From e2b8393ee8ed2a140d883ae3495fe7047dd827d2 Mon Sep 17 00:00:00 2001
From: Jonas Dohse <jonas@dohse.ch>
Date: Tue, 13 Oct 2015 18:38:45 -0700
Subject: [PATCH 001/323] test: port domains regression test from v0.10

f2a45caf2e1b73fea01fa9a941bc61096a999664 contained a test for a
regression that had been introduced by the original change that
77a10ed05f1e413818d29f07cbb268108b1f08fa ported. While
77a10ed05f1e413818d29f07cbb268108b1f08fa did not contain that
regression, the test that f2a45caf2e1b73fea01fa9a941bc61096a999664
contained should still be in the code base to prevent any regression
from happening in the future.

Original message for the commit that contained the test:

  domains: fix stack clearing after error handled

  caeb67735baa8e069902e23f21d01033907c4f33 introduced a regression where
  the domains stack would not be cleared after an error had been handled
  by the top-level domain.

  This change clears the domains stack regardless of the position of the
  active domain in the stack.

  PR: #9364
  PR-URL: https://github.com/joyent/node/pull/9364
  Reviewed-By: Trevor Norris <trev.norris@gmail.com>
  Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

PR: #3356
PR-URL: https://github.com/nodejs/node/pull/3356
Reviewed-By: Ben Noordhuis <ben@strongloop.com>
---
 ...in-top-level-error-handler-clears-stack.js | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 test/parallel/test-domain-top-level-error-handler-clears-stack.js

diff --git a/test/parallel/test-domain-top-level-error-handler-clears-stack.js b/test/parallel/test-domain-top-level-error-handler-clears-stack.js
new file mode 100644
index 00000000000000..a5fec1f65ef029
--- /dev/null
+++ b/test/parallel/test-domain-top-level-error-handler-clears-stack.js
@@ -0,0 +1,34 @@
+'use strict';
+
+const common = require('../common');
+const domain = require('domain');
+
+/*
+ * Make sure that the domains stack is cleared after a top-level domain
+ * error handler exited gracefully.
+ */
+const d = domain.create();
+
+d.on('error', common.mustCall(function() {
+  process.nextTick(function() {
+    // Scheduling a callback with process.nextTick will enter a _new_ domain,
+    // and the callback will be called after the domain that handled the error
+    // was exited. So there should be only one domain on the domains stack if
+    // the domains stack was cleared properly when the domain error handler
+    // returned.
+    if (domain._stack.length !== 1) {
+      // Do not use assert to perform this test: this callback runs in a
+      // different callstack as the original process._fatalException that
+      // handled the original error, thus throwing here would trigger another
+      // call to process._fatalException, and so on recursively and
+      // indefinitely.
+      console.error('domains stack length should be 1, but instead is:',
+        domain._stack.length);
+      process.exit(1);
+    }
+  });
+}));
+
+d.run(function() {
+  throw new Error('Error from domain');
+});

From 870108aaa898323fd89e518653015674b183560b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <mic.besace@gmail.com>
Date: Wed, 7 Oct 2015 19:58:39 +0200
Subject: [PATCH 002/323] console: sub-millisecond accuracy for console.time

This makes the output of console.timeEnd in line with major browsers.

PR-URL: https://github.com/nodejs/node/pull/3166
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 doc/api/console.markdown      | 2 +-
 lib/console.js                | 7 ++++---
 test/parallel/test-console.js | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/doc/api/console.markdown b/doc/api/console.markdown
index 4b5ed61b199e09..329b57ef9b57e6 100644
--- a/doc/api/console.markdown
+++ b/doc/api/console.markdown
@@ -93,7 +93,7 @@ Example:
       ;
     }
     console.timeEnd('100-elements');
-    // prints 100-elements: 262ms
+    // prints 100-elements: 225.438ms
 
 ### console.trace(message[, ...])
 
diff --git a/lib/console.js b/lib/console.js
index f9032e24a0fa44..531a383876ce2b 100644
--- a/lib/console.js
+++ b/lib/console.js
@@ -56,7 +56,7 @@ Console.prototype.dir = function(object, options) {
 
 
 Console.prototype.time = function(label) {
-  this._times.set(label, Date.now());
+  this._times.set(label, process.hrtime());
 };
 
 
@@ -65,8 +65,9 @@ Console.prototype.timeEnd = function(label) {
   if (!time) {
     throw new Error('No such label: ' + label);
   }
-  var duration = Date.now() - time;
-  this.log('%s: %dms', label, duration);
+  const duration = process.hrtime(time);
+  const ms = duration[0] * 1000 + duration[1] / 1e6;
+  this.log('%s: %sms', label, ms.toFixed(3));
 };
 
 
diff --git a/test/parallel/test-console.js b/test/parallel/test-console.js
index 982c83851f072a..f8a927398034cb 100644
--- a/test/parallel/test-console.js
+++ b/test/parallel/test-console.js
@@ -68,8 +68,8 @@ assert.notEqual(-1, strings.shift().indexOf('foo: [Object]'));
 assert.equal(-1, strings.shift().indexOf('baz'));
 assert.equal('Trace: This is a {"formatted":"trace"} 10 foo',
              strings.shift().split('\n').shift());
-assert.ok(/^label: \d+ms$/.test(strings.shift().trim()));
-assert.ok(/^__proto__: \d+ms$/.test(strings.shift().trim()));
-assert.ok(/^constructor: \d+ms$/.test(strings.shift().trim()));
-assert.ok(/^hasOwnProperty: \d+ms$/.test(strings.shift().trim()));
+assert.ok(/^label: \d+\.\d{3}ms$/.test(strings.shift().trim()));
+assert.ok(/^__proto__: \d+\.\d{3}ms$/.test(strings.shift().trim()));
+assert.ok(/^constructor: \d+\.\d{3}ms$/.test(strings.shift().trim()));
+assert.ok(/^hasOwnProperty: \d+\.\d{3}ms$/.test(strings.shift().trim()));
 assert.equal(strings.length, 0);

From f6ebc8277b2c7b8f9f9837c15624156185250461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <mic.besace@gmail.com>
Date: Wed, 7 Oct 2015 20:01:36 +0200
Subject: [PATCH 003/323] doc: reword description of console.time

PR-URL: https://github.com/nodejs/node/pull/3166
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 doc/api/console.markdown | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/api/console.markdown b/doc/api/console.markdown
index 329b57ef9b57e6..f3a69ce95104e2 100644
--- a/doc/api/console.markdown
+++ b/doc/api/console.markdown
@@ -74,16 +74,16 @@ Defaults to `false`. Colors are customizable, see below.
 
 ### console.time(label)
 
-Used to calculate the duration of a specific operation. To start a timer, call
-the `console.time()` method, giving it a name as only parameter. To stop the
-timer, and to get the elapsed time in milliseconds, just call the
-[`console.timeEnd()`](#console_console_timeend_label) method, again passing the
-timer's name as the parameter.
+Starts a timer that can be used to compute the duration of an operation. Timers
+are identified by a unique name. Use the same name when you call
+[`console.timeEnd()`](#console_console_timeend_label) to stop the timer and
+output the elapsed time in milliseconds. Timer durations are accurate to the
+sub-millisecond.
 
 ### console.timeEnd(label)
 
 Stops a timer that was previously started by calling
-[`console.time()`](#console_console_time_label) and print the result to the
+[`console.time()`](#console_console_time_label) and prints the result to the
 console.
 
 Example:

From a89eeca59051c5d60e93ab2946dd1c74a7226084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <mic.besace@gmail.com>
Date: Thu, 8 Oct 2015 21:19:34 +0200
Subject: [PATCH 004/323] console: rename argument of time and timeEnd

Name it timerName instead of label. It is clearer that way and matches
the description in the doc. It is also how it's named in MDN.

PR-URL: https://github.com/nodejs/node/pull/3166
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 doc/api/console.markdown |  8 ++++----
 lib/console.js           | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/api/console.markdown b/doc/api/console.markdown
index f3a69ce95104e2..6e2de6071e64a2 100644
--- a/doc/api/console.markdown
+++ b/doc/api/console.markdown
@@ -72,18 +72,18 @@ object. This is useful for inspecting large complicated objects. Defaults to
 - `colors` - if `true`, then the output will be styled with ANSI color codes.
 Defaults to `false`. Colors are customizable, see below.
 
-### console.time(label)
+### console.time(timerName)
 
 Starts a timer that can be used to compute the duration of an operation. Timers
 are identified by a unique name. Use the same name when you call
-[`console.timeEnd()`](#console_console_timeend_label) to stop the timer and
+[`console.timeEnd()`](#console_console_timeend_timername) to stop the timer and
 output the elapsed time in milliseconds. Timer durations are accurate to the
 sub-millisecond.
 
-### console.timeEnd(label)
+### console.timeEnd(timerName)
 
 Stops a timer that was previously started by calling
-[`console.time()`](#console_console_time_label) and prints the result to the
+[`console.time()`](#console_console_time_timername) and prints the result to the
 console.
 
 Example:
diff --git a/lib/console.js b/lib/console.js
index 531a383876ce2b..d2b4f3fc5b59be 100644
--- a/lib/console.js
+++ b/lib/console.js
@@ -55,19 +55,19 @@ Console.prototype.dir = function(object, options) {
 };
 
 
-Console.prototype.time = function(label) {
-  this._times.set(label, process.hrtime());
+Console.prototype.time = function(timerName) {
+  this._times.set(timerName, process.hrtime());
 };
 
 
-Console.prototype.timeEnd = function(label) {
-  var time = this._times.get(label);
+Console.prototype.timeEnd = function(timerName) {
+  var time = this._times.get(timerName);
   if (!time) {
-    throw new Error('No such label: ' + label);
+    throw new Error('No such timer name: ' + timerName);
   }
   const duration = process.hrtime(time);
   const ms = duration[0] * 1000 + duration[1] / 1e6;
-  this.log('%s: %sms', label, ms.toFixed(3));
+  this.log('%s: %sms', timerName, ms.toFixed(3));
 };
 
 

From ee2e641e0aeccedaf0af0d411b49fb427b5eb2e1 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Mon, 12 Oct 2015 09:50:56 -0700
Subject: [PATCH 005/323] test: add Symbol test for assert.deepEqual()

The existing test never ran because typeof Symbol === 'function' and not
'symbol'. We have Symbols now so remove the check and just run the test.

PR-URL: https://github.com/nodejs/node/pull/3327
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/parallel/test-assert.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js
index ce19462a62387c..db36abc184b024 100644
--- a/test/parallel/test-assert.js
+++ b/test/parallel/test-assert.js
@@ -140,9 +140,7 @@ assert.throws(makeBlock(a.deepEqual, 'a', ['a']), a.AssertionError);
 assert.throws(makeBlock(a.deepEqual, 'a', {0: 'a'}), a.AssertionError);
 assert.throws(makeBlock(a.deepEqual, 1, {}), a.AssertionError);
 assert.throws(makeBlock(a.deepEqual, true, {}), a.AssertionError);
-if (typeof Symbol === 'symbol') {
-  assert.throws(makeBlock(assert.deepEqual, Symbol(), {}), a.AssertionError);
-}
+assert.throws(makeBlock(a.deepEqual, Symbol(), {}), a.AssertionError);
 
 // primitive wrappers and object
 assert.doesNotThrow(makeBlock(a.deepEqual, new String('a'), ['a']),

From 5e0759f6fdac7a54eaf5b103d972895218a790e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20W=C3=BCller?= <johanneswueller@gmail.com>
Date: Sat, 3 Oct 2015 02:06:42 +0200
Subject: [PATCH 006/323] fs: add file descriptor support to *File() funcs

These changes affect the following functions and their synchronous
counterparts:

 * fs.readFile()
 * fs.writeFile()
 * fs.appendFile()

If the first parameter is a uint32, it is treated as a file descriptor.
In all other cases, the original implementation is used to ensure
backwards compatibility. File descriptor ownership is never taken from
the user.

The documentation was adjusted to reflect these API changes. A note was
added to make the user aware of file descriptor ownership and the
conditions under which a file descriptor can be used by each of these
functions.

Tests were extended to test for file descriptor parameters under the
conditions noted in the relevant documentation.

PR-URL: https://github.com/nodejs/node/pull/3163
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 doc/api/fs.markdown                       | 36 +++++++---
 lib/fs.js                                 | 86 ++++++++++++++++++-----
 test/parallel/test-fs-append-file-sync.js | 14 ++++
 test/parallel/test-fs-append-file.js      | 33 ++++++++-
 test/parallel/test-fs-readfile-fd.js      | 47 +++++++++++++
 test/parallel/test-fs-write-file-sync.js  | 12 ++++
 test/parallel/test-fs-write-file.js       | 31 +++++++-
 7 files changed, 230 insertions(+), 29 deletions(-)
 create mode 100644 test/parallel/test-fs-readfile-fd.js

diff --git a/doc/api/fs.markdown b/doc/api/fs.markdown
index e535ce64e283e9..b46c94984fbca8 100644
--- a/doc/api/fs.markdown
+++ b/doc/api/fs.markdown
@@ -468,9 +468,9 @@ The callback is given the three arguments, `(err, bytesRead, buffer)`.
 
 Synchronous version of `fs.read`. Returns the number of `bytesRead`.
 
-## fs.readFile(filename[, options], callback)
+## fs.readFile(file[, options], callback)
 
-* `filename` {String}
+* `file` {String | Integer} filename or file descriptor
 * `options` {Object | String}
   * `encoding` {String | Null} default = `null`
   * `flag` {String} default = `'r'`
@@ -492,18 +492,20 @@ If `options` is a string, then it specifies the encoding. Example:
 
     fs.readFile('/etc/passwd', 'utf8', callback);
 
+Any specified file descriptor has to support reading.
 
-## fs.readFileSync(filename[, options])
+_Note: Specified file descriptors will not be closed automatically._
 
-Synchronous version of `fs.readFile`. Returns the contents of the `filename`.
+## fs.readFileSync(file[, options])
+
+Synchronous version of `fs.readFile`. Returns the contents of the `file`.
 
 If the `encoding` option is specified then this function returns a
 string. Otherwise it returns a buffer.
 
+## fs.writeFile(file, data[, options], callback)
 
-## fs.writeFile(filename, data[, options], callback)
-
-* `filename` {String}
+* `file` {String | Integer} filename or file descriptor
 * `data` {String | Buffer}
 * `options` {Object | String}
   * `encoding` {String | Null} default = `'utf8'`
@@ -528,13 +530,21 @@ If `options` is a string, then it specifies the encoding. Example:
 
     fs.writeFile('message.txt', 'Hello Node.js', 'utf8', callback);
 
-## fs.writeFileSync(filename, data[, options])
+Any specified file descriptor has to support writing.
+
+Note that it is unsafe to use `fs.writeFile` multiple times on the same file
+without waiting for the callback. For this scenario,
+`fs.createWriteStream` is strongly recommended.
+
+_Note: Specified file descriptors will not be closed automatically._
+
+## fs.writeFileSync(file, data[, options])
 
 The synchronous version of `fs.writeFile`. Returns `undefined`.
 
-## fs.appendFile(filename, data[, options], callback)
+## fs.appendFile(file, data[, options], callback)
 
-* `filename` {String}
+* `file` {String | Integer} filename or file descriptor
 * `data` {String | Buffer}
 * `options` {Object | String}
   * `encoding` {String | Null} default = `'utf8'`
@@ -556,7 +566,11 @@ If `options` is a string, then it specifies the encoding. Example:
 
     fs.appendFile('message.txt', 'data to append', 'utf8', callback);
 
-## fs.appendFileSync(filename, data[, options])
+Any specified file descriptor has to have been opened for appending.
+
+_Note: Specified file descriptors will not be closed automatically._
+
+## fs.appendFileSync(file, data[, options])
 
 The synchronous version of `fs.appendFile`. Returns `undefined`.
 
diff --git a/lib/fs.js b/lib/fs.js
index fef4f7ba501b50..76873be14ab3de 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -101,6 +101,10 @@ function nullCheck(path, callback) {
   return true;
 }
 
+function isFd(path) {
+  return (path >>> 0) === path;
+}
+
 // Static method to set the stats properties on a Stats object.
 fs.Stats = function(
     dev,
@@ -243,10 +247,18 @@ fs.readFile = function(path, options, callback_) {
     return;
 
   var context = new ReadFileContext(callback, encoding);
+  context.isUserFd = isFd(path); // file descriptor ownership
   var req = new FSReqWrap();
   req.context = context;
   req.oncomplete = readFileAfterOpen;
 
+  if (context.isUserFd) {
+    process.nextTick(function() {
+      req.oncomplete(null, path);
+    });
+    return;
+  }
+
   binding.open(pathModule._makeLong(path),
                stringToFlags(flag),
                0o666,
@@ -257,6 +269,7 @@ const kReadFileBufferLength = 8 * 1024;
 
 function ReadFileContext(callback, encoding) {
   this.fd = undefined;
+  this.isUserFd = undefined;
   this.size = undefined;
   this.callback = callback;
   this.buffers = null;
@@ -293,6 +306,14 @@ ReadFileContext.prototype.close = function(err) {
   req.oncomplete = readFileAfterClose;
   req.context = this;
   this.err = err;
+
+  if (this.isUserFd) {
+    process.nextTick(function() {
+      req.oncomplete(null);
+    });
+    return;
+  }
+
   binding.close(this.fd, req);
 };
 
@@ -394,7 +415,8 @@ fs.readFileSync = function(path, options) {
   assertEncoding(encoding);
 
   var flag = options.flag || 'r';
-  var fd = fs.openSync(path, flag, 0o666);
+  var isUserFd = isFd(path); // file descriptor ownership
+  var fd = isUserFd ? path : fs.openSync(path, flag, 0o666);
 
   var st;
   var size;
@@ -404,7 +426,7 @@ fs.readFileSync = function(path, options) {
     size = st.isFile() ? st.size : 0;
     threw = false;
   } finally {
-    if (threw) fs.closeSync(fd);
+    if (threw && !isUserFd) fs.closeSync(fd);
   }
 
   var pos = 0;
@@ -419,7 +441,7 @@ fs.readFileSync = function(path, options) {
       buffer = new Buffer(size);
       threw = false;
     } finally {
-      if (threw) fs.closeSync(fd);
+      if (threw && !isUserFd) fs.closeSync(fd);
     }
   }
 
@@ -442,14 +464,15 @@ fs.readFileSync = function(path, options) {
       }
       threw = false;
     } finally {
-      if (threw) fs.closeSync(fd);
+      if (threw && !isUserFd) fs.closeSync(fd);
     }
 
     pos += bytesRead;
     done = (bytesRead === 0) || (size !== 0 && pos >= size);
   }
 
-  fs.closeSync(fd);
+  if (!isUserFd)
+    fs.closeSync(fd);
 
   if (size === 0) {
     // data was collected into the buffers list.
@@ -1096,25 +1119,33 @@ fs.futimesSync = function(fd, atime, mtime) {
   binding.futimes(fd, atime, mtime);
 };
 
-function writeAll(fd, buffer, offset, length, position, callback_) {
+function writeAll(fd, isUserFd, buffer, offset, length, position, callback_) {
   var callback = maybeCallback(arguments[arguments.length - 1]);
 
   // write(fd, buffer, offset, length, position, callback)
   fs.write(fd, buffer, offset, length, position, function(writeErr, written) {
     if (writeErr) {
-      fs.close(fd, function() {
+      if (isUserFd) {
         if (callback) callback(writeErr);
-      });
+      } else {
+        fs.close(fd, function() {
+          if (callback) callback(writeErr);
+        });
+      }
     } else {
       if (written === length) {
-        fs.close(fd, callback);
+        if (isUserFd) {
+          if (callback) callback(null);
+        } else {
+          fs.close(fd, callback);
+        }
       } else {
         offset += written;
         length -= written;
         if (position !== null) {
           position += written;
         }
-        writeAll(fd, buffer, offset, length, position, callback);
+        writeAll(fd, isUserFd, buffer, offset, length, position, callback);
       }
     }
   });
@@ -1134,16 +1165,27 @@ fs.writeFile = function(path, data, options, callback_) {
   assertEncoding(options.encoding);
 
   var flag = options.flag || 'w';
+
+  if (isFd(path)) {
+    writeFd(path, true);
+    return;
+  }
+
   fs.open(path, flag, options.mode, function(openErr, fd) {
     if (openErr) {
       if (callback) callback(openErr);
     } else {
-      var buffer = (data instanceof Buffer) ? data : new Buffer('' + data,
-          options.encoding || 'utf8');
-      var position = /a/.test(flag) ? null : 0;
-      writeAll(fd, buffer, 0, buffer.length, position, callback);
+      writeFd(fd, false);
     }
   });
+
+  function writeFd(fd, isUserFd) {
+    var buffer = (data instanceof Buffer) ? data : new Buffer('' + data,
+        options.encoding || 'utf8');
+    var position = /a/.test(flag) ? null : 0;
+
+    writeAll(fd, isUserFd, buffer, 0, buffer.length, position, callback);
+  }
 };
 
 fs.writeFileSync = function(path, data, options) {
@@ -1158,7 +1200,9 @@ fs.writeFileSync = function(path, data, options) {
   assertEncoding(options.encoding);
 
   var flag = options.flag || 'w';
-  var fd = fs.openSync(path, flag, options.mode);
+  var isUserFd = isFd(path); // file descriptor ownership
+  var fd = isUserFd ? path : fs.openSync(path, flag, options.mode);
+
   if (!(data instanceof Buffer)) {
     data = new Buffer('' + data, options.encoding || 'utf8');
   }
@@ -1175,7 +1219,7 @@ fs.writeFileSync = function(path, data, options) {
       }
     }
   } finally {
-    fs.closeSync(fd);
+    if (!isUserFd) fs.closeSync(fd);
   }
 };
 
@@ -1192,6 +1236,11 @@ fs.appendFile = function(path, data, options, callback_) {
 
   if (!options.flag)
     options = util._extend({ flag: 'a' }, options);
+
+  // force append behavior when using a supplied file descriptor
+  if (isFd(path))
+    options.flag = 'a';
+
   fs.writeFile(path, data, options, callback);
 };
 
@@ -1203,9 +1252,14 @@ fs.appendFileSync = function(path, data, options) {
   } else if (typeof options !== 'object') {
     throwOptionsError(options);
   }
+
   if (!options.flag)
     options = util._extend({ flag: 'a' }, options);
 
+  // force append behavior when using a supplied file descriptor
+  if (isFd(path))
+    options.flag = 'a';
+
   fs.writeFileSync(path, data, options);
 };
 
diff --git a/test/parallel/test-fs-append-file-sync.js b/test/parallel/test-fs-append-file-sync.js
index 42e0790e1f7227..4c5ae870ecd5e2 100644
--- a/test/parallel/test-fs-append-file-sync.js
+++ b/test/parallel/test-fs-append-file-sync.js
@@ -66,6 +66,19 @@ var fileData4 = fs.readFileSync(filename4);
 assert.equal(Buffer.byteLength('' + num) + currentFileData.length,
              fileData4.length);
 
+// test that appendFile accepts file descriptors
+var filename5 = join(common.tmpDir, 'append-sync5.txt');
+fs.writeFileSync(filename5, currentFileData);
+
+var filename5fd = fs.openSync(filename5, 'a+', 0o600);
+fs.appendFileSync(filename5fd, data);
+fs.closeSync(filename5fd);
+
+var fileData5 = fs.readFileSync(filename5);
+
+assert.equal(Buffer.byteLength(data) + currentFileData.length,
+             fileData5.length);
+
 //exit logic for cleanup
 
 process.on('exit', function() {
@@ -73,4 +86,5 @@ process.on('exit', function() {
   fs.unlinkSync(filename2);
   fs.unlinkSync(filename3);
   fs.unlinkSync(filename4);
+  fs.unlinkSync(filename5);
 });
diff --git a/test/parallel/test-fs-append-file.js b/test/parallel/test-fs-append-file.js
index b20323bd14b6e8..01742aa6f826c5 100644
--- a/test/parallel/test-fs-append-file.js
+++ b/test/parallel/test-fs-append-file.js
@@ -92,11 +92,42 @@ fs.appendFile(filename4, n, { mode: m }, function(e) {
   });
 });
 
+// test that appendFile accepts file descriptors
+var filename5 = join(common.tmpDir, 'append5.txt');
+fs.writeFileSync(filename5, currentFileData);
+
+fs.open(filename5, 'a+', function(e, fd) {
+  if (e) throw e;
+
+  ncallbacks++;
+
+  fs.appendFile(fd, s, function(e) {
+    if (e) throw e;
+
+    ncallbacks++;
+
+    fs.close(fd, function(e) {
+      if (e) throw e;
+
+      ncallbacks++;
+
+      fs.readFile(filename5, function(e, buffer) {
+        if (e) throw e;
+
+        ncallbacks++;
+        assert.equal(Buffer.byteLength(s) + currentFileData.length,
+                     buffer.length);
+      });
+    });
+  });
+});
+
 process.on('exit', function() {
-  assert.equal(8, ncallbacks);
+  assert.equal(12, ncallbacks);
 
   fs.unlinkSync(filename);
   fs.unlinkSync(filename2);
   fs.unlinkSync(filename3);
   fs.unlinkSync(filename4);
+  fs.unlinkSync(filename5);
 });
diff --git a/test/parallel/test-fs-readfile-fd.js b/test/parallel/test-fs-readfile-fd.js
new file mode 100644
index 00000000000000..fc63d480abf2bd
--- /dev/null
+++ b/test/parallel/test-fs-readfile-fd.js
@@ -0,0 +1,47 @@
+'use strict';
+var common = require('../common');
+var assert = require('assert');
+
+var path = require('path'),
+    fs = require('fs'),
+    fn = path.join(common.fixturesDir, 'empty.txt');
+
+tempFd(function(fd, close) {
+  fs.readFile(fd, function(err, data) {
+    assert.ok(data);
+    close();
+  });
+});
+
+tempFd(function(fd, close) {
+  fs.readFile(fd, 'utf8', function(err, data) {
+    assert.strictEqual('', data);
+    close();
+  });
+});
+
+tempFdSync(function(fd) {
+  assert.ok(fs.readFileSync(fd));
+});
+
+tempFdSync(function(fd) {
+  assert.strictEqual('', fs.readFileSync(fd, 'utf8'));
+});
+
+function tempFd(callback) {
+  fs.open(fn, 'r', function(err, fd) {
+    if (err) throw err;
+
+    callback(fd, function() {
+      fs.close(fd, function(err) {
+        if (err) throw err;
+      });
+    });
+  });
+}
+
+function tempFdSync(callback) {
+  var fd = fs.openSync(fn, 'r');
+  callback(fd);
+  fs.closeSync(fd);
+}
diff --git a/test/parallel/test-fs-write-file-sync.js b/test/parallel/test-fs-write-file-sync.js
index 37373404daf20e..72c0a2b19b712f 100644
--- a/test/parallel/test-fs-write-file-sync.js
+++ b/test/parallel/test-fs-write-file-sync.js
@@ -47,6 +47,18 @@ assert.equal('abc', content);
 
 assert.equal(mode, fs.statSync(file2).mode & mode);
 
+// Test writeFileSync with file descriptor
+var file3 = path.join(common.tmpDir, 'testWriteFileSyncFd.txt');
+
+var fd = fs.openSync(file3, 'w+', mode);
+fs.writeFileSync(fd, '123');
+fs.closeSync(fd);
+
+content = fs.readFileSync(file3, {encoding: 'utf8'});
+assert.equal('123', content);
+
+assert.equal(mode, fs.statSync(file3).mode & 0o777);
+
 // Verify that all opened files were closed.
 assert.equal(0, openCount);
 
diff --git a/test/parallel/test-fs-write-file.js b/test/parallel/test-fs-write-file.js
index 9ff3b3f39a7bd5..a29e841ea2f21e 100644
--- a/test/parallel/test-fs-write-file.js
+++ b/test/parallel/test-fs-write-file.js
@@ -69,11 +69,40 @@ fs.writeFile(filename3, n, { mode: m }, function(e) {
   });
 });
 
+// test that writeFile accepts file descriptors
+var filename4 = join(common.tmpDir, 'test4.txt');
+var buf = new Buffer(s, 'utf8');
+
+fs.open(filename4, 'w+', function(e, fd) {
+  if (e) throw e;
+
+  ncallbacks++;
+
+  fs.writeFile(fd, s, function(e) {
+    if (e) throw e;
+
+    ncallbacks++;
+
+    fs.close(fd, function(e) {
+      if (e) throw e;
+
+      ncallbacks++;
+
+      fs.readFile(filename4, function(e, buffer) {
+        if (e) throw e;
+
+        ncallbacks++;
+        assert.equal(Buffer.byteLength(s), buffer.length);
+      });
+    });
+  });
+});
 
 process.on('exit', function() {
-  assert.equal(6, ncallbacks);
+  assert.equal(10, ncallbacks);
 
   fs.unlinkSync(filename);
   fs.unlinkSync(filename2);
   fs.unlinkSync(filename3);
+  fs.unlinkSync(filename4);
 });

From 2296a4fc0ffe1975b88178b561bd50c2fa0ef92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=BE=D1=80=D0=B5=D0=BD=D0=B1=D0=B5=D1=80=D0=B3=20?=
 =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA?= <mark@ideco.ru>
Date: Tue, 5 May 2015 12:41:16 +0500
Subject: [PATCH 007/323] tls: add `options` argument to createSecurePair

Helps in implementation of #6204, where some options passed to
`createSecurePair()` are ignored before this patch.

These options are very helpful if someone wants to pass
`options.servername` or `options.SNICallback` to securepair.

PR-URL: https://github.com/nodejs/node/pull/2441
Reviewed-By: Fedor Indutny <fedor@indutny.com>
---
 doc/api/tls.markdown                          |   4 ++-
 lib/_tls_legacy.js                            |   6 ++--
 test/fixtures/google_ssl_hello.bin            | Bin 0 -> 517 bytes
 test/parallel/test-tls-securepair-fiftharg.js |  27 ++++++++++++++++++
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 test/fixtures/google_ssl_hello.bin
 create mode 100644 test/parallel/test-tls-securepair-fiftharg.js

diff --git a/doc/api/tls.markdown b/doc/api/tls.markdown
index d8ce9381a65cac..e846869e67d0be 100644
--- a/doc/api/tls.markdown
+++ b/doc/api/tls.markdown
@@ -511,7 +511,7 @@ publicly trusted list of CAs as given in
 <http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt>.
 
 
-## tls.createSecurePair([context][, isServer][, requestCert][, rejectUnauthorized])
+## tls.createSecurePair([context][, isServer][, requestCert][, rejectUnauthorized][, options])
 
 Creates a new secure pair object with two streams, one of which reads/writes
 encrypted data, and one reads/writes cleartext data.
@@ -530,6 +530,8 @@ and the cleartext one is used as a replacement for the initial encrypted stream.
    automatically reject clients with invalid certificates. Only applies to
    servers with `requestCert` enabled.
 
+ - `options`: An object with common SSL options. See [tls.TLSSocket][].
+
 `tls.createSecurePair()` returns a SecurePair object with `cleartext` and
 `encrypted` stream properties.
 
diff --git a/lib/_tls_legacy.js b/lib/_tls_legacy.js
index 1d700c9218f538..7f7707d149dfa2 100644
--- a/lib/_tls_legacy.js
+++ b/lib/_tls_legacy.js
@@ -761,11 +761,13 @@ function securePairNT(self, options) {
 exports.createSecurePair = function(context,
                                     isServer,
                                     requestCert,
-                                    rejectUnauthorized) {
+                                    rejectUnauthorized,
+                                    options) {
   var pair = new SecurePair(context,
                             isServer,
                             requestCert,
-                            rejectUnauthorized);
+                            rejectUnauthorized,
+                            options);
   return pair;
 };
 
diff --git a/test/fixtures/google_ssl_hello.bin b/test/fixtures/google_ssl_hello.bin
new file mode 100644
index 0000000000000000000000000000000000000000..5170533ab2170fb6ea89bb6c65944a5ae59f222e
GIT binary patch
literal 517
zcmWe*W@KVuWMKTm%v`Oa@Z!+d+6#M*zFShAsw%pd<^JuXn|(G1EZW}}e0Of3LUqQ<
zOY>zLo@#1%i-pZ&Qx4dBs(<F$YwS#t;(fDzJ6vE;IiP(&pJCnst^=G0gb#=uU_T(p
zV9a2|V979tL7%~tfs28afdyz;KLZ1UFoPfi17CT0xn6pHetJ%-UUGi!f1n%#P!$IQ
z8-qB51cM|4Hv<z;M491A;??&@J=e_>$X~fVu_;GjE5ly>G@EL(&ChdAs>{kIahY@c
z+!bfz$!0S%Rp?D=`_sS@Bi5A%E9Mo?3Y>j?0l&zzrE0g1osr9X(W5sbn<sYTI_YV@
zxO+C_>%H-uWA*r2!IWNCyEz|z-;vwdx2f1U-8S)~{#~u-$ysV4GtGn2XYKed-qX5m
z?F)zfT9?0`QJ5vhT{TUl_>tCA-&cacT<LxZC(J4yOp&bGe{u86`Io*-e#*FH=?bQE
ze_EK2UjEUrNhL|?phs&|p#9F9>31(x3a|BZaQl4IxC9su0t`|N5*)<^DV6%hdWNhS
zM!JS392q4g1^R}1hNS^O6|4-bz%T#;At2@jk^(G@tc*;IEX=ITOw24yOiT=-3^rgD
GWD)?}{iWpq

literal 0
HcmV?d00001

diff --git a/test/parallel/test-tls-securepair-fiftharg.js b/test/parallel/test-tls-securepair-fiftharg.js
new file mode 100644
index 00000000000000..b4610117889cc2
--- /dev/null
+++ b/test/parallel/test-tls-securepair-fiftharg.js
@@ -0,0 +1,27 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const fs = require('fs');
+const tls = require('tls');
+
+const sslcontext = tls.createSecureContext({
+  cert: fs.readFileSync(common.fixturesDir + '/test_cert.pem'),
+  key: fs.readFileSync(common.fixturesDir + '/test_key.pem')
+});
+
+var catchedServername;
+const pair = tls.createSecurePair(sslcontext, true, false, false, {
+  SNICallback: common.mustCall(function(servername, cb) {
+    catchedServername = servername;
+  })
+});
+
+// captured traffic from browser's request to https://www.google.com
+const sslHello = fs.readFileSync(common.fixturesDir + '/google_ssl_hello.bin');
+
+pair.encrypted.write(sslHello);
+
+process.on('exit', function() {
+  assert.strictEqual('www.google.com', catchedServername);
+});

From 9e981556e5a61474fc8982d8ed9d87b216d536f8 Mon Sep 17 00:00:00 2001
From: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Date: Tue, 6 Oct 2015 23:00:31 -0700
Subject: [PATCH 008/323] test: cleanup, improve repl-persistent-history

- Now cleans up the history file unless told otherwise.
- Now also logs which test case failed.
- Waits for flush after repl close if necessary.

Fixes: https://github.com/nodejs/node/issues/2319
PR-URL: https://github.com/nodejs/node/pull/2356
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed By: Evan Lucas <evanlucas@me.com>
---
 .../test-repl-persistent-history.js           | 83 +++++++++++++++----
 1 file changed, 68 insertions(+), 15 deletions(-)

diff --git a/test/sequential/test-repl-persistent-history.js b/test/sequential/test-repl-persistent-history.js
index ef433912da5a65..7cebddbd6c20f5 100644
--- a/test/sequential/test-repl-persistent-history.js
+++ b/test/sequential/test-repl-persistent-history.js
@@ -70,6 +70,7 @@ const historyFixturePath = path.join(fixtures, '.node_repl_history');
 const historyPath = path.join(common.tmpDir, '.fixture_copy_repl_history');
 const oldHistoryPath = path.join(fixtures, 'old-repl-history-file.json');
 const enoentHistoryPath = path.join(fixtures, 'enoent-repl-history-file.json');
+const defaultHistoryPath = path.join(common.tmpDir, '.node_repl_history');
 
 
 const tests = [{
@@ -113,11 +114,7 @@ const tests = [{
 },
 {
   env: { NODE_REPL_HISTORY_FILE: oldHistoryPath },
-  test: [UP, CLEAR, '\'42\'', ENTER/*, function(cb) {
-    // XXX(Fishrock123) Allow the REPL to save to disk.
-    // There isn't a way to do this programmatically right now.
-    setTimeout(cb, 50);
-  }*/],
+  test: [UP, CLEAR, '\'42\'', ENTER],
   expected: [prompt, convertMsg, prompt, prompt + '\'=^.^=\'', prompt, '\'',
              '4', '2', '\'', '\'42\'\n', prompt, prompt],
   after: function ensureHistoryFixture() {
@@ -132,7 +129,7 @@ const tests = [{
                                     '\'Stay Fresh~\'' + os.EOL);
   }
 },
-{
+{ // Requires the above testcase
   env: {},
   test: [UP, UP, ENTER],
   expected: [prompt, prompt + '\'42\'', prompt + '\'=^.^=\'', '\'=^.^=\'\n',
@@ -149,16 +146,45 @@ const tests = [{
   test: [UP],
   expected: [prompt, homedirErr, prompt, replDisabled, prompt]
 }];
+const numtests = tests.length;
+
+
+var testsNotRan = tests.length;
 
+process.on('beforeExit', () =>
+  assert.strictEqual(testsNotRan, 0)
+);
+
+function cleanupTmpFile() {
+  try {
+    // Write over the file, clearing any history
+    fs.writeFileSync(defaultHistoryPath, '');
+  } catch (err) {
+    if (err.code === 'ENOENT') return true;
+    throw err;
+  }
+  return true;
+}
 
 // Copy our fixture to the tmp directory
 fs.createReadStream(historyFixturePath)
-  .pipe(fs.createWriteStream(historyPath)).on('unpipe', runTest);
+  .pipe(fs.createWriteStream(historyPath)).on('unpipe', () => runTest());
 
-function runTest() {
+function runTest(assertCleaned) {
   const opts = tests.shift();
   if (!opts) return; // All done
 
+  if (assertCleaned) {
+    try {
+      assert.strictEqual(fs.readFileSync(defaultHistoryPath, 'utf8'), '');
+    } catch (e) {
+      if (e.code !== 'ENOENT') {
+        console.error(`Failed test # ${numtests - tests.length}`);
+        throw e;
+      }
+    }
+  }
+
   const env = opts.env;
   const test = opts.test;
   const expected = opts.expected;
@@ -177,7 +203,12 @@ function runTest() {
         if (output.charCodeAt(0) === 27 || /^[\r\n]+$/.test(output))
           return next();
 
-        assert.strictEqual(output, expected.shift());
+        try {
+          assert.strictEqual(output, expected.shift());
+        } catch (err) {
+          console.error(`Failed test # ${numtests - tests.length}`);
+          throw err;
+        }
         next();
       }
     }),
@@ -185,16 +216,38 @@ function runTest() {
     useColors: false,
     terminal: true
   }, function(err, repl) {
-    if (err) throw err;
+    if (err) {
+      console.error(`Failed test # ${numtests - tests.length}`);
+      throw err;
+    }
 
-    if (after) repl.on('close', after);
+    repl.once('close', () => {
+      if (repl._flushing) {
+        repl.once('flushHistory', onClose);
+        return;
+      }
 
-    repl.on('close', function() {
-      // Ensure everything that we expected was output
-      assert.strictEqual(expected.length, 0);
-      setImmediate(runTest);
+      onClose();
     });
 
+    function onClose() {
+      if (after) {
+        var cleaned = after();
+      } else {
+        var cleaned = cleanupTmpFile();
+      }
+
+      try {
+        // Ensure everything that we expected was output
+        assert.strictEqual(expected.length, 0);
+        testsNotRan--;
+        setImmediate(runTest, cleaned);
+      } catch (err) {
+        console.error(`Failed test # ${numtests - tests.length}`);
+        throw err;
+      }
+    }
+
     repl.inputStream.run(test);
   });
 }

From 4c80c02ac75b9b6bbe685151007675299709044b Mon Sep 17 00:00:00 2001
From: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Date: Tue, 6 Oct 2015 23:01:28 -0700
Subject: [PATCH 009/323] repl: limit persistent history correctly on load

Previously the wrong end of the history was limited on load.

PR-URL: https://github.com/nodejs/node/pull/2356
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed By: Evan Lucas <evanlucas@me.com>
---
 lib/internal/repl.js                            |  4 ++--
 test/sequential/test-repl-persistent-history.js | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/internal/repl.js b/lib/internal/repl.js
index c1beb85cefd795..0318a36098e31a 100644
--- a/lib/internal/repl.js
+++ b/lib/internal/repl.js
@@ -110,7 +110,7 @@ function setupHistory(repl, historyPath, oldHistoryPath, ready) {
     }
 
     if (data) {
-      repl.history = data.split(/[\n\r]+/).slice(-repl.historySize);
+      repl.history = data.split(/[\n\r]+/, repl.historySize);
     } else if (oldHistoryPath) {
       // Grab data from the older pre-v3.0 JSON NODE_REPL_HISTORY_FILE format.
       repl._writeToOutput(
@@ -123,7 +123,7 @@ function setupHistory(repl, historyPath, oldHistoryPath, ready) {
         if (!Array.isArray(repl.history)) {
           throw new Error('Expected array, got ' + typeof repl.history);
         }
-        repl.history = repl.history.slice(-repl.historySize);
+        repl.history = repl.history.slice(0, repl.historySize);
       } catch (err) {
         if (err.code !== 'ENOENT') {
           return ready(
diff --git a/test/sequential/test-repl-persistent-history.js b/test/sequential/test-repl-persistent-history.js
index 7cebddbd6c20f5..7fd68d7d764a4f 100644
--- a/test/sequential/test-repl-persistent-history.js
+++ b/test/sequential/test-repl-persistent-history.js
@@ -135,6 +135,18 @@ const tests = [{
   expected: [prompt, prompt + '\'42\'', prompt + '\'=^.^=\'', '\'=^.^=\'\n',
              prompt]
 },
+{
+  env: { NODE_REPL_HISTORY: historyPath,
+         NODE_REPL_HISTORY_SIZE: 1 },
+  test: [UP, UP, CLEAR],
+  expected: [prompt, prompt + '\'you look fabulous today\'', prompt]
+},
+{
+  env: { NODE_REPL_HISTORY_FILE: oldHistoryPath,
+         NODE_REPL_HISTORY_SIZE: 1 },
+  test: [UP, UP, UP, CLEAR],
+  expected: [prompt, convertMsg, prompt, prompt + '\'=^.^=\'', prompt]
+},
 { // Make sure this is always the last test, since we change os.homedir()
   before: function mockHomedirFailure() {
     // Mock os.homedir() failure

From 086103b32e839fabc008cdc094d9acce91718a7d Mon Sep 17 00:00:00 2001
From: calebboyd <caleb.boyd@gmail.com>
Date: Mon, 19 Oct 2015 12:38:55 -0500
Subject: [PATCH 010/323] doc: show keylen in pbkdf2 as a byte length

Ensure that keylen for pbkdf2 is documented as a length of bytes and not
bits.

PR-URL: https://github.com/nodejs/node/pull/3334
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/crypto.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/api/crypto.markdown b/doc/api/crypto.markdown
index 0379179de3593c..04d7af6a168334 100644
--- a/doc/api/crypto.markdown
+++ b/doc/api/crypto.markdown
@@ -621,13 +621,13 @@ Example (obtaining a shared secret):
 ## crypto.pbkdf2(password, salt, iterations, keylen[, digest], callback)
 
 Asynchronous PBKDF2 function.  Applies the selected HMAC digest function
-(default: SHA1) to derive a key of the requested length from the password,
+(default: SHA1) to derive a key of the requested byte length from the password,
 salt and number of iterations.  The callback gets two arguments:
 `(err, derivedKey)`.
 
 Example:
 
-    crypto.pbkdf2('secret', 'salt', 4096, 512, 'sha256', function(err, key) {
+    crypto.pbkdf2('secret', 'salt', 4096, 64, 'sha256', function(err, key) {
       if (err)
         throw err;
       console.log(key.toString('hex'));  // 'c5e478d...1469e50'

From b607366a1c263e4717b4212ea3397d1f4c13c6ae Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Mon, 12 Oct 2015 13:58:00 -0700
Subject: [PATCH 011/323] doc: add information about Assert behavior and
 maintenance

Assert is now locked. Userland alternatives should be used. Assert is
for testing Node.js itself.

Document potentially surprising use of enumerable properties only in
deep equality assertions.

Ref: https://github.com/nodejs/node/pull/3124
Ref: https://github.com/nodejs/node/issues/3122

PR-URL: https://github.com/nodejs/node/pull/3330
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
---
 doc/api/assert.markdown | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/doc/api/assert.markdown b/doc/api/assert.markdown
index fd1130eebe72a4..7bf6ebb40fd30a 100644
--- a/doc/api/assert.markdown
+++ b/doc/api/assert.markdown
@@ -1,9 +1,10 @@
 # Assert
 
-    Stability: 2 - Stable
+    Stability: 3 - Locked
 
-This module is used for writing assertion tests. You can access it with
-`require('assert')`.
+This module is used so that Node.js can test itself. It can be accessed with
+`require('assert')`. However, it is recommended that a userland assertion
+library be used instead.
 
 ## assert.fail(actual, expected, message, operator)
 
@@ -26,8 +27,17 @@ Tests shallow, coercive inequality with the not equal comparison operator
 
 ## assert.deepEqual(actual, expected[, message])
 
-Tests for deep equality. Primitive values are compared with the equal comparison
-operator ( `==` ). Doesn't take object prototypes into account.
+Tests for deep equality. Primitive values are compared with the equal
+comparison operator ( `==` ).
+
+This only considers enumerable properties. It does not test object prototypes,
+attached symbols, or non-enumerable properties. This can lead to some
+potentially surprising results. For example, this does not throw an
+`AssertionError` because the properties on the `Error` object are
+non-enumerable:
+
+    // WARNING: This does not throw an AssertionError!
+    assert.deepEqual(Error('a'), Error('b'));
 
 ## assert.notDeepEqual(actual, expected[, message])
 

From 412252ca045f52a34b7cca6ffb19ade116fa1ce0 Mon Sep 17 00:00:00 2001
From: Wyatt Preul <wpreul@gmail.com>
Date: Mon, 24 Aug 2015 16:40:38 -0500
Subject: [PATCH 012/323] util: Remove p, has been deprecated for years

Update deprecation test to use another method.

Ref: https://github.com/nodejs/node/pull/2529
PR-URL: https://github.com/nodejs/node/pull/3432
Reviewed-By: Brian White <mscdex@mscdex.net>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 lib/util.js                               |  7 -------
 test/fixtures/deprecated.js               |  2 +-
 test/sequential/test-deprecation-flags.js | 10 +++++-----
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/lib/util.js b/lib/util.js
index 399a4ee0a23828..19d3d464f104d4 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -790,13 +790,6 @@ function hasOwnProperty(obj, prop) {
 
 // Deprecated old stuff.
 
-exports.p = internalUtil.deprecate(function() {
-  for (var i = 0, len = arguments.length; i < len; ++i) {
-    console.error(exports.inspect(arguments[i]));
-  }
-}, 'util.p is deprecated. Use console.error instead.');
-
-
 exports.exec = internalUtil.deprecate(function() {
   return require('child_process').exec.apply(this, arguments);
 }, 'util.exec is deprecated. Use child_process.exec instead.');
diff --git a/test/fixtures/deprecated.js b/test/fixtures/deprecated.js
index be4bc4ae0d3558..f49c0d91ba1249 100644
--- a/test/fixtures/deprecated.js
+++ b/test/fixtures/deprecated.js
@@ -1 +1 @@
-require('util').p('This is deprecated');
+require('util').debug('This is deprecated');
diff --git a/test/sequential/test-deprecation-flags.js b/test/sequential/test-deprecation-flags.js
index ca325654c55d80..a243cc44f29dd7 100644
--- a/test/sequential/test-deprecation-flags.js
+++ b/test/sequential/test-deprecation-flags.js
@@ -16,8 +16,8 @@ execFile(node, normal, function(er, stdout, stderr) {
   console.error('normal: show deprecation warning');
   assert.equal(er, null);
   assert.equal(stdout, '');
-  assert.equal(stderr, '(node) util.p is deprecated. Use console.error ' +
-                       'instead.\n\'This is deprecated\'\n');
+  assert.equal(stderr, '(node) util.debug is deprecated. Use console.error ' +
+                       'instead.\nDEBUG: This is deprecated\n');
   console.log('normal ok');
 });
 
@@ -25,7 +25,7 @@ execFile(node, noDep, function(er, stdout, stderr) {
   console.error('--no-deprecation: silence deprecations');
   assert.equal(er, null);
   assert.equal(stdout, '');
-  assert.equal(stderr, '\'This is deprecated\'\n');
+  assert.equal(stderr, 'DEBUG: This is deprecated\n');
   console.log('silent ok');
 });
 
@@ -36,8 +36,8 @@ execFile(node, traceDep, function(er, stdout, stderr) {
   var stack = stderr.trim().split('\n');
   // just check the top and bottom.
   assert.equal(stack[0],
-               'Trace: util.p is deprecated. Use console.error instead.');
-  assert.equal(stack.pop(), '\'This is deprecated\'');
+               'Trace: util.debug is deprecated. Use console.error instead.');
+  assert.equal(stack.pop(), 'DEBUG: This is deprecated');
   console.log('trace ok');
 });
 

From 80169b1f0a5f944b99e82a409536dea426c992f3 Mon Sep 17 00:00:00 2001
From: Yuval Brik <yuval@brik.org.il>
Date: Fri, 28 Aug 2015 17:14:27 +0300
Subject: [PATCH 013/323] zlib: decompression throw on truncated input

Check for unexpected end-of-file error when decompressing. If the output
buffer still has space after decompressing and deflate returned Z_OK or
Z_BUF_ERROR - that means unexpected end-of-file. Added
test-zlib-truncated.js for the case of truncated input. Fixed the zlib
dictionary test to not end the inflate stream on a truncated output (no
crc) of deflate

Fixes: https://github.com/nodejs/node/issues/2043
PR-URL: https://github.com/nodejs/node/pull/2595
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 src/node_zlib.cc                      |  6 +-
 test/parallel/test-zlib-dictionary.js | 81 ++++++++++++++++-----------
 test/parallel/test-zlib-truncated.js  | 49 ++++++++++++++++
 3 files changed, 102 insertions(+), 34 deletions(-)
 create mode 100644 test/parallel/test-zlib-truncated.js

diff --git a/src/node_zlib.cc b/src/node_zlib.cc
index da60d4430f3042..f7e808cf1b1d82 100644
--- a/src/node_zlib.cc
+++ b/src/node_zlib.cc
@@ -271,8 +271,12 @@ class ZCtx : public AsyncWrap {
     // Acceptable error states depend on the type of zlib stream.
     switch (ctx->err_) {
     case Z_OK:
-    case Z_STREAM_END:
     case Z_BUF_ERROR:
+      if (ctx->strm_.avail_out != 0 && ctx->flush_ == Z_FINISH) {
+        ZCtx::Error(ctx, "unexpected end of file");
+        return false;
+      }
+    case Z_STREAM_END:
       // normal statuses, not fatal
       break;
     case Z_NEED_DICT:
diff --git a/test/parallel/test-zlib-dictionary.js b/test/parallel/test-zlib-dictionary.js
index 109f4273f767d0..7e11b1966c69bf 100644
--- a/test/parallel/test-zlib-dictionary.js
+++ b/test/parallel/test-zlib-dictionary.js
@@ -1,12 +1,12 @@
 'use strict';
 // test compression/decompression with dictionary
 
-var common = require('../common');
-var assert = require('assert');
-var zlib = require('zlib');
-var path = require('path');
+const common = require('../common');
+const assert = require('assert');
+const zlib = require('zlib');
+const path = require('path');
 
-var spdyDict = new Buffer([
+const spdyDict = new Buffer([
   'optionsgetheadpostputdeletetraceacceptaccept-charsetaccept-encodingaccept-',
   'languageauthorizationexpectfromhostif-modified-sinceif-matchif-none-matchi',
   'f-rangeif-unmodifiedsincemax-forwardsproxy-authorizationrangerefererteuser',
@@ -22,54 +22,69 @@ var spdyDict = new Buffer([
   '.1statusversionurl\0'
 ].join(''));
 
-var deflate = zlib.createDeflate({ dictionary: spdyDict });
-
-var input = [
+const input = [
   'HTTP/1.1 200 Ok',
   'Server: node.js',
   'Content-Length: 0',
   ''
 ].join('\r\n');
 
-var called = 0;
-
-//
-// We'll use clean-new inflate stream each time
-// and .reset() old dirty deflate one
-//
-function run(num) {
-  var inflate = zlib.createInflate({ dictionary: spdyDict });
-
-  if (num === 2) {
-    deflate.reset();
-    deflate.removeAllListeners('data');
-  }
+function basicDictionaryTest() {
+  let output = '';
+  const deflate = zlib.createDeflate({ dictionary: spdyDict });
+  const inflate = zlib.createInflate({ dictionary: spdyDict });
 
-  // Put data into deflate stream
   deflate.on('data', function(chunk) {
     inflate.write(chunk);
   });
 
-  // Get data from inflate stream
-  var output = [];
   inflate.on('data', function(chunk) {
-    output.push(chunk);
+    output += chunk;
+  });
+
+  deflate.on('end', function() {
+    inflate.end();
   });
+
   inflate.on('end', function() {
-    called++;
+    assert.equal(input, output);
+  });
+
+  deflate.write(input);
+  deflate.end();
+}
 
-    assert.equal(output.join(''), input);
+function deflateResetDictionaryTest() {
+  let doneReset = false;
+  let output = '';
+  const deflate = zlib.createDeflate({ dictionary: spdyDict });
+  const inflate = zlib.createInflate({ dictionary: spdyDict });
 
-    if (num < 2) run(num + 1);
+  deflate.on('data', function(chunk) {
+    if (doneReset)
+      inflate.write(chunk);
+  });
+
+  inflate.on('data', function(chunk) {
+    output += chunk;
+  });
+
+  deflate.on('end', function() {
+    inflate.end();
+  });
+
+  inflate.on('end', function() {
+    assert.equal(input, output);
   });
 
   deflate.write(input);
   deflate.flush(function() {
-    inflate.end();
+    deflate.reset();
+    doneReset = true;
+    deflate.write(input);
+    deflate.end();
   });
 }
-run(1);
 
-process.on('exit', function() {
-  assert.equal(called, 2);
-});
+basicDictionaryTest();
+deflateResetDictionaryTest();
diff --git a/test/parallel/test-zlib-truncated.js b/test/parallel/test-zlib-truncated.js
new file mode 100644
index 00000000000000..9a716f8d0b2110
--- /dev/null
+++ b/test/parallel/test-zlib-truncated.js
@@ -0,0 +1,49 @@
+'use strict';
+// tests zlib streams with truncated compressed input
+
+const common = require('../common');
+const assert = require('assert');
+const zlib = require ('zlib');
+
+const inputString = 'ΩΩLorem ipsum dolor sit amet, consectetur adipiscing el' +
+  'it. Morbi faucibus, purus at gravida dictum, libero arcu convallis la' +
+  'cus, in commodo libero metus eu nisi. Nullam commodo, neque nec porta' +
+  ' placerat, nisi est fermentum augue, vitae gravida tellus sapien sit ' +
+  'amet tellus. Aenean non diam orci. Proin quis elit turpis. Suspendiss' +
+  'e non diam ipsum. Suspendisse nec ullamcorper odio. Vestibulum arcu m' +
+  'i, sodales non suscipit id, ultrices ut massa. Sed ac sem sit amet ar' +
+  'cu malesuada fermentum. Nunc sed. ';
+
+[
+  { comp: 'gzip', decomp: 'gunzip', decompSync: 'gunzipSync' },
+  { comp: 'gzip', decomp: 'unzip', decompSync: 'unzipSync' },
+  { comp: 'deflate', decomp: 'inflate', decompSync: 'inflateSync' },
+  { comp: 'deflateRaw', decomp: 'inflateRaw', decompSync: 'inflateRawSync' }
+].forEach(function(methods) {
+  zlib[methods.comp](inputString, function(err, compressed) {
+    assert(!err);
+    let truncated = compressed.slice(0, compressed.length / 2);
+
+    // sync sanity
+    assert.doesNotThrow(function() {
+      let decompressed = zlib[methods.decompSync](compressed);
+      assert.equal(decompressed, inputString);
+    });
+
+    // async sanity
+    zlib[methods.decomp](compressed, function(err, result) {
+      assert.ifError(err);
+      assert.equal(result, inputString);
+    });
+
+    // sync truncated input test
+    assert.throws(function() {
+      zlib[methods.decompSync](truncated);
+    }, /unexpected end of file/);
+
+    // async truncated input test
+    zlib[methods.decomp](truncated, function(err, result) {
+      assert(/unexpected end of file/.test(err.message));
+    });
+  });
+});

From 28e9a4f41bc7f26e2e440543c36eaf8bcb257f44 Mon Sep 17 00:00:00 2001
From: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Date: Mon, 19 Oct 2015 11:57:55 -0400
Subject: [PATCH 014/323] test: repl-persistent-history is no longer flaky
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The race conditions were fixed in
286ef1daca1c1f3e3363ee162fb97fb823632352

PR-URL: https://github.com/nodejs/node/pull/3437
Reviewed By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
---
 test/sequential/sequential.status | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/sequential/sequential.status b/test/sequential/sequential.status
index e7f0ca2b323992..7d5e6f1c1e624f 100644
--- a/test/sequential/sequential.status
+++ b/test/sequential/sequential.status
@@ -5,7 +5,6 @@ prefix sequential
 # sample-test                       : PASS,FLAKY
 
 [true] # This section applies to all platforms
-test-repl-persistent-history                    : PASS,FLAKY
 
 [$system==win32]
 

From b36b4f385a818545ce6ea09dfd5bee3abd095950 Mon Sep 17 00:00:00 2001
From: "P.S.V.R" <pmq2001@gmail.com>
Date: Thu, 15 Oct 2015 16:38:46 +0800
Subject: [PATCH 015/323] build: rectify --link-module help text

PR-URL: https://github.com/nodejs/node/pull/3379
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index b4936f148a2b9c..d4aff36268ed93 100755
--- a/configure
+++ b/configure
@@ -90,7 +90,8 @@ parser.add_option("--link-module",
     action="append",
     dest="linked_module",
     help="Path to a JS file to be bundled in the binary as a builtin."
-         "This module will be referenced by basename without extension."
+         "This module will be referenced by path without extension."
+         "e.g. /root/x/y.js will be referenced via require('root/x/y')."
          "Can be used multiple times")
 
 parser.add_option("--openssl-no-asm",

From f78c8e74260d4674021aefd903315fc646be2cb9 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 16 Oct 2015 21:07:21 -0700
Subject: [PATCH 016/323] test: fix flaky test for symlinks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the symlink portion of the test was being skipped due to a
combination of OS support and user privileges, then an assertion would
always fail. This fixes that problem, improves assertion error reporting
and splits the test to make it clear that it is a test for links and
symlinks.

Fixes: https://github.com/nodejs/node/issues/3311
PR-URL: https://github.com/nodejs/node/pull/3418
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
---
 test/parallel/test-fs-link.js    | 20 +++++++
 test/parallel/test-fs-symlink.js | 97 ++++++++++++--------------------
 2 files changed, 55 insertions(+), 62 deletions(-)
 create mode 100644 test/parallel/test-fs-link.js

diff --git a/test/parallel/test-fs-link.js b/test/parallel/test-fs-link.js
new file mode 100644
index 00000000000000..4e95d20f7b6959
--- /dev/null
+++ b/test/parallel/test-fs-link.js
@@ -0,0 +1,20 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const path = require('path');
+const fs = require('fs');
+
+common.refreshTmpDir();
+
+// test creating and reading hard link
+const srcPath = path.join(common.fixturesDir, 'cycles', 'root.js');
+const dstPath = path.join(common.tmpDir, 'link1.js');
+
+const callback = function(err) {
+  if (err) throw err;
+  const srcContent = fs.readFileSync(srcPath, 'utf8');
+  const dstContent = fs.readFileSync(dstPath, 'utf8');
+  assert.strictEqual(srcContent, dstContent);
+};
+
+fs.link(srcPath, dstPath, common.mustCall(callback));
diff --git a/test/parallel/test-fs-symlink.js b/test/parallel/test-fs-symlink.js
index 199add4a1ba724..b506013b0a23f5 100644
--- a/test/parallel/test-fs-symlink.js
+++ b/test/parallel/test-fs-symlink.js
@@ -1,77 +1,50 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
-var path = require('path');
-var fs = require('fs');
-var exec = require('child_process').exec;
-var completed = 0;
-var expected_async = 4;
+const common = require('../common');
+const assert = require('assert');
+const path = require('path');
+const fs = require('fs');
+const exec = require('child_process').exec;
+
 var linkTime;
 var fileTime;
 
-common.refreshTmpDir();
-
-var runtest = function(skip_symlinks) {
-  if (!skip_symlinks) {
-    // test creating and reading symbolic link
-    var linkData = path.join(common.fixturesDir, '/cycles/root.js');
-    var linkPath = path.join(common.tmpDir, 'symlink1.js');
-
-    fs.symlink(linkData, linkPath, function(err) {
-      if (err) throw err;
-      console.log('symlink done');
-
-      fs.lstat(linkPath, function(err, stats) {
-        if (err) throw err;
-        linkTime = stats.mtime.getTime();
-        completed++;
-      });
-
-      fs.stat(linkPath, function(err, stats) {
-        if (err) throw err;
-        fileTime = stats.mtime.getTime();
-        completed++;
-      });
-
-      fs.readlink(linkPath, function(err, destination) {
-        if (err) throw err;
-        assert.equal(destination, linkData);
-        completed++;
-      });
-    });
-  }
-
-  // test creating and reading hard link
-  var srcPath = path.join(common.fixturesDir, 'cycles', 'root.js');
-  var dstPath = path.join(common.tmpDir, 'link1.js');
-
-  fs.link(srcPath, dstPath, function(err) {
-    if (err) throw err;
-    console.log('hard link done');
-    var srcContent = fs.readFileSync(srcPath, 'utf8');
-    var dstContent = fs.readFileSync(dstPath, 'utf8');
-    assert.equal(srcContent, dstContent);
-    completed++;
-  });
-};
-
 if (common.isWindows) {
   // On Windows, creating symlinks requires admin privileges.
   // We'll only try to run symlink test if we have enough privileges.
   exec('whoami /priv', function(err, o) {
     if (err || o.indexOf('SeCreateSymbolicLinkPrivilege') == -1) {
-      expected_async = 1;
-      runtest(true);
-    } else {
-      runtest(false);
+      console.log('1..0 # Skipped: insufficient privileges');
+      return;
     }
   });
-} else {
-  runtest(false);
 }
 
-process.on('exit', function() {
-  assert.equal(completed, expected_async);
-  assert(linkTime !== fileTime);
+common.refreshTmpDir();
+
+// test creating and reading symbolic link
+const linkData = path.join(common.fixturesDir, '/cycles/root.js');
+const linkPath = path.join(common.tmpDir, 'symlink1.js');
+
+fs.symlink(linkData, linkPath, function(err) {
+  if (err) throw err;
+
+  fs.lstat(linkPath, common.mustCall(function(err, stats) {
+    if (err) throw err;
+    linkTime = stats.mtime.getTime();
+  }));
+
+  fs.stat(linkPath, common.mustCall(function(err, stats) {
+    if (err) throw err;
+    fileTime = stats.mtime.getTime();
+  }));
+
+  fs.readlink(linkPath, common.mustCall(function(err, destination) {
+    if (err) throw err;
+    assert.equal(destination, linkData);
+  }));
 });
 
+
+process.on('exit', function() {
+  assert.notStrictEqual(linkTime, fileTime);
+});

From b483afcb2074c3c52635011f673c832446d23f73 Mon Sep 17 00:00:00 2001
From: Trevor Norris <trev.norris@gmail.com>
Date: Mon, 19 Oct 2015 14:06:51 -0600
Subject: [PATCH 017/323] doc: binary encoding is not deprecated

When v8 implemented proper one-byte string support Node's internal
"binary" encoding implementation was removed in favor of it. The result
was that "binary" encoding effectively became "latin-1" encoding.
Because of this and because one-byte strings are natively supported by
v8 the buffer encoding is not deprecated and will not be removed.

Ref: 83261e7 "deps: update v8 to 3.17.13"
PR-URL: https://github.com/nodejs/node/pull/3441
Reviewed-By: Ben Noordhuis <ben@strongloop.com>
---
 doc/api/buffer.markdown | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/doc/api/buffer.markdown b/doc/api/buffer.markdown
index 22faef5563cb06..0f3a2ff2f72c4d 100644
--- a/doc/api/buffer.markdown
+++ b/doc/api/buffer.markdown
@@ -30,10 +30,9 @@ encoding method.  Here are the different string encodings.
 
 * `'base64'` - Base64 string encoding.
 
-* `'binary'` - A way of encoding raw binary data into strings by using only
-  the first 8 bits of each character. This encoding method is deprecated and
-  should be avoided in favor of `Buffer` objects where possible. This encoding
-  will be removed in future versions of Node.js.
+* `'binary'` - A way of encoding the buffer into a one-byte (i.e. `latin-1`)
+  encoded string. The string `'latin-1'` is not supported. Instead simply pass
+  `'binary'` to use `'latin-1'` encoding.
 
 * `'hex'` - Encode each byte as two hexadecimal characters.
 

From 522e3d3cd303fed5353459333cc2f844250c40b1 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Fri, 16 Oct 2015 15:34:15 -0400
Subject: [PATCH 018/323] timers: reuse timer in `setTimeout().unref()`

Instead of creating new timer - reuse the timer from the freelist. This
won't make the freelist timer active for the duration of `uv_close()`,
and will let the event-loop exit properly.

Fix: #1264
PR-URL: https://github.com/nodejs/node/pull/3407
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 lib/timers.js                                 | 29 ++++++++++++++-----
 .../test-timers-unrefed-in-beforeexit.js      | 20 +++++++++++++
 2 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100644 test/parallel/test-timers-unrefed-in-beforeexit.js

diff --git a/lib/timers.js b/lib/timers.js
index 50ae477d59d30f..b75b7ccfc0a85d 100644
--- a/lib/timers.js
+++ b/lib/timers.js
@@ -119,16 +119,27 @@ function listOnTimeoutNT(list) {
 }
 
 
-const unenroll = exports.unenroll = function(item) {
+function reuse(item) {
   L.remove(item);
 
   var list = lists[item._idleTimeout];
-  // if empty then stop the watcher
-  debug('unenroll');
+  // if empty - reuse the watcher
   if (list && L.isEmpty(list)) {
+    debug('reuse hit');
+    list.stop();
+    delete lists[item._idleTimeout];
+    return list;
+  }
+
+  return null;
+}
+
+
+const unenroll = exports.unenroll = function(item) {
+  var list = reuse(item);
+  if (list) {
     debug('unenroll: list empty');
     list.close();
-    delete lists[item._idleTimeout];
   }
   // if active is called later, then we want to make sure not to insert again
   item._idleTimeout = -1;
@@ -312,12 +323,16 @@ Timeout.prototype.unref = function() {
     if (!this._idleStart) this._idleStart = now;
     var delay = this._idleStart + this._idleTimeout - now;
     if (delay < 0) delay = 0;
-    exports.unenroll(this);
 
     // Prevent running cb again when unref() is called during the same cb
-    if (this._called && !this._repeat) return;
+    if (this._called && !this._repeat) {
+      exports.unenroll(this);
+      return;
+    }
+
+    var handle = reuse(this);
 
-    this._handle = new Timer();
+    this._handle = handle || new Timer();
     this._handle.owner = this;
     this._handle[kOnTimeout] = unrefdHandle;
     this._handle.start(delay, 0);
diff --git a/test/parallel/test-timers-unrefed-in-beforeexit.js b/test/parallel/test-timers-unrefed-in-beforeexit.js
new file mode 100644
index 00000000000000..0ac3311816fb4d
--- /dev/null
+++ b/test/parallel/test-timers-unrefed-in-beforeexit.js
@@ -0,0 +1,20 @@
+'use strict';
+
+require('../common');
+const assert = require('assert');
+
+var once = 0;
+
+process.on('beforeExit', () => {
+  if (once > 1)
+    throw new RangeError('beforeExit should only have been called once!');
+
+  setTimeout(() => {}, 1).unref();
+  once++;
+});
+
+process.on('exit', (code) => {
+  if (code !== 0) return;
+
+  assert.strictEqual(once, 1);
+});

From bbbd81eab2bf5214351eea21151043e0c76e7437 Mon Sep 17 00:00:00 2001
From: Junliang Yan <jyan@ca.ibm.ca>
Date: Mon, 19 Oct 2015 15:30:11 -0400
Subject: [PATCH 019/323] test: skip test-dns-ipv6.js if ipv6 is unavailable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test should be skipped if ipv6 is unavailable on the running system.

Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/3444
---
 test/internet/test-dns-ipv6.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/internet/test-dns-ipv6.js b/test/internet/test-dns-ipv6.js
index 27b25f7995e630..5a66f8db783f4b 100644
--- a/test/internet/test-dns-ipv6.js
+++ b/test/internet/test-dns-ipv6.js
@@ -12,6 +12,11 @@ var expected = 0,
     running = false,
     queue = [];
 
+if (!common.hasIPv6) {
+  console.log('1..0 # Skipped: this test, no IPv6 support');
+  return;
+}
+
 function TEST(f) {
   function next() {
     var f = queue.shift();

From 47b06f6bb1abb7171ec60d13df5358b22b76d524 Mon Sep 17 00:00:00 2001
From: fansworld-claudio <cr@fansworld.tv>
Date: Mon, 19 Oct 2015 16:10:18 -0300
Subject: [PATCH 020/323] docs: add missing shell option to execSync

Adds the "shell" option from child_process.exec to
child_process.execSync on the api docs.

Fixes: #3387
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/3440
---
 doc/api/child_process.markdown | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/api/child_process.markdown b/doc/api/child_process.markdown
index ebbc8f4df2c6c9..908da7a656b10f 100644
--- a/doc/api/child_process.markdown
+++ b/doc/api/child_process.markdown
@@ -715,6 +715,10 @@ process has exited.
     - `stderr` by default will be output to the parent process' stderr unless
       `stdio` is specified
   * `env` {Object} Environment key-value pairs
+  * `shell` {String} Shell to execute the command with
+    (Default: '/bin/sh' on UNIX, 'cmd.exe' on Windows,  The shell should
+     understand the `-c` switch on UNIX or `/s /c` on Windows. On Windows,
+     command line parsing should be compatible with `cmd.exe`.)
   * `uid` {Number} Sets the user identity of the process. (See setuid(2).)
   * `gid` {Number} Sets the group identity of the process. (See setgid(2).)
   * `timeout` {Number} In milliseconds the maximum amount of time the process is allowed to run. (Default: undefined)

From eef0f0cd6349994556a8096bd02363b380d896d8 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 17 Oct 2015 18:52:15 -0700
Subject: [PATCH 021/323] test: remove flaky status from eval_messages test

This test has not failed on armv7-wheezy in over 6 weeks. Let's remove its
"flaky" status.

Fixes: https://github.com/nodejs/node/issues/2672
Reviewed-By: Rod Vagg <r@va.gg>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/3420
---
 test/message/message.status | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/message/message.status b/test/message/message.status
index 67c6de53424872..1a4a0e3adc2727 100644
--- a/test/message/message.status
+++ b/test/message/message.status
@@ -9,7 +9,6 @@ prefix message
 [$system==win32]
 
 [$system==linux]
-eval_messages                      : PASS,FLAKY
 
 [$system==macos]
 

From d0b8c5d3a4f9d5d2561e7cc7bb6729778ad0bc62 Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Wed, 14 Oct 2015 22:51:47 +1100
Subject: [PATCH 022/323] doc: add TSC meeting minutes 2015-10-07

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/3364
---
 doc/tsc-meetings/2015-10-07.md | 102 +++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 doc/tsc-meetings/2015-10-07.md

diff --git a/doc/tsc-meetings/2015-10-07.md b/doc/tsc-meetings/2015-10-07.md
new file mode 100644
index 00000000000000..6cb8813a5cac02
--- /dev/null
+++ b/doc/tsc-meetings/2015-10-07.md
@@ -0,0 +1,102 @@
+# Node Foundation TSC Meeting 2015-10-07
+
+## Links
+
+* **Audio Recording**: https://soundcloud.com/node-foundation/tsc-meeting-2015-10-07
+* **GitHub Issue**: https://github.com/nodejs/node/issues/3126
+* **Minutes Google Doc**: https://docs.google.com/document/d/1LIrTCdTUjKtb_GGecrJ3Es0rPOpVdpkV5kefJ_p5FGU
+* _Previous Minutes Google Doc: <https://docs.google.com/document/d/1RkLAWTIrhD3BTB2rs9_FahWI0C7lt9F8xnQXaueJPIE>_
+
+## Present
+
+* Rod Vagg (TSC)
+* Brian White (TSC)
+* Steven Loomis (observer)
+* Trevor Norris (TSC)
+* Shigeki Ohtsu (TSC)
+* Ben Noordhuis (TSC)
+* Mikeal Rogers (observer)
+* Michael Dawson (observer)
+* Seth Thompson (observer)
+* Jeremiah Senkpiel (TSC)
+
+## Agenda
+
+Extracted from **tsc-agenda** labelled issues and pull requests in the nodejs org prior to meeting.
+
+### nodejs/node
+
+* WG: Considering a new HTTP WG [#3214](https://github.com/nodejs/node/issues/3214)
+* lib,test: deprecate _linklist [#3078](https://github.com/nodejs/node/pull/3078)
+* Discussion: LTS & v5 release planning [#3000](https://github.com/nodejs/node/issues/3000)
+* Compiling node v4.0.0 with OpenSSL 1.0.1 fails [#2783](https://github.com/nodejs/node/issues/2783)
+* Inspecting Node.js with Chrome DevTools [#2546](https://github.com/nodejs/node/issues/2546)
+
+### nodejs/TSC
+
+* Umbrella Program [#2](https://github.com/nodejs/TSC/pull/2)
+
+## Minutes
+
+### Standup
+
+* Rod Vagg: 4.1.2 release, security procedures surrounding that
+* Brian White: Working on javascript dns resolver, regular PR + Issue work.
+* Steven Loomis: Working on ICU 56 Release. TC 39 & emca spec work for Intl WG. Working on Intl build issues.
+* Trevor Norris: Focused on fixing async_wrap, writing tests and preparing for it to become more official
+* Shigeki Ohtsu: No works for node project, I spent all time to my internal works.
+* Ben Noordhuis: Nothing to report—the usual
+* Mikeal Rogers: Looking into stalled Wgs and seeing how to help out. Working on the umbrella program. Lots of conference things.
+* Michael Dawson: Added a benchmarking machine to the CI, working on some tests issues. Working on PPC for the CI.
+* Seth Thompson: Working on v8 4.7, scheduled soon
+* Jeremiah Senkpiel: vacation, some issue catch-up
+
+### Review of previous meeting
+
+* Discussion: LTS & v5 release planning [#3000](https://github.com/nodejs/node/issues/3000)
+* Inspecting Node.js with Chrome DevTools [#2546](https://github.com/nodejs/node/issues/2546)
+* Umbrella Program [#2](https://github.com/nodejs/TSC/pull/2)
+* renaming of “language groups” from iojs-\* to nodejs-\* [#2525](https://github.com/nodejs/node/issues/2525)
+
+
+### WG: Considering a new HTTP WG [#3214](https://github.com/nodejs/node/issues/3214)
+
+* Discussed the HTTP WG based on James’ comments @ https://github.com/nodejs/node/issues/3234#issuecomment-146293038
+* Generally positive, only concerns are regarding decision making power—TSC may not want to hand that off as this is not quite like Streams (in that few people grok the code!) and there are philosophical questions to be resolved about HTTP that the TSC should be involved in.
+
+### lib,test: deprecate _linklist [#3078](https://github.com/nodejs/node/pull/3078)
+
+* Userland modules exist that could be used instead
+* Ben suggested straight removal, Jeramiah raised the matter of process that we have committed to adding a warning before removal, so we could remove in v6 but probably shouldn’t in v5
+* No disagreement with moving forward for deprecation
+
+### Discussion: LTS & v5 release planning [#3000](https://github.com/nodejs/node/issues/3000)
+
+* Recap of the latest LTS meeting [LTS#43](https://github.com/nodejs/LTS/issues/43)
+* Aim to have LTS / v4.2.0 out tomorrow, backup date of Monday if we miss that. LTS starts then for v4.x, v5.x has to wait until V8 4.6 to be stable mid to late October.
+
+### Compiling node v4.0.0 with OpenSSL 1.0.1 fails [#2783](https://github.com/nodejs/node/issues/2783)
+
+* Shigeki, Ben: It would be quite hard to support 1.0.1 since we are using 1.0.2 APIs.
+
+* Discussion on the possible difficulty of using 1.0.2 on varied Linux distros
+
+* ubuntu wily (not released) seems to use 1.0.2 - work has been done to package.  1.0.2 is only in Wily - https://launchpad.net/ubuntu/+source/openssl/1.0.2d-0ubuntu1 - https://answers.launchpad.net/ubuntu/+source/openssl/+question/263725 - “My guess is that we will see openssl 1.0.2 from Ubuntu 15.10 onwards (or eventually only starting with 16.04)”
+
+* Concern that allowing 1.0.1 would result in a substandard (insecure?) & untested binary.
+
+* Some discussion about the fact that we don’t test building with shared / static dependencies
+
+* feedback to issue: No appetite to do the work from the TSC, maybe someone could do it but we wouldn’t support.
+
+### Inspecting Node.js with Chrome DevTools [#2546](https://github.com/nodejs/node/issues/2546)
+
+_skipped discussion_
+
+### Umbrella Program [#2](https://github.com/nodejs/TSC/pull/2)
+
+_skipped discussion_
+
+## Next Meeting
+
+October 14th, 2015

From c64af7d99ebd478348b006262adcf581806fdc07 Mon Sep 17 00:00:00 2001
From: Yuval Brik <yuval@brik.org.il>
Date: Sun, 30 Aug 2015 00:27:14 +0300
Subject: [PATCH 023/323] tls: TLSSocket options default isServer false

Upon creating a TLSSocket object, set the default isServer option to false
Updated tls docs and added test-tls-socket-default-options

PR-URL: https://github.com/nodejs/node/pull/2614
Reviewed-By: Fedor Indutny <fedor@indutny.com>
---
 doc/api/tls.markdown                          |  7 ++-
 lib/_tls_wrap.js                              |  7 ++-
 .../test-tls-socket-default-options.js        | 56 +++++++++++++++++++
 3 files changed, 65 insertions(+), 5 deletions(-)
 create mode 100644 test/parallel/test-tls-socket-default-options.js

diff --git a/doc/api/tls.markdown b/doc/api/tls.markdown
index e846869e67d0be..4907c65328cab0 100644
--- a/doc/api/tls.markdown
+++ b/doc/api/tls.markdown
@@ -454,18 +454,19 @@ Or
 Wrapper for instance of [net.Socket][], replaces internal socket read/write
 routines to perform transparent encryption/decryption of incoming/outgoing data.
 
-## new tls.TLSSocket(socket, options)
+## new tls.TLSSocket(socket[, options])
 
 Construct a new TLSSocket object from existing TCP socket.
 
 `socket` is an instance of [net.Socket][]
 
-`options` is an object that might contain following properties:
+`options` is an optional object that might contain following properties:
 
   - `secureContext`: An optional TLS context object from
      `tls.createSecureContext( ... )`
 
-  - `isServer`: If true - TLS socket will be instantiated in server-mode
+  - `isServer`: If `true` - TLS socket will be instantiated in server-mode.
+    Default: `false`
 
   - `server`: An optional [net.Server][] instance
 
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
index 6a1c295ce31034..f0273471772137 100644
--- a/lib/_tls_wrap.js
+++ b/lib/_tls_wrap.js
@@ -228,7 +228,10 @@ function initRead(tls, wrapped) {
  */
 
 function TLSSocket(socket, options) {
-  this._tlsOptions = options;
+  if (options === undefined)
+    this._tlsOptions = {};
+  else
+    this._tlsOptions = options;
   this._secureEstablished = false;
   this._securePending = false;
   this._newSessionPending = false;
@@ -321,7 +324,7 @@ TLSSocket.prototype._wrapHandle = function(wrap) {
                 tls.createSecureContext();
   res = tls_wrap.wrap(handle._externalStream,
                       context.context,
-                      options.isServer);
+                      !!options.isServer);
   res._parent = handle;
   res._parentWrap = wrap;
   res._secureContext = context;
diff --git a/test/parallel/test-tls-socket-default-options.js b/test/parallel/test-tls-socket-default-options.js
new file mode 100644
index 00000000000000..3af03a0ba9269a
--- /dev/null
+++ b/test/parallel/test-tls-socket-default-options.js
@@ -0,0 +1,56 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
+  return;
+}
+const tls = require('tls');
+
+const fs = require('fs');
+const net = require('net');
+
+const sent = 'hello world';
+
+const serverOptions = {
+  isServer: true,
+  key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
+  cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
+};
+
+function testSocketOptions(socket, socketOptions) {
+  let received = '';
+  const server = tls.createServer(serverOptions, function(s) {
+    s.on('data', function(chunk) {
+      received += chunk;
+    });
+
+    s.on('end', function() {
+      server.close();
+      s.destroy();
+      assert.equal(received, sent);
+      setImmediate(runTests);
+    });
+  }).listen(common.PORT, function() {
+    let c = new tls.TLSSocket(socket, socketOptions);
+    c.connect(common.PORT, function() {
+      c.end(sent);
+    });
+  });
+
+}
+
+const testArgs = [
+  [],
+  [undefined, {}]
+];
+
+let n = 0;
+function runTests() {
+  if (n++ < testArgs.length) {
+    testSocketOptions.apply(null, testArgs[n]);
+  }
+}
+
+runTests();

From d5ce53458e50f6bb549a2cfc7c84181815cf4a81 Mon Sep 17 00:00:00 2001
From: Glen Keane <glenkeane.94@gmail.com>
Date: Thu, 15 Oct 2015 21:37:17 +0100
Subject: [PATCH 024/323] lttng: update flags for gc tracing

PR-URL: https://github.com/nodejs/node/pull/3388
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 src/node_lttng_provider.h | 60 ++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/node_lttng_provider.h b/src/node_lttng_provider.h
index 22dd935a95f464..2b5b9be8d39535 100644
--- a/src/node_lttng_provider.h
+++ b/src/node_lttng_provider.h
@@ -7,6 +7,17 @@
 
 namespace node {
 
+#define FOR_ALL_GC_TYPES(APPLY) \
+  APPLY(kGCTypeScavenge) \
+  APPLY(kGCTypeMarkSweepCompact) \
+  APPLY(kGCTypeAll)
+
+#define FOR_ALL_GC_CALLBACK_FLAGS(APPLY) \
+  APPLY(kNoGCCallbackFlags) \
+  APPLY(kGCCallbackFlagConstructRetainedObjectInfos) \
+  APPLY(kGCCallbackFlagForced) \
+  APPLY(kGCCallbackFlagSynchronousPhantomCallbackProcessing)
+
 void NODE_HTTP_SERVER_REQUEST(node_lttng_http_server_request_t* req,
                               node_lttng_connection_t* conn,
                               const char *remote, int port,
@@ -48,42 +59,33 @@ void NODE_NET_STREAM_END(node_lttng_connection_t* conn,
 void NODE_GC_START(v8::GCType type,
                    v8::GCCallbackFlags flags,
                    v8::Isolate* isolate) {
-  const char* typeStr = "";
-  const char* flagsStr = "";
-  if (type == v8::GCType::kGCTypeScavenge) {
-    typeStr = "kGCTypeScavenge";
-  } else if (type == v8::GCType::kGCTypeMarkSweepCompact) {
-    typeStr = "kGCTypeMarkSweepCompact";
-  } else if (type == v8::GCType::kGCTypeAll) {
-    typeStr = "kGCTypeAll";
-  }
-  if (flags == v8::GCCallbackFlags::kNoGCCallbackFlags) {
-    flagsStr = "kNoGCCallbackFlags";
-  } else if (flags == v8::GCCallbackFlags::kGCCallbackFlagCompacted) {
-    flagsStr = "kGCCallbackFlagCompacted";
-  }
+  const char* typeStr = "Unkown GC Type";
+  const char* flagsStr = "Unknown GC Flag";
+
+#define BUILD_IF(f) if (type == v8::GCType::f) { typeStr = #f; }
+  FOR_ALL_GC_TYPES(BUILD_IF);
+#undef BUILD_IF
+
+#define BUILD_IF(f) if (flags == v8::GCCallbackFlags::f) { flagsStr = #f; }
+  FOR_ALL_GC_CALLBACK_FLAGS(BUILD_IF);
+#undef BUILD_IF
 
   tracepoint(node, gc_start, typeStr, flagsStr);
 }
 
-
 void NODE_GC_DONE(v8::GCType type,
                   v8::GCCallbackFlags flags,
                   v8::Isolate* isolate) {
-  const char* typeStr = "";
-  const char* flagsStr = "";
-  if (type == v8::GCType::kGCTypeScavenge) {
-    typeStr = "kGCTypeScavenge";
-  } else if (type == v8::GCType::kGCTypeMarkSweepCompact) {
-    typeStr = "kGCTypeMarkSweepCompact";
-  } else if (type == v8::GCType::kGCTypeAll) {
-    typeStr = "kGCTypeAll";
-  }
-  if (flags == v8::GCCallbackFlags::kNoGCCallbackFlags) {
-    flagsStr = "kNoGCCallbackFlags";
-  } else if (flags == v8::GCCallbackFlags::kGCCallbackFlagCompacted) {
-    flagsStr = "kGCCallbackFlagCompacted";
-  }
+  const char* typeStr = "Unkown GC Type";
+  const char* flagsStr = "Unknown GC Flag";
+
+#define BUILD_IF(f) if (type == v8::GCType::f) { typeStr = #f; }
+  FOR_ALL_GC_TYPES(BUILD_IF);
+#undef BUILD_IF
+
+#define BUILD_IF(f) if (flags == v8::GCCallbackFlags::f) { flagsStr = #f; }
+  FOR_ALL_GC_CALLBACK_FLAGS(BUILD_IF);
+#undef BUILD_IF
 
   tracepoint(node, gc_done, typeStr, flagsStr);
 }

From 6936468de2bb9da5362bb10a206277c67e254040 Mon Sep 17 00:00:00 2001
From: Ido Ben-Yair <idoby@wix.com>
Date: Wed, 7 Oct 2015 18:59:15 +0300
Subject: [PATCH 025/323] vm: remove Watchdog dependency on Environment

Remove the Watchdog class' dependency on Environment.
No functional changes, only code cleanup.

PR-URL: https://github.com/nodejs/node/pull/3274
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 src/node_contextify.cc | 2 +-
 src/node_watchdog.cc   | 9 ++++-----
 src/node_watchdog.h    | 8 +++-----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/node_contextify.cc b/src/node_contextify.cc
index 8880439c8a7e3f..df328f265ebf6e 100644
--- a/src/node_contextify.cc
+++ b/src/node_contextify.cc
@@ -693,7 +693,7 @@ class ContextifyScript : public BaseObject {
 
     Local<Value> result;
     if (timeout != -1) {
-      Watchdog wd(env, timeout);
+      Watchdog wd(env->isolate(), timeout);
       result = script->Run();
     } else {
       result = script->Run();
diff --git a/src/node_watchdog.cc b/src/node_watchdog.cc
index 2811ab06ed3abf..77f93678fb88ff 100644
--- a/src/node_watchdog.cc
+++ b/src/node_watchdog.cc
@@ -1,15 +1,14 @@
 #include "node_watchdog.h"
-#include "env.h"
-#include "env-inl.h"
 #include "util.h"
+#include "util-inl.h"
 
 namespace node {
 
 using v8::V8;
 
 
-Watchdog::Watchdog(Environment* env, uint64_t ms) : env_(env),
-                                                    destroyed_(false) {
+Watchdog::Watchdog(v8::Isolate* isolate, uint64_t ms) : isolate_(isolate),
+                                                        destroyed_(false) {
   int rc;
   loop_ = new uv_loop_t;
   CHECK(loop_);
@@ -84,7 +83,7 @@ void Watchdog::Async(uv_async_t* async) {
 void Watchdog::Timer(uv_timer_t* timer) {
   Watchdog* w = ContainerOf(&Watchdog::timer_, timer);
   uv_stop(w->loop_);
-  V8::TerminateExecution(w->env()->isolate());
+  V8::TerminateExecution(w->isolate());
 }
 
 
diff --git a/src/node_watchdog.h b/src/node_watchdog.h
index 887404eb11fdda..ead31ce66df862 100644
--- a/src/node_watchdog.h
+++ b/src/node_watchdog.h
@@ -4,18 +4,16 @@
 #include "v8.h"
 #include "uv.h"
 
-#include "env.h"
-
 namespace node {
 
 class Watchdog {
  public:
-  explicit Watchdog(Environment* env, uint64_t ms);
+  explicit Watchdog(v8::Isolate* isolate, uint64_t ms);
   ~Watchdog();
 
   void Dispose();
 
-  inline Environment* env() const { return env_; }
+  v8::Isolate* isolate() { return isolate_; }
 
  private:
   void Destroy();
@@ -24,7 +22,7 @@ class Watchdog {
   static void Async(uv_async_t* async);
   static void Timer(uv_timer_t* timer);
 
-  Environment* env_;
+  v8::Isolate* isolate_;
   uv_thread_t thread_;
   uv_loop_t* loop_;
   uv_async_t async_;

From 04fb14cc35ef27e4d1192e2a3abeb9f30452e99c Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sun, 18 Oct 2015 14:42:44 -0700
Subject: [PATCH 026/323] test: fix flaky test-child-process-emfile

Require the test setup to obtain an EMFILE error and not ENFILE as
ENFILE means there is a race condition with other processes that may
close files before `spawn()` is called by the test.

Fixes: https://github.com/nodejs/node/issues/2666
PR-URL: https://github.com/nodejs/node/pull/3430
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/sequential/test-child-process-emfile.js | 32 +++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/test/sequential/test-child-process-emfile.js b/test/sequential/test-child-process-emfile.js
index ae7964d9e7a7d6..2ac0b6c0b23a73 100644
--- a/test/sequential/test-child-process-emfile.js
+++ b/test/sequential/test-child-process-emfile.js
@@ -1,30 +1,46 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
-var spawn = require('child_process').spawn;
-var fs = require('fs');
+const common = require('../common');
+const assert = require('assert');
+const child_process = require('child_process');
+const fs = require('fs');
 
 if (common.isWindows) {
   console.log('1..0 # Skipped: no RLIMIT_NOFILE on Windows');
   return;
 }
 
-var openFds = [];
+const ulimit = Number(child_process.execSync('ulimit -Hn'));
+if (ulimit > 64 || Number.isNaN(ulimit)) {
+  // Sorry about this nonsense. It can be replaced if
+  // https://github.com/nodejs/node-v0.x-archive/pull/2143#issuecomment-2847886
+  // ever happens.
+  const result = child_process.spawnSync(
+    '/bin/sh',
+    ['-c', `ulimit -n 64 && '${process.execPath}' '${__filename}'`]
+  );
+  assert.strictEqual(result.stdout.toString(), '');
+  assert.strictEqual(result.stderr.toString(), '');
+  assert.strictEqual(result.status, 0);
+  assert.strictEqual(result.error, undefined);
+  return;
+}
+
+const openFds = [];
 
 for (;;) {
   try {
     openFds.push(fs.openSync(__filename, 'r'));
   } catch (err) {
-    assert(err.code === 'EMFILE' || err.code === 'ENFILE');
+    assert(err.code === 'EMFILE');
     break;
   }
 }
 
 // Should emit an error, not throw.
-var proc = spawn(process.execPath, ['-e', '0']);
+const proc = child_process.spawn(process.execPath, ['-e', '0']);
 
 proc.on('error', common.mustCall(function(err) {
-  assert(err.code === 'EMFILE' || err.code === 'ENFILE');
+  assert.strictEqual(err.code, 'EMFILE');
 }));
 
 proc.on('exit', function() {

From c658de2f99f83f3aa0d9cc6747beb98cac15c268 Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Wed, 7 Oct 2015 22:18:56 +1100
Subject: [PATCH 027/323] doc: add TSC meeting minutes 2015-09-30

PR-URL: https://github.com/nodejs/node/pull/3235
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
---
 doc/tsc-meetings/2015-09-30.md | 161 +++++++++++++++++++++++++++++++++
 1 file changed, 161 insertions(+)
 create mode 100644 doc/tsc-meetings/2015-09-30.md

diff --git a/doc/tsc-meetings/2015-09-30.md b/doc/tsc-meetings/2015-09-30.md
new file mode 100644
index 00000000000000..0b2b2c8f32e6d8
--- /dev/null
+++ b/doc/tsc-meetings/2015-09-30.md
@@ -0,0 +1,161 @@
+# Node Foundation TSC Meeting 2015-09-30
+
+## Links
+
+* **Audio Recording**: https://soundcloud.com/node-foundation/tsc-meeting-2015-09-30
+* **GitHub Issue**: https://github.com/nodejs/node/issues/3126
+* **Minutes Google Doc**: https://docs.google.com/document/d/1RkLAWTIrhD3BTB2rs9_FahWI0C7lt9F8xnQXaueJPIE
+* _Previous Minutes Google Doc: <https://docs.google.com/document/d/1RCR2pGOc2d80NNusaX5DZaktWvHEsDUqfEZP-tvexBk>_
+
+## Present
+
+* Rod Vagg (TSC)
+* Brian White (TSC)
+* Chris Dickinson (TSC)
+* James Snell (TSC)
+* Michael Dawson
+* Ben Noordhuis (TSC)
+* Steven R Loomis
+* Bert Belder (TSC)
+* Alexis Campailla (TSC)
+* Domenic Denicola
+* Seth Thompson
+
+## Agenda
+
+Extracted from **tsc-agenda** labelled issues and pull requests in the nodejs org prior to meeting.
+
+### nodejs/node
+
+* Discussion: LTS & v5 release planning [#3000](https://github.com/nodejs/node/issues/3000)
+* Inspecting Node.js with Chrome DevTools [#2546](https://github.com/nodejs/node/issues/2546)
+
+### nodejs/TSC
+
+* Umbrella Program [#2](https://github.com/nodejs/TSC/pull/2)
+
+## Minutes
+
+### Standup
+
+* Rod Vagg (TSC) - Lots! Pass.
+* Brian White (TSC) - DNS PR (querying NSS modules like mDNS works now, continuing work on other getnameinfo/getaddrinfo compat issues)
+* Chris Dickinson (TSC) - Static Analysis
+* James Snell (TSC) - Review of the HTTP module, going in depth with spec compliance 
+* Michael Dawson - AIX, contributing changes from IBM repos, node-gyp, all related to getting native modules working on AIX, submitted PR to core, benchmarking — bare metal machine for benchmarking group, backporting test fix to 0.12, FIPS-compat work on the test suite, getting hooked into v8 security reporting
+* Ben Noordhuis (TSC) - Review PRs, bug reports, fixed 1-2 bugs, sent a few patches upstream to V8 and gyp, fixed a few bugs in node-gyp.
+* Steven R Loomis - Review PRs, bug reports. Looking into alternatives to packaging full ICU data. Might be able to `npm install` ICU data.
+* Bert Belder (TSC) - 
+* Alexis Campailla (TSC) - working on Node-serialport on Windows in Jenkins, looking into native module build service
+* Domenic Denicola - v8-extras are starting to appear in Chrome, maybe use them in Node for startup performance. 
+
+### Review of previous meeting
+
+* Deprecate Array#values() in 0.12.x [#25877](https://github.com/nodejs/node-v0.x-archive/issues/25877)
+* Deprecate smalloc in v0.12 [#25784](https://github.com/nodejs/node-v0.x-archive/issues/25784)
+* Inspecting Node.js with Chrome DevTools [#2546](https://github.com/nodejs/node/issues/2546)
+* util: Remove p, has been deprecated for years [#2529](https://github.com/nodejs/node/pull/2529)
+
+### Discussion: LTS & v5 release planning [#3000](https://github.com/nodejs/node/issues/3000)
+
+(Chris: apologies, I did a bad job here.)
+
+Ben: Plan is to ship the first LTS release with v8 4.5, not 4.6
+
+Rod: Yes.
+
+Ben: Is there a pressing reason to do so?
+
+Rod: LTS comes off the v4.x branch, we committed to not bump V8 in stable releases.
+
+Ben: It basically means that the first LTS release is going to ship with an outdated release.
+
+James: Yes, we knew this was a strong possibility.
+
+Michael: The model is that we give the community time to catch up. In the future that’s 6 months, so we’re never going to be on a supported version.
+
+Ben: V8 moves quickly. If we stick with 4.5, we’re going to have to manage a bigger delta between our copy and upstream.
+
+James: Yes, this was always going to be the case. We’re committed to supporting the V8 for 36 months.
+
+Ben: Yes, my point is that we could be starting with a smaller delta.
+
+Rod: One of the reasons we had this LTS delay on 4 is to shake out some of these concerns, like the buffer changes. Normally this shakeout will be 6 months, but this time it’s only been a month.
+
+Alexis: Is v5 going to be LTS also?
+
+Rod: We are having discussions about the overlap between v5 and v6, whether there’ll be a strict cutoff or some overlap. No decision yet. That’ll happen in April. It sounds like most folks are leaning towards
+making the two releases (v4 LTS + v5) independent — option 1 [here](https://github.com/nodejs/node/issues/3000#issuecomment-144026295).
+
+Ben: We still haven’t come up with a way to maintain V8 going forward.
+
+James: We do need a good process there, you are absolutely right about that.
+
+Rod: I vote for IBM to hire someone dedicated to this. (Laughter)
+
+Michael: I can’t promise that at this point.
+
+Rod: As the delta increases between versions this becomes more concerning.
+
+James: make sure this is on the LTS WG agenda for next week.
+
+Rod: We tried to tackle this once before, came up with job description but nothing concrete.
+
+Michael: We stopped short of telling the foundation that this is a position that we need to staff.
+
+James: I would agree. We’re at the point where bringing someone in at the foundation level is probably a good idea.
+
+Rod: Noted. OK. We’ve got resolution there.
+
+Michael: James: Make sure it’s on the LTS agenda for going back to the foundation for resources.
+
+Rod: LTS is meeting this Monday (issue 43 on the repo). There’s some discussion around codenames and how to expose LTS info. We’ve committed to first week of October for LTS releases, so timing is going to be a little awkward with 4.1.2 coming out monday. Version 5 will be shipping when we have a stable V8, presumably mid-to-late october (1-3 weeks with no stable release line.)
+
+Rod: We’ll be pulling in semver minor and patch changes, we’ll continue to have bugfix releases for version 4,
+
+### Inspecting Node.js with Chrome DevTools [#2546](https://github.com/nodejs/node/issues/2546)
+
+Rod: Trevor is lead on this, but isn’t present. Does anyone else have any updates?
+
+Ben: Wasn’t the last contentious issue putting WS in core? I think we agreed that if it’s not exposed to user-land, it's fine.
+
+Alexis: (discussion of another WS issue)
+
+Bert: we decided on this
+
+Ben: We agreed that if it was internal, non-exposed to core, 
+
+(Talk about native deps for WS, buffer-util can be )
+
+Ben: if this is a private dependency, we don’t need it to be fast, so we don’t necessarily need the native deps.
+
+Chris: (Hopped into discussion from minute-taking, hence the bad minutes)
+https://github.com/nodejs/node/pull/1202 - add mask/unmask
+https://github.com/nodejs/node/pull/1319 - add utf8 validator
+
+### Umbrella Program [#2](https://github.com/nodejs/TSC/pull/2)
+
+Ben: it’s basically a template for describing projects that are under the umbrella of the node foundation. It doesn’t look that controversial to me.
+
+Rod: it also doesn’t look that complete.
+
+Ben: Indeed. I suggest we discuss next week when mikeal is on the call. Seems like a rubber-stamp LGTM to me.
+
+Rod: We should think about what projects we want to introduce to the organization, including what happens to competition in the ecosystem when we pull in things (like build tools)
+Domenic: This is for things like libuv, yes?
+
+Rod: There are already npm projects knocking on the door. One such project is request. It has its own org right now, but could work under the auspices of the node foundation. However it exists in an ecosystem where there is competition — is it okay for us to bless one project over others? NAN is sort of in the same position, it _could_ have competition. Another example is the npm client possibly. If the foundation were in a position to take npm would we even want it?
+
+### renaming of “language groups” from iojs-\* to nodejs-\* [#2525](https://github.com/nodejs/node/issues/2525)
+
+Steven: Looking for buyoff on this.
+
+Ben: Seen the approach and it looks good.
+
+Rod: You should take this as “you have authority to move ahead”.
+
+Steven: Will do.
+
+### Next Meeting
+
+October 7th

From bf7c3dabb470e83e138b5a75508458edb4d8bd9e Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Fri, 16 Oct 2015 23:10:00 +1100
Subject: [PATCH 028/323] src: bump NODE_MODULE_VERSION To 47

For Node.js v5.0.0, due to upgrade to V8 4.6 which has an incompatible
ABI

PR-URL: https://github.com/nodejs/node/pull/3400
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 src/node_version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node_version.h b/src/node_version.h
index 37dee1e5a8b0fb..58753e3edf320c 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -49,6 +49,6 @@
  * an API is broken in the C++ side, including in v8 or
  * other dependencies.
  */
-#define NODE_MODULE_VERSION 46 /* Node.js v4.0.0 */
+#define NODE_MODULE_VERSION 47 /* Node.js v5.0.0 */
 
 #endif  /* SRC_NODE_VERSION_H_ */

From 1b75d4bda3fba33ba3cf11a03c727a5a8ad9e092 Mon Sep 17 00:00:00 2001
From: Michael Dawson <michael_dawson@ca.ibm.com>
Date: Tue, 20 Oct 2015 11:39:29 -0400
Subject: [PATCH 029/323] doc: update WORKING_GROUPS.md - add missing groups

Add Benchmarking and Post-Mortem workgroups as they
were missing.

Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <ben@strongloop.com>
PR-URL: https://github.com/nodejs/node/pull/3450
---
 WORKING_GROUPS.md | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/WORKING_GROUPS.md b/WORKING_GROUPS.md
index f3cdc84ba765d9..60e7d6437d3795 100644
--- a/WORKING_GROUPS.md
+++ b/WORKING_GROUPS.md
@@ -27,6 +27,8 @@ back in to the TSC.
 * [Roadmap](#roadmap)
 * [Docker](#docker)
 * [Addon API](#addon-api)
+* [Benchmarking](#benchmarking)
+* [Post-mortem](#post-mortem)
 * [Starting a Working Group](#starting-a-wg)
 * [Bootstrap Governance](#bootstrap-governance)
 * [Intl](#Intl)
@@ -219,6 +221,38 @@ Their responsibilities are:
 The current members can be found in their
 [README](https://github.com/nodejs/nan#collaborators).
 
+### [Benchmarking](https://github.com/nodejs/benchmarking)
+
+The purpose of the Benchmark working group is to gain consensus
+for an agreed set of benchmarks that can be used to:
+
++ track and evangelize performance gains made between Node releases
++ avoid performance regressions between releases
+
+Its responsibilities are:
+
++ Identify 1 or more benchmarks that reflect customer usage.
+   Likely need more than one to cover typical Node use cases
+   including low-latency and high concurrency
++ Work to get community consensus on the list chosen
++ Add regular execution of chosen benchmarks to Node builds
++ Track/publicize performance between builds/releases
+
+### [Post-mortem](https://github.com/nodejs/post-mortem)
+
+The Post-mortem Diagnostics working group is dedicated to the support
+and improvement of postmortem debugging for Node.js. It seeks to
+elevate the role of postmortem debugging for Node, to assist in the
+development of techniques and tools, and to make techniques and tools
+known and available to Node.js users.
+
+Its responsibilities are:
+
++ Defining and adding interfaces/APIs in order to allow dumps
+  to be generated when needed
++ Defining and adding common structures to the dumps generated
+  in order to support tools that want to introspect those dumps
+
 ## Starting a WG
 
 A Working Group is established by first defining a charter  that can be

From cf75a175e5f661a87f19dd3495f7d06eb2d0a87d Mon Sep 17 00:00:00 2001
From: Domenic Denicola <d@domenic.me>
Date: Thu, 26 Feb 2015 18:17:15 -0500
Subject: [PATCH 030/323] doc: more use-cases for promise events

This adds an example of a semi-common promise pattern that could
result in false-positive 'unhandledRejection' events, to help motivate
why there is a dual 'rejectionHandled' event. I anticipate it being
helpful to users who encounter 'unhandledRejection' events that do not
stem from obvious typos such as the JSON.pasre example.

Also cleans up the promise rejection tracking sample. By using a Map
instead of array we can get O(1) deletion and actually record the errors.
And, fixed indentation and backtick usage there to align with the rest of
the document.

Reviewed-By: Stephan Belanger <admin@stephenbelanger.com>
Reviewed-By: Petka Antonov <petka.antonov@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/3438
---
 doc/api/process.markdown | 41 +++++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/doc/api/process.markdown b/doc/api/process.markdown
index 71953766d339aa..eecf494c48bf27 100644
--- a/doc/api/process.markdown
+++ b/doc/api/process.markdown
@@ -159,40 +159,63 @@ event:
       return reportToUser(JSON.pasre(res)); // note the typo
     }); // no `.catch` or `.then`
 
+Here is an example of a coding pattern that will also trigger
+`'unhandledRejection'`:
+
+    function SomeResource() {
+      // Initially set the loaded status to a rejected promise
+      this.loaded = Promise.reject(new Error('Resource not yet loaded!'));
+    }
+
+    var resource = new SomeResource();
+    // no .catch or .then on resource.loaded for at least a turn
+
+In cases like this, you may not want to track the rejection as a developer
+error like you would for other `'unhandledRejection'` events. To address
+this, you can either attach a dummy `.catch(function() { })` handler to
+`resource.loaded`, preventing the `'unhandledRejection'` event from being
+emitted, or you can use the `'rejectionHandled'` event. Below is an
+explanation of how to do that.
+
 ## Event: 'rejectionHandled'
 
 Emitted whenever a Promise was rejected and an error handler was attached to it
 (for example with `.catch()`) later than after an event loop turn. This event
 is emitted with the following arguments:
 
- - `p` the promise that was previously emitted in an 'unhandledRejection'
+ - `p` the promise that was previously emitted in an `'unhandledRejection'`
  event, but which has now gained a rejection handler.
 
 There is no notion of a top level for a promise chain at which rejections can
 always be handled. Being inherently asynchronous in nature, a promise rejection
 can be be handled at a future point in time — possibly much later than the
-event loop turn it takes for the 'unhandledRejection' event to be emitted.
+event loop turn it takes for the `'unhandledRejection'` event to be emitted.
 
 Another way of stating this is that, unlike in synchronous code where there is
 an ever-growing list of unhandled exceptions, with promises there is a
 growing-and-shrinking list of unhandled rejections. In synchronous code, the
 'uncaughtException' event tells you when the list of unhandled exceptions
-grows. And in asynchronous code, the 'unhandledRejection' event tells you
+grows. And in asynchronous code, the `'unhandledRejection'` event tells you
 when the list of unhandled rejections grows, while the 'rejectionHandled'
 event tells you when the list of unhandled rejections shrinks.
 
-For example using the rejection detection hooks in order to keep a list of all
-the rejected promises at a given time:
+For example using the rejection detection hooks in order to keep a map of all
+the rejected promise reasons at a given time:
 
-    var unhandledRejections = [];
+    var unhandledRejections = new Map();
     process.on('unhandledRejection', function(reason, p) {
-        unhandledRejections.push(p);
+      unhandledRejections.set(p, reason);
     });
     process.on('rejectionHandled', function(p) {
-        var index = unhandledRejections.indexOf(p);
-        unhandledRejections.splice(index, 1);
+      unhandledRejections.delete(p);
     });
 
+This map will grow and shrink over time, reflecting rejections that start
+unhandled and then become handled. You could record the errors in some error
+log, either periodically (probably best for long-running programs, allowing
+you to clear the map, which in the case of a very buggy program could grow
+indefinitely) or upon process exit (more convenient for scripts).
+
 ## Signal Events
 
 <!--type=event-->

From 605c5a77546342e012bba5b603690df6213a884f Mon Sep 17 00:00:00 2001
From: Kyle Smith <kyle.r.smiff@gmail.com>
Date: Wed, 7 Oct 2015 16:03:21 -0700
Subject: [PATCH 031/323] doc: clarify the use of `option.detached`

This paragraph conveys that detached child processes do not stay
running in the background in general. Instead clarify that this
refers to the parent process exiting before the detached child
process is complete.

Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/3250
---
 doc/api/child_process.markdown | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/api/child_process.markdown b/doc/api/child_process.markdown
index 908da7a656b10f..13997d65452909 100644
--- a/doc/api/child_process.markdown
+++ b/doc/api/child_process.markdown
@@ -535,9 +535,10 @@ file:
      child.unref();
 
 When using the `detached` option to start a long-running process, the process
-will not stay running in the background unless it is provided with a `stdio`
-configuration that is not connected to the parent.  If the parent's `stdio` is
-inherited, the child will remain attached to the controlling terminal.
+will not stay running in the background after the parent exits unless it is
+provided with a `stdio` configuration that is not connected to the parent.
+If the parent's `stdio` is inherited, the child will remain attached to the
+controlling terminal.
 
 See also: [`child_process.exec()`](#child_process_child_process_exec_command_options_callback) and [`child_process.fork()`](#child_process_child_process_fork_modulepath_args_options)
 

From ad2b2724176150ae910785f69f97f38d7f322706 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <imrani@ca.ibm.com>
Date: Tue, 20 Oct 2015 16:58:16 -0400
Subject: [PATCH 032/323] test: fix test-net-keepalive for AIX

Fixed an intermittent issue on AIX where the 100ms timeout was reached
before the 'connection' event was fired. This resulted in a failure as
serverConnection would be undefined and the assert.equal would throw an
error. Changed the flow of the test so that the timeout is only set
after a connection has been made.

Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
PR-URL: https://github.com/nodejs/node/pull/3458
---
 test/parallel/test-net-keepalive.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/parallel/test-net-keepalive.js b/test/parallel/test-net-keepalive.js
index efbbc5ea7986bb..b05537ba052e10 100644
--- a/test/parallel/test-net-keepalive.js
+++ b/test/parallel/test-net-keepalive.js
@@ -4,8 +4,17 @@ var assert = require('assert');
 var net = require('net');
 
 var serverConnection;
+var clientConnection;
 var echoServer = net.createServer(function(connection) {
   serverConnection = connection;
+  setTimeout(function() {
+    // make sure both connections are still open
+    assert.equal(serverConnection.readyState, 'open');
+    assert.equal(clientConnection.readyState, 'open');
+    serverConnection.end();
+    clientConnection.end();
+    echoServer.close();
+  }, common.platformTimeout(100));
   connection.setTimeout(0);
   assert.notEqual(connection.setKeepAlive, undefined);
   // send a keepalive packet after 50 ms
@@ -17,15 +26,6 @@ var echoServer = net.createServer(function(connection) {
 echoServer.listen(common.PORT);
 
 echoServer.on('listening', function() {
-  var clientConnection = net.createConnection(common.PORT);
+  clientConnection = net.createConnection(common.PORT);
   clientConnection.setTimeout(0);
-
-  setTimeout(function() {
-    // make sure both connections are still open
-    assert.equal(serverConnection.readyState, 'open');
-    assert.equal(clientConnection.readyState, 'open');
-    serverConnection.end();
-    clientConnection.end();
-    echoServer.close();
-  }, common.platformTimeout(100));
 });

From 7c35fbcb148c1556898a5b8e45a043215caedc7d Mon Sep 17 00:00:00 2001
From: Michael Dawson <michael_dawson@ca.ibm.com>
Date: Tue, 20 Oct 2015 18:35:34 -0400
Subject: [PATCH 033/323] test: harden test-child-process-fork-regr-gh-2847

test-child-process-fork-regr-gh-2847 could fail depending
on timing and how messages were packed into tcp packets.
If all of the requests fit into one packet then the test
worked otherwise, otherwise errors could occur.  This PR
modifies the test to be tolerant while still validating that
some of the connection can be made succesfully

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/3459
---
 .../test-child-process-fork-regr-gh-2847.js   | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/test/parallel/test-child-process-fork-regr-gh-2847.js b/test/parallel/test-child-process-fork-regr-gh-2847.js
index 07ef6415a3c3e1..27b4d72d2fc612 100644
--- a/test/parallel/test-child-process-fork-regr-gh-2847.js
+++ b/test/parallel/test-child-process-fork-regr-gh-2847.js
@@ -7,6 +7,9 @@ const cluster = require('cluster');
 const net = require('net');
 const util = require('util');
 
+var connectcount = 0;
+var sendcount = 0;
+
 if (!cluster.isMaster) {
   // Exit on first received handle to leave the queue non-empty in master
   process.on('message', function() {
@@ -25,6 +28,21 @@ var server = net.createServer(function(s) {
   function send(callback) {
     var s = net.connect(common.PORT, function() {
       worker.send({}, s, callback);
+      connectcount++;
+    });
+
+    // Errors can happen if the connections
+    // are still happening while the server has been closed.
+    // This can happen depending on how the messages are
+    // bundled into packets. If they all make it into the first
+    // one then no errors will occur, otherwise the server
+    // may have been closed by the time the later ones make
+    // it to the server side.
+    // We ignore any errors that occur after some connections
+    // get through
+    s.on('error', function(err) {
+      if (connectcount < 3)
+        console.log(err);
     });
   }
 
@@ -36,5 +54,9 @@ var server = net.createServer(function(s) {
 
   // Queue up several handles, to make `process.disconnect()` wait
   for (var i = 0; i < 100; i++)
-    send();
+    send(function(err) {
+      if (err && sendcount < 3)
+        console.log(err);
+      sendcount++;
+    });
 });

From ff9ef893fd11b3388862416051799d20cb3f5b2b Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Tue, 20 Oct 2015 22:43:47 -0400
Subject: [PATCH 034/323] doc: add TSC meeting minutes 2015-10-14

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/3463
---
 doc/tsc-meetings/2015-10-14.md | 121 +++++++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 doc/tsc-meetings/2015-10-14.md

diff --git a/doc/tsc-meetings/2015-10-14.md b/doc/tsc-meetings/2015-10-14.md
new file mode 100644
index 00000000000000..65a0f467cdffb3
--- /dev/null
+++ b/doc/tsc-meetings/2015-10-14.md
@@ -0,0 +1,121 @@
+# Node Foundation TSC Meeting 2015-10-14
+
+## Links
+
+* **Audio Recording**: https://soundcloud.com/node-foundation/tsc-meeting-2015-10-14
+* **GitHub Issue**: https://github.com/nodejs/node/issues/3363
+* **Minutes Google Doc**: <https://docs.google.com/document/d/1tVPxA4Y3n3dmICJFZN2vK93PXjCaUQ-eiN2mvt7zqbE>
+* _Previous Minutes Google Doc: <https://docs.google.com/document/d/1LIrTCdTUjKtb_GGecrJ3Es0rPOpVdpkV5kefJ_p5FGU>_
+
+## Present
+
+* Rod Vagg (TSC)
+* Domenic Denicola (observer)
+* Brian White (TSC)
+* Steven Loomis (observer)
+* James Snell (TSC)
+* Michael Dawson (observer)
+* Ben Noordhuis (TSC)
+* Jeremiah Senkpiel (TSC)
+* Trevor Norris (TSC)
+* Alexis Campailla (TSC)
+* Mikeal Rogers (observer)
+
+## Agenda
+
+Extracted from **tsc-agenda** labelled issues and pull requests in the nodejs org prior to meeting.
+
+### nodejs/node
+
+* V8 security reporting [#3348](https://github.com/nodejs/node/issues/3348)
+* doc: add information about Assert behavior and maintenance [#3330](https://github.com/nodejs/node/pull/3330)
+* WG: Considering a new HTTP WG [#3214](https://github.com/nodejs/node/issues/3214)
+* Discussion: LTS & v5 release planning [#3000](https://github.com/nodejs/node/issues/3000)
+* Compiling node v4.0.0 with OpenSSL 1.0.1 fails [#2783](https://github.com/nodejs/node/issues/2783)
+
+### nodejs/TSC
+
+* Umbrella Program [#2](https://github.com/nodejs/TSC/pull/2)
+
+
+## Minutes
+
+### Standup
+
+* Rod Vagg: Not quite as involved, took a bit of time off. Getting back up to speed on build
+* Domenic: Nothing this week
+* Brian: PRs & Issues
+* Steven: Worked on getting ICU 56.1 out and into v4.2.0 LTS, working on making the ICU [install better](https://github.com/nodejs/node-v0.x-archive/issues/8996#issuecomment-89411193). Also shepherding iojs-* rename to nodejs-* [#2525](https://github.com/nodejs/node/issues/2525)
+* James: Worked on the 4.2.0 and 4.2.1 releases. Working on the cgitm smoke-testing tool and http WG.
+* Michael: Worked on adding pLinux to the CI. Looking into running the tests on fips-compliant mode. Investigated some AIX issues.
+* Ben: PRs & Issues, doing some work on the debugger and memory bugs in libuv
+* Jeremiah: PRs & Issues, working on resolving the timers in beforeExit bug: https://github.com/nodejs/node/pull/2795
+* Trevor: Helped Jeremiah with the beforeExit thing, worked on PRs and Issues. Looking into AsyncWrap improvements.
+* Alexis: Looking into a native module build service. Worked on the Ci a bit.
+* Mikeal: Worked on the Umbrella Program proposal. Helping set up the Node.js Interactive conference.
+
+
+### Review of previous meeting
+
+* WG: Considering a new HTTP WG [#3214](https://github.com/nodejs/node/issues/3214)
+* lib,test: deprecate _linklist [#3078](https://github.com/nodejs/node/pull/3078)
+* Discussion: LTS & v5 release planning [#3000](https://github.com/nodejs/node/issues/3000)
+* Compiling node v4.0.0 with OpenSSL 1.0.1 fails [#2783](https://github.com/nodejs/node/issues/2783)
+* Inspecting Node.js with Chrome DevTools [#2546](https://github.com/nodejs/node/issues/2546)
+* Umbrella Program [#2](https://github.com/nodejs/TSC/pull/2)
+
+
+### V8 security reporting [#3348](https://github.com/nodejs/node/issues/3348)
+
+Michael: Proposal is to add one or more TSC members to the V8 security list. Not all issues will actually be V8 issues, but there shouldn’t be too many.
+
+* Concerns about too many issues
+
+Michael: Let’s go back and ask if a handfull means only 4-5 a week.
+
+Mikeal: Part of the Umbrella Program is to make a top-level security group that all security issues are funneled through. This group may not need to be TSC members.
+
+Ben: How would this group know an issue is relevant to us?
+
+Rod: We are talking about a Chromium security list, so we would probably need someone with enough knowledge to filter out which issues affect us.
+
+Mikeal: They would only be an initial filter.
+
+Rod: Some chromium issues will not be recognizable as V8 issues without prior understanding.
+
+Rod & others: Suggest to add Ben and Fedor to add to the Chromium/V8 security list.
+
+Discussion about the current Security repo / group, and current mailing lists
+
+### doc: add information about Assert behavior and maintenance [#3330](https://github.com/nodejs/node/pull/3330)
+
+Discussion about what assert is intended to do, and how we want to deal with additions and breaking changes in the future.
+
+Discussion about the stability index in the docs.
+
+Resolution: Lock the assert module. Possibly re-evaluate in the future. Close existing open PRs/issues against it after landing doc change.
+
+
+### WG: Considering a new HTTP WG [#3214](https://github.com/nodejs/node/issues/3214)
+
+James: having scheduling problems for an initial hangout but are getting a lot of interest from outside of core, including Doug Wilson and Eran Hammer.
+
+Discussion about the WG’s goals and how we should possibly think about handing over authority of the http module to this WG in the future. (At charter time or later on)
+
+### Discussion: LTS & v5 release planning [#3000](https://github.com/nodejs/node/issues/3000)
+
+James: recommended that we adopt a general rule that commits must go through at least one stable release before going into an LTS. Exceptions to this are security problems and changes that can’t go on to stable.
+
+### Compiling node v4.0.0 with OpenSSL 1.0.1 fails [#2783](https://github.com/nodejs/node/issues/2783)
+
+Conclusion was that this would be difficult and would result in a build that had some features disabled. The TSC is not going to undertake this work and would have reservations officially supporting a build that cripples some crypto features. However, pull requests for this work are welcome and would be considered.
+
+### Umbrella Program [#2](https://github.com/nodejs/TSC/pull/2)
+
+Mikeal sought a vote from the TSC to adopt the Project Lifecycle document and the Core TLP document.
+
+Resolution: there were no abstentions from voting and no disagreement amongst TSC members present, additional TSC members have registered their +1 on the PR so the motion is passed.
+
+## Next Meeting
+
+October 21st, 2015

From 97d081709e65b6c702e283330779477124e2c640 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Tue, 13 Oct 2015 21:39:16 -0700
Subject: [PATCH 035/323] lib: avoid REPL exit on completion error

If a tab completion is attempted on an undefined reference inside of a
function, the REPL was exiting without reporting an error or anything
else. This change results in the REPL reporting the ReferenceError and
continuing.

Fixes: https://github.com/nodejs/node/issues/3346
PR-URL: https://github.com/nodejs/node/pull/3358
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/repl.js                                   | 15 ++++---
 test/parallel/test-repl-tab-complete-crash.js | 41 +++++++++++++++++++
 2 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 test/parallel/test-repl-tab-complete-crash.js

diff --git a/lib/repl.js b/lib/repl.js
index 81afd27a4dbd00..46288db5639c59 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -32,6 +32,8 @@ const Console = require('console').Console;
 const domain = require('domain');
 const debug = util.debuglog('repl');
 
+const replMap = new WeakMap();
+
 try {
   // hack for require.resolve("./relative") to work properly.
   module.filename = path.resolve('repl');
@@ -189,11 +191,12 @@ function REPLServer(prompt,
 
   self._domain.on('error', function(e) {
     debug('domain error');
-    self.outputStream.write((e.stack || e) + '\n');
-    self._currentStringLiteral = null;
-    self.bufferedCommand = '';
-    self.lines.level = [];
-    self.displayPrompt();
+    const top = replMap.get(self);
+    top.outputStream.write((e.stack || e) + '\n');
+    top._currentStringLiteral = null;
+    top.bufferedCommand = '';
+    top.lines.level = [];
+    top.displayPrompt();
   });
 
   if (!input && !output) {
@@ -472,6 +475,7 @@ exports.start = function(prompt,
                             ignoreUndefined,
                             replMode);
   if (!exports.repl) exports.repl = repl;
+  replMap.set(repl, repl);
   return repl;
 };
 
@@ -601,6 +605,7 @@ REPLServer.prototype.complete = function(line, callback) {
     // all this is only profitable if the nested REPL
     // does not have a bufferedCommand
     if (!magic.bufferedCommand) {
+      replMap.set(magic, replMap.get(this));
       return magic.complete(line, callback);
     }
   }
diff --git a/test/parallel/test-repl-tab-complete-crash.js b/test/parallel/test-repl-tab-complete-crash.js
new file mode 100644
index 00000000000000..85ab0577eb8601
--- /dev/null
+++ b/test/parallel/test-repl-tab-complete-crash.js
@@ -0,0 +1,41 @@
+'use strict';
+
+require('../common');
+const assert = require('assert');
+const util = require('util');
+const repl = require('repl');
+
+var referenceErrorCount = 0;
+
+// A stream to push an array into a REPL
+function ArrayStream() {
+  this.run = function(data) {
+    const self = this;
+    data.forEach(function(line) {
+      self.emit('data', line + '\n');
+    });
+  };
+}
+util.inherits(ArrayStream, require('stream').Stream);
+ArrayStream.prototype.readable = true;
+ArrayStream.prototype.writable = true;
+ArrayStream.prototype.resume = function() {};
+ArrayStream.prototype.write = function(msg) {
+  if (msg.startsWith('ReferenceError: ')) {
+    referenceErrorCount++;
+  }
+};
+
+const putIn = new ArrayStream();
+const testMe = repl.start('', putIn);
+
+// https://github.com/nodejs/node/issues/3346
+// Tab-completion for an undefined variable inside a function should report a
+// ReferenceError.
+putIn.run(['.clear']);
+putIn.run(['function () {']);
+testMe.complete('arguments.');
+
+process.on('exit', function() {
+  assert.strictEqual(referenceErrorCount, 1);
+});

From ae196175f4bc9aa492f6db9f89066bee85fc869c Mon Sep 17 00:00:00 2001
From: Trevor Norris <trev.norris@gmail.com>
Date: Wed, 14 Oct 2015 14:58:52 -0600
Subject: [PATCH 036/323] node: improve GetActiveRequests performance

v8 is faster at setting object properties in JS than C++. Even when it
requires calling into JS from native code. Make
process._getActiveRequests() faster by doing this when populating the
array containing request objects.

Simple benchmark:

    for (let i = 0; i < 22; i++)
      fs.open(__filename, 'r', function() { });
    let t = process.hrtime();
    for (let i = 0; i < 1e6; i++)
      process._getActiveRequests();
    t = process.hrtime(t);
    console.log((t[0] * 1e9 + t[1]) / 1e6);

Results between the two:

    Previous:  4406 ns/op
    Patched:    690 ns/op     5.4x faster

PR-URL: https://github.com/nodejs/node/pull/3375
Reviewed-By: James Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <ben@strongloop.com>
---
 src/env.h                                     |  1 +
 src/node.cc                                   | 39 +++++++++++++++++--
 src/node.js                                   | 11 ++++++
 .../test-process-getactiverequests.js         | 10 +++++
 4 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 test/parallel/test-process-getactiverequests.js

diff --git a/src/env.h b/src/env.h
index 97652146fabf0d..b79ef4ae3e6587 100644
--- a/src/env.h
+++ b/src/env.h
@@ -227,6 +227,7 @@ namespace node {
   V(zero_return_string, "ZERO_RETURN")                                        \
 
 #define ENVIRONMENT_STRONG_PERSISTENT_PROPERTIES(V)                           \
+  V(add_properties_by_index_function, v8::Function)                           \
   V(as_external, v8::External)                                                \
   V(async_hooks_init_function, v8::Function)                                  \
   V(async_hooks_pre_function, v8::Function)                                   \
diff --git a/src/node.cc b/src/node.cc
index 1dfa854ed5bb99..10e7da125d49a7 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -1009,6 +1009,17 @@ void RunMicrotasks(const FunctionCallbackInfo<Value>& args) {
 }
 
 
+void SetupProcessObject(const FunctionCallbackInfo<Value>& args) {
+  Environment* env = Environment::GetCurrent(args);
+
+  CHECK(args[0]->IsFunction());
+
+  env->set_add_properties_by_index_function(args[0].As<Function>());
+  env->process_object()->Delete(
+      FIXED_ONE_BYTE_STRING(env->isolate(), "_setupProcessObject"));
+}
+
+
 void SetupNextTick(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
 
@@ -1546,11 +1557,30 @@ static void GetActiveRequests(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
 
   Local<Array> ary = Array::New(args.GetIsolate());
-  int i = 0;
+  Local<Context> ctx = env->context();
+  Local<Function> fn = env->add_properties_by_index_function();
+  static const size_t argc = 8;
+  Local<Value> argv[argc];
+  size_t i = 0;
+
+  for (auto w : *env->req_wrap_queue()) {
+    if (w->persistent().IsEmpty() == false) {
+      argv[i++ % argc] = w->object();
+      if ((i % argc) == 0) {
+        HandleScope scope(env->isolate());
+        fn->Call(ctx, ary, argc, argv).ToLocalChecked();
+        for (auto&& arg : argv) {
+          arg = Local<Value>();
+        }
+      }
+    }
+  }
 
-  for (auto w : *env->req_wrap_queue())
-    if (w->persistent().IsEmpty() == false)
-      ary->Set(i++, w->object());
+  const size_t remainder = i % argc;
+  if (remainder > 0) {
+    HandleScope scope(env->isolate());
+    fn->Call(ctx, ary, remainder, argv).ToLocalChecked();
+  }
 
   args.GetReturnValue().Set(ary);
 }
@@ -2979,6 +3009,7 @@ void SetupProcessObject(Environment* env,
   env->SetMethod(process, "binding", Binding);
   env->SetMethod(process, "_linkedBinding", LinkedBinding);
 
+  env->SetMethod(process, "_setupProcessObject", SetupProcessObject);
   env->SetMethod(process, "_setupNextTick", SetupNextTick);
   env->SetMethod(process, "_setupPromises", SetupPromises);
   env->SetMethod(process, "_setupDomainUse", SetupDomainUse);
diff --git a/src/node.js b/src/node.js
index 7cfd2c035962a6..d47a129635e25c 100644
--- a/src/node.js
+++ b/src/node.js
@@ -22,6 +22,8 @@
 
     process.EventEmitter = EventEmitter; // process.EventEmitter is deprecated
 
+    startup.setupProcessObject();
+
     // do this good and early, since it handles errors.
     startup.processFatal();
 
@@ -173,6 +175,15 @@
     }
   }
 
+  startup.setupProcessObject = function() {
+    process._setupProcessObject(setPropByIndex);
+
+    function setPropByIndex() {
+      for (var i = 0; i < arguments.length; i++)
+        this.push(arguments[i]);
+    }
+  };
+
   startup.globalVariables = function() {
     global.process = process;
     global.global = global;
diff --git a/test/parallel/test-process-getactiverequests.js b/test/parallel/test-process-getactiverequests.js
new file mode 100644
index 00000000000000..4b7e0df1a50240
--- /dev/null
+++ b/test/parallel/test-process-getactiverequests.js
@@ -0,0 +1,10 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const fs = require('fs');
+
+for (let i = 0; i < 12; i++)
+  fs.open(__filename, 'r', function() { });
+
+assert.equal(12, process._getActiveRequests().length);

From b4f4c245398c14690dcbeea04b2abfcd3d511df6 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <me@re-becca.org>
Date: Fri, 9 Oct 2015 17:34:20 -0700
Subject: [PATCH 037/323] tools: use absolute paths in test-npm

Updated test-npm to use absolute paths for tmp/cache/prefix

PR-URL: https://github.com/nodejs/node/pull/3309
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 tools/test-npm.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/test-npm.sh b/tools/test-npm.sh
index 62929ee8ccc94f..8fa8731b5ee7a1 100755
--- a/tools/test-npm.sh
+++ b/tools/test-npm.sh
@@ -23,10 +23,10 @@ cd test-npm
 rm -rf npm-cache npm-tmp npm-prefix
 mkdir npm-cache npm-tmp npm-prefix
 
-# set some npm env varibles to point to our new temporary folders
-export npm_config_cache="npm-cache"
-export npm_config_prefix="npm-prefix"
-export npm_config_tmp="npm-tmp"
+# set some npm env variables to point to our new temporary folders
+export npm_config_cache="$(pwd)/npm-cache"
+export npm_config_prefix="$(pwd)/npm-prefix"
+export npm_config_tmp="$(pwd)/npm-tmp"
 
 # install npm devDependencies and run npm's tests
 

From ce391ed849514692cfd3e15a07b5876f3275dd70 Mon Sep 17 00:00:00 2001
From: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Date: Tue, 6 Oct 2015 23:05:53 -0700
Subject: [PATCH 038/323] repl: event ordering: delay 'close' until
 'flushHistory'

Emitting 'close' before the history has flushed is somewhat incorrect
and rather confusing.

This also makes the 'close' event always asynchronous for consistency.

Refs: https://github.com/nodejs/node/pull/2356
PR-URL: https://github.com/nodejs/node/pull/3435
Reviewed By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 lib/repl.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/repl.js b/lib/repl.js
index 46288db5639c59..ed3df92e08526b 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -27,7 +27,7 @@ const Stream = require('stream');
 const vm = require('vm');
 const path = require('path');
 const fs = require('fs');
-const rl = require('readline');
+const Interface = require('readline').Interface;
 const Console = require('console').Console;
 const domain = require('domain');
 const debug = util.debuglog('repl');
@@ -229,7 +229,7 @@ function REPLServer(prompt,
     self.complete(text, callback);
   }
 
-  rl.Interface.call(this, {
+  Interface.call(this, {
     input: self.inputStream,
     output: self.outputStream,
     completer: complete,
@@ -453,7 +453,7 @@ function REPLServer(prompt,
 
   self.displayPrompt();
 }
-inherits(REPLServer, rl.Interface);
+inherits(REPLServer, Interface);
 exports.REPLServer = REPLServer;
 
 exports.REPL_MODE_SLOPPY = Symbol('repl-sloppy');
@@ -479,6 +479,20 @@ exports.start = function(prompt,
   return repl;
 };
 
+REPLServer.prototype.close = function replClose() {
+  if (this.terminal && this._flushing && !this._closingOnFlush) {
+    this._closingOnFlush = true;
+    this.once('flushHistory', () =>
+      Interface.prototype.close.call(this)
+    );
+
+    return;
+  }
+  process.nextTick(() =>
+    Interface.prototype.close.call(this)
+  );
+};
+
 REPLServer.prototype.createContext = function() {
   var context;
   if (this.useGlobal) {

From 3c3435d017f8b80cb02383c2fc12292ee2b60171 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <me@re-becca.org>
Date: Fri, 9 Oct 2015 17:33:59 -0700
Subject: [PATCH 039/323] tools: update test-npm to work with npm 3

Refs: https://github.com/nodejs/node/pull/3308
PR-URL: https://github.com/nodejs/node/pull/3489
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 tools/test-npm.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/test-npm.sh b/tools/test-npm.sh
index 8fa8731b5ee7a1..23f4492e15c1ea 100755
--- a/tools/test-npm.sh
+++ b/tools/test-npm.sh
@@ -29,10 +29,9 @@ export npm_config_prefix="$(pwd)/npm-prefix"
 export npm_config_tmp="$(pwd)/npm-tmp"
 
 # install npm devDependencies and run npm's tests
-
 ../$NODE cli.js install --ignore-scripts
-../$NODE cli.js run-script test-legacy
-../$NODE cli.js run-script test
+../$NODE test/run.js
+../$NODE cli.js run-script tap -- "test/tap/*.js"
 
 # clean up everything one single shot
 cd .. && rm -rf test-npm

From 6e78382605239dd0492125acfbdffb3bb38f60e5 Mon Sep 17 00:00:00 2001
From: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Date: Thu, 22 Oct 2015 13:28:20 -0400
Subject: [PATCH 040/323] tools: ensure npm always uses the local node

Refs: https://github.com/nodejs/node/pull/3308
PR-URL: https://github.com/nodejs/node/pull/3489
Reviewed-By: Rod Vagg <rod@vagg.org>
---
 tools/test-npm.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/test-npm.sh b/tools/test-npm.sh
index 23f4492e15c1ea..9cb5a80100352e 100755
--- a/tools/test-npm.sh
+++ b/tools/test-npm.sh
@@ -28,6 +28,9 @@ export npm_config_cache="$(pwd)/npm-cache"
 export npm_config_prefix="$(pwd)/npm-prefix"
 export npm_config_tmp="$(pwd)/npm-tmp"
 
+# ensure npm always uses the local node
+export PATH="$(../$NODE -p 'require("path").resolve("..")'):$PATH"
+
 # install npm devDependencies and run npm's tests
 ../$NODE cli.js install --ignore-scripts
 ../$NODE test/run.js

From 32b51c97ec3de688efae3a88163814501b6dbcc5 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <me@re-becca.org>
Date: Fri, 9 Oct 2015 23:13:57 -0700
Subject: [PATCH 041/323] deps: upgrade npm to 3.3.6

PR-URL: https://github.com/nodejs/node/pull/3310
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 deps/npm/.mailmap                             |    1 +
 deps/npm/.travis.yml                          |    2 +-
 deps/npm/AUTHORS                              |    7 +-
 deps/npm/CHANGELOG.md                         | 1345 +++++++++++++-
 deps/npm/LICENSE                              |    6 +-
 deps/npm/Makefile                             |   24 +-
 deps/npm/bin/node-gyp-bin/node-gyp.cmd        |    8 +-
 deps/npm/bin/npm-cli.js                       |  142 +-
 deps/npm/bin/read-package-json.js             |   26 +-
 deps/npm/cli.js                               |    2 +-
 deps/npm/doc/api/npm-bin.md                   |   13 -
 deps/npm/doc/api/npm-bugs.md                  |   19 -
 deps/npm/doc/api/npm-cache.md                 |   30 -
 deps/npm/doc/api/npm-commands.md              |   22 -
 deps/npm/doc/api/npm-config.md                |   45 -
 deps/npm/doc/api/npm-deprecate.md             |   34 -
 deps/npm/doc/api/npm-docs.md                  |   19 -
 deps/npm/doc/api/npm-edit.md                  |   24 -
 deps/npm/doc/api/npm-explore.md               |   18 -
 deps/npm/doc/api/npm-help-search.md           |   30 -
 deps/npm/doc/api/npm-init.md                  |   29 -
 deps/npm/doc/api/npm-install.md               |   19 -
 deps/npm/doc/api/npm-link.md                  |   33 -
 deps/npm/doc/api/npm-load.md                  |   26 -
 deps/npm/doc/api/npm-ls.md                    |   56 -
 deps/npm/doc/api/npm-outdated.md              |   13 -
 deps/npm/doc/api/npm-owner.md                 |   31 -
 deps/npm/doc/api/npm-pack.md                  |   19 -
 deps/npm/doc/api/npm-ping.md                  |   14 -
 deps/npm/doc/api/npm-prefix.md                |   15 -
 deps/npm/doc/api/npm-prune.md                 |   17 -
 deps/npm/doc/api/npm-publish.md               |   30 -
 deps/npm/doc/api/npm-rebuild.md               |   16 -
 deps/npm/doc/api/npm-repo.md                  |   19 -
 deps/npm/doc/api/npm-restart.md               |   41 -
 deps/npm/doc/api/npm-root.md                  |   15 -
 deps/npm/doc/api/npm-run-script.md            |   27 -
 deps/npm/doc/api/npm-search.md                |   35 -
 deps/npm/doc/api/npm-shrinkwrap.md            |   20 -
 deps/npm/doc/api/npm-start.md                 |   13 -
 deps/npm/doc/api/npm-stop.md                  |   13 -
 deps/npm/doc/api/npm-tag.md                   |   23 -
 deps/npm/doc/api/npm-test.md                  |   16 -
 deps/npm/doc/api/npm-uninstall.md             |   16 -
 deps/npm/doc/api/npm-unpublish.md             |   20 -
 deps/npm/doc/api/npm-update.md                |   18 -
 deps/npm/doc/api/npm-version.md               |   18 -
 deps/npm/doc/api/npm-view.md                  |   93 -
 deps/npm/doc/api/npm-whoami.md                |   15 -
 deps/npm/doc/api/npm.md                       |  115 --
 deps/npm/doc/cli/npm-bin.md                   |    2 +-
 deps/npm/doc/cli/npm-bugs.md                  |    3 +-
 deps/npm/doc/cli/npm-build.md                 |    2 +-
 deps/npm/doc/cli/npm-completion.md            |    7 +-
 deps/npm/doc/cli/npm-config.md                |    1 -
 deps/npm/doc/cli/npm-dedupe.md                |   21 +-
 deps/npm/doc/cli/npm-deprecate.md             |    2 +-
 deps/npm/doc/cli/npm-docs.md                  |    4 +-
 deps/npm/doc/cli/npm-edit.md                  |    2 +-
 deps/npm/doc/cli/npm-explore.md               |    2 +-
 deps/npm/doc/cli/npm-help-search.md           |    2 +-
 deps/npm/doc/cli/npm-help.md                  |    3 +-
 deps/npm/doc/cli/npm-init.md                  |    2 +-
 deps/npm/doc/cli/npm-install.md               |   76 +-
 deps/npm/doc/cli/npm-link.md                  |    7 +-
 deps/npm/doc/cli/npm-logout.md                |    2 +-
 deps/npm/doc/cli/npm-ls.md                    |   18 +-
 deps/npm/doc/cli/npm-outdated.md              |    2 +-
 deps/npm/doc/cli/npm-owner.md                 |    6 +-
 deps/npm/doc/cli/npm-pack.md                  |   10 +-
 deps/npm/doc/cli/npm-prune.md                 |    3 +-
 deps/npm/doc/cli/npm-publish.md               |    6 +-
 deps/npm/doc/cli/npm-rebuild.md               |    6 +-
 deps/npm/doc/cli/npm-repo.md                  |    3 +-
 deps/npm/doc/cli/npm-rm.md                    |   23 -
 deps/npm/doc/cli/npm-root.md                  |    2 +-
 deps/npm/doc/cli/npm-run-script.md            |    5 +-
 deps/npm/doc/cli/npm-search.md                |    4 +-
 deps/npm/doc/cli/npm-shrinkwrap.md            |   38 +-
 deps/npm/doc/cli/npm-star.md                  |    4 +-
 deps/npm/doc/cli/npm-stars.md                 |    3 +-
 deps/npm/doc/cli/npm-tag.md                   |    3 +-
 deps/npm/doc/cli/npm-uninstall.md             |    8 +-
 deps/npm/doc/cli/npm-unpublish.md             |    2 +-
 deps/npm/doc/cli/npm-update.md                |    2 +-
 deps/npm/doc/cli/npm-version.md               |    4 +
 deps/npm/doc/cli/npm-view.md                  |    5 +-
 deps/npm/doc/cli/npm-whoami.md                |    2 +-
 deps/npm/doc/files/package.json.md            |   13 +-
 deps/npm/doc/misc/npm-config.md               |   62 +-
 deps/npm/doc/misc/npm-index.md                |  168 --
 deps/npm/doc/misc/npm-orgs.md                 |   90 -
 deps/npm/html/doc/README.html                 |    4 +-
 deps/npm/html/doc/api/npm-bin.html            |    2 +-
 deps/npm/html/doc/api/npm-bugs.html           |    2 +-
 deps/npm/html/doc/api/npm-cache.html          |    2 +-
 deps/npm/html/doc/api/npm-commands.html       |    2 +-
 deps/npm/html/doc/api/npm-config.html         |    2 +-
 deps/npm/html/doc/api/npm-deprecate.html      |    2 +-
 deps/npm/html/doc/api/npm-docs.html           |    2 +-
 deps/npm/html/doc/api/npm-edit.html           |    2 +-
 deps/npm/html/doc/api/npm-explore.html        |    2 +-
 deps/npm/html/doc/api/npm-help-search.html    |    2 +-
 deps/npm/html/doc/api/npm-init.html           |    2 +-
 deps/npm/html/doc/api/npm-install.html        |    2 +-
 deps/npm/html/doc/api/npm-link.html           |    2 +-
 deps/npm/html/doc/api/npm-load.html           |    2 +-
 deps/npm/html/doc/api/npm-ls.html             |    2 +-
 deps/npm/html/doc/api/npm-outdated.html       |    2 +-
 deps/npm/html/doc/api/npm-owner.html          |    2 +-
 deps/npm/html/doc/api/npm-pack.html           |    2 +-
 deps/npm/html/doc/api/npm-ping.html           |    2 +-
 deps/npm/html/doc/api/npm-prefix.html         |    2 +-
 deps/npm/html/doc/api/npm-prune.html          |    2 +-
 deps/npm/html/doc/api/npm-publish.html        |    2 +-
 deps/npm/html/doc/api/npm-rebuild.html        |    2 +-
 deps/npm/html/doc/api/npm-repo.html           |    2 +-
 deps/npm/html/doc/api/npm-restart.html        |    2 +-
 deps/npm/html/doc/api/npm-root.html           |    2 +-
 deps/npm/html/doc/api/npm-run-script.html     |    2 +-
 deps/npm/html/doc/api/npm-search.html         |    2 +-
 deps/npm/html/doc/api/npm-shrinkwrap.html     |    2 +-
 deps/npm/html/doc/api/npm-start.html          |    2 +-
 deps/npm/html/doc/api/npm-stop.html           |    2 +-
 deps/npm/html/doc/api/npm-tag.html            |    2 +-
 deps/npm/html/doc/api/npm-test.html           |    2 +-
 deps/npm/html/doc/api/npm-uninstall.html      |    2 +-
 deps/npm/html/doc/api/npm-unpublish.html      |    2 +-
 deps/npm/html/doc/api/npm-update.html         |    2 +-
 deps/npm/html/doc/api/npm-version.html        |    2 +-
 deps/npm/html/doc/api/npm-view.html           |    2 +-
 deps/npm/html/doc/api/npm-whoami.html         |    2 +-
 deps/npm/html/doc/api/npm.html                |    4 +-
 deps/npm/html/doc/cli/npm-access.html         |    2 +-
 deps/npm/html/doc/cli/npm-adduser.html        |    2 +-
 deps/npm/html/doc/cli/npm-bin.html            |    4 +-
 deps/npm/html/doc/cli/npm-bugs.html           |    5 +-
 deps/npm/html/doc/cli/npm-build.html          |    4 +-
 deps/npm/html/doc/cli/npm-bundle.html         |    2 +-
 deps/npm/html/doc/cli/npm-cache.html          |    2 +-
 deps/npm/html/doc/cli/npm-completion.html     |   10 +-
 deps/npm/html/doc/cli/npm-config.html         |    3 +-
 deps/npm/html/doc/cli/npm-dedupe.html         |   20 +-
 deps/npm/html/doc/cli/npm-deprecate.html      |    4 +-
 deps/npm/html/doc/cli/npm-dist-tag.html       |    2 +-
 deps/npm/html/doc/cli/npm-docs.html           |    6 +-
 deps/npm/html/doc/cli/npm-edit.html           |    4 +-
 deps/npm/html/doc/cli/npm-explore.html        |    4 +-
 deps/npm/html/doc/cli/npm-help-search.html    |    4 +-
 deps/npm/html/doc/cli/npm-help.html           |    5 +-
 deps/npm/html/doc/cli/npm-init.html           |    4 +-
 deps/npm/html/doc/cli/npm-install.html        |   72 +-
 deps/npm/html/doc/cli/npm-link.html           |    9 +-
 deps/npm/html/doc/cli/npm-logout.html         |    4 +-
 deps/npm/html/doc/cli/npm-ls.html             |   19 +-
 deps/npm/html/doc/cli/npm-outdated.html       |    4 +-
 deps/npm/html/doc/cli/npm-owner.html          |    8 +-
 deps/npm/html/doc/cli/npm-pack.html           |   12 +-
 deps/npm/html/doc/cli/npm-ping.html           |    2 +-
 deps/npm/html/doc/cli/npm-prefix.html         |    2 +-
 deps/npm/html/doc/cli/npm-prune.html          |    5 +-
 deps/npm/html/doc/cli/npm-publish.html        |    8 +-
 deps/npm/html/doc/cli/npm-rebuild.html        |   13 +-
 deps/npm/html/doc/cli/npm-repo.html           |    5 +-
 deps/npm/html/doc/cli/npm-restart.html        |    2 +-
 deps/npm/html/doc/cli/npm-rm.html             |   43 -
 deps/npm/html/doc/cli/npm-root.html           |    4 +-
 deps/npm/html/doc/cli/npm-run-script.html     |    7 +-
 deps/npm/html/doc/cli/npm-search.html         |    6 +-
 deps/npm/html/doc/cli/npm-shrinkwrap.html     |   43 +-
 deps/npm/html/doc/cli/npm-star.html           |    6 +-
 deps/npm/html/doc/cli/npm-stars.html          |    5 +-
 deps/npm/html/doc/cli/npm-start.html          |    2 +-
 deps/npm/html/doc/cli/npm-stop.html           |    2 +-
 deps/npm/html/doc/cli/npm-tag.html            |    5 +-
 deps/npm/html/doc/cli/npm-team.html           |    2 +-
 deps/npm/html/doc/cli/npm-test.html           |    2 +-
 deps/npm/html/doc/cli/npm-uninstall.html      |    9 +-
 deps/npm/html/doc/cli/npm-unpublish.html      |    4 +-
 deps/npm/html/doc/cli/npm-update.html         |    4 +-
 deps/npm/html/doc/cli/npm-version.html        |    8 +-
 deps/npm/html/doc/cli/npm-view.html           |    7 +-
 deps/npm/html/doc/cli/npm-whoami.html         |    4 +-
 deps/npm/html/doc/cli/npm.html                |   10 +-
 deps/npm/html/doc/files/npm-folders.html      |    2 +-
 deps/npm/html/doc/files/npm-global.html       |    2 +-
 deps/npm/html/doc/files/npm-json.html         |   14 +-
 deps/npm/html/doc/files/npmrc.html            |    2 +-
 deps/npm/html/doc/files/package.json.html     |   14 +-
 deps/npm/html/doc/index.html                  |   86 +-
 deps/npm/html/doc/misc/npm-coding-style.html  |    2 +-
 deps/npm/html/doc/misc/npm-config.html        |   54 +-
 deps/npm/html/doc/misc/npm-developers.html    |    2 +-
 deps/npm/html/doc/misc/npm-disputes.html      |    8 +-
 deps/npm/html/doc/misc/npm-faq.html           |    4 +-
 deps/npm/html/doc/misc/npm-index.html         |   86 +-
 deps/npm/html/doc/misc/npm-orgs.html          |    2 +-
 deps/npm/html/doc/misc/npm-registry.html      |    2 +-
 deps/npm/html/doc/misc/npm-scope.html         |    2 +-
 deps/npm/html/doc/misc/npm-scripts.html       |    2 +-
 deps/npm/html/doc/misc/removing-npm.html      |    2 +-
 deps/npm/html/doc/misc/semver.html            |    2 +-
 deps/npm/html/static/toc.js                   |   56 +-
 deps/npm/lib/access.js                        |    1 +
 deps/npm/lib/adduser.js                       |   98 +-
 deps/npm/lib/bin.js                           |   17 +-
 deps/npm/lib/bugs.js                          |   67 +-
 deps/npm/lib/build.js                         |  227 +--
 deps/npm/lib/cache.js                         |  257 +--
 deps/npm/lib/cache/add-local-tarball.js       |  123 +-
 deps/npm/lib/cache/add-local.js               |  115 +-
 deps/npm/lib/cache/add-named.js               |  161 +-
 deps/npm/lib/cache/add-remote-git.js          |   21 +-
 deps/npm/lib/cache/add-remote-tarball.js      |   76 +-
 deps/npm/lib/cache/cached-package-root.js     |   12 +-
 deps/npm/lib/cache/caching-client.js          |  147 +-
 deps/npm/lib/cache/update-index.js            |   11 +-
 deps/npm/lib/completion.js                    |  205 +--
 deps/npm/lib/config.js                        |  261 ++-
 .../lib/config/clear-credentials-by-uri.js    |   14 +-
 deps/npm/lib/config/core.js                   |  301 ++--
 deps/npm/lib/config/defaults.js               |  537 +++---
 deps/npm/lib/config/find-prefix.js            |   16 +-
 deps/npm/lib/config/get-credentials-by-uri.js |   66 +-
 deps/npm/lib/config/load-cafile.js            |   19 +-
 deps/npm/lib/config/load-prefix.js            |   48 +-
 deps/npm/lib/config/load-uid.js               |    6 +-
 deps/npm/lib/config/nerf-dart.js              |    6 +-
 deps/npm/lib/config/set-credentials-by-uri.js |   53 +-
 deps/npm/lib/config/set-user.js               |   12 +-
 deps/npm/lib/dedupe.js                        |  477 ++---
 deps/npm/lib/deprecate.js                     |   24 +-
 deps/npm/lib/dist-tag.js                      |   88 +-
 deps/npm/lib/docs.js                          |   62 +-
 deps/npm/lib/edit.js                          |   29 +-
 deps/npm/lib/explore.js                       |   40 +-
 deps/npm/lib/faq.js                           |    7 +-
 deps/npm/lib/fetch-package-metadata.js        |  330 ++++
 deps/npm/lib/fetch-package-metadata.md        |   37 +
 deps/npm/lib/get.js                           |    6 +-
 deps/npm/lib/help-search.js                   |  122 +-
 deps/npm/lib/help.js                          |  180 +-
 deps/npm/lib/init.js                          |   44 +-
 deps/npm/lib/install.js                       | 1600 ++++++-----------
 deps/npm/lib/install/access-error.js          |    8 +
 deps/npm/lib/install/action/build.js          |   12 +
 deps/npm/lib/install/action/extract.js        |   17 +
 deps/npm/lib/install/action/fetch.js          |   27 +
 deps/npm/lib/install/action/finalize.js       |   93 +
 deps/npm/lib/install/action/global-install.js |   16 +
 deps/npm/lib/install/action/global-link.js    |    7 +
 deps/npm/lib/install/action/install.js        |    7 +
 deps/npm/lib/install/action/move.js           |   59 +
 deps/npm/lib/install/action/postinstall.js    |    7 +
 deps/npm/lib/install/action/preinstall.js     |    7 +
 deps/npm/lib/install/action/prepublish.js     |    7 +
 deps/npm/lib/install/action/remove.js         |   82 +
 deps/npm/lib/install/action/test.js           |    7 +
 deps/npm/lib/install/action/update-linked.js  |    8 +
 deps/npm/lib/install/actions.js               |  127 ++
 .../lib/install/and-add-parent-to-errors.js   |   13 +
 deps/npm/lib/install/and-finish-tracker.js    |   16 +
 deps/npm/lib/install/and-ignore-errors.js     |    9 +
 deps/npm/lib/install/check-permissions.js     |   69 +
 deps/npm/lib/install/copy-tree.js             |   25 +
 deps/npm/lib/install/decompose-actions.js     |   50 +
 deps/npm/lib/install/deps.js                  |  534 ++++++
 deps/npm/lib/install/diff-trees.js            |  159 ++
 deps/npm/lib/install/exists.js                |   27 +
 .../npm/lib/install/filter-invalid-actions.js |   36 +
 deps/npm/lib/install/flatten-tree.js          |   29 +
 deps/npm/lib/install/get-package-id.js        |   19 +
 deps/npm/lib/install/inflate-bundled.js       |   15 +
 deps/npm/lib/install/inflate-shrinkwrap.js    |   58 +
 deps/npm/lib/install/is-dev.js                |    7 +
 deps/npm/lib/install/is-extraneous.js         |   14 +
 .../npm/lib/install/is-fs-access-available.js |   22 +
 .../lib/install/mutate-into-logical-tree.js   |  112 ++
 deps/npm/lib/install/node.js                  |   61 +
 deps/npm/lib/install/prune-tree.js            |   36 +
 deps/npm/lib/install/read-shrinkwrap.js       |   32 +
 deps/npm/lib/install/save.js                  |  199 ++
 deps/npm/lib/install/update-package-json.js   |   18 +
 deps/npm/lib/install/validate-args.js         |   44 +
 deps/npm/lib/install/validate-tree.js         |   69 +
 deps/npm/lib/install/writable.js              |   35 +
 deps/npm/lib/link.js                          |  123 +-
 deps/npm/lib/logout.js                        |   31 +-
 deps/npm/lib/ls.js                            |  439 +++--
 deps/npm/lib/npm.js                           |  852 ++++-----
 deps/npm/lib/outdated.js                      |  481 ++---
 deps/npm/lib/owner.js                         |  185 +-
 deps/npm/lib/pack.js                          |   59 +-
 deps/npm/lib/prefix.js                        |    9 +-
 deps/npm/lib/prune.js                         |   32 +-
 deps/npm/lib/publish.js                       |  116 +-
 deps/npm/lib/rebuild.js                       |   44 +-
 deps/npm/lib/repo.js                          |   75 +-
 deps/npm/lib/restart.js                       |    2 +-
 deps/npm/lib/root.js                          |    9 +-
 deps/npm/lib/run-script.js                    |  126 +-
 deps/npm/lib/search.js                        |  193 +-
 deps/npm/lib/set.js                           |    6 +-
 deps/npm/lib/shrinkwrap.js                    |  141 +-
 deps/npm/lib/star.js                          |   27 +-
 deps/npm/lib/stars.js                         |   18 +-
 deps/npm/lib/start.js                         |    2 +-
 deps/npm/lib/stop.js                          |    2 +-
 deps/npm/lib/substack.js                      |   21 +-
 deps/npm/lib/tag.js                           |   35 +-
 deps/npm/lib/test.js                          |    6 +-
 deps/npm/lib/unbuild.js                       |  125 +-
 deps/npm/lib/uninstall.js                     |  163 +-
 deps/npm/lib/unpublish.js                     |   56 +-
 deps/npm/lib/update.js                        |   74 +-
 .../lib/utils/completion/file-completion.js   |   17 +-
 .../lib/utils/completion/installed-deep.js    |   28 +-
 .../lib/utils/completion/installed-shallow.js |   54 +-
 deps/npm/lib/utils/deep-sort-object.js        |   12 +
 deps/npm/lib/utils/depr-check.js              |    6 +-
 deps/npm/lib/utils/error-handler.js           |  577 +++---
 deps/npm/lib/utils/gently-rm.js               |  142 +-
 deps/npm/lib/utils/git.js                     |   23 +-
 deps/npm/lib/utils/lifecycle.js               |  262 +--
 deps/npm/lib/utils/link.js                    |   54 +-
 deps/npm/lib/utils/locker.js                  |   60 +-
 deps/npm/lib/utils/map-to-registry.js         |   38 +-
 deps/npm/lib/utils/parse-json.js              |   24 +
 deps/npm/lib/utils/pulse-till-done.js         |   21 +
 deps/npm/lib/utils/read-local-package.js      |   10 +-
 deps/npm/lib/utils/spawn.js                   |   12 +-
 deps/npm/lib/utils/tar.js                     |  345 ++--
 deps/npm/lib/utils/temp-filename.js           |    7 +
 deps/npm/lib/utils/umask.js                   |    6 +-
 deps/npm/lib/utils/warn-deprecated.js         |    5 +-
 deps/npm/lib/version.js                       |    5 +-
 deps/npm/lib/view.js                          |  194 +-
 deps/npm/lib/visnup.js                        |   56 +-
 deps/npm/lib/whoami.js                        |   19 +-
 deps/npm/lib/xmas.js                          |   96 +-
 deps/npm/man/man1/npm-bin.1                   |    2 +-
 deps/npm/man/man1/npm-bugs.1                  |    3 +-
 deps/npm/man/man1/npm-build.1                 |    2 +-
 deps/npm/man/man1/npm-completion.1            |   11 +-
 deps/npm/man/man1/npm-config.1                |    1 -
 deps/npm/man/man1/npm-dedupe.1                |   21 +-
 deps/npm/man/man1/npm-deprecate.1             |    2 +-
 deps/npm/man/man1/npm-docs.1                  |    4 +-
 deps/npm/man/man1/npm-edit.1                  |    2 +-
 deps/npm/man/man1/npm-explore.1               |    2 +-
 deps/npm/man/man1/npm-help-search.1           |    2 +-
 deps/npm/man/man1/npm-help.1                  |    3 +-
 deps/npm/man/man1/npm-init.1                  |    2 +-
 deps/npm/man/man1/npm-install.1               |   79 +-
 deps/npm/man/man1/npm-link.1                  |    7 +-
 deps/npm/man/man1/npm-logout.1                |    2 +-
 deps/npm/man/man1/npm-ls.1                    |   22 +-
 deps/npm/man/man1/npm-outdated.1              |    2 +-
 deps/npm/man/man1/npm-owner.1                 |    6 +-
 deps/npm/man/man1/npm-pack.1                  |   10 +-
 deps/npm/man/man1/npm-prune.1                 |    3 +-
 deps/npm/man/man1/npm-publish.1               |    6 +-
 deps/npm/man/man1/npm-rebuild.1               |   11 +-
 deps/npm/man/man1/npm-repo.1                  |    3 +-
 deps/npm/man/man1/npm-rm.1                    |   34 -
 deps/npm/man/man1/npm-root.1                  |    2 +-
 deps/npm/man/man1/npm-run-script.1            |    5 +-
 deps/npm/man/man1/npm-search.1                |    4 +-
 deps/npm/man/man1/npm-shrinkwrap.1            |   42 +-
 deps/npm/man/man1/npm-star.1                  |    4 +-
 deps/npm/man/man1/npm-stars.1                 |    3 +-
 deps/npm/man/man1/npm-tag.1                   |    3 +-
 deps/npm/man/man1/npm-uninstall.1             |    8 +-
 deps/npm/man/man1/npm-unpublish.1             |    2 +-
 deps/npm/man/man1/npm-update.1                |    2 +-
 deps/npm/man/man1/npm-version.1               |    4 +
 deps/npm/man/man1/npm-view.1                  |    5 +-
 deps/npm/man/man1/npm-whoami.1                |    2 +-
 deps/npm/man/man1/npm.1                       |    2 +-
 deps/npm/man/man3/npm-bin.3                   |    2 +-
 deps/npm/man/man3/npm-bugs.3                  |    2 +-
 deps/npm/man/man3/npm-cache.3                 |    2 +-
 deps/npm/man/man3/npm-commands.3              |    2 +-
 deps/npm/man/man3/npm-config.3                |    2 +-
 deps/npm/man/man3/npm-deprecate.3             |    2 +-
 deps/npm/man/man3/npm-docs.3                  |    2 +-
 deps/npm/man/man3/npm-edit.3                  |    2 +-
 deps/npm/man/man3/npm-explore.3               |    2 +-
 deps/npm/man/man3/npm-help-search.3           |    2 +-
 deps/npm/man/man3/npm-init.3                  |    2 +-
 deps/npm/man/man3/npm-install.3               |    2 +-
 deps/npm/man/man3/npm-link.3                  |    2 +-
 deps/npm/man/man3/npm-load.3                  |    2 +-
 deps/npm/man/man3/npm-ls.3                    |    2 +-
 deps/npm/man/man3/npm-outdated.3              |    2 +-
 deps/npm/man/man3/npm-owner.3                 |    2 +-
 deps/npm/man/man3/npm-pack.3                  |    2 +-
 deps/npm/man/man3/npm-ping.3                  |    2 +-
 deps/npm/man/man3/npm-prefix.3                |    2 +-
 deps/npm/man/man3/npm-prune.3                 |    2 +-
 deps/npm/man/man3/npm-publish.3               |    2 +-
 deps/npm/man/man3/npm-rebuild.3               |    2 +-
 deps/npm/man/man3/npm-repo.3                  |    2 +-
 deps/npm/man/man3/npm-restart.3               |    2 +-
 deps/npm/man/man3/npm-root.3                  |    2 +-
 deps/npm/man/man3/npm-run-script.3            |    2 +-
 deps/npm/man/man3/npm-search.3                |    2 +-
 deps/npm/man/man3/npm-shrinkwrap.3            |    2 +-
 deps/npm/man/man3/npm-start.3                 |    2 +-
 deps/npm/man/man3/npm-stop.3                  |    2 +-
 deps/npm/man/man3/npm-tag.3                   |    2 +-
 deps/npm/man/man3/npm-test.3                  |    2 +-
 deps/npm/man/man3/npm-uninstall.3             |    2 +-
 deps/npm/man/man3/npm-unpublish.3             |    2 +-
 deps/npm/man/man3/npm-update.3                |    4 +-
 deps/npm/man/man3/npm-version.3               |    2 +-
 deps/npm/man/man3/npm-view.3                  |    2 +-
 deps/npm/man/man3/npm-whoami.3                |    2 +-
 deps/npm/man/man3/npm.3                       |    4 +-
 deps/npm/man/man5/npm-json.5                  |   13 +-
 deps/npm/man/man5/package.json.5              |   13 +-
 deps/npm/man/man7/npm-config.7                |   77 +-
 deps/npm/man/man7/npm-index.7                 |  126 --
 deps/npm/node_modules/abbrev/package.json     |   82 +-
 .../node_modules => }/ansi-regex/index.js     |    0
 .../strip-ansi => ansi-regex}/license         |    0
 .../node_modules => }/ansi-regex/package.json |  148 +-
 .../node_modules => }/ansi-regex/readme.md    |    0
 .../node_modules => }/ansi-styles/index.js    |    0
 .../ansi-regex => ansi-styles}/license        |    0
 .../ansi-styles/package.json                  |  134 +-
 .../node_modules => }/ansi-styles/readme.md   |    0
 deps/npm/node_modules/ansi/.jshintrc          |    4 -
 deps/npm/node_modules/ansi/package.json       |   90 +-
 deps/npm/node_modules/ansicolors/package.json |   85 +-
 deps/npm/node_modules/ansistyles/package.json |   87 +-
 .../brace-expansion => aproba}/.npmignore     |    3 +-
 .../node_modules/promzard => aproba}/LICENSE  |    8 +-
 deps/npm/node_modules/aproba/README.md        |   54 +
 deps/npm/node_modules/aproba/index.js         |   53 +
 deps/npm/node_modules/aproba/package.json     |   77 +
 deps/npm/node_modules/aproba/test/index.js    |   85 +
 .../stringstream => archy}/.travis.yml        |    2 +-
 deps/npm/node_modules/archy/package.json      |  135 +-
 .../are-we-there-yet/.npmignore               |    0
 .../are-we-there-yet/README.md                |    2 +-
 .../are-we-there-yet/index.js                 |    0
 .../are-we-there-yet/package.json             |   79 +-
 .../are-we-there-yet/test/tracker.js          |    0
 .../are-we-there-yet/test/trackergroup.js     |    4 +-
 .../are-we-there-yet/test/trackerstream.js    |    0
 .../wcwidth => array-index}/.npmignore        |    0
 .../node_modules => }/array-index/.travis.yml |    0
 .../node_modules => }/array-index/History.md  |    0
 .../node_modules => }/array-index/Makefile    |    0
 .../node_modules => }/array-index/README.md   |    0
 .../array-index/component.json                |    0
 .../node_modules => }/array-index/index.js    |    0
 .../array-index/package.json                  |   94 +-
 .../node_modules => }/array-index/test.js     |    0
 .../node_modules => }/asap/CHANGES.md         |    0
 .../node_modules => }/asap/LICENSE.md         |    1 -
 .../{dezalgo/node_modules => }/asap/README.md |    1 -
 .../{dezalgo/node_modules => }/asap/asap.js   |    1 -
 .../node_modules => }/asap/browser-asap.js    |    0
 .../node_modules => }/asap/browser-raw.js     |    0
 .../node_modules => }/asap/package.json       |  120 +-
 .../{dezalgo/node_modules => }/asap/raw.js    |    0
 .../node_modules => }/asn1/.npmignore         |    0
 .../node_modules => }/asn1/LICENSE            |    0
 .../node_modules => }/asn1/README.md          |    0
 .../node_modules => }/asn1/lib/ber/errors.js  |    0
 .../node_modules => }/asn1/lib/ber/index.js   |    0
 .../node_modules => }/asn1/lib/ber/reader.js  |    0
 .../node_modules => }/asn1/lib/ber/types.js   |    0
 .../node_modules => }/asn1/lib/ber/writer.js  |    0
 .../node_modules => }/asn1/lib/index.js       |    0
 .../node_modules => }/asn1/package.json       |   87 +-
 .../asn1/tst/ber/reader.test.js               |    0
 .../asn1/tst/ber/writer.test.js               |    0
 .../node_modules => }/assert-plus/README.md   |    0
 .../node_modules => }/assert-plus/assert.js   |    0
 .../assert-plus/package.json                  |   71 +-
 deps/npm/node_modules/async-some/package.json |   88 +-
 .../node_modules => }/async/CHANGELOG.md      |    0
 .../form-data/node_modules => }/async/LICENSE |    0
 .../node_modules => }/async/lib/async.js      |    0
 .../node_modules => }/async/package.json      |  152 +-
 .../node_modules => }/aws-sign2/LICENSE       |    0
 .../node_modules => }/aws-sign2/README.md     |    0
 .../node_modules => }/aws-sign2/index.js      |   18 +-
 .../node_modules => }/aws-sign2/package.json  |   74 +-
 .../balanced-match/.npmignore                 |    0
 .../balanced-match/.travis.yml                |    0
 .../node_modules => }/balanced-match/Makefile |    1 -
 .../balanced-match/README.md                  |    0
 .../balanced-match/example.js                 |    1 -
 .../node_modules => }/balanced-match/index.js |    0
 .../balanced-match/package.json               |  129 +-
 .../balanced-match/test/balanced.js           |    0
 .../{request/node_modules => }/bl/.npmignore  |    0
 .../{request/node_modules => }/bl/.travis.yml |    0
 .../{request/node_modules => }/bl/LICENSE.md  |    0
 .../{request/node_modules => }/bl/README.md   |    0
 .../{request/node_modules => }/bl/bl.js       |    0
 .../node_modules/readable-stream/.npmignore   |    0
 .../node_modules/readable-stream/.travis.yml  |    0
 .../node_modules/readable-stream/.zuul.yml    |    0
 .../node_modules/readable-stream/LICENSE      |    0
 .../node_modules/readable-stream/README.md    |    0
 .../readable-stream/doc/stream.markdown       |    0
 .../doc/wg-meetings/2015-01-30.md             |    0
 .../node_modules/readable-stream/duplex.js    |    0
 .../readable-stream/lib/_stream_duplex.js     |    0
 .../lib/_stream_passthrough.js                |    0
 .../readable-stream/lib/_stream_readable.js   |    0
 .../readable-stream/lib/_stream_transform.js  |    0
 .../readable-stream/lib/_stream_writable.js   |    0
 .../node_modules/readable-stream/package.json |   97 +-
 .../readable-stream/passthrough.js            |    0
 .../node_modules/readable-stream/readable.js  |    0
 .../node_modules/readable-stream/transform.js |    0
 .../node_modules/readable-stream/writable.js  |    0
 .../node_modules => }/bl/package.json         |  112 +-
 .../node_modules => }/bl/test/basic-test.js   |    0
 .../node_modules => }/bl/test/sauce.js        |    0
 .../node_modules => }/bl/test/test.js         |    0
 .../node_modules/block-stream/package.json    |   87 +-
 .../node_modules => }/bluebird/LICENSE        |    0
 .../node_modules => }/bluebird/README.md      |    0
 .../node_modules => }/bluebird/changelog.md   |    0
 .../bluebird/js/browser/bluebird.js           |   58 +-
 .../bluebird/js/browser/bluebird.min.js       |   10 +-
 .../node_modules => }/bluebird/js/main/any.js |    0
 .../bluebird/js/main/assert.js                |    0
 .../bluebird/js/main/async.js                 |    0
 .../bluebird/js/main/bind.js                  |    0
 .../bluebird/js/main/bluebird.js              |    0
 .../bluebird/js/main/call_get.js              |    0
 .../bluebird/js/main/cancel.js                |    0
 .../bluebird/js/main/captured_trace.js        |    0
 .../bluebird/js/main/catch_filter.js          |    0
 .../bluebird/js/main/context.js               |    0
 .../bluebird/js/main/debuggability.js         |    0
 .../bluebird/js/main/direct_resolve.js        |    0
 .../bluebird/js/main/each.js                  |    0
 .../bluebird/js/main/errors.js                |    0
 .../node_modules => }/bluebird/js/main/es5.js |    0
 .../bluebird/js/main/filter.js                |    0
 .../bluebird/js/main/finally.js               |    0
 .../bluebird/js/main/generators.js            |    0
 .../bluebird/js/main/join.js                  |    0
 .../node_modules => }/bluebird/js/main/map.js |    0
 .../bluebird/js/main/method.js                |    0
 .../bluebird/js/main/nodeify.js               |    0
 .../bluebird/js/main/progress.js              |    0
 .../bluebird/js/main/promise.js               |   48 +-
 .../bluebird/js/main/promise_array.js         |    0
 .../bluebird/js/main/promise_resolver.js      |    0
 .../bluebird/js/main/promisify.js             |    1 -
 .../bluebird/js/main/props.js                 |    0
 .../bluebird/js/main/queue.js                 |    0
 .../bluebird/js/main/race.js                  |    0
 .../bluebird/js/main/reduce.js                |    0
 .../bluebird/js/main/schedule.js              |    0
 .../bluebird/js/main/settle.js                |    0
 .../bluebird/js/main/some.js                  |    0
 .../js/main/synchronous_inspection.js         |    0
 .../bluebird/js/main/thenables.js             |    0
 .../bluebird/js/main/timers.js                |    0
 .../bluebird/js/main/using.js                 |    0
 .../bluebird/js/main/util.js                  |    0
 .../node_modules => }/bluebird/package.json   |  133 +-
 .../cryptiles => boom}/.npmignore             |    0
 .../cryptiles => boom}/.travis.yml            |    0
 .../node_modules => }/boom/CONTRIBUTING.md    |    0
 .../hawk/node_modules => }/boom/LICENSE       |    0
 .../hawk/node_modules => }/boom/README.md     |    0
 .../node_modules => }/boom/images/boom.png    |  Bin
 .../hawk/node_modules => }/boom/lib/index.js  |    0
 .../hawk/node_modules => }/boom/package.json  |   93 +-
 .../hawk/node_modules => }/boom/test/index.js |    0
 .../node_modules/brace-expansion/.npmignore   |    3 +
 .../brace-expansion/README.md                 |    3 +-
 .../brace-expansion/example.js                |    1 -
 .../brace-expansion/index.js                  |    1 -
 .../brace-expansion/package.json              |  129 +-
 .../builtin-modules/builtin-modules.json      |    0
 .../builtin-modules/index.js                  |    0
 .../license                                   |    0
 .../builtin-modules/package.json              |  114 +-
 .../builtin-modules/readme.md                 |    0
 .../builtin-modules/static.js                 |    0
 .../minimist => builtins}/.travis.yml         |    0
 .../node_modules => }/builtins/History.md     |    0
 .../node_modules => }/builtins/Readme.md      |    0
 .../node_modules => }/builtins/builtins.json  |    0
 deps/npm/node_modules/builtins/package.json   |   71 +
 .../node_modules => }/caseless/LICENSE        |    0
 .../node_modules => }/caseless/README.md      |    0
 .../node_modules => }/caseless/index.js       |    0
 .../node_modules => }/caseless/package.json   |   88 +-
 .../node_modules => }/caseless/test.js        |    0
 .../node_modules => }/chalk/index.js          |    0
 .../is-builtin-module => chalk}/license       |    0
 .../node_modules => }/chalk/package.json      |  177 +-
 .../node_modules => }/chalk/readme.md         |    0
 deps/npm/node_modules/char-spinner/README.md  |   31 -
 .../node_modules/char-spinner/package.json    |   54 -
 deps/npm/node_modules/char-spinner/spin.js    |   51 -
 .../node_modules/char-spinner/test/basic.js   |   35 -
 deps/npm/node_modules/chmodr/README.md        |    3 -
 deps/npm/node_modules/chmodr/chmodr.js        |   65 -
 deps/npm/node_modules/chmodr/package.json     |   53 -
 deps/npm/node_modules/chownr/package.json     |   89 +-
 .../node_modules => }/clone/.npmignore        |    0
 .../node_modules => }/clone/.travis.yml       |    0
 .../defaults/node_modules => }/clone/LICENSE  |    0
 .../node_modules => }/clone/README.md         |    0
 .../defaults/node_modules => }/clone/clone.js |    2 +-
 .../node_modules => }/clone/package.json      |  113 +-
 .../defaults/node_modules => }/clone/test.js  |    0
 deps/npm/node_modules/cmd-shim/package.json   |   78 +-
 .../node_modules/strip-ansi/package.json      |   85 -
 deps/npm/node_modules/columnify/package.json  |  109 +-
 .../node_modules => }/combined-stream/License |    0
 .../combined-stream/Readme.md                 |    0
 .../combined-stream/lib/combined_stream.js    |    0
 .../combined-stream/package.json              |   88 +-
 .../node_modules => }/commander/History.md    |    0
 .../node_modules => }/commander/LICENSE       |    0
 .../node_modules => }/commander/Readme.md     |    9 +-
 .../node_modules => }/commander/index.js      |    0
 .../node_modules => }/commander/package.json  |   97 +-
 .../node_modules => }/concat-map/.travis.yml  |    0
 .../node_modules => }/concat-map/LICENSE      |    0
 .../concat-map/README.markdown                |    0
 .../concat-map/example/map.js                 |    0
 .../node_modules => }/concat-map/index.js     |    0
 .../node_modules => }/concat-map/package.json |  138 +-
 .../node_modules => }/concat-map/test/map.js  |    0
 deps/npm/node_modules/concat-stream/LICENSE   |   24 +
 .../node_modules => }/concat-stream/index.js  |    0
 .../node_modules/readable-stream/.npmignore   |    0
 .../node_modules/readable-stream/.travis.yml  |    0
 .../node_modules/readable-stream/.zuul.yml    |    0
 .../node_modules/readable-stream/LICENSE      |    0
 .../node_modules/readable-stream/README.md    |    0
 .../readable-stream/doc/stream.markdown       |    0
 .../doc/wg-meetings/2015-01-30.md             |    0
 .../node_modules/readable-stream/duplex.js    |    0
 .../readable-stream/lib/_stream_duplex.js     |    0
 .../lib/_stream_passthrough.js                |    0
 .../readable-stream/lib/_stream_readable.js   |    0
 .../readable-stream/lib/_stream_transform.js  |    0
 .../readable-stream/lib/_stream_writable.js   |    0
 .../node_modules/readable-stream/package.json |   97 +-
 .../readable-stream/passthrough.js            |    0
 .../node_modules/readable-stream/readable.js  |    0
 .../node_modules/readable-stream/transform.js |    0
 .../node_modules/readable-stream/writable.js  |    0
 .../concat-stream/package.json                |  144 +-
 .../node_modules => }/concat-stream/readme.md |    2 +-
 .../node_modules/config-chain/package.json    |   96 +-
 .../node_modules => }/core-util-is/README.md  |    0
 .../core-util-is/float.patch                  |    0
 .../core-util-is/lib/util.js                  |    0
 .../core-util-is/package.json                 |   92 +-
 .../node_modules => }/core-util-is/util.js    |    0
 .../boom => cryptiles}/.npmignore             |    1 -
 .../hoek => cryptiles}/.travis.yml            |    0
 .../hawk/node_modules => }/cryptiles/LICENSE  |    0
 .../node_modules => }/cryptiles/README.md     |    0
 .../node_modules => }/cryptiles/lib/index.js  |    2 -
 .../node_modules => }/cryptiles/package.json  |   95 +-
 .../node_modules => }/cryptiles/test/index.js |    0
 .../node_modules => }/ctype/.npmignore        |    0
 .../node_modules => }/ctype/CHANGELOG         |    0
 .../node_modules => }/ctype/LICENSE           |    0
 .../node_modules => }/ctype/README            |    0
 .../node_modules => }/ctype/README.old        |    1 -
 .../node_modules => }/ctype/ctf.js            |    0
 .../node_modules => }/ctype/ctio.js           |    0
 .../node_modules => }/ctype/ctype.js          |    0
 .../ctype/man/man3ctype/ctio.3ctype           |    4 +-
 deps/npm/node_modules/ctype/package.json      |   64 +
 .../node_modules => }/ctype/tools/jsl.conf    |    0
 .../node_modules => }/ctype/tools/jsstyle     |    0
 .../node_modules => }/debuglog/LICENSE        |    0
 .../node_modules => }/debuglog/README.md      |    0
 .../node_modules => }/debuglog/debuglog.js    |    0
 .../node_modules => }/debuglog/package.json   |   74 +-
 .../node_modules => }/defaults/.npmignore     |    0
 .../node_modules => }/defaults/LICENSE        |    0
 .../node_modules => }/defaults/README.md      |    0
 .../node_modules => }/defaults/index.js       |    0
 .../node_modules => }/defaults/package.json   |   86 +-
 .../node_modules => }/defaults/test.js        |    1 -
 .../delayed-stream/.npmignore                 |    0
 .../node_modules => }/delayed-stream/License  |    0
 .../node_modules => }/delayed-stream/Makefile |    1 -
 .../delayed-stream/Readme.md                  |    0
 .../delayed-stream/lib/delayed_stream.js      |    0
 .../delayed-stream/package.json               |   89 +-
 .../node_modules => }/delegates/.npmignore    |    0
 .../node_modules => }/delegates/History.md    |    0
 .../node_modules => }/delegates/Makefile      |    0
 .../node_modules => }/delegates/Readme.md     |    0
 .../node_modules => }/delegates/index.js      |    0
 .../node_modules => }/delegates/package.json  |   75 +-
 .../node_modules => }/delegates/test/index.js |    0
 deps/npm/node_modules/dezalgo/package.json    |  113 +-
 deps/npm/node_modules/editor/package.json     |   98 +-
 .../escape-string-regexp/index.js             |    0
 .../license                                   |    0
 .../escape-string-regexp/package.json         |  122 +-
 .../escape-string-regexp/readme.md            |    0
 .../node_modules => }/extend/.jscs.json       |    0
 .../node_modules => }/extend/.npmignore       |    0
 .../node_modules => }/extend/.travis.yml      |    0
 .../node_modules => }/extend/CHANGELOG.md     |    0
 .../{request/node_modules => }/extend/LICENSE |    0
 .../node_modules => }/extend/README.md        |    0
 .../node_modules => }/extend/component.json   |    0
 .../node_modules => }/extend/index.js         |    0
 .../node_modules => }/extend/package.json     |  105 +-
 .../node_modules => }/forever-agent/LICENSE   |    0
 .../node_modules => }/forever-agent/README.md |    0
 .../node_modules => }/forever-agent/index.js  |   12 +-
 .../forever-agent/package.json                |   76 +-
 .../node_modules => }/form-data/License       |    0
 .../node_modules => }/form-data/Readme.md     |    0
 .../form-data/lib/browser.js                  |    0
 .../form-data/lib/form_data.js                |    0
 .../node_modules => }/form-data/package.json  |   94 +-
 deps/npm/node_modules/fs-vacuum/package.json  |   97 +-
 .../fs-write-stream-atomic/package.json       |   94 +-
 .../fstream-ignore/.npmignore                 |    0
 .../{chmodr => fstream-ignore}/LICENSE        |    0
 .../fstream-ignore/README.md                  |    0
 .../fstream-ignore/example/basic.js           |    0
 .../fstream-ignore/ignore.js                  |    0
 .../fstream-ignore/package.json               |   87 +-
 .../fstream-ignore/test/.ignore               |    0
 .../fstream-ignore/test/.npmignore            |    0
 .../fstream-ignore/test/00-setup.js           |    1 -
 .../fstream-ignore/test/basic.js              |    0
 .../fstream-ignore/test/common.js             |    0
 .../fstream-ignore/test/ignore-most.js        |    0
 .../fstream-ignore/test/nested-ignores.js     |    0
 .../fstream-ignore/test/read-file-order.js    |    0
 .../fstream-ignore/test/unignore-child.js     |    0
 .../fstream-ignore/test/zz-cleanup.js         |    0
 .../npm/node_modules/fstream-npm/package.json |   89 +-
 deps/npm/node_modules/fstream/package.json    |  101 +-
 .../node_modules => }/gauge/.npmignore        |    0
 .../{npmlog/node_modules => }/gauge/LICENSE   |    0
 .../{npmlog/node_modules => }/gauge/README.md |   11 +-
 .../node_modules => }/gauge/example.png       |  Bin
 deps/npm/node_modules/gauge/package.json      |   82 +
 .../node_modules => }/gauge/progress-bar.js   |   21 +-
 .../gauge/test/progress-bar.js                |   32 +-
 .../.npmignore                                |    0
 .../.travis.yml                               |    0
 .../generate-function/README.md               |    0
 .../generate-function/example.js              |    0
 .../generate-function/index.js                |    0
 .../generate-function/package.json            |   86 +-
 .../generate-function/test.js                 |    0
 .../.npmignore                                |    0
 .../.travis.yml                               |    0
 .../LICENSE                                   |    0
 .../generate-object-property/README.md        |    0
 .../generate-object-property/index.js         |    0
 .../generate-object-property/package.json     |   89 +-
 .../generate-object-property/test.js          |    0
 .../node_modules/github-url-from-git/Makefile |    5 -
 .../github-url-from-git/Readme.md             |   92 -
 .../node_modules/github-url-from-git/index.js |   32 -
 .../github-url-from-git/package.json          |   57 -
 .../node_modules/github-url-from-git/test.js  |   90 -
 .../github-url-from-username-repo/.npmignore  |   13 -
 .../github-url-from-username-repo/.travis.yml |    4 -
 .../github-url-from-username-repo/LICENSE     |   27 -
 .../github-url-from-username-repo/README.md   |   21 -
 .../github-url-from-username-repo/index.js    |   21 -
 .../package.json                              |   36 -
 .../test/index.js                             |   70 -
 deps/npm/node_modules/glob/package.json       |  113 +-
 .../npm/node_modules/graceful-fs/package.json |   56 +-
 .../graceful-readlink/.npmignore              |    0
 .../graceful-readlink/.travis.yml             |    0
 .../graceful-readlink/LICENSE                 |    1 -
 .../graceful-readlink/README.md               |    0
 .../graceful-readlink/index.js                |    2 -
 .../graceful-readlink/package.json            |   85 +-
 .../node_modules => }/har-validator/LICENSE   |    0
 .../node_modules => }/har-validator/README.md |    0
 .../har-validator/bin/har-validator           |    0
 .../har-validator/lib/error.js                |    0
 .../har-validator/lib/index.js                |    0
 .../har-validator/lib/schemas/cache.json      |    0
 .../har-validator/lib/schemas/cacheEntry.json |    0
 .../har-validator/lib/schemas/content.json    |    0
 .../har-validator/lib/schemas/cookie.json     |    0
 .../har-validator/lib/schemas/creator.json    |    0
 .../har-validator/lib/schemas/entry.json      |    0
 .../har-validator/lib/schemas/har.json        |    0
 .../har-validator/lib/schemas/index.js        |    0
 .../har-validator/lib/schemas/log.json        |    0
 .../har-validator/lib/schemas/page.json       |    0
 .../lib/schemas/pageTimings.json              |    0
 .../har-validator/lib/schemas/postData.json   |    0
 .../har-validator/lib/schemas/record.json     |    0
 .../har-validator/lib/schemas/request.json    |    0
 .../har-validator/lib/schemas/response.json   |    0
 .../har-validator/lib/schemas/timings.json    |    0
 .../har-validator/package.json                |  135 +-
 .../chalk/node_modules => }/has-ansi/index.js |    0
 .../os-homedir => has-ansi}/license           |    0
 .../node_modules => }/has-ansi/package.json   |  143 +-
 .../node_modules => }/has-ansi/readme.md      |    0
 .../node_modules => }/has-unicode/.npmignore  |    0
 .../node_modules => }/has-unicode/LICENSE     |    1 -
 .../node_modules => }/has-unicode/README.md   |    3 +-
 .../node_modules => }/has-unicode/index.js    |    0
 .../has-unicode/package.json                  |   87 +-
 .../has-unicode/test/index.js                 |    0
 .../node_modules => }/hawk/.npmignore         |    0
 .../node_modules => }/hawk/.travis.yml        |    0
 .../{request/node_modules => }/hawk/LICENSE   |    0
 .../{request/node_modules => }/hawk/README.md |   10 +-
 .../node_modules => }/hawk/bower.json         |    0
 .../node_modules => }/hawk/component.json     |    0
 .../node_modules => }/hawk/example/usage.js   |    1 -
 .../node_modules => }/hawk/images/hawk.png    |  Bin
 .../node_modules => }/hawk/images/logo.png    |  Bin
 .../node_modules => }/hawk/lib/browser.js     |    0
 .../node_modules => }/hawk/lib/client.js      |    3 -
 .../node_modules => }/hawk/lib/crypto.js      |    0
 .../node_modules => }/hawk/lib/index.js       |    1 -
 .../node_modules => }/hawk/lib/server.js      |    0
 .../node_modules => }/hawk/lib/utils.js       |    1 -
 .../node_modules => }/hawk/package.json       |  105 +-
 .../node_modules => }/hawk/test/browser.js    |    0
 .../node_modules => }/hawk/test/client.js     |    0
 .../node_modules => }/hawk/test/crypto.js     |    0
 .../node_modules => }/hawk/test/index.js      |    0
 .../node_modules => }/hawk/test/readme.js     |    1 -
 .../node_modules => }/hawk/test/server.js     |    0
 .../node_modules => }/hawk/test/uri.js        |    1 -
 .../node_modules => }/hawk/test/utils.js      |    0
 .../hawk/node_modules => }/hoek/.npmignore    |    0
 .../node_modules/qs => hoek}/.travis.yml      |    0
 .../node_modules => }/hoek/CONTRIBUTING.md    |    0
 .../hawk/node_modules => }/hoek/LICENSE       |    0
 .../hawk/node_modules => }/hoek/README.md     |    0
 .../node_modules => }/hoek/images/hoek.png    |  Bin
 .../hawk/node_modules => }/hoek/lib/escape.js |    0
 .../hawk/node_modules => }/hoek/lib/index.js  |    0
 .../hawk/node_modules => }/hoek/package.json  |   92 +-
 .../node_modules => }/hoek/test/escaper.js    |    0
 .../hawk/node_modules => }/hoek/test/index.js |    0
 .../hoek/test/modules/ignore.txt              |    0
 .../hoek/test/modules/test1.js                |    0
 .../hoek/test/modules/test2.js                |    0
 .../hoek/test/modules/test3.js                |    0
 .../node_modules/hosted-git-info/package.json |   87 +-
 .../http-signature/.dir-locals.el             |    0
 .../http-signature/.npmignore                 |    0
 .../node_modules => }/http-signature/LICENSE  |    0
 .../http-signature/README.md                  |    0
 .../http-signature/http_signing.md            |    1 -
 .../http-signature/lib/index.js               |    0
 .../http-signature/lib/parser.js              |    0
 .../http-signature/lib/signer.js              |    0
 .../http-signature/lib/util.js                |    0
 .../http-signature/lib/verify.js              |    0
 .../http-signature/package.json               |   99 +-
 .../generate-function => iferr}/.npmignore    |    0
 .../license.md => iferr/LICENSE}              |    8 +-
 deps/npm/node_modules/iferr/README.md         |   40 +
 deps/npm/node_modules/iferr/index.coffee      |   24 +
 deps/npm/node_modules/iferr/index.js          |   49 +
 deps/npm/node_modules/iferr/package.json      |   75 +
 deps/npm/node_modules/iferr/test/index.coffee |   42 +
 deps/npm/node_modules/iferr/test/mocha.opts   |    2 +
 deps/npm/node_modules/inflight/package.json   |   93 +-
 deps/npm/node_modules/inherits/package.json   |  102 +-
 deps/npm/node_modules/ini/package.json        |   90 +-
 .../init-package-json/package.json            |  100 +-
 .../node_modules => }/is-absolute/LICENSE     |    0
 .../node_modules => }/is-absolute/README.md   |    0
 .../node_modules => }/is-absolute/index.js    |    0
 .../is-absolute/package.json                  |   97 +-
 .../is-builtin-module/index.js                |    0
 .../os-tmpdir => is-builtin-module}/license   |    0
 .../is-builtin-module/package.json            |  117 +-
 .../is-builtin-module/readme.md               |    0
 .../is-my-json-valid/.npmignore               |    0
 .../is-my-json-valid/.travis.yml              |    0
 .../LICENSE                                   |    0
 .../is-my-json-valid/README.md                |    0
 .../is-my-json-valid/example.js               |    0
 .../is-my-json-valid/formats.js               |    0
 .../is-my-json-valid/index.js                 |   12 +-
 .../is-my-json-valid/package.json             |   97 +-
 .../is-my-json-valid/require.js               |    0
 .../is-my-json-valid/test/fixtures/cosmic.js  |    0
 .../json-schema-draft4/additionalItems.json   |    0
 .../additionalProperties.json                 |    0
 .../test/json-schema-draft4/allOf.json        |    0
 .../test/json-schema-draft4/anyOf.json        |    0
 .../test/json-schema-draft4/bignum.json       |    0
 .../test/json-schema-draft4/default.json      |    0
 .../test/json-schema-draft4/definitions.json  |    0
 .../test/json-schema-draft4/dependencies.json |    0
 .../test/json-schema-draft4/enum.json         |    0
 .../test/json-schema-draft4/format.json       |    0
 .../test/json-schema-draft4/items.json        |    0
 .../test/json-schema-draft4/maxItems.json     |    0
 .../test/json-schema-draft4/maxLength.json    |    0
 .../json-schema-draft4/maxProperties.json     |    0
 .../test/json-schema-draft4/maximum.json      |    0
 .../test/json-schema-draft4/minItems.json     |    0
 .../test/json-schema-draft4/minLength.json    |    0
 .../json-schema-draft4/minProperties.json     |    0
 .../test/json-schema-draft4/minimum.json      |    0
 .../test/json-schema-draft4/multipleOf.json   |    0
 .../test/json-schema-draft4/not.json          |    2 +-
 .../json-schema-draft4/nullAndFormat.json     |    0
 .../json-schema-draft4/nullAndObject.json     |    0
 .../test/json-schema-draft4/oneOf.json        |    0
 .../test/json-schema-draft4/pattern.json      |    0
 .../json-schema-draft4/patternProperties.json |    0
 .../test/json-schema-draft4/properties.json   |    0
 .../test/json-schema-draft4/ref.json          |    0
 .../test/json-schema-draft4/refRemote.json    |    0
 .../test/json-schema-draft4/required.json     |    0
 .../test/json-schema-draft4/type.json         |    0
 .../test/json-schema-draft4/uniqueItems.json  |    0
 .../is-my-json-valid/test/json-schema.js      |    0
 .../is-my-json-valid/test/misc.js             |    0
 .../node_modules => }/is-property/.npmignore  |    0
 .../node_modules => }/is-property/LICENSE     |    0
 .../node_modules => }/is-property/README.md   |    2 +-
 .../is-property/is-property.js                |    0
 .../is-property/package.json                  |   99 +-
 .../node_modules => }/is-relative/LICENSE-MIT |    0
 .../node_modules => }/is-relative/README.md   |    0
 .../node_modules => }/is-relative/index.js    |    0
 .../is-relative/package.json                  |  108 +-
 .../node_modules => }/isarray/README.md       |    0
 .../node_modules => }/isarray/build/build.js  |    0
 .../node_modules => }/isarray/component.json  |    0
 .../node_modules => }/isarray/index.js        |    0
 .../node_modules => }/isarray/package.json    |   88 +-
 .../node_modules => }/isstream/.npmignore     |    0
 .../node_modules => }/isstream/.travis.yml    |    0
 .../node_modules => }/isstream/LICENSE.md     |    0
 .../node_modules => }/isstream/README.md      |    0
 .../node_modules => }/isstream/isstream.js    |    0
 .../node_modules => }/isstream/package.json   |  104 +-
 .../node_modules => }/isstream/test.js        |    3 -
 .../node_modules => }/jju/.npmignore          |    5 +-
 .../node_modules => }/jju/README.md           |    1 -
 .../node_modules => }/jju/index.js            |    0
 .../node_modules => }/jju/lib/analyze.js      |    1 -
 .../node_modules => }/jju/lib/document.js     |    1 -
 .../node_modules => }/jju/lib/parse.js        |    1 -
 .../node_modules => }/jju/lib/stringify.js    |    1 -
 .../node_modules => }/jju/lib/unicode.js      |    0
 .../node_modules => }/jju/lib/utils.js        |    1 -
 deps/npm/node_modules/jju/package.json        |   88 +
 .../node_modules => }/jju/package.yaml        |    3 +-
 .../json-parse-helpfulerror/.editorconfig     |    0
 .../json-parse-helpfulerror/.npmignore        |    0
 .../json-parse-helpfulerror/LICENSE           |    1 -
 .../json-parse-helpfulerror/README.md         |    0
 .../json-parse-helpfulerror/index.js          |    0
 .../json-parse-helpfulerror/package.json      |   97 +-
 .../json-parse-helpfulerror/test/test.js      |    0
 .../json-stringify-safe/.npmignore            |    0
 .../json-stringify-safe/CHANGELOG.md          |    0
 .../LICENSE                                   |    0
 .../json-stringify-safe/Makefile              |    0
 .../json-stringify-safe/README.md             |    0
 .../json-stringify-safe/package.json          |   92 +-
 .../json-stringify-safe/stringify.js          |    0
 .../json-stringify-safe/test/mocha.opts       |    0
 .../test/stringify_test.js                    |    0
 .../node_modules => }/jsonpointer/.travis.yml |    0
 .../node_modules => }/jsonpointer/README.md   |    0
 .../jsonpointer/jsonpointer.js                |    0
 .../npm/node_modules/jsonpointer/package.json |   93 +
 .../node_modules => }/jsonpointer/test.js     |    0
 deps/npm/node_modules/lockfile/package.json   |   96 +-
 .../LICENSE.txt                               |    0
 .../node_modules/lodash._arraycopy/README.md  |   20 +
 .../node_modules/lodash._arraycopy/index.js   |   29 +
 .../lodash._arraycopy/package.json            |   97 +
 .../LICENSE.txt                               |    0
 .../node_modules/lodash._arrayeach/README.md  |   20 +
 .../node_modules/lodash._arrayeach/index.js   |   31 +
 .../lodash._arrayeach/package.json            |   97 +
 .../LICENSE.txt                               |    0
 .../node_modules/lodash._baseassign/README.md |   20 +
 .../node_modules/lodash._baseassign/index.js  |   27 +
 .../lodash._baseassign/package.json           |  116 ++
 .../LICENSE}                                  |    0
 .../lodash._basecallback/README.md            |   20 +
 .../lodash._basecallback/index.js             |  422 +++++
 .../lodash._basecallback/package.json         |  118 ++
 .../LICENSE.txt => lodash._baseclone/LICENSE} |    0
 .../node_modules/lodash._baseclone/README.md  |   20 +
 .../node_modules/lodash._baseclone/index.js   |  271 +++
 .../lodash._baseclone/package.json            |  120 ++
 .../LICENSE.txt                               |    0
 .../node_modules/lodash._basecopy/README.md   |   20 +
 .../node_modules/lodash._basecopy/index.js    |   32 +
 .../lodash._basecopy/package.json             |  113 ++
 .../lodash._basedifference/LICENSE            |   22 +
 .../lodash._basedifference/README.md          |   20 +
 .../lodash._basedifference/index.js           |   63 +
 .../lodash._basedifference/package.json       |  117 ++
 .../node_modules/lodash._baseflatten/LICENSE  |   22 +
 .../lodash._baseflatten/README.md             |   20 +
 .../node_modules/lodash._baseflatten/index.js |  131 ++
 .../lodash._baseflatten/package.json          |  116 ++
 .../node_modules/lodash._basefor/LICENSE.txt  |   22 +
 .../node_modules/lodash._basefor/README.md    |   20 +
 .../npm/node_modules/lodash._basefor/index.js |   86 +
 .../node_modules/lodash._basefor/package.json |  113 ++
 .../lodash._baseindexof/LICENSE.txt           |   22 +
 .../lodash._baseindexof/README.md             |   20 +
 .../node_modules/lodash._baseindexof/index.js |   57 +
 .../lodash._baseindexof/package.json          |  114 ++
 .../lodash._baseisequal/LICENSE.txt           |   22 +
 .../lodash._baseisequal/README.md             |   20 +
 .../node_modules/lodash._baseisequal/index.js |  342 ++++
 .../lodash._baseisequal/package.json          |  117 ++
 .../node_modules/lodash._basetostring/LICENSE |   22 +
 .../lodash._basetostring/README.md            |    4 +-
 .../lodash._basetostring/index.js             |    9 +-
 .../lodash._basetostring/package.json         |  106 +-
 .../npm/node_modules/lodash._baseuniq/LICENSE |   22 +
 .../node_modules/lodash._baseuniq/README.md   |   20 +
 .../node_modules/lodash._baseuniq/index.js    |   68 +
 .../lodash._baseuniq/package.json             |  118 ++
 .../lodash._bindcallback/LICENSE.txt          |   22 +
 .../lodash._bindcallback/README.md            |   20 +
 .../lodash._bindcallback/index.js             |   65 +
 .../lodash._bindcallback/package.json         |  114 ++
 .../lodash._cacheindexof/LICENSE.txt          |   22 +
 .../lodash._cacheindexof/README.md            |   20 +
 .../lodash._cacheindexof/index.js             |   53 +
 .../lodash._cacheindexof/package.json         |  114 ++
 .../node_modules/lodash._createcache/LICENSE  |   22 +
 .../lodash._createcache/README.md             |   20 +
 .../node_modules/lodash._createcache/index.js |   91 +
 .../lodash._createcache/package.json          |  116 ++
 .../lodash._createpadding/LICENSE             |   22 +
 .../lodash._createpadding/README.md           |    4 +-
 .../lodash._createpadding/index.js            |   12 +-
 .../lodash._createpadding/package.json        |  104 +-
 .../node_modules/lodash._getnative/LICENSE    |   22 +
 .../node_modules/lodash._getnative/README.md  |   20 +
 .../node_modules/lodash._getnative/index.js   |  137 ++
 .../lodash._getnative/package.json            |  111 ++
 .../lodash._isiterateecall/LICENSE.txt        |   22 +
 .../lodash._isiterateecall/README.md          |   20 +
 .../lodash._isiterateecall/index.js           |  132 ++
 .../lodash._isiterateecall/package.json       |  113 ++
 .../npm/node_modules/lodash.clonedeep/LICENSE |   22 +
 .../node_modules/lodash.clonedeep/README.md   |   20 +
 .../node_modules/lodash.clonedeep/index.js    |   63 +
 .../lodash.clonedeep/package.json             |  123 ++
 .../node_modules/lodash.isarguments/LICENSE   |   22 +
 .../node_modules/lodash.isarguments/README.md |   20 +
 .../node_modules/lodash.isarguments/index.js  |  106 ++
 .../lodash.isarguments/package.json           |  120 ++
 deps/npm/node_modules/lodash.isarray/LICENSE  |   22 +
 .../npm/node_modules/lodash.isarray/README.md |   20 +
 deps/npm/node_modules/lodash.isarray/index.js |  180 ++
 .../node_modules/lodash.isarray/package.json  |  124 ++
 .../lodash.istypedarray/LICENSE.txt           |   22 +
 .../lodash.istypedarray/README.md             |   20 +
 .../node_modules/lodash.istypedarray/index.js |  110 ++
 .../lodash.istypedarray/package.json          |  119 ++
 deps/npm/node_modules/lodash.keys/LICENSE     |   22 +
 deps/npm/node_modules/lodash.keys/README.md   |   20 +
 deps/npm/node_modules/lodash.keys/index.js    |  236 +++
 .../npm/node_modules/lodash.keys/package.json |  126 ++
 deps/npm/node_modules/lodash.pad/LICENSE      |   22 +
 .../node_modules => }/lodash.pad/README.md    |    4 +-
 .../node_modules => }/lodash.pad/index.js     |   18 +-
 .../node_modules => }/lodash.pad/package.json |   96 +-
 .../node_modules/lodash.padleft/LICENSE.txt   |   22 +
 .../lodash.padleft/README.md                  |    0
 .../node_modules => }/lodash.padleft/index.js |    0
 .../lodash.padleft/package.json               |   96 +-
 .../node_modules/lodash.padright/LICENSE.txt  |   22 +
 .../lodash.padright/README.md                 |    0
 .../lodash.padright/index.js                  |    0
 .../lodash.padright/package.json              |   96 +-
 .../npm/node_modules/lodash.pairs/LICENSE.txt |   22 +
 deps/npm/node_modules/lodash.pairs/README.md  |   20 +
 deps/npm/node_modules/lodash.pairs/index.js   |   78 +
 .../node_modules/lodash.pairs/package.json    |  121 ++
 deps/npm/node_modules/lodash.repeat/LICENSE   |   22 +
 .../node_modules => }/lodash.repeat/README.md |    4 +-
 .../node_modules => }/lodash.repeat/index.js  |   12 +-
 .../lodash.repeat/package.json                |  112 +-
 .../node_modules/lodash.restparam/LICENSE.txt |   22 +
 .../node_modules/lodash.restparam/README.md   |   20 +
 .../node_modules/lodash.restparam/index.js    |   67 +
 .../lodash.restparam/package.json             |  120 ++
 .../npm/node_modules/lodash.union/LICENSE.txt |   22 +
 deps/npm/node_modules/lodash.union/README.md  |   20 +
 deps/npm/node_modules/lodash.union/index.js   |   35 +
 .../node_modules/lodash.union/package.json    |  123 ++
 deps/npm/node_modules/lodash.uniq/LICENSE     |   22 +
 deps/npm/node_modules/lodash.uniq/README.md   |   20 +
 deps/npm/node_modules/lodash.uniq/index.js    |  106 ++
 .../npm/node_modules/lodash.uniq/package.json |  125 ++
 .../node_modules/lodash.without/LICENSE.txt   |   22 +
 .../npm/node_modules/lodash.without/README.md |   20 +
 deps/npm/node_modules/lodash.without/index.js |   89 +
 .../node_modules/lodash.without/package.json  |  122 ++
 deps/npm/node_modules/lru-cache/README.md     |   14 +-
 .../node_modules/lru-cache/lib/lru-cache.js   |   52 +-
 deps/npm/node_modules/lru-cache/package.json  |   96 +-
 deps/npm/node_modules/lru-cache/test/basic.js |   51 +-
 .../node_modules/lru-cache/test/serialize.js  |  215 ---
 .../node_modules => }/mime-db/HISTORY.md      |    0
 .../node_modules => }/mime-db/LICENSE         |    0
 .../node_modules => }/mime-db/README.md       |    0
 .../node_modules => }/mime-db/db.json         |    0
 .../node_modules => }/mime-db/index.js        |    0
 deps/npm/node_modules/mime-db/package.json    |  121 ++
 .../node_modules => }/mime-types/HISTORY.md   |    0
 .../node_modules => }/mime-types/LICENSE      |    0
 .../node_modules => }/mime-types/README.md    |    0
 .../node_modules => }/mime-types/index.js     |    0
 .../node_modules => }/mime-types/package.json |   99 +-
 .../node_modules/brace-expansion/README.md    |  121 --
 .../node_modules/balanced-match/Makefile      |    6 -
 .../node_modules/balanced-match/example.js    |    5 -
 .../node_modules/concat-map/package.json      |   83 -
 .../brace-expansion/test/bash-comparison.js   |   32 -
 .../brace-expansion/test/bash-results.txt     | 1075 -----------
 .../brace-expansion/test/cases.txt            |  182 --
 .../brace-expansion/test/dollar.js            |    9 -
 .../brace-expansion/test/empty-option.js      |   10 -
 .../brace-expansion/test/generate.sh          |   24 -
 .../test/negative-increment.js                |   15 -
 .../brace-expansion/test/nested.js            |   16 -
 .../brace-expansion/test/order.js             |   10 -
 .../node_modules/brace-expansion/test/pad.js  |   13 -
 .../brace-expansion/test/same-type.js         |    7 -
 .../brace-expansion/test/sequence.js          |   50 -
 deps/npm/node_modules/minimatch/package.json  |   99 +-
 .../balanced-match => minimist}/.travis.yml   |    0
 .../node_modules => }/minimist/LICENSE        |    0
 .../minimist/example/parse.js                 |    0
 .../node_modules => }/minimist/index.js       |   38 +-
 .../node_modules => }/minimist/package.json   |  111 +-
 .../minimist/readme.markdown                  |    0
 .../node_modules => }/minimist/test/dash.js   |    0
 .../minimist/test/default_bool.js             |    0
 .../node_modules => }/minimist/test/dotted.js |    0
 .../node_modules => }/minimist/test/long.js   |    0
 .../node_modules => }/minimist/test/parse.js  |   28 +-
 .../minimist/test/parse_modified.js           |    2 +-
 .../node_modules => }/minimist/test/short.js  |    4 +-
 .../minimist/test/whitespace.js               |    0
 deps/npm/node_modules/mkdirp/package.json     |  100 +-
 .../debug/node_modules => }/ms/.npmignore     |    0
 .../debug/node_modules => }/ms/History.md     |    0
 .../debug/node_modules => }/ms/LICENSE        |    0
 .../debug/node_modules => }/ms/README.md      |    0
 .../debug/node_modules => }/ms/index.js       |    0
 .../debug/node_modules => }/ms/package.json   |   84 +-
 .../fstream-ignore => mute-stream}/LICENSE    |    0
 .../node_modules => }/mute-stream/README.md   |    0
 .../node_modules => }/mute-stream/mute.js     |    0
 .../mute-stream/package.json                  |   89 +-
 .../mute-stream/test/basic.js                 |    0
 .../node_modules/brace-expansion/example.js   |    8 -
 .../node_modules/brace-expansion/index.js     |  191 --
 .../node_modules/balanced-match/README.md     |   80 -
 .../node_modules/balanced-match/index.js      |   38 -
 .../node_modules/balanced-match/package.json  |   73 -
 .../balanced-match/test/balanced.js           |   56 -
 .../node_modules/concat-map/LICENSE           |   18 -
 .../node_modules/concat-map/README.markdown   |   62 -
 .../node_modules/concat-map/example/map.js    |    6 -
 .../node_modules/concat-map/index.js          |   13 -
 .../node_modules/concat-map/test/map.js       |   39 -
 .../node_modules/brace-expansion/package.json |   75 -
 .../brace-expansion/test/bash-comparison.js   |   32 -
 .../brace-expansion/test/bash-results.txt     | 1075 -----------
 .../brace-expansion/test/cases.txt            |  182 --
 .../brace-expansion/test/dollar.js            |    9 -
 .../brace-expansion/test/empty-option.js      |   10 -
 .../brace-expansion/test/generate.sh          |   24 -
 .../test/negative-increment.js                |   15 -
 .../brace-expansion/test/nested.js            |   16 -
 .../brace-expansion/test/order.js             |   10 -
 .../node_modules/brace-expansion/test/pad.js  |   13 -
 .../brace-expansion/test/same-type.js         |    7 -
 .../brace-expansion/test/sequence.js          |   50 -
 .../glob/node_modules/minimatch/package.json  |  101 +-
 .../node-gyp/node_modules/glob/package.json   |  111 +-
 .../node_modules/minimatch/package.json       |   89 +-
 .../array-index/node_modules/debug/.npmignore |    6 -
 .../array-index/node_modules/debug/History.md |  195 --
 .../array-index/node_modules/debug/Makefile   |   36 -
 .../array-index/node_modules/debug/Readme.md  |  188 --
 .../array-index/node_modules/debug/bower.json |   28 -
 .../array-index/node_modules/debug/browser.js |  168 --
 .../node_modules/debug/component.json         |   19 -
 .../array-index/node_modules/debug/debug.js   |  197 --
 .../array-index/node_modules/debug/node.js    |  209 ---
 .../node_modules/debug/package.json           |   73 -
 .../node-gyp/node_modules/tar/package.json    |   87 +-
 deps/npm/node_modules/node-gyp/package.json   |  119 +-
 .../balanced-match => node-uuid}/.npmignore   |    0
 .../node_modules => }/node-uuid/LICENSE.md    |    2 +-
 .../node_modules => }/node-uuid/README.md     |    0
 .../node-uuid/benchmark/README.md             |    0
 .../node-uuid/benchmark/bench.gnu             |   36 +-
 .../node-uuid/benchmark/bench.sh              |    0
 .../node-uuid/benchmark/benchmark-native.c    |    0
 .../node-uuid/benchmark/benchmark.js          |    0
 .../node_modules => }/node-uuid/bin/uuid      |    0
 .../node_modules => }/node-uuid/bower.json    |    0
 .../node-uuid/component.json                  |    0
 .../node_modules => }/node-uuid/package.json  |  103 +-
 .../node-uuid/test/compare_v1.js              |    0
 .../node-uuid/test/test.html                  |    0
 .../node_modules => }/node-uuid/test/test.js  |    0
 .../node_modules => }/node-uuid/uuid.js       |    2 +-
 deps/npm/node_modules/nopt/package.json       |   88 +-
 .../normalize-git-url/package.json            |   99 +-
 .../normalize-package-data/package.json       |  115 +-
 .../npm-cache-filename/package.json           |   78 +-
 .../node_modules/npm-install-checks/index.js  |    1 -
 .../npm-install-checks/package.json           |  100 +-
 .../npm-install-checks/test/check-engine.js   |   10 +-
 .../node_modules/npm-package-arg/package.json |   96 +-
 .../node_modules/concat-stream/LICENSE        |   24 -
 .../node_modules/core-util-is/package.json    |   53 -
 .../process-nextick-args/package.json         |   45 -
 .../node_modules/string_decoder/package.json  |   54 -
 .../node_modules/util-deprecate/package.json  |   53 -
 .../npm-registry-client/package.json          |   96 +-
 .../npm-user-validate/package.json            |   87 +-
 .../npmlog/node_modules/gauge/package.json    |   60 -
 deps/npm/node_modules/npmlog/package.json     |   84 +-
 .../node_modules => }/oauth-sign/LICENSE      |    0
 .../node_modules => }/oauth-sign/README.md    |    2 +-
 .../node_modules => }/oauth-sign/index.js     |    2 +-
 .../node_modules => }/oauth-sign/package.json |   82 +-
 .../node_modules => }/oauth-sign/test.js      |    6 +-
 deps/npm/node_modules/once/package.json       |  104 +-
 deps/npm/node_modules/opener/package.json     |   89 +-
 .../node_modules => }/os-homedir/index.js     |    2 +-
 .../node_modules/chalk => os-homedir}/license |    0
 .../node_modules => }/os-homedir/package.json |  112 +-
 .../node_modules => }/os-homedir/readme.md    |    0
 .../node_modules => }/os-tmpdir/index.js      |    0
 .../ansi-styles => os-tmpdir}/license         |    0
 .../node_modules => }/os-tmpdir/package.json  |  109 +-
 .../node_modules => }/os-tmpdir/readme.md     |    0
 deps/npm/node_modules/osenv/package.json      |  101 +-
 .../node_modules => }/path-array/.npmignore   |    0
 .../node_modules => }/path-array/.travis.yml  |    0
 .../node_modules => }/path-array/History.md   |    0
 .../node_modules => }/path-array/README.md    |    0
 .../node_modules => }/path-array/index.js     |    0
 .../node_modules => }/path-array/package.json |   83 +-
 .../node_modules => }/path-array/test/test.js |    0
 .../path-is-absolute/index.js                 |    0
 .../license                                   |    0
 .../path-is-absolute/package.json             |  111 +-
 .../path-is-absolute/readme.md                |    0
 .../node_modules/path-is-inside/package.json  |   92 +-
 .../process-nextick-args/.travis.yml          |    0
 .../process-nextick-args/index.js             |    0
 .../process-nextick-args/license.md           |    0
 .../process-nextick-args/package.json         |   76 +-
 .../process-nextick-args/readme.md            |    0
 .../process-nextick-args/test.js              |    0
 .../node_modules => }/promzard/.npmignore     |    0
 .../{char-spinner => promzard}/LICENSE        |    0
 .../node_modules => }/promzard/README.md      |    0
 .../promzard/example/buffer.js                |    0
 .../promzard/example/index.js                 |    0
 .../promzard/example/npm-init/README.md       |    0
 .../promzard/example/npm-init/init-input.js   |    0
 .../promzard/example/npm-init/init.js         |    0
 .../promzard/example/npm-init/package.json    |    0
 .../promzard/example/substack-input.js        |    2 +-
 .../node_modules => }/promzard/package.json   |   79 +-
 .../node_modules => }/promzard/promzard.js    |    1 -
 .../node_modules => }/promzard/test/basic.js  |    0
 .../node_modules => }/promzard/test/buffer.js |    0
 .../promzard/test/exports.input               |    0
 .../promzard/test/exports.js                  |    0
 .../node_modules => }/promzard/test/fn.input  |    0
 .../node_modules => }/promzard/test/fn.js     |    0
 .../promzard/test/simple.input                |    0
 .../node_modules => }/promzard/test/simple.js |    6 +-
 .../promzard/test/validate.input              |    0
 .../promzard/test/validate.js                 |    0
 .../sigmund => proto-list}/LICENSE            |    0
 .../node_modules => }/proto-list/README.md    |    0
 .../node_modules => }/proto-list/package.json |   81 +-
 .../proto-list/proto-list.js                  |    0
 .../proto-list/test/basic.js                  |    0
 .../node_modules => }/qs/.eslintignore        |    0
 .../{request/node_modules => }/qs/.npmignore  |    0
 .../hawk/node_modules/boom => qs}/.travis.yml |    1 -
 .../node_modules => }/qs/CHANGELOG.md         |    0
 .../node_modules => }/qs/CONTRIBUTING.md      |    0
 .../{request/node_modules => }/qs/LICENSE     |    0
 .../qs/Readme.md => qs/README.md}             |    0
 .../{request/node_modules => }/qs/bower.json  |    0
 .../node_modules => }/qs/component.json       |    0
 .../{request/node_modules => }/qs/dist/qs.js  |    0
 .../node_modules => }/qs/lib/index.js         |    0
 .../node_modules => }/qs/lib/parse.js         |    0
 .../node_modules => }/qs/lib/stringify.js     |    0
 .../node_modules => }/qs/lib/utils.js         |    0
 .../node_modules => }/qs/package.json         |   94 +-
 .../node_modules => }/qs/test/parse.js        |    0
 .../node_modules => }/qs/test/stringify.js    |    0
 .../node_modules => }/qs/test/utils.js        |    0
 .../.npmignore                                |    3 +-
 deps/npm/node_modules/read-cmd-shim/README.md |   36 +
 deps/npm/node_modules/read-cmd-shim/index.js  |   54 +
 .../node_modules/read-cmd-shim/package.json   |   78 +
 .../read-cmd-shim/test/integration.js         |  139 ++
 .../readdir-scoped-modules/package.json       |   41 -
 .../node_modules/read-installed/package.json  |  108 +-
 .../node_modules/jju/.editorconfig            |   19 -
 .../node_modules/jju/benchmark/benchmark.js   |   40 -
 .../node_modules/jju/benchmark/package.json   |    9 -
 .../node_modules/jju/docs/Grammar.md          |  219 ---
 .../node_modules/jju/docs/JSON5.md            |   50 -
 .../node_modules/jju/package.json             |   63 -
 .../jju/test/portable-json5-tests.yaml        |  916 ----------
 .../node_modules/jju/test/test_analyze.js     |   53 -
 .../node_modules/jju/test/test_document.js    |  214 ---
 .../node_modules/jju/test/test_errors.js      |   56 -
 .../node_modules/jju/test/test_parse.js       |  171 --
 .../node_modules/jju/test/test_portable.js    |   60 -
 .../node_modules/jju/test/test_stringify.js   |   89 -
 .../node_modules/jju/test/test_tokenize.js    |   99 -
 .../node_modules/jju/test/test_updates.js     |   22 -
 .../node_modules/jju/test/update/author.yaml  |   31 -
 .../jju/test/update/deep-object.yaml          |   36 -
 .../node_modules/jju/test/update/delete.yaml  |   36 -
 .../jju/test/update/norm-array.yaml           |   32 -
 .../jju/test/update/norm-object.yaml          |   32 -
 .../jju/test/update/npm-array-bin.yaml        |   29 -
 .../jju/test/update/pkg-json5.yaml            |   36 -
 .../read-package-json/package.json            |  101 +-
 .../.travis.yml                               |    0
 .../LICENSE                                   |    0
 .../node_modules/read-package-tree/README.md  |   68 +
 .../read-package-tree/package.json            |   86 +
 .../npm/node_modules/read-package-tree/rpt.js |  190 ++
 .../read-package-tree/test/basic.js           |  155 ++
 .../test/fixtures/bad/package.json            |    2 +
 .../test/fixtures/deep-archy.txt              |   11 +
 .../test/fixtures/deep}/.keep                 |    0
 .../empty/node_modules/foo/package.json       |    1 +
 .../test/fixtures/linkedroot-archy.txt        |   11 +
 .../test/fixtures/noname/archy.txt            |    2 +
 .../noname/node_modules/foo/keep-alive}       |    0
 .../test/fixtures/other/archy.txt             |    2 +
 .../test/fixtures/other/node_modules/.bin}    |    0
 .../test/fixtures/root/archy.txt              |   11 +
 .../test/fixtures/root/package.json           |    2 +
 .../test/fixtures/selflink/archy.re           |   13 +
 .../test/fixtures/selflink/package.json       |    2 +
 deps/npm/node_modules/read/package.json       |   97 +-
 .../node_modules/core-util-is/README.md       |    3 -
 .../node_modules/core-util-is/float.patch     |  604 -------
 .../node_modules/core-util-is/lib/util.js     |  107 --
 .../node_modules/core-util-is/package.json    |   37 -
 .../node_modules/core-util-is/util.js         |  106 --
 .../node_modules/isarray/README.md            |   54 -
 .../node_modules/isarray/build/build.js       |  209 ---
 .../node_modules/isarray/component.json       |   19 -
 .../node_modules/isarray/index.js             |    3 -
 .../node_modules/isarray/package.json         |   38 -
 .../node_modules/string_decoder/.npmignore    |    2 -
 .../node_modules/string_decoder/LICENSE       |   20 -
 .../node_modules/string_decoder/README.md     |    7 -
 .../node_modules/string_decoder/index.js      |  221 ---
 .../node_modules/string_decoder/package.json  |   34 -
 .../node_modules/readable-stream/package.json |  106 +-
 .../readdir-scoped-modules/.travis.yml        |    7 +
 .../LICENSE                                   |    0
 .../readdir-scoped-modules/README.md          |    0
 .../readdir-scoped-modules/package.json       |   90 +
 .../readdir-scoped-modules/readdir.js         |    0
 .../readdir-scoped-modules/test/basic.js      |    0
 .../test/fixtures/@org/x}/.keep               |    0
 .../test/fixtures/@org/y}/.keep               |    0
 .../test/fixtures/@scope/x}/.keep             |    0
 .../test/fixtures/@scope/y}/.keep             |    0
 .../test/fixtures/a/x}/.keep                  |    0
 .../test/fixtures/a/y/.keep                   |    0
 .../test/fixtures/b/x/.keep                   |    0
 .../test/fixtures/b/y/.keep                   |    0
 .../realize-package-specifier/package.json    |   78 +-
 .../node_modules/core-util-is/README.md       |    3 -
 .../node_modules/core-util-is/float.patch     |  604 -------
 .../node_modules/core-util-is/lib/util.js     |  107 --
 .../node_modules/core-util-is/package.json    |   53 -
 .../node_modules/core-util-is/util.js         |  106 --
 .../node_modules/isarray/README.md            |   54 -
 .../node_modules/isarray/build/build.js       |  208 ---
 .../node_modules/isarray/component.json       |   19 -
 .../node_modules/isarray/index.js             |    3 -
 .../node_modules/isarray/package.json         |   53 -
 .../process-nextick-args/.travis.yml          |    7 -
 .../process-nextick-args/index.js             |   13 -
 .../process-nextick-args/package.json         |   45 -
 .../process-nextick-args/readme.md            |   18 -
 .../node_modules/process-nextick-args/test.js |   24 -
 .../node_modules/string_decoder/.npmignore    |    2 -
 .../node_modules/string_decoder/LICENSE       |   20 -
 .../node_modules/string_decoder/README.md     |    7 -
 .../node_modules/string_decoder/index.js      |  221 ---
 .../node_modules/util-deprecate/History.md    |   11 -
 .../node_modules/util-deprecate/LICENSE       |   24 -
 .../node_modules/util-deprecate/README.md     |   53 -
 .../node_modules/util-deprecate/browser.js    |   62 -
 .../node_modules/util-deprecate/node.js       |    6 -
 .../node_modules/util-deprecate/package.json  |   53 -
 .../has-ansi/node_modules/ansi-regex/index.js |    4 -
 .../node_modules/ansi-regex/package.json      |   86 -
 .../node_modules/ansi-regex/readme.md         |   31 -
 .../chalk/node_modules/strip-ansi/index.js    |    6 -
 .../chalk/node_modules/strip-ansi/license     |   21 -
 .../node_modules/ansi-regex/index.js          |    4 -
 .../node_modules/ansi-regex/license           |   21 -
 .../node_modules/ansi-regex/package.json      |   86 -
 .../node_modules/ansi-regex/readme.md         |   31 -
 .../chalk/node_modules/strip-ansi/readme.md   |   33 -
 .../chalk/node_modules/supports-color/license |   21 -
 .../generate-function/.travis.yml             |    3 -
 .../generate-object-property/.travis.yml      |    3 -
 .../node_modules/jsonpointer/package.json     |   64 -
 .../node_modules/ctype/package.json           |   42 -
 .../node_modules/mime-db/package.json         |   94 -
 .../request/node_modules/node-uuid/.npmignore |    2 -
 .../node_modules/tough-cookie/.jshintrc       |   70 -
 deps/npm/node_modules/request/package.json    |  131 +-
 deps/npm/node_modules/retry/package.json      |   87 +-
 deps/npm/node_modules/rimraf/package.json     |  101 +-
 deps/npm/node_modules/semver/package.json     |   83 +-
 .../node_modules/core-util-is/README.md       |    3 -
 .../node_modules/core-util-is/float.patch     |  604 -------
 .../node_modules/core-util-is/lib/util.js     |  107 --
 .../node_modules/core-util-is/util.js         |  106 --
 .../node_modules/isarray/README.md            |   54 -
 .../node_modules/isarray/build/build.js       |  208 ---
 .../node_modules/isarray/component.json       |   19 -
 .../node_modules/isarray/index.js             |    3 -
 .../node_modules/isarray/package.json         |   53 -
 .../process-nextick-args/.travis.yml          |    7 -
 .../process-nextick-args/index.js             |   13 -
 .../process-nextick-args/license.md           |   19 -
 .../process-nextick-args/readme.md            |   18 -
 .../node_modules/process-nextick-args/test.js |   24 -
 .../node_modules/string_decoder/.npmignore    |    2 -
 .../node_modules/string_decoder/LICENSE       |   20 -
 .../node_modules/string_decoder/README.md     |    7 -
 .../node_modules/string_decoder/index.js      |  221 ---
 .../node_modules/string_decoder/package.json  |   54 -
 .../node_modules/util-deprecate/History.md    |   11 -
 .../node_modules/util-deprecate/LICENSE       |   24 -
 .../node_modules/util-deprecate/README.md     |   53 -
 .../node_modules/util-deprecate/browser.js    |   62 -
 .../node_modules/util-deprecate/node.js       |    6 -
 .../node_modules/readable-stream/package.json |   98 +-
 deps/npm/node_modules/sha/package.json        |   84 +-
 .../json-stringify-safe => sigmund}/LICENSE   |    0
 .../node_modules => }/sigmund/README.md       |    0
 .../node_modules => }/sigmund/bench.js        |    0
 .../node_modules => }/sigmund/package.json    |   97 +-
 .../node_modules => }/sigmund/sigmund.js      |    0
 .../node_modules => }/sigmund/test/basic.js   |    1 -
 deps/npm/node_modules/slide/package.json      |   81 +-
 .../hawk/node_modules => }/sntp/.npmignore    |    1 -
 .../hawk/node_modules => }/sntp/.travis.yml   |    1 -
 .../hawk/node_modules => }/sntp/LICENSE       |    0
 .../hawk/node_modules => }/sntp/Makefile      |    3 +-
 .../hawk/node_modules => }/sntp/README.md     |    1 -
 .../node_modules => }/sntp/examples/offset.js |    1 -
 .../node_modules => }/sntp/examples/time.js   |    1 -
 .../hawk/node_modules => }/sntp/index.js      |    0
 .../hawk/node_modules => }/sntp/lib/index.js  |    0
 .../hawk/node_modules => }/sntp/package.json  |   99 +-
 .../hawk/node_modules => }/sntp/test/index.js |    1 -
 .../node_modules/sorted-object/package.json   |   85 +-
 .../node_modules => }/spdx-correct/README.md  |    0
 .../node_modules => }/spdx-correct/index.js   |    0
 .../spdx-correct/package.json                 |   87 +-
 .../spdx-exceptions/.npmignore                |    0
 .../spdx-exceptions/LICENSE.md                |    0
 .../spdx-exceptions/README.md                 |    0
 .../spdx-exceptions/index.json                |    0
 .../spdx-exceptions/package.json              |   80 +-
 .../spdx-expression-parse/LICENSE             |    0
 .../spdx-expression-parse/README.md           |    0
 .../spdx-expression-parse/index.js            |    0
 .../spdx-expression-parse/package.json        |   85 +-
 .../spdx-expression-parse/parser.generated.js |    0
 .../spdx-license-ids/LICENSE                  |    0
 .../spdx-license-ids/README.md                |    0
 .../spdx-license-ids/package.json             |  121 +-
 .../spdx-license-ids/spdx-license-ids.json    |    0
 deps/npm/node_modules/spdx/LICENSE.md         |    7 -
 deps/npm/node_modules/spdx/README.md          |  145 --
 .../node_modules/spdx-license-ids/README.md   |   55 -
 .../spdx-license-ids/package.json             |   78 -
 .../spdx-license-ids/spdx-license-ids.json    |  296 ---
 deps/npm/node_modules/spdx/package.json       |   73 -
 .../node_modules/spdx/source/exceptions.json  |   11 -
 .../spdx/source/parser.generated.js           | 1255 -------------
 deps/npm/node_modules/spdx/source/ranges.json |  194 --
 deps/npm/node_modules/spdx/source/spdx.js     |  161 --
 .../string_decoder/.npmignore                 |    0
 .../node_modules => }/string_decoder/LICENSE  |    0
 .../string_decoder/README.md                  |    0
 .../node_modules => }/string_decoder/index.js |    0
 .../string_decoder/package.json               |   87 +-
 .../node_modules => }/stringstream/.npmignore |    0
 .../concat-map => stringstream}/.travis.yml   |    0
 .../stringstream/LICENSE.txt                  |    0
 .../node_modules => }/stringstream/README.md  |    0
 .../node_modules => }/stringstream/example.js |    0
 .../stringstream/package.json                 |   84 +-
 .../stringstream/stringstream.js              |    0
 .../node_modules => }/strip-ansi/index.js     |    0
 .../has-ansi => strip-ansi}/license           |    0
 .../node_modules => }/strip-ansi/package.json |  146 +-
 .../node_modules => }/strip-ansi/readme.md    |    0
 .../node_modules => }/supports-color/index.js |    0
 .../ansi-regex => supports-color}/license     |    0
 .../supports-color/package.json               |  134 +-
 .../supports-color/readme.md                  |    0
 deps/npm/node_modules/tar/package.json        |   97 +-
 deps/npm/node_modules/text-table/package.json |  113 +-
 .../tough-cookie/.editorconfig                |    0
 .../node_modules => }/tough-cookie/.npmignore |    0
 .../tough-cookie/.travis.yml                  |    0
 .../node_modules => }/tough-cookie/LICENSE    |    0
 .../node_modules => }/tough-cookie/README.md  |    0
 .../tough-cookie/generate-pubsuffix.js        |    0
 .../tough-cookie/lib/cookie.js                |    0
 .../tough-cookie/lib/memstore.js              |    0
 .../tough-cookie/lib/pathMatch.js             |    0
 .../tough-cookie/lib/permuteDomain.js         |    0
 .../tough-cookie/lib/pubsuffix.js             |    0
 .../tough-cookie/lib/store.js                 |    0
 .../tough-cookie/package.json                 |  108 +-
 .../tough-cookie/public-suffix.txt            |    0
 .../tough-cookie/test/api_test.js             |    0
 .../tough-cookie/test/cookie_jar_test.js      |    0
 .../tough-cookie/test/cookie_sorting_test.js  |    0
 .../tough-cookie/test/cookie_to_json_test.js  |    0
 .../test/cookie_to_string_test.js             |    0
 .../tough-cookie/test/date_test.js            |    0
 .../tough-cookie/test/domain_and_path_test.js |    0
 .../test/ietf_data/dates/bsd-examples.json    |    0
 .../test/ietf_data/dates/examples.json        |    0
 .../tough-cookie/test/ietf_data/parser.json   |    0
 .../tough-cookie/test/ietf_test.js            |    0
 .../test/jar_serialization_test.js            |    0
 .../tough-cookie/test/lifetime_test.js        |    0
 .../tough-cookie/test/parsing_test.js         |    0
 .../tough-cookie/test/regression_test.js      |    0
 .../node_modules => }/tunnel-agent/LICENSE    |    0
 .../node_modules => }/tunnel-agent/README.md  |    0
 .../node_modules => }/tunnel-agent/index.js   |    6 +-
 .../tunnel-agent/package.json                 |   78 +-
 .../node_modules => }/typedarray/.travis.yml  |    0
 .../node_modules => }/typedarray/LICENSE      |    0
 .../typedarray/example/tarray.js              |    0
 .../node_modules => }/typedarray/index.js     |    0
 .../node_modules => }/typedarray/package.json |  128 +-
 .../typedarray/readme.markdown                |    0
 .../typedarray/test/server/undef_globals.js   |    2 +-
 .../typedarray/test/tarray.js                 |    0
 deps/npm/node_modules/uid-number/package.json |   79 +-
 deps/npm/node_modules/umask/package.json      |   85 +-
 .../node_modules/unique-filename/.npmignore   |    5 +
 .../node_modules/unique-filename/README.md    |   33 +
 .../npm/node_modules/unique-filename/index.js |    8 +
 .../node_modules/unique-filename/package.json |   76 +
 .../unique-filename/test/index.js             |   23 +
 deps/npm/node_modules/unique-slug/.npmignore  |    5 +
 deps/npm/node_modules/unique-slug/README.md   |   19 +
 deps/npm/node_modules/unique-slug/index.js    |   15 +
 .../npm/node_modules/unique-slug/package.json |   74 +
 .../node_modules/unique-slug/test/index.js    |   13 +
 deps/npm/node_modules/unpipe/HISTORY.md       |    4 +
 .../{github-url-from-git => unpipe}/LICENSE   |    2 +-
 deps/npm/node_modules/unpipe/README.md        |   43 +
 deps/npm/node_modules/unpipe/index.js         |   69 +
 deps/npm/node_modules/unpipe/package.json     |   83 +
 .../util-deprecate/History.md                 |    0
 .../node_modules => }/util-deprecate/LICENSE  |    0
 .../util-deprecate/README.md                  |    0
 .../util-deprecate/browser.js                 |    0
 .../node_modules => }/util-deprecate/node.js  |    0
 .../util-deprecate/package.json               |   91 +-
 .../node_modules => }/util-extend/README.md   |    0
 .../node_modules => }/util-extend/extend.js   |    0
 .../util-extend/package.json                  |   71 +-
 .../node_modules => }/util-extend/test.js     |    0
 .../node_modules/spdx-license-ids/LICENSE     |   24 -
 .../node_modules/spdx-license-ids/LICENSE     |   24 -
 .../node_modules/spdx-license-ids/README.md   |   55 -
 .../spdx-license-ids/package.json             |   77 -
 .../spdx-license-ids/spdx-license-ids.json    |  303 ----
 .../validate-npm-package-license/package.json |   90 +-
 .../node_modules/builtins/.travis.yml         |    4 -
 .../node_modules/builtins/package.json        |   25 -
 .../validate-npm-package-name/package.json    |   96 +-
 .../.npmignore                                |    0
 .../node_modules => }/wcwidth/LICENSE         |    1 -
 .../node_modules => }/wcwidth/Readme.md       |    0
 .../node_modules => }/wcwidth/combining.js    |    0
 .../node_modules => }/wcwidth/docs/index.md   |    3 -
 .../node_modules => }/wcwidth/index.js        |    0
 .../node_modules => }/wcwidth/package.json    |   82 +-
 .../node_modules => }/wcwidth/test/index.js   |    0
 deps/npm/node_modules/which/package.json      |   85 +-
 deps/npm/node_modules/wrappy/package.json     |   92 +-
 .../write-file-atomic/package.json            |   78 +-
 .../node_modules => }/xtend/.npmignore        |    0
 .../node_modules => }/xtend/LICENCE           |    0
 .../node_modules => }/xtend/Makefile          |    0
 .../node_modules => }/xtend/README.md         |    0
 .../node_modules => }/xtend/immutable.js      |    0
 .../node_modules => }/xtend/mutable.js        |    0
 .../node_modules => }/xtend/package.json      |  141 +-
 .../node_modules => }/xtend/test.js           |    0
 deps/npm/package.json                         |   79 +-
 deps/npm/scripts/index-build.js               |   61 +-
 deps/npm/scripts/installable.sh               |   13 +
 deps/npm/scripts/publish-tag.js               |    4 +-
 deps/npm/test/common.js                       |    7 -
 deps/npm/test/disabled/package-config/test.js |   29 +-
 .../test/fixtures/config/userconfig-with-gc   |   42 +-
 deps/npm/test/packages/npm-test-blerg/test.js |    9 +-
 .../npm/test/packages/npm-test-blerg3/test.js |    9 +-
 .../packages/npm-test-bundled-git/test.js     |    6 +-
 .../npm-test-ignore-nested-nm/test.js         |    2 +-
 .../packages/npm-test-missing-bindir/test.js  |    9 +-
 .../packages/npm-test-optional-deps/test.js   |   12 +-
 .../npm-test-shrinkwrap/npm-shrinkwrap.json   |   25 +-
 .../test/packages/npm-test-shrinkwrap/test.js |   17 +-
 deps/npm/test/run.js                          |  164 +-
 deps/npm/test/tap/00-check-mock-dep.js        |   20 +-
 deps/npm/test/tap/00-config-setup.js          |   76 +-
 deps/npm/test/tap/00-verify-bundle-deps.js    |   19 +-
 deps/npm/test/tap/00-verify-ls-ok.js          |   24 +-
 deps/npm/test/tap/404-parent.js               |   59 +-
 deps/npm/test/tap/404-private-registry.js     |    2 +-
 deps/npm/test/tap/access.js                   |    5 -
 .../test/tap/add-remote-git-fake-windows.js   |    1 -
 .../test/tap/add-remote-git-get-resolved.js   |    2 +-
 deps/npm/test/tap/adduser-always-auth.js      |  135 +-
 deps/npm/test/tap/adduser-legacy-auth.js      |    4 +-
 deps/npm/test/tap/bin.js                      |   24 +-
 .../tap/bitbucket-https-url-with-creds.js     |    2 +-
 .../test/tap/bitbucket-shortcut-package.js    |    4 +-
 deps/npm/test/tap/bitbucket-shortcut.js       |    6 +-
 deps/npm/test/tap/bugs.js                     |  170 +-
 deps/npm/test/tap/build-already-built.js      |   59 +-
 deps/npm/test/tap/builtin-config.js           |  166 +-
 .../test/tap/bundled-dependencies-nonarray.js |   34 +-
 .../test/tap/cache-add-localdir-fallback.js   |   88 +-
 deps/npm/test/tap/cache-add-unpublished.js    |   25 +-
 deps/npm/test/tap/cache-shasum-fork.js        |    7 +-
 deps/npm/test/tap/cache-shasum.js             |   59 +-
 deps/npm/test/tap/check-cpu-reqs.js           |   63 +
 deps/npm/test/tap/check-engine-reqs.js        |   65 +
 deps/npm/test/tap/check-install-self.js       |   66 +
 deps/npm/test/tap/check-os-reqs.js            |   63 +
 deps/npm/test/tap/check-permissions.js        |   88 +
 deps/npm/test/tap/circular-dep.js             |    5 +-
 deps/npm/test/tap/config-basic.js             |   39 +-
 deps/npm/test/tap/config-builtin.js           |   34 +-
 deps/npm/test/tap/config-certfile.js          |   18 +-
 deps/npm/test/tap/config-credentials.js       |  288 +--
 deps/npm/test/tap/config-edit.js              |   56 +-
 deps/npm/test/tap/config-malformed.js         |    4 +-
 deps/npm/test/tap/config-meta.js              |  101 +-
 deps/npm/test/tap/config-private.js           |   70 +-
 deps/npm/test/tap/config-project.js           |   32 +-
 deps/npm/test/tap/config-save.js              |  135 +-
 deps/npm/test/tap/cruft-test.js               |   43 +
 deps/npm/test/tap/dedupe-scoped.js            |   12 +-
 deps/npm/test/tap/dedupe.js                   |   44 +-
 deps/npm/test/tap/deprecate.js                |    6 -
 deps/npm/test/tap/dist-tag.js                 |  186 +-
 deps/npm/test/tap/do-not-remove-other-bins.js |  131 ++
 .../test/tap/extraneous-dep-cycle-ls-ok.js    |   70 +
 deps/npm/test/tap/false-name.js               |   13 +-
 deps/npm/test/tap/gently-rm-cmdshims.js       |  157 ++
 deps/npm/test/tap/gently-rm-overeager.js      |   45 +-
 deps/npm/test/tap/gently-rm-symlink.js        |   92 +-
 deps/npm/test/tap/get.js                      |  102 +-
 deps/npm/test/tap/gist-short-shortcut.js      |    2 +-
 deps/npm/test/tap/git-cache-no-hooks.js       |   70 +-
 .../test/tap/git-dependency-install-link.js   |    1 -
 deps/npm/test/tap/git-npmignore.js            |  135 +-
 deps/npm/test/tap/github-shortcut.js          |    8 +-
 deps/npm/test/tap/gitlab-shortcut-package.js  |    4 +-
 deps/npm/test/tap/gitlab-shortcut.js          |    6 +-
 .../tap/global-prefix-set-in-userconfig.js    |   30 +-
 deps/npm/test/tap/graceful-restart.js         |    3 +-
 deps/npm/test/tap/ignore-install-link.js      |   75 +-
 deps/npm/test/tap/init-interrupt.js           |   46 +-
 deps/npm/test/tap/install-actions.js          |  108 ++
 deps/npm/test/tap/install-at-locally.js       |    8 +-
 deps/npm/test/tap/install-bad-dep-format.js   |   58 +
 deps/npm/test/tap/install-bad-man.js          |   57 +-
 .../test/tap/install-cli-only-development.js  |   85 +
 .../test/tap/install-cli-only-production.js   |   88 +
 deps/npm/test/tap/install-cli-production.js   |    4 +-
 .../test/tap/install-into-likenamed-folder.js |   44 +
 deps/npm/test/tap/install-local-dep-cycle.js  |   79 +
 deps/npm/test/tap/install-man.js              |   58 +-
 deps/npm/test/tap/install-order.js            |   37 +
 deps/npm/test/tap/install-save-local.js       |   12 +-
 .../tap/install-scoped-already-installed.js   |   20 +-
 .../install-scoped-with-peer-dependency.js    |    7 +-
 .../tap/install-with-dev-dep-duplicate.js     |    7 +-
 deps/npm/test/tap/invalid-cmd-exit-code.js    |   22 +-
 deps/npm/test/tap/is-fs-access-available.js   |   54 +
 deps/npm/test/tap/lifecycle.js                |   10 +-
 deps/npm/test/tap/link.js                     |   49 +-
 deps/npm/test/tap/locker.js                   |   78 +-
 deps/npm/test/tap/logout.js                   |   44 +-
 deps/npm/test/tap/ls-env.js                   |   44 +
 deps/npm/test/tap/ls-l-depth-0.js             |    6 +-
 deps/npm/test/tap/ls-no-results.js            |   12 +-
 deps/npm/test/tap/ls-top-errors.js            |   71 +
 deps/npm/test/tap/nerf-dart.js                |   30 +-
 deps/npm/test/tap/nested-extraneous.js        |   46 +-
 deps/npm/test/tap/no-global-warns.js          |   67 +
 deps/npm/test/tap/no-scan-full-global-dir.js  |  100 ++
 .../test/tap/noargs-install-config-save.js    |   79 +-
 .../npm/test/tap/normalize-package-explode.js |   26 +
 deps/npm/test/tap/npm-api-not-loaded-error.js |   42 +-
 .../optional-metadep-rollback-collision.js    |   16 +-
 deps/npm/test/tap/outdated-depth-deep.js      |   77 +-
 deps/npm/test/tap/outdated-depth-integer.js   |   51 +-
 deps/npm/test/tap/outdated-depth.js           |    3 +-
 deps/npm/test/tap/outdated-git.js             |    2 +-
 deps/npm/test/tap/outdated-local.js           |    1 -
 deps/npm/test/tap/outdated-notarget.js        |   46 +-
 deps/npm/test/tap/outdated-private.js         |  113 +-
 deps/npm/test/tap/outdated.js                 |    9 +-
 deps/npm/test/tap/owner.js                    |  134 +-
 deps/npm/test/tap/pack-scoped.js              |   64 +-
 deps/npm/test/tap/peer-deps-invalid.js        |   34 +-
 deps/npm/test/tap/peer-deps-toplevel.js       |   30 +-
 .../tap/peer-deps-without-package-json.js     |    8 +-
 deps/npm/test/tap/peer-deps.js                |   26 +-
 deps/npm/test/tap/prepublish.js               |   76 +-
 deps/npm/test/tap/progress-config.js          |   56 +
 deps/npm/test/tap/publish-access-scoped.js    |   54 +-
 ...ublish-access-unscoped-restricted-fails.js |   46 +-
 deps/npm/test/tap/publish-access-unscoped.js  |   54 +-
 deps/npm/test/tap/publish-config.js           |   52 +-
 deps/npm/test/tap/publish-scoped.js           |   66 +-
 deps/npm/test/tap/pwd-prefix.js               |   20 +-
 deps/npm/test/tap/referer.js                  |   16 +-
 deps/npm/test/tap/registry.js                 |   47 +-
 deps/npm/test/tap/repo.js                     |   76 +-
 deps/npm/test/tap/rm-linked.js                |  136 ++
 deps/npm/test/tap/run-script.js               |    7 +-
 deps/npm/test/tap/semver-doc.js               |   16 +-
 deps/npm/test/tap/semver-tag.js               |   10 +-
 .../npm/test/tap/shrinkwrap-dev-dependency.js |    4 +-
 deps/npm/test/tap/shrinkwrap-empty-deps.js    |    3 +-
 .../test/tap/shrinkwrap-local-dependency.js   |  101 +-
 .../tap/shrinkwrap-prod-dependency-also.js    |   93 +
 deps/npm/test/tap/shrinkwrap-scoped-auth.js   |  122 +-
 deps/npm/test/tap/sorted-package-json.js      |   87 +-
 deps/npm/test/tap/spawn-enoent-help.js        |   28 +-
 deps/npm/test/tap/spawn-enoent.js             |   35 +-
 .../splat-with-only-prerelease-to-latest.js   |   11 +-
 deps/npm/test/tap/symlink-cycle.js            |   61 +
 deps/npm/test/tap/team.js                     |    3 -
 deps/npm/test/tap/test-run-ls.js              |   28 +-
 deps/npm/test/tap/uninstall-in-reverse.js     |   38 +
 deps/npm/test/tap/uninstall-package.js        |    4 +-
 deps/npm/test/tap/update-examples.js          |   59 +-
 deps/npm/test/tap/update-path.js              |   35 +
 .../test/tap/verify-no-lifecycle-on-repo.js   |   54 +
 deps/npm/test/tap/version-no-git.js           |   56 +-
 deps/npm/test/tap/version-no-package.js       |   36 +-
 deps/npm/test/tap/version-no-tags.js          |   80 +-
 deps/npm/test/tap/view.js                     |  316 ++--
 deps/npm/test/tap/whoami.js                   |   70 +-
 deps/npm/test/tap/zz-cleanup.js               |    8 +-
 1820 files changed, 35576 insertions(+), 33959 deletions(-)
 delete mode 100644 deps/npm/doc/api/npm-bin.md
 delete mode 100644 deps/npm/doc/api/npm-bugs.md
 delete mode 100644 deps/npm/doc/api/npm-cache.md
 delete mode 100644 deps/npm/doc/api/npm-commands.md
 delete mode 100644 deps/npm/doc/api/npm-config.md
 delete mode 100644 deps/npm/doc/api/npm-deprecate.md
 delete mode 100644 deps/npm/doc/api/npm-docs.md
 delete mode 100644 deps/npm/doc/api/npm-edit.md
 delete mode 100644 deps/npm/doc/api/npm-explore.md
 delete mode 100644 deps/npm/doc/api/npm-help-search.md
 delete mode 100644 deps/npm/doc/api/npm-init.md
 delete mode 100644 deps/npm/doc/api/npm-install.md
 delete mode 100644 deps/npm/doc/api/npm-link.md
 delete mode 100644 deps/npm/doc/api/npm-load.md
 delete mode 100644 deps/npm/doc/api/npm-ls.md
 delete mode 100644 deps/npm/doc/api/npm-outdated.md
 delete mode 100644 deps/npm/doc/api/npm-owner.md
 delete mode 100644 deps/npm/doc/api/npm-pack.md
 delete mode 100644 deps/npm/doc/api/npm-ping.md
 delete mode 100644 deps/npm/doc/api/npm-prefix.md
 delete mode 100644 deps/npm/doc/api/npm-prune.md
 delete mode 100644 deps/npm/doc/api/npm-publish.md
 delete mode 100644 deps/npm/doc/api/npm-rebuild.md
 delete mode 100644 deps/npm/doc/api/npm-repo.md
 delete mode 100644 deps/npm/doc/api/npm-restart.md
 delete mode 100644 deps/npm/doc/api/npm-root.md
 delete mode 100644 deps/npm/doc/api/npm-run-script.md
 delete mode 100644 deps/npm/doc/api/npm-search.md
 delete mode 100644 deps/npm/doc/api/npm-shrinkwrap.md
 delete mode 100644 deps/npm/doc/api/npm-start.md
 delete mode 100644 deps/npm/doc/api/npm-stop.md
 delete mode 100644 deps/npm/doc/api/npm-tag.md
 delete mode 100644 deps/npm/doc/api/npm-test.md
 delete mode 100644 deps/npm/doc/api/npm-uninstall.md
 delete mode 100644 deps/npm/doc/api/npm-unpublish.md
 delete mode 100644 deps/npm/doc/api/npm-update.md
 delete mode 100644 deps/npm/doc/api/npm-version.md
 delete mode 100644 deps/npm/doc/api/npm-view.md
 delete mode 100644 deps/npm/doc/api/npm-whoami.md
 delete mode 100644 deps/npm/doc/api/npm.md
 delete mode 100644 deps/npm/doc/cli/npm-rm.md
 delete mode 100644 deps/npm/doc/misc/npm-orgs.md
 delete mode 100644 deps/npm/html/doc/cli/npm-rm.html
 create mode 100644 deps/npm/lib/fetch-package-metadata.js
 create mode 100644 deps/npm/lib/fetch-package-metadata.md
 create mode 100644 deps/npm/lib/install/access-error.js
 create mode 100644 deps/npm/lib/install/action/build.js
 create mode 100644 deps/npm/lib/install/action/extract.js
 create mode 100644 deps/npm/lib/install/action/fetch.js
 create mode 100644 deps/npm/lib/install/action/finalize.js
 create mode 100644 deps/npm/lib/install/action/global-install.js
 create mode 100644 deps/npm/lib/install/action/global-link.js
 create mode 100644 deps/npm/lib/install/action/install.js
 create mode 100644 deps/npm/lib/install/action/move.js
 create mode 100644 deps/npm/lib/install/action/postinstall.js
 create mode 100644 deps/npm/lib/install/action/preinstall.js
 create mode 100644 deps/npm/lib/install/action/prepublish.js
 create mode 100644 deps/npm/lib/install/action/remove.js
 create mode 100644 deps/npm/lib/install/action/test.js
 create mode 100644 deps/npm/lib/install/action/update-linked.js
 create mode 100644 deps/npm/lib/install/actions.js
 create mode 100644 deps/npm/lib/install/and-add-parent-to-errors.js
 create mode 100644 deps/npm/lib/install/and-finish-tracker.js
 create mode 100644 deps/npm/lib/install/and-ignore-errors.js
 create mode 100644 deps/npm/lib/install/check-permissions.js
 create mode 100644 deps/npm/lib/install/copy-tree.js
 create mode 100644 deps/npm/lib/install/decompose-actions.js
 create mode 100644 deps/npm/lib/install/deps.js
 create mode 100644 deps/npm/lib/install/diff-trees.js
 create mode 100644 deps/npm/lib/install/exists.js
 create mode 100644 deps/npm/lib/install/filter-invalid-actions.js
 create mode 100644 deps/npm/lib/install/flatten-tree.js
 create mode 100644 deps/npm/lib/install/get-package-id.js
 create mode 100644 deps/npm/lib/install/inflate-bundled.js
 create mode 100644 deps/npm/lib/install/inflate-shrinkwrap.js
 create mode 100644 deps/npm/lib/install/is-dev.js
 create mode 100644 deps/npm/lib/install/is-extraneous.js
 create mode 100644 deps/npm/lib/install/is-fs-access-available.js
 create mode 100644 deps/npm/lib/install/mutate-into-logical-tree.js
 create mode 100644 deps/npm/lib/install/node.js
 create mode 100644 deps/npm/lib/install/prune-tree.js
 create mode 100644 deps/npm/lib/install/read-shrinkwrap.js
 create mode 100644 deps/npm/lib/install/save.js
 create mode 100644 deps/npm/lib/install/update-package-json.js
 create mode 100644 deps/npm/lib/install/validate-args.js
 create mode 100644 deps/npm/lib/install/validate-tree.js
 create mode 100644 deps/npm/lib/install/writable.js
 create mode 100644 deps/npm/lib/utils/deep-sort-object.js
 create mode 100644 deps/npm/lib/utils/parse-json.js
 create mode 100644 deps/npm/lib/utils/pulse-till-done.js
 create mode 100644 deps/npm/lib/utils/temp-filename.js
 delete mode 100644 deps/npm/man/man1/npm-rm.1
 rename deps/npm/node_modules/{columnify/node_modules/strip-ansi/node_modules => }/ansi-regex/index.js (100%)
 rename deps/npm/node_modules/{columnify/node_modules/strip-ansi => ansi-regex}/license (100%)
 rename deps/npm/node_modules/{columnify/node_modules/strip-ansi/node_modules => }/ansi-regex/package.json (54%)
 rename deps/npm/node_modules/{columnify/node_modules/strip-ansi/node_modules => }/ansi-regex/readme.md (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk/node_modules => }/ansi-styles/index.js (100%)
 rename deps/npm/node_modules/{columnify/node_modules/strip-ansi/node_modules/ansi-regex => ansi-styles}/license (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk/node_modules => }/ansi-styles/package.json (68%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk/node_modules => }/ansi-styles/readme.md (100%)
 delete mode 100644 deps/npm/node_modules/ansi/.jshintrc
 rename deps/npm/node_modules/{minimatch/node_modules/brace-expansion => aproba}/.npmignore (65%)
 rename deps/npm/node_modules/{init-package-json/node_modules/promzard => aproba}/LICENSE (83%)
 create mode 100644 deps/npm/node_modules/aproba/README.md
 create mode 100644 deps/npm/node_modules/aproba/index.js
 create mode 100644 deps/npm/node_modules/aproba/package.json
 create mode 100644 deps/npm/node_modules/aproba/test/index.js
 rename deps/npm/node_modules/{request/node_modules/stringstream => archy}/.travis.yml (81%)
 rename deps/npm/node_modules/{npmlog/node_modules => }/are-we-there-yet/.npmignore (100%)
 rename deps/npm/node_modules/{npmlog/node_modules => }/are-we-there-yet/README.md (99%)
 rename deps/npm/node_modules/{npmlog/node_modules => }/are-we-there-yet/index.js (100%)
 rename deps/npm/node_modules/{npmlog/node_modules => }/are-we-there-yet/package.json (63%)
 rename deps/npm/node_modules/{npmlog/node_modules => }/are-we-there-yet/test/tracker.js (100%)
 rename deps/npm/node_modules/{npmlog/node_modules => }/are-we-there-yet/test/trackergroup.js (99%)
 rename deps/npm/node_modules/{npmlog/node_modules => }/are-we-there-yet/test/trackerstream.js (100%)
 rename deps/npm/node_modules/{columnify/node_modules/wcwidth => array-index}/.npmignore (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/path-array/node_modules => }/array-index/.travis.yml (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/path-array/node_modules => }/array-index/History.md (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/path-array/node_modules => }/array-index/Makefile (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/path-array/node_modules => }/array-index/README.md (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/path-array/node_modules => }/array-index/component.json (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/path-array/node_modules => }/array-index/index.js (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/path-array/node_modules => }/array-index/package.json (65%)
 rename deps/npm/node_modules/{node-gyp/node_modules/path-array/node_modules => }/array-index/test.js (100%)
 rename deps/npm/node_modules/{dezalgo/node_modules => }/asap/CHANGES.md (100%)
 rename deps/npm/node_modules/{dezalgo/node_modules => }/asap/LICENSE.md (99%)
 rename deps/npm/node_modules/{dezalgo/node_modules => }/asap/README.md (99%)
 rename deps/npm/node_modules/{dezalgo/node_modules => }/asap/asap.js (99%)
 rename deps/npm/node_modules/{dezalgo/node_modules => }/asap/browser-asap.js (100%)
 rename deps/npm/node_modules/{dezalgo/node_modules => }/asap/browser-raw.js (100%)
 rename deps/npm/node_modules/{dezalgo/node_modules => }/asap/package.json (75%)
 rename deps/npm/node_modules/{dezalgo/node_modules => }/asap/raw.js (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/asn1/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/asn1/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/asn1/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/asn1/lib/ber/errors.js (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/asn1/lib/ber/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/asn1/lib/ber/reader.js (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/asn1/lib/ber/types.js (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/asn1/lib/ber/writer.js (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/asn1/lib/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/asn1/package.json (64%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/asn1/tst/ber/reader.test.js (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/asn1/tst/ber/writer.test.js (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/assert-plus/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/assert-plus/assert.js (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/assert-plus/package.json (55%)
 rename deps/npm/node_modules/{request/node_modules/form-data/node_modules => }/async/CHANGELOG.md (100%)
 rename deps/npm/node_modules/{request/node_modules/form-data/node_modules => }/async/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules/form-data/node_modules => }/async/lib/async.js (100%)
 rename deps/npm/node_modules/{request/node_modules/form-data/node_modules => }/async/package.json (77%)
 rename deps/npm/node_modules/{request/node_modules => }/aws-sign2/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules => }/aws-sign2/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/aws-sign2/index.js (96%)
 rename deps/npm/node_modules/{request/node_modules => }/aws-sign2/package.json (65%)
 rename deps/npm/node_modules/{minimatch/node_modules/brace-expansion/node_modules => }/balanced-match/.npmignore (100%)
 rename deps/npm/node_modules/{minimatch/node_modules/brace-expansion/node_modules => }/balanced-match/.travis.yml (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules => }/balanced-match/Makefile (98%)
 rename deps/npm/node_modules/{minimatch/node_modules/brace-expansion/node_modules => }/balanced-match/README.md (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules => }/balanced-match/example.js (99%)
 rename deps/npm/node_modules/{minimatch/node_modules/brace-expansion/node_modules => }/balanced-match/index.js (100%)
 rename deps/npm/node_modules/{minimatch/node_modules/brace-expansion/node_modules => }/balanced-match/package.json (67%)
 rename deps/npm/node_modules/{minimatch/node_modules/brace-expansion/node_modules => }/balanced-match/test/balanced.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/bl/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules => }/bl/.travis.yml (100%)
 rename deps/npm/node_modules/{request/node_modules => }/bl/LICENSE.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/bl/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/bl/bl.js (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/.npmignore (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/.travis.yml (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/.zuul.yml (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/LICENSE (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/README.md (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/doc/stream.markdown (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/duplex.js (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/lib/_stream_duplex.js (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/lib/_stream_passthrough.js (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/lib/_stream_readable.js (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/lib/_stream_transform.js (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/lib/_stream_writable.js (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/package.json (69%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/passthrough.js (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/readable.js (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/transform.js (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream => bl}/node_modules/readable-stream/writable.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/bl/package.json (61%)
 rename deps/npm/node_modules/{request/node_modules => }/bl/test/basic-test.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/bl/test/sauce.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/bl/test/test.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/changelog.md (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/browser/bluebird.js (98%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/browser/bluebird.min.js (99%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/any.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/assert.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/async.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/bind.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/bluebird.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/call_get.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/cancel.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/captured_trace.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/catch_filter.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/context.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/debuggability.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/direct_resolve.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/each.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/errors.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/es5.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/filter.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/finally.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/generators.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/join.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/map.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/method.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/nodeify.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/progress.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/promise.js (92%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/promise_array.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/promise_resolver.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/promisify.js (99%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/props.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/queue.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/race.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/reduce.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/schedule.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/settle.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/some.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/synchronous_inspection.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/thenables.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/timers.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/using.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/js/main/util.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/bluebird/package.json (74%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules/cryptiles => boom}/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules/cryptiles => boom}/.travis.yml (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/boom/CONTRIBUTING.md (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/boom/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/boom/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/boom/images/boom.png (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/boom/lib/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/boom/package.json (68%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/boom/test/index.js (100%)
 create mode 100644 deps/npm/node_modules/brace-expansion/.npmignore
 rename deps/npm/node_modules/{node-gyp/node_modules/glob/node_modules/minimatch/node_modules => }/brace-expansion/README.md (96%)
 rename deps/npm/node_modules/{minimatch/node_modules => }/brace-expansion/example.js (99%)
 rename deps/npm/node_modules/{minimatch/node_modules => }/brace-expansion/index.js (99%)
 rename deps/npm/node_modules/{minimatch/node_modules => }/brace-expansion/package.json (51%)
 rename deps/npm/node_modules/{normalize-package-data/node_modules/is-builtin-module/node_modules => }/builtin-modules/builtin-modules.json (100%)
 rename deps/npm/node_modules/{normalize-package-data/node_modules/is-builtin-module/node_modules => }/builtin-modules/index.js (100%)
 rename deps/npm/node_modules/{glob/node_modules/path-is-absolute => builtin-modules}/license (100%)
 rename deps/npm/node_modules/{normalize-package-data/node_modules/is-builtin-module/node_modules => }/builtin-modules/package.json (61%)
 rename deps/npm/node_modules/{normalize-package-data/node_modules/is-builtin-module/node_modules => }/builtin-modules/readme.md (100%)
 rename deps/npm/node_modules/{normalize-package-data/node_modules/is-builtin-module/node_modules => }/builtin-modules/static.js (100%)
 rename deps/npm/node_modules/{mkdirp/node_modules/minimist => builtins}/.travis.yml (100%)
 rename deps/npm/node_modules/{validate-npm-package-name/node_modules => }/builtins/History.md (100%)
 rename deps/npm/node_modules/{validate-npm-package-name/node_modules => }/builtins/Readme.md (100%)
 rename deps/npm/node_modules/{validate-npm-package-name/node_modules => }/builtins/builtins.json (100%)
 create mode 100644 deps/npm/node_modules/builtins/package.json
 rename deps/npm/node_modules/{request/node_modules => }/caseless/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules => }/caseless/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/caseless/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/caseless/package.json (64%)
 rename deps/npm/node_modules/{request/node_modules => }/caseless/test.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/chalk/index.js (100%)
 rename deps/npm/node_modules/{normalize-package-data/node_modules/is-builtin-module => chalk}/license (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/chalk/package.json (73%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/chalk/readme.md (100%)
 delete mode 100644 deps/npm/node_modules/char-spinner/README.md
 delete mode 100644 deps/npm/node_modules/char-spinner/package.json
 delete mode 100644 deps/npm/node_modules/char-spinner/spin.js
 delete mode 100644 deps/npm/node_modules/char-spinner/test/basic.js
 delete mode 100644 deps/npm/node_modules/chmodr/README.md
 delete mode 100644 deps/npm/node_modules/chmodr/chmodr.js
 delete mode 100644 deps/npm/node_modules/chmodr/package.json
 rename deps/npm/node_modules/{columnify/node_modules/wcwidth/node_modules/defaults/node_modules => }/clone/.npmignore (100%)
 rename deps/npm/node_modules/{columnify/node_modules/wcwidth/node_modules/defaults/node_modules => }/clone/.travis.yml (100%)
 rename deps/npm/node_modules/{columnify/node_modules/wcwidth/node_modules/defaults/node_modules => }/clone/LICENSE (100%)
 rename deps/npm/node_modules/{columnify/node_modules/wcwidth/node_modules/defaults/node_modules => }/clone/README.md (100%)
 rename deps/npm/node_modules/{columnify/node_modules/wcwidth/node_modules/defaults/node_modules => }/clone/clone.js (99%)
 rename deps/npm/node_modules/{columnify/node_modules/wcwidth/node_modules/defaults/node_modules => }/clone/package.json (80%)
 rename deps/npm/node_modules/{columnify/node_modules/wcwidth/node_modules/defaults/node_modules => }/clone/test.js (100%)
 delete mode 100644 deps/npm/node_modules/columnify/node_modules/strip-ansi/package.json
 rename deps/npm/node_modules/{request/node_modules => }/combined-stream/License (100%)
 rename deps/npm/node_modules/{request/node_modules => }/combined-stream/Readme.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/combined-stream/lib/combined_stream.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/combined-stream/package.json (70%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/commander/History.md (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/commander/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/commander/Readme.md (99%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/commander/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/commander/package.json (66%)
 rename deps/npm/node_modules/{minimatch/node_modules/brace-expansion/node_modules => }/concat-map/.travis.yml (100%)
 rename deps/npm/node_modules/{minimatch/node_modules/brace-expansion/node_modules => }/concat-map/LICENSE (100%)
 rename deps/npm/node_modules/{minimatch/node_modules/brace-expansion/node_modules => }/concat-map/README.markdown (100%)
 rename deps/npm/node_modules/{minimatch/node_modules/brace-expansion/node_modules => }/concat-map/example/map.js (100%)
 rename deps/npm/node_modules/{minimatch/node_modules/brace-expansion/node_modules => }/concat-map/index.js (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules => }/concat-map/package.json (66%)
 rename deps/npm/node_modules/{minimatch/node_modules/brace-expansion/node_modules => }/concat-map/test/map.js (100%)
 create mode 100644 deps/npm/node_modules/concat-stream/LICENSE
 rename deps/npm/node_modules/{npm-registry-client/node_modules => }/concat-stream/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/.travis.yml (100%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/.zuul.yml (100%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/doc/stream.markdown (100%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md (100%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/duplex.js (100%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/lib/_stream_duplex.js (100%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/lib/_stream_passthrough.js (100%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/lib/_stream_readable.js (100%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/lib/_stream_transform.js (100%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/lib/_stream_writable.js (100%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/package.json (68%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/passthrough.js (100%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/readable.js (100%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/transform.js (100%)
 rename deps/npm/node_modules/{request/node_modules/bl => concat-stream}/node_modules/readable-stream/writable.js (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules => }/concat-stream/package.json (60%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules => }/concat-stream/readme.md (98%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/core-util-is/README.md (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/core-util-is/float.patch (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/core-util-is/lib/util.js (100%)
 rename deps/npm/node_modules/{sha/node_modules/readable-stream/node_modules => }/core-util-is/package.json (58%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/core-util-is/util.js (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules/boom => cryptiles}/.npmignore (99%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules/hoek => cryptiles}/.travis.yml (100%)
 mode change 100644 => 100755
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/cryptiles/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/cryptiles/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/cryptiles/lib/index.js (99%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/cryptiles/package.json (68%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/cryptiles/test/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/ctype/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/ctype/CHANGELOG (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/ctype/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/ctype/README (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/ctype/README.old (99%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/ctype/ctf.js (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/ctype/ctio.js (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/ctype/ctype.js (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/ctype/man/man3ctype/ctio.3ctype (99%)
 create mode 100644 deps/npm/node_modules/ctype/package.json
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/ctype/tools/jsl.conf (100%)
 rename deps/npm/node_modules/{request/node_modules/http-signature/node_modules => }/ctype/tools/jsstyle (100%)
 rename deps/npm/node_modules/{read-installed/node_modules => }/debuglog/LICENSE (100%)
 rename deps/npm/node_modules/{read-installed/node_modules => }/debuglog/README.md (100%)
 rename deps/npm/node_modules/{read-installed/node_modules => }/debuglog/debuglog.js (100%)
 rename deps/npm/node_modules/{read-installed/node_modules => }/debuglog/package.json (54%)
 rename deps/npm/node_modules/{columnify/node_modules/wcwidth/node_modules => }/defaults/.npmignore (100%)
 rename deps/npm/node_modules/{columnify/node_modules/wcwidth/node_modules => }/defaults/LICENSE (100%)
 rename deps/npm/node_modules/{columnify/node_modules/wcwidth/node_modules => }/defaults/README.md (100%)
 rename deps/npm/node_modules/{columnify/node_modules/wcwidth/node_modules => }/defaults/index.js (100%)
 rename deps/npm/node_modules/{columnify/node_modules/wcwidth/node_modules => }/defaults/package.json (62%)
 rename deps/npm/node_modules/{columnify/node_modules/wcwidth/node_modules => }/defaults/test.js (99%)
 rename deps/npm/node_modules/{request/node_modules/combined-stream/node_modules => }/delayed-stream/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules/combined-stream/node_modules => }/delayed-stream/License (100%)
 rename deps/npm/node_modules/{request/node_modules/combined-stream/node_modules => }/delayed-stream/Makefile (98%)
 rename deps/npm/node_modules/{request/node_modules/combined-stream/node_modules => }/delayed-stream/Readme.md (100%)
 rename deps/npm/node_modules/{request/node_modules/combined-stream/node_modules => }/delayed-stream/lib/delayed_stream.js (100%)
 rename deps/npm/node_modules/{request/node_modules/combined-stream/node_modules => }/delayed-stream/package.json (69%)
 rename deps/npm/node_modules/{npmlog/node_modules/are-we-there-yet/node_modules => }/delegates/.npmignore (100%)
 rename deps/npm/node_modules/{npmlog/node_modules/are-we-there-yet/node_modules => }/delegates/History.md (100%)
 rename deps/npm/node_modules/{npmlog/node_modules/are-we-there-yet/node_modules => }/delegates/Makefile (100%)
 rename deps/npm/node_modules/{npmlog/node_modules/are-we-there-yet/node_modules => }/delegates/Readme.md (100%)
 rename deps/npm/node_modules/{npmlog/node_modules/are-we-there-yet/node_modules => }/delegates/index.js (100%)
 rename deps/npm/node_modules/{npmlog/node_modules/are-we-there-yet/node_modules => }/delegates/package.json (59%)
 rename deps/npm/node_modules/{npmlog/node_modules/are-we-there-yet/node_modules => }/delegates/test/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk/node_modules => }/escape-string-regexp/index.js (100%)
 rename deps/npm/node_modules/{normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules => escape-string-regexp}/license (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk/node_modules => }/escape-string-regexp/package.json (65%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk/node_modules => }/escape-string-regexp/readme.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/extend/.jscs.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/extend/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules => }/extend/.travis.yml (100%)
 rename deps/npm/node_modules/{request/node_modules => }/extend/CHANGELOG.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/extend/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules => }/extend/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/extend/component.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/extend/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/extend/package.json (70%)
 rename deps/npm/node_modules/{request/node_modules => }/forever-agent/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules => }/forever-agent/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/forever-agent/index.js (98%)
 rename deps/npm/node_modules/{request/node_modules => }/forever-agent/package.json (67%)
 rename deps/npm/node_modules/{request/node_modules => }/form-data/License (100%)
 rename deps/npm/node_modules/{request/node_modules => }/form-data/Readme.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/form-data/lib/browser.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/form-data/lib/form_data.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/form-data/package.json (74%)
 rename deps/npm/node_modules/{fstream-npm/node_modules => }/fstream-ignore/.npmignore (100%)
 rename deps/npm/node_modules/{chmodr => fstream-ignore}/LICENSE (100%)
 rename deps/npm/node_modules/{fstream-npm/node_modules => }/fstream-ignore/README.md (100%)
 rename deps/npm/node_modules/{fstream-npm/node_modules => }/fstream-ignore/example/basic.js (100%)
 rename deps/npm/node_modules/{fstream-npm/node_modules => }/fstream-ignore/ignore.js (100%)
 rename deps/npm/node_modules/{fstream-npm/node_modules => }/fstream-ignore/package.json (65%)
 rename deps/npm/node_modules/{fstream-npm/node_modules => }/fstream-ignore/test/.ignore (100%)
 rename deps/npm/node_modules/{fstream-npm/node_modules => }/fstream-ignore/test/.npmignore (100%)
 rename deps/npm/node_modules/{fstream-npm/node_modules => }/fstream-ignore/test/00-setup.js (99%)
 rename deps/npm/node_modules/{fstream-npm/node_modules => }/fstream-ignore/test/basic.js (100%)
 rename deps/npm/node_modules/{fstream-npm/node_modules => }/fstream-ignore/test/common.js (100%)
 rename deps/npm/node_modules/{fstream-npm/node_modules => }/fstream-ignore/test/ignore-most.js (100%)
 rename deps/npm/node_modules/{fstream-npm/node_modules => }/fstream-ignore/test/nested-ignores.js (100%)
 rename deps/npm/node_modules/{fstream-npm/node_modules => }/fstream-ignore/test/read-file-order.js (100%)
 rename deps/npm/node_modules/{fstream-npm/node_modules => }/fstream-ignore/test/unignore-child.js (100%)
 rename deps/npm/node_modules/{fstream-npm/node_modules => }/fstream-ignore/test/zz-cleanup.js (100%)
 rename deps/npm/node_modules/{npmlog/node_modules => }/gauge/.npmignore (100%)
 rename deps/npm/node_modules/{npmlog/node_modules => }/gauge/LICENSE (100%)
 rename deps/npm/node_modules/{npmlog/node_modules => }/gauge/README.md (93%)
 rename deps/npm/node_modules/{npmlog/node_modules => }/gauge/example.png (100%)
 create mode 100644 deps/npm/node_modules/gauge/package.json
 rename deps/npm/node_modules/{npmlog/node_modules => }/gauge/progress-bar.js (90%)
 rename deps/npm/node_modules/{npmlog/node_modules => }/gauge/test/progress-bar.js (87%)
 rename deps/npm/node_modules/{github-url-from-git => generate-function}/.npmignore (100%)
 rename deps/npm/node_modules/{minimatch/node_modules/brace-expansion => generate-function}/.travis.yml (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/generate-function/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/generate-function/example.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/generate-function/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/generate-function/package.json (61%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/generate-function/test.js (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/path-array/node_modules/array-index => generate-object-property}/.npmignore (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion => generate-object-property}/.travis.yml (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid => generate-object-property}/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/generate-object-property/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/generate-object-property/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/generate-object-property/package.json (61%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/generate-object-property/test.js (100%)
 delete mode 100644 deps/npm/node_modules/github-url-from-git/Makefile
 delete mode 100644 deps/npm/node_modules/github-url-from-git/Readme.md
 delete mode 100644 deps/npm/node_modules/github-url-from-git/index.js
 delete mode 100644 deps/npm/node_modules/github-url-from-git/package.json
 delete mode 100644 deps/npm/node_modules/github-url-from-git/test.js
 delete mode 100644 deps/npm/node_modules/github-url-from-username-repo/.npmignore
 delete mode 100644 deps/npm/node_modules/github-url-from-username-repo/.travis.yml
 delete mode 100644 deps/npm/node_modules/github-url-from-username-repo/LICENSE
 delete mode 100644 deps/npm/node_modules/github-url-from-username-repo/README.md
 delete mode 100644 deps/npm/node_modules/github-url-from-username-repo/index.js
 delete mode 100644 deps/npm/node_modules/github-url-from-username-repo/package.json
 delete mode 100644 deps/npm/node_modules/github-url-from-username-repo/test/index.js
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/commander/node_modules => }/graceful-readlink/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/commander/node_modules => }/graceful-readlink/.travis.yml (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/commander/node_modules => }/graceful-readlink/LICENSE (99%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/commander/node_modules => }/graceful-readlink/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/commander/node_modules => }/graceful-readlink/index.js (98%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/commander/node_modules => }/graceful-readlink/package.json (62%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/bin/har-validator (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/error.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/schemas/cache.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/schemas/cacheEntry.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/schemas/content.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/schemas/cookie.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/schemas/creator.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/schemas/entry.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/schemas/har.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/schemas/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/schemas/log.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/schemas/page.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/schemas/pageTimings.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/schemas/postData.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/schemas/record.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/schemas/request.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/schemas/response.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/lib/schemas/timings.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/har-validator/package.json (73%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk/node_modules => }/has-ansi/index.js (100%)
 rename deps/npm/node_modules/{osenv/node_modules/os-homedir => has-ansi}/license (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk/node_modules => }/has-ansi/package.json (69%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk/node_modules => }/has-ansi/readme.md (100%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/has-unicode/.npmignore (100%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/has-unicode/LICENSE (99%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/has-unicode/README.md (98%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/has-unicode/index.js (100%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/has-unicode/package.json (56%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/has-unicode/test/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/.travis.yml (100%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/README.md (99%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/bower.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/component.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/example/usage.js (99%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/images/hawk.png (100%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/images/logo.png (100%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/lib/browser.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/lib/client.js (99%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/lib/crypto.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/lib/index.js (99%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/lib/server.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/lib/utils.js (99%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/package.json (70%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/test/browser.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/test/client.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/test/crypto.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/test/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/test/readme.js (99%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/test/server.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/test/uri.js (99%)
 rename deps/npm/node_modules/{request/node_modules => }/hawk/test/utils.js (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/hoek/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules/qs => hoek}/.travis.yml (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/hoek/CONTRIBUTING.md (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/hoek/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/hoek/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/hoek/images/hoek.png (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/hoek/lib/escape.js (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/hoek/lib/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/hoek/package.json (68%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/hoek/test/escaper.js (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/hoek/test/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/hoek/test/modules/ignore.txt (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/hoek/test/modules/test1.js (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/hoek/test/modules/test2.js (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/hoek/test/modules/test3.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/http-signature/.dir-locals.el (100%)
 rename deps/npm/node_modules/{request/node_modules => }/http-signature/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules => }/http-signature/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules => }/http-signature/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/http-signature/http_signing.md (99%)
 rename deps/npm/node_modules/{request/node_modules => }/http-signature/lib/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/http-signature/lib/parser.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/http-signature/lib/signer.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/http-signature/lib/util.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/http-signature/lib/verify.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/http-signature/package.json (71%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function => iferr}/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/license.md => iferr/LICENSE} (87%)
 create mode 100644 deps/npm/node_modules/iferr/README.md
 create mode 100644 deps/npm/node_modules/iferr/index.coffee
 create mode 100644 deps/npm/node_modules/iferr/index.js
 create mode 100644 deps/npm/node_modules/iferr/package.json
 create mode 100644 deps/npm/node_modules/iferr/test/index.coffee
 create mode 100644 deps/npm/node_modules/iferr/test/mocha.opts
 rename deps/npm/node_modules/{which/node_modules => }/is-absolute/LICENSE (100%)
 rename deps/npm/node_modules/{which/node_modules => }/is-absolute/README.md (100%)
 rename deps/npm/node_modules/{which/node_modules => }/is-absolute/index.js (100%)
 rename deps/npm/node_modules/{which/node_modules => }/is-absolute/package.json (72%)
 rename deps/npm/node_modules/{normalize-package-data/node_modules => }/is-builtin-module/index.js (100%)
 rename deps/npm/node_modules/{osenv/node_modules/os-tmpdir => is-builtin-module}/license (100%)
 rename deps/npm/node_modules/{normalize-package-data/node_modules => }/is-builtin-module/package.json (66%)
 rename deps/npm/node_modules/{normalize-package-data/node_modules => }/is-builtin-module/readme.md (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/.travis.yml (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property => is-my-json-valid}/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/example.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/formats.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/index.js (99%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/package.json (66%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/require.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/fixtures/cosmic.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/additionalItems.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/additionalProperties.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/allOf.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/anyOf.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/bignum.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/default.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/definitions.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/dependencies.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/enum.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/format.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/items.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/maxItems.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/maxLength.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/maxProperties.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/maximum.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/minItems.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/minLength.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/minProperties.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/minimum.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/multipleOf.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/not.json (98%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/nullAndFormat.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/nullAndObject.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/oneOf.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/pattern.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/patternProperties.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/properties.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/ref.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/refRemote.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/required.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/type.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema-draft4/uniqueItems.json (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/json-schema.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules => }/is-my-json-valid/test/misc.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules => }/is-property/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules => }/is-property/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules => }/is-property/README.md (99%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules => }/is-property/is-property.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules => }/is-property/package.json (64%)
 rename deps/npm/node_modules/{which/node_modules/is-absolute/node_modules => }/is-relative/LICENSE-MIT (100%)
 rename deps/npm/node_modules/{which/node_modules/is-absolute/node_modules => }/is-relative/README.md (100%)
 rename deps/npm/node_modules/{which/node_modules/is-absolute/node_modules => }/is-relative/index.js (100%)
 rename deps/npm/node_modules/{which/node_modules/is-absolute/node_modules => }/is-relative/package.json (69%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/isarray/README.md (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/isarray/build/build.js (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/isarray/component.json (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/isarray/index.js (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/isarray/package.json (59%)
 rename deps/npm/node_modules/{request/node_modules => }/isstream/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules => }/isstream/.travis.yml (100%)
 rename deps/npm/node_modules/{request/node_modules => }/isstream/LICENSE.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/isstream/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/isstream/isstream.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/isstream/package.json (62%)
 rename deps/npm/node_modules/{request/node_modules => }/isstream/test.js (99%)
 rename deps/npm/node_modules/{read-package-json/node_modules/json-parse-helpfulerror/node_modules => }/jju/.npmignore (62%)
 rename deps/npm/node_modules/{read-package-json/node_modules/json-parse-helpfulerror/node_modules => }/jju/README.md (99%)
 rename deps/npm/node_modules/{read-package-json/node_modules/json-parse-helpfulerror/node_modules => }/jju/index.js (100%)
 rename deps/npm/node_modules/{read-package-json/node_modules/json-parse-helpfulerror/node_modules => }/jju/lib/analyze.js (99%)
 rename deps/npm/node_modules/{read-package-json/node_modules/json-parse-helpfulerror/node_modules => }/jju/lib/document.js (99%)
 rename deps/npm/node_modules/{read-package-json/node_modules/json-parse-helpfulerror/node_modules => }/jju/lib/parse.js (99%)
 rename deps/npm/node_modules/{read-package-json/node_modules/json-parse-helpfulerror/node_modules => }/jju/lib/stringify.js (99%)
 rename deps/npm/node_modules/{read-package-json/node_modules/json-parse-helpfulerror/node_modules => }/jju/lib/unicode.js (100%)
 rename deps/npm/node_modules/{read-package-json/node_modules/json-parse-helpfulerror/node_modules => }/jju/lib/utils.js (99%)
 create mode 100644 deps/npm/node_modules/jju/package.json
 rename deps/npm/node_modules/{read-package-json/node_modules/json-parse-helpfulerror/node_modules => }/jju/package.yaml (97%)
 rename deps/npm/node_modules/{read-package-json/node_modules => }/json-parse-helpfulerror/.editorconfig (100%)
 rename deps/npm/node_modules/{read-package-json/node_modules => }/json-parse-helpfulerror/.npmignore (100%)
 rename deps/npm/node_modules/{read-package-json/node_modules => }/json-parse-helpfulerror/LICENSE (99%)
 rename deps/npm/node_modules/{read-package-json/node_modules => }/json-parse-helpfulerror/README.md (100%)
 rename deps/npm/node_modules/{read-package-json/node_modules => }/json-parse-helpfulerror/index.js (100%)
 rename deps/npm/node_modules/{read-package-json/node_modules => }/json-parse-helpfulerror/package.json (58%)
 rename deps/npm/node_modules/{read-package-json/node_modules => }/json-parse-helpfulerror/test/test.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/json-stringify-safe/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules => }/json-stringify-safe/CHANGELOG.md (100%)
 rename deps/npm/node_modules/{config-chain/node_modules/proto-list => json-stringify-safe}/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules => }/json-stringify-safe/Makefile (100%)
 rename deps/npm/node_modules/{request/node_modules => }/json-stringify-safe/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/json-stringify-safe/package.json (68%)
 rename deps/npm/node_modules/{request/node_modules => }/json-stringify-safe/stringify.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/json-stringify-safe/test/mocha.opts (100%)
 rename deps/npm/node_modules/{request/node_modules => }/json-stringify-safe/test/stringify_test.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/jsonpointer/.travis.yml (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/jsonpointer/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/jsonpointer/jsonpointer.js (100%)
 create mode 100644 deps/npm/node_modules/jsonpointer/package.json
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/jsonpointer/test.js (100%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules/lodash._basetostring => lodash._arraycopy}/LICENSE.txt (100%)
 create mode 100644 deps/npm/node_modules/lodash._arraycopy/README.md
 create mode 100644 deps/npm/node_modules/lodash._arraycopy/index.js
 create mode 100644 deps/npm/node_modules/lodash._arraycopy/package.json
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat => lodash._arrayeach}/LICENSE.txt (100%)
 create mode 100644 deps/npm/node_modules/lodash._arrayeach/README.md
 create mode 100644 deps/npm/node_modules/lodash._arrayeach/index.js
 create mode 100644 deps/npm/node_modules/lodash._arrayeach/package.json
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules/lodash._createpadding => lodash._baseassign}/LICENSE.txt (100%)
 create mode 100644 deps/npm/node_modules/lodash._baseassign/README.md
 create mode 100644 deps/npm/node_modules/lodash._baseassign/index.js
 create mode 100644 deps/npm/node_modules/lodash._baseassign/package.json
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules/lodash.pad/LICENSE.txt => lodash._basecallback/LICENSE} (100%)
 create mode 100644 deps/npm/node_modules/lodash._basecallback/README.md
 create mode 100644 deps/npm/node_modules/lodash._basecallback/index.js
 create mode 100644 deps/npm/node_modules/lodash._basecallback/package.json
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules/lodash.padleft/LICENSE.txt => lodash._baseclone/LICENSE} (100%)
 create mode 100644 deps/npm/node_modules/lodash._baseclone/README.md
 create mode 100644 deps/npm/node_modules/lodash._baseclone/index.js
 create mode 100644 deps/npm/node_modules/lodash._baseclone/package.json
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules/lodash.padright => lodash._basecopy}/LICENSE.txt (100%)
 create mode 100644 deps/npm/node_modules/lodash._basecopy/README.md
 create mode 100644 deps/npm/node_modules/lodash._basecopy/index.js
 create mode 100644 deps/npm/node_modules/lodash._basecopy/package.json
 create mode 100644 deps/npm/node_modules/lodash._basedifference/LICENSE
 create mode 100644 deps/npm/node_modules/lodash._basedifference/README.md
 create mode 100644 deps/npm/node_modules/lodash._basedifference/index.js
 create mode 100644 deps/npm/node_modules/lodash._basedifference/package.json
 create mode 100644 deps/npm/node_modules/lodash._baseflatten/LICENSE
 create mode 100644 deps/npm/node_modules/lodash._baseflatten/README.md
 create mode 100644 deps/npm/node_modules/lodash._baseflatten/index.js
 create mode 100644 deps/npm/node_modules/lodash._baseflatten/package.json
 create mode 100644 deps/npm/node_modules/lodash._basefor/LICENSE.txt
 create mode 100644 deps/npm/node_modules/lodash._basefor/README.md
 create mode 100644 deps/npm/node_modules/lodash._basefor/index.js
 create mode 100644 deps/npm/node_modules/lodash._basefor/package.json
 create mode 100644 deps/npm/node_modules/lodash._baseindexof/LICENSE.txt
 create mode 100644 deps/npm/node_modules/lodash._baseindexof/README.md
 create mode 100644 deps/npm/node_modules/lodash._baseindexof/index.js
 create mode 100644 deps/npm/node_modules/lodash._baseindexof/package.json
 create mode 100644 deps/npm/node_modules/lodash._baseisequal/LICENSE.txt
 create mode 100644 deps/npm/node_modules/lodash._baseisequal/README.md
 create mode 100644 deps/npm/node_modules/lodash._baseisequal/index.js
 create mode 100644 deps/npm/node_modules/lodash._baseisequal/package.json
 create mode 100644 deps/npm/node_modules/lodash._basetostring/LICENSE
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/lodash._basetostring/README.md (84%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/lodash._basetostring/index.js (68%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/lodash._basetostring/package.json (52%)
 create mode 100644 deps/npm/node_modules/lodash._baseuniq/LICENSE
 create mode 100644 deps/npm/node_modules/lodash._baseuniq/README.md
 create mode 100644 deps/npm/node_modules/lodash._baseuniq/index.js
 create mode 100644 deps/npm/node_modules/lodash._baseuniq/package.json
 create mode 100644 deps/npm/node_modules/lodash._bindcallback/LICENSE.txt
 create mode 100644 deps/npm/node_modules/lodash._bindcallback/README.md
 create mode 100644 deps/npm/node_modules/lodash._bindcallback/index.js
 create mode 100644 deps/npm/node_modules/lodash._bindcallback/package.json
 create mode 100644 deps/npm/node_modules/lodash._cacheindexof/LICENSE.txt
 create mode 100644 deps/npm/node_modules/lodash._cacheindexof/README.md
 create mode 100644 deps/npm/node_modules/lodash._cacheindexof/index.js
 create mode 100644 deps/npm/node_modules/lodash._cacheindexof/package.json
 create mode 100644 deps/npm/node_modules/lodash._createcache/LICENSE
 create mode 100644 deps/npm/node_modules/lodash._createcache/README.md
 create mode 100644 deps/npm/node_modules/lodash._createcache/index.js
 create mode 100644 deps/npm/node_modules/lodash._createcache/package.json
 create mode 100644 deps/npm/node_modules/lodash._createpadding/LICENSE
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/lodash._createpadding/README.md (83%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/lodash._createpadding/index.js (79%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/lodash._createpadding/package.json (53%)
 create mode 100644 deps/npm/node_modules/lodash._getnative/LICENSE
 create mode 100644 deps/npm/node_modules/lodash._getnative/README.md
 create mode 100644 deps/npm/node_modules/lodash._getnative/index.js
 create mode 100644 deps/npm/node_modules/lodash._getnative/package.json
 create mode 100644 deps/npm/node_modules/lodash._isiterateecall/LICENSE.txt
 create mode 100644 deps/npm/node_modules/lodash._isiterateecall/README.md
 create mode 100644 deps/npm/node_modules/lodash._isiterateecall/index.js
 create mode 100644 deps/npm/node_modules/lodash._isiterateecall/package.json
 create mode 100644 deps/npm/node_modules/lodash.clonedeep/LICENSE
 create mode 100644 deps/npm/node_modules/lodash.clonedeep/README.md
 create mode 100644 deps/npm/node_modules/lodash.clonedeep/index.js
 create mode 100644 deps/npm/node_modules/lodash.clonedeep/package.json
 create mode 100644 deps/npm/node_modules/lodash.isarguments/LICENSE
 create mode 100644 deps/npm/node_modules/lodash.isarguments/README.md
 create mode 100644 deps/npm/node_modules/lodash.isarguments/index.js
 create mode 100644 deps/npm/node_modules/lodash.isarguments/package.json
 create mode 100644 deps/npm/node_modules/lodash.isarray/LICENSE
 create mode 100644 deps/npm/node_modules/lodash.isarray/README.md
 create mode 100644 deps/npm/node_modules/lodash.isarray/index.js
 create mode 100644 deps/npm/node_modules/lodash.isarray/package.json
 create mode 100644 deps/npm/node_modules/lodash.istypedarray/LICENSE.txt
 create mode 100644 deps/npm/node_modules/lodash.istypedarray/README.md
 create mode 100644 deps/npm/node_modules/lodash.istypedarray/index.js
 create mode 100644 deps/npm/node_modules/lodash.istypedarray/package.json
 create mode 100644 deps/npm/node_modules/lodash.keys/LICENSE
 create mode 100644 deps/npm/node_modules/lodash.keys/README.md
 create mode 100644 deps/npm/node_modules/lodash.keys/index.js
 create mode 100644 deps/npm/node_modules/lodash.keys/package.json
 create mode 100644 deps/npm/node_modules/lodash.pad/LICENSE
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/lodash.pad/README.md (84%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/lodash.pad/index.js (78%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/lodash.pad/package.json (70%)
 create mode 100644 deps/npm/node_modules/lodash.padleft/LICENSE.txt
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/lodash.padleft/README.md (100%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/lodash.padleft/index.js (100%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/lodash.padleft/package.json (77%)
 create mode 100644 deps/npm/node_modules/lodash.padright/LICENSE.txt
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/lodash.padright/README.md (100%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/lodash.padright/index.js (100%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules => }/lodash.padright/package.json (77%)
 create mode 100644 deps/npm/node_modules/lodash.pairs/LICENSE.txt
 create mode 100644 deps/npm/node_modules/lodash.pairs/README.md
 create mode 100644 deps/npm/node_modules/lodash.pairs/index.js
 create mode 100644 deps/npm/node_modules/lodash.pairs/package.json
 create mode 100644 deps/npm/node_modules/lodash.repeat/LICENSE
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules => }/lodash.repeat/README.md (84%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules => }/lodash.repeat/index.js (84%)
 rename deps/npm/node_modules/{npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules => }/lodash.repeat/package.json (58%)
 create mode 100644 deps/npm/node_modules/lodash.restparam/LICENSE.txt
 create mode 100644 deps/npm/node_modules/lodash.restparam/README.md
 create mode 100644 deps/npm/node_modules/lodash.restparam/index.js
 create mode 100644 deps/npm/node_modules/lodash.restparam/package.json
 create mode 100644 deps/npm/node_modules/lodash.union/LICENSE.txt
 create mode 100644 deps/npm/node_modules/lodash.union/README.md
 create mode 100644 deps/npm/node_modules/lodash.union/index.js
 create mode 100644 deps/npm/node_modules/lodash.union/package.json
 create mode 100644 deps/npm/node_modules/lodash.uniq/LICENSE
 create mode 100644 deps/npm/node_modules/lodash.uniq/README.md
 create mode 100644 deps/npm/node_modules/lodash.uniq/index.js
 create mode 100644 deps/npm/node_modules/lodash.uniq/package.json
 create mode 100644 deps/npm/node_modules/lodash.without/LICENSE.txt
 create mode 100644 deps/npm/node_modules/lodash.without/README.md
 create mode 100644 deps/npm/node_modules/lodash.without/index.js
 create mode 100644 deps/npm/node_modules/lodash.without/package.json
 delete mode 100644 deps/npm/node_modules/lru-cache/test/serialize.js
 rename deps/npm/node_modules/{request/node_modules/mime-types/node_modules => }/mime-db/HISTORY.md (100%)
 rename deps/npm/node_modules/{request/node_modules/mime-types/node_modules => }/mime-db/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules/mime-types/node_modules => }/mime-db/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules/mime-types/node_modules => }/mime-db/db.json (100%)
 rename deps/npm/node_modules/{request/node_modules/mime-types/node_modules => }/mime-db/index.js (100%)
 create mode 100644 deps/npm/node_modules/mime-db/package.json
 rename deps/npm/node_modules/{request/node_modules => }/mime-types/HISTORY.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/mime-types/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules => }/mime-types/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/mime-types/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/mime-types/package.json (73%)
 delete mode 100644 deps/npm/node_modules/minimatch/node_modules/brace-expansion/README.md
 delete mode 100644 deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
 delete mode 100644 deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
 delete mode 100644 deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
 delete mode 100644 deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/bash-comparison.js
 delete mode 100644 deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/bash-results.txt
 delete mode 100644 deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/cases.txt
 delete mode 100644 deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/dollar.js
 delete mode 100644 deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js
 delete mode 100644 deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/generate.sh
 delete mode 100644 deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/negative-increment.js
 delete mode 100644 deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/nested.js
 delete mode 100644 deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/order.js
 delete mode 100644 deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/pad.js
 delete mode 100644 deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/same-type.js
 delete mode 100644 deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js
 rename deps/npm/node_modules/{node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match => minimist}/.travis.yml (100%)
 rename deps/npm/node_modules/{mkdirp/node_modules => }/minimist/LICENSE (100%)
 rename deps/npm/node_modules/{mkdirp/node_modules => }/minimist/example/parse.js (100%)
 rename deps/npm/node_modules/{mkdirp/node_modules => }/minimist/index.js (97%)
 rename deps/npm/node_modules/{mkdirp/node_modules => }/minimist/package.json (61%)
 rename deps/npm/node_modules/{mkdirp/node_modules => }/minimist/readme.markdown (100%)
 rename deps/npm/node_modules/{mkdirp/node_modules => }/minimist/test/dash.js (100%)
 rename deps/npm/node_modules/{mkdirp/node_modules => }/minimist/test/default_bool.js (100%)
 rename deps/npm/node_modules/{mkdirp/node_modules => }/minimist/test/dotted.js (100%)
 rename deps/npm/node_modules/{mkdirp/node_modules => }/minimist/test/long.js (100%)
 rename deps/npm/node_modules/{mkdirp/node_modules => }/minimist/test/parse.js (98%)
 rename deps/npm/node_modules/{mkdirp/node_modules => }/minimist/test/parse_modified.js (97%)
 rename deps/npm/node_modules/{mkdirp/node_modules => }/minimist/test/short.js (99%)
 rename deps/npm/node_modules/{mkdirp/node_modules => }/minimist/test/whitespace.js (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules => }/ms/.npmignore (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules => }/ms/History.md (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules => }/ms/LICENSE (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules => }/ms/README.md (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules => }/ms/index.js (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules => }/ms/package.json (63%)
 rename deps/npm/node_modules/{fstream-npm/node_modules/fstream-ignore => mute-stream}/LICENSE (100%)
 rename deps/npm/node_modules/{read/node_modules => }/mute-stream/README.md (100%)
 rename deps/npm/node_modules/{read/node_modules => }/mute-stream/mute.js (100%)
 rename deps/npm/node_modules/{read/node_modules => }/mute-stream/package.json (64%)
 rename deps/npm/node_modules/{read/node_modules => }/mute-stream/test/basic.js (100%)
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-comparison.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-results.txt
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/cases.txt
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/dollar.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/generate.sh
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/negative-increment.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/nested.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/order.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/pad.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/same-type.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/.npmignore
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/History.md
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/Makefile
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/Readme.md
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/bower.json
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/browser.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/component.json
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/debug.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node.js
 delete mode 100644 deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/package.json
 rename deps/npm/node_modules/{node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match => node-uuid}/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules => }/node-uuid/LICENSE.md (96%)
 rename deps/npm/node_modules/{request/node_modules => }/node-uuid/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/node-uuid/benchmark/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/node-uuid/benchmark/bench.gnu (94%)
 rename deps/npm/node_modules/{request/node_modules => }/node-uuid/benchmark/bench.sh (100%)
 rename deps/npm/node_modules/{request/node_modules => }/node-uuid/benchmark/benchmark-native.c (100%)
 rename deps/npm/node_modules/{request/node_modules => }/node-uuid/benchmark/benchmark.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/node-uuid/bin/uuid (100%)
 rename deps/npm/node_modules/{request/node_modules => }/node-uuid/bower.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/node-uuid/component.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/node-uuid/package.json (61%)
 rename deps/npm/node_modules/{request/node_modules => }/node-uuid/test/compare_v1.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/node-uuid/test/test.html (100%)
 rename deps/npm/node_modules/{request/node_modules => }/node-uuid/test/test.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/node-uuid/uuid.js (99%)
 delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/LICENSE
 delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/package.json
 delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/package.json
 delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/package.json
 delete mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/package.json
 delete mode 100644 deps/npm/node_modules/npmlog/node_modules/gauge/package.json
 rename deps/npm/node_modules/{request/node_modules => }/oauth-sign/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules => }/oauth-sign/README.md (81%)
 rename deps/npm/node_modules/{request/node_modules => }/oauth-sign/index.js (98%)
 rename deps/npm/node_modules/{request/node_modules => }/oauth-sign/package.json (70%)
 rename deps/npm/node_modules/{request/node_modules => }/oauth-sign/test.js (99%)
 rename deps/npm/node_modules/{osenv/node_modules => }/os-homedir/index.js (85%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk => os-homedir}/license (100%)
 rename deps/npm/node_modules/{osenv/node_modules => }/os-homedir/package.json (52%)
 rename deps/npm/node_modules/{osenv/node_modules => }/os-homedir/readme.md (100%)
 rename deps/npm/node_modules/{osenv/node_modules => }/os-tmpdir/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles => os-tmpdir}/license (100%)
 rename deps/npm/node_modules/{osenv/node_modules => }/os-tmpdir/package.json (66%)
 rename deps/npm/node_modules/{osenv/node_modules => }/os-tmpdir/readme.md (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules => }/path-array/.npmignore (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules => }/path-array/.travis.yml (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules => }/path-array/History.md (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules => }/path-array/README.md (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules => }/path-array/index.js (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules => }/path-array/package.json (66%)
 rename deps/npm/node_modules/{node-gyp/node_modules => }/path-array/test/test.js (100%)
 rename deps/npm/node_modules/{glob/node_modules => }/path-is-absolute/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp => path-is-absolute}/license (100%)
 rename deps/npm/node_modules/{glob/node_modules => }/path-is-absolute/package.json (64%)
 rename deps/npm/node_modules/{glob/node_modules => }/path-is-absolute/readme.md (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/process-nextick-args/.travis.yml (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/process-nextick-args/index.js (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/process-nextick-args/license.md (100%)
 rename deps/npm/node_modules/{sha/node_modules/readable-stream/node_modules => }/process-nextick-args/package.json (57%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/process-nextick-args/readme.md (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/process-nextick-args/test.js (100%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/.npmignore (100%)
 rename deps/npm/node_modules/{char-spinner => promzard}/LICENSE (100%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/README.md (100%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/example/buffer.js (100%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/example/index.js (100%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/example/npm-init/README.md (100%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/example/npm-init/init-input.js (100%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/example/npm-init/init.js (100%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/example/npm-init/package.json (100%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/example/substack-input.js (99%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/package.json (61%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/promzard.js (99%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/test/basic.js (100%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/test/buffer.js (100%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/test/exports.input (100%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/test/exports.js (100%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/test/fn.input (100%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/test/fn.js (100%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/test/simple.input (100%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/test/simple.js (97%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/test/validate.input (100%)
 rename deps/npm/node_modules/{init-package-json/node_modules => }/promzard/test/validate.js (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/minimatch/node_modules/sigmund => proto-list}/LICENSE (100%)
 rename deps/npm/node_modules/{config-chain/node_modules => }/proto-list/README.md (100%)
 rename deps/npm/node_modules/{config-chain/node_modules => }/proto-list/package.json (63%)
 rename deps/npm/node_modules/{config-chain/node_modules => }/proto-list/proto-list.js (100%)
 rename deps/npm/node_modules/{config-chain/node_modules => }/proto-list/test/basic.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/qs/.eslintignore (100%)
 rename deps/npm/node_modules/{request/node_modules => }/qs/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules/boom => qs}/.travis.yml (98%)
 mode change 100755 => 100644
 rename deps/npm/node_modules/{request/node_modules => }/qs/CHANGELOG.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/qs/CONTRIBUTING.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/qs/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules/qs/Readme.md => qs/README.md} (100%)
 rename deps/npm/node_modules/{request/node_modules => }/qs/bower.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/qs/component.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/qs/dist/qs.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/qs/lib/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/qs/lib/parse.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/qs/lib/stringify.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/qs/lib/utils.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/qs/package.json (66%)
 rename deps/npm/node_modules/{request/node_modules => }/qs/test/parse.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/qs/test/stringify.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/qs/test/utils.js (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion => read-cmd-shim}/.npmignore (65%)
 create mode 100644 deps/npm/node_modules/read-cmd-shim/README.md
 create mode 100644 deps/npm/node_modules/read-cmd-shim/index.js
 create mode 100644 deps/npm/node_modules/read-cmd-shim/package.json
 create mode 100644 deps/npm/node_modules/read-cmd-shim/test/integration.js
 delete mode 100644 deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/package.json
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/.editorconfig
 delete mode 100755 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/benchmark/benchmark.js
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/benchmark/package.json
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/docs/Grammar.md
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/docs/JSON5.md
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/package.json
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/portable-json5-tests.yaml
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_analyze.js
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_document.js
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_errors.js
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_parse.js
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_portable.js
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_stringify.js
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_tokenize.js
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_updates.js
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/author.yaml
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/deep-object.yaml
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/delete.yaml
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/norm-array.yaml
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/norm-object.yaml
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/npm-array-bin.yaml
 delete mode 100644 deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/pkg-json5.yaml
 rename deps/npm/node_modules/{read-installed/node_modules/readdir-scoped-modules => read-package-tree}/.travis.yml (100%)
 rename deps/npm/node_modules/{read-installed/node_modules/readdir-scoped-modules => read-package-tree}/LICENSE (100%)
 create mode 100644 deps/npm/node_modules/read-package-tree/README.md
 create mode 100644 deps/npm/node_modules/read-package-tree/package.json
 create mode 100644 deps/npm/node_modules/read-package-tree/rpt.js
 create mode 100644 deps/npm/node_modules/read-package-tree/test/basic.js
 create mode 100644 deps/npm/node_modules/read-package-tree/test/fixtures/bad/package.json
 create mode 100644 deps/npm/node_modules/read-package-tree/test/fixtures/deep-archy.txt
 rename deps/npm/node_modules/{read-installed/node_modules/readdir-scoped-modules/test/fixtures/@org/x => read-package-tree/test/fixtures/deep}/.keep (100%)
 create mode 100644 deps/npm/node_modules/read-package-tree/test/fixtures/empty/node_modules/foo/package.json
 create mode 100644 deps/npm/node_modules/read-package-tree/test/fixtures/linkedroot-archy.txt
 create mode 100644 deps/npm/node_modules/read-package-tree/test/fixtures/noname/archy.txt
 rename deps/npm/node_modules/{read-installed/node_modules/readdir-scoped-modules/test/fixtures/@org/y/.keep => read-package-tree/test/fixtures/noname/node_modules/foo/keep-alive} (100%)
 create mode 100644 deps/npm/node_modules/read-package-tree/test/fixtures/other/archy.txt
 rename deps/npm/node_modules/{read-installed/node_modules/readdir-scoped-modules/test/fixtures/@scope/x/.keep => read-package-tree/test/fixtures/other/node_modules/.bin} (100%)
 create mode 100644 deps/npm/node_modules/read-package-tree/test/fixtures/root/archy.txt
 create mode 100644 deps/npm/node_modules/read-package-tree/test/fixtures/root/package.json
 create mode 100644 deps/npm/node_modules/read-package-tree/test/fixtures/selflink/archy.re
 create mode 100644 deps/npm/node_modules/read-package-tree/test/fixtures/selflink/package.json
 delete mode 100644 deps/npm/node_modules/readable-stream/node_modules/core-util-is/README.md
 delete mode 100644 deps/npm/node_modules/readable-stream/node_modules/core-util-is/float.patch
 delete mode 100644 deps/npm/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
 delete mode 100644 deps/npm/node_modules/readable-stream/node_modules/core-util-is/package.json
 delete mode 100644 deps/npm/node_modules/readable-stream/node_modules/core-util-is/util.js
 delete mode 100644 deps/npm/node_modules/readable-stream/node_modules/isarray/README.md
 delete mode 100644 deps/npm/node_modules/readable-stream/node_modules/isarray/build/build.js
 delete mode 100644 deps/npm/node_modules/readable-stream/node_modules/isarray/component.json
 delete mode 100644 deps/npm/node_modules/readable-stream/node_modules/isarray/index.js
 delete mode 100644 deps/npm/node_modules/readable-stream/node_modules/isarray/package.json
 delete mode 100644 deps/npm/node_modules/readable-stream/node_modules/string_decoder/.npmignore
 delete mode 100644 deps/npm/node_modules/readable-stream/node_modules/string_decoder/LICENSE
 delete mode 100644 deps/npm/node_modules/readable-stream/node_modules/string_decoder/README.md
 delete mode 100644 deps/npm/node_modules/readable-stream/node_modules/string_decoder/index.js
 delete mode 100644 deps/npm/node_modules/readable-stream/node_modules/string_decoder/package.json
 create mode 100644 deps/npm/node_modules/readdir-scoped-modules/.travis.yml
 rename deps/npm/node_modules/{read/node_modules/mute-stream => readdir-scoped-modules}/LICENSE (100%)
 rename deps/npm/node_modules/{read-installed/node_modules => }/readdir-scoped-modules/README.md (100%)
 create mode 100644 deps/npm/node_modules/readdir-scoped-modules/package.json
 rename deps/npm/node_modules/{read-installed/node_modules => }/readdir-scoped-modules/readdir.js (100%)
 rename deps/npm/node_modules/{read-installed/node_modules => }/readdir-scoped-modules/test/basic.js (100%)
 rename deps/npm/node_modules/{read-installed/node_modules/readdir-scoped-modules/test/fixtures/@scope/y => readdir-scoped-modules/test/fixtures/@org/x}/.keep (100%)
 rename deps/npm/node_modules/{read-installed/node_modules/readdir-scoped-modules/test/fixtures/a/x => readdir-scoped-modules/test/fixtures/@org/y}/.keep (100%)
 rename deps/npm/node_modules/{read-installed/node_modules/readdir-scoped-modules/test/fixtures/a/y => readdir-scoped-modules/test/fixtures/@scope/x}/.keep (100%)
 rename deps/npm/node_modules/{read-installed/node_modules/readdir-scoped-modules/test/fixtures/b/x => readdir-scoped-modules/test/fixtures/@scope/y}/.keep (100%)
 rename deps/npm/node_modules/{read-installed/node_modules/readdir-scoped-modules/test/fixtures/b/y => readdir-scoped-modules/test/fixtures/a/x}/.keep (100%)
 create mode 100644 deps/npm/node_modules/readdir-scoped-modules/test/fixtures/a/y/.keep
 create mode 100644 deps/npm/node_modules/readdir-scoped-modules/test/fixtures/b/x/.keep
 create mode 100644 deps/npm/node_modules/readdir-scoped-modules/test/fixtures/b/y/.keep
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/README.md
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/float.patch
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/package.json
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/util.js
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/README.md
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/build/build.js
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/component.json
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/index.js
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/index.js
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/package.json
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/readme.md
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/test.js
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/.npmignore
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/LICENSE
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/README.md
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/index.js
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/History.md
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/LICENSE
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/README.md
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/browser.js
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/node.js
 delete mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/package.json
 delete mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/index.js
 delete mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/package.json
 delete mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/readme.md
 delete mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/index.js
 delete mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/license
 delete mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/index.js
 delete mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/license
 delete mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/package.json
 delete mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/readme.md
 delete mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/readme.md
 delete mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/license
 delete mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/.travis.yml
 delete mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/.travis.yml
 delete mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json
 delete mode 100644 deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
 delete mode 100644 deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/package.json
 delete mode 100644 deps/npm/node_modules/request/node_modules/node-uuid/.npmignore
 delete mode 100644 deps/npm/node_modules/request/node_modules/tough-cookie/.jshintrc
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/README.md
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/float.patch
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/util.js
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/README.md
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/build/build.js
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/component.json
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/index.js
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/package.json
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/index.js
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/license.md
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/readme.md
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/test.js
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/.npmignore
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/LICENSE
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/README.md
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/index.js
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/package.json
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/History.md
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/LICENSE
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/README.md
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/browser.js
 delete mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/node.js
 rename deps/npm/node_modules/{request/node_modules/json-stringify-safe => sigmund}/LICENSE (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/minimatch/node_modules => }/sigmund/README.md (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/minimatch/node_modules => }/sigmund/bench.js (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/minimatch/node_modules => }/sigmund/package.json (61%)
 rename deps/npm/node_modules/{node-gyp/node_modules/minimatch/node_modules => }/sigmund/sigmund.js (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/minimatch/node_modules => }/sigmund/test/basic.js (99%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/sntp/.npmignore (99%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/sntp/.travis.yml (97%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/sntp/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/sntp/Makefile (94%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/sntp/README.md (99%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/sntp/examples/offset.js (99%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/sntp/examples/time.js (99%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/sntp/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/sntp/lib/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/sntp/package.json (67%)
 rename deps/npm/node_modules/{request/node_modules/hawk/node_modules => }/sntp/test/index.js (99%)
 rename deps/npm/node_modules/{validate-npm-package-license/node_modules => }/spdx-correct/README.md (100%)
 rename deps/npm/node_modules/{validate-npm-package-license/node_modules => }/spdx-correct/index.js (100%)
 rename deps/npm/node_modules/{validate-npm-package-license/node_modules => }/spdx-correct/package.json (67%)
 rename deps/npm/node_modules/{validate-npm-package-license/node_modules/spdx-expression-parse/node_modules => }/spdx-exceptions/.npmignore (100%)
 rename deps/npm/node_modules/{validate-npm-package-license/node_modules/spdx-expression-parse/node_modules => }/spdx-exceptions/LICENSE.md (100%)
 rename deps/npm/node_modules/{validate-npm-package-license/node_modules/spdx-expression-parse/node_modules => }/spdx-exceptions/README.md (100%)
 rename deps/npm/node_modules/{validate-npm-package-license/node_modules/spdx-expression-parse/node_modules => }/spdx-exceptions/index.json (100%)
 rename deps/npm/node_modules/{validate-npm-package-license/node_modules/spdx-expression-parse/node_modules => }/spdx-exceptions/package.json (63%)
 rename deps/npm/node_modules/{validate-npm-package-license/node_modules => }/spdx-expression-parse/LICENSE (100%)
 rename deps/npm/node_modules/{validate-npm-package-license/node_modules => }/spdx-expression-parse/README.md (100%)
 rename deps/npm/node_modules/{validate-npm-package-license/node_modules => }/spdx-expression-parse/index.js (100%)
 rename deps/npm/node_modules/{validate-npm-package-license/node_modules => }/spdx-expression-parse/package.json (65%)
 rename deps/npm/node_modules/{validate-npm-package-license/node_modules => }/spdx-expression-parse/parser.generated.js (100%)
 rename deps/npm/node_modules/{spdx/node_modules => }/spdx-license-ids/LICENSE (100%)
 rename deps/npm/node_modules/{validate-npm-package-license/node_modules/spdx-correct/node_modules => }/spdx-license-ids/README.md (100%)
 rename deps/npm/node_modules/{validate-npm-package-license/node_modules/spdx-correct/node_modules => }/spdx-license-ids/package.json (72%)
 rename deps/npm/node_modules/{validate-npm-package-license/node_modules/spdx-correct/node_modules => }/spdx-license-ids/spdx-license-ids.json (100%)
 delete mode 100644 deps/npm/node_modules/spdx/LICENSE.md
 delete mode 100644 deps/npm/node_modules/spdx/README.md
 delete mode 100755 deps/npm/node_modules/spdx/node_modules/spdx-license-ids/README.md
 delete mode 100644 deps/npm/node_modules/spdx/node_modules/spdx-license-ids/package.json
 delete mode 100644 deps/npm/node_modules/spdx/node_modules/spdx-license-ids/spdx-license-ids.json
 delete mode 100644 deps/npm/node_modules/spdx/package.json
 delete mode 100644 deps/npm/node_modules/spdx/source/exceptions.json
 delete mode 100644 deps/npm/node_modules/spdx/source/parser.generated.js
 delete mode 100644 deps/npm/node_modules/spdx/source/ranges.json
 delete mode 100644 deps/npm/node_modules/spdx/source/spdx.js
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/string_decoder/.npmignore (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/string_decoder/LICENSE (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/string_decoder/README.md (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/string_decoder/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/bl/node_modules/readable-stream/node_modules => }/string_decoder/package.json (61%)
 rename deps/npm/node_modules/{request/node_modules => }/stringstream/.npmignore (100%)
 rename deps/npm/node_modules/{node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map => stringstream}/.travis.yml (100%)
 rename deps/npm/node_modules/{request/node_modules => }/stringstream/LICENSE.txt (100%)
 rename deps/npm/node_modules/{request/node_modules => }/stringstream/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/stringstream/example.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/stringstream/package.json (72%)
 rename deps/npm/node_modules/{request/node_modules => }/stringstream/stringstream.js (100%)
 rename deps/npm/node_modules/{columnify/node_modules => }/strip-ansi/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi => strip-ansi}/license (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk/node_modules => }/strip-ansi/package.json (51%)
 rename deps/npm/node_modules/{columnify/node_modules => }/strip-ansi/readme.md (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk/node_modules => }/supports-color/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex => supports-color}/license (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk/node_modules => }/supports-color/package.json (67%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/chalk/node_modules => }/supports-color/readme.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/.editorconfig (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/.travis.yml (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/generate-pubsuffix.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/lib/cookie.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/lib/memstore.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/lib/pathMatch.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/lib/permuteDomain.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/lib/pubsuffix.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/lib/store.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/package.json (62%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/public-suffix.txt (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/test/api_test.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/test/cookie_jar_test.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/test/cookie_sorting_test.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/test/cookie_to_json_test.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/test/cookie_to_string_test.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/test/date_test.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/test/domain_and_path_test.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/test/ietf_data/dates/bsd-examples.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/test/ietf_data/dates/examples.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/test/ietf_data/parser.json (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/test/ietf_test.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/test/jar_serialization_test.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/test/lifetime_test.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/test/parsing_test.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tough-cookie/test/regression_test.js (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tunnel-agent/LICENSE (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tunnel-agent/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules => }/tunnel-agent/index.js (98%)
 rename deps/npm/node_modules/{request/node_modules => }/tunnel-agent/package.json (71%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules => }/typedarray/.travis.yml (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules => }/typedarray/LICENSE (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules => }/typedarray/example/tarray.js (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules => }/typedarray/index.js (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules => }/typedarray/package.json (67%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules => }/typedarray/readme.markdown (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules => }/typedarray/test/server/undef_globals.js (98%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules => }/typedarray/test/tarray.js (100%)
 create mode 100644 deps/npm/node_modules/unique-filename/.npmignore
 create mode 100644 deps/npm/node_modules/unique-filename/README.md
 create mode 100644 deps/npm/node_modules/unique-filename/index.js
 create mode 100644 deps/npm/node_modules/unique-filename/package.json
 create mode 100644 deps/npm/node_modules/unique-filename/test/index.js
 create mode 100644 deps/npm/node_modules/unique-slug/.npmignore
 create mode 100644 deps/npm/node_modules/unique-slug/README.md
 create mode 100644 deps/npm/node_modules/unique-slug/index.js
 create mode 100644 deps/npm/node_modules/unique-slug/package.json
 create mode 100644 deps/npm/node_modules/unique-slug/test/index.js
 create mode 100644 deps/npm/node_modules/unpipe/HISTORY.md
 rename deps/npm/node_modules/{github-url-from-git => unpipe}/LICENSE (93%)
 create mode 100644 deps/npm/node_modules/unpipe/README.md
 create mode 100644 deps/npm/node_modules/unpipe/index.js
 create mode 100644 deps/npm/node_modules/unpipe/package.json
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/util-deprecate/History.md (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/util-deprecate/LICENSE (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/util-deprecate/README.md (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/util-deprecate/browser.js (100%)
 rename deps/npm/node_modules/{npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules => }/util-deprecate/node.js (100%)
 rename deps/npm/node_modules/{sha/node_modules/readable-stream/node_modules => }/util-deprecate/package.json (61%)
 rename deps/npm/node_modules/{read-installed/node_modules => }/util-extend/README.md (100%)
 rename deps/npm/node_modules/{read-installed/node_modules => }/util-extend/extend.js (100%)
 rename deps/npm/node_modules/{read-installed/node_modules => }/util-extend/package.json (61%)
 rename deps/npm/node_modules/{read-installed/node_modules => }/util-extend/test.js (100%)
 delete mode 100644 deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/node_modules/spdx-license-ids/LICENSE
 delete mode 100644 deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-license-ids/LICENSE
 delete mode 100755 deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-license-ids/README.md
 delete mode 100644 deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-license-ids/package.json
 delete mode 100644 deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-license-ids/spdx-license-ids.json
 delete mode 100644 deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/.travis.yml
 delete mode 100644 deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/package.json
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property => wcwidth}/.npmignore (100%)
 rename deps/npm/node_modules/{columnify/node_modules => }/wcwidth/LICENSE (99%)
 rename deps/npm/node_modules/{columnify/node_modules => }/wcwidth/Readme.md (100%)
 rename deps/npm/node_modules/{columnify/node_modules => }/wcwidth/combining.js (100%)
 rename deps/npm/node_modules/{columnify/node_modules => }/wcwidth/docs/index.md (99%)
 rename deps/npm/node_modules/{columnify/node_modules => }/wcwidth/index.js (100%)
 rename deps/npm/node_modules/{columnify/node_modules => }/wcwidth/package.json (64%)
 rename deps/npm/node_modules/{columnify/node_modules => }/wcwidth/test/index.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/xtend/.npmignore (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/xtend/LICENCE (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/xtend/Makefile (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/xtend/README.md (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/xtend/immutable.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/xtend/mutable.js (100%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/xtend/package.json (63%)
 rename deps/npm/node_modules/{request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules => }/xtend/test.js (100%)
 create mode 100644 deps/npm/scripts/installable.sh
 delete mode 100644 deps/npm/test/common.js
 create mode 100644 deps/npm/test/tap/check-cpu-reqs.js
 create mode 100644 deps/npm/test/tap/check-engine-reqs.js
 create mode 100644 deps/npm/test/tap/check-install-self.js
 create mode 100644 deps/npm/test/tap/check-os-reqs.js
 create mode 100644 deps/npm/test/tap/check-permissions.js
 create mode 100644 deps/npm/test/tap/cruft-test.js
 create mode 100644 deps/npm/test/tap/do-not-remove-other-bins.js
 create mode 100644 deps/npm/test/tap/extraneous-dep-cycle-ls-ok.js
 create mode 100644 deps/npm/test/tap/gently-rm-cmdshims.js
 create mode 100644 deps/npm/test/tap/install-actions.js
 create mode 100644 deps/npm/test/tap/install-bad-dep-format.js
 create mode 100644 deps/npm/test/tap/install-cli-only-development.js
 create mode 100644 deps/npm/test/tap/install-cli-only-production.js
 create mode 100644 deps/npm/test/tap/install-into-likenamed-folder.js
 create mode 100644 deps/npm/test/tap/install-local-dep-cycle.js
 create mode 100644 deps/npm/test/tap/install-order.js
 create mode 100644 deps/npm/test/tap/is-fs-access-available.js
 create mode 100644 deps/npm/test/tap/ls-top-errors.js
 create mode 100644 deps/npm/test/tap/no-global-warns.js
 create mode 100644 deps/npm/test/tap/no-scan-full-global-dir.js
 create mode 100644 deps/npm/test/tap/normalize-package-explode.js
 create mode 100644 deps/npm/test/tap/progress-config.js
 create mode 100644 deps/npm/test/tap/rm-linked.js
 create mode 100644 deps/npm/test/tap/shrinkwrap-prod-dependency-also.js
 create mode 100644 deps/npm/test/tap/symlink-cycle.js
 create mode 100644 deps/npm/test/tap/uninstall-in-reverse.js
 create mode 100644 deps/npm/test/tap/update-path.js
 create mode 100644 deps/npm/test/tap/verify-no-lifecycle-on-repo.js

diff --git a/deps/npm/.mailmap b/deps/npm/.mailmap
index 84886514da4666..55383ba8df11d2 100644
--- a/deps/npm/.mailmap
+++ b/deps/npm/.mailmap
@@ -24,6 +24,7 @@ Isaac Z. Schlueter <i@izs.me> <i@foohack.com>
 Isaac Z. Schlueter <i@izs.me> isaacs <i@izs.me>
 Jake Verbaten <raynos2@gmail.com>
 James Sanders <jimmyjazz14@gmail.com>
+James Treworgy <jamietre@gmail.com>
 Jason Smith <jhs@iriscouch.com>
 Jonas Weber <github@jonasw.de>
 Julien Meddah <julien.meddah@deveryware.com>
diff --git a/deps/npm/.travis.yml b/deps/npm/.travis.yml
index d555682984faf5..e5828a39759b6e 100644
--- a/deps/npm/.travis.yml
+++ b/deps/npm/.travis.yml
@@ -8,7 +8,7 @@ env:
   - DEPLOY_VERSION=testing
 before_install:
   - "npm config set spin false"
-  - "npm install -g npm/npm#2.x"
+  - "node . install -g ."
   - "sudo mkdir -p /var/run/couchdb"
 script: "npm run-script test-all"
 notifications:
diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS
index 9b03dc4d363c9f..cbafe00659c6bd 100644
--- a/deps/npm/AUTHORS
+++ b/deps/npm/AUTHORS
@@ -291,11 +291,12 @@ Eduardo Pinho <enet4mikeenet@gmail.com>
 Rachel Hutchison <rhutchix@intel.com>
 Ryan Temple <ryantemple145@gmail.com>
 Eugene Sharygin <eush77@gmail.com>
-Nick Heiner <nick.heiner@opower.com>
 James Talmage <james@talmage.io>
 jane arc <jane@uber.com>
 Joseph Dykstra <josephdykstra@gmail.com>
+Andrew Crites <ajcrites@gmail.com>
 Joshua Egan <josh-egan@users.noreply.github.com>
+Carlos Alberto <euprogramador@gmail.com>
 Thomas Cort <thomasc@ssimicro.com>
 Thaddee Tyl <thaddee.tyl@gmail.com>
 Steve Klabnik <steve@steveklabnik.com>
@@ -308,7 +309,7 @@ murgatroid99 <mlumish@google.com>
 Marcin Cieslak <saper@saper.info>
 João Reis <reis@janeasystems.com>
 Matthew Hasbach <hasbach.git@gmail.com>
-Anna Henningsen <sqrt@entless.org>
 Jon Hall <jon_hall@outlook.com>
+Anna Henningsen <sqrt@entless.org>
+James Treworgy <jamietre@gmail.com>
 James Hartig <james@levenlabs.com>
-snopeks <stephaniesnopek@gmail.com>
diff --git a/deps/npm/CHANGELOG.md b/deps/npm/CHANGELOG.md
index 8a8dbbca445cd5..d4c1ba4aa2fa8f 100644
--- a/deps/npm/CHANGELOG.md
+++ b/deps/npm/CHANGELOG.md
@@ -1,49 +1,118 @@
-### v2.14.7 (2015-10-01):
+### v3.3.6 (2015-09-30):
+
+I have the most exciting news for you this week.  YOU HAVE NO IDEA.  Well,
+ok, maybe you do if you follow my twitter.
+
+Performance just got 5 bazillion times better (under some circumstances,
+ymmv, etc).  So– my test scenario is our very own website.  In npm@2, on my
+macbook running `npm ls` takes about 5 seconds. Personally it's more than
+I'd like, but it's entire workable. In npm@3 it has been taking _50_ seconds,
+which is appalling. But after doing some work on Monday isolating the performance
+issues I've been able to reduce npm@3's run time back down to 5 seconds.
+
+Other scenarios were even worse, there was one that until now in npm@3 that
+took almost 6 minutes, and has been reduced to 14 seconds.
+
+* [`7bc0d4c`](https:github.com/npm/npm/commit/7bc0d4c)
+  [`cf42217`](https:github.com/npm/npm/commit/cf42217)
+  [#8826](https://github.com/npm/npm/issues/8826)
+  Stop using deepclone on super big datastructures. Avoid cloning
+  all-together even when that means mutating things, when possible.
+  Otherwise use a custom written tree-copying function that understands
+  the underlying datastructure well enough to only copy what we absolutely
+  need to.
+  ([@iarna](https://github.com/iarna))
+
+In other news, look for us this Friday and Saturday at the amazing
+[Open Source and Feelings](https://osfeels.com) conference, where something like a
+third of the company will be attending.
+
+#### And finally a dependency update
+
+* [`a6a4437`](https:github.com/npm/npm/commit/a6a4437)
+  glob@5.0.15
+  ([@isaacs](https://github.com/isaacs))
+
+#### And some subdep updates
+
+* [`cc5e6a0`](https:github.com/npm/npm/commit/cc5e6a0)
+  hoek@2.16.3
+  ([@nlf](https://github.com/nlf))
+* [`912a516`](https:github.com/npm/npm/commit/912a516)
+  boom@2.9.0
+  ([@arb](https://github.com/arb))
+* [`63944e9`](https:github.com/npm/npm/commit/63944e9)
+  bluebird@2.10.1
+  ([@petkaantonov](https://github.com/petkaantonov))
+* [`ef16003`](https:github.com/npm/npm/commit/ef16003)
+  mime-types@2.1.7 & mime-db@1.19.0
+  ([@dougwilson](https://github.com/dougwilson))
+* [`2b8c0dd`](https:github.com/npm/npm/commit/2b8c0dd)
+  request@2.64.0
+  ([@simov](https://github.com/simov))
+* [`8139124`](https:github.com/npm/npm/commit/8139124)
+  brace-expansion@1.1.1
+  ([@juliangruber](https://github.com/juliangruber))
+
+### v3.3.5 (2015-09-24):
 
-#### MORE RELEASE STAGGERING?!
+Some of you all may not be aware, but npm is ALSO a company. I tell you this
+'cause npm-the-company had an all-staff get together this week, flying in
+our remote folks from around the world. That was great, but it also
+basically eliminated normal work on Monday and Tuesday.
 
-Hi all, and greetings from [Open Source & Feelings](http://osfeels.com)!
+Still, we've got a couple of really important bug fixes this week.  Plus a
+lil bit from the [now LTS 2.x branch](https://github.com/npm/npm/releases/tag/v2.14.6).
 
-So we're switching gears a little with how we handle our weekly releases: from
-now on, we're going to stagger release weeks between dependency bumps and
-regular patches. So, this week, aside from a doc change, we'll be doing only
-version bumps. Expect actual patches next week!
+#### ATTENTION WINDOWS USERS
 
-#### TOTALLY FOLLOWING THE RULES ALREADY
+If you previously updated to npm 3 and you try to update again, you may get
+an error messaging telling you that npm won't install npm into itself. Until you
+are at 3.3.5 or greater, you can get around this with `npm install -f -g npm`.
 
-So I snuck this in, because it's our own [@snopeks](https://github.com/snopeks)'
-first contribution to the main `npm` repo. She's been helping with building
-support documents for Orgs, and contributed her general intro guide to the new
-feature so you can read it with `npm help orgs` right in your terminal!
+* [`bef06f5`](https://github.com/npm/npm/commit/bef06f5)
+  [#9741](https://github.com/npm/npm/pull/9741) Uh...  so...  er...  it
+  seems that since npm@3.2.0 on Windows with a default configuration, it's
+  been impossible to update npm.  Well, that's not actually true, there's a
+  work around (see above), but it shouldn't be complaining in the first
+  place.
+  ([@iarna](https://github.com/iarna))
 
-* [`8324ea0`](https://github.com/npm/npm/commit/8324ea023ace4e08b6b8959ad199e2457af9f9cf)
-  [#9761](https://github.com/npm/npm/pull/9761) Added general user guide for
-  Orgs.
-  ([@snopeks](https://github.com/snopeks))
+#### STACK OVERFLOWS ON PUBLISH
 
-#### JUST. ONE. MORE.
+* [`330b496`](https://github.com/npm/npm/commit/330b496)
+  [#9667](https://github.com/npm/npm/pull/9667)
+  We were keeping track of metadata about your project while packing the
+  tree in a way that resulted in this data being written to packed tar files
+  headers. When this metadata included cycles, it resulted in the the tar
+  file entering an infinite recursive loop and eventually crashing with a
+  stack overflow.
 
-* [`9a502ca`](https://github.com/npm/npm/commit/9a502ca96e2d43ec75a8f684c9ca33af7e910f0a)
-  Use unique package name in tests to work around weird test-state-based
-  failures.
+  I've patched this by keeping track of your metadata by closing over the
+  variables in question instead, and I've further restricted gathering and
+  tracking the metadata to times when it's actually needed. (Which is only
+  if you need bundled modules.)
   ([@iarna](https://github.com/iarna))
 
-#### OKAY ACTUALLY THE THING I WAS SUPPOSED TO DO
+#### LESS CRASHY ERROR MESSAGES ON BAD PACKAGES
 
-Anyway -- here's your version bump! :)
+* [`829921f`](https://github.com/npm/npm/commit/829921f)
+  [#9741](https://github.com/npm/npm/pull/9741)
+  Packages with invalid names or versions were crashing the installer. These
+  are now captured and warned as was originally intended.
+  ([@iarna](https://github.com/iarna))
+
+#### ONE DEPENDENCY UPDATE
 
-* [`4aeb94c`](https://github.com/npm/npm/commit/4aeb94c9f0df3f41802cf2e0397a998f3b527c25)
-  `request@2.64.0`: No longer defaulting to `application/json` for `json`
-  requests. Also some minor doc and packaging patches.
+* [`963295c`](https://github.com/npm/npm/commit/963295c)
+  npm-install-checks@2.0.1
+  ([@iarna](https://github.com/iarna))
+
+#### AND ONE SUBDEPENDENCY
+
+* [`448737d`](https://github.com/npm/npm/commit/448737d)
+  request@2.63.0
   ([@simov](https://github.com/simov))
-  `minimatch@3.0.0`: No longer packaging browser modules.
-  ([@isaacs](https://github.com/isaacs))
-* [`a18b213`](https://github.com/npm/npm/commit/a18b213e6945a8f5faf882927829ac95f844e2aa)
-  `glob@5.0.15`: Upgraded `minimatch` dependency.
-  ([@isaacs](https://github.com/isaacs))
-* [`9eb64d4`](https://github.com/npm/npm/commit/9eb64e44509519ca9d788502edb2eba4cea5c86b)
-  `nock@2.13.0`
-  ([@pgte](https://github.com/pgte))
 
 ### v2.14.6 (2015-09-24):
 
@@ -65,12 +134,70 @@ Still, we're bringing you a couple of tiny little changes this week!
   making `json` requests.
   ([@simov](https://github.com/simov))
 
+### v3.3.4 (2015-09-17):
+
+This is a relatively quiet release, bringing a few bug fixes and
+some module updates, plus via the
+[2.14.5 release](https://github.com/npm/npm/releases/tag/v2.14.5)
+some forward compatibility fixes with versions of Node that
+aren't yet released.
+
+#### NO BETA NOTICE THIS TIME!!
+
+But, EXCITING NEWS FRIENDS, this week marks the exit of npm@3
+from beta. This means that the week of this release,
+[v3.3.3](https://github.com/npm/npm/releases/tag/v3.3.3) will
+become `latest` and this version (v3.3.4) will become `next`!!
+
+#### CRUFT FOR THE CRUFT GODS
+
+What I call "cruft", by which I mean, files sitting around in
+your `node_modules` folder, will no longer produce warnings in
+`npm ls` nor during `npm install`. This brings npm@3's behavior
+in line with npm@2.
+
+* [`a127801`](https://github.com/npm/npm/commit/a127801)
+  [#9285](https://github.com/npm/npm/pull/9586)
+  Stop warning about cruft in module directories.
+  ([@iarna](https://github.com/iarna))
+
+#### BETTER ERROR MESSAGE
+
+* [`95ee92c`](https://github.com/npm/npm/commit/95ee92c)
+  [#9433](https://github.com/npm/npm/issues/9433)
+  Give better error messages for invalid urls in the dependecy
+  list.
+  ([@jamietre](https://github.com/jamietre))
+
+#### MODULE UPDATES
+
+* [`ebb92ca`](https://github.com/npm/npm/commit/ebb92ca)
+  retry@0.8.0 [(@tim-kos](https://github.com/tim-kos))
+* [`55f1285`](https://github.com/npm/npm/commit/55f1285)
+  normalize-package-data@2.3.4 [(@zkat](https://github.com/zkat))
+* [`6d4ebff`](https://github.com/npm/npm/commit/6d4ebff)
+  sha@2.0.1 [(@ForbesLindesay](https://github.com/ForbesLindesay))
+* [`09a9c7a`](https://github.com/npm/npm/commit/09a9c7a)
+  semver@5.0.3 [(@isaacs](https://github.com/isaacs))
+* [`745000f`](https://github.com/npm/npm/commit/745000f)
+  node-gyp@3.0.3 [(@rvagg](https://github.com/rvagg))
+
+#### SUB DEP MODULE UPDATES
+
+* [`578ca25`](https://github.com/npm/npm/commit/578ca25)
+  request@2.62.0 [(@simov](https://github.com/simov))
+* [`1d8996e`](https://github.com/npm/npm/commit/1d8996e)
+  jju@1.2.1 [(@rlidwka](https://github.com/rlidwka))
+* [`6da1ba4`](https://github.com/npm/npm/commit/6da1ba4)
+  hoek@2.16.2 [(@nlf](https://github.com/nlf))
+
 ### v2.14.5 (2015-09-17):
 
 #### NPM IS DEAD. LONG LIVE NPM
 
-That's right folks. As of this week, `npm@latest` is `npm@3`! There's some
-really great shiny new things over there, and you should really take a look.
+That's right folks. As of this week, `npm@next` is `npm@3`, which means it'll be
+`npm@latest` next week! There's some really great shiny new things over there,
+and you should really take a look.
 
 Many kudos to [@iarna](https://github.com/iarna) for her hard work on `npm@3`!
 
@@ -138,6 +265,141 @@ bunch of patches to get the latest npm working.
   `semver@5.0.3`: Removed uglify-js dead code.
   ([@isaacs](https://github.com/isaacs))
 
+### v3.3.3 (2015-09-10):
+
+This short week brought us brings us a few small bug fixes, a
+doc change and a whole lotta dependency updates.
+
+Plus, as usual, this includes a forward port of everything in
+[`npm@2.14.4`](https://github.com/npm/npm/releases/tag/v2.14.4).
+
+#### BETA BUT NOT FOREVER
+
+**_THIS IS BETA SOFTWARE_**. `npm@3` will remain in beta until
+we're confident that it's stable and have assessed the effect of
+the breaking changes on the community. During that time we will
+still be doing `npm@2` releases, with `npm@2` tagged as `latest`
+and `next`. We'll _also_ be publishing new releases of `npm@3`
+as `npm@v3.x-next` and `npm@v3.x-latest` alongside those
+versions until we're ready to switch everyone over to `npm@3`.
+We need your help to find and fix its remaining bugs. It's a
+significant rewrite, so we are _sure_ there still significant
+bugs remaining. So do us a solid and deploy it in non-critical
+CI environments and for day-to-day use, but maybe don't use it
+for production maintenance or frontline continuous deployment
+just yet.
+
+#### REMOVE INSTALLED BINARIES ON WINDOWS
+
+So waaaay back at the start of August, I fixed a bug with
+[#9198](https://github.com/npm/npm/pull/9198). That fix made it
+so that if you had two modules installed that both installed the
+same binary (eg `gulp` & `gulp-cli`), that removing one wouldn't
+remove the binary if it was owned by the other.
+
+It did this by doing some hocus-pocus that, turns out, was
+Unix-specific, so on Windows it just threw up its hands and
+stopped removing installed binaries at all. Not great.
+
+So today we're fixing that– it let us maintain the same safety
+that we added in #9198, but ALSO works with windows.
+
+* [`25fbaed`](https://github.com/npm/npm/commit/25fbaed)
+  [#9394](https://github.com/npm/npm/issues/9394)
+  Treat cmd-shims the same way we treat symlinks
+  ([@iarna](https://github.com/iarna))
+
+#### API DOCUMENTATION HAS BEEN SACRIFICED THE API GOD
+
+The documentation of the internal APIs of npm is going away,
+because it would lead people into thinking they should integrate
+with npm by using it. Please don't do that! In the future, we'd
+like to give you a suite of stand alone modules that provide
+better, more stand alone APIs for your applications to build on.
+But for now, call the npm binary with `process.exec` or
+`process.spawn` instead.
+
+* [`2fb60bf`](https://github.com/npm/npm/commit/2fb60bf)
+  Remove misleading API documentation
+  ([@othiym23](https://github.com/othiym23))
+
+#### ALLOW `npm link` ON WINDOWS W/ PRERELEASE VERSIONS OF NODE
+
+We never meant to have this be a restriction in the first place
+and it was only just discovered with the recent node 4.0.0
+release candidate.
+
+* [`6665e54`](https://github.com/npm/npm/commit/6665e54)
+  [#9505](https://github.com/npm/npm/pull/9505)
+  Allow npm link to run on windows with prerelease versions of
+  node
+  ([@jon-hall](https://github.com/jon-hall))
+
+#### graceful-fs update
+
+We're updating all of npm's deps to use the most recent
+`graceful-fs`. This turns out to be important for future not yet
+released versions of node, because older versions monkey-patch
+`fs` in ways that will break in the future. Plus it ALSO makes
+use of `process.binding` which is an internal API that npm
+definitely shouldn't have been using. We're not done yet, but
+this is the bulk of them.
+
+* [`e7bc98e`](https://github.com/npm/npm/commit/e7bc98e)
+  write-file-atomic@1.1.3
+  ([@iarna](https://github.com/iarna))
+* [`7417600`](https://github.com/npm/npm/commit/7417600)
+  tar@2.2.1
+  ([@zkat](https://github.com/zkat))
+* [`e4e9d40`](https://github.com/npm/npm/commit/e4e9d40)
+  read-package-json@2.0.1
+  ([@zkat](https://github.com/zkat))
+* [`481611d`](https://github.com/npm/npm/commit/481611d)
+  read-installed@4.0.3
+  ([@zkat](https://github.com/zkat))
+* [`0dabbda`](https://github.com/npm/npm/commit/0dabbda)
+  npm-registry-client@7.0.4
+  ([@zkat](https://github.com/zkat))
+* [`c075a91`](https://github.com/npm/npm/commit/c075a91)
+  fstream@1.0.8
+  ([@zkat](https://github.com/zkat))
+* [`2e4341a`](https://github.com/npm/npm/commit/2e4341a)
+  fs-write-stream-atomic@1.0.4
+  ([@zkat](https://github.com/zkat))
+* [`18ad16e`](https://github.com/npm/npm/commit/18ad16e)
+  fs-vacuum@1.2.7
+  ([@zkat](https://github.com/zkat))
+
+#### DEPENDENCY UPDATES
+
+* [`9d6666b`](https://github.com/npm/npm/commit/9d6666b)
+  node-gyp@3.0.1
+  ([@rvagg](https://github.com/rvagg))
+* [`349c4df`](https://github.com/npm/npm/commit/349c4df)
+  retry@0.7.0
+  ([@tim-kos](https://github.com/tim-kos))
+* [`f507551`](https://github.com/npm/npm/commit/f507551)
+  which@1.1.2
+  ([@isaacs](https://github.com/isaacs))
+* [`e5b6743`](https://github.com/npm/npm/commit/e5b6743)
+  nopt@3.0.4
+  ([@zkat](https://github.com/zkat))
+
+#### THE DEPENDENCIES OF OUR DEPENDENCIES ARE OUR DEPENDENCIES UPDATES
+
+* [`316382d`](https://github.com/npm/npm/commit/316382d)
+  mime-types@2.1.6 & mime-db@1.18.0
+* [`64b741e`](https://github.com/npm/npm/commit/64b741e)
+  spdx-correct@1.0.1
+* [`fff62ac`](https://github.com/npm/npm/commit/fff62ac)
+  process-nextick-args@1.0.3
+* [`9d6488c`](https://github.com/npm/npm/commit/9d6488c)
+  cryptiles@2.0.5
+* [`1912012`](https://github.com/npm/npm/commit/1912012)
+  bluebird@2.10.0
+* [`4d09402`](https://github.com/npm/npm/commit/4d09402)
+  readdir-scoped-modules@1.0.2
+
 ### v2.14.4 (2015-09-10):
 
 #### THE GREAT NODEv4 SAGA
@@ -219,6 +481,41 @@ updates related to this:
   `nopt@3.0.4`: Minor clarifications to docs about how array and errors work.
   ([@zkat](https://github.com/zkat))
 
+### v3.3.2 (2015-09-04):
+
+#### PLEASE HOLD FOR THE NEXT AVAILABLE MAINTAINER
+
+This is a tiny little maintenance release, both to update dependencies and to
+keep `npm@3` up to date with changes made to `npm@2`.
+[@othiym23](https://github.com/othiym23) is putting out this release (again) as
+his esteemed colleague [@iarna](https://github.com/iarna) finishes relocating
+herself, her family, and her sizable anime collection all the way across North
+America. It contains [all the goodies in
+`npm@2.14.3`](https://github.com/npm/npm/releases/tag/v2.14.3) and one other
+dependency update.
+
+#### BETA WARNINGS FOR FUN AND PROFIT
+
+**_THIS IS BETA SOFTWARE_**. `npm@3` will remain in beta until we're
+confident that it's stable and have assessed the effect of the breaking
+changes on the community.  During that time we will still be doing `npm@2`
+releases, with `npm@2` tagged as `latest` and `next`.  We'll _also_ be
+publishing new releases of `npm@3` as `npm@v3.x-next` and `npm@v3.x-latest`
+alongside those versions until we're ready to switch everyone over to
+`npm@3`.  We need your help to find and fix its remaining bugs.  It's a
+significant rewrite, so we are _sure_ there still significant bugs
+remaining.  So do us a solid and deploy it in non-critical CI environments
+and for day-to-day use, but maybe don't use it for production maintenance or
+frontline continuous deployment just yet.
+
+That said, it's getting there! It will be leaving beta very soon!
+
+#### ONE OTHER DEPENDENCY UPDATE
+
+* [`bb5de34`](https://github.com/npm/npm/commit/bb5de3493531228df0bd3f0742d5493c826be6dd)
+  `is-my-json-valid@2.12.2`: Upgrade to a new, modernized version of
+  `json-pointer`. ([@mafintosh](https://github.com/mafintosh))
+
 ### v2.14.3 (2015-09-03):
 
 #### TEAMS AND ORGS STILL BETA. CLI CODE STILL SOLID.
@@ -261,6 +558,101 @@ No actual dep updates this week, but we're bumping a couple of devDeps:
   `deep-equal@1.0.1`: Make `null == undefined` in non-strict mode
   ([@isaacs](https://github.com/isaacs))
 
+### v3.3.1 (2015-08-27):
+
+Hi all, this `npm@3` update brings you another round of bug fixes.  The
+headliner here is that `npm update` works again.  We're running down the
+clock on blocker 3.x issues!  Shortly after that hits zero we'll be
+promoting 3.x to latest!!
+
+And of course, we have changes that were brought forward from 2.x. Check out
+the release notes for
+[2.14.1](https://github.com/npm/npm/releases/tag/v2.14.1) and
+[2.14.2](https://github.com/npm/npm/releases/tag/v2.14.2).
+
+#### BETA WARNINGS FOR FUN AND PROFIT
+
+**_THIS IS BETA SOFTWARE_**. `npm@3` will remain in beta until we're
+confident that it's stable and have assessed the effect of the breaking
+changes on the community.  During that time we will still be doing `npm@2`
+releases, with `npm@2` tagged as `latest` and `next`.  We'll _also_ be
+publishing new releases of `npm@3` as `npm@v3.x-next` and `npm@v3.x-latest`
+alongside those versions until we're ready to switch everyone over to
+`npm@3`.  We need your help to find and fix its remaining bugs.  It's a
+significant rewrite, so we are _sure_ there still significant bugs
+remaining.  So do us a solid and deploy it in non-critical CI environments
+and for day-to-day use, but maybe don't use it for production maintenance or
+frontline continuous deployment just yet.
+
+#### NPM UPDATE, NOW AGAIN YOUR FRIEND
+
+* [`f130a00`](https://github.com/npm/npm/commit/f130a00)
+  [#9095](https://github.com/npm/npm/issues/9095)
+  `npm update` once again works! Previously, after selecting packages
+  to update, it would then pick the wrong location to run the install
+  from. ([@iarna](https://github.com/iarna))
+
+#### MORE VERBOSING FOR YOUR VERBOSE LIFECYCLES
+
+* [`d088b7d`](https://github.com/npm/npm/commit/d088b7d)
+  [#9227](https://github.com/npm/npm/pull/9227)
+  Add some additional logging at the verbose and silly levels
+  when running lifecycle scripts. Hopefully this will make
+  debugging issues with them a bit easier!
+  ([@saper](https://github.com/saper))
+
+#### AND SOME OTHER BUG FIXES…
+
+* [`f4a5784`](https://github.com/npm/npm/commit/f4a5784)
+  [#9308](https://github.com/npm/npm/issues/9308)
+  Make fetching metadata for local modules faster! This ALSO means
+  that doing things like running `npm repo` won't build your
+  module and maybe run `prepublish`.
+  ([@iarna](https://github.com/iarna))
+
+* [`4468c92`](https://github.com/npm/npm/commit/4468c92)
+  [#9205](https://github.com/npm/npm/issues/9205)
+  Fix a bug where local modules would sometimes not resolve relative
+  links using the correct base path.
+  ([@iarna](https://github.com/iarna))
+
+* [`d395a6b`](https://github.com/npm/npm/commit/d395a6b)
+  [#8995](https://github.com/npm/npm/issues/8995)
+  Certain combinations of packages could result in different install orders for their
+  initial installation than for reinstalls run on the same folder.
+  ([@iarna](https://github.com/iarna))
+
+* [`d119ea6`](https://github.com/npm/npm/commit/d119ea6)
+  [#9113](https://github.com/npm/npm/issues/9113)
+  Make extraneous packages _always_ up in `npm ls`. Previously, if an
+  extraneous package had a dependency that depended back on the original
+  package this would result in the package not showing up in `ls`.
+  ([@iarna](https://github.com/iarna))
+
+* [`02420dc`](https://github.com/npm/npm/commit/02420dc)
+  [#9113](https://github.com/npm/npm/issues/9113)
+  Stop warning about missing top level package.json files. Errors in said
+  files will still be reported.
+  ([@iarna](https://github.com/iarna))
+
+#### SOME DEP UPDATES
+
+* [`1ed1364`](https://github.com/npm/npm/commit/1ed1364) rimraf@2.4.3
+  ([@isaacs](https://github.com/isaacs)) Added EPERM to delay/retry loop
+* [`e7b8315`](https://github.com/npm/npm/commit/e7b8315) read@1.0.7
+  Smaller distribution package, better metadata
+  ([@isaacs](https://github.com/isaacs))
+
+#### SOME DEPS OF DEPS UPDATES
+
+* [`b273bcc`](https://github.com/npm/npm/commit/b273bcc) mime-types@2.1.5
+* [`df6e225`](https://github.com/npm/npm/commit/df6e225) mime-db@1.17.0
+* [`785f2ad`](https://github.com/npm/npm/commit/785f2ad) is-my-json-valid@2.12.1
+* [`88170dd`](https://github.com/npm/npm/commit/88170dd) form-data@1.0.0-rc3
+* [`af5357b`](https://github.com/npm/npm/commit/af5357b) request@2.61.0
+* [`337f96a`](https://github.com/npm/npm/commit/337f96a) chalk@1.1.1
+* [`3dfd74d`](https://github.com/npm/npm/commit/3dfd74d) async@1.4.2
+
 ### v2.14.2 (2015-08-27):
 
 #### GETTING THAT PESKY `preferGlobal` WARNING RIGHT
@@ -402,6 +794,106 @@ appreciate everybody's patience and understanding tremendously.
   `request@2.61.0`: Bug fixes and keep-alive tweaks.
   ([@simov](https://github.com/simov))
 
+### v3.3.0 (2015-08-13):
+
+This is a pretty EXCITING week.  But I may be a little excitable– or
+possibly sleep deprived, it's sometimes hard to tell them apart. =D So
+[Kat](https://github.com/zkat) really went the extra mile this week and got
+the client side support for teams and orgs out in this week's 2.x release.
+You can't use that just yet, 'cause we have to turn on some server side
+stuff too, but this way it'll be there for you all the moment we do!  Check
+out the details over in the [2.14.0 release
+notes](https://github.com/npm/npm/releases/tag/v2.14.0)!
+
+But we over here in 3.x ALSO got a new feature this week, check out the new
+`--only` and `--also` flags for better control over when dev and production
+dependencies are used by various npm commands.
+
+That, and some important bug fixes round out this week. Enjoy everyone!
+
+#### NEVER SHALL NOT BETA THE BETA
+
+**_THIS IS BETA SOFTWARE_**.  EXCITING NEW BETA WARNING!!!  Ok, I fibbed,
+EXACTLY THE SAME BETA WARNINGS: `npm@3` will remain in beta until we're
+confident that it's stable and have assessed the effect of the breaking
+changes on the community.  During that time we will still be doing `npm@2`
+releases, with `npm@2` tagged as `latest` and `next`.  We'll _also_ be
+publishing new releases of `npm@3` as `npm@v3.x-next` and `npm@v3.x-latest`
+alongside those versions until we're ready to switch everyone over to
+`npm@3`.  We need your help to find and fix its remaining bugs.  It's a
+significant rewrite, so we are _sure_ there still significant bugs
+remaining.  So do us a solid and deploy it in non-critical CI environments
+and for day-to-day use, but maybe don't use it for production maintenance or
+frontline continuous deployment just yet.
+
+#### ONLY ALSO DEV
+
+Hey we've got a SUPER cool new feature for you all, thanks to the fantastic
+work of [@davglass](https://github.com/davglass) and
+[@bengl](https://github.com/bengl) we have `--only=prod`,
+`--only=dev`, `--also=prod` and `--also=dev` options. These apply in
+various ways to: `npm install`, `npm ls`, `npm outdated` and `npm update`.
+
+So for instance:
+
+```
+npm install --only=dev
+```
+
+Only installs dev dependencies. By contrast:
+
+```
+npm install --only=prod
+```
+
+Will only install prod dependencies and is very similar to `--production`
+but differs in that it doesn't set the environment variables that
+`--production` does.
+
+The related new flag, `--also` is most useful with things like:
+
+```
+npm shrinkwrap --also=dev
+```
+
+As shrinkwraps don't include dev deps by default.  This replaces passing in
+`--dev` in that scenario.
+
+And that leads into the fact that this deprecates `--dev` as its semantics
+across commands were inconsistent and confusing.
+
+* [`3ab1eea`](https://github.com/npm/npm/commit/3ab1eea)
+  [#9024](https://github.com/npm/npm/pull/9024)
+  Add support for `--only`, `--also` and deprecate `--dev`
+  ([@bengl](https://github.com/bengl))
+
+#### DON'T TOUCH! THAT'S NOT YOUR BIN
+
+* [`b31812e`](https://github.com/npm/npm/commit/b31812e)
+  [#8996](https://github.com/npm/npm/pull/8996)
+  When removing a module that has bin files, if one that we're going to
+  remove is a symlink to a DIFFERENT module, leave it alone. This only happens
+  when you have two modules that try to provide the same bin.
+  ([@iarna](https://github.com/iarna))
+
+#### THERE'S AN END IN SIGHT
+
+* [`d2178a9`](https://github.com/npm/npm/commit/d2178a9)
+  [#9223](https://github.com/npm/npm/pull/9223)
+  Close a bunch of infinite loops that could show up with symlink cycles in your dependencies.
+  ([@iarna](https://github.com/iarna))
+
+#### OOPS DIDN'T MEAN TO FIX THAT
+
+Well, not _just_ yet.  This was scheduled for next week, but it snuck into
+2.x this week.
+
+* [`139dd92`](https://github.com/npm/npm/commit/139dd92)
+  [#8716](https://github.com/npm/npm/pull/8716)
+  `npm init` will now only pick up the modules you install, not everything
+  else that got flattened with them.
+  ([@iarna](https://github.com/iarna))
+
 ### v2.14.0 (2015-08-13):
 
 #### IT'S HERE! KINDA!
@@ -455,6 +947,69 @@ All of these changes were done under [`#9011`](https://github.com/npm/npm/pull/9
   around semver range, thus making it valid semver.
   ([@KenanY](https://github.com/KenanY))
 
+### v3.2.2 (2015-08-08):
+
+Lot's of lovely bug fixes for `npm@3`.  I'm also suuuuper excited that I
+think we have a handle on stack explosions that effect a small portion of
+our users.  We also have some tantalizing clues as to where some low hanging
+fruit may be for performance issues.
+
+And of course, in addition to the npm@3 specific bug fixes, there are some
+great one's coming in from npm@2!  [@othiym23](https://github.com/othiym23)
+put together that release this week– check out its
+[release notes](https://github.com/npm/npm/releases/tag/v2.13.4) for the deets.
+
+#### AS ALWAYS STILL BETA
+
+**_THIS IS BETA SOFTWARE_**.  Just like the airline safety announcements,
+we're not taking this plane off till we finish telling you: `npm@3` will
+remain in beta until we're confident that it's stable and have assessed the
+effect of the breaking changes on the community.  During that time we will
+still be doing `npm@2` releases, with `npm@2` tagged as `latest` and `next`.
+We'll _also_ be publishing new releases of `npm@3` as `npm@v3.x-next` and
+`npm@v3.x-latest` alongside those versions until we're ready to switch
+everyone over to `npm@3`.  We need your help to find and fix its remaining
+bugs.  It's a significant rewrite, so we are _sure_ there still significant
+bugs remaining.  So do us a solid and deploy it in non-critical CI
+environments and for day-to-day use, but maybe don't use it for production
+maintenance or frontline continuous deployment just yet.
+
+#### BUG FIXES
+
+* [`a8c8a13`](https://github.com/npm/npm/commit/a8c8a13)
+  [#9050](https://github.com/npm/npm/issues/9050)
+  Resolve peer deps relative to the parent of the requirer
+  ([@iarna](http://github.com/iarna))
+* [`05f0226`](https://github.com/npm/npm/commit/05f0226)
+  [#9077](https://github.com/npm/npm/issues/9077)
+  Fix crash when saving `git+ssh` urls
+  ([@iarna](http://github.com/iarna))
+* [`e4a3808`](https://github.com/npm/npm/commit/e4a3808)
+  [#8951](https://github.com/npm/npm/issues/8951)
+  Extend our patch to allow `*` to match something when a package only has
+  prerelease versions to everything and not just the cache.
+  ([@iarna](http://github.com/iarna))
+* [`d135abf`](https://github.com/npm/npm/commit/d135abf)
+  [#8871](https://github.com/npm/npm/issues/8871)
+  Don't warn about a missing `package.json` or missing fields in the global
+  install directory.
+  ([@iarna](http://github.com/iarna))
+
+#### DEP VERSION BUMPS
+
+* [`990ee4f`](https://github.com/npm/npm/commit/990ee4f)
+  path-is-inside@1.0.1 ([@domenic](https://github.com/domenic))
+* [`1f71ec0`](https://github.com/npm/npm/commit/1f71ec0)
+  lodash.clonedeep@3.0.2 ([@jdalton](https://github.com/jdalton))
+* [`a091354`](https://github.com/npm/npm/commit/a091354)
+  marked@0.3.5 ([@chjj](https://github.com/chjj))
+* [`fc51f28`](https://github.com/npm/npm/commit/fc51f28)
+  tap@1.3.2 ([@isaacs](https://github.com/isaacs))
+* [`3569ec0`](https://github.com/npm/npm/commit/3569ec0)
+  nock@2.10.0 ([@pgte](https://github.com/pgte))
+* [`ad5f6fd`](https://github.com/npm/npm/commit/ad5f6fd)
+  npm-registry-mock@1.0.1 ([@isaacs](https://github.com/isaacs))
+
 ### v2.13.5 (2015-08-07):
 
 This is another quiet week for the `npm@2` release.
@@ -505,6 +1060,51 @@ like _you_, which we think is swell. Thanks!
 * [`4bbc86e`](https://github.com/npm/npm/commit/4bbc86e3825e2eee9a8758ba26bdea0cb6a2581e)
   `nock@2.10.0` ([@pgte](https://github.com/pgte))
 
+### v3.2.1 (2015-07-31):
+
+#### AN EXTRA QUIET RELEASE
+
+A bunch of stuff got deferred for various reasons, which just means more
+branches to land next week!
+
+Don't forget to check out [Kat's 2.x release](https://github.com/npm/npm/releases/tag/v2.13.4) for other quiet goodies.
+
+#### AS ALWAYS STILL BETA
+
+**_THIS IS BETA SOFTWARE_**.  Yes, we're still reminding you of this.  No,
+you can't be excused.  `npm@3` will remain in beta until we're confident
+that it's stable and have assessed the effect of the breaking changes on the
+community.  During that time we will still be doing `npm@2` releases, with
+`npm@2` tagged as `latest` and `next`.  We'll _also_ be publishing new
+releases of `npm@3` as `npm@v3.x-next` and `npm@v3.x-latest` alongside those
+versions until we're ready to switch everyone over to `npm@3`.  We need your
+help to find and fix its remaining bugs.  It's a significant rewrite, so we
+are _sure_ there still significant bugs remaining.  So do us a solid and
+deploy it in non-critical CI environments and for day-to-day use, but maybe
+don't use it for production maintenance or frontline continuous deployment
+just yet.
+
+
+#### MAKING OUR TESTS TEST THE THING THEY TEST
+
+* [`6e53c3d`](https://github.com/npm/npm/commit/6e53c3d)
+  [#8985](https://github.com/npm/npm/pull/8985)
+  Many thanks to @bengl for noticing that one of our tests wasn't testing
+  what it claimed it was testing! ([@bengl](https://github.com/bengl))
+
+#### MY PACKAGE.JSON WAS ALREADY IN THE RIGHT ORDER
+
+* [`eb2c7aa`](https://github.com/npm/npm/commit/d00d0f)
+  [#9068](https://github.com/npm/npm/pull/9079)
+  Stop sorting keys in the `package.json` that we haven't edited.  Many
+  thanks to [@Qix-](https://github.com/Qix-) for bringing this up and
+  providing a first pass at a patch for this.
+  ([@iarna](https://github.com/iarna))
+
+#### DEV DEP UPDATE
+
+* [`555f60c`](https://github.com/npm/npm/commit/555f60c) marked@0.3.4
+
 ### v2.13.4 (2015-07-30):
 
 #### JULY ENDS ON A FAIRLY QUIET NOTE
@@ -536,6 +1136,103 @@ Hooray.
   nock@2.9.1
   ([@pgte](https://github.com/pgte))
 
+### v3.2.0 (2015-07-24):
+
+#### MORE CONFIG, BETTER WINDOWS AND A BUG FIX
+
+This is a smallish release with a new config option and some bug fixes.  And
+lots of module updates.
+
+#### BETA BETAS ON
+
+**_THIS IS BETA SOFTWARE_**.  Yes, we're still reminding you of this.  No,
+you can't be excused.  `npm@3` will remain in beta until we're confident
+that it's stable and have assessed the effect of the breaking changes on the
+community.  During that time we will still be doing `npm@2` releases, with
+`npm@2` tagged as `latest` and `next`.  We'll _also_ be publishing new
+releases of `npm@3` as `npm@v3.x-next` and `npm@v3.x-latest` alongside those
+versions until we're ready to switch everyone over to `npm@3`.  We need your
+help to find and fix its remaining bugs.  It's a significant rewrite, so we
+are _sure_ there still significant bugs remaining.  So do us a solid and
+deploy it in non-critical CI environments and for day-to-day use, but maybe
+don't use it for production maintenance or frontline continuous deployment
+just yet.
+
+
+#### NEW CONFIGS, LESS PROGRESS
+
+* [`423d8f7`](https://github.com/npm/npm/commit/423d8f7)
+  [#8704](https://github.com/npm/npm/issues/8704)
+  Add the ability to disable the new progress bar with `--no-progress`
+  ([@iarna](https://github.com/iarna))
+
+#### AND BUG FIXES
+
+* [`b3ee452`](https://github.com/npm/npm/commit/b3ee452)
+  [#9038](https://github.com/npm/npm/pull/9038)
+  We previously disabled the use of the new `fs.access` API on Windows, but
+  the bug we were seeing is fixed in io.js@1.5.0 so we now use `fs.access`
+  if you're using that version or greater.
+  ([@iarna](https://github.com/iarna))
+
+* [`b181fa3`](https://github.com/npm/npm/commit/b181fa3)
+  [#8921](https://github.com/npm/npm/issues/8921)
+  [#8637](https://github.com/npm/npm/issues/8637)
+  Rejigger how we validate modules for install. This allow is to fix
+  a problem where arch/os checking wasn't being done at all.
+  It also made it easy to add back in a check that declines to
+  install a module in itself unless you force it.
+  ([@iarna](https://github.com/iarna))
+
+#### AND A WHOLE BUNCH OF SUBDEP VERSIONS
+
+These are all development dependencies and semver-compatible subdep
+upgrades, so they should not have visible impact on users.
+
+* [`6b3f6d9`](https://github.com/npm/npm/commit/6b3f6d9) standard@4.3.3
+* [`f4e22e5`](https://github.com/npm/npm/commit/f4e22e5) readable-stream@2.0.2 (inside concat-stream)
+* [`f130bfc`](https://github.com/npm/npm/commit/f130bfc) minimatch@2.0.10 (inside node-gyp's copy of glob)
+* [`36c6a0d`](https://github.com/npm/npm/commit/36c6a0d) caseless@0.11.0
+* [`80df59c`](https://github.com/npm/npm/commit/80df59c) chalk@1.1.0
+* [`ea935d9`](https://github.com/npm/npm/commit/ea935d9) bluebird@2.9.34
+* [`3588a0c`](https://github.com/npm/npm/commit/3588a0c) extend@3.0.0
+* [`c6a8450`](https://github.com/npm/npm/commit/c6a8450) form-data@1.0.0-rc2
+* [`a04925b`](https://github.com/npm/npm/commit/a04925b) har-validator@1.8.0
+* [`ee7c095`](https://github.com/npm/npm/commit/ee7c095) has-ansi@2.0.0
+* [`944fc34`](https://github.com/npm/npm/commit/944fc34) hawk@3.1.0
+* [`783dc7b`](https://github.com/npm/npm/commit/783dc7b) lodash._basecallback@3.3.1
+* [`acef0fe`](https://github.com/npm/npm/commit/acef0fe) lodash._baseclone@3.3.0
+* [`dfe959a`](https://github.com/npm/npm/commit/dfe959a) lodash._basedifference@3.0.3
+* [`a03bc76`](https://github.com/npm/npm/commit/a03bc76) lodash._baseflatten@3.1.4
+* [`8a07d50`](https://github.com/npm/npm/commit/8a07d50) lodash._basetostring@3.0.1
+* [`7785e3f`](https://github.com/npm/npm/commit/7785e3f) lodash._baseuniq@3.0.3
+* [`826fb35`](https://github.com/npm/npm/commit/826fb35) lodash._createcache@3.1.2
+* [`76030b3`](https://github.com/npm/npm/commit/76030b3) lodash._createpadding@3.6.1
+* [`1a49ec6`](https://github.com/npm/npm/commit/1a49ec6) lodash._getnative@3.9.1
+* [`eebe47f`](https://github.com/npm/npm/commit/eebe47f) lodash.isarguments@3.0.4
+* [`09994d4`](https://github.com/npm/npm/commit/09994d4) lodash.isarray@3.0.4
+* [`b6f8dbf`](https://github.com/npm/npm/commit/b6f8dbf) lodash.keys@3.1.2
+* [`c67dd6b`](https://github.com/npm/npm/commit/c67dd6b) lodash.pad@3.1.1
+* [`4add042`](https://github.com/npm/npm/commit/4add042) lodash.repeat@3.0.1
+* [`e04993c`](https://github.com/npm/npm/commit/e04993c) lru-cache@2.6.5
+* [`2ed7da4`](https://github.com/npm/npm/commit/2ed7da4) mime-db@1.15.0
+* [`ae08244`](https://github.com/npm/npm/commit/ae08244) mime-types@2.1.3
+* [`e71410e`](https://github.com/npm/npm/commit/e71410e) os-homedir@1.0.1
+* [`67c13e0`](https://github.com/npm/npm/commit/67c13e0) process-nextick-args@1.0.2
+* [`12ee041`](https://github.com/npm/npm/commit/12ee041) qs@4.0.0
+* [`15564a6`](https://github.com/npm/npm/commit/15564a6) spdx-license-ids@1.0.2
+* [`8733bff`](https://github.com/npm/npm/commit/8733bff) supports-color@2.0.0
+* [`230943c`](https://github.com/npm/npm/commit/230943c) tunnel-agent@0.4.1
+* [`26a4653`](https://github.com/npm/npm/commit/26a4653) ansi-styles@2.1.0
+* [`3d27081`](https://github.com/npm/npm/commit/3d27081) bl@1.0.0
+* [`9efa110`](https://github.com/npm/npm/commit/9efa110) async@1.4.0
+
+#### MERGED FORWARD
+
+* As usual, we've ported all the npm@2 goodies in this week's
+  [v2.13.3](https://github.com/npm/npm/releases/tag/v2.13.3)
+  release.
+
 ### v2.13.3 (2015-07-23):
 
 #### I'M SAVING THE GOOD JOKES FOR MORE INTERESTING RELEASES
@@ -635,6 +1332,79 @@ And some other version bumps for good measure.
   Fixes this thing where Kat decided to save `nock` as a regular dependency ;)
   ([@othiym23](https://github.com/othiym23))
 
+### v3.1.3 (2015-07-17):
+
+Rebecca: So Kat, I hear this week's other release uses a dialog between us to
+explain what changed?
+
+Kat: Well, you could say that…
+
+Rebecca: I would! This week I fixed more npm@3 bugs!
+
+Kat: That sounds familiar.
+
+Rebecca: Eheheheh, well, before we look at those, a word from our sponsor…
+
+#### BETA IS AS BETA DOES
+
+**_THIS IS BETA SOFTWARE_**.  Yes, we're still reminding you of this.  No,
+you can't be excused.  `npm@3` will remain in beta until we're confident
+that it's stable and have assessed the effect of the breaking changes on the
+community.  During that time we will still be doing `npm@2` releases, with
+`npm@2` tagged as `latest` and `next`.  We'll _also_ be publishing new
+releases of `npm@3` as `npm@v3.x-next` and `npm@v3.x-latest` alongside those
+versions until we're ready to switch everyone over to `npm@3`.  We need your
+help to find and fix its remaining bugs.  It's a significant rewrite, so we
+are _sure_ there still significant bugs remaining.  So do us a solid and
+deploy it in non-critical CI environments and for day-to-day use, but maybe
+don't use it for production maintenance or frontline continuous deployment
+just yet.
+
+Rebecca: Ok, enough of the dialoguing, that's Kat's schtick.  But do remember
+kids, betas hide in dark hallways waiting to break your stuff, stuff like…
+
+#### SO MANY LINKS YOU COULD MAKE A CHAIN
+
+* [`6d69ec9`](https://github.com/npm/npm/6d69ec9)
+  [#8967](https://github.com/npm/npm/issues/8967)
+  Removing a module linked into your globals would result in having
+  all of its subdeps removed. Since the npm release process does
+  exactly this, it burned me -every- -single- -week-. =D
+  While we're here, we also removed extraneous warns that used to
+  spill out when you'd remove a symlink.
+  ([@iarna](https://github.com/iarna))
+
+* [`fdb360f`](https://github.com/npm/npm/fdb360f)
+  [#8874](https://github.com/npm/npm/issues/8874)
+  Linking scoped modules was failing outright, but this fixes that
+  and updates our tests so we don't do it again.
+  ([@iarna](https://github.com/iarna))
+
+#### WE'LL TRY NOT TO CRACK YOUR WINDOWS
+
+* [`9fafb18`](https://github.com/npm/npm/9fafb18)
+  [#8701](https://github.com/npm/npm/issues/8701)
+  npm@3 introduced permissions checks that run before it actually tries to
+  do something. This saves you from having an install fail half way
+  through. We did this using the shiny new `fs.access` function available
+  in `node 0.12` and `io.js`, with fallback options for older nodes. Unfortunately
+  the way we implemented the fallback caused racey problems for Windows systems.
+  This fixes that by ensuring we only ever run any one check on a directory once.
+  BUT it turns out there are bugs in `fs.access` on Windows. So this ALSO just disables
+  the use of `fs.access` on Windows entirely until that settles out.
+  ([@iarna](https://github.com/iarna))
+
+#### ZOOM ZOOM, DEP UPDATES
+
+* [`5656baa`](https://github.com/npm/npm/5656baa)
+  `gauge@1.2.2`: Better handle terminal resizes while printing the progress bar
+  ([@iarna](https://github.com/iarna))
+
+#### MERGED FORWARD
+
+* Check out Kat's [super-fresh release notes for v2.13.2](https://github.com/npm/npm/releases/tag/v2.13.2)
+  and see all the changes we ported from npm@2.
+
 ### v2.13.2 (2015-07-16):
 
 #### HOLD ON TO YOUR TENTACLES... IT'S NPM RELEASE TIME!
@@ -708,6 +1478,92 @@ Both: Stay Freeesh~
   `node-gyp@2.0.2`: Fixes an issue with long paths on Win32
   ([@TooTallNate](https://github.com/TooTallNate))
 
+### v3.1.2
+
+#### SO VERY BETA RELEASE
+
+So, `v3.1.1` managed to actually break installing local modules.  And then
+immediately after I drove to an island for the weekend. 😁  So let's get
+this fixed outside the usual release train!
+
+Fortunately it didn't break installing _global_ modules and so you could
+swap it out for another version at least.
+
+#### DISCLAIMER MEANS WHAT IT SAYS
+
+**_THIS IS BETA SOFTWARE_**.  Yes, we're still reminding you of this.  No,
+you can't be excused.  `npm@3` will remain in beta until we're confident
+that it's stable and have assessed the effect of the breaking changes on the
+community.  During that time we will still be doing `npm@2` releases, with
+`npm@2` tagged as `latest` and `next`.  We'll _also_ be publishing new
+releases of `npm@3` as `npm@v3.x-next` and `npm@v3.x-latest` alongside those
+versions until we're ready to switch everyone over to `npm@3`.  We need your
+help to find and fix its remaining bugs.  It's a significant rewrite, so we
+are _sure_ there still significant bugs remaining.  So do us a solid and
+deploy it in non-critical CI environments and for day-to-day use, but maybe
+don't use it for production maintenance or frontline continuous deployment
+just yet.
+
+#### THIS IS IT, THE REASON
+
+* [`f5e19df`](https://github.com/npm/npm/commit/f5e19df)
+  [#8893](https://github.com/npm/npm/issues/8893)
+  Fix crash when installing local modules introduced by the fix for
+  [#8608](https://github.com/npm/npm/issues/8608)
+  ([@iarna](https://github.com/iarna)
+
+### v3.1.1
+
+#### RED EYE RELEASE
+
+Rebecca's up too late writing tests, so you can have npm@3 bug fixes!  Lots
+of great new issues from you all! ❤️️  Keep it up!
+
+#### YUP STILL BETA, PLEASE PAY ATTENTION
+
+**_THIS IS BETA SOFTWARE_**.  Yes, we're still reminding you of this.  No,
+you can't be excused.  `npm@3` will remain in beta until we're confident
+that it's stable and have assessed the effect of the breaking changes on the
+community.  During that time we will still be doing `npm@2` releases, with
+`npm@2` tagged as `latest` and `next`.  We'll _also_ be publishing new
+releases of `npm@3` as `npm@v3.x-next` and `npm@v3.x-latest` alongside those
+versions until we're ready to switch everyone over to `npm@3`.  We need your
+help to find and fix its remaining bugs.  It's a significant rewrite, so we
+are _sure_ there still significant bugs remaining.  So do us a solid and
+deploy it in non-critical CI environments and for day-to-day use, but maybe
+don't use it for production maintenance or frontline continuous deployment
+just yet.
+
+#### BOOGS
+
+* [`9badfd6`](https://github.com/npm/npm/commit/9babfd63f19f2d80b2d2624e0963b0bdb0d76ef4)
+  [#8608](https://github.com/npm/npm/issues/8608)
+  Make global installs and uninstalls MUCH faster by only reading the directories of
+  modules referred to by arguments.
+  ([@iarna](https://github.com/iarna)
+* [`075a5f0`](https://github.com/npm/npm/commit/075a5f046ab6837f489b08d44cb601e9fdb369b7)
+  [#8660](https://github.com/npm/npm/issues/8660)
+  Failed optional deps would still result in the optional deps own
+  dependencies being installed. We now find them and fail them out of the
+  tree.
+  ([@iarna](https://github.com/iarna)
+* [`c9fbbb5`](https://github.com/npm/npm/commit/c9fbbb540083396ea58fd179d81131d959d8e049)
+  [#8863](https://github.com/npm/npm/issues/8863)
+  The "no compatible version found" error message was including only the
+  version requested, not the name of the package we wanted. Ooops!
+  ([@iarna](https://github.com/iarna)
+* [`32e6bbd`](https://github.com/npm/npm/commit/32e6bbd21744dcbe8c0720ab53f60caa7f2a0588)
+  [#8806](https://github.com/npm/npm/issues/8806)
+  The "uninstall" lifecycle was being run after all of a module's dependencies has been
+  removed. This reverses that order-- this means "uninstall" lifecycles can make use
+  of the package's dependencies.
+  ([@iarna](https://github.com/iarna)
+
+#### MERGED FORWARD
+
+* Check out the [v2.13.1 release notes](https://github.com/npm/npm/releases/tag/v2.13.1)
+  and see all the changes we ported from npm@2.
+
 ### v2.13.1 (2015-07-09):
 
 #### KAUAI WAS NICE. I MISS IT.
@@ -758,6 +1614,120 @@ updated at their own pace.
 * [`b168e33`](https://github.com/npm/npm/commit/b168e33ad46faf47020a45f72ba8cec8c644bdb9)
   undeduplicate `strip-ansi` ([@othiym23](https://github.com/othiym23))
 
+### v3.1.0 (2015-07-02):
+
+This has been a brief week of bug fixes, plus some fun stuff merged forward
+from this weeks 2.x release. See the
+[2.13.0 release notes](https://github.com/npm/npm/releases/tag/v2.13.0)
+for details on that.
+
+You all have been AWESOME with
+[all](https://github.com/npm/npm/milestones/3.x)
+[the](https://github.com/npm/npm/milestones/3.2.0)
+npm@3 bug reports! Thank you and keep up the great work!
+
+#### NEW PLACE, SAME CODE
+
+Remember how last week we said `npm@3` would go to `3.0-next` and latest
+tags? Yeaaah, no, please use `npm@v3.x-next` and `npm@v3.x-latest` going forward.
+
+I dunno why we said "suuure, we'll never do a feature release till we're out
+of beta" when we're still forward porting `npm@2.x` features. `¯\_(ツ)_/¯`
+
+If you do accidentally use the old tag names, I'll be maintaining them
+for a few releases, but they won't be around forever.
+
+#### YUP STILL BETA, PLEASE PAY ATTENTION
+
+**_THIS IS BETA SOFTWARE_**. `npm@3` will remain in beta until we're
+confident that it's stable and have assessed the effect of the breaking
+changes on the community. During that time we will still be doing `npm@2`
+releases, with `npm@2` tagged as `latest` and `next`. We'll _also_ be
+publishing new releases of `npm@3` as `npm@v3.x-next` and `npm@v3.x-latest`
+alongside those versions until we're ready to switch everyone over to
+`npm@3`. We need your help to find and fix its remaining bugs. It's a
+significant rewrite, so we are _sure_ there still significant bugs
+remaining. So do us a solid and deploy it in non-critical CI environments
+and for day-to-day use, but maybe don't use it for production maintenance
+or frontline continuous deployment just yet.
+
+#### BUGS ON THE WINDOWS
+
+  * [`0030ade`](https://github.com/npm/npm/commit/0030ade)
+    [#8685](https://github.com/npm/npm/issues/8685)
+    Windows would hang when trying to clone git repos
+    ([@euprogramador](https://github.com/npm/npm/pull/8777))
+  * [`b259bcc`](https://github.com/npm/npm/commit/b259bcc)
+    [#8786](https://github.com/npm/npm/pull/8786)
+    Windows permissions checks would cause installations to fail under some
+    circumstances. We're disabling the checks entirely for this release.
+    I'm hoping to check back with this next week to get a Windows friendly
+    fix in.
+    ([@iarna](https://github.com/iarna))
+
+#### SO MANY BUGS SQUASHED, JUST CALL US RAID
+
+  * [`0848698`](https://github.com/npm/npm/commit/0848698)
+    [#8686](https://github.com/npm/npm/pull/8686)
+    Stop leaving progress bar cruft on the screen during publication
+    ([@ajcrites](https://github.com/ajcrites))
+  * [`57c3cea`](https://github.com/npm/npm/commit/57c3cea)
+    [#8695](https://github.com/npm/npm/pull/8695)
+    Remote packages with shrinkwraps made npm cause node + iojs to explode
+    and catch fire. NO MORE.
+    ([@iarna](https://github.com/iarna))
+  * [`2875ba3`](https://github.com/npm/npm/commit/2875ba3)
+    [#8723](https://github.com/npm/npm/pull/8723)
+    I uh, told you that engineStrict checking had gone away last week.
+    TURNS OUT I LIED. So this is making that actually be true.
+    ([@iarna](https://github.com/iarna))
+  * [`28064e5`](https://github.com/npm/npm/commit/28064e5)
+    [#3358](https://github.com/npm/npm/issues/3358)
+    Consistently allow Unicode BOMs at the start of package.json files.
+    Previously this was allowed some of time, like when you were installing
+    modules, but not others, like running npm version or installing w/
+    `--save`.
+    ([@iarna](https://github.com/iarna))
+  * [`3cb6ad2`](https://github.com/npm/npm/commit/3cb6ad2)
+    [#8736](https://github.com/npm/npm/issues/8766)
+    npm@3 wasn't running the "install" lifecycle in your current (toplevel)
+    module. This broke modules that relied on C compilation. BOO.
+    ([@iarna](https://github.com/iarna))
+  * [`68da583`](https://github.com/npm/npm/commit/68da583)
+    [#8766](https://github.com/npm/npm/issues/8766)
+    To my great shame, `npm link package` wasn't working AT ALL if you
+    didn't have `package` already installed.
+    ([@iarna](https://github.com/iarna))
+  * [`edd7448`](https://github.com/npm/npm/commit/edd7448)
+    read-package-tree@5.0.0: This update makes read-package-tree not explode
+    when there's bad data in your node_modules folder. npm@2 silently
+    ignores this sort of thing.
+    ([@iarna](https://github.com/iarna))
+  * [`0bb08c8`](https://github.com/npm/npm/commit/0bb08c8)
+    [#8778](https://github.com/npm/npm/pull/8778)
+    RELATEDLY, we now show any errors from your node_modules folder after
+    your installation completes as warnings. We're also reporting these in
+    `npm ls` now.
+    ([@iarna](https://github.com/iarna))
+  * [`6c248ff`](https://github.com/npm/npm/commit/6c248ff)
+    [#8779](https://github.com/npm/npm/pull/8779)
+    Hey, you know how we used to complain if your `package.json` was
+    missing stuff? Well guess what, we are again. I know, I know, you can
+    thank me later.
+    ([@iarna](https://github.com/iarna))
+  * [`d6f7c98`](https://github.com/npm/npm/commit/d6f7c98)
+    So, when we were rolling back after errors we had untested code that
+    tried to undo moves. Being untested it turns out it was very broken.
+    I've removed it until we have time to do this right.
+    ([@iarna](https://github.com/iarna))
+
+#### NEW VERSION
+
+Just the one. Others came in via the 2.x release. Do check out its
+changelog, immediately following this message.
+
+  * [`4e602c5`](https://github.com/npm/npm/commit/4e602c5) lodash@3.2.2
+
 ### v2.13.0 (2015-07-02):
 
 #### FORREST IS OUT! LET'S SNEAK IN ALL THE THINGS!
@@ -918,6 +1888,311 @@ with this fix.
 * [`151904a`](https://github.com/npm/npm/commit/151904af39dc24567f8c98529a2a64a4dbcc960a)
   `nopt@3.0.3` ([@isaacs](https://github.com/isaacs))
 
+### v3.0.0 (2015-06-25):
+
+Wow, it's finally here! This has been a long time coming. We are all
+delighted and proud to be getting this out into the world, and are looking
+forward to working with the npm user community to get it production-ready
+as quickly as possible.
+
+`npm@3` constitutes a nearly complete rewrite of npm's installer to be
+easier to maintain, and to bring a bunch of valuable new features and
+design improvements to you all.
+
+[@othiym23](https://github.com/othiym23) and
+[@isaacs](https://github.com/isaacs) have been
+[talking about the changes](http://blog.npmjs.org/post/91303926460/npm-cli-roadmap-a-periodic-update)
+in this release for well over a year, and it's been the primary focus of
+[@iarna](https://github.com/iarna) since she joined the team.
+
+Given that this is a near-total rewrite, all changes listed here are
+[@iarna](https://github.com/iarna)'s work unless otherwise specified.
+
+#### NO, REALLY, READ THIS PARAGRAPH. IT'S THE IMPORTANT ONE.
+
+**_THIS IS BETA SOFTWARE_**. `npm@3` will remain in beta until we're
+confident that it's stable and have assessed the effect of the breaking
+changes on the community. During that time we will still be doing `npm@2`
+releases, with `npm@2` tagged as `latest` and `next`. We'll _also_ be
+publishing new releases of `npm@3` as `npm@3.0-next` and `npm@3.0-latest`
+alongside those versions until we're ready to switch everyone over to
+`npm@3`. We need your help to find and fix its remaining bugs. It's a
+significant rewrite, so we are _sure_ there still significant bugs
+remaining. So do us a solid and deploy it in non-critical CI environments
+and for day-to-day use, but maybe don't use it for production maintenance
+or frontline continuous deployment just yet.
+
+#### BREAKING CHANGES
+
+##### `peerDependencies`
+
+`grunt`, `gulp`, and `broccoli` plugin maintainers take note! You will be
+affected by this change!
+
+* [#6930](https://github.com/npm/npm/issues/6930)
+  ([#6565](https://github.com/npm/npm/issues/6565))
+  `peerDependencies` no longer cause _anything_ to be implicitly installed.
+  Instead, npm will now warn if a packages `peerDependencies` are missing,
+  but it's up to the consumer of the module (i.e. you) to ensure the peers
+  get installed / are included in `package.json` as direct `dependencies`
+  or `devDependencies` of your package.
+* [#3803](https://github.com/npm/npm/issues/3803)
+  npm also no longer checks `peerDependencies` until after it has fully
+  resolved the tree.
+
+This shifts the responsibility for fulfilling peer dependencies from library
+/ framework / plugin maintainers to application authors, and is intended to
+get users out of the dependency hell caused by conflicting `peerDependency`
+constraints. npm's job is to keep you _out_ of dependency hell, not put you
+in it.
+
+##### `engineStrict`
+
+* [#6931](https://github.com/npm/npm/issues/6931) The rarely-used
+  `package.json` option `engineStrict` has been deprecated for several
+  months, producing warnings when it was used. Starting with `npm@3`, the
+  value of the field is ignored, and engine violations will only produce
+  warnings. If you, as a user, want strict `engines` field enforcement,
+  just run `npm config set engine-strict true`.
+
+As with the peer dependencies change, this is about shifting control from
+module authors to application authors. It turns out `engineStrict` was very
+difficult to understand even harder to use correctly, and more often than
+not just made modules using it difficult to deploy.
+
+##### `npm view`
+
+* [`77f1aec`](https://github.com/npm/npm/commit/77f1aec) With `npm view` (aka
+  `npm info`), always return arrays for versions, maintainers, etc. Previously
+  npm would return a plain value if there was only one, and multiple values if
+  there were more. ([@KenanY](https://github.com/KenanY))
+
+#### KNOWN BUGS
+
+Again, this is a _**BETA RELEASE**_, so not everything is working just yet.
+Here are the issues that we already know about. If you run into something
+that isn't on this list,
+[let us know](https://github.com/npm/npm/issues/new)!
+
+* [#8575](https://github.com/npm/npm/issues/8575)
+  Circular deps will never be removed by the prune-on-uninstall code.
+* [#8588](https://github.com/npm/npm/issues/8588)
+  Local deps where the dep name and the name in the package.json differ
+  don't result in an error.
+* [#8637](https://github.com/npm/npm/issues/8637)
+  Modules can install themselves as direct dependencies. npm@2 declined to
+  do this.
+* [#8660](https://github.com/npm/npm/issues/8660)
+  Dependencies of failed optional dependencies aren't rolled back when the
+  optional dependency is, and then are reported as extraneous thereafter.
+
+#### NEW FEATURES
+
+##### The multi-stage installer!
+
+* [#5919](https://github.com/npm/npm/issues/5919)
+  Previously the installer had a set of steps it executed for each package
+  and it would immediately start executing them as soon as it decided to
+  act on a package.
+
+  But now it executes each of those steps at the same time for all
+  packages, waiting for all of one stage to complete before moving on. This
+  eliminates many race conditions and makes the code easier to reason
+  about.
+
+This fixes, for instance:
+
+* [#6926](https://github.com/npm/npm/issues/6926)
+  ([#5001](https://github.com/npm/npm/issues/5001),
+  [#6170](https://github.com/npm/npm/issues/6170))
+  `install` and `postinstall` lifecycle scripts now only execute `after`
+  all the module with the script's dependencies are installed.
+
+##### Install: it looks different!
+
+You'll now get a tree much like the one produced by `npm ls` that
+highlights in orange the packages that were installed. Similarly, any
+removed packages will have their names prefixed by a `-`.
+
+Also, `npm outdated` used to include the name of the module in the
+`Location` field:
+
+```
+Package                Current  Wanted  Latest  Location
+deep-equal             MISSING   1.0.0   1.0.0  deep-equal
+glob                     4.5.3   4.5.3  5.0.10  rimraf > glob
+```
+
+Now it shows the module that required it as the final point in the
+`Location` field:
+
+```
+Package                Current  Wanted  Latest  Location
+deep-equal             MISSING   1.0.0   1.0.0  npm
+glob                     4.5.3   4.5.3  5.0.10  npm > rimraf
+```
+
+Previously the `Location` field was telling you where the module was on
+disk. Now it tells you what requires the module. When more than one thing
+requires the module you'll see it listed once for each thing requiring it.
+
+##### Install: it works different!
+
+* [#6928](https://github.com/npm/npm/issues/6928)
+  ([#2931](https://github.com/npm/npm/issues/2931)
+  [#2950](https://github.com/npm/npm/issues/2950))
+  `npm install` when you have an `npm-shrinkwrap.json` will ensure you have
+  the modules specified in it are installed in exactly the shape specified
+  no matter what you had when you started.
+* [#6913](https://github.com/npm/npm/issues/6913)
+  ([#1341](https://github.com/npm/npm/issues/1341)
+  [#3124](https://github.com/npm/npm/issues/3124)
+  [#4956](https://github.com/npm/npm/issues/4956)
+  [#6349](https://github.com/npm/npm/issues/6349)
+  [#5465](https://github.com/npm/npm/issues/5465))
+  `npm install` when some of your dependencies are missing sub-dependencies
+  will result in those sub-dependencies being installed. That is, `npm
+  install` now knows how to fix broken installs, most of the time.
+* [#5465](https://github.com/npm/npm/issues/5465)
+  If you directly `npm install` a module that's already a subdep of
+  something else and your new version is incompatible, it will now install
+  the previous version nested in the things that need it.
+* [`a2b50cf`](https://github.com/npm/npm/commit/a2b50cf)
+  [#5693](https://github.com/npm/npm/issues/5693)
+  When installing a new module, if it's mentioned in your
+  `npm-shrinkwrap.json` or your `package.json` use the version specifier
+  from there if you didn't specify one yourself.
+
+##### Flat, flat, flat!
+
+Your dependencies will now be installed *maximally flat*.  Insofar as is
+possible, all of your dependencies, and their dependencies, and THEIR
+dependencies will be installed in your project's `node_modules` folder with no
+nesting.  You'll only see modules nested underneath one another when two (or
+more) modules have conflicting dependencies.
+
+* [#3697](https://github.com/npm/npm/issues/3697)
+  This will hopefully eliminate most cases where windows users ended up
+  with paths that were too long for Explorer and other standard tools to
+  deal with.
+* [#6912](https://github.com/npm/npm/issues/6912)
+  ([#4761](https://github.com/npm/npm/issues/4761)
+  [#4037](https://github.com/npm/npm/issues/4037))
+  This also means that your installs will be deduped from the start.
+* [#5827](https://github.com/npm/npm/issues/5827)
+  This deduping even extends to git deps.
+* [#6936](https://github.com/npm/npm/issues/6936)
+  ([#5698](https://github.com/npm/npm/issues/5698))
+  Various commands are dedupe aware now.
+
+This has some implications for the behavior of other commands:
+
+* `npm uninstall` removes any dependencies of the module that you specified
+  that aren't required by any other module. Previously, it would only
+  remove those that happened to be installed under it, resulting in left
+  over cruft if you'd ever deduped.
+* `npm ls` now shows you your dependency tree organized around what
+  requires what, rather than where those modules are on disk.
+* [#6937](https://github.com/npm/npm/issues/6937)
+  `npm dedupe` now flattens the tree in addition to deduping.
+
+And bundling of dependencies when packing or publishing changes too:
+
+* [#2442](https://github.com/npm/npm/issues/2442)
+  bundledDependencies no longer requires that you specify deduped sub deps.
+  npm can now see that a dependency is required by something bundled and
+  automatically include it. To put that another way, bundledDependencies
+  should ONLY include things that you included in dependencies,
+  optionalDependencies or devDependencies.
+* [#5437](https://github.com/npm/npm/issues/5437)
+  When bundling a dependency that's both a `devDependency` and the child of
+  a regular `dependency`, npm bundles the child dependency.
+
+As a demonstration of our confidence in our own work, npm's own
+dependencies are now flattened, deduped, and bundled in the `npm@3` style.
+This means that `npm@3` can't be packed or published by `npm@2`, which is
+something to be aware of if you're hacking on npm.
+
+##### Shrinkwraps: they are a-changin'!
+
+First of all, they should be idempotent now
+([#5779](https://github.com/npm/npm/issues/5779)). No more differences
+because the first time you install (without `npm-shrinkwrap.json`) and the
+second time (with `npm-shrinkwrap.json`).
+
+* [#6781](https://github.com/npm/npm/issues/6781)
+  Second, if you save your changes to `package.json` and you have
+  `npm-shrinkwrap.json`, then it will be updated as well. This applies to
+  all of the commands that update your tree:
+  * `npm install --save`
+  * `npm update --save`
+  * `npm dedupe --save` ([#6410](https://github.com/npm/npm/issues/6410))
+  * `npm uninstall --save`
+* [#4944](https://github.com/npm/npm/issues/4944)
+  ([#5161](https://github.com/npm/npm/issues/5161)
+  [#5448](https://github.com/npm/npm/issues/5448))
+  Third, because `node_modules` folders are now deduped and flat,
+  shrinkwrap has to also be smart enough to handle this.
+
+And finally, enjoy this shrinkwrap bug fix:
+
+* [#3675](https://github.com/npm/npm/issues/3675)
+  When shrinkwrapping a dependency that's both a `devDependency` and the
+  child of a regular `dependency`, npm now correctly includes the child.
+
+##### The Age of Progress (Bars)!
+
+* [#6911](https://github.com/npm/npm/issues/6911)
+  ([#1257](https://github.com/npm/npm/issues/1257)
+  [#5340](https://github.com/npm/npm/issues/5340)
+  [#6420](https://github.com/npm/npm/issues/6420))
+  The spinner is gone (yay? boo? will you miss it?), and in its place npm
+  has _progress bars_, so you actually have some sense of how long installs
+  will take. It's provided in Unicode and non-Unicode variants, and Unicode
+  support is automatically detected from your environment.
+
+#### TINY JEWELS
+
+The bottom is where we usually hide the less interesting bits of each
+release, but each of these are small but incredibly useful bits of this
+release, and very much worth checking out:
+
+* [`9ebe312`](https://github.com/npm/npm/commit/9ebe312)
+  Build system maintainers, rejoice: npm does a better job of cleaning up
+  after itself in your temporary folder.
+* [#6942](https://github.com/npm/npm/issues/6942)
+  Check for permissions issues prior to actually trying to install
+  anything.
+* Emit warnings at the end of the installation when possible, so that
+  they'll be on your screen when npm stops.
+* [#3505](https://github.com/npm/npm/issues/3505)
+  `npm --dry-run`: You can now ask that npm only report what it _would have
+  done_ with the new `--dry-run` flag. This can be passed to any of the
+  commands that change your `node_modules` folder: `install`, `uninstall`,
+  `update` and `dedupe`.
+* [`81b46fb`](https://github.com/npm/npm/commit/81b46fb)
+  npm now knows the correct URLs for `npm bugs` and `npm repo` for
+  repositories hosted on Bitbucket and GitLab, just like it does for GitHub
+  (and GitHub support now extends to projects hosted as gists as well as
+  traditional repositories).
+* [`5be4008a`](https://github.com/npm/npm/commit/5be4008a09730cfa3891d9f145e4ec7f2accd144)
+  npm has been cleaned up to pass the [`standard`](http://npm.im/standard)
+  style checker. Forrest and Rebecca both feel this makes it easier to read
+  and understand the code, and should also make it easier for new
+  contributors to put merge-ready patches.
+  ([@othiym23](https://github.com/othiym23))
+
+#### ZARRO BOOGS
+
+* [`6401643`](https://github.com/npm/npm/commit/6401643)
+  Make sure the global install directory exists before installing to it.
+  ([@thefourtheye](https://github.com/thefourtheye))
+* [#6158](https://github.com/npm/npm/issues/6158)
+  When we remove modules we do so inside-out running unbuild for each one.
+* [`960a765`](https://github.com/npm/npm/commit/960a765)
+  The short usage information for each subcommand has been brought in sync
+  with the documentation. ([@smikes](https://github.com/smikes))
+
 ### v2.12.0 (2015-06-18):
 
 #### REMEMBER WHEN I SAID THAT THING ABOUT PERMISSIONS?
diff --git a/deps/npm/LICENSE b/deps/npm/LICENSE
index b6e3548d19ccc9..ab28d1e223fb8b 100644
--- a/deps/npm/LICENSE
+++ b/deps/npm/LICENSE
@@ -251,11 +251,11 @@ details.
 Any data published to The npm Registry (including user account information) may
 be removed or modified at the sole discretion of the npm server administrators.
 
-"npm Logo" created by Mathias Pettersson and Brian Hammond,
-used with permission.
+"npm Logo" contributed by Mathias Pettersson and Brian Hammond,
+use is subject to https://www.npmjs.com/policies/trademark
 
 "Gubblebum Blocky" font
-Copyright (c) by Tjarda Koster, http://jelloween.deviantart.com
+Copyright (c) by Tjarda Koster, https://jelloween.deviantart.com
 included for use in the npm website and documentation,
 used with permission.
 
diff --git a/deps/npm/Makefile b/deps/npm/Makefile
index 34e40624b5aee6..abdac9ceb70a56 100644
--- a/deps/npm/Makefile
+++ b/deps/npm/Makefile
@@ -16,10 +16,6 @@ cli_mandocs = $(shell find doc/cli -name '*.md' \
                |sed 's|doc/cli/|man/man1/|g' ) \
                man/man1/npm-README.1
 
-api_mandocs = $(shell find doc/api -name '*.md' \
-               |sed 's|.md|.3|g' \
-               |sed 's|doc/api/|man/man3/|g' )
-
 files_mandocs = $(shell find doc/files -name '*.md' \
                |sed 's|.md|.5|g' \
                |sed 's|doc/files/|man/man5/|g' ) \
@@ -36,10 +32,6 @@ cli_htmldocs = $(shell find doc/cli -name '*.md' \
                 |sed 's|doc/cli/|html/doc/cli/|g' ) \
                 html/doc/README.html
 
-api_htmldocs = $(shell find doc/api -name '*.md' \
-                |sed 's|.md|.html|g' \
-                |sed 's|doc/api/|html/doc/api/|g' )
-
 files_htmldocs = $(shell find doc/files -name '*.md' \
                   |sed 's|.md|.html|g' \
                   |sed 's|doc/files/|html/doc/files/|g' ) \
@@ -51,9 +43,9 @@ misc_htmldocs = $(shell find doc/misc -name '*.md' \
                  |sed 's|doc/misc/|html/doc/misc/|g' ) \
                  html/doc/index.html
 
-mandocs = $(api_mandocs) $(cli_mandocs) $(files_mandocs) $(misc_mandocs)
+mandocs = $(cli_mandocs) $(files_mandocs) $(misc_mandocs)
 
-htmldocs = $(api_htmldocs) $(cli_htmldocs) $(files_htmldocs) $(misc_htmldocs)
+htmldocs = $(cli_htmldocs) $(files_htmldocs) $(misc_htmldocs)
 
 all: doc
 
@@ -93,7 +85,6 @@ doc-clean:
     .building_marked \
     .building_marked-man \
     html/doc \
-    html/api \
     man
 
 # use `npm install marked-man` for this to work.
@@ -105,10 +96,6 @@ man/man1/%.1: doc/cli/%.md scripts/doc-build.sh package.json
 	@[ -d man/man1 ] || mkdir -p man/man1
 	scripts/doc-build.sh $< $@
 
-man/man3/%.3: doc/api/%.md scripts/doc-build.sh package.json
-	@[ -d man/man3 ] || mkdir -p man/man3
-	scripts/doc-build.sh $< $@
-
 man/man5/npm-json.5: man/man5/package.json.5
 	cp $< $@
 
@@ -138,12 +125,9 @@ html/doc/cli/%.html: doc/cli/%.md $(html_docdeps)
 	@[ -d html/doc/cli ] || mkdir -p html/doc/cli
 	scripts/doc-build.sh $< $@
 
-html/doc/api/%.html: doc/api/%.md $(html_docdeps)
-	@[ -d html/doc/api ] || mkdir -p html/doc/api
-	scripts/doc-build.sh $< $@
-
 html/doc/files/npm-json.html: html/doc/files/package.json.html
 	cp $< $@
+
 html/doc/files/npm-global.html: html/doc/files/npm-folders.html
 	cp $< $@
 
@@ -168,7 +152,7 @@ node_modules/.bin/marked-man:
 
 doc: man
 
-man: $(cli_docs) $(api_docs)
+man: $(cli_docs)
 
 test: doc
 	node cli.js test
diff --git a/deps/npm/bin/node-gyp-bin/node-gyp.cmd b/deps/npm/bin/node-gyp-bin/node-gyp.cmd
index 83ea8f59247858..bb0a7f710666e2 100755
--- a/deps/npm/bin/node-gyp-bin/node-gyp.cmd
+++ b/deps/npm/bin/node-gyp-bin/node-gyp.cmd
@@ -1,5 +1,5 @@
-if not defined npm_config_node_gyp (
-  node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %*
-) else (
+if not defined npm_config_node_gyp (
+  node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %*
+) else (
   node %npm_config_node_gyp% %*
-)
+)
diff --git a/deps/npm/bin/npm-cli.js b/deps/npm/bin/npm-cli.js
index ace40ca791c459..60d00bf29ab918 100755
--- a/deps/npm/bin/npm-cli.js
+++ b/deps/npm/bin/npm-cli.js
@@ -1,75 +1,77 @@
 #!/usr/bin/env node
 ;(function () { // wrapper in case we're in module_context mode
 
-// windows: running "npm blah" in this folder will invoke WSH, not node.
-if (typeof WScript !== "undefined") {
-  WScript.echo("npm does not work when run\n"
-              +"with the Windows Scripting Host\n\n"
-              +"'cd' to a different directory,\n"
-              +"or type 'npm.cmd <args>',\n"
-              +"or type 'node npm <args>'.")
-  WScript.quit(1)
-  return
-}
-
-
-process.title = "npm"
-
-var log = require("npmlog")
-log.pause() // will be unpaused when config is loaded.
-log.info("it worked if it ends with", "ok")
-
-var path = require("path")
-  , npm = require("../lib/npm.js")
-  , npmconf = require("../lib/config/core.js")
-  , errorHandler = require("../lib/utils/error-handler.js")
-
-  , configDefs = npmconf.defs
-  , shorthands = configDefs.shorthands
-  , types = configDefs.types
-  , nopt = require("nopt")
-
-// if npm is called as "npmg" or "npm_g", then
-// run in global mode.
-if (path.basename(process.argv[1]).slice(-1)  === "g") {
-  process.argv.splice(1, 1, "npm", "-g")
-}
-
-log.verbose("cli", process.argv)
-
-var conf = nopt(types, shorthands)
-npm.argv = conf.argv.remain
-if (npm.deref(npm.argv[0])) npm.command = npm.argv.shift()
-else conf.usage = true
-
-
-if (conf.version) {
-  console.log(npm.version)
-  return
-}
-
-if (conf.versions) {
-  npm.command = "version"
-  conf.usage = false
-  npm.argv = []
-}
-
-log.info("using", "npm@%s", npm.version)
-log.info("using", "node@%s", process.version)
-
-process.on("uncaughtException", errorHandler)
-
-if (conf.usage && npm.command !== "help") {
-  npm.argv.unshift(npm.command)
-  npm.command = "help"
-}
-
-// now actually fire up npm and run the command.
-// this is how to use npm programmatically:
-conf._exit = true
-npm.load(conf, function (er) {
-  if (er) return errorHandler(er)
-  npm.commands[npm.command](npm.argv, errorHandler)
-})
+  // windows: running "npm blah" in this folder will invoke WSH, not node.
+  /*global WScript*/
+  if (typeof WScript !== 'undefined') {
+    WScript.echo(
+      'npm does not work when run\n' +
+        'with the Windows Scripting Host\n\n' +
+        "'cd' to a different directory,\n" +
+        "or type 'npm.cmd <args>',\n" +
+        "or type 'node npm <args>'."
+    )
+    WScript.quit(1)
+    return
+  }
+
+  process.title = 'npm'
+
+  var log = require('npmlog')
+  log.pause() // will be unpaused when config is loaded.
+
+  log.info('it worked if it ends with', 'ok')
+
+  var path = require('path')
+  var npm = require('../lib/npm.js')
+  var npmconf = require('../lib/config/core.js')
+  var errorHandler = require('../lib/utils/error-handler.js')
+
+  var configDefs = npmconf.defs
+  var shorthands = configDefs.shorthands
+  var types = configDefs.types
+  var nopt = require('nopt')
+
+  // if npm is called as "npmg" or "npm_g", then
+  // run in global mode.
+  if (path.basename(process.argv[1]).slice(-1) === 'g') {
+    process.argv.splice(1, 1, 'npm', '-g')
+  }
+
+  log.verbose('cli', process.argv)
+
+  var conf = nopt(types, shorthands)
+  npm.argv = conf.argv.remain
+  if (npm.deref(npm.argv[0])) npm.command = npm.argv.shift()
+  else conf.usage = true
+
+  if (conf.version) {
+    console.log(npm.version)
+    return
+  }
+
+  if (conf.versions) {
+    npm.command = 'version'
+    conf.usage = false
+    npm.argv = []
+  }
+
+  log.info('using', 'npm@%s', npm.version)
+  log.info('using', 'node@%s', process.version)
+
+  process.on('uncaughtException', errorHandler)
+
+  if (conf.usage && npm.command !== 'help') {
+    npm.argv.unshift(npm.command)
+    npm.command = 'help'
+  }
+
+  // now actually fire up npm and run the command.
+  // this is how to use npm programmatically:
+  conf._exit = true
+  npm.load(conf, function (er) {
+    if (er) return errorHandler(er)
+    npm.commands[npm.command](npm.argv, errorHandler)
+  })
 
 })()
diff --git a/deps/npm/bin/read-package-json.js b/deps/npm/bin/read-package-json.js
index 3e5a0c77f254b4..7e62a0bd7de552 100755
--- a/deps/npm/bin/read-package-json.js
+++ b/deps/npm/bin/read-package-json.js
@@ -1,22 +1,24 @@
 var argv = process.argv
 if (argv.length < 3) {
-  console.error("Usage: read-package.json <file> [<fields> ...]")
+  console.error('Usage: read-package.json <file> [<fields> ...]')
   process.exit(1)
 }
 
-var fs = require("fs")
-  , file = argv[2]
-  , readJson = require("read-package-json")
+var file = argv[2]
+var readJson = require('read-package-json')
 
 readJson(file, function (er, data) {
   if (er) throw er
-  if (argv.length === 3) console.log(data)
-  else argv.slice(3).forEach(function (field) {
-    field = field.split(".")
-    var val = data
-    field.forEach(function (f) {
-      val = val[f]
+  if (argv.length === 3) {
+    console.log(data)
+  } else {
+    argv.slice(3).forEach(function (field) {
+      field = field.split('.')
+      var val = data
+      field.forEach(function (f) {
+        val = val[f]
+      })
+      console.log(val)
     })
-    console.log(val)
-  })
+  }
 })
diff --git a/deps/npm/cli.js b/deps/npm/cli.js
index 0df931e35a4120..05c5e21fb1eb53 100755
--- a/deps/npm/cli.js
+++ b/deps/npm/cli.js
@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require("./bin/npm-cli.js")
+require('./bin/npm-cli.js')
diff --git a/deps/npm/doc/api/npm-bin.md b/deps/npm/doc/api/npm-bin.md
deleted file mode 100644
index bd27af2fdca30e..00000000000000
--- a/deps/npm/doc/api/npm-bin.md
+++ /dev/null
@@ -1,13 +0,0 @@
-npm-bin(3) -- Display npm bin folder
-====================================
-
-## SYNOPSIS
-
-    npm.commands.bin(args, cb)
-
-## DESCRIPTION
-
-Print the folder where npm will install executables.
-
-This function should not be used programmatically.  Instead, just refer
-to the `npm.bin` property.
diff --git a/deps/npm/doc/api/npm-bugs.md b/deps/npm/doc/api/npm-bugs.md
deleted file mode 100644
index cc4db8f9ecdb91..00000000000000
--- a/deps/npm/doc/api/npm-bugs.md
+++ /dev/null
@@ -1,19 +0,0 @@
-npm-bugs(3) -- Bugs for a package in a web browser maybe
-========================================================
-
-## SYNOPSIS
-
-    npm.commands.bugs(package, callback)
-
-## DESCRIPTION
-
-This command tries to guess at the likely location of a package's
-bug tracker URL, and then tries to open it using the `--browser`
-config param.
-
-Like other commands, the first parameter is an array. This command only
-uses the first element, which is expected to be a package name with an
-optional version number.
-
-This command will launch a browser, so this command may not be the most
-friendly for programmatic use.
diff --git a/deps/npm/doc/api/npm-cache.md b/deps/npm/doc/api/npm-cache.md
deleted file mode 100644
index e7079d8c1e9f5b..00000000000000
--- a/deps/npm/doc/api/npm-cache.md
+++ /dev/null
@@ -1,30 +0,0 @@
-npm-cache(3) -- manage the npm cache programmatically
-=====================================================
-
-## SYNOPSIS
-
-    npm.commands.cache([args], callback)
-
-    // helpers
-    npm.commands.cache.clean([args], callback)
-    npm.commands.cache.add([args], callback)
-    npm.commands.cache.read(name, version, forceBypass, callback)
-
-## DESCRIPTION
-
-This acts much the same ways as the npm-cache(1) command line
-functionality.
-
-The callback is called with the package.json data of the thing that is
-eventually added to or read from the cache.
-
-The top level `npm.commands.cache(...)` functionality is a public
-interface, and like all commands on the `npm.commands` object, it will
-match the command line behavior exactly.
-
-However, the cache folder structure and the cache helper functions are
-considered **internal** API surface, and as such, may change in future
-releases of npm, potentially without warning or significant version
-incrementation.
-
-Use at your own risk.
diff --git a/deps/npm/doc/api/npm-commands.md b/deps/npm/doc/api/npm-commands.md
deleted file mode 100644
index 36dcfd8d6b6f52..00000000000000
--- a/deps/npm/doc/api/npm-commands.md
+++ /dev/null
@@ -1,22 +0,0 @@
-npm-commands(3) -- npm commands
-===============================
-
-## SYNOPSIS
-
-    npm.commands[<command>](args, callback)
-
-## DESCRIPTION
-
-npm comes with a full set of commands, and each of the commands takes a
-similar set of arguments.
-
-In general, all commands on the command object take an **array** of positional
-argument **strings**. The last argument to any function is a callback. Some
-commands are special and take other optional arguments.
-
-All commands have their own man page. See `man npm-<command>` for command-line
-usage, or `man 3 npm-<command>` for programmatic usage.
-
-## SEE ALSO
-
-* npm-index(7)
diff --git a/deps/npm/doc/api/npm-config.md b/deps/npm/doc/api/npm-config.md
deleted file mode 100644
index 7ae22742810841..00000000000000
--- a/deps/npm/doc/api/npm-config.md
+++ /dev/null
@@ -1,45 +0,0 @@
-npm-config(3) -- Manage the npm configuration files
-===================================================
-
-## SYNOPSIS
-
-    npm.commands.config(args, callback)
-    var val = npm.config.get(key)
-    npm.config.set(key, val)
-
-## DESCRIPTION
-
-This function acts much the same way as the command-line version.  The first
-element in the array tells config what to do. Possible values are:
-
-* `set`
-
-    Sets a config parameter.  The second element in `args` is interpreted as the
-    key, and the third element is interpreted as the value.
-
-* `get`
-
-    Gets the value of a config parameter. The second element in `args` is the
-    key to get the value of.
-
-* `delete` (`rm` or `del`)
-
-    Deletes a parameter from the config. The second element in `args` is the
-    key to delete.
-
-* `list` (`ls`)
-
-    Show all configs that aren't secret. No parameters necessary.
-
-* `edit`:
-
-    Opens the config file in the default editor. This command isn't very useful
-    programmatically, but it is made available.
-
-To programmatically access npm configuration settings, or set them for
-the duration of a program, use the `npm.config.set` and `npm.config.get`
-functions instead.
-
-## SEE ALSO
-
-* npm(3)
diff --git a/deps/npm/doc/api/npm-deprecate.md b/deps/npm/doc/api/npm-deprecate.md
deleted file mode 100644
index 200fb9c30ae019..00000000000000
--- a/deps/npm/doc/api/npm-deprecate.md
+++ /dev/null
@@ -1,34 +0,0 @@
-npm-deprecate(3) -- Deprecate a version of a package
-====================================================
-
-## SYNOPSIS
-
-    npm.commands.deprecate(args, callback)
-
-## DESCRIPTION
-
-This command will update the npm registry entry for a package, providing
-a deprecation warning to all who attempt to install it.
-
-The 'args' parameter must have exactly two elements:
-
-* `package[@version]`
-
-    The `version` portion is optional, and may be either a range, or a
-    specific version, or a tag.
-
-* `message`
-
-    The warning message that will be printed whenever a user attempts to
-    install the package.
-
-Note that you must be the package owner to deprecate something.  See the
-`owner` and `adduser` help topics.
-
-To un-deprecate a package, specify an empty string (`""`) for the `message` argument.
-
-## SEE ALSO
-
-* npm-publish(3)
-* npm-unpublish(3)
-* npm-registry(7)
diff --git a/deps/npm/doc/api/npm-docs.md b/deps/npm/doc/api/npm-docs.md
deleted file mode 100644
index 2c5fc5e6321b38..00000000000000
--- a/deps/npm/doc/api/npm-docs.md
+++ /dev/null
@@ -1,19 +0,0 @@
-npm-docs(3) -- Docs for a package in a web browser maybe
-========================================================
-
-## SYNOPSIS
-
-    npm.commands.docs(package, callback)
-
-## DESCRIPTION
-
-This command tries to guess at the likely location of a package's
-documentation URL, and then tries to open it using the `--browser`
-config param.
-
-Like other commands, the first parameter is an array. This command only
-uses the first element, which is expected to be a package name with an
-optional version number.
-
-This command will launch a browser, so this command may not be the most
-friendly for programmatic use.
diff --git a/deps/npm/doc/api/npm-edit.md b/deps/npm/doc/api/npm-edit.md
deleted file mode 100644
index b13fbb8578bee6..00000000000000
--- a/deps/npm/doc/api/npm-edit.md
+++ /dev/null
@@ -1,24 +0,0 @@
-npm-edit(3) -- Edit an installed package
-========================================
-
-## SYNOPSIS
-
-    npm.commands.edit(package, callback)
-
-## DESCRIPTION
-
-Opens the package folder in the default editor (or whatever you've
-configured as the npm `editor` config -- see `npm help config`.)
-
-After it has been edited, the package is rebuilt so as to pick up any
-changes in compiled packages.
-
-For instance, you can do `npm install connect` to install connect
-into your package, and then `npm.commands.edit(["connect"], callback)`
-to make a few changes to your locally installed copy.
-
-The first parameter is a string array with a single element, the package
-to open. The package can optionally have a version number attached.
-
-Since this command opens an editor in a new process, be careful about where
-and how this is used.
diff --git a/deps/npm/doc/api/npm-explore.md b/deps/npm/doc/api/npm-explore.md
deleted file mode 100644
index a239f3df3142fd..00000000000000
--- a/deps/npm/doc/api/npm-explore.md
+++ /dev/null
@@ -1,18 +0,0 @@
-npm-explore(3) -- Browse an installed package
-=============================================
-
-## SYNOPSIS
-
-    npm.commands.explore(args, callback)
-
-## DESCRIPTION
-
-Spawn a subshell in the directory of the installed package specified.
-
-If a command is specified, then it is run in the subshell, which then
-immediately terminates.
-
-Note that the package is *not* automatically rebuilt afterwards, so be
-sure to use `npm rebuild <pkg>` if you make any changes.
-
-The first element in the 'args' parameter must be a package name.  After that is the optional command, which can be any number of strings. All of the strings will be combined into one, space-delimited command.
diff --git a/deps/npm/doc/api/npm-help-search.md b/deps/npm/doc/api/npm-help-search.md
deleted file mode 100644
index 01b235ce72b4bd..00000000000000
--- a/deps/npm/doc/api/npm-help-search.md
+++ /dev/null
@@ -1,30 +0,0 @@
-npm-help-search(3) -- Search the help pages
-===========================================
-
-## SYNOPSIS
-
-    npm.commands.helpSearch(args, [silent,] callback)
-
-## DESCRIPTION
-
-This command is rarely useful, but it exists in the rare case that it is.
-
-This command takes an array of search terms and returns the help pages that
-match in order of best match.
-
-If there is only one match, then npm displays that help section. If there
-are multiple results, the results are printed to the screen formatted and the
-array of results is returned. Each result is an object with these properties:
-
-* hits:
-  A map of args to number of hits on that arg. For example, {"npm": 3}
-* found:
-  Total number of unique args that matched.
-* totalHits:
-  Total number of hits.
-* lines:
-  An array of all matching lines (and some adjacent lines).
-* file:
-  Name of the file that matched
-
-The silent parameter is not necessary not used, but it may in the future.
diff --git a/deps/npm/doc/api/npm-init.md b/deps/npm/doc/api/npm-init.md
deleted file mode 100644
index 9b75bf79116dd3..00000000000000
--- a/deps/npm/doc/api/npm-init.md
+++ /dev/null
@@ -1,29 +0,0 @@
-npm init(3) -- Interactively create a package.json file
-=======================================================
-
-## SYNOPSIS
-
-    npm.commands.init(args, callback)
-
-## DESCRIPTION
-
-This will ask you a bunch of questions, and then write a package.json for you.
-
-It attempts to make reasonable guesses about what you want things to be set to,
-and then writes a package.json file with the options you've selected.
-
-If you already have a package.json file, it'll read that first, and default to
-the options in there.
-
-It is strictly additive, so it does not delete options from your package.json
-without a really good reason to do so.
-
-Since this function expects to be run on the command-line, it doesn't work very
-well as a programmatically. The best option is to roll your own, and since
-JavaScript makes it stupid simple to output formatted JSON, that is the
-preferred method. If you're sure you want to handle command-line prompting,
-then go ahead and use this programmatically.
-
-## SEE ALSO
-
-package.json(5)
diff --git a/deps/npm/doc/api/npm-install.md b/deps/npm/doc/api/npm-install.md
deleted file mode 100644
index 12f665a76c92c7..00000000000000
--- a/deps/npm/doc/api/npm-install.md
+++ /dev/null
@@ -1,19 +0,0 @@
-npm-install(3) -- install a package programmatically
-====================================================
-
-## SYNOPSIS
-
-    npm.commands.install([where,] packages, callback)
-
-## DESCRIPTION
-
-This acts much the same ways as installing on the command-line.
-
-The 'where' parameter is optional and only used internally, and it specifies
-where the packages should be installed to.
-
-The 'packages' parameter is an array of strings. Each element in the array is
-the name of a package to be installed.
-
-Finally, 'callback' is a function that will be called when all packages have been
-installed or when an error has been encountered.
diff --git a/deps/npm/doc/api/npm-link.md b/deps/npm/doc/api/npm-link.md
deleted file mode 100644
index fe875ec60f1c4c..00000000000000
--- a/deps/npm/doc/api/npm-link.md
+++ /dev/null
@@ -1,33 +0,0 @@
-npm-link(3) -- Symlink a package folder
-=======================================
-
-## SYNOPSIS
-
-    npm.commands.link(callback)
-    npm.commands.link(packages, callback)
-
-## DESCRIPTION
-
-Package linking is a two-step process.
-
-Without parameters, link will create a globally-installed
-symbolic link from `prefix/package-name` to the current folder.
-
-With a parameters, link will create a symlink from the local `node_modules`
-folder to the global symlink.
-
-When creating tarballs for `npm publish`, the linked packages are
-"snapshotted" to their current state by resolving the symbolic links.
-
-This is
-handy for installing your own stuff, so that you can work on it and test it
-iteratively without having to continually rebuild.
-
-For example:
-
-    npm.commands.link(cb)           # creates global link from the cwd
-                                    # (say redis package)
-    npm.commands.link('redis', cb)  # link-install the package
-
-Now, any changes to the redis package will be reflected in
-the package in the current working directory
diff --git a/deps/npm/doc/api/npm-load.md b/deps/npm/doc/api/npm-load.md
deleted file mode 100644
index de412aff5b87b5..00000000000000
--- a/deps/npm/doc/api/npm-load.md
+++ /dev/null
@@ -1,26 +0,0 @@
-npm-load(3) -- Load config settings
-===================================
-
-## SYNOPSIS
-
-    npm.load(conf, cb)
-
-## DESCRIPTION
-
-npm.load() must be called before any other function call.  Both parameters are
-optional, but the second is recommended.
-
-The first parameter is an object containing command-line config params, and the
-second parameter is a callback that will be called when npm is loaded and ready
-to serve.
-
-The first parameter should follow a similar structure as the package.json
-config object.
-
-For example, to emulate the --dev flag, pass an object that looks like this:
-
-    {
-      "dev": true
-    }
-
-For a list of all the available command-line configs, see `npm help config`
diff --git a/deps/npm/doc/api/npm-ls.md b/deps/npm/doc/api/npm-ls.md
deleted file mode 100644
index 5de78f2104ae0c..00000000000000
--- a/deps/npm/doc/api/npm-ls.md
+++ /dev/null
@@ -1,56 +0,0 @@
-npm-ls(3) -- List installed packages
-======================================
-
-## SYNOPSIS
-
-    npm.commands.ls(args, [silent,] callback)
-
-## DESCRIPTION
-
-This command will print to stdout all the versions of packages that are
-installed, as well as their dependencies, in a tree-structure. It will also
-return that data using the callback.
-
-This command does not take any arguments, but args must be defined.
-Beyond that, if any arguments are passed in, npm will politely warn that it
-does not take positional arguments, though you may set config flags
-like with any other command, such as `global` to list global packages.
-
-It will print out extraneous, missing, and invalid packages.
-
-If the silent parameter is set to true, nothing will be output to the screen,
-but the data will still be returned.
-
-Callback is provided an error if one occurred, the full data about which
-packages are installed and which dependencies they will receive, and a
-"lite" data object which just shows which versions are installed where.
-Note that the full data object is a circular structure, so care must be
-taken if it is serialized to JSON.
-
-## CONFIGURATION
-
-### long
-
-* Default: false
-* Type: Boolean
-
-Show extended information.
-
-### parseable
-
-* Default: false
-* Type: Boolean
-
-Show parseable output instead of tree view.
-
-### global
-
-* Default: false
-* Type: Boolean
-
-List packages in the global install prefix instead of in the current
-project.
-
-Note, if parseable is set or long isn't set, then duplicates will be trimmed.
-This means that if a submodule has the same dependency as a parent module, then the
-dependency will only be output once.
diff --git a/deps/npm/doc/api/npm-outdated.md b/deps/npm/doc/api/npm-outdated.md
deleted file mode 100644
index 89f4cf6faa7fd7..00000000000000
--- a/deps/npm/doc/api/npm-outdated.md
+++ /dev/null
@@ -1,13 +0,0 @@
-npm-outdated(3) -- Check for outdated packages
-==============================================
-
-## SYNOPSIS
-
-    npm.commands.outdated([packages,] callback)
-
-## DESCRIPTION
-
-This command will check the registry to see if the specified packages are
-currently outdated.
-
-If the 'packages' parameter is left out, npm will check all packages.
diff --git a/deps/npm/doc/api/npm-owner.md b/deps/npm/doc/api/npm-owner.md
deleted file mode 100644
index 71fcccff59163b..00000000000000
--- a/deps/npm/doc/api/npm-owner.md
+++ /dev/null
@@ -1,31 +0,0 @@
-npm-owner(3) -- Manage package owners
-=====================================
-
-## SYNOPSIS
-
-    npm.commands.owner(args, callback)
-
-## DESCRIPTION
-
-The first element of the 'args' parameter defines what to do, and the subsequent
-elements depend on the action. Possible values for the action are (order of
-parameters are given in parenthesis):
-
-* ls (package):
-  List all the users who have access to modify a package and push new versions.
-  Handy when you need to know who to bug for help.
-* add (user, package):
-  Add a new user as a maintainer of a package.  This user is enabled to modify
-  metadata, publish new versions, and add other owners.
-* rm (user, package):
-  Remove a user from the package owner list.  This immediately revokes their
-  privileges.
-
-Note that there is only one level of access.  Either you can modify a package,
-or you can't.  Future versions may contain more fine-grained access levels, but
-that is not implemented at this time.
-
-## SEE ALSO
-
-* npm-publish(3)
-* npm-registry(7)
diff --git a/deps/npm/doc/api/npm-pack.md b/deps/npm/doc/api/npm-pack.md
deleted file mode 100644
index cb339c0c42d6fe..00000000000000
--- a/deps/npm/doc/api/npm-pack.md
+++ /dev/null
@@ -1,19 +0,0 @@
-npm-pack(3) -- Create a tarball from a package
-==============================================
-
-## SYNOPSIS
-
-    npm.commands.pack([packages,] callback)
-
-## DESCRIPTION
-
-For anything that's installable (that is, a package folder, tarball,
-tarball url, name@tag, name@version, or name), this command will fetch
-it to the cache, and then copy the tarball to the current working
-directory as `<name>-<version>.tgz`, and then write the filenames out to
-stdout.
-
-If the same package is specified multiple times, then the file will be
-overwritten the second time.
-
-If no arguments are supplied, then npm packs the current package folder.
diff --git a/deps/npm/doc/api/npm-ping.md b/deps/npm/doc/api/npm-ping.md
deleted file mode 100644
index 4357fe2ba99994..00000000000000
--- a/deps/npm/doc/api/npm-ping.md
+++ /dev/null
@@ -1,14 +0,0 @@
-npm-ping(3) -- Ping npm registry
-================================
-
-## SYNOPSIS
-
-    npm.registry.ping(registry, options, function (er, pong))
-
-## DESCRIPTION
-
-Attempts to connect to the given registry, returning a `pong`
-object with various metadata if it succeeds.
-
-This function is primarily useful for debugging connection issues
-to npm registries.
diff --git a/deps/npm/doc/api/npm-prefix.md b/deps/npm/doc/api/npm-prefix.md
deleted file mode 100644
index 806dd4b6cbafd0..00000000000000
--- a/deps/npm/doc/api/npm-prefix.md
+++ /dev/null
@@ -1,15 +0,0 @@
-npm-prefix(3) -- Display prefix
-===============================
-
-## SYNOPSIS
-
-    npm.commands.prefix(args, callback)
-
-## DESCRIPTION
-
-Print the prefix to standard out.
-
-'args' is never used and callback is never called with data.
-'args' must be present or things will break.
-
-This function is not useful programmatically
diff --git a/deps/npm/doc/api/npm-prune.md b/deps/npm/doc/api/npm-prune.md
deleted file mode 100644
index 2a4f177485deb9..00000000000000
--- a/deps/npm/doc/api/npm-prune.md
+++ /dev/null
@@ -1,17 +0,0 @@
-npm-prune(3) -- Remove extraneous packages
-==========================================
-
-## SYNOPSIS
-
-    npm.commands.prune([packages,] callback)
-
-## DESCRIPTION
-
-This command removes "extraneous" packages.
-
-The first parameter is optional, and it specifies packages to be removed.
-
-No packages are specified, then all packages will be checked.
-
-Extraneous packages are packages that are not listed on the parent
-package's dependencies list.
diff --git a/deps/npm/doc/api/npm-publish.md b/deps/npm/doc/api/npm-publish.md
deleted file mode 100644
index 6871dafb856d0e..00000000000000
--- a/deps/npm/doc/api/npm-publish.md
+++ /dev/null
@@ -1,30 +0,0 @@
-npm-publish(3) -- Publish a package
-===================================
-
-## SYNOPSIS
-
-    npm.commands.publish([packages,] callback)
-
-## DESCRIPTION
-
-Publishes a package to the registry so that it can be installed by name.
-Possible values in the 'packages' array are:
-
-* `<folder>`:
-  A folder containing a package.json file
-
-* `<tarball>`:
-  A url or file path to a gzipped tar archive containing a single folder
-  with a package.json file inside.
-
-If the package array is empty, npm will try to publish something in the
-current working directory.
-
-This command could fails if one of the packages specified already exists in
-the registry.  Overwrites when the "force" environment variable is set.
-
-## SEE ALSO
-
-* npm-registry(7)
-* npm-adduser(1)
-* npm-owner(3)
diff --git a/deps/npm/doc/api/npm-rebuild.md b/deps/npm/doc/api/npm-rebuild.md
deleted file mode 100644
index 8b8989806ae26f..00000000000000
--- a/deps/npm/doc/api/npm-rebuild.md
+++ /dev/null
@@ -1,16 +0,0 @@
-npm-rebuild(3) -- Rebuild a package
-===================================
-
-## SYNOPSIS
-
-    npm.commands.rebuild([packages,] callback)
-
-## DESCRIPTION
-
-This command runs the `npm build` command on each of the matched packages.  This is useful
-when you install a new version of node, and must recompile all your C++ addons with
-the new binary. If no 'packages' parameter is specify, every package will be rebuilt.
-
-## CONFIGURATION
-
-See `npm help build`
diff --git a/deps/npm/doc/api/npm-repo.md b/deps/npm/doc/api/npm-repo.md
deleted file mode 100644
index af3c52fab64a30..00000000000000
--- a/deps/npm/doc/api/npm-repo.md
+++ /dev/null
@@ -1,19 +0,0 @@
-npm-repo(3) -- Open package repository page in the browser
-========================================================
-
-## SYNOPSIS
-
-    npm.commands.repo(package, callback)
-
-## DESCRIPTION
-
-This command tries to guess at the likely location of a package's
-repository URL, and then tries to open it using the `--browser`
-config param.
-
-Like other commands, the first parameter is an array. This command only
-uses the first element, which is expected to be a package name with an
-optional version number.
-
-This command will launch a browser, so this command may not be the most
-friendly for programmatic use.
diff --git a/deps/npm/doc/api/npm-restart.md b/deps/npm/doc/api/npm-restart.md
deleted file mode 100644
index 606c41bf8505f4..00000000000000
--- a/deps/npm/doc/api/npm-restart.md
+++ /dev/null
@@ -1,41 +0,0 @@
-npm-restart(3) -- Restart a package
-===================================
-
-## SYNOPSIS
-
-    npm.commands.restart(packages, callback)
-
-## DESCRIPTION
-
-This restarts a package (or multiple packages).
-
-This runs a package's "stop", "restart", and "start" scripts, and associated
-pre- and post- scripts, in the order given below:
-
-1. prerestart
-2. prestop
-3. stop
-4. poststop
-5. restart
-6. prestart
-7. start
-8. poststart
-9. postrestart
-
-If no version is specified, then it restarts the "active" version.
-
-npm can restart multiple packages. Just specify multiple packages in
-the `packages` parameter.
-
-## NOTE
-
-Note that the "restart" script is run **in addition to** the "stop"
-and "start" scripts, not instead of them.
-
-This is the behavior as of `npm` major version 2.  A change in this
-behavior will be accompanied by an increase in major version number
-
-## SEE ALSO
-
-* npm-start(3)
-* npm-stop(3)
diff --git a/deps/npm/doc/api/npm-root.md b/deps/npm/doc/api/npm-root.md
deleted file mode 100644
index 1c3ab56402c0f8..00000000000000
--- a/deps/npm/doc/api/npm-root.md
+++ /dev/null
@@ -1,15 +0,0 @@
-npm-root(3) -- Display npm root
-===============================
-
-## SYNOPSIS
-
-    npm.commands.root(args, callback)
-
-## DESCRIPTION
-
-Print the effective `node_modules` folder to standard out.
-
-'args' is never used and callback is never called with data.
-'args' must be present or things will break.
-
-This function is not useful programmatically.
diff --git a/deps/npm/doc/api/npm-run-script.md b/deps/npm/doc/api/npm-run-script.md
deleted file mode 100644
index 91ad95351bb5c0..00000000000000
--- a/deps/npm/doc/api/npm-run-script.md
+++ /dev/null
@@ -1,27 +0,0 @@
-npm-run-script(3) -- Run arbitrary package scripts
-==================================================
-
-## SYNOPSIS
-
-    npm.commands.run-script(args, callback)
-
-## DESCRIPTION
-
-This runs an arbitrary command from a package's "scripts" object.
-
-It is used by the test, start, restart, and stop commands, but can be
-called directly, as well.
-
-The 'args' parameter is an array of strings. Behavior depends on the number
-of elements.  If there is only one element, npm assumes that the element
-represents a command to be run on the local repository. If there is more than
-one element, then the first is assumed to be the package and the second is
-assumed to be the command to run. All other elements are ignored.
-
-## SEE ALSO
-
-* npm-scripts(7)
-* npm-test(3)
-* npm-start(3)
-* npm-restart(3)
-* npm-stop(3)
diff --git a/deps/npm/doc/api/npm-search.md b/deps/npm/doc/api/npm-search.md
deleted file mode 100644
index 30651d76a4227f..00000000000000
--- a/deps/npm/doc/api/npm-search.md
+++ /dev/null
@@ -1,35 +0,0 @@
-npm-search(3) -- Search for packages
-====================================
-
-## SYNOPSIS
-
-    npm.commands.search(searchTerms, [silent,] [staleness,] callback)
-
-## DESCRIPTION
-
-Search the registry for packages matching the search terms. The available parameters are:
-
-* searchTerms:
-  Array of search terms. These terms are case-insensitive.
-* silent:
-  If true, npm will not log anything to the console.
-* staleness:
-  This is the threshold for stale packages. "Fresh" packages are not refreshed
-  from the registry. This value is measured in seconds.
-* callback:
-  Returns an object where each key is the name of a package, and the value
-  is information about that package along with a 'words' property, which is
-  a space-delimited string of all of the interesting words in that package.
-  The only properties included are those that are searched, which generally include:
-
-    * name
-    * description
-    * maintainers
-    * url
-    * keywords
-
-A search on the registry excludes any result that does not match all of the
-search terms. It also removes any items from the results that contain an
-excluded term (the "searchexclude" config). The search is case insensitive
-and doesn't try to read your mind (it doesn't do any verb tense matching or the
-like).
diff --git a/deps/npm/doc/api/npm-shrinkwrap.md b/deps/npm/doc/api/npm-shrinkwrap.md
deleted file mode 100644
index 6584d6a0da48f7..00000000000000
--- a/deps/npm/doc/api/npm-shrinkwrap.md
+++ /dev/null
@@ -1,20 +0,0 @@
-npm-shrinkwrap(3) -- programmatically generate package shrinkwrap file
-====================================================
-
-## SYNOPSIS
-
-    npm.commands.shrinkwrap(args, [silent,] callback)
-
-## DESCRIPTION
-
-This acts much the same ways as shrinkwrapping on the command-line.
-
-This command does not take any arguments, but 'args' must be defined.
-Beyond that, if any arguments are passed in, npm will politely warn that it
-does not take positional arguments.
-
-If the 'silent' parameter is set to true, nothing will be output to the screen,
-but the shrinkwrap file will still be written.
-
-Finally, 'callback' is a function that will be called when the shrinkwrap has
-been saved.
diff --git a/deps/npm/doc/api/npm-start.md b/deps/npm/doc/api/npm-start.md
deleted file mode 100644
index deeea90d97649b..00000000000000
--- a/deps/npm/doc/api/npm-start.md
+++ /dev/null
@@ -1,13 +0,0 @@
-npm-start(3) -- Start a package
-===============================
-
-## SYNOPSIS
-
-    npm.commands.start(packages, callback)
-
-## DESCRIPTION
-
-This runs a package's "start" script, if one was provided.
-
-npm can start multiple packages. Just specify multiple packages in the
-`packages` parameter.
diff --git a/deps/npm/doc/api/npm-stop.md b/deps/npm/doc/api/npm-stop.md
deleted file mode 100644
index 0f8333d3513233..00000000000000
--- a/deps/npm/doc/api/npm-stop.md
+++ /dev/null
@@ -1,13 +0,0 @@
-npm-stop(3) -- Stop a package
-=============================
-
-## SYNOPSIS
-
-    npm.commands.stop(packages, callback)
-
-## DESCRIPTION
-
-This runs a package's "stop" script, if one was provided.
-
-npm can run stop on multiple packages. Just specify multiple packages
-in the `packages` parameter.
diff --git a/deps/npm/doc/api/npm-tag.md b/deps/npm/doc/api/npm-tag.md
deleted file mode 100644
index 9cda0c407dec84..00000000000000
--- a/deps/npm/doc/api/npm-tag.md
+++ /dev/null
@@ -1,23 +0,0 @@
-npm-tag(3) -- Tag a published version
-=====================================
-
-## SYNOPSIS
-
-    npm.commands.tag(package@version, tag, callback)
-
-## DESCRIPTION
-
-Tags the specified version of the package with the specified tag, or the
-`--tag` config if not specified.
-
-The 'package@version' is an array of strings, but only the first two elements are
-currently used.
-
-The first element must be in the form package@version, where package
-is the package name and version is the version number (much like installing a
-specific version).
-
-The second element is the name of the tag to tag this version with. If this
-parameter is missing or falsey (empty), the default from the config will be
-used. For more information about how to set this config, check
-`man 3 npm-config` for programmatic usage or `man npm-config` for cli usage.
diff --git a/deps/npm/doc/api/npm-test.md b/deps/npm/doc/api/npm-test.md
deleted file mode 100644
index bc48dcc35f9572..00000000000000
--- a/deps/npm/doc/api/npm-test.md
+++ /dev/null
@@ -1,16 +0,0 @@
-npm-test(3) -- Test a package
-=============================
-
-## SYNOPSIS
-
-      npm.commands.test(packages, callback)
-
-## DESCRIPTION
-
-This runs a package's "test" script, if one was provided.
-
-To run tests as a condition of installation, set the `npat` config to
-true.
-
-npm can run tests on multiple packages. Just specify multiple packages
-in the `packages` parameter.
diff --git a/deps/npm/doc/api/npm-uninstall.md b/deps/npm/doc/api/npm-uninstall.md
deleted file mode 100644
index 4505295b3b3d3a..00000000000000
--- a/deps/npm/doc/api/npm-uninstall.md
+++ /dev/null
@@ -1,16 +0,0 @@
-npm-uninstall(3) -- uninstall a package programmatically
-========================================================
-
-## SYNOPSIS
-
-    npm.commands.uninstall(packages, callback)
-
-## DESCRIPTION
-
-This acts much the same ways as uninstalling on the command-line.
-
-The 'packages' parameter is an array of strings. Each element in the array is
-the name of a package to be uninstalled.
-
-Finally, 'callback' is a function that will be called when all packages have been
-uninstalled or when an error has been encountered.
diff --git a/deps/npm/doc/api/npm-unpublish.md b/deps/npm/doc/api/npm-unpublish.md
deleted file mode 100644
index 6cbc5c1f371ffe..00000000000000
--- a/deps/npm/doc/api/npm-unpublish.md
+++ /dev/null
@@ -1,20 +0,0 @@
-npm-unpublish(3) -- Remove a package from the registry
-======================================================
-
-## SYNOPSIS
-
-    npm.commands.unpublish(package, callback)
-
-## DESCRIPTION
-
-This removes a package version from the registry, deleting its
-entry and removing the tarball.
-
-The package parameter must be defined.
-
-Only the first element in the package parameter is used.  If there is no first
-element, then npm assumes that the package at the current working directory
-is what is meant.
-
-If no version is specified, or if all versions are removed then
-the root package entry is removed from the registry entirely.
diff --git a/deps/npm/doc/api/npm-update.md b/deps/npm/doc/api/npm-update.md
deleted file mode 100644
index 52d7ec343c0cfd..00000000000000
--- a/deps/npm/doc/api/npm-update.md
+++ /dev/null
@@ -1,18 +0,0 @@
-npm-update(3) -- Update a package
-=================================
-
-## SYNOPSIS
-
-    npm.commands.update(packages, callback)
-
-# DESCRIPTION
-
-Updates a package, upgrading it to the latest version. It also installs any
-missing packages.
-
-The `packages` argument is an array of packages to update. The `callback`
-parameter will be called when done or when an error occurs.
-
-## SEE ALSO
-
-* npm-update(1)
diff --git a/deps/npm/doc/api/npm-version.md b/deps/npm/doc/api/npm-version.md
deleted file mode 100644
index bd40102c457bf8..00000000000000
--- a/deps/npm/doc/api/npm-version.md
+++ /dev/null
@@ -1,18 +0,0 @@
-npm-version(3) -- Bump a package version
-========================================
-
-## SYNOPSIS
-
-    npm.commands.version(newversion, callback)
-
-## DESCRIPTION
-
-Run this in a package directory to bump the version and write the new
-data back to the package.json file.
-
-If run in a git repo, it will also create a version commit and tag, and
-fail if the repo is not clean.
-
-Like all other commands, this function takes a string array as its first
-parameter. The difference, however, is this function will fail if it does
-not have exactly one element. The only element should be a version number.
diff --git a/deps/npm/doc/api/npm-view.md b/deps/npm/doc/api/npm-view.md
deleted file mode 100644
index 0c110f52ed1c59..00000000000000
--- a/deps/npm/doc/api/npm-view.md
+++ /dev/null
@@ -1,93 +0,0 @@
-npm-view(3) -- View registry info
-=================================
-
-## SYNOPSIS
-
-    npm.commands.view(args, [silent,] callback)
-
-## DESCRIPTION
-
-This command shows data about a package and prints it to the stream
-referenced by the `outfd` config, which defaults to stdout.
-
-The "args" parameter is an ordered list that closely resembles the command-line
-usage. The elements should be ordered such that the first element is
-the package and version (package@version). The version is optional. After that,
-the rest of the parameters are fields with optional subfields ("field.subfield")
-which can be used to get only the information desired from the registry.
-
-The callback will be passed all of the data returned by the query.
-
-For example, to get the package registry entry for the `connect` package,
-you can do this:
-
-    npm.commands.view(["connect"], callback)
-
-If no version is specified, "latest" is assumed.
-
-Field names can be specified after the package descriptor.
-For example, to show the dependencies of the `ronn` package at version
-0.3.5, you could do the following:
-
-    npm.commands.view(["ronn@0.3.5", "dependencies"], callback)
-
-You can view child field by separating them with a period.
-To view the git repository URL for the latest version of npm, you could
-do this:
-
-    npm.commands.view(["npm", "repository.url"], callback)
-
-For fields that are arrays, requesting a non-numeric field will return
-all of the values from the objects in the list.  For example, to get all
-the contributor names for the "express" project, you can do this:
-
-    npm.commands.view(["express", "contributors.email"], callback)
-
-You may also use numeric indices in square braces to specifically select
-an item in an array field.  To just get the email address of the first
-contributor in the list, you can do this:
-
-    npm.commands.view(["express", "contributors[0].email"], callback)
-
-Multiple fields may be specified, and will be printed one after another.
-For exampls, to get all the contributor names and email addresses, you
-can do this:
-
-    npm.commands.view(["express", "contributors.name", "contributors.email"], callback)
-
-"Person" fields are shown as a string if they would be shown as an
-object.  So, for example, this will show the list of npm contributors in
-the shortened string format.  (See `npm help json` for more on this.)
-
-    npm.commands.view(["npm", "contributors"], callback)
-
-If a version range is provided, then data will be printed for every
-matching version of the package.  This will show which version of jsdom
-was required by each matching version of yui3:
-
-    npm.commands.view(["yui3@>0.5.4", "dependencies.jsdom"], callback)
-
-## OUTPUT
-
-If only a single string field for a single version is output, then it
-will not be colorized or quoted, so as to enable piping the output to
-another command.
-
-If the version range matches multiple versions, than each printed value
-will be prefixed with the version it applies to.
-
-If multiple fields are requested, than each of them are prefixed with
-the field name.
-
-Console output can be disabled by setting the 'silent' parameter to true.
-
-## RETURN VALUE
-
-The data returned will be an object in this formation:
-
-    { <version>:
-      { <field>: <value>
-      , ... }
-    , ... }
-
-corresponding to the list of fields selected.
diff --git a/deps/npm/doc/api/npm-whoami.md b/deps/npm/doc/api/npm-whoami.md
deleted file mode 100644
index 598a1ab1a347e5..00000000000000
--- a/deps/npm/doc/api/npm-whoami.md
+++ /dev/null
@@ -1,15 +0,0 @@
-npm-whoami(3) -- Display npm username
-=====================================
-
-## SYNOPSIS
-
-    npm.commands.whoami(args, callback)
-
-## DESCRIPTION
-
-Print the `username` config to standard output.
-
-'args' is never used and callback is never called with data.
-'args' must be present or things will break.
-
-This function is not useful programmatically
diff --git a/deps/npm/doc/api/npm.md b/deps/npm/doc/api/npm.md
deleted file mode 100644
index 611292ec94688d..00000000000000
--- a/deps/npm/doc/api/npm.md
+++ /dev/null
@@ -1,115 +0,0 @@
-npm(3) -- javascript package manager
-====================================
-
-## SYNOPSIS
-
-    var npm = require("npm")
-    npm.load([configObject, ]function (er, npm) {
-      // use the npm object, now that it's loaded.
-
-      npm.config.set(key, val)
-      val = npm.config.get(key)
-
-      console.log("prefix = %s", npm.prefix)
-
-      npm.commands.install(["package"], cb)
-    })
-
-## VERSION
-
-@VERSION@
-
-## DESCRIPTION
-
-This is the API documentation for npm.
-To find documentation of the command line
-client, see `npm(1)`.
-
-Prior to using npm's commands, `npm.load()` must be called.  If you provide
-`configObject` as an object map of top-level configs, they override the values
-stored in the various config locations. In the npm command line client, this
-set of configs is parsed from the command line options. Additional
-configuration params are loaded from two configuration files. See
-`npm-config(1)`, `npm-config(7)`, and `npmrc(5)` for more information.
-
-After that, each of the functions are accessible in the
-commands object: `npm.commands.<cmd>`.  See `npm-index(7)` for a list of
-all possible commands.
-
-All commands on the command object take an **array** of positional argument
-**strings**. The last argument to any function is a callback. Some
-commands take other optional arguments.
-
-Configs cannot currently be set on a per function basis, as each call to
-npm.config.set will change the value for *all* npm commands in that process.
-
-To find API documentation for a specific command, run the `npm apihelp`
-command.
-
-## METHODS AND PROPERTIES
-
-* `npm.load(configs, cb)`
-
-    Load the configuration params, and call the `cb` function once the
-    globalconfig and userconfig files have been loaded as well, or on
-    nextTick if they've already been loaded.
-
-* `npm.config`
-
-    An object for accessing npm configuration parameters.
-
-    * `npm.config.get(key)`
-    * `npm.config.set(key, val)`
-    * `npm.config.del(key)`
-
-* `npm.dir` or `npm.root`
-
-    The `node_modules` directory where npm will operate.
-
-* `npm.prefix`
-
-    The prefix where npm is operating.  (Most often the current working
-    directory.)
-
-* `npm.cache`
-
-    The place where npm keeps JSON and tarballs it fetches from the
-    registry (or uploads to the registry).
-
-* `npm.tmp`
-
-    npm's temporary working directory.
-
-* `npm.deref`
-
-    Get the "real" name for a command that has either an alias or
-    abbreviation.
-
-## MAGIC
-
-For each of the methods in the `npm.commands` object, a method is added to the
-npm object, which takes a set of positional string arguments rather than an
-array and a callback.
-
-If the last argument is a callback, then it will use the supplied
-callback.  However, if no callback is provided, then it will print out
-the error or results.
-
-For example, this would work in a node repl:
-
-    > npm = require("npm")
-    > npm.load()  // wait a sec...
-    > npm.install("dnode", "express")
-
-Note that that *won't* work in a node program, since the `install`
-method will get called before the configuration load is completed.
-
-## ABBREVS
-
-In order to support `npm ins foo` instead of `npm install foo`, the
-`npm.commands` object has a set of abbreviations as well as the full
-method names.  Use the `npm.deref` method to find the real name.
-
-For example:
-
-    var cmd = npm.deref("unp") // cmd === "unpublish"
diff --git a/deps/npm/doc/cli/npm-bin.md b/deps/npm/doc/cli/npm-bin.md
index 33863b45714b8f..8e1abbee8f0fca 100644
--- a/deps/npm/doc/cli/npm-bin.md
+++ b/deps/npm/doc/cli/npm-bin.md
@@ -3,7 +3,7 @@ npm-bin(1) -- Display npm bin folder
 
 ## SYNOPSIS
 
-    npm bin
+    npm bin [--global]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-bugs.md b/deps/npm/doc/cli/npm-bugs.md
index 002d9f7556f31a..d2ad534fa3501a 100644
--- a/deps/npm/doc/cli/npm-bugs.md
+++ b/deps/npm/doc/cli/npm-bugs.md
@@ -3,8 +3,7 @@ npm-bugs(1) -- Bugs for a package in a web browser maybe
 
 ## SYNOPSIS
 
-    npm bugs <pkgname>
-    npm bugs (with no args in a package dir)
+    npm bugs [<pkgname>]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-build.md b/deps/npm/doc/cli/npm-build.md
index 4d3467a160dd0c..019f225850dc04 100644
--- a/deps/npm/doc/cli/npm-build.md
+++ b/deps/npm/doc/cli/npm-build.md
@@ -3,7 +3,7 @@ npm-build(1) -- Build a package
 
 ## SYNOPSIS
 
-    npm build <package-folder>
+    npm build [<package-folder>]
 
 * `<package-folder>`:
   A folder containing a `package.json` file in its root.
diff --git a/deps/npm/doc/cli/npm-completion.md b/deps/npm/doc/cli/npm-completion.md
index bec0f60867cf82..6c7f3935629e7b 100644
--- a/deps/npm/doc/cli/npm-completion.md
+++ b/deps/npm/doc/cli/npm-completion.md
@@ -3,7 +3,7 @@ npm-completion(1) -- Tab Completion for npm
 
 ## SYNOPSIS
 
-    . <(npm completion)
+    source <(npm completion)
 
 ## DESCRIPTION
 
@@ -12,7 +12,10 @@ Enables tab-completion in all npm commands.
 The synopsis above
 loads the completions into your current shell.  Adding it to
 your ~/.bashrc or ~/.zshrc will make the completions available
-everywhere.
+everywhere:
+
+    npm completion >> ~/.bashrc
+    npm completion >> ~/.zshrc
 
 You may of course also pipe the output of npm completion to a file
 such as `/usr/local/etc/bash_completion.d/npm` if you have a system
diff --git a/deps/npm/doc/cli/npm-config.md b/deps/npm/doc/cli/npm-config.md
index 1d978c9dea0b45..119840ef010f17 100644
--- a/deps/npm/doc/cli/npm-config.md
+++ b/deps/npm/doc/cli/npm-config.md
@@ -8,7 +8,6 @@ npm-config(1) -- Manage the npm configuration files
     npm config delete <key>
     npm config list
     npm config edit
-    npm c [set|get|delete|list]
     npm get <key>
     npm set <key> <value> [--global]
 
diff --git a/deps/npm/doc/cli/npm-dedupe.md b/deps/npm/doc/cli/npm-dedupe.md
index d3be01050c7f5b..c963dfa8e9ee45 100644
--- a/deps/npm/doc/cli/npm-dedupe.md
+++ b/deps/npm/doc/cli/npm-dedupe.md
@@ -31,25 +31,20 @@ Because of the hierarchical nature of node's module lookup, b and d
 will both get their dependency met by the single c package at the root
 level of the tree.
 
+The deduplication algorithm walks the tree, moving each dependency as far
+up in the tree as possible, even if duplicates are not found. This will
+result in both a flat and deduplicated tree.
+
 If a suitable version exists at the target location in the tree
 already, then it will be left untouched, but the other duplicates will
 be deleted.
 
-If no suitable version can be found, then a warning is printed, and
-nothing is done.
-
-If any arguments are supplied, then they are filters, and only the
-named packages will be touched.
-
-Note that this operation transforms the dependency tree, and may
-result in packages getting updated versions, perhaps from the npm
-registry.
+Arguments are ignored. Dedupe always acts on the entire tree.
 
-This feature is experimental, and may change in future versions.
+Modules
 
-The `--tag` argument will apply to all of the affected dependencies. If a
-tag with the given name exists, the tagged version is preferred over newer
-versions.
+Note that this operation transforms the dependency tree, but will never
+result in new modules being installed.
 
 ## SEE ALSO
 
diff --git a/deps/npm/doc/cli/npm-deprecate.md b/deps/npm/doc/cli/npm-deprecate.md
index e62579349526e7..1be6f491be2053 100644
--- a/deps/npm/doc/cli/npm-deprecate.md
+++ b/deps/npm/doc/cli/npm-deprecate.md
@@ -3,7 +3,7 @@ npm-deprecate(1) -- Deprecate a version of a package
 
 ## SYNOPSIS
 
-    npm deprecate <name>[@<version>] <message>
+    npm deprecate <pkg>[@<version>] <message>
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-docs.md b/deps/npm/doc/cli/npm-docs.md
index 5db3d9f7e94f8c..f5064c55e2829a 100644
--- a/deps/npm/doc/cli/npm-docs.md
+++ b/deps/npm/doc/cli/npm-docs.md
@@ -4,9 +4,9 @@ npm-docs(1) -- Docs for a package in a web browser maybe
 ## SYNOPSIS
 
     npm docs [<pkgname> [<pkgname> ...]]
-    npm docs (with no args in a package dir)
+    npm docs .
     npm home [<pkgname> [<pkgname> ...]]
-    npm home (with no args in a package dir)
+    npm home .
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-edit.md b/deps/npm/doc/cli/npm-edit.md
index 6a73317b819791..89ecfa877eeacd 100644
--- a/deps/npm/doc/cli/npm-edit.md
+++ b/deps/npm/doc/cli/npm-edit.md
@@ -3,7 +3,7 @@ npm-edit(1) -- Edit an installed package
 
 ## SYNOPSIS
 
-    npm edit <name>[@<version>]
+    npm edit <pkg>[@<version>]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-explore.md b/deps/npm/doc/cli/npm-explore.md
index fded5340870776..b66e08bfb935ca 100644
--- a/deps/npm/doc/cli/npm-explore.md
+++ b/deps/npm/doc/cli/npm-explore.md
@@ -3,7 +3,7 @@ npm-explore(1) -- Browse an installed package
 
 ## SYNOPSIS
 
-    npm explore <name> [ -- <cmd>]
+    npm explore <pkg> [ -- <cmd>]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-help-search.md b/deps/npm/doc/cli/npm-help-search.md
index 7bf7401ba0cb49..0a40f1c43b9167 100644
--- a/deps/npm/doc/cli/npm-help-search.md
+++ b/deps/npm/doc/cli/npm-help-search.md
@@ -3,7 +3,7 @@ npm-help-search(1) -- Search npm help documentation
 
 ## SYNOPSIS
 
-    npm help-search some search terms
+    npm help-search <text>
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-help.md b/deps/npm/doc/cli/npm-help.md
index 7991b1d38d2aaa..9fb96c9c2e6512 100644
--- a/deps/npm/doc/cli/npm-help.md
+++ b/deps/npm/doc/cli/npm-help.md
@@ -3,8 +3,7 @@ npm-help(1) -- Get help on npm
 
 ## SYNOPSIS
 
-    npm help <topic>
-    npm help some search terms
+    npm help <term> [<terms..>]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-init.md b/deps/npm/doc/cli/npm-init.md
index ec4c25bedaab44..e90f9ef04d91a2 100644
--- a/deps/npm/doc/cli/npm-init.md
+++ b/deps/npm/doc/cli/npm-init.md
@@ -3,7 +3,7 @@ npm-init(1) -- Interactively create a package.json file
 
 ## SYNOPSIS
 
-    npm init [-f|--force|-y|--yes]
+    npm init [--force|-f|--yes|-y]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-install.md b/deps/npm/doc/cli/npm-install.md
index be32f7b296ef01..07c61e174aa725 100644
--- a/deps/npm/doc/cli/npm-install.md
+++ b/deps/npm/doc/cli/npm-install.md
@@ -3,15 +3,17 @@ npm-install(1) -- Install a package
 
 ## SYNOPSIS
 
-    npm install (with no args in a package dir)
+    npm install (with no args, in package dir)
+    npm install [<@scope>/]<name>
+    npm install [<@scope>/]<name>@<tag>
+    npm install [<@scope>/]<name>@<version>
+    npm install [<@scope>/]<name>@<version range>
     npm install <tarball file>
     npm install <tarball url>
     npm install <folder>
-    npm install [@<scope>/]<name> [--save|--save-dev|--save-optional] [--save-exact]
-    npm install [@<scope>/]<name>@<tag>
-    npm install [@<scope>/]<name>@<version>
-    npm install [@<scope>/]<name>@<version range>
-    npm i (with any of the previous argument usage)
+
+    alias: npm i
+    common options: [--save|--save-dev|--save-optional] [--save-exact] [--dry-run]
 
 ## DESCRIPTION
 
@@ -27,7 +29,7 @@ A `package` is:
 * d) a `<name>@<version>` that is published on the registry (see `npm-registry(7)`) with (c)
 * e) a `<name>@<tag>` that points to (d)
 * f) a `<name>` that has a "latest" tag satisfying (e)
-* g) a `<git remote url>` that resolves to (b)
+* g) a `<git remote url>` that resolves to (a)
 
 Even if you never publish your package, you can still get a lot of
 benefits of using npm if you just want to write a node program (a), and
@@ -71,7 +73,7 @@ after packing it up into a tarball (b).
 
           npm install https://github.com/indexzero/forever/tarball/v0.5.6
 
-* `npm install [@<scope>/]<name> [--save|--save-dev|--save-optional]`:
+* `npm install [<@scope>/]<name> [--save|--save-dev|--save-optional]`:
 
     Do a `<name>@<tag>` install, where `<tag>` is the "tag" config. (See
     `npm-config(7)`.)
@@ -99,6 +101,9 @@ after packing it up into a tarball (b).
       exact version rather than using npm's default semver range
       operator.
 
+    Further, if you have an `npm-shrinkwrap.json` then it will be updated as
+    well.
+
     `<scope>` is optional. The package will be downloaded from the registry
     associated with the specified scope. If no registry is associated with
     the given scope the default registry is assumed. See `npm-scope(7)`.
@@ -121,7 +126,7 @@ after packing it up into a tarball (b).
     working directory, then it will try to install that, and only try to
     fetch the package by name if it is not valid.
 
-* `npm install [@<scope>/]<name>@<tag>`:
+* `npm install [<@scope>/]<name>@<tag>`:
 
     Install the version of the package that is referenced by the specified tag.
     If the tag does not exist in the registry data for that package, then this
@@ -132,7 +137,7 @@ after packing it up into a tarball (b).
           npm install sax@latest
           npm install @myorg/mypackage@latest
 
-* `npm install [@<scope>/]<name>@<version>`:
+* `npm install [<@scope>/]<name>@<version>`:
 
     Install the specified version of the package.  This will fail if the
     version has not been published to the registry.
@@ -142,7 +147,7 @@ after packing it up into a tarball (b).
           npm install sax@0.1.1
           npm install @myorg/privatepackage@1.5.0
 
-* `npm install [@<scope>/]<name>@<version range>`:
+* `npm install [<@scope>/]<name>@<version range>`:
 
     Install a version of the package matching the specified version range.  This
     will follow the same rules for resolving dependencies described in `package.json(5)`.
@@ -157,10 +162,10 @@ after packing it up into a tarball (b).
 
 * `npm install <git remote url>`:
 
-    Install a package by cloning a git remote url.  The format of the git
-    url is:
+    Installs the package from the hosted git provider, cloning it with
+    `git`. First it tries via the https (git with github) and if that fails, via ssh.
 
-          <protocol>://[<user>[:<password>]@]<hostname>[:<port>][:/]<path>[#<commit-ish>]
+          <protocol>://[<user>[:<password>]@]<hostname>[:<port>][:][/]<path>[#<commit-ish>]
 
     `<protocol>` is one of `git`, `git+ssh`, `git+http`, or
     `git+https`.  If no `<commit-ish>` is specified, then `master` is
@@ -241,6 +246,9 @@ The `--tag` argument will apply to all of the specified install targets. If a
 tag with the given name exists, the tagged version is preferred over newer
 versions.
 
+The `--dry-run` argument will report in the usual way what the install would
+have done without actually installing anything.
+
 The `--force` argument will force npm to fetch remote resources even if a
 local copy exists on disk.
 
@@ -264,6 +272,9 @@ shrinkwrap file and use the package.json instead.
 The `--nodedir=/path/to/node/source` argument will allow npm to find the
 node source code so that npm can compile native modules.
 
+The `--only={prod[uction]|dev[elopment]}` argument will cause either only
+`devDependencies` or only non-`devDependencies` to be installed.
+
 See `npm-config(7)`.  Many of the configuration params have some
 effect on installation, since that's most of what npm does.
 
@@ -271,26 +282,39 @@ effect on installation, since that's most of what npm does.
 
 To install a package, npm uses the following algorithm:
 
-    install(where, what, family, ancestors)
-    fetch what, unpack to <where>/node_modules/<what>
-    for each dep in what.dependencies
-      resolve dep to precise version
-    for each dep@version in what.dependencies
-        not in <where>/node_modules/<what>/node_modules/*
-        and not in <family>
-      add precise version deps to <family>
-      install(<where>/node_modules/<what>, dep, family)
+    load the existing node_modules tree from disk
+    clone the tree
+    fetch the package.json and assorted metadata and add it to the clone
+    walk the clone and add any missing dependencies
+      dependencies will be added as close to the top as is possible
+      without breaking any other modules
+    compare the original tree with the cloned tree and make a list of
+    actions to take to convert one to the other
+    execute all of the actions, deepest first
+      kinds of actions are install, update, remove and move
 
 For this `package{dep}` structure: `A{B,C}, B{C}, C{D}`,
 this algorithm produces:
 
     A
     +-- B
-    `-- C
-        `-- D
+    +-- C
+    +-- D
 
 That is, the dependency from B to C is satisfied by the fact that A
-already caused C to be installed at a higher level.
+already caused C to be installed at a higher level. D is still installed
+at the top level because nothing conflicts with it.
+
+For `A{B,C}, B{C,D@1}, C{D@2}`, this algorithm produces:
+
+    A
+    +-- B
+    +-- C
+       `-- D@2
+    +-- D@1
+
+Because B's D@1 will be installed in the top leve, C now has to install D@2
+privately for itself.
 
 See npm-folders(5) for a more detailed description of the specific
 folder structures that npm creates.
diff --git a/deps/npm/doc/cli/npm-link.md b/deps/npm/doc/cli/npm-link.md
index b6d0c143ad4c15..344fcbf1a742bb 100644
--- a/deps/npm/doc/cli/npm-link.md
+++ b/deps/npm/doc/cli/npm-link.md
@@ -3,9 +3,10 @@ npm-link(1) -- Symlink a package folder
 
 ## SYNOPSIS
 
-    npm link (in package folder)
-    npm link [@<scope>/]<pkgname>
-    npm ln (with any of the previous argument usage)
+    npm link (in package dir)
+    npm link [<@scope>/]<pkg>[@<version>]
+
+    alias: npm ln
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-logout.md b/deps/npm/doc/cli/npm-logout.md
index 867953c02449bc..411ea67e6ca10e 100644
--- a/deps/npm/doc/cli/npm-logout.md
+++ b/deps/npm/doc/cli/npm-logout.md
@@ -3,7 +3,7 @@ npm-logout(1) -- Log out of the registry
 
 ## SYNOPSIS
 
-    npm logout [--registry=url] [--scope=@orgname]
+    npm logout [--registry=<url>] [--scope=<@scope>]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-ls.md b/deps/npm/doc/cli/npm-ls.md
index 318cdd8fd64997..70835189aae582 100644
--- a/deps/npm/doc/cli/npm-ls.md
+++ b/deps/npm/doc/cli/npm-ls.md
@@ -3,10 +3,9 @@ npm-ls(1) -- List installed packages
 
 ## SYNOPSIS
 
-    npm list [[@<scope>/]<pkg> ...]
-    npm ls [[@<scope>/]<pkg> ...]
-    npm la [[@<scope>/]<pkg> ...]
-    npm ll [[@<scope>/]<pkg> ...]
+    npm ls [[<@scope>/]<pkg> ...]
+
+    aliases: list, la, ll
 
 ## DESCRIPTION
 
@@ -28,6 +27,9 @@ If a project specifies git urls for dependencies these are shown
 in parentheses after the name@version to make it easier for users to
 recognize potential forks of a project.
 
+The tree shown is the logical dependency tree, based on package
+dependencies, not the physical layout of your node_modules folder.
+
 When run as `ll` or `la`, it shows extended information by default.
 
 ## CONFIGURATION
@@ -81,6 +83,14 @@ Display only the dependency tree for packages in `dependencies`.
 
 Display only the dependency tree for packages in `devDependencies`.
 
+### only
+
+* Type: String
+
+When "dev" or "development", is an alias to `dev`.
+
+When "prod" or "production", is an alias to `production`.`
+
 ## SEE ALSO
 
 * npm-config(1)
diff --git a/deps/npm/doc/cli/npm-outdated.md b/deps/npm/doc/cli/npm-outdated.md
index aa2a7d5dd16e02..bdc9b9b8ed7982 100644
--- a/deps/npm/doc/cli/npm-outdated.md
+++ b/deps/npm/doc/cli/npm-outdated.md
@@ -3,7 +3,7 @@ npm-outdated(1) -- Check for outdated packages
 
 ## SYNOPSIS
 
-    npm outdated [<name> [<name> ...]]
+    npm outdated [[<@scope>/]<pkg> ...]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-owner.md b/deps/npm/doc/cli/npm-owner.md
index b400f76378f531..1047a09bb8a053 100644
--- a/deps/npm/doc/cli/npm-owner.md
+++ b/deps/npm/doc/cli/npm-owner.md
@@ -3,9 +3,9 @@ npm-owner(1) -- Manage package owners
 
 ## SYNOPSIS
 
-    npm owner ls <package name>
-    npm owner add <user> <package name>
-    npm owner rm <user> <package name>
+    npm owner add <user> [<@scope>/]<pkg>
+    npm owner rm <user> [<@scope>/]<pkg>
+    npm owner ls [<@scope>/]<pkg>
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-pack.md b/deps/npm/doc/cli/npm-pack.md
index 42bc1564be7157..f44f5e3620c2af 100644
--- a/deps/npm/doc/cli/npm-pack.md
+++ b/deps/npm/doc/cli/npm-pack.md
@@ -3,15 +3,15 @@ npm-pack(1) -- Create a tarball from a package
 
 ## SYNOPSIS
 
-    npm pack [<pkg> [<pkg> ...]]
+    npm pack [[<@scope>/]<pkg>...]
 
 ## DESCRIPTION
 
 For anything that's installable (that is, a package folder, tarball,
-tarball url, name@tag, name@version, or name), this command will fetch
-it to the cache, and then copy the tarball to the current working
-directory as `<name>-<version>.tgz`, and then write the filenames out to
-stdout.
+tarball url, name@tag, name@version, name, or scoped name), this
+command will fetch it to the cache, and then copy the tarball to the
+current working directory as `<name>-<version>.tgz`, and then write
+the filenames out to stdout.
 
 If the same package is specified multiple times, then the file will be
 overwritten the second time.
diff --git a/deps/npm/doc/cli/npm-prune.md b/deps/npm/doc/cli/npm-prune.md
index 846a04240e598d..9089122117ab40 100644
--- a/deps/npm/doc/cli/npm-prune.md
+++ b/deps/npm/doc/cli/npm-prune.md
@@ -3,8 +3,7 @@ npm-prune(1) -- Remove extraneous packages
 
 ## SYNOPSIS
 
-    npm prune [<name> [<name ...]]
-    npm prune [<name> [<name ...]] [--production]
+    npm prune [[<@scope>/]<pkg>...] [--production]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-publish.md b/deps/npm/doc/cli/npm-publish.md
index 8c447d0df9c4d5..8e4da32cd5f505 100644
--- a/deps/npm/doc/cli/npm-publish.md
+++ b/deps/npm/doc/cli/npm-publish.md
@@ -4,8 +4,10 @@ npm-publish(1) -- Publish a package
 
 ## SYNOPSIS
 
-    npm publish <tarball> [--tag <tag>] [--access <public|restricted>]
-    npm publish <folder> [--tag <tag>] [--access <public|restricted>]
+    npm publish [<tarball>|<folder>] [--tag <tag>] [--access <public|restricted>]
+
+    Publishes '.' if no argument supplied
+    Sets tag 'latest' if no --tag specified
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-rebuild.md b/deps/npm/doc/cli/npm-rebuild.md
index 7287208681fd08..437737d9f4b563 100644
--- a/deps/npm/doc/cli/npm-rebuild.md
+++ b/deps/npm/doc/cli/npm-rebuild.md
@@ -3,11 +3,9 @@ npm-rebuild(1) -- Rebuild a package
 
 ## SYNOPSIS
 
-    npm rebuild [<name> [<name> ...]]
-    npm rb [<name> [<name> ...]]
+    npm rebuild [[<@scope>/<name>]...]
 
-* `<name>`:
-  The package to rebuild
+    alias: npm rb
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-repo.md b/deps/npm/doc/cli/npm-repo.md
index 6bc6f3b3758f43..523e135e8cc31f 100644
--- a/deps/npm/doc/cli/npm-repo.md
+++ b/deps/npm/doc/cli/npm-repo.md
@@ -3,8 +3,7 @@ npm-repo(1) -- Open package repository page in the browser
 
 ## SYNOPSIS
 
-    npm repo <pkgname>
-    npm repo (with no args in a package dir)
+    npm repo [<pkg>]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-rm.md b/deps/npm/doc/cli/npm-rm.md
deleted file mode 100644
index 6691265fff9394..00000000000000
--- a/deps/npm/doc/cli/npm-rm.md
+++ /dev/null
@@ -1,23 +0,0 @@
-npm-rm(1) -- Remove a package
-=============================
-
-## SYNOPSIS
-
-    npm rm <name>
-    npm r <name>
-    npm uninstall <name>
-    npm un <name>
-
-## DESCRIPTION
-
-This uninstalls a package, completely removing everything npm installed
-on its behalf.
-
-## SEE ALSO
-
-* npm-prune(1)
-* npm-install(1)
-* npm-folders(5)
-* npm-config(1)
-* npm-config(7)
-* npmrc(5)
diff --git a/deps/npm/doc/cli/npm-root.md b/deps/npm/doc/cli/npm-root.md
index ca99e1206b2789..a1d5bf8629913b 100644
--- a/deps/npm/doc/cli/npm-root.md
+++ b/deps/npm/doc/cli/npm-root.md
@@ -3,7 +3,7 @@ npm-root(1) -- Display npm root
 
 ## SYNOPSIS
 
-    npm root
+    npm root [-g]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-run-script.md b/deps/npm/doc/cli/npm-run-script.md
index 895e382f2faa18..1e956adcc0188e 100644
--- a/deps/npm/doc/cli/npm-run-script.md
+++ b/deps/npm/doc/cli/npm-run-script.md
@@ -3,8 +3,9 @@ npm-run-script(1) -- Run arbitrary package scripts
 
 ## SYNOPSIS
 
-    npm run-script [command] [-- <args>]
-    npm run [command] [-- <args>]
+    npm run-script <command> [-- <args>...]
+
+    alias: npm run
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-search.md b/deps/npm/doc/cli/npm-search.md
index 4757ad3202941e..e7e0defa07a879 100644
--- a/deps/npm/doc/cli/npm-search.md
+++ b/deps/npm/doc/cli/npm-search.md
@@ -4,8 +4,8 @@ npm-search(1) -- Search for packages
 ## SYNOPSIS
 
     npm search [--long] [search terms ...]
-    npm s [search terms ...]
-    npm se [search terms ...]
+
+    aliases: s, se
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-shrinkwrap.md b/deps/npm/doc/cli/npm-shrinkwrap.md
index ca9cb257b9d351..b4548ca7c05aab 100644
--- a/deps/npm/doc/cli/npm-shrinkwrap.md
+++ b/deps/npm/doc/cli/npm-shrinkwrap.md
@@ -82,29 +82,32 @@ This generates `npm-shrinkwrap.json`, which will look something like this:
 
     {
       "name": "A",
-      "version": "0.1.0",
+      "version": "1.1.0",
       "dependencies": {
         "B": {
-          "version": "0.0.1",
+          "version": "1.0.1",
+          "from": "B@^1.0.0",
+          "resolved": "https://registry.npmjs.org/B/-/B-1.0.1.tgz",
           "dependencies": {
             "C": {
-              "version": "0.0.1"
+              "version": "1.0.1",
+              "from": "org/C#v1.0.1",
+              "resolved": "git://github.com/org/C.git#5c380ae319fc4efe9e7f2d9c78b0faa588fd99b4"
             }
           }
         }
       }
     }
 
-The shrinkwrap command has locked down the dependencies based on
-what's currently installed in node_modules.  When `npm install`
-installs a package with an `npm-shrinkwrap.json` in the package
-root, the shrinkwrap file (rather than `package.json` files) completely
-drives the installation of that package and all of its dependencies
-(recursively).  So now the author publishes A@0.1.0, and subsequent
-installs of this package will use B@0.0.1 and C@0.0.1, regardless the
-dependencies and versions listed in A's, B's, and C's `package.json`
-files.
+The shrinkwrap command has locked down the dependencies based on what's
+currently installed in `node_modules`.  The installation behavior is changed to:
+
+1. The module tree described by the shrinkwrap is reproduced. This means
+reproducing the structure described in the file, using the specific files
+referenced in "resolved" if available, falling back to normal package
+resolution using "version" if one isn't.
 
+2. The tree is walked and any missing dependencies are installed in the usual fasion.
 
 ### Using shrinkwrapped packages
 
@@ -126,15 +129,14 @@ To add or update a dependency in a shrinkwrapped package:
 
 1. Run `npm install` in the package root to install the current
    versions of all dependencies.
-2. Add or update dependencies. `npm install` each new or updated
-   package individually and then update `package.json`.  Note that they
-   must be explicitly named in order to be installed: running `npm
-   install` with no arguments will merely reproduce the existing
+2. Add or update dependencies. `npm install --save` each new or updated
+   package individually to update the `package.json` and the shrinkwrap.
+   Note that they must be explicitly named in order to be installed: running
+   `npm install` with no arguments will merely reproduce the existing
    shrinkwrap.
 3. Validate that the package works as expected with the new
    dependencies.
-4. Run `npm shrinkwrap`, commit the new `npm-shrinkwrap.json`, and
-   publish your package.
+4. Commit the new `npm-shrinkwrap.json`, and publish your package.
 
 You can use npm-outdated(1) to view dependencies with newer versions
 available.
diff --git a/deps/npm/doc/cli/npm-star.md b/deps/npm/doc/cli/npm-star.md
index 5c076b3c3c1e7b..87d90b560c2027 100644
--- a/deps/npm/doc/cli/npm-star.md
+++ b/deps/npm/doc/cli/npm-star.md
@@ -3,8 +3,8 @@ npm-star(1) -- Mark your favorite packages
 
 ## SYNOPSIS
 
-    npm star <pkgname> [<pkg>, ...]
-    npm unstar <pkgname> [<pkg>, ...]
+    npm star [<pkg>...]
+    npm unstar [<pkg>...]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-stars.md b/deps/npm/doc/cli/npm-stars.md
index 7c28f5b2a5e020..1e225be29f3eda 100644
--- a/deps/npm/doc/cli/npm-stars.md
+++ b/deps/npm/doc/cli/npm-stars.md
@@ -3,8 +3,7 @@ npm-stars(1) -- View packages marked as favorites
 
 ## SYNOPSIS
 
-    npm stars
-    npm stars [username]
+    npm stars [<user>]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-tag.md b/deps/npm/doc/cli/npm-tag.md
index d7118d4e581a23..357c0862f267e3 100644
--- a/deps/npm/doc/cli/npm-tag.md
+++ b/deps/npm/doc/cli/npm-tag.md
@@ -3,7 +3,8 @@ npm-tag(1) -- Tag a published version
 
 ## SYNOPSIS
 
-    npm tag <name>@<version> [<tag>]
+    [DEPRECATED] npm tag <name>@<version> [<tag>]
+    See `dist-tag`
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-uninstall.md b/deps/npm/doc/cli/npm-uninstall.md
index bfa667c3e26eab..73e39a5fb0c258 100644
--- a/deps/npm/doc/cli/npm-uninstall.md
+++ b/deps/npm/doc/cli/npm-uninstall.md
@@ -3,8 +3,9 @@ npm-rm(1) -- Remove a package
 
 ## SYNOPSIS
 
-    npm uninstall [@<scope>/]<package> [--save|--save-dev|--save-optional]
-    npm rm (with any of the previous argument usage)
+    npm uninstall [<@scope>/]<pkg>[@<version>]... [--save|--save-dev|--save-optional]
+
+    aliases: remove, rm, r, un, unlink
 
 ## DESCRIPTION
 
@@ -27,6 +28,9 @@ the package version in your main package.json:
 
 * `--save-optional`: Package will be removed from your `optionalDependencies`.
 
+Further, if you have an `npm-shrinkwrap.json` then it will be updated as
+well.
+
 Scope is optional and follows the usual rules for `npm-scope(7)`.
 
 Examples:
diff --git a/deps/npm/doc/cli/npm-unpublish.md b/deps/npm/doc/cli/npm-unpublish.md
index 1d5fe928780378..0a5731ee1dbc24 100644
--- a/deps/npm/doc/cli/npm-unpublish.md
+++ b/deps/npm/doc/cli/npm-unpublish.md
@@ -3,7 +3,7 @@ npm-unpublish(1) -- Remove a package from the registry
 
 ## SYNOPSIS
 
-    npm unpublish [@<scope>/]<name>[@<version>]
+    npm unpublish [<@scope>/]<pkg>[@<version>]
 
 ## WARNING
 
diff --git a/deps/npm/doc/cli/npm-update.md b/deps/npm/doc/cli/npm-update.md
index ce31c28910ff08..30a0702d7dd7f0 100644
--- a/deps/npm/doc/cli/npm-update.md
+++ b/deps/npm/doc/cli/npm-update.md
@@ -3,7 +3,7 @@ npm-update(1) -- Update a package
 
 ## SYNOPSIS
 
-    npm update [-g] [<name> [<name> ...]]
+    npm update [-g] [<pkg>...]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-version.md b/deps/npm/doc/cli/npm-version.md
index 0a00e78cd7ccb9..0527a4d71352a1 100644
--- a/deps/npm/doc/cli/npm-version.md
+++ b/deps/npm/doc/cli/npm-version.md
@@ -5,6 +5,10 @@ npm-version(1) -- Bump a package version
 
     npm version [<newversion> | major | minor | patch | premajor | preminor | prepatch | prerelease]
 
+    'npm -v' or 'npm --version' to print npm version
+    'npm view <pkg> version' to view a package's published version
+    'npm ls' to inspect current package/dependency versions
+
 ## DESCRIPTION
 
 Run this in a package directory to bump the version and write the new
diff --git a/deps/npm/doc/cli/npm-view.md b/deps/npm/doc/cli/npm-view.md
index 683ed09f46f651..2330c016ec36aa 100644
--- a/deps/npm/doc/cli/npm-view.md
+++ b/deps/npm/doc/cli/npm-view.md
@@ -3,8 +3,9 @@ npm-view(1) -- View registry info
 
 ## SYNOPSIS
 
-    npm view [@<scope>/]<name>[@<version>] [<field>[.<subfield>]...]
-    npm v [@<scope>/]<name>[@<version>] [<field>[.<subfield>]...]
+    npm view [<@scope>/]<name>[@<version>] [<field>[.<subfield>]...]
+
+    aliases: info, show, v
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-whoami.md b/deps/npm/doc/cli/npm-whoami.md
index 3ff8837ff49d92..70b6a48f44671c 100644
--- a/deps/npm/doc/cli/npm-whoami.md
+++ b/deps/npm/doc/cli/npm-whoami.md
@@ -3,7 +3,7 @@ npm-whoami(1) -- Display npm username
 
 ## SYNOPSIS
 
-    npm whoami
+    npm whoami [--registry <registry>]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/files/package.json.md b/deps/npm/doc/files/package.json.md
index 91064b58b96159..82e174677d8c79 100644
--- a/deps/npm/doc/files/package.json.md
+++ b/deps/npm/doc/files/package.json.md
@@ -626,17 +626,10 @@ field is advisory only.
 
 ## engineStrict
 
-**NOTE: This feature is deprecated and will be removed in npm 3.0.0.**
+**This feature was deprecated with npm 3.0.0**
 
-If you are sure that your module will *definitely not* run properly on
-versions of Node/npm other than those specified in the `engines` object,
-then you can set `"engineStrict": true` in your package.json file.
-This will override the user's `engine-strict` config setting.
-
-Please do not do this unless you are really very very sure.  If your
-engines object is something overly restrictive, you can quite easily and
-inadvertently lock yourself into obscurity and prevent your users from
-updating to new versions of Node.  Consider this choice carefully.
+Prior to npm 3.0.0, this feature was used to treat this package as if the
+user had set `engine-strict`.
 
 ## os
 
diff --git a/deps/npm/doc/misc/npm-config.md b/deps/npm/doc/misc/npm-config.md
index 4b9d32ba3338cc..a28dd61d128568 100644
--- a/deps/npm/doc/misc/npm-config.md
+++ b/deps/npm/doc/misc/npm-config.md
@@ -28,7 +28,7 @@ The four relevant files are:
 
 * per-project config file (/path/to/my/project/.npmrc)
 * per-user config file (~/.npmrc)
-* global config file ($PREFIX/npmrc)
+* global config file ($PREFIX/etc/npmrc)
 * npm builtin config file (/path/to/npm/npmrc)
 
 See npmrc(5) for more details.
@@ -124,6 +124,14 @@ you want your scoped package to be publicly viewable (and installable) set
 Force npm to always require authentication when accessing the registry,
 even for `GET` requests.
 
+### also
+
+* Default: null
+* Type: String
+
+When "dev" or "development" and running local `npm shrinkwrap`,
+`npm outdated`, or `npm update`, is an alias for `--dev`.
+
 ### bin-links
 
 * Default: `true`
@@ -268,6 +276,17 @@ Install `dev-dependencies` along with packages.
 Note that `dev-dependencies` are also installed if the `npat` flag is
 set.
 
+### dry-run
+
+* Default: false
+* Type: Boolean
+
+Indicates that you don't want npm to make any changes and that it should
+only report what it would have done.  This can be passed into any of the
+commands that modify your local installation, eg, `install`, `update`,
+`dedupe`, `uninstall`.  This is NOT currently honored by network related
+commands, eg `dist-tags`, `owner`, `publish`, etc.
+
 ### editor
 
 * Default: `EDITOR` environment variable if set, or `"vi"` on Posix,
@@ -561,6 +580,24 @@ Run tests on installation.
 A node module to `require()` when npm loads.  Useful for programmatic
 usage.
 
+### only
+
+* Default: null
+* Type: String
+
+When "dev" or "development" and running local `npm install` without any
+arguments, only devDependencies (and their dependencies) are installed.
+
+When "dev" or "development" and running local `npm ls`, `npm outdated`, or
+`npm update`, is an alias for `--dev`.
+
+When "prod" or "production" and running local `npm install` without any
+arguments, only non-devDependencies (and their dependencies) are
+installed.
+
+When "prod" or "production" and running local `npm ls`, `npm outdated`, or
+`npm update`, is an alias for `--production`.
+
 ### optional
 
 * Default: true
@@ -597,6 +634,16 @@ Set to true to run in "production" mode.
    local `npm install` without any arguments.
 2. Set the NODE_ENV="production" for lifecycle scripts.
 
+### progress
+
+* Default: true
+* Type: Boolean
+
+When set to `true`, npm will display a progress bar during time intensive
+operations, if `process.stderr` is a TTY.
+
+Set to `false` to suppress the progress bar.
+
 ### proprietary-attribs
 
 * Default: true
@@ -772,17 +819,6 @@ using `-s` to add a signature.
 Note that git requires you to have set up GPG keys in your git configs
 for this to work properly.
 
-### spin
-
-* Default: true
-* Type: Boolean or `"always"`
-
-When set to `true`, npm will display an ascii spinner while it is doing
-things, if `process.stderr` is a TTY.
-
-Set to `false` to suppress the spinner, or set to `always` to output
-the spinner even for non-TTY outputs.
-
 ### strict-ssl
 
 * Default: true
@@ -827,7 +863,7 @@ on success, but left behind on failure for forensic purposes.
 
 ### unicode
 
-* Default: true
+* Default: true on windows and mac/unix systems with a unicode locale
 * Type: Boolean
 
 When set to true, npm uses unicode characters in the tree output.  When
diff --git a/deps/npm/doc/misc/npm-index.md b/deps/npm/doc/misc/npm-index.md
index 4efcb92af35698..4af01fd6890510 100644
--- a/deps/npm/doc/misc/npm-index.md
+++ b/deps/npm/doc/misc/npm-index.md
@@ -141,10 +141,6 @@ Open package repository page in the browser
 
 Restart a package
 
-### npm-rm(1)
-
-Remove a package
-
 ### npm-root(1)
 
 Display npm root
@@ -217,166 +213,6 @@ Display npm username
 
 Using npm in your Node programs
 
-### npm(3)
-
-javascript package manager
-
-### npm-bin(3)
-
-Display npm bin folder
-
-### npm-bugs(3)
-
-Bugs for a package in a web browser maybe
-
-### npm-cache(3)
-
-manage the npm cache programmatically
-
-### npm-commands(3)
-
-npm commands
-
-### npm-config(3)
-
-Manage the npm configuration files
-
-### npm-deprecate(3)
-
-Deprecate a version of a package
-
-### npm-docs(3)
-
-Docs for a package in a web browser maybe
-
-### npm-edit(3)
-
-Edit an installed package
-
-### npm-explore(3)
-
-Browse an installed package
-
-### npm-help-search(3)
-
-Search the help pages
-
-### npm-init(3)
-
-Interactively create a package.json file
-
-### npm-install(3)
-
-install a package programmatically
-
-### npm-link(3)
-
-Symlink a package folder
-
-### npm-load(3)
-
-Load config settings
-
-### npm-ls(3)
-
-List installed packages
-
-### npm-outdated(3)
-
-Check for outdated packages
-
-### npm-owner(3)
-
-Manage package owners
-
-### npm-pack(3)
-
-Create a tarball from a package
-
-### npm-ping(3)
-
-Ping npm registry
-
-### npm-prefix(3)
-
-Display prefix
-
-### npm-prune(3)
-
-Remove extraneous packages
-
-### npm-publish(3)
-
-Publish a package
-
-### npm-rebuild(3)
-
-Rebuild a package
-
-### npm-repo(3)
-
-Open package repository page in the browser
-
-### npm-restart(3)
-
-Restart a package
-
-### npm-root(3)
-
-Display npm root
-
-### npm-run-script(3)
-
-Run arbitrary package scripts
-
-### npm-search(3)
-
-Search for packages
-
-### npm-shrinkwrap(3)
-
-programmatically generate package shrinkwrap file
-
-### npm-start(3)
-
-Start a package
-
-### npm-stop(3)
-
-Stop a package
-
-### npm-tag(3)
-
-Tag a published version
-
-### npm-test(3)
-
-Test a package
-
-### npm-uninstall(3)
-
-uninstall a package programmatically
-
-### npm-unpublish(3)
-
-Remove a package from the registry
-
-### npm-update(3)
-
-Update a package
-
-### npm-version(3)
-
-Bump a package version
-
-### npm-view(3)
-
-View registry info
-
-### npm-whoami(3)
-
-Display npm username
-
 ## Files
 
 File system structures npm uses
@@ -421,10 +257,6 @@ Frequently Asked Questions
 
 Index of all npm documentation
 
-### npm-orgs(7)
-
-Working with Teams & Orgs
-
 ### npm-registry(7)
 
 The JavaScript Package Registry
diff --git a/deps/npm/doc/misc/npm-orgs.md b/deps/npm/doc/misc/npm-orgs.md
deleted file mode 100644
index 1f9977eaddf4be..00000000000000
--- a/deps/npm/doc/misc/npm-orgs.md
+++ /dev/null
@@ -1,90 +0,0 @@
-npm-orgs(7) -- Working with Teams & Orgs
-========================================
-
-## DESCRIPTION
-
-There are three levels of org users:
-
-1. Super admin, controls billing & adding people to the org.
-2. Team admin, manages team membership & package access.
-3. Developer, works on packages they are given access to.
-
-The super admin is the only person who can add users to the org because it impacts the monthly bill. The super admin will use the website to manage membership. Every org has a `developers` team that all users are automatically added to.
-
-The team admin is the person who manages team creation, team membership, and package access for teams. The team admin grants package access to teams, not individuals.
-
-The developer will be able to access packages based on the teams they are on. Access is either read-write or read-only.
-
-There are two main commands:
-
-1. `npm team` see npm-access(1) for more details
-2. `npm access` see npm-team(1) for more details
-
-## Team Admins create teams
-
-* Check who you’ve added to your org:
-
-```
-npm team ls <org>:developers
-```
-
-* Each org is automatically given a `developers` team, so you can see the whole list of team members in your org. This team automatically gets read-write access to all packages, but you can change that with the `access` command.
-
-* Create a new team:
-
-```
-npm team create <org:team>
-```
-
-* Add members to that team:
-
-```
-npm team add <org:team> <user>
-```
-
-## Publish a package and adjust package access
-
-* In package directory, run
-
-```
-npm init --scope=<org>
-```
-to scope it for your org & publish as usual
-
-* Grant access:
-
-```
-npm access grant <read-only|read-write> <org:team> [<package>]
-```
-
-* Revoke access:
-
-```
-npm access revoke <org:team> [<package>]
-```
-
-## Monitor your package access
-
-* See what org packages a team member can access:
-
-```
-npm access ls-packages <org> <user>
-```
-
-* See packages available to a specific team:
-
-```
-npm access ls-packages <org:team>
-```
-
-* Check which teams are collaborating on a package:
-
-```
-npm access ls-collaborators <pkg>
-```
-
-## SEE ALSO
-
-* npm-team(1)
-* npm-access(1)
-* npm-scope(7)
diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html
index 3ff8701c178278..537f3c06598d98 100644
--- a/deps/npm/html/doc/README.html
+++ b/deps/npm/html/doc/README.html
@@ -140,7 +140,7 @@ <h2 id="legal-stuff">Legal Stuff</h2>
 <p>If you have a complaint about a package in the public npm registry,
 and cannot <a href="https://docs.npmjs.com/misc/disputes">resolve it with the package
 owner</a>, please email
-<a href="&#x6d;&#x61;&#105;&#108;&#116;&#111;&#58;&#115;&#x75;&#x70;&#112;&#111;&#114;&#116;&#x40;&#x6e;&#x70;&#109;&#x6a;&#115;&#x2e;&#99;&#111;&#x6d;">&#115;&#x75;&#x70;&#112;&#111;&#114;&#116;&#x40;&#x6e;&#x70;&#109;&#x6a;&#115;&#x2e;&#99;&#111;&#x6d;</a> and explain the situation.</p>
+<a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#111;&#x3a;&#x73;&#117;&#x70;&#x70;&#111;&#x72;&#x74;&#64;&#x6e;&#x70;&#x6d;&#x6a;&#x73;&#x2e;&#99;&#x6f;&#109;">&#x73;&#117;&#x70;&#x70;&#111;&#x72;&#x74;&#64;&#x6e;&#x70;&#x6d;&#x6a;&#x73;&#x2e;&#99;&#x6f;&#109;</a> and explain the situation.</p>
 <p>Any data published to The npm Registry (including user account
 information) may be removed or modified at the sole discretion of the
 npm server administrators.</p>
@@ -183,5 +183,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@2.14.7</p>
+<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/api/npm-bin.html b/deps/npm/html/doc/api/npm-bin.html
index f7dbcb1d6699e2..1fb691d340844e 100644
--- a/deps/npm/html/doc/api/npm-bin.html
+++ b/deps/npm/html/doc/api/npm-bin.html
@@ -28,5 +28,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bin &mdash; npm@2.14.7</p>
+<p id="footer">npm-bin &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-bugs.html b/deps/npm/html/doc/api/npm-bugs.html
index 787057361e1f7b..e63c7875cd2a30 100644
--- a/deps/npm/html/doc/api/npm-bugs.html
+++ b/deps/npm/html/doc/api/npm-bugs.html
@@ -33,5 +33,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bugs &mdash; npm@2.14.7</p>
+<p id="footer">npm-bugs &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-cache.html b/deps/npm/html/doc/api/npm-cache.html
index 95640498f86008..1dd1447942f76a 100644
--- a/deps/npm/html/doc/api/npm-cache.html
+++ b/deps/npm/html/doc/api/npm-cache.html
@@ -42,5 +42,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-cache &mdash; npm@2.14.7</p>
+<p id="footer">npm-cache &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-commands.html b/deps/npm/html/doc/api/npm-commands.html
index 3b0dc843e25248..278f9d6aad8c08 100644
--- a/deps/npm/html/doc/api/npm-commands.html
+++ b/deps/npm/html/doc/api/npm-commands.html
@@ -36,5 +36,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-commands &mdash; npm@2.14.7</p>
+<p id="footer">npm-commands &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-config.html b/deps/npm/html/doc/api/npm-config.html
index e2f2519246c105..ec60c18660d29d 100644
--- a/deps/npm/html/doc/api/npm-config.html
+++ b/deps/npm/html/doc/api/npm-config.html
@@ -57,5 +57,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-config &mdash; npm@2.14.7</p>
+<p id="footer">npm-config &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-deprecate.html b/deps/npm/html/doc/api/npm-deprecate.html
index 5f35253d0ca4e7..6f3dd8a3523a5b 100644
--- a/deps/npm/html/doc/api/npm-deprecate.html
+++ b/deps/npm/html/doc/api/npm-deprecate.html
@@ -47,5 +47,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-deprecate &mdash; npm@2.14.7</p>
+<p id="footer">npm-deprecate &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-docs.html b/deps/npm/html/doc/api/npm-docs.html
index 908533f162dffb..8465f623973114 100644
--- a/deps/npm/html/doc/api/npm-docs.html
+++ b/deps/npm/html/doc/api/npm-docs.html
@@ -33,5 +33,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-docs &mdash; npm@2.14.7</p>
+<p id="footer">npm-docs &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-edit.html b/deps/npm/html/doc/api/npm-edit.html
index 6acabac5542f00..1a51093886cdc4 100644
--- a/deps/npm/html/doc/api/npm-edit.html
+++ b/deps/npm/html/doc/api/npm-edit.html
@@ -36,5 +36,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-edit &mdash; npm@2.14.7</p>
+<p id="footer">npm-edit &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-explore.html b/deps/npm/html/doc/api/npm-explore.html
index 587ebfd0365c74..fed88f0f13b028 100644
--- a/deps/npm/html/doc/api/npm-explore.html
+++ b/deps/npm/html/doc/api/npm-explore.html
@@ -31,5 +31,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-explore &mdash; npm@2.14.7</p>
+<p id="footer">npm-explore &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-help-search.html b/deps/npm/html/doc/api/npm-help-search.html
index 0732f3f66f0cd2..e3560fe62c8cfb 100644
--- a/deps/npm/html/doc/api/npm-help-search.html
+++ b/deps/npm/html/doc/api/npm-help-search.html
@@ -44,5 +44,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-help-search &mdash; npm@2.14.7</p>
+<p id="footer">npm-help-search &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-init.html b/deps/npm/html/doc/api/npm-init.html
index 6beeaf6e2b71d3..c43ad57aff108a 100644
--- a/deps/npm/html/doc/api/npm-init.html
+++ b/deps/npm/html/doc/api/npm-init.html
@@ -39,5 +39,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-init &mdash; npm@2.14.7</p>
+<p id="footer">npm-init &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-install.html b/deps/npm/html/doc/api/npm-install.html
index e697b8176f9b92..6d16e5f360fcd5 100644
--- a/deps/npm/html/doc/api/npm-install.html
+++ b/deps/npm/html/doc/api/npm-install.html
@@ -32,5 +32,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-install &mdash; npm@2.14.7</p>
+<p id="footer">npm-install &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-link.html b/deps/npm/html/doc/api/npm-link.html
index 4137329992f801..6ff53ac7992371 100644
--- a/deps/npm/html/doc/api/npm-link.html
+++ b/deps/npm/html/doc/api/npm-link.html
@@ -42,5 +42,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-link &mdash; npm@2.14.7</p>
+<p id="footer">npm-link &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-load.html b/deps/npm/html/doc/api/npm-load.html
index 2af4720ac40b39..a500b7ac5cfd41 100644
--- a/deps/npm/html/doc/api/npm-load.html
+++ b/deps/npm/html/doc/api/npm-load.html
@@ -37,5 +37,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-load &mdash; npm@2.14.7</p>
+<p id="footer">npm-load &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-ls.html b/deps/npm/html/doc/api/npm-ls.html
index b0d31e2515fc8b..fec0008537023f 100644
--- a/deps/npm/html/doc/api/npm-ls.html
+++ b/deps/npm/html/doc/api/npm-ls.html
@@ -63,5 +63,5 @@ <h3 id="global">global</h3>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-ls &mdash; npm@2.14.7</p>
+<p id="footer">npm-ls &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-outdated.html b/deps/npm/html/doc/api/npm-outdated.html
index 5c564a6eea8188..560d73908ef862 100644
--- a/deps/npm/html/doc/api/npm-outdated.html
+++ b/deps/npm/html/doc/api/npm-outdated.html
@@ -28,5 +28,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-outdated &mdash; npm@2.14.7</p>
+<p id="footer">npm-outdated &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-owner.html b/deps/npm/html/doc/api/npm-owner.html
index 32c0e6feac02f4..b725cab7595014 100644
--- a/deps/npm/html/doc/api/npm-owner.html
+++ b/deps/npm/html/doc/api/npm-owner.html
@@ -47,5 +47,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-owner &mdash; npm@2.14.7</p>
+<p id="footer">npm-owner &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-pack.html b/deps/npm/html/doc/api/npm-pack.html
index da0a19993cbb30..f4086f3b1d2d86 100644
--- a/deps/npm/html/doc/api/npm-pack.html
+++ b/deps/npm/html/doc/api/npm-pack.html
@@ -33,5 +33,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-pack &mdash; npm@2.14.7</p>
+<p id="footer">npm-pack &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-ping.html b/deps/npm/html/doc/api/npm-ping.html
index b768c73d4538c5..1bafcbffc5869e 100644
--- a/deps/npm/html/doc/api/npm-ping.html
+++ b/deps/npm/html/doc/api/npm-ping.html
@@ -29,4 +29,4 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-ping &mdash; npm@2.14.7</p>
+<p id="footer">npm-ping &mdash; npm@3.3.0</p>
diff --git a/deps/npm/html/doc/api/npm-prefix.html b/deps/npm/html/doc/api/npm-prefix.html
index 6f9dcff7917a4e..87cb6cc9ecbd40 100644
--- a/deps/npm/html/doc/api/npm-prefix.html
+++ b/deps/npm/html/doc/api/npm-prefix.html
@@ -29,5 +29,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-prefix &mdash; npm@2.14.7</p>
+<p id="footer">npm-prefix &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-prune.html b/deps/npm/html/doc/api/npm-prune.html
index 44f67558217df0..886a63134fcfe7 100644
--- a/deps/npm/html/doc/api/npm-prune.html
+++ b/deps/npm/html/doc/api/npm-prune.html
@@ -30,5 +30,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-prune &mdash; npm@2.14.7</p>
+<p id="footer">npm-prune &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-publish.html b/deps/npm/html/doc/api/npm-publish.html
index 9aec5e56509bb5..4ca8c6897fc571 100644
--- a/deps/npm/html/doc/api/npm-publish.html
+++ b/deps/npm/html/doc/api/npm-publish.html
@@ -46,5 +46,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-publish &mdash; npm@2.14.7</p>
+<p id="footer">npm-publish &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-rebuild.html b/deps/npm/html/doc/api/npm-rebuild.html
index f65c948f25b689..6f5c40d403fea3 100644
--- a/deps/npm/html/doc/api/npm-rebuild.html
+++ b/deps/npm/html/doc/api/npm-rebuild.html
@@ -30,5 +30,5 @@ <h2 id="configuration">CONFIGURATION</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-rebuild &mdash; npm@2.14.7</p>
+<p id="footer">npm-rebuild &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-repo.html b/deps/npm/html/doc/api/npm-repo.html
index c0f95fa2c6d181..44f799e7c2416d 100644
--- a/deps/npm/html/doc/api/npm-repo.html
+++ b/deps/npm/html/doc/api/npm-repo.html
@@ -33,5 +33,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-repo &mdash; npm@2.14.7</p>
+<p id="footer">npm-repo &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-restart.html b/deps/npm/html/doc/api/npm-restart.html
index 7390b50d270187..f31a949fe40d14 100644
--- a/deps/npm/html/doc/api/npm-restart.html
+++ b/deps/npm/html/doc/api/npm-restart.html
@@ -52,5 +52,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-restart &mdash; npm@2.14.7</p>
+<p id="footer">npm-restart &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-root.html b/deps/npm/html/doc/api/npm-root.html
index 706518ad20e9ba..bb10d3bd67ea42 100644
--- a/deps/npm/html/doc/api/npm-root.html
+++ b/deps/npm/html/doc/api/npm-root.html
@@ -29,5 +29,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-root &mdash; npm@2.14.7</p>
+<p id="footer">npm-root &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-run-script.html b/deps/npm/html/doc/api/npm-run-script.html
index 196ea26143afa0..6625e0ec80264e 100644
--- a/deps/npm/html/doc/api/npm-run-script.html
+++ b/deps/npm/html/doc/api/npm-run-script.html
@@ -41,5 +41,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-run-script &mdash; npm@2.14.7</p>
+<p id="footer">npm-run-script &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-search.html b/deps/npm/html/doc/api/npm-search.html
index 3c83b1a6c22bee..a7376b23ea799a 100644
--- a/deps/npm/html/doc/api/npm-search.html
+++ b/deps/npm/html/doc/api/npm-search.html
@@ -53,5 +53,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-search &mdash; npm@2.14.7</p>
+<p id="footer">npm-search &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-shrinkwrap.html b/deps/npm/html/doc/api/npm-shrinkwrap.html
index f9c37187ac2425..5764ab1fd546fd 100644
--- a/deps/npm/html/doc/api/npm-shrinkwrap.html
+++ b/deps/npm/html/doc/api/npm-shrinkwrap.html
@@ -33,5 +33,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-shrinkwrap &mdash; npm@2.14.7</p>
+<p id="footer">npm-shrinkwrap &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-start.html b/deps/npm/html/doc/api/npm-start.html
index 2e02140363285e..79eaea8608f3cd 100644
--- a/deps/npm/html/doc/api/npm-start.html
+++ b/deps/npm/html/doc/api/npm-start.html
@@ -28,5 +28,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-start &mdash; npm@2.14.7</p>
+<p id="footer">npm-start &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-stop.html b/deps/npm/html/doc/api/npm-stop.html
index 7a83de6a08c001..e6dda89c7923cc 100644
--- a/deps/npm/html/doc/api/npm-stop.html
+++ b/deps/npm/html/doc/api/npm-stop.html
@@ -28,5 +28,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-stop &mdash; npm@2.14.7</p>
+<p id="footer">npm-stop &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-tag.html b/deps/npm/html/doc/api/npm-tag.html
index 6569e063275d6d..ccd9da2099cb7d 100644
--- a/deps/npm/html/doc/api/npm-tag.html
+++ b/deps/npm/html/doc/api/npm-tag.html
@@ -36,5 +36,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-tag &mdash; npm@2.14.7</p>
+<p id="footer">npm-tag &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-test.html b/deps/npm/html/doc/api/npm-test.html
index c556185e38f3bb..69bdab014bb7cd 100644
--- a/deps/npm/html/doc/api/npm-test.html
+++ b/deps/npm/html/doc/api/npm-test.html
@@ -30,5 +30,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-test &mdash; npm@2.14.7</p>
+<p id="footer">npm-test &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-uninstall.html b/deps/npm/html/doc/api/npm-uninstall.html
index 33c7016ee7fe7d..c9cdf9f5da9d70 100644
--- a/deps/npm/html/doc/api/npm-uninstall.html
+++ b/deps/npm/html/doc/api/npm-uninstall.html
@@ -30,5 +30,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-uninstall &mdash; npm@2.14.7</p>
+<p id="footer">npm-uninstall &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-unpublish.html b/deps/npm/html/doc/api/npm-unpublish.html
index 03e4d93ee8ea17..e489cef1115b56 100644
--- a/deps/npm/html/doc/api/npm-unpublish.html
+++ b/deps/npm/html/doc/api/npm-unpublish.html
@@ -33,5 +33,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-unpublish &mdash; npm@2.14.7</p>
+<p id="footer">npm-unpublish &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-update.html b/deps/npm/html/doc/api/npm-update.html
index fc42422829be8b..7492b63ee8a89d 100644
--- a/deps/npm/html/doc/api/npm-update.html
+++ b/deps/npm/html/doc/api/npm-update.html
@@ -33,5 +33,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-update &mdash; npm@2.14.7</p>
+<p id="footer">npm-update &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-version.html b/deps/npm/html/doc/api/npm-version.html
index d584335baed1fe..7ff3a475d967ee 100644
--- a/deps/npm/html/doc/api/npm-version.html
+++ b/deps/npm/html/doc/api/npm-version.html
@@ -32,5 +32,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-version &mdash; npm@2.14.7</p>
+<p id="footer">npm-version &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-view.html b/deps/npm/html/doc/api/npm-view.html
index 110f222c02ad60..8f8ccdff4ab9ad 100644
--- a/deps/npm/html/doc/api/npm-view.html
+++ b/deps/npm/html/doc/api/npm-view.html
@@ -81,5 +81,5 @@ <h2 id="return-value">RETURN VALUE</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-view &mdash; npm@2.14.7</p>
+<p id="footer">npm-view &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm-whoami.html b/deps/npm/html/doc/api/npm-whoami.html
index 30cd99f8a9a52e..e56a2e5d837583 100644
--- a/deps/npm/html/doc/api/npm-whoami.html
+++ b/deps/npm/html/doc/api/npm-whoami.html
@@ -29,5 +29,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-whoami &mdash; npm@2.14.7</p>
+<p id="footer">npm-whoami &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/api/npm.html b/deps/npm/html/doc/api/npm.html
index b1e961cb88605f..4911e3d59f257f 100644
--- a/deps/npm/html/doc/api/npm.html
+++ b/deps/npm/html/doc/api/npm.html
@@ -23,7 +23,7 @@ <h2 id="synopsis">SYNOPSIS</h2>
   npm.commands.install([&quot;package&quot;], cb)
 })
 </code></pre><h2 id="version">VERSION</h2>
-<p>2.14.7</p>
+<p>3.3.0</p>
 <h2 id="description">DESCRIPTION</h2>
 <p>This is the API documentation for npm.
 To find documentation of the command line
@@ -109,5 +109,5 @@ <h2 id="abbrevs">ABBREVS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm &mdash; npm@2.14.7</p>
+<p id="footer">npm &mdash; npm@3.3.0</p>
 
diff --git a/deps/npm/html/doc/cli/npm-access.html b/deps/npm/html/doc/cli/npm-access.html
index 761aea5e5250ab..15eb34c86a811f 100644
--- a/deps/npm/html/doc/cli/npm-access.html
+++ b/deps/npm/html/doc/cli/npm-access.html
@@ -84,5 +84,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-access &mdash; npm@2.14.7</p>
+<p id="footer">npm-access &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-adduser.html b/deps/npm/html/doc/cli/npm-adduser.html
index a331bfbbf543c4..5b19a67f4f4d85 100644
--- a/deps/npm/html/doc/cli/npm-adduser.html
+++ b/deps/npm/html/doc/cli/npm-adduser.html
@@ -68,5 +68,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-adduser &mdash; npm@2.14.7</p>
+<p id="footer">npm-adduser &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-bin.html b/deps/npm/html/doc/cli/npm-bin.html
index 12c598c62ffc5b..050f8642595478 100644
--- a/deps/npm/html/doc/cli/npm-bin.html
+++ b/deps/npm/html/doc/cli/npm-bin.html
@@ -11,7 +11,7 @@
 
 <h1><a href="../cli/npm-bin.html">npm-bin</a></h1> <p>Display npm bin folder</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm bin
+<pre><code>npm bin [--global]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>Print the folder where npm will install executables.</p>
 <h2 id="see-also">SEE ALSO</h2>
@@ -35,5 +35,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bin &mdash; npm@2.14.7</p>
+<p id="footer">npm-bin &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-bugs.html b/deps/npm/html/doc/cli/npm-bugs.html
index fcd2b88da1c46f..02a2e932c151ee 100644
--- a/deps/npm/html/doc/cli/npm-bugs.html
+++ b/deps/npm/html/doc/cli/npm-bugs.html
@@ -11,8 +11,7 @@
 
 <h1><a href="../cli/npm-bugs.html">npm-bugs</a></h1> <p>Bugs for a package in a web browser maybe</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm bugs &lt;pkgname&gt;
-npm bugs (with no args in a package dir)
+<pre><code>npm bugs [&lt;pkgname&gt;]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This command tries to guess at the likely location of a package&#39;s
 bug tracker URL, and then tries to open it using the <code>--browser</code>
@@ -54,5 +53,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bugs &mdash; npm@2.14.7</p>
+<p id="footer">npm-bugs &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-build.html b/deps/npm/html/doc/cli/npm-build.html
index 9bc91614328b52..b8689f190ee471 100644
--- a/deps/npm/html/doc/cli/npm-build.html
+++ b/deps/npm/html/doc/cli/npm-build.html
@@ -11,7 +11,7 @@
 
 <h1><a href="../cli/npm-build.html">npm-build</a></h1> <p>Build a package</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm build &lt;package-folder&gt;
+<pre><code>npm build [&lt;package-folder&gt;]
 </code></pre><ul>
 <li><code>&lt;package-folder&gt;</code>:
 A folder containing a <code>package.json</code> file in its root.</li>
@@ -40,5 +40,5 @@ <h2 id="description">DESCRIPTION</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-build &mdash; npm@2.14.7</p>
+<p id="footer">npm-build &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-bundle.html b/deps/npm/html/doc/cli/npm-bundle.html
index 81a65c16921498..18cb054696e918 100644
--- a/deps/npm/html/doc/cli/npm-bundle.html
+++ b/deps/npm/html/doc/cli/npm-bundle.html
@@ -31,5 +31,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bundle &mdash; npm@2.14.7</p>
+<p id="footer">npm-bundle &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-cache.html b/deps/npm/html/doc/cli/npm-cache.html
index 85179374751b82..e9da236630f631 100644
--- a/deps/npm/html/doc/cli/npm-cache.html
+++ b/deps/npm/html/doc/cli/npm-cache.html
@@ -81,5 +81,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-cache &mdash; npm@2.14.7</p>
+<p id="footer">npm-cache &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-completion.html b/deps/npm/html/doc/cli/npm-completion.html
index 15f71fb290f1bb..48f05ec3f6fef3 100644
--- a/deps/npm/html/doc/cli/npm-completion.html
+++ b/deps/npm/html/doc/cli/npm-completion.html
@@ -11,14 +11,16 @@
 
 <h1><a href="../cli/npm-completion.html">npm-completion</a></h1> <p>Tab Completion for npm</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>. &lt;(npm completion)
+<pre><code>source &lt;(npm completion)
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>Enables tab-completion in all npm commands.</p>
 <p>The synopsis above
 loads the completions into your current shell.  Adding it to
 your ~/.bashrc or ~/.zshrc will make the completions available
-everywhere.</p>
-<p>You may of course also pipe the output of npm completion to a file
+everywhere:</p>
+<pre><code>npm completion &gt;&gt; ~/.bashrc
+npm completion &gt;&gt; ~/.zshrc
+</code></pre><p>You may of course also pipe the output of npm completion to a file
 such as <code>/usr/local/etc/bash_completion.d/npm</code> if you have a system
 that will read that file for you.</p>
 <p>When <code>COMP_CWORD</code>, <code>COMP_LINE</code>, and <code>COMP_POINT</code> are defined in the
@@ -42,5 +44,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-completion &mdash; npm@2.14.7</p>
+<p id="footer">npm-completion &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-config.html b/deps/npm/html/doc/cli/npm-config.html
index d73762fe026dd0..86b13ad58172a6 100644
--- a/deps/npm/html/doc/cli/npm-config.html
+++ b/deps/npm/html/doc/cli/npm-config.html
@@ -16,7 +16,6 @@ <h2 id="synopsis">SYNOPSIS</h2>
 npm config delete &lt;key&gt;
 npm config list
 npm config edit
-npm c [set|get|delete|list]
 npm get &lt;key&gt;
 npm set &lt;key&gt; &lt;value&gt; [--global]
 </code></pre><h2 id="description">DESCRIPTION</h2>
@@ -66,5 +65,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-config &mdash; npm@2.14.7</p>
+<p id="footer">npm-config &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-dedupe.html b/deps/npm/html/doc/cli/npm-dedupe.html
index b8bab0074dd91f..520d5158d73314 100644
--- a/deps/npm/html/doc/cli/npm-dedupe.html
+++ b/deps/npm/html/doc/cli/npm-dedupe.html
@@ -31,20 +31,16 @@ <h2 id="synopsis">SYNOPSIS</h2>
 </code></pre><p>Because of the hierarchical nature of node&#39;s module lookup, b and d
 will both get their dependency met by the single c package at the root
 level of the tree.</p>
+<p>The deduplication algorithm walks the tree, moving each dependency as far
+up in the tree as possible, even if duplicates are not found. This will
+result in both a flat and deduplicated tree.</p>
 <p>If a suitable version exists at the target location in the tree
 already, then it will be left untouched, but the other duplicates will
 be deleted.</p>
-<p>If no suitable version can be found, then a warning is printed, and
-nothing is done.</p>
-<p>If any arguments are supplied, then they are filters, and only the
-named packages will be touched.</p>
-<p>Note that this operation transforms the dependency tree, and may
-result in packages getting updated versions, perhaps from the npm
-registry.</p>
-<p>This feature is experimental, and may change in future versions.</p>
-<p>The <code>--tag</code> argument will apply to all of the affected dependencies. If a
-tag with the given name exists, the tagged version is preferred over newer
-versions.</p>
+<p>Arguments are ignored. Dedupe always acts on the entire tree.</p>
+<p>Modules</p>
+<p>Note that this operation transforms the dependency tree, but will never
+result in new modules being installed.</p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
 <li><a href="../cli/npm-ls.html">npm-ls(1)</a></li>
@@ -63,5 +59,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-dedupe &mdash; npm@2.14.7</p>
+<p id="footer">npm-dedupe &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-deprecate.html b/deps/npm/html/doc/cli/npm-deprecate.html
index 9549631b692012..33d09e1959e0f1 100644
--- a/deps/npm/html/doc/cli/npm-deprecate.html
+++ b/deps/npm/html/doc/cli/npm-deprecate.html
@@ -11,7 +11,7 @@
 
 <h1><a href="../cli/npm-deprecate.html">npm-deprecate</a></h1> <p>Deprecate a version of a package</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm deprecate &lt;name&gt;[@&lt;version&gt;] &lt;message&gt;
+<pre><code>npm deprecate &lt;pkg&gt;[@&lt;version&gt;] &lt;message&gt;
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This command will update the npm registry entry for a package, providing
 a deprecation warning to all who attempt to install it.</p>
@@ -38,5 +38,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-deprecate &mdash; npm@2.14.7</p>
+<p id="footer">npm-deprecate &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-dist-tag.html b/deps/npm/html/doc/cli/npm-dist-tag.html
index 2a683e71065c43..3435ecc32bbf15 100644
--- a/deps/npm/html/doc/cli/npm-dist-tag.html
+++ b/deps/npm/html/doc/cli/npm-dist-tag.html
@@ -77,5 +77,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-dist-tag &mdash; npm@2.14.7</p>
+<p id="footer">npm-dist-tag &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-docs.html b/deps/npm/html/doc/cli/npm-docs.html
index 0e17c157fc6abc..7a9028f783e3b1 100644
--- a/deps/npm/html/doc/cli/npm-docs.html
+++ b/deps/npm/html/doc/cli/npm-docs.html
@@ -12,9 +12,9 @@
 <h1><a href="../cli/npm-docs.html">npm-docs</a></h1> <p>Docs for a package in a web browser maybe</p>
 <h2 id="synopsis">SYNOPSIS</h2>
 <pre><code>npm docs [&lt;pkgname&gt; [&lt;pkgname&gt; ...]]
-npm docs (with no args in a package dir)
+npm docs .
 npm home [&lt;pkgname&gt; [&lt;pkgname&gt; ...]]
-npm home (with no args in a package dir)
+npm home .
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This command tries to guess at the likely location of a package&#39;s
 documentation URL, and then tries to open it using the <code>--browser</code>
@@ -56,5 +56,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-docs &mdash; npm@2.14.7</p>
+<p id="footer">npm-docs &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-edit.html b/deps/npm/html/doc/cli/npm-edit.html
index 79c150019e1023..8d1bfc1efad920 100644
--- a/deps/npm/html/doc/cli/npm-edit.html
+++ b/deps/npm/html/doc/cli/npm-edit.html
@@ -11,7 +11,7 @@
 
 <h1><a href="../cli/npm-edit.html">npm-edit</a></h1> <p>Edit an installed package</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm edit &lt;name&gt;[@&lt;version&gt;]
+<pre><code>npm edit &lt;pkg&gt;[@&lt;version&gt;]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>Opens the package folder in the default editor (or whatever you&#39;ve
 configured as the npm <code>editor</code> config -- see <code><a href="../misc/npm-config.html">npm-config(7)</a></code>.)</p>
@@ -49,5 +49,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-edit &mdash; npm@2.14.7</p>
+<p id="footer">npm-edit &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-explore.html b/deps/npm/html/doc/cli/npm-explore.html
index 29364ad4f3921c..8be4b5af9a3806 100644
--- a/deps/npm/html/doc/cli/npm-explore.html
+++ b/deps/npm/html/doc/cli/npm-explore.html
@@ -11,7 +11,7 @@
 
 <h1><a href="../cli/npm-explore.html">npm-explore</a></h1> <p>Browse an installed package</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm explore &lt;name&gt; [ -- &lt;cmd&gt;]
+<pre><code>npm explore &lt;pkg&gt; [ -- &lt;cmd&gt;]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>Spawn a subshell in the directory of the installed package specified.</p>
 <p>If a command is specified, then it is run in the subshell, which then
@@ -49,5 +49,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-explore &mdash; npm@2.14.7</p>
+<p id="footer">npm-explore &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-help-search.html b/deps/npm/html/doc/cli/npm-help-search.html
index 2ff4a11ac69943..ad9182bfdf40c6 100644
--- a/deps/npm/html/doc/cli/npm-help-search.html
+++ b/deps/npm/html/doc/cli/npm-help-search.html
@@ -11,7 +11,7 @@
 
 <h1><a href="../cli/npm-help-search.html">npm-help-search</a></h1> <p>Search npm help documentation</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm help-search some search terms
+<pre><code>npm help-search &lt;text&gt;
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This command will search the npm markdown documentation files for the
 terms provided, and then list the results, sorted by relevance.</p>
@@ -46,5 +46,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-help-search &mdash; npm@2.14.7</p>
+<p id="footer">npm-help-search &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-help.html b/deps/npm/html/doc/cli/npm-help.html
index 13b670b596e7c4..6678a564a3d81d 100644
--- a/deps/npm/html/doc/cli/npm-help.html
+++ b/deps/npm/html/doc/cli/npm-help.html
@@ -11,8 +11,7 @@
 
 <h1><a href="../cli/npm-help.html">npm-help</a></h1> <p>Get help on npm</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm help &lt;topic&gt;
-npm help some search terms
+<pre><code>npm help &lt;term&gt; [&lt;terms..&gt;]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>If supplied a topic, then show the appropriate documentation page.</p>
 <p>If the topic does not exist, or if multiple terms are provided, then run
@@ -52,5 +51,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-help &mdash; npm@2.14.7</p>
+<p id="footer">npm-help &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-init.html b/deps/npm/html/doc/cli/npm-init.html
index d9c3d05247d764..c3e3443039e77d 100644
--- a/deps/npm/html/doc/cli/npm-init.html
+++ b/deps/npm/html/doc/cli/npm-init.html
@@ -11,7 +11,7 @@
 
 <h1><a href="../cli/npm-init.html">npm-init</a></h1> <p>Interactively create a package.json file</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm init [-f|--force|-y|--yes]
+<pre><code>npm init [--force|-f|--yes|-y]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This will ask you a bunch of questions, and then write a package.json for you.</p>
 <p>It attempts to make reasonable guesses about what you want things to be set to,
@@ -48,5 +48,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-init &mdash; npm@2.14.7</p>
+<p id="footer">npm-init &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-install.html b/deps/npm/html/doc/cli/npm-install.html
index ab3e03f9ba6ffd..63057da690606d 100644
--- a/deps/npm/html/doc/cli/npm-install.html
+++ b/deps/npm/html/doc/cli/npm-install.html
@@ -11,15 +11,17 @@
 
 <h1><a href="../cli/npm-install.html">npm-install</a></h1> <p>Install a package</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm install (with no args in a package dir)
+<pre><code>npm install (with no args, in package dir)
+npm install [&lt;@scope&gt;/]&lt;name&gt;
+npm install [&lt;@scope&gt;/]&lt;name&gt;@&lt;tag&gt;
+npm install [&lt;@scope&gt;/]&lt;name&gt;@&lt;version&gt;
+npm install [&lt;@scope&gt;/]&lt;name&gt;@&lt;version range&gt;
 npm install &lt;tarball file&gt;
 npm install &lt;tarball url&gt;
 npm install &lt;folder&gt;
-npm install [@&lt;scope&gt;/]&lt;name&gt; [--save|--save-dev|--save-optional] [--save-exact]
-npm install [@&lt;scope&gt;/]&lt;name&gt;@&lt;tag&gt;
-npm install [@&lt;scope&gt;/]&lt;name&gt;@&lt;version&gt;
-npm install [@&lt;scope&gt;/]&lt;name&gt;@&lt;version range&gt;
-npm i (with any of the previous argument usage)
+
+alias: npm i
+common options: [--save|--save-dev|--save-optional] [--save-exact] [--dry-run]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This command installs a package, and any packages that it depends on. If the
 package has a shrinkwrap file, the installation of dependencies will be driven
@@ -32,7 +34,7 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <li>d) a <code>&lt;name&gt;@&lt;version&gt;</code> that is published on the registry (see <code><a href="../misc/npm-registry.html">npm-registry(7)</a></code>) with (c)</li>
 <li>e) a <code>&lt;name&gt;@&lt;tag&gt;</code> that points to (d)</li>
 <li>f) a <code>&lt;name&gt;</code> that has a &quot;latest&quot; tag satisfying (e)</li>
-<li>g) a <code>&lt;git remote url&gt;</code> that resolves to (b)</li>
+<li>g) a <code>&lt;git remote url&gt;</code> that resolves to (a)</li>
 </ul>
 <p>Even if you never publish your package, you can still get a lot of
 benefits of using npm if you just want to write a node program (a), and
@@ -65,7 +67,7 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <p>  Example:</p>
 <pre><code>    npm install https://github.com/indexzero/forever/tarball/v0.5.6
 </code></pre></li>
-<li><p><code>npm install [@&lt;scope&gt;/]&lt;name&gt; [--save|--save-dev|--save-optional]</code>:</p>
+<li><p><code>npm install [&lt;@scope&gt;/]&lt;name&gt; [--save|--save-dev|--save-optional]</code>:</p>
 <p>  Do a <code>&lt;name&gt;@&lt;tag&gt;</code> install, where <code>&lt;tag&gt;</code> is the &quot;tag&quot; config. (See
   <code><a href="../misc/npm-config.html">npm-config(7)</a></code>.)</p>
 <p>  In most cases, this will install the latest version
@@ -86,6 +88,8 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <li><p><code>--save-exact</code>: Saved dependencies will be configured with an
 exact version rather than using npm&#39;s default semver range
 operator.</p>
+<p>Further, if you have an <code>npm-shrinkwrap.json</code> then it will be updated as
+well.</p>
 <p><code>&lt;scope&gt;</code> is optional. The package will be downloaded from the registry
 associated with the specified scope. If no registry is associated with
 the given scope the default registry is assumed. See <code><a href="../misc/npm-scope.html">npm-scope(7)</a></code>.</p>
@@ -107,7 +111,7 @@ <h2 id="synopsis">SYNOPSIS</h2>
 working directory, then it will try to install that, and only try to
 fetch the package by name if it is not valid.
 </code></pre><ul>
-<li><p><code>npm install [@&lt;scope&gt;/]&lt;name&gt;@&lt;tag&gt;</code>:</p>
+<li><p><code>npm install [&lt;@scope&gt;/]&lt;name&gt;@&lt;tag&gt;</code>:</p>
 <p>  Install the version of the package that is referenced by the specified tag.
   If the tag does not exist in the registry data for that package, then this
   will fail.</p>
@@ -115,14 +119,14 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <pre><code>    npm install sax@latest
     npm install @myorg/mypackage@latest
 </code></pre></li>
-<li><p><code>npm install [@&lt;scope&gt;/]&lt;name&gt;@&lt;version&gt;</code>:</p>
+<li><p><code>npm install [&lt;@scope&gt;/]&lt;name&gt;@&lt;version&gt;</code>:</p>
 <p>  Install the specified version of the package.  This will fail if the
   version has not been published to the registry.</p>
 <p>  Example:</p>
 <pre><code>    npm install sax@0.1.1
     npm install @myorg/privatepackage@1.5.0
 </code></pre></li>
-<li><p><code>npm install [@&lt;scope&gt;/]&lt;name&gt;@&lt;version range&gt;</code>:</p>
+<li><p><code>npm install [&lt;@scope&gt;/]&lt;name&gt;@&lt;version range&gt;</code>:</p>
 <p>  Install a version of the package matching the specified version range.  This
   will follow the same rules for resolving dependencies described in <code><a href="../files/package.json.html">package.json(5)</a></code>.</p>
 <p>  Note that most version ranges must be put in quotes so that your shell will
@@ -132,9 +136,9 @@ <h2 id="synopsis">SYNOPSIS</h2>
     npm install @myorg/privatepackage@&quot;&gt;=0.1.0 &lt;0.2.0&quot;
 </code></pre></li>
 <li><p><code>npm install &lt;git remote url&gt;</code>:</p>
-<p>  Install a package by cloning a git remote url.  The format of the git
-  url is:</p>
-<pre><code>    &lt;protocol&gt;://[&lt;user&gt;[:&lt;password&gt;]@]&lt;hostname&gt;[:&lt;port&gt;][:/]&lt;path&gt;[#&lt;commit-ish&gt;]
+<p>  Installs the package from the hosted git provider, cloning it with
+  <code>git</code>. First it tries via the https (git with github) and if that fails, via ssh.</p>
+<pre><code>    &lt;protocol&gt;://[&lt;user&gt;[:&lt;password&gt;]@]&lt;hostname&gt;[:&lt;port&gt;][:][/]&lt;path&gt;[#&lt;commit-ish&gt;]
 </code></pre><p>  <code>&lt;protocol&gt;</code> is one of <code>git</code>, <code>git+ssh</code>, <code>git+http</code>, or
   <code>git+https</code>.  If no <code>&lt;commit-ish&gt;</code> is specified, then <code>master</code> is
   used.</p>
@@ -195,6 +199,8 @@ <h2 id="synopsis">SYNOPSIS</h2>
 </code></pre><p>The <code>--tag</code> argument will apply to all of the specified install targets. If a
 tag with the given name exists, the tagged version is preferred over newer
 versions.</p>
+<p>The <code>--dry-run</code> argument will report in the usual way what the install would
+have done without actually installing anything.</p>
 <p>The <code>--force</code> argument will force npm to fetch remote resources even if a
 local copy exists on disk.</p>
 <pre><code>npm install sax --force
@@ -210,27 +216,39 @@ <h2 id="synopsis">SYNOPSIS</h2>
 shrinkwrap file and use the package.json instead.</p>
 <p>The <code>--nodedir=/path/to/node/source</code> argument will allow npm to find the
 node source code so that npm can compile native modules.</p>
+<p>The <code>--only={prod[uction]|dev[elopment]}</code> argument will cause either only
+<code>devDependencies</code> or only non-<code>devDependencies</code> to be installed.</p>
 <p>See <code><a href="../misc/npm-config.html">npm-config(7)</a></code>.  Many of the configuration params have some
 effect on installation, since that&#39;s most of what npm does.</p>
 <h2 id="algorithm">ALGORITHM</h2>
 <p>To install a package, npm uses the following algorithm:</p>
-<pre><code>install(where, what, family, ancestors)
-fetch what, unpack to &lt;where&gt;/node_modules/&lt;what&gt;
-for each dep in what.dependencies
-  resolve dep to precise version
-for each dep@version in what.dependencies
-    not in &lt;where&gt;/node_modules/&lt;what&gt;/node_modules/*
-    and not in &lt;family&gt;
-  add precise version deps to &lt;family&gt;
-  install(&lt;where&gt;/node_modules/&lt;what&gt;, dep, family)
+<pre><code>load the existing node_modules tree from disk
+clone the tree
+fetch the package.json and assorted metadata and add it to the clone
+walk the clone and add any missing dependencies
+  dependencies will be added as close to the top as is possible
+  without breaking any other modules
+compare the original tree with the cloned tree and make a list of
+actions to take to convert one to the other
+execute all of the actions, deepest first
+  kinds of actions are install, update, remove and move
 </code></pre><p>For this <code>package{dep}</code> structure: <code>A{B,C}, B{C}, C{D}</code>,
 this algorithm produces:</p>
 <pre><code>A
 +-- B
-`-- C
-    `-- D
++-- C
++-- D
 </code></pre><p>That is, the dependency from B to C is satisfied by the fact that A
-already caused C to be installed at a higher level.</p>
+already caused C to be installed at a higher level. D is still installed
+at the top level because nothing conflicts with it.</p>
+<p>For <code>A{B,C}, B{C,D@1}, C{D@2}</code>, this algorithm produces:</p>
+<pre><code>A
++-- B
++-- C
+   `-- D@2
++-- D@1
+</code></pre><p>Because B&#39;s D@1 will be installed in the top leve, C now has to install D@2
+privately for itself.</p>
 <p>See <a href="../files/npm-folders.html">npm-folders(5)</a> for a more detailed description of the specific
 folder structures that npm creates.</p>
 <h3 id="limitations-of-npm-s-install-algorithm">Limitations of npm&#39;s Install Algorithm</h3>
@@ -277,5 +295,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-install &mdash; npm@2.14.7</p>
+<p id="footer">npm-install &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-link.html b/deps/npm/html/doc/cli/npm-link.html
index 322d02d46918af..0a944aff94d27f 100644
--- a/deps/npm/html/doc/cli/npm-link.html
+++ b/deps/npm/html/doc/cli/npm-link.html
@@ -11,9 +11,10 @@
 
 <h1><a href="../cli/npm-link.html">npm-link</a></h1> <p>Symlink a package folder</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm link (in package folder)
-npm link [@&lt;scope&gt;/]&lt;pkgname&gt;
-npm ln (with any of the previous argument usage)
+<pre><code>npm link (in package dir)
+npm link [&lt;@scope&gt;/]&lt;pkg&gt;[@&lt;version&gt;]
+
+alias: npm ln
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>Package linking is a two-step process.</p>
 <p>First, <code>npm link</code> in a package folder will create a globally-installed
@@ -72,5 +73,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-link &mdash; npm@2.14.7</p>
+<p id="footer">npm-link &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-logout.html b/deps/npm/html/doc/cli/npm-logout.html
index 16b97daae388bd..7fa51c9c136675 100644
--- a/deps/npm/html/doc/cli/npm-logout.html
+++ b/deps/npm/html/doc/cli/npm-logout.html
@@ -11,7 +11,7 @@
 
 <h1><a href="../cli/npm-logout.html">npm-logout</a></h1> <p>Log out of the registry</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm logout [--registry=url] [--scope=@orgname]
+<pre><code>npm logout [--registry=&lt;url&gt;] [--scope=&lt;@scope&gt;]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>When logged into a registry that supports token-based authentication, tell the
 server to end this token&#39;s session. This will invalidate the token everywhere
@@ -55,5 +55,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-logout &mdash; npm@2.14.7</p>
+<p id="footer">npm-logout &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-ls.html b/deps/npm/html/doc/cli/npm-ls.html
index f36d7952cf10cb..73144c1681f530 100644
--- a/deps/npm/html/doc/cli/npm-ls.html
+++ b/deps/npm/html/doc/cli/npm-ls.html
@@ -11,10 +11,9 @@
 
 <h1><a href="../cli/npm-ls.html">npm-ls</a></h1> <p>List installed packages</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm list [[@&lt;scope&gt;/]&lt;pkg&gt; ...]
-npm ls [[@&lt;scope&gt;/]&lt;pkg&gt; ...]
-npm la [[@&lt;scope&gt;/]&lt;pkg&gt; ...]
-npm ll [[@&lt;scope&gt;/]&lt;pkg&gt; ...]
+<pre><code>npm ls [[&lt;@scope&gt;/]&lt;pkg&gt; ...]
+
+aliases: list, la, ll
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This command will print to stdout all the versions of packages that are
 installed, as well as their dependencies, in a tree-structure.</p>
@@ -22,13 +21,15 @@ <h2 id="synopsis">SYNOPSIS</h2>
 limit the results to only the paths to the packages named.  Note that
 nested packages will <em>also</em> show the paths to the specified packages.
 For example, running <code>npm ls promzard</code> in npm&#39;s source tree will show:</p>
-<pre><code>npm@2.14.7 /path/to/npm
+<pre><code>npm@3.3.6 /path/to/npm
 └─┬ init-package-json@0.0.4
   └── promzard@0.1.5
 </code></pre><p>It will print out extraneous, missing, and invalid packages.</p>
 <p>If a project specifies git urls for dependencies these are shown
 in parentheses after the name@version to make it easier for users to
 recognize potential forks of a project.</p>
+<p>The tree shown is the logical dependency tree, based on package
+dependencies, not the physical layout of your node_modules folder.</p>
 <p>When run as <code>ll</code> or <code>la</code>, it shows extended information by default.</p>
 <h2 id="configuration">CONFIGURATION</h2>
 <h3 id="json">json</h3>
@@ -73,6 +74,12 @@ <h3 id="dev">dev</h3>
 <li>Default: false</li>
 </ul>
 <p>Display only the dependency tree for packages in <code>devDependencies</code>.</p>
+<h3 id="only">only</h3>
+<ul>
+<li>Type: String</li>
+</ul>
+<p>When &quot;dev&quot; or &quot;development&quot;, is an alias to <code>dev</code>.</p>
+<p>When &quot;prod&quot; or &quot;production&quot;, is an alias to <code>production</code>.`</p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
 <li><a href="../cli/npm-config.html">npm-config(1)</a></li>
@@ -97,5 +104,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-ls &mdash; npm@2.14.7</p>
+<p id="footer">npm-ls &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-outdated.html b/deps/npm/html/doc/cli/npm-outdated.html
index 29728e96ae7784..5a5f67b9421320 100644
--- a/deps/npm/html/doc/cli/npm-outdated.html
+++ b/deps/npm/html/doc/cli/npm-outdated.html
@@ -11,7 +11,7 @@
 
 <h1><a href="../cli/npm-outdated.html">npm-outdated</a></h1> <p>Check for outdated packages</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm outdated [&lt;name&gt; [&lt;name&gt; ...]]
+<pre><code>npm outdated [[&lt;@scope&gt;/]&lt;pkg&gt; ...]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This command will check the registry to see if any (or, specific) installed
 packages are currently outdated.</p>
@@ -67,5 +67,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-outdated &mdash; npm@2.14.7</p>
+<p id="footer">npm-outdated &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-owner.html b/deps/npm/html/doc/cli/npm-owner.html
index 603043dc6e19e3..6cbc0f4bdef925 100644
--- a/deps/npm/html/doc/cli/npm-owner.html
+++ b/deps/npm/html/doc/cli/npm-owner.html
@@ -11,9 +11,9 @@
 
 <h1><a href="../cli/npm-owner.html">npm-owner</a></h1> <p>Manage package owners</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm owner ls &lt;package name&gt;
-npm owner add &lt;user&gt; &lt;package name&gt;
-npm owner rm &lt;user&gt; &lt;package name&gt;
+<pre><code>npm owner add &lt;user&gt; [&lt;@scope&gt;/]&lt;pkg&gt;
+npm owner rm &lt;user&gt; [&lt;@scope&gt;/]&lt;pkg&gt;
+npm owner ls [&lt;@scope&gt;/]&lt;pkg&gt;
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>Manage ownership of published packages.</p>
 <ul>
@@ -49,5 +49,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-owner &mdash; npm@2.14.7</p>
+<p id="footer">npm-owner &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-pack.html b/deps/npm/html/doc/cli/npm-pack.html
index 77bf5578bbe6a6..7abf2f572b8140 100644
--- a/deps/npm/html/doc/cli/npm-pack.html
+++ b/deps/npm/html/doc/cli/npm-pack.html
@@ -11,13 +11,13 @@
 
 <h1><a href="../cli/npm-pack.html">npm-pack</a></h1> <p>Create a tarball from a package</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm pack [&lt;pkg&gt; [&lt;pkg&gt; ...]]
+<pre><code>npm pack [[&lt;@scope&gt;/]&lt;pkg&gt;...]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>For anything that&#39;s installable (that is, a package folder, tarball,
-tarball url, name@tag, name@version, or name), this command will fetch
-it to the cache, and then copy the tarball to the current working
-directory as <code>&lt;name&gt;-&lt;version&gt;.tgz</code>, and then write the filenames out to
-stdout.</p>
+tarball url, name@tag, name@version, name, or scoped name), this
+command will fetch it to the cache, and then copy the tarball to the
+current working directory as <code>&lt;name&gt;-&lt;version&gt;.tgz</code>, and then write
+the filenames out to stdout.</p>
 <p>If the same package is specified multiple times, then the file will be
 overwritten the second time.</p>
 <p>If no arguments are supplied, then npm packs the current package folder.</p>
@@ -41,5 +41,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-pack &mdash; npm@2.14.7</p>
+<p id="footer">npm-pack &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-ping.html b/deps/npm/html/doc/cli/npm-ping.html
index e10095ec5a50ae..4a78052b6c172c 100644
--- a/deps/npm/html/doc/cli/npm-ping.html
+++ b/deps/npm/html/doc/cli/npm-ping.html
@@ -32,4 +32,4 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-ping &mdash; npm@2.14.7</p>
+<p id="footer">npm-ping &mdash; npm@3.3.6</p>
diff --git a/deps/npm/html/doc/cli/npm-prefix.html b/deps/npm/html/doc/cli/npm-prefix.html
index 96d63d75070f5e..26aa01fda04d6b 100644
--- a/deps/npm/html/doc/cli/npm-prefix.html
+++ b/deps/npm/html/doc/cli/npm-prefix.html
@@ -38,5 +38,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-prefix &mdash; npm@2.14.7</p>
+<p id="footer">npm-prefix &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-prune.html b/deps/npm/html/doc/cli/npm-prune.html
index d90b0fb25a57b9..88d57ece8c8af5 100644
--- a/deps/npm/html/doc/cli/npm-prune.html
+++ b/deps/npm/html/doc/cli/npm-prune.html
@@ -11,8 +11,7 @@
 
 <h1><a href="../cli/npm-prune.html">npm-prune</a></h1> <p>Remove extraneous packages</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm prune [&lt;name&gt; [&lt;name ...]]
-npm prune [&lt;name&gt; [&lt;name ...]] [--production]
+<pre><code>npm prune [[&lt;@scope&gt;/]&lt;pkg&gt;...] [--production]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This command removes &quot;extraneous&quot; packages.  If a package name is
 provided, then only packages matching one of the supplied names are
@@ -41,5 +40,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-prune &mdash; npm@2.14.7</p>
+<p id="footer">npm-prune &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-publish.html b/deps/npm/html/doc/cli/npm-publish.html
index b6372b26446a7a..bc5884d872a797 100644
--- a/deps/npm/html/doc/cli/npm-publish.html
+++ b/deps/npm/html/doc/cli/npm-publish.html
@@ -11,8 +11,10 @@
 
 <h1><a href="../cli/npm-publish.html">npm-publish</a></h1> <p>Publish a package</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm publish &lt;tarball&gt; [--tag &lt;tag&gt;] [--access &lt;public|restricted&gt;]
-npm publish &lt;folder&gt; [--tag &lt;tag&gt;] [--access &lt;public|restricted&gt;]
+<pre><code>npm publish [&lt;tarball&gt;|&lt;folder&gt;] [--tag &lt;tag&gt;] [--access &lt;public|restricted&gt;]
+
+Publishes &#39;.&#39; if no argument supplied
+Sets tag &#39;latest&#39; if no --tag specified
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>Publishes a package to the registry so that it can be installed by name. See
 <code><a href="../misc/npm-developers.html">npm-developers(7)</a></code> for details on what&#39;s included in the published package, as
@@ -66,5 +68,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-publish &mdash; npm@2.14.7</p>
+<p id="footer">npm-publish &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-rebuild.html b/deps/npm/html/doc/cli/npm-rebuild.html
index 4fb2d48108246b..92ef96425b8a16 100644
--- a/deps/npm/html/doc/cli/npm-rebuild.html
+++ b/deps/npm/html/doc/cli/npm-rebuild.html
@@ -11,13 +11,10 @@
 
 <h1><a href="../cli/npm-rebuild.html">npm-rebuild</a></h1> <p>Rebuild a package</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm rebuild [&lt;name&gt; [&lt;name&gt; ...]]
-npm rb [&lt;name&gt; [&lt;name&gt; ...]]
-</code></pre><ul>
-<li><code>&lt;name&gt;</code>:
-The package to rebuild</li>
-</ul>
-<h2 id="description">DESCRIPTION</h2>
+<pre><code>npm rebuild [[&lt;@scope&gt;/&lt;name&gt;]...]
+
+alias: npm rb
+</code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This command runs the <code>npm build</code> command on the matched folders.  This is useful
 when you install a new version of node, and must recompile all your C++ addons with
 the new binary.</p>
@@ -38,5 +35,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-rebuild &mdash; npm@2.14.7</p>
+<p id="footer">npm-rebuild &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-repo.html b/deps/npm/html/doc/cli/npm-repo.html
index d66da6ab92f39f..1d1445eafb492e 100644
--- a/deps/npm/html/doc/cli/npm-repo.html
+++ b/deps/npm/html/doc/cli/npm-repo.html
@@ -11,8 +11,7 @@
 
 <h1><a href="../cli/npm-repo.html">npm-repo</a></h1> <p>Open package repository page in the browser</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm repo &lt;pkgname&gt;
-npm repo (with no args in a package dir)
+<pre><code>npm repo [&lt;pkg&gt;]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This command tries to guess at the likely location of a package&#39;s
 repository URL, and then tries to open it using the <code>--browser</code>
@@ -42,5 +41,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-repo &mdash; npm@2.14.7</p>
+<p id="footer">npm-repo &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-restart.html b/deps/npm/html/doc/cli/npm-restart.html
index 7d9fe7b9641efe..555c9fbeedda8f 100644
--- a/deps/npm/html/doc/cli/npm-restart.html
+++ b/deps/npm/html/doc/cli/npm-restart.html
@@ -53,5 +53,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-restart &mdash; npm@2.14.7</p>
+<p id="footer">npm-restart &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-rm.html b/deps/npm/html/doc/cli/npm-rm.html
deleted file mode 100644
index 1714fe27df61f0..00000000000000
--- a/deps/npm/html/doc/cli/npm-rm.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-rm</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/cli/npm-rm.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../cli/npm-rm.html">npm-rm</a></h1> <p>Remove a package</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm rm &lt;name&gt;
-npm r &lt;name&gt;
-npm uninstall &lt;name&gt;
-npm un &lt;name&gt;
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This uninstalls a package, completely removing everything npm installed
-on its behalf.</p>
-<h2 id="see-also">SEE ALSO</h2>
-<ul>
-<li><a href="../cli/npm-prune.html">npm-prune(1)</a></li>
-<li><a href="../cli/npm-install.html">npm-install(1)</a></li>
-<li><a href="../files/npm-folders.html">npm-folders(5)</a></li>
-<li><a href="../cli/npm-config.html">npm-config(1)</a></li>
-<li><a href="../misc/npm-config.html">npm-config(7)</a></li>
-<li><a href="../files/npmrc.html">npmrc(5)</a></li>
-</ul>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-rm &mdash; npm@2.14.7</p>
-
diff --git a/deps/npm/html/doc/cli/npm-root.html b/deps/npm/html/doc/cli/npm-root.html
index e29dacdbea6204..e8e2a1890f1fe7 100644
--- a/deps/npm/html/doc/cli/npm-root.html
+++ b/deps/npm/html/doc/cli/npm-root.html
@@ -11,7 +11,7 @@
 
 <h1><a href="../cli/npm-root.html">npm-root</a></h1> <p>Display npm root</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm root
+<pre><code>npm root [-g]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>Print the effective <code>node_modules</code> folder to standard out.</p>
 <h2 id="see-also">SEE ALSO</h2>
@@ -35,5 +35,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-root &mdash; npm@2.14.7</p>
+<p id="footer">npm-root &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-run-script.html b/deps/npm/html/doc/cli/npm-run-script.html
index 47f437d6257a15..39f4d0d60b123a 100644
--- a/deps/npm/html/doc/cli/npm-run-script.html
+++ b/deps/npm/html/doc/cli/npm-run-script.html
@@ -11,8 +11,9 @@
 
 <h1><a href="../cli/npm-run-script.html">npm-run-script</a></h1> <p>Run arbitrary package scripts</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm run-script [command] [-- &lt;args&gt;]
-npm run [command] [-- &lt;args&gt;]
+<pre><code>npm run-script &lt;command&gt; [-- &lt;args&gt;...]
+
+alias: npm run
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This runs an arbitrary command from a package&#39;s <code>&quot;scripts&quot;</code> object.  If no
 <code>&quot;command&quot;</code> is provided, it will list the available scripts.  <code>run[-script]</code> is
@@ -57,5 +58,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-run-script &mdash; npm@2.14.7</p>
+<p id="footer">npm-run-script &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-search.html b/deps/npm/html/doc/cli/npm-search.html
index 049a5faa187897..25ff96e1e85e47 100644
--- a/deps/npm/html/doc/cli/npm-search.html
+++ b/deps/npm/html/doc/cli/npm-search.html
@@ -12,8 +12,8 @@
 <h1><a href="../cli/npm-search.html">npm-search</a></h1> <p>Search for packages</p>
 <h2 id="synopsis">SYNOPSIS</h2>
 <pre><code>npm search [--long] [search terms ...]
-npm s [search terms ...]
-npm se [search terms ...]
+
+aliases: s, se
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>Search the registry for packages matching the search terms.</p>
 <p>If a term starts with <code>/</code>, then it&#39;s interpreted as a regular expression.
@@ -49,5 +49,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-search &mdash; npm@2.14.7</p>
+<p id="footer">npm-search &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-shrinkwrap.html b/deps/npm/html/doc/cli/npm-shrinkwrap.html
index 3d11d8e0e4d817..66e3b084869395 100644
--- a/deps/npm/html/doc/cli/npm-shrinkwrap.html
+++ b/deps/npm/html/doc/cli/npm-shrinkwrap.html
@@ -72,27 +72,33 @@ <h2 id="synopsis">SYNOPSIS</h2>
 </code></pre><p>This generates <code>npm-shrinkwrap.json</code>, which will look something like this:</p>
 <pre><code>{
   &quot;name&quot;: &quot;A&quot;,
-  &quot;version&quot;: &quot;0.1.0&quot;,
+  &quot;version&quot;: &quot;1.1.0&quot;,
   &quot;dependencies&quot;: {
     &quot;B&quot;: {
-      &quot;version&quot;: &quot;0.0.1&quot;,
+      &quot;version&quot;: &quot;1.0.1&quot;,
+      &quot;from&quot;: &quot;B@^1.0.0&quot;,
+      &quot;resolved&quot;: &quot;https://registry.npmjs.org/B/-/B-1.0.1.tgz&quot;,
       &quot;dependencies&quot;: {
         &quot;C&quot;: {
-          &quot;version&quot;: &quot;0.0.1&quot;
+          &quot;version&quot;: &quot;1.0.1&quot;,
+          &quot;from&quot;: &quot;org/C#v1.0.1&quot;,
+          &quot;resolved&quot;: &quot;git://github.com/org/C.git#5c380ae319fc4efe9e7f2d9c78b0faa588fd99b4&quot;
         }
       }
     }
   }
 }
-</code></pre><p>The shrinkwrap command has locked down the dependencies based on
-what&#39;s currently installed in node_modules.  When <code>npm install</code>
-installs a package with an <code>npm-shrinkwrap.json</code> in the package
-root, the shrinkwrap file (rather than <code>package.json</code> files) completely
-drives the installation of that package and all of its dependencies
-(recursively).  So now the author publishes A@0.1.0, and subsequent
-installs of this package will use B@0.0.1 and C@0.0.1, regardless the
-dependencies and versions listed in A&#39;s, B&#39;s, and C&#39;s <code>package.json</code>
-files.</p>
+</code></pre><p>The shrinkwrap command has locked down the dependencies based on what&#39;s
+currently installed in <code>node_modules</code>.  The installation behavior is changed to:</p>
+<ol>
+<li><p>The module tree described by the shrinkwrap is reproduced. This means
+reproducing the structure described in the file, using the specific files
+referenced in &quot;resolved&quot; if available, falling back to normal package
+resolution using &quot;version&quot; if one isn&#39;t.</p>
+</li>
+<li><p>The tree is walked and any missing dependencies are installed in the usual fasion.</p>
+</li>
+</ol>
 <h3 id="using-shrinkwrapped-packages">Using shrinkwrapped packages</h3>
 <p>Using a shrinkwrapped package is no different than using any other
 package: you can <code>npm install</code> it by hand, or add a dependency to your
@@ -110,15 +116,14 @@ <h3 id="building-shrinkwrapped-packages">Building shrinkwrapped packages</h3>
 <ol>
 <li>Run <code>npm install</code> in the package root to install the current
 versions of all dependencies.</li>
-<li>Add or update dependencies. <code>npm install</code> each new or updated
-package individually and then update <code>package.json</code>.  Note that they
-must be explicitly named in order to be installed: running <code>npm
-install</code> with no arguments will merely reproduce the existing
+<li>Add or update dependencies. <code>npm install --save</code> each new or updated
+package individually to update the <code>package.json</code> and the shrinkwrap.
+Note that they must be explicitly named in order to be installed: running
+<code>npm install</code> with no arguments will merely reproduce the existing
 shrinkwrap.</li>
 <li>Validate that the package works as expected with the new
 dependencies.</li>
-<li>Run <code>npm shrinkwrap</code>, commit the new <code>npm-shrinkwrap.json</code>, and
-publish your package.</li>
+<li>Commit the new <code>npm-shrinkwrap.json</code>, and publish your package.</li>
 </ol>
 <p>You can use <a href="../cli/npm-outdated.html">npm-outdated(1)</a> to view dependencies with newer versions
 available.</p>
@@ -164,5 +169,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-shrinkwrap &mdash; npm@2.14.7</p>
+<p id="footer">npm-shrinkwrap &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-star.html b/deps/npm/html/doc/cli/npm-star.html
index 6a33768b779697..c6a97f4192d3c6 100644
--- a/deps/npm/html/doc/cli/npm-star.html
+++ b/deps/npm/html/doc/cli/npm-star.html
@@ -11,8 +11,8 @@
 
 <h1><a href="../cli/npm-star.html">npm-star</a></h1> <p>Mark your favorite packages</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm star &lt;pkgname&gt; [&lt;pkg&gt;, ...]
-npm unstar &lt;pkgname&gt; [&lt;pkg&gt;, ...]
+<pre><code>npm star [&lt;pkg&gt;...]
+npm unstar [&lt;pkg&gt;...]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>&quot;Starring&quot; a package means that you have some interest in it.  It&#39;s
 a vaguely positive way to show that you care.</p>
@@ -36,5 +36,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-star &mdash; npm@2.14.7</p>
+<p id="footer">npm-star &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-stars.html b/deps/npm/html/doc/cli/npm-stars.html
index 89b23b0a8872c2..47aac754d33cab 100644
--- a/deps/npm/html/doc/cli/npm-stars.html
+++ b/deps/npm/html/doc/cli/npm-stars.html
@@ -11,8 +11,7 @@
 
 <h1><a href="../cli/npm-stars.html">npm-stars</a></h1> <p>View packages marked as favorites</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm stars
-npm stars [username]
+<pre><code>npm stars [&lt;user&gt;]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>If you have starred a lot of neat things and want to find them again
 quickly this command lets you do just that.</p>
@@ -37,5 +36,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-stars &mdash; npm@2.14.7</p>
+<p id="footer">npm-stars &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-start.html b/deps/npm/html/doc/cli/npm-start.html
index 718160b63eb421..1b5fb427f15ce3 100644
--- a/deps/npm/html/doc/cli/npm-start.html
+++ b/deps/npm/html/doc/cli/npm-start.html
@@ -34,5 +34,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-start &mdash; npm@2.14.7</p>
+<p id="footer">npm-start &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-stop.html b/deps/npm/html/doc/cli/npm-stop.html
index 2047d8e85417b2..b7b63c246289ca 100644
--- a/deps/npm/html/doc/cli/npm-stop.html
+++ b/deps/npm/html/doc/cli/npm-stop.html
@@ -34,5 +34,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-stop &mdash; npm@2.14.7</p>
+<p id="footer">npm-stop &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-tag.html b/deps/npm/html/doc/cli/npm-tag.html
index af7b2f746f6e9c..2a23eccd4a71ae 100644
--- a/deps/npm/html/doc/cli/npm-tag.html
+++ b/deps/npm/html/doc/cli/npm-tag.html
@@ -11,7 +11,8 @@
 
 <h1><a href="../cli/npm-tag.html">npm-tag</a></h1> <p>Tag a published version</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm tag &lt;name&gt;@&lt;version&gt; [&lt;tag&gt;]
+<pre><code>[DEPRECATED] npm tag &lt;name&gt;@&lt;version&gt; [&lt;tag&gt;]
+See `dist-tag`
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>THIS COMMAND IS DEPRECATED. See <a href="../cli/npm-dist-tag.html">npm-dist-tag(1)</a> for details.</p>
 <p>Tags the specified version of the package with the specified tag, or the
@@ -62,5 +63,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-tag &mdash; npm@2.14.7</p>
+<p id="footer">npm-tag &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-team.html b/deps/npm/html/doc/cli/npm-team.html
index cc23b76d82e007..60333b6c37669b 100644
--- a/deps/npm/html/doc/cli/npm-team.html
+++ b/deps/npm/html/doc/cli/npm-team.html
@@ -67,4 +67,4 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-team &mdash; npm@2.14.7</p>
+<p id="footer">npm-team &mdash; npm@3.3.6</p>
diff --git a/deps/npm/html/doc/cli/npm-test.html b/deps/npm/html/doc/cli/npm-test.html
index bcd729a7487a56..c48b3f6070740e 100644
--- a/deps/npm/html/doc/cli/npm-test.html
+++ b/deps/npm/html/doc/cli/npm-test.html
@@ -37,5 +37,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-test &mdash; npm@2.14.7</p>
+<p id="footer">npm-test &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-uninstall.html b/deps/npm/html/doc/cli/npm-uninstall.html
index 8763c40adb2922..6d7429bbd7af95 100644
--- a/deps/npm/html/doc/cli/npm-uninstall.html
+++ b/deps/npm/html/doc/cli/npm-uninstall.html
@@ -11,8 +11,9 @@
 
 <h1><a href="../cli/npm-rm.html">npm-rm</a></h1> <p>Remove a package</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm uninstall [@&lt;scope&gt;/]&lt;package&gt; [--save|--save-dev|--save-optional]
-npm rm (with any of the previous argument usage)
+<pre><code>npm uninstall [&lt;@scope&gt;/]&lt;pkg&gt;[@&lt;version&gt;]... [--save|--save-dev|--save-optional]
+
+aliases: remove, rm, r, un, unlink
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This uninstalls a package, completely removing everything npm installed
 on its behalf.</p>
@@ -30,6 +31,8 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <li><p><code>--save-optional</code>: Package will be removed from your <code>optionalDependencies</code>.</p>
 </li>
 </ul>
+<p>Further, if you have an <code>npm-shrinkwrap.json</code> then it will be updated as
+well.</p>
 <p>Scope is optional and follows the usual rules for <code><a href="../misc/npm-scope.html">npm-scope(7)</a></code>.</p>
 <p>Examples:</p>
 <pre><code>npm uninstall sax --save
@@ -57,5 +60,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-uninstall &mdash; npm@2.14.7</p>
+<p id="footer">npm-uninstall &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-unpublish.html b/deps/npm/html/doc/cli/npm-unpublish.html
index 667802cd4ccc65..a5495578f4049e 100644
--- a/deps/npm/html/doc/cli/npm-unpublish.html
+++ b/deps/npm/html/doc/cli/npm-unpublish.html
@@ -11,7 +11,7 @@
 
 <h1><a href="../cli/npm-unpublish.html">npm-unpublish</a></h1> <p>Remove a package from the registry</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm unpublish [@&lt;scope&gt;/]&lt;name&gt;[@&lt;version&gt;]
+<pre><code>npm unpublish [&lt;@scope&gt;/]&lt;pkg&gt;[@&lt;version&gt;]
 </code></pre><h2 id="warning">WARNING</h2>
 <p><strong>It is generally considered bad behavior to remove versions of a library
 that others are depending on!</strong></p>
@@ -47,5 +47,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-unpublish &mdash; npm@2.14.7</p>
+<p id="footer">npm-unpublish &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-update.html b/deps/npm/html/doc/cli/npm-update.html
index e08a2c115044b6..0dcbb63f3058cc 100644
--- a/deps/npm/html/doc/cli/npm-update.html
+++ b/deps/npm/html/doc/cli/npm-update.html
@@ -11,7 +11,7 @@
 
 <h1><a href="../cli/npm-update.html">npm-update</a></h1> <p>Update a package</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm update [-g] [&lt;name&gt; [&lt;name&gt; ...]]
+<pre><code>npm update [-g] [&lt;pkg&gt;...]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This command will update all the packages listed to the latest version
 (specified by the <code>tag</code> config), respecting semver.</p>
@@ -119,5 +119,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-update &mdash; npm@2.14.7</p>
+<p id="footer">npm-update &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-version.html b/deps/npm/html/doc/cli/npm-version.html
index 34bb9c956bb89a..3c03604995ba4a 100644
--- a/deps/npm/html/doc/cli/npm-version.html
+++ b/deps/npm/html/doc/cli/npm-version.html
@@ -12,6 +12,10 @@
 <h1><a href="../cli/npm-version.html">npm-version</a></h1> <p>Bump a package version</p>
 <h2 id="synopsis">SYNOPSIS</h2>
 <pre><code>npm version [&lt;newversion&gt; | major | minor | patch | premajor | preminor | prepatch | prerelease]
+
+&#39;npm -v&#39; or &#39;npm --version&#39; to print npm version
+&#39;npm view &lt;pkg&gt; version&#39; to view a package&#39;s published version
+&#39;npm ls&#39; to inspect current package/dependency versions
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>Run this in a package directory to bump the version and write the new
 data back to <code>package.json</code> and, if present, <code>npm-shrinkwrap.json</code>.</p>
@@ -50,7 +54,7 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <li>Run the <code>preversion</code> script. These scripts have access to the old <code>version</code> in package.json.
 A typical use would be running your full test suite before deploying.
 Any files you want added to the commit should be explicitly added using <code>git add</code>.</li>
-<li>Bump <code>version</code> in <code>package.json</code> as requested (<code>patch</code>, <code>minor</code>, <code>major</code>, etc). </li>
+<li>Bump <code>version</code> in <code>package.json</code> as requested (<code>patch</code>, <code>minor</code>, <code>major</code>, etc).</li>
 <li>Run the <code>version</code> script. These scripts have access to the new <code>version</code> in package.json
 (so they can incorporate it into file headers in generated files for example).
 Again, scripts should explicitly add generated files to the commit using <code>git add</code>.</li>
@@ -95,5 +99,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-version &mdash; npm@2.14.7</p>
+<p id="footer">npm-version &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-view.html b/deps/npm/html/doc/cli/npm-view.html
index 930a299af6e1ea..af6d7360110f51 100644
--- a/deps/npm/html/doc/cli/npm-view.html
+++ b/deps/npm/html/doc/cli/npm-view.html
@@ -11,8 +11,9 @@
 
 <h1><a href="../cli/npm-view.html">npm-view</a></h1> <p>View registry info</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm view [@&lt;scope&gt;/]&lt;name&gt;[@&lt;version&gt;] [&lt;field&gt;[.&lt;subfield&gt;]...]
-npm v [@&lt;scope&gt;/]&lt;name&gt;[@&lt;version&gt;] [&lt;field&gt;[.&lt;subfield&gt;]...]
+<pre><code>npm view [&lt;@scope&gt;/]&lt;name&gt;[@&lt;version&gt;] [&lt;field&gt;[.&lt;subfield&gt;]...]
+
+aliases: info, show, v
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This command shows data about a package and prints it to the stream
 referenced by the <code>outfd</code> config, which defaults to stdout.</p>
@@ -82,5 +83,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-view &mdash; npm@2.14.7</p>
+<p id="footer">npm-view &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm-whoami.html b/deps/npm/html/doc/cli/npm-whoami.html
index 1f25215aeb5a46..2cb374a5ed0699 100644
--- a/deps/npm/html/doc/cli/npm-whoami.html
+++ b/deps/npm/html/doc/cli/npm-whoami.html
@@ -11,7 +11,7 @@
 
 <h1><a href="../cli/npm-whoami.html">npm-whoami</a></h1> <p>Display npm username</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm whoami
+<pre><code>npm whoami [--registry &lt;registry&gt;]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>Print the <code>username</code> config to standard output.</p>
 <h2 id="see-also">SEE ALSO</h2>
@@ -33,5 +33,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-whoami &mdash; npm@2.14.7</p>
+<p id="footer">npm-whoami &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/cli/npm.html b/deps/npm/html/doc/cli/npm.html
index 9fd4df9b2d30c4..7581ad5a29efa6 100644
--- a/deps/npm/html/doc/cli/npm.html
+++ b/deps/npm/html/doc/cli/npm.html
@@ -13,7 +13,7 @@ <h1><a href="../cli/npm.html">npm</a></h1> <p>javascript package manager</p>
 <h2 id="synopsis">SYNOPSIS</h2>
 <pre><code>npm &lt;command&gt; [args]
 </code></pre><h2 id="version">VERSION</h2>
-<p>2.14.7</p>
+<p>3.3.6</p>
 <h2 id="description">DESCRIPTION</h2>
 <p>npm is the package manager for the Node JavaScript platform.  It puts
 modules in place so that node can find them, and manages dependency
@@ -110,7 +110,7 @@ <h2 id="contributions">CONTRIBUTIONS</h2>
 the issues list or ask on the mailing list.</p>
 <ul>
 <li><a href="http://github.com/npm/npm/issues">http://github.com/npm/npm/issues</a></li>
-<li><a href="&#x6d;&#x61;&#105;&#108;&#116;&#111;&#58;&#110;&#112;&#x6d;&#x2d;&#64;&#x67;&#111;&#111;&#103;&#x6c;&#101;&#103;&#114;&#111;&#117;&#112;&#x73;&#x2e;&#99;&#111;&#x6d;">&#110;&#112;&#x6d;&#x2d;&#64;&#x67;&#111;&#111;&#103;&#x6c;&#101;&#103;&#114;&#111;&#117;&#112;&#x73;&#x2e;&#99;&#111;&#x6d;</a></li>
+<li><a href="&#x6d;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#x6e;&#x70;&#109;&#45;&#64;&#x67;&#x6f;&#111;&#103;&#x6c;&#x65;&#x67;&#x72;&#x6f;&#x75;&#112;&#x73;&#46;&#x63;&#x6f;&#109;">&#x6e;&#x70;&#109;&#45;&#64;&#x67;&#x6f;&#111;&#103;&#x6c;&#x65;&#x67;&#x72;&#x6f;&#x75;&#112;&#x73;&#46;&#x63;&#x6f;&#109;</a></li>
 </ul>
 <h2 id="bugs">BUGS</h2>
 <p>When you find issues, please report them:</p>
@@ -118,7 +118,7 @@ <h2 id="bugs">BUGS</h2>
 <li>web:
 <a href="http://github.com/npm/npm/issues">http://github.com/npm/npm/issues</a></li>
 <li>email:
-<a href="&#x6d;&#x61;&#105;&#108;&#116;&#111;&#58;&#x6e;&#112;&#x6d;&#x2d;&#x40;&#103;&#111;&#111;&#x67;&#x6c;&#101;&#x67;&#x72;&#x6f;&#x75;&#x70;&#x73;&#46;&#99;&#111;&#109;">&#x6e;&#112;&#x6d;&#x2d;&#x40;&#103;&#111;&#111;&#x67;&#x6c;&#101;&#x67;&#x72;&#x6f;&#x75;&#x70;&#x73;&#46;&#99;&#111;&#109;</a></li>
+<a href="&#109;&#97;&#105;&#x6c;&#x74;&#111;&#x3a;&#x6e;&#112;&#x6d;&#x2d;&#64;&#103;&#111;&#111;&#x67;&#x6c;&#101;&#103;&#x72;&#111;&#117;&#x70;&#x73;&#46;&#x63;&#111;&#109;">&#x6e;&#112;&#x6d;&#x2d;&#64;&#103;&#111;&#111;&#x67;&#x6c;&#101;&#103;&#x72;&#111;&#117;&#x70;&#x73;&#46;&#x63;&#111;&#109;</a></li>
 </ul>
 <p>Be sure to include <em>all</em> of the output from the npm command that didn&#39;t work
 as expected.  The <code>npm-debug.log</code> file is also helpful to provide.</p>
@@ -128,7 +128,7 @@ <h2 id="author">AUTHOR</h2>
 <p><a href="http://blog.izs.me/">Isaac Z. Schlueter</a> ::
 <a href="https://github.com/isaacs/">isaacs</a> ::
 <a href="http://twitter.com/izs">@izs</a> ::
-<a href="&#x6d;&#x61;&#x69;&#108;&#x74;&#x6f;&#58;&#105;&#64;&#105;&#x7a;&#x73;&#46;&#x6d;&#101;">&#105;&#64;&#105;&#x7a;&#x73;&#46;&#x6d;&#101;</a></p>
+<a href="&#109;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#105;&#64;&#x69;&#122;&#x73;&#46;&#x6d;&#101;">&#105;&#64;&#x69;&#122;&#x73;&#46;&#x6d;&#101;</a></p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
 <li><a href="../cli/npm-help.html">npm-help(1)</a></li>
@@ -154,5 +154,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm &mdash; npm@2.14.7</p>
+<p id="footer">npm &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/files/npm-folders.html b/deps/npm/html/doc/files/npm-folders.html
index 71ac40170d7b67..95b1a32575936f 100644
--- a/deps/npm/html/doc/files/npm-folders.html
+++ b/deps/npm/html/doc/files/npm-folders.html
@@ -184,5 +184,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-folders &mdash; npm@2.14.7</p>
+<p id="footer">npm-folders &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/files/npm-global.html b/deps/npm/html/doc/files/npm-global.html
index 71ac40170d7b67..95b1a32575936f 100644
--- a/deps/npm/html/doc/files/npm-global.html
+++ b/deps/npm/html/doc/files/npm-global.html
@@ -184,5 +184,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-folders &mdash; npm@2.14.7</p>
+<p id="footer">npm-folders &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/files/npm-json.html b/deps/npm/html/doc/files/npm-json.html
index 9fecd63fa7865d..e9f9c2f78d3aea 100644
--- a/deps/npm/html/doc/files/npm-json.html
+++ b/deps/npm/html/doc/files/npm-json.html
@@ -473,15 +473,9 @@ <h2 id="engines">engines</h2>
 </code></pre><p>Note that, unless the user has set the <code>engine-strict</code> config flag, this
 field is advisory only.</p>
 <h2 id="enginestrict">engineStrict</h2>
-<p><strong>NOTE: This feature is deprecated and will be removed in npm 3.0.0.</strong></p>
-<p>If you are sure that your module will <em>definitely not</em> run properly on
-versions of Node/npm other than those specified in the <code>engines</code> object,
-then you can set <code>&quot;engineStrict&quot;: true</code> in your package.json file.
-This will override the user&#39;s <code>engine-strict</code> config setting.</p>
-<p>Please do not do this unless you are really very very sure.  If your
-engines object is something overly restrictive, you can quite easily and
-inadvertently lock yourself into obscurity and prevent your users from
-updating to new versions of Node.  Consider this choice carefully.</p>
+<p><strong>This feature was deprecated with npm 3.0.0</strong></p>
+<p>Prior to npm 3.0.0, this feature was used to treat this package as if the
+user had set <code>engine-strict</code>.</p>
 <h2 id="os">os</h2>
 <p>You can specify which operating systems your
 module will run on:</p>
@@ -565,5 +559,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">package.json &mdash; npm@2.14.7</p>
+<p id="footer">package.json &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/files/npmrc.html b/deps/npm/html/doc/files/npmrc.html
index 01a596ff22fc8e..86742503c32f50 100644
--- a/deps/npm/html/doc/files/npmrc.html
+++ b/deps/npm/html/doc/files/npmrc.html
@@ -83,5 +83,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npmrc &mdash; npm@2.14.7</p>
+<p id="footer">npmrc &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/files/package.json.html b/deps/npm/html/doc/files/package.json.html
index 9fecd63fa7865d..e9f9c2f78d3aea 100644
--- a/deps/npm/html/doc/files/package.json.html
+++ b/deps/npm/html/doc/files/package.json.html
@@ -473,15 +473,9 @@ <h2 id="engines">engines</h2>
 </code></pre><p>Note that, unless the user has set the <code>engine-strict</code> config flag, this
 field is advisory only.</p>
 <h2 id="enginestrict">engineStrict</h2>
-<p><strong>NOTE: This feature is deprecated and will be removed in npm 3.0.0.</strong></p>
-<p>If you are sure that your module will <em>definitely not</em> run properly on
-versions of Node/npm other than those specified in the <code>engines</code> object,
-then you can set <code>&quot;engineStrict&quot;: true</code> in your package.json file.
-This will override the user&#39;s <code>engine-strict</code> config setting.</p>
-<p>Please do not do this unless you are really very very sure.  If your
-engines object is something overly restrictive, you can quite easily and
-inadvertently lock yourself into obscurity and prevent your users from
-updating to new versions of Node.  Consider this choice carefully.</p>
+<p><strong>This feature was deprecated with npm 3.0.0</strong></p>
+<p>Prior to npm 3.0.0, this feature was used to treat this package as if the
+user had set <code>engine-strict</code>.</p>
 <h2 id="os">os</h2>
 <p>You can specify which operating systems your
 module will run on:</p>
@@ -565,5 +559,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">package.json &mdash; npm@2.14.7</p>
+<p id="footer">package.json &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/index.html b/deps/npm/html/doc/index.html
index 7cc68acd4a8cb0..721c111d9518e4 100644
--- a/deps/npm/html/doc/index.html
+++ b/deps/npm/html/doc/index.html
@@ -80,8 +80,6 @@ <h3 id="npm-repo-1-"><a href="cli/npm-repo.html">npm-repo(1)</a></h3>
 <p>Open package repository page in the browser</p>
 <h3 id="npm-restart-1-"><a href="cli/npm-restart.html">npm-restart(1)</a></h3>
 <p>Restart a package</p>
-<h3 id="npm-rm-1-"><a href="cli/npm-rm.html">npm-rm(1)</a></h3>
-<p>Remove a package</p>
 <h3 id="npm-root-1-"><a href="cli/npm-root.html">npm-root(1)</a></h3>
 <p>Display npm root</p>
 <h3 id="npm-run-script-1-"><a href="cli/npm-run-script.html">npm-run-script(1)</a></h3>
@@ -118,86 +116,6 @@ <h3 id="npm-whoami-1-"><a href="cli/npm-whoami.html">npm-whoami(1)</a></h3>
 <p>Display npm username</p>
 <h2 id="api-documentation">API Documentation</h2>
 <p>Using npm in your Node programs</p>
-<h3 id="npm-3-"><a href="api/npm.html">npm(3)</a></h3>
-<p>javascript package manager</p>
-<h3 id="npm-bin-3-"><a href="api/npm-bin.html">npm-bin(3)</a></h3>
-<p>Display npm bin folder</p>
-<h3 id="npm-bugs-3-"><a href="api/npm-bugs.html">npm-bugs(3)</a></h3>
-<p>Bugs for a package in a web browser maybe</p>
-<h3 id="npm-cache-3-"><a href="api/npm-cache.html">npm-cache(3)</a></h3>
-<p>manage the npm cache programmatically</p>
-<h3 id="npm-commands-3-"><a href="api/npm-commands.html">npm-commands(3)</a></h3>
-<p>npm commands</p>
-<h3 id="npm-config-3-"><a href="api/npm-config.html">npm-config(3)</a></h3>
-<p>Manage the npm configuration files</p>
-<h3 id="npm-deprecate-3-"><a href="api/npm-deprecate.html">npm-deprecate(3)</a></h3>
-<p>Deprecate a version of a package</p>
-<h3 id="npm-docs-3-"><a href="api/npm-docs.html">npm-docs(3)</a></h3>
-<p>Docs for a package in a web browser maybe</p>
-<h3 id="npm-edit-3-"><a href="api/npm-edit.html">npm-edit(3)</a></h3>
-<p>Edit an installed package</p>
-<h3 id="npm-explore-3-"><a href="api/npm-explore.html">npm-explore(3)</a></h3>
-<p>Browse an installed package</p>
-<h3 id="npm-help-search-3-"><a href="api/npm-help-search.html">npm-help-search(3)</a></h3>
-<p>Search the help pages</p>
-<h3 id="npm-init-3-"><a href="api/npm-init.html">npm-init(3)</a></h3>
-<p>Interactively create a package.json file</p>
-<h3 id="npm-install-3-"><a href="api/npm-install.html">npm-install(3)</a></h3>
-<p>install a package programmatically</p>
-<h3 id="npm-link-3-"><a href="api/npm-link.html">npm-link(3)</a></h3>
-<p>Symlink a package folder</p>
-<h3 id="npm-load-3-"><a href="api/npm-load.html">npm-load(3)</a></h3>
-<p>Load config settings</p>
-<h3 id="npm-ls-3-"><a href="api/npm-ls.html">npm-ls(3)</a></h3>
-<p>List installed packages</p>
-<h3 id="npm-outdated-3-"><a href="api/npm-outdated.html">npm-outdated(3)</a></h3>
-<p>Check for outdated packages</p>
-<h3 id="npm-owner-3-"><a href="api/npm-owner.html">npm-owner(3)</a></h3>
-<p>Manage package owners</p>
-<h3 id="npm-pack-3-"><a href="api/npm-pack.html">npm-pack(3)</a></h3>
-<p>Create a tarball from a package</p>
-<h3 id="npm-ping-3-"><a href="api/npm-ping.html">npm-ping(3)</a></h3>
-<p>Ping npm registry</p>
-<h3 id="npm-prefix-3-"><a href="api/npm-prefix.html">npm-prefix(3)</a></h3>
-<p>Display prefix</p>
-<h3 id="npm-prune-3-"><a href="api/npm-prune.html">npm-prune(3)</a></h3>
-<p>Remove extraneous packages</p>
-<h3 id="npm-publish-3-"><a href="api/npm-publish.html">npm-publish(3)</a></h3>
-<p>Publish a package</p>
-<h3 id="npm-rebuild-3-"><a href="api/npm-rebuild.html">npm-rebuild(3)</a></h3>
-<p>Rebuild a package</p>
-<h3 id="npm-repo-3-"><a href="api/npm-repo.html">npm-repo(3)</a></h3>
-<p>Open package repository page in the browser</p>
-<h3 id="npm-restart-3-"><a href="api/npm-restart.html">npm-restart(3)</a></h3>
-<p>Restart a package</p>
-<h3 id="npm-root-3-"><a href="api/npm-root.html">npm-root(3)</a></h3>
-<p>Display npm root</p>
-<h3 id="npm-run-script-3-"><a href="api/npm-run-script.html">npm-run-script(3)</a></h3>
-<p>Run arbitrary package scripts</p>
-<h3 id="npm-search-3-"><a href="api/npm-search.html">npm-search(3)</a></h3>
-<p>Search for packages</p>
-<h3 id="npm-shrinkwrap-3-"><a href="api/npm-shrinkwrap.html">npm-shrinkwrap(3)</a></h3>
-<p>programmatically generate package shrinkwrap file</p>
-<h3 id="npm-start-3-"><a href="api/npm-start.html">npm-start(3)</a></h3>
-<p>Start a package</p>
-<h3 id="npm-stop-3-"><a href="api/npm-stop.html">npm-stop(3)</a></h3>
-<p>Stop a package</p>
-<h3 id="npm-tag-3-"><a href="api/npm-tag.html">npm-tag(3)</a></h3>
-<p>Tag a published version</p>
-<h3 id="npm-test-3-"><a href="api/npm-test.html">npm-test(3)</a></h3>
-<p>Test a package</p>
-<h3 id="npm-uninstall-3-"><a href="api/npm-uninstall.html">npm-uninstall(3)</a></h3>
-<p>uninstall a package programmatically</p>
-<h3 id="npm-unpublish-3-"><a href="api/npm-unpublish.html">npm-unpublish(3)</a></h3>
-<p>Remove a package from the registry</p>
-<h3 id="npm-update-3-"><a href="api/npm-update.html">npm-update(3)</a></h3>
-<p>Update a package</p>
-<h3 id="npm-version-3-"><a href="api/npm-version.html">npm-version(3)</a></h3>
-<p>Bump a package version</p>
-<h3 id="npm-view-3-"><a href="api/npm-view.html">npm-view(3)</a></h3>
-<p>View registry info</p>
-<h3 id="npm-whoami-3-"><a href="api/npm-whoami.html">npm-whoami(3)</a></h3>
-<p>Display npm username</p>
 <h2 id="files">Files</h2>
 <p>File system structures npm uses</p>
 <h3 id="npm-folders-5-"><a href="files/npm-folders.html">npm-folders(5)</a></h3>
@@ -220,8 +138,6 @@ <h3 id="npm-faq-7-"><a href="misc/npm-faq.html">npm-faq(7)</a></h3>
 <p>Frequently Asked Questions</p>
 <h3 id="npm-index-7-"><a href="misc/npm-index.html">npm-index(7)</a></h3>
 <p>Index of all npm documentation</p>
-<h3 id="npm-orgs-7-"><a href="misc/npm-orgs.html">npm-orgs(7)</a></h3>
-<p>Working with Teams &amp; Orgs</p>
 <h3 id="npm-registry-7-"><a href="misc/npm-registry.html">npm-registry(7)</a></h3>
 <p>The JavaScript Package Registry</p>
 <h3 id="npm-scope-7-"><a href="misc/npm-scope.html">npm-scope(7)</a></h3>
@@ -244,5 +160,5 @@ <h3 id="semver-7-"><a href="misc/semver.html">semver(7)</a></h3>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-index &mdash; npm@2.14.7</p>
+<p id="footer">npm-index &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/misc/npm-coding-style.html b/deps/npm/html/doc/misc/npm-coding-style.html
index ac3c95c105c933..ef9d62dca79de5 100644
--- a/deps/npm/html/doc/misc/npm-coding-style.html
+++ b/deps/npm/html/doc/misc/npm-coding-style.html
@@ -147,5 +147,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-coding-style &mdash; npm@2.14.7</p>
+<p id="footer">npm-coding-style &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/misc/npm-config.html b/deps/npm/html/doc/misc/npm-config.html
index 0fd36894c9d06f..e715e0541eb3cf 100644
--- a/deps/npm/html/doc/misc/npm-config.html
+++ b/deps/npm/html/doc/misc/npm-config.html
@@ -30,7 +30,7 @@ <h3 id="npmrc-files">npmrc Files</h3>
 <ul>
 <li>per-project config file (/path/to/my/project/.npmrc)</li>
 <li>per-user config file (~/.npmrc)</li>
-<li>global config file ($PREFIX/npmrc)</li>
+<li>global config file ($PREFIX/etc/npmrc)</li>
 <li>npm builtin config file (/path/to/npm/npmrc)</li>
 </ul>
 <p>See <a href="../files/npmrc.html">npmrc(5)</a> for more details.</p>
@@ -107,6 +107,13 @@ <h3 id="always-auth">always-auth</h3>
 </ul>
 <p>Force npm to always require authentication when accessing the registry,
 even for <code>GET</code> requests.</p>
+<h3 id="also">also</h3>
+<ul>
+<li>Default: null</li>
+<li>Type: String</li>
+</ul>
+<p>When &quot;dev&quot; or &quot;development&quot; and running local <code>npm shrinkwrap</code>,
+<code>npm outdated</code>, or <code>npm update</code>, is an alias for <code>--dev</code>.</p>
 <h3 id="bin-links">bin-links</h3>
 <ul>
 <li>Default: <code>true</code></li>
@@ -226,6 +233,16 @@ <h3 id="dev">dev</h3>
 <p>Install <code>dev-dependencies</code> along with packages.</p>
 <p>Note that <code>dev-dependencies</code> are also installed if the <code>npat</code> flag is
 set.</p>
+<h3 id="dry-run">dry-run</h3>
+<ul>
+<li>Default: false</li>
+<li>Type: Boolean</li>
+</ul>
+<p>Indicates that you don&#39;t want npm to make any changes and that it should
+only report what it would have done.  This can be passed into any of the
+commands that modify your local installation, eg, <code>install</code>, <code>update</code>,
+<code>dedupe</code>, <code>uninstall</code>.  This is NOT currently honored by network related
+commands, eg <code>dist-tags</code>, <code>owner</code>, <code>publish</code>, etc.</p>
 <h3 id="editor">editor</h3>
 <ul>
 <li>Default: <code>EDITOR</code> environment variable if set, or <code>&quot;vi&quot;</code> on Posix,
@@ -483,6 +500,20 @@ <h3 id="onload-script">onload-script</h3>
 </ul>
 <p>A node module to <code>require()</code> when npm loads.  Useful for programmatic
 usage.</p>
+<h3 id="only">only</h3>
+<ul>
+<li>Default: null</li>
+<li>Type: String</li>
+</ul>
+<p>When &quot;dev&quot; or &quot;development&quot; and running local <code>npm install</code> without any
+arguments, only devDependencies (and their dependencies) are installed.</p>
+<p>When &quot;dev&quot; or &quot;development&quot; and running local <code>npm ls</code>, <code>npm outdated</code>, or
+<code>npm update</code>, is an alias for <code>--dev</code>.</p>
+<p>When &quot;prod&quot; or &quot;production&quot; and running local <code>npm install</code> without any
+arguments, only non-devDependencies (and their dependencies) are
+installed.</p>
+<p>When &quot;prod&quot; or &quot;production&quot; and running local <code>npm ls</code>, <code>npm outdated</code>, or
+<code>npm update</code>, is an alias for <code>--production</code>.</p>
 <h3 id="optional">optional</h3>
 <ul>
 <li>Default: true</li>
@@ -516,6 +547,14 @@ <h3 id="production">production</h3>
 local <code>npm install</code> without any arguments.</li>
 <li>Set the NODE_ENV=&quot;production&quot; for lifecycle scripts.</li>
 </ol>
+<h3 id="progress">progress</h3>
+<ul>
+<li>Default: true</li>
+<li>Type: Boolean</li>
+</ul>
+<p>When set to <code>true</code>, npm will display a progress bar during time intensive
+operations, if <code>process.stderr</code> is a TTY.</p>
+<p>Set to <code>false</code> to suppress the progress bar.</p>
 <h3 id="proprietary-attribs">proprietary-attribs</h3>
 <ul>
 <li>Default: true</li>
@@ -663,15 +702,6 @@ <h3 id="sign-git-tag">sign-git-tag</h3>
 using <code>-s</code> to add a signature.</p>
 <p>Note that git requires you to have set up GPG keys in your git configs
 for this to work properly.</p>
-<h3 id="spin">spin</h3>
-<ul>
-<li>Default: true</li>
-<li>Type: Boolean or <code>&quot;always&quot;</code></li>
-</ul>
-<p>When set to <code>true</code>, npm will display an ascii spinner while it is doing
-things, if <code>process.stderr</code> is a TTY.</p>
-<p>Set to <code>false</code> to suppress the spinner, or set to <code>always</code> to output
-the spinner even for non-TTY outputs.</p>
 <h3 id="strict-ssl">strict-ssl</h3>
 <ul>
 <li>Default: true</li>
@@ -709,7 +739,7 @@ <h3 id="tmp">tmp</h3>
 on success, but left behind on failure for forensic purposes.</p>
 <h3 id="unicode">unicode</h3>
 <ul>
-<li>Default: true</li>
+<li>Default: true on windows and mac/unix systems with a unicode locale</li>
 <li>Type: Boolean</li>
 </ul>
 <p>When set to true, npm uses unicode characters in the tree output.  When
@@ -799,5 +829,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-config &mdash; npm@2.14.7</p>
+<p id="footer">npm-config &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/misc/npm-developers.html b/deps/npm/html/doc/misc/npm-developers.html
index 03d1a8eda0d1c0..f291fb4e1d7a1b 100644
--- a/deps/npm/html/doc/misc/npm-developers.html
+++ b/deps/npm/html/doc/misc/npm-developers.html
@@ -195,5 +195,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-developers &mdash; npm@2.14.7</p>
+<p id="footer">npm-developers &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/misc/npm-disputes.html b/deps/npm/html/doc/misc/npm-disputes.html
index cf739f6b1c5e80..d7c75970855206 100644
--- a/deps/npm/html/doc/misc/npm-disputes.html
+++ b/deps/npm/html/doc/misc/npm-disputes.html
@@ -13,7 +13,7 @@ <h1><a href="../misc/npm-disputes.html">npm-disputes</a></h1> <p>Handling Module
 <h2 id="synopsis">SYNOPSIS</h2>
 <ol>
 <li>Get the author email with <code>npm owner ls &lt;pkgname&gt;</code></li>
-<li>Email the author, CC <a href="&#109;&#x61;&#x69;&#108;&#116;&#111;&#58;&#x73;&#x75;&#x70;&#112;&#111;&#114;&#116;&#64;&#110;&#x70;&#x6d;&#x6a;&#115;&#46;&#99;&#x6f;&#x6d;">&#x73;&#x75;&#x70;&#112;&#111;&#114;&#116;&#64;&#110;&#x70;&#x6d;&#x6a;&#115;&#46;&#99;&#x6f;&#x6d;</a></li>
+<li>Email the author, CC <a href="&#109;&#x61;&#105;&#108;&#x74;&#111;&#58;&#115;&#x75;&#x70;&#x70;&#111;&#114;&#x74;&#64;&#x6e;&#x70;&#109;&#106;&#x73;&#x2e;&#99;&#x6f;&#x6d;">&#115;&#x75;&#x70;&#x70;&#111;&#114;&#x74;&#64;&#x6e;&#x70;&#109;&#106;&#x73;&#x2e;&#99;&#x6f;&#x6d;</a></li>
 <li>After a few weeks, if there&#39;s no resolution, we&#39;ll sort it out.</li>
 </ol>
 <p>Don&#39;t squat on package names.  Publish code or move out of the way.</p>
@@ -51,12 +51,12 @@ <h2 id="description">DESCRIPTION</h2>
 owner (Bob).</li>
 <li>Joe emails Bob, explaining the situation <strong>as respectfully as
 possible</strong>, and what he would like to do with the module name.  He
-adds the npm support staff <a href="&#x6d;&#97;&#105;&#x6c;&#x74;&#111;&#58;&#x73;&#x75;&#x70;&#x70;&#x6f;&#x72;&#116;&#64;&#x6e;&#112;&#x6d;&#106;&#115;&#x2e;&#99;&#111;&#x6d;">&#x73;&#x75;&#x70;&#x70;&#x6f;&#x72;&#116;&#64;&#x6e;&#112;&#x6d;&#106;&#115;&#x2e;&#99;&#111;&#x6d;</a> to the CC list of
+adds the npm support staff <a href="&#109;&#x61;&#105;&#108;&#116;&#111;&#x3a;&#115;&#117;&#112;&#x70;&#111;&#x72;&#116;&#x40;&#110;&#112;&#x6d;&#106;&#x73;&#46;&#99;&#111;&#109;">&#115;&#117;&#112;&#x70;&#111;&#x72;&#116;&#x40;&#110;&#112;&#x6d;&#106;&#x73;&#46;&#99;&#111;&#109;</a> to the CC list of
 the email.  Mention in the email that Bob can run <code>npm owner add
 joe foo</code> to add Joe as an owner of the <code>foo</code> package.</li>
 <li>After a reasonable amount of time, if Bob has not responded, or if
 Bob and Joe can&#39;t come to any sort of resolution, email support
-<a href="&#109;&#97;&#105;&#x6c;&#x74;&#111;&#58;&#115;&#x75;&#x70;&#112;&#x6f;&#114;&#116;&#x40;&#110;&#x70;&#109;&#106;&#x73;&#46;&#x63;&#111;&#x6d;">&#115;&#x75;&#x70;&#112;&#x6f;&#114;&#116;&#x40;&#110;&#x70;&#109;&#106;&#x73;&#46;&#x63;&#111;&#x6d;</a> and we&#39;ll sort it out.  (&quot;Reasonable&quot; is
+<a href="&#x6d;&#97;&#x69;&#x6c;&#x74;&#111;&#58;&#x73;&#x75;&#112;&#x70;&#111;&#114;&#116;&#x40;&#110;&#112;&#x6d;&#x6a;&#115;&#x2e;&#99;&#111;&#x6d;">&#x73;&#x75;&#112;&#x70;&#111;&#114;&#116;&#x40;&#110;&#112;&#x6d;&#x6a;&#115;&#x2e;&#99;&#111;&#x6d;</a> and we&#39;ll sort it out.  (&quot;Reasonable&quot; is
 usually at least 4 weeks, but extra time is allowed around common
 holidays.)</li>
 </ol>
@@ -112,5 +112,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-disputes &mdash; npm@2.14.7</p>
+<p id="footer">npm-disputes &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/misc/npm-faq.html b/deps/npm/html/doc/misc/npm-faq.html
index eb017f3001274c..a6eaaaedba4b3f 100644
--- a/deps/npm/html/doc/misc/npm-faq.html
+++ b/deps/npm/html/doc/misc/npm-faq.html
@@ -237,7 +237,7 @@ <h2 id="i-get-econnrefused-a-lot-what-s-up-">I get ECONNREFUSED a lot.  What&#39
 <p>To check if the registry is down, open up
 <a href="https://registry.npmjs.org/">https://registry.npmjs.org/</a> in a web browser.  This will also tell
 you if you are just unable to access the internet for some reason.</p>
-<p>If the registry IS down, let us know by emailing <a href="&#x6d;&#x61;&#x69;&#108;&#x74;&#x6f;&#x3a;&#115;&#x75;&#x70;&#112;&#x6f;&#x72;&#x74;&#64;&#x6e;&#x70;&#109;&#106;&#115;&#x2e;&#x63;&#111;&#109;">&#115;&#x75;&#x70;&#112;&#x6f;&#x72;&#x74;&#64;&#x6e;&#x70;&#109;&#106;&#115;&#x2e;&#x63;&#111;&#109;</a>
+<p>If the registry IS down, let us know by emailing <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#111;&#58;&#115;&#x75;&#112;&#x70;&#111;&#114;&#x74;&#64;&#x6e;&#x70;&#x6d;&#106;&#x73;&#x2e;&#x63;&#x6f;&#x6d;">&#115;&#x75;&#112;&#x70;&#111;&#114;&#x74;&#64;&#x6e;&#x70;&#x6d;&#106;&#x73;&#x2e;&#x63;&#x6f;&#x6d;</a>
 or posting an issue at <a href="https://github.com/npm/npm/issues">https://github.com/npm/npm/issues</a>.  If it&#39;s
 down for the world (and not just on your local network) then we&#39;re
 probably already being pinged about it.</p>
@@ -308,5 +308,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-faq &mdash; npm@2.14.7</p>
+<p id="footer">npm-faq &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/misc/npm-index.html b/deps/npm/html/doc/misc/npm-index.html
index 2f7381b625bca0..d91644ad5dbd75 100644
--- a/deps/npm/html/doc/misc/npm-index.html
+++ b/deps/npm/html/doc/misc/npm-index.html
@@ -80,8 +80,6 @@ <h3 id="npm-repo-1-"><a href="../cli/npm-repo.html">npm-repo(1)</a></h3>
 <p>Open package repository page in the browser</p>
 <h3 id="npm-restart-1-"><a href="../cli/npm-restart.html">npm-restart(1)</a></h3>
 <p>Restart a package</p>
-<h3 id="npm-rm-1-"><a href="../cli/npm-rm.html">npm-rm(1)</a></h3>
-<p>Remove a package</p>
 <h3 id="npm-root-1-"><a href="../cli/npm-root.html">npm-root(1)</a></h3>
 <p>Display npm root</p>
 <h3 id="npm-run-script-1-"><a href="../cli/npm-run-script.html">npm-run-script(1)</a></h3>
@@ -118,86 +116,6 @@ <h3 id="npm-whoami-1-"><a href="../cli/npm-whoami.html">npm-whoami(1)</a></h3>
 <p>Display npm username</p>
 <h2 id="api-documentation">API Documentation</h2>
 <p>Using npm in your Node programs</p>
-<h3 id="npm-3-"><a href="../api/npm.html">npm(3)</a></h3>
-<p>javascript package manager</p>
-<h3 id="npm-bin-3-"><a href="../api/npm-bin.html">npm-bin(3)</a></h3>
-<p>Display npm bin folder</p>
-<h3 id="npm-bugs-3-"><a href="../api/npm-bugs.html">npm-bugs(3)</a></h3>
-<p>Bugs for a package in a web browser maybe</p>
-<h3 id="npm-cache-3-"><a href="../api/npm-cache.html">npm-cache(3)</a></h3>
-<p>manage the npm cache programmatically</p>
-<h3 id="npm-commands-3-"><a href="../api/npm-commands.html">npm-commands(3)</a></h3>
-<p>npm commands</p>
-<h3 id="npm-config-3-"><a href="../api/npm-config.html">npm-config(3)</a></h3>
-<p>Manage the npm configuration files</p>
-<h3 id="npm-deprecate-3-"><a href="../api/npm-deprecate.html">npm-deprecate(3)</a></h3>
-<p>Deprecate a version of a package</p>
-<h3 id="npm-docs-3-"><a href="../api/npm-docs.html">npm-docs(3)</a></h3>
-<p>Docs for a package in a web browser maybe</p>
-<h3 id="npm-edit-3-"><a href="../api/npm-edit.html">npm-edit(3)</a></h3>
-<p>Edit an installed package</p>
-<h3 id="npm-explore-3-"><a href="../api/npm-explore.html">npm-explore(3)</a></h3>
-<p>Browse an installed package</p>
-<h3 id="npm-help-search-3-"><a href="../api/npm-help-search.html">npm-help-search(3)</a></h3>
-<p>Search the help pages</p>
-<h3 id="npm-init-3-"><a href="../api/npm-init.html">npm-init(3)</a></h3>
-<p>Interactively create a package.json file</p>
-<h3 id="npm-install-3-"><a href="../api/npm-install.html">npm-install(3)</a></h3>
-<p>install a package programmatically</p>
-<h3 id="npm-link-3-"><a href="../api/npm-link.html">npm-link(3)</a></h3>
-<p>Symlink a package folder</p>
-<h3 id="npm-load-3-"><a href="../api/npm-load.html">npm-load(3)</a></h3>
-<p>Load config settings</p>
-<h3 id="npm-ls-3-"><a href="../api/npm-ls.html">npm-ls(3)</a></h3>
-<p>List installed packages</p>
-<h3 id="npm-outdated-3-"><a href="../api/npm-outdated.html">npm-outdated(3)</a></h3>
-<p>Check for outdated packages</p>
-<h3 id="npm-owner-3-"><a href="../api/npm-owner.html">npm-owner(3)</a></h3>
-<p>Manage package owners</p>
-<h3 id="npm-pack-3-"><a href="../api/npm-pack.html">npm-pack(3)</a></h3>
-<p>Create a tarball from a package</p>
-<h3 id="npm-ping-3-"><a href="../api/npm-ping.html">npm-ping(3)</a></h3>
-<p>Ping npm registry</p>
-<h3 id="npm-prefix-3-"><a href="../api/npm-prefix.html">npm-prefix(3)</a></h3>
-<p>Display prefix</p>
-<h3 id="npm-prune-3-"><a href="../api/npm-prune.html">npm-prune(3)</a></h3>
-<p>Remove extraneous packages</p>
-<h3 id="npm-publish-3-"><a href="../api/npm-publish.html">npm-publish(3)</a></h3>
-<p>Publish a package</p>
-<h3 id="npm-rebuild-3-"><a href="../api/npm-rebuild.html">npm-rebuild(3)</a></h3>
-<p>Rebuild a package</p>
-<h3 id="npm-repo-3-"><a href="../api/npm-repo.html">npm-repo(3)</a></h3>
-<p>Open package repository page in the browser</p>
-<h3 id="npm-restart-3-"><a href="../api/npm-restart.html">npm-restart(3)</a></h3>
-<p>Restart a package</p>
-<h3 id="npm-root-3-"><a href="../api/npm-root.html">npm-root(3)</a></h3>
-<p>Display npm root</p>
-<h3 id="npm-run-script-3-"><a href="../api/npm-run-script.html">npm-run-script(3)</a></h3>
-<p>Run arbitrary package scripts</p>
-<h3 id="npm-search-3-"><a href="../api/npm-search.html">npm-search(3)</a></h3>
-<p>Search for packages</p>
-<h3 id="npm-shrinkwrap-3-"><a href="../api/npm-shrinkwrap.html">npm-shrinkwrap(3)</a></h3>
-<p>programmatically generate package shrinkwrap file</p>
-<h3 id="npm-start-3-"><a href="../api/npm-start.html">npm-start(3)</a></h3>
-<p>Start a package</p>
-<h3 id="npm-stop-3-"><a href="../api/npm-stop.html">npm-stop(3)</a></h3>
-<p>Stop a package</p>
-<h3 id="npm-tag-3-"><a href="../api/npm-tag.html">npm-tag(3)</a></h3>
-<p>Tag a published version</p>
-<h3 id="npm-test-3-"><a href="../api/npm-test.html">npm-test(3)</a></h3>
-<p>Test a package</p>
-<h3 id="npm-uninstall-3-"><a href="../api/npm-uninstall.html">npm-uninstall(3)</a></h3>
-<p>uninstall a package programmatically</p>
-<h3 id="npm-unpublish-3-"><a href="../api/npm-unpublish.html">npm-unpublish(3)</a></h3>
-<p>Remove a package from the registry</p>
-<h3 id="npm-update-3-"><a href="../api/npm-update.html">npm-update(3)</a></h3>
-<p>Update a package</p>
-<h3 id="npm-version-3-"><a href="../api/npm-version.html">npm-version(3)</a></h3>
-<p>Bump a package version</p>
-<h3 id="npm-view-3-"><a href="../api/npm-view.html">npm-view(3)</a></h3>
-<p>View registry info</p>
-<h3 id="npm-whoami-3-"><a href="../api/npm-whoami.html">npm-whoami(3)</a></h3>
-<p>Display npm username</p>
 <h2 id="files">Files</h2>
 <p>File system structures npm uses</p>
 <h3 id="npm-folders-5-"><a href="../files/npm-folders.html">npm-folders(5)</a></h3>
@@ -220,8 +138,6 @@ <h3 id="npm-faq-7-"><a href="../misc/npm-faq.html">npm-faq(7)</a></h3>
 <p>Frequently Asked Questions</p>
 <h3 id="npm-index-7-"><a href="../misc/npm-index.html">npm-index(7)</a></h3>
 <p>Index of all npm documentation</p>
-<h3 id="npm-orgs-7-"><a href="../misc/npm-orgs.html">npm-orgs(7)</a></h3>
-<p>Working with Teams &amp; Orgs</p>
 <h3 id="npm-registry-7-"><a href="../misc/npm-registry.html">npm-registry(7)</a></h3>
 <p>The JavaScript Package Registry</p>
 <h3 id="npm-scope-7-"><a href="../misc/npm-scope.html">npm-scope(7)</a></h3>
@@ -244,5 +160,5 @@ <h3 id="semver-7-"><a href="../misc/semver.html">semver(7)</a></h3>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-index &mdash; npm@2.14.7</p>
+<p id="footer">npm-index &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/misc/npm-orgs.html b/deps/npm/html/doc/misc/npm-orgs.html
index 8c6e768c25c3aa..2d92acc116d4b8 100644
--- a/deps/npm/html/doc/misc/npm-orgs.html
+++ b/deps/npm/html/doc/misc/npm-orgs.html
@@ -86,4 +86,4 @@ <h2 id="team-admins-create-teams">Team Admins create teams</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-orgs &mdash; npm@2.14.7</p>
+<p id="footer">npm-orgs &mdash; npm@3.3.7</p>
diff --git a/deps/npm/html/doc/misc/npm-registry.html b/deps/npm/html/doc/misc/npm-registry.html
index a622e530491129..00065142cebe1d 100644
--- a/deps/npm/html/doc/misc/npm-registry.html
+++ b/deps/npm/html/doc/misc/npm-registry.html
@@ -70,5 +70,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-registry &mdash; npm@2.14.7</p>
+<p id="footer">npm-registry &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/misc/npm-scope.html b/deps/npm/html/doc/misc/npm-scope.html
index a2ac6463331b57..de22c23db4702b 100644
--- a/deps/npm/html/doc/misc/npm-scope.html
+++ b/deps/npm/html/doc/misc/npm-scope.html
@@ -91,5 +91,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-scope &mdash; npm@2.14.7</p>
+<p id="footer">npm-scope &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/misc/npm-scripts.html b/deps/npm/html/doc/misc/npm-scripts.html
index 580535d2c5101b..62100d82606e6f 100644
--- a/deps/npm/html/doc/misc/npm-scripts.html
+++ b/deps/npm/html/doc/misc/npm-scripts.html
@@ -207,5 +207,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-scripts &mdash; npm@2.14.7</p>
+<p id="footer">npm-scripts &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/misc/removing-npm.html b/deps/npm/html/doc/misc/removing-npm.html
index dc23b860d8d63f..c41aa6d71d0f65 100644
--- a/deps/npm/html/doc/misc/removing-npm.html
+++ b/deps/npm/html/doc/misc/removing-npm.html
@@ -57,5 +57,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">removing-npm &mdash; npm@2.14.7</p>
+<p id="footer">removing-npm &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/doc/misc/semver.html b/deps/npm/html/doc/misc/semver.html
index de275ef6e922e6..3207ecacdbe449 100644
--- a/deps/npm/html/doc/misc/semver.html
+++ b/deps/npm/html/doc/misc/semver.html
@@ -282,5 +282,5 @@ <h3 id="ranges">Ranges</h3>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">semver &mdash; npm@2.14.7</p>
+<p id="footer">semver &mdash; npm@3.3.6</p>
 
diff --git a/deps/npm/html/static/toc.js b/deps/npm/html/static/toc.js
index 2cfebd0aa968b7..7551e47efdf48e 100644
--- a/deps/npm/html/static/toc.js
+++ b/deps/npm/html/static/toc.js
@@ -1,29 +1,29 @@
 ;(function () {
-var wrapper = document.getElementById("wrapper")
-var els = Array.prototype.slice.call(wrapper.getElementsByTagName("*"), 0)
-  .filter(function (el) {
-    return el.parentNode === wrapper
-        && el.tagName.match(/H[1-6]/)
-        && el.id
-  })
-var l = 2
-  , toc = document.createElement("ul")
-toc.innerHTML = els.map(function (el) {
-  var i = el.tagName.charAt(1)
-    , out = ""
-  while (i > l) {
-    out += "<ul>"
-    l ++
-  }
-  while (i < l) {
-    out += "</ul>"
-    l --
-  }
-  out += "<li><a href='#" + el.id + "'>" +
-    ( el.innerText || el.text || el.innerHTML)
-    + "</a>"
-  return out
-}).join("\n")
-toc.id = "toc"
-document.body.appendChild(toc)
-})();
+  var wrapper = document.getElementById('wrapper')
+  var els = Array.prototype.slice.call(wrapper.getElementsByTagName('*'), 0)
+    .filter(function (el) {
+      return el.parentNode === wrapper &&
+        el.tagName.match(/H[1-6]/) &&
+        el.id
+    })
+  var l = 2
+  var toc = document.createElement('ul')
+  toc.innerHTML = els.map(function (el) {
+    var i = el.tagName.charAt(1)
+    var out = ''
+    while (i > l) {
+      out += '<ul>'
+      l++
+    }
+    while (i < l) {
+      out += '</ul>'
+      l--
+    }
+    out += '<li><a href=\'#' + el.id + '\'>' +
+      (el.innerText || el.text || el.innerHTML) +
+      '</a>'
+    return out
+  }).join('\n')
+  toc.id = 'toc'
+  document.body.appendChild(toc)
+})()
diff --git a/deps/npm/lib/access.js b/deps/npm/lib/access.js
index 790a760cb72201..25a482a20e3cdb 100644
--- a/deps/npm/lib/access.js
+++ b/deps/npm/lib/access.js
@@ -35,6 +35,7 @@ access.completion = function (opts, cb) {
       } else {
         return cb(null, [])
       }
+      break
     case 'public':
     case 'restricted':
     case 'ls-packages':
diff --git a/deps/npm/lib/adduser.js b/deps/npm/lib/adduser.js
index 367f3ba0d92754..630a2c5e6f1797 100644
--- a/deps/npm/lib/adduser.js
+++ b/deps/npm/lib/adduser.js
@@ -1,30 +1,32 @@
-
 module.exports = adduser
 
-var log = require("npmlog")
-  , npm = require("./npm.js")
-  , read = require("read")
-  , userValidate = require("npm-user-validate")
-  , crypto
+var log = require('npmlog')
+var npm = require('./npm.js')
+var read = require('read')
+var userValidate = require('npm-user-validate')
+var crypto
 
 try {
-  crypto = require("crypto")
+  crypto = require('crypto')
 } catch (ex) {}
 
-adduser.usage = "npm adduser\nThen enter stuff at the prompts"
+adduser.usage = 'npm adduser [--registry=url] [--scope=@orgname] [--always-auth]'
 
 function adduser (args, cb) {
-  npm.spinner.stop()
-  if (!crypto) return cb(new Error(
-    "You must compile node with ssl support to use the adduser feature"))
-
-  var creds = npm.config.getCredentialsByURI(npm.config.get("registry"))
-  var c = { u : creds.username || ""
-          , p : creds.password || ""
-          , e : creds.email || ""
-          }
-    , u = {}
-    , fns = [readUsername, readPassword, readEmail, save]
+  if (!crypto) {
+    return cb(new Error(
+    'You must compile node with ssl support to use the adduser feature'
+    ))
+  }
+
+  var creds = npm.config.getCredentialsByURI(npm.config.get('registry'))
+  var c = {
+    u: creds.username || '',
+    p: creds.password || '',
+    e: creds.email || ''
+  }
+  var u = {}
+  var fns = [readUsername, readPassword, readEmail, save]
 
   loop()
   function loop (er) {
@@ -37,9 +39,9 @@ function adduser (args, cb) {
 
 function readUsername (c, u, cb) {
   var v = userValidate.username
-  read({prompt: "Username: ", default: c.u || ""}, function (er, un) {
+  read({prompt: 'Username: ', default: c.u || ''}, function (er, un) {
     if (er) {
-      return cb(er.message === "cancelled" ? er.message : er)
+      return cb(er.message === 'cancelled' ? er.message : er)
     }
 
     // make sure it's valid.  we have to do this here, because
@@ -68,17 +70,17 @@ function readPassword (c, u, cb) {
 
   var prompt
   if (c.p && !c.changed) {
-    prompt = "Password: (or leave unchanged) "
+    prompt = 'Password: (or leave unchanged) '
   } else {
-    prompt = "Password: "
+    prompt = 'Password: '
   }
 
   read({prompt: prompt, silent: true}, function (er, pw) {
     if (er) {
-      return cb(er.message === "cancelled" ? er.message : er)
+      return cb(er.message === 'cancelled' ? er.message : er)
     }
 
-    if (!c.changed && pw === "") {
+    if (!c.changed && pw === '') {
       // when the username was not changed,
       // empty response means "use the old value"
       pw = c.p
@@ -102,10 +104,10 @@ function readPassword (c, u, cb) {
 
 function readEmail (c, u, cb) {
   var v = userValidate.email
-  var r = { prompt: "Email: (this IS public) ", default: c.e || "" }
+  var r = { prompt: 'Email: (this IS public) ', default: c.e || '' }
   read(r, function (er, em) {
     if (er) {
-      return cb(er.message === "cancelled" ? er.message : er)
+      return cb(er.message === 'cancelled' ? er.message : er)
     }
 
     if (!em) {
@@ -124,52 +126,48 @@ function readEmail (c, u, cb) {
 }
 
 function save (c, u, cb) {
-  npm.spinner.start()
-
   // save existing configs, but yank off for this PUT
-  var uri   = npm.config.get("registry")
-  var scope = npm.config.get("scope")
+  var uri = npm.config.get('registry')
+  var scope = npm.config.get('scope')
 
   // there may be a saved scope and no --registry (for login)
   if (scope) {
-    if (scope.charAt(0) !== "@") scope = "@" + scope
+    if (scope.charAt(0) !== '@') scope = '@' + scope
 
-    var scopedRegistry = npm.config.get(scope + ":registry")
-    var cliRegistry = npm.config.get("registry", "cli")
+    var scopedRegistry = npm.config.get(scope + ':registry')
+    var cliRegistry = npm.config.get('registry', 'cli')
     if (scopedRegistry && !cliRegistry) uri = scopedRegistry
   }
 
   var params = {
-    auth : {
-      username : u.u,
-      password : u.p,
-      email    : u.e
+    auth: {
+      username: u.u,
+      password: u.p,
+      email: u.e
     }
   }
   npm.registry.adduser(uri, params, function (er, doc) {
-    npm.spinner.stop()
     if (er) return cb(er)
 
     // don't want this polluting the configuration
-    npm.config.del("_token", "user")
+    npm.config.del('_token', 'user')
 
-    if (scope) npm.config.set(scope + ":registry", uri, "user")
+    if (scope) npm.config.set(scope + ':registry', uri, 'user')
 
     if (doc && doc.token) {
       npm.config.setCredentialsByURI(uri, {
-        token : doc.token
+        token: doc.token
       })
-    }
-    else {
+    } else {
       npm.config.setCredentialsByURI(uri, {
-        username   : u.u,
-        password   : u.p,
-        email      : u.e,
-        alwaysAuth : npm.config.get("always-auth")
+        username: u.u,
+        password: u.p,
+        email: u.e,
+        alwaysAuth: npm.config.get('always-auth')
       })
     }
 
-    log.info("adduser", "Authorized user %s", u.u)
-    npm.config.save("user", cb)
+    log.info('adduser', 'Authorized user %s', u.u)
+    npm.config.save('user', cb)
   })
 }
diff --git a/deps/npm/lib/bin.js b/deps/npm/lib/bin.js
index 5465112d8891e8..2e02617d35a790 100644
--- a/deps/npm/lib/bin.js
+++ b/deps/npm/lib/bin.js
@@ -1,19 +1,22 @@
 module.exports = bin
 
-var npm = require("./npm.js")
-var osenv = require("osenv")
+var npm = require('./npm.js')
+var osenv = require('osenv')
 
-bin.usage = "npm bin\nnpm bin -g\n(just prints the bin folder)"
+bin.usage = 'npm bin [--global]'
 
 function bin (args, silent, cb) {
-  if (typeof cb !== "function") cb = silent, silent = false
+  if (typeof cb !== 'function') {
+    cb = silent
+    silent = false
+  }
   var b = npm.bin
-    , PATH = osenv.path()
+  var PATH = osenv.path()
 
   if (!silent) console.log(b)
   process.nextTick(cb.bind(this, null, b))
 
-  if (npm.config.get("global") && PATH.indexOf(b) === -1) {
-    npm.config.get("logstream").write("(not in PATH env variable)\n")
+  if (npm.config.get('global') && PATH.indexOf(b) === -1) {
+    npm.config.get('logstream').write('(not in PATH env variable)\n')
   }
 }
diff --git a/deps/npm/lib/bugs.js b/deps/npm/lib/bugs.js
index 306d9bb4bfc9fe..d42e68faa5cde5 100644
--- a/deps/npm/lib/bugs.js
+++ b/deps/npm/lib/bugs.js
@@ -1,16 +1,11 @@
-
 module.exports = bugs
 
-bugs.usage = "npm bugs <pkgname>"
+bugs.usage = 'npm bugs [<pkgname>]'
 
-var npm = require("./npm.js")
-  , log = require("npmlog")
-  , opener = require("opener")
-  , path = require("path")
-  , readJson = require("read-package-json")
-  , npa = require("npm-package-arg")
-  , fs = require("fs")
-  , mapToRegistry = require("./utils/map-to-registry.js")
+var npm = require('./npm.js')
+var log = require('npmlog')
+var opener = require('opener')
+var fetchPackageMetadata = require('./fetch-package-metadata.js')
 
 bugs.completion = function (opts, cb) {
   // FIXME: there used to be registry completion here, but it stopped making
@@ -19,51 +14,15 @@ bugs.completion = function (opts, cb) {
 }
 
 function bugs (args, cb) {
-  var n = args.length && npa(args[0]).name || "."
-  fs.stat(n, function (er, s) {
-    if (er) {
-      if (er.code === "ENOENT") return callRegistry(n, cb)
-      return cb(er)
-    }
-    if (!s.isDirectory()) return callRegistry(n, cb)
-    readJson(path.resolve(n, "package.json"), function(er, d) {
-      if (er) return cb(er)
-      getUrlAndOpen(d, cb)
-    })
-  })
-}
-
-function getUrlAndOpen (d, cb) {
-  var repo = d.repository || d.repositories
-    , url
-  if (d.bugs) {
-    url = (typeof d.bugs === "string") ? d.bugs : d.bugs.url
-  }
-  else if (repo) {
-    if (Array.isArray(repo)) repo = repo.shift()
-    if (repo.hasOwnProperty("url")) repo = repo.url
-    log.verbose("bugs", "repository", repo)
-    if (repo && repo.match(/^(https?:\/\/|git(:\/\/|@))github.com/)) {
-      url = repo.replace(/^git(@|:\/\/)/, "https://")
-                .replace(/^https?:\/\/github.com:/, "https://github.com/")
-                .replace(/\.git$/, "")+"/issues"
-    }
-  }
-  if (!url) {
-    url = "https://www.npmjs.org/package/" + d.name
-  }
-  log.silly("bugs", "url", url)
-  opener(url, { command: npm.config.get("browser") }, cb)
-}
-
-function callRegistry (name, cb) {
-  mapToRegistry(name, npm.config, function (er, uri, auth) {
+  var n = args.length ? args[0] : '.'
+  fetchPackageMetadata(n, '.', function (er, d) {
     if (er) return cb(er)
 
-    npm.registry.get(uri + "/latest", { auth : auth }, function (er, d) {
-      if (er) return cb(er)
-
-      getUrlAndOpen(d, cb)
-    })
+    var url = d.bugs && ((typeof d.bugs === 'string') ? d.bugs : d.bugs.url)
+    if (!url) {
+      url = 'https://www.npmjs.org/package/' + d.name
+    }
+    log.silly('bugs', 'url', url)
+    opener(url, { command: npm.config.get('browser') }, cb)
   })
 }
diff --git a/deps/npm/lib/build.js b/deps/npm/lib/build.js
index 1f2d2efceb4618..8d62cb61f80f22 100644
--- a/deps/npm/lib/build.js
+++ b/deps/npm/lib/build.js
@@ -7,100 +7,112 @@
 
 // This runs AFTER install or link are completed.
 
-var npm = require("./npm.js")
-  , log = require("npmlog")
-  , chain = require("slide").chain
-  , fs = require("graceful-fs")
-  , path = require("path")
-  , lifecycle = require("./utils/lifecycle.js")
-  , readJson = require("read-package-json")
-  , link = require("./utils/link.js")
-  , linkIfExists = link.ifExists
-  , cmdShim = require("cmd-shim")
-  , cmdShimIfExists = cmdShim.ifExists
-  , asyncMap = require("slide").asyncMap
-  , ini = require("ini")
-  , writeFile = require("write-file-atomic")
+var npm = require('./npm.js')
+var log = require('npmlog')
+var chain = require('slide').chain
+var fs = require('graceful-fs')
+var path = require('path')
+var lifecycle = require('./utils/lifecycle.js')
+var readJson = require('read-package-json')
+var link = require('./utils/link.js')
+var linkIfExists = link.ifExists
+var cmdShim = require('cmd-shim')
+var cmdShimIfExists = cmdShim.ifExists
+var asyncMap = require('slide').asyncMap
+var ini = require('ini')
+var writeFile = require('write-file-atomic')
+var getPackageId = require('./install/get-package-id.js')
 
 module.exports = build
-build.usage = "npm build <folder>\n(this is plumbing)"
+build.usage = 'npm build [<folder>]'
 
 build._didBuild = {}
 build._noLC = {}
 function build (args, global, didPre, didRB, cb) {
-  if (typeof cb !== "function") cb = didRB, didRB = false
-  if (typeof cb !== "function") cb = didPre, didPre = false
-  if (typeof cb !== "function") {
-    cb = global, global = npm.config.get("global")
+  if (typeof cb !== 'function') {
+    cb = didRB
+    didRB = false
   }
+  if (typeof cb !== 'function') {
+    cb = didPre
+    didPre = false
+  }
+  if (typeof cb !== 'function') {
+    cb = global
+    global = npm.config.get('global')
+  }
+
   // it'd be nice to asyncMap these, but actually, doing them
   // in parallel generally munges up the output from node-waf
   var builder = build_(global, didPre, didRB)
-  chain(args.map(function (arg) { return function (cb) {
-    builder(arg, cb)
-  }}), cb)
+  chain(args.map(function (arg) {
+    return function (cb) {
+      builder(arg, cb)
+    }
+  }), cb)
 }
 
-function build_ (global, didPre, didRB) { return function (folder, cb) {
-  folder = path.resolve(folder)
-  if (build._didBuild[folder]) log.info("build", "already built", folder)
-  build._didBuild[folder] = true
-  log.info("build", folder)
-  readJson(path.resolve(folder, "package.json"), function (er, pkg) {
-    if (er) return cb(er)
-    chain
-      ( [ !didPre && [lifecycle, pkg, "preinstall", folder]
-        , [linkStuff, pkg, folder, global, didRB]
-        , [writeBuiltinConf, pkg, folder]
-        , didPre !== build._noLC && [lifecycle, pkg, "install", folder]
-        , didPre !== build._noLC && [lifecycle, pkg, "postinstall", folder]
-        , didPre !== build._noLC
-          && npm.config.get("npat")
-          && [lifecycle, pkg, "test", folder] ]
-      , cb )
-  })
-}}
+function build_ (global, didPre, didRB) {
+  return function (folder, cb) {
+    folder = path.resolve(folder)
+    if (build._didBuild[folder]) log.info('build', 'already built', folder)
+    build._didBuild[folder] = true
+    log.info('build', folder)
+    readJson(path.resolve(folder, 'package.json'), function (er, pkg) {
+      if (er) return cb(er)
+      chain([
+        !didPre && [lifecycle, pkg, 'preinstall', folder],
+        [linkStuff, pkg, folder, global, didRB],
+        [writeBuiltinConf, pkg, folder],
+        didPre !== build._noLC && [lifecycle, pkg, 'install', folder],
+        didPre !== build._noLC && [lifecycle, pkg, 'postinstall', folder],
+        didPre !== build._noLC && npm.config.get('npat') && [lifecycle, pkg, 'test', folder]
+      ],
+      cb)
+    })
+  }
+}
 
-function writeBuiltinConf (pkg, folder, cb) {
+var writeBuiltinConf = build.writeBuiltinConf = function (pkg, folder, cb) {
   // the builtin config is "sticky". Any time npm installs
   // itself globally, it puts its builtin config file there
   var parent = path.dirname(folder)
   var dir = npm.globalDir
 
-  if (pkg.name !== "npm" ||
-      !npm.config.get("global") ||
+  if (pkg.name !== 'npm' ||
+      !npm.config.get('global') ||
       !npm.config.usingBuiltin ||
       dir !== parent) {
     return cb()
   }
 
   var data = ini.stringify(npm.config.sources.builtin.data)
-  writeFile(path.resolve(folder, "npmrc"), data, cb)
+  writeFile(path.resolve(folder, 'npmrc'), data, cb)
 }
 
-function linkStuff (pkg, folder, global, didRB, cb) {
+var linkStuff = build.linkStuff = function (pkg, folder, global, didRB, cb) {
   // allow to opt out of linking binaries.
-  if (npm.config.get("bin-links") === false) return cb()
+  if (npm.config.get('bin-links') === false) return cb()
 
   // if it's global, and folder is in {prefix}/node_modules,
   // then bins are in {prefix}/bin
   // otherwise, then bins are in folder/../.bin
-  var parent = pkg.name[0] === '@' ? path.dirname(path.dirname(folder)) : path.dirname(folder)
+  var parent = pkg.name && pkg.name[0] === '@' ? path.dirname(path.dirname(folder)) : path.dirname(folder)
   var gnm = global && npm.globalDir
   var gtop = parent === gnm
 
-  log.info('linkStuff', pkg._id)
-  log.silly('linkStuff', pkg._id, 'has', parent, 'as its parent node_modules')
-  if (global) log.silly('linkStuff', pkg._id, 'is part of a global install')
-  if (gnm) log.silly('linkStuff', pkg._id, 'is installed into a global node_modules')
-  if (gtop) log.silly('linkStuff', pkg._id, 'is installed into the top-level global node_modules')
+  log.info('linkStuff', getPackageId(pkg))
+  log.silly('linkStuff', getPackageId(pkg), 'has', parent, 'as its parent node_modules')
+  if (global) log.silly('linkStuff', getPackageId(pkg), 'is part of a global install')
+  if (gnm) log.silly('linkStuff', getPackageId(pkg), 'is installed into a global node_modules')
+  if (gtop) log.silly('linkStuff', getPackageId(pkg), 'is installed into the top-level global node_modules')
 
   shouldWarn(pkg, folder, global, function () {
     asyncMap(
       [linkBins, linkMans, !didRB && rebuildBundles],
       function (fn, cb) {
         if (!fn) return cb()
-        log.verbose(fn.name, pkg._id)
+        log.verbose(fn.name, getPackageId(pkg))
         fn(pkg, folder, parent, gtop, cb)
       },
       cb
@@ -108,16 +120,16 @@ function linkStuff (pkg, folder, global, didRB, cb) {
   })
 }
 
-function shouldWarn(pkg, folder, global, cb) {
+function shouldWarn (pkg, folder, global, cb) {
   var parent = path.dirname(folder)
-    , top = parent === npm.dir
-    , cwd = npm.localPrefix
+  var top = parent === npm.dir
+  var cwd = npm.localPrefix
 
-  readJson(path.resolve(cwd, "package.json"), function(er, topPkg) {
+  readJson(path.resolve(cwd, 'package.json'), function (er, topPkg) {
     if (er) return cb(er)
 
     var linkedPkg = path.basename(cwd)
-      , currentPkg = path.basename(folder)
+    var currentPkg = path.basename(folder)
 
     // current searched package is the linked package on first call
     if (linkedPkg !== currentPkg) {
@@ -128,7 +140,7 @@ function shouldWarn(pkg, folder, global, cb) {
           .indexOf(currentPkg) === -1) {
 
         if (top && pkg.preferGlobal && !global) {
-          log.warn("prefer global", pkg._id + " should be installed with -g")
+          log.warn('prefer global', getPackageId(pkg) + ' should be installed with -g')
         }
       }
     }
@@ -138,76 +150,81 @@ function shouldWarn(pkg, folder, global, cb) {
 }
 
 function rebuildBundles (pkg, folder, parent, gtop, cb) {
-  if (!npm.config.get("rebuild-bundle")) return cb()
+  if (!npm.config.get('rebuild-bundle')) return cb()
 
   var deps = Object.keys(pkg.dependencies || {})
              .concat(Object.keys(pkg.devDependencies || {}))
-    , bundles = pkg.bundleDependencies || pkg.bundledDependencies || []
+  var bundles = pkg.bundleDependencies || pkg.bundledDependencies || []
 
-  fs.readdir(path.resolve(folder, "node_modules"), function (er, files) {
+  fs.readdir(path.resolve(folder, 'node_modules'), function (er, files) {
     // error means no bundles
     if (er) return cb()
 
-    log.verbose("rebuildBundles", files)
+    log.verbose('rebuildBundles', files)
     // don't asyncMap these, because otherwise build script output
     // gets interleaved and is impossible to read
     chain(files.filter(function (file) {
       // rebuild if:
       // not a .folder, like .bin or .hooks
-      return !file.match(/^[\._-]/)
+      return !file.match(/^[\._-]/) &&
           // not some old 0.x style bundle
-          && file.indexOf("@") === -1
+          file.indexOf('@') === -1 &&
           // either not a dep, or explicitly bundled
-          && (deps.indexOf(file) === -1 || bundles.indexOf(file) !== -1)
+          (deps.indexOf(file) === -1 || bundles.indexOf(file) !== -1)
     }).map(function (file) {
-      file = path.resolve(folder, "node_modules", file)
+      file = path.resolve(folder, 'node_modules', file)
       return function (cb) {
         if (build._didBuild[file]) return cb()
-        log.verbose("rebuild bundle", file)
+        log.verbose('rebuild bundle', file)
         // if file is not a package dir, then don't do it.
-        fs.lstat(path.resolve(file, "package.json"), function (er) {
+        fs.lstat(path.resolve(file, 'package.json'), function (er) {
           if (er) return cb()
           build_(false)(file, cb)
         })
-    }}), cb)
+      }
+    }), cb)
   })
 }
 
 function linkBins (pkg, folder, parent, gtop, cb) {
-  if (!pkg.bin || !gtop && path.basename(parent) !== "node_modules") {
+  if (!pkg.bin || !gtop && path.basename(parent) !== 'node_modules') {
     return cb()
   }
   var binRoot = gtop ? npm.globalBin
-                     : path.resolve(parent, ".bin")
-  log.verbose("link bins", [pkg.bin, binRoot, gtop])
+                     : path.resolve(parent, '.bin')
+  log.verbose('link bins', [pkg.bin, binRoot, gtop])
 
   asyncMap(Object.keys(pkg.bin), function (b, cb) {
-    linkBin( path.resolve(folder, pkg.bin[b])
-           , path.resolve(binRoot, b)
-           , gtop && folder
-           , function (er) {
-      if (er) return cb(er)
-      // bins should always be executable.
-      // XXX skip chmod on windows?
-      var src = path.resolve(folder, pkg.bin[b])
-      fs.chmod(src, npm.modes.exec, function (er) {
-        if (er && er.code === "ENOENT" && npm.config.get("ignore-scripts")) {
-          return cb()
-        }
-        if (er || !gtop) return cb(er)
-        var dest = path.resolve(binRoot, b)
-          , out = npm.config.get("parseable")
-                ? dest + "::" + src + ":BINFILE"
-                : dest + " -> " + src
-        console.log(out)
-        cb()
-      })
-    })
+    linkBin(
+      path.resolve(folder, pkg.bin[b]),
+      path.resolve(binRoot, b),
+      gtop && folder,
+      function (er) {
+        if (er) return cb(er)
+        // bins should always be executable.
+        // XXX skip chmod on windows?
+        var src = path.resolve(folder, pkg.bin[b])
+        fs.chmod(src, npm.modes.exec, function (er) {
+          if (er && er.code === 'ENOENT' && npm.config.get('ignore-scripts')) {
+            return cb()
+          }
+          if (er || !gtop) return cb(er)
+          var dest = path.resolve(binRoot, b)
+          var out = npm.config.get('parseable')
+                  ? dest + '::' + src + ':BINFILE'
+                  : dest + ' -> ' + src
+          log.clearProgress()
+          console.log(out)
+          log.showProgress()
+          cb()
+        })
+      }
+    )
   }, cb)
 }
 
 function linkBin (from, to, gently, cb) {
-  if (process.platform !== "win32") {
+  if (process.platform !== 'win32') {
     return linkIfExists(from, to, gently, cb)
   } else {
     return cmdShimIfExists(from, to, cb)
@@ -215,10 +232,10 @@ function linkBin (from, to, gently, cb) {
 }
 
 function linkMans (pkg, folder, parent, gtop, cb) {
-  if (!pkg.man || !gtop || process.platform === "win32") return cb()
+  if (!pkg.man || !gtop || process.platform === 'win32') return cb()
 
-  var manRoot = path.resolve(npm.config.get("prefix"), "share", "man")
-  log.verbose("linkMans", "man files are", pkg.man, "in", manRoot)
+  var manRoot = path.resolve(npm.config.get('prefix'), 'share', 'man')
+  log.verbose('linkMans', 'man files are', pkg.man, 'in', manRoot)
 
   // make sure that the mans are unique.
   // otherwise, if there are dupes, it'll fail with EEXIST
@@ -231,14 +248,14 @@ function linkMans (pkg, folder, parent, gtop, cb) {
   })
 
   asyncMap(pkg.man, function (man, cb) {
-    if (typeof man !== "string") return cb()
-    log.silly("linkMans", "preparing to link", man)
+    if (typeof man !== 'string') return cb()
+    log.silly('linkMans', 'preparing to link', man)
     var parseMan = man.match(/(.*\.([0-9]+)(\.gz)?)$/)
     if (!parseMan) {
       return cb(new Error(
-        man+" is not a valid name for a man file.  " +
-        "Man files must end with a number, " +
-        "and optionally a .gz suffix if they are compressed."
+        man + ' is not a valid name for a man file.  ' +
+        'Man files must end with a number, ' +
+        'and optionally a .gz suffix if they are compressed.'
       ))
     }
 
@@ -246,7 +263,7 @@ function linkMans (pkg, folder, parent, gtop, cb) {
     var sxn = parseMan[2]
     var bn = path.basename(stem)
     var manSrc = path.resolve(folder, man)
-    var manDest = path.join(manRoot, "man" + sxn, bn)
+    var manDest = path.join(manRoot, 'man' + sxn, bn)
 
     linkIfExists(manSrc, manDest, gtop && folder, cb)
   }, cb)
diff --git a/deps/npm/lib/cache.js b/deps/npm/lib/cache.js
index 2e11be32f862fa..b4b04819c98b9e 100644
--- a/deps/npm/lib/cache.js
+++ b/deps/npm/lib/cache.js
@@ -60,54 +60,54 @@ cache.unpack = unpack
 cache.clean = clean
 cache.read = read
 
-var npm = require("./npm.js")
-  , fs = require("graceful-fs")
-  , writeFileAtomic = require("write-file-atomic")
-  , assert = require("assert")
-  , rm = require("./utils/gently-rm.js")
-  , readJson = require("read-package-json")
-  , log = require("npmlog")
-  , path = require("path")
-  , asyncMap = require("slide").asyncMap
-  , tar = require("./utils/tar.js")
-  , fileCompletion = require("./utils/completion/file-completion.js")
-  , deprCheck = require("./utils/depr-check.js")
-  , addNamed = require("./cache/add-named.js")
-  , addLocal = require("./cache/add-local.js")
-  , addRemoteTarball = require("./cache/add-remote-tarball.js")
-  , addRemoteGit = require("./cache/add-remote-git.js")
-  , inflight = require("inflight")
-  , realizePackageSpecifier = require("realize-package-specifier")
-  , npa = require("npm-package-arg")
-  , getStat = require("./cache/get-stat.js")
-  , cachedPackageRoot = require("./cache/cached-package-root.js")
-  , mapToRegistry = require("./utils/map-to-registry.js")
-
-cache.usage = "npm cache add <tarball file>"
-            + "\nnpm cache add <folder>"
-            + "\nnpm cache add <tarball url>"
-            + "\nnpm cache add <git url>"
-            + "\nnpm cache add <name>@<version>"
-            + "\nnpm cache ls [<path>]"
-            + "\nnpm cache clean [<pkg>[@<version>]]"
+var npm = require('./npm.js')
+var fs = require('graceful-fs')
+var writeFileAtomic = require('write-file-atomic')
+var assert = require('assert')
+var rm = require('./utils/gently-rm.js')
+var readJson = require('read-package-json')
+var log = require('npmlog')
+var path = require('path')
+var asyncMap = require('slide').asyncMap
+var tar = require('./utils/tar.js')
+var fileCompletion = require('./utils/completion/file-completion.js')
+var deprCheck = require('./utils/depr-check.js')
+var addNamed = require('./cache/add-named.js')
+var addLocal = require('./cache/add-local.js')
+var addRemoteTarball = require('./cache/add-remote-tarball.js')
+var addRemoteGit = require('./cache/add-remote-git.js')
+var inflight = require('inflight')
+var realizePackageSpecifier = require('realize-package-specifier')
+var npa = require('npm-package-arg')
+var getStat = require('./cache/get-stat.js')
+var cachedPackageRoot = require('./cache/cached-package-root.js')
+var mapToRegistry = require('./utils/map-to-registry.js')
+
+cache.usage = 'npm cache add <tarball file>' +
+              '\nnpm cache add <folder>' +
+              '\nnpm cache add <tarball url>' +
+              '\nnpm cache add <git url>' +
+              '\nnpm cache add <name>@<version>' +
+              '\nnpm cache ls [<path>]' +
+              '\nnpm cache clean [<pkg>[@<version>]]'
 
 cache.completion = function (opts, cb) {
 
   var argv = opts.conf.argv.remain
   if (argv.length === 2) {
-    return cb(null, ["add", "ls", "clean"])
+    return cb(null, ['add', 'ls', 'clean'])
   }
 
   switch (argv[2]) {
-    case "clean":
-    case "ls":
+    case 'clean':
+    case 'ls':
       // cache and ls are easy, because the completion is
       // what ls_ returns anyway.
       // just get the partial words, minus the last path part
-      var p = path.dirname(opts.partialWords.slice(3).join("/"))
-      if (p === ".") p = ""
+      var p = path.dirname(opts.partialWords.slice(3).join('/'))
+      if (p === '.') p = ''
       return ls_(p, 2, cb)
-    case "add":
+    case 'add':
       // Same semantics as install and publish.
       return npm.commands.install.completion(opts, cb)
   }
@@ -116,10 +116,10 @@ cache.completion = function (opts, cb) {
 function cache (args, cb) {
   var cmd = args.shift()
   switch (cmd) {
-    case "rm": case "clear": case "clean": return clean(args, cb)
-    case "list": case "sl": case "ls": return ls(args, cb)
-    case "add": return add(args, npm.prefix, cb)
-    default: return cb("Usage: "+cache.usage)
+    case 'rm': case 'clear': case 'clean': return clean(args, cb)
+    case 'list': case 'sl': case 'ls': return ls(args, cb)
+    case 'add': return add(args, npm.prefix, cb)
+    default: return cb('Usage: ' + cache.usage)
   }
 }
 
@@ -127,30 +127,30 @@ function cache (args, cb) {
 // just do a readJson and return.
 // if they're not, then fetch them from the registry.
 function read (name, ver, forceBypass, cb) {
-  assert(typeof name === "string", "must include name of module to install")
-  assert(typeof cb === "function", "must include callback")
+  assert(typeof name === 'string', 'must include name of module to install')
+  assert(typeof cb === 'function', 'must include callback')
 
   if (forceBypass === undefined || forceBypass === null) forceBypass = true
 
-  var root = cachedPackageRoot({name : name, version : ver})
+  var root = cachedPackageRoot({name: name, version: ver})
   function c (er, data) {
-    if (er) log.verbose("cache", "addNamed error for", name+"@"+ver, er)
+    if (er) log.verbose('cache', 'addNamed error for', name + '@' + ver, er)
     if (data) deprCheck(data)
 
     return cb(er, data)
   }
 
-  if (forceBypass && npm.config.get("force")) {
-    log.verbose("using force", "skipping cache")
+  if (forceBypass && npm.config.get('force')) {
+    log.verbose('using force', 'skipping cache')
     return addNamed(name, ver, null, c)
   }
 
-  readJson(path.join(root, "package", "package.json"), function (er, data) {
-    if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
+  readJson(path.join(root, 'package', 'package.json'), function (er, data) {
+    if (er && er.code !== 'ENOENT' && er.code !== 'ENOTDIR') return cb(er)
 
     if (data) {
-      if (!data.name) return cb(new Error("No name provided"))
-      if (!data.version) return cb(new Error("No version provided"))
+      if (!data.name) return cb(new Error('No name provided'))
+      if (!data.version) return cb(new Error('No version provided'))
     }
 
     if (er) return addNamed(name, ver, null, c)
@@ -159,33 +159,33 @@ function read (name, ver, forceBypass, cb) {
 }
 
 function normalize (args) {
-  var normalized = ""
+  var normalized = ''
   if (args.length > 0) {
     var a = npa(args[0])
     if (a.name) normalized = a.name
-    if (a.rawSpec) normalized = [normalized, a.rawSpec].join("/")
-    if (args.length > 1) normalized = [normalized].concat(args.slice(1)).join("/")
+    if (a.rawSpec) normalized = [normalized, a.rawSpec].join('/')
+    if (args.length > 1) normalized = [normalized].concat(args.slice(1)).join('/')
   }
 
-  if (normalized.substr(-1) === "/") {
+  if (normalized.substr(-1) === '/') {
     normalized = normalized.substr(0, normalized.length - 1)
   }
   normalized = path.normalize(normalized)
-  log.silly("ls", "normalized", normalized)
+  log.silly('ls', 'normalized', normalized)
 
   return normalized
 }
 
 // npm cache ls [<path>]
 function ls (args, cb) {
-  var prefix = npm.config.get("cache")
+  var prefix = npm.config.get('cache')
   if (prefix.indexOf(process.env.HOME) === 0) {
-    prefix = "~" + prefix.substr(process.env.HOME.length)
+    prefix = '~' + prefix.substr(process.env.HOME.length)
   }
-  ls_(normalize(args), npm.config.get("depth"), function (er, files) {
+  ls_(normalize(args), npm.config.get('depth'), function (er, files) {
     console.log(files.map(function (f) {
       return path.join(prefix, f)
-    }).join("\n").trim())
+    }).join('\n').trim())
     cb(er, files)
   })
 }
@@ -197,7 +197,7 @@ function ls_ (req, depth, cb) {
 
 // npm cache clean [<path>]
 function clean (args, cb) {
-  assert(typeof cb === "function", "must include callback")
+  assert(typeof cb === 'function', 'must include callback')
 
   if (!args) args = []
 
@@ -205,15 +205,17 @@ function clean (args, cb) {
   if (f === npm.cache) {
     fs.readdir(npm.cache, function (er, files) {
       if (er) return cb()
-      asyncMap( files.filter(function (f) {
-                  return npm.config.get("force") || f !== "-"
-                }).map(function (f) {
-                  return path.join(npm.cache, f)
-                })
-              , rm, cb )
+      asyncMap(
+        files.filter(function (f) {
+          return npm.config.get('force') || f !== '-'
+        }).map(function (f) {
+          return path.join(npm.cache, f)
+        }),
+        rm,
+        cb
+      )
     })
-  }
-  else {
+  } else {
     rm(f, cb)
   }
 }
@@ -223,8 +225,8 @@ function clean (args, cb) {
 // npm cache add <tarball>
 // npm cache add <folder>
 cache.add = function (pkg, ver, where, scrub, cb) {
-  assert(typeof pkg === "string", "must include name of package to install")
-  assert(typeof cb === "function", "must include callback")
+  assert(typeof pkg === 'string', 'must include name of package to install')
+  assert(typeof cb === 'function', 'must include callback')
 
   if (scrub) {
     return clean([], function (er) {
@@ -235,67 +237,63 @@ cache.add = function (pkg, ver, where, scrub, cb) {
   return add([pkg, ver], where, cb)
 }
 
-
 var adding = 0
 function add (args, where, cb) {
   // this is hot code.  almost everything passes through here.
   // the args can be any of:
-  // ["url"]
-  // ["pkg", "version"]
-  // ["pkg@version"]
-  // ["pkg", "url"]
+  // ['url']
+  // ['pkg', 'version']
+  // ['pkg@version']
+  // ['pkg', 'url']
   // This is tricky, because urls can contain @
   // Also, in some cases we get [name, null] rather
   // that just a single argument.
 
-  var usage = "Usage:\n"
-            + "    npm cache add <tarball-url>\n"
-            + "    npm cache add <pkg>@<ver>\n"
-            + "    npm cache add <tarball>\n"
-            + "    npm cache add <folder>\n"
-    , spec
+  var usage = 'Usage:\n' +
+              '    npm cache add <tarball-url>\n' +
+              '    npm cache add <pkg>@<ver>\n' +
+              '    npm cache add <tarball>\n' +
+              '    npm cache add <folder>\n'
+  var spec
 
-  log.silly("cache add", "args", args)
+  log.silly('cache add', 'args', args)
 
   if (args[1] === undefined) args[1] = null
 
   // at this point the args length must ==2
   if (args[1] !== null) {
-    spec = args[0]+"@"+args[1]
+    spec = args[0] + '@' + args[1]
   } else if (args.length === 2) {
     spec = args[0]
   }
 
-  log.verbose("cache add", "spec", spec)
+  log.verbose('cache add', 'spec', spec)
 
   if (!spec) return cb(usage)
 
-  if (adding <= 0) {
-    npm.spinner.start()
-  }
   adding++
   cb = afterAdd(cb)
 
   realizePackageSpecifier(spec, where, function (err, p) {
     if (err) return cb(err)
 
-    log.silly("cache add", "parsed spec", p)
+    log.silly('cache add', 'parsed spec', p)
 
     switch (p.type) {
-      case "local":
-      case "directory":
+      case 'local':
+      case 'directory':
         addLocal(p, null, cb)
         break
-      case "remote":
+      case 'remote':
         // get auth, if possible
         mapToRegistry(spec, npm.config, function (err, uri, auth) {
           if (err) return cb(err)
 
-          addRemoteTarball(p.spec, {name : p.name}, null, auth, cb)
+          addRemoteTarball(p.spec, { name: p.name }, null, auth, cb)
         })
         break
-      case "git":
-      case "hosted":
+      case 'git':
+      case 'hosted':
         addRemoteGit(p.rawSpec, cb)
         break
       default:
@@ -307,47 +305,62 @@ function add (args, where, cb) {
 }
 
 function unpack (pkg, ver, unpackTarget, dMode, fMode, uid, gid, cb) {
-  if (typeof cb !== "function") cb = gid, gid = null
-  if (typeof cb !== "function") cb = uid, uid = null
-  if (typeof cb !== "function") cb = fMode, fMode = null
-  if (typeof cb !== "function") cb = dMode, dMode = null
+  if (typeof cb !== 'function') {
+    cb = gid
+    gid = null
+  }
+  if (typeof cb !== 'function') {
+    cb = uid
+    uid = null
+  }
+  if (typeof cb !== 'function') {
+    cb = fMode
+    fMode = null
+  }
+  if (typeof cb !== 'function') {
+    cb = dMode
+    dMode = null
+  }
 
   read(pkg, ver, false, function (er) {
     if (er) {
-      log.error("unpack", "Could not read data for %s", pkg + "@" + ver)
+      log.error('unpack', 'Could not read data for %s', pkg + '@' + ver)
       return cb(er)
     }
     npm.commands.unbuild([unpackTarget], true, function (er) {
       if (er) return cb(er)
-      tar.unpack( path.join(cachedPackageRoot({name : pkg, version : ver}), "package.tgz")
-                , unpackTarget
-                , dMode, fMode
-                , uid, gid
-                , cb )
+      tar.unpack(
+        path.join(cachedPackageRoot({ name: pkg, version: ver }), 'package.tgz'),
+        unpackTarget,
+        dMode, fMode,
+        uid, gid,
+        cb
+      )
     })
   })
 }
 
-function afterAdd (cb) { return function (er, data) {
-  adding--
-  if (adding <= 0) npm.spinner.stop()
+function afterAdd (cb) {
+  return function (er, data) {
+    adding--
 
-  if (er || !data || !data.name || !data.version) return cb(er, data)
-  log.silly("cache", "afterAdd", data.name+"@"+data.version)
+    if (er || !data || !data.name || !data.version) return cb(er, data)
+    log.silly('cache', 'afterAdd', data.name + '@' + data.version)
 
-  // Save the resolved, shasum, etc. into the data so that the next
-  // time we load from this cached data, we have all the same info.
-  var pj = path.join(cachedPackageRoot(data), "package", "package.json")
+    // Save the resolved, shasum, etc. into the data so that the next
+    // time we load from this cached data, we have all the same info.
+    var pj = path.join(cachedPackageRoot(data), 'package', 'package.json')
 
-  var done = inflight(pj, cb)
-  if (!done) return log.verbose("afterAdd", pj, "already in flight; not writing")
-  log.verbose("afterAdd", pj, "not in flight; writing")
+    var done = inflight(pj, cb)
+    if (!done) return log.verbose('afterAdd', pj, 'already in flight; not writing')
+    log.verbose('afterAdd', pj, 'not in flight; writing')
 
-  getStat(function (er, cs) {
-    if (er) return done(er)
-    writeFileAtomic(pj, JSON.stringify(data), {chown : cs}, function (er) {
-      if (!er) log.verbose("afterAdd", pj, "written")
-      return done(er, data)
+    getStat(function (er, cs) {
+      if (er) return done(er)
+      writeFileAtomic(pj, JSON.stringify(data), { chown: cs }, function (er) {
+        if (!er) log.verbose('afterAdd', pj, 'written')
+        return done(er, data)
+      })
     })
-  })
-}}
+  }
+}
diff --git a/deps/npm/lib/cache/add-local-tarball.js b/deps/npm/lib/cache/add-local-tarball.js
index e84b66dd8dd51f..1bcb4862321dd4 100644
--- a/deps/npm/lib/cache/add-local-tarball.js
+++ b/deps/npm/lib/cache/add-local-tarball.js
@@ -1,26 +1,28 @@
-var mkdir = require("mkdirp")
-  , assert = require("assert")
-  , fs = require("graceful-fs")
-  , writeFileAtomic = require("write-file-atomic")
-  , path = require("path")
-  , sha = require("sha")
-  , npm = require("../npm.js")
-  , log = require("npmlog")
-  , tar = require("../utils/tar.js")
-  , pathIsInside = require("path-is-inside")
-  , getCacheStat = require("./get-stat.js")
-  , cachedPackageRoot = require("./cached-package-root.js")
-  , chownr = require("chownr")
-  , inflight = require("inflight")
-  , once = require("once")
-  , writeStream = require("fs-write-stream-atomic")
-  , randomBytes = require("crypto").pseudoRandomBytes // only need uniqueness
+var mkdir = require('mkdirp')
+var assert = require('assert')
+var fs = require('graceful-fs')
+var writeFileAtomic = require('write-file-atomic')
+var path = require('path')
+var sha = require('sha')
+var npm = require('../npm.js')
+var log = require('npmlog')
+var tar = require('../utils/tar.js')
+var pathIsInside = require('path-is-inside')
+var getCacheStat = require('./get-stat.js')
+var cachedPackageRoot = require('./cached-package-root.js')
+var chownr = require('chownr')
+var inflight = require('inflight')
+var once = require('once')
+var writeStream = require('fs-write-stream-atomic')
+var tempFilename = require('../utils/temp-filename.js')
+var rimraf = require('rimraf')
+var getPackageId = require('../install/get-package-id.js')
 
 module.exports = addLocalTarball
 
 function addLocalTarball (p, pkgData, shasum, cb) {
-  assert(typeof p === "string", "must have path")
-  assert(typeof cb === "function", "must have callback")
+  assert(typeof p === 'string', 'must have path')
+  assert(typeof cb === 'function', 'must have callback')
 
   if (!pkgData) pkgData = {}
 
@@ -28,16 +30,16 @@ function addLocalTarball (p, pkgData, shasum, cb) {
   if (!shasum) {
     return sha.get(p, function (er, shasum) {
       if (er) return cb(er)
-      log.silly("addLocalTarball", "shasum (computed)", shasum)
+      log.silly('addLocalTarball', 'shasum (computed)', shasum)
       addLocalTarball(p, pkgData, shasum, cb)
     })
   }
 
   if (pathIsInside(p, npm.cache)) {
-    if (path.basename(p) !== "package.tgz") {
-      return cb(new Error("Not a valid cache tarball name: "+p))
+    if (path.basename(p) !== 'package.tgz') {
+      return cb(new Error('Not a valid cache tarball name: ' + p))
     }
-    log.verbose("addLocalTarball", "adding from inside cache", p)
+    log.verbose('addLocalTarball', 'adding from inside cache', p)
     return addPlacedTarball(p, pkgData, shasum, cb)
   }
 
@@ -51,8 +53,8 @@ function addLocalTarball (p, pkgData, shasum, cb) {
 }
 
 function addPlacedTarball (p, pkgData, shasum, cb) {
-  assert(pkgData, "should have package data by now")
-  assert(typeof cb === "function", "cb function required")
+  assert(pkgData, 'should have package data by now')
+  assert(typeof cb === 'function', 'cb function required')
 
   getCacheStat(function (er, cs) {
     if (er) return cb(er)
@@ -61,7 +63,7 @@ function addPlacedTarball (p, pkgData, shasum, cb) {
 }
 
 function addPlacedTarball_ (p, pkgData, uid, gid, resolvedSum, cb) {
-  var folder = path.join(cachedPackageRoot(pkgData), "package")
+  var folder = path.join(cachedPackageRoot(pkgData), 'package')
 
   // First, make sure we have the shasum, if we don't already.
   if (!resolvedSum) {
@@ -74,7 +76,7 @@ function addPlacedTarball_ (p, pkgData, uid, gid, resolvedSum, cb) {
 
   mkdir(folder, function (er) {
     if (er) return cb(er)
-    var pj = path.join(folder, "package.json")
+    var pj = path.join(folder, 'package.json')
     var json = JSON.stringify(pkgData, null, 2)
     writeFileAtomic(pj, json, function (er) {
       cb(er, pkgData)
@@ -83,19 +85,19 @@ function addPlacedTarball_ (p, pkgData, uid, gid, resolvedSum, cb) {
 }
 
 function addTmpTarball (tgz, pkgData, shasum, cb) {
-  assert(typeof cb === "function", "must have callback function")
-  assert(shasum, "must have shasum by now")
+  assert(typeof cb === 'function', 'must have callback function')
+  assert(shasum, 'must have shasum by now')
 
-  cb = inflight("addTmpTarball:" + tgz, cb)
-  if (!cb) return log.verbose("addTmpTarball", tgz, "already in flight; not adding")
-  log.verbose("addTmpTarball", tgz, "not in flight; adding")
+  cb = inflight('addTmpTarball:' + tgz, cb)
+  if (!cb) return log.verbose('addTmpTarball', tgz, 'already in flight; not adding')
+  log.verbose('addTmpTarball', tgz, 'not in flight; adding')
 
   // we already have the package info, so just move into place
   if (pkgData && pkgData.name && pkgData.version) {
     log.verbose(
-      "addTmpTarball",
-      "already have metadata; skipping unpack for",
-      pkgData.name + "@" + pkgData.version
+      'addTmpTarball',
+      'already have metadata; skipping unpack for',
+      getPackageId(pkgData)
     )
     return addTmpTarball_(tgz, pkgData, shasum, cb)
   }
@@ -107,34 +109,29 @@ function addTmpTarball (tgz, pkgData, shasum, cb) {
   // NOTE: we might not have any clue what we think it is, for example if the
   // user just did `npm install ./foo.tgz`
 
-  // generate a unique filename
-  randomBytes(6, function (er, random) {
+  var target = tempFilename('unpack')
+  getCacheStat(function (er, cs) {
     if (er) return cb(er)
 
-    var target = path.join(npm.tmp, "unpack-" + random.toString("hex"))
-    getCacheStat(function (er, cs) {
-      if (er) return cb(er)
-
-      log.verbose("addTmpTarball", "validating metadata from", tgz)
-      tar.unpack(tgz, target, null, null, cs.uid, cs.gid, function (er, data) {
-        if (er) return cb(er)
-
+    log.verbose('addTmpTarball', 'validating metadata from', tgz)
+    tar.unpack(tgz, target, null, null, cs.uid, cs.gid, function (unpackEr, data) {
+      // cleanup the extracted package and move on with the metadata
+      rimraf(target, function () {
+        if (unpackEr) return cb(unpackEr)
         // check that this is what we expected.
         if (!data.name) {
-          return cb(new Error("No name provided"))
-        }
-        else if (pkgData.name && data.name !== pkgData.name) {
-          return cb(new Error("Invalid Package: expected " + pkgData.name +
-                              " but found " + data.name))
+          return cb(new Error('No name provided'))
+        } else if (pkgData.name && data.name !== pkgData.name) {
+          return cb(new Error('Invalid Package: expected ' + pkgData.name +
+                              ' but found ' + data.name))
         }
 
         if (!data.version) {
-          return cb(new Error("No version provided"))
-        }
-        else if (pkgData.version && data.version !== pkgData.version) {
-          return cb(new Error("Invalid Package: expected " +
-                              pkgData.name + "@" + pkgData.version +
-                              " but found " + data.name + "@" + data.version))
+          return cb(new Error('No version provided'))
+        } else if (pkgData.version && data.version !== pkgData.version) {
+          return cb(new Error('Invalid Package: expected ' +
+                              getPackageId(pkgData) +
+                              ' but found ' + getPackageId(data)))
         }
 
         addTmpTarball_(tgz, data, shasum, cb)
@@ -144,15 +141,15 @@ function addTmpTarball (tgz, pkgData, shasum, cb) {
 }
 
 function addTmpTarball_ (tgz, data, shasum, cb) {
-  assert(typeof cb === "function", "must have callback function")
+  assert(typeof cb === 'function', 'must have callback function')
   cb = once(cb)
 
-  assert(data.name, "should have package name by now")
-  assert(data.version, "should have package version by now")
+  assert(data.name, 'should have package name by now')
+  assert(data.version, 'should have package version by now')
 
   var root = cachedPackageRoot(data)
-  var pkg = path.resolve(root, "package")
-  var target = path.resolve(root, "package.tgz")
+  var pkg = path.resolve(root, 'package')
+  var target = path.resolve(root, 'package.tgz')
   getCacheStat(function (er, cs) {
     if (er) return cb(er)
     mkdir(pkg, function (er, created) {
@@ -168,12 +165,12 @@ function addTmpTarball_ (tgz, data, shasum, cb) {
       var read = fs.createReadStream(tgz)
       var write = writeStream(target, { mode: npm.modes.file })
       var fin = cs.uid && cs.gid ? chown : done
-      read.on("error", cb).pipe(write).on("error", cb).on("close", fin)
+      read.on('error', cb).pipe(write).on('error', cb).on('close', fin)
     })
 
   })
 
-  function done() {
+  function done () {
     data._shasum = data._shasum || shasum
     cb(null, data)
   }
diff --git a/deps/npm/lib/cache/add-local.js b/deps/npm/lib/cache/add-local.js
index e7d286e4fb5d40..075ca5fc61d8de 100644
--- a/deps/npm/lib/cache/add-local.js
+++ b/deps/npm/lib/cache/add-local.js
@@ -1,44 +1,45 @@
-var assert = require("assert")
-  , path = require("path")
-  , mkdir = require("mkdirp")
-  , chownr = require("chownr")
-  , pathIsInside = require("path-is-inside")
-  , readJson = require("read-package-json")
-  , log = require("npmlog")
-  , npm = require("../npm.js")
-  , tar = require("../utils/tar.js")
-  , deprCheck = require("../utils/depr-check.js")
-  , getCacheStat = require("./get-stat.js")
-  , cachedPackageRoot = require("./cached-package-root.js")
-  , addLocalTarball = require("./add-local-tarball.js")
-  , sha = require("sha")
-  , inflight = require("inflight")
+var assert = require('assert')
+var path = require('path')
+var mkdir = require('mkdirp')
+var chownr = require('chownr')
+var pathIsInside = require('path-is-inside')
+var readJson = require('read-package-json')
+var log = require('npmlog')
+var npm = require('../npm.js')
+var tar = require('../utils/tar.js')
+var deprCheck = require('../utils/depr-check.js')
+var getCacheStat = require('./get-stat.js')
+var cachedPackageRoot = require('./cached-package-root.js')
+var addLocalTarball = require('./add-local-tarball.js')
+var sha = require('sha')
+var inflight = require('inflight')
+var lifecycle = require('../utils/lifecycle.js')
+var iferr = require('iferr')
 
 module.exports = addLocal
 
 function addLocal (p, pkgData, cb_) {
-  assert(typeof p === "object", "must have spec info")
-  assert(typeof cb === "function", "must have callback")
+  assert(typeof p === 'object', 'must have spec info')
+  assert(typeof cb === 'function', 'must have callback')
 
   pkgData = pkgData || {}
 
   function cb (er, data) {
     if (er) {
-      log.error("addLocal", "Could not install %s", p.spec)
+      log.error('addLocal', 'Could not install %s', p.spec)
       return cb_(er)
     }
-    if (data && !data._fromGithub) {
-      data._from = path.relative(npm.prefix, p.spec) || "."
+    if (data && !data._fromHosted) {
+      data._from = path.relative(npm.prefix, p.spec) || '.'
       var resolved = path.relative(npm.prefix, p.spec)
-      if (resolved) data._resolved = "file:"+resolved
+      if (resolved) data._resolved = 'file:' + resolved
     }
     return cb_(er, data)
   }
 
-  if (p.type === "directory") {
+  if (p.type === 'directory') {
     addLocalDirectory(p.spec, pkgData, null, cb)
-  }
-  else {
+  } else {
     addLocalTarball(p.spec, pkgData, null, cb)
   }
 }
@@ -46,33 +47,34 @@ function addLocal (p, pkgData, cb_) {
 // At this point, if shasum is set, it's something that we've already
 // read and checked.  Just stashing it in the data at this point.
 function addLocalDirectory (p, pkgData, shasum, cb) {
-  assert(pkgData, "must pass package data")
-  assert(typeof cb === "function", "must have callback")
+  assert(pkgData, 'must pass package data')
+  assert(typeof cb === 'function', 'must have callback')
 
   // if it's a folder, then read the package.json,
   // tar it to the proper place, and add the cache tar
-  if (pathIsInside(p, npm.cache)) return cb(new Error(
-    "Adding a cache directory to the cache will make the world implode."))
+  if (pathIsInside(p, npm.cache)) {
+    return cb(new Error(
+    'Adding a cache directory to the cache will make the world implode.'
+    ))
+  }
 
-  readJson(path.join(p, "package.json"), false, function (er, data) {
+  readJson(path.join(p, 'package.json'), false, function (er, data) {
     if (er) return cb(er)
 
     if (!data.name) {
-      return cb(new Error("No name provided in package.json"))
-    }
-    else if (pkgData.name && pkgData.name !== data.name) {
+      return cb(new Error('No name provided in package.json'))
+    } else if (pkgData.name && pkgData.name !== data.name) {
       return cb(new Error(
-        "Invalid package: expected " + pkgData.name + " but found " + data.name
+        'Invalid package: expected ' + pkgData.name + ' but found ' + data.name
       ))
     }
 
     if (!data.version) {
-      return cb(new Error("No version provided in package.json"))
-    }
-    else if (pkgData.version && pkgData.version !== data.version) {
+      return cb(new Error('No version provided in package.json'))
+    } else if (pkgData.version && pkgData.version !== data.version) {
       return cb(new Error(
-        "Invalid package: expected " + pkgData.name + "@" + pkgData.version +
-          " but found " + data.name + "@" + data.version
+        'Invalid package: expected ' + pkgData.name + '@' + pkgData.version +
+          ' but found ' + data.name + '@' + data.version
       ))
     }
 
@@ -80,27 +82,34 @@ function addLocalDirectory (p, pkgData, shasum, cb) {
 
     // pack to {cache}/name/ver/package.tgz
     var root = cachedPackageRoot(data)
-    var tgz = path.resolve(root, "package.tgz")
-    var pj = path.resolve(root, "package/package.json")
+    var tgz = path.resolve(root, 'package.tgz')
+    var pj = path.resolve(root, 'package/package.json')
 
     var wrapped = inflight(tgz, next)
-    if (!wrapped) return log.verbose("addLocalDirectory", tgz, "already in flight; waiting")
-    log.verbose("addLocalDirectory", tgz, "not in flight; packing")
+    if (!wrapped) return log.verbose('addLocalDirectory', tgz, 'already in flight; waiting')
+    log.verbose('addLocalDirectory', tgz, 'not in flight; packing')
 
     getCacheStat(function (er, cs) {
       mkdir(path.dirname(pj), function (er, made) {
         if (er) return cb(er)
-        var fancy = !pathIsInside(p, npm.tmp)
-        tar.pack(tgz, p, data, fancy, function (er) {
-          if (er) {
-            log.error("addLocalDirectory", "Could not pack", p, "to", tgz)
-            return cb(er)
-          }
-
-          if (!cs || isNaN(cs.uid) || isNaN(cs.gid)) wrapped()
-
-          chownr(made || tgz, cs.uid, cs.gid, wrapped)
-        })
+        var doPrePublish = !pathIsInside(p, npm.tmp)
+        if (doPrePublish) {
+          lifecycle(data, 'prepublish', p, iferr(cb, thenPack))
+        } else {
+          thenPack()
+        }
+        function thenPack () {
+          tar.pack(tgz, p, data, function (er) {
+            if (er) {
+              log.error('addLocalDirectory', 'Could not pack', p, 'to', tgz)
+              return cb(er)
+            }
+
+            if (!cs || isNaN(cs.uid) || isNaN(cs.gid)) wrapped()
+
+            chownr(made || tgz, cs.uid, cs.gid, wrapped)
+          })
+        }
       })
     })
 
diff --git a/deps/npm/lib/cache/add-named.js b/deps/npm/lib/cache/add-named.js
index acc67bf9d26d4f..b90d313984ad43 100644
--- a/deps/npm/lib/cache/add-named.js
+++ b/deps/npm/lib/cache/add-named.js
@@ -1,23 +1,24 @@
-var path = require("path")
-  , assert = require("assert")
-  , fs = require("graceful-fs")
-  , http = require("http")
-  , log = require("npmlog")
-  , semver = require("semver")
-  , readJson = require("read-package-json")
-  , url = require("url")
-  , npm = require("../npm.js")
-  , deprCheck = require("../utils/depr-check.js")
-  , inflight = require("inflight")
-  , addRemoteTarball = require("./add-remote-tarball.js")
-  , cachedPackageRoot = require("./cached-package-root.js")
-  , mapToRegistry = require("../utils/map-to-registry.js")
-
+var path = require('path')
+var assert = require('assert')
+var fs = require('graceful-fs')
+var http = require('http')
+var log = require('npmlog')
+var semver = require('semver')
+var readJson = require('read-package-json')
+var url = require('url')
+var npm = require('../npm.js')
+var deprCheck = require('../utils/depr-check.js')
+var inflight = require('inflight')
+var addRemoteTarball = require('./add-remote-tarball.js')
+var cachedPackageRoot = require('./cached-package-root.js')
+var mapToRegistry = require('../utils/map-to-registry.js')
+var pulseTillDone = require('../utils/pulse-till-done.js')
+var getPackageId = require('../install/get-package-id.js')
 
 module.exports = addNamed
 
 function getOnceFromRegistry (name, from, next, done) {
-  function fixName(err, data, json, resp) {
+  function fixName (err, data, json, resp) {
     // this is only necessary until npm/npm-registry-client#80 is fixed
     if (err && err.pkgid && err.pkgid !== name) {
       err.message = err.message.replace(
@@ -32,24 +33,24 @@ function getOnceFromRegistry (name, from, next, done) {
   mapToRegistry(name, npm.config, function (er, uri, auth) {
     if (er) return done(er)
 
-    var key = "registry:" + uri
+    var key = 'registry:' + uri
     next = inflight(key, next)
-    if (!next) return log.verbose(from, key, "already in flight; waiting")
-    else log.verbose(from, key, "not in flight; fetching")
+    if (!next) return log.verbose(from, key, 'already in flight; waiting')
+    else log.verbose(from, key, 'not in flight; fetching')
 
-    npm.registry.get(uri, { auth : auth }, fixName)
+    npm.registry.get(uri, { auth: auth }, pulseTillDone('fetchRegistry', fixName))
   })
 }
 
 function addNamed (name, version, data, cb_) {
-  assert(typeof name === "string", "must have module name")
-  assert(typeof cb_ === "function", "must have callback")
+  assert(typeof name === 'string', 'must have module name')
+  assert(typeof cb_ === 'function', 'must have callback')
 
-  var key = name + "@" + version
-  log.silly("addNamed", key)
+  var key = name + '@' + version
+  log.silly('addNamed', key)
 
   function cb (er, data) {
-    if (data && !data._fromGithub) data._from = key
+    if (data && !data._fromHosted) data._from = key
     cb_(er, data)
   }
 
@@ -66,29 +67,29 @@ function addNamed (name, version, data, cb_) {
 }
 
 function addNameTag (name, tag, data, cb) {
-  log.info("addNameTag", [name, tag])
+  log.info('addNameTag', [name, tag])
   var explicit = true
   if (!tag) {
     explicit = false
-    tag = npm.config.get("tag")
+    tag = npm.config.get('tag')
   }
 
-  getOnceFromRegistry(name, "addNameTag", next, cb)
+  getOnceFromRegistry(name, 'addNameTag', next, cb)
 
   function next (er, data, json, resp) {
     if (!er) er = errorResponse(name, resp)
     if (er) return cb(er)
 
-    log.silly("addNameTag", "next cb for", name, "with tag", tag)
+    log.silly('addNameTag', 'next cb for', name, 'with tag', tag)
 
     engineFilter(data)
-    if (data["dist-tags"] && data["dist-tags"][tag]
-        && data.versions[data["dist-tags"][tag]]) {
-      var ver = data["dist-tags"][tag]
+    if (data['dist-tags'] && data['dist-tags'][tag] &&
+        data.versions[data['dist-tags'][tag]]) {
+      var ver = data['dist-tags'][tag]
       return addNamed(name, ver, data.versions[ver], cb)
     }
     if (!explicit && Object.keys(data.versions).length) {
-      return addNamed(name, "*", data, cb)
+      return addNamed(name, '*', data, cb)
     }
 
     er = installTargetsError(tag, data)
@@ -98,17 +99,17 @@ function addNameTag (name, tag, data, cb) {
 
 function engineFilter (data) {
   var npmv = npm.version
-    , nodev = npm.config.get("node-version")
-    , strict = npm.config.get("engine-strict")
+  var nodev = npm.config.get('node-version')
+  var strict = npm.config.get('engine-strict')
 
-  if (!nodev || npm.config.get("force")) return data
+  if (!nodev || npm.config.get('force')) return data
 
   Object.keys(data.versions || {}).forEach(function (v) {
     var eng = data.versions[v].engines
     if (!eng) return
-    if (!strict && !data.versions[v].engineStrict) return
-    if (eng.node && !semver.satisfies(nodev, eng.node, true)
-        || eng.npm && !semver.satisfies(npmv, eng.npm, true)) {
+    if (!strict) return
+    if (eng.node && !semver.satisfies(nodev, eng.node, true) ||
+        eng.npm && !semver.satisfies(npmv, eng.npm, true)) {
       delete data.versions[v]
     }
   })
@@ -116,7 +117,7 @@ function engineFilter (data) {
 
 function addNameVersion (name, v, data, cb) {
   var ver = semver.valid(v, true)
-  if (!ver) return cb(new Error("Invalid version: "+v))
+  if (!ver) return cb(new Error('Invalid version: ' + v))
 
   var response
 
@@ -125,7 +126,7 @@ function addNameVersion (name, v, data, cb) {
     return next()
   }
 
-  getOnceFromRegistry(name, "addNameVersion", setData, cb)
+  getOnceFromRegistry(name, 'addNameVersion', setData, cb)
 
   function setData (er, d, json, resp) {
     if (!er) {
@@ -134,7 +135,7 @@ function addNameVersion (name, v, data, cb) {
     if (er) return cb(er)
     data = d && d.versions[ver]
     if (!data) {
-      er = new Error("version not found: "+name+"@"+ver)
+      er = new Error('version not found: ' + name + '@' + ver)
       er.package = name
       er.statusCode = 404
       return cb(er)
@@ -147,27 +148,30 @@ function addNameVersion (name, v, data, cb) {
     deprCheck(data)
     var dist = data.dist
 
-    if (!dist) return cb(new Error("No dist in "+data._id+" package"))
+    if (!dist) return cb(new Error('No dist in ' + getPackageId(data) + ' package'))
 
-    if (!dist.tarball) return cb(new Error(
-      "No dist.tarball in " + data._id + " package"))
+    if (!dist.tarball) {
+      return cb(new Error(
+      'No dist.tarball in ' + getPackageId(data) + ' package'
+      ))
+    }
 
-    if ((response && response.statusCode !== 304) || npm.config.get("force")) {
+    if ((response && response.statusCode !== 304) || npm.config.get('force')) {
       return fetchit()
     }
 
     // we got cached data, so let's see if we have a tarball.
-    var pkgroot = cachedPackageRoot({name : name, version : ver})
-    var pkgtgz = path.join(pkgroot, "package.tgz")
-    var pkgjson = path.join(pkgroot, "package", "package.json")
+    var pkgroot = cachedPackageRoot({ name: name, version: ver })
+    var pkgtgz = path.join(pkgroot, 'package.tgz')
+    var pkgjson = path.join(pkgroot, 'package', 'package.json')
     fs.stat(pkgtgz, function (er) {
       if (!er) {
         readJson(pkgjson, function (er, data) {
-          if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
+          if (er && er.code !== 'ENOENT' && er.code !== 'ENOTDIR') return cb(er)
 
           if (data) {
-            if (!data.name) return cb(new Error("No name provided"))
-            if (!data.version) return cb(new Error("No version provided"))
+            if (!data.name) return cb(new Error('No name provided'))
+            if (!data.version) return cb(new Error('No version provided'))
 
             // check the SHA of the package we have, to ensure it wasn't installed
             // from somewhere other than the registry (eg, a fork)
@@ -205,8 +209,8 @@ function addNameVersion (name, v, data, cb) {
 
         // Only add non-shasum'ed packages if --forced. Only ancient things
         // would lack this for good reasons nowadays.
-        if (!dist.shasum && !npm.config.get("force")) {
-          return cb(new Error("package lacks shasum: " + data._id))
+        if (!dist.shasum && !npm.config.get('force')) {
+          return cb(new Error('package lacks shasum: ' + getPackageId(data)))
         }
 
         addRemoteTarball(tb, data, dist.shasum, auth, cb)
@@ -217,15 +221,17 @@ function addNameVersion (name, v, data, cb) {
 
 function addNameRange (name, range, data, cb) {
   range = semver.validRange(range, true)
-  if (range === null) return cb(new Error(
-    "Invalid version range: " + range
-  ))
+  if (range === null) {
+    return cb(new Error(
+      'Invalid version range: ' + range
+    ))
+  }
 
-  log.silly("addNameRange", {name:name, range:range, hasData:!!data})
+  log.silly('addNameRange', { name: name, range: range, hasData: !!data })
 
   if (data) return next()
 
-  getOnceFromRegistry(name, "addNameRange", setData, cb)
+  getOnceFromRegistry(name, 'addNameRange', setData, cb)
 
   function setData (er, d, json, resp) {
     if (!er) {
@@ -237,18 +243,20 @@ function addNameRange (name, range, data, cb) {
   }
 
   function next () {
-    log.silly( "addNameRange", "number 2"
-             , {name:name, range:range, hasData:!!data})
+    log.silly(
+      'addNameRange',
+      'number 2', { name: name, range: range, hasData: !!data }
+    )
     engineFilter(data)
 
-    log.silly("addNameRange", "versions"
+    log.silly('addNameRange', 'versions'
              , [data.name, Object.keys(data.versions || {})])
 
     // if the tagged version satisfies, then use that.
-    var tagged = data["dist-tags"][npm.config.get("tag")]
-    if (tagged
-        && data.versions[tagged]
-        && semver.satisfies(tagged, range, true)) {
+    var tagged = data['dist-tags'][npm.config.get('tag')]
+    if (tagged &&
+        data.versions[tagged] &&
+        semver.satisfies(tagged, range, true)) {
       return addNamed(name, tagged, data.versions[tagged], cb)
     }
 
@@ -256,8 +264,8 @@ function addNameRange (name, range, data, cb) {
     var versions = Object.keys(data.versions || {})
     var ms = semver.maxSatisfying(versions, range, true)
     if (!ms) {
-      if (range === "*" && versions.length) {
-        return addNameTag(name, "latest", data, cb)
+      if (range === '*' && versions.length) {
+        return addNameTag(name, 'latest', data, cb)
       } else {
         return cb(installTargetsError(range, data))
       }
@@ -270,20 +278,19 @@ function addNameRange (name, range, data, cb) {
 }
 
 function installTargetsError (requested, data) {
-  var targets = Object.keys(data["dist-tags"]).filter(function (f) {
+  var targets = Object.keys(data['dist-tags']).filter(function (f) {
     return (data.versions || {}).hasOwnProperty(f)
   }).concat(Object.keys(data.versions || {}))
 
-  requested = data.name + (requested ? "@'" + requested + "'" : "")
+  requested = data.name + (requested ? "@'" + requested + "'" : '')
 
   targets = targets.length
-          ? "Valid install targets:\n" + JSON.stringify(targets) + "\n"
-          : "No valid targets found.\n"
-          + "Perhaps not compatible with your version of node?"
+          ? 'Valid install targets:\n' + JSON.stringify(targets) + '\n'
+          : 'No valid targets found.\n' +
+            'Perhaps not compatible with your version of node?'
 
-  var er = new Error( "No compatible version found: "
-                  + requested + "\n" + targets)
-  er.code = "ETARGET"
+  var er = new Error('No compatible version found: ' + requested + '\n' + targets)
+  er.code = 'ETARGET'
   return er
 }
 
@@ -292,7 +299,7 @@ function errorResponse (name, response) {
   if (response.statusCode >= 400) {
     er = new Error(http.STATUS_CODES[response.statusCode])
     er.statusCode = response.statusCode
-    er.code = "E" + er.statusCode
+    er.code = 'E' + er.statusCode
     er.pkgid = name
   }
   return er
diff --git a/deps/npm/lib/cache/add-remote-git.js b/deps/npm/lib/cache/add-remote-git.js
index d3ecccdce9af81..09096f9badae95 100644
--- a/deps/npm/lib/cache/add-remote-git.js
+++ b/deps/npm/lib/cache/add-remote-git.js
@@ -1,5 +1,4 @@
 var assert = require('assert')
-var crypto = require('crypto')
 var fs = require('graceful-fs')
 var path = require('path')
 var url = require('url')
@@ -13,12 +12,14 @@ var mkdir = require('mkdirp')
 var normalizeGitUrl = require('normalize-git-url')
 var npa = require('npm-package-arg')
 var realizePackageSpecifier = require('realize-package-specifier')
+var uniqueFilename = require('unique-filename')
 
 var addLocal = require('./add-local.js')
 var correctMkdir = require('../utils/correct-mkdir.js')
 var git = require('../utils/git.js')
 var npm = require('../npm.js')
 var rm = require('../utils/gently-rm.js')
+var tempFilename = require('../utils/temp-filename.js')
 
 var remotes = path.resolve(npm.config.get('cache'), '_git-remotes')
 var templates = path.join(remotes, '_templates')
@@ -47,7 +48,7 @@ function addRemoteGit (uri, _cb) {
   if (parsed) {
     // normalize GitHub syntax to org/repo (for now)
     var from
-    if (parsed.type === 'github' && parsed.default === 'shortcut') {
+    if (parsed.type === 'github' && parsed.getDefaultRepresentation() === 'shortcut') {
       from = parsed.path()
     } else {
       from = parsed.toString()
@@ -56,7 +57,7 @@ function addRemoteGit (uri, _cb) {
     log.verbose('addRemoteGit', from, 'is a repository hosted by', parsed.type)
 
     // prefer explicit URLs to pushing everything through shortcuts
-    if (parsed.default !== 'shortcut') {
+    if (parsed.getDefaultRepresentation() !== 'shortcut') {
       return tryClone(from, parsed.toString(), false, cb)
     }
 
@@ -75,7 +76,7 @@ function addRemoteGit (uri, _cb) {
 
 function tryGitProto (from, hostedInfo, cb) {
   var gitURL = hostedInfo.git()
-  if (!gitURL) return trySSH(from, hostedInfo, cb)
+  if (!gitURL) return tryHTTPS(from, hostedInfo, cb)
 
   log.silly('tryGitProto', 'attempting to clone', gitURL)
   tryClone(from, gitURL, true, function (er) {
@@ -115,9 +116,9 @@ function tryClone (from, combinedURL, silent, cb) {
   var treeish = normalized.branch
 
   // ensure that similarly-named remotes don't collide
-  var repoID = cloneURL.replace(/[^a-zA-Z0-9]+/g, '-') + '-' +
-    crypto.createHash('sha1').update(combinedURL).digest('hex').slice(0, 8)
-  var cachedRemote = path.join(remotes, repoID)
+  var cachedRemote = uniqueFilename(remotes, combinedURL.replace(/[^a-zA-Z0-9]+/g, '-'), cloneURL)
+  var repoID = path.relative(remotes, cachedRemote)
+  cachedRemote = path.join(remotes, repoID)
 
   cb = inflight(repoID, cb)
   if (!cb) {
@@ -297,11 +298,7 @@ function resolveHead (from, cloneURL, treeish, cachedRemote, cb) {
       log.verbose('resolveHead', from, 'resolved Git URL:', resolvedURL)
 
       // generate a unique filename
-      var tmpdir = path.join(
-        npm.tmp,
-        'git-cache-' + crypto.pseudoRandomBytes(6).toString('hex'),
-        resolvedTreeish
-      )
+      var tmpdir = path.join(tempFilename('git-cache'), resolvedTreeish)
       log.silly('resolveHead', 'Git working directory:', tmpdir)
 
       mkdir(tmpdir, function (er) {
diff --git a/deps/npm/lib/cache/add-remote-tarball.js b/deps/npm/lib/cache/add-remote-tarball.js
index 66d22009663307..aaa768acbd07b9 100644
--- a/deps/npm/lib/cache/add-remote-tarball.js
+++ b/deps/npm/lib/cache/add-remote-tarball.js
@@ -1,20 +1,22 @@
-var mkdir = require("mkdirp")
-  , assert = require("assert")
-  , log = require("npmlog")
-  , path = require("path")
-  , sha = require("sha")
-  , retry = require("retry")
-  , createWriteStream = require("fs-write-stream-atomic")
-  , npm = require("../npm.js")
-  , inflight = require("inflight")
-  , addLocalTarball = require("./add-local-tarball.js")
-  , cacheFile = require("npm-cache-filename")
+var mkdir = require('mkdirp')
+var assert = require('assert')
+var log = require('npmlog')
+var path = require('path')
+var sha = require('sha')
+var retry = require('retry')
+var createWriteStream = require('fs-write-stream-atomic')
+var npm = require('../npm.js')
+var inflight = require('inflight')
+var addLocalTarball = require('./add-local-tarball.js')
+var cacheFile = require('npm-cache-filename')
+var rimraf = require('rimraf')
+var pulseTillDone = require('../utils/pulse-till-done.js')
 
 module.exports = addRemoteTarball
 
 function addRemoteTarball (u, pkgData, shasum, auth, cb_) {
-  assert(typeof u === "string", "must have module URL")
-  assert(typeof cb_ === "function", "must have callback")
+  assert(typeof u === 'string', 'must have module URL')
+  assert(typeof cb_ === 'function', 'must have callback')
 
   function cb (er, data) {
     if (data) {
@@ -26,8 +28,8 @@ function addRemoteTarball (u, pkgData, shasum, auth, cb_) {
   }
 
   cb_ = inflight(u, cb_)
-  if (!cb_) return log.verbose("addRemoteTarball", u, "already in flight; waiting")
-  log.verbose("addRemoteTarball", u, "not in flight; adding")
+  if (!cb_) return log.verbose('addRemoteTarball', u, 'already in flight; waiting')
+  log.verbose('addRemoteTarball', u, 'not in flight; adding')
 
   // XXX Fetch direct to cache location, store tarballs under
   // ${cache}/registry.npmjs.org/pkg/-/pkg-1.2.3.tgz
@@ -35,10 +37,16 @@ function addRemoteTarball (u, pkgData, shasum, auth, cb_) {
 
   function next (er, resp, shasum) {
     if (er) return cb(er)
-    addLocalTarball(tmp, pkgData, shasum, cb)
+    addLocalTarball(tmp, pkgData, shasum, cleanup)
+  }
+  function cleanup (er, data) {
+    if (er) return cb(er)
+    rimraf(tmp, function () {
+      cb(er, data)
+    })
   }
 
-  log.verbose("addRemoteTarball", [u, shasum])
+  log.verbose('addRemoteTarball', [u, shasum])
   mkdir(path.dirname(tmp), function (er) {
     if (er) return cb(er)
     addRemoteTarball_(u, tmp, shasum, auth, next)
@@ -49,21 +57,24 @@ function addRemoteTarball_ (u, tmp, shasum, auth, cb) {
   // Tuned to spread 3 attempts over about a minute.
   // See formula at <https://github.com/tim-kos/node-retry>.
   var operation = retry.operation({
-    retries: npm.config.get("fetch-retries")
-  , factor: npm.config.get("fetch-retry-factor")
-  , minTimeout: npm.config.get("fetch-retry-mintimeout")
-  , maxTimeout: npm.config.get("fetch-retry-maxtimeout")
+    retries: npm.config.get('fetch-retries'),
+    factor: npm.config.get('fetch-retry-factor'),
+    minTimeout: npm.config.get('fetch-retry-mintimeout'),
+    maxTimeout: npm.config.get('fetch-retry-maxtimeout')
   })
 
   operation.attempt(function (currentAttempt) {
-    log.info("retry", "fetch attempt " + currentAttempt
-      + " at " + (new Date()).toLocaleTimeString())
+    log.info(
+      'retry',
+      'fetch attempt', currentAttempt,
+      'at', (new Date()).toLocaleTimeString()
+    )
     fetchAndShaCheck(u, tmp, shasum, auth, function (er, response, shasum) {
       // Only retry on 408, 5xx or no `response`.
       var sc = response && response.statusCode
       var statusRetry = !sc || (sc === 408 || sc >= 500)
       if (er && statusRetry && operation.retry(er)) {
-        log.warn("retry", "will retry, error on last attempt: " + er)
+        log.warn('retry', 'will retry, error on last attempt: ' + er)
         return
       }
       cb(er, response, shasum)
@@ -72,34 +83,35 @@ function addRemoteTarball_ (u, tmp, shasum, auth, cb) {
 }
 
 function fetchAndShaCheck (u, tmp, shasum, auth, cb) {
-  npm.registry.fetch(u, { auth : auth }, function (er, response) {
+  cb = pulseTillDone('fetchTarball', cb)
+  npm.registry.fetch(u, { auth: auth }, function (er, response) {
     if (er) {
-      log.error("fetch failed", u)
+      log.error('fetch failed', u)
       return cb(er, response)
     }
 
-    var tarball = createWriteStream(tmp, { mode : npm.modes.file })
-    tarball.on("error", function (er) {
+    var tarball = createWriteStream(tmp, { mode: npm.modes.file })
+    tarball.on('error', function (er) {
       cb(er)
       tarball.destroy()
     })
 
-    tarball.on("finish", function () {
+    tarball.on('finish', function () {
       if (!shasum) {
         // Well, we weren't given a shasum, so at least sha what we have
         // in case we want to compare it to something else later
         return sha.get(tmp, function (er, shasum) {
-          log.silly("fetchAndShaCheck", "shasum", shasum)
+          log.silly('fetchAndShaCheck', 'shasum', shasum)
           cb(er, response, shasum)
         })
       }
 
       // validate that the url we just downloaded matches the expected shasum.
-      log.silly("fetchAndShaCheck", "shasum", shasum)
+      log.silly('fetchAndShaCheck', 'shasum', shasum)
       sha.check(tmp, shasum, function (er) {
         if (er && er.message) {
           // add original filename for better debuggability
-          er.message = er.message + "\n" + "From:     " + u
+          er.message = er.message + '\n' + 'From:     ' + u
         }
         return cb(er, response, shasum)
       })
diff --git a/deps/npm/lib/cache/cached-package-root.js b/deps/npm/lib/cache/cached-package-root.js
index 7163314a8ede62..b47fac6c9e2ea0 100644
--- a/deps/npm/lib/cache/cached-package-root.js
+++ b/deps/npm/lib/cache/cached-package-root.js
@@ -1,14 +1,14 @@
-var assert = require("assert")
-var resolve = require("path").resolve
+var assert = require('assert')
+var resolve = require('path').resolve
 
-var npm = require("../npm.js")
+var npm = require('../npm.js')
 
 module.exports = getCacheRoot
 
 function getCacheRoot (data) {
-  assert(data, "must pass package metadata")
-  assert(data.name, "package metadata must include name")
-  assert(data.version, "package metadata must include version")
+  assert(data, 'must pass package metadata')
+  assert(data.name, 'package metadata must include name')
+  assert(data.version, 'package metadata must include version')
 
   return resolve(npm.cache, data.name, data.version)
 }
diff --git a/deps/npm/lib/cache/caching-client.js b/deps/npm/lib/cache/caching-client.js
index ec8eb8e16ce083..77d8d66cb248fa 100644
--- a/deps/npm/lib/cache/caching-client.js
+++ b/deps/npm/lib/cache/caching-client.js
@@ -1,30 +1,31 @@
 module.exports = CachingRegistryClient
 
-var path = require("path")
-  , fs = require("graceful-fs")
-  , url = require("url")
-  , assert = require("assert")
-  , inherits = require("util").inherits
-
-var RegistryClient = require("npm-registry-client")
-  , npm = require("../npm.js")
-  , log = require("npmlog")
-  , getCacheStat = require("./get-stat.js")
-  , cacheFile = require("npm-cache-filename")
-  , mkdirp = require("mkdirp")
-  , rimraf = require("rimraf")
-  , chownr = require("chownr")
-  , writeFile = require("write-file-atomic")
+var path = require('path')
+var fs = require('graceful-fs')
+var url = require('url')
+var assert = require('assert')
+var inherits = require('util').inherits
+
+var RegistryClient = require('npm-registry-client')
+var npm = require('../npm.js')
+var log = require('npmlog')
+var getCacheStat = require('./get-stat.js')
+var cacheFile = require('npm-cache-filename')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var chownr = require('chownr')
+var writeFile = require('write-file-atomic')
+var parseJSON = require('../utils/parse-json')
 
 function CachingRegistryClient (config) {
   RegistryClient.call(this, adaptConfig(config))
 
-  this._mapToCache = cacheFile(config.get("cache"))
+  this._mapToCache = cacheFile(config.get('cache'))
 
   // swizzle in our custom cache invalidation logic
   this._request = this.request
-  this.request  = this._invalidatingRequest
-  this.get      = get
+  this.request = this._invalidatingRequest
+  this.get = get
 }
 inherits(CachingRegistryClient, RegistryClient)
 
@@ -34,7 +35,7 @@ CachingRegistryClient.prototype._invalidatingRequest = function (uri, params, cb
     var args = arguments
 
     var method = params.method
-    if (method !== "HEAD" && method !== "GET") {
+    if (method !== 'HEAD' && method !== 'GET') {
       var invalidated = client._mapToCache(uri)
       // invalidate cache
       //
@@ -43,7 +44,7 @@ CachingRegistryClient.prototype._invalidatingRequest = function (uri, params, cb
       // thinking that it didn't work when it did.
       // Note that failure is an acceptable option here, since the only
       // result will be a stale cache for some helper commands.
-      log.verbose("request", "invalidating", invalidated, "on", method)
+      log.verbose('request', 'invalidating', invalidated, 'on', method)
       return rimraf(invalidated, function () {
         cb.apply(undefined, args)
       })
@@ -54,23 +55,23 @@ CachingRegistryClient.prototype._invalidatingRequest = function (uri, params, cb
 }
 
 function get (uri, params, cb) {
-  assert(typeof uri === "string", "must pass registry URI to get")
-  assert(params && typeof params === "object", "must pass params to get")
-  assert(typeof cb === "function", "must pass callback to get")
+  assert(typeof uri === 'string', 'must pass registry URI to get')
+  assert(params && typeof params === 'object', 'must pass params to get')
+  assert(typeof cb === 'function', 'must pass callback to get')
 
   var parsed = url.parse(uri)
   assert(
-    parsed.protocol === "http:" || parsed.protocol === "https:",
-    "must have a URL that starts with http: or https:"
+    parsed.protocol === 'http:' || parsed.protocol === 'https:',
+    'must have a URL that starts with http: or https:'
   )
 
-  var cacheBase = cacheFile(npm.config.get("cache"))(uri)
-  var cachePath = path.join(cacheBase, ".cache.json")
+  var cacheBase = cacheFile(npm.config.get('cache'))(uri)
+  var cachePath = path.join(cacheBase, '.cache.json')
 
   // If the GET is part of a write operation (PUT or DELETE), then
   // skip past the cache entirely, but still save the results.
   if (uri.match(/\?write=true$/)) {
-    log.verbose("get", "GET as part of write; not caching result")
+    log.verbose('get', 'GET as part of write; not caching result')
     return get_.call(this, uri, cachePath, params, cb)
   }
 
@@ -78,20 +79,14 @@ function get (uri, params, cb) {
   fs.stat(cachePath, function (er, stat) {
     if (!er) {
       fs.readFile(cachePath, function (er, data) {
-        try {
-          data = JSON.parse(data)
-        }
-        catch (ex) {
-          data = null
-        }
+        data = parseJSON.noExceptions(data)
 
         params.stat = stat
         params.data = data
 
         get_.call(client, uri, cachePath, params, cb)
       })
-    }
-    else {
+    } else {
       get_.call(client, uri, cachePath, params, cb)
     }
   })
@@ -99,16 +94,16 @@ function get (uri, params, cb) {
 
 function get_ (uri, cachePath, params, cb) {
   var staleOk = params.staleOk === undefined ? false : params.staleOk
-    , timeout = params.timeout === undefined ? -1 : params.timeout
-    , data    = params.data
-    , stat    = params.stat
-    , etag
-    , lastModified
-
-  timeout = Math.min(timeout, npm.config.get("cache-max") || 0)
-  timeout = Math.max(timeout, npm.config.get("cache-min") || -Infinity)
+  var timeout = params.timeout === undefined ? -1 : params.timeout
+  var data = params.data
+  var stat = params.stat
+  var etag
+  var lastModified
+
+  timeout = Math.min(timeout, npm.config.get('cache-max') || 0)
+  timeout = Math.max(timeout, npm.config.get('cache-min') || -Infinity)
   if (process.env.COMP_CWORD !== undefined &&
-      process.env.COMP_LINE  !== undefined &&
+      process.env.COMP_LINE !== undefined &&
       process.env.COMP_POINT !== undefined) {
     timeout = Math.max(timeout, 60000)
   }
@@ -118,19 +113,19 @@ function get_ (uri, cachePath, params, cb) {
     if (data._lastModified) lastModified = data._lastModified
 
     if (stat && timeout && timeout > 0) {
-      if ((Date.now() - stat.mtime.getTime())/1000 < timeout) {
-        log.verbose("get", uri, "not expired, no request")
+      if ((Date.now() - stat.mtime.getTime()) / 1000 < timeout) {
+        log.verbose('get', uri, 'not expired, no request')
         delete data._etag
         delete data._lastModified
-        return cb(null, data, JSON.stringify(data), { statusCode : 304 })
+        return cb(null, data, JSON.stringify(data), { statusCode: 304 })
       }
 
       if (staleOk) {
-        log.verbose("get", uri, "staleOk, background update")
+        log.verbose('get', uri, 'staleOk, background update')
         delete data._etag
         delete data._lastModified
         process.nextTick(
-          cb.bind(null, null, data, JSON.stringify(data), { statusCode : 304 } )
+          cb.bind(null, null, data, JSON.stringify(data), { statusCode: 304 })
         )
         cb = function () {}
       }
@@ -138,10 +133,10 @@ function get_ (uri, cachePath, params, cb) {
   }
 
   var options = {
-    etag         : etag,
-    lastModified : lastModified,
-    follow       : params.follow,
-    auth         : params.auth
+    etag: etag,
+    lastModified: lastModified,
+    follow: params.follow,
+    auth: params.auth
   }
   this.request(uri, options, function (er, remoteData, raw, response) {
     // if we get an error talking to the registry, but we have it
@@ -152,15 +147,15 @@ function get_ (uri, cachePath, params, cb) {
     }
 
     if (response) {
-      log.silly("get", "cb", [response.statusCode, response.headers])
+      log.silly('get', 'cb', [response.statusCode, response.headers])
       if (response.statusCode === 304 && (etag || lastModified)) {
         remoteData = data
-        log.verbose(etag ? "etag" : "lastModified", uri+" from cache")
+        log.verbose(etag ? 'etag' : 'lastModified', uri + ' from cache')
       }
     }
 
     data = remoteData
-    if (!data) er = er || new Error("failed to fetch from registry: " + uri)
+    if (!data) er = er || new Error('failed to fetch from registry: ' + uri)
 
     if (er) return cb(er, data, raw, response)
 
@@ -174,7 +169,7 @@ function get_ (uri, cachePath, params, cb) {
     }
 
     function saveToCache (cachePath, data, saved) {
-      log.verbose("get", "saving", data.name, "to", cachePath)
+      log.verbose('get', 'saving', data.name, 'to', cachePath)
       getCacheStat(function (er, st) {
         mkdirp(path.dirname(cachePath), function (er, made) {
           if (er) return saved()
@@ -192,26 +187,26 @@ function get_ (uri, cachePath, params, cb) {
 
 function adaptConfig (config) {
   return {
-    proxy : {
-      http         : config.get("proxy"),
-      https        : config.get("https-proxy"),
-      localAddress : config.get("local-address")
+    proxy: {
+      http: config.get('proxy'),
+      https: config.get('https-proxy'),
+      localAddress: config.get('local-address')
     },
-    ssl : {
-      certificate : config.get("cert"),
-      key         : config.get("key"),
-      ca          : config.get("ca"),
-      strict      : config.get("strict-ssl")
+    ssl: {
+      certificate: config.get('cert'),
+      key: config.get('key'),
+      ca: config.get('ca'),
+      strict: config.get('strict-ssl')
     },
-    retry : {
-      retries    : config.get("fetch-retries"),
-      factor     : config.get("fetch-retry-factor"),
-      minTimeout : config.get("fetch-retry-mintimeout"),
-      maxTimeout : config.get("fetch-retry-maxtimeout")
+    retry: {
+      retries: config.get('fetch-retries'),
+      factor: config.get('fetch-retry-factor'),
+      minTimeout: config.get('fetch-retry-mintimeout'),
+      maxTimeout: config.get('fetch-retry-maxtimeout')
     },
-    userAgent  : config.get("user-agent"),
-    log        : log,
-    defaultTag : config.get("tag"),
-    couchToken : config.get("_token")
+    userAgent: config.get('user-agent'),
+    log: log,
+    defaultTag: config.get('tag'),
+    couchToken: config.get('_token')
   }
 }
diff --git a/deps/npm/lib/cache/update-index.js b/deps/npm/lib/cache/update-index.js
index ab1ede120b2d88..a872b034908de5 100644
--- a/deps/npm/lib/cache/update-index.js
+++ b/deps/npm/lib/cache/update-index.js
@@ -10,6 +10,8 @@ var log = require('npmlog')
 var cacheFile = require('npm-cache-filename')
 var getCacheStat = require('./get-stat.js')
 var mapToRegistry = require('../utils/map-to-registry.js')
+var pulseTillDone = require('../utils/pulse-till-done.js')
+var parseJSON = require('../utils/parse-json.js')
 
 /* /-/all is special.
  * It uses timestamp-based caching and partial updates,
@@ -46,9 +48,8 @@ function updateIndex (staleness, cb) {
           chownr(made || cachePath, st.uid, st.gid, function (er) {
             if (er) return cb(er)
 
-            try {
-              data = JSON.parse(data)
-            } catch (ex) {
+            data = parseJSON.noExceptions(data)
+            if (!data) {
               fs.writeFile(cachePath, '{}', function (er) {
                 if (er) return cb(new Error('Broken cache.'))
 
@@ -80,7 +81,7 @@ function updateIndex (staleness, cb) {
 
 function updateIndex_ (all, params, data, cachePath, cb) {
   log.silly('update-index', 'fetching', all)
-  npm.registry.request(all, params, function (er, updates, _, res) {
+  npm.registry.request(all, params, pulseTillDone('updateIndex', function (er, updates, _, res) {
     if (er) return cb(er, data)
 
     var headers = res.headers
@@ -100,5 +101,5 @@ function updateIndex_ (all, params, data, cachePath, cb) {
         })
       })
     })
-  })
+  }))
 }
diff --git a/deps/npm/lib/completion.js b/deps/npm/lib/completion.js
index 1d26ffcf8ac92d..e9a838d484f508 100644
--- a/deps/npm/lib/completion.js
+++ b/deps/npm/lib/completion.js
@@ -1,119 +1,114 @@
 
 module.exports = completion
 
-completion.usage = "npm completion >> ~/.bashrc\n"
-                 + "npm completion >> ~/.zshrc\n"
-                 + "source <(npm completion)"
-
-var npm = require("./npm.js")
-  , npmconf = require("./config/core.js")
-  , configDefs = npmconf.defs
-  , configTypes = configDefs.types
-  , shorthands = configDefs.shorthands
-  , nopt = require("nopt")
-  , configNames = Object.keys(configTypes).filter(function (e) {
-      return e.charAt(0) !== "_"
+completion.usage = 'source <(npm completion)'
+
+var npm = require('./npm.js')
+var npmconf = require('./config/core.js')
+var configDefs = npmconf.defs
+var configTypes = configDefs.types
+var shorthands = configDefs.shorthands
+var nopt = require('nopt')
+var configNames = Object.keys(configTypes).filter(function (e) {
+      return e.charAt(0) !== '_'
     })
-  , shorthandNames = Object.keys(shorthands)
-  , allConfs = configNames.concat(shorthandNames)
-  , once = require("once")
-
+var shorthandNames = Object.keys(shorthands)
+var allConfs = configNames.concat(shorthandNames)
+var once = require('once')
 
 completion.completion = function (opts, cb) {
   if (opts.w > 3) return cb()
 
-  var fs = require("graceful-fs")
-    , path = require("path")
-    , bashExists = null
-    , zshExists = null
-  fs.stat(path.resolve(process.env.HOME, ".bashrc"), function (er) {
+  var fs = require('graceful-fs')
+  var path = require('path')
+  var bashExists = null
+  var zshExists = null
+  fs.stat(path.resolve(process.env.HOME, '.bashrc'), function (er) {
     bashExists = !er
     next()
   })
-  fs.stat(path.resolve(process.env.HOME, ".zshrc"), function (er) {
+  fs.stat(path.resolve(process.env.HOME, '.zshrc'), function (er) {
     zshExists = !er
     next()
   })
   function next () {
     if (zshExists === null || bashExists === null) return
     var out = []
-    if (zshExists) out.push("~/.zshrc")
-    if (bashExists) out.push("~/.bashrc")
-    if (opts.w === 2) out = out.map(function (m) {
-      return [">>", m]
-    })
+    if (zshExists) out.push('~/.zshrc')
+    if (bashExists) out.push('~/.bashrc')
+    if (opts.w === 2) {
+      out = out.map(function (m) {
+        return ['>>', m]
+      })
+    }
     cb(null, out)
   }
 }
 
 function completion (args, cb) {
-  if (process.platform === "win32") {
-    var e = new Error("npm completion not supported on windows")
-    e.code = "ENOTSUP"
-    e.errno = require("constants").ENOTSUP
+  if (process.platform === 'win32') {
+    var e = new Error('npm completion not supported on windows')
+    e.code = 'ENOTSUP'
+    e.errno = require('constants').ENOTSUP
     return cb(e)
   }
 
   // if the COMP_* isn't in the env, then just dump the script.
-  if (process.env.COMP_CWORD === undefined
-    ||process.env.COMP_LINE === undefined
-    ||process.env.COMP_POINT === undefined
-    ) return dumpScript(cb)
+  if (process.env.COMP_CWORD === undefined ||
+      process.env.COMP_LINE === undefined ||
+      process.env.COMP_POINT === undefined) {
+    return dumpScript(cb)
+  }
 
   console.error(process.env.COMP_CWORD)
   console.error(process.env.COMP_LINE)
   console.error(process.env.COMP_POINT)
 
-  //console.log("abracadabrasauce\nabracad cat monger")
-  //if (Math.random() * 3 < 1) console.log("man\\ bear\\ pig")
-  //else if (Math.random() * 3 < 1)
-  //  console.log("porkchop\\ sandwiches\nporkman")
-  //else console.log("encephylophagy")
-
   // get the partial line and partial word,
   // if the point isn't at the end.
   // ie, tabbing at: npm foo b|ar
   var w = +process.env.COMP_CWORD
-    , words = args.map(unescape)
-    , word = words[w]
-    , line = process.env.COMP_LINE
-    , point = +process.env.COMP_POINT
-    , partialLine = line.substr(0, point)
-    , partialWords = words.slice(0, w)
+  var words = args.map(unescape)
+  var word = words[w]
+  var line = process.env.COMP_LINE
+  var point = +process.env.COMP_POINT
+  var partialLine = line.substr(0, point)
+  var partialWords = words.slice(0, w)
 
   // figure out where in that last word the point is.
   var partialWord = args[w]
-    , i = partialWord.length
-  while (partialWord.substr(0, i) !== partialLine.substr(-1*i) && i > 0) {
-    i --
+  var i = partialWord.length
+  while (partialWord.substr(0, i) !== partialLine.substr(-1 * i) && i > 0) {
+    i--
   }
   partialWord = unescape(partialWord.substr(0, i))
   partialWords.push(partialWord)
 
-  var opts = { words : words
-             , w : w
-             , word : word
-             , line : line
-             , lineLength : line.length
-             , point : point
-             , partialLine : partialLine
-             , partialWords : partialWords
-             , partialWord : partialWord
-             , raw: args
-             }
+  var opts = {
+    words: words,
+    w: w,
+    word: word,
+    line: line,
+    lineLength: line.length,
+    point: point,
+    partialLine: partialLine,
+    partialWords: partialWords,
+    partialWord: partialWord,
+    raw: args
+  }
 
   cb = wrapCb(cb, opts)
 
   console.error(opts)
 
-  if (partialWords.slice(0, -1).indexOf("--") === -1) {
-    if (word.charAt(0) === "-") return configCompl(opts, cb)
-    if (words[w - 1]
-        && words[w - 1].charAt(0) === "-"
-        && !isFlag(words[w - 1])) {
+  if (partialWords.slice(0, -1).indexOf('--') === -1) {
+    if (word.charAt(0) === '-') return configCompl(opts, cb)
+    if (words[w - 1] &&
+        words[w - 1].charAt(0) === '-' &&
+        !isFlag(words[w - 1])) {
       // awaiting a value for a non-bool config.
       // don't even try to do this for now
-      console.error("configValueCompl")
+      console.error('configValueCompl')
       return configValueCompl(opts, cb)
     }
   }
@@ -145,20 +140,20 @@ function completion (args, cb) {
 }
 
 function dumpScript (cb) {
-  var fs = require("graceful-fs")
-    , path = require("path")
-    , p = path.resolve(__dirname, "utils/completion.sh")
+  var fs = require('graceful-fs')
+  var path = require('path')
+  var p = path.resolve(__dirname, 'utils/completion.sh')
 
   // The Darwin patch below results in callbacks first for the write and then
   // for the error handler, so make sure we only call our callback once.
   cb = once(cb)
 
-  fs.readFile(p, "utf8", function (er, d) {
+  fs.readFile(p, 'utf8', function (er, d) {
     if (er) return cb(er)
-    d = d.replace(/^\#\!.*?\n/, "")
+    d = d.replace(/^\#\!.*?\n/, '')
 
     process.stdout.write(d, function () { cb() })
-    process.stdout.on("error", function (er) {
+    process.stdout.on('error', function (er) {
       // Darwin is a real dick sometimes.
       //
       // This is necessary because the "source" or "." program in
@@ -169,7 +164,7 @@ function dumpScript (cb) {
       // Really, one should not be tossing away EPIPE errors, or any
       // errors, so casually.  But, without this, `. <(npm completion)`
       // can never ever work on OS X.
-      if (er.errno === "EPIPE") er = null
+      if (er.errno === 'EPIPE') er = null
       cb(er)
     })
 
@@ -177,59 +172,65 @@ function dumpScript (cb) {
 }
 
 function unescape (w) {
-  if (w.charAt(0) === "\"") return w.replace(/^"|"$/g, "")
-  else return w.replace(/\\ /g, " ")
+  if (w.charAt(0) === '\'') return w.replace(/^'|'$/g, '')
+  else return w.replace(/\\ /g, ' ')
 }
 
 function escape (w) {
   if (!w.match(/\s+/)) return w
-  return "\"" + w + "\""
+  return '\'' + w + '\''
 }
 
 // The command should respond with an array.  Loop over that,
 // wrapping quotes around any that have spaces, and writing
 // them to stdout.  Use console.log, not the outfd config.
 // If any of the items are arrays, then join them with a space.
-// Ie, returning ["a", "b c", ["d", "e"]] would allow it to expand
-// to: "a", "b c", or "d" "e"
-function wrapCb (cb, opts) { return function (er, compls) {
-  if (!Array.isArray(compls)) compls = compls ? [compls] : []
-  compls = compls.map(function (c) {
-    if (Array.isArray(c)) c = c.map(escape).join(" ")
-    else c = escape(c)
-    return c
-  })
-  if (opts.partialWord) compls = compls.filter(function (c) {
-    return c.indexOf(opts.partialWord) === 0
-  })
-  console.error([er && er.stack, compls, opts.partialWord])
-  if (er || compls.length === 0) return cb(er)
+// Ie, returning ['a', 'b c', ['d', 'e']] would allow it to expand
+// to: 'a', 'b c', or 'd' 'e'
+function wrapCb (cb, opts) {
+  return function (er, compls) {
+    if (!Array.isArray(compls)) compls = compls ? [compls] : []
+    compls = compls.map(function (c) {
+      if (Array.isArray(c)) c = c.map(escape).join(' ')
+      else c = escape(c)
+      return c
+    })
 
-  console.log(compls.join("\n"))
-  cb()
-}}
+    if (opts.partialWord) {
+      compls = compls.filter(function (c) {
+        return c.indexOf(opts.partialWord) === 0
+      })
+    }
+
+    console.error([er && er.stack, compls, opts.partialWord])
+    if (er || compls.length === 0) return cb(er)
+
+    console.log(compls.join('\n'))
+    cb()
+  }
+}
 
 // the current word has a dash.  Return the config names,
 // with the same number of dashes as the current word has.
 function configCompl (opts, cb) {
   var word = opts.word
-    , split = word.match(/^(-+)((?:no-)*)(.*)$/)
-    , dashes = split[1]
-    , no = split[2]
-    , flags = configNames.filter(isFlag)
+  var split = word.match(/^(-+)((?:no-)*)(.*)$/)
+  var dashes = split[1]
+  var no = split[2]
+  var flags = configNames.filter(isFlag)
   console.error(flags)
 
   return cb(null, allConfs.map(function (c) {
     return dashes + c
   }).concat(flags.map(function (f) {
-    return dashes + (no || "no-") + f
+    return dashes + (no || 'no-') + f
   })))
 }
 
 // expand with the valid values of various config values.
 // not yet implemented.
 function configValueCompl (opts, cb) {
-  console.error("configValue", opts)
+  console.error('configValue', opts)
   return cb(null, [])
 }
 
@@ -237,8 +238,8 @@ function configValueCompl (opts, cb) {
 function isFlag (word) {
   // shorthands never take args.
   var split = word.match(/^(-*)((?:no-)+)?(.*)$/)
-    , no = split[2]
-    , conf = split[3]
+  var no = split[2]
+  var conf = split[3]
   return no || configTypes[conf] === Boolean || shorthands[conf]
 }
 
diff --git a/deps/npm/lib/config.js b/deps/npm/lib/config.js
index c79cdc5b8b254f..305e6bc8a5d3a7 100644
--- a/deps/npm/lib/config.js
+++ b/deps/npm/lib/config.js
@@ -1,46 +1,47 @@
 
 module.exports = config
 
-config.usage = "npm config set <key> <value>"
-             + "\nnpm config get [<key>]"
-             + "\nnpm config delete <key>"
-             + "\nnpm config list"
-             + "\nnpm config edit"
-             + "\nnpm set <key> <value>"
-             + "\nnpm get [<key>]"
+config.usage = 'npm config set <key> <value>' +
+               '\nnpm config get [<key>]' +
+               '\nnpm config delete <key>' +
+               '\nnpm config list' +
+               '\nnpm config edit' +
+               '\nnpm set <key> <value>' +
+               '\nnpm get [<key>]'
 
-var log = require("npmlog")
-  , npm = require("./npm.js")
-  , npmconf = require("./config/core.js")
-  , fs = require("graceful-fs")
-  , writeFileAtomic = require("write-file-atomic")
-  , types = npmconf.defs.types
-  , ini = require("ini")
-  , editor = require("editor")
-  , os = require("os")
-  , umask = require("./utils/umask")
+var log = require('npmlog')
+var npm = require('./npm.js')
+var npmconf = require('./config/core.js')
+var fs = require('graceful-fs')
+var writeFileAtomic = require('write-file-atomic')
+var types = npmconf.defs.types
+var ini = require('ini')
+var editor = require('editor')
+var os = require('os')
+var umask = require('./utils/umask')
 
 config.completion = function (opts, cb) {
   var argv = opts.conf.argv.remain
-  if (argv[1] !== "config") argv.unshift("config")
+  if (argv[1] !== 'config') argv.unshift('config')
   if (argv.length === 2) {
-    var cmds = ["get", "set", "delete", "ls", "rm", "edit"]
-    if (opts.partialWord !== "l") cmds.push("list")
+    var cmds = ['get', 'set', 'delete', 'ls', 'rm', 'edit']
+    if (opts.partialWord !== 'l') cmds.push('list')
     return cb(null, cmds)
   }
 
   var action = argv[2]
   switch (action) {
-    case "set":
+    case 'set':
       // todo: complete with valid values, if possible.
       if (argv.length > 3) return cb(null, [])
       // fallthrough
-    case "get":
-    case "delete":
-    case "rm":
+      /*eslint no-fallthrough:0*/
+    case 'get':
+    case 'delete':
+    case 'rm':
       return cb(null, Object.keys(types))
-    case "edit":
-    case "list": case "ls":
+    case 'edit':
+    case 'list': case 'ls':
       return cb(null, [])
     default: return cb(null, [])
   }
@@ -52,87 +53,87 @@ config.completion = function (opts, cb) {
 function config (args, cb) {
   var action = args.shift()
   switch (action) {
-    case "set": return set(args[0], args[1], cb)
-    case "get": return get(args[0], cb)
-    case "delete": case "rm": case "del": return del(args[0], cb)
-    case "list": case "ls": return list(cb)
-    case "edit": return edit(cb)
+    case 'set': return set(args[0], args[1], cb)
+    case 'get': return get(args[0], cb)
+    case 'delete': case 'rm': case 'del': return del(args[0], cb)
+    case 'list': case 'ls': return list(cb)
+    case 'edit': return edit(cb)
     default: return unknown(action, cb)
   }
 }
 
 function edit (cb) {
-  var e = npm.config.get("editor")
-    , which = npm.config.get("global") ? "global" : "user"
-    , f = npm.config.get(which + "config")
-  if (!e) return cb(new Error("No EDITOR config or environ set."))
+  var e = npm.config.get('editor')
+  var which = npm.config.get('global') ? 'global' : 'user'
+  var f = npm.config.get(which + 'config')
+  if (!e) return cb(new Error('No EDITOR config or environ set.'))
   npm.config.save(which, function (er) {
     if (er) return cb(er)
-    fs.readFile(f, "utf8", function (er, data) {
-      if (er) data = ""
-      data = [ ";;;;"
-             , "; npm "+(npm.config.get("global") ?
-                         "globalconfig" : "userconfig")+" file"
-             , "; this is a simple ini-formatted file"
-             , "; lines that start with semi-colons are comments."
-             , "; read `npm help config` for help on the various options"
-             , ";;;;"
-             , ""
-             , data
-             ].concat( [ ";;;;"
-                       , "; all options with default values"
-                       , ";;;;"
-                       ]
-                     )
-              .concat(Object.keys(npmconf.defaults).reduce(function (arr, key) {
+    fs.readFile(f, 'utf8', function (er, data) {
+      if (er) data = ''
+      data = [
+        ';;;;',
+        '; npm ' + (npm.config.get('global') ?
+                  'globalconfig' : 'userconfig') + ' file',
+        '; this is a simple ini-formatted file',
+        '; lines that start with semi-colons are comments.',
+        '; read `npm help config` for help on the various options',
+        ';;;;',
+        '',
+        data
+      ].concat([
+        ';;;;',
+        '; all options with default values',
+        ';;;;'
+      ]).concat(Object.keys(npmconf.defaults).reduce(function (arr, key) {
                 var obj = {}
                 obj[key] = npmconf.defaults[key]
-                if (key === "logstream") return arr
+                if (key === 'logstream') return arr
                 return arr.concat(
                   ini.stringify(obj)
-                    .replace(/\n$/m, "")
-                    .replace(/^/g, "; ")
-                    .replace(/\n/g, "\n; ")
-                    .split("\n"))
+                    .replace(/\n$/m, '')
+                    .replace(/^/g, '; ')
+                    .replace(/\n/g, '\n; ')
+                    .split('\n'))
               }, []))
-              .concat([""])
+              .concat([''])
               .join(os.EOL)
-      writeFileAtomic
-        ( f
-        , data
-        , function (er) {
-            if (er) return cb(er)
-            editor(f, { editor: e }, cb)
-          }
-        )
+      writeFileAtomic(
+        f,
+        data,
+        function (er) {
+          if (er) return cb(er)
+          editor(f, { editor: e }, cb)
+        }
+      )
     })
   })
 }
 
 function del (key, cb) {
-  if (!key) return cb(new Error("no key provided"))
-  var where = npm.config.get("global") ? "global" : "user"
+  if (!key) return cb(new Error('no key provided'))
+  var where = npm.config.get('global') ? 'global' : 'user'
   npm.config.del(key, where)
   npm.config.save(where, cb)
 }
 
 function set (key, val, cb) {
   if (key === undefined) {
-    return unknown("", cb)
+    return unknown('', cb)
   }
   if (val === undefined) {
-    if (key.indexOf("=") !== -1) {
-      var k = key.split("=")
+    if (key.indexOf('=') !== -1) {
+      var k = key.split('=')
       key = k.shift()
-      val = k.join("=")
+      val = k.join('=')
     } else {
-      val = ""
+      val = ''
     }
   }
   key = key.trim()
   val = val.trim()
-  log.info("config", "set %j %j", key, val)
-  var where = npm.config.get("global") ? "global" : "user"
+  log.info('config', 'set %j %j', key, val)
+  var where = npm.config.get('global') ? 'global' : 'user'
   if (key.match(/umask/)) val = umask.fromString(val)
   npm.config.set(key, val, where)
   npm.config.save(where, cb)
@@ -140,8 +141,8 @@ function set (key, val, cb) {
 
 function get (key, cb) {
   if (!key) return list(cb)
-  if (!public(key)) {
-    return cb(new Error("---sekretz---"))
+  if (!publicVar(key)) {
+    return cb(new Error('---sekretz---'))
   }
   var val = npm.config.get(key)
   if (key.match(/umask/)) val = umask.toString(val)
@@ -153,133 +154,129 @@ function sort (a, b) {
   return a > b ? 1 : -1
 }
 
-function public (k) {
-  return !(k.charAt(0) === "_" ||
-           k.indexOf(":_") !== -1 ||
+function publicVar (k) {
+  return !(k.charAt(0) === '_' ||
+           k.indexOf(':_') !== -1 ||
            types[k] !== types[k])
 }
 
 function getKeys (data) {
-  return Object.keys(data).filter(public).sort(sort)
+  return Object.keys(data).filter(publicVar).sort(sort)
 }
 
 function list (cb) {
-  var msg = ""
-    , long = npm.config.get("long")
+  var msg = ''
+  var long = npm.config.get('long')
 
   var cli = npm.config.sources.cli.data
-    , cliKeys = getKeys(cli)
+  var cliKeys = getKeys(cli)
   if (cliKeys.length) {
-    msg += "; cli configs\n"
+    msg += '; cli configs\n'
     cliKeys.forEach(function (k) {
-      if (cli[k] && typeof cli[k] === "object") return
-      if (k === "argv") return
-      msg += k + " = " + JSON.stringify(cli[k]) + "\n"
+      if (cli[k] && typeof cli[k] === 'object') return
+      if (k === 'argv') return
+      msg += k + ' = ' + JSON.stringify(cli[k]) + '\n'
     })
-    msg += "\n"
+    msg += '\n'
   }
 
   // env configs
   var env = npm.config.sources.env.data
-    , envKeys = getKeys(env)
+  var envKeys = getKeys(env)
   if (envKeys.length) {
-    msg += "; environment configs\n"
+    msg += '; environment configs\n'
     envKeys.forEach(function (k) {
       if (env[k] !== npm.config.get(k)) {
         if (!long) return
-        msg += "; " + k + " = " + JSON.stringify(env[k])
-            + " (overridden)\n"
-      } else msg += k + " = " + JSON.stringify(env[k]) + "\n"
+        msg += '; ' + k + ' = ' +
+          JSON.stringify(env[k]) + ' (overridden)\n'
+      } else msg += k + ' = ' + JSON.stringify(env[k]) + '\n'
     })
-    msg += "\n"
+    msg += '\n'
   }
 
   // user config file
   var uconf = npm.config.sources.user.data
-    , uconfKeys = getKeys(uconf)
+  var uconfKeys = getKeys(uconf)
   if (uconfKeys.length) {
-    msg += "; userconfig " + npm.config.get("userconfig") + "\n"
+    msg += '; userconfig ' + npm.config.get('userconfig') + '\n'
     uconfKeys.forEach(function (k) {
-      var val = (k.charAt(0) === "_")
-              ? "---sekretz---"
+      var val = (k.charAt(0) === '_')
+              ? '---sekretz---'
               : JSON.stringify(uconf[k])
       if (uconf[k] !== npm.config.get(k)) {
         if (!long) return
-        msg += "; " + k + " = " + val
-            + " (overridden)\n"
-      } else msg += k + " = " + val + "\n"
+        msg += '; ' + k + ' = ' + val + ' (overridden)\n'
+      } else msg += k + ' = ' + val + '\n'
     })
-    msg += "\n"
+    msg += '\n'
   }
 
   // global config file
   var gconf = npm.config.sources.global.data
-    , gconfKeys = getKeys(gconf)
+  var gconfKeys = getKeys(gconf)
   if (gconfKeys.length) {
-    msg += "; globalconfig " + npm.config.get("globalconfig") + "\n"
+    msg += '; globalconfig ' + npm.config.get('globalconfig') + '\n'
     gconfKeys.forEach(function (k) {
-      var val = (k.charAt(0) === "_")
-              ? "---sekretz---"
+      var val = (k.charAt(0) === '_')
+              ? '---sekretz---'
               : JSON.stringify(gconf[k])
       if (gconf[k] !== npm.config.get(k)) {
         if (!long) return
-        msg += "; " + k + " = " + val
-            + " (overridden)\n"
-      } else msg += k + " = " + val + "\n"
+        msg += '; ' + k + ' = ' + val + ' (overridden)\n'
+      } else msg += k + ' = ' + val + '\n'
     })
-    msg += "\n"
+    msg += '\n'
   }
 
   // builtin config file
   var builtin = npm.config.sources.builtin || {}
   if (builtin && builtin.data) {
     var bconf = builtin.data
-      , bpath = builtin.path
-      , bconfKeys = getKeys(bconf)
+    var bpath = builtin.path
+    var bconfKeys = getKeys(bconf)
     if (bconfKeys.length) {
-      msg += "; builtin config " + bpath + "\n"
+      msg += '; builtin config ' + bpath + '\n'
       bconfKeys.forEach(function (k) {
-        var val = (k.charAt(0) === "_")
-                ? "---sekretz---"
+        var val = (k.charAt(0) === '_')
+                ? '---sekretz---'
                 : JSON.stringify(bconf[k])
         if (bconf[k] !== npm.config.get(k)) {
           if (!long) return
-          msg += "; " + k + " = " + val
-              + " (overridden)\n"
-        } else msg += k + " = " + val + "\n"
+          msg += '; ' + k + ' = ' + val + ' (overridden)\n'
+        } else msg += k + ' = ' + val + '\n'
       })
-      msg += "\n"
+      msg += '\n'
     }
   }
 
   // only show defaults if --long
   if (!long) {
-    msg += "; node bin location = " + process.execPath + "\n"
-         + "; cwd = " + process.cwd() + "\n"
-         + "; HOME = " + process.env.HOME + "\n"
-         + "; 'npm config ls -l' to show all defaults.\n"
+    msg += '; node bin location = ' + process.execPath + '\n' +
+           '; cwd = ' + process.cwd() + '\n' +
+           '; HOME = ' + process.env.HOME + '\n' +
+           '; "npm config ls -l" to show all defaults.\n'
 
     console.log(msg)
     return cb()
   }
 
   var defaults = npmconf.defaults
-    , defKeys = getKeys(defaults)
-  msg += "; default values\n"
+  var defKeys = getKeys(defaults)
+  msg += '; default values\n'
   defKeys.forEach(function (k) {
-    if (defaults[k] && typeof defaults[k] === "object") return
+    if (defaults[k] && typeof defaults[k] === 'object') return
     var val = JSON.stringify(defaults[k])
     if (defaults[k] !== npm.config.get(k)) {
-      msg += "; " + k + " = " + val
-          + " (overridden)\n"
-    } else msg += k + " = " + val + "\n"
+      msg += '; ' + k + ' = ' + val + ' (overridden)\n'
+    } else msg += k + ' = ' + val + '\n'
   })
-  msg += "\n"
+  msg += '\n'
 
   console.log(msg)
   return cb()
 }
 
 function unknown (action, cb) {
-  cb("Usage:\n" + config.usage)
+  cb('Usage:\n' + config.usage)
 }
diff --git a/deps/npm/lib/config/clear-credentials-by-uri.js b/deps/npm/lib/config/clear-credentials-by-uri.js
index 88131f7adb5b91..13c356605f0210 100644
--- a/deps/npm/lib/config/clear-credentials-by-uri.js
+++ b/deps/npm/lib/config/clear-credentials-by-uri.js
@@ -1,16 +1,16 @@
-var assert = require("assert")
+var assert = require('assert')
 
-var toNerfDart = require("./nerf-dart.js")
+var toNerfDart = require('./nerf-dart.js')
 
 module.exports = clearCredentialsByURI
 
 function clearCredentialsByURI (uri) {
-  assert(uri && typeof uri === "string", "registry URL is required")
+  assert(uri && typeof uri === 'string', 'registry URL is required')
 
   var nerfed = toNerfDart(uri)
 
-  this.del(nerfed + ":_authToken", "user")
-  this.del(nerfed + ":_password",  "user")
-  this.del(nerfed + ":username",   "user")
-  this.del(nerfed + ":email",      "user")
+  this.del(nerfed + ':_authToken', 'user')
+  this.del(nerfed + ':_password', 'user')
+  this.del(nerfed + ':username', 'user')
+  this.del(nerfed + ':email', 'user')
 }
diff --git a/deps/npm/lib/config/core.js b/deps/npm/lib/config/core.js
index f11a98dfb88c62..0c6d3ecdb76b43 100644
--- a/deps/npm/lib/config/core.js
+++ b/deps/npm/lib/config/core.js
@@ -1,16 +1,15 @@
-
-var CC = require("config-chain").ConfigChain
-var inherits = require("inherits")
-var configDefs = require("./defaults.js")
+var CC = require('config-chain').ConfigChain
+var inherits = require('inherits')
+var configDefs = require('./defaults.js')
 var types = configDefs.types
-var once = require("once")
-var fs = require("fs")
-var path = require("path")
-var nopt = require("nopt")
-var ini = require("ini")
+var once = require('once')
+var fs = require('fs')
+var path = require('path')
+var nopt = require('nopt')
+var ini = require('ini')
 var Umask = configDefs.Umask
-var mkdirp = require("mkdirp")
-var umask = require("../utils/umask")
+var mkdirp = require('mkdirp')
+var umask = require('../utils/umask')
 
 exports.load = load
 exports.Conf = Conf
@@ -19,11 +18,11 @@ exports.rootConf = null
 exports.usingBuiltin = false
 exports.defs = configDefs
 
-Object.defineProperty(exports, "defaults", { get: function () {
+Object.defineProperty(exports, 'defaults', { get: function () {
   return configDefs.defaults
 }, enumerable: true })
 
-Object.defineProperty(exports, "types", { get: function () {
+Object.defineProperty(exports, 'types', { get: function () {
   return configDefs.types
 }, enumerable: true })
 
@@ -34,20 +33,19 @@ var myUid = process.env.SUDO_UID !== undefined
 var myGid = process.env.SUDO_GID !== undefined
           ? process.env.SUDO_GID : (process.getgid && process.getgid())
 
-
 var loading = false
 var loadCbs = []
 function load () {
   var cli, builtin, cb
-  for (var i = 0; i < arguments.length; i++)
+  for (var i = 0; i < arguments.length; i++) {
     switch (typeof arguments[i]) {
-      case "string": builtin = arguments[i]; break
-      case "object": cli = arguments[i]; break
-      case "function": cb = arguments[i]; break
+      case 'string': builtin = arguments[i]; break
+      case 'object': cli = arguments[i]; break
+      case 'function': cb = arguments[i]; break
     }
+  }
 
-  if (!cb)
-    cb = function () {}
+  if (!cb) cb = function () {}
 
   if (exports.loaded) {
     var ret = exports.loaded
@@ -59,17 +57,17 @@ function load () {
   }
 
   // either a fresh object, or a clone of the passed in obj
-  if (!cli)
+  if (!cli) {
     cli = {}
-  else
+  } else {
     cli = Object.keys(cli).reduce(function (c, k) {
       c[k] = cli[k]
       return c
     }, {})
+  }
 
   loadCbs.push(cb)
-  if (loading)
-    return
+  if (loading) return
 
   loading = true
 
@@ -87,28 +85,28 @@ function load () {
   // check for a builtin if provided.
   exports.usingBuiltin = !!builtin
   var rc = exports.rootConf = new Conf()
-  if (builtin)
-    rc.addFile(builtin, "builtin")
-  else
-    rc.add({}, "builtin")
+  if (builtin) {
+    rc.addFile(builtin, 'builtin')
+  } else {
+    rc.add({}, 'builtin')
+  }
 
-  rc.on("load", function () {
+  rc.on('load', function () {
     load_(builtin, rc, cli, cb)
   })
-  rc.on("error", cb)
+  rc.on('error', cb)
 }
 
-function load_(builtin, rc, cli, cb) {
+function load_ (builtin, rc, cli, cb) {
   var defaults = configDefs.defaults
   var conf = new Conf(rc)
 
   conf.usingBuiltin = !!builtin
-  conf.add(cli, "cli")
+  conf.add(cli, 'cli')
   conf.addEnv()
 
-  conf.loadPrefix(function(er) {
-    if (er)
-      return cb(er)
+  conf.loadPrefix(function (er) {
+    if (er) return cb(er)
 
     // If you're doing `npm --userconfig=~/foo.npmrc` then you'd expect
     // that ~/.npmrc won't override the stuff in ~/foo.npmrc (or, indeed
@@ -126,24 +124,24 @@ function load_(builtin, rc, cli, cb) {
     // the default or resolved userconfig value.  npm will log a "verbose"
     // message about this when it happens, but it is a rare enough edge case
     // that we don't have to be super concerned about it.
-    var projectConf = path.resolve(conf.localPrefix, ".npmrc")
-    var defaultUserConfig = rc.get("userconfig")
-    var resolvedUserConfig = conf.get("userconfig")
-    if (!conf.get("global") &&
+    var projectConf = path.resolve(conf.localPrefix, '.npmrc')
+    var defaultUserConfig = rc.get('userconfig')
+    var resolvedUserConfig = conf.get('userconfig')
+    if (!conf.get('global') &&
         projectConf !== defaultUserConfig &&
         projectConf !== resolvedUserConfig) {
-      conf.addFile(projectConf, "project")
-      conf.once("load", afterPrefix)
+      conf.addFile(projectConf, 'project')
+      conf.once('load', afterPrefix)
     } else {
-      conf.add({}, "project")
+      conf.add({}, 'project')
       afterPrefix()
     }
   })
 
-  function afterPrefix() {
-    conf.addFile(conf.get("userconfig"), "user")
-    conf.once("error", cb)
-    conf.once("load", afterUser)
+  function afterPrefix () {
+    conf.addFile(conf.get('userconfig'), 'user')
+    conf.once('error', cb)
+    conf.once('load', afterUser)
   }
 
   function afterUser () {
@@ -152,11 +150,11 @@ function load_(builtin, rc, cli, cb) {
     // Eg, `npm config get globalconfig --prefix ~/local` should
     // return `~/local/etc/npmrc`
     // annoying humans and their expectations!
-    if (conf.get("prefix")) {
-      var etc = path.resolve(conf.get("prefix"), "etc")
-      mkdirp(etc, function (err) {
-        defaults.globalconfig = path.resolve(etc, "npmrc")
-        defaults.globalignorefile = path.resolve(etc, "npmignore")
+    if (conf.get('prefix')) {
+      var etc = path.resolve(conf.get('prefix'), 'etc')
+      mkdirp(etc, function () {
+        defaults.globalconfig = path.resolve(etc, 'npmrc')
+        defaults.globalignorefile = path.resolve(etc, 'npmignore')
         afterUserContinuation()
       })
     } else {
@@ -164,25 +162,24 @@ function load_(builtin, rc, cli, cb) {
     }
   }
 
-  function afterUserContinuation() {
-    conf.addFile(conf.get("globalconfig"), "global")
+  function afterUserContinuation () {
+    conf.addFile(conf.get('globalconfig'), 'global')
 
     // move the builtin into the conf stack now.
     conf.root = defaults
-    conf.add(rc.shift(), "builtin")
-    conf.once("load", function () {
+    conf.add(rc.shift(), 'builtin')
+    conf.once('load', function () {
       conf.loadExtras(afterExtras)
     })
   }
 
-  function afterExtras(er) {
-    if (er)
-      return cb(er)
+  function afterExtras (er) {
+    if (er) return cb(er)
 
     // warn about invalid bits.
     validate(conf)
 
-    var cafile = conf.get("cafile")
+    var cafile = conf.get('cafile')
 
     if (cafile) {
       return conf.loadCAFile(cafile, finalize)
@@ -191,7 +188,7 @@ function load_(builtin, rc, cli, cb) {
     finalize()
   }
 
-  function finalize(er) {
+  function finalize (er) {
     if (er) {
       return cb(er)
     }
@@ -208,36 +205,35 @@ function load_(builtin, rc, cli, cb) {
 // 4. Can inherit from another Conf object, using it as the base.
 inherits(Conf, CC)
 function Conf (base) {
-  if (!(this instanceof Conf))
-    return new Conf(base)
+  if (!(this instanceof Conf)) return new Conf(base)
 
   CC.apply(this)
 
-  if (base)
-    if (base instanceof Conf)
+  if (base) {
+    if (base instanceof Conf) {
       this.root = base.list[0] || base.root
-    else
+    } else {
       this.root = base
-  else
+    }
+  } else {
     this.root = configDefs.defaults
+  }
 }
 
-Conf.prototype.loadPrefix = require("./load-prefix.js")
-Conf.prototype.loadCAFile = require("./load-cafile.js")
-Conf.prototype.loadUid = require("./load-uid.js")
-Conf.prototype.setUser = require("./set-user.js")
-Conf.prototype.findPrefix = require("./find-prefix.js")
-Conf.prototype.getCredentialsByURI = require("./get-credentials-by-uri.js")
-Conf.prototype.setCredentialsByURI = require("./set-credentials-by-uri.js")
-Conf.prototype.clearCredentialsByURI = require("./clear-credentials-by-uri.js")
-
-Conf.prototype.loadExtras = function(cb) {
-  this.setUser(function(er) {
-    if (er)
-      return cb(er)
-    this.loadUid(function(er) {
-      if (er)
-        return cb(er)
+Conf.prototype.loadPrefix = require('./load-prefix.js')
+Conf.prototype.loadCAFile = require('./load-cafile.js')
+Conf.prototype.loadUid = require('./load-uid.js')
+Conf.prototype.setUser = require('./set-user.js')
+Conf.prototype.findPrefix = require('./find-prefix.js')
+Conf.prototype.getCredentialsByURI = require('./get-credentials-by-uri.js')
+Conf.prototype.setCredentialsByURI = require('./set-credentials-by-uri.js')
+Conf.prototype.clearCredentialsByURI = require('./clear-credentials-by-uri.js')
+
+Conf.prototype.loadExtras = function (cb) {
+  this.setUser(function (er) {
+    if (er) return cb(er)
+    this.loadUid(function (er) {
+      if (er) return cb(er)
       // Without prefix, nothing will ever work
       mkdirp(this.prefix, cb)
     }.bind(this))
@@ -247,17 +243,17 @@ Conf.prototype.loadExtras = function(cb) {
 Conf.prototype.save = function (where, cb) {
   var target = this.sources[where]
   if (!target || !(target.path || target.source) || !target.data) {
-    if (where !== "builtin")
-      var er = new Error("bad save target: " + where)
+    var er
+    if (where !== 'builtin') er = new Error('bad save target: ' + where)
     if (cb) {
       process.nextTick(cb.bind(null, er))
       return this
     }
-    return this.emit("error", er)
+    return this.emit('error', er)
   }
 
   if (target.source) {
-    var pref = target.prefix || ""
+    var pref = target.prefix || ''
     Object.keys(target.data).forEach(function (k) {
       target.source[pref + k] = target.data[k]
     })
@@ -267,11 +263,29 @@ Conf.prototype.save = function (where, cb) {
 
   var data = ini.stringify(target.data)
 
+  var then = function then (er) {
+    if (er) return done(er)
+
+    fs.chmod(target.path, mode, done)
+  }
+
+  var done = function done (er) {
+    if (er) {
+      if (cb) return cb(er)
+      else return this.emit('error', er)
+    }
+    this._saving --
+    if (this._saving === 0) {
+      if (cb) cb()
+      this.emit('save')
+    }
+  }
+
   then = then.bind(this)
   done = done.bind(this)
   this._saving ++
 
-  var mode = where === "user" ? "0600" : "0666"
+  var mode = where === 'user' ? '0600' : '0666'
   if (!data.trim()) {
     fs.unlink(target.path, function () {
       // ignore the possible error (e.g. the file doesn't exist)
@@ -279,57 +293,40 @@ Conf.prototype.save = function (where, cb) {
     })
   } else {
     mkdirp(path.dirname(target.path), function (er) {
-      if (er)
-        return then(er)
-      fs.writeFile(target.path, data, "utf8", function (er) {
-        if (er)
-          return then(er)
-        if (where === "user" && myUid && myGid)
+      if (er) return then(er)
+      fs.writeFile(target.path, data, 'utf8', function (er) {
+        if (er) return then(er)
+        if (where === 'user' && myUid && myGid) {
+
           fs.chown(target.path, +myUid, +myGid, then)
-        else
+        } else {
           then()
+        }
       })
     })
   }
 
-  function then (er) {
-    if (er)
-      return done(er)
-    fs.chmod(target.path, mode, done)
-  }
-
-  function done (er) {
-    if (er) {
-      if (cb) return cb(er)
-      else return this.emit("error", er)
-    }
-    this._saving --
-    if (this._saving === 0) {
-      if (cb) cb()
-      this.emit("save")
-    }
-  }
-
   return this
 }
 
 Conf.prototype.addFile = function (file, name) {
   name = name || file
-  var marker = {__source__:name}
-  this.sources[name] = { path: file, type: "ini" }
+  var marker = { __source__: name }
+  this.sources[name] = { path: file, type: 'ini' }
   this.push(marker)
   this._await()
-  fs.readFile(file, "utf8", function (er, data) {
-    if (er) // just ignore missing files.
-      return this.add({}, marker)
-    this.addString(data, file, "ini", marker)
+  fs.readFile(file, 'utf8', function (er, data) {
+    // just ignore missing files.
+    if (er) return this.add({}, marker)
+
+    this.addString(data, file, 'ini', marker)
   }.bind(this))
   return this
 }
 
 // always ini files.
 Conf.prototype.parse = function (content, file) {
-  return CC.prototype.parse.call(this, content, file, "ini")
+  return CC.prototype.parse.call(this, content, file, 'ini')
 }
 
 Conf.prototype.add = function (data, marker) {
@@ -337,9 +334,8 @@ Conf.prototype.add = function (data, marker) {
     Object.keys(data).forEach(function (k) {
       data[k] = parseField(data[k], k)
     })
-  }
-  catch (e) {
-    this.emit("error", e)
+  } catch (e) {
+    this.emit('error', e)
     return this
   }
   return CC.prototype.add.call(this, data, marker)
@@ -351,82 +347,77 @@ Conf.prototype.addEnv = function (env) {
   Object.keys(env)
     .filter(function (k) { return k.match(/^npm_config_/i) })
     .forEach(function (k) {
-      if (!env[k])
-        return
+      if (!env[k]) return
 
       // leave first char untouched, even if
-      // it is a "_" - convert all other to "-"
+      // it is a '_' - convert all other to '-'
       var p = k.toLowerCase()
-               .replace(/^npm_config_/, "")
-               .replace(/(?!^)_/g, "-")
+               .replace(/^npm_config_/, '')
+               .replace(/(?!^)_/g, '-')
       conf[p] = env[k]
     })
-  return CC.prototype.addEnv.call(this, "", conf, "env")
+  return CC.prototype.addEnv.call(this, '', conf, 'env')
 }
 
 function parseField (f, k) {
-  if (typeof f !== "string" && !(f instanceof String))
-    return f
+  if (typeof f !== 'string' && !(f instanceof String)) return f
 
   // type can be an array or single thing.
   var typeList = [].concat(types[k])
-  var isPath = -1 !== typeList.indexOf(path)
-  var isBool = -1 !== typeList.indexOf(Boolean)
-  var isString = -1 !== typeList.indexOf(String)
-  var isUmask = -1 !== typeList.indexOf(Umask)
-  var isNumber = -1 !== typeList.indexOf(Number)
+  var isPath = typeList.indexOf(path) !== -1
+  var isBool = typeList.indexOf(Boolean) !== -1
+  var isString = typeList.indexOf(String) !== -1
+  var isUmask = typeList.indexOf(Umask) !== -1
+  var isNumber = typeList.indexOf(Number) !== -1
 
-  f = (""+f).trim()
+  f = ('' + f).trim()
 
   if (f.match(/^".*"$/)) {
     try {
       f = JSON.parse(f)
-    }
-    catch (e) {
-      throw new Error("Failed parsing JSON config key " + k + ": " + f)
+    } catch (e) {
+      throw new Error('Failed parsing JSON config key ' + k + ': ' + f)
     }
   }
 
-  if (isBool && !isString && f === "")
-    return true
+  if (isBool && !isString && f === '') return true
 
   switch (f) {
-    case "true": return true
-    case "false": return false
-    case "null": return null
-    case "undefined": return undefined
+    case 'true': return true
+    case 'false': return false
+    case 'null': return null
+    case 'undefined': return undefined
   }
 
   f = envReplace(f)
 
   if (isPath) {
-    var homePattern = process.platform === "win32" ? /^~(\/|\\)/ : /^~\//
+    var homePattern = process.platform === 'win32' ? /^~(\/|\\)/ : /^~\//
     if (f.match(homePattern) && process.env.HOME) {
       f = path.resolve(process.env.HOME, f.substr(2))
     }
     f = path.resolve(f)
   }
 
-  if (isUmask)
-    f = umask.fromString(f)
+  if (isUmask) f = umask.fromString(f)
 
-  if (isNumber && !isNaN(f))
-    f = +f
+  if (isNumber && !isNaN(f)) f = +f
 
   return f
 }
 
 function envReplace (f) {
-  if (typeof f !== "string" || !f) return f
+  if (typeof f !== 'string' || !f) return f
 
   // replace any ${ENV} values with the appropriate environ.
   var envExpr = /(\\*)\$\{([^}]+)\}/g
   return f.replace(envExpr, function (orig, esc, name) {
     esc = esc.length && esc.length % 2
-    if (esc)
-      return orig
-    if (undefined === process.env[name])
-      throw new Error("Failed to replace env in config: "+orig)
+    if (esc) return orig
+    if (undefined === process.env[name]) {
+      throw new Error('Failed to replace env in config: ' + orig)
+    }
+
     return process.env[name]
   })
 }
diff --git a/deps/npm/lib/config/defaults.js b/deps/npm/lib/config/defaults.js
index a90d4c22b0a87e..ff56cb8e4e7bda 100644
--- a/deps/npm/lib/config/defaults.js
+++ b/deps/npm/lib/config/defaults.js
@@ -1,23 +1,23 @@
 // defaults, types, and shorthands.
 
-
-var path = require("path")
-  , url = require("url")
-  , Stream = require("stream").Stream
-  , semver = require("semver")
-  , stableFamily = semver.parse(process.version)
-  , nopt = require("nopt")
-  , os = require("os")
-  , osenv = require("osenv")
-  , umask = require("../utils/umask")
+var path = require('path')
+var url = require('url')
+var Stream = require('stream').Stream
+var semver = require('semver')
+var stableFamily = semver.parse(process.version)
+var nopt = require('nopt')
+var os = require('os')
+var osenv = require('osenv')
+var umask = require('../utils/umask')
+var hasUnicode = require('has-unicode')
 
 var log
 try {
-  log = require("npmlog")
+  log = require('npmlog')
 } catch (er) {
-  var util = require("util")
+  var util = require('util')
   log = { warn: function (m) {
-    console.warn(m + " " + util.format.apply(util, [].slice.call(arguments, 1)))
+    console.warn(m + ' ' + util.format.apply(util, [].slice.call(arguments, 1)))
   } }
 }
 
@@ -42,7 +42,7 @@ nopt.typeDefs.Stream = { type: Stream, validate: validateStream }
 nopt.typeDefs.Umask = { type: Umask, validate: validateUmask }
 
 nopt.invalidHandler = function (k, val, type) {
-  log.warn("invalid config", k + "=" + JSON.stringify(val))
+  log.warn('invalid config', k + '=' + JSON.stringify(val))
 
   if (Array.isArray(type)) {
     if (type.indexOf(url) !== -1) type = url
@@ -51,25 +51,25 @@ nopt.invalidHandler = function (k, val, type) {
 
   switch (type) {
     case Umask:
-      log.warn("invalid config", "Must be umask, octal number in range 0000..0777")
+      log.warn('invalid config', 'Must be umask, octal number in range 0000..0777')
       break
     case url:
-      log.warn("invalid config", "Must be a full url with 'http://'")
+      log.warn('invalid config', "Must be a full url with 'http://'")
       break
     case path:
-      log.warn("invalid config", "Must be a valid filesystem path")
+      log.warn('invalid config', 'Must be a valid filesystem path')
       break
     case Number:
-      log.warn("invalid config", "Must be a numeric value")
+      log.warn('invalid config', 'Must be a numeric value')
       break
     case Stream:
-      log.warn("invalid config", "Must be an instance of the Stream class")
+      log.warn('invalid config', 'Must be an instance of the Stream class')
       break
   }
 }
 
 if (!stableFamily || (+stableFamily.minor % 2)) stableFamily = null
-else stableFamily = stableFamily.major + "." + stableFamily.minor
+else stableFamily = stableFamily.major + '.' + stableFamily.minor
 
 var defaults
 
@@ -79,20 +79,19 @@ var home = osenv.home()
 var uidOrPid = process.getuid ? process.getuid() : process.pid
 
 if (home) process.env.HOME = home
-else home = path.resolve(temp, "npm-" + uidOrPid)
+else home = path.resolve(temp, 'npm-' + uidOrPid)
 
-var cacheExtra = process.platform === "win32" ? "npm-cache" : ".npm"
-var cacheRoot = process.platform === "win32" && process.env.APPDATA || home
+var cacheExtra = process.platform === 'win32' ? 'npm-cache' : '.npm'
+var cacheRoot = process.platform === 'win32' && process.env.APPDATA || home
 var cache = path.resolve(cacheRoot, cacheExtra)
 
-
 var globalPrefix
-Object.defineProperty(exports, "defaults", {get: function () {
+Object.defineProperty(exports, 'defaults', {get: function () {
   if (defaults) return defaults
 
   if (process.env.PREFIX) {
     globalPrefix = process.env.PREFIX
-  } else if (process.platform === "win32") {
+  } else if (process.platform === 'win32') {
     // c:\node\node.exe --> prefix=c:\node\
     globalPrefix = path.dirname(process.execPath)
   } else {
@@ -106,214 +105,222 @@ Object.defineProperty(exports, "defaults", {get: function () {
   }
 
   defaults = {
-    access : null
-    , "always-auth" : false
-
-    , "bin-links" : true
-    , browser : null
-
-    , ca: null
-    , cafile: null
-
-    , cache : cache
-
-    , "cache-lock-stale": 60000
-    , "cache-lock-retries": 10
-    , "cache-lock-wait": 10000
-
-    , "cache-max": Infinity
-    , "cache-min": 10
-
-    , cert: null
-
-    , color : true
-    , depth: Infinity
-    , description : true
-    , dev : false
-    , editor : osenv.editor()
-    , "engine-strict": false
-    , force : false
-
-    , "fetch-retries": 2
-    , "fetch-retry-factor": 10
-    , "fetch-retry-mintimeout": 10000
-    , "fetch-retry-maxtimeout": 60000
-
-    , git: "git"
-    , "git-tag-version": true
-
-    , global : false
-    , globalconfig : path.resolve(globalPrefix, "etc", "npmrc")
-    , group : process.platform === "win32" ? 0
-            : process.env.SUDO_GID || (process.getgid && process.getgid())
-    , heading: "npm"
-    , "if-present": false
-    , "ignore-scripts": false
-    , "init-module": path.resolve(home, ".npm-init.js")
-    , "init-author-name" : ""
-    , "init-author-email" : ""
-    , "init-author-url" : ""
-    , "init-version": "1.0.0"
-    , "init-license": "ISC"
-    , json: false
-    , key: null
-    , link: false
-    , "local-address" : undefined
-    , loglevel : "warn"
-    , logstream : process.stderr
-    , long : false
-    , message : "%s"
-    , "node-version" : process.version
-    , npat : false
-    , "onload-script" : false
-    , optional: true
-    , parseable : false
-    , prefix : globalPrefix
-    , production: process.env.NODE_ENV === "production"
-    , "proprietary-attribs": true
-    , proxy :  null
-    , "https-proxy" : null
-    , "user-agent" : "npm/{npm-version} "
-                     + "node/{node-version} "
-                     + "{platform} "
-                     + "{arch}"
-    , "rebuild-bundle" : true
-    , registry : "https://registry.npmjs.org/"
-    , rollback : true
-    , save : false
-    , "save-bundle": false
-    , "save-dev" : false
-    , "save-exact" : false
-    , "save-optional" : false
-    , "save-prefix": "^"
-    , scope : ""
-    , searchopts: ""
-    , searchexclude: null
-    , searchsort: "name"
-    , shell : osenv.shell()
-    , shrinkwrap: true
-    , "sign-git-tag": false
-    , spin: true
-    , "strict-ssl": true
-    , tag : "latest"
-    , "tag-version-prefix" : "v"
-    , tmp : temp
-    , unicode : true
-    , "unsafe-perm" : process.platform === "win32"
-                    || process.platform === "cygwin"
-                    || !( process.getuid && process.setuid
-                       && process.getgid && process.setgid )
-                    || process.getuid() !== 0
-    , usage : false
-    , user : process.platform === "win32" ? 0 : "nobody"
-    , userconfig : path.resolve(home, ".npmrc")
-    , umask: process.umask ? process.umask() : umask.fromString("022")
-    , version : false
-    , versions : false
-    , viewer: process.platform === "win32" ? "browser" : "man"
-
-    , _exit : true
+    access: null,
+    'always-auth': false,
+    also: null,
+
+    'bin-links': true,
+    browser: null,
+
+    ca: null,
+    cafile: null,
+
+    cache: cache,
+
+    'cache-lock-stale': 60000,
+    'cache-lock-retries': 10,
+    'cache-lock-wait': 10000,
+
+    'cache-max': Infinity,
+    'cache-min': 10,
+
+    cert: null,
+
+    color: true,
+    depth: Infinity,
+    description: true,
+    dev: false,
+    'dry-run': false,
+    editor: osenv.editor(),
+    'engine-strict': false,
+    force: false,
+
+    'fetch-retries': 2,
+    'fetch-retry-factor': 10,
+    'fetch-retry-mintimeout': 10000,
+    'fetch-retry-maxtimeout': 60000,
+
+    git: 'git',
+    'git-tag-version': true,
+
+    global: false,
+    globalconfig: path.resolve(globalPrefix, 'etc', 'npmrc'),
+    group: process.platform === 'win32' ? 0
+            : process.env.SUDO_GID || (process.getgid && process.getgid()),
+    heading: 'npm',
+    'if-present': false,
+    'ignore-scripts': false,
+    'init-module': path.resolve(home, '.npm-init.js'),
+    'init-author-name': '',
+    'init-author-email': '',
+    'init-author-url': '',
+    'init-version': '1.0.0',
+    'init-license': 'ISC',
+    json: false,
+    key: null,
+    link: false,
+    'local-address': undefined,
+    loglevel: 'warn',
+    logstream: process.stderr,
+    long: false,
+    message: '%s',
+    'node-version': process.version,
+    npat: false,
+    'onload-script': false,
+    only: null,
+    optional: true,
+    parseable: false,
+    prefix: globalPrefix,
+    production: process.env.NODE_ENV === 'production',
+    'progress': !process.env.TRAVIS && !process.env.CI,
+    'proprietary-attribs': true,
+    proxy: null,
+    'https-proxy': null,
+    'user-agent': 'npm/{npm-version} ' +
+                    'node/{node-version} ' +
+                    '{platform} ' +
+                    '{arch}',
+    'rebuild-bundle': true,
+    registry: 'https://registry.npmjs.org/',
+    rollback: true,
+    save: false,
+    'save-bundle': false,
+    'save-dev': false,
+    'save-exact': false,
+    'save-optional': false,
+    'save-prefix': '^',
+    scope: '',
+    searchopts: '',
+    searchexclude: null,
+    searchsort: 'name',
+    shell: osenv.shell(),
+    shrinkwrap: true,
+    'sign-git-tag': false,
+    'strict-ssl': true,
+    tag: 'latest',
+    'tag-version-prefix': 'v',
+    tmp: temp,
+    unicode: hasUnicode(),
+    'unsafe-perm': process.platform === 'win32' ||
+                     process.platform === 'cygwin' ||
+                     !(process.getuid && process.setuid &&
+                       process.getgid && process.setgid) ||
+                     process.getuid() !== 0,
+    usage: false,
+    user: process.platform === 'win32' ? 0 : 'nobody',
+    userconfig: path.resolve(home, '.npmrc'),
+    umask: process.umask ? process.umask() : umask.fromString('022'),
+    version: false,
+    versions: false,
+    viewer: process.platform === 'win32' ? 'browser' : 'man',
+
+    _exit: true
   }
 
   return defaults
 }})
 
-exports.types =
-  { access : [null, "restricted", "public"]
-  , "always-auth" : Boolean
-  , "bin-links": Boolean
-  , browser : [null, String]
-  , ca: [null, String, Array]
-  , cafile : path
-  , cache : path
-  , "cache-lock-stale": Number
-  , "cache-lock-retries": Number
-  , "cache-lock-wait": Number
-  , "cache-max": Number
-  , "cache-min": Number
-  , cert: [null, String]
-  , color : ["always", Boolean]
-  , depth : Number
-  , description : Boolean
-  , dev : Boolean
-  , editor : String
-  , "engine-strict": Boolean
-  , force : Boolean
-  , "fetch-retries": Number
-  , "fetch-retry-factor": Number
-  , "fetch-retry-mintimeout": Number
-  , "fetch-retry-maxtimeout": Number
-  , git: String
-  , "git-tag-version": Boolean
-  , global : Boolean
-  , globalconfig : path
-  , group : [Number, String]
-  , "https-proxy" : [null, url]
-  , "user-agent" : String
-  , "heading": String
-  , "if-present": Boolean
-  , "ignore-scripts": Boolean
-  , "init-module": path
-  , "init-author-name" : String
-  , "init-author-email" : String
-  , "init-author-url" : ["", url]
-  , "init-license": String
-  , "init-version": semver
-  , json: Boolean
-  , key: [null, String]
-  , link: Boolean
+exports.types = {
+  access: [null, 'restricted', 'public'],
+  'always-auth': Boolean,
+  also: [null, 'dev', 'development'],
+  'bin-links': Boolean,
+  browser: [null, String],
+  ca: [null, String, Array],
+  cafile: path,
+  cache: path,
+  'cache-lock-stale': Number,
+  'cache-lock-retries': Number,
+  'cache-lock-wait': Number,
+  'cache-max': Number,
+  'cache-min': Number,
+  cert: [null, String],
+  color: ['always', Boolean],
+  depth: Number,
+  description: Boolean,
+  dev: Boolean,
+  'dry-run': Boolean,
+  editor: String,
+  'engine-strict': Boolean,
+  force: Boolean,
+  'fetch-retries': Number,
+  'fetch-retry-factor': Number,
+  'fetch-retry-mintimeout': Number,
+  'fetch-retry-maxtimeout': Number,
+  git: String,
+  'git-tag-version': Boolean,
+  global: Boolean,
+  globalconfig: path,
+  group: [Number, String],
+  'https-proxy': [null, url],
+  'user-agent': String,
+  'heading': String,
+  'if-present': Boolean,
+  'ignore-scripts': Boolean,
+  'init-module': path,
+  'init-author-name': String,
+  'init-author-email': String,
+  'init-author-url': ['', url],
+  'init-license': String,
+  'init-version': semver,
+  json: Boolean,
+  key: [null, String],
+  link: Boolean,
   // local-address must be listed as an IP for a local network interface
   // must be IPv4 due to node bug
-  , "local-address" : getLocalAddresses()
-  , loglevel : ["silent", "error", "warn", "http", "info", "verbose", "silly"]
-  , logstream : Stream
-  , long : Boolean
-  , message: String
-  , "node-version" : [null, semver]
-  , npat : Boolean
-  , "onload-script" : [null, String]
-  , optional: Boolean
-  , parseable : Boolean
-  , prefix: path
-  , production: Boolean
-  , "proprietary-attribs": Boolean
-  , proxy : [null, false, url] // allow proxy to be disabled explicitly
-  , "rebuild-bundle" : Boolean
-  , registry : [null, url]
-  , rollback : Boolean
-  , save : Boolean
-  , "save-bundle": Boolean
-  , "save-dev" : Boolean
-  , "save-exact" : Boolean
-  , "save-optional" : Boolean
-  , "save-prefix": String
-  , scope : String
-  , searchopts : String
-  , searchexclude: [null, String]
-  , searchsort: [ "name", "-name"
-                , "description", "-description"
-                , "author", "-author"
-                , "date", "-date"
-                , "keywords", "-keywords" ]
-  , shell : String
-  , shrinkwrap: Boolean
-  , "sign-git-tag": Boolean
-  , spin: ["always", Boolean]
-  , "strict-ssl": Boolean
-  , tag : String
-  , tmp : path
-  , unicode : Boolean
-  , "unsafe-perm" : Boolean
-  , usage : Boolean
-  , user : [Number, String]
-  , userconfig : path
-  , umask: Umask
-  , version : Boolean
-  , "tag-version-prefix" : String
-  , versions : Boolean
-  , viewer: String
-  , _exit : Boolean
-  }
+  'local-address': getLocalAddresses(),
+  loglevel: ['silent', 'error', 'warn', 'http', 'info', 'verbose', 'silly'],
+  logstream: Stream,
+  long: Boolean,
+  message: String,
+  'node-version': [null, semver],
+  npat: Boolean,
+  'onload-script': [null, String],
+  only: [null, 'dev', 'development', 'prod', 'production'],
+  optional: Boolean,
+  parseable: Boolean,
+  prefix: path,
+  production: Boolean,
+  progress: Boolean,
+  'proprietary-attribs': Boolean,
+  proxy: [null, false, url], // allow proxy to be disabled explicitly
+  'rebuild-bundle': Boolean,
+  registry: [null, url],
+  rollback: Boolean,
+  save: Boolean,
+  'save-bundle': Boolean,
+  'save-dev': Boolean,
+  'save-exact': Boolean,
+  'save-optional': Boolean,
+  'save-prefix': String,
+  scope: String,
+  searchopts: String,
+  searchexclude: [null, String],
+  searchsort: [
+    'name', '-name',
+    'description', '-description',
+    'author', '-author',
+    'date', '-date',
+    'keywords', '-keywords'
+  ],
+  shell: String,
+  shrinkwrap: Boolean,
+  'sign-git-tag': Boolean,
+  'strict-ssl': Boolean,
+  tag: String,
+  tmp: path,
+  unicode: Boolean,
+  'unsafe-perm': Boolean,
+  usage: Boolean,
+  user: [Number, String],
+  userconfig: path,
+  umask: Umask,
+  version: Boolean,
+  'tag-version-prefix': String,
+  versions: Boolean,
+  viewer: String,
+  _exit: Boolean
+}
 
 function getLocalAddresses () {
   var interfaces
@@ -338,41 +345,41 @@ function getLocalAddresses () {
   }, []).concat(undefined)
 }
 
-exports.shorthands =
-  { s : ["--loglevel", "silent"]
-  , d : ["--loglevel", "info"]
-  , dd : ["--loglevel", "verbose"]
-  , ddd : ["--loglevel", "silly"]
-  , noreg : ["--no-registry"]
-  , N : ["--no-registry"]
-  , reg : ["--registry"]
-  , "no-reg" : ["--no-registry"]
-  , silent : ["--loglevel", "silent"]
-  , verbose : ["--loglevel", "verbose"]
-  , quiet: ["--loglevel", "warn"]
-  , q: ["--loglevel", "warn"]
-  , h : ["--usage"]
-  , H : ["--usage"]
-  , "?" : ["--usage"]
-  , help : ["--usage"]
-  , v : ["--version"]
-  , f : ["--force"]
-  , gangster : ["--force"]
-  , gangsta : ["--force"]
-  , desc : ["--description"]
-  , "no-desc" : ["--no-description"]
-  , "local" : ["--no-global"]
-  , l : ["--long"]
-  , m : ["--message"]
-  , p : ["--parseable"]
-  , porcelain : ["--parseable"]
-  , g : ["--global"]
-  , S : ["--save"]
-  , D : ["--save-dev"]
-  , E : ["--save-exact"]
-  , O : ["--save-optional"]
-  , y : ["--yes"]
-  , n : ["--no-yes"]
-  , B : ["--save-bundle"]
-  , C : ["--prefix"]
-  }
+exports.shorthands = {
+  s: ['--loglevel', 'silent'],
+  d: ['--loglevel', 'info'],
+  dd: ['--loglevel', 'verbose'],
+  ddd: ['--loglevel', 'silly'],
+  noreg: ['--no-registry'],
+  N: ['--no-registry'],
+  reg: ['--registry'],
+  'no-reg': ['--no-registry'],
+  silent: ['--loglevel', 'silent'],
+  verbose: ['--loglevel', 'verbose'],
+  quiet: ['--loglevel', 'warn'],
+  q: ['--loglevel', 'warn'],
+  h: ['--usage'],
+  H: ['--usage'],
+  '?': ['--usage'],
+  help: ['--usage'],
+  v: ['--version'],
+  f: ['--force'],
+  gangster: ['--force'],
+  gangsta: ['--force'],
+  desc: ['--description'],
+  'no-desc': ['--no-description'],
+  'local': ['--no-global'],
+  l: ['--long'],
+  m: ['--message'],
+  p: ['--parseable'],
+  porcelain: ['--parseable'],
+  g: ['--global'],
+  S: ['--save'],
+  D: ['--save-dev'],
+  E: ['--save-exact'],
+  O: ['--save-optional'],
+  y: ['--yes'],
+  n: ['--no-yes'],
+  B: ['--save-bundle'],
+  C: ['--prefix']
+}
diff --git a/deps/npm/lib/config/find-prefix.js b/deps/npm/lib/config/find-prefix.js
index bb00cd6b10c2fe..58f5cc8040b4d6 100644
--- a/deps/npm/lib/config/find-prefix.js
+++ b/deps/npm/lib/config/find-prefix.js
@@ -2,8 +2,8 @@
 
 module.exports = findPrefix
 
-var fs = require("fs")
-var path = require("path")
+var fs = require('fs')
+var path = require('path')
 
 function findPrefix (p, cb_) {
   function cb (er, p) {
@@ -17,7 +17,7 @@ function findPrefix (p, cb_) {
   // walk up until we hopefully find one.
   // if none anywhere, then use cwd.
   var walkedUp = false
-  while (path.basename(p) === "node_modules") {
+  while (path.basename(p) === 'node_modules') {
     p = path.dirname(p)
     walkedUp = true
   }
@@ -27,8 +27,8 @@ function findPrefix (p, cb_) {
 }
 
 function findPrefix_ (p, original, cb) {
-  if (p === "/"
-      || (process.platform === "win32" && p.match(/^[a-zA-Z]:(\\|\/)?$/))) {
+  if (p === '/' ||
+      (process.platform === 'win32' && p.match(/^[a-zA-Z]:(\\|\/)?$/))) {
     return cb(null, original)
   }
   fs.readdir(p, function (er, files) {
@@ -36,15 +36,15 @@ function findPrefix_ (p, original, cb) {
     // unless the prefix was simply a non
     // existent directory.
     if (er && p === original) {
-      if (er.code === "ENOENT") return cb(null, original);
+      if (er.code === 'ENOENT') return cb(null, original)
       return cb(er)
     }
 
     // walked up too high or something.
     if (er) return cb(null, original)
 
-    if (files.indexOf("node_modules") !== -1
-        || files.indexOf("package.json") !== -1) {
+    if (files.indexOf('node_modules') !== -1 ||
+        files.indexOf('package.json') !== -1) {
       return cb(null, p)
     }
 
diff --git a/deps/npm/lib/config/get-credentials-by-uri.js b/deps/npm/lib/config/get-credentials-by-uri.js
index 26a7f4317c6a3a..a073a594a5b681 100644
--- a/deps/npm/lib/config/get-credentials-by-uri.js
+++ b/deps/npm/lib/config/get-credentials-by-uri.js
@@ -1,27 +1,27 @@
-var assert = require("assert")
+var assert = require('assert')
 
-var toNerfDart = require("./nerf-dart.js")
+var toNerfDart = require('./nerf-dart.js')
 
 module.exports = getCredentialsByURI
 
 function getCredentialsByURI (uri) {
-  assert(uri && typeof uri === "string", "registry URL is required")
+  assert(uri && typeof uri === 'string', 'registry URL is required')
   var nerfed = toNerfDart(uri)
-  var defnerf = toNerfDart(this.get("registry"))
+  var defnerf = toNerfDart(this.get('registry'))
 
   // hidden class micro-optimization
   var c = {
-    scope      : nerfed,
-    token      : undefined,
-    password   : undefined,
-    username   : undefined,
-    email      : undefined,
-    auth       : undefined,
-    alwaysAuth : undefined
+    scope: nerfed,
+    token: undefined,
+    password: undefined,
+    username: undefined,
+    email: undefined,
+    auth: undefined,
+    alwaysAuth: undefined
   }
 
-  if (this.get(nerfed + ":_authToken")) {
-    c.token = this.get(nerfed + ":_authToken")
+  if (this.get(nerfed + ':_authToken')) {
+    c.token = this.get(nerfed + ':_authToken')
     // the bearer token is enough, don't confuse things
     return c
   }
@@ -30,43 +30,43 @@ function getCredentialsByURI (uri) {
   // registry, if set.
   //
   // XXX(isaacs): Remove when npm 1.4 is no longer relevant
-  var authDef = this.get("_auth")
-  var userDef = this.get("username")
-  var passDef = this.get("_password")
+  var authDef = this.get('_auth')
+  var userDef = this.get('username')
+  var passDef = this.get('_password')
   if (authDef && !(userDef && passDef)) {
-    authDef = new Buffer(authDef, "base64").toString()
-    authDef = authDef.split(":")
+    authDef = new Buffer(authDef, 'base64').toString()
+    authDef = authDef.split(':')
     userDef = authDef.shift()
-    passDef = authDef.join(":")
+    passDef = authDef.join(':')
   }
 
-  if (this.get(nerfed + ":_password")) {
-    c.password = new Buffer(this.get(nerfed + ":_password"), "base64").toString("utf8")
+  if (this.get(nerfed + ':_password')) {
+    c.password = new Buffer(this.get(nerfed + ':_password'), 'base64').toString('utf8')
   } else if (nerfed === defnerf && passDef) {
     c.password = passDef
   }
 
-  if (this.get(nerfed + ":username")) {
-    c.username = this.get(nerfed + ":username")
+  if (this.get(nerfed + ':username')) {
+    c.username = this.get(nerfed + ':username')
   } else if (nerfed === defnerf && userDef) {
     c.username = userDef
   }
 
-  if (this.get(nerfed + ":email")) {
-    c.email = this.get(nerfed + ":email")
-  } else if (this.get("email")) {
-    c.email = this.get("email")
+  if (this.get(nerfed + ':email')) {
+    c.email = this.get(nerfed + ':email')
+  } else if (this.get('email')) {
+    c.email = this.get('email')
   }
 
-  if (this.get(nerfed + ":always-auth") !== undefined) {
-    var val = this.get(nerfed + ":always-auth")
-    c.alwaysAuth = val === "false" ? false : !!val
-  } else if (this.get("always-auth") !== undefined) {
-    c.alwaysAuth = this.get("always-auth")
+  if (this.get(nerfed + ':always-auth') !== undefined) {
+    var val = this.get(nerfed + ':always-auth')
+    c.alwaysAuth = val === 'false' ? false : !!val
+  } else if (this.get('always-auth') !== undefined) {
+    c.alwaysAuth = this.get('always-auth')
   }
 
   if (c.username && c.password) {
-    c.auth = new Buffer(c.username + ":" + c.password).toString("base64")
+    c.auth = new Buffer(c.username + ':' + c.password).toString('base64')
   }
 
   return c
diff --git a/deps/npm/lib/config/load-cafile.js b/deps/npm/lib/config/load-cafile.js
index cc63615ff55532..1bf9cc49005670 100644
--- a/deps/npm/lib/config/load-cafile.js
+++ b/deps/npm/lib/config/load-cafile.js
@@ -1,14 +1,13 @@
 module.exports = loadCAFile
 
-var fs = require("fs")
+var fs = require('fs')
 
-function loadCAFile(cafilePath, cb) {
-  if (!cafilePath)
-    return process.nextTick(cb)
+function loadCAFile (cafilePath, cb) {
+  if (!cafilePath) return process.nextTick(cb)
 
-  fs.readFile(cafilePath, "utf8", afterCARead.bind(this))
+  fs.readFile(cafilePath, 'utf8', afterCARead.bind(this))
 
-  function afterCARead(er, cadata) {
+  function afterCARead (er, cadata) {
 
     if (er) {
       // previous cafile no longer exists, so just continue on gracefully
@@ -16,19 +15,19 @@ function loadCAFile(cafilePath, cb) {
       return cb(er)
     }
 
-    var delim = "-----END CERTIFICATE-----"
+    var delim = '-----END CERTIFICATE-----'
     var output
 
     output = cadata
       .split(delim)
-      .filter(function(xs) {
+      .filter(function (xs) {
         return !!xs.trim()
       })
-      .map(function(xs) {
+      .map(function (xs) {
         return xs.trimLeft() + delim
       })
 
-    this.set("ca", output)
+    this.set('ca', output)
     cb(null)
   }
 }
diff --git a/deps/npm/lib/config/load-prefix.js b/deps/npm/lib/config/load-prefix.js
index 39d076fb7d4434..01a9252803b74d 100644
--- a/deps/npm/lib/config/load-prefix.js
+++ b/deps/npm/lib/config/load-prefix.js
@@ -1,43 +1,43 @@
 module.exports = loadPrefix
 
-var findPrefix = require("./find-prefix.js")
-var path = require("path")
+var findPrefix = require('./find-prefix.js')
+var path = require('path')
 
 function loadPrefix (cb) {
   var cli = this.list[0]
 
-  Object.defineProperty(this, "prefix",
-    { set : function (prefix) {
-        var g = this.get("global")
-        this[g ? "globalPrefix" : "localPrefix"] = prefix
-      }.bind(this)
-    , get : function () {
-        var g = this.get("global")
+  Object.defineProperty(this, 'prefix',
+    { set: function (prefix) {
+        var g = this.get('global')
+        this[g ? 'globalPrefix' : 'localPrefix'] = prefix
+      }.bind(this),
+      get: function () {
+        var g = this.get('global')
         return g ? this.globalPrefix : this.localPrefix
-      }.bind(this)
-    , enumerable : true
+      }.bind(this),
+      enumerable: true
     })
 
-  Object.defineProperty(this, "globalPrefix",
-    { set : function (prefix) {
-        this.set("prefix", prefix)
-      }.bind(this)
-    , get : function () {
-        return path.resolve(this.get("prefix"))
-      }.bind(this)
-    , enumerable : true
+  Object.defineProperty(this, 'globalPrefix',
+    { set: function (prefix) {
+        this.set('prefix', prefix)
+      }.bind(this),
+      get: function () {
+        return path.resolve(this.get('prefix'))
+      }.bind(this),
+      enumerable: true
     })
 
   var p
-  Object.defineProperty(this, "localPrefix",
-    { set : function (prefix) { p = prefix },
-      get : function () { return p }
-    , enumerable: true })
+  Object.defineProperty(this, 'localPrefix',
+    { set: function (prefix) { p = prefix },
+      get: function () { return p },
+    enumerable: true })
 
   // try to guess at a good node_modules location.
   // If we are *explicitly* given a prefix on the cli, then
   // always use that.  otherwise, infer local prefix from cwd.
-  if (Object.prototype.hasOwnProperty.call(cli, "prefix")) {
+  if (Object.prototype.hasOwnProperty.call(cli, 'prefix')) {
     p = path.resolve(cli.prefix)
     process.nextTick(cb)
   } else {
diff --git a/deps/npm/lib/config/load-uid.js b/deps/npm/lib/config/load-uid.js
index 3ca79877353519..859eac7494bc7e 100644
--- a/deps/npm/lib/config/load-uid.js
+++ b/deps/npm/lib/config/load-uid.js
@@ -1,14 +1,14 @@
 module.exports = loadUid
 
-var getUid = require("uid-number")
+var getUid = require('uid-number')
 
 // Call in the context of a npmconf object
 
 function loadUid (cb) {
   // if we're not in unsafe-perm mode, then figure out who
   // to run stuff as.  Do this first, to support `npm update npm -g`
-  if (!this.get("unsafe-perm")) {
-    getUid(this.get("user"), this.get("group"), cb)
+  if (!this.get('unsafe-perm')) {
+    getUid(this.get('user'), this.get('group'), cb)
   } else {
     process.nextTick(cb)
   }
diff --git a/deps/npm/lib/config/nerf-dart.js b/deps/npm/lib/config/nerf-dart.js
index 07c817500f6fbe..8d2bdd26edf9ba 100644
--- a/deps/npm/lib/config/nerf-dart.js
+++ b/deps/npm/lib/config/nerf-dart.js
@@ -1,4 +1,4 @@
-var url = require("url")
+var url = require('url')
 
 module.exports = toNerfDart
 
@@ -11,7 +11,7 @@ module.exports = toNerfDart
  *
  * @returns {String} A nerfed URL.
  */
-function toNerfDart(uri) {
+function toNerfDart (uri) {
   var parsed = url.parse(uri)
   delete parsed.protocol
   delete parsed.auth
@@ -19,5 +19,5 @@ function toNerfDart(uri) {
   delete parsed.search
   delete parsed.hash
 
-  return url.resolve(url.format(parsed), ".")
+  return url.resolve(url.format(parsed), '.')
 }
diff --git a/deps/npm/lib/config/set-credentials-by-uri.js b/deps/npm/lib/config/set-credentials-by-uri.js
index 31eab4479ede21..74211380d86b6f 100644
--- a/deps/npm/lib/config/set-credentials-by-uri.js
+++ b/deps/npm/lib/config/set-credentials-by-uri.js
@@ -1,42 +1,39 @@
-var assert = require("assert")
+var assert = require('assert')
 
-var toNerfDart = require("./nerf-dart.js")
+var toNerfDart = require('./nerf-dart.js')
 
 module.exports = setCredentialsByURI
 
 function setCredentialsByURI (uri, c) {
-  assert(uri && typeof uri === "string", "registry URL is required")
-  assert(c && typeof c === "object", "credentials are required")
+  assert(uri && typeof uri === 'string', 'registry URL is required')
+  assert(c && typeof c === 'object', 'credentials are required')
 
   var nerfed = toNerfDart(uri)
 
   if (c.token) {
-    this.set(nerfed + ":_authToken", c.token, "user")
-    this.del(nerfed + ":_password",           "user")
-    this.del(nerfed + ":username",            "user")
-    this.del(nerfed + ":email",               "user")
-    this.del(nerfed + ":always-auth",         "user")
-  }
-  else if (c.username || c.password || c.email) {
-    assert(c.username, "must include username")
-    assert(c.password, "must include password")
-    assert(c.email, "must include email address")
-
-    this.del(nerfed + ":_authToken", "user")
-
-    var encoded = new Buffer(c.password, "utf8").toString("base64")
-    this.set(nerfed + ":_password", encoded,   "user")
-    this.set(nerfed + ":username", c.username, "user")
-    this.set(nerfed + ":email", c.email,       "user")
+    this.set(nerfed + ':_authToken', c.token, 'user')
+    this.del(nerfed + ':_password', 'user')
+    this.del(nerfed + ':username', 'user')
+    this.del(nerfed + ':email', 'user')
+    this.del(nerfed + ':always-auth', 'user')
+  } else if (c.username || c.password || c.email) {
+    assert(c.username, 'must include username')
+    assert(c.password, 'must include password')
+    assert(c.email, 'must include email address')
+
+    this.del(nerfed + ':_authToken', 'user')
+
+    var encoded = new Buffer(c.password, 'utf8').toString('base64')
+    this.set(nerfed + ':_password', encoded, 'user')
+    this.set(nerfed + ':username', c.username, 'user')
+    this.set(nerfed + ':email', c.email, 'user')
 
     if (c.alwaysAuth !== undefined) {
-      this.set(nerfed + ":always-auth", c.alwaysAuth, "user")
+      this.set(nerfed + ':always-auth', c.alwaysAuth, 'user')
+    } else {
+      this.del(nerfed + ':always-auth', 'user')
     }
-    else {
-      this.del(nerfed + ":always-auth", "user")
-    }
-  }
-  else {
-    throw new Error("No credentials to set.")
+  } else {
+    throw new Error('No credentials to set.')
   }
 }
diff --git a/deps/npm/lib/config/set-user.js b/deps/npm/lib/config/set-user.js
index 4c207a6792a6f4..14cc21d2ebd998 100644
--- a/deps/npm/lib/config/set-user.js
+++ b/deps/npm/lib/config/set-user.js
@@ -1,9 +1,9 @@
 module.exports = setUser
 
-var assert = require("assert")
-var path = require("path")
-var fs = require("fs")
-var mkdirp = require("mkdirp")
+var assert = require('assert')
+var path = require('path')
+var fs = require('fs')
+var mkdirp = require('mkdirp')
 
 function setUser (cb) {
   var defaultConf = this.root
@@ -12,13 +12,13 @@ function setUser (cb) {
   // If global, leave it as-is.
   // If not global, then set the user to the owner of the prefix folder.
   // Just set the default, so it can be overridden.
-  if (this.get("global")) return cb()
+  if (this.get('global')) return cb()
   if (process.env.SUDO_UID) {
     defaultConf.user = +(process.env.SUDO_UID)
     return cb()
   }
 
-  var prefix = path.resolve(this.get("prefix"))
+  var prefix = path.resolve(this.get('prefix'))
   mkdirp(prefix, function (er) {
     if (er) return cb(er)
     fs.stat(prefix, function (er, st) {
diff --git a/deps/npm/lib/dedupe.js b/deps/npm/lib/dedupe.js
index c63705e18d6ea9..2feaa9f8893f03 100644
--- a/deps/npm/lib/dedupe.js
+++ b/deps/npm/lib/dedupe.js
@@ -1,375 +1,160 @@
-// traverse the node_modules/package.json tree
-// looking for duplicates.  If any duplicates are found,
-// then move them up to the highest level necessary
-// in order to make them no longer duplicated.
-//
-// This is kind of ugly, and really highlights the need for
-// much better "put pkg X at folder Y" abstraction.  Oh well,
-// whatever.  Perfect enemy of the good, and all that.
-
-var fs = require("fs")
-var asyncMap = require("slide").asyncMap
-var path = require("path")
-var readJson = require("read-package-json")
-var semver = require("semver")
-var rm = require("./utils/gently-rm.js")
-var log = require("npmlog")
-var npm = require("./npm.js")
-var mapToRegistry = require("./utils/map-to-registry.js")
+var util = require('util')
+var path = require('path')
+var validate = require('aproba')
+var without = require('lodash.without')
+var asyncMap = require('slide').asyncMap
+var chain = require('slide').chain
+var npa = require('npm-package-arg')
+var log = require('npmlog')
+var npm = require('./npm.js')
+var Installer = require('./install.js').Installer
+var findRequirement = require('./install/deps.js').findRequirement
+var earliestInstallable = require('./install/deps.js').earliestInstallable
+var checkPermissions = require('./install/check-permissions.js')
+var decomposeActions = require('./install/decompose-actions.js')
+var loadExtraneous = require('./install/deps.js').loadExtraneous
+var filterInvalidActions = require('./install/filter-invalid-actions.js')
+var recalculateMetadata = require('./install/deps.js').recalculateMetadata
+var sortActions = require('./install/diff-trees.js').sortActions
 
 module.exports = dedupe
+module.exports.Deduper = Deduper
 
-dedupe.usage = "npm dedupe [pkg pkg...]"
+dedupe.usage = 'npm dedupe [package names...]'
 
-function dedupe (args, silent, cb) {
-  if (typeof silent === "function") cb = silent, silent = false
+function dedupe (args, cb) {
+  validate('AF', arguments)
+  // the /path/to/node_modules/..
+  var where = path.resolve(npm.dir, '..')
   var dryrun = false
   if (npm.command.match(/^find/)) dryrun = true
-  return dedupe_(npm.prefix, args, {}, dryrun, silent, cb)
-}
-
-function dedupe_ (dir, filter, unavoidable, dryrun, silent, cb) {
-  readInstalled(path.resolve(dir), {}, null, function (er, data, counter) {
-    if (er) {
-      return cb(er)
-    }
-
-    if (!data) {
-      return cb()
-    }
-
-    // find out which things are dupes
-    var dupes = Object.keys(counter || {}).filter(function (k) {
-      if (filter.length && -1 === filter.indexOf(k)) return false
-      return counter[k] > 1 && !unavoidable[k]
-    }).reduce(function (s, k) {
-      s[k] = []
-      return s
-    }, {})
-
-    // any that are unavoidable need to remain as they are.  don't even
-    // try to touch them or figure it out.  Maybe some day, we can do
-    // something a bit more clever here, but for now, just skip over it,
-    // and all its children.
-    ;(function U (obj) {
-      if (unavoidable[obj.name]) {
-        obj.unavoidable = true
-      }
-      if (obj.parent && obj.parent.unavoidable) {
-        obj.unavoidable = true
-      }
-      Object.keys(obj.children).forEach(function (k) {
-        U(obj.children[k])
-      })
-    })(data)
-
-    // then collect them up and figure out who needs them
-    ;(function C (obj) {
-      if (dupes[obj.name] && !obj.unavoidable) {
-        dupes[obj.name].push(obj)
-        obj.duplicate = true
-      }
-      obj.dependents = whoDepends(obj)
-      Object.keys(obj.children).forEach(function (k) {
-        C(obj.children[k])
-      })
-    })(data)
-
-    if (dryrun) {
-      var k = Object.keys(dupes)
-      if (!k.length) return cb()
-      return npm.commands.ls(k, silent, cb)
-    }
-
-    var summary = Object.keys(dupes).map(function (n) {
-      return [n, dupes[n].filter(function (d) {
-        return d && d.parent && !d.parent.duplicate && !d.unavoidable
-      }).map(function M (d) {
-        return [d.path, d.version, d.dependents.map(function (k) {
-          return [k.path, k.version, k.dependencies[d.name] || ""]
-        })]
-      })]
-    }).map(function (item) {
-      var set = item[1]
-
-      var ranges = set.map(function (i) {
-        return i[2].map(function (d) {
-          return d[2]
-        })
-      }).reduce(function (l, r) {
-        return l.concat(r)
-      }, []).map(function (v, i, set) {
-        if (set.indexOf(v) !== i) return false
-        return v
-      }).filter(function (v) {
-        return v !== false
-      })
-
-      var locs = set.map(function (i) {
-        return i[0]
-      })
-
-      var versions = set.map(function (i) {
-        return i[1]
-      }).filter(function (v, i, set) {
-        return set.indexOf(v) === i
-      })
-
-      var has = set.map(function (i) {
-        return [i[0], i[1]]
-      }).reduce(function (set, kv) {
-        set[kv[0]] = kv[1]
-        return set
-      }, {})
+  if (npm.config.get('dry-run')) dryrun = true
 
-      var loc = locs.length ? locs.reduce(function (a, b) {
-        // a=/path/to/node_modules/foo/node_modules/bar
-        // b=/path/to/node_modules/elk/node_modules/bar
-        // ==/path/to/node_modules/bar
-        var nmReg = new RegExp("\\" + path.sep + "node_modules\\" + path.sep)
-        a = a.split(nmReg)
-        b = b.split(nmReg)
-        var name = a.pop()
-        b.pop()
-        // find the longest chain that both A and B share.
-        // then push the name back on it, and join by /node_modules/
-        for (var i = 0, al = a.length, bl = b.length; i < al && i < bl && a[i] === b[i]; i++);
-        return a.slice(0, i).concat(name).join(path.sep + "node_modules" + path.sep)
-      }) : undefined
-
-      return [item[0], { item: item
-                       , ranges: ranges
-                       , locs: locs
-                       , loc: loc
-                       , has: has
-                       , versions: versions
-                       }]
-    }).filter(function (i) {
-      return i[1].loc
-    })
-
-    findVersions(npm, summary, function (er, set) {
-      if (er) return cb(er)
-      if (!set.length) return cb()
-      installAndRetest(set, filter, dir, unavoidable, silent, cb)
-    })
-  })
+  new Deduper(where, dryrun).run(cb)
 }
 
-function installAndRetest (set, filter, dir, unavoidable, silent, cb) {
-  //return cb(null, set)
-  var remove = []
-
-  asyncMap(set, function (item, cb) {
-    // [name, has, loc, locMatch, regMatch, others]
-    var name = item[0]
-    var has = item[1]
-    var where = item[2]
-    var locMatch = item[3]
-    var regMatch = item[4]
-    var others = item[5]
-
-    // nothing to be done here.  oh well.  just a conflict.
-    if (!locMatch && !regMatch) {
-      log.warn("unavoidable conflict", item[0], item[1])
-      log.warn("unavoidable conflict", "Not de-duplicating")
-      unavoidable[item[0]] = true
-      return cb()
-    }
-
-    // nothing to do except to clean up the extraneous deps
-    if (locMatch && has[where] === locMatch) {
-      remove.push.apply(remove, others)
-      return cb()
-    }
-
-    if (regMatch) {
-      var what = name + "@" + regMatch
-      // where is /path/to/node_modules/foo/node_modules/bar
-      // for package "bar", but we need it to be just
-      // /path/to/node_modules/foo
-      var nmReg = new RegExp("\\" + path.sep + "node_modules\\" + path.sep)
-      where = where.split(nmReg)
-      where.pop()
-      where = where.join(path.sep + "node_modules" + path.sep)
-      remove.push.apply(remove, others)
-
-      return npm.commands.install(where, what, cb)
-    }
-
-    // hrm?
-    return cb(new Error("danger zone\n" + name + " " +
-                        regMatch + " " + locMatch))
-
-  }, function (er) {
-    if (er) return cb(er)
-    asyncMap(remove, rm, function (er) {
-      if (er) return cb(er)
-      remove.forEach(function (r) {
-        log.info("rm", r)
-      })
-      dedupe_(dir, filter, unavoidable, false, silent, cb)
-    })
-  })
+function Deduper (where, dryrun) {
+  validate('SB', arguments)
+  Installer.call(this, where, dryrun, [])
+  this.noPackageJsonOk = true
+  this.topLevelLifecycles = false
 }
-
-function findVersions (npm, summary, cb) {
-  // now, for each item in the summary, try to find the maximum version
-  // that will satisfy all the ranges.  next step is to install it at
-  // the specified location.
-  asyncMap(summary, function (item, cb) {
-    var name = item[0]
-    var data = item[1]
-    var loc = data.loc
-    var locs = data.locs.filter(function (l) {
-      return l !== loc
+util.inherits(Deduper, Installer)
+
+Deduper.prototype.normalizeTree = function (log, cb) {
+  validate('OF', arguments)
+  log.silly('dedupe', 'normalizeTree')
+  // If we're looking globally only look at the one package we're operating on
+  if (npm.config.get('global')) {
+    var args = this.args
+    this.currentTree.children = this.currentTree.children.filter(function (child) {
+      return args.filter(function (arg) { return arg === child.package.name }).length
     })
+  }
+  Installer.prototype.normalizeTree.call(this, log, cb)
+}
 
-    // not actually a dupe, or perhaps all the other copies were
-    // children of a dupe, so this'll maybe be picked up later.
-    if (locs.length === 0) {
-      return cb(null, [])
-    }
-
-    // { <folder>: <version> }
-    var has = data.has
-
-    // the versions that we already have.
-    // if one of these is ok, then prefer to use that.
-    // otherwise, try fetching from the registry.
-    var versions = data.versions
-
-    var ranges = data.ranges
-    mapToRegistry(name, npm.config, function (er, uri, auth) {
-      if (er) return cb(er)
-
-      npm.registry.get(uri, { auth : auth }, next)
-    })
+Deduper.prototype.loadIdealTree = function (cb) {
+  validate('F', arguments)
+  log.silly('install', 'loadIdealTree')
 
-    function next (er, data) {
-      var regVersions = er ? [] : Object.keys(data.versions)
-      var locMatch = bestMatch(versions, ranges)
-      var tag = npm.config.get("tag")
-      var distTag = data["dist-tags"] && data["dist-tags"][tag]
+  var self = this
+  chain([
+    [this.newTracker(this.progress.loadIdealTree, 'cloneCurrentTree')],
+    [this, this.cloneCurrentTreeToIdealTree],
+    [this, this.finishTracker, 'cloneCurrentTree'],
 
-      var regMatch
-      if (distTag && data.versions[distTag] && matches(distTag, ranges)) {
-        regMatch = distTag
-      } else {
-        regMatch = bestMatch(regVersions, ranges)
-      }
+    [this.newTracker(this.progress.loadIdealTree, 'loadAllDepsIntoIdealTree', 10)],
+    [function (next) {
+      loadExtraneous(self.idealTree, self.progress.loadAllDepsIntoIdealTree, next)
+    }],
+    [this, this.finishTracker, 'loadAllDepsIntoIdealTree'],
 
-      cb(null, [[name, has, loc, locMatch, regMatch, locs]])
-    }
-  }, cb)
+    [this, function (next) { recalculateMetadata(this.idealTree, log, next) }]
+  ], cb)
 }
 
-function matches (version, ranges) {
-  return !ranges.some(function (r) {
-    return !semver.satisfies(version, r, true)
-  })
+Deduper.prototype.generateActionsToTake = function (cb) {
+  validate('F', arguments)
+  log.silly('dedupe', 'generateActionsToTake')
+  chain([
+    [this.newTracker(log, 'hoist', 1)],
+    [hoistChildren, this.idealTree, this.differences],
+    [this, this.finishTracker, 'hoist'],
+    [this.newTracker(log, 'sort-actions', 1)],
+    [this, function (next) {
+      this.differences = sortActions(this.differences)
+      next()
+    }],
+    [this, this.finishTracker, 'sort-actions'],
+    [filterInvalidActions, this.where, this.differences],
+    [checkPermissions, this.differences],
+    [decomposeActions, this.differences, this.todo]
+  ], cb)
 }
 
-function bestMatch (versions, ranges) {
-  return versions.filter(function (v) {
-    return matches(v, ranges)
-  }).sort(semver.compareLoose).pop()
+function move (node, hoistTo, diff) {
+  node.parent.children = without(node.parent.children, node)
+  hoistTo.children.push(node)
+  node.fromPath = node.path
+  node.path = path.resolve(hoistTo.path, 'node_modules', node.package.name)
+  node.parent = hoistTo
+  if (!diff.filter(function (action) { return action[0] === 'move' && action[1] === node }).length) {
+    diff.push(['move', node])
+  }
 }
 
-
-function readInstalled (dir, counter, parent, cb) {
-  var pkg, children, realpath
-
-  fs.realpath(dir, function (er, rp) {
-    realpath = rp
-    next()
+function moveRemainingChildren (node, diff) {
+  node.children.forEach(function (child) {
+    move(child, node, diff)
+    moveRemainingChildren(child, diff)
   })
+}
 
-  readJson(path.resolve(dir, "package.json"), function (er, data) {
-    if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
-    if (er) return cb() // not a package, probably.
-    counter[data.name] = counter[data.name] || 0
-    counter[data.name]++
-    pkg =
-      { _id: data._id
-      , name: data.name
-      , version: data.version
-      , dependencies: data.dependencies || {}
-      , optionalDependencies: data.optionalDependencies || {}
-      , devDependencies: data.devDependencies || {}
-      , bundledDependencies: data.bundledDependencies || []
-      , path: dir
-      , realPath: dir
-      , children: {}
-      , parent: parent
-      , family: Object.create(parent ? parent.family : null)
-      , unavoidable: false
-      , duplicate: false
-      }
-    if (parent) {
-      parent.children[data.name] = pkg
-      parent.family[data.name] = pkg
-    }
-    next()
-  })
-
-  fs.readdir(path.resolve(dir, "node_modules"), function (er, c) {
-    children = children || [] // error is ok, just means no children.
-    // check if there are scoped packages.
-    asyncMap(c || [], function (child, cb) {
-      if (child.indexOf('@') === 0) {
-        fs.readdir(path.resolve(dir, "node_modules", child), function (er, scopedChildren) {
-          // error is ok, just means no children.
-          (scopedChildren || []).forEach(function (sc) {
-            children.push(path.join(child, sc))
-          })
-          cb()
-        })
-      } else {
-        children.push(child)
-        cb()
-      }
-    }, function (er) {
-      if (er) return cb(er)
-      children = children.filter(function (p) {
-        return !p.match(/^[\._-]/)
-      })
-      next();
-    });
-  })
-
-  function next () {
-    if (!children || !pkg || !realpath) return
-
-    // ignore devDependencies.  Just leave them where they are.
-    children = children.filter(function (c) {
-      return !pkg.devDependencies.hasOwnProperty(c)
-    })
+function remove (child, diff, done) {
+  remove_(child, diff, {}, done)
+}
 
-    pkg.realPath = realpath
-    if (pkg.realPath !== pkg.path) children = []
-    var d = path.resolve(dir, "node_modules")
-    asyncMap(children, function (child, cb) {
-      readInstalled(path.resolve(d, child), counter, pkg, cb)
-    }, function (er) {
-      cb(er, pkg, counter)
-    })
-  }
+function remove_ (child, diff, seen, done) {
+  if (seen[child.path]) return done()
+  seen[child.path] = true
+  diff.push(['remove', child])
+  child.parent.children = without(child.parent.children, child)
+  asyncMap(child.children, function (child, next) {
+    remove_(child, diff, seen, next)
+  }, done)
 }
 
-function whoDepends (pkg) {
-  var start = pkg.parent || pkg
-  return whoDepends_(pkg, [], start)
+function hoistChildren (tree, diff, next) {
+  hoistChildren_(tree, diff, {}, next)
 }
 
-function whoDepends_ (pkg, who, test) {
-  if (test !== pkg &&
-      test.dependencies[pkg.name] &&
-      test.family[pkg.name] === pkg) {
-    who.push(test)
-  }
-  Object.keys(test.children).forEach(function (n) {
-    whoDepends_(pkg, who, test.children[n])
-  })
-  return who
+function hoistChildren_ (tree, diff, seen, next) {
+  validate('OAOF', arguments)
+  if (seen[tree.path]) return next()
+  seen[tree.path] = true
+  asyncMap(tree.children, function (child, done) {
+    if (!tree.parent) return hoistChildren_(child, diff, seen, done)
+    var better = findRequirement(tree.parent, child.package.name, child.package._requested || npa(child.package.name + '@' + child.package.version))
+    if (better) {
+      return chain([
+        [remove, child, diff],
+        [recalculateMetadata, tree, log]
+      ], done)
+    }
+    var hoistTo = earliestInstallable(tree, tree.parent, child.package)
+    if (hoistTo) {
+      move(child, hoistTo, diff)
+      chain([
+        [recalculateMetadata, hoistTo, log],
+        [hoistChildren_, child, diff, seen],
+        [function (next) {
+          moveRemainingChildren(child, diff)
+          next()
+        }]
+      ], done)
+    } else {
+      done()
+    }
+  }, next)
 }
diff --git a/deps/npm/lib/deprecate.js b/deps/npm/lib/deprecate.js
index c90ad9027231c0..ffc29c9c8b92e1 100644
--- a/deps/npm/lib/deprecate.js
+++ b/deps/npm/lib/deprecate.js
@@ -1,25 +1,25 @@
-var npm = require("./npm.js")
-  , mapToRegistry = require("./utils/map-to-registry.js")
-  , npa = require("npm-package-arg")
+var npm = require('./npm.js')
+var mapToRegistry = require('./utils/map-to-registry.js')
+var npa = require('npm-package-arg')
 
 module.exports = deprecate
 
-deprecate.usage = "npm deprecate <pkg>[@<version>] <message>"
+deprecate.usage = 'npm deprecate <pkg>[@<version>] <message>'
 
 deprecate.completion = function (opts, cb) {
   // first, get a list of remote packages this user owns.
   // once we have a user account, then don't complete anything.
   if (opts.conf.argv.remain.length > 2) return cb()
   // get the list of packages by user
-  var path = "/-/by-user/"
+  var path = '/-/by-user/'
   mapToRegistry(path, npm.config, function (er, uri, c) {
     if (er) return cb(er)
 
     if (!(c && c.username)) return cb()
 
     var params = {
-      timeout : 60000,
-      auth    : c
+      timeout: 60000,
+      auth: c
     }
     npm.registry.get(uri + c.username, params, function (er, list) {
       if (er) return cb()
@@ -31,8 +31,8 @@ deprecate.completion = function (opts, cb) {
 
 function deprecate (args, cb) {
   var pkg = args[0]
-    , msg = args[1]
-  if (msg === undefined) return cb("Usage: " + deprecate.usage)
+  var msg = args[1]
+  if (msg === undefined) return cb('Usage: ' + deprecate.usage)
 
   // fetch the data and make sure it exists.
   var p = npa(pkg)
@@ -41,9 +41,9 @@ function deprecate (args, cb) {
     if (er) return cb(er)
 
     var params = {
-      version : p.spec,
-      message : msg,
-      auth    : auth
+      version: p.spec,
+      message: msg,
+      auth: auth
     }
     npm.registry.deprecate(uri, params, cb)
   })
diff --git a/deps/npm/lib/dist-tag.js b/deps/npm/lib/dist-tag.js
index 48b40202f9a142..d0bae9ab4409c6 100644
--- a/deps/npm/lib/dist-tag.js
+++ b/deps/npm/lib/dist-tag.js
@@ -1,21 +1,21 @@
 module.exports = distTag
 
-var log = require("npmlog")
-var npa = require("npm-package-arg")
-var semver = require("semver")
+var log = require('npmlog')
+var npa = require('npm-package-arg')
+var semver = require('semver')
 
-var npm = require("./npm.js")
-var mapToRegistry = require("./utils/map-to-registry.js")
-var readLocalPkg = require("./utils/read-local-package.js")
+var npm = require('./npm.js')
+var mapToRegistry = require('./utils/map-to-registry.js')
+var readLocalPkg = require('./utils/read-local-package.js')
 
-distTag.usage = "npm dist-tag add <pkg>@<version> [<tag>]"
-              + "\nnpm dist-tag rm <pkg> <tag>"
-              + "\nnpm dist-tag ls [<pkg>]"
+distTag.usage = 'npm dist-tag add <pkg>@<version> [<tag>]' +
+                '\nnpm dist-tag rm <pkg> <tag>' +
+                '\nnpm dist-tag ls [<pkg>]'
 
 distTag.completion = function (opts, cb) {
   var argv = opts.conf.argv.remain
   if (argv.length === 2) {
-    return cb(null, ["add", "rm", "ls"])
+    return cb(null, ['add', 'rm', 'ls'])
   }
 
   switch (argv[2]) {
@@ -27,29 +27,29 @@ distTag.completion = function (opts, cb) {
 function distTag (args, cb) {
   var cmd = args.shift()
   switch (cmd) {
-    case "add": case "a": case "set": case "s":
+    case 'add': case 'a': case 'set': case 's':
       return add(args[0], args[1], cb)
-    case "rm":  case "r": case "del": case "d": case "remove":
+    case 'rm': case 'r': case 'del': case 'd': case 'remove':
       return remove(args[1], args[0], cb)
-    case "ls":  case "l": case "sl": case "list":
+    case 'ls': case 'l': case 'sl': case 'list':
       return list(args[0], cb)
     default:
-      return cb("Usage:\n"+distTag.usage)
+      return cb('Usage:\n' + distTag.usage)
   }
 }
 
 function add (spec, tag, cb) {
-  var thing = npa(spec || "")
+  var thing = npa(spec || '')
   var pkg = thing.name
   var version = thing.rawSpec
-  var t = (tag || npm.config.get("tag")).trim()
+  var t = (tag || npm.config.get('tag')).trim()
 
-  log.verbose("dist-tag add", t, "to", pkg+"@"+version)
+  log.verbose('dist-tag add', t, 'to', pkg + '@' + version)
 
-  if (!pkg || !version || !t) return cb("Usage:\n"+distTag.usage)
+  if (!pkg || !version || !t) return cb('Usage:\n' + distTag.usage)
 
   if (semver.validRange(t)) {
-    var er = new Error("Tag name must not be a valid SemVer range: " + t)
+    var er = new Error('Tag name must not be a valid SemVer range: ' + t)
     return cb(er)
   }
 
@@ -57,23 +57,23 @@ function add (spec, tag, cb) {
     if (er) return cb(er)
 
     if (tags[t] === version) {
-      log.warn("dist-tag add", t, "is already set to version", version)
+      log.warn('dist-tag add', t, 'is already set to version', version)
       return cb()
     }
     tags[t] = version
 
     mapToRegistry(pkg, npm.config, function (er, uri, auth, base) {
       var params = {
-        package : pkg,
-        distTag : t,
-        version : version,
-        auth : auth
+        'package': pkg,
+        distTag: t,
+        version: version,
+        auth: auth
       }
 
       npm.registry.distTags.add(base, params, function (er) {
         if (er) return cb(er)
 
-        console.log("+"+t+": "+pkg+"@"+version)
+        console.log('+' + t + ': ' + pkg + '@' + version)
         cb()
       })
     })
@@ -81,14 +81,14 @@ function add (spec, tag, cb) {
 }
 
 function remove (tag, pkg, cb) {
-  log.verbose("dist-tag del", tag, "from", pkg)
+  log.verbose('dist-tag del', tag, 'from', pkg)
 
   fetchTags(pkg, function (er, tags) {
     if (er) return cb(er)
 
     if (!tags[tag]) {
-      log.info("dist-tag del", tag, "is not a dist-tag on", pkg)
-      return cb(new Error(tag+" is not a dist-tag on "+pkg))
+      log.info('dist-tag del', tag, 'is not a dist-tag on', pkg)
+      return cb(new Error(tag + ' is not a dist-tag on ' + pkg))
     }
 
     var version = tags[tag]
@@ -96,15 +96,15 @@ function remove (tag, pkg, cb) {
 
     mapToRegistry(pkg, npm.config, function (er, uri, auth, base) {
       var params = {
-        package : pkg,
-        distTag : tag,
-        auth : auth
+        'package': pkg,
+        distTag: tag,
+        auth: auth
       }
 
       npm.registry.distTags.rm(base, params, function (er) {
         if (er) return cb(er)
 
-        console.log("-"+tag+": "+pkg+"@"+version)
+        console.log('-' + tag + ': ' + pkg + '@' + version)
         cb()
       })
     })
@@ -112,20 +112,22 @@ function remove (tag, pkg, cb) {
 }
 
 function list (pkg, cb) {
-  if (!pkg) return readLocalPkg(function (er, pkg) {
-    if (er) return cb(er)
-    if (!pkg) return cb(distTag.usage)
-    list(pkg, cb)
-  })
+  if (!pkg) {
+    return readLocalPkg(function (er, pkg) {
+      if (er) return cb(er)
+      if (!pkg) return cb(distTag.usage)
+      list(pkg, cb)
+    })
+  }
 
   fetchTags(pkg, function (er, tags) {
     if (er) {
-      log.error("dist-tag ls", "Couldn't get dist-tag data for", pkg)
+      log.error('dist-tag ls', "Couldn't get dist-tag data for", pkg)
       return cb(er)
     }
     var msg = Object.keys(tags).map(function (k) {
-      return k+": "+tags[k]
-    }).sort().join("\n")
+      return k + ': ' + tags[k]
+    }).sort().join('\n')
     console.log(msg)
     cb(er, tags)
   })
@@ -136,13 +138,13 @@ function fetchTags (pkg, cb) {
     if (er) return cb(er)
 
     var params = {
-      package : pkg,
-      auth : auth
+      'package': pkg,
+      auth: auth
     }
     npm.registry.distTags.fetch(base, params, function (er, tags) {
       if (er) return cb(er)
       if (!tags || !Object.keys(tags).length) {
-        return cb(new Error("No dist-tags found for " + pkg))
+        return cb(new Error('No dist-tags found for ' + pkg))
       }
 
       cb(null, tags)
diff --git a/deps/npm/lib/docs.js b/deps/npm/lib/docs.js
index 0de2349ddc952c..ea4bd561077e86 100644
--- a/deps/npm/lib/docs.js
+++ b/deps/npm/lib/docs.js
@@ -1,14 +1,12 @@
 module.exports = docs
 
-docs.usage  = "npm docs <pkgname>"
-docs.usage += "\n"
-docs.usage += "npm docs ."
+docs.usage = 'npm docs <pkgname>' +
+             '\nnpm docs .'
 
-var npm = require("./npm.js")
-  , opener = require("opener")
-  , path = require("path")
-  , log = require("npmlog")
-  , mapToRegistry = require("./utils/map-to-registry.js")
+var npm = require('./npm.js')
+var opener = require('opener')
+var log = require('npmlog')
+var fetchPackageMetadata = require('./fetch-package-metadata.js')
 
 docs.completion = function (opts, cb) {
   // FIXME: there used to be registry completion here, but it stopped making
@@ -16,16 +14,12 @@ docs.completion = function (opts, cb) {
   cb()
 }
 
-function url (json) {
-  return json.homepage ? json.homepage : "https://npmjs.org/package/" + json.name
-}
-
 function docs (args, cb) {
-  args = args || []
+  if (!args || !args.length) args = ['.']
   var pending = args.length
-  if (!pending) return getDoc(".", cb)
-  args.forEach(function(proj) {
-    getDoc(proj, function(err) {
+  log.silly('docs', args)
+  args.forEach(function (proj) {
+    getDoc(proj, function (err) {
       if (err) {
         return cb(err)
       }
@@ -35,37 +29,11 @@ function docs (args, cb) {
 }
 
 function getDoc (project, cb) {
-  project = project || "."
-  var package = path.resolve(npm.localPrefix, "package.json")
-
-  if (project === "." || project === "./") {
-    var json
-    try {
-      json = require(package)
-      if (!json.name) throw new Error('package.json does not have a valid "name" property')
-      project = json.name
-    } catch (e) {
-      log.error(e.message)
-      return cb(docs.usage)
-    }
-
-    return opener(url(json), { command: npm.config.get("browser") }, cb)
-  }
-
-  mapToRegistry(project, npm.config, function (er, uri, auth) {
+  log.silly('getDoc', project)
+  fetchPackageMetadata(project, '.', function (er, d) {
     if (er) return cb(er)
-
-    npm.registry.get(uri + "/latest", { timeout : 3600, auth : auth }, next)
+    var url = d.homepage
+    if (!url) url = 'https://www.npmjs.org/package/' + d.name
+    return opener(url, {command: npm.config.get('browser')}, cb)
   })
-
-  function next (er, json) {
-    var github = "https://github.com/" + project + "#readme"
-
-    if (er) {
-      if (project.split("/").length !== 2) return cb(er)
-      return opener(github, { command: npm.config.get("browser") }, cb)
-    }
-
-    return opener(url(json), { command: npm.config.get("browser") }, cb)
-  }
 }
diff --git a/deps/npm/lib/edit.js b/deps/npm/lib/edit.js
index ddf501d54e56be..155db6fd97828c 100644
--- a/deps/npm/lib/edit.js
+++ b/deps/npm/lib/edit.js
@@ -1,25 +1,28 @@
-// npm edit <pkg>[@<version>]
+// npm edit <pkg>
 // open the package folder in the $EDITOR
 
 module.exports = edit
-edit.usage = "npm edit <pkg>"
+edit.usage = 'npm edit <pkg>[@<version>]'
 
-edit.completion = require("./utils/completion/installed-shallow.js")
+edit.completion = require('./utils/completion/installed-shallow.js')
 
-var npm = require("./npm.js")
-  , path = require("path")
-  , fs = require("graceful-fs")
-  , editor = require("editor")
+var npm = require('./npm.js')
+var path = require('path')
+var fs = require('graceful-fs')
+var editor = require('editor')
 
 function edit (args, cb) {
   var p = args[0]
   if (args.length !== 1 || !p) return cb(edit.usage)
-  var e = npm.config.get("editor")
-  if (!e) return cb(new Error(
-    "No editor set.  Set the 'editor' config, or $EDITOR environ."))
-  p = p.split("/")
-       .join("/node_modules/")
-       .replace(/(\/node_modules)+/, "/node_modules")
+  var e = npm.config.get('editor')
+  if (!e) {
+    return cb(new Error(
+      "No editor set.  Set the 'editor' config, or $EDITOR environ."
+    ))
+  }
+  p = p.split('/')
+       .join('/node_modules/')
+       .replace(/(\/node_modules)+/, '/node_modules')
   var f = path.resolve(npm.dir, p)
   fs.lstat(f, function (er) {
     if (er) return cb(er)
diff --git a/deps/npm/lib/explore.js b/deps/npm/lib/explore.js
index 96475a0691f987..105ff84cc81301 100644
--- a/deps/npm/lib/explore.js
+++ b/deps/npm/lib/explore.js
@@ -2,33 +2,39 @@
 // open a subshell to the package folder.
 
 module.exports = explore
-explore.usage = "npm explore <pkg> [ -- <cmd>]"
-explore.completion = require("./utils/completion/installed-shallow.js")
+explore.usage = 'npm explore <pkg> [ -- <cmd>]'
+explore.completion = require('./utils/completion/installed-shallow.js')
 
-var npm = require("./npm.js")
-  , spawn = require("./utils/spawn")
-  , path = require("path")
-  , fs = require("graceful-fs")
+var npm = require('./npm.js')
+var spawn = require('./utils/spawn')
+var path = require('path')
+var fs = require('graceful-fs')
 
 function explore (args, cb) {
   if (args.length < 1 || !args[0]) return cb(explore.usage)
   var p = args.shift()
-  args = args.join(" ").trim()
-  if (args) args = ["-c", args]
+  args = args.join(' ').trim()
+  if (args) args = ['-c', args]
   else args = []
 
   var cwd = path.resolve(npm.dir, p)
-  var sh = npm.config.get("shell")
+  var sh = npm.config.get('shell')
   fs.stat(cwd, function (er, s) {
-    if (er || !s.isDirectory()) return cb(new Error(
-      "It doesn't look like "+p+" is installed."))
-    if (!args.length) console.log(
-      "\nExploring "+cwd+"\n"+
-      "Type 'exit' or ^D when finished\n")
+    if (er || !s.isDirectory()) {
+      return cb(new Error(
+        "It doesn't look like " + p + ' is installed.'
+      ))
+    }
 
-    npm.spinner.stop()
-    var shell = spawn(sh, args, { cwd: cwd, stdio: "inherit" })
-    shell.on("close", function (er) {
+    if (!args.length) {
+      console.log(
+        '\nExploring ' + cwd + '\n' +
+          "Type 'exit' or ^D when finished\n"
+      )
+    }
+
+    var shell = spawn(sh, args, { cwd: cwd, stdio: 'inherit' })
+    shell.on('close', function (er) {
       // only fail if non-interactive.
       if (!args.length) return cb()
       cb(er)
diff --git a/deps/npm/lib/faq.js b/deps/npm/lib/faq.js
index 912db0072f21e1..c9d88d3012e564 100644
--- a/deps/npm/lib/faq.js
+++ b/deps/npm/lib/faq.js
@@ -1,8 +1,7 @@
-
 module.exports = faq
 
-faq.usage = "npm faq"
+faq.usage = 'npm faq'
 
-var npm = require("./npm.js")
+var npm = require('./npm.js')
 
-function faq (args, cb) { npm.commands.help(["faq"], cb) }
+function faq (args, cb) { npm.commands.help(['faq'], cb) }
diff --git a/deps/npm/lib/fetch-package-metadata.js b/deps/npm/lib/fetch-package-metadata.js
new file mode 100644
index 00000000000000..4efc37806e8b49
--- /dev/null
+++ b/deps/npm/lib/fetch-package-metadata.js
@@ -0,0 +1,330 @@
+'use strict'
+var fs = require('graceful-fs')
+var path = require('path')
+var zlib = require('zlib')
+
+var log = require('npmlog')
+var realizePackageSpecifier = require('realize-package-specifier')
+var tar = require('tar')
+var once = require('once')
+var semver = require('semver')
+var readPackageTree = require('read-package-tree')
+var readPackageJson = require('read-package-json')
+var iferr = require('iferr')
+var rimraf = require('rimraf')
+var clone = require('lodash.clonedeep')
+var validate = require('aproba')
+var unpipe = require('unpipe')
+
+var npm = require('./npm.js')
+var mapToRegistry = require('./utils/map-to-registry.js')
+var cache = require('./cache.js')
+var cachedPackageRoot = require('./cache/cached-package-root.js')
+var tempFilename = require('./utils/temp-filename.js')
+var getCacheStat = require('./cache/get-stat.js')
+var unpack = require('./utils/tar.js').unpack
+var pulseTillDone = require('./utils/pulse-till-done.js')
+var parseJSON = require('./utils/parse-json.js')
+
+function andLogAndFinish (spec, tracker, done) {
+  validate('SF', [spec, done])
+  return function (er, pkg) {
+    if (er) {
+      log.silly('fetchPackageMetaData', 'error for ' + spec, er)
+      if (tracker) tracker.finish()
+    }
+    return done(er, pkg)
+  }
+}
+
+module.exports = function fetchPackageMetadata (spec, where, tracker, done) {
+  if (!done) {
+    done = tracker || where
+    tracker = null
+    if (done === where) where = null
+  }
+  if (typeof spec === 'object') {
+    var dep = spec
+    spec = dep.raw
+  }
+  var logAndFinish = andLogAndFinish(spec, tracker, done)
+  if (!dep) {
+    log.silly('fetchPackageMetaData', spec)
+    return realizePackageSpecifier(spec, where, iferr(logAndFinish, function (dep) {
+      fetchPackageMetadata(dep, where, tracker, done)
+    }))
+  }
+  if (dep.type === 'version' || dep.type === 'range' || dep.type === 'tag') {
+    fetchNamedPackageData(dep, addRequestedAndFinish)
+  } else if (dep.type === 'directory') {
+    fetchDirectoryPackageData(dep, where, addRequestedAndFinish)
+  } else {
+    fetchOtherPackageData(spec, dep, where, addRequestedAndFinish)
+  }
+  function addRequestedAndFinish (er, pkg) {
+    if (pkg) {
+      pkg._requested = dep
+      pkg._spec = spec
+      pkg._where = where
+      if (!pkg._args) pkg._args = []
+      pkg._args.push([pkg._spec, pkg._where])
+    }
+    logAndFinish(er, pkg)
+  }
+}
+
+function fetchOtherPackageData (spec, dep, where, next) {
+  validate('SOSF', arguments)
+  log.silly('fetchOtherPackageData', spec)
+  cache.add(spec, null, where, false, iferr(next, function (pkg) {
+    var result = clone(pkg)
+    result._inCache = true
+    next(null, result)
+  }))
+}
+
+function fetchDirectoryPackageData (dep, where, next) {
+  validate('OSF', arguments)
+  log.silly('fetchDirectoryPackageData', dep.name || dep.rawSpec)
+  readPackageJson(path.join(dep.spec, 'package.json'), false, next)
+}
+
+var regCache = {}
+
+function fetchNamedPackageData (dep, next) {
+  validate('OF', arguments)
+  log.silly('fetchNamedPackageData', dep.name || dep.rawSpec)
+  mapToRegistry(dep.name || dep.rawSpec, npm.config, iferr(next, function (url, auth) {
+    if (regCache[url]) {
+      pickVersionFromRegistryDocument(clone(regCache[url]))
+    } else {
+      npm.registry.get(url, {auth: auth}, pulseTillDone('fetchMetadata', iferr(next, pickVersionFromRegistryDocument)))
+    }
+    function returnAndAddMetadata (pkg) {
+      delete pkg._from
+      delete pkg._resolved
+      delete pkg._shasum
+      next(null, pkg)
+    }
+    function pickVersionFromRegistryDocument (pkg) {
+      if (!regCache[url]) regCache[url] = pkg
+      var versions = Object.keys(pkg.versions).sort(semver.rcompare)
+
+      if (dep.type === 'tag') {
+        var tagVersion = pkg['dist-tags'][dep.spec]
+        if (pkg.versions[tagVersion]) return returnAndAddMetadata(pkg.versions[tagVersion])
+      } else {
+        var latestVersion = pkg['dist-tags'][npm.config.get('tag')] || versions[0]
+
+        // Find the the most recent version less than or equal
+        // to latestVersion that satisfies our spec
+        for (var ii = 0; ii < versions.length; ++ii) {
+          if (semver.gt(versions[ii], latestVersion)) continue
+          if (semver.satisfies(versions[ii], dep.spec)) {
+            return returnAndAddMetadata(pkg.versions[versions[ii]])
+          }
+        }
+
+        // Failing that, try finding the most recent version that matches
+        // our spec
+        for (var jj = 0; jj < versions.length; ++jj) {
+          if (semver.satisfies(versions[jj], dep.spec)) {
+            return returnAndAddMetadata(pkg.versions[versions[jj]])
+          }
+        }
+
+        // Failing THAT, if the range was '*' uses latestVersion
+        if (dep.spec === '*') {
+          return returnAndAddMetadata(pkg.versions[latestVersion])
+        }
+      }
+
+      // And failing that, we error out
+      var targets = versions.length
+                  ? 'Valid install targets:\n' + JSON.stringify(versions) + '\n'
+                  : 'No valid targets found.'
+      var er = new Error('No compatible version found: ' +
+                         dep.raw + '\n' + targets)
+      return next(er)
+    }
+  }))
+}
+
+function retryWithCached (pkg, asserter, next) {
+  if (!pkg._inCache) {
+    cache.add(pkg._spec, null, pkg._where, false, iferr(next, function (newpkg) {
+      Object.keys(newpkg).forEach(function (key) {
+        if (key[0] !== '_') return
+        pkg[key] = newpkg[key]
+      })
+      pkg._inCache = true
+      return asserter(pkg, next)
+    }))
+  }
+  return !pkg._inCache
+}
+
+module.exports.addShrinkwrap = function addShrinkwrap (pkg, next) {
+  validate('OF', arguments)
+  if (pkg._shrinkwrap !== undefined) return next(null, pkg)
+  if (retryWithCached(pkg, addShrinkwrap, next)) return
+  pkg._shrinkwrap = null
+  // FIXME: cache the shrinkwrap directly
+  var pkgname = pkg.name
+  var ver = pkg.version
+  var tarball = path.join(cachedPackageRoot({name: pkgname, version: ver}), 'package.tgz')
+  untarStream(tarball, function (er, untar) {
+    if (er) {
+      if (er.code === 'ENOTTARBALL') {
+        pkg._shrinkwrap = null
+        return next()
+      } else {
+        return next(er)
+      }
+    }
+    if (er) return next(er)
+    var foundShrinkwrap = false
+    untar.on('entry', function (entry) {
+      if (!/^(?:[^\/]+[\/])npm-shrinkwrap.json$/.test(entry.path)) return
+      log.silly('addShrinkwrap', 'Found shrinkwrap in ' + pkgname + ' ' + entry.path)
+      foundShrinkwrap = true
+      var shrinkwrap = ''
+      entry.on('data', function (chunk) {
+        shrinkwrap += chunk
+      })
+      entry.on('end', function () {
+        untar.close()
+        log.silly('addShrinkwrap', 'Completed reading shrinkwrap in ' + pkgname)
+        try {
+          pkg._shrinkwrap = parseJSON(shrinkwrap)
+        } catch (ex) {
+          var er = new Error('Error parsing ' + pkgname + '@' + ver + "'s npm-shrinkwrap.json: " + ex.message)
+          er.type = 'ESHRINKWRAP'
+          return next(er)
+        }
+        next(null, pkg)
+      })
+      entry.resume()
+    })
+    untar.on('end', function () {
+      if (!foundShrinkwrap) {
+        pkg._shrinkwrap = null
+        next(null, pkg)
+      }
+    })
+  })
+}
+
+module.exports.addBundled = function addBundled (pkg, next) {
+  validate('OF', arguments)
+  if (pkg._bundled !== undefined) return next(null, pkg)
+  if (!pkg.bundleDependencies) return next(null, pkg)
+  if (retryWithCached(pkg, addBundled, next)) return
+  pkg._bundled = null
+  var pkgname = pkg.name
+  var ver = pkg.version
+  var tarball = path.join(cachedPackageRoot({name: pkgname, version: ver}), 'package.tgz')
+  var target = tempFilename('unpack')
+  getCacheStat(iferr(next, function (cs) {
+    log.verbose('addBundled', 'extract', tarball)
+    unpack(tarball, target, null, null, cs.uid, cs.gid, iferr(next, function () {
+      log.silly('addBundled', 'read tarball')
+      readPackageTree(target, function (er, tree) {
+        log.silly('cleanup', 'remove extracted module')
+        rimraf(target, function () {
+          if (tree) {
+            pkg._bundled = tree.children
+          }
+          next(null, pkg)
+        })
+      })
+    }))
+  }))
+}
+
+// FIXME: hasGzipHeader / hasTarHeader / untarStream duplicate a lot
+// of code from lib/utils/tar.js– these should be brought together.
+
+function hasGzipHeader (c) {
+  return c[0] === 0x1F && c[1] === 0x8B && c[2] === 0x08
+}
+
+function hasTarHeader (c) {
+  return c[257] === 0x75 && // tar archives have 7573746172 at position
+         c[258] === 0x73 && // 257 and 003030 or 202000 at position 262
+         c[259] === 0x74 &&
+         c[260] === 0x61 &&
+         c[261] === 0x72 &&
+
+       ((c[262] === 0x00 &&
+         c[263] === 0x30 &&
+         c[264] === 0x30) ||
+
+        (c[262] === 0x20 &&
+         c[263] === 0x20 &&
+         c[264] === 0x00))
+}
+
+function untarStream (tarball, cb) {
+  validate('SF', arguments)
+  cb = once(cb)
+
+  var stream
+  var file = stream = fs.createReadStream(tarball)
+  var tounpipe = [file]
+  file.on('error', function (er) {
+    er = new Error('Error extracting ' + tarball + ' archive: ' + er.message)
+    er.code = 'EREADFILE'
+    cb(er)
+  })
+  file.on('data', function OD (c) {
+    if (hasGzipHeader(c)) {
+      doGunzip()
+    } else if (hasTarHeader(c)) {
+      doUntar()
+    } else {
+      file.close()
+      var er = new Error('Non-gzip/tarball ' + tarball)
+      er.code = 'ENOTTARBALL'
+      return cb(er)
+    }
+    file.removeListener('data', OD)
+    file.emit('data', c)
+    cb(null, stream)
+  })
+
+  function doGunzip () {
+    var gunzip = stream.pipe(zlib.createGunzip())
+    gunzip.on('error', function (er) {
+      er = new Error('Error extracting ' + tarball + ' archive: ' + er.message)
+      er.code = 'EGUNZIP'
+      cb(er)
+    })
+    tounpipe.push(gunzip)
+    stream = gunzip
+    doUntar()
+  }
+
+  function doUntar () {
+    var untar = stream.pipe(tar.Parse())
+    untar.on('error', function (er) {
+      er = new Error('Error extracting ' + tarball + ' archive: ' + er.message)
+      er.code = 'EUNTAR'
+      cb(er)
+    })
+    tounpipe.push(untar)
+    stream = untar
+    addClose()
+  }
+
+  function addClose () {
+    stream.close = function () {
+      tounpipe.forEach(function (stream) {
+        unpipe(stream)
+      })
+
+      if (file.close) file.close()
+      if (file.destroy) file.destroy()
+    }
+  }
+}
diff --git a/deps/npm/lib/fetch-package-metadata.md b/deps/npm/lib/fetch-package-metadata.md
new file mode 100644
index 00000000000000..6a7d4fc595de24
--- /dev/null
+++ b/deps/npm/lib/fetch-package-metadata.md
@@ -0,0 +1,37 @@
+fetch-package-metadata
+----------------------
+
+    var fetchPackageMetadata = require("npm/lib/fetch-package-metadata")
+    fetchPackageMetadata(spec, contextdir, callback)
+
+This will get package metadata (and if possible, ONLY package metadata) for
+a specifer as passed to `npm install` et al, eg `npm@next` or `npm@^2.0.3`
+
+## fetchPackageMetadata(*spec*, *contextdir*, *tracker*, *callback*)
+
+* *spec* **string** | **object** -- The package specifier, can be anything npm can
+  understand (see [realize-package-specifier]), or it can be the result from
+  realize-package-specifier or npm-package-arg (for non-local deps).
+
+* *contextdir* **string** -- The directory from which relative paths to
+  local packages should be resolved.
+
+* *tracker* **object** -- **(optional)** An are-we-there-yet tracker group as
+  provided by `npm.log.newGroup()`.
+
+* *callback* **function (er, package)** -- Called when the package information
+  has been loaded. `package` is the object for of the `package.json`
+  matching the requested spec.  In the case of named packages, it comes from
+  the registry and thus may not exactly match what's found in the associated
+  tarball.
+
+[realize-package-specifier]: (https://github.com/npm/realize-package-specifier)
+
+In the case of tarballs and git repos, it will use the cache to download
+them in order to get the package metadata.  For named packages, only the
+metadata is downloaded (eg http://registry.npmjs.org/package).  For local
+directories, the package.json is read directly.  For local tarballs, the
+tarball is streamed in memory and just the package.json is extracted from
+it.  (Due to the nature of tars, having the package.json early in the file
+will result in it being loaded faster– the extractor short-circuits the
+uncompress/untar streams as best as it can.)
diff --git a/deps/npm/lib/get.js b/deps/npm/lib/get.js
index aa058002ec19a8..8dc805ec560c31 100644
--- a/deps/npm/lib/get.js
+++ b/deps/npm/lib/get.js
@@ -1,12 +1,12 @@
 
 module.exports = get
 
-get.usage = "npm get <key> <value> (See `npm config`)"
+get.usage = 'npm get <key> <value> (See `npm config`)'
 
-var npm = require("./npm.js")
+var npm = require('./npm.js')
 
 get.completion = npm.commands.config.completion
 
 function get (args, cb) {
-  npm.commands.config(["get"].concat(args), cb)
+  npm.commands.config(['get'].concat(args), cb)
 }
diff --git a/deps/npm/lib/help-search.js b/deps/npm/lib/help-search.js
index d8553453bc54df..16f389027fa9d6 100644
--- a/deps/npm/lib/help-search.js
+++ b/deps/npm/lib/help-search.js
@@ -1,29 +1,29 @@
 
 module.exports = helpSearch
 
-var fs = require("graceful-fs")
-  , path = require("path")
-  , asyncMap = require("slide").asyncMap
-  , npm = require("./npm.js")
-  , glob = require("glob")
-  , color = require("ansicolors")
+var fs = require('graceful-fs')
+var path = require('path')
+var asyncMap = require('slide').asyncMap
+var npm = require('./npm.js')
+var glob = require('glob')
+var color = require('ansicolors')
 
-helpSearch.usage = "npm help-search <text>"
+helpSearch.usage = 'npm help-search <text>'
 
 function helpSearch (args, silent, cb) {
-  if (typeof cb !== "function") cb = silent, silent = false
+  if (typeof cb !== 'function') {
+    cb = silent
+    silent = false
+  }
   if (!args.length) return cb(helpSearch.usage)
 
-  var docPath = path.resolve(__dirname, "..", "doc")
-  return glob(docPath + "/*/*.md", function (er, files) {
-    if (er)
-      return cb(er)
+  var docPath = path.resolve(__dirname, '..', 'doc')
+  return glob(docPath + '/*/*.md', function (er, files) {
+    if (er) return cb(er)
     readFiles(files, function (er, data) {
-      if (er)
-        return cb(er)
+      if (er) return cb(er)
       searchFiles(args, data, function (er, results) {
-        if (er)
-          return cb(er)
+        if (er) return cb(er)
         formatResults(args, results, cb)
       })
     })
@@ -52,8 +52,7 @@ function searchFiles (args, files, cb) {
     for (var a = 0, l = args.length; a < l && !match; a++) {
       match = data.toLowerCase().indexOf(args[a].toLowerCase()) !== -1
     }
-    if (!match)
-      return
+    if (!match) return
 
     var lines = data.split(/\n+/)
 
@@ -61,14 +60,14 @@ function searchFiles (args, files, cb) {
     // if the next line has a search term, then skip all 3
     // otherwise, set the line to null.  then remove the nulls.
     l = lines.length
-    for (var i = 0; i < l; i ++) {
+    for (var i = 0; i < l; i++) {
       var line = lines[i]
-        , nextLine = lines[i + 1]
-        , ll
+      var nextLine = lines[i + 1]
+      var ll
 
       match = false
       if (nextLine) {
-        for (a = 0, ll = args.length; a < ll && !match; a ++) {
+        for (a = 0, ll = args.length; a < ll && !match; a++) {
           match = nextLine.toLowerCase()
                   .indexOf(args[a].toLowerCase()) !== -1
         }
@@ -80,12 +79,12 @@ function searchFiles (args, files, cb) {
       }
 
       match = false
-      for (a = 0, ll = args.length; a < ll && !match; a ++) {
+      for (a = 0, ll = args.length; a < ll && !match; a++) {
         match = line.toLowerCase().indexOf(args[a].toLowerCase()) !== -1
       }
       if (match) {
         // skip over the next line
-        i ++
+        i++
         continue
       }
 
@@ -94,7 +93,7 @@ function searchFiles (args, files, cb) {
 
     // now squish any string of nulls into a single null
     lines = lines.reduce(function (l, r) {
-      if (!(r === null && l[l.length-1] === null)) l.push(r)
+      if (!(r === null && l[l.length - 1] === null)) l.push(r)
       return l
     }, [])
 
@@ -103,10 +102,10 @@ function searchFiles (args, files, cb) {
 
     // now see how many args were found at all.
     var found = {}
-      , totalHits = 0
+    var totalHits = 0
     lines.forEach(function (line) {
       args.forEach(function (arg) {
-        var hit = (line || "").toLowerCase()
+        var hit = (line || '').toLowerCase()
                   .split(arg.toLowerCase()).length - 1
         if (hit > 0) {
           found[arg] = (found[arg] || 0) + hit
@@ -115,27 +114,28 @@ function searchFiles (args, files, cb) {
       })
     })
 
-    var cmd = "npm help "
-    if (path.basename(path.dirname(file)) === "api") {
-      cmd = "npm apihelp "
+    var cmd = 'npm help '
+    if (path.basename(path.dirname(file)) === 'api') {
+      cmd = 'npm apihelp '
     }
-    cmd += path.basename(file, ".md").replace(/^npm-/, "")
-    results.push({ file: file
-                 , cmd: cmd
-                 , lines: lines
-                 , found: Object.keys(found)
-                 , hits: found
-                 , totalHits: totalHits
-                 })
+    cmd += path.basename(file, '.md').replace(/^npm-/, '')
+    results.push({
+      file: file,
+      cmd: cmd,
+      lines: lines,
+      found: Object.keys(found),
+      hits: found,
+      totalHits: totalHits
+    })
   })
 
   // if only one result, then just show that help section.
   if (results.length === 1) {
-    return npm.commands.help([results[0].file.replace(/\.md$/, "")], cb)
+    return npm.commands.help([results[0].file.replace(/\.md$/, '')], cb)
   }
 
   if (results.length === 0) {
-    console.log("No results for " + args.map(JSON.stringify).join(" "))
+    console.log('No results for ' + args.map(JSON.stringify).join(' '))
     return cb()
   }
 
@@ -161,25 +161,25 @@ function formatResults (args, results, cb) {
 
   var out = results.map(function (res) {
     var out = res.cmd
-      , r = Object.keys(res.hits).map(function (k) {
-          return k + ":" + res.hits[k]
+    var r = Object.keys(res.hits).map(function (k) {
+          return k + ':' + res.hits[k]
         }).sort(function (a, b) {
           return a > b ? 1 : -1
-        }).join(" ")
+        }).join(' ')
 
     out += ((new Array(Math.max(1, cols - out.length - r.length)))
-             .join(" ")) + r
+             .join(' ')) + r
 
-    if (!npm.config.get("long")) return out
+    if (!npm.config.get('long')) return out
 
-    out = "\n\n" + out
-         + "\n" + (new Array(cols)).join("—") + "\n"
-         + res.lines.map(function (line, i) {
-      if (line === null || i > 3) return ""
-      for (var out = line, a = 0, l = args.length; a < l; a ++) {
+    out = '\n\n' + out + '\n' +
+      (new Array(cols)).join('—') + '\n' +
+      res.lines.map(function (line, i) {
+      if (line === null || i > 3) return ''
+      for (var out = line, a = 0, l = args.length; a < l; a++) {
         var finder = out.toLowerCase().split(args[a].toLowerCase())
-          , newOut = ""
-          , p = 0
+        var newOut = ''
+        var p = 0
 
         finder.forEach(function (f) {
           newOut += out.substr(p, f.length)
@@ -193,16 +193,16 @@ function formatResults (args, results, cb) {
       }
 
       return newOut
-    }).join("\n").trim()
+    }).join('\n').trim()
     return out
-  }).join("\n")
-
-  if (results.length && !npm.config.get("long")) {
-    out = "Top hits for "+(args.map(JSON.stringify).join(" "))
-        + "\n" + (new Array(cols)).join("—") + "\n"
-        + out
-        + "\n" + (new Array(cols)).join("—") + "\n"
-        + "(run with -l or --long to see more context)"
+  }).join('\n')
+
+  if (results.length && !npm.config.get('long')) {
+    out = 'Top hits for ' + (args.map(JSON.stringify).join(' ')) + '\n' +
+          (new Array(cols)).join('—') + '\n' +
+          out + '\n' +
+          (new Array(cols)).join('—') + '\n' +
+          '(run with -l or --long to see more context)'
   }
 
   console.log(out.trim())
diff --git a/deps/npm/lib/help.js b/deps/npm/lib/help.js
index 942d27b41e17b8..a954ae814b7550 100644
--- a/deps/npm/lib/help.js
+++ b/deps/npm/lib/help.js
@@ -6,16 +6,15 @@ help.completion = function (opts, cb) {
   getSections(cb)
 }
 
-var path = require("path")
-  , spawn = require("./utils/spawn")
-  , npm = require("./npm.js")
-  , log = require("npmlog")
-  , opener = require("opener")
-  , glob = require("glob")
+var path = require('path')
+var spawn = require('./utils/spawn')
+var npm = require('./npm.js')
+var log = require('npmlog')
+var opener = require('opener')
+var glob = require('glob')
 
 function help (args, cb) {
-  npm.spinner.stop()
-  var argv = npm.config.get("argv").cooked
+  var argv = npm.config.get('argv').cooked
 
   var argnum = 0
   if (args.length === 2 && ~~args[0]) {
@@ -24,54 +23,53 @@ function help (args, cb) {
 
   // npm help foo bar baz: search topics
   if (args.length > 1 && args[0]) {
-    return npm.commands["help-search"](args, argnum, cb)
+    return npm.commands['help-search'](args, argnum, cb)
   }
 
   var section = npm.deref(args[0]) || args[0]
 
   // npm help <noargs>:  show basic usage
   if (!section) {
-    var valid = argv[0] === "help" ? 0 : 1
+    var valid = argv[0] === 'help' ? 0 : 1
     return npmUsage(valid, cb)
   }
 
-
   // npm <cmd> -h: show command usage
-  if ( npm.config.get("usage")
-    && npm.commands[section]
-    && npm.commands[section].usage
-  ) {
-    npm.config.set("loglevel", "silent")
-    log.level = "silent"
+  if (npm.config.get('usage') &&
+      npm.commands[section] &&
+      npm.commands[section].usage) {
+    npm.config.set('loglevel', 'silent')
+    log.level = 'silent'
     console.log(npm.commands[section].usage)
     return cb()
   }
 
   // npm apihelp <section>: Prefer section 3 over section 1
-  var apihelp = argv.length && -1 !== argv[0].indexOf("api")
+  var apihelp = argv.length && argv[0].indexOf('api') !== -1
   var pref = apihelp ? [3, 1, 5, 7] : [1, 3, 5, 7]
-  if (argnum)
+  if (argnum) {
     pref = [ argnum ].concat(pref.filter(function (n) {
       return n !== argnum
     }))
+  }
 
   // npm help <section>: Try to find the path
-  var manroot = path.resolve(__dirname, "..", "man")
+  var manroot = path.resolve(__dirname, '..', 'man')
 
   // legacy
-  if (section === "global") section = "folders"
-  else if (section === "json") section = "package.json"
+  if (section === 'global') section = 'folders'
+  else if (section === 'json') section = 'package.json'
 
   // find either /section.n or /npm-section.n
   // The glob is used in the glob.  The regexp is used much
   // further down.  Globs and regexps are different
-  var compextglob = ".+(gz|bz2|lzma|[FYzZ]|xz)"
-  var compextre = "\\.(gz|bz2|lzma|[FYzZ]|xz)$"
-  var f = "+(npm-" + section + "|" + section + ").[0-9]?(" + compextglob + ")"
-  return glob(manroot + "/*/" + f, function (er, mans) {
+  var compextglob = '.+(gz|bz2|lzma|[FYzZ]|xz)'
+  var compextre = '\\.(gz|bz2|lzma|[FYzZ]|xz)$'
+  var f = '+(npm-' + section + '|' + section + ').[0-9]?(' + compextglob + ')'
+  return glob(manroot + '/*/' + f, function (er, mans) {
     if (er) return cb(er)
 
-    if (!mans.length) return npm.commands["help-search"](args, cb)
+    if (!mans.length) return npm.commands['help-search'](args, cb)
 
     mans = mans.map(function (man) {
       var ext = path.extname(man)
@@ -103,83 +101,83 @@ function pickMan (mans, pref_) {
 function viewMan (man, cb) {
   var nre = /([0-9]+)$/
   var num = man.match(nre)[1]
-  var section = path.basename(man, "." + num)
+  var section = path.basename(man, '.' + num)
 
   // at this point, we know that the specified man page exists
-  var manpath = path.join(__dirname, "..", "man")
-    , env = {}
+  var manpath = path.join(__dirname, '..', 'man')
+  var env = {}
   Object.keys(process.env).forEach(function (i) {
     env[i] = process.env[i]
   })
   env.MANPATH = manpath
-  var viewer = npm.config.get("viewer")
+  var viewer = npm.config.get('viewer')
 
   var conf
   switch (viewer) {
-    case "woman":
-      var a = ["-e", "(woman-find-file \"" + man + "\")"]
-      conf = { env: env, stdio: "inherit" }
-      var woman = spawn("emacsclient", a, conf)
-      woman.on("close", cb)
+    case 'woman':
+      var a = ['-e', '(woman-find-file \'' + man + '\')']
+      conf = { env: env, stdio: 'inherit' }
+      var woman = spawn('emacsclient', a, conf)
+      woman.on('close', cb)
       break
 
-    case "browser":
-      opener(htmlMan(man), { command: npm.config.get("browser") }, cb)
+    case 'browser':
+      opener(htmlMan(man), { command: npm.config.get('browser') }, cb)
       break
 
     default:
-      conf = { env: env, stdio: "inherit" }
-      var manProcess = spawn("man", [num, section], conf)
-      manProcess.on("close", cb)
+      conf = { env: env, stdio: 'inherit' }
+      var manProcess = spawn('man', [num, section], conf)
+      manProcess.on('close', cb)
       break
   }
 }
 
 function htmlMan (man) {
   var sect = +man.match(/([0-9]+)$/)[1]
-  var f = path.basename(man).replace(/([0-9]+)$/, "html")
+  var f = path.basename(man).replace(/([0-9]+)$/, 'html')
   switch (sect) {
     case 1:
-      sect = "cli"
+      sect = 'cli'
       break
     case 3:
-      sect = "api"
+      sect = 'api'
       break
     case 5:
-      sect = "files"
+      sect = 'files'
       break
     case 7:
-      sect = "misc"
+      sect = 'misc'
       break
     default:
-      throw new Error("invalid man section: " + sect)
+      throw new Error('invalid man section: ' + sect)
   }
-  return path.resolve(__dirname, "..", "html", "doc", sect, f)
+  return path.resolve(__dirname, '..', 'html', 'doc', sect, f)
 }
 
 function npmUsage (valid, cb) {
-  npm.config.set("loglevel", "silent")
-  log.level = "silent"
-  console.log(
-    [ "\nUsage: npm <command>"
-      , ""
-      , "where <command> is one of:"
-      , npm.config.get("long") ? usages()
-        : "    " + wrap(Object.keys(npm.commands))
-      , ""
-      , "npm <cmd> -h     quick help on <cmd>"
-      , "npm -l           display full usage info"
-      , "npm faq          commonly asked questions"
-      , "npm help <term>  search for help on <term>"
-      , "npm help npm     involved overview"
-      , ""
-      , "Specify configs in the ini-formatted file:"
-      , "    " + npm.config.get("userconfig")
-      , "or on the command line via: npm <command> --key value"
-      , "Config info can be viewed via: npm help config"
-      , ""
-      , "npm@" + npm.version + " " + path.dirname(__dirname)
-      ].join("\n"))
+  npm.config.set('loglevel', 'silent')
+  log.level = 'silent'
+  console.log([
+    '\nUsage: npm <command>',
+    '',
+    'where <command> is one of:',
+    npm.config.get('long') ? usages()
+        : '    ' + wrap(Object.keys(npm.commands)),
+    '',
+    'npm <cmd> -h     quick help on <cmd>',
+    'npm -l           display full usage info',
+    'npm faq          commonly asked questions',
+    'npm help <term>  search for help on <term>',
+    'npm help npm     involved overview',
+    '',
+    'Specify configs in the ini-formatted file:',
+    '    ' + npm.config.get('userconfig'),
+    'or on the command line via: npm <command> --key value',
+    'Config info can be viewed via: npm help config',
+    '',
+    'npm@' + npm.version + ' ' + path.dirname(__dirname)
+  ].join('\n'))
   cb(valid)
 }
 
@@ -189,50 +187,50 @@ function usages () {
   return Object.keys(npm.commands).filter(function (c) {
     return c === npm.deref(c)
   }).reduce(function (set, c) {
-    set.push([c, npm.commands[c].usage || ""])
+    set.push([c, npm.commands[c].usage || ''])
     maxLen = Math.max(maxLen, c.length)
     return set
   }, []).map(function (item) {
     var c = item[0]
-      , usage = item[1]
-    return "\n    " + c + (new Array(maxLen - c.length + 2).join(" "))
-         + (usage.split("\n")
-            .join("\n" + (new Array(maxLen + 6).join(" "))))
-  }).join("\n")
+    var usage = item[1]
+    return '\n    ' +
+      c + (new Array(maxLen - c.length + 2).join(' ')) +
+      (usage.split('\n').join('\n' + (new Array(maxLen + 6).join(' '))))
+  }).join('\n')
 }
 
-
 function wrap (arr) {
-  var out = [""]
-    , l = 0
-    , line
+  var out = ['']
+  var l = 0
+  var line
 
   line = process.stdout.columns
-  if (!line)
+  if (!line) {
     line = 60
-  else
+  } else {
     line = Math.min(60, Math.max(line - 16, 24))
+  }
 
-  arr.sort(function (a,b) { return a<b?-1:1 })
+  arr.sort(function (a, b) { return a < b ? -1 : 1 })
     .forEach(function (c) {
       if (out[l].length + c.length + 2 < line) {
-        out[l] += ", "+c
+        out[l] += ', ' + c
       } else {
-        out[l++] += ","
+        out[l++] += ','
         out[l] = c
       }
     })
-  return out.join("\n    ").substr(2)
+  return out.join('\n    ').substr(2)
 }
 
 function getSections (cb) {
-  var g = path.resolve(__dirname, "../man/man[0-9]/*.[0-9]")
+  var g = path.resolve(__dirname, '../man/man[0-9]/*.[0-9]')
   glob(g, function (er, files) {
-    if (er)
-      return cb(er)
+    if (er) return cb(er)
+
     cb(null, Object.keys(files.reduce(function (acc, file) {
-      file = path.basename(file).replace(/\.[0-9]+$/, "")
-      file = file.replace(/^npm-/, "")
+      file = path.basename(file).replace(/\.[0-9]+$/, '')
+      file = file.replace(/^npm-/, '')
       acc[file] = true
       return acc
     }, { help: true })))
diff --git a/deps/npm/lib/init.js b/deps/npm/lib/init.js
index a889774b02b939..e3eb3d40dd5618 100644
--- a/deps/npm/lib/init.js
+++ b/deps/npm/lib/init.js
@@ -1,41 +1,39 @@
-
 // initialize a package.json file
 
 module.exports = init
 
-var log = require("npmlog")
-  , npm = require("./npm.js")
-  , initJson = require("init-package-json")
+var log = require('npmlog')
+var npm = require('./npm.js')
+var initJson = require('init-package-json')
 
-init.usage = "npm init [--force/-f]"
+init.usage = 'npm init [--force|-f|--yes|-y]'
 
 function init (args, cb) {
   var dir = process.cwd()
   log.pause()
-  npm.spinner.stop()
-  var initFile = npm.config.get("init-module")
+  var initFile = npm.config.get('init-module')
   if (!initJson.yes(npm.config)) {
-    console.log(
-      ["This utility will walk you through creating a package.json file."
-      ,"It only covers the most common items, and tries to guess sensible defaults."
-      ,""
-      ,"See `npm help json` for definitive documentation on these fields"
-      ,"and exactly what they do."
-      ,""
-      ,"Use `npm install <pkg> --save` afterwards to install a package and"
-      ,"save it as a dependency in the package.json file."
-      ,""
-      ,"Press ^C at any time to quit."
-      ].join("\n"))
+    console.log([
+      'This utility will walk you through creating a package.json file.',
+      'It only covers the most common items, and tries to guess sensible defaults.',
+      '',
+      'See `npm help json` for definitive documentation on these fields',
+      'and exactly what they do.',
+      '',
+      'Use `npm install <pkg> --save` afterwards to install a package and',
+      'save it as a dependency in the package.json file.',
+      '',
+      'Press ^C at any time to quit.'
+    ].join('\n'))
   }
   initJson(dir, initFile, npm.config, function (er, data) {
     log.resume()
-    log.silly("package data", data)
-    if (er && er.message === "canceled") {
-      log.warn("init", "canceled")
+    log.silly('package data', data)
+    if (er && er.message === 'canceled') {
+      log.warn('init', 'canceled')
       return cb(null, data)
     }
-    log.info("init", "written successfully")
+    log.info('init', 'written successfully')
     cb(er, data)
   })
 }
diff --git a/deps/npm/lib/install.js b/deps/npm/lib/install.js
index 9cc6a46fc0ca06..3ebb3b3bb02595 100644
--- a/deps/npm/lib/install.js
+++ b/deps/npm/lib/install.js
@@ -1,3 +1,4 @@
+'use strict'
 // npm install <pkg> <pkg> <pkg>
 //
 // See doc/install.md for more description
@@ -12,23 +13,23 @@
 // added, and then that's passed to the next generation of installation.
 
 module.exports = install
-
-install.usage = "npm install"
-              + "\nnpm install <pkg>"
-              + "\nnpm install <pkg>@<tag>"
-              + "\nnpm install <pkg>@<version>"
-              + "\nnpm install <pkg>@<version range>"
-              + "\nnpm install <folder>"
-              + "\nnpm install <tarball file>"
-              + "\nnpm install <tarball url>"
-              + "\nnpm install <git:// url>"
-              + "\nnpm install <github username>/<github project>"
-              + "\n\nCan specify one or more: npm install ./foo.tgz bar@stable /some/folder"
-              + "\nIf no argument is supplied and ./npm-shrinkwrap.json is "
-              + "\npresent, installs dependencies specified in the shrinkwrap."
-              + "\nOtherwise, installs dependencies from ./package.json."
+module.exports.Installer = Installer
+
+install.usage = '\nnpm install (with no args, in package dir)' +
+                '\nnpm install [<@scope>/]<pkg>' +
+                '\nnpm install [<@scope>/]<pkg>@<tag>' +
+                '\nnpm install [<@scope>/]<pkg>@<version>' +
+                '\nnpm install [<@scope>/]<pkg>@<version range>' +
+                '\nnpm install <folder>' +
+                '\nnpm install <tarball file>' +
+                '\nnpm install <tarball url>' +
+                '\nnpm install <git:// url>' +
+                '\nnpm install <github username>/<github project>' +
+                '\n\nalias: npm i' +
+                '\ncommon options: [--save|--save-dev|--save-optional] [--save-exact]'
 
 install.completion = function (opts, cb) {
+  validate('OF', arguments)
   // install can complete to a folder with a package.json, or any package.
   // if it has a slash, then it's gotta be a folder
   // if it starts with https?://, then just give up, because it's a url
@@ -42,12 +43,12 @@ install.completion = function (opts, cb) {
     // is a folder containing a package.json file.  If that is not the
     // case we return 0 matches, which will trigger the default bash
     // complete.
-    var lastSlashIdx = opts.partialWord.lastIndexOf("/")
+    var lastSlashIdx = opts.partialWord.lastIndexOf('/')
     var partialName = opts.partialWord.slice(lastSlashIdx + 1)
     var partialPath = opts.partialWord.slice(0, lastSlashIdx)
-    if (partialPath === "") partialPath = "/"
+    if (partialPath === '') partialPath = '/'
 
-    function annotatePackageDirMatch (sibling, cb) {
+    var annotatePackageDirMatch = function (sibling, cb) {
       var fullPath = path.join(partialPath, sibling)
       if (sibling.slice(0, partialName.length) !== partialName) {
         return cb(null, null) // not name match
@@ -59,7 +60,7 @@ install.completion = function (opts, cb) {
           null,
           {
             fullPath: fullPath,
-            isPackage: contents.indexOf("package.json") !== -1
+            isPackage: contents.indexOf('package.json') !== -1
           }
         )
       })
@@ -86,1111 +87,628 @@ install.completion = function (opts, cb) {
   cb()
 }
 
-var npm = require("./npm.js")
-  , semver = require("semver")
-  , readJson = require("read-package-json")
-  , readInstalled = require("read-installed")
-  , log = require("npmlog")
-  , path = require("path")
-  , fs = require("graceful-fs")
-  , writeFileAtomic = require("write-file-atomic")
-  , cache = require("./cache.js")
-  , asyncMap = require("slide").asyncMap
-  , chain = require("slide").chain
-  , url = require("url")
-  , mkdir = require("mkdirp")
-  , lifecycle = require("./utils/lifecycle.js")
-  , archy = require("archy")
-  , npmInstallChecks = require("npm-install-checks")
-  , sortedObject = require("sorted-object")
-  , mapToRegistry = require("./utils/map-to-registry.js")
-  , npa = require("npm-package-arg")
-  , inflight = require("inflight")
-  , locker = require("./utils/locker.js")
-  , lock = locker.lock
-  , unlock = locker.unlock
-  , warnStrict = require("./utils/warn-deprecated.js")("engineStrict")
-  , warnPeers = require("./utils/warn-deprecated.js")("peerDependencies")
-
-function install (args, cb_) {
-  var hasArguments = !!args.length
-
-  function cb (er, installed) {
-    if (er) return cb_(er)
-
-    validateInstall(where, function (er, problem) {
-      if (er) return cb_(er)
-
-      if (problem) {
-        var peerInvalidError = new Error("The package " + problem._id +
-          " does not satisfy its siblings' peerDependencies requirements!")
-        peerInvalidError.code = "EPEERINVALID"
-        peerInvalidError.packageName = problem.name
-        peerInvalidError.packageVersion = problem.version
-        peerInvalidError.peersDepending = problem.peersDepending
-        return cb(peerInvalidError)
-      }
-
-      var tree = treeify(installed || [])
-        , pretty = prettify(tree, installed).trim()
-
-      if (pretty) console.log(pretty)
-      save(where, installed, tree, pretty, hasArguments, cb_)
-    })
-  }
-
-  // the /path/to/node_modules/..
-  var where = path.resolve(npm.dir, "..")
-
-  // internal api: install(where, what, cb)
-  if (arguments.length === 3) {
-    where = args
-    args = [].concat(cb_) // pass in [] to do default dep-install
-    cb_ = arguments[2]
-    log.verbose("install", "where, what", [where, args])
-  }
-
-  if (!npm.config.get("global")) {
-    args = args.filter(function (a) {
-      return path.resolve(a) !== where
-    })
-  }
-
-  mkdir(where, function (er) {
-    if (er) return cb(er)
-    // install dependencies locally by default,
-    // or install current folder globally
-    if (!args.length) {
-      var opt = { dev: npm.config.get("dev") || !npm.config.get("production") }
-
-      if (npm.config.get("global")) args = ["."]
-      else return readDependencies(null, where, opt, function (er, data) {
-        if (er) {
-          log.error("install", "Couldn't read dependencies")
-          return cb(er)
-        }
-        var deps = Object.keys(data.dependencies || {})
-        log.verbose("install", "where, deps", [where, deps])
-
-        // FIXME: Install peerDependencies as direct dependencies, but only at
-        // the top level. Should only last until peerDependencies are nerfed to
-        // no longer implicitly install themselves.
-        var peers = []
-        Object.keys(data.peerDependencies || {}).forEach(function (dep) {
-          if (!data.dependencies[dep]) {
-            log.verbose(
-              "install",
-              "peerDependency", dep, "wasn't going to be installed; adding"
-            )
-            warnPeers([
-              "The peer dependency "+dep+" included from "+data.name+" will no",
-              "longer be automatically installed to fulfill the peerDependency ",
-              "in npm 3+. Your application will need to depend on it explicitly."
-            ], dep+","+data.name)
-            peers.push(dep)
-          }
-        })
-        log.verbose("install", "where, peers", [where, peers])
-
-        var context = { family: {}
-                      , ancestors: {}
-                      , explicit: false
-                      , parent: data
-                      , root: true
-                      , wrap: null }
-
-        if (data.name === path.basename(where) &&
-            path.basename(path.dirname(where)) === "node_modules") {
-          // Only include in ancestry if it can actually be required.
-          // Otherwise, it does not count.
-          context.family[data.name] =
-            context.ancestors[data.name] = data.version
-        }
-
-        installManyTop(deps.map(function (dep) {
-          var target = data.dependencies[dep]
-          return dep + "@" + target
-        }).concat(peers.map(function (dep) {
-          var target = data.peerDependencies[dep]
-          return dep + "@" + target
-        })), where, context, function(er, results) {
-          if (er || npm.config.get("production")) return cb(er, results)
-          lifecycle(data, "prepublish", where, function(er) {
-            return cb(er, results)
-          })
-        })
+// system packages
+var fs = require('fs')
+var path = require('path')
+
+// dependencies
+var log = require('npmlog')
+var readPackageTree = require('read-package-tree')
+var chain = require('slide').chain
+var asyncMap = require('slide').asyncMap
+var archy = require('archy')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var iferr = require('iferr')
+var validate = require('aproba')
+
+// npm internal utils
+var npm = require('./npm.js')
+var locker = require('./utils/locker.js')
+var lock = locker.lock
+var unlock = locker.unlock
+var ls = require('./ls.js')
+var parseJSON = require('./utils/parse-json.js')
+
+// install specific libraries
+var copyTree = require('./install/copy-tree.js')
+var readShrinkwrap = require('./install/read-shrinkwrap.js')
+var recalculateMetadata = require('./install/deps.js').recalculateMetadata
+var loadDeps = require('./install/deps.js').loadDeps
+var loadDevDeps = require('./install/deps.js').loadDevDeps
+var getAllMetadata = require('./install/deps.js').getAllMetadata
+var loadRequestedDeps = require('./install/deps.js').loadRequestedDeps
+var loadExtraneous = require('./install/deps.js').loadExtraneous
+var pruneTree = require('./install/prune-tree.js')
+var diffTrees = require('./install/diff-trees.js')
+var checkPermissions = require('./install/check-permissions.js')
+var decomposeActions = require('./install/decompose-actions.js')
+var filterInvalidActions = require('./install/filter-invalid-actions.js')
+var validateTree = require('./install/validate-tree.js')
+var validateArgs = require('./install/validate-args.js')
+var saveRequested = require('./install/save.js').saveRequested
+var getSaveType = require('./install/save.js').getSaveType
+var doSerialActions = require('./install/actions.js').doSerial
+var doReverseSerialActions = require('./install/actions.js').doReverseSerial
+var doParallelActions = require('./install/actions.js').doParallel
+var doOneAction = require('./install/actions.js').doOne
+var getPackageId = require('./install/get-package-id.js')
+
+function unlockCB (lockPath, name, cb) {
+  validate('SSF', arguments)
+  return function (installEr) {
+    var args = arguments
+    try {
+      unlock(lockPath, name, reportErrorAndReturn)
+    } catch (unlockEx) {
+      process.nextTick(function () {
+        reportErrorAndReturn(unlockEx)
       })
     }
-
-    // initial "family" is the name:version of the root, if it's got
-    // a package.json file.
-    var jsonPath = path.resolve(where, "package.json")
-    log.verbose('install', 'initial load of', jsonPath)
-    readJson(jsonPath, log.warn, function (er, data) {
-      if (er
-          && er.code !== "ENOENT"
-          && er.code !== "ENOTDIR") return cb(er)
-      if (er) data = null
-      var context = { family: {}
-                    , ancestors: {}
-                    , explicit: true
-                    , parent: data
-                    , root: true
-                    , wrap: null }
-      if (data && data.name === path.basename(where) &&
-          path.basename(path.dirname(where)) === "node_modules") {
-        context.family[data.name] = context.ancestors[data.name] = data.version
+    function reportErrorAndReturn (unlockEr) {
+      if (installEr) {
+        if (unlockEr && unlockEr.code !== 'ENOTLOCKED') {
+          log.warn('unlock' + name, unlockEr)
+        }
+        return cb.apply(null, args)
       }
-      var fn = npm.config.get("global") ? installMany : installManyTop
-      fn(args, where, context, cb)
-    })
-  })
-}
-
-function validateInstall (where, cb) {
-  var jsonPath = path.resolve(where, 'package.json')
-  log.verbose('validateInstall', 'loading', jsonPath, 'for validation')
-  readJson(jsonPath, log.warn, function (er, data) {
-    if (er
-        && er.code !== 'ENOENT'
-        && er.code !== 'ENOTDIR') return cb(er)
-
-    if (data && data.engineStrict) {
-      warnStrict([
-        "Per-package engineStrict (found in this package's package.json) ",
-        "won't be used in npm 3+. Use the config setting `engine-strict` instead."
-      ], data.name)
+      if (unlockEr) return cb(unlockEr)
+      return cb.apply(null, args)
     }
-
-    readInstalled(where, { log: log.warn, dev: true }, function (er, data) {
-      if (er) return cb(er)
-
-      cb(null, findPeerInvalid_(data.dependencies, []))
-    })
-  })
+  }
 }
 
-function findPeerInvalid_ (packageMap, fpiList) {
-  if (fpiList.indexOf(packageMap) !== -1)
-    return undefined
-
-  fpiList.push(packageMap)
-
-  for (var packageName in packageMap) {
-    var pkg = packageMap[packageName]
+function install (where, args, cb) {
+  if (!cb) {
+    cb = args
+    args = where
+    where = null
+  }
+  var globalTop = path.resolve(npm.globalDir, '..')
+  if (!where) {
+    where = npm.config.get('global')
+          ? globalTop
+          : npm.prefix
+  }
+  validate('SAF', [where, args, cb])
+  // the /path/to/node_modules/..
+  var dryrun = !!npm.config.get('dry-run')
 
-    if (pkg.peerInvalid) {
-      var peersDepending = {}
-      for (var peerName in packageMap) {
-        var peer = packageMap[peerName]
-        if (peer.peerDependencies && peer.peerDependencies[packageName]) {
-          peersDepending[peer.name + "@" + peer.version] =
-            peer.peerDependencies[packageName]
-        }
-      }
-      return { name: pkg.name, peersDepending: peersDepending, version: pkg.version, _id: pkg._id }
-    }
+  if (npm.config.get('dev')) {
+    log.warn('install', 'Usage of the `--dev` option is deprecated. Use `--only=dev` instead.')
+  }
 
-    if (pkg.dependencies) {
-      var invalid = findPeerInvalid_(pkg.dependencies, fpiList)
-      if (invalid)
-        return invalid
-    }
+  if (where === globalTop && !args.length) {
+    args = ['.']
   }
+  args = args.filter(function (a) {
+    return path.resolve(a) !== npm.prefix
+  })
 
-  return null
+  new Installer(where, dryrun, args).run(cb)
 }
 
-// reads dependencies for the package at "where". There are several cases,
-// depending on our current state and the package's configuration:
-//
-// 1. If "context" is specified, then we examine the context to see if there's a
-//    shrinkwrap there. In that case, dependencies are read from the shrinkwrap.
-// 2. Otherwise, if an npm-shrinkwrap.json file is present, dependencies are
-//    read from there.
-// 3. Otherwise, dependencies come from package.json.
-//
-// Regardless of which case we fall into, "cb" is invoked with a first argument
-// describing the full package (as though readJson had been used) but with
-// "dependencies" read as described above. The second argument to "cb" is the
-// shrinkwrap to use in processing this package's dependencies, which may be
-// "wrap" (in case 1) or a new shrinkwrap (in case 2).
-function readDependencies (context, where, opts, cb) {
-  var wrap = context ? context.wrap : null
-
-  var jsonPath = path.resolve(where, 'package.json')
-  log.verbose('readDependencies', 'loading dependencies from', jsonPath)
-  readJson(jsonPath, log.warn, function (er, data) {
-    if (er && er.code === "ENOENT") er.code = "ENOPACKAGEJSON"
-    if (er) return cb(er)
-
-    if (opts && opts.dev) {
-      if (!data.dependencies) data.dependencies = {}
-      Object.keys(data.devDependencies || {}).forEach(function (k) {
-        if (data.dependencies[k]) {
-          log.warn("package.json", "Dependency '%s' exists in both dependencies " +
-                   "and devDependencies, using '%s@%s' from dependencies",
-                    k, k, data.dependencies[k])
-        } else {
-          data.dependencies[k] = data.devDependencies[k]
-        }
-      })
-    }
-
-    if (!npm.config.get("optional") && data.optionalDependencies) {
-      Object.keys(data.optionalDependencies).forEach(function (d) {
-        delete data.dependencies[d]
-      })
+function Installer (where, dryrun, args) {
+  validate('SBA', arguments)
+  this.where = where
+  this.dryrun = dryrun
+  this.args = args
+  this.currentTree = null
+  this.idealTree = null
+  this.differences = []
+  this.todo = []
+  this.progress = {}
+  this.noPackageJsonOk = !!args.length
+  this.topLevelLifecycles = !args.length
+  this.npat = npm.config.get('npat')
+  this.dev = npm.config.get('dev') || (!/^prod(uction)?$/.test(npm.config.get('only')) && !npm.config.get('production'))
+  this.prod = !/^dev(elopment)?$/.test(npm.config.get('only'))
+  this.rollback = npm.config.get('rollback')
+  this.link = npm.config.get('link')
+  this.global = this.where === path.resolve(npm.globalDir, '..')
+}
+Installer.prototype = {}
+
+Installer.prototype.run = function (cb) {
+  validate('F', arguments)
+
+  // FIXME: This is bad and I should feel bad.
+  // lib/install needs to have some way of sharing _limited_
+  // state with the things it calls. Passing the object is too
+  // much. The global config is WAY too much. =( =(
+  // But not having this is gonna break linked modules in
+  // subtle stupid ways, and refactoring all this code isn't
+  // the right thing to do just yet.
+  if (this.global) {
+    var prevGlobal = npm.config.get('global')
+    npm.config.set('global', true)
+    var next = cb
+    cb = function () {
+      npm.config.set('global', prevGlobal)
+      next.apply(null, arguments)
     }
+  }
 
-    // User has opted out of shrinkwraps entirely
-    if (npm.config.get("shrinkwrap") === false)
-      return cb(null, data, null)
-
-    if (wrap) {
-      log.verbose("readDependencies: using existing wrap", [where, wrap])
-      var rv = {}
-      Object.keys(data).forEach(function (key) {
-        rv[key] = data[key]
-      })
-      rv.dependencies = {}
-      Object.keys(wrap).forEach(function (key) {
-        log.verbose("from wrap", [key, wrap[key]])
-        rv.dependencies[key] = readWrap(wrap[key])
-      })
-      log.verbose("readDependencies returned deps", rv.dependencies)
-      return cb(null, rv, wrap)
+  var installSteps = []
+  var postInstallSteps = []
+  installSteps.push(
+    [this.newTracker(log, 'loadCurrentTree', 4)],
+    [this, this.loadCurrentTree],
+    [this, this.finishTracker, 'loadCurrentTree'],
+
+    [this.newTracker(log, 'loadIdealTree', 12)],
+    [this, this.loadIdealTree],
+    [this, this.finishTracker, 'loadIdealTree'],
+
+    [this, this.debugTree, 'currentTree', 'currentTree'],
+    [this, this.debugTree, 'idealTree', 'idealTree'],
+
+    [this.newTracker(log, 'generateActionsToTake')],
+    [this, this.generateActionsToTake],
+    [this, this.finishTracker, 'generateActionsToTake'],
+
+    [this, this.debugActions, 'diffTrees', 'differences'],
+    [this, this.debugActions, 'decomposeActions', 'todo'])
+  if (!this.dryrun) {
+    installSteps.push(
+      [this.newTracker(log, 'executeActions', 8)],
+      [this, this.executeActions],
+      [this, this.finishTracker, 'executeActions'])
+    var node_modules = path.resolve(this.where, 'node_modules')
+    var staging = path.resolve(node_modules, '.staging')
+    postInstallSteps.push(
+      [this.newTracker(log, 'rollbackFailedOptional', 1)],
+      [this, this.rollbackFailedOptional, staging, this.todo],
+      [this, this.finishTracker, 'rollbackFailedOptional'],
+      [this, this.commit, staging, this.todo],
+      [this.newTracker(log, 'runTopLevelLifecycles', 2)],
+      [this, this.runTopLevelLifecycles],
+      [this, this.finishTracker, 'runTopLevelLifecycles'])
+
+    if (getSaveType(this.args)) {
+      postInstallSteps.push(
+        [this, this.saveToDependencies])
     }
-
-    var wrapfile = path.resolve(where, "npm-shrinkwrap.json")
-
-    fs.readFile(wrapfile, "utf8", function (er, wrapjson) {
-      if (er) return cb(null, data, null)
-
-      log.verbose("readDependencies", "npm-shrinkwrap.json is overriding dependencies")
-      var newwrap
-      try {
-        newwrap = JSON.parse(wrapjson)
-      } catch (ex) {
-        return cb(ex)
-      }
-
-      log.info("shrinkwrap", "file %j", wrapfile)
-      var rv = {}
-      Object.keys(data).forEach(function (key) {
-        rv[key] = data[key]
-      })
-      rv.dependencies = {}
-      Object.keys(newwrap.dependencies || {}).forEach(function (key) {
-        rv.dependencies[key] = readWrap(newwrap.dependencies[key])
-      })
-
-      // fold in devDependencies if not already present, at top level
-      if (opts && opts.dev) {
-        Object.keys(data.devDependencies || {}).forEach(function (k) {
-          rv.dependencies[k] = rv.dependencies[k] || data.devDependencies[k]
+  }
+  postInstallSteps.push(
+    [this, this.printInstalled])
+
+  var self = this
+  chain(installSteps, function (installEr) {
+    if (installEr) self.failing = true
+    chain(postInstallSteps, function (postInstallEr) {
+      if (self.idealTree) {
+        self.idealTree.warnings.forEach(function (warning) {
+          if (warning.code === 'EPACKAGEJSON' && self.global) return
+          if (warning.code === 'ENOTDIR') return
+          log.warn(warning.code, warning.message)
         })
       }
-
-      log.verbose("readDependencies returned deps", rv.dependencies)
-      return cb(null, rv, newwrap.dependencies)
+      if (installEr && postInstallEr) {
+        log.warn('error', postInstallEr.message)
+        log.verbose('error', postInstallEr.stack)
+      }
+      cb(installEr || postInstallEr, self.getInstalledModules(), self.idealTree)
     })
   })
 }
 
-function readWrap (w) {
-  return (w.resolved) ? w.resolved
-       : (w.from && url.parse(w.from).protocol) ? w.from
-       : w.version
+Installer.prototype.loadArgMetadata = function (next) {
+  var self = this
+  getAllMetadata(this.args, this.currentTree, iferr(next, function (args) {
+    self.args = args
+    next()
+  }))
 }
 
-// if the -S|--save option is specified, then write installed packages
-// as dependencies to a package.json file.
-function save (where, installed, tree, pretty, hasArguments, cb) {
-  if (!hasArguments ||
-      !npm.config.get("save") &&
-      !npm.config.get("save-dev") &&
-      !npm.config.get("save-optional") ||
-      npm.config.get("global")) {
-    return cb(null, installed, tree, pretty)
+Installer.prototype.newTracker = function (tracker, name, size) {
+  validate('OS', [tracker, name])
+  if (size) validate('N', [size])
+  this.progress[name] = tracker.newGroup(name, size)
+  var self = this
+  return function (next) {
+    self.progress[name].silly(name, 'Starting')
+    next()
   }
+}
 
-  var saveBundle = npm.config.get("save-bundle")
-  var savePrefix = npm.config.get("save-prefix")
-
-  // each item in the tree is a top-level thing that should be saved
-  // to the package.json file.
-  // The relevant tree shape is { <folder>: {what:<pkg>} }
-  var saveTarget = path.resolve(where, "package.json")
+Installer.prototype.finishTracker = function (name, cb) {
+  validate('SF', arguments)
+  this.progress[name].silly(name, 'Finishing')
+  this.progress[name].finish()
+  cb()
+}
 
-  asyncMap(Object.keys(tree), function (k, cb) {
-    // if "from" is remote, git, or hosted, then save that instead.
-    var t = tree[k]
-      , f = npa(t.from)
-      , a = npa(t.what)
-      , w = [a.name, a.spec]
+Installer.prototype.loadCurrentTree = function (cb) {
+  validate('F', arguments)
+  log.silly('install', 'loadCurrentTree')
+  var todo = []
+  if (this.global) {
+    todo.push([this, this.readGlobalPackageData])
+  } else {
+    todo.push([this, this.readLocalPackageData])
+  }
+  todo.push(
+    [this, this.normalizeTree, log.newGroup('normalizeTree')])
+  chain(todo, cb)
+}
 
+Installer.prototype.loadIdealTree = function (cb) {
+  validate('F', arguments)
+  log.silly('install', 'loadIdealTree')
 
-    fs.stat(t.from, function (er){
-      if (!er) {
-        w[1] = "file:" + t.from
-      } else if (['hosted', 'git', 'remote'].indexOf(f.type) !== -1) {
-        w[1] = t.from
-      }
-      cb(null, [w])
-    })
-  }
-  , function (er, arr) {
-      var things = arr.reduce(function (set, k) {
-        var rangeDescriptor = semver.valid(k[1], true) &&
-                              semver.gte(k[1], "0.1.0", true) &&
-                              !npm.config.get("save-exact")
-                            ? savePrefix : ""
-        set[k[0]] = rangeDescriptor + k[1]
-        return set
-      }, {})
-
-
-    // don't use readJson, because we don't want to do all the other
-    // tricky npm-specific stuff that's in there.
-    fs.readFile(saveTarget, function (er, data) {
-      // ignore errors here, just don't save it.
-      try {
-        data = JSON.parse(data.toString("utf8"))
-      } catch (ex) {
-        er = ex
-      }
+  chain([
+    [this.newTracker(this.progress.loadIdealTree, 'cloneCurrentTree')],
+    [this, this.cloneCurrentTreeToIdealTree],
+    [this, this.finishTracker, 'cloneCurrentTree'],
 
-      if (er) {
-        return cb(null, installed, tree, pretty)
-      }
+    [this.newTracker(this.progress.loadIdealTree, 'loadShrinkwrap')],
+    [this, this.loadShrinkwrap],
+    [this, this.finishTracker, 'loadShrinkwrap'],
 
-      var deps = npm.config.get("save-optional") ? "optionalDependencies"
-               : npm.config.get("save-dev") ? "devDependencies"
-               : "dependencies"
+    [this.newTracker(this.progress.loadIdealTree, 'loadAllDepsIntoIdealTree', 10)],
+    [this, this.loadAllDepsIntoIdealTree],
+    [this, this.finishTracker, 'loadAllDepsIntoIdealTree'],
 
-      if (saveBundle) {
-        var bundle = data.bundleDependencies || data.bundledDependencies
-        delete data.bundledDependencies
-        if (!Array.isArray(bundle)) bundle = []
-        data.bundleDependencies = bundle.sort()
-      }
+    [this, function (next) { recalculateMetadata(this.idealTree, log, next) } ],
+    [this, this.debugTree, 'idealTree:prePrune', 'idealTree'],
+    [this, function (next) { next(pruneTree(this.idealTree)) } ]
+  ], cb)
+}
 
-      log.verbose("save", "saving", things)
-      data[deps] = data[deps] || {}
-      Object.keys(things).forEach(function (t) {
-        data[deps][t] = things[t]
-        if (saveBundle) {
-          var i = bundle.indexOf(t)
-          if (i === -1) bundle.push(t)
-          data.bundleDependencies = bundle.sort()
-        }
-      })
+Installer.prototype.loadAllDepsIntoIdealTree = function (cb) {
+  validate('F', arguments)
+  log.silly('install', 'loadAllDepsIntoIdealTree')
+  var saveDeps = getSaveType(this.args)
+
+  var cg = this.progress.loadAllDepsIntoIdealTree
+  var installNewModules = !!this.args.length
+  var steps = []
+
+  if (installNewModules) {
+    steps.push([validateArgs, this.idealTree, this.args])
+    steps.push([loadRequestedDeps, this.args, this.idealTree, saveDeps, cg.newGroup('loadRequestedDeps')])
+  } else {
+    if (this.prod) {
+      steps.push(
+        [loadDeps, this.idealTree, cg.newGroup('loadDeps')])
+    }
+    if (this.dev) {
+      steps.push(
+        [loadDevDeps, this.idealTree, cg.newGroup('loadDevDeps')])
+    }
+  }
+  steps.push(
+    [loadExtraneous.andResolveDeps, this.idealTree, cg.newGroup('loadExtraneous')])
+  chain(steps, cb)
+}
 
-      data[deps] = sortedObject(data[deps])
+Installer.prototype.generateActionsToTake = function (cb) {
+  validate('F', arguments)
+  log.silly('install', 'generateActionsToTake')
+  var cg = this.progress.generateActionsToTake
+  chain([
+    [validateTree, this.idealTree, cg.newGroup('validateTree')],
+    [diffTrees, this.currentTree, this.idealTree, this.differences, cg.newGroup('diffTrees')],
+    [this, this.computeLinked],
+    [filterInvalidActions, this.where, this.differences],
+    [checkPermissions, this.differences],
+    [decomposeActions, this.differences, this.todo]
+  ], cb)
+}
 
-      log.silly("save", "writing", saveTarget)
-      data = JSON.stringify(data, null, 2) + "\n"
-      writeFileAtomic(saveTarget, data, function (er) {
-        cb(er, installed, tree, pretty)
-      })
+Installer.prototype.computeLinked = function (cb) {
+  validate('F', arguments)
+  if (!this.link || this.global) return cb()
+  var linkTodoList = []
+  var self = this
+  asyncMap(this.differences, function (action, next) {
+    var cmd = action[0]
+    var pkg = action[1]
+    if (cmd !== 'add' && cmd !== 'update') return next()
+    var isReqByTop = pkg.package._requiredBy.filter(function (name) { return name === '/' }).length
+    var isReqByUser = pkg.package._requiredBy.filter(function (name) { return name === '#USER' }).length
+    var isExtraneous = pkg.package._requiredBy.length === 0
+    if (!isReqByTop && !isReqByUser && !isExtraneous) return next()
+    isLinkable(pkg, function (install, link) {
+      if (install) linkTodoList.push(['global-install', pkg])
+      if (link) linkTodoList.push(['global-link', pkg])
+      if (install || link) {
+        pkg.parent.children = pkg.parent.children.filter(function (child) { return child !== pkg })
+      }
+      next()
     })
+  }, function () {
+    if (linkTodoList.length === 0) return cb()
+    pruneTree(self.idealTree)
+    self.differences.length = 0
+    Array.prototype.push.apply(self.differences, linkTodoList)
+    diffTrees(self.currentTree, self.idealTree, self.differences, log.newGroup('d2'), cb)
   })
 }
 
-
-// Outputting *all* the installed modules is a bit confusing,
-// because the length of the path does not make it clear
-// that the submodules are not immediately require()able.
-// TODO: Show the complete tree, ls-style, but only if --long is provided
-function prettify (tree, installed) {
-  function red (set, kv) {
-    set[kv[0]] = kv[1]
-    return set
-  }
-
-  if (npm.config.get("json")) {
-    tree = Object.keys(tree).map(function (p) {
-      if (!tree[p]) return null
-      var what = npa(tree[p].what)
-        , name = what.name
-        , version = what.spec
-        , o = { name: name, version: version, from: tree[p].from }
-      o.dependencies = tree[p].children.map(function P (dep) {
-         var what = npa(dep.what)
-           , name = what.name
-           , version = what.spec
-           , o = { version: version, from: dep.from }
-         o.dependencies = dep.children.map(P).reduce(red, {})
-         return [name, o]
-       }).reduce(red, {})
-       return o
+function isLinkable (pkg, cb) {
+  var globalPackage = path.resolve(npm.globalPrefix, 'lib', 'node_modules', pkg.package.name)
+  var globalPackageJson = path.resolve(globalPackage, 'package.json')
+  fs.stat(globalPackage, function (er) {
+    if (er) return cb(true, true)
+    fs.readFile(globalPackageJson, function (er, data) {
+      var json = parseJSON.noExceptions(data)
+      cb(false, json && json.version === pkg.package.version)
     })
-
-    return JSON.stringify(tree, null, 2)
-  }
-  if (npm.config.get("parseable")) return parseable(installed)
-
-  return Object.keys(tree).map(function (p) {
-    return archy({ label: tree[p].what + " " + p
-                 , nodes: (tree[p].children || []).map(function P (c) {
-                     if (npm.config.get("long")) {
-                       return { label: c.what, nodes: c.children.map(P) }
-                     }
-                     var g = c.children.map(function (g) {
-                       return g.what
-                     }).join(", ")
-                     if (g) g = " (" + g + ")"
-                     return c.what + g
-                   })
-                 }, "", { unicode: npm.config.get("unicode") })
-  }).join("\n")
+  })
 }
 
-function parseable (installed) {
-  var long = npm.config.get("long")
-    , cwd = process.cwd()
-  return installed.map(function (item) {
-    return path.resolve(cwd, item[1]) +
-         ( long ?  ":" + item[0] : "" )
-  }).join("\n")
-}
+Installer.prototype.executeActions = function (cb) {
+  validate('F', arguments)
+  log.silly('install', 'executeActions')
+  var todo = this.todo
+  var cg = this.progress.executeActions
+
+  var node_modules = path.resolve(this.where, 'node_modules')
+  var staging = path.resolve(node_modules, '.staging')
+  var steps = []
+  var trackLifecycle = cg.newGroup('lifecycle')
+
+  cb = unlockCB(node_modules, '.staging', cb)
+
+  steps.push(
+    [doSerialActions, 'global-install', staging, todo, trackLifecycle.newGroup('global-install')],
+    [doParallelActions, 'fetch', staging, todo, cg.newGroup('fetch', 10)],
+    [lock, node_modules, '.staging'],
+    [rimraf, staging],
+    [mkdirp, staging],
+    [doParallelActions, 'extract', staging, todo, cg.newGroup('extract', 10)],
+    [doParallelActions, 'preinstall', staging, todo, trackLifecycle.newGroup('preinstall')],
+    [doReverseSerialActions, 'remove', staging, todo, cg.newGroup('remove')],
+    // FIXME: We do this here to commit the removes prior to trying to move
+    // anything into place. Once we can rollback removes we should find
+    // a better solution for this.
+    // This is to protect against cruft in the node_modules folder (like dot files)
+    // that stop it from being removed.
+    [this, this.commit, staging, this.todo],
+    [doSerialActions, 'move', staging, todo, cg.newGroup('move')],
+    [doSerialActions, 'finalize', staging, todo, cg.newGroup('finalize')],
+    [doSerialActions, 'build', staging, todo, trackLifecycle.newGroup('build')],
+    [doSerialActions, 'global-link', staging, todo, trackLifecycle.newGroup('global-link')],
+    [doParallelActions, 'update-linked', staging, todo, trackLifecycle.newGroup('update-linked')],
+    [doSerialActions, 'install', staging, todo, trackLifecycle.newGroup('install')],
+    [doSerialActions, 'postinstall', staging, todo, trackLifecycle.newGroup('postinstall')])
+  if (this.npat) {
+    steps.push(
+      [doParallelActions, 'test', staging, todo, trackLifecycle.newGroup('npat')])
+  }
 
-function treeify (installed) {
-  // each item is [what, where, parent, parentDir]
-  // If no parent, then report it.
-  // otherwise, tack it into the parent's children list.
-  // If the parent isn't a top-level then ignore it.
-  var whatWhere = installed.reduce(function (l, r) {
-    var parentDir = r[3]
-      , parent = r[2]
-      , where = r[1]
-      , what = r[0]
-      , from = r[4]
-    l[where] = { parentDir: parentDir
-               , parent: parent
-               , children: []
-               , where: where
-               , what: what
-               , from: from }
-    return l
-  }, {})
-
-  // log.warn("install", whatWhere, "whatWhere")
-  return Object.keys(whatWhere).reduce(function (l, r) {
-    var ww = whatWhere[r]
-    //log.warn("r, ww", [r, ww])
-    if (!ww.parent) {
-      l[r] = ww
+  var self = this
+  chain(steps, function (er) {
+    if (!er || self.rollback) {
+      rimraf(staging, function () { cb(er) })
     } else {
-      var p = whatWhere[ww.parentDir]
-      if (p) p.children.push(ww)
-      else l[r] = ww
+      cb(er)
     }
-    return l
-  }, {})
+  })
 }
 
+Installer.prototype.rollbackFailedOptional = function (staging, actionsToRun, cb) {
+  if (!this.rollback) return cb()
+  var failed = actionsToRun.map(function (action) {
+    return action[1]
+  }).filter(function (pkg) {
+    return pkg.failed && pkg.rollback
+  })
+  asyncMap(failed, function (pkg, next) {
+    asyncMap(pkg.rollback, function (rollback, done) {
+      rollback(staging, pkg, done)
+    }, next)
+  }, cb)
+}
 
-// just like installMany, but also add the existing packages in
-// where/node_modules to the family object.
-function installManyTop (what, where, context, cb_) {
-  function cb (er, d) {
-    if (context.explicit || er) return cb_(er, d)
-    // since this wasn't an explicit install, let's build the top
-    // folder, so that `npm install` also runs the lifecycle scripts.
-    npm.commands.build([where], false, true, function (er) {
-      return cb_(er, d)
+Installer.prototype.commit = function (staging, actionsToRun, cb) {
+  var toCommit = actionsToRun.map(function (action) { return action[1] }).filter(function (pkg) { return !pkg.failed && pkg.commit })
+  asyncMap(toCommit, function (pkg, next) {
+    asyncMap(pkg.commit, function (commit, done) {
+      commit(staging, pkg, done)
+    }, function () {
+      pkg.commit = []
+      next.apply(null, arguments)
     })
-  }
-
-  if (context.explicit) return next()
+  }, cb)
+}
 
-  var jsonPath = path.join(where, 'package.json')
-  log.verbose('installManyTop', 'reading for lifecycle', jsonPath)
-  readJson(jsonPath, log.warn, function (er, data) {
-    if (er) return next(er)
-    lifecycle(data, "preinstall", where, next)
-  })
+Installer.prototype.runTopLevelLifecycles = function (cb) {
+  validate('F', arguments)
+  if (this.failing) return cb()
+  log.silly('install', 'runTopLevelLifecycles')
+  var steps = []
+  var trackLifecycle = this.progress.runTopLevelLifecycles
+  if (!this.topLevelLifecycles) {
+    trackLifecycle.finish()
+    return cb()
+  }
 
-  function next (er) {
-    if (er) return cb(er)
-    installManyTop_(what, where, context, cb)
+  steps.push(
+    [doOneAction, 'preinstall', this.idealTree.path, this.idealTree, trackLifecycle.newGroup('preinstall:.')],
+    [doOneAction, 'build', this.idealTree.path, this.idealTree, trackLifecycle.newGroup('build:.')],
+    [doOneAction, 'install', this.idealTree.path, this.idealTree, trackLifecycle.newGroup('install:.')],
+    [doOneAction, 'postinstall', this.idealTree.path, this.idealTree, trackLifecycle.newGroup('postinstall:.')])
+  if (this.npat) {
+    steps.push(
+      [doOneAction, 'test', this.idealTree.path, this.idealTree, trackLifecycle.newGroup('npat:.')])
+  }
+  if (this.dev) {
+    steps.push(
+      [doOneAction, 'prepublish', this.idealTree.path, this.idealTree, trackLifecycle.newGroup('prepublish')])
   }
+  chain(steps, cb)
 }
 
-function installManyTop_ (what, where, context, cb) {
-  var nm = path.resolve(where, "node_modules")
-
-  fs.readdir(nm, function (er, pkgs) {
-    if (er) return installMany(what, where, context, cb)
-
-    var scopes = [], unscoped = []
-    pkgs.filter(function (p) {
-      return !p.match(/^[\._-]/)
-    }).forEach(function (p) {
-      // @names deserve deeper investigation
-      if (p[0] === "@") {
-        scopes.push(p)
-      }
-      else {
-        unscoped.push(p)
-      }
-    })
-
-    maybeScoped(scopes, nm, function (er, scoped) {
-      if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
-      // recombine unscoped with @scope/package packages
-      asyncMap(unscoped.concat(scoped).map(function (p) {
-        return path.resolve(nm, p, "package.json")
-      }), function (jsonPath, cb) {
-        log.verbose('installManyTop', 'reading scoped package data from', jsonPath)
-        readJson(jsonPath, log.info, function (er, data) {
-          if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
-          if (er) return cb(null, [])
-          cb(null, [[data.name, data.version]])
-        })
-      }, function (er, packages) {
-        // if there's nothing in node_modules, then don't freak out.
-        if (er) packages = []
-        // add all the existing packages to the family list.
-        // however, do not add to the ancestors list.
-        packages.forEach(function (p) {
-          context.family[p[0]] = p[1]
-        })
-        installMany(what, where, context, cb)
-      })
-    })
-  })
+Installer.prototype.saveToDependencies = function (cb) {
+  validate('F', arguments)
+  if (this.failing) return cb()
+  log.silly('install', 'saveToDependencies')
+  saveRequested(this.args, this.idealTree, cb)
 }
 
-function maybeScoped (scopes, where, cb) {
-  // find packages in scopes
-  asyncMap(scopes, function (scope, cb) {
-    fs.readdir(path.resolve(where, scope), function (er, scoped) {
-      if (er) return cb(er)
-      var paths = scoped.map(function (p) {
-        return path.join(scope, p)
+Installer.prototype.readGlobalPackageData = function (cb) {
+  validate('F', arguments)
+  log.silly('install', 'readGlobalPackageData')
+  var self = this
+  this.loadArgMetadata(iferr(cb, function () {
+    mkdirp(self.where, iferr(cb, function () {
+      var pkgs = {}
+      self.args.forEach(function (pkg) {
+        pkgs[pkg.name] = true
       })
-      cb(null, paths)
-    })
-  }, cb)
+      readPackageTree(self.where, function (ctx, kid) { return ctx.parent || pkgs[kid] }, iferr(cb, function (currentTree) {
+        self.currentTree = currentTree
+        return cb()
+      }))
+    }))
+  }))
 }
 
-function installMany (what, where, context, cb) {
-  // readDependencies takes care of figuring out whether the list of
-  // dependencies we'll iterate below comes from an existing shrinkwrap from a
-  // parent level, a new shrinkwrap at this level, or package.json at this
-  // level, as well as which shrinkwrap (if any) our dependencies should use.
-  var opt = { dev: npm.config.get("dev") }
-  readDependencies(context, where, opt, function (er, data, wrap) {
-    if (er) data = {}
-
-    var parent = data
-
-    // if we're explicitly installing "what" into "where", then the shrinkwrap
-    // for "where" doesn't apply. This would be the case if someone were adding
-    // a new package to a shrinkwrapped package. (data.dependencies will not be
-    // used here except to indicate what packages are already present, so
-    // there's no harm in using that.)
-    if (context.explicit) wrap = null
-
-    var deps = data.dependencies || {}
-    var devDeps = data.devDependencies || {}
-
-    // what is a list of things.
-    // resolve each one.
-    asyncMap( what
-            , targetResolver(where, context, deps, devDeps)
-            , function (er, targets) {
-
-      if (er) return cb(er)
-
-      var bundled = data.bundleDependencies || data.bundledDependencies || []
-      // only take the hit for readInstalled if there are probably bundled
-      // dependencies to read
-      if (bundled.length) {
-        readInstalled(where, { dev: true }, andBuildResolvedTree)
-      } else {
-        andBuildResolvedTree()
+Installer.prototype.readLocalPackageData = function (cb) {
+  validate('F', arguments)
+  log.silly('install', 'readLocalPackageData')
+  var self = this
+  mkdirp(this.where, iferr(cb, function () {
+    readPackageTree(self.where, iferr(cb, function (currentTree) {
+      self.currentTree = currentTree
+      self.currentTree.warnings = []
+      if (!self.noPackageJsonOk && !currentTree.package) {
+        log.error('install', "Couldn't read dependencies")
+        var er = new Error("ENOENT, open '" + path.join(self.where, 'package.json') + "'")
+        er.code = 'ENOPACKAGEJSON'
+        er.errno = 34
+        return cb(er)
       }
-
-      function andBuildResolvedTree (er, current) {
-        if (er) return cb(er)
-
-        // each target will be a data object corresponding
-        // to a package, folder, or whatever that is in the cache now.
-        var newPrev = Object.create(context.family)
-          , newAnc = Object.create(context.ancestors)
-
-        if (!context.root) {
-          newAnc[data.name] = data.version
-        }
-        bundled.forEach(function (bundle) {
-          var bundleData = current.dependencies[bundle]
-          if ((!bundleData || !bundleData.version) && current.devDependencies) {
-            log.verbose(
-              'installMany', bundle, 'was bundled with',
-              data.name + '@' + data.version +
-                ", but wasn't found in dependencies. Trying devDependencies"
-            )
-            bundleData = current.devDependencies[bundle]
-          }
-
-          if (!bundleData || !bundleData.version) {
-            log.warn(
-              'installMany', bundle, 'was bundled with',
-              data.name + '@' + data.version +
-                ", but bundled package wasn't found in unpacked tree"
-            )
-          } else {
-            log.verbose(
-              'installMany', bundle + '@' + bundleData.version,
-              'was bundled with', data.name + '@' + data.version
-            )
-            newPrev[bundle] = bundleData.version
+      if (!currentTree.package) currentTree.package = {}
+      self.loadArgMetadata(iferr(cb, function () {
+        if (currentTree.package._shrinkwrap) return cb()
+        fs.readFile(path.join(self.where, 'npm-shrinkwrap.json'), function (er, data) {
+          if (er) return cb()
+          try {
+            currentTree.package._shrinkwrap = parseJSON(data)
+          } catch (ex) {
+            return cb(ex)
           }
+          return cb()
         })
-        targets.forEach(function (t) {
-          newPrev[t.name] = t.version
-        })
-        log.silly("install resolved", targets)
-        targets.filter(function (t) { return t }).forEach(function (t) {
-          log.info("install", "%s into %s", t._id, where)
-        })
-        asyncMap(targets, function (target, cb) {
-          log.info("installOne", target._id)
-          var wrapData = wrap ? wrap[target.name] : null
-          var newWrap = wrapData && wrapData.dependencies
-                      ? wrap[target.name].dependencies || {}
-                      : null
-          var newContext = { family: newPrev
-                           , ancestors: newAnc
-                           , parent: parent
-                           , explicit: false
-                           , wrap: newWrap }
-          installOne(target, where, newContext, cb)
-        }, cb)
-      }
-    })
-  })
+      }))
+    }))
+  }))
 }
 
-function targetResolver (where, context, deps, devDeps) {
-  var alreadyInstalledManually = []
-    , resolveLeft = 0
-    , nm = path.resolve(where, "node_modules")
-    , parent = context.parent
-    , wrap = context.wrap
-
-  if (!context.explicit) readdir(nm)
-
-  function readdir(name) {
-    resolveLeft++
-    fs.readdir(name, function (er, inst) {
-      if (er) return resolveLeft--
-
-      // don't even mess with non-package looking things
-      inst = inst.filter(function (p) {
-        if (!p.match(/^[@\._-]/)) return true
-        // scoped packages
-        readdir(path.join(name, p))
-      })
-
-      asyncMap(inst, function (pkg, cb) {
-        var jsonPath = path.resolve(name, pkg, 'package.json')
-        log.verbose('targetResolver', 'reading package data from', jsonPath)
-        readJson(jsonPath, log.info, function (er, d) {
-          if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
-          // error means it's not a package, most likely.
-          if (er) return cb(null, [])
-
-          // if it's a bundled dep, then assume that anything there is valid.
-          // otherwise, make sure that it's a semver match with what we want.
-          var bd = parent.bundleDependencies
-          var isBundled = bd && bd.indexOf(d.name) !== -1
-          var expectedVersion = deps[d.name] || (devDeps && devDeps[d.name]) || "*"
-          var currentIsSatisfactory = semver.satisfies(d.version, expectedVersion, true)
-          if (isBundled || currentIsSatisfactory || deps[d.name] === d._resolved) {
-            return cb(null, d.name)
-          }
-
-          // see if the package had been previously linked
-          fs.lstat(path.resolve(nm, pkg), function(err, s) {
-            if (err) return cb(null, [])
-            if (s.isSymbolicLink()) {
-              return cb(null, d.name)
-            }
+Installer.prototype.cloneCurrentTreeToIdealTree = function (cb) {
+  validate('F', arguments)
+  log.silly('install', 'cloneCurrentTreeToIdealTree')
+  this.idealTree = copyTree(this.currentTree)
+  this.idealTree.warnings = []
+  cb()
+}
 
-            // something is there, but it's not satisfactory.  Clobber it.
-            return cb(null, [])
-          })
-        })
-      }, function (er, inst) {
-        // this is the list of things that are valid and should be ignored.
-        alreadyInstalledManually = alreadyInstalledManually.concat(inst)
-        resolveLeft--
-      })
-    })
+Installer.prototype.loadShrinkwrap = function (cb) {
+  validate('F', arguments)
+  log.silly('install', 'loadShrinkwrap')
+  var installNewModules = !!this.args.length
+  if (installNewModules) {
+    readShrinkwrap(this.idealTree, cb)
+  } else {
+    readShrinkwrap.andInflate(this.idealTree, cb)
   }
+}
 
-  var to = 0
-  return function resolver (what, cb) {
-    if (resolveLeft) return setTimeout(function () {
-      resolver(what, cb)
-    }, to++)
-
-    // now we know what's been installed here manually,
-    // or tampered with in some way that npm doesn't want to overwrite.
-    if (alreadyInstalledManually.indexOf(npa(what).name) !== -1) {
-      log.verbose("already installed", "skipping %s %s", what, where)
-      return cb(null, [])
-    }
-
-    // check for a version installed higher in the tree.
-    // If installing from a shrinkwrap, it must match exactly.
-    if (context.family[what]) {
-      log.verbose('install', what, 'is installed as', context.family[what])
-      if (wrap && wrap[what].version === context.family[what]) {
-        log.verbose("shrinkwrap", "use existing", what)
-        return cb(null, [])
-      }
-    }
-
-    // if it's identical to its parent, then it's probably someone
-    // doing `npm install foo` inside of the foo project.  Print
-    // a warning, and skip it.
-    if (parent && parent.name === what && !npm.config.get("force")) {
-      log.warn("install", "Refusing to install %s as a dependency of itself"
-              , what)
-      return cb(null, [])
-    }
-
-    if (wrap) {
-      var name = npa(what).name
-      if (wrap[name]) {
-        var wrapTarget = readWrap(wrap[name])
-        what = name + "@" + wrapTarget
-      } else {
-        log.verbose("shrinkwrap", "skipping %s (not in shrinkwrap)", what)
-      }
-    } else if (deps[what]) {
-      what = what + "@" + deps[what]
-    }
-
-    // This is where we actually fetch the package, if it's not already
-    // in the cache.
-    // If it's a git repo, then we want to install it, even if the parent
-    // already has a matching copy.
-    // If it's not a git repo, and the parent already has that pkg, then
-    // we can skip installing it again.
-    var pkgroot = path.resolve(npm.prefix, (parent && parent._from) || "")
-    cache.add(what, null, pkgroot, false, function (er, data) {
-      if (er && parent && parent.optionalDependencies &&
-          parent.optionalDependencies.hasOwnProperty(npa(what).name)) {
-        log.warn("optional dep failed, continuing", what)
-        log.verbose("optional dep failed, continuing", [what, er])
-        return cb(null, [])
-      }
-
-      var type = npa(what).type
-      var isGit = type === "git" || type === "hosted"
-
-      if (!er &&
-          data &&
-          !context.explicit &&
-          context.family[data.name] === data.version &&
-          !npm.config.get("force") &&
-          !isGit) {
-        log.info("already installed", data.name + "@" + data.version)
-        return cb(null, [])
+Installer.prototype.normalizeTree = function (log, cb) {
+  validate('OF', arguments)
+  log.silly('install', 'normalizeTree')
+  recalculateMetadata(this.currentTree, log, iferr(cb, function (tree) {
+    tree.children.forEach(function (child) {
+      if (child.package._requiredBy.length === 0) {
+        child.package._requiredBy.push('#EXISTING')
       }
-
-
-      if (data && !data._from) data._from = what
-      if (er && parent && parent.name) er.parent = parent.name
-      return cb(er, data || [])
     })
-  }
+    cb(null, tree)
+  }))
 }
 
-// we've already decided to install this.  if anything's in the way,
-// then uninstall it first.
-function installOne (target, where, context, cb) {
-  // the --link flag makes this a "link" command if it's at the
-  // the top level.
-  var isGit = false
-  var type = npa(target._from).type
-  if (target && target._from) isGit = type === 'git' || type === 'hosted'
-
-  if (where === npm.prefix && npm.config.get("link")
-      && !npm.config.get("global") && !isGit) {
-    return localLink(target, where, context, cb)
-  }
-  installOne_(target, where, context, function (er, installedWhat) {
-
-    // check if this one is optional to its parent.
-    if (er && context.parent && context.parent.optionalDependencies &&
-        context.parent.optionalDependencies.hasOwnProperty(target.name)) {
-      log.warn("optional dep failed, continuing", target._id)
-      log.verbose("optional dep failed, continuing", [target._id, er])
-      er = null
-    }
-
-    cb(er, installedWhat)
+Installer.prototype.getInstalledModules = function () {
+  return this.differences.filter(function (action) {
+    var mutation = action[0]
+    return (mutation === 'add' || mutation === 'update')
+  }).map(function (action) {
+    var child = action[1]
+    return [child.package._id, child.path]
   })
-
 }
 
-function localLink (target, where, context, cb) {
-  log.verbose("localLink", target._id)
-  var jsonPath = path.resolve(npm.globalDir, target.name , 'package.json')
-  var parent = context.parent
-
-  log.verbose('localLink', 'reading data to link', target.name, 'from', jsonPath)
-  readJson(jsonPath, log.warn, function (er, data) {
-    function thenLink () {
-      npm.commands.link([target.name], function (er, d) {
-        log.silly("localLink", "back from link", [er, d])
-        cb(er, [resultList(target, where, parent && parent._id)])
-      })
-    }
-
-    if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
-    if (er || data._id === target._id) {
-      if (er) {
-        install( path.resolve(npm.globalDir, "..")
-               , target._id
-               , function (er) {
-          if (er) return cb(er, [])
-          thenLink()
-        })
-      } else thenLink()
-    } else {
-      log.verbose("localLink", "install locally (no link)", target._id)
-      installOne_(target, where, context, cb)
+Installer.prototype.printInstalled = function (cb) {
+  validate('F', arguments)
+  log.silly('install', 'printInstalled')
+  var self = this
+  log.clearProgress()
+  this.differences.forEach(function (action) {
+    var mutation = action[0]
+    var child = action[1]
+    var name = getPackageId(child)
+    var where = path.relative(self.where, child.path)
+    if (mutation === 'remove') {
+      console.log('- ' + name + ' ' + where)
+    } else if (mutation === 'move') {
+      var oldWhere = path.relative(self.where, child.fromPath)
+      console.log(name + ' ' + oldWhere + ' -> ' + where)
     }
   })
-}
-
-function resultList (target, where, parentId) {
-  var nm = path.resolve(where, "node_modules")
-    , targetFolder = path.resolve(nm, target.name)
-    , prettyWhere = where
-
-  if (!npm.config.get("global")) {
-    prettyWhere = path.relative(process.cwd(), where)
-  }
-
-  if (prettyWhere === ".") prettyWhere = null
-
-  if (!npm.config.get("global")) {
-    // print out the folder relative to where we are right now.
-    targetFolder = path.relative(process.cwd(), targetFolder)
-  }
-
-  return [ target._id
-         , targetFolder
-         , prettyWhere && parentId
-         , parentId && prettyWhere
-         , target._from ]
-}
-
-var installed = Object.create(null)
-
-function installOne_ (target, where, context, cb_) {
-  var nm = path.resolve(where, "node_modules")
-    , targetFolder = path.resolve(nm, target.name)
-    , prettyWhere = path.relative(process.cwd(), where)
-    , parent = context.parent
-
-  if (prettyWhere === ".") prettyWhere = null
-
-  cb_ = inflight(target.name + ":" + where, cb_)
-  if (!cb_) {
-    return log.verbose("installOne", "of", target.name, "to", where, "already in flight; waiting")
-  }
-  else {
-    log.verbose("installOne", "of", target.name, "to", where, "not in flight; installing")
-  }
-
-  function cb(er, data) {
-    unlock(nm, target.name, function () { cb_(er, data) })
-  }
-
-  lock(nm, target.name, function (er) {
-    if (er) return cb(er)
-
-    if (targetFolder in installed) {
-      log.error("install", "trying to install", target.version, "to", targetFolder)
-      log.error("install", "but already installed versions", installed[targetFolder])
-      installed[targetFolder].push(target.version)
-    }
-    else {
-      installed[targetFolder] = [target.version]
-    }
-
-    var force = npm.config.get("force")
-      , nodeVersion = npm.config.get("node-version")
-      , strict = npm.config.get("engine-strict")
-      , c = npmInstallChecks
-
-    chain(
-        [ [c.checkEngine, target, npm.version, nodeVersion, force, strict]
-        , [c.checkPlatform, target, force]
-        , [c.checkCycle, target, context.ancestors]
-        , [c.checkGit, targetFolder]
-        , [write, target, targetFolder, context] ]
-      , function (er, d) {
-          if (er) return cb(er)
-
-          d.push(resultList(target, where, parent && parent._id))
-          cb(er, d)
-        }
-      )
+  var addedOrMoved = this.differences.filter(function (action) {
+    var mutation = action[0]
+    var child = action[1]
+    return !child.failed && (mutation === 'add' || mutation === 'update')
+  }).map(function (action) {
+    var child = action[1]
+    return getPackageId(child)
   })
-}
-
-function write (target, targetFolder, context, cb_) {
-  var up = npm.config.get("unsafe-perm")
-    , user = up ? null : npm.config.get("user")
-    , group = up ? null : npm.config.get("group")
-    , family = context.family
-
-  function cb (er, data) {
-    // cache.unpack returns the data object, and all we care about
-    // is the list of installed packages from that last thing.
-    if (!er) return cb_(er, data)
-
-    if (npm.config.get("rollback") === false) return cb_(er)
-    npm.rollbacks.push(targetFolder)
-    cb_(er, data)
-  }
-
-  var bundled = []
-
-  log.silly("install write", "writing", target.name, target.version, "to", targetFolder)
-  chain(
-    [ [ cache.unpack, target.name, target.version, targetFolder, null, null, user, group ],
-      function writePackageJSON (cb) {
-        var jsonPath = path.resolve(targetFolder, 'package.json')
-        log.verbose('write', 'writing to', jsonPath)
-        writeFileAtomic(jsonPath, JSON.stringify(target, null, 2) + '\n', cb)
-      },
-      [ lifecycle, target, "preinstall", targetFolder ],
-      function collectBundled (cb) {
-        if (!target.bundleDependencies) return cb()
-
-        var bd = path.resolve(targetFolder, "node_modules")
-        fs.readdir(bd, function (er, b) {
-          // nothing bundled, maybe
-          if (er) return cb()
-          bundled = b || []
-          cb()
-        })
-      } ]
-
-    // nest the chain so that we can throw away the results returned
-    // up until this point, since we really don't care about it.
-    , function X (er) {
-      if (er) return cb(er)
-
-      // before continuing to installing dependencies, check for a shrinkwrap.
-      var opt = { dev: npm.config.get("dev") }
-      readDependencies(context, targetFolder, opt, function (er, data, wrap) {
-        if (er) return cb(er);
-        var deps = prepareForInstallMany(data, "dependencies", bundled, wrap,
-            family)
-        var depsTargetFolder = targetFolder
-        var depsContext = { family: family
-                          , ancestors: context.ancestors
-                          , parent: target
-                          , explicit: false
-                          , wrap: wrap }
-
-        var actions =
-          [ [ installManyAndBuild, deps, depsTargetFolder, depsContext ] ]
-
-        // FIXME: This is an accident waiting to happen!
-        //
-        // 1. If multiple children at the same level of the tree share a
-        //    peerDependency that's not in the parent's dependencies, because
-        //    the peerDeps don't get added to the family, they will keep
-        //    getting reinstalled (worked around by inflighting installOne).
-        // 2. The installer can't safely build at the parent level because
-        //    that's already being done by the parent's installAndBuild. This
-        //    runs the risk of the peerDependency never getting built.
-        //
-        //  The fix: Don't install peerDependencies; require them to be
-        //  included as explicit dependencies / devDependencies, and warn
-        //  or error when they're missing. See #5080 for more arguments in
-        //  favor of killing implicit peerDependency installs with fire.
-        var peerDeps = prepareForInstallMany(data, "peerDependencies", bundled,
-            wrap, family)
-        peerDeps.forEach(function (pd) {
-            warnPeers([
-              "The peer dependency "+pd+" included from "+data.name+" will no",
-              "longer be automatically installed to fulfill the peerDependency ",
-              "in npm 3+. Your application will need to depend on it explicitly."
-            ], pd+","+data.name)
-        })
-
-        // Package scopes cause an addditional tree level which needs to be
-        // considered when resolving a peerDependency's target folder.
-        var pdTargetFolder
-        if (npa(target.name).scope) {
-          pdTargetFolder = path.resolve(targetFolder, '../../..')
-        } else {
-          pdTargetFolder = path.resolve(targetFolder, '../..')
-        }
-
-        var pdContext = context
-        if (peerDeps.length > 0) {
-          actions.push(
-            [ installMany, peerDeps, pdTargetFolder, pdContext ]
-          )
-        }
-
-        chain(actions, cb)
-      })
+  log.showProgress()
+  if (!addedOrMoved.length) return cb()
+  recalculateMetadata(this.idealTree, log, iferr(cb, function (tree) {
+    log.clearProgress()
+    ls.fromTree(self.where, tree, addedOrMoved, false, function () {
+      log.showProgress()
+      cb()
     })
+  }))
 }
 
-function installManyAndBuild (deps, targetFolder, context, cb) {
-  installMany(deps, targetFolder, context, function (er, d) {
-    log.verbose("about to build", targetFolder)
-    if (er) return cb(er)
-    npm.commands.build( [targetFolder]
-                      , npm.config.get("global")
-                      , true
-                      , function (er) { return cb(er, d) })
+Installer.prototype.debugActions = function (name, actionListName, cb) {
+  validate('SSF', arguments)
+  var actionsToLog = this[actionListName]
+  log.silly(name, 'action count', actionsToLog.length)
+  actionsToLog.forEach(function (action) {
+    log.silly(name, action.map(function (value) {
+      return (value && value.package) ? getPackageId(value) : value
+    }).join(' '))
   })
+  cb()
 }
 
-function prepareForInstallMany (packageData, depsKey, bundled, wrap, family) {
-  var deps = Object.keys(packageData[depsKey] || {})
+// This takes an object and a property name instead of a value to allow us
+// to define the arguments for use by chain before the property exists yet.
+Installer.prototype.debugTree = function (name, treeName, cb) {
+  validate('SSF', arguments)
+  log.silly(name, this.prettify(this[treeName]).trim())
+  cb()
+}
 
-  // don't install bundleDependencies, unless they're missing.
-  if (packageData.bundleDependencies) {
-    deps = deps.filter(function (d) {
-      return packageData.bundleDependencies.indexOf(d) === -1 ||
-             bundled.indexOf(d) === -1
-    })
+Installer.prototype.prettify = function (tree) {
+  validate('O', arguments)
+  var seen = {}
+  function byName (aa, bb) {
+    return getPackageId(aa).localeCompare(getPackageId(bb))
   }
-
-  return deps.filter(function (d) {
-    // prefer to not install things that are satisfied by
-    // something in the "family" list, unless we're installing
-    // from a shrinkwrap.
-    if (wrap) return wrap
-    if (semver.validRange(family[d], true)) {
-      return !semver.satisfies(family[d], packageData[depsKey][d], true)
+  function expandTree (tree) {
+    seen[tree.path] = true
+    return {
+      label: getPackageId(tree),
+      nodes: tree.children.filter(function (tree) { return !seen[tree.path] }).sort(byName).map(expandTree)
     }
-    return true
-  }).map(function (d) {
-    var v = packageData[depsKey][d]
-    var t = d + "@" + v
-    log.silly("prepareForInstallMany", "adding", t, "from", packageData.name, depsKey)
-    return t
-  })
+  }
+  return archy(expandTree(tree), '', { unicode: npm.config.get('unicode') })
 }
diff --git a/deps/npm/lib/install/access-error.js b/deps/npm/lib/install/access-error.js
new file mode 100644
index 00000000000000..ff94be98576379
--- /dev/null
+++ b/deps/npm/lib/install/access-error.js
@@ -0,0 +1,8 @@
+'use strict'
+module.exports = function (dir, er) {
+  if (!er) return
+  var accessEr = new Error("EACCES, access '" + dir + "'", -13)
+  accessEr.code = 'EACCES'
+  accessEr.path = dir
+  return accessEr
+}
diff --git a/deps/npm/lib/install/action/build.js b/deps/npm/lib/install/action/build.js
new file mode 100644
index 00000000000000..0feb3a0fbf88fa
--- /dev/null
+++ b/deps/npm/lib/install/action/build.js
@@ -0,0 +1,12 @@
+'use strict'
+var chain = require('slide').chain
+var build = require('../../build.js')
+var npm = require('../../npm.js')
+
+module.exports = function (top, buildpath, pkg, log, next) {
+  log.silly('build', pkg.package.name)
+  chain([
+    [build.linkStuff, pkg.package, pkg.path, npm.config.get('global'), false],
+    [build.writeBuiltinConf, pkg.package, pkg.path]
+  ], next)
+}
diff --git a/deps/npm/lib/install/action/extract.js b/deps/npm/lib/install/action/extract.js
new file mode 100644
index 00000000000000..f9a4f8b2fab407
--- /dev/null
+++ b/deps/npm/lib/install/action/extract.js
@@ -0,0 +1,17 @@
+'use strict'
+var updatePackageJson = require('../update-package-json')
+var npm = require('../../npm.js')
+var cache = require('../../cache.js')
+
+module.exports = function (top, buildpath, pkg, log, next) {
+  log.silly('extract', pkg.package.name)
+  var up = npm.config.get('unsafe-perm')
+  var user = up ? null : npm.config.get('user')
+  var group = up ? null : npm.config.get('group')
+  cache.unpack(pkg.package.name, pkg.package.version
+        , buildpath
+        , null, null, user, group, function (er) {
+    if (er) return next(er)
+    updatePackageJson(pkg, buildpath, next)
+  })
+}
diff --git a/deps/npm/lib/install/action/fetch.js b/deps/npm/lib/install/action/fetch.js
new file mode 100644
index 00000000000000..16a94244b15496
--- /dev/null
+++ b/deps/npm/lib/install/action/fetch.js
@@ -0,0 +1,27 @@
+'use strict'
+// var cache = require('../../cache.js')
+
+module.exports = function (top, buildpath, pkg, log, next) {
+  next()
+/*
+// FIXME: Unnecessary as long as we have to have the tarball to resolve all deps, which
+// is progressively seeming to be likely for the indefinite future.
+// ALSO fails for local deps specified with relative URLs outside of the top level.
+
+  var name = pkg.package.name
+  var version
+  switch (pkg.package._requested.type) {
+    case 'version':
+    case 'range':
+      version = pkg.package.version
+      break
+    case 'hosted':
+      name = name + '@' + pkg.package._requested.spec
+      break
+    default:
+      name = pkg.package._requested.raw
+  }
+  log.silly('fetch', name, version)
+  cache.add(name, version, top, false, next)
+*/
+}
diff --git a/deps/npm/lib/install/action/finalize.js b/deps/npm/lib/install/action/finalize.js
new file mode 100644
index 00000000000000..62e21cc47db89c
--- /dev/null
+++ b/deps/npm/lib/install/action/finalize.js
@@ -0,0 +1,93 @@
+'use strict'
+var path = require('path')
+var rimraf = require('rimraf')
+var fs = require('graceful-fs')
+var mkdirp = require('mkdirp')
+var asyncMap = require('slide').asyncMap
+var andIgnoreErrors = require('../and-ignore-errors.js')
+
+module.exports = function (top, buildpath, pkg, log, next) {
+  log.silly('finalize', pkg.path)
+
+  var delpath = path.join(path.dirname(pkg.path), '.' + path.basename(pkg.path) + '.DELETE')
+
+  mkdirp(path.resolve(pkg.path, '..'), whenParentExists)
+
+  function whenParentExists (mkdirEr) {
+    if (mkdirEr) return next(mkdirEr)
+    // We stat first, because we can't rely on ENOTEMPTY from Windows.
+    // Windows, by contrast, gives the generic EPERM of a folder already exists.
+    fs.lstat(pkg.path, destStated)
+  }
+
+  function destStated (doesNotExist) {
+    if (doesNotExist) {
+      fs.rename(buildpath, pkg.path, whenMoved)
+    } else {
+      moveAway()
+    }
+  }
+
+  function whenMoved (renameEr) {
+    if (!renameEr) return next()
+    if (renameEr.code !== 'ENOTEMPTY') return next(renameEr)
+    moveAway()
+  }
+
+  function moveAway () {
+    fs.rename(pkg.path, delpath, whenOldMovedAway)
+  }
+
+  function whenOldMovedAway (renameEr) {
+    if (renameEr) return next(renameEr)
+    fs.rename(buildpath, pkg.path, whenConflictMoved)
+  }
+
+  function whenConflictMoved (renameEr) {
+    // if we got an error we'll try to put back the original module back,
+    // succeed or fail though we want the original error that caused this
+    if (renameEr) return fs.rename(delpath, pkg.path, function () { next(renameEr) })
+    fs.readdir(path.join(delpath, 'node_modules'), makeTarget)
+  }
+
+  function makeTarget (readdirEr, files) {
+    if (readdirEr) return cleanup()
+    if (!files.length) return cleanup()
+    mkdirp(path.join(pkg.path, 'node_modules'), function (mkdirEr) { moveModules(mkdirEr, files) })
+  }
+
+  function moveModules (mkdirEr, files) {
+    if (mkdirEr) return next(mkdirEr)
+    asyncMap(files, function (file, done) {
+      var from = path.join(delpath, 'node_modules', file)
+      var to = path.join(pkg.path, 'node_modules', file)
+      // we ignore errors here, because they can legitimately happen, for instance,
+      // bundled modules will be in both node_modules folders
+      fs.rename(from, to, andIgnoreErrors(done))
+    }, cleanup)
+  }
+
+  function cleanup () {
+    rimraf(delpath, afterCleanup)
+  }
+
+  function afterCleanup (rimrafEr) {
+    if (rimrafEr) log.warn('finalize', rimrafEr)
+    next()
+  }
+}
+
+module.exports.rollback = function (buildpath, pkg, next) {
+  var top = path.resolve(buildpath, '..')
+  rimraf(pkg.path, function () {
+    removeEmptyParents(pkg.path)
+  })
+  function removeEmptyParents (pkgdir) {
+    if (path.relative(top, pkgdir)[0] === '.') return next()
+    fs.rmdir(pkgdir, function (er) {
+      // FIXME: Make sure windows does what we want here
+      if (er && er.code !== 'ENOENT') return next()
+      removeEmptyParents(path.resolve(pkgdir, '..'))
+    })
+  }
+}
diff --git a/deps/npm/lib/install/action/global-install.js b/deps/npm/lib/install/action/global-install.js
new file mode 100644
index 00000000000000..25c61aebd8bf11
--- /dev/null
+++ b/deps/npm/lib/install/action/global-install.js
@@ -0,0 +1,16 @@
+'use strict'
+var path = require('path')
+var npm = require('../../npm.js')
+var Installer = require('../../install.js').Installer
+
+module.exports = function (top, buildpath, pkg, log, next) {
+  log.silly('global-install', pkg.package.name)
+  var globalRoot = path.resolve(npm.globalDir, '..')
+  npm.config.set('global', true)
+  var install = new Installer(globalRoot, false, [pkg.package.name + '@' + pkg.package._requested.spec])
+  install.link = false
+  install.run(function () {
+    npm.config.set('global', false)
+    next.apply(null, arguments)
+  })
+}
diff --git a/deps/npm/lib/install/action/global-link.js b/deps/npm/lib/install/action/global-link.js
new file mode 100644
index 00000000000000..80eb46b95ad5cb
--- /dev/null
+++ b/deps/npm/lib/install/action/global-link.js
@@ -0,0 +1,7 @@
+'use strict'
+var npm = require('../../npm.js')
+
+module.exports = function (top, buildpath, pkg, log, next) {
+  log.silly('global-link', pkg.package.name)
+  npm.link(pkg.package.name, next)
+}
diff --git a/deps/npm/lib/install/action/install.js b/deps/npm/lib/install/action/install.js
new file mode 100644
index 00000000000000..f6c8d56e086a29
--- /dev/null
+++ b/deps/npm/lib/install/action/install.js
@@ -0,0 +1,7 @@
+'use strict'
+var lifecycle = require('../../utils/lifecycle.js')
+
+module.exports = function (top, buildpath, pkg, log, next) {
+  log.silly('install', pkg.package.name, buildpath)
+  lifecycle(pkg.package, 'install', pkg.path, false, false, next)
+}
diff --git a/deps/npm/lib/install/action/move.js b/deps/npm/lib/install/action/move.js
new file mode 100644
index 00000000000000..9bdfbc7bf25577
--- /dev/null
+++ b/deps/npm/lib/install/action/move.js
@@ -0,0 +1,59 @@
+'use strict'
+var fs = require('graceful-fs')
+var path = require('path')
+var chain = require('slide').chain
+var iferr = require('iferr')
+var rimraf = require('rimraf')
+var mkdirp = require('mkdirp')
+var rmStuff = require('../../unbuild.js').rmStuff
+var lifecycle = require('../../utils/lifecycle.js')
+var updatePackageJson = require('../update-package-json')
+
+module.exports = function (top, buildpath, pkg, log, next) {
+  log.silly('move', pkg.fromPath, pkg.path)
+  chain([
+    [lifecycle, pkg.package, 'preuninstall', pkg.fromPath, false, true],
+    [lifecycle, pkg.package, 'uninstall', pkg.fromPath, false, true],
+    [rmStuff, pkg.package, pkg.fromPath],
+    [lifecycle, pkg.package, 'postuninstall', pkg.fromPath, false, true],
+    [moveModuleOnly, pkg.fromPath, pkg.path],
+    [lifecycle, pkg.package, 'preinstall', pkg.path, false, true],
+    [removeEmptyParents, path.resolve(pkg.fromPath, '..')],
+    [updatePackageJson, pkg, pkg.path]
+  ], next)
+}
+
+function removeEmptyParents (pkgdir, next) {
+  fs.rmdir(pkgdir, function (er) {
+    // FIXME: Make sure windows does what we want here
+    if (er && er.code !== 'ENOENT') return next()
+    removeEmptyParents(path.resolve(pkgdir, '..'), next)
+  })
+}
+
+function moveModuleOnly (from, to, done) {
+  var from_modules = path.join(from, 'node_modules')
+  var temp_modules = from + '.node_modules'
+
+  rimraf(to, iferr(done, makeDestination))
+
+  function makeDestination () {
+    mkdirp(path.resolve(to, '..'), iferr(done, moveNodeModules))
+  }
+
+  function moveNodeModules () {
+    fs.rename(from_modules, temp_modules, function (er) {
+      doMove(er ? done : moveNodeModulesBack)
+    })
+  }
+
+  function doMove (next) {
+    fs.rename(from, to, iferr(done, next))
+  }
+
+  function moveNodeModulesBack () {
+    mkdirp(from, iferr(done, function () {
+      fs.rename(temp_modules, from_modules, done)
+    }))
+  }
+}
diff --git a/deps/npm/lib/install/action/postinstall.js b/deps/npm/lib/install/action/postinstall.js
new file mode 100644
index 00000000000000..5460c8364d572a
--- /dev/null
+++ b/deps/npm/lib/install/action/postinstall.js
@@ -0,0 +1,7 @@
+'use strict'
+var lifecycle = require('../../utils/lifecycle.js')
+
+module.exports = function (top, buildpath, pkg, log, next) {
+  log.silly('postinstall', pkg.package.name, buildpath)
+  lifecycle(pkg.package, 'postinstall', pkg.path, false, false, next)
+}
diff --git a/deps/npm/lib/install/action/preinstall.js b/deps/npm/lib/install/action/preinstall.js
new file mode 100644
index 00000000000000..989519c26f86da
--- /dev/null
+++ b/deps/npm/lib/install/action/preinstall.js
@@ -0,0 +1,7 @@
+'use strict'
+var lifecycle = require('../../utils/lifecycle.js')
+
+module.exports = function (top, buildpath, pkg, log, next) {
+  log.silly('preinstall', pkg.package.name, buildpath)
+  lifecycle(pkg.package, 'preinstall', buildpath, false, false, next)
+}
diff --git a/deps/npm/lib/install/action/prepublish.js b/deps/npm/lib/install/action/prepublish.js
new file mode 100644
index 00000000000000..95ff22b66edd8a
--- /dev/null
+++ b/deps/npm/lib/install/action/prepublish.js
@@ -0,0 +1,7 @@
+'use strict'
+var lifecycle = require('../../utils/lifecycle.js')
+
+module.exports = function (top, buildpath, pkg, log, next) {
+  log.silly('prepublish', pkg.package.name, buildpath)
+  lifecycle(pkg.package, 'prepublish', buildpath, false, false, next)
+}
diff --git a/deps/npm/lib/install/action/remove.js b/deps/npm/lib/install/action/remove.js
new file mode 100644
index 00000000000000..b3126a58005394
--- /dev/null
+++ b/deps/npm/lib/install/action/remove.js
@@ -0,0 +1,82 @@
+'use strict'
+var path = require('path')
+var fs = require('graceful-fs')
+var rimraf = require('rimraf')
+var asyncMap = require('slide').asyncMap
+var mkdirp = require('mkdirp')
+var npm = require('../../npm.js')
+var andIgnoreErrors = require('../and-ignore-errors.js')
+
+// This is weird because we want to remove the module but not it's node_modules folder
+// allowing for this allows us to not worry about the order of operations
+module.exports = function (top, buildpath, pkg, log, next) {
+  log.silly('remove', pkg.path)
+  if (pkg.target) {
+    removeLink(pkg, next)
+  } else {
+    removeDir(pkg, log, next)
+  }
+}
+
+function removeLink (pkg, next) {
+  npm.commands.unbuild(pkg.path, true, next)
+}
+
+function removeDir (pkg, log, next) {
+  var modpath = path.join(path.dirname(pkg.path), '.' + path.basename(pkg.path) + '.MODULES')
+
+  fs.rename(path.join(pkg.path, 'node_modules'), modpath, unbuildPackage)
+
+  function unbuildPackage (renameEr) {
+    npm.commands.unbuild(pkg.path, true, renameEr ? andRemoveEmptyParents(pkg.path) : moveModulesBack)
+  }
+
+  function andRemoveEmptyParents (path) {
+    return function (er) {
+      if (er) return next(er)
+      removeEmptyParents(pkg.path)
+    }
+  }
+
+  function moveModulesBack () {
+    fs.readdir(modpath, makeTarget)
+  }
+
+  function makeTarget (readdirEr, files) {
+    if (readdirEr) return cleanup()
+    if (!files.length) return cleanup()
+    mkdirp(path.join(pkg.path, 'node_modules'), function (mkdirEr) { moveModules(mkdirEr, files) })
+  }
+
+  function moveModules (mkdirEr, files) {
+    if (mkdirEr) return next(mkdirEr)
+    asyncMap(files, function (file, done) {
+      var from = path.join(modpath, file)
+      var to = path.join(pkg.path, 'node_modules', file)
+      // we ignore errors here, because they can legitimately happen, for instance,
+      // bundled modules will be in both node_modules folders
+      fs.rename(from, to, andIgnoreErrors(done))
+    }, cleanup)
+  }
+
+  function cleanup () {
+    rimraf(modpath, afterCleanup)
+  }
+
+  function afterCleanup (rimrafEr) {
+    if (rimrafEr) log.warn('finalize', rimrafEr)
+    removeEmptyParents(path.resolve(pkg.path, '..'))
+  }
+
+  function removeEmptyParents (pkgdir) {
+    fs.rmdir(pkgdir, function (er) {
+      // FIXME: Make sure windows does what we want here
+      if (er && er.code !== 'ENOENT') return next()
+      removeEmptyParents(path.resolve(pkgdir, '..'))
+    })
+  }
+}
+
+module.exports.commit = function (staging, pkg, next) {
+  rimraf(pkg.path, next)
+}
diff --git a/deps/npm/lib/install/action/test.js b/deps/npm/lib/install/action/test.js
new file mode 100644
index 00000000000000..354519d06fd042
--- /dev/null
+++ b/deps/npm/lib/install/action/test.js
@@ -0,0 +1,7 @@
+'use strict'
+var lifecycle = require('../../utils/lifecycle.js')
+
+module.exports = function (top, buildpath, pkg, log, next) {
+  log.silly('test', pkg.package.name, buildpath)
+  lifecycle(pkg.package, 'test', buildpath, false, false, next)
+}
diff --git a/deps/npm/lib/install/action/update-linked.js b/deps/npm/lib/install/action/update-linked.js
new file mode 100644
index 00000000000000..46c4cdfadd1509
--- /dev/null
+++ b/deps/npm/lib/install/action/update-linked.js
@@ -0,0 +1,8 @@
+'use strict'
+var path = require('path')
+
+module.exports = function (top, buildpath, pkg, log, next) {
+  log.warn('update-linked', path.relative(top, pkg.path), 'needs updating to', pkg.package.version,
+    'from', pkg.oldPkg.package.version, "but we can't, as it's a symlink")
+  next()
+}
diff --git a/deps/npm/lib/install/actions.js b/deps/npm/lib/install/actions.js
new file mode 100644
index 00000000000000..84d987faf0a0d9
--- /dev/null
+++ b/deps/npm/lib/install/actions.js
@@ -0,0 +1,127 @@
+'use strict'
+var path = require('path')
+var validate = require('aproba')
+var chain = require('slide').chain
+var asyncMap = require('slide').asyncMap
+var uniqueFilename = require('unique-filename')
+var log = require('npmlog')
+var andFinishTracker = require('./and-finish-tracker.js')
+var andAddParentToErrors = require('./and-add-parent-to-errors.js')
+var failedDependency = require('./deps.js').failedDependency
+
+var actions = {}
+
+actions.fetch = require('./action/fetch.js')
+actions.extract = require('./action/extract.js')
+actions.build = require('./action/build.js')
+actions.test = require('./action/test.js')
+actions.preinstall = require('./action/preinstall.js')
+actions.install = require('./action/install.js')
+actions.postinstall = require('./action/postinstall.js')
+actions.prepublish = require('./action/prepublish.js')
+actions.finalize = require('./action/finalize.js')
+actions.remove = require('./action/remove.js')
+actions.move = require('./action/move.js')
+actions['update-linked'] = require('./action/update-linked.js')
+actions['global-install'] = require('./action/global-install.js')
+actions['global-link'] = require('./action/global-link.js')
+
+// FIXME: We wrap actions like three ways to sunday here.
+// Rewrite this to only work one way.
+
+Object.keys(actions).forEach(function (actionName) {
+  var action = actions[actionName]
+  actions[actionName] = function (top, buildpath, pkg, log, next) {
+    validate('SSOOF', arguments)
+    // refuse to run actions for failed packages
+    if (pkg.failed) return next()
+    if (action.rollback) {
+      if (!pkg.rollback) pkg.rollback = []
+      pkg.rollback.unshift(action.rollback)
+    }
+    if (action.commit) {
+      if (!pkg.commit) pkg.commit = []
+      pkg.commit.push(action.commit)
+    }
+    return action(top, buildpath, pkg, log, andFinishTracker(log, andAddParentToErrors(pkg.parent, andHandleOptionalDepErrors(pkg, next))))
+  }
+})
+
+function markAsFailed (pkg) {
+  pkg.failed = true
+  pkg.requires.forEach(function (req) {
+    req.requiredBy = req.requiredBy.filter(function (reqReqBy) { return reqReqBy !== pkg })
+    if (req.requiredBy.length === 0 && !req.userRequired && !req.existing) {
+      markAsFailed(req)
+    }
+  })
+}
+
+function andHandleOptionalDepErrors (pkg, next) {
+  return function (er) {
+    if (!er) return next.apply(null, arguments)
+    markAsFailed(pkg)
+    var anyFatal = pkg.directlyRequested || !pkg.parent
+    for (var ii = 0; ii < pkg.requiredBy.length; ++ii) {
+      var parent = pkg.requiredBy[ii]
+      var isFatal = failedDependency(parent, pkg)
+      if (isFatal) anyFatal = true
+    }
+    if (anyFatal) return next.apply(null, arguments)
+    log.warn('install:' + pkg.package.name, er.message)
+    log.verbose('install:' + pkg.package.name, er.stack)
+    next()
+  }
+}
+
+function prepareAction (staging, log) {
+  validate('SO', arguments)
+  return function (action) {
+    validate('SO', action)
+    var cmd = action[0]
+    var pkg = action[1]
+    if (!actions[cmd]) throw new Error('Unknown decomposed command "' + cmd + '" (is it new?)')
+    var buildpath = uniqueFilename(staging, pkg.package.name, pkg.realpath)
+    var top = path.resolve(staging, '../..')
+    return [actions[cmd], top, buildpath, pkg, log.newGroup(cmd + ':' + pkg.package.name)]
+  }
+}
+
+exports.actions = actions
+
+function execAction (todo, done) {
+  validate('AF', arguments)
+  var cmd = todo.shift()
+  todo.push(done)
+  cmd.apply(null, todo)
+}
+
+exports.doOne = function (cmd, staging, pkg, log, next) {
+  validate('SSOOF', arguments)
+  execAction(prepareAction(staging, log)([cmd, pkg]), next)
+}
+
+exports.doSerial = function (type, staging, actionsToRun, log, next) {
+  validate('SSAOF', arguments)
+  actionsToRun = actionsToRun
+    .filter(function (value) { return value[0] === type })
+  log.silly('doSerial', '%s %d', type, actionsToRun.length)
+  chain(actionsToRun.map(prepareAction(staging, log)), andFinishTracker(log, next))
+}
+
+exports.doReverseSerial = function (type, staging, actionsToRun, log, next) {
+  validate('SSAOF', arguments)
+  actionsToRun = actionsToRun
+    .filter(function (value) { return value[0] === type })
+    .reverse()
+  log.silly('doReverseSerial', '%s %d', type, actionsToRun.length)
+  chain(actionsToRun.map(prepareAction(staging, log)), andFinishTracker(log, next))
+}
+
+exports.doParallel = function (type, staging, actionsToRun, log, next) {
+  validate('SSAOF', arguments)
+  actionsToRun = actionsToRun.filter(function (value) { return value[0] === type })
+  log.silly('doParallel', type + ' ' + actionsToRun.length)
+
+  asyncMap(actionsToRun.map(prepareAction(staging, log)), execAction, andFinishTracker(log, next))
+}
diff --git a/deps/npm/lib/install/and-add-parent-to-errors.js b/deps/npm/lib/install/and-add-parent-to-errors.js
new file mode 100644
index 00000000000000..62a86bd4a6c360
--- /dev/null
+++ b/deps/npm/lib/install/and-add-parent-to-errors.js
@@ -0,0 +1,13 @@
+'use strict'
+var validate = require('aproba')
+
+module.exports = function (parent, cb) {
+  validate('F', [cb])
+  return function (er) {
+    if (!er) return cb.apply(null, arguments)
+    if (er instanceof Error && parent && parent.package && parent.package.name) {
+      er.parent = parent.package.name
+    }
+    cb(er)
+  }
+}
diff --git a/deps/npm/lib/install/and-finish-tracker.js b/deps/npm/lib/install/and-finish-tracker.js
new file mode 100644
index 00000000000000..2bab60ddc40080
--- /dev/null
+++ b/deps/npm/lib/install/and-finish-tracker.js
@@ -0,0 +1,16 @@
+'use strict'
+var validate = require('aproba')
+
+module.exports = function (tracker, cb) {
+  validate('OF', [tracker, cb])
+  return function () {
+    tracker.finish()
+    cb.apply(null, arguments)
+  }
+}
+
+module.exports.now = function (tracker, cb) {
+  validate('OF', [tracker, cb])
+  tracker.finish()
+  cb.apply(null, Array.prototype.slice.call(arguments, 2))
+}
diff --git a/deps/npm/lib/install/and-ignore-errors.js b/deps/npm/lib/install/and-ignore-errors.js
new file mode 100644
index 00000000000000..cf46ad82155b5c
--- /dev/null
+++ b/deps/npm/lib/install/and-ignore-errors.js
@@ -0,0 +1,9 @@
+'use strict'
+
+module.exports = function (cb) {
+  return function () {
+    var args = Array.prototype.slice.call(arguments, 1)
+    if (args.length) args.unshift(null)
+    return cb.apply(null, args)
+  }
+}
diff --git a/deps/npm/lib/install/check-permissions.js b/deps/npm/lib/install/check-permissions.js
new file mode 100644
index 00000000000000..7806fcff993e19
--- /dev/null
+++ b/deps/npm/lib/install/check-permissions.js
@@ -0,0 +1,69 @@
+'use strict'
+var path = require('path')
+var log = require('npmlog')
+var validate = require('aproba')
+var uniq = require('lodash.uniq')
+var asyncMap = require('slide').asyncMap
+var npm = require('../npm.js')
+var exists = require('./exists.js')
+var writable = require('./writable.js')
+
+module.exports = function (actions, next) {
+  validate('AF', arguments)
+  var errors = []
+  asyncMap(actions, function (action, done) {
+    var cmd = action[0]
+    var pkg = action[1]
+    switch (cmd) {
+      case 'add':
+        hasAnyWriteAccess(path.resolve(pkg.path, '..'), errors, done)
+        break
+      case 'update':
+      case 'remove':
+        hasWriteAccess(pkg.path, errors, andHasWriteAccess(path.resolve(pkg.path, '..'), errors, done))
+        break
+      case 'move':
+        hasAnyWriteAccess(pkg.path, errors, andHasWriteAccess(path.resolve(pkg.fromPath, '..'), errors, done))
+        break
+      default:
+        done()
+    }
+  }, function () {
+    if (!errors.length) return next()
+    uniq(errors.map(function (er) { return 'Missing write access to ' + er.path })).forEach(function (er) {
+      log.warn('checkPermissions', er)
+    })
+    npm.config.get('force') ? next() : next(errors[0])
+  })
+}
+
+function andHasWriteAccess (dir, errors, done) {
+  validate('SAF', arguments)
+  return function () {
+    hasWriteAccess(dir, errors, done)
+  }
+}
+
+function hasAnyWriteAccess (dir, errors, done) {
+  validate('SAF', arguments)
+  findNearestDir()
+  function findNearestDir () {
+    var nextDir = path.resolve(dir, '..')
+    exists(dir, function (dirDoesntExist) {
+      if (!dirDoesntExist || nextDir === dir) {
+        return hasWriteAccess(dir, errors, done)
+      } else {
+        dir = nextDir
+        findNearestDir()
+      }
+    })
+  }
+}
+
+function hasWriteAccess (dir, errors, done) {
+  validate('SAF', arguments)
+  writable(dir, function (er) {
+    if (er) errors.push(er)
+    done()
+  })
+}
diff --git a/deps/npm/lib/install/copy-tree.js b/deps/npm/lib/install/copy-tree.js
new file mode 100644
index 00000000000000..67a9c687a22d25
--- /dev/null
+++ b/deps/npm/lib/install/copy-tree.js
@@ -0,0 +1,25 @@
+'use strict'
+
+module.exports = function (tree) {
+  return copyTree(tree, {})
+}
+
+function copyTree (tree, cache) {
+  if (cache[tree.path]) return cache[tree.path]
+  var newTree = cache[tree.path] = Object.create(tree)
+  copyModuleList(newTree, 'children', cache)
+  newTree.children.forEach(function (child) {
+    child.parent = newTree
+  })
+  copyModuleList(newTree, 'requires', cache)
+  copyModuleList(newTree, 'requiredBy', cache)
+  return newTree
+}
+
+function copyModuleList (tree, key, cache) {
+  var newList = []
+  tree[key].forEach(function (child) {
+    newList.push(copyTree(child, cache))
+  })
+  tree[key] = newList
+}
diff --git a/deps/npm/lib/install/decompose-actions.js b/deps/npm/lib/install/decompose-actions.js
new file mode 100644
index 00000000000000..b345ba5d09ea10
--- /dev/null
+++ b/deps/npm/lib/install/decompose-actions.js
@@ -0,0 +1,50 @@
+'use strict'
+var validate = require('aproba')
+var asyncMap = require('slide').asyncMap
+
+module.exports = function (differences, decomposed, next) {
+  validate('AAF', arguments)
+  asyncMap(differences, function (action, done) {
+    var cmd = action[0]
+    var pkg = action[1]
+    switch (cmd) {
+      case 'add':
+      case 'update':
+          addSteps(decomposed, pkg, done)
+        break
+      case 'move':
+        moveSteps(decomposed, pkg, done)
+        break
+      case 'remove':
+      case 'update-linked':
+      default:
+        defaultSteps(decomposed, cmd, pkg, done)
+    }
+  }, next)
+}
+
+function addSteps (decomposed, pkg, done) {
+  decomposed.push(['fetch', pkg])
+  decomposed.push(['extract', pkg])
+  decomposed.push(['preinstall', pkg])
+  decomposed.push(['build', pkg])
+  decomposed.push(['install', pkg])
+  decomposed.push(['postinstall', pkg])
+  decomposed.push(['test', pkg])
+  decomposed.push(['finalize', pkg])
+  done()
+}
+
+function moveSteps (decomposed, pkg, done) {
+  decomposed.push(['move', pkg])
+  decomposed.push(['build', pkg])
+  decomposed.push(['install', pkg])
+  decomposed.push(['postinstall', pkg])
+  decomposed.push(['test', pkg])
+  done()
+}
+
+function defaultSteps (decomposed, cmd, pkg, done) {
+  decomposed.push([cmd, pkg])
+  done()
+}
diff --git a/deps/npm/lib/install/deps.js b/deps/npm/lib/install/deps.js
new file mode 100644
index 00000000000000..ab162087407102
--- /dev/null
+++ b/deps/npm/lib/install/deps.js
@@ -0,0 +1,534 @@
+'use strict'
+var assert = require('assert')
+var path = require('path')
+var url = require('url')
+var semver = require('semver')
+var asyncMap = require('slide').asyncMap
+var chain = require('slide').chain
+var union = require('lodash.union')
+var iferr = require('iferr')
+var npa = require('npm-package-arg')
+var validate = require('aproba')
+var realizePackageSpecifier = require('realize-package-specifier')
+var dezalgo = require('dezalgo')
+var fetchPackageMetadata = require('../fetch-package-metadata.js')
+var andAddParentToErrors = require('./and-add-parent-to-errors.js')
+var addShrinkwrap = require('../fetch-package-metadata.js').addShrinkwrap
+var addBundled = require('../fetch-package-metadata.js').addBundled
+var readShrinkwrap = require('./read-shrinkwrap.js')
+var inflateShrinkwrap = require('./inflate-shrinkwrap.js')
+var inflateBundled = require('./inflate-bundled.js')
+var andFinishTracker = require('./and-finish-tracker.js')
+var npm = require('../npm.js')
+var flatName = require('./flatten-tree.js').flatName
+var createChild = require('./node.js').create
+var resetMetadata = require('./node.js').reset
+var andIgnoreErrors = require('./and-ignore-errors.js')
+var isInstallable = require('./validate-args.js').isInstallable
+var getPackageId = require('./get-package-id.js')
+
+// The export functions in this module mutate a dependency tree, adding
+// items to them.
+
+function isDep (tree, child) {
+  if (child.fromShrinkwrap) return true
+  var requested = isProdDep(tree, child.package.name)
+  var matches
+  if (requested) matches = doesChildVersionMatch(child, requested)
+  if (matches) return matches
+  requested = isDevDep(tree, child.package.name)
+  if (!requested) return
+  return doesChildVersionMatch(child, requested)
+}
+
+function isDevDep (tree, name) {
+  var devDeps = tree.package.devDependencies || {}
+  var reqVer = devDeps[name]
+  if (reqVer == null) return
+  return npa(name + '@' + reqVer)
+}
+
+function isProdDep (tree, name) {
+  var deps = tree.package.dependencies || {}
+  var reqVer = deps[name]
+  if (reqVer == null) return false
+  return npa(name + '@' + reqVer)
+}
+
+var registryTypes = { range: true, version: true }
+
+function doesChildVersionMatch (child, requested) {
+  // we always consider deps provided by a shrinkwrap as "correct" or else
+  // we'll subvert them if they're intentionally "invalid"
+  if (child.fromShrinkwrap) return true
+  // ranges of * ALWAYS count as a match, because when downloading we allow
+  // prereleases to match * if there are ONLY prereleases
+  if (requested.spec === '*') return true
+
+  var childReq = child.package._requested
+  if (childReq) {
+    if (childReq.rawSpec === requested.rawSpec) return true
+    if (childReq.type === requested.type && childReq.spec === requested.spec) return true
+  }
+  if (!registryTypes[requested.type]) return requested.rawSpec === child.package._from
+  return semver.satisfies(child.package.version, requested.spec)
+}
+
+exports.recalculateMetadata = function (tree, log, next) {
+  recalculateMetadata(tree, log, {}, next)
+}
+
+function recalculateMetadata (tree, log, seen, next) {
+  validate('OOOF', arguments)
+  if (seen[tree.path]) return next()
+  seen[tree.path] = true
+  if (tree.parent == null) resetMetadata(tree)
+  function markDeps (spec, done) {
+    validate('SF', arguments)
+    realizePackageSpecifier(spec, packageRelativePath(tree), function (er, req) {
+      if (er) return done()
+      var child = findRequirement(tree, req.name, req)
+      if (child) {
+        resolveWithExistingModule(child, tree, log, andIgnoreErrors(done))
+      } else if (tree.package.dependencies[req.name] != null) {
+        tree.missingDeps[req.name] = req.rawSpec
+        done()
+      } else if (tree.package.devDependencies[req.name] != null) {
+        tree.missingDevDeps[req.name] = req.rawSpec
+        done()
+      } else {
+        done()
+      }
+    })
+  }
+  function specs (deps) {
+    return Object.keys(deps).map(function (depname) { return depname + '@' + deps[depname] })
+  }
+  var tomark = specs(tree.package.dependencies)
+  if (!tree.parent && (npm.config.get('dev') || !npm.config.get('production'))) {
+    tomark = union(tomark, specs(tree.package.devDependencies))
+  }
+  tree.children = tree.children.filter(function (child) { return !child.failed })
+  chain([
+    [asyncMap, tomark, markDeps],
+    [asyncMap, tree.children, function (child, done) { recalculateMetadata(child, log, seen, done) }]
+  ], function () {
+    tree.userRequired = tree.package._requiredBy.some(function (req) { req === '#USER' })
+    tree.existing = tree.package._requiredBy.some(function (req) { req === '#EXISTING' })
+    tree.package._location = flatNameFromTree(tree)
+    next(null, tree)
+  })
+}
+
+function addRequiredDep (tree, child) {
+  if (!isDep(tree, child)) return false
+  var name = isProdDep(tree, child.package.name) ? flatNameFromTree(tree) : '#DEV:' + flatNameFromTree(tree)
+  child.package._requiredBy = union(child.package._requiredBy || [], [name])
+  child.requiredBy = union(child.requiredBy || [], [tree])
+  tree.requires = union(tree.requires || [], [child])
+  return true
+}
+
+function matchingDep (tree, name) {
+  if (tree.package.dependencies && tree.package.dependencies[name]) return tree.package.dependencies[name]
+  if (tree.package.devDependencies && tree.package.devDependencies[name]) return tree.package.devDependencies[name]
+  return
+}
+
+function packageRelativePath (tree) {
+  if (!tree) return ''
+  var requested = tree.package._requested || {}
+  var isLocal = requested.type === 'directory' || requested.type === 'local'
+  return isLocal ? requested.spec : tree.path
+}
+
+function getShrinkwrap (tree, name) {
+  return tree.package._shrinkwrap && tree.package._shrinkwrap.dependencies && tree.package._shrinkwrap.dependencies[name]
+}
+
+exports.getAllMetadata = function (args, tree, next) {
+  asyncMap(args, function (spec, done) {
+    if (tree && spec.lastIndexOf('@') <= 0) {
+      var sw = getShrinkwrap(tree, spec)
+      if (sw) {
+        // FIXME: This is duplicated in inflate-shrinkwrap and should be factoed
+        // into a shared function
+        spec = sw.resolved
+             ? spec + '@' + sw.resolved
+             : (sw.from && url.parse(sw.from).protocol)
+             ? spec + '@' + sw.from
+             : spec + '@' + sw.version
+      } else {
+        var version = matchingDep(tree, spec)
+        if (version != null) {
+          spec += '@' + version
+        }
+      }
+    }
+    fetchPackageMetadata(spec, packageRelativePath(tree), done)
+  }, next)
+}
+
+// Add a list of args to tree's top level dependencies
+exports.loadRequestedDeps = function (args, tree, saveToDependencies, log, next) {
+  validate('AOOF', [args, tree, log, next])
+  asyncMap(args, function (pkg, done) {
+    var depLoaded = andAddParentToErrors(tree, done)
+    tree.children = tree.children.filter(function (child) {
+      return child.package.name !== pkg.name
+    })
+    resolveWithNewModule(pkg, tree, log.newGroup('loadRequestedDeps'), iferr(depLoaded, function (child, tracker) {
+      validate('OO', arguments)
+      if (npm.config.get('global')) {
+        child.isGlobal = true
+      }
+      if (saveToDependencies) {
+        tree.package[saveToDependencies][child.package.name] =
+          child.package._requested.rawSpec || child.package._requested.spec
+      }
+      if (saveToDependencies && saveToDependencies !== 'devDependencies') {
+        tree.package.dependencies[child.package.name] =
+          child.package._requested.rawSpec || child.package._requested.spec
+      }
+      child.directlyRequested = true
+      child.save = saveToDependencies
+
+      // For things the user asked to install, that aren't a dependency (or
+      // won't be when we're done), flag it as "depending" on the user
+      // themselves, so we don't remove it as a dep that no longer exists
+      if (!addRequiredDep(tree, child)) {
+        child.package._requiredBy = union(child.package._requiredBy, ['#USER'])
+        child.directlyRequested = true
+      }
+      depLoaded(null, child, tracker)
+    }))
+  }, andForEachChild(loadDeps, andFinishTracker(log, next)))
+}
+
+// while this implementation does not require async calling, doing so
+// gives this a consistent interface with loadDeps et al
+exports.removeDeps = function (args, tree, saveToDependencies, log, next) {
+  validate('AOOF', [args, tree, log, next])
+  args.forEach(function (pkg) {
+    if (saveToDependencies) {
+      var toRemove = tree.children.filter(function (child) { return child.package.name === pkg.name })
+      tree.removed = union(tree.removed || [], toRemove)
+      toRemove.forEach(function (parent) {
+        parent.save = saveToDependencies
+      })
+    }
+    tree.children = tree.children.filter(function (child) { return child.package.name !== pkg.name })
+  })
+  log.finish()
+  next()
+}
+
+function andForEachChild (load, next) {
+  validate('F', [next])
+  next = dezalgo(next)
+  return function (er, children, logs) {
+    // when children is empty, logs won't be passed in at all (asyncMap is weird)
+    // so shortcircuit before arg validation
+    if (!er && (!children || children.length === 0)) return next()
+    validate('EAA', arguments)
+    if (er) return next(er)
+    assert(children.length === logs.length)
+    var cmds = []
+    for (var ii = 0; ii < children.length; ++ii) {
+      cmds.push([load, children[ii], logs[ii]])
+    }
+    var sortedCmds = cmds.sort(function installOrder (aa, bb) {
+      return aa[1].package.name.localeCompare(bb[1].package.name)
+    })
+    chain(sortedCmds, next)
+  }
+}
+
+function isDepOptional (tree, name) {
+  if (!tree.package.optionalDependencies) return false
+  if (tree.package.optionalDependencies[name] != null) return true
+  return false
+}
+
+var failedDependency = exports.failedDependency = function (tree, name_pkg) {
+  var name, pkg
+  if (typeof name_pkg === 'string') {
+    name = name_pkg
+  } else {
+    pkg = name_pkg
+    name = pkg.name || pkg.package.name
+  }
+
+  tree.children = tree.children.filter(function (child) { return child.package.name !== name })
+
+  if (isDepOptional(tree, name)) {
+    return false
+  }
+
+  tree.failed = true
+
+  if (!tree.parent) return true
+
+  for (var ii = 0; ii < tree.requiredBy.length; ++ii) {
+    var requireParent = tree.requiredBy[ii]
+    if (failedDependency(requireParent, tree.package)) {
+      return true
+    }
+  }
+  return false
+}
+
+function andHandleOptionalErrors (log, tree, name, done) {
+  validate('OOSF', arguments)
+  return function (er, child, childLog) {
+    if (!er) validate('OO', [child, childLog])
+    if (!er) return done(er, child, childLog)
+    var isFatal = failedDependency(tree, name)
+    if (er && !isFatal) {
+      tree.children = tree.children.filter(function (child) { return child.package.name !== name })
+      log.warn('install', "Couldn't install optional dependency:", er.message)
+      log.verbose('install', er.stack)
+      return done()
+    } else {
+      return done(er, child, childLog)
+    }
+  }
+}
+
+// Load any missing dependencies in the given tree
+exports.loadDeps = loadDeps
+function loadDeps (tree, log, next) {
+  validate('OOF', arguments)
+  if (tree.loaded || (tree.parent && tree.parent.failed)) return andFinishTracker.now(log, next)
+  if (tree.parent) tree.loaded = true
+  if (!tree.package.dependencies) tree.package.dependencies = {}
+  asyncMap(Object.keys(tree.package.dependencies), function (dep, done) {
+    var version = tree.package.dependencies[dep]
+    if (tree.package.optionalDependencies &&
+        tree.package.optionalDependencies[dep] &&
+        !npm.config.get('optional')) {
+      return done()
+    }
+
+    addDependency(dep, version, tree, log.newGroup('loadDep:' + dep), andHandleOptionalErrors(log, tree, dep, done))
+  }, andForEachChild(loadDeps, andFinishTracker(log, next)))
+}
+
+// Load development dependencies into the given tree
+exports.loadDevDeps = function (tree, log, next) {
+  validate('OOF', arguments)
+  if (!tree.package.devDependencies) return andFinishTracker.now(log, next)
+  asyncMap(Object.keys(tree.package.devDependencies), function (dep, done) {
+    // things defined as both dev dependencies and regular dependencies are treated
+    // as the former
+    if (tree.package.dependencies[dep]) return done()
+
+    var logGroup = log.newGroup('loadDevDep:' + dep)
+    addDependency(dep, tree.package.devDependencies[dep], tree, logGroup, done)
+  }, andForEachChild(loadDeps, andFinishTracker(log, next)))
+}
+
+exports.loadExtraneous = function loadExtraneous (tree, log, next) {
+  var seen = {}
+  function loadExtraneous (tree, log, next) {
+    validate('OOF', arguments)
+    if (seen[tree.path]) return next()
+    seen[tree.path] = true
+    asyncMap(tree.children.filter(function (child) { return !child.loaded }), function (child, done) {
+      resolveWithExistingModule(child, tree, log, done)
+    }, andForEachChild(loadExtraneous, andFinishTracker(log, next)))
+  }
+  loadExtraneous(tree, log, next)
+}
+
+exports.loadExtraneous.andResolveDeps = function (tree, log, next) {
+  validate('OOF', arguments)
+  asyncMap(tree.children.filter(function (child) { return !child.loaded }), function (child, done) {
+    resolveWithExistingModule(child, tree, log, done)
+  }, andForEachChild(loadDeps, andFinishTracker(log, next)))
+}
+
+function addDependency (name, versionSpec, tree, log, done) {
+  validate('SSOOF', arguments)
+  var next = andAddParentToErrors(tree, done)
+  var spec = name + '@' + versionSpec
+  realizePackageSpecifier(spec, packageRelativePath(tree), iferr(done, function (req) {
+    var child = findRequirement(tree, name, req)
+    if (child) {
+      resolveWithExistingModule(child, tree, log, iferr(next, function (child, log) {
+        if (child.package._shrinkwrap === undefined) {
+          readShrinkwrap.andInflate(child, function (er) { next(er, child, log) })
+        } else {
+          next(null, child, log)
+        }
+      }))
+    } else {
+      resolveWithNewModule(req, tree, log, next)
+    }
+  }))
+}
+
+function resolveWithExistingModule (child, tree, log, next) {
+  validate('OOOF', arguments)
+  addRequiredDep(tree, child)
+
+  if (tree.parent && child.parent !== tree) updatePhantomChildren(tree.parent, child)
+
+  next(null, child, log)
+}
+
+var updatePhantomChildren = exports.updatePhantomChildren = function (current, child) {
+  validate('OO', arguments)
+  while (current && current !== child.parent) {
+    // FIXME: phantomChildren doesn't actually belong in the package.json
+    if (!current.package._phantomChildren) current.package._phantomChildren = {}
+    current.package._phantomChildren[child.package.name] = child.package.version
+    current = current.parent
+  }
+}
+
+function flatNameFromTree (tree) {
+  validate('O', arguments)
+  if (!tree.parent) return '/'
+  var path = flatNameFromTree(tree.parent)
+  if (path !== '/') path += '/'
+  return flatName(path, tree)
+}
+
+function resolveWithNewModule (pkg, tree, log, next) {
+  validate('OOOF', arguments)
+  if (pkg.type) {
+    return fetchPackageMetadata(pkg, packageRelativePath(tree), log.newItem('fetchMetadata'), iferr(next, function (pkg) {
+      resolveWithNewModule(pkg, tree, log, next)
+    }))
+  }
+
+  if (!pkg.installable) {
+    log.silly('resolveWithNewModule', getPackageId(pkg), 'checking installable status')
+    return isInstallable(pkg, iferr(next, function () {
+      pkg.installable = true
+      resolveWithNewModule(pkg, tree, log, next)
+    }))
+  }
+
+  if (!pkg._from) {
+    pkg._from = pkg._requested.name + '@' + pkg._requested.spec
+  }
+  addShrinkwrap(pkg, iferr(next, function () {
+    addBundled(pkg, iferr(next, function () {
+      var parent = earliestInstallable(tree, tree, pkg) || tree
+      var child = createChild({
+        package: pkg,
+        parent: parent,
+        path: path.join(parent.path, 'node_modules', pkg.name),
+        realpath: path.resolve(parent.realpath, 'node_modules', pkg.name),
+        children: pkg._bundled || [],
+        isLink: tree.isLink
+      })
+
+      parent.children = parent.children.filter(function (pkg) { return pkg.package.name !== child.package.name })
+      parent.children.push(child)
+      addRequiredDep(tree, child)
+      pkg._location = flatNameFromTree(child)
+
+      if (tree.parent && parent !== tree) updatePhantomChildren(tree.parent, child)
+
+      if (pkg._bundled) {
+        inflateBundled(child, child.children)
+      }
+
+      if (pkg._shrinkwrap && pkg._shrinkwrap.dependencies) {
+        return inflateShrinkwrap(child, pkg._shrinkwrap.dependencies, function (er) {
+          next(er, child, log)
+        })
+      }
+
+      next(null, child, log)
+    }))
+  }))
+}
+
+var validatePeerDeps = exports.validatePeerDeps = function (tree, onInvalid) {
+  if (!tree.package.peerDependencies) return
+  Object.keys(tree.package.peerDependencies).forEach(function (pkgname) {
+    var version = tree.package.peerDependencies[pkgname]
+    var match = findRequirement(tree.parent || tree, pkgname, npa(pkgname + '@' + version))
+    if (!match) onInvalid(tree, pkgname, version)
+  })
+}
+
+exports.validateAllPeerDeps = function (tree, onInvalid) {
+  validateAllPeerDeps(tree, onInvalid, {})
+}
+
+function validateAllPeerDeps (tree, onInvalid, seen) {
+  validate('OFO', arguments)
+  if (seen[tree.path]) return
+  seen[tree.path] = true
+  validatePeerDeps(tree, onInvalid)
+  tree.children.forEach(function (child) { validateAllPeerDeps(child, onInvalid, seen) })
+}
+
+// Determine if a module requirement is already met by the tree at or above
+// our current location in the tree.
+var findRequirement = exports.findRequirement = function (tree, name, requested) {
+  validate('OSO', arguments)
+  var nameMatch = function (child) {
+    return child.package.name === name && child.parent
+  }
+  var versionMatch = function (child) {
+    return doesChildVersionMatch(child, requested)
+  }
+  if (nameMatch(tree)) {
+    // this *is* the module, but it doesn't match the version, so a
+    // new copy will have to be installed
+    return versionMatch(tree) ? tree : null
+  }
+
+  var matches = tree.children.filter(nameMatch)
+  if (matches.length) {
+    matches = matches.filter(versionMatch)
+    // the module exists as a dependent, but the version doesn't match, so
+    // a new copy will have to be installed above here
+    if (matches.length) return matches[0]
+    return null
+  }
+  if (!tree.parent) return null
+  return findRequirement(tree.parent, name, requested)
+}
+
+// Find the highest level in the tree that we can install this module in.
+// If the module isn't installed above us yet, that'd be the very top.
+// If it is, then it's the level below where its installed.
+var earliestInstallable = exports.earliestInstallable = function (requiredBy, tree, pkg) {
+  validate('OOO', arguments)
+  var nameMatch = function (child) {
+    return child.package.name === pkg.name
+  }
+
+  if (tree.children.some(nameMatch)) return null
+
+  // If any of the children of this tree have conflicting
+  // binaries then we need to decline to install this package here.
+  var binaryMatches = tree.children.some(function (child) {
+    return Object.keys(child.package.bin || {}).some(function (bin) {
+      return pkg.bin && pkg.bin[bin]
+    })
+  })
+  if (binaryMatches) return null
+
+  // if this tree location requested the same module then we KNOW it
+  // isn't compatible because if it were findRequirement would have
+  // found that version.
+  if (requiredBy !== tree && tree.package.dependencies && tree.package.dependencies[pkg.name]) {
+    return null
+  }
+
+  // FIXME: phantomChildren doesn't actually belong in the package.json
+  if (tree.package._phantomChildren && tree.package._phantomChildren[pkg.name]) return null
+
+  if (!tree.parent) return tree
+  if (tree.isGlobal) return tree
+
+  return (earliestInstallable(requiredBy, tree.parent, pkg) || tree)
+}
diff --git a/deps/npm/lib/install/diff-trees.js b/deps/npm/lib/install/diff-trees.js
new file mode 100644
index 00000000000000..768bcde55f0fd3
--- /dev/null
+++ b/deps/npm/lib/install/diff-trees.js
@@ -0,0 +1,159 @@
+'use strict'
+var validate = require('aproba')
+var npa = require('npm-package-arg')
+var flattenTree = require('./flatten-tree.js')
+
+function nonRegistrySource (pkg) {
+  validate('O', arguments)
+  var requested = pkg._requested || (pkg._from && npa(pkg._from))
+  if (!requested) return false
+
+  if (requested.type === 'hosted') return true
+  if (requested.type === 'local') return true
+  return false
+}
+
+function pkgAreEquiv (aa, bb) {
+  var aaSha = (aa.dist && aa.dist.shasum) || aa._shasum
+  var bbSha = (bb.dist && bb.dist.shasum) || bb._shasum
+  if (aaSha === bbSha) return true
+  if (aaSha || bbSha) return false
+  if (nonRegistrySource(aa) || nonRegistrySource(bb)) return false
+  if (aa.version === bb.version) return true
+  return false
+}
+
+function getNameAndVersion (pkg) {
+  var versionspec = pkg._shasum
+
+  if (!versionspec && nonRegistrySource(pkg)) {
+    if (pkg._requested) {
+      versionspec = pkg._requested.spec
+    } else if (pkg._from) {
+      versionspec = npa(pkg._from).spec
+    }
+  }
+  if (!versionspec) {
+    versionspec = pkg.version
+  }
+  return pkg.name + '@' + versionspec
+}
+
+function pushAll (aa, bb) {
+  Array.prototype.push.apply(aa, bb)
+}
+
+module.exports = function (oldTree, newTree, differences, log, next) {
+  validate('OOAOF', arguments)
+  pushAll(differences, sortActions(diffTrees(oldTree, newTree)))
+  log.finish()
+  next()
+}
+
+function isLink (node) {
+  return node && node.isLink
+}
+
+function requiredByAllLinked (node) {
+  if (!node.requiredBy.length) return false
+  return node.requiredBy.filter(isLink).length === node.requiredBy.length
+}
+
+function isNotReqByTop (req) {
+  return req !== '/' &&     // '/' is the top level itself
+         req !== '#USER' && // #USER
+         req !== '#EXTRANEOUS'
+}
+
+var sortActions = module.exports.sortActions = function (differences) {
+  var actions = {}
+  differences.forEach(function (action) {
+    var child = action[1]
+    actions[child.package._location] = action
+  })
+
+  var sorted = []
+  var added = {}
+
+  var sortedlocs = Object.keys(actions).sort(sortByLocation)
+
+  // Do top level deps first, this stops the sorting by required order from
+  // unsorting these deps.
+  var toplocs = sortedlocs.filter(function (location) {
+    var mod = actions[location][1]
+    if (!mod.package._requiredBy) return true
+    // If the module is required by ANY non-top level package
+    // then we don't want to include this.
+    return !mod.package._requiredBy.some(isNotReqByTop)
+  })
+
+  toplocs.concat(sortedlocs).forEach(function (location) {
+    sortByDeps(actions[location])
+  })
+
+  function sortByLocation (aa, bb) {
+    return bb.localeCompare(aa)
+  }
+  function sortByDeps (action) {
+    var mod = action[1]
+    if (added[mod.package._location]) return
+    added[mod.package._location] = action
+    mod.package._requiredBy.sort().forEach(function (location) {
+      if (actions[location]) sortByDeps(actions[location])
+    })
+    sorted.unshift(action)
+  }
+
+  return sorted
+}
+
+function diffTrees (oldTree, newTree) {
+  validate('OO', arguments)
+  var differences = []
+  var flatOldTree = flattenTree(oldTree)
+  var flatNewTree = flattenTree(newTree)
+  var toRemove = {}
+  var toRemoveByNameAndVer = {}
+  // find differences
+  Object.keys(flatOldTree).forEach(function (flatname) {
+    if (flatNewTree[flatname]) return
+    var pkg = flatOldTree[flatname]
+    toRemove[flatname] = pkg
+    var namever = getNameAndVersion(pkg.package)
+    if (!toRemoveByNameAndVer[namever]) toRemoveByNameAndVer[namever] = []
+    toRemoveByNameAndVer[namever].push(flatname)
+  })
+  Object.keys(flatNewTree).forEach(function (path) {
+    var pkg = flatNewTree[path]
+    pkg.oldPkg = flatOldTree[path]
+    pkg.isInLink = (pkg.oldPkg && isLink(pkg.oldPkg.parent)) ||
+                   (pkg.parent && isLink(pkg.parent)) ||
+                   requiredByAllLinked(pkg)
+    if (pkg.fromBundle) return
+    if (pkg.oldPkg) {
+      if (!pkg.directlyRequested && pkgAreEquiv(pkg.oldPkg.package, pkg.package)) return
+      if (!pkg.isInLink && (isLink(pkg.oldPkg) || isLink(pkg))) {
+        differences.push(['update-linked', pkg])
+      } else {
+        differences.push(['update', pkg])
+      }
+    } else {
+      var vername = getNameAndVersion(pkg.package)
+      if (toRemoveByNameAndVer[vername] && toRemoveByNameAndVer[vername].length) {
+        var flatname = toRemoveByNameAndVer[vername].shift()
+        pkg.fromPath = toRemove[flatname].path
+        differences.push(['move', pkg])
+        delete toRemove[flatname]
+      } else {
+        differences.push(['add', pkg])
+      }
+    }
+  })
+  Object
+    .keys(toRemove)
+    .map(function (path) { return toRemove[path] })
+    .forEach(function (pkg) {
+      differences.push(['remove', pkg])
+    })
+  return differences
+}
diff --git a/deps/npm/lib/install/exists.js b/deps/npm/lib/install/exists.js
new file mode 100644
index 00000000000000..59100d63ba0d94
--- /dev/null
+++ b/deps/npm/lib/install/exists.js
@@ -0,0 +1,27 @@
+'use strict'
+var fs = require('fs')
+var inflight = require('inflight')
+var accessError = require('./access-error.js')
+var isFsAccessAvailable = require('./is-fs-access-available.js')
+
+if (isFsAccessAvailable) {
+  module.exports = fsAccessImplementation
+} else {
+  module.exports = fsStatImplementation
+}
+
+// exposed only for testing purposes
+module.exports.fsAccessImplementation = fsAccessImplementation
+module.exports.fsStatImplementation = fsStatImplementation
+
+function fsAccessImplementation (dir, done) {
+  done = inflight('exists:' + dir, done)
+  if (!done) return
+  fs.access(dir, fs.F_OK, done)
+}
+
+function fsStatImplementation (dir, done) {
+  done = inflight('exists:' + dir, done)
+  if (!done) return
+  fs.stat(dir, function (er) { done(accessError(dir, er)) })
+}
diff --git a/deps/npm/lib/install/filter-invalid-actions.js b/deps/npm/lib/install/filter-invalid-actions.js
new file mode 100644
index 00000000000000..55278ed829d2dd
--- /dev/null
+++ b/deps/npm/lib/install/filter-invalid-actions.js
@@ -0,0 +1,36 @@
+'use strict'
+var path = require('path')
+var validate = require('aproba')
+var log = require('npmlog')
+var getPackageId = require('./get-package-id.js')
+
+module.exports = function (top, differences, next) {
+  validate('SAF', arguments)
+  var action
+  var keep = []
+
+  differences.forEach(function (action) {
+    var cmd = action[0]
+    var pkg = action[1]
+    if (cmd === 'remove') {
+      pkg.removing = true
+    }
+  })
+
+  /*eslint no-cond-assign:0*/
+  while (action = differences.shift()) {
+    var cmd = action[0]
+    var pkg = action[1]
+    if (pkg.isInLink || pkg.parent.target || pkg.parent.isLink) {
+      // we want to skip warning if this is a child of another module that we're removing
+      if (!pkg.parent.removing) {
+        log.warn('skippingAction', 'Module is inside a symlinked module: not running ' +
+          cmd + ' ' + getPackageId(pkg) + ' ' + path.relative(top, pkg.path))
+      }
+    } else {
+      keep.push(action)
+    }
+  }
+  differences.push.apply(differences, keep)
+  next()
+}
diff --git a/deps/npm/lib/install/flatten-tree.js b/deps/npm/lib/install/flatten-tree.js
new file mode 100644
index 00000000000000..a0c6b7a79d1508
--- /dev/null
+++ b/deps/npm/lib/install/flatten-tree.js
@@ -0,0 +1,29 @@
+'use strict'
+var validate = require('aproba')
+
+module.exports = function (tree) {
+  validate('O', arguments)
+  var seen = {}
+  var flat = {}
+  var todo = [[tree, '/']]
+  while (todo.length) {
+    var next = todo.shift()
+    var pkg = next[0]
+    seen[pkg.path] = true
+    var path = next[1]
+    flat[path] = pkg
+    if (path !== '/') path += '/'
+    for (var ii = 0; ii < pkg.children.length; ++ii) {
+      var child = pkg.children[ii]
+      if (!seen[child.path]) {
+        todo.push([child, flatName(path, child)])
+      }
+    }
+  }
+  return flat
+}
+
+var flatName = module.exports.flatName = function (path, child) {
+  validate('SO', arguments)
+  return path + (child.package.name || 'TOP')
+}
diff --git a/deps/npm/lib/install/get-package-id.js b/deps/npm/lib/install/get-package-id.js
new file mode 100644
index 00000000000000..076eb1423a2fd5
--- /dev/null
+++ b/deps/npm/lib/install/get-package-id.js
@@ -0,0 +1,19 @@
+'use strict'
+var path = require('path')
+
+module.exports = function (tree) {
+  var pkg = tree.package || tree
+  // FIXME: Excluding the '@' here is cleaning up after the mess that
+  // read-package-json makes. =(
+  if (pkg._id && pkg._id !== '@') return pkg._id
+  var name = pkg.name || (tree && tree.logical && path.basename(tree.logical))
+  if (name && pkg.version) {
+    return name + '@' + pkg.version
+  } else if (tree) {
+    return tree.path
+  } else if (name) {
+    return name
+  } else {
+    return ''
+  }
+}
diff --git a/deps/npm/lib/install/inflate-bundled.js b/deps/npm/lib/install/inflate-bundled.js
new file mode 100644
index 00000000000000..c27acd1dc0f4c4
--- /dev/null
+++ b/deps/npm/lib/install/inflate-bundled.js
@@ -0,0 +1,15 @@
+'use strict'
+var path = require('path')
+var validate = require('aproba')
+
+module.exports = function inflateBundled (parent, children) {
+  validate('OA', arguments)
+  children.forEach(function (child) {
+    child.fromBundle = true
+    child.parent = parent
+    child.path = path.join(parent.path, child.package.name)
+    child.realpath = path.resolve(parent.realpath, child.package.name)
+    child.isLink = child.isLink || parent.isLink || parent.target
+    inflateBundled(child, child.children)
+  })
+}
diff --git a/deps/npm/lib/install/inflate-shrinkwrap.js b/deps/npm/lib/install/inflate-shrinkwrap.js
new file mode 100644
index 00000000000000..dd32583f6da829
--- /dev/null
+++ b/deps/npm/lib/install/inflate-shrinkwrap.js
@@ -0,0 +1,58 @@
+'use strict'
+var path = require('path')
+var url = require('url')
+var asyncMap = require('slide').asyncMap
+var validate = require('aproba')
+var iferr = require('iferr')
+var fetchPackageMetadata = require('../fetch-package-metadata.js')
+var addShrinkwrap = require('../fetch-package-metadata.js').addShrinkwrap
+var addBundled = require('../fetch-package-metadata.js').addBundled
+var inflateBundled = require('./inflate-bundled.js')
+var npm = require('../npm.js')
+var createChild = require('./node.js').create
+
+var inflateShrinkwrap = module.exports = function (tree, swdeps, finishInflating) {
+  validate('OOF', arguments)
+  if (!npm.config.get('shrinkwrap')) return finishInflating()
+  var onDisk = {}
+  tree.children.forEach(function (child) { onDisk[child.package.name] = child })
+  tree.children = []
+  asyncMap(Object.keys(swdeps), function (name, next) {
+    var sw = swdeps[name]
+    var spec = sw.resolved
+             ? name + '@' + sw.resolved
+             : (sw.from && url.parse(sw.from).protocol)
+             ? name + '@' + sw.from
+             : name + '@' + sw.version
+    var child = onDisk[name]
+    if (child && (child.fromShrinkwrap ||
+                  (sw.resolved && child.package._resolved === sw.resolved) ||
+                  (sw.from && url.parse(sw.from).protocol && child.package._from === sw.from) ||
+                  child.package.version === sw.version)) {
+      if (!child.fromShrinkwrap) child.fromShrinkwrap = spec
+      tree.children.push(child)
+      return next()
+    }
+    fetchPackageMetadata(spec, tree.path, iferr(next, function (pkg) {
+      pkg._from = sw.from || spec
+      addShrinkwrap(pkg, iferr(next, function () {
+        addBundled(pkg, iferr(next, function () {
+          var child = createChild({
+            package: pkg,
+            loaded: false,
+            parent: tree,
+            fromShrinkwrap: spec,
+            path: path.join(tree.path, 'node_modules', pkg.name),
+            realpath: path.resolve(tree.realpath, 'node_modules', pkg.name),
+            children: pkg._bundled || []
+          })
+          tree.children.push(child)
+          if (pkg._bundled) {
+            inflateBundled(child, child.children)
+          }
+          inflateShrinkwrap(child, sw.dependencies || {}, next)
+        }))
+      }))
+    }))
+  }, finishInflating)
+}
diff --git a/deps/npm/lib/install/is-dev.js b/deps/npm/lib/install/is-dev.js
new file mode 100644
index 00000000000000..b1f2c4b6614975
--- /dev/null
+++ b/deps/npm/lib/install/is-dev.js
@@ -0,0 +1,7 @@
+'use strict'
+var isDev = exports.isDev = function (node) {
+  return node.package._requiredBy.some(function (req) { return req === '#DEV:/' })
+}
+exports.isOnlyDev = function (node) {
+  return node.package._requiredBy.length === 1 && isDev(node)
+}
diff --git a/deps/npm/lib/install/is-extraneous.js b/deps/npm/lib/install/is-extraneous.js
new file mode 100644
index 00000000000000..cd4d954668426a
--- /dev/null
+++ b/deps/npm/lib/install/is-extraneous.js
@@ -0,0 +1,14 @@
+'use strict'
+var path = require('path')
+var isDev = require('./is-dev.js').isDev
+var npm = require('../npm.js')
+
+module.exports = function (tree) {
+  var pkg = tree.package
+  var requiredBy = pkg._requiredBy.filter(function (req) { return req[0] !== '#' })
+  var isTopLevel = tree.parent == null
+  var isChildOfTop = !isTopLevel && tree.parent.parent == null
+  var isTopGlobal = isChildOfTop && tree.parent.path === path.resolve(npm.globalDir, '..')
+  var topHasNoPackageJson = isChildOfTop && tree.parent.error
+  return !isTopLevel && (!isChildOfTop || !topHasNoPackageJson) && !isTopGlobal && requiredBy.length === 0 && !isDev(tree)
+}
diff --git a/deps/npm/lib/install/is-fs-access-available.js b/deps/npm/lib/install/is-fs-access-available.js
new file mode 100644
index 00000000000000..a7d2640d794b5d
--- /dev/null
+++ b/deps/npm/lib/install/is-fs-access-available.js
@@ -0,0 +1,22 @@
+'use strict'
+var fs = require('fs')
+var semver = require('semver')
+var isWindows = process.platform === 'win32'
+
+// fs.access first introduced in node 0.12 / io.js
+if (!fs.access) {
+  module.exports = false
+} else if (!isWindows) {
+  // fs.access always works on non-Windows OSes
+  module.exports = true
+} else {
+  // The Windows implementation of `fs.access` has a bug where it will
+  // sometimes return access errors all the time for directories, even
+  // when access is available. As all we actually test ARE directories, this
+  // is a bit of a problem.
+  // This was fixed in io.js version 1.5.0
+  // As of 2015-07-20, it is still unfixed in node:
+  // https://github.com/joyent/node/issues/25657
+
+  module.exports = semver.gte(process.version, '1.5.0')
+}
diff --git a/deps/npm/lib/install/mutate-into-logical-tree.js b/deps/npm/lib/install/mutate-into-logical-tree.js
new file mode 100644
index 00000000000000..0fbedcb9d27fe8
--- /dev/null
+++ b/deps/npm/lib/install/mutate-into-logical-tree.js
@@ -0,0 +1,112 @@
+'use strict'
+var union = require('lodash.union')
+var without = require('lodash.without')
+var validate = require('aproba')
+var flattenTree = require('./flatten-tree.js')
+var isExtraneous = require('./is-extraneous.js')
+var validateAllPeerDeps = require('./deps.js').validateAllPeerDeps
+var getPackageId = require('./get-package-id.js')
+
+var mutateIntoLogicalTree = module.exports = function (tree) {
+  validate('O', arguments)
+
+  validateAllPeerDeps(tree, function (tree, pkgname, version) {
+    if (!tree.missingPeers) tree.missingPeers = {}
+    tree.missingPeers[pkgname] = version
+  })
+
+  var flat = flattenTree(tree)
+
+  function getNode (flatname) {
+    return flatname.substr(0, 5) === '#DEV:' ?
+           flat[flatname.substr(5)] :
+           flat[flatname]
+  }
+
+  Object.keys(flat).sort().forEach(function (flatname) {
+    var node = flat[flatname]
+    var requiredBy = node.package._requiredBy || []
+    var requiredByNames = requiredBy.filter(function (parentFlatname) {
+      var parentNode = getNode(parentFlatname)
+      if (!parentNode) return false
+      return parentNode.package.dependencies[node.package.name] ||
+             (parentNode.package.devDependencies && parentNode.package.devDependencies[node.package.name])
+    })
+    requiredBy = requiredByNames.map(getNode)
+
+    node.requiredBy = requiredBy
+
+    if (!requiredBy.length) return
+
+    if (node.parent) node.parent.children = without(node.parent.children, node)
+
+    requiredBy.forEach(function (parentNode) {
+      parentNode.children = union(parentNode.children, [node])
+    })
+    if (node.package._requiredBy.some(function (nodename) { return nodename[0] === '#' })) {
+      tree.children = union(tree.children, [node])
+    }
+  })
+  return tree
+}
+
+module.exports.asReadInstalled = function (tree) {
+  mutateIntoLogicalTree(tree)
+  return translateTree(tree)
+}
+
+function translateTree (tree) {
+  return translateTree_(tree, {})
+}
+
+function translateTree_ (tree, seen) {
+  var pkg = tree.package
+  if (seen[tree.path]) return pkg
+  seen[tree.path] = pkg
+  if (pkg._dependencies) return pkg
+  pkg._dependencies = pkg.dependencies
+  pkg.dependencies = {}
+  tree.children.forEach(function (child) {
+    pkg.dependencies[child.package.name] = translateTree_(child, seen)
+  })
+  Object.keys(tree.missingDeps).forEach(function (name) {
+    if (pkg.dependencies[name]) {
+      pkg.dependencies[name].invalid = true
+      pkg.dependencies[name].realName = name
+      pkg.dependencies[name].extraneous = false
+    } else {
+      pkg.dependencies[name] = {
+        requiredBy: tree.missingDeps[name],
+        missing: true,
+        optional: !!pkg.optionalDependencies[name]
+      }
+    }
+  })
+  var checkForMissingPeers = (tree.parent ? [] : [tree]).concat(tree.children)
+  checkForMissingPeers.filter(function (child) {
+    return child.missingPeers
+  }).forEach(function (child) {
+    Object.keys(child.missingPeers).forEach(function (pkgname) {
+      var version = child.missingPeers[pkgname]
+      var peerPkg = pkg.dependencies[pkgname]
+      if (!peerPkg) {
+        peerPkg = pkg.dependencies[pkgname] = {
+          _id: pkgname + '@' + version,
+          name: pkgname,
+          version: version
+        }
+      }
+      if (!peerPkg.peerMissing) peerPkg.peerMissing = []
+      peerPkg.peerMissing.push({
+        requiredBy: getPackageId(child),
+        requires: pkgname + '@' + version
+      })
+    })
+  })
+  pkg.path = tree.path
+
+  pkg.error = tree.error
+  pkg.extraneous = isExtraneous(tree)
+  if (tree.target && tree.parent && !tree.parent.target) pkg.link = tree.realpath
+  return pkg
+}
diff --git a/deps/npm/lib/install/node.js b/deps/npm/lib/install/node.js
new file mode 100644
index 00000000000000..c76dc765ba493c
--- /dev/null
+++ b/deps/npm/lib/install/node.js
@@ -0,0 +1,61 @@
+'use strict'
+
+var defaultTemplate = {
+  package: {
+    dependencies: {},
+    devDependencies: {},
+    optionalDependencies: {},
+    _requiredBy: [],
+    _phantomChildren: {}
+  },
+  loaded: false,
+  children: [],
+  requiredBy: [],
+  requires: [],
+  missingDeps: {},
+  missingDevDeps: {},
+  path: null,
+  realpath: null,
+  userRequired: false,
+  existing: false
+}
+
+function isLink (node) {
+  return node && node.isLink
+}
+
+var create = exports.create = function (node, template) {
+  if (!template) template = defaultTemplate
+  Object.keys(template).forEach(function (key) {
+    if (template[key] != null && typeof template[key] === 'object' && !(template[key] instanceof Array)) {
+      if (!node[key]) node[key] = {}
+      return create(node[key], template[key])
+    }
+    if (node[key] != null) return
+    node[key] = template[key]
+  })
+  if (isLink(node) || isLink(node.parent)) {
+    node.isLink = true
+  }
+  return node
+}
+
+exports.reset = function (node) {
+  reset(node, {})
+}
+
+function reset (node, seen) {
+  if (seen[node.path]) return
+  seen[node.path] = true
+  var child = create(node)
+  child.package._requiredBy = child.package._requiredBy.filter(function (req) {
+    return req[0] === '#'
+  })
+  child.requiredBy = []
+  child.package._phantomChildren = {}
+  // FIXME: cleaning up after read-package-json's mess =(
+  if (child.package._id === '@') delete child.package._id
+  child.missingDeps = {}
+  child.children.forEach(function (child) { reset(child, seen) })
+  if (!child.package.version) child.package.version = ''
+}
diff --git a/deps/npm/lib/install/prune-tree.js b/deps/npm/lib/install/prune-tree.js
new file mode 100644
index 00000000000000..eb3edf4f75bafc
--- /dev/null
+++ b/deps/npm/lib/install/prune-tree.js
@@ -0,0 +1,36 @@
+'use strict'
+var validate = require('aproba')
+var flattenTree = require('./flatten-tree.js')
+
+function isNotPackage (mod) {
+  return function (parentMod) { return mod !== parentMod }
+}
+
+module.exports = function pruneTree (tree) {
+  validate('O', arguments)
+  var flat = flattenTree(tree)
+  // we just do this repeatedly until there are no more orphaned packages
+  // which isn't as effecient as it could be on a REALLY big tree
+  // but we'll face that if it proves to be an issue
+  var removedPackage
+  do {
+    removedPackage = false
+    Object.keys(flat).forEach(function (flatname) {
+      var child = flat[flatname]
+      if (!child.parent) return
+      child.package._requiredBy = (child.package._requiredBy || []).filter(function (req) {
+        var isDev = req.substr(0, 4) === '#DEV'
+        if (req[0] === '#' && !isDev) return true
+        if (flat[req]) return true
+        if (!isDev) return false
+        var reqChildAsDevDep = flat[req.substr(5)]
+        return reqChildAsDevDep && !reqChildAsDevDep.parent
+      })
+      if (!child.package._requiredBy.length) {
+        removedPackage = true
+        delete flat[flatname]
+        child.parent.children = child.parent.children.filter(isNotPackage(child))
+      }
+    })
+  } while (removedPackage)
+}
diff --git a/deps/npm/lib/install/read-shrinkwrap.js b/deps/npm/lib/install/read-shrinkwrap.js
new file mode 100644
index 00000000000000..35180b688dbadc
--- /dev/null
+++ b/deps/npm/lib/install/read-shrinkwrap.js
@@ -0,0 +1,32 @@
+'use strict'
+var path = require('path')
+var fs = require('graceful-fs')
+var iferr = require('iferr')
+var inflateShrinkwrap = require('./inflate-shrinkwrap.js')
+var parseJSON = require('../utils/parse-json.js')
+
+var readShrinkwrap = module.exports = function (child, next) {
+  fs.readFile(path.join(child.path, 'npm-shrinkwrap.json'), function (er, data) {
+    if (er) {
+      child.package._shrinkwrap = null
+      return next()
+    }
+    try {
+      child.package._shrinkwrap = parseJSON(data)
+    } catch (ex) {
+      child.package._shrinkwrap = null
+      return next(ex)
+    }
+    return next()
+  })
+}
+
+module.exports.andInflate = function (child, next) {
+  readShrinkwrap(child, iferr(next, function () {
+    if (child.package._shrinkwrap) {
+      return inflateShrinkwrap(child, child.package._shrinkwrap.dependencies || {}, next)
+    } else {
+      return next()
+    }
+  }))
+}
diff --git a/deps/npm/lib/install/save.js b/deps/npm/lib/install/save.js
new file mode 100644
index 00000000000000..dffd3a0cd5d176
--- /dev/null
+++ b/deps/npm/lib/install/save.js
@@ -0,0 +1,199 @@
+'use strict'
+var fs = require('graceful-fs')
+var path = require('path')
+var url = require('url')
+var writeFileAtomic = require('write-file-atomic')
+var log = require('npmlog')
+var semver = require('semver')
+var iferr = require('iferr')
+var validate = require('aproba')
+var without = require('lodash.without')
+var npm = require('../npm.js')
+var deepSortObject = require('../utils/deep-sort-object.js')
+var parseJSON = require('../utils/parse-json.js')
+
+// if the -S|--save option is specified, then write installed packages
+// as dependencies to a package.json file.
+
+exports.saveRequested = function (args, tree, andReturn) {
+  validate('AOF', arguments)
+  savePackageJson(args, tree, andWarnErrors(andSaveShrinkwrap(tree, andReturn)))
+}
+
+function andSaveShrinkwrap (tree, andReturn) {
+  validate('OF', arguments)
+  return function (er) {
+    validate('E', arguments)
+    saveShrinkwrap(tree, andWarnErrors(andReturn))
+  }
+}
+
+function andWarnErrors (cb) {
+  validate('F', arguments)
+  return function (er) {
+    if (er) log.warn('saveError', er.message)
+    arguments[0] = null
+    cb.apply(null, arguments)
+  }
+}
+
+function saveShrinkwrap (tree, next) {
+  validate('OF', arguments)
+  var saveTarget = path.resolve(tree.path, 'npm-shrinkwrap.json')
+  fs.stat(saveTarget, function (er, stat) {
+    if (er) return next()
+    var save = npm.config.get('save')
+    var saveDev = npm.config.get('save-dev')
+    var saveOptional = npm.config.get('save-optional')
+    if (!saveOptional && saveDev) return next()
+    if (saveOptional || !save) return next()
+    npm.commands.shrinkwrap([], true, next)
+  })
+}
+
+function savePackageJson (args, tree, next) {
+  validate('AOF', arguments)
+  var saveBundle = npm.config.get('save-bundle')
+
+  // each item in the tree is a top-level thing that should be saved
+  // to the package.json file.
+  // The relevant tree shape is { <folder>: {what:<pkg>} }
+  var saveTarget = path.resolve(tree.path, 'package.json')
+  // don't use readJson, because we don't want to do all the other
+  // tricky npm-specific stuff that's in there.
+  fs.readFile(saveTarget, iferr(next, function (packagejson) {
+    try {
+      packagejson = parseJSON(packagejson)
+    } catch (ex) {
+      return next(ex)
+    }
+
+    // If we're saving bundled deps, normalize the key before we start
+    if (saveBundle) {
+      var bundle = packagejson.bundleDependencies || packagejson.bundledDependencies
+      delete packagejson.bundledDependencies
+      if (!Array.isArray(bundle)) bundle = []
+    }
+
+    var toSave = getThingsToSave(tree)
+    var toRemove = getThingsToRemove(args, tree)
+    var savingTo = {}
+    toSave.forEach(function (pkg) { savingTo[pkg.save] = true })
+    toRemove.forEach(function (pkg) { savingTo[pkg.save] = true })
+
+    Object.keys(savingTo).forEach(function (save) {
+      if (!packagejson[save]) packagejson[save] = {}
+    })
+
+    log.verbose('saving', toSave)
+    toSave.forEach(function (pkg) {
+      packagejson[pkg.save][pkg.name] = pkg.spec
+      if (saveBundle) {
+        var ii = bundle.indexOf(pkg.name)
+        if (ii === -1) bundle.push(pkg.name)
+      }
+    })
+
+    toRemove.forEach(function (pkg) {
+      delete packagejson[pkg.save][pkg.name]
+      if (saveBundle) {
+        bundle = without(bundle, pkg.name)
+      }
+    })
+
+    Object.keys(savingTo).forEach(function (key) {
+      packagejson[key] = deepSortObject(packagejson[key])
+    })
+    if (saveBundle) {
+      packagejson.bundledDependencies = deepSortObject(bundle)
+    }
+
+    var json = JSON.stringify(packagejson, null, 2) + '\n'
+    writeFileAtomic(saveTarget, json, next)
+  }))
+}
+
+var getSaveType = exports.getSaveType = function (args) {
+  validate('A', arguments)
+  var nothingToSave = !args.length
+  var globalInstall = npm.config.get('global')
+  var noSaveFlags = !npm.config.get('save') &&
+                    !npm.config.get('save-dev') &&
+                    !npm.config.get('save-optional')
+  if (nothingToSave || globalInstall || noSaveFlags) return null
+
+  if (npm.config.get('save-optional')) return 'optionalDependencies'
+  else if (npm.config.get('save-dev')) return 'devDependencies'
+  else return 'dependencies'
+}
+
+function computeVersionSpec (child) {
+  validate('O', arguments)
+  var requested = child.package._requested
+  if (!requested || requested.type === 'tag') {
+    requested = {
+      type: 'version',
+      spec: child.package.version
+    }
+  }
+  if (requested.type === 'version' || requested.type === 'range') {
+    var version = child.package.version
+    var rangeDescriptor = ''
+    if (semver.valid(version, true) &&
+        semver.gte(version, '0.1.0', true) &&
+        !npm.config.get('save-exact')) {
+      rangeDescriptor = npm.config.get('save-prefix')
+    }
+    return rangeDescriptor + version
+  } else if (requested.type === 'directory' || requested.type === 'local') {
+    var relativePath = path.relative(child.parent.path, requested.spec)
+    if (/^[.][.]/.test(relativePath)) {
+      return url.format({
+        protocol: 'file',
+        slashes: true,
+        pathname: requested.spec
+      })
+    } else {
+      return url.format({
+        protocol: 'file',
+        slashes: false,
+        pathname: relativePath
+      })
+    }
+  } else {
+    return requested.spec
+  }
+}
+
+function getThingsToSave (tree) {
+  validate('O', arguments)
+  var toSave = tree.children.filter(function (child) {
+    return child.save
+  }).map(function (child) {
+    return {
+      name: child.package.name,
+      spec: computeVersionSpec(child),
+      save: child.save
+    }
+  })
+  return toSave
+}
+
+function getThingsToRemove (args, tree) {
+  validate('AO', arguments)
+  if (!tree.removed) return []
+  var toRemove = tree.removed.map(function (child) {
+    return {
+      name: child.package.name,
+      save: child.save
+    }
+  })
+  var saveType = getSaveType(args)
+  args.forEach(function (arg) {
+    toRemove.push({
+      name: arg,
+      save: saveType
+    })
+  })
+  return toRemove
+}
diff --git a/deps/npm/lib/install/update-package-json.js b/deps/npm/lib/install/update-package-json.js
new file mode 100644
index 00000000000000..97b2f05bb0fa97
--- /dev/null
+++ b/deps/npm/lib/install/update-package-json.js
@@ -0,0 +1,18 @@
+'use strict'
+var path = require('path')
+var writeFileAtomic = require('write-file-atomic')
+var deepSortObject = require('../utils/deep-sort-object.js')
+
+module.exports = function (pkg, buildpath, next) {
+  // FIXME: This bundled dance is because we're sticking a big tree of bundled
+  // deps into the parsed package.json– it probably doesn't belong there =/
+  // But the real reason we don't just dump it out is that it's the result
+  // of npm-read-tree, which produces circular data structures, due to the
+  // parent and children keys.
+  var bundled = pkg.package._bundled
+  delete pkg.package._bundled // FIXME
+  var packagejson = deepSortObject(pkg.package)
+  var data = JSON.stringify(packagejson, null, 2) + '\n'
+  pkg.package._bundled = bundled
+  writeFileAtomic(path.resolve(buildpath, 'package.json'), data, next)
+}
diff --git a/deps/npm/lib/install/validate-args.js b/deps/npm/lib/install/validate-args.js
new file mode 100644
index 00000000000000..75ae3e362ad036
--- /dev/null
+++ b/deps/npm/lib/install/validate-args.js
@@ -0,0 +1,44 @@
+'use strict'
+var validate = require('aproba')
+var asyncMap = require('slide').asyncMap
+var chain = require('slide').chain
+var npmInstallChecks = require('npm-install-checks')
+var checkEngine = npmInstallChecks.checkEngine
+var checkPlatform = npmInstallChecks.checkPlatform
+var npm = require('../npm.js')
+
+module.exports = function (idealTree, args, next) {
+  validate('OAF', arguments)
+  var force = npm.config.get('force')
+
+  asyncMap(args, function (pkg, done) {
+    chain([
+      [checkSelf, idealTree, pkg, force],
+      [isInstallable, pkg]
+    ], done)
+  }, next)
+}
+
+var isInstallable = module.exports.isInstallable = function (pkg, next) {
+  var force = npm.config.get('force')
+  var nodeVersion = npm.config.get('node-version')
+  var strict = npm.config.get('engine-strict')
+  chain([
+    [checkEngine, pkg, npm.version, nodeVersion, force, strict],
+    [checkPlatform, pkg, force]
+  ], next)
+}
+
+function checkSelf (idealTree, pkg, force, next) {
+  if (idealTree.package.name !== pkg.name) return next()
+  if (force) {
+    var warn = new Error("Wouldn't install " + pkg.name + ' as a dependency of itself, but being forced')
+    warn.code = 'ENOSELF'
+    idealTree.warnings.push(warn)
+    next()
+  } else {
+    var er = new Error('Refusing to install ' + pkg.name + ' as a dependency of itself')
+    er.code = 'ENOSELF'
+    next(er)
+  }
+}
diff --git a/deps/npm/lib/install/validate-tree.js b/deps/npm/lib/install/validate-tree.js
new file mode 100644
index 00000000000000..f09abedcbee6e0
--- /dev/null
+++ b/deps/npm/lib/install/validate-tree.js
@@ -0,0 +1,69 @@
+'use strict'
+var path = require('path')
+var validate = require('aproba')
+var asyncMap = require('slide').asyncMap
+var chain = require('slide').chain
+var npmInstallChecks = require('npm-install-checks')
+var checkGit = npmInstallChecks.checkGit
+var clone = require('lodash.clonedeep')
+var normalizePackageData = require('normalize-package-data')
+var npm = require('../npm.js')
+var andFinishTracker = require('./and-finish-tracker.js')
+var flattenTree = require('./flatten-tree.js')
+var validateAllPeerDeps = require('./deps.js').validateAllPeerDeps
+var getPackageId = require('./get-package-id.js')
+
+module.exports = function (idealTree, log, next) {
+  validate('OOF', arguments)
+  var moduleMap = flattenTree(idealTree)
+  var modules = Object.keys(moduleMap).map(function (name) { return moduleMap[name] })
+
+  chain([
+    [asyncMap, modules, function (mod, done) {
+      chain([
+        mod.parent && !mod.isLink && [checkGit, mod.realpath],
+        [checkErrors, mod, idealTree]
+      ], done)
+    }],
+    [thenValidateAllPeerDeps, idealTree],
+    [thenCheckTop, idealTree]
+  ], andFinishTracker(log, next))
+}
+
+function checkErrors (mod, idealTree, next) {
+  if (mod.error && (mod.parent || path.resolve(npm.globalDir, '..') !== mod.path)) idealTree.warnings.push(mod.error)
+  next()
+}
+
+function thenValidateAllPeerDeps (idealTree, next) {
+  validate('OF', arguments)
+  validateAllPeerDeps(idealTree, function (tree, pkgname, version) {
+    var warn = new Error(getPackageId(tree) + ' requires a peer of ' + pkgname + '@' +
+      version + ' but none was installed.')
+    warn.code = 'EPEERINVALID'
+    idealTree.warnings.push(warn)
+  })
+  next()
+}
+
+function thenCheckTop (idealTree, next) {
+  validate('OF', arguments)
+  if (idealTree.package.error) return next()
+
+  // FIXME: when we replace read-package-json with something less magic,
+  // this should done elsewhere.
+  // As it is, the package has already been normalized and thus some
+  // errors are suppressed.
+  var pkg = clone(idealTree.package)
+  try {
+    normalizePackageData(pkg, function (warn) {
+      var warnObj = new Error(getPackageId(idealTree) + ' ' + warn)
+      warnObj.code = 'EPACKAGEJSON'
+      idealTree.warnings.push(warnObj)
+    }, false)
+  } catch (er) {
+    er.code = 'EPACKAGEJSON'
+    idealTree.warnings.push(er)
+  }
+  next()
+}
diff --git a/deps/npm/lib/install/writable.js b/deps/npm/lib/install/writable.js
new file mode 100644
index 00000000000000..199b48f5970688
--- /dev/null
+++ b/deps/npm/lib/install/writable.js
@@ -0,0 +1,35 @@
+'use strict'
+var path = require('path')
+var fs = require('fs')
+var inflight = require('inflight')
+var accessError = require('./access-error.js')
+var andIgnoreErrors = require('./and-ignore-errors.js')
+var isFsAccessAvailable = require('./is-fs-access-available.js')
+
+if (isFsAccessAvailable) {
+  module.exports = fsAccessImplementation
+} else {
+  module.exports = fsOpenImplementation
+}
+
+// exposed only for testing purposes
+module.exports.fsAccessImplementation = fsAccessImplementation
+module.exports.fsOpenImplementation = fsOpenImplementation
+
+function fsAccessImplementation (dir, done) {
+  done = inflight('writable:' + dir, done)
+  if (!done) return
+  fs.access(dir, fs.W_OK, done)
+}
+
+function fsOpenImplementation (dir, done) {
+  done = inflight('writable:' + dir, done)
+  if (!done) return
+  var tmp = path.join(dir, '.npm.check.permissions')
+  fs.open(tmp, 'w', function (er, fd) {
+    if (er) return done(accessError(dir, er))
+    fs.close(fd, function () {
+      fs.unlink(tmp, andIgnoreErrors(done))
+    })
+  })
+}
diff --git a/deps/npm/lib/link.js b/deps/npm/lib/link.js
index 19c5dd062906e6..9a62b063384b7e 100644
--- a/deps/npm/lib/link.js
+++ b/deps/npm/lib/link.js
@@ -1,20 +1,21 @@
 // link with no args: symlink the folder to the global location
 // link with package arg: symlink the global to the local
 
-var npm = require("./npm.js")
-  , symlink = require("./utils/link.js")
-  , fs = require("graceful-fs")
-  , log = require("npmlog")
-  , asyncMap = require("slide").asyncMap
-  , chain = require("slide").chain
-  , path = require("path")
-  , build = require("./build.js")
-  , npa = require("npm-package-arg")
+var npm = require('./npm.js')
+var symlink = require('./utils/link.js')
+var fs = require('graceful-fs')
+var log = require('npmlog')
+var asyncMap = require('slide').asyncMap
+var chain = require('slide').chain
+var path = require('path')
+var build = require('./build.js')
+var npa = require('npm-package-arg')
 
 module.exports = link
 
-link.usage = "npm link (in package dir)"
-           + "\nnpm link <pkg> (link global into local)"
+link.usage = 'npm link (in package dir)' +
+             '\nnpm link [<@scope>/]<pkg>[@<version>]' +
+             '\n\nalias: npm ln'
 
 link.completion = function (opts, cb) {
   var dir = npm.globalDir
@@ -37,30 +38,44 @@ function link (args, cb) {
     }
   }
 
-  if (npm.config.get("global")) {
-    return cb(new Error("link should never be --global.\n"
-                       +"Please re-run this command with --local"))
+  if (npm.config.get('global')) {
+    return cb(new Error(
+      'link should never be --global.\n' +
+      'Please re-run this command with --local'
+    ))
   }
 
-  if (args.length === 1 && args[0] === ".") args = []
+  if (args.length === 1 && args[0] === '.') args = []
   if (args.length) return linkInstall(args, cb)
   linkPkg(npm.prefix, cb)
 }
 
+function parentFolder (id, folder) {
+  if (id[0] === '@') {
+    return path.resolve(folder, '..', '..')
+  } else {
+    return path.resolve(folder, '..')
+  }
+}
+
 function linkInstall (pkgs, cb) {
   asyncMap(pkgs, function (pkg, cb) {
-    var t = path.resolve(npm.globalDir, "..")
-      , pp = path.resolve(npm.globalDir, pkg)
-      , rp = null
-      , target = path.resolve(npm.dir, pkg)
+    var t = path.resolve(npm.globalDir, '..')
+    var pp = path.resolve(npm.globalDir, pkg)
+    var rp = null
+    var target = path.resolve(npm.dir, pkg)
 
     function n (er, data) {
       if (er) return cb(er, data)
-      // install returns [ [folder, pkgId], ... ]
-      // but we definitely installed just one thing.
-      var d = data.filter(function (d) { return !d[3] })
-      var what = npa(d[0][0])
-      pp = d[0][1]
+      // we want the ONE thing that was installed into the global dir
+      var installed = data.filter(function (info) {
+        var id = info[0]
+        var folder = info[1]
+        return parentFolder(id, folder) === npm.globalDir
+      })
+      var id = installed[0][0]
+      pp = installed[0][1]
+      var what = npa(id)
       pkg = what.name
       target = path.resolve(npm.dir, pkg)
       next()
@@ -68,7 +83,7 @@ function linkInstall (pkgs, cb) {
 
     // if it's a folder, a random not-installed thing, or not a scoped package,
     // then link or install it first
-    if (pkg[0] !== "@" && (pkg.indexOf("/") !== -1 || pkg.indexOf("\\") !== -1)) {
+    if (pkg[0] !== '@' && (pkg.indexOf('/') !== -1 || pkg.indexOf('\\') !== -1)) {
       return fs.lstat(path.resolve(pkg), function (er, st) {
         if (er || !st.isDirectory()) {
           npm.commands.install(t, pkg, n)
@@ -82,13 +97,13 @@ function linkInstall (pkgs, cb) {
     fs.lstat(pp, function (er, st) {
       if (er) {
         rp = pp
-        return npm.commands.install(t, pkg, n)
+        return npm.commands.install(t, [pkg], n)
       } else if (!st.isSymbolicLink()) {
         rp = pp
         next()
       } else {
         return fs.realpath(pp, function (er, real) {
-          if (er) log.warn("invalid symbolic link", pkg)
+          if (er) log.warn('invalid symbolic link', pkg)
           else rp = real
           next()
         })
@@ -96,39 +111,44 @@ function linkInstall (pkgs, cb) {
     })
 
     function next () {
-      chain
-        ( [ [function (cb) {
-              log.verbose("link", "symlinking %s to %s",  pp, target)
-              cb()
-            }]
-          , [symlink, pp, target]
+      if (npm.config.get('dry-run')) return resultPrinter(pkg, pp, target, rp, cb)
+      chain(
+        [
+          [function (cb) {
+            log.verbose('link', 'symlinking %s to %s', pp, target)
+            cb()
+          }],
+          [symlink, pp, target],
           // do not run any scripts
-          , rp && [build, [target], npm.config.get("global"), build._noLC, true]
-          , [ resultPrinter, pkg, pp, target, rp ] ]
-        , cb )
+          rp && [build, [target], npm.config.get('global'), build._noLC, true],
+          [resultPrinter, pkg, pp, target, rp ]
+        ],
+        cb
+      )
     }
   }, cb)
 }
 
 function linkPkg (folder, cb_) {
   var me = folder || npm.prefix
-    , readJson = require("read-package-json")
+  var readJson = require('read-package-json')
 
-  log.verbose("linkPkg", folder)
+  log.verbose('linkPkg', folder)
 
-  readJson(path.resolve(me, "package.json"), function (er, d) {
+  readJson(path.resolve(me, 'package.json'), function (er, d) {
     function cb (er) {
       return cb_(er, [[d && d._id, target, null, null]])
     }
     if (er) return cb(er)
     if (!d.name) {
-      er = new Error("Package must have a name field to be linked")
+      er = new Error('Package must have a name field to be linked')
       return cb(er)
     }
+    if (npm.config.get('dry-run')) return resultPrinter(path.basename(me), me, target, cb)
     var target = path.resolve(npm.globalDir, d.name)
     symlink(me, target, false, true, function (er) {
       if (er) return cb(er)
-      log.verbose("link", "build target", target)
+      log.verbose('link', 'build target', target)
       // also install missing dependencies.
       npm.commands.install(me, [], function (er) {
         if (er) return cb(er)
@@ -144,16 +164,21 @@ function linkPkg (folder, cb_) {
 }
 
 function resultPrinter (pkg, src, dest, rp, cb) {
-  if (typeof cb !== "function") cb = rp, rp = null
+  if (typeof cb !== 'function') {
+    cb = rp
+    rp = null
+  }
   var where = dest
-  rp = (rp || "").trim()
-  src = (src || "").trim()
+  rp = (rp || '').trim()
+  src = (src || '').trim()
   // XXX If --json is set, then look up the data from the package.json
-  if (npm.config.get("parseable")) {
+  if (npm.config.get('parseable')) {
     return parseableOutput(dest, rp || src, cb)
   }
   if (rp === src) rp = null
-  console.log(where + " -> " + src + (rp ? " -> " + rp: ""))
+  log.clearProgress()
+  console.log(where + ' -> ' + src + (rp ? ' -> ' + rp : ''))
+  log.showProgress()
   cb()
 }
 
@@ -161,10 +186,12 @@ function parseableOutput (dest, rp, cb) {
   // XXX this should match ls --parseable and install --parseable
   // look up the data from package.json, format it the same way.
   //
-  // link is always effectively "long", since it doesn't help much to
+  // link is always effectively 'long', since it doesn't help much to
   // *just* print the target folder.
   // However, we don't actually ever read the version number, so
   // the second field is always blank.
-  console.log(dest + "::" + rp)
+  log.clearProgress()
+  console.log(dest + '::' + rp)
+  log.showProgress()
   cb()
 }
diff --git a/deps/npm/lib/logout.js b/deps/npm/lib/logout.js
index 64635be4decc4c..c1ac2818ef1837 100644
--- a/deps/npm/lib/logout.js
+++ b/deps/npm/lib/logout.js
@@ -1,39 +1,34 @@
 module.exports = logout
 
-var dezalgo = require("dezalgo")
-var log = require("npmlog")
+var dezalgo = require('dezalgo')
+var log = require('npmlog')
 
-var npm = require("./npm.js")
-var mapToRegistry = require("./utils/map-to-registry.js")
+var npm = require('./npm.js')
+var mapToRegistry = require('./utils/map-to-registry.js')
 
-logout.usage = "npm logout [--registry] [--scope]"
+logout.usage = 'npm logout [--registry=<url>] [--scope=<@scope>]'
 
 function logout (args, cb) {
-  npm.spinner.start()
   cb = dezalgo(cb)
 
-  mapToRegistry("/", npm.config, function (err, uri, auth, normalized) {
+  mapToRegistry('/', npm.config, function (err, uri, auth, normalized) {
     if (err) return cb(err)
 
     if (auth.token) {
-      log.verbose("logout", "clearing session token for", normalized)
+      log.verbose('logout', 'clearing session token for', normalized)
       npm.registry.logout(normalized, { auth: auth }, function (err) {
         if (err) return cb(err)
 
         npm.config.clearCredentialsByURI(normalized)
-        npm.spinner.stop()
-        npm.config.save("user", cb)
+        npm.config.save('user', cb)
       })
-    }
-    else if (auth.username || auth.password) {
-      log.verbose("logout", "clearing user credentials for", normalized)
+    } else if (auth.username || auth.password) {
+      log.verbose('logout', 'clearing user credentials for', normalized)
       npm.config.clearCredentialsByURI(normalized)
-      npm.spinner.stop()
-      npm.config.save("user", cb)
-    }
-    else {
+      npm.config.save('user', cb)
+    } else {
       cb(new Error(
-        "Not logged in to", normalized + ",", "so can't log out."
+        'Not logged in to', normalized + ',', "so can't log out."
       ))
     }
   })
diff --git a/deps/npm/lib/ls.js b/deps/npm/lib/ls.js
index c7877b925e6be7..1854938eb6919a 100644
--- a/deps/npm/lib/ls.js
+++ b/deps/npm/lib/ls.js
@@ -1,4 +1,3 @@
-
 // show the installed versions of packages
 //
 // --parseable creates output like this:
@@ -7,74 +6,99 @@
 
 module.exports = exports = ls
 
-var npm = require("./npm.js")
-  , readInstalled = require("read-installed")
-  , log = require("npmlog")
-  , path = require("path")
-  , archy = require("archy")
-  , semver = require("semver")
-  , url = require("url")
-  , color = require("ansicolors")
-  , npa = require("npm-package-arg")
-
-ls.usage = "npm ls"
-
-ls.completion = require("./utils/completion/installed-deep.js")
+var path = require('path')
+var url = require('url')
+var readPackageTree = require('read-package-tree')
+var log = require('npmlog')
+var archy = require('archy')
+var semver = require('semver')
+var color = require('ansicolors')
+var npa = require('npm-package-arg')
+var iferr = require('iferr')
+var npm = require('./npm.js')
+var mutateIntoLogicalTree = require('./install/mutate-into-logical-tree.js')
+var recalculateMetadata = require('./install/deps.js').recalculateMetadata
+var getPackageId = require('./install/get-package-id.js')
+
+ls.usage = 'npm ls [[<@scope>/]<pkg> ...]' +
+    '\n\naliases: list, la, ll'
+
+ls.completion = require('./utils/completion/installed-deep.js')
 
 function ls (args, silent, cb) {
-  if (typeof cb !== "function") cb = silent, silent = false
+  if (typeof cb !== 'function') {
+    cb = silent
+    silent = false
+  }
+  var dir = path.resolve(npm.dir, '..')
+  readPackageTree(dir, andRecalculateMetadata(iferr(cb, function (physicalTree) {
+    lsFromTree(dir, physicalTree, args, silent, cb)
+  })))
+}
 
-  var dir = path.resolve(npm.dir, "..")
+function andRecalculateMetadata (next) {
+  return function (er, tree) {
+    recalculateMetadata(tree || {}, log, next)
+  }
+}
 
-  // npm ls 'foo@~1.3' bar 'baz@<2'
-  if (!args) args = []
-  else args = args.map(function (a) {
-    var p = npa(a)
-      , name = p.name
-      , ver = semver.validRange(p.rawSpec) || ""
+var lsFromTree = ls.fromTree = function (dir, physicalTree, args, silent, cb) {
+  if (typeof cb !== 'function') {
+    cb = silent
+    silent = false
+  }
 
-    return [ name, ver ]
-  })
+  // npm ls 'foo@~1.3' bar 'baz@<2'
+  if (!args) {
+    args = []
+  } else {
+    args = args.map(function (a) {
+      var p = npa(a)
+      var name = p.name
+      var ver = semver.validRange(p.rawSpec) || ''
+
+      return [ name, ver ]
+    })
+  }
 
-  var depth = npm.config.get("depth")
-  var opt = { depth: depth, log: log.warn, dev: true }
-  readInstalled(dir, opt, function (er, data) {
-    pruneNestedExtraneous(data)
-    filterByEnv(data)
-    var bfs = bfsify(data, args)
-      , lite = getLite(bfs)
-
-    if (er || silent) return cb(er, data, lite)
-
-    var long = npm.config.get("long")
-      , json = npm.config.get("json")
-      , out
-    if (json) {
-      var seen = []
-      var d = long ? bfs : lite
-      // the raw data can be circular
-      out = JSON.stringify(d, function (k, o) {
-        if (typeof o === "object") {
-          if (-1 !== seen.indexOf(o)) return "[Circular]"
-          seen.push(o)
-        }
-        return o
-      }, 2)
-    } else if (npm.config.get("parseable")) {
-      out = makeParseable(bfs, long, dir)
-    } else if (data) {
-      out = makeArchy(bfs, long, dir)
-    }
-    console.log(out)
+  var data = mutateIntoLogicalTree.asReadInstalled(physicalTree)
+
+  pruneNestedExtraneous(data)
+  filterByEnv(data)
+  var bfs = filterFound(bfsify(data), args)
+  var lite = getLite(bfs)
+
+  if (silent) return cb(null, data, lite)
+
+  var long = npm.config.get('long')
+  var json = npm.config.get('json')
+  var out
+  if (json) {
+    var seen = []
+    var d = long ? bfs : lite
+    // the raw data can be circular
+    out = JSON.stringify(d, function (k, o) {
+      if (typeof o === 'object') {
+        if (seen.indexOf(o) !== -1) return '[Circular]'
+        seen.push(o)
+      }
+      return o
+    }, 2)
+  } else if (npm.config.get('parseable')) {
+    out = makeParseable(bfs, long, dir)
+  } else if (data) {
+    out = makeArchy(bfs, long, dir)
+  }
+  console.log(out)
 
-    if (args.length && !data._found) process.exitCode = 1
+  if (args.length && !data._found) process.exitCode = 1
 
-    // if any errors were found, then complain and exit status 1
-    if (lite.problems && lite.problems.length) {
-      er = lite.problems.join("\n")
-    }
-    cb(er, data, lite)
-  })
+  var er
+  // if any errors were found, then complain and exit status 1
+  if (lite.problems && lite.problems.length) {
+    er = lite.problems.join('\n')
+  }
+  cb(er, data, lite)
 }
 
 function pruneNestedExtraneous (data, visited) {
@@ -90,15 +114,15 @@ function pruneNestedExtraneous (data, visited) {
 }
 
 function filterByEnv (data) {
-  var dev = npm.config.get("dev")
-  var production = npm.config.get("production")
-  if (dev === production) return
+  var dev = npm.config.get('dev') || /^dev(elopment)?$/.test(npm.config.get('only'))
+  var production = npm.config.get('production') || /^prod(uction)?$/.test(npm.config.get('only'))
   var dependencies = {}
   var devDependencies = data.devDependencies || []
   Object.keys(data.dependencies).forEach(function (name) {
     var keys = Object.keys(devDependencies)
-    if (production && keys.indexOf(name) !== -1) return
-    if (dev && keys.indexOf(name) === -1) return
+    if (production && !dev && keys.indexOf(name) !== -1) return
+    if (dev && !production && keys.indexOf(name) === -1) return
+    if (!dev && keys.indexOf(name) !== -1 && data.dependencies[name].missing) return
     dependencies[name] = data.dependencies[name]
   })
   data.dependencies = dependencies
@@ -111,59 +135,84 @@ function alphasort (a, b) {
        : a < b ? -1 : 0
 }
 
+function isCruft (data) {
+  return data.extraneous && data.error && data.error.code === 'ENOTDIR'
+}
+
 function getLite (data, noname) {
   var lite = {}
-    , maxDepth = npm.config.get("depth")
+
+  if (isCruft(data)) return lite
+
+  var maxDepth = npm.config.get('depth')
 
   if (!noname && data.name) lite.name = data.name
   if (data.version) lite.version = data.version
   if (data.extraneous) {
     lite.extraneous = true
     lite.problems = lite.problems || []
-    lite.problems.push( "extraneous: "
-                      + data.name + "@" + data.version
-                      + " " + (data.path || "") )
+    lite.problems.push('extraneous: ' + getPackageId(data) + ' ' + (data.path || ''))
   }
 
-  if (data._from)
+  if (data.error && data.path !== path.resolve(npm.globalDir, '..') &&
+      (data.error.code !== 'ENOENT' || noname)) {
+    lite.invalid = true
+    lite.problems = lite.problems || []
+    var message = data.error.message
+    lite.problems.push('error in ' + data.path + ': ' + message)
+  }
+
+  if (data._from) {
     lite.from = data._from
+  }
 
-  if (data._resolved)
+  if (data._resolved) {
     lite.resolved = data._resolved
+  }
 
   if (data.invalid) {
     lite.invalid = true
     lite.problems = lite.problems || []
-    lite.problems.push( "invalid: "
-                      + data.name + "@" + data.version
-                      + " " + (data.path || "") )
+    lite.problems.push('invalid: ' +
+                       getPackageId(data) +
+                       ' ' + (data.path || ''))
   }
 
   if (data.peerInvalid) {
     lite.peerInvalid = true
     lite.problems = lite.problems || []
-    lite.problems.push( "peer invalid: "
-                      + data.name + "@" + data.version
-                      + " " + (data.path || "") )
+    lite.problems.push('peer dep not met: ' +
+                       getPackageId(data) +
+                       ' ' + (data.path || ''))
   }
 
-  if (data.dependencies) {
-    var deps = Object.keys(data.dependencies)
-    if (deps.length) lite.dependencies = deps.map(function (d) {
+  var deps = (data.dependencies && Object.keys(data.dependencies)) || []
+  if (deps.length) {
+    lite.dependencies = deps.map(function (d) {
       var dep = data.dependencies[d]
-      if (typeof dep === "string") {
+      if (dep.missing && !dep.optional) {
         lite.problems = lite.problems || []
         var p
         if (data.depth > maxDepth) {
-          p = "max depth reached: "
+          p = 'max depth reached: '
         } else {
-          p = "missing: "
+          p = 'missing: '
         }
-        p += d + "@" + dep
-          + ", required by "
-          + data.name + "@" + data.version
+        p += d + '@' + dep.requiredBy +
+            ', required by ' +
+            getPackageId(data)
         lite.problems.push(p)
-        return [d, { required: dep, missing: true }]
+        return [d, { required: dep.requiredBy, missing: true }]
+      } else if (dep.peerMissing) {
+        lite.problems = lite.problems || []
+        dep.peerMissing.forEach(function (missing) {
+          var pdm = 'peer dep missing: ' +
+              missing.requires +
+              ', required by ' +
+              missing.requiredBy
+          lite.problems.push(pdm)
+        })
+        return [d, { required: dep, peerMissing: true }]
       }
       return [d, getLite(dep, true)]
     }).reduce(function (deps, d) {
@@ -178,7 +227,7 @@ function getLite (data, noname) {
   return lite
 }
 
-function bfsify (root, args, current, queue, seen) {
+function bfsify (root) {
   // walk over the data, and turn it from this:
   // +-- a
   // |   `-- b
@@ -188,137 +237,162 @@ function bfsify (root, args, current, queue, seen) {
   // +-- a
   // `-- b
   // which looks nicer
-  args = args || []
-  current = current || root
-  queue = queue || []
-  seen = seen || [root]
-  var deps = current.dependencies = current.dependencies || {}
-  Object.keys(deps).forEach(function (d) {
-    var dep = deps[d]
-    if (typeof dep !== "object") return
-    if (seen.indexOf(dep) !== -1) {
-      if (npm.config.get("parseable") || !npm.config.get("long")) {
-        delete deps[d]
-        return
-      } else {
-        dep = deps[d] = Object.create(dep)
-        dep.dependencies = {}
+  var queue = [root]
+  var seen = [root]
+
+  while (queue.length) {
+    var current = queue.shift()
+    var deps = current.dependencies = current.dependencies || {}
+    Object.keys(deps).forEach(function (d) {
+      var dep = deps[d]
+      if (dep.missing) return
+      if (seen.indexOf(dep) !== -1) {
+        if (npm.config.get('parseable') || !npm.config.get('long')) {
+          delete deps[d]
+          return
+        } else {
+          dep = deps[d] = Object.create(dep)
+          dep.dependencies = {}
+        }
       }
-    }
-    queue.push(dep)
-    seen.push(dep)
-  })
-
-  if (!queue.length) {
-    // if there were args, then only show the paths to found nodes.
-    return filterFound(root, args)
+      queue.push(dep)
+      seen.push(dep)
+    })
   }
-  return bfsify(root, args, queue.shift(), queue, seen)
+
+  return root
 }
 
 function filterFound (root, args) {
   if (!args.length) return root
   var deps = root.dependencies
-  if (deps) Object.keys(deps).forEach(function (d) {
-    var dep = filterFound(deps[d], args)
-
-    // see if this one itself matches
-    var found = false
-    for (var i = 0; !found && i < args.length; i ++) {
-      if (d === args[i][0]) {
-        found = semver.satisfies(dep.version, args[i][1], true)
+  if (deps) {
+    Object.keys(deps).forEach(function (d) {
+      var dep = filterFound(deps[d], args)
+      if (dep.peerMissing) return
+
+      // see if this one itself matches
+      var found = false
+      for (var i = 0; !found && i < args.length; i++) {
+        if (d === args[i][0]) {
+          found = semver.satisfies(dep.version, args[i][1], true)
+        }
       }
-    }
-    // included explicitly
-    if (found) dep._found = true
-    // included because a child was included
-    if (dep._found && !root._found) root._found = 1
-    // not included
-    if (!dep._found) delete deps[d]
-  })
+      // included explicitly
+      if (found) dep._found = true
+      // included because a child was included
+      if (dep._found && !root._found) root._found = 1
+      // not included
+      if (!dep._found) delete deps[d]
+    })
+  }
   if (!root._found) root._found = false
   return root
 }
 
 function makeArchy (data, long, dir) {
   var out = makeArchy_(data, long, dir, 0)
-  return archy(out, "", { unicode: npm.config.get("unicode") })
+  return archy(out, '', { unicode: npm.config.get('unicode') })
 }
 
 function makeArchy_ (data, long, dir, depth, parent, d) {
-  if (typeof data === "string") {
-    if (depth -1 <= npm.config.get("depth")) {
+  if (data.missing) {
+    if (depth - 1 <= npm.config.get('depth')) {
       // just missing
-      var unmet = "UNMET DEPENDENCY"
+      var unmet = 'UNMET ' + (data.optional ? 'OPTIONAL ' : '') + 'DEPENDENCY'
       if (npm.color) {
-        unmet = color.bgBlack(color.red(unmet))
+        if (data.optional) {
+          unmet = color.bgBlack(color.yellow(unmet))
+        } else {
+          unmet = color.bgBlack(color.red(unmet))
+        }
       }
-      data = unmet + " " + d + "@" + data
+      data = unmet + ' ' + d + '@' + data.requiredBy
     } else {
-      data = d+"@"+ data
+      data = d + '@' + data.requiredBy
     }
     return data
   }
 
   var out = {}
   // the top level is a bit special.
-  out.label = data._id || ""
+  out.label = data._id || ''
   if (data._found === true && data._id) {
     if (npm.color) {
-      out.label = color.bgBlack(color.yellow(out.label.trim())) + " "
+      out.label = color.bgBlack(color.yellow(out.label.trim())) + ' '
     } else {
-      out.label = out.label.trim() + " "
+      out.label = out.label.trim() + ' '
     }
   }
-  if (data.link) out.label += " -> " + data.link
+  if (data.link) out.label += ' -> ' + data.link
 
   if (data.invalid) {
-    if (data.realName !== data.name) out.label += " ("+data.realName+")"
-    var invalid = "invalid"
+    if (data.realName !== data.name) out.label += ' (' + data.realName + ')'
+    var invalid = 'invalid'
     if (npm.color) invalid = color.bgBlack(color.red(invalid))
-    out.label += " " + invalid
+    out.label += ' ' + invalid
   }
 
   if (data.peerInvalid) {
-    var peerInvalid = "peer invalid"
+    var peerInvalid = 'peer invalid'
     if (npm.color) peerInvalid = color.bgBlack(color.red(peerInvalid))
-    out.label += " " + peerInvalid
+    out.label += ' ' + peerInvalid
+  }
+
+  if (data.peerMissing) {
+    var peerMissing = 'UNMET PEER DEPENDENCY'
+    if (npm.color) peerMissing = color.bgBlack(color.red(peerMissing))
+    out.label = peerMissing + ' ' + out.label
   }
 
   if (data.extraneous && data.path !== dir) {
-    var extraneous = "extraneous"
+    var extraneous = 'extraneous'
     if (npm.color) extraneous = color.bgBlack(color.green(extraneous))
-    out.label += " " + extraneous
+    out.label += ' ' + extraneous
+  }
+
+  if (data.error && depth) {
+    var message = data.error.message
+    if (message.indexOf('\n')) message = message.slice(0, message.indexOf('\n'))
+    var error = 'error: ' + message
+    if (npm.color) error = color.bgRed(color.brightWhite(error))
+    out.label += ' ' + error
   }
 
   // add giturl to name@version
   if (data._resolved) {
-    var type = npa(data._resolved).type
-    var isGit = type === 'git' || type === 'hosted'
-    if (isGit) {
-      out.label += ' (' + data._resolved + ')'
+    try {
+      var type = npa(data._resolved).type
+      var isGit = type === 'git' || type === 'hosted'
+      if (isGit) {
+        out.label += ' (' + data._resolved + ')'
+      }
+    } catch (ex) {
+      // npa threw an exception then it ain't git so whatev
     }
   }
 
   if (long) {
-    if (dir === data.path) out.label += "\n" + dir
-    out.label += "\n" + getExtras(data, dir)
+    if (dir === data.path) out.label += '\n' + dir
+    out.label += '\n' + getExtras(data, dir)
   } else if (dir === data.path) {
-    if (out.label) out.label += " "
+    if (out.label) out.label += ' '
     out.label += dir
   }
 
   // now all the children.
   out.nodes = []
-  if (depth <= npm.config.get("depth")) {
+  if (depth <= npm.config.get('depth')) {
     out.nodes = Object.keys(data.dependencies || {})
-      .sort(alphasort).map(function (d) {
+      .sort(alphasort).filter(function (d) {
+        return !isCruft(data.dependencies[d])
+      }).map(function (d) {
         return makeArchy_(data.dependencies[d], long, dir, depth + 1, data, d)
       })
   }
 
   if (out.nodes.length === 0 && data.path === dir) {
-    out.nodes = ["(empty)"]
+    out.nodes = ['(empty)']
   }
 
   return out
@@ -332,16 +406,15 @@ function getExtras (data) {
   if (data.homepage) extras.push(data.homepage)
   if (data._from) {
     var from = data._from
-    if (from.indexOf(data.name + "@") === 0) {
+    if (from.indexOf(data.name + '@') === 0) {
       from = from.substr(data.name.length + 1)
     }
     var u = url.parse(from)
     if (u.protocol) extras.push(from)
   }
-  return extras.join("\n")
+  return extras.join('\n')
 }
 
-
 function makeParseable (data, long, dir, depth, parent, d) {
   depth = depth || 0
 
@@ -351,36 +424,38 @@ function makeParseable (data, long, dir, depth, parent, d) {
       return makeParseable(data.dependencies[d], long, dir, depth + 1, data, d)
     }))
   .filter(function (x) { return x })
-  .join("\n")
+  .join('\n')
 }
 
 function makeParseable_ (data, long, dir, depth, parent, d) {
-  if (data.hasOwnProperty("_found") && data._found !== true) return ""
-
-  if (typeof data === "string") {
-    if (data.depth < npm.config.get("depth")) {
-      data = npm.config.get("long")
-           ? path.resolve(parent.path, "node_modules", d)
-           + ":"+d+"@"+JSON.stringify(data)+":INVALID:MISSING"
-           : ""
+  if (data.hasOwnProperty('_found') && data._found !== true) return ''
+
+  if (data.missing) {
+    if (depth < npm.config.get('depth')) {
+      data = npm.config.get('long')
+           ? path.resolve(parent.path, 'node_modules', d) +
+             ':' + d + '@' + JSON.stringify(data.requiredBy) + ':INVALID:MISSING'
+           : ''
     } else {
-      data = path.resolve(data.path || "", "node_modules", d || "")
-           + (npm.config.get("long")
-             ? ":" + d + "@" + JSON.stringify(data)
-             + ":" // no realpath resolved
-             + ":MAXDEPTH"
-             : "")
+      data = path.resolve(dir || '', 'node_modules', d || '') +
+             (npm.config.get('long')
+             ? ':' + d + '@' + JSON.stringify(data.requiredBy) +
+               ':' + // no realpath resolved
+               ':MAXDEPTH'
+             : '')
     }
 
     return data
   }
 
-  if (!npm.config.get("long")) return data.path
+  if (!npm.config.get('long')) return data.path
 
-  return data.path
-       + ":" + (data._id || "")
-       + ":" + (data.realPath !== data.path ? data.realPath : "")
-       + (data.extraneous ? ":EXTRANEOUS" : "")
-       + (data.invalid ? ":INVALID" : "")
-       + (data.peerInvalid ? ":PEERINVALID" : "")
+  return data.path +
+         ':' + (data._id || '') +
+         ':' + (data.realPath !== data.path ? data.realPath : '') +
+         (data.extraneous ? ':EXTRANEOUS' : '') +
+         (data.error && data.path !== path.resolve(npm.globalDir, '..') ? ':ERROR' : '') +
+         (data.invalid ? ':INVALID' : '') +
+         (data.peerInvalid ? ':PEERINVALID' : '') +
+         (data.peerMissing ? ':PEERINVALID:MISSING' : '')
 }
diff --git a/deps/npm/lib/npm.js b/deps/npm/lib/npm.js
index c049d95ba6e24b..264ad3636e5806 100644
--- a/deps/npm/lib/npm.js
+++ b/deps/npm/lib/npm.js
@@ -1,469 +1,477 @@
-;(function(){
-// windows: running "npm blah" in this folder will invoke WSH, not node.
-if (typeof WScript !== "undefined") {
-  WScript.echo("npm does not work when run\n"
-              +"with the Windows Scripting Host\n\n"
-              +"'cd' to a different directory,\n"
-              +"or type 'npm.cmd <args>',\n"
-              +"or type 'node npm <args>'.")
-  WScript.quit(1)
-  return
-}
-
-
-var EventEmitter = require("events").EventEmitter
-  , npm = module.exports = new EventEmitter()
-  , npmconf = require("./config/core.js")
-  , log = require("npmlog")
-  , gfs = require('graceful-fs')
-  , fs = gfs.gracefulify(require('fs'))
-  , path = require("path")
-  , abbrev = require("abbrev")
-  , which = require("which")
-  , CachingRegClient = require("./cache/caching-client.js")
-  , charSpin = require("char-spinner")
-
-npm.config = {
-  loaded: false,
-  get: function() {
-    throw new Error('npm.load() required')
-  },
-  set: function() {
-    throw new Error('npm.load() required')
+;(function () {
+  // windows: running 'npm blah' in this folder will invoke WSH, not node.
+  /*globals WScript*/
+  if (typeof WScript !== 'undefined') {
+    WScript.echo(
+      'npm does not work when run\n' +
+      'with the Windows Scripting Host\n\n' +
+      '"cd" to a different directory,\n' +
+      'or type "npm.cmd <args>",\n' +
+      'or type "node npm <args>".'
+    )
+    WScript.quit(1)
+    return
   }
-}
 
-npm.commands = {}
+  var gfs = require('graceful-fs')
+  // Patch the global fs module here at the app level
+  var fs = gfs.gracefulify(require('fs'))
+
+  var EventEmitter = require('events').EventEmitter
+  var npm = module.exports = new EventEmitter()
+  var npmconf = require('./config/core.js')
+  var log = require('npmlog')
+
+  var path = require('path')
+  var abbrev = require('abbrev')
+  var which = require('which')
+  var CachingRegClient = require('./cache/caching-client.js')
+  var parseJSON = require('./utils/parse-json.js')
+
+  npm.config = {
+    loaded: false,
+    get: function () {
+      throw new Error('npm.load() required')
+    },
+    set: function () {
+      throw new Error('npm.load() required')
+    }
+  }
 
-npm.rollbacks = []
+  npm.commands = {}
+
+  npm.rollbacks = []
 
-try {
-  // startup, ok to do this synchronously
-  var j = JSON.parse(fs.readFileSync(
-    path.join(__dirname, "../package.json"))+"")
-  npm.version = j.version
-} catch (ex) {
   try {
-    log.info("error reading version", ex)
-  } catch (er) {}
-  npm.version = ex
-}
+    // startup, ok to do this synchronously
+    var j = parseJSON(fs.readFileSync(
+      path.join(__dirname, '../package.json')) + '')
+    npm.version = j.version
+  } catch (ex) {
+    try {
+      log.info('error reading version', ex)
+    } catch (er) {}
+    npm.version = ex
+  }
+
+  var commandCache = {}
 
-var commandCache = {}
   // short names for common things
-  , aliases = { "rm" : "uninstall"
-              , "r" : "uninstall"
-              , "un" : "uninstall"
-              , "unlink" : "uninstall"
-              , "remove" : "uninstall"
-              , "rb" : "rebuild"
-              , "list" : "ls"
-              , "la" : "ls"
-              , "ll" : "ls"
-              , "ln" : "link"
-              , "i" : "install"
-              , "isntall" : "install"
-              , "up" : "update"
-              , "upgrade" : "update"
-              , "c" : "config"
-              , "dist-tags" : "dist-tag"
-              , "info" : "view"
-              , "show" : "view"
-              , "find" : "search"
-              , "s" : "search"
-              , "se" : "search"
-              , "author" : "owner"
-              , "home" : "docs"
-              , "issues": "bugs"
-              , "unstar": "star" // same function
-              , "apihelp" : "help"
-              , "login": "adduser"
-              , "add-user": "adduser"
-              , "tst": "test"
-              , "t": "test"
-              , "find-dupes": "dedupe"
-              , "ddp": "dedupe"
-              , "v": "view"
-              , "verison": "version"
-              }
-
-  , aliasNames = Object.keys(aliases)
-  // these are filenames in .
-  , cmdList = [ "install"
-              , "uninstall"
-              , "cache"
-              , "config"
-              , "set"
-              , "get"
-              , "update"
-              , "outdated"
-              , "prune"
-              , "pack"
-              , "dedupe"
-
-              , "rebuild"
-              , "link"
-
-              , "publish"
-              , "star"
-              , "stars"
-              , "tag"
-              , "adduser"
-              , "logout"
-              , "unpublish"
-              , "owner"
-              , "access"
-              , "team"
-              , "deprecate"
-              , "shrinkwrap"
-
-              , "help"
-              , "help-search"
-              , "ls"
-              , "search"
-              , "view"
-              , "init"
-              , "version"
-              , "edit"
-              , "explore"
-              , "docs"
-              , "repo"
-              , "bugs"
-              , "faq"
-              , "root"
-              , "prefix"
-              , "bin"
-              , "whoami"
-              , "dist-tag"
-              , "ping"
-
-              , "test"
-              , "stop"
-              , "start"
-              , "restart"
-              , "run-script"
-              , "completion"
-              ]
-  , plumbing = [ "build"
-               , "unbuild"
-               , "xmas"
-               , "substack"
-               , "visnup"
-               ]
-  , littleGuys = [ "isntall" ]
-  , fullList = cmdList.concat(aliasNames).filter(function (c) {
-      return plumbing.indexOf(c) === -1
-    })
-  , abbrevs = abbrev(fullList)
-
-// we have our reasons
-fullList = npm.fullList = fullList.filter(function (c) {
-  return littleGuys.indexOf(c) === -1
-})
-
-npm.spinner =
-  { int: null
-  , started: false
-  , start: function () {
-      if (npm.spinner.int) return
-      var c = npm.config.get("spin")
-      if (!c) return
-      var stream = npm.config.get("logstream")
-      var opt = { tty: c !== "always", stream: stream }
-      opt.cleanup = !npm.spinner.started
-      npm.spinner.int = charSpin(opt)
-      npm.spinner.started = true
-    }
-  , stop: function () {
-      clearInterval(npm.spinner.int)
-      npm.spinner.int = null
-    }
+  var aliases = {
+    'rm': 'uninstall',
+    'r': 'uninstall',
+    'un': 'uninstall',
+    'unlink': 'uninstall',
+    'remove': 'uninstall',
+    'rb': 'rebuild',
+    'list': 'ls',
+    'la': 'ls',
+    'll': 'ls',
+    'ln': 'link',
+    'i': 'install',
+    'isntall': 'install',
+    'up': 'update',
+    'upgrade': 'update',
+    'c': 'config',
+    'dist-tags': 'dist-tag',
+    'info': 'view',
+    'show': 'view',
+    'find': 'search',
+    's': 'search',
+    'se': 'search',
+    'author': 'owner',
+    'home': 'docs',
+    'issues': 'bugs',
+    'unstar': 'star', // same function
+    'apihelp': 'help',
+    'login': 'adduser',
+    'add-user': 'adduser',
+    'tst': 'test',
+    't': 'test',
+    'find-dupes': 'dedupe',
+    'ddp': 'dedupe',
+    'v': 'view',
+    'verison': 'version'
   }
 
-Object.keys(abbrevs).concat(plumbing).forEach(function addCommand (c) {
-  Object.defineProperty(npm.commands, c, { get : function () {
-    if (!loaded) throw new Error(
-      "Call npm.load(config, cb) before using this command.\n"+
-      "See the README.md or cli.js for example usage.")
-    var a = npm.deref(c)
-    if (c === "la" || c === "ll") {
-      npm.config.set("long", true)
-    }
-
-    npm.command = c
-    if (commandCache[a]) return commandCache[a]
+  var aliasNames = Object.keys(aliases)
 
-    var cmd = require(__dirname+"/"+a+".js")
+  // these are filenames in .
+  var cmdList = [
+    'install',
+    'uninstall',
+    'cache',
+    'config',
+    'set',
+    'get',
+    'update',
+    'outdated',
+    'prune',
+    'pack',
+    'dedupe',
+
+    'rebuild',
+    'link',
+
+    'publish',
+    'star',
+    'stars',
+    'tag',
+    'adduser',
+    'logout',
+    'unpublish',
+    'owner',
+    'access',
+    'team',
+    'deprecate',
+    'shrinkwrap',
+
+    'help',
+    'help-search',
+    'ls',
+    'search',
+    'view',
+    'init',
+    'version',
+    'edit',
+    'explore',
+    'docs',
+    'repo',
+    'bugs',
+    'faq',
+    'root',
+    'prefix',
+    'bin',
+    'whoami',
+    'dist-tag',
+    'ping',
+
+    'test',
+    'stop',
+    'start',
+    'restart',
+    'run-script',
+    'completion'
+  ]
+  var plumbing = [
+    'build',
+    'unbuild',
+    'xmas',
+    'substack',
+    'visnup'
+  ]
+  var littleGuys = [ 'isntall' ]
+  var fullList = cmdList.concat(aliasNames).filter(function (c) {
+        return plumbing.indexOf(c) === -1
+      })
+  var abbrevs = abbrev(fullList)
+
+  // we have our reasons
+  fullList = npm.fullList = fullList.filter(function (c) {
+    return littleGuys.indexOf(c) === -1
+  })
 
-    commandCache[a] = function () {
-      var args = Array.prototype.slice.call(arguments, 0)
-      if (typeof args[args.length - 1] !== "function") {
-        args.push(defaultCb)
+  Object.keys(abbrevs).concat(plumbing).forEach(function addCommand (c) {
+    Object.defineProperty(npm.commands, c, { get: function () {
+      if (!loaded) {
+        throw new Error(
+          'Call npm.load(config, cb) before using this command.\n' +
+            'See the README.md or cli.js for example usage.'
+        )
       }
-      if (args.length === 1) args.unshift([])
-
-      npm.registry.version = npm.version
-      if (!npm.registry.refer) {
-        npm.registry.refer = [a].concat(args[0]).map(function (arg) {
-          // exclude anything that might be a URL, path, or private module
-          // Those things will always have a slash in them somewhere
-          if (arg && arg.match && arg.match(/\/|\\/)) {
-            return "[REDACTED]"
-          } else {
-            return arg
-          }
-        }).filter(function (arg) {
-          return arg && arg.match
-        }).join(" ")
+      var a = npm.deref(c)
+      if (c === 'la' || c === 'll') {
+        npm.config.set('long', true)
       }
 
-      cmd.apply(npm, args)
-    }
+      npm.command = c
+      if (commandCache[a]) return commandCache[a]
+
+      var cmd = require(__dirname + '/' + a + '.js')
+
+      commandCache[a] = function () {
+        var args = Array.prototype.slice.call(arguments, 0)
+        if (typeof args[args.length - 1] !== 'function') {
+          args.push(defaultCb)
+        }
+        if (args.length === 1) args.unshift([])
+
+        npm.registry.version = npm.version
+        if (!npm.registry.refer) {
+          npm.registry.refer = [a].concat(args[0]).map(function (arg) {
+            // exclude anything that might be a URL, path, or private module
+            // Those things will always have a slash in them somewhere
+            if (arg && arg.match && arg.match(/\/|\\/)) {
+              return '[REDACTED]'
+            } else {
+              return arg
+            }
+          }).filter(function (arg) {
+            return arg && arg.match
+          }).join(' ')
+        }
+
+        cmd.apply(npm, args)
+      }
 
-    Object.keys(cmd).forEach(function (k) {
-      commandCache[a][k] = cmd[k]
-    })
+      Object.keys(cmd).forEach(function (k) {
+        commandCache[a][k] = cmd[k]
+      })
 
-    return commandCache[a]
-  }, enumerable: fullList.indexOf(c) !== -1, configurable: true })
+      return commandCache[a]
+    }, enumerable: fullList.indexOf(c) !== -1, configurable: true })
 
-  // make css-case commands callable via camelCase as well
-  if (c.match(/\-([a-z])/)) {
-    addCommand(c.replace(/\-([a-z])/g, function (a, b) {
-      return b.toUpperCase()
-    }))
-  }
-})
+    // make css-case commands callable via camelCase as well
+    if (c.match(/\-([a-z])/)) {
+      addCommand(c.replace(/\-([a-z])/g, function (a, b) {
+        return b.toUpperCase()
+      }))
+    }
+  })
 
-function defaultCb (er, data) {
-  if (er) console.error(er.stack || er.message)
-  else console.log(data)
-}
+  function defaultCb (er, data) {
+    log.disableProgress()
+    if (er) console.error(er.stack || er.message)
+    else console.log(data)
+  }
 
-npm.deref = function (c) {
-  if (!c) return ""
-  if (c.match(/[A-Z]/)) c = c.replace(/([A-Z])/g, function (m) {
-    return "-" + m.toLowerCase()
-  })
-  if (plumbing.indexOf(c) !== -1) return c
-  var a = abbrevs[c]
-  if (aliases[a]) a = aliases[a]
-  return a
-}
-
-var loaded = false
-  , loading = false
-  , loadErr = null
-  , loadListeners = []
-
-function loadCb (er) {
-  loadListeners.forEach(function (cb) {
-    process.nextTick(cb.bind(npm, er, npm))
-  })
-  loadListeners.length = 0
-}
-
-npm.load = function (cli, cb_) {
-  if (!cb_ && typeof cli === "function") cb_ = cli , cli = {}
-  if (!cb_) cb_ = function () {}
-  if (!cli) cli = {}
-  loadListeners.push(cb_)
-  if (loaded || loadErr) return cb(loadErr)
-  if (loading) return
-  loading = true
-  var onload = true
-
-  function cb (er) {
-    if (loadErr) return
-    loadErr = er
-    if (er) return cb_(er)
-    if (npm.config.get("force")) {
-      log.warn("using --force", "I sure hope you know what you are doing.")
-    }
-    npm.config.loaded = true
-    loaded = true
-    loadCb(loadErr = er)
-    if (onload = onload && npm.config.get("onload-script")) {
-      require(onload)
-      onload = false
+  npm.deref = function (c) {
+    if (!c) return ''
+    if (c.match(/[A-Z]/)) {
+      c = c.replace(/([A-Z])/g, function (m) {
+        return '-' + m.toLowerCase()
+      })
     }
+    if (plumbing.indexOf(c) !== -1) return c
+    var a = abbrevs[c]
+    if (aliases[a]) a = aliases[a]
+    return a
   }
 
-  log.pause()
+  var loaded = false
+  var loading = false
+  var loadErr = null
+  var loadListeners = []
 
-  load(npm, cli, cb)
-}
+  function loadCb (er) {
+    loadListeners.forEach(function (cb) {
+      process.nextTick(cb.bind(npm, er, npm))
+    })
+    loadListeners.length = 0
+  }
 
-function load (npm, cli, cb) {
-  which(process.argv[0], function (er, node) {
-    if (!er && node.toUpperCase() !== process.execPath.toUpperCase()) {
-      log.verbose("node symlink", node)
-      process.execPath = node
-      process.installPrefix = path.resolve(node, "..", "..")
+  npm.load = function (cli, cb_) {
+    if (!cb_ && typeof cli === 'function') {
+      cb_ = cli
+      cli = {}
     }
-
-    // look up configs
-    //console.error("about to look up configs")
-
-    var builtin = path.resolve(__dirname, "..", "npmrc")
-    npmconf.load(cli, builtin, function (er, config) {
-      if (er === config) er = null
-
-      npm.config = config
-      if (er) return cb(er)
-
-      // if the "project" config is not a filename, and we're
-      // not in global mode, then that means that it collided
-      // with either the default or effective userland config
-      if (!config.get("global")
-          && config.sources.project
-          && config.sources.project.type !== "ini") {
-        log.verbose("config"
-                   , "Skipping project config: %s. "
-                   + "(matches userconfig)"
-                   , config.localPrefix + "/.npmrc")
+    if (!cb_) cb_ = function () {}
+    if (!cli) cli = {}
+    loadListeners.push(cb_)
+    if (loaded || loadErr) return cb(loadErr)
+    if (loading) return
+    loading = true
+    var onload = true
+
+    function cb (er) {
+      if (loadErr) return
+      loadErr = er
+      if (er) return cb_(er)
+      if (npm.config.get('force')) {
+        log.warn('using --force', 'I sure hope you know what you are doing.')
       }
-
-      // Include npm-version and node-version in user-agent
-      var ua = config.get("user-agent") || ""
-      ua = ua.replace(/\{node-version\}/gi, process.version)
-      ua = ua.replace(/\{npm-version\}/gi, npm.version)
-      ua = ua.replace(/\{platform\}/gi, process.platform)
-      ua = ua.replace(/\{arch\}/gi, process.arch)
-      config.set("user-agent", ua)
-
-      var color = config.get("color")
-
-      log.level = config.get("loglevel")
-      log.heading = config.get("heading") || "npm"
-      log.stream = config.get("logstream")
-
-      switch (color) {
-        case "always":
-          log.enableColor()
-          npm.color = true
-          break
-        case false:
-          log.disableColor()
-          npm.color = false
-          break
-        default:
-          var tty = require("tty")
-          if (process.stdout.isTTY) npm.color = true
-          else if (!tty.isatty) npm.color = true
-          else if (tty.isatty(1)) npm.color = true
-          else npm.color = false
-          break
+      npm.config.loaded = true
+      loaded = true
+      loadCb(loadErr = er)
+      onload = onload && npm.config.get('onload-script')
+      if (onload) {
+        require(onload)
+        onload = false
       }
+    }
 
-      log.resume()
-
-      // at this point the configs are all set.
-      // go ahead and spin up the registry client.
-      npm.registry = new CachingRegClient(npm.config)
-
-      var umask = npm.config.get("umask")
-      npm.modes = { exec: 0777 & (~umask)
-                  , file: 0666 & (~umask)
-                  , umask: umask }
+    log.pause()
 
-      var gp = Object.getOwnPropertyDescriptor(config, "globalPrefix")
-      Object.defineProperty(npm, "globalPrefix", gp)
+    load(npm, cli, cb)
+  }
 
-      var lp = Object.getOwnPropertyDescriptor(config, "localPrefix")
-      Object.defineProperty(npm, "localPrefix", lp)
+  function load (npm, cli, cb) {
+    which(process.argv[0], function (er, node) {
+      if (!er && node.toUpperCase() !== process.execPath.toUpperCase()) {
+        log.verbose('node symlink', node)
+        process.execPath = node
+        process.installPrefix = path.resolve(node, '..', '..')
+      }
 
-      return cb(null, npm)
+      // look up configs
+      var builtin = path.resolve(__dirname, '..', 'npmrc')
+      npmconf.load(cli, builtin, function (er, config) {
+        if (er === config) er = null
+
+        npm.config = config
+        if (er) return cb(er)
+
+        // if the 'project' config is not a filename, and we're
+        // not in global mode, then that means that it collided
+        // with either the default or effective userland config
+        if (!config.get('global') &&
+            config.sources.project &&
+            config.sources.project.type !== 'ini') {
+          log.verbose(
+            'config',
+            'Skipping project config: %s. (matches userconfig)',
+            config.localPrefix + '/.npmrc'
+          )
+        }
+
+        // Include npm-version and node-version in user-agent
+        var ua = config.get('user-agent') || ''
+        ua = ua.replace(/\{node-version\}/gi, process.version)
+        ua = ua.replace(/\{npm-version\}/gi, npm.version)
+        ua = ua.replace(/\{platform\}/gi, process.platform)
+        ua = ua.replace(/\{arch\}/gi, process.arch)
+        config.set('user-agent', ua)
+
+        var color = config.get('color')
+
+        log.level = config.get('loglevel')
+        log.heading = config.get('heading') || 'npm'
+        log.stream = config.get('logstream')
+
+        switch (color) {
+          case 'always':
+            log.enableColor()
+            npm.color = true
+            break
+          case false:
+            log.disableColor()
+            npm.color = false
+            break
+          default:
+            var tty = require('tty')
+            if (process.stdout.isTTY) npm.color = true
+            else if (!tty.isatty) npm.color = true
+            else if (tty.isatty(1)) npm.color = true
+            else npm.color = false
+            break
+        }
+
+        log.resume()
+
+        if (config.get('progress')) {
+          log.enableProgress()
+        } else {
+          log.disableProgress()
+        }
+
+        // at this point the configs are all set.
+        // go ahead and spin up the registry client.
+        npm.registry = new CachingRegClient(npm.config)
+
+        var umask = npm.config.get('umask')
+        npm.modes = {
+          exec: parseInt('0777', 8) & (~umask),
+          file: parseInt('0666', 8) & (~umask),
+          umask: umask
+        }
+
+        var gp = Object.getOwnPropertyDescriptor(config, 'globalPrefix')
+        Object.defineProperty(npm, 'globalPrefix', gp)
+
+        var lp = Object.getOwnPropertyDescriptor(config, 'localPrefix')
+        Object.defineProperty(npm, 'localPrefix', lp)
+
+        return cb(null, npm)
+      })
     })
-  })
-}
+  }
 
-Object.defineProperty(npm, "prefix",
-  { get : function () {
-      return npm.config.get("global") ? npm.globalPrefix : npm.localPrefix
-    }
-  , set : function (r) {
-      var k = npm.config.get("global") ? "globalPrefix" : "localPrefix"
-      return npm[k] = r
-    }
-  , enumerable : true
-  })
+  Object.defineProperty(npm, 'prefix',
+    { get: function () {
+        return npm.config.get('global') ? npm.globalPrefix : npm.localPrefix
+      },
+      set: function (r) {
+        var k = npm.config.get('global') ? 'globalPrefix' : 'localPrefix'
+        npm[k] = r
+        return r
+      },
+      enumerable: true
+    })
 
-Object.defineProperty(npm, "bin",
-  { get : function () {
-      if (npm.config.get("global")) return npm.globalBin
-      return path.resolve(npm.root, ".bin")
-    }
-  , enumerable : true
-  })
+  Object.defineProperty(npm, 'bin',
+    { get: function () {
+        if (npm.config.get('global')) return npm.globalBin
+        return path.resolve(npm.root, '.bin')
+      },
+      enumerable: true
+    })
 
-Object.defineProperty(npm, "globalBin",
-  { get : function () {
-      var b = npm.globalPrefix
-      if (process.platform !== "win32") b = path.resolve(b, "bin")
-      return b
-    }
-  })
+  Object.defineProperty(npm, 'globalBin',
+    { get: function () {
+        var b = npm.globalPrefix
+        if (process.platform !== 'win32') b = path.resolve(b, 'bin')
+        return b
+      }
+    })
 
-Object.defineProperty(npm, "dir",
-  { get : function () {
-      if (npm.config.get("global")) return npm.globalDir
-      return path.resolve(npm.prefix, "node_modules")
-    }
-  , enumerable : true
-  })
+  Object.defineProperty(npm, 'dir',
+    { get: function () {
+        if (npm.config.get('global')) return npm.globalDir
+        return path.resolve(npm.prefix, 'node_modules')
+      },
+      enumerable: true
+    })
 
-Object.defineProperty(npm, "globalDir",
-  { get : function () {
-      return (process.platform !== "win32")
-           ? path.resolve(npm.globalPrefix, "lib", "node_modules")
-           : path.resolve(npm.globalPrefix, "node_modules")
-    }
-  , enumerable : true
-  })
+  Object.defineProperty(npm, 'globalDir',
+    { get: function () {
+        return (process.platform !== 'win32')
+             ? path.resolve(npm.globalPrefix, 'lib', 'node_modules')
+             : path.resolve(npm.globalPrefix, 'node_modules')
+      },
+      enumerable: true
+    })
 
-Object.defineProperty(npm, "root",
-  { get : function () { return npm.dir } })
+  Object.defineProperty(npm, 'root',
+    { get: function () { return npm.dir } })
 
-Object.defineProperty(npm, "cache",
-  { get : function () { return npm.config.get("cache") }
-  , set : function (r) { return npm.config.set("cache", r) }
-  , enumerable : true
-  })
+  Object.defineProperty(npm, 'cache',
+    { get: function () { return npm.config.get('cache') },
+      set: function (r) { return npm.config.set('cache', r) },
+      enumerable: true
+    })
 
-var tmpFolder
-var rand = require("crypto").randomBytes(4).toString("hex")
-Object.defineProperty(npm, "tmp",
-  { get : function () {
-      if (!tmpFolder) tmpFolder = "npm-" + process.pid + "-" + rand
-      return path.resolve(npm.config.get("tmp"), tmpFolder)
-    }
-  , enumerable : true
-  })
+  var tmpFolder
+  var rand = require('crypto').randomBytes(4).toString('hex')
+  Object.defineProperty(npm, 'tmp',
+    { get: function () {
+        if (!tmpFolder) tmpFolder = 'npm-' + process.pid + '-' + rand
+        return path.resolve(npm.config.get('tmp'), tmpFolder)
+      },
+      enumerable: true
+    })
 
-// the better to repl you with
-Object.getOwnPropertyNames(npm.commands).forEach(function (n) {
-  if (npm.hasOwnProperty(n) || n === "config") return
+  // the better to repl you with
+  Object.getOwnPropertyNames(npm.commands).forEach(function (n) {
+    if (npm.hasOwnProperty(n) || n === 'config') return
 
-  Object.defineProperty(npm, n, { get: function () {
-    return function () {
-      var args = Array.prototype.slice.call(arguments, 0)
-        , cb = defaultCb
+    Object.defineProperty(npm, n, { get: function () {
+      return function () {
+        var args = Array.prototype.slice.call(arguments, 0)
+        var cb = defaultCb
 
-      if (args.length === 1 && Array.isArray(args[0])) {
-        args = args[0]
-      }
+        if (args.length === 1 && Array.isArray(args[0])) {
+          args = args[0]
+        }
 
-      if (typeof args[args.length - 1] === "function") {
-        cb = args.pop()
+        if (typeof args[args.length - 1] === 'function') {
+          cb = args.pop()
+        }
+        npm.commands[n](args, cb)
       }
+    }, enumerable: false, configurable: true })
+  })
 
-      npm.commands[n](args, cb)
-    }
-  }, enumerable: false, configurable: true })
-})
-
-if (require.main === module) {
-  require("../bin/npm-cli.js")
-}
+  if (require.main === module) {
+    require('../bin/npm-cli.js')
+  }
 })()
diff --git a/deps/npm/lib/outdated.js b/deps/npm/lib/outdated.js
index ab49d109690ee6..61eb3beb9a3151 100644
--- a/deps/npm/lib/outdated.js
+++ b/deps/npm/lib/outdated.js
@@ -16,97 +16,129 @@ packages.
 
 module.exports = outdated
 
-outdated.usage = "npm outdated [<pkg> [<pkg> ...]]"
-
-outdated.completion = require("./utils/completion/installed-deep.js")
-
-
-var path = require("path")
-  , readJson = require("read-package-json")
-  , cache = require("./cache.js")
-  , asyncMap = require("slide").asyncMap
-  , npm = require("./npm.js")
-  , url = require("url")
-  , color = require("ansicolors")
-  , styles = require("ansistyles")
-  , table = require("text-table")
-  , semver = require("semver")
-  , os = require("os")
-  , mapToRegistry = require("./utils/map-to-registry.js")
-  , npa = require("npm-package-arg")
-  , readInstalled = require("read-installed")
-  , long = npm.config.get("long")
-  , log = require("npmlog")
+outdated.usage = 'npm outdated [[<@scope>/]<pkg> ...]'
+
+outdated.completion = require('./utils/completion/installed-deep.js')
+
+var os = require('os')
+var url = require('url')
+var path = require('path')
+var log = require('npmlog')
+var readPackageTree = require('read-package-tree')
+var readJson = require('read-package-json')
+var asyncMap = require('slide').asyncMap
+var color = require('ansicolors')
+var styles = require('ansistyles')
+var table = require('text-table')
+var semver = require('semver')
+var npa = require('npm-package-arg')
+var mutateIntoLogicalTree = require('./install/mutate-into-logical-tree.js')
+var cache = require('./cache.js')
+var npm = require('./npm.js')
+var long = npm.config.get('long')
+var mapToRegistry = require('./utils/map-to-registry.js')
+var isExtraneous = require('./install/is-extraneous.js')
+var recalculateMetadata = require('./install/deps.js').recalculateMetadata
+
+function uniqName (item) {
+  return item[0].path + '|' + item[1] + '|' + item[7]
+}
+
+function uniq (list) {
+  var uniqed = []
+  var seen = {}
+  list.forEach(function (item) {
+    var name = uniqName(item)
+    if (seen[name]) return
+    seen[name] = true
+    uniqed.push(item)
+  })
+  return uniqed
+}
+
+function andRecalculateMetadata (next) {
+  return function (er, tree) {
+    if (er) return next(er)
+    recalculateMetadata(tree, log, next)
+  }
+}
 
 function outdated (args, silent, cb) {
-  if (typeof cb !== "function") cb = silent, silent = false
-  var dir = path.resolve(npm.dir, "..")
+  if (typeof cb !== 'function') {
+    cb = silent
+    silent = false
+  }
+  var dir = path.resolve(npm.dir, '..')
 
   // default depth for `outdated` is 0 (cf. `ls`)
-  if (npm.config.get("depth") === Infinity) npm.config.set("depth", 0)
-
-  outdated_(args, dir, {}, 0, function (er, list) {
-    if (!list) list = []
-    if (er || silent || list.length === 0) return cb(er, list)
-    list.sort(function(a, b) {
-      var aa = a[1].toLowerCase()
-        , bb = b[1].toLowerCase()
-      return aa === bb ? 0
-           : aa < bb ? -1 : 1
-    })
-    if (npm.config.get("json")) {
-      console.log(makeJSON(list))
-    } else if (npm.config.get("parseable")) {
-      console.log(makeParseable(list))
-    } else {
-      var outList = list.map(makePretty)
-      var outHead = [ "Package"
-                    , "Current"
-                    , "Wanted"
-                    , "Latest"
-                    , "Location"
-                    ]
-      if (long) outHead.push("Package Type")
-      var outTable = [outHead].concat(outList)
-
-      if (npm.color) {
-        outTable[0] = outTable[0].map(function(heading) {
-          return styles.underline(heading)
-        })
-      }
+  if (npm.config.get('depth') === Infinity) npm.config.set('depth', 0)
+
+  readPackageTree(dir, andRecalculateMetadata(function (er, tree) {
+    mutateIntoLogicalTree(tree)
+    outdated_(args, '', tree, {}, 0, function (er, list) {
+      list = uniq(list || []).sort(function (aa, bb) {
+        return aa[0].path.localeCompare(bb[0].path) ||
+          aa[1].localeCompare(bb[1])
+      })
+      if (er || silent || list.length === 0) return cb(er, list)
+      log.disableProgress()
+      if (npm.config.get('json')) {
+        console.log(makeJSON(list))
+      } else if (npm.config.get('parseable')) {
+        console.log(makeParseable(list))
+      } else {
+        var outList = list.map(makePretty)
+        var outHead = [ 'Package',
+                        'Current',
+                        'Wanted',
+                        'Latest',
+                        'Location'
+                      ]
+        if (long) outHead.push('Package Type')
+        var outTable = [outHead].concat(outList)
+
+        if (npm.color) {
+          outTable[0] = outTable[0].map(function (heading) {
+            return styles.underline(heading)
+          })
+        }
 
-      var tableOpts = { align: ["l", "r", "r", "r", "l"]
-                      , stringLength: function(s) { return ansiTrim(s).length }
-                      }
-      console.log(table(outTable, tableOpts))
-    }
-    cb(null, list)
-  })
+        var tableOpts = {
+          align: ['l', 'r', 'r', 'r', 'l'],
+          stringLength: function (s) { return ansiTrim(s).length }
+        }
+        console.log(table(outTable, tableOpts))
+      }
+      cb(null, list.map(function (item) { return [item[0].parent.path].concat(item.slice(1, 7)) }))
+    })
+  }))
 }
 
 // [[ dir, dep, has, want, latest, type ]]
 function makePretty (p) {
-  var dep = p[1]
-    , dir = path.resolve(p[0], "node_modules", dep)
-    , has = p[2]
-    , want = p[3]
-    , latest = p[4]
-    , type = p[6]
-
-  if (!npm.config.get("global")) {
+  var dep = p[0]
+  var depname = p[1]
+  var dir = dep.path
+  var has = p[2]
+  var want = p[3]
+  var latest = p[4]
+  var type = p[6]
+  var deppath = p[7]
+
+  if (!npm.config.get('global')) {
     dir = path.relative(process.cwd(), dir)
   }
 
-  var columns = [ dep
-                , has || "MISSING"
-                , want
-                , latest
-                , dirToPrettyLocation(dir)
+  var columns = [ depname,
+                  has || 'MISSING',
+                  want,
+                  latest,
+                  deppath
                 ]
   if (long) columns[5] = type
 
   if (npm.color) {
-    columns[0] = color[has === want ? "yellow" : "red"](columns[0]) // dep
+    columns[0] = color[has === want ? 'yellow' : 'red'](columns[0]) // dep
     columns[2] = color.green(columns[2]) // want
     columns[3] = color.magenta(columns[3]) // latest
     columns[4] = color.brightBlack(columns[4]) // dir
@@ -117,171 +149,162 @@ function makePretty (p) {
 }
 
 function ansiTrim (str) {
-  var r = new RegExp("\x1b(?:\\[(?:\\d+[ABCDEFGJKSTm]|\\d+;\\d+[Hfm]|" +
-        "\\d+;\\d+;\\d+m|6n|s|u|\\?25[lh])|\\w)", "g")
-  return str.replace(r, "")
-}
-
-function dirToPrettyLocation (dir) {
-  return dir.replace(/^node_modules[/\\]/, "")
-            .replace(/[[/\\]node_modules[/\\]/g, " > ")
+  var r = new RegExp('\x1b(?:\\[(?:\\d+[ABCDEFGJKSTm]|\\d+;\\d+[Hfm]|' +
+        '\\d+;\\d+;\\d+m|6n|s|u|\\?25[lh])|\\w)', 'g')
+  return str.replace(r, '')
 }
 
 function makeParseable (list) {
   return list.map(function (p) {
-
-    var dep = p[1]
-      , dir = path.resolve(p[0], "node_modules", dep)
-      , has = p[2]
-      , want = p[3]
-      , latest = p[4]
-      , type = p[6]
-
-    var out = [ dir
-           , dep + "@" + want
-           , (has ? (dep + "@" + has) : "MISSING")
-           , dep + "@" + latest
-           ]
-   if (long) out.push(type)
-
-   return out.join(":")
+    var dep = p[0]
+    var depname = p[1]
+    var dir = dep.path
+    var has = p[2]
+    var want = p[3]
+    var latest = p[4]
+    var type = p[6]
+
+    var out = [
+      dir,
+      depname + '@' + want,
+      (has ? (depname + '@' + has) : 'MISSING'),
+      depname + '@' + latest
+    ]
+    if (long) out.push(type)
+
+    return out.join(':')
   }).join(os.EOL)
 }
 
 function makeJSON (list) {
   var out = {}
   list.forEach(function (p) {
-    var dir = path.resolve(p[0], "node_modules", p[1])
-    if (!npm.config.get("global")) {
+    var dep = p[0]
+    var depname = p[1]
+    var dir = dep.path
+    var has = p[2]
+    var want = p[3]
+    var latest = p[4]
+    var type = p[6]
+    if (!npm.config.get('global')) {
       dir = path.relative(process.cwd(), dir)
     }
-    out[p[1]] = { current: p[2]
-                , wanted: p[3]
-                , latest: p[4]
-                , location: dir
+    out[depname] = { current: has,
+                  wanted: want,
+                  latest: latest,
+                  location: dir
                 }
-    if (long) out[p[1]].type = p[6]
+    if (long) out[depname].type = type
   })
   return JSON.stringify(out, null, 2)
 }
 
-function outdated_ (args, dir, parentHas, depth, cb) {
-  // get the deps from package.json, or {<dir/node_modules/*>:"*"}
-  // asyncMap over deps:
-  //   shouldHave = cache.add(dep, req).version
-  //   if has === shouldHave then
-  //     return outdated(args, dir/node_modules/dep, parentHas + has)
-  //   else if dep in args or args is empty
-  //     return [dir, dep, has, shouldHave]
-
-  if (depth > npm.config.get("depth")) {
+function outdated_ (args, path, tree, parentHas, depth, cb) {
+  if (!tree.package) tree.package = {}
+  if (path && tree.package.name) path += ' > ' + tree.package.name
+  if (!path && tree.package.name) path = tree.package.name
+  if (depth > npm.config.get('depth')) {
     return cb(null, [])
   }
-  var deps = null
   var types = {}
-  readJson(path.resolve(dir, "package.json"), function (er, d) {
-    d = d || {}
-    if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
-    deps = (er) ? true : (d.dependencies || {})
-    if (!er) {
-      Object.keys(deps).forEach(function (k) {
-        types[k] = "dependencies"
-      })
-    }
-
-    if (npm.config.get("save-dev")) {
-      deps = d.devDependencies || {}
-      Object.keys(deps).forEach(function (k) {
-        types[k] = "devDependencies"
-      })
+  var pkg = tree.package
 
-      return next()
-    }
-
-    if (npm.config.get("save")) {
-      // remove optional dependencies from dependencies during --save.
-      Object.keys(d.optionalDependencies || {}).forEach(function (k) {
-        delete deps[k]
-      })
-      return next()
-    }
+  var deps = tree.children.filter(function (child) { return !isExtraneous(child) }) || []
 
-    if (npm.config.get("save-optional")) {
-      deps = d.optionalDependencies || {}
-      Object.keys(deps).forEach(function (k) {
-        types[k] = "optionalDependencies"
-      })
-      return next()
-    }
-
-    var doUpdate = npm.config.get("dev") ||
-                    (!npm.config.get("production") &&
-                    !Object.keys(parentHas).length &&
-                    !npm.config.get("global"))
-
-    if (!er && d && doUpdate) {
-      Object.keys(d.devDependencies || {}).forEach(function (k) {
-        if (!(k in parentHas)) {
-          deps[k] = d.devDependencies[k]
-          types[k] = "devDependencies"
-        }
-      })
-    }
-    return next()
+  deps.forEach(function (dep) {
+    types[dep.package.name] = 'dependencies'
   })
 
-  var has = null
-  readInstalled(path.resolve(dir), { dev : true }, function (er, data) {
-    if (er) {
-      has = Object.create(parentHas)
-      return next()
-    }
-    var pkgs = Object.keys(data.dependencies)
-    pkgs = pkgs.filter(function (p) {
-      return !p.match(/^[\._-]/)
+  Object.keys(tree.missingDeps).forEach(function (name) {
+    deps.push({
+      package: { name: name },
+      path: tree.path,
+      parent: tree,
+      isMissing: true
     })
-    asyncMap(pkgs, function (pkg, cb) {
-      var jsonFile = path.resolve(dir, "node_modules", pkg, "package.json")
-      readJson(jsonFile, function (er, d) {
-        if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
-        if (d && d.name && d.private) delete deps[d.name]
-        cb(null, er ? [] : [[d.name, d.version, d._from]])
-      })
-    }, function (er, pvs) {
-      if (er) return cb(er)
-      has = Object.create(parentHas)
-      pvs.forEach(function (pv) {
-        has[pv[0]] = {
-          version: pv[1],
-          from: pv[2]
-        }
+    types[name] = 'dependencies'
+  })
+
+  // If we explicitly asked for dev deps OR we didn't ask for production deps
+  // AND we asked to save dev-deps OR we didn't ask to save anything that's NOT
+  // dev deps then…
+  // (All the save checking here is because this gets called from npm-update currently
+  // and that requires this logic around dev deps.)
+  // FIXME: Refactor npm update to not be in terms of outdated.
+  var dev = npm.config.get('dev') || /^dev(elopment)?$/.test(npm.config.get('also'))
+  var prod = npm.config.get('production') || /^prod(uction)?$/.test(npm.config.get('only'))
+  if ((dev || !prod) &&
+      (npm.config.get('save-dev') || (
+        !npm.config.get('save') && !npm.config.get('save-optional')))) {
+    Object.keys(tree.missingDevDeps).forEach(function (name) {
+      deps.push({
+        package: { name: name },
+        path: tree.path,
+        parent: tree,
+        isMissing: true
       })
+      if (!types[name]) {
+        types[name] = 'devDependencies'
+      }
+    })
+  }
 
-      next()
+  if (npm.config.get('save-dev')) {
+    deps = deps.filter(function (dep) { return pkg.devDependencies[dep.package.name] })
+    deps.forEach(function (dep) {
+      types[dep.package.name] = 'devDependencies'
     })
-  })
+  } else if (npm.config.get('save')) {
+    // remove optional dependencies from dependencies during --save.
+    deps = deps.filter(function (dep) { return !pkg.optionalDependencies[dep.package.name] })
+  } else if (npm.config.get('save-optional')) {
+    deps = deps.filter(function (dep) { return pkg.optionalDependencies[dep.package.name] })
+    deps.forEach(function (dep) {
+      types[dep.package.name] = 'optionalDependencies'
+    })
+  }
+  var doUpdate = dev || (
+    !prod &&
+    !Object.keys(parentHas).length &&
+    !npm.config.get('global')
+  )
+  if (doUpdate) {
+    Object.keys(pkg.devDependencies).forEach(function (k) {
+      if (!(k in parentHas)) {
+        deps[k] = pkg.devDependencies[k]
+        types[k] = 'devDependencies'
+      }
+    })
+  }
 
-  function next () {
-    if (!has || !deps) return
-    if (deps === true) {
-      deps = Object.keys(has).reduce(function (l, r) {
-        l[r] = "latest"
-        return l
-      }, {})
+  var has = Object.create(parentHas)
+  tree.children.forEach(function (child) {
+    if (child.package.name && child.package.private) {
+      deps = deps.filter(function (dep) { return dep !== child })
     }
+    has[child.package.name] = {
+      version: child.package.version,
+      from: child.package._from
+    }
+  })
 
-    // now get what we should have, based on the dep.
-    // if has[dep] !== shouldHave[dep], then cb with the data
-    // otherwise dive into the folder
-    asyncMap(Object.keys(deps), function (dep, cb) {
-      if (!long) return shouldUpdate(args, dir, dep, has, deps[dep], depth, cb)
-
-      shouldUpdate(args, dir, dep, has, deps[dep], depth, cb, types[dep])
-    }, cb)
-  }
+  // now get what we should have, based on the dep.
+  // if has[dep] !== shouldHave[dep], then cb with the data
+  // otherwise dive into the folder
+  asyncMap(deps, function (dep, cb) {
+    var name = dep.package.name
+    var required = (tree.package.dependencies)[name] ||
+                   (tree.package.optionalDependencies)[name] ||
+                   (tree.package.devDependencies)[name] ||
+                   dep.package._requested && dep.package._requested.spec ||
+                   '*'
+    if (!long) return shouldUpdate(args, dep, name, has, required, depth, path, cb)
+
+    shouldUpdate(args, dep, name, has, required, depth, path, cb, types[name])
+  }, cb)
 }
 
-function shouldUpdate (args, dir, dep, has, req, depth, cb, type) {
+function shouldUpdate (args, tree, dep, has, req, depth, pkgpath, cb, type) {
   // look up the most recent version.
   // if that's what we already have, or if it's not on the args list,
   // then dive into it.  Otherwise, cb() with the data.
@@ -292,31 +315,32 @@ function shouldUpdate (args, dir, dep, has, req, depth, cb, type) {
   function skip (er) {
     // show user that no viable version can be found
     if (er) return cb(er)
-    outdated_( args
-             , path.resolve(dir, "node_modules", dep)
-             , has
-             , depth + 1
-             , cb )
+    outdated_(args,
+              pkgpath,
+              tree,
+              has,
+              depth + 1,
+              cb)
   }
 
   function doIt (wanted, latest) {
     if (!long) {
-      return cb(null, [[ dir, dep, curr && curr.version, wanted, latest, req]])
+      return cb(null, [[ tree, dep, curr && curr.version, wanted, latest, req, null, pkgpath]])
     }
-    cb(null, [[ dir, dep, curr && curr.version, wanted, latest, req, type]])
+    cb(null, [[ tree, dep, curr && curr.version, wanted, latest, req, type, pkgpath]])
   }
 
   if (args.length && args.indexOf(dep) === -1) return skip()
   var parsed = npa(dep + '@' + req)
-  if (parsed.type === "git" || (parsed.hosted && parsed.hosted.type === "github")) {
-    return doIt("git", "git")
+  if (parsed.type === 'git' || parsed.type === 'hosted') {
+    return doIt('git', 'git')
   }
 
   // search for the latest package
   mapToRegistry(dep, npm.config, function (er, uri, auth) {
     if (er) return cb(er)
 
-    npm.registry.get(uri, { auth : auth }, updateDeps)
+    npm.registry.get(uri, { auth: auth }, updateDeps)
   })
 
   function updateLocalDeps (latestRegistryVersion) {
@@ -348,13 +372,14 @@ function shouldUpdate (args, dir, dep, has, req, depth, cb, type) {
       return updateLocalDeps()
     }
 
-    if (!d || !d["dist-tags"] || !d.versions) return cb()
-    var l = d.versions[d["dist-tags"].latest]
+    if (!d || !d['dist-tags'] || !d.versions) return cb()
+    var l = d.versions[d['dist-tags'].latest]
     if (!l) return cb()
 
     var r = req
-    if (d["dist-tags"][req])
-      r = d["dist-tags"][req]
+    if (d['dist-tags'][req]) {
+      r = d['dist-tags'][req]
+    }
 
     if (semver.validRange(r, true)) {
       // some kind of semver range.
@@ -369,11 +394,11 @@ function shouldUpdate (args, dir, dep, has, req, depth, cb, type) {
     // We didn't find the version in the doc.  See if cache can find it.
     cache.add(dep, req, null, false, onCacheAdd)
 
-    function onCacheAdd(er, d) {
+    function onCacheAdd (er, d) {
       // if this fails, then it means we can't update this thing.
       // it's probably a thing that isn't published.
       if (er) {
-        if (er.code && er.code === "ETARGET") {
+        if (er.code && er.code === 'ETARGET') {
           // no viable version found
           return skip(er)
         }
@@ -385,14 +410,14 @@ function shouldUpdate (args, dir, dep, has, req, depth, cb, type) {
       var dFromUrl = d._from && url.parse(d._from).protocol
       var cFromUrl = curr && curr.from && url.parse(curr.from).protocol
 
-      if (!curr || dFromUrl && cFromUrl && d._from !== curr.from
-          || d.version !== curr.version
-          || d.version !== l.version) {
+      if (!curr ||
+          dFromUrl && cFromUrl && d._from !== curr.from ||
+          d.version !== curr.version ||
+          d.version !== l.version) {
         if (parsed.type === 'local') return updateLocalDeps(l.version)
 
         doIt(d.version, l.version)
-      }
-      else {
+      } else {
         skip()
       }
     }
diff --git a/deps/npm/lib/owner.js b/deps/npm/lib/owner.js
index c9adb792249d75..f32f405dd19e64 100644
--- a/deps/npm/lib/owner.js
+++ b/deps/npm/lib/owner.js
@@ -1,21 +1,21 @@
 module.exports = owner
 
-owner.usage = "npm owner add <username> <pkg>"
-            + "\nnpm owner rm <username> <pkg>"
-            + "\nnpm owner ls <pkg>"
+owner.usage = 'npm owner add <user> [<@scope>/]<pkg>' +
+              '\nnpm owner rm <user> [<@scope>/]<pkg>' +
+              '\nnpm owner ls [<@scope>/]<pkg>'
 
-var npm = require("./npm.js")
-  , log = require("npmlog")
-  , mapToRegistry = require("./utils/map-to-registry.js")
-  , readLocalPkg = require("./utils/read-local-package.js")
+var npm = require('./npm.js')
+var log = require('npmlog')
+var mapToRegistry = require('./utils/map-to-registry.js')
+var readLocalPkg = require('./utils/read-local-package.js')
 
 owner.completion = function (opts, cb) {
   var argv = opts.conf.argv.remain
   if (argv.length > 4) return cb()
   if (argv.length <= 2) {
-    var subs = ["add", "rm"]
-    if (opts.partialWord === "l") subs.push("ls")
-    else subs.push("ls", "list")
+    var subs = ['add', 'rm']
+    if (opts.partialWord === 'l') subs.push('ls')
+    else subs.push('ls', 'list')
     return cb(null, subs)
   }
 
@@ -25,44 +25,45 @@ owner.completion = function (opts, cb) {
     var un = encodeURIComponent(username)
     var byUser, theUser
     switch (argv[2]) {
-      case "ls":
+      case 'ls':
         // FIXME: there used to be registry completion here, but it stopped
         // making sense somewhere around 50,000 packages on the registry
         return cb()
 
-      case "rm":
+      case 'rm':
         if (argv.length > 3) {
           theUser = encodeURIComponent(argv[3])
-          byUser = "-/by-user/" + theUser + "|" + un
+          byUser = '-/by-user/' + theUser + '|' + un
           return mapToRegistry(byUser, npm.config, function (er, uri, auth) {
             if (er) return cb(er)
 
             console.error(uri)
-            npm.registry.get(uri, { auth : auth }, function (er, d) {
+            npm.registry.get(uri, { auth: auth }, function (er, d) {
               if (er) return cb(er)
               // return the intersection
               return cb(null, d[theUser].filter(function (p) {
                 // kludge for server adminery.
-                return un === "isaacs" || d[un].indexOf(p) === -1
+                return un === 'isaacs' || d[un].indexOf(p) === -1
               }))
             })
           })
         }
         // else fallthrough
-      case "add":
+        /*eslint no-fallthrough:0*/
+      case 'add':
         if (argv.length > 3) {
           theUser = encodeURIComponent(argv[3])
-          byUser = "-/by-user/" + theUser + "|" + un
+          byUser = '-/by-user/' + theUser + '|' + un
           return mapToRegistry(byUser, npm.config, function (er, uri, auth) {
             if (er) return cb(er)
 
             console.error(uri)
-            npm.registry.get(uri, { auth : auth }, function (er, d) {
+            npm.registry.get(uri, { auth: auth }, function (er, d) {
               console.error(uri, er || d)
               // return mine that they're not already on.
               if (er) return cb(er)
               var mine = d[un] || []
-                , theirs = d[theUser] || []
+              var theirs = d[theUser] || []
               return cb(null, mine.filter(function (p) {
                 return theirs.indexOf(p) === -1
               }))
@@ -70,10 +71,10 @@ owner.completion = function (opts, cb) {
           })
         }
         // just list all users who aren't me.
-        return mapToRegistry("-/users", npm.config, function (er, uri, auth) {
+        return mapToRegistry('-/users', npm.config, function (er, uri, auth) {
           if (er) return cb(er)
 
-          npm.registry.get(uri, { auth : auth }, function (er, list) {
+          npm.registry.get(uri, { auth: auth }, function (er, list) {
             if (er) return cb()
             return cb(null, Object.keys(list).filter(function (n) {
               return n !== un
@@ -90,34 +91,39 @@ owner.completion = function (opts, cb) {
 function owner (args, cb) {
   var action = args.shift()
   switch (action) {
-    case "ls": case "list": return ls(args[0], cb)
-    case "add": return add(args[0], args[1], cb)
-    case "rm": case "remove": return rm(args[0], args[1], cb)
+    case 'ls': case 'list': return ls(args[0], cb)
+    case 'add': return add(args[0], args[1], cb)
+    case 'rm': case 'remove': return rm(args[0], args[1], cb)
     default: return unknown(action, cb)
   }
 }
 
 function ls (pkg, cb) {
-  if (!pkg) return readLocalPkg(function (er, pkg) {
-    if (er) return cb(er)
-    if (!pkg) return cb(owner.usage)
-    ls(pkg, cb)
-  })
+  if (!pkg) {
+    return readLocalPkg(function (er, pkg) {
+      if (er) return cb(er)
+      if (!pkg) return cb(owner.usage)
+      ls(pkg, cb)
+    })
+  }
 
   mapToRegistry(pkg, npm.config, function (er, uri, auth) {
     if (er) return cb(er)
 
-    npm.registry.get(uri, { auth : auth }, function (er, data) {
-      var msg = ""
+    npm.registry.get(uri, { auth: auth }, function (er, data) {
+      var msg = ''
       if (er) {
-        log.error("owner ls", "Couldn't get owner data", pkg)
+        log.error('owner ls', "Couldn't get owner data", pkg)
         return cb(er)
       }
       var owners = data.maintainers
-      if (!owners || !owners.length) msg = "admin party!"
-      else msg = owners.map(function (o) {
-        return o.name + " <" + o.email + ">"
-      }).join("\n")
+      if (!owners || !owners.length) {
+        msg = 'admin party!'
+      } else {
+        msg = owners.map(function (o) {
+          return o.name + ' <' + o.email + '>'
+        }).join('\n')
+      }
       console.log(msg)
       cb(er, owners)
     })
@@ -126,20 +132,24 @@ function ls (pkg, cb) {
 
 function add (user, pkg, cb) {
   if (!user) return cb(owner.usage)
-  if (!pkg) return readLocalPkg(function (er, pkg) {
-    if (er) return cb(er)
-    if (!pkg) return cb(new Error(owner.usage))
-    add(user, pkg, cb)
-  })
+  if (!pkg) {
+    return readLocalPkg(function (er, pkg) {
+      if (er) return cb(er)
+      if (!pkg) return cb(new Error(owner.usage))
+      add(user, pkg, cb)
+    })
+  }
 
-  log.verbose("owner add", "%s to %s", user, pkg)
+  log.verbose('owner add', '%s to %s', user, pkg)
   mutate(pkg, user, function (u, owners) {
     if (!owners) owners = []
-    for (var i = 0, l = owners.length; i < l; i ++) {
+    for (var i = 0, l = owners.length; i < l; i++) {
       var o = owners[i]
       if (o.name === u.name) {
-        log.info( "owner add"
-                , "Already a package owner: " + o.name + " <" + o.email + ">")
+        log.info(
+          'owner add',
+          'Already a package owner: ' + o.name + ' <' + o.email + '>'
+        )
         return false
       }
     }
@@ -149,58 +159,69 @@ function add (user, pkg, cb) {
 }
 
 function rm (user, pkg, cb) {
-  if (!pkg) return readLocalPkg(function (er, pkg) {
-    if (er) return cb(er)
-    if (!pkg) return cb(new Error(owner.usage))
-    rm(user, pkg, cb)
-  })
+  if (!pkg) {
+    return readLocalPkg(function (er, pkg) {
+      if (er) return cb(er)
+      if (!pkg) return cb(new Error(owner.usage))
+      rm(user, pkg, cb)
+    })
+  }
 
-  log.verbose("owner rm", "%s from %s", user, pkg)
+  log.verbose('owner rm', '%s from %s', user, pkg)
   mutate(pkg, user, function (u, owners) {
     var found = false
-      , m = owners.filter(function (o) {
-          var match = (o.name === user)
-          found = found || match
-          return !match
-        })
+    var m = owners.filter(function (o) {
+      var match = (o.name === user)
+      found = found || match
+      return !match
+    })
+
     if (!found) {
-      log.info("owner rm", "Not a package owner: " + user)
+      log.info('owner rm', 'Not a package owner: ' + user)
       return false
     }
-    if (!m.length) return new Error(
-      "Cannot remove all owners of a package.  Add someone else first.")
+
+    if (!m.length) {
+      return new Error(
+        'Cannot remove all owners of a package.  Add someone else first.'
+      )
+    }
+
     return m
   }, cb)
 }
 
 function mutate (pkg, user, mutation, cb) {
   if (user) {
-    var byUser = "-/user/org.couchdb.user:" + user
+    var byUser = '-/user/org.couchdb.user:' + user
     mapToRegistry(byUser, npm.config, function (er, uri, auth) {
       if (er) return cb(er)
 
-      npm.registry.get(uri, { auth : auth }, mutate_)
+      npm.registry.get(uri, { auth: auth }, mutate_)
     })
   } else {
     mutate_(null, null)
   }
 
   function mutate_ (er, u) {
-    if (!er && user && (!u || u.error)) er = new Error(
-      "Couldn't get user data for " + user + ": " + JSON.stringify(u))
+    if (!er && user && (!u || u.error)) {
+      er = new Error(
+        "Couldn't get user data for " + user + ': ' + JSON.stringify(u)
+      )
+    }
 
     if (er) {
-      log.error("owner mutate", "Error getting user data for %s", user)
+      log.error('owner mutate', 'Error getting user data for %s', user)
       return cb(er)
     }
 
-    if (u) u = { "name" : u.name, "email" : u.email }
+    if (u) u = { name: u.name, email: u.email }
     mapToRegistry(pkg, npm.config, function (er, uri, auth) {
       if (er) return cb(er)
 
-      npm.registry.get(uri, { auth : auth }, function (er, data) {
+      npm.registry.get(uri, { auth: auth }, function (er, data) {
         if (er) {
-          log.error("owner mutate", "Error getting package data for %s", pkg)
+          log.error('owner mutate', 'Error getting package data for %s', pkg)
           return cb(er)
         }
 
@@ -213,32 +234,30 @@ function mutate (pkg, user, mutation, cb) {
         if (m instanceof Error) return cb(m) // error
 
         data = {
-          _id : data._id,
-          _rev : data._rev,
-          maintainers : m
+          _id: data._id,
+          _rev: data._rev,
+          maintainers: m
         }
-        var dataPath = pkg.replace("/", "%2f") + "/-rev/" + data._rev
+        var dataPath = pkg.replace('/', '%2f') + '/-rev/' + data._rev
         mapToRegistry(dataPath, npm.config, function (er, uri, auth) {
           if (er) return cb(er)
 
           var params = {
-            method : "PUT",
-            body : data,
-            auth : auth
+            method: 'PUT',
+            body: data,
+            auth: auth
           }
           npm.registry.request(uri, params, function (er, data) {
             if (!er && data.error) {
-              er = new Error("Failed to update package metadata: "+JSON.stringify(data))
+              er = new Error('Failed to update package metadata: ' + JSON.stringify(data))
             }
 
             if (er) {
-              log.error("owner mutate", "Failed to update package metadata")
-            }
-            else if (m.length > beforeMutation) {
-              console.log("+ %s (%s)", user, pkg)
-            }
-            else if (m.length < beforeMutation) {
-              console.log("- %s (%s)", user, pkg)
+              log.error('owner mutate', 'Failed to update package metadata')
+            } else if (m.length > beforeMutation) {
+              console.log('+ %s (%s)', user, pkg)
+            } else if (m.length < beforeMutation) {
+              console.log('- %s (%s)', user, pkg)
             }
 
             cb(er, data)
@@ -250,5 +269,5 @@ function mutate (pkg, user, mutation, cb) {
 }
 
 function unknown (action, cb) {
-  cb("Usage: \n" + owner.usage)
+  cb('Usage: \n' + owner.usage)
 }
diff --git a/deps/npm/lib/pack.js b/deps/npm/lib/pack.js
index a5ce90094f6a3a..d596dd034b9b39 100644
--- a/deps/npm/lib/pack.js
+++ b/deps/npm/lib/pack.js
@@ -4,39 +4,42 @@
 
 module.exports = pack
 
-var npm = require("./npm.js")
-  , install = require("./install.js")
-  , cache = require("./cache.js")
-  , fs = require("graceful-fs")
-  , chain = require("slide").chain
-  , path = require("path")
-  , cwd = process.cwd()
-  , writeStream = require('fs-write-stream-atomic')
-  , cachedPackageRoot = require("./cache/cached-package-root.js")
+var install = require('./install.js')
+var cache = require('./cache.js')
+var fs = require('graceful-fs')
+var chain = require('slide').chain
+var path = require('path')
+var cwd = process.cwd()
+var writeStream = require('fs-write-stream-atomic')
+var cachedPackageRoot = require('./cache/cached-package-root.js')
 
-pack.usage = "npm pack <pkg>"
+pack.usage = 'npm pack [[<@scope>/]<pkg>...]'
 
 // if it can be installed, it can be packed.
 pack.completion = install.completion
 
 function pack (args, silent, cb) {
-  if (typeof cb !== "function") cb = silent, silent = false
+  if (typeof cb !== 'function') {
+    cb = silent
+    silent = false
+  }
 
-  if (args.length === 0) args = ["."]
+  if (args.length === 0) args = ['.']
 
-  chain(args.map(function (arg) { return function (cb) {
-    pack_(arg, cb)
-  }}), function (er, files) {
-    if (er || silent) return cb(er, files)
-    printFiles(files, cb)
-  })
+  chain(
+    args.map(function (arg) { return function (cb) { pack_(arg, cb) } }),
+    function (er, files) {
+      if (er || silent) return cb(er, files)
+      printFiles(files, cb)
+    }
+  )
 }
 
 function printFiles (files, cb) {
   files = files.map(function (file) {
     return path.relative(cwd, file)
   })
-  console.log(files.join("\n"))
+  console.log(files.join('\n'))
   cb()
 }
 
@@ -47,17 +50,17 @@ function pack_ (pkg, cb) {
 
     // scoped packages get special treatment
     var name = data.name
-    if (name[0] === "@") name = name.substr(1).replace(/\//g, "-")
-    var fname = name + "-" + data.version + ".tgz"
+    if (name[0] === '@') name = name.substr(1).replace(/\//g, '-')
+    var fname = name + '-' + data.version + '.tgz'
 
-    var cached = path.join(cachedPackageRoot(data), "package.tgz")
-      , from = fs.createReadStream(cached)
-      , to = writeStream(fname)
-      , errState = null
+    var cached = path.join(cachedPackageRoot(data), 'package.tgz')
+    var from = fs.createReadStream(cached)
+    var to = writeStream(fname)
+    var errState = null
 
-    from.on("error", cb_)
-    to.on("error", cb_)
-    to.on("close", cb_)
+    from.on('error', cb_)
+    to.on('error', cb_)
+    to.on('close', cb_)
     from.pipe(to)
 
     function cb_ (er) {
diff --git a/deps/npm/lib/prefix.js b/deps/npm/lib/prefix.js
index e002edea155d12..42f61103f64a2e 100644
--- a/deps/npm/lib/prefix.js
+++ b/deps/npm/lib/prefix.js
@@ -1,11 +1,14 @@
 module.exports = prefix
 
-var npm = require("./npm.js")
+var npm = require('./npm.js')
 
-prefix.usage = "npm prefix\nnpm prefix -g\n(just prints the prefix folder)"
+prefix.usage = 'npm prefix [-g]'
 
 function prefix (args, silent, cb) {
-  if (typeof cb !== "function") cb = silent, silent = false
+  if (typeof cb !== 'function') {
+    cb = silent
+    silent = false
+  }
   if (!silent) console.log(npm.prefix)
   process.nextTick(cb.bind(this, null, npm.prefix))
 }
diff --git a/deps/npm/lib/prune.js b/deps/npm/lib/prune.js
index edba876013580b..46373742f59afd 100644
--- a/deps/npm/lib/prune.js
+++ b/deps/npm/lib/prune.js
@@ -2,28 +2,28 @@
 
 module.exports = prune
 
-prune.usage = "npm prune"
+prune.usage = 'npm prune [[<@scope>/]<pkg>...] [--production]'
 
-var readInstalled = require("read-installed")
-  , npm = require("./npm.js")
-  , path = require("path")
-  , readJson = require("read-package-json")
-  , log = require("npmlog")
+var readInstalled = require('read-installed')
+var npm = require('./npm.js')
+var path = require('path')
+var readJson = require('read-package-json')
+var log = require('npmlog')
 
-prune.completion = require("./utils/completion/installed-deep.js")
+prune.completion = require('./utils/completion/installed-deep.js')
 
 function prune (args, cb) {
-  //check if is a valid package.json file
-  var jsonFile = path.resolve(npm.dir, "..", "package.json" )
+  // check if is a valid package.json file
+  var jsonFile = path.resolve(npm.dir, '..', 'package.json')
   readJson(jsonFile, log.warn, function (er) {
     if (er) return cb(er)
     next()
   })
 
-  function next() {
+  function next () {
     var opt = {
-      depth: npm.config.get("depth"),
-      dev: !npm.config.get("production") || npm.config.get("dev")
+      depth: npm.config.get('depth'),
+      dev: !npm.config.get('production') || npm.config.get('dev')
     }
     readInstalled(npm.prefix, opt, function (er, data) {
       if (er) return cb(er)
@@ -39,11 +39,9 @@ function prune_ (args, data, cb) {
 function prunables (args, data, seen) {
   var deps = data.dependencies || {}
   return Object.keys(deps).map(function (d) {
-    if (typeof deps[d] !== "object"
-        || seen.indexOf(deps[d]) !== -1) return null
+    if (typeof deps[d] !== 'object' || seen.indexOf(deps[d]) !== -1) return null
     seen.push(deps[d])
-    if (deps[d].extraneous
-        && (args.length === 0 || args.indexOf(d) !== -1)) {
+    if (deps[d].extraneous && (args.length === 0 || args.indexOf(d) !== -1)) {
       var extra = deps[d]
       delete deps[d]
       return extra.path
@@ -51,6 +49,6 @@ function prunables (args, data, seen) {
     return prunables(args, deps[d], seen)
   }).filter(function (d) { return d !== null })
   .reduce(function FLAT (l, r) {
-    return l.concat(Array.isArray(r) ? r.reduce(FLAT,[]) : r)
+    return l.concat(Array.isArray(r) ? r.reduce(FLAT, []) : r)
   }, [])
 }
diff --git a/deps/npm/lib/publish.js b/deps/npm/lib/publish.js
index 8f1c73c3c98fe5..45de4f24b40ef9 100644
--- a/deps/npm/lib/publish.js
+++ b/deps/npm/lib/publish.js
@@ -1,23 +1,22 @@
 
 module.exports = publish
 
-var npm = require("./npm.js")
-  , log = require("npmlog")
-  , path = require("path")
-  , readJson = require("read-package-json")
-  , lifecycle = require("./utils/lifecycle.js")
-  , chain = require("slide").chain
-  , mapToRegistry = require("./utils/map-to-registry.js")
-  , cachedPackageRoot = require("./cache/cached-package-root.js")
-  , createReadStream = require("graceful-fs").createReadStream
-  , npa = require("npm-package-arg")
-  , semver = require('semver')
-  , getPublishConfig = require("./utils/get-publish-config.js")
-
-publish.usage = "npm publish <tarball> [--tag <tagname>]"
-              + "\nnpm publish <folder> [--tag <tagname>]"
-              + "\n\nPublishes '.' if no argument supplied"
-              + "\n\nSets tag `latest` if no --tag specified"
+var npm = require('./npm.js')
+var log = require('npmlog')
+var path = require('path')
+var readJson = require('read-package-json')
+var lifecycle = require('./utils/lifecycle.js')
+var chain = require('slide').chain
+var mapToRegistry = require('./utils/map-to-registry.js')
+var cachedPackageRoot = require('./cache/cached-package-root.js')
+var createReadStream = require('graceful-fs').createReadStream
+var npa = require('npm-package-arg')
+var semver = require('semver')
+var getPublishConfig = require('./utils/get-publish-config.js')
+
+publish.usage = 'npm publish [<tarball>|<folder>] [--tag <tag>] [--access <public|restricted>]' +
+                "\n\nPublishes '.' if no argument supplied" +
+                '\n\nSets tag `latest` if no --tag specified'
 
 publish.completion = function (opts, cb) {
   // publish can complete to a folder with a package.json
@@ -27,29 +26,29 @@ publish.completion = function (opts, cb) {
 }
 
 function publish (args, isRetry, cb) {
-  if (typeof cb !== "function") {
+  if (typeof cb !== 'function') {
     cb = isRetry
     isRetry = false
   }
-  if (args.length === 0) args = ["."]
+  if (args.length === 0) args = ['.']
   if (args.length !== 1) return cb(publish.usage)
 
-  log.verbose("publish", args)
+  log.verbose('publish', args)
 
   var t = npm.config.get('tag').trim()
   if (semver.validRange(t)) {
-    var er = new Error("Tag name must not be a valid SemVer range: " + t)
+    var er = new Error('Tag name must not be a valid SemVer range: ' + t)
     return cb(er)
   }
 
   var arg = args[0]
   // if it's a local folder, then run the prepublish there, first.
-  readJson(path.resolve(arg, "package.json"), function (er, data) {
-    if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
+  readJson(path.resolve(arg, 'package.json'), function (er, data) {
+    if (er && er.code !== 'ENOENT' && er.code !== 'ENOTDIR') return cb(er)
 
     if (data) {
-      if (!data.name) return cb(new Error("No name provided"))
-      if (!data.version) return cb(new Error("No version provided"))
+      if (!data.name) return cb(new Error('No name provided'))
+      if (!data.version) return cb(new Error('No version provided'))
     }
 
     // Error is OK. Could be publishing a URL or tarball, however, that means
@@ -61,26 +60,29 @@ function publish (args, isRetry, cb) {
 }
 
 // didPre in this case means that we already ran the prepublish script,
-// and that the "dir" is an actual directory, and not something silly
+// and that the 'dir' is an actual directory, and not something silly
 // like a tarball or name@version thing.
 // That means that we can run publish/postpublish in the dir, rather than
 // in the cache dir.
 function cacheAddPublish (dir, didPre, isRetry, cb) {
   npm.commands.cache.add(dir, null, null, false, function (er, data) {
     if (er) return cb(er)
-    log.silly("publish", data)
-    var cachedir = path.resolve(cachedPackageRoot(data), "package")
-    chain([ !didPre &&
-          [lifecycle, data, "prepublish", cachedir]
-        , [publish_, dir, data, isRetry, cachedir]
-        , [lifecycle, data, "publish", didPre ? dir : cachedir]
-        , [lifecycle, data, "postpublish", didPre ? dir : cachedir] ]
-      , cb )
+    log.silly('publish', data)
+    var cachedir = path.resolve(cachedPackageRoot(data), 'package')
+    chain(
+      [
+        !didPre && [lifecycle, data, 'prepublish', cachedir],
+        [publish_, dir, data, isRetry, cachedir],
+        [lifecycle, data, 'publish', didPre ? dir : cachedir],
+        [lifecycle, data, 'postpublish', didPre ? dir : cachedir]
+      ],
+      cb
+    )
   })
 }
 
 function publish_ (arg, data, isRetry, cachedir, cb) {
-  if (!data) return cb(new Error("no package.json file found"))
+  if (!data) return cb(new Error('no package.json file found'))
 
   var mappedConfig = getPublishConfig(
     data.publishConfig,
@@ -90,51 +92,52 @@ function publish_ (arg, data, isRetry, cachedir, cb) {
   var config = mappedConfig.config
   var registry = mappedConfig.client
 
-  data._npmVersion  = npm.version
+  data._npmVersion = npm.version
   data._nodeVersion = process.versions.node
 
   delete data.modules
-  if (data.private) return cb(
-    new Error(
-      "This package has been marked as private\n" +
+  if (data.private) {
+    return cb(new Error(
+      'This package has been marked as private\n' +
       "Remove the 'private' field from the package.json to publish it."
-    )
-  )
+    ))
+  }
 
   mapToRegistry(data.name, config, function (er, registryURI, auth, registryBase) {
     if (er) return cb(er)
 
-    var tarballPath = cachedir + ".tgz"
+    var tarballPath = cachedir + '.tgz'
 
     // we just want the base registry URL in this case
-    log.verbose("publish", "registryBase", registryBase)
-    log.silly("publish", "uploading", tarballPath)
+    log.verbose('publish', 'registryBase', registryBase)
+    log.silly('publish', 'uploading', tarballPath)
 
     data._npmUser = {
-      name  : auth.username,
-      email : auth.email
+      name: auth.username,
+      email: auth.email
     }
 
     var params = {
-      metadata : data,
-      body     : createReadStream(tarballPath),
-      auth     : auth
+      metadata: data,
+      body: createReadStream(tarballPath),
+      auth: auth
     }
 
     // registry-frontdoor cares about the access level, which is only
     // configurable for scoped packages
-    if (config.get("access")) {
-      if (!npa(data.name).scope && config.get("access") === "restricted") {
+    if (config.get('access')) {
+      if (!npa(data.name).scope && config.get('access') === 'restricted') {
         return cb(new Error("Can't restrict access to unscoped packages."))
       }
 
-      params.access = config.get("access")
+      params.access = config.get('access')
     }
 
+    log.showProgress('publish:' + data._id)
     registry.publish(registryBase, params, function (er) {
-      if (er && er.code === "EPUBLISHCONFLICT" &&
-          npm.config.get("force") && !isRetry) {
-        log.warn("publish", "Forced publish over " + data._id)
+      if (er && er.code === 'EPUBLISHCONFLICT' &&
+          npm.config.get('force') && !isRetry) {
+        log.warn('publish', 'Forced publish over ' + data._id)
         return npm.commands.unpublish([data._id], function (er) {
           // ignore errors.  Use the force.  Reach out with your feelings.
           // but if it fails again, then report the first error.
@@ -144,7 +147,8 @@ function publish_ (arg, data, isRetry, cachedir, cb) {
       // report the unpublish error if this was a retry and unpublish failed
       if (er && isRetry && isRetry !== true) return cb(isRetry)
       if (er) return cb(er)
-      console.log("+ " + data._id)
+      log.clearProgress()
+      console.log('+ ' + data._id)
       cb()
     })
   })
diff --git a/deps/npm/lib/rebuild.js b/deps/npm/lib/rebuild.js
index ab372c6ec07c7e..0e36c6361efef0 100644
--- a/deps/npm/lib/rebuild.js
+++ b/deps/npm/lib/rebuild.js
@@ -1,27 +1,27 @@
 
 module.exports = rebuild
 
-var readInstalled = require("read-installed")
-  , semver = require("semver")
-  , log = require("npmlog")
-  , npm = require("./npm.js")
-  , npa = require("npm-package-arg")
+var readInstalled = require('read-installed')
+var semver = require('semver')
+var log = require('npmlog')
+var npm = require('./npm.js')
+var npa = require('npm-package-arg')
 
-rebuild.usage = "npm rebuild [<name>[@<version>] [name[@<version>] ...]]"
+rebuild.usage = 'npm rebuild [[<@scope>/<name>]...]'
 
-rebuild.completion = require("./utils/completion/installed-deep.js")
+rebuild.completion = require('./utils/completion/installed-deep.js')
 
 function rebuild (args, cb) {
-  var opt = { depth: npm.config.get("depth"), dev: true }
+  var opt = { depth: npm.config.get('depth'), dev: true }
   readInstalled(npm.prefix, opt, function (er, data) {
-    log.info("readInstalled", typeof data)
+    log.info('readInstalled', typeof data)
     if (er) return cb(er)
     var set = filter(data, args)
-      , folders = Object.keys(set).filter(function (f) {
-          return f !== npm.prefix
-        })
+    var folders = Object.keys(set).filter(function (f) {
+      return f !== npm.prefix
+    })
     if (!folders.length) return cb()
-    log.silly("rebuild set", folders)
+    log.silly('rebuild set', folders)
     cleanBuild(folders, set, cb)
   })
 }
@@ -29,9 +29,11 @@ function rebuild (args, cb) {
 function cleanBuild (folders, set, cb) {
   npm.commands.build(folders, function (er) {
     if (er) return cb(er)
+    log.clearProgress()
     console.log(folders.map(function (f) {
-      return set[f] + " " + f
-    }).join("\n"))
+      return set[f] + ' ' + f
+    }).join('\n'))
+    log.showProgress()
     cb()
   })
 }
@@ -45,11 +47,11 @@ function filter (data, args, set, seen) {
   var pass
   if (!args.length) pass = true // rebuild everything
   else if (data.name && data._id) {
-    for (var i = 0, l = args.length; i < l; i ++) {
+    for (var i = 0, l = args.length; i < l; i++) {
       var arg = args[i]
-        , nv = npa(arg)
-        , n = nv.name
-        , v = nv.rawSpec
+      var nv = npa(arg)
+      var n = nv.name
+      var v = nv.rawSpec
       if (n !== data.name) continue
       if (!semver.satisfies(data.version, v, true)) continue
       pass = true
@@ -57,7 +59,7 @@ function filter (data, args, set, seen) {
     }
   }
   if (pass && data._id) {
-    log.verbose("rebuild", "path, id", [data.path, data._id])
+    log.verbose('rebuild', 'path, id', [data.path, data._id])
     set[data.path] = data._id
   }
   // need to also dive through kids, always.
@@ -66,7 +68,7 @@ function filter (data, args, set, seen) {
   Object.keys(data.dependencies || {}).forEach(function (d) {
     // return
     var dep = data.dependencies[d]
-    if (typeof dep === "string") return
+    if (typeof dep === 'string') return
     filter(dep, args, set, seen)
   })
   return set
diff --git a/deps/npm/lib/repo.js b/deps/npm/lib/repo.js
index 1b0454773d74d7..4bd200aff91832 100644
--- a/deps/npm/lib/repo.js
+++ b/deps/npm/lib/repo.js
@@ -1,18 +1,12 @@
-
 module.exports = repo
 
-repo.usage = "npm repo <pkgname>"
+repo.usage = 'npm repo [<pkg>]'
 
-var npm = require("./npm.js")
-  , opener = require("opener")
-  , github = require("github-url-from-git")
-  , githubUserRepo = require("github-url-from-username-repo")
-  , path = require("path")
-  , readJson = require("read-package-json")
-  , fs = require("fs")
-  , url_ = require("url")
-  , mapToRegistry = require("./utils/map-to-registry.js")
-  , npa = require("npm-package-arg")
+var npm = require('./npm.js')
+var opener = require('opener')
+var hostedGitInfo = require('hosted-git-info')
+var url_ = require('url')
+var fetchPackageMetadata = require('./fetch-package-metadata.js')
 
 repo.completion = function (opts, cb) {
   // FIXME: there used to be registry completion here, but it stopped making
@@ -21,58 +15,37 @@ repo.completion = function (opts, cb) {
 }
 
 function repo (args, cb) {
-  var n = args.length && npa(args[0]).name || "."
-  fs.stat(n, function (er, s) {
-    if (er && er.code === "ENOENT") return callRegistry(n, cb)
-    else if (er) return cb(er)
-    if (!s.isDirectory()) return callRegistry(n, cb)
-    readJson(path.resolve(n, "package.json"), function (er, d) {
-      if (er) return cb(er)
-      getUrlAndOpen(d, cb)
-    })
+  var n = args.length ? args[0] : '.'
+  fetchPackageMetadata(n, '.', function (er, d) {
+    if (er) return cb(er)
+    getUrlAndOpen(d, cb)
   })
 }
 
 function getUrlAndOpen (d, cb) {
   var r = d.repository
-  if (!r) return cb(new Error("no repository"))
+  if (!r) return cb(new Error('no repository'))
   // XXX remove this when npm@v1.3.10 from node 0.10 is deprecated
   // from https://github.com/npm/npm-www/issues/418
-  if (githubUserRepo(r.url))
-    r.url = githubUserRepo(r.url)
+  var info = hostedGitInfo.fromUrl(r.url)
+  var url = info ? info.browse() : unknownHostedUrl(r.url)
 
-  var url = (r.url && ~r.url.indexOf("github"))
-          ? github(r.url)
-          : nonGithubUrl(r.url)
-
-  if (!url)
-    return cb(new Error("no repository: could not get url"))
-  opener(url, { command: npm.config.get("browser") }, cb)
-}
+  if (!url) return cb(new Error('no repository: could not get url'))
 
-function callRegistry (n, cb) {
-  mapToRegistry(n, npm.config, function (er, uri) {
-    if (er) return cb(er)
-
-    npm.registry.get(uri + "/latest", { timeout : 3600 }, function (er, d) {
-      if (er) return cb(er)
-      getUrlAndOpen(d, cb)
-    })
-  })
+  opener(url, { command: npm.config.get('browser') }, cb)
 }
 
-function nonGithubUrl (url) {
+function unknownHostedUrl (url) {
   try {
-    var idx = url.indexOf("@")
+    var idx = url.indexOf('@')
     if (idx !== -1) {
-      url = url.slice(idx+1).replace(/:([^\d]+)/, "/$1")
+      url = url.slice(idx + 1).replace(/:([^\d]+)/, '/$1')
     }
     url = url_.parse(url)
-    var protocol = url.protocol === "https:"
-                 ? "https:"
-                 : "http:"
-    return protocol + "//" + (url.host || "") +
-      url.path.replace(/\.git$/, "")
-  }
-  catch(e) {}
+    var protocol = url.protocol === 'https:'
+                 ? 'https:'
+                 : 'http:'
+    return protocol + '//' + (url.host || '') +
+      url.path.replace(/\.git$/, '')
+  } catch(e) {}
 }
diff --git a/deps/npm/lib/restart.js b/deps/npm/lib/restart.js
index 69c4b913db62db..601249fd6b36b0 100644
--- a/deps/npm/lib/restart.js
+++ b/deps/npm/lib/restart.js
@@ -1 +1 @@
-module.exports = require("./utils/lifecycle.js").cmd("restart")
+module.exports = require('./utils/lifecycle.js').cmd('restart')
diff --git a/deps/npm/lib/root.js b/deps/npm/lib/root.js
index b2f731ed55ae99..958361d351a4b0 100644
--- a/deps/npm/lib/root.js
+++ b/deps/npm/lib/root.js
@@ -1,11 +1,14 @@
 module.exports = root
 
-var npm = require("./npm.js")
+var npm = require('./npm.js')
 
-root.usage = "npm root\nnpm root -g\n(just prints the root folder)"
+root.usage = 'npm root [-g]'
 
 function root (args, silent, cb) {
-  if (typeof cb !== "function") cb = silent, silent = false
+  if (typeof cb !== 'function') {
+    cb = silent
+    silent = false
+  }
   if (!silent) console.log(npm.dir)
   process.nextTick(cb.bind(this, null, npm.dir))
 }
diff --git a/deps/npm/lib/run-script.js b/deps/npm/lib/run-script.js
index 2c805615a42e3a..8c99c29b82a6d2 100644
--- a/deps/npm/lib/run-script.js
+++ b/deps/npm/lib/run-script.js
@@ -1,13 +1,14 @@
 module.exports = runScript
 
-var lifecycle = require("./utils/lifecycle.js")
-  , npm = require("./npm.js")
-  , path = require("path")
-  , readJson = require("read-package-json")
-  , log = require("npmlog")
-  , chain = require("slide").chain
+var lifecycle = require('./utils/lifecycle.js')
+var npm = require('./npm.js')
+var path = require('path')
+var readJson = require('read-package-json')
+var log = require('npmlog')
+var chain = require('slide').chain
 
-runScript.usage = "npm run-script <command> [-- <args>]"
+runScript.usage = 'npm run-script <command> [-- <args>...]' +
+                  '\n\nalias: npm run'
 
 runScript.completion = function (opts, cb) {
 
@@ -19,20 +20,19 @@ runScript.completion = function (opts, cb) {
   if (argv.length === 3) {
     // either specified a script locally, in which case, done,
     // or a package, in which case, complete against its scripts
-    var json = path.join(npm.localPrefix, "package.json")
+    var json = path.join(npm.localPrefix, 'package.json')
     return readJson(json, function (er, d) {
-      if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
+      if (er && er.code !== 'ENOENT' && er.code !== 'ENOTDIR') return cb(er)
       if (er) d = {}
       var scripts = Object.keys(d.scripts || {})
-      console.error("local scripts", scripts)
+      console.error('local scripts', scripts)
       if (scripts.indexOf(argv[2]) !== -1) return cb()
       // ok, try to find out which package it was, then
-      var pref = npm.config.get("global") ? npm.config.get("prefix")
+      var pref = npm.config.get('global') ? npm.config.get('prefix')
                : npm.localPrefix
-      var pkgDir = path.resolve( pref, "node_modules"
-                               , argv[2], "package.json" )
+      var pkgDir = path.resolve(pref, 'node_modules', argv[2], 'package.json')
       readJson(pkgDir, function (er, d) {
-        if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
+        if (er && er.code !== 'ENOENT' && er.code !== 'ENOTDIR') return cb(er)
         if (er) d = {}
         var scripts = Object.keys(d.scripts || {})
         return cb(null, scripts)
@@ -40,8 +40,8 @@ runScript.completion = function (opts, cb) {
     })
   }
 
-  readJson(path.join(npm.localPrefix, "package.json"), function (er, d) {
-    if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
+  readJson(path.join(npm.localPrefix, 'package.json'), function (er, d) {
+    if (er && er.code !== 'ENOENT' && er.code !== 'ENOTDIR') return cb(er)
     d = d || {}
     cb(null, Object.keys(d.scripts || {}))
   })
@@ -51,23 +51,30 @@ function runScript (args, cb) {
   if (!args.length) return list(cb)
 
   var pkgdir = npm.localPrefix
-    , cmd = args.shift()
+  var cmd = args.shift()
 
-  readJson(path.resolve(pkgdir, "package.json"), function (er, d) {
+  readJson(path.resolve(pkgdir, 'package.json'), function (er, d) {
     if (er) return cb(er)
     run(d, pkgdir, cmd, args, cb)
   })
 }
 
-function list(cb) {
-  var json = path.join(npm.localPrefix, "package.json")
-  var cmdList = [ "publish", "install", "uninstall"
-                , "test", "stop", "start", "restart", "version"
-                ].reduce(function (l, p) {
-                  return l.concat(["pre" + p, p, "post" + p])
-                }, [])
-  return readJson(json, function(er, d) {
-    if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
+function list (cb) {
+  var json = path.join(npm.localPrefix, 'package.json')
+  var cmdList = [
+    'publish',
+    'install',
+    'uninstall',
+    'test',
+    'stop',
+    'start',
+    'restart',
+    'version'
+  ].reduce(function (l, p) {
+    return l.concat(['pre' + p, p, 'post' + p])
+  }, [])
+  return readJson(json, function (er, d) {
+    if (er && er.code !== 'ENOENT' && er.code !== 'ENOTDIR') return cb(er)
     if (er) d = {}
     var allScripts = Object.keys(d.scripts || {})
     var scripts = []
@@ -77,37 +84,36 @@ function list(cb) {
       else runScripts.push(script)
     })
 
-    if (log.level === "silent") {
+    if (log.level === 'silent') {
       return cb(null, allScripts)
     }
 
-    if (npm.config.get("json")) {
+    if (npm.config.get('json')) {
       console.log(JSON.stringify(d.scripts || {}, null, 2))
       return cb(null, allScripts)
     }
 
-    if (npm.config.get("parseable")) {
-      allScripts.forEach(function(script) {
-        console.log(script + ":" + d.scripts[script])
+    if (npm.config.get('parseable')) {
+      allScripts.forEach(function (script) {
+        console.log(script + ':' + d.scripts[script])
       })
       return cb(null, allScripts)
     }
 
-    var s = "\n    "
-    var prefix = "  "
+    var s = '\n    '
+    var prefix = '  '
     if (scripts.length) {
-      console.log("Lifecycle scripts included in %s:", d.name)
+      console.log('Lifecycle scripts included in %s:', d.name)
     }
-    scripts.forEach(function(script) {
+    scripts.forEach(function (script) {
       console.log(prefix + script + s + d.scripts[script])
     })
     if (!scripts.length && runScripts.length) {
-      console.log("Scripts available in %s via `npm run-script`:", d.name)
+      console.log('Scripts available in %s via `npm run-script`:', d.name)
+    } else if (runScripts.length) {
+      console.log('\navailable via `npm run-script`:')
     }
-    else if (runScripts.length) {
-      console.log("\navailable via `npm run-script`:")
-    }
-    runScripts.forEach(function(script) {
+    runScripts.forEach(function (script) {
       console.log(prefix + script + s + d.scripts[script])
     })
     return cb(null, allScripts)
@@ -118,38 +124,38 @@ function run (pkg, wd, cmd, args, cb) {
   if (!pkg.scripts) pkg.scripts = {}
 
   var cmds
-  if (cmd === "restart" && !pkg.scripts.restart) {
+  if (cmd === 'restart' && !pkg.scripts.restart) {
     cmds = [
-      "prestop", "stop", "poststop",
-      "restart",
-      "prestart", "start", "poststart"
+      'prestop', 'stop', 'poststop',
+      'restart',
+      'prestart', 'start', 'poststart'
     ]
   } else {
     if (!pkg.scripts[cmd]) {
-      if (cmd === "test") {
-        pkg.scripts.test = "echo \"Error: no test specified\""
-      } else if (cmd === "env") {
-        if (process.platform === "win32") {
-          log.verbose("run-script using default platform env: SET (Windows)")
-          pkg.scripts[cmd] = "SET"
+      if (cmd === 'test') {
+        pkg.scripts.test = 'echo \'Error: no test specified\''
+      } else if (cmd === 'env') {
+        if (process.platform === 'win32') {
+          log.verbose('run-script using default platform env: SET (Windows)')
+          pkg.scripts[cmd] = 'SET'
         } else {
-          log.verbose("run-script using default platform env: env (Unix)")
-          pkg.scripts[cmd] = "env"
+          log.verbose('run-script using default platform env: env (Unix)')
+          pkg.scripts[cmd] = 'env'
         }
-      } else if (npm.config.get("if-present")) {
-        return cb(null);
+      } else if (npm.config.get('if-present')) {
+        return cb(null)
       } else {
-        return cb(new Error("missing script: " + cmd))
+        return cb(new Error('missing script: ' + cmd))
       }
     }
     cmds = [cmd]
   }
 
   if (!cmd.match(/^(pre|post)/)) {
-    cmds = ["pre"+cmd].concat(cmds).concat("post"+cmd)
+    cmds = ['pre' + cmd].concat(cmds).concat('post' + cmd)
   }
 
-  log.verbose("run-script", cmds)
+  log.verbose('run-script', cmds)
   chain(cmds.map(function (c) {
     // pass cli arguments after -- to script.
     if (pkg.scripts[c] && c === cmd) {
@@ -164,8 +170,8 @@ function run (pkg, wd, cmd, args, cb) {
 // join arguments after '--' and pass them to script,
 // handle special characters such as ', ", ' '.
 function joinArgs (args) {
-  var joinedArgs = ""
-  args.forEach(function(arg) {
+  var joinedArgs = ''
+  args.forEach(function (arg) {
     joinedArgs += ' "' + arg.replace(/"/g, '\\"') + '"'
   })
   return joinedArgs
diff --git a/deps/npm/lib/search.js b/deps/npm/lib/search.js
index 840bc2f6b785df..a029d62eb18d25 100644
--- a/deps/npm/lib/search.js
+++ b/deps/npm/lib/search.js
@@ -1,17 +1,18 @@
 
 module.exports = exports = search
 
-var npm = require("./npm.js")
-  , columnify = require("columnify")
-  , updateIndex = require("./cache/update-index.js")
+var npm = require('./npm.js')
+var columnify = require('columnify')
+var updateIndex = require('./cache/update-index.js')
 
-search.usage = "npm search [some search terms ...]"
+search.usage = 'npm search [--long] [search terms ...]' +
+               '\n\naliases: s, se'
 
 search.completion = function (opts, cb) {
   var compl = {}
-    , partial = opts.partialWord
-    , ipartial = partial.toLowerCase()
-    , plen = partial.length
+  var partial = opts.partialWord
+  var ipartial = partial.toLowerCase()
+  var plen = partial.length
 
   // get the batch of data that matches so far.
   // this is an example of using npm.commands.search programmatically
@@ -19,7 +20,7 @@ search.completion = function (opts, cb) {
   search(opts.conf.argv.remain.slice(2), true, function (er, data) {
     if (er) return cb(er)
     Object.keys(data).forEach(function (name) {
-      data[name].words.split(" ").forEach(function (w) {
+      data[name].words.split(' ').forEach(function (w) {
         if (w.toLowerCase().indexOf(ipartial) === 0) {
           compl[partial + w.substr(plen)] = true
         }
@@ -30,19 +31,25 @@ search.completion = function (opts, cb) {
 }
 
 function search (args, silent, staleness, cb) {
-  if (typeof cb !== "function") cb = staleness, staleness = 600
-  if (typeof cb !== "function") cb = silent, silent = false
+  if (typeof cb !== 'function') {
+    cb = staleness
+    staleness = 600
+  }
+  if (typeof cb !== 'function') {
+    cb = silent
+    silent = false
+  }
 
-  var searchopts = npm.config.get("searchopts")
-  var searchexclude = npm.config.get("searchexclude")
+  var searchopts = npm.config.get('searchopts')
+  var searchexclude = npm.config.get('searchexclude')
 
-  if (typeof searchopts !== "string") searchopts = ""
+  if (typeof searchopts !== 'string') searchopts = ''
   searchopts = searchopts.split(/\s+/)
   var opts = searchopts.concat(args).map(function (s) {
     return s.toLowerCase()
   }).filter(function (s) { return s })
 
-  if (typeof searchexclude === "string") {
+  if (typeof searchexclude === 'string') {
     searchexclude = searchexclude.split(/\s+/)
   } else {
     searchexclude = []
@@ -73,7 +80,7 @@ function filter (data, args, notArgs) {
   return Object.keys(data).map(function (d) {
     return data[d]
   }).filter(function (d) {
-    return typeof d === "object"
+    return typeof d === 'object'
   }).map(stripData).map(getWords).filter(function (data) {
     return filterWords(data, args, notArgs)
   }).reduce(function (l, r) {
@@ -83,51 +90,52 @@ function filter (data, args, notArgs) {
 }
 
 function stripData (data) {
-  return { name: data.name
-         , description: npm.config.get("description") ? data.description : ""
-         , maintainers: (data.maintainers || []).map(function (m) {
-             return "=" + m.name
-           })
-         , url: !Object.keys(data.versions || {}).length ? data.url : null
-         , keywords: data.keywords || []
-         , version: Object.keys(data.versions || {})[0] || []
-         , time: data.time
-                 && data.time.modified
-                 && (new Date(data.time.modified).toISOString()
-                     .split("T").join(" ")
-                     .replace(/:[0-9]{2}\.[0-9]{3}Z$/, ""))
-                     .slice(0, -5) // remove time
-                 || "prehistoric"
-         }
+  return {
+    name: data.name,
+    description: npm.config.get('description') ? data.description : '',
+    maintainers: (data.maintainers || []).map(function (m) {
+      return '=' + m.name
+    }),
+    url: !Object.keys(data.versions || {}).length ? data.url : null,
+    keywords: data.keywords || [],
+    version: Object.keys(data.versions || {})[0] || [],
+    time: data.time &&
+          data.time.modified &&
+          (new Date(data.time.modified).toISOString() // remove time
+            .split('T').join(' ')
+            .replace(/:[0-9]{2}\.[0-9]{3}Z$/, ''))
+            .slice(0, -5) ||
+          'prehistoric'
+  }
 }
 
 function getWords (data) {
   data.words = [ data.name ]
                .concat(data.description)
                .concat(data.maintainers)
-               .concat(data.url && ("<" + data.url + ">"))
+               .concat(data.url && ('<' + data.url + '>'))
                .concat(data.keywords)
                .map(function (f) { return f && f.trim && f.trim() })
                .filter(function (f) { return f })
-               .join(" ")
+               .join(' ')
                .toLowerCase()
   return data
 }
 
 function filterWords (data, args, notArgs) {
   var words = data.words
-  for (var i = 0, l = args.length; i < l; i ++) {
+  for (var i = 0, l = args.length; i < l; i++) {
     if (!match(words, args[i])) return false
   }
-  for (i = 0, l = notArgs.length; i < l; i ++) {
+  for (i = 0, l = notArgs.length; i < l; i++) {
     if (match(words, notArgs[i])) return false
   }
   return true
 }
 
 function match (words, arg) {
-  if (arg.charAt(0) === "/") {
-    arg = arg.replace(/\/$/, "")
+  if (arg.charAt(0) === '/') {
+    arg = arg.replace(/\/$/, '')
     arg = new RegExp(arg.substr(1, arg.length - 1))
     return words.match(arg)
   }
@@ -135,68 +143,71 @@ function match (words, arg) {
 }
 
 function prettify (data, args) {
-  var searchsort = (npm.config.get("searchsort") || "NAME").toLowerCase()
-    , sortField = searchsort.replace(/^\-+/, "")
-    , searchRev = searchsort.charAt(0) === "-"
-    , truncate = !npm.config.get("long")
+  var searchsort = (npm.config.get('searchsort') || 'NAME').toLowerCase()
+  var sortField = searchsort.replace(/^\-+/, '')
+  var searchRev = searchsort.charAt(0) === '-'
+  var truncate = !npm.config.get('long')
 
   if (Object.keys(data).length === 0) {
-    return "No match found for "+(args.map(JSON.stringify).join(" "))
+    return 'No match found for ' + (args.map(JSON.stringify).join(' '))
   }
 
   var lines = Object.keys(data).map(function (d) {
     // strip keyname
     return data[d]
-  }).map(function(dat) {
+  }).map(function (dat) {
     dat.author = dat.maintainers
     delete dat.maintainers
     dat.date = dat.time
     delete dat.time
     return dat
-  }).map(function(dat) {
+  }).map(function (dat) {
     // split keywords on whitespace or ,
-    if (typeof dat.keywords === "string") {
+    if (typeof dat.keywords === 'string') {
       dat.keywords = dat.keywords.split(/[,\s]+/)
     }
     if (Array.isArray(dat.keywords)) {
-      dat.keywords = dat.keywords.join(" ")
+      dat.keywords = dat.keywords.join(' ')
     }
 
     // split author on whitespace or ,
-    if (typeof dat.author === "string") {
+    if (typeof dat.author === 'string') {
       dat.author = dat.author.split(/[,\s]+/)
     }
     if (Array.isArray(dat.author)) {
-      dat.author = dat.author.join(" ")
+      dat.author = dat.author.join(' ')
     }
     return dat
   })
 
-  lines.sort(function(a, b) {
+  lines.sort(function (a, b) {
     var aa = a[sortField].toLowerCase()
-      , bb = b[sortField].toLowerCase()
+    var bb = b[sortField].toLowerCase()
     return aa === bb ? 0
          : aa < bb ? -1 : 1
   })
 
   if (searchRev) lines.reverse()
 
-  var columns = npm.config.get("description")
-               ? ["name", "description", "author", "date", "version", "keywords"]
-               : ["name", "author", "date", "version", "keywords"]
-
-  var output = columnify(lines, {
-        include: columns
-      , truncate: truncate
-      , config: {
-          name: { maxWidth: 40, truncate: false, truncateMarker: "" }
-        , description: { maxWidth: 60 }
-        , author: { maxWidth: 20 }
-        , date: { maxWidth: 11 }
-        , version: { maxWidth: 11 }
-        , keywords: { maxWidth: Infinity }
-      }
-  })
+  var columns = npm.config.get('description')
+               ? ['name', 'description', 'author', 'date', 'version', 'keywords']
+               : ['name', 'author', 'date', 'version', 'keywords']
+
+  var output = columnify(
+    lines,
+    {
+        include: columns,
+        truncate: truncate,
+        config: {
+          name: { maxWidth: 40, truncate: false, truncateMarker: '' },
+          description: { maxWidth: 60 },
+          author: { maxWidth: 20 },
+          date: { maxWidth: 11 },
+          version: { maxWidth: 11 },
+          keywords: { maxWidth: Infinity }
+        }
+    }
+  )
   output = trimToMaxWidth(output)
   output = highlightSearchTerms(output, args)
 
@@ -204,63 +215,63 @@ function prettify (data, args) {
 }
 
 var colors = [31, 33, 32, 36, 34, 35 ]
-  , cl = colors.length
+var cl = colors.length
 
 function addColorMarker (str, arg, i) {
   var m = i % cl + 1
-    , markStart = String.fromCharCode(m)
-    , markEnd = String.fromCharCode(0)
-
-  if (arg.charAt(0) === "/") {
-    //arg = arg.replace(/\/$/, "")
-    return str.replace( new RegExp(arg.substr(1, arg.length - 2), "gi")
-                      , function (bit) { return markStart + bit + markEnd } )
-
+  var markStart = String.fromCharCode(m)
+  var markEnd = String.fromCharCode(0)
+
+  if (arg.charAt(0) === '/') {
+    return str.replace(
+      new RegExp(arg.substr(1, arg.length - 2), 'gi'),
+      function (bit) { return markStart + bit + markEnd }
+    )
   }
 
   // just a normal string, do the split/map thing
   var pieces = str.toLowerCase().split(arg.toLowerCase())
-    , p = 0
+  var p = 0
 
   return pieces.map(function (piece) {
     piece = str.substr(p, piece.length)
-    var mark = markStart
-             + str.substr(p+piece.length, arg.length)
-             + markEnd
+    var mark = markStart +
+               str.substr(p + piece.length, arg.length) +
+               markEnd
     p += piece.length + arg.length
     return piece + mark
-  }).join("")
+  }).join('')
 }
 
 function colorize (line) {
-  for (var i = 0; i < cl; i ++) {
+  for (var i = 0; i < cl; i++) {
     var m = i + 1
-    var color = npm.color ? "\033["+colors[i]+"m" : ""
+    var color = npm.color ? '\u001B[' + colors[i] + 'm' : ''
     line = line.split(String.fromCharCode(m)).join(color)
   }
-  var uncolor = npm.color ? "\033[0m" : ""
-  return line.split("\u0000").join(uncolor)
+  var uncolor = npm.color ? '\u001B[0m' : ''
+  return line.split('\u0000').join(uncolor)
 }
 
-function getMaxWidth() {
+function getMaxWidth () {
   var cols
   try {
-    var tty = require("tty")
-      , stdout = process.stdout
+    var tty = require('tty')
+    var stdout = process.stdout
     cols = !tty.isatty(stdout.fd) ? Infinity : process.stdout.getWindowSize()[0]
     cols = (cols === 0) ? Infinity : cols
   } catch (ex) { cols = Infinity }
   return cols
 }
 
-function trimToMaxWidth(str) {
+function trimToMaxWidth (str) {
   var maxWidth = getMaxWidth()
-  return str.split("\n").map(function(line) {
+  return str.split('\n').map(function (line) {
     return line.slice(0, maxWidth)
-  }).join("\n")
+  }).join('\n')
 }
 
-function highlightSearchTerms(str, terms) {
+function highlightSearchTerms (str, terms) {
   terms.forEach(function (arg, i) {
     str = addColorMarker(str, arg, i)
   })
diff --git a/deps/npm/lib/set.js b/deps/npm/lib/set.js
index c83602ec1f6ce3..b5e7376fbd55f5 100644
--- a/deps/npm/lib/set.js
+++ b/deps/npm/lib/set.js
@@ -1,13 +1,13 @@
 
 module.exports = set
 
-set.usage = "npm set <key> <value> (See `npm config`)"
+set.usage = 'npm set <key> <value> (See `npm config`)'
 
-var npm = require("./npm.js")
+var npm = require('./npm.js')
 
 set.completion = npm.commands.config.completion
 
 function set (args, cb) {
   if (!args.length) return cb(set.usage)
-  npm.commands.config(["set"].concat(args), cb)
+  npm.commands.config(['set'].concat(args), cb)
 }
diff --git a/deps/npm/lib/shrinkwrap.js b/deps/npm/lib/shrinkwrap.js
index 03192a3fa47225..2a8cc7a29fa2e8 100644
--- a/deps/npm/lib/shrinkwrap.js
+++ b/deps/npm/lib/shrinkwrap.js
@@ -3,84 +3,127 @@
 
 module.exports = exports = shrinkwrap
 
-var npm = require("./npm.js")
-  , log = require("npmlog")
-  , fs = require("fs")
-  , writeFileAtomic = require("write-file-atomic")
-  , path = require("path")
-  , readJson = require("read-package-json")
-  , sortedObject = require("sorted-object")
+var path = require('path')
+var log = require('npmlog')
+var writeFileAtomic = require('write-file-atomic')
+var iferr = require('iferr')
+var readPackageTree = require('read-package-tree')
+var validate = require('aproba')
+var npm = require('./npm.js')
+var recalculateMetadata = require('./install/deps.js').recalculateMetadata
+var validatePeerDeps = require('./install/deps.js').validatePeerDeps
+var isExtraneous = require('./install/is-extraneous.js')
+var isOnlyDev = require('./install/is-dev.js').isOnlyDev
+var getPackageId = require('./install/get-package-id.js')
 
-shrinkwrap.usage = "npm shrinkwrap"
+shrinkwrap.usage = 'npm shrinkwrap'
 
 function shrinkwrap (args, silent, cb) {
-  if (typeof cb !== "function") cb = silent, silent = false
+  if (typeof cb !== 'function') {
+    cb = silent
+    silent = false
+  }
 
   if (args.length) {
-    log.warn("shrinkwrap", "doesn't take positional args")
+    log.warn('shrinkwrap', "doesn't take positional args")
   }
 
-  // https://github.com/npm/npm/issues/7641
-  // introduced because `npm ls` can now show dev and prod depenednecy
-  // trees separately
-  if (npm.config.get("dev")) {
-    npm.config.set("production", true)
-  }
-  npm.commands.ls([], true, function (er, _, pkginfo) {
-    if (er) return cb(er)
-    shrinkwrap_(pkginfo, silent, npm.config.get("dev"), cb)
-  })
+  var dir = path.resolve(npm.dir, '..')
+  npm.config.set('production', true)
+  readPackageTree(dir, andRecalculateMetadata(iferr(cb, function (tree) {
+    var pkginfo = treeToShrinkwrap(tree, !!npm.config.get('dev') || /^dev(elopment)?$/.test(npm.config.get('also')))
+    shrinkwrap_(pkginfo, silent, cb)
+  })))
 }
 
-function shrinkwrap_ (pkginfo, silent, dev, cb) {
-  if (pkginfo.problems) {
-    return cb(new Error("Problems were encountered\n"
-                       +"Please correct and try again.\n"
-                       +pkginfo.problems.join("\n")))
+function andRecalculateMetadata (next) {
+  validate('F', arguments)
+  return function (er, tree) {
+    validate('EO', arguments)
+    if (er) return next(er)
+    recalculateMetadata(tree, log, next)
   }
+}
 
-  if (!dev) {
-    // remove dev deps unless the user does --dev
-    readJson(path.resolve(npm.prefix, "package.json"), function (er, data) {
-      if (er)
-        return cb(er)
-      if (data.devDependencies) {
-        Object.keys(data.devDependencies).forEach(function (dep) {
-          if (data.dependencies && data.dependencies[dep]) {
-            // do not exclude the dev dependency if it's also listed as a dependency
-            return
-          }
+function treeToShrinkwrap (tree, dev) {
+  validate('OB', arguments)
+  var pkginfo = {}
+  if (tree.package.name) pkginfo.name = tree.package.name
+  if (tree.package.version) pkginfo.version = tree.package.version
+  var problems = []
+  if (tree.children.length) {
+    shrinkwrapDeps(dev, problems, pkginfo.dependencies = {}, tree)
+  }
+  if (problems.length) pkginfo.problems = problems
+  return pkginfo
+}
 
-          log.warn("shrinkwrap", "Excluding devDependency: %s", dep, data.dependencies)
-          delete pkginfo.dependencies[dep]
-        })
-      }
-      save(pkginfo, silent, cb)
+function shrinkwrapDeps (dev, problems, deps, tree, seen) {
+  validate('BAOO', [dev, problems, deps, tree])
+  if (!seen) seen = {}
+  if (seen[tree.path]) return
+  seen[tree.path] = true
+  Object.keys(tree.missingDeps).forEach(function (name) {
+    var invalid = tree.children.filter(function (dep) { return dep.package.name === name })[0]
+    if (invalid) {
+      problems.push('invalid: have ' + invalid.package._id + ' (expected: ' + tree.missingDeps[name] + ') ' + invalid.path)
+    } else {
+      var topname = getPackageId(tree)
+      problems.push('missing: ' + name + '@' + tree.package.dependencies[name] +
+        (topname ? ', required by ' + topname : ''))
+    }
+  })
+  tree.children.sort(function (aa, bb) { return aa.package.name.localeCompare(bb.package.name) }).forEach(function (child) {
+    if (!dev && isOnlyDev(child)) {
+      log.warn('shrinkwrap', 'Excluding devDependency: %s', child.package.name, child.parent.package.dependencies)
+      return
+    }
+    var pkginfo = deps[child.package.name] = {}
+    pkginfo.version = child.package.version
+    pkginfo.from = child.package._from
+    pkginfo.resolved = child.package._resolved
+    if (isExtraneous(child)) {
+      problems.push('extraneous: ' + child.package._id + ' ' + child.path)
+    }
+    validatePeerDeps(child, function (tree, pkgname, version) {
+      problems.push('peer invalid: ' + pkgname + '@' + version +
+        ', required by ' + child.package._id)
     })
-  } else {
-    save(pkginfo, silent, cb)
-  }
+    if (child.children.length) {
+      shrinkwrapDeps(dev, problems, pkginfo.dependencies = {}, child, seen)
+    }
+  })
 }
 
+function shrinkwrap_ (pkginfo, silent, cb) {
+  if (pkginfo.problems) {
+    return cb(new Error('Problems were encountered\n' +
+                        'Please correct and try again.\n' +
+                        pkginfo.problems.join('\n')))
+  }
+
+  save(pkginfo, silent, cb)
+}
 
 function save (pkginfo, silent, cb) {
   // copy the keys over in a well defined order
   // because javascript objects serialize arbitrarily
-  pkginfo.dependencies = sortedObject(pkginfo.dependencies || {})
   var swdata
   try {
-    swdata = JSON.stringify(pkginfo, null, 2) + "\n"
+    swdata = JSON.stringify(pkginfo, null, 2) + '\n'
   } catch (er) {
-    log.error("shrinkwrap", "Error converting package info to json")
+    log.error('shrinkwrap', 'Error converting package info to json')
     return cb(er)
   }
 
-  var file = path.resolve(npm.prefix, "npm-shrinkwrap.json")
+  var file = path.resolve(npm.prefix, 'npm-shrinkwrap.json')
 
   writeFileAtomic(file, swdata, function (er) {
     if (er) return cb(er)
     if (silent) return cb(null, pkginfo)
-    console.log("wrote npm-shrinkwrap.json")
+    log.clearProgress()
+    console.log('wrote npm-shrinkwrap.json')
+    log.showProgress()
     cb(null, pkginfo)
   })
 }
diff --git a/deps/npm/lib/star.js b/deps/npm/lib/star.js
index 1f324336c0c57f..29c4037d0cb2b0 100644
--- a/deps/npm/lib/star.js
+++ b/deps/npm/lib/star.js
@@ -1,13 +1,12 @@
-
 module.exports = star
 
-var npm = require("./npm.js")
-  , log = require("npmlog")
-  , asyncMap = require("slide").asyncMap
-  , mapToRegistry = require("./utils/map-to-registry.js")
+var npm = require('./npm.js')
+var log = require('npmlog')
+var asyncMap = require('slide').asyncMap
+var mapToRegistry = require('./utils/map-to-registry.js')
 
-star.usage = "npm star <package> [pkg, pkg, ...]\n"
-           + "npm unstar <package> [pkg, pkg, ...]"
+star.usage = 'npm star [<pkg>...]\n' +
+             'npm unstar [<pkg>...]'
 
 star.completion = function (opts, cb) {
   // FIXME: there used to be registry completion here, but it stopped making
@@ -17,22 +16,22 @@ star.completion = function (opts, cb) {
 
 function star (args, cb) {
   if (!args.length) return cb(star.usage)
-  var s = npm.config.get("unicode") ? "\u2605 " : "(*)"
-    , u = npm.config.get("unicode") ? "\u2606 " : "( )"
-    , using = !(npm.command.match(/^un/))
+  var s = npm.config.get('unicode') ? '\u2605 ' : '(*)'
+  var u = npm.config.get('unicode') ? '\u2606 ' : '( )'
+  var using = !(npm.command.match(/^un/))
   if (!using) s = u
   asyncMap(args, function (pkg, cb) {
     mapToRegistry(pkg, npm.config, function (er, uri, auth) {
       if (er) return cb(er)
 
       var params = {
-        starred : using,
-        auth    : auth
+        starred: using,
+        auth: auth
       }
       npm.registry.star(uri, params, function (er, data, raw, req) {
         if (!er) {
-          console.log(s + " "+pkg)
-          log.verbose("star", data)
+          console.log(s + ' ' + pkg)
+          log.verbose('star', data)
         }
         cb(er, data, raw, req)
       })
diff --git a/deps/npm/lib/stars.js b/deps/npm/lib/stars.js
index 01ec76e42c1f4c..4ad8f02e59dca9 100644
--- a/deps/npm/lib/stars.js
+++ b/deps/npm/lib/stars.js
@@ -1,10 +1,10 @@
 module.exports = stars
 
-stars.usage = "npm stars [username]"
+stars.usage = 'npm stars [<user>]'
 
-var npm = require("./npm.js")
-  , log = require("npmlog")
-  , mapToRegistry = require("./utils/map-to-registry.js")
+var npm = require('./npm.js')
+var log = require('npmlog')
+var mapToRegistry = require('./utils/map-to-registry.js')
 
 function stars (args, cb) {
   npm.commands.whoami([], true, function (er, username) {
@@ -20,12 +20,12 @@ function stars (args, cb) {
       if (er.code !== 'ENEEDAUTH') return cb(er)
     }
 
-    mapToRegistry("", npm.config, function (er, uri, auth) {
+    mapToRegistry('', npm.config, function (er, uri, auth) {
       if (er) return cb(er)
 
       var params = {
-        username : name,
-        auth     : auth
+        username: name,
+        auth: auth
       }
       npm.registry.stars(uri, params, showstars)
     })
@@ -35,9 +35,9 @@ function stars (args, cb) {
     if (er) return cb(er)
 
     if (data.rows.length === 0) {
-      log.warn("stars", "user has not starred any packages.")
+      log.warn('stars', 'user has not starred any packages.')
     } else {
-      data.rows.forEach(function(a) {
+      data.rows.forEach(function (a) {
         console.log(a.value)
       })
     }
diff --git a/deps/npm/lib/start.js b/deps/npm/lib/start.js
index 98823825bb17ba..85d61e78d0a43a 100644
--- a/deps/npm/lib/start.js
+++ b/deps/npm/lib/start.js
@@ -1 +1 @@
-module.exports = require("./utils/lifecycle.js").cmd("start")
+module.exports = require('./utils/lifecycle.js').cmd('start')
diff --git a/deps/npm/lib/stop.js b/deps/npm/lib/stop.js
index 8ea5ba6aa61b99..e4d02ff28165b9 100644
--- a/deps/npm/lib/stop.js
+++ b/deps/npm/lib/stop.js
@@ -1 +1 @@
-module.exports = require("./utils/lifecycle.js").cmd("stop")
+module.exports = require('./utils/lifecycle.js').cmd('stop')
diff --git a/deps/npm/lib/substack.js b/deps/npm/lib/substack.js
index 1929f187384949..c39a5dcc482a8d 100644
--- a/deps/npm/lib/substack.js
+++ b/deps/npm/lib/substack.js
@@ -1,15 +1,16 @@
 module.exports = substack
-var npm = require("./npm.js")
+var npm = require('./npm.js')
 
-var isms =
-  [ "\033[32mbeep \033[35mboop\033[m"
-  , "Replace your configs with services"
-  , "SEPARATE ALL THE CONCERNS!"
-  , "MODULE ALL THE THINGS!"
-  , "\\o/"
-  , "but first, burritos"
-  , "full time mad scientist here"
-  , "c/,,\\" ]
+var isms = [
+  '\u001b[32mbeep \u001b[35mboop\u001b[m',
+  'Replace your configs with services',
+  'SEPARATE ALL THE CONCERNS!',
+  'MODULE ALL THE THINGS!',
+  '\\o/',
+  'but first, burritos',
+  'full time mad scientist here',
+  'c/,,\\'
+]
 
 function substack (args, cb) {
   var i = Math.floor(Math.random() * isms.length)
diff --git a/deps/npm/lib/tag.js b/deps/npm/lib/tag.js
index 75da0b2174fff7..01db4d8ea65b1d 100644
--- a/deps/npm/lib/tag.js
+++ b/deps/npm/lib/tag.js
@@ -1,40 +1,41 @@
 // turns out tagging isn't very complicated
 // all the smarts are in the couch.
 module.exports = tag
-tag.usage = "npm tag <project>@<version> [<tag>]"
+tag.usage = '[DEPRECATED] npm tag <name>@<version> [<tag>]' +
+            '\nSee `dist-tag`'
 
-tag.completion = require("./unpublish.js").completion
+tag.completion = require('./unpublish.js').completion
 
-var npm = require("./npm.js")
-  , mapToRegistry = require("./utils/map-to-registry.js")
-  , npa = require("npm-package-arg")
-  , semver = require("semver")
-  , log = require("npmlog")
+var npm = require('./npm.js')
+var mapToRegistry = require('./utils/map-to-registry.js')
+var npa = require('npm-package-arg')
+var semver = require('semver')
+var log = require('npmlog')
 
 function tag (args, cb) {
-  var thing = npa(args.shift() || "")
-    , project = thing.name
-    , version = thing.rawSpec
-    , t = args.shift() || npm.config.get("tag")
+  var thing = npa(args.shift() || '')
+  var project = thing.name
+  var version = thing.rawSpec
+  var t = args.shift() || npm.config.get('tag')
 
   t = t.trim()
 
-  if (!project || !version || !t) return cb("Usage:\n"+tag.usage)
+  if (!project || !version || !t) return cb('Usage:\n' + tag.usage)
 
   if (semver.validRange(t)) {
-    var er = new Error("Tag name must not be a valid SemVer range: " + t)
+    var er = new Error('Tag name must not be a valid SemVer range: ' + t)
     return cb(er)
   }
 
-  log.warn("tag", "This command is deprecated. Use `npm dist-tag` instead.")
+  log.warn('tag', 'This command is deprecated. Use `npm dist-tag` instead.')
 
   mapToRegistry(project, npm.config, function (er, uri, auth) {
     if (er) return cb(er)
 
     var params = {
-      version : version,
-      tag     : t,
-      auth    : auth
+      version: version,
+      tag: t,
+      auth: auth
     }
     npm.registry.tag(uri, params, cb)
   })
diff --git a/deps/npm/lib/test.js b/deps/npm/lib/test.js
index dd4994cf28d159..cbc75821708b12 100644
--- a/deps/npm/lib/test.js
+++ b/deps/npm/lib/test.js
@@ -1,12 +1,12 @@
 module.exports = test
 
-var testCmd = require("./utils/lifecycle.js").cmd("test")
+var testCmd = require('./utils/lifecycle.js').cmd('test')
 
 function test (args, cb) {
   testCmd(args, function (er) {
     if (!er) return cb()
-    if (er.code === "ELIFECYCLE") {
-      return cb("Test failed.  See above for more details.")
+    if (er.code === 'ELIFECYCLE') {
+      return cb('Test failed.  See above for more details.')
     }
     return cb(er)
   })
diff --git a/deps/npm/lib/unbuild.js b/deps/npm/lib/unbuild.js
index d5fe0e6a0d1541..e6605939de36ab 100644
--- a/deps/npm/lib/unbuild.js
+++ b/deps/npm/lib/unbuild.js
@@ -1,59 +1,70 @@
 module.exports = unbuild
-unbuild.usage = "npm unbuild <folder>\n(this is plumbing)"
+module.exports.rmStuff = rmStuff
+unbuild.usage = 'npm unbuild <folder>\n(this is plumbing)'
 
-var readJson = require("read-package-json")
-  , gentlyRm = require("./utils/gently-rm.js")
-  , npm = require("./npm.js")
-  , path = require("path")
-  , isInside = require("path-is-inside")
-  , lifecycle = require("./utils/lifecycle.js")
-  , asyncMap = require("slide").asyncMap
-  , chain = require("slide").chain
-  , log = require("npmlog")
-  , build = require("./build.js")
+var readJson = require('read-package-json')
+var gentlyRm = require('./utils/gently-rm.js')
+var npm = require('./npm.js')
+var path = require('path')
+var isInside = require('path-is-inside')
+var lifecycle = require('./utils/lifecycle.js')
+var asyncMap = require('slide').asyncMap
+var chain = require('slide').chain
+var log = require('npmlog')
+var build = require('./build.js')
 
 // args is a list of folders.
 // remove any bins/etc, and then delete the folder.
 function unbuild (args, silent, cb) {
-  if (typeof silent === "function") cb = silent, silent = false
+  if (typeof silent === 'function') {
+    cb = silent
+    silent = false
+  }
   asyncMap(args, unbuild_(silent), cb)
 }
 
-function unbuild_ (silent) { return function (folder, cb_) {
-  function cb (er) {
-    cb_(er, path.relative(npm.root, folder))
-  }
-  folder = path.resolve(folder)
-  var base = isInside(folder, npm.prefix) ? npm.prefix : folder
-  delete build._didBuild[folder]
-  log.verbose("unbuild", folder.substr(npm.prefix.length + 1))
-  readJson(path.resolve(folder, "package.json"), function (er, pkg) {
-    // if no json, then just trash it, but no scripts or whatever.
-    if (er) return gentlyRm(folder, false, base, cb)
-    chain
-      ( [ [lifecycle, pkg, "preuninstall", folder, false, true]
-        , [lifecycle, pkg, "uninstall", folder, false, true]
-        , !silent && function(cb) {
-            console.log("unbuild " + pkg._id)
+function unbuild_ (silent) {
+  return function (folder, cb_) {
+    function cb (er) {
+      cb_(er, path.relative(npm.root, folder))
+    }
+    folder = path.resolve(folder)
+    var base = isInside(folder, npm.prefix) ? npm.prefix : folder
+    delete build._didBuild[folder]
+    log.verbose('unbuild', folder.substr(npm.prefix.length + 1))
+    readJson(path.resolve(folder, 'package.json'), function (er, pkg) {
+      // if no json, then just trash it, but no scripts or whatever.
+      if (er) return gentlyRm(folder, false, base, cb)
+      chain(
+        [
+          [lifecycle, pkg, 'preuninstall', folder, false, true],
+          [lifecycle, pkg, 'uninstall', folder, false, true],
+          !silent && function (cb) {
+            log.clearProgress()
+            console.log('unbuild ' + pkg._id)
+            log.showProgress()
             cb()
-          }
-        , [rmStuff, pkg, folder]
-        , [lifecycle, pkg, "postuninstall", folder, false, true]
-        , [gentlyRm, folder, false, base] ]
-      , cb )
-  })
-}}
+          },
+          [rmStuff, pkg, folder],
+          [lifecycle, pkg, 'postuninstall', folder, false, true],
+          [gentlyRm, folder, false, base]
+        ],
+        cb
+      )
+    })
+  }
+}
 
 function rmStuff (pkg, folder, cb) {
   // if it's global, and folder is in {prefix}/node_modules,
   // then bins are in {prefix}/bin
   // otherwise, then bins are in folder/../.bin
   var parent = path.dirname(folder)
-    , gnm = npm.dir
-    , top = gnm === parent
+  var gnm = npm.dir
+  var top = gnm === parent
 
-  log.verbose("unbuild rmStuff", pkg._id, "from", gnm)
-  if (!top) log.verbose("unbuild rmStuff", "in", parent)
+  log.verbose('unbuild rmStuff', pkg._id, 'from', gnm)
+  if (!top) log.verbose('unbuild rmStuff', 'in', parent)
   asyncMap([rmBins, rmMans], function (fn, cb) {
     fn(pkg, folder, parent, top, cb)
   }, cb)
@@ -61,26 +72,26 @@ function rmStuff (pkg, folder, cb) {
 
 function rmBins (pkg, folder, parent, top, cb) {
   if (!pkg.bin) return cb()
-  var binRoot = top ? npm.bin : path.resolve(parent, ".bin")
+  var binRoot = top ? npm.bin : path.resolve(parent, '.bin')
   asyncMap(Object.keys(pkg.bin), function (b, cb) {
-    if (process.platform === "win32") {
-      chain([ [gentlyRm, path.resolve(binRoot, b) + ".cmd", true]
-            , [gentlyRm, path.resolve(binRoot, b), true] ], cb)
+    if (process.platform === 'win32') {
+      chain([ [gentlyRm, path.resolve(binRoot, b) + '.cmd', true, folder],
+              [gentlyRm, path.resolve(binRoot, b), true, folder] ], cb)
     } else {
-      gentlyRm(path.resolve(binRoot, b), true, cb)
+      gentlyRm(path.resolve(binRoot, b), true, folder, cb)
     }
   }, cb)
 }
 
 function rmMans (pkg, folder, parent, top, cb) {
-  if (!pkg.man
-      || !top
-      || process.platform === "win32"
-      || !npm.config.get("global")) {
+  if (!pkg.man ||
+      !top ||
+      process.platform === 'win32' ||
+      !npm.config.get('global')) {
     return cb()
   }
-  var manRoot = path.resolve(npm.config.get("prefix"), "share", "man")
-  log.verbose("rmMans", "man files are", pkg.man, "in", manRoot)
+  var manRoot = path.resolve(npm.config.get('prefix'), 'share', 'man')
+  log.verbose('rmMans', 'man files are', pkg.man, 'in', manRoot)
   asyncMap(pkg.man, function (man, cb) {
     if (Array.isArray(man)) {
       man.forEach(rmMan)
@@ -89,25 +100,25 @@ function rmMans (pkg, folder, parent, top, cb) {
     }
 
     function rmMan (man) {
-      log.silly("rmMan", "preparing to remove", man)
+      log.silly('rmMan', 'preparing to remove', man)
       var parseMan = man.match(/(.*\.([0-9]+)(\.gz)?)$/)
       if (!parseMan) {
         log.error(
-          "rmMan", man, "is not a valid name for a man file.",
-          "Man files must end with a number, " +
-          "and optionally a .gz suffix if they are compressed."
+          'rmMan', man, 'is not a valid name for a man file.',
+          'Man files must end with a number, ' +
+          'and optionally a .gz suffix if they are compressed.'
         )
         return cb()
       }
 
       var stem = parseMan[1]
       var sxn = parseMan[2]
-      var gz = parseMan[3] || ""
+      var gz = parseMan[3] || ''
       var bn = path.basename(stem)
       var manDest = path.join(
         manRoot,
-        "man"+sxn,
-        (bn.indexOf(pkg.name) === 0 ? bn : pkg.name+"-"+bn)+"."+sxn+gz
+        'man' + sxn,
+        (bn.indexOf(pkg.name) === 0 ? bn : pkg.name + '-' + bn) + '.' + sxn + gz
       )
       gentlyRm(manDest, true, cb)
     }
diff --git a/deps/npm/lib/uninstall.js b/deps/npm/lib/uninstall.js
index 600c6819740f77..03a0a56303c3d5 100644
--- a/deps/npm/lib/uninstall.js
+++ b/deps/npm/lib/uninstall.js
@@ -1,128 +1,73 @@
-
+'use strict'
 // remove a package.
 
 module.exports = uninstall
+module.exports.Uninstaller = Uninstaller
 
-uninstall.usage = "npm uninstall <name>[@<version> [<name>[@<version>] ...]"
-                + "\nnpm rm <name>[@<version> [<name>[@<version>] ...]"
+uninstall.usage = 'npm uninstall [<@scope>/]<pkg>[@<version>]... [--save|--save-dev|--save-optional]' +
+                  '\n\naliases: remove, rm, r, un, unlink'
 
-uninstall.completion = require("./utils/completion/installed-shallow.js")
+var util = require('util')
+var path = require('path')
+var validate = require('aproba')
+var chain = require('slide').chain
+var readJson = require('read-package-json')
+var npm = require('./npm.js')
+var Installer = require('./install.js').Installer
+var getSaveType = require('./install/save.js').getSaveType
+var removeDeps = require('./install/deps.js').removeDeps
+var loadExtraneous = require('./install/deps.js').loadExtraneous
+var log = require('npmlog')
 
-var fs = require("graceful-fs")
-  , writeFileAtomic = require("write-file-atomic")
-  , log = require("npmlog")
-  , readJson = require("read-package-json")
-  , path = require("path")
-  , npm = require("./npm.js")
-  , asyncMap = require("slide").asyncMap
+uninstall.completion = require('./utils/completion/installed-shallow.js')
 
 function uninstall (args, cb) {
-  // this is super easy
-  // get the list of args that correspond to package names in either
-  // the global npm.dir,
-  // then call unbuild on all those folders to pull out their bins
-  // and mans and whatnot, and then delete the folder.
-
-  var nm = npm.dir
-  if (args.length === 1 && args[0] === ".") args = []
-  if (args.length) return uninstall_(args, nm, cb)
+  validate('AF', arguments)
+  // the /path/to/node_modules/..
+  var dryrun = !!npm.config.get('dry-run')
 
-  // remove this package from the global space, if it's installed there
-  readJson(path.resolve(npm.localPrefix, "package.json"), function (er, pkg) {
-    if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
-    if (er) return cb(uninstall.usage)
-    uninstall_( [pkg.name]
-              , npm.globalDir
-              , cb )
+  if (args.length === 1 && args[0] === '.') args = []
+  args = args.filter(function (a) {
+    return path.resolve(a) !== where
   })
 
-}
-
-function uninstall_ (args, nm, cb) {
-  // if we've been asked to --save or --save-dev or --save-optional,
-  // then also remove it from the associated dependencies hash.
-  var s = npm.config.get('save')
-    , d = npm.config.get('save-dev')
-    , o = npm.config.get('save-optional')
-  if (s || d || o) {
-    cb = saver(args, nm, cb)
-  }
-
-  asyncMap(args, function (arg, cb) {
-    // uninstall .. should not delete /usr/local/lib/node_modules/..
-    var p = path.join(path.resolve(nm), path.join("/", arg))
-    if (path.resolve(p) === nm) {
-      log.warn("uninstall", "invalid argument: %j", arg)
-      return cb(null, [])
-    }
-    fs.lstat(p, function (er) {
-      if (er) {
-        log.warn("uninstall", "not installed in %s: %j", nm, arg)
-        return cb(null, [])
-      }
-      cb(null, p)
+  var where = npm.config.get('global') || !args.length
+            ? path.resolve(npm.globalDir, '..')
+            : npm.prefix
+
+  if (args.length) {
+    new Uninstaller(where, dryrun, args).run(cb)
+  } else {
+    // remove this package from the global space, if it's installed there
+    readJson(path.resolve(npm.localPrefix, 'package.json'), function (er, pkg) {
+      if (er && er.code !== 'ENOENT' && er.code !== 'ENOTDIR') return cb(er)
+      if (er) return cb(uninstall.usage)
+      new Uninstaller(where, dryrun, [pkg.name]).run(cb)
     })
-  }, function (er, folders) {
-    if (er) return cb(er)
-    asyncMap(folders, npm.commands.unbuild, cb)
-  })
+  }
 }
 
-function saver (args, nm, cb_) {
-  return cb
-  function cb (er, data) {
-    var s = npm.config.get('save')
-      , d = npm.config.get('save-dev')
-      , o = npm.config.get('save-optional')
-    if (er || !(s || d || o)) return cb_(er, data)
-    var pj = path.resolve(nm, '..', 'package.json')
-    // don't use readJson here, because we don't want all the defaults
-    // filled in, for mans and other bs.
-    fs.readFile(pj, 'utf8', function (er, json) {
-      var pkg
-      try {
-        pkg = JSON.parse(json)
-      } catch (_) {}
-      if (!pkg) return cb_(null, data)
-
-      var bundle
-      if (npm.config.get('save-bundle')) {
-        bundle = pkg.bundleDependencies || pkg.bundledDependencies
-        if (!Array.isArray(bundle)) bundle = undefined
-      }
-
-      var changed = false
-      args.forEach(function (a) {
-        ; [ [s, 'dependencies']
-          , [o, 'optionalDependencies']
-          , [d, 'devDependencies'] ].forEach(function (f) {
-            var flag = f[0]
-              , field = f[1]
-            if (!flag || !pkg[field] || !pkg[field].hasOwnProperty(a)) return
-            changed = true
+function Uninstaller (where, dryrun, args) {
+  validate('SBA', arguments)
+  Installer.call(this, where, dryrun, args)
+}
+util.inherits(Uninstaller, Installer)
 
-            if (bundle) {
-              var i = bundle.indexOf(a)
-              if (i !== -1) bundle.splice(i, 1)
-            }
+Uninstaller.prototype.loadArgMetadata = function (next) {
+  this.args = this.args.map(function (arg) { return {name: arg} })
+  next()
+}
 
-            delete pkg[field][a]
-          })
-      })
-      if (!changed) return cb_(null, data)
+Uninstaller.prototype.loadAllDepsIntoIdealTree = function (cb) {
+  validate('F', arguments)
+  log.silly('uninstall', 'loadAllDepsIntoIdealtree')
+  var saveDeps = getSaveType(this.args)
 
-      if (bundle) {
-        delete pkg.bundledDependencies
-        if (bundle.length) {
-          pkg.bundleDependencies = bundle
-        } else {
-          delete pkg.bundleDependencies
-        }
-      }
+  var cg = this.progress.loadAllDepsIntoIdealTree
+  var steps = []
 
-      writeFileAtomic(pj, JSON.stringify(pkg, null, 2) + "\n", function (er) {
-        return cb_(er, data)
-      })
-    })
-  }
+  steps.push(
+    [removeDeps, this.args, this.idealTree, saveDeps, cg.newGroup('removeDeps')],
+    [loadExtraneous, this.idealTree, cg.newGroup('loadExtraneous')])
+  chain(steps, cb)
 }
diff --git a/deps/npm/lib/unpublish.js b/deps/npm/lib/unpublish.js
index 111f27aa2d2997..63f87b8207d246 100644
--- a/deps/npm/lib/unpublish.js
+++ b/deps/npm/lib/unpublish.js
@@ -1,15 +1,15 @@
 
 module.exports = unpublish
 
-var log = require("npmlog")
-var npm = require("./npm.js")
-var readJson = require("read-package-json")
-var path = require("path")
-var mapToRegistry = require("./utils/map-to-registry.js")
-var npa = require("npm-package-arg")
-var getPublishConfig = require("./utils/get-publish-config.js")
+var log = require('npmlog')
+var npm = require('./npm.js')
+var readJson = require('read-package-json')
+var path = require('path')
+var mapToRegistry = require('./utils/map-to-registry.js')
+var npa = require('npm-package-arg')
+var getPublishConfig = require('./utils/get-publish-config.js')
 
-unpublish.usage = "npm unpublish <project>[@<version>]"
+unpublish.usage = 'npm unpublish [<@scope>/]<pkg>[@<version>]'
 
 unpublish.completion = function (opts, cb) {
   if (opts.conf.argv.remain.length >= 3) return cb()
@@ -18,11 +18,11 @@ unpublish.completion = function (opts, cb) {
 
     var un = encodeURIComponent(username)
     if (!un) return cb()
-    var byUser = "-/by-user/" + un
+    var byUser = '-/by-user/' + un
     mapToRegistry(byUser, npm.config, function (er, uri, auth) {
       if (er) return cb(er)
 
-      npm.registry.get(uri, { auth : auth }, function (er, pkgs) {
+      npm.registry.get(uri, { auth: auth }, function (er, pkgs) {
         // do a bit of filtering at this point, so that we don't need
         // to fetch versions for more than one thing, but also don't
         // accidentally a whole project.
@@ -36,12 +36,12 @@ unpublish.completion = function (opts, cb) {
         mapToRegistry(pkgs[0], npm.config, function (er, uri, auth) {
           if (er) return cb(er)
 
-          npm.registry.get(uri, { auth : auth }, function (er, d) {
+          npm.registry.get(uri, { auth: auth }, function (er, d) {
             if (er) return cb(er)
             var vers = Object.keys(d.versions)
             if (!vers.length) return cb(null, pkgs)
             return cb(null, vers.map(function (v) {
-              return pkgs[0] + "@" + v
+              return pkgs[0] + '@' + v
             }))
           })
         })
@@ -54,24 +54,26 @@ function unpublish (args, cb) {
   if (args.length > 1) return cb(unpublish.usage)
 
   var thing = args.length ? npa(args[0]) : {}
-    , project = thing.name
-    , version = thing.rawSpec
-
-  log.silly("unpublish", "args[0]", args[0])
-  log.silly("unpublish", "thing", thing)
-  if (!version && !npm.config.get("force")) {
-    return cb("Refusing to delete entire project.\n"
-             + "Run with --force to do this.\n"
-             + unpublish.usage)
+  var project = thing.name
+  var version = thing.rawSpec
+
+  log.silly('unpublish', 'args[0]', args[0])
+  log.silly('unpublish', 'thing', thing)
+  if (!version && !npm.config.get('force')) {
+    return cb(
+      'Refusing to delete entire project.\n' +
+      'Run with --force to do this.\n' +
+      unpublish.usage
+    )
   }
 
   if (!project || path.resolve(project) === npm.localPrefix) {
     // if there's a package.json in the current folder, then
     // read the package name and version out of that.
-    var cwdJson = path.join(npm.localPrefix, "package.json")
+    var cwdJson = path.join(npm.localPrefix, 'package.json')
     return readJson(cwdJson, function (er, data) {
-      if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
-      if (er) return cb("Usage:\n" + unpublish.usage)
+      if (er && er.code !== 'ENOENT' && er.code !== 'ENOTDIR') return cb(er)
+      if (er) return cb('Usage:\n' + unpublish.usage)
       log.verbose('unpublish', data)
       gotProject(data.name, data.version, data.publishConfig, cb)
     })
@@ -87,7 +89,7 @@ function gotProject (project, version, publishConfig, cb_) {
 
   function cb (er) {
     if (er) return cb_(er)
-    console.log("- " + project + (version ? "@" + version : ""))
+    console.log('- ' + project + (version ? '@' + version : ''))
     cb_()
   }
 
@@ -96,9 +98,9 @@ function gotProject (project, version, publishConfig, cb_) {
   var registry = mappedConfig.client
 
   // remove from the cache first
-  npm.commands.cache(["clean", project, version], function (er) {
+  npm.commands.cache(['clean', project, version], function (er) {
     if (er) {
-      log.error("unpublish", "Failed to clean cache")
+      log.error('unpublish', 'Failed to clean cache')
       return cb(er)
     }
 
diff --git a/deps/npm/lib/update.js b/deps/npm/lib/update.js
index 3e9438e9231629..45f2817f5fc893 100644
--- a/deps/npm/lib/update.js
+++ b/deps/npm/lib/update.js
@@ -1,58 +1,60 @@
-/*
-for each pkg in prefix that isn't a git repo
-  look for a new version of pkg that satisfies dep
-  if so, install it.
-  if not, then update it
-*/
-
 module.exports = update
 
-update.usage = "npm update [pkg]"
-
-var npm = require("./npm.js")
-  , asyncMap = require("slide").asyncMap
-  , log = require("npmlog")
+update.usage = 'npm update [-g] [<pkg>...]'
 
-  // load these, just so that we know that they'll be available, in case
-  // npm itself is getting overwritten.
-  , install = require("./install.js")
-  , build = require("./build.js")
+var url = require('url')
+var log = require('npmlog')
+var chain = require('slide').chain
+var npm = require('./npm.js')
+var Installer = require('./install.js').Installer
 
 update.completion = npm.commands.outdated.completion
 
 function update (args, cb) {
-  npm.commands.outdated(args, true, function (er, outdated) {
+  var dryrun = false
+  if (npm.config.get('dry-run')) dryrun = true
+
+  npm.commands.outdated(args, true, function (er, rawOutdated) {
     if (er) return cb(er)
+    var outdated = rawOutdated.map(function (ww) {
+      return {
+        dep: ww[0],
+        depname: ww[1],
+        current: ww[2],
+        wanted: ww[3],
+        latest: ww[4],
+        req: ww[5],
+        what: ww[1] + '@' + ww[3]
+      }
+    })
 
     var wanted = outdated.filter(function (ww) {
-      var dep = ww[1]
-      var current = ww[2]
-      var wanted = ww[3]
-      var latest = ww[4]
-      if (current === wanted && wanted !== latest) {
+      if (ww.current === ww.wanted && ww.wanted !== ww.latest) {
         log.verbose(
           'outdated',
-          'not updating', dep,
+          'not updating', ww.depname,
           "because it's currently at the maximum version that matches its specified semver range"
         )
       }
-      return current !== wanted
+      return ww.current !== ww.wanted
     })
     if (wanted.length === 0) return cb()
 
     log.info('outdated', 'updating', wanted)
-    asyncMap(wanted, function (ww, cb) {
-      // [[ dir, dep, has, want, req ]]
-      var where = ww[0]
-        , dep = ww[1]
-        , want = ww[3]
-        , what = dep + "@" + want
-        , req = ww[5]
-        , url = require('url')
-
+    var toInstall = {}
+    wanted.forEach(function (ww) {
       // use the initial installation method (repo, tar, git) for updating
-      if (url.parse(req).protocol) what = req
-      npm.commands.install(where, what, cb)
-    }, cb)
+      if (url.parse(ww.req).protocol) ww.what = ww.req
+
+      var where = ww.dep.parent && ww.dep.parent.path || ww.dep.path
+      if (toInstall[where]) {
+        toInstall[where].push(ww.what)
+      } else {
+        toInstall[where] = [ww.what]
+      }
+    })
+    chain(Object.keys(toInstall).map(function (where) {
+      return [new Installer(where, dryrun, toInstall[where]), 'run']
+    }), cb)
   })
 }
diff --git a/deps/npm/lib/utils/completion/file-completion.js b/deps/npm/lib/utils/completion/file-completion.js
index 6ce2f83467d012..78777a025ec88a 100644
--- a/deps/npm/lib/utils/completion/file-completion.js
+++ b/deps/npm/lib/utils/completion/file-completion.js
@@ -1,21 +1,24 @@
 module.exports = fileCompletion
 
-var mkdir = require("mkdirp")
-  , path = require("path")
-  , glob = require("glob")
+var mkdir = require('mkdirp')
+var path = require('path')
+var glob = require('glob')
 
 function fileCompletion (root, req, depth, cb) {
-  if (typeof cb !== "function") cb = depth, depth = Infinity
+  if (typeof cb !== 'function') {
+    cb = depth
+    depth = Infinity
+  }
   mkdir(root, function (er) {
     if (er) return cb(er)
 
     // can be either exactly the req, or a descendent
-    var pattern = root + "/{" + req + "," + req + "/**/*}"
-      , opts = { mark: true, dot: true, maxDepth: depth }
+    var pattern = root + '/{' + req + ',' + req + '/**/*}'
+    var opts = { mark: true, dot: true, maxDepth: depth }
     glob(pattern, opts, function (er, files) {
       if (er) return cb(er)
       return cb(null, (files || []).map(function (f) {
-        var tail = f.substr(root.length + 1).replace(/^\//, "")
+        var tail = f.substr(root.length + 1).replace(/^\//, '')
         return path.join(req, tail)
       }))
     })
diff --git a/deps/npm/lib/utils/completion/installed-deep.js b/deps/npm/lib/utils/completion/installed-deep.js
index 5fb67d263f12e7..146a4d7908eead 100644
--- a/deps/npm/lib/utils/completion/installed-deep.js
+++ b/deps/npm/lib/utils/completion/installed-deep.js
@@ -1,21 +1,25 @@
 module.exports = installedDeep
 
-var npm = require("../../npm.js")
-  , readInstalled = require("read-installed")
+var npm = require('../../npm.js')
+var readInstalled = require('read-installed')
 
 function installedDeep (opts, cb) {
   var local
-    , global
-    , depth = npm.config.get("depth")
-    , opt = { depth: depth, dev: true }
+  var global
+  var depth = npm.config.get('depth')
+  var opt = { depth: depth, dev: true }
 
-  if (npm.config.get("global")) local = [], next()
-  else readInstalled(npm.prefix, opt, function (er, data) {
-    local = getNames(data || {})
+  if (npm.config.get('global')) {
+    local = []
     next()
-  })
+  } else {
+    readInstalled(npm.prefix, opt, function (er, data) {
+      local = getNames(data || {})
+      next()
+    })
+  }
 
-  readInstalled(npm.config.get("prefix"), opt, function (er, data) {
+  readInstalled(npm.config.get('prefix'), opt, function (er, data) {
     global = getNames(data || {})
     next()
   })
@@ -37,9 +41,9 @@ function installedDeep (opts, cb) {
 
   function next () {
     if (!local || !global) return
-    if (!npm.config.get("global")) {
+    if (!npm.config.get('global')) {
       global = global.map(function (g) {
-        return [g, "-g"]
+        return [g, '-g']
       })
     }
     var names = local.concat(global)
diff --git a/deps/npm/lib/utils/completion/installed-shallow.js b/deps/npm/lib/utils/completion/installed-shallow.js
index 8d64649d5f66a9..bf692fedea3a5d 100644
--- a/deps/npm/lib/utils/completion/installed-shallow.js
+++ b/deps/npm/lib/utils/completion/installed-shallow.js
@@ -1,31 +1,39 @@
 
 module.exports = installedShallow
 
-var npm = require("../../npm.js")
-  , fs = require("graceful-fs")
-  , path = require("path")
-  , readJson = require("read-package-json")
-  , asyncMap = require("slide").asyncMap
+var npm = require('../../npm.js')
+var fs = require('graceful-fs')
+var path = require('path')
+var readJson = require('read-package-json')
+var asyncMap = require('slide').asyncMap
 
 function installedShallow (opts, filter, cb) {
-  if (typeof cb !== "function") cb = filter, filter = null
+  if (typeof cb !== 'function') {
+    cb = filter
+    filter = null
+  }
   var conf = opts.conf
-    , args = conf.argv.remain
+  var args = conf.argv.remain
   if (args.length > 3) return cb()
   var local
-    , global
-    , localDir = npm.dir
-    , globalDir = npm.globalDir
-  if (npm.config.get("global")) local = [], next()
-  else fs.readdir(localDir, function (er, pkgs) {
-    local = (pkgs || []).filter(function (p) {
-      return p.charAt(0) !== "."
-    })
+  var global
+  var localDir = npm.dir
+  var globalDir = npm.globalDir
+  if (npm.config.get('global')) {
+    local = []
     next()
-  })
+  } else {
+    fs.readdir(localDir, function (er, pkgs) {
+      local = (pkgs || []).filter(function (p) {
+        return p.charAt(0) !== '.'
+      })
+      next()
+    })
+  }
+
   fs.readdir(globalDir, function (er, pkgs) {
     global = (pkgs || []).filter(function (p) {
-      return p.charAt(0) !== "."
+      return p.charAt(0) !== '.'
     })
     next()
   })
@@ -37,7 +45,7 @@ function installedShallow (opts, filter, cb) {
 
 function filterInstalled (local, global, filter, cb) {
   var fl
-    , fg
+  var fg
 
   if (!filter) {
     fl = local
@@ -46,7 +54,7 @@ function filterInstalled (local, global, filter, cb) {
   }
 
   asyncMap(local, function (p, cb) {
-    readJson(path.join(npm.dir, p, "package.json"), function (er, d) {
+    readJson(path.join(npm.dir, p, 'package.json'), function (er, d) {
       if (!d || !filter(d)) return cb(null, [])
       return cb(null, d.name)
     })
@@ -57,7 +65,7 @@ function filterInstalled (local, global, filter, cb) {
 
   var globalDir = npm.globalDir
   asyncMap(global, function (p, cb) {
-    readJson(path.join(globalDir, p, "package.json"), function (er, d) {
+    readJson(path.join(globalDir, p, 'package.json'), function (er, d) {
       if (!d || !filter(d)) return cb(null, [])
       return cb(null, d.name)
     })
@@ -68,12 +76,12 @@ function filterInstalled (local, global, filter, cb) {
 
   function next () {
     if (!fg || !fl) return
-    if (!npm.config.get("global")) {
+    if (!npm.config.get('global')) {
       fg = fg.map(function (g) {
-        return [g, "-g"]
+        return [g, '-g']
       })
     }
-    console.error("filtered", fl, fg)
+    console.error('filtered', fl, fg)
     return cb(null, fl.concat(fg))
   }
 }
diff --git a/deps/npm/lib/utils/deep-sort-object.js b/deps/npm/lib/utils/deep-sort-object.js
new file mode 100644
index 00000000000000..c8003c207893a5
--- /dev/null
+++ b/deps/npm/lib/utils/deep-sort-object.js
@@ -0,0 +1,12 @@
+'use strict'
+var sortedObject = require('sorted-object')
+
+module.exports = function deepSortObject (obj, sortBy) {
+  if (obj == null || typeof obj !== 'object') return obj
+  if (obj instanceof Array) return obj.sort(sortBy)
+  obj = sortedObject(obj)
+  Object.keys(obj).forEach(function (key) {
+    obj[key] = deepSortObject(obj[key], sortBy)
+  })
+  return obj
+}
diff --git a/deps/npm/lib/utils/depr-check.js b/deps/npm/lib/utils/depr-check.js
index 7166348b086607..89cf402739a841 100644
--- a/deps/npm/lib/utils/depr-check.js
+++ b/deps/npm/lib/utils/depr-check.js
@@ -1,13 +1,13 @@
-var log = require("npmlog")
+var log = require('npmlog')
 
 var deprecated = {}
-  , deprWarned = {}
+var deprWarned = {}
 module.exports = function deprCheck (data) {
   if (deprecated[data._id]) data.deprecated = deprecated[data._id]
   if (data.deprecated) deprecated[data._id] = data.deprecated
   else return
   if (!deprWarned[data._id]) {
     deprWarned[data._id] = true
-    log.warn("deprecated", "%s: %s", data._id, data.deprecated)
+    log.warn('deprecated', '%s: %s', data._id, data.deprecated)
   }
 }
diff --git a/deps/npm/lib/utils/error-handler.js b/deps/npm/lib/utils/error-handler.js
index dac6a17f251c90..cd61f7912993fb 100644
--- a/deps/npm/lib/utils/error-handler.js
+++ b/deps/npm/lib/utils/error-handler.js
@@ -2,45 +2,47 @@
 module.exports = errorHandler
 
 var cbCalled = false
-  , log = require("npmlog")
-  , npm = require("../npm.js")
-  , rm = require("rimraf")
-  , itWorked = false
-  , path = require("path")
-  , wroteLogFile = false
-  , exitCode = 0
-  , rollbacks = npm.rollbacks
-  , chain = require("slide").chain
-  , writeStream = require("fs-write-stream-atomic")
-  , nameValidator = require("validate-npm-package-name")
-
-
-process.on("exit", function (code) {
-  // console.error("exit", code)
+var log = require('npmlog')
+var npm = require('../npm.js')
+var rm = require('rimraf')
+var itWorked = false
+var path = require('path')
+var wroteLogFile = false
+var exitCode = 0
+var rollbacks = npm.rollbacks
+var chain = require('slide').chain
+var writeStream = require('fs-write-stream-atomic')
+var nameValidator = require('validate-npm-package-name')
+
+process.on('exit', function (code) {
+  log.disableProgress()
   if (!npm.config || !npm.config.loaded) return
   if (code) itWorked = false
-  if (itWorked) log.info("ok")
+  if (itWorked) log.info('ok')
   else {
     if (!cbCalled) {
-      log.error("", "cb() never called!")
+      log.error('', 'cb() never called!')
     }
 
     if (wroteLogFile) {
       // just a line break
-      if (log.levels[log.level] <= log.levels.error) console.error("")
-
-      log.error("",
-                ["Please include the following file with any support request:"
-                ,"    " + path.resolve("npm-debug.log")
-                ].join("\n"))
+      if (log.levels[log.level] <= log.levels.error) console.error('')
+
+      log.error(
+        '',
+        [
+          'Please include the following file with any support request:',
+          '    ' + path.resolve('npm-debug.log')
+        ].join('\n')
+      )
       wroteLogFile = false
     }
     if (code) {
-      log.error("code", code)
+      log.error('code', code)
     }
   }
 
-  var doExit = npm.config.get("_exit")
+  var doExit = npm.config.get('_exit')
   if (doExit) {
     // actually exit.
     if (exitCode === 0 && !itWorked) {
@@ -55,9 +57,9 @@ process.on("exit", function (code) {
 function exit (code, noLog) {
   exitCode = exitCode || process.exitCode || code
 
-  var doExit = npm.config ? npm.config.get("_exit") : true
-  log.verbose("exit", [code, doExit])
-  if (log.level === "silent") noLog = true
+  var doExit = npm.config ? npm.config.get('_exit') : true
+  log.verbose('exit', [code, doExit])
+  if (log.level === 'silent') noLog = true
 
   if (rollbacks.length) {
     chain(rollbacks.map(function (f) {
@@ -66,22 +68,22 @@ function exit (code, noLog) {
       }
     }), function (er) {
       if (er) {
-        log.error("error rolling back", er)
+        log.error('error rolling back', er)
         if (!code) errorHandler(er)
-        else if (noLog) rm("npm-debug.log", reallyExit.bind(null, er))
+        else if (noLog) rm('npm-debug.log', reallyExit.bind(null, er))
         else writeLogFile(reallyExit.bind(this, er))
       } else {
         if (!noLog && code) writeLogFile(reallyExit)
-        else rm("npm-debug.log", reallyExit)
+        else rm('npm-debug.log', reallyExit)
       }
     })
     rollbacks.length = 0
   }
   else if (code && !noLog) writeLogFile(reallyExit)
-  else rm("npm-debug.log", reallyExit)
+  else rm('npm-debug.log', reallyExit)
 
   function reallyExit (er) {
-    if (er && !code) code = typeof er.errno === "number" ? er.errno : 1
+    if (er && !code) code = typeof er.errno === 'number' ? er.errno : 1
 
     // truncate once it's been written.
     log.record.length = 0
@@ -91,298 +93,397 @@ function exit (code, noLog) {
     // just emit a fake exit event.
     // if we're really exiting, then let it exit on its own, so that
     // in-process stuff can finish or clean up first.
-    if (!doExit) process.emit("exit", code)
-    npm.spinner.stop()
+    if (!doExit) process.emit('exit', code)
   }
 }
 
-
 function errorHandler (er) {
-  // console.error("errorHandler", er)
+  log.disableProgress()
+  // console.error('errorHandler', er)
   if (!npm.config || !npm.config.loaded) {
     // logging won't work unless we pretend that it's ready
-    er = er || new Error("Exit prior to config file resolving.")
+    er = er || new Error('Exit prior to config file resolving.')
     console.error(er.stack || er.message)
   }
 
   if (cbCalled) {
-    er = er || new Error("Callback called more than once.")
+    er = er || new Error('Callback called more than once.')
   }
 
   cbCalled = true
   if (!er) return exit(0)
-  if (typeof er === "string") {
-    log.error("", er)
+  if (typeof er === 'string') {
+    log.error('', er)
     return exit(1, true)
   } else if (!(er instanceof Error)) {
-    log.error("weird error", er)
+    log.error('weird error', er)
     return exit(1, true)
   }
 
   var m = er.code || er.message.match(/^(?:Error: )?(E[A-Z]+)/)
-  if (m && !er.code) er.code = m
-
-  ; [ "type"
-    , "fstream_path"
-    , "fstream_unc_path"
-    , "fstream_type"
-    , "fstream_class"
-    , "fstream_finish_call"
-    , "fstream_linkpath"
-    , "stack"
-    , "fstream_stack"
-    , "statusCode"
-    , "pkgid"
-    ].forEach(function (k) {
-      var v = er[k]
-      if (!v) return
-      if (k === "fstream_stack") v = v.join("\n")
-      log.verbose(k, v)
-    })
+  if (m && !er.code) {
+    er.code = m
+  }
 
-  log.verbose("cwd", process.cwd())
-
-  var os = require("os")
-  // log.error("System", os.type() + " " + os.release())
-  // log.error("command", process.argv.map(JSON.stringify).join(" "))
-  // log.error("node -v", process.version)
-  // log.error("npm -v", npm.version)
-  log.error("", os.type() + " " + os.release())
-  log.error("argv", process.argv.map(JSON.stringify).join(" "))
-  log.error("node", process.version)
-  log.error("npm ", "v" + npm.version)
-
-  ; [ "file"
-    , "path"
-    , "code"
-    , "errno"
-    , "syscall"
-    ].forEach(function (k) {
-      var v = er[k]
-      if (v) log.error(k, v)
-    })
+  ;[
+    'type',
+    'fstream_path',
+    'fstream_unc_path',
+    'fstream_type',
+    'fstream_class',
+    'fstream_finish_call',
+    'fstream_linkpath',
+    'stack',
+    'fstream_stack',
+    'statusCode',
+    'pkgid'
+  ].forEach(function (k) {
+    var v = er[k]
+    if (!v) return
+    if (k === 'fstream_stack') v = v.join('\n')
+    log.verbose(k, v)
+  })
+
+  log.verbose('cwd', process.cwd())
+
+  var os = require('os')
+  // log.error('System', os.type() + ' ' + os.release())
+  // log.error('command', process.argv.map(JSON.stringify).join(' '))
+  // log.error('node -v', process.version)
+  // log.error('npm -v', npm.version)
+  log.error('', os.type() + ' ' + os.release())
+  log.error('argv', process.argv.map(JSON.stringify).join(' '))
+  log.error('node', process.version)
+  log.error('npm ', 'v' + npm.version)
+
+  ;[
+    'file',
+    'path',
+    'code',
+    'errno',
+    'syscall'
+  ].forEach(function (k) {
+    var v = er[k]
+    if (v) log.error(k, v)
+  })
 
   // just a line break
-  if (log.levels[log.level] <= log.levels.error) console.error("")
+  if (log.levels[log.level] <= log.levels.error) console.error('')
 
   switch (er.code) {
-  case "ECONNREFUSED":
-    log.error("", er)
-    log.error("", ["\nIf you are behind a proxy, please make sure that the"
-              ,"'proxy' config is set properly.  See: 'npm help config'"
-              ].join("\n"))
+  case 'ECONNREFUSED':
+    log.error('', er)
+    log.error(
+      '',
+      [
+        '\nIf you are behind a proxy, please make sure that the',
+        "'proxy' config is set properly.  See: 'npm help config'"
+      ].join('\n')
+    )
     break
 
-  case "EACCES":
-  case "EPERM":
-    log.error("", er)
-    log.error("", ["\nPlease try running this command again as root/Administrator."
-              ].join("\n"))
+  case 'EACCES':
+  case 'EPERM':
+    log.error('', er)
+    log.error('', ['\nPlease try running this command again as root/Administrator.'
+              ].join('\n'))
     break
 
-  case "ELIFECYCLE":
-    log.error("", er.message)
-    log.error("", ["","Failed at the "+er.pkgid+" "+er.stage+" script '"+er.script+"'."
-              ,"This is most likely a problem with the "+er.pkgname+" package,"
-              ,"not with npm itself."
-              ,"Tell the author that this fails on your system:"
-              ,"    "+er.script
-              ,"You can get their info via:"
-              ,"    npm owner ls "+er.pkgname
-              ,"There is likely additional logging output above."
-              ].join("\n"))
+  case 'ELIFECYCLE':
+    log.error('', er.message)
+    log.error(
+      '',
+      [
+        '',
+        'Failed at the ' + er.pkgid + ' ' + er.stage + " script '" + er.script + "'.",
+        'This is most likely a problem with the ' + er.pkgname + ' package,',
+        'not with npm itself.',
+        'Tell the author that this fails on your system:',
+        '    ' + er.script,
+        'You can get their info via:',
+        '    npm owner ls ' + er.pkgname,
+        'There is likely additional logging output above.'
+      ].join('\n')
+    )
     break
 
-  case "ENOGIT":
-    log.error("", er.message)
-    log.error("", ["","Failed using git."
-              ,"This is most likely not a problem with npm itself."
-              ,"Please check if you have git installed and in your PATH."
-              ].join("\n"))
+  case 'ENOGIT':
+    log.error('', er.message)
+    log.error(
+      '',
+      [
+        '',
+        'Failed using git.',
+        'This is most likely not a problem with npm itself.',
+        'Please check if you have git installed and in your PATH.'
+      ].join('\n')
+    )
     break
 
-  case "EJSONPARSE":
-    log.error("", er.message)
-    log.error("", "File: "+er.file)
-    log.error("", ["Failed to parse package.json data."
-              ,"package.json must be actual JSON, not just JavaScript."
-              ,"","This is not a bug in npm."
-              ,"Tell the package author to fix their package.json file."
-              ].join("\n"), "JSON.parse")
+  case 'EJSONPARSE':
+    log.error('', er.message)
+    log.error('', 'File: ' + er.file)
+    log.error(
+      '',
+      [
+        'Failed to parse package.json data.',
+        'package.json must be actual JSON, not just JavaScript.',
+        '',
+        'This is not a bug in npm.',
+        'Tell the package author to fix their package.json file.'
+      ].join('\n'),
+      'JSON.parse'
+    )
     break
 
   // TODO(isaacs)
   // Add a special case here for E401 and E403 explaining auth issues?
 
-  case "E404":
+  case 'E404':
     var msg = [er.message]
-    if (er.pkgid && er.pkgid !== "-") {
-      msg.push("", "'" + er.pkgid + "' is not in the npm registry.")
+    if (er.pkgid && er.pkgid !== '-') {
+      msg.push('', "'" + er.pkgid + "' is not in the npm registry.")
 
       var valResult = nameValidator(er.pkgid)
 
       if (valResult.validForNewPackages) {
-        msg.push("You should bug the author to publish it (or use the name yourself!)")
+        msg.push('You should bug the author to publish it (or use the name yourself!)')
       } else {
-        msg.push("Your package name is not valid, because", "")
+        msg.push('Your package name is not valid, because', '')
 
         var errorsArray = (valResult.errors || []).concat(valResult.warnings || [])
-        errorsArray.forEach(function(item, idx) {
-          msg.push(" " + (idx + 1) + ". " + item)
+        errorsArray.forEach(function (item, idx) {
+          msg.push(' ' + (idx + 1) + '. ' + item)
         })
       }
 
       if (er.parent) {
-        msg.push("It was specified as a dependency of '"+er.parent+"'")
+        msg.push("It was specified as a dependency of '" + er.parent + "'")
       }
-      msg.push("\nNote that you can also install from a"
-              ,"tarball, folder, http url, or git url.")
+      msg.push(
+        '\nNote that you can also install from a',
+        'tarball, folder, http url, or git url.'
+      )
     }
     // There's no need to have 404 in the message as well.
-    msg[0] = msg[0].replace(/^404\s+/, "")
-    log.error("404", msg.join("\n"))
+    msg[0] = msg[0].replace(/^404\s+/, '')
+    log.error('404', msg.join('\n'))
     break
 
-  case "EPUBLISHCONFLICT":
-    log.error("publish fail", ["Cannot publish over existing version."
-              ,"Update the 'version' field in package.json and try again."
-              ,""
-              ,"To automatically increment version numbers, see:"
-              ,"    npm help version"
-              ].join("\n"))
+  case 'EPUBLISHCONFLICT':
+    log.error(
+      'publish fail',
+      [
+        'Cannot publish over existing version.',
+        "Update the 'version' field in package.json and try again.",
+        '',
+        'To automatically increment version numbers, see:',
+        '    npm help version'
+      ].join('\n')
+    )
     break
 
-  case "EISGIT":
-    log.error("git", [er.message
-              ,"    "+er.path
-              ,"Refusing to remove it. Update manually,"
-              ,"or move it out of the way first."
-              ].join("\n"))
+  case 'EISGIT':
+    log.error(
+      'git',
+      [
+        er.message,
+        '    ' + er.path,
+        'Refusing to remove it. Update manually,',
+        'or move it out of the way first.'
+      ].join('\n')
+    )
     break
 
-  case "ECYCLE":
-    log.error("cycle", [er.message
-              ,"While installing: "+er.pkgid
-              ,"Found a pathological dependency case that npm cannot solve."
-              ,"Please report this to the package author."
-              ].join("\n"))
+  case 'ECYCLE':
+    log.error(
+      'cycle',
+      [
+        er.message,
+        'While installing: ' + er.pkgid,
+        'Found a pathological dependency case that npm cannot solve.',
+        'Please report this to the package author.'
+      ].join('\n')
+    )
     break
 
-  case "EBADPLATFORM":
-    log.error("notsup", [er.message
-              ,"Not compatible with your operating system or architecture: "+er.pkgid
-              ,"Valid OS:    "+er.os.join(",")
-              ,"Valid Arch:  "+er.cpu.join(",")
-              ,"Actual OS:   "+process.platform
-              ,"Actual Arch: "+process.arch
-              ].join("\n"))
+  case 'EBADPLATFORM':
+    log.error(
+      'notsup',
+      [
+        er.message,
+        'Not compatible with your operating system or architecture: ' + er.pkgid,
+        'Valid OS:    ' + er.os.join(','),
+        'Valid Arch:  ' + er.cpu.join(','),
+        'Actual OS:   ' + process.platform,
+        'Actual Arch: ' + process.arch
+      ].join('\n')
+    )
     break
 
-  case "EEXIST":
-    log.error([er.message
-              ,"File exists: "+er.path
-              ,"Move it away, and try again."].join("\n"))
+  case 'EEXIST':
+    log.error(
+      [
+        er.message,
+        'File exists: ' + er.path,
+        'Move it away, and try again.'
+      ].join('\n')
+    )
     break
 
-  case "ENEEDAUTH":
-    log.error("need auth", [er.message
-              ,"You need to authorize this machine using `npm adduser`"
-              ].join("\n"))
+  case 'ENEEDAUTH':
+    log.error(
+      'need auth',
+      [
+        er.message,
+        'You need to authorize this machine using `npm adduser`'
+      ].join('\n')
+    )
     break
 
-  case "EPEERINVALID":
+  case 'EPEERINVALID':
     var peerErrors = Object.keys(er.peersDepending).map(function (peer) {
-      return "Peer " + peer + " wants " + er.packageName + "@"
-        + er.peersDepending[peer]
+      return 'Peer ' + peer + ' wants ' +
+        er.packageName + '@' + er.peersDepending[peer]
     })
-    log.error("peerinvalid", [er.message].concat(peerErrors).join("\n"))
+    log.error('peerinvalid', [er.message].concat(peerErrors).join('\n'))
     break
 
-  case "ECONNRESET":
-  case "ENOTFOUND":
-  case "ETIMEDOUT":
-  case "EAI_FAIL":
-    log.error("network", [er.message
-              ,"This is most likely not a problem with npm itself"
-              ,"and is related to network connectivity."
-              ,"In most cases you are behind a proxy or have bad network settings."
-              ,"\nIf you are behind a proxy, please make sure that the"
-              ,"'proxy' config is set properly.  See: 'npm help config'"
-              ].join("\n"))
+  case 'ECONNRESET':
+  case 'ENOTFOUND':
+  case 'ETIMEDOUT':
+  case 'EAI_FAIL':
+    log.error(
+      'network',
+      [
+        er.message,
+        'This is most likely not a problem with npm itself',
+        'and is related to network connectivity.',
+        'In most cases you are behind a proxy or have bad network settings.',
+        '\nIf you are behind a proxy, please make sure that the',
+        "'proxy' config is set properly.  See: 'npm help config'"
+      ].join('\n')
+    )
     break
 
-  case "ENOPACKAGEJSON":
-    log.error("package.json", [er.message
-              ,"This is most likely not a problem with npm itself."
-              ,"npm can't find a package.json file in your current directory."
-              ].join("\n"))
+  case 'ENOPACKAGEJSON':
+    log.error(
+      'package.json',
+      [
+        er.message,
+        'This is most likely not a problem with npm itself.',
+        "npm can't find a package.json file in your current directory."
+      ].join('\n')
+    )
     break
 
-  case "ETARGET":
-    var msg = [er.message
-              ,"This is most likely not a problem with npm itself."
-              ,"In most cases you or one of your dependencies are requesting"
-              ,"a package version that doesn't exist."
-              ]
-      if (er.parent) {
-        msg.push("\nIt was specified as a dependency of '"+er.parent+"'\n")
-      }
-      log.error("notarget", msg.join("\n"))
+  case 'ETARGET':
+    msg = [
+      er.message,
+      'This is most likely not a problem with npm itself.',
+      'In most cases you or one of your dependencies are requesting',
+      "a package version that doesn't exist."
+    ]
+    if (er.parent) {
+      msg.push("\nIt was specified as a dependency of '" + er.parent + "'\n")
+    }
+    log.error('notarget', msg.join('\n'))
     break
 
-  case "ENOTSUP":
+  case 'ENOTSUP':
     if (er.required) {
-      log.error("notsup", [er.message
-                ,"Not compatible with your version of node/npm: "+er.pkgid
-                ,"Required: "+JSON.stringify(er.required)
-                ,"Actual:   "
-                +JSON.stringify({npm:npm.version
-                                ,node:npm.config.get("node-version")})
-                ].join("\n"))
+      log.error(
+        'notsup',
+        [
+          er.message,
+          'Not compatible with your version of node/npm: ' + er.pkgid,
+          'Required: ' + JSON.stringify(er.required),
+          'Actual:   ' + JSON.stringify({
+            npm: npm.version,
+            node: npm.config.get('node-version')
+          })
+        ].join('\n')
+      )
       break
     } // else passthrough
+    /*eslint no-fallthrough:0*/
+
+  case 'ENOSPC':
+    log.error(
+      'nospc',
+      [
+        er.message,
+        'This is most likely not a problem with npm itself',
+        'and is related to insufficient space on your system.'
+      ].join('\n')
+    )
+    break
 
-  case "ENOSPC":
-    log.error("nospc", [er.message
-              ,"This is most likely not a problem with npm itself"
-              ,"and is related to insufficient space on your system."
-              ].join("\n"))
+  case 'EROFS':
+    log.error(
+      'rofs',
+      [
+        er.message,
+        'This is most likely not a problem with npm itself',
+        'and is related to the file system being read-only.',
+        '\nOften virtualized file systems, or other file systems',
+        "that don't support symlinks, give this error."
+      ].join('\n')
+    )
     break
 
-  case "EROFS":
-    log.error("rofs", [er.message
-              ,"This is most likely not a problem with npm itself"
-              ,"and is related to the file system being read-only."
-              ,"\nOften virtualized file systems, or other file systems"
-              ,"that don't support symlinks, give this error."
-              ].join("\n"))
+  case 'ENOENT':
+    log.error(
+      'enoent',
+      [
+        er.message,
+        'This is most likely not a problem with npm itself',
+        'and is related to npm not being able to find a file.',
+        er.file ? "\nCheck if the file '" + er.file + "' is present." : ''
+      ].join('\n')
+    )
     break
 
-  case "ENOENT":
-    log.error("enoent", [er.message
-              ,"This is most likely not a problem with npm itself"
-              ,"and is related to npm not being able to find a file."
-              ,er.file?"\nCheck if the file '"+er.file+"' is present.":""
-              ].join("\n"))
+  case 'EMISSINGARG':
+  case 'EUNKNOWNTYPE':
+  case 'EINVALIDTYPE':
+  case 'ETOOMANYARGS':
+    log.error(
+      'typeerror',
+      [
+        er.stack,
+        'This is an error with npm itself. Please report this error at:',
+        '    <http://github.com/npm/npm/issues>'
+      ].join('\n')
+    )
     break
 
-  case "EISDIR":
-    log.error("eisdir", [er.message
-              ,"This is most likely not a problem with npm itself"
-              ,"and is related to npm not being able to find a package.json in"
-              ,"a package you are trying to install."
-              ].join("\n"))
+  case 'EISDIR':
+    log.error(
+      'eisdir',
+      [
+        er.message,
+        'This is most likely not a problem with npm itself',
+        'and is related to npm not being able to find a package.json in',
+        'a package you are trying to install.'
+      ].join('\n')
+    )
     break
 
   default:
-    log.error("", er.message || er)
-    log.error("", ["", "If you need help, you may report this error at:"
-                  ,"    <https://github.com/npm/npm/issues>"
-                  ].join("\n"))
+    log.error('', er.message || er)
+    log.error(
+      '',
+      [
+        '',
+        'If you need help, you may report this error at:',
+        '    <https://github.com/npm/npm/issues>'
+      ].join('\n')
+    )
     break
   }
 
-  exit(typeof er.errno === "number" ? er.errno : 1)
+  exit(typeof er.errno === 'number' ? er.errno : 1)
 }
 
 var writingLogFile = false
@@ -391,22 +492,22 @@ function writeLogFile (cb) {
   writingLogFile = true
   wroteLogFile = true
 
-  var fstr = writeStream("npm-debug.log")
-    , os = require("os")
-    , out = ""
+  var fstr = writeStream('npm-debug.log')
+  var os = require('os')
+  var out = ''
 
   log.record.forEach(function (m) {
     var pref = [m.id, m.level]
     if (m.prefix) pref.push(m.prefix)
-    pref = pref.join(" ")
+    pref = pref.join(' ')
 
     m.message.trim().split(/\r?\n/).map(function (line) {
-      return (pref + " " + line).trim()
+      return (pref + ' ' + line).trim()
     }).forEach(function (line) {
       out += line + os.EOL
     })
   })
 
   fstr.end(out)
-  fstr.on("close", cb)
+  fstr.on('close', cb)
 }
diff --git a/deps/npm/lib/utils/gently-rm.js b/deps/npm/lib/utils/gently-rm.js
index ad0b4d039933c9..c73bb1bfc0ca56 100644
--- a/deps/npm/lib/utils/gently-rm.js
+++ b/deps/npm/lib/utils/gently-rm.js
@@ -14,6 +14,8 @@ var vacuum = require('fs-vacuum')
 var some = require('async-some')
 var asyncMap = require('slide').asyncMap
 var normalize = require('path').normalize
+var readCmdShim = require('read-cmd-shim')
+var iferr = require('iferr')
 
 function gentlyRm (target, gently, base, cb) {
   if (!cb) {
@@ -53,73 +55,74 @@ function gentlyRm (target, gently, base, cb) {
     return cb(new Error('May not delete: ' + resolved))
   }
 
-  var options = { log: log.silly.bind(log, 'vacuum-fs') }
-  if (npm.config.get('force') || !gently) options.purge = true
-  if (base) options.base = normalize(resolve(npm.prefix, base))
+  follow(resolved, function (realpath) {
+    var options = { log: log.silly.bind(log, 'vacuum-fs') }
+    if (npm.config.get('force') || !gently) options.purge = true
+    if (base) options.base = normalize(resolve(npm.prefix, base))
 
-  if (!gently) {
-    log.verbose('gentlyRm', "don't care about contents; nuking", resolved)
-    return vacuum(resolved, options, cb)
-  }
-
-  var parent = options.base = normalize(base ? resolve(npm.prefix, base) : npm.prefix)
-
-  // is the parent directory managed by npm?
-  log.silly('gentlyRm', 'verifying', parent, 'is an npm working directory')
-  some(prefixes, isManaged(parent), function (er, matched) {
-    if (er) return cb(er)
-
-    if (!matched) {
-      log.error('gentlyRm', 'containing path', parent, "isn't under npm's control")
-      return clobberFail(resolved, parent, cb)
-    }
-    log.silly('gentlyRm', 'containing path', parent, "is under npm's control, in", matched)
-
-    // is the target directly contained within the (now known to be
-    // managed) parent?
-    if (isInside(resolved, parent)) {
-      log.silly('gentlyRm', 'deletion target', resolved, 'is under', parent)
-      log.verbose('gentlyRm', 'vacuuming from', resolved, 'up to', parent)
+    if (!gently) {
+      log.verbose('gentlyRm', "don't care about contents; nuking", resolved)
       return vacuum(resolved, options, cb)
     }
-    log.silly('gentlyRm', resolved, 'is not under', parent)
 
-    // the target isn't directly within the parent, but is it itself managed?
-    log.silly('gentlyRm', 'verifying', resolved, 'is an npm working directory')
-    some(prefixes, isManaged(resolved), function (er, matched) {
+    var parent = options.base = normalize(base ? resolve(npm.prefix, base) : npm.prefix)
+
+    // is the parent directory managed by npm?
+    log.silly('gentlyRm', 'verifying', parent, 'is an npm working directory')
+    some(prefixes, isManaged(parent), function (er, matched) {
       if (er) return cb(er)
 
-      if (matched) {
-        log.silly('gentlyRm', resolved, "is under npm's control, in", matched)
-        options.base = matched
-        log.verbose('gentlyRm', 'removing', resolved, 'with base', options.base)
+      if (!matched) {
+        log.error('gentlyRm', 'containing path', parent, "isn't under npm's control")
+        return clobberFail(resolved, parent, cb)
+      }
+      log.silly('gentlyRm', 'containing path', parent, "is under npm's control, in", matched)
+
+      // is the target directly contained within the (now known to be
+      // managed) parent?
+      if (isInside(resolved, parent)) {
+        log.silly('gentlyRm', 'deletion target', resolved, 'is under', parent)
+        log.verbose('gentlyRm', 'vacuuming from', resolved, 'up to', parent)
+        options.base = parent
         return vacuum(resolved, options, cb)
       }
-      log.verbose('gentlyRm', resolved, "is not under npm's control")
-
-      // the target isn't managed directly, but maybe it's a link...
-      log.silly('gentlyRm', 'checking to see if', resolved, 'is a link')
-      lstat(resolved, function (er, stat) {
-        if (er) {
-          // race conditions are common when unbuilding
-          if (er.code === 'ENOENT') return cb(null)
-          return cb(er)
-        }
+      log.silly('gentlyRm', realpath, 'is not under', parent)
+
+      // the target isn't directly within the parent, but is it itself managed?
+      log.silly('gentlyRm', 'verifying', realpath, 'is an npm working directory')
+      some(prefixes, isManaged(realpath), function (er, matched) {
+        if (er) return cb(er)
 
-        if (!stat.isSymbolicLink()) {
-          log.error('gentlyRm', resolved, 'is outside', parent, 'and not a link')
-          return clobberFail(resolved, parent, cb)
+        if (matched) {
+          log.silly('gentlyRm', resolved, "is under npm's control, in", matched)
+          if (isInside(realpath, parent)) {
+            log.silly('gentlyRm', realpath, 'is controlled by', parent)
+            options.base = matched
+            log.verbose('gentlyRm', 'removing', resolved, 'with base', options.base)
+            return vacuum(resolved, options, cb)
+          } else if (resolved !== realpath) {
+            log.warn('gentlyRm', 'not removing', resolved, "as it wasn't installed by", parent)
+            return cb()
+          }
         }
+        log.verbose('gentlyRm', resolved, "is not under npm's control")
 
-        // ...and maybe the link source, when read...
-        log.silly('gentlyRm', resolved, 'is a link')
-        readlink(resolved, function (er, link) {
+        // the target isn't managed directly, but maybe it's a link...
+        log.silly('gentlyRm', 'checking to see if', resolved, 'is a link')
+        readLinkOrShim(resolved, function (er, link) {
           if (er) {
             // race conditions are common when unbuilding
             if (er.code === 'ENOENT') return cb(null)
             return cb(er)
           }
 
+          if (!link) {
+            log.error('gentlyRm', resolved, 'is outside', parent, 'and not a link')
+            return clobberFail(resolved, parent, cb)
+          }
+
+          // ...and maybe the link source, when read...
+          log.silly('gentlyRm', resolved, 'is a link')
           // ...is inside the managed parent
           var source = resolve(dirname(resolved), link)
           if (isInside(source, parent)) {
@@ -168,23 +171,19 @@ function isManaged (target) {
     if (cached) return cb(null, cached)
 
     // otherwise, check the path
-    lstat(resolved, function (er, stat) {
+    readLinkOrShim(resolved, function (er, source) {
       if (er) return cb(er)
 
       // if it's not a link, cache & return the path itself
-      if (!stat.isSymbolicLink()) {
+      if (!source) {
         resolvedPaths[resolved] = resolved
         return cb(null, resolved)
       }
 
       // otherwise, cache & return the link's source
-      readlink(resolved, function (er, source) {
-        if (er) return cb(er)
-
-        resolved = resolve(resolved, source)
-        resolvedPaths[resolved] = resolved
-        cb(null, resolved)
-      })
+      resolved = resolve(resolved, source)
+      resolvedPaths[resolved] = resolved
+      cb(null, resolved)
     })
   }
 }
@@ -195,3 +194,28 @@ function clobberFail (target, root, cb) {
   er.path = target
   return cb(er)
 }
+
+function readLinkOrShim (path, cb) {
+  lstat(path, iferr(cb, function (stat) {
+    if (stat.isSymbolicLink()) {
+      readlink(path, cb)
+    } else {
+      readCmdShim(path, function (er, source) {
+        if (!er) return cb(null, source)
+        // lstat wouldn't return an error on these, so we don't either.
+        if (er.code === 'ENOTASHIM' || er.code === 'EISDIR') {
+          return cb(null, null)
+        } else {
+          return cb(er)
+        }
+      })
+    }
+  }))
+}
+
+function follow (path, cb) {
+  readLinkOrShim(path, function (er, source) {
+    if (!source) return cb(path)
+    cb(normalize(resolve(dirname(path), source)))
+  })
+}
diff --git a/deps/npm/lib/utils/git.js b/deps/npm/lib/utils/git.js
index 9c80ea55375f78..2d9da1086e150b 100644
--- a/deps/npm/lib/utils/git.js
+++ b/deps/npm/lib/utils/git.js
@@ -1,20 +1,19 @@
-
 // handle some git configuration for windows
 
 exports.spawn = spawnGit
 exports.chainableExec = chainableExec
 exports.whichAndExec = whichAndExec
 
-var exec = require("child_process").execFile
-  , spawn = require("./spawn")
-  , npm = require("../npm.js")
-  , which = require("which")
-  , git = npm.config.get("git")
-  , assert = require("assert")
-  , log = require("npmlog")
+var exec = require('child_process').execFile
+var spawn = require('./spawn')
+var npm = require('../npm.js')
+var which = require('which')
+var git = npm.config.get('git')
+var assert = require('assert')
+var log = require('npmlog')
 
 function prefixGitArgs () {
-  return process.platform === "win32" ? ["-c", "core.longpaths=true"] : []
+  return process.platform === 'win32' ? ['-c', 'core.longpaths=true'] : []
 }
 
 function execGit (args, options, cb) {
@@ -24,7 +23,7 @@ function execGit (args, options, cb) {
 }
 
 function spawnGit (args, options) {
-  log.info("git", args)
+  log.info('git', args)
   return spawn(git, prefixGitArgs().concat(args || []), options)
 }
 
@@ -38,11 +37,11 @@ function whichGit (cb) {
 }
 
 function whichAndExec (args, options, cb) {
-  assert.equal(typeof cb, "function", "no callback provided")
+  assert.equal(typeof cb, 'function', 'no callback provided')
   // check for git
   whichGit(function (err) {
     if (err) {
-      err.code = "ENOGIT"
+      err.code = 'ENOGIT'
       return cb(err)
     }
 
diff --git a/deps/npm/lib/utils/lifecycle.js b/deps/npm/lib/utils/lifecycle.js
index 9805a1c0c1dc45..1c0d437a907bf7 100644
--- a/deps/npm/lib/utils/lifecycle.js
+++ b/deps/npm/lib/utils/lifecycle.js
@@ -2,20 +2,20 @@ exports = module.exports = lifecycle
 exports.cmd = cmd
 exports.makeEnv = makeEnv
 
-var log = require("npmlog")
-var spawn = require("./spawn")
-var npm = require("../npm.js")
-var path = require("path")
-var fs = require("graceful-fs")
-var chain = require("slide").chain
-var Stream = require("stream").Stream
-var PATH = "PATH"
-var uidNumber = require("uid-number")
-var umask = require("./umask")
-
-// windows calls it's path "Path" usually, but this is not guaranteed.
-if (process.platform === "win32") {
-  PATH = "Path"
+var log = require('npmlog')
+var spawn = require('./spawn')
+var npm = require('../npm.js')
+var path = require('path')
+var fs = require('graceful-fs')
+var chain = require('slide').chain
+var Stream = require('stream').Stream
+var PATH = 'PATH'
+var uidNumber = require('uid-number')
+var umask = require('./umask')
+
+// windows calls it's path 'Path' usually, but this is not guaranteed.
+if (process.platform === 'win32') {
+  PATH = 'Path'
   Object.keys(process.env).forEach(function (e) {
     if (e.match(/^PATH$/i)) {
       PATH = e
@@ -23,27 +23,41 @@ if (process.platform === "win32") {
   })
 }
 
+function logid (pkg, stage) {
+  return pkg._id + '~' + stage + ':'
+}
+
 function lifecycle (pkg, stage, wd, unsafe, failOk, cb) {
-  if (typeof cb !== "function") cb = failOk, failOk = false
-  if (typeof cb !== "function") cb = unsafe, unsafe = false
-  if (typeof cb !== "function") cb = wd, wd = null
+  if (typeof cb !== 'function') {
+    cb = failOk
+    failOk = false
+  }
+  if (typeof cb !== 'function') {
+    cb = unsafe
+    unsafe = false
+  }
+  if (typeof cb !== 'function') {
+    cb = wd
+    wd = null
+  }
 
   while (pkg && pkg._data) pkg = pkg._data
-  if (!pkg) return cb(new Error("Invalid package data"))
+  if (!pkg) return cb(new Error('Invalid package data'))
 
-  log.info(stage, pkg._id)
+  log.info('lifecycle', logid(pkg, stage), pkg._id)
   if (!pkg.scripts || npm.config.get('ignore-scripts')) pkg.scripts = {}
 
   validWd(wd || path.resolve(npm.dir, pkg.name), function (er, wd) {
     if (er) return cb(er)
 
-    unsafe = unsafe || npm.config.get("unsafe-perm")
+    unsafe = unsafe || npm.config.get('unsafe-perm')
 
     if ((wd.indexOf(npm.dir) !== 0 ||
           wd.indexOf(pkg.name) !== wd.length - pkg.name.length) &&
         !unsafe && pkg.scripts[stage]) {
-      log.warn( "cannot run in wd", "%s %s (wd=%s)"
-              , pkg._id, pkg.scripts[stage], wd)
+      log.warn('lifecycle', logid(pkg, stage), 'cannot run in wd',
+        '%s %s (wd=%s)', pkg._id, pkg.scripts[stage], wd
+      )
       return cb()
     }
 
@@ -53,63 +67,61 @@ function lifecycle (pkg, stage, wd, unsafe, failOk, cb) {
     env.npm_node_execpath = env.NODE = env.NODE || process.execPath
     env.npm_execpath = require.main.filename
 
-    // "nobody" typically doesn't have permission to write to /tmp
+    // 'nobody' typically doesn't have permission to write to /tmp
     // even if it's never used, sh freaks out.
-    if (!npm.config.get("unsafe-perm")) env.TMPDIR = wd
+    if (!npm.config.get('unsafe-perm')) env.TMPDIR = wd
 
     lifecycle_(pkg, stage, wd, env, unsafe, failOk, cb)
   })
 }
 
-function checkForLink (pkg, cb) {
-  var f = path.join(npm.dir, pkg.name)
-  fs.lstat(f, function (er, s) {
-    cb(null, !(er || !s.isSymbolicLink()))
-  })
-}
-
 function lifecycle_ (pkg, stage, wd, env, unsafe, failOk, cb) {
   var pathArr = []
-    , p = wd.split("node_modules")
-    , acc = path.resolve(p.shift())
+  var p = wd.split('node_modules')
+  var acc = path.resolve(p.shift())
 
   p.forEach(function (pp) {
-    pathArr.unshift(path.join(acc, "node_modules", ".bin"))
-    acc = path.join(acc, "node_modules", pp)
+    pathArr.unshift(path.join(acc, 'node_modules', '.bin'))
+    acc = path.join(acc, 'node_modules', pp)
   })
-  pathArr.unshift(path.join(acc, "node_modules", ".bin"))
+  pathArr.unshift(path.join(acc, 'node_modules', '.bin'))
 
   // we also unshift the bundled node-gyp-bin folder so that
   // the bundled one will be used for installing things.
-  pathArr.unshift(path.join(__dirname, "..", "..", "bin", "node-gyp-bin"))
+  pathArr.unshift(path.join(__dirname, '..', '..', 'bin', 'node-gyp-bin'))
 
   if (env[PATH]) pathArr.push(env[PATH])
-  env[PATH] = pathArr.join(process.platform === "win32" ? ";" : ":")
+  env[PATH] = pathArr.join(process.platform === 'win32' ? ';' : ':')
 
   var packageLifecycle = pkg.scripts && pkg.scripts.hasOwnProperty(stage)
 
   if (packageLifecycle) {
     // define this here so it's available to all scripts.
     env.npm_lifecycle_script = pkg.scripts[stage]
+  } else {
+    log.silly('lifecycle', logid(pkg, stage), 'no script for ' + stage + ', continuing')
   }
 
   function done (er) {
     if (er) {
-      if (npm.config.get("force")) {
-        log.info("forced, continuing", er)
+      if (npm.config.get('force')) {
+        log.info('lifecycle', logid(pkg, stage), 'forced, continuing', er)
         er = null
       } else if (failOk) {
-        log.warn("continuing anyway", er.message)
+        log.warn('lifecycle', logid(pkg, stage), 'continuing anyway', er.message)
         er = null
       }
     }
     cb(er)
   }
 
-  chain
-    ( [ packageLifecycle && [runPackageLifecycle, pkg, env, wd, unsafe]
-      , [runHookLifecycle, pkg, env, wd, unsafe] ]
-    , done )
+  chain(
+    [
+      packageLifecycle && [runPackageLifecycle, pkg, env, wd, unsafe],
+      [runHookLifecycle, pkg, env, wd, unsafe]
+    ],
+    done
+  )
 }
 
 function validWd (d, cb) {
@@ -117,7 +129,7 @@ function validWd (d, cb) {
     if (er || !st.isDirectory()) {
       var p = path.dirname(d)
       if (p === d) {
-        return cb(new Error("Could not find suitable wd"))
+        return cb(new Error('Could not find suitable wd'))
       }
       return validWd(p, cb)
     }
@@ -128,17 +140,16 @@ function validWd (d, cb) {
 function runPackageLifecycle (pkg, env, wd, unsafe, cb) {
   // run package lifecycle scripts in the package root, or the nearest parent.
   var stage = env.npm_lifecycle_event
-    , cmd = env.npm_lifecycle_script
+  var cmd = env.npm_lifecycle_script
 
-  var note = "\n> " + pkg._id + " " + stage + " " + wd
-           + "\n> " + cmd + "\n"
+  var note = '\n> ' + pkg._id + ' ' + stage + ' ' + wd +
+             '\n> ' + cmd + '\n'
   runCmd(note, cmd, pkg, env, stage, wd, unsafe, cb)
 }
 
-
 var running = false
 var queue = []
-function dequeue() {
+function dequeue () {
   running = false
   if (queue.length) {
     var r = queue.shift()
@@ -154,18 +165,17 @@ function runCmd (note, cmd, pkg, env, stage, wd, unsafe, cb) {
 
   running = true
   log.pause()
-  var user = unsafe ? null : npm.config.get("user")
-    , group = unsafe ? null : npm.config.get("group")
+  var user = unsafe ? null : npm.config.get('user')
+  var group = unsafe ? null : npm.config.get('group')
 
   if (log.level !== 'silent') {
-    if (npm.spinner.int) {
-      npm.config.get("logstream").write("\r \r")
-    }
+    log.clearProgress()
     console.log(note)
+    log.showProgress()
   }
-  log.verbose("unsafe-perm in lifecycle", unsafe)
+  log.verbose('lifecycle', logid(pkg, stage), 'unsafe-perm in lifecycle', unsafe)
 
-  if (process.platform === "win32") {
+  if (process.platform === 'win32') {
     unsafe = true
   }
 
@@ -186,10 +196,11 @@ function runCmd_ (cmd, pkg, env, wd, stage, unsafe, uid, gid, cb_) {
     process.nextTick(dequeue)
   }
 
-  var conf = { cwd: wd
-             , env: env
-             , stdio: [ 0, 1, 2 ]
-             }
+  var conf = {
+    cwd: wd,
+    env: env,
+    stdio: [ 0, 1, 2 ]
+  }
 
   if (!unsafe) {
     conf.uid = uid ^ 0
@@ -205,25 +216,33 @@ function runCmd_ (cmd, pkg, env, wd, stage, unsafe, uid, gid, cb_) {
     conf.windowsVerbatimArguments = true
   }
 
+  log.verbose('lifecycle', logid(pkg, stage), 'PATH:', env[PATH])
+  log.verbose('lifecycle', logid(pkg, stage), 'CWD:', wd)
+  log.silly('lifecycle', logid(pkg, stage), 'Args:', [shFlag, cmd])
+
+  var progressEnabled = log.progressEnabled
+  if (progressEnabled) log.disableProgress()
   var proc = spawn(sh, [shFlag, cmd], conf)
-  proc.on("error", procError)
-  proc.on("close", function (code, signal) {
+
+  proc.on('error', procError)
+  proc.on('close', function (code, signal) {
+    log.silly('lifecycle', logid(pkg, stage), 'Returned: code:', code, ' signal:', signal)
     if (signal) {
-      process.kill(process.pid, signal);
+      process.kill(process.pid, signal)
     } else if (code) {
-      var er = new Error("Exit status " + code)
+      var er = new Error('Exit status ' + code)
     }
     procError(er)
   })
 
   function procError (er) {
+    if (progressEnabled) log.enableProgress()
     if (er && !npm.ROLLBACK) {
-      log.info(pkg._id, "Failed to exec "+stage+" script")
-      er.message = pkg._id + " "
-                 + stage + ": `" + cmd +"`\n"
-                 + er.message
-      if (er.code !== "EPERM") {
-        er.code = "ELIFECYCLE"
+      log.info('lifecycle', logid(pkg, stage), 'Failed to exec ' + stage + ' script')
+      er.message = pkg._id + ' ' + stage + ': `' + cmd + '`\n' +
+                   er.message
+      if (er.code !== 'EPERM') {
+        er.code = 'ELIFECYCLE'
       }
       er.pkgid = pkg._id
       er.stage = stage
@@ -231,33 +250,30 @@ function runCmd_ (cmd, pkg, env, wd, stage, unsafe, uid, gid, cb_) {
       er.pkgname = pkg.name
       return cb(er)
     } else if (er) {
-      log.error(pkg._id+"."+stage, er)
-      log.error(pkg._id+"."+stage, "continuing anyway")
+      log.error('lifecycle', logid(pkg, stage), er)
+      log.error('lifecycle', logid(pkg, stage), 'continuing anyway')
       return cb()
     }
     cb(er)
   }
 }
 
-
 function runHookLifecycle (pkg, env, wd, unsafe, cb) {
   // check for a hook script, run if present.
   var stage = env.npm_lifecycle_event
-    , hook = path.join(npm.dir, ".hooks", stage)
-    , user = unsafe ? null : npm.config.get("user")
-    , group = unsafe ? null : npm.config.get("group")
-    , cmd = hook
+  var hook = path.join(npm.dir, '.hooks', stage)
+  var cmd = hook
 
   fs.stat(hook, function (er) {
     if (er) return cb()
-    var note = "\n> " + pkg._id + " " + stage + " " + wd
-             + "\n> " + cmd
+    var note = '\n> ' + pkg._id + ' ' + stage + ' ' + wd +
+               '\n> ' + cmd
     runCmd(note, hook, pkg, env, stage, wd, unsafe, cb)
   })
 }
 
 function makeEnv (data, prefix, env) {
-  prefix = prefix || "npm_package_"
+  prefix = prefix || 'npm_package_'
   if (!env) {
     env = {}
     for (var i in process.env) if (!i.match(/^npm_/)) {
@@ -265,52 +281,57 @@ function makeEnv (data, prefix, env) {
     }
 
     // npat asks for tap output
-    if (npm.config.get("npat")) env.TAP = 1
+    if (npm.config.get('npat')) env.TAP = 1
 
     // express and others respect the NODE_ENV value.
-    if (npm.config.get("production")) env.NODE_ENV = "production"
+    if (npm.config.get('production')) env.NODE_ENV = 'production'
 
-  } else if (!data.hasOwnProperty("_lifecycleEnv")) {
-    Object.defineProperty(data, "_lifecycleEnv",
-      { value : env
-      , enumerable : false
-      })
+  } else if (!data.hasOwnProperty('_lifecycleEnv')) {
+    Object.defineProperty(data, '_lifecycleEnv',
+      {
+        value: env,
+        enumerable: false
+      }
+    )
   }
 
-  for (var i in data) if (i.charAt(0) !== "_") {
-    var envKey = (prefix+i).replace(/[^a-zA-Z0-9_]/g, '_')
-    if (i === "readme") {
+  for (i in data) if (i.charAt(0) !== '_') {
+    var envKey = (prefix + i).replace(/[^a-zA-Z0-9_]/g, '_')
+    if (i === 'readme') {
       continue
     }
-    if (data[i] && typeof(data[i]) === "object") {
+    if (data[i] && typeof data[i] === 'object') {
       try {
         // quick and dirty detection for cyclical structures
         JSON.stringify(data[i])
-        makeEnv(data[i], envKey+"_", env)
+        makeEnv(data[i], envKey + '_', env)
       } catch (ex) {
         // usually these are package objects.
         // just get the path and basic details.
         var d = data[i]
-        makeEnv( { name: d.name, version: d.version, path:d.path }
-               , envKey+"_", env)
+        makeEnv(
+          { name: d.name, version: d.version, path: d.path },
+          envKey + '_',
+          env
+        )
       }
     } else {
       env[envKey] = String(data[i])
-      env[envKey] = -1 !== env[envKey].indexOf("\n")
-                  ? JSON.stringify(env[envKey])
-                  : env[envKey]
+      env[envKey] = env[envKey].indexOf('\n') !== -1 ?
+                      JSON.stringify(env[envKey]) :
+                      env[envKey]
     }
 
   }
 
-  if (prefix !== "npm_package_") return env
+  if (prefix !== 'npm_package_') return env
 
-  prefix = "npm_config_"
+  prefix = 'npm_config_'
   var pkgConfig = {}
-    , keys = npm.config.keys
-    , pkgVerConfig = {}
-    , namePref = data.name + ":"
-    , verPref = data.name + "@" + data.version + ":"
+  var keys = npm.config.keys
+  var pkgVerConfig = {}
+  var namePref = data.name + ':'
+  var verPref = data.name + '@' + data.version + ':'
 
   keys.forEach(function (i) {
     // in some rare cases (e.g. working with nerf darts), there are segmented
@@ -321,29 +342,30 @@ function makeEnv (data, prefix, env) {
     var value = npm.config.get(i)
     if (value instanceof Stream || Array.isArray(value)) return
     if (i.match(/umask/)) value = umask.toString(value)
-    if (!value) value = ""
-    else if (typeof value === "number") value = "" + value
-    else if (typeof value !== "string") value = JSON.stringify(value)
+    if (!value) value = ''
+    else if (typeof value === 'number') value = '' + value
+    else if (typeof value !== 'string') value = JSON.stringify(value)
 
-    value = -1 !== value.indexOf("\n")
+    value = value.indexOf('\n') !== -1
           ? JSON.stringify(value)
           : value
-    i = i.replace(/^_+/, "")
+    i = i.replace(/^_+/, '')
+    var k
     if (i.indexOf(namePref) === 0) {
-      var k = i.substr(namePref.length).replace(/[^a-zA-Z0-9_]/g, "_")
-      pkgConfig[ k ] = value
+      k = i.substr(namePref.length).replace(/[^a-zA-Z0-9_]/g, '_')
+      pkgConfig[k] = value
     } else if (i.indexOf(verPref) === 0) {
-      var k = i.substr(verPref.length).replace(/[^a-zA-Z0-9_]/g, "_")
-      pkgVerConfig[ k ] = value
+      k = i.substr(verPref.length).replace(/[^a-zA-Z0-9_]/g, '_')
+      pkgVerConfig[k] = value
     }
-    var envKey = (prefix+i).replace(/[^a-zA-Z0-9_]/g, "_")
+    var envKey = (prefix + i).replace(/[^a-zA-Z0-9_]/g, '_')
     env[envKey] = value
   })
 
-  prefix = "npm_package_config_"
+  prefix = 'npm_package_config_'
   ;[pkgConfig, pkgVerConfig].forEach(function (conf) {
     for (var i in conf) {
-      var envKey = (prefix+i)
+      var envKey = (prefix + i)
       env[envKey] = conf[i]
     }
   })
@@ -353,10 +375,10 @@ function makeEnv (data, prefix, env) {
 
 function cmd (stage) {
   function CMD (args, cb) {
-    npm.commands["run-script"]([stage].concat(args), cb)
+    npm.commands['run-script']([stage].concat(args), cb)
   }
-  CMD.usage = "npm "+stage+" [-- <args>]"
-  var installedShallow = require("./completion/installed-shallow.js")
+  CMD.usage = 'npm ' + stage + ' [-- <args>]'
+  var installedShallow = require('./completion/installed-shallow.js')
   CMD.completion = function (opts, cb) {
     installedShallow(opts, function (d) {
       return d.scripts && d.scripts[stage]
diff --git a/deps/npm/lib/utils/link.js b/deps/npm/lib/utils/link.js
index e353bfae9372a4..1091f46833c8c8 100644
--- a/deps/npm/lib/utils/link.js
+++ b/deps/npm/lib/utils/link.js
@@ -1,29 +1,44 @@
-
 module.exports = link
 link.ifExists = linkIfExists
 
-var fs = require("graceful-fs")
-  , chain = require("slide").chain
-  , mkdir = require("mkdirp")
-  , rm = require("./gently-rm.js")
-  , path = require("path")
-  , npm = require("../npm.js")
+var fs = require('graceful-fs')
+var chain = require('slide').chain
+var mkdir = require('mkdirp')
+var rm = require('./gently-rm.js')
+var path = require('path')
+var npm = require('../npm.js')
 
 function linkIfExists (from, to, gently, cb) {
   fs.stat(from, function (er) {
     if (er) return cb()
-    link(from, to, gently, cb)
+    fs.readlink(to, function (er, fromOnDisk) {
+      // if the link already exists and matches what we would do,
+      // we don't need to do anything
+      if (!er) {
+        var toDir = path.dirname(to)
+        var absoluteFrom = path.resolve(toDir, from)
+        var absoluteFromOnDisk = path.resolve(toDir, fromOnDisk)
+        if (absoluteFrom === absoluteFromOnDisk) return cb()
+      }
+      link(from, to, gently, cb)
+    })
   })
 }
 
 function link (from, to, gently, abs, cb) {
-  if (typeof cb !== "function") cb = abs, abs = false
-  if (typeof cb !== "function") cb = gently, gently = null
-  if (npm.config.get("force")) gently = false
+  if (typeof cb !== 'function') {
+    cb = abs
+    abs = false
+  }
+  if (typeof cb !== 'function') {
+    cb = gently
+    gently = null
+  }
+  if (npm.config.get('force')) gently = false
 
   to = path.resolve(to)
   var target = from = path.resolve(from)
-  if (!abs && process.platform !== "win32") {
+  if (!abs && process.platform !== 'win32') {
     // junctions on windows must be absolute
     target = path.relative(path.dirname(to), from)
     // if there is no folder in common, then it will be much
@@ -31,10 +46,13 @@ function link (from, to, gently, abs, cb) {
     if (target.length >= from.length) target = from
   }
 
-  chain
-    ( [ [fs, "stat", from]
-      , [rm, to, gently]
-      , [mkdir, path.dirname(to)]
-      , [fs, "symlink", target, to, "junction"] ]
-    , cb)
+  chain(
+    [
+      [fs, 'stat', from],
+      [rm, to, gently],
+      [mkdir, path.dirname(to)],
+      [fs, 'symlink', target, to, 'junction']
+    ],
+    cb
+  )
 }
diff --git a/deps/npm/lib/utils/locker.js b/deps/npm/lib/utils/locker.js
index 293d2da052b956..9cd8b2c4fdac95 100644
--- a/deps/npm/lib/utils/locker.js
+++ b/deps/npm/lib/utils/locker.js
@@ -1,38 +1,39 @@
-var crypto = require("crypto")
-var resolve = require("path").resolve
+var crypto = require('crypto')
+var resolve = require('path').resolve
 
-var lockfile = require("lockfile")
-var log = require("npmlog")
-var mkdirp = require("mkdirp")
+var lockfile = require('lockfile')
+var log = require('npmlog')
 
-var npm = require("../npm.js")
+var npm = require('../npm.js')
 var correctMkdir = require('../utils/correct-mkdir.js')
 
 var installLocks = {}
 
 function lockFileName (base, name) {
-  var c = name.replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-+|-+$/g, "")
-    , p = resolve(base, name)
-    , h = crypto.createHash("sha1").update(p).digest("hex")
-    , l = resolve(npm.cache, "_locks")
+  var c = name.replace(/[^a-zA-Z0-9]+/g, '-').replace(/^-+|-+$/g, '')
+  var p = resolve(base, name)
+  var h = crypto.createHash('sha1').update(p).digest('hex')
+  var l = resolve(npm.cache, '_locks')
 
-  return resolve(l, c.substr(0, 24)+"-"+h.substr(0, 16)+".lock")
+  return resolve(l, c.substr(0, 24) + '-' + h.substr(0, 16) + '.lock')
 }
 
 function lock (base, name, cb) {
-  var lockDir = resolve(npm.cache, "_locks")
+  var lockDir = resolve(npm.cache, '_locks')
   correctMkdir(lockDir, function (er) {
     if (er) return cb(er)
 
-    var opts = { stale:   npm.config.get("cache-lock-stale")
-               , retries: npm.config.get("cache-lock-retries")
-               , wait:    npm.config.get("cache-lock-wait") }
+    var opts = {
+      stale: npm.config.get('cache-lock-stale'),
+      retries: npm.config.get('cache-lock-retries'),
+      wait: npm.config.get('cache-lock-wait')
+    }
     var lf = lockFileName(base, name)
     lockfile.lock(lf, opts, function (er) {
-      if (er) log.warn("locking", lf, "failed", er)
+      if (er) log.warn('locking', lf, 'failed', er)
 
       if (!er) {
-        log.verbose("lock", "using", lf, "for", resolve(base, name))
+        log.verbose('lock', 'using', lf, 'for', resolve(base, name))
         installLocks[lf] = true
       }
 
@@ -43,31 +44,30 @@ function lock (base, name, cb) {
 
 function unlock (base, name, cb) {
   var lf = lockFileName(base, name)
-    , locked = installLocks[lf]
+  var locked = installLocks[lf]
   if (locked === false) {
     return process.nextTick(cb)
-  }
-  else if (locked === true) {
+  } else if (locked === true) {
     lockfile.unlock(lf, function (er) {
       if (er) {
-        log.warn("unlocking", lf, "failed", er)
-      }
-      else {
+        log.warn('unlocking', lf, 'failed', er)
+      } else {
         installLocks[lf] = false
-        log.verbose("unlock", "done using", lf, "for", resolve(base, name))
+        log.verbose('unlock', 'done using', lf, 'for', resolve(base, name))
       }
 
       cb(er)
     })
-  }
-  else {
-    throw new Error(
-      "Attempt to unlock " + resolve(base, name) + ", which hasn't been locked"
+  } else {
+    var notLocked = new Error(
+      'Attempt to unlock ' + resolve(base, name) + ", which hasn't been locked"
     )
+    notLocked.code = 'ENOTLOCKED'
+    throw notLocked
   }
 }
 
 module.exports = {
-  lock   : lock,
-  unlock : unlock
+  lock: lock,
+  unlock: unlock
 }
diff --git a/deps/npm/lib/utils/map-to-registry.js b/deps/npm/lib/utils/map-to-registry.js
index bd68a26d42ef8e..34046d191769d3 100644
--- a/deps/npm/lib/utils/map-to-registry.js
+++ b/deps/npm/lib/utils/map-to-registry.js
@@ -1,56 +1,56 @@
-var url = require("url")
+var url = require('url')
 
-var log = require("npmlog")
-  , npa = require("npm-package-arg")
+var log = require('npmlog')
+var npa = require('npm-package-arg')
 
 module.exports = mapToRegistry
 
-function mapToRegistry(name, config, cb) {
-  log.silly("mapToRegistry", "name", name)
+function mapToRegistry (name, config, cb) {
+  log.silly('mapToRegistry', 'name', name)
   var registry
 
   // the name itself takes precedence
   var data = npa(name)
   if (data.scope) {
     // the name is definitely scoped, so escape now
-    name = name.replace("/", "%2f")
+    name = name.replace('/', '%2f')
 
-    log.silly("mapToRegistry", "scope (from package name)", data.scope)
+    log.silly('mapToRegistry', 'scope (from package name)', data.scope)
 
-    registry = config.get(data.scope + ":registry")
+    registry = config.get(data.scope + ':registry')
     if (!registry) {
-      log.verbose("mapToRegistry", "no registry URL found in name for scope", data.scope)
+      log.verbose('mapToRegistry', 'no registry URL found in name for scope', data.scope)
     }
   }
 
   // ...then --scope=@scope or --scope=scope
-  var scope = config.get("scope")
+  var scope = config.get('scope')
   if (!registry && scope) {
     // I'm an enabler, sorry
-    if (scope.charAt(0) !== "@") scope = "@" + scope
+    if (scope.charAt(0) !== '@') scope = '@' + scope
 
-    log.silly("mapToRegistry", "scope (from config)", scope)
+    log.silly('mapToRegistry', 'scope (from config)', scope)
 
-    registry = config.get(scope + ":registry")
+    registry = config.get(scope + ':registry')
     if (!registry) {
-      log.verbose("mapToRegistry", "no registry URL found in config for scope", scope)
+      log.verbose('mapToRegistry', 'no registry URL found in config for scope', scope)
     }
   }
 
   // ...and finally use the default registry
   if (!registry) {
-    log.silly("mapToRegistry", "using default registry")
-    registry = config.get("registry")
+    log.silly('mapToRegistry', 'using default registry')
+    registry = config.get('registry')
   }
 
-  log.silly("mapToRegistry", "registry", registry)
+  log.silly('mapToRegistry', 'registry', registry)
 
   var auth = config.getCredentialsByURI(registry)
 
   // normalize registry URL so resolution doesn't drop a piece of registry URL
-  var normalized = registry.slice(-1) !== "/" ? registry+"/" : registry
+  var normalized = registry.slice(-1) !== '/' ? registry + '/' : registry
   var uri = url.resolve(normalized, name)
-  log.silly("mapToRegistry", "uri", uri)
+  log.silly('mapToRegistry', 'uri', uri)
 
   cb(null, uri, auth, normalized)
 }
diff --git a/deps/npm/lib/utils/parse-json.js b/deps/npm/lib/utils/parse-json.js
new file mode 100644
index 00000000000000..5c0b959a0d39ee
--- /dev/null
+++ b/deps/npm/lib/utils/parse-json.js
@@ -0,0 +1,24 @@
+'use strict'
+var parseJSON = module.exports = function (content) {
+  return JSON.parse(stripBOM(content))
+}
+
+parseJSON.noExceptions = function (content) {
+  try {
+    return parseJSON(content)
+  } catch (ex) {
+    return
+  }
+}
+
+// from read-package-json
+function stripBOM (content) {
+  content = content.toString()
+  // Remove byte order marker. This catches EF BB BF (the UTF-8 BOM)
+  // because the buffer-to-string conversion in `fs.readFileSync()`
+  // translates it to FEFF, the UTF-16 BOM.
+  if (content.charCodeAt(0) === 0xFEFF) {
+    content = content.slice(1)
+  }
+  return content
+}
diff --git a/deps/npm/lib/utils/pulse-till-done.js b/deps/npm/lib/utils/pulse-till-done.js
new file mode 100644
index 00000000000000..fc6450e0030015
--- /dev/null
+++ b/deps/npm/lib/utils/pulse-till-done.js
@@ -0,0 +1,21 @@
+'use strict'
+var validate = require('aproba')
+var log = require('npmlog')
+
+var pulsers = 0
+var pulse
+
+module.exports = function (prefix, cb) {
+  validate('SF', [prefix, cb])
+  if (!pulsers++) {
+    pulse = setInterval(function () {
+      log.gauge.pulse('network')
+    }, 250)
+  }
+  return function () {
+    if (!--pulsers) {
+      clearInterval(pulse)
+    }
+    cb.apply(null, arguments)
+  }
+}
diff --git a/deps/npm/lib/utils/read-local-package.js b/deps/npm/lib/utils/read-local-package.js
index ca6d613210f1da..27ca7b4e395376 100644
--- a/deps/npm/lib/utils/read-local-package.js
+++ b/deps/npm/lib/utils/read-local-package.js
@@ -1,12 +1,12 @@
 exports = module.exports = readLocalPkg
 
-var npm = require("../npm.js")
-  , readJson = require("read-package-json")
+var npm = require('../npm.js')
+var readJson = require('read-package-json')
 
 function readLocalPkg (cb) {
-  if (npm.config.get("global")) return cb()
-  var path = require("path")
-  readJson(path.resolve(npm.prefix, "package.json"), function (er, d) {
+  if (npm.config.get('global')) return cb()
+  var path = require('path')
+  readJson(path.resolve(npm.prefix, 'package.json'), function (er, d) {
     return cb(er, d && d.name)
   })
 }
diff --git a/deps/npm/lib/utils/spawn.js b/deps/npm/lib/utils/spawn.js
index 74684521f741a0..e389d83e02c64d 100644
--- a/deps/npm/lib/utils/spawn.js
+++ b/deps/npm/lib/utils/spawn.js
@@ -1,16 +1,16 @@
 module.exports = spawn
 
-var _spawn = require("child_process").spawn
-var EventEmitter = require("events").EventEmitter
+var _spawn = require('child_process').spawn
+var EventEmitter = require('events').EventEmitter
 
 function spawn (cmd, args, options) {
   var raw = _spawn(cmd, args, options)
   var cooked = new EventEmitter()
 
-  raw.on("error", function (er) {
+  raw.on('error', function (er) {
     er.file = cmd
-    cooked.emit("error", er)
-  }).on("close", function (code, signal) {
+    cooked.emit('error', er)
+  }).on('close', function (code, signal) {
     // Create ENOENT error because Node.js v0.8 will not emit
     // an `error` event if the command could not be found.
     if (code === 127) {
@@ -21,7 +21,7 @@ function spawn (cmd, args, options) {
       er.file = cmd
       cooked.emit('error', er)
     } else {
-      cooked.emit("close", code, signal)
+      cooked.emit('close', code, signal)
     }
   })
 
diff --git a/deps/npm/lib/utils/tar.js b/deps/npm/lib/utils/tar.js
index 7656b5d9754a3a..5b20160ea5d46d 100644
--- a/deps/npm/lib/utils/tar.js
+++ b/deps/npm/lib/utils/tar.js
@@ -1,22 +1,26 @@
 // commands for packing and unpacking tarballs
 // this file is used by lib/cache.js
 
-var npm = require("../npm.js")
-  , fs = require("graceful-fs")
-  , writeFileAtomic = require("write-file-atomic")
-  , writeStreamAtomic = require("fs-write-stream-atomic")
-  , path = require("path")
-  , log = require("npmlog")
-  , uidNumber = require("uid-number")
-  , rm = require("./gently-rm.js")
-  , readJson = require("read-package-json")
-  , myUid = process.getuid && process.getuid()
-  , myGid = process.getgid && process.getgid()
-  , tar = require("tar")
-  , zlib = require("zlib")
-  , fstream = require("fstream")
-  , Packer = require("fstream-npm")
-  , lifecycle = require("./lifecycle.js")
+var fs = require('graceful-fs')
+var path = require('path')
+var writeFileAtomic = require('write-file-atomic')
+var writeStreamAtomic = require('fs-write-stream-atomic')
+var log = require('npmlog')
+var uidNumber = require('uid-number')
+var readJson = require('read-package-json')
+var tar = require('tar')
+var zlib = require('zlib')
+var fstream = require('fstream')
+var Packer = require('fstream-npm')
+var iferr = require('iferr')
+var inherits = require('inherits')
+var npm = require('../npm.js')
+var rm = require('./gently-rm.js')
+var myUid = process.getuid && process.getuid()
+var myGid = process.getgid && process.getgid()
+var readPackageTree = require('read-package-tree')
+var union = require('lodash.union')
+var flattenTree = require('../install/flatten-tree.js')
 
 if (process.env.SUDO_UID && myUid === 0) {
   if (!isNaN(process.env.SUDO_UID)) myUid = +process.env.SUDO_UID
@@ -26,28 +30,148 @@ if (process.env.SUDO_UID && myUid === 0) {
 exports.pack = pack
 exports.unpack = unpack
 
-function pack (tarball, folder, pkg, dfc, cb) {
-  log.verbose("tar pack", [tarball, folder])
-  if (typeof cb !== "function") cb = dfc, dfc = false
+function pack (tarball, folder, pkg, cb) {
+  log.verbose('tar pack', [tarball, folder])
+
+  log.verbose('tarball', tarball)
+  log.verbose('folder', folder)
+
+  readJson(path.join(folder, 'package.json'), function (er, pkg) {
+    if (er || !pkg.bundleDependencies) {
+      pack_(tarball, folder, null, null, pkg, cb)
+    } else {
+      // we require this at runtime due to load-order issues, because recursive
+      // requires fail if you replace the exports object, and we do, not in deps, but
+      // in a dep of it.
+      var recalculateMetadata = require('../install/deps.js').recalculateMetadata
+
+      readPackageTree(folder, iferr(cb, function (tree) {
+        recalculateMetadata(tree, log.newGroup('pack:' + pkg), iferr(cb, function () {
+          pack_(tarball, folder, tree, flattenTree(tree), pkg, cb)
+        }))
+      }))
+    }
+  })
+}
 
-  log.verbose("tarball", tarball)
-  log.verbose("folder", folder)
+function BundledPacker (props) {
+  Packer.call(this, props)
+}
+inherits(BundledPacker, Packer)
+
+BundledPacker.prototype.applyIgnores = function (entry, partial, entryObj) {
+  // package.json files can never be ignored.
+  if (entry === 'package.json') return true
+
+  // readme files should never be ignored.
+  if (entry.match(/^readme(\.[^\.]*)$/i)) return true
+
+  // license files should never be ignored.
+  if (entry.match(/^(license|licence)(\.[^\.]*)?$/i)) return true
+
+  // changelogs should never be ignored.
+  if (entry.match(/^(changes|changelog|history)(\.[^\.]*)?$/i)) return true
+
+  // special rules.  see below.
+  if (entry === 'node_modules' && this.packageRoot) return true
+
+  // some files are *never* allowed under any circumstances
+  if (entry === '.git' ||
+      entry === '.lock-wscript' ||
+      entry.match(/^\.wafpickle-[0-9]+$/) ||
+      entry === 'CVS' ||
+      entry === '.svn' ||
+      entry === '.hg' ||
+      entry.match(/^\..*\.swp$/) ||
+      entry === '.DS_Store' ||
+      entry.match(/^\._/) ||
+      entry === 'npm-debug.log'
+    ) {
+    return false
+  }
 
-  if (dfc) {
-    // do fancy crap
-    return lifecycle(pkg, "prepublish", folder, function (er) {
-      if (er) return cb(er)
-      pack_(tarball, folder, pkg, cb)
-    })
-  } else {
-    pack_(tarball, folder, pkg, cb)
+  // in a node_modules folder, we only include bundled dependencies
+  // also, prevent packages in node_modules from being affected
+  // by rules set in the containing package, so that
+  // bundles don't get busted.
+  // Also, once in a bundle, everything is installed as-is
+  // To prevent infinite cycles in the case of cyclic deps that are
+  // linked with npm link, even in a bundle, deps are only bundled
+  // if they're not already present at a higher level.
+  if (this.bundleMagic) {
+    // bubbling up.  stop here and allow anything the bundled pkg allows
+    if (entry.indexOf('/') !== -1) return true
+
+    // never include the .bin.  It's typically full of platform-specific
+    // stuff like symlinks and .cmd files anyway.
+    if (entry === '.bin') return false
+
+    // the package root.
+    var p = this.parent
+    // the package before this one.
+    var pp = p && p.parent
+
+    // if this entry has already been bundled, and is a symlink,
+    // and it is the *same* symlink as this one, then exclude it.
+    if (pp && pp.bundleLinks && this.bundleLinks &&
+        pp.bundleLinks[entry] &&
+        pp.bundleLinks[entry] === this.bundleLinks[entry]) {
+      return false
+    }
+
+    // since it's *not* a symbolic link, if we're *already* in a bundle,
+    // then we should include everything.
+    if (pp && pp.package && pp.basename === 'node_modules') {
+      return true
+    }
+
+    // only include it at this point if it's a bundleDependency
+    return this.isBundled(entry)
   }
+  // if (this.bundled) return true
+
+  return Packer.prototype.applyIgnores.call(this, entry, partial, entryObj)
 }
 
-function pack_ (tarball, folder, pkg, cb) {
-  new Packer({ path: folder, type: "Directory", isDirectory: true })
-    .on("error", function (er) {
-      if (er) log.error("tar pack", "Error reading " + folder)
+function nameMatch (name) { return function (other) { return name === other.package.name } }
+
+function pack_ (tarball, folder, tree, flatTree, pkg, cb) {
+  function InstancePacker (props) {
+    BundledPacker.call(this, props)
+  }
+  inherits(InstancePacker, BundledPacker)
+  InstancePacker.prototype.isBundled = function (name) {
+    var bd = this.package && this.package.bundleDependencies
+    if (!bd) return false
+
+    if (!Array.isArray(bd)) {
+      throw new Error(this.package.name + '\'s `bundledDependencies` should ' +
+                      'be an array')
+    }
+    if (!tree) return false
+
+    if (bd.indexOf(name) !== -1) return true
+    var pkg = tree.children.filter(nameMatch(name))[0]
+    if (!pkg) return false
+    var requiredBy = union([], pkg.package._requiredBy)
+    var seen = {}
+    while (requiredBy.length) {
+      var req = requiredBy.shift()
+      if (seen[req]) continue
+      seen[req] = true
+      var reqPkg = flatTree[req]
+      if (!reqPkg) continue
+      if (reqPkg.parent === tree && bd.indexOf(reqPkg.package.name) !== -1) {
+        return true
+      }
+      requiredBy = union(requiredBy, reqPkg.package._requiredBy)
+    }
+    return false
+  }
+
+  new InstancePacker({ path: folder, type: 'Directory', isDirectory: true })
+    .on('error', function (er) {
+      if (er) log.error('tar pack', 'Error reading ' + folder)
       return cb(er)
     })
 
@@ -56,32 +180,43 @@ function pack_ (tarball, folder, pkg, cb) {
     // However, npm *itself* excludes these from its own package,
     // so that it can be more easily bootstrapped using old and
     // non-compliant tar implementations.
-    .pipe(tar.Pack({ noProprietary: !npm.config.get("proprietary-attribs") }))
-    .on("error", function (er) {
-      if (er) log.error("tar.pack", "tar creation error", tarball)
+    .pipe(tar.Pack({ noProprietary: !npm.config.get('proprietary-attribs') }))
+    .on('error', function (er) {
+      if (er) log.error('tar.pack', 'tar creation error', tarball)
       cb(er)
     })
     .pipe(zlib.Gzip())
-    .on("error", function (er) {
-      if (er) log.error("tar.pack", "gzip error "+tarball)
+    .on('error', function (er) {
+      if (er) log.error('tar.pack', 'gzip error ' + tarball)
       cb(er)
     })
     .pipe(writeStreamAtomic(tarball))
-    .on("error", function (er) {
-      if (er) log.error("tar.pack", "Could not write "+tarball)
+    .on('error', function (er) {
+      if (er) log.error('tar.pack', 'Could not write ' + tarball)
       cb(er)
     })
-    .on("close", cb)
+    .on('close', cb)
 }
 
-
 function unpack (tarball, unpackTarget, dMode, fMode, uid, gid, cb) {
-  log.verbose("tar", "unpack", tarball)
-  log.verbose("tar", "unpacking to", unpackTarget)
-  if (typeof cb !== "function") cb = gid, gid = null
-  if (typeof cb !== "function") cb = uid, uid = null
-  if (typeof cb !== "function") cb = fMode, fMode = npm.modes.file
-  if (typeof cb !== "function") cb = dMode, dMode = npm.modes.exec
+  log.verbose('tar', 'unpack', tarball)
+  log.verbose('tar', 'unpacking to', unpackTarget)
+  if (typeof cb !== 'function') {
+    cb = gid
+    gid = null
+  }
+  if (typeof cb !== 'function') {
+    cb = uid
+    uid = null
+  }
+  if (typeof cb !== 'function') {
+    cb = fMode
+    fMode = npm.modes.file
+  }
+  if (typeof cb !== 'function') {
+    cb = dMode
+    dMode = npm.modes.exec
+  }
 
   uidNumber(uid, gid, function (er, uid, gid) {
     if (er) return cb(er)
@@ -89,26 +224,25 @@ function unpack (tarball, unpackTarget, dMode, fMode, uid, gid, cb) {
   })
 }
 
-function unpack_ ( tarball, unpackTarget, dMode, fMode, uid, gid, cb ) {
+function unpack_ (tarball, unpackTarget, dMode, fMode, uid, gid, cb) {
   rm(unpackTarget, function (er) {
     if (er) return cb(er)
     // gzip {tarball} --decompress --stdout \
     //   | tar -mvxpf - --strip-components=1 -C {unpackTarget}
-    gunzTarPerm( tarball, unpackTarget
-               , dMode, fMode
-               , uid, gid
-               , function (er, folder) {
+    gunzTarPerm(tarball, unpackTarget,
+                dMode, fMode,
+                uid, gid,
+                function (er, folder) {
       if (er) return cb(er)
-      readJson(path.resolve(folder, "package.json"), cb)
+      readJson(path.resolve(folder, 'package.json'), cb)
     })
   })
 }
 
-
 function gunzTarPerm (tarball, target, dMode, fMode, uid, gid, cb_) {
   if (!dMode) dMode = npm.modes.exec
   if (!fMode) fMode = npm.modes.file
-  log.silly("gunzTarPerm", "modes", [dMode.toString(8), fMode.toString(8)])
+  log.silly('gunzTarPerm', 'modes', [dMode.toString(8), fMode.toString(8)])
 
   var cbCalled = false
   function cb (er) {
@@ -119,51 +253,51 @@ function gunzTarPerm (tarball, target, dMode, fMode, uid, gid, cb_) {
 
   var fst = fs.createReadStream(tarball)
 
-  fst.on("open", function (fd) {
+  fst.on('open', function (fd) {
     fs.fstat(fd, function (er, st) {
-      if (er) return fst.emit("error", er)
+      if (er) return fst.emit('error', er)
       if (st.size === 0) {
-        er = new Error("0-byte tarball\n" +
-                       "Please run `npm cache clean`")
-        fst.emit("error", er)
+        er = new Error('0-byte tarball\n' +
+                       'Please run `npm cache clean`')
+        fst.emit('error', er)
       }
     })
   })
 
   // figure out who we're supposed to be, if we're not pretending
   // to be a specific user.
-  if (npm.config.get("unsafe-perm") && process.platform !== "win32") {
+  if (npm.config.get('unsafe-perm') && process.platform !== 'win32') {
     uid = myUid
     gid = myGid
   }
 
   function extractEntry (entry) {
-    log.silly("gunzTarPerm", "extractEntry", entry.path)
+    log.silly('gunzTarPerm', 'extractEntry', entry.path)
     // never create things that are user-unreadable,
     // or dirs that are user-un-listable. Only leads to headaches.
     var originalMode = entry.mode = entry.mode || entry.props.mode
-    entry.mode = entry.mode | (entry.type === "Directory" ? dMode : fMode)
+    entry.mode = entry.mode | (entry.type === 'Directory' ? dMode : fMode)
     entry.mode = entry.mode & (~npm.modes.umask)
     entry.props.mode = entry.mode
     if (originalMode !== entry.mode) {
-      log.silly( "gunzTarPerm", "modified mode"
-               , [entry.path, originalMode, entry.mode])
+      log.silly('gunzTarPerm', 'modified mode',
+                [entry.path, originalMode, entry.mode])
     }
 
     // if there's a specific owner uid/gid that we want, then set that
-    if (process.platform !== "win32" &&
-        typeof uid === "number" &&
-        typeof gid === "number") {
+    if (process.platform !== 'win32' &&
+        typeof uid === 'number' &&
+        typeof gid === 'number') {
       entry.props.uid = entry.uid = uid
       entry.props.gid = entry.gid = gid
     }
   }
 
-  var extractOpts = { type: "Directory", path: target, strip: 1 }
+  var extractOpts = { type: 'Directory', path: target, strip: 1 }
 
-  if (process.platform !== "win32" &&
-      typeof uid === "number" &&
-      typeof gid === "number") {
+  if (process.platform !== 'win32' &&
+      typeof uid === 'number' &&
+      typeof gid === 'number') {
     extractOpts.uid = uid
     extractOpts.gid = gid
   }
@@ -172,9 +306,9 @@ function gunzTarPerm (tarball, target, dMode, fMode, uid, gid, cb_) {
   extractOpts.filter = function () {
     // symbolic links are not allowed in packages.
     if (this.type.match(/^.*Link$/)) {
-      log.warn( "excluding symbolic link"
-              , this.path.substr(target.length + 1)
-              + " -> " + this.linkpath )
+      log.warn('excluding symbolic link',
+               this.path.substr(target.length + 1) +
+               ' -> ' + this.linkpath)
       return false
     }
 
@@ -182,12 +316,12 @@ function gunzTarPerm (tarball, target, dMode, fMode, uid, gid, cb_) {
     // employed during tarball creation, in the fstream-npm module.
     // It is duplicated here to handle tarballs that are created
     // using other means, such as system tar or git archive.
-    if (this.type === "File") {
+    if (this.type === 'File') {
       var base = path.basename(this.path)
-      if (base === ".npmignore") {
+      if (base === '.npmignore') {
         sawIgnores[ this.path ] = true
-      } else if (base === ".gitignore") {
-        var npmignore = this.path.replace(/\.gitignore$/, ".npmignore")
+      } else if (base === '.gitignore') {
+        var npmignore = this.path.replace(/\.gitignore$/, '.npmignore')
         if (sawIgnores[npmignore]) {
           // Skip this one, already seen.
           return false
@@ -202,13 +336,12 @@ function gunzTarPerm (tarball, target, dMode, fMode, uid, gid, cb_) {
     return true
   }
 
-
   fst
-    .on("error", function (er) {
-      if (er) log.error("tar.unpack", "error reading "+tarball)
+    .on('error', function (er) {
+      if (er) log.error('tar.unpack', 'error reading ' + tarball)
       cb(er)
     })
-    .on("data", function OD (c) {
+    .on('data', function OD (c) {
       // detect what it is.
       // Then, depending on that, we'll figure out whether it's
       // a single-file module, gzipped tarball, or naked tarball.
@@ -218,59 +351,59 @@ function gunzTarPerm (tarball, target, dMode, fMode, uid, gid, cb_) {
           c[2] === 0x08) {
         fst
           .pipe(zlib.Unzip())
-          .on("error", function (er) {
-            if (er) log.error("tar.unpack", "unzip error "+tarball)
+          .on('error', function (er) {
+            if (er) log.error('tar.unpack', 'unzip error ' + tarball)
             cb(er)
           })
           .pipe(tar.Extract(extractOpts))
-          .on("entry", extractEntry)
-          .on("error", function (er) {
-            if (er) log.error("tar.unpack", "untar error "+tarball)
+          .on('entry', extractEntry)
+          .on('error', function (er) {
+            if (er) log.error('tar.unpack', 'untar error ' + tarball)
             cb(er)
           })
-          .on("close", cb)
+          .on('close', cb)
       } else if (hasTarHeader(c)) {
         // naked tar
         fst
           .pipe(tar.Extract(extractOpts))
-          .on("entry", extractEntry)
-          .on("error", function (er) {
-            if (er) log.error("tar.unpack", "untar error "+tarball)
+          .on('entry', extractEntry)
+          .on('error', function (er) {
+            if (er) log.error('tar.unpack', 'untar error ' + tarball)
             cb(er)
           })
-          .on("close", cb)
+          .on('close', cb)
       } else {
         // naked js file
-        var jsOpts = { path: path.resolve(target, "index.js") }
+        var jsOpts = { path: path.resolve(target, 'index.js') }
 
-        if (process.platform !== "win32" &&
-            typeof uid === "number" &&
-            typeof gid === "number") {
+        if (process.platform !== 'win32' &&
+            typeof uid === 'number' &&
+            typeof gid === 'number') {
           jsOpts.uid = uid
           jsOpts.gid = gid
         }
 
         fst
           .pipe(fstream.Writer(jsOpts))
-          .on("error", function (er) {
-            if (er) log.error("tar.unpack", "copy error "+tarball)
+          .on('error', function (er) {
+            if (er) log.error('tar.unpack', 'copy error ' + tarball)
             cb(er)
           })
-          .on("close", function () {
-            var j = path.resolve(target, "package.json")
+          .on('close', function () {
+            var j = path.resolve(target, 'package.json')
             readJson(j, function (er, d) {
               if (er) {
-                log.error("not a package", tarball)
+                log.error('not a package', tarball)
                 return cb(er)
               }
-              writeFileAtomic(j, JSON.stringify(d) + "\n", cb)
+              writeFileAtomic(j, JSON.stringify(d) + '\n', cb)
             })
           })
       }
 
       // now un-hook, and re-emit the chunk
-      fst.removeListener("data", OD)
-      fst.emit("data", c)
+      fst.removeListener('data', OD)
+      fst.emit('data', c)
     })
 }
 
diff --git a/deps/npm/lib/utils/temp-filename.js b/deps/npm/lib/utils/temp-filename.js
new file mode 100644
index 00000000000000..6b8245e8b790f0
--- /dev/null
+++ b/deps/npm/lib/utils/temp-filename.js
@@ -0,0 +1,7 @@
+'use strict'
+var uniqueFilename = require('unique-filename')
+var npm = require('../npm.js')
+
+module.exports = function (prefix) {
+  return uniqueFilename(npm.tmp, prefix)
+}
diff --git a/deps/npm/lib/utils/umask.js b/deps/npm/lib/utils/umask.js
index 6ccb4a1194b658..2dde1befa69dce 100644
--- a/deps/npm/lib/utils/umask.js
+++ b/deps/npm/lib/utils/umask.js
@@ -1,5 +1,5 @@
-var umask = require("umask")
-var npmlog = require("npmlog")
+var umask = require('umask')
+var npmlog = require('npmlog')
 var _fromString = umask.fromString
 
 module.exports = umask
@@ -8,7 +8,7 @@ module.exports = umask
 umask.fromString = function (val) {
   _fromString(val, function (err, result) {
     if (err) {
-      npmlog.warn("invalid umask", err.message)
+      npmlog.warn('invalid umask', err.message)
     }
     val = result
   })
diff --git a/deps/npm/lib/utils/warn-deprecated.js b/deps/npm/lib/utils/warn-deprecated.js
index ec821b9bd495b1..fe5c5ec82a304d 100644
--- a/deps/npm/lib/utils/warn-deprecated.js
+++ b/deps/npm/lib/utils/warn-deprecated.js
@@ -1,6 +1,6 @@
 module.exports = warnDeprecated
 
-var log = require("npmlog")
+var log = require('npmlog')
 
 var deprecations = {}
 
@@ -11,8 +11,7 @@ function warnDeprecated (type) {
         deprecations[type] = {}
         messages.forEach(function (m) { log.warn(type, m) })
       }
-    }
-    else {
+    } else {
       if (!deprecations[type]) deprecations[type] = {}
 
       if (!deprecations[type][instance]) {
diff --git a/deps/npm/lib/version.js b/deps/npm/lib/version.js
index dbd48a0145a3d7..455bcc2dbadb55 100644
--- a/deps/npm/lib/version.js
+++ b/deps/npm/lib/version.js
@@ -12,6 +12,7 @@ var npm = require('./npm.js')
 var git = require('./utils/git.js')
 var assert = require('assert')
 var lifecycle = require('./utils/lifecycle.js')
+var parseJSON = require('./utils/parse-json.js')
 
 version.usage = 'npm version [<newversion> | major | minor | patch | premajor | preminor | prepatch | prerelease]' +
                 '\n(run in package dir)\n' +
@@ -32,7 +33,7 @@ function version (args, silent, cb_) {
   fs.readFile(packagePath, function (er, data) {
     if (data) data = data.toString()
     try {
-      data = JSON.parse(data)
+      data = parseJSON(data)
     } catch (e) {
       er = e
       data = null
@@ -107,7 +108,7 @@ function updateShrinkwrap (newVersion, cb) {
 
     try {
       data = data.toString()
-      data = JSON.parse(data)
+      data = parseJSON(data)
     } catch (er) {
       log.error('version', 'Bad npm-shrinkwrap.json data')
       return cb(er)
diff --git a/deps/npm/lib/view.js b/deps/npm/lib/view.js
index 9199d352ae7ff8..9ca18d35402e1b 100644
--- a/deps/npm/lib/view.js
+++ b/deps/npm/lib/view.js
@@ -1,16 +1,17 @@
 // npm view [pkg [pkg ...]]
 
 module.exports = view
-view.usage = "npm view pkg[@version] [<field>[.subfield]...]"
-
-var npm = require("./npm.js")
-  , readJson = require("read-package-json")
-  , log = require("npmlog")
-  , util = require("util")
-  , semver = require("semver")
-  , mapToRegistry = require("./utils/map-to-registry.js")
-  , npa = require("npm-package-arg")
-  , path = require("path")
+view.usage = 'npm view [<@scope>/]<pkg>[@<version>] [<field>[.subfield]...]' +
+             '\n\naliases: info, show, v'
+
+var npm = require('./npm.js')
+var readJson = require('read-package-json')
+var log = require('npmlog')
+var util = require('util')
+var semver = require('semver')
+var mapToRegistry = require('./utils/map-to-registry.js')
+var npa = require('npm-package-arg')
+var path = require('path')
 
 view.completion = function (opts, cb) {
   if (opts.conf.argv.remain.length <= 2) {
@@ -19,14 +20,14 @@ view.completion = function (opts, cb) {
     return cb()
   }
   // have the package, get the fields.
-  var tag = npm.config.get("tag")
+  var tag = npm.config.get('tag')
   mapToRegistry(opts.conf.argv.remain[2], npm.config, function (er, uri, auth) {
     if (er) return cb(er)
 
-    npm.registry.get(uri, { auth : auth }, function (er, d) {
+    npm.registry.get(uri, { auth: auth }, function (er, d) {
       if (er) return cb(er)
-      var dv = d.versions[d["dist-tags"][tag]]
-        , fields = []
+      var dv = d.versions[d['dist-tags'][tag]]
+      var fields = []
       d.versions = Object.keys(d.versions).sort(semver.compareLoose)
       fields = getFields(d).concat(getFields(dv))
       cb(null, fields)
@@ -38,48 +39,51 @@ view.completion = function (opts, cb) {
     if (!d) return f
     pref = pref || []
     Object.keys(d).forEach(function (k) {
-      if (k.charAt(0) === "_" || k.indexOf(".") !== -1) return
-      var p = pref.concat(k).join(".")
+      if (k.charAt(0) === '_' || k.indexOf('.') !== -1) return
+      var p = pref.concat(k).join('.')
       f.push(p)
       if (Array.isArray(d[k])) {
         d[k].forEach(function (val, i) {
-          var pi = p + "[" + i + "]"
-          if (val && typeof val === "object") getFields(val, f, [p])
+          var pi = p + '[' + i + ']'
+          if (val && typeof val === 'object') getFields(val, f, [p])
           else f.push(pi)
         })
         return
       }
-      if (typeof d[k] === "object") getFields(d[k], f, [p])
+      if (typeof d[k] === 'object') getFields(d[k], f, [p])
     })
     return f
   }
 }
 
 function view (args, silent, cb) {
-  if (typeof cb !== "function") cb = silent, silent = false
+  if (typeof cb !== 'function') {
+    cb = silent
+    silent = false
+  }
 
-  if (!args.length) args = ["."]
+  if (!args.length) args = ['.']
 
   var pkg = args.shift()
-    , nv = npa(pkg)
-    , name = nv.name
-    , local = (name === "." || !name)
+  var nv = npa(pkg)
+  var name = nv.name
+  var local = (name === '.' || !name)
 
-  if (npm.config.get("global") && local) {
-    return cb(new Error("Cannot use view command in global mode."))
+  if (npm.config.get('global') && local) {
+    return cb(new Error('Cannot use view command in global mode.'))
   }
 
   if (local) {
     var dir = npm.prefix
-    readJson(path.resolve(dir, "package.json"), function (er, d) {
+    readJson(path.resolve(dir, 'package.json'), function (er, d) {
       d = d || {}
-      if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
-      if (!d.name) return cb(new Error("Invalid package.json"))
+      if (er && er.code !== 'ENOENT' && er.code !== 'ENOTDIR') return cb(er)
+      if (!d.name) return cb(new Error('Invalid package.json'))
 
       var p = d.name
       nv = npa(p)
-      if (pkg && ~pkg.indexOf("@")) {
-        nv.rawSpec = pkg.split("@")[pkg.indexOf("@")]
+      if (pkg && ~pkg.indexOf('@')) {
+        nv.rawSpec = pkg.split('@')[pkg.indexOf('@')]
       }
 
       fetchAndRead(nv, args, silent, cb)
@@ -92,53 +96,54 @@ function view (args, silent, cb) {
 function fetchAndRead (nv, args, silent, cb) {
   // get the data about this package
   var name = nv.name
-    , version = nv.rawSpec || npm.config.get("tag")
+  var version = nv.rawSpec || npm.config.get('tag')
 
   mapToRegistry(name, npm.config, function (er, uri, auth) {
     if (er) return cb(er)
 
-    npm.registry.get(uri, { auth : auth }, function (er, data) {
+    npm.registry.get(uri, { auth: auth }, function (er, data) {
       if (er) return cb(er)
-      if (data["dist-tags"] && data["dist-tags"].hasOwnProperty(version)) {
-        version = data["dist-tags"][version]
+      if (data['dist-tags'] && data['dist-tags'].hasOwnProperty(version)) {
+        version = data['dist-tags'][version]
       }
 
       if (data.time && data.time.unpublished) {
         var u = data.time.unpublished
-        er = new Error("Unpublished by " + u.name + " on " + u.time)
+        er = new Error('Unpublished by ' + u.name + ' on ' + u.time)
         er.statusCode = 404
-        er.code = "E404"
+        er.code = 'E404'
         er.pkgid = data._id
         return cb(er, data)
       }
 
-
       var results = []
-        , error = null
-        , versions = data.versions || {}
+      var error = null
+      var versions = data.versions || {}
       data.versions = Object.keys(versions).sort(semver.compareLoose)
-      if (!args.length) args = [""]
+      if (!args.length) args = ['']
 
       // remove readme unless we asked for it
-      if (-1 === args.indexOf("readme")) {
+      if (args.indexOf('readme') === -1) {
         delete data.readme
       }
 
       Object.keys(versions).forEach(function (v) {
-        if (semver.satisfies(v, version, true)) args.forEach(function (args) {
-          // remove readme unless we asked for it
-          if (-1 === args.indexOf("readme")) {
-            delete versions[v].readme
-          }
-          results.push(showFields(data, versions[v], args))
-        })
+        if (semver.satisfies(v, version, true)) {
+          args.forEach(function (args) {
+            // remove readme unless we asked for it
+            if (args.indexOf('readme') !== -1) {
+              delete versions[v].readme
+            }
+            results.push(showFields(data, versions[v], args))
+          })
+        }
       })
       results = results.reduce(reducer, {})
       var retval = results
 
-      if (args.length === 1 && args[0] === "") {
+      if (args.length === 1 && args[0] === '') {
         retval = cleanBlanks(retval)
-        log.silly("cleanup", retval)
+        log.silly('cleanup', retval)
       }
 
       if (error || silent) cb(error, retval)
@@ -150,18 +155,21 @@ function fetchAndRead (nv, args, silent, cb) {
 function cleanBlanks (obj) {
   var clean = {}
   Object.keys(obj).forEach(function (version) {
-    clean[version] = obj[version][""]
+    clean[version] = obj[version]['']
   })
   return clean
 }
 
 function reducer (l, r) {
-  if (r) Object.keys(r).forEach(function (v) {
-    l[v] = l[v] || {}
-    Object.keys(r[v]).forEach(function (t) {
-      l[v][t] = r[v][t]
+  if (r) {
+    Object.keys(r).forEach(function (v) {
+      l[v] = l[v] || {}
+      Object.keys(r[v]).forEach(function (t) {
+        l[v][t] = r[v][t]
+      })
     })
-  })
+  }
+
   return l
 }
 
@@ -173,12 +181,12 @@ function showFields (data, version, fields) {
       o[k] = s[k]
     })
   })
-  return search(o, fields.split("."), version.version, fields)
+  return search(o, fields.split('.'), version.version, fields)
 }
 
 function search (data, fields, version, title) {
   var field
-    , tail = fields
+  var tail = fields
   while (!field && fields.length) field = tail.shift()
   fields = [field].concat(tail)
   var o
@@ -195,7 +203,7 @@ function search (data, fields, version, title) {
     if (data.field && data.field.hasOwnProperty(index)) {
       return search(data[field][index], tail, version, title)
     } else {
-      field = field + "[" + index + "]"
+      field = field + '[' + index + ']'
     }
   }
   if (Array.isArray(data)) {
@@ -205,8 +213,8 @@ function search (data, fields, version, title) {
     var results = []
     data.forEach(function (data, i) {
       var tl = title.length
-        , newt = title.substr(0, tl-(fields.join(".").length) - 1)
-               + "["+i+"]" + [""].concat(fields).join(".")
+      var newt = title.substr(0, tl - fields.join('.').length - 1) +
+                 '[' + i + ']' + [''].concat(fields).join('.')
       results.push(search(data, fields.slice(), version, newt))
     })
     results = results.reduce(reducer, {})
@@ -215,11 +223,11 @@ function search (data, fields, version, title) {
   if (!data.hasOwnProperty(field)) return undefined
   data = data[field]
   if (tail.length) {
-    if (typeof data === "object") {
+    if (typeof data === 'object') {
       // there are more fields to deal with.
       return search(data, tail, version, title)
     } else {
-      return new Error("Not an object: "+data)
+      return new Error('Not an object: ' + data)
     }
   }
   o = {}
@@ -230,33 +238,33 @@ function search (data, fields, version, title) {
 
 function printData (data, name, cb) {
   var versions = Object.keys(data)
-    , msg = ""
-    , includeVersions = versions.length > 1
-    , includeFields
+  var msg = ''
+  var includeVersions = versions.length > 1
+  var includeFields
 
   versions.forEach(function (v) {
     var fields = Object.keys(data[v])
     includeFields = includeFields || (fields.length > 1)
     fields.forEach(function (f) {
       var d = cleanup(data[v][f])
-      if (includeVersions || includeFields || typeof d !== "string") {
+      if (includeVersions || includeFields || typeof d !== 'string') {
         d = cleanup(data[v][f])
-        d = npm.config.get("json")
+        d = npm.config.get('json')
           ? JSON.stringify(d, null, 2)
           : util.inspect(d, false, 5, npm.color)
-      } else if (typeof d === "string" && npm.config.get("json")) {
+      } else if (typeof d === 'string' && npm.config.get('json')) {
         d = JSON.stringify(d)
       }
-      if (f && includeFields) f += " = "
-      if (d.indexOf("\n") !== -1) d = " \n" + d
-      msg += (includeVersions ? name + "@" + v + " " : "")
-           + (includeFields ? f : "") + d + "\n"
+      if (f && includeFields) f += ' = '
+      if (d.indexOf('\n') !== -1) d = ' \n' + d
+      msg += (includeVersions ? name + '@' + v + ' ' : '') +
+             (includeFields ? f : '') + d + '\n'
     })
   })
 
   // preserve output symmetry by adding a whitespace-only line at the end if
   // there's one at the beginning
-  if (/^\s*\n/.test(msg)) msg += "\n"
+  if (/^\s*\n/.test(msg)) msg += '\n'
 
   // print directly to stdout to not unnecessarily add blank lines
   process.stdout.write(msg)
@@ -265,38 +273,34 @@ function printData (data, name, cb) {
 }
 function cleanup (data) {
   if (Array.isArray(data)) {
-    if (data.length === 1) {
-      data = data[0]
-    } else {
-      return data.map(cleanup)
-    }
+    return data.map(cleanup)
   }
-  if (!data || typeof data !== "object") return data
+  if (!data || typeof data !== 'object') return data
 
-  if (typeof data.versions === "object"
-      && data.versions
-      && !Array.isArray(data.versions)) {
+  if (typeof data.versions === 'object' &&
+      data.versions &&
+      !Array.isArray(data.versions)) {
     data.versions = Object.keys(data.versions || {})
   }
 
   var keys = Object.keys(data)
   keys.forEach(function (d) {
-    if (d.charAt(0) === "_") delete data[d]
-    else if (typeof data[d] === "object") data[d] = cleanup(data[d])
+    if (d.charAt(0) === '_') delete data[d]
+    else if (typeof data[d] === 'object') data[d] = cleanup(data[d])
   })
   keys = Object.keys(data)
-  if (keys.length <= 3
-      && data.name
-      && (keys.length === 1
-          || keys.length === 3 && data.email && data.url
-          || keys.length === 2 && (data.email || data.url))) {
+  if (keys.length <= 3 &&
+      data.name &&
+      (keys.length === 1 ||
+       keys.length === 3 && data.email && data.url ||
+       keys.length === 2 && (data.email || data.url))) {
     data = unparsePerson(data)
   }
   return data
 }
 function unparsePerson (d) {
-  if (typeof d === "string") return d
-  return d.name
-       + (d.email ? " <"+d.email+">" : "")
-       + (d.url ? " ("+d.url+")" : "")
+  if (typeof d === 'string') return d
+  return d.name +
+    (d.email ? ' <' + d.email + '>' : '') +
+    (d.url ? ' (' + d.url + ')' : '')
 }
diff --git a/deps/npm/lib/visnup.js b/deps/npm/lib/visnup.js
index 8d710c20b0dcc8..b0352fd6d049f2 100644
--- a/deps/npm/lib/visnup.js
+++ b/deps/npm/lib/visnup.js
@@ -1,38 +1,38 @@
 module.exports = visnup
-var npm = require("./npm.js")
+var npm = require('./npm.js')
 
 var handsomeFace = [
-  [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 232, 237, 236, 236, 232, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
- ,[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 235, 236, 235, 233, 237, 235, 233, 232, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
- ,[0, 0, 0, 0, 0, 0, 0, 0, 0, 232, 235, 233, 232, 235, 235, 234, 233, 236, 232, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
- ,[0, 0, 0, 0, 0, 0, 0, 0, 237, 235, 232, 232, 234, 233, 233, 232, 232, 233, 232, 232, 235, 232, 233, 234, 234, 0, 0, 0, 0, 0, 0, 0, 0, 0]
- ,[0, 0, 0, 0, 0, 0, 0, 232, 232, 232, 239, 238, 235, 233, 232, 232, 232, 232, 232, 232, 232, 233, 235, 232, 233, 233, 232, 0, 0, 0, 0, 0, 0, 0]
- ,[0, 0, 0, 0, 234, 234, 232, 233, 234, 233, 234, 235, 233, 235, 60, 238, 238, 234, 234, 233, 234, 233, 238, 251, 246, 233, 233, 232, 0, 0, 0, 0, 0, 0]
- ,[0, 0, 233, 233, 233, 232, 232, 239, 249, 251, 252, 231, 231, 188, 250, 254, 59, 60, 255, 231, 231, 231, 252, 235, 239, 235, 232, 233, 0, 0, 0, 0, 0, 0]
- ,[0, 0, 232, 233, 232, 232, 232, 248, 231, 231, 231, 231, 231, 231, 231, 254, 238, 254, 231, 231, 231, 231, 231, 252, 233, 235, 237, 233, 234, 0, 0, 0, 0, 0]
- ,[0, 0, 233, 232, 232, 232, 248, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 251, 233, 233, 233, 236, 233, 0, 0, 0, 0]
- ,[232, 233, 233, 232, 232, 246, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 249, 233, 234, 234, 0, 0, 0, 0]
- ,[232, 232, 232, 232, 233, 249, 231, 255, 255, 255, 255, 254, 109, 60, 239, 237, 238, 237, 235, 235, 235, 235, 236, 235, 235, 235, 234, 232, 232, 232, 232, 232, 233, 0]
- ,[0, 232, 232, 233, 233, 233, 233, 233, 233, 233, 233, 233, 235, 236, 238, 238, 235, 188, 254, 254, 145, 236, 252, 254, 254, 254, 254, 249, 236, 235, 232, 232, 233, 0]
- ,[0, 0, 233, 237, 249, 239, 233, 252, 231, 231, 231, 231, 231, 231, 254, 235, 235, 254, 231, 231, 251, 235, 237, 231, 231, 231, 231, 7, 237, 235, 232, 233, 233, 0]
- ,[0, 0, 0, 0, 233, 248, 239, 233, 231, 231, 231, 231, 254, 233, 233, 235, 254, 255, 231, 254, 237, 236, 254, 239, 235, 235, 233, 233, 232, 232, 233, 232, 0, 0]
- ,[0, 0, 0, 232, 233, 246, 255, 255, 236, 236, 236, 236, 236, 255, 231, 231, 231, 231, 231, 231, 252, 234, 248, 231, 231, 231, 231, 248, 232, 232, 232, 0, 0, 0]
- ,[0, 0, 0, 0, 235, 237, 7, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 255, 238, 235, 7, 231, 231, 231, 246, 232, 0, 0, 0, 0, 0]
- ,[0, 0, 0, 0, 0, 235, 103, 188, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 252, 232, 238, 231, 231, 255, 244, 232, 0, 0, 0, 0, 0]
- ,[0, 0, 0, 0, 0, 235, 236, 103, 146, 253, 255, 231, 231, 231, 231, 231, 253, 251, 250, 250, 250, 246, 232, 235, 152, 255, 146, 66, 233, 0, 0, 0, 0, 0]
- ,[0, 0, 0, 0, 0, 0, 233, 103, 146, 146, 146, 146, 254, 231, 231, 231, 109, 103, 146, 255, 188, 239, 240, 103, 255, 253, 103, 238, 234, 0, 0, 0, 0, 0]
- ,[0, 0, 0, 0, 0, 0, 232, 235, 109, 146, 146, 146, 146, 146, 252, 152, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 103, 235, 233, 0, 0, 0, 0, 0]
- ,[0, 0, 0, 0, 0, 0, 0, 235, 235, 103, 146, 146, 146, 146, 146, 146, 188, 188, 188, 188, 188, 188, 152, 146, 146, 146, 66, 235, 0, 0, 0, 0, 0, 0]
- ,[0, 0, 0, 0, 0, 0, 0, 0, 233, 235, 66, 146, 146, 146, 146, 152, 255, 146, 240, 239, 241, 109, 146, 146, 146, 103, 233, 0, 0, 0, 0, 0, 0, 0]
- ,[0, 0, 0, 0, 0, 0, 0, 0, 0, 234, 237, 109, 146, 146, 146, 146, 146, 254, 231, 231, 188, 146, 146, 146, 103, 233, 0, 0, 0, 0, 0, 0, 0, 0]
- ,[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 233, 237, 60, 103, 146, 146, 146, 146, 146, 103, 66, 60, 235, 232, 0, 0, 0, 0, 0, 0, 0, 0, 0]
- ,[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 232, 233, 233, 236, 235, 237, 235, 237, 237, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]
-
+  [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 232, 237, 236, 236, 232, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+  [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 235, 236, 235, 233, 237, 235, 233, 232, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+  [0, 0, 0, 0, 0, 0, 0, 0, 0, 232, 235, 233, 232, 235, 235, 234, 233, 236, 232, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+  [0, 0, 0, 0, 0, 0, 0, 0, 237, 235, 232, 232, 234, 233, 233, 232, 232, 233, 232, 232, 235, 232, 233, 234, 234, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+  [0, 0, 0, 0, 0, 0, 0, 232, 232, 232, 239, 238, 235, 233, 232, 232, 232, 232, 232, 232, 232, 233, 235, 232, 233, 233, 232, 0, 0, 0, 0, 0, 0, 0],
+  [0, 0, 0, 0, 234, 234, 232, 233, 234, 233, 234, 235, 233, 235, 60, 238, 238, 234, 234, 233, 234, 233, 238, 251, 246, 233, 233, 232, 0, 0, 0, 0, 0, 0],
+  [0, 0, 233, 233, 233, 232, 232, 239, 249, 251, 252, 231, 231, 188, 250, 254, 59, 60, 255, 231, 231, 231, 252, 235, 239, 235, 232, 233, 0, 0, 0, 0, 0, 0],
+  [0, 0, 232, 233, 232, 232, 232, 248, 231, 231, 231, 231, 231, 231, 231, 254, 238, 254, 231, 231, 231, 231, 231, 252, 233, 235, 237, 233, 234, 0, 0, 0, 0, 0],
+  [0, 0, 233, 232, 232, 232, 248, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 251, 233, 233, 233, 236, 233, 0, 0, 0, 0],
+  [232, 233, 233, 232, 232, 246, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 249, 233, 234, 234, 0, 0, 0, 0],
+  [232, 232, 232, 232, 233, 249, 231, 255, 255, 255, 255, 254, 109, 60, 239, 237, 238, 237, 235, 235, 235, 235, 236, 235, 235, 235, 234, 232, 232, 232, 232, 232, 233, 0],
+  [0, 232, 232, 233, 233, 233, 233, 233, 233, 233, 233, 233, 235, 236, 238, 238, 235, 188, 254, 254, 145, 236, 252, 254, 254, 254, 254, 249, 236, 235, 232, 232, 233, 0],
+  [0, 0, 233, 237, 249, 239, 233, 252, 231, 231, 231, 231, 231, 231, 254, 235, 235, 254, 231, 231, 251, 235, 237, 231, 231, 231, 231, 7, 237, 235, 232, 233, 233, 0],
+  [0, 0, 0, 0, 233, 248, 239, 233, 231, 231, 231, 231, 254, 233, 233, 235, 254, 255, 231, 254, 237, 236, 254, 239, 235, 235, 233, 233, 232, 232, 233, 232, 0, 0],
+  [0, 0, 0, 232, 233, 246, 255, 255, 236, 236, 236, 236, 236, 255, 231, 231, 231, 231, 231, 231, 252, 234, 248, 231, 231, 231, 231, 248, 232, 232, 232, 0, 0, 0],
+  [0, 0, 0, 0, 235, 237, 7, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 255, 238, 235, 7, 231, 231, 231, 246, 232, 0, 0, 0, 0, 0],
+  [0, 0, 0, 0, 0, 235, 103, 188, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 252, 232, 238, 231, 231, 255, 244, 232, 0, 0, 0, 0, 0],
+  [0, 0, 0, 0, 0, 235, 236, 103, 146, 253, 255, 231, 231, 231, 231, 231, 253, 251, 250, 250, 250, 246, 232, 235, 152, 255, 146, 66, 233, 0, 0, 0, 0, 0],
+  [0, 0, 0, 0, 0, 0, 233, 103, 146, 146, 146, 146, 254, 231, 231, 231, 109, 103, 146, 255, 188, 239, 240, 103, 255, 253, 103, 238, 234, 0, 0, 0, 0, 0],
+  [0, 0, 0, 0, 0, 0, 232, 235, 109, 146, 146, 146, 146, 146, 252, 152, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 103, 235, 233, 0, 0, 0, 0, 0],
+  [0, 0, 0, 0, 0, 0, 0, 235, 235, 103, 146, 146, 146, 146, 146, 146, 188, 188, 188, 188, 188, 188, 152, 146, 146, 146, 66, 235, 0, 0, 0, 0, 0, 0],
+  [0, 0, 0, 0, 0, 0, 0, 0, 233, 235, 66, 146, 146, 146, 146, 152, 255, 146, 240, 239, 241, 109, 146, 146, 146, 103, 233, 0, 0, 0, 0, 0, 0, 0],
+  [0, 0, 0, 0, 0, 0, 0, 0, 0, 234, 237, 109, 146, 146, 146, 146, 146, 254, 231, 231, 188, 146, 146, 146, 103, 233, 0, 0, 0, 0, 0, 0, 0, 0],
+  [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 233, 237, 60, 103, 146, 146, 146, 146, 146, 103, 66, 60, 235, 232, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+  [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 232, 233, 233, 236, 235, 237, 235, 237, 237, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+]
 
 function visnup (args, cb) {
   handsomeFace.forEach(function (line) {
     console.log(line.map(function (ch) {
-      return "\033[" + (ch ? "48;5;" + ch : ch) + "m"
+      return '\u001b[' + (ch ? '48;5;' + ch : ch) + 'm'
     }).join(' '))
   })
 
diff --git a/deps/npm/lib/whoami.js b/deps/npm/lib/whoami.js
index bef0184a0065bd..feb6fab95ae89c 100644
--- a/deps/npm/lib/whoami.js
+++ b/deps/npm/lib/whoami.js
@@ -1,31 +1,30 @@
-var npm = require("./npm.js")
+var npm = require('./npm.js')
 
 module.exports = whoami
 
-whoami.usage = "npm whoami\n(just prints username according to given registry)"
+whoami.usage = 'npm whoami [--registry <registry>]\n(just prints username according to given registry)'
 
 function whoami (args, silent, cb) {
   // FIXME: need tighter checking on this, but is a breaking change
-  if (typeof cb !== "function") {
+  if (typeof cb !== 'function') {
     cb = silent
     silent = false
   }
 
-  var registry = npm.config.get("registry")
-  if (!registry) return cb(new Error("no default registry set"))
+  var registry = npm.config.get('registry')
+  if (!registry) return cb(new Error('no default registry set'))
 
   var auth = npm.config.getCredentialsByURI(registry)
   if (auth) {
     if (auth.username) {
       if (!silent) console.log(auth.username)
       return process.nextTick(cb.bind(this, null, auth.username))
-    }
-    else if (auth.token) {
-      return npm.registry.whoami(registry, { auth : auth }, function (er, username) {
+    } else if (auth.token) {
+      return npm.registry.whoami(registry, { auth: auth }, function (er, username) {
         if (er) return cb(er)
         if (!username) {
           var needNewSession = new Error(
-            "Your auth token is no longer valid. Please log in again."
+            'Your auth token is no longer valid. Please log in again.'
           )
           needNewSession.code = 'ENEEDAUTH'
           return cb(needNewSession)
@@ -40,7 +39,7 @@ function whoami (args, silent, cb) {
   // At this point, if they have a credentials object, it doesn't have a token
   // or auth in it.  Probably just the default registry.
   var needAuth = new Error(
-    "this command requires you to be logged in."
+    'this command requires you to be logged in.'
   )
   needAuth.code = 'ENEEDAUTH'
   process.nextTick(cb.bind(this, needAuth))
diff --git a/deps/npm/lib/xmas.js b/deps/npm/lib/xmas.js
index fa8d1db556d9a5..25535533e10fbd 100644
--- a/deps/npm/lib/xmas.js
+++ b/deps/npm/lib/xmas.js
@@ -1,55 +1,59 @@
 // happy xmas
-var log = require("npmlog")
+var log = require('npmlog')
 
 module.exports = function (args, cb) {
-var s = process.platform === "win32" ? " *" : " \u2605"
-  , f = "\uFF0F"
-  , b = "\uFF3C"
-  , x = process.platform === "win32" ? " " : ""
-  , o = [ "\u0069" , "\u0020", "\u0020", "\u0020", "\u0020", "\u0020"
-        , "\u0020", "\u0020", "\u0020", "\u0020", "\u0020", "\u0020"
-        , "\u0020", "\u2E1B","\u2042","\u2E2E","&","@","\uFF61" ]
-  , oc = [21,33,34,35,36,37]
-  , l = "\u005e"
+  var s = process.platform === 'win32' ? ' *' : ' \u2605'
+  var f = '\uFF0F'
+  var b = '\uFF3C'
+  var x = process.platform === 'win32' ? ' ' : ''
+  var o = [
+    '\u0069', '\u0020', '\u0020', '\u0020', '\u0020', '\u0020',
+    '\u0020', '\u0020', '\u0020', '\u0020', '\u0020', '\u0020',
+    '\u0020', '\u2E1B', '\u2042', '\u2E2E', '&', '@', '\uFF61'
+  ]
+  var oc = [21, 33, 34, 35, 36, 37]
+  var l = '\u005e'
 
-function w (s) { process.stderr.write(s) }
+  function w (s) { process.stderr.write(s) }
 
-w("\n")
-;(function T (H) {
-  for (var i = 0; i < H; i ++) w(" ")
-  w(x+"\033[33m"+s+"\n")
-  var M = H * 2 - 1
-  for (var L = 1; L <= H; L ++) {
-    var O = L * 2 - 2
-    var S = (M - O) / 2
-    for (i = 0; i < S; i ++) w(" ")
-    w(x+"\033[32m"+f)
-    for (i = 0; i < O; i ++) w(
-      "\033["+oc[Math.floor(Math.random()*oc.length)]+"m"+
-      o[Math.floor(Math.random() * o.length)]
-    )
-    w(x+"\033[32m"+b+"\n")
-  }
-  w(" ")
-  for (i = 1; i < H; i ++) w("\033[32m"+l)
-  w("| "+x+" |")
-  for (i = 1; i < H; i ++) w("\033[32m"+l)
-  if (H > 10) {
-    w("\n ")
-    for (i = 1; i < H; i ++) w(" ")
-    w("| "+x+" |")
-    for (i = 1; i < H; i ++) w(" ")
-  }
-})(20)
-w("\n\n")
-log.heading = ''
-log.addLevel('npm', 100000, log.headingStyle)
-log.npm("loves you", "Happy Xmas, Noders!")
-cb()
+  w('\n')
+  ;(function T (H) {
+    for (var i = 0; i < H; i++) w(' ')
+    w(x + '\u001b[33m' + s + '\n')
+    var M = H * 2 - 1
+    for (var L = 1; L <= H; L++) {
+      var O = L * 2 - 2
+      var S = (M - O) / 2
+      for (i = 0; i < S; i++) w(' ')
+      w(x + '\u001b[32m' + f)
+      for (i = 0; i < O; i++) {
+        w(
+          '\u001b[' + oc[Math.floor(Math.random() * oc.length)] + 'm' +
+          o[Math.floor(Math.random() * o.length)]
+        )
+      }
+      w(x + '\u001b[32m' + b + '\n')
+    }
+    w(' ')
+    for (i = 1; i < H; i++) w('\u001b[32m' + l)
+    w('| ' + x + ' |')
+    for (i = 1; i < H; i++) w('\u001b[32m' + l)
+    if (H > 10) {
+      w('\n ')
+      for (i = 1; i < H; i++) w(' ')
+      w('| ' + x + ' |')
+      for (i = 1; i < H; i++) w(' ')
+    }
+  })(20)
+  w('\n\n')
+  log.heading = ''
+  log.addLevel('npm', 100000, log.headingStyle)
+  log.npm('loves you', 'Happy Xmas, Noders!')
+  cb()
 }
-var dg=false
-Object.defineProperty(module.exports, "usage", {get:function () {
+var dg = false
+Object.defineProperty(module.exports, 'usage', {get: function () {
   if (dg) module.exports([], function () {})
   dg = true
-  return " "
+  return ' '
 }})
diff --git a/deps/npm/man/man1/npm-bin.1 b/deps/npm/man/man1/npm-bin.1
index 4f28530086d1c9..12e182d9a17ad4 100644
--- a/deps/npm/man/man1/npm-bin.1
+++ b/deps/npm/man/man1/npm-bin.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm bin
+npm bin [\-\-global]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-bugs.1 b/deps/npm/man/man1/npm-bugs.1
index 513355ae976c8d..9f4626a411cf6d 100644
--- a/deps/npm/man/man1/npm-bugs.1
+++ b/deps/npm/man/man1/npm-bugs.1
@@ -5,8 +5,7 @@
 .P
 .RS 2
 .nf
-npm bugs <pkgname>
-npm bugs (with no args in a package dir)
+npm bugs [<pkgname>]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-build.1 b/deps/npm/man/man1/npm-build.1
index 8e20ab1770b086..7528f1a21cfe58 100644
--- a/deps/npm/man/man1/npm-build.1
+++ b/deps/npm/man/man1/npm-build.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm build <package\-folder>
+npm build [<package\-folder>]
 .fi
 .RE
 .RS 0
diff --git a/deps/npm/man/man1/npm-completion.1 b/deps/npm/man/man1/npm-completion.1
index ce7235fbd71c65..0f3b1abf2e7638 100644
--- a/deps/npm/man/man1/npm-completion.1
+++ b/deps/npm/man/man1/npm-completion.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-\|\. <(npm completion)
+source <(npm completion)
 .fi
 .RE
 .SH DESCRIPTION
@@ -15,7 +15,14 @@ Enables tab\-completion in all npm commands\.
 The synopsis above
 loads the completions into your current shell\.  Adding it to
 your ~/\.bashrc or ~/\.zshrc will make the completions available
-everywhere\.
+everywhere:
+.P
+.RS 2
+.nf
+npm completion >> ~/\.bashrc
+npm completion >> ~/\.zshrc
+.fi
+.RE
 .P
 You may of course also pipe the output of npm completion to a file
 such as \fB/usr/local/etc/bash_completion\.d/npm\fP if you have a system
diff --git a/deps/npm/man/man1/npm-config.1 b/deps/npm/man/man1/npm-config.1
index 47a5bd197ebad3..4ff3ac37ea1550 100644
--- a/deps/npm/man/man1/npm-config.1
+++ b/deps/npm/man/man1/npm-config.1
@@ -10,7 +10,6 @@ npm config get <key>
 npm config delete <key>
 npm config list
 npm config edit
-npm c [set|get|delete|list]
 npm get <key>
 npm set <key> <value> [\-\-global]
 .fi
diff --git a/deps/npm/man/man1/npm-dedupe.1 b/deps/npm/man/man1/npm-dedupe.1
index 9d73fcb177e764..0c965e957a9b10 100644
--- a/deps/npm/man/man1/npm-dedupe.1
+++ b/deps/npm/man/man1/npm-dedupe.1
@@ -42,25 +42,20 @@ Because of the hierarchical nature of node's module lookup, b and d
 will both get their dependency met by the single c package at the root
 level of the tree\.
 .P
+The deduplication algorithm walks the tree, moving each dependency as far
+up in the tree as possible, even if duplicates are not found\. This will
+result in both a flat and deduplicated tree\.
+.P
 If a suitable version exists at the target location in the tree
 already, then it will be left untouched, but the other duplicates will
 be deleted\.
 .P
-If no suitable version can be found, then a warning is printed, and
-nothing is done\.
-.P
-If any arguments are supplied, then they are filters, and only the
-named packages will be touched\.
-.P
-Note that this operation transforms the dependency tree, and may
-result in packages getting updated versions, perhaps from the npm
-registry\.
+Arguments are ignored\. Dedupe always acts on the entire tree\.
 .P
-This feature is experimental, and may change in future versions\.
+Modules
 .P
-The \fB\-\-tag\fP argument will apply to all of the affected dependencies\. If a
-tag with the given name exists, the tagged version is preferred over newer
-versions\.
+Note that this operation transforms the dependency tree, but will never
+result in new modules being installed\.
 .SH SEE ALSO
 .RS 0
 .IP \(bu 2
diff --git a/deps/npm/man/man1/npm-deprecate.1 b/deps/npm/man/man1/npm-deprecate.1
index 1c41959dacdb9b..df8c342953c80b 100644
--- a/deps/npm/man/man1/npm-deprecate.1
+++ b/deps/npm/man/man1/npm-deprecate.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm deprecate <name>[@<version>] <message>
+npm deprecate <pkg>[@<version>] <message>
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-docs.1 b/deps/npm/man/man1/npm-docs.1
index 328ad817fdf33e..74b258d7373b29 100644
--- a/deps/npm/man/man1/npm-docs.1
+++ b/deps/npm/man/man1/npm-docs.1
@@ -6,9 +6,9 @@
 .RS 2
 .nf
 npm docs [<pkgname> [<pkgname> \.\.\.]]
-npm docs (with no args in a package dir)
+npm docs \.
 npm home [<pkgname> [<pkgname> \.\.\.]]
-npm home (with no args in a package dir)
+npm home \.
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-edit.1 b/deps/npm/man/man1/npm-edit.1
index c3cba10dcc9943..8cb4ea635e8091 100644
--- a/deps/npm/man/man1/npm-edit.1
+++ b/deps/npm/man/man1/npm-edit.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm edit <name>[@<version>]
+npm edit <pkg>[@<version>]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-explore.1 b/deps/npm/man/man1/npm-explore.1
index b588f8d2f2726b..4b1471748110ac 100644
--- a/deps/npm/man/man1/npm-explore.1
+++ b/deps/npm/man/man1/npm-explore.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm explore <name> [ \-\- <cmd>]
+npm explore <pkg> [ \-\- <cmd>]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-help-search.1 b/deps/npm/man/man1/npm-help-search.1
index 1fa13cc301775f..8d6f8e42e66b19 100644
--- a/deps/npm/man/man1/npm-help-search.1
+++ b/deps/npm/man/man1/npm-help-search.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm help\-search some search terms
+npm help\-search <text>
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-help.1 b/deps/npm/man/man1/npm-help.1
index 5083a5866f9f9a..2f6d09c665531c 100644
--- a/deps/npm/man/man1/npm-help.1
+++ b/deps/npm/man/man1/npm-help.1
@@ -5,8 +5,7 @@
 .P
 .RS 2
 .nf
-npm help <topic>
-npm help some search terms
+npm help <term> [<terms\.\.>]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-init.1 b/deps/npm/man/man1/npm-init.1
index 56da738cb8d521..5fabda5543f809 100644
--- a/deps/npm/man/man1/npm-init.1
+++ b/deps/npm/man/man1/npm-init.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm init [\-f|\-\-force|\-y|\-\-yes]
+npm init [\-\-force|\-f|\-\-yes|\-y]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-install.1 b/deps/npm/man/man1/npm-install.1
index c135dfb4a392f1..8e78558ba4a2fc 100644
--- a/deps/npm/man/man1/npm-install.1
+++ b/deps/npm/man/man1/npm-install.1
@@ -5,15 +5,17 @@
 .P
 .RS 2
 .nf
-npm install (with no args in a package dir)
+npm install (with no args, in package dir)
+npm install [<@scope>/]<name>
+npm install [<@scope>/]<name>@<tag>
+npm install [<@scope>/]<name>@<version>
+npm install [<@scope>/]<name>@<version range>
 npm install <tarball file>
 npm install <tarball url>
 npm install <folder>
-npm install [@<scope>/]<name> [\-\-save|\-\-save\-dev|\-\-save\-optional] [\-\-save\-exact]
-npm install [@<scope>/]<name>@<tag>
-npm install [@<scope>/]<name>@<version>
-npm install [@<scope>/]<name>@<version range>
-npm i (with any of the previous argument usage)
+
+alias: npm i
+common options: [\-\-save|\-\-save\-dev|\-\-save\-optional] [\-\-save\-exact] [\-\-dry\-run]
 .fi
 .RE
 .SH DESCRIPTION
@@ -37,7 +39,7 @@ e) a \fB<name>@<tag>\fP that points to (d)
 .IP \(bu 2
 f) a \fB<name>\fP that has a "latest" tag satisfying (e)
 .IP \(bu 2
-g) a \fB<git remote url>\fP that resolves to (b)
+g) a \fB<git remote url>\fP that resolves to (a)
 
 .RE
 .P
@@ -83,7 +85,7 @@ after packing it up into a tarball (b)\.
 .fi
 .RE
 .IP \(bu 2
-\fBnpm install [@<scope>/]<name> [\-\-save|\-\-save\-dev|\-\-save\-optional]\fP:
+\fBnpm install [<@scope>/]<name> [\-\-save|\-\-save\-dev|\-\-save\-optional]\fP:
   Do a \fB<name>@<tag>\fP install, where \fB<tag>\fP is the "tag" config\. (See
   npm help 7 \fBnpm\-config\fP\|\.)
   In most cases, this will install the latest version
@@ -110,6 +112,8 @@ package\.json, there is an additional, optional flag:
 \fB\-\-save\-exact\fP: Saved dependencies will be configured with an
 exact version rather than using npm's default semver range
 operator\.
+Further, if you have an \fBnpm\-shrinkwrap\.json\fP then it will be updated as
+well\.
 \fB<scope>\fP is optional\. The package will be downloaded from the registry
 associated with the specified scope\. If no registry is associated with
 the given scope the default registry is assumed\. See npm help 7 \fBnpm\-scope\fP\|\.
@@ -142,7 +146,7 @@ fetch the package by name if it is not valid\.
 .RE
 .RS 0
 .IP \(bu 2
-\fBnpm install [@<scope>/]<name>@<tag>\fP:
+\fBnpm install [<@scope>/]<name>@<tag>\fP:
   Install the version of the package that is referenced by the specified tag\.
   If the tag does not exist in the registry data for that package, then this
   will fail\.
@@ -155,7 +159,7 @@ fetch the package by name if it is not valid\.
 .fi
 .RE
 .IP \(bu 2
-\fBnpm install [@<scope>/]<name>@<version>\fP:
+\fBnpm install [<@scope>/]<name>@<version>\fP:
   Install the specified version of the package\.  This will fail if the
   version has not been published to the registry\.
   Example:
@@ -167,7 +171,7 @@ fetch the package by name if it is not valid\.
 .fi
 .RE
 .IP \(bu 2
-\fBnpm install [@<scope>/]<name>@<version range>\fP:
+\fBnpm install [<@scope>/]<name>@<version range>\fP:
   Install a version of the package matching the specified version range\.  This
   will follow the same rules for resolving dependencies described in npm help 5 \fBpackage\.json\fP\|\.
   Note that most version ranges must be put in quotes so that your shell will
@@ -182,12 +186,12 @@ fetch the package by name if it is not valid\.
 .RE
 .IP \(bu 2
 \fBnpm install <git remote url>\fP:
-  Install a package by cloning a git remote url\.  The format of the git
-  url is:
+  Installs the package from the hosted git provider, cloning it with
+  \fBgit\fP\|\. First it tries via the https (git with github) and if that fails, via ssh\.
 .P
 .RS 2
 .nf
-    <protocol>://[<user>[:<password>]@]<hostname>[:<port>][:/]<path>[#<commit\-ish>]
+    <protocol>://[<user>[:<password>]@]<hostname>[:<port>][:][/]<path>[#<commit\-ish>]
 .fi
 .RE
   \fB<protocol>\fP is one of \fBgit\fP, \fBgit+ssh\fP, \fBgit+http\fP, or
@@ -289,6 +293,9 @@ The \fB\-\-tag\fP argument will apply to all of the specified install targets\.
 tag with the given name exists, the tagged version is preferred over newer
 versions\.
 .P
+The \fB\-\-dry\-run\fP argument will report in the usual way what the install would
+have done without actually installing anything\.
+.P
 The \fB\-\-force\fP argument will force npm to fetch remote resources even if a
 local copy exists on disk\.
 .P
@@ -316,6 +323,9 @@ shrinkwrap file and use the package\.json instead\.
 The \fB\-\-nodedir=/path/to/node/source\fP argument will allow npm to find the
 node source code so that npm can compile native modules\.
 .P
+The \fB\-\-only={prod[uction]|dev[elopment]}\fP argument will cause either only
+\fBdevDependencies\fP or only non\-\fBdevDependencies\fP to be installed\.
+.P
 See npm help 7 \fBnpm\-config\fP\|\.  Many of the configuration params have some
 effect on installation, since that's most of what npm does\.
 .SH ALGORITHM
@@ -324,15 +334,16 @@ To install a package, npm uses the following algorithm:
 .P
 .RS 2
 .nf
-install(where, what, family, ancestors)
-fetch what, unpack to <where>/node_modules/<what>
-for each dep in what\.dependencies
-  resolve dep to precise version
-for each dep@version in what\.dependencies
-    not in <where>/node_modules/<what>/node_modules/*
-    and not in <family>
-  add precise version deps to <family>
-  install(<where>/node_modules/<what>, dep, family)
+load the existing node_modules tree from disk
+clone the tree
+fetch the package\.json and assorted metadata and add it to the clone
+walk the clone and add any missing dependencies
+  dependencies will be added as close to the top as is possible
+  without breaking any other modules
+compare the original tree with the cloned tree and make a list of
+actions to take to convert one to the other
+execute all of the actions, deepest first
+  kinds of actions are install, update, remove and move
 .fi
 .RE
 .P
@@ -343,13 +354,29 @@ this algorithm produces:
 .nf
 A
 +\-\- B
-`\-\- C
-    `\-\- D
++\-\- C
++\-\- D
 .fi
 .RE
 .P
 That is, the dependency from B to C is satisfied by the fact that A
-already caused C to be installed at a higher level\.
+already caused C to be installed at a higher level\. D is still installed
+at the top level because nothing conflicts with it\.
+.P
+For \fBA{B,C}, B{C,D@1}, C{D@2}\fP, this algorithm produces:
+.P
+.RS 2
+.nf
+A
++\-\- B
++\-\- C
+   `\-\- D@2
++\-\- D@1
+.fi
+.RE
+.P
+Because B's D@1 will be installed in the top leve, C now has to install D@2
+privately for itself\.
 .P
 See npm help 5 folders for a more detailed description of the specific
 folder structures that npm creates\.
diff --git a/deps/npm/man/man1/npm-link.1 b/deps/npm/man/man1/npm-link.1
index 7fee404349015f..78c3b75a8e9c56 100644
--- a/deps/npm/man/man1/npm-link.1
+++ b/deps/npm/man/man1/npm-link.1
@@ -5,9 +5,10 @@
 .P
 .RS 2
 .nf
-npm link (in package folder)
-npm link [@<scope>/]<pkgname>
-npm ln (with any of the previous argument usage)
+npm link (in package dir)
+npm link [<@scope>/]<pkg>[@<version>]
+
+alias: npm ln
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-logout.1 b/deps/npm/man/man1/npm-logout.1
index d7ea3cd978ff04..d7a840c5dd36b5 100644
--- a/deps/npm/man/man1/npm-logout.1
+++ b/deps/npm/man/man1/npm-logout.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm logout [\-\-registry=url] [\-\-scope=@orgname]
+npm logout [\-\-registry=<url>] [\-\-scope=<@scope>]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-ls.1 b/deps/npm/man/man1/npm-ls.1
index a65a3fa8902551..d246286fd5c565 100644
--- a/deps/npm/man/man1/npm-ls.1
+++ b/deps/npm/man/man1/npm-ls.1
@@ -5,10 +5,9 @@
 .P
 .RS 2
 .nf
-npm list [[@<scope>/]<pkg> \.\.\.]
-npm ls [[@<scope>/]<pkg> \.\.\.]
-npm la [[@<scope>/]<pkg> \.\.\.]
-npm ll [[@<scope>/]<pkg> \.\.\.]
+npm ls [[<@scope>/]<pkg> \.\.\.]
+
+aliases: list, la, ll
 .fi
 .RE
 .SH DESCRIPTION
@@ -23,7 +22,7 @@ For example, running \fBnpm ls promzard\fP in npm's source tree will show:
 .P
 .RS 2
 .nf
-npm@2.14.7 /path/to/npm
+npm@3.3.6 /path/to/npm
 └─┬ init\-package\-json@0\.0\.4
   └── promzard@0\.1\.5
 .fi
@@ -35,6 +34,9 @@ If a project specifies git urls for dependencies these are shown
 in parentheses after the name@version to make it easier for users to
 recognize potential forks of a project\.
 .P
+The tree shown is the logical dependency tree, based on package
+dependencies, not the physical layout of your node_modules folder\.
+.P
 When run as \fBll\fP or \fBla\fP, it shows extended information by default\.
 .SH CONFIGURATION
 .SS json
@@ -106,6 +108,16 @@ Default: false
 .RE
 .P
 Display only the dependency tree for packages in \fBdevDependencies\fP\|\.
+.SS only
+.RS 0
+.IP \(bu 2
+Type: String
+
+.RE
+.P
+When "dev" or "development", is an alias to \fBdev\fP\|\.
+.P
+When "prod" or "production", is an alias to \fBproduction\fP\|\.`
 .SH SEE ALSO
 .RS 0
 .IP \(bu 2
diff --git a/deps/npm/man/man1/npm-outdated.1 b/deps/npm/man/man1/npm-outdated.1
index 7f96b4e48cde03..493e7a9f21402b 100644
--- a/deps/npm/man/man1/npm-outdated.1
+++ b/deps/npm/man/man1/npm-outdated.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm outdated [<name> [<name> \.\.\.]]
+npm outdated [[<@scope>/]<pkg> \.\.\.]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-owner.1 b/deps/npm/man/man1/npm-owner.1
index 28d2cc125f578c..009121d4eb59b2 100644
--- a/deps/npm/man/man1/npm-owner.1
+++ b/deps/npm/man/man1/npm-owner.1
@@ -5,9 +5,9 @@
 .P
 .RS 2
 .nf
-npm owner ls <package name>
-npm owner add <user> <package name>
-npm owner rm <user> <package name>
+npm owner add <user> [<@scope>/]<pkg>
+npm owner rm <user> [<@scope>/]<pkg>
+npm owner ls [<@scope>/]<pkg>
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-pack.1 b/deps/npm/man/man1/npm-pack.1
index 295d918bfed991..0ece00cf1f28fa 100644
--- a/deps/npm/man/man1/npm-pack.1
+++ b/deps/npm/man/man1/npm-pack.1
@@ -5,16 +5,16 @@
 .P
 .RS 2
 .nf
-npm pack [<pkg> [<pkg> \.\.\.]]
+npm pack [[<@scope>/]<pkg>\.\.\.]
 .fi
 .RE
 .SH DESCRIPTION
 .P
 For anything that's installable (that is, a package folder, tarball,
-tarball url, name@tag, name@version, or name), this command will fetch
-it to the cache, and then copy the tarball to the current working
-directory as \fB<name>\-<version>\.tgz\fP, and then write the filenames out to
-stdout\.
+tarball url, name@tag, name@version, name, or scoped name), this
+command will fetch it to the cache, and then copy the tarball to the
+current working directory as \fB<name>\-<version>\.tgz\fP, and then write
+the filenames out to stdout\.
 .P
 If the same package is specified multiple times, then the file will be
 overwritten the second time\.
diff --git a/deps/npm/man/man1/npm-prune.1 b/deps/npm/man/man1/npm-prune.1
index bb9908f5152bb9..051acaab50a1d5 100644
--- a/deps/npm/man/man1/npm-prune.1
+++ b/deps/npm/man/man1/npm-prune.1
@@ -5,8 +5,7 @@
 .P
 .RS 2
 .nf
-npm prune [<name> [<name \.\.\.]]
-npm prune [<name> [<name \.\.\.]] [\-\-production]
+npm prune [[<@scope>/]<pkg>\.\.\.] [\-\-production]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-publish.1 b/deps/npm/man/man1/npm-publish.1
index 20d1f36f6cd0d9..4421c8f45dbce0 100644
--- a/deps/npm/man/man1/npm-publish.1
+++ b/deps/npm/man/man1/npm-publish.1
@@ -5,8 +5,10 @@
 .P
 .RS 2
 .nf
-npm publish <tarball> [\-\-tag <tag>] [\-\-access <public|restricted>]
-npm publish <folder> [\-\-tag <tag>] [\-\-access <public|restricted>]
+npm publish [<tarball>|<folder>] [\-\-tag <tag>] [\-\-access <public|restricted>]
+
+Publishes '\.' if no argument supplied
+Sets tag 'latest' if no \-\-tag specified
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-rebuild.1 b/deps/npm/man/man1/npm-rebuild.1
index b10caeef0d8b46..03d16889aa5482 100644
--- a/deps/npm/man/man1/npm-rebuild.1
+++ b/deps/npm/man/man1/npm-rebuild.1
@@ -5,15 +5,10 @@
 .P
 .RS 2
 .nf
-npm rebuild [<name> [<name> \.\.\.]]
-npm rb [<name> [<name> \.\.\.]]
-.fi
-.RE
-.RS 0
-.IP \(bu 2
-\fB<name>\fP:
-The package to rebuild
+npm rebuild [[<@scope>/<name>]\.\.\.]
 
+alias: npm rb
+.fi
 .RE
 .SH DESCRIPTION
 .P
diff --git a/deps/npm/man/man1/npm-repo.1 b/deps/npm/man/man1/npm-repo.1
index 14f228c9553ee5..fe4418e7e5db84 100644
--- a/deps/npm/man/man1/npm-repo.1
+++ b/deps/npm/man/man1/npm-repo.1
@@ -5,8 +5,7 @@
 .P
 .RS 2
 .nf
-npm repo <pkgname>
-npm repo (with no args in a package dir)
+npm repo [<pkg>]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-rm.1 b/deps/npm/man/man1/npm-rm.1
deleted file mode 100644
index 9c2506635a491d..00000000000000
--- a/deps/npm/man/man1/npm-rm.1
+++ /dev/null
@@ -1,34 +0,0 @@
-.TH "NPM\-RM" "1" "October 2015" "" ""
-.SH "NAME"
-\fBnpm-rm\fR \- Remove a package
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm rm <name>
-npm r <name>
-npm uninstall <name>
-npm un <name>
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This uninstalls a package, completely removing everything npm installed
-on its behalf\.
-.SH SEE ALSO
-.RS 0
-.IP \(bu 2
-npm help prune
-.IP \(bu 2
-npm help install
-.IP \(bu 2
-npm help 5 folders
-.IP \(bu 2
-npm help config
-.IP \(bu 2
-npm help 7 config
-.IP \(bu 2
-npm help 5 npmrc
-
-.RE
-
diff --git a/deps/npm/man/man1/npm-root.1 b/deps/npm/man/man1/npm-root.1
index 20e4a2f687ebea..6c42d89965e47f 100644
--- a/deps/npm/man/man1/npm-root.1
+++ b/deps/npm/man/man1/npm-root.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm root
+npm root [\-g]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-run-script.1 b/deps/npm/man/man1/npm-run-script.1
index e4da37dc2af7c5..08a675a31117c8 100644
--- a/deps/npm/man/man1/npm-run-script.1
+++ b/deps/npm/man/man1/npm-run-script.1
@@ -5,8 +5,9 @@
 .P
 .RS 2
 .nf
-npm run\-script [command] [\-\- <args>]
-npm run [command] [\-\- <args>]
+npm run\-script <command> [\-\- <args>\.\.\.]
+
+alias: npm run
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-search.1 b/deps/npm/man/man1/npm-search.1
index ea2a9c82431130..c3d1a6d0c9c7e3 100644
--- a/deps/npm/man/man1/npm-search.1
+++ b/deps/npm/man/man1/npm-search.1
@@ -6,8 +6,8 @@
 .RS 2
 .nf
 npm search [\-\-long] [search terms \.\.\.]
-npm s [search terms \.\.\.]
-npm se [search terms \.\.\.]
+
+aliases: s, se
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-shrinkwrap.1 b/deps/npm/man/man1/npm-shrinkwrap.1
index 1a8abd78292a6f..a3d7940478b49c 100644
--- a/deps/npm/man/man1/npm-shrinkwrap.1
+++ b/deps/npm/man/man1/npm-shrinkwrap.1
@@ -111,13 +111,17 @@ This generates \fBnpm\-shrinkwrap\.json\fP, which will look something like this:
 .nf
 {
   "name": "A",
-  "version": "0\.1\.0",
+  "version": "1\.1\.0",
   "dependencies": {
     "B": {
-      "version": "0\.0\.1",
+      "version": "1\.0\.1",
+      "from": "B@^1\.0\.0",
+      "resolved": "https://registry\.npmjs\.org/B/\-/B\-1\.0\.1\.tgz",
       "dependencies": {
         "C": {
-          "version": "0\.0\.1"
+          "version": "1\.0\.1",
+          "from": "org/C#v1\.0\.1",
+          "resolved": "git://github\.com/org/C\.git#5c380ae319fc4efe9e7f2d9c78b0faa588fd99b4"
         }
       }
     }
@@ -126,15 +130,18 @@ This generates \fBnpm\-shrinkwrap\.json\fP, which will look something like this:
 .fi
 .RE
 .P
-The shrinkwrap command has locked down the dependencies based on
-what's currently installed in node_modules\.  When \fBnpm install\fP
-installs a package with an \fBnpm\-shrinkwrap\.json\fP in the package
-root, the shrinkwrap file (rather than \fBpackage\.json\fP files) completely
-drives the installation of that package and all of its dependencies
-(recursively)\.  So now the author publishes A@0\.1\.0, and subsequent
-installs of this package will use B@0\.0\.1 and C@0\.0\.1, regardless the
-dependencies and versions listed in A's, B's, and C's \fBpackage\.json\fP
-files\.
+The shrinkwrap command has locked down the dependencies based on what's
+currently installed in \fBnode_modules\fP\|\.  The installation behavior is changed to:
+.RS 0
+.IP 1. 3
+The module tree described by the shrinkwrap is reproduced\. This means
+reproducing the structure described in the file, using the specific files
+referenced in "resolved" if available, falling back to normal package
+resolution using "version" if one isn't\.
+.IP 2. 3
+The tree is walked and any missing dependencies are installed in the usual fasion\.
+
+.RE
 .SS Using shrinkwrapped packages
 .P
 Using a shrinkwrapped package is no different than using any other
@@ -161,17 +168,16 @@ To add or update a dependency in a shrinkwrapped package:
 Run \fBnpm install\fP in the package root to install the current
 versions of all dependencies\.
 .IP 2. 3
-Add or update dependencies\. \fBnpm install\fP each new or updated
-package individually and then update \fBpackage\.json\fP\|\.  Note that they
-must be explicitly named in order to be installed: running \fBnpm
-install\fP with no arguments will merely reproduce the existing
+Add or update dependencies\. \fBnpm install \-\-save\fP each new or updated
+package individually to update the \fBpackage\.json\fP and the shrinkwrap\.
+Note that they must be explicitly named in order to be installed: running
+\fBnpm install\fP with no arguments will merely reproduce the existing
 shrinkwrap\.
 .IP 3. 3
 Validate that the package works as expected with the new
 dependencies\.
 .IP 4. 3
-Run \fBnpm shrinkwrap\fP, commit the new \fBnpm\-shrinkwrap\.json\fP, and
-publish your package\.
+Commit the new \fBnpm\-shrinkwrap\.json\fP, and publish your package\.
 
 .RE
 .P
diff --git a/deps/npm/man/man1/npm-star.1 b/deps/npm/man/man1/npm-star.1
index 7bcb1db69f9685..fabbfba56e29da 100644
--- a/deps/npm/man/man1/npm-star.1
+++ b/deps/npm/man/man1/npm-star.1
@@ -5,8 +5,8 @@
 .P
 .RS 2
 .nf
-npm star <pkgname> [<pkg>, \.\.\.]
-npm unstar <pkgname> [<pkg>, \.\.\.]
+npm star [<pkg>\.\.\.]
+npm unstar [<pkg>\.\.\.]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-stars.1 b/deps/npm/man/man1/npm-stars.1
index 2d8c3b2c7def7f..f8c7b21410f5f2 100644
--- a/deps/npm/man/man1/npm-stars.1
+++ b/deps/npm/man/man1/npm-stars.1
@@ -5,8 +5,7 @@
 .P
 .RS 2
 .nf
-npm stars
-npm stars [username]
+npm stars [<user>]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-tag.1 b/deps/npm/man/man1/npm-tag.1
index affc443d538540..4d63d7168da677 100644
--- a/deps/npm/man/man1/npm-tag.1
+++ b/deps/npm/man/man1/npm-tag.1
@@ -5,7 +5,8 @@
 .P
 .RS 2
 .nf
-npm tag <name>@<version> [<tag>]
+[DEPRECATED] npm tag <name>@<version> [<tag>]
+See `dist\-tag`
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-uninstall.1 b/deps/npm/man/man1/npm-uninstall.1
index fedb41b730f211..d254c8142d8050 100644
--- a/deps/npm/man/man1/npm-uninstall.1
+++ b/deps/npm/man/man1/npm-uninstall.1
@@ -5,8 +5,9 @@
 .P
 .RS 2
 .nf
-npm uninstall [@<scope>/]<package> [\-\-save|\-\-save\-dev|\-\-save\-optional]
-npm rm (with any of the previous argument usage)
+npm uninstall [<@scope>/]<pkg>[@<version>]\.\.\. [\-\-save|\-\-save\-dev|\-\-save\-optional]
+
+aliases: remove, rm, r, un, unlink
 .fi
 .RE
 .SH DESCRIPTION
@@ -37,6 +38,9 @@ the package version in your main package\.json:
 
 .RE
 .P
+Further, if you have an \fBnpm\-shrinkwrap\.json\fP then it will be updated as
+well\.
+.P
 Scope is optional and follows the usual rules for npm help 7 \fBnpm\-scope\fP\|\.
 .P
 Examples:
diff --git a/deps/npm/man/man1/npm-unpublish.1 b/deps/npm/man/man1/npm-unpublish.1
index f3c46aac93ac88..9d3236baa2998d 100644
--- a/deps/npm/man/man1/npm-unpublish.1
+++ b/deps/npm/man/man1/npm-unpublish.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm unpublish [@<scope>/]<name>[@<version>]
+npm unpublish [<@scope>/]<pkg>[@<version>]
 .fi
 .RE
 .SH WARNING
diff --git a/deps/npm/man/man1/npm-update.1 b/deps/npm/man/man1/npm-update.1
index 4e247b50082a94..ec9d93a9e9bd85 100644
--- a/deps/npm/man/man1/npm-update.1
+++ b/deps/npm/man/man1/npm-update.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm update [\-g] [<name> [<name> \.\.\.]]
+npm update [\-g] [<pkg>\.\.\.]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-version.1 b/deps/npm/man/man1/npm-version.1
index 5c04c279f913ab..b7f9bca0cd8788 100644
--- a/deps/npm/man/man1/npm-version.1
+++ b/deps/npm/man/man1/npm-version.1
@@ -6,6 +6,10 @@
 .RS 2
 .nf
 npm version [<newversion> | major | minor | patch | premajor | preminor | prepatch | prerelease]
+
+\|'npm \-v' or 'npm \-\-version' to print npm version
+\|'npm view <pkg> version' to view a package's published version
+\|'npm ls' to inspect current package/dependency versions
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-view.1 b/deps/npm/man/man1/npm-view.1
index ba3fe90030d0d7..55f1f6ae15d080 100644
--- a/deps/npm/man/man1/npm-view.1
+++ b/deps/npm/man/man1/npm-view.1
@@ -5,8 +5,9 @@
 .P
 .RS 2
 .nf
-npm view [@<scope>/]<name>[@<version>] [<field>[\.<subfield>]\.\.\.]
-npm v [@<scope>/]<name>[@<version>] [<field>[\.<subfield>]\.\.\.]
+npm view [<@scope>/]<name>[@<version>] [<field>[\.<subfield>]\.\.\.]
+
+aliases: info, show, v
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-whoami.1 b/deps/npm/man/man1/npm-whoami.1
index b52b509ebb670d..1bb605e285cf75 100644
--- a/deps/npm/man/man1/npm-whoami.1
+++ b/deps/npm/man/man1/npm-whoami.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm whoami
+npm whoami [\-\-registry <registry>]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1
index 3837768230bf87..38dab77422217a 100644
--- a/deps/npm/man/man1/npm.1
+++ b/deps/npm/man/man1/npm.1
@@ -10,7 +10,7 @@ npm <command> [args]
 .RE
 .SH VERSION
 .P
-2.14.7
+3.3.6
 .SH DESCRIPTION
 .P
 npm is the package manager for the Node JavaScript platform\.  It puts
diff --git a/deps/npm/man/man3/npm-bin.3 b/deps/npm/man/man3/npm-bin.3
index 31c2c4326d8b52..bfb93455d8a789 100644
--- a/deps/npm/man/man3/npm-bin.3
+++ b/deps/npm/man/man3/npm-bin.3
@@ -1,4 +1,4 @@
-.TH "NPM\-BIN" "3" "October 2015" "" ""
+.TH "NPM\-BIN" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-bin\fR \- Display npm bin folder
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-bugs.3 b/deps/npm/man/man3/npm-bugs.3
index 860af2e5762598..2740034a58c71b 100644
--- a/deps/npm/man/man3/npm-bugs.3
+++ b/deps/npm/man/man3/npm-bugs.3
@@ -1,4 +1,4 @@
-.TH "NPM\-BUGS" "3" "October 2015" "" ""
+.TH "NPM\-BUGS" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-bugs\fR \- Bugs for a package in a web browser maybe
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-cache.3 b/deps/npm/man/man3/npm-cache.3
index 5ca2d8c7063e60..50a6b7a38c0e82 100644
--- a/deps/npm/man/man3/npm-cache.3
+++ b/deps/npm/man/man3/npm-cache.3
@@ -1,4 +1,4 @@
-.TH "NPM\-CACHE" "3" "October 2015" "" ""
+.TH "NPM\-CACHE" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-cache\fR \- manage the npm cache programmatically
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-commands.3 b/deps/npm/man/man3/npm-commands.3
index 9036288732f2a3..03d0dc40bd190d 100644
--- a/deps/npm/man/man3/npm-commands.3
+++ b/deps/npm/man/man3/npm-commands.3
@@ -1,4 +1,4 @@
-.TH "NPM\-COMMANDS" "3" "October 2015" "" ""
+.TH "NPM\-COMMANDS" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-commands\fR \- npm commands
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-config.3 b/deps/npm/man/man3/npm-config.3
index d27e2dcc453458..d2e57c26b57509 100644
--- a/deps/npm/man/man3/npm-config.3
+++ b/deps/npm/man/man3/npm-config.3
@@ -1,4 +1,4 @@
-.TH "NPM\-CONFIG" "3" "October 2015" "" ""
+.TH "NPM\-CONFIG" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-config\fR \- Manage the npm configuration files
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-deprecate.3 b/deps/npm/man/man3/npm-deprecate.3
index 39cf6336c213ee..f0e35ab9d33fe2 100644
--- a/deps/npm/man/man3/npm-deprecate.3
+++ b/deps/npm/man/man3/npm-deprecate.3
@@ -1,4 +1,4 @@
-.TH "NPM\-DEPRECATE" "3" "October 2015" "" ""
+.TH "NPM\-DEPRECATE" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-deprecate\fR \- Deprecate a version of a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-docs.3 b/deps/npm/man/man3/npm-docs.3
index f0c01390e296bb..4305dae16399f2 100644
--- a/deps/npm/man/man3/npm-docs.3
+++ b/deps/npm/man/man3/npm-docs.3
@@ -1,4 +1,4 @@
-.TH "NPM\-DOCS" "3" "October 2015" "" ""
+.TH "NPM\-DOCS" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-docs\fR \- Docs for a package in a web browser maybe
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-edit.3 b/deps/npm/man/man3/npm-edit.3
index c1c79f822970cd..27ccd879fac3ef 100644
--- a/deps/npm/man/man3/npm-edit.3
+++ b/deps/npm/man/man3/npm-edit.3
@@ -1,4 +1,4 @@
-.TH "NPM\-EDIT" "3" "October 2015" "" ""
+.TH "NPM\-EDIT" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-edit\fR \- Edit an installed package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-explore.3 b/deps/npm/man/man3/npm-explore.3
index 702d5bfc800c09..9fb6e008aad2bc 100644
--- a/deps/npm/man/man3/npm-explore.3
+++ b/deps/npm/man/man3/npm-explore.3
@@ -1,4 +1,4 @@
-.TH "NPM\-EXPLORE" "3" "October 2015" "" ""
+.TH "NPM\-EXPLORE" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-explore\fR \- Browse an installed package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-help-search.3 b/deps/npm/man/man3/npm-help-search.3
index 8e8053b588a062..243e5d2a28dcb7 100644
--- a/deps/npm/man/man3/npm-help-search.3
+++ b/deps/npm/man/man3/npm-help-search.3
@@ -1,4 +1,4 @@
-.TH "NPM\-HELP\-SEARCH" "3" "October 2015" "" ""
+.TH "NPM\-HELP\-SEARCH" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-help-search\fR \- Search the help pages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-init.3 b/deps/npm/man/man3/npm-init.3
index b2eab12fe34944..947398d7a864d9 100644
--- a/deps/npm/man/man3/npm-init.3
+++ b/deps/npm/man/man3/npm-init.3
@@ -1,4 +1,4 @@
-.TH "NPM" "" "October 2015" "" ""
+.TH "NPM" "" "August 2015" "" ""
 .SH "NAME"
 \fBnpm\fR
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-install.3 b/deps/npm/man/man3/npm-install.3
index 75397cdc95bff2..d2951dd0d45f74 100644
--- a/deps/npm/man/man3/npm-install.3
+++ b/deps/npm/man/man3/npm-install.3
@@ -1,4 +1,4 @@
-.TH "NPM\-INSTALL" "3" "October 2015" "" ""
+.TH "NPM\-INSTALL" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-install\fR \- install a package programmatically
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-link.3 b/deps/npm/man/man3/npm-link.3
index 2829bab6af0ed5..5877e03fbe8fb7 100644
--- a/deps/npm/man/man3/npm-link.3
+++ b/deps/npm/man/man3/npm-link.3
@@ -1,4 +1,4 @@
-.TH "NPM\-LINK" "3" "October 2015" "" ""
+.TH "NPM\-LINK" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-link\fR \- Symlink a package folder
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-load.3 b/deps/npm/man/man3/npm-load.3
index dd0017ec748989..ce409b6a5f66aa 100644
--- a/deps/npm/man/man3/npm-load.3
+++ b/deps/npm/man/man3/npm-load.3
@@ -1,4 +1,4 @@
-.TH "NPM\-LOAD" "3" "October 2015" "" ""
+.TH "NPM\-LOAD" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-load\fR \- Load config settings
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-ls.3 b/deps/npm/man/man3/npm-ls.3
index 3f998266170e32..4fc976f2ede0f3 100644
--- a/deps/npm/man/man3/npm-ls.3
+++ b/deps/npm/man/man3/npm-ls.3
@@ -1,4 +1,4 @@
-.TH "NPM\-LS" "3" "October 2015" "" ""
+.TH "NPM\-LS" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-ls\fR \- List installed packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-outdated.3 b/deps/npm/man/man3/npm-outdated.3
index 09e51e92ef0309..f2fd1f73b70f41 100644
--- a/deps/npm/man/man3/npm-outdated.3
+++ b/deps/npm/man/man3/npm-outdated.3
@@ -1,4 +1,4 @@
-.TH "NPM\-OUTDATED" "3" "October 2015" "" ""
+.TH "NPM\-OUTDATED" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-outdated\fR \- Check for outdated packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-owner.3 b/deps/npm/man/man3/npm-owner.3
index d0b24cbd54e44a..16e2c54019676b 100644
--- a/deps/npm/man/man3/npm-owner.3
+++ b/deps/npm/man/man3/npm-owner.3
@@ -1,4 +1,4 @@
-.TH "NPM\-OWNER" "3" "October 2015" "" ""
+.TH "NPM\-OWNER" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-owner\fR \- Manage package owners
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-pack.3 b/deps/npm/man/man3/npm-pack.3
index be86942dd4cd98..037ec3c3467b55 100644
--- a/deps/npm/man/man3/npm-pack.3
+++ b/deps/npm/man/man3/npm-pack.3
@@ -1,4 +1,4 @@
-.TH "NPM\-PACK" "3" "October 2015" "" ""
+.TH "NPM\-PACK" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-pack\fR \- Create a tarball from a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-ping.3 b/deps/npm/man/man3/npm-ping.3
index 9963edd15d665b..607fc8423e8da3 100644
--- a/deps/npm/man/man3/npm-ping.3
+++ b/deps/npm/man/man3/npm-ping.3
@@ -1,4 +1,4 @@
-.TH "NPM\-PING" "3" "October 2015" "" ""
+.TH "NPM\-PING" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-ping\fR \- Ping npm registry
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-prefix.3 b/deps/npm/man/man3/npm-prefix.3
index 33c118fc2fb6e3..5ca38b5ec214ff 100644
--- a/deps/npm/man/man3/npm-prefix.3
+++ b/deps/npm/man/man3/npm-prefix.3
@@ -1,4 +1,4 @@
-.TH "NPM\-PREFIX" "3" "October 2015" "" ""
+.TH "NPM\-PREFIX" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-prefix\fR \- Display prefix
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-prune.3 b/deps/npm/man/man3/npm-prune.3
index 49f4d0ad650ca6..4bf3f28039ce39 100644
--- a/deps/npm/man/man3/npm-prune.3
+++ b/deps/npm/man/man3/npm-prune.3
@@ -1,4 +1,4 @@
-.TH "NPM\-PRUNE" "3" "October 2015" "" ""
+.TH "NPM\-PRUNE" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-prune\fR \- Remove extraneous packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-publish.3 b/deps/npm/man/man3/npm-publish.3
index 5be59e838273ed..4a303370b0ed84 100644
--- a/deps/npm/man/man3/npm-publish.3
+++ b/deps/npm/man/man3/npm-publish.3
@@ -1,4 +1,4 @@
-.TH "NPM\-PUBLISH" "3" "October 2015" "" ""
+.TH "NPM\-PUBLISH" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-publish\fR \- Publish a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-rebuild.3 b/deps/npm/man/man3/npm-rebuild.3
index 714c5778b8f184..b59df54005ac93 100644
--- a/deps/npm/man/man3/npm-rebuild.3
+++ b/deps/npm/man/man3/npm-rebuild.3
@@ -1,4 +1,4 @@
-.TH "NPM\-REBUILD" "3" "October 2015" "" ""
+.TH "NPM\-REBUILD" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-rebuild\fR \- Rebuild a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-repo.3 b/deps/npm/man/man3/npm-repo.3
index dae556f6a92812..53983bca9b9466 100644
--- a/deps/npm/man/man3/npm-repo.3
+++ b/deps/npm/man/man3/npm-repo.3
@@ -1,4 +1,4 @@
-.TH "NPM\-REPO" "3" "October 2015" "" ""
+.TH "NPM\-REPO" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-repo\fR \- Open package repository page in the browser
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-restart.3 b/deps/npm/man/man3/npm-restart.3
index dad6281d126e8f..478c2f5f30dec4 100644
--- a/deps/npm/man/man3/npm-restart.3
+++ b/deps/npm/man/man3/npm-restart.3
@@ -1,4 +1,4 @@
-.TH "NPM\-RESTART" "3" "October 2015" "" ""
+.TH "NPM\-RESTART" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-restart\fR \- Restart a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-root.3 b/deps/npm/man/man3/npm-root.3
index 3fd75ab7b16c51..8ade1a6826a613 100644
--- a/deps/npm/man/man3/npm-root.3
+++ b/deps/npm/man/man3/npm-root.3
@@ -1,4 +1,4 @@
-.TH "NPM\-ROOT" "3" "October 2015" "" ""
+.TH "NPM\-ROOT" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-root\fR \- Display npm root
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-run-script.3 b/deps/npm/man/man3/npm-run-script.3
index bc4508c0409221..416f1ff79203bb 100644
--- a/deps/npm/man/man3/npm-run-script.3
+++ b/deps/npm/man/man3/npm-run-script.3
@@ -1,4 +1,4 @@
-.TH "NPM\-RUN\-SCRIPT" "3" "October 2015" "" ""
+.TH "NPM\-RUN\-SCRIPT" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-run-script\fR \- Run arbitrary package scripts
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-search.3 b/deps/npm/man/man3/npm-search.3
index 85a9ede36c97c4..823eff13b03c0f 100644
--- a/deps/npm/man/man3/npm-search.3
+++ b/deps/npm/man/man3/npm-search.3
@@ -1,4 +1,4 @@
-.TH "NPM\-SEARCH" "3" "October 2015" "" ""
+.TH "NPM\-SEARCH" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-search\fR \- Search for packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-shrinkwrap.3 b/deps/npm/man/man3/npm-shrinkwrap.3
index 7211d969a67432..fa89d927ddbc4f 100644
--- a/deps/npm/man/man3/npm-shrinkwrap.3
+++ b/deps/npm/man/man3/npm-shrinkwrap.3
@@ -1,4 +1,4 @@
-.TH "NPM\-SHRINKWRAP" "3" "October 2015" "" ""
+.TH "NPM\-SHRINKWRAP" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-shrinkwrap\fR \- programmatically generate package shrinkwrap file
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-start.3 b/deps/npm/man/man3/npm-start.3
index 7629bc9ee48094..050c108e818b19 100644
--- a/deps/npm/man/man3/npm-start.3
+++ b/deps/npm/man/man3/npm-start.3
@@ -1,4 +1,4 @@
-.TH "NPM\-START" "3" "October 2015" "" ""
+.TH "NPM\-START" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-start\fR \- Start a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-stop.3 b/deps/npm/man/man3/npm-stop.3
index 95f6e61542a34c..9df3b4c69b85fd 100644
--- a/deps/npm/man/man3/npm-stop.3
+++ b/deps/npm/man/man3/npm-stop.3
@@ -1,4 +1,4 @@
-.TH "NPM\-STOP" "3" "October 2015" "" ""
+.TH "NPM\-STOP" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-stop\fR \- Stop a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-tag.3 b/deps/npm/man/man3/npm-tag.3
index 643c57c9687663..5c3f3558309124 100644
--- a/deps/npm/man/man3/npm-tag.3
+++ b/deps/npm/man/man3/npm-tag.3
@@ -1,4 +1,4 @@
-.TH "NPM\-TAG" "3" "October 2015" "" ""
+.TH "NPM\-TAG" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-tag\fR \- Tag a published version
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-test.3 b/deps/npm/man/man3/npm-test.3
index 5434f91e74af9d..f0a67f1241c0d5 100644
--- a/deps/npm/man/man3/npm-test.3
+++ b/deps/npm/man/man3/npm-test.3
@@ -1,4 +1,4 @@
-.TH "NPM\-TEST" "3" "October 2015" "" ""
+.TH "NPM\-TEST" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-test\fR \- Test a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-uninstall.3 b/deps/npm/man/man3/npm-uninstall.3
index 168df5f0eb9870..fe9ebaaf1729ca 100644
--- a/deps/npm/man/man3/npm-uninstall.3
+++ b/deps/npm/man/man3/npm-uninstall.3
@@ -1,4 +1,4 @@
-.TH "NPM\-UNINSTALL" "3" "October 2015" "" ""
+.TH "NPM\-UNINSTALL" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-uninstall\fR \- uninstall a package programmatically
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-unpublish.3 b/deps/npm/man/man3/npm-unpublish.3
index 1d10b121f3a8f0..721bf206b55839 100644
--- a/deps/npm/man/man3/npm-unpublish.3
+++ b/deps/npm/man/man3/npm-unpublish.3
@@ -1,4 +1,4 @@
-.TH "NPM\-UNPUBLISH" "3" "October 2015" "" ""
+.TH "NPM\-UNPUBLISH" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-unpublish\fR \- Remove a package from the registry
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-update.3 b/deps/npm/man/man3/npm-update.3
index 2f67a13b9aa69c..da780d598e8131 100644
--- a/deps/npm/man/man3/npm-update.3
+++ b/deps/npm/man/man3/npm-update.3
@@ -1,4 +1,4 @@
-.TH "NPM\-UPDATE" "3" "October 2015" "" ""
+.TH "NPM\-UPDATE" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-update\fR \- Update a package
 .SH SYNOPSIS
@@ -8,7 +8,7 @@
 npm\.commands\.update(packages, callback)
 .fi
 .RE
-.TH "DESCRIPTION" "" "October 2015" "" ""
+.TH "DESCRIPTION" "" "August 2015" "" ""
 .SH "NAME"
 \fBDESCRIPTION\fR
 .P
diff --git a/deps/npm/man/man3/npm-version.3 b/deps/npm/man/man3/npm-version.3
index 32d8ce6c8adaaa..7a13475c43363a 100644
--- a/deps/npm/man/man3/npm-version.3
+++ b/deps/npm/man/man3/npm-version.3
@@ -1,4 +1,4 @@
-.TH "NPM\-VERSION" "3" "October 2015" "" ""
+.TH "NPM\-VERSION" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-version\fR \- Bump a package version
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-view.3 b/deps/npm/man/man3/npm-view.3
index 45ece20c3a4026..8c3d191f54a2ff 100644
--- a/deps/npm/man/man3/npm-view.3
+++ b/deps/npm/man/man3/npm-view.3
@@ -1,4 +1,4 @@
-.TH "NPM\-VIEW" "3" "October 2015" "" ""
+.TH "NPM\-VIEW" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-view\fR \- View registry info
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-whoami.3 b/deps/npm/man/man3/npm-whoami.3
index a580afe2e517b0..0c29cf74846061 100644
--- a/deps/npm/man/man3/npm-whoami.3
+++ b/deps/npm/man/man3/npm-whoami.3
@@ -1,4 +1,4 @@
-.TH "NPM\-WHOAMI" "3" "October 2015" "" ""
+.TH "NPM\-WHOAMI" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-whoami\fR \- Display npm username
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm.3 b/deps/npm/man/man3/npm.3
index 1cbe624eebfbea..c45b9788a31747 100644
--- a/deps/npm/man/man3/npm.3
+++ b/deps/npm/man/man3/npm.3
@@ -1,4 +1,4 @@
-.TH "NPM" "3" "October 2015" "" ""
+.TH "NPM" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm\fR \- javascript package manager
 .SH SYNOPSIS
@@ -20,7 +20,7 @@ npm\.load([configObject, ]function (er, npm) {
 .RE
 .SH VERSION
 .P
-2.14.7
+3.3.0
 .SH DESCRIPTION
 .P
 This is the API documentation for npm\.
diff --git a/deps/npm/man/man5/npm-json.5 b/deps/npm/man/man5/npm-json.5
index c41943c22da223..0aed3a4db09d35 100644
--- a/deps/npm/man/man5/npm-json.5
+++ b/deps/npm/man/man5/npm-json.5
@@ -758,17 +758,10 @@ Note that, unless the user has set the \fBengine\-strict\fP config flag, this
 field is advisory only\.
 .SH engineStrict
 .P
-\fBNOTE: This feature is deprecated and will be removed in npm 3\.0\.0\.\fR
+\fBThis feature was deprecated with npm 3\.0\.0\fR
 .P
-If you are sure that your module will \fIdefinitely not\fR run properly on
-versions of Node/npm other than those specified in the \fBengines\fP object,
-then you can set \fB"engineStrict": true\fP in your package\.json file\.
-This will override the user's \fBengine\-strict\fP config setting\.
-.P
-Please do not do this unless you are really very very sure\.  If your
-engines object is something overly restrictive, you can quite easily and
-inadvertently lock yourself into obscurity and prevent your users from
-updating to new versions of Node\.  Consider this choice carefully\.
+Prior to npm 3\.0\.0, this feature was used to treat this package as if the
+user had set \fBengine\-strict\fP\|\.
 .SH os
 .P
 You can specify which operating systems your
diff --git a/deps/npm/man/man5/package.json.5 b/deps/npm/man/man5/package.json.5
index c41943c22da223..0aed3a4db09d35 100644
--- a/deps/npm/man/man5/package.json.5
+++ b/deps/npm/man/man5/package.json.5
@@ -758,17 +758,10 @@ Note that, unless the user has set the \fBengine\-strict\fP config flag, this
 field is advisory only\.
 .SH engineStrict
 .P
-\fBNOTE: This feature is deprecated and will be removed in npm 3\.0\.0\.\fR
+\fBThis feature was deprecated with npm 3\.0\.0\fR
 .P
-If you are sure that your module will \fIdefinitely not\fR run properly on
-versions of Node/npm other than those specified in the \fBengines\fP object,
-then you can set \fB"engineStrict": true\fP in your package\.json file\.
-This will override the user's \fBengine\-strict\fP config setting\.
-.P
-Please do not do this unless you are really very very sure\.  If your
-engines object is something overly restrictive, you can quite easily and
-inadvertently lock yourself into obscurity and prevent your users from
-updating to new versions of Node\.  Consider this choice carefully\.
+Prior to npm 3\.0\.0, this feature was used to treat this package as if the
+user had set \fBengine\-strict\fP\|\.
 .SH os
 .P
 You can specify which operating systems your
diff --git a/deps/npm/man/man7/npm-config.7 b/deps/npm/man/man7/npm-config.7
index 6fa530413b75d1..c810392761cdd1 100644
--- a/deps/npm/man/man7/npm-config.7
+++ b/deps/npm/man/man7/npm-config.7
@@ -28,7 +28,7 @@ per\-project config file (/path/to/my/project/\.npmrc)
 .IP \(bu 2
 per\-user config file (~/\.npmrc)
 .IP \(bu 2
-global config file ($PREFIX/npmrc)
+global config file ($PREFIX/etc/npmrc)
 .IP \(bu 2
 npm builtin config file (/path/to/npm/npmrc)
 
@@ -173,6 +173,17 @@ Type: Boolean
 .P
 Force npm to always require authentication when accessing the registry,
 even for \fBGET\fP requests\.
+.SS also
+.RS 0
+.IP \(bu 2
+Default: null
+.IP \(bu 2
+Type: String
+
+.RE
+.P
+When "dev" or "development" and running local \fBnpm shrinkwrap\fP,
+\fBnpm outdated\fP, or \fBnpm update\fP, is an alias for \fB\-\-dev\fP\|\.
 .SS bin\-links
 .RS 0
 .IP \(bu 2
@@ -370,6 +381,20 @@ Install \fBdev\-dependencies\fP along with packages\.
 .P
 Note that \fBdev\-dependencies\fP are also installed if the \fBnpat\fP flag is
 set\.
+.SS dry\-run
+.RS 0
+.IP \(bu 2
+Default: false
+.IP \(bu 2
+Type: Boolean
+
+.RE
+.P
+Indicates that you don't want npm to make any changes and that it should
+only report what it would have done\.  This can be passed into any of the
+commands that modify your local installation, eg, \fBinstall\fP, \fBupdate\fP,
+\fBdedupe\fP, \fBuninstall\fP\|\.  This is NOT currently honored by network related
+commands, eg \fBdist\-tags\fP, \fBowner\fP, \fBpublish\fP, etc\.
 .SS editor
 .RS 0
 .IP \(bu 2
@@ -778,6 +803,27 @@ Type: path
 .P
 A node module to \fBrequire()\fP when npm loads\.  Useful for programmatic
 usage\.
+.SS only
+.RS 0
+.IP \(bu 2
+Default: null
+.IP \(bu 2
+Type: String
+
+.RE
+.P
+When "dev" or "development" and running local \fBnpm install\fP without any
+arguments, only devDependencies (and their dependencies) are installed\.
+.P
+When "dev" or "development" and running local \fBnpm ls\fP, \fBnpm outdated\fP, or
+\fBnpm update\fP, is an alias for \fB\-\-dev\fP\|\.
+.P
+When "prod" or "production" and running local \fBnpm install\fP without any
+arguments, only non\-devDependencies (and their dependencies) are
+installed\.
+.P
+When "prod" or "production" and running local \fBnpm ls\fP, \fBnpm outdated\fP, or
+\fBnpm update\fP, is an alias for \fB\-\-production\fP\|\.
 .SS optional
 .RS 0
 .IP \(bu 2
@@ -830,6 +876,19 @@ local \fBnpm install\fP without any arguments\.
 Set the NODE_ENV="production" for lifecycle scripts\.
 
 .RE
+.SS progress
+.RS 0
+.IP \(bu 2
+Default: true
+.IP \(bu 2
+Type: Boolean
+
+.RE
+.P
+When set to \fBtrue\fP, npm will display a progress bar during time intensive
+operations, if \fBprocess\.stderr\fP is a TTY\.
+.P
+Set to \fBfalse\fP to suppress the progress bar\.
 .SS proprietary\-attribs
 .RS 0
 .IP \(bu 2
@@ -1060,20 +1119,6 @@ using \fB\-s\fP to add a signature\.
 .P
 Note that git requires you to have set up GPG keys in your git configs
 for this to work properly\.
-.SS spin
-.RS 0
-.IP \(bu 2
-Default: true
-.IP \(bu 2
-Type: Boolean or \fB"always"\fP
-
-.RE
-.P
-When set to \fBtrue\fP, npm will display an ascii spinner while it is doing
-things, if \fBprocess\.stderr\fP is a TTY\.
-.P
-Set to \fBfalse\fP to suppress the spinner, or set to \fBalways\fP to output
-the spinner even for non\-TTY outputs\.
 .SS strict\-ssl
 .RS 0
 .IP \(bu 2
@@ -1131,7 +1176,7 @@ on success, but left behind on failure for forensic purposes\.
 .SS unicode
 .RS 0
 .IP \(bu 2
-Default: true
+Default: true on windows and mac/unix systems with a unicode locale
 .IP \(bu 2
 Type: Boolean
 
diff --git a/deps/npm/man/man7/npm-index.7 b/deps/npm/man/man7/npm-index.7
index 4ab8ccd28afe77..8134075c0d043f 100644
--- a/deps/npm/man/man7/npm-index.7
+++ b/deps/npm/man/man7/npm-index.7
@@ -106,9 +106,6 @@ Open package repository page in the browser
 .SS npm help restart
 .P
 Restart a package
-.SS npm help rm
-.P
-Remove a package
 .SS npm help root
 .P
 Display npm root
@@ -163,126 +160,6 @@ Display npm username
 .SH API Documentation
 .P
 Using npm in your Node programs
-.SS npm apihelp npm
-.P
-javascript package manager
-.SS npm apihelp bin
-.P
-Display npm bin folder
-.SS npm apihelp bugs
-.P
-Bugs for a package in a web browser maybe
-.SS npm apihelp cache
-.P
-manage the npm cache programmatically
-.SS npm apihelp commands
-.P
-npm commands
-.SS npm apihelp config
-.P
-Manage the npm configuration files
-.SS npm apihelp deprecate
-.P
-Deprecate a version of a package
-.SS npm apihelp docs
-.P
-Docs for a package in a web browser maybe
-.SS npm apihelp edit
-.P
-Edit an installed package
-.SS npm apihelp explore
-.P
-Browse an installed package
-.SS npm apihelp help\-search
-.P
-Search the help pages
-.SS npm apihelp init
-.P
-Interactively create a package\.json file
-.SS npm apihelp install
-.P
-install a package programmatically
-.SS npm apihelp link
-.P
-Symlink a package folder
-.SS npm apihelp load
-.P
-Load config settings
-.SS npm apihelp ls
-.P
-List installed packages
-.SS npm apihelp outdated
-.P
-Check for outdated packages
-.SS npm apihelp owner
-.P
-Manage package owners
-.SS npm apihelp pack
-.P
-Create a tarball from a package
-.SS npm apihelp ping
-.P
-Ping npm registry
-.SS npm apihelp prefix
-.P
-Display prefix
-.SS npm apihelp prune
-.P
-Remove extraneous packages
-.SS npm apihelp publish
-.P
-Publish a package
-.SS npm apihelp rebuild
-.P
-Rebuild a package
-.SS npm apihelp repo
-.P
-Open package repository page in the browser
-.SS npm apihelp restart
-.P
-Restart a package
-.SS npm apihelp root
-.P
-Display npm root
-.SS npm apihelp run\-script
-.P
-Run arbitrary package scripts
-.SS npm apihelp search
-.P
-Search for packages
-.SS npm apihelp shrinkwrap
-.P
-programmatically generate package shrinkwrap file
-.SS npm apihelp start
-.P
-Start a package
-.SS npm apihelp stop
-.P
-Stop a package
-.SS npm apihelp tag
-.P
-Tag a published version
-.SS npm apihelp test
-.P
-Test a package
-.SS npm apihelp uninstall
-.P
-uninstall a package programmatically
-.SS npm apihelp unpublish
-.P
-Remove a package from the registry
-.SS npm apihelp update
-.P
-Update a package
-.SS npm apihelp version
-.P
-Bump a package version
-.SS npm apihelp view
-.P
-View registry info
-.SS npm apihelp whoami
-.P
-Display npm username
 .SH Files
 .P
 File system structures npm uses
@@ -316,9 +193,6 @@ Frequently Asked Questions
 .SS npm help 7 index
 .P
 Index of all npm documentation
-.SS npm help 7 orgs
-.P
-Working with Teams & Orgs
 .SS npm help 7 registry
 .P
 The JavaScript Package Registry
diff --git a/deps/npm/node_modules/abbrev/package.json b/deps/npm/node_modules/abbrev/package.json
index 9b71f630b71ae1..b86461cfaef2fe 100644
--- a/deps/npm/node_modules/abbrev/package.json
+++ b/deps/npm/node_modules/abbrev/package.json
@@ -1,47 +1,73 @@
 {
-  "name": "abbrev",
-  "version": "1.0.7",
-  "description": "Like ruby's abbrev module, but in js",
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me"
-  },
-  "main": "abbrev.js",
-  "scripts": {
-    "test": "tap test.js --cov"
+  "_args": [
+    [
+      "abbrev@~1.0.7",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "abbrev@>=1.0.7 <1.1.0",
+  "_id": "abbrev@1.0.7",
+  "_inCache": true,
+  "_location": "/abbrev",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/isaacs/abbrev-js.git"
+  "_npmVersion": "2.10.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "abbrev",
+    "raw": "abbrev@~1.0.7",
+    "rawSpec": "~1.0.7",
+    "scope": null,
+    "spec": ">=1.0.7 <1.1.0",
+    "type": "range"
   },
-  "license": "ISC",
-  "devDependencies": {
-    "tap": "^1.2.0"
+  "_requiredBy": [
+    "/",
+    "/nopt"
+  ],
+  "_resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz",
+  "_shasum": "5b6035b2ee9d4fb5cf859f08a9be81b208491843",
+  "_shrinkwrap": null,
+  "_spec": "abbrev@~1.0.7",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter"
   },
-  "gitHead": "821d09ce7da33627f91bbd8ed631497ed6f760c2",
   "bugs": {
     "url": "https://github.com/isaacs/abbrev-js/issues"
   },
-  "homepage": "https://github.com/isaacs/abbrev-js#readme",
-  "_id": "abbrev@1.0.7",
-  "_shasum": "5b6035b2ee9d4fb5cf859f08a9be81b208491843",
-  "_from": "abbrev@>=1.0.7 <1.1.0",
-  "_npmVersion": "2.10.1",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
+  "dependencies": {},
+  "description": "Like ruby's abbrev module, but in js",
+  "devDependencies": {
+    "tap": "^1.2.0"
   },
+  "directories": {},
   "dist": {
     "shasum": "5b6035b2ee9d4fb5cf859f08a9be81b208491843",
     "tarball": "http://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
   },
+  "gitHead": "821d09ce7da33627f91bbd8ed631497ed6f760c2",
+  "homepage": "https://github.com/isaacs/abbrev-js#readme",
+  "license": "ISC",
+  "main": "abbrev.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+  "name": "abbrev",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/isaacs/abbrev-js.git"
+  },
+  "scripts": {
+    "test": "tap test.js --cov"
+  },
+  "version": "1.0.7"
 }
diff --git a/deps/npm/node_modules/columnify/node_modules/strip-ansi/node_modules/ansi-regex/index.js b/deps/npm/node_modules/ansi-regex/index.js
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/strip-ansi/node_modules/ansi-regex/index.js
rename to deps/npm/node_modules/ansi-regex/index.js
diff --git a/deps/npm/node_modules/columnify/node_modules/strip-ansi/license b/deps/npm/node_modules/ansi-regex/license
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/strip-ansi/license
rename to deps/npm/node_modules/ansi-regex/license
diff --git a/deps/npm/node_modules/columnify/node_modules/strip-ansi/node_modules/ansi-regex/package.json b/deps/npm/node_modules/ansi-regex/package.json
similarity index 54%
rename from deps/npm/node_modules/columnify/node_modules/strip-ansi/node_modules/ansi-regex/package.json
rename to deps/npm/node_modules/ansi-regex/package.json
index 7fc07677a044ac..5f3f32c654231d 100644
--- a/deps/npm/node_modules/columnify/node_modules/strip-ansi/node_modules/ansi-regex/package.json
+++ b/deps/npm/node_modules/ansi-regex/package.json
@@ -1,86 +1,114 @@
 {
-  "name": "ansi-regex",
-  "version": "2.0.0",
-  "description": "Regular expression for matching ANSI escape codes",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sindresorhus/ansi-regex.git"
+  "_args": [
+    [
+      "ansi-regex@^2.0.0",
+      "/Users/rebecca/code/npm/node_modules/chalk/node_modules/strip-ansi"
+    ]
+  ],
+  "_from": "ansi-regex@>=2.0.0 <3.0.0",
+  "_id": "ansi-regex@2.0.0",
+  "_inCache": true,
+  "_location": "/ansi-regex",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "sindresorhus@gmail.com",
+    "name": "sindresorhus"
+  },
+  "_npmVersion": "2.11.2",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "ansi-regex",
+    "raw": "ansi-regex@^2.0.0",
+    "rawSpec": "^2.0.0",
+    "scope": null,
+    "spec": ">=2.0.0 <3.0.0",
+    "type": "range"
   },
+  "_requiredBy": [
+    "/columnify/strip-ansi",
+    "/has-ansi",
+    "/strip-ansi"
+  ],
+  "_resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
+  "_shasum": "c5061b6e0ef8a81775e50f5d66151bf6bf371107",
+  "_shrinkwrap": null,
+  "_spec": "ansi-regex@^2.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/chalk/node_modules/strip-ansi",
   "author": {
-    "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
+    "name": "Sindre Sorhus",
     "url": "sindresorhus.com"
   },
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    },
-    {
-      "name": "jbnicolai",
-      "email": "jappelman@xebia.com"
-    }
-  ],
+  "bugs": {
+    "url": "https://github.com/sindresorhus/ansi-regex/issues"
+  },
+  "dependencies": {},
+  "description": "Regular expression for matching ANSI escape codes",
+  "devDependencies": {
+    "mocha": "*"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "c5061b6e0ef8a81775e50f5d66151bf6bf371107",
+    "tarball": "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+  },
   "engines": {
     "node": ">=0.10.0"
   },
-  "scripts": {
-    "test": "mocha test/test.js",
-    "view-supported": "node test/viewCodes.js"
-  },
   "files": [
     "index.js"
   ],
+  "gitHead": "57c3f2941a73079fa8b081e02a522e3d29913e2f",
+  "homepage": "https://github.com/sindresorhus/ansi-regex",
   "keywords": [
+    "256",
     "ansi",
-    "styles",
+    "cli",
     "color",
-    "colour",
     "colors",
-    "terminal",
+    "colour",
+    "command-line",
     "console",
-    "cli",
-    "string",
-    "tty",
     "escape",
+    "find",
     "formatting",
-    "rgb",
-    "256",
-    "shell",
-    "xterm",
-    "command-line",
-    "text",
+    "match",
+    "pattern",
+    "re",
     "regex",
     "regexp",
-    "re",
-    "match",
+    "rgb",
+    "shell",
+    "string",
+    "styles",
+    "terminal",
     "test",
-    "find",
-    "pattern"
+    "text",
+    "tty",
+    "xterm"
   ],
-  "devDependencies": {
-    "mocha": "*"
-  },
-  "gitHead": "57c3f2941a73079fa8b081e02a522e3d29913e2f",
-  "bugs": {
-    "url": "https://github.com/sindresorhus/ansi-regex/issues"
-  },
-  "homepage": "https://github.com/sindresorhus/ansi-regex",
-  "_id": "ansi-regex@2.0.0",
-  "_shasum": "c5061b6e0ef8a81775e50f5d66151bf6bf371107",
-  "_from": "ansi-regex@>=2.0.0 <3.0.0",
-  "_npmVersion": "2.11.2",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "name": "sindresorhus",
-    "email": "sindresorhus@gmail.com"
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "sindresorhus",
+      "email": "sindresorhus@gmail.com"
+    },
+    {
+      "name": "jbnicolai",
+      "email": "jappelman@xebia.com"
+    }
+  ],
+  "name": "ansi-regex",
+  "optionalDependencies": {},
+  "readme": "# ansi-regex [![Build Status](https://travis-ci.org/sindresorhus/ansi-regex.svg?branch=master)](https://travis-ci.org/sindresorhus/ansi-regex)\n\n> Regular expression for matching [ANSI escape codes](http://en.wikipedia.org/wiki/ANSI_escape_code)\n\n\n## Install\n\n```\n$ npm install --save ansi-regex\n```\n\n\n## Usage\n\n```js\nvar ansiRegex = require('ansi-regex');\n\nansiRegex().test('\\u001b[4mcake\\u001b[0m');\n//=> true\n\nansiRegex().test('cake');\n//=> false\n\n'\\u001b[4mcake\\u001b[0m'.match(ansiRegex());\n//=> ['\\u001b[4m', '\\u001b[0m']\n```\n\n\n## License\n\nMIT © [Sindre Sorhus](http://sindresorhus.com)\n",
+  "readmeFilename": "readme.md",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sindresorhus/ansi-regex.git"
   },
-  "dist": {
-    "shasum": "c5061b6e0ef8a81775e50f5d66151bf6bf371107",
-    "tarball": "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+  "scripts": {
+    "test": "mocha test/test.js",
+    "view-supported": "node test/viewCodes.js"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "version": "2.0.0"
 }
diff --git a/deps/npm/node_modules/columnify/node_modules/strip-ansi/node_modules/ansi-regex/readme.md b/deps/npm/node_modules/ansi-regex/readme.md
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/strip-ansi/node_modules/ansi-regex/readme.md
rename to deps/npm/node_modules/ansi-regex/readme.md
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/index.js b/deps/npm/node_modules/ansi-styles/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/index.js
rename to deps/npm/node_modules/ansi-styles/index.js
diff --git a/deps/npm/node_modules/columnify/node_modules/strip-ansi/node_modules/ansi-regex/license b/deps/npm/node_modules/ansi-styles/license
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/strip-ansi/node_modules/ansi-regex/license
rename to deps/npm/node_modules/ansi-styles/license
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/package.json b/deps/npm/node_modules/ansi-styles/package.json
similarity index 68%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/package.json
rename to deps/npm/node_modules/ansi-styles/package.json
index b6a9ceaea0fa60..98210c30fdc266 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/package.json
+++ b/deps/npm/node_modules/ansi-styles/package.json
@@ -1,80 +1,104 @@
 {
-  "name": "ansi-styles",
-  "version": "2.1.0",
-  "description": "ANSI escape codes for styling strings in the terminal",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/chalk/ansi-styles.git"
+  "_args": [
+    [
+      "ansi-styles@^2.1.0",
+      "/Users/rebecca/code/npm/node_modules/chalk"
+    ]
+  ],
+  "_from": "ansi-styles@>=2.1.0 <3.0.0",
+  "_id": "ansi-styles@2.1.0",
+  "_inCache": true,
+  "_location": "/ansi-styles",
+  "_nodeVersion": "0.12.4",
+  "_npmUser": {
+    "email": "jappelman@xebia.com",
+    "name": "jbnicolai"
   },
+  "_npmVersion": "2.10.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "ansi-styles",
+    "raw": "ansi-styles@^2.1.0",
+    "rawSpec": "^2.1.0",
+    "scope": null,
+    "spec": ">=2.1.0 <3.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/chalk"
+  ],
+  "_resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz",
+  "_shasum": "990f747146927b559a932bf92959163d60c0d0e2",
+  "_shrinkwrap": null,
+  "_spec": "ansi-styles@^2.1.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/chalk",
   "author": {
-    "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
+    "name": "Sindre Sorhus",
     "url": "sindresorhus.com"
   },
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    },
-    {
-      "name": "jbnicolai",
-      "email": "jappelman@xebia.com"
-    }
-  ],
+  "bugs": {
+    "url": "https://github.com/chalk/ansi-styles/issues"
+  },
+  "dependencies": {},
+  "description": "ANSI escape codes for styling strings in the terminal",
+  "devDependencies": {
+    "mocha": "*"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "990f747146927b559a932bf92959163d60c0d0e2",
+    "tarball": "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+  },
   "engines": {
     "node": ">=0.10.0"
   },
-  "scripts": {
-    "test": "mocha"
-  },
   "files": [
     "index.js"
   ],
+  "gitHead": "18421cbe4a2d93359ec2599a894f704be126d066",
+  "homepage": "https://github.com/chalk/ansi-styles",
   "keywords": [
+    "256",
     "ansi",
-    "styles",
+    "cli",
     "color",
-    "colour",
     "colors",
-    "terminal",
+    "colour",
+    "command-line",
     "console",
-    "cli",
-    "string",
-    "tty",
     "escape",
     "formatting",
-    "rgb",
-    "256",
-    "shell",
-    "xterm",
     "log",
     "logging",
-    "command-line",
-    "text"
+    "rgb",
+    "shell",
+    "string",
+    "styles",
+    "terminal",
+    "text",
+    "tty",
+    "xterm"
   ],
-  "devDependencies": {
-    "mocha": "*"
-  },
-  "gitHead": "18421cbe4a2d93359ec2599a894f704be126d066",
-  "bugs": {
-    "url": "https://github.com/chalk/ansi-styles/issues"
-  },
-  "homepage": "https://github.com/chalk/ansi-styles",
-  "_id": "ansi-styles@2.1.0",
-  "_shasum": "990f747146927b559a932bf92959163d60c0d0e2",
-  "_from": "ansi-styles@>=2.1.0 <3.0.0",
-  "_npmVersion": "2.10.1",
-  "_nodeVersion": "0.12.4",
-  "_npmUser": {
-    "name": "jbnicolai",
-    "email": "jappelman@xebia.com"
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "sindresorhus",
+      "email": "sindresorhus@gmail.com"
+    },
+    {
+      "name": "jbnicolai",
+      "email": "jappelman@xebia.com"
+    }
+  ],
+  "name": "ansi-styles",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/chalk/ansi-styles"
   },
-  "dist": {
-    "shasum": "990f747146927b559a932bf92959163d60c0d0e2",
-    "tarball": "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+  "scripts": {
+    "test": "mocha"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "version": "2.1.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/readme.md b/deps/npm/node_modules/ansi-styles/readme.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/readme.md
rename to deps/npm/node_modules/ansi-styles/readme.md
diff --git a/deps/npm/node_modules/ansi/.jshintrc b/deps/npm/node_modules/ansi/.jshintrc
deleted file mode 100644
index 248c5426ea63dc..00000000000000
--- a/deps/npm/node_modules/ansi/.jshintrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "laxcomma": true,
-  "asi": true
-}
diff --git a/deps/npm/node_modules/ansi/package.json b/deps/npm/node_modules/ansi/package.json
index 706ae63067694d..cdef43ffa9b855 100644
--- a/deps/npm/node_modules/ansi/package.json
+++ b/deps/npm/node_modules/ansi/package.json
@@ -1,39 +1,65 @@
 {
-  "name": "ansi",
-  "description": "Advanced ANSI formatting tool for Node.js",
-  "keywords": [
-    "ansi",
-    "formatting",
-    "cursor",
-    "color",
-    "terminal",
-    "rgb",
-    "256",
-    "stream"
+  "_args": [
+    [
+      "ansi@~0.3.0",
+      "/Users/rebecca/code/npm/node_modules/npmlog"
+    ]
   ],
-  "version": "0.3.0",
+  "_from": "ansi@>=0.3.0 <0.4.0",
+  "_id": "ansi@0.3.0",
+  "_inCache": true,
+  "_location": "/ansi",
+  "_npmUser": {
+    "email": "nathan@tootallnate.net",
+    "name": "tootallnate"
+  },
+  "_npmVersion": "1.4.9",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "ansi",
+    "raw": "ansi@~0.3.0",
+    "rawSpec": "~0.3.0",
+    "scope": null,
+    "spec": ">=0.3.0 <0.4.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/gauge",
+    "/npmlog"
+  ],
+  "_resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz",
+  "_shasum": "74b2f1f187c8553c7f95015bcb76009fb43d38e0",
+  "_shrinkwrap": null,
+  "_spec": "ansi@~0.3.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/npmlog",
   "author": {
-    "name": "Nathan Rajlich",
     "email": "nathan@tootallnate.net",
+    "name": "Nathan Rajlich",
     "url": "http://tootallnate.net"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/TooTallNate/ansi.js.git"
-  },
-  "main": "./lib/ansi.js",
   "bugs": {
     "url": "https://github.com/TooTallNate/ansi.js/issues"
   },
-  "homepage": "https://github.com/TooTallNate/ansi.js",
-  "_id": "ansi@0.3.0",
-  "_shasum": "74b2f1f187c8553c7f95015bcb76009fb43d38e0",
-  "_from": "ansi@latest",
-  "_npmVersion": "1.4.9",
-  "_npmUser": {
-    "name": "tootallnate",
-    "email": "nathan@tootallnate.net"
+  "dependencies": {},
+  "description": "Advanced ANSI formatting tool for Node.js",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "74b2f1f187c8553c7f95015bcb76009fb43d38e0",
+    "tarball": "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
   },
+  "homepage": "https://github.com/TooTallNate/ansi.js",
+  "keywords": [
+    "256",
+    "ansi",
+    "color",
+    "cursor",
+    "formatting",
+    "rgb",
+    "stream",
+    "terminal"
+  ],
+  "main": "./lib/ansi.js",
   "maintainers": [
     {
       "name": "TooTallNate",
@@ -44,11 +70,11 @@
       "email": "nathan@tootallnate.net"
     }
   ],
-  "dist": {
-    "shasum": "74b2f1f187c8553c7f95015bcb76009fb43d38e0",
-    "tarball": "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
+  "name": "ansi",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/TooTallNate/ansi.js.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "version": "0.3.0"
 }
diff --git a/deps/npm/node_modules/ansicolors/package.json b/deps/npm/node_modules/ansicolors/package.json
index bca06da296aa24..b759eb47cd3d68 100644
--- a/deps/npm/node_modules/ansicolors/package.json
+++ b/deps/npm/node_modules/ansicolors/package.json
@@ -1,34 +1,77 @@
 {
-  "name": "ansicolors",
-  "version": "0.3.2",
-  "description": "Functions that surround a string with ansicolor codes so it prints in color.",
-  "main": "ansicolors.js",
-  "scripts": {
-    "test": "node test/*.js"
+  "_args": [
+    [
+      "ansicolors@~0.3.2",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "ansicolors@>=0.3.2 <0.4.0",
+  "_id": "ansicolors@0.3.2",
+  "_inCache": true,
+  "_location": "/ansicolors",
+  "_npmUser": {
+    "email": "thlorenz@gmx.de",
+    "name": "thlorenz"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/thlorenz/ansicolors.git"
+  "_npmVersion": "1.3.11",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "ansicolors",
+    "raw": "ansicolors@~0.3.2",
+    "rawSpec": "~0.3.2",
+    "scope": null,
+    "spec": ">=0.3.2 <0.4.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz",
+  "_shasum": "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979",
+  "_shrinkwrap": null,
+  "_spec": "ansicolors@~0.3.2",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "thlorenz@gmx.de",
+    "name": "Thorsten Lorenz",
+    "url": "thlorenz.com"
+  },
+  "bugs": {
+    "url": "https://github.com/thlorenz/ansicolors/issues"
+  },
+  "dependencies": {},
+  "description": "Functions that surround a string with ansicolor codes so it prints in color.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979",
+    "tarball": "http://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"
   },
+  "gitHead": "858847ca28e8b360d9b70eee0592700fa2ab087d",
   "keywords": [
     "ansi",
     "colors",
     "highlight",
     "string"
   ],
-  "author": {
-    "name": "Thorsten Lorenz",
-    "email": "thlorenz@gmx.de",
-    "url": "thlorenz.com"
-  },
   "license": "MIT",
-  "readmeFilename": "README.md",
-  "gitHead": "858847ca28e8b360d9b70eee0592700fa2ab087d",
+  "main": "ansicolors.js",
+  "maintainers": [
+    {
+      "name": "thlorenz",
+      "email": "thlorenz@gmx.de"
+    }
+  ],
+  "name": "ansicolors",
+  "optionalDependencies": {},
   "readme": "# ansicolors [![build status](https://secure.travis-ci.org/thlorenz/ansicolors.png)](http://next.travis-ci.org/thlorenz/ansicolors)\n\nFunctions that surround a string with ansicolor codes so it prints in color.\n\nIn case you need styles, like `bold`, have a look at [ansistyles](https://github.com/thlorenz/ansistyles).\n\n## Installation\n\n    npm install ansicolors\n\n## Usage\n\n```js\nvar colors = require('ansicolors');\n\n// foreground colors\nvar redHerring = colors.red('herring');\nvar blueMoon = colors.blue('moon');\nvar brighBlueMoon = colors.brightBlue('moon');\n\nconsole.log(redHerring);      // this will print 'herring' in red\nconsole.log(blueMoon);        // this 'moon' in blue\nconsole.log(brightBlueMoon);  // I think you got the idea\n\n// background colors\nconsole.log(colors.bgYellow('printed on yellow background'));\nconsole.log(colors.bgBrightBlue('printed on bright blue background'));\n\n// mixing background and foreground colors\n// below two lines have same result (order in which bg and fg are combined doesn't matter)\nconsole.log(colors.bgYellow(colors.blue('printed on yellow background in blue')));\nconsole.log(colors.blue(colors.bgYellow('printed on yellow background in blue')));\n```\n\n## Advanced API\n\n**ansicolors** allows you to access opening and closing escape sequences separately.\n\n```js\nvar colors = require('ansicolors');\n\nfunction inspect(obj, depth) {\n  return require('util').inspect(obj, false, depth || 5, true);\n}\n\nconsole.log('open blue', inspect(colors.open.blue));\nconsole.log('close bgBlack', inspect(colors.close.bgBlack));\n\n// => open blue '\\u001b[34m'\n//    close bgBlack '\\u001b[49m'\n```\n\n## Tests\n\nLook at the [tests](https://github.com/thlorenz/ansicolors/blob/master/test/ansicolors.js) to see more examples and/or run them via: \n\n    npm explore ansicolors && npm test\n\n## Alternatives\n\n**ansicolors** tries to meet simple use cases with a very simple API. However, if you need a more powerful ansi formatting tool, \nI'd suggest to look at the [features](https://github.com/TooTallNate/ansi.js#features) of the [ansi module](https://github.com/TooTallNate/ansi.js).\n",
-  "bugs": {
-    "url": "https://github.com/thlorenz/ansicolors/issues"
+  "readmeFilename": "README.md",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/thlorenz/ansicolors.git"
   },
-  "homepage": "https://github.com/thlorenz/ansicolors",
-  "_id": "ansicolors@0.3.2",
-  "_from": "ansicolors@latest"
+  "scripts": {
+    "test": "node test/*.js"
+  },
+  "version": "0.3.2"
 }
diff --git a/deps/npm/node_modules/ansistyles/package.json b/deps/npm/node_modules/ansistyles/package.json
index dec9cd9e69a832..3f523f2e9ee34b 100644
--- a/deps/npm/node_modules/ansistyles/package.json
+++ b/deps/npm/node_modules/ansistyles/package.json
@@ -1,38 +1,77 @@
 {
-  "name": "ansistyles",
-  "version": "0.1.3",
-  "description": "Functions that surround a string with ansistyle codes so it prints in style.",
-  "main": "ansistyles.js",
-  "scripts": {
-    "test": "node test/ansistyles.js"
+  "_args": [
+    [
+      "ansistyles@~0.1.3",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "ansistyles@>=0.1.3 <0.2.0",
+  "_id": "ansistyles@0.1.3",
+  "_inCache": true,
+  "_location": "/ansistyles",
+  "_npmUser": {
+    "email": "thlorenz@gmx.de",
+    "name": "thlorenz"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/thlorenz/ansistyles.git"
+  "_npmVersion": "1.3.11",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "ansistyles",
+    "raw": "ansistyles@~0.1.3",
+    "rawSpec": "~0.1.3",
+    "scope": null,
+    "spec": ">=0.1.3 <0.2.0",
+    "type": "range"
   },
-  "keywords": [
-    "ansi",
-    "style",
-    "terminal",
-    "console"
+  "_requiredBy": [
+    "/"
   ],
+  "_resolved": "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz",
+  "_shasum": "5de60415bda071bb37127854c864f41b23254539",
+  "_shrinkwrap": null,
+  "_spec": "ansistyles@~0.1.3",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Thorsten Lorenz",
     "email": "thlorenz@gmx.de",
+    "name": "Thorsten Lorenz",
     "url": "thlorenz.com"
   },
-  "license": "MIT",
-  "readmeFilename": "README.md",
-  "gitHead": "27bf1bc65231bcc7fd109bf13b13601b51f8cd04",
-  "readme": "# ansistyles [![build status](https://secure.travis-ci.org/thlorenz/ansistyles.png)](http://next.travis-ci.org/thlorenz/ansistyles)\n\nFunctions that surround a string with ansistyle codes so it prints in style.\n\nIn case you need colors, like `red`, have a look at [ansicolors](https://github.com/thlorenz/ansicolors).\n\n## Installation\n\n    npm install ansistyles\n\n## Usage\n\n```js\nvar styles = require('ansistyles');\n\nconsole.log(styles.bright('hello world'));    // prints hello world in 'bright' white\nconsole.log(styles.underline('hello world')); // prints hello world underlined\nconsole.log(styles.inverse('hello world'));   // prints hello world black on white\n```\n\n## Combining with ansicolors\n\nGet the ansicolors module:\n\n    npm install ansicolors\n\n```js\nvar styles = require('ansistyles')\n  , colors = require('ansicolors');\n\n  console.log(\n    // prints hello world underlined in blue on a green background\n    colors.bgGreen(colors.blue(styles.underline('hello world'))) \n  );\n```\n\n## Tests\n\nLook at the [tests](https://github.com/thlorenz/ansistyles/blob/master/test/ansistyles.js) to see more examples and/or run them via: \n\n    npm explore ansistyles && npm test\n\n## More Styles\n\nAs you can see from [here](https://github.com/thlorenz/ansistyles/blob/master/ansistyles.js#L4-L15), more styles are available,\nbut didn't have any effect on the terminals that I tested on Mac Lion and Ubuntu Linux.\n\nI included them for completeness, but didn't show them in the examples because they seem to have no effect.\n\n### reset\n\nA style reset function is also included, please note however that this is not nestable.\n\nTherefore the below only underlines `hell` only, but not `world`.\n\n```js\nconsole.log(styles.underline('hell' + styles.reset('o') + ' world'));\n```\n\nIt is essentially the same as:\n\n```js\nconsole.log(styles.underline('hell') + styles.reset('') + 'o world');\n```\n\n\n\n## Alternatives\n\n**ansistyles** tries to meet simple use cases with a very simple API. However, if you need a more powerful ansi formatting tool, \nI'd suggest to look at the [features](https://github.com/TooTallNate/ansi.js#features) of the [ansi module](https://github.com/TooTallNate/ansi.js).\n",
   "bugs": {
     "url": "https://github.com/thlorenz/ansistyles/issues"
   },
-  "homepage": "https://github.com/thlorenz/ansistyles",
-  "_id": "ansistyles@0.1.3",
+  "dependencies": {},
+  "description": "Functions that surround a string with ansistyle codes so it prints in style.",
+  "devDependencies": {},
+  "directories": {},
   "dist": {
-    "shasum": "b14f315fe763a2b3a88df9d3261a517e666c4615"
+    "shasum": "5de60415bda071bb37127854c864f41b23254539",
+    "tarball": "http://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"
+  },
+  "gitHead": "27bf1bc65231bcc7fd109bf13b13601b51f8cd04",
+  "keywords": [
+    "ansi",
+    "console",
+    "style",
+    "terminal"
+  ],
+  "license": "MIT",
+  "main": "ansistyles.js",
+  "maintainers": [
+    {
+      "name": "thlorenz",
+      "email": "thlorenz@gmx.de"
+    }
+  ],
+  "name": "ansistyles",
+  "optionalDependencies": {},
+  "readme": "# ansistyles [![build status](https://secure.travis-ci.org/thlorenz/ansistyles.png)](http://next.travis-ci.org/thlorenz/ansistyles)\n\nFunctions that surround a string with ansistyle codes so it prints in style.\n\nIn case you need colors, like `red`, have a look at [ansicolors](https://github.com/thlorenz/ansicolors).\n\n## Installation\n\n    npm install ansistyles\n\n## Usage\n\n```js\nvar styles = require('ansistyles');\n\nconsole.log(styles.bright('hello world'));    // prints hello world in 'bright' white\nconsole.log(styles.underline('hello world')); // prints hello world underlined\nconsole.log(styles.inverse('hello world'));   // prints hello world black on white\n```\n\n## Combining with ansicolors\n\nGet the ansicolors module:\n\n    npm install ansicolors\n\n```js\nvar styles = require('ansistyles')\n  , colors = require('ansicolors');\n\n  console.log(\n    // prints hello world underlined in blue on a green background\n    colors.bgGreen(colors.blue(styles.underline('hello world'))) \n  );\n```\n\n## Tests\n\nLook at the [tests](https://github.com/thlorenz/ansistyles/blob/master/test/ansistyles.js) to see more examples and/or run them via: \n\n    npm explore ansistyles && npm test\n\n## More Styles\n\nAs you can see from [here](https://github.com/thlorenz/ansistyles/blob/master/ansistyles.js#L4-L15), more styles are available,\nbut didn't have any effect on the terminals that I tested on Mac Lion and Ubuntu Linux.\n\nI included them for completeness, but didn't show them in the examples because they seem to have no effect.\n\n### reset\n\nA style reset function is also included, please note however that this is not nestable.\n\nTherefore the below only underlines `hell` only, but not `world`.\n\n```js\nconsole.log(styles.underline('hell' + styles.reset('o') + ' world'));\n```\n\nIt is essentially the same as:\n\n```js\nconsole.log(styles.underline('hell') + styles.reset('') + 'o world');\n```\n\n\n\n## Alternatives\n\n**ansistyles** tries to meet simple use cases with a very simple API. However, if you need a more powerful ansi formatting tool, \nI'd suggest to look at the [features](https://github.com/TooTallNate/ansi.js#features) of the [ansi module](https://github.com/TooTallNate/ansi.js).\n",
+  "readmeFilename": "README.md",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/thlorenz/ansistyles.git"
+  },
+  "scripts": {
+    "test": "node test/ansistyles.js"
   },
-  "_from": "ansistyles@0.1.3",
-  "_resolved": "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"
+  "version": "0.1.3"
 }
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/.npmignore b/deps/npm/node_modules/aproba/.npmignore
similarity index 65%
rename from deps/npm/node_modules/minimatch/node_modules/brace-expansion/.npmignore
rename to deps/npm/node_modules/aproba/.npmignore
index 249bc20eb5573c..24001896d6d0c9 100644
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/.npmignore
+++ b/deps/npm/node_modules/aproba/.npmignore
@@ -1,2 +1,3 @@
+*~
 node_modules
-*.sw*
+.#*
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/LICENSE b/deps/npm/node_modules/aproba/LICENSE
similarity index 83%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/LICENSE
rename to deps/npm/node_modules/aproba/LICENSE
index 05eeeb88c2ef4c..2a4982dc40cb69 100644
--- a/deps/npm/node_modules/init-package-json/node_modules/promzard/LICENSE
+++ b/deps/npm/node_modules/aproba/LICENSE
@@ -1,6 +1,4 @@
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter
+Copyright (c) 2015, Rebecca Turner <me@re-becca.org>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -11,5 +9,5 @@ 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.
+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/deps/npm/node_modules/aproba/README.md b/deps/npm/node_modules/aproba/README.md
new file mode 100644
index 00000000000000..e5c1f5595b8e2a
--- /dev/null
+++ b/deps/npm/node_modules/aproba/README.md
@@ -0,0 +1,54 @@
+aproba
+======
+
+A rediculously light-weight function argument validator
+
+```
+var validate = require("aproba")
+
+function myfunc(a, b, c) {
+  // `a` must be a string, `b` a number, `c` a function
+  validate('SNF', arguments) // [a,b,c] is also valid
+}
+
+myfunc('test', 23, function () {}) // ok
+myfunc(123, 23, function () {}) // type error
+myfunc('test', 23) // missing arg error
+myfunc('test', 23, function () {}, true) // too many args error
+
+```
+
+Valid types are:
+
+type | description
+---- | -----------
+*    | matches any type
+A    | instanceof Array OR an arguments object
+S    | typeof == string
+N    | typeof == number
+F    | typeof == function
+O    | typeof == object and not type A and not type E
+B    | typeof == boolean
+E    | instanceof Error OR null
+
+Validation failures throw one of three exception types, distinguished by a
+`code` property of `EMISSINGARG`, `EINVALIDTYPE` or `ETOOMANYARGS`.
+
+If an error argument is found and is not null then the remaining arguments will not be validated.
+
+### Why this exists
+
+I wanted a very simple argument validator. It needed to do two things:
+
+1. Be more concise and easier to use than assertions
+
+2. Not encourage an infinite bikeshed of DSLs
+
+This is why types are specified by a single character and there's no such
+thing as an optional argument.
+
+This is not intended to validate user data. This is specifically about
+asserting the interface of your functions.
+
+If you need greater validation, I encourage you to write them by hand or
+look elsewhere.
diff --git a/deps/npm/node_modules/aproba/index.js b/deps/npm/node_modules/aproba/index.js
new file mode 100644
index 00000000000000..7d8ff07f87a4c0
--- /dev/null
+++ b/deps/npm/node_modules/aproba/index.js
@@ -0,0 +1,53 @@
+"use strict"
+
+var types = {
+  "*": ["any", function () { return true }],
+  A: ["array", function (thingy) { return thingy instanceof Array || (typeof thingy === "object" && thingy.hasOwnProperty("callee")) }],
+  S: ["string", function (thingy) { return typeof thingy === "string" }],
+  N: ["number", function (thingy) { return typeof thingy === "number" }],
+  F: ["function", function (thingy) { return typeof thingy === "function" }],
+  O: ["object", function (thingy) { return typeof thingy === "object" && !types.A[1](thingy) && !types.E[1](thingy) }],
+  B: ["boolean", function (thingy) { return typeof thingy == "boolean" }],
+  E: ["error", function (thingy) { return thingy instanceof Error }]
+}
+
+var validate = module.exports = function (schema, args) {
+  if (!schema) throw missingRequiredArg(0, "schema")
+  if (!args) throw missingRequiredArg(1, "args")
+  if (!types.S[1](schema)) throw invalidType(0, "string", schema)
+  if (!types.A[1](args)) throw invalidType(1, "array", args)
+  for (var ii = 0; ii < schema.length; ++ii) {
+    var type = schema[ii]
+    if (!types[type]) throw unknownType(ii, type)
+    var typeLabel = types[type][0]
+    var typeCheck = types[type][1]
+    if (type === "E" && args[ii] == null) continue
+    if (args[ii] == null) throw missingRequiredArg(ii)
+    if (!typeCheck(args[ii])) throw invalidType(ii, typeLabel, args[ii])
+    if (type === "E") return
+  }
+  if (schema.length < args.length) throw tooManyArgs(schema.length, args.length)
+}
+
+function missingRequiredArg(num) {
+  return newException("EMISSINGARG", "Missing required argument #"+(num+1))
+}
+
+function unknownType(num, type) {
+  return newException("EUNKNOWNTYPE", "Unknown type "+type+" in argument #"+(num+1))
+}
+
+function invalidType(num, type, value) {
+  return newException("EINVALIDTYPE", "Argument #"+(num+1)+": Expected "+type+" but got "+typeof value)
+}
+
+function tooManyArgs(expected, got) {
+  return newException("ETOOMANYARGS", "Too many arguments, expected "+expected+" and got "+got)
+}
+
+function newException(code, msg) {
+  var e = new Error(msg)
+  e.code = code
+  Error.captureStackTrace(e, validate)
+  return e
+}
diff --git a/deps/npm/node_modules/aproba/package.json b/deps/npm/node_modules/aproba/package.json
new file mode 100644
index 00000000000000..16f35b0a5541d6
--- /dev/null
+++ b/deps/npm/node_modules/aproba/package.json
@@ -0,0 +1,77 @@
+{
+  "_args": [
+    [
+      "aproba@~1.0.1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "aproba@>=1.0.1 <1.1.0",
+  "_id": "aproba@1.0.1",
+  "_inCache": true,
+  "_location": "/aproba",
+  "_nodeVersion": "1.6.2",
+  "_npmUser": {
+    "email": "me@re-becca.org",
+    "name": "iarna"
+  },
+  "_npmVersion": "2.7.5",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "aproba",
+    "raw": "aproba@~1.0.1",
+    "rawSpec": "~1.0.1",
+    "scope": null,
+    "spec": ">=1.0.1 <1.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_shasum": "c4ac2cc5becfb8b099de7ef9f02790e7d32d99ef",
+  "_shrinkwrap": null,
+  "_spec": "aproba@~1.0.1",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "me@re-becca.org",
+    "name": "Rebecca Turner"
+  },
+  "bugs": {
+    "url": "https://github.com/iarna/aproba/issues"
+  },
+  "dependencies": {},
+  "description": "A rediculously light-weight argument validator",
+  "devDependencies": {
+    "tap": "^0.7.0"
+  },
+  "directories": {
+    "test": "test"
+  },
+  "dist": {
+    "shasum": "c4ac2cc5becfb8b099de7ef9f02790e7d32d99ef",
+    "tarball": "http://registry.npmjs.org/aproba/-/aproba-1.0.1.tgz"
+  },
+  "gitHead": "a2ea029793a14cddb9457afd0a83dc421889c7ad",
+  "homepage": "https://github.com/iarna/aproba",
+  "keywords": [
+    "argument",
+    "validate"
+  ],
+  "license": "ISC",
+  "main": "index.js",
+  "maintainers": [
+    {
+      "name": "iarna",
+      "email": "me@re-becca.org"
+    }
+  ],
+  "name": "aproba",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/iarna/aproba"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.0.1"
+}
diff --git a/deps/npm/node_modules/aproba/test/index.js b/deps/npm/node_modules/aproba/test/index.js
new file mode 100644
index 00000000000000..0574709c8f5d7d
--- /dev/null
+++ b/deps/npm/node_modules/aproba/test/index.js
@@ -0,0 +1,85 @@
+"use strict"
+var test = require("tap").test
+var validate = require("../index.js")
+
+function thrown (t, code, msg, todo) {
+  validate("OSSF", arguments)
+  try {
+    todo()
+    t.fail(msg)
+  }
+  catch (e) {
+    t.is(e.code, code, msg + e.message)
+  }
+}
+
+function notThrown (t, msg, todo) {
+  validate("OSF", arguments)
+  try {
+    todo()
+    t.pass(msg)
+  }
+  catch (e) {
+    t.fail(msg+"\n"+e.stack)
+  }
+}
+
+test("general", function (t) {
+  t.plan(69)
+  var values = {
+    "A": [],
+    "S": "test",
+    "N": 123,
+    "F": function () {},
+    "O": {},
+    "B": false,
+    "E": new Error()
+  }
+  Object.keys(values).forEach(function (type) {
+    Object.keys(values).forEach(function (contraType) {
+      if (type === contraType) {
+        notThrown(t, type + " matches " + contraType, function () {
+          validate(type, [values[contraType]])
+        })
+      }
+      else {
+        thrown(t, "EINVALIDTYPE", type + " does not match " + contraType, function () {
+          validate(type, [values[contraType]])
+        })
+      }
+    })
+    if (type === "E") {
+      notThrown(t, "null is ok for E", function () {
+        validate(type, [null])
+      })
+    }
+    else {
+      thrown(t, "EMISSINGARG", "null not ok for "+type, function () {
+        validate(type, [null])
+      })
+    }
+  })
+  Object.keys(values).forEach(function (contraType) {
+    notThrown(t, "* matches " + contraType, function () {
+      validate("*", [values[contraType]])
+    })
+  })
+  thrown(t, "EMISSINGARG", "not enough args", function () {
+    validate("SNF", ["abc", 123])
+  })
+  thrown(t, "ETOOMANYARGS", "too many args", function () {
+    validate("SNF", ["abc", 123, function () {}, true])
+  })
+  notThrown(t, "E matches null", function () {
+    validate("E", [null])
+  })
+  notThrown(t, "E matches undefined", function () {
+    validate("E", [undefined])
+  })
+  notThrown(t, "E w/ error requires nothing else", function () {
+    validate("ESN", [new Error(), "foo"])
+  })
+  thrown(t, "EMISSINGARG", "E w/o error works as usual", function () {
+    validate("ESN", [null, "foo"])
+  })
+})
diff --git a/deps/npm/node_modules/request/node_modules/stringstream/.travis.yml b/deps/npm/node_modules/archy/.travis.yml
similarity index 81%
rename from deps/npm/node_modules/request/node_modules/stringstream/.travis.yml
rename to deps/npm/node_modules/archy/.travis.yml
index f1d0f13c8a54d0..895dbd36234210 100644
--- a/deps/npm/node_modules/request/node_modules/stringstream/.travis.yml
+++ b/deps/npm/node_modules/archy/.travis.yml
@@ -1,4 +1,4 @@
 language: node_js
 node_js:
-  - 0.4
   - 0.6
+  - 0.8
diff --git a/deps/npm/node_modules/archy/package.json b/deps/npm/node_modules/archy/package.json
index 4b3da6637268ca..9c7188b9cc9cae 100644
--- a/deps/npm/node_modules/archy/package.json
+++ b/deps/npm/node_modules/archy/package.json
@@ -1,24 +1,83 @@
 {
-  "name": "archy",
-  "version": "1.0.0",
+  "_args": [
+    [
+      "archy@~1.0.0",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "archy@>=1.0.0 <1.1.0",
+  "_id": "archy@1.0.0",
+  "_inCache": true,
+  "_location": "/archy",
+  "_npmUser": {
+    "email": "mail@substack.net",
+    "name": "substack"
+  },
+  "_npmVersion": "1.4.25",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "archy",
+    "raw": "archy@~1.0.0",
+    "rawSpec": "~1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <1.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+  "_shasum": "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40",
+  "_shrinkwrap": null,
+  "_spec": "archy@~1.0.0",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "mail@substack.net",
+    "name": "James Halliday",
+    "url": "http://substack.net"
+  },
+  "bugs": {
+    "url": "https://github.com/substack/node-archy/issues"
+  },
+  "dependencies": {},
   "description": "render nested hierarchies `npm ls` style with unicode pipes",
-  "main": "index.js",
   "devDependencies": {
     "tap": "~0.3.3",
     "tape": "~0.1.1"
   },
+  "directories": {},
+  "dist": {
+    "shasum": "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40",
+    "tarball": "http://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
+  },
+  "gitHead": "30223c16191e877bf027b15b12daf077b9b55b84",
+  "homepage": "https://github.com/substack/node-archy",
+  "keywords": [
+    "hierarchy",
+    "npm ls",
+    "pretty",
+    "print",
+    "unicode"
+  ],
+  "license": "MIT",
+  "main": "index.js",
+  "maintainers": [
+    {
+      "name": "substack",
+      "email": "mail@substack.net"
+    }
+  ],
+  "name": "archy",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "http://github.com/substack/node-archy.git"
+  },
   "scripts": {
     "test": "tap test"
   },
   "testling": {
-    "files": "test/*.js",
     "browsers": {
-      "iexplore": [
-        "6.0",
-        "7.0",
-        "8.0",
-        "9.0"
-      ],
       "chrome": [
         "20.0"
       ],
@@ -26,54 +85,20 @@
         "10.0",
         "15.0"
       ],
-      "safari": [
-        "5.1"
+      "iexplore": [
+        "6.0",
+        "7.0",
+        "8.0",
+        "9.0"
       ],
       "opera": [
         "12.0"
+      ],
+      "safari": [
+        "5.1"
       ]
-    }
-  },
-  "repository": {
-    "type": "git",
-    "url": "http://github.com/substack/node-archy.git"
-  },
-  "keywords": [
-    "hierarchy",
-    "npm ls",
-    "unicode",
-    "pretty",
-    "print"
-  ],
-  "author": {
-    "name": "James Halliday",
-    "email": "mail@substack.net",
-    "url": "http://substack.net"
-  },
-  "license": "MIT",
-  "gitHead": "30223c16191e877bf027b15b12daf077b9b55b84",
-  "bugs": {
-    "url": "https://github.com/substack/node-archy/issues"
-  },
-  "homepage": "https://github.com/substack/node-archy",
-  "_id": "archy@1.0.0",
-  "_shasum": "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40",
-  "_from": "archy@>=1.0.0 <2.0.0",
-  "_npmVersion": "1.4.25",
-  "_npmUser": {
-    "name": "substack",
-    "email": "mail@substack.net"
-  },
-  "maintainers": [
-    {
-      "name": "substack",
-      "email": "mail@substack.net"
-    }
-  ],
-  "dist": {
-    "shasum": "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40",
-    "tarball": "http://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
+    },
+    "files": "test/*.js"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
+  "version": "1.0.0"
 }
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/.npmignore b/deps/npm/node_modules/are-we-there-yet/.npmignore
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/.npmignore
rename to deps/npm/node_modules/are-we-there-yet/.npmignore
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/README.md b/deps/npm/node_modules/are-we-there-yet/README.md
similarity index 99%
rename from deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/README.md
rename to deps/npm/node_modules/are-we-there-yet/README.md
index 52f9f9ae1ed4a2..3491c5956cc236 100644
--- a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/README.md
+++ b/deps/npm/node_modules/are-we-there-yet/README.md
@@ -25,7 +25,7 @@ single.completeWork(20)
 console.log(top.completed()) // 0.2
 
 fs.stat("file", function(er, stat) {
-  if (er) throw er  
+  if (er) throw er
   var stream = top.newStream("file", stat.size)
   console.log(top.completed()) // now 0.1 as single is 50% of the job and is 20% complete
                               // and 50% * 20% == 10%
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/index.js b/deps/npm/node_modules/are-we-there-yet/index.js
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/index.js
rename to deps/npm/node_modules/are-we-there-yet/index.js
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/package.json b/deps/npm/node_modules/are-we-there-yet/package.json
similarity index 63%
rename from deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/package.json
rename to deps/npm/node_modules/are-we-there-yet/package.json
index 759100666932a3..008eec8352374d 100644
--- a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/package.json
+++ b/deps/npm/node_modules/are-we-there-yet/package.json
@@ -1,51 +1,74 @@
 {
-  "name": "are-we-there-yet",
-  "version": "1.0.4",
-  "description": "Keep track of the overall completion of many dispirate processes",
-  "main": "index.js",
-  "scripts": {
-    "test": "tap test/*.js"
+  "_args": [
+    [
+      "are-we-there-yet@~1.0.0",
+      "/Users/rebecca/code/npm/node_modules/npmlog"
+    ]
+  ],
+  "_from": "are-we-there-yet@>=1.0.0 <1.1.0",
+  "_id": "are-we-there-yet@1.0.4",
+  "_inCache": true,
+  "_location": "/are-we-there-yet",
+  "_npmUser": {
+    "email": "me@re-becca.org",
+    "name": "iarna"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/iarna/are-we-there-yet.git"
+  "_npmVersion": "2.0.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "are-we-there-yet",
+    "raw": "are-we-there-yet@~1.0.0",
+    "rawSpec": "~1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <1.1.0",
+    "type": "range"
   },
+  "_requiredBy": [
+    "/npmlog"
+  ],
+  "_resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+  "_shasum": "527fe389f7bcba90806106b99244eaa07e886f85",
+  "_shrinkwrap": null,
+  "_spec": "are-we-there-yet@~1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/npmlog",
   "author": {
     "name": "Rebecca Turner",
     "url": "http://re-becca.org"
   },
-  "license": "ISC",
   "bugs": {
     "url": "https://github.com/iarna/are-we-there-yet/issues"
   },
-  "homepage": "https://github.com/iarna/are-we-there-yet",
-  "devDependencies": {
-    "tap": "^0.4.13"
-  },
   "dependencies": {
     "delegates": "^0.1.0",
     "readable-stream": "^1.1.13"
   },
-  "gitHead": "7ce414849b81ab83935a935275def01914821bde",
-  "_id": "are-we-there-yet@1.0.4",
-  "_shasum": "527fe389f7bcba90806106b99244eaa07e886f85",
-  "_from": "are-we-there-yet@>=1.0.0 <1.1.0",
-  "_npmVersion": "2.0.0",
-  "_npmUser": {
-    "name": "iarna",
-    "email": "me@re-becca.org"
+  "description": "Keep track of the overall completion of many dispirate processes",
+  "devDependencies": {
+    "tap": "^0.4.13"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "527fe389f7bcba90806106b99244eaa07e886f85",
+    "tarball": "http://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz"
   },
+  "gitHead": "7ce414849b81ab83935a935275def01914821bde",
+  "homepage": "https://github.com/iarna/are-we-there-yet",
+  "license": "ISC",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "iarna",
       "email": "me@re-becca.org"
     }
   ],
-  "dist": {
-    "shasum": "527fe389f7bcba90806106b99244eaa07e886f85",
-    "tarball": "http://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz"
+  "name": "are-we-there-yet",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/iarna/are-we-there-yet.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.0.4"
 }
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/test/tracker.js b/deps/npm/node_modules/are-we-there-yet/test/tracker.js
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/test/tracker.js
rename to deps/npm/node_modules/are-we-there-yet/test/tracker.js
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/test/trackergroup.js b/deps/npm/node_modules/are-we-there-yet/test/trackergroup.js
similarity index 99%
rename from deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/test/trackergroup.js
rename to deps/npm/node_modules/are-we-there-yet/test/trackergroup.js
index a64e121c03a1f1..f97e1034ff9e07 100644
--- a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/test/trackergroup.js
+++ b/deps/npm/node_modules/are-we-there-yet/test/trackergroup.js
@@ -49,7 +49,7 @@ test("TrackerGroup", function (t) {
     t.is(er, null, "finishAll: on change event fired")
     t.is(onChangeName, name, "finishAll: on change emits the correct name")
     t.is(track.completed(), 1, "Finishing everything ")
-    
+
     track = new TrackerGroup(name)
     a = track.newItem("a", 10, 2)
     b = track.newItem("b", 10, 1)
@@ -68,7 +68,7 @@ test("TrackerGroup", function (t) {
     t.is(er, null, "weightedFinishAll: on change event fired")
     t.is(onChangeName, name, "weightedFinishAll: on change emits the correct name")
     t.is(track.completed(), 1, "weightedFinishaAll: Finishing everything ")
-    
+
     track = new TrackerGroup(name)
     a = track.newGroup("a", 10)
     b = track.newGroup("b", 10)
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/test/trackerstream.js b/deps/npm/node_modules/are-we-there-yet/test/trackerstream.js
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/test/trackerstream.js
rename to deps/npm/node_modules/are-we-there-yet/test/trackerstream.js
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/.npmignore b/deps/npm/node_modules/array-index/.npmignore
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/.npmignore
rename to deps/npm/node_modules/array-index/.npmignore
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/.travis.yml b/deps/npm/node_modules/array-index/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/.travis.yml
rename to deps/npm/node_modules/array-index/.travis.yml
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/History.md b/deps/npm/node_modules/array-index/History.md
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/History.md
rename to deps/npm/node_modules/array-index/History.md
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/Makefile b/deps/npm/node_modules/array-index/Makefile
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/Makefile
rename to deps/npm/node_modules/array-index/Makefile
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/README.md b/deps/npm/node_modules/array-index/README.md
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/README.md
rename to deps/npm/node_modules/array-index/README.md
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/component.json b/deps/npm/node_modules/array-index/component.json
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/component.json
rename to deps/npm/node_modules/array-index/component.json
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/index.js b/deps/npm/node_modules/array-index/index.js
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/index.js
rename to deps/npm/node_modules/array-index/index.js
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json b/deps/npm/node_modules/array-index/package.json
similarity index 65%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json
rename to deps/npm/node_modules/array-index/package.json
index 6ba9df72c29bc3..a30106a99b33e1 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json
+++ b/deps/npm/node_modules/array-index/package.json
@@ -1,58 +1,82 @@
 {
-  "name": "array-index",
-  "description": "Invoke getter/setter functions on array-like objects",
-  "keywords": [
-    "index",
-    "array",
-    "getter",
-    "setter",
-    "proxy"
+  "_args": [
+    [
+      "array-index@~0.1.0",
+      "/Users/rebecca/code/npm/node_modules/path-array"
+    ]
+  ],
+  "_from": "array-index@>=0.1.0 <0.2.0",
+  "_id": "array-index@0.1.1",
+  "_inCache": true,
+  "_location": "/array-index",
+  "_nodeVersion": "0.10.32",
+  "_npmUser": {
+    "email": "nathan@tootallnate.net",
+    "name": "tootallnate"
+  },
+  "_npmVersion": "2.1.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "array-index",
+    "raw": "array-index@~0.1.0",
+    "rawSpec": "~0.1.0",
+    "scope": null,
+    "spec": ">=0.1.0 <0.2.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/path-array"
   ],
-  "version": "0.1.1",
+  "_resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
+  "_shasum": "4d5eaf06cc3d925847cd73d1535c217ba306d3e1",
+  "_shrinkwrap": null,
+  "_spec": "array-index@~0.1.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/path-array",
   "author": {
-    "name": "Nathan Rajlich",
     "email": "nathan@tootallnate.net",
+    "name": "Nathan Rajlich",
     "url": "http://tootallnate.net"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/TooTallNate/array-index.git"
-  },
-  "main": "index.js",
-  "scripts": {
-    "test": "node test"
+  "bugs": {
+    "url": "https://github.com/TooTallNate/array-index/issues"
   },
   "dependencies": {
     "debug": "*"
   },
+  "description": "Invoke getter/setter functions on array-like objects",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "4d5eaf06cc3d925847cd73d1535c217ba306d3e1",
+    "tarball": "http://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz"
+  },
   "engines": {
     "node": "*"
   },
   "gitHead": "65a5d884f25b4b7a1608e367d715d713dbd3b3d6",
-  "bugs": {
-    "url": "https://github.com/TooTallNate/array-index/issues"
-  },
   "homepage": "https://github.com/TooTallNate/array-index",
-  "_id": "array-index@0.1.1",
-  "_shasum": "4d5eaf06cc3d925847cd73d1535c217ba306d3e1",
-  "_from": "array-index@>=0.1.0 <0.2.0",
-  "_npmVersion": "2.1.3",
-  "_nodeVersion": "0.10.32",
-  "_npmUser": {
-    "name": "tootallnate",
-    "email": "nathan@tootallnate.net"
-  },
+  "keywords": [
+    "array",
+    "getter",
+    "index",
+    "proxy",
+    "setter"
+  ],
+  "main": "index.js",
   "maintainers": [
     {
       "name": "tootallnate",
       "email": "nathan@tootallnate.net"
     }
   ],
-  "dist": {
-    "shasum": "4d5eaf06cc3d925847cd73d1535c217ba306d3e1",
-    "tarball": "http://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz"
+  "name": "array-index",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/TooTallNate/array-index.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "node test"
+  },
+  "version": "0.1.1"
 }
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/test.js b/deps/npm/node_modules/array-index/test.js
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/test.js
rename to deps/npm/node_modules/array-index/test.js
diff --git a/deps/npm/node_modules/dezalgo/node_modules/asap/CHANGES.md b/deps/npm/node_modules/asap/CHANGES.md
similarity index 100%
rename from deps/npm/node_modules/dezalgo/node_modules/asap/CHANGES.md
rename to deps/npm/node_modules/asap/CHANGES.md
diff --git a/deps/npm/node_modules/dezalgo/node_modules/asap/LICENSE.md b/deps/npm/node_modules/asap/LICENSE.md
similarity index 99%
rename from deps/npm/node_modules/dezalgo/node_modules/asap/LICENSE.md
rename to deps/npm/node_modules/asap/LICENSE.md
index ba18c61390db9a..0d82d695f7a242 100644
--- a/deps/npm/node_modules/dezalgo/node_modules/asap/LICENSE.md
+++ b/deps/npm/node_modules/asap/LICENSE.md
@@ -18,4 +18,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
-
diff --git a/deps/npm/node_modules/dezalgo/node_modules/asap/README.md b/deps/npm/node_modules/asap/README.md
similarity index 99%
rename from deps/npm/node_modules/dezalgo/node_modules/asap/README.md
rename to deps/npm/node_modules/asap/README.md
index 452fd8c2037099..d60a08a044d9c2 100644
--- a/deps/npm/node_modules/dezalgo/node_modules/asap/README.md
+++ b/deps/npm/node_modules/asap/README.md
@@ -234,4 +234,3 @@ browser-only implementation.
 
 Copyright 2009-2014 by Contributors
 MIT License (enclosed)
-
diff --git a/deps/npm/node_modules/dezalgo/node_modules/asap/asap.js b/deps/npm/node_modules/asap/asap.js
similarity index 99%
rename from deps/npm/node_modules/dezalgo/node_modules/asap/asap.js
rename to deps/npm/node_modules/asap/asap.js
index f04fcd58fc0b22..3a27c8cee7a597 100644
--- a/deps/npm/node_modules/dezalgo/node_modules/asap/asap.js
+++ b/deps/npm/node_modules/asap/asap.js
@@ -62,4 +62,3 @@ RawTask.prototype.call = function () {
         freeTasks.push(this);
     }
 };
-
diff --git a/deps/npm/node_modules/dezalgo/node_modules/asap/browser-asap.js b/deps/npm/node_modules/asap/browser-asap.js
similarity index 100%
rename from deps/npm/node_modules/dezalgo/node_modules/asap/browser-asap.js
rename to deps/npm/node_modules/asap/browser-asap.js
diff --git a/deps/npm/node_modules/dezalgo/node_modules/asap/browser-raw.js b/deps/npm/node_modules/asap/browser-raw.js
similarity index 100%
rename from deps/npm/node_modules/dezalgo/node_modules/asap/browser-raw.js
rename to deps/npm/node_modules/asap/browser-raw.js
diff --git a/deps/npm/node_modules/dezalgo/node_modules/asap/package.json b/deps/npm/node_modules/asap/package.json
similarity index 75%
rename from deps/npm/node_modules/dezalgo/node_modules/asap/package.json
rename to deps/npm/node_modules/asap/package.json
index e01b3f06de9ed2..6c4417126b110b 100644
--- a/deps/npm/node_modules/dezalgo/node_modules/asap/package.json
+++ b/deps/npm/node_modules/asap/package.json
@@ -1,44 +1,47 @@
 {
-  "name": "asap",
-  "version": "2.0.3",
-  "description": "High-priority task queue for Node.js and browsers",
-  "keywords": [
-    "event",
-    "task",
-    "queue"
+  "_args": [
+    [
+      "asap@^2.0.0",
+      "/Users/rebecca/code/npm/node_modules/dezalgo"
+    ]
   ],
-  "license": {
-    "type": "MIT",
-    "url": "https://github.com/kriskowal/asap/raw/master/LICENSE.md"
+  "_from": "asap@>=2.0.0 <3.0.0",
+  "_id": "asap@2.0.3",
+  "_inCache": true,
+  "_location": "/asap",
+  "_nodeVersion": "1.8.1",
+  "_npmUser": {
+    "email": "kris.kowal@cixar.com",
+    "name": "kriskowal"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/kriskowal/asap.git"
+  "_npmVersion": "2.8.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "asap",
+    "raw": "asap@^2.0.0",
+    "rawSpec": "^2.0.0",
+    "scope": null,
+    "spec": ">=2.0.0 <3.0.0",
+    "type": "range"
   },
-  "main": "./asap.js",
+  "_requiredBy": [
+    "/dezalgo"
+  ],
+  "_resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz",
+  "_shasum": "1fc1d1564ee11620dfca6d67029850913f9f4679",
+  "_shrinkwrap": null,
+  "_spec": "asap@^2.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/dezalgo",
   "browser": {
     "./asap.js": "./browser-asap.js",
     "./raw.js": "./browser-raw.js",
     "./test/domain.js": "./test/browser-domain.js"
   },
-  "files": [
-    "raw.js",
-    "asap.js",
-    "browser-raw.js",
-    "browser-asap.js"
-  ],
-  "scripts": {
-    "test": "npm run lint && npm run test-node",
-    "test-travis": "npm run lint && npm run test-node && npm run test-saucelabs && npm run test-saucelabs-worker",
-    "test-node": "node test/asap-test.js",
-    "test-publish": "node scripts/publish-bundle.js test/asap-test.js | pbcopy",
-    "test-browser": "node scripts/publish-bundle.js test/asap-test.js | xargs opener",
-    "test-saucelabs": "node scripts/saucelabs.js test/asap-test.js scripts/saucelabs-spot-configurations.json",
-    "test-saucelabs-all": "node scripts/saucelabs.js test/asap-test.js scripts/saucelabs-all-configurations.json",
-    "test-saucelabs-worker": "node scripts/saucelabs-worker-test.js scripts/saucelabs-spot-configurations.json",
-    "test-saucelabs-worker-all": "node scripts/saucelabs-worker-test.js scripts/saucelabs-all-configurations.json",
-    "lint": "jshint raw.js asap.js browser-raw.js browser-asap.js $(find scripts -name '*.js' | grep -v gauntlet)"
+  "bugs": {
+    "url": "https://github.com/kriskowal/asap/issues"
   },
+  "dependencies": {},
+  "description": "High-priority task queue for Node.js and browsers",
   "devDependencies": {
     "events": "^1.0.1",
     "jshint": "^2.5.1",
@@ -51,20 +54,29 @@
     "wd": "^0.2.21",
     "weak-map": "^1.0.5"
   },
-  "gitHead": "ccbf94d4e4a0c3afc2df13331044020a46a74ab6",
-  "bugs": {
-    "url": "https://github.com/kriskowal/asap/issues"
+  "directories": {},
+  "dist": {
+    "shasum": "1fc1d1564ee11620dfca6d67029850913f9f4679",
+    "tarball": "http://registry.npmjs.org/asap/-/asap-2.0.3.tgz"
   },
+  "files": [
+    "asap.js",
+    "browser-asap.js",
+    "browser-raw.js",
+    "raw.js"
+  ],
+  "gitHead": "ccbf94d4e4a0c3afc2df13331044020a46a74ab6",
   "homepage": "https://github.com/kriskowal/asap#readme",
-  "_id": "asap@2.0.3",
-  "_shasum": "1fc1d1564ee11620dfca6d67029850913f9f4679",
-  "_from": "asap@>=2.0.0 <3.0.0",
-  "_npmVersion": "2.8.3",
-  "_nodeVersion": "1.8.1",
-  "_npmUser": {
-    "name": "kriskowal",
-    "email": "kris.kowal@cixar.com"
+  "keywords": [
+    "event",
+    "queue",
+    "task"
+  ],
+  "license": {
+    "type": "MIT",
+    "url": "https://github.com/kriskowal/asap/raw/master/LICENSE.md"
   },
+  "main": "./asap.js",
   "maintainers": [
     {
       "name": "kriskowal",
@@ -75,11 +87,23 @@
       "email": "forbes@lindesay.co.uk"
     }
   ],
-  "dist": {
-    "shasum": "1fc1d1564ee11620dfca6d67029850913f9f4679",
-    "tarball": "http://registry.npmjs.org/asap/-/asap-2.0.3.tgz"
+  "name": "asap",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/kriskowal/asap.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "lint": "jshint raw.js asap.js browser-raw.js browser-asap.js $(find scripts -name '*.js' | grep -v gauntlet)",
+    "test": "npm run lint && npm run test-node",
+    "test-browser": "node scripts/publish-bundle.js test/asap-test.js | xargs opener",
+    "test-node": "node test/asap-test.js",
+    "test-publish": "node scripts/publish-bundle.js test/asap-test.js | pbcopy",
+    "test-saucelabs": "node scripts/saucelabs.js test/asap-test.js scripts/saucelabs-spot-configurations.json",
+    "test-saucelabs-all": "node scripts/saucelabs.js test/asap-test.js scripts/saucelabs-all-configurations.json",
+    "test-saucelabs-worker": "node scripts/saucelabs-worker-test.js scripts/saucelabs-spot-configurations.json",
+    "test-saucelabs-worker-all": "node scripts/saucelabs-worker-test.js scripts/saucelabs-all-configurations.json",
+    "test-travis": "npm run lint && npm run test-node && npm run test-saucelabs && npm run test-saucelabs-worker"
+  },
+  "version": "2.0.3"
 }
diff --git a/deps/npm/node_modules/dezalgo/node_modules/asap/raw.js b/deps/npm/node_modules/asap/raw.js
similarity index 100%
rename from deps/npm/node_modules/dezalgo/node_modules/asap/raw.js
rename to deps/npm/node_modules/asap/raw.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/.npmignore b/deps/npm/node_modules/asn1/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/.npmignore
rename to deps/npm/node_modules/asn1/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/LICENSE b/deps/npm/node_modules/asn1/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/LICENSE
rename to deps/npm/node_modules/asn1/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/README.md b/deps/npm/node_modules/asn1/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/README.md
rename to deps/npm/node_modules/asn1/README.md
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/errors.js b/deps/npm/node_modules/asn1/lib/ber/errors.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/errors.js
rename to deps/npm/node_modules/asn1/lib/ber/errors.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/index.js b/deps/npm/node_modules/asn1/lib/ber/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/index.js
rename to deps/npm/node_modules/asn1/lib/ber/index.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/reader.js b/deps/npm/node_modules/asn1/lib/ber/reader.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/reader.js
rename to deps/npm/node_modules/asn1/lib/ber/reader.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/types.js b/deps/npm/node_modules/asn1/lib/ber/types.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/types.js
rename to deps/npm/node_modules/asn1/lib/ber/types.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/writer.js b/deps/npm/node_modules/asn1/lib/ber/writer.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/writer.js
rename to deps/npm/node_modules/asn1/lib/ber/writer.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/index.js b/deps/npm/node_modules/asn1/lib/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/index.js
rename to deps/npm/node_modules/asn1/lib/index.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/package.json b/deps/npm/node_modules/asn1/package.json
similarity index 64%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/package.json
rename to deps/npm/node_modules/asn1/package.json
index be2bc636ad376a..3cfaafd3e53695 100644
--- a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/package.json
+++ b/deps/npm/node_modules/asn1/package.json
@@ -1,7 +1,42 @@
 {
+  "_args": [
+    [
+      "asn1@0.1.11",
+      "/Users/rebecca/code/npm/node_modules/http-signature"
+    ]
+  ],
+  "_defaultsLoaded": true,
+  "_engineSupported": true,
+  "_from": "asn1@0.1.11",
+  "_id": "asn1@0.1.11",
+  "_inCache": true,
+  "_location": "/asn1",
+  "_nodeVersion": "v0.6.6",
+  "_npmUser": {
+    "email": "mcavage@gmail.com",
+    "name": "mcavage"
+  },
+  "_npmVersion": "1.1.0-beta-4",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "asn1",
+    "raw": "asn1@0.1.11",
+    "rawSpec": "0.1.11",
+    "scope": null,
+    "spec": "0.1.11",
+    "type": "version"
+  },
+  "_requiredBy": [
+    "/http-signature"
+  ],
+  "_resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+  "_shasum": "559be18376d08a4ec4dbe80877d27818639b2df7",
+  "_shrinkwrap": null,
+  "_spec": "asn1@0.1.11",
+  "_where": "/Users/rebecca/code/npm/node_modules/http-signature",
   "author": {
-    "name": "Mark Cavage",
-    "email": "mcavage@gmail.com"
+    "email": "mcavage@gmail.com",
+    "name": "Mark Cavage"
   },
   "contributors": [
     {
@@ -13,51 +48,35 @@
       "email": "yunong@joyent.com"
     }
   ],
-  "name": "asn1",
-  "description": "Contains parsers and serializers for ASN.1 (currently BER only)",
-  "version": "0.1.11",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/mcavage/node-asn1.git"
-  },
-  "main": "lib/index.js",
-  "engines": {
-    "node": ">=0.4.9"
-  },
   "dependencies": {},
+  "description": "Contains parsers and serializers for ASN.1 (currently BER only)",
   "devDependencies": {
     "tap": "0.1.4"
   },
-  "scripts": {
-    "pretest": "which gjslint; if [[ \"$?\" = 0 ]] ; then  gjslint --nojsdoc -r lib -r tst; else echo \"Missing gjslint. Skipping lint\"; fi",
-    "test": "tap ./tst"
-  },
-  "_npmUser": {
-    "name": "mcavage",
-    "email": "mcavage@gmail.com"
-  },
-  "_id": "asn1@0.1.11",
-  "_engineSupported": true,
-  "_npmVersion": "1.1.0-beta-4",
-  "_nodeVersion": "v0.6.6",
-  "_defaultsLoaded": true,
+  "directories": {},
   "dist": {
     "shasum": "559be18376d08a4ec4dbe80877d27818639b2df7",
     "tarball": "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
   },
+  "engines": {
+    "node": ">=0.4.9"
+  },
+  "main": "lib/index.js",
   "maintainers": [
     {
       "name": "mcavage",
       "email": "mcavage@gmail.com"
     }
   ],
-  "directories": {},
-  "_shasum": "559be18376d08a4ec4dbe80877d27818639b2df7",
-  "_resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
-  "_from": "asn1@0.1.11",
-  "bugs": {
-    "url": "https://github.com/mcavage/node-asn1/issues"
+  "name": "asn1",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/mcavage/node-asn1.git"
+  },
+  "scripts": {
+    "pretest": "which gjslint; if [[ \"$?\" = 0 ]] ; then  gjslint --nojsdoc -r lib -r tst; else echo \"Missing gjslint. Skipping lint\"; fi",
+    "test": "./node_modules/.bin/tap ./tst"
   },
-  "readme": "ERROR: No README data found!",
-  "homepage": "https://github.com/mcavage/node-asn1#readme"
+  "version": "0.1.11"
 }
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/tst/ber/reader.test.js b/deps/npm/node_modules/asn1/tst/ber/reader.test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/tst/ber/reader.test.js
rename to deps/npm/node_modules/asn1/tst/ber/reader.test.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/tst/ber/writer.test.js b/deps/npm/node_modules/asn1/tst/ber/writer.test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/tst/ber/writer.test.js
rename to deps/npm/node_modules/asn1/tst/ber/writer.test.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/README.md b/deps/npm/node_modules/assert-plus/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/README.md
rename to deps/npm/node_modules/assert-plus/README.md
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/assert.js b/deps/npm/node_modules/assert-plus/assert.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/assert.js
rename to deps/npm/node_modules/assert-plus/assert.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json b/deps/npm/node_modules/assert-plus/package.json
similarity index 55%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json
rename to deps/npm/node_modules/assert-plus/package.json
index 6fcca673f1935c..37eeed1d2bc3c4 100644
--- a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json
+++ b/deps/npm/node_modules/assert-plus/package.json
@@ -1,45 +1,66 @@
 {
-  "author": {
-    "name": "Mark Cavage",
-    "email": "mcavage@gmail.com"
+  "_args": [
+    [
+      "assert-plus@^0.1.5",
+      "/Users/rebecca/code/npm/node_modules/http-signature"
+    ]
+  ],
+  "_from": "assert-plus@>=0.1.5 <0.2.0",
+  "_id": "assert-plus@0.1.5",
+  "_inCache": true,
+  "_location": "/assert-plus",
+  "_npmUser": {
+    "email": "mcavage@gmail.com",
+    "name": "mcavage"
   },
-  "name": "assert-plus",
-  "description": "Extra assertions on top of node's assert module",
-  "version": "0.1.5",
-  "main": "./assert.js",
-  "devDependencies": {},
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mcavage/node-assert-plus.git"
+  "_npmVersion": "1.3.11",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "assert-plus",
+    "raw": "assert-plus@^0.1.5",
+    "rawSpec": "^0.1.5",
+    "scope": null,
+    "spec": ">=0.1.5 <0.2.0",
+    "type": "range"
   },
-  "engines": {
-    "node": ">=0.8"
+  "_requiredBy": [
+    "/http-signature"
+  ],
+  "_resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+  "_shasum": "ee74009413002d84cec7219c6ac811812e723160",
+  "_shrinkwrap": null,
+  "_spec": "assert-plus@^0.1.5",
+  "_where": "/Users/rebecca/code/npm/node_modules/http-signature",
+  "author": {
+    "email": "mcavage@gmail.com",
+    "name": "Mark Cavage"
   },
   "bugs": {
     "url": "https://github.com/mcavage/node-assert-plus/issues"
   },
   "dependencies": {},
-  "_id": "assert-plus@0.1.5",
+  "description": "Extra assertions on top of node's assert module",
+  "devDependencies": {},
+  "directories": {},
   "dist": {
     "shasum": "ee74009413002d84cec7219c6ac811812e723160",
     "tarball": "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
   },
-  "_from": "assert-plus@>=0.1.5 <0.2.0",
-  "_npmVersion": "1.3.11",
-  "_npmUser": {
-    "name": "mcavage",
-    "email": "mcavage@gmail.com"
+  "engines": {
+    "node": ">=0.8"
   },
+  "main": "./assert.js",
   "maintainers": [
     {
       "name": "mcavage",
       "email": "mcavage@gmail.com"
     }
   ],
-  "directories": {},
-  "_shasum": "ee74009413002d84cec7219c6ac811812e723160",
-  "_resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-  "readme": "ERROR: No README data found!",
-  "homepage": "https://github.com/mcavage/node-assert-plus#readme"
+  "name": "assert-plus",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mcavage/node-assert-plus.git"
+  },
+  "version": "0.1.5"
 }
diff --git a/deps/npm/node_modules/async-some/package.json b/deps/npm/node_modules/async-some/package.json
index b7d5521e58dfba..e2b7ad635a9c6f 100644
--- a/deps/npm/node_modules/async-some/package.json
+++ b/deps/npm/node_modules/async-some/package.json
@@ -1,41 +1,81 @@
 {
-  "name": "async-some",
-  "version": "1.0.2",
-  "description": "short-circuited, asynchronous version of Array.protototype.some",
-  "main": "some.js",
-  "scripts": {
-    "test": "tap test/*.js"
+  "_args": [
+    [
+      "async-some@~1.0.2",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "async-some@>=1.0.2 <1.1.0",
+  "_id": "async-some@1.0.2",
+  "_inCache": true,
+  "_location": "/async-some",
+  "_nodeVersion": "2.0.2",
+  "_npmUser": {
+    "email": "ogd@aoaioxxysz.net",
+    "name": "othiym23"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/othiym23/async-some.git"
+  "_npmVersion": "2.10.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "async-some",
+    "raw": "async-some@~1.0.2",
+    "rawSpec": "~1.0.2",
+    "scope": null,
+    "spec": ">=1.0.2 <1.1.0",
+    "type": "range"
   },
-  "keywords": [
-    "async",
-    "some",
-    "array",
-    "collections",
-    "fp"
+  "_requiredBy": [
+    "/"
   ],
+  "_resolved": "https://registry.npmjs.org/async-some/-/async-some-1.0.2.tgz",
+  "_shasum": "4d8a81620d5958791b5b98f802d3207776e95509",
+  "_shrinkwrap": null,
+  "_spec": "async-some@~1.0.2",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Forrest L Norvell",
-    "email": "ogd@aoaioxxysz.net"
+    "email": "ogd@aoaioxxysz.net",
+    "name": "Forrest L Norvell"
   },
-  "license": "ISC",
   "bugs": {
     "url": "https://github.com/othiym23/async-some/issues"
   },
-  "homepage": "https://github.com/othiym23/async-some",
   "dependencies": {
     "dezalgo": "^1.0.2"
   },
+  "description": "short-circuited, asynchronous version of Array.protototype.some",
   "devDependencies": {
     "tap": "^1.1.0"
   },
-  "readme": "# some\n\nShort-circuited async Array.prototype.some implementation.\n\nSerially evaluates a list of values from a JS array or arraylike\nagainst an asynchronous predicate, terminating on the first truthy\nvalue. If the predicate encounters an error, pass it to the completion\ncallback. Otherwise, pass the truthy value passed by the predicate, or\n`false` if no truthy value was passed.\n\nIs\n[Zalgo](http://blog.izs.me/post/59142742143/designing-apis-for-asynchrony)-proof,\nbrowser-safe, and pretty efficient.\n\n## Usage\n\n```javascript\nvar some = require(\"async-some\");\nvar resolve = require(\"path\").resolve;\nvar stat = require(\"fs\").stat;\nvar readFileSync = require(\"fs\").readFileSync;\n\nsome([\"apple\", \"seaweed\", \"ham\", \"quince\"], porkDetector, function (error, match) {\n  if (error) return console.error(error);\n\n  if (match) return console.dir(JSON.parse(readFileSync(match)));\n\n  console.error(\"time to buy more Sporkle™!\");\n});\n\nvar PREFIX = resolve(__dirname, \"../pork_store\");\nfunction porkDetector(value, cb) {\n  var path = resolve(PREFIX, value + \".json\");\n  stat(path, function (er, stat) {\n    if (er) {\n      if (er.code === \"ENOENT\") return cb(null, false);\n\n      return cb(er);\n    }\n\n    cb(er, path);\n  });\n}\n```\n\n### some(list, test, callback)\n\n* `list` {Object} An arraylike (either an Array or the arguments arraylike) to\n  be checked.\n* `test` {Function} The predicate against which the elements of `list` will be\n  tested. Takes two parameters:\n  * `element` {any} The element of the list to be tested.\n  * `callback` {Function} The continuation to be called once the test is\n    complete. Takes (again) two values:\n    * `error` {Error} Any errors that the predicate encountered.\n    * `value` {any} A truthy value. A non-falsy result terminates checking the\n      entire list.\n* `callback` {Function} The callback to invoke when either a value has been\n  found or the entire input list has been processed with no result. Is invoked\n  with the traditional two parameters:\n  * `error` {Error} Errors that were encountered during the evaluation of some().\n  * `match` {any} Value successfully matched by `test`, if any.\n",
-  "readmeFilename": "README.md",
+  "directories": {},
+  "dist": {
+    "shasum": "4d8a81620d5958791b5b98f802d3207776e95509",
+    "tarball": "http://registry.npmjs.org/async-some/-/async-some-1.0.2.tgz"
+  },
   "gitHead": "3a5086ad54739c48b2bbf073f23bcc95658199e3",
-  "_id": "async-some@1.0.2",
-  "_shasum": "4d8a81620d5958791b5b98f802d3207776e95509",
-  "_from": "async-some@>=1.0.2 <1.1.0"
+  "homepage": "https://github.com/othiym23/async-some",
+  "keywords": [
+    "array",
+    "async",
+    "collections",
+    "fp",
+    "some"
+  ],
+  "license": "ISC",
+  "main": "some.js",
+  "maintainers": [
+    {
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
+    }
+  ],
+  "name": "async-some",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/othiym23/async-some.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.0.2"
 }
diff --git a/deps/npm/node_modules/request/node_modules/form-data/node_modules/async/CHANGELOG.md b/deps/npm/node_modules/async/CHANGELOG.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/form-data/node_modules/async/CHANGELOG.md
rename to deps/npm/node_modules/async/CHANGELOG.md
diff --git a/deps/npm/node_modules/request/node_modules/form-data/node_modules/async/LICENSE b/deps/npm/node_modules/async/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/form-data/node_modules/async/LICENSE
rename to deps/npm/node_modules/async/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/form-data/node_modules/async/lib/async.js b/deps/npm/node_modules/async/lib/async.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/form-data/node_modules/async/lib/async.js
rename to deps/npm/node_modules/async/lib/async.js
diff --git a/deps/npm/node_modules/request/node_modules/form-data/node_modules/async/package.json b/deps/npm/node_modules/async/package.json
similarity index 77%
rename from deps/npm/node_modules/request/node_modules/form-data/node_modules/async/package.json
rename to deps/npm/node_modules/async/package.json
index d646d803453f3d..cd315c1447ea39 100644
--- a/deps/npm/node_modules/request/node_modules/form-data/node_modules/async/package.json
+++ b/deps/npm/node_modules/async/package.json
@@ -1,28 +1,46 @@
 {
-  "name": "async",
-  "description": "Higher-order functions and common patterns for asynchronous code",
-  "main": "lib/async.js",
-  "files": [
-    "lib"
+  "_args": [
+    [
+      "async@1.4.2",
+      "/Users/rebecca/code/npm"
+    ]
   ],
-  "author": {
-    "name": "Caolan McMahon"
+  "_from": "async@1.4.2",
+  "_id": "async@1.4.2",
+  "_inCache": true,
+  "_location": "/async",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "email": "megawac@gmail.com",
+    "name": "megawac"
   },
-  "version": "1.4.2",
-  "keywords": [
-    "async",
-    "callback",
-    "utility",
-    "module"
+  "_npmVersion": "2.9.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "async",
+    "raw": "async@1.4.2",
+    "rawSpec": "1.4.2",
+    "scope": null,
+    "spec": "1.4.2",
+    "type": "version"
+  },
+  "_requiredBy": [
+    "/form-data",
+    "/istanbul"
   ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/caolan/async.git"
+  "_resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz",
+  "_shasum": "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab",
+  "_shrinkwrap": null,
+  "_spec": "async@1.4.2",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "name": "Caolan McMahon"
   },
   "bugs": {
     "url": "https://github.com/caolan/async/issues"
   },
-  "license": "MIT",
+  "dependencies": {},
+  "description": "Higher-order functions and common patterns for asynchronous code",
   "devDependencies": {
     "benchmark": "github:bestiejs/benchmark.js",
     "bluebird": "^2.9.32",
@@ -47,55 +65,36 @@
     "xyz": "^0.5.0",
     "yargs": "~3.9.1"
   },
+  "directories": {},
+  "dist": {
+    "shasum": "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab",
+    "tarball": "http://registry.npmjs.org/async/-/async-1.4.2.tgz"
+  },
+  "files": [
+    "lib"
+  ],
+  "gitHead": "92f78aebad222d60c13e4299c0e723f2fe2d6611",
+  "homepage": "https://github.com/caolan/async#readme",
+  "installable": true,
   "jam": {
-    "main": "lib/async.js",
+    "categories": [
+      "Utilities"
+    ],
     "include": [
-      "lib/async.js",
+      "LICENSE",
       "README.md",
-      "LICENSE"
+      "lib/async.js"
     ],
-    "categories": [
-      "Utilities"
-    ]
-  },
-  "scripts": {
-    "mocha-node-test": "mocha mocha_test/",
-    "mocha-browser-test": "karma start",
-    "mocha-test": "npm run mocha-node-test && npm run mocha-browser-test",
-    "nodeunit-test": "nodeunit test/test-async.js",
-    "test": "npm run-script lint && npm run nodeunit-test && npm run mocha-test",
-    "lint": "jshint lib/*.js test/*.js perf/*.js && jscs lib/*.js test/*.js perf/*.js",
-    "coverage": "nyc npm test && nyc report",
-    "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls"
-  },
-  "spm": {
     "main": "lib/async.js"
   },
-  "volo": {
-    "main": "lib/async.js",
-    "ignore": [
-      "**/.*",
-      "node_modules",
-      "bower_components",
-      "test",
-      "tests"
-    ]
-  },
-  "gitHead": "92f78aebad222d60c13e4299c0e723f2fe2d6611",
-  "homepage": "https://github.com/caolan/async#readme",
-  "_id": "async@1.4.2",
-  "_shasum": "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab",
-  "_from": "async@>=1.4.0 <2.0.0",
-  "_npmVersion": "2.9.0",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "name": "megawac",
-    "email": "megawac@gmail.com"
-  },
-  "dist": {
-    "shasum": "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab",
-    "tarball": "http://registry.npmjs.org/async/-/async-1.4.2.tgz"
-  },
+  "keywords": [
+    "async",
+    "callback",
+    "module",
+    "utility"
+  ],
+  "license": "MIT",
+  "main": "lib/async.js",
   "maintainers": [
     {
       "name": "caolan",
@@ -114,7 +113,34 @@
       "email": "megawac@gmail.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "async",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/caolan/async.git"
+  },
+  "scripts": {
+    "coverage": "nyc npm test && nyc report",
+    "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls",
+    "lint": "jshint lib/*.js test/*.js perf/*.js && jscs lib/*.js test/*.js perf/*.js",
+    "mocha-browser-test": "karma start",
+    "mocha-node-test": "mocha mocha_test/",
+    "mocha-test": "npm run mocha-node-test && npm run mocha-browser-test",
+    "nodeunit-test": "nodeunit test/test-async.js",
+    "test": "npm run-script lint && npm run nodeunit-test && npm run mocha-test"
+  },
+  "spm": {
+    "main": "lib/async.js"
+  },
+  "version": "1.4.2",
+  "volo": {
+    "ignore": [
+      "**/.*",
+      "bower_components",
+      "node_modules",
+      "test",
+      "tests"
+    ],
+    "main": "lib/async.js"
+  }
 }
diff --git a/deps/npm/node_modules/request/node_modules/aws-sign2/LICENSE b/deps/npm/node_modules/aws-sign2/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/aws-sign2/LICENSE
rename to deps/npm/node_modules/aws-sign2/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/aws-sign2/README.md b/deps/npm/node_modules/aws-sign2/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/aws-sign2/README.md
rename to deps/npm/node_modules/aws-sign2/README.md
diff --git a/deps/npm/node_modules/request/node_modules/aws-sign2/index.js b/deps/npm/node_modules/aws-sign2/index.js
similarity index 96%
rename from deps/npm/node_modules/request/node_modules/aws-sign2/index.js
rename to deps/npm/node_modules/aws-sign2/index.js
index 576e49ddff1bce..d954c3bd079005 100644
--- a/deps/npm/node_modules/request/node_modules/aws-sign2/index.js
+++ b/deps/npm/node_modules/aws-sign2/index.js
@@ -17,7 +17,7 @@ var crypto = require('crypto')
  * Valid keys.
  */
 
-var keys = 
+var keys =
   [ 'acl'
   , 'location'
   , 'logging'
@@ -56,7 +56,7 @@ module.exports.authorization = authorization
  * @param {Object} options
  * @return {String}
  * @api private
- */ 
+ */
 
 function hmacSha1 (options) {
   return crypto.createHmac('sha1', options.secret).update(options.message).digest('base64')
@@ -65,8 +65,8 @@ function hmacSha1 (options) {
 module.exports.hmacSha1 = hmacSha1
 
 /**
- * Create a base64 sha1 HMAC for `options`. 
- * 
+ * Create a base64 sha1 HMAC for `options`.
+ *
  * @param {Object} options
  * @return {String}
  * @api private
@@ -79,10 +79,10 @@ function sign (options) {
 module.exports.sign = sign
 
 /**
- * Create a base64 sha1 HMAC for `options`. 
+ * Create a base64 sha1 HMAC for `options`.
  *
  * Specifically to be used with S3 presigned URLs
- * 
+ *
  * @param {Object} options
  * @return {String}
  * @api private
@@ -98,7 +98,7 @@ module.exports.signQuery= signQuery
  * Return a string for sign() with the given `options`.
  *
  * Spec:
- * 
+ *
  *    <verb>\n
  *    <md5>\n
  *    <content-type>\n
@@ -114,7 +114,7 @@ module.exports.signQuery= signQuery
 function stringToSign (options) {
   var headers = options.amazonHeaders || ''
   if (headers) headers += '\n'
-  var r = 
+  var r =
     [ options.verb
     , options.md5
     , options.contentType
@@ -130,7 +130,7 @@ module.exports.queryStringToSign = stringToSign
  * for S3 presigned URLs
  *
  * Spec:
- * 
+ *
  *    <date>\n
  *    <resource>
  *
diff --git a/deps/npm/node_modules/request/node_modules/aws-sign2/package.json b/deps/npm/node_modules/aws-sign2/package.json
similarity index 65%
rename from deps/npm/node_modules/request/node_modules/aws-sign2/package.json
rename to deps/npm/node_modules/aws-sign2/package.json
index b454fe46973974..8bb70110aae105 100644
--- a/deps/npm/node_modules/request/node_modules/aws-sign2/package.json
+++ b/deps/npm/node_modules/aws-sign2/package.json
@@ -1,46 +1,68 @@
 {
-  "author": {
-    "name": "Mikeal Rogers",
+  "_args": [
+    [
+      "aws-sign2@~0.5.0",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
+  ],
+  "_from": "aws-sign2@>=0.5.0 <0.6.0",
+  "_id": "aws-sign2@0.5.0",
+  "_inCache": true,
+  "_location": "/aws-sign2",
+  "_npmUser": {
     "email": "mikeal.rogers@gmail.com",
-    "url": "http://www.futurealoof.com"
+    "name": "mikeal"
   },
-  "name": "aws-sign2",
-  "description": "AWS signing. Originally pulled from LearnBoost/knox, maintained as vendor in request, now a standalone module.",
-  "version": "0.5.0",
-  "repository": {
-    "url": "git+https://github.com/mikeal/aws-sign.git"
+  "_npmVersion": "1.3.2",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "aws-sign2",
+    "raw": "aws-sign2@~0.5.0",
+    "rawSpec": "~0.5.0",
+    "scope": null,
+    "spec": ">=0.5.0 <0.6.0",
+    "type": "range"
   },
-  "main": "index.js",
-  "dependencies": {},
-  "devDependencies": {},
-  "optionalDependencies": {},
-  "engines": {
-    "node": "*"
+  "_requiredBy": [
+    "/request"
+  ],
+  "_resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+  "_shasum": "c57103f7a17fc037f02d7c2e64b602ea223f7d63",
+  "_shrinkwrap": null,
+  "_spec": "aws-sign2@~0.5.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
+  "author": {
+    "email": "mikeal.rogers@gmail.com",
+    "name": "Mikeal Rogers",
+    "url": "http://www.futurealoof.com"
   },
-  "readme": "aws-sign\n========\n\nAWS signing. Originally pulled from LearnBoost/knox, maintained as vendor in request, now a standalone module.\n",
-  "readmeFilename": "README.md",
   "bugs": {
     "url": "https://github.com/mikeal/aws-sign/issues"
   },
-  "_id": "aws-sign2@0.5.0",
+  "dependencies": {},
+  "description": "AWS signing. Originally pulled from LearnBoost/knox, maintained as vendor in request, now a standalone module.",
+  "devDependencies": {},
+  "directories": {},
   "dist": {
     "shasum": "c57103f7a17fc037f02d7c2e64b602ea223f7d63",
     "tarball": "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
   },
-  "_from": "aws-sign2@>=0.5.0 <0.6.0",
-  "_npmVersion": "1.3.2",
-  "_npmUser": {
-    "name": "mikeal",
-    "email": "mikeal.rogers@gmail.com"
+  "engines": {
+    "node": "*"
   },
+  "main": "index.js",
   "maintainers": [
     {
       "name": "mikeal",
       "email": "mikeal.rogers@gmail.com"
     }
   ],
-  "directories": {},
-  "_shasum": "c57103f7a17fc037f02d7c2e64b602ea223f7d63",
-  "_resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
-  "homepage": "https://github.com/mikeal/aws-sign#readme"
+  "name": "aws-sign2",
+  "optionalDependencies": {},
+  "readme": "aws-sign\n========\n\nAWS signing. Originally pulled from LearnBoost/knox, maintained as vendor in request, now a standalone module.\n",
+  "readmeFilename": "README.md",
+  "repository": {
+    "url": "https://github.com/mikeal/aws-sign"
+  },
+  "version": "0.5.0"
 }
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore b/deps/npm/node_modules/balanced-match/.npmignore
similarity index 100%
rename from deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore
rename to deps/npm/node_modules/balanced-match/.npmignore
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml b/deps/npm/node_modules/balanced-match/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml
rename to deps/npm/node_modules/balanced-match/.travis.yml
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile b/deps/npm/node_modules/balanced-match/Makefile
similarity index 98%
rename from deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
rename to deps/npm/node_modules/balanced-match/Makefile
index fa5da71a6d0d34..dd2730cfde0cab 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
+++ b/deps/npm/node_modules/balanced-match/Makefile
@@ -3,4 +3,3 @@ test:
 	@node_modules/.bin/tape test/*.js
 
 .PHONY: test
-
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md b/deps/npm/node_modules/balanced-match/README.md
similarity index 100%
rename from deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
rename to deps/npm/node_modules/balanced-match/README.md
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js b/deps/npm/node_modules/balanced-match/example.js
similarity index 99%
rename from deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
rename to deps/npm/node_modules/balanced-match/example.js
index c02ad348e69aec..9ce76f480a4321 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
+++ b/deps/npm/node_modules/balanced-match/example.js
@@ -2,4 +2,3 @@ var balanced = require('./');
 
 console.log(balanced('{', '}', 'pre{in{nested}}post'));
 console.log(balanced('{', '}', 'pre{first}between{second}post'));
-
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js b/deps/npm/node_modules/balanced-match/index.js
similarity index 100%
rename from deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
rename to deps/npm/node_modules/balanced-match/index.js
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json b/deps/npm/node_modules/balanced-match/package.json
similarity index 67%
rename from deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
rename to deps/npm/node_modules/balanced-match/package.json
index ede6efefa07883..3f11aaccbff0ba 100644
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
+++ b/deps/npm/node_modules/balanced-match/package.json
@@ -1,73 +1,96 @@
 {
-  "name": "balanced-match",
-  "description": "Match balanced character pairs, like \"{\" and \"}\"",
-  "version": "0.2.0",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/juliangruber/balanced-match.git"
-  },
-  "homepage": "https://github.com/juliangruber/balanced-match",
-  "main": "index.js",
-  "scripts": {
-    "test": "make test"
+  "_args": [
+    [
+      "balanced-match@^0.2.0",
+      "/Users/rebecca/code/npm/node_modules/brace-expansion"
+    ]
+  ],
+  "_from": "balanced-match@>=0.2.0 <0.3.0",
+  "_id": "balanced-match@0.2.0",
+  "_inCache": true,
+  "_location": "/balanced-match",
+  "_nodeVersion": "0.10.32",
+  "_npmUser": {
+    "email": "julian@juliangruber.com",
+    "name": "juliangruber"
   },
-  "dependencies": {},
-  "devDependencies": {
-    "tape": "~1.1.1"
+  "_npmVersion": "2.1.8",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "balanced-match",
+    "raw": "balanced-match@^0.2.0",
+    "rawSpec": "^0.2.0",
+    "scope": null,
+    "spec": ">=0.2.0 <0.3.0",
+    "type": "range"
   },
-  "keywords": [
-    "match",
-    "regexp",
-    "test",
-    "balanced",
-    "parse"
+  "_requiredBy": [
+    "/brace-expansion"
   ],
+  "_resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+  "_shasum": "38f6730c03aab6d5edbb52bd934885e756d71674",
+  "_shrinkwrap": null,
+  "_spec": "balanced-match@^0.2.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/brace-expansion",
   "author": {
-    "name": "Julian Gruber",
     "email": "mail@juliangruber.com",
+    "name": "Julian Gruber",
     "url": "http://juliangruber.com"
   },
-  "license": "MIT",
-  "testling": {
-    "files": "test/*.js",
-    "browsers": [
-      "ie/8..latest",
-      "firefox/20..latest",
-      "firefox/nightly",
-      "chrome/25..latest",
-      "chrome/canary",
-      "opera/12..latest",
-      "opera/next",
-      "safari/5.1..latest",
-      "ipad/6.0..latest",
-      "iphone/6.0..latest",
-      "android-browser/4.2..latest"
-    ]
-  },
-  "gitHead": "ba40ed78e7114a4a67c51da768a100184dead39c",
   "bugs": {
     "url": "https://github.com/juliangruber/balanced-match/issues"
   },
-  "_id": "balanced-match@0.2.0",
-  "_shasum": "38f6730c03aab6d5edbb52bd934885e756d71674",
-  "_from": "balanced-match@>=0.2.0 <0.3.0",
-  "_npmVersion": "2.1.8",
-  "_nodeVersion": "0.10.32",
-  "_npmUser": {
-    "name": "juliangruber",
-    "email": "julian@juliangruber.com"
+  "dependencies": {},
+  "description": "Match balanced character pairs, like \"{\" and \"}\"",
+  "devDependencies": {
+    "tape": "~1.1.1"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "38f6730c03aab6d5edbb52bd934885e756d71674",
+    "tarball": "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
   },
+  "gitHead": "ba40ed78e7114a4a67c51da768a100184dead39c",
+  "homepage": "https://github.com/juliangruber/balanced-match",
+  "keywords": [
+    "balanced",
+    "match",
+    "parse",
+    "regexp",
+    "test"
+  ],
+  "license": "MIT",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "juliangruber",
       "email": "julian@juliangruber.com"
     }
   ],
-  "dist": {
-    "shasum": "38f6730c03aab6d5edbb52bd934885e756d71674",
-    "tarball": "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+  "name": "balanced-match",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/juliangruber/balanced-match.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "make test"
+  },
+  "testling": {
+    "browsers": [
+      "android-browser/4.2..latest",
+      "chrome/25..latest",
+      "chrome/canary",
+      "firefox/20..latest",
+      "firefox/nightly",
+      "ie/8..latest",
+      "ipad/6.0..latest",
+      "iphone/6.0..latest",
+      "opera/12..latest",
+      "opera/next",
+      "safari/5.1..latest"
+    ],
+    "files": "test/*.js"
+  },
+  "version": "0.2.0"
 }
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js b/deps/npm/node_modules/balanced-match/test/balanced.js
similarity index 100%
rename from deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js
rename to deps/npm/node_modules/balanced-match/test/balanced.js
diff --git a/deps/npm/node_modules/request/node_modules/bl/.npmignore b/deps/npm/node_modules/bl/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/.npmignore
rename to deps/npm/node_modules/bl/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/bl/.travis.yml b/deps/npm/node_modules/bl/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/.travis.yml
rename to deps/npm/node_modules/bl/.travis.yml
diff --git a/deps/npm/node_modules/request/node_modules/bl/LICENSE.md b/deps/npm/node_modules/bl/LICENSE.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/LICENSE.md
rename to deps/npm/node_modules/bl/LICENSE.md
diff --git a/deps/npm/node_modules/request/node_modules/bl/README.md b/deps/npm/node_modules/bl/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/README.md
rename to deps/npm/node_modules/bl/README.md
diff --git a/deps/npm/node_modules/request/node_modules/bl/bl.js b/deps/npm/node_modules/bl/bl.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/bl.js
rename to deps/npm/node_modules/bl/bl.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/.npmignore b/deps/npm/node_modules/bl/node_modules/readable-stream/.npmignore
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/.npmignore
rename to deps/npm/node_modules/bl/node_modules/readable-stream/.npmignore
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/.travis.yml b/deps/npm/node_modules/bl/node_modules/readable-stream/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/.travis.yml
rename to deps/npm/node_modules/bl/node_modules/readable-stream/.travis.yml
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/.zuul.yml b/deps/npm/node_modules/bl/node_modules/readable-stream/.zuul.yml
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/.zuul.yml
rename to deps/npm/node_modules/bl/node_modules/readable-stream/.zuul.yml
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/LICENSE b/deps/npm/node_modules/bl/node_modules/readable-stream/LICENSE
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/LICENSE
rename to deps/npm/node_modules/bl/node_modules/readable-stream/LICENSE
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/README.md b/deps/npm/node_modules/bl/node_modules/readable-stream/README.md
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/README.md
rename to deps/npm/node_modules/bl/node_modules/readable-stream/README.md
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/doc/stream.markdown b/deps/npm/node_modules/bl/node_modules/readable-stream/doc/stream.markdown
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/doc/stream.markdown
rename to deps/npm/node_modules/bl/node_modules/readable-stream/doc/stream.markdown
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md b/deps/npm/node_modules/bl/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md
rename to deps/npm/node_modules/bl/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/duplex.js b/deps/npm/node_modules/bl/node_modules/readable-stream/duplex.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/duplex.js
rename to deps/npm/node_modules/bl/node_modules/readable-stream/duplex.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_duplex.js b/deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_duplex.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_duplex.js
rename to deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_duplex.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_passthrough.js b/deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_passthrough.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_passthrough.js
rename to deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_passthrough.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_readable.js b/deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_readable.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_readable.js
rename to deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_readable.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_transform.js b/deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_transform.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_transform.js
rename to deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_transform.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_writable.js b/deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_writable.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_writable.js
rename to deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_writable.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/package.json b/deps/npm/node_modules/bl/node_modules/readable-stream/package.json
similarity index 69%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/package.json
rename to deps/npm/node_modules/bl/node_modules/readable-stream/package.json
index 70ad998cae2d45..dc64209734e4a2 100644
--- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/package.json
+++ b/deps/npm/node_modules/bl/node_modules/readable-stream/package.json
@@ -1,8 +1,43 @@
 {
-  "name": "readable-stream",
-  "version": "2.0.2",
-  "description": "Streams3, a user-land copy of the stream library from iojs v2.x",
-  "main": "readable.js",
+  "_args": [
+    [
+      "readable-stream@~2.0.0",
+      "/Users/rebecca/code/npm/node_modules/bl"
+    ]
+  ],
+  "_from": "readable-stream@>=2.0.0 <2.1.0",
+  "_id": "readable-stream@2.0.2",
+  "_inCache": true,
+  "_location": "/bl/readable-stream",
+  "_nodeVersion": "2.3.0",
+  "_npmUser": {
+    "email": "calvin.metcalf@gmail.com",
+    "name": "cwmma"
+  },
+  "_npmVersion": "2.11.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "readable-stream",
+    "raw": "readable-stream@~2.0.0",
+    "rawSpec": "~2.0.0",
+    "scope": null,
+    "spec": ">=2.0.0 <2.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/bl"
+  ],
+  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+  "_shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
+  "_shrinkwrap": null,
+  "_spec": "readable-stream@~2.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/bl",
+  "browser": {
+    "util": false
+  },
+  "bugs": {
+    "url": "https://github.com/nodejs/readable-stream/issues"
+  },
   "dependencies": {
     "core-util-is": "~1.0.0",
     "inherits": "~2.0.1",
@@ -11,46 +46,26 @@
     "string_decoder": "~0.10.x",
     "util-deprecate": "~1.0.1"
   },
+  "description": "Streams3, a user-land copy of the stream library from iojs v2.x",
   "devDependencies": {
     "tap": "~0.2.6",
     "tape": "~4.0.0",
     "zuul": "~3.0.0"
   },
-  "scripts": {
-    "test": "tap test/parallel/*.js",
-    "browser": "zuul --browser-name $BROWSER_NAME --browser-version $BROWSER_VERSION -- test/browser.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/nodejs/readable-stream.git"
+  "directories": {},
+  "dist": {
+    "shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
+    "tarball": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz"
   },
+  "gitHead": "1a70134a71196eeabb5e27bc7580faaa68d30513",
+  "homepage": "https://github.com/nodejs/readable-stream#readme",
   "keywords": [
+    "pipe",
     "readable",
-    "stream",
-    "pipe"
+    "stream"
   ],
-  "browser": {
-    "util": false
-  },
   "license": "MIT",
-  "gitHead": "1a70134a71196eeabb5e27bc7580faaa68d30513",
-  "bugs": {
-    "url": "https://github.com/nodejs/readable-stream/issues"
-  },
-  "homepage": "https://github.com/nodejs/readable-stream#readme",
-  "_id": "readable-stream@2.0.2",
-  "_shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
-  "_from": "readable-stream@>=2.0.0 <2.1.0",
-  "_npmVersion": "2.11.1",
-  "_nodeVersion": "2.3.0",
-  "_npmUser": {
-    "name": "cwmma",
-    "email": "calvin.metcalf@gmail.com"
-  },
-  "dist": {
-    "shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
-    "tarball": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz"
-  },
+  "main": "readable.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -69,7 +84,15 @@
       "email": "calvin.metcalf@gmail.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "readable-stream",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/nodejs/readable-stream.git"
+  },
+  "scripts": {
+    "browser": "zuul --browser-name $BROWSER_NAME --browser-version $BROWSER_VERSION -- test/browser.js",
+    "test": "tap test/parallel/*.js"
+  },
+  "version": "2.0.2"
 }
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/passthrough.js b/deps/npm/node_modules/bl/node_modules/readable-stream/passthrough.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/passthrough.js
rename to deps/npm/node_modules/bl/node_modules/readable-stream/passthrough.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/readable.js b/deps/npm/node_modules/bl/node_modules/readable-stream/readable.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/readable.js
rename to deps/npm/node_modules/bl/node_modules/readable-stream/readable.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/transform.js b/deps/npm/node_modules/bl/node_modules/readable-stream/transform.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/transform.js
rename to deps/npm/node_modules/bl/node_modules/readable-stream/transform.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/writable.js b/deps/npm/node_modules/bl/node_modules/readable-stream/writable.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/writable.js
rename to deps/npm/node_modules/bl/node_modules/readable-stream/writable.js
diff --git a/deps/npm/node_modules/request/node_modules/bl/package.json b/deps/npm/node_modules/bl/package.json
similarity index 61%
rename from deps/npm/node_modules/request/node_modules/bl/package.json
rename to deps/npm/node_modules/bl/package.json
index 1513847030a9eb..f3ca993c5d086d 100644
--- a/deps/npm/node_modules/request/node_modules/bl/package.json
+++ b/deps/npm/node_modules/bl/package.json
@@ -1,62 +1,92 @@
 {
-  "name": "bl",
-  "version": "1.0.0",
-  "description": "Buffer List: collect buffers and access with a standard readable Buffer interface, streamable too!",
-  "main": "bl.js",
-  "scripts": {
-    "test": "node test/test.js | faucet",
-    "test-local": "brtapsauce-local test/basic-test.js"
+  "_args": [
+    [
+      "bl@~1.0.0",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
+  ],
+  "_from": "bl@>=1.0.0 <1.1.0",
+  "_id": "bl@1.0.0",
+  "_inCache": true,
+  "_location": "/bl",
+  "_nodeVersion": "2.0.1-nightly20150618d2e4e03444",
+  "_npmUser": {
+    "email": "rod@vagg.org",
+    "name": "rvagg"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/rvagg/bl.git"
+  "_npmVersion": "2.9.0",
+  "_phantomChildren": {
+    "core-util-is": "1.0.1",
+    "inherits": "2.0.1",
+    "isarray": "0.0.1",
+    "process-nextick-args": "1.0.2",
+    "string_decoder": "0.10.31",
+    "util-deprecate": "1.0.1"
   },
-  "homepage": "https://github.com/rvagg/bl",
+  "_requested": {
+    "name": "bl",
+    "raw": "bl@~1.0.0",
+    "rawSpec": "~1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <1.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/request"
+  ],
+  "_resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
+  "_shasum": "ada9a8a89a6d7ac60862f7dec7db207873e0c3f5",
+  "_shrinkwrap": null,
+  "_spec": "bl@~1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
   "authors": [
-    "Rod Vagg <rod@vagg.org> (https://github.com/rvagg)",
+    "Jarett Cruger <jcrugzz@gmail.com> (https://github.com/jcrugzz)",
     "Matteo Collina <matteo.collina@gmail.com> (https://github.com/mcollina)",
-    "Jarett Cruger <jcrugzz@gmail.com> (https://github.com/jcrugzz)"
-  ],
-  "keywords": [
-    "buffer",
-    "buffers",
-    "stream",
-    "awesomesauce"
+    "Rod Vagg <rod@vagg.org> (https://github.com/rvagg)"
   ],
-  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/rvagg/bl/issues"
+  },
   "dependencies": {
     "readable-stream": "~2.0.0"
   },
+  "description": "Buffer List: collect buffers and access with a standard readable Buffer interface, streamable too!",
   "devDependencies": {
-    "tape": "~2.12.3",
-    "hash_file": "~0.1.1",
+    "brtapsauce": "~0.3.0",
     "faucet": "~0.0.1",
-    "brtapsauce": "~0.3.0"
-  },
-  "gitHead": "1794938be6697a6d1e02cd942a4eea59b353347a",
-  "bugs": {
-    "url": "https://github.com/rvagg/bl/issues"
+    "hash_file": "~0.1.1",
+    "tape": "~2.12.3"
   },
-  "_id": "bl@1.0.0",
-  "_shasum": "ada9a8a89a6d7ac60862f7dec7db207873e0c3f5",
-  "_from": "bl@>=1.0.0 <1.1.0",
-  "_npmVersion": "2.9.0",
-  "_nodeVersion": "2.0.1-nightly20150618d2e4e03444",
-  "_npmUser": {
-    "name": "rvagg",
-    "email": "rod@vagg.org"
+  "directories": {},
+  "dist": {
+    "shasum": "ada9a8a89a6d7ac60862f7dec7db207873e0c3f5",
+    "tarball": "http://registry.npmjs.org/bl/-/bl-1.0.0.tgz"
   },
+  "gitHead": "1794938be6697a6d1e02cd942a4eea59b353347a",
+  "homepage": "https://github.com/rvagg/bl",
+  "keywords": [
+    "awesomesauce",
+    "buffer",
+    "buffers",
+    "stream"
+  ],
+  "license": "MIT",
+  "main": "bl.js",
   "maintainers": [
     {
       "name": "rvagg",
       "email": "rod@vagg.org"
     }
   ],
-  "dist": {
-    "shasum": "ada9a8a89a6d7ac60862f7dec7db207873e0c3f5",
-    "tarball": "http://registry.npmjs.org/bl/-/bl-1.0.0.tgz"
+  "name": "bl",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/rvagg/bl.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "node test/test.js | faucet",
+    "test-local": "brtapsauce-local test/basic-test.js"
+  },
+  "version": "1.0.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/bl/test/basic-test.js b/deps/npm/node_modules/bl/test/basic-test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/test/basic-test.js
rename to deps/npm/node_modules/bl/test/basic-test.js
diff --git a/deps/npm/node_modules/request/node_modules/bl/test/sauce.js b/deps/npm/node_modules/bl/test/sauce.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/test/sauce.js
rename to deps/npm/node_modules/bl/test/sauce.js
diff --git a/deps/npm/node_modules/request/node_modules/bl/test/test.js b/deps/npm/node_modules/bl/test/test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/test/test.js
rename to deps/npm/node_modules/bl/test/test.js
diff --git a/deps/npm/node_modules/block-stream/package.json b/deps/npm/node_modules/block-stream/package.json
index 80227bb69ed8ab..806b6bf1763b6d 100644
--- a/deps/npm/node_modules/block-stream/package.json
+++ b/deps/npm/node_modules/block-stream/package.json
@@ -1,54 +1,79 @@
 {
+  "_args": [
+    [
+      "block-stream@*",
+      "/Users/rebecca/code/npm/node_modules/node-gyp/node_modules/tar"
+    ]
+  ],
+  "_from": "block-stream@*",
+  "_id": "block-stream@0.0.8",
+  "_inCache": true,
+  "_location": "/block-stream",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
+  },
+  "_npmVersion": "2.10.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "block-stream",
+    "raw": "block-stream@*",
+    "rawSpec": "*",
+    "scope": null,
+    "spec": "*",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/node-gyp/tar",
+    "/tar"
+  ],
+  "_resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz",
+  "_shasum": "0688f46da2bbf9cff0c4f68225a0cb95cbe8a46b",
+  "_shrinkwrap": null,
+  "_spec": "block-stream@*",
+  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp/node_modules/tar",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "name": "block-stream",
-  "description": "a stream of blocks",
-  "version": "0.0.8",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/block-stream.git"
-  },
-  "engines": {
-    "node": "0.4 || >=0.5.8"
+  "bugs": {
+    "url": "https://github.com/isaacs/block-stream/issues"
   },
-  "main": "block-stream.js",
   "dependencies": {
     "inherits": "~2.0.0"
   },
+  "description": "a stream of blocks",
   "devDependencies": {
     "tap": "0.x"
   },
-  "scripts": {
-    "test": "tap test/"
-  },
-  "license": "ISC",
-  "gitHead": "b35520314f4763af0788d65a846bb43d9c0a8f02",
-  "bugs": {
-    "url": "https://github.com/isaacs/block-stream/issues"
-  },
-  "homepage": "https://github.com/isaacs/block-stream#readme",
-  "_id": "block-stream@0.0.8",
-  "_shasum": "0688f46da2bbf9cff0c4f68225a0cb95cbe8a46b",
-  "_from": "block-stream@0.0.8",
-  "_npmVersion": "2.10.0",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
-  },
+  "directories": {},
   "dist": {
     "shasum": "0688f46da2bbf9cff0c4f68225a0cb95cbe8a46b",
     "tarball": "http://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
   },
+  "engines": {
+    "node": "0.4 || >=0.5.8"
+  },
+  "gitHead": "b35520314f4763af0788d65a846bb43d9c0a8f02",
+  "homepage": "https://github.com/isaacs/block-stream#readme",
+  "license": "ISC",
+  "main": "block-stream.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
+  "name": "block-stream",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/block-stream.git"
+  },
+  "scripts": {
+    "test": "tap test/"
+  },
+  "version": "0.0.8"
 }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/LICENSE b/deps/npm/node_modules/bluebird/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/LICENSE
rename to deps/npm/node_modules/bluebird/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/README.md b/deps/npm/node_modules/bluebird/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/README.md
rename to deps/npm/node_modules/bluebird/README.md
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/changelog.md b/deps/npm/node_modules/bluebird/changelog.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/changelog.md
rename to deps/npm/node_modules/bluebird/changelog.md
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/browser/bluebird.js b/deps/npm/node_modules/bluebird/js/browser/bluebird.js
similarity index 98%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/browser/bluebird.js
rename to deps/npm/node_modules/bluebird/js/browser/bluebird.js
index c8db9da3efc918..2f9380ef5af3be 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/browser/bluebird.js
+++ b/deps/npm/node_modules/bluebird/js/browser/bluebird.js
@@ -1,18 +1,18 @@
 /* @preserve
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013-2015 Petka Antonov
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
@@ -20,7 +20,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
- * 
+ *
  */
 /**
  * bluebird build version 2.10.1
@@ -2914,30 +2914,30 @@ _dereq_('./any.js')(Promise);
 _dereq_('./each.js')(Promise, INTERNAL);
 _dereq_('./timers.js')(Promise, INTERNAL);
 _dereq_('./filter.js')(Promise, INTERNAL);
-                                                         
-    util.toFastProperties(Promise);                                          
-    util.toFastProperties(Promise.prototype);                                
-    function fillTypes(value) {                                              
-        var p = new Promise(INTERNAL);                                       
-        p._fulfillmentHandler0 = value;                                      
-        p._rejectionHandler0 = value;                                        
-        p._progressHandler0 = value;                                         
-        p._promise0 = value;                                                 
-        p._receiver0 = value;                                                
-        p._settledValue = value;                                             
-    }                                                                        
-    // Complete slack tracking, opt out of field-type tracking and           
-    // stabilize map                                                         
-    fillTypes({a: 1});                                                       
-    fillTypes({b: 2});                                                       
-    fillTypes({c: 3});                                                       
-    fillTypes(1);                                                            
-    fillTypes(function(){});                                                 
-    fillTypes(undefined);                                                    
-    fillTypes(false);                                                        
-    fillTypes(new Promise(INTERNAL));                                        
-    CapturedTrace.setBounds(async.firstLineError, util.lastLineError);       
-    return Promise;                                                          
+
+    util.toFastProperties(Promise);
+    util.toFastProperties(Promise.prototype);
+    function fillTypes(value) {
+        var p = new Promise(INTERNAL);
+        p._fulfillmentHandler0 = value;
+        p._rejectionHandler0 = value;
+        p._progressHandler0 = value;
+        p._promise0 = value;
+        p._receiver0 = value;
+        p._settledValue = value;
+    }
+    // Complete slack tracking, opt out of field-type tracking and
+    // stabilize map
+    fillTypes({a: 1});
+    fillTypes({b: 2});
+    fillTypes({c: 3});
+    fillTypes(1);
+    fillTypes(function(){});
+    fillTypes(undefined);
+    fillTypes(false);
+    fillTypes(new Promise(INTERNAL));
+    CapturedTrace.setBounds(async.firstLineError, util.lastLineError);
+    return Promise;
 
 };
 
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/browser/bluebird.min.js b/deps/npm/node_modules/bluebird/js/browser/bluebird.min.js
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/browser/bluebird.min.js
rename to deps/npm/node_modules/bluebird/js/browser/bluebird.min.js
index f49fe5394f51df..34dce5096318d9 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/browser/bluebird.min.js
+++ b/deps/npm/node_modules/bluebird/js/browser/bluebird.min.js
@@ -1,18 +1,18 @@
 /* @preserve
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2013-2015 Petka Antonov
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
@@ -20,7 +20,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
- * 
+ *
  */
 /**
  * bluebird build version 2.10.1
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/any.js b/deps/npm/node_modules/bluebird/js/main/any.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/any.js
rename to deps/npm/node_modules/bluebird/js/main/any.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/assert.js b/deps/npm/node_modules/bluebird/js/main/assert.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/assert.js
rename to deps/npm/node_modules/bluebird/js/main/assert.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/async.js b/deps/npm/node_modules/bluebird/js/main/async.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/async.js
rename to deps/npm/node_modules/bluebird/js/main/async.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/bind.js b/deps/npm/node_modules/bluebird/js/main/bind.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/bind.js
rename to deps/npm/node_modules/bluebird/js/main/bind.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/bluebird.js b/deps/npm/node_modules/bluebird/js/main/bluebird.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/bluebird.js
rename to deps/npm/node_modules/bluebird/js/main/bluebird.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/call_get.js b/deps/npm/node_modules/bluebird/js/main/call_get.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/call_get.js
rename to deps/npm/node_modules/bluebird/js/main/call_get.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/cancel.js b/deps/npm/node_modules/bluebird/js/main/cancel.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/cancel.js
rename to deps/npm/node_modules/bluebird/js/main/cancel.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/captured_trace.js b/deps/npm/node_modules/bluebird/js/main/captured_trace.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/captured_trace.js
rename to deps/npm/node_modules/bluebird/js/main/captured_trace.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/catch_filter.js b/deps/npm/node_modules/bluebird/js/main/catch_filter.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/catch_filter.js
rename to deps/npm/node_modules/bluebird/js/main/catch_filter.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/context.js b/deps/npm/node_modules/bluebird/js/main/context.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/context.js
rename to deps/npm/node_modules/bluebird/js/main/context.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/debuggability.js b/deps/npm/node_modules/bluebird/js/main/debuggability.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/debuggability.js
rename to deps/npm/node_modules/bluebird/js/main/debuggability.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/direct_resolve.js b/deps/npm/node_modules/bluebird/js/main/direct_resolve.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/direct_resolve.js
rename to deps/npm/node_modules/bluebird/js/main/direct_resolve.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/each.js b/deps/npm/node_modules/bluebird/js/main/each.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/each.js
rename to deps/npm/node_modules/bluebird/js/main/each.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/errors.js b/deps/npm/node_modules/bluebird/js/main/errors.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/errors.js
rename to deps/npm/node_modules/bluebird/js/main/errors.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/es5.js b/deps/npm/node_modules/bluebird/js/main/es5.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/es5.js
rename to deps/npm/node_modules/bluebird/js/main/es5.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/filter.js b/deps/npm/node_modules/bluebird/js/main/filter.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/filter.js
rename to deps/npm/node_modules/bluebird/js/main/filter.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/finally.js b/deps/npm/node_modules/bluebird/js/main/finally.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/finally.js
rename to deps/npm/node_modules/bluebird/js/main/finally.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/generators.js b/deps/npm/node_modules/bluebird/js/main/generators.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/generators.js
rename to deps/npm/node_modules/bluebird/js/main/generators.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/join.js b/deps/npm/node_modules/bluebird/js/main/join.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/join.js
rename to deps/npm/node_modules/bluebird/js/main/join.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/map.js b/deps/npm/node_modules/bluebird/js/main/map.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/map.js
rename to deps/npm/node_modules/bluebird/js/main/map.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/method.js b/deps/npm/node_modules/bluebird/js/main/method.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/method.js
rename to deps/npm/node_modules/bluebird/js/main/method.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/nodeify.js b/deps/npm/node_modules/bluebird/js/main/nodeify.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/nodeify.js
rename to deps/npm/node_modules/bluebird/js/main/nodeify.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/progress.js b/deps/npm/node_modules/bluebird/js/main/progress.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/progress.js
rename to deps/npm/node_modules/bluebird/js/main/progress.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/promise.js b/deps/npm/node_modules/bluebird/js/main/promise.js
similarity index 92%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/promise.js
rename to deps/npm/node_modules/bluebird/js/main/promise.js
index 96bd5456f4ae2f..8e2ccfbd361e58 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/promise.js
+++ b/deps/npm/node_modules/bluebird/js/main/promise.js
@@ -726,29 +726,29 @@ require('./any.js')(Promise);
 require('./each.js')(Promise, INTERNAL);
 require('./timers.js')(Promise, INTERNAL);
 require('./filter.js')(Promise, INTERNAL);
-                                                         
-    util.toFastProperties(Promise);                                          
-    util.toFastProperties(Promise.prototype);                                
-    function fillTypes(value) {                                              
-        var p = new Promise(INTERNAL);                                       
-        p._fulfillmentHandler0 = value;                                      
-        p._rejectionHandler0 = value;                                        
-        p._progressHandler0 = value;                                         
-        p._promise0 = value;                                                 
-        p._receiver0 = value;                                                
-        p._settledValue = value;                                             
-    }                                                                        
-    // Complete slack tracking, opt out of field-type tracking and           
-    // stabilize map                                                         
-    fillTypes({a: 1});                                                       
-    fillTypes({b: 2});                                                       
-    fillTypes({c: 3});                                                       
-    fillTypes(1);                                                            
-    fillTypes(function(){});                                                 
-    fillTypes(undefined);                                                    
-    fillTypes(false);                                                        
-    fillTypes(new Promise(INTERNAL));                                        
-    CapturedTrace.setBounds(async.firstLineError, util.lastLineError);       
-    return Promise;                                                          
+
+    util.toFastProperties(Promise);
+    util.toFastProperties(Promise.prototype);
+    function fillTypes(value) {
+        var p = new Promise(INTERNAL);
+        p._fulfillmentHandler0 = value;
+        p._rejectionHandler0 = value;
+        p._progressHandler0 = value;
+        p._promise0 = value;
+        p._receiver0 = value;
+        p._settledValue = value;
+    }
+    // Complete slack tracking, opt out of field-type tracking and
+    // stabilize map
+    fillTypes({a: 1});
+    fillTypes({b: 2});
+    fillTypes({c: 3});
+    fillTypes(1);
+    fillTypes(function(){});
+    fillTypes(undefined);
+    fillTypes(false);
+    fillTypes(new Promise(INTERNAL));
+    CapturedTrace.setBounds(async.firstLineError, util.lastLineError);
+    return Promise;
 
 };
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/promise_array.js b/deps/npm/node_modules/bluebird/js/main/promise_array.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/promise_array.js
rename to deps/npm/node_modules/bluebird/js/main/promise_array.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/promise_resolver.js b/deps/npm/node_modules/bluebird/js/main/promise_resolver.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/promise_resolver.js
rename to deps/npm/node_modules/bluebird/js/main/promise_resolver.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/promisify.js b/deps/npm/node_modules/bluebird/js/main/promisify.js
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/promisify.js
rename to deps/npm/node_modules/bluebird/js/main/promisify.js
index 86763d60bae2a8..1558e8cbd96e53 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/promisify.js
+++ b/deps/npm/node_modules/bluebird/js/main/promisify.js
@@ -304,4 +304,3 @@ Promise.promisifyAll = function (target, options) {
     return promisifyAll(target, suffix, filter, promisifier);
 };
 };
-
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/props.js b/deps/npm/node_modules/bluebird/js/main/props.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/props.js
rename to deps/npm/node_modules/bluebird/js/main/props.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/queue.js b/deps/npm/node_modules/bluebird/js/main/queue.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/queue.js
rename to deps/npm/node_modules/bluebird/js/main/queue.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/race.js b/deps/npm/node_modules/bluebird/js/main/race.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/race.js
rename to deps/npm/node_modules/bluebird/js/main/race.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/reduce.js b/deps/npm/node_modules/bluebird/js/main/reduce.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/reduce.js
rename to deps/npm/node_modules/bluebird/js/main/reduce.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/schedule.js b/deps/npm/node_modules/bluebird/js/main/schedule.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/schedule.js
rename to deps/npm/node_modules/bluebird/js/main/schedule.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/settle.js b/deps/npm/node_modules/bluebird/js/main/settle.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/settle.js
rename to deps/npm/node_modules/bluebird/js/main/settle.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/some.js b/deps/npm/node_modules/bluebird/js/main/some.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/some.js
rename to deps/npm/node_modules/bluebird/js/main/some.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/synchronous_inspection.js b/deps/npm/node_modules/bluebird/js/main/synchronous_inspection.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/synchronous_inspection.js
rename to deps/npm/node_modules/bluebird/js/main/synchronous_inspection.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/thenables.js b/deps/npm/node_modules/bluebird/js/main/thenables.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/thenables.js
rename to deps/npm/node_modules/bluebird/js/main/thenables.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/timers.js b/deps/npm/node_modules/bluebird/js/main/timers.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/timers.js
rename to deps/npm/node_modules/bluebird/js/main/timers.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/using.js b/deps/npm/node_modules/bluebird/js/main/using.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/using.js
rename to deps/npm/node_modules/bluebird/js/main/using.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/util.js b/deps/npm/node_modules/bluebird/js/main/util.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/js/main/util.js
rename to deps/npm/node_modules/bluebird/js/main/util.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/package.json b/deps/npm/node_modules/bluebird/package.json
similarity index 74%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/package.json
rename to deps/npm/node_modules/bluebird/package.json
index 92e49170e89883..891665390c0c96 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/bluebird/package.json
+++ b/deps/npm/node_modules/bluebird/package.json
@@ -1,46 +1,48 @@
 {
-  "name": "bluebird",
-  "description": "Full featured Promises/A+ implementation with exceptionally good performance",
-  "version": "2.10.1",
-  "keywords": [
-    "promise",
-    "performance",
-    "promises",
-    "promises-a",
-    "promises-aplus",
-    "async",
-    "await",
-    "deferred",
-    "deferreds",
-    "future",
-    "flow control",
-    "dsl",
-    "fluent interface",
-    "parallel",
-    "thread",
-    "concurrency"
+  "_args": [
+    [
+      "bluebird@^2.9.30",
+      "/Users/rebecca/code/npm/node_modules/har-validator"
+    ]
   ],
-  "scripts": {
-    "lint": "node scripts/jshint.js",
-    "test": "node tools/test.js",
-    "istanbul": "istanbul",
-    "prepublish": "node tools/build.js --no-debug --main --zalgo --browser --minify",
-    "generate-browser-core": "node tools/build.js --features=core --no-debug --main --zalgo --browser --minify && mv js/browser/bluebird.js js/browser/bluebird.core.js && mv js/browser/bluebird.min.js js/browser/bluebird.core.min.js"
-  },
-  "homepage": "https://github.com/petkaantonov/bluebird",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/petkaantonov/bluebird.git"
+  "_from": "bluebird@>=2.9.30 <3.0.0",
+  "_id": "bluebird@2.10.1",
+  "_inCache": true,
+  "_location": "/bluebird",
+  "_nodeVersion": "2.3.0",
+  "_npmUser": {
+    "email": "petka_antonov@hotmail.com",
+    "name": "esailija"
   },
-  "bugs": {
-    "url": "http://github.com/petkaantonov/bluebird/issues"
+  "_npmVersion": "2.11.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "bluebird",
+    "raw": "bluebird@^2.9.30",
+    "rawSpec": "^2.9.30",
+    "scope": null,
+    "spec": ">=2.9.30 <3.0.0",
+    "type": "range"
   },
-  "license": "MIT",
+  "_requiredBy": [
+    "/har-validator"
+  ],
+  "_resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.1.tgz",
+  "_shasum": "3aeb31bdd92e52df50cba95303e281f94448ce06",
+  "_shrinkwrap": null,
+  "_spec": "bluebird@^2.9.30",
+  "_where": "/Users/rebecca/code/npm/node_modules/har-validator",
   "author": {
-    "name": "Petka Antonov",
     "email": "petka_antonov@hotmail.com",
+    "name": "Petka Antonov",
     "url": "http://github.com/petkaantonov/"
   },
+  "browser": "./js/browser/bluebird.js",
+  "bugs": {
+    "url": "http://github.com/petkaantonov/bluebird/issues"
+  },
+  "dependencies": {},
+  "description": "Full featured Promises/A+ implementation with exceptionally good performance",
   "devDependencies": {
     "acorn": "~0.6.0",
     "baconjs": "^0.7.43",
@@ -56,6 +58,7 @@
     "istanbul": "^0.3.5",
     "jshint": "^2.6.0",
     "jshint-stylish": "~0.2.0",
+    "kefir": "^2.4.1",
     "mkdirp": "~0.5.0",
     "mocha": "~2.1",
     "open": "~0.0.5",
@@ -64,11 +67,13 @@
     "rx": "^2.3.25",
     "serve-static": "^1.7.1",
     "sinon": "~1.7.3",
-    "uglify-js": "~2.4.16",
-    "kefir": "^2.4.1"
+    "uglify-js": "~2.4.16"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "3aeb31bdd92e52df50cba95303e281f94448ce06",
+    "tarball": "http://registry.npmjs.org/bluebird/-/bluebird-2.10.1.tgz"
   },
-  "main": "./js/main/bluebird.js",
-  "browser": "./js/browser/bluebird.js",
   "files": [
     "js/browser",
     "js/main",
@@ -76,26 +81,46 @@
     "zalgo.js"
   ],
   "gitHead": "41b23cce935e77b851e076928745ad4c3cebba42",
-  "_id": "bluebird@2.10.1",
-  "_shasum": "3aeb31bdd92e52df50cba95303e281f94448ce06",
-  "_from": "bluebird@>=2.9.30 <3.0.0",
-  "_npmVersion": "2.11.1",
-  "_nodeVersion": "2.3.0",
-  "_npmUser": {
-    "name": "esailija",
-    "email": "petka_antonov@hotmail.com"
-  },
+  "homepage": "https://github.com/petkaantonov/bluebird",
+  "installable": true,
+  "keywords": [
+    "async",
+    "await",
+    "concurrency",
+    "deferred",
+    "deferreds",
+    "dsl",
+    "flow control",
+    "fluent interface",
+    "future",
+    "parallel",
+    "performance",
+    "promise",
+    "promises",
+    "promises-a",
+    "promises-aplus",
+    "thread"
+  ],
+  "license": "MIT",
+  "main": "./js/main/bluebird.js",
   "maintainers": [
     {
       "name": "esailija",
       "email": "petka_antonov@hotmail.com"
     }
   ],
-  "dist": {
-    "shasum": "3aeb31bdd92e52df50cba95303e281f94448ce06",
-    "tarball": "http://registry.npmjs.org/bluebird/-/bluebird-2.10.1.tgz"
+  "name": "bluebird",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/petkaantonov/bluebird.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "generate-browser-core": "node tools/build.js --features=core --no-debug --main --zalgo --browser --minify && mv js/browser/bluebird.js js/browser/bluebird.core.js && mv js/browser/bluebird.min.js js/browser/bluebird.core.min.js",
+    "istanbul": "istanbul",
+    "lint": "node scripts/jshint.js",
+    "prepublish": "node tools/build.js --no-debug --main --zalgo --browser --minify",
+    "test": "node tools/test.js"
+  },
+  "version": "2.10.1"
 }
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/.npmignore b/deps/npm/node_modules/boom/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/.npmignore
rename to deps/npm/node_modules/boom/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/.travis.yml b/deps/npm/node_modules/boom/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/.travis.yml
rename to deps/npm/node_modules/boom/.travis.yml
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/CONTRIBUTING.md b/deps/npm/node_modules/boom/CONTRIBUTING.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/CONTRIBUTING.md
rename to deps/npm/node_modules/boom/CONTRIBUTING.md
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/LICENSE b/deps/npm/node_modules/boom/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/LICENSE
rename to deps/npm/node_modules/boom/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/README.md b/deps/npm/node_modules/boom/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/README.md
rename to deps/npm/node_modules/boom/README.md
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/images/boom.png b/deps/npm/node_modules/boom/images/boom.png
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/images/boom.png
rename to deps/npm/node_modules/boom/images/boom.png
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/lib/index.js b/deps/npm/node_modules/boom/lib/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/lib/index.js
rename to deps/npm/node_modules/boom/lib/index.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/package.json b/deps/npm/node_modules/boom/package.json
similarity index 68%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/package.json
rename to deps/npm/node_modules/boom/package.json
index c9d3f09b64718c..47e26632201779 100644
--- a/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/package.json
+++ b/deps/npm/node_modules/boom/package.json
@@ -1,45 +1,66 @@
 {
-  "name": "boom",
-  "description": "HTTP-friendly error objects",
-  "version": "2.9.0",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/hapijs/boom.git"
+  "_args": [
+    [
+      "boom@^2.8.x",
+      "/Users/rebecca/code/npm/node_modules/hawk"
+    ]
+  ],
+  "_from": "boom@>=2.8.0 <3.0.0",
+  "_id": "boom@2.9.0",
+  "_inCache": true,
+  "_location": "/boom",
+  "_nodeVersion": "0.10.40",
+  "_npmUser": {
+    "email": "arbretz@gmail.com",
+    "name": "arb"
   },
-  "main": "lib/index.js",
-  "keywords": [
-    "error",
-    "http"
+  "_npmVersion": "2.11.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "boom",
+    "raw": "boom@^2.8.x",
+    "rawSpec": "^2.8.x",
+    "scope": null,
+    "spec": ">=2.8.0 <3.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/cryptiles",
+    "/hawk"
   ],
-  "engines": {
-    "node": ">=0.10.40"
+  "_resolved": "https://registry.npmjs.org/boom/-/boom-2.9.0.tgz",
+  "_shasum": "a54b7fd2fee477d351bf9e371680cbea67f12715",
+  "_shrinkwrap": null,
+  "_spec": "boom@^2.8.x",
+  "_where": "/Users/rebecca/code/npm/node_modules/hawk",
+  "bugs": {
+    "url": "https://github.com/hapijs/boom/issues"
   },
   "dependencies": {
     "hoek": "2.x.x"
   },
+  "description": "HTTP-friendly error objects",
   "devDependencies": {
     "code": "1.x.x",
     "lab": "5.x.x"
   },
-  "scripts": {
-    "test": "lab -a code -t 100 -L",
-    "test-cov-html": "lab -a code -r html -o coverage.html -L"
+  "directories": {},
+  "dist": {
+    "shasum": "a54b7fd2fee477d351bf9e371680cbea67f12715",
+    "tarball": "http://registry.npmjs.org/boom/-/boom-2.9.0.tgz"
   },
-  "license": "BSD-3-Clause",
-  "gitHead": "2ffee0e9d9868140911d30c7acfd7925e534623e",
-  "bugs": {
-    "url": "https://github.com/hapijs/boom/issues"
+  "engines": {
+    "node": ">=0.10.40"
   },
+  "gitHead": "2ffee0e9d9868140911d30c7acfd7925e534623e",
   "homepage": "https://github.com/hapijs/boom#readme",
-  "_id": "boom@2.9.0",
-  "_shasum": "a54b7fd2fee477d351bf9e371680cbea67f12715",
-  "_from": "boom@>=2.8.0 <3.0.0",
-  "_npmVersion": "2.11.1",
-  "_nodeVersion": "0.10.40",
-  "_npmUser": {
-    "name": "arb",
-    "email": "arbretz@gmail.com"
-  },
+  "installable": true,
+  "keywords": [
+    "error",
+    "http"
+  ],
+  "license": "BSD-3-Clause",
+  "main": "lib/index.js",
   "maintainers": [
     {
       "name": "hueniverse",
@@ -54,11 +75,15 @@
       "email": "arbretz@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "a54b7fd2fee477d351bf9e371680cbea67f12715",
-    "tarball": "http://registry.npmjs.org/boom/-/boom-2.9.0.tgz"
+  "name": "boom",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/hapijs/boom.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/boom/-/boom-2.9.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "lab -a code -t 100 -L",
+    "test-cov-html": "lab -a code -r html -o coverage.html -L"
+  },
+  "version": "2.9.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/test/index.js b/deps/npm/node_modules/boom/test/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/test/index.js
rename to deps/npm/node_modules/boom/test/index.js
diff --git a/deps/npm/node_modules/brace-expansion/.npmignore b/deps/npm/node_modules/brace-expansion/.npmignore
new file mode 100644
index 00000000000000..353546af2368e1
--- /dev/null
+++ b/deps/npm/node_modules/brace-expansion/.npmignore
@@ -0,0 +1,3 @@
+test
+.gitignore
+.travis.yml
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md b/deps/npm/node_modules/brace-expansion/README.md
similarity index 96%
rename from deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md
rename to deps/npm/node_modules/brace-expansion/README.md
index 62bc7bae3fed28..b0d793ed5d9016 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md
+++ b/deps/npm/node_modules/brace-expansion/README.md
@@ -1,9 +1,10 @@
 # brace-expansion
 
-[Brace expansion](https://www.gnu.org/software/bash/manual/html_node/Brace-Expansion.html), 
+[Brace expansion](https://www.gnu.org/software/bash/manual/html_node/Brace-Expansion.html),
 as known from sh/bash, in JavaScript.
 
 [![build status](https://secure.travis-ci.org/juliangruber/brace-expansion.svg)](http://travis-ci.org/juliangruber/brace-expansion)
+[![downloads](https://img.shields.io/npm/dm/brace-expansion.svg)](https://www.npmjs.org/package/brace-expansion)
 
 [![testling badge](https://ci.testling.com/juliangruber/brace-expansion.png)](https://ci.testling.com/juliangruber/brace-expansion)
 
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/example.js b/deps/npm/node_modules/brace-expansion/example.js
similarity index 99%
rename from deps/npm/node_modules/minimatch/node_modules/brace-expansion/example.js
rename to deps/npm/node_modules/brace-expansion/example.js
index 60ecfc74d41618..36cde4de5c114b 100644
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/example.js
+++ b/deps/npm/node_modules/brace-expansion/example.js
@@ -5,4 +5,3 @@ console.log(expand('http://www.numericals.com/file{1..100..10}.txt'));
 console.log(expand('http://www.letters.com/file{a..z..2}.txt'));
 console.log(expand('mkdir /usr/local/src/bash/{old,new,dist,bugs}'));
 console.log(expand('chown root /usr/{ucb/{ex,edit},lib/{ex?.?*,how_ex}}'));
-
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/index.js b/deps/npm/node_modules/brace-expansion/index.js
similarity index 99%
rename from deps/npm/node_modules/minimatch/node_modules/brace-expansion/index.js
rename to deps/npm/node_modules/brace-expansion/index.js
index a23104e9550173..f8d40f79acde0a 100644
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/index.js
+++ b/deps/npm/node_modules/brace-expansion/index.js
@@ -188,4 +188,3 @@ function expand(str, isTop) {
 
   return expansions;
 }
-
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/package.json b/deps/npm/node_modules/brace-expansion/package.json
similarity index 51%
rename from deps/npm/node_modules/minimatch/node_modules/brace-expansion/package.json
rename to deps/npm/node_modules/brace-expansion/package.json
index 5f1866c8b5a29e..5e70336f86ed64 100644
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/package.json
+++ b/deps/npm/node_modules/brace-expansion/package.json
@@ -1,60 +1,67 @@
 {
-  "name": "brace-expansion",
-  "description": "Brace expansion as known from sh/bash",
-  "version": "1.1.0",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/juliangruber/brace-expansion.git"
+  "_args": [
+    [
+      "brace-expansion@^1.0.0",
+      "/Users/rebecca/code/npm/node_modules/glob/node_modules/minimatch"
+    ],
+    [
+      "brace-expansion@^1.0.0",
+      "/Users/rebecca/code/npm/node_modules/minimatch"
+    ]
+  ],
+  "_from": "brace-expansion@>=1.0.0 <2.0.0",
+  "_id": "brace-expansion@1.1.1",
+  "_inCache": true,
+  "_location": "/brace-expansion",
+  "_nodeVersion": "0.10.36",
+  "_npmUser": {
+    "email": "julian@juliangruber.com",
+    "name": "juliangruber"
   },
-  "homepage": "https://github.com/juliangruber/brace-expansion",
-  "main": "index.js",
-  "scripts": {
-    "test": "tape test/*.js",
-    "gentest": "bash test/generate.sh"
+  "_npmVersion": "2.6.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "brace-expansion",
+    "raw": "brace-expansion@^1.0.0",
+    "rawSpec": "^1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/minimatch",
+    "/node-gyp/glob/minimatch"
+  ],
+  "_shrinkwrap": null,
+  "_spec": "brace-expansion@^1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/minimatch",
+  "author": {
+    "email": "mail@juliangruber.com",
+    "name": "Julian Gruber",
+    "url": "http://juliangruber.com"
+  },
+  "bugs": {
+    "url": "https://github.com/juliangruber/brace-expansion/issues"
   },
   "dependencies": {
     "balanced-match": "^0.2.0",
     "concat-map": "0.0.1"
   },
+  "description": "Brace expansion as known from sh/bash",
   "devDependencies": {
     "tape": "^3.0.3"
   },
-  "keywords": [],
-  "author": {
-    "name": "Julian Gruber",
-    "email": "mail@juliangruber.com",
-    "url": "http://juliangruber.com"
+  "directories": {},
+  "dist": {
+    "shasum": "da5fb78aef4c44c9e4acf525064fb3208ebab045",
+    "tarball": "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz"
   },
+  "gitHead": "f50da498166d76ea570cf3b30179f01f0f119612",
+  "homepage": "https://github.com/juliangruber/brace-expansion",
+  "installable": true,
+  "keywords": [],
   "license": "MIT",
-  "testling": {
-    "files": "test/*.js",
-    "browsers": [
-      "ie/8..latest",
-      "firefox/20..latest",
-      "firefox/nightly",
-      "chrome/25..latest",
-      "chrome/canary",
-      "opera/12..latest",
-      "opera/next",
-      "safari/5.1..latest",
-      "ipad/6.0..latest",
-      "iphone/6.0..latest",
-      "android-browser/4.2..latest"
-    ]
-  },
-  "gitHead": "b5fa3b1c74e5e2dba2d0efa19b28335641bc1164",
-  "bugs": {
-    "url": "https://github.com/juliangruber/brace-expansion/issues"
-  },
-  "_id": "brace-expansion@1.1.0",
-  "_shasum": "c9b7d03c03f37bc704be100e522b40db8f6cfcd9",
-  "_from": "brace-expansion@>=1.0.0 <2.0.0",
-  "_npmVersion": "2.1.10",
-  "_nodeVersion": "0.10.32",
-  "_npmUser": {
-    "name": "juliangruber",
-    "email": "julian@juliangruber.com"
-  },
+  "main": "index.js",
   "maintainers": [
     {
       "name": "juliangruber",
@@ -65,11 +72,31 @@
       "email": "isaacs@npmjs.com"
     }
   ],
-  "dist": {
-    "shasum": "c9b7d03c03f37bc704be100e522b40db8f6cfcd9",
-    "tarball": "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz"
+  "name": "brace-expansion",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/juliangruber/brace-expansion.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "gentest": "bash test/generate.sh",
+    "test": "tape test/*.js"
+  },
+  "testling": {
+    "browsers": [
+      "android-browser/4.2..latest",
+      "chrome/25..latest",
+      "chrome/canary",
+      "firefox/20..latest",
+      "firefox/nightly",
+      "ie/8..latest",
+      "ipad/6.0..latest",
+      "iphone/6.0..latest",
+      "opera/12..latest",
+      "opera/next",
+      "safari/5.1..latest"
+    ],
+    "files": "test/*.js"
+  },
+  "version": "1.1.1"
 }
diff --git a/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/builtin-modules.json b/deps/npm/node_modules/builtin-modules/builtin-modules.json
similarity index 100%
rename from deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/builtin-modules.json
rename to deps/npm/node_modules/builtin-modules/builtin-modules.json
diff --git a/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/index.js b/deps/npm/node_modules/builtin-modules/index.js
similarity index 100%
rename from deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/index.js
rename to deps/npm/node_modules/builtin-modules/index.js
diff --git a/deps/npm/node_modules/glob/node_modules/path-is-absolute/license b/deps/npm/node_modules/builtin-modules/license
similarity index 100%
rename from deps/npm/node_modules/glob/node_modules/path-is-absolute/license
rename to deps/npm/node_modules/builtin-modules/license
diff --git a/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/package.json b/deps/npm/node_modules/builtin-modules/package.json
similarity index 61%
rename from deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/package.json
rename to deps/npm/node_modules/builtin-modules/package.json
index a6851b0e059203..d509e87c26bc06 100644
--- a/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/package.json
+++ b/deps/npm/node_modules/builtin-modules/package.json
@@ -1,69 +1,95 @@
 {
-  "name": "builtin-modules",
-  "version": "1.1.0",
-  "description": "List of the Node.js builtin modules",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sindresorhus/builtin-modules.git"
+  "_args": [
+    [
+      "builtin-modules@^1.0.0",
+      "/Users/rebecca/code/npm/node_modules/is-builtin-module"
+    ]
+  ],
+  "_from": "builtin-modules@>=1.0.0 <2.0.0",
+  "_id": "builtin-modules@1.1.0",
+  "_inCache": true,
+  "_location": "/builtin-modules",
+  "_nodeVersion": "3.0.0",
+  "_npmUser": {
+    "email": "sindresorhus@gmail.com",
+    "name": "sindresorhus"
+  },
+  "_npmVersion": "2.13.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "builtin-modules",
+    "raw": "builtin-modules@^1.0.0",
+    "rawSpec": "^1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
   },
+  "_requiredBy": [
+    "/is-builtin-module"
+  ],
+  "_resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz",
+  "_shasum": "1053955fd994a5746e525e4ac717b81caf07491c",
+  "_shrinkwrap": null,
+  "_spec": "builtin-modules@^1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/is-builtin-module",
   "author": {
-    "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
+    "name": "Sindre Sorhus",
     "url": "sindresorhus.com"
   },
+  "bugs": {
+    "url": "https://github.com/sindresorhus/builtin-modules/issues"
+  },
+  "dependencies": {},
+  "description": "List of the Node.js builtin modules",
+  "devDependencies": {
+    "ava": "*",
+    "xo": "*"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "1053955fd994a5746e525e4ac717b81caf07491c",
+    "tarball": "http://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
+  },
   "engines": {
     "node": ">=0.10.0"
   },
-  "scripts": {
-    "test": "xo && ava",
-    "make": "node make.js"
-  },
   "files": [
+    "builtin-modules.json",
     "index.js",
-    "static.js",
-    "builtin-modules.json"
+    "static.js"
   ],
+  "gitHead": "d317be16fab701f2ac73bc9aa771f60ec052ed66",
+  "homepage": "https://github.com/sindresorhus/builtin-modules#readme",
+  "installable": true,
   "keywords": [
-    "builtin",
+    "array",
     "built-in",
+    "builtin",
     "builtins",
-    "node",
-    "modules",
-    "core",
     "bundled",
+    "core",
     "list",
-    "array",
-    "names"
+    "modules",
+    "names",
+    "node"
   ],
-  "devDependencies": {
-    "ava": "*",
-    "xo": "*"
-  },
-  "gitHead": "d317be16fab701f2ac73bc9aa771f60ec052ed66",
-  "bugs": {
-    "url": "https://github.com/sindresorhus/builtin-modules/issues"
-  },
-  "homepage": "https://github.com/sindresorhus/builtin-modules#readme",
-  "_id": "builtin-modules@1.1.0",
-  "_shasum": "1053955fd994a5746e525e4ac717b81caf07491c",
-  "_from": "builtin-modules@>=1.0.0 <2.0.0",
-  "_npmVersion": "2.13.3",
-  "_nodeVersion": "3.0.0",
-  "_npmUser": {
-    "name": "sindresorhus",
-    "email": "sindresorhus@gmail.com"
-  },
-  "dist": {
-    "shasum": "1053955fd994a5746e525e4ac717b81caf07491c",
-    "tarball": "http://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
-  },
+  "license": "MIT",
   "maintainers": [
     {
       "name": "sindresorhus",
       "email": "sindresorhus@gmail.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
+  "name": "builtin-modules",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sindresorhus/builtin-modules.git"
+  },
+  "scripts": {
+    "make": "node make.js",
+    "test": "xo && ava"
+  },
+  "version": "1.1.0"
 }
diff --git a/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/readme.md b/deps/npm/node_modules/builtin-modules/readme.md
similarity index 100%
rename from deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/readme.md
rename to deps/npm/node_modules/builtin-modules/readme.md
diff --git a/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/static.js b/deps/npm/node_modules/builtin-modules/static.js
similarity index 100%
rename from deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/static.js
rename to deps/npm/node_modules/builtin-modules/static.js
diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/.travis.yml b/deps/npm/node_modules/builtins/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/mkdirp/node_modules/minimist/.travis.yml
rename to deps/npm/node_modules/builtins/.travis.yml
diff --git a/deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/History.md b/deps/npm/node_modules/builtins/History.md
similarity index 100%
rename from deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/History.md
rename to deps/npm/node_modules/builtins/History.md
diff --git a/deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/Readme.md b/deps/npm/node_modules/builtins/Readme.md
similarity index 100%
rename from deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/Readme.md
rename to deps/npm/node_modules/builtins/Readme.md
diff --git a/deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/builtins.json b/deps/npm/node_modules/builtins/builtins.json
similarity index 100%
rename from deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/builtins.json
rename to deps/npm/node_modules/builtins/builtins.json
diff --git a/deps/npm/node_modules/builtins/package.json b/deps/npm/node_modules/builtins/package.json
new file mode 100644
index 00000000000000..d3a0e571f28089
--- /dev/null
+++ b/deps/npm/node_modules/builtins/package.json
@@ -0,0 +1,71 @@
+{
+  "_args": [
+    [
+      "builtins@0.0.7",
+      "/Users/rebecca/code/npm/node_modules/validate-npm-package-name"
+    ]
+  ],
+  "_from": "builtins@0.0.7",
+  "_id": "builtins@0.0.7",
+  "_inCache": true,
+  "_location": "/builtins",
+  "_npmUser": {
+    "email": "julian@juliangruber.com",
+    "name": "juliangruber"
+  },
+  "_npmVersion": "1.3.22",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "builtins",
+    "raw": "builtins@0.0.7",
+    "rawSpec": "0.0.7",
+    "scope": null,
+    "spec": "0.0.7",
+    "type": "version"
+  },
+  "_requiredBy": [
+    "/validate-npm-package-name"
+  ],
+  "_resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz",
+  "_shasum": "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a",
+  "_shrinkwrap": null,
+  "_spec": "builtins@0.0.7",
+  "_where": "/Users/rebecca/code/npm/node_modules/validate-npm-package-name",
+  "bugs": {
+    "url": "https://github.com/juliangruber/builtins/issues"
+  },
+  "dependencies": {},
+  "description": "List of node.js builtin modules",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a",
+    "tarball": "http://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
+  },
+  "homepage": "https://github.com/juliangruber/builtins",
+  "license": "MIT",
+  "main": "builtins.json",
+  "maintainers": [
+    {
+      "name": "juliangruber",
+      "email": "julian@juliangruber.com"
+    },
+    {
+      "name": "segment",
+      "email": "tj@segment.io"
+    }
+  ],
+  "name": "builtins",
+  "optionalDependencies": {},
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/juliangruber/builtins"
+  },
+  "scripts": {
+    "test": "node -e \"require('./builtins.json')\""
+  },
+  "version": "0.0.7"
+}
diff --git a/deps/npm/node_modules/request/node_modules/caseless/LICENSE b/deps/npm/node_modules/caseless/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/caseless/LICENSE
rename to deps/npm/node_modules/caseless/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/caseless/README.md b/deps/npm/node_modules/caseless/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/caseless/README.md
rename to deps/npm/node_modules/caseless/README.md
diff --git a/deps/npm/node_modules/request/node_modules/caseless/index.js b/deps/npm/node_modules/caseless/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/caseless/index.js
rename to deps/npm/node_modules/caseless/index.js
diff --git a/deps/npm/node_modules/request/node_modules/caseless/package.json b/deps/npm/node_modules/caseless/package.json
similarity index 64%
rename from deps/npm/node_modules/request/node_modules/caseless/package.json
rename to deps/npm/node_modules/caseless/package.json
index 2cd79ea01ab69b..eb2fdfd7839c02 100644
--- a/deps/npm/node_modules/request/node_modules/caseless/package.json
+++ b/deps/npm/node_modules/caseless/package.json
@@ -1,43 +1,63 @@
 {
-  "name": "caseless",
-  "version": "0.11.0",
-  "description": "Caseless object set/get/has, very useful when working with HTTP headers.",
-  "main": "index.js",
-  "scripts": {
-    "test": "node test.js"
+  "_args": [
+    [
+      "caseless@~0.11.0",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
+  ],
+  "_from": "caseless@>=0.11.0 <0.12.0",
+  "_id": "caseless@0.11.0",
+  "_inCache": true,
+  "_location": "/caseless",
+  "_nodeVersion": "1.8.1",
+  "_npmUser": {
+    "email": "mikeal.rogers@gmail.com",
+    "name": "mikeal"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mikeal/caseless.git"
+  "_npmVersion": "2.8.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "caseless",
+    "raw": "caseless@~0.11.0",
+    "rawSpec": "~0.11.0",
+    "scope": null,
+    "spec": ">=0.11.0 <0.12.0",
+    "type": "range"
   },
-  "keywords": [
-    "headers",
-    "http",
-    "caseless"
+  "_requiredBy": [
+    "/request"
   ],
-  "test": "node test.js",
+  "_resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+  "_shasum": "715b96ea9841593cc33067923f5ec60ebda4f7d7",
+  "_shrinkwrap": null,
+  "_spec": "caseless@~0.11.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
   "author": {
-    "name": "Mikeal Rogers",
-    "email": "mikeal.rogers@gmail.com"
+    "email": "mikeal.rogers@gmail.com",
+    "name": "Mikeal Rogers"
   },
-  "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/mikeal/caseless/issues"
   },
+  "dependencies": {},
+  "description": "Caseless object set/get/has, very useful when working with HTTP headers.",
   "devDependencies": {
     "tape": "^2.10.2"
   },
+  "directories": {},
+  "dist": {
+    "shasum": "715b96ea9841593cc33067923f5ec60ebda4f7d7",
+    "tarball": "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+  },
   "gitHead": "c578232a02cc2b46b6da8851caf57fdbfac89ff5",
   "homepage": "https://github.com/mikeal/caseless#readme",
-  "_id": "caseless@0.11.0",
-  "_shasum": "715b96ea9841593cc33067923f5ec60ebda4f7d7",
-  "_from": "caseless@>=0.11.0 <0.12.0",
-  "_npmVersion": "2.8.3",
-  "_nodeVersion": "1.8.1",
-  "_npmUser": {
-    "name": "mikeal",
-    "email": "mikeal.rogers@gmail.com"
-  },
+  "keywords": [
+    "caseless",
+    "headers",
+    "http"
+  ],
+  "license": "Apache-2.0",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "mikeal",
@@ -52,11 +72,15 @@
       "email": "simeonvelichkov@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "715b96ea9841593cc33067923f5ec60ebda4f7d7",
-    "tarball": "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+  "name": "caseless",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mikeal/caseless.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "node test.js"
+  },
+  "test": "node test.js",
+  "version": "0.11.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/caseless/test.js b/deps/npm/node_modules/caseless/test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/caseless/test.js
rename to deps/npm/node_modules/caseless/test.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/index.js b/deps/npm/node_modules/chalk/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/index.js
rename to deps/npm/node_modules/chalk/index.js
diff --git a/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/license b/deps/npm/node_modules/chalk/license
similarity index 100%
rename from deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/license
rename to deps/npm/node_modules/chalk/license
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/package.json b/deps/npm/node_modules/chalk/package.json
similarity index 73%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/package.json
rename to deps/npm/node_modules/chalk/package.json
index a6120d20c890b9..f1773ed151a2bf 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/package.json
+++ b/deps/npm/node_modules/chalk/package.json
@@ -1,61 +1,43 @@
 {
-  "name": "chalk",
-  "version": "1.1.1",
-  "description": "Terminal string styling done right. Much color.",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/chalk/chalk.git"
-  },
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    },
-    {
-      "name": "jbnicolai",
-      "email": "jappelman@xebia.com"
-    },
-    {
-      "name": "unicorn",
-      "email": "sindresorhus+unicorn@gmail.com"
-    }
+  "_args": [
+    [
+      "chalk@1.1.1",
+      "/Users/rebecca/code/npm"
+    ]
   ],
-  "engines": {
-    "node": ">=0.10.0"
+  "_from": "chalk@1.1.1",
+  "_id": "chalk@1.1.1",
+  "_inCache": true,
+  "_location": "/chalk",
+  "_nodeVersion": "0.12.7",
+  "_npmUser": {
+    "email": "sindresorhus@gmail.com",
+    "name": "sindresorhus"
   },
-  "scripts": {
-    "test": "xo && mocha",
-    "bench": "matcha benchmark.js",
-    "coverage": "nyc npm test && nyc report",
-    "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls"
+  "_npmVersion": "2.13.5",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "chalk",
+    "raw": "chalk@1.1.1",
+    "rawSpec": "1.1.1",
+    "scope": null,
+    "spec": "1.1.1",
+    "type": "version"
   },
-  "files": [
-    "index.js"
-  ],
-  "keywords": [
-    "color",
-    "colour",
-    "colors",
-    "terminal",
-    "console",
-    "cli",
-    "string",
-    "str",
-    "ansi",
-    "style",
-    "styles",
-    "tty",
-    "formatting",
-    "rgb",
-    "256",
-    "shell",
-    "xterm",
-    "log",
-    "logging",
-    "command-line",
-    "text"
+  "_requiredBy": [
+    "/eslint",
+    "/har-validator",
+    "/inquirer",
+    "/unicode-length"
   ],
+  "_resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+  "_shasum": "509afb67066e7499f7eb3535c77445772ae2d019",
+  "_shrinkwrap": null,
+  "_spec": "chalk@1.1.1",
+  "_where": "/Users/rebecca/code/npm",
+  "bugs": {
+    "url": "https://github.com/chalk/chalk/issues"
+  },
   "dependencies": {
     "ansi-styles": "^2.1.0",
     "escape-string-regexp": "^1.0.2",
@@ -63,6 +45,7 @@
     "strip-ansi": "^3.0.0",
     "supports-color": "^2.0.0"
   },
+  "description": "Terminal string styling done right. Much color.",
   "devDependencies": {
     "coveralls": "^2.11.2",
     "matcha": "^0.6.0",
@@ -73,31 +56,75 @@
     "semver": "^4.3.3",
     "xo": "*"
   },
-  "xo": {
-    "envs": [
-      "node",
-      "mocha"
-    ]
+  "directories": {},
+  "dist": {
+    "shasum": "509afb67066e7499f7eb3535c77445772ae2d019",
+    "tarball": "http://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"
   },
-  "gitHead": "8b554e254e89c85c1fd04dcc444beeb15824e1a5",
-  "bugs": {
-    "url": "https://github.com/chalk/chalk/issues"
+  "engines": {
+    "node": ">=0.10.0"
   },
+  "files": [
+    "index.js"
+  ],
+  "gitHead": "8b554e254e89c85c1fd04dcc444beeb15824e1a5",
   "homepage": "https://github.com/chalk/chalk#readme",
-  "_id": "chalk@1.1.1",
-  "_shasum": "509afb67066e7499f7eb3535c77445772ae2d019",
-  "_from": "chalk@>=1.0.0 <2.0.0",
-  "_npmVersion": "2.13.5",
-  "_nodeVersion": "0.12.7",
-  "_npmUser": {
-    "name": "sindresorhus",
-    "email": "sindresorhus@gmail.com"
+  "installable": true,
+  "keywords": [
+    "256",
+    "ansi",
+    "cli",
+    "color",
+    "colors",
+    "colour",
+    "command-line",
+    "console",
+    "formatting",
+    "log",
+    "logging",
+    "rgb",
+    "shell",
+    "str",
+    "string",
+    "style",
+    "styles",
+    "terminal",
+    "text",
+    "tty",
+    "xterm"
+  ],
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "sindresorhus",
+      "email": "sindresorhus@gmail.com"
+    },
+    {
+      "name": "jbnicolai",
+      "email": "jappelman@xebia.com"
+    },
+    {
+      "name": "unicorn",
+      "email": "sindresorhus+unicorn@gmail.com"
+    }
+  ],
+  "name": "chalk",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/chalk/chalk.git"
   },
-  "dist": {
-    "shasum": "509afb67066e7499f7eb3535c77445772ae2d019",
-    "tarball": "http://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"
+  "scripts": {
+    "bench": "matcha benchmark.js",
+    "coverage": "nyc npm test && nyc report",
+    "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls",
+    "test": "xo && mocha"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "version": "1.1.1",
+  "xo": {
+    "envs": [
+      "mocha",
+      "node"
+    ]
+  }
 }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/readme.md b/deps/npm/node_modules/chalk/readme.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/readme.md
rename to deps/npm/node_modules/chalk/readme.md
diff --git a/deps/npm/node_modules/char-spinner/README.md b/deps/npm/node_modules/char-spinner/README.md
deleted file mode 100644
index b1290f5925b7d0..00000000000000
--- a/deps/npm/node_modules/char-spinner/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# char-spinner
-
-Put a little spinner on process.stderr, as unobtrusively as possible.
-
-## USAGE
-
-```javascript
-var spinner = require("char-spinner")
-
-// All options are optional
-// even the options argument itself is optional
-spinner(options)
-```
-
-## OPTIONS
-
-Usually the defaults are what you want.  Mostly they're just
-configurable for testing purposes.
-
-* `stream` Output stream.  Default=`process.stderr`
-* `tty` Only show spinner if output stream has a truish `.isTTY`.  Default=`true`
-* `string` String of chars to spin.  Default=`'/-\\|'`
-* `interval` Number of ms between frames, bigger = slower.  Default=`50`
-* `cleanup` Print `'\r \r'` to stream on process exit.  Default=`true`
-* `unref` Unreference the spinner interval so that the process can
-  exit normally.  Default=`true`
-* `delay` Number of frames to "skip over" before printing the spinner.
-  Useful if you want to avoid showing the spinner for very fast
-  actions.  Default=`2`
-
-Returns the generated interval, if one was created.
diff --git a/deps/npm/node_modules/char-spinner/package.json b/deps/npm/node_modules/char-spinner/package.json
deleted file mode 100644
index 91092d84bb4089..00000000000000
--- a/deps/npm/node_modules/char-spinner/package.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "name": "char-spinner",
-  "version": "1.0.1",
-  "description": "Put a little spinner on process.stderr, as unobtrusively as possible.",
-  "main": "spin.js",
-  "directories": {
-    "test": "test"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "tap": "^0.4.10"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/char-spinner"
-  },
-  "keywords": [
-    "char",
-    "spinner"
-  ],
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
-  },
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/isaacs/char-spinner/issues"
-  },
-  "homepage": "https://github.com/isaacs/char-spinner",
-  "gitHead": "091b2ff5960aa083f68a5619fa93999d072aa152",
-  "_id": "char-spinner@1.0.1",
-  "_shasum": "e6ea67bd247e107112983b7ab0479ed362800081",
-  "_from": "char-spinner@latest",
-  "_npmVersion": "1.4.13",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "i@izs.me"
-  },
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "dist": {
-    "shasum": "e6ea67bd247e107112983b7ab0479ed362800081",
-    "tarball": "http://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz"
-  },
-  "_resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz"
-}
diff --git a/deps/npm/node_modules/char-spinner/spin.js b/deps/npm/node_modules/char-spinner/spin.js
deleted file mode 100644
index cae8540c6fa649..00000000000000
--- a/deps/npm/node_modules/char-spinner/spin.js
+++ /dev/null
@@ -1,51 +0,0 @@
-module.exports = spinner
-
-function spinner(opt) {
-  opt = opt || {}
-  var str = opt.stream || process.stderr
-  var tty = typeof opt.tty === 'boolean' ? opt.tty : true
-  var string = opt.string || '/-\\|'
-  var ms = typeof opt.interval === 'number' ? opt.interval : 50
-  if (ms < 0) ms = 0
-  if (tty && !str.isTTY) return false
-  var CR = str.isTTY ? '\u001b[0G' : '\u000d';
-  var CLEAR = str.isTTY ? '\u001b[2K' : '\u000d \u000d';
-
-  var s = 0
-  var sprite = string.split('')
-  var wrote = false
-
-  var delay = typeof opt.delay === 'number' ? opt.delay : 2
-
-  var interval = setInterval(function() {
-    if (--delay >= 0) return
-    s = ++s % sprite.length
-    var c = sprite[s]
-    str.write(c + CR)
-    wrote = true
-  }, ms)
-
-  var unref = typeof opt.unref === 'boolean' ? opt.unref : true
-  if (unref && typeof interval.unref === 'function') {
-    interval.unref()
-  }
-
-  var cleanup = typeof opt.cleanup === 'boolean' ? opt.cleanup : true
-  if (cleanup) {
-    process.on('exit', function() {
-      if (wrote) {
-          str.write(CLEAR);
-      }
-    })
-  }
-
-  module.exports.clear = function () {
-    str.write(CLEAR);
-  };
-  
-  return interval
-}
-
-module.exports.clear = function () {};
-
-
diff --git a/deps/npm/node_modules/char-spinner/test/basic.js b/deps/npm/node_modules/char-spinner/test/basic.js
deleted file mode 100644
index ed91b984f70b20..00000000000000
--- a/deps/npm/node_modules/char-spinner/test/basic.js
+++ /dev/null
@@ -1,35 +0,0 @@
-var test = require('tap').test
-var spinner = require('../spin.js')
-
-test('does nothing when not a tty', function(t) {
-  var int = spinner({
-    stream: { write: function(c) {
-      throw new Error('wrote something: ' + JSON.stringify(c))
-    }, isTTY: false },
-  })
-  t.notOk(int)
-  t.end()
-})
-
-test('write spinny stuff', function(t) {
-  var output = ''
-  var written = 0
-  var expect = "b\u001b[0Gc\u001b[0Gd\u001b[0Ge\u001b[0Gf\u001b[0Gg\u001b[0Gh\u001b[0Gi\u001b[0Gj\u001b[0Gk\u001b[0Gl\u001b[0Gm\u001b[0Gn\u001b[0Go\u001b[0Gp\u001b[0Ga\u001b[0Gb\u001b[0Gc\u001b[0Gd\u001b[0Ge\u001b[0Gf\u001b[0Gg\u001b[0Gh\u001b[0Gi\u001b[0Gj\u001b[0Gk\u001b[0Gl\u001b[0Gm\u001b[0Gn\u001b[0Go\u001b[0Gp\u001b[0Ga\u001b[0Gb\u001b[0Gc\u001b[0Gd\u001b[0Ge\u001b[0Gf\u001b[0Gg\u001b[0Gh\u001b[0Gi\u001b[0Gj\u001b[0Gk\u001b[0Gl\u001b[0Gm\u001b[0Gn\u001b[0Go\u001b[0Gp\u001b[0Ga\u001b[0Gb\u001b[0Gc\u001b[0G"
-
-  var int = spinner({
-    interval: 0,
-    string: 'abcdefghijklmnop',
-    stream: {
-      write: function(c) {
-        output += c
-        if (++written == 50) {
-          t.equal(output, expect)
-          clearInterval(int)
-          t.end()
-        }
-      },
-      isTTY: true
-    },
-    cleanup: false
-  })
-})
diff --git a/deps/npm/node_modules/chmodr/README.md b/deps/npm/node_modules/chmodr/README.md
deleted file mode 100644
index e3e9313c1c3091..00000000000000
--- a/deps/npm/node_modules/chmodr/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Like `chmod -R`.
-
-Takes the same arguments as `fs.chmod()`
diff --git a/deps/npm/node_modules/chmodr/chmodr.js b/deps/npm/node_modules/chmodr/chmodr.js
deleted file mode 100644
index 1e167da21bfcb6..00000000000000
--- a/deps/npm/node_modules/chmodr/chmodr.js
+++ /dev/null
@@ -1,65 +0,0 @@
-module.exports = chmodr
-chmodr.sync = chmodrSync
-
-var fs = require("fs")
-, path = require("path")
-
-function chmodr (p, mode, cb) {
-  fs.readdir(p, function (er, children) {
-    // any error other than ENOTDIR means it's not readable, or
-    // doesn't exist.  give up.
-    if (er && er.code !== "ENOTDIR")
-      return cb(er)
-    var isDir = !er
-    var m = isDir ? dirMode(mode) : mode
-    if (er || !children.length)
-      return fs.chmod(p, m, cb)
-
-    var len = children.length
-    var errState = null
-    children.forEach(function (child) {
-      var pathChild = path.resolve(p, child);
-      fs.lstat(pathChild, function(er, stats) {
-        if (er)
-          return cb(er)
-        if (!stats.isSymbolicLink())
-          chmodr(pathChild, mode, then)
-        else
-          then()
-      })
-    })
-    function then (er) {
-      if (errState) return
-      if (er) return cb(errState = er)
-      if (-- len === 0) return fs.chmod(p, dirMode(mode), cb)
-    }
-  })
-}
-
-function chmodrSync (p, mode) {
-  var children
-  try {
-    children = fs.readdirSync(p)
-  } catch (er) {
-    if (er && er.code === "ENOTDIR") return fs.chmodSync(p, mode)
-    throw er
-  }
-  if (!children.length) return fs.chmodSync(p, dirMode(mode))
-
-  children.forEach(function (child) {
-    var pathChild = path.resolve(p, child)
-    var stats = fs.lstatSync(pathChild)
-    if (!stats.isSymbolicLink())
-      chmodrSync(pathChild, mode)
-  })
-  return fs.chmodSync(p, dirMode(mode))
-}
-
-// If a party has r, add x
-// so that dirs are listable
-function dirMode(mode) {
-  if (mode & 0400) mode |= 0100
-  if (mode & 040) mode |= 010
-  if (mode & 04) mode |= 01
-  return mode
-}
diff --git a/deps/npm/node_modules/chmodr/package.json b/deps/npm/node_modules/chmodr/package.json
deleted file mode 100644
index 54febed62cb8c9..00000000000000
--- a/deps/npm/node_modules/chmodr/package.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
-  },
-  "name": "chmodr",
-  "description": "like `chmod -R`",
-  "version": "1.0.1",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/chmodr.git"
-  },
-  "main": "chmodr.js",
-  "devDependencies": {
-    "mkdirp": "0.3",
-    "rimraf": "",
-    "tap": "^1.3.2"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "license": "ISC",
-  "files": [
-    "chmodr.js"
-  ],
-  "gitHead": "a1ffe57f50c7d1a32e342ed1a03772d37bb4d00e",
-  "bugs": {
-    "url": "https://github.com/isaacs/chmodr/issues"
-  },
-  "homepage": "https://github.com/isaacs/chmodr#readme",
-  "_id": "chmodr@1.0.1",
-  "_shasum": "858e07efd75b6633ae6121ffaa33b2900bcfe18d",
-  "_from": "chmodr@>=1.0.1 <1.1.0",
-  "_npmVersion": "3.2.1",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
-  },
-  "dist": {
-    "shasum": "858e07efd75b6633ae6121ffaa33b2900bcfe18d",
-    "tarball": "http://registry.npmjs.org/chmodr/-/chmodr-1.0.1.tgz"
-  },
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/chmodr/-/chmodr-1.0.1.tgz"
-}
diff --git a/deps/npm/node_modules/chownr/package.json b/deps/npm/node_modules/chownr/package.json
index fdd1dd23083e77..527fe0fa3edd8c 100644
--- a/deps/npm/node_modules/chownr/package.json
+++ b/deps/npm/node_modules/chownr/package.json
@@ -1,54 +1,79 @@
 {
+  "_args": [
+    [
+      "chownr@1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "chownr@>=1.0.0 <2.0.0",
+  "_id": "chownr@1.0.1",
+  "_inCache": true,
+  "_location": "/chownr",
+  "_nodeVersion": "2.2.1",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
+  },
+  "_npmVersion": "3.2.2",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "chownr",
+    "raw": "chownr@1",
+    "rawSpec": "1",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
+  "_shasum": "e2a75042a9551908bebd25b8523d5f9769d79181",
+  "_shrinkwrap": null,
+  "_spec": "chownr@1",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "name": "chownr",
-  "description": "like `chown -R`",
-  "version": "1.0.1",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/chownr.git"
+  "bugs": {
+    "url": "https://github.com/isaacs/chownr/issues"
   },
-  "main": "chownr.js",
-  "files": [
-    "chownr.js"
-  ],
+  "dependencies": {},
+  "description": "like `chown -R`",
   "devDependencies": {
     "mkdirp": "0.3",
     "rimraf": "",
     "tap": "^1.2.0"
   },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "license": "ISC",
-  "gitHead": "c6c43844e80d7c7045e737a72b9fbb1ba0579a26",
-  "bugs": {
-    "url": "https://github.com/isaacs/chownr/issues"
-  },
-  "homepage": "https://github.com/isaacs/chownr#readme",
-  "_id": "chownr@1.0.1",
-  "_shasum": "e2a75042a9551908bebd25b8523d5f9769d79181",
-  "_from": "chownr@1.0.1",
-  "_npmVersion": "3.2.2",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
-  },
+  "directories": {},
   "dist": {
     "shasum": "e2a75042a9551908bebd25b8523d5f9769d79181",
     "tarball": "http://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"
   },
+  "files": [
+    "chownr.js"
+  ],
+  "gitHead": "c6c43844e80d7c7045e737a72b9fbb1ba0579a26",
+  "homepage": "https://github.com/isaacs/chownr#readme",
+  "installable": true,
+  "license": "ISC",
+  "main": "chownr.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "chownr",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/chownr.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.0.1"
 }
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/.npmignore b/deps/npm/node_modules/clone/.npmignore
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/.npmignore
rename to deps/npm/node_modules/clone/.npmignore
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/.travis.yml b/deps/npm/node_modules/clone/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/.travis.yml
rename to deps/npm/node_modules/clone/.travis.yml
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/LICENSE b/deps/npm/node_modules/clone/LICENSE
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/LICENSE
rename to deps/npm/node_modules/clone/LICENSE
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/README.md b/deps/npm/node_modules/clone/README.md
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/README.md
rename to deps/npm/node_modules/clone/README.md
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/clone.js b/deps/npm/node_modules/clone/clone.js
similarity index 99%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/clone.js
rename to deps/npm/node_modules/clone/clone.js
index f8fa3159a7c4ee..321ffa30f5e2ab 100644
--- a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/clone.js
+++ b/deps/npm/node_modules/clone/clone.js
@@ -114,7 +114,7 @@ function clone(parent, circular, depth, prototype) {
       if (proto) {
         attrs = Object.getOwnPropertyDescriptor(proto, i);
       }
-      
+
       if (attrs && attrs.set == null) {
         continue;
       }
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/package.json b/deps/npm/node_modules/clone/package.json
similarity index 80%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/package.json
rename to deps/npm/node_modules/clone/package.json
index bc8e878a54c34b..c5de8f778617d4 100644
--- a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/package.json
+++ b/deps/npm/node_modules/clone/package.json
@@ -1,38 +1,54 @@
 {
-  "name": "clone",
-  "description": "deep cloning of objects and arrays",
-  "tags": [
-    "clone",
-    "object",
-    "array",
-    "function",
-    "date"
+  "_args": [
+    [
+      "clone@~0.1.5",
+      "/Users/rebecca/code/npm/node_modules/defaults"
+    ]
   ],
-  "version": "0.1.19",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/pvorb/node-clone.git"
+  "_from": "clone@>=0.1.5 <0.2.0",
+  "_id": "clone@0.1.19",
+  "_inCache": true,
+  "_location": "/clone",
+  "_npmUser": {
+    "email": "paul@vorba.ch",
+    "name": "pvorb"
   },
-  "bugs": {
-    "url": "https://github.com/pvorb/node-clone/issues"
+  "_npmVersion": "1.4.14",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "clone",
+    "raw": "clone@~0.1.5",
+    "rawSpec": "~0.1.5",
+    "scope": null,
+    "spec": ">=0.1.5 <0.2.0",
+    "type": "range"
   },
-  "main": "clone.js",
+  "_requiredBy": [
+    "/defaults"
+  ],
+  "_resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz",
+  "_shasum": "613fb68639b26a494ac53253e15b1a6bd88ada85",
+  "_shrinkwrap": null,
+  "_spec": "clone@~0.1.5",
+  "_where": "/Users/rebecca/code/npm/node_modules/defaults",
   "author": {
-    "name": "Paul Vorbach",
     "email": "paul@vorba.ch",
+    "name": "Paul Vorbach",
     "url": "http://paul.vorba.ch/"
   },
+  "bugs": {
+    "url": "https://github.com/pvorb/node-clone/issues"
+  },
   "contributors": [
+    {
+      "name": "Hugh Kennedy",
+      "url": "http://twitter.com/hughskennedy"
+    },
     {
       "name": "Blake Miner",
       "email": "miner.blake@gmail.com",
       "url": "http://www.blakeminer.com/"
     },
-    {
-      "name": "Tian You",
-      "email": "axqd001@gmail.com",
-      "url": "http://blog.axqd.net/"
-    },
     {
       "name": "George Stagas",
       "email": "gstagas@gmail.com",
@@ -57,8 +73,9 @@
       "url": "https://github.com/w1nk"
     },
     {
-      "name": "Hugh Kennedy",
-      "url": "http://twitter.com/hughskennedy"
+      "name": "Tian You",
+      "email": "axqd001@gmail.com",
+      "url": "http://blog.axqd.net/"
     },
     {
       "name": "Dustin Diaz",
@@ -88,39 +105,45 @@
       "url": "https://github.com/oroce"
     }
   ],
-  "license": "MIT",
-  "engines": {
-    "node": "*"
-  },
   "dependencies": {},
+  "description": "deep cloning of objects and arrays",
   "devDependencies": {
-    "underscore": "*",
-    "nodeunit": "*"
+    "nodeunit": "*",
+    "underscore": "*"
   },
-  "optionalDependencies": {},
-  "scripts": {
-    "test": "nodeunit test.js"
+  "directories": {},
+  "dist": {
+    "shasum": "613fb68639b26a494ac53253e15b1a6bd88ada85",
+    "tarball": "http://registry.npmjs.org/clone/-/clone-0.1.19.tgz"
+  },
+  "engines": {
+    "node": "*"
   },
   "gitHead": "bb11a43363a0f69e8ac014cb5376ce215ea1f8fd",
   "homepage": "https://github.com/pvorb/node-clone",
-  "_id": "clone@0.1.19",
-  "_shasum": "613fb68639b26a494ac53253e15b1a6bd88ada85",
-  "_from": "clone@>=0.1.5 <0.2.0",
-  "_npmVersion": "1.4.14",
-  "_npmUser": {
-    "name": "pvorb",
-    "email": "paul@vorba.ch"
-  },
+  "license": "MIT",
+  "main": "clone.js",
   "maintainers": [
     {
       "name": "pvorb",
       "email": "paul@vorb.de"
     }
   ],
-  "dist": {
-    "shasum": "613fb68639b26a494ac53253e15b1a6bd88ada85",
-    "tarball": "http://registry.npmjs.org/clone/-/clone-0.1.19.tgz"
+  "name": "clone",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/pvorb/node-clone.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz"
+  "scripts": {
+    "test": "nodeunit test.js"
+  },
+  "tags": [
+    "array",
+    "clone",
+    "date",
+    "function",
+    "object"
+  ],
+  "version": "0.1.19"
 }
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/test.js b/deps/npm/node_modules/clone/test.js
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/test.js
rename to deps/npm/node_modules/clone/test.js
diff --git a/deps/npm/node_modules/cmd-shim/package.json b/deps/npm/node_modules/cmd-shim/package.json
index e1f4f543ea708c..47058a16f12ccf 100644
--- a/deps/npm/node_modules/cmd-shim/package.json
+++ b/deps/npm/node_modules/cmd-shim/package.json
@@ -1,46 +1,70 @@
 {
-  "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.1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "cmd-shim@>=2.0.1 <2.1.0",
+  "_id": "cmd-shim@2.0.1",
+  "_inCache": true,
+  "_location": "/cmd-shim",
+  "_npmUser": {
+    "email": "forbes@lindesay.co.uk",
+    "name": "forbeslindesay"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ForbesLindesay/cmd-shim.git"
+  "_npmVersion": "1.5.0-alpha-4",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "cmd-shim",
+    "raw": "cmd-shim@~2.0.1",
+    "rawSpec": "~2.0.1",
+    "scope": null,
+    "spec": ">=2.0.1 <2.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz",
+  "_shasum": "4512a373d2391679aec51ad1d4733559e9b85d4a",
+  "_shrinkwrap": null,
+  "_spec": "cmd-shim@~2.0.1",
+  "_where": "/Users/rebecca/code/npm",
+  "bugs": {
+    "url": "https://github.com/ForbesLindesay/cmd-shim/issues"
   },
-  "license": "BSD",
   "dependencies": {
     "graceful-fs": ">3.0.1 <4.0.0-0",
     "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": "4512a373d2391679aec51ad1d4733559e9b85d4a",
+    "tarball": "http://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz"
   },
+  "gitHead": "6f53d506be590fe9ac20c9801512cd1a3aad5974",
   "homepage": "https://github.com/ForbesLindesay/cmd-shim",
-  "_id": "cmd-shim@2.0.1",
-  "_shasum": "4512a373d2391679aec51ad1d4733559e9b85d4a",
-  "_from": "cmd-shim@>=2.0.1-0 <3.0.0-0",
-  "_npmVersion": "1.5.0-alpha-4",
-  "_npmUser": {
-    "name": "forbeslindesay",
-    "email": "forbes@lindesay.co.uk"
-  },
+  "license": "BSD",
   "maintainers": [
     {
       "name": "forbeslindesay",
       "email": "forbes@lindesay.co.uk"
     }
   ],
-  "dist": {
-    "shasum": "4512a373d2391679aec51ad1d4733559e9b85d4a",
-    "tarball": "http://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz"
+  "name": "cmd-shim",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "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.1"
 }
diff --git a/deps/npm/node_modules/columnify/node_modules/strip-ansi/package.json b/deps/npm/node_modules/columnify/node_modules/strip-ansi/package.json
deleted file mode 100644
index 2871d037908d62..00000000000000
--- a/deps/npm/node_modules/columnify/node_modules/strip-ansi/package.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "name": "strip-ansi",
-  "version": "3.0.0",
-  "description": "Strip ANSI escape codes",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sindresorhus/strip-ansi.git"
-  },
-  "author": {
-    "name": "Sindre Sorhus",
-    "email": "sindresorhus@gmail.com",
-    "url": "sindresorhus.com"
-  },
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    },
-    {
-      "name": "jbnicolai",
-      "email": "jappelman@xebia.com"
-    }
-  ],
-  "engines": {
-    "node": ">=0.10.0"
-  },
-  "scripts": {
-    "test": "node test.js"
-  },
-  "files": [
-    "index.js"
-  ],
-  "keywords": [
-    "strip",
-    "trim",
-    "remove",
-    "ansi",
-    "styles",
-    "color",
-    "colour",
-    "colors",
-    "terminal",
-    "console",
-    "string",
-    "tty",
-    "escape",
-    "formatting",
-    "rgb",
-    "256",
-    "shell",
-    "xterm",
-    "log",
-    "logging",
-    "command-line",
-    "text"
-  ],
-  "dependencies": {
-    "ansi-regex": "^2.0.0"
-  },
-  "devDependencies": {
-    "ava": "0.0.4"
-  },
-  "gitHead": "3f05b9810e1438f946e2eb84ee854cc00b972e9e",
-  "bugs": {
-    "url": "https://github.com/sindresorhus/strip-ansi/issues"
-  },
-  "homepage": "https://github.com/sindresorhus/strip-ansi",
-  "_id": "strip-ansi@3.0.0",
-  "_shasum": "7510b665567ca914ccb5d7e072763ac968be3724",
-  "_from": "strip-ansi@>=3.0.0 <4.0.0",
-  "_npmVersion": "2.11.2",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "name": "sindresorhus",
-    "email": "sindresorhus@gmail.com"
-  },
-  "dist": {
-    "shasum": "7510b665567ca914ccb5d7e072763ac968be3724",
-    "tarball": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/columnify/package.json b/deps/npm/node_modules/columnify/package.json
index 1dc803973c6900..1c9b23ddfbc5a4 100644
--- a/deps/npm/node_modules/columnify/package.json
+++ b/deps/npm/node_modules/columnify/package.json
@@ -1,67 +1,92 @@
 {
-  "name": "columnify",
-  "version": "1.5.2",
-  "description": "Render data in text columns. Supports in-column text-wrap.",
-  "main": "columnify.js",
-  "scripts": {
-    "pretest": "npm prune",
-    "test": "make prepublish && tape test/*.js | tap-spec",
-    "bench": "npm test && node bench",
-    "prepublish": "make prepublish"
+  "_args": [
+    [
+      "columnify@~1.5.1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "columnify@>=1.5.1 <1.6.0",
+  "_id": "columnify@1.5.2",
+  "_inCache": true,
+  "_location": "/columnify",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "email": "secoif@gmail.com",
+    "name": "timoxley"
+  },
+  "_npmVersion": "2.9.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "columnify",
+    "raw": "columnify@~1.5.1",
+    "rawSpec": "~1.5.1",
+    "scope": null,
+    "spec": ">=1.5.1 <1.6.0",
+    "type": "range"
   },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.2.tgz",
+  "_shasum": "6937930d47c22a9bfa20732a7fd619d47eaba65a",
+  "_shrinkwrap": null,
+  "_spec": "columnify@~1.5.1",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
     "name": "Tim Oxley"
   },
-  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/timoxley/columnify/issues"
+  },
+  "dependencies": {
+    "strip-ansi": "^3.0.0",
+    "wcwidth": "^1.0.0"
+  },
+  "description": "Render data in text columns. Supports in-column text-wrap.",
   "devDependencies": {
     "babel": "^5.8.21",
     "chalk": "^1.1.0",
     "tap-spec": "^4.0.2",
     "tape": "^4.0.3"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/timoxley/columnify.git"
+  "directories": {
+    "test": "test"
+  },
+  "dist": {
+    "shasum": "6937930d47c22a9bfa20732a7fd619d47eaba65a",
+    "tarball": "http://registry.npmjs.org/columnify/-/columnify-1.5.2.tgz"
   },
+  "gitHead": "e7417b78091844ff2f3ba62551a4817c7ae217bd",
+  "homepage": "https://github.com/timoxley/columnify",
+  "installable": true,
   "keywords": [
-    "column",
-    "text",
     "ansi",
+    "column",
     "console",
+    "table",
     "terminal",
-    "wrap",
-    "table"
+    "text",
+    "wrap"
   ],
-  "bugs": {
-    "url": "https://github.com/timoxley/columnify/issues"
-  },
-  "homepage": "https://github.com/timoxley/columnify",
-  "dependencies": {
-    "strip-ansi": "^3.0.0",
-    "wcwidth": "^1.0.0"
-  },
-  "directories": {
-    "test": "test"
-  },
-  "gitHead": "e7417b78091844ff2f3ba62551a4817c7ae217bd",
-  "_id": "columnify@1.5.2",
-  "_shasum": "6937930d47c22a9bfa20732a7fd619d47eaba65a",
-  "_from": "columnify@1.5.2",
-  "_npmVersion": "2.9.0",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "name": "timoxley",
-    "email": "secoif@gmail.com"
-  },
+  "license": "MIT",
+  "main": "columnify.js",
   "maintainers": [
     {
       "name": "timoxley",
       "email": "secoif@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "6937930d47c22a9bfa20732a7fd619d47eaba65a",
-    "tarball": "http://registry.npmjs.org/columnify/-/columnify-1.5.2.tgz"
+  "name": "columnify",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/timoxley/columnify.git"
+  },
+  "scripts": {
+    "bench": "npm test && node bench",
+    "prepublish": "make prepublish",
+    "pretest": "npm prune",
+    "test": "make prepublish && tape test/*.js | tap-spec"
   },
-  "_resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.2.tgz"
+  "version": "1.5.2"
 }
diff --git a/deps/npm/node_modules/request/node_modules/combined-stream/License b/deps/npm/node_modules/combined-stream/License
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/combined-stream/License
rename to deps/npm/node_modules/combined-stream/License
diff --git a/deps/npm/node_modules/request/node_modules/combined-stream/Readme.md b/deps/npm/node_modules/combined-stream/Readme.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/combined-stream/Readme.md
rename to deps/npm/node_modules/combined-stream/Readme.md
diff --git a/deps/npm/node_modules/request/node_modules/combined-stream/lib/combined_stream.js b/deps/npm/node_modules/combined-stream/lib/combined_stream.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/combined-stream/lib/combined_stream.js
rename to deps/npm/node_modules/combined-stream/lib/combined_stream.js
diff --git a/deps/npm/node_modules/request/node_modules/combined-stream/package.json b/deps/npm/node_modules/combined-stream/package.json
similarity index 70%
rename from deps/npm/node_modules/request/node_modules/combined-stream/package.json
rename to deps/npm/node_modules/combined-stream/package.json
index 10339866f9134b..1c3e72c157f22e 100644
--- a/deps/npm/node_modules/request/node_modules/combined-stream/package.json
+++ b/deps/npm/node_modules/combined-stream/package.json
@@ -1,48 +1,65 @@
 {
+  "_args": [
+    [
+      "combined-stream@~1.0.1",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
+  ],
+  "_from": "combined-stream@>=1.0.1 <1.1.0",
+  "_id": "combined-stream@1.0.5",
+  "_inCache": true,
+  "_location": "/combined-stream",
+  "_nodeVersion": "0.12.4",
+  "_npmUser": {
+    "email": "iam@alexindigo.com",
+    "name": "alexindigo"
+  },
+  "_npmVersion": "2.10.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "combined-stream",
+    "raw": "combined-stream@~1.0.1",
+    "rawSpec": "~1.0.1",
+    "scope": null,
+    "spec": ">=1.0.1 <1.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/form-data",
+    "/request"
+  ],
+  "_resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+  "_shasum": "938370a57b4a51dea2c77c15d5c5fdf895164009",
+  "_shrinkwrap": null,
+  "_spec": "combined-stream@~1.0.1",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
   "author": {
-    "name": "Felix Geisendörfer",
     "email": "felix@debuggable.com",
+    "name": "Felix Geisendörfer",
     "url": "http://debuggable.com/"
   },
-  "name": "combined-stream",
-  "description": "A stream that emits multiple other streams one after another.",
-  "version": "1.0.5",
-  "homepage": "https://github.com/felixge/node-combined-stream",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/felixge/node-combined-stream.git"
-  },
-  "main": "./lib/combined_stream",
-  "scripts": {
-    "test": "node test/run.js"
-  },
-  "engines": {
-    "node": ">= 0.8"
+  "bugs": {
+    "url": "https://github.com/felixge/node-combined-stream/issues"
   },
   "dependencies": {
     "delayed-stream": "~1.0.0"
   },
+  "description": "A stream that emits multiple other streams one after another.",
   "devDependencies": {
     "far": "~0.0.7"
   },
-  "license": "MIT",
-  "gitHead": "cfc7b815d090a109bcedb5bb0f6713148d55a6b7",
-  "bugs": {
-    "url": "https://github.com/felixge/node-combined-stream/issues"
-  },
-  "_id": "combined-stream@1.0.5",
-  "_shasum": "938370a57b4a51dea2c77c15d5c5fdf895164009",
-  "_from": "combined-stream@>=1.0.1 <1.1.0",
-  "_npmVersion": "2.10.1",
-  "_nodeVersion": "0.12.4",
-  "_npmUser": {
-    "name": "alexindigo",
-    "email": "iam@alexindigo.com"
-  },
+  "directories": {},
   "dist": {
     "shasum": "938370a57b4a51dea2c77c15d5c5fdf895164009",
     "tarball": "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
   },
+  "engines": {
+    "node": ">= 0.8"
+  },
+  "gitHead": "cfc7b815d090a109bcedb5bb0f6713148d55a6b7",
+  "homepage": "https://github.com/felixge/node-combined-stream",
+  "license": "MIT",
+  "main": "./lib/combined_stream",
   "maintainers": [
     {
       "name": "felixge",
@@ -61,7 +78,14 @@
       "email": "apeherder@gmail.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "combined-stream",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/felixge/node-combined-stream.git"
+  },
+  "scripts": {
+    "test": "node test/run.js"
+  },
+  "version": "1.0.5"
 }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/History.md b/deps/npm/node_modules/commander/History.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/History.md
rename to deps/npm/node_modules/commander/History.md
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/LICENSE b/deps/npm/node_modules/commander/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/LICENSE
rename to deps/npm/node_modules/commander/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/Readme.md b/deps/npm/node_modules/commander/Readme.md
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/Readme.md
rename to deps/npm/node_modules/commander/Readme.md
index af58e22c937eb6..5509996c7de697 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/Readme.md
+++ b/deps/npm/node_modules/commander/Readme.md
@@ -6,7 +6,7 @@
 [![NPM Downloads](https://img.shields.io/npm/dm/commander.svg?style=flat)](https://www.npmjs.org/package/commander)
 [![Join the chat at https://gitter.im/tj/commander.js](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/tj/commander.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-  The complete solution for [node.js](http://nodejs.org) command-line interfaces, inspired by Ruby's [commander](https://github.com/tj/commander).  
+  The complete solution for [node.js](http://nodejs.org) command-line interfaces, inspired by Ruby's [commander](https://github.com/tj/commander).
   [API documentation](http://tj.github.com/commander.js/)
 
 
@@ -95,7 +95,7 @@ program
   .option('-s --size <size>', 'Pizza size', /^(large|medium|small)$/i, 'medium')
   .option('-d --drink [drink]', 'Drink', /^(coke|pepsi|izze)$/i)
   .parse(process.argv);
-  
+
 console.log(' size: %j', program.size);
 console.log(' drink: %j', program.drink);
 ```
@@ -171,7 +171,7 @@ program
   .parse(process.argv);
 ```
 
-When `.command()` is invoked with a description argument, no `.action(callback)` should be called to handle sub-commands, otherwise there will be an error. This tells commander that you're going to use separate executables for sub-commands, much like `git(1)` and other popular tools.  
+When `.command()` is invoked with a description argument, no `.action(callback)` should be called to handle sub-commands, otherwise there will be an error. This tells commander that you're going to use separate executables for sub-commands, much like `git(1)` and other popular tools.
 The commander will try to search the executables in the directory of the entry script (like `./examples/pm`) with the name `program-command`, like `pm-install`, `pm-search`.
 
 If the program is designed to be installed globally, make sure the executables have proper modes, like `755`.
@@ -186,7 +186,7 @@ You can enable `--harmony` option in two ways:
 
  The help information is auto-generated based on the information commander already knows about your program, so the following `--help` info is for free:
 
-```  
+```
  $ ./examples/pizza --help
 
    Usage: pizza [options]
@@ -339,4 +339,3 @@ More Demos can be found in the [examples](https://github.com/tj/commander.js/tre
 ## License
 
 MIT
-
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/index.js b/deps/npm/node_modules/commander/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/index.js
rename to deps/npm/node_modules/commander/index.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/package.json b/deps/npm/node_modules/commander/package.json
similarity index 66%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/package.json
rename to deps/npm/node_modules/commander/package.json
index 6b4595126ac339..ba89d2e64e1c89 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/package.json
+++ b/deps/npm/node_modules/commander/package.json
@@ -1,52 +1,72 @@
 {
-  "name": "commander",
-  "version": "2.8.1",
-  "description": "the complete solution for node.js command-line programs",
-  "keywords": [
-    "command",
-    "option",
-    "parser"
+  "_args": [
+    [
+      "commander@^2.8.1",
+      "/Users/rebecca/code/npm/node_modules/har-validator"
+    ]
+  ],
+  "_from": "commander@>=2.8.1 <3.0.0",
+  "_id": "commander@2.8.1",
+  "_inCache": true,
+  "_location": "/commander",
+  "_nodeVersion": "0.12.0",
+  "_npmUser": {
+    "email": "zhiyelee@gmail.com",
+    "name": "zhiyelee"
+  },
+  "_npmVersion": "2.5.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "commander",
+    "raw": "commander@^2.8.1",
+    "rawSpec": "^2.8.1",
+    "scope": null,
+    "spec": ">=2.8.1 <3.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/har-validator"
   ],
+  "_resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+  "_shasum": "06be367febfda0c330aa1e2a072d3dc9762425d4",
+  "_shrinkwrap": null,
+  "_spec": "commander@^2.8.1",
+  "_where": "/Users/rebecca/code/npm/node_modules/har-validator",
   "author": {
-    "name": "TJ Holowaychuk",
-    "email": "tj@vision-media.ca"
+    "email": "tj@vision-media.ca",
+    "name": "TJ Holowaychuk"
   },
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/tj/commander.js.git"
+  "bugs": {
+    "url": "https://github.com/tj/commander.js/issues"
+  },
+  "dependencies": {
+    "graceful-readlink": ">= 1.0.0"
   },
+  "description": "the complete solution for node.js command-line programs",
   "devDependencies": {
     "should": ">= 0.0.1",
     "sinon": ">= 1.14.1"
   },
-  "scripts": {
-    "test": "make test"
+  "directories": {},
+  "dist": {
+    "shasum": "06be367febfda0c330aa1e2a072d3dc9762425d4",
+    "tarball": "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz"
   },
-  "main": "index",
   "engines": {
     "node": ">= 0.6.x"
   },
   "files": [
     "index.js"
   ],
-  "dependencies": {
-    "graceful-readlink": ">= 1.0.0"
-  },
   "gitHead": "c6c84726050b19c0373de27cd359f3baddff579f",
-  "bugs": {
-    "url": "https://github.com/tj/commander.js/issues"
-  },
   "homepage": "https://github.com/tj/commander.js",
-  "_id": "commander@2.8.1",
-  "_shasum": "06be367febfda0c330aa1e2a072d3dc9762425d4",
-  "_from": "commander@>=2.8.1 <3.0.0",
-  "_npmVersion": "2.5.1",
-  "_nodeVersion": "0.12.0",
-  "_npmUser": {
-    "name": "zhiyelee",
-    "email": "zhiyelee@gmail.com"
-  },
+  "keywords": [
+    "command",
+    "option",
+    "parser"
+  ],
+  "license": "MIT",
+  "main": "index",
   "maintainers": [
     {
       "name": "tjholowaychuk",
@@ -65,11 +85,14 @@
       "email": "thethomaseffect@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "06be367febfda0c330aa1e2a072d3dc9762425d4",
-    "tarball": "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz"
+  "name": "commander",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tj/commander.js.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "make test"
+  },
+  "version": "2.8.1"
 }
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml b/deps/npm/node_modules/concat-map/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml
rename to deps/npm/node_modules/concat-map/.travis.yml
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE b/deps/npm/node_modules/concat-map/LICENSE
similarity index 100%
rename from deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE
rename to deps/npm/node_modules/concat-map/LICENSE
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown b/deps/npm/node_modules/concat-map/README.markdown
similarity index 100%
rename from deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
rename to deps/npm/node_modules/concat-map/README.markdown
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js b/deps/npm/node_modules/concat-map/example/map.js
similarity index 100%
rename from deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js
rename to deps/npm/node_modules/concat-map/example/map.js
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js b/deps/npm/node_modules/concat-map/index.js
similarity index 100%
rename from deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
rename to deps/npm/node_modules/concat-map/index.js
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json b/deps/npm/node_modules/concat-map/package.json
similarity index 66%
rename from deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
rename to deps/npm/node_modules/concat-map/package.json
index b516138098fba9..6b398a35026372 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
+++ b/deps/npm/node_modules/concat-map/package.json
@@ -1,83 +1,107 @@
 {
-  "name": "concat-map",
+  "_args": [
+    [
+      "concat-map@0.0.1",
+      "/Users/rebecca/code/npm/node_modules/brace-expansion"
+    ]
+  ],
+  "_from": "concat-map@0.0.1",
+  "_id": "concat-map@0.0.1",
+  "_inCache": true,
+  "_location": "/concat-map",
+  "_npmUser": {
+    "email": "mail@substack.net",
+    "name": "substack"
+  },
+  "_npmVersion": "1.3.21",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "concat-map",
+    "raw": "concat-map@0.0.1",
+    "rawSpec": "0.0.1",
+    "scope": null,
+    "spec": "0.0.1",
+    "type": "version"
+  },
+  "_requiredBy": [
+    "/brace-expansion"
+  ],
+  "_resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+  "_shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
+  "_shrinkwrap": null,
+  "_spec": "concat-map@0.0.1",
+  "_where": "/Users/rebecca/code/npm/node_modules/brace-expansion",
+  "author": {
+    "email": "mail@substack.net",
+    "name": "James Halliday",
+    "url": "http://substack.net"
+  },
+  "bugs": {
+    "url": "https://github.com/substack/node-concat-map/issues"
+  },
+  "dependencies": {},
   "description": "concatenative mapdashery",
-  "version": "0.0.1",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/substack/node-concat-map.git"
+  "devDependencies": {
+    "tape": "~2.4.0"
   },
-  "main": "index.js",
+  "directories": {
+    "example": "example",
+    "test": "test"
+  },
+  "dist": {
+    "shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
+    "tarball": "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+  },
+  "homepage": "https://github.com/substack/node-concat-map",
   "keywords": [
     "concat",
     "concatMap",
-    "map",
     "functional",
-    "higher-order"
+    "higher-order",
+    "map"
   ],
-  "directories": {
-    "example": "example",
-    "test": "test"
+  "license": "MIT",
+  "main": "index.js",
+  "maintainers": [
+    {
+      "name": "substack",
+      "email": "mail@substack.net"
+    }
+  ],
+  "name": "concat-map",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/substack/node-concat-map.git"
   },
   "scripts": {
     "test": "tape test/*.js"
   },
-  "devDependencies": {
-    "tape": "~2.4.0"
-  },
-  "license": "MIT",
-  "author": {
-    "name": "James Halliday",
-    "email": "mail@substack.net",
-    "url": "http://substack.net"
-  },
   "testling": {
-    "files": "test/*.js",
     "browsers": {
+      "chrome": [
+        10,
+        22
+      ],
+      "ff": [
+        10,
+        15,
+        3.5
+      ],
       "ie": [
         6,
         7,
         8,
         9
       ],
-      "ff": [
-        3.5,
-        10,
-        15
-      ],
-      "chrome": [
-        10,
-        22
+      "opera": [
+        12
       ],
       "safari": [
         5.1
-      ],
-      "opera": [
-        12
       ]
-    }
-  },
-  "bugs": {
-    "url": "https://github.com/substack/node-concat-map/issues"
-  },
-  "homepage": "https://github.com/substack/node-concat-map",
-  "_id": "concat-map@0.0.1",
-  "dist": {
-    "shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
-    "tarball": "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+    },
+    "files": "test/*.js"
   },
-  "_from": "concat-map@0.0.1",
-  "_npmVersion": "1.3.21",
-  "_npmUser": {
-    "name": "substack",
-    "email": "mail@substack.net"
-  },
-  "maintainers": [
-    {
-      "name": "substack",
-      "email": "mail@substack.net"
-    }
-  ],
-  "_shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
-  "_resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "version": "0.0.1"
 }
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js b/deps/npm/node_modules/concat-map/test/map.js
similarity index 100%
rename from deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
rename to deps/npm/node_modules/concat-map/test/map.js
diff --git a/deps/npm/node_modules/concat-stream/LICENSE b/deps/npm/node_modules/concat-stream/LICENSE
new file mode 100644
index 00000000000000..1e836b4760025f
--- /dev/null
+++ b/deps/npm/node_modules/concat-stream/LICENSE
@@ -0,0 +1,24 @@
+The MIT License
+
+Copyright (c) 2013 Max Ogden
+
+Permission is hereby granted, free of charge,
+to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to
+deal in the Software without restriction, including
+without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom
+the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/index.js b/deps/npm/node_modules/concat-stream/index.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/index.js
rename to deps/npm/node_modules/concat-stream/index.js
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/.npmignore b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/.npmignore
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/.travis.yml b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/.travis.yml
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/.travis.yml
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/.zuul.yml b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/.zuul.yml
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/.zuul.yml
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/.zuul.yml
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/LICENSE b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/LICENSE
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/README.md b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/README.md
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/README.md
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/doc/stream.markdown b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/doc/stream.markdown
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/doc/stream.markdown
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/doc/stream.markdown
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/duplex.js b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/duplex.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/duplex.js
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/duplex.js
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_duplex.js b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_duplex.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_duplex.js
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_duplex.js
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_passthrough.js b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_passthrough.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_passthrough.js
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_passthrough.js
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_readable.js b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_readable.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_readable.js
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_readable.js
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_transform.js b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_transform.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_transform.js
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_transform.js
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_writable.js b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_writable.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_writable.js
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_writable.js
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/package.json b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/package.json
similarity index 68%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/package.json
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/package.json
index 70ad998cae2d45..a3289c74d132ba 100644
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/package.json
+++ b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/package.json
@@ -1,8 +1,43 @@
 {
-  "name": "readable-stream",
-  "version": "2.0.2",
-  "description": "Streams3, a user-land copy of the stream library from iojs v2.x",
-  "main": "readable.js",
+  "_args": [
+    [
+      "readable-stream@~2.0.0",
+      "/Users/rebecca/code/npm/node_modules/concat-stream"
+    ]
+  ],
+  "_from": "readable-stream@>=2.0.0 <2.1.0",
+  "_id": "readable-stream@2.0.2",
+  "_inCache": true,
+  "_location": "/concat-stream/readable-stream",
+  "_nodeVersion": "2.3.0",
+  "_npmUser": {
+    "email": "calvin.metcalf@gmail.com",
+    "name": "cwmma"
+  },
+  "_npmVersion": "2.11.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "readable-stream",
+    "raw": "readable-stream@~2.0.0",
+    "rawSpec": "~2.0.0",
+    "scope": null,
+    "spec": ">=2.0.0 <2.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/concat-stream"
+  ],
+  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+  "_shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
+  "_shrinkwrap": null,
+  "_spec": "readable-stream@~2.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/concat-stream",
+  "browser": {
+    "util": false
+  },
+  "bugs": {
+    "url": "https://github.com/nodejs/readable-stream/issues"
+  },
   "dependencies": {
     "core-util-is": "~1.0.0",
     "inherits": "~2.0.1",
@@ -11,46 +46,26 @@
     "string_decoder": "~0.10.x",
     "util-deprecate": "~1.0.1"
   },
+  "description": "Streams3, a user-land copy of the stream library from iojs v2.x",
   "devDependencies": {
     "tap": "~0.2.6",
     "tape": "~4.0.0",
     "zuul": "~3.0.0"
   },
-  "scripts": {
-    "test": "tap test/parallel/*.js",
-    "browser": "zuul --browser-name $BROWSER_NAME --browser-version $BROWSER_VERSION -- test/browser.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/nodejs/readable-stream.git"
+  "directories": {},
+  "dist": {
+    "shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
+    "tarball": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz"
   },
+  "gitHead": "1a70134a71196eeabb5e27bc7580faaa68d30513",
+  "homepage": "https://github.com/nodejs/readable-stream#readme",
   "keywords": [
+    "pipe",
     "readable",
-    "stream",
-    "pipe"
+    "stream"
   ],
-  "browser": {
-    "util": false
-  },
   "license": "MIT",
-  "gitHead": "1a70134a71196eeabb5e27bc7580faaa68d30513",
-  "bugs": {
-    "url": "https://github.com/nodejs/readable-stream/issues"
-  },
-  "homepage": "https://github.com/nodejs/readable-stream#readme",
-  "_id": "readable-stream@2.0.2",
-  "_shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
-  "_from": "readable-stream@>=2.0.0 <2.1.0",
-  "_npmVersion": "2.11.1",
-  "_nodeVersion": "2.3.0",
-  "_npmUser": {
-    "name": "cwmma",
-    "email": "calvin.metcalf@gmail.com"
-  },
-  "dist": {
-    "shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
-    "tarball": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz"
-  },
+  "main": "readable.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -69,7 +84,15 @@
       "email": "calvin.metcalf@gmail.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "readable-stream",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/nodejs/readable-stream.git"
+  },
+  "scripts": {
+    "browser": "zuul --browser-name $BROWSER_NAME --browser-version $BROWSER_VERSION -- test/browser.js",
+    "test": "tap test/parallel/*.js"
+  },
+  "version": "2.0.2"
 }
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/passthrough.js b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/passthrough.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/passthrough.js
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/passthrough.js
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/readable.js b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/readable.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/readable.js
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/readable.js
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/transform.js b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/transform.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/transform.js
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/transform.js
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/writable.js b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/writable.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/writable.js
rename to deps/npm/node_modules/concat-stream/node_modules/readable-stream/writable.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/package.json b/deps/npm/node_modules/concat-stream/package.json
similarity index 60%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/package.json
rename to deps/npm/node_modules/concat-stream/package.json
index caa06817b0e47a..276492319d8eb1 100644
--- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/package.json
+++ b/deps/npm/node_modules/concat-stream/package.json
@@ -1,81 +1,111 @@
 {
-  "name": "concat-stream",
-  "version": "1.5.0",
-  "description": "writable stream that concatenates strings or binary data and calls a callback with the result",
-  "tags": [
-    "stream",
-    "simple",
-    "util",
-    "utility"
+  "_args": [
+    [
+      "concat-stream@^1.4.6",
+      "/Users/rebecca/code/npm/node_modules/npm-registry-client"
+    ]
   ],
-  "author": {
-    "name": "Max Ogden",
-    "email": "max@maxogden.com"
+  "_from": "concat-stream@>=1.4.6 <2.0.0",
+  "_id": "concat-stream@1.5.0",
+  "_inCache": true,
+  "_location": "/concat-stream",
+  "_nodeVersion": "1.8.2",
+  "_npmUser": {
+    "email": "max@maxogden.com",
+    "name": "maxogden"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/maxogden/concat-stream.git"
+  "_npmVersion": "2.9.0",
+  "_phantomChildren": {
+    "core-util-is": "1.0.1",
+    "inherits": "2.0.1",
+    "isarray": "0.0.1",
+    "process-nextick-args": "1.0.1",
+    "string_decoder": "0.10.31",
+    "util-deprecate": "1.0.1"
   },
-  "bugs": {
-    "url": "http://github.com/maxogden/concat-stream/issues"
+  "_requested": {
+    "name": "concat-stream",
+    "raw": "concat-stream@^1.4.6",
+    "rawSpec": "^1.4.6",
+    "scope": null,
+    "spec": ">=1.4.6 <2.0.0",
+    "type": "range"
   },
-  "engines": [
-    "node >= 0.8"
-  ],
-  "main": "index.js",
-  "files": [
-    "index.js"
+  "_requiredBy": [
+    "/npm-registry-client"
   ],
-  "scripts": {
-    "test": "tape test/*.js test/server/*.js"
+  "_resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
+  "_shasum": "53f7d43c51c5e43f81c8fdd03321c631be68d611",
+  "_shrinkwrap": null,
+  "_spec": "concat-stream@^1.4.6",
+  "_where": "/Users/rebecca/code/npm/node_modules/npm-registry-client",
+  "author": {
+    "email": "max@maxogden.com",
+    "name": "Max Ogden"
+  },
+  "bugs": {
+    "url": "http://github.com/maxogden/concat-stream/issues"
   },
-  "license": "MIT",
   "dependencies": {
     "inherits": "~2.0.1",
-    "typedarray": "~0.0.5",
-    "readable-stream": "~2.0.0"
+    "readable-stream": "~2.0.0",
+    "typedarray": "~0.0.5"
   },
+  "description": "writable stream that concatenates strings or binary data and calls a callback with the result",
   "devDependencies": {
     "tape": "~2.3.2"
   },
-  "testling": {
-    "files": "test/*.js",
-    "browsers": [
-      "ie/8..latest",
-      "firefox/17..latest",
-      "firefox/nightly",
-      "chrome/22..latest",
-      "chrome/canary",
-      "opera/12..latest",
-      "opera/next",
-      "safari/5.1..latest",
-      "ipad/6.0..latest",
-      "iphone/6.0..latest",
-      "android-browser/4.2..latest"
-    ]
+  "directories": {},
+  "dist": {
+    "shasum": "53f7d43c51c5e43f81c8fdd03321c631be68d611",
+    "tarball": "http://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz"
   },
+  "engines": [
+    "node >= 0.8"
+  ],
+  "files": [
+    "index.js"
+  ],
   "gitHead": "7cb37c8ddc0fd2ea03c104d07d44d84b83a31185",
   "homepage": "https://github.com/maxogden/concat-stream#readme",
-  "_id": "concat-stream@1.5.0",
-  "_shasum": "53f7d43c51c5e43f81c8fdd03321c631be68d611",
-  "_from": "concat-stream@>=1.4.6 <2.0.0",
-  "_npmVersion": "2.9.0",
-  "_nodeVersion": "1.8.2",
-  "_npmUser": {
-    "name": "maxogden",
-    "email": "max@maxogden.com"
-  },
+  "license": "MIT",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "maxogden",
       "email": "max@maxogden.com"
     }
   ],
-  "dist": {
-    "shasum": "53f7d43c51c5e43f81c8fdd03321c631be68d611",
-    "tarball": "http://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz"
+  "name": "concat-stream",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/maxogden/concat-stream.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "tape test/*.js test/server/*.js"
+  },
+  "tags": [
+    "simple",
+    "stream",
+    "util",
+    "utility"
+  ],
+  "testling": {
+    "browsers": [
+      "android-browser/4.2..latest",
+      "chrome/22..latest",
+      "chrome/canary",
+      "firefox/17..latest",
+      "firefox/nightly",
+      "ie/8..latest",
+      "ipad/6.0..latest",
+      "iphone/6.0..latest",
+      "opera/12..latest",
+      "opera/next",
+      "safari/5.1..latest"
+    ],
+    "files": "test/*.js"
+  },
+  "version": "1.5.0"
 }
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/readme.md b/deps/npm/node_modules/concat-stream/readme.md
similarity index 98%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/readme.md
rename to deps/npm/node_modules/concat-stream/readme.md
index 69234d52a535bb..587ff7a4dc8ef9 100644
--- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/readme.md
+++ b/deps/npm/node_modules/concat-stream/readme.md
@@ -73,7 +73,7 @@ var concat = require('concat-stream')
 
 Return a `writable` stream that will fire `cb(data)` with all of the data that
 was written to the stream. Data can be written to `writable` as strings,
-Buffers, arrays of byte integers, and Uint8Arrays. 
+Buffers, arrays of byte integers, and Uint8Arrays.
 
 By default `concat-stream` will give you back the same data type as the type of the first buffer written to the stream. Use `opts.encoding` to set what format `data` should be returned as, e.g. if you if you don't want to rely on the built-in type checking or for some other reason.
 
diff --git a/deps/npm/node_modules/config-chain/package.json b/deps/npm/node_modules/config-chain/package.json
index b25913cab0143b..b9ab7365b72804 100644
--- a/deps/npm/node_modules/config-chain/package.json
+++ b/deps/npm/node_modules/config-chain/package.json
@@ -1,46 +1,66 @@
 {
-  "name": "config-chain",
-  "version": "1.1.9",
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "https://raw.githubusercontent.com/dominictarr/config-chain/master/LICENCE"
-    }
+  "_args": [
+    [
+      "config-chain@~1.1.9",
+      "/Users/rebecca/code/npm"
+    ]
   ],
-  "description": "HANDLE CONFIGURATION ONCE AND FOR ALL",
-  "homepage": "http://github.com/dominictarr/config-chain",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/dominictarr/config-chain.git"
-  },
-  "dependencies": {
-    "proto-list": "~1.2.1",
-    "ini": "1"
+  "_from": "config-chain@>=1.1.9 <1.2.0",
+  "_id": "config-chain@1.1.9",
+  "_inCache": true,
+  "_location": "/config-chain",
+  "_nodeVersion": "0.12.4",
+  "_npmUser": {
+    "email": "dominic.tarr@gmail.com",
+    "name": "dominictarr"
   },
-  "devDependencies": {
-    "tap": "0.3.0"
+  "_npmVersion": "2.11.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "config-chain",
+    "raw": "config-chain@~1.1.9",
+    "rawSpec": "~1.1.9",
+    "scope": null,
+    "spec": ">=1.1.9 <1.2.0",
+    "type": "range"
   },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
+  "_shasum": "39ac7d4dca84faad926124c54cff25a53aa8bf6e",
+  "_shrinkwrap": null,
+  "_spec": "config-chain@~1.1.9",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Dominic Tarr",
     "email": "dominic.tarr@gmail.com",
+    "name": "Dominic Tarr",
     "url": "http://dominictarr.com"
   },
-  "scripts": {
-    "test": "tap test/"
-  },
-  "gitHead": "832609897082a0a887c59dadb105f4db6de1ab4c",
   "bugs": {
     "url": "https://github.com/dominictarr/config-chain/issues"
   },
-  "_id": "config-chain@1.1.9",
-  "_shasum": "39ac7d4dca84faad926124c54cff25a53aa8bf6e",
-  "_from": "config-chain@>=1.1.9 <1.2.0",
-  "_npmVersion": "2.11.0",
-  "_nodeVersion": "0.12.4",
-  "_npmUser": {
-    "name": "dominictarr",
-    "email": "dominic.tarr@gmail.com"
+  "dependencies": {
+    "ini": "1",
+    "proto-list": "~1.2.1"
+  },
+  "description": "HANDLE CONFIGURATION ONCE AND FOR ALL",
+  "devDependencies": {
+    "tap": "0.3.0"
   },
+  "directories": {},
+  "dist": {
+    "shasum": "39ac7d4dca84faad926124c54cff25a53aa8bf6e",
+    "tarball": "http://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz"
+  },
+  "gitHead": "832609897082a0a887c59dadb105f4db6de1ab4c",
+  "homepage": "http://github.com/dominictarr/config-chain",
+  "licenses": [
+    {
+      "type": "MIT",
+      "url": "https://raw.githubusercontent.com/dominictarr/config-chain/master/LICENCE"
+    }
+  ],
   "maintainers": [
     {
       "name": "dominictarr",
@@ -51,10 +71,14 @@
       "email": "i@izs.me"
     }
   ],
-  "dist": {
-    "shasum": "39ac7d4dca84faad926124c54cff25a53aa8bf6e",
-    "tarball": "http://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz"
+  "name": "config-chain",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dominictarr/config-chain.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz"
+  "scripts": {
+    "test": "tap test/"
+  },
+  "version": "1.1.9"
 }
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/README.md b/deps/npm/node_modules/core-util-is/README.md
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/README.md
rename to deps/npm/node_modules/core-util-is/README.md
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/float.patch b/deps/npm/node_modules/core-util-is/float.patch
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/float.patch
rename to deps/npm/node_modules/core-util-is/float.patch
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/lib/util.js b/deps/npm/node_modules/core-util-is/lib/util.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
rename to deps/npm/node_modules/core-util-is/lib/util.js
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/package.json b/deps/npm/node_modules/core-util-is/package.json
similarity index 58%
rename from deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/package.json
rename to deps/npm/node_modules/core-util-is/package.json
index 466dfdfe0139b3..3e3708371a710a 100644
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/package.json
+++ b/deps/npm/node_modules/core-util-is/package.json
@@ -1,53 +1,81 @@
 {
-  "name": "core-util-is",
-  "version": "1.0.1",
-  "description": "The `util.is*` functions introduced in Node v0.12.",
-  "main": "lib/util.js",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/core-util-is.git"
+  "_args": [
+    [
+      "core-util-is@~1.0.0",
+      "/Users/rebecca/code/npm/node_modules/readable-stream"
+    ]
+  ],
+  "_from": "core-util-is@>=1.0.0 <1.1.0",
+  "_id": "core-util-is@1.0.1",
+  "_inCache": true,
+  "_location": "/core-util-is",
+  "_npmUser": {
+    "email": "i@izs.me",
+    "name": "isaacs"
   },
-  "keywords": [
-    "util",
-    "isBuffer",
-    "isArray",
-    "isNumber",
-    "isString",
-    "isRegExp",
-    "isThis",
-    "isThat",
-    "polyfill"
+  "_npmVersion": "1.3.23",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "core-util-is",
+    "raw": "core-util-is@~1.0.0",
+    "rawSpec": "~1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <1.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/bl/readable-stream",
+    "/concat-stream/readable-stream",
+    "/readable-stream"
   ],
+  "_resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+  "_shasum": "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538",
+  "_shrinkwrap": null,
+  "_spec": "core-util-is@~1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/readable-stream",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "license": "MIT",
   "bugs": {
     "url": "https://github.com/isaacs/core-util-is/issues"
   },
-  "readme": "# core-util-is\n\nThe `util.is*` functions introduced in Node v0.12.\n",
-  "readmeFilename": "README.md",
-  "homepage": "https://github.com/isaacs/core-util-is",
-  "_id": "core-util-is@1.0.1",
+  "dependencies": {},
+  "description": "The `util.is*` functions introduced in Node v0.12.",
+  "devDependencies": {},
+  "directories": {},
   "dist": {
     "shasum": "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538",
     "tarball": "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
   },
-  "_from": "core-util-is@>=1.0.0 <1.1.0",
-  "_npmVersion": "1.3.23",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "i@izs.me"
-  },
+  "homepage": "https://github.com/isaacs/core-util-is",
+  "keywords": [
+    "isArray",
+    "isBuffer",
+    "isNumber",
+    "isRegExp",
+    "isString",
+    "isThat",
+    "isThis",
+    "polyfill",
+    "util"
+  ],
+  "license": "MIT",
+  "main": "lib/util.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "directories": {},
-  "_shasum": "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538",
-  "_resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+  "name": "core-util-is",
+  "optionalDependencies": {},
+  "readme": "# core-util-is\n\nThe `util.is*` functions introduced in Node v0.12.\n",
+  "readmeFilename": "README.md",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/core-util-is"
+  },
+  "version": "1.0.1"
 }
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/util.js b/deps/npm/node_modules/core-util-is/util.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/util.js
rename to deps/npm/node_modules/core-util-is/util.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/.npmignore b/deps/npm/node_modules/cryptiles/.npmignore
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/.npmignore
rename to deps/npm/node_modules/cryptiles/.npmignore
index 77ba16cb055ca5..b0939eabe34d2d 100644
--- a/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/.npmignore
+++ b/deps/npm/node_modules/cryptiles/.npmignore
@@ -15,4 +15,3 @@ config.json
 */*/._*
 coverage.*
 lib-cov
-
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/.travis.yml b/deps/npm/node_modules/cryptiles/.travis.yml
old mode 100644
new mode 100755
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/.travis.yml
rename to deps/npm/node_modules/cryptiles/.travis.yml
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/LICENSE b/deps/npm/node_modules/cryptiles/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/LICENSE
rename to deps/npm/node_modules/cryptiles/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/README.md b/deps/npm/node_modules/cryptiles/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/README.md
rename to deps/npm/node_modules/cryptiles/README.md
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/lib/index.js b/deps/npm/node_modules/cryptiles/lib/index.js
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/lib/index.js
rename to deps/npm/node_modules/cryptiles/lib/index.js
index f385870ee68e3a..c8a046d7433235 100755
--- a/deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/lib/index.js
+++ b/deps/npm/node_modules/cryptiles/lib/index.js
@@ -64,5 +64,3 @@ exports.fixedTimeComparison = function (a, b) {
 
     return (mismatch === 0);
 };
-
-
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/package.json b/deps/npm/node_modules/cryptiles/package.json
similarity index 68%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/package.json
rename to deps/npm/node_modules/cryptiles/package.json
index c65fd094047c73..75d997644a6fe9 100644
--- a/deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/package.json
+++ b/deps/npm/node_modules/cryptiles/package.json
@@ -1,50 +1,67 @@
 {
-  "name": "cryptiles",
-  "description": "General purpose crypto utilities",
-  "version": "2.0.5",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/hapijs/cryptiles.git"
+  "_args": [
+    [
+      "cryptiles@2.x.x",
+      "/Users/rebecca/code/npm/node_modules/hawk"
+    ]
+  ],
+  "_from": "cryptiles@>=2.0.0 <3.0.0",
+  "_id": "cryptiles@2.0.5",
+  "_inCache": true,
+  "_location": "/cryptiles",
+  "_nodeVersion": "4.0.0",
+  "_npmUser": {
+    "email": "eran@hammer.io",
+    "name": "hueniverse"
   },
-  "main": "lib/index.js",
-  "keywords": [
-    "cryptography",
-    "security",
-    "utilites"
+  "_npmVersion": "2.14.2",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "cryptiles",
+    "raw": "cryptiles@2.x.x",
+    "rawSpec": "2.x.x",
+    "scope": null,
+    "spec": ">=2.0.0 <3.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/follow/hawk",
+    "/hawk"
   ],
-  "engines": {
-    "node": ">=0.10.40"
+  "_resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+  "_shasum": "3bdfecdc608147c1c67202fa291e7dca59eaa3b8",
+  "_shrinkwrap": null,
+  "_spec": "cryptiles@2.x.x",
+  "_where": "/Users/rebecca/code/npm/node_modules/hawk",
+  "bugs": {
+    "url": "https://github.com/hapijs/cryptiles/issues"
   },
   "dependencies": {
     "boom": "2.x.x"
   },
+  "description": "General purpose crypto utilities",
   "devDependencies": {
     "code": "1.x.x",
     "lab": "5.x.x"
   },
-  "scripts": {
-    "test": "lab -a code -t 100 -L",
-    "test-cov-html": "lab -a code -r html -o coverage.html"
-  },
-  "license": "BSD-3-Clause",
-  "gitHead": "9bc5a852f01cd51e615814e1cb255fe2df810649",
-  "bugs": {
-    "url": "https://github.com/hapijs/cryptiles/issues"
-  },
-  "homepage": "https://github.com/hapijs/cryptiles#readme",
-  "_id": "cryptiles@2.0.5",
-  "_shasum": "3bdfecdc608147c1c67202fa291e7dca59eaa3b8",
-  "_from": "cryptiles@>=2.0.0 <3.0.0",
-  "_npmVersion": "2.14.2",
-  "_nodeVersion": "4.0.0",
-  "_npmUser": {
-    "name": "hueniverse",
-    "email": "eran@hammer.io"
-  },
+  "directories": {},
   "dist": {
     "shasum": "3bdfecdc608147c1c67202fa291e7dca59eaa3b8",
     "tarball": "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
   },
+  "engines": {
+    "node": ">=0.10.40"
+  },
+  "gitHead": "9bc5a852f01cd51e615814e1cb255fe2df810649",
+  "homepage": "https://github.com/hapijs/cryptiles#readme",
+  "installable": true,
+  "keywords": [
+    "cryptography",
+    "security",
+    "utilites"
+  ],
+  "license": "BSD-3-Clause",
+  "main": "lib/index.js",
   "maintainers": [
     {
       "name": "hueniverse",
@@ -55,7 +72,15 @@
       "email": "ceejceej@gmail.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "cryptiles",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/hapijs/cryptiles.git"
+  },
+  "scripts": {
+    "test": "lab -a code -t 100 -L",
+    "test-cov-html": "lab -a code -r html -o coverage.html"
+  },
+  "version": "2.0.5"
 }
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/test/index.js b/deps/npm/node_modules/cryptiles/test/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/test/index.js
rename to deps/npm/node_modules/cryptiles/test/index.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/.npmignore b/deps/npm/node_modules/ctype/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/.npmignore
rename to deps/npm/node_modules/ctype/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/CHANGELOG b/deps/npm/node_modules/ctype/CHANGELOG
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/CHANGELOG
rename to deps/npm/node_modules/ctype/CHANGELOG
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/LICENSE b/deps/npm/node_modules/ctype/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/LICENSE
rename to deps/npm/node_modules/ctype/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/README b/deps/npm/node_modules/ctype/README
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/README
rename to deps/npm/node_modules/ctype/README
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/README.old b/deps/npm/node_modules/ctype/README.old
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/README.old
rename to deps/npm/node_modules/ctype/README.old
index 9326b725f5641e..c6270bd1c9375a 100644
--- a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/README.old
+++ b/deps/npm/node_modules/ctype/README.old
@@ -295,4 +295,3 @@ void wsint64(Number[], endian, buffer offset);
 Write floating point numbers from a buffer:
 void wfloat(Number, buffer, endian, offset);   /* IEEE-754 Single precision */
 void wdouble(Number, buffer, endian, offset);  /* IEEE-754 Double precision */
-
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/ctf.js b/deps/npm/node_modules/ctype/ctf.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/ctf.js
rename to deps/npm/node_modules/ctype/ctf.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/ctio.js b/deps/npm/node_modules/ctype/ctio.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/ctio.js
rename to deps/npm/node_modules/ctype/ctio.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/ctype.js b/deps/npm/node_modules/ctype/ctype.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/ctype.js
rename to deps/npm/node_modules/ctype/ctype.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/man/man3ctype/ctio.3ctype b/deps/npm/node_modules/ctype/man/man3ctype/ctio.3ctype
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/man/man3ctype/ctio.3ctype
rename to deps/npm/node_modules/ctype/man/man3ctype/ctio.3ctype
index 3f94986a1b3af6..483ad955605588 100644
--- a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/man/man3ctype/ctio.3ctype
+++ b/deps/npm/node_modules/ctype/man/man3ctype/ctio.3ctype
@@ -11,7 +11,7 @@
 .\"
 .\" The above copyright notice and this permission notice shall be included in
 .\" all copies or substantial portions of the Software.
-.\" 
+.\"
 .\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 .\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 .\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -204,7 +204,7 @@ IEEE-754 floating point value instead.
 .SS "\fBwfloat()\fR, \fBwdouble()\fR"
 .sp
 .LP
-The functions "\fBrfloat()\fR and \fBrdouble()\fR" work like the other write 
+The functions "\fBrfloat()\fR and \fBrdouble()\fR" work like the other write
 functions, except that the domain for a float is that of a single precision 4
 byte value. The domain for a double is any \fBNumber\fR in ECMAScript, which is
 defined to be represented by a double.
diff --git a/deps/npm/node_modules/ctype/package.json b/deps/npm/node_modules/ctype/package.json
new file mode 100644
index 00000000000000..a4d41f6d5cbd49
--- /dev/null
+++ b/deps/npm/node_modules/ctype/package.json
@@ -0,0 +1,64 @@
+{
+  "_args": [
+    [
+      "ctype@0.5.3",
+      "/Users/rebecca/code/npm/node_modules/http-signature"
+    ]
+  ],
+  "_from": "ctype@0.5.3",
+  "_id": "ctype@0.5.3",
+  "_inCache": true,
+  "_location": "/ctype",
+  "_npmUser": {
+    "email": "rm@fingolfin.org",
+    "name": "rm"
+  },
+  "_npmVersion": "1.1.59",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "ctype",
+    "raw": "ctype@0.5.3",
+    "rawSpec": "0.5.3",
+    "scope": null,
+    "spec": "0.5.3",
+    "type": "version"
+  },
+  "_requiredBy": [
+    "/http-signature"
+  ],
+  "_resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+  "_shasum": "82c18c2461f74114ef16c135224ad0b9144ca12f",
+  "_shrinkwrap": null,
+  "_spec": "ctype@0.5.3",
+  "_where": "/Users/rebecca/code/npm/node_modules/http-signature",
+  "author": {
+    "email": "rm@fingolfin.org",
+    "name": "Robert Mustacchi"
+  },
+  "dependencies": {},
+  "description": "read and write binary structures and data types",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "82c18c2461f74114ef16c135224ad0b9144ca12f",
+    "tarball": "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+  },
+  "engines": {
+    "node": ">= 0.4"
+  },
+  "homepage": "https://github.com/rmustacc/node-ctype",
+  "main": "ctype.js",
+  "maintainers": [
+    {
+      "name": "rm",
+      "email": "rm@fingolfin.org"
+    }
+  ],
+  "name": "ctype",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/rmustacc/node-ctype.git"
+  },
+  "version": "0.5.3"
+}
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/tools/jsl.conf b/deps/npm/node_modules/ctype/tools/jsl.conf
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/tools/jsl.conf
rename to deps/npm/node_modules/ctype/tools/jsl.conf
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/tools/jsstyle b/deps/npm/node_modules/ctype/tools/jsstyle
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/tools/jsstyle
rename to deps/npm/node_modules/ctype/tools/jsstyle
diff --git a/deps/npm/node_modules/read-installed/node_modules/debuglog/LICENSE b/deps/npm/node_modules/debuglog/LICENSE
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/debuglog/LICENSE
rename to deps/npm/node_modules/debuglog/LICENSE
diff --git a/deps/npm/node_modules/read-installed/node_modules/debuglog/README.md b/deps/npm/node_modules/debuglog/README.md
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/debuglog/README.md
rename to deps/npm/node_modules/debuglog/README.md
diff --git a/deps/npm/node_modules/read-installed/node_modules/debuglog/debuglog.js b/deps/npm/node_modules/debuglog/debuglog.js
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/debuglog/debuglog.js
rename to deps/npm/node_modules/debuglog/debuglog.js
diff --git a/deps/npm/node_modules/read-installed/node_modules/debuglog/package.json b/deps/npm/node_modules/debuglog/package.json
similarity index 54%
rename from deps/npm/node_modules/read-installed/node_modules/debuglog/package.json
rename to deps/npm/node_modules/debuglog/package.json
index 39fac076703ce0..e7fe99f56e34f1 100644
--- a/deps/npm/node_modules/read-installed/node_modules/debuglog/package.json
+++ b/deps/npm/node_modules/debuglog/package.json
@@ -1,19 +1,41 @@
 {
-  "name": "debuglog",
-  "version": "1.0.1",
-  "description": "backport of util.debuglog from node v0.11",
-  "license": "MIT",
-  "main": "debuglog.js",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/sam-github/node-debuglog.git"
+  "_args": [
+    [
+      "debuglog@^1.0.1",
+      "/Users/rebecca/code/npm/node_modules/read-installed"
+    ]
+  ],
+  "_from": "debuglog@>=1.0.1 <2.0.0",
+  "_id": "debuglog@1.0.1",
+  "_inCache": true,
+  "_location": "/debuglog",
+  "_npmUser": {
+    "email": "sam@strongloop.com",
+    "name": "octet"
   },
-  "author": {
-    "name": "Sam Roberts",
-    "email": "sam@strongloop.com"
+  "_npmVersion": "1.4.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "debuglog",
+    "raw": "debuglog@^1.0.1",
+    "rawSpec": "^1.0.1",
+    "scope": null,
+    "spec": ">=1.0.1 <2.0.0",
+    "type": "range"
   },
-  "engines": {
-    "node": "*"
+  "_requiredBy": [
+    "/read-installed",
+    "/read-package-tree",
+    "/readdir-scoped-modules"
+  ],
+  "_resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
+  "_shasum": "aa24ffb9ac3df9a2351837cfb2d279360cd78492",
+  "_shrinkwrap": null,
+  "_spec": "debuglog@^1.0.1",
+  "_where": "/Users/rebecca/code/npm/node_modules/read-installed",
+  "author": {
+    "email": "sam@strongloop.com",
+    "name": "Sam Roberts"
   },
   "browser": {
     "util": false
@@ -21,25 +43,31 @@
   "bugs": {
     "url": "https://github.com/sam-github/node-debuglog/issues"
   },
-  "homepage": "https://github.com/sam-github/node-debuglog",
-  "_id": "debuglog@1.0.1",
+  "dependencies": {},
+  "description": "backport of util.debuglog from node v0.11",
+  "devDependencies": {},
+  "directories": {},
   "dist": {
     "shasum": "aa24ffb9ac3df9a2351837cfb2d279360cd78492",
     "tarball": "http://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"
   },
-  "_from": "debuglog@>=1.0.1 <2.0.0",
-  "_npmVersion": "1.4.3",
-  "_npmUser": {
-    "name": "octet",
-    "email": "sam@strongloop.com"
+  "engines": {
+    "node": "*"
   },
+  "homepage": "https://github.com/sam-github/node-debuglog",
+  "license": "MIT",
+  "main": "debuglog.js",
   "maintainers": [
     {
       "name": "octet",
       "email": "sam@strongloop.com"
     }
   ],
-  "directories": {},
-  "_shasum": "aa24ffb9ac3df9a2351837cfb2d279360cd78492",
-  "_resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"
+  "name": "debuglog",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/sam-github/node-debuglog.git"
+  },
+  "version": "1.0.1"
 }
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/.npmignore b/deps/npm/node_modules/defaults/.npmignore
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/.npmignore
rename to deps/npm/node_modules/defaults/.npmignore
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/LICENSE b/deps/npm/node_modules/defaults/LICENSE
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/LICENSE
rename to deps/npm/node_modules/defaults/LICENSE
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/README.md b/deps/npm/node_modules/defaults/README.md
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/README.md
rename to deps/npm/node_modules/defaults/README.md
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/index.js b/deps/npm/node_modules/defaults/index.js
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/index.js
rename to deps/npm/node_modules/defaults/index.js
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/package.json b/deps/npm/node_modules/defaults/package.json
similarity index 62%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/package.json
rename to deps/npm/node_modules/defaults/package.json
index fdd074d0f4afbb..7c025a16873369 100644
--- a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/package.json
+++ b/deps/npm/node_modules/defaults/package.json
@@ -1,53 +1,77 @@
 {
-  "name": "defaults",
-  "version": "1.0.2",
-  "description": "merge single level defaults over a config object",
-  "main": "index.js",
-  "scripts": {
-    "test": "node test.js"
+  "_args": [
+    [
+      "defaults@^1.0.0",
+      "/Users/rebecca/code/npm/node_modules/wcwidth"
+    ]
+  ],
+  "_from": "defaults@>=1.0.0 <2.0.0",
+  "_id": "defaults@1.0.2",
+  "_inCache": true,
+  "_location": "/defaults",
+  "_npmUser": {
+    "email": "tmpvar@gmail.com",
+    "name": "tmpvar"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/tmpvar/defaults.git"
+  "_npmVersion": "1.4.23",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "defaults",
+    "raw": "defaults@^1.0.0",
+    "rawSpec": "^1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
   },
-  "keywords": [
-    "config",
-    "defaults"
+  "_requiredBy": [
+    "/wcwidth"
   ],
+  "_resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz",
+  "_shasum": "6902e25aa047649a501e19ef9e98f3e8365c109a",
+  "_shrinkwrap": null,
+  "_spec": "defaults@^1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/wcwidth",
   "author": {
-    "name": "Elijah Insua",
-    "email": "tmpvar@gmail.com"
+    "email": "tmpvar@gmail.com",
+    "name": "Elijah Insua"
+  },
+  "bugs": {
+    "url": "https://github.com/tmpvar/defaults/issues"
   },
-  "license": "MIT",
   "dependencies": {
     "clone": "~0.1.5"
   },
+  "description": "merge single level defaults over a config object",
   "devDependencies": {
     "tap": "~0.4.0"
   },
-  "gitHead": "22c57d1f87a2f03c1f9d21bd39c67db8553a0064",
-  "bugs": {
-    "url": "https://github.com/tmpvar/defaults/issues"
+  "directories": {},
+  "dist": {
+    "shasum": "6902e25aa047649a501e19ef9e98f3e8365c109a",
+    "tarball": "http://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz"
   },
+  "gitHead": "22c57d1f87a2f03c1f9d21bd39c67db8553a0064",
   "homepage": "https://github.com/tmpvar/defaults",
-  "_id": "defaults@1.0.2",
-  "_shasum": "6902e25aa047649a501e19ef9e98f3e8365c109a",
-  "_from": "defaults@>=1.0.0 <2.0.0",
-  "_npmVersion": "1.4.23",
-  "_npmUser": {
-    "name": "tmpvar",
-    "email": "tmpvar@gmail.com"
-  },
+  "keywords": [
+    "config",
+    "defaults"
+  ],
+  "license": "MIT",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "tmpvar",
       "email": "tmpvar@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "6902e25aa047649a501e19ef9e98f3e8365c109a",
-    "tarball": "http://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz"
+  "name": "defaults",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/tmpvar/defaults.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz"
+  "scripts": {
+    "test": "node test.js"
+  },
+  "version": "1.0.2"
 }
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/test.js b/deps/npm/node_modules/defaults/test.js
similarity index 99%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/test.js
rename to deps/npm/node_modules/defaults/test.js
index 60e0ffba8b4aab..eab79ff71f1498 100644
--- a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/test.js
+++ b/deps/npm/node_modules/defaults/test.js
@@ -31,4 +31,3 @@ test("ensure defaults clone nested objects", function(t) {
   t.ok(result.b !== d.b, 'objects should be clones');
   t.end();
 });
-
diff --git a/deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/.npmignore b/deps/npm/node_modules/delayed-stream/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/.npmignore
rename to deps/npm/node_modules/delayed-stream/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/License b/deps/npm/node_modules/delayed-stream/License
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/License
rename to deps/npm/node_modules/delayed-stream/License
diff --git a/deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/Makefile b/deps/npm/node_modules/delayed-stream/Makefile
similarity index 98%
rename from deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/Makefile
rename to deps/npm/node_modules/delayed-stream/Makefile
index b4ff85a33b6eb4..2d7580746d0b84 100644
--- a/deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/Makefile
+++ b/deps/npm/node_modules/delayed-stream/Makefile
@@ -4,4 +4,3 @@ test:
 	@./test/run.js
 
 .PHONY: test
-
diff --git a/deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/Readme.md b/deps/npm/node_modules/delayed-stream/Readme.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/Readme.md
rename to deps/npm/node_modules/delayed-stream/Readme.md
diff --git a/deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/lib/delayed_stream.js b/deps/npm/node_modules/delayed-stream/lib/delayed_stream.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/lib/delayed_stream.js
rename to deps/npm/node_modules/delayed-stream/lib/delayed_stream.js
diff --git a/deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/package.json b/deps/npm/node_modules/delayed-stream/package.json
similarity index 69%
rename from deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/package.json
rename to deps/npm/node_modules/delayed-stream/package.json
index 8ac66b814c8162..7f4cb7f97feab1 100644
--- a/deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/package.json
+++ b/deps/npm/node_modules/delayed-stream/package.json
@@ -1,53 +1,69 @@
 {
+  "_args": [
+    [
+      "delayed-stream@~1.0.0",
+      "/Users/rebecca/code/npm/node_modules/combined-stream"
+    ]
+  ],
+  "_from": "delayed-stream@>=1.0.0 <1.1.0",
+  "_id": "delayed-stream@1.0.0",
+  "_inCache": true,
+  "_location": "/delayed-stream",
+  "_nodeVersion": "1.6.4",
+  "_npmUser": {
+    "email": "apeherder@gmail.com",
+    "name": "apechimp"
+  },
+  "_npmVersion": "2.8.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "delayed-stream",
+    "raw": "delayed-stream@~1.0.0",
+    "rawSpec": "~1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <1.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/combined-stream"
+  ],
+  "_resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+  "_shasum": "df3ae199acadfb7d440aaae0b29e2272b24ec619",
+  "_shrinkwrap": null,
+  "_spec": "delayed-stream@~1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/combined-stream",
   "author": {
-    "name": "Felix Geisendörfer",
     "email": "felix@debuggable.com",
+    "name": "Felix Geisendörfer",
     "url": "http://debuggable.com/"
   },
+  "bugs": {
+    "url": "https://github.com/felixge/node-delayed-stream/issues"
+  },
   "contributors": [
     {
       "name": "Mike Atkins",
       "email": "apeherder@gmail.com"
     }
   ],
-  "name": "delayed-stream",
-  "description": "Buffers events from a stream until you are ready to handle them.",
-  "license": "MIT",
-  "version": "1.0.0",
-  "homepage": "https://github.com/felixge/node-delayed-stream",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/felixge/node-delayed-stream.git"
-  },
-  "main": "./lib/delayed_stream",
-  "engines": {
-    "node": ">=0.4.0"
-  },
-  "scripts": {
-    "test": "make test"
-  },
   "dependencies": {},
+  "description": "Buffers events from a stream until you are ready to handle them.",
   "devDependencies": {
     "fake": "0.2.0",
     "far": "0.0.1"
   },
-  "gitHead": "07a9dc99fb8f1a488160026b9ad77493f766fb84",
-  "bugs": {
-    "url": "https://github.com/felixge/node-delayed-stream/issues"
-  },
-  "_id": "delayed-stream@1.0.0",
-  "_shasum": "df3ae199acadfb7d440aaae0b29e2272b24ec619",
-  "_from": "delayed-stream@>=1.0.0 <1.1.0",
-  "_npmVersion": "2.8.3",
-  "_nodeVersion": "1.6.4",
-  "_npmUser": {
-    "name": "apechimp",
-    "email": "apeherder@gmail.com"
-  },
+  "directories": {},
   "dist": {
     "shasum": "df3ae199acadfb7d440aaae0b29e2272b24ec619",
     "tarball": "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
   },
+  "engines": {
+    "node": ">=0.4.0"
+  },
+  "gitHead": "07a9dc99fb8f1a488160026b9ad77493f766fb84",
+  "homepage": "https://github.com/felixge/node-delayed-stream",
+  "license": "MIT",
+  "main": "./lib/delayed_stream",
   "maintainers": [
     {
       "name": "felixge",
@@ -58,7 +74,14 @@
       "email": "apeherder@gmail.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "delayed-stream",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/felixge/node-delayed-stream.git"
+  },
+  "scripts": {
+    "test": "make test"
+  },
+  "version": "1.0.0"
 }
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/.npmignore b/deps/npm/node_modules/delegates/.npmignore
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/.npmignore
rename to deps/npm/node_modules/delegates/.npmignore
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/History.md b/deps/npm/node_modules/delegates/History.md
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/History.md
rename to deps/npm/node_modules/delegates/History.md
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/Makefile b/deps/npm/node_modules/delegates/Makefile
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/Makefile
rename to deps/npm/node_modules/delegates/Makefile
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/Readme.md b/deps/npm/node_modules/delegates/Readme.md
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/Readme.md
rename to deps/npm/node_modules/delegates/Readme.md
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/index.js b/deps/npm/node_modules/delegates/index.js
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/index.js
rename to deps/npm/node_modules/delegates/index.js
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/package.json b/deps/npm/node_modules/delegates/package.json
similarity index 59%
rename from deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/package.json
rename to deps/npm/node_modules/delegates/package.json
index ea3c1da0d490b2..3d6aaa8fa4d883 100644
--- a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/package.json
+++ b/deps/npm/node_modules/delegates/package.json
@@ -1,33 +1,56 @@
 {
-  "name": "delegates",
-  "version": "0.1.0",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/visionmedia/node-delegates.git"
+  "_args": [
+    [
+      "delegates@^0.1.0",
+      "/Users/rebecca/code/npm/node_modules/are-we-there-yet"
+    ]
+  ],
+  "_from": "delegates@>=0.1.0 <0.2.0",
+  "_id": "delegates@0.1.0",
+  "_inCache": true,
+  "_location": "/delegates",
+  "_npmUser": {
+    "email": "dominic@dbarnes.info",
+    "name": "dominicbarnes"
   },
-  "description": "delegate methods and accessors to another property",
-  "keywords": [
-    "delegate",
-    "delegation"
+  "_npmVersion": "1.4.9",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "delegates",
+    "raw": "delegates@^0.1.0",
+    "rawSpec": "^0.1.0",
+    "scope": null,
+    "spec": ">=0.1.0 <0.2.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/are-we-there-yet"
   ],
+  "_resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz",
+  "_shasum": "b4b57be11a1653517a04b27f0949bdc327dfe390",
+  "_shrinkwrap": null,
+  "_spec": "delegates@^0.1.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/are-we-there-yet",
+  "bugs": {
+    "url": "https://github.com/visionmedia/node-delegates/issues"
+  },
   "dependencies": {},
+  "description": "delegate methods and accessors to another property",
   "devDependencies": {
     "mocha": "*",
     "should": "*"
   },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/visionmedia/node-delegates/issues"
+  "directories": {},
+  "dist": {
+    "shasum": "b4b57be11a1653517a04b27f0949bdc327dfe390",
+    "tarball": "http://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
   },
   "homepage": "https://github.com/visionmedia/node-delegates",
-  "_id": "delegates@0.1.0",
-  "_shasum": "b4b57be11a1653517a04b27f0949bdc327dfe390",
-  "_from": "delegates@>=0.1.0 <0.2.0",
-  "_npmVersion": "1.4.9",
-  "_npmUser": {
-    "name": "dominicbarnes",
-    "email": "dominic@dbarnes.info"
-  },
+  "keywords": [
+    "delegate",
+    "delegation"
+  ],
+  "license": "MIT",
   "maintainers": [
     {
       "name": "tjholowaychuk",
@@ -38,11 +61,11 @@
       "email": "dominic@dbarnes.info"
     }
   ],
-  "dist": {
-    "shasum": "b4b57be11a1653517a04b27f0949bdc327dfe390",
-    "tarball": "http://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+  "name": "delegates",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/visionmedia/node-delegates"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "version": "0.1.0"
 }
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/test/index.js b/deps/npm/node_modules/delegates/test/index.js
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/test/index.js
rename to deps/npm/node_modules/delegates/test/index.js
diff --git a/deps/npm/node_modules/dezalgo/package.json b/deps/npm/node_modules/dezalgo/package.json
index ea2b1a6d30d219..b59399450ddc4c 100644
--- a/deps/npm/node_modules/dezalgo/package.json
+++ b/deps/npm/node_modules/dezalgo/package.json
@@ -1,52 +1,99 @@
 {
-  "name": "dezalgo",
-  "version": "1.0.3",
-  "description": "Contain async insanity so that the dark pony lord doesn't eat souls",
-  "main": "dezalgo.js",
-  "directories": {
-    "test": "test"
+  "_args": [
+    [
+      "dezalgo@~1.0.3",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "dezalgo@>=1.0.3 <1.1.0",
+  "_id": "dezalgo@1.0.3",
+  "_inCache": true,
+  "_location": "/dezalgo",
+  "_nodeVersion": "2.0.2",
+  "_npmUser": {
+    "email": "ogd@aoaioxxysz.net",
+    "name": "othiym23"
+  },
+  "_npmVersion": "2.11.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "dezalgo",
+    "raw": "dezalgo@~1.0.3",
+    "rawSpec": "~1.0.3",
+    "scope": null,
+    "spec": ">=1.0.3 <1.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/",
+    "/async-some",
+    "/read-package-tree",
+    "/readdir-scoped-modules",
+    "/realize-package-specifier"
+  ],
+  "_resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
+  "_shasum": "7f742de066fc748bc8db820569dddce49bf0d456",
+  "_shrinkwrap": null,
+  "_spec": "dezalgo@~1.0.3",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
+    "url": "http://blog.izs.me/"
+  },
+  "bugs": {
+    "url": "https://github.com/npm/dezalgo/issues"
   },
   "dependencies": {
     "asap": "^2.0.0",
     "wrappy": "1"
   },
+  "description": "Contain async insanity so that the dark pony lord doesn't eat souls",
   "devDependencies": {
     "tap": "^1.2.0"
   },
-  "scripts": {
-    "test": "tap test/*.js"
+  "directories": {
+    "test": "test"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/dezalgo.git"
+  "dist": {
+    "shasum": "7f742de066fc748bc8db820569dddce49bf0d456",
+    "tarball": "http://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz"
   },
+  "gitHead": "d4d3f3f6f47b1a326194d5281349c83dde258458",
+  "homepage": "https://github.com/npm/dezalgo",
   "keywords": [
+    "H̝̪̜͓̀̌̂̒E̢̙̠̣ ̴̳͇̥̟̠͍̐C̹̓̑̐̆͝Ó̶̭͓̚M̬̼Ĕ̖̤͔͔̟̹̽̿̊ͥ̍ͫS̻̰̦̻̖̘̱̒ͪ͌̅͟",
+    "H̴̱̦̗̬̣͓̺e̮ ͉̠̰̞͎̖͟ẁh̛̺̯ͅo̖̫͡ ̢Ẁa̡̗i̸t͖̣͉̀ş͔̯̩ ̤̦̮͇̞̦̲B͎̭͇̦̼e̢hin͏͙̟̪d̴̰͓̻̣̮͕ͅ T͖̮̕h͖e̘̺̰̙͘ ̥Ẁ̦͔̻͚a̞͖̪͉l̪̠̻̰̣̠l̲͎͞",
+    "T̯̪ͅo̯͖̹ ̻̮̖̲͢i̥̖n̢͈͇̝͍v͏͉ok̭̬̝ͅe̞͍̩̫͍̩͝ ̩̮̖̟͇͉́t͔͔͎̗h͏̗̟e̘͉̰̦̠̞͓ ͕h͉̟͎̪̠̱͠ḭ̮̩v̺͉͇̩e̵͖-̺̪m͍i̜n̪̲̲̲̮d̷ ̢r̠̼̯̹̦̦͘ͅe͓̳͓̙p̺̗̫͙͘ͅr͔̰͜e̴͓̞s͉̩̩͟ͅe͏̣n͚͇̗̭̺͍tì͙̣n͏̖̥̗͎̰̪g̞͓̭̱̯̫̕ ̣̱͜ͅc̦̰̰̠̮͎͙̀hao̺̜̻͍͙ͅs͉͓̘.͎̼̺̼͕̹͘",
+    "Z̘͍̼͎̣͔͝Ą̲̜̱̱̹̤͇L̶̝̰̭͔G͍̖͍O̫͜ͅ!̼̤ͅ",
     "async",
-    "zalgo",
-    "the dark pony",
-    "he comes",
     "asynchrony of all holy and good",
-    "T̯̪ͅo̯͖̹ ̻̮̖̲͢i̥̖n̢͈͇̝͍v͏͉ok̭̬̝ͅe̞͍̩̫͍̩͝ ̩̮̖̟͇͉́t͔͔͎̗h͏̗̟e̘͉̰̦̠̞͓ ͕h͉̟͎̪̠̱͠ḭ̮̩v̺͉͇̩e̵͖-̺̪m͍i̜n̪̲̲̲̮d̷ ̢r̠̼̯̹̦̦͘ͅe͓̳͓̙p̺̗̫͙͘ͅr͔̰͜e̴͓̞s͉̩̩͟ͅe͏̣n͚͇̗̭̺͍tì͙̣n͏̖̥̗͎̰̪g̞͓̭̱̯̫̕ ̣̱͜ͅc̦̰̰̠̮͎͙̀hao̺̜̻͍͙ͅs͉͓̘.͎̼̺̼͕̹͘",
+    "he comes",
+    "the dark pony",
+    "zalgo",
     "̠̞̱̰I͖͇̝̻n̦̰͍̰̟v̤̺̫̳̭̼̗͘ò̹̟̩̩͚k̢̥̠͍͉̦̬i̖͓͔̮̱̻͘n̶̳͙̫͎g̖̯̣̲̪͉ ̞͎̗͕͚ͅt̲͕̘̺̯̗̦h̘̦̲̜̻e̳͎͉̬͙ ̴̞̪̲̥f̜̯͓͓̭̭͢e̱̘͔̮e̜̤l̺̱͖̯͓͙͈͢i̵̦̬͉͔̫͚͕n͉g̨͖̙̙̹̹̟̤ ͉̪o̞̠͍̪̰͙ͅf̬̲̺ ͔͕̲͕͕̲̕c̙͉h̝͔̩̙̕ͅa̲͖̻̗̹o̥̼̫s̝̖̜̝͚̫̟.̺͚  ̸̱̲W̶̥̣͖̦i͏̤̬̱̳̣ͅt͉h̗̪̪ ̷̱͚̹̪ǫ͕̗̣̳̦͎u̼̦͔̥̮̕ţ͖͎̻͔͉ ̴͎̩òr̹̰̖͉͈͝d̷̲̦̖͓e̲͓̠r",
-    "̧͚̜͓̰̭̭Ṯ̫̹̜̮̟̮͝h͚̘̩̘̖̰́e ̥̘͓͉͔͙̼N̟̜̣̘͔̪e̞̞̤͢z̰̖̘͇p̠͟e̺̱̣͍͙̝ṛ̘̬͔̙͇̠d͝ḭ̯̱̥̗̩a̛ͅn͏̦ ̷̥hi̥v̖̳̹͉̮̱͝e̹̪̘̖̰̟-̴͙͓͚̜̻mi̗̺̻͙̺ͅn̪̯͈d ͏̘͓̫̳ͅơ̹͔̳̖̣͓f͈̹̘ ͕ͅc̗̤̠̜̮̥̥h̡͍̩̭̫͚̱a̤͉̤͔͜os͕̤̼͍̲̀ͅ.̡̱ ̦Za̯̱̗̭͍̣͚l̗͉̰̤g͏̣̭̬̗̲͖ͅo̶̭̩̳̟͈.̪̦̰̳",
-    "H̴̱̦̗̬̣͓̺e̮ ͉̠̰̞͎̖͟ẁh̛̺̯ͅo̖̫͡ ̢Ẁa̡̗i̸t͖̣͉̀ş͔̯̩ ̤̦̮͇̞̦̲B͎̭͇̦̼e̢hin͏͙̟̪d̴̰͓̻̣̮͕ͅ T͖̮̕h͖e̘̺̰̙͘ ̥Ẁ̦͔̻͚a̞͖̪͉l̪̠̻̰̣̠l̲͎͞",
-    "Z̘͍̼͎̣͔͝Ą̲̜̱̱̹̤͇L̶̝̰̭͔G͍̖͍O̫͜ͅ!̼̤ͅ",
-    "H̝̪̜͓̀̌̂̒E̢̙̠̣ ̴̳͇̥̟̠͍̐C̹̓̑̐̆͝Ó̶̭͓̚M̬̼Ĕ̖̤͔͔̟̹̽̿̊ͥ̍ͫS̻̰̦̻̖̘̱̒ͪ͌̅͟"
+    "̧͚̜͓̰̭̭Ṯ̫̹̜̮̟̮͝h͚̘̩̘̖̰́e ̥̘͓͉͔͙̼N̟̜̣̘͔̪e̞̞̤͢z̰̖̘͇p̠͟e̺̱̣͍͙̝ṛ̘̬͔̙͇̠d͝ḭ̯̱̥̗̩a̛ͅn͏̦ ̷̥hi̥v̖̳̹͉̮̱͝e̹̪̘̖̰̟-̴͙͓͚̜̻mi̗̺̻͙̺ͅn̪̯͈d ͏̘͓̫̳ͅơ̹͔̳̖̣͓f͈̹̘ ͕ͅc̗̤̠̜̮̥̥h̡͍̩̭̫͚̱a̤͉̤͔͜os͕̤̼͍̲̀ͅ.̡̱ ̦Za̯̱̗̭͍̣͚l̗͉̰̤g͏̣̭̬̗̲͖ͅo̶̭̩̳̟͈.̪̦̰̳"
   ],
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
-  },
   "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/npm/dezalgo/issues"
+  "main": "dezalgo.js",
+  "maintainers": [
+    {
+      "name": "isaacs",
+      "email": "isaacs@npmjs.com"
+    },
+    {
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
+    }
+  ],
+  "name": "dezalgo",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/dezalgo.git"
   },
-  "homepage": "https://github.com/npm/dezalgo",
-  "readme": "# dezalgo\n\nContain async insanity so that the dark pony lord doesn't eat souls\n\nSee [this blog\npost](http://blog.izs.me/post/59142742143/designing-apis-for-asynchrony).\n\n## USAGE\n\nPass a callback to `dezalgo` and it will ensure that it is *always*\ncalled in a future tick, and never in this tick.\n\n```javascript\nvar dz = require('dezalgo')\n\nvar cache = {}\nfunction maybeSync(arg, cb) {\n  cb = dz(cb)\n\n  // this will actually defer to nextTick\n  if (cache[arg]) cb(null, cache[arg])\n\n  fs.readFile(arg, function (er, data) {\n    // since this is *already* defered, it will call immediately\n    if (er) cb(er)\n    cb(null, cache[arg] = data)\n  })\n}\n```\n",
-  "readmeFilename": "README.md",
-  "gitHead": "d4d3f3f6f47b1a326194d5281349c83dde258458",
-  "_id": "dezalgo@1.0.3",
-  "_shasum": "7f742de066fc748bc8db820569dddce49bf0d456",
-  "_from": "dezalgo@>=1.0.3 <1.1.0"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.0.3"
 }
diff --git a/deps/npm/node_modules/editor/package.json b/deps/npm/node_modules/editor/package.json
index 0e5abd3bfb2607..8627e32661956d 100644
--- a/deps/npm/node_modules/editor/package.json
+++ b/deps/npm/node_modules/editor/package.json
@@ -1,60 +1,84 @@
 {
-  "name": "editor",
-  "version": "1.0.0",
-  "description": "launch $EDITOR in your program",
-  "main": "index.js",
-  "directories": {
-    "example": "example",
-    "test": "test"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "tap": "~0.4.4"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "_args": [
+    [
+      "editor@~1.0.0",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "editor@>=1.0.0 <1.1.0",
+  "_id": "editor@1.0.0",
+  "_inCache": true,
+  "_location": "/editor",
+  "_nodeVersion": "1.6.3",
+  "_npmUser": {
+    "email": "substack@gmail.com",
+    "name": "substack"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/substack/node-editor.git"
+  "_npmVersion": "2.7.5",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "editor",
+    "raw": "editor@~1.0.0",
+    "rawSpec": "~1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <1.1.0",
+    "type": "range"
   },
-  "homepage": "https://github.com/substack/node-editor",
-  "keywords": [
-    "text",
-    "edit",
-    "shell"
+  "_requiredBy": [
+    "/"
   ],
+  "_resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz",
+  "_shasum": "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742",
+  "_shrinkwrap": null,
+  "_spec": "editor@~1.0.0",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "James Halliday",
     "email": "mail@substack.net",
+    "name": "James Halliday",
     "url": "http://substack.net"
   },
-  "license": "MIT",
-  "engine": {
-    "node": ">=0.6"
-  },
-  "gitHead": "15200af2c417c65a4df153f39f32143dcd476375",
   "bugs": {
     "url": "https://github.com/substack/node-editor/issues"
   },
-  "_id": "editor@1.0.0",
-  "_shasum": "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742",
-  "_from": "editor@>=1.0.0 <1.1.0",
-  "_npmVersion": "2.7.5",
-  "_nodeVersion": "1.6.3",
-  "_npmUser": {
-    "name": "substack",
-    "email": "substack@gmail.com"
+  "dependencies": {},
+  "description": "launch $EDITOR in your program",
+  "devDependencies": {
+    "tap": "~0.4.4"
+  },
+  "directories": {
+    "example": "example",
+    "test": "test"
   },
   "dist": {
     "shasum": "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742",
     "tarball": "http://registry.npmjs.org/editor/-/editor-1.0.0.tgz"
   },
+  "engine": {
+    "node": ">=0.6"
+  },
+  "gitHead": "15200af2c417c65a4df153f39f32143dcd476375",
+  "homepage": "https://github.com/substack/node-editor",
+  "keywords": [
+    "edit",
+    "shell",
+    "text"
+  ],
+  "license": "MIT",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "substack",
       "email": "mail@substack.net"
     }
   ],
-  "_resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"
+  "name": "editor",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/substack/node-editor.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.0.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/index.js b/deps/npm/node_modules/escape-string-regexp/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/index.js
rename to deps/npm/node_modules/escape-string-regexp/index.js
diff --git a/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/license b/deps/npm/node_modules/escape-string-regexp/license
similarity index 100%
rename from deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/license
rename to deps/npm/node_modules/escape-string-regexp/license
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/package.json b/deps/npm/node_modules/escape-string-regexp/package.json
similarity index 65%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/package.json
rename to deps/npm/node_modules/escape-string-regexp/package.json
index 813c9089d27760..18bc92013065f9 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/package.json
+++ b/deps/npm/node_modules/escape-string-regexp/package.json
@@ -1,70 +1,94 @@
 {
-  "name": "escape-string-regexp",
-  "version": "1.0.3",
-  "description": "Escape RegExp special characters",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sindresorhus/escape-string-regexp.git"
+  "_args": [
+    [
+      "escape-string-regexp@^1.0.2",
+      "/Users/rebecca/code/npm/node_modules/chalk"
+    ]
+  ],
+  "_from": "escape-string-regexp@>=1.0.2 <2.0.0",
+  "_id": "escape-string-regexp@1.0.3",
+  "_inCache": true,
+  "_location": "/escape-string-regexp",
+  "_nodeVersion": "0.10.35",
+  "_npmUser": {
+    "email": "jappelman@xebia.com",
+    "name": "jbnicolai"
+  },
+  "_npmVersion": "2.1.16",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "escape-string-regexp",
+    "raw": "escape-string-regexp@^1.0.2",
+    "rawSpec": "^1.0.2",
+    "scope": null,
+    "spec": ">=1.0.2 <2.0.0",
+    "type": "range"
   },
+  "_requiredBy": [
+    "/chalk"
+  ],
+  "_resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+  "_shasum": "9e2d8b25bc2555c3336723750e03f099c2735bb5",
+  "_shrinkwrap": null,
+  "_spec": "escape-string-regexp@^1.0.2",
+  "_where": "/Users/rebecca/code/npm/node_modules/chalk",
   "author": {
-    "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
+    "name": "Sindre Sorhus",
     "url": "http://sindresorhus.com"
   },
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    },
-    {
-      "name": "jbnicolai",
-      "email": "jappelman@xebia.com"
-    }
-  ],
+  "bugs": {
+    "url": "https://github.com/sindresorhus/escape-string-regexp/issues"
+  },
+  "dependencies": {},
+  "description": "Escape RegExp special characters",
+  "devDependencies": {
+    "mocha": "*"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "9e2d8b25bc2555c3336723750e03f099c2735bb5",
+    "tarball": "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+  },
   "engines": {
     "node": ">=0.8.0"
   },
-  "scripts": {
-    "test": "mocha"
-  },
   "files": [
     "index.js"
   ],
+  "gitHead": "1e446e6b4449b5f1f8868cd31bf8fd25ee37fb4b",
+  "homepage": "https://github.com/sindresorhus/escape-string-regexp",
   "keywords": [
+    "characters",
+    "escape",
+    "expression",
+    "re",
     "regex",
     "regexp",
-    "re",
     "regular",
-    "expression",
-    "escape",
-    "string",
-    "str",
     "special",
-    "characters"
+    "str",
+    "string"
   ],
-  "devDependencies": {
-    "mocha": "*"
-  },
-  "gitHead": "1e446e6b4449b5f1f8868cd31bf8fd25ee37fb4b",
-  "bugs": {
-    "url": "https://github.com/sindresorhus/escape-string-regexp/issues"
-  },
-  "homepage": "https://github.com/sindresorhus/escape-string-regexp",
-  "_id": "escape-string-regexp@1.0.3",
-  "_shasum": "9e2d8b25bc2555c3336723750e03f099c2735bb5",
-  "_from": "escape-string-regexp@>=1.0.2 <2.0.0",
-  "_npmVersion": "2.1.16",
-  "_nodeVersion": "0.10.35",
-  "_npmUser": {
-    "name": "jbnicolai",
-    "email": "jappelman@xebia.com"
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "sindresorhus",
+      "email": "sindresorhus@gmail.com"
+    },
+    {
+      "name": "jbnicolai",
+      "email": "jappelman@xebia.com"
+    }
+  ],
+  "name": "escape-string-regexp",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/sindresorhus/escape-string-regexp"
   },
-  "dist": {
-    "shasum": "9e2d8b25bc2555c3336723750e03f099c2735bb5",
-    "tarball": "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+  "scripts": {
+    "test": "mocha"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
-  "readme": "ERROR: No README data found!"
+  "version": "1.0.3"
 }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/readme.md b/deps/npm/node_modules/escape-string-regexp/readme.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/readme.md
rename to deps/npm/node_modules/escape-string-regexp/readme.md
diff --git a/deps/npm/node_modules/request/node_modules/extend/.jscs.json b/deps/npm/node_modules/extend/.jscs.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/extend/.jscs.json
rename to deps/npm/node_modules/extend/.jscs.json
diff --git a/deps/npm/node_modules/request/node_modules/extend/.npmignore b/deps/npm/node_modules/extend/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/extend/.npmignore
rename to deps/npm/node_modules/extend/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/extend/.travis.yml b/deps/npm/node_modules/extend/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/extend/.travis.yml
rename to deps/npm/node_modules/extend/.travis.yml
diff --git a/deps/npm/node_modules/request/node_modules/extend/CHANGELOG.md b/deps/npm/node_modules/extend/CHANGELOG.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/extend/CHANGELOG.md
rename to deps/npm/node_modules/extend/CHANGELOG.md
diff --git a/deps/npm/node_modules/request/node_modules/extend/LICENSE b/deps/npm/node_modules/extend/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/extend/LICENSE
rename to deps/npm/node_modules/extend/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/extend/README.md b/deps/npm/node_modules/extend/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/extend/README.md
rename to deps/npm/node_modules/extend/README.md
diff --git a/deps/npm/node_modules/request/node_modules/extend/component.json b/deps/npm/node_modules/extend/component.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/extend/component.json
rename to deps/npm/node_modules/extend/component.json
diff --git a/deps/npm/node_modules/request/node_modules/extend/index.js b/deps/npm/node_modules/extend/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/extend/index.js
rename to deps/npm/node_modules/extend/index.js
diff --git a/deps/npm/node_modules/request/node_modules/extend/package.json b/deps/npm/node_modules/extend/package.json
similarity index 70%
rename from deps/npm/node_modules/request/node_modules/extend/package.json
rename to deps/npm/node_modules/extend/package.json
index c8c7cac9967924..64d1715fd7f49f 100644
--- a/deps/npm/node_modules/request/node_modules/extend/package.json
+++ b/deps/npm/node_modules/extend/package.json
@@ -1,20 +1,44 @@
 {
-  "name": "extend",
+  "_args": [
+    [
+      "extend@~3.0.0",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
+  ],
+  "_from": "extend@>=3.0.0 <3.1.0",
+  "_id": "extend@3.0.0",
+  "_inCache": true,
+  "_location": "/extend",
+  "_nodeVersion": "2.3.1",
+  "_npmUser": {
+    "email": "ljharb@gmail.com",
+    "name": "ljharb"
+  },
+  "_npmVersion": "2.11.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "extend",
+    "raw": "extend@~3.0.0",
+    "rawSpec": "~3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <3.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/request"
+  ],
+  "_resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
+  "_shasum": "5a474353b9f3353ddd8176dfd37b91c83a46f1d4",
+  "_shrinkwrap": null,
+  "_spec": "extend@~3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
   "author": {
-    "name": "Stefan Thomas",
     "email": "justmoon@members.fsf.org",
+    "name": "Stefan Thomas",
     "url": "http://www.justmoon.net"
   },
-  "version": "3.0.0",
-  "description": "Port of jQuery.extend for node.js and the browser",
-  "main": "index",
-  "scripts": {
-    "test": "npm run lint && node test/index.js && npm run coverage-quiet",
-    "coverage": "covert test/index.js",
-    "coverage-quiet": "covert test/index.js --quiet",
-    "lint": "npm run jscs && npm run eslint",
-    "jscs": "jscs *.js */*.js",
-    "eslint": "eslint *.js */*.js"
+  "bugs": {
+    "url": "https://github.com/justmoon/node-extend/issues"
   },
   "contributors": [
     {
@@ -22,41 +46,28 @@
       "url": "https://github.com/ljharb"
     }
   ],
-  "keywords": [
-    "extend",
-    "clone",
-    "merge"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/justmoon/node-extend.git"
-  },
   "dependencies": {},
+  "description": "Port of jQuery.extend for node.js and the browser",
   "devDependencies": {
-    "tape": "^4.0.0",
     "covert": "^1.1.0",
+    "eslint": "^0.24.0",
     "jscs": "^1.13.1",
-    "eslint": "^0.24.0"
-  },
-  "license": "MIT",
-  "gitHead": "148e7270cab2e9413af2cd0cab147070d755ed6d",
-  "bugs": {
-    "url": "https://github.com/justmoon/node-extend/issues"
-  },
-  "homepage": "https://github.com/justmoon/node-extend#readme",
-  "_id": "extend@3.0.0",
-  "_shasum": "5a474353b9f3353ddd8176dfd37b91c83a46f1d4",
-  "_from": "extend@>=3.0.0 <3.1.0",
-  "_npmVersion": "2.11.3",
-  "_nodeVersion": "2.3.1",
-  "_npmUser": {
-    "name": "ljharb",
-    "email": "ljharb@gmail.com"
+    "tape": "^4.0.0"
   },
+  "directories": {},
   "dist": {
     "shasum": "5a474353b9f3353ddd8176dfd37b91c83a46f1d4",
     "tarball": "http://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
   },
+  "gitHead": "148e7270cab2e9413af2cd0cab147070d755ed6d",
+  "homepage": "https://github.com/justmoon/node-extend#readme",
+  "keywords": [
+    "clone",
+    "extend",
+    "merge"
+  ],
+  "license": "MIT",
+  "main": "index",
   "maintainers": [
     {
       "name": "justmoon",
@@ -67,7 +78,19 @@
       "email": "ljharb@gmail.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "extend",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/justmoon/node-extend.git"
+  },
+  "scripts": {
+    "coverage": "covert test/index.js",
+    "coverage-quiet": "covert test/index.js --quiet",
+    "eslint": "eslint *.js */*.js",
+    "jscs": "jscs *.js */*.js",
+    "lint": "npm run jscs && npm run eslint",
+    "test": "npm run lint && node test/index.js && npm run coverage-quiet"
+  },
+  "version": "3.0.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/forever-agent/LICENSE b/deps/npm/node_modules/forever-agent/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/forever-agent/LICENSE
rename to deps/npm/node_modules/forever-agent/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/forever-agent/README.md b/deps/npm/node_modules/forever-agent/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/forever-agent/README.md
rename to deps/npm/node_modules/forever-agent/README.md
diff --git a/deps/npm/node_modules/request/node_modules/forever-agent/index.js b/deps/npm/node_modules/forever-agent/index.js
similarity index 98%
rename from deps/npm/node_modules/request/node_modules/forever-agent/index.js
rename to deps/npm/node_modules/forever-agent/index.js
index 416c7abd709233..d7276fd97391c6 100644
--- a/deps/npm/node_modules/request/node_modules/forever-agent/index.js
+++ b/deps/npm/node_modules/forever-agent/index.js
@@ -6,8 +6,8 @@ var util = require('util')
   , net = require('net')
   , tls = require('tls')
   , AgentSSL = require('https').Agent
-  
-function getConnectionName(host, port) {  
+
+function getConnectionName(host, port) {
   var name = ''
   if (typeof host === 'string') {
     name = host + ':' + port
@@ -16,7 +16,7 @@ function getConnectionName(host, port) {
     name = host.host + ':' + host.port + ':' + (host.localAddress ? (host.localAddress + ':') : ':')
   }
   return name
-}    
+}
 
 function ForeverAgent(options) {
   var self = this
@@ -34,7 +34,7 @@ function ForeverAgent(options) {
     } else if (self.sockets[name].length < self.minSockets) {
       if (!self.freeSockets[name]) self.freeSockets[name] = []
       self.freeSockets[name].push(socket)
-      
+
       // if an error happens while we don't use the socket anyway, meh, throw the socket away
       var onIdleError = function() {
         socket.destroy()
@@ -60,7 +60,7 @@ ForeverAgent.prototype.createConnection = net.createConnection
 ForeverAgent.prototype.addRequestNoreuse = Agent.prototype.addRequest
 ForeverAgent.prototype.addRequest = function(req, host, port) {
   var name = getConnectionName(host, port)
-  
+
   if (typeof host !== 'string') {
     var options = host
     port = options.port
@@ -89,7 +89,7 @@ ForeverAgent.prototype.removeSocket = function(s, name, host, port) {
     delete this.sockets[name]
     delete this.requests[name]
   }
-  
+
   if (this.freeSockets[name]) {
     var index = this.freeSockets[name].indexOf(s)
     if (index !== -1) {
diff --git a/deps/npm/node_modules/request/node_modules/forever-agent/package.json b/deps/npm/node_modules/forever-agent/package.json
similarity index 67%
rename from deps/npm/node_modules/request/node_modules/forever-agent/package.json
rename to deps/npm/node_modules/forever-agent/package.json
index ef074a51063a85..d22d4c03223118 100644
--- a/deps/npm/node_modules/request/node_modules/forever-agent/package.json
+++ b/deps/npm/node_modules/forever-agent/package.json
@@ -1,37 +1,59 @@
 {
+  "_args": [
+    [
+      "forever-agent@~0.6.0",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
+  ],
+  "_from": "forever-agent@>=0.6.0 <0.7.0",
+  "_id": "forever-agent@0.6.1",
+  "_inCache": true,
+  "_location": "/forever-agent",
+  "_npmUser": {
+    "email": "simeonvelichkov@gmail.com",
+    "name": "simov"
+  },
+  "_npmVersion": "1.4.28",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "forever-agent",
+    "raw": "forever-agent@~0.6.0",
+    "rawSpec": "~0.6.0",
+    "scope": null,
+    "spec": ">=0.6.0 <0.7.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/request"
+  ],
+  "_resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+  "_shasum": "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91",
+  "_shrinkwrap": null,
+  "_spec": "forever-agent@~0.6.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
   "author": {
-    "name": "Mikeal Rogers",
     "email": "mikeal.rogers@gmail.com",
+    "name": "Mikeal Rogers",
     "url": "http://www.futurealoof.com"
   },
-  "name": "forever-agent",
-  "description": "HTTP Agent that keeps socket connections alive between keep-alive requests. Formerly part of mikeal/request, now a standalone module.",
-  "version": "0.6.1",
-  "license": "Apache-2.0",
-  "repository": {
-    "url": "git+https://github.com/mikeal/forever-agent.git"
+  "bugs": {
+    "url": "https://github.com/mikeal/forever-agent/issues"
   },
-  "main": "index.js",
   "dependencies": {},
+  "description": "HTTP Agent that keeps socket connections alive between keep-alive requests. Formerly part of mikeal/request, now a standalone module.",
   "devDependencies": {},
-  "optionalDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91",
+    "tarball": "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+  },
   "engines": {
     "node": "*"
   },
   "gitHead": "1b3b6163f2b3c2c4122bbfa288c1325c0df9871d",
-  "bugs": {
-    "url": "https://github.com/mikeal/forever-agent/issues"
-  },
   "homepage": "https://github.com/mikeal/forever-agent",
-  "_id": "forever-agent@0.6.1",
-  "scripts": {},
-  "_shasum": "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91",
-  "_from": "forever-agent@>=0.6.0 <0.7.0",
-  "_npmVersion": "1.4.28",
-  "_npmUser": {
-    "name": "simov",
-    "email": "simeonvelichkov@gmail.com"
-  },
+  "license": "Apache-2.0",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "mikeal",
@@ -46,11 +68,11 @@
       "email": "simeonvelichkov@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91",
-    "tarball": "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+  "name": "forever-agent",
+  "optionalDependencies": {},
+  "repository": {
+    "url": "https://github.com/mikeal/forever-agent"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {},
+  "version": "0.6.1"
 }
diff --git a/deps/npm/node_modules/request/node_modules/form-data/License b/deps/npm/node_modules/form-data/License
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/form-data/License
rename to deps/npm/node_modules/form-data/License
diff --git a/deps/npm/node_modules/request/node_modules/form-data/Readme.md b/deps/npm/node_modules/form-data/Readme.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/form-data/Readme.md
rename to deps/npm/node_modules/form-data/Readme.md
diff --git a/deps/npm/node_modules/request/node_modules/form-data/lib/browser.js b/deps/npm/node_modules/form-data/lib/browser.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/form-data/lib/browser.js
rename to deps/npm/node_modules/form-data/lib/browser.js
diff --git a/deps/npm/node_modules/request/node_modules/form-data/lib/form_data.js b/deps/npm/node_modules/form-data/lib/form_data.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/form-data/lib/form_data.js
rename to deps/npm/node_modules/form-data/lib/form_data.js
diff --git a/deps/npm/node_modules/request/node_modules/form-data/package.json b/deps/npm/node_modules/form-data/package.json
similarity index 74%
rename from deps/npm/node_modules/request/node_modules/form-data/package.json
rename to deps/npm/node_modules/form-data/package.json
index 8fba29b8002baa..01f1798646a0d2 100644
--- a/deps/npm/node_modules/request/node_modules/form-data/package.json
+++ b/deps/npm/node_modules/form-data/package.json
@@ -1,33 +1,52 @@
 {
+  "_args": [
+    [
+      "form-data@1.0.0-rc3",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "form-data@1.0.0-rc3",
+  "_id": "form-data@1.0.0-rc3",
+  "_inCache": true,
+  "_location": "/form-data",
+  "_nodeVersion": "2.2.1",
+  "_npmUser": {
+    "email": "pierceydylan@gmail.com",
+    "name": "dylanpiercey"
+  },
+  "_npmVersion": "2.11.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "form-data",
+    "raw": "form-data@1.0.0-rc3",
+    "rawSpec": "1.0.0-rc3",
+    "scope": null,
+    "spec": "1.0.0-rc3",
+    "type": "version"
+  },
+  "_requiredBy": [
+    "/request"
+  ],
+  "_resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
+  "_shasum": "d35bc62e7fbc2937ae78f948aaa0d38d90607577",
+  "_shrinkwrap": null,
+  "_spec": "form-data@1.0.0-rc3",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Felix Geisendörfer",
     "email": "felix@debuggable.com",
+    "name": "Felix Geisendörfer",
     "url": "http://debuggable.com/"
   },
-  "name": "form-data",
-  "description": "A library to create readable \"multipart/form-data\" streams. Can be used to submit forms and file uploads to other web applications.",
-  "version": "1.0.0-rc3",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/form-data/form-data.git"
-  },
-  "main": "./lib/form_data",
   "browser": "./lib/browser",
-  "scripts": {
-    "test": "./test/run.js"
-  },
-  "pre-commit": [
-    "test"
-  ],
-  "engines": {
-    "node": ">= 0.10"
+  "bugs": {
+    "url": "https://github.com/form-data/form-data/issues"
   },
   "dependencies": {
     "async": "^1.4.0",
     "combined-stream": "^1.0.5",
     "mime-types": "^2.1.3"
   },
-  "license": "MIT",
+  "description": "A library to create readable \"multipart/form-data\" streams. Can be used to submit forms and file uploads to other web applications.",
   "devDependencies": {
     "fake": "^0.2.2",
     "far": "^0.0.7",
@@ -35,24 +54,19 @@
     "pre-commit": "^1.0.10",
     "request": "^2.60.0"
   },
-  "gitHead": "c174f1b7f3a78a00ec5af0360469280445e37804",
-  "bugs": {
-    "url": "https://github.com/form-data/form-data/issues"
-  },
-  "homepage": "https://github.com/form-data/form-data#readme",
-  "_id": "form-data@1.0.0-rc3",
-  "_shasum": "d35bc62e7fbc2937ae78f948aaa0d38d90607577",
-  "_from": "form-data@>=1.0.0-rc1 <1.1.0",
-  "_npmVersion": "2.11.0",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "name": "dylanpiercey",
-    "email": "pierceydylan@gmail.com"
-  },
+  "directories": {},
   "dist": {
     "shasum": "d35bc62e7fbc2937ae78f948aaa0d38d90607577",
     "tarball": "http://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz"
   },
+  "engines": {
+    "node": ">= 0.10"
+  },
+  "gitHead": "c174f1b7f3a78a00ec5af0360469280445e37804",
+  "homepage": "https://github.com/form-data/form-data#readme",
+  "installable": true,
+  "license": "MIT",
+  "main": "./lib/form_data",
   "maintainers": [
     {
       "name": "felixge",
@@ -79,7 +93,17 @@
       "email": "pierceydylan@gmail.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "form-data",
+  "optionalDependencies": {},
+  "pre-commit": [
+    "test"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/form-data/form-data.git"
+  },
+  "scripts": {
+    "test": "./test/run.js"
+  },
+  "version": "1.0.0-rc3"
 }
diff --git a/deps/npm/node_modules/fs-vacuum/package.json b/deps/npm/node_modules/fs-vacuum/package.json
index c7d9895a924d72..da4465c95ad119 100644
--- a/deps/npm/node_modules/fs-vacuum/package.json
+++ b/deps/npm/node_modules/fs-vacuum/package.json
@@ -1,43 +1,88 @@
 {
-  "name": "fs-vacuum",
-  "version": "1.2.7",
-  "description": "recursively remove empty directories -- to a point",
-  "main": "vacuum.js",
-  "scripts": {
-    "test": "tap test/*.js"
+  "_args": [
+    [
+      "fs-vacuum@~1.2.6",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "fs-vacuum@>=1.2.6 <1.3.0",
+  "_id": "fs-vacuum@1.2.7",
+  "_inCache": true,
+  "_location": "/fs-vacuum",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "email": "kat@sykosomatic.org",
+    "name": "zkat"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/fs-vacuum.git"
+  "_npmVersion": "2.14.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "fs-vacuum",
+    "raw": "fs-vacuum@~1.2.6",
+    "rawSpec": "~1.2.6",
+    "scope": null,
+    "spec": ">=1.2.6 <1.3.0",
+    "type": "range"
   },
-  "keywords": [
-    "rm",
-    "rimraf",
-    "clean"
+  "_requiredBy": [
+    "/"
   ],
+  "_resolved": "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.7.tgz",
+  "_shasum": "75e501f9d2889ba2fe9fe12f936ba5dad50ca35a",
+  "_shrinkwrap": null,
+  "_spec": "fs-vacuum@~1.2.6",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Forrest L Norvell",
-    "email": "ogd@aoaioxxysz.net"
+    "email": "ogd@aoaioxxysz.net",
+    "name": "Forrest L Norvell"
   },
-  "license": "ISC",
   "bugs": {
     "url": "https://github.com/npm/fs-vacuum/issues"
   },
-  "homepage": "https://github.com/npm/fs-vacuum",
+  "dependencies": {
+    "graceful-fs": "^4.1.2",
+    "path-is-inside": "^1.0.1",
+    "rimraf": "^2.2.8"
+  },
+  "description": "recursively remove empty directories -- to a point",
   "devDependencies": {
     "mkdirp": "^0.5.0",
     "tap": "^0.4.11",
     "tmp": "0.0.24"
   },
-  "dependencies": {
-    "graceful-fs": "^4.1.2",
-    "path-is-inside": "^1.0.1",
-    "rimraf": "^2.2.8"
+  "directories": {},
+  "dist": {
+    "shasum": "75e501f9d2889ba2fe9fe12f936ba5dad50ca35a",
+    "tarball": "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.7.tgz"
   },
-  "readme": "# fs-vacuum\n\nRemove the empty branches of a directory tree, optionally up to (but not\nincluding) a specified base directory. Optionally nukes the leaf directory.\n\n## Usage\n\n```javascript\nvar logger = require(\"npmlog\");\nvar vacuum = require(\"fs-vacuum\");\n\nvar options = {\n  base  : \"/path/to/my/tree/root\",\n  purge : true,\n  log   : logger.silly.bind(logger, \"myCleanup\")\n};\n\n/* Assuming there are no other files or directories in \"out\", \"to\", or \"my\",\n * the final path will just be \"/path/to/my/tree/root\".\n */\nvacuum(\"/path/to/my/tree/root/out/to/my/files\", function (error) {\n  if (error) console.error(\"Unable to cleanly vacuum:\", error.message);\n});\n```\n# vacuum(directory, options, callback)\n\n* `directory` {String} Leaf node to remove. **Must be a directory, symlink, or file.**\n* `options` {Object}\n  * `base` {String} No directories at or above this level of the filesystem will be removed.\n  * `purge` {Boolean} If set, nuke the whole leaf directory, including its contents.\n  * `log` {Function} A logging function that takes `npmlog`-compatible argument lists.\n* `callback` {Function} Function to call once vacuuming is complete.\n  * `error` {Error} What went wrong along the way, if anything.\n",
-  "readmeFilename": "README.md",
   "gitHead": "498a44d987ee11bc355fe1ec479d55a689fc37ef",
-  "_id": "fs-vacuum@1.2.7",
-  "_shasum": "75e501f9d2889ba2fe9fe12f936ba5dad50ca35a",
-  "_from": "fs-vacuum@1.2.7"
+  "homepage": "https://github.com/npm/fs-vacuum",
+  "installable": true,
+  "keywords": [
+    "clean",
+    "rimraf",
+    "rm"
+  ],
+  "license": "ISC",
+  "main": "vacuum.js",
+  "maintainers": [
+    {
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
+    },
+    {
+      "name": "zkat",
+      "email": "kat@sykosomatic.org"
+    }
+  ],
+  "name": "fs-vacuum",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/fs-vacuum.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.2.7"
 }
diff --git a/deps/npm/node_modules/fs-write-stream-atomic/package.json b/deps/npm/node_modules/fs-write-stream-atomic/package.json
index a94785682a9f91..46a8546ba8befd 100644
--- a/deps/npm/node_modules/fs-write-stream-atomic/package.json
+++ b/deps/npm/node_modules/fs-write-stream-atomic/package.json
@@ -1,38 +1,86 @@
 {
-  "name": "fs-write-stream-atomic",
-  "version": "1.0.4",
-  "description": "Like `fs.createWriteStream(...)`, but atomic.",
-  "main": "index.js",
-  "directories": {
-    "test": "test"
+  "_args": [
+    [
+      "fs-write-stream-atomic@~1.0.3",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "fs-write-stream-atomic@>=1.0.3 <1.1.0",
+  "_id": "fs-write-stream-atomic@1.0.4",
+  "_inCache": true,
+  "_location": "/fs-write-stream-atomic",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "email": "kat@sykosomatic.org",
+    "name": "zkat"
+  },
+  "_npmVersion": "2.14.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "fs-write-stream-atomic",
+    "raw": "fs-write-stream-atomic@~1.0.3",
+    "rawSpec": "~1.0.3",
+    "scope": null,
+    "spec": ">=1.0.3 <1.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.4.tgz",
+  "_shasum": "c1ea55889f036ceebdead7d1055edbad998fe5e9",
+  "_shrinkwrap": null,
+  "_spec": "fs-write-stream-atomic@~1.0.3",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
+    "url": "http://blog.izs.me/"
+  },
+  "bugs": {
+    "url": "https://github.com/npm/fs-write-stream-atomic/issues"
   },
   "dependencies": {
     "graceful-fs": "^4.1.2"
   },
+  "description": "Like `fs.createWriteStream(...)`, but atomic.",
   "devDependencies": {
     "tap": "^1.2.0"
   },
-  "scripts": {
-    "test": "tap test/*.js"
+  "directories": {
+    "test": "test"
   },
+  "dist": {
+    "shasum": "c1ea55889f036ceebdead7d1055edbad998fe5e9",
+    "tarball": "http://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.4.tgz"
+  },
+  "gitHead": "6ca2651b913149543c5390c6c4f7d370bdca42b5",
+  "homepage": "https://github.com/npm/fs-write-stream-atomic",
+  "installable": true,
+  "license": "ISC",
+  "main": "index.js",
+  "maintainers": [
+    {
+      "name": "iarna",
+      "email": "me@re-becca.org"
+    },
+    {
+      "name": "isaacs",
+      "email": "isaacs@npmjs.com"
+    },
+    {
+      "name": "zkat",
+      "email": "kat@sykosomatic.org"
+    }
+  ],
+  "name": "fs-write-stream-atomic",
+  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/npm/fs-write-stream-atomic.git"
   },
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
-  },
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/npm/fs-write-stream-atomic/issues"
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "homepage": "https://github.com/npm/fs-write-stream-atomic",
-  "readme": "# fs-write-stream-atomic\n\nLike `fs.createWriteStream(...)`, but atomic.\n\nWrites to a tmp file and does an atomic `fs.rename` to move it into\nplace when it's done.\n\nFirst rule of debugging: **It's always a race condition.**\n\n## USAGE\n\n```javascript\nvar fsWriteStreamAtomic = require('fs-write-stream-atomic')\n// options are optional.\nvar write = fsWriteStreamAtomic('output.txt', options)\nvar read = fs.createReadStream('input.txt')\nread.pipe(write)\n\n// When the write stream emits a 'finish' or 'close' event,\n// you can be sure that it is moved into place, and contains\n// all the bytes that were written to it, even if something else\n// was writing to `output.txt` at the same time.\n```\n\n### `fsWriteStreamAtomic(filename, [options])`\n\n* `filename` {String} The file we want to write to\n* `options` {Object}\n  * `chown` {Object} User and group to set ownership after write\n    * `uid` {Number}\n    * `gid` {Number}\n  * `encoding` {String} default = 'utf8'\n  * `mode` {Number} default = `0666`\n  * `flags` {String} default = `'w'`\n\n",
-  "readmeFilename": "README.md",
-  "gitHead": "6ca2651b913149543c5390c6c4f7d370bdca42b5",
-  "_id": "fs-write-stream-atomic@1.0.4",
-  "_shasum": "c1ea55889f036ceebdead7d1055edbad998fe5e9",
-  "_from": "fs-write-stream-atomic@1.0.4"
+  "version": "1.0.4"
 }
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/.npmignore b/deps/npm/node_modules/fstream-ignore/.npmignore
similarity index 100%
rename from deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/.npmignore
rename to deps/npm/node_modules/fstream-ignore/.npmignore
diff --git a/deps/npm/node_modules/chmodr/LICENSE b/deps/npm/node_modules/fstream-ignore/LICENSE
similarity index 100%
rename from deps/npm/node_modules/chmodr/LICENSE
rename to deps/npm/node_modules/fstream-ignore/LICENSE
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/README.md b/deps/npm/node_modules/fstream-ignore/README.md
similarity index 100%
rename from deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/README.md
rename to deps/npm/node_modules/fstream-ignore/README.md
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/example/basic.js b/deps/npm/node_modules/fstream-ignore/example/basic.js
similarity index 100%
rename from deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/example/basic.js
rename to deps/npm/node_modules/fstream-ignore/example/basic.js
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/ignore.js b/deps/npm/node_modules/fstream-ignore/ignore.js
similarity index 100%
rename from deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/ignore.js
rename to deps/npm/node_modules/fstream-ignore/ignore.js
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json b/deps/npm/node_modules/fstream-ignore/package.json
similarity index 65%
rename from deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json
rename to deps/npm/node_modules/fstream-ignore/package.json
index 1a505bd4a2afc2..05416ea99b2184 100644
--- a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json
+++ b/deps/npm/node_modules/fstream-ignore/package.json
@@ -1,56 +1,79 @@
 {
+  "_args": [
+    [
+      "fstream-ignore@^1.0.0",
+      "/Users/rebecca/code/npm/node_modules/fstream-npm"
+    ]
+  ],
+  "_from": "fstream-ignore@>=1.0.0 <2.0.0",
+  "_id": "fstream-ignore@1.0.2",
+  "_inCache": true,
+  "_location": "/fstream-ignore",
+  "_nodeVersion": "0.10.16",
+  "_npmUser": {
+    "email": "i@izs.me",
+    "name": "isaacs"
+  },
+  "_npmVersion": "2.1.11",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "fstream-ignore",
+    "raw": "fstream-ignore@^1.0.0",
+    "rawSpec": "^1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/fstream-npm"
+  ],
+  "_resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz",
+  "_shasum": "18c891db01b782a74a7bff936a0f24997741c7ab",
+  "_shrinkwrap": null,
+  "_spec": "fstream-ignore@^1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/fstream-npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "name": "fstream-ignore",
-  "description": "A thing for ignoring files based on globs",
-  "version": "1.0.2",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/fstream-ignore.git"
-  },
-  "main": "ignore.js",
-  "scripts": {
-    "test": "tap test/*.js"
+  "bugs": {
+    "url": "https://github.com/isaacs/fstream-ignore/issues"
   },
   "dependencies": {
     "fstream": "^1.0.0",
     "inherits": "2",
     "minimatch": "^2.0.1"
   },
+  "description": "A thing for ignoring files based on globs",
   "devDependencies": {
-    "tap": "",
+    "mkdirp": "",
     "rimraf": "",
-    "mkdirp": ""
+    "tap": ""
   },
-  "license": "ISC",
-  "gitHead": "20363d39660671c0de746bd07a0d07de7090d085",
-  "bugs": {
-    "url": "https://github.com/isaacs/fstream-ignore/issues"
+  "directories": {},
+  "dist": {
+    "shasum": "18c891db01b782a74a7bff936a0f24997741c7ab",
+    "tarball": "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz"
   },
+  "gitHead": "20363d39660671c0de746bd07a0d07de7090d085",
   "homepage": "https://github.com/isaacs/fstream-ignore",
-  "_id": "fstream-ignore@1.0.2",
-  "_shasum": "18c891db01b782a74a7bff936a0f24997741c7ab",
-  "_from": "fstream-ignore@>=1.0.0 <2.0.0",
-  "_npmVersion": "2.1.11",
-  "_nodeVersion": "0.10.16",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "i@izs.me"
-  },
+  "license": "ISC",
+  "main": "ignore.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "dist": {
-    "shasum": "18c891db01b782a74a7bff936a0f24997741c7ab",
-    "tarball": "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz"
+  "name": "fstream-ignore",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/fstream-ignore.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.0.2"
 }
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/.ignore b/deps/npm/node_modules/fstream-ignore/test/.ignore
similarity index 100%
rename from deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/.ignore
rename to deps/npm/node_modules/fstream-ignore/test/.ignore
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/.npmignore b/deps/npm/node_modules/fstream-ignore/test/.npmignore
similarity index 100%
rename from deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/.npmignore
rename to deps/npm/node_modules/fstream-ignore/test/.npmignore
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/00-setup.js b/deps/npm/node_modules/fstream-ignore/test/00-setup.js
similarity index 99%
rename from deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/00-setup.js
rename to deps/npm/node_modules/fstream-ignore/test/00-setup.js
index 7d7e4a1b784c23..351bcd10f15782 100644
--- a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/00-setup.js
+++ b/deps/npm/node_modules/fstream-ignore/test/00-setup.js
@@ -68,4 +68,3 @@ tap.test("create fixtures", function (t) {
   })
   t.end()
 })
-
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/basic.js b/deps/npm/node_modules/fstream-ignore/test/basic.js
similarity index 100%
rename from deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/basic.js
rename to deps/npm/node_modules/fstream-ignore/test/basic.js
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/common.js b/deps/npm/node_modules/fstream-ignore/test/common.js
similarity index 100%
rename from deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/common.js
rename to deps/npm/node_modules/fstream-ignore/test/common.js
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/ignore-most.js b/deps/npm/node_modules/fstream-ignore/test/ignore-most.js
similarity index 100%
rename from deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/ignore-most.js
rename to deps/npm/node_modules/fstream-ignore/test/ignore-most.js
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/nested-ignores.js b/deps/npm/node_modules/fstream-ignore/test/nested-ignores.js
similarity index 100%
rename from deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/nested-ignores.js
rename to deps/npm/node_modules/fstream-ignore/test/nested-ignores.js
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/read-file-order.js b/deps/npm/node_modules/fstream-ignore/test/read-file-order.js
similarity index 100%
rename from deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/read-file-order.js
rename to deps/npm/node_modules/fstream-ignore/test/read-file-order.js
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/unignore-child.js b/deps/npm/node_modules/fstream-ignore/test/unignore-child.js
similarity index 100%
rename from deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/unignore-child.js
rename to deps/npm/node_modules/fstream-ignore/test/unignore-child.js
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/zz-cleanup.js b/deps/npm/node_modules/fstream-ignore/test/zz-cleanup.js
similarity index 100%
rename from deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/zz-cleanup.js
rename to deps/npm/node_modules/fstream-ignore/test/zz-cleanup.js
diff --git a/deps/npm/node_modules/fstream-npm/package.json b/deps/npm/node_modules/fstream-npm/package.json
index f3ab7b8faf1adc..f4deee360d7c7c 100644
--- a/deps/npm/node_modules/fstream-npm/package.json
+++ b/deps/npm/node_modules/fstream-npm/package.json
@@ -1,24 +1,50 @@
 {
+  "_args": [
+    [
+      "fstream-npm@~1.0.5",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "fstream-npm@>=1.0.5 <1.1.0",
+  "_id": "fstream-npm@1.0.5",
+  "_inCache": true,
+  "_location": "/fstream-npm",
+  "_nodeVersion": "2.5.0",
+  "_npmUser": {
+    "email": "ogd@aoaioxxysz.net",
+    "name": "othiym23"
+  },
+  "_npmVersion": "2.14.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "fstream-npm",
+    "raw": "fstream-npm@~1.0.5",
+    "rawSpec": "~1.0.5",
+    "scope": null,
+    "spec": ">=1.0.5 <1.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.5.tgz",
+  "_shasum": "4c1d1cbc6da95c745f8d2c52077a1d2e7b337206",
+  "_shrinkwrap": null,
+  "_spec": "fstream-npm@~1.0.5",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "name": "fstream-npm",
-  "description": "fstream class for creating npm packages",
-  "version": "1.0.5",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/fstream-npm.git"
-  },
-  "scripts": {
-    "test": "standard && tap test/*.js"
+  "bugs": {
+    "url": "https://github.com/isaacs/fstream-npm/issues"
   },
-  "main": "./fstream-npm.js",
   "dependencies": {
     "fstream-ignore": "^1.0.0",
     "inherits": "2"
   },
+  "description": "fstream class for creating npm packages",
   "devDependencies": {
     "graceful-fs": "^4.1.2",
     "mkdirp": "^0.5.1",
@@ -26,15 +52,38 @@
     "standard": "^4.3.1",
     "tap": "^1.3.2"
   },
-  "license": "ISC",
-  "readme": "# fstream-npm\n\nThis is an fstream DirReader class that will read a directory and filter\nthings according to the semantics of what goes in an npm package.\n\nFor example:\n\n```javascript\n// This will print out all the files that would be included\n// by 'npm publish' or 'npm install' of this directory.\n\nvar FN = require(\"fstream-npm\")\nFN({ path: \"./\" })\n  .on(\"child\", function (e) {\n    console.error(e.path.substr(e.root.path.length + 1))\n  })\n```\n\n",
-  "readmeFilename": "README.md",
-  "gitHead": "f6ec06b9c45d7330213a5b446fff424b5a74e197",
-  "bugs": {
-    "url": "https://github.com/isaacs/fstream-npm/issues"
+  "directories": {},
+  "dist": {
+    "shasum": "4c1d1cbc6da95c745f8d2c52077a1d2e7b337206",
+    "tarball": "http://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.5.tgz"
   },
+  "gitHead": "f6ec06b9c45d7330213a5b446fff424b5a74e197",
   "homepage": "https://github.com/isaacs/fstream-npm#readme",
-  "_id": "fstream-npm@1.0.5",
-  "_shasum": "4c1d1cbc6da95c745f8d2c52077a1d2e7b337206",
-  "_from": "fstream-npm@>=1.0.5 <1.1.0"
+  "installable": true,
+  "license": "ISC",
+  "main": "./fstream-npm.js",
+  "maintainers": [
+    {
+      "name": "isaacs",
+      "email": "isaacs@npmjs.com"
+    },
+    {
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
+    },
+    {
+      "name": "iarna",
+      "email": "me@re-becca.org"
+    }
+  ],
+  "name": "fstream-npm",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/fstream-npm.git"
+  },
+  "scripts": {
+    "test": "standard && tap test/*.js"
+  },
+  "version": "1.0.5"
 }
diff --git a/deps/npm/node_modules/fstream/package.json b/deps/npm/node_modules/fstream/package.json
index 8c008195442823..6eeeffe499607b 100644
--- a/deps/npm/node_modules/fstream/package.json
+++ b/deps/npm/node_modules/fstream/package.json
@@ -1,19 +1,48 @@
 {
+  "_args": [
+    [
+      "fstream@~1.0.7",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "fstream@>=1.0.7 <1.1.0",
+  "_id": "fstream@1.0.8",
+  "_inCache": true,
+  "_location": "/fstream",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "email": "kat@sykosomatic.org",
+    "name": "zkat"
+  },
+  "_npmVersion": "2.14.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "fstream",
+    "raw": "fstream@~1.0.7",
+    "rawSpec": "~1.0.7",
+    "scope": null,
+    "spec": ">=1.0.7 <1.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/",
+    "/fstream-ignore",
+    "/node-gyp",
+    "/node-gyp/tar",
+    "/tar"
+  ],
+  "_resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz",
+  "_shasum": "7e8d7a73abb3647ef36e4b8a15ca801dba03d038",
+  "_shrinkwrap": null,
+  "_spec": "fstream@~1.0.7",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "name": "fstream",
-  "description": "Advanced file system stream things",
-  "version": "1.0.8",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/fstream.git"
-  },
-  "main": "fstream.js",
-  "engines": {
-    "node": ">=0.6"
+  "bugs": {
+    "url": "https://github.com/isaacs/fstream/issues"
   },
   "dependencies": {
     "graceful-fs": "^4.1.2",
@@ -21,22 +50,50 @@
     "mkdirp": ">=0.5 0",
     "rimraf": "2"
   },
+  "description": "Advanced file system stream things",
   "devDependencies": {
     "standard": "^4.0.0",
     "tap": "^1.2.0"
   },
-  "scripts": {
-    "test": "standard && tap examples/*.js"
+  "directories": {},
+  "dist": {
+    "shasum": "7e8d7a73abb3647ef36e4b8a15ca801dba03d038",
+    "tarball": "http://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz"
   },
-  "license": "ISC",
-  "readme": "Like FS streams, but with stat on them, and supporting directories and\nsymbolic links, as well as normal files.  Also, you can use this to set\nthe stats on a file, even if you don't change its contents, or to create\na symlink, etc.\n\nSo, for example, you can \"write\" a directory, and it'll call `mkdir`.  You\ncan specify a uid and gid, and it'll call `chown`.  You can specify a\n`mtime` and `atime`, and it'll call `utimes`.  You can call it a symlink\nand provide a `linkpath` and it'll call `symlink`.\n\nNote that it won't automatically resolve symbolic links.  So, if you\ncall `fstream.Reader('/some/symlink')` then you'll get an object\nthat stats and then ends immediately (since it has no data).  To follow\nsymbolic links, do this: `fstream.Reader({path:'/some/symlink', follow:\ntrue })`.\n\nThere are various checks to make sure that the bytes emitted are the\nsame as the intended size, if the size is set.\n\n## Examples\n\n```javascript\nfstream\n  .Writer({ path: \"path/to/file\"\n          , mode: 0755\n          , size: 6\n          })\n  .write(\"hello\\n\")\n  .end()\n```\n\nThis will create the directories if they're missing, and then write\n`hello\\n` into the file, chmod it to 0755, and assert that 6 bytes have\nbeen written when it's done.\n\n```javascript\nfstream\n  .Writer({ path: \"path/to/file\"\n          , mode: 0755\n          , size: 6\n          , flags: \"a\"\n          })\n  .write(\"hello\\n\")\n  .end()\n```\n\nYou can pass flags in, if you want to append to a file.\n\n```javascript\nfstream\n  .Writer({ path: \"path/to/symlink\"\n          , linkpath: \"./file\"\n          , SymbolicLink: true\n          , mode: \"0755\" // octal strings supported\n          })\n  .end()\n```\n\nIf isSymbolicLink is a function, it'll be called, and if it returns\ntrue, then it'll treat it as a symlink.  If it's not a function, then\nany truish value will make a symlink, or you can set `type:\n'SymbolicLink'`, which does the same thing.\n\nNote that the linkpath is relative to the symbolic link location, not\nthe parent dir or cwd.\n\n```javascript\nfstream\n  .Reader(\"path/to/dir\")\n  .pipe(fstream.Writer(\"path/to/other/dir\"))\n```\n\nThis will do like `cp -Rp path/to/dir path/to/other/dir`.  If the other\ndir exists and isn't a directory, then it'll emit an error.  It'll also\nset the uid, gid, mode, etc. to be identical.  In this way, it's more\nlike `rsync -a` than simply a copy.\n",
-  "readmeFilename": "README.md",
-  "gitHead": "d9f81146c50e687f1df04c1a0e7e4c173eb3dae2",
-  "bugs": {
-    "url": "https://github.com/isaacs/fstream/issues"
+  "engines": {
+    "node": ">=0.6"
   },
+  "gitHead": "d9f81146c50e687f1df04c1a0e7e4c173eb3dae2",
   "homepage": "https://github.com/isaacs/fstream#readme",
-  "_id": "fstream@1.0.8",
-  "_shasum": "7e8d7a73abb3647ef36e4b8a15ca801dba03d038",
-  "_from": "fstream@1.0.8"
+  "installable": true,
+  "license": "ISC",
+  "main": "fstream.js",
+  "maintainers": [
+    {
+      "name": "iarna",
+      "email": "me@re-becca.org"
+    },
+    {
+      "name": "isaacs",
+      "email": "isaacs@npmjs.com"
+    },
+    {
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
+    },
+    {
+      "name": "zkat",
+      "email": "kat@sykosomatic.org"
+    }
+  ],
+  "name": "fstream",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/fstream.git"
+  },
+  "scripts": {
+    "test": "standard && tap examples/*.js"
+  },
+  "version": "1.0.8"
 }
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/.npmignore b/deps/npm/node_modules/gauge/.npmignore
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/.npmignore
rename to deps/npm/node_modules/gauge/.npmignore
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/LICENSE b/deps/npm/node_modules/gauge/LICENSE
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/LICENSE
rename to deps/npm/node_modules/gauge/LICENSE
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/README.md b/deps/npm/node_modules/gauge/README.md
similarity index 93%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/README.md
rename to deps/npm/node_modules/gauge/README.md
index fb9eb0a7d1e125..ca0a8cd773d6d2 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/README.md
+++ b/deps/npm/node_modules/gauge/README.md
@@ -30,6 +30,11 @@ gauge.hide()
 Constructs a new gauge. Gauges are drawn on a single line, and are not drawn
 if the current terminal isn't a tty.
 
+If you resize your terminal in a way that can be detected then the gauge
+will be drawn at the new size. As a general rule, growing your terminal will
+be clean, but shrinking your terminal will result in cruft as we don't have
+enough information to know where what we wrote previously is now located.
+
 The **options** object can have the following properties, all of which are
 optional:
 
@@ -117,7 +122,7 @@ will be turned into the gauge line.  The default template is:
 
 ```javascript
 [
-    {type: "name", separated: true, maxLength: 25, minWidth: 25, align: "left"},
+    {type: "name", separated: true, maxLength: 25, minLength: 25, align: "left"},
     {type: "spinner", separated: true},
     {type: "startgroup"},
     {type: "completionbar"},
@@ -131,7 +136,7 @@ be be included verbatum in the output.
 If the template element is an object, it can have the following keys:
 
 * *type* can be:
-  * `name` – The most recent name passed to `show`; if this is in response to a 
+  * `name` – The most recent name passed to `show`; if this is in response to a
     `pulse` then the name passed to `pulse` will be appended along with the
     subsection property from the theme.
   * `spinner` – If you've ever called `pulse` this will be one of the characters
@@ -148,7 +153,7 @@ If the template element is an object, it can have the following keys:
   will be padded according to the *align* value.
 * *align* – (Default: left) Possible values "left", "right" and "center". Works
   as you'd expect from word processors.
-* *length* – Provides a single value for both *minLength* and *maxLength*. If both 
+* *length* – Provides a single value for both *minLength* and *maxLength*. If both
   *length* and *minLength or *maxLength* are specifed then the latter take precedence.
 
 ### Tracking Completion
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/example.png b/deps/npm/node_modules/gauge/example.png
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/example.png
rename to deps/npm/node_modules/gauge/example.png
diff --git a/deps/npm/node_modules/gauge/package.json b/deps/npm/node_modules/gauge/package.json
new file mode 100644
index 00000000000000..a7777aa17e77c0
--- /dev/null
+++ b/deps/npm/node_modules/gauge/package.json
@@ -0,0 +1,82 @@
+{
+  "_args": [
+    [
+      "gauge",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "gauge@*",
+  "_id": "gauge@1.2.2",
+  "_inCache": true,
+  "_location": "/gauge",
+  "_nodeVersion": "0.10.38",
+  "_npmUser": {
+    "email": "me@re-becca.org",
+    "name": "iarna"
+  },
+  "_npmVersion": "3.1.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "gauge",
+    "raw": "gauge",
+    "rawSpec": "",
+    "scope": null,
+    "spec": "*",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/npmlog"
+  ],
+  "_shasum": "05b6730a19a8fcad3c340a142f0945222a3f815b",
+  "_shrinkwrap": null,
+  "_spec": "gauge",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "me@re-becca.org",
+    "name": "Rebecca Turner"
+  },
+  "bugs": {
+    "url": "https://github.com/iarna/gauge/issues"
+  },
+  "dependencies": {
+    "ansi": "^0.3.0",
+    "has-unicode": "^1.0.0",
+    "lodash.pad": "^3.0.0",
+    "lodash.padleft": "^3.0.0",
+    "lodash.padright": "^3.0.0"
+  },
+  "description": "A terminal based horizontal guage",
+  "devDependencies": {
+    "tap": "^0.4.13"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "05b6730a19a8fcad3c340a142f0945222a3f815b",
+    "tarball": "http://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz"
+  },
+  "gitHead": "9f7eeeeed3b74a70f30b721d570435f6ffbc0168",
+  "homepage": "https://github.com/iarna/gauge",
+  "keywords": [
+    "gauge",
+    "progress",
+    "progressbar"
+  ],
+  "license": "ISC",
+  "main": "progress-bar.js",
+  "maintainers": [
+    {
+      "name": "iarna",
+      "email": "me@re-becca.org"
+    }
+  ],
+  "name": "gauge",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/iarna/gauge.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.2.2"
+}
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/progress-bar.js b/deps/npm/node_modules/gauge/progress-bar.js
similarity index 90%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/progress-bar.js
rename to deps/npm/node_modules/gauge/progress-bar.js
index 39dbf2ac43dd9a..16bdadc5103eee 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/progress-bar.js
+++ b/deps/npm/node_modules/gauge/progress-bar.js
@@ -11,8 +11,10 @@ function isTTY() {
   return process.stderr.isTTY
 }
 function getWritableTTYColumns() {
-  // One less than the actual as writing to the final column wraps the line
-  return process.stderr.columns - 1
+  // Writing to the final column wraps the line
+  // We have to use stdout here, because Node's magic SIGWINCH handler only
+  // updates process.stdout, not process.stderr
+  return process.stdout.columns - 1
 }
 
 var ProgressBar = module.exports = function (options, cursor) {
@@ -39,6 +41,13 @@ var ProgressBar = module.exports = function (options, cursor) {
   this.lastCompleted = 0
   this.spun = 0
   this.last = new Date(0)
+
+  var self = this
+  this._handleSizeChange = function () {
+    if (!self.showing) return
+    self.hide()
+    self.show()
+  }
 }
 ProgressBar.prototype = {}
 
@@ -68,6 +77,14 @@ ProgressBar.prototype.setTemplate = function(template) {
   this.template = template
 }
 
+ProgressBar.prototype._enableResizeEvents = function() {
+  process.stdout.on('resize', this._handleSizeChange)
+}
+
+ProgressBar.prototype._disableResizeEvents = function() {
+  process.stdout.removeListener('resize', this._handleSizeChange)
+}
+
 ProgressBar.prototype.disable = function() {
   this.hide()
   this.disabled = true
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/test/progress-bar.js b/deps/npm/node_modules/gauge/test/progress-bar.js
similarity index 87%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/test/progress-bar.js
rename to deps/npm/node_modules/gauge/test/progress-bar.js
index 8e2a5ad6438fdd..39939269f5b630 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/test/progress-bar.js
+++ b/deps/npm/node_modules/gauge/test/progress-bar.js
@@ -70,7 +70,7 @@ test("hide", function (t) {
 
 test("renderTemplate", function (t) {
   t.plan(16)
-  process.stderr.columns = 11
+  process.stdout.columns = 11
   var result = bar.renderTemplate(ProgressBar.ascii,[{type: "name"}],{name: "NAME"})
   t.is(result, "NAME", "name substitution")
   var result = bar.renderTemplate(ProgressBar.ascii,[{type: "completionbar"}],{completed: 0})
@@ -108,7 +108,7 @@ test("renderTemplate", function (t) {
 test("show & pulse", function (t) {
   t.plan(23)
 
-  process.stderr.columns = 16
+  process.stdout.columns = 16
   cursor = []
   process.stderr.isTTY = false
   bar.template[0].length = 6
@@ -146,3 +146,31 @@ test("show & pulse", function (t) {
       [ 'write', 'S -> P | |----|\n' ],
       [ 'show' ] ])
 })
+
+test("window resizing", function (t) {
+  t.plan(16)
+  process.stderr.isTTY = true
+  process.stdout.columns = 32
+  bar.show("NAME", 0.1)
+  cursor = []
+  bar.last = new Date(0)
+  bar.pulse()
+  isOutput(t, "32 columns",
+    [ [ 'up', 1 ],
+      [ 'hide' ],
+      [ 'horizontalAbsolute', 0 ],
+      [ 'write', 'NAME   / |##------------------|\n' ],
+      [ 'show' ] ])
+
+  process.stdout.columns = 16
+  bar.show("NAME", 0.5)
+  cursor = []
+  bar.last = new Date(0)
+  bar.pulse()
+  isOutput(t, "16 columns",
+    [ [ 'up', 1 ],
+      [ 'hide' ],
+      [ 'horizontalAbsolute', 0 ],
+      [ 'write', 'NAME   - |##--|\n' ],
+      [ 'show' ] ]);
+});
diff --git a/deps/npm/node_modules/github-url-from-git/.npmignore b/deps/npm/node_modules/generate-function/.npmignore
similarity index 100%
rename from deps/npm/node_modules/github-url-from-git/.npmignore
rename to deps/npm/node_modules/generate-function/.npmignore
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/.travis.yml b/deps/npm/node_modules/generate-function/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/minimatch/node_modules/brace-expansion/.travis.yml
rename to deps/npm/node_modules/generate-function/.travis.yml
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/README.md b/deps/npm/node_modules/generate-function/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/README.md
rename to deps/npm/node_modules/generate-function/README.md
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/example.js b/deps/npm/node_modules/generate-function/example.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/example.js
rename to deps/npm/node_modules/generate-function/example.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/index.js b/deps/npm/node_modules/generate-function/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/index.js
rename to deps/npm/node_modules/generate-function/index.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/package.json b/deps/npm/node_modules/generate-function/package.json
similarity index 61%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/package.json
rename to deps/npm/node_modules/generate-function/package.json
index db1ac2aa364f5d..5980efe9995320 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/package.json
+++ b/deps/npm/node_modules/generate-function/package.json
@@ -1,53 +1,77 @@
 {
-  "name": "generate-function",
-  "version": "2.0.0",
-  "description": "Module that helps you write generated functions in Node",
-  "main": "index.js",
-  "scripts": {
-    "test": "tape test.js"
+  "_args": [
+    [
+      "generate-function@^2.0.0",
+      "/Users/rebecca/code/npm/node_modules/is-my-json-valid"
+    ]
+  ],
+  "_from": "generate-function@>=2.0.0 <3.0.0",
+  "_id": "generate-function@2.0.0",
+  "_inCache": true,
+  "_location": "/generate-function",
+  "_npmUser": {
+    "email": "mathiasbuus@gmail.com",
+    "name": "mafintosh"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mafintosh/generate-function.git"
+  "_npmVersion": "1.4.23",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "generate-function",
+    "raw": "generate-function@^2.0.0",
+    "rawSpec": "^2.0.0",
+    "scope": null,
+    "spec": ">=2.0.0 <3.0.0",
+    "type": "range"
   },
-  "keywords": [
-    "generate",
-    "code",
-    "generation",
-    "function",
-    "performance"
+  "_requiredBy": [
+    "/is-my-json-valid"
   ],
+  "_resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+  "_shasum": "6858fe7c0969b7d4e9093337647ac79f60dfbe74",
+  "_shrinkwrap": null,
+  "_spec": "generate-function@^2.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/is-my-json-valid",
   "author": {
     "name": "Mathias Buus"
   },
-  "license": "MIT",
   "bugs": {
     "url": "https://github.com/mafintosh/generate-function/issues"
   },
-  "homepage": "https://github.com/mafintosh/generate-function",
+  "dependencies": {},
+  "description": "Module that helps you write generated functions in Node",
   "devDependencies": {
     "tape": "^2.13.4"
   },
-  "gitHead": "3d5fc8de5859be95f58e3af9bfb5f663edd95149",
-  "_id": "generate-function@2.0.0",
-  "_shasum": "6858fe7c0969b7d4e9093337647ac79f60dfbe74",
-  "_from": "generate-function@>=2.0.0 <3.0.0",
-  "_npmVersion": "1.4.23",
-  "_npmUser": {
-    "name": "mafintosh",
-    "email": "mathiasbuus@gmail.com"
+  "directories": {},
+  "dist": {
+    "shasum": "6858fe7c0969b7d4e9093337647ac79f60dfbe74",
+    "tarball": "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
   },
+  "gitHead": "3d5fc8de5859be95f58e3af9bfb5f663edd95149",
+  "homepage": "https://github.com/mafintosh/generate-function",
+  "keywords": [
+    "code",
+    "function",
+    "generate",
+    "generation",
+    "performance"
+  ],
+  "license": "MIT",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "mafintosh",
       "email": "mathiasbuus@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "6858fe7c0969b7d4e9093337647ac79f60dfbe74",
-    "tarball": "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
+  "name": "generate-function",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mafintosh/generate-function"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "tape test.js"
+  },
+  "version": "2.0.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/test.js b/deps/npm/node_modules/generate-function/test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/test.js
rename to deps/npm/node_modules/generate-function/test.js
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/.npmignore b/deps/npm/node_modules/generate-object-property/.npmignore
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/.npmignore
rename to deps/npm/node_modules/generate-object-property/.npmignore
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.travis.yml b/deps/npm/node_modules/generate-object-property/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.travis.yml
rename to deps/npm/node_modules/generate-object-property/.travis.yml
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/LICENSE b/deps/npm/node_modules/generate-object-property/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/LICENSE
rename to deps/npm/node_modules/generate-object-property/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/README.md b/deps/npm/node_modules/generate-object-property/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/README.md
rename to deps/npm/node_modules/generate-object-property/README.md
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/index.js b/deps/npm/node_modules/generate-object-property/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/index.js
rename to deps/npm/node_modules/generate-object-property/index.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/package.json b/deps/npm/node_modules/generate-object-property/package.json
similarity index 61%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/package.json
rename to deps/npm/node_modules/generate-object-property/package.json
index 8bc73da759fde0..ac179d2e368314 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/package.json
+++ b/deps/npm/node_modules/generate-object-property/package.json
@@ -1,51 +1,74 @@
 {
-  "name": "generate-object-property",
-  "version": "1.2.0",
-  "description": "Generate safe JS code that can used to reference a object property",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mafintosh/generate-object-property.git"
+  "_args": [
+    [
+      "generate-object-property@^1.1.0",
+      "/Users/rebecca/code/npm/node_modules/is-my-json-valid"
+    ]
+  ],
+  "_from": "generate-object-property@>=1.1.0 <2.0.0",
+  "_id": "generate-object-property@1.2.0",
+  "_inCache": true,
+  "_location": "/generate-object-property",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "email": "mathiasbuus@gmail.com",
+    "name": "mafintosh"
   },
-  "devDependencies": {
-    "tape": "^2.13.0"
+  "_npmVersion": "2.9.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "generate-object-property",
+    "raw": "generate-object-property@^1.1.0",
+    "rawSpec": "^1.1.0",
+    "scope": null,
+    "spec": ">=1.1.0 <2.0.0",
+    "type": "range"
   },
-  "scripts": {
-    "test": "tape test.js"
+  "_requiredBy": [
+    "/is-my-json-valid"
+  ],
+  "_resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+  "_shasum": "9c0e1c40308ce804f4783618b937fa88f99d50d0",
+  "_shrinkwrap": null,
+  "_spec": "generate-object-property@^1.1.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/is-my-json-valid",
+  "author": {
+    "name": "Mathias Buus",
+    "url": "@mafintosh"
+  },
+  "bugs": {
+    "url": "https://github.com/mafintosh/generate-object-property/issues"
   },
   "dependencies": {
     "is-property": "^1.0.0"
   },
-  "bugs": {
-    "url": "https://github.com/mafintosh/generate-object-property/issues"
+  "description": "Generate safe JS code that can used to reference a object property",
+  "devDependencies": {
+    "tape": "^2.13.0"
   },
-  "homepage": "https://github.com/mafintosh/generate-object-property",
-  "main": "index.js",
-  "author": {
-    "name": "Mathias Buus",
-    "url": "@mafintosh"
+  "directories": {},
+  "dist": {
+    "shasum": "9c0e1c40308ce804f4783618b937fa88f99d50d0",
+    "tarball": "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
   },
-  "license": "MIT",
   "gitHead": "0dd7d411018de54b2eae63b424c15b3e50bd678c",
-  "_id": "generate-object-property@1.2.0",
-  "_shasum": "9c0e1c40308ce804f4783618b937fa88f99d50d0",
-  "_from": "generate-object-property@>=1.1.0 <2.0.0",
-  "_npmVersion": "2.9.0",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "name": "mafintosh",
-    "email": "mathiasbuus@gmail.com"
-  },
+  "homepage": "https://github.com/mafintosh/generate-object-property",
+  "license": "MIT",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "mafintosh",
       "email": "mathiasbuus@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "9c0e1c40308ce804f4783618b937fa88f99d50d0",
-    "tarball": "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
+  "name": "generate-object-property",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mafintosh/generate-object-property"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "tape test.js"
+  },
+  "version": "1.2.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/test.js b/deps/npm/node_modules/generate-object-property/test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/test.js
rename to deps/npm/node_modules/generate-object-property/test.js
diff --git a/deps/npm/node_modules/github-url-from-git/Makefile b/deps/npm/node_modules/github-url-from-git/Makefile
deleted file mode 100644
index 37f330e81b98c1..00000000000000
--- a/deps/npm/node_modules/github-url-from-git/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-test:
-	@./node_modules/.bin/mocha test.js --reporter spec --require should
-
-.PHONY: test
diff --git a/deps/npm/node_modules/github-url-from-git/Readme.md b/deps/npm/node_modules/github-url-from-git/Readme.md
deleted file mode 100644
index 9dccaa8db696fa..00000000000000
--- a/deps/npm/node_modules/github-url-from-git/Readme.md
+++ /dev/null
@@ -1,92 +0,0 @@
-
-# github-url-from-git
-
-```js
-describe('parse(url)', function(){
-  it('should support git://*', function(){
-    var url = 'git://github.com/jamesor/mongoose-versioner';
-    parse(url).should.equal('https://github.com/jamesor/mongoose-versioner');
-  })
-
-  it('should support git://*.git', function(){
-    var url = 'git://github.com/treygriffith/cellar.git';
-    parse(url).should.equal('https://github.com/treygriffith/cellar');
-  })
-
-  it('should support https://*', function(){
-    var url = 'https://github.com/Empeeric/i18n-node';
-    parse(url).should.equal('https://github.com/Empeeric/i18n-node');
-  })
-
-  it('should support https://*.git', function(){
-    var url = 'https://jpillora@github.com/banchee/tranquil.git';
-    parse(url).should.equal('https://github.com/banchee/tranquil');
-  })
-
-  it('should return undefined on failure', function(){
-    var url = 'git://github.com/justgord/.git';
-    assert(null == parse(url));
-  })
-
-  it('should parse git@github.com:bcoe/thumbd.git', function() {
-    var url = 'git@github.com:bcoe/thumbd.git';
-    parse(url).should.eql('https://github.com/bcoe/thumbd');
-  })
-
-  it('should parse git@github.com:bcoe/thumbd.git#2.7.0', function() {
-    var url = 'git@github.com:bcoe/thumbd.git#2.7.0';
-    parse(url).should.eql('https://github.com/bcoe/thumbd');
-  })
-
-  it('should parse git+https://github.com/bcoe/thumbd.git', function() {
-    var url = 'git+https://github.com/bcoe/thumbd.git';
-    parse(url).should.eql('https://github.com/bcoe/thumbd');
-  })
-
-  it('should parse git+ssh://github.com/bcoe/thumbd.git', function() {
-    var url = 'git+ssh://github.com/bcoe/thumbd.git';
-    parse(url).should.eql('https://github.com/bcoe/thumbd');
-  })
-
-  it('should parse https://EastCloud@github.com/EastCloud/node-websockets.git', function() {
-    var url = 'https://EastCloud@github.com/EastCloud/node-websockets.git';
-    parse(url).should.eql('https://github.com/EastCloud/node-websockets');
-  })
-
-  // gist urls.
-
-  it('should parse git@gist urls', function() {
-    var url = 'git@gist.github.com:3135914.git';
-    parse(url).should.equal('https://gist.github.com/3135914')
-  })
-
-  it('should parse https://gist urls', function() {
-    var url = 'https://gist.github.com/3135914.git';
-    parse(url).should.equal('https://gist.github.com/3135914')
-  })
-
-  // Handle arbitrary GitHub Enterprise domains.
-
-  it('should parse parse extra GHE urls provided', function() {
-    var url = 'git://github.example.com/treygriffith/cellar.git';
-    parse(
-      url, {extraBaseUrls: ['github.example.com']}
-    ).should.equal('https://github.example.com/treygriffith/cellar');
-  });
-
-  it('should parse GHE urls with multiple subdomains', function() {
-    var url = 'git://github.internal.example.com/treygriffith/cellar.git';
-    parse(
-      url, {extraBaseUrls: ['github.internal.example.com']}
-    ).should.equal('https://github.internal.example.com/treygriffith/cellar');
-  });
-})
-
-describe('re', function() {
-  it('should expose GitHub url parsing regex', function() {
-    parse.re.source.should.equal(
-      /^(?:https?:\/\/|git:\/\/)?(?:[^@]+@)?(gist.github.com|github.com)[:\/]([^\/]+\/[^\/]+?|[0-9]+)$/.source
-    )
-  });
-})
-```
diff --git a/deps/npm/node_modules/github-url-from-git/index.js b/deps/npm/node_modules/github-url-from-git/index.js
deleted file mode 100644
index 44872e8c10c2f8..00000000000000
--- a/deps/npm/node_modules/github-url-from-git/index.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// convert git:// form url to github URL, e.g.,
-// git://github.com/bcoe/foo.git
-// https://github.com/bcoe/foo.
-function githubUrlFromGit(url, opts){
-  try {
-    var m = re(opts).exec(url.replace(/\.git(#.*)?$/, ''));
-    var host = m[1];
-    var path = m[2];
-    return 'https://' + host + '/' + path;
-  } catch (err) {
-    // ignore
-  }
-};
-
-// generate the git:// parsing regex
-// with options, e.g., the ability
-// to specify multiple GHE domains.
-function re(opts) {
-  opts = opts || {};
-  // whitelist of URLs that should be treated as GitHub repos.
-  var baseUrls = ['gist.github.com', 'github.com'].concat(opts.extraBaseUrls || []);
-  // build regex from whitelist.
-  return new RegExp(
-    /^(?:https?:\/\/|git:\/\/|git\+ssh:\/\/|git\+https:\/\/)?(?:[^@]+@)?/.source +
-    '(' + baseUrls.join('|') + ')' +
-    /[:\/]([^\/]+\/[^\/]+?|[0-9]+)$/.source
-  );
-}
-
-githubUrlFromGit.re = re();
-
-module.exports = githubUrlFromGit;
diff --git a/deps/npm/node_modules/github-url-from-git/package.json b/deps/npm/node_modules/github-url-from-git/package.json
deleted file mode 100644
index 229af333ca4146..00000000000000
--- a/deps/npm/node_modules/github-url-from-git/package.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "name": "github-url-from-git",
-  "version": "1.4.0",
-  "description": "Parse a github git url and return the github repo url",
-  "main": "index.js",
-  "scripts": {
-    "test": "mocha test.js --reporter spec --require should"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/visionmedia/node-github-url-from-git.git"
-  },
-  "keywords": [
-    "github",
-    "git",
-    "url",
-    "parser"
-  ],
-  "author": {
-    "name": "TJ Holowaychuk"
-  },
-  "license": "MIT",
-  "devDependencies": {
-    "better-assert": "~1.0.0",
-    "mocha": "~1.9.0",
-    "should": "~1.2.2"
-  },
-  "gitHead": "154df00b0b590c29be5d2a5822e7b2e160b75345",
-  "bugs": {
-    "url": "https://github.com/visionmedia/node-github-url-from-git/issues"
-  },
-  "homepage": "https://github.com/visionmedia/node-github-url-from-git",
-  "_id": "github-url-from-git@1.4.0",
-  "_shasum": "285e6b520819001bde128674704379e4ff03e0de",
-  "_from": "github-url-from-git@>=1.4.0-0 <2.0.0-0",
-  "_npmVersion": "2.0.0-alpha.7",
-  "_npmUser": {
-    "name": "bcoe",
-    "email": "bencoe@gmail.com"
-  },
-  "maintainers": [
-    {
-      "name": "tjholowaychuk",
-      "email": "tj@vision-media.ca"
-    },
-    {
-      "name": "bcoe",
-      "email": "bencoe@gmail.com"
-    }
-  ],
-  "dist": {
-    "shasum": "285e6b520819001bde128674704379e4ff03e0de",
-    "tarball": "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz"
-}
diff --git a/deps/npm/node_modules/github-url-from-git/test.js b/deps/npm/node_modules/github-url-from-git/test.js
deleted file mode 100644
index 93aa38bb1f9f9f..00000000000000
--- a/deps/npm/node_modules/github-url-from-git/test.js
+++ /dev/null
@@ -1,90 +0,0 @@
-var parse = require('./');
-var assert = require('better-assert');
-
-describe('parse(url)', function(){
-  it('should support git://*', function(){
-    var url = 'git://github.com/jamesor/mongoose-versioner';
-    parse(url).should.equal('https://github.com/jamesor/mongoose-versioner');
-  })
-
-  it('should support git://*.git', function(){
-    var url = 'git://github.com/treygriffith/cellar.git';
-    parse(url).should.equal('https://github.com/treygriffith/cellar');
-  })
-
-  it('should support https://*', function(){
-    var url = 'https://github.com/Empeeric/i18n-node';
-    parse(url).should.equal('https://github.com/Empeeric/i18n-node');
-  })
-
-  it('should support https://*.git', function(){
-    var url = 'https://jpillora@github.com/banchee/tranquil.git';
-    parse(url).should.equal('https://github.com/banchee/tranquil');
-  })
-
-  it('should return undefined on failure', function(){
-    var url = 'git://github.com/justgord/.git';
-    assert(null == parse(url));
-  })
-
-  it('should parse git@github.com:bcoe/thumbd.git', function() {
-    var url = 'git@github.com:bcoe/thumbd.git';
-    parse(url).should.eql('https://github.com/bcoe/thumbd');
-  })
-
-  it('should parse git@github.com:bcoe/thumbd.git#2.7.0', function() {
-    var url = 'git@github.com:bcoe/thumbd.git#2.7.0';
-    parse(url).should.eql('https://github.com/bcoe/thumbd');
-  })
-
-  it('should parse git+https://github.com/bcoe/thumbd.git', function() {
-    var url = 'git+https://github.com/bcoe/thumbd.git';
-    parse(url).should.eql('https://github.com/bcoe/thumbd');
-  })
-
-  it('should parse git+ssh://github.com/bcoe/thumbd.git', function() {
-    var url = 'git+ssh://github.com/bcoe/thumbd.git';
-    parse(url).should.eql('https://github.com/bcoe/thumbd');
-  })
-
-  it('should parse https://EastCloud@github.com/EastCloud/node-websockets.git', function() {
-    var url = 'https://EastCloud@github.com/EastCloud/node-websockets.git';
-    parse(url).should.eql('https://github.com/EastCloud/node-websockets');
-  })
-
-  // gist urls.
-
-  it('should parse git@gist urls', function() {
-    var url = 'git@gist.github.com:3135914.git';
-    parse(url).should.equal('https://gist.github.com/3135914')
-  })
-
-  it('should parse https://gist urls', function() {
-    var url = 'https://gist.github.com/3135914.git';
-    parse(url).should.equal('https://gist.github.com/3135914')
-  })
-
-  // Handle arbitrary GitHub Enterprise domains.
-
-  it('should parse parse extra GHE urls provided', function() {
-    var url = 'git://github.example.com/treygriffith/cellar.git';
-    parse(
-      url, {extraBaseUrls: ['github.example.com']}
-    ).should.equal('https://github.example.com/treygriffith/cellar');
-  });
-
-  it('should parse GHE urls with multiple subdomains', function() {
-    var url = 'git://github.internal.example.com/treygriffith/cellar.git';
-    parse(
-      url, {extraBaseUrls: ['github.internal.example.com']}
-    ).should.equal('https://github.internal.example.com/treygriffith/cellar');
-  });
-})
-
-describe('re', function() {
-  it('should expose GitHub url parsing regex', function() {
-    parse.re.source.should.equal(
-      /^(?:https?:\/\/|git:\/\/|git\+ssh:\/\/|git\+https:\/\/)?(?:[^@]+@)?(gist.github.com|github.com)[:\/]([^\/]+\/[^\/]+?|[0-9]+)$/.source
-    )
-  });
-})
diff --git a/deps/npm/node_modules/github-url-from-username-repo/.npmignore b/deps/npm/node_modules/github-url-from-username-repo/.npmignore
deleted file mode 100644
index 39747c08b4dc95..00000000000000
--- a/deps/npm/node_modules/github-url-from-username-repo/.npmignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.swp
-.*.swp
-
-.DS_Store
-*~
-.project
-.settings
-npm-debug.log
-coverage.html
-.idea
-lib-cov
-
-node_modules
\ No newline at end of file
diff --git a/deps/npm/node_modules/github-url-from-username-repo/.travis.yml b/deps/npm/node_modules/github-url-from-username-repo/.travis.yml
deleted file mode 100644
index a12e3f0fdebc13..00000000000000
--- a/deps/npm/node_modules/github-url-from-username-repo/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-language: node_js
-node_js:
-  - "0.8"
-  - "0.10"
\ No newline at end of file
diff --git a/deps/npm/node_modules/github-url-from-username-repo/LICENSE b/deps/npm/node_modules/github-url-from-username-repo/LICENSE
deleted file mode 100644
index 44c152ba75756c..00000000000000
--- a/deps/npm/node_modules/github-url-from-username-repo/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) Robert Kowalski ("Author")
-All rights reserved.
-
-The BSD License
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/deps/npm/node_modules/github-url-from-username-repo/README.md b/deps/npm/node_modules/github-url-from-username-repo/README.md
deleted file mode 100644
index 9adbee0ea38635..00000000000000
--- a/deps/npm/node_modules/github-url-from-username-repo/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-[![Build Status](https://travis-ci.org/robertkowalski/github-url-from-username-repo.png?branch=master)](https://travis-ci.org/robertkowalski/github-url-from-username-repo)
-[![Dependency Status](https://gemnasium.com/robertkowalski/github-url-from-username-repo.png)](https://gemnasium.com/robertkowalski/github-url-from-username-repo)
-
-
-# github-url-from-username-repo
-
-## API
-
-### getUrl(url, [forBrowser])
-
-Get's the url normalized for npm.
-If `forBrowser` is true, return a GitHub url that is usable in a webbrowser.
-
-## Usage
-
-```javascript
-
-var getUrl = require("github-url-from-username-repo")
-getUrl("visionmedia/express") // https://github.com/visionmedia/express
-
-```
diff --git a/deps/npm/node_modules/github-url-from-username-repo/index.js b/deps/npm/node_modules/github-url-from-username-repo/index.js
deleted file mode 100644
index f9d77f952f59fa..00000000000000
--- a/deps/npm/node_modules/github-url-from-username-repo/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-module.exports = getUrl
-
-function getUrl (r, forBrowser) {
-  if (!r) return null
-  // Regex taken from https://github.com/npm/npm-package-arg/commit/01dce583c64afae07b66a2a8a6033aeba871c3cd
-  // Note: This does not fully test the git ref format.
-  // See https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html
-  //
-  // The only way to do this properly would be to shell out to
-  // git-check-ref-format, and as this is a fast sync function,
-  // we don't want to do that. Just let git fail if it turns
-  // out that the commit-ish is invalid.
-  // GH usernames cannot start with . or -
-  if (/^[^@%\/\s\.-][^:@%\/\s]*\/[^@\s\/%]+(?:#.*)?$/.test(r)) {
-    if (forBrowser)
-      r = r.replace("#", "/tree/")
-    return "https://github.com/" + r
-  }
-
-  return null
-}
diff --git a/deps/npm/node_modules/github-url-from-username-repo/package.json b/deps/npm/node_modules/github-url-from-username-repo/package.json
deleted file mode 100644
index f8aa80d5b6fb0b..00000000000000
--- a/deps/npm/node_modules/github-url-from-username-repo/package.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "name": "github-url-from-username-repo",
-  "version": "1.0.2",
-  "description": "Create urls from username/repo",
-  "main": "index.js",
-  "scripts": {
-    "test": "mocha -R spec"
-  },
-  "devDependencies": {
-    "mocha": "~1.13.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git@github.com:robertkowalski/github-url-from-username-repo.git"
-  },
-  "author": {
-    "name": "Robert Kowalski",
-    "email": "rok@kowalski.gd"
-  },
-  "license": "BSD-2-Clause",
-  "bugs": {
-    "url": "https://github.com/robertkowalski/github-url-from-username-repo/issues"
-  },
-  "keywords": [
-    "git",
-    "github",
-    "repo"
-  ],
-  "readme": "[![Build Status](https://travis-ci.org/robertkowalski/github-url-from-username-repo.png?branch=master)](https://travis-ci.org/robertkowalski/github-url-from-username-repo)\n[![Dependency Status](https://gemnasium.com/robertkowalski/github-url-from-username-repo.png)](https://gemnasium.com/robertkowalski/github-url-from-username-repo)\n\n\n# github-url-from-username-repo\n\n## API\n\n### getUrl(url, [forBrowser])\n\nGet's the url normalized for npm.\nIf `forBrowser` is true, return a GitHub url that is usable in a webbrowser.\n\n## Usage\n\n```javascript\n\nvar getUrl = require(\"github-url-from-username-repo\")\ngetUrl(\"visionmedia/express\") // https://github.com/visionmedia/express\n\n```\n",
-  "readmeFilename": "README.md",
-  "gitHead": "d404a13f7f04edaed0e2f068a43b81230b8c7aee",
-  "homepage": "https://github.com/robertkowalski/github-url-from-username-repo",
-  "_id": "github-url-from-username-repo@1.0.2",
-  "_shasum": "7dd79330d2abe69c10c2cef79714c97215791dfa",
-  "_from": "github-url-from-username-repo@>=1.0.2-0 <2.0.0-0"
-}
diff --git a/deps/npm/node_modules/github-url-from-username-repo/test/index.js b/deps/npm/node_modules/github-url-from-username-repo/test/index.js
deleted file mode 100644
index 10fe3a34cc37c3..00000000000000
--- a/deps/npm/node_modules/github-url-from-username-repo/test/index.js
+++ /dev/null
@@ -1,70 +0,0 @@
-var assert = require("assert")
-var getUrl = require("../")
-
-describe("github url from username/repo", function () {
-  it("returns a github url for the username/repo", function () {
-    var url = getUrl("visionmedia/express")
-    assert.equal("https://github.com/visionmedia/express", url)
-  })
-
-  it("returns null if it does not match", function () {
-    var url = getUrl("package")
-    assert.deepEqual(null, url)
-  })
-
-  it("returns null if no repo/user was given", function () {
-    var url = getUrl()
-    assert.deepEqual(null, url)
-  })
-
-  it("returns null for something that's already a URI", function () {
-    var url = getUrl("file:../relative")
-    assert.deepEqual(null, url)
-  })
-
-  it("works with .", function () {
-    var url = getUrl("component/.download.er.js.")
-    assert.equal("https://github.com/component/.download.er.js.", url)
-  })
-
-  it("works with . in the beginning", function () {
-    var url = getUrl("component/.downloader.js")
-    assert.equal("https://github.com/component/.downloader.js", url)
-  })
-
-  it("works with -", function () {
-    var url = getUrl("component/-dow-nloader.j-s")
-    assert.equal("https://github.com/component/-dow-nloader.j-s", url)
-  })
-
-  it("can handle branches with #", function () {
-    var url = getUrl(
-      "component/entejs#1c3e1fe71640b4b477f04d947bd53c473799b277")
-
-    assert.equal("https://github.com/component/entejs#1c3e1fe71640b" +
-      "4b477f04d947bd53c473799b277", url)
-  })
-
-  it("can handle branches with slashes", function () {
-    var url = getUrl(
-      "component/entejs#some/branch/name")
-
-    assert.equal("https://github.com/component/entejs#some/branch/name", url)
-  })
-
-  describe("browser mode", function () {
-    it("is able to return urls for branches", function () {
-      var url = getUrl(
-        "component/entejs#1c3e1fe71640b4b477f04d947bd53c473799b277", true)
-
-      assert.equal("https://github.com/component/entejs/tree/1c3e1fe71640b" +
-        "4b477f04d947bd53c473799b277", url)
-    })
-    it("is able to return urls without a branch for the browser", function () {
-      var url = getUrl(
-        "component/entejs", true)
-
-      assert.equal("https://github.com/component/entejs", url)
-    })
-  })
-})
diff --git a/deps/npm/node_modules/glob/package.json b/deps/npm/node_modules/glob/package.json
index 2949b83be0637f..d93b6fcc167e24 100644
--- a/deps/npm/node_modules/glob/package.json
+++ b/deps/npm/node_modules/glob/package.json
@@ -1,24 +1,47 @@
 {
+  "_args": [
+    [
+      "glob@~5.0.15",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "glob@>=5.0.15 <5.1.0",
+  "_id": "glob@5.0.15",
+  "_inCache": true,
+  "_location": "/glob",
+  "_nodeVersion": "4.0.0",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
+  },
+  "_npmVersion": "3.3.2",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "glob",
+    "raw": "glob@~5.0.15",
+    "rawSpec": "~5.0.15",
+    "scope": null,
+    "spec": ">=5.0.15 <5.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/",
+    "/init-package-json",
+    "/read-package-json",
+    "/rimraf"
+  ],
+  "_resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+  "_shasum": "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1",
+  "_shrinkwrap": null,
+  "_spec": "glob@~5.0.15",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "name": "glob",
-  "description": "a little globber",
-  "version": "5.0.15",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/node-glob.git"
-  },
-  "main": "glob.js",
-  "files": [
-    "glob.js",
-    "sync.js",
-    "common.js"
-  ],
-  "engines": {
-    "node": "*"
+  "bugs": {
+    "url": "https://github.com/isaacs/node-glob/issues"
   },
   "dependencies": {
     "inflight": "^1.0.4",
@@ -27,47 +50,51 @@
     "once": "^1.3.0",
     "path-is-absolute": "^1.0.0"
   },
+  "description": "a little globber",
   "devDependencies": {
     "mkdirp": "0",
     "rimraf": "^2.2.8",
     "tap": "^1.1.4",
     "tick": "0.0.6"
   },
-  "scripts": {
-    "prepublish": "npm run benchclean",
-    "profclean": "rm -f v8.log profile.txt",
-    "test": "tap test/*.js --cov",
-    "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js",
-    "bench": "bash benchmark.sh",
-    "prof": "bash prof.sh && cat profile.txt",
-    "benchclean": "node benchclean.js"
-  },
-  "license": "ISC",
-  "gitHead": "3a7e71d453dd80e75b196fd262dd23ed54beeceb",
-  "bugs": {
-    "url": "https://github.com/isaacs/node-glob/issues"
-  },
-  "homepage": "https://github.com/isaacs/node-glob#readme",
-  "_id": "glob@5.0.15",
-  "_shasum": "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1",
-  "_from": "glob@5.0.15",
-  "_npmVersion": "3.3.2",
-  "_nodeVersion": "4.0.0",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
-  },
+  "directories": {},
   "dist": {
     "shasum": "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1",
     "tarball": "http://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
   },
+  "engines": {
+    "node": "*"
+  },
+  "files": [
+    "common.js",
+    "glob.js",
+    "sync.js"
+  ],
+  "gitHead": "3a7e71d453dd80e75b196fd262dd23ed54beeceb",
+  "homepage": "https://github.com/isaacs/node-glob#readme",
+  "installable": true,
+  "license": "ISC",
+  "main": "glob.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "glob",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/node-glob.git"
+  },
+  "scripts": {
+    "bench": "bash benchmark.sh",
+    "benchclean": "node benchclean.js",
+    "prepublish": "npm run benchclean",
+    "prof": "bash prof.sh && cat profile.txt",
+    "profclean": "rm -f v8.log profile.txt",
+    "test": "tap test/*.js --cov",
+    "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js"
+  },
+  "version": "5.0.15"
 }
diff --git a/deps/npm/node_modules/graceful-fs/package.json b/deps/npm/node_modules/graceful-fs/package.json
index f9e1598a6545ea..b01932d06af216 100644
--- a/deps/npm/node_modules/graceful-fs/package.json
+++ b/deps/npm/node_modules/graceful-fs/package.json
@@ -36,14 +36,10 @@
   },
   "dependencies": {},
   "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"
+  "devDependencies": {
+    "mkdirp": "^0.5.0",
+    "rimraf": "^2.2.8",
+    "tap": "^1.2.0"
   },
   "directories": {
     "test": "test"
@@ -64,45 +60,23 @@
   "gitHead": "c286080071b6be9aa9ba108b0bb9b44ff122926d",
   "homepage": "https://github.com/isaacs/node-graceful-fs#readme",
   "keywords": [
+    "EACCESS",
+    "EAGAIN",
+    "EINVAL",
+    "EMFILE",
+    "EPERM",
+    "error",
+    "errors",
     "fs",
+    "handling",
     "module",
+    "queue",
     "reading",
-    "retry",
     "retries",
-    "queue",
-    "error",
-    "errors",
-    "handling",
-    "EMFILE",
-    "EAGAIN",
-    "EINVAL",
-    "EPERM",
-    "EACCESS"
+    "retry"
   ],
   "license": "ISC",
-  "devDependencies": {
-    "mkdirp": "^0.5.0",
-    "rimraf": "^2.2.8",
-    "tap": "^1.2.0"
-  },
-  "gitHead": "45c57aa5e323c35a985a525de6f0c9a6ef59e1f8",
-  "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",
-  "_from": "graceful-fs@>=3.0.8 <3.1.0",
-  "_npmVersion": "2.10.1",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
-  },
-  "dist": {
-    "shasum": "ce813e725fa82f7e6147d51c9a5ca68270551c22",
-    "tarball": "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-  },
+  "main": "graceful-fs.js",
   "maintainers": [
     {
       "name": "isaacs",
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/.npmignore b/deps/npm/node_modules/graceful-readlink/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/.npmignore
rename to deps/npm/node_modules/graceful-readlink/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/.travis.yml b/deps/npm/node_modules/graceful-readlink/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/.travis.yml
rename to deps/npm/node_modules/graceful-readlink/.travis.yml
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/LICENSE b/deps/npm/node_modules/graceful-readlink/LICENSE
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/LICENSE
rename to deps/npm/node_modules/graceful-readlink/LICENSE
index d1f842f0bb2722..50d1e5c666c05b 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/LICENSE
+++ b/deps/npm/node_modules/graceful-readlink/LICENSE
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/README.md b/deps/npm/node_modules/graceful-readlink/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/README.md
rename to deps/npm/node_modules/graceful-readlink/README.md
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/index.js b/deps/npm/node_modules/graceful-readlink/index.js
similarity index 98%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/index.js
rename to deps/npm/node_modules/graceful-readlink/index.js
index 7e9fc70f0ac251..c4a79d1afad211 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/index.js
+++ b/deps/npm/node_modules/graceful-readlink/index.js
@@ -8,5 +8,3 @@ exports.readlinkSync = function (p) {
     return p;
   }
 };
-
-
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/package.json b/deps/npm/node_modules/graceful-readlink/package.json
similarity index 62%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/package.json
rename to deps/npm/node_modules/graceful-readlink/package.json
index 5b8486a16f8bc4..60665a7562a630 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/package.json
+++ b/deps/npm/node_modules/graceful-readlink/package.json
@@ -1,48 +1,73 @@
 {
-  "name": "graceful-readlink",
-  "version": "1.0.1",
-  "description": "graceful fs.readlink",
-  "main": "index.js",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/zhiyelee/graceful-readlink.git"
+  "_args": [
+    [
+      "graceful-readlink@>= 1.0.0",
+      "/Users/rebecca/code/npm/node_modules/commander"
+    ]
+  ],
+  "_from": "graceful-readlink@>=1.0.0",
+  "_id": "graceful-readlink@1.0.1",
+  "_inCache": true,
+  "_location": "/graceful-readlink",
+  "_nodeVersion": "0.11.14",
+  "_npmUser": {
+    "email": "zhiyelee@gmail.com",
+    "name": "zhiyelee"
+  },
+  "_npmVersion": "2.1.17",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "graceful-readlink",
+    "raw": "graceful-readlink@>= 1.0.0",
+    "rawSpec": ">= 1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/commander"
+  ],
+  "_resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+  "_shasum": "4cafad76bc62f02fa039b2f94e9a3dd3a391a725",
+  "_shrinkwrap": null,
+  "_spec": "graceful-readlink@>= 1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/commander",
+  "author": {
+    "name": "zhiyelee"
   },
-  "homepage": "https://github.com/zhiyelee/graceful-readlink",
   "bugs": {
     "url": "https://github.com/zhiyelee/graceful-readlink/issues"
   },
+  "dependencies": {},
+  "description": "graceful fs.readlink",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "4cafad76bc62f02fa039b2f94e9a3dd3a391a725",
+    "tarball": "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+  },
+  "gitHead": "f6655275bebef706fb63fd01b5f062a7052419a5",
+  "homepage": "https://github.com/zhiyelee/graceful-readlink",
   "keywords": [
     "fs.readlink",
     "readlink"
   ],
-  "author": {
-    "name": "zhiyelee"
-  },
   "license": "MIT",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "gitHead": "f6655275bebef706fb63fd01b5f062a7052419a5",
-  "_id": "graceful-readlink@1.0.1",
-  "_shasum": "4cafad76bc62f02fa039b2f94e9a3dd3a391a725",
-  "_from": "graceful-readlink@>=1.0.0",
-  "_npmVersion": "2.1.17",
-  "_nodeVersion": "0.11.14",
-  "_npmUser": {
-    "name": "zhiyelee",
-    "email": "zhiyelee@gmail.com"
-  },
+  "main": "index.js",
   "maintainers": [
     {
       "name": "zhiyelee",
       "email": "zhiyelee@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "4cafad76bc62f02fa039b2f94e9a3dd3a391a725",
-    "tarball": "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+  "name": "graceful-readlink",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/zhiyelee/graceful-readlink.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "version": "1.0.1"
 }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/LICENSE b/deps/npm/node_modules/har-validator/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/LICENSE
rename to deps/npm/node_modules/har-validator/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/README.md b/deps/npm/node_modules/har-validator/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/README.md
rename to deps/npm/node_modules/har-validator/README.md
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/bin/har-validator b/deps/npm/node_modules/har-validator/bin/har-validator
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/bin/har-validator
rename to deps/npm/node_modules/har-validator/bin/har-validator
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/error.js b/deps/npm/node_modules/har-validator/lib/error.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/error.js
rename to deps/npm/node_modules/har-validator/lib/error.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/index.js b/deps/npm/node_modules/har-validator/lib/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/index.js
rename to deps/npm/node_modules/har-validator/lib/index.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/cache.json b/deps/npm/node_modules/har-validator/lib/schemas/cache.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/cache.json
rename to deps/npm/node_modules/har-validator/lib/schemas/cache.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/cacheEntry.json b/deps/npm/node_modules/har-validator/lib/schemas/cacheEntry.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/cacheEntry.json
rename to deps/npm/node_modules/har-validator/lib/schemas/cacheEntry.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/content.json b/deps/npm/node_modules/har-validator/lib/schemas/content.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/content.json
rename to deps/npm/node_modules/har-validator/lib/schemas/content.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/cookie.json b/deps/npm/node_modules/har-validator/lib/schemas/cookie.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/cookie.json
rename to deps/npm/node_modules/har-validator/lib/schemas/cookie.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/creator.json b/deps/npm/node_modules/har-validator/lib/schemas/creator.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/creator.json
rename to deps/npm/node_modules/har-validator/lib/schemas/creator.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/entry.json b/deps/npm/node_modules/har-validator/lib/schemas/entry.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/entry.json
rename to deps/npm/node_modules/har-validator/lib/schemas/entry.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/har.json b/deps/npm/node_modules/har-validator/lib/schemas/har.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/har.json
rename to deps/npm/node_modules/har-validator/lib/schemas/har.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/index.js b/deps/npm/node_modules/har-validator/lib/schemas/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/index.js
rename to deps/npm/node_modules/har-validator/lib/schemas/index.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/log.json b/deps/npm/node_modules/har-validator/lib/schemas/log.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/log.json
rename to deps/npm/node_modules/har-validator/lib/schemas/log.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/page.json b/deps/npm/node_modules/har-validator/lib/schemas/page.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/page.json
rename to deps/npm/node_modules/har-validator/lib/schemas/page.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/pageTimings.json b/deps/npm/node_modules/har-validator/lib/schemas/pageTimings.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/pageTimings.json
rename to deps/npm/node_modules/har-validator/lib/schemas/pageTimings.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/postData.json b/deps/npm/node_modules/har-validator/lib/schemas/postData.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/postData.json
rename to deps/npm/node_modules/har-validator/lib/schemas/postData.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/record.json b/deps/npm/node_modules/har-validator/lib/schemas/record.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/record.json
rename to deps/npm/node_modules/har-validator/lib/schemas/record.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/request.json b/deps/npm/node_modules/har-validator/lib/schemas/request.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/request.json
rename to deps/npm/node_modules/har-validator/lib/schemas/request.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/response.json b/deps/npm/node_modules/har-validator/lib/schemas/response.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/response.json
rename to deps/npm/node_modules/har-validator/lib/schemas/response.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/timings.json b/deps/npm/node_modules/har-validator/lib/schemas/timings.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/timings.json
rename to deps/npm/node_modules/har-validator/lib/schemas/timings.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/package.json b/deps/npm/node_modules/har-validator/package.json
similarity index 73%
rename from deps/npm/node_modules/request/node_modules/har-validator/package.json
rename to deps/npm/node_modules/har-validator/package.json
index 7a32287fa4aad6..0604cfc10c3375 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/package.json
+++ b/deps/npm/node_modules/har-validator/package.json
@@ -1,51 +1,55 @@
 {
-  "version": "1.8.0",
-  "name": "har-validator",
-  "description": "Extremely fast HTTP Archive (HAR) validator using JSON Schema",
+  "_args": [
+    [
+      "har-validator@^1.6.1",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
+  ],
+  "_from": "har-validator@>=1.6.1 <2.0.0",
+  "_id": "har-validator@1.8.0",
+  "_inCache": true,
+  "_location": "/har-validator",
+  "_nodeVersion": "0.12.2",
+  "_npmUser": {
+    "email": "ahmad@ahmadnassri.com",
+    "name": "ahmadnassri"
+  },
+  "_npmVersion": "2.11.2",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "har-validator",
+    "raw": "har-validator@^1.6.1",
+    "rawSpec": "^1.6.1",
+    "scope": null,
+    "spec": ">=1.6.1 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/request"
+  ],
+  "_resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
+  "_shasum": "d83842b0eb4c435960aeb108a067a3aa94c0eeb2",
+  "_shrinkwrap": null,
+  "_spec": "har-validator@^1.6.1",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
   "author": {
-    "name": "Ahmad Nassri",
     "email": "ahmad@ahmadnassri.com",
+    "name": "Ahmad Nassri",
     "url": "https://www.ahmadnassri.com/"
   },
-  "homepage": "https://github.com/ahmadnassri/har-validator",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ahmadnassri/har-validator.git"
-  },
-  "license": "ISC",
-  "main": "lib/index",
   "bin": {
     "har-validator": "bin/har-validator"
   },
-  "keywords": [
-    "har",
-    "http",
-    "archive",
-    "validate",
-    "validator"
-  ],
-  "engines": {
-    "node": ">=0.10"
-  },
-  "files": [
-    "bin",
-    "lib"
-  ],
   "bugs": {
     "url": "https://github.com/ahmadnassri/har-validator/issues"
   },
-  "scripts": {
-    "pretest": "standard && echint",
-    "test": "mocha",
-    "posttest": "npm run coverage",
-    "coverage": "istanbul cover --dir coverage _mocha -- -R dot",
-    "codeclimate": "codeclimate < coverage/lcov.info"
-  },
-  "echint": {
-    "ignore": [
-      "coverage/**"
-    ]
+  "dependencies": {
+    "bluebird": "^2.9.30",
+    "chalk": "^1.0.0",
+    "commander": "^2.8.1",
+    "is-my-json-valid": "^2.12.0"
   },
+  "description": "Extremely fast HTTP Archive (HAR) validator using JSON Schema",
   "devDependencies": {
     "codeclimate-test-reporter": "0.0.4",
     "echint": "^1.3.0",
@@ -55,33 +59,52 @@
     "should": "^7.0.1",
     "standard": "^4.3.1"
   },
-  "dependencies": {
-    "bluebird": "^2.9.30",
-    "chalk": "^1.0.0",
-    "commander": "^2.8.1",
-    "is-my-json-valid": "^2.12.0"
+  "directories": {},
+  "dist": {
+    "shasum": "d83842b0eb4c435960aeb108a067a3aa94c0eeb2",
+    "tarball": "http://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz"
   },
-  "gitHead": "8fd21c30edb23a1fed2d50b934d055d1be3dd7c9",
-  "_id": "har-validator@1.8.0",
-  "_shasum": "d83842b0eb4c435960aeb108a067a3aa94c0eeb2",
-  "_from": "har-validator@>=1.6.1 <2.0.0",
-  "_npmVersion": "2.11.2",
-  "_nodeVersion": "0.12.2",
-  "_npmUser": {
-    "name": "ahmadnassri",
-    "email": "ahmad@ahmadnassri.com"
+  "echint": {
+    "ignore": [
+      "coverage/**"
+    ]
   },
+  "engines": {
+    "node": ">=0.10"
+  },
+  "files": [
+    "bin",
+    "lib"
+  ],
+  "gitHead": "8fd21c30edb23a1fed2d50b934d055d1be3dd7c9",
+  "homepage": "https://github.com/ahmadnassri/har-validator",
+  "keywords": [
+    "archive",
+    "har",
+    "http",
+    "validate",
+    "validator"
+  ],
+  "license": "ISC",
+  "main": "lib/index",
   "maintainers": [
     {
       "name": "ahmadnassri",
       "email": "ahmad@ahmadnassri.com"
     }
   ],
-  "dist": {
-    "shasum": "d83842b0eb4c435960aeb108a067a3aa94c0eeb2",
-    "tarball": "http://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz"
+  "name": "har-validator",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ahmadnassri/har-validator.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "codeclimate": "codeclimate < coverage/lcov.info",
+    "coverage": "istanbul cover --dir coverage _mocha -- -R dot",
+    "posttest": "npm run coverage",
+    "pretest": "standard && echint",
+    "test": "mocha"
+  },
+  "version": "1.8.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/index.js b/deps/npm/node_modules/has-ansi/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/index.js
rename to deps/npm/node_modules/has-ansi/index.js
diff --git a/deps/npm/node_modules/osenv/node_modules/os-homedir/license b/deps/npm/node_modules/has-ansi/license
similarity index 100%
rename from deps/npm/node_modules/osenv/node_modules/os-homedir/license
rename to deps/npm/node_modules/has-ansi/license
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/package.json b/deps/npm/node_modules/has-ansi/package.json
similarity index 69%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/package.json
rename to deps/npm/node_modules/has-ansi/package.json
index d39a62eb9150d7..a7ec031ca3082c 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/package.json
+++ b/deps/npm/node_modules/has-ansi/package.json
@@ -1,85 +1,108 @@
 {
-  "name": "has-ansi",
-  "version": "2.0.0",
-  "description": "Check if a string has ANSI escape codes",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sindresorhus/has-ansi.git"
+  "_args": [
+    [
+      "has-ansi@^2.0.0",
+      "/Users/rebecca/code/npm/node_modules/chalk"
+    ]
+  ],
+  "_from": "has-ansi@>=2.0.0 <3.0.0",
+  "_id": "has-ansi@2.0.0",
+  "_inCache": true,
+  "_location": "/has-ansi",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "sindresorhus@gmail.com",
+    "name": "sindresorhus"
   },
+  "_npmVersion": "2.11.2",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "has-ansi",
+    "raw": "has-ansi@^2.0.0",
+    "rawSpec": "^2.0.0",
+    "scope": null,
+    "spec": ">=2.0.0 <3.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/chalk"
+  ],
+  "_resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+  "_shasum": "34f5049ce1ecdf2b0649af3ef24e45ed35416d91",
+  "_shrinkwrap": null,
+  "_spec": "has-ansi@^2.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/chalk",
   "author": {
-    "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
+    "name": "Sindre Sorhus",
     "url": "sindresorhus.com"
   },
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    },
-    {
-      "name": "jbnicolai",
-      "email": "jappelman@xebia.com"
-    }
-  ],
+  "bugs": {
+    "url": "https://github.com/sindresorhus/has-ansi/issues"
+  },
+  "dependencies": {
+    "ansi-regex": "^2.0.0"
+  },
+  "description": "Check if a string has ANSI escape codes",
+  "devDependencies": {
+    "ava": "0.0.4"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "34f5049ce1ecdf2b0649af3ef24e45ed35416d91",
+    "tarball": "http://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
+  },
   "engines": {
     "node": ">=0.10.0"
   },
-  "scripts": {
-    "test": "node test.js"
-  },
   "files": [
     "index.js"
   ],
+  "gitHead": "0722275e1bef139fcd09137da6e5550c3cd368b9",
+  "homepage": "https://github.com/sindresorhus/has-ansi",
   "keywords": [
     "ansi",
-    "styles",
     "color",
-    "colour",
     "colors",
-    "terminal",
+    "colour",
+    "command-line",
     "console",
-    "string",
-    "tty",
     "escape",
-    "shell",
-    "xterm",
-    "command-line",
-    "text",
+    "find",
+    "has",
+    "match",
+    "pattern",
+    "re",
     "regex",
     "regexp",
-    "re",
-    "match",
+    "shell",
+    "string",
+    "styles",
+    "terminal",
     "test",
-    "find",
-    "pattern",
-    "has"
+    "text",
+    "tty",
+    "xterm"
   ],
-  "dependencies": {
-    "ansi-regex": "^2.0.0"
-  },
-  "devDependencies": {
-    "ava": "0.0.4"
-  },
-  "gitHead": "0722275e1bef139fcd09137da6e5550c3cd368b9",
-  "bugs": {
-    "url": "https://github.com/sindresorhus/has-ansi/issues"
-  },
-  "homepage": "https://github.com/sindresorhus/has-ansi",
-  "_id": "has-ansi@2.0.0",
-  "_shasum": "34f5049ce1ecdf2b0649af3ef24e45ed35416d91",
-  "_from": "has-ansi@>=2.0.0 <3.0.0",
-  "_npmVersion": "2.11.2",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "name": "sindresorhus",
-    "email": "sindresorhus@gmail.com"
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "sindresorhus",
+      "email": "sindresorhus@gmail.com"
+    },
+    {
+      "name": "jbnicolai",
+      "email": "jappelman@xebia.com"
+    }
+  ],
+  "name": "has-ansi",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/sindresorhus/has-ansi"
   },
-  "dist": {
-    "shasum": "34f5049ce1ecdf2b0649af3ef24e45ed35416d91",
-    "tarball": "http://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
+  "scripts": {
+    "test": "node test.js"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "version": "2.0.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/readme.md b/deps/npm/node_modules/has-ansi/readme.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/readme.md
rename to deps/npm/node_modules/has-ansi/readme.md
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/.npmignore b/deps/npm/node_modules/has-unicode/.npmignore
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/.npmignore
rename to deps/npm/node_modules/has-unicode/.npmignore
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/LICENSE b/deps/npm/node_modules/has-unicode/LICENSE
similarity index 99%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/LICENSE
rename to deps/npm/node_modules/has-unicode/LICENSE
index d42e25e95655bb..e756052969b780 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/LICENSE
+++ b/deps/npm/node_modules/has-unicode/LICENSE
@@ -11,4 +11,3 @@ 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/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/README.md b/deps/npm/node_modules/has-unicode/README.md
similarity index 98%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/README.md
rename to deps/npm/node_modules/has-unicode/README.md
index e9d3cc326c144a..4393106fda3a0a 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/README.md
+++ b/deps/npm/node_modules/has-unicode/README.md
@@ -33,8 +33,7 @@ As such, we report any Windows installation as unicode capable.
 ### Unix Like Operating Systems
 
 We look at the environment variables `LC_ALL`, `LC_CTYPE`, and `LANG` in
-that order.  For `LC_ALL` and `LANG`, it looks for `.UTF-8` in the value. 
+that order.  For `LC_ALL` and `LANG`, it looks for `.UTF-8` in the value.
 For `LC_CTYPE` it looks to see if the value is `UTF-8`.  This is sufficient
 for most POSIX systems.  While locale data can be put in `/etc/locale.conf`
 as well, AFAIK it's always copied into the environment.
-
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/index.js b/deps/npm/node_modules/has-unicode/index.js
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/index.js
rename to deps/npm/node_modules/has-unicode/index.js
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/package.json b/deps/npm/node_modules/has-unicode/package.json
similarity index 56%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/package.json
rename to deps/npm/node_modules/has-unicode/package.json
index fd552a9e4096ee..de92acfcac4a32 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/package.json
+++ b/deps/npm/node_modules/has-unicode/package.json
@@ -1,53 +1,78 @@
 {
-  "name": "has-unicode",
-  "version": "1.0.0",
-  "description": "Try to guess if your terminal supports unicode",
-  "main": "index.js",
-  "scripts": {
-    "test": "tap test/*.js"
+  "_args": [
+    [
+      "has-unicode@~1.0.0",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "has-unicode@>=1.0.0 <1.1.0",
+  "_id": "has-unicode@1.0.0",
+  "_inCache": true,
+  "_location": "/has-unicode",
+  "_nodeVersion": "0.10.33",
+  "_npmUser": {
+    "email": "me@re-becca.org",
+    "name": "iarna"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/iarna/has-unicode.git"
+  "_npmVersion": "2.1.11",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "has-unicode",
+    "raw": "has-unicode@~1.0.0",
+    "rawSpec": "~1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <1.1.0",
+    "type": "range"
   },
-  "keywords": [
-    "unicode",
-    "terminal"
+  "_requiredBy": [
+    "/",
+    "/gauge"
   ],
+  "_resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz",
+  "_shasum": "bac5c44e064c2ffc3b8fcbd8c71afe08f9afc8cc",
+  "_shrinkwrap": null,
+  "_spec": "has-unicode@~1.0.0",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Rebecca Turner",
-    "email": "me@re-becca.org"
+    "email": "me@re-becca.org",
+    "name": "Rebecca Turner"
   },
-  "license": "ISC",
   "bugs": {
     "url": "https://github.com/iarna/has-unicode/issues"
   },
-  "homepage": "https://github.com/iarna/has-unicode",
+  "dependencies": {},
+  "description": "Try to guess if your terminal supports unicode",
   "devDependencies": {
     "require-inject": "^1.1.1",
     "tap": "^0.4.13"
   },
-  "gitHead": "a8c3dcf3be5f0c8f8e26a3e7ffea7da24344a006",
-  "_id": "has-unicode@1.0.0",
-  "_shasum": "bac5c44e064c2ffc3b8fcbd8c71afe08f9afc8cc",
-  "_from": "has-unicode@>=1.0.0 <2.0.0",
-  "_npmVersion": "2.1.11",
-  "_nodeVersion": "0.10.33",
-  "_npmUser": {
-    "name": "iarna",
-    "email": "me@re-becca.org"
+  "directories": {},
+  "dist": {
+    "shasum": "bac5c44e064c2ffc3b8fcbd8c71afe08f9afc8cc",
+    "tarball": "http://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz"
   },
+  "gitHead": "a8c3dcf3be5f0c8f8e26a3e7ffea7da24344a006",
+  "homepage": "https://github.com/iarna/has-unicode",
+  "keywords": [
+    "terminal",
+    "unicode"
+  ],
+  "license": "ISC",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "iarna",
       "email": "me@re-becca.org"
     }
   ],
-  "dist": {
-    "shasum": "bac5c44e064c2ffc3b8fcbd8c71afe08f9afc8cc",
-    "tarball": "http://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz"
+  "name": "has-unicode",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/iarna/has-unicode"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.0.0"
 }
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/test/index.js b/deps/npm/node_modules/has-unicode/test/index.js
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/test/index.js
rename to deps/npm/node_modules/has-unicode/test/index.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/.npmignore b/deps/npm/node_modules/hawk/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/.npmignore
rename to deps/npm/node_modules/hawk/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/hawk/.travis.yml b/deps/npm/node_modules/hawk/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/.travis.yml
rename to deps/npm/node_modules/hawk/.travis.yml
diff --git a/deps/npm/node_modules/request/node_modules/hawk/LICENSE b/deps/npm/node_modules/hawk/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/LICENSE
rename to deps/npm/node_modules/hawk/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/hawk/README.md b/deps/npm/node_modules/hawk/README.md
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/hawk/README.md
rename to deps/npm/node_modules/hawk/README.md
index 4aff23f3a3f7c5..63725034fc5e72 100755
--- a/deps/npm/node_modules/request/node_modules/hawk/README.md
+++ b/deps/npm/node_modules/hawk/README.md
@@ -75,12 +75,12 @@ and the server.
 
 ## Replay Protection
 
-Without replay protection, an attacker can use a compromised (but otherwise valid and authenticated) request more 
-than once, gaining access to a protected resource. To mitigate this, clients include both a nonce and a timestamp when 
+Without replay protection, an attacker can use a compromised (but otherwise valid and authenticated) request more
+than once, gaining access to a protected resource. To mitigate this, clients include both a nonce and a timestamp when
 making requests. This gives the server enough information to prevent replay attacks.
 
 The nonce is generated by the client, and is a string unique across all requests with the same timestamp and
-key identifier combination. 
+key identifier combination.
 
 The timestamp enables the server to restrict the validity period of the credentials where requests occuring afterwards
 are rejected. It also removes the need for the server to retain an unbounded number of nonce values for future checks.
@@ -373,7 +373,7 @@ and for a finite period of time. Both the client and server can issue bewit cred
 credentials as the client to maintain clear traceability as to who issued which credentials.
 
 In order to simplify implementation, bewit credentials do not support single-use policy and can be replayed multiple times within
-the granted access timeframe. 
+the granted access timeframe.
 
 
 ## Bewit Usage Example
@@ -496,7 +496,7 @@ which can often affect how the request body is interpreted by the server. If the
 or value of such headers, an attacker can manipulate the request headers without being detected. Implementers should use the
 `ext` feature to pass application-specific information via the `Authorization` header which is protected by the request MAC.
 
-The response authentication, when performed, only covers the response payload, content-type, and the request information 
+The response authentication, when performed, only covers the response payload, content-type, and the request information
 provided by the client in it's request (method, resource, timestamp, nonce, etc.). It does not cover the HTTP status code or
 any other response header field (e.g. Location) which can affect the client's behaviour.
 
diff --git a/deps/npm/node_modules/request/node_modules/hawk/bower.json b/deps/npm/node_modules/hawk/bower.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/bower.json
rename to deps/npm/node_modules/hawk/bower.json
diff --git a/deps/npm/node_modules/request/node_modules/hawk/component.json b/deps/npm/node_modules/hawk/component.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/component.json
rename to deps/npm/node_modules/hawk/component.json
diff --git a/deps/npm/node_modules/request/node_modules/hawk/example/usage.js b/deps/npm/node_modules/hawk/example/usage.js
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/hawk/example/usage.js
rename to deps/npm/node_modules/hawk/example/usage.js
index 13b860b4c5ad8a..64fe17674a5753 100755
--- a/deps/npm/node_modules/request/node_modules/hawk/example/usage.js
+++ b/deps/npm/node_modules/hawk/example/usage.js
@@ -75,4 +75,3 @@ credentialsFunc('dh37fgj492je', function (err, credentials) {
         process.exit(0);
     });
 });
-
diff --git a/deps/npm/node_modules/request/node_modules/hawk/images/hawk.png b/deps/npm/node_modules/hawk/images/hawk.png
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/images/hawk.png
rename to deps/npm/node_modules/hawk/images/hawk.png
diff --git a/deps/npm/node_modules/request/node_modules/hawk/images/logo.png b/deps/npm/node_modules/hawk/images/logo.png
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/images/logo.png
rename to deps/npm/node_modules/hawk/images/logo.png
diff --git a/deps/npm/node_modules/request/node_modules/hawk/lib/browser.js b/deps/npm/node_modules/hawk/lib/browser.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/lib/browser.js
rename to deps/npm/node_modules/hawk/lib/browser.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/lib/client.js b/deps/npm/node_modules/hawk/lib/client.js
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/hawk/lib/client.js
rename to deps/npm/node_modules/hawk/lib/client.js
index b3e8649e3a6215..f9ae69171343bd 100755
--- a/deps/npm/node_modules/request/node_modules/hawk/lib/client.js
+++ b/deps/npm/node_modules/hawk/lib/client.js
@@ -364,6 +364,3 @@ exports.message = function (host, port, message, options) {
 
     return result;
 };
-
-
-
diff --git a/deps/npm/node_modules/request/node_modules/hawk/lib/crypto.js b/deps/npm/node_modules/hawk/lib/crypto.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/lib/crypto.js
rename to deps/npm/node_modules/hawk/lib/crypto.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/lib/index.js b/deps/npm/node_modules/hawk/lib/index.js
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/hawk/lib/index.js
rename to deps/npm/node_modules/hawk/lib/index.js
index a883882c8c538c..911b906aabdaed 100755
--- a/deps/npm/node_modules/request/node_modules/hawk/lib/index.js
+++ b/deps/npm/node_modules/hawk/lib/index.js
@@ -12,4 +12,3 @@ exports.uri = {
     authenticate: exports.server.authenticateBewit,
     getBewit: exports.client.getBewit
 };
-
diff --git a/deps/npm/node_modules/request/node_modules/hawk/lib/server.js b/deps/npm/node_modules/hawk/lib/server.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/lib/server.js
rename to deps/npm/node_modules/hawk/lib/server.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/lib/utils.js b/deps/npm/node_modules/hawk/lib/utils.js
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/hawk/lib/utils.js
rename to deps/npm/node_modules/hawk/lib/utils.js
index 8d2719abc68218..8b192ace661de3 100755
--- a/deps/npm/node_modules/request/node_modules/hawk/lib/utils.js
+++ b/deps/npm/node_modules/hawk/lib/utils.js
@@ -161,4 +161,3 @@ exports.unauthorized = function (message, attributes) {
 
     return Boom.unauthorized(message, 'Hawk', attributes);
 };
-
diff --git a/deps/npm/node_modules/request/node_modules/hawk/package.json b/deps/npm/node_modules/hawk/package.json
similarity index 70%
rename from deps/npm/node_modules/request/node_modules/hawk/package.json
rename to deps/npm/node_modules/hawk/package.json
index 5a835b2e42a959..81abc2e1c658c3 100644
--- a/deps/npm/node_modules/request/node_modules/hawk/package.json
+++ b/deps/npm/node_modules/hawk/package.json
@@ -1,68 +1,91 @@
 {
-  "name": "hawk",
-  "description": "HTTP Hawk Authentication Scheme",
-  "version": "3.1.0",
-  "author": {
-    "name": "Eran Hammer",
+  "_args": [
+    [
+      "hawk@~3.1.0",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
+  ],
+  "_from": "hawk@>=3.1.0 <3.2.0",
+  "_id": "hawk@3.1.0",
+  "_inCache": true,
+  "_location": "/hawk",
+  "_nodeVersion": "0.10.38",
+  "_npmUser": {
     "email": "eran@hammer.io",
-    "url": "http://hueniverse.com"
+    "name": "hueniverse"
   },
-  "contributors": [],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/hueniverse/hawk.git"
+  "_npmVersion": "2.10.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "hawk",
+    "raw": "hawk@~3.1.0",
+    "rawSpec": "~3.1.0",
+    "scope": null,
+    "spec": ">=3.1.0 <3.2.0",
+    "type": "range"
   },
-  "main": "lib/index.js",
-  "keywords": [
-    "http",
-    "authentication",
-    "scheme",
-    "hawk"
+  "_requiredBy": [
+    "/request"
   ],
-  "engines": {
-    "node": ">=0.10.32"
+  "_resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz",
+  "_shasum": "8a13ae19977ec607602f3f0b9fd676f18c384e44",
+  "_shrinkwrap": null,
+  "_spec": "hawk@~3.1.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
+  "author": {
+    "email": "eran@hammer.io",
+    "name": "Eran Hammer",
+    "url": "http://hueniverse.com"
   },
   "browser": "./lib/browser.js",
+  "bugs": {
+    "url": "https://github.com/hueniverse/hawk/issues"
+  },
+  "contributors": [],
   "dependencies": {
-    "hoek": "2.x.x",
     "boom": "^2.8.x",
     "cryptiles": "2.x.x",
+    "hoek": "2.x.x",
     "sntp": "1.x.x"
   },
+  "description": "HTTP Hawk Authentication Scheme",
   "devDependencies": {
     "code": "1.x.x",
     "lab": "5.x.x"
   },
-  "scripts": {
-    "test": "lab -a code -t 100 -L",
-    "test-cov-html": "lab -a code -r html -o coverage.html"
-  },
-  "license": "BSD-3-Clause",
-  "gitHead": "fdb9d05e383d5237631eaddc4f51422e54fa8b52",
-  "bugs": {
-    "url": "https://github.com/hueniverse/hawk/issues"
-  },
-  "homepage": "https://github.com/hueniverse/hawk#readme",
-  "_id": "hawk@3.1.0",
-  "_shasum": "8a13ae19977ec607602f3f0b9fd676f18c384e44",
-  "_from": "hawk@>=3.1.0 <3.2.0",
-  "_npmVersion": "2.10.0",
-  "_nodeVersion": "0.10.38",
-  "_npmUser": {
-    "name": "hueniverse",
-    "email": "eran@hammer.io"
-  },
+  "directories": {},
   "dist": {
     "shasum": "8a13ae19977ec607602f3f0b9fd676f18c384e44",
     "tarball": "http://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz"
   },
+  "engines": {
+    "node": ">=0.10.32"
+  },
+  "gitHead": "fdb9d05e383d5237631eaddc4f51422e54fa8b52",
+  "homepage": "https://github.com/hueniverse/hawk#readme",
+  "keywords": [
+    "authentication",
+    "hawk",
+    "http",
+    "scheme"
+  ],
+  "license": "BSD-3-Clause",
+  "main": "lib/index.js",
   "maintainers": [
     {
       "name": "hueniverse",
       "email": "eran@hueniverse.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "hawk",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/hueniverse/hawk.git"
+  },
+  "scripts": {
+    "test": "lab -a code -t 100 -L",
+    "test-cov-html": "lab -a code -r html -o coverage.html"
+  },
+  "version": "3.1.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/hawk/test/browser.js b/deps/npm/node_modules/hawk/test/browser.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/test/browser.js
rename to deps/npm/node_modules/hawk/test/browser.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/test/client.js b/deps/npm/node_modules/hawk/test/client.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/test/client.js
rename to deps/npm/node_modules/hawk/test/client.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/test/crypto.js b/deps/npm/node_modules/hawk/test/crypto.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/test/crypto.js
rename to deps/npm/node_modules/hawk/test/crypto.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/test/index.js b/deps/npm/node_modules/hawk/test/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/test/index.js
rename to deps/npm/node_modules/hawk/test/index.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/test/readme.js b/deps/npm/node_modules/hawk/test/readme.js
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/hawk/test/readme.js
rename to deps/npm/node_modules/hawk/test/readme.js
index a466264667ee64..7a343f5e219c61 100755
--- a/deps/npm/node_modules/request/node_modules/hawk/test/readme.js
+++ b/deps/npm/node_modules/hawk/test/readme.js
@@ -92,4 +92,3 @@ describe('README', function () {
         });
     });
 });
-
diff --git a/deps/npm/node_modules/request/node_modules/hawk/test/server.js b/deps/npm/node_modules/hawk/test/server.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/test/server.js
rename to deps/npm/node_modules/hawk/test/server.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/test/uri.js b/deps/npm/node_modules/hawk/test/uri.js
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/hawk/test/uri.js
rename to deps/npm/node_modules/hawk/test/uri.js
index 1b623c09126c32..03491328b53895 100755
--- a/deps/npm/node_modules/request/node_modules/hawk/test/uri.js
+++ b/deps/npm/node_modules/hawk/test/uri.js
@@ -846,4 +846,3 @@ describe('Uri', function () {
         });
     });
 });
-
diff --git a/deps/npm/node_modules/request/node_modules/hawk/test/utils.js b/deps/npm/node_modules/hawk/test/utils.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/test/utils.js
rename to deps/npm/node_modules/hawk/test/utils.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/.npmignore b/deps/npm/node_modules/hoek/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/.npmignore
rename to deps/npm/node_modules/hoek/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/qs/.travis.yml b/deps/npm/node_modules/hoek/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/qs/.travis.yml
rename to deps/npm/node_modules/hoek/.travis.yml
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/CONTRIBUTING.md b/deps/npm/node_modules/hoek/CONTRIBUTING.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/CONTRIBUTING.md
rename to deps/npm/node_modules/hoek/CONTRIBUTING.md
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/LICENSE b/deps/npm/node_modules/hoek/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/LICENSE
rename to deps/npm/node_modules/hoek/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/README.md b/deps/npm/node_modules/hoek/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/README.md
rename to deps/npm/node_modules/hoek/README.md
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/images/hoek.png b/deps/npm/node_modules/hoek/images/hoek.png
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/images/hoek.png
rename to deps/npm/node_modules/hoek/images/hoek.png
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/lib/escape.js b/deps/npm/node_modules/hoek/lib/escape.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/lib/escape.js
rename to deps/npm/node_modules/hoek/lib/escape.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/lib/index.js b/deps/npm/node_modules/hoek/lib/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/lib/index.js
rename to deps/npm/node_modules/hoek/lib/index.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/package.json b/deps/npm/node_modules/hoek/package.json
similarity index 68%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/package.json
rename to deps/npm/node_modules/hoek/package.json
index 4e3968f48bc998..58a346a4360456 100644
--- a/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/package.json
+++ b/deps/npm/node_modules/hoek/package.json
@@ -1,46 +1,64 @@
 {
-  "name": "hoek",
-  "description": "General purpose node utilities",
-  "version": "2.16.3",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/hapijs/hoek.git"
+  "_args": [
+    [
+      "hoek@2.x.x",
+      "/Users/rebecca/code/npm/node_modules/hawk"
+    ]
+  ],
+  "_from": "hoek@>=2.0.0 <3.0.0",
+  "_id": "hoek@2.16.3",
+  "_inCache": true,
+  "_location": "/hoek",
+  "_nodeVersion": "4.1.0",
+  "_npmUser": {
+    "email": "quitlahok@gmail.com",
+    "name": "nlf"
   },
-  "main": "lib/index.js",
-  "keywords": [
-    "utilities"
+  "_npmVersion": "3.3.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "hoek",
+    "raw": "hoek@2.x.x",
+    "rawSpec": "2.x.x",
+    "scope": null,
+    "spec": ">=2.0.0 <3.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/boom",
+    "/hawk",
+    "/sntp"
   ],
-  "engines": {
-    "node": ">=0.10.40"
+  "_resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+  "_shasum": "20bb7403d3cea398e91dc4710a8ff1b8274a25ed",
+  "_shrinkwrap": null,
+  "_spec": "hoek@2.x.x",
+  "_where": "/Users/rebecca/code/npm/node_modules/hawk",
+  "bugs": {
+    "url": "https://github.com/hapijs/hoek/issues"
   },
   "dependencies": {},
+  "description": "General purpose node utilities",
   "devDependencies": {
     "code": "1.x.x",
     "lab": "5.x.x"
   },
-  "scripts": {
-    "test": "lab -a code -t 100 -L",
-    "test-cov-html": "lab -a code -t 100 -L -r html -o coverage.html"
-  },
-  "license": "BSD-3-Clause",
-  "gitHead": "20f36e85616264d4b73a64a374803175213a9121",
-  "bugs": {
-    "url": "https://github.com/hapijs/hoek/issues"
-  },
-  "homepage": "https://github.com/hapijs/hoek#readme",
-  "_id": "hoek@2.16.3",
-  "_shasum": "20bb7403d3cea398e91dc4710a8ff1b8274a25ed",
-  "_from": "hoek@>=2.0.0 <3.0.0",
-  "_npmVersion": "3.3.3",
-  "_nodeVersion": "4.1.0",
-  "_npmUser": {
-    "name": "nlf",
-    "email": "quitlahok@gmail.com"
-  },
+  "directories": {},
   "dist": {
     "shasum": "20bb7403d3cea398e91dc4710a8ff1b8274a25ed",
     "tarball": "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
   },
+  "engines": {
+    "node": ">=0.10.40"
+  },
+  "gitHead": "20f36e85616264d4b73a64a374803175213a9121",
+  "homepage": "https://github.com/hapijs/hoek#readme",
+  "installable": true,
+  "keywords": [
+    "utilities"
+  ],
+  "license": "BSD-3-Clause",
+  "main": "lib/index.js",
   "maintainers": [
     {
       "name": "hueniverse",
@@ -55,7 +73,15 @@
       "email": "quitlahok@gmail.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "hoek",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/hapijs/hoek.git"
+  },
+  "scripts": {
+    "test": "lab -a code -t 100 -L",
+    "test-cov-html": "lab -a code -t 100 -L -r html -o coverage.html"
+  },
+  "version": "2.16.3"
 }
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/escaper.js b/deps/npm/node_modules/hoek/test/escaper.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/escaper.js
rename to deps/npm/node_modules/hoek/test/escaper.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/index.js b/deps/npm/node_modules/hoek/test/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/index.js
rename to deps/npm/node_modules/hoek/test/index.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/ignore.txt b/deps/npm/node_modules/hoek/test/modules/ignore.txt
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/ignore.txt
rename to deps/npm/node_modules/hoek/test/modules/ignore.txt
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test1.js b/deps/npm/node_modules/hoek/test/modules/test1.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test1.js
rename to deps/npm/node_modules/hoek/test/modules/test1.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test2.js b/deps/npm/node_modules/hoek/test/modules/test2.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test2.js
rename to deps/npm/node_modules/hoek/test/modules/test2.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test3.js b/deps/npm/node_modules/hoek/test/modules/test3.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test3.js
rename to deps/npm/node_modules/hoek/test/modules/test3.js
diff --git a/deps/npm/node_modules/hosted-git-info/package.json b/deps/npm/node_modules/hosted-git-info/package.json
index 8d34aca2d72223..e77f5f18329c69 100644
--- a/deps/npm/node_modules/hosted-git-info/package.json
+++ b/deps/npm/node_modules/hosted-git-info/package.json
@@ -1,49 +1,68 @@
 {
-  "name": "hosted-git-info",
-  "version": "2.1.4",
-  "description": "Provides metadata and conversions from repository urls for Github, Bitbucket and Gitlab",
-  "main": "index.js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/hosted-git-info.git"
+  "_args": [
+    [
+      "hosted-git-info@~2.1.4",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "hosted-git-info@>=2.1.4 <2.2.0",
+  "_id": "hosted-git-info@2.1.4",
+  "_inCache": true,
+  "_location": "/hosted-git-info",
+  "_nodeVersion": "2.0.2",
+  "_npmUser": {
+    "email": "ogd@aoaioxxysz.net",
+    "name": "othiym23"
   },
-  "keywords": [
-    "git",
-    "github",
-    "bitbucket",
-    "gitlab"
+  "_npmVersion": "2.10.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "hosted-git-info",
+    "raw": "hosted-git-info@~2.1.4",
+    "rawSpec": "~2.1.4",
+    "scope": null,
+    "spec": ">=2.1.4 <2.2.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/",
+    "/normalize-package-data",
+    "/npm-package-arg"
   ],
+  "_resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz",
+  "_shasum": "d9e953b26988be88096c46e926494d9604c300f8",
+  "_shrinkwrap": null,
+  "_spec": "hosted-git-info@~2.1.4",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Rebecca Turner",
     "email": "me@re-becca.org",
+    "name": "Rebecca Turner",
     "url": "http://re-becca.org"
   },
-  "license": "ISC",
   "bugs": {
     "url": "https://github.com/npm/hosted-git-info/issues"
   },
-  "homepage": "https://github.com/npm/hosted-git-info",
-  "scripts": {
-    "test": "standard && tap test/*.js"
-  },
+  "dependencies": {},
+  "description": "Provides metadata and conversions from repository urls for Github, Bitbucket and Gitlab",
   "devDependencies": {
     "standard": "^3.3.2",
     "tap": "^0.4.13"
   },
-  "gitHead": "9e1a36df8eb050a663713c79e56d89dadba2bd8d",
-  "_id": "hosted-git-info@2.1.4",
-  "_shasum": "d9e953b26988be88096c46e926494d9604c300f8",
-  "_from": "hosted-git-info@>=2.1.2 <2.2.0",
-  "_npmVersion": "2.10.1",
-  "_nodeVersion": "2.0.2",
-  "_npmUser": {
-    "name": "othiym23",
-    "email": "ogd@aoaioxxysz.net"
-  },
+  "directories": {},
   "dist": {
     "shasum": "d9e953b26988be88096c46e926494d9604c300f8",
     "tarball": "http://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
   },
+  "gitHead": "9e1a36df8eb050a663713c79e56d89dadba2bd8d",
+  "homepage": "https://github.com/npm/hosted-git-info",
+  "keywords": [
+    "bitbucket",
+    "git",
+    "github",
+    "gitlab"
+  ],
+  "license": "ISC",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "iarna",
@@ -54,6 +73,14 @@
       "email": "ogd@aoaioxxysz.net"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+  "name": "hosted-git-info",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/hosted-git-info.git"
+  },
+  "scripts": {
+    "test": "standard && tap test/*.js"
+  },
+  "version": "2.1.4"
 }
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/.dir-locals.el b/deps/npm/node_modules/http-signature/.dir-locals.el
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/.dir-locals.el
rename to deps/npm/node_modules/http-signature/.dir-locals.el
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/.npmignore b/deps/npm/node_modules/http-signature/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/.npmignore
rename to deps/npm/node_modules/http-signature/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/LICENSE b/deps/npm/node_modules/http-signature/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/LICENSE
rename to deps/npm/node_modules/http-signature/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/README.md b/deps/npm/node_modules/http-signature/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/README.md
rename to deps/npm/node_modules/http-signature/README.md
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/http_signing.md b/deps/npm/node_modules/http-signature/http_signing.md
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/http-signature/http_signing.md
rename to deps/npm/node_modules/http-signature/http_signing.md
index dd81ee5b59e08f..8108885015d4cb 100644
--- a/deps/npm/node_modules/request/node_modules/http-signature/http_signing.md
+++ b/deps/npm/node_modules/http-signature/http_signing.md
@@ -293,4 +293,3 @@ inserted for readability):
 The Authorization header would be:
 
     Authorization: Signature keyId="Test",algorithm="rsa-sha256",headers="request-line host date content-type content-md5 content-length",signature="H/AaTDkJvLELy4i1RujnKlS6dm8QWiJvEpn9cKRMi49kKF+mohZ15z1r+mF+XiKS5kOOscyS83olfBtsVhYjPg2Ei3/D9D4Mvb7bFm9IaLJgYTFFuQCghrKQQFPiqJN320emjHxFowpIm1BkstnEU7lktH/XdXVBo8a6Uteiztw="
-
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/lib/index.js b/deps/npm/node_modules/http-signature/lib/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/lib/index.js
rename to deps/npm/node_modules/http-signature/lib/index.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/lib/parser.js b/deps/npm/node_modules/http-signature/lib/parser.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/lib/parser.js
rename to deps/npm/node_modules/http-signature/lib/parser.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/lib/signer.js b/deps/npm/node_modules/http-signature/lib/signer.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/lib/signer.js
rename to deps/npm/node_modules/http-signature/lib/signer.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/lib/util.js b/deps/npm/node_modules/http-signature/lib/util.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/lib/util.js
rename to deps/npm/node_modules/http-signature/lib/util.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/lib/verify.js b/deps/npm/node_modules/http-signature/lib/verify.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/http-signature/lib/verify.js
rename to deps/npm/node_modules/http-signature/lib/verify.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/package.json b/deps/npm/node_modules/http-signature/package.json
similarity index 71%
rename from deps/npm/node_modules/request/node_modules/http-signature/package.json
rename to deps/npm/node_modules/http-signature/package.json
index 47d76cffcf9187..910f8118114417 100644
--- a/deps/npm/node_modules/request/node_modules/http-signature/package.json
+++ b/deps/npm/node_modules/http-signature/package.json
@@ -1,11 +1,43 @@
 {
-  "name": "http-signature",
-  "description": "Reference implementation of Joyent's HTTP Signature scheme.",
-  "version": "0.11.0",
-  "license": "MIT",
+  "_args": [
+    [
+      "http-signature@~0.11.0",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
+  ],
+  "_from": "http-signature@>=0.11.0 <0.12.0",
+  "_id": "http-signature@0.11.0",
+  "_inCache": true,
+  "_location": "/http-signature",
+  "_nodeVersion": "0.10.36",
+  "_npmUser": {
+    "email": "patrick.f.mooney@gmail.com",
+    "name": "pfmooney"
+  },
+  "_npmVersion": "2.5.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "http-signature",
+    "raw": "http-signature@~0.11.0",
+    "rawSpec": "~0.11.0",
+    "scope": null,
+    "spec": ">=0.11.0 <0.12.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/request"
+  ],
+  "_resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz",
+  "_shasum": "1796cf67a001ad5cd6849dca0991485f09089fe6",
+  "_shrinkwrap": null,
+  "_spec": "http-signature@~0.11.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
   "author": {
     "name": "Joyent, Inc"
   },
+  "bugs": {
+    "url": "https://github.com/joyent/node-http-signature/issues"
+  },
   "contributors": [
     {
       "name": "Mark Cavage",
@@ -20,44 +52,31 @@
       "email": "patrick.f.mooney@gmail.com"
     }
   ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/joyent/node-http-signature.git"
-  },
-  "homepage": "https://github.com/joyent/node-http-signature/",
-  "bugs": {
-    "url": "https://github.com/joyent/node-http-signature/issues"
-  },
-  "keywords": [
-    "https",
-    "request"
-  ],
-  "engines": {
-    "node": ">=0.8"
-  },
-  "main": "lib/index.js",
-  "scripts": {
-    "test": "tap test/*.js"
-  },
   "dependencies": {
-    "assert-plus": "^0.1.5",
     "asn1": "0.1.11",
+    "assert-plus": "^0.1.5",
     "ctype": "0.5.3"
   },
+  "description": "Reference implementation of Joyent's HTTP Signature scheme.",
   "devDependencies": {
     "node-uuid": "^1.4.1",
     "tap": "0.4.2"
   },
-  "_id": "http-signature@0.11.0",
-  "_shasum": "1796cf67a001ad5cd6849dca0991485f09089fe6",
-  "_resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz",
-  "_from": "http-signature@>=0.11.0 <0.12.0",
-  "_npmVersion": "2.5.1",
-  "_nodeVersion": "0.10.36",
-  "_npmUser": {
-    "name": "pfmooney",
-    "email": "patrick.f.mooney@gmail.com"
+  "directories": {},
+  "dist": {
+    "shasum": "1796cf67a001ad5cd6849dca0991485f09089fe6",
+    "tarball": "http://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"
   },
+  "engines": {
+    "node": ">=0.8"
+  },
+  "homepage": "https://github.com/joyent/node-http-signature/",
+  "keywords": [
+    "https",
+    "request"
+  ],
+  "license": "MIT",
+  "main": "lib/index.js",
   "maintainers": [
     {
       "name": "mcavage",
@@ -68,10 +87,14 @@
       "email": "patrick.f.mooney@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "1796cf67a001ad5cd6849dca0991485f09089fe6",
-    "tarball": "http://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"
+  "name": "http-signature",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/joyent/node-http-signature.git"
   },
-  "directories": {},
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "0.11.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/.npmignore b/deps/npm/node_modules/iferr/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/.npmignore
rename to deps/npm/node_modules/iferr/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/license.md b/deps/npm/node_modules/iferr/LICENSE
similarity index 87%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/license.md
rename to deps/npm/node_modules/iferr/LICENSE
index c67e3532b54245..19d5f4bce547ba 100644
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/license.md
+++ b/deps/npm/node_modules/iferr/LICENSE
@@ -1,4 +1,6 @@
-# Copyright (c) 2015 Calvin Metcalf
+The MIT License (MIT)
+
+Copyright (c) 2014 Nadav Ivgi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -10,10 +12,10 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-**THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.**
+SOFTWARE.
\ No newline at end of file
diff --git a/deps/npm/node_modules/iferr/README.md b/deps/npm/node_modules/iferr/README.md
new file mode 100644
index 00000000000000..0940763fa94137
--- /dev/null
+++ b/deps/npm/node_modules/iferr/README.md
@@ -0,0 +1,40 @@
+# iferr
+
+Higher-order functions for easier error handling.
+
+`if (err) return cb(err);` be gone!
+
+## Install
+```bash
+npm install iferr
+```
+
+## Use
+
+### JavaScript example
+```js
+var iferr = require('iferr');
+
+function get_friends_count(id, cb) {
+  User.load_user(id, iferr(cb, function(user) {
+    user.load_friends(iferr(cb, function(friends) {
+      cb(null, friends.length);
+    }));
+  }));
+}
+```
+
+### CoffeeScript example
+```coffee
+iferr = require 'iferr'
+
+get_friends_count = (id, cb) ->
+  User.load_user id, iferr cb, (user) ->
+    user.load_friends iferr cb, (friends) ->
+      cb null, friends.length
+```
+
+(TODO: document tiferr, throwerr and printerr)
+
+## License
+MIT
diff --git a/deps/npm/node_modules/iferr/index.coffee b/deps/npm/node_modules/iferr/index.coffee
new file mode 100644
index 00000000000000..da6d00719f10c4
--- /dev/null
+++ b/deps/npm/node_modules/iferr/index.coffee
@@ -0,0 +1,24 @@
+# Delegates to `succ` on sucecss or to `fail` on error
+# ex: Thing.load 123, iferr cb, (thing) -> ...
+iferr = (fail, succ) -> (err, a...) ->
+  if err? then fail err
+  else succ? a...
+
+# Like iferr, but also catches errors thrown from `succ` and passes to `fail`
+tiferr = (fail, succ) -> iferr fail, (a...) ->
+  try succ a...
+  catch err then fail err
+
+# Delegate to the success function on success, or throw the error otherwise
+# ex: Thing.load 123, throwerr (thing) -> ...
+throwerr = iferr.bind null, (err) -> throw err
+
+# Prints errors when one is passed, or does nothing otherwise
+# ex: thing.save printerr
+printerr = iferr (err) -> console.error err.stack or err
+
+module.exports = exports = iferr
+exports.iferr = iferr
+exports.tiferr = tiferr
+exports.throwerr = throwerr
+exports.printerr = printerr
diff --git a/deps/npm/node_modules/iferr/index.js b/deps/npm/node_modules/iferr/index.js
new file mode 100644
index 00000000000000..78fce3d2b0965a
--- /dev/null
+++ b/deps/npm/node_modules/iferr/index.js
@@ -0,0 +1,49 @@
+// Generated by CoffeeScript 1.7.1
+(function() {
+  var exports, iferr, printerr, throwerr, tiferr,
+    __slice = [].slice;
+
+  iferr = function(fail, succ) {
+    return function() {
+      var a, err;
+      err = arguments[0], a = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+      if (err != null) {
+        return fail(err);
+      } else {
+        return typeof succ === "function" ? succ.apply(null, a) : void 0;
+      }
+    };
+  };
+
+  tiferr = function(fail, succ) {
+    return iferr(fail, function() {
+      var a, err;
+      a = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+      try {
+        return succ.apply(null, a);
+      } catch (_error) {
+        err = _error;
+        return fail(err);
+      }
+    });
+  };
+
+  throwerr = iferr.bind(null, function(err) {
+    throw err;
+  });
+
+  printerr = iferr(function(err) {
+    return console.error(err.stack || err);
+  });
+
+  module.exports = exports = iferr;
+
+  exports.iferr = iferr;
+
+  exports.tiferr = tiferr;
+
+  exports.throwerr = throwerr;
+
+  exports.printerr = printerr;
+
+}).call(this);
diff --git a/deps/npm/node_modules/iferr/package.json b/deps/npm/node_modules/iferr/package.json
new file mode 100644
index 00000000000000..f746e2862c9125
--- /dev/null
+++ b/deps/npm/node_modules/iferr/package.json
@@ -0,0 +1,75 @@
+{
+  "_args": [
+    [
+      "iferr@~0.1.5",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "iferr@>=0.1.5 <0.2.0",
+  "_id": "iferr@0.1.5",
+  "_inCache": true,
+  "_location": "/iferr",
+  "_npmUser": {
+    "email": "npm@shesek.info",
+    "name": "nadav"
+  },
+  "_npmVersion": "1.4.4",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "iferr",
+    "raw": "iferr@~0.1.5",
+    "rawSpec": "~0.1.5",
+    "scope": null,
+    "spec": ">=0.1.5 <0.2.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+  "_shasum": "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501",
+  "_shrinkwrap": null,
+  "_spec": "iferr@~0.1.5",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "name": "Nadav Ivgi"
+  },
+  "bugs": {
+    "url": "https://github.com/shesek/iferr/issues"
+  },
+  "dependencies": {},
+  "description": "Higher-order functions for easier error handling",
+  "devDependencies": {
+    "coffee-script": "^1.7.1",
+    "mocha": "^1.18.2"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501",
+    "tarball": "http://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"
+  },
+  "homepage": "https://github.com/shesek/iferr",
+  "keywords": [
+    "error",
+    "errors"
+  ],
+  "license": "MIT",
+  "main": "index.js",
+  "maintainers": [
+    {
+      "name": "nadav",
+      "email": "npm@shesek.info"
+    }
+  ],
+  "name": "iferr",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/shesek/iferr"
+  },
+  "scripts": {
+    "prepublish": "coffee -c index.coffee",
+    "test": "mocha"
+  },
+  "version": "0.1.5"
+}
diff --git a/deps/npm/node_modules/iferr/test/index.coffee b/deps/npm/node_modules/iferr/test/index.coffee
new file mode 100644
index 00000000000000..be0bc56fdf1b96
--- /dev/null
+++ b/deps/npm/node_modules/iferr/test/index.coffee
@@ -0,0 +1,42 @@
+{ iferr, tiferr, throwerr } = require '../index.coffee'
+{ equal: eq, throws } = require 'assert'
+
+invoke_fail = (cb) -> cb new Error 'callback error'
+invoke_succ = (cb) -> cb null
+throw_error = -> throw new Error 'thrown'
+
+describe 'iferr', ->
+  it 'calls the error callback on errors', (done) ->
+    invoke_fail iferr(
+      (err) ->
+        eq err.message, 'callback error'
+        do done
+      ->
+        done new Error 'shouldn\'t call the success callback'
+    )
+
+  it 'calls the success callback on success', (done) ->
+    invoke_succ iferr(
+      -> done new Error 'shouldn\'t call the error callback'
+      done
+    )
+
+describe 'tiferr', ->
+  it 'catches errors in the success callback', (done) ->
+    invoke_succ tiferr(
+      (err) ->
+        eq err.message, 'thrown'
+        do done
+      throw_error
+    )
+
+describe 'throwerr', ->
+  it 'throws errors passed to the callback', (done)->
+    try invoke_fail throwerr ->
+      done 'shouldn\'t call the success callback'
+    catch err
+      eq err.message, 'callback error'
+      do done
+
+  it 'delegates to the success callback otherwise', (done) ->
+    invoke_succ throwerr done
diff --git a/deps/npm/node_modules/iferr/test/mocha.opts b/deps/npm/node_modules/iferr/test/mocha.opts
new file mode 100644
index 00000000000000..019defcf152a84
--- /dev/null
+++ b/deps/npm/node_modules/iferr/test/mocha.opts
@@ -0,0 +1,2 @@
+--compilers coffee:coffee-script/register
+--reporter spec
diff --git a/deps/npm/node_modules/inflight/package.json b/deps/npm/node_modules/inflight/package.json
index e0b63729cc6dc8..7e3c816bd39ea4 100644
--- a/deps/npm/node_modules/inflight/package.json
+++ b/deps/npm/node_modules/inflight/package.json
@@ -1,36 +1,87 @@
 {
-  "name": "inflight",
-  "version": "1.0.4",
-  "description": "Add callbacks to requests in flight to avoid async duplication",
-  "main": "inflight.js",
+  "_args": [
+    [
+      "inflight@~1.0.4",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "inflight@>=1.0.4 <1.1.0",
+  "_id": "inflight@1.0.4",
+  "_inCache": true,
+  "_location": "/inflight",
+  "_nodeVersion": "0.10.32",
+  "_npmUser": {
+    "email": "ogd@aoaioxxysz.net",
+    "name": "othiym23"
+  },
+  "_npmVersion": "2.1.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "inflight",
+    "raw": "inflight@~1.0.4",
+    "rawSpec": "~1.0.4",
+    "scope": null,
+    "spec": ">=1.0.4 <1.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/",
+    "/glob",
+    "/node-gyp/glob",
+    "/rimraf/glob"
+  ],
+  "_resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+  "_shasum": "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a",
+  "_shrinkwrap": null,
+  "_spec": "inflight@~1.0.4",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
+    "url": "http://blog.izs.me/"
+  },
+  "bugs": {
+    "url": "https://github.com/isaacs/inflight/issues"
+  },
   "dependencies": {
     "once": "^1.3.0",
     "wrappy": "1"
   },
+  "description": "Add callbacks to requests in flight to avoid async duplication",
   "devDependencies": {
     "tap": "^0.4.10"
   },
-  "scripts": {
-    "test": "tap test.js"
+  "directories": {},
+  "dist": {
+    "shasum": "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a",
+    "tarball": "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"
   },
+  "gitHead": "c7b5531d572a867064d4a1da9e013e8910b7d1ba",
+  "homepage": "https://github.com/isaacs/inflight",
+  "license": "ISC",
+  "main": "inflight.js",
+  "maintainers": [
+    {
+      "name": "isaacs",
+      "email": "i@izs.me"
+    },
+    {
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
+    },
+    {
+      "name": "iarna",
+      "email": "me@re-becca.org"
+    }
+  ],
+  "name": "inflight",
+  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/inflight"
   },
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/inflight/issues"
+  "scripts": {
+    "test": "tap test.js"
   },
-  "homepage": "https://github.com/isaacs/inflight",
-  "license": "ISC",
-  "readme": "# inflight\n\nAdd callbacks to requests in flight to avoid async duplication\n\n## USAGE\n\n```javascript\nvar inflight = require('inflight')\n\n// some request that does some stuff\nfunction req(key, callback) {\n  // key is any random string.  like a url or filename or whatever.\n  //\n  // will return either a falsey value, indicating that the\n  // request for this key is already in flight, or a new callback\n  // which when called will call all callbacks passed to inflightk\n  // with the same key\n  callback = inflight(key, callback)\n\n  // If we got a falsey value back, then there's already a req going\n  if (!callback) return\n\n  // this is where you'd fetch the url or whatever\n  // callback is also once()-ified, so it can safely be assigned\n  // to multiple events etc.  First call wins.\n  setTimeout(function() {\n    callback(null, key)\n  }, 100)\n}\n\n// only assigns a single setTimeout\n// when it dings, all cbs get called\nreq('foo', cb1)\nreq('foo', cb2)\nreq('foo', cb3)\nreq('foo', cb4)\n```\n",
-  "readmeFilename": "README.md",
-  "gitHead": "c7b5531d572a867064d4a1da9e013e8910b7d1ba",
-  "_id": "inflight@1.0.4",
-  "_shasum": "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a",
-  "_from": "inflight@>=1.0.4 <1.1.0"
+  "version": "1.0.4"
 }
diff --git a/deps/npm/node_modules/inherits/package.json b/deps/npm/node_modules/inherits/package.json
index a0cd42683614fd..9407a1962e3b71 100644
--- a/deps/npm/node_modules/inherits/package.json
+++ b/deps/npm/node_modules/inherits/package.json
@@ -1,51 +1,87 @@
 {
-  "name": "inherits",
-  "description": "Browser-friendly inheritance fully compatible with standard node.js inherits()",
-  "version": "2.0.1",
-  "keywords": [
-    "inheritance",
-    "class",
-    "klass",
-    "oop",
-    "object-oriented",
-    "inherits",
-    "browser",
-    "browserify"
+  "_args": [
+    [
+      "inherits@~2.0.1",
+      "/Users/rebecca/code/npm"
+    ]
   ],
-  "main": "./inherits.js",
-  "browser": "./inherits_browser.js",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/inherits"
+  "_from": "inherits@>=2.0.1 <2.1.0",
+  "_id": "inherits@2.0.1",
+  "_inCache": true,
+  "_location": "/inherits",
+  "_npmUser": {
+    "email": "i@izs.me",
+    "name": "isaacs"
   },
-  "license": "ISC",
-  "scripts": {
-    "test": "node test"
+  "_npmVersion": "1.3.8",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "inherits",
+    "raw": "inherits@~2.0.1",
+    "rawSpec": "~2.0.1",
+    "scope": null,
+    "spec": ">=2.0.1 <2.1.0",
+    "type": "range"
   },
-  "readme": "Browser-friendly inheritance fully compatible with standard node.js\n[inherits](http://nodejs.org/api/util.html#util_util_inherits_constructor_superconstructor).\n\nThis package exports standard `inherits` from node.js `util` module in\nnode environment, but also provides alternative browser-friendly\nimplementation through [browser\nfield](https://gist.github.com/shtylman/4339901). Alternative\nimplementation is a literal copy of standard one located in standalone\nmodule to avoid requiring of `util`. It also has a shim for old\nbrowsers with no `Object.create` support.\n\nWhile keeping you sure you are using standard `inherits`\nimplementation in node.js environment, it allows bundlers such as\n[browserify](https://github.com/substack/node-browserify) to not\ninclude full `util` package to your client code if all you need is\njust `inherits` function. It worth, because browser shim for `util`\npackage is large and `inherits` is often the single function you need\nfrom it.\n\nIt's recommended to use this package instead of\n`require('util').inherits` for any code that has chances to be used\nnot only in node.js but in browser too.\n\n## usage\n\n```js\nvar inherits = require('inherits');\n// then use exactly as the standard one\n```\n\n## note on version ~1.0\n\nVersion ~1.0 had completely different motivation and is not compatible\nneither with 2.0 nor with standard node.js `inherits`.\n\nIf you are using version ~1.0 and planning to switch to ~2.0, be\ncareful:\n\n* new version uses `super_` instead of `super` for referencing\n  superclass\n* new version overwrites current prototype while old one preserves any\n  existing fields on it\n",
-  "readmeFilename": "README.md",
+  "_requiredBy": [
+    "/",
+    "/bl/readable-stream",
+    "/block-stream",
+    "/concat-stream",
+    "/concat-stream/readable-stream",
+    "/fstream",
+    "/fstream-ignore",
+    "/fstream-npm",
+    "/glob",
+    "/node-gyp/glob",
+    "/node-gyp/tar",
+    "/readable-stream",
+    "/rimraf/glob",
+    "/tar"
+  ],
+  "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+  "_shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1",
+  "_shrinkwrap": null,
+  "_spec": "inherits@~2.0.1",
+  "_where": "/Users/rebecca/code/npm",
+  "browser": "./inherits_browser.js",
   "bugs": {
     "url": "https://github.com/isaacs/inherits/issues"
   },
-  "_id": "inherits@2.0.1",
+  "dependencies": {},
+  "description": "Browser-friendly inheritance fully compatible with standard node.js inherits()",
+  "devDependencies": {},
+  "directories": {},
   "dist": {
     "shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1",
     "tarball": "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
   },
-  "_from": "inherits@latest",
-  "_npmVersion": "1.3.8",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "i@izs.me"
-  },
+  "keywords": [
+    "browser",
+    "browserify",
+    "class",
+    "inheritance",
+    "inherits",
+    "klass",
+    "object-oriented",
+    "oop"
+  ],
+  "license": "ISC",
+  "main": "./inherits.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "directories": {},
-  "_shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1",
-  "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-  "homepage": "https://github.com/isaacs/inherits"
+  "name": "inherits",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/inherits"
+  },
+  "scripts": {
+    "test": "node test"
+  },
+  "version": "2.0.1"
 }
diff --git a/deps/npm/node_modules/ini/package.json b/deps/npm/node_modules/ini/package.json
index e9b9d5396c0e09..ca9e5bfd546f6c 100644
--- a/deps/npm/node_modules/ini/package.json
+++ b/deps/npm/node_modules/ini/package.json
@@ -1,56 +1,80 @@
 {
+  "_args": [
+    [
+      "ini@~1.3.4",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "ini@>=1.3.4 <1.4.0",
+  "_id": "ini@1.3.4",
+  "_inCache": true,
+  "_location": "/ini",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
+  },
+  "_npmVersion": "2.10.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "ini",
+    "raw": "ini@~1.3.4",
+    "rawSpec": "~1.3.4",
+    "scope": null,
+    "spec": ">=1.3.4 <1.4.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/",
+    "/config-chain"
+  ],
+  "_resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+  "_shasum": "0537cb79daf59b59a1a517dff706c86ec039162e",
+  "_shrinkwrap": null,
+  "_spec": "ini@~1.3.4",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "name": "ini",
+  "bugs": {
+    "url": "https://github.com/isaacs/ini/issues"
+  },
+  "dependencies": {},
   "description": "An ini encoder/decoder for node",
-  "version": "1.3.4",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/ini.git"
+  "devDependencies": {
+    "tap": "^1.2.0"
   },
-  "main": "ini.js",
-  "scripts": {
-    "test": "tap test/*.js"
+  "directories": {},
+  "dist": {
+    "shasum": "0537cb79daf59b59a1a517dff706c86ec039162e",
+    "tarball": "http://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
   },
   "engines": {
     "node": "*"
   },
-  "dependencies": {},
-  "devDependencies": {
-    "tap": "^1.2.0"
-  },
-  "license": "ISC",
   "files": [
     "ini.js"
   ],
   "gitHead": "4a3001abc4c608e51add9f1d2b2cadf02b8e6dea",
-  "bugs": {
-    "url": "https://github.com/isaacs/ini/issues"
-  },
   "homepage": "https://github.com/isaacs/ini#readme",
-  "_id": "ini@1.3.4",
-  "_shasum": "0537cb79daf59b59a1a517dff706c86ec039162e",
-  "_from": "ini@latest",
-  "_npmVersion": "2.10.1",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
-  },
-  "dist": {
-    "shasum": "0537cb79daf59b59a1a517dff706c86ec039162e",
-    "tarball": "http://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-  },
+  "license": "ISC",
+  "main": "ini.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "ini",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/ini.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.3.4"
 }
diff --git a/deps/npm/node_modules/init-package-json/package.json b/deps/npm/node_modules/init-package-json/package.json
index 0cc543ece404f1..a3ee5eea9fed45 100644
--- a/deps/npm/node_modules/init-package-json/package.json
+++ b/deps/npm/node_modules/init-package-json/package.json
@@ -1,21 +1,48 @@
 {
-  "name": "init-package-json",
-  "version": "1.9.1",
-  "main": "init-package-json.js",
-  "scripts": {
-    "test": "tap test/*.js"
+  "_args": [
+    [
+      "init-package-json@~1.9.1",
+      "/Users/ogd/Documents/projects/npm/npm"
+    ]
+  ],
+  "_from": "init-package-json@>=1.9.1 <1.10.0",
+  "_id": "init-package-json@1.9.1",
+  "_inCache": true,
+  "_location": "/init-package-json",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "email": "kat@sykosomatic.org",
+    "name": "zkat"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/init-package-json.git"
+  "_npmVersion": "2.14.1",
+  "_phantomChildren": {
+    "spdx-correct": "1.0.0",
+    "spdx-expression-parse": "1.0.0"
   },
+  "_requested": {
+    "name": "init-package-json",
+    "raw": "init-package-json@~1.9.1",
+    "rawSpec": "~1.9.1",
+    "scope": null,
+    "spec": ">=1.9.1 <1.10.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz",
+  "_shasum": "a28e05b5baeb3363cd473df68d30d3a80523a31c",
+  "_shrinkwrap": null,
+  "_spec": "init-package-json@~1.9.1",
+  "_where": "/Users/ogd/Documents/projects/npm/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "license": "ISC",
-  "description": "A node module to get your node module started",
+  "bugs": {
+    "url": "https://github.com/isaacs/init-package-json/issues"
+  },
   "dependencies": {
     "glob": "^5.0.3",
     "npm-package-arg": "^4.0.0",
@@ -26,39 +53,32 @@
     "validate-npm-package-license": "^3.0.1",
     "validate-npm-package-name": "^2.0.1"
   },
+  "description": "A node module to get your node module started",
   "devDependencies": {
     "npm": "^2",
     "rimraf": "^2.1.4",
     "tap": "^1.2.0"
   },
+  "directories": {},
+  "dist": {
+    "shasum": "a28e05b5baeb3363cd473df68d30d3a80523a31c",
+    "tarball": "http://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz"
+  },
+  "gitHead": "37c38b4e23189eb5645901fa6851f343fddd4b73",
+  "homepage": "https://github.com/isaacs/init-package-json#readme",
+  "installable": true,
   "keywords": [
+    "helper",
     "init",
-    "package.json",
     "package",
-    "helper",
-    "wizard",
-    "wizerd",
+    "package.json",
     "prompt",
-    "start"
+    "start",
+    "wizard",
+    "wizerd"
   ],
-  "gitHead": "37c38b4e23189eb5645901fa6851f343fddd4b73",
-  "bugs": {
-    "url": "https://github.com/isaacs/init-package-json/issues"
-  },
-  "homepage": "https://github.com/isaacs/init-package-json#readme",
-  "_id": "init-package-json@1.9.1",
-  "_shasum": "a28e05b5baeb3363cd473df68d30d3a80523a31c",
-  "_from": "init-package-json@1.9.1",
-  "_npmVersion": "2.14.1",
-  "_nodeVersion": "2.2.2",
-  "_npmUser": {
-    "name": "zkat",
-    "email": "kat@sykosomatic.org"
-  },
-  "dist": {
-    "shasum": "a28e05b5baeb3363cd473df68d30d3a80523a31c",
-    "tarball": "http://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz"
-  },
+  "license": "ISC",
+  "main": "init-package-json.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -77,6 +97,14 @@
       "email": "kat@sykosomatic.org"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz"
+  "name": "init-package-json",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/init-package-json.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.9.1"
 }
diff --git a/deps/npm/node_modules/which/node_modules/is-absolute/LICENSE b/deps/npm/node_modules/is-absolute/LICENSE
similarity index 100%
rename from deps/npm/node_modules/which/node_modules/is-absolute/LICENSE
rename to deps/npm/node_modules/is-absolute/LICENSE
diff --git a/deps/npm/node_modules/which/node_modules/is-absolute/README.md b/deps/npm/node_modules/is-absolute/README.md
similarity index 100%
rename from deps/npm/node_modules/which/node_modules/is-absolute/README.md
rename to deps/npm/node_modules/is-absolute/README.md
diff --git a/deps/npm/node_modules/which/node_modules/is-absolute/index.js b/deps/npm/node_modules/is-absolute/index.js
similarity index 100%
rename from deps/npm/node_modules/which/node_modules/is-absolute/index.js
rename to deps/npm/node_modules/is-absolute/index.js
diff --git a/deps/npm/node_modules/which/node_modules/is-absolute/package.json b/deps/npm/node_modules/is-absolute/package.json
similarity index 72%
rename from deps/npm/node_modules/which/node_modules/is-absolute/package.json
rename to deps/npm/node_modules/is-absolute/package.json
index 4f954b855f11d4..28c21dd109aabc 100644
--- a/deps/npm/node_modules/which/node_modules/is-absolute/package.json
+++ b/deps/npm/node_modules/is-absolute/package.json
@@ -1,39 +1,64 @@
 {
-  "name": "is-absolute",
-  "description": "Return true if a file path is absolute.",
-  "version": "0.1.7",
-  "homepage": "https://github.com/jonschlinkert/is-absolute",
+  "_args": [
+    [
+      "is-absolute@^0.1.7",
+      "/Users/rebecca/code/npm/node_modules/which"
+    ]
+  ],
+  "_from": "is-absolute@>=0.1.7 <0.2.0",
+  "_id": "is-absolute@0.1.7",
+  "_inCache": true,
+  "_location": "/is-absolute",
+  "_nodeVersion": "0.12.0",
+  "_npmUser": {
+    "email": "github@sellside.com",
+    "name": "jonschlinkert"
+  },
+  "_npmVersion": "2.5.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "is-absolute",
+    "raw": "is-absolute@^0.1.7",
+    "rawSpec": "^0.1.7",
+    "scope": null,
+    "spec": ">=0.1.7 <0.2.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/which"
+  ],
+  "_resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
+  "_shasum": "847491119fccb5fb436217cc737f7faad50f603f",
+  "_shrinkwrap": null,
+  "_spec": "is-absolute@^0.1.7",
+  "_where": "/Users/rebecca/code/npm/node_modules/which",
   "author": {
     "name": "Jon Schlinkert",
     "url": "https://github.com/jonschlinkert"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/jonschlinkert/is-absolute.git"
-  },
   "bugs": {
     "url": "https://github.com/jonschlinkert/is-absolute/issues"
   },
-  "license": {
-    "type": "MIT",
-    "url": "https://github.com/jonschlinkert/is-absolute/blob/master/LICENSE"
-  },
-  "files": [
-    "index.js"
-  ],
-  "main": "index.js",
-  "engines": {
-    "node": ">=0.10.0"
-  },
-  "scripts": {
-    "test": "mocha"
-  },
   "dependencies": {
     "is-relative": "^0.1.0"
   },
+  "description": "Return true if a file path is absolute.",
   "devDependencies": {
     "mocha": "*"
   },
+  "directories": {},
+  "dist": {
+    "shasum": "847491119fccb5fb436217cc737f7faad50f603f",
+    "tarball": "http://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz"
+  },
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "files": [
+    "index.js"
+  ],
+  "gitHead": "90cca7b671620bf28b778a61fddc8a986a2e1095",
+  "homepage": "https://github.com/jonschlinkert/is-absolute",
   "keywords": [
     "absolute",
     "check",
@@ -50,27 +75,25 @@
     "uri",
     "url"
   ],
-  "gitHead": "90cca7b671620bf28b778a61fddc8a986a2e1095",
-  "_id": "is-absolute@0.1.7",
-  "_shasum": "847491119fccb5fb436217cc737f7faad50f603f",
-  "_from": "is-absolute@>=0.1.7 <0.2.0",
-  "_npmVersion": "2.5.1",
-  "_nodeVersion": "0.12.0",
-  "_npmUser": {
-    "name": "jonschlinkert",
-    "email": "github@sellside.com"
+  "license": {
+    "type": "MIT",
+    "url": "https://github.com/jonschlinkert/is-absolute/blob/master/LICENSE"
   },
+  "main": "index.js",
   "maintainers": [
     {
       "name": "jonschlinkert",
       "email": "github@sellside.com"
     }
   ],
-  "dist": {
-    "shasum": "847491119fccb5fb436217cc737f7faad50f603f",
-    "tarball": "http://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz"
+  "name": "is-absolute",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/jonschlinkert/is-absolute.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "mocha"
+  },
+  "version": "0.1.7"
 }
diff --git a/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/index.js b/deps/npm/node_modules/is-builtin-module/index.js
similarity index 100%
rename from deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/index.js
rename to deps/npm/node_modules/is-builtin-module/index.js
diff --git a/deps/npm/node_modules/osenv/node_modules/os-tmpdir/license b/deps/npm/node_modules/is-builtin-module/license
similarity index 100%
rename from deps/npm/node_modules/osenv/node_modules/os-tmpdir/license
rename to deps/npm/node_modules/is-builtin-module/license
diff --git a/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/package.json b/deps/npm/node_modules/is-builtin-module/package.json
similarity index 66%
rename from deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/package.json
rename to deps/npm/node_modules/is-builtin-module/package.json
index 58feefdfb8884b..925fc9d27d6625 100644
--- a/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/package.json
+++ b/deps/npm/node_modules/is-builtin-module/package.json
@@ -1,72 +1,97 @@
 {
-  "name": "is-builtin-module",
-  "version": "1.0.0",
-  "description": "Check if a string matches the name of a Node.js builtin module",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/sindresorhus/is-builtin-module"
+  "_args": [
+    [
+      "is-builtin-module@^1.0.0",
+      "/Users/rebecca/code/npm/node_modules/normalize-package-data"
+    ]
+  ],
+  "_from": "is-builtin-module@>=1.0.0 <2.0.0",
+  "_id": "is-builtin-module@1.0.0",
+  "_inCache": true,
+  "_location": "/is-builtin-module",
+  "_nodeVersion": "0.12.2",
+  "_npmUser": {
+    "email": "sindresorhus@gmail.com",
+    "name": "sindresorhus"
+  },
+  "_npmVersion": "2.7.4",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "is-builtin-module",
+    "raw": "is-builtin-module@^1.0.0",
+    "rawSpec": "^1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
   },
+  "_requiredBy": [
+    "/normalize-package-data"
+  ],
+  "_resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+  "_shasum": "540572d34f7ac3119f8f76c30cbc1b1e037affbe",
+  "_shrinkwrap": null,
+  "_spec": "is-builtin-module@^1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/normalize-package-data",
   "author": {
-    "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
+    "name": "Sindre Sorhus",
     "url": "sindresorhus.com"
   },
+  "bugs": {
+    "url": "https://github.com/sindresorhus/is-builtin-module/issues"
+  },
+  "dependencies": {
+    "builtin-modules": "^1.0.0"
+  },
+  "description": "Check if a string matches the name of a Node.js builtin module",
+  "devDependencies": {
+    "ava": "0.0.4"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "540572d34f7ac3119f8f76c30cbc1b1e037affbe",
+    "tarball": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"
+  },
   "engines": {
     "node": ">=0.10.0"
   },
-  "scripts": {
-    "test": "node test.js"
-  },
   "files": [
     "index.js"
   ],
+  "gitHead": "da55ebf031f3864c5d309e25e49ed816957d70a2",
+  "homepage": "https://github.com/sindresorhus/is-builtin-module",
+  "installable": true,
   "keywords": [
-    "builtin",
+    "array",
     "built-in",
+    "builtin",
     "builtins",
-    "node",
-    "modules",
-    "core",
     "bundled",
+    "check",
+    "core",
+    "detect",
+    "is",
     "list",
-    "array",
+    "match",
+    "modules",
     "names",
-    "is",
-    "detect",
-    "check",
-    "match"
+    "node"
   ],
-  "dependencies": {
-    "builtin-modules": "^1.0.0"
-  },
-  "devDependencies": {
-    "ava": "0.0.4"
-  },
-  "gitHead": "da55ebf031f3864c5d309e25e49ed816957d70a2",
-  "bugs": {
-    "url": "https://github.com/sindresorhus/is-builtin-module/issues"
-  },
-  "homepage": "https://github.com/sindresorhus/is-builtin-module",
-  "_id": "is-builtin-module@1.0.0",
-  "_shasum": "540572d34f7ac3119f8f76c30cbc1b1e037affbe",
-  "_from": "is-builtin-module@>=1.0.0 <2.0.0",
-  "_npmVersion": "2.7.4",
-  "_nodeVersion": "0.12.2",
-  "_npmUser": {
-    "name": "sindresorhus",
-    "email": "sindresorhus@gmail.com"
-  },
-  "dist": {
-    "shasum": "540572d34f7ac3119f8f76c30cbc1b1e037affbe",
-    "tarball": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"
-  },
+  "license": "MIT",
   "maintainers": [
     {
       "name": "sindresorhus",
       "email": "sindresorhus@gmail.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"
+  "name": "is-builtin-module",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/sindresorhus/is-builtin-module"
+  },
+  "scripts": {
+    "test": "node test.js"
+  },
+  "version": "1.0.0"
 }
diff --git a/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/readme.md b/deps/npm/node_modules/is-builtin-module/readme.md
similarity index 100%
rename from deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/readme.md
rename to deps/npm/node_modules/is-builtin-module/readme.md
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/.npmignore b/deps/npm/node_modules/is-my-json-valid/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/.npmignore
rename to deps/npm/node_modules/is-my-json-valid/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/.travis.yml b/deps/npm/node_modules/is-my-json-valid/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/.travis.yml
rename to deps/npm/node_modules/is-my-json-valid/.travis.yml
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/LICENSE b/deps/npm/node_modules/is-my-json-valid/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/LICENSE
rename to deps/npm/node_modules/is-my-json-valid/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/README.md b/deps/npm/node_modules/is-my-json-valid/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/README.md
rename to deps/npm/node_modules/is-my-json-valid/README.md
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/example.js b/deps/npm/node_modules/is-my-json-valid/example.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/example.js
rename to deps/npm/node_modules/is-my-json-valid/example.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/formats.js b/deps/npm/node_modules/is-my-json-valid/formats.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/formats.js
rename to deps/npm/node_modules/is-my-json-valid/formats.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/index.js b/deps/npm/node_modules/is-my-json-valid/index.js
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/index.js
rename to deps/npm/node_modules/is-my-json-valid/index.js
index 7820e6497b5af1..b01417d3e558e0 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/index.js
+++ b/deps/npm/node_modules/is-my-json-valid/index.js
@@ -190,7 +190,7 @@ var compile = function(schema, cache, root, reporter, opts) {
         validate('for (var %s = %d; %s < %s.length; %s++) {', i, node.items.length, i, name, i)
         visit(name+'['+i+']', node.additionalItems, reporter, filter)
         validate('}')
-      }   
+      }
     }
 
     if (node.format && fmts[node.format]) {
@@ -395,7 +395,7 @@ var compile = function(schema, cache, root, reporter, opts) {
       node.anyOf.forEach(function(sch, i) {
         if (i === 0) {
           validate('var %s = errors', prev)
-        } else {          
+        } else {
           validate('if (errors !== %s) {', prev)
             ('errors = %s', prev)
         }
@@ -446,7 +446,7 @@ var compile = function(schema, cache, root, reporter, opts) {
 
     if (node.maxProperties !== undefined) {
       if (type !== 'object') validate('if (%s) {', types.object(name))
-      
+
       validate('if (Object.keys(%s).length > %d) {', name, node.maxProperties)
       error('has more properties than allowed')
       validate('}')
@@ -456,7 +456,7 @@ var compile = function(schema, cache, root, reporter, opts) {
 
     if (node.minProperties !== undefined) {
       if (type !== 'object') validate('if (%s) {', types.object(name))
-      
+
       validate('if (Object.keys(%s).length < %d) {', name, node.minProperties)
       error('has less properties than allowed')
       validate('}')
@@ -466,7 +466,7 @@ var compile = function(schema, cache, root, reporter, opts) {
 
     if (node.maxItems !== undefined) {
       if (type !== 'array') validate('if (%s) {', types.array(name))
-      
+
       validate('if (%s.length > %d) {', name, node.maxItems)
       error('has more items than allowed')
       validate('}')
@@ -476,7 +476,7 @@ var compile = function(schema, cache, root, reporter, opts) {
 
     if (node.minItems !== undefined) {
       if (type !== 'array') validate('if (%s) {', types.array(name))
-      
+
       validate('if (%s.length < %d) {', name, node.minItems)
       error('has less items than allowed')
       validate('}')
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json b/deps/npm/node_modules/is-my-json-valid/package.json
similarity index 66%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
rename to deps/npm/node_modules/is-my-json-valid/package.json
index 34a9f77acd5276..e217ecb50e4c2a 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
+++ b/deps/npm/node_modules/is-my-json-valid/package.json
@@ -1,52 +1,70 @@
 {
-  "name": "is-my-json-valid",
-  "version": "2.12.2",
-  "description": "A JSONSchema validator that uses code generation to be extremely fast",
-  "main": "index.js",
+  "_args": [
+    [
+      "is-my-json-valid@~2.12.2",
+      "/Users/ogd/Documents/projects/npm/npm"
+    ]
+  ],
+  "_from": "is-my-json-valid@>=2.12.2 <2.13.0",
+  "_id": "is-my-json-valid@2.12.2",
+  "_inCache": true,
+  "_location": "/is-my-json-valid",
+  "_nodeVersion": "2.5.0",
+  "_npmUser": {
+    "email": "mathiasbuus@gmail.com",
+    "name": "mafintosh"
+  },
+  "_npmVersion": "2.13.4",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "is-my-json-valid",
+    "raw": "is-my-json-valid@~2.12.2",
+    "rawSpec": "~2.12.2",
+    "scope": null,
+    "spec": ">=2.12.2 <2.13.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/eslint",
+    "/har-validator"
+  ],
+  "_resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz",
+  "_shasum": "0d65859318c846ce3a134402fd3fbc504272ccc9",
+  "_shrinkwrap": null,
+  "_spec": "is-my-json-valid@~2.12.2",
+  "_where": "/Users/ogd/Documents/projects/npm/npm",
+  "author": {
+    "name": "Mathias Buus"
+  },
+  "bugs": {
+    "url": "https://github.com/mafintosh/is-my-json-valid/issues"
+  },
   "dependencies": {
     "generate-function": "^2.0.0",
     "generate-object-property": "^1.1.0",
     "jsonpointer": "2.0.0",
     "xtend": "^4.0.0"
   },
+  "description": "A JSONSchema validator that uses code generation to be extremely fast",
   "devDependencies": {
     "tape": "^2.13.4"
   },
-  "scripts": {
-    "test": "tape test/*.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mafintosh/is-my-json-valid.git"
+  "directories": {},
+  "dist": {
+    "shasum": "0d65859318c846ce3a134402fd3fbc504272ccc9",
+    "tarball": "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz"
   },
+  "gitHead": "48040cf001f661bcaa31f09bdc7fe3939ac2253b",
+  "homepage": "https://github.com/mafintosh/is-my-json-valid",
+  "installable": true,
   "keywords": [
     "json",
-    "schema",
+    "jsonschema",
     "orderly",
-    "jsonschema"
+    "schema"
   ],
-  "author": {
-    "name": "Mathias Buus"
-  },
   "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/mafintosh/is-my-json-valid/issues"
-  },
-  "homepage": "https://github.com/mafintosh/is-my-json-valid",
-  "gitHead": "48040cf001f661bcaa31f09bdc7fe3939ac2253b",
-  "_id": "is-my-json-valid@2.12.2",
-  "_shasum": "0d65859318c846ce3a134402fd3fbc504272ccc9",
-  "_from": "is-my-json-valid@>=2.12.0 <3.0.0",
-  "_npmVersion": "2.13.4",
-  "_nodeVersion": "2.5.0",
-  "_npmUser": {
-    "name": "mafintosh",
-    "email": "mathiasbuus@gmail.com"
-  },
-  "dist": {
-    "shasum": "0d65859318c846ce3a134402fd3fbc504272ccc9",
-    "tarball": "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz"
-  },
+  "main": "index.js",
   "maintainers": [
     {
       "name": "mafintosh",
@@ -61,7 +79,14 @@
       "email": "freeall@gmail.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "is-my-json-valid",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mafintosh/is-my-json-valid.git"
+  },
+  "scripts": {
+    "test": "tape test/*.js"
+  },
+  "version": "2.12.2"
 }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/require.js b/deps/npm/node_modules/is-my-json-valid/require.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/require.js
rename to deps/npm/node_modules/is-my-json-valid/require.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/fixtures/cosmic.js b/deps/npm/node_modules/is-my-json-valid/test/fixtures/cosmic.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/fixtures/cosmic.js
rename to deps/npm/node_modules/is-my-json-valid/test/fixtures/cosmic.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/additionalItems.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/additionalItems.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/additionalItems.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/additionalItems.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/additionalProperties.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/additionalProperties.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/additionalProperties.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/additionalProperties.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/allOf.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/allOf.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/allOf.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/allOf.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/anyOf.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/anyOf.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/anyOf.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/anyOf.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/bignum.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/bignum.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/bignum.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/bignum.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/default.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/default.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/default.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/default.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/definitions.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/definitions.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/definitions.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/definitions.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/dependencies.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/dependencies.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/dependencies.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/dependencies.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/enum.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/enum.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/enum.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/enum.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/format.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/format.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/format.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/format.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/items.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/items.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/items.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/items.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/maxItems.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/maxItems.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/maxItems.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/maxItems.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/maxLength.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/maxLength.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/maxLength.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/maxLength.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/maxProperties.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/maxProperties.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/maxProperties.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/maxProperties.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/maximum.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/maximum.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/maximum.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/maximum.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/minItems.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/minItems.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/minItems.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/minItems.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/minLength.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/minLength.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/minLength.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/minLength.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/minProperties.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/minProperties.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/minProperties.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/minProperties.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/minimum.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/minimum.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/minimum.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/minimum.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/multipleOf.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/multipleOf.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/multipleOf.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/multipleOf.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/not.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/not.json
similarity index 98%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/not.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/not.json
index cbb7f46bf8bc5b..f66690fe1bbff5 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/not.json
+++ b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/not.json
@@ -74,7 +74,7 @@
         "description": "forbidden property",
         "schema": {
             "properties": {
-                "foo": { 
+                "foo": {
                     "not": {}
                 }
             }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/nullAndFormat.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/nullAndFormat.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/nullAndFormat.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/nullAndFormat.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/nullAndObject.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/nullAndObject.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/nullAndObject.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/nullAndObject.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/oneOf.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/oneOf.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/oneOf.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/oneOf.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/pattern.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/pattern.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/pattern.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/pattern.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/patternProperties.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/patternProperties.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/patternProperties.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/patternProperties.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/properties.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/properties.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/properties.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/properties.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/ref.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/ref.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/ref.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/ref.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/refRemote.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/refRemote.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/refRemote.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/refRemote.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/required.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/required.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/required.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/required.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/type.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/type.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/type.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/type.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/uniqueItems.json b/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/uniqueItems.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/uniqueItems.json
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/uniqueItems.json
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema.js b/deps/npm/node_modules/is-my-json-valid/test/json-schema.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema.js
rename to deps/npm/node_modules/is-my-json-valid/test/json-schema.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/misc.js b/deps/npm/node_modules/is-my-json-valid/test/misc.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/misc.js
rename to deps/npm/node_modules/is-my-json-valid/test/misc.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/.npmignore b/deps/npm/node_modules/is-property/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/.npmignore
rename to deps/npm/node_modules/is-property/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/LICENSE b/deps/npm/node_modules/is-property/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/LICENSE
rename to deps/npm/node_modules/is-property/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/README.md b/deps/npm/node_modules/is-property/README.md
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/README.md
rename to deps/npm/node_modules/is-property/README.md
index ef1d00b62f8022..9846a8bb9fc51b 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/README.md
+++ b/deps/npm/node_modules/is-property/README.md
@@ -16,7 +16,7 @@ Install
 -------
 
     npm install is-property
-    
+
 ### `require("is-property")(str)`
 Checks if str is a property
 
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/is-property.js b/deps/npm/node_modules/is-property/is-property.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/is-property.js
rename to deps/npm/node_modules/is-property/is-property.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/package.json b/deps/npm/node_modules/is-property/package.json
similarity index 64%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/package.json
rename to deps/npm/node_modules/is-property/package.json
index 9f23619477398c..1842f7e7a24988 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/package.json
+++ b/deps/npm/node_modules/is-property/package.json
@@ -1,59 +1,82 @@
 {
-  "name": "is-property",
-  "version": "1.0.2",
-  "description": "Tests if a JSON property can be accessed using . syntax",
-  "main": "is-property.js",
-  "directories": {
-    "test": "test"
+  "_args": [
+    [
+      "is-property@^1.0.0",
+      "/Users/rebecca/code/npm/node_modules/generate-object-property"
+    ]
+  ],
+  "_from": "is-property@>=1.0.0 <2.0.0",
+  "_id": "is-property@1.0.2",
+  "_inCache": true,
+  "_location": "/is-property",
+  "_nodeVersion": "0.10.26",
+  "_npmUser": {
+    "email": "mikolalysenko@gmail.com",
+    "name": "mikolalysenko"
+  },
+  "_npmVersion": "2.1.4",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "is-property",
+    "raw": "is-property@^1.0.0",
+    "rawSpec": "^1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/generate-object-property"
+  ],
+  "_resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+  "_shasum": "57fe1c4e48474edd65b09911f26b1cd4095dda84",
+  "_shrinkwrap": null,
+  "_spec": "is-property@^1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/generate-object-property",
+  "author": {
+    "name": "Mikola Lysenko"
+  },
+  "bugs": {
+    "url": "https://github.com/mikolalysenko/is-property/issues"
   },
   "dependencies": {},
+  "description": "Tests if a JSON property can be accessed using . syntax",
   "devDependencies": {
     "tape": "~1.0.4"
   },
-  "scripts": {
-    "test": "tap test/*.js"
+  "directories": {
+    "test": "test"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/mikolalysenko/is-property.git"
+  "dist": {
+    "shasum": "57fe1c4e48474edd65b09911f26b1cd4095dda84",
+    "tarball": "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
   },
+  "gitHead": "0a85ea5b6b1264ea1cdecc6e5cf186adbb3ffc50",
+  "homepage": "https://github.com/mikolalysenko/is-property",
   "keywords": [
+    ".",
+    "[]",
+    "bracket",
+    "dot",
     "is",
-    "property",
     "json",
-    "dot",
-    "bracket",
-    ".",
-    "[]"
+    "property"
   ],
-  "author": {
-    "name": "Mikola Lysenko"
-  },
   "license": "MIT",
-  "gitHead": "0a85ea5b6b1264ea1cdecc6e5cf186adbb3ffc50",
-  "bugs": {
-    "url": "https://github.com/mikolalysenko/is-property/issues"
-  },
-  "homepage": "https://github.com/mikolalysenko/is-property",
-  "_id": "is-property@1.0.2",
-  "_shasum": "57fe1c4e48474edd65b09911f26b1cd4095dda84",
-  "_from": "is-property@>=1.0.0 <2.0.0",
-  "_npmVersion": "2.1.4",
-  "_nodeVersion": "0.10.26",
-  "_npmUser": {
-    "name": "mikolalysenko",
-    "email": "mikolalysenko@gmail.com"
-  },
+  "main": "is-property.js",
   "maintainers": [
     {
       "name": "mikolalysenko",
       "email": "mikolalysenko@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "57fe1c4e48474edd65b09911f26b1cd4095dda84",
-    "tarball": "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+  "name": "is-property",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/mikolalysenko/is-property.git"
   },
-  "_resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.0.2"
 }
diff --git a/deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/LICENSE-MIT b/deps/npm/node_modules/is-relative/LICENSE-MIT
similarity index 100%
rename from deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/LICENSE-MIT
rename to deps/npm/node_modules/is-relative/LICENSE-MIT
diff --git a/deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/README.md b/deps/npm/node_modules/is-relative/README.md
similarity index 100%
rename from deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/README.md
rename to deps/npm/node_modules/is-relative/README.md
diff --git a/deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/index.js b/deps/npm/node_modules/is-relative/index.js
similarity index 100%
rename from deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/index.js
rename to deps/npm/node_modules/is-relative/index.js
diff --git a/deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/package.json b/deps/npm/node_modules/is-relative/package.json
similarity index 69%
rename from deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/package.json
rename to deps/npm/node_modules/is-relative/package.json
index d582081dd157ca..70618409329c92 100644
--- a/deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/package.json
+++ b/deps/npm/node_modules/is-relative/package.json
@@ -1,25 +1,63 @@
 {
-  "name": "is-relative",
-  "description": "Returns `true` if the path appears to be relative.",
-  "version": "0.1.3",
-  "homepage": "https://github.com/jonschlinkert/is-relative",
+  "_args": [
+    [
+      "is-relative@^0.1.0",
+      "/Users/rebecca/code/npm/node_modules/is-absolute"
+    ]
+  ],
+  "_from": "is-relative@>=0.1.0 <0.2.0",
+  "_id": "is-relative@0.1.3",
+  "_inCache": true,
+  "_location": "/is-relative",
+  "_npmUser": {
+    "email": "github@sellside.com",
+    "name": "jonschlinkert"
+  },
+  "_npmVersion": "1.4.9",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "is-relative",
+    "raw": "is-relative@^0.1.0",
+    "rawSpec": "^0.1.0",
+    "scope": null,
+    "spec": ">=0.1.0 <0.2.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/is-absolute"
+  ],
+  "_resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
+  "_shasum": "905fee8ae86f45b3ec614bc3c15c869df0876e82",
+  "_shrinkwrap": null,
+  "_spec": "is-relative@^0.1.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/is-absolute",
   "author": {
     "name": "Jon Schlinkert",
     "url": "https://github.com/jonschlinkert"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/jonschlinkert/is-relative.git"
-  },
   "bugs": {
     "url": "https://github.com/jonschlinkert/is-relative/issues"
   },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "https://github.com/jonschlinkert/is-relative/blob/master/LICENSE-MIT"
-    }
+  "dependencies": {},
+  "description": "Returns `true` if the path appears to be relative.",
+  "devDependencies": {
+    "mocha": "*",
+    "verb": ">= 0.2.6",
+    "verb-tag-jscomments": "^0.1.4"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "905fee8ae86f45b3ec614bc3c15c869df0876e82",
+    "tarball": "http://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
+  },
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "files": [
+    "LICENSE-MIT",
+    "index.js"
   ],
+  "homepage": "https://github.com/jonschlinkert/is-relative",
   "keywords": [
     "absolute",
     "check",
@@ -36,41 +74,27 @@
     "uri",
     "url"
   ],
-  "main": "index.js",
-  "files": [
-    "index.js",
-    "LICENSE-MIT"
+  "licenses": [
+    {
+      "type": "MIT",
+      "url": "https://github.com/jonschlinkert/is-relative/blob/master/LICENSE-MIT"
+    }
   ],
-  "engines": {
-    "node": ">=0.10.0"
-  },
-  "scripts": {
-    "test": "mocha -R spec"
-  },
-  "devDependencies": {
-    "mocha": "*",
-    "verb": ">= 0.2.6",
-    "verb-tag-jscomments": "^0.1.4"
-  },
-  "_id": "is-relative@0.1.3",
-  "_shasum": "905fee8ae86f45b3ec614bc3c15c869df0876e82",
-  "_from": "is-relative@>=0.1.0 <0.2.0",
-  "_npmVersion": "1.4.9",
-  "_npmUser": {
-    "name": "jonschlinkert",
-    "email": "github@sellside.com"
-  },
+  "main": "index.js",
   "maintainers": [
     {
       "name": "jonschlinkert",
       "email": "github@sellside.com"
     }
   ],
-  "dist": {
-    "shasum": "905fee8ae86f45b3ec614bc3c15c869df0876e82",
-    "tarball": "http://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
+  "name": "is-relative",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/jonschlinkert/is-relative.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "mocha -R spec"
+  },
+  "version": "0.1.3"
 }
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/README.md b/deps/npm/node_modules/isarray/README.md
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/README.md
rename to deps/npm/node_modules/isarray/README.md
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/build/build.js b/deps/npm/node_modules/isarray/build/build.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/build/build.js
rename to deps/npm/node_modules/isarray/build/build.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/component.json b/deps/npm/node_modules/isarray/component.json
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/component.json
rename to deps/npm/node_modules/isarray/component.json
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/index.js b/deps/npm/node_modules/isarray/index.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/index.js
rename to deps/npm/node_modules/isarray/index.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/package.json b/deps/npm/node_modules/isarray/package.json
similarity index 59%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/package.json
rename to deps/npm/node_modules/isarray/package.json
index 19228ab6fdcaaf..7a923d7baf3bc1 100644
--- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/package.json
+++ b/deps/npm/node_modules/isarray/package.json
@@ -1,53 +1,75 @@
 {
-  "name": "isarray",
-  "description": "Array#isArray for older browsers",
-  "version": "0.0.1",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/juliangruber/isarray.git"
-  },
-  "homepage": "https://github.com/juliangruber/isarray",
-  "main": "index.js",
-  "scripts": {
-    "test": "tap test/*.js"
+  "_args": [
+    [
+      "isarray@0.0.1",
+      "/Users/rebecca/code/npm/node_modules/readable-stream"
+    ]
+  ],
+  "_from": "isarray@0.0.1",
+  "_id": "isarray@0.0.1",
+  "_inCache": true,
+  "_location": "/isarray",
+  "_npmUser": {
+    "email": "julian@juliangruber.com",
+    "name": "juliangruber"
   },
-  "dependencies": {},
-  "devDependencies": {
-    "tap": "*"
+  "_npmVersion": "1.2.18",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "isarray",
+    "raw": "isarray@0.0.1",
+    "rawSpec": "0.0.1",
+    "scope": null,
+    "spec": "0.0.1",
+    "type": "version"
   },
-  "keywords": [
-    "browser",
-    "isarray",
-    "array"
+  "_requiredBy": [
+    "/bl/readable-stream",
+    "/concat-stream/readable-stream",
+    "/readable-stream"
   ],
+  "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+  "_shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf",
+  "_shrinkwrap": null,
+  "_spec": "isarray@0.0.1",
+  "_where": "/Users/rebecca/code/npm/node_modules/readable-stream",
   "author": {
-    "name": "Julian Gruber",
     "email": "mail@juliangruber.com",
+    "name": "Julian Gruber",
     "url": "http://juliangruber.com"
   },
-  "license": "MIT",
-  "_id": "isarray@0.0.1",
+  "dependencies": {},
+  "description": "Array#isArray for older browsers",
+  "devDependencies": {
+    "tap": "*"
+  },
+  "directories": {},
   "dist": {
     "shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf",
     "tarball": "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
   },
-  "_from": "isarray@0.0.1",
-  "_npmVersion": "1.2.18",
-  "_npmUser": {
-    "name": "juliangruber",
-    "email": "julian@juliangruber.com"
-  },
+  "homepage": "https://github.com/juliangruber/isarray",
+  "keywords": [
+    "array",
+    "browser",
+    "isarray"
+  ],
+  "license": "MIT",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "juliangruber",
       "email": "julian@juliangruber.com"
     }
   ],
-  "directories": {},
-  "_shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf",
-  "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-  "bugs": {
-    "url": "https://github.com/juliangruber/isarray/issues"
+  "name": "isarray",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/juliangruber/isarray.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "readme": "ERROR: No README data found!"
+  "version": "0.0.1"
 }
diff --git a/deps/npm/node_modules/request/node_modules/isstream/.npmignore b/deps/npm/node_modules/isstream/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/isstream/.npmignore
rename to deps/npm/node_modules/isstream/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/isstream/.travis.yml b/deps/npm/node_modules/isstream/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/isstream/.travis.yml
rename to deps/npm/node_modules/isstream/.travis.yml
diff --git a/deps/npm/node_modules/request/node_modules/isstream/LICENSE.md b/deps/npm/node_modules/isstream/LICENSE.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/isstream/LICENSE.md
rename to deps/npm/node_modules/isstream/LICENSE.md
diff --git a/deps/npm/node_modules/request/node_modules/isstream/README.md b/deps/npm/node_modules/isstream/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/isstream/README.md
rename to deps/npm/node_modules/isstream/README.md
diff --git a/deps/npm/node_modules/request/node_modules/isstream/isstream.js b/deps/npm/node_modules/isstream/isstream.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/isstream/isstream.js
rename to deps/npm/node_modules/isstream/isstream.js
diff --git a/deps/npm/node_modules/request/node_modules/isstream/package.json b/deps/npm/node_modules/isstream/package.json
similarity index 62%
rename from deps/npm/node_modules/request/node_modules/isstream/package.json
rename to deps/npm/node_modules/isstream/package.json
index 74e97e608cc11e..54d8b76a0b6e49 100644
--- a/deps/npm/node_modules/request/node_modules/isstream/package.json
+++ b/deps/npm/node_modules/isstream/package.json
@@ -1,59 +1,83 @@
 {
-  "name": "isstream",
-  "version": "0.1.2",
-  "description": "Determine if an object is a Stream",
-  "main": "isstream.js",
-  "scripts": {
-    "test": "tar --xform 's/^package/readable-stream-1.0/' -zxf readable-stream-1.0.*.tgz && tar --xform 's/^package/readable-stream-1.1/' -zxf readable-stream-1.1.*.tgz && node test.js; rm -rf readable-stream-1.?/"
+  "_args": [
+    [
+      "isstream@~0.1.1",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
+  ],
+  "_from": "isstream@>=0.1.1 <0.2.0",
+  "_id": "isstream@0.1.2",
+  "_inCache": true,
+  "_location": "/isstream",
+  "_nodeVersion": "1.4.3",
+  "_npmUser": {
+    "email": "rod@vagg.org",
+    "name": "rvagg"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/rvagg/isstream.git"
+  "_npmVersion": "2.6.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "isstream",
+    "raw": "isstream@~0.1.1",
+    "rawSpec": "~0.1.1",
+    "scope": null,
+    "spec": ">=0.1.1 <0.2.0",
+    "type": "range"
   },
-  "keywords": [
-    "stream",
-    "type",
-    "streams",
-    "readable-stream",
-    "hippo"
+  "_requiredBy": [
+    "/request"
   ],
+  "_resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+  "_shasum": "47e63f7af55afa6f92e1500e690eb8b8529c099a",
+  "_shrinkwrap": null,
+  "_spec": "isstream@~0.1.1",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
+  "author": {
+    "email": "rod@vagg.org",
+    "name": "Rod Vagg"
+  },
+  "bugs": {
+    "url": "https://github.com/rvagg/isstream/issues"
+  },
+  "dependencies": {},
+  "description": "Determine if an object is a Stream",
   "devDependencies": {
-    "tape": "~2.12.3",
     "core-util-is": "~1.0.0",
+    "inherits": "~2.0.1",
     "isarray": "0.0.1",
     "string_decoder": "~0.10.x",
-    "inherits": "~2.0.1"
-  },
-  "author": {
-    "name": "Rod Vagg",
-    "email": "rod@vagg.org"
+    "tape": "~2.12.3"
   },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/rvagg/isstream/issues"
+  "directories": {},
+  "dist": {
+    "shasum": "47e63f7af55afa6f92e1500e690eb8b8529c099a",
+    "tarball": "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
   },
-  "homepage": "https://github.com/rvagg/isstream",
   "gitHead": "cd39cba6da939b4fc9110825203adc506422c3dc",
-  "_id": "isstream@0.1.2",
-  "_shasum": "47e63f7af55afa6f92e1500e690eb8b8529c099a",
-  "_from": "isstream@>=0.1.1 <0.2.0",
-  "_npmVersion": "2.6.1",
-  "_nodeVersion": "1.4.3",
-  "_npmUser": {
-    "name": "rvagg",
-    "email": "rod@vagg.org"
-  },
+  "homepage": "https://github.com/rvagg/isstream",
+  "keywords": [
+    "hippo",
+    "readable-stream",
+    "stream",
+    "streams",
+    "type"
+  ],
+  "license": "MIT",
+  "main": "isstream.js",
   "maintainers": [
     {
       "name": "rvagg",
       "email": "rod@vagg.org"
     }
   ],
-  "dist": {
-    "shasum": "47e63f7af55afa6f92e1500e690eb8b8529c099a",
-    "tarball": "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+  "name": "isstream",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/rvagg/isstream.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "tar --xform 's/^package/readable-stream-1.0/' -zxf readable-stream-1.0.*.tgz && tar --xform 's/^package/readable-stream-1.1/' -zxf readable-stream-1.1.*.tgz && node test.js; rm -rf readable-stream-1.?/"
+  },
+  "version": "0.1.2"
 }
diff --git a/deps/npm/node_modules/request/node_modules/isstream/test.js b/deps/npm/node_modules/isstream/test.js
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/isstream/test.js
rename to deps/npm/node_modules/isstream/test.js
index 8c950c55e6375f..881e70b3098ff7 100644
--- a/deps/npm/node_modules/request/node_modules/isstream/test.js
+++ b/deps/npm/node_modules/isstream/test.js
@@ -163,6 +163,3 @@ testDuplex(true, 'ReadableStream11.PassThrough', new (ReadableStream11.PassThrou
 
   })
 })
-
-
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/.npmignore b/deps/npm/node_modules/jju/.npmignore
similarity index 62%
rename from deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/.npmignore
rename to deps/npm/node_modules/jju/.npmignore
index b561496c91d48f..5ae40150eea106 100644
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/.npmignore
+++ b/deps/npm/node_modules/jju/.npmignore
@@ -1,6 +1,9 @@
 package.json
 node_modules
-test/external
+test
+benchmark
+docs
 examples
+/.editorconfig
 /.eslint*
 /.travis.yml
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/README.md b/deps/npm/node_modules/jju/README.md
similarity index 99%
rename from deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/README.md
rename to deps/npm/node_modules/jju/README.md
index 85d52a2dcea030..3d61083fb04dd0 100644
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/README.md
+++ b/deps/npm/node_modules/jju/README.md
@@ -240,4 +240,3 @@ JSON.stringify will split this into 15 lines, and it's hard to read.
 Yet again, this feature comes with a performance hit, so if user experience matters to you more than performance, use this module. If your JSON will be consumed by machines, use JSON.stringify instead.
 
 As a rule of thumb, if you use "space" argument to indent your JSON, you'd better use this module instead.
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/index.js b/deps/npm/node_modules/jju/index.js
similarity index 100%
rename from deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/index.js
rename to deps/npm/node_modules/jju/index.js
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/analyze.js b/deps/npm/node_modules/jju/lib/analyze.js
similarity index 99%
rename from deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/analyze.js
rename to deps/npm/node_modules/jju/lib/analyze.js
index 9b0f9af01cd9e8..39303b0969081c 100644
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/analyze.js
+++ b/deps/npm/node_modules/jju/lib/analyze.js
@@ -89,4 +89,3 @@ module.exports.analyze = function analyzeJSON(input, options) {
 
   return result
 }
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/document.js b/deps/npm/node_modules/jju/lib/document.js
similarity index 99%
rename from deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/document.js
rename to deps/npm/node_modules/jju/lib/document.js
index cfab8691fc9aba..af1a01a03d062b 100644
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/document.js
+++ b/deps/npm/node_modules/jju/lib/document.js
@@ -482,4 +482,3 @@ module.exports.Document = Document
 module.exports.update = function updateJSON(source, new_value, options) {
   return Document(source, options).update(new_value).toString()
 }
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/parse.js b/deps/npm/node_modules/jju/lib/parse.js
similarity index 99%
rename from deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/parse.js
rename to deps/npm/node_modules/jju/lib/parse.js
index 5f9fe998610d0f..2b7894937862d5 100644
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/parse.js
+++ b/deps/npm/node_modules/jju/lib/parse.js
@@ -749,4 +749,3 @@ module.exports.tokenize = function tokenizeJSON(input, options) {
   tokens.data = module.exports.parse(input, options)
   return tokens
 }
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/stringify.js b/deps/npm/node_modules/jju/lib/stringify.js
similarity index 99%
rename from deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/stringify.js
rename to deps/npm/node_modules/jju/lib/stringify.js
index ce89d77ee1f433..754019eac551c1 100644
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/stringify.js
+++ b/deps/npm/node_modules/jju/lib/stringify.js
@@ -380,4 +380,3 @@ module.exports.stringify = function stringifyJSON(object, options, _space) {
 
   return _stringify(object, options, 0, '')
 }
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/unicode.js b/deps/npm/node_modules/jju/lib/unicode.js
similarity index 100%
rename from deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/unicode.js
rename to deps/npm/node_modules/jju/lib/unicode.js
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/utils.js b/deps/npm/node_modules/jju/lib/utils.js
similarity index 99%
rename from deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/utils.js
rename to deps/npm/node_modules/jju/lib/utils.js
index a8476b6c4630e1..dd4752c73a4078 100644
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/utils.js
+++ b/deps/npm/node_modules/jju/lib/utils.js
@@ -43,4 +43,3 @@ module.exports.middleware = function() {
     throw Error('this function is removed, use express-json5 instead')
   }
 }
-
diff --git a/deps/npm/node_modules/jju/package.json b/deps/npm/node_modules/jju/package.json
new file mode 100644
index 00000000000000..215d56ed2c9b9b
--- /dev/null
+++ b/deps/npm/node_modules/jju/package.json
@@ -0,0 +1,88 @@
+{
+  "_args": [
+    [
+      "jju@^1.1.0",
+      "/Users/rebecca/code/npm/node_modules/json-parse-helpfulerror"
+    ]
+  ],
+  "_from": "jju@>=1.1.0 <2.0.0",
+  "_id": "jju@1.2.1",
+  "_inCache": true,
+  "_location": "/jju",
+  "_nodeVersion": "2.2.1",
+  "_npmUser": {
+    "email": "alex@kocharin.ru",
+    "name": "rlidwka"
+  },
+  "_npmVersion": "2.0.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "jju",
+    "raw": "jju@^1.1.0",
+    "rawSpec": "^1.1.0",
+    "scope": null,
+    "spec": ">=1.1.0 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/json-parse-helpfulerror"
+  ],
+  "_resolved": "https://registry.npmjs.org/jju/-/jju-1.2.1.tgz",
+  "_shasum": "edf6ec20d5d668c80c2c00cea63f8a9422a4b528",
+  "_shrinkwrap": null,
+  "_spec": "jju@^1.1.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/json-parse-helpfulerror",
+  "author": {
+    "email": "alex@kocharin.ru",
+    "name": "Alex Kocharin"
+  },
+  "bugs": {
+    "url": "https://github.com/rlidwka/jju/issues"
+  },
+  "dependencies": {},
+  "description": "a set of utilities to work with JSON / JSON5 documents",
+  "devDependencies": {
+    "eslint": "~0.4.2",
+    "js-yaml": ">=3.1.0",
+    "mocha": ">=1.21.0"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "edf6ec20d5d668c80c2c00cea63f8a9422a4b528",
+    "tarball": "http://registry.npmjs.org/jju/-/jju-1.2.1.tgz"
+  },
+  "gitHead": "8b079c1d03af527ab28a47c7b714d6f888abc53d",
+  "homepage": "http://rlidwka.github.io/jju/",
+  "installable": true,
+  "keywords": [
+    "data",
+    "json",
+    "json5",
+    "parser",
+    "serializer"
+  ],
+  "license": {
+    "type": "WTFPL",
+    "url": "http://www.wtfpl.net/txt/copying/"
+  },
+  "maintainers": [
+    {
+      "name": "rlidwka",
+      "email": "alex@kocharin.ru"
+    }
+  ],
+  "name": "jju",
+  "optionalDependencies": {},
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/rlidwka/jju"
+  },
+  "scripts": {
+    "lint": "eslint -c ./.eslint.yaml ./lib",
+    "test": "mocha test/*.js"
+  },
+  "version": "1.2.1"
+}
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/package.yaml b/deps/npm/node_modules/jju/package.yaml
similarity index 97%
rename from deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/package.yaml
rename to deps/npm/node_modules/jju/package.yaml
index cab7b5d0bcad28..4d81c219f19511 100644
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/package.yaml
+++ b/deps/npm/node_modules/jju/package.yaml
@@ -3,7 +3,7 @@
 # "jju" stands for "json/json5 utils"
 name: jju
 
-version: 1.2.0
+version: 1.2.1
 description: a set of utilities to work with JSON / JSON5 documents
 
 author:
@@ -43,4 +43,3 @@ publishConfig:
 license:
   type: WTFPL
   url: http://www.wtfpl.net/txt/copying/
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/.editorconfig b/deps/npm/node_modules/json-parse-helpfulerror/.editorconfig
similarity index 100%
rename from deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/.editorconfig
rename to deps/npm/node_modules/json-parse-helpfulerror/.editorconfig
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/.npmignore b/deps/npm/node_modules/json-parse-helpfulerror/.npmignore
similarity index 100%
rename from deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/.npmignore
rename to deps/npm/node_modules/json-parse-helpfulerror/.npmignore
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/LICENSE b/deps/npm/node_modules/json-parse-helpfulerror/LICENSE
similarity index 99%
rename from deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/LICENSE
rename to deps/npm/node_modules/json-parse-helpfulerror/LICENSE
index e637724b3bc595..c3d2eb3550079b 100644
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/LICENSE
+++ b/deps/npm/node_modules/json-parse-helpfulerror/LICENSE
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/README.md b/deps/npm/node_modules/json-parse-helpfulerror/README.md
similarity index 100%
rename from deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/README.md
rename to deps/npm/node_modules/json-parse-helpfulerror/README.md
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/index.js b/deps/npm/node_modules/json-parse-helpfulerror/index.js
similarity index 100%
rename from deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/index.js
rename to deps/npm/node_modules/json-parse-helpfulerror/index.js
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/package.json b/deps/npm/node_modules/json-parse-helpfulerror/package.json
similarity index 58%
rename from deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/package.json
rename to deps/npm/node_modules/json-parse-helpfulerror/package.json
index 2a5a98fc32a02c..6ab518ee986948 100644
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/package.json
+++ b/deps/npm/node_modules/json-parse-helpfulerror/package.json
@@ -1,61 +1,84 @@
 {
-  "name": "json-parse-helpfulerror",
-  "version": "1.0.3",
-  "description": "A drop-in replacement for JSON.parse that uses `jju` to give helpful errors",
-  "main": "index.js",
-  "scripts": {
-    "test": "lab -c",
-    "lint": "jslint --edition=latest --terse *.js"
+  "_args": [
+    [
+      "json-parse-helpfulerror@^1.0.2",
+      "/Users/rebecca/code/npm/node_modules/read-package-json"
+    ]
+  ],
+  "_from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
+  "_id": "json-parse-helpfulerror@1.0.3",
+  "_inCache": true,
+  "_location": "/json-parse-helpfulerror",
+  "_nodeVersion": "0.10.35",
+  "_npmUser": {
+    "email": "smikes@cubane.com",
+    "name": "smikes"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/smikes/json-parse-helpfulerror.git"
+  "_npmVersion": "2.1.16",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "json-parse-helpfulerror",
+    "raw": "json-parse-helpfulerror@^1.0.2",
+    "rawSpec": "^1.0.2",
+    "scope": null,
+    "spec": ">=1.0.2 <2.0.0",
+    "type": "range"
   },
-  "keywords": [
-    "json",
-    "parse",
-    "line",
-    "doublequote",
-    "error"
+  "_requiredBy": [
+    "/read-package-json"
   ],
+  "_resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
+  "_shasum": "13f14ce02eed4e981297b64eb9e3b932e2dd13dc",
+  "_shrinkwrap": null,
+  "_spec": "json-parse-helpfulerror@^1.0.2",
+  "_where": "/Users/rebecca/code/npm/node_modules/read-package-json",
   "author": {
-    "name": "Sam Mikes",
-    "email": "smikes@cubane.com"
+    "email": "smikes@cubane.com",
+    "name": "Sam Mikes"
   },
-  "license": "MIT",
   "bugs": {
     "url": "https://github.com/smikes/json-parse-helpfulerror/issues"
   },
-  "homepage": "https://github.com/smikes/json-parse-helpfulerror",
+  "dependencies": {
+    "jju": "^1.1.0"
+  },
+  "description": "A drop-in replacement for JSON.parse that uses `jju` to give helpful errors",
   "devDependencies": {
     "code": "^1.2.1",
     "jslint": "^0.7.1",
     "lab": "^5.1.1"
   },
-  "dependencies": {
-    "jju": "^1.1.0"
+  "directories": {},
+  "dist": {
+    "shasum": "13f14ce02eed4e981297b64eb9e3b932e2dd13dc",
+    "tarball": "http://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz"
   },
   "gitHead": "eedb116ec96b5c479be3919b526d6de0a521be5e",
-  "_id": "json-parse-helpfulerror@1.0.3",
-  "_shasum": "13f14ce02eed4e981297b64eb9e3b932e2dd13dc",
-  "_from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
-  "_npmVersion": "2.1.16",
-  "_nodeVersion": "0.10.35",
-  "_npmUser": {
-    "name": "smikes",
-    "email": "smikes@cubane.com"
-  },
+  "homepage": "https://github.com/smikes/json-parse-helpfulerror",
+  "keywords": [
+    "doublequote",
+    "error",
+    "json",
+    "line",
+    "parse"
+  ],
+  "license": "MIT",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "smikes",
       "email": "smikes@cubane.com"
     }
   ],
-  "dist": {
-    "shasum": "13f14ce02eed4e981297b64eb9e3b932e2dd13dc",
-    "tarball": "http://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz"
+  "name": "json-parse-helpfulerror",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/smikes/json-parse-helpfulerror.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "lint": "jslint --edition=latest --terse *.js",
+    "test": "lab -c"
+  },
+  "version": "1.0.3"
 }
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/test/test.js b/deps/npm/node_modules/json-parse-helpfulerror/test/test.js
similarity index 100%
rename from deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/test/test.js
rename to deps/npm/node_modules/json-parse-helpfulerror/test/test.js
diff --git a/deps/npm/node_modules/request/node_modules/json-stringify-safe/.npmignore b/deps/npm/node_modules/json-stringify-safe/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/json-stringify-safe/.npmignore
rename to deps/npm/node_modules/json-stringify-safe/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/json-stringify-safe/CHANGELOG.md b/deps/npm/node_modules/json-stringify-safe/CHANGELOG.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/json-stringify-safe/CHANGELOG.md
rename to deps/npm/node_modules/json-stringify-safe/CHANGELOG.md
diff --git a/deps/npm/node_modules/config-chain/node_modules/proto-list/LICENSE b/deps/npm/node_modules/json-stringify-safe/LICENSE
similarity index 100%
rename from deps/npm/node_modules/config-chain/node_modules/proto-list/LICENSE
rename to deps/npm/node_modules/json-stringify-safe/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/json-stringify-safe/Makefile b/deps/npm/node_modules/json-stringify-safe/Makefile
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/json-stringify-safe/Makefile
rename to deps/npm/node_modules/json-stringify-safe/Makefile
diff --git a/deps/npm/node_modules/request/node_modules/json-stringify-safe/README.md b/deps/npm/node_modules/json-stringify-safe/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/json-stringify-safe/README.md
rename to deps/npm/node_modules/json-stringify-safe/README.md
diff --git a/deps/npm/node_modules/request/node_modules/json-stringify-safe/package.json b/deps/npm/node_modules/json-stringify-safe/package.json
similarity index 68%
rename from deps/npm/node_modules/request/node_modules/json-stringify-safe/package.json
rename to deps/npm/node_modules/json-stringify-safe/package.json
index e3cbf9a7471c7d..812c93422961b0 100644
--- a/deps/npm/node_modules/request/node_modules/json-stringify-safe/package.json
+++ b/deps/npm/node_modules/json-stringify-safe/package.json
@@ -1,22 +1,45 @@
 {
-  "name": "json-stringify-safe",
-  "version": "5.0.1",
-  "description": "Like JSON.stringify, but doesn't blow up on circular refs.",
-  "keywords": [
-    "json",
-    "stringify",
-    "circular",
-    "safe"
+  "_args": [
+    [
+      "json-stringify-safe@~5.0.0",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
   ],
-  "homepage": "https://github.com/isaacs/json-stringify-safe",
-  "bugs": {
-    "url": "https://github.com/isaacs/json-stringify-safe/issues"
+  "_from": "json-stringify-safe@>=5.0.0 <5.1.0",
+  "_id": "json-stringify-safe@5.0.1",
+  "_inCache": true,
+  "_location": "/json-stringify-safe",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
   },
+  "_npmVersion": "2.10.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "json-stringify-safe",
+    "raw": "json-stringify-safe@~5.0.0",
+    "rawSpec": "~5.0.0",
+    "scope": null,
+    "spec": ">=5.0.0 <5.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/request"
+  ],
+  "_resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+  "_shasum": "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb",
+  "_shrinkwrap": null,
+  "_spec": "json-stringify-safe@~5.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me"
   },
+  "bugs": {
+    "url": "https://github.com/isaacs/json-stringify-safe/issues"
+  },
   "contributors": [
     {
       "name": "Andri Möll",
@@ -24,34 +47,28 @@
       "url": "http://themoll.com"
     }
   ],
-  "license": "ISC",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/json-stringify-safe.git"
-  },
-  "main": "stringify.js",
-  "scripts": {
-    "test": "node test.js"
-  },
+  "dependencies": {},
+  "description": "Like JSON.stringify, but doesn't blow up on circular refs.",
   "devDependencies": {
     "mocha": ">= 2.1.0 < 3",
     "must": ">= 0.12 < 0.13",
     "sinon": ">= 1.12.2 < 2"
   },
-  "gitHead": "3890dceab3ad14f8701e38ca74f38276abc76de5",
-  "_id": "json-stringify-safe@5.0.1",
-  "_shasum": "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb",
-  "_from": "json-stringify-safe@>=5.0.0 <5.1.0",
-  "_npmVersion": "2.10.0",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
-  },
+  "directories": {},
   "dist": {
     "shasum": "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb",
     "tarball": "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
   },
+  "gitHead": "3890dceab3ad14f8701e38ca74f38276abc76de5",
+  "homepage": "https://github.com/isaacs/json-stringify-safe",
+  "keywords": [
+    "circular",
+    "json",
+    "safe",
+    "stringify"
+  ],
+  "license": "ISC",
+  "main": "stringify.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -62,7 +79,14 @@
       "email": "andri@dot.ee"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "json-stringify-safe",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/json-stringify-safe.git"
+  },
+  "scripts": {
+    "test": "node test.js"
+  },
+  "version": "5.0.1"
 }
diff --git a/deps/npm/node_modules/request/node_modules/json-stringify-safe/stringify.js b/deps/npm/node_modules/json-stringify-safe/stringify.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/json-stringify-safe/stringify.js
rename to deps/npm/node_modules/json-stringify-safe/stringify.js
diff --git a/deps/npm/node_modules/request/node_modules/json-stringify-safe/test/mocha.opts b/deps/npm/node_modules/json-stringify-safe/test/mocha.opts
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/json-stringify-safe/test/mocha.opts
rename to deps/npm/node_modules/json-stringify-safe/test/mocha.opts
diff --git a/deps/npm/node_modules/request/node_modules/json-stringify-safe/test/stringify_test.js b/deps/npm/node_modules/json-stringify-safe/test/stringify_test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/json-stringify-safe/test/stringify_test.js
rename to deps/npm/node_modules/json-stringify-safe/test/stringify_test.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/.travis.yml b/deps/npm/node_modules/jsonpointer/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/.travis.yml
rename to deps/npm/node_modules/jsonpointer/.travis.yml
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/README.md b/deps/npm/node_modules/jsonpointer/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/README.md
rename to deps/npm/node_modules/jsonpointer/README.md
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/jsonpointer.js b/deps/npm/node_modules/jsonpointer/jsonpointer.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/jsonpointer.js
rename to deps/npm/node_modules/jsonpointer/jsonpointer.js
diff --git a/deps/npm/node_modules/jsonpointer/package.json b/deps/npm/node_modules/jsonpointer/package.json
new file mode 100644
index 00000000000000..1a2dab55960709
--- /dev/null
+++ b/deps/npm/node_modules/jsonpointer/package.json
@@ -0,0 +1,93 @@
+{
+  "_args": [
+    [
+      "jsonpointer@2.0.0",
+      "/Users/ogd/Documents/projects/npm/npm/node_modules/is-my-json-valid"
+    ]
+  ],
+  "_from": "jsonpointer@2.0.0",
+  "_id": "jsonpointer@2.0.0",
+  "_inCache": true,
+  "_location": "/jsonpointer",
+  "_nodeVersion": "0.10.36",
+  "_npmUser": {
+    "email": "marc.brookman@gmail.com",
+    "name": "marcbachmann"
+  },
+  "_npmVersion": "2.10.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "jsonpointer",
+    "raw": "jsonpointer@2.0.0",
+    "rawSpec": "2.0.0",
+    "scope": null,
+    "spec": "2.0.0",
+    "type": "version"
+  },
+  "_requiredBy": [
+    "/is-my-json-valid",
+    "/npm-registry-couchapp/is-my-json-valid"
+  ],
+  "_resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz",
+  "_shasum": "3af1dd20fe85463910d469a385e33017d2a030d9",
+  "_shrinkwrap": null,
+  "_spec": "jsonpointer@2.0.0",
+  "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/is-my-json-valid",
+  "author": {
+    "email": "jan@apache.org",
+    "name": "Jan Lehnardt"
+  },
+  "bugs": {
+    "url": "http://github.com/janl/node-jsonpointer/issues"
+  },
+  "contributors": [
+    {
+      "name": "Joe Hildebrand",
+      "email": "joe-github@cursive.net"
+    }
+  ],
+  "dependencies": {},
+  "description": "Simple JSON Addressing.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "3af1dd20fe85463910d469a385e33017d2a030d9",
+    "tarball": "http://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
+  },
+  "engines": {
+    "node": ">=0.6.0"
+  },
+  "gitHead": "26ea4a5c0fcb6d9a2e87f733403791dd05637af8",
+  "homepage": "https://github.com/janl/node-jsonpointer#readme",
+  "installable": true,
+  "license": "MIT",
+  "main": "./jsonpointer",
+  "maintainers": [
+    {
+      "name": "jan",
+      "email": "jan@apache.org"
+    },
+    {
+      "name": "marcbachmann",
+      "email": "marc.brookman@gmail.com"
+    }
+  ],
+  "name": "jsonpointer",
+  "optionalDependencies": {},
+  "readme": "# JSON Pointer for nodejs\n\nThis is an implementation of [JSON Pointer](http://tools.ietf.org/html/draft-ietf-appsawg-json-pointer-08).\n\n## Usage\n\n    var jsonpointer = require(\"jsonpointer\");\n    var obj = { foo: 1, bar: { baz: 2}, qux: [3, 4, 5]};\n    var one = jsonpointer.get(obj, \"/foo\");\n    var two = jsonpointer.get(obj, \"/bar/baz\");\n    var three = jsonpointer.get(obj, \"/qux/0\");\n    var four = jsonpointer.get(obj, \"/qux/1\");\n    var five = jsonpointer.get(obj, \"/qux/2\");\n    var notfound = jsonpointer.get(obj, \"/quo\"); // returns null\n\n    jsonpointer.set(obj, \"/foo\", 6); // obj.foo = 6;\n\n## Testing\n\n    $ node test.js\n    All tests pass.\n    $\n\n[![Build Status](https://travis-ci.org/janl/node-jsonpointer.png?branch=master)](https://travis-ci.org/janl/node-jsonpointer)\n\n## Author\n\n(c) 2011 Jan Lehnardt <jan@apache.org>\n\n## License\n\nMIT License.\n",
+  "readmeFilename": "README.md",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/janl/node-jsonpointer.git"
+  },
+  "scripts": {
+    "test": "node test.js"
+  },
+  "tags": [
+    "simple",
+    "util",
+    "util",
+    "utility"
+  ],
+  "version": "2.0.0"
+}
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/test.js b/deps/npm/node_modules/jsonpointer/test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/test.js
rename to deps/npm/node_modules/jsonpointer/test.js
diff --git a/deps/npm/node_modules/lockfile/package.json b/deps/npm/node_modules/lockfile/package.json
index cd18aa2ed520fe..43a798e6e1ade2 100644
--- a/deps/npm/node_modules/lockfile/package.json
+++ b/deps/npm/node_modules/lockfile/package.json
@@ -1,54 +1,69 @@
 {
-  "name": "lockfile",
-  "version": "1.0.1",
-  "main": "lockfile.js",
-  "directories": {
-    "test": "test"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "tap": "~0.2.5",
-    "touch": "0"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "_args": [
+    [
+      "lockfile@~1.0.1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "lockfile@>=1.0.1 <1.1.0",
+  "_id": "lockfile@1.0.1",
+  "_inCache": true,
+  "_location": "/lockfile",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/lockfile.git"
+  "_npmVersion": "2.10.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lockfile",
+    "raw": "lockfile@~1.0.1",
+    "rawSpec": "~1.0.1",
+    "scope": null,
+    "spec": ">=1.0.1 <1.1.0",
+    "type": "range"
   },
-  "keywords": [
-    "lockfile",
-    "lock",
-    "file",
-    "fs",
-    "O_EXCL"
+  "_requiredBy": [
+    "/"
   ],
+  "_resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz",
+  "_shasum": "9d353ecfe3f54d150bb57f89d51746935a39c4f5",
+  "_shrinkwrap": null,
+  "_spec": "lockfile@~1.0.1",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "license": "ISC",
-  "description": "A very polite lock file utility, which endeavors to not litter, and to wait patiently for others.",
-  "gitHead": "9d338ed8e3e3a166955d051f6b5fb6bb1e563ca8",
   "bugs": {
     "url": "https://github.com/isaacs/lockfile/issues"
   },
-  "homepage": "https://github.com/isaacs/lockfile#readme",
-  "_id": "lockfile@1.0.1",
-  "_shasum": "9d353ecfe3f54d150bb57f89d51746935a39c4f5",
-  "_from": "lockfile@>=1.0.0 <1.1.0",
-  "_npmVersion": "2.10.0",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
+  "dependencies": {},
+  "description": "A very polite lock file utility, which endeavors to not litter, and to wait patiently for others.",
+  "devDependencies": {
+    "tap": "~0.2.5",
+    "touch": "0"
+  },
+  "directories": {
+    "test": "test"
   },
   "dist": {
     "shasum": "9d353ecfe3f54d150bb57f89d51746935a39c4f5",
     "tarball": "http://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"
   },
+  "gitHead": "9d338ed8e3e3a166955d051f6b5fb6bb1e563ca8",
+  "homepage": "https://github.com/isaacs/lockfile#readme",
+  "keywords": [
+    "O_EXCL",
+    "file",
+    "fs",
+    "lock",
+    "lockfile"
+  ],
+  "license": "ISC",
+  "main": "lockfile.js",
   "maintainers": [
     {
       "name": "trevorburnham",
@@ -59,5 +74,14 @@
       "email": "i@izs.me"
     }
   ],
-  "_resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"
+  "name": "lockfile",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/lockfile.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.0.1"
 }
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/LICENSE.txt b/deps/npm/node_modules/lodash._arraycopy/LICENSE.txt
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/LICENSE.txt
rename to deps/npm/node_modules/lodash._arraycopy/LICENSE.txt
diff --git a/deps/npm/node_modules/lodash._arraycopy/README.md b/deps/npm/node_modules/lodash._arraycopy/README.md
new file mode 100644
index 00000000000000..16ee6fd242807c
--- /dev/null
+++ b/deps/npm/node_modules/lodash._arraycopy/README.md
@@ -0,0 +1,20 @@
+# lodash._arraycopy v3.0.0
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `arrayCopy` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash._arraycopy
+```
+
+In Node.js/io.js:
+
+```js
+var arrayCopy = require('lodash._arraycopy');
+```
+
+See the [package source](https://github.com/lodash/lodash/blob/3.0.0-npm-packages/lodash._arraycopy) for more details.
diff --git a/deps/npm/node_modules/lodash._arraycopy/index.js b/deps/npm/node_modules/lodash._arraycopy/index.js
new file mode 100644
index 00000000000000..b9abb2253a1f57
--- /dev/null
+++ b/deps/npm/node_modules/lodash._arraycopy/index.js
@@ -0,0 +1,29 @@
+/**
+ * lodash 3.0.0 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.7.0 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+
+/**
+ * Copies the values of `source` to `array`.
+ *
+ * @private
+ * @param {Array} source The array to copy values from.
+ * @param {Array} [array=[]] The array to copy values to.
+ * @returns {Array} Returns `array`.
+ */
+function arrayCopy(source, array) {
+  var index = -1,
+      length = source.length;
+
+  array || (array = Array(length));
+  while (++index < length) {
+    array[index] = source[index];
+  }
+  return array;
+}
+
+module.exports = arrayCopy;
diff --git a/deps/npm/node_modules/lodash._arraycopy/package.json b/deps/npm/node_modules/lodash._arraycopy/package.json
new file mode 100644
index 00000000000000..acad533065ff8d
--- /dev/null
+++ b/deps/npm/node_modules/lodash._arraycopy/package.json
@@ -0,0 +1,97 @@
+{
+  "_args": [
+    [
+      "lodash._arraycopy@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash._baseclone"
+    ]
+  ],
+  "_from": "lodash._arraycopy@>=3.0.0 <4.0.0",
+  "_id": "lodash._arraycopy@3.0.0",
+  "_inCache": true,
+  "_location": "/lodash._arraycopy",
+  "_nodeVersion": "0.10.35",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.3.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._arraycopy",
+    "raw": "lodash._arraycopy@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash._baseclone"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz",
+  "_shasum": "76e7b7c1f1fb92547374878a562ed06a3e50f6e1",
+  "_shrinkwrap": null,
+  "_spec": "lodash._arraycopy@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseclone",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {},
+  "description": "The modern build of lodash’s internal `arrayCopy` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "76e7b7c1f1fb92547374878a562ed06a3e50f6e1",
+    "tarball": "http://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    }
+  ],
+  "name": "lodash._arraycopy",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/lodash/lodash"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.0.0"
+}
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/LICENSE.txt b/deps/npm/node_modules/lodash._arrayeach/LICENSE.txt
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/LICENSE.txt
rename to deps/npm/node_modules/lodash._arrayeach/LICENSE.txt
diff --git a/deps/npm/node_modules/lodash._arrayeach/README.md b/deps/npm/node_modules/lodash._arrayeach/README.md
new file mode 100644
index 00000000000000..1f3236ba0338f9
--- /dev/null
+++ b/deps/npm/node_modules/lodash._arrayeach/README.md
@@ -0,0 +1,20 @@
+# lodash._arrayeach v3.0.0
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `arrayEach` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash._arrayeach
+```
+
+In Node.js/io.js:
+
+```js
+var arrayEach = require('lodash._arrayeach');
+```
+
+See the [package source](https://github.com/lodash/lodash/blob/3.0.0-npm-packages/lodash._arrayeach) for more details.
diff --git a/deps/npm/node_modules/lodash._arrayeach/index.js b/deps/npm/node_modules/lodash._arrayeach/index.js
new file mode 100644
index 00000000000000..7b31bcdb2534ef
--- /dev/null
+++ b/deps/npm/node_modules/lodash._arrayeach/index.js
@@ -0,0 +1,31 @@
+/**
+ * lodash 3.0.0 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.7.0 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+
+/**
+ * A specialized version of `_.forEach` for arrays without support for callback
+ * shorthands or `this` binding.
+ *
+ * @private
+ * @param {Array} array The array to iterate over.
+ * @param {Function} iteratee The function invoked per iteration.
+ * @returns {Array} Returns `array`.
+ */
+function arrayEach(array, iteratee) {
+  var index = -1,
+      length = array.length;
+
+  while (++index < length) {
+    if (iteratee(array[index], index, array) === false) {
+      break;
+    }
+  }
+  return array;
+}
+
+module.exports = arrayEach;
diff --git a/deps/npm/node_modules/lodash._arrayeach/package.json b/deps/npm/node_modules/lodash._arrayeach/package.json
new file mode 100644
index 00000000000000..7036298dbf9013
--- /dev/null
+++ b/deps/npm/node_modules/lodash._arrayeach/package.json
@@ -0,0 +1,97 @@
+{
+  "_args": [
+    [
+      "lodash._arrayeach@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash._baseclone"
+    ]
+  ],
+  "_from": "lodash._arrayeach@>=3.0.0 <4.0.0",
+  "_id": "lodash._arrayeach@3.0.0",
+  "_inCache": true,
+  "_location": "/lodash._arrayeach",
+  "_nodeVersion": "0.10.35",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.3.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._arrayeach",
+    "raw": "lodash._arrayeach@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash._baseclone"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz",
+  "_shasum": "bab156b2a90d3f1bbd5c653403349e5e5933ef9e",
+  "_shrinkwrap": null,
+  "_spec": "lodash._arrayeach@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseclone",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {},
+  "description": "The modern build of lodash’s internal `arrayEach` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "bab156b2a90d3f1bbd5c653403349e5e5933ef9e",
+    "tarball": "http://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    }
+  ],
+  "name": "lodash._arrayeach",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/lodash/lodash"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.0.0"
+}
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/LICENSE.txt b/deps/npm/node_modules/lodash._baseassign/LICENSE.txt
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/LICENSE.txt
rename to deps/npm/node_modules/lodash._baseassign/LICENSE.txt
diff --git a/deps/npm/node_modules/lodash._baseassign/README.md b/deps/npm/node_modules/lodash._baseassign/README.md
new file mode 100644
index 00000000000000..0aa23093730de6
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseassign/README.md
@@ -0,0 +1,20 @@
+# lodash._baseassign v3.2.0
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseAssign` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash._baseassign
+```
+
+In Node.js/io.js:
+
+```js
+var baseAssign = require('lodash._baseassign');
+```
+
+See the [package source](https://github.com/lodash/lodash/blob/3.2.0-npm-packages/lodash._baseassign) for more details.
diff --git a/deps/npm/node_modules/lodash._baseassign/index.js b/deps/npm/node_modules/lodash._baseassign/index.js
new file mode 100644
index 00000000000000..f5612c85081563
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseassign/index.js
@@ -0,0 +1,27 @@
+/**
+ * lodash 3.2.0 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+var baseCopy = require('lodash._basecopy'),
+    keys = require('lodash.keys');
+
+/**
+ * The base implementation of `_.assign` without support for argument juggling,
+ * multiple sources, and `customizer` functions.
+ *
+ * @private
+ * @param {Object} object The destination object.
+ * @param {Object} source The source object.
+ * @returns {Object} Returns `object`.
+ */
+function baseAssign(object, source) {
+  return source == null
+    ? object
+    : baseCopy(source, keys(source), object);
+}
+
+module.exports = baseAssign;
diff --git a/deps/npm/node_modules/lodash._baseassign/package.json b/deps/npm/node_modules/lodash._baseassign/package.json
new file mode 100644
index 00000000000000..5c5c487719127c
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseassign/package.json
@@ -0,0 +1,116 @@
+{
+  "_args": [
+    [
+      "lodash._baseassign@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash._baseclone"
+    ]
+  ],
+  "_from": "lodash._baseassign@>=3.0.0 <4.0.0",
+  "_id": "lodash._baseassign@3.2.0",
+  "_inCache": true,
+  "_location": "/lodash._baseassign",
+  "_nodeVersion": "0.12.3",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.10.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._baseassign",
+    "raw": "lodash._baseassign@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash._baseclone"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+  "_shasum": "8c38a099500f215ad09e59f1722fd0c52bfe0a4e",
+  "_shrinkwrap": null,
+  "_spec": "lodash._baseassign@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseclone",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {
+    "lodash._basecopy": "^3.0.0",
+    "lodash.keys": "^3.0.0"
+  },
+  "description": "The modern build of lodash’s internal `baseAssign` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "8c38a099500f215ad09e59f1722fd0c52bfe0a4e",
+    "tarball": "http://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    }
+  ],
+  "name": "lodash._baseassign",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.2.0"
+}
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/LICENSE.txt b/deps/npm/node_modules/lodash._basecallback/LICENSE
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/LICENSE.txt
rename to deps/npm/node_modules/lodash._basecallback/LICENSE
diff --git a/deps/npm/node_modules/lodash._basecallback/README.md b/deps/npm/node_modules/lodash._basecallback/README.md
new file mode 100644
index 00000000000000..11f1a64b71187a
--- /dev/null
+++ b/deps/npm/node_modules/lodash._basecallback/README.md
@@ -0,0 +1,20 @@
+# lodash._basecallback v3.3.1
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseCallback` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash._basecallback
+```
+
+In Node.js/io.js:
+
+```js
+var baseCallback = require('lodash._basecallback');
+```
+
+See the [package source](https://github.com/lodash/lodash/blob/3.3.1-npm-packages/lodash._basecallback) for more details.
diff --git a/deps/npm/node_modules/lodash._basecallback/index.js b/deps/npm/node_modules/lodash._basecallback/index.js
new file mode 100644
index 00000000000000..cd44f79ee883ae
--- /dev/null
+++ b/deps/npm/node_modules/lodash._basecallback/index.js
@@ -0,0 +1,422 @@
+/**
+ * lodash 3.3.1 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+var baseIsEqual = require('lodash._baseisequal'),
+    bindCallback = require('lodash._bindcallback'),
+    isArray = require('lodash.isarray'),
+    pairs = require('lodash.pairs');
+
+/** Used to match property names within property paths. */
+var reIsDeepProp = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\n\\]|\\.)*?\1)\]/,
+    reIsPlainProp = /^\w*$/,
+    rePropName = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\n\\]|\\.)*?)\2)\]/g;
+
+/** Used to match backslashes in property paths. */
+var reEscapeChar = /\\(\\)?/g;
+
+/**
+ * Converts `value` to a string if it's not one. An empty string is returned
+ * for `null` or `undefined` values.
+ *
+ * @private
+ * @param {*} value The value to process.
+ * @returns {string} Returns the string.
+ */
+function baseToString(value) {
+  return value == null ? '' : (value + '');
+}
+
+/**
+ * The base implementation of `_.callback` which supports specifying the
+ * number of arguments to provide to `func`.
+ *
+ * @private
+ * @param {*} [func=_.identity] The value to convert to a callback.
+ * @param {*} [thisArg] The `this` binding of `func`.
+ * @param {number} [argCount] The number of arguments to provide to `func`.
+ * @returns {Function} Returns the callback.
+ */
+function baseCallback(func, thisArg, argCount) {
+  var type = typeof func;
+  if (type == 'function') {
+    return thisArg === undefined
+      ? func
+      : bindCallback(func, thisArg, argCount);
+  }
+  if (func == null) {
+    return identity;
+  }
+  if (type == 'object') {
+    return baseMatches(func);
+  }
+  return thisArg === undefined
+    ? property(func)
+    : baseMatchesProperty(func, thisArg);
+}
+
+/**
+ * The base implementation of `get` without support for string paths
+ * and default values.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @param {Array} path The path of the property to get.
+ * @param {string} [pathKey] The key representation of path.
+ * @returns {*} Returns the resolved value.
+ */
+function baseGet(object, path, pathKey) {
+  if (object == null) {
+    return;
+  }
+  if (pathKey !== undefined && pathKey in toObject(object)) {
+    path = [pathKey];
+  }
+  var index = 0,
+      length = path.length;
+
+  while (object != null && index < length) {
+    object = object[path[index++]];
+  }
+  return (index && index == length) ? object : undefined;
+}
+
+/**
+ * The base implementation of `_.isMatch` without support for callback
+ * shorthands and `this` binding.
+ *
+ * @private
+ * @param {Object} object The object to inspect.
+ * @param {Array} matchData The propery names, values, and compare flags to match.
+ * @param {Function} [customizer] The function to customize comparing objects.
+ * @returns {boolean} Returns `true` if `object` is a match, else `false`.
+ */
+function baseIsMatch(object, matchData, customizer) {
+  var index = matchData.length,
+      length = index,
+      noCustomizer = !customizer;
+
+  if (object == null) {
+    return !length;
+  }
+  object = toObject(object);
+  while (index--) {
+    var data = matchData[index];
+    if ((noCustomizer && data[2])
+          ? data[1] !== object[data[0]]
+          : !(data[0] in object)
+        ) {
+      return false;
+    }
+  }
+  while (++index < length) {
+    data = matchData[index];
+    var key = data[0],
+        objValue = object[key],
+        srcValue = data[1];
+
+    if (noCustomizer && data[2]) {
+      if (objValue === undefined && !(key in object)) {
+        return false;
+      }
+    } else {
+      var result = customizer ? customizer(objValue, srcValue, key) : undefined;
+      if (!(result === undefined ? baseIsEqual(srcValue, objValue, customizer, true) : result)) {
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+/**
+ * The base implementation of `_.matches` which does not clone `source`.
+ *
+ * @private
+ * @param {Object} source The object of property values to match.
+ * @returns {Function} Returns the new function.
+ */
+function baseMatches(source) {
+  var matchData = getMatchData(source);
+  if (matchData.length == 1 && matchData[0][2]) {
+    var key = matchData[0][0],
+        value = matchData[0][1];
+
+    return function(object) {
+      if (object == null) {
+        return false;
+      }
+      return object[key] === value && (value !== undefined || (key in toObject(object)));
+    };
+  }
+  return function(object) {
+    return baseIsMatch(object, matchData);
+  };
+}
+
+/**
+ * The base implementation of `_.matchesProperty` which does not clone `srcValue`.
+ *
+ * @private
+ * @param {string} path The path of the property to get.
+ * @param {*} srcValue The value to compare.
+ * @returns {Function} Returns the new function.
+ */
+function baseMatchesProperty(path, srcValue) {
+  var isArr = isArray(path),
+      isCommon = isKey(path) && isStrictComparable(srcValue),
+      pathKey = (path + '');
+
+  path = toPath(path);
+  return function(object) {
+    if (object == null) {
+      return false;
+    }
+    var key = pathKey;
+    object = toObject(object);
+    if ((isArr || !isCommon) && !(key in object)) {
+      object = path.length == 1 ? object : baseGet(object, baseSlice(path, 0, -1));
+      if (object == null) {
+        return false;
+      }
+      key = last(path);
+      object = toObject(object);
+    }
+    return object[key] === srcValue
+      ? (srcValue !== undefined || (key in object))
+      : baseIsEqual(srcValue, object[key], undefined, true);
+  };
+}
+
+/**
+ * The base implementation of `_.property` without support for deep paths.
+ *
+ * @private
+ * @param {string} key The key of the property to get.
+ * @returns {Function} Returns the new function.
+ */
+function baseProperty(key) {
+  return function(object) {
+    return object == null ? undefined : object[key];
+  };
+}
+
+/**
+ * A specialized version of `baseProperty` which supports deep paths.
+ *
+ * @private
+ * @param {Array|string} path The path of the property to get.
+ * @returns {Function} Returns the new function.
+ */
+function basePropertyDeep(path) {
+  var pathKey = (path + '');
+  path = toPath(path);
+  return function(object) {
+    return baseGet(object, path, pathKey);
+  };
+}
+
+/**
+ * The base implementation of `_.slice` without an iteratee call guard.
+ *
+ * @private
+ * @param {Array} array The array to slice.
+ * @param {number} [start=0] The start position.
+ * @param {number} [end=array.length] The end position.
+ * @returns {Array} Returns the slice of `array`.
+ */
+function baseSlice(array, start, end) {
+  var index = -1,
+      length = array.length;
+
+  start = start == null ? 0 : (+start || 0);
+  if (start < 0) {
+    start = -start > length ? 0 : (length + start);
+  }
+  end = (end === undefined || end > length) ? length : (+end || 0);
+  if (end < 0) {
+    end += length;
+  }
+  length = start > end ? 0 : ((end - start) >>> 0);
+  start >>>= 0;
+
+  var result = Array(length);
+  while (++index < length) {
+    result[index] = array[index + start];
+  }
+  return result;
+}
+
+/**
+ * Gets the propery names, values, and compare flags of `object`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the match data of `object`.
+ */
+function getMatchData(object) {
+  var result = pairs(object),
+      length = result.length;
+
+  while (length--) {
+    result[length][2] = isStrictComparable(result[length][1]);
+  }
+  return result;
+}
+
+/**
+ * Checks if `value` is a property name and not a property path.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @param {Object} [object] The object to query keys on.
+ * @returns {boolean} Returns `true` if `value` is a property name, else `false`.
+ */
+function isKey(value, object) {
+  var type = typeof value;
+  if ((type == 'string' && reIsPlainProp.test(value)) || type == 'number') {
+    return true;
+  }
+  if (isArray(value)) {
+    return false;
+  }
+  var result = !reIsDeepProp.test(value);
+  return result || (object != null && value in toObject(object));
+}
+
+/**
+ * Checks if `value` is suitable for strict equality comparisons, i.e. `===`.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` if suitable for strict
+ *  equality comparisons, else `false`.
+ */
+function isStrictComparable(value) {
+  return value === value && !isObject(value);
+}
+
+/**
+ * Converts `value` to an object if it's not one.
+ *
+ * @private
+ * @param {*} value The value to process.
+ * @returns {Object} Returns the object.
+ */
+function toObject(value) {
+  return isObject(value) ? value : Object(value);
+}
+
+/**
+ * Converts `value` to property path array if it's not one.
+ *
+ * @private
+ * @param {*} value The value to process.
+ * @returns {Array} Returns the property path array.
+ */
+function toPath(value) {
+  if (isArray(value)) {
+    return value;
+  }
+  var result = [];
+  baseToString(value).replace(rePropName, function(match, number, quote, string) {
+    result.push(quote ? string.replace(reEscapeChar, '$1') : (number || match));
+  });
+  return result;
+}
+
+/**
+ * Gets the last element of `array`.
+ *
+ * @static
+ * @memberOf _
+ * @category Array
+ * @param {Array} array The array to query.
+ * @returns {*} Returns the last element of `array`.
+ * @example
+ *
+ * _.last([1, 2, 3]);
+ * // => 3
+ */
+function last(array) {
+  var length = array ? array.length : 0;
+  return length ? array[length - 1] : undefined;
+}
+
+/**
+ * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.
+ * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+ * @example
+ *
+ * _.isObject({});
+ * // => true
+ *
+ * _.isObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isObject(1);
+ * // => false
+ */
+function isObject(value) {
+  // Avoid a V8 JIT bug in Chrome 19-20.
+  // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.
+  var type = typeof value;
+  return !!value && (type == 'object' || type == 'function');
+}
+
+/**
+ * This method returns the first argument provided to it.
+ *
+ * @static
+ * @memberOf _
+ * @category Utility
+ * @param {*} value Any value.
+ * @returns {*} Returns `value`.
+ * @example
+ *
+ * var object = { 'user': 'fred' };
+ *
+ * _.identity(object) === object;
+ * // => true
+ */
+function identity(value) {
+  return value;
+}
+
+/**
+ * Creates a function that returns the property value at `path` on a
+ * given object.
+ *
+ * @static
+ * @memberOf _
+ * @category Utility
+ * @param {Array|string} path The path of the property to get.
+ * @returns {Function} Returns the new function.
+ * @example
+ *
+ * var objects = [
+ *   { 'a': { 'b': { 'c': 2 } } },
+ *   { 'a': { 'b': { 'c': 1 } } }
+ * ];
+ *
+ * _.map(objects, _.property('a.b.c'));
+ * // => [2, 1]
+ *
+ * _.pluck(_.sortBy(objects, _.property(['a', 'b', 'c'])), 'a.b.c');
+ * // => [1, 2]
+ */
+function property(path) {
+  return isKey(path) ? baseProperty(path) : basePropertyDeep(path);
+}
+
+module.exports = baseCallback;
diff --git a/deps/npm/node_modules/lodash._basecallback/package.json b/deps/npm/node_modules/lodash._basecallback/package.json
new file mode 100644
index 00000000000000..26f29994f7a060
--- /dev/null
+++ b/deps/npm/node_modules/lodash._basecallback/package.json
@@ -0,0 +1,118 @@
+{
+  "_args": [
+    [
+      "lodash._basecallback@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash.uniq"
+    ]
+  ],
+  "_from": "lodash._basecallback@>=3.0.0 <4.0.0",
+  "_id": "lodash._basecallback@3.3.1",
+  "_inCache": true,
+  "_location": "/lodash._basecallback",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.12.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._basecallback",
+    "raw": "lodash._basecallback@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash.uniq"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._basecallback/-/lodash._basecallback-3.3.1.tgz",
+  "_shasum": "b7b2bb43dc2160424a21ccf26c57e443772a8e27",
+  "_shrinkwrap": null,
+  "_spec": "lodash._basecallback@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash.uniq",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {
+    "lodash._baseisequal": "^3.0.0",
+    "lodash._bindcallback": "^3.0.0",
+    "lodash.isarray": "^3.0.0",
+    "lodash.pairs": "^3.0.0"
+  },
+  "description": "The modern build of lodash’s internal `baseCallback` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "b7b2bb43dc2160424a21ccf26c57e443772a8e27",
+    "tarball": "http://registry.npmjs.org/lodash._basecallback/-/lodash._basecallback-3.3.1.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    }
+  ],
+  "name": "lodash._basecallback",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.3.1"
+}
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/LICENSE.txt b/deps/npm/node_modules/lodash._baseclone/LICENSE
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/LICENSE.txt
rename to deps/npm/node_modules/lodash._baseclone/LICENSE
diff --git a/deps/npm/node_modules/lodash._baseclone/README.md b/deps/npm/node_modules/lodash._baseclone/README.md
new file mode 100644
index 00000000000000..883a43c3a48435
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseclone/README.md
@@ -0,0 +1,20 @@
+# lodash._baseclone v3.3.0
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseClone` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash._baseclone
+```
+
+In Node.js/io.js:
+
+```js
+var baseClone = require('lodash._baseclone');
+```
+
+See the [package source](https://github.com/lodash/lodash/blob/3.3.0-npm-packages/lodash._baseclone) for more details.
diff --git a/deps/npm/node_modules/lodash._baseclone/index.js b/deps/npm/node_modules/lodash._baseclone/index.js
new file mode 100644
index 00000000000000..4024d58ad339cb
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseclone/index.js
@@ -0,0 +1,271 @@
+/**
+ * lodash 3.3.0 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+var arrayCopy = require('lodash._arraycopy'),
+    arrayEach = require('lodash._arrayeach'),
+    baseAssign = require('lodash._baseassign'),
+    baseFor = require('lodash._basefor'),
+    isArray = require('lodash.isarray'),
+    keys = require('lodash.keys');
+
+/** `Object#toString` result references. */
+var argsTag = '[object Arguments]',
+    arrayTag = '[object Array]',
+    boolTag = '[object Boolean]',
+    dateTag = '[object Date]',
+    errorTag = '[object Error]',
+    funcTag = '[object Function]',
+    mapTag = '[object Map]',
+    numberTag = '[object Number]',
+    objectTag = '[object Object]',
+    regexpTag = '[object RegExp]',
+    setTag = '[object Set]',
+    stringTag = '[object String]',
+    weakMapTag = '[object WeakMap]';
+
+var arrayBufferTag = '[object ArrayBuffer]',
+    float32Tag = '[object Float32Array]',
+    float64Tag = '[object Float64Array]',
+    int8Tag = '[object Int8Array]',
+    int16Tag = '[object Int16Array]',
+    int32Tag = '[object Int32Array]',
+    uint8Tag = '[object Uint8Array]',
+    uint8ClampedTag = '[object Uint8ClampedArray]',
+    uint16Tag = '[object Uint16Array]',
+    uint32Tag = '[object Uint32Array]';
+
+/** Used to match `RegExp` flags from their coerced string values. */
+var reFlags = /\w*$/;
+
+/** Used to identify `toStringTag` values supported by `_.clone`. */
+var cloneableTags = {};
+cloneableTags[argsTag] = cloneableTags[arrayTag] =
+cloneableTags[arrayBufferTag] = cloneableTags[boolTag] =
+cloneableTags[dateTag] = cloneableTags[float32Tag] =
+cloneableTags[float64Tag] = cloneableTags[int8Tag] =
+cloneableTags[int16Tag] = cloneableTags[int32Tag] =
+cloneableTags[numberTag] = cloneableTags[objectTag] =
+cloneableTags[regexpTag] = cloneableTags[stringTag] =
+cloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] =
+cloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;
+cloneableTags[errorTag] = cloneableTags[funcTag] =
+cloneableTags[mapTag] = cloneableTags[setTag] =
+cloneableTags[weakMapTag] = false;
+
+/** Used for native method references. */
+var objectProto = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
+/**
+ * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)
+ * of values.
+ */
+var objToString = objectProto.toString;
+
+/** Native method references. */
+var ArrayBuffer = global.ArrayBuffer,
+    Uint8Array = global.Uint8Array;
+
+/**
+ * The base implementation of `_.clone` without support for argument juggling
+ * and `this` binding `customizer` functions.
+ *
+ * @private
+ * @param {*} value The value to clone.
+ * @param {boolean} [isDeep] Specify a deep clone.
+ * @param {Function} [customizer] The function to customize cloning values.
+ * @param {string} [key] The key of `value`.
+ * @param {Object} [object] The object `value` belongs to.
+ * @param {Array} [stackA=[]] Tracks traversed source objects.
+ * @param {Array} [stackB=[]] Associates clones with source counterparts.
+ * @returns {*} Returns the cloned value.
+ */
+function baseClone(value, isDeep, customizer, key, object, stackA, stackB) {
+  var result;
+  if (customizer) {
+    result = object ? customizer(value, key, object) : customizer(value);
+  }
+  if (result !== undefined) {
+    return result;
+  }
+  if (!isObject(value)) {
+    return value;
+  }
+  var isArr = isArray(value);
+  if (isArr) {
+    result = initCloneArray(value);
+    if (!isDeep) {
+      return arrayCopy(value, result);
+    }
+  } else {
+    var tag = objToString.call(value),
+        isFunc = tag == funcTag;
+
+    if (tag == objectTag || tag == argsTag || (isFunc && !object)) {
+      result = initCloneObject(isFunc ? {} : value);
+      if (!isDeep) {
+        return baseAssign(result, value);
+      }
+    } else {
+      return cloneableTags[tag]
+        ? initCloneByTag(value, tag, isDeep)
+        : (object ? value : {});
+    }
+  }
+  // Check for circular references and return its corresponding clone.
+  stackA || (stackA = []);
+  stackB || (stackB = []);
+
+  var length = stackA.length;
+  while (length--) {
+    if (stackA[length] == value) {
+      return stackB[length];
+    }
+  }
+  // Add the source value to the stack of traversed objects and associate it with its clone.
+  stackA.push(value);
+  stackB.push(result);
+
+  // Recursively populate clone (susceptible to call stack limits).
+  (isArr ? arrayEach : baseForOwn)(value, function(subValue, key) {
+    result[key] = baseClone(subValue, isDeep, customizer, key, value, stackA, stackB);
+  });
+  return result;
+}
+
+/**
+ * The base implementation of `_.forOwn` without support for callback
+ * shorthands and `this` binding.
+ *
+ * @private
+ * @param {Object} object The object to iterate over.
+ * @param {Function} iteratee The function invoked per iteration.
+ * @returns {Object} Returns `object`.
+ */
+function baseForOwn(object, iteratee) {
+  return baseFor(object, iteratee, keys);
+}
+
+/**
+ * Creates a clone of the given array buffer.
+ *
+ * @private
+ * @param {ArrayBuffer} buffer The array buffer to clone.
+ * @returns {ArrayBuffer} Returns the cloned array buffer.
+ */
+function bufferClone(buffer) {
+  var result = new ArrayBuffer(buffer.byteLength),
+      view = new Uint8Array(result);
+
+  view.set(new Uint8Array(buffer));
+  return result;
+}
+
+/**
+ * Initializes an array clone.
+ *
+ * @private
+ * @param {Array} array The array to clone.
+ * @returns {Array} Returns the initialized clone.
+ */
+function initCloneArray(array) {
+  var length = array.length,
+      result = new array.constructor(length);
+
+  // Add array properties assigned by `RegExp#exec`.
+  if (length && typeof array[0] == 'string' && hasOwnProperty.call(array, 'index')) {
+    result.index = array.index;
+    result.input = array.input;
+  }
+  return result;
+}
+
+/**
+ * Initializes an object clone.
+ *
+ * @private
+ * @param {Object} object The object to clone.
+ * @returns {Object} Returns the initialized clone.
+ */
+function initCloneObject(object) {
+  var Ctor = object.constructor;
+  if (!(typeof Ctor == 'function' && Ctor instanceof Ctor)) {
+    Ctor = Object;
+  }
+  return new Ctor;
+}
+
+/**
+ * Initializes an object clone based on its `toStringTag`.
+ *
+ * **Note:** This function only supports cloning values with tags of
+ * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`.
+ *
+ * @private
+ * @param {Object} object The object to clone.
+ * @param {string} tag The `toStringTag` of the object to clone.
+ * @param {boolean} [isDeep] Specify a deep clone.
+ * @returns {Object} Returns the initialized clone.
+ */
+function initCloneByTag(object, tag, isDeep) {
+  var Ctor = object.constructor;
+  switch (tag) {
+    case arrayBufferTag:
+      return bufferClone(object);
+
+    case boolTag:
+    case dateTag:
+      return new Ctor(+object);
+
+    case float32Tag: case float64Tag:
+    case int8Tag: case int16Tag: case int32Tag:
+    case uint8Tag: case uint8ClampedTag: case uint16Tag: case uint32Tag:
+      var buffer = object.buffer;
+      return new Ctor(isDeep ? bufferClone(buffer) : buffer, object.byteOffset, object.length);
+
+    case numberTag:
+    case stringTag:
+      return new Ctor(object);
+
+    case regexpTag:
+      var result = new Ctor(object.source, reFlags.exec(object));
+      result.lastIndex = object.lastIndex;
+  }
+  return result;
+}
+
+/**
+ * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.
+ * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+ * @example
+ *
+ * _.isObject({});
+ * // => true
+ *
+ * _.isObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isObject(1);
+ * // => false
+ */
+function isObject(value) {
+  // Avoid a V8 JIT bug in Chrome 19-20.
+  // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.
+  var type = typeof value;
+  return !!value && (type == 'object' || type == 'function');
+}
+
+module.exports = baseClone;
diff --git a/deps/npm/node_modules/lodash._baseclone/package.json b/deps/npm/node_modules/lodash._baseclone/package.json
new file mode 100644
index 00000000000000..ebfea785ecf519
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseclone/package.json
@@ -0,0 +1,120 @@
+{
+  "_args": [
+    [
+      "lodash._baseclone@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash.clonedeep"
+    ]
+  ],
+  "_from": "lodash._baseclone@>=3.0.0 <4.0.0",
+  "_id": "lodash._baseclone@3.3.0",
+  "_inCache": true,
+  "_location": "/lodash._baseclone",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.12.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._baseclone",
+    "raw": "lodash._baseclone@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash.clonedeep"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz",
+  "_shasum": "303519bf6393fe7e42f34d8b630ef7794e3542b7",
+  "_shrinkwrap": null,
+  "_spec": "lodash._baseclone@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash.clonedeep",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {
+    "lodash._arraycopy": "^3.0.0",
+    "lodash._arrayeach": "^3.0.0",
+    "lodash._baseassign": "^3.0.0",
+    "lodash._basefor": "^3.0.0",
+    "lodash.isarray": "^3.0.0",
+    "lodash.keys": "^3.0.0"
+  },
+  "description": "The modern build of lodash’s internal `baseClone` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "303519bf6393fe7e42f34d8b630ef7794e3542b7",
+    "tarball": "http://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    }
+  ],
+  "name": "lodash._baseclone",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.3.0"
+}
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/LICENSE.txt b/deps/npm/node_modules/lodash._basecopy/LICENSE.txt
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/LICENSE.txt
rename to deps/npm/node_modules/lodash._basecopy/LICENSE.txt
diff --git a/deps/npm/node_modules/lodash._basecopy/README.md b/deps/npm/node_modules/lodash._basecopy/README.md
new file mode 100644
index 00000000000000..acdfa29d3d210a
--- /dev/null
+++ b/deps/npm/node_modules/lodash._basecopy/README.md
@@ -0,0 +1,20 @@
+# lodash._basecopy v3.0.1
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseCopy` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash._basecopy
+```
+
+In Node.js/io.js:
+
+```js
+var baseCopy = require('lodash._basecopy');
+```
+
+See the [package source](https://github.com/lodash/lodash/blob/3.0.1-npm-packages/lodash._basecopy) for more details.
diff --git a/deps/npm/node_modules/lodash._basecopy/index.js b/deps/npm/node_modules/lodash._basecopy/index.js
new file mode 100644
index 00000000000000..b586d31d9d4345
--- /dev/null
+++ b/deps/npm/node_modules/lodash._basecopy/index.js
@@ -0,0 +1,32 @@
+/**
+ * lodash 3.0.1 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+
+/**
+ * Copies properties of `source` to `object`.
+ *
+ * @private
+ * @param {Object} source The object to copy properties from.
+ * @param {Array} props The property names to copy.
+ * @param {Object} [object={}] The object to copy properties to.
+ * @returns {Object} Returns `object`.
+ */
+function baseCopy(source, props, object) {
+  object || (object = {});
+
+  var index = -1,
+      length = props.length;
+
+  while (++index < length) {
+    var key = props[index];
+    object[key] = source[key];
+  }
+  return object;
+}
+
+module.exports = baseCopy;
diff --git a/deps/npm/node_modules/lodash._basecopy/package.json b/deps/npm/node_modules/lodash._basecopy/package.json
new file mode 100644
index 00000000000000..34df84a4df08b3
--- /dev/null
+++ b/deps/npm/node_modules/lodash._basecopy/package.json
@@ -0,0 +1,113 @@
+{
+  "_args": [
+    [
+      "lodash._basecopy@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash._baseassign"
+    ]
+  ],
+  "_from": "lodash._basecopy@>=3.0.0 <4.0.0",
+  "_id": "lodash._basecopy@3.0.1",
+  "_inCache": true,
+  "_location": "/lodash._basecopy",
+  "_nodeVersion": "0.12.2",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.7.6",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._basecopy",
+    "raw": "lodash._basecopy@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash._baseassign"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+  "_shasum": "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36",
+  "_shrinkwrap": null,
+  "_spec": "lodash._basecopy@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseassign",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {},
+  "description": "The modern build of lodash’s internal `baseCopy` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36",
+    "tarball": "http://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    }
+  ],
+  "name": "lodash._basecopy",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/lodash/lodash"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.0.1"
+}
diff --git a/deps/npm/node_modules/lodash._basedifference/LICENSE b/deps/npm/node_modules/lodash._basedifference/LICENSE
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash._basedifference/LICENSE
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash._basedifference/README.md b/deps/npm/node_modules/lodash._basedifference/README.md
new file mode 100644
index 00000000000000..d9b809cfd2a277
--- /dev/null
+++ b/deps/npm/node_modules/lodash._basedifference/README.md
@@ -0,0 +1,20 @@
+# lodash._basedifference v3.0.3
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseDifference` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash._basedifference
+```
+
+In Node.js/io.js:
+
+```js
+var baseDifference = require('lodash._basedifference');
+```
+
+See the [package source](https://github.com/lodash/lodash/blob/3.0.3-npm-packages/lodash._basedifference) for more details.
diff --git a/deps/npm/node_modules/lodash._basedifference/index.js b/deps/npm/node_modules/lodash._basedifference/index.js
new file mode 100644
index 00000000000000..43c6460fd1e17f
--- /dev/null
+++ b/deps/npm/node_modules/lodash._basedifference/index.js
@@ -0,0 +1,63 @@
+/**
+ * lodash 3.0.3 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+var baseIndexOf = require('lodash._baseindexof'),
+    cacheIndexOf = require('lodash._cacheindexof'),
+    createCache = require('lodash._createcache');
+
+/** Used as the size to enable large array optimizations. */
+var LARGE_ARRAY_SIZE = 200;
+
+/**
+ * The base implementation of `_.difference` which accepts a single array
+ * of values to exclude.
+ *
+ * @private
+ * @param {Array} array The array to inspect.
+ * @param {Array} values The values to exclude.
+ * @returns {Array} Returns the new array of filtered values.
+ */
+function baseDifference(array, values) {
+  var length = array ? array.length : 0,
+      result = [];
+
+  if (!length) {
+    return result;
+  }
+  var index = -1,
+      indexOf = baseIndexOf,
+      isCommon = true,
+      cache = (isCommon && values.length >= LARGE_ARRAY_SIZE) ? createCache(values) : null,
+      valuesLength = values.length;
+
+  if (cache) {
+    indexOf = cacheIndexOf;
+    isCommon = false;
+    values = cache;
+  }
+  outer:
+  while (++index < length) {
+    var value = array[index];
+
+    if (isCommon && value === value) {
+      var valuesIndex = valuesLength;
+      while (valuesIndex--) {
+        if (values[valuesIndex] === value) {
+          continue outer;
+        }
+      }
+      result.push(value);
+    }
+    else if (indexOf(values, value, 0) < 0) {
+      result.push(value);
+    }
+  }
+  return result;
+}
+
+module.exports = baseDifference;
diff --git a/deps/npm/node_modules/lodash._basedifference/package.json b/deps/npm/node_modules/lodash._basedifference/package.json
new file mode 100644
index 00000000000000..e44ef4e8fa750c
--- /dev/null
+++ b/deps/npm/node_modules/lodash._basedifference/package.json
@@ -0,0 +1,117 @@
+{
+  "_args": [
+    [
+      "lodash._basedifference@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash.without"
+    ]
+  ],
+  "_from": "lodash._basedifference@>=3.0.0 <4.0.0",
+  "_id": "lodash._basedifference@3.0.3",
+  "_inCache": true,
+  "_location": "/lodash._basedifference",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.12.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._basedifference",
+    "raw": "lodash._basedifference@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash.without"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-3.0.3.tgz",
+  "_shasum": "f2c204296c2a78e02b389081b6edcac933cf629c",
+  "_shrinkwrap": null,
+  "_spec": "lodash._basedifference@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash.without",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {
+    "lodash._baseindexof": "^3.0.0",
+    "lodash._cacheindexof": "^3.0.0",
+    "lodash._createcache": "^3.0.0"
+  },
+  "description": "The modern build of lodash’s internal `baseDifference` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "f2c204296c2a78e02b389081b6edcac933cf629c",
+    "tarball": "http://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-3.0.3.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    }
+  ],
+  "name": "lodash._basedifference",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.0.3"
+}
diff --git a/deps/npm/node_modules/lodash._baseflatten/LICENSE b/deps/npm/node_modules/lodash._baseflatten/LICENSE
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseflatten/LICENSE
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash._baseflatten/README.md b/deps/npm/node_modules/lodash._baseflatten/README.md
new file mode 100644
index 00000000000000..f3e227779c4f89
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseflatten/README.md
@@ -0,0 +1,20 @@
+# lodash._baseflatten v3.1.4
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseFlatten` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash._baseflatten
+```
+
+In Node.js/io.js:
+
+```js
+var baseFlatten = require('lodash._baseflatten');
+```
+
+See the [package source](https://github.com/lodash/lodash/blob/3.1.4-npm-packages/lodash._baseflatten) for more details.
diff --git a/deps/npm/node_modules/lodash._baseflatten/index.js b/deps/npm/node_modules/lodash._baseflatten/index.js
new file mode 100644
index 00000000000000..c43acfa729179c
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseflatten/index.js
@@ -0,0 +1,131 @@
+/**
+ * lodash 3.1.4 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+var isArguments = require('lodash.isarguments'),
+    isArray = require('lodash.isarray');
+
+/**
+ * Checks if `value` is object-like.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
+ */
+function isObjectLike(value) {
+  return !!value && typeof value == 'object';
+}
+
+/**
+ * Used as the [maximum length](http://ecma-international.org/ecma-262/6.0/#sec-number.max_safe_integer)
+ * of an array-like value.
+ */
+var MAX_SAFE_INTEGER = 9007199254740991;
+
+/**
+ * Appends the elements of `values` to `array`.
+ *
+ * @private
+ * @param {Array} array The array to modify.
+ * @param {Array} values The values to append.
+ * @returns {Array} Returns `array`.
+ */
+function arrayPush(array, values) {
+  var index = -1,
+      length = values.length,
+      offset = array.length;
+
+  while (++index < length) {
+    array[offset + index] = values[index];
+  }
+  return array;
+}
+
+/**
+ * The base implementation of `_.flatten` with added support for restricting
+ * flattening and specifying the start index.
+ *
+ * @private
+ * @param {Array} array The array to flatten.
+ * @param {boolean} [isDeep] Specify a deep flatten.
+ * @param {boolean} [isStrict] Restrict flattening to arrays-like objects.
+ * @param {Array} [result=[]] The initial result value.
+ * @returns {Array} Returns the new flattened array.
+ */
+function baseFlatten(array, isDeep, isStrict, result) {
+  result || (result = []);
+
+  var index = -1,
+      length = array.length;
+
+  while (++index < length) {
+    var value = array[index];
+    if (isObjectLike(value) && isArrayLike(value) &&
+        (isStrict || isArray(value) || isArguments(value))) {
+      if (isDeep) {
+        // Recursively flatten arrays (susceptible to call stack limits).
+        baseFlatten(value, isDeep, isStrict, result);
+      } else {
+        arrayPush(result, value);
+      }
+    } else if (!isStrict) {
+      result[result.length] = value;
+    }
+  }
+  return result;
+}
+
+/**
+ * The base implementation of `_.property` without support for deep paths.
+ *
+ * @private
+ * @param {string} key The key of the property to get.
+ * @returns {Function} Returns the new function.
+ */
+function baseProperty(key) {
+  return function(object) {
+    return object == null ? undefined : object[key];
+  };
+}
+
+/**
+ * Gets the "length" property value of `object`.
+ *
+ * **Note:** This function is used to avoid a [JIT bug](https://bugs.webkit.org/show_bug.cgi?id=142792)
+ * that affects Safari on at least iOS 8.1-8.3 ARM64.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {*} Returns the "length" value.
+ */
+var getLength = baseProperty('length');
+
+/**
+ * Checks if `value` is array-like.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is array-like, else `false`.
+ */
+function isArrayLike(value) {
+  return value != null && isLength(getLength(value));
+}
+
+/**
+ * Checks if `value` is a valid array-like length.
+ *
+ * **Note:** This function is based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
+ */
+function isLength(value) {
+  return typeof value == 'number' && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
+}
+
+module.exports = baseFlatten;
diff --git a/deps/npm/node_modules/lodash._baseflatten/package.json b/deps/npm/node_modules/lodash._baseflatten/package.json
new file mode 100644
index 00000000000000..48b2545dcad0c9
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseflatten/package.json
@@ -0,0 +1,116 @@
+{
+  "_args": [
+    [
+      "lodash._baseflatten@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash.union"
+    ]
+  ],
+  "_from": "lodash._baseflatten@>=3.0.0 <4.0.0",
+  "_id": "lodash._baseflatten@3.1.4",
+  "_inCache": true,
+  "_location": "/lodash._baseflatten",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.12.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._baseflatten",
+    "raw": "lodash._baseflatten@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash.union"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz",
+  "_shasum": "0770ff80131af6e34f3b511796a7ba5214e65ff7",
+  "_shrinkwrap": null,
+  "_spec": "lodash._baseflatten@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash.union",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {
+    "lodash.isarguments": "^3.0.0",
+    "lodash.isarray": "^3.0.0"
+  },
+  "description": "The modern build of lodash’s internal `baseFlatten` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "0770ff80131af6e34f3b511796a7ba5214e65ff7",
+    "tarball": "http://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    }
+  ],
+  "name": "lodash._baseflatten",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.1.4"
+}
diff --git a/deps/npm/node_modules/lodash._basefor/LICENSE.txt b/deps/npm/node_modules/lodash._basefor/LICENSE.txt
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash._basefor/LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash._basefor/README.md b/deps/npm/node_modules/lodash._basefor/README.md
new file mode 100644
index 00000000000000..d9e33731b2fc90
--- /dev/null
+++ b/deps/npm/node_modules/lodash._basefor/README.md
@@ -0,0 +1,20 @@
+# lodash._basefor v3.0.2
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseFor` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash._basefor
+```
+
+In Node.js/io.js:
+
+```js
+var baseFor = require('lodash._basefor');
+```
+
+See the [package source](https://github.com/lodash/lodash/blob/3.0.2-npm-packages/lodash._basefor) for more details.
diff --git a/deps/npm/node_modules/lodash._basefor/index.js b/deps/npm/node_modules/lodash._basefor/index.js
new file mode 100644
index 00000000000000..a3d7dcd1014da0
--- /dev/null
+++ b/deps/npm/node_modules/lodash._basefor/index.js
@@ -0,0 +1,86 @@
+/**
+ * lodash 3.0.2 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+
+/**
+ * The base implementation of `baseForIn` and `baseForOwn` which iterates
+ * over `object` properties returned by `keysFunc` invoking `iteratee` for
+ * each property. Iteratee functions may exit iteration early by explicitly
+ * returning `false`.
+ *
+ * @private
+ * @param {Object} object The object to iterate over.
+ * @param {Function} iteratee The function invoked per iteration.
+ * @param {Function} keysFunc The function to get the keys of `object`.
+ * @returns {Object} Returns `object`.
+ */
+var baseFor = createBaseFor();
+
+/**
+ * Creates a base function for `_.forIn` or `_.forInRight`.
+ *
+ * @private
+ * @param {boolean} [fromRight] Specify iterating from right to left.
+ * @returns {Function} Returns the new base function.
+ */
+function createBaseFor(fromRight) {
+  return function(object, iteratee, keysFunc) {
+    var iterable = toObject(object),
+        props = keysFunc(object),
+        length = props.length,
+        index = fromRight ? length : -1;
+
+    while ((fromRight ? index-- : ++index < length)) {
+      var key = props[index];
+      if (iteratee(iterable[key], key, iterable) === false) {
+        break;
+      }
+    }
+    return object;
+  };
+}
+
+/**
+ * Converts `value` to an object if it's not one.
+ *
+ * @private
+ * @param {*} value The value to process.
+ * @returns {Object} Returns the object.
+ */
+function toObject(value) {
+  return isObject(value) ? value : Object(value);
+}
+
+/**
+ * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.
+ * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+ * @example
+ *
+ * _.isObject({});
+ * // => true
+ *
+ * _.isObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isObject(1);
+ * // => false
+ */
+function isObject(value) {
+  // Avoid a V8 JIT bug in Chrome 19-20.
+  // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.
+  var type = typeof value;
+  return !!value && (type == 'object' || type == 'function');
+}
+
+module.exports = baseFor;
diff --git a/deps/npm/node_modules/lodash._basefor/package.json b/deps/npm/node_modules/lodash._basefor/package.json
new file mode 100644
index 00000000000000..898b10c857e37d
--- /dev/null
+++ b/deps/npm/node_modules/lodash._basefor/package.json
@@ -0,0 +1,113 @@
+{
+  "_args": [
+    [
+      "lodash._basefor@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash._baseclone"
+    ]
+  ],
+  "_from": "lodash._basefor@>=3.0.0 <4.0.0",
+  "_id": "lodash._basefor@3.0.2",
+  "_inCache": true,
+  "_location": "/lodash._basefor",
+  "_nodeVersion": "0.12.3",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.10.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._basefor",
+    "raw": "lodash._basefor@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash._baseclone"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.2.tgz",
+  "_shasum": "3a4cece5b7031eae78a441c5416b90878eeee5a1",
+  "_shrinkwrap": null,
+  "_spec": "lodash._basefor@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseclone",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {},
+  "description": "The modern build of lodash’s internal `baseFor` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "3a4cece5b7031eae78a441c5416b90878eeee5a1",
+    "tarball": "http://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.2.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    }
+  ],
+  "name": "lodash._basefor",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.0.2"
+}
diff --git a/deps/npm/node_modules/lodash._baseindexof/LICENSE.txt b/deps/npm/node_modules/lodash._baseindexof/LICENSE.txt
new file mode 100644
index 00000000000000..17764328c826b5
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseindexof/LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js 1.7.0, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash._baseindexof/README.md b/deps/npm/node_modules/lodash._baseindexof/README.md
new file mode 100644
index 00000000000000..ddcc79d5d66aee
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseindexof/README.md
@@ -0,0 +1,20 @@
+# lodash._baseindexof v3.1.0
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseIndexOf` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash._baseindexof
+```
+
+In Node.js/io.js:
+
+```js
+var baseIndexOf = require('lodash._baseindexof');
+```
+
+See the [package source](https://github.com/lodash/lodash/blob/3.1.0-npm-packages/lodash._baseindexof) for more details.
diff --git a/deps/npm/node_modules/lodash._baseindexof/index.js b/deps/npm/node_modules/lodash._baseindexof/index.js
new file mode 100644
index 00000000000000..e5da79147894ae
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseindexof/index.js
@@ -0,0 +1,57 @@
+/**
+ * lodash 3.1.0 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.2 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+
+/**
+ * The base implementation of `_.indexOf` without support for binary searches.
+ *
+ * @private
+ * @param {Array} array The array to search.
+ * @param {*} value The value to search for.
+ * @param {number} fromIndex The index to search from.
+ * @returns {number} Returns the index of the matched value, else `-1`.
+ */
+function baseIndexOf(array, value, fromIndex) {
+  if (value !== value) {
+    return indexOfNaN(array, fromIndex);
+  }
+  var index = fromIndex - 1,
+      length = array.length;
+
+  while (++index < length) {
+    if (array[index] === value) {
+      return index;
+    }
+  }
+  return -1;
+}
+
+/**
+ * Gets the index at which the first occurrence of `NaN` is found in `array`.
+ * If `fromRight` is provided elements of `array` are iterated from right to left.
+ *
+ * @private
+ * @param {Array} array The array to search.
+ * @param {number} fromIndex The index to search from.
+ * @param {boolean} [fromRight] Specify iterating from right to left.
+ * @returns {number} Returns the index of the matched `NaN`, else `-1`.
+ */
+function indexOfNaN(array, fromIndex, fromRight) {
+  var length = array.length,
+      index = fromIndex + (fromRight ? 0 : -1);
+
+  while ((fromRight ? index-- : ++index < length)) {
+    var other = array[index];
+    if (other !== other) {
+      return index;
+    }
+  }
+  return -1;
+}
+
+module.exports = baseIndexOf;
diff --git a/deps/npm/node_modules/lodash._baseindexof/package.json b/deps/npm/node_modules/lodash._baseindexof/package.json
new file mode 100644
index 00000000000000..9c14340985446a
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseindexof/package.json
@@ -0,0 +1,114 @@
+{
+  "_args": [
+    [
+      "lodash._baseindexof@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash._baseuniq"
+    ]
+  ],
+  "_from": "lodash._baseindexof@>=3.0.0 <4.0.0",
+  "_id": "lodash._baseindexof@3.1.0",
+  "_inCache": true,
+  "_location": "/lodash._baseindexof",
+  "_nodeVersion": "0.12.0",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.6.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._baseindexof",
+    "raw": "lodash._baseindexof@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash._basedifference",
+    "/lodash._baseuniq"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz",
+  "_shasum": "fe52b53a1c6761e42618d654e4a25789ed61822c",
+  "_shrinkwrap": null,
+  "_spec": "lodash._baseindexof@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseuniq",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {},
+  "description": "The modern build of lodash’s internal `baseIndexOf` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "fe52b53a1c6761e42618d654e4a25789ed61822c",
+    "tarball": "http://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    }
+  ],
+  "name": "lodash._baseindexof",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/lodash/lodash"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.1.0"
+}
diff --git a/deps/npm/node_modules/lodash._baseisequal/LICENSE.txt b/deps/npm/node_modules/lodash._baseisequal/LICENSE.txt
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseisequal/LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash._baseisequal/README.md b/deps/npm/node_modules/lodash._baseisequal/README.md
new file mode 100644
index 00000000000000..7261bf341cd90e
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseisequal/README.md
@@ -0,0 +1,20 @@
+# lodash._baseisequal v3.0.7
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseIsEqual` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash._baseisequal
+```
+
+In Node.js/io.js:
+
+```js
+var baseIsEqual = require('lodash._baseisequal');
+```
+
+See the [package source](https://github.com/lodash/lodash/blob/3.0.7-npm-packages/lodash._baseisequal) for more details.
diff --git a/deps/npm/node_modules/lodash._baseisequal/index.js b/deps/npm/node_modules/lodash._baseisequal/index.js
new file mode 100644
index 00000000000000..76aebe4a3998df
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseisequal/index.js
@@ -0,0 +1,342 @@
+/**
+ * lodash 3.0.7 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+var isArray = require('lodash.isarray'),
+    isTypedArray = require('lodash.istypedarray'),
+    keys = require('lodash.keys');
+
+/** `Object#toString` result references. */
+var argsTag = '[object Arguments]',
+    arrayTag = '[object Array]',
+    boolTag = '[object Boolean]',
+    dateTag = '[object Date]',
+    errorTag = '[object Error]',
+    numberTag = '[object Number]',
+    objectTag = '[object Object]',
+    regexpTag = '[object RegExp]',
+    stringTag = '[object String]';
+
+/**
+ * Checks if `value` is object-like.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
+ */
+function isObjectLike(value) {
+  return !!value && typeof value == 'object';
+}
+
+/** Used for native method references. */
+var objectProto = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
+/**
+ * Used to resolve the [`toStringTag`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-object.prototype.tostring)
+ * of values.
+ */
+var objToString = objectProto.toString;
+
+/**
+ * A specialized version of `_.some` for arrays without support for callback
+ * shorthands and `this` binding.
+ *
+ * @private
+ * @param {Array} array The array to iterate over.
+ * @param {Function} predicate The function invoked per iteration.
+ * @returns {boolean} Returns `true` if any element passes the predicate check,
+ *  else `false`.
+ */
+function arraySome(array, predicate) {
+  var index = -1,
+      length = array.length;
+
+  while (++index < length) {
+    if (predicate(array[index], index, array)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * The base implementation of `_.isEqual` without support for `this` binding
+ * `customizer` functions.
+ *
+ * @private
+ * @param {*} value The value to compare.
+ * @param {*} other The other value to compare.
+ * @param {Function} [customizer] The function to customize comparing values.
+ * @param {boolean} [isLoose] Specify performing partial comparisons.
+ * @param {Array} [stackA] Tracks traversed `value` objects.
+ * @param {Array} [stackB] Tracks traversed `other` objects.
+ * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+ */
+function baseIsEqual(value, other, customizer, isLoose, stackA, stackB) {
+  if (value === other) {
+    return true;
+  }
+  if (value == null || other == null || (!isObject(value) && !isObjectLike(other))) {
+    return value !== value && other !== other;
+  }
+  return baseIsEqualDeep(value, other, baseIsEqual, customizer, isLoose, stackA, stackB);
+}
+
+/**
+ * A specialized version of `baseIsEqual` for arrays and objects which performs
+ * deep comparisons and tracks traversed objects enabling objects with circular
+ * references to be compared.
+ *
+ * @private
+ * @param {Object} object The object to compare.
+ * @param {Object} other The other object to compare.
+ * @param {Function} equalFunc The function to determine equivalents of values.
+ * @param {Function} [customizer] The function to customize comparing objects.
+ * @param {boolean} [isLoose] Specify performing partial comparisons.
+ * @param {Array} [stackA=[]] Tracks traversed `value` objects.
+ * @param {Array} [stackB=[]] Tracks traversed `other` objects.
+ * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
+ */
+function baseIsEqualDeep(object, other, equalFunc, customizer, isLoose, stackA, stackB) {
+  var objIsArr = isArray(object),
+      othIsArr = isArray(other),
+      objTag = arrayTag,
+      othTag = arrayTag;
+
+  if (!objIsArr) {
+    objTag = objToString.call(object);
+    if (objTag == argsTag) {
+      objTag = objectTag;
+    } else if (objTag != objectTag) {
+      objIsArr = isTypedArray(object);
+    }
+  }
+  if (!othIsArr) {
+    othTag = objToString.call(other);
+    if (othTag == argsTag) {
+      othTag = objectTag;
+    } else if (othTag != objectTag) {
+      othIsArr = isTypedArray(other);
+    }
+  }
+  var objIsObj = objTag == objectTag,
+      othIsObj = othTag == objectTag,
+      isSameTag = objTag == othTag;
+
+  if (isSameTag && !(objIsArr || objIsObj)) {
+    return equalByTag(object, other, objTag);
+  }
+  if (!isLoose) {
+    var objIsWrapped = objIsObj && hasOwnProperty.call(object, '__wrapped__'),
+        othIsWrapped = othIsObj && hasOwnProperty.call(other, '__wrapped__');
+
+    if (objIsWrapped || othIsWrapped) {
+      return equalFunc(objIsWrapped ? object.value() : object, othIsWrapped ? other.value() : other, customizer, isLoose, stackA, stackB);
+    }
+  }
+  if (!isSameTag) {
+    return false;
+  }
+  // Assume cyclic values are equal.
+  // For more information on detecting circular references see https://es5.github.io/#JO.
+  stackA || (stackA = []);
+  stackB || (stackB = []);
+
+  var length = stackA.length;
+  while (length--) {
+    if (stackA[length] == object) {
+      return stackB[length] == other;
+    }
+  }
+  // Add `object` and `other` to the stack of traversed objects.
+  stackA.push(object);
+  stackB.push(other);
+
+  var result = (objIsArr ? equalArrays : equalObjects)(object, other, equalFunc, customizer, isLoose, stackA, stackB);
+
+  stackA.pop();
+  stackB.pop();
+
+  return result;
+}
+
+/**
+ * A specialized version of `baseIsEqualDeep` for arrays with support for
+ * partial deep comparisons.
+ *
+ * @private
+ * @param {Array} array The array to compare.
+ * @param {Array} other The other array to compare.
+ * @param {Function} equalFunc The function to determine equivalents of values.
+ * @param {Function} [customizer] The function to customize comparing arrays.
+ * @param {boolean} [isLoose] Specify performing partial comparisons.
+ * @param {Array} [stackA] Tracks traversed `value` objects.
+ * @param {Array} [stackB] Tracks traversed `other` objects.
+ * @returns {boolean} Returns `true` if the arrays are equivalent, else `false`.
+ */
+function equalArrays(array, other, equalFunc, customizer, isLoose, stackA, stackB) {
+  var index = -1,
+      arrLength = array.length,
+      othLength = other.length;
+
+  if (arrLength != othLength && !(isLoose && othLength > arrLength)) {
+    return false;
+  }
+  // Ignore non-index properties.
+  while (++index < arrLength) {
+    var arrValue = array[index],
+        othValue = other[index],
+        result = customizer ? customizer(isLoose ? othValue : arrValue, isLoose ? arrValue : othValue, index) : undefined;
+
+    if (result !== undefined) {
+      if (result) {
+        continue;
+      }
+      return false;
+    }
+    // Recursively compare arrays (susceptible to call stack limits).
+    if (isLoose) {
+      if (!arraySome(other, function(othValue) {
+            return arrValue === othValue || equalFunc(arrValue, othValue, customizer, isLoose, stackA, stackB);
+          })) {
+        return false;
+      }
+    } else if (!(arrValue === othValue || equalFunc(arrValue, othValue, customizer, isLoose, stackA, stackB))) {
+      return false;
+    }
+  }
+  return true;
+}
+
+/**
+ * A specialized version of `baseIsEqualDeep` for comparing objects of
+ * the same `toStringTag`.
+ *
+ * **Note:** This function only supports comparing values with tags of
+ * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`.
+ *
+ * @private
+ * @param {Object} value The object to compare.
+ * @param {Object} other The other object to compare.
+ * @param {string} tag The `toStringTag` of the objects to compare.
+ * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
+ */
+function equalByTag(object, other, tag) {
+  switch (tag) {
+    case boolTag:
+    case dateTag:
+      // Coerce dates and booleans to numbers, dates to milliseconds and booleans
+      // to `1` or `0` treating invalid dates coerced to `NaN` as not equal.
+      return +object == +other;
+
+    case errorTag:
+      return object.name == other.name && object.message == other.message;
+
+    case numberTag:
+      // Treat `NaN` vs. `NaN` as equal.
+      return (object != +object)
+        ? other != +other
+        : object == +other;
+
+    case regexpTag:
+    case stringTag:
+      // Coerce regexes to strings and treat strings primitives and string
+      // objects as equal. See https://es5.github.io/#x15.10.6.4 for more details.
+      return object == (other + '');
+  }
+  return false;
+}
+
+/**
+ * A specialized version of `baseIsEqualDeep` for objects with support for
+ * partial deep comparisons.
+ *
+ * @private
+ * @param {Object} object The object to compare.
+ * @param {Object} other The other object to compare.
+ * @param {Function} equalFunc The function to determine equivalents of values.
+ * @param {Function} [customizer] The function to customize comparing values.
+ * @param {boolean} [isLoose] Specify performing partial comparisons.
+ * @param {Array} [stackA] Tracks traversed `value` objects.
+ * @param {Array} [stackB] Tracks traversed `other` objects.
+ * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
+ */
+function equalObjects(object, other, equalFunc, customizer, isLoose, stackA, stackB) {
+  var objProps = keys(object),
+      objLength = objProps.length,
+      othProps = keys(other),
+      othLength = othProps.length;
+
+  if (objLength != othLength && !isLoose) {
+    return false;
+  }
+  var index = objLength;
+  while (index--) {
+    var key = objProps[index];
+    if (!(isLoose ? key in other : hasOwnProperty.call(other, key))) {
+      return false;
+    }
+  }
+  var skipCtor = isLoose;
+  while (++index < objLength) {
+    key = objProps[index];
+    var objValue = object[key],
+        othValue = other[key],
+        result = customizer ? customizer(isLoose ? othValue : objValue, isLoose? objValue : othValue, key) : undefined;
+
+    // Recursively compare objects (susceptible to call stack limits).
+    if (!(result === undefined ? equalFunc(objValue, othValue, customizer, isLoose, stackA, stackB) : result)) {
+      return false;
+    }
+    skipCtor || (skipCtor = key == 'constructor');
+  }
+  if (!skipCtor) {
+    var objCtor = object.constructor,
+        othCtor = other.constructor;
+
+    // Non `Object` object instances with different constructors are not equal.
+    if (objCtor != othCtor &&
+        ('constructor' in object && 'constructor' in other) &&
+        !(typeof objCtor == 'function' && objCtor instanceof objCtor &&
+          typeof othCtor == 'function' && othCtor instanceof othCtor)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+/**
+ * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.
+ * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+ * @example
+ *
+ * _.isObject({});
+ * // => true
+ *
+ * _.isObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isObject(1);
+ * // => false
+ */
+function isObject(value) {
+  // Avoid a V8 JIT bug in Chrome 19-20.
+  // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.
+  var type = typeof value;
+  return !!value && (type == 'object' || type == 'function');
+}
+
+module.exports = baseIsEqual;
diff --git a/deps/npm/node_modules/lodash._baseisequal/package.json b/deps/npm/node_modules/lodash._baseisequal/package.json
new file mode 100644
index 00000000000000..8fe01997710cbf
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseisequal/package.json
@@ -0,0 +1,117 @@
+{
+  "_args": [
+    [
+      "lodash._baseisequal@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash._basecallback"
+    ]
+  ],
+  "_from": "lodash._baseisequal@>=3.0.0 <4.0.0",
+  "_id": "lodash._baseisequal@3.0.7",
+  "_inCache": true,
+  "_location": "/lodash._baseisequal",
+  "_nodeVersion": "2.0.2",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.10.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._baseisequal",
+    "raw": "lodash._baseisequal@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash._basecallback"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz",
+  "_shasum": "d8025f76339d29342767dcc887ce5cb95a5b51f1",
+  "_shrinkwrap": null,
+  "_spec": "lodash._baseisequal@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash._basecallback",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {
+    "lodash.isarray": "^3.0.0",
+    "lodash.istypedarray": "^3.0.0",
+    "lodash.keys": "^3.0.0"
+  },
+  "description": "The modern build of lodash’s internal `baseIsEqual` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "d8025f76339d29342767dcc887ce5cb95a5b51f1",
+    "tarball": "http://registry.npmjs.org/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    }
+  ],
+  "name": "lodash._baseisequal",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.0.7"
+}
diff --git a/deps/npm/node_modules/lodash._basetostring/LICENSE b/deps/npm/node_modules/lodash._basetostring/LICENSE
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash._basetostring/LICENSE
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/README.md b/deps/npm/node_modules/lodash._basetostring/README.md
similarity index 84%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/README.md
rename to deps/npm/node_modules/lodash._basetostring/README.md
index ad04ea956e4d20..f81145e6ebe765 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/README.md
+++ b/deps/npm/node_modules/lodash._basetostring/README.md
@@ -1,4 +1,4 @@
-# lodash._basetostring v3.0.0
+# lodash._basetostring v3.0.1
 
 The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseToString` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
 
@@ -17,4 +17,4 @@ In Node.js/io.js:
 var baseToString = require('lodash._basetostring');
 ```
 
-See the [package source](https://github.com/lodash/lodash/blob/3.0.0-npm-packages/lodash._basetostring) for more details.
+See the [package source](https://github.com/lodash/lodash/blob/3.0.1-npm-packages/lodash._basetostring) for more details.
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/index.js b/deps/npm/node_modules/lodash._basetostring/index.js
similarity index 68%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/index.js
rename to deps/npm/node_modules/lodash._basetostring/index.js
index 71ac885889b9e6..db8ecc9fdd0094 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/index.js
+++ b/deps/npm/node_modules/lodash._basetostring/index.js
@@ -1,14 +1,14 @@
 /**
- * lodash 3.0.0 (Custom Build) <https://lodash.com/>
+ * lodash 3.0.1 (Custom Build) <https://lodash.com/>
  * Build: `lodash modern modularize exports="npm" -o ./`
  * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
- * Based on Underscore.js 1.7.0 <http://underscorejs.org/LICENSE>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
  * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
  * Available under MIT license <https://lodash.com/license>
  */
 
 /**
- * Converts `value` to a string if it is not one. An empty string is returned
+ * Converts `value` to a string if it's not one. An empty string is returned
  * for `null` or `undefined` values.
  *
  * @private
@@ -16,9 +16,6 @@
  * @returns {string} Returns the string.
  */
 function baseToString(value) {
-  if (typeof value == 'string') {
-    return value;
-  }
   return value == null ? '' : (value + '');
 }
 
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/package.json b/deps/npm/node_modules/lodash._basetostring/package.json
similarity index 52%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/package.json
rename to deps/npm/node_modules/lodash._basetostring/package.json
index dfb815b75772c1..072f16bd0207e2 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/package.json
+++ b/deps/npm/node_modules/lodash._basetostring/package.json
@@ -1,15 +1,48 @@
 {
-  "name": "lodash._basetostring",
-  "version": "3.0.0",
-  "description": "The modern build of lodash’s internal `baseToString` as a module.",
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
+  "_args": [
+    [
+      "lodash._basetostring@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash.pad"
+    ]
+  ],
+  "_from": "lodash._basetostring@>=3.0.0 <4.0.0",
+  "_id": "lodash._basetostring@3.0.1",
+  "_inCache": true,
+  "_location": "/lodash._basetostring",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.12.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._basetostring",
+    "raw": "lodash._basetostring@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash.pad",
+    "/lodash.padleft",
+    "/lodash.padright",
+    "/lodash.repeat"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
+  "_shasum": "d1861d877f824a52f669832dcaf3ee15566a07d5",
+  "_shrinkwrap": null,
+  "_spec": "lodash._basetostring@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash.pad",
   "author": {
-    "name": "John-David Dalton",
     "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
     "url": "http://allyoucanleet.com/"
   },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -37,36 +70,47 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lodash/lodash.git"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
-  },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
-  "_id": "lodash._basetostring@3.0.0",
-  "_shasum": "75a9a4aaaa2b2a8761111ff5431e7d83c1daf0e2",
-  "_from": "lodash._basetostring@3.0.0",
-  "_npmVersion": "2.3.0",
-  "_nodeVersion": "0.10.35",
-  "_npmUser": {
-    "name": "jdalton",
-    "email": "john.david.dalton@gmail.com"
+  "dependencies": {},
+  "description": "The modern build of lodash’s internal `baseToString` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "d1861d877f824a52f669832dcaf3ee15566a07d5",
+    "tarball": "http://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
   },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "maintainers": [
     {
       "name": "jdalton",
       "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
     }
   ],
-  "dist": {
-    "shasum": "75a9a4aaaa2b2a8761111ff5431e7d83c1daf0e2",
-    "tarball": "http://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
+  "name": "lodash._basetostring",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.0.1"
 }
diff --git a/deps/npm/node_modules/lodash._baseuniq/LICENSE b/deps/npm/node_modules/lodash._baseuniq/LICENSE
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseuniq/LICENSE
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash._baseuniq/README.md b/deps/npm/node_modules/lodash._baseuniq/README.md
new file mode 100644
index 00000000000000..ad71873dc90346
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseuniq/README.md
@@ -0,0 +1,20 @@
+# lodash._baseuniq v3.0.3
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseUniq` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash._baseuniq
+```
+
+In Node.js/io.js:
+
+```js
+var baseUniq = require('lodash._baseuniq');
+```
+
+See the [package source](https://github.com/lodash/lodash/blob/3.0.3-npm-packages/lodash._baseuniq) for more details.
diff --git a/deps/npm/node_modules/lodash._baseuniq/index.js b/deps/npm/node_modules/lodash._baseuniq/index.js
new file mode 100644
index 00000000000000..bb7d433f8d6d34
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseuniq/index.js
@@ -0,0 +1,68 @@
+/**
+ * lodash 3.0.3 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+var baseIndexOf = require('lodash._baseindexof'),
+    cacheIndexOf = require('lodash._cacheindexof'),
+    createCache = require('lodash._createcache');
+
+/** Used as the size to enable large array optimizations. */
+var LARGE_ARRAY_SIZE = 200;
+
+/**
+ * The base implementation of `_.uniq` without support for callback shorthands
+ * and `this` binding.
+ *
+ * @private
+ * @param {Array} array The array to inspect.
+ * @param {Function} [iteratee] The function invoked per iteration.
+ * @returns {Array} Returns the new duplicate-value-free array.
+ */
+function baseUniq(array, iteratee) {
+  var index = -1,
+      indexOf = baseIndexOf,
+      length = array.length,
+      isCommon = true,
+      isLarge = isCommon && length >= LARGE_ARRAY_SIZE,
+      seen = isLarge ? createCache() : null,
+      result = [];
+
+  if (seen) {
+    indexOf = cacheIndexOf;
+    isCommon = false;
+  } else {
+    isLarge = false;
+    seen = iteratee ? [] : result;
+  }
+  outer:
+  while (++index < length) {
+    var value = array[index],
+        computed = iteratee ? iteratee(value, index, array) : value;
+
+    if (isCommon && value === value) {
+      var seenIndex = seen.length;
+      while (seenIndex--) {
+        if (seen[seenIndex] === computed) {
+          continue outer;
+        }
+      }
+      if (iteratee) {
+        seen.push(computed);
+      }
+      result.push(value);
+    }
+    else if (indexOf(seen, computed, 0) < 0) {
+      if (iteratee || isLarge) {
+        seen.push(computed);
+      }
+      result.push(value);
+    }
+  }
+  return result;
+}
+
+module.exports = baseUniq;
diff --git a/deps/npm/node_modules/lodash._baseuniq/package.json b/deps/npm/node_modules/lodash._baseuniq/package.json
new file mode 100644
index 00000000000000..b98e6e7b2e669d
--- /dev/null
+++ b/deps/npm/node_modules/lodash._baseuniq/package.json
@@ -0,0 +1,118 @@
+{
+  "_args": [
+    [
+      "lodash._baseuniq@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash.union"
+    ]
+  ],
+  "_from": "lodash._baseuniq@>=3.0.0 <4.0.0",
+  "_id": "lodash._baseuniq@3.0.3",
+  "_inCache": true,
+  "_location": "/lodash._baseuniq",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.12.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._baseuniq",
+    "raw": "lodash._baseuniq@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash.union",
+    "/lodash.uniq"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-3.0.3.tgz",
+  "_shasum": "2123fa0db2d69c28d5beb1c1f36d61522a740234",
+  "_shrinkwrap": null,
+  "_spec": "lodash._baseuniq@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash.union",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {
+    "lodash._baseindexof": "^3.0.0",
+    "lodash._cacheindexof": "^3.0.0",
+    "lodash._createcache": "^3.0.0"
+  },
+  "description": "The modern build of lodash’s internal `baseUniq` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "2123fa0db2d69c28d5beb1c1f36d61522a740234",
+    "tarball": "http://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-3.0.3.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    }
+  ],
+  "name": "lodash._baseuniq",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.0.3"
+}
diff --git a/deps/npm/node_modules/lodash._bindcallback/LICENSE.txt b/deps/npm/node_modules/lodash._bindcallback/LICENSE.txt
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash._bindcallback/LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash._bindcallback/README.md b/deps/npm/node_modules/lodash._bindcallback/README.md
new file mode 100644
index 00000000000000..d287f26d81bc3c
--- /dev/null
+++ b/deps/npm/node_modules/lodash._bindcallback/README.md
@@ -0,0 +1,20 @@
+# lodash._bindcallback v3.0.1
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `bindCallback` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash._bindcallback
+```
+
+In Node.js/io.js:
+
+```js
+var bindCallback = require('lodash._bindcallback');
+```
+
+See the [package source](https://github.com/lodash/lodash/blob/3.0.1-npm-packages/lodash._bindcallback) for more details.
diff --git a/deps/npm/node_modules/lodash._bindcallback/index.js b/deps/npm/node_modules/lodash._bindcallback/index.js
new file mode 100644
index 00000000000000..ef6811d1a5ebf3
--- /dev/null
+++ b/deps/npm/node_modules/lodash._bindcallback/index.js
@@ -0,0 +1,65 @@
+/**
+ * lodash 3.0.1 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+
+/**
+ * A specialized version of `baseCallback` which only supports `this` binding
+ * and specifying the number of arguments to provide to `func`.
+ *
+ * @private
+ * @param {Function} func The function to bind.
+ * @param {*} thisArg The `this` binding of `func`.
+ * @param {number} [argCount] The number of arguments to provide to `func`.
+ * @returns {Function} Returns the callback.
+ */
+function bindCallback(func, thisArg, argCount) {
+  if (typeof func != 'function') {
+    return identity;
+  }
+  if (thisArg === undefined) {
+    return func;
+  }
+  switch (argCount) {
+    case 1: return function(value) {
+      return func.call(thisArg, value);
+    };
+    case 3: return function(value, index, collection) {
+      return func.call(thisArg, value, index, collection);
+    };
+    case 4: return function(accumulator, value, index, collection) {
+      return func.call(thisArg, accumulator, value, index, collection);
+    };
+    case 5: return function(value, other, key, object, source) {
+      return func.call(thisArg, value, other, key, object, source);
+    };
+  }
+  return function() {
+    return func.apply(thisArg, arguments);
+  };
+}
+
+/**
+ * This method returns the first argument provided to it.
+ *
+ * @static
+ * @memberOf _
+ * @category Utility
+ * @param {*} value Any value.
+ * @returns {*} Returns `value`.
+ * @example
+ *
+ * var object = { 'user': 'fred' };
+ *
+ * _.identity(object) === object;
+ * // => true
+ */
+function identity(value) {
+  return value;
+}
+
+module.exports = bindCallback;
diff --git a/deps/npm/node_modules/lodash._bindcallback/package.json b/deps/npm/node_modules/lodash._bindcallback/package.json
new file mode 100644
index 00000000000000..272cb6a29b71a9
--- /dev/null
+++ b/deps/npm/node_modules/lodash._bindcallback/package.json
@@ -0,0 +1,114 @@
+{
+  "_args": [
+    [
+      "lodash._bindcallback@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash.clonedeep"
+    ]
+  ],
+  "_from": "lodash._bindcallback@>=3.0.0 <4.0.0",
+  "_id": "lodash._bindcallback@3.0.1",
+  "_inCache": true,
+  "_location": "/lodash._bindcallback",
+  "_nodeVersion": "0.12.2",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.7.6",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._bindcallback",
+    "raw": "lodash._bindcallback@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash._basecallback",
+    "/lodash.clonedeep"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
+  "_shasum": "e531c27644cf8b57a99e17ed95b35c748789392e",
+  "_shrinkwrap": null,
+  "_spec": "lodash._bindcallback@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash.clonedeep",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {},
+  "description": "The modern build of lodash’s internal `bindCallback` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "e531c27644cf8b57a99e17ed95b35c748789392e",
+    "tarball": "http://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    }
+  ],
+  "name": "lodash._bindcallback",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/lodash/lodash"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.0.1"
+}
diff --git a/deps/npm/node_modules/lodash._cacheindexof/LICENSE.txt b/deps/npm/node_modules/lodash._cacheindexof/LICENSE.txt
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash._cacheindexof/LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash._cacheindexof/README.md b/deps/npm/node_modules/lodash._cacheindexof/README.md
new file mode 100644
index 00000000000000..69d2b62bf5dbed
--- /dev/null
+++ b/deps/npm/node_modules/lodash._cacheindexof/README.md
@@ -0,0 +1,20 @@
+# lodash._cacheindexof v3.0.2
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `cacheIndexOf` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash._cacheindexof
+```
+
+In Node.js/io.js:
+
+```js
+var cacheIndexOf = require('lodash._cacheindexof');
+```
+
+See the [package source](https://github.com/lodash/lodash/blob/3.0.2-npm-packages/lodash._cacheindexof) for more details.
diff --git a/deps/npm/node_modules/lodash._cacheindexof/index.js b/deps/npm/node_modules/lodash._cacheindexof/index.js
new file mode 100644
index 00000000000000..bc1d5afcfd5778
--- /dev/null
+++ b/deps/npm/node_modules/lodash._cacheindexof/index.js
@@ -0,0 +1,53 @@
+/**
+ * lodash 3.0.2 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+
+/**
+ * Checks if `value` is in `cache` mimicking the return signature of
+ * `_.indexOf` by returning `0` if the value is found, else `-1`.
+ *
+ * @private
+ * @param {Object} cache The cache to search.
+ * @param {*} value The value to search for.
+ * @returns {number} Returns `0` if `value` is found, else `-1`.
+ */
+function cacheIndexOf(cache, value) {
+  var data = cache.data,
+      result = (typeof value == 'string' || isObject(value)) ? data.set.has(value) : data.hash[value];
+
+  return result ? 0 : -1;
+}
+
+/**
+ * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.
+ * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+ * @example
+ *
+ * _.isObject({});
+ * // => true
+ *
+ * _.isObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isObject(1);
+ * // => false
+ */
+function isObject(value) {
+  // Avoid a V8 JIT bug in Chrome 19-20.
+  // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.
+  var type = typeof value;
+  return !!value && (type == 'object' || type == 'function');
+}
+
+module.exports = cacheIndexOf;
diff --git a/deps/npm/node_modules/lodash._cacheindexof/package.json b/deps/npm/node_modules/lodash._cacheindexof/package.json
new file mode 100644
index 00000000000000..c87fc6b14d0f94
--- /dev/null
+++ b/deps/npm/node_modules/lodash._cacheindexof/package.json
@@ -0,0 +1,114 @@
+{
+  "_args": [
+    [
+      "lodash._cacheindexof@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash._baseuniq"
+    ]
+  ],
+  "_from": "lodash._cacheindexof@>=3.0.0 <4.0.0",
+  "_id": "lodash._cacheindexof@3.0.2",
+  "_inCache": true,
+  "_location": "/lodash._cacheindexof",
+  "_nodeVersion": "0.12.3",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.10.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._cacheindexof",
+    "raw": "lodash._cacheindexof@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash._basedifference",
+    "/lodash._baseuniq"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz",
+  "_shasum": "3dc69ac82498d2ee5e3ce56091bafd2adc7bde92",
+  "_shrinkwrap": null,
+  "_spec": "lodash._cacheindexof@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseuniq",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {},
+  "description": "The modern build of lodash’s internal `cacheIndexOf` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "3dc69ac82498d2ee5e3ce56091bafd2adc7bde92",
+    "tarball": "http://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    }
+  ],
+  "name": "lodash._cacheindexof",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.0.2"
+}
diff --git a/deps/npm/node_modules/lodash._createcache/LICENSE b/deps/npm/node_modules/lodash._createcache/LICENSE
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash._createcache/LICENSE
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash._createcache/README.md b/deps/npm/node_modules/lodash._createcache/README.md
new file mode 100644
index 00000000000000..0ee4834d086a5b
--- /dev/null
+++ b/deps/npm/node_modules/lodash._createcache/README.md
@@ -0,0 +1,20 @@
+# lodash._createcache v3.1.2
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `createCache` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash._createcache
+```
+
+In Node.js/io.js:
+
+```js
+var createCache = require('lodash._createcache');
+```
+
+See the [package source](https://github.com/lodash/lodash/blob/3.1.2-npm-packages/lodash._createcache) for more details.
diff --git a/deps/npm/node_modules/lodash._createcache/index.js b/deps/npm/node_modules/lodash._createcache/index.js
new file mode 100644
index 00000000000000..6cf391c1497a4c
--- /dev/null
+++ b/deps/npm/node_modules/lodash._createcache/index.js
@@ -0,0 +1,91 @@
+/**
+ * lodash 3.1.2 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+var getNative = require('lodash._getnative');
+
+/** Native method references. */
+var Set = getNative(global, 'Set');
+
+/* Native method references for those with the same name as other `lodash` methods. */
+var nativeCreate = getNative(Object, 'create');
+
+/**
+ *
+ * Creates a cache object to store unique values.
+ *
+ * @private
+ * @param {Array} [values] The values to cache.
+ */
+function SetCache(values) {
+  var length = values ? values.length : 0;
+
+  this.data = { 'hash': nativeCreate(null), 'set': new Set };
+  while (length--) {
+    this.push(values[length]);
+  }
+}
+
+/**
+ * Adds `value` to the cache.
+ *
+ * @private
+ * @name push
+ * @memberOf SetCache
+ * @param {*} value The value to cache.
+ */
+function cachePush(value) {
+  var data = this.data;
+  if (typeof value == 'string' || isObject(value)) {
+    data.set.add(value);
+  } else {
+    data.hash[value] = true;
+  }
+}
+
+/**
+ * Creates a `Set` cache object to optimize linear searches of large arrays.
+ *
+ * @private
+ * @param {Array} [values] The values to cache.
+ * @returns {null|Object} Returns the new cache object if `Set` is supported, else `null`.
+ */
+function createCache(values) {
+  return (nativeCreate && Set) ? new SetCache(values) : null;
+}
+
+/**
+ * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.
+ * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+ * @example
+ *
+ * _.isObject({});
+ * // => true
+ *
+ * _.isObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isObject(1);
+ * // => false
+ */
+function isObject(value) {
+  // Avoid a V8 JIT bug in Chrome 19-20.
+  // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.
+  var type = typeof value;
+  return !!value && (type == 'object' || type == 'function');
+}
+
+// Add functions to the `Set` cache.
+SetCache.prototype.push = cachePush;
+
+module.exports = createCache;
diff --git a/deps/npm/node_modules/lodash._createcache/package.json b/deps/npm/node_modules/lodash._createcache/package.json
new file mode 100644
index 00000000000000..8417cf9d67cf4f
--- /dev/null
+++ b/deps/npm/node_modules/lodash._createcache/package.json
@@ -0,0 +1,116 @@
+{
+  "_args": [
+    [
+      "lodash._createcache@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash._baseuniq"
+    ]
+  ],
+  "_from": "lodash._createcache@>=3.0.0 <4.0.0",
+  "_id": "lodash._createcache@3.1.2",
+  "_inCache": true,
+  "_location": "/lodash._createcache",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.12.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._createcache",
+    "raw": "lodash._createcache@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash._basedifference",
+    "/lodash._baseuniq"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz",
+  "_shasum": "56d6a064017625e79ebca6b8018e17440bdcf093",
+  "_shrinkwrap": null,
+  "_spec": "lodash._createcache@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseuniq",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {
+    "lodash._getnative": "^3.0.0"
+  },
+  "description": "The modern build of lodash’s internal `createCache` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "56d6a064017625e79ebca6b8018e17440bdcf093",
+    "tarball": "http://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    }
+  ],
+  "name": "lodash._createcache",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.1.2"
+}
diff --git a/deps/npm/node_modules/lodash._createpadding/LICENSE b/deps/npm/node_modules/lodash._createpadding/LICENSE
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash._createpadding/LICENSE
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/README.md b/deps/npm/node_modules/lodash._createpadding/README.md
similarity index 83%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/README.md
rename to deps/npm/node_modules/lodash._createpadding/README.md
index 0e1c73128ce792..f9c9411c70412e 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/README.md
+++ b/deps/npm/node_modules/lodash._createpadding/README.md
@@ -1,4 +1,4 @@
-# lodash._createpadding v3.6.0
+# lodash._createpadding v3.6.1
 
 The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `createPadding` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
 
@@ -17,4 +17,4 @@ In Node.js/io.js:
 var createPadding = require('lodash._createpadding');
 ```
 
-See the [package source](https://github.com/lodash/lodash/blob/3.6.0-npm-packages/lodash._createpadding) for more details.
+See the [package source](https://github.com/lodash/lodash/blob/3.6.1-npm-packages/lodash._createpadding) for more details.
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/index.js b/deps/npm/node_modules/lodash._createpadding/index.js
similarity index 79%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/index.js
rename to deps/npm/node_modules/lodash._createpadding/index.js
index 72890bd2d8f4cf..3541a8aae32935 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/index.js
+++ b/deps/npm/node_modules/lodash._createpadding/index.js
@@ -1,18 +1,16 @@
 /**
- * lodash 3.6.0 (Custom Build) <https://lodash.com/>
+ * lodash 3.6.1 (Custom Build) <https://lodash.com/>
  * Build: `lodash modern modularize exports="npm" -o ./`
  * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
- * Based on Underscore.js 1.8.2 <http://underscorejs.org/LICENSE>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
  * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
  * Available under MIT license <https://lodash.com/license>
  */
 var repeat = require('lodash.repeat');
 
-/** Native method references. */
-var ceil = Math.ceil;
-
 /* Native method references for those with the same name as other `lodash` methods. */
-var nativeIsFinite = global.isFinite;
+var nativeCeil = Math.ceil,
+    nativeIsFinite = global.isFinite;
 
 /**
  * Creates the padding required for `string` based on the given `length`.
@@ -33,7 +31,7 @@ function createPadding(string, length, chars) {
   }
   var padLength = length - strLength;
   chars = chars == null ? ' ' : (chars + '');
-  return repeat(chars, ceil(padLength / chars.length)).slice(0, padLength);
+  return repeat(chars, nativeCeil(padLength / chars.length)).slice(0, padLength);
 }
 
 module.exports = createPadding;
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/package.json b/deps/npm/node_modules/lodash._createpadding/package.json
similarity index 53%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/package.json
rename to deps/npm/node_modules/lodash._createpadding/package.json
index ffe797253ae925..9801837b99594d 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/package.json
+++ b/deps/npm/node_modules/lodash._createpadding/package.json
@@ -1,15 +1,47 @@
 {
-  "name": "lodash._createpadding",
-  "version": "3.6.0",
-  "description": "The modern build of lodash’s internal `createPadding` as a module.",
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
+  "_args": [
+    [
+      "lodash._createpadding@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash.pad"
+    ]
+  ],
+  "_from": "lodash._createpadding@>=3.0.0 <4.0.0",
+  "_id": "lodash._createpadding@3.6.1",
+  "_inCache": true,
+  "_location": "/lodash._createpadding",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.12.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._createpadding",
+    "raw": "lodash._createpadding@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash.pad",
+    "/lodash.padleft",
+    "/lodash.padright"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+  "_shasum": "4907b438595adc54ee8935527a6c424c02c81a87",
+  "_shrinkwrap": null,
+  "_spec": "lodash._createpadding@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash.pad",
   "author": {
-    "name": "John-David Dalton",
     "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
     "url": "http://allyoucanleet.com/"
   },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -37,39 +69,49 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lodash/lodash.git"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
-  },
   "dependencies": {
     "lodash.repeat": "^3.0.0"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
-  "_id": "lodash._createpadding@3.6.0",
-  "_shasum": "c466850dd1a05e6bfec54fd0cf0db28b68332d5e",
-  "_from": "lodash._createpadding@3.6.0",
-  "_npmVersion": "2.7.3",
-  "_nodeVersion": "0.12.0",
-  "_npmUser": {
-    "name": "jdalton",
-    "email": "john.david.dalton@gmail.com"
+  "description": "The modern build of lodash’s internal `createPadding` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "4907b438595adc54ee8935527a6c424c02c81a87",
+    "tarball": "http://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz"
   },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "maintainers": [
     {
       "name": "jdalton",
       "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
     }
   ],
-  "dist": {
-    "shasum": "c466850dd1a05e6bfec54fd0cf0db28b68332d5e",
-    "tarball": "http://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.0.tgz"
+  "name": "lodash._createpadding",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.6.1"
 }
diff --git a/deps/npm/node_modules/lodash._getnative/LICENSE b/deps/npm/node_modules/lodash._getnative/LICENSE
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash._getnative/LICENSE
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash._getnative/README.md b/deps/npm/node_modules/lodash._getnative/README.md
new file mode 100644
index 00000000000000..7835cec0ab1c02
--- /dev/null
+++ b/deps/npm/node_modules/lodash._getnative/README.md
@@ -0,0 +1,20 @@
+# lodash._getnative v3.9.1
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `getNative` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash._getnative
+```
+
+In Node.js/io.js:
+
+```js
+var getNative = require('lodash._getnative');
+```
+
+See the [package source](https://github.com/lodash/lodash/blob/3.9.1-npm-packages/lodash._getnative) for more details.
diff --git a/deps/npm/node_modules/lodash._getnative/index.js b/deps/npm/node_modules/lodash._getnative/index.js
new file mode 100644
index 00000000000000..a32063d27b9e74
--- /dev/null
+++ b/deps/npm/node_modules/lodash._getnative/index.js
@@ -0,0 +1,137 @@
+/**
+ * lodash 3.9.1 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+
+/** `Object#toString` result references. */
+var funcTag = '[object Function]';
+
+/** Used to detect host constructors (Safari > 5). */
+var reIsHostCtor = /^\[object .+?Constructor\]$/;
+
+/**
+ * Checks if `value` is object-like.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
+ */
+function isObjectLike(value) {
+  return !!value && typeof value == 'object';
+}
+
+/** Used for native method references. */
+var objectProto = Object.prototype;
+
+/** Used to resolve the decompiled source of functions. */
+var fnToString = Function.prototype.toString;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
+/**
+ * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)
+ * of values.
+ */
+var objToString = objectProto.toString;
+
+/** Used to detect if a method is native. */
+var reIsNative = RegExp('^' +
+  fnToString.call(hasOwnProperty).replace(/[\\^$.*+?()[\]{}|]/g, '\\$&')
+  .replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$'
+);
+
+/**
+ * Gets the native function at `key` of `object`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @param {string} key The key of the method to get.
+ * @returns {*} Returns the function if it's native, else `undefined`.
+ */
+function getNative(object, key) {
+  var value = object == null ? undefined : object[key];
+  return isNative(value) ? value : undefined;
+}
+
+/**
+ * Checks if `value` is classified as a `Function` object.
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
+ * @example
+ *
+ * _.isFunction(_);
+ * // => true
+ *
+ * _.isFunction(/abc/);
+ * // => false
+ */
+function isFunction(value) {
+  // The use of `Object#toString` avoids issues with the `typeof` operator
+  // in older versions of Chrome and Safari which return 'function' for regexes
+  // and Safari 8 equivalents which return 'object' for typed array constructors.
+  return isObject(value) && objToString.call(value) == funcTag;
+}
+
+/**
+ * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.
+ * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+ * @example
+ *
+ * _.isObject({});
+ * // => true
+ *
+ * _.isObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isObject(1);
+ * // => false
+ */
+function isObject(value) {
+  // Avoid a V8 JIT bug in Chrome 19-20.
+  // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.
+  var type = typeof value;
+  return !!value && (type == 'object' || type == 'function');
+}
+
+/**
+ * Checks if `value` is a native function.
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a native function, else `false`.
+ * @example
+ *
+ * _.isNative(Array.prototype.push);
+ * // => true
+ *
+ * _.isNative(_);
+ * // => false
+ */
+function isNative(value) {
+  if (value == null) {
+    return false;
+  }
+  if (isFunction(value)) {
+    return reIsNative.test(fnToString.call(value));
+  }
+  return isObjectLike(value) && reIsHostCtor.test(value);
+}
+
+module.exports = getNative;
diff --git a/deps/npm/node_modules/lodash._getnative/package.json b/deps/npm/node_modules/lodash._getnative/package.json
new file mode 100644
index 00000000000000..2f5c5eb3b58cb1
--- /dev/null
+++ b/deps/npm/node_modules/lodash._getnative/package.json
@@ -0,0 +1,111 @@
+{
+  "_args": [
+    [
+      "lodash._getnative@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash.keys"
+    ]
+  ],
+  "_from": "lodash._getnative@>=3.0.0 <4.0.0",
+  "_id": "lodash._getnative@3.9.1",
+  "_inCache": true,
+  "_location": "/lodash._getnative",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.12.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._getnative",
+    "raw": "lodash._getnative@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash._createcache",
+    "/lodash.keys",
+    "/lodash.uniq"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+  "_shasum": "570bc7dede46d61cdcde687d65d3eecbaa3aaff5",
+  "_shrinkwrap": null,
+  "_spec": "lodash._getnative@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash.keys",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {},
+  "description": "The modern build of lodash’s internal `getNative` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "570bc7dede46d61cdcde687d65d3eecbaa3aaff5",
+    "tarball": "http://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    }
+  ],
+  "name": "lodash._getnative",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.9.1"
+}
diff --git a/deps/npm/node_modules/lodash._isiterateecall/LICENSE.txt b/deps/npm/node_modules/lodash._isiterateecall/LICENSE.txt
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash._isiterateecall/LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash._isiterateecall/README.md b/deps/npm/node_modules/lodash._isiterateecall/README.md
new file mode 100644
index 00000000000000..0c5c701db23f43
--- /dev/null
+++ b/deps/npm/node_modules/lodash._isiterateecall/README.md
@@ -0,0 +1,20 @@
+# lodash._isiterateecall v3.0.9
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `isIterateeCall` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash._isiterateecall
+```
+
+In Node.js/io.js:
+
+```js
+var isIterateeCall = require('lodash._isiterateecall');
+```
+
+See the [package source](https://github.com/lodash/lodash/blob/3.0.9-npm-packages/lodash._isiterateecall) for more details.
diff --git a/deps/npm/node_modules/lodash._isiterateecall/index.js b/deps/npm/node_modules/lodash._isiterateecall/index.js
new file mode 100644
index 00000000000000..ea3761b6c41ca2
--- /dev/null
+++ b/deps/npm/node_modules/lodash._isiterateecall/index.js
@@ -0,0 +1,132 @@
+/**
+ * lodash 3.0.9 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+
+/** Used to detect unsigned integer values. */
+var reIsUint = /^\d+$/;
+
+/**
+ * Used as the [maximum length](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.max_safe_integer)
+ * of an array-like value.
+ */
+var MAX_SAFE_INTEGER = 9007199254740991;
+
+/**
+ * The base implementation of `_.property` without support for deep paths.
+ *
+ * @private
+ * @param {string} key The key of the property to get.
+ * @returns {Function} Returns the new function.
+ */
+function baseProperty(key) {
+  return function(object) {
+    return object == null ? undefined : object[key];
+  };
+}
+
+/**
+ * Gets the "length" property value of `object`.
+ *
+ * **Note:** This function is used to avoid a [JIT bug](https://bugs.webkit.org/show_bug.cgi?id=142792)
+ * that affects Safari on at least iOS 8.1-8.3 ARM64.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {*} Returns the "length" value.
+ */
+var getLength = baseProperty('length');
+
+/**
+ * Checks if `value` is array-like.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is array-like, else `false`.
+ */
+function isArrayLike(value) {
+  return value != null && isLength(getLength(value));
+}
+
+/**
+ * Checks if `value` is a valid array-like index.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @param {number} [length=MAX_SAFE_INTEGER] The upper bounds of a valid index.
+ * @returns {boolean} Returns `true` if `value` is a valid index, else `false`.
+ */
+function isIndex(value, length) {
+  value = (typeof value == 'number' || reIsUint.test(value)) ? +value : -1;
+  length = length == null ? MAX_SAFE_INTEGER : length;
+  return value > -1 && value % 1 == 0 && value < length;
+}
+
+/**
+ * Checks if the provided arguments are from an iteratee call.
+ *
+ * @private
+ * @param {*} value The potential iteratee value argument.
+ * @param {*} index The potential iteratee index or key argument.
+ * @param {*} object The potential iteratee object argument.
+ * @returns {boolean} Returns `true` if the arguments are from an iteratee call, else `false`.
+ */
+function isIterateeCall(value, index, object) {
+  if (!isObject(object)) {
+    return false;
+  }
+  var type = typeof index;
+  if (type == 'number'
+      ? (isArrayLike(object) && isIndex(index, object.length))
+      : (type == 'string' && index in object)) {
+    var other = object[index];
+    return value === value ? (value === other) : (other !== other);
+  }
+  return false;
+}
+
+/**
+ * Checks if `value` is a valid array-like length.
+ *
+ * **Note:** This function is based on [`ToLength`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-tolength).
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
+ */
+function isLength(value) {
+  return typeof value == 'number' && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
+}
+
+/**
+ * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.
+ * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+ * @example
+ *
+ * _.isObject({});
+ * // => true
+ *
+ * _.isObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isObject(1);
+ * // => false
+ */
+function isObject(value) {
+  // Avoid a V8 JIT bug in Chrome 19-20.
+  // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.
+  var type = typeof value;
+  return !!value && (type == 'object' || type == 'function');
+}
+
+module.exports = isIterateeCall;
diff --git a/deps/npm/node_modules/lodash._isiterateecall/package.json b/deps/npm/node_modules/lodash._isiterateecall/package.json
new file mode 100644
index 00000000000000..075ad22405f810
--- /dev/null
+++ b/deps/npm/node_modules/lodash._isiterateecall/package.json
@@ -0,0 +1,113 @@
+{
+  "_args": [
+    [
+      "lodash._isiterateecall@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash.uniq"
+    ]
+  ],
+  "_from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
+  "_id": "lodash._isiterateecall@3.0.9",
+  "_inCache": true,
+  "_location": "/lodash._isiterateecall",
+  "_nodeVersion": "2.0.2",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.10.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash._isiterateecall",
+    "raw": "lodash._isiterateecall@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash.uniq"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+  "_shasum": "5203ad7ba425fae842460e696db9cf3e6aac057c",
+  "_shrinkwrap": null,
+  "_spec": "lodash._isiterateecall@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash.uniq",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {},
+  "description": "The modern build of lodash’s internal `isIterateeCall` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "5203ad7ba425fae842460e696db9cf3e6aac057c",
+    "tarball": "http://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    }
+  ],
+  "name": "lodash._isiterateecall",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.0.9"
+}
diff --git a/deps/npm/node_modules/lodash.clonedeep/LICENSE b/deps/npm/node_modules/lodash.clonedeep/LICENSE
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash.clonedeep/LICENSE
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash.clonedeep/README.md b/deps/npm/node_modules/lodash.clonedeep/README.md
new file mode 100644
index 00000000000000..7be9a82e463cb2
--- /dev/null
+++ b/deps/npm/node_modules/lodash.clonedeep/README.md
@@ -0,0 +1,20 @@
+# lodash.clonedeep v3.0.2
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.cloneDeep` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash.clonedeep
+```
+
+In Node.js/io.js:
+
+```js
+var cloneDeep = require('lodash.clonedeep');
+```
+
+See the [documentation](https://lodash.com/docs#cloneDeep) or [package source](https://github.com/lodash/lodash/blob/3.0.2-npm-packages/lodash.clonedeep) for more details.
diff --git a/deps/npm/node_modules/lodash.clonedeep/index.js b/deps/npm/node_modules/lodash.clonedeep/index.js
new file mode 100644
index 00000000000000..f486c2246be0dd
--- /dev/null
+++ b/deps/npm/node_modules/lodash.clonedeep/index.js
@@ -0,0 +1,63 @@
+/**
+ * lodash 3.0.2 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+var baseClone = require('lodash._baseclone'),
+    bindCallback = require('lodash._bindcallback');
+
+/**
+ * Creates a deep clone of `value`. If `customizer` is provided it's invoked
+ * to produce the cloned values. If `customizer` returns `undefined` cloning
+ * is handled by the method instead. The `customizer` is bound to `thisArg`
+ * and invoked with up to three argument; (value [, index|key, object]).
+ *
+ * **Note:** This method is loosely based on the
+ * [structured clone algorithm](http://www.w3.org/TR/html5/infrastructure.html#internal-structured-cloning-algorithm).
+ * The enumerable properties of `arguments` objects and objects created by
+ * constructors other than `Object` are cloned to plain `Object` objects. An
+ * empty object is returned for uncloneable values such as functions, DOM nodes,
+ * Maps, Sets, and WeakMaps.
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to deep clone.
+ * @param {Function} [customizer] The function to customize cloning values.
+ * @param {*} [thisArg] The `this` binding of `customizer`.
+ * @returns {*} Returns the deep cloned value.
+ * @example
+ *
+ * var users = [
+ *   { 'user': 'barney' },
+ *   { 'user': 'fred' }
+ * ];
+ *
+ * var deep = _.cloneDeep(users);
+ * deep[0] === users[0];
+ * // => false
+ *
+ * // using a customizer callback
+ * var el = _.cloneDeep(document.body, function(value) {
+ *   if (_.isElement(value)) {
+ *     return value.cloneNode(true);
+ *   }
+ * });
+ *
+ * el === document.body
+ * // => false
+ * el.nodeName
+ * // => BODY
+ * el.childNodes.length;
+ * // => 20
+ */
+function cloneDeep(value, customizer, thisArg) {
+  return typeof customizer == 'function'
+    ? baseClone(value, true, bindCallback(customizer, thisArg, 3))
+    : baseClone(value, true);
+}
+
+module.exports = cloneDeep;
diff --git a/deps/npm/node_modules/lodash.clonedeep/package.json b/deps/npm/node_modules/lodash.clonedeep/package.json
new file mode 100644
index 00000000000000..83c6e3b1fc0744
--- /dev/null
+++ b/deps/npm/node_modules/lodash.clonedeep/package.json
@@ -0,0 +1,123 @@
+{
+  "_args": [
+    [
+      "lodash.clonedeep@~3.0.1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "lodash.clonedeep@>=3.0.1 <3.1.0",
+  "_id": "lodash.clonedeep@3.0.2",
+  "_inCache": true,
+  "_location": "/lodash.clonedeep",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.13.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash.clonedeep",
+    "raw": "lodash.clonedeep@~3.0.1",
+    "rawSpec": "~3.0.1",
+    "scope": null,
+    "spec": ">=3.0.1 <3.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz",
+  "_shasum": "a0a1e40d82a5ea89ff5b147b8444ed63d92827db",
+  "_shrinkwrap": null,
+  "_spec": "lodash.clonedeep@~3.0.1",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {
+    "lodash._baseclone": "^3.0.0",
+    "lodash._bindcallback": "^3.0.0"
+  },
+  "description": "The modern build of lodash’s `_.cloneDeep` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "a0a1e40d82a5ea89ff5b147b8444ed63d92827db",
+    "tarball": "http://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "installable": true,
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
+  ],
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    }
+  ],
+  "name": "lodash.clonedeep",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.0.2"
+}
diff --git a/deps/npm/node_modules/lodash.isarguments/LICENSE b/deps/npm/node_modules/lodash.isarguments/LICENSE
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash.isarguments/LICENSE
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash.isarguments/README.md b/deps/npm/node_modules/lodash.isarguments/README.md
new file mode 100644
index 00000000000000..2e94f790f6e4e4
--- /dev/null
+++ b/deps/npm/node_modules/lodash.isarguments/README.md
@@ -0,0 +1,20 @@
+# lodash.isarguments v3.0.4
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.isArguments` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash.isarguments
+```
+
+In Node.js/io.js:
+
+```js
+var isArguments = require('lodash.isarguments');
+```
+
+See the [documentation](https://lodash.com/docs#isArguments) or [package source](https://github.com/lodash/lodash/blob/3.0.4-npm-packages/lodash.isarguments) for more details.
diff --git a/deps/npm/node_modules/lodash.isarguments/index.js b/deps/npm/node_modules/lodash.isarguments/index.js
new file mode 100644
index 00000000000000..b947b47dffdca8
--- /dev/null
+++ b/deps/npm/node_modules/lodash.isarguments/index.js
@@ -0,0 +1,106 @@
+/**
+ * lodash 3.0.4 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+
+/**
+ * Checks if `value` is object-like.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
+ */
+function isObjectLike(value) {
+  return !!value && typeof value == 'object';
+}
+
+/** Used for native method references. */
+var objectProto = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
+/** Native method references. */
+var propertyIsEnumerable = objectProto.propertyIsEnumerable;
+
+/**
+ * Used as the [maximum length](http://ecma-international.org/ecma-262/6.0/#sec-number.max_safe_integer)
+ * of an array-like value.
+ */
+var MAX_SAFE_INTEGER = 9007199254740991;
+
+/**
+ * The base implementation of `_.property` without support for deep paths.
+ *
+ * @private
+ * @param {string} key The key of the property to get.
+ * @returns {Function} Returns the new function.
+ */
+function baseProperty(key) {
+  return function(object) {
+    return object == null ? undefined : object[key];
+  };
+}
+
+/**
+ * Gets the "length" property value of `object`.
+ *
+ * **Note:** This function is used to avoid a [JIT bug](https://bugs.webkit.org/show_bug.cgi?id=142792)
+ * that affects Safari on at least iOS 8.1-8.3 ARM64.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {*} Returns the "length" value.
+ */
+var getLength = baseProperty('length');
+
+/**
+ * Checks if `value` is array-like.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is array-like, else `false`.
+ */
+function isArrayLike(value) {
+  return value != null && isLength(getLength(value));
+}
+
+/**
+ * Checks if `value` is a valid array-like length.
+ *
+ * **Note:** This function is based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
+ */
+function isLength(value) {
+  return typeof value == 'number' && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
+}
+
+/**
+ * Checks if `value` is classified as an `arguments` object.
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
+ * @example
+ *
+ * _.isArguments(function() { return arguments; }());
+ * // => true
+ *
+ * _.isArguments([1, 2, 3]);
+ * // => false
+ */
+function isArguments(value) {
+  return isObjectLike(value) && isArrayLike(value) &&
+    hasOwnProperty.call(value, 'callee') && !propertyIsEnumerable.call(value, 'callee');
+}
+
+module.exports = isArguments;
diff --git a/deps/npm/node_modules/lodash.isarguments/package.json b/deps/npm/node_modules/lodash.isarguments/package.json
new file mode 100644
index 00000000000000..de5c561d5eb2ea
--- /dev/null
+++ b/deps/npm/node_modules/lodash.isarguments/package.json
@@ -0,0 +1,120 @@
+{
+  "_args": [
+    [
+      "lodash.isarguments@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash.keys"
+    ]
+  ],
+  "_from": "lodash.isarguments@>=3.0.0 <4.0.0",
+  "_id": "lodash.isarguments@3.0.4",
+  "_inCache": true,
+  "_location": "/lodash.isarguments",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.12.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash.isarguments",
+    "raw": "lodash.isarguments@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash._baseflatten",
+    "/lodash.keys"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz",
+  "_shasum": "ebbb884c48d27366a44ea6fee57ed7b5a32a81e0",
+  "_shrinkwrap": null,
+  "_spec": "lodash.isarguments@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash.keys",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {},
+  "description": "The modern build of lodash’s `_.isArguments` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "ebbb884c48d27366a44ea6fee57ed7b5a32a81e0",
+    "tarball": "http://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
+  ],
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    }
+  ],
+  "name": "lodash.isarguments",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.0.4"
+}
diff --git a/deps/npm/node_modules/lodash.isarray/LICENSE b/deps/npm/node_modules/lodash.isarray/LICENSE
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash.isarray/LICENSE
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash.isarray/README.md b/deps/npm/node_modules/lodash.isarray/README.md
new file mode 100644
index 00000000000000..ea274aae1be395
--- /dev/null
+++ b/deps/npm/node_modules/lodash.isarray/README.md
@@ -0,0 +1,20 @@
+# lodash.isarray v3.0.4
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.isArray` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash.isarray
+```
+
+In Node.js/io.js:
+
+```js
+var isArray = require('lodash.isarray');
+```
+
+See the [documentation](https://lodash.com/docs#isArray) or [package source](https://github.com/lodash/lodash/blob/3.0.4-npm-packages/lodash.isarray) for more details.
diff --git a/deps/npm/node_modules/lodash.isarray/index.js b/deps/npm/node_modules/lodash.isarray/index.js
new file mode 100644
index 00000000000000..dd246584489df6
--- /dev/null
+++ b/deps/npm/node_modules/lodash.isarray/index.js
@@ -0,0 +1,180 @@
+/**
+ * lodash 3.0.4 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+
+/** `Object#toString` result references. */
+var arrayTag = '[object Array]',
+    funcTag = '[object Function]';
+
+/** Used to detect host constructors (Safari > 5). */
+var reIsHostCtor = /^\[object .+?Constructor\]$/;
+
+/**
+ * Checks if `value` is object-like.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
+ */
+function isObjectLike(value) {
+  return !!value && typeof value == 'object';
+}
+
+/** Used for native method references. */
+var objectProto = Object.prototype;
+
+/** Used to resolve the decompiled source of functions. */
+var fnToString = Function.prototype.toString;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
+/**
+ * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)
+ * of values.
+ */
+var objToString = objectProto.toString;
+
+/** Used to detect if a method is native. */
+var reIsNative = RegExp('^' +
+  fnToString.call(hasOwnProperty).replace(/[\\^$.*+?()[\]{}|]/g, '\\$&')
+  .replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$'
+);
+
+/* Native method references for those with the same name as other `lodash` methods. */
+var nativeIsArray = getNative(Array, 'isArray');
+
+/**
+ * Used as the [maximum length](http://ecma-international.org/ecma-262/6.0/#sec-number.max_safe_integer)
+ * of an array-like value.
+ */
+var MAX_SAFE_INTEGER = 9007199254740991;
+
+/**
+ * Gets the native function at `key` of `object`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @param {string} key The key of the method to get.
+ * @returns {*} Returns the function if it's native, else `undefined`.
+ */
+function getNative(object, key) {
+  var value = object == null ? undefined : object[key];
+  return isNative(value) ? value : undefined;
+}
+
+/**
+ * Checks if `value` is a valid array-like length.
+ *
+ * **Note:** This function is based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
+ */
+function isLength(value) {
+  return typeof value == 'number' && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
+}
+
+/**
+ * Checks if `value` is classified as an `Array` object.
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
+ * @example
+ *
+ * _.isArray([1, 2, 3]);
+ * // => true
+ *
+ * _.isArray(function() { return arguments; }());
+ * // => false
+ */
+var isArray = nativeIsArray || function(value) {
+  return isObjectLike(value) && isLength(value.length) && objToString.call(value) == arrayTag;
+};
+
+/**
+ * Checks if `value` is classified as a `Function` object.
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
+ * @example
+ *
+ * _.isFunction(_);
+ * // => true
+ *
+ * _.isFunction(/abc/);
+ * // => false
+ */
+function isFunction(value) {
+  // The use of `Object#toString` avoids issues with the `typeof` operator
+  // in older versions of Chrome and Safari which return 'function' for regexes
+  // and Safari 8 equivalents which return 'object' for typed array constructors.
+  return isObject(value) && objToString.call(value) == funcTag;
+}
+
+/**
+ * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.
+ * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+ * @example
+ *
+ * _.isObject({});
+ * // => true
+ *
+ * _.isObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isObject(1);
+ * // => false
+ */
+function isObject(value) {
+  // Avoid a V8 JIT bug in Chrome 19-20.
+  // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.
+  var type = typeof value;
+  return !!value && (type == 'object' || type == 'function');
+}
+
+/**
+ * Checks if `value` is a native function.
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a native function, else `false`.
+ * @example
+ *
+ * _.isNative(Array.prototype.push);
+ * // => true
+ *
+ * _.isNative(_);
+ * // => false
+ */
+function isNative(value) {
+  if (value == null) {
+    return false;
+  }
+  if (isFunction(value)) {
+    return reIsNative.test(fnToString.call(value));
+  }
+  return isObjectLike(value) && reIsHostCtor.test(value);
+}
+
+module.exports = isArray;
diff --git a/deps/npm/node_modules/lodash.isarray/package.json b/deps/npm/node_modules/lodash.isarray/package.json
new file mode 100644
index 00000000000000..47cb23f1e91886
--- /dev/null
+++ b/deps/npm/node_modules/lodash.isarray/package.json
@@ -0,0 +1,124 @@
+{
+  "_args": [
+    [
+      "lodash.isarray@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash._baseclone"
+    ]
+  ],
+  "_from": "lodash.isarray@>=3.0.0 <4.0.0",
+  "_id": "lodash.isarray@3.0.4",
+  "_inCache": true,
+  "_location": "/lodash.isarray",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.12.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash.isarray",
+    "raw": "lodash.isarray@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash._basecallback",
+    "/lodash._baseclone",
+    "/lodash._baseflatten",
+    "/lodash._baseisequal",
+    "/lodash.keys",
+    "/lodash.uniq"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+  "_shasum": "79e4eb88c36a8122af86f844aa9bcd851b5fbb55",
+  "_shrinkwrap": null,
+  "_spec": "lodash.isarray@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseclone",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {},
+  "description": "The modern build of lodash’s `_.isArray` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "79e4eb88c36a8122af86f844aa9bcd851b5fbb55",
+    "tarball": "http://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
+  ],
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    }
+  ],
+  "name": "lodash.isarray",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.0.4"
+}
diff --git a/deps/npm/node_modules/lodash.istypedarray/LICENSE.txt b/deps/npm/node_modules/lodash.istypedarray/LICENSE.txt
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash.istypedarray/LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash.istypedarray/README.md b/deps/npm/node_modules/lodash.istypedarray/README.md
new file mode 100644
index 00000000000000..b1779ccf7fcd17
--- /dev/null
+++ b/deps/npm/node_modules/lodash.istypedarray/README.md
@@ -0,0 +1,20 @@
+# lodash.istypedarray v3.0.2
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.isTypedArray` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash.istypedarray
+```
+
+In Node.js/io.js:
+
+```js
+var isTypedArray = require('lodash.istypedarray');
+```
+
+See the [documentation](https://lodash.com/docs#isTypedArray) or [package source](https://github.com/lodash/lodash/blob/3.0.2-npm-packages/lodash.istypedarray) for more details.
diff --git a/deps/npm/node_modules/lodash.istypedarray/index.js b/deps/npm/node_modules/lodash.istypedarray/index.js
new file mode 100644
index 00000000000000..829a2d77a78ec7
--- /dev/null
+++ b/deps/npm/node_modules/lodash.istypedarray/index.js
@@ -0,0 +1,110 @@
+/**
+ * lodash 3.0.2 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+
+/** `Object#toString` result references. */
+var argsTag = '[object Arguments]',
+    arrayTag = '[object Array]',
+    boolTag = '[object Boolean]',
+    dateTag = '[object Date]',
+    errorTag = '[object Error]',
+    funcTag = '[object Function]',
+    mapTag = '[object Map]',
+    numberTag = '[object Number]',
+    objectTag = '[object Object]',
+    regexpTag = '[object RegExp]',
+    setTag = '[object Set]',
+    stringTag = '[object String]',
+    weakMapTag = '[object WeakMap]';
+
+var arrayBufferTag = '[object ArrayBuffer]',
+    float32Tag = '[object Float32Array]',
+    float64Tag = '[object Float64Array]',
+    int8Tag = '[object Int8Array]',
+    int16Tag = '[object Int16Array]',
+    int32Tag = '[object Int32Array]',
+    uint8Tag = '[object Uint8Array]',
+    uint8ClampedTag = '[object Uint8ClampedArray]',
+    uint16Tag = '[object Uint16Array]',
+    uint32Tag = '[object Uint32Array]';
+
+/** Used to identify `toStringTag` values of typed arrays. */
+var typedArrayTags = {};
+typedArrayTags[float32Tag] = typedArrayTags[float64Tag] =
+typedArrayTags[int8Tag] = typedArrayTags[int16Tag] =
+typedArrayTags[int32Tag] = typedArrayTags[uint8Tag] =
+typedArrayTags[uint8ClampedTag] = typedArrayTags[uint16Tag] =
+typedArrayTags[uint32Tag] = true;
+typedArrayTags[argsTag] = typedArrayTags[arrayTag] =
+typedArrayTags[arrayBufferTag] = typedArrayTags[boolTag] =
+typedArrayTags[dateTag] = typedArrayTags[errorTag] =
+typedArrayTags[funcTag] = typedArrayTags[mapTag] =
+typedArrayTags[numberTag] = typedArrayTags[objectTag] =
+typedArrayTags[regexpTag] = typedArrayTags[setTag] =
+typedArrayTags[stringTag] = typedArrayTags[weakMapTag] = false;
+
+/**
+ * Checks if `value` is object-like.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
+ */
+function isObjectLike(value) {
+  return !!value && typeof value == 'object';
+}
+
+/** Used for native method references. */
+var objectProto = Object.prototype;
+
+/**
+ * Used to resolve the [`toStringTag`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-object.prototype.tostring)
+ * of values.
+ */
+var objToString = objectProto.toString;
+
+/**
+ * Used as the [maximum length](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.max_safe_integer)
+ * of an array-like value.
+ */
+var MAX_SAFE_INTEGER = 9007199254740991;
+
+/**
+ * Checks if `value` is a valid array-like length.
+ *
+ * **Note:** This function is based on [`ToLength`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-tolength).
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
+ */
+function isLength(value) {
+  return typeof value == 'number' && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
+}
+
+/**
+ * Checks if `value` is classified as a typed array.
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
+ * @example
+ *
+ * _.isTypedArray(new Uint8Array);
+ * // => true
+ *
+ * _.isTypedArray([]);
+ * // => false
+ */
+function isTypedArray(value) {
+  return isObjectLike(value) && isLength(value.length) && !!typedArrayTags[objToString.call(value)];
+}
+
+module.exports = isTypedArray;
diff --git a/deps/npm/node_modules/lodash.istypedarray/package.json b/deps/npm/node_modules/lodash.istypedarray/package.json
new file mode 100644
index 00000000000000..4177313505326b
--- /dev/null
+++ b/deps/npm/node_modules/lodash.istypedarray/package.json
@@ -0,0 +1,119 @@
+{
+  "_args": [
+    [
+      "lodash.istypedarray@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash._baseisequal"
+    ]
+  ],
+  "_from": "lodash.istypedarray@>=3.0.0 <4.0.0",
+  "_id": "lodash.istypedarray@3.0.2",
+  "_inCache": true,
+  "_location": "/lodash.istypedarray",
+  "_nodeVersion": "0.12.3",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.10.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash.istypedarray",
+    "raw": "lodash.istypedarray@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash._baseisequal"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.2.tgz",
+  "_shasum": "9397b113c15f424f320af06caa59cc495e2093ce",
+  "_shrinkwrap": null,
+  "_spec": "lodash.istypedarray@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseisequal",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {},
+  "description": "The modern build of lodash’s `_.isTypedArray` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "9397b113c15f424f320af06caa59cc495e2093ce",
+    "tarball": "http://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.2.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
+  ],
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    }
+  ],
+  "name": "lodash.istypedarray",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.0.2"
+}
diff --git a/deps/npm/node_modules/lodash.keys/LICENSE b/deps/npm/node_modules/lodash.keys/LICENSE
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash.keys/LICENSE
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash.keys/README.md b/deps/npm/node_modules/lodash.keys/README.md
new file mode 100644
index 00000000000000..5f69a1826f90e2
--- /dev/null
+++ b/deps/npm/node_modules/lodash.keys/README.md
@@ -0,0 +1,20 @@
+# lodash.keys v3.1.2
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.keys` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash.keys
+```
+
+In Node.js/io.js:
+
+```js
+var keys = require('lodash.keys');
+```
+
+See the [documentation](https://lodash.com/docs#keys) or [package source](https://github.com/lodash/lodash/blob/3.1.2-npm-packages/lodash.keys) for more details.
diff --git a/deps/npm/node_modules/lodash.keys/index.js b/deps/npm/node_modules/lodash.keys/index.js
new file mode 100644
index 00000000000000..f4c17749a17ae7
--- /dev/null
+++ b/deps/npm/node_modules/lodash.keys/index.js
@@ -0,0 +1,236 @@
+/**
+ * lodash 3.1.2 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+var getNative = require('lodash._getnative'),
+    isArguments = require('lodash.isarguments'),
+    isArray = require('lodash.isarray');
+
+/** Used to detect unsigned integer values. */
+var reIsUint = /^\d+$/;
+
+/** Used for native method references. */
+var objectProto = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
+/* Native method references for those with the same name as other `lodash` methods. */
+var nativeKeys = getNative(Object, 'keys');
+
+/**
+ * Used as the [maximum length](http://ecma-international.org/ecma-262/6.0/#sec-number.max_safe_integer)
+ * of an array-like value.
+ */
+var MAX_SAFE_INTEGER = 9007199254740991;
+
+/**
+ * The base implementation of `_.property` without support for deep paths.
+ *
+ * @private
+ * @param {string} key The key of the property to get.
+ * @returns {Function} Returns the new function.
+ */
+function baseProperty(key) {
+  return function(object) {
+    return object == null ? undefined : object[key];
+  };
+}
+
+/**
+ * Gets the "length" property value of `object`.
+ *
+ * **Note:** This function is used to avoid a [JIT bug](https://bugs.webkit.org/show_bug.cgi?id=142792)
+ * that affects Safari on at least iOS 8.1-8.3 ARM64.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {*} Returns the "length" value.
+ */
+var getLength = baseProperty('length');
+
+/**
+ * Checks if `value` is array-like.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is array-like, else `false`.
+ */
+function isArrayLike(value) {
+  return value != null && isLength(getLength(value));
+}
+
+/**
+ * Checks if `value` is a valid array-like index.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @param {number} [length=MAX_SAFE_INTEGER] The upper bounds of a valid index.
+ * @returns {boolean} Returns `true` if `value` is a valid index, else `false`.
+ */
+function isIndex(value, length) {
+  value = (typeof value == 'number' || reIsUint.test(value)) ? +value : -1;
+  length = length == null ? MAX_SAFE_INTEGER : length;
+  return value > -1 && value % 1 == 0 && value < length;
+}
+
+/**
+ * Checks if `value` is a valid array-like length.
+ *
+ * **Note:** This function is based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
+ */
+function isLength(value) {
+  return typeof value == 'number' && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
+}
+
+/**
+ * A fallback implementation of `Object.keys` which creates an array of the
+ * own enumerable property names of `object`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the array of property names.
+ */
+function shimKeys(object) {
+  var props = keysIn(object),
+      propsLength = props.length,
+      length = propsLength && object.length;
+
+  var allowIndexes = !!length && isLength(length) &&
+    (isArray(object) || isArguments(object));
+
+  var index = -1,
+      result = [];
+
+  while (++index < propsLength) {
+    var key = props[index];
+    if ((allowIndexes && isIndex(key, length)) || hasOwnProperty.call(object, key)) {
+      result.push(key);
+    }
+  }
+  return result;
+}
+
+/**
+ * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.
+ * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+ * @example
+ *
+ * _.isObject({});
+ * // => true
+ *
+ * _.isObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isObject(1);
+ * // => false
+ */
+function isObject(value) {
+  // Avoid a V8 JIT bug in Chrome 19-20.
+  // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.
+  var type = typeof value;
+  return !!value && (type == 'object' || type == 'function');
+}
+
+/**
+ * Creates an array of the own enumerable property names of `object`.
+ *
+ * **Note:** Non-object values are coerced to objects. See the
+ * [ES spec](http://ecma-international.org/ecma-262/6.0/#sec-object.keys)
+ * for more details.
+ *
+ * @static
+ * @memberOf _
+ * @category Object
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the array of property names.
+ * @example
+ *
+ * function Foo() {
+ *   this.a = 1;
+ *   this.b = 2;
+ * }
+ *
+ * Foo.prototype.c = 3;
+ *
+ * _.keys(new Foo);
+ * // => ['a', 'b'] (iteration order is not guaranteed)
+ *
+ * _.keys('hi');
+ * // => ['0', '1']
+ */
+var keys = !nativeKeys ? shimKeys : function(object) {
+  var Ctor = object == null ? undefined : object.constructor;
+  if ((typeof Ctor == 'function' && Ctor.prototype === object) ||
+      (typeof object != 'function' && isArrayLike(object))) {
+    return shimKeys(object);
+  }
+  return isObject(object) ? nativeKeys(object) : [];
+};
+
+/**
+ * Creates an array of the own and inherited enumerable property names of `object`.
+ *
+ * **Note:** Non-object values are coerced to objects.
+ *
+ * @static
+ * @memberOf _
+ * @category Object
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the array of property names.
+ * @example
+ *
+ * function Foo() {
+ *   this.a = 1;
+ *   this.b = 2;
+ * }
+ *
+ * Foo.prototype.c = 3;
+ *
+ * _.keysIn(new Foo);
+ * // => ['a', 'b', 'c'] (iteration order is not guaranteed)
+ */
+function keysIn(object) {
+  if (object == null) {
+    return [];
+  }
+  if (!isObject(object)) {
+    object = Object(object);
+  }
+  var length = object.length;
+  length = (length && isLength(length) &&
+    (isArray(object) || isArguments(object)) && length) || 0;
+
+  var Ctor = object.constructor,
+      index = -1,
+      isProto = typeof Ctor == 'function' && Ctor.prototype === object,
+      result = Array(length),
+      skipIndexes = length > 0;
+
+  while (++index < length) {
+    result[index] = (index + '');
+  }
+  for (var key in object) {
+    if (!(skipIndexes && isIndex(key, length)) &&
+        !(key == 'constructor' && (isProto || !hasOwnProperty.call(object, key)))) {
+      result.push(key);
+    }
+  }
+  return result;
+}
+
+module.exports = keys;
diff --git a/deps/npm/node_modules/lodash.keys/package.json b/deps/npm/node_modules/lodash.keys/package.json
new file mode 100644
index 00000000000000..606a4d98524817
--- /dev/null
+++ b/deps/npm/node_modules/lodash.keys/package.json
@@ -0,0 +1,126 @@
+{
+  "_args": [
+    [
+      "lodash.keys@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash._baseclone"
+    ]
+  ],
+  "_from": "lodash.keys@>=3.0.0 <4.0.0",
+  "_id": "lodash.keys@3.1.2",
+  "_inCache": true,
+  "_location": "/lodash.keys",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.12.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash.keys",
+    "raw": "lodash.keys@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash._baseassign",
+    "/lodash._baseclone",
+    "/lodash._baseisequal",
+    "/lodash.pairs"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+  "_shasum": "4dbc0472b156be50a0b286855d1bd0b0c656098a",
+  "_shrinkwrap": null,
+  "_spec": "lodash.keys@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseclone",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {
+    "lodash._getnative": "^3.0.0",
+    "lodash.isarguments": "^3.0.0",
+    "lodash.isarray": "^3.0.0"
+  },
+  "description": "The modern build of lodash’s `_.keys` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "4dbc0472b156be50a0b286855d1bd0b0c656098a",
+    "tarball": "http://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
+  ],
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    }
+  ],
+  "name": "lodash.keys",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.1.2"
+}
diff --git a/deps/npm/node_modules/lodash.pad/LICENSE b/deps/npm/node_modules/lodash.pad/LICENSE
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash.pad/LICENSE
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/README.md b/deps/npm/node_modules/lodash.pad/README.md
similarity index 84%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/README.md
rename to deps/npm/node_modules/lodash.pad/README.md
index 9b4891cd8c6f41..456d23ddf0c968 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/README.md
+++ b/deps/npm/node_modules/lodash.pad/README.md
@@ -1,4 +1,4 @@
-# lodash.pad v3.1.0
+# lodash.pad v3.1.1
 
 The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.pad` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
 
@@ -17,4 +17,4 @@ In Node.js/io.js:
 var pad = require('lodash.pad');
 ```
 
-See the [documentation](https://lodash.com/docs#pad) or [package source](https://github.com/lodash/lodash/blob/3.1.0-npm-packages/lodash.pad) for more details.
+See the [documentation](https://lodash.com/docs#pad) or [package source](https://github.com/lodash/lodash/blob/3.1.1-npm-packages/lodash.pad) for more details.
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/index.js b/deps/npm/node_modules/lodash.pad/index.js
similarity index 78%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/index.js
rename to deps/npm/node_modules/lodash.pad/index.js
index d08251ba5939ee..a29ccea9ca189d 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/index.js
+++ b/deps/npm/node_modules/lodash.pad/index.js
@@ -1,23 +1,21 @@
 /**
- * lodash 3.1.0 (Custom Build) <https://lodash.com/>
+ * lodash 3.1.1 (Custom Build) <https://lodash.com/>
  * Build: `lodash modern modularize exports="npm" -o ./`
  * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
- * Based on Underscore.js 1.8.2 <http://underscorejs.org/LICENSE>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
  * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
  * Available under MIT license <https://lodash.com/license>
  */
 var baseToString = require('lodash._basetostring'),
     createPadding = require('lodash._createpadding');
 
-/** Native method references. */
-var ceil = Math.ceil,
-    floor = Math.floor;
-
 /* Native method references for those with the same name as other `lodash` methods. */
-var nativeIsFinite = global.isFinite;
+var nativeCeil = Math.ceil,
+    nativeFloor = Math.floor,
+    nativeIsFinite = global.isFinite;
 
 /**
- * Pads `string` on the left and right sides if it is shorter than `length`.
+ * Pads `string` on the left and right sides if it's shorter than `length`.
  * Padding characters are truncated if they can't be evenly divided by `length`.
  *
  * @static
@@ -47,8 +45,8 @@ function pad(string, length, chars) {
     return string;
   }
   var mid = (length - strLength) / 2,
-      leftLength = floor(mid),
-      rightLength = ceil(mid);
+      leftLength = nativeFloor(mid),
+      rightLength = nativeCeil(mid);
 
   chars = createPadding('', rightLength, chars);
   return chars.slice(0, leftLength) + string + chars;
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/package.json b/deps/npm/node_modules/lodash.pad/package.json
similarity index 70%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/package.json
rename to deps/npm/node_modules/lodash.pad/package.json
index 6f028c0cc622d8..283af352801a90 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/package.json
+++ b/deps/npm/node_modules/lodash.pad/package.json
@@ -1,21 +1,45 @@
 {
-  "name": "lodash.pad",
-  "version": "3.1.0",
-  "description": "The modern build of lodash’s `_.pad` as a module.",
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
+  "_args": [
+    [
+      "lodash.pad@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/gauge"
+    ]
   ],
+  "_from": "lodash.pad@>=3.0.0 <4.0.0",
+  "_id": "lodash.pad@3.1.1",
+  "_inCache": true,
+  "_location": "/lodash.pad",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.12.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash.pad",
+    "raw": "lodash.pad@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/gauge"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
+  "_shasum": "2e078ebc33b331d2ba34bf8732af129fd5c04624",
+  "_shrinkwrap": null,
+  "_spec": "lodash.pad@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/gauge",
   "author": {
-    "name": "John-David Dalton",
     "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
     "url": "http://allyoucanleet.com/"
   },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -43,29 +67,26 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lodash/lodash.git"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
-  },
   "dependencies": {
     "lodash._basetostring": "^3.0.0",
     "lodash._createpadding": "^3.0.0"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
-  "_id": "lodash.pad@3.1.0",
-  "_shasum": "9f18b1f3749a95e197b5ff2ae752ea9851ada965",
-  "_from": "lodash.pad@>=3.0.0 <4.0.0",
-  "_npmVersion": "2.7.3",
-  "_nodeVersion": "0.12.0",
-  "_npmUser": {
-    "name": "jdalton",
-    "email": "john.david.dalton@gmail.com"
+  "description": "The modern build of lodash’s `_.pad` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "2e078ebc33b331d2ba34bf8732af129fd5c04624",
+    "tarball": "http://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz"
   },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
+  ],
+  "license": "MIT",
   "maintainers": [
     {
       "name": "jdalton",
@@ -88,11 +109,14 @@
       "email": "blaine@iceddev.com"
     }
   ],
-  "dist": {
-    "shasum": "9f18b1f3749a95e197b5ff2ae752ea9851ada965",
-    "tarball": "http://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.0.tgz"
+  "name": "lodash.pad",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.1.1"
 }
diff --git a/deps/npm/node_modules/lodash.padleft/LICENSE.txt b/deps/npm/node_modules/lodash.padleft/LICENSE.txt
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash.padleft/LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/README.md b/deps/npm/node_modules/lodash.padleft/README.md
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/README.md
rename to deps/npm/node_modules/lodash.padleft/README.md
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/index.js b/deps/npm/node_modules/lodash.padleft/index.js
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/index.js
rename to deps/npm/node_modules/lodash.padleft/index.js
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/package.json b/deps/npm/node_modules/lodash.padleft/package.json
similarity index 77%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/package.json
rename to deps/npm/node_modules/lodash.padleft/package.json
index 55b0c256f9d1bc..be544bdce085a4 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/package.json
+++ b/deps/npm/node_modules/lodash.padleft/package.json
@@ -1,21 +1,45 @@
 {
-  "name": "lodash.padleft",
-  "version": "3.1.1",
-  "description": "The modern build of lodash’s `_.padLeft` as a module.",
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
+  "_args": [
+    [
+      "lodash.padleft@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/gauge"
+    ]
+  ],
+  "_from": "lodash.padleft@>=3.0.0 <4.0.0",
+  "_id": "lodash.padleft@3.1.1",
+  "_inCache": true,
+  "_location": "/lodash.padleft",
+  "_nodeVersion": "0.12.2",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.9.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash.padleft",
+    "raw": "lodash.padleft@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/gauge"
   ],
+  "_resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
+  "_shasum": "150151f1e0245edba15d50af2d71f1d5cff46530",
+  "_shrinkwrap": null,
+  "_spec": "lodash.padleft@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/gauge",
   "author": {
-    "name": "John-David Dalton",
     "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
     "url": "http://allyoucanleet.com/"
   },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -43,29 +67,26 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lodash/lodash.git"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
-  },
   "dependencies": {
     "lodash._basetostring": "^3.0.0",
     "lodash._createpadding": "^3.0.0"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
-  "_id": "lodash.padleft@3.1.1",
-  "_shasum": "150151f1e0245edba15d50af2d71f1d5cff46530",
-  "_from": "lodash.padleft@>=3.0.0 <4.0.0",
-  "_npmVersion": "2.9.0",
-  "_nodeVersion": "0.12.2",
-  "_npmUser": {
-    "name": "jdalton",
-    "email": "john.david.dalton@gmail.com"
+  "description": "The modern build of lodash’s `_.padLeft` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "150151f1e0245edba15d50af2d71f1d5cff46530",
+    "tarball": "http://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz"
   },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
+  ],
+  "license": "MIT",
   "maintainers": [
     {
       "name": "jdalton",
@@ -88,11 +109,14 @@
       "email": "blaine@iceddev.com"
     }
   ],
-  "dist": {
-    "shasum": "150151f1e0245edba15d50af2d71f1d5cff46530",
-    "tarball": "http://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz"
+  "name": "lodash.padleft",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.1.1"
 }
diff --git a/deps/npm/node_modules/lodash.padright/LICENSE.txt b/deps/npm/node_modules/lodash.padright/LICENSE.txt
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash.padright/LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/README.md b/deps/npm/node_modules/lodash.padright/README.md
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/README.md
rename to deps/npm/node_modules/lodash.padright/README.md
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/index.js b/deps/npm/node_modules/lodash.padright/index.js
similarity index 100%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/index.js
rename to deps/npm/node_modules/lodash.padright/index.js
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/package.json b/deps/npm/node_modules/lodash.padright/package.json
similarity index 77%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/package.json
rename to deps/npm/node_modules/lodash.padright/package.json
index 2a40f94bfc3bfd..13111367ff56c7 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/package.json
+++ b/deps/npm/node_modules/lodash.padright/package.json
@@ -1,21 +1,45 @@
 {
-  "name": "lodash.padright",
-  "version": "3.1.1",
-  "description": "The modern build of lodash’s `_.padRight` as a module.",
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
+  "_args": [
+    [
+      "lodash.padright@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/gauge"
+    ]
+  ],
+  "_from": "lodash.padright@>=3.0.0 <4.0.0",
+  "_id": "lodash.padright@3.1.1",
+  "_inCache": true,
+  "_location": "/lodash.padright",
+  "_nodeVersion": "0.12.2",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.9.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash.padright",
+    "raw": "lodash.padright@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/gauge"
   ],
+  "_resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
+  "_shasum": "79f7770baaa39738c040aeb5465e8d88f2aacec0",
+  "_shrinkwrap": null,
+  "_spec": "lodash.padright@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/gauge",
   "author": {
-    "name": "John-David Dalton",
     "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
     "url": "http://allyoucanleet.com/"
   },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -43,29 +67,26 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lodash/lodash.git"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
-  },
   "dependencies": {
     "lodash._basetostring": "^3.0.0",
     "lodash._createpadding": "^3.0.0"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
-  "_id": "lodash.padright@3.1.1",
-  "_shasum": "79f7770baaa39738c040aeb5465e8d88f2aacec0",
-  "_from": "lodash.padright@>=3.0.0 <4.0.0",
-  "_npmVersion": "2.9.0",
-  "_nodeVersion": "0.12.2",
-  "_npmUser": {
-    "name": "jdalton",
-    "email": "john.david.dalton@gmail.com"
+  "description": "The modern build of lodash’s `_.padRight` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "79f7770baaa39738c040aeb5465e8d88f2aacec0",
+    "tarball": "http://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz"
   },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
+  ],
+  "license": "MIT",
   "maintainers": [
     {
       "name": "jdalton",
@@ -88,11 +109,14 @@
       "email": "blaine@iceddev.com"
     }
   ],
-  "dist": {
-    "shasum": "79f7770baaa39738c040aeb5465e8d88f2aacec0",
-    "tarball": "http://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz"
+  "name": "lodash.padright",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.1.1"
 }
diff --git a/deps/npm/node_modules/lodash.pairs/LICENSE.txt b/deps/npm/node_modules/lodash.pairs/LICENSE.txt
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash.pairs/LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash.pairs/README.md b/deps/npm/node_modules/lodash.pairs/README.md
new file mode 100644
index 00000000000000..9edbbac4b155f1
--- /dev/null
+++ b/deps/npm/node_modules/lodash.pairs/README.md
@@ -0,0 +1,20 @@
+# lodash.pairs v3.0.1
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.pairs` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash.pairs
+```
+
+In Node.js/io.js:
+
+```js
+var pairs = require('lodash.pairs');
+```
+
+See the [documentation](https://lodash.com/docs#pairs) or [package source](https://github.com/lodash/lodash/blob/3.0.1-npm-packages/lodash.pairs) for more details.
diff --git a/deps/npm/node_modules/lodash.pairs/index.js b/deps/npm/node_modules/lodash.pairs/index.js
new file mode 100644
index 00000000000000..c0c1877553b7b0
--- /dev/null
+++ b/deps/npm/node_modules/lodash.pairs/index.js
@@ -0,0 +1,78 @@
+/**
+ * lodash 3.0.1 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+var keys = require('lodash.keys');
+
+/**
+ * Converts `value` to an object if it's not one.
+ *
+ * @private
+ * @param {*} value The value to process.
+ * @returns {Object} Returns the object.
+ */
+function toObject(value) {
+  return isObject(value) ? value : Object(value);
+}
+
+/**
+ * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.
+ * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+ *
+ * @static
+ * @memberOf _
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+ * @example
+ *
+ * _.isObject({});
+ * // => true
+ *
+ * _.isObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isObject(1);
+ * // => false
+ */
+function isObject(value) {
+  // Avoid a V8 JIT bug in Chrome 19-20.
+  // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.
+  var type = typeof value;
+  return !!value && (type == 'object' || type == 'function');
+}
+
+/**
+ * Creates a two dimensional array of the key-value pairs for `object`,
+ * e.g. `[[key1, value1], [key2, value2]]`.
+ *
+ * @static
+ * @memberOf _
+ * @category Object
+ * @param {Object} object The object to query.
+ * @returns {Array} Returns the new array of key-value pairs.
+ * @example
+ *
+ * _.pairs({ 'barney': 36, 'fred': 40 });
+ * // => [['barney', 36], ['fred', 40]] (iteration order is not guaranteed)
+ */
+function pairs(object) {
+  object = toObject(object);
+
+  var index = -1,
+      props = keys(object),
+      length = props.length,
+      result = Array(length);
+
+  while (++index < length) {
+    var key = props[index];
+    result[index] = [key, object[key]];
+  }
+  return result;
+}
+
+module.exports = pairs;
diff --git a/deps/npm/node_modules/lodash.pairs/package.json b/deps/npm/node_modules/lodash.pairs/package.json
new file mode 100644
index 00000000000000..8a172572239dbe
--- /dev/null
+++ b/deps/npm/node_modules/lodash.pairs/package.json
@@ -0,0 +1,121 @@
+{
+  "_args": [
+    [
+      "lodash.pairs@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash._basecallback"
+    ]
+  ],
+  "_from": "lodash.pairs@>=3.0.0 <4.0.0",
+  "_id": "lodash.pairs@3.0.1",
+  "_inCache": true,
+  "_location": "/lodash.pairs",
+  "_nodeVersion": "0.12.3",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.10.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash.pairs",
+    "raw": "lodash.pairs@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash._basecallback"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash.pairs/-/lodash.pairs-3.0.1.tgz",
+  "_shasum": "bbe08d5786eeeaa09a15c91ebf0dcb7d2be326a9",
+  "_shrinkwrap": null,
+  "_spec": "lodash.pairs@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash._basecallback",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {
+    "lodash.keys": "^3.0.0"
+  },
+  "description": "The modern build of lodash’s `_.pairs` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "bbe08d5786eeeaa09a15c91ebf0dcb7d2be326a9",
+    "tarball": "http://registry.npmjs.org/lodash.pairs/-/lodash.pairs-3.0.1.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
+  ],
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    }
+  ],
+  "name": "lodash.pairs",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.0.1"
+}
diff --git a/deps/npm/node_modules/lodash.repeat/LICENSE b/deps/npm/node_modules/lodash.repeat/LICENSE
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash.repeat/LICENSE
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/README.md b/deps/npm/node_modules/lodash.repeat/README.md
similarity index 84%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/README.md
rename to deps/npm/node_modules/lodash.repeat/README.md
index d2796e3f739a4f..dec571a333a52a 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/README.md
+++ b/deps/npm/node_modules/lodash.repeat/README.md
@@ -1,4 +1,4 @@
-# lodash.repeat v3.0.0
+# lodash.repeat v3.0.1
 
 The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.repeat` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
 
@@ -17,4 +17,4 @@ In Node.js/io.js:
 var repeat = require('lodash.repeat');
 ```
 
-See the [documentation](https://lodash.com/docs#repeat) or [package source](https://github.com/lodash/lodash/blob/3.0.0-npm-packages/lodash.repeat) for more details.
+See the [documentation](https://lodash.com/docs#repeat) or [package source](https://github.com/lodash/lodash/blob/3.0.1-npm-packages/lodash.repeat) for more details.
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/index.js b/deps/npm/node_modules/lodash.repeat/index.js
similarity index 84%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/index.js
rename to deps/npm/node_modules/lodash.repeat/index.js
index 68e100813461a4..367913f56e0ada 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/index.js
+++ b/deps/npm/node_modules/lodash.repeat/index.js
@@ -1,18 +1,16 @@
 /**
- * lodash 3.0.0 (Custom Build) <https://lodash.com/>
+ * lodash 3.0.1 (Custom Build) <https://lodash.com/>
  * Build: `lodash modern modularize exports="npm" -o ./`
  * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
- * Based on Underscore.js 1.7.0 <http://underscorejs.org/LICENSE>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
  * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
  * Available under MIT license <https://lodash.com/license>
  */
 var baseToString = require('lodash._basetostring');
 
-/** Native method references. */
-var floor = Math.floor;
-
 /* Native method references for those with the same name as other `lodash` methods. */
-var nativeIsFinite = global.isFinite;
+var nativeFloor = Math.floor,
+    nativeIsFinite = global.isFinite;
 
 /**
  * Repeats the given string `n` times.
@@ -47,7 +45,7 @@ function repeat(string, n) {
     if (n % 2) {
       result += string;
     }
-    n = floor(n / 2);
+    n = nativeFloor(n / 2);
     string += string;
   } while (n);
 
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/package.json b/deps/npm/node_modules/lodash.repeat/package.json
similarity index 58%
rename from deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/package.json
rename to deps/npm/node_modules/lodash.repeat/package.json
index de5156da130dc2..a7294ef3514575 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/package.json
+++ b/deps/npm/node_modules/lodash.repeat/package.json
@@ -1,21 +1,45 @@
 {
-  "name": "lodash.repeat",
-  "version": "3.0.0",
-  "description": "The modern build of lodash’s `_.repeat` as a module.",
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
+  "_args": [
+    [
+      "lodash.repeat@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash._createpadding"
+    ]
+  ],
+  "_from": "lodash.repeat@>=3.0.0 <4.0.0",
+  "_id": "lodash.repeat@3.0.1",
+  "_inCache": true,
+  "_location": "/lodash.repeat",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.12.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash.repeat",
+    "raw": "lodash.repeat@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash._createpadding"
   ],
+  "_resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz",
+  "_shasum": "f4b98dc7ef67256ce61e7874e1865edb208e0edf",
+  "_shrinkwrap": null,
+  "_spec": "lodash.repeat@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash._createpadding",
   "author": {
-    "name": "John-David Dalton",
     "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
     "url": "http://allyoucanleet.com/"
   },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -43,39 +67,55 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lodash/lodash.git"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
-  },
   "dependencies": {
     "lodash._basetostring": "^3.0.0"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
-  "_id": "lodash.repeat@3.0.0",
-  "_shasum": "c340f4136c99dc5b2e397b3fd50cffbd172a94b0",
-  "_from": "lodash.repeat@>=3.0.0 <4.0.0",
-  "_npmVersion": "2.3.0",
-  "_nodeVersion": "0.10.35",
-  "_npmUser": {
-    "name": "jdalton",
-    "email": "john.david.dalton@gmail.com"
+  "description": "The modern build of lodash’s `_.repeat` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "f4b98dc7ef67256ce61e7874e1865edb208e0edf",
+    "tarball": "http://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
   },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
+  ],
+  "license": "MIT",
   "maintainers": [
     {
       "name": "jdalton",
       "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
     }
   ],
-  "dist": {
-    "shasum": "c340f4136c99dc5b2e397b3fd50cffbd172a94b0",
-    "tarball": "http://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.0.tgz"
+  "name": "lodash.repeat",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.0.1"
 }
diff --git a/deps/npm/node_modules/lodash.restparam/LICENSE.txt b/deps/npm/node_modules/lodash.restparam/LICENSE.txt
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash.restparam/LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash.restparam/README.md b/deps/npm/node_modules/lodash.restparam/README.md
new file mode 100644
index 00000000000000..80e47a4f9b2093
--- /dev/null
+++ b/deps/npm/node_modules/lodash.restparam/README.md
@@ -0,0 +1,20 @@
+# lodash.restparam v3.6.1
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.restParam` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash.restparam
+```
+
+In Node.js/io.js:
+
+```js
+var restParam = require('lodash.restparam');
+```
+
+See the [documentation](https://lodash.com/docs#restParam) or [package source](https://github.com/lodash/lodash/blob/3.6.1-npm-packages/lodash.restparam) for more details.
diff --git a/deps/npm/node_modules/lodash.restparam/index.js b/deps/npm/node_modules/lodash.restparam/index.js
new file mode 100644
index 00000000000000..932f47ac743461
--- /dev/null
+++ b/deps/npm/node_modules/lodash.restparam/index.js
@@ -0,0 +1,67 @@
+/**
+ * lodash 3.6.1 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+
+/** Used as the `TypeError` message for "Functions" methods. */
+var FUNC_ERROR_TEXT = 'Expected a function';
+
+/* Native method references for those with the same name as other `lodash` methods. */
+var nativeMax = Math.max;
+
+/**
+ * Creates a function that invokes `func` with the `this` binding of the
+ * created function and arguments from `start` and beyond provided as an array.
+ *
+ * **Note:** This method is based on the [rest parameter](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/rest_parameters).
+ *
+ * @static
+ * @memberOf _
+ * @category Function
+ * @param {Function} func The function to apply a rest parameter to.
+ * @param {number} [start=func.length-1] The start position of the rest parameter.
+ * @returns {Function} Returns the new function.
+ * @example
+ *
+ * var say = _.restParam(function(what, names) {
+ *   return what + ' ' + _.initial(names).join(', ') +
+ *     (_.size(names) > 1 ? ', & ' : '') + _.last(names);
+ * });
+ *
+ * say('hello', 'fred', 'barney', 'pebbles');
+ * // => 'hello fred, barney, & pebbles'
+ */
+function restParam(func, start) {
+  if (typeof func != 'function') {
+    throw new TypeError(FUNC_ERROR_TEXT);
+  }
+  start = nativeMax(start === undefined ? (func.length - 1) : (+start || 0), 0);
+  return function() {
+    var args = arguments,
+        index = -1,
+        length = nativeMax(args.length - start, 0),
+        rest = Array(length);
+
+    while (++index < length) {
+      rest[index] = args[start + index];
+    }
+    switch (start) {
+      case 0: return func.call(this, rest);
+      case 1: return func.call(this, args[0], rest);
+      case 2: return func.call(this, args[0], args[1], rest);
+    }
+    var otherArgs = Array(start + 1);
+    index = -1;
+    while (++index < start) {
+      otherArgs[index] = args[index];
+    }
+    otherArgs[start] = rest;
+    return func.apply(this, otherArgs);
+  };
+}
+
+module.exports = restParam;
diff --git a/deps/npm/node_modules/lodash.restparam/package.json b/deps/npm/node_modules/lodash.restparam/package.json
new file mode 100644
index 00000000000000..b57d381a17af73
--- /dev/null
+++ b/deps/npm/node_modules/lodash.restparam/package.json
@@ -0,0 +1,120 @@
+{
+  "_args": [
+    [
+      "lodash.restparam@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/lodash.union"
+    ]
+  ],
+  "_from": "lodash.restparam@>=3.0.0 <4.0.0",
+  "_id": "lodash.restparam@3.6.1",
+  "_inCache": true,
+  "_location": "/lodash.restparam",
+  "_nodeVersion": "0.12.2",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.7.6",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash.restparam",
+    "raw": "lodash.restparam@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/lodash.union",
+    "/lodash.without"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+  "_shasum": "936a4e309ef330a7645ed4145986c85ae5b20805",
+  "_shrinkwrap": null,
+  "_spec": "lodash.restparam@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/lodash.union",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {},
+  "description": "The modern build of lodash’s `_.restParam` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "936a4e309ef330a7645ed4145986c85ae5b20805",
+    "tarball": "http://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
+  ],
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    }
+  ],
+  "name": "lodash.restparam",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/lodash/lodash"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.6.1"
+}
diff --git a/deps/npm/node_modules/lodash.union/LICENSE.txt b/deps/npm/node_modules/lodash.union/LICENSE.txt
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash.union/LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash.union/README.md b/deps/npm/node_modules/lodash.union/README.md
new file mode 100644
index 00000000000000..62f67e410f1e15
--- /dev/null
+++ b/deps/npm/node_modules/lodash.union/README.md
@@ -0,0 +1,20 @@
+# lodash.union v3.1.0
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.union` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash.union
+```
+
+In Node.js/io.js:
+
+```js
+var union = require('lodash.union');
+```
+
+See the [documentation](https://lodash.com/docs#union) or [package source](https://github.com/lodash/lodash/blob/3.1.0-npm-packages/lodash.union) for more details.
diff --git a/deps/npm/node_modules/lodash.union/index.js b/deps/npm/node_modules/lodash.union/index.js
new file mode 100644
index 00000000000000..b26b28c89cda4c
--- /dev/null
+++ b/deps/npm/node_modules/lodash.union/index.js
@@ -0,0 +1,35 @@
+/**
+ * lodash 3.1.0 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.2 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+var baseFlatten = require('lodash._baseflatten'),
+    baseUniq = require('lodash._baseuniq'),
+    restParam = require('lodash.restparam');
+
+/**
+ * Creates an array of unique values, in order, of the provided arrays using
+ * `SameValueZero` for equality comparisons.
+ *
+ * **Note:** [`SameValueZero`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
+ * comparisons are like strict equality comparisons, e.g. `===`, except that
+ * `NaN` matches `NaN`.
+ *
+ * @static
+ * @memberOf _
+ * @category Array
+ * @param {...Array} [arrays] The arrays to inspect.
+ * @returns {Array} Returns the new array of combined values.
+ * @example
+ *
+ * _.union([1, 2], [4, 2], [2, 1]);
+ * // => [1, 2, 4]
+ */
+var union = restParam(function(arrays) {
+  return baseUniq(baseFlatten(arrays, false, true));
+});
+
+module.exports = union;
diff --git a/deps/npm/node_modules/lodash.union/package.json b/deps/npm/node_modules/lodash.union/package.json
new file mode 100644
index 00000000000000..4359aa2c3a486a
--- /dev/null
+++ b/deps/npm/node_modules/lodash.union/package.json
@@ -0,0 +1,123 @@
+{
+  "_args": [
+    [
+      "lodash.union@~3.1.0",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "lodash.union@>=3.1.0 <3.2.0",
+  "_id": "lodash.union@3.1.0",
+  "_inCache": true,
+  "_location": "/lodash.union",
+  "_nodeVersion": "0.12.0",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.7.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash.union",
+    "raw": "lodash.union@~3.1.0",
+    "rawSpec": "~3.1.0",
+    "scope": null,
+    "spec": ">=3.1.0 <3.2.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-3.1.0.tgz",
+  "_shasum": "a4a3066fc15d6a7f8151cce9bdfe63dce7f5bcff",
+  "_shrinkwrap": null,
+  "_spec": "lodash.union@~3.1.0",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {
+    "lodash._baseflatten": "^3.0.0",
+    "lodash._baseuniq": "^3.0.0",
+    "lodash.restparam": "^3.0.0"
+  },
+  "description": "The modern build of lodash’s `_.union` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "a4a3066fc15d6a7f8151cce9bdfe63dce7f5bcff",
+    "tarball": "http://registry.npmjs.org/lodash.union/-/lodash.union-3.1.0.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
+  ],
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    }
+  ],
+  "name": "lodash.union",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/lodash/lodash"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.1.0"
+}
diff --git a/deps/npm/node_modules/lodash.uniq/LICENSE b/deps/npm/node_modules/lodash.uniq/LICENSE
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash.uniq/LICENSE
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash.uniq/README.md b/deps/npm/node_modules/lodash.uniq/README.md
new file mode 100644
index 00000000000000..7ec935c7aa7fbe
--- /dev/null
+++ b/deps/npm/node_modules/lodash.uniq/README.md
@@ -0,0 +1,20 @@
+# lodash.uniq v3.2.2
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.uniq` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash.uniq
+```
+
+In Node.js/io.js:
+
+```js
+var uniq = require('lodash.uniq');
+```
+
+See the [documentation](https://lodash.com/docs#uniq) or [package source](https://github.com/lodash/lodash/blob/3.2.2-npm-packages/lodash.uniq) for more details.
diff --git a/deps/npm/node_modules/lodash.uniq/index.js b/deps/npm/node_modules/lodash.uniq/index.js
new file mode 100644
index 00000000000000..7c9a845e6a491f
--- /dev/null
+++ b/deps/npm/node_modules/lodash.uniq/index.js
@@ -0,0 +1,106 @@
+/**
+ * lodash 3.2.2 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+var baseCallback = require('lodash._basecallback'),
+    baseUniq = require('lodash._baseuniq'),
+    isIterateeCall = require('lodash._isiterateecall');
+
+/**
+ * An implementation of `_.uniq` optimized for sorted arrays without support
+ * for callback shorthands and `this` binding.
+ *
+ * @private
+ * @param {Array} array The array to inspect.
+ * @param {Function} [iteratee] The function invoked per iteration.
+ * @returns {Array} Returns the new duplicate-value-free array.
+ */
+function sortedUniq(array, iteratee) {
+  var seen,
+      index = -1,
+      length = array.length,
+      resIndex = -1,
+      result = [];
+
+  while (++index < length) {
+    var value = array[index],
+        computed = iteratee ? iteratee(value, index, array) : value;
+
+    if (!index || seen !== computed) {
+      seen = computed;
+      result[++resIndex] = value;
+    }
+  }
+  return result;
+}
+
+/**
+ * Creates a duplicate-free version of an array, using
+ * [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+ * for equality comparisons, in which only the first occurence of each element
+ * is kept. Providing `true` for `isSorted` performs a faster search algorithm
+ * for sorted arrays. If an iteratee function is provided it is invoked for
+ * each element in the array to generate the criterion by which uniqueness
+ * is computed. The `iteratee` is bound to `thisArg` and invoked with three
+ * arguments: (value, index, array).
+ *
+ * If a property name is provided for `iteratee` the created `_.property`
+ * style callback returns the property value of the given element.
+ *
+ * If a value is also provided for `thisArg` the created `_.matchesProperty`
+ * style callback returns `true` for elements that have a matching property
+ * value, else `false`.
+ *
+ * If an object is provided for `iteratee` the created `_.matches` style
+ * callback returns `true` for elements that have the properties of the given
+ * object, else `false`.
+ *
+ * @static
+ * @memberOf _
+ * @alias unique
+ * @category Array
+ * @param {Array} array The array to inspect.
+ * @param {boolean} [isSorted] Specify the array is sorted.
+ * @param {Function|Object|string} [iteratee] The function invoked per iteration.
+ * @param {*} [thisArg] The `this` binding of `iteratee`.
+ * @returns {Array} Returns the new duplicate-value-free array.
+ * @example
+ *
+ * _.uniq([2, 1, 2]);
+ * // => [2, 1]
+ *
+ * // using `isSorted`
+ * _.uniq([1, 1, 2], true);
+ * // => [1, 2]
+ *
+ * // using an iteratee function
+ * _.uniq([1, 2.5, 1.5, 2], function(n) {
+ *   return this.floor(n);
+ * }, Math);
+ * // => [1, 2.5]
+ *
+ * // using the `_.property` callback shorthand
+ * _.uniq([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
+ * // => [{ 'x': 1 }, { 'x': 2 }]
+ */
+function uniq(array, isSorted, iteratee, thisArg) {
+  var length = array ? array.length : 0;
+  if (!length) {
+    return [];
+  }
+  if (isSorted != null && typeof isSorted != 'boolean') {
+    thisArg = iteratee;
+    iteratee = isIterateeCall(array, isSorted, thisArg) ? undefined : isSorted;
+    isSorted = false;
+  }
+  iteratee = iteratee == null ? iteratee : baseCallback(iteratee, thisArg, 3);
+  return (isSorted)
+    ? sortedUniq(array, iteratee)
+    : baseUniq(array, iteratee);
+}
+
+module.exports = uniq;
diff --git a/deps/npm/node_modules/lodash.uniq/package.json b/deps/npm/node_modules/lodash.uniq/package.json
new file mode 100644
index 00000000000000..0e06bfe287aa56
--- /dev/null
+++ b/deps/npm/node_modules/lodash.uniq/package.json
@@ -0,0 +1,125 @@
+{
+  "_args": [
+    [
+      "lodash.uniq@~3.2.1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "lodash.uniq@>=3.2.1 <3.3.0",
+  "_id": "lodash.uniq@3.2.2",
+  "_inCache": true,
+  "_location": "/lodash.uniq",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.12.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash.uniq",
+    "raw": "lodash.uniq@~3.2.1",
+    "rawSpec": "~3.2.1",
+    "scope": null,
+    "spec": ">=3.2.1 <3.3.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-3.2.2.tgz",
+  "_shasum": "146c36f25e75d19501ba402e88ba14937f63cd8b",
+  "_shrinkwrap": null,
+  "_spec": "lodash.uniq@~3.2.1",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {
+    "lodash._basecallback": "^3.0.0",
+    "lodash._baseuniq": "^3.0.0",
+    "lodash._getnative": "^3.0.0",
+    "lodash._isiterateecall": "^3.0.0",
+    "lodash.isarray": "^3.0.0"
+  },
+  "description": "The modern build of lodash’s `_.uniq` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "146c36f25e75d19501ba402e88ba14937f63cd8b",
+    "tarball": "http://registry.npmjs.org/lodash.uniq/-/lodash.uniq-3.2.2.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
+  ],
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    }
+  ],
+  "name": "lodash.uniq",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.2.2"
+}
diff --git a/deps/npm/node_modules/lodash.without/LICENSE.txt b/deps/npm/node_modules/lodash.without/LICENSE.txt
new file mode 100644
index 00000000000000..9cd87e5dcefe58
--- /dev/null
+++ b/deps/npm/node_modules/lodash.without/LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/lodash.without/README.md b/deps/npm/node_modules/lodash.without/README.md
new file mode 100644
index 00000000000000..5414eed6d39c0c
--- /dev/null
+++ b/deps/npm/node_modules/lodash.without/README.md
@@ -0,0 +1,20 @@
+# lodash.without v3.2.1
+
+The [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.without` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.
+
+## Installation
+
+Using npm:
+
+```bash
+$ {sudo -H} npm i -g npm
+$ npm i --save lodash.without
+```
+
+In Node.js/io.js:
+
+```js
+var without = require('lodash.without');
+```
+
+See the [documentation](https://lodash.com/docs#without) or [package source](https://github.com/lodash/lodash/blob/3.2.1-npm-packages/lodash.without) for more details.
diff --git a/deps/npm/node_modules/lodash.without/index.js b/deps/npm/node_modules/lodash.without/index.js
new file mode 100644
index 00000000000000..2febcd416bcd2f
--- /dev/null
+++ b/deps/npm/node_modules/lodash.without/index.js
@@ -0,0 +1,89 @@
+/**
+ * lodash 3.2.1 (Custom Build) <https://lodash.com/>
+ * Build: `lodash modern modularize exports="npm" -o ./`
+ * Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ * Available under MIT license <https://lodash.com/license>
+ */
+var baseDifference = require('lodash._basedifference'),
+    restParam = require('lodash.restparam');
+
+/**
+ * Used as the [maximum length](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.max_safe_integer)
+ * of an array-like value.
+ */
+var MAX_SAFE_INTEGER = 9007199254740991;
+
+/**
+ * The base implementation of `_.property` without support for deep paths.
+ *
+ * @private
+ * @param {string} key The key of the property to get.
+ * @returns {Function} Returns the new function.
+ */
+function baseProperty(key) {
+  return function(object) {
+    return object == null ? undefined : object[key];
+  };
+}
+
+/**
+ * Gets the "length" property value of `object`.
+ *
+ * **Note:** This function is used to avoid a [JIT bug](https://bugs.webkit.org/show_bug.cgi?id=142792)
+ * that affects Safari on at least iOS 8.1-8.3 ARM64.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @returns {*} Returns the "length" value.
+ */
+var getLength = baseProperty('length');
+
+/**
+ * Checks if `value` is array-like.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is array-like, else `false`.
+ */
+function isArrayLike(value) {
+  return value != null && isLength(getLength(value));
+}
+
+/**
+ * Checks if `value` is a valid array-like length.
+ *
+ * **Note:** This function is based on [`ToLength`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-tolength).
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
+ */
+function isLength(value) {
+  return typeof value == 'number' && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
+}
+
+/**
+ * Creates an array excluding all provided values using
+ * [`SameValueZero`](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-samevaluezero)
+ * for equality comparisons.
+ *
+ * @static
+ * @memberOf _
+ * @category Array
+ * @param {Array} array The array to filter.
+ * @param {...*} [values] The values to exclude.
+ * @returns {Array} Returns the new array of filtered values.
+ * @example
+ *
+ * _.without([1, 2, 1, 3], 1, 2);
+ * // => [3]
+ */
+var without = restParam(function(array, values) {
+  return isArrayLike(array)
+    ? baseDifference(array, values)
+    : [];
+});
+
+module.exports = without;
diff --git a/deps/npm/node_modules/lodash.without/package.json b/deps/npm/node_modules/lodash.without/package.json
new file mode 100644
index 00000000000000..3463a8fc9faaaf
--- /dev/null
+++ b/deps/npm/node_modules/lodash.without/package.json
@@ -0,0 +1,122 @@
+{
+  "_args": [
+    [
+      "lodash.without@~3.2.1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "lodash.without@>=3.2.1 <3.3.0",
+  "_id": "lodash.without@3.2.1",
+  "_inCache": true,
+  "_location": "/lodash.without",
+  "_nodeVersion": "0.12.3",
+  "_npmUser": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "jdalton"
+  },
+  "_npmVersion": "2.10.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lodash.without",
+    "raw": "lodash.without@~3.2.1",
+    "rawSpec": "~3.2.1",
+    "scope": null,
+    "spec": ">=3.2.1 <3.3.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/lodash.without/-/lodash.without-3.2.1.tgz",
+  "_shasum": "d69614b3512e52294b6abab782e7ca96538ce816",
+  "_shrinkwrap": null,
+  "_spec": "lodash.without@~3.2.1",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "john.david.dalton@gmail.com",
+    "name": "John-David Dalton",
+    "url": "http://allyoucanleet.com/"
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "dependencies": {
+    "lodash._basedifference": "^3.0.0",
+    "lodash.restparam": "^3.0.0"
+  },
+  "description": "The modern build of lodash’s `_.without` as a module.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "d69614b3512e52294b6abab782e7ca96538ce816",
+    "tarball": "http://registry.npmjs.org/lodash.without/-/lodash.without-3.2.1.tgz"
+  },
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
+  ],
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jdalton",
+      "email": "john.david.dalton@gmail.com"
+    },
+    {
+      "name": "kitcambridge",
+      "email": "github@kitcambridge.be"
+    },
+    {
+      "name": "mathias",
+      "email": "mathias@qiwi.be"
+    },
+    {
+      "name": "phated",
+      "email": "blaine@iceddev.com"
+    },
+    {
+      "name": "d10",
+      "email": "demoneaux@gmail.com"
+    }
+  ],
+  "name": "lodash.without",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "version": "3.2.1"
+}
diff --git a/deps/npm/node_modules/lru-cache/README.md b/deps/npm/node_modules/lru-cache/README.md
index 3fd6d0bcae478e..a8bba688f7202e 100644
--- a/deps/npm/node_modules/lru-cache/README.md
+++ b/deps/npm/node_modules/lru-cache/README.md
@@ -36,7 +36,7 @@ away.
 * `length` Function that is used to calculate the length of stored
   items.  If you're storing strings or buffers, then you probably want
   to do something like `function(n){return n.length}`.  The default is
-  `function(n){return 1}`, which is fine if you want to store `max`
+  `function(n){return 1}`, which is fine if you want to store `n`
   like-sized things.
 * `dispose` Function that is called on items when they are dropped
   from the cache.  This can be handy if you want to close file
@@ -102,18 +102,8 @@ away.
     Return total length of objects in cache taking into account
     `length` options function.
 
-* `itemCount`
+* `itemCount()`
 
     Return total quantity of objects currently in cache. Note, that
     `stale` (see options) items are returned as part of this item
     count.
-
-* `dump()`
-
-    Return an array of the cache entries ready for serialization and usage
-    with 'destinationCache.load(arr)`.
-
-* `load(cacheEntriesArray)`
-
-    Loads another cache entries array, obtained with `sourceCache.dump()`,
-    into the cache. The destination cache is reset before loading new entries
diff --git a/deps/npm/node_modules/lru-cache/lib/lru-cache.js b/deps/npm/node_modules/lru-cache/lib/lru-cache.js
index 32c2d2d90be150..d66e7a2382f176 100644
--- a/deps/npm/node_modules/lru-cache/lib/lru-cache.js
+++ b/deps/npm/node_modules/lru-cache/lib/lru-cache.js
@@ -137,24 +137,10 @@ LRUCache.prototype.reset = function () {
   this._itemCount = 0
 }
 
+// Provided for debugging/dev purposes only. No promises whatsoever that
+// this API stays stable.
 LRUCache.prototype.dump = function () {
-  var arr = []
-  var i = 0
-
-  for (var k = this._mru - 1; k >= 0 && i < this._itemCount; k--) if (this._lruList[k]) {
-    var hit = this._lruList[k]
-    if (!isStale(this, hit)) {
-      //Do not store staled hits
-      ++i
-      arr.push({
-        k: hit.key,
-        v: hit.value,
-        e: hit.now + (hit.maxAge || 0)
-      });
-    }
-  }
-  //arr has the most read first
-  return arr
+  return this._cache
 }
 
 LRUCache.prototype.dumpLru = function () {
@@ -164,13 +150,8 @@ LRUCache.prototype.dumpLru = function () {
 LRUCache.prototype.set = function (key, value, maxAge) {
   maxAge = maxAge || this._maxAge
   var now = maxAge ? Date.now() : 0
-  var len = this._lengthCalculator(value)
 
   if (hOP(this._cache, key)) {
-    if (len > this._max) {
-      del(this, this._cache[key])
-      return false
-    }
     // dispose of the old one before overwriting
     if (this._dispose)
       this._dispose(key, this._cache[key].value)
@@ -178,16 +159,11 @@ LRUCache.prototype.set = function (key, value, maxAge) {
     this._cache[key].now = now
     this._cache[key].maxAge = maxAge
     this._cache[key].value = value
-    this._length += (len - this._cache[key].length)
-    this._cache[key].length = len
     this.get(key)
-
-    if (this._length > this._max)
-      trim(this)
-
     return true
   }
 
+  var len = this._lengthCalculator(value)
   var hit = new Entry(key, value, this._mru++, len, now, maxAge)
 
   // oversized objects fall out of cache automatically.
@@ -233,26 +209,6 @@ LRUCache.prototype.del = function (key) {
   del(this, this._cache[key])
 }
 
-LRUCache.prototype.load = function (arr) {
-  //reset the cache
-  this.reset();
-
-  var now = Date.now()
-  //A previous serialized cache has the most recent items first
-  for (var l = arr.length - 1; l >= 0; l-- ) {
-    var hit = arr[l]
-    var expiresAt = hit.e || 0
-    if (expiresAt === 0) {
-      //the item was created without expiration in a non aged cache
-      this.set(hit.k, hit.v)
-    } else {
-      var maxAge = expiresAt - now
-      //dont add already expired items
-      if (maxAge > 0) this.set(hit.k, hit.v, maxAge)
-    }
-  }
-}
-
 function get (self, key, doUse) {
   var hit = self._cache[key]
   if (hit) {
diff --git a/deps/npm/node_modules/lru-cache/package.json b/deps/npm/node_modules/lru-cache/package.json
index 5a9d76a1d5f455..97472d1fb19cce 100644
--- a/deps/npm/node_modules/lru-cache/package.json
+++ b/deps/npm/node_modules/lru-cache/package.json
@@ -1,47 +1,64 @@
 {
-  "name": "lru-cache",
-  "description": "A cache object that deletes the least-recently-used items.",
-  "version": "2.7.0",
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me"
-  },
-  "keywords": [
-    "mru",
-    "lru",
-    "cache"
+  "_args": [
+    [
+      "lru-cache@2",
+      "/Users/rebecca/code/npm/node_modules/node-gyp/node_modules/minimatch"
+    ]
   ],
-  "scripts": {
-    "test": "tap test --gc"
+  "_from": "lru-cache@>=2.0.0 <3.0.0",
+  "_id": "lru-cache@2.6.5",
+  "_inCache": true,
+  "_location": "/lru-cache",
+  "_nodeVersion": "2.2.1",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
   },
-  "main": "lib/lru-cache.js",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/node-lru-cache.git"
+  "_npmVersion": "3.0.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "lru-cache",
+    "raw": "lru-cache@2",
+    "rawSpec": "2",
+    "scope": null,
+    "spec": ">=2.0.0 <3.0.0",
+    "type": "range"
   },
-  "devDependencies": {
-    "tap": "^1.2.0",
-    "weak": ""
+  "_requiredBy": [
+    "/node-gyp/minimatch"
+  ],
+  "_resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz",
+  "_shasum": "e56d6354148ede8d7707b58d143220fd08df0fd5",
+  "_shrinkwrap": null,
+  "_spec": "lru-cache@2",
+  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp/node_modules/minimatch",
+  "author": {
+    "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter"
   },
-  "license": "ISC",
-  "gitHead": "fc6ee93093f4e463e5946736d4c48adc013724d1",
   "bugs": {
     "url": "https://github.com/isaacs/node-lru-cache/issues"
   },
-  "homepage": "https://github.com/isaacs/node-lru-cache#readme",
-  "_id": "lru-cache@2.7.0",
-  "_shasum": "aaa376a4cd970f9cebf5ec1909566ec034f07ee6",
-  "_from": "lru-cache@2.7.0",
-  "_npmVersion": "3.3.2",
-  "_nodeVersion": "4.0.0",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
+  "dependencies": {},
+  "description": "A cache object that deletes the least-recently-used items.",
+  "devDependencies": {
+    "tap": "^1.2.0",
+    "weak": ""
   },
+  "directories": {},
   "dist": {
-    "shasum": "aaa376a4cd970f9cebf5ec1909566ec034f07ee6",
-    "tarball": "http://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
+    "shasum": "e56d6354148ede8d7707b58d143220fd08df0fd5",
+    "tarball": "http://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
   },
+  "gitHead": "7062a0c891bfb80a294be9217e4de0f882e75776",
+  "homepage": "https://github.com/isaacs/node-lru-cache#readme",
+  "keywords": [
+    "cache",
+    "lru",
+    "mru"
+  ],
+  "license": "ISC",
+  "main": "lib/lru-cache.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -52,7 +69,14 @@
       "email": "ogd@aoaioxxysz.net"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "lru-cache",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/node-lru-cache.git"
+  },
+  "scripts": {
+    "test": "tap test --gc"
+  },
+  "version": "2.6.5"
 }
diff --git a/deps/npm/node_modules/lru-cache/test/basic.js b/deps/npm/node_modules/lru-cache/test/basic.js
index b47225f109891f..949113e9ce8bd7 100644
--- a/deps/npm/node_modules/lru-cache/test/basic.js
+++ b/deps/npm/node_modules/lru-cache/test/basic.js
@@ -93,6 +93,31 @@ test("reset", function (t) {
 })
 
 
+// Note: `<cache>.dump()` is a debugging tool only. No guarantees are made
+// about the format/layout of the response.
+test("dump", function (t) {
+  var cache = new LRU(10)
+  var d = cache.dump();
+  t.equal(Object.keys(d).length, 0, "nothing in dump for empty cache")
+  cache.set("a", "A")
+  var d = cache.dump()  // { a: { key: "a", value: "A", lu: 0 } }
+  t.ok(d.a)
+  t.equal(d.a.key, "a")
+  t.equal(d.a.value, "A")
+  t.equal(d.a.lu, 0)
+
+  cache.set("b", "B")
+  cache.get("b")
+  d = cache.dump()
+  t.ok(d.b)
+  t.equal(d.b.key, "b")
+  t.equal(d.b.value, "B")
+  t.equal(d.b.lu, 2)
+
+  t.end()
+})
+
+
 test("basic with weighed length", function (t) {
   var cache = new LRU({
     max: 100,
@@ -157,32 +182,6 @@ test("lru recently gotten with weighed length", function (t) {
   t.end()
 })
 
-test("lru recently updated with weighed length", function (t) {
-  var cache = new LRU({
-    max: 8,
-    length: function (item) { return item.length }
-  })
-  cache.set("a", "A")
-  cache.set("b", "BB")
-  cache.set("c", "CCC")
-  t.equal(cache.length, 6) //CCC BB A
-  cache.set("a", "+A")
-  t.equal(cache.length, 7) //+A CCC BB
-  cache.set("b", "++BB")
-  t.equal(cache.length, 6) //++BB +A
-  t.equal(cache.get("c"), undefined)
-
-  cache.set("c", "oversized")
-  t.equal(cache.length, 6) //++BB +A
-  t.equal(cache.get("c"), undefined)
-
-  cache.set("a", "oversized")
-  t.equal(cache.length, 4) //++BB
-  t.equal(cache.get("a"), undefined)
-  t.equal(cache.get("b"), "++BB")
-  t.end()
-})
-
 test("set returns proper booleans", function(t) {
   var cache = new LRU({
     max: 5,
diff --git a/deps/npm/node_modules/lru-cache/test/serialize.js b/deps/npm/node_modules/lru-cache/test/serialize.js
deleted file mode 100644
index 5fe5dc3d371f1e..00000000000000
--- a/deps/npm/node_modules/lru-cache/test/serialize.js
+++ /dev/null
@@ -1,215 +0,0 @@
-var test = require('tap').test
-var LRU = require('../')
-
-test('dump', function (t) {
-  var cache = new LRU()
-
-  t.equal(cache.dump().length, 0, "nothing in dump for empty cache")
-
-  cache.set("a", "A")
-  cache.set("b", "B")
-  t.deepEqual(cache.dump(), [
-    { k: "b", v: "B", e: 0 },
-    { k: "a", v: "A", e: 0 }
-  ])
-
-  cache.set("a", "A");
-  t.deepEqual(cache.dump(), [
-    { k: "a", v: "A", e: 0 },
-    { k: "b", v: "B", e: 0 }
-  ])
-
-  cache.get("b");
-  t.deepEqual(cache.dump(), [
-    { k: "b", v: "B", e: 0 },
-    { k: "a", v: "A", e: 0 }
-  ])
-
-  cache.del("a");
-  t.deepEqual(cache.dump(), [
-    { k: "b", v: "B",  e: 0 }
-  ])
-
-  t.end()
-})
-
-test("do not dump stale items", function(t) {
-  var cache = new LRU({
-    max: 5,
-    maxAge: 50
-  })
-
-  //expires at 50
-  cache.set("a", "A")
-
-  setTimeout(function () {
-    //expires at 75
-    cache.set("b", "B")
-    var s = cache.dump()
-    t.equal(s.length, 2)
-    t.equal(s[0].k, "b")
-    t.equal(s[1].k, "a")
-  }, 25)
-
-  setTimeout(function () {
-    //expires at 110
-    cache.set("c", "C")
-    var s = cache.dump()
-    t.equal(s.length, 2)
-    t.equal(s[0].k, "c")
-    t.equal(s[1].k, "b")
-  }, 60)
-
-  setTimeout(function () {
-    //expires at 130
-    cache.set("d", "D", 40)
-    var s = cache.dump()
-    t.equal(s.length, 2)
-    t.equal(s[0].k, "d")
-    t.equal(s[1].k, "c")
-  }, 90)
-
-  setTimeout(function () {
-    var s = cache.dump()
-    t.equal(s.length, 1)
-    t.equal(s[0].k, "d")
-  }, 120)
-
-  setTimeout(function () {
-    var s = cache.dump()
-    t.deepEqual(s, [])
-    t.end()
-  }, 155)
-})
-
-test("load basic cache", function(t) {
-  var cache = new LRU(),
-      copy = new LRU()
-
-  cache.set("a", "A")
-  cache.set("b", "B")
-
-  copy.load(cache.dump())
-  t.deepEquals(cache.dump(), copy.dump())
-
-  t.end()
-})
-
-
-test("load staled cache", function(t) {
-  var cache = new LRU({maxAge: 50}),
-      copy = new LRU({maxAge: 50}),
-      arr
-
-  //expires at 50
-  cache.set("a", "A")
-  setTimeout(function () {
-    //expires at 80
-    cache.set("b", "B")
-    arr = cache.dump()
-    t.equal(arr.length, 2)
-  }, 30)
-
-  setTimeout(function () {
-    copy.load(arr)
-    t.equal(copy.get("a"), undefined)
-    t.equal(copy.get("b"), "B")
-  }, 60)
-
-  setTimeout(function () {
-    t.equal(copy.get("b"), undefined)
-    t.end()
-  }, 90)
-})
-
-test("load to other size cache", function(t) {
-  var cache = new LRU({max: 2}),
-      copy = new LRU({max: 1})
-
-  cache.set("a", "A")
-  cache.set("b", "B")
-
-  copy.load(cache.dump())
-  t.equal(copy.get("a"), undefined)
-  t.equal(copy.get("b"), "B")
-
-  //update the last read from original cache
-  cache.get("a")
-  copy.load(cache.dump())
-  t.equal(copy.get("a"), "A")
-  t.equal(copy.get("b"), undefined)
-
-  t.end()
-})
-
-
-test("load to other age cache", function(t) {
-  var cache = new LRU({maxAge: 50}),
-      aged = new LRU({maxAge: 100}),
-      simple = new LRU(),
-      arr,
-      expired
-
-  //created at 0
-  //a would be valid till 0 + 50
-  cache.set("a", "A")
-  setTimeout(function () {
-    //created at 20
-    //b would be valid till 20 + 50
-    cache.set("b", "B")
-    //b would be valid till 20 + 70
-    cache.set("c", "C", 70)
-    arr = cache.dump()
-    t.equal(arr.length, 3)
-  }, 20)
-
-  setTimeout(function () {
-    t.equal(cache.get("a"), undefined)
-    t.equal(cache.get("b"), "B")
-    t.equal(cache.get("c"), "C")
-
-    aged.load(arr)
-    t.equal(aged.get("a"), undefined)
-    t.equal(aged.get("b"), "B")
-    t.equal(aged.get("c"), "C")
-
-    simple.load(arr)
-    t.equal(simple.get("a"), undefined)
-    t.equal(simple.get("b"), "B")
-    t.equal(simple.get("c"), "C")
-  }, 60)
-
-  setTimeout(function () {
-    t.equal(cache.get("a"), undefined)
-    t.equal(cache.get("b"), undefined)
-    t.equal(cache.get("c"), "C")
-
-    aged.load(arr)
-    t.equal(aged.get("a"), undefined)
-    t.equal(aged.get("b"), undefined)
-    t.equal(aged.get("c"), "C")
-
-    simple.load(arr)
-    t.equal(simple.get("a"), undefined)
-    t.equal(simple.get("b"), undefined)
-    t.equal(simple.get("c"), "C")
-  }, 80)
-
-  setTimeout(function () {
-    t.equal(cache.get("a"), undefined)
-    t.equal(cache.get("b"), undefined)
-    t.equal(cache.get("c"), undefined)
-
-    aged.load(arr)
-    t.equal(aged.get("a"), undefined)
-    t.equal(aged.get("b"), undefined)
-    t.equal(aged.get("c"), undefined)
-
-    simple.load(arr)
-    t.equal(simple.get("a"), undefined)
-    t.equal(simple.get("b"), undefined)
-    t.equal(simple.get("c"), undefined)
-    t.end()
-  }, 100)
-
-})
diff --git a/deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/HISTORY.md b/deps/npm/node_modules/mime-db/HISTORY.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/HISTORY.md
rename to deps/npm/node_modules/mime-db/HISTORY.md
diff --git a/deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/LICENSE b/deps/npm/node_modules/mime-db/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/LICENSE
rename to deps/npm/node_modules/mime-db/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/README.md b/deps/npm/node_modules/mime-db/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/README.md
rename to deps/npm/node_modules/mime-db/README.md
diff --git a/deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/db.json b/deps/npm/node_modules/mime-db/db.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/db.json
rename to deps/npm/node_modules/mime-db/db.json
diff --git a/deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/index.js b/deps/npm/node_modules/mime-db/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/index.js
rename to deps/npm/node_modules/mime-db/index.js
diff --git a/deps/npm/node_modules/mime-db/package.json b/deps/npm/node_modules/mime-db/package.json
new file mode 100644
index 00000000000000..66acfaa43762cb
--- /dev/null
+++ b/deps/npm/node_modules/mime-db/package.json
@@ -0,0 +1,121 @@
+{
+  "_args": [
+    [
+      "mime-db@~1.19.0",
+      "/Users/rebecca/code/npm/node_modules/mime-types"
+    ]
+  ],
+  "_from": "mime-db@>=1.19.0 <1.20.0",
+  "_id": "mime-db@1.19.0",
+  "_inCache": true,
+  "_location": "/mime-db",
+  "_npmUser": {
+    "email": "doug@somethingdoug.com",
+    "name": "dougwilson"
+  },
+  "_npmVersion": "1.4.28",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "mime-db",
+    "raw": "mime-db@~1.19.0",
+    "rawSpec": "~1.19.0",
+    "scope": null,
+    "spec": ">=1.19.0 <1.20.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/mime-types"
+  ],
+  "_resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz",
+  "_shasum": "496a18198a7ce8244534e25bb102b74fb420fd56",
+  "_shrinkwrap": null,
+  "_spec": "mime-db@~1.19.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/mime-types",
+  "bugs": {
+    "url": "https://github.com/jshttp/mime-db/issues"
+  },
+  "contributors": [
+    {
+      "name": "Douglas Christopher Wilson",
+      "email": "doug@somethingdoug.com"
+    },
+    {
+      "name": "Jonathan Ong",
+      "email": "me@jongleberry.com",
+      "url": "http://jongleberry.com"
+    },
+    {
+      "name": "Robert Kieffer",
+      "email": "robert@broofa.com",
+      "url": "http://github.com/broofa"
+    }
+  ],
+  "dependencies": {},
+  "description": "Media Type Database",
+  "devDependencies": {
+    "bluebird": "2.10.0",
+    "co": "4.6.0",
+    "cogent": "1.0.1",
+    "csv-parse": "1.0.0",
+    "gnode": "0.1.1",
+    "istanbul": "0.3.20",
+    "mocha": "1.21.5",
+    "raw-body": "2.1.3",
+    "stream-to-array": "2"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "496a18198a7ce8244534e25bb102b74fb420fd56",
+    "tarball": "http://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz"
+  },
+  "engines": {
+    "node": ">= 0.6"
+  },
+  "files": [
+    "HISTORY.md",
+    "LICENSE",
+    "README.md",
+    "db.json",
+    "index.js"
+  ],
+  "gitHead": "46a40f0524a01fb3075a7ecde92e8e04fc93d599",
+  "homepage": "https://github.com/jshttp/mime-db",
+  "installable": true,
+  "keywords": [
+    "charset",
+    "charsets",
+    "database",
+    "db",
+    "mime",
+    "type",
+    "types"
+  ],
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "jongleberry",
+      "email": "jonathanrichardong@gmail.com"
+    },
+    {
+      "name": "dougwilson",
+      "email": "doug@somethingdoug.com"
+    }
+  ],
+  "name": "mime-db",
+  "optionalDependencies": {},
+  "readme": "# mime-db\n\n[![NPM Version][npm-version-image]][npm-url]\n[![NPM Downloads][npm-downloads-image]][npm-url]\n[![Node.js Version][node-image]][node-url]\n[![Build Status][travis-image]][travis-url]\n[![Coverage Status][coveralls-image]][coveralls-url]\n\nThis is a database of all mime types.\nIt consists of a single, public JSON file and does not include any logic,\nallowing it to remain as un-opinionated as possible with an API.\nIt aggregates data from the following sources:\n\n- http://www.iana.org/assignments/media-types/media-types.xhtml\n- http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types\n- http://hg.nginx.org/nginx/raw-file/default/conf/mime.types\n\n## Installation\n\n```bash\nnpm install mime-db\n```\n\n### Database Download\n\nIf you're crazy enough to use this in the browser, you can just grab the\nJSON file using [RawGit](https://rawgit.com/). It is recommended to replace\n`master` with [a release tag](https://github.com/jshttp/mime-db/tags) as the\nJSON format may change in the future.\n\n```\nhttps://cdn.rawgit.com/jshttp/mime-db/master/db.json\n```\n\n## Usage\n\n```js\nvar db = require('mime-db');\n\n// grab data on .js files\nvar data = db['application/javascript'];\n```\n\n## Data Structure\n\nThe JSON file is a map lookup for lowercased mime types.\nEach mime type has the following properties:\n\n- `.source` - where the mime type is defined.\n    If not set, it's probably a custom media type.\n    - `apache` - [Apache common media types](http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types)\n    - `iana` - [IANA-defined media types](http://www.iana.org/assignments/media-types/media-types.xhtml)\n    - `nginx` - [nginx media types](http://hg.nginx.org/nginx/raw-file/default/conf/mime.types)\n- `.extensions[]` - known extensions associated with this mime type.\n- `.compressible` - whether a file of this type is can be gzipped.\n- `.charset` - the default charset associated with this type, if any.\n\nIf unknown, every property could be `undefined`.\n\n## Contributing\n\nTo edit the database, only make PRs against `src/custom.json` or\n`src/custom-suffix.json`.\n\nTo update the build, run `npm run build`.\n\n## Adding Custom Media Types\n\nThe best way to get new media types included in this library is to register\nthem with the IANA. The community registration procedure is outlined in\n[RFC 6838 section 5](http://tools.ietf.org/html/rfc6838#section-5). Types\nregistered with the IANA are automatically pulled into this library.\n\n[npm-version-image]: https://img.shields.io/npm/v/mime-db.svg\n[npm-downloads-image]: https://img.shields.io/npm/dm/mime-db.svg\n[npm-url]: https://npmjs.org/package/mime-db\n[travis-image]: https://img.shields.io/travis/jshttp/mime-db/master.svg\n[travis-url]: https://travis-ci.org/jshttp/mime-db\n[coveralls-image]: https://img.shields.io/coveralls/jshttp/mime-db/master.svg\n[coveralls-url]: https://coveralls.io/r/jshttp/mime-db?branch=master\n[node-image]: https://img.shields.io/node/v/mime-db.svg\n[node-url]: http://nodejs.org/download/\n",
+  "readmeFilename": "README.md",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jshttp/mime-db.git"
+  },
+  "scripts": {
+    "build": "node scripts/build",
+    "fetch": "gnode scripts/fetch-apache && gnode scripts/fetch-iana && gnode scripts/fetch-nginx",
+    "test": "mocha --reporter spec --bail --check-leaks test/",
+    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/",
+    "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/",
+    "update": "npm run fetch && npm run build"
+  },
+  "version": "1.19.0"
+}
diff --git a/deps/npm/node_modules/request/node_modules/mime-types/HISTORY.md b/deps/npm/node_modules/mime-types/HISTORY.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/mime-types/HISTORY.md
rename to deps/npm/node_modules/mime-types/HISTORY.md
diff --git a/deps/npm/node_modules/request/node_modules/mime-types/LICENSE b/deps/npm/node_modules/mime-types/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/mime-types/LICENSE
rename to deps/npm/node_modules/mime-types/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/mime-types/README.md b/deps/npm/node_modules/mime-types/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/mime-types/README.md
rename to deps/npm/node_modules/mime-types/README.md
diff --git a/deps/npm/node_modules/request/node_modules/mime-types/index.js b/deps/npm/node_modules/mime-types/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/mime-types/index.js
rename to deps/npm/node_modules/mime-types/index.js
diff --git a/deps/npm/node_modules/request/node_modules/mime-types/package.json b/deps/npm/node_modules/mime-types/package.json
similarity index 73%
rename from deps/npm/node_modules/request/node_modules/mime-types/package.json
rename to deps/npm/node_modules/mime-types/package.json
index 73e16dde1e0ee5..5cd56a93b42521 100644
--- a/deps/npm/node_modules/request/node_modules/mime-types/package.json
+++ b/deps/npm/node_modules/mime-types/package.json
@@ -1,7 +1,40 @@
 {
-  "name": "mime-types",
-  "description": "The ultimate javascript content-type utility.",
-  "version": "2.1.7",
+  "_args": [
+    [
+      "mime-types@~2.1.2",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
+  ],
+  "_from": "mime-types@>=2.1.2 <2.2.0",
+  "_id": "mime-types@2.1.7",
+  "_inCache": true,
+  "_location": "/mime-types",
+  "_npmUser": {
+    "email": "doug@somethingdoug.com",
+    "name": "dougwilson"
+  },
+  "_npmVersion": "1.4.28",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "mime-types",
+    "raw": "mime-types@~2.1.2",
+    "rawSpec": "~2.1.2",
+    "scope": null,
+    "spec": ">=2.1.2 <2.2.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/form-data",
+    "/request"
+  ],
+  "_resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
+  "_shasum": "ff603970e3c731ef6f7f4df3c9a0f463a13c2755",
+  "_shrinkwrap": null,
+  "_spec": "mime-types@~2.1.2",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
+  "bugs": {
+    "url": "https://github.com/jshttp/mime-types/issues"
+  },
   "contributors": [
     {
       "name": "Douglas Christopher Wilson",
@@ -18,48 +51,35 @@
       "url": "http://jongleberry.com"
     }
   ],
-  "license": "MIT",
-  "keywords": [
-    "mime",
-    "types"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/jshttp/mime-types.git"
-  },
   "dependencies": {
     "mime-db": "~1.19.0"
   },
+  "description": "The ultimate javascript content-type utility.",
   "devDependencies": {
     "istanbul": "0.3.20",
     "mocha": "~1.21.5"
   },
+  "directories": {},
+  "dist": {
+    "shasum": "ff603970e3c731ef6f7f4df3c9a0f463a13c2755",
+    "tarball": "http://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz"
+  },
+  "engines": {
+    "node": ">= 0.6"
+  },
   "files": [
     "HISTORY.md",
     "LICENSE",
     "index.js"
   ],
-  "engines": {
-    "node": ">= 0.6"
-  },
-  "scripts": {
-    "test": "mocha --reporter spec test/test.js",
-    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot test/test.js",
-    "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter dot test/test.js"
-  },
   "gitHead": "43f860c7df4a70246272194d601348865d550298",
-  "bugs": {
-    "url": "https://github.com/jshttp/mime-types/issues"
-  },
   "homepage": "https://github.com/jshttp/mime-types",
-  "_id": "mime-types@2.1.7",
-  "_shasum": "ff603970e3c731ef6f7f4df3c9a0f463a13c2755",
-  "_from": "mime-types@>=2.1.2 <2.2.0",
-  "_npmVersion": "1.4.28",
-  "_npmUser": {
-    "name": "dougwilson",
-    "email": "doug@somethingdoug.com"
-  },
+  "installable": true,
+  "keywords": [
+    "mime",
+    "types"
+  ],
+  "license": "MIT",
   "maintainers": [
     {
       "name": "jongleberry",
@@ -74,11 +94,16 @@
       "email": "doug@somethingdoug.com"
     }
   ],
-  "dist": {
-    "shasum": "ff603970e3c731ef6f7f4df3c9a0f463a13c2755",
-    "tarball": "http://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz"
+  "name": "mime-types",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/jshttp/mime-types"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "mocha --reporter spec test/test.js",
+    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot test/test.js",
+    "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter dot test/test.js"
+  },
+  "version": "2.1.7"
 }
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/README.md b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/README.md
deleted file mode 100644
index 62bc7bae3fed28..00000000000000
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/README.md
+++ /dev/null
@@ -1,121 +0,0 @@
-# brace-expansion
-
-[Brace expansion](https://www.gnu.org/software/bash/manual/html_node/Brace-Expansion.html), 
-as known from sh/bash, in JavaScript.
-
-[![build status](https://secure.travis-ci.org/juliangruber/brace-expansion.svg)](http://travis-ci.org/juliangruber/brace-expansion)
-
-[![testling badge](https://ci.testling.com/juliangruber/brace-expansion.png)](https://ci.testling.com/juliangruber/brace-expansion)
-
-## Example
-
-```js
-var expand = require('brace-expansion');
-
-expand('file-{a,b,c}.jpg')
-// => ['file-a.jpg', 'file-b.jpg', 'file-c.jpg']
-
-expand('-v{,,}')
-// => ['-v', '-v', '-v']
-
-expand('file{0..2}.jpg')
-// => ['file0.jpg', 'file1.jpg', 'file2.jpg']
-
-expand('file-{a..c}.jpg')
-// => ['file-a.jpg', 'file-b.jpg', 'file-c.jpg']
-
-expand('file{2..0}.jpg')
-// => ['file2.jpg', 'file1.jpg', 'file0.jpg']
-
-expand('file{0..4..2}.jpg')
-// => ['file0.jpg', 'file2.jpg', 'file4.jpg']
-
-expand('file-{a..e..2}.jpg')
-// => ['file-a.jpg', 'file-c.jpg', 'file-e.jpg']
-
-expand('file{00..10..5}.jpg')
-// => ['file00.jpg', 'file05.jpg', 'file10.jpg']
-
-expand('{{A..C},{a..c}}')
-// => ['A', 'B', 'C', 'a', 'b', 'c']
-
-expand('ppp{,config,oe{,conf}}')
-// => ['ppp', 'pppconfig', 'pppoe', 'pppoeconf']
-```
-
-## API
-
-```js
-var expand = require('brace-expansion');
-```
-
-### var expanded = expand(str)
-
-Return an array of all possible and valid expansions of `str`. If none are
-found, `[str]` is returned.
-
-Valid expansions are:
-
-```js
-/^(.*,)+(.+)?$/
-// {a,b,...}
-```
-
-A comma seperated list of options, like `{a,b}` or `{a,{b,c}}` or `{,a,}`.
-
-```js
-/^-?\d+\.\.-?\d+(\.\.-?\d+)?$/
-// {x..y[..incr]}
-```
-
-A numeric sequence from `x` to `y` inclusive, with optional increment.
-If `x` or `y` start with a leading `0`, all the numbers will be padded
-to have equal length. Negative numbers and backwards iteration work too.
-
-```js
-/^-?\d+\.\.-?\d+(\.\.-?\d+)?$/
-// {x..y[..incr]}
-```
-
-An alphabetic sequence from `x` to `y` inclusive, with optional increment.
-`x` and `y` must be exactly one character, and if given, `incr` must be a
-number.
-
-For compatibility reasons, the string `${` is not eligible for brace expansion.
-
-## Installation
-
-With [npm](https://npmjs.org) do:
-
-```bash
-npm install brace-expansion
-```
-
-## Contributors
-
-- [Julian Gruber](https://github.com/juliangruber)
-- [Isaac Z. Schlueter](https://github.com/isaacs)
-
-## License
-
-(MIT)
-
-Copyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
deleted file mode 100644
index fa5da71a6d0d34..00000000000000
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-
-test:
-	@node_modules/.bin/tape test/*.js
-
-.PHONY: test
-
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
deleted file mode 100644
index c02ad348e69aec..00000000000000
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var balanced = require('./');
-
-console.log(balanced('{', '}', 'pre{in{nested}}post'));
-console.log(balanced('{', '}', 'pre{first}between{second}post'));
-
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
deleted file mode 100644
index 2f1bd3d5d241b8..00000000000000
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "name": "concat-map",
-  "description": "concatenative mapdashery",
-  "version": "0.0.1",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/substack/node-concat-map.git"
-  },
-  "main": "index.js",
-  "keywords": [
-    "concat",
-    "concatMap",
-    "map",
-    "functional",
-    "higher-order"
-  ],
-  "directories": {
-    "example": "example",
-    "test": "test"
-  },
-  "scripts": {
-    "test": "tape test/*.js"
-  },
-  "devDependencies": {
-    "tape": "~2.4.0"
-  },
-  "license": "MIT",
-  "author": {
-    "name": "James Halliday",
-    "email": "mail@substack.net",
-    "url": "http://substack.net"
-  },
-  "testling": {
-    "files": "test/*.js",
-    "browsers": {
-      "ie": [
-        6,
-        7,
-        8,
-        9
-      ],
-      "ff": [
-        3.5,
-        10,
-        15
-      ],
-      "chrome": [
-        10,
-        22
-      ],
-      "safari": [
-        5.1
-      ],
-      "opera": [
-        12
-      ]
-    }
-  },
-  "bugs": {
-    "url": "https://github.com/substack/node-concat-map/issues"
-  },
-  "homepage": "https://github.com/substack/node-concat-map",
-  "_id": "concat-map@0.0.1",
-  "dist": {
-    "shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
-    "tarball": "https://registrytwo.npmjs.com/concat-map/-/concat-map-0.0.1.tgz"
-  },
-  "_from": "concat-map@0.0.1",
-  "_npmVersion": "1.3.21",
-  "_npmUser": {
-    "name": "substack",
-    "email": "mail@substack.net"
-  },
-  "maintainers": [
-    {
-      "name": "substack",
-      "email": "mail@substack.net"
-    }
-  ],
-  "_shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
-  "_resolved": "https://registrytwo.npmjs.com/concat-map/-/concat-map-0.0.1.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/bash-comparison.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/bash-comparison.js
deleted file mode 100644
index 5fe2b8ad48cc1c..00000000000000
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/bash-comparison.js
+++ /dev/null
@@ -1,32 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-var fs = require('fs');
-var resfile = __dirname + '/bash-results.txt';
-var cases = fs.readFileSync(resfile, 'utf8').split('><><><><');
-
-// throw away the EOF marker
-cases.pop()
-
-test('matches bash expansions', function(t) {
-  cases.forEach(function(testcase) {
-    var set = testcase.split('\n');
-    var pattern = set.shift();
-    var actual = expand(pattern);
-
-    // If it expands to the empty string, then it's actually
-    // just nothing, but Bash is a singly typed language, so
-    // "nothing" is the same as "".
-    if (set.length === 1 && set[0] === '') {
-      set = []
-    } else {
-      // otherwise, strip off the [] that were added so that
-      // "" expansions would be preserved properly.
-      set = set.map(function (s) {
-        return s.replace(/^\[|\]$/g, '')
-      })
-    }
-
-    t.same(actual, set, pattern);
-  });
-  t.end();
-})
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/bash-results.txt b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/bash-results.txt
deleted file mode 100644
index 958148d26aacb9..00000000000000
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/bash-results.txt
+++ /dev/null
@@ -1,1075 +0,0 @@
-A{b,{d,e},{f,g}}Z
-[AbZ]
-[AdZ]
-[AeZ]
-[AfZ]
-[AgZ]><><><><PRE-{a,b}{{a,b},a,b}-POST
-[PRE-aa-POST]
-[PRE-ab-POST]
-[PRE-aa-POST]
-[PRE-ab-POST]
-[PRE-ba-POST]
-[PRE-bb-POST]
-[PRE-ba-POST]
-[PRE-bb-POST]><><><><\{a,b}{{a,b},a,b}
-[{a,b}a]
-[{a,b}b]
-[{a,b}a]
-[{a,b}b]><><><><{{a,b}
-[{a]
-[{b]><><><><{a,b}}
-[a}]
-[b}]><><><><{,}
-><><><><a{,}
-[a]
-[a]><><><><{,}b
-[b]
-[b]><><><><a{,}b
-[ab]
-[ab]><><><><a{b}c
-[a{b}c]><><><><a{1..5}b
-[a1b]
-[a2b]
-[a3b]
-[a4b]
-[a5b]><><><><a{01..5}b
-[a01b]
-[a02b]
-[a03b]
-[a04b]
-[a05b]><><><><a{-01..5}b
-[a-01b]
-[a000b]
-[a001b]
-[a002b]
-[a003b]
-[a004b]
-[a005b]><><><><a{-01..5..3}b
-[a-01b]
-[a002b]
-[a005b]><><><><a{001..9}b
-[a001b]
-[a002b]
-[a003b]
-[a004b]
-[a005b]
-[a006b]
-[a007b]
-[a008b]
-[a009b]><><><><a{b,c{d,e},{f,g}h}x{y,z
-[abx{y,z]
-[acdx{y,z]
-[acex{y,z]
-[afhx{y,z]
-[aghx{y,z]><><><><a{b,c{d,e},{f,g}h}x{y,z\}
-[abx{y,z}]
-[acdx{y,z}]
-[acex{y,z}]
-[afhx{y,z}]
-[aghx{y,z}]><><><><a{b,c{d,e},{f,g}h}x{y,z}
-[abxy]
-[abxz]
-[acdxy]
-[acdxz]
-[acexy]
-[acexz]
-[afhxy]
-[afhxz]
-[aghxy]
-[aghxz]><><><><a{b{c{d,e}f{x,y{{g}h
-[a{b{cdf{x,y{{g}h]
-[a{b{cef{x,y{{g}h]><><><><a{b{c{d,e}f{x,y{}g}h
-[a{b{cdfxh]
-[a{b{cdfy{}gh]
-[a{b{cefxh]
-[a{b{cefy{}gh]><><><><a{b{c{d,e}f{x,y}}g}h
-[a{b{cdfx}g}h]
-[a{b{cdfy}g}h]
-[a{b{cefx}g}h]
-[a{b{cefy}g}h]><><><><a{b{c{d,e}f}g}h
-[a{b{cdf}g}h]
-[a{b{cef}g}h]><><><><a{{x,y},z}b
-[axb]
-[ayb]
-[azb]><><><><f{x,y{g,z}}h
-[fxh]
-[fygh]
-[fyzh]><><><><f{x,y{{g,z}}h
-[f{x,y{g}h]
-[f{x,y{z}h]><><><><f{x,y{{g,z}}h}
-[fx]
-[fy{g}h]
-[fy{z}h]><><><><f{x,y{{g}h
-[f{x,y{{g}h]><><><><f{x,y{{g}}h
-[f{x,y{{g}}h]><><><><f{x,y{}g}h
-[fxh]
-[fy{}gh]><><><><z{a,b{,c}d
-[z{a,bd]
-[z{a,bcd]><><><><z{a,b},c}d
-[za,c}d]
-[zb,c}d]><><><><{-01..5}
-[-01]
-[000]
-[001]
-[002]
-[003]
-[004]
-[005]><><><><{-05..100..5}
-[-05]
-[000]
-[005]
-[010]
-[015]
-[020]
-[025]
-[030]
-[035]
-[040]
-[045]
-[050]
-[055]
-[060]
-[065]
-[070]
-[075]
-[080]
-[085]
-[090]
-[095]
-[100]><><><><{-05..100}
-[-05]
-[-04]
-[-03]
-[-02]
-[-01]
-[000]
-[001]
-[002]
-[003]
-[004]
-[005]
-[006]
-[007]
-[008]
-[009]
-[010]
-[011]
-[012]
-[013]
-[014]
-[015]
-[016]
-[017]
-[018]
-[019]
-[020]
-[021]
-[022]
-[023]
-[024]
-[025]
-[026]
-[027]
-[028]
-[029]
-[030]
-[031]
-[032]
-[033]
-[034]
-[035]
-[036]
-[037]
-[038]
-[039]
-[040]
-[041]
-[042]
-[043]
-[044]
-[045]
-[046]
-[047]
-[048]
-[049]
-[050]
-[051]
-[052]
-[053]
-[054]
-[055]
-[056]
-[057]
-[058]
-[059]
-[060]
-[061]
-[062]
-[063]
-[064]
-[065]
-[066]
-[067]
-[068]
-[069]
-[070]
-[071]
-[072]
-[073]
-[074]
-[075]
-[076]
-[077]
-[078]
-[079]
-[080]
-[081]
-[082]
-[083]
-[084]
-[085]
-[086]
-[087]
-[088]
-[089]
-[090]
-[091]
-[092]
-[093]
-[094]
-[095]
-[096]
-[097]
-[098]
-[099]
-[100]><><><><{0..5..2}
-[0]
-[2]
-[4]><><><><{0001..05..2}
-[0001]
-[0003]
-[0005]><><><><{0001..-5..2}
-[0001]
-[-001]
-[-003]
-[-005]><><><><{0001..-5..-2}
-[0001]
-[-001]
-[-003]
-[-005]><><><><{0001..5..-2}
-[0001]
-[0003]
-[0005]><><><><{01..5}
-[01]
-[02]
-[03]
-[04]
-[05]><><><><{1..05}
-[01]
-[02]
-[03]
-[04]
-[05]><><><><{1..05..3}
-[01]
-[04]><><><><{05..100}
-[005]
-[006]
-[007]
-[008]
-[009]
-[010]
-[011]
-[012]
-[013]
-[014]
-[015]
-[016]
-[017]
-[018]
-[019]
-[020]
-[021]
-[022]
-[023]
-[024]
-[025]
-[026]
-[027]
-[028]
-[029]
-[030]
-[031]
-[032]
-[033]
-[034]
-[035]
-[036]
-[037]
-[038]
-[039]
-[040]
-[041]
-[042]
-[043]
-[044]
-[045]
-[046]
-[047]
-[048]
-[049]
-[050]
-[051]
-[052]
-[053]
-[054]
-[055]
-[056]
-[057]
-[058]
-[059]
-[060]
-[061]
-[062]
-[063]
-[064]
-[065]
-[066]
-[067]
-[068]
-[069]
-[070]
-[071]
-[072]
-[073]
-[074]
-[075]
-[076]
-[077]
-[078]
-[079]
-[080]
-[081]
-[082]
-[083]
-[084]
-[085]
-[086]
-[087]
-[088]
-[089]
-[090]
-[091]
-[092]
-[093]
-[094]
-[095]
-[096]
-[097]
-[098]
-[099]
-[100]><><><><{0a..0z}
-[{0a..0z}]><><><><{a,b\}c,d}
-[a]
-[b}c]
-[d]><><><><{a,b{c,d}
-[{a,bc]
-[{a,bd]><><><><{a,b}c,d}
-[ac,d}]
-[bc,d}]><><><><{a..F}
-[a]
-[`]
-[_]
-[^]
-[]]
-[]
-[[]
-[Z]
-[Y]
-[X]
-[W]
-[V]
-[U]
-[T]
-[S]
-[R]
-[Q]
-[P]
-[O]
-[N]
-[M]
-[L]
-[K]
-[J]
-[I]
-[H]
-[G]
-[F]><><><><{A..f}
-[A]
-[B]
-[C]
-[D]
-[E]
-[F]
-[G]
-[H]
-[I]
-[J]
-[K]
-[L]
-[M]
-[N]
-[O]
-[P]
-[Q]
-[R]
-[S]
-[T]
-[U]
-[V]
-[W]
-[X]
-[Y]
-[Z]
-[[]
-[]
-[]]
-[^]
-[_]
-[`]
-[a]
-[b]
-[c]
-[d]
-[e]
-[f]><><><><{a..Z}
-[a]
-[`]
-[_]
-[^]
-[]]
-[]
-[[]
-[Z]><><><><{A..z}
-[A]
-[B]
-[C]
-[D]
-[E]
-[F]
-[G]
-[H]
-[I]
-[J]
-[K]
-[L]
-[M]
-[N]
-[O]
-[P]
-[Q]
-[R]
-[S]
-[T]
-[U]
-[V]
-[W]
-[X]
-[Y]
-[Z]
-[[]
-[]
-[]]
-[^]
-[_]
-[`]
-[a]
-[b]
-[c]
-[d]
-[e]
-[f]
-[g]
-[h]
-[i]
-[j]
-[k]
-[l]
-[m]
-[n]
-[o]
-[p]
-[q]
-[r]
-[s]
-[t]
-[u]
-[v]
-[w]
-[x]
-[y]
-[z]><><><><{z..A}
-[z]
-[y]
-[x]
-[w]
-[v]
-[u]
-[t]
-[s]
-[r]
-[q]
-[p]
-[o]
-[n]
-[m]
-[l]
-[k]
-[j]
-[i]
-[h]
-[g]
-[f]
-[e]
-[d]
-[c]
-[b]
-[a]
-[`]
-[_]
-[^]
-[]]
-[]
-[[]
-[Z]
-[Y]
-[X]
-[W]
-[V]
-[U]
-[T]
-[S]
-[R]
-[Q]
-[P]
-[O]
-[N]
-[M]
-[L]
-[K]
-[J]
-[I]
-[H]
-[G]
-[F]
-[E]
-[D]
-[C]
-[B]
-[A]><><><><{Z..a}
-[Z]
-[[]
-[]
-[]]
-[^]
-[_]
-[`]
-[a]><><><><{a..F..2}
-[a]
-[_]
-[]]
-[[]
-[Y]
-[W]
-[U]
-[S]
-[Q]
-[O]
-[M]
-[K]
-[I]
-[G]><><><><{A..f..02}
-[A]
-[C]
-[E]
-[G]
-[I]
-[K]
-[M]
-[O]
-[Q]
-[S]
-[U]
-[W]
-[Y]
-[[]
-[]]
-[_]
-[a]
-[c]
-[e]><><><><{a..Z..5}
-[a]
-[]><><><><d{a..Z..5}b
-[dab]
-[db]><><><><{A..z..10}
-[A]
-[K]
-[U]
-[_]
-[i]
-[s]><><><><{z..A..-2}
-[z]
-[x]
-[v]
-[t]
-[r]
-[p]
-[n]
-[l]
-[j]
-[h]
-[f]
-[d]
-[b]
-[`]
-[^]
-[]
-[Z]
-[X]
-[V]
-[T]
-[R]
-[P]
-[N]
-[L]
-[J]
-[H]
-[F]
-[D]
-[B]><><><><{Z..a..20}
-[Z]><><><><{a{,b}
-[{a]
-[{ab]><><><><{a},b}
-[a}]
-[b]><><><><{x,y{,}g}
-[x]
-[yg]
-[yg]><><><><{x,y{}g}
-[x]
-[y{}g]><><><><{{a,b}
-[{a]
-[{b]><><><><{{a,b},c}
-[a]
-[b]
-[c]><><><><{{a,b}c}
-[{ac}]
-[{bc}]><><><><{{a,b},}
-[a]
-[b]><><><><X{{a,b},}X
-[XaX]
-[XbX]
-[XX]><><><><{{a,b},}c
-[ac]
-[bc]
-[c]><><><><{{a,b}.}
-[{a.}]
-[{b.}]><><><><{{a,b}}
-[{a}]
-[{b}]><><><><X{a..#}X
-[X{a..#}X]><><><><
-><><><><{-10..00}
-[-10]
-[-09]
-[-08]
-[-07]
-[-06]
-[-05]
-[-04]
-[-03]
-[-02]
-[-01]
-[000]><><><><{a,\\{a,b}c}
-[a]
-[\ac]
-[\bc]><><><><{a,\{a,b}c}
-[ac}]
-[{ac}]
-[bc}]><><><><a,\{b,c}
-[a,{b,c}]><><><><{-10.\.00}
-[{-10..00}]><><><><ff{c,b,a}
-[ffc]
-[ffb]
-[ffa]><><><><f{d,e,f}g
-[fdg]
-[feg]
-[ffg]><><><><{l,n,m}xyz
-[lxyz]
-[nxyz]
-[mxyz]><><><><{abc\,def}
-[{abc,def}]><><><><{abc}
-[{abc}]><><><><{x\,y,\{abc\},trie}
-[x,y]
-[{abc}]
-[trie]><><><><{}
-[{}]><><><><}
-[}]><><><><{
-[{]><><><><abcd{efgh
-[abcd{efgh]><><><><{1..10}
-[1]
-[2]
-[3]
-[4]
-[5]
-[6]
-[7]
-[8]
-[9]
-[10]><><><><{0..10,braces}
-[0..10]
-[braces]><><><><{{0..10},braces}
-[0]
-[1]
-[2]
-[3]
-[4]
-[5]
-[6]
-[7]
-[8]
-[9]
-[10]
-[braces]><><><><x{{0..10},braces}y
-[x0y]
-[x1y]
-[x2y]
-[x3y]
-[x4y]
-[x5y]
-[x6y]
-[x7y]
-[x8y]
-[x9y]
-[x10y]
-[xbracesy]><><><><{3..3}
-[3]><><><><x{3..3}y
-[x3y]><><><><{10..1}
-[10]
-[9]
-[8]
-[7]
-[6]
-[5]
-[4]
-[3]
-[2]
-[1]><><><><{10..1}y
-[10y]
-[9y]
-[8y]
-[7y]
-[6y]
-[5y]
-[4y]
-[3y]
-[2y]
-[1y]><><><><x{10..1}y
-[x10y]
-[x9y]
-[x8y]
-[x7y]
-[x6y]
-[x5y]
-[x4y]
-[x3y]
-[x2y]
-[x1y]><><><><{a..f}
-[a]
-[b]
-[c]
-[d]
-[e]
-[f]><><><><{f..a}
-[f]
-[e]
-[d]
-[c]
-[b]
-[a]><><><><{a..A}
-[a]
-[`]
-[_]
-[^]
-[]]
-[]
-[[]
-[Z]
-[Y]
-[X]
-[W]
-[V]
-[U]
-[T]
-[S]
-[R]
-[Q]
-[P]
-[O]
-[N]
-[M]
-[L]
-[K]
-[J]
-[I]
-[H]
-[G]
-[F]
-[E]
-[D]
-[C]
-[B]
-[A]><><><><{A..a}
-[A]
-[B]
-[C]
-[D]
-[E]
-[F]
-[G]
-[H]
-[I]
-[J]
-[K]
-[L]
-[M]
-[N]
-[O]
-[P]
-[Q]
-[R]
-[S]
-[T]
-[U]
-[V]
-[W]
-[X]
-[Y]
-[Z]
-[[]
-[]
-[]]
-[^]
-[_]
-[`]
-[a]><><><><{f..f}
-[f]><><><><{1..f}
-[{1..f}]><><><><{f..1}
-[{f..1}]><><><><{-1..-10}
-[-1]
-[-2]
-[-3]
-[-4]
-[-5]
-[-6]
-[-7]
-[-8]
-[-9]
-[-10]><><><><{-20..0}
-[-20]
-[-19]
-[-18]
-[-17]
-[-16]
-[-15]
-[-14]
-[-13]
-[-12]
-[-11]
-[-10]
-[-9]
-[-8]
-[-7]
-[-6]
-[-5]
-[-4]
-[-3]
-[-2]
-[-1]
-[0]><><><><a-{b{d,e}}-c
-[a-{bd}-c]
-[a-{be}-c]><><><><a-{bdef-{g,i}-c
-[a-{bdef-g-c]
-[a-{bdef-i-c]><><><><{klklkl}{1,2,3}
-[{klklkl}1]
-[{klklkl}2]
-[{klklkl}3]><><><><{1..10..2}
-[1]
-[3]
-[5]
-[7]
-[9]><><><><{-1..-10..2}
-[-1]
-[-3]
-[-5]
-[-7]
-[-9]><><><><{-1..-10..-2}
-[-1]
-[-3]
-[-5]
-[-7]
-[-9]><><><><{10..1..-2}
-[10]
-[8]
-[6]
-[4]
-[2]><><><><{10..1..2}
-[10]
-[8]
-[6]
-[4]
-[2]><><><><{1..20..2}
-[1]
-[3]
-[5]
-[7]
-[9]
-[11]
-[13]
-[15]
-[17]
-[19]><><><><{1..20..20}
-[1]><><><><{100..0..5}
-[100]
-[95]
-[90]
-[85]
-[80]
-[75]
-[70]
-[65]
-[60]
-[55]
-[50]
-[45]
-[40]
-[35]
-[30]
-[25]
-[20]
-[15]
-[10]
-[5]
-[0]><><><><{100..0..-5}
-[100]
-[95]
-[90]
-[85]
-[80]
-[75]
-[70]
-[65]
-[60]
-[55]
-[50]
-[45]
-[40]
-[35]
-[30]
-[25]
-[20]
-[15]
-[10]
-[5]
-[0]><><><><{a..z}
-[a]
-[b]
-[c]
-[d]
-[e]
-[f]
-[g]
-[h]
-[i]
-[j]
-[k]
-[l]
-[m]
-[n]
-[o]
-[p]
-[q]
-[r]
-[s]
-[t]
-[u]
-[v]
-[w]
-[x]
-[y]
-[z]><><><><{a..z..2}
-[a]
-[c]
-[e]
-[g]
-[i]
-[k]
-[m]
-[o]
-[q]
-[s]
-[u]
-[w]
-[y]><><><><{z..a..-2}
-[z]
-[x]
-[v]
-[t]
-[r]
-[p]
-[n]
-[l]
-[j]
-[h]
-[f]
-[d]
-[b]><><><><{2147483645..2147483649}
-[2147483645]
-[2147483646]
-[2147483647]
-[2147483648]
-[2147483649]><><><><{10..0..2}
-[10]
-[8]
-[6]
-[4]
-[2]
-[0]><><><><{10..0..-2}
-[10]
-[8]
-[6]
-[4]
-[2]
-[0]><><><><{-50..-0..5}
-[-50]
-[-45]
-[-40]
-[-35]
-[-30]
-[-25]
-[-20]
-[-15]
-[-10]
-[-5]
-[0]><><><><{1..10.f}
-[{1..10.f}]><><><><{1..ff}
-[{1..ff}]><><><><{1..10..ff}
-[{1..10..ff}]><><><><{1.20..2}
-[{1.20..2}]><><><><{1..20..f2}
-[{1..20..f2}]><><><><{1..20..2f}
-[{1..20..2f}]><><><><{1..2f..2}
-[{1..2f..2}]><><><><{1..ff..2}
-[{1..ff..2}]><><><><{1..ff}
-[{1..ff}]><><><><{1..f}
-[{1..f}]><><><><{1..0f}
-[{1..0f}]><><><><{1..10f}
-[{1..10f}]><><><><{1..10.f}
-[{1..10.f}]><><><><{1..10.f}
-[{1..10.f}]><><><><
\ No newline at end of file
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/cases.txt b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/cases.txt
deleted file mode 100644
index e5161c3da869f3..00000000000000
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/cases.txt
+++ /dev/null
@@ -1,182 +0,0 @@
-# skip quotes for now
-# "{x,x}"
-# {"x,x"}
-# {x","x}
-# '{a,b}{{a,b},a,b}'
-A{b,{d,e},{f,g}}Z
-PRE-{a,b}{{a,b},a,b}-POST
-\\{a,b}{{a,b},a,b}
-{{a,b}
-{a,b}}
-{,}
-a{,}
-{,}b
-a{,}b
-a{b}c
-a{1..5}b
-a{01..5}b
-a{-01..5}b
-a{-01..5..3}b
-a{001..9}b
-a{b,c{d,e},{f,g}h}x{y,z
-a{b,c{d,e},{f,g}h}x{y,z\\}
-a{b,c{d,e},{f,g}h}x{y,z}
-a{b{c{d,e}f{x,y{{g}h
-a{b{c{d,e}f{x,y{}g}h
-a{b{c{d,e}f{x,y}}g}h
-a{b{c{d,e}f}g}h
-a{{x,y},z}b
-f{x,y{g,z}}h
-f{x,y{{g,z}}h
-f{x,y{{g,z}}h}
-f{x,y{{g}h
-f{x,y{{g}}h
-f{x,y{}g}h
-z{a,b{,c}d
-z{a,b},c}d
-{-01..5}
-{-05..100..5}
-{-05..100}
-{0..5..2}
-{0001..05..2}
-{0001..-5..2}
-{0001..-5..-2}
-{0001..5..-2}
-{01..5}
-{1..05}
-{1..05..3}
-{05..100}
-{0a..0z}
-{a,b\\}c,d}
-{a,b{c,d}
-{a,b}c,d}
-{a..F}
-{A..f}
-{a..Z}
-{A..z}
-{z..A}
-{Z..a}
-{a..F..2}
-{A..f..02}
-{a..Z..5}
-d{a..Z..5}b
-{A..z..10}
-{z..A..-2}
-{Z..a..20}
-{a{,b}
-{a},b}
-{x,y{,}g}
-{x,y{}g}
-{{a,b}
-{{a,b},c}
-{{a,b}c}
-{{a,b},}
-X{{a,b},}X
-{{a,b},}c
-{{a,b}.}
-{{a,b}}
-X{a..#}X
-# this next one is an empty string
-
-{-10..00}
-# Need to escape slashes in here for reasons i guess.
-{a,\\\\{a,b}c}
-{a,\\{a,b}c}
-a,\\{b,c}
-{-10.\\.00}
-#### bash tests/braces.tests
-# Note that some tests are edited out because some features of
-# bash are intentionally not supported in this brace expander.
-ff{c,b,a}
-f{d,e,f}g
-{l,n,m}xyz
-{abc\\,def}
-{abc}
-{x\\,y,\\{abc\\},trie}
-# not impementing back-ticks obviously
-# XXXX\\{`echo a b c | tr ' ' ','`\\}
-{}
-# We only ever have to worry about parsing a single argument,
-# not a command line, so spaces have a different meaning than bash.
-# { }
-}
-{
-abcd{efgh
-# spaces
-# foo {1,2} bar
-# not impementing back-ticks obviously
-# `zecho foo {1,2} bar`
-# $(zecho foo {1,2} bar)
-# ${var} is not a variable here, like it is in bash. omit.
-# foo{bar,${var}.}
-# foo{bar,${var}}
-# isaacs: skip quotes for now
-# "${var}"{x,y}
-# $var{x,y}
-# ${var}{x,y}
-# new sequence brace operators
-{1..10}
-# this doesn't work yet
-{0..10,braces}
-# but this does
-{{0..10},braces}
-x{{0..10},braces}y
-{3..3}
-x{3..3}y
-{10..1}
-{10..1}y
-x{10..1}y
-{a..f}
-{f..a}
-{a..A}
-{A..a}
-{f..f}
-# mixes are incorrectly-formed brace expansions
-{1..f}
-{f..1}
-# spaces
-# 0{1..9} {10..20}
-# do negative numbers work?
-{-1..-10}
-{-20..0}
-# weirdly-formed brace expansions -- fixed in post-bash-3.1
-a-{b{d,e}}-c
-a-{bdef-{g,i}-c
-# isaacs: skip quotes for now
-# {"klklkl"}{1,2,3}
-# isaacs: this is a valid test, though
-{klklkl}{1,2,3}
-# {"x,x"}
-{1..10..2}
-{-1..-10..2}
-{-1..-10..-2}
-{10..1..-2}
-{10..1..2}
-{1..20..2}
-{1..20..20}
-{100..0..5}
-{100..0..-5}
-{a..z}
-{a..z..2}
-{z..a..-2}
-# make sure brace expansion handles ints > 2**31 - 1 using intmax_t
-{2147483645..2147483649}
-# unwanted zero-padding -- fixed post-bash-4.0
-{10..0..2}
-{10..0..-2}
-{-50..-0..5}
-# bad
-{1..10.f}
-{1..ff}
-{1..10..ff}
-{1.20..2}
-{1..20..f2}
-{1..20..2f}
-{1..2f..2}
-{1..ff..2}
-{1..ff}
-{1..f}
-{1..0f}
-{1..10f}
-{1..10.f}
-{1..10.f}
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/dollar.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/dollar.js
deleted file mode 100644
index 3fcc185a7d6dcc..00000000000000
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/dollar.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('ignores ${', function(t) {
-  t.deepEqual(expand('${1..3}'), ['${1..3}']);
-  t.deepEqual(expand('${a,b}${c,d}'), ['${a,b}${c,d}']);
-  t.deepEqual(expand('x${a,b}x${c,d}x'), ['x${a,b}x${c,d}x']);
-  t.end();
-});
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js
deleted file mode 100644
index e429121eab8059..00000000000000
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('empty option', function(t) {
-  t.deepEqual(expand('-v{,,,,}'), [
-    '-v', '-v', '-v', '-v', '-v'
-  ]);
-  t.end();
-});
-
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/generate.sh b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/generate.sh
deleted file mode 100644
index e040e664d9f881..00000000000000
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/generate.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# Bash 4.3 because of arbitrary need to pick a single standard.
-
-if [ "${BASH_VERSINFO[0]}" != "4" ] || [ "${BASH_VERSINFO[1]}" != "3" ]; then
-  echo "this script requires bash 4.3" >&2
-  exit 1
-fi
-
-CDPATH= cd "$(dirname "$0")"
-
-js='require("./")(process.argv[1]).join(" ")'
-
-cat cases.txt | \
-  while read case; do
-    if [ "${case:0:1}" = "#" ]; then
-      continue;
-    fi;
-    b="$($BASH -c 'for c in '"$case"'; do echo ["$c"]; done')"
-    echo "$case"
-    echo -n "$b><><><><";
-  done > bash-results.txt
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/negative-increment.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/negative-increment.js
deleted file mode 100644
index 8d434c23d4514d..00000000000000
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/negative-increment.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('negative increment', function(t) {
-  t.deepEqual(expand('{3..1}'), ['3', '2', '1']);
-  t.deepEqual(expand('{10..8}'), ['10', '9', '8']);
-  t.deepEqual(expand('{10..08}'), ['10', '09', '08']);
-  t.deepEqual(expand('{c..a}'), ['c', 'b', 'a']);
-
-  t.deepEqual(expand('{4..0..2}'), ['4', '2', '0']);
-  t.deepEqual(expand('{4..0..-2}'), ['4', '2', '0']);
-  t.deepEqual(expand('{e..a..2}'), ['e', 'c', 'a']);
-
-  t.end();
-});
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/nested.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/nested.js
deleted file mode 100644
index 0862dc51f90aee..00000000000000
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/nested.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('nested', function(t) {
-  t.deepEqual(expand('{a,b{1..3},c}'), [
-    'a', 'b1', 'b2', 'b3', 'c'
-  ]);
-  t.deepEqual(expand('{{A..Z},{a..z}}'),
-    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
-  );
-  t.deepEqual(expand('ppp{,config,oe{,conf}}'), [
-    'ppp', 'pppconfig', 'pppoe', 'pppoeconf'
-  ]);
-  t.end();
-});
-
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/order.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/order.js
deleted file mode 100644
index c00ad155fe6760..00000000000000
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/order.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('order', function(t) {
-  t.deepEqual(expand('a{d,c,b}e'), [
-    'ade', 'ace', 'abe'
-  ]);
-  t.end();
-});
-
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/pad.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/pad.js
deleted file mode 100644
index e4158775f1bd06..00000000000000
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/pad.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('pad', function(t) {
-  t.deepEqual(expand('{9..11}'), [
-    '9', '10', '11'
-  ]);
-  t.deepEqual(expand('{09..11}'), [
-    '09', '10', '11'
-  ]);
-  t.end();
-});
-
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/same-type.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/same-type.js
deleted file mode 100644
index 3038fba7416b3a..00000000000000
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/same-type.js
+++ /dev/null
@@ -1,7 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('x and y of same type', function(t) {
-  t.deepEqual(expand('{a..9}'), ['{a..9}']);
-  t.end();
-});
diff --git a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js b/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js
deleted file mode 100644
index f73a9579ab398b..00000000000000
--- a/deps/npm/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js
+++ /dev/null
@@ -1,50 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('numeric sequences', function(t) {
-  t.deepEqual(expand('a{1..2}b{2..3}c'), [
-    'a1b2c', 'a1b3c', 'a2b2c', 'a2b3c'
-  ]);
-  t.deepEqual(expand('{1..2}{2..3}'), [
-    '12', '13', '22', '23'
-  ]);
-  t.end();
-});
-
-test('numeric sequences with step count', function(t) {
-  t.deepEqual(expand('{0..8..2}'), [
-    '0', '2', '4', '6', '8'
-  ]);
-  t.deepEqual(expand('{1..8..2}'), [
-    '1', '3', '5', '7'
-  ]);
-  t.end();
-});
-
-test('numeric sequence with negative x / y', function(t) {
-  t.deepEqual(expand('{3..-2}'), [
-    '3', '2', '1', '0', '-1', '-2'
-  ]);
-  t.end();
-});
-
-test('alphabetic sequences', function(t) {
-  t.deepEqual(expand('1{a..b}2{b..c}3'), [
-    '1a2b3', '1a2c3', '1b2b3', '1b2c3'
-  ]);
-  t.deepEqual(expand('{a..b}{b..c}'), [
-    'ab', 'ac', 'bb', 'bc'
-  ]);
-  t.end();
-});
-
-test('alphabetic sequences with step count', function(t) {
-  t.deepEqual(expand('{a..k..2}'), [
-    'a', 'c', 'e', 'g', 'i', 'k'
-  ]);
-  t.deepEqual(expand('{b..k..2}'), [
-    'b', 'd', 'f', 'h', 'j'
-  ]);
-  t.end();
-});
-
diff --git a/deps/npm/node_modules/minimatch/package.json b/deps/npm/node_modules/minimatch/package.json
index c7c9a089ceb430..9d97a256b68b14 100644
--- a/deps/npm/node_modules/minimatch/package.json
+++ b/deps/npm/node_modules/minimatch/package.json
@@ -1,62 +1,87 @@
 {
+  "_args": [
+    [
+      "minimatch@^2.0.1",
+      "/Users/rebecca/code/npm/node_modules/glob"
+    ]
+  ],
+  "_from": "minimatch@>=2.0.1 <3.0.0",
+  "_id": "minimatch@2.0.10",
+  "_inCache": true,
+  "_location": "/minimatch",
+  "_nodeVersion": "2.2.1",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
+  },
+  "_npmVersion": "3.1.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "minimatch",
+    "raw": "minimatch@^2.0.1",
+    "rawSpec": "^2.0.1",
+    "scope": null,
+    "spec": ">=2.0.1 <3.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/fstream-ignore",
+    "/glob"
+  ],
+  "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+  "_shasum": "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7",
+  "_shrinkwrap": null,
+  "_spec": "minimatch@^2.0.1",
+  "_where": "/Users/rebecca/code/npm/node_modules/glob",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me"
   },
-  "name": "minimatch",
-  "description": "a glob matcher in javascript",
-  "version": "2.0.10",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/minimatch.git"
-  },
-  "main": "minimatch.js",
-  "scripts": {
-    "posttest": "standard minimatch.js test/*.js",
-    "test": "tap test/*.js",
-    "prepublish": "browserify -o browser.js -e minimatch.js -s minimatch --bare"
-  },
-  "engines": {
-    "node": "*"
+  "bugs": {
+    "url": "https://github.com/isaacs/minimatch/issues"
   },
   "dependencies": {
     "brace-expansion": "^1.0.0"
   },
+  "description": "a glob matcher in javascript",
   "devDependencies": {
     "browserify": "^9.0.3",
     "standard": "^3.7.2",
     "tap": "^1.2.0"
   },
-  "license": "ISC",
-  "files": [
-    "minimatch.js",
-    "browser.js"
-  ],
-  "gitHead": "6afb85f0c324b321f76a38df81891e562693e257",
-  "bugs": {
-    "url": "https://github.com/isaacs/minimatch/issues"
-  },
-  "homepage": "https://github.com/isaacs/minimatch#readme",
-  "_id": "minimatch@2.0.10",
-  "_shasum": "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7",
-  "_from": "minimatch@2.0.10",
-  "_npmVersion": "3.1.0",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
-  },
+  "directories": {},
   "dist": {
     "shasum": "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7",
     "tarball": "http://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"
   },
+  "engines": {
+    "node": "*"
+  },
+  "files": [
+    "browser.js",
+    "minimatch.js"
+  ],
+  "gitHead": "6afb85f0c324b321f76a38df81891e562693e257",
+  "homepage": "https://github.com/isaacs/minimatch#readme",
+  "license": "ISC",
+  "main": "minimatch.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"
+  "name": "minimatch",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/minimatch.git"
+  },
+  "scripts": {
+    "posttest": "standard minimatch.js test/*.js",
+    "prepublish": "browserify -o browser.js -e minimatch.js -s minimatch --bare",
+    "test": "tap test/*.js"
+  },
+  "version": "2.0.10"
 }
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml b/deps/npm/node_modules/minimist/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml
rename to deps/npm/node_modules/minimist/.travis.yml
diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/LICENSE b/deps/npm/node_modules/minimist/LICENSE
similarity index 100%
rename from deps/npm/node_modules/mkdirp/node_modules/minimist/LICENSE
rename to deps/npm/node_modules/minimist/LICENSE
diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/example/parse.js b/deps/npm/node_modules/minimist/example/parse.js
similarity index 100%
rename from deps/npm/node_modules/mkdirp/node_modules/minimist/example/parse.js
rename to deps/npm/node_modules/minimist/example/parse.js
diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/index.js b/deps/npm/node_modules/minimist/index.js
similarity index 97%
rename from deps/npm/node_modules/mkdirp/node_modules/minimist/index.js
rename to deps/npm/node_modules/minimist/index.js
index 584f551a6da734..a5793ceccec488 100644
--- a/deps/npm/node_modules/mkdirp/node_modules/minimist/index.js
+++ b/deps/npm/node_modules/minimist/index.js
@@ -1,16 +1,16 @@
 module.exports = function (args, opts) {
     if (!opts) opts = {};
-    
+
     var flags = { bools : {}, strings : {} };
-    
+
     [].concat(opts['boolean']).filter(Boolean).forEach(function (key) {
         flags.bools[key] = true;
     });
-    
+
     [].concat(opts.string).filter(Boolean).forEach(function (key) {
         flags.strings[key] = true;
     });
-    
+
     var aliases = {};
     Object.keys(opts.alias || {}).forEach(function (key) {
         aliases[key] = [].concat(opts.alias[key]);
@@ -20,14 +20,14 @@ module.exports = function (args, opts) {
             }));
         });
     });
-    
+
     var defaults = opts['default'] || {};
-    
+
     var argv = { _ : [] };
     Object.keys(flags.bools).forEach(function (key) {
         setArg(key, defaults[key] === undefined ? false : defaults[key]);
     });
-    
+
     var notFlags = [];
 
     if (args.indexOf('--') !== -1) {
@@ -40,15 +40,15 @@ module.exports = function (args, opts) {
             ? Number(val) : val
         ;
         setKey(argv, key.split('.'), value);
-        
+
         (aliases[key] || []).forEach(function (x) {
             setKey(argv, x.split('.'), value);
         });
     }
-    
+
     for (var i = 0; i < args.length; i++) {
         var arg = args[i];
-        
+
         if (/^--.+=/.test(arg)) {
             // Using [\s\S] instead of . because js doesn't support the
             // 'dotall' regex modifier. See:
@@ -79,23 +79,23 @@ module.exports = function (args, opts) {
         }
         else if (/^-[^-]+/.test(arg)) {
             var letters = arg.slice(1,-1).split('');
-            
+
             var broken = false;
             for (var j = 0; j < letters.length; j++) {
                 var next = arg.slice(j+2);
-                
+
                 if (next === '-') {
                     setArg(letters[j], next)
                     continue;
                 }
-                
+
                 if (/[A-Za-z]/.test(letters[j])
                 && /-?\d+(\.\d*)?(e-?\d+)?$/.test(next)) {
                     setArg(letters[j], next);
                     broken = true;
                     break;
                 }
-                
+
                 if (letters[j+1] && letters[j+1].match(/\W/)) {
                     setArg(letters[j], arg.slice(j+2));
                     broken = true;
@@ -105,7 +105,7 @@ module.exports = function (args, opts) {
                     setArg(letters[j], flags.strings[letters[j]] ? '' : true);
                 }
             }
-            
+
             var key = arg.slice(-1)[0];
             if (!broken && key !== '-') {
                 if (args[i+1] && !/^(-|--)[^-]/.test(args[i+1])
@@ -129,17 +129,17 @@ module.exports = function (args, opts) {
             );
         }
     }
-    
+
     Object.keys(defaults).forEach(function (key) {
         if (!hasKey(argv, key.split('.'))) {
             setKey(argv, key.split('.'), defaults[key]);
-            
+
             (aliases[key] || []).forEach(function (x) {
                 setKey(argv, x.split('.'), defaults[key]);
             });
         }
     });
-    
+
     notFlags.forEach(function(key) {
         argv._.push(key);
     });
@@ -163,7 +163,7 @@ function setKey (obj, keys, value) {
         if (o[key] === undefined) o[key] = {};
         o = o[key];
     });
-    
+
     var key = keys[keys.length - 1];
     if (o[key] === undefined || typeof o[key] === 'boolean') {
         o[key] = value;
diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/package.json b/deps/npm/node_modules/minimist/package.json
similarity index 61%
rename from deps/npm/node_modules/mkdirp/node_modules/minimist/package.json
rename to deps/npm/node_modules/minimist/package.json
index 7cd80f4f41ac5a..c59b424193c390 100644
--- a/deps/npm/node_modules/mkdirp/node_modules/minimist/package.json
+++ b/deps/npm/node_modules/minimist/package.json
@@ -1,66 +1,91 @@
 {
-  "name": "minimist",
-  "version": "0.0.8",
-  "description": "parse argument options",
-  "main": "index.js",
-  "devDependencies": {
-    "tape": "~1.0.4",
-    "tap": "~0.4.0"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "testling": {
-    "files": "test/*.js",
-    "browsers": [
-      "ie/6..latest",
-      "ff/5",
-      "firefox/latest",
-      "chrome/10",
-      "chrome/latest",
-      "safari/5.1",
-      "safari/latest",
-      "opera/12"
+  "_args": [
+    [
+      "minimist@0.0.8",
+      "/Users/rebecca/code/npm/node_modules/mkdirp"
     ]
+  ],
+  "_from": "minimist@0.0.8",
+  "_id": "minimist@0.0.8",
+  "_inCache": true,
+  "_location": "/minimist",
+  "_npmUser": {
+    "email": "mail@substack.net",
+    "name": "substack"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/substack/minimist.git"
+  "_npmVersion": "1.4.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "minimist",
+    "raw": "minimist@0.0.8",
+    "rawSpec": "0.0.8",
+    "scope": null,
+    "spec": "0.0.8",
+    "type": "version"
   },
-  "homepage": "https://github.com/substack/minimist",
-  "keywords": [
-    "argv",
-    "getopt",
-    "parser",
-    "optimist"
+  "_requiredBy": [
+    "/mkdirp"
   ],
+  "_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+  "_shasum": "857fcabfc3397d2625b8228262e86aa7a011b05d",
+  "_shrinkwrap": null,
+  "_spec": "minimist@0.0.8",
+  "_where": "/Users/rebecca/code/npm/node_modules/mkdirp",
   "author": {
-    "name": "James Halliday",
     "email": "mail@substack.net",
+    "name": "James Halliday",
     "url": "http://substack.net"
   },
-  "license": "MIT",
   "bugs": {
     "url": "https://github.com/substack/minimist/issues"
   },
-  "_id": "minimist@0.0.8",
+  "dependencies": {},
+  "description": "parse argument options",
+  "devDependencies": {
+    "tap": "~0.4.0",
+    "tape": "~1.0.4"
+  },
+  "directories": {},
   "dist": {
     "shasum": "857fcabfc3397d2625b8228262e86aa7a011b05d",
     "tarball": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
   },
-  "_from": "minimist@0.0.8",
-  "_npmVersion": "1.4.3",
-  "_npmUser": {
-    "name": "substack",
-    "email": "mail@substack.net"
-  },
+  "homepage": "https://github.com/substack/minimist",
+  "keywords": [
+    "argv",
+    "getopt",
+    "optimist",
+    "parser"
+  ],
+  "license": "MIT",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "substack",
       "email": "mail@substack.net"
     }
   ],
-  "directories": {},
-  "_shasum": "857fcabfc3397d2625b8228262e86aa7a011b05d",
-  "_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+  "name": "minimist",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/substack/minimist.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "testling": {
+    "browsers": [
+      "chrome/10",
+      "chrome/latest",
+      "ff/5",
+      "firefox/latest",
+      "ie/6..latest",
+      "opera/12",
+      "safari/5.1",
+      "safari/latest"
+    ],
+    "files": "test/*.js"
+  },
+  "version": "0.0.8"
 }
diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/readme.markdown b/deps/npm/node_modules/minimist/readme.markdown
similarity index 100%
rename from deps/npm/node_modules/mkdirp/node_modules/minimist/readme.markdown
rename to deps/npm/node_modules/minimist/readme.markdown
diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/dash.js b/deps/npm/node_modules/minimist/test/dash.js
similarity index 100%
rename from deps/npm/node_modules/mkdirp/node_modules/minimist/test/dash.js
rename to deps/npm/node_modules/minimist/test/dash.js
diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/default_bool.js b/deps/npm/node_modules/minimist/test/default_bool.js
similarity index 100%
rename from deps/npm/node_modules/mkdirp/node_modules/minimist/test/default_bool.js
rename to deps/npm/node_modules/minimist/test/default_bool.js
diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/dotted.js b/deps/npm/node_modules/minimist/test/dotted.js
similarity index 100%
rename from deps/npm/node_modules/mkdirp/node_modules/minimist/test/dotted.js
rename to deps/npm/node_modules/minimist/test/dotted.js
diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/long.js b/deps/npm/node_modules/minimist/test/long.js
similarity index 100%
rename from deps/npm/node_modules/mkdirp/node_modules/minimist/test/long.js
rename to deps/npm/node_modules/minimist/test/long.js
diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/parse.js b/deps/npm/node_modules/minimist/test/parse.js
similarity index 98%
rename from deps/npm/node_modules/mkdirp/node_modules/minimist/test/parse.js
rename to deps/npm/node_modules/minimist/test/parse.js
index 8a90646696628e..47e92237fb0bbc 100644
--- a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/parse.js
+++ b/deps/npm/node_modules/minimist/test/parse.js
@@ -14,7 +14,7 @@ test('parse args', function (t) {
     );
     t.end();
 });
- 
+
 test('comprehensive', function (t) {
     t.deepEqual(
         parse([
@@ -80,13 +80,13 @@ test('flag boolean value', function (t) {
         boolean: [ 't', 'verbose' ],
         default: { verbose: true }
     });
-    
+
     t.deepEqual(argv, {
         verbose: false,
         t: true,
         _: ['moo']
     });
-    
+
     t.deepEqual(typeof argv.verbose, 'boolean');
     t.deepEqual(typeof argv.t, 'boolean');
     t.end();
@@ -97,13 +97,13 @@ test('flag boolean default false', function (t) {
         boolean: ['t', 'verbose'],
         default: { verbose: false, t: false }
     });
-    
+
     t.deepEqual(argv, {
         verbose: false,
         t: false,
         _: ['moo']
     });
-    
+
     t.deepEqual(typeof argv.verbose, 'boolean');
     t.deepEqual(typeof argv.t, 'boolean');
     t.end();
@@ -114,14 +114,14 @@ test('boolean groups', function (t) {
     var argv = parse([ '-x', '-z', 'one', 'two', 'three' ], {
         boolean: ['x','y','z']
     });
-    
+
     t.deepEqual(argv, {
         x : true,
         y : false,
         z : true,
         _ : [ 'one', 'two', 'three' ]
     });
-    
+
     t.deepEqual(typeof argv.x, 'boolean');
     t.deepEqual(typeof argv.y, 'boolean');
     t.deepEqual(typeof argv.z, 'boolean');
@@ -131,7 +131,7 @@ test('boolean groups', function (t) {
 test('newlines in params' , function (t) {
     var args = parse([ '-s', "X\nX" ])
     t.deepEqual(args, { _ : [], s : "X\nX" });
-    
+
     // reproduce in bash:
     // VALUE="new
     // line"
@@ -145,7 +145,7 @@ test('strings' , function (t) {
     var s = parse([ '-s', '0001234' ], { string: 's' }).s;
     t.equal(s, '0001234');
     t.equal(typeof s, 'string');
-    
+
     var x = parse([ '-x', '56' ], { string: 'x' }).x;
     t.equal(x, '56');
     t.equal(typeof x, 'string');
@@ -222,7 +222,7 @@ test('nested dotted objects', function (t) {
         '--foo.quux.quibble', '5', '--foo.quux.o_O',
         '--beep.boop'
     ]);
-    
+
     t.same(argv.foo, {
         bar : 3,
         baz : 4,
@@ -254,9 +254,9 @@ test('boolean and alias with chainable api', function (t) {
         h: true,
         '_': [ 'derp' ]
     };
-    
+
     t.same(aliasedArgv, expected);
-    t.same(propertyArgv, expected); 
+    t.same(propertyArgv, expected);
     t.end();
 });
 
@@ -295,7 +295,7 @@ test('boolean and alias using explicit true', function (t) {
     };
 
     t.same(aliasedArgv, expected);
-    t.same(propertyArgv, expected); 
+    t.same(propertyArgv, expected);
     t.end();
 });
 
@@ -311,7 +311,7 @@ test('boolean and --x=true', function(t) {
     parsed = parse(['--boool', '--other=false'], {
         boolean: 'boool'
     });
-    
+
     t.same(parsed.boool, true);
     t.same(parsed.other, 'false');
     t.end();
diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/parse_modified.js b/deps/npm/node_modules/minimist/test/parse_modified.js
similarity index 97%
rename from deps/npm/node_modules/mkdirp/node_modules/minimist/test/parse_modified.js
rename to deps/npm/node_modules/minimist/test/parse_modified.js
index 21851b036ee6d9..7c4c2abe397797 100644
--- a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/parse_modified.js
+++ b/deps/npm/node_modules/minimist/test/parse_modified.js
@@ -3,7 +3,7 @@ var test = require('tape');
 
 test('parse with modifier functions' , function (t) {
     t.plan(1);
-    
+
     var argv = parse([ '-b', '123' ], { boolean: 'b' });
     t.deepEqual(argv, { b: true, _: ['123'] });
 });
diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/short.js b/deps/npm/node_modules/minimist/test/short.js
similarity index 99%
rename from deps/npm/node_modules/mkdirp/node_modules/minimist/test/short.js
rename to deps/npm/node_modules/minimist/test/short.js
index d513a1c2529095..ac18880f1eb50c 100644
--- a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/short.js
+++ b/deps/npm/node_modules/minimist/test/short.js
@@ -43,7 +43,7 @@ test('short', function (t) {
     );
     t.end();
 });
- 
+
 test('mixed short bool and capture', function (t) {
     t.same(
         parse([ '-h', 'localhost', '-fp', '555', 'script.js' ]),
@@ -54,7 +54,7 @@ test('mixed short bool and capture', function (t) {
     );
     t.end();
 });
- 
+
 test('short and long', function (t) {
     t.deepEqual(
         parse([ '-h', 'localhost', '-fp', '555', 'script.js' ]),
diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/test/whitespace.js b/deps/npm/node_modules/minimist/test/whitespace.js
similarity index 100%
rename from deps/npm/node_modules/mkdirp/node_modules/minimist/test/whitespace.js
rename to deps/npm/node_modules/minimist/test/whitespace.js
diff --git a/deps/npm/node_modules/mkdirp/package.json b/deps/npm/node_modules/mkdirp/package.json
index 24411034800529..3e5bbaf3d09a33 100644
--- a/deps/npm/node_modules/mkdirp/package.json
+++ b/deps/npm/node_modules/mkdirp/package.json
@@ -1,59 +1,87 @@
 {
-  "name": "mkdirp",
-  "description": "Recursively mkdir, like `mkdir -p`",
-  "version": "0.5.1",
-  "author": {
-    "name": "James Halliday",
-    "email": "mail@substack.net",
-    "url": "http://substack.net"
-  },
-  "main": "index.js",
-  "keywords": [
-    "mkdir",
-    "directory"
+  "_args": [
+    [
+      "mkdirp@~0.5.1",
+      "/Users/rebecca/code/npm"
+    ]
   ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/substack/node-mkdirp.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "_from": "mkdirp@>=0.5.1 <0.6.0",
+  "_id": "mkdirp@0.5.1",
+  "_inCache": true,
+  "_location": "/mkdirp",
+  "_nodeVersion": "2.0.0",
+  "_npmUser": {
+    "email": "substack@gmail.com",
+    "name": "substack"
   },
-  "dependencies": {
-    "minimist": "0.0.8"
+  "_npmVersion": "2.9.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "mkdirp",
+    "raw": "mkdirp@~0.5.1",
+    "rawSpec": "~0.5.1",
+    "scope": null,
+    "spec": ">=0.5.1 <0.6.0",
+    "type": "range"
   },
-  "devDependencies": {
-    "tap": "1",
-    "mock-fs": "2 >=2.7.0"
+  "_requiredBy": [
+    "/",
+    "/cmd-shim",
+    "/fstream",
+    "/node-gyp",
+    "/npm-registry-client"
+  ],
+  "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+  "_shasum": "30057438eac6cf7f8c4767f38648d6697d75c903",
+  "_shrinkwrap": null,
+  "_spec": "mkdirp@~0.5.1",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "mail@substack.net",
+    "name": "James Halliday",
+    "url": "http://substack.net"
   },
   "bin": {
     "mkdirp": "bin/cmd.js"
   },
-  "license": "MIT",
-  "gitHead": "d4eff0f06093aed4f387e88e9fc301cb76beedc7",
   "bugs": {
     "url": "https://github.com/substack/node-mkdirp/issues"
   },
-  "homepage": "https://github.com/substack/node-mkdirp#readme",
-  "_id": "mkdirp@0.5.1",
-  "_shasum": "30057438eac6cf7f8c4767f38648d6697d75c903",
-  "_from": "mkdirp@>=0.5.1 <0.6.0",
-  "_npmVersion": "2.9.0",
-  "_nodeVersion": "2.0.0",
-  "_npmUser": {
-    "name": "substack",
-    "email": "substack@gmail.com"
+  "dependencies": {
+    "minimist": "0.0.8"
   },
+  "description": "Recursively mkdir, like `mkdir -p`",
+  "devDependencies": {
+    "mock-fs": "2 >=2.7.0",
+    "tap": "1"
+  },
+  "directories": {},
   "dist": {
     "shasum": "30057438eac6cf7f8c4767f38648d6697d75c903",
     "tarball": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
   },
+  "gitHead": "d4eff0f06093aed4f387e88e9fc301cb76beedc7",
+  "homepage": "https://github.com/substack/node-mkdirp#readme",
+  "keywords": [
+    "directory",
+    "mkdir"
+  ],
+  "license": "MIT",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "substack",
       "email": "mail@substack.net"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
+  "name": "mkdirp",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/substack/node-mkdirp.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "0.5.1"
 }
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/.npmignore b/deps/npm/node_modules/ms/.npmignore
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/.npmignore
rename to deps/npm/node_modules/ms/.npmignore
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/History.md b/deps/npm/node_modules/ms/History.md
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/History.md
rename to deps/npm/node_modules/ms/History.md
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/LICENSE b/deps/npm/node_modules/ms/LICENSE
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/LICENSE
rename to deps/npm/node_modules/ms/LICENSE
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/README.md b/deps/npm/node_modules/ms/README.md
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/README.md
rename to deps/npm/node_modules/ms/README.md
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/index.js b/deps/npm/node_modules/ms/index.js
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/index.js
rename to deps/npm/node_modules/ms/index.js
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/package.json b/deps/npm/node_modules/ms/package.json
similarity index 63%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/package.json
rename to deps/npm/node_modules/ms/package.json
index 253335e6234907..84a9b7a97a2e89 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/package.json
+++ b/deps/npm/node_modules/ms/package.json
@@ -1,48 +1,72 @@
 {
-  "name": "ms",
-  "version": "0.7.1",
-  "description": "Tiny ms conversion utility",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/guille/ms.js.git"
+  "_args": [
+    [
+      "ms@0.7.1",
+      "/Users/rebecca/code/npm/node_modules/debug"
+    ]
+  ],
+  "_from": "ms@0.7.1",
+  "_id": "ms@0.7.1",
+  "_inCache": true,
+  "_location": "/ms",
+  "_nodeVersion": "0.12.2",
+  "_npmUser": {
+    "email": "rauchg@gmail.com",
+    "name": "rauchg"
   },
-  "main": "./index",
-  "devDependencies": {
-    "mocha": "*",
-    "expect.js": "*",
-    "serve": "*"
+  "_npmVersion": "2.7.5",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "ms",
+    "raw": "ms@0.7.1",
+    "rawSpec": "0.7.1",
+    "scope": null,
+    "spec": "0.7.1",
+    "type": "version"
+  },
+  "_requiredBy": [
+    "/debug"
+  ],
+  "_resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+  "_shasum": "9cd13c03adbff25b65effde7ce864ee952017098",
+  "_shrinkwrap": null,
+  "_spec": "ms@0.7.1",
+  "_where": "/Users/rebecca/code/npm/node_modules/debug",
+  "bugs": {
+    "url": "https://github.com/guille/ms.js/issues"
   },
   "component": {
     "scripts": {
       "ms/index.js": "index.js"
     }
   },
-  "gitHead": "713dcf26d9e6fd9dbc95affe7eff9783b7f1b909",
-  "bugs": {
-    "url": "https://github.com/guille/ms.js/issues"
+  "dependencies": {},
+  "description": "Tiny ms conversion utility",
+  "devDependencies": {
+    "expect.js": "*",
+    "mocha": "*",
+    "serve": "*"
   },
-  "homepage": "https://github.com/guille/ms.js",
-  "_id": "ms@0.7.1",
-  "scripts": {},
-  "_shasum": "9cd13c03adbff25b65effde7ce864ee952017098",
-  "_from": "ms@0.7.1",
-  "_npmVersion": "2.7.5",
-  "_nodeVersion": "0.12.2",
-  "_npmUser": {
-    "name": "rauchg",
-    "email": "rauchg@gmail.com"
+  "directories": {},
+  "dist": {
+    "shasum": "9cd13c03adbff25b65effde7ce864ee952017098",
+    "tarball": "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
   },
+  "gitHead": "713dcf26d9e6fd9dbc95affe7eff9783b7f1b909",
+  "homepage": "https://github.com/guille/ms.js",
+  "main": "./index",
   "maintainers": [
     {
       "name": "rauchg",
       "email": "rauchg@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "9cd13c03adbff25b65effde7ce864ee952017098",
-    "tarball": "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+  "name": "ms",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/guille/ms.js.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {},
+  "version": "0.7.1"
 }
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/LICENSE b/deps/npm/node_modules/mute-stream/LICENSE
similarity index 100%
rename from deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/LICENSE
rename to deps/npm/node_modules/mute-stream/LICENSE
diff --git a/deps/npm/node_modules/read/node_modules/mute-stream/README.md b/deps/npm/node_modules/mute-stream/README.md
similarity index 100%
rename from deps/npm/node_modules/read/node_modules/mute-stream/README.md
rename to deps/npm/node_modules/mute-stream/README.md
diff --git a/deps/npm/node_modules/read/node_modules/mute-stream/mute.js b/deps/npm/node_modules/mute-stream/mute.js
similarity index 100%
rename from deps/npm/node_modules/read/node_modules/mute-stream/mute.js
rename to deps/npm/node_modules/mute-stream/mute.js
diff --git a/deps/npm/node_modules/read/node_modules/mute-stream/package.json b/deps/npm/node_modules/mute-stream/package.json
similarity index 64%
rename from deps/npm/node_modules/read/node_modules/mute-stream/package.json
rename to deps/npm/node_modules/mute-stream/package.json
index 9cdb30284561ec..16c475606982a8 100644
--- a/deps/npm/node_modules/read/node_modules/mute-stream/package.json
+++ b/deps/npm/node_modules/mute-stream/package.json
@@ -1,55 +1,80 @@
 {
-  "name": "mute-stream",
-  "version": "0.0.5",
-  "main": "mute.js",
-  "directories": {
-    "test": "test"
-  },
-  "devDependencies": {
-    "tap": "~0.2.5"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "_args": [
+    [
+      "mute-stream@~0.0.4",
+      "/Users/rebecca/code/npm/node_modules/read"
+    ]
+  ],
+  "_from": "mute-stream@>=0.0.4 <0.1.0",
+  "_id": "mute-stream@0.0.5",
+  "_inCache": true,
+  "_location": "/mute-stream",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/mute-stream.git"
+  "_npmVersion": "2.10.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "mute-stream",
+    "raw": "mute-stream@~0.0.4",
+    "rawSpec": "~0.0.4",
+    "scope": null,
+    "spec": ">=0.0.4 <0.1.0",
+    "type": "range"
   },
-  "keywords": [
-    "mute",
-    "stream",
-    "pipe"
+  "_requiredBy": [
+    "/read"
   ],
+  "_resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
+  "_shasum": "8fbfabb0a98a253d3184331f9e8deb7372fac6c0",
+  "_shrinkwrap": null,
+  "_spec": "mute-stream@~0.0.4",
+  "_where": "/Users/rebecca/code/npm/node_modules/read",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "license": "ISC",
-  "description": "Bytes go in, but they don't come out (when muted).",
-  "gitHead": "17d9854a315f56088d039534f87b740e470a9af0",
   "bugs": {
     "url": "https://github.com/isaacs/mute-stream/issues"
   },
-  "homepage": "https://github.com/isaacs/mute-stream#readme",
-  "_id": "mute-stream@0.0.5",
-  "_shasum": "8fbfabb0a98a253d3184331f9e8deb7372fac6c0",
-  "_from": "mute-stream@>=0.0.4 <0.1.0",
-  "_npmVersion": "2.10.0",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
+  "dependencies": {},
+  "description": "Bytes go in, but they don't come out (when muted).",
+  "devDependencies": {
+    "tap": "~0.2.5"
+  },
+  "directories": {
+    "test": "test"
   },
   "dist": {
     "shasum": "8fbfabb0a98a253d3184331f9e8deb7372fac6c0",
     "tarball": "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
   },
+  "gitHead": "17d9854a315f56088d039534f87b740e470a9af0",
+  "homepage": "https://github.com/isaacs/mute-stream#readme",
+  "keywords": [
+    "mute",
+    "pipe",
+    "stream"
+  ],
+  "license": "ISC",
+  "main": "mute.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "_resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
+  "name": "mute-stream",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/mute-stream.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "0.0.5"
 }
diff --git a/deps/npm/node_modules/read/node_modules/mute-stream/test/basic.js b/deps/npm/node_modules/mute-stream/test/basic.js
similarity index 100%
rename from deps/npm/node_modules/read/node_modules/mute-stream/test/basic.js
rename to deps/npm/node_modules/mute-stream/test/basic.js
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js
deleted file mode 100644
index 60ecfc74d41618..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js
+++ /dev/null
@@ -1,8 +0,0 @@
-var expand = require('./');
-
-console.log(expand('http://any.org/archive{1996..1999}/vol{1..4}/part{a,b,c}.html'));
-console.log(expand('http://www.numericals.com/file{1..100..10}.txt'));
-console.log(expand('http://www.letters.com/file{a..z..2}.txt'));
-console.log(expand('mkdir /usr/local/src/bash/{old,new,dist,bugs}'));
-console.log(expand('chown root /usr/{ucb/{ex,edit},lib/{ex?.?*,how_ex}}'));
-
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js
deleted file mode 100644
index a23104e9550173..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js
+++ /dev/null
@@ -1,191 +0,0 @@
-var concatMap = require('concat-map');
-var balanced = require('balanced-match');
-
-module.exports = expandTop;
-
-var escSlash = '\0SLASH'+Math.random()+'\0';
-var escOpen = '\0OPEN'+Math.random()+'\0';
-var escClose = '\0CLOSE'+Math.random()+'\0';
-var escComma = '\0COMMA'+Math.random()+'\0';
-var escPeriod = '\0PERIOD'+Math.random()+'\0';
-
-function numeric(str) {
-  return parseInt(str, 10) == str
-    ? parseInt(str, 10)
-    : str.charCodeAt(0);
-}
-
-function escapeBraces(str) {
-  return str.split('\\\\').join(escSlash)
-            .split('\\{').join(escOpen)
-            .split('\\}').join(escClose)
-            .split('\\,').join(escComma)
-            .split('\\.').join(escPeriod);
-}
-
-function unescapeBraces(str) {
-  return str.split(escSlash).join('\\')
-            .split(escOpen).join('{')
-            .split(escClose).join('}')
-            .split(escComma).join(',')
-            .split(escPeriod).join('.');
-}
-
-
-// Basically just str.split(","), but handling cases
-// where we have nested braced sections, which should be
-// treated as individual members, like {a,{b,c},d}
-function parseCommaParts(str) {
-  if (!str)
-    return [''];
-
-  var parts = [];
-  var m = balanced('{', '}', str);
-
-  if (!m)
-    return str.split(',');
-
-  var pre = m.pre;
-  var body = m.body;
-  var post = m.post;
-  var p = pre.split(',');
-
-  p[p.length-1] += '{' + body + '}';
-  var postParts = parseCommaParts(post);
-  if (post.length) {
-    p[p.length-1] += postParts.shift();
-    p.push.apply(p, postParts);
-  }
-
-  parts.push.apply(parts, p);
-
-  return parts;
-}
-
-function expandTop(str) {
-  if (!str)
-    return [];
-
-  return expand(escapeBraces(str), true).map(unescapeBraces);
-}
-
-function identity(e) {
-  return e;
-}
-
-function embrace(str) {
-  return '{' + str + '}';
-}
-function isPadded(el) {
-  return /^-?0\d/.test(el);
-}
-
-function lte(i, y) {
-  return i <= y;
-}
-function gte(i, y) {
-  return i >= y;
-}
-
-function expand(str, isTop) {
-  var expansions = [];
-
-  var m = balanced('{', '}', str);
-  if (!m || /\$$/.test(m.pre)) return [str];
-
-  var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
-  var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
-  var isSequence = isNumericSequence || isAlphaSequence;
-  var isOptions = /^(.*,)+(.+)?$/.test(m.body);
-  if (!isSequence && !isOptions) {
-    // {a},b}
-    if (m.post.match(/,.*}/)) {
-      str = m.pre + '{' + m.body + escClose + m.post;
-      return expand(str);
-    }
-    return [str];
-  }
-
-  var n;
-  if (isSequence) {
-    n = m.body.split(/\.\./);
-  } else {
-    n = parseCommaParts(m.body);
-    if (n.length === 1) {
-      // x{{a,b}}y ==> x{a}y x{b}y
-      n = expand(n[0], false).map(embrace);
-      if (n.length === 1) {
-        var post = m.post.length
-          ? expand(m.post, false)
-          : [''];
-        return post.map(function(p) {
-          return m.pre + n[0] + p;
-        });
-      }
-    }
-  }
-
-  // at this point, n is the parts, and we know it's not a comma set
-  // with a single entry.
-
-  // no need to expand pre, since it is guaranteed to be free of brace-sets
-  var pre = m.pre;
-  var post = m.post.length
-    ? expand(m.post, false)
-    : [''];
-
-  var N;
-
-  if (isSequence) {
-    var x = numeric(n[0]);
-    var y = numeric(n[1]);
-    var width = Math.max(n[0].length, n[1].length)
-    var incr = n.length == 3
-      ? Math.abs(numeric(n[2]))
-      : 1;
-    var test = lte;
-    var reverse = y < x;
-    if (reverse) {
-      incr *= -1;
-      test = gte;
-    }
-    var pad = n.some(isPadded);
-
-    N = [];
-
-    for (var i = x; test(i, y); i += incr) {
-      var c;
-      if (isAlphaSequence) {
-        c = String.fromCharCode(i);
-        if (c === '\\')
-          c = '';
-      } else {
-        c = String(i);
-        if (pad) {
-          var need = width - c.length;
-          if (need > 0) {
-            var z = new Array(need + 1).join('0');
-            if (i < 0)
-              c = '-' + z + c.slice(1);
-            else
-              c = z + c;
-          }
-        }
-      }
-      N.push(c);
-    }
-  } else {
-    N = concatMap(n, function(el) { return expand(el, false) });
-  }
-
-  for (var j = 0; j < N.length; j++) {
-    for (var k = 0; k < post.length; k++) {
-      var expansion = pre + N[j] + post[k];
-      if (!isTop || isSequence || expansion)
-        expansions.push(expansion);
-    }
-  }
-
-  return expansions;
-}
-
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
deleted file mode 100644
index 2aff0ebff4403e..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
+++ /dev/null
@@ -1,80 +0,0 @@
-# balanced-match
-
-Match balanced string pairs, like `{` and `}` or `<b>` and `</b>`.
-
-[![build status](https://secure.travis-ci.org/juliangruber/balanced-match.svg)](http://travis-ci.org/juliangruber/balanced-match)
-[![downloads](https://img.shields.io/npm/dm/balanced-match.svg)](https://www.npmjs.org/package/balanced-match)
-
-[![testling badge](https://ci.testling.com/juliangruber/balanced-match.png)](https://ci.testling.com/juliangruber/balanced-match)
-
-## Example
-
-Get the first matching pair of braces:
-
-```js
-var balanced = require('balanced-match');
-
-console.log(balanced('{', '}', 'pre{in{nested}}post'));
-console.log(balanced('{', '}', 'pre{first}between{second}post'));
-```
-
-The matches are:
-
-```bash
-$ node example.js
-{ start: 3, end: 14, pre: 'pre', body: 'in{nested}', post: 'post' }
-{ start: 3,
-  end: 9,
-  pre: 'pre',
-  body: 'first',
-  post: 'between{second}post' }
-```
-
-## API
-
-### var m = balanced(a, b, str)
-
-For the first non-nested matching pair of `a` and `b` in `str`, return an
-object with those keys:
-
-* **start** the index of the first match of `a`
-* **end** the index of the matching `b`
-* **pre** the preamble, `a` and `b` not included
-* **body** the match, `a` and `b` not included
-* **post** the postscript, `a` and `b` not included
-
-If there's no match, `undefined` will be returned.
-
-If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `['{', 'a', '']`.
-
-## Installation
-
-With [npm](https://npmjs.org) do:
-
-```bash
-npm install balanced-match
-```
-
-## License
-
-(MIT)
-
-Copyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
deleted file mode 100644
index d165ae8174ca82..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-module.exports = balanced;
-function balanced(a, b, str) {
-  var bal = 0;
-  var m = {};
-  var ended = false;
-
-  for (var i = 0; i < str.length; i++) {
-    if (a == str.substr(i, a.length)) {
-      if (!('start' in m)) m.start = i;
-      bal++;
-    }
-    else if (b == str.substr(i, b.length) && 'start' in m) {
-      ended = true;
-      bal--;
-      if (!bal) {
-        m.end = i;
-        m.pre = str.substr(0, m.start);
-        m.body = (m.end - m.start > 1)
-          ? str.substring(m.start + a.length, m.end)
-          : '';
-        m.post = str.slice(m.end + b.length);
-        return m;
-      }
-    }
-  }
-
-  // if we opened more than we closed, find the one we closed
-  if (bal && ended) {
-    var start = m.start + a.length;
-    m = balanced(a, b, str.substr(start));
-    if (m) {
-      m.start += start;
-      m.end += start;
-      m.pre = str.slice(0, start) + m.pre;
-    }
-    return m;
-  }
-}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
deleted file mode 100644
index ede6efefa07883..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "name": "balanced-match",
-  "description": "Match balanced character pairs, like \"{\" and \"}\"",
-  "version": "0.2.0",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/juliangruber/balanced-match.git"
-  },
-  "homepage": "https://github.com/juliangruber/balanced-match",
-  "main": "index.js",
-  "scripts": {
-    "test": "make test"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "tape": "~1.1.1"
-  },
-  "keywords": [
-    "match",
-    "regexp",
-    "test",
-    "balanced",
-    "parse"
-  ],
-  "author": {
-    "name": "Julian Gruber",
-    "email": "mail@juliangruber.com",
-    "url": "http://juliangruber.com"
-  },
-  "license": "MIT",
-  "testling": {
-    "files": "test/*.js",
-    "browsers": [
-      "ie/8..latest",
-      "firefox/20..latest",
-      "firefox/nightly",
-      "chrome/25..latest",
-      "chrome/canary",
-      "opera/12..latest",
-      "opera/next",
-      "safari/5.1..latest",
-      "ipad/6.0..latest",
-      "iphone/6.0..latest",
-      "android-browser/4.2..latest"
-    ]
-  },
-  "gitHead": "ba40ed78e7114a4a67c51da768a100184dead39c",
-  "bugs": {
-    "url": "https://github.com/juliangruber/balanced-match/issues"
-  },
-  "_id": "balanced-match@0.2.0",
-  "_shasum": "38f6730c03aab6d5edbb52bd934885e756d71674",
-  "_from": "balanced-match@>=0.2.0 <0.3.0",
-  "_npmVersion": "2.1.8",
-  "_nodeVersion": "0.10.32",
-  "_npmUser": {
-    "name": "juliangruber",
-    "email": "julian@juliangruber.com"
-  },
-  "maintainers": [
-    {
-      "name": "juliangruber",
-      "email": "julian@juliangruber.com"
-    }
-  ],
-  "dist": {
-    "shasum": "38f6730c03aab6d5edbb52bd934885e756d71674",
-    "tarball": "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js
deleted file mode 100644
index 36bfd39954850d..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js
+++ /dev/null
@@ -1,56 +0,0 @@
-var test = require('tape');
-var balanced = require('..');
-
-test('balanced', function(t) {
-  t.deepEqual(balanced('{', '}', 'pre{in{nest}}post'), {
-    start: 3,
-    end: 12,
-    pre: 'pre',
-    body: 'in{nest}',
-    post: 'post'
-  });
-  t.deepEqual(balanced('{', '}', '{{{{{{{{{in}post'), {
-    start: 8,
-    end: 11,
-    pre: '{{{{{{{{',
-    body: 'in',
-    post: 'post'
-  });
-  t.deepEqual(balanced('{', '}', 'pre{body{in}post'), {
-    start: 8,
-    end: 11,
-    pre: 'pre{body',
-    body: 'in',
-    post: 'post'
-  });
-  t.deepEqual(balanced('{', '}', 'pre}{in{nest}}post'), {
-    start: 4,
-    end: 13,
-    pre: 'pre}',
-    body: 'in{nest}',
-    post: 'post'
-  });
-  t.deepEqual(balanced('{', '}', 'pre{body}between{body2}post'), {
-    start: 3,
-    end: 8,
-    pre: 'pre',
-    body: 'body',
-    post: 'between{body2}post'
-  });
-  t.notOk(balanced('{', '}', 'nope'), 'should be notOk');
-  t.deepEqual(balanced('<b>', '</b>', 'pre<b>in<b>nest</b></b>post'), {
-    start: 3,
-    end: 19,
-    pre: 'pre',
-    body: 'in<b>nest</b>',
-    post: 'post'
-  });
-  t.deepEqual(balanced('<b>', '</b>', 'pre</b><b>in<b>nest</b></b>post'), {
-    start: 7,
-    end: 23,
-    pre: 'pre</b>',
-    body: 'in<b>nest</b>',
-    post: 'post'
-  });
-  t.end();
-});
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE
deleted file mode 100644
index ee27ba4b4412b0..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE
+++ /dev/null
@@ -1,18 +0,0 @@
-This software is released under the MIT license:
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
deleted file mode 100644
index 408f70a1be473c..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
+++ /dev/null
@@ -1,62 +0,0 @@
-concat-map
-==========
-
-Concatenative mapdashery.
-
-[![browser support](http://ci.testling.com/substack/node-concat-map.png)](http://ci.testling.com/substack/node-concat-map)
-
-[![build status](https://secure.travis-ci.org/substack/node-concat-map.png)](http://travis-ci.org/substack/node-concat-map)
-
-example
-=======
-
-``` js
-var concatMap = require('concat-map');
-var xs = [ 1, 2, 3, 4, 5, 6 ];
-var ys = concatMap(xs, function (x) {
-    return x % 2 ? [ x - 0.1, x, x + 0.1 ] : [];
-});
-console.dir(ys);
-```
-
-***
-
-```
-[ 0.9, 1, 1.1, 2.9, 3, 3.1, 4.9, 5, 5.1 ]
-```
-
-methods
-=======
-
-``` js
-var concatMap = require('concat-map')
-```
-
-concatMap(xs, fn)
------------------
-
-Return an array of concatenated elements by calling `fn(x, i)` for each element
-`x` and each index `i` in the array `xs`.
-
-When `fn(x, i)` returns an array, its result will be concatenated with the
-result array. If `fn(x, i)` returns anything else, that value will be pushed
-onto the end of the result array.
-
-install
-=======
-
-With [npm](http://npmjs.org) do:
-
-```
-npm install concat-map
-```
-
-license
-=======
-
-MIT
-
-notes
-=====
-
-This module was written while sitting high above the ground in a tree.
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js
deleted file mode 100644
index 33656217b61d8f..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js
+++ /dev/null
@@ -1,6 +0,0 @@
-var concatMap = require('../');
-var xs = [ 1, 2, 3, 4, 5, 6 ];
-var ys = concatMap(xs, function (x) {
-    return x % 2 ? [ x - 0.1, x, x + 0.1 ] : [];
-});
-console.dir(ys);
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
deleted file mode 100644
index b29a7812e5055a..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-module.exports = function (xs, fn) {
-    var res = [];
-    for (var i = 0; i < xs.length; i++) {
-        var x = fn(xs[i], i);
-        if (isArray(x)) res.push.apply(res, x);
-        else res.push(x);
-    }
-    return res;
-};
-
-var isArray = Array.isArray || function (xs) {
-    return Object.prototype.toString.call(xs) === '[object Array]';
-};
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
deleted file mode 100644
index fdbd7022f6da17..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var concatMap = require('../');
-var test = require('tape');
-
-test('empty or not', function (t) {
-    var xs = [ 1, 2, 3, 4, 5, 6 ];
-    var ixes = [];
-    var ys = concatMap(xs, function (x, ix) {
-        ixes.push(ix);
-        return x % 2 ? [ x - 0.1, x, x + 0.1 ] : [];
-    });
-    t.same(ys, [ 0.9, 1, 1.1, 2.9, 3, 3.1, 4.9, 5, 5.1 ]);
-    t.same(ixes, [ 0, 1, 2, 3, 4, 5 ]);
-    t.end();
-});
-
-test('always something', function (t) {
-    var xs = [ 'a', 'b', 'c', 'd' ];
-    var ys = concatMap(xs, function (x) {
-        return x === 'b' ? [ 'B', 'B', 'B' ] : [ x ];
-    });
-    t.same(ys, [ 'a', 'B', 'B', 'B', 'c', 'd' ]);
-    t.end();
-});
-
-test('scalars', function (t) {
-    var xs = [ 'a', 'b', 'c', 'd' ];
-    var ys = concatMap(xs, function (x) {
-        return x === 'b' ? [ 'B', 'B', 'B' ] : x;
-    });
-    t.same(ys, [ 'a', 'B', 'B', 'B', 'c', 'd' ]);
-    t.end();
-});
-
-test('undefs', function (t) {
-    var xs = [ 'a', 'b', 'c', 'd' ];
-    var ys = concatMap(xs, function () {});
-    t.same(ys, [ undefined, undefined, undefined, undefined ]);
-    t.end();
-});
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
deleted file mode 100644
index 5f1866c8b5a29e..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "name": "brace-expansion",
-  "description": "Brace expansion as known from sh/bash",
-  "version": "1.1.0",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/juliangruber/brace-expansion.git"
-  },
-  "homepage": "https://github.com/juliangruber/brace-expansion",
-  "main": "index.js",
-  "scripts": {
-    "test": "tape test/*.js",
-    "gentest": "bash test/generate.sh"
-  },
-  "dependencies": {
-    "balanced-match": "^0.2.0",
-    "concat-map": "0.0.1"
-  },
-  "devDependencies": {
-    "tape": "^3.0.3"
-  },
-  "keywords": [],
-  "author": {
-    "name": "Julian Gruber",
-    "email": "mail@juliangruber.com",
-    "url": "http://juliangruber.com"
-  },
-  "license": "MIT",
-  "testling": {
-    "files": "test/*.js",
-    "browsers": [
-      "ie/8..latest",
-      "firefox/20..latest",
-      "firefox/nightly",
-      "chrome/25..latest",
-      "chrome/canary",
-      "opera/12..latest",
-      "opera/next",
-      "safari/5.1..latest",
-      "ipad/6.0..latest",
-      "iphone/6.0..latest",
-      "android-browser/4.2..latest"
-    ]
-  },
-  "gitHead": "b5fa3b1c74e5e2dba2d0efa19b28335641bc1164",
-  "bugs": {
-    "url": "https://github.com/juliangruber/brace-expansion/issues"
-  },
-  "_id": "brace-expansion@1.1.0",
-  "_shasum": "c9b7d03c03f37bc704be100e522b40db8f6cfcd9",
-  "_from": "brace-expansion@>=1.0.0 <2.0.0",
-  "_npmVersion": "2.1.10",
-  "_nodeVersion": "0.10.32",
-  "_npmUser": {
-    "name": "juliangruber",
-    "email": "julian@juliangruber.com"
-  },
-  "maintainers": [
-    {
-      "name": "juliangruber",
-      "email": "julian@juliangruber.com"
-    },
-    {
-      "name": "isaacs",
-      "email": "isaacs@npmjs.com"
-    }
-  ],
-  "dist": {
-    "shasum": "c9b7d03c03f37bc704be100e522b40db8f6cfcd9",
-    "tarball": "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-comparison.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-comparison.js
deleted file mode 100644
index 5fe2b8ad48cc1c..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-comparison.js
+++ /dev/null
@@ -1,32 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-var fs = require('fs');
-var resfile = __dirname + '/bash-results.txt';
-var cases = fs.readFileSync(resfile, 'utf8').split('><><><><');
-
-// throw away the EOF marker
-cases.pop()
-
-test('matches bash expansions', function(t) {
-  cases.forEach(function(testcase) {
-    var set = testcase.split('\n');
-    var pattern = set.shift();
-    var actual = expand(pattern);
-
-    // If it expands to the empty string, then it's actually
-    // just nothing, but Bash is a singly typed language, so
-    // "nothing" is the same as "".
-    if (set.length === 1 && set[0] === '') {
-      set = []
-    } else {
-      // otherwise, strip off the [] that were added so that
-      // "" expansions would be preserved properly.
-      set = set.map(function (s) {
-        return s.replace(/^\[|\]$/g, '')
-      })
-    }
-
-    t.same(actual, set, pattern);
-  });
-  t.end();
-})
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-results.txt b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-results.txt
deleted file mode 100644
index 958148d26aacb9..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-results.txt
+++ /dev/null
@@ -1,1075 +0,0 @@
-A{b,{d,e},{f,g}}Z
-[AbZ]
-[AdZ]
-[AeZ]
-[AfZ]
-[AgZ]><><><><PRE-{a,b}{{a,b},a,b}-POST
-[PRE-aa-POST]
-[PRE-ab-POST]
-[PRE-aa-POST]
-[PRE-ab-POST]
-[PRE-ba-POST]
-[PRE-bb-POST]
-[PRE-ba-POST]
-[PRE-bb-POST]><><><><\{a,b}{{a,b},a,b}
-[{a,b}a]
-[{a,b}b]
-[{a,b}a]
-[{a,b}b]><><><><{{a,b}
-[{a]
-[{b]><><><><{a,b}}
-[a}]
-[b}]><><><><{,}
-><><><><a{,}
-[a]
-[a]><><><><{,}b
-[b]
-[b]><><><><a{,}b
-[ab]
-[ab]><><><><a{b}c
-[a{b}c]><><><><a{1..5}b
-[a1b]
-[a2b]
-[a3b]
-[a4b]
-[a5b]><><><><a{01..5}b
-[a01b]
-[a02b]
-[a03b]
-[a04b]
-[a05b]><><><><a{-01..5}b
-[a-01b]
-[a000b]
-[a001b]
-[a002b]
-[a003b]
-[a004b]
-[a005b]><><><><a{-01..5..3}b
-[a-01b]
-[a002b]
-[a005b]><><><><a{001..9}b
-[a001b]
-[a002b]
-[a003b]
-[a004b]
-[a005b]
-[a006b]
-[a007b]
-[a008b]
-[a009b]><><><><a{b,c{d,e},{f,g}h}x{y,z
-[abx{y,z]
-[acdx{y,z]
-[acex{y,z]
-[afhx{y,z]
-[aghx{y,z]><><><><a{b,c{d,e},{f,g}h}x{y,z\}
-[abx{y,z}]
-[acdx{y,z}]
-[acex{y,z}]
-[afhx{y,z}]
-[aghx{y,z}]><><><><a{b,c{d,e},{f,g}h}x{y,z}
-[abxy]
-[abxz]
-[acdxy]
-[acdxz]
-[acexy]
-[acexz]
-[afhxy]
-[afhxz]
-[aghxy]
-[aghxz]><><><><a{b{c{d,e}f{x,y{{g}h
-[a{b{cdf{x,y{{g}h]
-[a{b{cef{x,y{{g}h]><><><><a{b{c{d,e}f{x,y{}g}h
-[a{b{cdfxh]
-[a{b{cdfy{}gh]
-[a{b{cefxh]
-[a{b{cefy{}gh]><><><><a{b{c{d,e}f{x,y}}g}h
-[a{b{cdfx}g}h]
-[a{b{cdfy}g}h]
-[a{b{cefx}g}h]
-[a{b{cefy}g}h]><><><><a{b{c{d,e}f}g}h
-[a{b{cdf}g}h]
-[a{b{cef}g}h]><><><><a{{x,y},z}b
-[axb]
-[ayb]
-[azb]><><><><f{x,y{g,z}}h
-[fxh]
-[fygh]
-[fyzh]><><><><f{x,y{{g,z}}h
-[f{x,y{g}h]
-[f{x,y{z}h]><><><><f{x,y{{g,z}}h}
-[fx]
-[fy{g}h]
-[fy{z}h]><><><><f{x,y{{g}h
-[f{x,y{{g}h]><><><><f{x,y{{g}}h
-[f{x,y{{g}}h]><><><><f{x,y{}g}h
-[fxh]
-[fy{}gh]><><><><z{a,b{,c}d
-[z{a,bd]
-[z{a,bcd]><><><><z{a,b},c}d
-[za,c}d]
-[zb,c}d]><><><><{-01..5}
-[-01]
-[000]
-[001]
-[002]
-[003]
-[004]
-[005]><><><><{-05..100..5}
-[-05]
-[000]
-[005]
-[010]
-[015]
-[020]
-[025]
-[030]
-[035]
-[040]
-[045]
-[050]
-[055]
-[060]
-[065]
-[070]
-[075]
-[080]
-[085]
-[090]
-[095]
-[100]><><><><{-05..100}
-[-05]
-[-04]
-[-03]
-[-02]
-[-01]
-[000]
-[001]
-[002]
-[003]
-[004]
-[005]
-[006]
-[007]
-[008]
-[009]
-[010]
-[011]
-[012]
-[013]
-[014]
-[015]
-[016]
-[017]
-[018]
-[019]
-[020]
-[021]
-[022]
-[023]
-[024]
-[025]
-[026]
-[027]
-[028]
-[029]
-[030]
-[031]
-[032]
-[033]
-[034]
-[035]
-[036]
-[037]
-[038]
-[039]
-[040]
-[041]
-[042]
-[043]
-[044]
-[045]
-[046]
-[047]
-[048]
-[049]
-[050]
-[051]
-[052]
-[053]
-[054]
-[055]
-[056]
-[057]
-[058]
-[059]
-[060]
-[061]
-[062]
-[063]
-[064]
-[065]
-[066]
-[067]
-[068]
-[069]
-[070]
-[071]
-[072]
-[073]
-[074]
-[075]
-[076]
-[077]
-[078]
-[079]
-[080]
-[081]
-[082]
-[083]
-[084]
-[085]
-[086]
-[087]
-[088]
-[089]
-[090]
-[091]
-[092]
-[093]
-[094]
-[095]
-[096]
-[097]
-[098]
-[099]
-[100]><><><><{0..5..2}
-[0]
-[2]
-[4]><><><><{0001..05..2}
-[0001]
-[0003]
-[0005]><><><><{0001..-5..2}
-[0001]
-[-001]
-[-003]
-[-005]><><><><{0001..-5..-2}
-[0001]
-[-001]
-[-003]
-[-005]><><><><{0001..5..-2}
-[0001]
-[0003]
-[0005]><><><><{01..5}
-[01]
-[02]
-[03]
-[04]
-[05]><><><><{1..05}
-[01]
-[02]
-[03]
-[04]
-[05]><><><><{1..05..3}
-[01]
-[04]><><><><{05..100}
-[005]
-[006]
-[007]
-[008]
-[009]
-[010]
-[011]
-[012]
-[013]
-[014]
-[015]
-[016]
-[017]
-[018]
-[019]
-[020]
-[021]
-[022]
-[023]
-[024]
-[025]
-[026]
-[027]
-[028]
-[029]
-[030]
-[031]
-[032]
-[033]
-[034]
-[035]
-[036]
-[037]
-[038]
-[039]
-[040]
-[041]
-[042]
-[043]
-[044]
-[045]
-[046]
-[047]
-[048]
-[049]
-[050]
-[051]
-[052]
-[053]
-[054]
-[055]
-[056]
-[057]
-[058]
-[059]
-[060]
-[061]
-[062]
-[063]
-[064]
-[065]
-[066]
-[067]
-[068]
-[069]
-[070]
-[071]
-[072]
-[073]
-[074]
-[075]
-[076]
-[077]
-[078]
-[079]
-[080]
-[081]
-[082]
-[083]
-[084]
-[085]
-[086]
-[087]
-[088]
-[089]
-[090]
-[091]
-[092]
-[093]
-[094]
-[095]
-[096]
-[097]
-[098]
-[099]
-[100]><><><><{0a..0z}
-[{0a..0z}]><><><><{a,b\}c,d}
-[a]
-[b}c]
-[d]><><><><{a,b{c,d}
-[{a,bc]
-[{a,bd]><><><><{a,b}c,d}
-[ac,d}]
-[bc,d}]><><><><{a..F}
-[a]
-[`]
-[_]
-[^]
-[]]
-[]
-[[]
-[Z]
-[Y]
-[X]
-[W]
-[V]
-[U]
-[T]
-[S]
-[R]
-[Q]
-[P]
-[O]
-[N]
-[M]
-[L]
-[K]
-[J]
-[I]
-[H]
-[G]
-[F]><><><><{A..f}
-[A]
-[B]
-[C]
-[D]
-[E]
-[F]
-[G]
-[H]
-[I]
-[J]
-[K]
-[L]
-[M]
-[N]
-[O]
-[P]
-[Q]
-[R]
-[S]
-[T]
-[U]
-[V]
-[W]
-[X]
-[Y]
-[Z]
-[[]
-[]
-[]]
-[^]
-[_]
-[`]
-[a]
-[b]
-[c]
-[d]
-[e]
-[f]><><><><{a..Z}
-[a]
-[`]
-[_]
-[^]
-[]]
-[]
-[[]
-[Z]><><><><{A..z}
-[A]
-[B]
-[C]
-[D]
-[E]
-[F]
-[G]
-[H]
-[I]
-[J]
-[K]
-[L]
-[M]
-[N]
-[O]
-[P]
-[Q]
-[R]
-[S]
-[T]
-[U]
-[V]
-[W]
-[X]
-[Y]
-[Z]
-[[]
-[]
-[]]
-[^]
-[_]
-[`]
-[a]
-[b]
-[c]
-[d]
-[e]
-[f]
-[g]
-[h]
-[i]
-[j]
-[k]
-[l]
-[m]
-[n]
-[o]
-[p]
-[q]
-[r]
-[s]
-[t]
-[u]
-[v]
-[w]
-[x]
-[y]
-[z]><><><><{z..A}
-[z]
-[y]
-[x]
-[w]
-[v]
-[u]
-[t]
-[s]
-[r]
-[q]
-[p]
-[o]
-[n]
-[m]
-[l]
-[k]
-[j]
-[i]
-[h]
-[g]
-[f]
-[e]
-[d]
-[c]
-[b]
-[a]
-[`]
-[_]
-[^]
-[]]
-[]
-[[]
-[Z]
-[Y]
-[X]
-[W]
-[V]
-[U]
-[T]
-[S]
-[R]
-[Q]
-[P]
-[O]
-[N]
-[M]
-[L]
-[K]
-[J]
-[I]
-[H]
-[G]
-[F]
-[E]
-[D]
-[C]
-[B]
-[A]><><><><{Z..a}
-[Z]
-[[]
-[]
-[]]
-[^]
-[_]
-[`]
-[a]><><><><{a..F..2}
-[a]
-[_]
-[]]
-[[]
-[Y]
-[W]
-[U]
-[S]
-[Q]
-[O]
-[M]
-[K]
-[I]
-[G]><><><><{A..f..02}
-[A]
-[C]
-[E]
-[G]
-[I]
-[K]
-[M]
-[O]
-[Q]
-[S]
-[U]
-[W]
-[Y]
-[[]
-[]]
-[_]
-[a]
-[c]
-[e]><><><><{a..Z..5}
-[a]
-[]><><><><d{a..Z..5}b
-[dab]
-[db]><><><><{A..z..10}
-[A]
-[K]
-[U]
-[_]
-[i]
-[s]><><><><{z..A..-2}
-[z]
-[x]
-[v]
-[t]
-[r]
-[p]
-[n]
-[l]
-[j]
-[h]
-[f]
-[d]
-[b]
-[`]
-[^]
-[]
-[Z]
-[X]
-[V]
-[T]
-[R]
-[P]
-[N]
-[L]
-[J]
-[H]
-[F]
-[D]
-[B]><><><><{Z..a..20}
-[Z]><><><><{a{,b}
-[{a]
-[{ab]><><><><{a},b}
-[a}]
-[b]><><><><{x,y{,}g}
-[x]
-[yg]
-[yg]><><><><{x,y{}g}
-[x]
-[y{}g]><><><><{{a,b}
-[{a]
-[{b]><><><><{{a,b},c}
-[a]
-[b]
-[c]><><><><{{a,b}c}
-[{ac}]
-[{bc}]><><><><{{a,b},}
-[a]
-[b]><><><><X{{a,b},}X
-[XaX]
-[XbX]
-[XX]><><><><{{a,b},}c
-[ac]
-[bc]
-[c]><><><><{{a,b}.}
-[{a.}]
-[{b.}]><><><><{{a,b}}
-[{a}]
-[{b}]><><><><X{a..#}X
-[X{a..#}X]><><><><
-><><><><{-10..00}
-[-10]
-[-09]
-[-08]
-[-07]
-[-06]
-[-05]
-[-04]
-[-03]
-[-02]
-[-01]
-[000]><><><><{a,\\{a,b}c}
-[a]
-[\ac]
-[\bc]><><><><{a,\{a,b}c}
-[ac}]
-[{ac}]
-[bc}]><><><><a,\{b,c}
-[a,{b,c}]><><><><{-10.\.00}
-[{-10..00}]><><><><ff{c,b,a}
-[ffc]
-[ffb]
-[ffa]><><><><f{d,e,f}g
-[fdg]
-[feg]
-[ffg]><><><><{l,n,m}xyz
-[lxyz]
-[nxyz]
-[mxyz]><><><><{abc\,def}
-[{abc,def}]><><><><{abc}
-[{abc}]><><><><{x\,y,\{abc\},trie}
-[x,y]
-[{abc}]
-[trie]><><><><{}
-[{}]><><><><}
-[}]><><><><{
-[{]><><><><abcd{efgh
-[abcd{efgh]><><><><{1..10}
-[1]
-[2]
-[3]
-[4]
-[5]
-[6]
-[7]
-[8]
-[9]
-[10]><><><><{0..10,braces}
-[0..10]
-[braces]><><><><{{0..10},braces}
-[0]
-[1]
-[2]
-[3]
-[4]
-[5]
-[6]
-[7]
-[8]
-[9]
-[10]
-[braces]><><><><x{{0..10},braces}y
-[x0y]
-[x1y]
-[x2y]
-[x3y]
-[x4y]
-[x5y]
-[x6y]
-[x7y]
-[x8y]
-[x9y]
-[x10y]
-[xbracesy]><><><><{3..3}
-[3]><><><><x{3..3}y
-[x3y]><><><><{10..1}
-[10]
-[9]
-[8]
-[7]
-[6]
-[5]
-[4]
-[3]
-[2]
-[1]><><><><{10..1}y
-[10y]
-[9y]
-[8y]
-[7y]
-[6y]
-[5y]
-[4y]
-[3y]
-[2y]
-[1y]><><><><x{10..1}y
-[x10y]
-[x9y]
-[x8y]
-[x7y]
-[x6y]
-[x5y]
-[x4y]
-[x3y]
-[x2y]
-[x1y]><><><><{a..f}
-[a]
-[b]
-[c]
-[d]
-[e]
-[f]><><><><{f..a}
-[f]
-[e]
-[d]
-[c]
-[b]
-[a]><><><><{a..A}
-[a]
-[`]
-[_]
-[^]
-[]]
-[]
-[[]
-[Z]
-[Y]
-[X]
-[W]
-[V]
-[U]
-[T]
-[S]
-[R]
-[Q]
-[P]
-[O]
-[N]
-[M]
-[L]
-[K]
-[J]
-[I]
-[H]
-[G]
-[F]
-[E]
-[D]
-[C]
-[B]
-[A]><><><><{A..a}
-[A]
-[B]
-[C]
-[D]
-[E]
-[F]
-[G]
-[H]
-[I]
-[J]
-[K]
-[L]
-[M]
-[N]
-[O]
-[P]
-[Q]
-[R]
-[S]
-[T]
-[U]
-[V]
-[W]
-[X]
-[Y]
-[Z]
-[[]
-[]
-[]]
-[^]
-[_]
-[`]
-[a]><><><><{f..f}
-[f]><><><><{1..f}
-[{1..f}]><><><><{f..1}
-[{f..1}]><><><><{-1..-10}
-[-1]
-[-2]
-[-3]
-[-4]
-[-5]
-[-6]
-[-7]
-[-8]
-[-9]
-[-10]><><><><{-20..0}
-[-20]
-[-19]
-[-18]
-[-17]
-[-16]
-[-15]
-[-14]
-[-13]
-[-12]
-[-11]
-[-10]
-[-9]
-[-8]
-[-7]
-[-6]
-[-5]
-[-4]
-[-3]
-[-2]
-[-1]
-[0]><><><><a-{b{d,e}}-c
-[a-{bd}-c]
-[a-{be}-c]><><><><a-{bdef-{g,i}-c
-[a-{bdef-g-c]
-[a-{bdef-i-c]><><><><{klklkl}{1,2,3}
-[{klklkl}1]
-[{klklkl}2]
-[{klklkl}3]><><><><{1..10..2}
-[1]
-[3]
-[5]
-[7]
-[9]><><><><{-1..-10..2}
-[-1]
-[-3]
-[-5]
-[-7]
-[-9]><><><><{-1..-10..-2}
-[-1]
-[-3]
-[-5]
-[-7]
-[-9]><><><><{10..1..-2}
-[10]
-[8]
-[6]
-[4]
-[2]><><><><{10..1..2}
-[10]
-[8]
-[6]
-[4]
-[2]><><><><{1..20..2}
-[1]
-[3]
-[5]
-[7]
-[9]
-[11]
-[13]
-[15]
-[17]
-[19]><><><><{1..20..20}
-[1]><><><><{100..0..5}
-[100]
-[95]
-[90]
-[85]
-[80]
-[75]
-[70]
-[65]
-[60]
-[55]
-[50]
-[45]
-[40]
-[35]
-[30]
-[25]
-[20]
-[15]
-[10]
-[5]
-[0]><><><><{100..0..-5}
-[100]
-[95]
-[90]
-[85]
-[80]
-[75]
-[70]
-[65]
-[60]
-[55]
-[50]
-[45]
-[40]
-[35]
-[30]
-[25]
-[20]
-[15]
-[10]
-[5]
-[0]><><><><{a..z}
-[a]
-[b]
-[c]
-[d]
-[e]
-[f]
-[g]
-[h]
-[i]
-[j]
-[k]
-[l]
-[m]
-[n]
-[o]
-[p]
-[q]
-[r]
-[s]
-[t]
-[u]
-[v]
-[w]
-[x]
-[y]
-[z]><><><><{a..z..2}
-[a]
-[c]
-[e]
-[g]
-[i]
-[k]
-[m]
-[o]
-[q]
-[s]
-[u]
-[w]
-[y]><><><><{z..a..-2}
-[z]
-[x]
-[v]
-[t]
-[r]
-[p]
-[n]
-[l]
-[j]
-[h]
-[f]
-[d]
-[b]><><><><{2147483645..2147483649}
-[2147483645]
-[2147483646]
-[2147483647]
-[2147483648]
-[2147483649]><><><><{10..0..2}
-[10]
-[8]
-[6]
-[4]
-[2]
-[0]><><><><{10..0..-2}
-[10]
-[8]
-[6]
-[4]
-[2]
-[0]><><><><{-50..-0..5}
-[-50]
-[-45]
-[-40]
-[-35]
-[-30]
-[-25]
-[-20]
-[-15]
-[-10]
-[-5]
-[0]><><><><{1..10.f}
-[{1..10.f}]><><><><{1..ff}
-[{1..ff}]><><><><{1..10..ff}
-[{1..10..ff}]><><><><{1.20..2}
-[{1.20..2}]><><><><{1..20..f2}
-[{1..20..f2}]><><><><{1..20..2f}
-[{1..20..2f}]><><><><{1..2f..2}
-[{1..2f..2}]><><><><{1..ff..2}
-[{1..ff..2}]><><><><{1..ff}
-[{1..ff}]><><><><{1..f}
-[{1..f}]><><><><{1..0f}
-[{1..0f}]><><><><{1..10f}
-[{1..10f}]><><><><{1..10.f}
-[{1..10.f}]><><><><{1..10.f}
-[{1..10.f}]><><><><
\ No newline at end of file
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/cases.txt b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/cases.txt
deleted file mode 100644
index e5161c3da869f3..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/cases.txt
+++ /dev/null
@@ -1,182 +0,0 @@
-# skip quotes for now
-# "{x,x}"
-# {"x,x"}
-# {x","x}
-# '{a,b}{{a,b},a,b}'
-A{b,{d,e},{f,g}}Z
-PRE-{a,b}{{a,b},a,b}-POST
-\\{a,b}{{a,b},a,b}
-{{a,b}
-{a,b}}
-{,}
-a{,}
-{,}b
-a{,}b
-a{b}c
-a{1..5}b
-a{01..5}b
-a{-01..5}b
-a{-01..5..3}b
-a{001..9}b
-a{b,c{d,e},{f,g}h}x{y,z
-a{b,c{d,e},{f,g}h}x{y,z\\}
-a{b,c{d,e},{f,g}h}x{y,z}
-a{b{c{d,e}f{x,y{{g}h
-a{b{c{d,e}f{x,y{}g}h
-a{b{c{d,e}f{x,y}}g}h
-a{b{c{d,e}f}g}h
-a{{x,y},z}b
-f{x,y{g,z}}h
-f{x,y{{g,z}}h
-f{x,y{{g,z}}h}
-f{x,y{{g}h
-f{x,y{{g}}h
-f{x,y{}g}h
-z{a,b{,c}d
-z{a,b},c}d
-{-01..5}
-{-05..100..5}
-{-05..100}
-{0..5..2}
-{0001..05..2}
-{0001..-5..2}
-{0001..-5..-2}
-{0001..5..-2}
-{01..5}
-{1..05}
-{1..05..3}
-{05..100}
-{0a..0z}
-{a,b\\}c,d}
-{a,b{c,d}
-{a,b}c,d}
-{a..F}
-{A..f}
-{a..Z}
-{A..z}
-{z..A}
-{Z..a}
-{a..F..2}
-{A..f..02}
-{a..Z..5}
-d{a..Z..5}b
-{A..z..10}
-{z..A..-2}
-{Z..a..20}
-{a{,b}
-{a},b}
-{x,y{,}g}
-{x,y{}g}
-{{a,b}
-{{a,b},c}
-{{a,b}c}
-{{a,b},}
-X{{a,b},}X
-{{a,b},}c
-{{a,b}.}
-{{a,b}}
-X{a..#}X
-# this next one is an empty string
-
-{-10..00}
-# Need to escape slashes in here for reasons i guess.
-{a,\\\\{a,b}c}
-{a,\\{a,b}c}
-a,\\{b,c}
-{-10.\\.00}
-#### bash tests/braces.tests
-# Note that some tests are edited out because some features of
-# bash are intentionally not supported in this brace expander.
-ff{c,b,a}
-f{d,e,f}g
-{l,n,m}xyz
-{abc\\,def}
-{abc}
-{x\\,y,\\{abc\\},trie}
-# not impementing back-ticks obviously
-# XXXX\\{`echo a b c | tr ' ' ','`\\}
-{}
-# We only ever have to worry about parsing a single argument,
-# not a command line, so spaces have a different meaning than bash.
-# { }
-}
-{
-abcd{efgh
-# spaces
-# foo {1,2} bar
-# not impementing back-ticks obviously
-# `zecho foo {1,2} bar`
-# $(zecho foo {1,2} bar)
-# ${var} is not a variable here, like it is in bash. omit.
-# foo{bar,${var}.}
-# foo{bar,${var}}
-# isaacs: skip quotes for now
-# "${var}"{x,y}
-# $var{x,y}
-# ${var}{x,y}
-# new sequence brace operators
-{1..10}
-# this doesn't work yet
-{0..10,braces}
-# but this does
-{{0..10},braces}
-x{{0..10},braces}y
-{3..3}
-x{3..3}y
-{10..1}
-{10..1}y
-x{10..1}y
-{a..f}
-{f..a}
-{a..A}
-{A..a}
-{f..f}
-# mixes are incorrectly-formed brace expansions
-{1..f}
-{f..1}
-# spaces
-# 0{1..9} {10..20}
-# do negative numbers work?
-{-1..-10}
-{-20..0}
-# weirdly-formed brace expansions -- fixed in post-bash-3.1
-a-{b{d,e}}-c
-a-{bdef-{g,i}-c
-# isaacs: skip quotes for now
-# {"klklkl"}{1,2,3}
-# isaacs: this is a valid test, though
-{klklkl}{1,2,3}
-# {"x,x"}
-{1..10..2}
-{-1..-10..2}
-{-1..-10..-2}
-{10..1..-2}
-{10..1..2}
-{1..20..2}
-{1..20..20}
-{100..0..5}
-{100..0..-5}
-{a..z}
-{a..z..2}
-{z..a..-2}
-# make sure brace expansion handles ints > 2**31 - 1 using intmax_t
-{2147483645..2147483649}
-# unwanted zero-padding -- fixed post-bash-4.0
-{10..0..2}
-{10..0..-2}
-{-50..-0..5}
-# bad
-{1..10.f}
-{1..ff}
-{1..10..ff}
-{1.20..2}
-{1..20..f2}
-{1..20..2f}
-{1..2f..2}
-{1..ff..2}
-{1..ff}
-{1..f}
-{1..0f}
-{1..10f}
-{1..10.f}
-{1..10.f}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/dollar.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/dollar.js
deleted file mode 100644
index 3fcc185a7d6dcc..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/dollar.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('ignores ${', function(t) {
-  t.deepEqual(expand('${1..3}'), ['${1..3}']);
-  t.deepEqual(expand('${a,b}${c,d}'), ['${a,b}${c,d}']);
-  t.deepEqual(expand('x${a,b}x${c,d}x'), ['x${a,b}x${c,d}x']);
-  t.end();
-});
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js
deleted file mode 100644
index e429121eab8059..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('empty option', function(t) {
-  t.deepEqual(expand('-v{,,,,}'), [
-    '-v', '-v', '-v', '-v', '-v'
-  ]);
-  t.end();
-});
-
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/generate.sh b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/generate.sh
deleted file mode 100644
index e040e664d9f881..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/generate.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# Bash 4.3 because of arbitrary need to pick a single standard.
-
-if [ "${BASH_VERSINFO[0]}" != "4" ] || [ "${BASH_VERSINFO[1]}" != "3" ]; then
-  echo "this script requires bash 4.3" >&2
-  exit 1
-fi
-
-CDPATH= cd "$(dirname "$0")"
-
-js='require("./")(process.argv[1]).join(" ")'
-
-cat cases.txt | \
-  while read case; do
-    if [ "${case:0:1}" = "#" ]; then
-      continue;
-    fi;
-    b="$($BASH -c 'for c in '"$case"'; do echo ["$c"]; done')"
-    echo "$case"
-    echo -n "$b><><><><";
-  done > bash-results.txt
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/negative-increment.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/negative-increment.js
deleted file mode 100644
index 8d434c23d4514d..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/negative-increment.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('negative increment', function(t) {
-  t.deepEqual(expand('{3..1}'), ['3', '2', '1']);
-  t.deepEqual(expand('{10..8}'), ['10', '9', '8']);
-  t.deepEqual(expand('{10..08}'), ['10', '09', '08']);
-  t.deepEqual(expand('{c..a}'), ['c', 'b', 'a']);
-
-  t.deepEqual(expand('{4..0..2}'), ['4', '2', '0']);
-  t.deepEqual(expand('{4..0..-2}'), ['4', '2', '0']);
-  t.deepEqual(expand('{e..a..2}'), ['e', 'c', 'a']);
-
-  t.end();
-});
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/nested.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/nested.js
deleted file mode 100644
index 0862dc51f90aee..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/nested.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('nested', function(t) {
-  t.deepEqual(expand('{a,b{1..3},c}'), [
-    'a', 'b1', 'b2', 'b3', 'c'
-  ]);
-  t.deepEqual(expand('{{A..Z},{a..z}}'),
-    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
-  );
-  t.deepEqual(expand('ppp{,config,oe{,conf}}'), [
-    'ppp', 'pppconfig', 'pppoe', 'pppoeconf'
-  ]);
-  t.end();
-});
-
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/order.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/order.js
deleted file mode 100644
index c00ad155fe6760..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/order.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('order', function(t) {
-  t.deepEqual(expand('a{d,c,b}e'), [
-    'ade', 'ace', 'abe'
-  ]);
-  t.end();
-});
-
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/pad.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/pad.js
deleted file mode 100644
index e4158775f1bd06..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/pad.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('pad', function(t) {
-  t.deepEqual(expand('{9..11}'), [
-    '9', '10', '11'
-  ]);
-  t.deepEqual(expand('{09..11}'), [
-    '09', '10', '11'
-  ]);
-  t.end();
-});
-
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/same-type.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/same-type.js
deleted file mode 100644
index 3038fba7416b3a..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/same-type.js
+++ /dev/null
@@ -1,7 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('x and y of same type', function(t) {
-  t.deepEqual(expand('{a..9}'), ['{a..9}']);
-  t.end();
-});
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js
deleted file mode 100644
index f73a9579ab398b..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js
+++ /dev/null
@@ -1,50 +0,0 @@
-var test = require('tape');
-var expand = require('..');
-
-test('numeric sequences', function(t) {
-  t.deepEqual(expand('a{1..2}b{2..3}c'), [
-    'a1b2c', 'a1b3c', 'a2b2c', 'a2b3c'
-  ]);
-  t.deepEqual(expand('{1..2}{2..3}'), [
-    '12', '13', '22', '23'
-  ]);
-  t.end();
-});
-
-test('numeric sequences with step count', function(t) {
-  t.deepEqual(expand('{0..8..2}'), [
-    '0', '2', '4', '6', '8'
-  ]);
-  t.deepEqual(expand('{1..8..2}'), [
-    '1', '3', '5', '7'
-  ]);
-  t.end();
-});
-
-test('numeric sequence with negative x / y', function(t) {
-  t.deepEqual(expand('{3..-2}'), [
-    '3', '2', '1', '0', '-1', '-2'
-  ]);
-  t.end();
-});
-
-test('alphabetic sequences', function(t) {
-  t.deepEqual(expand('1{a..b}2{b..c}3'), [
-    '1a2b3', '1a2c3', '1b2b3', '1b2c3'
-  ]);
-  t.deepEqual(expand('{a..b}{b..c}'), [
-    'ab', 'ac', 'bb', 'bc'
-  ]);
-  t.end();
-});
-
-test('alphabetic sequences with step count', function(t) {
-  t.deepEqual(expand('{a..k..2}'), [
-    'a', 'c', 'e', 'g', 'i', 'k'
-  ]);
-  t.deepEqual(expand('{b..k..2}'), [
-    'b', 'd', 'f', 'h', 'j'
-  ]);
-  t.end();
-});
-
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/package.json b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/package.json
index 3dc6beb49f684a..17ccc275e3c004 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/package.json
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/package.json
@@ -1,63 +1,88 @@
 {
+  "_args": [
+    [
+      "minimatch@^2.0.1",
+      "/Users/rebecca/code/npm/node_modules/glob"
+    ],
+    [
+      "minimatch@^2.0.1",
+      "/Users/rebecca/code/npm/node_modules/node-gyp/node_modules/glob"
+    ]
+  ],
+  "_from": "minimatch@>=2.0.1 <3.0.0",
+  "_id": "minimatch@2.0.10",
+  "_inCache": true,
+  "_location": "/node-gyp/glob/minimatch",
+  "_nodeVersion": "2.2.1",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
+  },
+  "_npmVersion": "3.1.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "minimatch",
+    "raw": "minimatch@^2.0.1",
+    "rawSpec": "^2.0.1",
+    "scope": null,
+    "spec": ">=2.0.1 <3.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/node-gyp/glob"
+  ],
+  "_shrinkwrap": null,
+  "_spec": "minimatch@^2.0.1",
+  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp/node_modules/glob",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me"
   },
-  "name": "minimatch",
-  "description": "a glob matcher in javascript",
-  "version": "2.0.10",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/minimatch.git"
-  },
-  "main": "minimatch.js",
-  "scripts": {
-    "posttest": "standard minimatch.js test/*.js",
-    "test": "tap test/*.js",
-    "prepublish": "browserify -o browser.js -e minimatch.js -s minimatch --bare"
-  },
-  "engines": {
-    "node": "*"
+  "bugs": {
+    "url": "https://github.com/isaacs/minimatch/issues"
   },
   "dependencies": {
     "brace-expansion": "^1.0.0"
   },
+  "description": "a glob matcher in javascript",
   "devDependencies": {
     "browserify": "^9.0.3",
     "standard": "^3.7.2",
     "tap": "^1.2.0"
   },
-  "license": "ISC",
-  "files": [
-    "minimatch.js",
-    "browser.js"
-  ],
-  "gitHead": "6afb85f0c324b321f76a38df81891e562693e257",
-  "bugs": {
-    "url": "https://github.com/isaacs/minimatch/issues"
-  },
-  "homepage": "https://github.com/isaacs/minimatch#readme",
-  "_id": "minimatch@2.0.10",
-  "_shasum": "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7",
-  "_from": "minimatch@>=2.0.1 <3.0.0",
-  "_npmVersion": "3.1.0",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
-  },
+  "directories": {},
   "dist": {
     "shasum": "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7",
     "tarball": "http://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"
   },
+  "engines": {
+    "node": "*"
+  },
+  "files": [
+    "browser.js",
+    "minimatch.js"
+  ],
+  "gitHead": "6afb85f0c324b321f76a38df81891e562693e257",
+  "homepage": "https://github.com/isaacs/minimatch#readme",
+  "license": "ISC",
+  "main": "minimatch.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "minimatch",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/minimatch.git"
+  },
+  "scripts": {
+    "posttest": "standard minimatch.js test/*.js",
+    "prepublish": "browserify -o browser.js -e minimatch.js -s minimatch --bare",
+    "test": "tap test/*.js"
+  },
+  "version": "2.0.10"
 }
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/package.json b/deps/npm/node_modules/node-gyp/node_modules/glob/package.json
index 434e4696f8fb15..5e32a7561d6e21 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/package.json
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/package.json
@@ -1,24 +1,46 @@
 {
-  "author": {
-    "name": "Isaac Z. Schlueter",
+  "_args": [
+    [
+      "glob@3 || 4",
+      "/Users/rebecca/code/npm/node_modules/node-gyp"
+    ]
+  ],
+  "_from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
+  "_id": "glob@4.5.3",
+  "_inCache": true,
+  "_location": "/node-gyp/glob",
+  "_nodeVersion": "1.4.2",
+  "_npmUser": {
     "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
+    "name": "isaacs"
   },
-  "name": "glob",
-  "description": "a little globber",
-  "version": "4.5.3",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/node-glob.git"
+  "_npmVersion": "2.7.1",
+  "_phantomChildren": {
+    "brace-expansion": "1.1.0"
   },
-  "main": "glob.js",
-  "files": [
-    "glob.js",
-    "sync.js",
-    "common.js"
+  "_requested": {
+    "name": "glob",
+    "raw": "glob@3 || 4",
+    "rawSpec": "3 || 4",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/node-gyp"
   ],
-  "engines": {
-    "node": "*"
+  "_resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+  "_shasum": "c6cb73d3226c1efef04de3c56d012f03377ee15f",
+  "_shrinkwrap": null,
+  "_spec": "glob@3 || 4",
+  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp",
+  "author": {
+    "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
+    "url": "http://blog.izs.me/"
+  },
+  "bugs": {
+    "url": "https://github.com/isaacs/node-glob/issues"
   },
   "dependencies": {
     "inflight": "^1.0.4",
@@ -26,47 +48,50 @@
     "minimatch": "^2.0.1",
     "once": "^1.3.0"
   },
+  "description": "a little globber",
   "devDependencies": {
     "mkdirp": "0",
     "rimraf": "^2.2.8",
     "tap": "^0.5.0",
     "tick": "0.0.6"
   },
-  "scripts": {
-    "prepublish": "npm run benchclean",
-    "profclean": "rm -f v8.log profile.txt",
-    "test": "npm run profclean && tap test/*.js",
-    "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js",
-    "bench": "bash benchmark.sh",
-    "prof": "bash prof.sh && cat profile.txt",
-    "benchclean": "bash benchclean.sh"
+  "directories": {},
+  "dist": {
+    "shasum": "c6cb73d3226c1efef04de3c56d012f03377ee15f",
+    "tarball": "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz"
   },
-  "license": "ISC",
-  "gitHead": "a4e461ab59a837eee80a4d8dbdbf5ae1054a646f",
-  "bugs": {
-    "url": "https://github.com/isaacs/node-glob/issues"
+  "engines": {
+    "node": "*"
   },
+  "files": [
+    "common.js",
+    "glob.js",
+    "sync.js"
+  ],
+  "gitHead": "a4e461ab59a837eee80a4d8dbdbf5ae1054a646f",
   "homepage": "https://github.com/isaacs/node-glob",
-  "_id": "glob@4.5.3",
-  "_shasum": "c6cb73d3226c1efef04de3c56d012f03377ee15f",
-  "_from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
-  "_npmVersion": "2.7.1",
-  "_nodeVersion": "1.4.2",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "i@izs.me"
-  },
+  "license": "ISC",
+  "main": "glob.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "dist": {
-    "shasum": "c6cb73d3226c1efef04de3c56d012f03377ee15f",
-    "tarball": "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz"
+  "name": "glob",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/node-glob.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "bench": "bash benchmark.sh",
+    "benchclean": "bash benchclean.sh",
+    "prepublish": "npm run benchclean",
+    "prof": "bash prof.sh && cat profile.txt",
+    "profclean": "rm -f v8.log profile.txt",
+    "test": "npm run profclean && tap test/*.js",
+    "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js"
+  },
+  "version": "4.5.3"
 }
diff --git a/deps/npm/node_modules/node-gyp/node_modules/minimatch/package.json b/deps/npm/node_modules/node-gyp/node_modules/minimatch/package.json
index 8bf46ccae0c4f6..7358ebfad52d1a 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/minimatch/package.json
+++ b/deps/npm/node_modules/node-gyp/node_modules/minimatch/package.json
@@ -1,58 +1,81 @@
 {
-  "author": {
-    "name": "Isaac Z. Schlueter",
+  "_args": [
+    [
+      "minimatch@1",
+      "/Users/rebecca/code/npm/node_modules/node-gyp"
+    ]
+  ],
+  "_from": "minimatch@>=1.0.0 <2.0.0",
+  "_id": "minimatch@1.0.0",
+  "_inCache": true,
+  "_location": "/node-gyp/minimatch",
+  "_npmUser": {
     "email": "i@izs.me",
-    "url": "http://blog.izs.me"
+    "name": "isaacs"
   },
-  "name": "minimatch",
-  "description": "a glob matcher in javascript",
-  "version": "1.0.0",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/minimatch.git"
+  "_npmVersion": "1.4.21",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "minimatch",
+    "raw": "minimatch@1",
+    "rawSpec": "1",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
   },
-  "main": "minimatch.js",
-  "scripts": {
-    "test": "tap test/*.js"
+  "_requiredBy": [
+    "/node-gyp"
+  ],
+  "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+  "_shasum": "e0dd2120b49e1b724ce8d714c520822a9438576d",
+  "_shrinkwrap": null,
+  "_spec": "minimatch@1",
+  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp",
+  "author": {
+    "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
+    "url": "http://blog.izs.me"
   },
-  "engines": {
-    "node": "*"
+  "bugs": {
+    "url": "https://github.com/isaacs/minimatch/issues"
   },
   "dependencies": {
     "lru-cache": "2",
     "sigmund": "~1.0.0"
   },
+  "description": "a glob matcher in javascript",
   "devDependencies": {
     "tap": ""
   },
-  "license": {
-    "type": "MIT",
-    "url": "http://github.com/isaacs/minimatch/raw/master/LICENSE"
+  "directories": {},
+  "dist": {
+    "shasum": "e0dd2120b49e1b724ce8d714c520822a9438576d",
+    "tarball": "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"
   },
-  "gitHead": "b374a643976eb55cdc19c60b6dd51ebe9bcc607a",
-  "bugs": {
-    "url": "https://github.com/isaacs/minimatch/issues"
+  "engines": {
+    "node": "*"
   },
+  "gitHead": "b374a643976eb55cdc19c60b6dd51ebe9bcc607a",
   "homepage": "https://github.com/isaacs/minimatch",
-  "_id": "minimatch@1.0.0",
-  "_shasum": "e0dd2120b49e1b724ce8d714c520822a9438576d",
-  "_from": "minimatch@>=1.0.0 <2.0.0",
-  "_npmVersion": "1.4.21",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "i@izs.me"
+  "license": {
+    "type": "MIT",
+    "url": "http://github.com/isaacs/minimatch/raw/master/LICENSE"
   },
+  "main": "minimatch.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "dist": {
-    "shasum": "e0dd2120b49e1b724ce8d714c520822a9438576d",
-    "tarball": "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"
+  "name": "minimatch",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/minimatch.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.0.0"
 }
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/.npmignore b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/.npmignore
deleted file mode 100644
index 7e6163db02e5e7..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/.npmignore
+++ /dev/null
@@ -1,6 +0,0 @@
-support
-test
-examples
-example
-*.sock
-dist
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/History.md b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/History.md
deleted file mode 100644
index 854c9711c6fd68..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/History.md
+++ /dev/null
@@ -1,195 +0,0 @@
-
-2.2.0 / 2015-05-09
-==================
-
-  * package: update "ms" to v0.7.1 (#202, @dougwilson)
-  * README: add logging to file example (#193, @DanielOchoa)
-  * README: fixed a typo (#191, @amir-s)
-  * browser: expose `storage` (#190, @stephenmathieson)
-  * Makefile: add a `distclean` target (#189, @stephenmathieson)
-
-2.1.3 / 2015-03-13
-==================
-
-  * Updated stdout/stderr example (#186)
-  * Updated example/stdout.js to match debug current behaviour
-  * Renamed example/stderr.js to stdout.js
-  * Update Readme.md (#184)
-  * replace high intensity foreground color for bold (#182, #183)
-
-2.1.2 / 2015-03-01
-==================
-
-  * dist: recompile
-  * update "ms" to v0.7.0
-  * package: update "browserify" to v9.0.3
-  * component: fix "ms.js" repo location
-  * changed bower package name
-  * updated documentation about using debug in a browser
-  * fix: security error on safari (#167, #168, @yields)
-
-2.1.1 / 2014-12-29
-==================
-
-  * browser: use `typeof` to check for `console` existence
-  * browser: check for `console.log` truthiness (fix IE 8/9)
-  * browser: add support for Chrome apps
-  * Readme: added Windows usage remarks
-  * Add `bower.json` to properly support bower install
-
-2.1.0 / 2014-10-15
-==================
-
-  * node: implement `DEBUG_FD` env variable support
-  * package: update "browserify" to v6.1.0
-  * package: add "license" field to package.json (#135, @panuhorsmalahti)
-
-2.0.0 / 2014-09-01
-==================
-
-  * package: update "browserify" to v5.11.0
-  * node: use stderr rather than stdout for logging (#29, @stephenmathieson)
-
-1.0.4 / 2014-07-15
-==================
-
-  * dist: recompile
-  * example: remove `console.info()` log usage
-  * example: add "Content-Type" UTF-8 header to browser example
-  * browser: place %c marker after the space character
-  * browser: reset the "content" color via `color: inherit`
-  * browser: add colors support for Firefox >= v31
-  * debug: prefer an instance `log()` function over the global one (#119)
-  * Readme: update documentation about styled console logs for FF v31 (#116, @wryk)
-
-1.0.3 / 2014-07-09
-==================
-
-  * Add support for multiple wildcards in namespaces (#122, @seegno)
-  * browser: fix lint
-
-1.0.2 / 2014-06-10
-==================
-
-  * browser: update color palette (#113, @gscottolson)
-  * common: make console logging function configurable (#108, @timoxley)
-  * node: fix %o colors on old node <= 0.8.x
-  * Makefile: find node path using shell/which (#109, @timoxley)
-
-1.0.1 / 2014-06-06
-==================
-
-  * browser: use `removeItem()` to clear localStorage
-  * browser, node: don't set DEBUG if namespaces is undefined (#107, @leedm777)
-  * package: add "contributors" section
-  * node: fix comment typo
-  * README: list authors
-
-1.0.0 / 2014-06-04
-==================
-
-  * make ms diff be global, not be scope
-  * debug: ignore empty strings in enable()
-  * node: make DEBUG_COLORS able to disable coloring
-  * *: export the `colors` array
-  * npmignore: don't publish the `dist` dir
-  * Makefile: refactor to use browserify
-  * package: add "browserify" as a dev dependency
-  * Readme: add Web Inspector Colors section
-  * node: reset terminal color for the debug content
-  * node: map "%o" to `util.inspect()`
-  * browser: map "%j" to `JSON.stringify()`
-  * debug: add custom "formatters"
-  * debug: use "ms" module for humanizing the diff
-  * Readme: add "bash" syntax highlighting
-  * browser: add Firebug color support
-  * browser: add colors for WebKit browsers
-  * node: apply log to `console`
-  * rewrite: abstract common logic for Node & browsers
-  * add .jshintrc file
-
-0.8.1 / 2014-04-14
-==================
-
-  * package: re-add the "component" section
-
-0.8.0 / 2014-03-30
-==================
-
-  * add `enable()` method for nodejs. Closes #27
-  * change from stderr to stdout
-  * remove unnecessary index.js file
-
-0.7.4 / 2013-11-13
-==================
-
-  * remove "browserify" key from package.json (fixes something in browserify)
-
-0.7.3 / 2013-10-30
-==================
-
-  * fix: catch localStorage security error when cookies are blocked (Chrome)
-  * add debug(err) support. Closes #46
-  * add .browser prop to package.json. Closes #42
-
-0.7.2 / 2013-02-06
-==================
-
-  * fix package.json
-  * fix: Mobile Safari (private mode) is broken with debug
-  * fix: Use unicode to send escape character to shell instead of octal to work with strict mode javascript
-
-0.7.1 / 2013-02-05
-==================
-
-  * add repository URL to package.json
-  * add DEBUG_COLORED to force colored output
-  * add browserify support
-  * fix component. Closes #24
-
-0.7.0 / 2012-05-04
-==================
-
-  * Added .component to package.json
-  * Added debug.component.js build
-
-0.6.0 / 2012-03-16
-==================
-
-  * Added support for "-" prefix in DEBUG [Vinay Pulim]
-  * Added `.enabled` flag to the node version [TooTallNate]
-
-0.5.0 / 2012-02-02
-==================
-
-  * Added: humanize diffs. Closes #8
-  * Added `debug.disable()` to the CS variant
-  * Removed padding. Closes #10
-  * Fixed: persist client-side variant again. Closes #9
-
-0.4.0 / 2012-02-01
-==================
-
-  * Added browser variant support for older browsers [TooTallNate]
-  * Added `debug.enable('project:*')` to browser variant [TooTallNate]
-  * Added padding to diff (moved it to the right)
-
-0.3.0 / 2012-01-26
-==================
-
-  * Added millisecond diff when isatty, otherwise UTC string
-
-0.2.0 / 2012-01-22
-==================
-
-  * Added wildcard support
-
-0.1.0 / 2011-12-02
-==================
-
-  * Added: remove colors unless stderr isatty [TooTallNate]
-
-0.0.1 / 2010-01-03
-==================
-
-  * Initial release
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/Makefile b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/Makefile
deleted file mode 100644
index 5cf4a5962b8ba3..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-
-# get Makefile directory name: http://stackoverflow.com/a/5982798/376773
-THIS_MAKEFILE_PATH:=$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
-THIS_DIR:=$(shell cd $(dir $(THIS_MAKEFILE_PATH));pwd)
-
-# BIN directory
-BIN := $(THIS_DIR)/node_modules/.bin
-
-# applications
-NODE ?= $(shell which node)
-NPM ?= $(NODE) $(shell which npm)
-BROWSERIFY ?= $(NODE) $(BIN)/browserify
-
-all: dist/debug.js
-
-install: node_modules
-
-clean:
-	@rm -rf dist
-
-dist:
-	@mkdir -p $@
-
-dist/debug.js: node_modules browser.js debug.js dist
-	@$(BROWSERIFY) \
-		--standalone debug \
-		. > $@
-
-distclean: clean
-	@rm -rf node_modules
-
-node_modules: package.json
-	@NODE_ENV= $(NPM) install
-	@touch node_modules
-
-.PHONY: all install clean distclean
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/Readme.md b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/Readme.md
deleted file mode 100644
index b4f45e3cc6a33a..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/Readme.md
+++ /dev/null
@@ -1,188 +0,0 @@
-# debug
-
-  tiny node.js debugging utility modelled after node core's debugging technique.
-
-## Installation
-
-```bash
-$ npm install debug
-```
-
-## Usage
-
- With `debug` you simply invoke the exported function to generate your debug function, passing it a name which will determine if a noop function is returned, or a decorated `console.error`, so all of the `console` format string goodies you're used to work fine. A unique color is selected per-function for visibility.
-
-Example _app.js_:
-
-```js
-var debug = require('debug')('http')
-  , http = require('http')
-  , name = 'My App';
-
-// fake app
-
-debug('booting %s', name);
-
-http.createServer(function(req, res){
-  debug(req.method + ' ' + req.url);
-  res.end('hello\n');
-}).listen(3000, function(){
-  debug('listening');
-});
-
-// fake worker of some kind
-
-require('./worker');
-```
-
-Example _worker.js_:
-
-```js
-var debug = require('debug')('worker');
-
-setInterval(function(){
-  debug('doing some work');
-}, 1000);
-```
-
- The __DEBUG__ environment variable is then used to enable these based on space or comma-delimited names. Here are some examples:
-
-  ![debug http and worker](http://f.cl.ly/items/18471z1H402O24072r1J/Screenshot.png)
-
-  ![debug worker](http://f.cl.ly/items/1X413v1a3M0d3C2c1E0i/Screenshot.png)
-
-#### Windows note
-
- On Windows the environment variable is set using the `set` command.
-
- ```cmd
- set DEBUG=*,-not_this
- ```
-
-Then, run the program to be debugged as usual.
-
-## Millisecond diff
-
-  When actively developing an application it can be useful to see when the time spent between one `debug()` call and the next. Suppose for example you invoke `debug()` before requesting a resource, and after as well, the "+NNNms" will show you how much time was spent between calls.
-
-  ![](http://f.cl.ly/items/2i3h1d3t121M2Z1A3Q0N/Screenshot.png)
-
-  When stdout is not a TTY, `Date#toUTCString()` is used, making it more useful for logging the debug information as shown below:
-
-  ![](http://f.cl.ly/items/112H3i0e0o0P0a2Q2r11/Screenshot.png)
-
-## Conventions
-
- If you're using this in one or more of your libraries, you _should_ use the name of your library so that developers may toggle debugging as desired without guessing names. If you have more than one debuggers you _should_ prefix them with your library name and use ":" to separate features. For example "bodyParser" from Connect would then be "connect:bodyParser".
-
-## Wildcards
-
-  The `*` character may be used as a wildcard. Suppose for example your library has debuggers named "connect:bodyParser", "connect:compress", "connect:session", instead of listing all three with `DEBUG=connect:bodyParser,connect:compress,connect:session`, you may simply do `DEBUG=connect:*`, or to run everything using this module simply use `DEBUG=*`.
-
-  You can also exclude specific debuggers by prefixing them with a "-" character.  For example, `DEBUG=*,-connect:*` would include all debuggers except those starting with "connect:".
-
-## Browser support
-
-  Debug works in the browser as well, currently persisted by `localStorage`. Consider the situation shown below where you have `worker:a` and `worker:b`, and wish to debug both. Somewhere in the code on your page, include:
-
-```js
-window.myDebug = require("debug");
-```
-
-  ("debug" is a global object in the browser so we give this object a different name.) When your page is open in the browser, type the following in the console:
-
-```js
-myDebug.enable("worker:*")
-```
-
-  Refresh the page. Debug output will continue to be sent to the console until it is disabled by typing `myDebug.disable()` in the console.
-
-```js
-a = debug('worker:a');
-b = debug('worker:b');
-
-setInterval(function(){
-  a('doing some work');
-}, 1000);
-
-setInterval(function(){
-  b('doing some work');
-}, 1200);
-```
-
-#### Web Inspector Colors
-
-  Colors are also enabled on "Web Inspectors" that understand the `%c` formatting
-  option. These are WebKit web inspectors, Firefox ([since version
-  31](https://hacks.mozilla.org/2014/05/editable-box-model-multiple-selection-sublime-text-keys-much-more-firefox-developer-tools-episode-31/))
-  and the Firebug plugin for Firefox (any version).
-
-  Colored output looks something like:
-
-  ![](https://cloud.githubusercontent.com/assets/71256/3139768/b98c5fd8-e8ef-11e3-862a-f7253b6f47c6.png)
-
-### stderr vs stdout
-
-You can set an alternative logging method per-namespace by overriding the `log` method on a per-namespace or globally:
-
-Example _stdout.js_:
-
-```js
-var debug = require('debug');
-var error = debug('app:error');
-
-// by default stderr is used
-error('goes to stderr!');
-
-var log = debug('app:log');
-// set this namespace to log via console.log
-log.log = console.log.bind(console); // don't forget to bind to console!
-log('goes to stdout');
-error('still goes to stderr!');
-
-// set all output to go via console.info
-// overrides all per-namespace log settings
-debug.log = console.info.bind(console);
-error('now goes to stdout via console.info');
-log('still goes to stdout, but via console.info now');
-```
-
-### Save debug output to a file
-
-You can save all debug statements to a file by piping them.
-
-Example:
-
-```bash
-$ DEBUG_FD=3 node your-app.js 3> whatever.log
-```
-
-## Authors
-
- - TJ Holowaychuk
- - Nathan Rajlich
-
-## License
-
-(The MIT License)
-
-Copyright (c) 2014 TJ Holowaychuk &lt;tj@vision-media.ca&gt;
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/bower.json b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/bower.json
deleted file mode 100644
index 6af573ff5c260d..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/bower.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name": "visionmedia-debug",
-  "main": "dist/debug.js",
-  "version": "2.2.0",
-  "homepage": "https://github.com/visionmedia/debug",
-  "authors": [
-    "TJ Holowaychuk <tj@vision-media.ca>"
-  ],
-  "description": "visionmedia-debug",
-  "moduleType": [
-    "amd",
-    "es6",
-    "globals",
-    "node"
-  ],
-  "keywords": [
-    "visionmedia",
-    "debug"
-  ],
-  "license": "MIT",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ]
-}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/browser.js b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/browser.js
deleted file mode 100644
index 7c76452219939f..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/browser.js
+++ /dev/null
@@ -1,168 +0,0 @@
-
-/**
- * This is the web browser implementation of `debug()`.
- *
- * Expose `debug()` as the module.
- */
-
-exports = module.exports = require('./debug');
-exports.log = log;
-exports.formatArgs = formatArgs;
-exports.save = save;
-exports.load = load;
-exports.useColors = useColors;
-exports.storage = 'undefined' != typeof chrome
-               && 'undefined' != typeof chrome.storage
-                  ? chrome.storage.local
-                  : localstorage();
-
-/**
- * Colors.
- */
-
-exports.colors = [
-  'lightseagreen',
-  'forestgreen',
-  'goldenrod',
-  'dodgerblue',
-  'darkorchid',
-  'crimson'
-];
-
-/**
- * Currently only WebKit-based Web Inspectors, Firefox >= v31,
- * and the Firebug extension (any Firefox version) are known
- * to support "%c" CSS customizations.
- *
- * TODO: add a `localStorage` variable to explicitly enable/disable colors
- */
-
-function useColors() {
-  // is webkit? http://stackoverflow.com/a/16459606/376773
-  return ('WebkitAppearance' in document.documentElement.style) ||
-    // is firebug? http://stackoverflow.com/a/398120/376773
-    (window.console && (console.firebug || (console.exception && console.table))) ||
-    // is firefox >= v31?
-    // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
-    (navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31);
-}
-
-/**
- * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
- */
-
-exports.formatters.j = function(v) {
-  return JSON.stringify(v);
-};
-
-
-/**
- * Colorize log arguments if enabled.
- *
- * @api public
- */
-
-function formatArgs() {
-  var args = arguments;
-  var useColors = this.useColors;
-
-  args[0] = (useColors ? '%c' : '')
-    + this.namespace
-    + (useColors ? ' %c' : ' ')
-    + args[0]
-    + (useColors ? '%c ' : ' ')
-    + '+' + exports.humanize(this.diff);
-
-  if (!useColors) return args;
-
-  var c = 'color: ' + this.color;
-  args = [args[0], c, 'color: inherit'].concat(Array.prototype.slice.call(args, 1));
-
-  // the final "%c" is somewhat tricky, because there could be other
-  // arguments passed either before or after the %c, so we need to
-  // figure out the correct index to insert the CSS into
-  var index = 0;
-  var lastC = 0;
-  args[0].replace(/%[a-z%]/g, function(match) {
-    if ('%%' === match) return;
-    index++;
-    if ('%c' === match) {
-      // we only are interested in the *last* %c
-      // (the user may have provided their own)
-      lastC = index;
-    }
-  });
-
-  args.splice(lastC, 0, c);
-  return args;
-}
-
-/**
- * Invokes `console.log()` when available.
- * No-op when `console.log` is not a "function".
- *
- * @api public
- */
-
-function log() {
-  // this hackery is required for IE8/9, where
-  // the `console.log` function doesn't have 'apply'
-  return 'object' === typeof console
-    && console.log
-    && Function.prototype.apply.call(console.log, console, arguments);
-}
-
-/**
- * Save `namespaces`.
- *
- * @param {String} namespaces
- * @api private
- */
-
-function save(namespaces) {
-  try {
-    if (null == namespaces) {
-      exports.storage.removeItem('debug');
-    } else {
-      exports.storage.debug = namespaces;
-    }
-  } catch(e) {}
-}
-
-/**
- * Load `namespaces`.
- *
- * @return {String} returns the previously persisted debug modes
- * @api private
- */
-
-function load() {
-  var r;
-  try {
-    r = exports.storage.debug;
-  } catch(e) {}
-  return r;
-}
-
-/**
- * Enable namespaces listed in `localStorage.debug` initially.
- */
-
-exports.enable(load());
-
-/**
- * Localstorage attempts to return the localstorage.
- *
- * This is necessary because safari throws
- * when a user disables cookies/localstorage
- * and you attempt to access it.
- *
- * @return {LocalStorage}
- * @api private
- */
-
-function localstorage(){
-  try {
-    return window.localStorage;
-  } catch (e) {}
-}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/component.json b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/component.json
deleted file mode 100644
index ca1063724a4498..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/component.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "debug",
-  "repo": "visionmedia/debug",
-  "description": "small debugging utility",
-  "version": "2.2.0",
-  "keywords": [
-    "debug",
-    "log",
-    "debugger"
-  ],
-  "main": "browser.js",
-  "scripts": [
-    "browser.js",
-    "debug.js"
-  ],
-  "dependencies": {
-    "rauchg/ms.js": "0.7.1"
-  }
-}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/debug.js b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/debug.js
deleted file mode 100644
index 7571a86058aec0..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/debug.js
+++ /dev/null
@@ -1,197 +0,0 @@
-
-/**
- * This is the common logic for both the Node.js and web browser
- * implementations of `debug()`.
- *
- * Expose `debug()` as the module.
- */
-
-exports = module.exports = debug;
-exports.coerce = coerce;
-exports.disable = disable;
-exports.enable = enable;
-exports.enabled = enabled;
-exports.humanize = require('ms');
-
-/**
- * The currently active debug mode names, and names to skip.
- */
-
-exports.names = [];
-exports.skips = [];
-
-/**
- * Map of special "%n" handling functions, for the debug "format" argument.
- *
- * Valid key names are a single, lowercased letter, i.e. "n".
- */
-
-exports.formatters = {};
-
-/**
- * Previously assigned color.
- */
-
-var prevColor = 0;
-
-/**
- * Previous log timestamp.
- */
-
-var prevTime;
-
-/**
- * Select a color.
- *
- * @return {Number}
- * @api private
- */
-
-function selectColor() {
-  return exports.colors[prevColor++ % exports.colors.length];
-}
-
-/**
- * Create a debugger with the given `namespace`.
- *
- * @param {String} namespace
- * @return {Function}
- * @api public
- */
-
-function debug(namespace) {
-
-  // define the `disabled` version
-  function disabled() {
-  }
-  disabled.enabled = false;
-
-  // define the `enabled` version
-  function enabled() {
-
-    var self = enabled;
-
-    // set `diff` timestamp
-    var curr = +new Date();
-    var ms = curr - (prevTime || curr);
-    self.diff = ms;
-    self.prev = prevTime;
-    self.curr = curr;
-    prevTime = curr;
-
-    // add the `color` if not set
-    if (null == self.useColors) self.useColors = exports.useColors();
-    if (null == self.color && self.useColors) self.color = selectColor();
-
-    var args = Array.prototype.slice.call(arguments);
-
-    args[0] = exports.coerce(args[0]);
-
-    if ('string' !== typeof args[0]) {
-      // anything else let's inspect with %o
-      args = ['%o'].concat(args);
-    }
-
-    // apply any `formatters` transformations
-    var index = 0;
-    args[0] = args[0].replace(/%([a-z%])/g, function(match, format) {
-      // if we encounter an escaped % then don't increase the array index
-      if (match === '%%') return match;
-      index++;
-      var formatter = exports.formatters[format];
-      if ('function' === typeof formatter) {
-        var val = args[index];
-        match = formatter.call(self, val);
-
-        // now we need to remove `args[index]` since it's inlined in the `format`
-        args.splice(index, 1);
-        index--;
-      }
-      return match;
-    });
-
-    if ('function' === typeof exports.formatArgs) {
-      args = exports.formatArgs.apply(self, args);
-    }
-    var logFn = enabled.log || exports.log || console.log.bind(console);
-    logFn.apply(self, args);
-  }
-  enabled.enabled = true;
-
-  var fn = exports.enabled(namespace) ? enabled : disabled;
-
-  fn.namespace = namespace;
-
-  return fn;
-}
-
-/**
- * Enables a debug mode by namespaces. This can include modes
- * separated by a colon and wildcards.
- *
- * @param {String} namespaces
- * @api public
- */
-
-function enable(namespaces) {
-  exports.save(namespaces);
-
-  var split = (namespaces || '').split(/[\s,]+/);
-  var len = split.length;
-
-  for (var i = 0; i < len; i++) {
-    if (!split[i]) continue; // ignore empty strings
-    namespaces = split[i].replace(/\*/g, '.*?');
-    if (namespaces[0] === '-') {
-      exports.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));
-    } else {
-      exports.names.push(new RegExp('^' + namespaces + '$'));
-    }
-  }
-}
-
-/**
- * Disable debug output.
- *
- * @api public
- */
-
-function disable() {
-  exports.enable('');
-}
-
-/**
- * Returns true if the given mode name is enabled, false otherwise.
- *
- * @param {String} name
- * @return {Boolean}
- * @api public
- */
-
-function enabled(name) {
-  var i, len;
-  for (i = 0, len = exports.skips.length; i < len; i++) {
-    if (exports.skips[i].test(name)) {
-      return false;
-    }
-  }
-  for (i = 0, len = exports.names.length; i < len; i++) {
-    if (exports.names[i].test(name)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-/**
- * Coerce `val`.
- *
- * @param {Mixed} val
- * @return {Mixed}
- * @api private
- */
-
-function coerce(val) {
-  if (val instanceof Error) return val.stack || val.message;
-  return val;
-}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node.js b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node.js
deleted file mode 100644
index 1d392a81d6c785..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node.js
+++ /dev/null
@@ -1,209 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var tty = require('tty');
-var util = require('util');
-
-/**
- * This is the Node.js implementation of `debug()`.
- *
- * Expose `debug()` as the module.
- */
-
-exports = module.exports = require('./debug');
-exports.log = log;
-exports.formatArgs = formatArgs;
-exports.save = save;
-exports.load = load;
-exports.useColors = useColors;
-
-/**
- * Colors.
- */
-
-exports.colors = [6, 2, 3, 4, 5, 1];
-
-/**
- * The file descriptor to write the `debug()` calls to.
- * Set the `DEBUG_FD` env variable to override with another value. i.e.:
- *
- *   $ DEBUG_FD=3 node script.js 3>debug.log
- */
-
-var fd = parseInt(process.env.DEBUG_FD, 10) || 2;
-var stream = 1 === fd ? process.stdout :
-             2 === fd ? process.stderr :
-             createWritableStdioStream(fd);
-
-/**
- * Is stdout a TTY? Colored output is enabled when `true`.
- */
-
-function useColors() {
-  var debugColors = (process.env.DEBUG_COLORS || '').trim().toLowerCase();
-  if (0 === debugColors.length) {
-    return tty.isatty(fd);
-  } else {
-    return '0' !== debugColors
-        && 'no' !== debugColors
-        && 'false' !== debugColors
-        && 'disabled' !== debugColors;
-  }
-}
-
-/**
- * Map %o to `util.inspect()`, since Node doesn't do that out of the box.
- */
-
-var inspect = (4 === util.inspect.length ?
-  // node <= 0.8.x
-  function (v, colors) {
-    return util.inspect(v, void 0, void 0, colors);
-  } :
-  // node > 0.8.x
-  function (v, colors) {
-    return util.inspect(v, { colors: colors });
-  }
-);
-
-exports.formatters.o = function(v) {
-  return inspect(v, this.useColors)
-    .replace(/\s*\n\s*/g, ' ');
-};
-
-/**
- * Adds ANSI color escape codes if enabled.
- *
- * @api public
- */
-
-function formatArgs() {
-  var args = arguments;
-  var useColors = this.useColors;
-  var name = this.namespace;
-
-  if (useColors) {
-    var c = this.color;
-
-    args[0] = '  \u001b[3' + c + ';1m' + name + ' '
-      + '\u001b[0m'
-      + args[0] + '\u001b[3' + c + 'm'
-      + ' +' + exports.humanize(this.diff) + '\u001b[0m';
-  } else {
-    args[0] = new Date().toUTCString()
-      + ' ' + name + ' ' + args[0];
-  }
-  return args;
-}
-
-/**
- * Invokes `console.error()` with the specified arguments.
- */
-
-function log() {
-  return stream.write(util.format.apply(this, arguments) + '\n');
-}
-
-/**
- * Save `namespaces`.
- *
- * @param {String} namespaces
- * @api private
- */
-
-function save(namespaces) {
-  if (null == namespaces) {
-    // If you set a process.env field to null or undefined, it gets cast to the
-    // string 'null' or 'undefined'. Just delete instead.
-    delete process.env.DEBUG;
-  } else {
-    process.env.DEBUG = namespaces;
-  }
-}
-
-/**
- * Load `namespaces`.
- *
- * @return {String} returns the previously persisted debug modes
- * @api private
- */
-
-function load() {
-  return process.env.DEBUG;
-}
-
-/**
- * Copied from `node/src/node.js`.
- *
- * XXX: It's lame that node doesn't expose this API out-of-the-box. It also
- * relies on the undocumented `tty_wrap.guessHandleType()` which is also lame.
- */
-
-function createWritableStdioStream (fd) {
-  var stream;
-  var tty_wrap = process.binding('tty_wrap');
-
-  // Note stream._type is used for test-module-load-list.js
-
-  switch (tty_wrap.guessHandleType(fd)) {
-    case 'TTY':
-      stream = new tty.WriteStream(fd);
-      stream._type = 'tty';
-
-      // Hack to have stream not keep the event loop alive.
-      // See https://github.com/joyent/node/issues/1726
-      if (stream._handle && stream._handle.unref) {
-        stream._handle.unref();
-      }
-      break;
-
-    case 'FILE':
-      var fs = require('fs');
-      stream = new fs.SyncWriteStream(fd, { autoClose: false });
-      stream._type = 'fs';
-      break;
-
-    case 'PIPE':
-    case 'TCP':
-      var net = require('net');
-      stream = new net.Socket({
-        fd: fd,
-        readable: false,
-        writable: true
-      });
-
-      // FIXME Should probably have an option in net.Socket to create a
-      // stream from an existing fd which is writable only. But for now
-      // we'll just add this hack and set the `readable` member to false.
-      // Test: ./node test/fixtures/echo.js < /etc/passwd
-      stream.readable = false;
-      stream.read = null;
-      stream._type = 'pipe';
-
-      // FIXME Hack to have stream not keep the event loop alive.
-      // See https://github.com/joyent/node/issues/1726
-      if (stream._handle && stream._handle.unref) {
-        stream._handle.unref();
-      }
-      break;
-
-    default:
-      // Probably an error on in uv_guess_handle()
-      throw new Error('Implement me. Unknown stream file type!');
-  }
-
-  // For supporting legacy API we put the FD here.
-  stream.fd = fd;
-
-  stream._isStdio = true;
-
-  return stream;
-}
-
-/**
- * Enable namespaces listed in `process.env.DEBUG` initially.
- */
-
-exports.enable(load());
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/package.json b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/package.json
deleted file mode 100644
index 7e6d9fc59a1755..00000000000000
--- a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/package.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "name": "debug",
-  "version": "2.2.0",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/visionmedia/debug.git"
-  },
-  "description": "small debugging utility",
-  "keywords": [
-    "debug",
-    "log",
-    "debugger"
-  ],
-  "author": {
-    "name": "TJ Holowaychuk",
-    "email": "tj@vision-media.ca"
-  },
-  "contributors": [
-    {
-      "name": "Nathan Rajlich",
-      "email": "nathan@tootallnate.net",
-      "url": "http://n8.io"
-    }
-  ],
-  "license": "MIT",
-  "dependencies": {
-    "ms": "0.7.1"
-  },
-  "devDependencies": {
-    "browserify": "9.0.3",
-    "mocha": "*"
-  },
-  "main": "./node.js",
-  "browser": "./browser.js",
-  "component": {
-    "scripts": {
-      "debug/index.js": "browser.js",
-      "debug/debug.js": "debug.js"
-    }
-  },
-  "gitHead": "b38458422b5aa8aa6d286b10dfe427e8a67e2b35",
-  "bugs": {
-    "url": "https://github.com/visionmedia/debug/issues"
-  },
-  "homepage": "https://github.com/visionmedia/debug",
-  "_id": "debug@2.2.0",
-  "scripts": {},
-  "_shasum": "f87057e995b1a1f6ae6a4960664137bc56f039da",
-  "_from": "debug@*",
-  "_npmVersion": "2.7.4",
-  "_nodeVersion": "0.12.2",
-  "_npmUser": {
-    "name": "tootallnate",
-    "email": "nathan@tootallnate.net"
-  },
-  "maintainers": [
-    {
-      "name": "tjholowaychuk",
-      "email": "tj@vision-media.ca"
-    },
-    {
-      "name": "tootallnate",
-      "email": "nathan@tootallnate.net"
-    }
-  ],
-  "dist": {
-    "shasum": "f87057e995b1a1f6ae6a4960664137bc56f039da",
-    "tarball": "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/tar/package.json b/deps/npm/node_modules/node-gyp/node_modules/tar/package.json
index 7fab5394cd6ec2..c8bfe8fda9c690 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/tar/package.json
+++ b/deps/npm/node_modules/node-gyp/node_modules/tar/package.json
@@ -1,46 +1,66 @@
 {
+  "_args": [
+    [
+      "tar@^1.0.0",
+      "/Users/rebecca/code/npm/node_modules/node-gyp"
+    ]
+  ],
+  "_from": "tar@>=1.0.0 <2.0.0",
+  "_id": "tar@1.0.3",
+  "_inCache": true,
+  "_location": "/node-gyp/tar",
+  "_nodeVersion": "0.10.33",
+  "_npmUser": {
+    "email": "ogd@aoaioxxysz.net",
+    "name": "othiym23"
+  },
+  "_npmVersion": "2.1.10",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "tar",
+    "raw": "tar@^1.0.0",
+    "rawSpec": "^1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/node-gyp"
+  ],
+  "_resolved": "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz",
+  "_shasum": "15bcdab244fa4add44e4244a0176edb8aa9a2b44",
+  "_shrinkwrap": null,
+  "_spec": "tar@^1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "name": "tar",
-  "description": "tar for node",
-  "version": "1.0.3",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/node-tar.git"
-  },
-  "main": "tar.js",
-  "scripts": {
-    "test": "tap test/*.js"
+  "bugs": {
+    "url": "https://github.com/isaacs/node-tar/issues"
   },
   "dependencies": {
     "block-stream": "*",
     "fstream": "^1.0.2",
     "inherits": "2"
   },
+  "description": "tar for node",
   "devDependencies": {
     "graceful-fs": "^3.0.2",
+    "mkdirp": "^0.5.0",
     "rimraf": "1.x",
-    "tap": "0.x",
-    "mkdirp": "^0.5.0"
+    "tap": "0.x"
   },
-  "license": "BSD",
-  "gitHead": "f4151128c585da236c6b1e278b762ecaedc20c15",
-  "bugs": {
-    "url": "https://github.com/isaacs/node-tar/issues"
+  "directories": {},
+  "dist": {
+    "shasum": "15bcdab244fa4add44e4244a0176edb8aa9a2b44",
+    "tarball": "http://registry.npmjs.org/tar/-/tar-1.0.3.tgz"
   },
+  "gitHead": "f4151128c585da236c6b1e278b762ecaedc20c15",
   "homepage": "https://github.com/isaacs/node-tar",
-  "_id": "tar@1.0.3",
-  "_shasum": "15bcdab244fa4add44e4244a0176edb8aa9a2b44",
-  "_from": "tar@>=1.0.0 <2.0.0",
-  "_npmVersion": "2.1.10",
-  "_nodeVersion": "0.10.33",
-  "_npmUser": {
-    "name": "othiym23",
-    "email": "ogd@aoaioxxysz.net"
-  },
+  "license": "BSD",
+  "main": "tar.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -51,11 +71,14 @@
       "email": "ogd@aoaioxxysz.net"
     }
   ],
-  "dist": {
-    "shasum": "15bcdab244fa4add44e4244a0176edb8aa9a2b44",
-    "tarball": "http://registry.npmjs.org/tar/-/tar-1.0.3.tgz"
+  "name": "tar",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/node-tar.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.0.3"
 }
diff --git a/deps/npm/node_modules/node-gyp/package.json b/deps/npm/node_modules/node-gyp/package.json
index 76fc168f2d955d..6b0bef6e6222f6 100644
--- a/deps/npm/node_modules/node-gyp/package.json
+++ b/deps/npm/node_modules/node-gyp/package.json
@@ -1,32 +1,57 @@
 {
-  "name": "node-gyp",
-  "description": "Node.js native addon build tool",
-  "license": "MIT",
-  "keywords": [
-    "native",
-    "addon",
-    "module",
-    "c",
-    "c++",
-    "bindings",
-    "gyp"
+  "_args": [
+    [
+      "node-gyp@~3.0.1",
+      "/Users/rebecca/code/npm"
+    ]
   ],
-  "version": "3.0.3",
-  "installVersion": 9,
+  "_from": "node-gyp@>=3.0.1 <3.1.0",
+  "_id": "node-gyp@3.0.3",
+  "_inCache": true,
+  "_location": "/node-gyp",
+  "_nodeVersion": "4.0.0",
+  "_npmUser": {
+    "email": "rod@vagg.org",
+    "name": "rvagg"
+  },
+  "_npmVersion": "2.14.2",
+  "_phantomChildren": {
+    "block-stream": "0.0.8",
+    "brace-expansion": "1.1.0",
+    "fstream": "1.0.8",
+    "inflight": "1.0.4",
+    "inherits": "2.0.1",
+    "lru-cache": "2.6.5",
+    "once": "1.3.2",
+    "sigmund": "1.0.1"
+  },
+  "_requested": {
+    "name": "node-gyp",
+    "raw": "node-gyp@~3.0.1",
+    "rawSpec": "~3.0.1",
+    "scope": null,
+    "spec": ">=3.0.1 <3.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.0.3.tgz",
+  "_shasum": "9b004219f4fa9efbfd78c5fc674aa12e58fb8694",
+  "_shrinkwrap": null,
+  "_spec": "node-gyp@~3.0.1",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Nathan Rajlich",
     "email": "nathan@tootallnate.net",
+    "name": "Nathan Rajlich",
     "url": "http://tootallnate.net"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/nodejs/node-gyp.git"
-  },
-  "preferGlobal": true,
   "bin": {
     "node-gyp": "./bin/node-gyp.js"
   },
-  "main": "./lib/node-gyp.js",
+  "bugs": {
+    "url": "https://github.com/nodejs/node-gyp/issues"
+  },
   "dependencies": {
     "fstream": "^1.0.0",
     "glob": "3 || 4",
@@ -43,29 +68,33 @@
     "tar": "^1.0.0",
     "which": "1"
   },
-  "engines": {
-    "node": ">= 0.8.0"
-  },
+  "description": "Node.js native addon build tool",
   "devDependencies": {
     "tape": "~4.2.0"
   },
-  "scripts": {
-    "test": "tape test/test-*"
+  "directories": {},
+  "dist": {
+    "shasum": "9b004219f4fa9efbfd78c5fc674aa12e58fb8694",
+    "tarball": "http://registry.npmjs.org/node-gyp/-/node-gyp-3.0.3.tgz"
   },
-  "gitHead": "d6b03851d366c7fa78e7d2f57c61bb074ea45ea3",
-  "bugs": {
-    "url": "https://github.com/nodejs/node-gyp/issues"
+  "engines": {
+    "node": ">= 0.8.0"
   },
+  "gitHead": "d6b03851d366c7fa78e7d2f57c61bb074ea45ea3",
   "homepage": "https://github.com/nodejs/node-gyp",
-  "_id": "node-gyp@3.0.3",
-  "_shasum": "9b004219f4fa9efbfd78c5fc674aa12e58fb8694",
-  "_from": "node-gyp@3.0.3",
-  "_npmVersion": "2.14.2",
-  "_nodeVersion": "4.0.0",
-  "_npmUser": {
-    "name": "rvagg",
-    "email": "rod@vagg.org"
-  },
+  "installVersion": 9,
+  "installable": true,
+  "keywords": [
+    "addon",
+    "bindings",
+    "c",
+    "c++",
+    "gyp",
+    "module",
+    "native"
+  ],
+  "license": "MIT",
+  "main": "./lib/node-gyp.js",
   "maintainers": [
     {
       "name": "TooTallNate",
@@ -88,11 +117,15 @@
       "email": "nathan@tootallnate.net"
     }
   ],
-  "dist": {
-    "shasum": "9b004219f4fa9efbfd78c5fc674aa12e58fb8694",
-    "tarball": "http://registry.npmjs.org/node-gyp/-/node-gyp-3.0.3.tgz"
+  "name": "node-gyp",
+  "optionalDependencies": {},
+  "preferGlobal": true,
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/nodejs/node-gyp.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.0.3.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "tape test/test-*"
+  },
+  "version": "3.0.3"
 }
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore b/deps/npm/node_modules/node-uuid/.npmignore
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore
rename to deps/npm/node_modules/node-uuid/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/LICENSE.md b/deps/npm/node_modules/node-uuid/LICENSE.md
similarity index 96%
rename from deps/npm/node_modules/request/node_modules/node-uuid/LICENSE.md
rename to deps/npm/node_modules/node-uuid/LICENSE.md
index 652609b37e009c..a43093bf321f2b 100644
--- a/deps/npm/node_modules/request/node_modules/node-uuid/LICENSE.md
+++ b/deps/npm/node_modules/node-uuid/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c)  2010-2012 Robert Kieffer 
+Copyright (c)  2010-2012 Robert Kieffer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/README.md b/deps/npm/node_modules/node-uuid/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/node-uuid/README.md
rename to deps/npm/node_modules/node-uuid/README.md
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/benchmark/README.md b/deps/npm/node_modules/node-uuid/benchmark/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/node-uuid/benchmark/README.md
rename to deps/npm/node_modules/node-uuid/benchmark/README.md
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/benchmark/bench.gnu b/deps/npm/node_modules/node-uuid/benchmark/bench.gnu
similarity index 94%
rename from deps/npm/node_modules/request/node_modules/node-uuid/benchmark/bench.gnu
rename to deps/npm/node_modules/node-uuid/benchmark/bench.gnu
index a342fbbe04e9ac..fd597ab681ae10 100644
--- a/deps/npm/node_modules/request/node_modules/node-uuid/benchmark/bench.gnu
+++ b/deps/npm/node_modules/node-uuid/benchmark/bench.gnu
@@ -1,14 +1,14 @@
 #!/opt/local/bin/gnuplot -persist
 #
-#    
+#
 #    	G N U P L O T
 #    	Version 4.4 patchlevel 3
 #    	last modified March 2011
 #    	System: Darwin 10.8.0
-#    
+#
 #    	Copyright (C) 1986-1993, 1998, 2004, 2007-2010
 #    	Thomas Williams, Colin Kelley and many others
-#    
+#
 #    	gnuplot home:     http://www.gnuplot.info
 #    	faq, bugs, etc:   type "help seeking-assistance"
 #    	immediate help:   type "help"
@@ -17,7 +17,7 @@ set terminal postscript eps noenhanced defaultplex \
  leveldefault color colortext \
  solid linewidth 1.2 butt noclip \
  palfuncparam 2000,0.003 \
- "Helvetica" 14 
+ "Helvetica" 14
 set output 'bench.eps'
 unset clip points
 set clip one
@@ -38,7 +38,7 @@ set timefmt cb "%d/%m/%y,%H:%M"
 set boxwidth
 set style fill  empty border
 set style rectangle back fc lt -3 fillstyle   solid 1.00 border lt -1
-set style circle radius graph 0.02, first 0, 0 
+set style circle radius graph 0.02, first 0, 0
 set dummy x,y
 set format x "% g"
 set format y "% g"
@@ -50,7 +50,7 @@ set angles radians
 unset grid
 set key title ""
 set key outside left top horizontal Right noreverse enhanced autotitles columnhead nobox
-set key noinvert samplen 4 spacing 1 width 0 height 0 
+set key noinvert samplen 4 spacing 1 width 0 height 0
 set key maxcolumns 2 maxrows 0
 unset label
 unset arrow
@@ -107,10 +107,10 @@ set nox2tics
 set noy2tics
 set cbtics border in scale 1,0.5 mirror norotate  offset character 0, 0, 0
 set cbtics autofreq  norangelimit
-set title "" 
+set title ""
 set title  offset character 0, 0, 0 font "" norotate
-set timestamp bottom 
-set timestamp "" 
+set timestamp bottom
+set timestamp ""
 set timestamp  offset character 0, 0, 0 font "" norotate
 set rrange [ * : * ] noreverse nowriteback  # (currently [8.98847e+307:-8.98847e+307] )
 set autoscale rfixmin
@@ -124,9 +124,9 @@ set autoscale ufixmax
 set vrange [ * : * ] noreverse nowriteback  # (currently [-10.0000:10.0000] )
 set autoscale vfixmin
 set autoscale vfixmax
-set xlabel "" 
+set xlabel ""
 set xlabel  offset character 0, 0, 0 font "" textcolor lt -1 norotate
-set x2label "" 
+set x2label ""
 set x2label  offset character 0, 0, 0 font "" textcolor lt -1 norotate
 set xrange [ * : * ] noreverse nowriteback  # (currently [-0.150000:3.15000] )
 set autoscale xfixmin
@@ -134,9 +134,9 @@ set autoscale xfixmax
 set x2range [ * : * ] noreverse nowriteback  # (currently [0.00000:3.00000] )
 set autoscale x2fixmin
 set autoscale x2fixmax
-set ylabel "" 
+set ylabel ""
 set ylabel  offset character 0, 0, 0 font "" textcolor lt -1 rotate by -270
-set y2label "" 
+set y2label ""
 set y2label  offset character 0, 0, 0 font "" textcolor lt -1 rotate by -270
 set yrange [ 0.00000 : 1.90000e+06 ] noreverse nowriteback  # (currently [:] )
 set autoscale yfixmin
@@ -144,12 +144,12 @@ set autoscale yfixmax
 set y2range [ * : * ] noreverse nowriteback  # (currently [0.00000:1.90000e+06] )
 set autoscale y2fixmin
 set autoscale y2fixmax
-set zlabel "" 
+set zlabel ""
 set zlabel  offset character 0, 0, 0 font "" textcolor lt -1 norotate
 set zrange [ * : * ] noreverse nowriteback  # (currently [-10.0000:10.0000] )
 set autoscale zfixmin
 set autoscale zfixmax
-set cblabel "" 
+set cblabel ""
 set cblabel  offset character 0, 0, 0 font "" textcolor lt -1 rotate by -270
 set cbrange [ * : * ] noreverse nowriteback  # (currently [8.98847e+307:-8.98847e+307] )
 set autoscale cbfixmin
@@ -162,12 +162,12 @@ set tmargin  -1
 set pm3d explicit at s
 set pm3d scansautomatic
 set pm3d interpolate 1,1 flush begin noftriangles nohidden3d corners2color mean
-set palette positive nops_allcF maxcolors 0 gamma 1.5 color model RGB 
+set palette positive nops_allcF maxcolors 0 gamma 1.5 color model RGB
 set palette rgbformulae 7, 5, 15
 set colorbox default
 set colorbox vertical origin screen 0.9, 0.2, 0 size screen 0.05, 0.6, 0 front bdefault
-set loadpath 
-set fontpath 
+set loadpath
+set fontpath
 set fit noerrorvariables
 GNUTERM = "aqua"
 plot 'bench_results.txt' using 2:xticlabel(1) w lp lw 2, '' using 3:xticlabel(1) w lp lw 2, '' using 4:xticlabel(1) w lp lw 2, '' using 5:xticlabel(1) w lp lw 2, '' using 6:xticlabel(1) w lp lw 2, '' using 7:xticlabel(1) w lp lw 2, '' using 8:xticlabel(1) w lp lw 2, '' using 9:xticlabel(1) w lp lw 2
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/benchmark/bench.sh b/deps/npm/node_modules/node-uuid/benchmark/bench.sh
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/node-uuid/benchmark/bench.sh
rename to deps/npm/node_modules/node-uuid/benchmark/bench.sh
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/benchmark/benchmark-native.c b/deps/npm/node_modules/node-uuid/benchmark/benchmark-native.c
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/node-uuid/benchmark/benchmark-native.c
rename to deps/npm/node_modules/node-uuid/benchmark/benchmark-native.c
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/benchmark/benchmark.js b/deps/npm/node_modules/node-uuid/benchmark/benchmark.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/node-uuid/benchmark/benchmark.js
rename to deps/npm/node_modules/node-uuid/benchmark/benchmark.js
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/bin/uuid b/deps/npm/node_modules/node-uuid/bin/uuid
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/node-uuid/bin/uuid
rename to deps/npm/node_modules/node-uuid/bin/uuid
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/bower.json b/deps/npm/node_modules/node-uuid/bower.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/node-uuid/bower.json
rename to deps/npm/node_modules/node-uuid/bower.json
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/component.json b/deps/npm/node_modules/node-uuid/component.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/node-uuid/component.json
rename to deps/npm/node_modules/node-uuid/component.json
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/package.json b/deps/npm/node_modules/node-uuid/package.json
similarity index 61%
rename from deps/npm/node_modules/request/node_modules/node-uuid/package.json
rename to deps/npm/node_modules/node-uuid/package.json
index 4aa75044ada392..a95715dd6ed409 100644
--- a/deps/npm/node_modules/request/node_modules/node-uuid/package.json
+++ b/deps/npm/node_modules/node-uuid/package.json
@@ -1,15 +1,45 @@
 {
-  "name": "node-uuid",
-  "description": "Rigorous implementation of RFC4122 (v1 and v4) UUIDs.",
-  "url": "http://github.com/broofa/node-uuid",
-  "keywords": [
-    "uuid",
-    "guid",
-    "rfc4122"
+  "_args": [
+    [
+      "node-uuid@~1.4.0",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
+  ],
+  "_from": "node-uuid@>=1.4.0 <1.5.0",
+  "_id": "node-uuid@1.4.3",
+  "_inCache": true,
+  "_location": "/node-uuid",
+  "_npmUser": {
+    "email": "robert@broofa.com",
+    "name": "broofa"
+  },
+  "_npmVersion": "1.4.28",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "node-uuid",
+    "raw": "node-uuid@~1.4.0",
+    "rawSpec": "~1.4.0",
+    "scope": null,
+    "spec": ">=1.4.0 <1.5.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/request"
   ],
+  "_resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
+  "_shasum": "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9",
+  "_shrinkwrap": null,
+  "_spec": "node-uuid@~1.4.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
   "author": {
-    "name": "Robert Kieffer",
-    "email": "robert@broofa.com"
+    "email": "robert@broofa.com",
+    "name": "Robert Kieffer"
+  },
+  "bin": {
+    "uuid": "./bin/uuid"
+  },
+  "bugs": {
+    "url": "https://github.com/broofa/node-uuid/issues"
   },
   "contributors": [
     {
@@ -17,49 +47,44 @@
       "email": "dev@tavan.de"
     }
   ],
-  "bin": {
-    "uuid": "./bin/uuid"
-  },
-  "scripts": {
-    "test": "node test/test.js"
+  "dependencies": {},
+  "description": "Rigorous implementation of RFC4122 (v1 and v4) UUIDs.",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9",
+    "tarball": "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
   },
+  "gitHead": "886463c660a095dfebfa69603921a8d156fdb12c",
+  "homepage": "https://github.com/broofa/node-uuid",
+  "keywords": [
+    "guid",
+    "rfc4122",
+    "uuid"
+  ],
   "lib": ".",
-  "main": "./uuid.js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/broofa/node-uuid.git"
-  },
-  "version": "1.4.3",
   "licenses": [
     {
       "type": "MIT",
       "url": "https://raw.github.com/broofa/node-uuid/master/LICENSE.md"
     }
   ],
-  "gitHead": "886463c660a095dfebfa69603921a8d156fdb12c",
-  "bugs": {
-    "url": "https://github.com/broofa/node-uuid/issues"
-  },
-  "homepage": "https://github.com/broofa/node-uuid",
-  "_id": "node-uuid@1.4.3",
-  "_shasum": "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9",
-  "_from": "node-uuid@>=1.4.0 <1.5.0",
-  "_npmVersion": "1.4.28",
-  "_npmUser": {
-    "name": "broofa",
-    "email": "robert@broofa.com"
-  },
+  "main": "./uuid.js",
   "maintainers": [
     {
       "name": "broofa",
       "email": "robert@broofa.com"
     }
   ],
-  "dist": {
-    "shasum": "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9",
-    "tarball": "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
+  "name": "node-uuid",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/broofa/node-uuid.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "node test/test.js"
+  },
+  "url": "http://github.com/broofa/node-uuid",
+  "version": "1.4.3"
 }
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/test/compare_v1.js b/deps/npm/node_modules/node-uuid/test/compare_v1.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/node-uuid/test/compare_v1.js
rename to deps/npm/node_modules/node-uuid/test/compare_v1.js
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/test/test.html b/deps/npm/node_modules/node-uuid/test/test.html
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/node-uuid/test/test.html
rename to deps/npm/node_modules/node-uuid/test/test.html
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/test/test.js b/deps/npm/node_modules/node-uuid/test/test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/node-uuid/test/test.js
rename to deps/npm/node_modules/node-uuid/test/test.js
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/uuid.js b/deps/npm/node_modules/node-uuid/uuid.js
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/node-uuid/uuid.js
rename to deps/npm/node_modules/node-uuid/uuid.js
index 0a617697969af7..80ed720db3ed56 100644
--- a/deps/npm/node_modules/request/node_modules/node-uuid/uuid.js
+++ b/deps/npm/node_modules/node-uuid/uuid.js
@@ -230,7 +230,7 @@
   } else  if (typeof define === 'function' && define.amd) {
     // Publish as AMD module
     define(function() {return uuid;});
- 
+
 
   } else {
     // Publish as global (in browsers)
diff --git a/deps/npm/node_modules/nopt/package.json b/deps/npm/node_modules/nopt/package.json
index 618f93467e283f..e7272b70180748 100644
--- a/deps/npm/node_modules/nopt/package.json
+++ b/deps/npm/node_modules/nopt/package.json
@@ -1,38 +1,84 @@
 {
-  "name": "nopt",
-  "version": "3.0.4",
-  "description": "Option parsing for Node, supporting types, shorthands, etc. Used by npm.",
+  "_args": [
+    [
+      "nopt@~3.0.3",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "nopt@>=3.0.3 <3.1.0",
+  "_id": "nopt@3.0.4",
+  "_inCache": true,
+  "_location": "/nopt",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "email": "kat@sykosomatic.org",
+    "name": "zkat"
+  },
+  "_npmVersion": "2.14.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "nopt",
+    "raw": "nopt@~3.0.3",
+    "rawSpec": "~3.0.3",
+    "scope": null,
+    "spec": ">=3.0.3 <3.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/",
+    "/node-gyp"
+  ],
+  "_resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.4.tgz",
+  "_shasum": "dd63bc9c72a6e4e85b85cdc0ca314598facede5e",
+  "_shrinkwrap": null,
+  "_spec": "nopt@~3.0.3",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "main": "lib/nopt.js",
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/isaacs/nopt.git"
-  },
   "bin": {
     "nopt": "./bin/nopt.js"
   },
-  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/isaacs/nopt/issues"
+  },
   "dependencies": {
     "abbrev": "1"
   },
+  "description": "Option parsing for Node, supporting types, shorthands, etc. Used by npm.",
   "devDependencies": {
     "tap": "^1.2.0"
   },
-  "readme": "If you want to write an option parser, and have it be good, there are\ntwo ways to do it.  The Right Way, and the Wrong Way.\n\nThe Wrong Way is to sit down and write an option parser.  We've all done\nthat.\n\nThe Right Way is to write some complex configurable program with so many\noptions that you hit the limit of your frustration just trying to\nmanage them all, and defer it with duct-tape solutions until you see\nexactly to the core of the problem, and finally snap and write an\nawesome option parser.\n\nIf you want to write an option parser, don't write an option parser.\nWrite a package manager, or a source control system, or a service\nrestarter, or an operating system.  You probably won't end up with a\ngood one of those, but if you don't give up, and you are relentless and\ndiligent enough in your procrastination, you may just end up with a very\nnice option parser.\n\n## USAGE\n\n    // my-program.js\n    var nopt = require(\"nopt\")\n      , Stream = require(\"stream\").Stream\n      , path = require(\"path\")\n      , knownOpts = { \"foo\" : [String, null]\n                    , \"bar\" : [Stream, Number]\n                    , \"baz\" : path\n                    , \"bloo\" : [ \"big\", \"medium\", \"small\" ]\n                    , \"flag\" : Boolean\n                    , \"pick\" : Boolean\n                    , \"many1\" : [String, Array]\n                    , \"many2\" : [path]\n                    }\n      , shortHands = { \"foofoo\" : [\"--foo\", \"Mr. Foo\"]\n                     , \"b7\" : [\"--bar\", \"7\"]\n                     , \"m\" : [\"--bloo\", \"medium\"]\n                     , \"p\" : [\"--pick\"]\n                     , \"f\" : [\"--flag\"]\n                     }\n                 // everything is optional.\n                 // knownOpts and shorthands default to {}\n                 // arg list defaults to process.argv\n                 // slice defaults to 2\n      , parsed = nopt(knownOpts, shortHands, process.argv, 2)\n    console.log(parsed)\n\nThis would give you support for any of the following:\n\n```bash\n$ node my-program.js --foo \"blerp\" --no-flag\n{ \"foo\" : \"blerp\", \"flag\" : false }\n\n$ node my-program.js ---bar 7 --foo \"Mr. Hand\" --flag\n{ bar: 7, foo: \"Mr. Hand\", flag: true }\n\n$ node my-program.js --foo \"blerp\" -f -----p\n{ foo: \"blerp\", flag: true, pick: true }\n\n$ node my-program.js -fp --foofoo\n{ foo: \"Mr. Foo\", flag: true, pick: true }\n\n$ node my-program.js --foofoo -- -fp  # -- stops the flag parsing.\n{ foo: \"Mr. Foo\", argv: { remain: [\"-fp\"] } }\n\n$ node my-program.js --blatzk -fp # unknown opts are ok.\n{ blatzk: true, flag: true, pick: true }\n\n$ node my-program.js --blatzk=1000 -fp # but you need to use = if they have a value\n{ blatzk: 1000, flag: true, pick: true }\n\n$ node my-program.js --no-blatzk -fp # unless they start with \"no-\"\n{ blatzk: false, flag: true, pick: true }\n\n$ node my-program.js --baz b/a/z # known paths are resolved.\n{ baz: \"/Users/isaacs/b/a/z\" }\n\n# if Array is one of the types, then it can take many\n# values, and will always be an array.  The other types provided\n# specify what types are allowed in the list.\n\n$ node my-program.js --many1 5 --many1 null --many1 foo\n{ many1: [\"5\", \"null\", \"foo\"] }\n\n$ node my-program.js --many2 foo --many2 bar\n{ many2: [\"/path/to/foo\", \"path/to/bar\"] }\n```\n\nRead the tests at the bottom of `lib/nopt.js` for more examples of\nwhat this puppy can do.\n\n## Types\n\nThe following types are supported, and defined on `nopt.typeDefs`\n\n* String: A normal string.  No parsing is done.\n* path: A file system path.  Gets resolved against cwd if not absolute.\n* url: A url.  If it doesn't parse, it isn't accepted.\n* Number: Must be numeric.\n* Date: Must parse as a date. If it does, and `Date` is one of the options,\n  then it will return a Date object, not a string.\n* Boolean: Must be either `true` or `false`.  If an option is a boolean,\n  then it does not need a value, and its presence will imply `true` as\n  the value.  To negate boolean flags, do `--no-whatever` or `--whatever\n  false`\n* NaN: Means that the option is strictly not allowed.  Any value will\n  fail.\n* Stream: An object matching the \"Stream\" class in node.  Valuable\n  for use when validating programmatically.  (npm uses this to let you\n  supply any WriteStream on the `outfd` and `logfd` config options.)\n* Array: If `Array` is specified as one of the types, then the value\n  will be parsed as a list of options.  This means that multiple values\n  can be specified, and that the value will always be an array.\n\nIf a type is an array of values not on this list, then those are\nconsidered valid values.  For instance, in the example above, the\n`--bloo` option can only be one of `\"big\"`, `\"medium\"`, or `\"small\"`,\nand any other value will be rejected.\n\nWhen parsing unknown fields, `\"true\"`, `\"false\"`, and `\"null\"` will be\ninterpreted as their JavaScript equivalents.\n\nYou can also mix types and values, or multiple types, in a list.  For\ninstance `{ blah: [Number, null] }` would allow a value to be set to\neither a Number or null.  When types are ordered, this implies a\npreference, and the first type that can be used to properly interpret\nthe value will be used.\n\nTo define a new type, add it to `nopt.typeDefs`.  Each item in that\nhash is an object with a `type` member and a `validate` method.  The\n`type` member is an object that matches what goes in the type list.  The\n`validate` method is a function that gets called with `validate(data,\nkey, val)`.  Validate methods should assign `data[key]` to the valid\nvalue of `val` if it can be handled properly, or return boolean\n`false` if it cannot.\n\nYou can also call `nopt.clean(data, types, typeDefs)` to clean up a\nconfig object and remove its invalid properties.\n\n## Error Handling\n\nBy default, nopt outputs a warning to standard error when invalid values for\nknown options are found.  You can change this behavior by assigning a method\nto `nopt.invalidHandler`.  This method will be called with\nthe offending `nopt.invalidHandler(key, val, types)`.\n\nIf no `nopt.invalidHandler` is assigned, then it will console.error\nits whining.  If it is assigned to boolean `false` then the warning is\nsuppressed.\n\n## Abbreviations\n\nYes, they are supported.  If you define options like this:\n\n```javascript\n{ \"foolhardyelephants\" : Boolean\n, \"pileofmonkeys\" : Boolean }\n```\n\nThen this will work:\n\n```bash\nnode program.js --foolhar --pil\nnode program.js --no-f --pileofmon\n# etc.\n```\n\n## Shorthands\n\nShorthands are a hash of shorter option names to a snippet of args that\nthey expand to.\n\nIf multiple one-character shorthands are all combined, and the\ncombination does not unambiguously match any other option or shorthand,\nthen they will be broken up into their constituent parts.  For example:\n\n```json\n{ \"s\" : [\"--loglevel\", \"silent\"]\n, \"g\" : \"--global\"\n, \"f\" : \"--force\"\n, \"p\" : \"--parseable\"\n, \"l\" : \"--long\"\n}\n```\n\n```bash\nnpm ls -sgflp\n# just like doing this:\nnpm ls --loglevel silent --global --force --long --parseable\n```\n\n## The Rest of the args\n\nThe config object returned by nopt is given a special member called\n`argv`, which is an object with the following fields:\n\n* `remain`: The remaining args after all the parsing has occurred.\n* `original`: The args as they originally appeared.\n* `cooked`: The args after flags and shorthands are expanded.\n\n## Slicing\n\nNode programs are called with more or less the exact argv as it appears\nin C land, after the v8 and node-specific options have been plucked off.\nAs such, `argv[0]` is always `node` and `argv[1]` is always the\nJavaScript program being run.\n\nThat's usually not very useful to you.  So they're sliced off by\ndefault.  If you want them, then you can pass in `0` as the last\nargument, or any other number that you'd like to slice off the start of\nthe list.\n",
-  "readmeFilename": "README.md",
-  "gitHead": "f52626631ea1afef5a6dd9acf23ddd1466831a08",
-  "bugs": {
-    "url": "https://github.com/isaacs/nopt/issues"
+  "directories": {},
+  "dist": {
+    "shasum": "dd63bc9c72a6e4e85b85cdc0ca314598facede5e",
+    "tarball": "http://registry.npmjs.org/nopt/-/nopt-3.0.4.tgz"
   },
+  "gitHead": "f52626631ea1afef5a6dd9acf23ddd1466831a08",
   "homepage": "https://github.com/isaacs/nopt#readme",
-  "_id": "nopt@3.0.4",
-  "_shasum": "dd63bc9c72a6e4e85b85cdc0ca314598facede5e",
-  "_from": "nopt@3.0.4"
+  "installable": true,
+  "license": "ISC",
+  "main": "lib/nopt.js",
+  "maintainers": [
+    {
+      "name": "isaacs",
+      "email": "isaacs@npmjs.com"
+    },
+    {
+      "name": "zkat",
+      "email": "kat@sykosomatic.org"
+    }
+  ],
+  "name": "nopt",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/isaacs/nopt.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "3.0.4"
 }
diff --git a/deps/npm/node_modules/normalize-git-url/package.json b/deps/npm/node_modules/normalize-git-url/package.json
index b2dc3d910a907a..9028655064b34b 100644
--- a/deps/npm/node_modules/normalize-git-url/package.json
+++ b/deps/npm/node_modules/normalize-git-url/package.json
@@ -1,42 +1,89 @@
 {
-  "name": "normalize-git-url",
-  "version": "3.0.1",
-  "description": "Normalizes Git URLs. For npm, but you can use it too.",
-  "main": "normalize-git-url.js",
-  "directories": {
-    "test": "test"
+  "_args": [
+    [
+      "normalize-git-url@~3.0.1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "normalize-git-url@>=3.0.1 <3.1.0",
+  "_id": "normalize-git-url@3.0.1",
+  "_inCache": true,
+  "_location": "/normalize-git-url",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "email": "kat@sykosomatic.org",
+    "name": "zkat"
+  },
+  "_npmVersion": "3.1.2",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "normalize-git-url",
+    "raw": "normalize-git-url@~3.0.1",
+    "rawSpec": "~3.0.1",
+    "scope": null,
+    "spec": ">=3.0.1 <3.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/normalize-git-url/-/normalize-git-url-3.0.1.tgz",
+  "_shasum": "d40d419d05a15870271e50534dbb7b8ccd9b0a5c",
+  "_shrinkwrap": null,
+  "_spec": "normalize-git-url@~3.0.1",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "ogd@aoaioxxysz.net",
+    "name": "Forrest L Norvell"
+  },
+  "bugs": {
+    "url": "https://github.com/npm/normalize-git-url/issues"
   },
   "dependencies": {},
+  "description": "Normalizes Git URLs. For npm, but you can use it too.",
   "devDependencies": {
     "tap": "^1.1.0"
   },
-  "scripts": {
-    "test": "tap test/*.js"
+  "directories": {
+    "test": "test"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/normalize-git-url.git"
+  "dist": {
+    "shasum": "d40d419d05a15870271e50534dbb7b8ccd9b0a5c",
+    "tarball": "http://registry.npmjs.org/normalize-git-url/-/normalize-git-url-3.0.1.tgz"
   },
+  "gitHead": "8393cd4345e404eb6ad2ff6853dcc8287807ca22",
+  "homepage": "https://github.com/npm/normalize-git-url",
   "keywords": [
     "git",
     "github",
-    "url",
     "normalize",
-    "npm"
+    "npm",
+    "url"
   ],
-  "author": {
-    "name": "Forrest L Norvell",
-    "email": "ogd@aoaioxxysz.net"
-  },
   "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/npm/normalize-git-url/issues"
+  "main": "normalize-git-url.js",
+  "maintainers": [
+    {
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
+    },
+    {
+      "name": "iarna",
+      "email": "me@re-becca.org"
+    },
+    {
+      "name": "zkat",
+      "email": "kat@sykosomatic.org"
+    }
+  ],
+  "name": "normalize-git-url",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/normalize-git-url.git"
   },
-  "homepage": "https://github.com/npm/normalize-git-url",
-  "readme": "# normalize-git-url\n\nYou have a bunch of Git URLs. You want to convert them to a canonical\nrepresentation, probably for use inside npm so that it doesn't end up creating\na bunch of superfluous cached origins. You use this package.\n\n## Usage\n\n```javascript\nvar ngu = require('normalize-git-url');\nvar normalized = ngu(\"git+ssh://git@github.com:organization/repo.git#hashbrowns\")\n// get back:\n// {\n//   url : \"ssh://git@github.com/organization/repo.git\",\n//   branch : \"hashbrowns\" // did u know hashbrowns are delicious?\n// }\n```\n\n## API\n\nThere's just the one function, and all it takes is a single parameter, a non-normalized Git URL.\n\n### normalizeGitUrl(url)\n\n* `url` {String} The Git URL (very loosely speaking) to be normalized.\n\nReturns an object with the following format:\n\n* `url` {String} The normalized URL.\n* `branch` {String} The treeish to be checked out once the repo at `url` is\n  cloned. It doesn't have to be a branch, but it's a lot easier to intuit what\n  the output is for with that name.\n\n## Limitations\n\nRight now this doesn't try to special-case GitHub too much -- it doesn't ensure\nthat `.git` is added to the end of URLs, it doesn't prefer `https:` over\n`http:` or `ssh:`, it doesn't deal with redirects, and it doesn't try to\nresolve symbolic names to treeish hashcodes. For now, it just tries to account\nfor minor differences in representation.\n",
-  "readmeFilename": "README.md",
-  "gitHead": "8393cd4345e404eb6ad2ff6853dcc8287807ca22",
-  "_id": "normalize-git-url@3.0.1",
-  "_shasum": "d40d419d05a15870271e50534dbb7b8ccd9b0a5c",
-  "_from": "normalize-git-url@latest"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "3.0.1"
 }
diff --git a/deps/npm/node_modules/normalize-package-data/package.json b/deps/npm/node_modules/normalize-package-data/package.json
index 464b0092769317..762dd8e2edd0cf 100644
--- a/deps/npm/node_modules/normalize-package-data/package.json
+++ b/deps/npm/node_modules/normalize-package-data/package.json
@@ -1,53 +1,112 @@
 {
-  "name": "normalize-package-data",
-  "version": "2.3.4",
-  "author": {
-    "name": "Meryn Stol",
-    "email": "merynstol@gmail.com"
+  "_args": [
+    [
+      "normalize-package-data@~2.3.3",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "normalize-package-data@>=2.3.3 <2.4.0",
+  "_id": "normalize-package-data@2.3.4",
+  "_inCache": true,
+  "_location": "/normalize-package-data",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "email": "kat@sykosomatic.org",
+    "name": "zkat"
   },
-  "description": "Normalizes data that can be found in package.json files.",
-  "license": "BSD-2-Clause",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/npm/normalize-package-data.git"
+  "_npmVersion": "2.14.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "normalize-package-data",
+    "raw": "normalize-package-data@~2.3.3",
+    "rawSpec": "~2.3.3",
+    "scope": null,
+    "spec": ">=2.3.3 <2.4.0",
+    "type": "range"
   },
-  "main": "lib/normalize.js",
-  "scripts": {
-    "test": "tap test/*.js"
+  "_requiredBy": [
+    "/",
+    "/npm-registry-client",
+    "/read-package-json"
+  ],
+  "_resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.4.tgz",
+  "_shasum": "b92233ce6ef04fbd6bc0c05dead155af33a623e0",
+  "_shrinkwrap": null,
+  "_spec": "normalize-package-data@~2.3.3",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "merynstol@gmail.com",
+    "name": "Meryn Stol"
   },
+  "bugs": {
+    "url": "https://github.com/npm/normalize-package-data/issues"
+  },
+  "contributors": [
+    {
+      "name": "Isaac Z. Schlueter",
+      "email": "i@izs.me"
+    },
+    {
+      "name": "Meryn Stol",
+      "email": "merynstol@gmail.com"
+    },
+    {
+      "name": "Robert Kowalski",
+      "email": "rok@kowalski.gd"
+    }
+  ],
   "dependencies": {
     "hosted-git-info": "^2.0.2",
     "is-builtin-module": "^1.0.0",
     "semver": "2 || 3 || 4 || 5",
     "validate-npm-package-license": "^3.0.1"
   },
+  "description": "Normalizes data that can be found in package.json files.",
   "devDependencies": {
     "async": "~0.9.0",
     "tap": "^1.1.0",
     "underscore": "~1.4.4"
   },
-  "contributors": [
+  "directories": {},
+  "dist": {
+    "shasum": "b92233ce6ef04fbd6bc0c05dead155af33a623e0",
+    "tarball": "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.4.tgz"
+  },
+  "gitHead": "0aa15b23116f2dfd086f1ed6bf213cbb7e7490dd",
+  "homepage": "https://github.com/npm/normalize-package-data#readme",
+  "installable": true,
+  "license": "BSD-2-Clause",
+  "main": "lib/normalize.js",
+  "maintainers": [
     {
-      "name": "Isaac Z. Schlueter",
-      "email": "i@izs.me"
+      "name": "iarna",
+      "email": "me@re-becca.org"
     },
     {
-      "name": "Meryn Stol",
+      "name": "isaacs",
+      "email": "isaacs@npmjs.com"
+    },
+    {
+      "name": "meryn",
       "email": "merynstol@gmail.com"
     },
     {
-      "name": "Robert Kowalski",
-      "email": "rok@kowalski.gd"
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
+    },
+    {
+      "name": "zkat",
+      "email": "kat@sykosomatic.org"
     }
   ],
-  "readme": "# normalize-package-data [![Build Status](https://travis-ci.org/npm/normalize-package-data.png?branch=master)](https://travis-ci.org/npm/normalize-package-data)\n\nnormalize-package data exports a function that normalizes package metadata. This data is typically found in a package.json file, but in principle could come from any source - for example the npm registry.\n\nnormalize-package-data is used by [read-package-json](https://npmjs.org/package/read-package-json) to normalize the data it reads from a package.json file. In turn, read-package-json is used by [npm](https://npmjs.org/package/npm) and various npm-related tools.\n\n## Installation\n\n```\nnpm install normalize-package-data\n```\n\n## Usage\n\nBasic usage is really simple. You call the function that normalize-package-data exports. Let's call it `normalizeData`.\n\n```javascript\nnormalizeData = require('normalize-package-data')\npackageData = fs.readFileSync(\"package.json\")\nnormalizeData(packageData)\n// packageData is now normalized\n```\n\n#### Strict mode\n\nYou may activate strict validation by passing true as the second argument.\n\n```javascript\nnormalizeData = require('normalize-package-data')\npackageData = fs.readFileSync(\"package.json\")\nwarnFn = function(msg) { console.error(msg) }\nnormalizeData(packageData, true)\n// packageData is now normalized\n```\n\nIf strict mode is activated, only Semver 2.0 version strings are accepted. Otherwise, Semver 1.0 strings are accepted as well. Packages must have a name, and the name field must not have contain leading or trailing whitespace.\n\n#### Warnings\n\nOptionally, you may pass a \"warning\" function. It gets called whenever the `normalizeData` function encounters something that doesn't look right. It indicates less than perfect input data.\n\n```javascript\nnormalizeData = require('normalize-package-data')\npackageData = fs.readFileSync(\"package.json\")\nwarnFn = function(msg) { console.error(msg) }\nnormalizeData(packageData, warnFn)\n// packageData is now normalized. Any number of warnings may have been logged.\n```\n\nYou may combine strict validation with warnings by passing `true` as the second argument, and `warnFn` as third.\n\nWhen `private` field is set to `true`, warnings will be suppressed.\n\n### Potential exceptions\n\nIf the supplied data has an invalid name or version vield, `normalizeData` will throw an error. Depending on where you call `normalizeData`, you may want to catch these errors so can pass them to a callback.\n\n## What normalization (currently) entails\n\n* The value of `name` field gets trimmed (unless in strict mode).\n* The value of the `version` field gets cleaned by `semver.clean`. See [documentation for the semver module](https://github.com/isaacs/node-semver).\n* If `name` and/or `version` fields are missing, they are set to empty strings.\n* If `files` field is not an array, it will be removed.\n* If `bin` field is a string, then `bin` field will become an object with `name` set to the value of the `name` field, and `bin` set to the original string value.\n* If `man` field is a string, it will become an array with the original string as its sole member.\n* If `keywords` field is string, it is considered to be a list of keywords separated by one or more white-space characters. It gets converted to an array by splitting on `\\s+`.\n* All people fields (`author`, `maintainers`, `contributors`) get converted into objects with name, email and url properties.\n* If `bundledDependencies` field (a typo) exists and `bundleDependencies` field does not, `bundledDependencies` will get renamed to `bundleDependencies`.\n* If the value of any of the dependencies fields  (`dependencies`, `devDependencies`, `optionalDependencies`) is a string, it gets converted into an object with familiar `name=>value` pairs.\n* The values in `optionalDependencies` get added to `dependencies`. The `optionalDependencies` array is left untouched.\n* As of v2: Dependencies that point at known hosted git providers (currently: github, bitbucket, gitlab) will have their URLs canonicalized, but protocols will be preserved.\n* As of v2: Dependencies that use shortcuts for hosted git providers (`org/proj`, `github:org/proj`, `bitbucket:org/proj`, `gitlab:org/proj`, `gist:docid`) will have the shortcut left in place. (In the case of github, the `org/proj` form will be expanded to `github:org/proj`.) THIS MARKS A BREAKING CHANGE FROM V1, where the shorcut was previously expanded to a URL.\n* If `description` field does not exist, but `readme` field does, then (more or less) the first paragraph of text that's found in the readme is taken as value for `description`.\n* If `repository` field is a string, it will become an object with `url` set to the original string value, and `type` set to `\"git\"`.\n* If `repository.url` is not a valid url, but in the style of \"[owner-name]/[repo-name]\", `repository.url` will be set to git+https://github.com/[owner-name]/[repo-name].git\n* If `bugs` field is a string, the value of `bugs` field is changed into an object with `url` set to the original string value.\n* If `bugs` field does not exist, but `repository` field points to a repository hosted on GitHub, the value of the `bugs` field gets set to an url in the form of https://github.com/[owner-name]/[repo-name]/issues . If the repository field points to a GitHub Gist repo url, the associated http url is chosen.\n* If `bugs` field is an object, the resulting value only has email and url properties. If email and url properties are not strings, they are ignored. If no valid values for either email or url is found, bugs field will be removed.\n* If `homepage` field is not a string, it will be removed.\n* If the url in the `homepage` field does not specify a protocol, then http is assumed. For example, `myproject.org` will be changed to `http://myproject.org`.\n* If `homepage` field does not exist, but `repository` field points to a repository hosted on GitHub, the value of the `homepage` field gets set to an url in the form of https://github.com/[owner-name]/[repo-name]/ . If the repository field points to a GitHub Gist repo url, the associated http url is chosen.\n\n### Rules for name field\n\nIf `name` field is given, the value of the name field must be a string. The string may not:\n\n* start with a period.\n* contain the following characters: `/@\\s+%`\n* contain and characters that would need to be encoded for use in urls.\n* resemble the word `node_modules` or `favicon.ico` (case doesn't matter).\n\n### Rules for version field\n\nIf `version` field is given, the value of the version field must be a valid *semver* string, as determined by the `semver.valid` method. See [documentation for the semver module](https://github.com/isaacs/node-semver).\n\n### Rules for license field\n\nThe `license` field should be a valid *SDPDX license expression* or one of the special values allowed by [validate-npm-package-license](https://npmjs.com/packages/validate-npm-package-license). See [documentation for the license field in package.json](https://docs.npmjs.com/files/package.json#license).\n\n## Credits\n\nThis package contains code based on read-package-json written by Isaac Z. Schlueter. Used with permisson.\n\n## License\n\nnormalize-package-data is released under the [BSD 2-Clause License](http://opensource.org/licenses/MIT).  \nCopyright (c) 2013 Meryn Stol  \n",
-  "readmeFilename": "README.md",
-  "gitHead": "0aa15b23116f2dfd086f1ed6bf213cbb7e7490dd",
-  "bugs": {
-    "url": "https://github.com/npm/normalize-package-data/issues"
+  "name": "normalize-package-data",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/npm/normalize-package-data.git"
   },
-  "homepage": "https://github.com/npm/normalize-package-data#readme",
-  "_id": "normalize-package-data@2.3.4",
-  "_shasum": "b92233ce6ef04fbd6bc0c05dead155af33a623e0",
-  "_from": "normalize-package-data@2.3.4"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "2.3.4"
 }
diff --git a/deps/npm/node_modules/npm-cache-filename/package.json b/deps/npm/node_modules/npm-cache-filename/package.json
index b2431b96c2f688..882017f225381f 100644
--- a/deps/npm/node_modules/npm-cache-filename/package.json
+++ b/deps/npm/node_modules/npm-cache-filename/package.json
@@ -1,43 +1,59 @@
 {
-  "name": "npm-cache-filename",
-  "version": "1.0.2",
-  "description": "Given a cache folder and url, return the appropriate cache folder.",
-  "main": "index.js",
-  "dependencies": {},
-  "devDependencies": {
-    "tap": "^1.2.0"
-  },
-  "scripts": {
-    "test": "tap test.js"
+  "_args": [
+    [
+      "npm-cache-filename@~1.0.1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "npm-cache-filename@>=1.0.1 <1.1.0",
+  "_id": "npm-cache-filename@1.0.2",
+  "_inCache": true,
+  "_location": "/npm-cache-filename",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "email": "kat@sykosomatic.org",
+    "name": "zkat"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/npm/npm-cache-filename.git"
+  "_npmVersion": "2.12.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "npm-cache-filename",
+    "raw": "npm-cache-filename@~1.0.1",
+    "rawSpec": "~1.0.1",
+    "scope": null,
+    "spec": ">=1.0.1 <1.1.0",
+    "type": "range"
   },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz",
+  "_shasum": "ded306c5b0bfc870a9e9faf823bc5f283e05ae11",
+  "_shrinkwrap": null,
+  "_spec": "npm-cache-filename@~1.0.1",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "license": "ISC",
   "bugs": {
     "url": "https://github.com/npm/npm-cache-filename/issues"
   },
-  "homepage": "https://github.com/npm/npm-cache-filename",
-  "gitHead": "b7eef12919fdf544a3b83bba73093f7268c40c1e",
-  "_id": "npm-cache-filename@1.0.2",
-  "_shasum": "ded306c5b0bfc870a9e9faf823bc5f283e05ae11",
-  "_from": "npm-cache-filename@1.0.2",
-  "_npmVersion": "2.12.1",
-  "_nodeVersion": "2.2.2",
-  "_npmUser": {
-    "name": "zkat",
-    "email": "kat@sykosomatic.org"
+  "dependencies": {},
+  "description": "Given a cache folder and url, return the appropriate cache folder.",
+  "devDependencies": {
+    "tap": "^1.2.0"
   },
+  "directories": {},
   "dist": {
     "shasum": "ded306c5b0bfc870a9e9faf823bc5f283e05ae11",
     "tarball": "http://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"
   },
+  "gitHead": "b7eef12919fdf544a3b83bba73093f7268c40c1e",
+  "homepage": "https://github.com/npm/npm-cache-filename",
+  "license": "ISC",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -52,6 +68,14 @@
       "email": "kat@sykosomatic.org"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"
+  "name": "npm-cache-filename",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/npm/npm-cache-filename.git"
+  },
+  "scripts": {
+    "test": "tap test.js"
+  },
+  "version": "1.0.2"
 }
diff --git a/deps/npm/node_modules/npm-install-checks/index.js b/deps/npm/node_modules/npm-install-checks/index.js
index 10f214fa931e97..d7c3360e4c6a29 100644
--- a/deps/npm/node_modules/npm-install-checks/index.js
+++ b/deps/npm/node_modules/npm-install-checks/index.js
@@ -6,7 +6,6 @@ var semver = require("semver")
 exports.checkEngine = checkEngine
 function checkEngine (target, npmVer, nodeVer, force, strict, cb) {
   var nodev = force ? null : nodeVer
-    , strict = strict || target.engineStrict
     , eng = target.engines
   if (!eng) return cb()
   if (nodev && eng.node && !semver.satisfies(nodev, eng.node)
diff --git a/deps/npm/node_modules/npm-install-checks/package.json b/deps/npm/node_modules/npm-install-checks/package.json
index 3e7203c6fa549d..a207b2b94e91c7 100644
--- a/deps/npm/node_modules/npm-install-checks/package.json
+++ b/deps/npm/node_modules/npm-install-checks/package.json
@@ -1,41 +1,93 @@
 {
-  "name": "npm-install-checks",
-  "version": "1.0.6",
-  "description": "checks that npm runs during the installation of a module",
-  "main": "index.js",
+  "_args": [
+    [
+      "npm-install-checks@~2.0.0",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "npm-install-checks@>=2.0.0 <2.1.0",
+  "_id": "npm-install-checks@2.0.1",
+  "_inCache": true,
+  "_location": "/npm-install-checks",
+  "_nodeVersion": "4.0.0",
+  "_npmUser": {
+    "email": "me@re-becca.org",
+    "name": "iarna"
+  },
+  "_npmVersion": "3.3.4",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "npm-install-checks",
+    "raw": "npm-install-checks@~2.0.0",
+    "rawSpec": "~2.0.0",
+    "scope": null,
+    "spec": ">=2.0.0 <2.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_shasum": "a93540b53f04fa9d916d2733d6541f6db7d88e46",
+  "_shrinkwrap": null,
+  "_spec": "npm-install-checks@~2.0.0",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "rok@kowalski.gd",
+    "name": "Robert Kowalski"
+  },
+  "bugs": {
+    "url": "https://github.com/npm/npm-install-checks/issues"
+  },
   "dependencies": {
     "npmlog": "0.1 || 1",
     "semver": "^2.3.0 || 3.x || 4 || 5"
   },
+  "description": "checks that npm runs during the installation of a module",
   "devDependencies": {
     "mkdirp": "~0.3.5",
     "rimraf": "~2.2.5",
     "tap": "^1.2.0"
   },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/npm/npm-install-checks.git"
+  "directories": {},
+  "dist": {
+    "shasum": "a93540b53f04fa9d916d2733d6541f6db7d88e46",
+    "tarball": "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-2.0.1.tgz"
   },
+  "gitHead": "1e9474f30490cd7621e976e91fa611d35e644f64",
   "homepage": "https://github.com/npm/npm-install-checks",
+  "installable": true,
   "keywords": [
-    "npm,",
-    "install"
+    "install",
+    "npm,"
   ],
-  "author": {
-    "name": "Robert Kowalski",
-    "email": "rok@kowalski.gd"
-  },
   "license": "BSD-2-Clause",
-  "bugs": {
-    "url": "https://github.com/npm/npm-install-checks/issues"
+  "main": "index.js",
+  "maintainers": [
+    {
+      "name": "robertkowalski",
+      "email": "rok@kowalski.gd"
+    },
+    {
+      "name": "isaacs",
+      "email": "isaacs@npmjs.com"
+    },
+    {
+      "name": "iarna",
+      "email": "me@re-becca.org"
+    },
+    {
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
+    }
+  ],
+  "name": "npm-install-checks",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/npm/npm-install-checks.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "readme": "# npm-install-checks\n\nA package that contains checks that npm runs during the installation.\n\n## API\n\n### .checkEngine(target, npmVer, nodeVer, force, strict, cb)\nCheck if node/npm version is supported by the package.\n\nError type: `ENOTSUP`\n\n### .checkPlatform(target, force, cb)\nCheck if OS/Arch is supported by the package.\n\nError type: `EBADPLATFORM`\n\n### .checkCycle(target, ancestors, cb)\nCheck for cyclic dependencies.\n\nError type: `ECYCLE`\n\n### .checkGit(folder, cb)\nCheck if a folder is a .git folder.\n\nError type: `EISGIT`\n",
-  "readmeFilename": "README.md",
-  "gitHead": "f28aebca7f5df0ddb13161b0f04d069004f6c367",
-  "_id": "npm-install-checks@1.0.6",
-  "_shasum": "8d4c1e852806e4e2d66601ab787be5841550d0cb",
-  "_from": "npm-install-checks@>=1.0.6 <1.1.0"
+  "version": "2.0.1"
 }
diff --git a/deps/npm/node_modules/npm-install-checks/test/check-engine.js b/deps/npm/node_modules/npm-install-checks/test/check-engine.js
index a16b13d7dbd8fe..c89ec5398d7acc 100644
--- a/deps/npm/node_modules/npm-install-checks/test/check-engine.js
+++ b/deps/npm/node_modules/npm-install-checks/test/check-engine.js
@@ -18,16 +18,16 @@ test("node version too old", function (t) {
 })
 
 test("npm version too old", function (t) {
-  var target = { engines: { npm: "1.3.6" }}
-    c(target, "1.4.2", "0.2.1", false, true, function (err) {
+  var target = { engines: { npm: "^1.4.6" }}
+    c(target, "1.3.2", "0.2.1", false, true, function (err) {
       t.ok(err, "returns an error")
-      t.equals(err.required.npm, "1.3.6")
+      t.equals(err.required.npm, "^1.4.6")
       t.end()
     })
 })
 
-test("strict=false does not return an error", function (t) {
-  var target = { engines: { npm: "1.3.6" }}
+test("strict=false w/engineStrict json does not return an error", function (t) {
+  var target = { engines: { npm: "1.3.6" }, engineStrict: true }
   c(target, "1.4.2", "0.2.1", false, false, function (err) {
     t.notOk(err, "returns no error")
     t.end()
diff --git a/deps/npm/node_modules/npm-package-arg/package.json b/deps/npm/node_modules/npm-package-arg/package.json
index 9caed85e739668..211498c8b0c84f 100644
--- a/deps/npm/node_modules/npm-package-arg/package.json
+++ b/deps/npm/node_modules/npm-package-arg/package.json
@@ -1,39 +1,89 @@
 {
-  "name": "npm-package-arg",
-  "version": "4.0.2",
-  "description": "Parse the things that can be arguments to `npm install`",
-  "main": "npa.js",
-  "directories": {
-    "test": "test"
+  "_args": [
+    [
+      "npm-package-arg@~4.0.2",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "npm-package-arg@>=4.0.2 <4.1.0",
+  "_id": "npm-package-arg@4.0.2",
+  "_inCache": true,
+  "_location": "/npm-package-arg",
+  "_nodeVersion": "2.3.1",
+  "_npmUser": {
+    "email": "ogd@aoaioxxysz.net",
+    "name": "othiym23"
+  },
+  "_npmVersion": "2.13.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "npm-package-arg",
+    "raw": "npm-package-arg@~4.0.2",
+    "rawSpec": "~4.0.2",
+    "scope": null,
+    "spec": ">=4.0.2 <4.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/",
+    "/init-package-json",
+    "/npm-registry-client",
+    "/realize-package-specifier"
+  ],
+  "_resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.0.2.tgz",
+  "_shasum": "3f28235f9f6428e54bfeca73629e27d6c81a7e82",
+  "_shrinkwrap": null,
+  "_spec": "npm-package-arg@~4.0.2",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
+    "url": "http://blog.izs.me/"
+  },
+  "bugs": {
+    "url": "https://github.com/npm/npm-package-arg/issues"
   },
   "dependencies": {
     "hosted-git-info": "^2.1.4",
     "semver": "4 || 5"
   },
+  "description": "Parse the things that can be arguments to `npm install`",
   "devDependencies": {
     "tap": "^1.2.0"
   },
-  "scripts": {
-    "test": "tap test/*.js"
+  "directories": {
+    "test": "test"
   },
+  "dist": {
+    "shasum": "3f28235f9f6428e54bfeca73629e27d6c81a7e82",
+    "tarball": "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.0.2.tgz"
+  },
+  "gitHead": "8d3c51c33807fabde4db86a3811831b756eaf2eb",
+  "homepage": "https://github.com/npm/npm-package-arg",
+  "license": "ISC",
+  "main": "npa.js",
+  "maintainers": [
+    {
+      "name": "isaacs",
+      "email": "i@izs.me"
+    },
+    {
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
+    },
+    {
+      "name": "iarna",
+      "email": "me@re-becca.org"
+    }
+  ],
+  "name": "npm-package-arg",
+  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/npm/npm-package-arg.git"
   },
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
-  },
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/npm/npm-package-arg/issues"
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "homepage": "https://github.com/npm/npm-package-arg",
-  "readme": "# npm-package-arg\n\nParse package name and specifier passed to commands like `npm install` or\n`npm cache add`.  This just parses the text given-- it's worth noting that\n`npm` has further logic it applies by looking at your disk to figure out\nwhat ambiguous specifiers are.  If you want that logic, please see\n[realize-package-specifier].\n\n[realize-package-specifier]: https://www.npmjs.org/package/realize-package-specifier\n\nArguments look like: `foo@1.2`, `@bar/foo@1.2`, `foo@user/foo`, `http://x.com/foo.tgz`,\n`git+https://github.com/user/foo`, `bitbucket:user/foo`, `foo.tar.gz` or `bar`\n\n## EXAMPLES\n\n```javascript\nvar assert = require(\"assert\")\nvar npa = require(\"npm-package-arg\")\n\n// Pass in the descriptor, and it'll return an object\nvar parsed = npa(\"@bar/foo@1.2\")\n\n// Returns an object like:\n{\n  raw: '@bar/foo@1.2',   // what was passed in\n  name: \"@bar/foo\",      // the name of the package\n  scope: \"@bar\",         // the private scope of the package, or null\n  type: \"range\",         // the type of specifier this is\n  spec: \">=1.2.0 <1.3.0\" // the expanded specifier\n  rawSpec: \"1.2\"         // the specifier as passed in\n }\n\n// Parsing urls pointing at hosted git services produces a variation:\nvar parsed = npa(\"git+https://github.com/user/foo\")\n\n// Returns an object like:\n{\n  raw: 'git+https://github.com/user/foo',\n  scope: null,\n  name: null,\n  rawSpec: 'git+https://github.com/user/foo',\n  spec: 'user/foo',\n  type: 'hosted',\n  hosted: {\n    type: 'github',\n    ssh: 'git@github.com:user/foo.git',\n    sshurl: 'git+ssh://git@github.com/user/foo.git',\n    https: 'https://github.com/user/foo.git',\n    directUrl: 'https://raw.githubusercontent.com/user/foo/master/package.json'\n  }\n}\n\n// Completely unreasonable invalid garbage throws an error\n// Make sure you wrap this in a try/catch if you have not\n// already sanitized the inputs!\nassert.throws(function() {\n  npa(\"this is not \\0 a valid package name or url\")\n})\n```\n\n## USING\n\n`var npa = require('npm-package-arg')`\n\n* var result = npa(*arg*)\n\nParses *arg* and returns a result object detailing what *arg* is.\n\n*arg* -- a package descriptor, like: `foo@1.2`, or `foo@user/foo`, or\n`http://x.com/foo.tgz`, or `git+https://github.com/user/foo`\n\n## RESULT OBJECT\n\nThe objects that are returned by npm-package-arg contain the following\nkeys:\n\n* `name` - If known, the `name` field expected in the resulting pkg.\n* `type` - One of the following strings:\n  * `git` - A git repo\n  * `hosted` - A hosted project, from github, bitbucket or gitlab. Originally\n    either a full url pointing at one of these services or a shorthand like\n    `user/project` or `github:user/project` for github or `bitbucket:user/project`\n    for bitbucket.\n  * `tag` - A tagged version, like `\"foo@latest\"`\n  * `version` - A specific version number, like `\"foo@1.2.3\"`\n  * `range` - A version range, like `\"foo@2.x\"`\n  * `local` - A local file or folder path\n  * `remote` - An http url (presumably to a tgz)\n* `spec` - The \"thing\".  URL, the range, git repo, etc.\n* `hosted` - If type=hosted this will be an object with the following keys:\n  * `type` - github, bitbucket or gitlab\n  * `ssh` - The ssh path for this git repo\n  * `sshUrl` - The ssh URL for this git repo\n  * `httpsUrl` - The HTTPS URL for this git repo\n  * `directUrl` - The URL for the package.json in this git repo\n* `raw` - The original un-modified string that was provided.\n* `rawSpec` - The part after the `name@...`, as it was originally\n  provided.\n* `scope` - If a name is something like `@org/module` then the `scope`\n  field will be set to `org`.  If it doesn't have a scoped name, then\n  scope is `null`.\n",
-  "readmeFilename": "README.md",
-  "gitHead": "8d3c51c33807fabde4db86a3811831b756eaf2eb",
-  "_id": "npm-package-arg@4.0.2",
-  "_shasum": "3f28235f9f6428e54bfeca73629e27d6c81a7e82",
-  "_from": "npm-package-arg@>=4.0.2 <4.1.0"
+  "version": "4.0.2"
 }
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/LICENSE b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/LICENSE
deleted file mode 100644
index 99c130e1de3427..00000000000000
--- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-The MIT License
-
-Copyright (c) 2013 Max Ogden
-
-Permission is hereby granted, free of charge, 
-to any person obtaining a copy of this software and 
-associated documentation files (the "Software"), to 
-deal in the Software without restriction, including 
-without limitation the rights to use, copy, modify, 
-merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom 
-the Software is furnished to do so, 
-subject to the following conditions:
-
-The above copyright notice and this permission notice 
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR 
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/package.json b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/package.json
deleted file mode 100644
index 466dfdfe0139b3..00000000000000
--- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/package.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "name": "core-util-is",
-  "version": "1.0.1",
-  "description": "The `util.is*` functions introduced in Node v0.12.",
-  "main": "lib/util.js",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/core-util-is.git"
-  },
-  "keywords": [
-    "util",
-    "isBuffer",
-    "isArray",
-    "isNumber",
-    "isString",
-    "isRegExp",
-    "isThis",
-    "isThat",
-    "polyfill"
-  ],
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
-  },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/isaacs/core-util-is/issues"
-  },
-  "readme": "# core-util-is\n\nThe `util.is*` functions introduced in Node v0.12.\n",
-  "readmeFilename": "README.md",
-  "homepage": "https://github.com/isaacs/core-util-is",
-  "_id": "core-util-is@1.0.1",
-  "dist": {
-    "shasum": "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538",
-    "tarball": "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-  },
-  "_from": "core-util-is@>=1.0.0 <1.1.0",
-  "_npmVersion": "1.3.23",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "i@izs.me"
-  },
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "directories": {},
-  "_shasum": "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538",
-  "_resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-}
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/package.json b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/package.json
deleted file mode 100644
index 087586e8f8cedd..00000000000000
--- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/package.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "name": "process-nextick-args",
-  "version": "1.0.3",
-  "description": "process.nextTick but always with args",
-  "main": "index.js",
-  "scripts": {
-    "test": "node test.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/calvinmetcalf/process-nextick-args.git"
-  },
-  "author": "",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/calvinmetcalf/process-nextick-args/issues"
-  },
-  "homepage": "https://github.com/calvinmetcalf/process-nextick-args",
-  "devDependencies": {
-    "tap": "~0.2.6"
-  },
-  "gitHead": "e855846a69662b9489f1ad3dde1ebf2ccc4370b8",
-  "_id": "process-nextick-args@1.0.3",
-  "_shasum": "e272eed825d5e9f4ea74d8d73b1fe311c3beb630",
-  "_from": "process-nextick-args@>=1.0.0 <1.1.0",
-  "_npmVersion": "2.9.0",
-  "_nodeVersion": "2.5.0",
-  "_npmUser": {
-    "name": "cwmma",
-    "email": "calvin.metcalf@gmail.com"
-  },
-  "dist": {
-    "shasum": "e272eed825d5e9f4ea74d8d73b1fe311c3beb630",
-    "tarball": "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
-  },
-  "maintainers": [
-    {
-      "name": "cwmma",
-      "email": "calvin.metcalf@gmail.com"
-    }
-  ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/package.json b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/package.json
deleted file mode 100644
index 0364d54ba46af6..00000000000000
--- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/package.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "name": "string_decoder",
-  "version": "0.10.31",
-  "description": "The string_decoder module from Node core",
-  "main": "index.js",
-  "dependencies": {},
-  "devDependencies": {
-    "tap": "~0.4.8"
-  },
-  "scripts": {
-    "test": "tap test/simple/*.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/rvagg/string_decoder.git"
-  },
-  "homepage": "https://github.com/rvagg/string_decoder",
-  "keywords": [
-    "string",
-    "decoder",
-    "browser",
-    "browserify"
-  ],
-  "license": "MIT",
-  "gitHead": "d46d4fd87cf1d06e031c23f1ba170ca7d4ade9a0",
-  "bugs": {
-    "url": "https://github.com/rvagg/string_decoder/issues"
-  },
-  "_id": "string_decoder@0.10.31",
-  "_shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94",
-  "_from": "string_decoder@>=0.10.0 <0.11.0",
-  "_npmVersion": "1.4.23",
-  "_npmUser": {
-    "name": "rvagg",
-    "email": "rod@vagg.org"
-  },
-  "maintainers": [
-    {
-      "name": "substack",
-      "email": "mail@substack.net"
-    },
-    {
-      "name": "rvagg",
-      "email": "rod@vagg.org"
-    }
-  ],
-  "dist": {
-    "shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94",
-    "tarball": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/package.json b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/package.json
deleted file mode 100644
index ea487da0e43000..00000000000000
--- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/package.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "name": "util-deprecate",
-  "version": "1.0.1",
-  "description": "The Node.js `util.deprecate()` function with browser support",
-  "main": "node.js",
-  "browser": "browser.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/TooTallNate/util-deprecate.git"
-  },
-  "keywords": [
-    "util",
-    "deprecate",
-    "browserify",
-    "browser",
-    "node"
-  ],
-  "author": {
-    "name": "Nathan Rajlich",
-    "email": "nathan@tootallnate.net",
-    "url": "http://n8.io/"
-  },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/TooTallNate/util-deprecate/issues"
-  },
-  "homepage": "https://github.com/TooTallNate/util-deprecate",
-  "gitHead": "6e923f7d98a0afbe5b9c7db9d0f0029c1936746c",
-  "_id": "util-deprecate@1.0.1",
-  "_shasum": "3556a3d13c4c6aa7983d7e2425478197199b7881",
-  "_from": "util-deprecate@>=1.0.1 <1.1.0",
-  "_npmVersion": "1.4.28",
-  "_npmUser": {
-    "name": "tootallnate",
-    "email": "nathan@tootallnate.net"
-  },
-  "maintainers": [
-    {
-      "name": "tootallnate",
-      "email": "nathan@tootallnate.net"
-    }
-  ],
-  "dist": {
-    "shasum": "3556a3d13c4c6aa7983d7e2425478197199b7881",
-    "tarball": "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/npm-registry-client/package.json b/deps/npm/node_modules/npm-registry-client/package.json
index ab9f763737eda5..3ab27508a18eec 100644
--- a/deps/npm/node_modules/npm-registry-client/package.json
+++ b/deps/npm/node_modules/npm-registry-client/package.json
@@ -1,18 +1,44 @@
 {
+  "_args": [
+    [
+      "npm-registry-client@~7.0.7",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "npm-registry-client@>=7.0.7 <7.1.0",
+  "_id": "npm-registry-client@7.0.7",
+  "_inCache": true,
+  "_location": "/npm-registry-client",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "email": "kat@sykosomatic.org",
+    "name": "zkat"
+  },
+  "_npmVersion": "2.14.4",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "npm-registry-client",
+    "raw": "npm-registry-client@~7.0.7",
+    "rawSpec": "~7.0.7",
+    "scope": null,
+    "spec": ">=7.0.7 <7.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.0.7.tgz",
+  "_shasum": "899d7c8fefe87b72a70d8c9e075fb874539e0d3e",
+  "_shrinkwrap": null,
+  "_spec": "npm-registry-client@~7.0.7",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "name": "npm-registry-client",
-  "description": "Client for the npm registry",
-  "version": "7.0.7",
-  "repository": {
-    "url": "git://github.com/isaacs/npm-registry-client.git"
-  },
-  "main": "index.js",
-  "scripts": {
-    "test": "standard && tap test/*.js"
+  "bugs": {
+    "url": "https://github.com/isaacs/npm-registry-client/issues"
   },
   "dependencies": {
     "chownr": "^1.0.1",
@@ -21,14 +47,15 @@
     "mkdirp": "^0.5.0",
     "normalize-package-data": "~1.0.1 || ^2.0.0",
     "npm-package-arg": "^3.0.0 || ^4.0.0",
+    "npmlog": "",
     "once": "^1.3.0",
     "request": "^2.47.0",
     "retry": "^0.8.0",
     "rimraf": "2",
     "semver": "2 >=2.2.1 || 3.x || 4 || 5",
-    "slide": "^1.1.3",
-    "npmlog": ""
+    "slide": "^1.1.3"
   },
+  "description": "Client for the npm registry",
   "devDependencies": {
     "negotiator": "^0.4.9",
     "nock": "^0.56.0",
@@ -36,18 +63,43 @@
     "standard": "^4.0.0",
     "tap": "^1.2.0"
   },
+  "directories": {},
+  "dist": {
+    "shasum": "899d7c8fefe87b72a70d8c9e075fb874539e0d3e",
+    "tarball": "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.0.7.tgz"
+  },
+  "gitHead": "06f188917bf575fe7dc7c2f6d1d4adbaa50bc423",
+  "homepage": "https://github.com/isaacs/npm-registry-client#readme",
+  "installable": true,
+  "license": "ISC",
+  "main": "index.js",
+  "maintainers": [
+    {
+      "name": "isaacs",
+      "email": "isaacs@npmjs.com"
+    },
+    {
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
+    },
+    {
+      "name": "iarna",
+      "email": "me@re-becca.org"
+    },
+    {
+      "name": "zkat",
+      "email": "kat@sykosomatic.org"
+    }
+  ],
+  "name": "npm-registry-client",
   "optionalDependencies": {
     "npmlog": ""
   },
-  "license": "ISC",
-  "readme": "# npm-registry-client\n\nThe code that npm uses to talk to the registry.\n\nIt handles all the caching and HTTP calls.\n\n## Usage\n\n```javascript\nvar RegClient = require('npm-registry-client')\nvar client = new RegClient(config)\nvar uri = \"https://registry.npmjs.org/npm\"\nvar params = {timeout: 1000}\n\nclient.get(uri, params, function (error, data, raw, res) {\n  // error is an error if there was a problem.\n  // data is the parsed data object\n  // raw is the json string\n  // res is the response from couch\n})\n```\n\n# Registry URLs\n\nThe registry calls take either a full URL pointing to a resource in the\nregistry, or a base URL for the registry as a whole (including the registry\npath – but be sure to terminate the path with `/`). `http` and `https` URLs are\nthe only ones supported.\n\n## Using the client\n\nEvery call to the client follows the same pattern:\n\n* `uri` {String} The *fully-qualified* URI of the registry API method being\n  invoked.\n* `params` {Object} Per-request parameters.\n* `callback` {Function} Callback to be invoked when the call is complete.\n\n### Credentials\n\nMany requests to the registry can by authenticated, and require credentials\nfor authorization. These credentials always look the same:\n\n* `username` {String}\n* `password` {String}\n* `email` {String}\n* `alwaysAuth` {Boolean} Whether calls to the target registry are always\n  authed.\n\n**or**\n\n* `token` {String}\n* `alwaysAuth` {Boolean} Whether calls to the target registry are always\n  authed.\n\n## API\n\n### client.access(uri, params, cb)\n\n* `uri` {String} Registry URL for the package's access API endpoint.\n  Looks like `/-/package/<package name>/access`.\n* `params` {Object} Object containing per-request properties.\n  * `access` {String} New access level for the package. Can be either\n    `public` or `restricted`. Registry will raise an error if trying\n    to change the access level of an unscoped package.\n  * `auth` {Credentials}\n\nSet the access level for scoped packages. For now, there are only two\naccess levels: \"public\" and \"restricted\".\n\n### client.adduser(uri, params, cb)\n\n* `uri` {String} Base registry URL.\n* `params` {Object} Object containing per-request properties.\n  * `auth` {Credentials}\n* `cb` {Function}\n  * `error` {Error | null}\n  * `data` {Object} the parsed data object\n  * `raw` {String} the json\n  * `res` {Response Object} response from couch\n\nAdd a user account to the registry, or verify the credentials.\n\n### client.deprecate(uri, params, cb)\n\n* `uri` {String} Full registry URI for the deprecated package.\n* `params` {Object} Object containing per-request properties.\n  * `version` {String} Semver version range.\n  * `message` {String} The message to use as a deprecation warning.\n  * `auth` {Credentials}\n* `cb` {Function}\n\nDeprecate a version of a package in the registry.\n\n### client.distTags.fetch(uri, params, cb)\n\n* `uri` {String} Base URL for the registry.\n* `params` {Object} Object containing per-request properties.\n  * `package` {String} Name of the package.\n  * `auth` {Credentials}\n* `cb` {Function}\n\nFetch all of the `dist-tags` for the named package.\n\n### client.distTags.add(uri, params, cb)\n\n* `uri` {String} Base URL for the registry.\n* `params` {Object} Object containing per-request properties.\n  * `package` {String} Name of the package.\n  * `distTag` {String} Name of the new `dist-tag`.\n  * `version` {String} Exact version to be mapped to the `dist-tag`.\n  * `auth` {Credentials}\n* `cb` {Function}\n\nAdd (or replace) a single dist-tag onto the named package.\n\n### client.distTags.set(uri, params, cb)\n\n* `uri` {String} Base URL for the registry.\n* `params` {Object} Object containing per-request properties.\n  * `package` {String} Name of the package.\n  * `distTags` {Object} Object containing a map from tag names to package\n     versions.\n  * `auth` {Credentials}\n* `cb` {Function}\n\nSet all of the `dist-tags` for the named package at once, creating any\n`dist-tags` that do not already exit. Any `dist-tags` not included in the\n`distTags` map will be removed.\n\n### client.distTags.update(uri, params, cb)\n\n* `uri` {String} Base URL for the registry.\n* `params` {Object} Object containing per-request properties.\n  * `package` {String} Name of the package.\n  * `distTags` {Object} Object containing a map from tag names to package\n     versions.\n  * `auth` {Credentials}\n* `cb` {Function}\n\nUpdate the values of multiple `dist-tags`, creating any `dist-tags` that do\nnot already exist. Any pre-existing `dist-tags` not included in the `distTags`\nmap will be left alone.\n\n### client.distTags.rm(uri, params, cb)\n\n* `uri` {String} Base URL for the registry.\n* `params` {Object} Object containing per-request properties.\n  * `package` {String} Name of the package.\n  * `distTag` {String} Name of the new `dist-tag`.\n  * `auth` {Credentials}\n* `cb` {Function}\n\nRemove a single `dist-tag` from the named package.\n\n### client.get(uri, params, cb)\n\n* `uri` {String} The complete registry URI to fetch\n* `params` {Object} Object containing per-request properties.\n  * `timeout` {Number} Duration before the request times out. Optional\n    (default: never).\n  * `follow` {Boolean} Follow 302/301 responses. Optional (default: true).\n  * `staleOk` {Boolean} If there's cached data available, then return that to\n    the callback quickly, and update the cache the background. Optional\n    (default: false).\n  * `auth` {Credentials} Optional.\n* `cb` {Function}\n\nFetches data from the registry via a GET request, saving it in the cache folder\nwith the ETag or the \"Last Modified\" timestamp.\n\n### client.publish(uri, params, cb)\n\n* `uri` {String} The registry URI for the package to publish.\n* `params` {Object} Object containing per-request properties.\n  * `metadata` {Object} Package metadata.\n  * `access` {String} Access for the package. Can be `public` or `restricted` (no default).\n  * `body` {Stream} Stream of the package body / tarball.\n  * `auth` {Credentials}\n* `cb` {Function}\n\nPublish a package to the registry.\n\nNote that this does not create the tarball from a folder.\n\n### client.star(uri, params, cb)\n\n* `uri` {String} The complete registry URI for the package to star.\n* `params` {Object} Object containing per-request properties.\n  * `starred` {Boolean} True to star the package, false to unstar it. Optional\n    (default: false).\n  * `auth` {Credentials}\n* `cb` {Function}\n\nStar or unstar a package.\n\nNote that the user does not have to be the package owner to star or unstar a\npackage, though other writes do require that the user be the package owner.\n\n### client.stars(uri, params, cb)\n\n* `uri` {String} The base URL for the registry.\n* `params` {Object} Object containing per-request properties.\n  * `username` {String} Name of user to fetch starred packages for. Optional\n    (default: user in `auth`).\n  * `auth` {Credentials} Optional (required if `username` is omitted).\n* `cb` {Function}\n\nView your own or another user's starred packages.\n\n### client.tag(uri, params, cb)\n\n* `uri` {String} The complete registry URI to tag\n* `params` {Object} Object containing per-request properties.\n  * `version` {String} Version to tag.\n  * `tag` {String} Tag name to apply.\n  * `auth` {Credentials}\n* `cb` {Function}\n\nMark a version in the `dist-tags` hash, so that `pkg@tag` will fetch the\nspecified version.\n\n### client.unpublish(uri, params, cb)\n\n* `uri` {String} The complete registry URI of the package to unpublish.\n* `params` {Object} Object containing per-request properties.\n  * `version` {String} version to unpublish. Optional – omit to unpublish all\n    versions.\n  * `auth` {Credentials}\n* `cb` {Function}\n\nRemove a version of a package (or all versions) from the registry.  When the\nlast version us unpublished, the entire document is removed from the database.\n\n### client.whoami(uri, params, cb)\n\n* `uri` {String} The base registry for the URI.\n* `params` {Object} Object containing per-request properties.\n  * `auth` {Credentials}\n* `cb` {Function}\n\nSimple call to see who the registry thinks you are. Especially useful with\ntoken-based auth.\n\n\n## PLUMBING\n\nThe below are primarily intended for use by the rest of the API, or by the npm\ncaching logic directly.\n\n### client.request(uri, params, cb)\n\n* `uri` {String} URI pointing to the resource to request.\n* `params` {Object} Object containing per-request properties.\n  * `method` {String} HTTP method. Optional (default: \"GET\").\n  * `body` {Stream | Buffer | String | Object} The request body.  Objects\n    that are not Buffers or Streams are encoded as JSON. Optional – body\n    only used for write operations.\n  * `etag` {String} The cached ETag. Optional.\n  * `lastModified` {String} The cached Last-Modified timestamp. Optional.\n  * `follow` {Boolean} Follow 302/301 responses. Optional (default: true).\n  * `auth` {Credentials} Optional.\n* `cb` {Function}\n  * `error` {Error | null}\n  * `data` {Object} the parsed data object\n  * `raw` {String} the json\n  * `res` {Response Object} response from couch\n\nMake a generic request to the registry. All the other methods are wrappers\naround `client.request`.\n\n### client.fetch(uri, params, cb)\n\n* `uri` {String} The complete registry URI to upload to\n* `params` {Object} Object containing per-request properties.\n  * `headers` {Stream} HTTP headers to be included with the request. Optional.\n  * `auth` {Credentials} Optional.\n* `cb` {Function}\n\nFetch a package from a URL, with auth set appropriately if included. Used to\ncache remote tarballs as well as request package tarballs from the registry.\n\n# Configuration\n\nThe client uses its own configuration, which is just passed in as a simple\nnested object. The following are the supported values (with their defaults, if\nany):\n\n* `proxy.http` {URL} The URL to proxy HTTP requests through.\n* `proxy.https` {URL} The URL to proxy HTTPS requests through. Defaults to be\n  the same as `proxy.http` if unset.\n* `proxy.localAddress` {IP} The local address to use on multi-homed systems.\n* `ssl.ca` {String} Certificate signing authority certificates to trust.\n* `ssl.certificate` {String} Client certificate (PEM encoded). Enable access\n  to servers that require client certificates.\n* `ssl.key` {String} Private key (PEM encoded) for client certificate.\n* `ssl.strict` {Boolean} Whether or not to be strict with SSL certificates.\n  Default = `true`\n* `retry.count` {Number} Number of times to retry on GET failures. Default = 2.\n* `retry.factor` {Number} `factor` setting for `node-retry`. Default = 10.\n* `retry.minTimeout` {Number} `minTimeout` setting for `node-retry`.\n  Default = 10000 (10 seconds)\n* `retry.maxTimeout` {Number} `maxTimeout` setting for `node-retry`.\n  Default = 60000 (60 seconds)\n* `userAgent` {String} User agent header to send. Default =\n  `\"node/{process.version}\"`\n* `log` {Object} The logger to use.  Defaults to `require(\"npmlog\")` if\n  that works, otherwise logs are disabled.\n* `defaultTag` {String} The default tag to use when publishing new packages.\n  Default = `\"latest\"`\n* `couchToken` {Object} A token for use with\n  [couch-login](https://npmjs.org/package/couch-login).\n* `sessionToken` {string} A random identifier for this set of client requests.\n  Default = 8 random hexadecimal bytes.\n",
-  "readmeFilename": "README.md",
-  "gitHead": "06f188917bf575fe7dc7c2f6d1d4adbaa50bc423",
-  "bugs": {
-    "url": "https://github.com/isaacs/npm-registry-client/issues"
+  "repository": {
+    "url": "git://github.com/isaacs/npm-registry-client.git"
   },
-  "homepage": "https://github.com/isaacs/npm-registry-client#readme",
-  "_id": "npm-registry-client@7.0.7",
-  "_shasum": "899d7c8fefe87b72a70d8c9e075fb874539e0d3e",
-  "_from": "npm-registry-client@7.0.7"
+  "scripts": {
+    "test": "standard && tap test/*.js"
+  },
+  "version": "7.0.7"
 }
diff --git a/deps/npm/node_modules/npm-user-validate/package.json b/deps/npm/node_modules/npm-user-validate/package.json
index 8a27d7cfe1ad49..69c37fe875acd1 100644
--- a/deps/npm/node_modules/npm-user-validate/package.json
+++ b/deps/npm/node_modules/npm-user-validate/package.json
@@ -1,46 +1,63 @@
 {
-  "name": "npm-user-validate",
-  "version": "0.1.2",
-  "description": "User validations for npm",
-  "main": "npm-user-validate.js",
-  "devDependencies": {
-    "tap": "0.4.3"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "_args": [
+    [
+      "npm-user-validate@~0.1.2",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "npm-user-validate@>=0.1.2 <0.2.0",
+  "_id": "npm-user-validate@0.1.2",
+  "_inCache": true,
+  "_location": "/npm-user-validate",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/npm/npm-user-validate.git"
+  "_npmVersion": "2.10.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "npm-user-validate",
+    "raw": "npm-user-validate@~0.1.2",
+    "rawSpec": "~0.1.2",
+    "scope": null,
+    "spec": ">=0.1.2 <0.2.0",
+    "type": "range"
   },
-  "keywords": [
-    "npm",
-    "validation",
-    "registry"
+  "_requiredBy": [
+    "/"
   ],
+  "_resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz",
+  "_shasum": "d585da0b47c9f41a9e6ca684b6fd84ba41ebe87d",
+  "_shrinkwrap": null,
+  "_spec": "npm-user-validate@~0.1.2",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Robert Kowalski",
-    "email": "rok@kowalski.gd"
+    "email": "rok@kowalski.gd",
+    "name": "Robert Kowalski"
   },
-  "license": "BSD-2-Clause",
-  "gitHead": "e5b280babff5b73fe74b496461bcf424a51881e1",
   "bugs": {
     "url": "https://github.com/npm/npm-user-validate/issues"
   },
-  "homepage": "https://github.com/npm/npm-user-validate#readme",
-  "_id": "npm-user-validate@0.1.2",
-  "_shasum": "d585da0b47c9f41a9e6ca684b6fd84ba41ebe87d",
-  "_from": "npm-user-validate@>=0.1.1 <0.2.0",
-  "_npmVersion": "2.10.0",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
+  "dependencies": {},
+  "description": "User validations for npm",
+  "devDependencies": {
+    "tap": "0.4.3"
   },
+  "directories": {},
   "dist": {
     "shasum": "d585da0b47c9f41a9e6ca684b6fd84ba41ebe87d",
     "tarball": "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz"
   },
+  "gitHead": "e5b280babff5b73fe74b496461bcf424a51881e1",
+  "homepage": "https://github.com/npm/npm-user-validate#readme",
+  "keywords": [
+    "npm",
+    "registry",
+    "validation"
+  ],
+  "license": "BSD-2-Clause",
+  "main": "npm-user-validate.js",
   "maintainers": [
     {
       "name": "robertkowalski",
@@ -51,6 +68,14 @@
       "email": "i@izs.me"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz"
+  "name": "npm-user-validate",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/npm/npm-user-validate.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "0.1.2"
 }
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/package.json b/deps/npm/node_modules/npmlog/node_modules/gauge/package.json
deleted file mode 100644
index 227173e6401edd..00000000000000
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/package.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "name": "gauge",
-  "version": "1.2.0",
-  "description": "A terminal based horizontal guage",
-  "main": "progress-bar.js",
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/iarna/gauge.git"
-  },
-  "keywords": [
-    "progressbar",
-    "progress",
-    "gauge"
-  ],
-  "author": {
-    "name": "Rebecca Turner",
-    "email": "me@re-becca.org"
-  },
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/iarna/gauge/issues"
-  },
-  "homepage": "https://github.com/iarna/gauge",
-  "dependencies": {
-    "ansi": "^0.3.0",
-    "has-unicode": "^1.0.0",
-    "lodash.pad": "^3.0.0",
-    "lodash.padleft": "^3.0.0",
-    "lodash.padright": "^3.0.0"
-  },
-  "devDependencies": {
-    "tap": "^0.4.13"
-  },
-  "gitHead": "db15c35374816b3fc3b9e1e54866f31ed7f4a733",
-  "_id": "gauge@1.2.0",
-  "_shasum": "3094ab1285633f799814388fc8f2de67b4c012c5",
-  "_from": "gauge@>=1.2.0 <1.3.0",
-  "_npmVersion": "2.6.0",
-  "_nodeVersion": "1.1.0",
-  "_npmUser": {
-    "name": "iarna",
-    "email": "me@re-becca.org"
-  },
-  "maintainers": [
-    {
-      "name": "iarna",
-      "email": "me@re-becca.org"
-    }
-  ],
-  "dist": {
-    "shasum": "3094ab1285633f799814388fc8f2de67b4c012c5",
-    "tarball": "http://registry.npmjs.org/gauge/-/gauge-1.2.0.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.0.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/npmlog/package.json b/deps/npm/node_modules/npmlog/package.json
index 1613546d9f195c..755274a19354aa 100644
--- a/deps/npm/node_modules/npmlog/package.json
+++ b/deps/npm/node_modules/npmlog/package.json
@@ -1,47 +1,66 @@
 {
+  "_args": [
+    [
+      "npmlog@~1.2.1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "npmlog@>=1.2.1 <1.3.0",
+  "_id": "npmlog@1.2.1",
+  "_inCache": true,
+  "_location": "/npmlog",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
+  },
+  "_npmVersion": "2.10.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "npmlog",
+    "raw": "npmlog@~1.2.1",
+    "rawSpec": "~1.2.1",
+    "scope": null,
+    "spec": ">=1.2.1 <1.3.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/",
+    "/node-gyp",
+    "/npm-install-checks",
+    "/npm-registry-client"
+  ],
+  "_resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
+  "_shasum": "28e7be619609b53f7ad1dd300a10d64d716268b6",
+  "_shrinkwrap": null,
+  "_spec": "npmlog@~1.2.1",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "name": "npmlog",
-  "description": "logger for npm",
-  "version": "1.2.1",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/npmlog.git"
-  },
-  "main": "log.js",
-  "scripts": {
-    "test": "tap test/*.js"
+  "bugs": {
+    "url": "https://github.com/isaacs/npmlog/issues"
   },
   "dependencies": {
     "ansi": "~0.3.0",
     "are-we-there-yet": "~1.0.0",
     "gauge": "~1.2.0"
   },
+  "description": "logger for npm",
   "devDependencies": {
     "tap": ""
   },
-  "license": "ISC",
-  "gitHead": "4e1a73a567036064ded425a7d48c863d53550b4f",
-  "bugs": {
-    "url": "https://github.com/isaacs/npmlog/issues"
-  },
-  "homepage": "https://github.com/isaacs/npmlog#readme",
-  "_id": "npmlog@1.2.1",
-  "_shasum": "28e7be619609b53f7ad1dd300a10d64d716268b6",
-  "_from": "npmlog@>=1.2.1 <1.3.0",
-  "_npmVersion": "2.10.0",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
-  },
+  "directories": {},
   "dist": {
     "shasum": "28e7be619609b53f7ad1dd300a10d64d716268b6",
     "tarball": "http://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz"
   },
+  "gitHead": "4e1a73a567036064ded425a7d48c863d53550b4f",
+  "homepage": "https://github.com/isaacs/npmlog#readme",
+  "license": "ISC",
+  "main": "log.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -52,7 +71,14 @@
       "email": "me@re-becca.org"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "npmlog",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/npmlog.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.2.1"
 }
diff --git a/deps/npm/node_modules/request/node_modules/oauth-sign/LICENSE b/deps/npm/node_modules/oauth-sign/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/oauth-sign/LICENSE
rename to deps/npm/node_modules/oauth-sign/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/oauth-sign/README.md b/deps/npm/node_modules/oauth-sign/README.md
similarity index 81%
rename from deps/npm/node_modules/request/node_modules/oauth-sign/README.md
rename to deps/npm/node_modules/oauth-sign/README.md
index 34c4a85d2dde05..af496148e4815a 100644
--- a/deps/npm/node_modules/request/node_modules/oauth-sign/README.md
+++ b/deps/npm/node_modules/oauth-sign/README.md
@@ -1,4 +1,4 @@
 oauth-sign
 ==========
 
-OAuth 1 signing. Formerly a vendor lib in mikeal/request, now a standalone module. 
+OAuth 1 signing. Formerly a vendor lib in mikeal/request, now a standalone module.
diff --git a/deps/npm/node_modules/request/node_modules/oauth-sign/index.js b/deps/npm/node_modules/oauth-sign/index.js
similarity index 98%
rename from deps/npm/node_modules/request/node_modules/oauth-sign/index.js
rename to deps/npm/node_modules/oauth-sign/index.js
index a587541dc577e6..5a70f3f8cdc43b 100644
--- a/deps/npm/node_modules/request/node_modules/oauth-sign/index.js
+++ b/deps/npm/node_modules/oauth-sign/index.js
@@ -45,7 +45,7 @@ function compare (a, b) {
 }
 
 function generateBase (httpMethod, base_uri, params) {
-  // adapted from https://dev.twitter.com/docs/auth/oauth and 
+  // adapted from https://dev.twitter.com/docs/auth/oauth and
   // https://dev.twitter.com/docs/auth/creating-signature
 
   // Parameter normalization
diff --git a/deps/npm/node_modules/request/node_modules/oauth-sign/package.json b/deps/npm/node_modules/oauth-sign/package.json
similarity index 70%
rename from deps/npm/node_modules/request/node_modules/oauth-sign/package.json
rename to deps/npm/node_modules/oauth-sign/package.json
index eeaaa68d3596ce..6fd0150221fab1 100644
--- a/deps/npm/node_modules/request/node_modules/oauth-sign/package.json
+++ b/deps/npm/node_modules/oauth-sign/package.json
@@ -1,40 +1,60 @@
 {
+  "_args": [
+    [
+      "oauth-sign@~0.8.0",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
+  ],
+  "_from": "oauth-sign@>=0.8.0 <0.9.0",
+  "_id": "oauth-sign@0.8.0",
+  "_inCache": true,
+  "_location": "/oauth-sign",
+  "_nodeVersion": "0.12.4",
+  "_npmUser": {
+    "email": "simeonvelichkov@gmail.com",
+    "name": "simov"
+  },
+  "_npmVersion": "2.10.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "oauth-sign",
+    "raw": "oauth-sign@~0.8.0",
+    "rawSpec": "~0.8.0",
+    "scope": null,
+    "spec": ">=0.8.0 <0.9.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/request"
+  ],
+  "_resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz",
+  "_shasum": "938fdc875765ba527137d8aec9d178e24debc553",
+  "_shrinkwrap": null,
+  "_spec": "oauth-sign@~0.8.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
   "author": {
-    "name": "Mikeal Rogers",
     "email": "mikeal.rogers@gmail.com",
+    "name": "Mikeal Rogers",
     "url": "http://www.futurealoof.com"
   },
-  "name": "oauth-sign",
-  "description": "OAuth 1 signing. Formerly a vendor lib in mikeal/request, now a standalone module.",
-  "version": "0.8.0",
-  "license": "Apache-2.0",
-  "repository": {
-    "url": "git+https://github.com/mikeal/oauth-sign.git"
+  "bugs": {
+    "url": "https://github.com/mikeal/oauth-sign/issues"
   },
-  "main": "index.js",
   "dependencies": {},
+  "description": "OAuth 1 signing. Formerly a vendor lib in mikeal/request, now a standalone module.",
   "devDependencies": {},
-  "optionalDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "938fdc875765ba527137d8aec9d178e24debc553",
+    "tarball": "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
+  },
   "engines": {
     "node": "*"
   },
-  "scripts": {
-    "test": "node test.js"
-  },
   "gitHead": "e1f2b42ff039901ce977f8e81918767d97d496b5",
-  "bugs": {
-    "url": "https://github.com/mikeal/oauth-sign/issues"
-  },
   "homepage": "https://github.com/mikeal/oauth-sign#readme",
-  "_id": "oauth-sign@0.8.0",
-  "_shasum": "938fdc875765ba527137d8aec9d178e24debc553",
-  "_from": "oauth-sign@>=0.8.0 <0.9.0",
-  "_npmVersion": "2.10.1",
-  "_nodeVersion": "0.12.4",
-  "_npmUser": {
-    "name": "simov",
-    "email": "simeonvelichkov@gmail.com"
-  },
+  "license": "Apache-2.0",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "mikeal",
@@ -49,11 +69,13 @@
       "email": "simeonvelichkov@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "938fdc875765ba527137d8aec9d178e24debc553",
-    "tarball": "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
+  "name": "oauth-sign",
+  "optionalDependencies": {},
+  "repository": {
+    "url": "git+https://github.com/mikeal/oauth-sign.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "node test.js"
+  },
+  "version": "0.8.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/oauth-sign/test.js b/deps/npm/node_modules/oauth-sign/test.js
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/oauth-sign/test.js
rename to deps/npm/node_modules/oauth-sign/test.js
index a8847270df5e3b..4cd02b8aa21967 100644
--- a/deps/npm/node_modules/request/node_modules/oauth-sign/test.js
+++ b/deps/npm/node_modules/oauth-sign/test.js
@@ -6,7 +6,7 @@ var oauth = require('./index')
 
 // Tests from Twitter documentation https://dev.twitter.com/docs/auth/oauth
 
-var reqsign = hmacsign('POST', 'https://api.twitter.com/oauth/request_token', 
+var reqsign = hmacsign('POST', 'https://api.twitter.com/oauth/request_token',
   { oauth_callback: 'http://localhost:3005/the_dance/process_callback?service_provider_id=11'
   , oauth_consumer_key: 'GDdmIQH6jhtmLUypg82g'
   , oauth_nonce: 'QP70eNmVz8jvdPevU3oJD2AfF7R7odC2XJcn4XlZJqk'
@@ -28,12 +28,12 @@ var accsign = hmacsign('POST', 'https://api.twitter.com/oauth/access_token',
   , oauth_verifier: 'pDNg57prOHapMbhv25RNf75lVRd6JDsni1AJJIDYoTY'
   , oauth_version: '1.0'
   }, "MCD8BKwGdgPHvAuvgvz4EQpqDAtx89grbuNMRd7Eh98", "x6qpRnlEmW9JbQn4PQVVeVG8ZLPEx6A0TOebgwcuA")
-  
+
 console.log(accsign)
 console.log('PUw/dHA4fnlJYM6RhXk5IU/0fCc=')
 assert.equal(accsign, 'PUw/dHA4fnlJYM6RhXk5IU/0fCc=')
 
-var upsign = hmacsign('POST', 'http://api.twitter.com/1/statuses/update.json', 
+var upsign = hmacsign('POST', 'http://api.twitter.com/1/statuses/update.json',
   { oauth_consumer_key: "GDdmIQH6jhtmLUypg82g"
   , oauth_nonce: "oElnnMTQIZvqvlfXM56aBLAf5noGD0AQR3Fmi7Q6Y"
   , oauth_signature_method: "HMAC-SHA1"
diff --git a/deps/npm/node_modules/once/package.json b/deps/npm/node_modules/once/package.json
index c85f12ebe1d4fa..06f4e27a6c990b 100644
--- a/deps/npm/node_modules/once/package.json
+++ b/deps/npm/node_modules/once/package.json
@@ -1,60 +1,90 @@
 {
-  "name": "once",
-  "version": "1.3.2",
-  "description": "Run a function exactly one time",
-  "main": "once.js",
-  "directories": {
-    "test": "test"
-  },
-  "dependencies": {
-    "wrappy": "1"
-  },
-  "devDependencies": {
-    "tap": "~0.3.0"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "_args": [
+    [
+      "once@~1.3.2",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "once@>=1.3.2 <1.4.0",
+  "_id": "once@1.3.2",
+  "_inCache": true,
+  "_location": "/once",
+  "_nodeVersion": "2.0.0",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/once.git"
+  "_npmVersion": "2.9.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "once",
+    "raw": "once@~1.3.2",
+    "rawSpec": "~1.3.2",
+    "scope": null,
+    "spec": ">=1.3.2 <1.4.0",
+    "type": "range"
   },
-  "keywords": [
-    "once",
-    "function",
-    "one",
-    "single"
+  "_requiredBy": [
+    "/",
+    "/glob",
+    "/inflight",
+    "/node-gyp/glob",
+    "/npm-registry-client",
+    "/read-package-tree",
+    "/readdir-scoped-modules",
+    "/rimraf/glob"
   ],
+  "_resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+  "_shasum": "d8feeca93b039ec1dcdee7741c92bdac5e28081b",
+  "_shrinkwrap": null,
+  "_spec": "once@~1.3.2",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "license": "ISC",
-  "gitHead": "e35eed5a7867574e2bf2260a1ba23970958b22f2",
   "bugs": {
     "url": "https://github.com/isaacs/once/issues"
   },
-  "homepage": "https://github.com/isaacs/once#readme",
-  "_id": "once@1.3.2",
-  "_shasum": "d8feeca93b039ec1dcdee7741c92bdac5e28081b",
-  "_from": "once@>=1.3.2 <1.4.0",
-  "_npmVersion": "2.9.1",
-  "_nodeVersion": "2.0.0",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
+  "dependencies": {
+    "wrappy": "1"
+  },
+  "description": "Run a function exactly one time",
+  "devDependencies": {
+    "tap": "~0.3.0"
+  },
+  "directories": {
+    "test": "test"
   },
   "dist": {
     "shasum": "d8feeca93b039ec1dcdee7741c92bdac5e28081b",
     "tarball": "http://registry.npmjs.org/once/-/once-1.3.2.tgz"
   },
+  "gitHead": "e35eed5a7867574e2bf2260a1ba23970958b22f2",
+  "homepage": "https://github.com/isaacs/once#readme",
+  "keywords": [
+    "function",
+    "once",
+    "one",
+    "single"
+  ],
+  "license": "ISC",
+  "main": "once.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "_resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "once",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/once.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.3.2"
 }
diff --git a/deps/npm/node_modules/opener/package.json b/deps/npm/node_modules/opener/package.json
index aab02afc15bcb6..44e43737e07f49 100644
--- a/deps/npm/node_modules/opener/package.json
+++ b/deps/npm/node_modules/opener/package.json
@@ -1,54 +1,79 @@
 {
-  "name": "opener",
-  "description": "Opens stuff, like webpages and files and executables, cross-platform",
-  "version": "1.4.1",
+  "_args": [
+    [
+      "opener@~1.4.1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "opener@>=1.4.1 <1.5.0",
+  "_id": "opener@1.4.1",
+  "_inCache": true,
+  "_location": "/opener",
+  "_nodeVersion": "1.5.1",
+  "_npmUser": {
+    "email": "d@domenic.me",
+    "name": "domenic"
+  },
+  "_npmVersion": "2.7.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "opener",
+    "raw": "opener@~1.4.1",
+    "rawSpec": "~1.4.1",
+    "scope": null,
+    "spec": ">=1.4.1 <1.5.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/opener/-/opener-1.4.1.tgz",
+  "_shasum": "897590acd1aed3311b703b58bccb4d43f56f2895",
+  "_shrinkwrap": null,
+  "_spec": "opener@~1.4.1",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Domenic Denicola",
     "email": "d@domenic.me",
+    "name": "Domenic Denicola",
     "url": "https://domenic.me/"
   },
-  "license": "WTFPL",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/domenic/opener"
-  },
-  "main": "opener.js",
   "bin": {
     "opener": "opener.js"
   },
-  "files": [
-    "opener.js"
-  ],
-  "scripts": {
-    "lint": "jshint opener.js"
+  "bugs": {
+    "url": "https://github.com/domenic/opener/issues"
   },
+  "dependencies": {},
+  "description": "Opens stuff, like webpages and files and executables, cross-platform",
   "devDependencies": {
     "jshint": "^2.6.3"
   },
-  "gitHead": "d0ee95b19951703462fa593baa16e81fdff7827c",
-  "bugs": {
-    "url": "https://github.com/domenic/opener/issues"
+  "directories": {},
+  "dist": {
+    "shasum": "897590acd1aed3311b703b58bccb4d43f56f2895",
+    "tarball": "http://registry.npmjs.org/opener/-/opener-1.4.1.tgz"
   },
+  "files": [
+    "opener.js"
+  ],
+  "gitHead": "d0ee95b19951703462fa593baa16e81fdff7827c",
   "homepage": "https://github.com/domenic/opener",
-  "_id": "opener@1.4.1",
-  "_shasum": "897590acd1aed3311b703b58bccb4d43f56f2895",
-  "_from": "opener@>=1.4.1 <1.5.0",
-  "_npmVersion": "2.7.0",
-  "_nodeVersion": "1.5.1",
-  "_npmUser": {
-    "name": "domenic",
-    "email": "d@domenic.me"
-  },
+  "license": "WTFPL",
+  "main": "opener.js",
   "maintainers": [
     {
       "name": "domenic",
       "email": "domenic@domenicdenicola.com"
     }
   ],
-  "dist": {
-    "shasum": "897590acd1aed3311b703b58bccb4d43f56f2895",
-    "tarball": "http://registry.npmjs.org/opener/-/opener-1.4.1.tgz"
+  "name": "opener",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/domenic/opener"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/opener/-/opener-1.4.1.tgz"
+  "scripts": {
+    "lint": "jshint opener.js"
+  },
+  "version": "1.4.1"
 }
diff --git a/deps/npm/node_modules/osenv/node_modules/os-homedir/index.js b/deps/npm/node_modules/os-homedir/index.js
similarity index 85%
rename from deps/npm/node_modules/osenv/node_modules/os-homedir/index.js
rename to deps/npm/node_modules/os-homedir/index.js
index 758ff653df10a9..33066166fe6692 100644
--- a/deps/npm/node_modules/osenv/node_modules/os-homedir/index.js
+++ b/deps/npm/node_modules/os-homedir/index.js
@@ -15,7 +15,7 @@ function homedir() {
 	}
 
 	if (process.platform === 'linux') {
-		return home || (user ? (process.getuid() === 0 ? '/root' : '/home/' + user) : null);
+		return home || (process.getuid() === 0 ? '/root' : (user ? '/home/' + user : null));
 	}
 
 	return home || null;
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/license b/deps/npm/node_modules/os-homedir/license
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/license
rename to deps/npm/node_modules/os-homedir/license
diff --git a/deps/npm/node_modules/osenv/node_modules/os-homedir/package.json b/deps/npm/node_modules/os-homedir/package.json
similarity index 52%
rename from deps/npm/node_modules/osenv/node_modules/os-homedir/package.json
rename to deps/npm/node_modules/os-homedir/package.json
index c9a3b650c0516d..893ce6c2f60daa 100644
--- a/deps/npm/node_modules/osenv/node_modules/os-homedir/package.json
+++ b/deps/npm/node_modules/os-homedir/package.json
@@ -1,70 +1,94 @@
 {
-  "name": "os-homedir",
-  "version": "1.0.0",
-  "description": "io.js 2.3.0 os.homedir() ponyfill",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sindresorhus/os-homedir.git"
+  "_args": [
+    [
+      "os-homedir@^1.0.0",
+      "/Users/rebecca/code/npm/node_modules/osenv"
+    ]
+  ],
+  "_from": "os-homedir@>=1.0.0 <2.0.0",
+  "_id": "os-homedir@1.0.1",
+  "_inCache": true,
+  "_location": "/os-homedir",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "sindresorhus@gmail.com",
+    "name": "sindresorhus"
+  },
+  "_npmVersion": "2.11.2",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "os-homedir",
+    "raw": "os-homedir@^1.0.0",
+    "rawSpec": "^1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
   },
+  "_requiredBy": [
+    "/osenv"
+  ],
+  "_resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz",
+  "_shasum": "0d62bdf44b916fd3bbdcf2cab191948fb094f007",
+  "_shrinkwrap": null,
+  "_spec": "os-homedir@^1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/osenv",
   "author": {
-    "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
+    "name": "Sindre Sorhus",
     "url": "sindresorhus.com"
   },
+  "bugs": {
+    "url": "https://github.com/sindresorhus/os-homedir/issues"
+  },
+  "dependencies": {},
+  "description": "io.js 2.3.0 os.homedir() ponyfill",
+  "devDependencies": {
+    "ava": "0.0.4",
+    "path-exists": "^1.0.0"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "0d62bdf44b916fd3bbdcf2cab191948fb094f007",
+    "tarball": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
+  },
   "engines": {
     "node": ">=0.10.0"
   },
-  "scripts": {
-    "test": "node test.js"
-  },
   "files": [
     "index.js"
   ],
+  "gitHead": "13ff83fbd13ebe286a6092286b2c634ab4534c5f",
+  "homepage": "https://github.com/sindresorhus/os-homedir",
   "keywords": [
     "built-in",
     "core",
-    "ponyfill",
-    "polyfill",
-    "shim",
-    "os",
-    "homedir",
-    "home",
     "dir",
     "directory",
     "folder",
-    "user",
-    "path"
+    "home",
+    "homedir",
+    "os",
+    "path",
+    "polyfill",
+    "ponyfill",
+    "shim",
+    "user"
   ],
-  "devDependencies": {
-    "ava": "0.0.4",
-    "path-exists": "^1.0.0"
-  },
-  "gitHead": "7e39e2e049de404f06233fa617ecf46fed997a78",
-  "bugs": {
-    "url": "https://github.com/sindresorhus/os-homedir/issues"
-  },
-  "homepage": "https://github.com/sindresorhus/os-homedir",
-  "_id": "os-homedir@1.0.0",
-  "_shasum": "e37078bc61b5869063053897257e39ec1261b702",
-  "_from": "os-homedir@>=1.0.0 <2.0.0",
-  "_npmVersion": "2.11.1",
-  "_nodeVersion": "2.3.0",
-  "_npmUser": {
-    "name": "sindresorhus",
-    "email": "sindresorhus@gmail.com"
-  },
-  "dist": {
-    "shasum": "e37078bc61b5869063053897257e39ec1261b702",
-    "tarball": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.0.tgz"
-  },
+  "license": "MIT",
   "maintainers": [
     {
       "name": "sindresorhus",
       "email": "sindresorhus@gmail.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "os-homedir",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/sindresorhus/os-homedir"
+  },
+  "scripts": {
+    "test": "node test.js"
+  },
+  "version": "1.0.1"
 }
diff --git a/deps/npm/node_modules/osenv/node_modules/os-homedir/readme.md b/deps/npm/node_modules/os-homedir/readme.md
similarity index 100%
rename from deps/npm/node_modules/osenv/node_modules/os-homedir/readme.md
rename to deps/npm/node_modules/os-homedir/readme.md
diff --git a/deps/npm/node_modules/osenv/node_modules/os-tmpdir/index.js b/deps/npm/node_modules/os-tmpdir/index.js
similarity index 100%
rename from deps/npm/node_modules/osenv/node_modules/os-tmpdir/index.js
rename to deps/npm/node_modules/os-tmpdir/index.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/license b/deps/npm/node_modules/os-tmpdir/license
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/license
rename to deps/npm/node_modules/os-tmpdir/license
diff --git a/deps/npm/node_modules/osenv/node_modules/os-tmpdir/package.json b/deps/npm/node_modules/os-tmpdir/package.json
similarity index 66%
rename from deps/npm/node_modules/osenv/node_modules/os-tmpdir/package.json
rename to deps/npm/node_modules/os-tmpdir/package.json
index f8b2682bf83cfe..76f16c4895e30f 100644
--- a/deps/npm/node_modules/osenv/node_modules/os-tmpdir/package.json
+++ b/deps/npm/node_modules/os-tmpdir/package.json
@@ -1,69 +1,94 @@
 {
-  "name": "os-tmpdir",
-  "version": "1.0.1",
-  "description": "Node.js os.tmpdir() ponyfill",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/sindresorhus/os-tmpdir"
+  "_args": [
+    [
+      "os-tmpdir@^1.0.0",
+      "/Users/rebecca/code/npm/node_modules/osenv"
+    ]
+  ],
+  "_from": "os-tmpdir@>=1.0.0 <2.0.0",
+  "_id": "os-tmpdir@1.0.1",
+  "_inCache": true,
+  "_location": "/os-tmpdir",
+  "_nodeVersion": "0.12.3",
+  "_npmUser": {
+    "email": "sindresorhus@gmail.com",
+    "name": "sindresorhus"
   },
+  "_npmVersion": "2.9.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "os-tmpdir",
+    "raw": "os-tmpdir@^1.0.0",
+    "rawSpec": "^1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/osenv"
+  ],
+  "_resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz",
+  "_shasum": "e9b423a1edaf479882562e92ed71d7743a071b6e",
+  "_shrinkwrap": null,
+  "_spec": "os-tmpdir@^1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/osenv",
   "author": {
-    "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
+    "name": "Sindre Sorhus",
     "url": "sindresorhus.com"
   },
+  "bugs": {
+    "url": "https://github.com/sindresorhus/os-tmpdir/issues"
+  },
+  "dependencies": {},
+  "description": "Node.js os.tmpdir() ponyfill",
+  "devDependencies": {
+    "ava": "0.0.4"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "e9b423a1edaf479882562e92ed71d7743a071b6e",
+    "tarball": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
+  },
   "engines": {
     "node": ">=0.10.0"
   },
-  "scripts": {
-    "test": "node test.js"
-  },
   "files": [
     "index.js"
   ],
+  "gitHead": "5c5d355f81378980db629d60128ad03e02b1c1e5",
+  "homepage": "https://github.com/sindresorhus/os-tmpdir",
   "keywords": [
     "built-in",
     "core",
-    "ponyfill",
+    "dir",
+    "directory",
+    "env",
+    "environment",
+    "os",
     "polyfill",
+    "ponyfill",
     "shim",
-    "os",
-    "tmpdir",
+    "temp",
     "tempdir",
     "tmp",
-    "temp",
-    "dir",
-    "directory",
-    "env",
-    "environment"
+    "tmpdir"
   ],
-  "devDependencies": {
-    "ava": "0.0.4"
-  },
-  "gitHead": "5c5d355f81378980db629d60128ad03e02b1c1e5",
-  "bugs": {
-    "url": "https://github.com/sindresorhus/os-tmpdir/issues"
-  },
-  "homepage": "https://github.com/sindresorhus/os-tmpdir",
-  "_id": "os-tmpdir@1.0.1",
-  "_shasum": "e9b423a1edaf479882562e92ed71d7743a071b6e",
-  "_from": "os-tmpdir@>=1.0.0 <2.0.0",
-  "_npmVersion": "2.9.1",
-  "_nodeVersion": "0.12.3",
-  "_npmUser": {
-    "name": "sindresorhus",
-    "email": "sindresorhus@gmail.com"
-  },
-  "dist": {
-    "shasum": "e9b423a1edaf479882562e92ed71d7743a071b6e",
-    "tarball": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
-  },
+  "license": "MIT",
   "maintainers": [
     {
       "name": "sindresorhus",
       "email": "sindresorhus@gmail.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
+  "name": "os-tmpdir",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/sindresorhus/os-tmpdir"
+  },
+  "scripts": {
+    "test": "node test.js"
+  },
+  "version": "1.0.1"
 }
diff --git a/deps/npm/node_modules/osenv/node_modules/os-tmpdir/readme.md b/deps/npm/node_modules/os-tmpdir/readme.md
similarity index 100%
rename from deps/npm/node_modules/osenv/node_modules/os-tmpdir/readme.md
rename to deps/npm/node_modules/os-tmpdir/readme.md
diff --git a/deps/npm/node_modules/osenv/package.json b/deps/npm/node_modules/osenv/package.json
index d5718bdb1111ab..98144d44157b35 100644
--- a/deps/npm/node_modules/osenv/package.json
+++ b/deps/npm/node_modules/osenv/package.json
@@ -1,58 +1,74 @@
 {
-  "name": "osenv",
-  "version": "0.1.3",
-  "main": "osenv.js",
-  "directories": {
-    "test": "test"
+  "_args": [
+    [
+      "osenv@~0.1.2",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "osenv@>=0.1.2 <0.2.0",
+  "_id": "osenv@0.1.3",
+  "_inCache": true,
+  "_location": "/osenv",
+  "_nodeVersion": "2.2.1",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
+  },
+  "_npmVersion": "3.0.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "osenv",
+    "raw": "osenv@~0.1.2",
+    "rawSpec": "~0.1.2",
+    "scope": null,
+    "spec": ">=0.1.2 <0.2.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/",
+    "/node-gyp"
+  ],
+  "_resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
+  "_shasum": "83cf05c6d6458fc4d5ac6362ea325d92f2754217",
+  "_shrinkwrap": null,
+  "_spec": "osenv@~0.1.2",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
+    "url": "http://blog.izs.me/"
+  },
+  "bugs": {
+    "url": "https://github.com/npm/osenv/issues"
   },
   "dependencies": {
     "os-homedir": "^1.0.0",
     "os-tmpdir": "^1.0.0"
   },
+  "description": "Look up environment settings specific to different operating systems",
   "devDependencies": {
     "tap": "^1.2.0"
   },
-  "scripts": {
-    "test": "tap test/*.js"
+  "directories": {
+    "test": "test"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/osenv.git"
+  "dist": {
+    "shasum": "83cf05c6d6458fc4d5ac6362ea325d92f2754217",
+    "tarball": "http://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz"
   },
+  "gitHead": "f746b3405d8f9e28054d11b97e1436f6a15016c4",
+  "homepage": "https://github.com/npm/osenv#readme",
   "keywords": [
     "environment",
-    "variable",
     "home",
-    "tmpdir",
     "path",
     "prompt",
-    "ps1"
+    "ps1",
+    "tmpdir",
+    "variable"
   ],
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
-  },
   "license": "ISC",
-  "description": "Look up environment settings specific to different operating systems",
-  "gitHead": "f746b3405d8f9e28054d11b97e1436f6a15016c4",
-  "bugs": {
-    "url": "https://github.com/npm/osenv/issues"
-  },
-  "homepage": "https://github.com/npm/osenv#readme",
-  "_id": "osenv@0.1.3",
-  "_shasum": "83cf05c6d6458fc4d5ac6362ea325d92f2754217",
-  "_from": "osenv@0.1.3",
-  "_npmVersion": "3.0.0",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
-  },
-  "dist": {
-    "shasum": "83cf05c6d6458fc4d5ac6362ea325d92f2754217",
-    "tarball": "http://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz"
-  },
+  "main": "osenv.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -71,5 +87,14 @@
       "email": "me@re-becca.org"
     }
   ],
-  "_resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz"
+  "name": "osenv",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/osenv.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "0.1.3"
 }
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/.npmignore b/deps/npm/node_modules/path-array/.npmignore
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/.npmignore
rename to deps/npm/node_modules/path-array/.npmignore
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/.travis.yml b/deps/npm/node_modules/path-array/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/.travis.yml
rename to deps/npm/node_modules/path-array/.travis.yml
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/History.md b/deps/npm/node_modules/path-array/History.md
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/History.md
rename to deps/npm/node_modules/path-array/History.md
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/README.md b/deps/npm/node_modules/path-array/README.md
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/README.md
rename to deps/npm/node_modules/path-array/README.md
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/index.js b/deps/npm/node_modules/path-array/index.js
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/index.js
rename to deps/npm/node_modules/path-array/index.js
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/package.json b/deps/npm/node_modules/path-array/package.json
similarity index 66%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/package.json
rename to deps/npm/node_modules/path-array/package.json
index 41d25482b86772..1bb9fe1b1040e6 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/path-array/package.json
+++ b/deps/npm/node_modules/path-array/package.json
@@ -1,56 +1,79 @@
 {
-  "name": "path-array",
-  "version": "1.0.0",
-  "description": "Treat your $PATH like a JavaScript Array",
-  "main": "index.js",
-  "scripts": {
-    "test": "mocha --reporter spec"
+  "_args": [
+    [
+      "path-array@^1.0.0",
+      "/Users/rebecca/code/npm/node_modules/node-gyp"
+    ]
+  ],
+  "_from": "path-array@>=1.0.0 <2.0.0",
+  "_id": "path-array@1.0.0",
+  "_inCache": true,
+  "_location": "/path-array",
+  "_npmUser": {
+    "email": "nathan@tootallnate.net",
+    "name": "tootallnate"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/TooTallNate/node-path-array.git"
+  "_npmVersion": "1.4.28",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "path-array",
+    "raw": "path-array@^1.0.0",
+    "rawSpec": "^1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
   },
-  "keywords": [
-    "PATH",
-    "env",
-    "array"
+  "_requiredBy": [
+    "/node-gyp"
   ],
+  "_resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
+  "_shasum": "6c14130c33084f0150553c657b38397ab67aaa4e",
+  "_shrinkwrap": null,
+  "_spec": "path-array@^1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp",
   "author": {
-    "name": "Nathan Rajlich",
     "email": "nathan@tootallnate.net",
+    "name": "Nathan Rajlich",
     "url": "http://n8.io/"
   },
-  "license": "MIT",
   "bugs": {
     "url": "https://github.com/TooTallNate/node-path-array/issues"
   },
-  "homepage": "https://github.com/TooTallNate/node-path-array",
   "dependencies": {
     "array-index": "~0.1.0"
   },
+  "description": "Treat your $PATH like a JavaScript Array",
   "devDependencies": {
     "mocha": "~1.16.1"
   },
-  "gitHead": "5d1fedd54e4413459f67e4a4babb024144cd00d0",
-  "_id": "path-array@1.0.0",
-  "_shasum": "6c14130c33084f0150553c657b38397ab67aaa4e",
-  "_from": "path-array@>=1.0.0 <2.0.0",
-  "_npmVersion": "1.4.28",
-  "_npmUser": {
-    "name": "tootallnate",
-    "email": "nathan@tootallnate.net"
+  "directories": {},
+  "dist": {
+    "shasum": "6c14130c33084f0150553c657b38397ab67aaa4e",
+    "tarball": "http://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz"
   },
+  "gitHead": "5d1fedd54e4413459f67e4a4babb024144cd00d0",
+  "homepage": "https://github.com/TooTallNate/node-path-array",
+  "keywords": [
+    "PATH",
+    "array",
+    "env"
+  ],
+  "license": "MIT",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "tootallnate",
       "email": "nathan@tootallnate.net"
     }
   ],
-  "dist": {
-    "shasum": "6c14130c33084f0150553c657b38397ab67aaa4e",
-    "tarball": "http://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz"
+  "name": "path-array",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/TooTallNate/node-path-array.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "mocha --reporter spec"
+  },
+  "version": "1.0.0"
 }
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/test/test.js b/deps/npm/node_modules/path-array/test/test.js
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/path-array/test/test.js
rename to deps/npm/node_modules/path-array/test/test.js
diff --git a/deps/npm/node_modules/glob/node_modules/path-is-absolute/index.js b/deps/npm/node_modules/path-is-absolute/index.js
similarity index 100%
rename from deps/npm/node_modules/glob/node_modules/path-is-absolute/index.js
rename to deps/npm/node_modules/path-is-absolute/index.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/license b/deps/npm/node_modules/path-is-absolute/license
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/license
rename to deps/npm/node_modules/path-is-absolute/license
diff --git a/deps/npm/node_modules/glob/node_modules/path-is-absolute/package.json b/deps/npm/node_modules/path-is-absolute/package.json
similarity index 64%
rename from deps/npm/node_modules/glob/node_modules/path-is-absolute/package.json
rename to deps/npm/node_modules/path-is-absolute/package.json
index 39372636f3fb4f..8a704f11b7b8c0 100644
--- a/deps/npm/node_modules/glob/node_modules/path-is-absolute/package.json
+++ b/deps/npm/node_modules/path-is-absolute/package.json
@@ -1,70 +1,95 @@
 {
-  "name": "path-is-absolute",
-  "version": "1.0.0",
-  "description": "Node.js 0.12 path.isAbsolute() ponyfill",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sindresorhus/path-is-absolute.git"
+  "_args": [
+    [
+      "path-is-absolute@^1.0.0",
+      "/Users/rebecca/code/npm/node_modules/glob"
+    ]
+  ],
+  "_from": "path-is-absolute@>=1.0.0 <2.0.0",
+  "_id": "path-is-absolute@1.0.0",
+  "_inCache": true,
+  "_location": "/path-is-absolute",
+  "_nodeVersion": "0.12.0",
+  "_npmUser": {
+    "email": "sindresorhus@gmail.com",
+    "name": "sindresorhus"
+  },
+  "_npmVersion": "2.5.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "path-is-absolute",
+    "raw": "path-is-absolute@^1.0.0",
+    "rawSpec": "^1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
   },
+  "_requiredBy": [
+    "/glob"
+  ],
+  "_resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
+  "_shasum": "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912",
+  "_shrinkwrap": null,
+  "_spec": "path-is-absolute@^1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/glob",
   "author": {
-    "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
+    "name": "Sindre Sorhus",
     "url": "sindresorhus.com"
   },
+  "bugs": {
+    "url": "https://github.com/sindresorhus/path-is-absolute/issues"
+  },
+  "dependencies": {},
+  "description": "Node.js 0.12 path.isAbsolute() ponyfill",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912",
+    "tarball": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+  },
   "engines": {
     "node": ">=0.10.0"
   },
-  "scripts": {
-    "test": "node test.js"
-  },
   "files": [
     "index.js"
   ],
+  "gitHead": "7a76a0c9f2263192beedbe0a820e4d0baee5b7a1",
+  "homepage": "https://github.com/sindresorhus/path-is-absolute",
   "keywords": [
-    "path",
-    "paths",
-    "file",
-    "dir",
     "absolute",
-    "isabsolute",
-    "is-absolute",
     "built-in",
-    "util",
-    "utils",
+    "check",
     "core",
-    "ponyfill",
+    "detect",
+    "dir",
+    "file",
+    "is",
+    "is-absolute",
+    "isabsolute",
+    "path",
+    "paths",
     "polyfill",
+    "ponyfill",
     "shim",
-    "is",
-    "detect",
-    "check"
+    "util",
+    "utils"
   ],
-  "gitHead": "7a76a0c9f2263192beedbe0a820e4d0baee5b7a1",
-  "bugs": {
-    "url": "https://github.com/sindresorhus/path-is-absolute/issues"
-  },
-  "homepage": "https://github.com/sindresorhus/path-is-absolute",
-  "_id": "path-is-absolute@1.0.0",
-  "_shasum": "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912",
-  "_from": "path-is-absolute@>=1.0.0 <2.0.0",
-  "_npmVersion": "2.5.1",
-  "_nodeVersion": "0.12.0",
-  "_npmUser": {
-    "name": "sindresorhus",
-    "email": "sindresorhus@gmail.com"
-  },
+  "license": "MIT",
   "maintainers": [
     {
       "name": "sindresorhus",
       "email": "sindresorhus@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912",
-    "tarball": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+  "name": "path-is-absolute",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/sindresorhus/path-is-absolute"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "node test.js"
+  },
+  "version": "1.0.0"
 }
diff --git a/deps/npm/node_modules/glob/node_modules/path-is-absolute/readme.md b/deps/npm/node_modules/path-is-absolute/readme.md
similarity index 100%
rename from deps/npm/node_modules/glob/node_modules/path-is-absolute/readme.md
rename to deps/npm/node_modules/path-is-absolute/readme.md
diff --git a/deps/npm/node_modules/path-is-inside/package.json b/deps/npm/node_modules/path-is-inside/package.json
index b96d6fea0e8b92..fbcf469a361e60 100644
--- a/deps/npm/node_modules/path-is-inside/package.json
+++ b/deps/npm/node_modules/path-is-inside/package.json
@@ -1,43 +1,81 @@
 {
-  "name": "path-is-inside",
-  "description": "Tests whether one path is inside another path",
-  "keywords": [
-    "path",
-    "directory",
-    "folder",
-    "inside",
-    "relative"
+  "_args": [
+    [
+      "path-is-inside@~1.0.0",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "path-is-inside@>=1.0.0 <1.1.0",
+  "_id": "path-is-inside@1.0.1",
+  "_inCache": true,
+  "_location": "/path-is-inside",
+  "_npmUser": {
+    "email": "domenic@domenicdenicola.com",
+    "name": "domenic"
+  },
+  "_npmVersion": "1.3.25",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "path-is-inside",
+    "raw": "path-is-inside@~1.0.0",
+    "rawSpec": "~1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <1.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
   ],
-  "version": "1.0.1",
+  "_resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz",
+  "_shasum": "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89",
+  "_shrinkwrap": null,
+  "_spec": "path-is-inside@~1.0.0",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Domenic Denicola",
     "email": "domenic@domenicdenicola.com",
+    "name": "Domenic Denicola",
     "url": "http://domenic.me"
   },
-  "license": "WTFPL",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/domenic/path-is-inside.git"
-  },
   "bugs": {
     "url": "http://github.com/domenic/path-is-inside/issues"
   },
-  "main": "lib/path-is-inside.js",
-  "scripts": {
-    "test": "mocha",
-    "lint": "jshint lib"
-  },
+  "dependencies": {},
+  "description": "Tests whether one path is inside another path",
   "devDependencies": {
     "jshint": "~2.3.0",
     "mocha": "~1.15.1"
   },
-  "readme": "# Is This Path Inside This Other Path?\n\nIt turns out this question isn't trivial to answer using Node's built-in path APIs. A naive `indexOf`-based solution will fail sometimes on Windows, which is case-insensitive (see e.g. [isaacs/npm#4214][]). You might then think to be clever with `path.resolve`, but you have to be careful to account for situations whether the paths have different drive letters, or else you'll cause bugs like [isaacs/npm#4313][]. And let's not even get started on trailing slashes.\n\nThe **path-is-inside** package will give you a robust, cross-platform way of detecting whether a given path is inside another path.\n\n## Usage\n\nPretty simple. First the path being tested; then the potential parent. Like so:\n\n```js\nvar pathIsInside = require(\"path-is-inside\");\n\npathIsInside(\"/x/y/z\", \"/x/y\") // true\npathIsInside(\"/x/y\", \"/x/y/z\") // false\n```\n\n## OS-Specific Behavior\n\nLike Node's built-in path module, path-is-inside treats all file paths on Windows as case-insensitive, whereas it treats all file paths on *-nix operating systems as case-sensitive. Keep this in mind especially when working on a Mac, where, despite Node's defaults, the OS usually treats paths case-insensitively.\n\nIn practice, this means:\n\n```js\n// On Windows\n\npathIsInside(\"C:\\\\X\\\\Y\\\\Z\", \"C:\\\\x\\\\y\") // true\n\n// On *-nix, including Mac OS X\n\npathIsInside(\"/X/Y/Z\", \"/x/y\") // false\n```\n\n[isaacs/npm#4214]: https://github.com/isaacs/npm/pull/4214\n[isaacs/npm#4313]: https://github.com/isaacs/npm/issues/4313\n",
-  "readmeFilename": "README.md",
-  "homepage": "https://github.com/domenic/path-is-inside",
-  "_id": "path-is-inside@1.0.1",
+  "directories": {},
   "dist": {
-    "shasum": "c5e6c4764c4cd41f2ac839c53be5621d085726b3"
+    "shasum": "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89",
+    "tarball": "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"
+  },
+  "homepage": "https://github.com/domenic/path-is-inside",
+  "installable": true,
+  "keywords": [
+    "directory",
+    "folder",
+    "inside",
+    "path",
+    "relative"
+  ],
+  "license": "WTFPL",
+  "main": "lib/path-is-inside.js",
+  "maintainers": [
+    {
+      "name": "domenic",
+      "email": "domenic@domenicdenicola.com"
+    }
+  ],
+  "name": "path-is-inside",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/domenic/path-is-inside.git"
+  },
+  "scripts": {
+    "lint": "jshint lib",
+    "test": "mocha"
   },
-  "_from": "path-is-inside@1.0.1",
-  "_resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"
+  "version": "1.0.1"
 }
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml b/deps/npm/node_modules/process-nextick-args/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml
rename to deps/npm/node_modules/process-nextick-args/.travis.yml
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/index.js b/deps/npm/node_modules/process-nextick-args/index.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/index.js
rename to deps/npm/node_modules/process-nextick-args/index.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/license.md b/deps/npm/node_modules/process-nextick-args/license.md
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/license.md
rename to deps/npm/node_modules/process-nextick-args/license.md
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/package.json b/deps/npm/node_modules/process-nextick-args/package.json
similarity index 57%
rename from deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/package.json
rename to deps/npm/node_modules/process-nextick-args/package.json
index 087586e8f8cedd..f6f94b306a9aa8 100644
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/package.json
+++ b/deps/npm/node_modules/process-nextick-args/package.json
@@ -1,45 +1,73 @@
 {
-  "name": "process-nextick-args",
-  "version": "1.0.3",
-  "description": "process.nextTick but always with args",
-  "main": "index.js",
-  "scripts": {
-    "test": "node test.js"
+  "_args": [
+    [
+      "process-nextick-args@~1.0.0",
+      "/Users/rebecca/code/npm/node_modules/bl/node_modules/readable-stream"
+    ]
+  ],
+  "_from": "process-nextick-args@>=1.0.0 <1.1.0",
+  "_id": "process-nextick-args@1.0.3",
+  "_inCache": true,
+  "_location": "/process-nextick-args",
+  "_nodeVersion": "2.5.0",
+  "_npmUser": {
+    "email": "calvin.metcalf@gmail.com",
+    "name": "cwmma"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/calvinmetcalf/process-nextick-args.git"
+  "_npmVersion": "2.9.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "process-nextick-args",
+    "raw": "process-nextick-args@~1.0.0",
+    "rawSpec": "~1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <1.1.0",
+    "type": "range"
   },
+  "_requiredBy": [
+    "/bl/readable-stream",
+    "/concat-stream/readable-stream",
+    "/tap-parser/readable-stream",
+    "/tap/readable-stream"
+  ],
+  "_resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz",
+  "_shasum": "e272eed825d5e9f4ea74d8d73b1fe311c3beb630",
+  "_shrinkwrap": null,
+  "_spec": "process-nextick-args@~1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/bl/node_modules/readable-stream",
   "author": "",
-  "license": "MIT",
   "bugs": {
     "url": "https://github.com/calvinmetcalf/process-nextick-args/issues"
   },
-  "homepage": "https://github.com/calvinmetcalf/process-nextick-args",
+  "dependencies": {},
+  "description": "process.nextTick but always with args",
   "devDependencies": {
     "tap": "~0.2.6"
   },
-  "gitHead": "e855846a69662b9489f1ad3dde1ebf2ccc4370b8",
-  "_id": "process-nextick-args@1.0.3",
-  "_shasum": "e272eed825d5e9f4ea74d8d73b1fe311c3beb630",
-  "_from": "process-nextick-args@>=1.0.0 <1.1.0",
-  "_npmVersion": "2.9.0",
-  "_nodeVersion": "2.5.0",
-  "_npmUser": {
-    "name": "cwmma",
-    "email": "calvin.metcalf@gmail.com"
-  },
+  "directories": {},
   "dist": {
     "shasum": "e272eed825d5e9f4ea74d8d73b1fe311c3beb630",
     "tarball": "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
   },
+  "gitHead": "e855846a69662b9489f1ad3dde1ebf2ccc4370b8",
+  "homepage": "https://github.com/calvinmetcalf/process-nextick-args",
+  "installable": true,
+  "license": "MIT",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "cwmma",
       "email": "calvin.metcalf@gmail.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "process-nextick-args",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/calvinmetcalf/process-nextick-args.git"
+  },
+  "scripts": {
+    "test": "node test.js"
+  },
+  "version": "1.0.3"
 }
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/readme.md b/deps/npm/node_modules/process-nextick-args/readme.md
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/readme.md
rename to deps/npm/node_modules/process-nextick-args/readme.md
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/test.js b/deps/npm/node_modules/process-nextick-args/test.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/test.js
rename to deps/npm/node_modules/process-nextick-args/test.js
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/.npmignore b/deps/npm/node_modules/promzard/.npmignore
similarity index 100%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/.npmignore
rename to deps/npm/node_modules/promzard/.npmignore
diff --git a/deps/npm/node_modules/char-spinner/LICENSE b/deps/npm/node_modules/promzard/LICENSE
similarity index 100%
rename from deps/npm/node_modules/char-spinner/LICENSE
rename to deps/npm/node_modules/promzard/LICENSE
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/README.md b/deps/npm/node_modules/promzard/README.md
similarity index 100%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/README.md
rename to deps/npm/node_modules/promzard/README.md
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/example/buffer.js b/deps/npm/node_modules/promzard/example/buffer.js
similarity index 100%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/example/buffer.js
rename to deps/npm/node_modules/promzard/example/buffer.js
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/example/index.js b/deps/npm/node_modules/promzard/example/index.js
similarity index 100%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/example/index.js
rename to deps/npm/node_modules/promzard/example/index.js
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/example/npm-init/README.md b/deps/npm/node_modules/promzard/example/npm-init/README.md
similarity index 100%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/example/npm-init/README.md
rename to deps/npm/node_modules/promzard/example/npm-init/README.md
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/example/npm-init/init-input.js b/deps/npm/node_modules/promzard/example/npm-init/init-input.js
similarity index 100%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/example/npm-init/init-input.js
rename to deps/npm/node_modules/promzard/example/npm-init/init-input.js
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/example/npm-init/init.js b/deps/npm/node_modules/promzard/example/npm-init/init.js
similarity index 100%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/example/npm-init/init.js
rename to deps/npm/node_modules/promzard/example/npm-init/init.js
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/example/npm-init/package.json b/deps/npm/node_modules/promzard/example/npm-init/package.json
similarity index 100%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/example/npm-init/package.json
rename to deps/npm/node_modules/promzard/example/npm-init/package.json
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/example/substack-input.js b/deps/npm/node_modules/promzard/example/substack-input.js
similarity index 99%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/example/substack-input.js
rename to deps/npm/node_modules/promzard/example/substack-input.js
index bf7aedb82d41fd..c049c20f9a2736 100644
--- a/deps/npm/node_modules/init-package-json/node_modules/promzard/example/substack-input.js
+++ b/deps/npm/node_modules/promzard/example/substack-input.js
@@ -17,7 +17,7 @@ module.exports = {
             ;
         }
         catch (e) {}
-        
+
         return prompt('description', value);
     })(),
     "main" : prompt('entry point', 'index.js'),
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/package.json b/deps/npm/node_modules/promzard/package.json
similarity index 61%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/package.json
rename to deps/npm/node_modules/promzard/package.json
index 1407e97be584d7..e91ad77dd899ac 100644
--- a/deps/npm/node_modules/init-package-json/node_modules/promzard/package.json
+++ b/deps/npm/node_modules/promzard/package.json
@@ -1,51 +1,74 @@
 {
+  "_args": [
+    [
+      "promzard@^0.3.0",
+      "/Users/rebecca/code/npm/node_modules/init-package-json"
+    ]
+  ],
+  "_from": "promzard@>=0.3.0 <0.4.0",
+  "_id": "promzard@0.3.0",
+  "_inCache": true,
+  "_location": "/promzard",
+  "_nodeVersion": "1.4.2",
+  "_npmUser": {
+    "email": "i@izs.me",
+    "name": "isaacs"
+  },
+  "_npmVersion": "2.7.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "promzard",
+    "raw": "promzard@^0.3.0",
+    "rawSpec": "^0.3.0",
+    "scope": null,
+    "spec": ">=0.3.0 <0.4.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/init-package-json"
+  ],
+  "_resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz",
+  "_shasum": "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee",
+  "_shrinkwrap": null,
+  "_spec": "promzard@^0.3.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/init-package-json",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "name": "promzard",
-  "description": "prompting wizardly",
-  "version": "0.3.0",
-  "repository": {
-    "url": "git://github.com/isaacs/promzard.git"
+  "bugs": {
+    "url": "https://github.com/isaacs/promzard/issues"
   },
   "dependencies": {
     "read": "1"
   },
+  "description": "prompting wizardly",
   "devDependencies": {
     "tap": "~0.2.5"
   },
-  "main": "promzard.js",
-  "scripts": {
-    "test": "tap test/*.js"
+  "directories": {},
+  "dist": {
+    "shasum": "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee",
+    "tarball": "http://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
   },
-  "license": "ISC",
   "gitHead": "780ead051299aa28be2584199ab6fa503a32d354",
-  "bugs": {
-    "url": "https://github.com/isaacs/promzard/issues"
-  },
   "homepage": "https://github.com/isaacs/promzard",
-  "_id": "promzard@0.3.0",
-  "_shasum": "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee",
-  "_from": "promzard@>=0.3.0 <0.4.0",
-  "_npmVersion": "2.7.1",
-  "_nodeVersion": "1.4.2",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "i@izs.me"
-  },
+  "license": "ISC",
+  "main": "promzard.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "dist": {
-    "shasum": "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee",
-    "tarball": "http://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
+  "name": "promzard",
+  "optionalDependencies": {},
+  "repository": {
+    "url": "git://github.com/isaacs/promzard"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "0.3.0"
 }
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/promzard.js b/deps/npm/node_modules/promzard/promzard.js
similarity index 99%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/promzard.js
rename to deps/npm/node_modules/promzard/promzard.js
index da1abca9535e4f..424152a802eb02 100644
--- a/deps/npm/node_modules/init-package-json/node_modules/promzard/promzard.js
+++ b/deps/npm/node_modules/promzard/promzard.js
@@ -235,4 +235,3 @@ PromZard.prototype.prompt = function (pdt, cb) {
 
   read({ prompt: prompt + ':' , default: def }, cb)
 }
-
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/test/basic.js b/deps/npm/node_modules/promzard/test/basic.js
similarity index 100%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/test/basic.js
rename to deps/npm/node_modules/promzard/test/basic.js
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/test/buffer.js b/deps/npm/node_modules/promzard/test/buffer.js
similarity index 100%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/test/buffer.js
rename to deps/npm/node_modules/promzard/test/buffer.js
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/test/exports.input b/deps/npm/node_modules/promzard/test/exports.input
similarity index 100%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/test/exports.input
rename to deps/npm/node_modules/promzard/test/exports.input
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/test/exports.js b/deps/npm/node_modules/promzard/test/exports.js
similarity index 100%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/test/exports.js
rename to deps/npm/node_modules/promzard/test/exports.js
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/test/fn.input b/deps/npm/node_modules/promzard/test/fn.input
similarity index 100%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/test/fn.input
rename to deps/npm/node_modules/promzard/test/fn.input
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/test/fn.js b/deps/npm/node_modules/promzard/test/fn.js
similarity index 100%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/test/fn.js
rename to deps/npm/node_modules/promzard/test/fn.js
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/test/simple.input b/deps/npm/node_modules/promzard/test/simple.input
similarity index 100%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/test/simple.input
rename to deps/npm/node_modules/promzard/test/simple.input
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/test/simple.js b/deps/npm/node_modules/promzard/test/simple.js
similarity index 97%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/test/simple.js
rename to deps/npm/node_modules/promzard/test/simple.js
index 034a86475afbd5..bcf8791113ead7 100644
--- a/deps/npm/node_modules/init-package-json/node_modules/promzard/test/simple.js
+++ b/deps/npm/node_modules/promzard/test/simple.js
@@ -3,7 +3,7 @@ var promzard = require('../');
 
 test('simple', function (t) {
     t.plan(1);
-    
+
     var ctx = { tmpdir : '/tmp' }
     var file = __dirname + '/simple.input';
     promzard(file, ctx, function (err, output) {
@@ -19,11 +19,11 @@ test('simple', function (t) {
             output
         );
     });
-    
+
     setTimeout(function () {
         process.stdin.emit('data', '\n');
     }, 100);
-    
+
     setTimeout(function () {
         process.stdin.emit('data', '55\n');
     }, 200);
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/test/validate.input b/deps/npm/node_modules/promzard/test/validate.input
similarity index 100%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/test/validate.input
rename to deps/npm/node_modules/promzard/test/validate.input
diff --git a/deps/npm/node_modules/init-package-json/node_modules/promzard/test/validate.js b/deps/npm/node_modules/promzard/test/validate.js
similarity index 100%
rename from deps/npm/node_modules/init-package-json/node_modules/promzard/test/validate.js
rename to deps/npm/node_modules/promzard/test/validate.js
diff --git a/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/LICENSE b/deps/npm/node_modules/proto-list/LICENSE
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/LICENSE
rename to deps/npm/node_modules/proto-list/LICENSE
diff --git a/deps/npm/node_modules/config-chain/node_modules/proto-list/README.md b/deps/npm/node_modules/proto-list/README.md
similarity index 100%
rename from deps/npm/node_modules/config-chain/node_modules/proto-list/README.md
rename to deps/npm/node_modules/proto-list/README.md
diff --git a/deps/npm/node_modules/config-chain/node_modules/proto-list/package.json b/deps/npm/node_modules/proto-list/package.json
similarity index 63%
rename from deps/npm/node_modules/config-chain/node_modules/proto-list/package.json
rename to deps/npm/node_modules/proto-list/package.json
index 458621ad892adf..ff0b6b60598cf8 100644
--- a/deps/npm/node_modules/config-chain/node_modules/proto-list/package.json
+++ b/deps/npm/node_modules/proto-list/package.json
@@ -1,48 +1,73 @@
 {
-  "name": "proto-list",
-  "version": "1.2.4",
-  "description": "A utility for managing a prototype chain",
-  "main": "./proto-list.js",
+  "_args": [
+    [
+      "proto-list@~1.2.1",
+      "/Users/rebecca/code/npm/node_modules/config-chain"
+    ]
+  ],
+  "_from": "proto-list@>=1.2.1 <1.3.0",
+  "_id": "proto-list@1.2.4",
+  "_inCache": true,
+  "_location": "/proto-list",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
+  },
+  "_npmVersion": "2.10.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "proto-list",
+    "raw": "proto-list@~1.2.1",
+    "rawSpec": "~1.2.1",
+    "scope": null,
+    "spec": ">=1.2.1 <1.3.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/config-chain"
+  ],
+  "_resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+  "_shasum": "212d5bfe1318306a420f6402b8e26ff39647a849",
+  "_shrinkwrap": null,
+  "_spec": "proto-list@~1.2.1",
+  "_where": "/Users/rebecca/code/npm/node_modules/config-chain",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/isaacs/proto-list.git"
-  },
-  "license": "ISC",
-  "devDependencies": {
-    "tap": "0"
-  },
-  "gitHead": "9e4af12d4dddee2fd531f0fe0c21c9cfacb78ac0",
   "bugs": {
     "url": "https://github.com/isaacs/proto-list/issues"
   },
-  "homepage": "https://github.com/isaacs/proto-list#readme",
-  "_id": "proto-list@1.2.4",
-  "_shasum": "212d5bfe1318306a420f6402b8e26ff39647a849",
-  "_from": "proto-list@>=1.2.1 <1.3.0",
-  "_npmVersion": "2.10.0",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
+  "dependencies": {},
+  "description": "A utility for managing a prototype chain",
+  "devDependencies": {
+    "tap": "0"
   },
+  "directories": {},
   "dist": {
     "shasum": "212d5bfe1318306a420f6402b8e26ff39647a849",
     "tarball": "http://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
   },
+  "gitHead": "9e4af12d4dddee2fd531f0fe0c21c9cfacb78ac0",
+  "homepage": "https://github.com/isaacs/proto-list#readme",
+  "license": "ISC",
+  "main": "./proto-list.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
+  "name": "proto-list",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/isaacs/proto-list.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.2.4"
 }
diff --git a/deps/npm/node_modules/config-chain/node_modules/proto-list/proto-list.js b/deps/npm/node_modules/proto-list/proto-list.js
similarity index 100%
rename from deps/npm/node_modules/config-chain/node_modules/proto-list/proto-list.js
rename to deps/npm/node_modules/proto-list/proto-list.js
diff --git a/deps/npm/node_modules/config-chain/node_modules/proto-list/test/basic.js b/deps/npm/node_modules/proto-list/test/basic.js
similarity index 100%
rename from deps/npm/node_modules/config-chain/node_modules/proto-list/test/basic.js
rename to deps/npm/node_modules/proto-list/test/basic.js
diff --git a/deps/npm/node_modules/request/node_modules/qs/.eslintignore b/deps/npm/node_modules/qs/.eslintignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/qs/.eslintignore
rename to deps/npm/node_modules/qs/.eslintignore
diff --git a/deps/npm/node_modules/request/node_modules/qs/.npmignore b/deps/npm/node_modules/qs/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/qs/.npmignore
rename to deps/npm/node_modules/qs/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/.travis.yml b/deps/npm/node_modules/qs/.travis.yml
old mode 100755
new mode 100644
similarity index 98%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/.travis.yml
rename to deps/npm/node_modules/qs/.travis.yml
index dd1b24f13ac1f8..7a64dd2210cb10
--- a/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/.travis.yml
+++ b/deps/npm/node_modules/qs/.travis.yml
@@ -5,4 +5,3 @@ node_js:
   - 4.0
 
 sudo: false
-
diff --git a/deps/npm/node_modules/request/node_modules/qs/CHANGELOG.md b/deps/npm/node_modules/qs/CHANGELOG.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/qs/CHANGELOG.md
rename to deps/npm/node_modules/qs/CHANGELOG.md
diff --git a/deps/npm/node_modules/request/node_modules/qs/CONTRIBUTING.md b/deps/npm/node_modules/qs/CONTRIBUTING.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/qs/CONTRIBUTING.md
rename to deps/npm/node_modules/qs/CONTRIBUTING.md
diff --git a/deps/npm/node_modules/request/node_modules/qs/LICENSE b/deps/npm/node_modules/qs/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/qs/LICENSE
rename to deps/npm/node_modules/qs/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/qs/Readme.md b/deps/npm/node_modules/qs/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/qs/Readme.md
rename to deps/npm/node_modules/qs/README.md
diff --git a/deps/npm/node_modules/request/node_modules/qs/bower.json b/deps/npm/node_modules/qs/bower.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/qs/bower.json
rename to deps/npm/node_modules/qs/bower.json
diff --git a/deps/npm/node_modules/request/node_modules/qs/component.json b/deps/npm/node_modules/qs/component.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/qs/component.json
rename to deps/npm/node_modules/qs/component.json
diff --git a/deps/npm/node_modules/request/node_modules/qs/dist/qs.js b/deps/npm/node_modules/qs/dist/qs.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/qs/dist/qs.js
rename to deps/npm/node_modules/qs/dist/qs.js
diff --git a/deps/npm/node_modules/request/node_modules/qs/lib/index.js b/deps/npm/node_modules/qs/lib/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/qs/lib/index.js
rename to deps/npm/node_modules/qs/lib/index.js
diff --git a/deps/npm/node_modules/request/node_modules/qs/lib/parse.js b/deps/npm/node_modules/qs/lib/parse.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/qs/lib/parse.js
rename to deps/npm/node_modules/qs/lib/parse.js
diff --git a/deps/npm/node_modules/request/node_modules/qs/lib/stringify.js b/deps/npm/node_modules/qs/lib/stringify.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/qs/lib/stringify.js
rename to deps/npm/node_modules/qs/lib/stringify.js
diff --git a/deps/npm/node_modules/request/node_modules/qs/lib/utils.js b/deps/npm/node_modules/qs/lib/utils.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/qs/lib/utils.js
rename to deps/npm/node_modules/qs/lib/utils.js
diff --git a/deps/npm/node_modules/request/node_modules/qs/package.json b/deps/npm/node_modules/qs/package.json
similarity index 66%
rename from deps/npm/node_modules/request/node_modules/qs/package.json
rename to deps/npm/node_modules/qs/package.json
index 981aff4b78e153..c2aba945ddc3b8 100644
--- a/deps/npm/node_modules/request/node_modules/qs/package.json
+++ b/deps/npm/node_modules/qs/package.json
@@ -1,48 +1,62 @@
 {
-  "name": "qs",
-  "description": "A querystring parser that supports nesting and arrays, with a depth limit",
-  "homepage": "https://github.com/hapijs/qs",
-  "version": "5.1.0",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/hapijs/qs.git"
+  "_args": [
+    [
+      "qs@~5.1.0",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
+  ],
+  "_from": "qs@>=5.1.0 <5.2.0",
+  "_id": "qs@5.1.0",
+  "_inCache": true,
+  "_location": "/qs",
+  "_nodeVersion": "0.12.7",
+  "_npmUser": {
+    "email": "quitlahok@gmail.com",
+    "name": "nlf"
   },
-  "main": "lib/index.js",
-  "keywords": [
-    "querystring",
-    "qs"
+  "_npmVersion": "2.14.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "qs",
+    "raw": "qs@~5.1.0",
+    "rawSpec": "~5.1.0",
+    "scope": null,
+    "spec": ">=5.1.0 <5.2.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/request"
   ],
-  "engines": ">=0.10.40",
+  "_resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz",
+  "_shasum": "4d932e5c7ea411cca76a312d39a606200fd50cd9",
+  "_shrinkwrap": null,
+  "_spec": "qs@~5.1.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
+  "bugs": {
+    "url": "https://github.com/hapijs/qs/issues"
+  },
   "dependencies": {},
+  "description": "A querystring parser that supports nesting and arrays, with a depth limit",
   "devDependencies": {
     "browserify": "^10.2.1",
     "code": "1.x.x",
     "lab": "5.x.x"
   },
-  "scripts": {
-    "test": "lab -a code -t 100 -L",
-    "test-tap": "lab -a code -r tap -o tests.tap",
-    "test-cov-html": "lab -a code -r html -o coverage.html",
-    "dist": "browserify --standalone Qs lib/index.js > dist/qs.js"
-  },
-  "license": "BSD-3-Clause",
-  "gitHead": "9e9759ec5be2dd99ce90961bbff47075cd5a8160",
-  "bugs": {
-    "url": "https://github.com/hapijs/qs/issues"
-  },
-  "_id": "qs@5.1.0",
-  "_shasum": "4d932e5c7ea411cca76a312d39a606200fd50cd9",
-  "_from": "qs@>=5.1.0 <5.2.0",
-  "_npmVersion": "2.14.1",
-  "_nodeVersion": "0.12.7",
-  "_npmUser": {
-    "name": "nlf",
-    "email": "quitlahok@gmail.com"
-  },
+  "directories": {},
   "dist": {
     "shasum": "4d932e5c7ea411cca76a312d39a606200fd50cd9",
     "tarball": "http://registry.npmjs.org/qs/-/qs-5.1.0.tgz"
   },
+  "engines": ">=0.10.40",
+  "gitHead": "9e9759ec5be2dd99ce90961bbff47075cd5a8160",
+  "homepage": "https://github.com/hapijs/qs",
+  "installable": true,
+  "keywords": [
+    "qs",
+    "querystring"
+  ],
+  "license": "BSD-3-Clause",
+  "main": "lib/index.js",
   "maintainers": [
     {
       "name": "nlf",
@@ -53,7 +67,17 @@
       "email": "eran@hueniverse.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "qs",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/hapijs/qs.git"
+  },
+  "scripts": {
+    "dist": "browserify --standalone Qs lib/index.js > dist/qs.js",
+    "test": "lab -a code -t 100 -L",
+    "test-cov-html": "lab -a code -r html -o coverage.html",
+    "test-tap": "lab -a code -r tap -o tests.tap"
+  },
+  "version": "5.1.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/qs/test/parse.js b/deps/npm/node_modules/qs/test/parse.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/qs/test/parse.js
rename to deps/npm/node_modules/qs/test/parse.js
diff --git a/deps/npm/node_modules/request/node_modules/qs/test/stringify.js b/deps/npm/node_modules/qs/test/stringify.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/qs/test/stringify.js
rename to deps/npm/node_modules/qs/test/stringify.js
diff --git a/deps/npm/node_modules/request/node_modules/qs/test/utils.js b/deps/npm/node_modules/qs/test/utils.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/qs/test/utils.js
rename to deps/npm/node_modules/qs/test/utils.js
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore b/deps/npm/node_modules/read-cmd-shim/.npmignore
similarity index 65%
rename from deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore
rename to deps/npm/node_modules/read-cmd-shim/.npmignore
index 249bc20eb5573c..ac50549639a976 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore
+++ b/deps/npm/node_modules/read-cmd-shim/.npmignore
@@ -1,2 +1,3 @@
+.#*
+*~
 node_modules
-*.sw*
diff --git a/deps/npm/node_modules/read-cmd-shim/README.md b/deps/npm/node_modules/read-cmd-shim/README.md
new file mode 100644
index 00000000000000..2f0b5f6cc671e0
--- /dev/null
+++ b/deps/npm/node_modules/read-cmd-shim/README.md
@@ -0,0 +1,36 @@
+# read-cmd-shim
+
+Figure out what a [`cmd-shim`](https://github.com/ForbesLindesay/cmd-shim)
+is pointing at.  This acts as the equivalent of
+[`fs.readlink`](https://nodejs.org/api/fs.html#fs_fs_readlink_path_callback).
+
+### Usage
+
+```
+var readCmdShim = require('read-cmd-shim')
+
+readCmdShim('/path/to/shim.cmd', function (er, destination) {
+  …
+})
+
+var destination = readCmdShim.sync('/path/to/shim.cmd')
+
+### readCmdShim(path, callback)
+
+Reads the `cmd-shim` located at `path` and calls back with the _relative_
+path that the shim points at. Consider this as roughly the equivalent of
+`fs.readlink`.
+
+This can read both `.cmd` style that are run by the Windows Command Prompt
+and Powershell, and the kind without any extension that are used by Cygwin.
+
+This can return errors that `fs.readFile` returns, except that they'll
+include a stack trace from where `readCmdShim` was called.  Plus it can
+return a special `ENOTASHIM` exception, when it can't find a cmd-shim in the
+file referenced by `path`.  This should only happen if you pass in a
+non-command shim.
+
+
+### readCmdShim.sync(path)
+
+Same as above but synchronous. Errors are thrown.
diff --git a/deps/npm/node_modules/read-cmd-shim/index.js b/deps/npm/node_modules/read-cmd-shim/index.js
new file mode 100644
index 00000000000000..6a2265449af268
--- /dev/null
+++ b/deps/npm/node_modules/read-cmd-shim/index.js
@@ -0,0 +1,54 @@
+'use strict'
+var fs = require('graceful-fs')
+
+function extractPath (path, cmdshimContents) {
+  if (/[.]cmd$/.test(path)) {
+    return extractPathFromCmd(cmdshimContents)
+  } else {
+    return extractPathFromCygwin(cmdshimContents)
+  }
+}
+
+function extractPathFromCmd (cmdshimContents) {
+  var matches = cmdshimContents.match(/"%~dp0\\([^"]+?)"\s+%[*]/)
+  return matches && matches[1]
+}
+
+function extractPathFromCygwin (cmdshimContents) {
+  var matches = cmdshimContents.match(/"[$]basedir[/]([^"]+?)"\s+"[$]@"/)
+  return matches && matches[1]
+}
+
+function wrapError (thrown, newError) {
+  newError.message = thrown.message
+  newError.code = thrown.code
+  return newError
+}
+
+function notaShim (path, er) {
+  if (!er) {
+    er = new Error()
+    Error.captureStackTrace(er, notaShim)
+  }
+  er.code = 'ENOTASHIM'
+  er.message = "Can't read shim path from '" + path + "', it doesn't appear to be a cmd-shim"
+  return er
+}
+
+var readCmdShim = module.exports = function (path, cb) {
+  var er = new Error()
+  Error.captureStackTrace(er, readCmdShim)
+  fs.readFile(path, function (readFileEr, contents) {
+    if (readFileEr) return cb(wrapError(readFileEr, er))
+    var destination = extractPath(path, contents.toString())
+    if (destination) return cb(null, destination)
+    return cb(notaShim(path, er))
+  })
+}
+
+module.exports.sync = function (path) {
+  var contents = fs.readFileSync(path)
+  var destination = extractPath(path, contents.toString())
+  if (!destination) throw notaShim(path)
+  return destination
+}
diff --git a/deps/npm/node_modules/read-cmd-shim/package.json b/deps/npm/node_modules/read-cmd-shim/package.json
new file mode 100644
index 00000000000000..48111968048a2f
--- /dev/null
+++ b/deps/npm/node_modules/read-cmd-shim/package.json
@@ -0,0 +1,78 @@
+{
+  "_args": [
+    [
+      "read-cmd-shim",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "read-cmd-shim@*",
+  "_id": "read-cmd-shim@1.0.1",
+  "_inCache": true,
+  "_location": "/read-cmd-shim",
+  "_nodeVersion": "3.1.0",
+  "_npmUser": {
+    "email": "me@re-becca.org",
+    "name": "iarna"
+  },
+  "_npmVersion": "3.3.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "read-cmd-shim",
+    "raw": "read-cmd-shim",
+    "rawSpec": "",
+    "scope": null,
+    "spec": "*",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_shasum": "2d5d157786a37c055d22077c32c53f8329e91c7b",
+  "_shrinkwrap": null,
+  "_spec": "read-cmd-shim",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "me@re-becca.org",
+    "name": "Rebecca Turner",
+    "url": "http://re-becca.org/"
+  },
+  "bugs": {
+    "url": "https://github.com/npm/read-cmd-shim/issues"
+  },
+  "dependencies": {
+    "graceful-fs": "^4.1.2"
+  },
+  "description": "Figure out what a cmd-shim is pointing at. This acts as the equivalent of fs.readlink.",
+  "devDependencies": {
+    "cmd-shim": "^2.0.1",
+    "rimraf": "^2.4.3",
+    "standard": "^5.2.2",
+    "tap": "^1.4.1"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "2d5d157786a37c055d22077c32c53f8329e91c7b",
+    "tarball": "http://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz"
+  },
+  "gitHead": "7c50879bf49743a1c69f9d7f0ba1638fc46bb40c",
+  "homepage": "https://github.com/npm/read-cmd-shim#readme",
+  "installable": true,
+  "license": "ISC",
+  "main": "index.js",
+  "maintainers": [
+    {
+      "name": "iarna",
+      "email": "me@re-becca.org"
+    }
+  ],
+  "name": "read-cmd-shim",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/read-cmd-shim.git"
+  },
+  "scripts": {
+    "test": "standard && tap test/*.js"
+  },
+  "version": "1.0.1"
+}
diff --git a/deps/npm/node_modules/read-cmd-shim/test/integration.js b/deps/npm/node_modules/read-cmd-shim/test/integration.js
new file mode 100644
index 00000000000000..269f964727cd6b
--- /dev/null
+++ b/deps/npm/node_modules/read-cmd-shim/test/integration.js
@@ -0,0 +1,139 @@
+'use strict'
+var path = require('path')
+var fs = require('graceful-fs')
+var test = require('tap').test
+var rimraf = require('rimraf')
+var cmdShim = require('cmd-shim')
+var readCmdShim = require('../index.js')
+var workDir = path.join(__dirname, path.basename(__filename, '.js'))
+var testShbang = path.join(workDir, 'test-shbang')
+var testShbangCmd = testShbang + '.cmd'
+var testShim = path.join(workDir, 'test')
+var testShimCmd = testShim + '.cmd'
+
+test('setup', function (t) {
+  rimraf.sync(workDir)
+  fs.mkdirSync(workDir)
+  fs.writeFileSync(testShbang + '.js', '#!/usr/bin/env node\ntrue')
+  cmdShim(__filename, testShim, function (er) {
+    t.error(er)
+    cmdShim(testShbang + '.js', testShbang, function (er) {
+      t.error(er)
+      t.done()
+    })
+  })
+})
+
+test('async-read-no-shbang', function (t) {
+  t.plan(2)
+  readCmdShim(testShimCmd, function (er, dest) {
+    t.error(er)
+    t.is(dest, '..\\basic.js')
+    t.done()
+  })
+})
+
+test('sync-read-no-shbang', function (t) {
+  t.plan(1)
+  var dest = readCmdShim.sync(testShimCmd)
+  t.is(dest, '..\\basic.js')
+  t.done()
+})
+
+test('async-read-shbang', function (t) {
+  t.plan(2)
+  readCmdShim(testShbangCmd, function (er, dest) {
+    t.error(er)
+    t.is(dest, 'test-shbang.js')
+    t.done()
+  })
+})
+
+test('sync-read-shbang', function (t) {
+  t.plan(1)
+  var dest = readCmdShim.sync(testShbangCmd)
+  t.is(dest, 'test-shbang.js')
+  t.done()
+})
+
+test('async-read-no-shbang-cygwin', function (t) {
+  t.plan(2)
+  readCmdShim(testShim, function (er, dest) {
+    t.error(er)
+    t.is(dest, '../basic.js')
+    t.done()
+  })
+})
+
+test('sync-read-no-shbang-cygwin', function (t) {
+  t.plan(1)
+  var dest = readCmdShim.sync(testShim)
+  t.is(dest, '../basic.js')
+  t.done()
+})
+
+test('async-read-shbang-cygwin', function (t) {
+  t.plan(2)
+  readCmdShim(testShbang, function (er, dest) {
+    t.error(er)
+    t.is(dest, 'test-shbang.js')
+    t.done()
+  })
+})
+
+test('sync-read-shbang-cygwin', function (t) {
+  t.plan(1)
+  var dest = readCmdShim.sync(testShbang)
+  t.is(dest, 'test-shbang.js')
+  t.done()
+})
+
+test('async-read-dir', function (t) {
+  t.plan(2)
+  readCmdShim(workDir, function (er) {
+    t.ok(er)
+    t.is(er.code, 'EISDIR', "cmd-shims can't be directories")
+    t.done()
+  })
+})
+
+test('sync-read-dir', function (t) {
+  t.plan(1)
+  t.throws(function () { readCmdShim.sync(workDir) }, "cmd-shims can't be directories")
+  t.done()
+})
+
+test('async-read-not-there', function (t) {
+  t.plan(2)
+  readCmdShim('/path/to/nowhere', function (er, dest) {
+    t.ok(er, 'missing files throw errors')
+    t.is(er.code, 'ENOENT', "cmd-shim file doesn't exist")
+    t.done()
+  })
+})
+
+test('sync-read-not-there', function (t) {
+  t.plan(1)
+  t.throws(function () { readCmdShim.sync('/path/to/nowhere') }, "cmd-shim file doesn't exist")
+  t.done()
+})
+
+test('async-read-not-shim', function (t) {
+  t.plan(2)
+  readCmdShim(__filename, function (er, dest) {
+    t.ok(er)
+    t.is(er.code, 'ENOTASHIM', 'shim file specified is not a shim')
+    t.done()
+  })
+})
+
+test('sync-read-not-shim', function (t) {
+  t.plan(1)
+  t.throws(function () { readCmdShim.sync(__filename) }, 'shim file specified is not a shim')
+  t.done()
+})
+
+test('cleanup', function (t) {
+  rimraf.sync(workDir)
+  t.done()
+})
diff --git a/deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/package.json b/deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/package.json
deleted file mode 100644
index d9c7b715554e80..00000000000000
--- a/deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/package.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "name": "readdir-scoped-modules",
-  "version": "1.0.2",
-  "description": "Like `fs.readdir` but handling `@org/module` dirs as if they were a single entry.",
-  "main": "readdir.js",
-  "directories": {
-    "test": "test"
-  },
-  "dependencies": {
-    "debuglog": "^1.0.1",
-    "dezalgo": "^1.0.0",
-    "graceful-fs": "^4.1.2",
-    "once": "^1.3.0"
-  },
-  "devDependencies": {
-    "tap": "^1.2.0"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/readdir-scoped-modules.git"
-  },
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
-  },
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/npm/readdir-scoped-modules/issues"
-  },
-  "homepage": "https://github.com/npm/readdir-scoped-modules",
-  "readme": "# readdir-scoped-modules\n\nLike `fs.readdir` but handling `@org/module` dirs as if they were\na single entry.\n\nUsed by npm.\n\n## USAGE\n\n```javascript\nvar readdir = require('readdir-scoped-modules')\n\nreaddir('node_modules', function (er, entries) {\n  // entries will be something like\n  // ['a', '@org/foo', '@org/bar']\n})\n```\n",
-  "readmeFilename": "README.md",
-  "gitHead": "d41d5de877cb4e9e3f14b92913132680af73d1b4",
-  "_id": "readdir-scoped-modules@1.0.2",
-  "_shasum": "9fafa37d286be5d92cbaebdee030dc9b5f406747",
-  "_from": "readdir-scoped-modules@>=1.0.0 <2.0.0"
-}
diff --git a/deps/npm/node_modules/read-installed/package.json b/deps/npm/node_modules/read-installed/package.json
index b1b3c5fa5a9fbc..546f7f339c5cb1 100644
--- a/deps/npm/node_modules/read-installed/package.json
+++ b/deps/npm/node_modules/read-installed/package.json
@@ -1,46 +1,98 @@
 {
-  "name": "read-installed",
-  "description": "Read all the installed packages in a folder, and return a tree structure with all the data.",
-  "version": "4.0.3",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/read-installed.git"
+  "_args": [
+    [
+      "read-installed@~4.0.2",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "read-installed@>=4.0.2 <4.1.0",
+  "_id": "read-installed@4.0.3",
+  "_inCache": true,
+  "_location": "/read-installed",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "email": "kat@sykosomatic.org",
+    "name": "zkat"
   },
-  "main": "read-installed.js",
-  "scripts": {
-    "test": "tap ./test/*.js"
+  "_npmVersion": "2.14.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "read-installed",
+    "raw": "read-installed@~4.0.2",
+    "rawSpec": "~4.0.2",
+    "scope": null,
+    "spec": ">=4.0.2 <4.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz",
+  "_shasum": "ff9b8b67f187d1e4c29b9feb31f6b223acd19067",
+  "_shrinkwrap": null,
+  "_spec": "read-installed@~4.0.2",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
+    "url": "http://blog.izs.me/"
+  },
+  "bugs": {
+    "url": "https://github.com/isaacs/read-installed/issues"
   },
   "dependencies": {
     "debuglog": "^1.0.1",
+    "graceful-fs": "^4.1.2",
     "read-package-json": "^2.0.0",
     "readdir-scoped-modules": "^1.0.0",
     "semver": "2 || 3 || 4 || 5",
     "slide": "~1.1.3",
-    "util-extend": "^1.0.1",
-    "graceful-fs": "^4.1.2"
-  },
-  "optionalDependencies": {
-    "graceful-fs": "^4.1.2"
-  },
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
+    "util-extend": "^1.0.1"
   },
-  "license": "ISC",
+  "description": "Read all the installed packages in a folder, and return a tree structure with all the data.",
   "devDependencies": {
     "mkdirp": "^0.5.0",
     "rimraf": "^2.2.8",
     "tap": "^1.2.0"
   },
-  "readme": "# read-installed\n\nRead all the installed packages in a folder, and return a tree\nstructure with all the data.\n\nnpm uses this.\n\n## 2.0.0\n\nBreaking changes in `2.0.0`:\n\nThe second argument is now an `Object` that contains the following keys:\n\n * `depth` optional, defaults to Infinity\n * `log` optional log Function\n * `dev` optional, default false, set to true to include devDependencies\n\n## Usage\n\n```javascript\nvar readInstalled = require(\"read-installed\")\n// optional options\nvar options = { dev: false, log: fn, depth: 2 }\nreadInstalled(folder, options, function (er, data) {\n  ...\n})\n```\n",
-  "readmeFilename": "README.md",
-  "gitHead": "da02df6acdb5f5ee31d8c637ef31fb50efb455c1",
-  "bugs": {
-    "url": "https://github.com/isaacs/read-installed/issues"
+  "directories": {},
+  "dist": {
+    "shasum": "ff9b8b67f187d1e4c29b9feb31f6b223acd19067",
+    "tarball": "http://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz"
   },
+  "gitHead": "da02df6acdb5f5ee31d8c637ef31fb50efb455c1",
   "homepage": "https://github.com/isaacs/read-installed#readme",
-  "_id": "read-installed@4.0.3",
-  "_shasum": "ff9b8b67f187d1e4c29b9feb31f6b223acd19067",
-  "_from": "read-installed@4.0.3"
+  "installable": true,
+  "license": "ISC",
+  "main": "read-installed.js",
+  "maintainers": [
+    {
+      "name": "iarna",
+      "email": "me@re-becca.org"
+    },
+    {
+      "name": "isaacs",
+      "email": "isaacs@npmjs.com"
+    },
+    {
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
+    },
+    {
+      "name": "zkat",
+      "email": "kat@sykosomatic.org"
+    }
+  ],
+  "name": "read-installed",
+  "optionalDependencies": {
+    "graceful-fs": "^4.1.2"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/read-installed.git"
+  },
+  "scripts": {
+    "test": "tap ./test/*.js"
+  },
+  "version": "4.0.3"
 }
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/.editorconfig b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/.editorconfig
deleted file mode 100644
index 8de2a35e3a2b74..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/.editorconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[{.,}*.{js,json,json5,yml,yaml}]
-indent_style = space
-indent_size = 2
-
-[*.md]
-indent_style = space
-indent_size = 4
-trim_trailing_whitespace = false
-
-[Makefile]
-indent_style = tab
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/benchmark/benchmark.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/benchmark/benchmark.js
deleted file mode 100755
index 28a6aad75ad937..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/benchmark/benchmark.js
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env node
-
-var Benchmark = require('benchmark')
-var YAML = require('js-yaml')
-var JJU = require('../')
-var JSON5 = require('json5')
-var suite = new Benchmark.Suite
-
-var sample
-sample = require('fs').readFileSync(__dirname + '/../package.yaml')
-sample = YAML.safeLoad(sample)
-sample = JSON.stringify(sample)
-
-var functions = {
-  'JSON':    function(x) { JSON.parse(x) },
-  'JSON5':   function(x) { JSON5.parse(x) },
-  'JJU':     function(x) { JJU.parse(x) },
-  'JS-YAML': function(x) { YAML.safeLoad(x) },
-}
-
-for (var name in functions) {
-  with ({ fn: functions[name] }) {
-    suite.add(name, {
-      onCycle: function onCycle(event) {
-        process.stdout.write('\r\033[2K - ' + event.target)
-      },
-      fn: function () {
-        fn(sample)
-      },
-    })
-  }
-}
-
-console.log()
-suite.on('cycle', function(event) {
-  console.log('\r\033[2K + ' + String(event.target))
-})
-.run()
-
-process.on('exit', function() { console.log() })
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/benchmark/package.json b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/benchmark/package.json
deleted file mode 100644
index 7f0dcf08b7209d..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/benchmark/package.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "benchmarks",
-  "private": true,
-  "dependencies": {
-    "json5": "*",
-    "js-yaml": "*",
-    "benchmark": "*"
-  }
-}
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/docs/Grammar.md b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/docs/Grammar.md
deleted file mode 100644
index eb7c8bc667fd54..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/docs/Grammar.md
+++ /dev/null
@@ -1,219 +0,0 @@
-
-JSON5 grammar expressed in EBNF form. 
-
-PS: I don't know what is appropriate syntax highlighter for this, so I'm using "modula2" because why not. I also inserted <ZWSP> after backslash to preserve syntax highlighting, this character has nothing to do with actual JSON5 syntax and should be ignored.
-
-```modula2
-json5_text = expression_with_whitespace
-
-expression_with_whitespace = [white_space] , expression , [white_space]
-
-expression = literal
-           | array_literal
-           | object_literal
-
-literal = null_literal
-        | boolean_literal
-        | signed_numeric_literal
-        | string_literal
-
-null_literal = 'null'
-
-boolean_literal = 'true'
-                | 'false'
-
-(* Source Characters *)
-
-source_character = .
-                (* any Unicode code unit *)
-
-line_terminator = <LF>
-                | <CR>
-                | <LS>
-                | <PS>
-
-line_terminator_sequence = <LF>
-                         | <CR>
-                         | <LS>
-                         | <PS>
-                         | <CR> , <LF>
-
-white_space = white_space_element
-            | white_space , white_space_element
-
-white_space_element = white_space_character
-                    | comment
-
-white_space_character = <TAB>
-                      | <VT>
-                      | <FF>
-                      | <SP>
-                      | <NBSP>
-                      | <BOM>
-                      | <USP>
-
-comment = multi_line_comment
-        | single_line_comment
-
-multi_line_comment = '/*' , [multi_line_comment_chars] , '*/'
-
-multi_line_comment_chars = (source_character - '*') , [multi_line_comment_chars]
-                         | '*' , [post_asterisk_comment_chars]
-
-post_asterisk_comment_chars = (source_character - ('*' | '/')) , [multi_line_comment_chars]
-                            | '*' , [post_asterisk_comment_chars]
-
-single_line_comment = '//' , [single_line_comment_chars]
-
-single_line_comment_chars = single_line_comment_char , single_line_comment_chars
-
-single_line_comment_char = source_character - line_terminator
-
-(* Character classes *)
-
-decimal_digit = '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9'
-
-non_zero_digit = decimal_digit - '0'
-
-hex_digit = '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' | 'a'
-          | 'b' | 'c' | 'd' | 'e' | 'f' | 'A' | 'B' | 'C' | 'D' | 'E' | 'F'
-
-ascii_letter = ascii_letter_lowercase
-             | ascii_letter_uppercase
-
-ascii_letter_lowercase = 'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'g' | 'h' | 'i' 
-                       | 'j' | 'k' | 'l' | 'm' | 'n' | 'o' | 'p' | 'q' | 'r'
-                       | 's' | 't' | 'u' | 'v' | 'w' | 'x' | 'y' | 'z'
-
-ascii_letter_uppercase = 'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'G' | 'H' | 'I' 
-                       | 'J' | 'K' | 'L' | 'M' | 'N' | 'O' | 'P' | 'Q' | 'R'
-                       | 'S' | 'T' | 'U' | 'V' | 'W' | 'X' | 'Y' | 'Z'
-
-(* Numeric Literals *)
-
-signed_numeric_literal = '-' , numeric_literal
-                       | '+' , numeric_literal
-                       | numeric_literal
-
-numeric_literal = decimal_literal
-                | hex_integer_literal
-                | non_finite_literal
-
-non_finite_literal = 'Infinity'
-                   | 'NaN'
-
-decimal_literal = decimal_integer_literal , '.' , [decimal_digits] , [exponent_part]
-                | '.' , decimal_digits , [exponent_part]
-                | decimal_integer_literal , [exponent_part]
-
-decimal_integer_literal = '0'
-                        | non_zero_digit , [decimal_digits]
-
-decimal_digits = decimal_digit
-               | decimal_digits , decimal_digit
-
-exponent_part = exponent_indicator , signed_integer
-
-exponent_indicator = 'e' | 'E'
-
-signed_integer = decimal_digits
-               | '+' , decimal_digits
-               | '-' , decimal_digits
-
-hex_integer_literal = '0x' , hex_digit
-                    | '0X' , hex_digit
-                    | hex_integer_literal , hex_digit
-
-(* String Literals *)
-
-string_literal = '"' , [double_string_characters] , '"'
-               | "'" , [single_string_characters] , "'"
-
-double_string_characters = double_string_character , [double_string_characters]
-
-single_string_characters = single_string_character , [single_string_characters]
-
-double_string_character = source_character - ('"' | '\​' | line_terminator)
-                        | '\​' , escape_sequence
-                        | line_continuation
-
-single_string_character = source_character - ("'" | '\​' | line_terminator)
-                        | '\​' , escape_sequence
-                        | line_continuation
-
-line_continuation = '\​' , line_terminator_sequence
-
-escape_sequence = character_escape_sequence
-                | '0'
-                | hex_escape_sequence
-                | unicode_escape_sequence
-
-character_escape_sequence = single_escape_character
-                          | non_escape_character
-
-single_escape_character = '"' | "'" | '\​' | 'b' | 'f' | 'n' | 'r' | 't' | 'v'
-
-non_escape_character = source_character - (escape_character | line_terminator)
-
-escape_character = single_escape_character
-                 | decimal_digit
-                 | 'x'
-                 | 'u'
-
-hex_escape_sequence = 'x' , hex_digit , hex_digit
-
-unicode_escape_sequence = 'u' , hex_digit , hex_digit , hex_digit , hex_digit
-
-(* Array Literals *)
-
-array_literal = '[' , [white_space] , ']'
-              | '[' , [white_space] , element_list , ']'
-              | '[' , [white_space] , element_list , ',' , [white_space] , ']'
-
-element_list = expression , [white_space]
-             | element_list , ',' , [white_space] , expression , [white_space]
-
-(* Object Literals *)
-
-object_literal = '{' , [white_space] , '}'
-               | '{' , [white_space] , property_name_and_value_list , '}'
-               | '{' , [white_space] , property_name_and_value_list , ',' , '}'
-
-property_name_and_value_list = property_assignment , [white_space]
-                             | property_name_and_value_list , [white_space] , ',' , [white_space] , property_assignment , [white_space]
-
-property_assignment = property_name , [white_space] , ':' , [white_space] , expression
-
-property_name = identifier_name
-              | string_literal
-              | numeric_literal
-
-identifier_name = identifier_start
-                | identifier_name , identifier_part
-
-identifier_start = unicode_letter
-                 | '$'
-                 | '_'
-                 | '\​' , unicode_escape_sequence
-
-identifier_part = identifier_start
-                | unicode_combining_mark
-                | unicode_digit
-                | unicode_connector_punctuation
-                | <ZWNJ>
-                | <ZWJ>
-
-unicode_letter = ascii_letter
-              (* + any character in the Unicode categories "Uppercase letter (Lu)", "Lowercase letter (Ll)", "Titlecase letter (Lt)", "Modifier letter (Lm)", "Other letter (Lo)", or "Letter number (Nl)" *)
-
-unicode_combining_mark =
-                      (* + any character in the Unicode categories "Non-spacing mark (Mn)" or "Combining spacing mark (Mc)" *)
-
-unicode_digit = decimal_digit
-             (* + any character in the Unicode category "Decimal number (Nd)" *)
-
-unicode_connector_punctuation =
-                             (* + any character in the Unicode category "Connector punctuation (Pc)" *)
-
-
-```
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/docs/JSON5.md b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/docs/JSON5.md
deleted file mode 100644
index bbe18a3d8ce213..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/docs/JSON5.md
+++ /dev/null
@@ -1,50 +0,0 @@
-## JSON5 syntax
-
-We support slighly modified version of JSON5, see https://groups.google.com/forum/#!topic/json5/3DjClVYI6Wg
-
-I started from ES5 specification and added a set of additional restrictions on top of ES5 spec. So I'd expect my implementation to be much closer to javascript. It's no longer an extension of json, but a reduction of ecmascript, which was my original intent.
-
-This JSON5 version is a subset of ES5 language, specification is here:
-
-http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
-
-This is a language that defines data structures only, so following notes/restrictions are applied:
-
-- Literals (NullLiteral, BooleanLiteral, NumericLiteral, StringLiteral) are allowed.
-- Compatibility syntax is not supported, which means octal literals are forbidden.
-- ArrayLiterals and allowed, but instead of AssignmentExpressions you can only use other allowed Literals, ArrayLiterals and ObjectLiterals. Elisions are currently not supported.
-- ObjectLiterals and allowed, but instead of AssignmentExpressions you can only use other allowed Literals, ArrayLiterals and ObjectLiterals. Setters and getters are forbidden.
-- All other primary expressions ("this", Identifier, Expression) are forbidden.
-- Two unary expressions ('-' and '+') allowed before NumericLiterals.
-- Any data that has a number type can be represented, including +0, -0, +Infinity, -Infinity and NaN.
-- "undefined" is forbidden, use null instead if applicable.
-- Comments and whitespace are defined according to spec.
-
-Main authority here is ES5 spec, so strict backward JSON compatibility is not guaranteed.
-
-
-If you're unsure whether a behaviour of this library is a bug or not, you can run this test:
-
-```javascript
-JSON5.parse(String(something))
-```
-
-Should always be equal to:
-
-```javascript
-eval('(function(){return ('+String(something)+'\n)\n})()')
-```
-
-If `something` meets all rules above. Parens and newlines in the example above are carefully placed so comments and another newlines will work properly, so don't look so impressed about that.
-
-
-## Weirdness of JSON5
-
-These are the parts that I don't particulary like, but see no good way to fix:
-
- - no elisions, `[,,,] -> [null,null,null]`
- - `[Object], [Circular]` aren't parsed
- - no way of nicely representing multiline strings
- - unicode property names are way to hard to implement
- - Date and other custom objects
- - incompatible with YAML (at least comments)
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/package.json b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/package.json
deleted file mode 100644
index ed34885e26881b..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/package.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "name": "jju",
-  "version": "1.2.0",
-  "description": "a set of utilities to work with JSON / JSON5 documents",
-  "author": {
-    "name": "Alex Kocharin",
-    "email": "alex@kocharin.ru"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/rlidwka/jju.git"
-  },
-  "bugs": {
-    "url": "https://github.com/rlidwka/jju/issues"
-  },
-  "homepage": "http://rlidwka.github.io/jju/",
-  "devDependencies": {
-    "mocha": ">=1.21.0",
-    "js-yaml": ">=3.1.0",
-    "eslint": "~0.4.2"
-  },
-  "scripts": {
-    "test": "mocha test/*.js",
-    "lint": "eslint -c ./.eslint.yaml ./lib"
-  },
-  "keywords": [
-    "json",
-    "json5",
-    "parser",
-    "serializer",
-    "data"
-  ],
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "license": {
-    "type": "WTFPL",
-    "url": "http://www.wtfpl.net/txt/copying/"
-  },
-  "gitHead": "6f1b2a8321cb0dfcffc50378b3632853cf529671",
-  "_id": "jju@1.2.0",
-  "_shasum": "add5b586fec853b44929d78bf94864ab577c02e9",
-  "_from": "jju@>=1.1.0 <2.0.0",
-  "_npmVersion": "2.0.1",
-  "_nodeVersion": "1.1.1",
-  "_npmUser": {
-    "name": "rlidwka",
-    "email": "alex@kocharin.ru"
-  },
-  "maintainers": [
-    {
-      "name": "rlidwka",
-      "email": "alex@kocharin.ru"
-    }
-  ],
-  "dist": {
-    "shasum": "add5b586fec853b44929d78bf94864ab577c02e9",
-    "tarball": "http://registry.npmjs.org/jju/-/jju-1.2.0.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/jju/-/jju-1.2.0.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/portable-json5-tests.yaml b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/portable-json5-tests.yaml
deleted file mode 100644
index 5bf6ac38fe13bf..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/portable-json5-tests.yaml
+++ /dev/null
@@ -1,916 +0,0 @@
-# vi:set ts=2 sts=2 sw=2 et:
-#
-# Copyright (c) JD 2456730 Alex Kocharin <alex@kocharin.ru>
-#
-# 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 original file is available here:
-# https://github.com/rlidwka/jju/tree/master/test/portable-json5-tests.yaml
-#
-# ----------------------------------------------------------------------------
-#
-# Portable JSON5 test suite.
-#
-# This file contains an actual YAML data and it may include fancy syntax.
-# If your platform does not support YAML, you might wish to pre-process it
-# using a generic YAML parser.
-#
-
-%YAML 1.2
----
-#
-# "input" is an arbitrary JSON5 you have to parse
-# "output" is a normalized JSON you have to compare your result with,
-#          or !error (null) if your input should result in parser error
-#
-# Types of tests:
-#
-#  - basic    - Tests that every JSON5 parser should pass.
-#
-#  - advanced - Tests that bring close compatibility with javascript. Not
-#               strictly required, but nice to have for completeness.
-#
-#  - extra    - Extra test cases you can follow at your discretion.
-#
-# Questionable features like elisions go to extra. All valid javascript, but
-# invalid json5 also goes to extra. Feel free to ignore this section if you
-# want to. Thus, eval(input) is a complete json5 parser, that should pass all
-# basic and advanced tests.
-#
-
-# Basic types in minimal form
-# ---------------------------
-
-type-no-data:
-  type: extra
-  output: !error
-  input: ''
-
-type-null:
-  type: basic
-  output: null
-  input: >
-    null
-
-# undefined is not supported,
-# null should be used instead
-type-no-undefined:
-  type: extra
-  output: !error
-  input: >
-    undefined
-
-type-no-raw:
-  type: extra
-  output: !error
-  input: >
-    foobar
-
-type-bool-true:
-  type: basic
-  output: true
-  input: >
-    true
-
-type-bool-false:
-  type: basic
-  output: false
-  input: >
-    false
-
-type-number:
-  type: basic
-  output: 0
-  input: >
-    0
-
-type-string:
-  type: basic
-  output: ""
-  input: >
-    ""
-
-type-object:
-  type: basic
-  output: {}
-  input: >
-    {}
-
-type-array:
-  type: basic
-  output: []
-  input: >
-    []
-
-# Numbers: special
-# ----------------
-
-# note: it's hard to test this
-# just add `1/x < 0` check in your code somewhere
-num-negative-zero:
-  type: extra
-  output: -0.0
-  input: >
-    -0
-
-num-nan:
-  type: basic
-  output: .nan
-  input: >
-    NaN
-
-num-signed-nan:
-  type: basic
-  output: .nan
-  input: >
-    +NaN
-
-num-positive-inf:
-  type: basic
-  output: +.inf
-  input: >
-    Infinity
-
-num-negative-inf:
-  type: basic
-  output: -.inf
-  input: >
-    -Infinity
-
-num-inf-exact-case:
-  type: extra
-  output: !error
-  input: >
-    INFINITY
-
-# Numbers: hexadecimal
-# --------------------
-
-num-hex-zero:
-  type: basic
-  output: 0
-  input: >
-    0x0
-
-num-cut-hex:
-  type: basic
-  output: !error
-  input: >
-    0x
-
-num-all-hex:
-  type: basic
-  output: 12841684683518
-  input: >
-    0xBADF00DCAFE
-
-num-mixed-case:
-  type: basic
-  output: 3735928559
-  input: >
-    0xDeAdBEef
-
-num-signed-hex:
-  type: advanced
-  output: 31
-  input: >
-    +0x1F
-
-num-negative-hex:
-  type: advanced
-  output: -31
-  input: >
-    -0x1f
-
-num-bad-hex:
-  type: advanced
-  output: !error
-  input: >
-    0xBADxF00D
-
-num-no-hex-float:
-  type: advanced
-  output: !error
-  input: >
-    0x12.345
-
-# this is not actually an exponent :)
-num-hex-exponent:
-  type: advanced
-  output: 4836
-  input: >
-    0x0012e4
-
-# Numbers: octal
-# --------------
-
-# Octals are primarily used in config files
-# to set up a file mask (like 0777)
-#
-# Note: they will have 0o12345 syntax instead
-# of 012345 in the ES6, so we'll need to switch
-# as well in the future
-
-num-octal:
-  type: extra
-  output: 342391
-  input: >
-    01234567
-
-num-octal-zeroes:
-  type: extra
-  output: -24000
-  input: >
-    -000000056700
-
-num-bad-octal:
-  type: extra
-  output: !error
-  input: >
-    012345678
-
-num-no-octal-float:
-  type: extra
-  output: !error
-  input: >
-    012.345
-
-num-no-octal-exp:
-  type: extra
-  output: !error
-  input: >
-    0123e4
-
-# Numbers: floating point
-# -----------------------
-
-num-float:
-  type: basic
-  output: 123.456
-  input: >
-    123.456
-
-num-signed-foat:
-  type: basic
-  output: -0.00098765
-  input: >
-    -0.00098765
-
-num-omit-trailing-mantissa:
-  type: basic
-  output: 1234000
-  input: >
-    1234.e3
-
-num-omit-leading-mantissa:
-  type: advanced
-  output: -123.4
-  input: >
-    -.1234e3
-
-num-bad-float:
-  type: advanced
-  output: !error
-  input: >
-    0.12.345
-
-num-bad-sum:
-  type: extra
-  output: !error
-  input: >
-    0.12+345
-
-num-uc-exp:
-  type: advanced
-  output: -1230000
-  input: >
-    -123E+4
-
-num-float-exp:
-  type: basic
-  output: 123000
-  input: >
-    0.0123e7
-
-num-bad-exp:
-  type: extra
-  output: !error
-  input: >
-    123e7.3
-
-num-bad-char:
-  type: extra
-  output: !error
-  input: >
-    123a456
-
-num-no-exp:
-  type: advanced
-  output: !error
-  input: >
-    123e
-
-num-zero-exp:
-  type: advanced
-  output: -0.0
-  input: >
-    -.00e-0
-
-num-dec-base-signed-exp:
-  type: advanced
-  output: 0.00000123
-  input: >
-    1230000E-012
-
-# String: quotes
-# --------------
-
-string-double-quotes:
-  type: basic
-  output: foobar
-  input: >
-    "foobar"
-
-string-single-quotes:
-  type: basic
-  output: foobar
-  input: >
-    'foobar'
-
-string-open:
-  type: basic
-  output: !error
-  input: >
-    "\\\\\\\\\\\\\"
-
-string-not-open:
-  type: basic
-  output: "\\\\\\\\\\\\\\"
-  input: >
-    "\\\\\\\\\\\\\\"
-
-string-continuation:
-  type: advanced
-  output: "  foo    bar   "
-  input: >
-    "  foo \
-       bar \
-      "
-
-string-win-continuation:
-  type: advanced
-  output: "foobar"
-  input: "'foo\\\r\nbar'"
-
-string-win-reverse-continuation:
-  type: advanced
-  output: !error
-  input: "'foo\\\n\rbar'"
-
-string-unicode-continuation:
-  type: advanced
-  output: "foobarbaz"
-  input: "'foo\\\u2028bar\\\u2029baz'"
-
-string-multi-bad-continuation:
-  type: advanced
-  output: !error
-  input: >
-    foo\
-
-    bar
-
-string-bad-ending:
-  type: basic
-  output: !error
-  input: "'foo\rbar'"
-
-string-bad-ending-2028:
-  type: advanced
-  output: !error
-  input: "'foo\u2028bar'"
-
-string-bad-ending-2029:
-  type: advanced
-  output: !error
-  input: "'foo\u2029bar'"
-
-string-literal-unicode:
-  type: advanced
-  output: "foo\uFEFF\u2030bar\u1234"
-  input: "'foo\uFEFF\u2030bar\u1234'"
-
-string-control-char:
-  type: advanced
-  output: "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0b\x0c\x0e\x0f"
-  input: "'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0b\x0c\x0e\x0f'"
-
-# String: escape sequences
-# ------------------------
-
-string-octal-escape:
-  type: extra
-  output: "\x1b[1;32mhi\x1b[m??"
-  input: >
-    '\033[1;32mhi\033[m\077\077'
-
-string-octal-two-digits:
-  type: extra
-  output: "\n\x1c\x2e\x07890\x01"
-  input: >
-    '\12\34\56\78\90\1'
-
-string-octal-three-digits:
-  type: extra
-  output: "\n34.78\xff 0"
-  input: >
-    '\01234\5678\377\400'
-
-string-hex-escape:
-  type: extra
-  output: "\x01\x23\xab\xcd\xef"
-  input: >
-    "\x01\x23\xab\xCd\xEF"
-
-# \0 is *not* an octal escape sequence,
-# and is allowed even in strict mode
-string-zero-point:
-  type: basic
-  output: "\0"
-  input: >
-    '\0'
-
-string-escape-double-quotes:
-  type: basic
-  output: "\"''"
-  input: >
-    "\"'\'"
-
-string-escape-single-quotes:
-  type: basic
-  output: "   '\"\"   "
-  input: >
-    '   \'"\"   '
-
-string-escape-json-chars:
-  type: basic
-  output: "\\\/\b\f\n\r\t"
-  input: >
-    "\\\/\b\f\n\r\t"
-
-# this character was left out of
-# json spec for whatever reason
-string-escape-slash-v:
-  type: basic
-  output: "\v"
-  input: >
-    "\v"
-
-string-unicode-escape:
-  type: basic
-  output: "\u0000\uffffx\ufeff\u1234\u9f6a\u2028\uabcd"
-  input: >
-    "\u0000\uFFFFx\uFeFf\u1234\u9F6a\u2028\uabcd"
-
-string-arbitrary-escape:
-  type: advanced
-  output: "X12Uqwe\r\tyiopasd\fghjklzc\u000b\b\nm9 "
-  input: >
-    '\X12\U\q\w\e\r\t\y\i\o\p\a\s\d\f\g\h\j\k\l\z\c\v\b\n\m\9\ '
-
-string-bad-unicode:
-  type: advanced
-  output: !error
-  input: >
-    '\uEFGH'
-
-string-incomplete-unicode:
-  type: advanced
-  output: !error
-  input: >
-    '\u$'
-
-string-bad-hex:
-  type: advanced
-  output: !error
-  input: >
-    '\xFG'
-
-string-incomplete-hex:
-  type: advanced
-  output: !error
-  input: >
-    '\x$'
-
-# Object literals
-# ---------------
-
-object-nested:
-  type: basic
-  output: {q:{'w':{"e":[1]}}}
-  input: |
-    {q:{'w':{"e":[1]}}}
-
-object-trailing-comma:
-  type: basic
-  output: {foo: 'bar'}
-  input: |
-    {foo: 'bar',}
-
-object-leading-comma-style:
-  type: basic
-  output: {q: 1,w: 2,e: 3}
-  input: |
-    { q: 1
-    , w: 2
-    , e: 3
-    }
-
-object-incomplete:
-  type: basic
-  output: !error
-  input: |
-    {q:1,w:2,{}
-
-object-isnt-array:
-  type: basic
-  output: !error
-  input: |
-    {1,2}
-
-object-no-single-comma:
-  type: basic
-  output: !error
-  input: |
-    {,}
-
-object-no-elisions:
-  type: basic
-  output: !error
-  input: |
-    {q:1,,w:2}
-
-# Objects: keys
-# -------------
-
-object-singlequoted:
-  type: basic
-  output: {q: 1,w: 2,e: 3}
-  input: |
-    {'q':1,'w':2,'e':3}
-
-object-doublequoted:
-  type: basic
-  output: {q: 1,w: 2,e: 3}
-  input: |
-    {"q":1,"w":2,"e":3}
-
-object-unquoted:
-  type: basic
-  output: {$FOO_bar123: 'baz'}
-  input: >
-    {$FOO_bar123: 'baz'}
-
-object-no-first-digit:
-  type: advanced
-  output: !error
-  input: >
-    {123foo: bar}
-
-object-unquoted-unicode:
-  type: advanced
-  output: {"\u1f04\u03bb\u03c6\u03b1": baz}
-  input: "{\u1f04\u03bb\u03c6\u03b1:'baz'}"
-
-object-unicode-escape-key:
-  type: advanced
-  output: {foo: 'bar', "\u1f04\u03bb\u03c6\u03b1": baz, "qwe\u1f04rty": quux}
-  input: |
-    {foo:'bar', \u1f04\u03bb\u03c6\u03b1:'baz', qwe\u1f04rty: "quux"}
-
-object-no-raw-literal:
-  type: extra
-  output: !error
-  input: |
-    {foo: bar}
-
-object-bad-literal:
-  type: advanced
-  output: !error
-  input: |
-    {foo-bar: 123}
-
-object-no-space-in-key:
-  type: advanced
-  output: !error
-  input: |
-    {foo bar: 123}
-
-object-no-comment-in-key:
-  type: advanced
-  output: !error
-  input: |
-    {foo/*bar*/baz: 123}
-
-object-float-keys:
-  type: advanced
-  output: {'1': 'one', '3.1415': 'pi'}
-  input: |
-    {1:'one', 3.1415:'pi'}
-
-object-no-negative:
-  type: advanced
-  output: !error
-  input: |
-    {-5: 123}
-
-object-exponent-keys:
-  type: advanced
-  output: {'1': 'exp', '1000': 'pos', '0.001': 'neg'}
-  input: |
-    {1e0: 'exp', 1e+3: 'pos', 1e-3: 'neg'}
-
-object-octal-keys:
-  type: extra
-  output: {'668': 1}
-  input: |
-    {01234: 1}
-
-object-hex-keys:
-  type: advanced
-  output: {'51966': 1}
-  input: |
-    {0xCAFE: 1}
-
-object-null-keys:
-  type: basic
-  output: {'null': null}
-  input: |
-    {null: null}
-
-object-no-array-keys:
-  type: extra
-  output: !error
-  input: |
-    {[]: 123}
-
-object-no-empty-keys:
-  type: basic
-  output: !error
-  input: |
-    {: 123}
-
-object-empty-string-key:
-  type: basic
-  output: {s: {'': 1}, m: {'': 2}}
-  input: |
-    {s: {'': 1}, m: {"": 2}}
-
-object-bad-unicode-space:
-  type: advanced
-  output: !error
-  input: |
-    { \u0020foobar: 123 }
-
-object-bad-unicode-dash:
-  type: advanced
-  output: !error
-  input: |
-    { foo\u002dbar: 123}
-
-object-incomplete-unicode-sequence:
-  type: advanced
-  output: !error
-  input: |
-    { foo\u12f: 123 }
-
-object-double-escape:
-  type: advanced
-  output: !error
-  input: |
-    { foo\\u1234bar: 123 }
-
-object-we-arent-es3:
-  type: basic
-  output: {new: 1, delete: 2, throw: 3}
-  input: |
-    {new: 1, delete: 2, throw: 3}
-
-object-last-digits:
-  type: basic
-  output: {$123e2: 1, abc123: 2}
-  input: |
-    {$123e2: 1, abc123: 2}
-
-object-unicode-in-string:
-  type: advanced
-  output: {"\uff13qwe": 123}
-  input: |
-    {"\uff13qwe": 123}
-
-object-unicode-esc-in-string:
-  type: advanced
-  output: {"\\uff13qwe": 123}
-  input: |
-    {"\\uff13qwe": 123}
-
-object-unicode-digits-first-esc:
-  type: advanced
-  output: !error
-  input: |
-    {\uff13qwe: 123}
-
-object-unicode-digits-first-lit:
-  type: advanced
-  output: !error
-  input: "{\uff13qwe: 123}"
-
-object-unicode-weirdness-esc:
-  type: advanced
-  output: {"digit\uff13": 1, "comb\u094F": 2, "punct\u2040": 3, "zwnj\u200C": 4}
-  input: |
-    {digit\uff13: 1, comb\u094F: 2, punct\u2040: 3, zwnj\u200C: 4}
-
-object-unicode-weirdness-lit:
-  type: advanced
-  output: {"digit\uff13": 1, "comb\u094F": 2, "punct\u2040": 3, "zwnj\u200C": 4}
-  input: "{digit\uff13: 1, comb\u094F: 2, punct\u2040: 3, zwnj\u200C: 4}"
-
-# Array literals
-# --------------
-
-array-all-types:
-  type: basic
-  output: [1.2,"3,4",{},[],null,+.inf]
-  input: |
-    [1.2,"3,4",{},[],null,Infinity]
-
-array-trailing-comma:
-  type: basic
-  output: [1,2,3,4]
-  input: |
-    [1,2,3,4,]
-
-array-leading-comma-style:
-  type: basic
-  output: [quux,foo,bar,baz]
-  input: |
-    [ 'quux'
-    , 'foo'
-    , 'bar'
-    , 'baz'
-    ]
-
-array-incomplete:
-  type: basic
-  output: !error
-  input: |
-    [1,2,3,[]
-
-array-nested:
-  type: basic
-  output: [[[[[[]]]]],[[],[]]]
-  input: |
-    [[[[[[/*[]*/]]]]],[[],[]]]
-
-array-isnt-object:
-  type: extra
-  output: !error
-  input: |
-    [1:2]
-
-array-no-single-comma:
-  type: extra
-  output: !error
-  input: |
-    [,]
-
-array-no-elisions:
-  type: extra
-  output: !error
-  input: |
-    [1,,2,3]
-
-# Comments
-# --------
-
-comment-single:
-  type: basic
-  output: foobar
-  input: |
-    // blahblah
-    "foobar"
-    // another one
-
-comment-multi:
-  type: basic
-  output: foobar
-  input: |
-    /*
-     * 123
-     */
-    "foobar"
-    /**/
-
-comment-single-newlines:
-  type: advanced
-  output: [ 123, 456, 789 ]
-  input: "[// foo\r123,// bar\u2028456,// baz\u2029789]"
-
-comment-inside:
-  type: advanced
-  output: [123, '// foo', '/* bar']
-  input: >
-    [
-      /*
-      " // */ 123, // ",
-      "// foo",
-      '/* bar',
-    ]
-
-comment-in-token:
-  type: advanced
-  output: !error
-  input:
-    123/*comment*/456
-
-comment-java-style:
-  type: basic
-  output: 123
-  input:
-    /*****************/
-    123
-    /****************/
-
-comment-object:
-  type: basic
-  output: {q: 123}
-  input: /**/{/**/q/**/:/**/123/**/,/**/}//
-
-# Whitespace
-# ----------
-
-ws-no-whitespace:
-  type: basic
-  output: {"foo":bar,bar:["qwe",null,[],{}],"baz":123}
-  input: '{foo:"bar","bar":["qwe",null,[],{}],"baz":123}'
-
-ws-allow-prefix:
-  type: basic
-  output: 123
-  input: " \t123"
-
-ws-unicode-spaces:
-  type: advanced
-  output: { foo : 123 }
-  input: "
-    \u0020\u00A0\uFEFF
-    {
-    \x09\x0A\x0B\x0C\x0D\u1680\u180E
-      foo
-    \u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A
-      :
-    \u2028\u2029\u202F\u205F\u3000
-      123
-    \uFEFF
-    }"
-
-ws-unicode-newlines:
-  type: advanced
-  output: [ 123, 456 ]
-  input: "
-    [
-      \u000D
-      123,
-      \u2028
-      456,
-      \u2029
-    ]
-    "
-
-# Multiple tokens
-# ---------------
-
-multi-string-nospace:
-  type: basic
-  output: !error
-  input: '"foo""bar"'
-
-multi-string:
-  type: basic
-  output: !error
-  input: '"foo" "bar"'
-
-# note: valid javascript
-multi-array:
-  type: extra
-  output: !error
-  input: '[0] [0]'
-
-multi-object:
-  type: basic
-  output: !error
-  input: '{} {}'
-...
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_analyze.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_analyze.js
deleted file mode 100644
index 2a24e01eac2c2d..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_analyze.js
+++ /dev/null
@@ -1,53 +0,0 @@
-var _assert = require('assert')
-var analyze = require('../').analyze
-
-function addTest(a, b) {
-  if (typeof(describe) === 'function') {
-    it('test_analyze: ' + a + ' == ' + b, function() {
-      _assert.equal(a, b)
-    })
-  } else {
-    _assert.equal(a, b)
-  }
-}
-
-var t = analyze(JSON.stringify(require('os').networkInterfaces()))
-addTest(t.has_whitespace, false)
-addTest(t.has_comments, false)
-addTest(t.has_newlines, false)
-addTest(t.newline, '\n')
-addTest(t.quote, '"')
-addTest(t.quote_keys, true)
-addTest(t.indent, '')
-
-var t = analyze(JSON.stringify(require('os').networkInterfaces(), null, 2))
-addTest(t.has_whitespace, true)
-addTest(t.has_comments, false)
-addTest(t.has_newlines, true)
-addTest(t.newline, '\n')
-addTest(t.quote, '"')
-addTest(t.quote_keys, true)
-addTest(t.indent, '  ')
-
-var t = analyze(JSON.stringify(require('os').networkInterfaces(), null, 3))
-addTest(t.indent, '   ')
-
-var t = analyze(JSON.stringify(require('os').networkInterfaces(), null, '\t'))
-addTest(t.indent, '\t')
-
-var t = analyze(JSON.stringify(require('os').networkInterfaces(), null, 3).replace(/\n/g, '\r\n'))
-addTest(t.indent, '   ')
-addTest(t.newline, '\r\n')
-
-var t = analyze(JSON.stringify(require('os').networkInterfaces()).replace(/"/g, "'"))
-addTest(t.quote, "'")
-addTest(t.quote_keys, true)
-
-var t = analyze("{foo:'bar', 'bar':\"baz\", 'baz':\"quux\"}")
-addTest(t.quote, "'")
-addTest(t.quote_keys, false)
-
-var t = analyze("{foo:'bar', \"bar\":'baz', \"baz\":\"quux\"}")
-addTest(t.quote, '"')
-addTest(t.quote_keys, false)
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_document.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_document.js
deleted file mode 100644
index 5f1ef2aaf6a764..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_document.js
+++ /dev/null
@@ -1,214 +0,0 @@
-var assert = require('assert')
-var create = require('../lib/document').Document
-var jju = require('..')
-
-var str = '{ x\r\n:\n1, y: {"..z.": 123, t: null, s:"123", a:[ 1,2,{x:3},] }}\n'
-var d = create(str)
-assert.equal(d + '', str)
-assert.deepEqual(d.get(''), {x:1,y:{'..z.':123,t:null,s:'123',a:[1,2,{x:3}]}})
-assert.deepEqual(d.get('x'), 1)
-assert.deepEqual(d.get('x.x'), undefined)
-assert.deepEqual(d.get('x.x.x.x'), undefined)
-assert.strictEqual(d.get('y.x'), undefined)
-assert.deepEqual(d.get('y.s'), '123')
-assert.strictEqual(d.get('y.t'), null)
-assert.strictEqual(d.get('y.t.x'), undefined)
-assert.equal(d.has(''), true)
-assert.equal(d.has('x'), true)
-assert.equal(d.has('x.x'), false)
-assert.equal(d.has('x.x.x.x'), false)
-assert.equal(d.has('y.x'), false)
-assert.equal(d.has('y'), true)
-assert.equal(d.has('y.s'), true)
-assert.equal(d.has('y.t'), true)
-assert.equal(d.has('a'), false)
-
-// arrays
-assert.deepEqual(d.get('y.a'), [1,2,{x:3}])
-assert.deepEqual(d.get('y.a.0'), 1)
-assert.deepEqual(d.get('y.a.2.x'), 3)
-assert.deepEqual(d.get('y.a.10'), undefined)
-assert.deepEqual(d.has('y.a.0'), true)
-assert.deepEqual(d.has('y.a.10'), false)
-assert.deepEqual(d.get('y.a.2'), {x:3})
-assert.deepEqual(d.get('y.a.-1'), undefined)
-
-// controversial
-assert.strictEqual(d.get('y.s.0'), undefined)
-assert.equal(d.has('y.s.0'), false)
-
-// paths
-assert.deepEqual(d.get([]), {x:1,y:{'..z.':123,t:null,s:'123',a:[1,2,{x:3}]}})
-assert.strictEqual(d.has([]), true)
-assert.strictEqual(d.get(['y','..z.']), 123)
-assert.strictEqual(d.has(['y','..z.']), true)
-assert.deepEqual(d.get(['y','a',2,'x']), 3)
-assert.deepEqual(create('[1]').set(0, 4).get(''), [4])
-assert.deepEqual(create('[1]').set(1, 4).get(''), [1,4])
-assert.deepEqual(create('[1]').has(0), true)
-assert.deepEqual(create('[1]').has(1), false)
-assert.deepEqual(create('[1]').get(0), 1)
-
-// invalid paths
-assert.throws(function() { create('[1]').set(null, 4) }, /invalid path type/i)
-assert.throws(function() { create('[1]').set({}, 4) }, /invalid path type/i)
-assert.throws(function() { create('[1]').set(/./, 4) }, /invalid path type/i)
-assert.throws(function() { create('[1]').set(function(){}, 4) }, /invalid path type/i)
-assert.throws(function() { create('[1]').set(false, 4) }, /invalid path type/i)
-assert.throws(function() { create('[1]').set(undefined, 4) }, /invalid path type/i)
-
-// set root
-assert.strictEqual(create(str).set('', 4).get(''), 4)
-assert.strictEqual(create(str).set('', null).get(''), null)
-assert.strictEqual(create(str).set('', {x:4}).get('x'), 4)
-assert.deepEqual(create(str).set('', [1,2,3]).get(''), [1,2,3])
-assert.strictEqual(create('1').set('', 4).get(''), 4)
-assert.strictEqual(create('null').set('', 4).get(''), 4)
-assert.strictEqual(create('[]').set('', 4).get(''), 4)
-assert.strictEqual(create('{}').set('', 4).get(''), 4)
-
-// set 1st level
-assert.deepEqual(create('{}').set('x', 4).get('x'), 4)
-assert.deepEqual(create('{a:{b:[]}}').set('a.b.0', 4).get('a'), {b:[4]})
-//assert.deepEqual(create('1').set('x', 4).get('x'), 4)
-//assert.deepEqual(create('null').set('x', 4).get('x'), 4)
-
-// array: boundaries
-assert.strictEqual(create('[]').set('0', 4).get('0'), 4)
-assert.strictEqual(create('[1,2,3]').set('2', 4).get('2'), 4)
-assert.strictEqual(create('[1,2,3]').set('3', 4).get('3'), 4)
-
-// various error cases
-assert.throws(function() { create('1').set('x', 4) }, /set key .* of an non-object/)
-assert.throws(function() { create('null').set('x', 4) }, /set key .* of an non-object/)
-assert.throws(function() { create('[]').set('x', 4) }, /set key .* of an array/)
-assert.throws(function() { create('""').set('x', 4) }, /set key .* of an non-object/)
-assert.throws(function() { create('{}').set('x.x.x', 4) }, /set key .* of an non-object/)
-assert.throws(function() { create('1').set('1', 4) }, /set key .* of an non-object/)
-assert.throws(function() { create('null').set('1', 4) }, /set key .* of an non-object/)
-assert.throws(function() { create('""').set('1', 4) }, /set key .* of an non-object/)
-assert.throws(function() { create('[]').set('-1', 4) }, /set key .* of an array/)
-assert.throws(function() { create('[]').set('1', 4) }, /set key .* out of bounds/)
-assert.throws(function() { create('[1,2,3]').set('4', 4) }, /set key .* out of bounds/)
-assert.throws(function() { create('{a:{b:[]}}').set('a.b.x', 4) }, /set key .* of an array/)
-
-// unsetting stuff
-assert.throws(function() { create('[]').unset('') }, /can't remove root document/)
-
-// arrays: handling spaces correctly
-assert.equal(create("[]").set(0,{})+"", '[{}]')
-assert.equal(create("[0]").set(1,{})+"", '[0,{}]')
-assert.equal(create("[0,]").set(1,{})+"", '[0,{},]')
-assert.equal(create("[    ]").set(0,{})+"", '[{}    ]')
-assert.equal(create("[ 0  ,  ]").set(1,{})+"", '[ 0  , {},  ]')
-assert.equal(create("[ 0   ]").set(1,{})+"", '[ 0, {}   ]')
-assert.equal(create("{}").set('y',{})+"", '{"y":{}}')
-assert.equal(create("{x:1}").set('y',{})+"", '{x:1,y:{}}')
-assert.equal(create("{x:1,}").set('y',{})+"", '{x:1,y:{},}')
-assert.equal(create("{    }").set('y',{})+"", '{"y":{}    }')
-assert.equal(create("{ x:1  ,  }").set('y',{})+"", '{ x:1  , y:{},  }')
-assert.equal(create("{ x:1   }").set('y',{})+"", '{ x:1, y:{}   }')
-
-// deleting elements
-assert.throws(function() { create('[]').unset('0') }, /unset key .* out of bounds/)
-assert.throws(function() { create('[1,2]').unset('2') }, /unset key .* out of bounds/)
-assert.throws(function() { create('[1,2,3]').unset('0') }, /in the middle of an array/)
-
-// CommonJS assert spec is "awesome"
-assert.deepEqual(create('[1,2]').unset('1').get(''), [1])
-assert.deepEqual(create('[1,2]').unset('1').get('').length, 1)
-assert.deepEqual(create('[1,2,3]').unset('2').unset('1').get(''), [1])
-assert.deepEqual(create('[1,2,3]').unset('2').unset('1').get('').length, 1)
-assert.deepEqual(create('[1]').unset('0').get(''), [])
-assert.deepEqual(create('[1]').unset('0').get('').length, 0)
-
-assert.deepEqual(create('{x:{y:"z"}, z:4}').unset('x').get(''), {z:4})
-assert.throws(function() { create('[1,2]').unset('') }, /root/)
-
-// getting crazy
-//assert.deepEqual(create(str).set('a.b.c.d.e', 1).get('a'), {b:{c:{d:{e:1}}}})
-
-// update: arrays
-assert.deepEqual(create("[1]").update([2,3])+"", '[2,3]')
-assert.deepEqual(create("[1]").update([2,3,4])+"", '[2,3,4]')
-assert.deepEqual(create("[]").update([2])+"", '[2]')
-assert.deepEqual(create("[2]").update([])+"", '[]')
-assert.deepEqual(create("[2,3,4]").update([2,3])+"", '[2,3]')
-assert.deepEqual(create("[2,3,4]").update([])+"", '[]')
-assert.deepEqual(create("[]").update([2,3,4])+"", '[2,3,4]')
-assert.deepEqual(create(" /*zz*/ [ 2 , 3 , 4 ] /*xx*/ ").update([])+"", ' /*zz*/ [    ] /*xx*/ ')
-assert.deepEqual(create(" /*zz*/ [ ] /*xx*/ ").update([2,3,4])+"", ' /*zz*/ [2,3,4 ] /*xx*/ ')
-
-// update: objects
-assert.deepEqual(create("{x:1}").update({x:1,y:2,z:3})+"", '{x:1,y:2,z:3}')
-assert.deepEqual(create("{x:1}").update({x:2,z:3,t:4})+"", '{x:2,z:3,t:4}')
-assert.deepEqual(create("{}").update({x:1,y:2})+"", '{"x":1,"y":2}')
-assert.deepEqual(create("{x:1}").update({})+"", '{}')
-assert.deepEqual(create("{x:1,y:2}").update({x:1})+"", '{x:1}')
-assert.deepEqual(create(" /*zz*/ { x /*a*/ : /*b*/ 2 , y:3 , z //\n: 4  } /*xx*/ ").update({})+"", ' /*zz*/ {     } /*xx*/ ')
-assert.deepEqual(create(" /*zz*/ { } /*xx*/ ").update({x: 2, y: 3, z: 4})+"", ' /*zz*/ {"x":2,"y":3,"z":4 } /*xx*/ ')
-
-// remove trailing comma
-assert.deepEqual(create("{x:1,}").update({})+"", '{}')
-assert.deepEqual(create("[0,]").update([])+"", '[]')
-assert.deepEqual(create("[0 /*z*/ , /*z*/]").update([])+"", '[ /*z*/]')
-
-// mode
-assert.equal(create('{"test":123}', {mode:'json'}).update({q:1,w:2})+'', '{"q":1,"w":2}')
-
-assert.equal(create('{1:2}').update({ a: 1, b: [1,2], c: 3})+'', '{a:1,b:[1,2],c:3}')
-
-// undef
-//assert.throws(function(){ jju.update(undefined, undefined) }, /root doc/)
-assert.equal(jju.update(undefined, undefined), '')
-assert.equal(jju.update(undefined, 42), '42')
-assert.equal(jju.update(undefined, {x: 5}), '{"x":5}')
-
-/*
- *  real test
- */
-var upd = { name: 'yapm',
-  version: '0.6.0',
-  description: 'npm wrapper allowing to use package.yaml instead of package.json',
-  author: { name: 'Alex Kocharin', email: 'alex@kocharin.ru' },
-  keywords:
-   [ 'package manager',
-     'modules',
-     'install',
-     'package.yaml',
-     'package.json5',
-     'yaml',
-     'json5',
-     'npm' ],
-  preferGlobal: true,
-  homepage: 'https://npmjs.org/doc/',
-  repository: { type: 'git', url: 'https://github.com/rlidwka/yapm' },
-  bugs: { url: 'http://github.com/rlidwka/yapm/issues' },
-  main: './yapm.js',
-  bin: { yapm: './yapm.js' },
-  dependencies: { npm: '*', 'js-yaml': '*', through: '*', 'json5-utils': '*' },
-  devDependencies: { async: '*' },
-  optionalDependencies: { 'yaml-update': '*' },
-  test_nonascii: 'тест' }
-
-assert.deepEqual(create(create('{"garbage":"garbage"}').update(upd)).get(''), upd)
-assert.deepEqual(JSON.parse(create('{"garbage":"garbage"}', {mode:'json',legacy:true}).update(upd)), upd)
-
-//console.log(create('{"garbage":"garbage"}').update(upd)+'')
-
-//assert.deepEqual(create("  [  ]  //").set(0,{})+""  [  ,{}]  //
-
-
-//node -e 'console.log(require("./document").Document("{}").set("",[1,2,3])+"")'[1, 2, 3]
-
-//alex@elu:~/json5-utils/lib$ node -e 'console.log(require("./document").Document("[]").set("0",[1,2,3]).get(""))'
-//[ [ 1, 2, 3 ] ]
-
-
-/*assert.equal(create('"test"').get(''), 'test')
-assert.equal(create('"test"').get([]), 'test')
-assert.equal(create('"test"').get(false), 'test')
-assert.equal(create(undefined).get(''), undefined)
-
-//assert.equal(create('"test"').set('', 'foo').toString(), '"foo"')
-*/
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_errors.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_errors.js
deleted file mode 100644
index 8b2cdb7dcbdf67..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_errors.js
+++ /dev/null
@@ -1,56 +0,0 @@
-var assert = require('assert')
-var parse = require('../').parse
-
-function addTest(arg, row, col, errRegExp) {
-  var fn = function() {
-    try {
-      parse(arg)
-    } catch(err) {
-      if (row !== undefined) assert.equal(err.row, row, 'wrong row: ' + err.row)
-      if (col !== undefined) assert.equal(err.column, col, 'wrong column: ' + err.column)
-      if (errRegExp) assert(errRegExp.exec(err.message))
-      return
-    }
-    throw Error("no error")
-  }
-
-  if (typeof(describe) === 'function') {
-    it('test_errors: ' + JSON.stringify(arg), fn)
-  } else {
-    fn()
-  }
-}
-
-// semicolon will be unexpected, so it indicates an error position
-addTest(';', 1, 1)
-addTest('\n\n\n;', 4, 1)
-addTest('\r\n;', 2, 1)
-addTest('\n\r;', 3, 1)
-addTest('\n\u2028;', 3, 1)
-addTest('\n\u2029;', 3, 1)
-addTest('[\n1\n,\n;', 4, 1)
-addTest('{\n;', 2, 1)
-addTest('{\n1\n:\n;', 4, 1)
-addTest('.e3', 1, 3, /"\.e3"/)
-
-// line continuations
-addTest('["\\\n",\n;', 3, 1)
-addTest('["\\\r\n",\n;', 3, 1)
-addTest('["\\\u2028",\n;', 3, 1)
-addTest('["\\\u2029",\n;', 3, 1)
-
-// bareword rewind
-addTest('nulz', 1, 1)
-
-// no data
-addTest('  ', 1, 3, /No data.*whitespace/)
-addTest('blah', 1, 1, /Unexpected token 'b'/)
-addTest('', 1, 1, /No data.*empty input/)
-
-try {
-  parse('{{{{{{{{{')
-} catch(err) {
-  var x = err.stack.match(/parseObject/g)
-  assert(!x || x.length < 2, "shouldn't blow up the stack with internal calls")
-}
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_parse.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_parse.js
deleted file mode 100644
index d33e61ee7e37be..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_parse.js
+++ /dev/null
@@ -1,171 +0,0 @@
-var assert = require('assert')
-var parse = require('../').parse
-
-function addTest(arg, bulk) {
-  function fn_json5() {
-    //console.log('testing: ', arg)
-    try {
-      var x = parse(arg)
-    } catch(err) {
-      x = 'fail'
-    }
-    try {
-      var z = eval('(function(){"use strict"\nreturn ('+String(arg)+'\n)\n})()')
-    } catch(err) {
-      z = 'fail'
-    }
-    assert.deepEqual(x, z)
-  }
-
-  function fn_strict() {
-    //console.log('testing: ', arg)
-    try {
-      var x = parse(arg, {mode: 'json'})
-    } catch(err) {
-      x = 'fail'
-    }
-    try {
-      var z = JSON.parse(arg)
-    } catch(err) {
-      z = 'fail'
-    }
-    assert.deepEqual(x, z)
-  }
-
-  if (typeof(describe) === 'function' && !bulk) {
-    it('test_parse_json5: ' + JSON.stringify(arg), fn_json5)
-    it('test_parse_strict: ' + JSON.stringify(arg), fn_strict)
-  } else {
-    fn_json5()
-    fn_strict()
-  }
-}
-
-addTest('"\\uaaaa\\u0000\\uFFFF\\uFaAb"')
-addTest(' "\\xaa\\x00\xFF\xFa\0\0"  ')
-addTest('"\\\'\\"\\b\\f\\t\\n\\r\\v"')
-addTest('"\\q\\w\\e\\r\\t\\y\\\\i\\o\\p\\[\\/\\\\"')
-addTest('"\\\n\\\r\n\\\n"')
-addTest('\'\\\n\\\r\n\\\n\'')
-addTest('  null')
-addTest('true  ')
-addTest('false')
-addTest(' Infinity ')
-addTest('+Infinity')
-addTest('[]')
-addTest('[ 0xA2, 0X024324AaBf]')
-addTest('-0x12')
-addTest('  [1,2,3,4,5]')
-addTest('[1,2,3,4,5,]  ')
-addTest('[1e-13]')
-addTest('[null, true, false]')
-addTest('  [1,2,"3,4,",5,]')
-addTest('[ 1,\n2,"3,4,"  \r\n,\n5,]')
-addTest('[  1  ,  2  ,  3  ,  4  ,  5  ,  ]')
-addTest('{}  ')
-addTest('{"2":1,"3":null,}')
-addTest('{ "2 " : 1 , "3":null  , }')
-addTest('{ \"2\"  : 25e245 ,  \"3\": 23 }')
-addTest('{"2":1,"3":nul,}')
-addTest('{:1,"3":nul,}')
-addTest('[1,2] // ssssssssss 3,4,5,]  ')
-addTest('[1,2 , // ssssssssss \n//xxx\n3,4,5,]  ')
-addTest('[1,2 /* ssssssssss 3,4,*/ /* */ , 5 ]  ')
-addTest('[1,2 /* ssssssssss 3,4,*/ /* * , 5 ]  ')
-addTest('{"3":1,"3":,}')
-addTest('{ чйуач:1, щцкшчлм  : 4,}')
-addTest('{ qef-:1 }')
-addTest('{ $$$:1 , ___: 3}')
-addTest('{3:1,2:1}')
-addTest('{3.4e3:1}')
-addTest('{-3e3:1}')
-addTest('{+3e3:1}')
-addTest('{.3e3:1}')
-
-for (var i=0; i<200; i++) {
-  addTest('"' + String.fromCharCode(i) + '"', true)
-}
-
-// strict JSON test cases
-addTest('"\\xaa"')
-addTest('"\\0"')
-addTest('"\0"')
-addTest('"\\v"')
-addTest('{null: 123}')
-addTest("{'null': 123}")
-
-assert.throws(function() {
-  parse('0o')
-})
-
-assert.strictEqual(parse('01234567'), 342391)
-assert.strictEqual(parse('0o1234567'), 342391)
-
-// undef
-assert.strictEqual(parse(undefined), undefined)
-
-// whitespaces
-addTest('[1,\r\n2,\r3,\n]')
-'\u0020\u00A0\uFEFF\x09\x0A\x0B\x0C\x0D\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000'.split('').forEach(function(x) {
-  addTest(x+'[1,'+x+'2]'+x)
-  addTest('"'+x+'"'+x)
-})
-'\u000A\u000D\u2028\u2029'.split('').forEach(function(x) {
-  addTest(x+'[1,'+x+'2]'+x)
-  addTest('"\\'+x+'"'+x)
-})
-
-/* weird ES6 stuff, not working
-
-if (process.version > 'v0.11.7') {
-  assert(Array.isArray(parse('{__proto__:[]}').__proto__))
-  assert.equal(parse('{__proto__:{xxx:5}}').xxx, undefined)
-  assert.equal(parse('{__proto__:{xxx:5}}').__proto__.xxx, 5)
-
-  var o1 = parse('{"__proto__":[]}')
-  assert.deepEqual([], o1.__proto__)
-  assert.deepEqual(["__proto__"], Object.keys(o1))
-  assert.deepEqual([], Object.getOwnPropertyDescriptor(o1, "__proto__").value)
-  assert.deepEqual(["__proto__"], Object.getOwnPropertyNames(o1))
-  assert(o1.hasOwnProperty("__proto__"))
-  assert(Object.prototype.isPrototypeOf(o1))
-
-  // Parse a non-object value as __proto__.
-  var o2 = JSON.parse('{"__proto__":5}')
-  assert.deepEqual(5, o2.__proto__)
-  assert.deepEqual(["__proto__"], Object.keys(o2))
-  assert.deepEqual(5, Object.getOwnPropertyDescriptor(o2, "__proto__").value)
-  assert.deepEqual(["__proto__"], Object.getOwnPropertyNames(o2))
-  assert(o2.hasOwnProperty("__proto__"))
-  assert(Object.prototype.isPrototypeOf(o2))
-}*/
-
-assert.throws(parse.bind(null, "{-1:42}"))
-
-for (var i=0; i<100; i++) {
-  var str = '-01.e'.split('')
-
-  var rnd = [1,2,3,4,5].map(function(x) {
-    x = ~~(Math.random()*str.length)
-    return str[x]
-  }).join('')
-
-  try {
-    var x = parse(rnd)
-  } catch(err) {
-    x = 'fail'
-  }
-  try {
-    var y = JSON.parse(rnd)
-  } catch(err) {
-    y = 'fail'
-  }
-  try {
-    var z = eval(rnd)
-  } catch(err) {
-    z = 'fail'
-  }
-  //console.log(rnd, x, y, z)
-  if (x !== y && x !== z) throw 'ERROR'
-}
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_portable.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_portable.js
deleted file mode 100644
index 0143e7d8e5bff6..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_portable.js
+++ /dev/null
@@ -1,60 +0,0 @@
-var assert = require('assert')
-var FS = require('fs')
-var YAML = require('js-yaml')
-var jju = require('../')
-
-function addTest(name, fn) {
-  if (typeof(describe) === 'function') {
-    it(name, fn)
-  } else {
-    fn()
-  }
-}
-
-var schema = YAML.Schema.create([
-  new YAML.Type('!error', {
-    kind: 'scalar',
-    resolve: function (state) {
-      //state.result = null
-      return true
-    },
-  })
-])
-
-var tests = YAML.safeLoad(FS.readFileSync(__dirname + '/portable-json5-tests.yaml', 'utf8'), {
-  schema: schema
-})
-
-if (!Object.is) {
-  Object.defineProperty(Object, 'is', {
-    value: function(x, y) {
-      if (x === y) {
-        return x !== 0 || 1 / x === 1 / y;
-      }
-      return x !== x && y !== y;
-    },
-    configurable: true,
-    enumerable: false,
-    writable: true,
-  })
-}
-
-for (var k in tests) {
-  ;(function(k) {
-    addTest(k, function() {
-      try {
-        var result = jju.parse(tests[k].input)
-      } catch(err) {
-        result = null
-      }
-
-      // need deepStrictEqual
-      if (typeof(result) === 'object') {
-        assert.deepEqual(result, tests[k].output)
-      } else {
-        assert(Object.is(result, tests[k].output), String(result) + ' == ' + tests[k].output)
-      }
-    })
-  })(k)
-}
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_stringify.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_stringify.js
deleted file mode 100644
index c97e38e93c1f61..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_stringify.js
+++ /dev/null
@@ -1,89 +0,0 @@
-var assert = require('assert')
-var parse = require('../').parse
-var stringify = require('../').stringify
-
-function deepEqual(x, y) {
-  if (Number.isNaN(x)) {
-    return assert(Number.isNaN(y))
-  }
-  assert.deepEqual(x, y)
-}
-
-function addTest(arg, arg2, arg3) {
-  function fn() {
-    deepEqual(parse(stringify(arg)), arg2 === undefined ? arg : arg2)
-    if (arg !== undefined) deepEqual(JSON.parse(stringify(arg, {mode: 'json', indent: false})), (arg3 === undefined ? (arg2 === undefined ? arg : arg2) : arg3))
-  }
-
-  if (typeof(describe) === 'function') {
-    it('test_stringify: ' + JSON.stringify(arg), fn)
-  } else {
-    fn()
-  }
-}
-
-addTest(0)
-addTest(-0)
-addTest(NaN, undefined, null)
-addTest(Infinity, undefined, null)
-addTest(-Infinity, undefined, null)
-addTest(123)
-addTest(19508130958019385.135135)
-addTest(-2e123)
-addTest(null)
-addTest(undefined)
-addTest([])
-addTest([,,,,,,,], [null,null,null,null,null,null,null])
-addTest([undefined,null,1,2,3,], [null,null,1,2,3])
-addTest([[[[]]],[[]]])
-addTest({})
-addTest({1:2,3:4})
-addTest({1:{1:{1:{1:4}}}, 3:4})
-addTest({1:undefined, 3:undefined}, {})
-addTest(new Number(4), 4)
-addTest(new Boolean(true), true)
-addTest(new String('xqefxef'), 'xqefxef')
-addTest(new Boolean(), false)
-
-var r='';for (var i=0; i<5000; i++) {r+=String.fromCharCode(i)}
-addTest(r)
-
-assert.equal("[1, 2, 3]", stringify([1, 2, 3], {indent: 1}))
-assert.equal("[1, 2, 3]", stringify([1, 2, 3], {indent: 2}))
-
-var oddball = Object(42)
-oddball.__proto__ = { __proto__: null }
-assert.equal('{}', stringify(oddball))
-
-/* this WILL throw
-var falseNum = Object("37")
-falseNum.__proto__ = Number.prototype
-assert.equal("{0: '3', 1: '7'}", stringify(falseNum))*/
-
-assert.equal(stringify(Infinity), 'Infinity')
-assert.equal(stringify(Infinity, {mode: 'json'}), 'null')
-assert.equal(stringify(NaN), 'NaN')
-assert.equal(stringify(NaN, {mode: 'json'}), 'null')
-assert.equal(stringify(-0), '-0')
-
-assert.equal(stringify('test', null), "'test'")
-
-var array = [""]
-var expected = "''"
-for (var i = 0; i < 1000; i++) {
-  array.push("")
-  expected = "''," + expected
-}
-expected = '[' + expected + ']'
-assert.equal(expected, stringify(array, {indent: false}))
-
-assert.strictEqual(stringify([1,2,3], function(){}), undefined)
-
-// don't stringify prototype
-assert.equal('{a: 1}', stringify({a:1,__proto__:{b:2}}))
-
-// sort keys tests
-assert.equal('{a: 1, b: 2, z: 3}', stringify({b:2,a:1,z:3}, {sort_keys: 1}))
-assert.equal('{a: 1, b: {a: 2, b: 5, c: 1}, z: 3}', stringify({b:{c:1,a:2,b:5},a:1,z:3}, {sort_keys: 1}))
-assert.equal('{a: [3, 5, 1], b: 2, z: 3}', stringify({b:2,a:[3,5,1],z:3}, {sort_keys: 1}))
-assert.equal('{b: 2, a: 1, z: 3}', stringify({b:2,a:1,z:3}, {sort_keys: 0}))
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_tokenize.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_tokenize.js
deleted file mode 100644
index 64fb7ec93d9fef..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_tokenize.js
+++ /dev/null
@@ -1,99 +0,0 @@
-var assert = require('assert')
-var parse = require('../').parse
-
-function tokenize(arg) {
-  var result = []
-  parse(arg, {_tokenize: function(smth) {
-    result.push(smth)
-  }})
-  assert.deepEqual(result.map(function(x){return x.raw}).join(''), arg)
-  return result
-}
-
-function addTest(x, exp) {
-  function fn(){assert.deepEqual(tokenize(x), exp)}
-
-  if (typeof(describe) === 'function') {
-    it('test_tokenize: ' + JSON.stringify(x), fn)
-  } else {
-    fn()
-  }
-}
-
-addTest('123', [ { raw: '123', value: 123, type: 'literal', stack: [] }])
-
-addTest(' /* zz */\r\n true /* zz */\n',
-[ { raw: ' ', type: 'whitespace', stack: [] },
-  { raw: '/* zz */', type: 'comment', stack: [] },
-  { raw: '\r\n', type: 'newline', stack: [] },
-  { raw: ' ', type: 'whitespace', stack: [] },
-  { raw: 'true', type: 'literal', value: true, stack: [] },
-  { raw: ' ', type: 'whitespace', stack: [] },
-  { raw: '/* zz */', type: 'comment', stack: [] },
-  { raw: '\n', type: 'newline', stack: [] } ])
-
-addTest('{q:123,  w : /*zz*/\n\r 345 } ',
-[ { raw: '{', type: 'separator', stack: [] },
-  { raw: 'q', type: 'key', value: 'q', stack: [] },
-  { raw: ':', type: 'separator', stack: [] },
-  { raw: '123', type: 'literal', value: 123, stack: ['q'] },
-  { raw: ',', type: 'separator', stack: [] },
-  { raw: '  ', type: 'whitespace', stack: [] },
-  { raw: 'w', type: 'key', value: 'w', stack: [] },
-  { raw: ' ', type: 'whitespace', stack: [] },
-  { raw: ':', type: 'separator', stack: [] },
-  { raw: ' ', type: 'whitespace', stack: [] },
-  { raw: '/*zz*/', type: 'comment', stack: [] },
-  { raw: '\n', type: 'newline', stack: [] },
-  { raw: '\r', type: 'newline', stack: [] },
-  { raw: ' ', type: 'whitespace', stack: [] },
-  { raw: '345', type: 'literal', value: 345, stack: ['w'] },
-  { raw: ' ', type: 'whitespace', stack: [] },
-  { raw: '}', type: 'separator', stack: [] },
-  { raw: ' ', type: 'whitespace', stack: [] } ])
-
-addTest('null /* */// xxx\n//xxx',
-[ { raw: 'null', type: 'literal', value: null, stack: [] },
-  { raw: ' ', type: 'whitespace', stack: [] },
-  { raw: '/* */', type: 'comment', stack: [] },
-  { raw: '// xxx', type: 'comment', stack: [] },
-  { raw: '\n', type: 'newline', stack: [] },
-  { raw: '//xxx', type: 'comment', stack: [] } ])
-
-addTest('[1,2,[[],[1]],{},{1:2},{q:{q:{}}},]',
-[ { raw: '[', type: 'separator', stack: [] },
-  { raw: '1', type: 'literal', value: 1, stack: [0] },
-  { raw: ',', type: 'separator', stack: [] },
-  { raw: '2', type: 'literal', value: 2, stack: [1] },
-  { raw: ',', type: 'separator', stack: [] },
-  { raw: '[', type: 'separator', stack: [2] },
-  { raw: '[', type: 'separator', stack: [2,0] },
-  { raw: ']', type: 'separator', stack: [2,0] },
-  { raw: ',', type: 'separator', stack: [2] },
-  { raw: '[', type: 'separator', stack: [2,1] },
-  { raw: '1', type: 'literal', value: 1, stack: [2,1,0] },
-  { raw: ']', type: 'separator', stack: [2,1] },
-  { raw: ']', type: 'separator', stack: [2] },
-  { raw: ',', type: 'separator', stack: [] },
-  { raw: '{', type: 'separator', stack: [3] },
-  { raw: '}', type: 'separator', stack: [3] },
-  { raw: ',', type: 'separator', stack: [] },
-  { raw: '{', type: 'separator', stack: [4] },
-  { raw: '1', type: 'key', value: 1, stack: [4] },
-  { raw: ':', type: 'separator', stack: [4] },
-  { raw: '2', type: 'literal', value: 2, stack: [4,'1'] },
-  { raw: '}', type: 'separator', stack: [4] },
-  { raw: ',', type: 'separator', stack: [] },
-  { raw: '{', type: 'separator', stack: [5] },
-  { raw: 'q', type: 'key', value: 'q', stack: [5] },
-  { raw: ':', type: 'separator', stack: [5] },
-  { raw: '{', type: 'separator', stack: [5,'q'] },
-  { raw: 'q', type: 'key', value: 'q', stack: [5,'q'] },
-  { raw: ':', type: 'separator', stack: [5,'q'] },
-  { raw: '{', type: 'separator', stack: [5,'q','q'] },
-  { raw: '}', type: 'separator', stack: [5,'q','q'] },
-  { raw: '}', type: 'separator', stack: [5,'q'] },
-  { raw: '}', type: 'separator', stack: [5] },
-  { raw: ',', type: 'separator', stack: [] },
-  { raw: ']', type: 'separator', stack: [] } ])
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_updates.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_updates.js
deleted file mode 100644
index b7482519a919a7..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/test_updates.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var assert = require('assert')
-var FS = require('fs')
-var YAML = require('js-yaml')
-var jju = require('../')
-
-function addTest(name, fn) {
-  if (typeof(describe) === 'function') {
-    it(name, fn)
-  } else {
-    fn()
-  }
-}
-
-FS.readdirSync(__dirname + '/update').filter(function(file) {
-  return file.match(/^[^\.].*\.yaml$/)
-}).forEach(function(file) {
-  addTest('update: ' + file, function() {
-    var test = YAML.load(FS.readFileSync(__dirname + '/update/' + file, 'utf8'))
-    assert.strictEqual(test.test(jju, test.input), test.output)
-  })
-})
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/author.yaml b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/author.yaml
deleted file mode 100644
index 4b08bb61b49056..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/author.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-input: |
-  { "name": "just-a-demo",
-    "version": "0.1.2",
-    "description": "blahblahblah",
-    "main": "test.js",
-    "scripts": { "test": "echo \"Error: no test specified\" && exit 1" },
-    "author": "John Doe <whoever@google.com>",
-    "license": "BSD-2-Clause" }
-
-output: |
-  { "name": "just-a-demo",
-    "version": "0.1.2",
-    "description": "blahblahblah",
-    "main": "test.js",
-    "scripts": { "test": "echo \"Error: no test specified\" && exit 1" },
-    "author": {
-      "name": "John Doe",
-      "email": "whoever@google.com"
-    },
-    "license": "BSD-2-Clause" }
-
-test: !!js/function |
-  function(jju, input) {
-    obj = jju.parse(input)
-    obj.author = {
-      name: 'John Doe',
-      email: 'whoever@google.com',
-    }
-    return jju.update(input, obj)
-  }
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/deep-object.yaml b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/deep-object.yaml
deleted file mode 100644
index e0795a37874e9e..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/deep-object.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-input: |
-  {
-    "foo": {
-      "bar": {
-        "baz": {
-          "quux": "4"
-        }
-      }
-    }
-  }
-
-output: |
-  {
-    "foo": {
-      "bar": {
-        "baz": {
-          "quux": "4"
-        },
-        "qwe": {
-          "rty": {
-            "aaa": {
-              "bbb": 1
-            }
-          }
-        }
-      }
-    }
-  }
-
-test: !!js/function |
-  function(jju, input) {
-    obj = jju.parse(input)
-    obj.foo.bar.qwe = {rty: {aaa: {bbb: 1}}}
-    return jju.update(input, obj, {mode:'json'})
-  }
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/delete.yaml b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/delete.yaml
deleted file mode 100644
index b964715d37b0b4..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/delete.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-input: |
-  {
-    "name": "test",
-    "version": "0.0.0",
-    "dependencies": {
-      "foo": "1.2.x",
-      "bar": ">= 1"
-    },
-    "bundleDependencies": [
-      "foo",
-      "bar"
-    ],
-    "license": "BSD-2-Clause"
-  }
-
-output: |
-  {
-    "name": "test",
-    "version": "0.0.0",
-    "dependencies": {
-      "foo": "1.2.x"
-    },
-    "bundleDependencies": [
-      "foo"
-    ],
-    "license": "BSD-2-Clause"
-  }
-
-test: !!js/function |
-  function(jju, input) {
-    obj = jju.parse(input)
-    obj.bundleDependencies.pop()
-    delete obj.dependencies.bar
-    return jju.update(input, obj, {mode:'json'})
-  }
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/norm-array.yaml b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/norm-array.yaml
deleted file mode 100644
index c5b9dd952d1255..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/norm-array.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-input: |
-  {
-    "name": "test",
-    "version": "0.0.0",
-    "bundleDependencies": [
-      "foo",
-      "bar"
-    ],
-    "license": "BSD-2-Clause"
-  }
-
-output: |
-  {
-    "name": "test",
-    "version": "0.0.0",
-    "bundleDependencies": [
-      "foo",
-      "bar",
-      "baz",
-      "quux"
-    ],
-    "license": "BSD-2-Clause"
-  }
-
-test: !!js/function |
-  function(jju, input) {
-    obj = jju.parse(input)
-    obj.bundleDependencies.push('baz')
-    obj.bundleDependencies.push('quux')
-    return jju.update(input, obj, {mode:'json'})
-  }
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/norm-object.yaml b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/norm-object.yaml
deleted file mode 100644
index 93878675b7abc7..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/norm-object.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-input: |
-  {
-    "name": "test",
-    "version": "0.0.0",
-    "dependencies": {
-      "foobar": "*",
-      "bazquux": ">= 1.1.1"
-    },
-    "license": "BSD-2-Clause"
-  }
-
-output: |
-  {
-    "name": "test",
-    "version": "0.0.0",
-    "dependencies": {
-      "foobar": "*",
-      "bazquux": ">= 1.1.1",
-      "whatever": "1.2.x",
-      "qwerty": "1"
-    },
-    "license": "BSD-2-Clause"
-  }
-
-test: !!js/function |
-  function(jju, input) {
-    obj = jju.parse(input)
-    obj.dependencies.whatever = '1.2.x'
-    obj.dependencies.qwerty = '1'
-    return jju.update(input, obj, {mode:'json'})
-  }
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/npm-array-bin.yaml b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/npm-array-bin.yaml
deleted file mode 100644
index 35e1639bfda28b..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/npm-array-bin.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-input: |
-  { "name":"npm-test-array-bin"
-  , "version":"1.2.5"
-  , "bin": [ "bin/array-bin" ]
-  , "scripts": { "test": "node test.js" } }
-
-# less than ideal, I know...
-output: |
-  { "name":"npm-test-array-bin"
-  , "version":"1.2.5"
-  , "bin": {"array-bin":"bin/array-bin"}
-  , "scripts": { "test": "node test.js" }, "readme": "just an npm test\n", "readmeFilename": "README", "description": "just an npm test", "_id": "npm-test-array-bin@1.2.5", "dist": {"shasum":"9c426a1bd55e98718ab4ddcc01fa57ea83c649f1"}, "_from": "npm-test-array-bin/" }
-
-test: !!js/function |
-  function(jju, input) {
-    obj =
-    { name: 'npm-test-array-bin',
-      version: '1.2.5',
-      bin: { 'array-bin': 'bin/array-bin' },
-      scripts: { test: 'node test.js' },
-      readme: 'just an npm test\n',
-      readmeFilename: 'README',
-      description: 'just an npm test',
-      _id: 'npm-test-array-bin@1.2.5',
-      dist: { shasum: '9c426a1bd55e98718ab4ddcc01fa57ea83c649f1' },
-      _from: 'npm-test-array-bin/' }
-    return jju.update(input, obj)
-  }
-
diff --git a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/pkg-json5.yaml b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/pkg-json5.yaml
deleted file mode 100644
index 21a5c6eb141ed4..00000000000000
--- a/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/test/update/pkg-json5.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-input: |
-  // vim:syntax=javascript
-  {
-    name: 'yapm',
-    version: '1.1.0-1325', // upstream npm@1.3.25
-    description: 'A package manager for node (npm fork)',
-  }
-
-output: |
-  // vim:syntax=javascript
-  {
-    name: 'yapm',
-    version: '1.1.0-1325', // upstream npm@1.3.25
-    description: 'A package manager for node (npm fork)',
-    _id: 'yapm@1.1.0-1325',
-    dist: {
-      shasum: 'd5aa31c1ad00c1e7e57e07cea1b22c1806a47111',
-    },
-    _from: './zzz',
-  }
-
-test: !!js/function |
-  function(jju, input) {
-    var upd = {
-      "name": "yapm",
-      "version": "1.1.0-1325",
-      "description": "A package manager for node (npm fork)",
-      "_id": "yapm@1.1.0-1325",
-      "dist": {
-        "shasum": "d5aa31c1ad00c1e7e57e07cea1b22c1806a47111"
-      },
-      "_from": "./zzz"
-    }
-    return jju.update(input, upd)
-  }
-
diff --git a/deps/npm/node_modules/read-package-json/package.json b/deps/npm/node_modules/read-package-json/package.json
index 17113419c0ab74..b6eadd5d00a9ac 100644
--- a/deps/npm/node_modules/read-package-json/package.json
+++ b/deps/npm/node_modules/read-package-json/package.json
@@ -1,42 +1,97 @@
 {
-  "name": "read-package-json",
-  "version": "2.0.1",
+  "_args": [
+    [
+      "read-package-json@~2.0.0",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "read-package-json@>=2.0.0 <2.1.0",
+  "_id": "read-package-json@2.0.1",
+  "_inCache": true,
+  "_location": "/read-package-json",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "email": "kat@sykosomatic.org",
+    "name": "zkat"
+  },
+  "_npmVersion": "2.14.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "read-package-json",
+    "raw": "read-package-json@~2.0.0",
+    "rawSpec": "~2.0.0",
+    "scope": null,
+    "spec": ">=2.0.0 <2.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/",
+    "/init-package-json",
+    "/read-installed",
+    "/read-package-tree"
+  ],
+  "_resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.1.tgz",
+  "_shasum": "b822abfc2c4f0abfe7f52de6448be4560b6e7053",
+  "_shrinkwrap": null,
+  "_spec": "read-package-json@~2.0.0",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "description": "The thing npm uses to read package.json files with semantics and defaults and validation",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/read-package-json.git"
-  },
-  "main": "read-json.js",
-  "scripts": {
-    "test": "standard && tap test/*.js"
+  "bugs": {
+    "url": "https://github.com/isaacs/read-package-json/issues"
   },
   "dependencies": {
     "glob": "^5.0.3",
+    "graceful-fs": "^4.1.2",
     "json-parse-helpfulerror": "^1.0.2",
-    "normalize-package-data": "^2.0.0",
-    "graceful-fs": "^4.1.2"
+    "normalize-package-data": "^2.0.0"
   },
+  "description": "The thing npm uses to read package.json files with semantics and defaults and validation",
   "devDependencies": {
     "standard": "^3.3.1",
     "tap": "^1.2.0"
   },
+  "directories": {},
+  "dist": {
+    "shasum": "b822abfc2c4f0abfe7f52de6448be4560b6e7053",
+    "tarball": "http://registry.npmjs.org/read-package-json/-/read-package-json-2.0.1.tgz"
+  },
+  "gitHead": "d4f9f52c823750e7f2a7b9069bc56b9fd3a0ee96",
+  "homepage": "https://github.com/isaacs/read-package-json#readme",
+  "installable": true,
+  "license": "ISC",
+  "main": "read-json.js",
+  "maintainers": [
+    {
+      "name": "iarna",
+      "email": "me@re-becca.org"
+    },
+    {
+      "name": "isaacs",
+      "email": "isaacs@npmjs.com"
+    },
+    {
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
+    },
+    {
+      "name": "zkat",
+      "email": "kat@sykosomatic.org"
+    }
+  ],
+  "name": "read-package-json",
   "optionalDependencies": {
     "graceful-fs": "^4.1.2"
   },
-  "license": "ISC",
-  "readme": "# read-package-json\n\nThis is the thing that npm uses to read package.json files.  It\nvalidates some stuff, and loads some default things.\n\nIt keeps a cache of the files you've read, so that you don't end\nup reading the same package.json file multiple times.\n\nNote that if you just want to see what's literally in the package.json\nfile, you can usually do `var data = require('some-module/package.json')`.\n\nThis module is basically only needed by npm, but it's handy to see what\nnpm will see when it looks at your package.\n\n## Usage\n\n```javascript\nvar readJson = require('read-package-json')\n\n// readJson(filename, [logFunction=noop], [strict=false], cb)\nreadJson('/path/to/package.json', console.error, false, function (er, data) {\n  if (er) {\n    console.error(\"There was an error reading the file\")\n    return\n  }\n\n  console.error('the package data is', data)\n});\n```\n\n## readJson(file, [logFn = noop], [strict = false], cb)\n\n* `file` {String} The path to the package.json file\n* `logFn` {Function} Function to handle logging.  Defaults to a noop.\n* `strict` {Boolean} True to enforce SemVer 2.0 version strings, and\n  other strict requirements.\n* `cb` {Function} Gets called with `(er, data)`, as is The Node Way.\n\nReads the JSON file and does the things.\n\n## `package.json` Fields\n\nSee `man 5 package.json` or `npm help json`.\n\n## readJson.log\n\nBy default this is a reference to the `npmlog` module.  But if that\nmodule can't be found, then it'll be set to just a dummy thing that does\nnothing.\n\nReplace with your own `{log,warn,error}` object for fun loggy time.\n\n## readJson.extras(file, data, cb)\n\nRun all the extra stuff relative to the file, with the parsed data.\n\nModifies the data as it does stuff.  Calls the cb when it's done.\n\n## readJson.extraSet = [fn, fn, ...]\n\nArray of functions that are called by `extras`.  Each one receives the\narguments `fn(file, data, cb)` and is expected to call `cb(er, data)`\nwhen done or when an error occurs.\n\nOrder is indeterminate, so each function should be completely\nindependent.\n\nMix and match!\n\n## readJson.cache\n\nThe `lru-cache` object that readJson uses to not read the same file over\nand over again.  See\n[lru-cache](https://github.com/isaacs/node-lru-cache) for details.\n\n## Other Relevant Files Besides `package.json`\n\nSome other files have an effect on the resulting data object, in the\nfollowing ways:\n\n### `README?(.*)`\n\nIf there is a `README` or `README.*` file present, then npm will attach\na `readme` field to the data with the contents of this file.\n\nOwing to the fact that roughly 100% of existing node modules have\nMarkdown README files, it will generally be assumed to be Markdown,\nregardless of the extension.  Please plan accordingly.\n\n### `server.js`\n\nIf there is a `server.js` file, and there is not already a\n`scripts.start` field, then `scripts.start` will be set to `node\nserver.js`.\n\n### `AUTHORS`\n\nIf there is not already a `contributors` field, then the `contributors`\nfield will be set to the contents of the `AUTHORS` file, split by lines,\nand parsed.\n\n### `bindings.gyp`\n\nIf a bindings.gyp file exists, and there is not already a\n`scripts.install` field, then the `scripts.install` field will be set to\n`node-gyp rebuild`.\n\n### `wscript`\n\nIf a wscript file exists, and there is not already a `scripts.install`\nfield, then the `scripts.install` field will be set to `node-waf clean ;\nnode-waf configure build`.\n\nNote that the `bindings.gyp` file supercedes this, since node-waf has\nbeen deprecated in favor of node-gyp.\n\n### `index.js`\n\nIf the json file does not exist, but there is a `index.js` file\npresent instead, and that file has a package comment, then it will try\nto parse the package comment, and use that as the data instead.\n\nA package comment looks like this:\n\n```javascript\n/**package\n * { \"name\": \"my-bare-module\"\n * , \"version\": \"1.2.3\"\n * , \"description\": \"etc....\" }\n **/\n\n// or...\n\n/**package\n{ \"name\": \"my-bare-module\"\n, \"version\": \"1.2.3\"\n, \"description\": \"etc....\" }\n**/\n```\n\nThe important thing is that it starts with `/**package`, and ends with\n`**/`.  If the package.json file exists, then the index.js is not\nparsed.\n\n### `{directories.man}/*.[0-9]`\n\nIf there is not already a `man` field defined as an array of files or a\nsingle file, and\nthere is a `directories.man` field defined, then that directory will\nbe searched for manpages.\n\nAny valid manpages found in that directory will be assigned to the `man`\narray, and installed in the appropriate man directory at package install\ntime, when installed globally on a Unix system.\n\n### `{directories.bin}/*`\n\nIf there is not already a `bin` field defined as a string filename or a\nhash of `<name> : <filename>` pairs, then the `directories.bin`\ndirectory will be searched and all the files within it will be linked as\nexecutables at install time.\n\nWhen installing locally, npm links bins into `node_modules/.bin`, which\nis in the `PATH` environ when npm runs scripts.  When\ninstalling globally, they are linked into `{prefix}/bin`, which is\npresumably in the `PATH` environment variable.\n",
-  "readmeFilename": "README.md",
-  "gitHead": "d4f9f52c823750e7f2a7b9069bc56b9fd3a0ee96",
-  "bugs": {
-    "url": "https://github.com/isaacs/read-package-json/issues"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/read-package-json.git"
   },
-  "homepage": "https://github.com/isaacs/read-package-json#readme",
-  "_id": "read-package-json@2.0.1",
-  "_shasum": "b822abfc2c4f0abfe7f52de6448be4560b6e7053",
-  "_from": "read-package-json@2.0.1"
+  "scripts": {
+    "test": "standard && tap test/*.js"
+  },
+  "version": "2.0.1"
 }
diff --git a/deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/.travis.yml b/deps/npm/node_modules/read-package-tree/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/.travis.yml
rename to deps/npm/node_modules/read-package-tree/.travis.yml
diff --git a/deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/LICENSE b/deps/npm/node_modules/read-package-tree/LICENSE
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/LICENSE
rename to deps/npm/node_modules/read-package-tree/LICENSE
diff --git a/deps/npm/node_modules/read-package-tree/README.md b/deps/npm/node_modules/read-package-tree/README.md
new file mode 100644
index 00000000000000..b3cda81f7fdcf4
--- /dev/null
+++ b/deps/npm/node_modules/read-package-tree/README.md
@@ -0,0 +1,68 @@
+# read-package-tree
+
+Read the contents of node_modules.
+
+## USAGE
+
+```javascript
+var rpt = require ('read-package-tree')
+rpt('/path/to/pkg/root', function (node, kidName) {
+  // optional filter function– if included, each package folder found is passed to
+  // it to see if it should be included in the final tree
+  // node is what we're adding children to
+  // kidName is the directory name of the module we're considering adding
+  // return true -> include, false -> skip
+}, function (er, data) {
+  // er means that something didn't work.
+  // data is a structure like:
+  // {
+  //   package: <package.json data, or an empty object>
+  //   package.name: defaults to `basename(path)`
+  //   children: [ <more things like this> ]
+  //   parent: <thing that has this in its children property, or null>
+  //   path: <path loaded>
+  //   realpath: <the real path on disk>
+  //   isLink: <set if this is a Link>
+  //   target: <if a Link, then this is the actual Node>
+  //   error: <if set, the error we got loading/parsing the package.json>
+  // }
+})
+```
+
+That's it.  It doesn't figure out if dependencies are met, it doesn't
+mutate package.json data objects (beyond what
+[read-package-json](http://npm.im/read-package-json) already does), it
+doesn't limit its search to include/exclude `devDependencies`, or
+anything else.
+
+Just follows the links in the `node_modules` heirarchy and reads the
+package.json files it finds therein.
+
+## Symbolic Links
+
+When there are symlinks to packages in the `node_modules` hierarchy, a
+`Link` object will be created, with a `target` that is a `Node`
+object.
+
+For the most part, you can treat `Link` objects just the same as
+`Node` objects.  But if your tree-walking program needs to treat
+symlinks differently from normal folders, then make sure to check the
+object.
+
+In a given `read-package-tree` run, a specific `path` will always
+correspond to a single object, and a specific `realpath` will always
+correspond to a single `Node` object.  This means that you may not be
+able to pass the resulting data object to `JSON.stringify`, because it
+may contain cycles.
+
+## Errors
+
+Errors parsing or finding a package.json in node_modules will result in a
+node with the error property set.  We will still find deeper node_modules
+if any exist. *Prior to `5.0.0` these aborted tree reading with an error
+callback.*
+
+Only a few classes of errors are fatal (result in an error callback):
+
+* If the top level location is entirely missing, that will error.
+* if `fs.realpath` returns an error for any path its trying to resolve.
diff --git a/deps/npm/node_modules/read-package-tree/package.json b/deps/npm/node_modules/read-package-tree/package.json
new file mode 100644
index 00000000000000..4f70ab170e7e0e
--- /dev/null
+++ b/deps/npm/node_modules/read-package-tree/package.json
@@ -0,0 +1,86 @@
+{
+  "_args": [
+    [
+      "read-package-tree@~5.1.1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "read-package-tree@>=5.1.1 <5.2.0",
+  "_id": "read-package-tree@5.1.2",
+  "_inCache": true,
+  "_location": "/read-package-tree",
+  "_nodeVersion": "0.12.7",
+  "_npmUser": {
+    "email": "me@re-becca.org",
+    "name": "iarna"
+  },
+  "_npmVersion": "2.13.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "read-package-tree",
+    "raw": "read-package-tree@~5.1.1",
+    "rawSpec": "~5.1.1",
+    "scope": null,
+    "spec": ">=5.1.1 <5.2.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_shasum": "e3a488792f40cf470819f01a610e719d64f09094",
+  "_shrinkwrap": null,
+  "_spec": "read-package-tree@~5.1.1",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
+    "url": "http://blog.izs.me/"
+  },
+  "bugs": {
+    "url": "https://github.com/npm/read-package-tree/issues"
+  },
+  "dependencies": {
+    "debuglog": "^1.0.1",
+    "dezalgo": "^1.0.0",
+    "once": "^1.3.0",
+    "read-package-json": "^2.0.0",
+    "readdir-scoped-modules": "^1.0.0"
+  },
+  "description": "Read the contents of node_modules.",
+  "devDependencies": {
+    "archy": "0",
+    "tap": "^1.2.0"
+  },
+  "directories": {
+    "test": "test"
+  },
+  "dist": {
+    "shasum": "e3a488792f40cf470819f01a610e719d64f09094",
+    "tarball": "http://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.2.tgz"
+  },
+  "gitHead": "2ed40c4654804f2a5ddb7b0b2c509080731eea6b",
+  "homepage": "https://github.com/npm/read-package-tree",
+  "installable": true,
+  "license": "ISC",
+  "main": "rpt.js",
+  "maintainers": [
+    {
+      "name": "isaacs",
+      "email": "i@izs.me"
+    },
+    {
+      "name": "iarna",
+      "email": "me@re-becca.org"
+    }
+  ],
+  "name": "read-package-tree",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/read-package-tree.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "5.1.2"
+}
diff --git a/deps/npm/node_modules/read-package-tree/rpt.js b/deps/npm/node_modules/read-package-tree/rpt.js
new file mode 100644
index 00000000000000..acd91bd8c01434
--- /dev/null
+++ b/deps/npm/node_modules/read-package-tree/rpt.js
@@ -0,0 +1,190 @@
+var fs = require('fs')
+var rpj = require('read-package-json')
+var path = require('path')
+var dz = require('dezalgo')
+var once = require('once')
+var readdir = require('readdir-scoped-modules')
+var debug = require('debuglog')('rpt')
+
+function dpath (p) {
+  if (!p) return ''
+  if (p.indexOf(process.cwd()) === 0) {
+    p = p.substr(process.cwd().length + 1)
+  }
+  return p
+}
+
+module.exports = rpt
+
+rpt.Node = Node
+rpt.Link = Link
+
+var ID = 0
+function Node (pkg, logical, physical, er, cache) {
+  if (cache[physical]) return cache[physical]
+
+  if (!(this instanceof Node)) {
+    return new Node(pkg, logical, physical, er, cache)
+  }
+
+  cache[physical] = this
+
+  debug(this.constructor.name, dpath(physical), pkg && pkg._id)
+
+  this.id = ID++
+  this.package = pkg || {}
+  this.path = logical
+  this.realpath = physical
+  this.parent = null
+  this.isLink = false
+  this.children = []
+  this.error = er
+}
+
+Node.prototype.package = null
+Node.prototype.path = ''
+Node.prototype.realpath = ''
+Node.prototype.children = null
+Node.prototype.error = null
+
+function Link (pkg, logical, physical, realpath, er, cache) {
+  if (cache[physical]) return cache[physical]
+
+  if (!(this instanceof Link)) {
+    return new Link(pkg, logical, physical, realpath, er, cache)
+  }
+
+  cache[physical] = this
+
+  debug(this.constructor.name, dpath(physical), pkg && pkg._id)
+
+  this.id = ID++
+  this.path = logical
+  this.realpath = realpath
+  this.package = pkg || {}
+  this.parent = null
+  this.target = new Node(this.package, logical, realpath, er, cache)
+  this.isLink = true
+  this.children = this.target.children
+  this.error = er
+}
+
+Link.prototype = Object.create(Node.prototype, {
+  constructor: { value: Link }
+})
+Link.prototype.target = null
+Link.prototype.realpath = ''
+
+function loadNode (logical, physical, cache, cb) {
+  debug('loadNode', dpath(logical))
+  fs.realpath(physical, function (er, real) {
+    if (er) return cb(er)
+    debug('realpath l=%j p=%j real=%j', dpath(logical), dpath(physical), dpath(real))
+    var pj = path.resolve(real, 'package.json')
+    rpj(pj, function (er, pkg) {
+      pkg = pkg || null
+      var node
+      if (physical === real) {
+        node = new Node(pkg, logical, physical, er, cache)
+      } else {
+        node = new Link(pkg, logical, physical, real, er, cache)
+      }
+
+      cb(null, node)
+    })
+  })
+}
+
+function loadChildren (node, cache, filterWith, cb) {
+  debug('loadChildren', dpath(node.path))
+  // don't let it be called more than once
+  cb = once(cb)
+  var nm = path.resolve(node.path, 'node_modules')
+  readdir(nm, function (er, kids) {
+    // If there are no children, that's fine, just return
+    if (er) return cb(null, node)
+
+    kids = kids.filter(function (kid) {
+      return kid[0] !== '.' && (!filterWith || filterWith(node, kid))
+    })
+
+    var l = kids . length
+    if (l === 0) return cb(null, node)
+
+    kids.forEach(function (kid) {
+      var kidPath = path.resolve(nm, kid)
+      var kidRealPath = path.resolve(node.realpath,'node_modules',kid)
+      loadNode(kidPath, kidRealPath, cache, then)
+    })
+
+    function then (er, kid) {
+      if (er) return cb(er)
+
+      node.children.push(kid)
+      kid.parent = node
+      if (--l === 0) {
+        sortChildren(node)
+        return cb(null, node)
+      }
+    }
+  })
+}
+
+function sortChildren (node) {
+  node.children = node.children.sort(function (a, b) {
+    a = a.package.name ? a.package.name.toLowerCase() : a.path
+    b = b.package.name ? b.package.name.toLowerCase() : b.path
+    return a > b ? 1 : -1
+  })
+}
+
+function loadTree (node, did, cache, filterWith, cb) {
+  debug('loadTree', dpath(node.path), !!cache[node.path])
+
+  if (did[node.realpath]) {
+    return dz(cb)(null, node)
+  }
+
+  did[node.realpath] = true
+
+  cb = once(cb)
+  loadChildren(node, cache, filterWith, function (er, node) {
+    if (er) return cb(er)
+
+    var kids = node.children.filter(function (kid) {
+      return !did[kid.realpath]
+    })
+
+    var l = kids.length
+    if (l === 0) return cb(null, node)
+
+    kids.forEach(function (kid, index) {
+      loadTree(kid, did, cache, filterWith, then)
+    })
+
+    function then (er, kid) {
+      if (er) return cb(er)
+
+      if (--l === 0) cb(null, node)
+    }
+  })
+}
+
+function rpt (root, filterWith, cb) {
+  if (!cb) {
+    cb = filterWith
+    filterWith = null
+  }
+  fs.realpath(root, function (er, realRoot) {
+    if (er) return cb(er)
+    debug('rpt', dpath(realRoot))
+    var cache = Object.create(null)
+    loadNode(root, realRoot, cache, function (er, node) {
+      // if there's an error, it's fine, as long as we got a node
+      if (!node) return cb(er)
+      loadTree(node, {}, cache, filterWith, function (lter, tree) {
+        cb(er && er.code !== 'ENOENT' ? er : lter, tree)
+      })
+    })
+  })
+}
diff --git a/deps/npm/node_modules/read-package-tree/test/basic.js b/deps/npm/node_modules/read-package-tree/test/basic.js
new file mode 100644
index 00000000000000..0dcb538911f3f2
--- /dev/null
+++ b/deps/npm/node_modules/read-package-tree/test/basic.js
@@ -0,0 +1,155 @@
+var test = require('tap').test
+var rpt = require('../rpt.js')
+var path = require('path')
+var fs = require('fs')
+var archy = require('archy')
+var fixtures = path.resolve(__dirname, 'fixtures')
+var roots = [ 'root', 'other', 'selflink', 'noname' ]
+var cwd = path.resolve(__dirname, '..')
+
+var symlinks = {
+  'selflink/node_modules/@scope/z/node_modules/glob':
+    '../../../foo/node_modules/glob',
+  'other/node_modules/glob':
+    '../../root/node_modules/@scope/x/node_modules/glob',
+  'linkedroot':
+    'root',
+  'deep/root':
+    '../root',
+  'deeproot':
+    'deep'
+}
+
+function cleanup () {
+  Object.keys(symlinks).forEach(function (s) {
+    var p = path.resolve(cwd, 'test/fixtures', s)
+    try {
+      fs.unlinkSync(p)
+    } catch (er) {}
+  })
+}
+
+test('setup symlinks', function (t) {
+  cleanup()
+
+  Object.keys(symlinks).forEach(function (s) {
+    var p = path.resolve(cwd, 'test/fixtures', s)
+    fs.symlinkSync(symlinks [ s ], p, 'dir')
+  })
+
+  t.end()
+})
+
+roots.forEach(function (root) {
+  var dir = path.resolve(fixtures, root)
+  var expectedtxt = path.resolve(dir, 'archy.txt')
+  var expectedre  = path.resolve(dir, 'archy.re')
+
+  test(root, function (t) {
+    rpt(dir, function (er, d) {
+      if (er && er.code !== 'ENOENT') throw er
+
+      var actual = archy(archyize(d)).trim()
+      // console . log ('----', dir)
+      console.log(actual)
+      // console . log (require ('util') . inspect (d, {
+      //   depth: Infinity
+      // }))
+      try {
+        var expect = fs.readFileSync(expectedtxt, 'utf8').trim()
+        t.equal(actual, expect, root + ' tree')
+      } catch (e) {
+        var expect = new RegExp(fs.readFileSync(expectedre, 'utf8').trim())
+        t.like(actual, expect, root + ' tree')
+      }
+      t.end()
+    })
+  })
+})
+
+test('linkedroot', function (t) {
+  var dir = path.resolve(fixtures, 'linkedroot')
+  var out = dir + '-archy.txt'
+  rpt(dir, function (er, d) {
+    if (er && er.code !== 'ENOENT') throw er
+
+    var actual = archy(archyize(d)).trim()
+    console.log(actual)
+    var expect = fs.readFileSync(out, 'utf8').trim()
+    t.equal(actual, expect, 'linkedroot tree')
+    t.end()
+  })
+})
+
+test('deeproot', function (t) {
+  var dir = path.resolve(fixtures, 'deeproot/root')
+  var out = path.resolve(fixtures, 'deep') + '-archy.txt'
+  rpt(dir, function (er, d) {
+    if (er && er.code !== 'ENOENT') throw er
+
+    var actual = archy(archyize(d)).trim()
+    console.log(actual)
+    var expect = fs.readFileSync(out, 'utf8').trim()
+    t.equal(actual, expect, 'deeproot tree')
+    t.end()
+  })
+})
+
+test('broken json', function (t) {
+  rpt(path.resolve(fixtures, 'bad'), function (er, d) {
+    t.ok(d.error, 'Got an error object')
+    t.equal(d.error && d.error.code, 'EJSONPARSE')
+    t.ok(d, 'Got a tree')
+    t.end()
+  })
+})
+
+test('missing json does not obscure deeper errors', function (t) {
+  rpt(path.resolve(fixtures, 'empty'), function (er, d) {
+    var error = d.error
+    t.ok(error, 'Error reading json of top level')
+    t.equal(error && error.code, 'ENOENT')
+    var childError = d.children.length===1 && d.children[0].error
+    t.ok(childError, 'Error parsing JSON of child node')
+    t.equal(childError && childError.code, 'EJSONPARSE')
+    t.end()
+  })
+})
+test('missing folder', function (t) {
+  rpt(path.resolve(fixtures, 'does-not-exist'), function (er, d) {
+    t.ok(er, 'Got an error object')
+    t.equal(er && er.code, 'ENOENT')
+    t.ok(!d, 'No tree on top level error')
+    t.end()
+  })
+})
+
+
+function archyize (d, seen) {
+  seen = seen || {}
+  var path = d.path
+  if (d.target) {
+    path = d.target.path
+  }
+
+  var label = d.package._id ? d.package._id + ' ' :
+              d.package.name ? d.package.name + (d.package.version ? '@' + d.package.version : '') + ' ' :
+              ''
+  label += path.substr(cwd.length + 1)
+
+  if (d . target) {
+    return { label: label + ' (symlink)', nodes: [] }
+  }
+
+  return {
+    label: label,
+    nodes: d.children.map(function (kid) {
+      return archyize(kid, seen)
+    })
+  }
+}
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/bad/package.json b/deps/npm/node_modules/read-package-tree/test/fixtures/bad/package.json
new file mode 100644
index 00000000000000..21d815ec3b0c33
--- /dev/null
+++ b/deps/npm/node_modules/read-package-tree/test/fixtures/bad/package.json
@@ -0,0 +1,2 @@
+{
+  "NOPE"
diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/deep-archy.txt b/deps/npm/node_modules/read-package-tree/test/fixtures/deep-archy.txt
new file mode 100644
index 00000000000000..630eab1a493700
--- /dev/null
+++ b/deps/npm/node_modules/read-package-tree/test/fixtures/deep-archy.txt
@@ -0,0 +1,11 @@
+root@1.2.3 test/fixtures/deeproot/root
+├─┬ @scope/x@1.2.3 test/fixtures/deeproot/root/node_modules/@scope/x
+│ └─┬ glob@4.0.5 test/fixtures/deeproot/root/node_modules/@scope/x/node_modules/glob
+│   ├── graceful-fs@3.0.2 test/fixtures/deeproot/root/node_modules/@scope/x/node_modules/glob/node_modules/graceful-fs
+│   ├── inherits@2.0.1 test/fixtures/deeproot/root/node_modules/@scope/x/node_modules/glob/node_modules/inherits
+│   ├─┬ minimatch@1.0.0 test/fixtures/deeproot/root/node_modules/@scope/x/node_modules/glob/node_modules/minimatch
+│   │ ├── lru-cache@2.5.0 test/fixtures/deeproot/root/node_modules/@scope/x/node_modules/glob/node_modules/minimatch/node_modules/lru-cache
+│   │ └── sigmund@1.0.0 test/fixtures/deeproot/root/node_modules/@scope/x/node_modules/glob/node_modules/minimatch/node_modules/sigmund
+│   └── once@1.3.0 test/fixtures/deeproot/root/node_modules/@scope/x/node_modules/glob/node_modules/once
+├── @scope/y@1.2.3 test/fixtures/deeproot/root/node_modules/@scope/y
+└── foo@1.2.3 test/fixtures/deeproot/root/node_modules/foo
\ No newline at end of file
diff --git a/deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/fixtures/@org/x/.keep b/deps/npm/node_modules/read-package-tree/test/fixtures/deep/.keep
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/fixtures/@org/x/.keep
rename to deps/npm/node_modules/read-package-tree/test/fixtures/deep/.keep
diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/empty/node_modules/foo/package.json b/deps/npm/node_modules/read-package-tree/test/fixtures/empty/node_modules/foo/package.json
new file mode 100644
index 00000000000000..98232c64fce936
--- /dev/null
+++ b/deps/npm/node_modules/read-package-tree/test/fixtures/empty/node_modules/foo/package.json
@@ -0,0 +1 @@
+{
diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/linkedroot-archy.txt b/deps/npm/node_modules/read-package-tree/test/fixtures/linkedroot-archy.txt
new file mode 100644
index 00000000000000..e34a46031304d4
--- /dev/null
+++ b/deps/npm/node_modules/read-package-tree/test/fixtures/linkedroot-archy.txt
@@ -0,0 +1,11 @@
+root@1.2.3 test/fixtures/linkedroot
+├─┬ @scope/x@1.2.3 test/fixtures/linkedroot/node_modules/@scope/x
+│ └─┬ glob@4.0.5 test/fixtures/linkedroot/node_modules/@scope/x/node_modules/glob
+│   ├── graceful-fs@3.0.2 test/fixtures/linkedroot/node_modules/@scope/x/node_modules/glob/node_modules/graceful-fs
+│   ├── inherits@2.0.1 test/fixtures/linkedroot/node_modules/@scope/x/node_modules/glob/node_modules/inherits
+│   ├─┬ minimatch@1.0.0 test/fixtures/linkedroot/node_modules/@scope/x/node_modules/glob/node_modules/minimatch
+│   │ ├── lru-cache@2.5.0 test/fixtures/linkedroot/node_modules/@scope/x/node_modules/glob/node_modules/minimatch/node_modules/lru-cache
+│   │ └── sigmund@1.0.0 test/fixtures/linkedroot/node_modules/@scope/x/node_modules/glob/node_modules/minimatch/node_modules/sigmund
+│   └── once@1.3.0 test/fixtures/linkedroot/node_modules/@scope/x/node_modules/glob/node_modules/once
+├── @scope/y@1.2.3 test/fixtures/linkedroot/node_modules/@scope/y
+└── foo@1.2.3 test/fixtures/linkedroot/node_modules/foo
\ No newline at end of file
diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/noname/archy.txt b/deps/npm/node_modules/read-package-tree/test/fixtures/noname/archy.txt
new file mode 100644
index 00000000000000..03d78dfc69b8b3
--- /dev/null
+++ b/deps/npm/node_modules/read-package-tree/test/fixtures/noname/archy.txt
@@ -0,0 +1,2 @@
+test/fixtures/noname
+└── test/fixtures/noname/node_modules/foo
diff --git a/deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/fixtures/@org/y/.keep b/deps/npm/node_modules/read-package-tree/test/fixtures/noname/node_modules/foo/keep-alive
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/fixtures/@org/y/.keep
rename to deps/npm/node_modules/read-package-tree/test/fixtures/noname/node_modules/foo/keep-alive
diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/other/archy.txt b/deps/npm/node_modules/read-package-tree/test/fixtures/other/archy.txt
new file mode 100644
index 00000000000000..23666226c91820
--- /dev/null
+++ b/deps/npm/node_modules/read-package-tree/test/fixtures/other/archy.txt
@@ -0,0 +1,2 @@
+test/fixtures/other
+└── glob@4.0.5 test/fixtures/other/node_modules/glob (symlink)
\ No newline at end of file
diff --git a/deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/fixtures/@scope/x/.keep b/deps/npm/node_modules/read-package-tree/test/fixtures/other/node_modules/.bin
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/fixtures/@scope/x/.keep
rename to deps/npm/node_modules/read-package-tree/test/fixtures/other/node_modules/.bin
diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/root/archy.txt b/deps/npm/node_modules/read-package-tree/test/fixtures/root/archy.txt
new file mode 100644
index 00000000000000..1aacd3f0b7bc65
--- /dev/null
+++ b/deps/npm/node_modules/read-package-tree/test/fixtures/root/archy.txt
@@ -0,0 +1,11 @@
+root@1.2.3 test/fixtures/root
+├─┬ @scope/x@1.2.3 test/fixtures/root/node_modules/@scope/x
+│ └─┬ glob@4.0.5 test/fixtures/root/node_modules/@scope/x/node_modules/glob
+│   ├── graceful-fs@3.0.2 test/fixtures/root/node_modules/@scope/x/node_modules/glob/node_modules/graceful-fs
+│   ├── inherits@2.0.1 test/fixtures/root/node_modules/@scope/x/node_modules/glob/node_modules/inherits
+│   ├─┬ minimatch@1.0.0 test/fixtures/root/node_modules/@scope/x/node_modules/glob/node_modules/minimatch
+│   │ ├── lru-cache@2.5.0 test/fixtures/root/node_modules/@scope/x/node_modules/glob/node_modules/minimatch/node_modules/lru-cache
+│   │ └── sigmund@1.0.0 test/fixtures/root/node_modules/@scope/x/node_modules/glob/node_modules/minimatch/node_modules/sigmund
+│   └── once@1.3.0 test/fixtures/root/node_modules/@scope/x/node_modules/glob/node_modules/once
+├── @scope/y@1.2.3 test/fixtures/root/node_modules/@scope/y
+└── foo@1.2.3 test/fixtures/root/node_modules/foo
\ No newline at end of file
diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/root/package.json b/deps/npm/node_modules/read-package-tree/test/fixtures/root/package.json
new file mode 100644
index 00000000000000..010347cee63bc5
--- /dev/null
+++ b/deps/npm/node_modules/read-package-tree/test/fixtures/root/package.json
@@ -0,0 +1,2 @@
+{"name":"root",
+ "version":"1.2.3"}
\ No newline at end of file
diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/selflink/archy.re b/deps/npm/node_modules/read-package-tree/test/fixtures/selflink/archy.re
new file mode 100644
index 00000000000000..22e18109b1b37a
--- /dev/null
+++ b/deps/npm/node_modules/read-package-tree/test/fixtures/selflink/archy.re
@@ -0,0 +1,13 @@
+selflink@1[.]2[.]3 test/fixtures/selflink
+├── @scope/y@1[.]2[.]3 test/fixtures/selflink/node_modules/@scope/y
+├─┬ @scope/z@1[.]2[.]3 test/fixtures/selflink/node_modules/@scope/z
+│ └── glob@4[.]0[.]5 test/fixtures/selflink/node_modules/foo/node_modules/glob [(]symlink[)]
+└─┬ foo@1[.]2[.]3 test/fixtures/selflink/node_modules/foo
+  ├─┬ glob@4[.]0[.]5 test/fixtures/selflink/node_modules/foo/node_modules/glob
+  │ ├── graceful-fs@3[.]0[.]2 test/fixtures/selflink/node_modules/(foo|@scope/z)/node_modules/glob/node_modules/graceful-fs
+  │ ├── inherits@2[.]0[.]1 test/fixtures/selflink/node_modules/(foo|@scope/z)/node_modules/glob/node_modules/inherits
+  │ ├─┬ minimatch@1[.]0[.]0 test/fixtures/selflink/node_modules/(foo|@scope/z)/node_modules/glob/node_modules/minimatch
+  │ │ ├── lru-cache@2[.]5[.]0 test/fixtures/selflink/node_modules/(foo|@scope/z)/node_modules/glob/node_modules/minimatch/node_modules/lru-cache
+  │ │ └── sigmund@1[.]0[.]0 test/fixtures/selflink/node_modules/(foo|@scope/z)/node_modules/glob/node_modules/minimatch/node_modules/sigmund
+  │ └── once@1[.]3[.]0 test/fixtures/selflink/node_modules/(foo|@scope/z)/node_modules/glob/node_modules/once
+  └── selflink@1[.]2[.]3 test/fixtures/selflink [(]symlink[)]
diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/selflink/package.json b/deps/npm/node_modules/read-package-tree/test/fixtures/selflink/package.json
new file mode 100644
index 00000000000000..5bbf35e55b8407
--- /dev/null
+++ b/deps/npm/node_modules/read-package-tree/test/fixtures/selflink/package.json
@@ -0,0 +1,2 @@
+{"name":"selflink",
+ "version":"1.2.3"}
diff --git a/deps/npm/node_modules/read/package.json b/deps/npm/node_modules/read/package.json
index b8357c6315dde0..04f8459555d6a8 100644
--- a/deps/npm/node_modules/read/package.json
+++ b/deps/npm/node_modules/read/package.json
@@ -1,57 +1,84 @@
 {
-  "name": "read",
-  "version": "1.0.7",
-  "main": "lib/read.js",
-  "dependencies": {
-    "mute-stream": "~0.0.4"
-  },
-  "devDependencies": {
-    "tap": "^1.2.0"
+  "_args": [
+    [
+      "read@1.0.7",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "read@1.0.7",
+  "_id": "read@1.0.7",
+  "_inCache": true,
+  "_location": "/read",
+  "_nodeVersion": "2.2.1",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
   },
-  "engines": {
-    "node": ">=0.8"
+  "_npmVersion": "3.2.2",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "read",
+    "raw": "read@1.0.7",
+    "rawSpec": "1.0.7",
+    "scope": null,
+    "spec": "1.0.7",
+    "type": "version"
   },
+  "_requiredBy": [
+    "/",
+    "/init-package-json",
+    "/promzard"
+  ],
+  "_resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+  "_shasum": "b3da19bd052431a97671d44a42634adf710b40c4",
+  "_shrinkwrap": null,
+  "_spec": "read@1.0.7",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "description": "read(1) for node programs",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/read.git"
-  },
-  "license": "ISC",
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "files": [
-    "lib/read.js"
-  ],
-  "gitHead": "b14516b9236c40140fd0666567f5d0c588a09a62",
   "bugs": {
     "url": "https://github.com/isaacs/read/issues"
   },
-  "homepage": "https://github.com/isaacs/read#readme",
-  "_id": "read@1.0.7",
-  "_shasum": "b3da19bd052431a97671d44a42634adf710b40c4",
-  "_from": "read@1.0.7",
-  "_npmVersion": "3.2.2",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
+  "dependencies": {
+    "mute-stream": "~0.0.4"
   },
+  "description": "read(1) for node programs",
+  "devDependencies": {
+    "tap": "^1.2.0"
+  },
+  "directories": {},
   "dist": {
     "shasum": "b3da19bd052431a97671d44a42634adf710b40c4",
     "tarball": "http://registry.npmjs.org/read/-/read-1.0.7.tgz"
   },
+  "engines": {
+    "node": ">=0.8"
+  },
+  "files": [
+    "lib/read.js"
+  ],
+  "gitHead": "b14516b9236c40140fd0666567f5d0c588a09a62",
+  "homepage": "https://github.com/isaacs/read#readme",
+  "installable": true,
+  "license": "ISC",
+  "main": "lib/read.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz"
+  "name": "read",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/read.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.0.7"
 }
diff --git a/deps/npm/node_modules/readable-stream/node_modules/core-util-is/README.md b/deps/npm/node_modules/readable-stream/node_modules/core-util-is/README.md
deleted file mode 100644
index 5a76b4149c5eb5..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/core-util-is/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# core-util-is
-
-The `util.is*` functions introduced in Node v0.12.
diff --git a/deps/npm/node_modules/readable-stream/node_modules/core-util-is/float.patch b/deps/npm/node_modules/readable-stream/node_modules/core-util-is/float.patch
deleted file mode 100644
index a06d5c05f75fd5..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/core-util-is/float.patch
+++ /dev/null
@@ -1,604 +0,0 @@
-diff --git a/lib/util.js b/lib/util.js
-index a03e874..9074e8e 100644
---- a/lib/util.js
-+++ b/lib/util.js
-@@ -19,430 +19,6 @@
- // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- // USE OR OTHER DEALINGS IN THE SOFTWARE.
-
--var formatRegExp = /%[sdj%]/g;
--exports.format = function(f) {
--  if (!isString(f)) {
--    var objects = [];
--    for (var i = 0; i < arguments.length; i++) {
--      objects.push(inspect(arguments[i]));
--    }
--    return objects.join(' ');
--  }
--
--  var i = 1;
--  var args = arguments;
--  var len = args.length;
--  var str = String(f).replace(formatRegExp, function(x) {
--    if (x === '%%') return '%';
--    if (i >= len) return x;
--    switch (x) {
--      case '%s': return String(args[i++]);
--      case '%d': return Number(args[i++]);
--      case '%j':
--        try {
--          return JSON.stringify(args[i++]);
--        } catch (_) {
--          return '[Circular]';
--        }
--      default:
--        return x;
--    }
--  });
--  for (var x = args[i]; i < len; x = args[++i]) {
--    if (isNull(x) || !isObject(x)) {
--      str += ' ' + x;
--    } else {
--      str += ' ' + inspect(x);
--    }
--  }
--  return str;
--};
--
--
--// Mark that a method should not be used.
--// Returns a modified function which warns once by default.
--// If --no-deprecation is set, then it is a no-op.
--exports.deprecate = function(fn, msg) {
--  // Allow for deprecating things in the process of starting up.
--  if (isUndefined(global.process)) {
--    return function() {
--      return exports.deprecate(fn, msg).apply(this, arguments);
--    };
--  }
--
--  if (process.noDeprecation === true) {
--    return fn;
--  }
--
--  var warned = false;
--  function deprecated() {
--    if (!warned) {
--      if (process.throwDeprecation) {
--        throw new Error(msg);
--      } else if (process.traceDeprecation) {
--        console.trace(msg);
--      } else {
--        console.error(msg);
--      }
--      warned = true;
--    }
--    return fn.apply(this, arguments);
--  }
--
--  return deprecated;
--};
--
--
--var debugs = {};
--var debugEnviron;
--exports.debuglog = function(set) {
--  if (isUndefined(debugEnviron))
--    debugEnviron = process.env.NODE_DEBUG || '';
--  set = set.toUpperCase();
--  if (!debugs[set]) {
--    if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
--      var pid = process.pid;
--      debugs[set] = function() {
--        var msg = exports.format.apply(exports, arguments);
--        console.error('%s %d: %s', set, pid, msg);
--      };
--    } else {
--      debugs[set] = function() {};
--    }
--  }
--  return debugs[set];
--};
--
--
--/**
-- * Echos the value of a value. Trys to print the value out
-- * in the best way possible given the different types.
-- *
-- * @param {Object} obj The object to print out.
-- * @param {Object} opts Optional options object that alters the output.
-- */
--/* legacy: obj, showHidden, depth, colors*/
--function inspect(obj, opts) {
--  // default options
--  var ctx = {
--    seen: [],
--    stylize: stylizeNoColor
--  };
--  // legacy...
--  if (arguments.length >= 3) ctx.depth = arguments[2];
--  if (arguments.length >= 4) ctx.colors = arguments[3];
--  if (isBoolean(opts)) {
--    // legacy...
--    ctx.showHidden = opts;
--  } else if (opts) {
--    // got an "options" object
--    exports._extend(ctx, opts);
--  }
--  // set default options
--  if (isUndefined(ctx.showHidden)) ctx.showHidden = false;
--  if (isUndefined(ctx.depth)) ctx.depth = 2;
--  if (isUndefined(ctx.colors)) ctx.colors = false;
--  if (isUndefined(ctx.customInspect)) ctx.customInspect = true;
--  if (ctx.colors) ctx.stylize = stylizeWithColor;
--  return formatValue(ctx, obj, ctx.depth);
--}
--exports.inspect = inspect;
--
--
--// http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
--inspect.colors = {
--  'bold' : [1, 22],
--  'italic' : [3, 23],
--  'underline' : [4, 24],
--  'inverse' : [7, 27],
--  'white' : [37, 39],
--  'grey' : [90, 39],
--  'black' : [30, 39],
--  'blue' : [34, 39],
--  'cyan' : [36, 39],
--  'green' : [32, 39],
--  'magenta' : [35, 39],
--  'red' : [31, 39],
--  'yellow' : [33, 39]
--};
--
--// Don't use 'blue' not visible on cmd.exe
--inspect.styles = {
--  'special': 'cyan',
--  'number': 'yellow',
--  'boolean': 'yellow',
--  'undefined': 'grey',
--  'null': 'bold',
--  'string': 'green',
--  'date': 'magenta',
--  // "name": intentionally not styling
--  'regexp': 'red'
--};
--
--
--function stylizeWithColor(str, styleType) {
--  var style = inspect.styles[styleType];
--
--  if (style) {
--    return '\u001b[' + inspect.colors[style][0] + 'm' + str +
--           '\u001b[' + inspect.colors[style][1] + 'm';
--  } else {
--    return str;
--  }
--}
--
--
--function stylizeNoColor(str, styleType) {
--  return str;
--}
--
--
--function arrayToHash(array) {
--  var hash = {};
--
--  array.forEach(function(val, idx) {
--    hash[val] = true;
--  });
--
--  return hash;
--}
--
--
--function formatValue(ctx, value, recurseTimes) {
--  // Provide a hook for user-specified inspect functions.
--  // Check that value is an object with an inspect function on it
--  if (ctx.customInspect &&
--      value &&
--      isFunction(value.inspect) &&
--      // Filter out the util module, it's inspect function is special
--      value.inspect !== exports.inspect &&
--      // Also filter out any prototype objects using the circular check.
--      !(value.constructor && value.constructor.prototype === value)) {
--    var ret = value.inspect(recurseTimes, ctx);
--    if (!isString(ret)) {
--      ret = formatValue(ctx, ret, recurseTimes);
--    }
--    return ret;
--  }
--
--  // Primitive types cannot have properties
--  var primitive = formatPrimitive(ctx, value);
--  if (primitive) {
--    return primitive;
--  }
--
--  // Look up the keys of the object.
--  var keys = Object.keys(value);
--  var visibleKeys = arrayToHash(keys);
--
--  if (ctx.showHidden) {
--    keys = Object.getOwnPropertyNames(value);
--  }
--
--  // Some type of object without properties can be shortcutted.
--  if (keys.length === 0) {
--    if (isFunction(value)) {
--      var name = value.name ? ': ' + value.name : '';
--      return ctx.stylize('[Function' + name + ']', 'special');
--    }
--    if (isRegExp(value)) {
--      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
--    }
--    if (isDate(value)) {
--      return ctx.stylize(Date.prototype.toString.call(value), 'date');
--    }
--    if (isError(value)) {
--      return formatError(value);
--    }
--  }
--
--  var base = '', array = false, braces = ['{', '}'];
--
--  // Make Array say that they are Array
--  if (isArray(value)) {
--    array = true;
--    braces = ['[', ']'];
--  }
--
--  // Make functions say that they are functions
--  if (isFunction(value)) {
--    var n = value.name ? ': ' + value.name : '';
--    base = ' [Function' + n + ']';
--  }
--
--  // Make RegExps say that they are RegExps
--  if (isRegExp(value)) {
--    base = ' ' + RegExp.prototype.toString.call(value);
--  }
--
--  // Make dates with properties first say the date
--  if (isDate(value)) {
--    base = ' ' + Date.prototype.toUTCString.call(value);
--  }
--
--  // Make error with message first say the error
--  if (isError(value)) {
--    base = ' ' + formatError(value);
--  }
--
--  if (keys.length === 0 && (!array || value.length == 0)) {
--    return braces[0] + base + braces[1];
--  }
--
--  if (recurseTimes < 0) {
--    if (isRegExp(value)) {
--      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
--    } else {
--      return ctx.stylize('[Object]', 'special');
--    }
--  }
--
--  ctx.seen.push(value);
--
--  var output;
--  if (array) {
--    output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
--  } else {
--    output = keys.map(function(key) {
--      return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
--    });
--  }
--
--  ctx.seen.pop();
--
--  return reduceToSingleString(output, base, braces);
--}
--
--
--function formatPrimitive(ctx, value) {
--  if (isUndefined(value))
--    return ctx.stylize('undefined', 'undefined');
--  if (isString(value)) {
--    var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
--                                             .replace(/'/g, "\\'")
--                                             .replace(/\\"/g, '"') + '\'';
--    return ctx.stylize(simple, 'string');
--  }
--  if (isNumber(value)) {
--    // Format -0 as '-0'. Strict equality won't distinguish 0 from -0,
--    // so instead we use the fact that 1 / -0 < 0 whereas 1 / 0 > 0 .
--    if (value === 0 && 1 / value < 0)
--      return ctx.stylize('-0', 'number');
--    return ctx.stylize('' + value, 'number');
--  }
--  if (isBoolean(value))
--    return ctx.stylize('' + value, 'boolean');
--  // For some reason typeof null is "object", so special case here.
--  if (isNull(value))
--    return ctx.stylize('null', 'null');
--}
--
--
--function formatError(value) {
--  return '[' + Error.prototype.toString.call(value) + ']';
--}
--
--
--function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
--  var output = [];
--  for (var i = 0, l = value.length; i < l; ++i) {
--    if (hasOwnProperty(value, String(i))) {
--      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
--          String(i), true));
--    } else {
--      output.push('');
--    }
--  }
--  keys.forEach(function(key) {
--    if (!key.match(/^\d+$/)) {
--      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
--          key, true));
--    }
--  });
--  return output;
--}
--
--
--function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
--  var name, str, desc;
--  desc = Object.getOwnPropertyDescriptor(value, key) || { value: value[key] };
--  if (desc.get) {
--    if (desc.set) {
--      str = ctx.stylize('[Getter/Setter]', 'special');
--    } else {
--      str = ctx.stylize('[Getter]', 'special');
--    }
--  } else {
--    if (desc.set) {
--      str = ctx.stylize('[Setter]', 'special');
--    }
--  }
--  if (!hasOwnProperty(visibleKeys, key)) {
--    name = '[' + key + ']';
--  }
--  if (!str) {
--    if (ctx.seen.indexOf(desc.value) < 0) {
--      if (isNull(recurseTimes)) {
--        str = formatValue(ctx, desc.value, null);
--      } else {
--        str = formatValue(ctx, desc.value, recurseTimes - 1);
--      }
--      if (str.indexOf('\n') > -1) {
--        if (array) {
--          str = str.split('\n').map(function(line) {
--            return '  ' + line;
--          }).join('\n').substr(2);
--        } else {
--          str = '\n' + str.split('\n').map(function(line) {
--            return '   ' + line;
--          }).join('\n');
--        }
--      }
--    } else {
--      str = ctx.stylize('[Circular]', 'special');
--    }
--  }
--  if (isUndefined(name)) {
--    if (array && key.match(/^\d+$/)) {
--      return str;
--    }
--    name = JSON.stringify('' + key);
--    if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
--      name = name.substr(1, name.length - 2);
--      name = ctx.stylize(name, 'name');
--    } else {
--      name = name.replace(/'/g, "\\'")
--                 .replace(/\\"/g, '"')
--                 .replace(/(^"|"$)/g, "'");
--      name = ctx.stylize(name, 'string');
--    }
--  }
--
--  return name + ': ' + str;
--}
--
--
--function reduceToSingleString(output, base, braces) {
--  var numLinesEst = 0;
--  var length = output.reduce(function(prev, cur) {
--    numLinesEst++;
--    if (cur.indexOf('\n') >= 0) numLinesEst++;
--    return prev + cur.replace(/\u001b\[\d\d?m/g, '').length + 1;
--  }, 0);
--
--  if (length > 60) {
--    return braces[0] +
--           (base === '' ? '' : base + '\n ') +
--           ' ' +
--           output.join(',\n  ') +
--           ' ' +
--           braces[1];
--  }
--
--  return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
--}
--
--
- // NOTE: These type checking functions intentionally don't use `instanceof`
- // because it is fragile and can be easily faked with `Object.create()`.
- function isArray(ar) {
-@@ -522,166 +98,10 @@ function isPrimitive(arg) {
- exports.isPrimitive = isPrimitive;
-
- function isBuffer(arg) {
--  return arg instanceof Buffer;
-+  return Buffer.isBuffer(arg);
- }
- exports.isBuffer = isBuffer;
-
- function objectToString(o) {
-   return Object.prototype.toString.call(o);
--}
--
--
--function pad(n) {
--  return n < 10 ? '0' + n.toString(10) : n.toString(10);
--}
--
--
--var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',
--              'Oct', 'Nov', 'Dec'];
--
--// 26 Feb 16:19:34
--function timestamp() {
--  var d = new Date();
--  var time = [pad(d.getHours()),
--              pad(d.getMinutes()),
--              pad(d.getSeconds())].join(':');
--  return [d.getDate(), months[d.getMonth()], time].join(' ');
--}
--
--
--// log is just a thin wrapper to console.log that prepends a timestamp
--exports.log = function() {
--  console.log('%s - %s', timestamp(), exports.format.apply(exports, arguments));
--};
--
--
--/**
-- * Inherit the prototype methods from one constructor into another.
-- *
-- * The Function.prototype.inherits from lang.js rewritten as a standalone
-- * function (not on Function.prototype). NOTE: If this file is to be loaded
-- * during bootstrapping this function needs to be rewritten using some native
-- * functions as prototype setup using normal JavaScript does not work as
-- * expected during bootstrapping (see mirror.js in r114903).
-- *
-- * @param {function} ctor Constructor function which needs to inherit the
-- *     prototype.
-- * @param {function} superCtor Constructor function to inherit prototype from.
-- */
--exports.inherits = function(ctor, superCtor) {
--  ctor.super_ = superCtor;
--  ctor.prototype = Object.create(superCtor.prototype, {
--    constructor: {
--      value: ctor,
--      enumerable: false,
--      writable: true,
--      configurable: true
--    }
--  });
--};
--
--exports._extend = function(origin, add) {
--  // Don't do anything if add isn't an object
--  if (!add || !isObject(add)) return origin;
--
--  var keys = Object.keys(add);
--  var i = keys.length;
--  while (i--) {
--    origin[keys[i]] = add[keys[i]];
--  }
--  return origin;
--};
--
--function hasOwnProperty(obj, prop) {
--  return Object.prototype.hasOwnProperty.call(obj, prop);
--}
--
--
--// Deprecated old stuff.
--
--exports.p = exports.deprecate(function() {
--  for (var i = 0, len = arguments.length; i < len; ++i) {
--    console.error(exports.inspect(arguments[i]));
--  }
--}, 'util.p: Use console.error() instead');
--
--
--exports.exec = exports.deprecate(function() {
--  return require('child_process').exec.apply(this, arguments);
--}, 'util.exec is now called `child_process.exec`.');
--
--
--exports.print = exports.deprecate(function() {
--  for (var i = 0, len = arguments.length; i < len; ++i) {
--    process.stdout.write(String(arguments[i]));
--  }
--}, 'util.print: Use console.log instead');
--
--
--exports.puts = exports.deprecate(function() {
--  for (var i = 0, len = arguments.length; i < len; ++i) {
--    process.stdout.write(arguments[i] + '\n');
--  }
--}, 'util.puts: Use console.log instead');
--
--
--exports.debug = exports.deprecate(function(x) {
--  process.stderr.write('DEBUG: ' + x + '\n');
--}, 'util.debug: Use console.error instead');
--
--
--exports.error = exports.deprecate(function(x) {
--  for (var i = 0, len = arguments.length; i < len; ++i) {
--    process.stderr.write(arguments[i] + '\n');
--  }
--}, 'util.error: Use console.error instead');
--
--
--exports.pump = exports.deprecate(function(readStream, writeStream, callback) {
--  var callbackCalled = false;
--
--  function call(a, b, c) {
--    if (callback && !callbackCalled) {
--      callback(a, b, c);
--      callbackCalled = true;
--    }
--  }
--
--  readStream.addListener('data', function(chunk) {
--    if (writeStream.write(chunk) === false) readStream.pause();
--  });
--
--  writeStream.addListener('drain', function() {
--    readStream.resume();
--  });
--
--  readStream.addListener('end', function() {
--    writeStream.end();
--  });
--
--  readStream.addListener('close', function() {
--    call();
--  });
--
--  readStream.addListener('error', function(err) {
--    writeStream.end();
--    call(err);
--  });
--
--  writeStream.addListener('error', function(err) {
--    readStream.destroy();
--    call(err);
--  });
--}, 'util.pump(): Use readableStream.pipe() instead');
--
--
--var uv;
--exports._errnoException = function(err, syscall) {
--  if (isUndefined(uv)) uv = process.binding('uv');
--  var errname = uv.errname(err);
--  var e = new Error(syscall + ' ' + errname);
--  e.code = errname;
--  e.errno = errname;
--  e.syscall = syscall;
--  return e;
--};
-+}
\ No newline at end of file
diff --git a/deps/npm/node_modules/readable-stream/node_modules/core-util-is/lib/util.js b/deps/npm/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
deleted file mode 100644
index 9074e8ebcb61e9..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-// NOTE: These type checking functions intentionally don't use `instanceof`
-// because it is fragile and can be easily faked with `Object.create()`.
-function isArray(ar) {
-  return Array.isArray(ar);
-}
-exports.isArray = isArray;
-
-function isBoolean(arg) {
-  return typeof arg === 'boolean';
-}
-exports.isBoolean = isBoolean;
-
-function isNull(arg) {
-  return arg === null;
-}
-exports.isNull = isNull;
-
-function isNullOrUndefined(arg) {
-  return arg == null;
-}
-exports.isNullOrUndefined = isNullOrUndefined;
-
-function isNumber(arg) {
-  return typeof arg === 'number';
-}
-exports.isNumber = isNumber;
-
-function isString(arg) {
-  return typeof arg === 'string';
-}
-exports.isString = isString;
-
-function isSymbol(arg) {
-  return typeof arg === 'symbol';
-}
-exports.isSymbol = isSymbol;
-
-function isUndefined(arg) {
-  return arg === void 0;
-}
-exports.isUndefined = isUndefined;
-
-function isRegExp(re) {
-  return isObject(re) && objectToString(re) === '[object RegExp]';
-}
-exports.isRegExp = isRegExp;
-
-function isObject(arg) {
-  return typeof arg === 'object' && arg !== null;
-}
-exports.isObject = isObject;
-
-function isDate(d) {
-  return isObject(d) && objectToString(d) === '[object Date]';
-}
-exports.isDate = isDate;
-
-function isError(e) {
-  return isObject(e) &&
-      (objectToString(e) === '[object Error]' || e instanceof Error);
-}
-exports.isError = isError;
-
-function isFunction(arg) {
-  return typeof arg === 'function';
-}
-exports.isFunction = isFunction;
-
-function isPrimitive(arg) {
-  return arg === null ||
-         typeof arg === 'boolean' ||
-         typeof arg === 'number' ||
-         typeof arg === 'string' ||
-         typeof arg === 'symbol' ||  // ES6 symbol
-         typeof arg === 'undefined';
-}
-exports.isPrimitive = isPrimitive;
-
-function isBuffer(arg) {
-  return Buffer.isBuffer(arg);
-}
-exports.isBuffer = isBuffer;
-
-function objectToString(o) {
-  return Object.prototype.toString.call(o);
-}
\ No newline at end of file
diff --git a/deps/npm/node_modules/readable-stream/node_modules/core-util-is/package.json b/deps/npm/node_modules/readable-stream/node_modules/core-util-is/package.json
deleted file mode 100644
index b67333380c265e..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/core-util-is/package.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "name": "core-util-is",
-  "version": "1.0.1",
-  "description": "The `util.is*` functions introduced in Node v0.12.",
-  "main": "lib/util.js",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/core-util-is.git"
-  },
-  "keywords": [
-    "util",
-    "isBuffer",
-    "isArray",
-    "isNumber",
-    "isString",
-    "isRegExp",
-    "isThis",
-    "isThat",
-    "polyfill"
-  ],
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
-  },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/isaacs/core-util-is/issues"
-  },
-  "readme": "# core-util-is\n\nThe `util.is*` functions introduced in Node v0.12.\n",
-  "readmeFilename": "README.md",
-  "homepage": "https://github.com/isaacs/core-util-is#readme",
-  "_id": "core-util-is@1.0.1",
-  "_shasum": "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538",
-  "_resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
-  "_from": "core-util-is@>=1.0.0 <1.1.0"
-}
diff --git a/deps/npm/node_modules/readable-stream/node_modules/core-util-is/util.js b/deps/npm/node_modules/readable-stream/node_modules/core-util-is/util.js
deleted file mode 100644
index 007fa10575636d..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/core-util-is/util.js
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-// NOTE: These type checking functions intentionally don't use `instanceof`
-// because it is fragile and can be easily faked with `Object.create()`.
-function isArray(ar) {
-  return Array.isArray(ar);
-}
-exports.isArray = isArray;
-
-function isBoolean(arg) {
-  return typeof arg === 'boolean';
-}
-exports.isBoolean = isBoolean;
-
-function isNull(arg) {
-  return arg === null;
-}
-exports.isNull = isNull;
-
-function isNullOrUndefined(arg) {
-  return arg == null;
-}
-exports.isNullOrUndefined = isNullOrUndefined;
-
-function isNumber(arg) {
-  return typeof arg === 'number';
-}
-exports.isNumber = isNumber;
-
-function isString(arg) {
-  return typeof arg === 'string';
-}
-exports.isString = isString;
-
-function isSymbol(arg) {
-  return typeof arg === 'symbol';
-}
-exports.isSymbol = isSymbol;
-
-function isUndefined(arg) {
-  return arg === void 0;
-}
-exports.isUndefined = isUndefined;
-
-function isRegExp(re) {
-  return isObject(re) && objectToString(re) === '[object RegExp]';
-}
-exports.isRegExp = isRegExp;
-
-function isObject(arg) {
-  return typeof arg === 'object' && arg !== null;
-}
-exports.isObject = isObject;
-
-function isDate(d) {
-  return isObject(d) && objectToString(d) === '[object Date]';
-}
-exports.isDate = isDate;
-
-function isError(e) {
-  return isObject(e) && objectToString(e) === '[object Error]';
-}
-exports.isError = isError;
-
-function isFunction(arg) {
-  return typeof arg === 'function';
-}
-exports.isFunction = isFunction;
-
-function isPrimitive(arg) {
-  return arg === null ||
-         typeof arg === 'boolean' ||
-         typeof arg === 'number' ||
-         typeof arg === 'string' ||
-         typeof arg === 'symbol' ||  // ES6 symbol
-         typeof arg === 'undefined';
-}
-exports.isPrimitive = isPrimitive;
-
-function isBuffer(arg) {
-  return arg instanceof Buffer;
-}
-exports.isBuffer = isBuffer;
-
-function objectToString(o) {
-  return Object.prototype.toString.call(o);
-}
diff --git a/deps/npm/node_modules/readable-stream/node_modules/isarray/README.md b/deps/npm/node_modules/readable-stream/node_modules/isarray/README.md
deleted file mode 100644
index 052a62b8d7b7ae..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/isarray/README.md
+++ /dev/null
@@ -1,54 +0,0 @@
-
-# isarray
-
-`Array#isArray` for older browsers.
-
-## Usage
-
-```js
-var isArray = require('isarray');
-
-console.log(isArray([])); // => true
-console.log(isArray({})); // => false
-```
-
-## Installation
-
-With [npm](http://npmjs.org) do
-
-```bash
-$ npm install isarray
-```
-
-Then bundle for the browser with
-[browserify](https://github.com/substack/browserify).
-
-With [component](http://component.io) do
-
-```bash
-$ component install juliangruber/isarray
-```
-
-## License
-
-(MIT)
-
-Copyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/deps/npm/node_modules/readable-stream/node_modules/isarray/build/build.js b/deps/npm/node_modules/readable-stream/node_modules/isarray/build/build.js
deleted file mode 100644
index ec58596aeebe4e..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/isarray/build/build.js
+++ /dev/null
@@ -1,209 +0,0 @@
-
-/**
- * Require the given path.
- *
- * @param {String} path
- * @return {Object} exports
- * @api public
- */
-
-function require(path, parent, orig) {
-  var resolved = require.resolve(path);
-
-  // lookup failed
-  if (null == resolved) {
-    orig = orig || path;
-    parent = parent || 'root';
-    var err = new Error('Failed to require "' + orig + '" from "' + parent + '"');
-    err.path = orig;
-    err.parent = parent;
-    err.require = true;
-    throw err;
-  }
-
-  var module = require.modules[resolved];
-
-  // perform real require()
-  // by invoking the module's
-  // registered function
-  if (!module.exports) {
-    module.exports = {};
-    module.client = module.component = true;
-    module.call(this, module.exports, require.relative(resolved), module);
-  }
-
-  return module.exports;
-}
-
-/**
- * Registered modules.
- */
-
-require.modules = {};
-
-/**
- * Registered aliases.
- */
-
-require.aliases = {};
-
-/**
- * Resolve `path`.
- *
- * Lookup:
- *
- *   - PATH/index.js
- *   - PATH.js
- *   - PATH
- *
- * @param {String} path
- * @return {String} path or null
- * @api private
- */
-
-require.resolve = function(path) {
-  if (path.charAt(0) === '/') path = path.slice(1);
-  var index = path + '/index.js';
-
-  var paths = [
-    path,
-    path + '.js',
-    path + '.json',
-    path + '/index.js',
-    path + '/index.json'
-  ];
-
-  for (var i = 0; i < paths.length; i++) {
-    var path = paths[i];
-    if (require.modules.hasOwnProperty(path)) return path;
-  }
-
-  if (require.aliases.hasOwnProperty(index)) {
-    return require.aliases[index];
-  }
-};
-
-/**
- * Normalize `path` relative to the current path.
- *
- * @param {String} curr
- * @param {String} path
- * @return {String}
- * @api private
- */
-
-require.normalize = function(curr, path) {
-  var segs = [];
-
-  if ('.' != path.charAt(0)) return path;
-
-  curr = curr.split('/');
-  path = path.split('/');
-
-  for (var i = 0; i < path.length; ++i) {
-    if ('..' == path[i]) {
-      curr.pop();
-    } else if ('.' != path[i] && '' != path[i]) {
-      segs.push(path[i]);
-    }
-  }
-
-  return curr.concat(segs).join('/');
-};
-
-/**
- * Register module at `path` with callback `definition`.
- *
- * @param {String} path
- * @param {Function} definition
- * @api private
- */
-
-require.register = function(path, definition) {
-  require.modules[path] = definition;
-};
-
-/**
- * Alias a module definition.
- *
- * @param {String} from
- * @param {String} to
- * @api private
- */
-
-require.alias = function(from, to) {
-  if (!require.modules.hasOwnProperty(from)) {
-    throw new Error('Failed to alias "' + from + '", it does not exist');
-  }
-  require.aliases[to] = from;
-};
-
-/**
- * Return a require function relative to the `parent` path.
- *
- * @param {String} parent
- * @return {Function}
- * @api private
- */
-
-require.relative = function(parent) {
-  var p = require.normalize(parent, '..');
-
-  /**
-   * lastIndexOf helper.
-   */
-
-  function lastIndexOf(arr, obj) {
-    var i = arr.length;
-    while (i--) {
-      if (arr[i] === obj) return i;
-    }
-    return -1;
-  }
-
-  /**
-   * The relative require() itself.
-   */
-
-  function localRequire(path) {
-    var resolved = localRequire.resolve(path);
-    return require(resolved, parent, path);
-  }
-
-  /**
-   * Resolve relative to the parent.
-   */
-
-  localRequire.resolve = function(path) {
-    var c = path.charAt(0);
-    if ('/' == c) return path.slice(1);
-    if ('.' == c) return require.normalize(p, path);
-
-    // resolve deps by returning
-    // the dep in the nearest "deps"
-    // directory
-    var segs = parent.split('/');
-    var i = lastIndexOf(segs, 'deps') + 1;
-    if (!i) i = 0;
-    path = segs.slice(0, i + 1).join('/') + '/deps/' + path;
-    return path;
-  };
-
-  /**
-   * Check if module is defined at `path`.
-   */
-
-  localRequire.exists = function(path) {
-    return require.modules.hasOwnProperty(localRequire.resolve(path));
-  };
-
-  return localRequire;
-};
-require.register("isarray/index.js", function(exports, require, module){
-module.exports = Array.isArray || function (arr) {
-  return Object.prototype.toString.call(arr) == '[object Array]';
-};
-
-});
-require.alias("isarray/index.js", "isarray/index.js");
-
diff --git a/deps/npm/node_modules/readable-stream/node_modules/isarray/component.json b/deps/npm/node_modules/readable-stream/node_modules/isarray/component.json
deleted file mode 100644
index 9e31b683889015..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/isarray/component.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name" : "isarray",
-  "description" : "Array#isArray for older browsers",
-  "version" : "0.0.1",
-  "repository" : "juliangruber/isarray",
-  "homepage": "https://github.com/juliangruber/isarray",
-  "main" : "index.js",
-  "scripts" : [
-    "index.js"
-  ],
-  "dependencies" : {},
-  "keywords": ["browser","isarray","array"],
-  "author": {
-    "name": "Julian Gruber",
-    "email": "mail@juliangruber.com",
-    "url": "http://juliangruber.com"
-  },
-  "license": "MIT"
-}
diff --git a/deps/npm/node_modules/readable-stream/node_modules/isarray/index.js b/deps/npm/node_modules/readable-stream/node_modules/isarray/index.js
deleted file mode 100644
index 5f5ad45d46dda9..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/isarray/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = Array.isArray || function (arr) {
-  return Object.prototype.toString.call(arr) == '[object Array]';
-};
diff --git a/deps/npm/node_modules/readable-stream/node_modules/isarray/package.json b/deps/npm/node_modules/readable-stream/node_modules/isarray/package.json
deleted file mode 100644
index fb1eb3786d8168..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/isarray/package.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "name": "isarray",
-  "description": "Array#isArray for older browsers",
-  "version": "0.0.1",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/juliangruber/isarray.git"
-  },
-  "homepage": "https://github.com/juliangruber/isarray",
-  "main": "index.js",
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "tap": "*"
-  },
-  "keywords": [
-    "browser",
-    "isarray",
-    "array"
-  ],
-  "author": {
-    "name": "Julian Gruber",
-    "email": "mail@juliangruber.com",
-    "url": "http://juliangruber.com"
-  },
-  "license": "MIT",
-  "readme": "\n# isarray\n\n`Array#isArray` for older browsers.\n\n## Usage\n\n```js\nvar isArray = require('isarray');\n\nconsole.log(isArray([])); // => true\nconsole.log(isArray({})); // => false\n```\n\n## Installation\n\nWith [npm](http://npmjs.org) do\n\n```bash\n$ npm install isarray\n```\n\nThen bundle for the browser with\n[browserify](https://github.com/substack/browserify).\n\nWith [component](http://component.io) do\n\n```bash\n$ component install juliangruber/isarray\n```\n\n## License\n\n(MIT)\n\nCopyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the \"Software\"), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\nof the Software, and to permit persons to whom the Software is furnished to do\nso, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n",
-  "readmeFilename": "README.md",
-  "bugs": {
-    "url": "https://github.com/juliangruber/isarray/issues"
-  },
-  "_id": "isarray@0.0.1",
-  "_shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf",
-  "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-  "_from": "isarray@0.0.1"
-}
diff --git a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/.npmignore b/deps/npm/node_modules/readable-stream/node_modules/string_decoder/.npmignore
deleted file mode 100644
index 206320cc1d21b9..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build
-test
diff --git a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/LICENSE b/deps/npm/node_modules/readable-stream/node_modules/string_decoder/LICENSE
deleted file mode 100644
index 6de584a48f5c89..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright Joyent, Inc. and other Node contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons to whom the Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/README.md b/deps/npm/node_modules/readable-stream/node_modules/string_decoder/README.md
deleted file mode 100644
index 4d2aa001501107..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-**string_decoder.js** (`require('string_decoder')`) from Node.js core
-
-Copyright Joyent, Inc. and other Node contributors. See LICENCE file for details.
-
-Version numbers match the versions found in Node core, e.g. 0.10.24 matches Node 0.10.24, likewise 0.11.10 matches Node 0.11.10. **Prefer the stable version over the unstable.**
-
-The *build/* directory contains a build script that will scrape the source from the [joyent/node](https://github.com/joyent/node) repo given a specific Node version.
\ No newline at end of file
diff --git a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/index.js b/deps/npm/node_modules/readable-stream/node_modules/string_decoder/index.js
deleted file mode 100644
index b00e54fb790982..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/index.js
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-var Buffer = require('buffer').Buffer;
-
-var isBufferEncoding = Buffer.isEncoding
-  || function(encoding) {
-       switch (encoding && encoding.toLowerCase()) {
-         case 'hex': case 'utf8': case 'utf-8': case 'ascii': case 'binary': case 'base64': case 'ucs2': case 'ucs-2': case 'utf16le': case 'utf-16le': case 'raw': return true;
-         default: return false;
-       }
-     }
-
-
-function assertEncoding(encoding) {
-  if (encoding && !isBufferEncoding(encoding)) {
-    throw new Error('Unknown encoding: ' + encoding);
-  }
-}
-
-// StringDecoder provides an interface for efficiently splitting a series of
-// buffers into a series of JS strings without breaking apart multi-byte
-// characters. CESU-8 is handled as part of the UTF-8 encoding.
-//
-// @TODO Handling all encodings inside a single object makes it very difficult
-// to reason about this code, so it should be split up in the future.
-// @TODO There should be a utf8-strict encoding that rejects invalid UTF-8 code
-// points as used by CESU-8.
-var StringDecoder = exports.StringDecoder = function(encoding) {
-  this.encoding = (encoding || 'utf8').toLowerCase().replace(/[-_]/, '');
-  assertEncoding(encoding);
-  switch (this.encoding) {
-    case 'utf8':
-      // CESU-8 represents each of Surrogate Pair by 3-bytes
-      this.surrogateSize = 3;
-      break;
-    case 'ucs2':
-    case 'utf16le':
-      // UTF-16 represents each of Surrogate Pair by 2-bytes
-      this.surrogateSize = 2;
-      this.detectIncompleteChar = utf16DetectIncompleteChar;
-      break;
-    case 'base64':
-      // Base-64 stores 3 bytes in 4 chars, and pads the remainder.
-      this.surrogateSize = 3;
-      this.detectIncompleteChar = base64DetectIncompleteChar;
-      break;
-    default:
-      this.write = passThroughWrite;
-      return;
-  }
-
-  // Enough space to store all bytes of a single character. UTF-8 needs 4
-  // bytes, but CESU-8 may require up to 6 (3 bytes per surrogate).
-  this.charBuffer = new Buffer(6);
-  // Number of bytes received for the current incomplete multi-byte character.
-  this.charReceived = 0;
-  // Number of bytes expected for the current incomplete multi-byte character.
-  this.charLength = 0;
-};
-
-
-// write decodes the given buffer and returns it as JS string that is
-// guaranteed to not contain any partial multi-byte characters. Any partial
-// character found at the end of the buffer is buffered up, and will be
-// returned when calling write again with the remaining bytes.
-//
-// Note: Converting a Buffer containing an orphan surrogate to a String
-// currently works, but converting a String to a Buffer (via `new Buffer`, or
-// Buffer#write) will replace incomplete surrogates with the unicode
-// replacement character. See https://codereview.chromium.org/121173009/ .
-StringDecoder.prototype.write = function(buffer) {
-  var charStr = '';
-  // if our last write ended with an incomplete multibyte character
-  while (this.charLength) {
-    // determine how many remaining bytes this buffer has to offer for this char
-    var available = (buffer.length >= this.charLength - this.charReceived) ?
-        this.charLength - this.charReceived :
-        buffer.length;
-
-    // add the new bytes to the char buffer
-    buffer.copy(this.charBuffer, this.charReceived, 0, available);
-    this.charReceived += available;
-
-    if (this.charReceived < this.charLength) {
-      // still not enough chars in this buffer? wait for more ...
-      return '';
-    }
-
-    // remove bytes belonging to the current character from the buffer
-    buffer = buffer.slice(available, buffer.length);
-
-    // get the character that was split
-    charStr = this.charBuffer.slice(0, this.charLength).toString(this.encoding);
-
-    // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character
-    var charCode = charStr.charCodeAt(charStr.length - 1);
-    if (charCode >= 0xD800 && charCode <= 0xDBFF) {
-      this.charLength += this.surrogateSize;
-      charStr = '';
-      continue;
-    }
-    this.charReceived = this.charLength = 0;
-
-    // if there are no more bytes in this buffer, just emit our char
-    if (buffer.length === 0) {
-      return charStr;
-    }
-    break;
-  }
-
-  // determine and set charLength / charReceived
-  this.detectIncompleteChar(buffer);
-
-  var end = buffer.length;
-  if (this.charLength) {
-    // buffer the incomplete character bytes we got
-    buffer.copy(this.charBuffer, 0, buffer.length - this.charReceived, end);
-    end -= this.charReceived;
-  }
-
-  charStr += buffer.toString(this.encoding, 0, end);
-
-  var end = charStr.length - 1;
-  var charCode = charStr.charCodeAt(end);
-  // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character
-  if (charCode >= 0xD800 && charCode <= 0xDBFF) {
-    var size = this.surrogateSize;
-    this.charLength += size;
-    this.charReceived += size;
-    this.charBuffer.copy(this.charBuffer, size, 0, size);
-    buffer.copy(this.charBuffer, 0, 0, size);
-    return charStr.substring(0, end);
-  }
-
-  // or just emit the charStr
-  return charStr;
-};
-
-// detectIncompleteChar determines if there is an incomplete UTF-8 character at
-// the end of the given buffer. If so, it sets this.charLength to the byte
-// length that character, and sets this.charReceived to the number of bytes
-// that are available for this character.
-StringDecoder.prototype.detectIncompleteChar = function(buffer) {
-  // determine how many bytes we have to check at the end of this buffer
-  var i = (buffer.length >= 3) ? 3 : buffer.length;
-
-  // Figure out if one of the last i bytes of our buffer announces an
-  // incomplete char.
-  for (; i > 0; i--) {
-    var c = buffer[buffer.length - i];
-
-    // See http://en.wikipedia.org/wiki/UTF-8#Description
-
-    // 110XXXXX
-    if (i == 1 && c >> 5 == 0x06) {
-      this.charLength = 2;
-      break;
-    }
-
-    // 1110XXXX
-    if (i <= 2 && c >> 4 == 0x0E) {
-      this.charLength = 3;
-      break;
-    }
-
-    // 11110XXX
-    if (i <= 3 && c >> 3 == 0x1E) {
-      this.charLength = 4;
-      break;
-    }
-  }
-  this.charReceived = i;
-};
-
-StringDecoder.prototype.end = function(buffer) {
-  var res = '';
-  if (buffer && buffer.length)
-    res = this.write(buffer);
-
-  if (this.charReceived) {
-    var cr = this.charReceived;
-    var buf = this.charBuffer;
-    var enc = this.encoding;
-    res += buf.slice(0, cr).toString(enc);
-  }
-
-  return res;
-};
-
-function passThroughWrite(buffer) {
-  return buffer.toString(this.encoding);
-}
-
-function utf16DetectIncompleteChar(buffer) {
-  this.charReceived = buffer.length % 2;
-  this.charLength = this.charReceived ? 2 : 0;
-}
-
-function base64DetectIncompleteChar(buffer) {
-  this.charReceived = buffer.length % 3;
-  this.charLength = this.charReceived ? 3 : 0;
-}
diff --git a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/package.json b/deps/npm/node_modules/readable-stream/node_modules/string_decoder/package.json
deleted file mode 100644
index ee70702359198d..00000000000000
--- a/deps/npm/node_modules/readable-stream/node_modules/string_decoder/package.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "name": "string_decoder",
-  "version": "0.10.31",
-  "description": "The string_decoder module from Node core",
-  "main": "index.js",
-  "dependencies": {},
-  "devDependencies": {
-    "tap": "~0.4.8"
-  },
-  "scripts": {
-    "test": "tap test/simple/*.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/rvagg/string_decoder.git"
-  },
-  "homepage": "https://github.com/rvagg/string_decoder",
-  "keywords": [
-    "string",
-    "decoder",
-    "browser",
-    "browserify"
-  ],
-  "license": "MIT",
-  "readme": "**string_decoder.js** (`require('string_decoder')`) from Node.js core\n\nCopyright Joyent, Inc. and other Node contributors. See LICENCE file for details.\n\nVersion numbers match the versions found in Node core, e.g. 0.10.24 matches Node 0.10.24, likewise 0.11.10 matches Node 0.11.10. **Prefer the stable version over the unstable.**\n\nThe *build/* directory contains a build script that will scrape the source from the [joyent/node](https://github.com/joyent/node) repo given a specific Node version.",
-  "readmeFilename": "README.md",
-  "bugs": {
-    "url": "https://github.com/rvagg/string_decoder/issues"
-  },
-  "_id": "string_decoder@0.10.31",
-  "_shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94",
-  "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-  "_from": "string_decoder@>=0.10.0 <0.11.0"
-}
diff --git a/deps/npm/node_modules/readable-stream/package.json b/deps/npm/node_modules/readable-stream/package.json
index fbc5e7fa4983be..a82d55fa2424be 100644
--- a/deps/npm/node_modules/readable-stream/package.json
+++ b/deps/npm/node_modules/readable-stream/package.json
@@ -1,51 +1,72 @@
 {
-  "name": "readable-stream",
-  "version": "1.1.13",
-  "description": "Streams3, a user-land copy of the stream library from Node.js v0.11.x",
-  "main": "readable.js",
+  "_args": [
+    [
+      "readable-stream@^1.1.13",
+      "/Users/rebecca/code/npm/node_modules/are-we-there-yet"
+    ]
+  ],
+  "_from": "readable-stream@>=1.1.13 <2.0.0",
+  "_id": "readable-stream@1.1.13",
+  "_inCache": true,
+  "_location": "/readable-stream",
+  "_npmUser": {
+    "email": "rod@vagg.org",
+    "name": "rvagg"
+  },
+  "_npmVersion": "1.4.23",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "readable-stream",
+    "raw": "readable-stream@^1.1.13",
+    "rawSpec": "^1.1.13",
+    "scope": null,
+    "spec": ">=1.1.13 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/are-we-there-yet",
+    "/sha"
+  ],
+  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+  "_shasum": "f6eef764f514c89e2b9e23146a75ba106756d23e",
+  "_shrinkwrap": null,
+  "_spec": "readable-stream@^1.1.13",
+  "_where": "/Users/rebecca/code/npm/node_modules/are-we-there-yet",
+  "author": {
+    "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
+    "url": "http://blog.izs.me/"
+  },
+  "browser": {
+    "util": false
+  },
+  "bugs": {
+    "url": "https://github.com/isaacs/readable-stream/issues"
+  },
   "dependencies": {
     "core-util-is": "~1.0.0",
+    "inherits": "~2.0.1",
     "isarray": "0.0.1",
-    "string_decoder": "~0.10.x",
-    "inherits": "~2.0.1"
+    "string_decoder": "~0.10.x"
   },
+  "description": "Streams3, a user-land copy of the stream library from Node.js v0.11.x",
   "devDependencies": {
     "tap": "~0.2.6"
   },
-  "scripts": {
-    "test": "tap test/simple/*.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/readable-stream.git"
+  "directories": {},
+  "dist": {
+    "shasum": "f6eef764f514c89e2b9e23146a75ba106756d23e",
+    "tarball": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"
   },
+  "gitHead": "3b672fd7ae92acf5b4ffdbabf74b372a0a56b051",
+  "homepage": "https://github.com/isaacs/readable-stream",
   "keywords": [
+    "pipe",
     "readable",
-    "stream",
-    "pipe"
+    "stream"
   ],
-  "browser": {
-    "util": false
-  },
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
-  },
   "license": "MIT",
-  "gitHead": "3b672fd7ae92acf5b4ffdbabf74b372a0a56b051",
-  "bugs": {
-    "url": "https://github.com/isaacs/readable-stream/issues"
-  },
-  "homepage": "https://github.com/isaacs/readable-stream",
-  "_id": "readable-stream@1.1.13",
-  "_shasum": "f6eef764f514c89e2b9e23146a75ba106756d23e",
-  "_from": "readable-stream@>=1.1.13 <1.2.0",
-  "_npmVersion": "1.4.23",
-  "_npmUser": {
-    "name": "rvagg",
-    "email": "rod@vagg.org"
-  },
+  "main": "readable.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -60,11 +81,14 @@
       "email": "rod@vagg.org"
     }
   ],
-  "dist": {
-    "shasum": "f6eef764f514c89e2b9e23146a75ba106756d23e",
-    "tarball": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"
+  "name": "readable-stream",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/readable-stream"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "tap test/simple/*.js"
+  },
+  "version": "1.1.13"
 }
diff --git a/deps/npm/node_modules/readdir-scoped-modules/.travis.yml b/deps/npm/node_modules/readdir-scoped-modules/.travis.yml
new file mode 100644
index 00000000000000..e1bcee1acd90c1
--- /dev/null
+++ b/deps/npm/node_modules/readdir-scoped-modules/.travis.yml
@@ -0,0 +1,7 @@
+language: node_js
+before_script: npm install -g npm@latest
+node_js:
+  - '0.8'
+  - '0.10'
+  - '0.12'
+  - 'iojs'
diff --git a/deps/npm/node_modules/read/node_modules/mute-stream/LICENSE b/deps/npm/node_modules/readdir-scoped-modules/LICENSE
similarity index 100%
rename from deps/npm/node_modules/read/node_modules/mute-stream/LICENSE
rename to deps/npm/node_modules/readdir-scoped-modules/LICENSE
diff --git a/deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/README.md b/deps/npm/node_modules/readdir-scoped-modules/README.md
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/README.md
rename to deps/npm/node_modules/readdir-scoped-modules/README.md
diff --git a/deps/npm/node_modules/readdir-scoped-modules/package.json b/deps/npm/node_modules/readdir-scoped-modules/package.json
new file mode 100644
index 00000000000000..ba44304f444686
--- /dev/null
+++ b/deps/npm/node_modules/readdir-scoped-modules/package.json
@@ -0,0 +1,90 @@
+{
+  "_args": [
+    [
+      "readdir-scoped-modules@^1.0.0",
+      "/Users/rebecca/code/npm/node_modules/read-installed"
+    ]
+  ],
+  "_from": "readdir-scoped-modules@>=1.0.0 <2.0.0",
+  "_id": "readdir-scoped-modules@1.0.2",
+  "_inCache": true,
+  "_location": "/readdir-scoped-modules",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "email": "kat@sykosomatic.org",
+    "name": "zkat"
+  },
+  "_npmVersion": "2.14.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "readdir-scoped-modules",
+    "raw": "readdir-scoped-modules@^1.0.0",
+    "rawSpec": "^1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/read-installed",
+    "/read-package-tree"
+  ],
+  "_resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz",
+  "_shasum": "9fafa37d286be5d92cbaebdee030dc9b5f406747",
+  "_shrinkwrap": null,
+  "_spec": "readdir-scoped-modules@^1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/read-installed",
+  "author": {
+    "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
+    "url": "http://blog.izs.me/"
+  },
+  "bugs": {
+    "url": "https://github.com/npm/readdir-scoped-modules/issues"
+  },
+  "dependencies": {
+    "debuglog": "^1.0.1",
+    "dezalgo": "^1.0.0",
+    "graceful-fs": "^4.1.2",
+    "once": "^1.3.0"
+  },
+  "description": "Like `fs.readdir` but handling `@org/module` dirs as if they were a single entry.",
+  "devDependencies": {
+    "tap": "^1.2.0"
+  },
+  "directories": {
+    "test": "test"
+  },
+  "dist": {
+    "shasum": "9fafa37d286be5d92cbaebdee030dc9b5f406747",
+    "tarball": "http://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz"
+  },
+  "gitHead": "d41d5de877cb4e9e3f14b92913132680af73d1b4",
+  "homepage": "https://github.com/npm/readdir-scoped-modules",
+  "installable": true,
+  "license": "ISC",
+  "main": "readdir.js",
+  "maintainers": [
+    {
+      "name": "isaacs",
+      "email": "isaacs@npmjs.com"
+    },
+    {
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
+    },
+    {
+      "name": "zkat",
+      "email": "kat@sykosomatic.org"
+    }
+  ],
+  "name": "readdir-scoped-modules",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/readdir-scoped-modules.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.0.2"
+}
diff --git a/deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/readdir.js b/deps/npm/node_modules/readdir-scoped-modules/readdir.js
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/readdir.js
rename to deps/npm/node_modules/readdir-scoped-modules/readdir.js
diff --git a/deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/basic.js b/deps/npm/node_modules/readdir-scoped-modules/test/basic.js
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/basic.js
rename to deps/npm/node_modules/readdir-scoped-modules/test/basic.js
diff --git a/deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/fixtures/@scope/y/.keep b/deps/npm/node_modules/readdir-scoped-modules/test/fixtures/@org/x/.keep
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/fixtures/@scope/y/.keep
rename to deps/npm/node_modules/readdir-scoped-modules/test/fixtures/@org/x/.keep
diff --git a/deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/fixtures/a/x/.keep b/deps/npm/node_modules/readdir-scoped-modules/test/fixtures/@org/y/.keep
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/fixtures/a/x/.keep
rename to deps/npm/node_modules/readdir-scoped-modules/test/fixtures/@org/y/.keep
diff --git a/deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/fixtures/a/y/.keep b/deps/npm/node_modules/readdir-scoped-modules/test/fixtures/@scope/x/.keep
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/fixtures/a/y/.keep
rename to deps/npm/node_modules/readdir-scoped-modules/test/fixtures/@scope/x/.keep
diff --git a/deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/fixtures/b/x/.keep b/deps/npm/node_modules/readdir-scoped-modules/test/fixtures/@scope/y/.keep
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/fixtures/b/x/.keep
rename to deps/npm/node_modules/readdir-scoped-modules/test/fixtures/@scope/y/.keep
diff --git a/deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/fixtures/b/y/.keep b/deps/npm/node_modules/readdir-scoped-modules/test/fixtures/a/x/.keep
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/readdir-scoped-modules/test/fixtures/b/y/.keep
rename to deps/npm/node_modules/readdir-scoped-modules/test/fixtures/a/x/.keep
diff --git a/deps/npm/node_modules/readdir-scoped-modules/test/fixtures/a/y/.keep b/deps/npm/node_modules/readdir-scoped-modules/test/fixtures/a/y/.keep
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/deps/npm/node_modules/readdir-scoped-modules/test/fixtures/b/x/.keep b/deps/npm/node_modules/readdir-scoped-modules/test/fixtures/b/x/.keep
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/deps/npm/node_modules/readdir-scoped-modules/test/fixtures/b/y/.keep b/deps/npm/node_modules/readdir-scoped-modules/test/fixtures/b/y/.keep
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/deps/npm/node_modules/realize-package-specifier/package.json b/deps/npm/node_modules/realize-package-specifier/package.json
index b14b24beffe366..d87b7d9ef5e1c2 100644
--- a/deps/npm/node_modules/realize-package-specifier/package.json
+++ b/deps/npm/node_modules/realize-package-specifier/package.json
@@ -1,47 +1,63 @@
 {
-  "name": "realize-package-specifier",
-  "version": "3.0.1",
-  "description": "Like npm-package-arg, but more so, producing full file paths and differentiating local tar and directory sources.",
-  "main": "index.js",
-  "scripts": {
-    "test": "tap test/*.js"
+  "_args": [
+    [
+      "realize-package-specifier@~3.0.1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "realize-package-specifier@>=3.0.1 <3.1.0",
+  "_id": "realize-package-specifier@3.0.1",
+  "_inCache": true,
+  "_location": "/realize-package-specifier",
+  "_nodeVersion": "2.0.2",
+  "_npmUser": {
+    "email": "ogd@aoaioxxysz.net",
+    "name": "othiym23"
   },
-  "license": "ISC",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/realize-package-specifier.git"
+  "_npmVersion": "2.10.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "realize-package-specifier",
+    "raw": "realize-package-specifier@~3.0.1",
+    "rawSpec": "~3.0.1",
+    "scope": null,
+    "spec": ">=3.0.1 <3.1.0",
+    "type": "range"
   },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz",
+  "_shasum": "fde32e926448e38f99334d95b7b08d51e3a98d9f",
+  "_shrinkwrap": null,
+  "_spec": "realize-package-specifier@~3.0.1",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Rebecca Turner",
     "email": "me@re-becca.org",
+    "name": "Rebecca Turner",
     "url": "http://re-becca.org"
   },
-  "homepage": "https://github.com/npm/realize-package-specifier",
+  "bugs": {
+    "url": "https://github.com/npm/realize-package-specifier/issues"
+  },
   "dependencies": {
     "dezalgo": "^1.0.1",
     "npm-package-arg": "^4.0.0"
   },
+  "description": "Like npm-package-arg, but more so, producing full file paths and differentiating local tar and directory sources.",
   "devDependencies": {
     "require-inject": "^1.1.0",
     "tap": "^0.4.12"
   },
-  "gitHead": "4f50130fa6b5e80954a90ea12bab382f53d890b1",
-  "bugs": {
-    "url": "https://github.com/npm/realize-package-specifier/issues"
-  },
-  "_id": "realize-package-specifier@3.0.1",
-  "_shasum": "fde32e926448e38f99334d95b7b08d51e3a98d9f",
-  "_from": "realize-package-specifier@>=3.0.0 <3.1.0",
-  "_npmVersion": "2.10.1",
-  "_nodeVersion": "2.0.2",
-  "_npmUser": {
-    "name": "othiym23",
-    "email": "ogd@aoaioxxysz.net"
-  },
+  "directories": {},
   "dist": {
     "shasum": "fde32e926448e38f99334d95b7b08d51e3a98d9f",
     "tarball": "http://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz"
   },
+  "gitHead": "4f50130fa6b5e80954a90ea12bab382f53d890b1",
+  "homepage": "https://github.com/npm/realize-package-specifier",
+  "license": "ISC",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "iarna",
@@ -52,6 +68,14 @@
       "email": "ogd@aoaioxxysz.net"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz"
+  "name": "realize-package-specifier",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/realize-package-specifier.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "3.0.1"
 }
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/README.md b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/README.md
deleted file mode 100644
index 5a76b4149c5eb5..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# core-util-is
-
-The `util.is*` functions introduced in Node v0.12.
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/float.patch b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/float.patch
deleted file mode 100644
index a06d5c05f75fd5..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/float.patch
+++ /dev/null
@@ -1,604 +0,0 @@
-diff --git a/lib/util.js b/lib/util.js
-index a03e874..9074e8e 100644
---- a/lib/util.js
-+++ b/lib/util.js
-@@ -19,430 +19,6 @@
- // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- // USE OR OTHER DEALINGS IN THE SOFTWARE.
-
--var formatRegExp = /%[sdj%]/g;
--exports.format = function(f) {
--  if (!isString(f)) {
--    var objects = [];
--    for (var i = 0; i < arguments.length; i++) {
--      objects.push(inspect(arguments[i]));
--    }
--    return objects.join(' ');
--  }
--
--  var i = 1;
--  var args = arguments;
--  var len = args.length;
--  var str = String(f).replace(formatRegExp, function(x) {
--    if (x === '%%') return '%';
--    if (i >= len) return x;
--    switch (x) {
--      case '%s': return String(args[i++]);
--      case '%d': return Number(args[i++]);
--      case '%j':
--        try {
--          return JSON.stringify(args[i++]);
--        } catch (_) {
--          return '[Circular]';
--        }
--      default:
--        return x;
--    }
--  });
--  for (var x = args[i]; i < len; x = args[++i]) {
--    if (isNull(x) || !isObject(x)) {
--      str += ' ' + x;
--    } else {
--      str += ' ' + inspect(x);
--    }
--  }
--  return str;
--};
--
--
--// Mark that a method should not be used.
--// Returns a modified function which warns once by default.
--// If --no-deprecation is set, then it is a no-op.
--exports.deprecate = function(fn, msg) {
--  // Allow for deprecating things in the process of starting up.
--  if (isUndefined(global.process)) {
--    return function() {
--      return exports.deprecate(fn, msg).apply(this, arguments);
--    };
--  }
--
--  if (process.noDeprecation === true) {
--    return fn;
--  }
--
--  var warned = false;
--  function deprecated() {
--    if (!warned) {
--      if (process.throwDeprecation) {
--        throw new Error(msg);
--      } else if (process.traceDeprecation) {
--        console.trace(msg);
--      } else {
--        console.error(msg);
--      }
--      warned = true;
--    }
--    return fn.apply(this, arguments);
--  }
--
--  return deprecated;
--};
--
--
--var debugs = {};
--var debugEnviron;
--exports.debuglog = function(set) {
--  if (isUndefined(debugEnviron))
--    debugEnviron = process.env.NODE_DEBUG || '';
--  set = set.toUpperCase();
--  if (!debugs[set]) {
--    if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
--      var pid = process.pid;
--      debugs[set] = function() {
--        var msg = exports.format.apply(exports, arguments);
--        console.error('%s %d: %s', set, pid, msg);
--      };
--    } else {
--      debugs[set] = function() {};
--    }
--  }
--  return debugs[set];
--};
--
--
--/**
-- * Echos the value of a value. Trys to print the value out
-- * in the best way possible given the different types.
-- *
-- * @param {Object} obj The object to print out.
-- * @param {Object} opts Optional options object that alters the output.
-- */
--/* legacy: obj, showHidden, depth, colors*/
--function inspect(obj, opts) {
--  // default options
--  var ctx = {
--    seen: [],
--    stylize: stylizeNoColor
--  };
--  // legacy...
--  if (arguments.length >= 3) ctx.depth = arguments[2];
--  if (arguments.length >= 4) ctx.colors = arguments[3];
--  if (isBoolean(opts)) {
--    // legacy...
--    ctx.showHidden = opts;
--  } else if (opts) {
--    // got an "options" object
--    exports._extend(ctx, opts);
--  }
--  // set default options
--  if (isUndefined(ctx.showHidden)) ctx.showHidden = false;
--  if (isUndefined(ctx.depth)) ctx.depth = 2;
--  if (isUndefined(ctx.colors)) ctx.colors = false;
--  if (isUndefined(ctx.customInspect)) ctx.customInspect = true;
--  if (ctx.colors) ctx.stylize = stylizeWithColor;
--  return formatValue(ctx, obj, ctx.depth);
--}
--exports.inspect = inspect;
--
--
--// http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
--inspect.colors = {
--  'bold' : [1, 22],
--  'italic' : [3, 23],
--  'underline' : [4, 24],
--  'inverse' : [7, 27],
--  'white' : [37, 39],
--  'grey' : [90, 39],
--  'black' : [30, 39],
--  'blue' : [34, 39],
--  'cyan' : [36, 39],
--  'green' : [32, 39],
--  'magenta' : [35, 39],
--  'red' : [31, 39],
--  'yellow' : [33, 39]
--};
--
--// Don't use 'blue' not visible on cmd.exe
--inspect.styles = {
--  'special': 'cyan',
--  'number': 'yellow',
--  'boolean': 'yellow',
--  'undefined': 'grey',
--  'null': 'bold',
--  'string': 'green',
--  'date': 'magenta',
--  // "name": intentionally not styling
--  'regexp': 'red'
--};
--
--
--function stylizeWithColor(str, styleType) {
--  var style = inspect.styles[styleType];
--
--  if (style) {
--    return '\u001b[' + inspect.colors[style][0] + 'm' + str +
--           '\u001b[' + inspect.colors[style][1] + 'm';
--  } else {
--    return str;
--  }
--}
--
--
--function stylizeNoColor(str, styleType) {
--  return str;
--}
--
--
--function arrayToHash(array) {
--  var hash = {};
--
--  array.forEach(function(val, idx) {
--    hash[val] = true;
--  });
--
--  return hash;
--}
--
--
--function formatValue(ctx, value, recurseTimes) {
--  // Provide a hook for user-specified inspect functions.
--  // Check that value is an object with an inspect function on it
--  if (ctx.customInspect &&
--      value &&
--      isFunction(value.inspect) &&
--      // Filter out the util module, it's inspect function is special
--      value.inspect !== exports.inspect &&
--      // Also filter out any prototype objects using the circular check.
--      !(value.constructor && value.constructor.prototype === value)) {
--    var ret = value.inspect(recurseTimes, ctx);
--    if (!isString(ret)) {
--      ret = formatValue(ctx, ret, recurseTimes);
--    }
--    return ret;
--  }
--
--  // Primitive types cannot have properties
--  var primitive = formatPrimitive(ctx, value);
--  if (primitive) {
--    return primitive;
--  }
--
--  // Look up the keys of the object.
--  var keys = Object.keys(value);
--  var visibleKeys = arrayToHash(keys);
--
--  if (ctx.showHidden) {
--    keys = Object.getOwnPropertyNames(value);
--  }
--
--  // Some type of object without properties can be shortcutted.
--  if (keys.length === 0) {
--    if (isFunction(value)) {
--      var name = value.name ? ': ' + value.name : '';
--      return ctx.stylize('[Function' + name + ']', 'special');
--    }
--    if (isRegExp(value)) {
--      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
--    }
--    if (isDate(value)) {
--      return ctx.stylize(Date.prototype.toString.call(value), 'date');
--    }
--    if (isError(value)) {
--      return formatError(value);
--    }
--  }
--
--  var base = '', array = false, braces = ['{', '}'];
--
--  // Make Array say that they are Array
--  if (isArray(value)) {
--    array = true;
--    braces = ['[', ']'];
--  }
--
--  // Make functions say that they are functions
--  if (isFunction(value)) {
--    var n = value.name ? ': ' + value.name : '';
--    base = ' [Function' + n + ']';
--  }
--
--  // Make RegExps say that they are RegExps
--  if (isRegExp(value)) {
--    base = ' ' + RegExp.prototype.toString.call(value);
--  }
--
--  // Make dates with properties first say the date
--  if (isDate(value)) {
--    base = ' ' + Date.prototype.toUTCString.call(value);
--  }
--
--  // Make error with message first say the error
--  if (isError(value)) {
--    base = ' ' + formatError(value);
--  }
--
--  if (keys.length === 0 && (!array || value.length == 0)) {
--    return braces[0] + base + braces[1];
--  }
--
--  if (recurseTimes < 0) {
--    if (isRegExp(value)) {
--      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
--    } else {
--      return ctx.stylize('[Object]', 'special');
--    }
--  }
--
--  ctx.seen.push(value);
--
--  var output;
--  if (array) {
--    output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
--  } else {
--    output = keys.map(function(key) {
--      return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
--    });
--  }
--
--  ctx.seen.pop();
--
--  return reduceToSingleString(output, base, braces);
--}
--
--
--function formatPrimitive(ctx, value) {
--  if (isUndefined(value))
--    return ctx.stylize('undefined', 'undefined');
--  if (isString(value)) {
--    var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
--                                             .replace(/'/g, "\\'")
--                                             .replace(/\\"/g, '"') + '\'';
--    return ctx.stylize(simple, 'string');
--  }
--  if (isNumber(value)) {
--    // Format -0 as '-0'. Strict equality won't distinguish 0 from -0,
--    // so instead we use the fact that 1 / -0 < 0 whereas 1 / 0 > 0 .
--    if (value === 0 && 1 / value < 0)
--      return ctx.stylize('-0', 'number');
--    return ctx.stylize('' + value, 'number');
--  }
--  if (isBoolean(value))
--    return ctx.stylize('' + value, 'boolean');
--  // For some reason typeof null is "object", so special case here.
--  if (isNull(value))
--    return ctx.stylize('null', 'null');
--}
--
--
--function formatError(value) {
--  return '[' + Error.prototype.toString.call(value) + ']';
--}
--
--
--function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
--  var output = [];
--  for (var i = 0, l = value.length; i < l; ++i) {
--    if (hasOwnProperty(value, String(i))) {
--      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
--          String(i), true));
--    } else {
--      output.push('');
--    }
--  }
--  keys.forEach(function(key) {
--    if (!key.match(/^\d+$/)) {
--      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
--          key, true));
--    }
--  });
--  return output;
--}
--
--
--function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
--  var name, str, desc;
--  desc = Object.getOwnPropertyDescriptor(value, key) || { value: value[key] };
--  if (desc.get) {
--    if (desc.set) {
--      str = ctx.stylize('[Getter/Setter]', 'special');
--    } else {
--      str = ctx.stylize('[Getter]', 'special');
--    }
--  } else {
--    if (desc.set) {
--      str = ctx.stylize('[Setter]', 'special');
--    }
--  }
--  if (!hasOwnProperty(visibleKeys, key)) {
--    name = '[' + key + ']';
--  }
--  if (!str) {
--    if (ctx.seen.indexOf(desc.value) < 0) {
--      if (isNull(recurseTimes)) {
--        str = formatValue(ctx, desc.value, null);
--      } else {
--        str = formatValue(ctx, desc.value, recurseTimes - 1);
--      }
--      if (str.indexOf('\n') > -1) {
--        if (array) {
--          str = str.split('\n').map(function(line) {
--            return '  ' + line;
--          }).join('\n').substr(2);
--        } else {
--          str = '\n' + str.split('\n').map(function(line) {
--            return '   ' + line;
--          }).join('\n');
--        }
--      }
--    } else {
--      str = ctx.stylize('[Circular]', 'special');
--    }
--  }
--  if (isUndefined(name)) {
--    if (array && key.match(/^\d+$/)) {
--      return str;
--    }
--    name = JSON.stringify('' + key);
--    if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
--      name = name.substr(1, name.length - 2);
--      name = ctx.stylize(name, 'name');
--    } else {
--      name = name.replace(/'/g, "\\'")
--                 .replace(/\\"/g, '"')
--                 .replace(/(^"|"$)/g, "'");
--      name = ctx.stylize(name, 'string');
--    }
--  }
--
--  return name + ': ' + str;
--}
--
--
--function reduceToSingleString(output, base, braces) {
--  var numLinesEst = 0;
--  var length = output.reduce(function(prev, cur) {
--    numLinesEst++;
--    if (cur.indexOf('\n') >= 0) numLinesEst++;
--    return prev + cur.replace(/\u001b\[\d\d?m/g, '').length + 1;
--  }, 0);
--
--  if (length > 60) {
--    return braces[0] +
--           (base === '' ? '' : base + '\n ') +
--           ' ' +
--           output.join(',\n  ') +
--           ' ' +
--           braces[1];
--  }
--
--  return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
--}
--
--
- // NOTE: These type checking functions intentionally don't use `instanceof`
- // because it is fragile and can be easily faked with `Object.create()`.
- function isArray(ar) {
-@@ -522,166 +98,10 @@ function isPrimitive(arg) {
- exports.isPrimitive = isPrimitive;
-
- function isBuffer(arg) {
--  return arg instanceof Buffer;
-+  return Buffer.isBuffer(arg);
- }
- exports.isBuffer = isBuffer;
-
- function objectToString(o) {
-   return Object.prototype.toString.call(o);
--}
--
--
--function pad(n) {
--  return n < 10 ? '0' + n.toString(10) : n.toString(10);
--}
--
--
--var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',
--              'Oct', 'Nov', 'Dec'];
--
--// 26 Feb 16:19:34
--function timestamp() {
--  var d = new Date();
--  var time = [pad(d.getHours()),
--              pad(d.getMinutes()),
--              pad(d.getSeconds())].join(':');
--  return [d.getDate(), months[d.getMonth()], time].join(' ');
--}
--
--
--// log is just a thin wrapper to console.log that prepends a timestamp
--exports.log = function() {
--  console.log('%s - %s', timestamp(), exports.format.apply(exports, arguments));
--};
--
--
--/**
-- * Inherit the prototype methods from one constructor into another.
-- *
-- * The Function.prototype.inherits from lang.js rewritten as a standalone
-- * function (not on Function.prototype). NOTE: If this file is to be loaded
-- * during bootstrapping this function needs to be rewritten using some native
-- * functions as prototype setup using normal JavaScript does not work as
-- * expected during bootstrapping (see mirror.js in r114903).
-- *
-- * @param {function} ctor Constructor function which needs to inherit the
-- *     prototype.
-- * @param {function} superCtor Constructor function to inherit prototype from.
-- */
--exports.inherits = function(ctor, superCtor) {
--  ctor.super_ = superCtor;
--  ctor.prototype = Object.create(superCtor.prototype, {
--    constructor: {
--      value: ctor,
--      enumerable: false,
--      writable: true,
--      configurable: true
--    }
--  });
--};
--
--exports._extend = function(origin, add) {
--  // Don't do anything if add isn't an object
--  if (!add || !isObject(add)) return origin;
--
--  var keys = Object.keys(add);
--  var i = keys.length;
--  while (i--) {
--    origin[keys[i]] = add[keys[i]];
--  }
--  return origin;
--};
--
--function hasOwnProperty(obj, prop) {
--  return Object.prototype.hasOwnProperty.call(obj, prop);
--}
--
--
--// Deprecated old stuff.
--
--exports.p = exports.deprecate(function() {
--  for (var i = 0, len = arguments.length; i < len; ++i) {
--    console.error(exports.inspect(arguments[i]));
--  }
--}, 'util.p: Use console.error() instead');
--
--
--exports.exec = exports.deprecate(function() {
--  return require('child_process').exec.apply(this, arguments);
--}, 'util.exec is now called `child_process.exec`.');
--
--
--exports.print = exports.deprecate(function() {
--  for (var i = 0, len = arguments.length; i < len; ++i) {
--    process.stdout.write(String(arguments[i]));
--  }
--}, 'util.print: Use console.log instead');
--
--
--exports.puts = exports.deprecate(function() {
--  for (var i = 0, len = arguments.length; i < len; ++i) {
--    process.stdout.write(arguments[i] + '\n');
--  }
--}, 'util.puts: Use console.log instead');
--
--
--exports.debug = exports.deprecate(function(x) {
--  process.stderr.write('DEBUG: ' + x + '\n');
--}, 'util.debug: Use console.error instead');
--
--
--exports.error = exports.deprecate(function(x) {
--  for (var i = 0, len = arguments.length; i < len; ++i) {
--    process.stderr.write(arguments[i] + '\n');
--  }
--}, 'util.error: Use console.error instead');
--
--
--exports.pump = exports.deprecate(function(readStream, writeStream, callback) {
--  var callbackCalled = false;
--
--  function call(a, b, c) {
--    if (callback && !callbackCalled) {
--      callback(a, b, c);
--      callbackCalled = true;
--    }
--  }
--
--  readStream.addListener('data', function(chunk) {
--    if (writeStream.write(chunk) === false) readStream.pause();
--  });
--
--  writeStream.addListener('drain', function() {
--    readStream.resume();
--  });
--
--  readStream.addListener('end', function() {
--    writeStream.end();
--  });
--
--  readStream.addListener('close', function() {
--    call();
--  });
--
--  readStream.addListener('error', function(err) {
--    writeStream.end();
--    call(err);
--  });
--
--  writeStream.addListener('error', function(err) {
--    readStream.destroy();
--    call(err);
--  });
--}, 'util.pump(): Use readableStream.pipe() instead');
--
--
--var uv;
--exports._errnoException = function(err, syscall) {
--  if (isUndefined(uv)) uv = process.binding('uv');
--  var errname = uv.errname(err);
--  var e = new Error(syscall + ' ' + errname);
--  e.code = errname;
--  e.errno = errname;
--  e.syscall = syscall;
--  return e;
--};
-+}
\ No newline at end of file
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/lib/util.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
deleted file mode 100644
index 9074e8ebcb61e9..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-// NOTE: These type checking functions intentionally don't use `instanceof`
-// because it is fragile and can be easily faked with `Object.create()`.
-function isArray(ar) {
-  return Array.isArray(ar);
-}
-exports.isArray = isArray;
-
-function isBoolean(arg) {
-  return typeof arg === 'boolean';
-}
-exports.isBoolean = isBoolean;
-
-function isNull(arg) {
-  return arg === null;
-}
-exports.isNull = isNull;
-
-function isNullOrUndefined(arg) {
-  return arg == null;
-}
-exports.isNullOrUndefined = isNullOrUndefined;
-
-function isNumber(arg) {
-  return typeof arg === 'number';
-}
-exports.isNumber = isNumber;
-
-function isString(arg) {
-  return typeof arg === 'string';
-}
-exports.isString = isString;
-
-function isSymbol(arg) {
-  return typeof arg === 'symbol';
-}
-exports.isSymbol = isSymbol;
-
-function isUndefined(arg) {
-  return arg === void 0;
-}
-exports.isUndefined = isUndefined;
-
-function isRegExp(re) {
-  return isObject(re) && objectToString(re) === '[object RegExp]';
-}
-exports.isRegExp = isRegExp;
-
-function isObject(arg) {
-  return typeof arg === 'object' && arg !== null;
-}
-exports.isObject = isObject;
-
-function isDate(d) {
-  return isObject(d) && objectToString(d) === '[object Date]';
-}
-exports.isDate = isDate;
-
-function isError(e) {
-  return isObject(e) &&
-      (objectToString(e) === '[object Error]' || e instanceof Error);
-}
-exports.isError = isError;
-
-function isFunction(arg) {
-  return typeof arg === 'function';
-}
-exports.isFunction = isFunction;
-
-function isPrimitive(arg) {
-  return arg === null ||
-         typeof arg === 'boolean' ||
-         typeof arg === 'number' ||
-         typeof arg === 'string' ||
-         typeof arg === 'symbol' ||  // ES6 symbol
-         typeof arg === 'undefined';
-}
-exports.isPrimitive = isPrimitive;
-
-function isBuffer(arg) {
-  return Buffer.isBuffer(arg);
-}
-exports.isBuffer = isBuffer;
-
-function objectToString(o) {
-  return Object.prototype.toString.call(o);
-}
\ No newline at end of file
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/package.json b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/package.json
deleted file mode 100644
index 466dfdfe0139b3..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/package.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "name": "core-util-is",
-  "version": "1.0.1",
-  "description": "The `util.is*` functions introduced in Node v0.12.",
-  "main": "lib/util.js",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/core-util-is.git"
-  },
-  "keywords": [
-    "util",
-    "isBuffer",
-    "isArray",
-    "isNumber",
-    "isString",
-    "isRegExp",
-    "isThis",
-    "isThat",
-    "polyfill"
-  ],
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
-  },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/isaacs/core-util-is/issues"
-  },
-  "readme": "# core-util-is\n\nThe `util.is*` functions introduced in Node v0.12.\n",
-  "readmeFilename": "README.md",
-  "homepage": "https://github.com/isaacs/core-util-is",
-  "_id": "core-util-is@1.0.1",
-  "dist": {
-    "shasum": "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538",
-    "tarball": "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-  },
-  "_from": "core-util-is@>=1.0.0 <1.1.0",
-  "_npmVersion": "1.3.23",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "i@izs.me"
-  },
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "directories": {},
-  "_shasum": "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538",
-  "_resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/util.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/util.js
deleted file mode 100644
index 007fa10575636d..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/util.js
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-// NOTE: These type checking functions intentionally don't use `instanceof`
-// because it is fragile and can be easily faked with `Object.create()`.
-function isArray(ar) {
-  return Array.isArray(ar);
-}
-exports.isArray = isArray;
-
-function isBoolean(arg) {
-  return typeof arg === 'boolean';
-}
-exports.isBoolean = isBoolean;
-
-function isNull(arg) {
-  return arg === null;
-}
-exports.isNull = isNull;
-
-function isNullOrUndefined(arg) {
-  return arg == null;
-}
-exports.isNullOrUndefined = isNullOrUndefined;
-
-function isNumber(arg) {
-  return typeof arg === 'number';
-}
-exports.isNumber = isNumber;
-
-function isString(arg) {
-  return typeof arg === 'string';
-}
-exports.isString = isString;
-
-function isSymbol(arg) {
-  return typeof arg === 'symbol';
-}
-exports.isSymbol = isSymbol;
-
-function isUndefined(arg) {
-  return arg === void 0;
-}
-exports.isUndefined = isUndefined;
-
-function isRegExp(re) {
-  return isObject(re) && objectToString(re) === '[object RegExp]';
-}
-exports.isRegExp = isRegExp;
-
-function isObject(arg) {
-  return typeof arg === 'object' && arg !== null;
-}
-exports.isObject = isObject;
-
-function isDate(d) {
-  return isObject(d) && objectToString(d) === '[object Date]';
-}
-exports.isDate = isDate;
-
-function isError(e) {
-  return isObject(e) && objectToString(e) === '[object Error]';
-}
-exports.isError = isError;
-
-function isFunction(arg) {
-  return typeof arg === 'function';
-}
-exports.isFunction = isFunction;
-
-function isPrimitive(arg) {
-  return arg === null ||
-         typeof arg === 'boolean' ||
-         typeof arg === 'number' ||
-         typeof arg === 'string' ||
-         typeof arg === 'symbol' ||  // ES6 symbol
-         typeof arg === 'undefined';
-}
-exports.isPrimitive = isPrimitive;
-
-function isBuffer(arg) {
-  return arg instanceof Buffer;
-}
-exports.isBuffer = isBuffer;
-
-function objectToString(o) {
-  return Object.prototype.toString.call(o);
-}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/README.md b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/README.md
deleted file mode 100644
index 052a62b8d7b7ae..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/README.md
+++ /dev/null
@@ -1,54 +0,0 @@
-
-# isarray
-
-`Array#isArray` for older browsers.
-
-## Usage
-
-```js
-var isArray = require('isarray');
-
-console.log(isArray([])); // => true
-console.log(isArray({})); // => false
-```
-
-## Installation
-
-With [npm](http://npmjs.org) do
-
-```bash
-$ npm install isarray
-```
-
-Then bundle for the browser with
-[browserify](https://github.com/substack/browserify).
-
-With [component](http://component.io) do
-
-```bash
-$ component install juliangruber/isarray
-```
-
-## License
-
-(MIT)
-
-Copyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/build/build.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/build/build.js
deleted file mode 100644
index e1856ef0943728..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/build/build.js
+++ /dev/null
@@ -1,208 +0,0 @@
-
-/**
- * Require the given path.
- *
- * @param {String} path
- * @return {Object} exports
- * @api public
- */
-
-function require(path, parent, orig) {
-  var resolved = require.resolve(path);
-
-  // lookup failed
-  if (null == resolved) {
-    orig = orig || path;
-    parent = parent || 'root';
-    var err = new Error('Failed to require "' + orig + '" from "' + parent + '"');
-    err.path = orig;
-    err.parent = parent;
-    err.require = true;
-    throw err;
-  }
-
-  var module = require.modules[resolved];
-
-  // perform real require()
-  // by invoking the module's
-  // registered function
-  if (!module.exports) {
-    module.exports = {};
-    module.client = module.component = true;
-    module.call(this, module.exports, require.relative(resolved), module);
-  }
-
-  return module.exports;
-}
-
-/**
- * Registered modules.
- */
-
-require.modules = {};
-
-/**
- * Registered aliases.
- */
-
-require.aliases = {};
-
-/**
- * Resolve `path`.
- *
- * Lookup:
- *
- *   - PATH/index.js
- *   - PATH.js
- *   - PATH
- *
- * @param {String} path
- * @return {String} path or null
- * @api private
- */
-
-require.resolve = function(path) {
-  if (path.charAt(0) === '/') path = path.slice(1);
-  var index = path + '/index.js';
-
-  var paths = [
-    path,
-    path + '.js',
-    path + '.json',
-    path + '/index.js',
-    path + '/index.json'
-  ];
-
-  for (var i = 0; i < paths.length; i++) {
-    var path = paths[i];
-    if (require.modules.hasOwnProperty(path)) return path;
-  }
-
-  if (require.aliases.hasOwnProperty(index)) {
-    return require.aliases[index];
-  }
-};
-
-/**
- * Normalize `path` relative to the current path.
- *
- * @param {String} curr
- * @param {String} path
- * @return {String}
- * @api private
- */
-
-require.normalize = function(curr, path) {
-  var segs = [];
-
-  if ('.' != path.charAt(0)) return path;
-
-  curr = curr.split('/');
-  path = path.split('/');
-
-  for (var i = 0; i < path.length; ++i) {
-    if ('..' == path[i]) {
-      curr.pop();
-    } else if ('.' != path[i] && '' != path[i]) {
-      segs.push(path[i]);
-    }
-  }
-
-  return curr.concat(segs).join('/');
-};
-
-/**
- * Register module at `path` with callback `definition`.
- *
- * @param {String} path
- * @param {Function} definition
- * @api private
- */
-
-require.register = function(path, definition) {
-  require.modules[path] = definition;
-};
-
-/**
- * Alias a module definition.
- *
- * @param {String} from
- * @param {String} to
- * @api private
- */
-
-require.alias = function(from, to) {
-  if (!require.modules.hasOwnProperty(from)) {
-    throw new Error('Failed to alias "' + from + '", it does not exist');
-  }
-  require.aliases[to] = from;
-};
-
-/**
- * Return a require function relative to the `parent` path.
- *
- * @param {String} parent
- * @return {Function}
- * @api private
- */
-
-require.relative = function(parent) {
-  var p = require.normalize(parent, '..');
-
-  /**
-   * lastIndexOf helper.
-   */
-
-  function lastIndexOf(arr, obj) {
-    var i = arr.length;
-    while (i--) {
-      if (arr[i] === obj) return i;
-    }
-    return -1;
-  }
-
-  /**
-   * The relative require() itself.
-   */
-
-  function localRequire(path) {
-    var resolved = localRequire.resolve(path);
-    return require(resolved, parent, path);
-  }
-
-  /**
-   * Resolve relative to the parent.
-   */
-
-  localRequire.resolve = function(path) {
-    var c = path.charAt(0);
-    if ('/' == c) return path.slice(1);
-    if ('.' == c) return require.normalize(p, path);
-
-    // resolve deps by returning
-    // the dep in the nearest "deps"
-    // directory
-    var segs = parent.split('/');
-    var i = lastIndexOf(segs, 'deps') + 1;
-    if (!i) i = 0;
-    path = segs.slice(0, i + 1).join('/') + '/deps/' + path;
-    return path;
-  };
-
-  /**
-   * Check if module is defined at `path`.
-   */
-
-  localRequire.exists = function(path) {
-    return require.modules.hasOwnProperty(localRequire.resolve(path));
-  };
-
-  return localRequire;
-};
-require.register("isarray/index.js", function(exports, require, module){
-module.exports = Array.isArray || function (arr) {
-  return Object.prototype.toString.call(arr) == '[object Array]';
-};
-
-});
-require.alias("isarray/index.js", "isarray/index.js");
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/component.json b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/component.json
deleted file mode 100644
index 9e31b683889015..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/component.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name" : "isarray",
-  "description" : "Array#isArray for older browsers",
-  "version" : "0.0.1",
-  "repository" : "juliangruber/isarray",
-  "homepage": "https://github.com/juliangruber/isarray",
-  "main" : "index.js",
-  "scripts" : [
-    "index.js"
-  ],
-  "dependencies" : {},
-  "keywords": ["browser","isarray","array"],
-  "author": {
-    "name": "Julian Gruber",
-    "email": "mail@juliangruber.com",
-    "url": "http://juliangruber.com"
-  },
-  "license": "MIT"
-}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/index.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/index.js
deleted file mode 100644
index 5f5ad45d46dda9..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = Array.isArray || function (arr) {
-  return Object.prototype.toString.call(arr) == '[object Array]';
-};
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json
deleted file mode 100644
index 19228ab6fdcaaf..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "name": "isarray",
-  "description": "Array#isArray for older browsers",
-  "version": "0.0.1",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/juliangruber/isarray.git"
-  },
-  "homepage": "https://github.com/juliangruber/isarray",
-  "main": "index.js",
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "tap": "*"
-  },
-  "keywords": [
-    "browser",
-    "isarray",
-    "array"
-  ],
-  "author": {
-    "name": "Julian Gruber",
-    "email": "mail@juliangruber.com",
-    "url": "http://juliangruber.com"
-  },
-  "license": "MIT",
-  "_id": "isarray@0.0.1",
-  "dist": {
-    "shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf",
-    "tarball": "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-  },
-  "_from": "isarray@0.0.1",
-  "_npmVersion": "1.2.18",
-  "_npmUser": {
-    "name": "juliangruber",
-    "email": "julian@juliangruber.com"
-  },
-  "maintainers": [
-    {
-      "name": "juliangruber",
-      "email": "julian@juliangruber.com"
-    }
-  ],
-  "directories": {},
-  "_shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf",
-  "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-  "bugs": {
-    "url": "https://github.com/juliangruber/isarray/issues"
-  },
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml
deleted file mode 100644
index 5ac98855343cee..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-language: node_js
-node_js:
-  - "0.8"
-  - "0.10"
-  - "0.11"
-  - "0.12"
-  - "iojs"
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/index.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/index.js
deleted file mode 100644
index 049521cad7ba1b..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use strict';
-module.exports = nextTick;
-
-function nextTick(fn) {
-  var args = new Array(arguments.length - 1);
-  var i = 0;
-  while (i < args.length) {
-    args[i++] = arguments[i];
-  }
-  process.nextTick(function afterTick() {
-    fn.apply(null, args);
-  });
-}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/package.json b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/package.json
deleted file mode 100644
index 087586e8f8cedd..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/package.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "name": "process-nextick-args",
-  "version": "1.0.3",
-  "description": "process.nextTick but always with args",
-  "main": "index.js",
-  "scripts": {
-    "test": "node test.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/calvinmetcalf/process-nextick-args.git"
-  },
-  "author": "",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/calvinmetcalf/process-nextick-args/issues"
-  },
-  "homepage": "https://github.com/calvinmetcalf/process-nextick-args",
-  "devDependencies": {
-    "tap": "~0.2.6"
-  },
-  "gitHead": "e855846a69662b9489f1ad3dde1ebf2ccc4370b8",
-  "_id": "process-nextick-args@1.0.3",
-  "_shasum": "e272eed825d5e9f4ea74d8d73b1fe311c3beb630",
-  "_from": "process-nextick-args@>=1.0.0 <1.1.0",
-  "_npmVersion": "2.9.0",
-  "_nodeVersion": "2.5.0",
-  "_npmUser": {
-    "name": "cwmma",
-    "email": "calvin.metcalf@gmail.com"
-  },
-  "dist": {
-    "shasum": "e272eed825d5e9f4ea74d8d73b1fe311c3beb630",
-    "tarball": "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
-  },
-  "maintainers": [
-    {
-      "name": "cwmma",
-      "email": "calvin.metcalf@gmail.com"
-    }
-  ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/readme.md b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/readme.md
deleted file mode 100644
index 78e7cfaeb7acde..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-process-nextick-args
-=====
-
-[![Build Status](https://travis-ci.org/calvinmetcalf/process-nextick-args.svg?branch=master)](https://travis-ci.org/calvinmetcalf/process-nextick-args)
-
-```bash
-npm install --save process-nextick-args
-```
-
-Always be able to pass arguments to process.nextTick, no matter the platform
-
-```js
-var nextTick = require('process-nextick-args');
-
-nextTick(function (a, b, c) {
-  console.log(a, b, c);
-}, 'step', 3,  'profit');
-```
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/test.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/test.js
deleted file mode 100644
index ef15721584ac99..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var test = require("tap").test;
-var nextTick = require('./');
-
-test('should work', function (t) {
-  t.plan(5);
-  nextTick(function (a) {
-    t.ok(a);
-    nextTick(function (thing) {
-      t.equals(thing, 7);
-    }, 7);
-  }, true);
-  nextTick(function (a, b, c) {
-    t.equals(a, 'step');
-    t.equals(b, 3);
-    t.equals(c, 'profit');
-  }, 'step', 3,  'profit');
-});
-
-test('correct number of arguments', function (t) {
-  t.plan(1);
-  nextTick(function () {
-    t.equals(2, arguments.length, 'correct number');
-  }, 1, 2);
-});
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/.npmignore b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/.npmignore
deleted file mode 100644
index 206320cc1d21b9..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build
-test
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/LICENSE b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/LICENSE
deleted file mode 100644
index 6de584a48f5c89..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright Joyent, Inc. and other Node contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons to whom the Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/README.md b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/README.md
deleted file mode 100644
index 4d2aa001501107..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-**string_decoder.js** (`require('string_decoder')`) from Node.js core
-
-Copyright Joyent, Inc. and other Node contributors. See LICENCE file for details.
-
-Version numbers match the versions found in Node core, e.g. 0.10.24 matches Node 0.10.24, likewise 0.11.10 matches Node 0.11.10. **Prefer the stable version over the unstable.**
-
-The *build/* directory contains a build script that will scrape the source from the [joyent/node](https://github.com/joyent/node) repo given a specific Node version.
\ No newline at end of file
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/index.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/index.js
deleted file mode 100644
index b00e54fb790982..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/index.js
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-var Buffer = require('buffer').Buffer;
-
-var isBufferEncoding = Buffer.isEncoding
-  || function(encoding) {
-       switch (encoding && encoding.toLowerCase()) {
-         case 'hex': case 'utf8': case 'utf-8': case 'ascii': case 'binary': case 'base64': case 'ucs2': case 'ucs-2': case 'utf16le': case 'utf-16le': case 'raw': return true;
-         default: return false;
-       }
-     }
-
-
-function assertEncoding(encoding) {
-  if (encoding && !isBufferEncoding(encoding)) {
-    throw new Error('Unknown encoding: ' + encoding);
-  }
-}
-
-// StringDecoder provides an interface for efficiently splitting a series of
-// buffers into a series of JS strings without breaking apart multi-byte
-// characters. CESU-8 is handled as part of the UTF-8 encoding.
-//
-// @TODO Handling all encodings inside a single object makes it very difficult
-// to reason about this code, so it should be split up in the future.
-// @TODO There should be a utf8-strict encoding that rejects invalid UTF-8 code
-// points as used by CESU-8.
-var StringDecoder = exports.StringDecoder = function(encoding) {
-  this.encoding = (encoding || 'utf8').toLowerCase().replace(/[-_]/, '');
-  assertEncoding(encoding);
-  switch (this.encoding) {
-    case 'utf8':
-      // CESU-8 represents each of Surrogate Pair by 3-bytes
-      this.surrogateSize = 3;
-      break;
-    case 'ucs2':
-    case 'utf16le':
-      // UTF-16 represents each of Surrogate Pair by 2-bytes
-      this.surrogateSize = 2;
-      this.detectIncompleteChar = utf16DetectIncompleteChar;
-      break;
-    case 'base64':
-      // Base-64 stores 3 bytes in 4 chars, and pads the remainder.
-      this.surrogateSize = 3;
-      this.detectIncompleteChar = base64DetectIncompleteChar;
-      break;
-    default:
-      this.write = passThroughWrite;
-      return;
-  }
-
-  // Enough space to store all bytes of a single character. UTF-8 needs 4
-  // bytes, but CESU-8 may require up to 6 (3 bytes per surrogate).
-  this.charBuffer = new Buffer(6);
-  // Number of bytes received for the current incomplete multi-byte character.
-  this.charReceived = 0;
-  // Number of bytes expected for the current incomplete multi-byte character.
-  this.charLength = 0;
-};
-
-
-// write decodes the given buffer and returns it as JS string that is
-// guaranteed to not contain any partial multi-byte characters. Any partial
-// character found at the end of the buffer is buffered up, and will be
-// returned when calling write again with the remaining bytes.
-//
-// Note: Converting a Buffer containing an orphan surrogate to a String
-// currently works, but converting a String to a Buffer (via `new Buffer`, or
-// Buffer#write) will replace incomplete surrogates with the unicode
-// replacement character. See https://codereview.chromium.org/121173009/ .
-StringDecoder.prototype.write = function(buffer) {
-  var charStr = '';
-  // if our last write ended with an incomplete multibyte character
-  while (this.charLength) {
-    // determine how many remaining bytes this buffer has to offer for this char
-    var available = (buffer.length >= this.charLength - this.charReceived) ?
-        this.charLength - this.charReceived :
-        buffer.length;
-
-    // add the new bytes to the char buffer
-    buffer.copy(this.charBuffer, this.charReceived, 0, available);
-    this.charReceived += available;
-
-    if (this.charReceived < this.charLength) {
-      // still not enough chars in this buffer? wait for more ...
-      return '';
-    }
-
-    // remove bytes belonging to the current character from the buffer
-    buffer = buffer.slice(available, buffer.length);
-
-    // get the character that was split
-    charStr = this.charBuffer.slice(0, this.charLength).toString(this.encoding);
-
-    // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character
-    var charCode = charStr.charCodeAt(charStr.length - 1);
-    if (charCode >= 0xD800 && charCode <= 0xDBFF) {
-      this.charLength += this.surrogateSize;
-      charStr = '';
-      continue;
-    }
-    this.charReceived = this.charLength = 0;
-
-    // if there are no more bytes in this buffer, just emit our char
-    if (buffer.length === 0) {
-      return charStr;
-    }
-    break;
-  }
-
-  // determine and set charLength / charReceived
-  this.detectIncompleteChar(buffer);
-
-  var end = buffer.length;
-  if (this.charLength) {
-    // buffer the incomplete character bytes we got
-    buffer.copy(this.charBuffer, 0, buffer.length - this.charReceived, end);
-    end -= this.charReceived;
-  }
-
-  charStr += buffer.toString(this.encoding, 0, end);
-
-  var end = charStr.length - 1;
-  var charCode = charStr.charCodeAt(end);
-  // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character
-  if (charCode >= 0xD800 && charCode <= 0xDBFF) {
-    var size = this.surrogateSize;
-    this.charLength += size;
-    this.charReceived += size;
-    this.charBuffer.copy(this.charBuffer, size, 0, size);
-    buffer.copy(this.charBuffer, 0, 0, size);
-    return charStr.substring(0, end);
-  }
-
-  // or just emit the charStr
-  return charStr;
-};
-
-// detectIncompleteChar determines if there is an incomplete UTF-8 character at
-// the end of the given buffer. If so, it sets this.charLength to the byte
-// length that character, and sets this.charReceived to the number of bytes
-// that are available for this character.
-StringDecoder.prototype.detectIncompleteChar = function(buffer) {
-  // determine how many bytes we have to check at the end of this buffer
-  var i = (buffer.length >= 3) ? 3 : buffer.length;
-
-  // Figure out if one of the last i bytes of our buffer announces an
-  // incomplete char.
-  for (; i > 0; i--) {
-    var c = buffer[buffer.length - i];
-
-    // See http://en.wikipedia.org/wiki/UTF-8#Description
-
-    // 110XXXXX
-    if (i == 1 && c >> 5 == 0x06) {
-      this.charLength = 2;
-      break;
-    }
-
-    // 1110XXXX
-    if (i <= 2 && c >> 4 == 0x0E) {
-      this.charLength = 3;
-      break;
-    }
-
-    // 11110XXX
-    if (i <= 3 && c >> 3 == 0x1E) {
-      this.charLength = 4;
-      break;
-    }
-  }
-  this.charReceived = i;
-};
-
-StringDecoder.prototype.end = function(buffer) {
-  var res = '';
-  if (buffer && buffer.length)
-    res = this.write(buffer);
-
-  if (this.charReceived) {
-    var cr = this.charReceived;
-    var buf = this.charBuffer;
-    var enc = this.encoding;
-    res += buf.slice(0, cr).toString(enc);
-  }
-
-  return res;
-};
-
-function passThroughWrite(buffer) {
-  return buffer.toString(this.encoding);
-}
-
-function utf16DetectIncompleteChar(buffer) {
-  this.charReceived = buffer.length % 2;
-  this.charLength = this.charReceived ? 2 : 0;
-}
-
-function base64DetectIncompleteChar(buffer) {
-  this.charReceived = buffer.length % 3;
-  this.charLength = this.charReceived ? 3 : 0;
-}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/History.md b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/History.md
deleted file mode 100644
index ec010299b1b259..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/History.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-1.0.1 / 2014-11-25
-==================
-
-  * browser: use `console.warn()` for deprecation calls
-  * browser: more jsdocs
-
-1.0.0 / 2014-04-30
-==================
-
-  * initial commit
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/LICENSE b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/LICENSE
deleted file mode 100644
index 6a60e8c225c9ba..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-(The MIT License)
-
-Copyright (c) 2014 Nathan Rajlich <nathan@tootallnate.net>
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/README.md b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/README.md
deleted file mode 100644
index 75622fa7c250a6..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-util-deprecate
-==============
-### The Node.js `util.deprecate()` function with browser support
-
-In Node.js, this module simply re-exports the `util.deprecate()` function.
-
-In the web browser (i.e. via browserify), a browser-specific implementation
-of the `util.deprecate()` function is used.
-
-
-## API
-
-A `deprecate()` function is the only thing exposed by this module.
-
-``` javascript
-// setup:
-exports.foo = deprecate(foo, 'foo() is deprecated, use bar() instead');
-
-
-// users see:
-foo();
-// foo() is deprecated, use bar() instead
-foo();
-foo();
-```
-
-
-## License
-
-(The MIT License)
-
-Copyright (c) 2014 Nathan Rajlich <nathan@tootallnate.net>
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/browser.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/browser.js
deleted file mode 100644
index 55fa5a4bc6056a..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/browser.js
+++ /dev/null
@@ -1,62 +0,0 @@
-
-/**
- * Module exports.
- */
-
-module.exports = deprecate;
-
-/**
- * Mark that a method should not be used.
- * Returns a modified function which warns once by default.
- *
- * If `localStorage.noDeprecation = true` is set, then it is a no-op.
- *
- * If `localStorage.throwDeprecation = true` is set, then deprecated functions
- * will throw an Error when invoked.
- *
- * If `localStorage.traceDeprecation = true` is set, then deprecated functions
- * will invoke `console.trace()` instead of `console.error()`.
- *
- * @param {Function} fn - the function to deprecate
- * @param {String} msg - the string to print to the console when `fn` is invoked
- * @returns {Function} a new "deprecated" version of `fn`
- * @api public
- */
-
-function deprecate (fn, msg) {
-  if (config('noDeprecation')) {
-    return fn;
-  }
-
-  var warned = false;
-  function deprecated() {
-    if (!warned) {
-      if (config('throwDeprecation')) {
-        throw new Error(msg);
-      } else if (config('traceDeprecation')) {
-        console.trace(msg);
-      } else {
-        console.warn(msg);
-      }
-      warned = true;
-    }
-    return fn.apply(this, arguments);
-  }
-
-  return deprecated;
-}
-
-/**
- * Checks `localStorage` for boolean values for the given `name`.
- *
- * @param {String} name
- * @returns {Boolean}
- * @api private
- */
-
-function config (name) {
-  if (!global.localStorage) return false;
-  var val = global.localStorage[name];
-  if (null == val) return false;
-  return String(val).toLowerCase() === 'true';
-}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/node.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/node.js
deleted file mode 100644
index 5e6fcff5ddd3fb..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/node.js
+++ /dev/null
@@ -1,6 +0,0 @@
-
-/**
- * For Node.js, simply re-export the core `util.deprecate` function.
- */
-
-module.exports = require('util').deprecate;
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/package.json b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/package.json
deleted file mode 100644
index ea487da0e43000..00000000000000
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/package.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "name": "util-deprecate",
-  "version": "1.0.1",
-  "description": "The Node.js `util.deprecate()` function with browser support",
-  "main": "node.js",
-  "browser": "browser.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/TooTallNate/util-deprecate.git"
-  },
-  "keywords": [
-    "util",
-    "deprecate",
-    "browserify",
-    "browser",
-    "node"
-  ],
-  "author": {
-    "name": "Nathan Rajlich",
-    "email": "nathan@tootallnate.net",
-    "url": "http://n8.io/"
-  },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/TooTallNate/util-deprecate/issues"
-  },
-  "homepage": "https://github.com/TooTallNate/util-deprecate",
-  "gitHead": "6e923f7d98a0afbe5b9c7db9d0f0029c1936746c",
-  "_id": "util-deprecate@1.0.1",
-  "_shasum": "3556a3d13c4c6aa7983d7e2425478197199b7881",
-  "_from": "util-deprecate@>=1.0.1 <1.1.0",
-  "_npmVersion": "1.4.28",
-  "_npmUser": {
-    "name": "tootallnate",
-    "email": "nathan@tootallnate.net"
-  },
-  "maintainers": [
-    {
-      "name": "tootallnate",
-      "email": "nathan@tootallnate.net"
-    }
-  ],
-  "dist": {
-    "shasum": "3556a3d13c4c6aa7983d7e2425478197199b7881",
-    "tarball": "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/index.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/index.js
deleted file mode 100644
index 4906755bc93573..00000000000000
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-'use strict';
-module.exports = function () {
-	return /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
-};
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/package.json
deleted file mode 100644
index 7fc07677a044ac..00000000000000
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/package.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  "name": "ansi-regex",
-  "version": "2.0.0",
-  "description": "Regular expression for matching ANSI escape codes",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sindresorhus/ansi-regex.git"
-  },
-  "author": {
-    "name": "Sindre Sorhus",
-    "email": "sindresorhus@gmail.com",
-    "url": "sindresorhus.com"
-  },
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    },
-    {
-      "name": "jbnicolai",
-      "email": "jappelman@xebia.com"
-    }
-  ],
-  "engines": {
-    "node": ">=0.10.0"
-  },
-  "scripts": {
-    "test": "mocha test/test.js",
-    "view-supported": "node test/viewCodes.js"
-  },
-  "files": [
-    "index.js"
-  ],
-  "keywords": [
-    "ansi",
-    "styles",
-    "color",
-    "colour",
-    "colors",
-    "terminal",
-    "console",
-    "cli",
-    "string",
-    "tty",
-    "escape",
-    "formatting",
-    "rgb",
-    "256",
-    "shell",
-    "xterm",
-    "command-line",
-    "text",
-    "regex",
-    "regexp",
-    "re",
-    "match",
-    "test",
-    "find",
-    "pattern"
-  ],
-  "devDependencies": {
-    "mocha": "*"
-  },
-  "gitHead": "57c3f2941a73079fa8b081e02a522e3d29913e2f",
-  "bugs": {
-    "url": "https://github.com/sindresorhus/ansi-regex/issues"
-  },
-  "homepage": "https://github.com/sindresorhus/ansi-regex",
-  "_id": "ansi-regex@2.0.0",
-  "_shasum": "c5061b6e0ef8a81775e50f5d66151bf6bf371107",
-  "_from": "ansi-regex@>=2.0.0 <3.0.0",
-  "_npmVersion": "2.11.2",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "name": "sindresorhus",
-    "email": "sindresorhus@gmail.com"
-  },
-  "dist": {
-    "shasum": "c5061b6e0ef8a81775e50f5d66151bf6bf371107",
-    "tarball": "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/readme.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/readme.md
deleted file mode 100644
index 1a4894ec1110e3..00000000000000
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/readme.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# ansi-regex [![Build Status](https://travis-ci.org/sindresorhus/ansi-regex.svg?branch=master)](https://travis-ci.org/sindresorhus/ansi-regex)
-
-> Regular expression for matching [ANSI escape codes](http://en.wikipedia.org/wiki/ANSI_escape_code)
-
-
-## Install
-
-```
-$ npm install --save ansi-regex
-```
-
-
-## Usage
-
-```js
-var ansiRegex = require('ansi-regex');
-
-ansiRegex().test('\u001b[4mcake\u001b[0m');
-//=> true
-
-ansiRegex().test('cake');
-//=> false
-
-'\u001b[4mcake\u001b[0m'.match(ansiRegex());
-//=> ['\u001b[4m', '\u001b[0m']
-```
-
-
-## License
-
-MIT © [Sindre Sorhus](http://sindresorhus.com)
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/index.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/index.js
deleted file mode 100644
index 099480fbfc54cb..00000000000000
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-'use strict';
-var ansiRegex = require('ansi-regex')();
-
-module.exports = function (str) {
-	return typeof str === 'string' ? str.replace(ansiRegex, '') : str;
-};
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/license b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/license
deleted file mode 100644
index 654d0bfe943437..00000000000000
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/license
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/index.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/index.js
deleted file mode 100644
index 4906755bc93573..00000000000000
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-'use strict';
-module.exports = function () {
-	return /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
-};
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/license b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/license
deleted file mode 100644
index 654d0bfe943437..00000000000000
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/license
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/package.json
deleted file mode 100644
index 7fc07677a044ac..00000000000000
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/package.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  "name": "ansi-regex",
-  "version": "2.0.0",
-  "description": "Regular expression for matching ANSI escape codes",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sindresorhus/ansi-regex.git"
-  },
-  "author": {
-    "name": "Sindre Sorhus",
-    "email": "sindresorhus@gmail.com",
-    "url": "sindresorhus.com"
-  },
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    },
-    {
-      "name": "jbnicolai",
-      "email": "jappelman@xebia.com"
-    }
-  ],
-  "engines": {
-    "node": ">=0.10.0"
-  },
-  "scripts": {
-    "test": "mocha test/test.js",
-    "view-supported": "node test/viewCodes.js"
-  },
-  "files": [
-    "index.js"
-  ],
-  "keywords": [
-    "ansi",
-    "styles",
-    "color",
-    "colour",
-    "colors",
-    "terminal",
-    "console",
-    "cli",
-    "string",
-    "tty",
-    "escape",
-    "formatting",
-    "rgb",
-    "256",
-    "shell",
-    "xterm",
-    "command-line",
-    "text",
-    "regex",
-    "regexp",
-    "re",
-    "match",
-    "test",
-    "find",
-    "pattern"
-  ],
-  "devDependencies": {
-    "mocha": "*"
-  },
-  "gitHead": "57c3f2941a73079fa8b081e02a522e3d29913e2f",
-  "bugs": {
-    "url": "https://github.com/sindresorhus/ansi-regex/issues"
-  },
-  "homepage": "https://github.com/sindresorhus/ansi-regex",
-  "_id": "ansi-regex@2.0.0",
-  "_shasum": "c5061b6e0ef8a81775e50f5d66151bf6bf371107",
-  "_from": "ansi-regex@>=2.0.0 <3.0.0",
-  "_npmVersion": "2.11.2",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "name": "sindresorhus",
-    "email": "sindresorhus@gmail.com"
-  },
-  "dist": {
-    "shasum": "c5061b6e0ef8a81775e50f5d66151bf6bf371107",
-    "tarball": "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/readme.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/readme.md
deleted file mode 100644
index 1a4894ec1110e3..00000000000000
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/readme.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# ansi-regex [![Build Status](https://travis-ci.org/sindresorhus/ansi-regex.svg?branch=master)](https://travis-ci.org/sindresorhus/ansi-regex)
-
-> Regular expression for matching [ANSI escape codes](http://en.wikipedia.org/wiki/ANSI_escape_code)
-
-
-## Install
-
-```
-$ npm install --save ansi-regex
-```
-
-
-## Usage
-
-```js
-var ansiRegex = require('ansi-regex');
-
-ansiRegex().test('\u001b[4mcake\u001b[0m');
-//=> true
-
-ansiRegex().test('cake');
-//=> false
-
-'\u001b[4mcake\u001b[0m'.match(ansiRegex());
-//=> ['\u001b[4m', '\u001b[0m']
-```
-
-
-## License
-
-MIT © [Sindre Sorhus](http://sindresorhus.com)
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/readme.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/readme.md
deleted file mode 100644
index 76091512df5e46..00000000000000
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/readme.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# strip-ansi [![Build Status](https://travis-ci.org/sindresorhus/strip-ansi.svg?branch=master)](https://travis-ci.org/sindresorhus/strip-ansi)
-
-> Strip [ANSI escape codes](http://en.wikipedia.org/wiki/ANSI_escape_code)
-
-
-## Install
-
-```
-$ npm install --save strip-ansi
-```
-
-
-## Usage
-
-```js
-var stripAnsi = require('strip-ansi');
-
-stripAnsi('\u001b[4mcake\u001b[0m');
-//=> 'cake'
-```
-
-
-## Related
-
-- [strip-ansi-cli](https://github.com/sindresorhus/strip-ansi-cli) - CLI for this module
-- [has-ansi](https://github.com/sindresorhus/has-ansi) - Check if a string has ANSI escape codes
-- [ansi-regex](https://github.com/sindresorhus/ansi-regex) - Regular expression for matching ANSI escape codes
-- [chalk](https://github.com/sindresorhus/chalk) - Terminal string styling done right
-
-
-## License
-
-MIT © [Sindre Sorhus](http://sindresorhus.com)
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/license b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/license
deleted file mode 100644
index 654d0bfe943437..00000000000000
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/license
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/.travis.yml b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/.travis.yml
deleted file mode 100644
index 6e5919de39a312..00000000000000
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/.travis.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-language: node_js
-node_js:
-  - "0.10"
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/.travis.yml b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/.travis.yml
deleted file mode 100644
index 6e5919de39a312..00000000000000
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/.travis.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-language: node_js
-node_js:
-  - "0.10"
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json
deleted file mode 100644
index 4b0677650bcd69..00000000000000
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "name": "jsonpointer",
-  "description": "Simple JSON Addressing.",
-  "tags": [
-    "util",
-    "simple",
-    "util",
-    "utility"
-  ],
-  "version": "2.0.0",
-  "author": {
-    "name": "Jan Lehnardt",
-    "email": "jan@apache.org"
-  },
-  "contributors": [
-    {
-      "name": "Joe Hildebrand",
-      "email": "joe-github@cursive.net"
-    }
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/janl/node-jsonpointer.git"
-  },
-  "bugs": {
-    "url": "http://github.com/janl/node-jsonpointer/issues"
-  },
-  "engines": {
-    "node": ">=0.6.0"
-  },
-  "main": "./jsonpointer",
-  "scripts": {
-    "test": "node test.js"
-  },
-  "license": "MIT",
-  "gitHead": "26ea4a5c0fcb6d9a2e87f733403791dd05637af8",
-  "homepage": "https://github.com/janl/node-jsonpointer#readme",
-  "_id": "jsonpointer@2.0.0",
-  "_shasum": "3af1dd20fe85463910d469a385e33017d2a030d9",
-  "_from": "jsonpointer@2.0.0",
-  "_npmVersion": "2.10.1",
-  "_nodeVersion": "0.10.36",
-  "_npmUser": {
-    "name": "marcbachmann",
-    "email": "marc.brookman@gmail.com"
-  },
-  "maintainers": [
-    {
-      "name": "jan",
-      "email": "jan@apache.org"
-    },
-    {
-      "name": "marcbachmann",
-      "email": "marc.brookman@gmail.com"
-    }
-  ],
-  "dist": {
-    "shasum": "3af1dd20fe85463910d469a385e33017d2a030d9",
-    "tarball": "http://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
deleted file mode 100644
index c33f8a5742ae69..00000000000000
--- a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "name": "ctype",
-  "version": "0.5.3",
-  "description": "read and write binary structures and data types",
-  "homepage": "https://github.com/rmustacc/node-ctype",
-  "author": {
-    "name": "Robert Mustacchi",
-    "email": "rm@fingolfin.org"
-  },
-  "engines": {
-    "node": ">= 0.4"
-  },
-  "main": "ctype.js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/rmustacc/node-ctype.git"
-  },
-  "_id": "ctype@0.5.3",
-  "dist": {
-    "shasum": "82c18c2461f74114ef16c135224ad0b9144ca12f",
-    "tarball": "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
-  },
-  "_npmVersion": "1.1.59",
-  "_npmUser": {
-    "name": "rm",
-    "email": "rm@fingolfin.org"
-  },
-  "maintainers": [
-    {
-      "name": "rm",
-      "email": "rm@fingolfin.org"
-    }
-  ],
-  "directories": {},
-  "_shasum": "82c18c2461f74114ef16c135224ad0b9144ca12f",
-  "_resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
-  "_from": "ctype@0.5.3",
-  "bugs": {
-    "url": "https://github.com/rmustacc/node-ctype/issues"
-  },
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/package.json b/deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/package.json
deleted file mode 100644
index 2e3337b7cc981f..00000000000000
--- a/deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/package.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "name": "mime-db",
-  "description": "Media Type Database",
-  "version": "1.19.0",
-  "contributors": [
-    {
-      "name": "Douglas Christopher Wilson",
-      "email": "doug@somethingdoug.com"
-    },
-    {
-      "name": "Jonathan Ong",
-      "email": "me@jongleberry.com",
-      "url": "http://jongleberry.com"
-    },
-    {
-      "name": "Robert Kieffer",
-      "email": "robert@broofa.com",
-      "url": "http://github.com/broofa"
-    }
-  ],
-  "license": "MIT",
-  "keywords": [
-    "mime",
-    "db",
-    "type",
-    "types",
-    "database",
-    "charset",
-    "charsets"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/jshttp/mime-db.git"
-  },
-  "devDependencies": {
-    "bluebird": "2.10.0",
-    "co": "4.6.0",
-    "cogent": "1.0.1",
-    "csv-parse": "1.0.0",
-    "gnode": "0.1.1",
-    "istanbul": "0.3.20",
-    "mocha": "1.21.5",
-    "raw-body": "2.1.3",
-    "stream-to-array": "2"
-  },
-  "files": [
-    "HISTORY.md",
-    "LICENSE",
-    "README.md",
-    "db.json",
-    "index.js"
-  ],
-  "engines": {
-    "node": ">= 0.6"
-  },
-  "scripts": {
-    "build": "node scripts/build",
-    "fetch": "gnode scripts/fetch-apache && gnode scripts/fetch-iana && gnode scripts/fetch-nginx",
-    "test": "mocha --reporter spec --bail --check-leaks test/",
-    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/",
-    "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/",
-    "update": "npm run fetch && npm run build"
-  },
-  "gitHead": "46a40f0524a01fb3075a7ecde92e8e04fc93d599",
-  "bugs": {
-    "url": "https://github.com/jshttp/mime-db/issues"
-  },
-  "homepage": "https://github.com/jshttp/mime-db",
-  "_id": "mime-db@1.19.0",
-  "_shasum": "496a18198a7ce8244534e25bb102b74fb420fd56",
-  "_from": "mime-db@>=1.19.0 <1.20.0",
-  "_npmVersion": "1.4.28",
-  "_npmUser": {
-    "name": "dougwilson",
-    "email": "doug@somethingdoug.com"
-  },
-  "maintainers": [
-    {
-      "name": "jongleberry",
-      "email": "jonathanrichardong@gmail.com"
-    },
-    {
-      "name": "dougwilson",
-      "email": "doug@somethingdoug.com"
-    }
-  ],
-  "dist": {
-    "shasum": "496a18198a7ce8244534e25bb102b74fb420fd56",
-    "tarball": "http://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/.npmignore b/deps/npm/node_modules/request/node_modules/node-uuid/.npmignore
deleted file mode 100644
index fd4f2b066b339e..00000000000000
--- a/deps/npm/node_modules/request/node_modules/node-uuid/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules
-.DS_Store
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/.jshintrc b/deps/npm/node_modules/request/node_modules/tough-cookie/.jshintrc
deleted file mode 100644
index fb11913a419c1a..00000000000000
--- a/deps/npm/node_modules/request/node_modules/tough-cookie/.jshintrc
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "passfail"      : false,
-    "maxerr"        : 100,
-
-    "browser"       : false,
-    "node"          : true,
-    "rhino"         : false,
-    "couch"         : false,
-    "wsh"           : false,
-
-    "jquery"        : false,
-    "prototypejs"   : false,
-    "mootools"      : false,
-    "dojo"          : false,
-
-    "debug"         : false,
-    "devel"         : false,
-
-    "esnext"        : true,
-    "strict"        : true,
-    "globalstrict"  : true,
-
-    "asi"           : false,
-    "laxbreak"      : false,
-    "bitwise"       : true,
-    "boss"          : false,
-    "curly"         : true,
-    "eqeqeq"        : false,
-    "eqnull"        : true,
-    "evil"          : false,
-    "expr"          : false,
-    "forin"         : false,
-    "immed"         : true,
-    "lastsemic"     : true,
-    "latedef"       : false,
-    "loopfunc"      : false,
-    "noarg"         : true,
-    "regexp"        : false,
-    "regexdash"     : false,
-    "scripturl"     : false,
-    "shadow"        : false,
-    "supernew"      : false,
-    "undef"         : true,
-    "unused"         : true,
-
-    "newcap"        : true,
-    "noempty"       : true,
-    "nonew"         : true,
-    "nomen"         : false,
-    "onevar"        : false,
-    "onecase"       : true,
-    "plusplus"      : false,
-    "proto"         : false,
-    "sub"           : true,
-    "trailing"      : true,
-    "white"         : false,
-
-    "predef": [
-      "describe",
-      "it",
-      "before",
-      "beforeEach",
-      "after",
-      "afterEach",
-      "expect",
-      "setTimeout",
-      "clearTimeout"
-    ],
-    "maxlen": 0
-}
diff --git a/deps/npm/node_modules/request/package.json b/deps/npm/node_modules/request/package.json
index 0700cd724f0ef3..3653b72c6ec3e3 100644
--- a/deps/npm/node_modules/request/package.json
+++ b/deps/npm/node_modules/request/package.json
@@ -1,58 +1,69 @@
 {
-  "name": "request",
-  "description": "Simplified HTTP request client.",
-  "tags": [
-    "http",
-    "simple",
-    "util",
-    "utility"
+  "_args": [
+    [
+      "request@2",
+      "/Users/rebecca/code/npm/node_modules/node-gyp"
+    ]
   ],
-  "version": "2.64.0",
-  "author": {
-    "name": "Mikeal Rogers",
-    "email": "mikeal.rogers@gmail.com"
+  "_from": "request@>=2.0.0 <3.0.0",
+  "_id": "request@2.64.0",
+  "_inCache": true,
+  "_location": "/request",
+  "_nodeVersion": "4.1.0",
+  "_npmUser": {
+    "email": "simeonvelichkov@gmail.com",
+    "name": "simov"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/request/request.git"
+  "_npmVersion": "2.14.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "request",
+    "raw": "request@2",
+    "rawSpec": "2",
+    "scope": null,
+    "spec": ">=2.0.0 <3.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/node-gyp",
+    "/npm-registry-client"
+  ],
+  "_resolved": "https://registry.npmjs.org/request/-/request-2.64.0.tgz",
+  "_shasum": "96a582423ce9b4b5c34e9b232e480173f14ba608",
+  "_shrinkwrap": null,
+  "_spec": "request@2",
+  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp",
+  "author": {
+    "email": "mikeal.rogers@gmail.com",
+    "name": "Mikeal Rogers"
   },
   "bugs": {
     "url": "http://github.com/request/request/issues"
   },
-  "license": "Apache-2.0",
-  "engines": {
-    "node": ">=0.8.0"
-  },
-  "main": "index.js",
   "dependencies": {
+    "aws-sign2": "~0.5.0",
     "bl": "~1.0.0",
     "caseless": "~0.11.0",
+    "combined-stream": "~1.0.1",
     "extend": "~3.0.0",
     "forever-agent": "~0.6.0",
     "form-data": "~1.0.0-rc1",
+    "har-validator": "^1.6.1",
+    "hawk": "~3.1.0",
+    "http-signature": "~0.11.0",
+    "isstream": "~0.1.1",
     "json-stringify-safe": "~5.0.0",
     "mime-types": "~2.1.2",
     "node-uuid": "~1.4.0",
-    "qs": "~5.1.0",
-    "tunnel-agent": "~0.4.0",
-    "tough-cookie": ">=0.12.0",
-    "http-signature": "~0.11.0",
     "oauth-sign": "~0.8.0",
-    "hawk": "~3.1.0",
-    "aws-sign2": "~0.5.0",
+    "qs": "~5.1.0",
     "stringstream": "~0.0.4",
-    "combined-stream": "~1.0.1",
-    "isstream": "~0.1.1",
-    "har-validator": "^1.6.1"
-  },
-  "scripts": {
-    "test": "npm run lint && npm run test-ci && npm run test-browser",
-    "test-ci": "taper tests/test-*.js",
-    "test-cov": "istanbul cover tape tests/test-*.js",
-    "test-browser": "node tests/browser/start.js",
-    "lint": "eslint lib/ *.js tests/ && echo Lint passed."
+    "tough-cookie": ">=0.12.0",
+    "tunnel-agent": "~0.4.0"
   },
+  "description": "Simplified HTTP request client.",
   "devDependencies": {
+    "bluebird": "~2.9.21",
     "browserify": "~5.9.1",
     "browserify-istanbul": "~0.1.3",
     "buffer-equal": "0.0.1",
@@ -70,20 +81,21 @@
     "rimraf": "~2.2.8",
     "server-destroy": "~1.0.0",
     "tape": "~3.0.0",
-    "taper": "~0.4.0",
-    "bluebird": "~2.9.21"
+    "taper": "~0.4.0"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "96a582423ce9b4b5c34e9b232e480173f14ba608",
+    "tarball": "http://registry.npmjs.org/request/-/request-2.64.0.tgz"
+  },
+  "engines": {
+    "node": ">=0.8.0"
   },
   "gitHead": "ca364485249f13c4810bb9b3952fb0fb886a93ee",
   "homepage": "https://github.com/request/request#readme",
-  "_id": "request@2.64.0",
-  "_shasum": "96a582423ce9b4b5c34e9b232e480173f14ba608",
-  "_from": "request@2.64.0",
-  "_npmVersion": "2.14.3",
-  "_nodeVersion": "4.1.0",
-  "_npmUser": {
-    "name": "simov",
-    "email": "simeonvelichkov@gmail.com"
-  },
+  "installable": true,
+  "license": "Apache-2.0",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "mikeal",
@@ -102,11 +114,26 @@
       "email": "simeonvelichkov@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "96a582423ce9b4b5c34e9b232e480173f14ba608",
-    "tarball": "http://registry.npmjs.org/request/-/request-2.64.0.tgz"
+  "name": "request",
+  "optionalDependencies": {},
+  "readme": "\n# Request - Simplified HTTP client\n\n[![npm package](https://nodei.co/npm/request.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/request/)\n\n[![Build status](https://img.shields.io/travis/request/request.svg?style=flat-square)](https://travis-ci.org/request/request)\n[![Coverage](https://img.shields.io/codecov/c/github/request/request.svg?style=flat-square)](https://codecov.io/github/request/request?branch=master)\n[![Coverage](https://img.shields.io/coveralls/request/request.svg?style=flat-square)](https://coveralls.io/r/request/request)\n[![Dependency Status](https://img.shields.io/david/request/request.svg?style=flat-square)](https://david-dm.org/request/request)\n[![Gitter](https://img.shields.io/badge/gitter-join_chat-blue.svg?style=flat-square)](https://gitter.im/request/request?utm_source=badge)\n\n\n## Super simple to use\n\nRequest is designed to be the simplest way possible to make http calls. It supports HTTPS and follows redirects by default.\n\n```js\nvar request = require('request');\nrequest('http://www.google.com', function (error, response, body) {\n  if (!error && response.statusCode == 200) {\n    console.log(body) // Show the HTML for the Google homepage.\n  }\n})\n```\n\n\n## Table of contents\n\n- [Streaming](#streaming)\n- [Forms](#forms)\n- [HTTP Authentication](#http-authentication)\n- [Custom HTTP Headers](#custom-http-headers)\n- [OAuth Signing](#oauth-signing)\n- [Proxies](#proxies)\n- [Unix Domain Sockets](#unix-domain-sockets)\n- [TLS/SSL Protocol](#tlsssl-protocol)\n- [Support for HAR 1.2](#support-for-har-12)\n- [**All Available Options**](#requestoptions-callback)\n\nRequest also offers [convenience methods](#convenience-methods) like\n`request.defaults` and `request.post`, and there are\nlots of [usage examples](#examples) and several\n[debugging techniques](#debugging).\n\n\n---\n\n\n## Streaming\n\nYou can stream any response to a file stream.\n\n```js\nrequest('http://google.com/doodle.png').pipe(fs.createWriteStream('doodle.png'))\n```\n\nYou can also stream a file to a PUT or POST request. This method will also check the file extension against a mapping of file extensions to content-types (in this case `application/json`) and use the proper `content-type` in the PUT request (if the headers don’t already provide one).\n\n```js\nfs.createReadStream('file.json').pipe(request.put('http://mysite.com/obj.json'))\n```\n\nRequest can also `pipe` to itself. When doing so, `content-type` and `content-length` are preserved in the PUT headers.\n\n```js\nrequest.get('http://google.com/img.png').pipe(request.put('http://mysite.com/img.png'))\n```\n\nRequest emits a \"response\" event when a response is received. The `response` argument will be an instance of [http.IncomingMessage](http://nodejs.org/api/http.html#http_http_incomingmessage).\n\n```js\nrequest\n  .get('http://google.com/img.png')\n  .on('response', function(response) {\n    console.log(response.statusCode) // 200\n    console.log(response.headers['content-type']) // 'image/png'\n  })\n  .pipe(request.put('http://mysite.com/img.png'))\n```\n\nTo easily handle errors when streaming requests, listen to the `error` event before piping:\n\n```js\nrequest\n  .get('http://mysite.com/doodle.png')\n  .on('error', function(err) {\n    console.log(err)\n  })\n  .pipe(fs.createWriteStream('doodle.png'))\n```\n\nNow let’s get fancy.\n\n```js\nhttp.createServer(function (req, resp) {\n  if (req.url === '/doodle.png') {\n    if (req.method === 'PUT') {\n      req.pipe(request.put('http://mysite.com/doodle.png'))\n    } else if (req.method === 'GET' || req.method === 'HEAD') {\n      request.get('http://mysite.com/doodle.png').pipe(resp)\n    }\n  }\n})\n```\n\nYou can also `pipe()` from `http.ServerRequest` instances, as well as to `http.ServerResponse` instances. The HTTP method, headers, and entity-body data will be sent. Which means that, if you don't really care about security, you can do:\n\n```js\nhttp.createServer(function (req, resp) {\n  if (req.url === '/doodle.png') {\n    var x = request('http://mysite.com/doodle.png')\n    req.pipe(x)\n    x.pipe(resp)\n  }\n})\n```\n\nAnd since `pipe()` returns the destination stream in ≥ Node 0.5.x you can do one line proxying. :)\n\n```js\nreq.pipe(request('http://mysite.com/doodle.png')).pipe(resp)\n```\n\nAlso, none of this new functionality conflicts with requests previous features, it just expands them.\n\n```js\nvar r = request.defaults({'proxy':'http://localproxy.com'})\n\nhttp.createServer(function (req, resp) {\n  if (req.url === '/doodle.png') {\n    r.get('http://google.com/doodle.png').pipe(resp)\n  }\n})\n```\n\nYou can still use intermediate proxies, the requests will still follow HTTP forwards, etc.\n\n[back to top](#table-of-contents)\n\n\n---\n\n\n## Forms\n\n`request` supports `application/x-www-form-urlencoded` and `multipart/form-data` form uploads. For `multipart/related` refer to the `multipart` API.\n\n\n#### application/x-www-form-urlencoded (URL-Encoded Forms)\n\nURL-encoded forms are simple.\n\n```js\nrequest.post('http://service.com/upload', {form:{key:'value'}})\n// or\nrequest.post('http://service.com/upload').form({key:'value'})\n// or\nrequest.post({url:'http://service.com/upload', form: {key:'value'}}, function(err,httpResponse,body){ /* ... */ })\n```\n\n\n#### multipart/form-data (Multipart Form Uploads)\n\nFor `multipart/form-data` we use the [form-data](https://github.com/felixge/node-form-data) library by [@felixge](https://github.com/felixge). For the most cases, you can pass your upload form data via the `formData` option.\n\n\n```js\nvar formData = {\n  // Pass a simple key-value pair\n  my_field: 'my_value',\n  // Pass data via Buffers\n  my_buffer: new Buffer([1, 2, 3]),\n  // Pass data via Streams\n  my_file: fs.createReadStream(__dirname + '/unicycle.jpg'),\n  // Pass multiple values /w an Array\n  attachments: [\n    fs.createReadStream(__dirname + '/attachment1.jpg'),\n    fs.createReadStream(__dirname + '/attachment2.jpg')\n  ],\n  // Pass optional meta-data with an 'options' object with style: {value: DATA, options: OPTIONS}\n  // Use case: for some types of streams, you'll need to provide \"file\"-related information manually.\n  // See the `form-data` README for more information about options: https://github.com/felixge/node-form-data\n  custom_file: {\n    value:  fs.createReadStream('/dev/urandom'),\n    options: {\n      filename: 'topsecret.jpg',\n      contentType: 'image/jpg'\n    }\n  }\n};\nrequest.post({url:'http://service.com/upload', formData: formData}, function optionalCallback(err, httpResponse, body) {\n  if (err) {\n    return console.error('upload failed:', err);\n  }\n  console.log('Upload successful!  Server responded with:', body);\n});\n```\n\nFor advanced cases, you can access the form-data object itself via `r.form()`. This can be modified until the request is fired on the next cycle of the event-loop. (Note that this calling `form()` will clear the currently set form data for that request.)\n\n```js\n// NOTE: Advanced use-case, for normal use see 'formData' usage above\nvar r = request.post('http://service.com/upload', function optionalCallback(err, httpResponse, body) {...})\nvar form = r.form();\nform.append('my_field', 'my_value');\nform.append('my_buffer', new Buffer([1, 2, 3]));\nform.append('custom_file', fs.createReadStream(__dirname + '/unicycle.jpg'), {filename: 'unicycle.jpg'});\n```\nSee the [form-data README](https://github.com/felixge/node-form-data) for more information & examples.\n\n\n#### multipart/related\n\nSome variations in different HTTP implementations require a newline/CRLF before, after, or both before and after the boundary of a `multipart/related` request (using the multipart option). This has been observed in the .NET WebAPI version 4.0. You can turn on a boundary preambleCRLF or postamble by passing them as `true` to your request options.\n\n```js\n  request({\n    method: 'PUT',\n    preambleCRLF: true,\n    postambleCRLF: true,\n    uri: 'http://service.com/upload',\n    multipart: [\n      {\n        'content-type': 'application/json',\n        body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, 'content_type': 'text/plain' }}})\n      },\n      { body: 'I am an attachment' },\n      { body: fs.createReadStream('image.png') }\n    ],\n    // alternatively pass an object containing additional options\n    multipart: {\n      chunked: false,\n      data: [\n        {\n          'content-type': 'application/json',\n          body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, 'content_type': 'text/plain' }}})\n        },\n        { body: 'I am an attachment' }\n      ]\n    }\n  },\n  function (error, response, body) {\n    if (error) {\n      return console.error('upload failed:', error);\n    }\n    console.log('Upload successful!  Server responded with:', body);\n  })\n```\n\n[back to top](#table-of-contents)\n\n\n---\n\n\n## HTTP Authentication\n\n```js\nrequest.get('http://some.server.com/').auth('username', 'password', false);\n// or\nrequest.get('http://some.server.com/', {\n  'auth': {\n    'user': 'username',\n    'pass': 'password',\n    'sendImmediately': false\n  }\n});\n// or\nrequest.get('http://some.server.com/').auth(null, null, true, 'bearerToken');\n// or\nrequest.get('http://some.server.com/', {\n  'auth': {\n    'bearer': 'bearerToken'\n  }\n});\n```\n\nIf passed as an option, `auth` should be a hash containing values:\n\n- `user` || `username`\n- `pass` || `password`\n- `sendImmediately` (optional)\n- `bearer` (optional)\n\nThe method form takes parameters\n`auth(username, password, sendImmediately, bearer)`.\n\n`sendImmediately` defaults to `true`, which causes a basic or bearer\nauthentication header to be sent.  If `sendImmediately` is `false`, then\n`request` will retry with a proper authentication header after receiving a\n`401` response from the server (which must contain a `WWW-Authenticate` header\nindicating the required authentication method).\n\nNote that you can also specify basic authentication using the URL itself, as\ndetailed in [RFC 1738](http://www.ietf.org/rfc/rfc1738.txt).  Simply pass the\n`user:password` before the host with an `@` sign:\n\n```js\nvar username = 'username',\n    password = 'password',\n    url = 'http://' + username + ':' + password + '@some.server.com';\n\nrequest({url: url}, function (error, response, body) {\n   // Do more stuff with 'body' here\n});\n```\n\nDigest authentication is supported, but it only works with `sendImmediately`\nset to `false`; otherwise `request` will send basic authentication on the\ninitial request, which will probably cause the request to fail.\n\nBearer authentication is supported, and is activated when the `bearer` value is\navailable. The value may be either a `String` or a `Function` returning a\n`String`. Using a function to supply the bearer token is particularly useful if\nused in conjunction with `defaults` to allow a single function to supply the\nlast known token at the time of sending a request, or to compute one on the fly.\n\n[back to top](#table-of-contents)\n\n\n---\n\n\n## Custom HTTP Headers\n\nHTTP Headers, such as `User-Agent`, can be set in the `options` object.\nIn the example below, we call the github API to find out the number\nof stars and forks for the request repository. This requires a\ncustom `User-Agent` header as well as https.\n\n```js\nvar request = require('request');\n\nvar options = {\n  url: 'https://api.github.com/repos/request/request',\n  headers: {\n    'User-Agent': 'request'\n  }\n};\n\nfunction callback(error, response, body) {\n  if (!error && response.statusCode == 200) {\n    var info = JSON.parse(body);\n    console.log(info.stargazers_count + \" Stars\");\n    console.log(info.forks_count + \" Forks\");\n  }\n}\n\nrequest(options, callback);\n```\n\n[back to top](#table-of-contents)\n\n\n---\n\n\n## OAuth Signing\n\n[OAuth version 1.0](https://tools.ietf.org/html/rfc5849) is supported.  The\ndefault signing algorithm is\n[HMAC-SHA1](https://tools.ietf.org/html/rfc5849#section-3.4.2):\n\n```js\n// OAuth1.0 - 3-legged server side flow (Twitter example)\n// step 1\nvar qs = require('querystring')\n  , oauth =\n    { callback: 'http://mysite.com/callback/'\n    , consumer_key: CONSUMER_KEY\n    , consumer_secret: CONSUMER_SECRET\n    }\n  , url = 'https://api.twitter.com/oauth/request_token'\n  ;\nrequest.post({url:url, oauth:oauth}, function (e, r, body) {\n  // Ideally, you would take the body in the response\n  // and construct a URL that a user clicks on (like a sign in button).\n  // The verifier is only available in the response after a user has\n  // verified with twitter that they are authorizing your app.\n\n  // step 2\n  var req_data = qs.parse(body)\n  var uri = 'https://api.twitter.com/oauth/authenticate'\n    + '?' + qs.stringify({oauth_token: req_data.oauth_token})\n  // redirect the user to the authorize uri\n\n  // step 3\n  // after the user is redirected back to your server\n  var auth_data = qs.parse(body)\n    , oauth =\n      { consumer_key: CONSUMER_KEY\n      , consumer_secret: CONSUMER_SECRET\n      , token: auth_data.oauth_token\n      , token_secret: req_data.oauth_token_secret\n      , verifier: auth_data.oauth_verifier\n      }\n    , url = 'https://api.twitter.com/oauth/access_token'\n    ;\n  request.post({url:url, oauth:oauth}, function (e, r, body) {\n    // ready to make signed requests on behalf of the user\n    var perm_data = qs.parse(body)\n      , oauth =\n        { consumer_key: CONSUMER_KEY\n        , consumer_secret: CONSUMER_SECRET\n        , token: perm_data.oauth_token\n        , token_secret: perm_data.oauth_token_secret\n        }\n      , url = 'https://api.twitter.com/1.1/users/show.json'\n      , qs =\n        { screen_name: perm_data.screen_name\n        , user_id: perm_data.user_id\n        }\n      ;\n    request.get({url:url, oauth:oauth, qs:qs, json:true}, function (e, r, user) {\n      console.log(user)\n    })\n  })\n})\n```\n\nFor [RSA-SHA1 signing](https://tools.ietf.org/html/rfc5849#section-3.4.3), make\nthe following changes to the OAuth options object:\n* Pass `signature_method : 'RSA-SHA1'`\n* Instead of `consumer_secret`, specify a `private_key` string in\n  [PEM format](http://how2ssl.com/articles/working_with_pem_files/)\n\nFor [PLAINTEXT signing](http://oauth.net/core/1.0/#anchor22), make\nthe following changes to the OAuth options object:\n* Pass `signature_method : 'PLAINTEXT'`\n\nTo send OAuth parameters via query params or in a post body as described in The\n[Consumer Request Parameters](http://oauth.net/core/1.0/#consumer_req_param)\nsection of the oauth1 spec:\n* Pass `transport_method : 'query'` or `transport_method : 'body'` in the OAuth\n  options object.\n* `transport_method` defaults to `'header'`\n\nTo use [Request Body Hash](https://oauth.googlecode.com/svn/spec/ext/body_hash/1.0/oauth-bodyhash.html) you can either\n* Manually generate the body hash and pass it as a string `body_hash: '...'`\n* Automatically generate the body hash by passing `body_hash: true`\n\n[back to top](#table-of-contents)\n\n\n---\n\n\n## Proxies\n\nIf you specify a `proxy` option, then the request (and any subsequent\nredirects) will be sent via a connection to the proxy server.\n\nIf your endpoint is an `https` url, and you are using a proxy, then\nrequest will send a `CONNECT` request to the proxy server *first*, and\nthen use the supplied connection to connect to the endpoint.\n\nThat is, first it will make a request like:\n\n```\nHTTP/1.1 CONNECT endpoint-server.com:80\nHost: proxy-server.com\nUser-Agent: whatever user agent you specify\n```\n\nand then the proxy server make a TCP connection to `endpoint-server`\non port `80`, and return a response that looks like:\n\n```\nHTTP/1.1 200 OK\n```\n\nAt this point, the connection is left open, and the client is\ncommunicating directly with the `endpoint-server.com` machine.\n\nSee [the wikipedia page on HTTP Tunneling](http://en.wikipedia.org/wiki/HTTP_tunnel)\nfor more information.\n\nBy default, when proxying `http` traffic, request will simply make a\nstandard proxied `http` request.  This is done by making the `url`\nsection of the initial line of the request a fully qualified url to\nthe endpoint.\n\nFor example, it will make a single request that looks like:\n\n```\nHTTP/1.1 GET http://endpoint-server.com/some-url\nHost: proxy-server.com\nOther-Headers: all go here\n\nrequest body or whatever\n```\n\nBecause a pure \"http over http\" tunnel offers no additional security\nor other features, it is generally simpler to go with a\nstraightforward HTTP proxy in this case.  However, if you would like\nto force a tunneling proxy, you may set the `tunnel` option to `true`.\n\nYou can also make a standard proxied `http` request by explicitly setting\n`tunnel : false`, but **note that this will allow the proxy to see the traffic\nto/from the destination server**.\n\nIf you are using a tunneling proxy, you may set the\n`proxyHeaderWhiteList` to share certain headers with the proxy.\n\nYou can also set the `proxyHeaderExclusiveList` to share certain\nheaders only with the proxy and not with destination host.\n\nBy default, this set is:\n\n```\naccept\naccept-charset\naccept-encoding\naccept-language\naccept-ranges\ncache-control\ncontent-encoding\ncontent-language\ncontent-length\ncontent-location\ncontent-md5\ncontent-range\ncontent-type\nconnection\ndate\nexpect\nmax-forwards\npragma\nproxy-authorization\nreferer\nte\ntransfer-encoding\nuser-agent\nvia\n```\n\nNote that, when using a tunneling proxy, the `proxy-authorization`\nheader and any headers from custom `proxyHeaderExclusiveList` are\n*never* sent to the endpoint server, but only to the proxy server.\n\n\n### Controlling proxy behaviour using environment variables\n\nThe following environment variables are respected by `request`:\n\n * `HTTP_PROXY` / `http_proxy`\n * `HTTPS_PROXY` / `https_proxy`\n * `NO_PROXY` / `no_proxy`\n\nWhen `HTTP_PROXY` / `http_proxy` are set, they will be used to proxy non-SSL requests that do not have an explicit `proxy` configuration option present. Similarly, `HTTPS_PROXY` / `https_proxy` will be respected for SSL requests that do not have an explicit `proxy` configuration option. It is valid to define a proxy in one of the environment variables, but then override it for a specific request, using the `proxy` configuration option. Furthermore, the `proxy` configuration option can be explicitly set to false / null to opt out of proxying altogether for that request.\n\n`request` is also aware of the `NO_PROXY`/`no_proxy` environment variables. These variables provide a granular way to opt out of proxying, on a per-host basis. It should contain a comma separated list of hosts to opt out of proxying. It is also possible to opt of proxying when a particular destination port is used. Finally, the variable may be set to `*` to opt out of the implicit proxy configuration of the other environment variables.\n\nHere's some examples of valid `no_proxy` values:\n\n * `google.com` - don't proxy HTTP/HTTPS requests to Google.\n * `google.com:443` - don't proxy HTTPS requests to Google, but *do* proxy HTTP requests to Google.\n * `google.com:443, yahoo.com:80` - don't proxy HTTPS requests to Google, and don't proxy HTTP requests to Yahoo!\n * `*` - ignore `https_proxy`/`http_proxy` environment variables altogether.\n\n[back to top](#table-of-contents)\n\n\n---\n\n\n## UNIX Domain Sockets\n\n`request` supports making requests to [UNIX Domain Sockets](http://en.wikipedia.org/wiki/Unix_domain_socket). To make one, use the following URL scheme:\n\n```js\n/* Pattern */ 'http://unix:SOCKET:PATH'\n/* Example */ request.get('http://unix:/absolute/path/to/unix.socket:/request/path')\n```\n\nNote: The `SOCKET` path is assumed to be absolute to the root of the host file system.\n\n[back to top](#table-of-contents)\n\n\n---\n\n\n## TLS/SSL Protocol\n\nTLS/SSL Protocol options, such as `cert`, `key` and `passphrase`, can be\nset directly in `options` object, in the `agentOptions` property of the `options` object, or even in `https.globalAgent.options`. Keep in mind that, although `agentOptions` allows for a slightly wider range of configurations, the recommended way is via `options` object directly, as using `agentOptions` or `https.globalAgent.options` would not be applied in the same way in proxied environments (as data travels through a TLS connection instead of an http/https agent).\n\n```js\nvar fs = require('fs')\n    , path = require('path')\n    , certFile = path.resolve(__dirname, 'ssl/client.crt')\n    , keyFile = path.resolve(__dirname, 'ssl/client.key')\n    , caFile = path.resolve(__dirname, 'ssl/ca.cert.pem')\n    , request = require('request');\n\nvar options = {\n    url: 'https://api.some-server.com/',\n    cert: fs.readFileSync(certFile),\n    key: fs.readFileSync(keyFile),\n    passphrase: 'password',\n    ca: fs.readFileSync(caFile)\n    }\n};\n\nrequest.get(options);\n```\n\n### Using `options.agentOptions`\n\nIn the example below, we call an API requires client side SSL certificate\n(in PEM format) with passphrase protected private key (in PEM format) and disable the SSLv3 protocol:\n\n```js\nvar fs = require('fs')\n    , path = require('path')\n    , certFile = path.resolve(__dirname, 'ssl/client.crt')\n    , keyFile = path.resolve(__dirname, 'ssl/client.key')\n    , request = require('request');\n\nvar options = {\n    url: 'https://api.some-server.com/',\n    agentOptions: {\n        cert: fs.readFileSync(certFile),\n        key: fs.readFileSync(keyFile),\n        // Or use `pfx` property replacing `cert` and `key` when using private key, certificate and CA certs in PFX or PKCS12 format:\n        // pfx: fs.readFileSync(pfxFilePath),\n        passphrase: 'password',\n        securityOptions: 'SSL_OP_NO_SSLv3'\n    }\n};\n\nrequest.get(options);\n```\n\nIt is able to force using SSLv3 only by specifying `secureProtocol`:\n\n```js\nrequest.get({\n    url: 'https://api.some-server.com/',\n    agentOptions: {\n        secureProtocol: 'SSLv3_method'\n    }\n});\n```\n\nIt is possible to accept other certificates than those signed by generally allowed Certificate Authorities (CAs).\nThis can be useful, for example,  when using self-signed certificates.\nTo require a different root certificate, you can specify the signing CA by adding the contents of the CA's certificate file to the `agentOptions`.\nThe certificate the domain presents must be signed by the root certificate specified:\n\n```js\nrequest.get({\n    url: 'https://api.some-server.com/',\n    agentOptions: {\n        ca: fs.readFileSync('ca.cert.pem')\n    }\n});\n```\n\n[back to top](#table-of-contents)\n\n\n---\n\n## Support for HAR 1.2\n\nThe `options.har` property will override the values: `url`, `method`, `qs`, `headers`, `form`, `formData`, `body`, `json`, as well as construct multipart data and read files from disk when `request.postData.params[].fileName` is present without a matching `value`.\n\na validation step will check if the HAR Request format matches the latest spec (v1.2) and will skip parsing if not matching.\n\n```js\n  var request = require('request')\n  request({\n    // will be ignored\n    method: 'GET',\n    uri: 'http://www.google.com',\n\n    // HTTP Archive Request Object\n    har: {\n      url: 'http://www.mockbin.com/har',\n      method: 'POST',\n      headers: [\n        {\n          name: 'content-type',\n          value: 'application/x-www-form-urlencoded'\n        }\n      ],\n      postData: {\n        mimeType: 'application/x-www-form-urlencoded',\n        params: [\n          {\n            name: 'foo',\n            value: 'bar'\n          },\n          {\n            name: 'hello',\n            value: 'world'\n          }\n        ]\n      }\n    }\n  })\n\n  // a POST request will be sent to http://www.mockbin.com\n  // with body an application/x-www-form-urlencoded body:\n  // foo=bar&hello=world\n```\n\n[back to top](#table-of-contents)\n\n\n---\n\n## request(options, callback)\n\nThe first argument can be either a `url` or an `options` object. The only required option is `uri`; all others are optional.\n\n- `uri` || `url` - fully qualified uri or a parsed url object from `url.parse()`\n- `baseUrl` - fully qualified uri string used as the base url. Most useful with `request.defaults`, for example when you want to do many requests to the same domain.  If `baseUrl` is `https://example.com/api/`, then requesting `/end/point?test=true` will fetch `https://example.com/api/end/point?test=true`. When `baseUrl` is given, `uri` must also be a string.\n- `method` - http method (default: `\"GET\"`)\n- `headers` - http headers (default: `{}`)\n\n---\n\n- `qs` - object containing querystring values to be appended to the `uri`\n- `qsParseOptions` - object containing options to pass to the [qs.parse](https://github.com/hapijs/qs#parsing-objects) method. Alternatively pass options to the [querystring.parse](https://nodejs.org/docs/v0.12.0/api/querystring.html#querystring_querystring_parse_str_sep_eq_options) method using this format `{sep:';', eq:':', options:{}}`\n- `qsStringifyOptions` - object containing options to pass to the [qs.stringify](https://github.com/hapijs/qs#stringifying) method. Alternatively pass options to the  [querystring.stringify](https://nodejs.org/docs/v0.12.0/api/querystring.html#querystring_querystring_stringify_obj_sep_eq_options) method using this format `{sep:';', eq:':', options:{}}`. For example, to change the way arrays are converted to query strings using the `qs` module pass the `arrayFormat` option with one of `indices|brackets|repeat`\n- `useQuerystring` - If true, use `querystring` to stringify and parse\n  querystrings, otherwise use `qs` (default: `false`).  Set this option to\n  `true` if you need arrays to be serialized as `foo=bar&foo=baz` instead of the\n  default `foo[0]=bar&foo[1]=baz`.\n\n---\n\n- `body` - entity body for PATCH, POST and PUT requests. Must be a `Buffer` or `String`, unless `json` is `true`. If `json` is `true`, then `body` must be a JSON-serializable object.\n- `form` - when passed an object or a querystring, this sets `body` to a querystring representation of value, and adds `Content-type: application/x-www-form-urlencoded` header. When passed no options, a `FormData` instance is returned (and is piped to request). See \"Forms\" section above.\n- `formData` - Data to pass for a `multipart/form-data` request. See\n  [Forms](#forms) section above.\n- `multipart` - array of objects which contain their own headers and `body`\n  attributes. Sends a `multipart/related` request. See [Forms](#forms) section\n  above.\n  - Alternatively you can pass in an object `{chunked: false, data: []}` where\n    `chunked` is used to specify whether the request is sent in\n    [chunked transfer encoding](https://en.wikipedia.org/wiki/Chunked_transfer_encoding)\n    In non-chunked requests, data items with body streams are not allowed.\n- `preambleCRLF` - append a newline/CRLF before the boundary of your `multipart/form-data` request.\n- `postambleCRLF` - append a newline/CRLF at the end of the boundary of your `multipart/form-data` request.\n- `json` - sets `body` but to JSON representation of value and adds `Content-type: application/json` header.  Additionally, parses the response body as JSON.\n- `jsonReviver` - a [reviver function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/parse) that will be passed to `JSON.parse()` when parsing a JSON response body.\n\n---\n\n- `auth` - A hash containing values `user` || `username`, `pass` || `password`, and `sendImmediately` (optional).  See documentation above.\n- `oauth` - Options for OAuth HMAC-SHA1 signing. See documentation above.\n- `hawk` - Options for [Hawk signing](https://github.com/hueniverse/hawk). The `credentials` key must contain the necessary signing info, [see hawk docs for details](https://github.com/hueniverse/hawk#usage-example).\n- `aws` - `object` containing AWS signing information. Should have the properties `key`, `secret`. Also requires the property `bucket`, unless you’re specifying your `bucket` as part of the path, or the request doesn’t use a bucket (i.e. GET Services)\n- `httpSignature` - Options for the [HTTP Signature Scheme](https://github.com/joyent/node-http-signature/blob/master/http_signing.md) using [Joyent's library](https://github.com/joyent/node-http-signature). The `keyId` and `key` properties must be specified. See the docs for other options.\n\n---\n\n- `followRedirect` - follow HTTP 3xx responses as redirects (default: `true`). This property can also be implemented as function which gets `response` object as a single argument and should return `true` if redirects should continue or `false` otherwise.\n- `followAllRedirects` - follow non-GET HTTP 3xx responses as redirects (default: `false`)\n- `maxRedirects` - the maximum number of redirects to follow (default: `10`)\n- `removeRefererHeader` - removes the referer header when a redirect happens (default: `false`).\n\n---\n\n- `encoding` - Encoding to be used on `setEncoding` of response data. If `null`, the `body` is returned as a `Buffer`. Anything else **(including the default value of `undefined`)** will be passed as the [encoding](http://nodejs.org/api/buffer.html#buffer_buffer) parameter to `toString()` (meaning this is effectively `utf8` by default). (**Note:** if you expect binary data, you should set `encoding: null`.)\n- `gzip` - If `true`, add an `Accept-Encoding` header to request compressed content encodings from the server (if not already present) and decode supported content encodings in the response.  **Note:** Automatic decoding of the response content is performed on the body data returned through `request` (both through the `request` stream and passed to the callback function) but is not performed on the `response` stream (available from the `response` event) which is the unmodified `http.IncomingMessage` object which may contain compressed data. See example below.\n- `jar` - If `true`, remember cookies for future use (or define your custom cookie jar; see examples section)\n\n---\n\n- `agent` - `http(s).Agent` instance to use\n- `agentClass` - alternatively specify your agent's class name\n- `agentOptions` - and pass its options. **Note:** for HTTPS see [tls API doc for TLS/SSL options](http://nodejs.org/api/tls.html#tls_tls_connect_options_callback) and the [documentation above](#using-optionsagentoptions).\n- `forever` - set to `true` to use the [forever-agent](https://github.com/request/forever-agent) **Note:** Defaults to `http(s).Agent({keepAlive:true})` in node 0.12+\n- `pool` - An object describing which agents to use for the request. If this option is omitted the request will use the global agent (as long as your options allow for it). Otherwise, request will search the pool for your custom agent. If no custom agent is found, a new agent will be created and added to the pool. **Note:** `pool` is used only when the `agent` option is not specified.\n  - A `maxSockets` property can also be provided on the `pool` object to set the max number of sockets for all agents created (ex: `pool: {maxSockets: Infinity}`).\n  - Note that if you are sending multiple requests in a loop and creating\n    multiple new `pool` objects, `maxSockets` will not work as intended.  To\n    work around this, either use [`request.defaults`](#requestdefaultsoptions)\n    with your pool options or create the pool object with the `maxSockets`\n    property outside of the loop.\n- `timeout` - Integer containing the number of milliseconds to wait for a\nserver to send response headers (and start the response body) before aborting\nthe request. Note that if the underlying TCP connection cannot be established,\nthe OS-wide TCP connection timeout will overrule the `timeout` option ([the\ndefault in Linux can be anywhere from 20-120 seconds][linux-timeout]).\n\n[linux-timeout]: http://www.sekuda.com/overriding_the_default_linux_kernel_20_second_tcp_socket_connect_timeout\n\n---\n\n- `localAddress` - Local interface to bind for network connections.\n- `proxy` - An HTTP proxy to be used. Supports proxy Auth with Basic Auth, identical to support for the `url` parameter (by embedding the auth info in the `uri`)\n- `strictSSL` - If `true`, requires SSL certificates be valid. **Note:** to use your own certificate authority, you need to specify an agent that was created with that CA as an option.\n- `tunnel` - controls the behavior of\n  [HTTP `CONNECT` tunneling](https://en.wikipedia.org/wiki/HTTP_tunnel#HTTP_CONNECT_tunneling)\n  as follows:\n   - `undefined` (default) - `true` if the destination is `https` or a previous\n     request in the redirect chain used a tunneling proxy, `false` otherwise\n   - `true` - always tunnel to the destination by making a `CONNECT` request to\n     the proxy\n   - `false` - request the destination as a `GET` request.\n- `proxyHeaderWhiteList` - A whitelist of headers to send to a\n  tunneling proxy.\n- `proxyHeaderExclusiveList` - A whitelist of headers to send\n  exclusively to a tunneling proxy and not to destination.\n\n---\n\n- `time` - If `true`, the request-response cycle (including all redirects) is timed at millisecond resolution, and the result provided on the response's `elapsedTime` property.\n- `har` - A [HAR 1.2 Request Object](http://www.softwareishard.com/blog/har-12-spec/#request), will be processed from HAR format into options overwriting matching values *(see the [HAR 1.2 section](#support-for-har-1.2) for details)*\n\nThe callback argument gets 3 arguments:\n\n1. An `error` when applicable (usually from [`http.ClientRequest`](http://nodejs.org/api/http.html#http_class_http_clientrequest) object)\n2. An [`http.IncomingMessage`](http://nodejs.org/api/http.html#http_http_incomingmessage) object\n3. The third is the `response` body (`String` or `Buffer`, or JSON object if the `json` option is supplied)\n\n[back to top](#table-of-contents)\n\n\n---\n\n## Convenience methods\n\nThere are also shorthand methods for different HTTP METHODs and some other conveniences.\n\n\n### request.defaults(options)\n\nThis method **returns a wrapper** around the normal request API that defaults\nto whatever options you pass to it.\n\n**Note:** `request.defaults()` **does not** modify the global request API;\ninstead, it **returns a wrapper** that has your default settings applied to it.\n\n**Note:** You can call `.defaults()` on the wrapper that is returned from\n`request.defaults` to add/override defaults that were previously defaulted.\n\nFor example:\n```js\n//requests using baseRequest() will set the 'x-token' header\nvar baseRequest = request.defaults({\n  headers: {x-token: 'my-token'}\n})\n\n//requests using specialRequest() will include the 'x-token' header set in\n//baseRequest and will also include the 'special' header\nvar specialRequest = baseRequest.defaults({\n  headers: {special: 'special value'}\n})\n```\n\n### request.put\n\nSame as `request()`, but defaults to `method: \"PUT\"`.\n\n```js\nrequest.put(url)\n```\n\n### request.patch\n\nSame as `request()`, but defaults to `method: \"PATCH\"`.\n\n```js\nrequest.patch(url)\n```\n\n### request.post\n\nSame as `request()`, but defaults to `method: \"POST\"`.\n\n```js\nrequest.post(url)\n```\n\n### request.head\n\nSame as `request()`, but defaults to `method: \"HEAD\"`.\n\n```js\nrequest.head(url)\n```\n\n### request.del\n\nSame as `request()`, but defaults to `method: \"DELETE\"`.\n\n```js\nrequest.del(url)\n```\n\n### request.get\n\nSame as `request()` (for uniformity).\n\n```js\nrequest.get(url)\n```\n### request.cookie\n\nFunction that creates a new cookie.\n\n```js\nrequest.cookie('key1=value1')\n```\n### request.jar()\n\nFunction that creates a new cookie jar.\n\n```js\nrequest.jar()\n```\n\n[back to top](#table-of-contents)\n\n\n---\n\n\n## Debugging\n\nThere are at least three ways to debug the operation of `request`:\n\n1. Launch the node process like `NODE_DEBUG=request node script.js`\n   (`lib,request,otherlib` works too).\n\n2. Set `require('request').debug = true` at any time (this does the same thing\n   as #1).\n\n3. Use the [request-debug module](https://github.com/nylen/request-debug) to\n   view request and response headers and bodies.\n\n[back to top](#table-of-contents)\n\n\n---\n\n## Timeouts\n\nMost requests to external servers should have a timeout attached, in case the\nserver is not responding in a timely manner. Without a timeout, your code may\nhave a socket open/consume resources for minutes or more.\n\nThere are two main types of timeouts: **connection timeouts** and **read\ntimeouts**. A connect timeout occurs if the timeout is hit while your client is\nattempting to establish a connection to a remote machine (corresponding to the\n[connect() call][connect] on the socket). A read timeout occurs any time the\nserver is too slow to send back a part of the response.\n\nThese two situations have widely different implications for what went wrong\nwith the request, so it's useful to be able to distinguish them. You can detect\ntimeout errors by checking `err.code` for an 'ETIMEDOUT' value. Further, you\ncan detect whether the timeout was a connection timeout by checking if the\n`err.connect` property is set to `true`.\n\n```js\nrequest.get('http://10.255.255.1', {timeout: 1500}, function(err) {\n    console.log(err.code === 'ETIMEDOUT');\n    // Set to `true` if the timeout was a connection timeout, `false` or\n    // `undefined` otherwise.\n    console.log(err.connect === true);\n    process.exit(0);\n});\n```\n\n[connect]: http://linux.die.net/man/2/connect\n\n## Examples:\n\n```js\n  var request = require('request')\n    , rand = Math.floor(Math.random()*100000000).toString()\n    ;\n  request(\n    { method: 'PUT'\n    , uri: 'http://mikeal.iriscouch.com/testjs/' + rand\n    , multipart:\n      [ { 'content-type': 'application/json'\n        ,  body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, 'content_type': 'text/plain' }}})\n        }\n      , { body: 'I am an attachment' }\n      ]\n    }\n  , function (error, response, body) {\n      if(response.statusCode == 201){\n        console.log('document saved as: http://mikeal.iriscouch.com/testjs/'+ rand)\n      } else {\n        console.log('error: '+ response.statusCode)\n        console.log(body)\n      }\n    }\n  )\n```\n\nFor backwards-compatibility, response compression is not supported by default.\nTo accept gzip-compressed responses, set the `gzip` option to `true`.  Note\nthat the body data passed through `request` is automatically decompressed\nwhile the response object is unmodified and will contain compressed data if\nthe server sent a compressed response.\n\n```js\n  var request = require('request')\n  request(\n    { method: 'GET'\n    , uri: 'http://www.google.com'\n    , gzip: true\n    }\n  , function (error, response, body) {\n      // body is the decompressed response body\n      console.log('server encoded the data as: ' + (response.headers['content-encoding'] || 'identity'))\n      console.log('the decoded data is: ' + body)\n    }\n  ).on('data', function(data) {\n    // decompressed data as it is received\n    console.log('decoded chunk: ' + data)\n  })\n  .on('response', function(response) {\n    // unmodified http.IncomingMessage object\n    response.on('data', function(data) {\n      // compressed data as it is received\n      console.log('received ' + data.length + ' bytes of compressed data')\n    })\n  })\n```\n\nCookies are disabled by default (else, they would be used in subsequent requests). To enable cookies, set `jar` to `true` (either in `defaults` or `options`).\n\n```js\nvar request = request.defaults({jar: true})\nrequest('http://www.google.com', function () {\n  request('http://images.google.com')\n})\n```\n\nTo use a custom cookie jar (instead of `request`’s global cookie jar), set `jar` to an instance of `request.jar()` (either in `defaults` or `options`)\n\n```js\nvar j = request.jar()\nvar request = request.defaults({jar:j})\nrequest('http://www.google.com', function () {\n  request('http://images.google.com')\n})\n```\n\nOR\n\n```js\nvar j = request.jar();\nvar cookie = request.cookie('key1=value1');\nvar url = 'http://www.google.com';\nj.setCookie(cookie, url);\nrequest({url: url, jar: j}, function () {\n  request('http://images.google.com')\n})\n```\n\nTo use a custom cookie store (such as a\n[`FileCookieStore`](https://github.com/mitsuru/tough-cookie-filestore)\nwhich supports saving to and restoring from JSON files), pass it as a parameter\nto `request.jar()`:\n\n```js\nvar FileCookieStore = require('tough-cookie-filestore');\n// NOTE - currently the 'cookies.json' file must already exist!\nvar j = request.jar(new FileCookieStore('cookies.json'));\nrequest = request.defaults({ jar : j })\nrequest('http://www.google.com', function() {\n  request('http://images.google.com')\n})\n```\n\nThe cookie store must be a\n[`tough-cookie`](https://github.com/goinstant/tough-cookie)\nstore and it must support synchronous operations; see the\n[`CookieStore` API docs](https://github.com/goinstant/tough-cookie/#cookiestore-api)\nfor details.\n\nTo inspect your cookie jar after a request:\n\n```js\nvar j = request.jar()\nrequest({url: 'http://www.google.com', jar: j}, function () {\n  var cookie_string = j.getCookieString(url); // \"key1=value1; key2=value2; ...\"\n  var cookies = j.getCookies(url);\n  // [{key: 'key1', value: 'value1', domain: \"www.google.com\", ...}, ...]\n})\n```\n\n[back to top](#table-of-contents)\n",
+  "readmeFilename": "README.md",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/request/request.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/request/-/request-2.64.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "lint": "eslint lib/ *.js tests/ && echo Lint passed.",
+    "test": "npm run lint && npm run test-ci && npm run test-browser",
+    "test-browser": "node tests/browser/start.js",
+    "test-ci": "taper tests/test-*.js",
+    "test-cov": "istanbul cover tape tests/test-*.js"
+  },
+  "tags": [
+    "http",
+    "simple",
+    "util",
+    "utility"
+  ],
+  "version": "2.64.0"
 }
diff --git a/deps/npm/node_modules/retry/package.json b/deps/npm/node_modules/retry/package.json
index 75b9680d5a9d66..4f4664e8439647 100644
--- a/deps/npm/node_modules/retry/package.json
+++ b/deps/npm/node_modules/retry/package.json
@@ -1,53 +1,78 @@
 {
+  "_args": [
+    [
+      "retry@~0.8.0",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "retry@>=0.8.0 <0.9.0",
+  "_id": "retry@0.8.0",
+  "_inCache": true,
+  "_location": "/retry",
+  "_nodeVersion": "0.10.33",
+  "_npmUser": {
+    "email": "tim@debuggable.com",
+    "name": "tim-kos"
+  },
+  "_npmVersion": "2.1.7",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "retry",
+    "raw": "retry@~0.8.0",
+    "rawSpec": "~0.8.0",
+    "scope": null,
+    "spec": ">=0.8.0 <0.9.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz",
+  "_shasum": "2367628dc0edb247b1eab649dc53ac8628ac2d5f",
+  "_shrinkwrap": null,
+  "_spec": "retry@~0.8.0",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Tim Koschützki",
     "email": "tim@debuggable.com",
+    "name": "Tim Koschützki",
     "url": "http://debuggable.com/"
   },
-  "name": "retry",
+  "bugs": {
+    "url": "https://github.com/tim-kos/node-retry/issues"
+  },
+  "dependencies": {},
   "description": "Abstraction for exponential and custom retry strategies for failed operations.",
-  "license": "MIT",
-  "version": "0.8.0",
-  "homepage": "https://github.com/tim-kos/node-retry",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/tim-kos/node-retry.git"
+  "devDependencies": {
+    "fake": "0.2.0",
+    "far": "0.0.1"
   },
   "directories": {
     "lib": "./lib"
   },
-  "main": "index",
+  "dist": {
+    "shasum": "2367628dc0edb247b1eab649dc53ac8628ac2d5f",
+    "tarball": "http://registry.npmjs.org/retry/-/retry-0.8.0.tgz"
+  },
   "engines": {
     "node": "*"
   },
-  "dependencies": {},
-  "devDependencies": {
-    "fake": "0.2.0",
-    "far": "0.0.1"
-  },
   "gitHead": "9446e803d6a41ae08732a4a215ae5bf1ff1ccfdd",
-  "bugs": {
-    "url": "https://github.com/tim-kos/node-retry/issues"
-  },
-  "_id": "retry@0.8.0",
-  "scripts": {},
-  "_shasum": "2367628dc0edb247b1eab649dc53ac8628ac2d5f",
-  "_from": "retry@0.8.0",
-  "_npmVersion": "2.1.7",
-  "_nodeVersion": "0.10.33",
-  "_npmUser": {
-    "name": "tim-kos",
-    "email": "tim@debuggable.com"
-  },
+  "homepage": "https://github.com/tim-kos/node-retry",
+  "installable": true,
+  "license": "MIT",
+  "main": "index",
   "maintainers": [
     {
       "name": "tim-kos",
       "email": "tim@debuggable.com"
     }
   ],
-  "dist": {
-    "shasum": "2367628dc0edb247b1eab649dc53ac8628ac2d5f",
-    "tarball": "http://registry.npmjs.org/retry/-/retry-0.8.0.tgz"
+  "name": "retry",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/tim-kos/node-retry.git"
   },
-  "_resolved": "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"
+  "scripts": {},
+  "version": "0.8.0"
 }
diff --git a/deps/npm/node_modules/rimraf/package.json b/deps/npm/node_modules/rimraf/package.json
index 7576f528f72db2..0f0f454ff36b78 100644
--- a/deps/npm/node_modules/rimraf/package.json
+++ b/deps/npm/node_modules/rimraf/package.json
@@ -1,61 +1,92 @@
 {
-  "name": "rimraf",
-  "version": "2.4.3",
-  "main": "rimraf.js",
-  "description": "A deep deletion module for node (like `rm -rf`)",
+  "_args": [
+    [
+      "rimraf@2.4.3",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "rimraf@2.4.3",
+  "_id": "rimraf@2.4.3",
+  "_inCache": true,
+  "_location": "/rimraf",
+  "_nodeVersion": "2.2.1",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
+  },
+  "_npmVersion": "3.2.2",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "rimraf",
+    "raw": "rimraf@2.4.3",
+    "rawSpec": "2.4.3",
+    "scope": null,
+    "spec": "2.4.3",
+    "type": "version"
+  },
+  "_requiredBy": [
+    "/",
+    "/fs-vacuum",
+    "/fstream",
+    "/node-gyp",
+    "/npm-registry-client",
+    "/nyc",
+    "/spawn-wrap"
+  ],
+  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
+  "_shasum": "e5b51c9437a4c582adb955e9f28cf8d945e272af",
+  "_shrinkwrap": null,
+  "_spec": "rimraf@2.4.3",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "license": "ISC",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/rimraf.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
   "bin": {
     "rimraf": "./bin.js"
   },
+  "bugs": {
+    "url": "https://github.com/isaacs/rimraf/issues"
+  },
   "dependencies": {
     "glob": "^5.0.14"
   },
-  "files": [
-    "LICENSE",
-    "README.md",
-    "bin.js",
-    "rimraf.js"
-  ],
+  "description": "A deep deletion module for node (like `rm -rf`)",
   "devDependencies": {
     "mkdirp": "^0.5.1",
     "tap": "^1.3.1"
   },
-  "gitHead": "ec7050f8ca14c931b847414f18466e601ca7c02e",
-  "bugs": {
-    "url": "https://github.com/isaacs/rimraf/issues"
-  },
-  "homepage": "https://github.com/isaacs/rimraf#readme",
-  "_id": "rimraf@2.4.3",
-  "_shasum": "e5b51c9437a4c582adb955e9f28cf8d945e272af",
-  "_from": "rimraf@2.4.3",
-  "_npmVersion": "3.2.2",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
-  },
+  "directories": {},
   "dist": {
     "shasum": "e5b51c9437a4c582adb955e9f28cf8d945e272af",
     "tarball": "http://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz"
   },
+  "files": [
+    "LICENSE",
+    "README.md",
+    "bin.js",
+    "rimraf.js"
+  ],
+  "gitHead": "ec7050f8ca14c931b847414f18466e601ca7c02e",
+  "homepage": "https://github.com/isaacs/rimraf#readme",
+  "installable": true,
+  "license": "ISC",
+  "main": "rimraf.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz"
+  "name": "rimraf",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/rimraf.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "2.4.3"
 }
diff --git a/deps/npm/node_modules/semver/package.json b/deps/npm/node_modules/semver/package.json
index b3a540c1643bb5..d4235760dc1bfa 100644
--- a/deps/npm/node_modules/semver/package.json
+++ b/deps/npm/node_modules/semver/package.json
@@ -1,40 +1,65 @@
 {
-  "name": "semver",
-  "version": "5.0.3",
-  "description": "The semantic version parser used by npm.",
-  "main": "semver.js",
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "devDependencies": {
-    "tap": "^1.3.4"
+  "_args": [
+    [
+      "semver@~5.0.1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "semver@>=5.0.1 <5.1.0",
+  "_id": "semver@5.0.3",
+  "_inCache": true,
+  "_location": "/semver",
+  "_nodeVersion": "4.0.0",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
   },
-  "license": "ISC",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/node-semver.git"
+  "_npmVersion": "3.3.2",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "semver",
+    "raw": "semver@~5.0.1",
+    "rawSpec": "~5.0.1",
+    "scope": null,
+    "spec": ">=5.0.1 <5.1.0",
+    "type": "range"
   },
+  "_requiredBy": [
+    "/",
+    "/init-package-json",
+    "/node-gyp",
+    "/normalize-package-data",
+    "/npm-install-checks",
+    "/npm-package-arg",
+    "/npm-registry-client",
+    "/read-installed"
+  ],
+  "_resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
+  "_shasum": "77466de589cd5d3c95f138aa78bc569a3cb5d27a",
+  "_shrinkwrap": null,
+  "_spec": "semver@~5.0.1",
+  "_where": "/Users/rebecca/code/npm",
   "bin": {
     "semver": "./bin/semver"
   },
-  "gitHead": "5f89ecbe78145ad0b501cf6279f602a23c89738d",
   "bugs": {
     "url": "https://github.com/npm/node-semver/issues"
   },
-  "homepage": "https://github.com/npm/node-semver#readme",
-  "_id": "semver@5.0.3",
-  "_shasum": "77466de589cd5d3c95f138aa78bc569a3cb5d27a",
-  "_from": "semver@5.0.3",
-  "_npmVersion": "3.3.2",
-  "_nodeVersion": "4.0.0",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
+  "dependencies": {},
+  "description": "The semantic version parser used by npm.",
+  "devDependencies": {
+    "tap": "^1.3.4"
   },
+  "directories": {},
   "dist": {
     "shasum": "77466de589cd5d3c95f138aa78bc569a3cb5d27a",
     "tarball": "http://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
   },
+  "gitHead": "5f89ecbe78145ad0b501cf6279f602a23c89738d",
+  "homepage": "https://github.com/npm/node-semver#readme",
+  "installable": true,
+  "license": "ISC",
+  "main": "semver.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -45,6 +70,14 @@
       "email": "ogd@aoaioxxysz.net"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
+  "name": "semver",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/node-semver.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "5.0.3"
 }
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/README.md b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/README.md
deleted file mode 100644
index 5a76b4149c5eb5..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# core-util-is
-
-The `util.is*` functions introduced in Node v0.12.
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/float.patch b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/float.patch
deleted file mode 100644
index a06d5c05f75fd5..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/float.patch
+++ /dev/null
@@ -1,604 +0,0 @@
-diff --git a/lib/util.js b/lib/util.js
-index a03e874..9074e8e 100644
---- a/lib/util.js
-+++ b/lib/util.js
-@@ -19,430 +19,6 @@
- // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- // USE OR OTHER DEALINGS IN THE SOFTWARE.
-
--var formatRegExp = /%[sdj%]/g;
--exports.format = function(f) {
--  if (!isString(f)) {
--    var objects = [];
--    for (var i = 0; i < arguments.length; i++) {
--      objects.push(inspect(arguments[i]));
--    }
--    return objects.join(' ');
--  }
--
--  var i = 1;
--  var args = arguments;
--  var len = args.length;
--  var str = String(f).replace(formatRegExp, function(x) {
--    if (x === '%%') return '%';
--    if (i >= len) return x;
--    switch (x) {
--      case '%s': return String(args[i++]);
--      case '%d': return Number(args[i++]);
--      case '%j':
--        try {
--          return JSON.stringify(args[i++]);
--        } catch (_) {
--          return '[Circular]';
--        }
--      default:
--        return x;
--    }
--  });
--  for (var x = args[i]; i < len; x = args[++i]) {
--    if (isNull(x) || !isObject(x)) {
--      str += ' ' + x;
--    } else {
--      str += ' ' + inspect(x);
--    }
--  }
--  return str;
--};
--
--
--// Mark that a method should not be used.
--// Returns a modified function which warns once by default.
--// If --no-deprecation is set, then it is a no-op.
--exports.deprecate = function(fn, msg) {
--  // Allow for deprecating things in the process of starting up.
--  if (isUndefined(global.process)) {
--    return function() {
--      return exports.deprecate(fn, msg).apply(this, arguments);
--    };
--  }
--
--  if (process.noDeprecation === true) {
--    return fn;
--  }
--
--  var warned = false;
--  function deprecated() {
--    if (!warned) {
--      if (process.throwDeprecation) {
--        throw new Error(msg);
--      } else if (process.traceDeprecation) {
--        console.trace(msg);
--      } else {
--        console.error(msg);
--      }
--      warned = true;
--    }
--    return fn.apply(this, arguments);
--  }
--
--  return deprecated;
--};
--
--
--var debugs = {};
--var debugEnviron;
--exports.debuglog = function(set) {
--  if (isUndefined(debugEnviron))
--    debugEnviron = process.env.NODE_DEBUG || '';
--  set = set.toUpperCase();
--  if (!debugs[set]) {
--    if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
--      var pid = process.pid;
--      debugs[set] = function() {
--        var msg = exports.format.apply(exports, arguments);
--        console.error('%s %d: %s', set, pid, msg);
--      };
--    } else {
--      debugs[set] = function() {};
--    }
--  }
--  return debugs[set];
--};
--
--
--/**
-- * Echos the value of a value. Trys to print the value out
-- * in the best way possible given the different types.
-- *
-- * @param {Object} obj The object to print out.
-- * @param {Object} opts Optional options object that alters the output.
-- */
--/* legacy: obj, showHidden, depth, colors*/
--function inspect(obj, opts) {
--  // default options
--  var ctx = {
--    seen: [],
--    stylize: stylizeNoColor
--  };
--  // legacy...
--  if (arguments.length >= 3) ctx.depth = arguments[2];
--  if (arguments.length >= 4) ctx.colors = arguments[3];
--  if (isBoolean(opts)) {
--    // legacy...
--    ctx.showHidden = opts;
--  } else if (opts) {
--    // got an "options" object
--    exports._extend(ctx, opts);
--  }
--  // set default options
--  if (isUndefined(ctx.showHidden)) ctx.showHidden = false;
--  if (isUndefined(ctx.depth)) ctx.depth = 2;
--  if (isUndefined(ctx.colors)) ctx.colors = false;
--  if (isUndefined(ctx.customInspect)) ctx.customInspect = true;
--  if (ctx.colors) ctx.stylize = stylizeWithColor;
--  return formatValue(ctx, obj, ctx.depth);
--}
--exports.inspect = inspect;
--
--
--// http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
--inspect.colors = {
--  'bold' : [1, 22],
--  'italic' : [3, 23],
--  'underline' : [4, 24],
--  'inverse' : [7, 27],
--  'white' : [37, 39],
--  'grey' : [90, 39],
--  'black' : [30, 39],
--  'blue' : [34, 39],
--  'cyan' : [36, 39],
--  'green' : [32, 39],
--  'magenta' : [35, 39],
--  'red' : [31, 39],
--  'yellow' : [33, 39]
--};
--
--// Don't use 'blue' not visible on cmd.exe
--inspect.styles = {
--  'special': 'cyan',
--  'number': 'yellow',
--  'boolean': 'yellow',
--  'undefined': 'grey',
--  'null': 'bold',
--  'string': 'green',
--  'date': 'magenta',
--  // "name": intentionally not styling
--  'regexp': 'red'
--};
--
--
--function stylizeWithColor(str, styleType) {
--  var style = inspect.styles[styleType];
--
--  if (style) {
--    return '\u001b[' + inspect.colors[style][0] + 'm' + str +
--           '\u001b[' + inspect.colors[style][1] + 'm';
--  } else {
--    return str;
--  }
--}
--
--
--function stylizeNoColor(str, styleType) {
--  return str;
--}
--
--
--function arrayToHash(array) {
--  var hash = {};
--
--  array.forEach(function(val, idx) {
--    hash[val] = true;
--  });
--
--  return hash;
--}
--
--
--function formatValue(ctx, value, recurseTimes) {
--  // Provide a hook for user-specified inspect functions.
--  // Check that value is an object with an inspect function on it
--  if (ctx.customInspect &&
--      value &&
--      isFunction(value.inspect) &&
--      // Filter out the util module, it's inspect function is special
--      value.inspect !== exports.inspect &&
--      // Also filter out any prototype objects using the circular check.
--      !(value.constructor && value.constructor.prototype === value)) {
--    var ret = value.inspect(recurseTimes, ctx);
--    if (!isString(ret)) {
--      ret = formatValue(ctx, ret, recurseTimes);
--    }
--    return ret;
--  }
--
--  // Primitive types cannot have properties
--  var primitive = formatPrimitive(ctx, value);
--  if (primitive) {
--    return primitive;
--  }
--
--  // Look up the keys of the object.
--  var keys = Object.keys(value);
--  var visibleKeys = arrayToHash(keys);
--
--  if (ctx.showHidden) {
--    keys = Object.getOwnPropertyNames(value);
--  }
--
--  // Some type of object without properties can be shortcutted.
--  if (keys.length === 0) {
--    if (isFunction(value)) {
--      var name = value.name ? ': ' + value.name : '';
--      return ctx.stylize('[Function' + name + ']', 'special');
--    }
--    if (isRegExp(value)) {
--      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
--    }
--    if (isDate(value)) {
--      return ctx.stylize(Date.prototype.toString.call(value), 'date');
--    }
--    if (isError(value)) {
--      return formatError(value);
--    }
--  }
--
--  var base = '', array = false, braces = ['{', '}'];
--
--  // Make Array say that they are Array
--  if (isArray(value)) {
--    array = true;
--    braces = ['[', ']'];
--  }
--
--  // Make functions say that they are functions
--  if (isFunction(value)) {
--    var n = value.name ? ': ' + value.name : '';
--    base = ' [Function' + n + ']';
--  }
--
--  // Make RegExps say that they are RegExps
--  if (isRegExp(value)) {
--    base = ' ' + RegExp.prototype.toString.call(value);
--  }
--
--  // Make dates with properties first say the date
--  if (isDate(value)) {
--    base = ' ' + Date.prototype.toUTCString.call(value);
--  }
--
--  // Make error with message first say the error
--  if (isError(value)) {
--    base = ' ' + formatError(value);
--  }
--
--  if (keys.length === 0 && (!array || value.length == 0)) {
--    return braces[0] + base + braces[1];
--  }
--
--  if (recurseTimes < 0) {
--    if (isRegExp(value)) {
--      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
--    } else {
--      return ctx.stylize('[Object]', 'special');
--    }
--  }
--
--  ctx.seen.push(value);
--
--  var output;
--  if (array) {
--    output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
--  } else {
--    output = keys.map(function(key) {
--      return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
--    });
--  }
--
--  ctx.seen.pop();
--
--  return reduceToSingleString(output, base, braces);
--}
--
--
--function formatPrimitive(ctx, value) {
--  if (isUndefined(value))
--    return ctx.stylize('undefined', 'undefined');
--  if (isString(value)) {
--    var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
--                                             .replace(/'/g, "\\'")
--                                             .replace(/\\"/g, '"') + '\'';
--    return ctx.stylize(simple, 'string');
--  }
--  if (isNumber(value)) {
--    // Format -0 as '-0'. Strict equality won't distinguish 0 from -0,
--    // so instead we use the fact that 1 / -0 < 0 whereas 1 / 0 > 0 .
--    if (value === 0 && 1 / value < 0)
--      return ctx.stylize('-0', 'number');
--    return ctx.stylize('' + value, 'number');
--  }
--  if (isBoolean(value))
--    return ctx.stylize('' + value, 'boolean');
--  // For some reason typeof null is "object", so special case here.
--  if (isNull(value))
--    return ctx.stylize('null', 'null');
--}
--
--
--function formatError(value) {
--  return '[' + Error.prototype.toString.call(value) + ']';
--}
--
--
--function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
--  var output = [];
--  for (var i = 0, l = value.length; i < l; ++i) {
--    if (hasOwnProperty(value, String(i))) {
--      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
--          String(i), true));
--    } else {
--      output.push('');
--    }
--  }
--  keys.forEach(function(key) {
--    if (!key.match(/^\d+$/)) {
--      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
--          key, true));
--    }
--  });
--  return output;
--}
--
--
--function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
--  var name, str, desc;
--  desc = Object.getOwnPropertyDescriptor(value, key) || { value: value[key] };
--  if (desc.get) {
--    if (desc.set) {
--      str = ctx.stylize('[Getter/Setter]', 'special');
--    } else {
--      str = ctx.stylize('[Getter]', 'special');
--    }
--  } else {
--    if (desc.set) {
--      str = ctx.stylize('[Setter]', 'special');
--    }
--  }
--  if (!hasOwnProperty(visibleKeys, key)) {
--    name = '[' + key + ']';
--  }
--  if (!str) {
--    if (ctx.seen.indexOf(desc.value) < 0) {
--      if (isNull(recurseTimes)) {
--        str = formatValue(ctx, desc.value, null);
--      } else {
--        str = formatValue(ctx, desc.value, recurseTimes - 1);
--      }
--      if (str.indexOf('\n') > -1) {
--        if (array) {
--          str = str.split('\n').map(function(line) {
--            return '  ' + line;
--          }).join('\n').substr(2);
--        } else {
--          str = '\n' + str.split('\n').map(function(line) {
--            return '   ' + line;
--          }).join('\n');
--        }
--      }
--    } else {
--      str = ctx.stylize('[Circular]', 'special');
--    }
--  }
--  if (isUndefined(name)) {
--    if (array && key.match(/^\d+$/)) {
--      return str;
--    }
--    name = JSON.stringify('' + key);
--    if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
--      name = name.substr(1, name.length - 2);
--      name = ctx.stylize(name, 'name');
--    } else {
--      name = name.replace(/'/g, "\\'")
--                 .replace(/\\"/g, '"')
--                 .replace(/(^"|"$)/g, "'");
--      name = ctx.stylize(name, 'string');
--    }
--  }
--
--  return name + ': ' + str;
--}
--
--
--function reduceToSingleString(output, base, braces) {
--  var numLinesEst = 0;
--  var length = output.reduce(function(prev, cur) {
--    numLinesEst++;
--    if (cur.indexOf('\n') >= 0) numLinesEst++;
--    return prev + cur.replace(/\u001b\[\d\d?m/g, '').length + 1;
--  }, 0);
--
--  if (length > 60) {
--    return braces[0] +
--           (base === '' ? '' : base + '\n ') +
--           ' ' +
--           output.join(',\n  ') +
--           ' ' +
--           braces[1];
--  }
--
--  return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
--}
--
--
- // NOTE: These type checking functions intentionally don't use `instanceof`
- // because it is fragile and can be easily faked with `Object.create()`.
- function isArray(ar) {
-@@ -522,166 +98,10 @@ function isPrimitive(arg) {
- exports.isPrimitive = isPrimitive;
-
- function isBuffer(arg) {
--  return arg instanceof Buffer;
-+  return Buffer.isBuffer(arg);
- }
- exports.isBuffer = isBuffer;
-
- function objectToString(o) {
-   return Object.prototype.toString.call(o);
--}
--
--
--function pad(n) {
--  return n < 10 ? '0' + n.toString(10) : n.toString(10);
--}
--
--
--var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',
--              'Oct', 'Nov', 'Dec'];
--
--// 26 Feb 16:19:34
--function timestamp() {
--  var d = new Date();
--  var time = [pad(d.getHours()),
--              pad(d.getMinutes()),
--              pad(d.getSeconds())].join(':');
--  return [d.getDate(), months[d.getMonth()], time].join(' ');
--}
--
--
--// log is just a thin wrapper to console.log that prepends a timestamp
--exports.log = function() {
--  console.log('%s - %s', timestamp(), exports.format.apply(exports, arguments));
--};
--
--
--/**
-- * Inherit the prototype methods from one constructor into another.
-- *
-- * The Function.prototype.inherits from lang.js rewritten as a standalone
-- * function (not on Function.prototype). NOTE: If this file is to be loaded
-- * during bootstrapping this function needs to be rewritten using some native
-- * functions as prototype setup using normal JavaScript does not work as
-- * expected during bootstrapping (see mirror.js in r114903).
-- *
-- * @param {function} ctor Constructor function which needs to inherit the
-- *     prototype.
-- * @param {function} superCtor Constructor function to inherit prototype from.
-- */
--exports.inherits = function(ctor, superCtor) {
--  ctor.super_ = superCtor;
--  ctor.prototype = Object.create(superCtor.prototype, {
--    constructor: {
--      value: ctor,
--      enumerable: false,
--      writable: true,
--      configurable: true
--    }
--  });
--};
--
--exports._extend = function(origin, add) {
--  // Don't do anything if add isn't an object
--  if (!add || !isObject(add)) return origin;
--
--  var keys = Object.keys(add);
--  var i = keys.length;
--  while (i--) {
--    origin[keys[i]] = add[keys[i]];
--  }
--  return origin;
--};
--
--function hasOwnProperty(obj, prop) {
--  return Object.prototype.hasOwnProperty.call(obj, prop);
--}
--
--
--// Deprecated old stuff.
--
--exports.p = exports.deprecate(function() {
--  for (var i = 0, len = arguments.length; i < len; ++i) {
--    console.error(exports.inspect(arguments[i]));
--  }
--}, 'util.p: Use console.error() instead');
--
--
--exports.exec = exports.deprecate(function() {
--  return require('child_process').exec.apply(this, arguments);
--}, 'util.exec is now called `child_process.exec`.');
--
--
--exports.print = exports.deprecate(function() {
--  for (var i = 0, len = arguments.length; i < len; ++i) {
--    process.stdout.write(String(arguments[i]));
--  }
--}, 'util.print: Use console.log instead');
--
--
--exports.puts = exports.deprecate(function() {
--  for (var i = 0, len = arguments.length; i < len; ++i) {
--    process.stdout.write(arguments[i] + '\n');
--  }
--}, 'util.puts: Use console.log instead');
--
--
--exports.debug = exports.deprecate(function(x) {
--  process.stderr.write('DEBUG: ' + x + '\n');
--}, 'util.debug: Use console.error instead');
--
--
--exports.error = exports.deprecate(function(x) {
--  for (var i = 0, len = arguments.length; i < len; ++i) {
--    process.stderr.write(arguments[i] + '\n');
--  }
--}, 'util.error: Use console.error instead');
--
--
--exports.pump = exports.deprecate(function(readStream, writeStream, callback) {
--  var callbackCalled = false;
--
--  function call(a, b, c) {
--    if (callback && !callbackCalled) {
--      callback(a, b, c);
--      callbackCalled = true;
--    }
--  }
--
--  readStream.addListener('data', function(chunk) {
--    if (writeStream.write(chunk) === false) readStream.pause();
--  });
--
--  writeStream.addListener('drain', function() {
--    readStream.resume();
--  });
--
--  readStream.addListener('end', function() {
--    writeStream.end();
--  });
--
--  readStream.addListener('close', function() {
--    call();
--  });
--
--  readStream.addListener('error', function(err) {
--    writeStream.end();
--    call(err);
--  });
--
--  writeStream.addListener('error', function(err) {
--    readStream.destroy();
--    call(err);
--  });
--}, 'util.pump(): Use readableStream.pipe() instead');
--
--
--var uv;
--exports._errnoException = function(err, syscall) {
--  if (isUndefined(uv)) uv = process.binding('uv');
--  var errname = uv.errname(err);
--  var e = new Error(syscall + ' ' + errname);
--  e.code = errname;
--  e.errno = errname;
--  e.syscall = syscall;
--  return e;
--};
-+}
\ No newline at end of file
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/lib/util.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
deleted file mode 100644
index 9074e8ebcb61e9..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-// NOTE: These type checking functions intentionally don't use `instanceof`
-// because it is fragile and can be easily faked with `Object.create()`.
-function isArray(ar) {
-  return Array.isArray(ar);
-}
-exports.isArray = isArray;
-
-function isBoolean(arg) {
-  return typeof arg === 'boolean';
-}
-exports.isBoolean = isBoolean;
-
-function isNull(arg) {
-  return arg === null;
-}
-exports.isNull = isNull;
-
-function isNullOrUndefined(arg) {
-  return arg == null;
-}
-exports.isNullOrUndefined = isNullOrUndefined;
-
-function isNumber(arg) {
-  return typeof arg === 'number';
-}
-exports.isNumber = isNumber;
-
-function isString(arg) {
-  return typeof arg === 'string';
-}
-exports.isString = isString;
-
-function isSymbol(arg) {
-  return typeof arg === 'symbol';
-}
-exports.isSymbol = isSymbol;
-
-function isUndefined(arg) {
-  return arg === void 0;
-}
-exports.isUndefined = isUndefined;
-
-function isRegExp(re) {
-  return isObject(re) && objectToString(re) === '[object RegExp]';
-}
-exports.isRegExp = isRegExp;
-
-function isObject(arg) {
-  return typeof arg === 'object' && arg !== null;
-}
-exports.isObject = isObject;
-
-function isDate(d) {
-  return isObject(d) && objectToString(d) === '[object Date]';
-}
-exports.isDate = isDate;
-
-function isError(e) {
-  return isObject(e) &&
-      (objectToString(e) === '[object Error]' || e instanceof Error);
-}
-exports.isError = isError;
-
-function isFunction(arg) {
-  return typeof arg === 'function';
-}
-exports.isFunction = isFunction;
-
-function isPrimitive(arg) {
-  return arg === null ||
-         typeof arg === 'boolean' ||
-         typeof arg === 'number' ||
-         typeof arg === 'string' ||
-         typeof arg === 'symbol' ||  // ES6 symbol
-         typeof arg === 'undefined';
-}
-exports.isPrimitive = isPrimitive;
-
-function isBuffer(arg) {
-  return Buffer.isBuffer(arg);
-}
-exports.isBuffer = isBuffer;
-
-function objectToString(o) {
-  return Object.prototype.toString.call(o);
-}
\ No newline at end of file
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/util.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/util.js
deleted file mode 100644
index 007fa10575636d..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/util.js
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-// NOTE: These type checking functions intentionally don't use `instanceof`
-// because it is fragile and can be easily faked with `Object.create()`.
-function isArray(ar) {
-  return Array.isArray(ar);
-}
-exports.isArray = isArray;
-
-function isBoolean(arg) {
-  return typeof arg === 'boolean';
-}
-exports.isBoolean = isBoolean;
-
-function isNull(arg) {
-  return arg === null;
-}
-exports.isNull = isNull;
-
-function isNullOrUndefined(arg) {
-  return arg == null;
-}
-exports.isNullOrUndefined = isNullOrUndefined;
-
-function isNumber(arg) {
-  return typeof arg === 'number';
-}
-exports.isNumber = isNumber;
-
-function isString(arg) {
-  return typeof arg === 'string';
-}
-exports.isString = isString;
-
-function isSymbol(arg) {
-  return typeof arg === 'symbol';
-}
-exports.isSymbol = isSymbol;
-
-function isUndefined(arg) {
-  return arg === void 0;
-}
-exports.isUndefined = isUndefined;
-
-function isRegExp(re) {
-  return isObject(re) && objectToString(re) === '[object RegExp]';
-}
-exports.isRegExp = isRegExp;
-
-function isObject(arg) {
-  return typeof arg === 'object' && arg !== null;
-}
-exports.isObject = isObject;
-
-function isDate(d) {
-  return isObject(d) && objectToString(d) === '[object Date]';
-}
-exports.isDate = isDate;
-
-function isError(e) {
-  return isObject(e) && objectToString(e) === '[object Error]';
-}
-exports.isError = isError;
-
-function isFunction(arg) {
-  return typeof arg === 'function';
-}
-exports.isFunction = isFunction;
-
-function isPrimitive(arg) {
-  return arg === null ||
-         typeof arg === 'boolean' ||
-         typeof arg === 'number' ||
-         typeof arg === 'string' ||
-         typeof arg === 'symbol' ||  // ES6 symbol
-         typeof arg === 'undefined';
-}
-exports.isPrimitive = isPrimitive;
-
-function isBuffer(arg) {
-  return arg instanceof Buffer;
-}
-exports.isBuffer = isBuffer;
-
-function objectToString(o) {
-  return Object.prototype.toString.call(o);
-}
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/README.md b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/README.md
deleted file mode 100644
index 052a62b8d7b7ae..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/README.md
+++ /dev/null
@@ -1,54 +0,0 @@
-
-# isarray
-
-`Array#isArray` for older browsers.
-
-## Usage
-
-```js
-var isArray = require('isarray');
-
-console.log(isArray([])); // => true
-console.log(isArray({})); // => false
-```
-
-## Installation
-
-With [npm](http://npmjs.org) do
-
-```bash
-$ npm install isarray
-```
-
-Then bundle for the browser with
-[browserify](https://github.com/substack/browserify).
-
-With [component](http://component.io) do
-
-```bash
-$ component install juliangruber/isarray
-```
-
-## License
-
-(MIT)
-
-Copyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/build/build.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/build/build.js
deleted file mode 100644
index e1856ef0943728..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/build/build.js
+++ /dev/null
@@ -1,208 +0,0 @@
-
-/**
- * Require the given path.
- *
- * @param {String} path
- * @return {Object} exports
- * @api public
- */
-
-function require(path, parent, orig) {
-  var resolved = require.resolve(path);
-
-  // lookup failed
-  if (null == resolved) {
-    orig = orig || path;
-    parent = parent || 'root';
-    var err = new Error('Failed to require "' + orig + '" from "' + parent + '"');
-    err.path = orig;
-    err.parent = parent;
-    err.require = true;
-    throw err;
-  }
-
-  var module = require.modules[resolved];
-
-  // perform real require()
-  // by invoking the module's
-  // registered function
-  if (!module.exports) {
-    module.exports = {};
-    module.client = module.component = true;
-    module.call(this, module.exports, require.relative(resolved), module);
-  }
-
-  return module.exports;
-}
-
-/**
- * Registered modules.
- */
-
-require.modules = {};
-
-/**
- * Registered aliases.
- */
-
-require.aliases = {};
-
-/**
- * Resolve `path`.
- *
- * Lookup:
- *
- *   - PATH/index.js
- *   - PATH.js
- *   - PATH
- *
- * @param {String} path
- * @return {String} path or null
- * @api private
- */
-
-require.resolve = function(path) {
-  if (path.charAt(0) === '/') path = path.slice(1);
-  var index = path + '/index.js';
-
-  var paths = [
-    path,
-    path + '.js',
-    path + '.json',
-    path + '/index.js',
-    path + '/index.json'
-  ];
-
-  for (var i = 0; i < paths.length; i++) {
-    var path = paths[i];
-    if (require.modules.hasOwnProperty(path)) return path;
-  }
-
-  if (require.aliases.hasOwnProperty(index)) {
-    return require.aliases[index];
-  }
-};
-
-/**
- * Normalize `path` relative to the current path.
- *
- * @param {String} curr
- * @param {String} path
- * @return {String}
- * @api private
- */
-
-require.normalize = function(curr, path) {
-  var segs = [];
-
-  if ('.' != path.charAt(0)) return path;
-
-  curr = curr.split('/');
-  path = path.split('/');
-
-  for (var i = 0; i < path.length; ++i) {
-    if ('..' == path[i]) {
-      curr.pop();
-    } else if ('.' != path[i] && '' != path[i]) {
-      segs.push(path[i]);
-    }
-  }
-
-  return curr.concat(segs).join('/');
-};
-
-/**
- * Register module at `path` with callback `definition`.
- *
- * @param {String} path
- * @param {Function} definition
- * @api private
- */
-
-require.register = function(path, definition) {
-  require.modules[path] = definition;
-};
-
-/**
- * Alias a module definition.
- *
- * @param {String} from
- * @param {String} to
- * @api private
- */
-
-require.alias = function(from, to) {
-  if (!require.modules.hasOwnProperty(from)) {
-    throw new Error('Failed to alias "' + from + '", it does not exist');
-  }
-  require.aliases[to] = from;
-};
-
-/**
- * Return a require function relative to the `parent` path.
- *
- * @param {String} parent
- * @return {Function}
- * @api private
- */
-
-require.relative = function(parent) {
-  var p = require.normalize(parent, '..');
-
-  /**
-   * lastIndexOf helper.
-   */
-
-  function lastIndexOf(arr, obj) {
-    var i = arr.length;
-    while (i--) {
-      if (arr[i] === obj) return i;
-    }
-    return -1;
-  }
-
-  /**
-   * The relative require() itself.
-   */
-
-  function localRequire(path) {
-    var resolved = localRequire.resolve(path);
-    return require(resolved, parent, path);
-  }
-
-  /**
-   * Resolve relative to the parent.
-   */
-
-  localRequire.resolve = function(path) {
-    var c = path.charAt(0);
-    if ('/' == c) return path.slice(1);
-    if ('.' == c) return require.normalize(p, path);
-
-    // resolve deps by returning
-    // the dep in the nearest "deps"
-    // directory
-    var segs = parent.split('/');
-    var i = lastIndexOf(segs, 'deps') + 1;
-    if (!i) i = 0;
-    path = segs.slice(0, i + 1).join('/') + '/deps/' + path;
-    return path;
-  };
-
-  /**
-   * Check if module is defined at `path`.
-   */
-
-  localRequire.exists = function(path) {
-    return require.modules.hasOwnProperty(localRequire.resolve(path));
-  };
-
-  return localRequire;
-};
-require.register("isarray/index.js", function(exports, require, module){
-module.exports = Array.isArray || function (arr) {
-  return Object.prototype.toString.call(arr) == '[object Array]';
-};
-
-});
-require.alias("isarray/index.js", "isarray/index.js");
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/component.json b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/component.json
deleted file mode 100644
index 9e31b683889015..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/component.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name" : "isarray",
-  "description" : "Array#isArray for older browsers",
-  "version" : "0.0.1",
-  "repository" : "juliangruber/isarray",
-  "homepage": "https://github.com/juliangruber/isarray",
-  "main" : "index.js",
-  "scripts" : [
-    "index.js"
-  ],
-  "dependencies" : {},
-  "keywords": ["browser","isarray","array"],
-  "author": {
-    "name": "Julian Gruber",
-    "email": "mail@juliangruber.com",
-    "url": "http://juliangruber.com"
-  },
-  "license": "MIT"
-}
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/index.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/index.js
deleted file mode 100644
index 5f5ad45d46dda9..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = Array.isArray || function (arr) {
-  return Object.prototype.toString.call(arr) == '[object Array]';
-};
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/package.json b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/package.json
deleted file mode 100644
index 19228ab6fdcaaf..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/package.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "name": "isarray",
-  "description": "Array#isArray for older browsers",
-  "version": "0.0.1",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/juliangruber/isarray.git"
-  },
-  "homepage": "https://github.com/juliangruber/isarray",
-  "main": "index.js",
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "tap": "*"
-  },
-  "keywords": [
-    "browser",
-    "isarray",
-    "array"
-  ],
-  "author": {
-    "name": "Julian Gruber",
-    "email": "mail@juliangruber.com",
-    "url": "http://juliangruber.com"
-  },
-  "license": "MIT",
-  "_id": "isarray@0.0.1",
-  "dist": {
-    "shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf",
-    "tarball": "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-  },
-  "_from": "isarray@0.0.1",
-  "_npmVersion": "1.2.18",
-  "_npmUser": {
-    "name": "juliangruber",
-    "email": "julian@juliangruber.com"
-  },
-  "maintainers": [
-    {
-      "name": "juliangruber",
-      "email": "julian@juliangruber.com"
-    }
-  ],
-  "directories": {},
-  "_shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf",
-  "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-  "bugs": {
-    "url": "https://github.com/juliangruber/isarray/issues"
-  },
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml
deleted file mode 100644
index 5ac98855343cee..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-language: node_js
-node_js:
-  - "0.8"
-  - "0.10"
-  - "0.11"
-  - "0.12"
-  - "iojs"
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/index.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/index.js
deleted file mode 100644
index 049521cad7ba1b..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use strict';
-module.exports = nextTick;
-
-function nextTick(fn) {
-  var args = new Array(arguments.length - 1);
-  var i = 0;
-  while (i < args.length) {
-    args[i++] = arguments[i];
-  }
-  process.nextTick(function afterTick() {
-    fn.apply(null, args);
-  });
-}
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/license.md b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/license.md
deleted file mode 100644
index c67e3532b54245..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/license.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2015 Calvin Metcalf
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-**THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.**
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/readme.md b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/readme.md
deleted file mode 100644
index 78e7cfaeb7acde..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-process-nextick-args
-=====
-
-[![Build Status](https://travis-ci.org/calvinmetcalf/process-nextick-args.svg?branch=master)](https://travis-ci.org/calvinmetcalf/process-nextick-args)
-
-```bash
-npm install --save process-nextick-args
-```
-
-Always be able to pass arguments to process.nextTick, no matter the platform
-
-```js
-var nextTick = require('process-nextick-args');
-
-nextTick(function (a, b, c) {
-  console.log(a, b, c);
-}, 'step', 3,  'profit');
-```
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/test.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/test.js
deleted file mode 100644
index ef15721584ac99..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var test = require("tap").test;
-var nextTick = require('./');
-
-test('should work', function (t) {
-  t.plan(5);
-  nextTick(function (a) {
-    t.ok(a);
-    nextTick(function (thing) {
-      t.equals(thing, 7);
-    }, 7);
-  }, true);
-  nextTick(function (a, b, c) {
-    t.equals(a, 'step');
-    t.equals(b, 3);
-    t.equals(c, 'profit');
-  }, 'step', 3,  'profit');
-});
-
-test('correct number of arguments', function (t) {
-  t.plan(1);
-  nextTick(function () {
-    t.equals(2, arguments.length, 'correct number');
-  }, 1, 2);
-});
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/.npmignore b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/.npmignore
deleted file mode 100644
index 206320cc1d21b9..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build
-test
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/LICENSE b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/LICENSE
deleted file mode 100644
index 6de584a48f5c89..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright Joyent, Inc. and other Node contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons to whom the Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/README.md b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/README.md
deleted file mode 100644
index 4d2aa001501107..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-**string_decoder.js** (`require('string_decoder')`) from Node.js core
-
-Copyright Joyent, Inc. and other Node contributors. See LICENCE file for details.
-
-Version numbers match the versions found in Node core, e.g. 0.10.24 matches Node 0.10.24, likewise 0.11.10 matches Node 0.11.10. **Prefer the stable version over the unstable.**
-
-The *build/* directory contains a build script that will scrape the source from the [joyent/node](https://github.com/joyent/node) repo given a specific Node version.
\ No newline at end of file
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/index.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/index.js
deleted file mode 100644
index b00e54fb790982..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/index.js
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-var Buffer = require('buffer').Buffer;
-
-var isBufferEncoding = Buffer.isEncoding
-  || function(encoding) {
-       switch (encoding && encoding.toLowerCase()) {
-         case 'hex': case 'utf8': case 'utf-8': case 'ascii': case 'binary': case 'base64': case 'ucs2': case 'ucs-2': case 'utf16le': case 'utf-16le': case 'raw': return true;
-         default: return false;
-       }
-     }
-
-
-function assertEncoding(encoding) {
-  if (encoding && !isBufferEncoding(encoding)) {
-    throw new Error('Unknown encoding: ' + encoding);
-  }
-}
-
-// StringDecoder provides an interface for efficiently splitting a series of
-// buffers into a series of JS strings without breaking apart multi-byte
-// characters. CESU-8 is handled as part of the UTF-8 encoding.
-//
-// @TODO Handling all encodings inside a single object makes it very difficult
-// to reason about this code, so it should be split up in the future.
-// @TODO There should be a utf8-strict encoding that rejects invalid UTF-8 code
-// points as used by CESU-8.
-var StringDecoder = exports.StringDecoder = function(encoding) {
-  this.encoding = (encoding || 'utf8').toLowerCase().replace(/[-_]/, '');
-  assertEncoding(encoding);
-  switch (this.encoding) {
-    case 'utf8':
-      // CESU-8 represents each of Surrogate Pair by 3-bytes
-      this.surrogateSize = 3;
-      break;
-    case 'ucs2':
-    case 'utf16le':
-      // UTF-16 represents each of Surrogate Pair by 2-bytes
-      this.surrogateSize = 2;
-      this.detectIncompleteChar = utf16DetectIncompleteChar;
-      break;
-    case 'base64':
-      // Base-64 stores 3 bytes in 4 chars, and pads the remainder.
-      this.surrogateSize = 3;
-      this.detectIncompleteChar = base64DetectIncompleteChar;
-      break;
-    default:
-      this.write = passThroughWrite;
-      return;
-  }
-
-  // Enough space to store all bytes of a single character. UTF-8 needs 4
-  // bytes, but CESU-8 may require up to 6 (3 bytes per surrogate).
-  this.charBuffer = new Buffer(6);
-  // Number of bytes received for the current incomplete multi-byte character.
-  this.charReceived = 0;
-  // Number of bytes expected for the current incomplete multi-byte character.
-  this.charLength = 0;
-};
-
-
-// write decodes the given buffer and returns it as JS string that is
-// guaranteed to not contain any partial multi-byte characters. Any partial
-// character found at the end of the buffer is buffered up, and will be
-// returned when calling write again with the remaining bytes.
-//
-// Note: Converting a Buffer containing an orphan surrogate to a String
-// currently works, but converting a String to a Buffer (via `new Buffer`, or
-// Buffer#write) will replace incomplete surrogates with the unicode
-// replacement character. See https://codereview.chromium.org/121173009/ .
-StringDecoder.prototype.write = function(buffer) {
-  var charStr = '';
-  // if our last write ended with an incomplete multibyte character
-  while (this.charLength) {
-    // determine how many remaining bytes this buffer has to offer for this char
-    var available = (buffer.length >= this.charLength - this.charReceived) ?
-        this.charLength - this.charReceived :
-        buffer.length;
-
-    // add the new bytes to the char buffer
-    buffer.copy(this.charBuffer, this.charReceived, 0, available);
-    this.charReceived += available;
-
-    if (this.charReceived < this.charLength) {
-      // still not enough chars in this buffer? wait for more ...
-      return '';
-    }
-
-    // remove bytes belonging to the current character from the buffer
-    buffer = buffer.slice(available, buffer.length);
-
-    // get the character that was split
-    charStr = this.charBuffer.slice(0, this.charLength).toString(this.encoding);
-
-    // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character
-    var charCode = charStr.charCodeAt(charStr.length - 1);
-    if (charCode >= 0xD800 && charCode <= 0xDBFF) {
-      this.charLength += this.surrogateSize;
-      charStr = '';
-      continue;
-    }
-    this.charReceived = this.charLength = 0;
-
-    // if there are no more bytes in this buffer, just emit our char
-    if (buffer.length === 0) {
-      return charStr;
-    }
-    break;
-  }
-
-  // determine and set charLength / charReceived
-  this.detectIncompleteChar(buffer);
-
-  var end = buffer.length;
-  if (this.charLength) {
-    // buffer the incomplete character bytes we got
-    buffer.copy(this.charBuffer, 0, buffer.length - this.charReceived, end);
-    end -= this.charReceived;
-  }
-
-  charStr += buffer.toString(this.encoding, 0, end);
-
-  var end = charStr.length - 1;
-  var charCode = charStr.charCodeAt(end);
-  // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character
-  if (charCode >= 0xD800 && charCode <= 0xDBFF) {
-    var size = this.surrogateSize;
-    this.charLength += size;
-    this.charReceived += size;
-    this.charBuffer.copy(this.charBuffer, size, 0, size);
-    buffer.copy(this.charBuffer, 0, 0, size);
-    return charStr.substring(0, end);
-  }
-
-  // or just emit the charStr
-  return charStr;
-};
-
-// detectIncompleteChar determines if there is an incomplete UTF-8 character at
-// the end of the given buffer. If so, it sets this.charLength to the byte
-// length that character, and sets this.charReceived to the number of bytes
-// that are available for this character.
-StringDecoder.prototype.detectIncompleteChar = function(buffer) {
-  // determine how many bytes we have to check at the end of this buffer
-  var i = (buffer.length >= 3) ? 3 : buffer.length;
-
-  // Figure out if one of the last i bytes of our buffer announces an
-  // incomplete char.
-  for (; i > 0; i--) {
-    var c = buffer[buffer.length - i];
-
-    // See http://en.wikipedia.org/wiki/UTF-8#Description
-
-    // 110XXXXX
-    if (i == 1 && c >> 5 == 0x06) {
-      this.charLength = 2;
-      break;
-    }
-
-    // 1110XXXX
-    if (i <= 2 && c >> 4 == 0x0E) {
-      this.charLength = 3;
-      break;
-    }
-
-    // 11110XXX
-    if (i <= 3 && c >> 3 == 0x1E) {
-      this.charLength = 4;
-      break;
-    }
-  }
-  this.charReceived = i;
-};
-
-StringDecoder.prototype.end = function(buffer) {
-  var res = '';
-  if (buffer && buffer.length)
-    res = this.write(buffer);
-
-  if (this.charReceived) {
-    var cr = this.charReceived;
-    var buf = this.charBuffer;
-    var enc = this.encoding;
-    res += buf.slice(0, cr).toString(enc);
-  }
-
-  return res;
-};
-
-function passThroughWrite(buffer) {
-  return buffer.toString(this.encoding);
-}
-
-function utf16DetectIncompleteChar(buffer) {
-  this.charReceived = buffer.length % 2;
-  this.charLength = this.charReceived ? 2 : 0;
-}
-
-function base64DetectIncompleteChar(buffer) {
-  this.charReceived = buffer.length % 3;
-  this.charLength = this.charReceived ? 3 : 0;
-}
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/package.json b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/package.json
deleted file mode 100644
index 0364d54ba46af6..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/package.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "name": "string_decoder",
-  "version": "0.10.31",
-  "description": "The string_decoder module from Node core",
-  "main": "index.js",
-  "dependencies": {},
-  "devDependencies": {
-    "tap": "~0.4.8"
-  },
-  "scripts": {
-    "test": "tap test/simple/*.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/rvagg/string_decoder.git"
-  },
-  "homepage": "https://github.com/rvagg/string_decoder",
-  "keywords": [
-    "string",
-    "decoder",
-    "browser",
-    "browserify"
-  ],
-  "license": "MIT",
-  "gitHead": "d46d4fd87cf1d06e031c23f1ba170ca7d4ade9a0",
-  "bugs": {
-    "url": "https://github.com/rvagg/string_decoder/issues"
-  },
-  "_id": "string_decoder@0.10.31",
-  "_shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94",
-  "_from": "string_decoder@>=0.10.0 <0.11.0",
-  "_npmVersion": "1.4.23",
-  "_npmUser": {
-    "name": "rvagg",
-    "email": "rod@vagg.org"
-  },
-  "maintainers": [
-    {
-      "name": "substack",
-      "email": "mail@substack.net"
-    },
-    {
-      "name": "rvagg",
-      "email": "rod@vagg.org"
-    }
-  ],
-  "dist": {
-    "shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94",
-    "tarball": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/History.md b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/History.md
deleted file mode 100644
index ec010299b1b259..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/History.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-1.0.1 / 2014-11-25
-==================
-
-  * browser: use `console.warn()` for deprecation calls
-  * browser: more jsdocs
-
-1.0.0 / 2014-04-30
-==================
-
-  * initial commit
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/LICENSE b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/LICENSE
deleted file mode 100644
index 6a60e8c225c9ba..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-(The MIT License)
-
-Copyright (c) 2014 Nathan Rajlich <nathan@tootallnate.net>
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/README.md b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/README.md
deleted file mode 100644
index 75622fa7c250a6..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-util-deprecate
-==============
-### The Node.js `util.deprecate()` function with browser support
-
-In Node.js, this module simply re-exports the `util.deprecate()` function.
-
-In the web browser (i.e. via browserify), a browser-specific implementation
-of the `util.deprecate()` function is used.
-
-
-## API
-
-A `deprecate()` function is the only thing exposed by this module.
-
-``` javascript
-// setup:
-exports.foo = deprecate(foo, 'foo() is deprecated, use bar() instead');
-
-
-// users see:
-foo();
-// foo() is deprecated, use bar() instead
-foo();
-foo();
-```
-
-
-## License
-
-(The MIT License)
-
-Copyright (c) 2014 Nathan Rajlich <nathan@tootallnate.net>
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/browser.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/browser.js
deleted file mode 100644
index 55fa5a4bc6056a..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/browser.js
+++ /dev/null
@@ -1,62 +0,0 @@
-
-/**
- * Module exports.
- */
-
-module.exports = deprecate;
-
-/**
- * Mark that a method should not be used.
- * Returns a modified function which warns once by default.
- *
- * If `localStorage.noDeprecation = true` is set, then it is a no-op.
- *
- * If `localStorage.throwDeprecation = true` is set, then deprecated functions
- * will throw an Error when invoked.
- *
- * If `localStorage.traceDeprecation = true` is set, then deprecated functions
- * will invoke `console.trace()` instead of `console.error()`.
- *
- * @param {Function} fn - the function to deprecate
- * @param {String} msg - the string to print to the console when `fn` is invoked
- * @returns {Function} a new "deprecated" version of `fn`
- * @api public
- */
-
-function deprecate (fn, msg) {
-  if (config('noDeprecation')) {
-    return fn;
-  }
-
-  var warned = false;
-  function deprecated() {
-    if (!warned) {
-      if (config('throwDeprecation')) {
-        throw new Error(msg);
-      } else if (config('traceDeprecation')) {
-        console.trace(msg);
-      } else {
-        console.warn(msg);
-      }
-      warned = true;
-    }
-    return fn.apply(this, arguments);
-  }
-
-  return deprecated;
-}
-
-/**
- * Checks `localStorage` for boolean values for the given `name`.
- *
- * @param {String} name
- * @returns {Boolean}
- * @api private
- */
-
-function config (name) {
-  if (!global.localStorage) return false;
-  var val = global.localStorage[name];
-  if (null == val) return false;
-  return String(val).toLowerCase() === 'true';
-}
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/node.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/node.js
deleted file mode 100644
index 5e6fcff5ddd3fb..00000000000000
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/node.js
+++ /dev/null
@@ -1,6 +0,0 @@
-
-/**
- * For Node.js, simply re-export the core `util.deprecate` function.
- */
-
-module.exports = require('util').deprecate;
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/package.json b/deps/npm/node_modules/sha/node_modules/readable-stream/package.json
index 7a333a98a324e1..edc90f8d7cbae6 100644
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/package.json
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/package.json
@@ -1,8 +1,43 @@
 {
-  "name": "readable-stream",
-  "version": "2.0.2",
-  "description": "Streams3, a user-land copy of the stream library from iojs v2.x",
-  "main": "readable.js",
+  "_args": [
+    [
+      "readable-stream@^2.0.2",
+      "/Users/rebecca/code/npm/node_modules/sha"
+    ]
+  ],
+  "_from": "readable-stream@>=2.0.2 <3.0.0",
+  "_id": "readable-stream@2.0.2",
+  "_inCache": true,
+  "_location": "/sha/readable-stream",
+  "_nodeVersion": "2.3.0",
+  "_npmUser": {
+    "email": "calvin.metcalf@gmail.com",
+    "name": "cwmma"
+  },
+  "_npmVersion": "2.11.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "readable-stream",
+    "raw": "readable-stream@^2.0.2",
+    "rawSpec": "^2.0.2",
+    "scope": null,
+    "spec": ">=2.0.2 <3.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/sha"
+  ],
+  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+  "_shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
+  "_shrinkwrap": null,
+  "_spec": "readable-stream@^2.0.2",
+  "_where": "/Users/rebecca/code/npm/node_modules/sha",
+  "browser": {
+    "util": false
+  },
+  "bugs": {
+    "url": "https://github.com/nodejs/readable-stream/issues"
+  },
   "dependencies": {
     "core-util-is": "~1.0.0",
     "inherits": "~2.0.1",
@@ -11,46 +46,27 @@
     "string_decoder": "~0.10.x",
     "util-deprecate": "~1.0.1"
   },
+  "description": "Streams3, a user-land copy of the stream library from iojs v2.x",
   "devDependencies": {
     "tap": "~0.2.6",
     "tape": "~4.0.0",
     "zuul": "~3.0.0"
   },
-  "scripts": {
-    "test": "tap test/parallel/*.js",
-    "browser": "zuul --browser-name $BROWSER_NAME --browser-version $BROWSER_VERSION -- test/browser.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/nodejs/readable-stream.git"
+  "directories": {},
+  "dist": {
+    "shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
+    "tarball": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz"
   },
+  "gitHead": "1a70134a71196eeabb5e27bc7580faaa68d30513",
+  "homepage": "https://github.com/nodejs/readable-stream#readme",
+  "installable": true,
   "keywords": [
+    "pipe",
     "readable",
-    "stream",
-    "pipe"
+    "stream"
   ],
-  "browser": {
-    "util": false
-  },
   "license": "MIT",
-  "gitHead": "1a70134a71196eeabb5e27bc7580faaa68d30513",
-  "bugs": {
-    "url": "https://github.com/nodejs/readable-stream/issues"
-  },
-  "homepage": "https://github.com/nodejs/readable-stream#readme",
-  "_id": "readable-stream@2.0.2",
-  "_shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
-  "_from": "readable-stream@>=2.0.2 <3.0.0",
-  "_npmVersion": "2.11.1",
-  "_nodeVersion": "2.3.0",
-  "_npmUser": {
-    "name": "cwmma",
-    "email": "calvin.metcalf@gmail.com"
-  },
-  "dist": {
-    "shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
-    "tarball": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz"
-  },
+  "main": "readable.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -69,7 +85,15 @@
       "email": "calvin.metcalf@gmail.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "readable-stream",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/nodejs/readable-stream.git"
+  },
+  "scripts": {
+    "browser": "zuul --browser-name $BROWSER_NAME --browser-version $BROWSER_VERSION -- test/browser.js",
+    "test": "tap test/parallel/*.js"
+  },
+  "version": "2.0.2"
 }
diff --git a/deps/npm/node_modules/sha/package.json b/deps/npm/node_modules/sha/package.json
index 95e55e138946a6..0bd2cf7a1dcafb 100644
--- a/deps/npm/node_modules/sha/package.json
+++ b/deps/npm/node_modules/sha/package.json
@@ -1,36 +1,64 @@
 {
-  "name": "sha",
-  "version": "2.0.1",
-  "description": "Check and get file hashes",
-  "scripts": {
-    "test": "mocha -R spec"
+  "_args": [
+    [
+      "sha@~2.0.1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "sha@>=2.0.1 <2.1.0",
+  "_id": "sha@2.0.1",
+  "_inCache": true,
+  "_location": "/sha",
+  "_nodeVersion": "1.6.2",
+  "_npmUser": {
+    "email": "forbes@lindesay.co.uk",
+    "name": "forbeslindesay"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ForbesLindesay/sha.git"
+  "_npmVersion": "2.7.1",
+  "_phantomChildren": {
+    "core-util-is": "1.0.1",
+    "inherits": "2.0.1",
+    "isarray": "0.0.1",
+    "process-nextick-args": "1.0.3",
+    "string_decoder": "0.10.31",
+    "util-deprecate": "1.0.1"
+  },
+  "_requested": {
+    "name": "sha",
+    "raw": "sha@~2.0.1",
+    "rawSpec": "~2.0.1",
+    "scope": null,
+    "spec": ">=2.0.1 <2.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/sha/-/sha-2.0.1.tgz",
+  "_shasum": "6030822fbd2c9823949f8f72ed6411ee5cf25aae",
+  "_shrinkwrap": null,
+  "_spec": "sha@~2.0.1",
+  "_where": "/Users/rebecca/code/npm",
+  "bugs": {
+    "url": "https://github.com/ForbesLindesay/sha/issues"
   },
-  "license": "(BSD-2-Clause OR MIT)",
   "dependencies": {
     "graceful-fs": "^4.1.2",
     "readable-stream": "^2.0.2"
   },
+  "description": "Check and get file hashes",
   "devDependencies": {
     "mocha": "~1.9.0"
   },
-  "gitHead": "ce7c72ba753d886fb46c396cbadcbfc8eac25b4f",
-  "bugs": {
-    "url": "https://github.com/ForbesLindesay/sha/issues"
+  "directories": {},
+  "dist": {
+    "shasum": "6030822fbd2c9823949f8f72ed6411ee5cf25aae",
+    "tarball": "http://registry.npmjs.org/sha/-/sha-2.0.1.tgz"
   },
+  "gitHead": "ce7c72ba753d886fb46c396cbadcbfc8eac25b4f",
   "homepage": "https://github.com/ForbesLindesay/sha",
-  "_id": "sha@2.0.1",
-  "_shasum": "6030822fbd2c9823949f8f72ed6411ee5cf25aae",
-  "_from": "sha@2.0.1",
-  "_npmVersion": "2.7.1",
-  "_nodeVersion": "1.6.2",
-  "_npmUser": {
-    "name": "forbeslindesay",
-    "email": "forbes@lindesay.co.uk"
-  },
+  "installable": true,
+  "license": "(BSD-2-Clause OR MIT)",
   "maintainers": [
     {
       "name": "forbeslindesay",
@@ -45,10 +73,14 @@
       "email": "thechargingvolcano@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "6030822fbd2c9823949f8f72ed6411ee5cf25aae",
-    "tarball": "http://registry.npmjs.org/sha/-/sha-2.0.1.tgz"
+  "name": "sha",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ForbesLindesay/sha.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/sha/-/sha-2.0.1.tgz"
+  "scripts": {
+    "test": "mocha -R spec"
+  },
+  "version": "2.0.1"
 }
diff --git a/deps/npm/node_modules/request/node_modules/json-stringify-safe/LICENSE b/deps/npm/node_modules/sigmund/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/json-stringify-safe/LICENSE
rename to deps/npm/node_modules/sigmund/LICENSE
diff --git a/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/README.md b/deps/npm/node_modules/sigmund/README.md
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/README.md
rename to deps/npm/node_modules/sigmund/README.md
diff --git a/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/bench.js b/deps/npm/node_modules/sigmund/bench.js
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/bench.js
rename to deps/npm/node_modules/sigmund/bench.js
diff --git a/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/package.json b/deps/npm/node_modules/sigmund/package.json
similarity index 61%
rename from deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/package.json
rename to deps/npm/node_modules/sigmund/package.json
index 4255e77a933eed..61af1e0b73a51e 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/package.json
+++ b/deps/npm/node_modules/sigmund/package.json
@@ -1,60 +1,83 @@
 {
-  "name": "sigmund",
-  "version": "1.0.1",
-  "description": "Quick and dirty signatures for Objects.",
-  "main": "sigmund.js",
-  "directories": {
-    "test": "test"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "tap": "~0.3.0"
-  },
-  "scripts": {
-    "test": "tap test/*.js",
-    "bench": "node bench.js"
+  "_args": [
+    [
+      "sigmund@~1.0.0",
+      "/Users/rebecca/code/npm/node_modules/node-gyp/node_modules/minimatch"
+    ]
+  ],
+  "_from": "sigmund@>=1.0.0 <1.1.0",
+  "_id": "sigmund@1.0.1",
+  "_inCache": true,
+  "_location": "/sigmund",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/sigmund.git"
+  "_npmVersion": "2.10.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "sigmund",
+    "raw": "sigmund@~1.0.0",
+    "rawSpec": "~1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <1.1.0",
+    "type": "range"
   },
-  "keywords": [
-    "object",
-    "signature",
-    "key",
-    "data",
-    "psychoanalysis"
+  "_requiredBy": [
+    "/node-gyp/minimatch"
   ],
+  "_resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+  "_shasum": "3ff21f198cad2175f9f3b781853fd94d0d19b590",
+  "_shrinkwrap": null,
+  "_spec": "sigmund@~1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp/node_modules/minimatch",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "license": "ISC",
-  "gitHead": "527f97aa5bb253d927348698c0cd3bb267d098c6",
   "bugs": {
     "url": "https://github.com/isaacs/sigmund/issues"
   },
-  "homepage": "https://github.com/isaacs/sigmund#readme",
-  "_id": "sigmund@1.0.1",
-  "_shasum": "3ff21f198cad2175f9f3b781853fd94d0d19b590",
-  "_from": "sigmund@>=1.0.0 <1.1.0",
-  "_npmVersion": "2.10.0",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
+  "dependencies": {},
+  "description": "Quick and dirty signatures for Objects.",
+  "devDependencies": {
+    "tap": "~0.3.0"
+  },
+  "directories": {
+    "test": "test"
   },
   "dist": {
     "shasum": "3ff21f198cad2175f9f3b781853fd94d0d19b590",
     "tarball": "http://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
   },
+  "gitHead": "527f97aa5bb253d927348698c0cd3bb267d098c6",
+  "homepage": "https://github.com/isaacs/sigmund#readme",
+  "keywords": [
+    "data",
+    "key",
+    "object",
+    "psychoanalysis",
+    "signature"
+  ],
+  "license": "ISC",
+  "main": "sigmund.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "_resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "sigmund",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/sigmund.git"
+  },
+  "scripts": {
+    "bench": "node bench.js",
+    "test": "tap test/*.js"
+  },
+  "version": "1.0.1"
 }
diff --git a/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/sigmund.js b/deps/npm/node_modules/sigmund/sigmund.js
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/sigmund.js
rename to deps/npm/node_modules/sigmund/sigmund.js
diff --git a/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/test/basic.js b/deps/npm/node_modules/sigmund/test/basic.js
similarity index 99%
rename from deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/test/basic.js
rename to deps/npm/node_modules/sigmund/test/basic.js
index 50c53a13e98d0e..6149a80239f059 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/test/basic.js
+++ b/deps/npm/node_modules/sigmund/test/basic.js
@@ -21,4 +21,3 @@ test('basic', function (t) {
     t.equal(sigmund(obj3), cycleHash)
     t.end()
 })
-
diff --git a/deps/npm/node_modules/slide/package.json b/deps/npm/node_modules/slide/package.json
index 1c0b30bf2a96e8..6ec642342c2423 100644
--- a/deps/npm/node_modules/slide/package.json
+++ b/deps/npm/node_modules/slide/package.json
@@ -1,11 +1,47 @@
 {
-  "name": "slide",
-  "version": "1.1.6",
+  "_args": [
+    [
+      "slide@~1.1.6",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "slide@>=1.1.6 <1.2.0",
+  "_id": "slide@1.1.6",
+  "_inCache": true,
+  "_location": "/slide",
+  "_npmUser": {
+    "email": "i@izs.me",
+    "name": "isaacs"
+  },
+  "_npmVersion": "2.0.0-beta.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "slide",
+    "raw": "slide@~1.1.6",
+    "rawSpec": "~1.1.6",
+    "scope": null,
+    "spec": ">=1.1.6 <1.2.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/",
+    "/npm-registry-client",
+    "/read-installed",
+    "/write-file-atomic"
+  ],
+  "_resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
+  "_shasum": "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707",
+  "_shrinkwrap": null,
+  "_spec": "slide@~1.1.6",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
+  "bugs": {
+    "url": "https://github.com/isaacs/slide-flow-control/issues"
+  },
   "contributors": [
     {
       "name": "S. Sriram",
@@ -13,42 +49,33 @@
       "url": "http://www.565labs.com"
     }
   ],
-  "description": "A flow control lib small enough to fit on in a slide presentation. Derived live at Oak.JS",
-  "main": "./lib/slide.js",
   "dependencies": {},
+  "description": "A flow control lib small enough to fit on in a slide presentation. Derived live at Oak.JS",
   "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707",
+    "tarball": "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
+  },
   "engines": {
     "node": "*"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/slide-flow-control.git"
-  },
-  "license": "ISC",
   "gitHead": "8345e51ee41e35825abc1a40750ea11462f57028",
-  "bugs": {
-    "url": "https://github.com/isaacs/slide-flow-control/issues"
-  },
   "homepage": "https://github.com/isaacs/slide-flow-control",
-  "_id": "slide@1.1.6",
-  "scripts": {},
-  "_shasum": "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707",
-  "_from": "slide@>=1.1.6 <1.2.0",
-  "_npmVersion": "2.0.0-beta.3",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "i@izs.me"
-  },
+  "license": "ISC",
+  "main": "./lib/slide.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "dist": {
-    "shasum": "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707",
-    "tarball": "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
+  "name": "slide",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/slide-flow-control.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
+  "scripts": {},
+  "version": "1.1.6"
 }
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/.npmignore b/deps/npm/node_modules/sntp/.npmignore
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/.npmignore
rename to deps/npm/node_modules/sntp/.npmignore
index 77ba16cb055ca5..b0939eabe34d2d 100644
--- a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/.npmignore
+++ b/deps/npm/node_modules/sntp/.npmignore
@@ -15,4 +15,3 @@ config.json
 */*/._*
 coverage.*
 lib-cov
-
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/.travis.yml b/deps/npm/node_modules/sntp/.travis.yml
similarity index 97%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/.travis.yml
rename to deps/npm/node_modules/sntp/.travis.yml
index 047f7e3d5e1e39..77795c6a9b47df 100755
--- a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/.travis.yml
+++ b/deps/npm/node_modules/sntp/.travis.yml
@@ -2,4 +2,3 @@ language: node_js
 
 node_js:
   - 0.10
-
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/LICENSE b/deps/npm/node_modules/sntp/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/LICENSE
rename to deps/npm/node_modules/sntp/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/Makefile b/deps/npm/node_modules/sntp/Makefile
similarity index 94%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/Makefile
rename to deps/npm/node_modules/sntp/Makefile
index 417fd93708605f..43189de8e3577e 100755
--- a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/Makefile
+++ b/deps/npm/node_modules/sntp/Makefile
@@ -1,9 +1,8 @@
 test:
 	@node node_modules/lab/bin/lab
-test-cov: 
+test-cov:
 	@node node_modules/lab/bin/lab -t 100 -m 3000
 test-cov-html:
 	@node node_modules/lab/bin/lab -r html -o coverage.html
 
 .PHONY: test test-cov test-cov-html
-
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/README.md b/deps/npm/node_modules/sntp/README.md
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/README.md
rename to deps/npm/node_modules/sntp/README.md
index 98a6e025dba0b5..ec5c1a14af19ff 100755
--- a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/README.md
+++ b/deps/npm/node_modules/sntp/README.md
@@ -65,4 +65,3 @@ Sntp.start(function () {
     Sntp.stop();
 });
 ```
-
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/examples/offset.js b/deps/npm/node_modules/sntp/examples/offset.js
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/examples/offset.js
rename to deps/npm/node_modules/sntp/examples/offset.js
index 0303f6dcfa7623..58f3cf93e036ff 100755
--- a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/examples/offset.js
+++ b/deps/npm/node_modules/sntp/examples/offset.js
@@ -13,4 +13,3 @@ Sntp.offset(function (err, offset) {
         console.log(offset);                // Identical (served from cache)
     });
 });
-
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/examples/time.js b/deps/npm/node_modules/sntp/examples/time.js
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/examples/time.js
rename to deps/npm/node_modules/sntp/examples/time.js
index bd70d0e6a516f4..ff2589f75ebb33 100755
--- a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/examples/time.js
+++ b/deps/npm/node_modules/sntp/examples/time.js
@@ -22,4 +22,3 @@ Sntp.time(options, function (err, time) {
     console.log('Local clock is off by: ' + time.t + ' milliseconds');
     process.exit(0);
 });
-
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/index.js b/deps/npm/node_modules/sntp/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/index.js
rename to deps/npm/node_modules/sntp/index.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/lib/index.js b/deps/npm/node_modules/sntp/lib/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/lib/index.js
rename to deps/npm/node_modules/sntp/lib/index.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/package.json b/deps/npm/node_modules/sntp/package.json
similarity index 67%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/package.json
rename to deps/npm/node_modules/sntp/package.json
index 8b664b60fcd738..263dc45954d90f 100644
--- a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/package.json
+++ b/deps/npm/node_modules/sntp/package.json
@@ -1,65 +1,88 @@
 {
-  "name": "sntp",
-  "description": "SNTP Client",
-  "version": "1.0.9",
+  "_args": [
+    [
+      "sntp@1.x.x",
+      "/Users/rebecca/code/npm/node_modules/hawk"
+    ]
+  ],
+  "_from": "sntp@>=1.0.0 <2.0.0",
+  "_id": "sntp@1.0.9",
+  "_inCache": true,
+  "_location": "/sntp",
+  "_npmUser": {
+    "email": "eran@hueniverse.com",
+    "name": "hueniverse"
+  },
+  "_npmVersion": "1.4.23",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "sntp",
+    "raw": "sntp@1.x.x",
+    "rawSpec": "1.x.x",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/hawk"
+  ],
+  "_resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+  "_shasum": "6541184cc90aeea6c6e7b35e2659082443c66198",
+  "_shrinkwrap": null,
+  "_spec": "sntp@1.x.x",
+  "_where": "/Users/rebecca/code/npm/node_modules/hawk",
   "author": {
-    "name": "Eran Hammer",
     "email": "eran@hammer.io",
+    "name": "Eran Hammer",
     "url": "http://hueniverse.com"
   },
-  "contributors": [],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/hueniverse/sntp.git"
-  },
-  "main": "index",
-  "keywords": [
-    "sntp",
-    "ntp",
-    "time"
-  ],
-  "engines": {
-    "node": ">=0.8.0"
+  "bugs": {
+    "url": "https://github.com/hueniverse/sntp/issues"
   },
+  "contributors": [],
   "dependencies": {
     "hoek": "2.x.x"
   },
+  "description": "SNTP Client",
   "devDependencies": {
     "lab": "4.x.x"
   },
-  "scripts": {
-    "test": "make test-cov"
+  "directories": {},
+  "dist": {
+    "shasum": "6541184cc90aeea6c6e7b35e2659082443c66198",
+    "tarball": "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
   },
+  "engines": {
+    "node": ">=0.8.0"
+  },
+  "gitHead": "ee2e35284f684609990681734d39010cd356d7da",
+  "homepage": "https://github.com/hueniverse/sntp",
+  "keywords": [
+    "ntp",
+    "sntp",
+    "time"
+  ],
   "licenses": [
     {
       "type": "BSD",
       "url": "http://github.com/hueniverse/sntp/raw/master/LICENSE"
     }
   ],
-  "gitHead": "ee2e35284f684609990681734d39010cd356d7da",
-  "bugs": {
-    "url": "https://github.com/hueniverse/sntp/issues"
-  },
-  "homepage": "https://github.com/hueniverse/sntp",
-  "_id": "sntp@1.0.9",
-  "_shasum": "6541184cc90aeea6c6e7b35e2659082443c66198",
-  "_from": "sntp@>=1.0.0 <2.0.0",
-  "_npmVersion": "1.4.23",
-  "_npmUser": {
-    "name": "hueniverse",
-    "email": "eran@hueniverse.com"
-  },
+  "main": "index",
   "maintainers": [
     {
       "name": "hueniverse",
       "email": "eran@hueniverse.com"
     }
   ],
-  "dist": {
-    "shasum": "6541184cc90aeea6c6e7b35e2659082443c66198",
-    "tarball": "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+  "name": "sntp",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/hueniverse/sntp"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "make test-cov"
+  },
+  "version": "1.0.9"
 }
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/test/index.js b/deps/npm/node_modules/sntp/test/index.js
similarity index 99%
rename from deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/test/index.js
rename to deps/npm/node_modules/sntp/test/index.js
index f1d1cdabf5bb66..2b8a1c256e8fe5 100755
--- a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/test/index.js
+++ b/deps/npm/node_modules/sntp/test/index.js
@@ -432,4 +432,3 @@ describe('SNTP', function () {
         });
     });
 });
-
diff --git a/deps/npm/node_modules/sorted-object/package.json b/deps/npm/node_modules/sorted-object/package.json
index 5bd814207aa352..ea1e21dd2dc42e 100644
--- a/deps/npm/node_modules/sorted-object/package.json
+++ b/deps/npm/node_modules/sorted-object/package.json
@@ -1,37 +1,78 @@
 {
-  "name": "sorted-object",
-  "description": "Returns a copy of an object with its keys sorted",
-  "keywords": [
-    "sort",
-    "keys",
-    "object"
+  "_args": [
+    [
+      "sorted-object@~1.0.0",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "sorted-object@>=1.0.0 <1.1.0",
+  "_id": "sorted-object@1.0.0",
+  "_inCache": true,
+  "_location": "/sorted-object",
+  "_npmUser": {
+    "email": "domenic@domenicdenicola.com",
+    "name": "domenic"
+  },
+  "_npmVersion": "1.3.25",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "sorted-object",
+    "raw": "sorted-object@~1.0.0",
+    "rawSpec": "~1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <1.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
   ],
-  "version": "1.0.0",
+  "_resolved": "https://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz",
+  "_shasum": "5d1f4f9c1fb2cd48965967304e212eb44cfb6d05",
+  "_shrinkwrap": null,
+  "_spec": "sorted-object@~1.0.0",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Domenic Denicola",
     "email": "domenic@domenicdenicola.com",
+    "name": "Domenic Denicola",
     "url": "http://domenic.me/"
   },
-  "license": "WTFPL",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/domenic/sorted-object.git"
-  },
   "bugs": {
     "url": "http://github.com/domenic/sorted-object/issues"
   },
-  "main": "lib/sorted-object.js",
-  "scripts": {
-    "test": "tape test/tests.js",
-    "lint": "jshint lib && jshint test"
-  },
+  "dependencies": {},
+  "description": "Returns a copy of an object with its keys sorted",
   "devDependencies": {
     "jshint": "~2.4.3",
     "tape": "~2.4.2"
   },
-  "readme": "# Get a Version of an Object with Sorted Keys\n\nAlthough objects in JavaScript are theoretically unsorted, in practice most engines use insertion order—at least, ignoring numeric keys. This manifests itself most prominently when dealing with an object's JSON serialization.\n\nSo, for example, you might be trying to serialize some object to a JSON file. But every time you write it, it ends up being output in a different order, depending on how you created it in the first place! This makes for some ugly diffs.\n\n**sorted-object** gives you the answer. Just use this package to create a version of your object with its keys sorted before serializing, and you'll get a consistent order every time.\n\n```js\nvar sortedObject = require(\"sorted-object\");\n\nvar objectToSerialize = generateStuffNondeterministically();\n\n// Before:\nfs.writeFileSync(\"dest.json\", JSON.stringify(objectToSerialize));\n\n// After:\nvar sortedVersion = sortedObject(objectToSerialize);\nfs.writeFileSync(\"dest.json\", JSON.stringify(sortedVersion));\n```\n",
-  "readmeFilename": "README.md",
+  "directories": {},
+  "dist": {
+    "shasum": "5d1f4f9c1fb2cd48965967304e212eb44cfb6d05",
+    "tarball": "http://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz"
+  },
   "homepage": "https://github.com/domenic/sorted-object",
-  "_id": "sorted-object@1.0.0",
-  "_from": "sorted-object@"
+  "keywords": [
+    "keys",
+    "object",
+    "sort"
+  ],
+  "license": "WTFPL",
+  "main": "lib/sorted-object.js",
+  "maintainers": [
+    {
+      "name": "domenic",
+      "email": "domenic@domenicdenicola.com"
+    }
+  ],
+  "name": "sorted-object",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/domenic/sorted-object.git"
+  },
+  "scripts": {
+    "lint": "jshint lib && jshint test",
+    "test": "tape test/tests.js"
+  },
+  "version": "1.0.0"
 }
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/README.md b/deps/npm/node_modules/spdx-correct/README.md
similarity index 100%
rename from deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/README.md
rename to deps/npm/node_modules/spdx-correct/README.md
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/index.js b/deps/npm/node_modules/spdx-correct/index.js
similarity index 100%
rename from deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/index.js
rename to deps/npm/node_modules/spdx-correct/index.js
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/package.json b/deps/npm/node_modules/spdx-correct/package.json
similarity index 67%
rename from deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/package.json
rename to deps/npm/node_modules/spdx-correct/package.json
index f1a85e2ea38e0c..efaea0260352d9 100644
--- a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/package.json
+++ b/deps/npm/node_modules/spdx-correct/package.json
@@ -1,21 +1,63 @@
 {
-  "name": "spdx-correct",
-  "description": "correct invalid SPDX identifiers",
-  "version": "1.0.1",
+  "_args": [
+    [
+      "spdx-correct@~1.0.0",
+      "/Users/rebecca/code/npm/node_modules/validate-npm-package-license"
+    ]
+  ],
+  "_from": "spdx-correct@>=1.0.0 <1.1.0",
+  "_id": "spdx-correct@1.0.1",
+  "_inCache": true,
+  "_location": "/spdx-correct",
+  "_nodeVersion": "0.12.7",
+  "_npmUser": {
+    "email": "kyle@kemitchell.com",
+    "name": "kemitchell"
+  },
+  "_npmVersion": "2.13.5",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "spdx-correct",
+    "raw": "spdx-correct@~1.0.0",
+    "rawSpec": "~1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <1.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/validate-npm-package-license"
+  ],
+  "_resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz",
+  "_shasum": "ac075f5f2f6a06c0bfdd1c847eb3dde3dd8221ea",
+  "_shrinkwrap": null,
+  "_spec": "spdx-correct@~1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/validate-npm-package-license",
   "author": {
-    "name": "Kyle E. Mitchell",
     "email": "kyle@kemitchell.com",
+    "name": "Kyle E. Mitchell",
     "url": "https://kemitchell.com"
   },
+  "bugs": {
+    "url": "https://github.com/kemitchell/spdx-correct.js/issues"
+  },
   "dependencies": {
     "spdx-license-ids": "^1.0.2"
   },
+  "description": "correct invalid SPDX identifiers",
   "devDependencies": {
     "defence-cli": "^1.0.1",
     "replace-require-self": "^1.0.0",
     "spdx-expression-parse": "^1.0.0",
     "tape": "~4.0.0"
   },
+  "directories": {},
+  "dist": {
+    "shasum": "ac075f5f2f6a06c0bfdd1c847eb3dde3dd8221ea",
+    "tarball": "http://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz"
+  },
+  "gitHead": "f3581dea1529d975851ceab7f86e646d8220608a",
+  "homepage": "https://github.com/kemitchell/spdx-correct.js#readme",
+  "installable": true,
   "keywords": [
     "SPDX",
     "law",
@@ -24,31 +66,6 @@
     "metadata"
   ],
   "license": "Apache-2.0",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/kemitchell/spdx-correct.js.git"
-  },
-  "scripts": {
-    "test": "defence README.md | replace-require-self | node && tape *.test.js"
-  },
-  "gitHead": "f3581dea1529d975851ceab7f86e646d8220608a",
-  "bugs": {
-    "url": "https://github.com/kemitchell/spdx-correct.js/issues"
-  },
-  "homepage": "https://github.com/kemitchell/spdx-correct.js#readme",
-  "_id": "spdx-correct@1.0.1",
-  "_shasum": "ac075f5f2f6a06c0bfdd1c847eb3dde3dd8221ea",
-  "_from": "spdx-correct@>=1.0.0 <1.1.0",
-  "_npmVersion": "2.13.5",
-  "_nodeVersion": "0.12.7",
-  "_npmUser": {
-    "name": "kemitchell",
-    "email": "kyle@kemitchell.com"
-  },
-  "dist": {
-    "shasum": "ac075f5f2f6a06c0bfdd1c847eb3dde3dd8221ea",
-    "tarball": "http://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz"
-  },
   "maintainers": [
     {
       "name": "kemitchell",
@@ -59,6 +76,14 @@
       "email": "ogd@aoaioxxysz.net"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz"
+  "name": "spdx-correct",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/kemitchell/spdx-correct.js.git"
+  },
+  "scripts": {
+    "test": "defence README.md | replace-require-self | node && tape *.test.js"
+  },
+  "version": "1.0.1"
 }
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/.npmignore b/deps/npm/node_modules/spdx-exceptions/.npmignore
similarity index 100%
rename from deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/.npmignore
rename to deps/npm/node_modules/spdx-exceptions/.npmignore
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/LICENSE.md b/deps/npm/node_modules/spdx-exceptions/LICENSE.md
similarity index 100%
rename from deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/LICENSE.md
rename to deps/npm/node_modules/spdx-exceptions/LICENSE.md
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/README.md b/deps/npm/node_modules/spdx-exceptions/README.md
similarity index 100%
rename from deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/README.md
rename to deps/npm/node_modules/spdx-exceptions/README.md
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/index.json b/deps/npm/node_modules/spdx-exceptions/index.json
similarity index 100%
rename from deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/index.json
rename to deps/npm/node_modules/spdx-exceptions/index.json
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/package.json b/deps/npm/node_modules/spdx-exceptions/package.json
similarity index 63%
rename from deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/package.json
rename to deps/npm/node_modules/spdx-exceptions/package.json
index 08249989340112..0ed389b575dbcd 100644
--- a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/package.json
+++ b/deps/npm/node_modules/spdx-exceptions/package.json
@@ -1,10 +1,43 @@
 {
-  "name": "spdx-exceptions",
-  "description": "list of SPDX standard license exceptions",
-  "version": "1.0.2",
+  "_args": [
+    [
+      "spdx-exceptions@^1.0.0",
+      "/Users/ogd/Documents/projects/npm/npm/node_modules/spdx-expression-parse"
+    ]
+  ],
+  "_from": "spdx-exceptions@>=1.0.0 <2.0.0",
+  "_id": "spdx-exceptions@1.0.2",
+  "_inCache": true,
+  "_location": "/spdx-exceptions",
+  "_nodeVersion": "0.12.7",
+  "_npmUser": {
+    "email": "kyle@kemitchell.com",
+    "name": "kemitchell"
+  },
+  "_npmVersion": "2.13.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "spdx-exceptions",
+    "raw": "spdx-exceptions@^1.0.0",
+    "rawSpec": "^1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/spdx-expression-parse"
+  ],
+  "_resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.2.tgz",
+  "_shasum": "c584a2875a1db1c8743266990af6e0c82e143a5b",
+  "_shrinkwrap": null,
+  "_spec": "spdx-exceptions@^1.0.0",
+  "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/spdx-expression-parse",
   "author": {
     "name": "The Linux Foundation"
   },
+  "bugs": {
+    "url": "https://github.com/kemitchell/spdx-exceptions.js/issues"
+  },
   "contributors": [
     {
       "name": "Kyle E. Mitchell",
@@ -12,41 +45,34 @@
       "url": "https://kemitchell.com/"
     }
   ],
+  "dependencies": {},
+  "description": "list of SPDX standard license exceptions",
   "devDependencies": {
     "defence-cli": "^1.0.1"
   },
-  "license": "CC-BY-3.0",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/kemitchell/spdx-exceptions.js.git"
-  },
-  "scripts": {
-    "test": "defence -i javascript README.md | sed 's!spdx-exceptions!./!' | node"
-  },
-  "gitHead": "a1e7b0595efee0e4436e9807dd36280791e44c82",
-  "bugs": {
-    "url": "https://github.com/kemitchell/spdx-exceptions.js/issues"
-  },
-  "homepage": "https://github.com/kemitchell/spdx-exceptions.js#readme",
-  "_id": "spdx-exceptions@1.0.2",
-  "_shasum": "c584a2875a1db1c8743266990af6e0c82e143a5b",
-  "_from": "spdx-exceptions@>=1.0.0 <2.0.0",
-  "_npmVersion": "2.13.3",
-  "_nodeVersion": "0.12.7",
-  "_npmUser": {
-    "name": "kemitchell",
-    "email": "kyle@kemitchell.com"
-  },
+  "directories": {},
   "dist": {
     "shasum": "c584a2875a1db1c8743266990af6e0c82e143a5b",
     "tarball": "http://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.2.tgz"
   },
+  "gitHead": "a1e7b0595efee0e4436e9807dd36280791e44c82",
+  "homepage": "https://github.com/kemitchell/spdx-exceptions.js#readme",
+  "installable": true,
+  "license": "CC-BY-3.0",
   "maintainers": [
     {
       "name": "kemitchell",
       "email": "kyle@kemitchell.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.2.tgz"
+  "name": "spdx-exceptions",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/kemitchell/spdx-exceptions.js.git"
+  },
+  "scripts": {
+    "test": "defence -i javascript README.md | sed 's!spdx-exceptions!./!' | node"
+  },
+  "version": "1.0.2"
 }
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/LICENSE b/deps/npm/node_modules/spdx-expression-parse/LICENSE
similarity index 100%
rename from deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/LICENSE
rename to deps/npm/node_modules/spdx-expression-parse/LICENSE
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/README.md b/deps/npm/node_modules/spdx-expression-parse/README.md
similarity index 100%
rename from deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/README.md
rename to deps/npm/node_modules/spdx-expression-parse/README.md
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/index.js b/deps/npm/node_modules/spdx-expression-parse/index.js
similarity index 100%
rename from deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/index.js
rename to deps/npm/node_modules/spdx-expression-parse/index.js
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/package.json b/deps/npm/node_modules/spdx-expression-parse/package.json
similarity index 65%
rename from deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/package.json
rename to deps/npm/node_modules/spdx-expression-parse/package.json
index e38d0b5a9671c1..79ab103509df6e 100644
--- a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/package.json
+++ b/deps/npm/node_modules/spdx-expression-parse/package.json
@@ -1,20 +1,62 @@
 {
-  "name": "spdx-expression-parse",
-  "description": "parse SPDX license expressions",
-  "version": "1.0.0",
+  "_args": [
+    [
+      "spdx-expression-parse@~1.0.0",
+      "/Users/ogd/Documents/projects/npm/npm/node_modules/init-package-json/node_modules/validate-npm-package-license"
+    ]
+  ],
+  "_from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+  "_id": "spdx-expression-parse@1.0.0",
+  "_inCache": true,
+  "_location": "/spdx-expression-parse",
+  "_nodeVersion": "0.12.7",
+  "_npmUser": {
+    "email": "kyle@kemitchell.com",
+    "name": "kemitchell"
+  },
+  "_npmVersion": "2.13.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "spdx-expression-parse",
+    "raw": "spdx-expression-parse@~1.0.0",
+    "rawSpec": "~1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <1.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/init-package-json/validate-npm-package-license"
+  ],
+  "_resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz",
+  "_shasum": "4fbb7e738c9e98fa0b0914dfd961ac6629fbcdef",
+  "_shrinkwrap": null,
+  "_spec": "spdx-expression-parse@~1.0.0",
+  "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/init-package-json/node_modules/validate-npm-package-license",
   "author": {
-    "name": "Kyle E. Mitchell",
     "email": "kyle@kemitchell.com",
+    "name": "Kyle E. Mitchell",
     "url": "http://kemitchell.com"
   },
+  "bugs": {
+    "url": "https://github.com/kemitchell/spdx-expression-parse.js/issues"
+  },
   "dependencies": {
     "spdx-exceptions": "^1.0.0",
     "spdx-license-ids": "^1.0.0"
   },
+  "description": "parse SPDX license expressions",
   "devDependencies": {
     "defence-cli": "^1.0.1",
     "jison": "^0.4.15"
   },
+  "directories": {},
+  "dist": {
+    "shasum": "4fbb7e738c9e98fa0b0914dfd961ac6629fbcdef",
+    "tarball": "http://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz"
+  },
+  "gitHead": "213bc03808f709a4ceaadb8466740a8c96c1e896",
+  "homepage": "https://github.com/kemitchell/spdx-expression-parse.js#readme",
+  "installable": true,
   "keywords": [
     "SPDX",
     "law",
@@ -26,6 +68,14 @@
     "standards"
   ],
   "license": "(MIT AND CC-BY-3.0)",
+  "maintainers": [
+    {
+      "name": "kemitchell",
+      "email": "kyle@kemitchell.com"
+    }
+  ],
+  "name": "spdx-expression-parse",
+  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/kemitchell/spdx-expression-parse.js.git"
@@ -36,30 +86,5 @@
     "pretest": "npm run generate",
     "test": "defence -i javascript README.md | node"
   },
-  "gitHead": "213bc03808f709a4ceaadb8466740a8c96c1e896",
-  "bugs": {
-    "url": "https://github.com/kemitchell/spdx-expression-parse.js/issues"
-  },
-  "homepage": "https://github.com/kemitchell/spdx-expression-parse.js#readme",
-  "_id": "spdx-expression-parse@1.0.0",
-  "_shasum": "4fbb7e738c9e98fa0b0914dfd961ac6629fbcdef",
-  "_from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-  "_npmVersion": "2.13.3",
-  "_nodeVersion": "0.12.7",
-  "_npmUser": {
-    "name": "kemitchell",
-    "email": "kyle@kemitchell.com"
-  },
-  "dist": {
-    "shasum": "4fbb7e738c9e98fa0b0914dfd961ac6629fbcdef",
-    "tarball": "http://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz"
-  },
-  "maintainers": [
-    {
-      "name": "kemitchell",
-      "email": "kyle@kemitchell.com"
-    }
-  ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz"
+  "version": "1.0.0"
 }
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/parser.generated.js b/deps/npm/node_modules/spdx-expression-parse/parser.generated.js
similarity index 100%
rename from deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/parser.generated.js
rename to deps/npm/node_modules/spdx-expression-parse/parser.generated.js
diff --git a/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/LICENSE b/deps/npm/node_modules/spdx-license-ids/LICENSE
similarity index 100%
rename from deps/npm/node_modules/spdx/node_modules/spdx-license-ids/LICENSE
rename to deps/npm/node_modules/spdx-license-ids/LICENSE
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/node_modules/spdx-license-ids/README.md b/deps/npm/node_modules/spdx-license-ids/README.md
similarity index 100%
rename from deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/node_modules/spdx-license-ids/README.md
rename to deps/npm/node_modules/spdx-license-ids/README.md
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/node_modules/spdx-license-ids/package.json b/deps/npm/node_modules/spdx-license-ids/package.json
similarity index 72%
rename from deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/node_modules/spdx-license-ids/package.json
rename to deps/npm/node_modules/spdx-license-ids/package.json
index 62c5c37ba96261..c2a1dbf2c6a19c 100644
--- a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/node_modules/spdx-license-ids/package.json
+++ b/deps/npm/node_modules/spdx-license-ids/package.json
@@ -1,41 +1,46 @@
 {
-  "name": "spdx-license-ids",
-  "version": "1.0.2",
-  "description": "A list of SPDX license identifiers",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/shinnn/spdx-license-ids.git"
+  "_args": [
+    [
+      "spdx-license-ids@^1.0.0",
+      "/Users/rebecca/code/npm/node_modules/spdx"
+    ]
+  ],
+  "_from": "spdx-license-ids@>=1.0.0 <2.0.0",
+  "_id": "spdx-license-ids@1.0.2",
+  "_inCache": true,
+  "_location": "/spdx-license-ids",
+  "_nodeVersion": "2.3.3",
+  "_npmUser": {
+    "email": "snnskwtnb@gmail.com",
+    "name": "shinnn"
   },
+  "_npmVersion": "2.12.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "spdx-license-ids",
+    "raw": "spdx-license-ids@^1.0.0",
+    "rawSpec": "^1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/spdx"
+  ],
+  "_resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz",
+  "_shasum": "0674e9c9a230f980016b5b073a10aa165701677c",
+  "_shrinkwrap": null,
+  "_spec": "spdx-license-ids@^1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/spdx",
   "author": {
     "name": "Shinnosuke Watanabe",
     "url": "https://github.com/shinnn"
   },
-  "scripts": {
-    "build": "node --harmony_arrow_functions build.js",
-    "lint": "eslint --config node_modules/@shinnn/eslintrc/rc.json --ignore-path .gitignore .",
-    "pretest": "${npm_package_scripts_build} && ${npm_package_scripts_lint}",
-    "test": "node --harmony_arrow_functions test.js",
-    "coverage": "node --harmony_arrow_functions node_modules/.bin/istanbul cover test.js",
-    "coveralls": "${npm_package_scripts_coverage} && istanbul-coveralls"
+  "bugs": {
+    "url": "https://github.com/shinnn/spdx-license-ids/issues"
   },
-  "license": "Unlicense",
-  "main": "spdx-license-ids.json",
-  "files": [
-    "spdx-license-ids.json"
-  ],
-  "keywords": [
-    "spdx",
-    "license",
-    "licenses",
-    "id",
-    "identifier",
-    "identifiers",
-    "json",
-    "array",
-    "oss",
-    "browser",
-    "client-side"
-  ],
+  "dependencies": {},
+  "description": "A list of SPDX license identifiers",
   "devDependencies": {
     "@shinnn/eslintrc": "^1.0.0",
     "each-async": "^1.1.1",
@@ -48,30 +53,50 @@
     "stringify-object": "^2.2.0",
     "tape": "^4.0.0"
   },
-  "gitHead": "df183ecdf1738f77b1e8e41f686ee56206a40693",
-  "bugs": {
-    "url": "https://github.com/shinnn/spdx-license-ids/issues"
+  "directories": {},
+  "dist": {
+    "shasum": "0674e9c9a230f980016b5b073a10aa165701677c",
+    "tarball": "http://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
   },
+  "files": [
+    "spdx-license-ids.json"
+  ],
+  "gitHead": "df183ecdf1738f77b1e8e41f686ee56206a40693",
   "homepage": "https://github.com/shinnn/spdx-license-ids#readme",
-  "_id": "spdx-license-ids@1.0.2",
-  "_shasum": "0674e9c9a230f980016b5b073a10aa165701677c",
-  "_from": "spdx-license-ids@>=1.0.0 <2.0.0",
-  "_npmVersion": "2.12.1",
-  "_nodeVersion": "2.3.3",
-  "_npmUser": {
-    "name": "shinnn",
-    "email": "snnskwtnb@gmail.com"
-  },
+  "keywords": [
+    "array",
+    "browser",
+    "client-side",
+    "id",
+    "identifier",
+    "identifiers",
+    "json",
+    "license",
+    "licenses",
+    "oss",
+    "spdx"
+  ],
+  "license": "Unlicense",
+  "main": "spdx-license-ids.json",
   "maintainers": [
     {
       "name": "shinnn",
       "email": "snnskwtnb@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "0674e9c9a230f980016b5b073a10aa165701677c",
-    "tarball": "http://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+  "name": "spdx-license-ids",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/shinnn/spdx-license-ids.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
+  "scripts": {
+    "build": "node --harmony_arrow_functions build.js",
+    "coverage": "node --harmony_arrow_functions node_modules/.bin/istanbul cover test.js",
+    "coveralls": "${npm_package_scripts_coverage} && istanbul-coveralls",
+    "lint": "eslint --config node_modules/@shinnn/eslintrc/rc.json --ignore-path .gitignore .",
+    "pretest": "${npm_package_scripts_build} && ${npm_package_scripts_lint}",
+    "test": "node --harmony_arrow_functions test.js"
+  },
+  "version": "1.0.2"
 }
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/node_modules/spdx-license-ids/spdx-license-ids.json b/deps/npm/node_modules/spdx-license-ids/spdx-license-ids.json
similarity index 100%
rename from deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/node_modules/spdx-license-ids/spdx-license-ids.json
rename to deps/npm/node_modules/spdx-license-ids/spdx-license-ids.json
diff --git a/deps/npm/node_modules/spdx/LICENSE.md b/deps/npm/node_modules/spdx/LICENSE.md
deleted file mode 100644
index 2180a8c1a3676e..00000000000000
--- a/deps/npm/node_modules/spdx/LICENSE.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright Kyle E. Mitchell
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
diff --git a/deps/npm/node_modules/spdx/README.md b/deps/npm/node_modules/spdx/README.md
deleted file mode 100644
index f373262474e8bb..00000000000000
--- a/deps/npm/node_modules/spdx/README.md
+++ /dev/null
@@ -1,145 +0,0 @@
-spdx.js
-=======
-
-[![npm version](https://img.shields.io/npm/v/spdx.svg)](https://www.npmjs.com/package/spdx)
-[![SPDX License Expression Syntax version](https://img.shields.io/badge/SPDX-2.0-blue.svg)](http://spdx.org/SPDX-specifications/spdx-version-2.0)
-[![license](https://img.shields.io/badge/license-Apache--2.0-303284.svg)](http://www.apache.org/licenses/LICENSE-2.0)
-[![build status](https://img.shields.io/travis/kemitchell/spdx.js.svg)](http://travis-ci.org/kemitchell/spdx.js)
-
-SPDX License Expression Syntax parser
-
-<!--js
-  // The fenced code blocks below are run as tests with `jsmd`.
-  // The following `require` call brings the module.
-  // Use `require ('spdx')` in your own code.
-  var spdx = require('./');
-  var package = require('./package.json');
--->
-
-Simple License Expressions
---------------------------
-```js
-spdx.valid('Invalid-Identifier'); // => null
-spdx.valid('GPL-2.0'); // => true
-spdx.valid('GPL-2.0+'); // => true
-spdx.valid('LicenseRef-23'); // => true
-spdx.valid('LicenseRef-MIT-Style-1'); // => true
-spdx.valid('DocumentRef-spdx-tool-1.2:LicenseRef-MIT-Style-2'); // => true
-```
-
-Composite License Expressions
------------------------------
-
-### Disjunctive `OR` Operator
-```js
-spdx.valid('(LGPL-2.1 OR MIT)'); // => true
-spdx.valid('(LGPL-2.1 OR MIT OR BSD-3-Clause)'); // => true
-```
-
-### Conjunctive `AND` Operator
-```js
-spdx.valid('(LGPL-2.1 AND MIT)'); // => true
-spdx.valid('(LGPL-2.1 AND MIT AND BSD-2-Clause)'); // => true
-```
-
-### Exception `WITH` Operator
-```js
-spdx.valid('(GPL-2.0+ WITH Bison-exception-2.2)'); // => true
-```
-
-### Order of Precedence and Parentheses
-```js
-var firstAST = {
-  left: {license: 'LGPL-2.1'},
-  conjunction: 'or',
-  right: {
-    left: {license: 'BSD-3-Clause'},
-    conjunction: 'and',
-    right: {license: 'MIT'}
-  }
-};
-spdx.parse('(LGPL-2.1 OR BSD-3-Clause AND MIT)'); // => firstAST
-
-var secondAST = {
-  left: {license: 'MIT'},
-  conjunction: 'and',
-  right: {
-    left: {license: 'LGPL-2.1', plus: true},
-    conjunction: 'and',
-    right: {license: 'BSD-3-Clause'}
-  }
-};
-spdx.parse('(MIT AND (LGPL-2.1+ AND BSD-3-Clause))'); // => secondAST
-```
-
-Strict Whitespace Rules
------------------------
-```js
-spdx.valid('MIT '); // => false
-spdx.valid(' MIT'); // => false
-spdx.valid('MIT  AND  BSD-3-Clause'); // => false
-```
-
-Identifier Lists
-----------------
-```js
-Array.isArray(spdx.licenses); // => true
-spdx.licenses.indexOf('ISC') > -1; // => true
-spdx.licenses.indexOf('Apache-1.7') > -1; // => false
-spdx.licenses.every(function(element) {
-  return typeof element === 'string';
-}); // => true
-
-Array.isArray(spdx.exceptions); // => true
-spdx.exceptions.indexOf('GCC-exception-3.1') > -1; // => true
-spdx.exceptions.every(function(element) {
-  return typeof element === 'string';
-}); // => true
-```
-
-Comparison
-----------
-```js
-spdx.gt('GPL-3.0', 'GPL-2.0'); // => true
-spdx.lt('MPL-1.0', 'MPL-2.0'); // => true
-
-spdx.gt('LPPL-1.3a', 'LPPL-1.0'); // => true
-spdx.gt('LPPL-1.3c', 'LPPL-1.3a'); // => true
-spdx.gt('MIT', 'ISC'); // => false
-spdx.gt('OSL-1.0', 'OPL-1.0'); // => false
-spdx.gt('AGPL-3.0', 'AGPL-1.0'); // => true
-
-try {
-  spdx.gt('(MIT OR ISC)', 'GPL-3.0');
-} catch (error) {
-  error.message; // => '"(MIT OR ISC)" is not a simple license identifier'
-}
-
-spdx.satisfies('MIT', 'MIT'); // => true
-spdx.satisfies('MIT', '(ISC OR MIT)'); // => true
-spdx.satisfies('Zlib', '(ISC OR (MIT OR Zlib))'); // => true
-spdx.satisfies('GPL-3.0', '(ISC OR MIT)'); // => false
-spdx.satisfies('GPL-2.0', 'GPL-2.0+'); // => true
-spdx.satisfies('GPL-3.0', 'GPL-2.0+'); // => true
-spdx.satisfies('GPL-1.0', 'GPL-2.0+'); // => false
-
-spdx.satisfies('GPL-2.0', 'GPL-2.0+ WITH Bison-exception-2.2'); // => false
-spdx.satisfies(
-  'GPL-3.0 WITH Bison-exception-2.2', 'GPL-2.0+ WITH Bison-exception-2.2'
-); // => true
-
-spdx.satisfies('(MIT OR GPL-2.0)', '(ISC OR MIT)'); // => true
-spdx.satisfies('(MIT AND GPL-2.0)', '(MIT OR GPL-2.0)'); // => true
-spdx.satisfies('(MIT AND GPL-2.0)', '(ISC OR GPL-2.0)'); // => false
-```
-
-Version Metadata
-----------------
-```js
-spdx.specificationVersion; // => '2.0'
-spdx.implementationVersion; // => package.version
-```
-
-The Specification
------------------
-[The Software Package Data Exchange (SPDX) specification](http://spdx.org) is the work of the [Linux Foundation](http://www.linuxfoundation.org) and its contributors, and is licensed under the terms of [the Creative Commons Attribution License 3.0 Unported (SPDX: "CC-BY-3.0")](http://spdx.org/licenses/CC-BY-3.0). "SPDX" is a United States federally registered trademark of the Linux Foundation.
diff --git a/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/README.md b/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/README.md
deleted file mode 100755
index 7ea6092d6cb3df..00000000000000
--- a/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/README.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# spdx-license-ids
-
-A list of [SPDX license](http://spdx.org/licenses/) identifiers
-
-[**Download JSON**](https://raw.githubusercontent.com/shinnn/spdx-license-ids/master/spdx-license-ids.json)
-
-## Use as a JavaScript Library
-
-[![NPM version](https://img.shields.io/npm/v/spdx-license-ids.svg)](https://www.npmjs.org/package/spdx-license-ids)
-[![Bower version](https://img.shields.io/bower/v/spdx-license-ids.svg)](https://github.com/shinnn/spdx-license-ids/releases)
-[![Build Status](https://travis-ci.org/shinnn/spdx-license-ids.svg?branch=master)](https://travis-ci.org/shinnn/spdx-license-ids)
-[![Coverage Status](https://img.shields.io/coveralls/shinnn/spdx-license-ids.svg)](https://coveralls.io/r/shinnn/spdx-license-ids)
-[![devDependency Status](https://david-dm.org/shinnn/spdx-license-ids/dev-status.svg)](https://david-dm.org/shinnn/spdx-license-ids#info=devDependencies)
-
-### Installation
-
-#### Package managers
-
-##### [npm](https://www.npmjs.com/)
-
-```sh
-npm install spdx-license-ids
-```
-
-##### [bower](http://bower.io/)
-
-```sh
-bower install spdx-license-ids
-```
-
-##### [Duo](http://duojs.org/)
-
-```javascript
-var spdxLicenseIds = require('shinnn/spdx-license-ids');
-```
-
-#### Standalone
-
-[Download the script file directly.](https://raw.githubusercontent.com/shinnn/spdx-license-ids/master/spdx-license-ids-browser.js)
-
-### API
-
-#### spdxLicenseIds
-
-Type: `Array` of `String`
-
-It returns an array of SPDX license identifiers.
-
-```javascript
-var spdxLicenseIds = require('spdx-license-ids'); //=> ['Glide', 'Abstyles', 'AFL-1.1', ... ]
-```
-
-## License
-
-[The Unlicense](./LICENSE).
diff --git a/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/package.json b/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/package.json
deleted file mode 100644
index e6e341b111d03a..00000000000000
--- a/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/package.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "name": "spdx-license-ids",
-  "version": "1.0.1",
-  "description": "A list of SPDX license identifiers",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/shinnn/spdx-license-ids.git"
-  },
-  "author": {
-    "name": "Shinnosuke Watanabe",
-    "url": "https://github.com/shinnn"
-  },
-  "scripts": {
-    "build": "node --harmony_arrow_functions build.js",
-    "lint": "eslint --config node_modules/@shinnn/eslintrc/rc.json --ignore-path .gitignore .",
-    "pretest": "${npm_package_scripts_build} && ${npm_package_scripts_lint}",
-    "test": "node --harmony_arrow_functions test.js",
-    "coverage": "node --harmony_arrow_functions node_modules/.bin/istanbul cover test.js",
-    "coveralls": "${npm_package_scripts_coverage} && istanbul-coveralls"
-  },
-  "license": "Unlicense",
-  "main": "spdx-license-ids.json",
-  "files": [
-    "spdx-license-ids.json"
-  ],
-  "keywords": [
-    "spdx",
-    "license",
-    "licenses",
-    "id",
-    "identifier",
-    "identifiers",
-    "json",
-    "array",
-    "oss",
-    "browser",
-    "client-side"
-  ],
-  "devDependencies": {
-    "@shinnn/eslintrc": "^1.0.0",
-    "each-async": "^1.1.1",
-    "eslint": "^0.21.2",
-    "got": "^3.2.0",
-    "istanbul": "^0.3.14",
-    "istanbul-coveralls": "^1.0.2",
-    "require-bower-files": "^2.0.0",
-    "rm-rf": "^0.1.0",
-    "stringify-object": "^2.0.0",
-    "tape": "^4.0.0"
-  },
-  "gitHead": "05c7466fcd62c8642006ef354c95064fcade3a03",
-  "bugs": {
-    "url": "https://github.com/shinnn/spdx-license-ids/issues"
-  },
-  "homepage": "https://github.com/shinnn/spdx-license-ids#readme",
-  "_id": "spdx-license-ids@1.0.1",
-  "_shasum": "8f7d365fbeb056f82d21d0c0e9c1ebbd676e6af4",
-  "_from": "spdx-license-ids@>=1.0.0 <2.0.0",
-  "_npmVersion": "2.10.1",
-  "_nodeVersion": "2.0.2",
-  "_npmUser": {
-    "name": "shinnn",
-    "email": "snnskwtnb@gmail.com"
-  },
-  "maintainers": [
-    {
-      "name": "shinnn",
-      "email": "snnskwtnb@gmail.com"
-    }
-  ],
-  "dist": {
-    "shasum": "8f7d365fbeb056f82d21d0c0e9c1ebbd676e6af4",
-    "tarball": "http://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/spdx-license-ids.json b/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/spdx-license-ids.json
deleted file mode 100644
index 3c5bdfcd0fc2dd..00000000000000
--- a/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/spdx-license-ids.json
+++ /dev/null
@@ -1,296 +0,0 @@
-[
-  "Glide",
-  "Abstyles",
-  "AFL-1.1",
-  "AFL-1.2",
-  "AFL-2.0",
-  "AFL-2.1",
-  "AFL-3.0",
-  "AMPAS",
-  "APL-1.0",
-  "Adobe-Glyph",
-  "APAFML",
-  "Adobe-2006",
-  "AGPL-1.0",
-  "Afmparse",
-  "Aladdin",
-  "ADSL",
-  "AMDPLPA",
-  "ANTLR-PD",
-  "Apache-1.0",
-  "Apache-1.1",
-  "Apache-2.0",
-  "AML",
-  "APSL-1.0",
-  "APSL-1.1",
-  "APSL-1.2",
-  "APSL-2.0",
-  "Artistic-1.0",
-  "Artistic-1.0-Perl",
-  "Artistic-1.0-cl8",
-  "Artistic-2.0",
-  "AAL",
-  "Bahyph",
-  "Barr",
-  "Beerware",
-  "BitTorrent-1.0",
-  "BitTorrent-1.1",
-  "BSL-1.0",
-  "Borceux",
-  "BSD-2-Clause",
-  "BSD-2-Clause-FreeBSD",
-  "BSD-2-Clause-NetBSD",
-  "BSD-3-Clause",
-  "BSD-3-Clause-Clear",
-  "BSD-4-Clause",
-  "BSD-Protection",
-  "BSD-3-Clause-Attribution",
-  "BSD-4-Clause-UC",
-  "bzip2-1.0.5",
-  "bzip2-1.0.6",
-  "Caldera",
-  "CECILL-1.0",
-  "CECILL-1.1",
-  "CECILL-2.0",
-  "CECILL-B",
-  "CECILL-C",
-  "ClArtistic",
-  "MIT-CMU",
-  "CNRI-Python",
-  "CNRI-Python-GPL-Compatible",
-  "CPOL-1.02",
-  "CDDL-1.0",
-  "CDDL-1.1",
-  "CPAL-1.0",
-  "CPL-1.0",
-  "CATOSL-1.1",
-  "Condor-1.1",
-  "CC-BY-1.0",
-  "CC-BY-2.0",
-  "CC-BY-2.5",
-  "CC-BY-3.0",
-  "CC-BY-4.0",
-  "CC-BY-ND-1.0",
-  "CC-BY-ND-2.0",
-  "CC-BY-ND-2.5",
-  "CC-BY-ND-3.0",
-  "CC-BY-ND-4.0",
-  "CC-BY-NC-1.0",
-  "CC-BY-NC-2.0",
-  "CC-BY-NC-2.5",
-  "CC-BY-NC-3.0",
-  "CC-BY-NC-4.0",
-  "CC-BY-NC-ND-1.0",
-  "CC-BY-NC-ND-2.0",
-  "CC-BY-NC-ND-2.5",
-  "CC-BY-NC-ND-3.0",
-  "CC-BY-NC-ND-4.0",
-  "CC-BY-NC-SA-1.0",
-  "CC-BY-NC-SA-2.0",
-  "CC-BY-NC-SA-2.5",
-  "CC-BY-NC-SA-3.0",
-  "CC-BY-NC-SA-4.0",
-  "CC-BY-SA-1.0",
-  "CC-BY-SA-2.0",
-  "CC-BY-SA-2.5",
-  "CC-BY-SA-3.0",
-  "CC-BY-SA-4.0",
-  "CC0-1.0",
-  "Crossword",
-  "CUA-OPL-1.0",
-  "Cube",
-  "D-FSL-1.0",
-  "diffmark",
-  "WTFPL",
-  "DOC",
-  "Dotseqn",
-  "DSDP",
-  "dvipdfm",
-  "EPL-1.0",
-  "ECL-1.0",
-  "ECL-2.0",
-  "eGenix",
-  "EFL-1.0",
-  "EFL-2.0",
-  "MIT-advertising",
-  "MIT-enna",
-  "Entessa",
-  "ErlPL-1.1",
-  "EUDatagrid",
-  "EUPL-1.0",
-  "EUPL-1.1",
-  "Eurosym",
-  "Fair",
-  "MIT-feh",
-  "Frameworx-1.0",
-  "FreeImage",
-  "FTL",
-  "FSFUL",
-  "FSFULLR",
-  "Giftware",
-  "GL2PS",
-  "Glulxe",
-  "AGPL-3.0",
-  "GFDL-1.1",
-  "GFDL-1.2",
-  "GFDL-1.3",
-  "GPL-1.0",
-  "GPL-2.0",
-  "GPL-3.0",
-  "LGPL-2.1",
-  "LGPL-3.0",
-  "LGPL-2.0",
-  "gnuplot",
-  "gSOAP-1.3b",
-  "HaskellReport",
-  "HPND",
-  "IBM-pibs",
-  "IPL-1.0",
-  "ImageMagick",
-  "iMatix",
-  "Imlib2",
-  "IJG",
-  "Intel-ACPI",
-  "Intel",
-  "IPA",
-  "ISC",
-  "JasPer-2.0",
-  "JSON",
-  "LPPL-1.3a",
-  "LPPL-1.0",
-  "LPPL-1.1",
-  "LPPL-1.2",
-  "LPPL-1.3c",
-  "Latex2e",
-  "BSD-3-Clause-LBNL",
-  "Leptonica",
-  "Libpng",
-  "libtiff",
-  "LPL-1.02",
-  "LPL-1.0",
-  "MakeIndex",
-  "MTLL",
-  "MS-PL",
-  "MS-RL",
-  "MirOS",
-  "MITNFA",
-  "MIT",
-  "Motosoto",
-  "MPL-1.0",
-  "MPL-1.1",
-  "MPL-2.0",
-  "MPL-2.0-no-copyleft-exception",
-  "mpich2",
-  "Multics",
-  "Mup",
-  "NASA-1.3",
-  "Naumen",
-  "NBPL-1.0",
-  "NetCDF",
-  "NGPL",
-  "NOSL",
-  "NPL-1.0",
-  "NPL-1.1",
-  "Newsletr",
-  "NLPL",
-  "Nokia",
-  "NPOSL-3.0",
-  "Noweb",
-  "NRL",
-  "NTP",
-  "Nunit",
-  "OCLC-2.0",
-  "ODbL-1.0",
-  "PDDL-1.0",
-  "OGTSL",
-  "OLDAP-2.2.2",
-  "OLDAP-1.1",
-  "OLDAP-1.2",
-  "OLDAP-1.3",
-  "OLDAP-1.4",
-  "OLDAP-2.0",
-  "OLDAP-2.0.1",
-  "OLDAP-2.1",
-  "OLDAP-2.2",
-  "OLDAP-2.2.1",
-  "OLDAP-2.3",
-  "OLDAP-2.4",
-  "OLDAP-2.5",
-  "OLDAP-2.6",
-  "OLDAP-2.7",
-  "OLDAP-2.8",
-  "OML",
-  "OPL-1.0",
-  "OSL-1.0",
-  "OSL-1.1",
-  "OSL-2.0",
-  "OSL-2.1",
-  "OSL-3.0",
-  "OpenSSL",
-  "PHP-3.0",
-  "PHP-3.01",
-  "Plexus",
-  "PostgreSQL",
-  "psfrag",
-  "psutils",
-  "Python-2.0",
-  "QPL-1.0",
-  "Qhull",
-  "Rdisc",
-  "RPSL-1.0",
-  "RPL-1.1",
-  "RPL-1.5",
-  "RHeCos-1.1",
-  "RSCPL",
-  "Ruby",
-  "SAX-PD",
-  "Saxpath",
-  "SCEA",
-  "SWL",
-  "SGI-B-1.0",
-  "SGI-B-1.1",
-  "SGI-B-2.0",
-  "OFL-1.0",
-  "OFL-1.1",
-  "SimPL-2.0",
-  "Sleepycat",
-  "SNIA",
-  "SMLNJ",
-  "SugarCRM-1.1.3",
-  "SISSL",
-  "SISSL-1.2",
-  "SPL-1.0",
-  "Watcom-1.0",
-  "TCL",
-  "Unlicense",
-  "TMate",
-  "TORQUE-1.1",
-  "TOSL",
-  "Unicode-TOU",
-  "NCSA",
-  "Vim",
-  "VOSTROM",
-  "VSL-1.0",
-  "W3C",
-  "W3C-19980720",
-  "Wsuipa",
-  "Xnet",
-  "X11",
-  "Xerox",
-  "XFree86-1.1",
-  "xinetd",
-  "xpp",
-  "XSkat",
-  "YPL-1.0",
-  "YPL-1.1",
-  "Zed",
-  "Zend-2.0",
-  "Zimbra-1.3",
-  "Zimbra-1.4",
-  "Zlib",
-  "zlib-acknowledgement",
-  "ZPL-1.1",
-  "ZPL-2.0",
-  "ZPL-2.1",
-  "ICU"
-]
diff --git a/deps/npm/node_modules/spdx/package.json b/deps/npm/node_modules/spdx/package.json
deleted file mode 100644
index d1601c60119e82..00000000000000
--- a/deps/npm/node_modules/spdx/package.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "name": "spdx",
-  "description": "SPDX License Expression Syntax parser",
-  "version": "0.4.1",
-  "author": {
-    "name": "Kyle E. Mitchell",
-    "email": "kyle@kemitchell.com",
-    "url": "http://kemitchell.com"
-  },
-  "bugs": {
-    "url": "https://github.com/kemitchell/spdx.js/issues"
-  },
-  "dependencies": {
-    "spdx-license-ids": "^1.0.0"
-  },
-  "devDependencies": {
-    "docco": "^0.7.0",
-    "fixpack": "^2.2.0",
-    "jison": "^0.4.15",
-    "jscs": "^1.12.0",
-    "jshint": "^2.7.0",
-    "jsmd": "^0.3.0"
-  },
-  "homepage": "https://github.com/kemitchell/spdx.js",
-  "keywords": [
-    "SPDX",
-    "law",
-    "legal",
-    "license",
-    "metadata",
-    "package",
-    "package.json",
-    "standards"
-  ],
-  "license": "Apache-2.0",
-  "main": "source/spdx.js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/kemitchell/spdx.js.git"
-  },
-  "scripts": {
-    "build": "node build/parser.js > source/parser.generated.js",
-    "doc": "docco --output documentation source/spdx.js",
-    "lint": "fixpack && jshint build source/spdx.js && jscs build source/spdx.js",
-    "precommit": "npm run lint && npm run test",
-    "prepublish": "npm run build",
-    "pretest": "npm run build",
-    "test": "jsmd README.md"
-  },
-  "gitHead": "e98233f7ebfa27ceec7d9f9bd77d7eb003ca3210",
-  "_id": "spdx@0.4.1",
-  "_shasum": "eb43a2d83483e7073d24184b5ca0d00f33e184ff",
-  "_from": "spdx@>=0.4.0 <0.5.0",
-  "_npmVersion": "2.11.0",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "name": "kemitchell",
-    "email": "kyle@kemitchell.com"
-  },
-  "maintainers": [
-    {
-      "name": "kemitchell",
-      "email": "kyle@kemitchell.com"
-    }
-  ],
-  "dist": {
-    "shasum": "eb43a2d83483e7073d24184b5ca0d00f33e184ff",
-    "tarball": "http://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz",
-  "readme": "ERROR: No README data found!"
-}
diff --git a/deps/npm/node_modules/spdx/source/exceptions.json b/deps/npm/node_modules/spdx/source/exceptions.json
deleted file mode 100644
index d588a1af7e11f8..00000000000000
--- a/deps/npm/node_modules/spdx/source/exceptions.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-  "Autoconf-exception-2.0",
-  "Autoconf-exception-3.0",
-  "Bison-exception-2.2",
-  "Classpath-exception-2.0",
-  "eCos-exception-2.0",
-  "Font-exception-2.0",
-  "GCC-exception-2.0",
-  "GCC-exception-3.1",
-  "WxWindows-exception-3.1"
-]
diff --git a/deps/npm/node_modules/spdx/source/parser.generated.js b/deps/npm/node_modules/spdx/source/parser.generated.js
deleted file mode 100644
index 380609339cd77a..00000000000000
--- a/deps/npm/node_modules/spdx/source/parser.generated.js
+++ /dev/null
@@ -1,1255 +0,0 @@
-/* parser generated by jison 0.4.15 */
-/*
-  Returns a Parser object of the following structure:
-
-  Parser: {
-    yy: {}
-  }
-
-  Parser.prototype: {
-    yy: {},
-    trace: function(),
-    symbols_: {associative list: name ==> number},
-    terminals_: {associative list: number ==> name},
-    productions_: [...],
-    performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate, $$, _$),
-    table: [...],
-    defaultActions: {...},
-    parseError: function(str, hash),
-    parse: function(input),
-
-    lexer: {
-        EOF: 1,
-        parseError: function(str, hash),
-        setInput: function(input),
-        input: function(),
-        unput: function(str),
-        more: function(),
-        less: function(n),
-        pastInput: function(),
-        upcomingInput: function(),
-        showPosition: function(),
-        test_match: function(regex_match_array, rule_index),
-        next: function(),
-        lex: function(),
-        begin: function(condition),
-        popState: function(),
-        _currentRules: function(),
-        topState: function(),
-        pushState: function(condition),
-
-        options: {
-            ranges: boolean           (optional: true ==> token location info will include a .range[] member)
-            flex: boolean             (optional: true ==> flex-like lexing behaviour where the rules are tested exhaustively to find the longest match)
-            backtrack_lexer: boolean  (optional: true ==> lexer regexes are tested in order and for each matching regex the action code is invoked; the lexer terminates the scan when a token is returned by the action code)
-        },
-
-        performAction: function(yy, yy_, $avoiding_name_collisions, YY_START),
-        rules: [...],
-        conditions: {associative list: name ==> set},
-    }
-  }
-
-
-  token location info (@$, _$, etc.): {
-    first_line: n,
-    last_line: n,
-    first_column: n,
-    last_column: n,
-    range: [start_number, end_number]       (where the numbers are indexes into the input string, regular zero-based)
-  }
-
-
-  the parseError function receives a 'hash' object with these members for lexer and parser errors: {
-    text:        (matched text)
-    token:       (the produced terminal token, if any)
-    line:        (yylineno)
-  }
-  while parser (grammar) errors will also provide these members, i.e. parser errors deliver a superset of attributes: {
-    loc:         (yylloc)
-    expected:    (string describing the set of expected tokens)
-    recoverable: (boolean: TRUE when the parser has a error recovery rule available for this particular error)
-  }
-*/
-var spdxparse = (function(){
-var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,5],$V1=[1,6],$V2=[1,7],$V3=[1,4],$V4=[1,9],$V5=[1,10],$V6=[5,14,15,17],$V7=[5,12,14,15,17];
-var parser = {trace: function trace() { },
-yy: {},
-symbols_: {"error":2,"start":3,"expression":4,"EOS":5,"simpleExpression":6,"LICENSE":7,"PLUS":8,"LICENSEREF":9,"DOCUMENTREF":10,"COLON":11,"WITH":12,"EXCEPTION":13,"AND":14,"OR":15,"OPEN":16,"CLOSE":17,"$accept":0,"$end":1},
-terminals_: {2:"error",5:"EOS",7:"LICENSE",8:"PLUS",9:"LICENSEREF",10:"DOCUMENTREF",11:"COLON",12:"WITH",13:"EXCEPTION",14:"AND",15:"OR",16:"OPEN",17:"CLOSE"},
-productions_: [0,[3,2],[6,1],[6,2],[6,1],[6,3],[4,1],[4,3],[4,3],[4,3],[4,3]],
-performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
-/* this == yyval */
-
-var $0 = $$.length - 1;
-switch (yystate) {
-case 1:
-return this.$ = $$[$0-1];
-break;
-case 2: case 4: case 5:
-this.$ = { license: yytext };
-break;
-case 3:
-this.$ = { license: $$[$0-1], plus: true };
-break;
-case 6:
-this.$ = $$[$0];
-break;
-case 7:
-this.$ = { exception: $$[$0] };
-this.$.license = $$[$0-2].license;
-if ($$[$0-2].hasOwnProperty('plus')) {
-  this.$.plus = $$[$0-2].plus;
-}
-break;
-case 8:
-this.$ = { conjunction: 'and', left: $$[$0-2], right: $$[$0] };
-break;
-case 9:
-this.$ = { conjunction: 'or', left: $$[$0-2], right: $$[$0] };
-break;
-case 10:
-this.$ = $$[$0-1]
-break;
-}
-},
-table: [{3:1,4:2,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{1:[3]},{5:[1,8],14:$V4,15:$V5},o($V6,[2,6],{12:[1,11]}),{4:12,6:3,7:$V0,9:$V1,10:$V2,16:$V3},o($V7,[2,2],{8:[1,13]}),o($V7,[2,4]),{11:[1,14]},{1:[2,1]},{4:15,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{4:16,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{13:[1,17]},{14:$V4,15:$V5,17:[1,18]},o($V7,[2,3]),{9:[1,19]},o($V6,[2,8]),o([5,15,17],[2,9],{14:$V4}),o($V6,[2,7]),o($V6,[2,10]),o($V7,[2,5])],
-defaultActions: {8:[2,1]},
-parseError: function parseError(str, hash) {
-    if (hash.recoverable) {
-        this.trace(str);
-    } else {
-        throw new Error(str);
-    }
-},
-parse: function parse(input) {
-    var self = this, stack = [0], tstack = [], vstack = [null], lstack = [], table = this.table, yytext = '', yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1;
-    var args = lstack.slice.call(arguments, 1);
-    var lexer = Object.create(this.lexer);
-    var sharedState = { yy: {} };
-    for (var k in this.yy) {
-        if (Object.prototype.hasOwnProperty.call(this.yy, k)) {
-            sharedState.yy[k] = this.yy[k];
-        }
-    }
-    lexer.setInput(input, sharedState.yy);
-    sharedState.yy.lexer = lexer;
-    sharedState.yy.parser = this;
-    if (typeof lexer.yylloc == 'undefined') {
-        lexer.yylloc = {};
-    }
-    var yyloc = lexer.yylloc;
-    lstack.push(yyloc);
-    var ranges = lexer.options && lexer.options.ranges;
-    if (typeof sharedState.yy.parseError === 'function') {
-        this.parseError = sharedState.yy.parseError;
-    } else {
-        this.parseError = Object.getPrototypeOf(this).parseError;
-    }
-    function popStack(n) {
-        stack.length = stack.length - 2 * n;
-        vstack.length = vstack.length - n;
-        lstack.length = lstack.length - n;
-    }
-    _token_stack:
-        function lex() {
-            var token;
-            token = lexer.lex() || EOF;
-            if (typeof token !== 'number') {
-                token = self.symbols_[token] || token;
-            }
-            return token;
-        }
-    var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected;
-    while (true) {
-        state = stack[stack.length - 1];
-        if (this.defaultActions[state]) {
-            action = this.defaultActions[state];
-        } else {
-            if (symbol === null || typeof symbol == 'undefined') {
-                symbol = lex();
-            }
-            action = table[state] && table[state][symbol];
-        }
-                    if (typeof action === 'undefined' || !action.length || !action[0]) {
-                var errStr = '';
-                expected = [];
-                for (p in table[state]) {
-                    if (this.terminals_[p] && p > TERROR) {
-                        expected.push('\'' + this.terminals_[p] + '\'');
-                    }
-                }
-                if (lexer.showPosition) {
-                    errStr = 'Parse error on line ' + (yylineno + 1) + ':\n' + lexer.showPosition() + '\nExpecting ' + expected.join(', ') + ', got \'' + (this.terminals_[symbol] || symbol) + '\'';
-                } else {
-                    errStr = 'Parse error on line ' + (yylineno + 1) + ': Unexpected ' + (symbol == EOF ? 'end of input' : '\'' + (this.terminals_[symbol] || symbol) + '\'');
-                }
-                this.parseError(errStr, {
-                    text: lexer.match,
-                    token: this.terminals_[symbol] || symbol,
-                    line: lexer.yylineno,
-                    loc: yyloc,
-                    expected: expected
-                });
-            }
-        if (action[0] instanceof Array && action.length > 1) {
-            throw new Error('Parse Error: multiple actions possible at state: ' + state + ', token: ' + symbol);
-        }
-        switch (action[0]) {
-        case 1:
-            stack.push(symbol);
-            vstack.push(lexer.yytext);
-            lstack.push(lexer.yylloc);
-            stack.push(action[1]);
-            symbol = null;
-            if (!preErrorSymbol) {
-                yyleng = lexer.yyleng;
-                yytext = lexer.yytext;
-                yylineno = lexer.yylineno;
-                yyloc = lexer.yylloc;
-                if (recovering > 0) {
-                    recovering--;
-                }
-            } else {
-                symbol = preErrorSymbol;
-                preErrorSymbol = null;
-            }
-            break;
-        case 2:
-            len = this.productions_[action[1]][1];
-            yyval.$ = vstack[vstack.length - len];
-            yyval._$ = {
-                first_line: lstack[lstack.length - (len || 1)].first_line,
-                last_line: lstack[lstack.length - 1].last_line,
-                first_column: lstack[lstack.length - (len || 1)].first_column,
-                last_column: lstack[lstack.length - 1].last_column
-            };
-            if (ranges) {
-                yyval._$.range = [
-                    lstack[lstack.length - (len || 1)].range[0],
-                    lstack[lstack.length - 1].range[1]
-                ];
-            }
-            r = this.performAction.apply(yyval, [
-                yytext,
-                yyleng,
-                yylineno,
-                sharedState.yy,
-                action[1],
-                vstack,
-                lstack
-            ].concat(args));
-            if (typeof r !== 'undefined') {
-                return r;
-            }
-            if (len) {
-                stack = stack.slice(0, -1 * len * 2);
-                vstack = vstack.slice(0, -1 * len);
-                lstack = lstack.slice(0, -1 * len);
-            }
-            stack.push(this.productions_[action[1]][0]);
-            vstack.push(yyval.$);
-            lstack.push(yyval._$);
-            newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
-            stack.push(newState);
-            break;
-        case 3:
-            return true;
-        }
-    }
-    return true;
-}};
-/* generated by jison-lex 0.3.4 */
-var lexer = (function(){
-var lexer = ({
-
-EOF:1,
-
-parseError:function parseError(str, hash) {
-        if (this.yy.parser) {
-            this.yy.parser.parseError(str, hash);
-        } else {
-            throw new Error(str);
-        }
-    },
-
-// resets the lexer, sets new input
-setInput:function (input, yy) {
-        this.yy = yy || this.yy || {};
-        this._input = input;
-        this._more = this._backtrack = this.done = false;
-        this.yylineno = this.yyleng = 0;
-        this.yytext = this.matched = this.match = '';
-        this.conditionStack = ['INITIAL'];
-        this.yylloc = {
-            first_line: 1,
-            first_column: 0,
-            last_line: 1,
-            last_column: 0
-        };
-        if (this.options.ranges) {
-            this.yylloc.range = [0,0];
-        }
-        this.offset = 0;
-        return this;
-    },
-
-// consumes and returns one char from the input
-input:function () {
-        var ch = this._input[0];
-        this.yytext += ch;
-        this.yyleng++;
-        this.offset++;
-        this.match += ch;
-        this.matched += ch;
-        var lines = ch.match(/(?:\r\n?|\n).*/g);
-        if (lines) {
-            this.yylineno++;
-            this.yylloc.last_line++;
-        } else {
-            this.yylloc.last_column++;
-        }
-        if (this.options.ranges) {
-            this.yylloc.range[1]++;
-        }
-
-        this._input = this._input.slice(1);
-        return ch;
-    },
-
-// unshifts one char (or a string) into the input
-unput:function (ch) {
-        var len = ch.length;
-        var lines = ch.split(/(?:\r\n?|\n)/g);
-
-        this._input = ch + this._input;
-        this.yytext = this.yytext.substr(0, this.yytext.length - len);
-        //this.yyleng -= len;
-        this.offset -= len;
-        var oldLines = this.match.split(/(?:\r\n?|\n)/g);
-        this.match = this.match.substr(0, this.match.length - 1);
-        this.matched = this.matched.substr(0, this.matched.length - 1);
-
-        if (lines.length - 1) {
-            this.yylineno -= lines.length - 1;
-        }
-        var r = this.yylloc.range;
-
-        this.yylloc = {
-            first_line: this.yylloc.first_line,
-            last_line: this.yylineno + 1,
-            first_column: this.yylloc.first_column,
-            last_column: lines ?
-                (lines.length === oldLines.length ? this.yylloc.first_column : 0)
-                 + oldLines[oldLines.length - lines.length].length - lines[0].length :
-              this.yylloc.first_column - len
-        };
-
-        if (this.options.ranges) {
-            this.yylloc.range = [r[0], r[0] + this.yyleng - len];
-        }
-        this.yyleng = this.yytext.length;
-        return this;
-    },
-
-// When called from action, caches matched text and appends it on next action
-more:function () {
-        this._more = true;
-        return this;
-    },
-
-// When called from action, signals the lexer that this rule fails to match the input, so the next matching rule (regex) should be tested instead.
-reject:function () {
-        if (this.options.backtrack_lexer) {
-            this._backtrack = true;
-        } else {
-            return this.parseError('Lexical error on line ' + (this.yylineno + 1) + '. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true).\n' + this.showPosition(), {
-                text: "",
-                token: null,
-                line: this.yylineno
-            });
-
-        }
-        return this;
-    },
-
-// retain first n characters of the match
-less:function (n) {
-        this.unput(this.match.slice(n));
-    },
-
-// displays already matched input, i.e. for error messages
-pastInput:function () {
-        var past = this.matched.substr(0, this.matched.length - this.match.length);
-        return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, "");
-    },
-
-// displays upcoming input, i.e. for error messages
-upcomingInput:function () {
-        var next = this.match;
-        if (next.length < 20) {
-            next += this._input.substr(0, 20-next.length);
-        }
-        return (next.substr(0,20) + (next.length > 20 ? '...' : '')).replace(/\n/g, "");
-    },
-
-// displays the character position where the lexing error occurred, i.e. for error messages
-showPosition:function () {
-        var pre = this.pastInput();
-        var c = new Array(pre.length + 1).join("-");
-        return pre + this.upcomingInput() + "\n" + c + "^";
-    },
-
-// test the lexed token: return FALSE when not a match, otherwise return token
-test_match:function (match, indexed_rule) {
-        var token,
-            lines,
-            backup;
-
-        if (this.options.backtrack_lexer) {
-            // save context
-            backup = {
-                yylineno: this.yylineno,
-                yylloc: {
-                    first_line: this.yylloc.first_line,
-                    last_line: this.last_line,
-                    first_column: this.yylloc.first_column,
-                    last_column: this.yylloc.last_column
-                },
-                yytext: this.yytext,
-                match: this.match,
-                matches: this.matches,
-                matched: this.matched,
-                yyleng: this.yyleng,
-                offset: this.offset,
-                _more: this._more,
-                _input: this._input,
-                yy: this.yy,
-                conditionStack: this.conditionStack.slice(0),
-                done: this.done
-            };
-            if (this.options.ranges) {
-                backup.yylloc.range = this.yylloc.range.slice(0);
-            }
-        }
-
-        lines = match[0].match(/(?:\r\n?|\n).*/g);
-        if (lines) {
-            this.yylineno += lines.length;
-        }
-        this.yylloc = {
-            first_line: this.yylloc.last_line,
-            last_line: this.yylineno + 1,
-            first_column: this.yylloc.last_column,
-            last_column: lines ?
-                         lines[lines.length - 1].length - lines[lines.length - 1].match(/\r?\n?/)[0].length :
-                         this.yylloc.last_column + match[0].length
-        };
-        this.yytext += match[0];
-        this.match += match[0];
-        this.matches = match;
-        this.yyleng = this.yytext.length;
-        if (this.options.ranges) {
-            this.yylloc.range = [this.offset, this.offset += this.yyleng];
-        }
-        this._more = false;
-        this._backtrack = false;
-        this._input = this._input.slice(match[0].length);
-        this.matched += match[0];
-        token = this.performAction.call(this, this.yy, this, indexed_rule, this.conditionStack[this.conditionStack.length - 1]);
-        if (this.done && this._input) {
-            this.done = false;
-        }
-        if (token) {
-            return token;
-        } else if (this._backtrack) {
-            // recover context
-            for (var k in backup) {
-                this[k] = backup[k];
-            }
-            return false; // rule action called reject() implying the next rule should be tested instead.
-        }
-        return false;
-    },
-
-// return next match in input
-next:function () {
-        if (this.done) {
-            return this.EOF;
-        }
-        if (!this._input) {
-            this.done = true;
-        }
-
-        var token,
-            match,
-            tempMatch,
-            index;
-        if (!this._more) {
-            this.yytext = '';
-            this.match = '';
-        }
-        var rules = this._currentRules();
-        for (var i = 0; i < rules.length; i++) {
-            tempMatch = this._input.match(this.rules[rules[i]]);
-            if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
-                match = tempMatch;
-                index = i;
-                if (this.options.backtrack_lexer) {
-                    token = this.test_match(tempMatch, rules[i]);
-                    if (token !== false) {
-                        return token;
-                    } else if (this._backtrack) {
-                        match = false;
-                        continue; // rule action called reject() implying a rule MISmatch.
-                    } else {
-                        // else: this is a lexer rule which consumes input without producing a token (e.g. whitespace)
-                        return false;
-                    }
-                } else if (!this.options.flex) {
-                    break;
-                }
-            }
-        }
-        if (match) {
-            token = this.test_match(match, rules[index]);
-            if (token !== false) {
-                return token;
-            }
-            // else: this is a lexer rule which consumes input without producing a token (e.g. whitespace)
-            return false;
-        }
-        if (this._input === "") {
-            return this.EOF;
-        } else {
-            return this.parseError('Lexical error on line ' + (this.yylineno + 1) + '. Unrecognized text.\n' + this.showPosition(), {
-                text: "",
-                token: null,
-                line: this.yylineno
-            });
-        }
-    },
-
-// return next match that has a token
-lex:function lex() {
-        var r = this.next();
-        if (r) {
-            return r;
-        } else {
-            return this.lex();
-        }
-    },
-
-// activates a new lexer condition state (pushes the new lexer condition state onto the condition stack)
-begin:function begin(condition) {
-        this.conditionStack.push(condition);
-    },
-
-// pop the previously active lexer condition state off the condition stack
-popState:function popState() {
-        var n = this.conditionStack.length - 1;
-        if (n > 0) {
-            return this.conditionStack.pop();
-        } else {
-            return this.conditionStack[0];
-        }
-    },
-
-// produce the lexer rule set which is active for the currently active lexer condition state
-_currentRules:function _currentRules() {
-        if (this.conditionStack.length && this.conditionStack[this.conditionStack.length - 1]) {
-            return this.conditions[this.conditionStack[this.conditionStack.length - 1]].rules;
-        } else {
-            return this.conditions["INITIAL"].rules;
-        }
-    },
-
-// return the currently active lexer condition state; when an index argument is provided it produces the N-th previous condition state, if available
-topState:function topState(n) {
-        n = this.conditionStack.length - 1 - Math.abs(n || 0);
-        if (n >= 0) {
-            return this.conditionStack[n];
-        } else {
-            return "INITIAL";
-        }
-    },
-
-// alias for begin(condition)
-pushState:function pushState(condition) {
-        this.begin(condition);
-    },
-
-// return the number of states currently on the stack
-stateStackSize:function stateStackSize() {
-        return this.conditionStack.length;
-    },
-options: {},
-performAction: function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
-var YYSTATE=YY_START;
-switch($avoiding_name_collisions) {
-case 0:return 5;
-break;
-case 1:/* skip whitespace */
-break;
-case 2:return 8;
-break;
-case 3:return 16;
-break;
-case 4:return 17;
-break;
-case 5:return 11;
-break;
-case 6:return 10;
-break;
-case 7:return 9;
-break;
-case 8:return 14;
-break;
-case 9:return 15;
-break;
-case 10:return 12;
-break;
-case 11:return 7;
-break;
-case 12:return 7;
-break;
-case 13:return 7;
-break;
-case 14:return 7;
-break;
-case 15:return 7;
-break;
-case 16:return 7;
-break;
-case 17:return 7;
-break;
-case 18:return 7;
-break;
-case 19:return 7;
-break;
-case 20:return 7;
-break;
-case 21:return 7;
-break;
-case 22:return 7;
-break;
-case 23:return 7;
-break;
-case 24:return 7;
-break;
-case 25:return 7;
-break;
-case 26:return 7;
-break;
-case 27:return 7;
-break;
-case 28:return 7;
-break;
-case 29:return 7;
-break;
-case 30:return 7;
-break;
-case 31:return 7;
-break;
-case 32:return 7;
-break;
-case 33:return 7;
-break;
-case 34:return 7;
-break;
-case 35:return 7;
-break;
-case 36:return 7;
-break;
-case 37:return 7;
-break;
-case 38:return 7;
-break;
-case 39:return 7;
-break;
-case 40:return 7;
-break;
-case 41:return 7;
-break;
-case 42:return 7;
-break;
-case 43:return 7;
-break;
-case 44:return 7;
-break;
-case 45:return 7;
-break;
-case 46:return 7;
-break;
-case 47:return 7;
-break;
-case 48:return 7;
-break;
-case 49:return 7;
-break;
-case 50:return 7;
-break;
-case 51:return 7;
-break;
-case 52:return 7;
-break;
-case 53:return 7;
-break;
-case 54:return 7;
-break;
-case 55:return 7;
-break;
-case 56:return 7;
-break;
-case 57:return 7;
-break;
-case 58:return 7;
-break;
-case 59:return 7;
-break;
-case 60:return 7;
-break;
-case 61:return 7;
-break;
-case 62:return 7;
-break;
-case 63:return 7;
-break;
-case 64:return 7;
-break;
-case 65:return 7;
-break;
-case 66:return 7;
-break;
-case 67:return 7;
-break;
-case 68:return 7;
-break;
-case 69:return 7;
-break;
-case 70:return 7;
-break;
-case 71:return 7;
-break;
-case 72:return 7;
-break;
-case 73:return 7;
-break;
-case 74:return 7;
-break;
-case 75:return 7;
-break;
-case 76:return 7;
-break;
-case 77:return 7;
-break;
-case 78:return 7;
-break;
-case 79:return 7;
-break;
-case 80:return 7;
-break;
-case 81:return 7;
-break;
-case 82:return 7;
-break;
-case 83:return 7;
-break;
-case 84:return 7;
-break;
-case 85:return 7;
-break;
-case 86:return 7;
-break;
-case 87:return 7;
-break;
-case 88:return 7;
-break;
-case 89:return 7;
-break;
-case 90:return 7;
-break;
-case 91:return 7;
-break;
-case 92:return 7;
-break;
-case 93:return 7;
-break;
-case 94:return 7;
-break;
-case 95:return 7;
-break;
-case 96:return 7;
-break;
-case 97:return 7;
-break;
-case 98:return 7;
-break;
-case 99:return 7;
-break;
-case 100:return 7;
-break;
-case 101:return 7;
-break;
-case 102:return 7;
-break;
-case 103:return 7;
-break;
-case 104:return 7;
-break;
-case 105:return 7;
-break;
-case 106:return 7;
-break;
-case 107:return 7;
-break;
-case 108:return 7;
-break;
-case 109:return 7;
-break;
-case 110:return 7;
-break;
-case 111:return 7;
-break;
-case 112:return 7;
-break;
-case 113:return 7;
-break;
-case 114:return 7;
-break;
-case 115:return 7;
-break;
-case 116:return 7;
-break;
-case 117:return 7;
-break;
-case 118:return 7;
-break;
-case 119:return 7;
-break;
-case 120:return 7;
-break;
-case 121:return 7;
-break;
-case 122:return 7;
-break;
-case 123:return 7;
-break;
-case 124:return 7;
-break;
-case 125:return 7;
-break;
-case 126:return 7;
-break;
-case 127:return 7;
-break;
-case 128:return 7;
-break;
-case 129:return 7;
-break;
-case 130:return 7;
-break;
-case 131:return 7;
-break;
-case 132:return 7;
-break;
-case 133:return 7;
-break;
-case 134:return 7;
-break;
-case 135:return 7;
-break;
-case 136:return 7;
-break;
-case 137:return 7;
-break;
-case 138:return 7;
-break;
-case 139:return 7;
-break;
-case 140:return 7;
-break;
-case 141:return 7;
-break;
-case 142:return 7;
-break;
-case 143:return 7;
-break;
-case 144:return 7;
-break;
-case 145:return 7;
-break;
-case 146:return 7;
-break;
-case 147:return 7;
-break;
-case 148:return 7;
-break;
-case 149:return 7;
-break;
-case 150:return 7;
-break;
-case 151:return 7;
-break;
-case 152:return 7;
-break;
-case 153:return 7;
-break;
-case 154:return 7;
-break;
-case 155:return 7;
-break;
-case 156:return 7;
-break;
-case 157:return 7;
-break;
-case 158:return 7;
-break;
-case 159:return 7;
-break;
-case 160:return 7;
-break;
-case 161:return 7;
-break;
-case 162:return 7;
-break;
-case 163:return 7;
-break;
-case 164:return 7;
-break;
-case 165:return 7;
-break;
-case 166:return 7;
-break;
-case 167:return 7;
-break;
-case 168:return 7;
-break;
-case 169:return 7;
-break;
-case 170:return 7;
-break;
-case 171:return 7;
-break;
-case 172:return 7;
-break;
-case 173:return 7;
-break;
-case 174:return 7;
-break;
-case 175:return 7;
-break;
-case 176:return 7;
-break;
-case 177:return 7;
-break;
-case 178:return 7;
-break;
-case 179:return 7;
-break;
-case 180:return 7;
-break;
-case 181:return 7;
-break;
-case 182:return 7;
-break;
-case 183:return 7;
-break;
-case 184:return 7;
-break;
-case 185:return 7;
-break;
-case 186:return 7;
-break;
-case 187:return 7;
-break;
-case 188:return 7;
-break;
-case 189:return 7;
-break;
-case 190:return 7;
-break;
-case 191:return 7;
-break;
-case 192:return 7;
-break;
-case 193:return 7;
-break;
-case 194:return 7;
-break;
-case 195:return 7;
-break;
-case 196:return 7;
-break;
-case 197:return 7;
-break;
-case 198:return 7;
-break;
-case 199:return 7;
-break;
-case 200:return 7;
-break;
-case 201:return 7;
-break;
-case 202:return 7;
-break;
-case 203:return 7;
-break;
-case 204:return 7;
-break;
-case 205:return 7;
-break;
-case 206:return 7;
-break;
-case 207:return 7;
-break;
-case 208:return 7;
-break;
-case 209:return 7;
-break;
-case 210:return 7;
-break;
-case 211:return 7;
-break;
-case 212:return 7;
-break;
-case 213:return 7;
-break;
-case 214:return 7;
-break;
-case 215:return 7;
-break;
-case 216:return 7;
-break;
-case 217:return 7;
-break;
-case 218:return 7;
-break;
-case 219:return 7;
-break;
-case 220:return 7;
-break;
-case 221:return 7;
-break;
-case 222:return 7;
-break;
-case 223:return 7;
-break;
-case 224:return 7;
-break;
-case 225:return 7;
-break;
-case 226:return 7;
-break;
-case 227:return 7;
-break;
-case 228:return 7;
-break;
-case 229:return 7;
-break;
-case 230:return 7;
-break;
-case 231:return 7;
-break;
-case 232:return 7;
-break;
-case 233:return 7;
-break;
-case 234:return 7;
-break;
-case 235:return 7;
-break;
-case 236:return 7;
-break;
-case 237:return 7;
-break;
-case 238:return 7;
-break;
-case 239:return 7;
-break;
-case 240:return 7;
-break;
-case 241:return 7;
-break;
-case 242:return 7;
-break;
-case 243:return 7;
-break;
-case 244:return 7;
-break;
-case 245:return 7;
-break;
-case 246:return 7;
-break;
-case 247:return 7;
-break;
-case 248:return 7;
-break;
-case 249:return 7;
-break;
-case 250:return 7;
-break;
-case 251:return 7;
-break;
-case 252:return 7;
-break;
-case 253:return 7;
-break;
-case 254:return 7;
-break;
-case 255:return 7;
-break;
-case 256:return 7;
-break;
-case 257:return 7;
-break;
-case 258:return 7;
-break;
-case 259:return 7;
-break;
-case 260:return 7;
-break;
-case 261:return 7;
-break;
-case 262:return 7;
-break;
-case 263:return 7;
-break;
-case 264:return 7;
-break;
-case 265:return 7;
-break;
-case 266:return 7;
-break;
-case 267:return 7;
-break;
-case 268:return 7;
-break;
-case 269:return 7;
-break;
-case 270:return 7;
-break;
-case 271:return 7;
-break;
-case 272:return 7;
-break;
-case 273:return 7;
-break;
-case 274:return 7;
-break;
-case 275:return 7;
-break;
-case 276:return 7;
-break;
-case 277:return 7;
-break;
-case 278:return 7;
-break;
-case 279:return 7;
-break;
-case 280:return 7;
-break;
-case 281:return 7;
-break;
-case 282:return 7;
-break;
-case 283:return 7;
-break;
-case 284:return 7;
-break;
-case 285:return 7;
-break;
-case 286:return 7;
-break;
-case 287:return 7;
-break;
-case 288:return 7;
-break;
-case 289:return 7;
-break;
-case 290:return 7;
-break;
-case 291:return 7;
-break;
-case 292:return 7;
-break;
-case 293:return 7;
-break;
-case 294:return 7;
-break;
-case 295:return 7;
-break;
-case 296:return 7;
-break;
-case 297:return 7;
-break;
-case 298:return 7;
-break;
-case 299:return 7;
-break;
-case 300:return 7;
-break;
-case 301:return 7;
-break;
-case 302:return 7;
-break;
-case 303:return 7;
-break;
-case 304:return 7;
-break;
-case 305:return 7;
-break;
-case 306:return 7;
-break;
-case 307:return 7;
-break;
-case 308:return 13;
-break;
-case 309:return 13;
-break;
-case 310:return 13;
-break;
-case 311:return 13;
-break;
-case 312:return 13;
-break;
-case 313:return 13;
-break;
-case 314:return 13;
-break;
-case 315:return 13;
-break;
-case 316:return 13;
-break;
-}
-},
-rules: [/^(?:$)/,/^(?:\s+)/,/^(?:\+)/,/^(?:\()/,/^(?:\))/,/^(?::)/,/^(?:DocumentRef-([0-9A-Za-z-+.]+))/,/^(?:LicenseRef-([0-9A-Za-z-+.]+))/,/^(?:AND)/,/^(?:OR)/,/^(?:WITH)/,/^(?:Glide)/,/^(?:Abstyles)/,/^(?:AFL-1.1)/,/^(?:AFL-1.2)/,/^(?:AFL-2.0)/,/^(?:AFL-2.1)/,/^(?:AFL-3.0)/,/^(?:AMPAS)/,/^(?:APL-1.0)/,/^(?:Adobe-Glyph)/,/^(?:APAFML)/,/^(?:Adobe-2006)/,/^(?:AGPL-1.0)/,/^(?:Afmparse)/,/^(?:Aladdin)/,/^(?:ADSL)/,/^(?:AMDPLPA)/,/^(?:ANTLR-PD)/,/^(?:Apache-1.0)/,/^(?:Apache-1.1)/,/^(?:Apache-2.0)/,/^(?:AML)/,/^(?:APSL-1.0)/,/^(?:APSL-1.1)/,/^(?:APSL-1.2)/,/^(?:APSL-2.0)/,/^(?:Artistic-1.0)/,/^(?:Artistic-1.0-Perl)/,/^(?:Artistic-1.0-cl8)/,/^(?:Artistic-2.0)/,/^(?:AAL)/,/^(?:Bahyph)/,/^(?:Barr)/,/^(?:Beerware)/,/^(?:BitTorrent-1.0)/,/^(?:BitTorrent-1.1)/,/^(?:BSL-1.0)/,/^(?:Borceux)/,/^(?:BSD-2-Clause)/,/^(?:BSD-2-Clause-FreeBSD)/,/^(?:BSD-2-Clause-NetBSD)/,/^(?:BSD-3-Clause)/,/^(?:BSD-3-Clause-Clear)/,/^(?:BSD-4-Clause)/,/^(?:BSD-Protection)/,/^(?:BSD-3-Clause-Attribution)/,/^(?:BSD-4-Clause-UC)/,/^(?:bzip2-1.0.5)/,/^(?:bzip2-1.0.6)/,/^(?:Caldera)/,/^(?:CECILL-1.0)/,/^(?:CECILL-1.1)/,/^(?:CECILL-2.0)/,/^(?:CECILL-B)/,/^(?:CECILL-C)/,/^(?:ClArtistic)/,/^(?:MIT-CMU)/,/^(?:CNRI-Jython)/,/^(?:CNRI-Python)/,/^(?:CNRI-Python-GPL-Compatible)/,/^(?:CPOL-1.02)/,/^(?:CDDL-1.0)/,/^(?:CDDL-1.1)/,/^(?:CPAL-1.0)/,/^(?:CPL-1.0)/,/^(?:CATOSL-1.1)/,/^(?:Condor-1.1)/,/^(?:CC-BY-1.0)/,/^(?:CC-BY-2.0)/,/^(?:CC-BY-2.5)/,/^(?:CC-BY-3.0)/,/^(?:CC-BY-4.0)/,/^(?:CC-BY-ND-1.0)/,/^(?:CC-BY-ND-2.0)/,/^(?:CC-BY-ND-2.5)/,/^(?:CC-BY-ND-3.0)/,/^(?:CC-BY-ND-4.0)/,/^(?:CC-BY-NC-1.0)/,/^(?:CC-BY-NC-2.0)/,/^(?:CC-BY-NC-2.5)/,/^(?:CC-BY-NC-3.0)/,/^(?:CC-BY-NC-4.0)/,/^(?:CC-BY-NC-ND-1.0)/,/^(?:CC-BY-NC-ND-2.0)/,/^(?:CC-BY-NC-ND-2.5)/,/^(?:CC-BY-NC-ND-3.0)/,/^(?:CC-BY-NC-ND-4.0)/,/^(?:CC-BY-NC-SA-1.0)/,/^(?:CC-BY-NC-SA-2.0)/,/^(?:CC-BY-NC-SA-2.5)/,/^(?:CC-BY-NC-SA-3.0)/,/^(?:CC-BY-NC-SA-4.0)/,/^(?:CC-BY-SA-1.0)/,/^(?:CC-BY-SA-2.0)/,/^(?:CC-BY-SA-2.5)/,/^(?:CC-BY-SA-3.0)/,/^(?:CC-BY-SA-4.0)/,/^(?:CC0-1.0)/,/^(?:Crossword)/,/^(?:CUA-OPL-1.0)/,/^(?:Cube)/,/^(?:D-FSL-1.0)/,/^(?:diffmark)/,/^(?:WTFPL)/,/^(?:DOC)/,/^(?:Dotseqn)/,/^(?:DSDP)/,/^(?:dvipdfm)/,/^(?:EPL-1.0)/,/^(?:ECL-1.0)/,/^(?:ECL-2.0)/,/^(?:eGenix)/,/^(?:EFL-1.0)/,/^(?:EFL-2.0)/,/^(?:MIT-advertising)/,/^(?:MIT-enna)/,/^(?:Entessa)/,/^(?:ErlPL-1.1)/,/^(?:EUDatagrid)/,/^(?:EUPL-1.0)/,/^(?:EUPL-1.1)/,/^(?:Eurosym)/,/^(?:Fair)/,/^(?:MIT-feh)/,/^(?:Frameworx-1.0)/,/^(?:FreeImage)/,/^(?:FTL)/,/^(?:FSFUL)/,/^(?:FSFULLR)/,/^(?:Giftware)/,/^(?:GL2PS)/,/^(?:Glulxe)/,/^(?:AGPL-3.0)/,/^(?:GFDL-1.1)/,/^(?:GFDL-1.2)/,/^(?:GFDL-1.3)/,/^(?:GPL-1.0)/,/^(?:GPL-2.0)/,/^(?:GPL-3.0)/,/^(?:LGPL-2.1)/,/^(?:LGPL-3.0)/,/^(?:LGPL-2.0)/,/^(?:gnuplot)/,/^(?:gSOAP-1.3b)/,/^(?:HaskellReport)/,/^(?:HPND)/,/^(?:IBM-pibs)/,/^(?:IPL-1.0)/,/^(?:ICU)/,/^(?:ImageMagick)/,/^(?:iMatix)/,/^(?:Imlib2)/,/^(?:IJG)/,/^(?:Intel-ACPI)/,/^(?:Intel)/,/^(?:IPA)/,/^(?:ISC)/,/^(?:JasPer-2.0)/,/^(?:JSON)/,/^(?:LPPL-1.3a)/,/^(?:LPPL-1.0)/,/^(?:LPPL-1.1)/,/^(?:LPPL-1.2)/,/^(?:LPPL-1.3c)/,/^(?:Latex2e)/,/^(?:BSD-3-Clause-LBNL)/,/^(?:Leptonica)/,/^(?:Libpng)/,/^(?:libtiff)/,/^(?:LPL-1.02)/,/^(?:LPL-1.0)/,/^(?:MakeIndex)/,/^(?:MTLL)/,/^(?:MS-PL)/,/^(?:MS-RL)/,/^(?:MirOS)/,/^(?:MITNFA)/,/^(?:MIT)/,/^(?:Motosoto)/,/^(?:MPL-1.0)/,/^(?:MPL-1.1)/,/^(?:MPL-2.0)/,/^(?:MPL-2.0-no-copyleft-exception)/,/^(?:mpich2)/,/^(?:Multics)/,/^(?:Mup)/,/^(?:NASA-1.3)/,/^(?:Naumen)/,/^(?:NBPL-1.0)/,/^(?:NetCDF)/,/^(?:NGPL)/,/^(?:NOSL)/,/^(?:NPL-1.0)/,/^(?:NPL-1.1)/,/^(?:Newsletr)/,/^(?:NLPL)/,/^(?:Nokia)/,/^(?:NPOSL-3.0)/,/^(?:Noweb)/,/^(?:NRL)/,/^(?:NTP)/,/^(?:Nunit)/,/^(?:OCLC-2.0)/,/^(?:ODbL-1.0)/,/^(?:PDDL-1.0)/,/^(?:OGTSL)/,/^(?:OLDAP-2.2.2)/,/^(?:OLDAP-1.1)/,/^(?:OLDAP-1.2)/,/^(?:OLDAP-1.3)/,/^(?:OLDAP-1.4)/,/^(?:OLDAP-2.0)/,/^(?:OLDAP-2.0.1)/,/^(?:OLDAP-2.1)/,/^(?:OLDAP-2.2)/,/^(?:OLDAP-2.2.1)/,/^(?:OLDAP-2.3)/,/^(?:OLDAP-2.4)/,/^(?:OLDAP-2.5)/,/^(?:OLDAP-2.6)/,/^(?:OLDAP-2.7)/,/^(?:OLDAP-2.8)/,/^(?:OML)/,/^(?:OPL-1.0)/,/^(?:OSL-1.0)/,/^(?:OSL-1.1)/,/^(?:OSL-2.0)/,/^(?:OSL-2.1)/,/^(?:OSL-3.0)/,/^(?:OpenSSL)/,/^(?:PHP-3.0)/,/^(?:PHP-3.01)/,/^(?:Plexus)/,/^(?:PostgreSQL)/,/^(?:psfrag)/,/^(?:psutils)/,/^(?:Python-2.0)/,/^(?:QPL-1.0)/,/^(?:Qhull)/,/^(?:Rdisc)/,/^(?:RPSL-1.0)/,/^(?:RPL-1.1)/,/^(?:RPL-1.5)/,/^(?:RHeCos-1.1)/,/^(?:RSCPL)/,/^(?:RSA-MD)/,/^(?:Ruby)/,/^(?:SAX-PD)/,/^(?:Saxpath)/,/^(?:SCEA)/,/^(?:SWL)/,/^(?:SGI-B-1.0)/,/^(?:SGI-B-1.1)/,/^(?:SGI-B-2.0)/,/^(?:OFL-1.0)/,/^(?:OFL-1.1)/,/^(?:SimPL-2.0)/,/^(?:Sleepycat)/,/^(?:SNIA)/,/^(?:SMLNJ)/,/^(?:SugarCRM-1.1.3)/,/^(?:SISSL)/,/^(?:SISSL-1.2)/,/^(?:SPL-1.0)/,/^(?:Watcom-1.0)/,/^(?:TCL)/,/^(?:Unlicense)/,/^(?:TMate)/,/^(?:TORQUE-1.1)/,/^(?:TOSL)/,/^(?:Unicode-TOU)/,/^(?:UPL-1.0)/,/^(?:NCSA)/,/^(?:Vim)/,/^(?:VOSTROM)/,/^(?:VSL-1.0)/,/^(?:W3C-19980720)/,/^(?:W3C)/,/^(?:Wsuipa)/,/^(?:Xnet)/,/^(?:X11)/,/^(?:Xerox)/,/^(?:XFree86-1.1)/,/^(?:xinetd)/,/^(?:xpp)/,/^(?:XSkat)/,/^(?:YPL-1.0)/,/^(?:YPL-1.1)/,/^(?:Zed)/,/^(?:Zend-2.0)/,/^(?:Zimbra-1.3)/,/^(?:Zimbra-1.4)/,/^(?:Zlib)/,/^(?:zlib-acknowledgement)/,/^(?:ZPL-1.1)/,/^(?:ZPL-2.0)/,/^(?:ZPL-2.1)/,/^(?:Autoconf-exception-2.0)/,/^(?:Autoconf-exception-3.0)/,/^(?:Bison-exception-2.2)/,/^(?:Classpath-exception-2.0)/,/^(?:eCos-exception-2.0)/,/^(?:Font-exception-2.0)/,/^(?:GCC-exception-2.0)/,/^(?:GCC-exception-3.1)/,/^(?:WxWindows-exception-3.1)/],
-conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316],"inclusive":true}}
-});
-return lexer;
-})();
-parser.lexer = lexer;
-function Parser () {
-  this.yy = {};
-}
-Parser.prototype = parser;parser.Parser = Parser;
-return new Parser;
-})();
-
-
-if (typeof require !== 'undefined' && typeof exports !== 'undefined') {
-exports.parser = spdxparse;
-exports.Parser = spdxparse.Parser;
-exports.parse = function () { return spdxparse.parse.apply(spdxparse, arguments); };
-exports.main = function commonjsMain(args) {
-    if (!args[1]) {
-        console.log('Usage: '+args[0]+' FILE');
-        process.exit(1);
-    }
-    var source = require('fs').readFileSync(require('path').normalize(args[1]), "utf8");
-    return exports.parser.parse(source);
-};
-if (typeof module !== 'undefined' && require.main === module) {
-  exports.main(process.argv.slice(1));
-}
-}
diff --git a/deps/npm/node_modules/spdx/source/ranges.json b/deps/npm/node_modules/spdx/source/ranges.json
deleted file mode 100644
index 1f3c52b3e194dd..00000000000000
--- a/deps/npm/node_modules/spdx/source/ranges.json
+++ /dev/null
@@ -1,194 +0,0 @@
-[
-  [
-    "AFL-1.1",
-    "AFL-1.2",
-    "AFL-2.0",
-    "AFL-2.1",
-    "AFL-3.0"
-  ],
-  [
-    "AGPL-1.0",
-    "AGPL-3.0"
-  ],
-  [
-    "Apache-1.0",
-    "Apache-1.1",
-    "Apache-2.0"
-  ],
-  [
-    "APSL-1.0",
-    "APSL-1.1",
-    "APSL-1.2",
-    "APSL-2.0"
-  ],
-  [
-    "Artistic-1.0",
-    "Artistic-2.0"
-  ],
-  [
-    "BitTorrent-1.0",
-    "BitTorrent-1.1"
-  ],
-  [
-    "CC-BY-1.0",
-    "CC-BY-2.0",
-    "CC-BY-2.5",
-    "CC-BY-3.0",
-    "CC-BY-4.0"
-  ],
-  [
-    "CC-BY-NC-1.0",
-    "CC-BY-NC-2.0",
-    "CC-BY-NC-2.5",
-    "CC-BY-NC-3.0",
-    "CC-BY-NC-4.0"
-  ],
-  [
-    "CC-BY-NC-ND-1.0",
-    "CC-BY-NC-ND-2.0",
-    "CC-BY-NC-ND-2.5",
-    "CC-BY-NC-ND-3.0",
-    "CC-BY-NC-ND-4.0"
-  ],
-  [
-    "CC-BY-NC-SA-1.0",
-    "CC-BY-NC-SA-2.0",
-    "CC-BY-NC-SA-2.5",
-    "CC-BY-NC-SA-3.0",
-    "CC-BY-NC-SA-4.0"
-  ],
-  [
-    "CC-BY-ND-1.0",
-    "CC-BY-ND-2.0",
-    "CC-BY-ND-2.5",
-    "CC-BY-ND-3.0",
-    "CC-BY-ND-4.0"
-  ],
-  [
-    "CC-BY-SA-1.0",
-    "CC-BY-SA-2.0",
-    "CC-BY-SA-2.5",
-    "CC-BY-SA-3.0",
-    "CC-BY-SA-4.0"
-  ],
-  [
-    "CDDL-1.0",
-    "CDDL-1.1"
-  ],
-  [
-    "CECILL-1.0",
-    "CECILL-1.1",
-    "CECILL-2.0"
-  ],
-  [
-    "ECL-1.0",
-    "ECL-2.0"
-  ],
-  [
-    "EFL-1.0",
-    "EFL-2.0"
-  ],
-  [
-    "EUPL-1.0",
-    "EUPL-1.1"
-  ],
-  [
-    "GFDL-1.1",
-    "GFDL-1.2",
-    "GFDL-1.3"
-  ],
-  [
-    "GPL-1.0",
-    "GPL-2.0",
-    "GPL-3.0"
-  ],
-  [
-    "LGPL-2.0",
-    "LGPL-2.1",
-    "LGPL-3.0"
-  ],
-  [
-    "LPL-1.0",
-    "LPL-1.02"
-  ],
-  [
-    "LPPL-1.0",
-    "LPPL-1.1",
-    "LPPL-1.2",
-    "LPPL-1.3a",
-    "LPPL-1.3c"
-  ],
-  [
-    "MPL-1.0",
-    "MPL-1.1",
-    "MPL-2.0"
-  ],
-  [
-    "MPL-1.0",
-    "MPL-1.1",
-    "MPL-2.0-no-copyleft-exception"
-  ],
-  [
-    "NPL-1.0",
-    "NPL-1.1"
-  ],
-  [
-    "OFL-1.0",
-    "OFL-1.1"
-  ],
-  [
-    "OLDAP-1.1",
-    "OLDAP-1.2",
-    "OLDAP-1.3",
-    "OLDAP-1.4",
-    "OLDAP-2.0",
-    "OLDAP-2.0.1",
-    "OLDAP-2.1",
-    "OLDAP-2.2",
-    "OLDAP-2.2.1",
-    "OLDAP-2.2.2",
-    "OLDAP-2.3",
-    "OLDAP-2.4",
-    "OLDAP-2.5",
-    "OLDAP-2.6",
-    "OLDAP-2.7",
-    "OLDAP-2.8"
-  ],
-  [
-    "OSL-1.0",
-    "OSL-1.1",
-    "OSL-2.0",
-    "OSL-2.1",
-    "OSL-3.0"
-  ],
-  [
-    "PHP-3.0",
-    "PHP-3.01"
-  ],
-  [
-    "RPL-1.1",
-    "RPL-1.5"
-  ],
-  [
-    "SGI-B-1.0",
-    "SGI-B-1.1",
-    "SGI-B-2.0"
-  ],
-  [
-    "YPL-1.0",
-    "YPL-1.1"
-  ],
-  [
-    "ZPL-1.1",
-    "ZPL-2.0",
-    "ZPL-2.1"
-  ],
-  [
-    "Zimbra-1.3",
-    "Zimbra-1.4"
-  ],
-  [
-    "bzip2-1.0.5",
-    "bzip2-1.0.6"
-  ]
-]
diff --git a/deps/npm/node_modules/spdx/source/spdx.js b/deps/npm/node_modules/spdx/source/spdx.js
deleted file mode 100644
index 5aece3d5437511..00000000000000
--- a/deps/npm/node_modules/spdx/source/spdx.js
+++ /dev/null
@@ -1,161 +0,0 @@
-// spdx.js
-// =======
-// SPDX License Expression Syntax parser
-
-// Validation
-// ----------
-
-// Require the generated parser.
-var parser = require('./parser.generated.js').parser;
-
-exports.parse = function(argument) {
-  return parser.parse(argument);
-};
-
-var containsRepeatedSpace = /\s{2,}/;
-
-exports.valid = function(argument) {
-  if (
-    argument.trim() !== argument ||
-    containsRepeatedSpace.test(argument)
-  ) {
-    return false;
-  }
-  try {
-    parser.parse(argument);
-    return true;
-  } catch (e) {
-    // jison generates parsers that throw errors, while this function
-    // mimics `semver.valid` by returning null.
-    return null;
-  }
-};
-
-// Comparison
-// ----------
-
-var ranges = require('./ranges.json');
-
-var notALicenseIdentifier = ' is not a simple license identifier';
-
-var rangeComparison = function(comparison) {
-  return function(first, second) {
-    var firstAST = exports.parse(first);
-    if (!firstAST.hasOwnProperty('license')) {
-      throw new Error('"' + first + '"' + notALicenseIdentifier);
-    }
-    var secondAST = exports.parse(second);
-    if (!secondAST.hasOwnProperty('license')) {
-      throw new Error('"' + second + '"' + notALicenseIdentifier);
-    }
-    return ranges.some(function(range) {
-      var indexOfFirst = range.indexOf(firstAST.license);
-      if (indexOfFirst < 0) {
-        return false;
-      }
-      var indexOfSecond = range.indexOf(secondAST.license);
-      if (indexOfSecond < 0) {
-        return false;
-      }
-      return comparison(indexOfFirst, indexOfSecond);
-    });
-  };
-};
-
-exports.gt = rangeComparison(function(first, second) {
-  return first > second;
-});
-
-exports.lt = rangeComparison(function(first, second) {
-  return first < second;
-});
-
-exports.satisfies = (function() {
-  var rangesAreCompatible = function(first, second) {
-    return (
-      first.license === second.license ||
-      ranges.some(function(range) {
-        return (
-          range.indexOf(first.license) > -1 &&
-          range.indexOf(second.license)
-        );
-      })
-    );
-  };
-
-  var identifierInRange = function(identifier, range) {
-    return (
-      identifier.license === range.license ||
-      exports.gt(identifier.license, range.license)
-    );
-  };
-
-  var licensesAreCompatible = function(first, second) {
-    if (first.exception !== second.exception) {
-      return false;
-    } else if (second.hasOwnProperty('license')) {
-      if (second.hasOwnProperty('plus')) {
-        if (first.hasOwnProperty('plus')) {
-          // first+, second+
-          return rangesAreCompatible(first, second);
-        } else {
-          // first, second+
-          return identifierInRange(first, second);
-        }
-      } else {
-        if (first.hasOwnProperty('plus')) {
-          // first+, second
-          return identifierInRange(second, first);
-        } else {
-          // first, second
-          return first.license === second.license;
-        }
-      }
-    }
-  };
-
-  var recurseLeftAndRight = function(first, second) {
-    var firstConjunction = first.conjunction;
-    if (firstConjunction === 'and') {
-      return (
-        recurse(first.left, second) &&
-        recurse(first.right, second)
-      );
-    } else if (firstConjunction === 'or') {
-      return (
-        recurse(first.left, second) ||
-        recurse(first.right, second)
-      );
-    }
-  };
-
-  var recurse = function(first, second) {
-    if (first.hasOwnProperty('conjunction')) {
-      return recurseLeftAndRight(first, second);
-    } else if (second.hasOwnProperty('conjunction')) {
-      return recurseLeftAndRight(second, first);
-    } else {
-      return licensesAreCompatible(first, second);
-    }
-  };
-
-  return function(first, second) {
-    return recurse(parser.parse(first), parser.parse(second));
-  };
-})();
-
-// Reference Data
-// --------------
-
-// Require the same license and exception data used by the parser.
-exports.licenses = require('spdx-license-ids');
-exports.exceptions = require('./exceptions.json');
-
-// Version Metadata
-// ----------------
-
-// The License Expression Syntax version
-exports.specificationVersion = '2.0';
-
-// This module's semantic version
-exports.implementationVersion = '0.4.1';
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/.npmignore b/deps/npm/node_modules/string_decoder/.npmignore
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/.npmignore
rename to deps/npm/node_modules/string_decoder/.npmignore
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/LICENSE b/deps/npm/node_modules/string_decoder/LICENSE
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/LICENSE
rename to deps/npm/node_modules/string_decoder/LICENSE
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/README.md b/deps/npm/node_modules/string_decoder/README.md
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/README.md
rename to deps/npm/node_modules/string_decoder/README.md
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/index.js b/deps/npm/node_modules/string_decoder/index.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/index.js
rename to deps/npm/node_modules/string_decoder/index.js
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/package.json b/deps/npm/node_modules/string_decoder/package.json
similarity index 61%
rename from deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/package.json
rename to deps/npm/node_modules/string_decoder/package.json
index 0364d54ba46af6..10772c834f78c2 100644
--- a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/package.json
+++ b/deps/npm/node_modules/string_decoder/package.json
@@ -1,39 +1,61 @@
 {
-  "name": "string_decoder",
-  "version": "0.10.31",
-  "description": "The string_decoder module from Node core",
-  "main": "index.js",
+  "_args": [
+    [
+      "string_decoder@~0.10.x",
+      "/Users/rebecca/code/npm/node_modules/readable-stream"
+    ]
+  ],
+  "_from": "string_decoder@>=0.10.0 <0.11.0",
+  "_id": "string_decoder@0.10.31",
+  "_inCache": true,
+  "_location": "/string_decoder",
+  "_npmUser": {
+    "email": "rod@vagg.org",
+    "name": "rvagg"
+  },
+  "_npmVersion": "1.4.23",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "string_decoder",
+    "raw": "string_decoder@~0.10.x",
+    "rawSpec": "~0.10.x",
+    "scope": null,
+    "spec": ">=0.10.0 <0.11.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/bl/readable-stream",
+    "/concat-stream/readable-stream",
+    "/readable-stream"
+  ],
+  "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+  "_shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94",
+  "_shrinkwrap": null,
+  "_spec": "string_decoder@~0.10.x",
+  "_where": "/Users/rebecca/code/npm/node_modules/readable-stream",
+  "bugs": {
+    "url": "https://github.com/rvagg/string_decoder/issues"
+  },
   "dependencies": {},
+  "description": "The string_decoder module from Node core",
   "devDependencies": {
     "tap": "~0.4.8"
   },
-  "scripts": {
-    "test": "tap test/simple/*.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/rvagg/string_decoder.git"
+  "directories": {},
+  "dist": {
+    "shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94",
+    "tarball": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
   },
+  "gitHead": "d46d4fd87cf1d06e031c23f1ba170ca7d4ade9a0",
   "homepage": "https://github.com/rvagg/string_decoder",
   "keywords": [
-    "string",
-    "decoder",
     "browser",
-    "browserify"
+    "browserify",
+    "decoder",
+    "string"
   ],
   "license": "MIT",
-  "gitHead": "d46d4fd87cf1d06e031c23f1ba170ca7d4ade9a0",
-  "bugs": {
-    "url": "https://github.com/rvagg/string_decoder/issues"
-  },
-  "_id": "string_decoder@0.10.31",
-  "_shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94",
-  "_from": "string_decoder@>=0.10.0 <0.11.0",
-  "_npmVersion": "1.4.23",
-  "_npmUser": {
-    "name": "rvagg",
-    "email": "rod@vagg.org"
-  },
+  "main": "index.js",
   "maintainers": [
     {
       "name": "substack",
@@ -44,11 +66,14 @@
       "email": "rod@vagg.org"
     }
   ],
-  "dist": {
-    "shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94",
-    "tarball": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+  "name": "string_decoder",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/rvagg/string_decoder.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "tap test/simple/*.js"
+  },
+  "version": "0.10.31"
 }
diff --git a/deps/npm/node_modules/request/node_modules/stringstream/.npmignore b/deps/npm/node_modules/stringstream/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/stringstream/.npmignore
rename to deps/npm/node_modules/stringstream/.npmignore
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml b/deps/npm/node_modules/stringstream/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml
rename to deps/npm/node_modules/stringstream/.travis.yml
diff --git a/deps/npm/node_modules/request/node_modules/stringstream/LICENSE.txt b/deps/npm/node_modules/stringstream/LICENSE.txt
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/stringstream/LICENSE.txt
rename to deps/npm/node_modules/stringstream/LICENSE.txt
diff --git a/deps/npm/node_modules/request/node_modules/stringstream/README.md b/deps/npm/node_modules/stringstream/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/stringstream/README.md
rename to deps/npm/node_modules/stringstream/README.md
diff --git a/deps/npm/node_modules/request/node_modules/stringstream/example.js b/deps/npm/node_modules/stringstream/example.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/stringstream/example.js
rename to deps/npm/node_modules/stringstream/example.js
diff --git a/deps/npm/node_modules/request/node_modules/stringstream/package.json b/deps/npm/node_modules/stringstream/package.json
similarity index 72%
rename from deps/npm/node_modules/request/node_modules/stringstream/package.json
rename to deps/npm/node_modules/stringstream/package.json
index 3b1373bb581d02..890b0ae3d0084d 100644
--- a/deps/npm/node_modules/request/node_modules/stringstream/package.json
+++ b/deps/npm/node_modules/stringstream/package.json
@@ -1,48 +1,70 @@
 {
-  "name": "stringstream",
-  "version": "0.0.4",
-  "description": "Encode and decode streams into string streams",
-  "author": {
-    "name": "Michael Hart",
+  "_args": [
+    [
+      "stringstream@~0.0.4",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
+  ],
+  "_from": "stringstream@>=0.0.4 <0.1.0",
+  "_id": "stringstream@0.0.4",
+  "_inCache": true,
+  "_location": "/stringstream",
+  "_npmUser": {
     "email": "michael.hart.au@gmail.com",
-    "url": "http://github.com/mhart"
+    "name": "hichaelmart"
   },
-  "main": "stringstream.js",
-  "keywords": [
-    "string",
-    "stream",
-    "base64",
-    "gzip"
+  "_npmVersion": "1.2.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "stringstream",
+    "raw": "stringstream@~0.0.4",
+    "rawSpec": "~0.0.4",
+    "scope": null,
+    "spec": ">=0.0.4 <0.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/request"
   ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mhart/StringStream.git"
+  "_resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz",
+  "_shasum": "0f0e3423f942960b5692ac324a57dd093bc41a92",
+  "_shrinkwrap": null,
+  "_spec": "stringstream@~0.0.4",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
+  "author": {
+    "email": "michael.hart.au@gmail.com",
+    "name": "Michael Hart",
+    "url": "http://github.com/mhart"
   },
-  "license": "MIT",
-  "readme": "# Decode streams into strings The Right Way(tm)\n\n```javascript\nvar fs   = require('fs')\nvar zlib = require('zlib')\nvar strs = require('stringstream')\n\nvar utf8Stream = fs.createReadStream('massiveLogFile.gz')\n  .pipe(zlib.createGunzip())\n  .pipe(strs('utf8'))\n```\n\nNo need to deal with `setEncoding()` weirdness, just compose streams\nlike they were supposed to be!\n\nHandles input and output encoding:\n\n```javascript\n// Stream from utf8 to hex to base64... Why not, ay.\nvar hex64Stream = fs.createReadStream('myFile')\n  .pipe(strs('utf8', 'hex'))\n  .pipe(strs('hex', 'base64'))\n```\n\nAlso deals with `base64` output correctly by aligning each emitted data\nchunk so that there are no dangling `=` characters:\n\n```javascript\nvar stream = fs.createReadStream('myFile').pipe(strs('base64'))\n\nvar base64Str = ''\n\nstream.on('data', function(data) { base64Str += data })\nstream.on('end', function() {\n  console.log('My base64 encoded file is: ' + base64Str) // Wouldn't work with setEncoding()\n  console.log('Original file is: ' + new Buffer(base64Str, 'base64'))\n})\n```\n",
-  "readmeFilename": "README.md",
-  "_id": "stringstream@0.0.4",
+  "dependencies": {},
+  "description": "Encode and decode streams into string streams",
+  "devDependencies": {},
+  "directories": {},
   "dist": {
     "shasum": "0f0e3423f942960b5692ac324a57dd093bc41a92",
     "tarball": "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
   },
-  "_npmVersion": "1.2.0",
-  "_npmUser": {
-    "name": "hichaelmart",
-    "email": "michael.hart.au@gmail.com"
-  },
+  "keywords": [
+    "base64",
+    "gzip",
+    "stream",
+    "string"
+  ],
+  "license": "MIT",
+  "main": "stringstream.js",
   "maintainers": [
     {
       "name": "hichaelmart",
       "email": "michael.hart.au@gmail.com"
     }
   ],
-  "directories": {},
-  "_shasum": "0f0e3423f942960b5692ac324a57dd093bc41a92",
-  "_resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz",
-  "_from": "stringstream@>=0.0.4 <0.1.0",
-  "bugs": {
-    "url": "https://github.com/mhart/StringStream/issues"
+  "name": "stringstream",
+  "optionalDependencies": {},
+  "readme": "# Decode streams into strings The Right Way(tm)\n\n```javascript\nvar fs   = require('fs')\nvar zlib = require('zlib')\nvar strs = require('stringstream')\n\nvar utf8Stream = fs.createReadStream('massiveLogFile.gz')\n  .pipe(zlib.createGunzip())\n  .pipe(strs('utf8'))\n```\n\nNo need to deal with `setEncoding()` weirdness, just compose streams\nlike they were supposed to be!\n\nHandles input and output encoding:\n\n```javascript\n// Stream from utf8 to hex to base64... Why not, ay.\nvar hex64Stream = fs.createReadStream('myFile')\n  .pipe(strs('utf8', 'hex'))\n  .pipe(strs('hex', 'base64'))\n```\n\nAlso deals with `base64` output correctly by aligning each emitted data\nchunk so that there are no dangling `=` characters:\n\n```javascript\nvar stream = fs.createReadStream('myFile').pipe(strs('base64'))\n\nvar base64Str = ''\n\nstream.on('data', function(data) { base64Str += data })\nstream.on('end', function() {\n  console.log('My base64 encoded file is: ' + base64Str) // Wouldn't work with setEncoding()\n  console.log('Original file is: ' + new Buffer(base64Str, 'base64'))\n})\n```\n",
+  "readmeFilename": "README.md",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mhart/StringStream.git"
   },
-  "homepage": "https://github.com/mhart/StringStream#readme"
+  "version": "0.0.4"
 }
diff --git a/deps/npm/node_modules/request/node_modules/stringstream/stringstream.js b/deps/npm/node_modules/stringstream/stringstream.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/stringstream/stringstream.js
rename to deps/npm/node_modules/stringstream/stringstream.js
diff --git a/deps/npm/node_modules/columnify/node_modules/strip-ansi/index.js b/deps/npm/node_modules/strip-ansi/index.js
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/strip-ansi/index.js
rename to deps/npm/node_modules/strip-ansi/index.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/license b/deps/npm/node_modules/strip-ansi/license
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/license
rename to deps/npm/node_modules/strip-ansi/license
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/package.json b/deps/npm/node_modules/strip-ansi/package.json
similarity index 51%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/package.json
rename to deps/npm/node_modules/strip-ansi/package.json
index 2871d037908d62..765c6921f4ca74 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/package.json
+++ b/deps/npm/node_modules/strip-ansi/package.json
@@ -1,85 +1,111 @@
 {
-  "name": "strip-ansi",
-  "version": "3.0.0",
-  "description": "Strip ANSI escape codes",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sindresorhus/strip-ansi.git"
+  "_args": [
+    [
+      "strip-ansi@^3.0.0",
+      "/Users/rebecca/code/npm/node_modules/chalk"
+    ]
+  ],
+  "_from": "strip-ansi@>=3.0.0 <4.0.0",
+  "_id": "strip-ansi@3.0.0",
+  "_inCache": true,
+  "_location": "/strip-ansi",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "sindresorhus@gmail.com",
+    "name": "sindresorhus"
+  },
+  "_npmVersion": "2.11.2",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "strip-ansi",
+    "raw": "strip-ansi@^3.0.0",
+    "rawSpec": "^3.0.0",
+    "scope": null,
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
   },
+  "_requiredBy": [
+    "/chalk",
+    "/columnify"
+  ],
+  "_resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+  "_shasum": "7510b665567ca914ccb5d7e072763ac968be3724",
+  "_shrinkwrap": null,
+  "_spec": "strip-ansi@^3.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/chalk",
   "author": {
-    "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
+    "name": "Sindre Sorhus",
     "url": "sindresorhus.com"
   },
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    },
-    {
-      "name": "jbnicolai",
-      "email": "jappelman@xebia.com"
-    }
-  ],
+  "bugs": {
+    "url": "https://github.com/sindresorhus/strip-ansi/issues"
+  },
+  "dependencies": {
+    "ansi-regex": "^2.0.0"
+  },
+  "description": "Strip ANSI escape codes",
+  "devDependencies": {
+    "ava": "0.0.4"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "7510b665567ca914ccb5d7e072763ac968be3724",
+    "tarball": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
+  },
   "engines": {
     "node": ">=0.10.0"
   },
-  "scripts": {
-    "test": "node test.js"
-  },
   "files": [
     "index.js"
   ],
+  "gitHead": "3f05b9810e1438f946e2eb84ee854cc00b972e9e",
+  "homepage": "https://github.com/sindresorhus/strip-ansi",
   "keywords": [
-    "strip",
-    "trim",
-    "remove",
+    "256",
     "ansi",
-    "styles",
     "color",
-    "colour",
     "colors",
-    "terminal",
+    "colour",
+    "command-line",
     "console",
-    "string",
-    "tty",
     "escape",
     "formatting",
-    "rgb",
-    "256",
-    "shell",
-    "xterm",
     "log",
     "logging",
-    "command-line",
-    "text"
+    "remove",
+    "rgb",
+    "shell",
+    "string",
+    "strip",
+    "styles",
+    "terminal",
+    "text",
+    "trim",
+    "tty",
+    "xterm"
   ],
-  "dependencies": {
-    "ansi-regex": "^2.0.0"
-  },
-  "devDependencies": {
-    "ava": "0.0.4"
-  },
-  "gitHead": "3f05b9810e1438f946e2eb84ee854cc00b972e9e",
-  "bugs": {
-    "url": "https://github.com/sindresorhus/strip-ansi/issues"
-  },
-  "homepage": "https://github.com/sindresorhus/strip-ansi",
-  "_id": "strip-ansi@3.0.0",
-  "_shasum": "7510b665567ca914ccb5d7e072763ac968be3724",
-  "_from": "strip-ansi@>=3.0.0 <4.0.0",
-  "_npmVersion": "2.11.2",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "name": "sindresorhus",
-    "email": "sindresorhus@gmail.com"
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "sindresorhus",
+      "email": "sindresorhus@gmail.com"
+    },
+    {
+      "name": "jbnicolai",
+      "email": "jappelman@xebia.com"
+    }
+  ],
+  "name": "strip-ansi",
+  "optionalDependencies": {},
+  "readme": "# strip-ansi [![Build Status](https://travis-ci.org/sindresorhus/strip-ansi.svg?branch=master)](https://travis-ci.org/sindresorhus/strip-ansi)\n\n> Strip [ANSI escape codes](http://en.wikipedia.org/wiki/ANSI_escape_code)\n\n\n## Install\n\n```\n$ npm install --save strip-ansi\n```\n\n\n## Usage\n\n```js\nvar stripAnsi = require('strip-ansi');\n\nstripAnsi('\\u001b[4mcake\\u001b[0m');\n//=> 'cake'\n```\n\n\n## Related\n\n- [strip-ansi-cli](https://github.com/sindresorhus/strip-ansi-cli) - CLI for this module\n- [has-ansi](https://github.com/sindresorhus/has-ansi) - Check if a string has ANSI escape codes\n- [ansi-regex](https://github.com/sindresorhus/ansi-regex) - Regular expression for matching ANSI escape codes\n- [chalk](https://github.com/sindresorhus/chalk) - Terminal string styling done right\n\n\n## License\n\nMIT © [Sindre Sorhus](http://sindresorhus.com)\n",
+  "readmeFilename": "readme.md",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sindresorhus/strip-ansi.git"
   },
-  "dist": {
-    "shasum": "7510b665567ca914ccb5d7e072763ac968be3724",
-    "tarball": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
+  "scripts": {
+    "test": "node test.js"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "version": "3.0.0"
 }
diff --git a/deps/npm/node_modules/columnify/node_modules/strip-ansi/readme.md b/deps/npm/node_modules/strip-ansi/readme.md
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/strip-ansi/readme.md
rename to deps/npm/node_modules/strip-ansi/readme.md
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/index.js b/deps/npm/node_modules/supports-color/index.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/index.js
rename to deps/npm/node_modules/supports-color/index.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/license b/deps/npm/node_modules/supports-color/license
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/license
rename to deps/npm/node_modules/supports-color/license
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/package.json b/deps/npm/node_modules/supports-color/package.json
similarity index 67%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/package.json
rename to deps/npm/node_modules/supports-color/package.json
index 38a1ecb3cebb2a..020a57ea52ed18 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/package.json
+++ b/deps/npm/node_modules/supports-color/package.json
@@ -1,79 +1,103 @@
 {
-  "name": "supports-color",
-  "version": "2.0.0",
-  "description": "Detect whether a terminal supports color",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/chalk/supports-color.git"
+  "_args": [
+    [
+      "supports-color@^2.0.0",
+      "/Users/rebecca/code/npm/node_modules/chalk"
+    ]
+  ],
+  "_from": "supports-color@>=2.0.0 <3.0.0",
+  "_id": "supports-color@2.0.0",
+  "_inCache": true,
+  "_location": "/supports-color",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "sindresorhus@gmail.com",
+    "name": "sindresorhus"
+  },
+  "_npmVersion": "2.11.2",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "supports-color",
+    "raw": "supports-color@^2.0.0",
+    "rawSpec": "^2.0.0",
+    "scope": null,
+    "spec": ">=2.0.0 <3.0.0",
+    "type": "range"
   },
+  "_requiredBy": [
+    "/chalk"
+  ],
+  "_resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+  "_shasum": "535d045ce6b6363fa40117084629995e9df324c7",
+  "_shrinkwrap": null,
+  "_spec": "supports-color@^2.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/chalk",
   "author": {
-    "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
+    "name": "Sindre Sorhus",
     "url": "sindresorhus.com"
   },
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    },
-    {
-      "name": "jbnicolai",
-      "email": "jappelman@xebia.com"
-    }
-  ],
+  "bugs": {
+    "url": "https://github.com/chalk/supports-color/issues"
+  },
+  "dependencies": {},
+  "description": "Detect whether a terminal supports color",
+  "devDependencies": {
+    "mocha": "*",
+    "require-uncached": "^1.0.2"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "535d045ce6b6363fa40117084629995e9df324c7",
+    "tarball": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+  },
   "engines": {
     "node": ">=0.8.0"
   },
-  "scripts": {
-    "test": "mocha"
-  },
   "files": [
     "index.js"
   ],
+  "gitHead": "8400d98ade32b2adffd50902c06d9e725a5c6588",
+  "homepage": "https://github.com/chalk/supports-color",
   "keywords": [
+    "256",
+    "ansi",
+    "capability",
+    "cli",
     "color",
-    "colour",
     "colors",
-    "terminal",
+    "colour",
+    "command-line",
     "console",
-    "cli",
-    "ansi",
-    "styles",
-    "tty",
+    "detect",
     "rgb",
-    "256",
     "shell",
-    "xterm",
-    "command-line",
+    "styles",
     "support",
     "supports",
-    "capability",
-    "detect"
+    "terminal",
+    "tty",
+    "xterm"
   ],
-  "devDependencies": {
-    "mocha": "*",
-    "require-uncached": "^1.0.2"
-  },
-  "gitHead": "8400d98ade32b2adffd50902c06d9e725a5c6588",
-  "bugs": {
-    "url": "https://github.com/chalk/supports-color/issues"
-  },
-  "homepage": "https://github.com/chalk/supports-color",
-  "_id": "supports-color@2.0.0",
-  "_shasum": "535d045ce6b6363fa40117084629995e9df324c7",
-  "_from": "supports-color@>=2.0.0 <3.0.0",
-  "_npmVersion": "2.11.2",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "name": "sindresorhus",
-    "email": "sindresorhus@gmail.com"
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "sindresorhus",
+      "email": "sindresorhus@gmail.com"
+    },
+    {
+      "name": "jbnicolai",
+      "email": "jappelman@xebia.com"
+    }
+  ],
+  "name": "supports-color",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/chalk/supports-color"
   },
-  "dist": {
-    "shasum": "535d045ce6b6363fa40117084629995e9df324c7",
-    "tarball": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+  "scripts": {
+    "test": "mocha"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "version": "2.0.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/readme.md b/deps/npm/node_modules/supports-color/readme.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/readme.md
rename to deps/npm/node_modules/supports-color/readme.md
diff --git a/deps/npm/node_modules/tar/package.json b/deps/npm/node_modules/tar/package.json
index 2d0846a1fde27b..de38b246152145 100644
--- a/deps/npm/node_modules/tar/package.json
+++ b/deps/npm/node_modules/tar/package.json
@@ -1,40 +1,93 @@
 {
+  "_args": [
+    [
+      "tar@~2.2.0",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "tar@>=2.2.0 <2.3.0",
+  "_id": "tar@2.2.1",
+  "_inCache": true,
+  "_location": "/tar",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "email": "kat@sykosomatic.org",
+    "name": "zkat"
+  },
+  "_npmVersion": "2.14.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "tar",
+    "raw": "tar@~2.2.0",
+    "rawSpec": "~2.2.0",
+    "scope": null,
+    "spec": ">=2.2.0 <2.3.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+  "_shasum": "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1",
+  "_shrinkwrap": null,
+  "_spec": "tar@~2.2.0",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "name": "tar",
-  "description": "tar for node",
-  "version": "2.2.1",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/node-tar.git"
-  },
-  "main": "tar.js",
-  "scripts": {
-    "test": "tap test/*.js"
+  "bugs": {
+    "url": "https://github.com/isaacs/node-tar/issues"
   },
   "dependencies": {
     "block-stream": "*",
     "fstream": "^1.0.2",
     "inherits": "2"
   },
+  "description": "tar for node",
   "devDependencies": {
     "graceful-fs": "^4.1.2",
+    "mkdirp": "^0.5.0",
     "rimraf": "1.x",
-    "tap": "0.x",
-    "mkdirp": "^0.5.0"
+    "tap": "0.x"
   },
-  "license": "ISC",
-  "readme": "# node-tar\n\nTar for Node.js.\n\n[![NPM](https://nodei.co/npm/tar.png)](https://nodei.co/npm/tar/)\n\n## API\n\nSee `examples/` for usage examples.\n\n### var tar = require('tar')\n\nReturns an object with `.Pack`, `.Extract` and `.Parse` methods.\n\n### tar.Pack([properties])\n\nReturns a through stream. Use\n[fstream](https://npmjs.org/package/fstream) to write files into the\npack stream and you will receive tar archive data from the pack\nstream.\n\nThis only works with directories, it does not work with individual files.\n\nThe optional `properties` object are used to set properties in the tar\n'Global Extended Header'. If the `fromBase` property is set to true,\nthe tar will contain files relative to the path passed, and not with\nthe path included.\n\n### tar.Extract([options])\n\nReturns a through stream. Write tar data to the stream and the files\nin the tarball will be extracted onto the filesystem.\n\n`options` can be:\n\n```js\n{\n  path: '/path/to/extract/tar/into',\n  strip: 0, // how many path segments to strip from the root when extracting\n}\n```\n\n`options` also get passed to the `fstream.Writer` instance that `tar`\nuses internally.\n\n### tar.Parse()\n\nReturns a writable stream. Write tar data to it and it will emit\n`entry` events for each entry parsed from the tarball. This is used by\n`tar.Extract`.\n",
-  "readmeFilename": "README.md",
-  "gitHead": "52237e39d2eb68d22a32d9a98f1d762189fe6a3d",
-  "bugs": {
-    "url": "https://github.com/isaacs/node-tar/issues"
+  "directories": {},
+  "dist": {
+    "shasum": "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1",
+    "tarball": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz"
   },
+  "gitHead": "52237e39d2eb68d22a32d9a98f1d762189fe6a3d",
   "homepage": "https://github.com/isaacs/node-tar#readme",
-  "_id": "tar@2.2.1",
-  "_shasum": "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1",
-  "_from": "tar@2.2.1"
+  "installable": true,
+  "license": "ISC",
+  "main": "tar.js",
+  "maintainers": [
+    {
+      "name": "isaacs",
+      "email": "isaacs@npmjs.com"
+    },
+    {
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
+    },
+    {
+      "name": "soldair",
+      "email": "soldair@gmail.com"
+    },
+    {
+      "name": "zkat",
+      "email": "kat@sykosomatic.org"
+    }
+  ],
+  "name": "tar",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/node-tar.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "2.2.1"
 }
diff --git a/deps/npm/node_modules/text-table/package.json b/deps/npm/node_modules/text-table/package.json
index 1eacd78e222a4b..da8084b42b586f 100644
--- a/deps/npm/node_modules/text-table/package.json
+++ b/deps/npm/node_modules/text-table/package.json
@@ -1,52 +1,95 @@
 {
-  "name": "text-table",
-  "version": "0.2.0",
+  "_args": [
+    [
+      "text-table@~0.2.0",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "text-table@>=0.2.0 <0.3.0",
+  "_id": "text-table@0.2.0",
+  "_inCache": true,
+  "_location": "/text-table",
+  "_npmUser": {
+    "email": "mail@substack.net",
+    "name": "substack"
+  },
+  "_npmVersion": "1.3.7",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "text-table",
+    "raw": "text-table@~0.2.0",
+    "rawSpec": "~0.2.0",
+    "scope": null,
+    "spec": ">=0.2.0 <0.3.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+  "_shasum": "7f5ee823ae805207c00af2df4a84ec3fcfa570b4",
+  "_shrinkwrap": null,
+  "_spec": "text-table@~0.2.0",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "mail@substack.net",
+    "name": "James Halliday",
+    "url": "http://substack.net"
+  },
+  "bugs": {
+    "url": "https://github.com/substack/text-table/issues"
+  },
+  "dependencies": {},
   "description": "borderless text tables with alignment",
-  "main": "index.js",
   "devDependencies": {
+    "cli-color": "~0.2.3",
     "tap": "~0.4.0",
-    "tape": "~1.0.2",
-    "cli-color": "~0.2.3"
+    "tape": "~1.0.2"
   },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "testling": {
-    "files": "test/*.js",
-    "browsers": [
-      "ie/6..latest",
-      "chrome/20..latest",
-      "firefox/10..latest",
-      "safari/latest",
-      "opera/11.0..latest",
-      "iphone/6",
-      "ipad/6"
-    ]
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/substack/text-table.git"
+  "directories": {},
+  "dist": {
+    "shasum": "7f5ee823ae805207c00af2df4a84ec3fcfa570b4",
+    "tarball": "http://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
   },
   "homepage": "https://github.com/substack/text-table",
   "keywords": [
-    "text",
-    "table",
     "align",
     "ascii",
     "rows",
-    "tabular"
+    "table",
+    "tabular",
+    "text"
   ],
-  "author": {
-    "name": "James Halliday",
-    "email": "mail@substack.net",
-    "url": "http://substack.net"
-  },
   "license": "MIT",
+  "main": "index.js",
+  "maintainers": [
+    {
+      "name": "substack",
+      "email": "mail@substack.net"
+    }
+  ],
+  "name": "text-table",
+  "optionalDependencies": {},
   "readme": "# text-table\n\ngenerate borderless text table strings suitable for printing to stdout\n\n[![build status](https://secure.travis-ci.org/substack/text-table.png)](http://travis-ci.org/substack/text-table)\n\n[![browser support](https://ci.testling.com/substack/text-table.png)](http://ci.testling.com/substack/text-table)\n\n# example\n\n## default align\n\n``` js\nvar table = require('text-table');\nvar t = table([\n    [ 'master', '0123456789abcdef' ],\n    [ 'staging', 'fedcba9876543210' ]\n]);\nconsole.log(t);\n```\n\n```\nmaster   0123456789abcdef\nstaging  fedcba9876543210\n```\n\n## left-right align\n\n``` js\nvar table = require('text-table');\nvar t = table([\n    [ 'beep', '1024' ],\n    [ 'boop', '33450' ],\n    [ 'foo', '1006' ],\n    [ 'bar', '45' ]\n], { align: [ 'l', 'r' ] });\nconsole.log(t);\n```\n\n```\nbeep   1024\nboop  33450\nfoo    1006\nbar      45\n```\n\n## dotted align\n\n``` js\nvar table = require('text-table');\nvar t = table([\n    [ 'beep', '1024' ],\n    [ 'boop', '334.212' ],\n    [ 'foo', '1006' ],\n    [ 'bar', '45.6' ],\n    [ 'baz', '123.' ]\n], { align: [ 'l', '.' ] });\nconsole.log(t);\n```\n\n```\nbeep  1024\nboop   334.212\nfoo   1006\nbar     45.6\nbaz    123.\n```\n\n## centered\n\n``` js\nvar table = require('text-table');\nvar t = table([\n    [ 'beep', '1024', 'xyz' ],\n    [ 'boop', '3388450', 'tuv' ],\n    [ 'foo', '10106', 'qrstuv' ],\n    [ 'bar', '45', 'lmno' ]\n], { align: [ 'l', 'c', 'l' ] });\nconsole.log(t);\n```\n\n```\nbeep    1024   xyz\nboop  3388450  tuv\nfoo    10106   qrstuv\nbar      45    lmno\n```\n\n# methods\n\n``` js\nvar table = require('text-table')\n```\n\n## var s = table(rows, opts={})\n\nReturn a formatted table string `s` from an array of `rows` and some options\n`opts`.\n\n`rows` should be an array of arrays containing strings, numbers, or other\nprintable values.\n\noptions can be:\n\n* `opts.hsep` - separator to use between columns, default `'  '`\n* `opts.align` - array of alignment types for each column, default `['l','l',...]`\n* `opts.stringLength` - callback function to use when calculating the string length\n\nalignment types are:\n\n* `'l'` - left\n* `'r'` - right\n* `'c'` - center\n* `'.'` - decimal\n\n# install\n\nWith [npm](https://npmjs.org) do:\n\n```\nnpm install text-table\n```\n\n# Use with ANSI-colors\n\nSince the string length of ANSI color schemes does not equal the length\nJavaScript sees internally it is necessary to pass the a custom string length\ncalculator during the main function call.\n\nSee the `test/ansi-colors.js` file for an example.\n\n# license\n\nMIT\n",
   "readmeFilename": "readme.markdown",
-  "bugs": {
-    "url": "https://github.com/substack/text-table/issues"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/substack/text-table.git"
   },
-  "_id": "text-table@0.2.0",
-  "_from": "text-table@~0.2.0"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "testling": {
+    "browsers": [
+      "chrome/20..latest",
+      "firefox/10..latest",
+      "ie/6..latest",
+      "ipad/6",
+      "iphone/6",
+      "opera/11.0..latest",
+      "safari/latest"
+    ],
+    "files": "test/*.js"
+  },
+  "version": "0.2.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/.editorconfig b/deps/npm/node_modules/tough-cookie/.editorconfig
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/.editorconfig
rename to deps/npm/node_modules/tough-cookie/.editorconfig
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/.npmignore b/deps/npm/node_modules/tough-cookie/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/.npmignore
rename to deps/npm/node_modules/tough-cookie/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/.travis.yml b/deps/npm/node_modules/tough-cookie/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/.travis.yml
rename to deps/npm/node_modules/tough-cookie/.travis.yml
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/LICENSE b/deps/npm/node_modules/tough-cookie/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/LICENSE
rename to deps/npm/node_modules/tough-cookie/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/README.md b/deps/npm/node_modules/tough-cookie/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/README.md
rename to deps/npm/node_modules/tough-cookie/README.md
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/generate-pubsuffix.js b/deps/npm/node_modules/tough-cookie/generate-pubsuffix.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/generate-pubsuffix.js
rename to deps/npm/node_modules/tough-cookie/generate-pubsuffix.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/lib/cookie.js b/deps/npm/node_modules/tough-cookie/lib/cookie.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/lib/cookie.js
rename to deps/npm/node_modules/tough-cookie/lib/cookie.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/lib/memstore.js b/deps/npm/node_modules/tough-cookie/lib/memstore.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/lib/memstore.js
rename to deps/npm/node_modules/tough-cookie/lib/memstore.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/lib/pathMatch.js b/deps/npm/node_modules/tough-cookie/lib/pathMatch.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/lib/pathMatch.js
rename to deps/npm/node_modules/tough-cookie/lib/pathMatch.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/lib/permuteDomain.js b/deps/npm/node_modules/tough-cookie/lib/permuteDomain.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/lib/permuteDomain.js
rename to deps/npm/node_modules/tough-cookie/lib/permuteDomain.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/lib/pubsuffix.js b/deps/npm/node_modules/tough-cookie/lib/pubsuffix.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/lib/pubsuffix.js
rename to deps/npm/node_modules/tough-cookie/lib/pubsuffix.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/lib/store.js b/deps/npm/node_modules/tough-cookie/lib/store.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/lib/store.js
rename to deps/npm/node_modules/tough-cookie/lib/store.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/package.json b/deps/npm/node_modules/tough-cookie/package.json
similarity index 62%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/package.json
rename to deps/npm/node_modules/tough-cookie/package.json
index 55605b3ee689b5..f808bccefe3182 100644
--- a/deps/npm/node_modules/request/node_modules/tough-cookie/package.json
+++ b/deps/npm/node_modules/tough-cookie/package.json
@@ -1,55 +1,72 @@
 {
-  "author": {
-    "name": "Jeremy Stashewsky",
-    "email": "jstashewsky@salesforce.com"
+  "_args": [
+    [
+      "tough-cookie@>=0.12.0",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
+  ],
+  "_from": "tough-cookie@>=0.12.0",
+  "_id": "tough-cookie@2.0.0",
+  "_inCache": true,
+  "_location": "/tough-cookie",
+  "_nodeVersion": "0.12.2",
+  "_npmUser": {
+    "email": "jstash@gmail.com",
+    "name": "jstash"
   },
-  "license": "BSD-3-Clause",
-  "name": "tough-cookie",
-  "description": "RFC6265 Cookies and Cookie Jar for node.js",
-  "keywords": [
-    "HTTP",
-    "cookie",
-    "cookies",
-    "set-cookie",
-    "cookiejar",
-    "jar",
-    "RFC6265",
-    "RFC2965"
+  "_npmVersion": "2.7.4",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "tough-cookie",
+    "raw": "tough-cookie@>=0.12.0",
+    "rawSpec": ">=0.12.0",
+    "scope": null,
+    "spec": ">=0.12.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/request"
   ],
-  "version": "2.0.0",
-  "homepage": "https://github.com/SalesforceEng/tough-cookie",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/SalesforceEng/tough-cookie.git"
+  "_resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz",
+  "_shasum": "41ce08720b35cf90beb044dd2609fb19e928718f",
+  "_shrinkwrap": null,
+  "_spec": "tough-cookie@>=0.12.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
+  "author": {
+    "email": "jstashewsky@salesforce.com",
+    "name": "Jeremy Stashewsky"
   },
   "bugs": {
     "url": "https://github.com/SalesforceEng/tough-cookie/issues"
   },
-  "main": "./lib/cookie",
-  "scripts": {
-    "test": "vows test/*_test.js"
-  },
-  "engines": {
-    "node": ">=0.10.0"
-  },
+  "dependencies": {},
+  "description": "RFC6265 Cookies and Cookie Jar for node.js",
   "devDependencies": {
-    "vows": "0.7.0",
-    "async": ">=0.1.12"
-  },
-  "gitHead": "a3af6104da7787c23bb98910109b0e0e8a10153c",
-  "_id": "tough-cookie@2.0.0",
-  "_shasum": "41ce08720b35cf90beb044dd2609fb19e928718f",
-  "_from": "tough-cookie@>=0.12.0",
-  "_npmVersion": "2.7.4",
-  "_nodeVersion": "0.12.2",
-  "_npmUser": {
-    "name": "jstash",
-    "email": "jstash@gmail.com"
+    "async": ">=0.1.12",
+    "vows": "0.7.0"
   },
+  "directories": {},
   "dist": {
     "shasum": "41ce08720b35cf90beb044dd2609fb19e928718f",
     "tarball": "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"
   },
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "gitHead": "a3af6104da7787c23bb98910109b0e0e8a10153c",
+  "homepage": "https://github.com/SalesforceEng/tough-cookie",
+  "keywords": [
+    "HTTP",
+    "RFC2965",
+    "RFC6265",
+    "cookie",
+    "cookiejar",
+    "cookies",
+    "jar",
+    "set-cookie"
+  ],
+  "license": "BSD-3-Clause",
+  "main": "./lib/cookie",
   "maintainers": [
     {
       "name": "jstash",
@@ -60,7 +77,14 @@
       "email": "services@goinstant.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "tough-cookie",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/SalesforceEng/tough-cookie.git"
+  },
+  "scripts": {
+    "test": "vows test/*_test.js"
+  },
+  "version": "2.0.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/public-suffix.txt b/deps/npm/node_modules/tough-cookie/public-suffix.txt
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/public-suffix.txt
rename to deps/npm/node_modules/tough-cookie/public-suffix.txt
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/test/api_test.js b/deps/npm/node_modules/tough-cookie/test/api_test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/test/api_test.js
rename to deps/npm/node_modules/tough-cookie/test/api_test.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/test/cookie_jar_test.js b/deps/npm/node_modules/tough-cookie/test/cookie_jar_test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/test/cookie_jar_test.js
rename to deps/npm/node_modules/tough-cookie/test/cookie_jar_test.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/test/cookie_sorting_test.js b/deps/npm/node_modules/tough-cookie/test/cookie_sorting_test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/test/cookie_sorting_test.js
rename to deps/npm/node_modules/tough-cookie/test/cookie_sorting_test.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/test/cookie_to_json_test.js b/deps/npm/node_modules/tough-cookie/test/cookie_to_json_test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/test/cookie_to_json_test.js
rename to deps/npm/node_modules/tough-cookie/test/cookie_to_json_test.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/test/cookie_to_string_test.js b/deps/npm/node_modules/tough-cookie/test/cookie_to_string_test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/test/cookie_to_string_test.js
rename to deps/npm/node_modules/tough-cookie/test/cookie_to_string_test.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/test/date_test.js b/deps/npm/node_modules/tough-cookie/test/date_test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/test/date_test.js
rename to deps/npm/node_modules/tough-cookie/test/date_test.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/test/domain_and_path_test.js b/deps/npm/node_modules/tough-cookie/test/domain_and_path_test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/test/domain_and_path_test.js
rename to deps/npm/node_modules/tough-cookie/test/domain_and_path_test.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/test/ietf_data/dates/bsd-examples.json b/deps/npm/node_modules/tough-cookie/test/ietf_data/dates/bsd-examples.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/test/ietf_data/dates/bsd-examples.json
rename to deps/npm/node_modules/tough-cookie/test/ietf_data/dates/bsd-examples.json
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/test/ietf_data/dates/examples.json b/deps/npm/node_modules/tough-cookie/test/ietf_data/dates/examples.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/test/ietf_data/dates/examples.json
rename to deps/npm/node_modules/tough-cookie/test/ietf_data/dates/examples.json
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/test/ietf_data/parser.json b/deps/npm/node_modules/tough-cookie/test/ietf_data/parser.json
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/test/ietf_data/parser.json
rename to deps/npm/node_modules/tough-cookie/test/ietf_data/parser.json
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/test/ietf_test.js b/deps/npm/node_modules/tough-cookie/test/ietf_test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/test/ietf_test.js
rename to deps/npm/node_modules/tough-cookie/test/ietf_test.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/test/jar_serialization_test.js b/deps/npm/node_modules/tough-cookie/test/jar_serialization_test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/test/jar_serialization_test.js
rename to deps/npm/node_modules/tough-cookie/test/jar_serialization_test.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/test/lifetime_test.js b/deps/npm/node_modules/tough-cookie/test/lifetime_test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/test/lifetime_test.js
rename to deps/npm/node_modules/tough-cookie/test/lifetime_test.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/test/parsing_test.js b/deps/npm/node_modules/tough-cookie/test/parsing_test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/test/parsing_test.js
rename to deps/npm/node_modules/tough-cookie/test/parsing_test.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/test/regression_test.js b/deps/npm/node_modules/tough-cookie/test/regression_test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tough-cookie/test/regression_test.js
rename to deps/npm/node_modules/tough-cookie/test/regression_test.js
diff --git a/deps/npm/node_modules/request/node_modules/tunnel-agent/LICENSE b/deps/npm/node_modules/tunnel-agent/LICENSE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tunnel-agent/LICENSE
rename to deps/npm/node_modules/tunnel-agent/LICENSE
diff --git a/deps/npm/node_modules/request/node_modules/tunnel-agent/README.md b/deps/npm/node_modules/tunnel-agent/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/tunnel-agent/README.md
rename to deps/npm/node_modules/tunnel-agent/README.md
diff --git a/deps/npm/node_modules/request/node_modules/tunnel-agent/index.js b/deps/npm/node_modules/tunnel-agent/index.js
similarity index 98%
rename from deps/npm/node_modules/request/node_modules/tunnel-agent/index.js
rename to deps/npm/node_modules/tunnel-agent/index.js
index da516ec43f8785..6a0d9642c9cf2f 100644
--- a/deps/npm/node_modules/request/node_modules/tunnel-agent/index.js
+++ b/deps/npm/node_modules/tunnel-agent/index.js
@@ -116,7 +116,7 @@ TunnelingAgent.prototype.createSocket = function createSocket(options, cb) {
   var placeholder = {}
   self.sockets.push(placeholder)
 
-  var connectOptions = mergeOptions({}, self.proxyOptions, 
+  var connectOptions = mergeOptions({}, self.proxyOptions,
     { method: 'CONNECT'
     , path: options.host + ':' + options.port
     , agent: false
@@ -181,7 +181,7 @@ TunnelingAgent.prototype.createSocket = function createSocket(options, cb) {
 TunnelingAgent.prototype.removeSocket = function removeSocket(socket) {
   var pos = this.sockets.indexOf(socket)
   if (pos === -1) return
-  
+
   this.sockets.splice(pos, 1)
 
   var pending = this.requests.shift()
@@ -196,7 +196,7 @@ function createSecureSocket(options, cb) {
   var self = this
   TunnelingAgent.prototype.createSocket.call(self, options, function(socket) {
     // 0 is dummy port for v0.6
-    var secureSocket = tls.connect(0, mergeOptions({}, self.options, 
+    var secureSocket = tls.connect(0, mergeOptions({}, self.options,
       { servername: options.host
       , socket: socket
       }
diff --git a/deps/npm/node_modules/request/node_modules/tunnel-agent/package.json b/deps/npm/node_modules/tunnel-agent/package.json
similarity index 71%
rename from deps/npm/node_modules/request/node_modules/tunnel-agent/package.json
rename to deps/npm/node_modules/tunnel-agent/package.json
index 77c19da8d3ddc5..67f840442a48a1 100644
--- a/deps/npm/node_modules/request/node_modules/tunnel-agent/package.json
+++ b/deps/npm/node_modules/tunnel-agent/package.json
@@ -1,41 +1,59 @@
 {
+  "_args": [
+    [
+      "tunnel-agent@~0.4.0",
+      "/Users/rebecca/code/npm/node_modules/request"
+    ]
+  ],
+  "_from": "tunnel-agent@>=0.4.0 <0.5.0",
+  "_id": "tunnel-agent@0.4.1",
+  "_inCache": true,
+  "_location": "/tunnel-agent",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "simeonvelichkov@gmail.com",
+    "name": "simov"
+  },
+  "_npmVersion": "2.11.2",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "tunnel-agent",
+    "raw": "tunnel-agent@~0.4.0",
+    "rawSpec": "~0.4.0",
+    "scope": null,
+    "spec": ">=0.4.0 <0.5.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/request"
+  ],
+  "_resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz",
+  "_shasum": "bbeecff4d679ce753db9462761a88dfcec3c5ab3",
+  "_shrinkwrap": null,
+  "_spec": "tunnel-agent@~0.4.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/request",
   "author": {
-    "name": "Mikeal Rogers",
     "email": "mikeal.rogers@gmail.com",
+    "name": "Mikeal Rogers",
     "url": "http://www.futurealoof.com"
   },
-  "name": "tunnel-agent",
-  "description": "HTTP proxy tunneling agent. Formerly part of mikeal/request, now a standalone module.",
-  "version": "0.4.1",
-  "repository": {
-    "url": "git+https://github.com/mikeal/tunnel-agent.git"
+  "bugs": {
+    "url": "https://github.com/mikeal/tunnel-agent/issues"
   },
-  "main": "index.js",
   "dependencies": {},
+  "description": "HTTP proxy tunneling agent. Formerly part of mikeal/request, now a standalone module.",
   "devDependencies": {},
-  "optionalDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "bbeecff4d679ce753db9462761a88dfcec3c5ab3",
+    "tarball": "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
+  },
   "engines": {
     "node": "*"
   },
   "gitHead": "912a7a6d00e10ec76baf9c9369de280fa5badef3",
-  "bugs": {
-    "url": "https://github.com/mikeal/tunnel-agent/issues"
-  },
   "homepage": "https://github.com/mikeal/tunnel-agent#readme",
-  "_id": "tunnel-agent@0.4.1",
-  "scripts": {},
-  "_shasum": "bbeecff4d679ce753db9462761a88dfcec3c5ab3",
-  "_from": "tunnel-agent@>=0.4.0 <0.5.0",
-  "_npmVersion": "2.11.2",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "name": "simov",
-    "email": "simeonvelichkov@gmail.com"
-  },
-  "dist": {
-    "shasum": "bbeecff4d679ce753db9462761a88dfcec3c5ab3",
-    "tarball": "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
-  },
+  "main": "index.js",
   "maintainers": [
     {
       "name": "mikeal",
@@ -54,7 +72,11 @@
       "email": "simeonvelichkov@gmail.com"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "tunnel-agent",
+  "optionalDependencies": {},
+  "repository": {
+    "url": "git+https://github.com/mikeal/tunnel-agent.git"
+  },
+  "scripts": {},
+  "version": "0.4.1"
 }
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/.travis.yml b/deps/npm/node_modules/typedarray/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/.travis.yml
rename to deps/npm/node_modules/typedarray/.travis.yml
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/LICENSE b/deps/npm/node_modules/typedarray/LICENSE
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/LICENSE
rename to deps/npm/node_modules/typedarray/LICENSE
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/example/tarray.js b/deps/npm/node_modules/typedarray/example/tarray.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/example/tarray.js
rename to deps/npm/node_modules/typedarray/example/tarray.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/index.js b/deps/npm/node_modules/typedarray/index.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/index.js
rename to deps/npm/node_modules/typedarray/index.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/package.json b/deps/npm/node_modules/typedarray/package.json
similarity index 67%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/package.json
rename to deps/npm/node_modules/typedarray/package.json
index b8b59f5c303991..3d8667a09ce9df 100644
--- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/package.json
+++ b/deps/npm/node_modules/typedarray/package.json
@@ -1,17 +1,53 @@
 {
-  "name": "typedarray",
-  "version": "0.0.6",
+  "_args": [
+    [
+      "typedarray@~0.0.5",
+      "/Users/rebecca/code/npm/node_modules/concat-stream"
+    ]
+  ],
+  "_from": "typedarray@>=0.0.5 <0.1.0",
+  "_id": "typedarray@0.0.6",
+  "_inCache": true,
+  "_location": "/typedarray",
+  "_npmUser": {
+    "email": "mail@substack.net",
+    "name": "substack"
+  },
+  "_npmVersion": "1.4.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "typedarray",
+    "raw": "typedarray@~0.0.5",
+    "rawSpec": "~0.0.5",
+    "scope": null,
+    "spec": ">=0.0.5 <0.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/concat-stream"
+  ],
+  "_resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+  "_shasum": "867ac74e3864187b1d3d47d996a78ec5c8830777",
+  "_shrinkwrap": null,
+  "_spec": "typedarray@~0.0.5",
+  "_where": "/Users/rebecca/code/npm/node_modules/concat-stream",
+  "author": {
+    "email": "mail@substack.net",
+    "name": "James Halliday",
+    "url": "http://substack.net"
+  },
+  "bugs": {
+    "url": "https://github.com/substack/typedarray/issues"
+  },
+  "dependencies": {},
   "description": "TypedArray polyfill for old browsers",
-  "main": "index.js",
   "devDependencies": {
     "tape": "~2.3.2"
   },
-  "scripts": {
-    "test": "tape test/*.js test/server/*.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/substack/typedarray.git"
+  "directories": {},
+  "dist": {
+    "shasum": "867ac74e3864187b1d3d47d996a78ec5c8830777",
+    "tarball": "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
   },
   "homepage": "https://github.com/substack/typedarray",
   "keywords": [
@@ -19,61 +55,49 @@
     "DataView",
     "Float32Array",
     "Float64Array",
-    "Int8Array",
     "Int16Array",
     "Int32Array",
-    "Uint8Array",
-    "Uint8ClampedArray",
+    "Int8Array",
     "Uint16Array",
     "Uint32Array",
-    "typed",
+    "Uint8Array",
+    "Uint8ClampedArray",
     "array",
-    "polyfill"
+    "polyfill",
+    "typed"
   ],
-  "author": {
-    "name": "James Halliday",
-    "email": "mail@substack.net",
-    "url": "http://substack.net"
-  },
   "license": "MIT",
+  "main": "index.js",
+  "maintainers": [
+    {
+      "name": "substack",
+      "email": "mail@substack.net"
+    }
+  ],
+  "name": "typedarray",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/substack/typedarray.git"
+  },
+  "scripts": {
+    "test": "tape test/*.js test/server/*.js"
+  },
   "testling": {
-    "files": "test/*.js",
     "browsers": [
-      "ie/6..latest",
-      "firefox/16..latest",
-      "firefox/nightly",
+      "android-browser/4.2..latest",
       "chrome/22..latest",
       "chrome/canary",
-      "opera/12..latest",
-      "opera/next",
-      "safari/5.1..latest",
+      "firefox/16..latest",
+      "firefox/nightly",
+      "ie/6..latest",
       "ipad/6.0..latest",
       "iphone/6.0..latest",
-      "android-browser/4.2..latest"
-    ]
-  },
-  "bugs": {
-    "url": "https://github.com/substack/typedarray/issues"
-  },
-  "_id": "typedarray@0.0.6",
-  "dist": {
-    "shasum": "867ac74e3864187b1d3d47d996a78ec5c8830777",
-    "tarball": "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
-  },
-  "_from": "typedarray@>=0.0.5 <0.1.0",
-  "_npmVersion": "1.4.3",
-  "_npmUser": {
-    "name": "substack",
-    "email": "mail@substack.net"
+      "opera/12..latest",
+      "opera/next",
+      "safari/5.1..latest"
+    ],
+    "files": "test/*.js"
   },
-  "maintainers": [
-    {
-      "name": "substack",
-      "email": "mail@substack.net"
-    }
-  ],
-  "directories": {},
-  "_shasum": "867ac74e3864187b1d3d47d996a78ec5c8830777",
-  "_resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-  "readme": "ERROR: No README data found!"
+  "version": "0.0.6"
 }
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/readme.markdown b/deps/npm/node_modules/typedarray/readme.markdown
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/readme.markdown
rename to deps/npm/node_modules/typedarray/readme.markdown
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/test/server/undef_globals.js b/deps/npm/node_modules/typedarray/test/server/undef_globals.js
similarity index 98%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/test/server/undef_globals.js
rename to deps/npm/node_modules/typedarray/test/server/undef_globals.js
index 425950f9fc9ed7..e57dabdcebc9c1 100644
--- a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/test/server/undef_globals.js
+++ b/deps/npm/node_modules/typedarray/test/server/undef_globals.js
@@ -11,7 +11,7 @@ test('u8a without globals', function (t) {
     vm.runInNewContext(src, c);
     var TA = c.module.exports;
     var ua = new(TA.Uint8Array)(5);
-    
+
     t.equal(ua.length, 5);
     ua[1] = 256 + 55;
     t.equal(ua[1], 55);
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/test/tarray.js b/deps/npm/node_modules/typedarray/test/tarray.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/test/tarray.js
rename to deps/npm/node_modules/typedarray/test/tarray.js
diff --git a/deps/npm/node_modules/uid-number/package.json b/deps/npm/node_modules/uid-number/package.json
index 8d416235f86da8..2d1af9ce8d7508 100644
--- a/deps/npm/node_modules/uid-number/package.json
+++ b/deps/npm/node_modules/uid-number/package.json
@@ -1,49 +1,72 @@
 {
+  "_args": [
+    [
+      "uid-number@0.0.6",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "uid-number@0.0.6",
+  "_id": "uid-number@0.0.6",
+  "_inCache": true,
+  "_location": "/uid-number",
+  "_nodeVersion": "0.10.31",
+  "_npmUser": {
+    "email": "i@izs.me",
+    "name": "isaacs"
+  },
+  "_npmVersion": "2.1.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "uid-number",
+    "raw": "uid-number@0.0.6",
+    "rawSpec": "0.0.6",
+    "scope": null,
+    "spec": "0.0.6",
+    "type": "version"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+  "_shasum": "0ea10e8035e8eb5b8e4449f06da1c730663baa81",
+  "_shrinkwrap": null,
+  "_spec": "uid-number@0.0.6",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "name": "uid-number",
-  "description": "Convert a username/group name to a uid/gid number",
-  "version": "0.0.6",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/uid-number.git"
+  "bugs": {
+    "url": "https://github.com/isaacs/uid-number/issues"
   },
-  "main": "uid-number.js",
   "dependencies": {},
+  "description": "Convert a username/group name to a uid/gid number",
   "devDependencies": {},
-  "optionalDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "0ea10e8035e8eb5b8e4449f06da1c730663baa81",
+    "tarball": "http://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
+  },
   "engines": {
     "node": "*"
   },
-  "license": "ISC",
   "gitHead": "aab48f5d6bda85794946b26d945d2ee452e0e9ab",
-  "bugs": {
-    "url": "https://github.com/isaacs/uid-number/issues"
-  },
   "homepage": "https://github.com/isaacs/uid-number",
-  "_id": "uid-number@0.0.6",
-  "scripts": {},
-  "_shasum": "0ea10e8035e8eb5b8e4449f06da1c730663baa81",
-  "_from": "uid-number@>=0.0.6 <0.1.0",
-  "_npmVersion": "2.1.3",
-  "_nodeVersion": "0.10.31",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "i@izs.me"
-  },
+  "license": "ISC",
+  "main": "uid-number.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "dist": {
-    "shasum": "0ea10e8035e8eb5b8e4449f06da1c730663baa81",
-    "tarball": "http://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
+  "name": "uid-number",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/uid-number.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
+  "scripts": {},
+  "version": "0.0.6"
 }
diff --git a/deps/npm/node_modules/umask/package.json b/deps/npm/node_modules/umask/package.json
index ed84e346f110ca..c0c6fdc114aafe 100644
--- a/deps/npm/node_modules/umask/package.json
+++ b/deps/npm/node_modules/umask/package.json
@@ -1,53 +1,78 @@
 {
-  "name": "umask",
-  "version": "1.1.0",
-  "description": "convert umask from string <-> number",
-  "main": "index.js",
-  "scripts": {
-    "test": "lab -ct 100",
-    "lint": "jslint --terse --latest *.js test/*.js"
+  "_args": [
+    [
+      "umask@~1.1.0",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "umask@>=1.1.0 <1.2.0",
+  "_id": "umask@1.1.0",
+  "_inCache": true,
+  "_location": "/umask",
+  "_nodeVersion": "0.10.35",
+  "_npmUser": {
+    "email": "smikes@cubane.com",
+    "name": "smikes"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/smikes/umask.git"
+  "_npmVersion": "2.2.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "umask",
+    "raw": "umask@~1.1.0",
+    "rawSpec": "~1.1.0",
+    "scope": null,
+    "spec": ">=1.1.0 <1.2.0",
+    "type": "range"
   },
-  "keywords": [
-    "umask"
+  "_requiredBy": [
+    "/"
   ],
+  "_resolved": "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz",
+  "_shasum": "f29cebf01df517912bb58ff9c4e50fde8e33320d",
+  "_shrinkwrap": null,
+  "_spec": "umask@~1.1.0",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Sam Mikes",
-    "email": "smikes@cubane.com"
+    "email": "smikes@cubane.com",
+    "name": "Sam Mikes"
   },
-  "license": "MIT",
   "bugs": {
     "url": "https://github.com/smikes/umask/issues"
   },
-  "homepage": "https://github.com/smikes/umask",
+  "dependencies": {},
+  "description": "convert umask from string <-> number",
   "devDependencies": {
     "code": "^1.2.1",
     "jslint": "^0.7.2",
     "lab": "^5.2.0"
   },
-  "gitHead": "63d821e4d0b06ef9a4b727c5fbe5976e9534d76e",
-  "_id": "umask@1.1.0",
-  "_shasum": "f29cebf01df517912bb58ff9c4e50fde8e33320d",
-  "_from": "umask@>=1.1.0 <1.2.0",
-  "_npmVersion": "2.2.0",
-  "_nodeVersion": "0.10.35",
-  "_npmUser": {
-    "name": "smikes",
-    "email": "smikes@cubane.com"
+  "directories": {},
+  "dist": {
+    "shasum": "f29cebf01df517912bb58ff9c4e50fde8e33320d",
+    "tarball": "http://registry.npmjs.org/umask/-/umask-1.1.0.tgz"
   },
+  "gitHead": "63d821e4d0b06ef9a4b727c5fbe5976e9534d76e",
+  "homepage": "https://github.com/smikes/umask",
+  "keywords": [
+    "umask"
+  ],
+  "license": "MIT",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "smikes",
       "email": "smikes@cubane.com"
     }
   ],
-  "dist": {
-    "shasum": "f29cebf01df517912bb58ff9c4e50fde8e33320d",
-    "tarball": "http://registry.npmjs.org/umask/-/umask-1.1.0.tgz"
+  "name": "umask",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/smikes/umask.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz"
+  "scripts": {
+    "lint": "jslint --terse --latest *.js test/*.js",
+    "test": "lab -ct 100"
+  },
+  "version": "1.1.0"
 }
diff --git a/deps/npm/node_modules/unique-filename/.npmignore b/deps/npm/node_modules/unique-filename/.npmignore
new file mode 100644
index 00000000000000..1ab9fa63f542db
--- /dev/null
+++ b/deps/npm/node_modules/unique-filename/.npmignore
@@ -0,0 +1,5 @@
+*~
+.#*
+DEADJOE
+
+node_modules
diff --git a/deps/npm/node_modules/unique-filename/README.md b/deps/npm/node_modules/unique-filename/README.md
new file mode 100644
index 00000000000000..4b5b241eb9acfd
--- /dev/null
+++ b/deps/npm/node_modules/unique-filename/README.md
@@ -0,0 +1,33 @@
+unique-filename
+===============
+
+Generate a unique filename for use in temporary directories or caches.
+
+```
+var uniqueFilename = require('unique-filename')
+
+// returns something like: /tmp/912ec803b2ce49e4a541068d495ab570
+var randomTmpfile = uniqueFilename(os.tmpdir())
+
+// returns something like: /tmp/my-test-912ec803b2ce49e4a541068d495ab570
+var randomPrefixedTmpfile = uniqueFilename(os.tmpdir(), 'my-test')
+
+var uniqueTmpfile = uniqueFilename('/tmp', 'testing', '/my/thing/to/uniq/on')
+```
+
+### uniqueFilename(*dir*, *fileprefix*, *uniqstr*) → String
+
+Returns the full path of a unique filename that looks like:
+`dir/prefix-912ec803b2ce49e4a541068d495ab570`
+or `dir/912ec803b2ce49e4a541068d495ab570`
+
+*dir* – The path you want the filename in. `os.tmpdir()` is a good choice for this.
+
+*fileprefix* – A string to append prior to the unique part of the filename.
+The parameter is required if *uniqstr* is also passed in but is otherwise
+optional and can be `undefined`/`null`/`''`. If present and not empty
+then this string plus a hyphen are prepended to the unique part.
+
+*uniqstr* – Optional, if not passed the unique part of the resulting
+filename will be random.  If passed in it will be generated from this string
+in a reproducable way.
diff --git a/deps/npm/node_modules/unique-filename/index.js b/deps/npm/node_modules/unique-filename/index.js
new file mode 100644
index 00000000000000..02bf1e273143c1
--- /dev/null
+++ b/deps/npm/node_modules/unique-filename/index.js
@@ -0,0 +1,8 @@
+'use strict'
+var path = require('path')
+
+var uniqueSlug = require('unique-slug')
+
+module.exports = function (filepath, prefix, uniq) {
+  return path.join(filepath, (prefix ? prefix + '-' : '') + uniqueSlug(uniq))
+}
diff --git a/deps/npm/node_modules/unique-filename/package.json b/deps/npm/node_modules/unique-filename/package.json
new file mode 100644
index 00000000000000..2b3f9a1b6c7e14
--- /dev/null
+++ b/deps/npm/node_modules/unique-filename/package.json
@@ -0,0 +1,76 @@
+{
+  "_args": [
+    [
+      "unique-filename@~1.0.0",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "unique-filename@>=1.0.0 <1.1.0",
+  "_id": "unique-filename@1.0.0",
+  "_inCache": true,
+  "_location": "/unique-filename",
+  "_nodeVersion": "1.6.2",
+  "_npmUser": {
+    "email": "me@re-becca.org",
+    "name": "iarna"
+  },
+  "_npmVersion": "2.7.6",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "unique-filename",
+    "raw": "unique-filename@~1.0.0",
+    "rawSpec": "~1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <1.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_shasum": "0bee4219e192e86da3c4ffc0cc6e054d8634eab9",
+  "_shrinkwrap": null,
+  "_spec": "unique-filename@~1.0.0",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "me@re-becca.org",
+    "name": "Rebecca Turner",
+    "url": "http://re-becca.org/"
+  },
+  "bugs": {
+    "url": "https://github.com/iarna/unique-filename/issues"
+  },
+  "dependencies": {
+    "unique-slug": "^1.0.0"
+  },
+  "description": "Generate a unique filename for use in temporary directories or caches.",
+  "devDependencies": {
+    "standard": "^3.7.3",
+    "tap": "^1.0.0"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "0bee4219e192e86da3c4ffc0cc6e054d8634eab9",
+    "tarball": "http://registry.npmjs.org/unique-filename/-/unique-filename-1.0.0.tgz"
+  },
+  "gitHead": "935739361f6ecc7b613c5daf66a57b67938796d4",
+  "homepage": "https://github.com/iarna/unique-filename",
+  "keywords": [],
+  "license": "ISC",
+  "main": "index.js",
+  "maintainers": [
+    {
+      "name": "iarna",
+      "email": "me@re-becca.org"
+    }
+  ],
+  "name": "unique-filename",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/iarna/unique-filename.git"
+  },
+  "scripts": {
+    "test": "standard && tap test"
+  },
+  "version": "1.0.0"
+}
diff --git a/deps/npm/node_modules/unique-filename/test/index.js b/deps/npm/node_modules/unique-filename/test/index.js
new file mode 100644
index 00000000000000..b1a8fee5eb77bd
--- /dev/null
+++ b/deps/npm/node_modules/unique-filename/test/index.js
@@ -0,0 +1,23 @@
+'sue strict'
+var t = require('tap')
+var uniqueFilename = require('../index.js')
+
+t.plan(6)
+
+var randomTmpfile = uniqueFilename('tmp')
+t.like(randomTmpfile, /^tmp.[a-f0-9]{32}$/, 'random tmp file')
+
+var randomAgain = uniqueFilename('tmp')
+t.notEqual(randomAgain, randomTmpfile, 'random tmp files are not the same')
+
+var randomPrefixedTmpfile = uniqueFilename('tmp', 'my-test')
+t.like(randomPrefixedTmpfile, /^tmp.my-test-[a-f0-9]{32}$/, 'random prefixed tmp file')
+
+var randomPrefixedAgain = uniqueFilename('tmp', 'my-test')
+t.notEqual(randomPrefixedAgain, randomPrefixedTmpfile, 'random prefixed tmp files are not the same')
+
+var uniqueTmpfile = uniqueFilename('tmp', 'testing', '/my/thing/to/uniq/on')
+t.like(uniqueTmpfile, /^tmp.testing-dd1ecbb112056bb8a7347e852ce3ddf9$/, 'unique filename')
+
+var uniqueAgain = uniqueFilename('tmp', 'testing', '/my/thing/to/uniq/on')
+t.is(uniqueTmpfile, uniqueAgain, 'same unique string component produces same filename')
diff --git a/deps/npm/node_modules/unique-slug/.npmignore b/deps/npm/node_modules/unique-slug/.npmignore
new file mode 100644
index 00000000000000..1ab9fa63f542db
--- /dev/null
+++ b/deps/npm/node_modules/unique-slug/.npmignore
@@ -0,0 +1,5 @@
+*~
+.#*
+DEADJOE
+
+node_modules
diff --git a/deps/npm/node_modules/unique-slug/README.md b/deps/npm/node_modules/unique-slug/README.md
new file mode 100644
index 00000000000000..617735a986a5b8
--- /dev/null
+++ b/deps/npm/node_modules/unique-slug/README.md
@@ -0,0 +1,19 @@
+unique-slug
+===========
+
+Generate a unique character string suitible for use in files and URLs.
+
+```
+var uniqueSlug = require('unique-slug')
+
+var randomSlug = uniqueSlug()
+var fileSlug = uniqueSlug('/etc/passwd')
+```
+
+### uniqueSlug(*str*) → String (32 chars)
+
+If *str* is passed in then the return value will be its md5 digest in
+hex.
+
+If *str* is not passed in, it will be 16 bytes coverted into 32 hex
+characters, generated by `crypto.pseudoRandomBytes`.
diff --git a/deps/npm/node_modules/unique-slug/index.js b/deps/npm/node_modules/unique-slug/index.js
new file mode 100644
index 00000000000000..747cf6d06a0922
--- /dev/null
+++ b/deps/npm/node_modules/unique-slug/index.js
@@ -0,0 +1,15 @@
+'use strict'
+var crypto = require('crypto')
+
+module.exports = function (uniq) {
+  if (uniq) {
+    var hash = crypto.createHash('md5')
+    hash.update(uniq)
+    return hash.digest('hex')
+  } else {
+    // Safe because w/o a callback because this interface can
+    // neither block nor error (by contrast with randomBytes
+    // which will throw an exception without enough entropy)
+    return crypto.pseudoRandomBytes(16).toString('hex')
+  }
+}
diff --git a/deps/npm/node_modules/unique-slug/package.json b/deps/npm/node_modules/unique-slug/package.json
new file mode 100644
index 00000000000000..95923348210591
--- /dev/null
+++ b/deps/npm/node_modules/unique-slug/package.json
@@ -0,0 +1,74 @@
+{
+  "_args": [
+    [
+      "unique-slug@^1.0.0",
+      "/Users/rebecca/code/npm/node_modules/unique-filename"
+    ]
+  ],
+  "_from": "unique-slug@>=1.0.0 <2.0.0",
+  "_id": "unique-slug@1.0.0",
+  "_inCache": true,
+  "_location": "/unique-slug",
+  "_nodeVersion": "1.6.2",
+  "_npmUser": {
+    "email": "me@re-becca.org",
+    "name": "iarna"
+  },
+  "_npmVersion": "2.7.6",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "unique-slug",
+    "raw": "unique-slug@^1.0.0",
+    "rawSpec": "^1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/unique-filename"
+  ],
+  "_shasum": "4459d12416f576cc091a3deb19939ec99c735626",
+  "_shrinkwrap": null,
+  "_spec": "unique-slug@^1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/unique-filename",
+  "author": {
+    "email": "me@re-becca.org",
+    "name": "Rebecca Turner",
+    "url": "http://re-becca.org"
+  },
+  "bugs": {
+    "url": "https://github.com/iarna/unique-slug/issues"
+  },
+  "dependencies": {},
+  "description": "Generate a unique character string suitible for use in files and URLs.",
+  "devDependencies": {
+    "standard": "^3.7.3",
+    "tap": "^1.0.0"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "4459d12416f576cc091a3deb19939ec99c735626",
+    "tarball": "http://registry.npmjs.org/unique-slug/-/unique-slug-1.0.0.tgz"
+  },
+  "gitHead": "024b3bd3c0184550702c93f088822e3f38da5c17",
+  "homepage": "https://github.com/iarna/unique-slug",
+  "keywords": [],
+  "license": "ISC",
+  "main": "index.js",
+  "maintainers": [
+    {
+      "name": "iarna",
+      "email": "me@re-becca.org"
+    }
+  ],
+  "name": "unique-slug",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/iarna/unique-slug.git"
+  },
+  "scripts": {
+    "test": "standard && tap test"
+  },
+  "version": "1.0.0"
+}
diff --git a/deps/npm/node_modules/unique-slug/test/index.js b/deps/npm/node_modules/unique-slug/test/index.js
new file mode 100644
index 00000000000000..6866678ed0f55d
--- /dev/null
+++ b/deps/npm/node_modules/unique-slug/test/index.js
@@ -0,0 +1,13 @@
+'use strict'
+var t = require('tap')
+var uniqueSlug = require('../index.js')
+
+t.plan(5)
+var slugA = uniqueSlug()
+t.is(slugA.length, 32, 'random slugs are 32 chars')
+t.notEqual(slugA, uniqueSlug(), "two slugs aren't the same")
+var base = '/path/to/thingy'
+var slugB = uniqueSlug(base)
+t.is(slugB.length, 32, 'string based slugs are 32 chars')
+t.is(slugB, uniqueSlug(base), 'two string based slugs, from the same string are the same')
+t.notEqual(slugB, uniqueSlug(slugA), 'two string based slongs, from diff strings are different')
diff --git a/deps/npm/node_modules/unpipe/HISTORY.md b/deps/npm/node_modules/unpipe/HISTORY.md
new file mode 100644
index 00000000000000..85e0f8d747dc2a
--- /dev/null
+++ b/deps/npm/node_modules/unpipe/HISTORY.md
@@ -0,0 +1,4 @@
+1.0.0 / 2015-06-14
+==================
+
+  * Initial release
diff --git a/deps/npm/node_modules/github-url-from-git/LICENSE b/deps/npm/node_modules/unpipe/LICENSE
similarity index 93%
rename from deps/npm/node_modules/github-url-from-git/LICENSE
rename to deps/npm/node_modules/unpipe/LICENSE
index b7409302c44e35..aed0138278a940 100644
--- a/deps/npm/node_modules/github-url-from-git/LICENSE
+++ b/deps/npm/node_modules/unpipe/LICENSE
@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2013 TJ Holowaychuk <tj@vision-media.ca>
+Copyright (c) 2015 Douglas Christopher Wilson <doug@somethingdoug.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/deps/npm/node_modules/unpipe/README.md b/deps/npm/node_modules/unpipe/README.md
new file mode 100644
index 00000000000000..e536ad2c045bba
--- /dev/null
+++ b/deps/npm/node_modules/unpipe/README.md
@@ -0,0 +1,43 @@
+# unpipe
+
+[![NPM Version][npm-image]][npm-url]
+[![NPM Downloads][downloads-image]][downloads-url]
+[![Node.js Version][node-image]][node-url]
+[![Build Status][travis-image]][travis-url]
+[![Test Coverage][coveralls-image]][coveralls-url]
+
+Unpipe a stream from all destinations.
+
+## Installation
+
+```sh
+$ npm install unpipe
+```
+
+## API
+
+```js
+var unpipe = require('unpipe')
+```
+
+### unpipe(stream)
+
+Unpipes all destinations from a given stream. With stream 2+, this is
+equivalent to `stream.unpipe()`. When used with streams 1 style streams
+(typically Node.js 0.8 and below), this module attempts to undo the
+actions done in `stream.pipe(dest)`.
+
+## License
+
+[MIT](LICENSE)
+
+[npm-image]: https://img.shields.io/npm/v/unpipe.svg
+[npm-url]: https://npmjs.org/package/unpipe
+[node-image]: https://img.shields.io/node/v/unpipe.svg
+[node-url]: http://nodejs.org/download/
+[travis-image]: https://img.shields.io/travis/stream-utils/unpipe.svg
+[travis-url]: https://travis-ci.org/stream-utils/unpipe
+[coveralls-image]: https://img.shields.io/coveralls/stream-utils/unpipe.svg
+[coveralls-url]: https://coveralls.io/r/stream-utils/unpipe?branch=master
+[downloads-image]: https://img.shields.io/npm/dm/unpipe.svg
+[downloads-url]: https://npmjs.org/package/unpipe
diff --git a/deps/npm/node_modules/unpipe/index.js b/deps/npm/node_modules/unpipe/index.js
new file mode 100644
index 00000000000000..15c3d97a12b484
--- /dev/null
+++ b/deps/npm/node_modules/unpipe/index.js
@@ -0,0 +1,69 @@
+/*!
+ * unpipe
+ * Copyright(c) 2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+'use strict'
+
+/**
+ * Module exports.
+ * @public
+ */
+
+module.exports = unpipe
+
+/**
+ * Determine if there are Node.js pipe-like data listeners.
+ * @private
+ */
+
+function hasPipeDataListeners(stream) {
+  var listeners = stream.listeners('data')
+
+  for (var i = 0; i < listeners.length; i++) {
+    if (listeners[i].name === 'ondata') {
+      return true
+    }
+  }
+
+  return false
+}
+
+/**
+ * Unpipe a stream from all destinations.
+ *
+ * @param {object} stream
+ * @public
+ */
+
+function unpipe(stream) {
+  if (!stream) {
+    throw new TypeError('argument stream is required')
+  }
+
+  if (typeof stream.unpipe === 'function') {
+    // new-style
+    stream.unpipe()
+    return
+  }
+
+  // Node.js 0.8 hack
+  if (!hasPipeDataListeners(stream)) {
+    return
+  }
+
+  var listener
+  var listeners = stream.listeners('close')
+
+  for (var i = 0; i < listeners.length; i++) {
+    listener = listeners[i]
+
+    if (listener.name !== 'cleanup' && listener.name !== 'onclose') {
+      continue
+    }
+
+    // invoke the listener
+    listener.call(stream)
+  }
+}
diff --git a/deps/npm/node_modules/unpipe/package.json b/deps/npm/node_modules/unpipe/package.json
new file mode 100644
index 00000000000000..8d270a91e08b66
--- /dev/null
+++ b/deps/npm/node_modules/unpipe/package.json
@@ -0,0 +1,83 @@
+{
+  "_args": [
+    [
+      "unpipe@~1.0.0",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "unpipe@>=1.0.0 <1.1.0",
+  "_id": "unpipe@1.0.0",
+  "_inCache": true,
+  "_location": "/unpipe",
+  "_npmUser": {
+    "email": "doug@somethingdoug.com",
+    "name": "dougwilson"
+  },
+  "_npmVersion": "1.4.28",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "unpipe",
+    "raw": "unpipe@~1.0.0",
+    "rawSpec": "~1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <1.1.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+  "_shasum": "b2bf4ee8514aae6165b4817829d21b2ef49904ec",
+  "_shrinkwrap": null,
+  "_spec": "unpipe@~1.0.0",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "email": "doug@somethingdoug.com",
+    "name": "Douglas Christopher Wilson"
+  },
+  "bugs": {
+    "url": "https://github.com/stream-utils/unpipe/issues"
+  },
+  "dependencies": {},
+  "description": "Unpipe a stream from all destinations",
+  "devDependencies": {
+    "istanbul": "0.3.15",
+    "mocha": "2.2.5",
+    "readable-stream": "1.1.13"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "b2bf4ee8514aae6165b4817829d21b2ef49904ec",
+    "tarball": "http://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
+  },
+  "engines": {
+    "node": ">= 0.8"
+  },
+  "files": [
+    "HISTORY.md",
+    "LICENSE",
+    "README.md",
+    "index.js"
+  ],
+  "gitHead": "d2df901c06487430e78dca62b6edb8bb2fc5e99d",
+  "homepage": "https://github.com/stream-utils/unpipe",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "dougwilson",
+      "email": "doug@somethingdoug.com"
+    }
+  ],
+  "name": "unpipe",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/stream-utils/unpipe"
+  },
+  "scripts": {
+    "test": "mocha --reporter spec --bail --check-leaks test/",
+    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/",
+    "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/"
+  },
+  "version": "1.0.0"
+}
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/History.md b/deps/npm/node_modules/util-deprecate/History.md
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/History.md
rename to deps/npm/node_modules/util-deprecate/History.md
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/LICENSE b/deps/npm/node_modules/util-deprecate/LICENSE
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/LICENSE
rename to deps/npm/node_modules/util-deprecate/LICENSE
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/README.md b/deps/npm/node_modules/util-deprecate/README.md
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/README.md
rename to deps/npm/node_modules/util-deprecate/README.md
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/browser.js b/deps/npm/node_modules/util-deprecate/browser.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/browser.js
rename to deps/npm/node_modules/util-deprecate/browser.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/node.js b/deps/npm/node_modules/util-deprecate/node.js
similarity index 100%
rename from deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/node.js
rename to deps/npm/node_modules/util-deprecate/node.js
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/package.json b/deps/npm/node_modules/util-deprecate/package.json
similarity index 61%
rename from deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/package.json
rename to deps/npm/node_modules/util-deprecate/package.json
index ea487da0e43000..aa607316f71808 100644
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/package.json
+++ b/deps/npm/node_modules/util-deprecate/package.json
@@ -1,53 +1,78 @@
 {
-  "name": "util-deprecate",
-  "version": "1.0.1",
-  "description": "The Node.js `util.deprecate()` function with browser support",
-  "main": "node.js",
-  "browser": "browser.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+  "_args": [
+    [
+      "util-deprecate@~1.0.1",
+      "/Users/rebecca/code/npm/node_modules/concat-stream/node_modules/readable-stream"
+    ]
+  ],
+  "_from": "util-deprecate@>=1.0.1 <1.1.0",
+  "_id": "util-deprecate@1.0.1",
+  "_inCache": true,
+  "_location": "/util-deprecate",
+  "_npmUser": {
+    "email": "nathan@tootallnate.net",
+    "name": "tootallnate"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/TooTallNate/util-deprecate.git"
+  "_npmVersion": "1.4.28",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "util-deprecate",
+    "raw": "util-deprecate@~1.0.1",
+    "rawSpec": "~1.0.1",
+    "scope": null,
+    "spec": ">=1.0.1 <1.1.0",
+    "type": "range"
   },
-  "keywords": [
-    "util",
-    "deprecate",
-    "browserify",
-    "browser",
-    "node"
+  "_requiredBy": [
+    "/concat-stream/readable-stream"
   ],
+  "_resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz",
+  "_shasum": "3556a3d13c4c6aa7983d7e2425478197199b7881",
+  "_shrinkwrap": null,
+  "_spec": "util-deprecate@~1.0.1",
+  "_where": "/Users/rebecca/code/npm/node_modules/concat-stream/node_modules/readable-stream",
   "author": {
-    "name": "Nathan Rajlich",
     "email": "nathan@tootallnate.net",
+    "name": "Nathan Rajlich",
     "url": "http://n8.io/"
   },
-  "license": "MIT",
+  "browser": "browser.js",
   "bugs": {
     "url": "https://github.com/TooTallNate/util-deprecate/issues"
   },
-  "homepage": "https://github.com/TooTallNate/util-deprecate",
-  "gitHead": "6e923f7d98a0afbe5b9c7db9d0f0029c1936746c",
-  "_id": "util-deprecate@1.0.1",
-  "_shasum": "3556a3d13c4c6aa7983d7e2425478197199b7881",
-  "_from": "util-deprecate@>=1.0.1 <1.1.0",
-  "_npmVersion": "1.4.28",
-  "_npmUser": {
-    "name": "tootallnate",
-    "email": "nathan@tootallnate.net"
+  "dependencies": {},
+  "description": "The Node.js `util.deprecate()` function with browser support",
+  "devDependencies": {},
+  "directories": {},
+  "dist": {
+    "shasum": "3556a3d13c4c6aa7983d7e2425478197199b7881",
+    "tarball": "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
   },
+  "gitHead": "6e923f7d98a0afbe5b9c7db9d0f0029c1936746c",
+  "homepage": "https://github.com/TooTallNate/util-deprecate",
+  "keywords": [
+    "browser",
+    "browserify",
+    "deprecate",
+    "node",
+    "util"
+  ],
+  "license": "MIT",
+  "main": "node.js",
   "maintainers": [
     {
       "name": "tootallnate",
       "email": "nathan@tootallnate.net"
     }
   ],
-  "dist": {
-    "shasum": "3556a3d13c4c6aa7983d7e2425478197199b7881",
-    "tarball": "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
+  "name": "util-deprecate",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/TooTallNate/util-deprecate.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "version": "1.0.1"
 }
diff --git a/deps/npm/node_modules/read-installed/node_modules/util-extend/README.md b/deps/npm/node_modules/util-extend/README.md
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/util-extend/README.md
rename to deps/npm/node_modules/util-extend/README.md
diff --git a/deps/npm/node_modules/read-installed/node_modules/util-extend/extend.js b/deps/npm/node_modules/util-extend/extend.js
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/util-extend/extend.js
rename to deps/npm/node_modules/util-extend/extend.js
diff --git a/deps/npm/node_modules/read-installed/node_modules/util-extend/package.json b/deps/npm/node_modules/util-extend/package.json
similarity index 61%
rename from deps/npm/node_modules/read-installed/node_modules/util-extend/package.json
rename to deps/npm/node_modules/util-extend/package.json
index 259d6c1049fac5..90d27e158c0099 100644
--- a/deps/npm/node_modules/read-installed/node_modules/util-extend/package.json
+++ b/deps/npm/node_modules/util-extend/package.json
@@ -1,41 +1,66 @@
 {
-  "name": "util-extend",
-  "version": "1.0.1",
-  "description": "Node's internal object extension function",
-  "main": "extend.js",
-  "scripts": {
-    "test": "node test.js"
+  "_args": [
+    [
+      "util-extend@^1.0.1",
+      "/Users/rebecca/code/npm/node_modules/read-installed"
+    ]
+  ],
+  "_from": "util-extend@>=1.0.1 <2.0.0",
+  "_id": "util-extend@1.0.1",
+  "_inCache": true,
+  "_location": "/util-extend",
+  "_npmUser": {
+    "email": "i@izs.me",
+    "name": "isaacs"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/util-extend.git"
+  "_npmVersion": "1.3.4",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "util-extend",
+    "raw": "util-extend@^1.0.1",
+    "rawSpec": "^1.0.1",
+    "scope": null,
+    "spec": ">=1.0.1 <2.0.0",
+    "type": "range"
   },
+  "_requiredBy": [
+    "/read-installed"
+  ],
+  "_resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz",
+  "_shasum": "bb703b79480293ddcdcfb3c6a9fea20f483415bc",
+  "_shrinkwrap": null,
+  "_spec": "util-extend@^1.0.1",
+  "_where": "/Users/rebecca/code/npm/node_modules/read-installed",
   "author": "",
-  "license": "MIT",
-  "readmeFilename": "README.md",
-  "readme": "# util-extend\n\nThe Node object extending function that Node uses for Node!\n\n## Usage\n\n```js\nvar extend = require('util-extend');\nfunction functionThatTakesOptions(options) {\n  var options = extend(defaults, options);\n  // now any unset options are set to the defaults.\n}\n```\n",
   "bugs": {
     "url": "https://github.com/isaacs/util-extend/issues"
   },
-  "_id": "util-extend@1.0.1",
+  "dependencies": {},
+  "description": "Node's internal object extension function",
+  "devDependencies": {},
+  "directories": {},
   "dist": {
     "shasum": "bb703b79480293ddcdcfb3c6a9fea20f483415bc",
     "tarball": "http://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz"
   },
-  "_from": "util-extend@>=1.0.1 <2.0.0",
-  "_npmVersion": "1.3.4",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "i@izs.me"
-  },
+  "license": "MIT",
+  "main": "extend.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "directories": {},
-  "_shasum": "bb703b79480293ddcdcfb3c6a9fea20f483415bc",
-  "_resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz",
-  "homepage": "https://github.com/isaacs/util-extend#readme"
+  "name": "util-extend",
+  "optionalDependencies": {},
+  "readme": "# util-extend\n\nThe Node object extending function that Node uses for Node!\n\n## Usage\n\n```js\nvar extend = require('util-extend');\nfunction functionThatTakesOptions(options) {\n  var options = extend(defaults, options);\n  // now any unset options are set to the defaults.\n}\n```\n",
+  "readmeFilename": "README.md",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/util-extend"
+  },
+  "scripts": {
+    "test": "node test.js"
+  },
+  "version": "1.0.1"
 }
diff --git a/deps/npm/node_modules/read-installed/node_modules/util-extend/test.js b/deps/npm/node_modules/util-extend/test.js
similarity index 100%
rename from deps/npm/node_modules/read-installed/node_modules/util-extend/test.js
rename to deps/npm/node_modules/util-extend/test.js
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/node_modules/spdx-license-ids/LICENSE b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/node_modules/spdx-license-ids/LICENSE
deleted file mode 100644
index 68a49daad8ff7e..00000000000000
--- a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/node_modules/spdx-license-ids/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-license-ids/LICENSE b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-license-ids/LICENSE
deleted file mode 100644
index 68a49daad8ff7e..00000000000000
--- a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-license-ids/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-license-ids/README.md b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-license-ids/README.md
deleted file mode 100755
index 92523532b24609..00000000000000
--- a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-license-ids/README.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# spdx-license-ids
-
-A list of [SPDX license](https://spdx.org/licenses/) identifiers
-
-[**Download JSON**](https://raw.githubusercontent.com/shinnn/spdx-license-ids/master/spdx-license-ids.json)
-
-## Use as a JavaScript Library
-
-[![NPM version](https://img.shields.io/npm/v/spdx-license-ids.svg)](https://www.npmjs.org/package/spdx-license-ids)
-[![Bower version](https://img.shields.io/bower/v/spdx-license-ids.svg)](https://github.com/shinnn/spdx-license-ids/releases)
-[![Build Status](https://travis-ci.org/shinnn/spdx-license-ids.svg?branch=master)](https://travis-ci.org/shinnn/spdx-license-ids)
-[![Coverage Status](https://img.shields.io/coveralls/shinnn/spdx-license-ids.svg)](https://coveralls.io/r/shinnn/spdx-license-ids)
-[![devDependency Status](https://david-dm.org/shinnn/spdx-license-ids/dev-status.svg)](https://david-dm.org/shinnn/spdx-license-ids#info=devDependencies)
-
-### Installation
-
-#### Package managers
-
-##### [npm](https://www.npmjs.com/)
-
-```sh
-npm install spdx-license-ids
-```
-
-##### [bower](http://bower.io/)
-
-```sh
-bower install spdx-license-ids
-```
-
-##### [Duo](http://duojs.org/)
-
-```javascript
-const spdxLicenseIds = require('shinnn/spdx-license-ids');
-```
-
-#### Standalone
-
-[Download the script file directly.](https://raw.githubusercontent.com/shinnn/spdx-license-ids/master/spdx-license-ids-browser.js)
-
-### API
-
-#### spdxLicenseIds
-
-Type: `Array` of `String`
-
-It returns an array of SPDX license identifiers.
-
-```javascript
-const spdxLicenseIds = require('spdx-license-ids'); //=> ['Glide', 'Abstyles', 'AFL-1.1', ... ]
-```
-
-## License
-
-[The Unlicense](./LICENSE).
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-license-ids/package.json b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-license-ids/package.json
deleted file mode 100644
index 62c5c37ba96261..00000000000000
--- a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-license-ids/package.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "name": "spdx-license-ids",
-  "version": "1.0.2",
-  "description": "A list of SPDX license identifiers",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/shinnn/spdx-license-ids.git"
-  },
-  "author": {
-    "name": "Shinnosuke Watanabe",
-    "url": "https://github.com/shinnn"
-  },
-  "scripts": {
-    "build": "node --harmony_arrow_functions build.js",
-    "lint": "eslint --config node_modules/@shinnn/eslintrc/rc.json --ignore-path .gitignore .",
-    "pretest": "${npm_package_scripts_build} && ${npm_package_scripts_lint}",
-    "test": "node --harmony_arrow_functions test.js",
-    "coverage": "node --harmony_arrow_functions node_modules/.bin/istanbul cover test.js",
-    "coveralls": "${npm_package_scripts_coverage} && istanbul-coveralls"
-  },
-  "license": "Unlicense",
-  "main": "spdx-license-ids.json",
-  "files": [
-    "spdx-license-ids.json"
-  ],
-  "keywords": [
-    "spdx",
-    "license",
-    "licenses",
-    "id",
-    "identifier",
-    "identifiers",
-    "json",
-    "array",
-    "oss",
-    "browser",
-    "client-side"
-  ],
-  "devDependencies": {
-    "@shinnn/eslintrc": "^1.0.0",
-    "each-async": "^1.1.1",
-    "eslint": "^0.24.0",
-    "got": "^3.3.0",
-    "istanbul": "^0.3.17",
-    "istanbul-coveralls": "^1.0.3",
-    "require-bower-files": "^2.0.0",
-    "rimraf": "^2.4.1",
-    "stringify-object": "^2.2.0",
-    "tape": "^4.0.0"
-  },
-  "gitHead": "df183ecdf1738f77b1e8e41f686ee56206a40693",
-  "bugs": {
-    "url": "https://github.com/shinnn/spdx-license-ids/issues"
-  },
-  "homepage": "https://github.com/shinnn/spdx-license-ids#readme",
-  "_id": "spdx-license-ids@1.0.2",
-  "_shasum": "0674e9c9a230f980016b5b073a10aa165701677c",
-  "_from": "spdx-license-ids@>=1.0.0 <2.0.0",
-  "_npmVersion": "2.12.1",
-  "_nodeVersion": "2.3.3",
-  "_npmUser": {
-    "name": "shinnn",
-    "email": "snnskwtnb@gmail.com"
-  },
-  "maintainers": [
-    {
-      "name": "shinnn",
-      "email": "snnskwtnb@gmail.com"
-    }
-  ],
-  "dist": {
-    "shasum": "0674e9c9a230f980016b5b073a10aa165701677c",
-    "tarball": "http://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
-  },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
-}
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-license-ids/spdx-license-ids.json b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-license-ids/spdx-license-ids.json
deleted file mode 100644
index 2a4a78f549f06e..00000000000000
--- a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-license-ids/spdx-license-ids.json
+++ /dev/null
@@ -1,303 +0,0 @@
-[
-  "Glide",
-  "Abstyles",
-  "AFL-1.1",
-  "AFL-1.2",
-  "AFL-2.0",
-  "AFL-2.1",
-  "AFL-3.0",
-  "AMPAS",
-  "APL-1.0",
-  "Adobe-Glyph",
-  "APAFML",
-  "Adobe-2006",
-  "AGPL-1.0",
-  "Afmparse",
-  "Aladdin",
-  "ADSL",
-  "AMDPLPA",
-  "ANTLR-PD",
-  "Apache-1.0",
-  "Apache-1.1",
-  "Apache-2.0",
-  "AML",
-  "APSL-1.0",
-  "APSL-1.1",
-  "APSL-1.2",
-  "APSL-2.0",
-  "Artistic-1.0",
-  "Artistic-1.0-Perl",
-  "Artistic-1.0-cl8",
-  "Artistic-2.0",
-  "AAL",
-  "Bahyph",
-  "Barr",
-  "Beerware",
-  "BitTorrent-1.0",
-  "BitTorrent-1.1",
-  "BSL-1.0",
-  "Borceux",
-  "BSD-2-Clause",
-  "BSD-2-Clause-FreeBSD",
-  "BSD-2-Clause-NetBSD",
-  "BSD-3-Clause",
-  "BSD-3-Clause-Clear",
-  "BSD-4-Clause",
-  "BSD-Protection",
-  "BSD-3-Clause-Attribution",
-  "BSD-4-Clause-UC",
-  "bzip2-1.0.5",
-  "bzip2-1.0.6",
-  "Caldera",
-  "CECILL-1.0",
-  "CECILL-1.1",
-  "CECILL-2.0",
-  "CECILL-B",
-  "CECILL-C",
-  "ClArtistic",
-  "MIT-CMU",
-  "CNRI-Jython",
-  "CNRI-Python",
-  "CNRI-Python-GPL-Compatible",
-  "CPOL-1.02",
-  "CDDL-1.0",
-  "CDDL-1.1",
-  "CPAL-1.0",
-  "CPL-1.0",
-  "CATOSL-1.1",
-  "Condor-1.1",
-  "CC-BY-1.0",
-  "CC-BY-2.0",
-  "CC-BY-2.5",
-  "CC-BY-3.0",
-  "CC-BY-4.0",
-  "CC-BY-ND-1.0",
-  "CC-BY-ND-2.0",
-  "CC-BY-ND-2.5",
-  "CC-BY-ND-3.0",
-  "CC-BY-ND-4.0",
-  "CC-BY-NC-1.0",
-  "CC-BY-NC-2.0",
-  "CC-BY-NC-2.5",
-  "CC-BY-NC-3.0",
-  "CC-BY-NC-4.0",
-  "CC-BY-NC-ND-1.0",
-  "CC-BY-NC-ND-2.0",
-  "CC-BY-NC-ND-2.5",
-  "CC-BY-NC-ND-3.0",
-  "CC-BY-NC-ND-4.0",
-  "CC-BY-NC-SA-1.0",
-  "CC-BY-NC-SA-2.0",
-  "CC-BY-NC-SA-2.5",
-  "CC-BY-NC-SA-3.0",
-  "CC-BY-NC-SA-4.0",
-  "CC-BY-SA-1.0",
-  "CC-BY-SA-2.0",
-  "CC-BY-SA-2.5",
-  "CC-BY-SA-3.0",
-  "CC-BY-SA-4.0",
-  "CC0-1.0",
-  "Crossword",
-  "CUA-OPL-1.0",
-  "Cube",
-  "D-FSL-1.0",
-  "diffmark",
-  "WTFPL",
-  "DOC",
-  "Dotseqn",
-  "DSDP",
-  "dvipdfm",
-  "EPL-1.0",
-  "ECL-1.0",
-  "ECL-2.0",
-  "eGenix",
-  "EFL-1.0",
-  "EFL-2.0",
-  "MIT-advertising",
-  "MIT-enna",
-  "Entessa",
-  "ErlPL-1.1",
-  "EUDatagrid",
-  "EUPL-1.0",
-  "EUPL-1.1",
-  "Eurosym",
-  "Fair",
-  "MIT-feh",
-  "Frameworx-1.0",
-  "FreeImage",
-  "FTL",
-  "FSFUL",
-  "FSFULLR",
-  "Giftware",
-  "GL2PS",
-  "Glulxe",
-  "AGPL-3.0",
-  "GFDL-1.1",
-  "GFDL-1.2",
-  "GFDL-1.3",
-  "GPL-1.0",
-  "GPL-2.0",
-  "GPL-3.0",
-  "LGPL-2.1",
-  "LGPL-3.0",
-  "LGPL-2.0",
-  "gnuplot",
-  "gSOAP-1.3b",
-  "HaskellReport",
-  "HPND",
-  "IBM-pibs",
-  "IPL-1.0",
-  "ICU",
-  "ImageMagick",
-  "iMatix",
-  "Imlib2",
-  "IJG",
-  "Intel-ACPI",
-  "Intel",
-  "IPA",
-  "ISC",
-  "JasPer-2.0",
-  "JSON",
-  "LPPL-1.3a",
-  "LPPL-1.0",
-  "LPPL-1.1",
-  "LPPL-1.2",
-  "LPPL-1.3c",
-  "Latex2e",
-  "BSD-3-Clause-LBNL",
-  "Leptonica",
-  "LGPLLR",
-  "Libpng",
-  "libtiff",
-  "LPL-1.02",
-  "LPL-1.0",
-  "MakeIndex",
-  "MTLL",
-  "MS-PL",
-  "MS-RL",
-  "MirOS",
-  "MITNFA",
-  "MIT",
-  "Motosoto",
-  "MPL-1.0",
-  "MPL-1.1",
-  "MPL-2.0",
-  "MPL-2.0-no-copyleft-exception",
-  "mpich2",
-  "Multics",
-  "Mup",
-  "NASA-1.3",
-  "Naumen",
-  "NBPL-1.0",
-  "NetCDF",
-  "NGPL",
-  "NOSL",
-  "NPL-1.0",
-  "NPL-1.1",
-  "Newsletr",
-  "NLPL",
-  "Nokia",
-  "NPOSL-3.0",
-  "Noweb",
-  "NRL",
-  "NTP",
-  "Nunit",
-  "OCLC-2.0",
-  "ODbL-1.0",
-  "PDDL-1.0",
-  "OGTSL",
-  "OLDAP-2.2.2",
-  "OLDAP-1.1",
-  "OLDAP-1.2",
-  "OLDAP-1.3",
-  "OLDAP-1.4",
-  "OLDAP-2.0",
-  "OLDAP-2.0.1",
-  "OLDAP-2.1",
-  "OLDAP-2.2",
-  "OLDAP-2.2.1",
-  "OLDAP-2.3",
-  "OLDAP-2.4",
-  "OLDAP-2.5",
-  "OLDAP-2.6",
-  "OLDAP-2.7",
-  "OLDAP-2.8",
-  "OML",
-  "OPL-1.0",
-  "OSL-1.0",
-  "OSL-1.1",
-  "OSL-2.0",
-  "OSL-2.1",
-  "OSL-3.0",
-  "OpenSSL",
-  "PHP-3.0",
-  "PHP-3.01",
-  "Plexus",
-  "PostgreSQL",
-  "psfrag",
-  "psutils",
-  "Python-2.0",
-  "QPL-1.0",
-  "Qhull",
-  "Rdisc",
-  "RPSL-1.0",
-  "RPL-1.1",
-  "RPL-1.5",
-  "RHeCos-1.1",
-  "RSCPL",
-  "RSA-MD",
-  "Ruby",
-  "SAX-PD",
-  "Saxpath",
-  "SCEA",
-  "SWL",
-  "SGI-B-1.0",
-  "SGI-B-1.1",
-  "SGI-B-2.0",
-  "OFL-1.0",
-  "OFL-1.1",
-  "SimPL-2.0",
-  "Sleepycat",
-  "SNIA",
-  "Spencer-86",
-  "Spencer-94",
-  "Spencer-99",
-  "SMLNJ",
-  "SugarCRM-1.1.3",
-  "SISSL",
-  "SISSL-1.2",
-  "SPL-1.0",
-  "Watcom-1.0",
-  "TCL",
-  "Unlicense",
-  "TMate",
-  "TORQUE-1.1",
-  "TOSL",
-  "Unicode-TOU",
-  "UPL-1.0",
-  "NCSA",
-  "Vim",
-  "VOSTROM",
-  "VSL-1.0",
-  "W3C-19980720",
-  "W3C",
-  "Wsuipa",
-  "Xnet",
-  "X11",
-  "Xerox",
-  "XFree86-1.1",
-  "xinetd",
-  "xpp",
-  "XSkat",
-  "YPL-1.0",
-  "YPL-1.1",
-  "Zed",
-  "Zend-2.0",
-  "Zimbra-1.3",
-  "Zimbra-1.4",
-  "Zlib",
-  "zlib-acknowledgement",
-  "ZPL-1.1",
-  "ZPL-2.0",
-  "ZPL-2.1"
-]
diff --git a/deps/npm/node_modules/validate-npm-package-license/package.json b/deps/npm/node_modules/validate-npm-package-license/package.json
index 00006cc3904b90..94c1433c77c7f4 100644
--- a/deps/npm/node_modules/validate-npm-package-license/package.json
+++ b/deps/npm/node_modules/validate-npm-package-license/package.json
@@ -1,20 +1,63 @@
 {
-  "name": "validate-npm-package-license",
-  "description": "Give me a string and I'll tell you if it's a valid npm package license string",
-  "version": "3.0.1",
+  "_args": [
+    [
+      "validate-npm-package-license@^3.0.1",
+      "/Users/ogd/Documents/projects/npm/npm/node_modules/init-package-json"
+    ]
+  ],
+  "_from": "validate-npm-package-license@>=3.0.1 <4.0.0",
+  "_id": "validate-npm-package-license@3.0.1",
+  "_inCache": true,
+  "_location": "/validate-npm-package-license",
+  "_nodeVersion": "0.12.7",
+  "_npmUser": {
+    "email": "kyle@kemitchell.com",
+    "name": "kemitchell"
+  },
+  "_npmVersion": "2.13.5",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "validate-npm-package-license",
+    "raw": "validate-npm-package-license@^3.0.1",
+    "rawSpec": "^3.0.1",
+    "scope": null,
+    "spec": ">=3.0.1 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/init-package-json",
+    "/normalize-package-data"
+  ],
+  "_resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+  "_shasum": "2804babe712ad3379459acfbe24746ab2c303fbc",
+  "_shrinkwrap": null,
+  "_spec": "validate-npm-package-license@^3.0.1",
+  "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/init-package-json",
   "author": {
-    "name": "Kyle E. Mitchell",
     "email": "kyle@kemitchell.com",
+    "name": "Kyle E. Mitchell",
     "url": "https://kemitchell.com"
   },
+  "bugs": {
+    "url": "https://github.com/kemitchell/validate-npm-package-license.js/issues"
+  },
   "dependencies": {
     "spdx-correct": "~1.0.0",
     "spdx-expression-parse": "~1.0.0"
   },
+  "description": "Give me a string and I'll tell you if it's a valid npm package license string",
   "devDependencies": {
     "defence-cli": "^1.0.1",
     "replace-require-self": "^1.0.0"
   },
+  "directories": {},
+  "dist": {
+    "shasum": "2804babe712ad3379459acfbe24746ab2c303fbc",
+    "tarball": "http://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"
+  },
+  "gitHead": "00200d28f9960985f221bc1a8a71e4760daf39bf",
+  "homepage": "https://github.com/kemitchell/validate-npm-package-license.js#readme",
+  "installable": true,
   "keywords": [
     "license",
     "npm",
@@ -22,31 +65,6 @@
     "validation"
   ],
   "license": "Apache-2.0",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/kemitchell/validate-npm-package-license.js.git"
-  },
-  "scripts": {
-    "test": "defence README.md | replace-require-self | node"
-  },
-  "gitHead": "00200d28f9960985f221bc1a8a71e4760daf39bf",
-  "bugs": {
-    "url": "https://github.com/kemitchell/validate-npm-package-license.js/issues"
-  },
-  "homepage": "https://github.com/kemitchell/validate-npm-package-license.js#readme",
-  "_id": "validate-npm-package-license@3.0.1",
-  "_shasum": "2804babe712ad3379459acfbe24746ab2c303fbc",
-  "_from": "validate-npm-package-license@3.0.1",
-  "_npmVersion": "2.13.5",
-  "_nodeVersion": "0.12.7",
-  "_npmUser": {
-    "name": "kemitchell",
-    "email": "kyle@kemitchell.com"
-  },
-  "dist": {
-    "shasum": "2804babe712ad3379459acfbe24746ab2c303fbc",
-    "tarball": "http://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"
-  },
   "maintainers": [
     {
       "name": "kemitchell",
@@ -57,6 +75,16 @@
       "email": "ogd@aoaioxxysz.net"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"
+  "name": "validate-npm-package-license",
+  "optionalDependencies": {},
+  "readme": "validate-npm-package-license\n============================\n\nGive me a string and I'll tell you if it's a valid npm package license string.\n\n```javascript\nvar valid = require('validate-npm-package-license');\n```\n\nSPDX license identifiers are valid license strings:\n\n```javascript\n\nvar assert = require('assert');\nvar validSPDXExpression = {\n  validForNewPackages: true,\n  validForOldPackages: true,\n  spdx: true\n};\n\nassert.deepEqual(valid('MIT'), validSPDXExpression);\nassert.deepEqual(valid('BSD-2-Clause'), validSPDXExpression);\nassert.deepEqual(valid('Apache-2.0'), validSPDXExpression);\nassert.deepEqual(valid('ISC'), validSPDXExpression);\n```\nThe function will return a warning and suggestion for nearly-correct license identifiers:\n\n```javascript\nassert.deepEqual(\n  valid('Apache 2.0'),\n  {\n    validForOldPackages: false,\n    validForNewPackages: false,\n    warnings: [\n      'license should be ' +\n      'a valid SPDX license expression (without \"LicenseRef\"), ' +\n      '\"UNLICENSED\", or ' +\n      '\"SEE LICENSE IN <filename>\"',\n      'license is similar to the valid expression \"Apache-2.0\"'\n    ]\n  }\n);\n```\n\nSPDX expressions are valid, too ...\n\n```javascript\n// Simple SPDX license expression for dual licensing\nassert.deepEqual(\n  valid('(GPL-3.0 OR BSD-2-Clause)'),\n  validSPDXExpression\n);\n```\n\n... except if they contain `LicenseRef`:\n\n```javascript\nvar warningAboutLicenseRef = {\n  validForOldPackages: false,\n  validForNewPackages: false,\n  spdx: true,\n  warnings: [\n    'license should be ' +\n    'a valid SPDX license expression (without \"LicenseRef\"), ' +\n    '\"UNLICENSED\", or ' +\n    '\"SEE LICENSE IN <filename>\"',\n  ]\n};\n\nassert.deepEqual(\n  valid('LicenseRef-Made-Up'),\n  warningAboutLicenseRef\n);\n\nassert.deepEqual(\n  valid('(MIT OR LicenseRef-Made-Up)'),\n  warningAboutLicenseRef\n);\n```\n\nIf you can't describe your licensing terms with standardized SPDX identifiers, put the terms in a file in the package and point users there:\n\n```javascript\nassert.deepEqual(\n  valid('SEE LICENSE IN LICENSE.txt'),\n  {\n    validForNewPackages: true,\n    validForOldPackages: true,\n    inFile: 'LICENSE.txt'\n  }\n);\n\nassert.deepEqual(\n  valid('SEE LICENSE IN license.md'),\n  {\n    validForNewPackages: true,\n    validForOldPackages: true,\n    inFile: 'license.md'\n  }\n);\n```\n\nIf there aren't any licensing terms, use `UNLICENSED`:\n\n```javascript\nvar unlicensed = {\n  validForNewPackages: true,\n  validForOldPackages: true,\n  unlicensed: true\n};\nassert.deepEqual(valid('UNLICENSED'), unlicensed);\nassert.deepEqual(valid('UNLICENCED'), unlicensed);\n```\n",
+  "readmeFilename": "README.md",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/kemitchell/validate-npm-package-license.js.git"
+  },
+  "scripts": {
+    "test": "defence README.md | replace-require-self | node"
+  },
+  "version": "3.0.1"
 }
diff --git a/deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/.travis.yml b/deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/.travis.yml
deleted file mode 100644
index cc4dba29d959a2..00000000000000
--- a/deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-language: node_js
-node_js:
-  - "0.8"
-  - "0.10"
diff --git a/deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/package.json b/deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/package.json
deleted file mode 100644
index 32b8c350692db4..00000000000000
--- a/deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/package.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name": "builtins",
-  "version": "0.0.7",
-  "description": "List of node.js builtin modules",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/juliangruber/builtins.git"
-  },
-  "license": "MIT",
-  "main": "builtins.json",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org"
-  },
-  "scripts": {
-    "test": "node -e \"require('./builtins.json')\""
-  },
-  "readme": "\n# builtins\n\n  List of node.js [builtin modules](http://nodejs.org/api/).\n\n  [![build status](https://secure.travis-ci.org/juliangruber/builtins.svg)](http://travis-ci.org/juliangruber/builtins)\n\n## Example\n\n```js\nvar builtins = require('builtins');\n\nassert(builtins.indexOf('http') > -1);\n```\n\n## License\n\n  MIT\n",
-  "readmeFilename": "Readme.md",
-  "bugs": {
-    "url": "https://github.com/juliangruber/builtins/issues"
-  },
-  "homepage": "https://github.com/juliangruber/builtins",
-  "_id": "builtins@0.0.7",
-  "_from": "builtins@0.0.7"
-}
diff --git a/deps/npm/node_modules/validate-npm-package-name/package.json b/deps/npm/node_modules/validate-npm-package-name/package.json
index b2a6104af58c6e..63cfacd9419c86 100644
--- a/deps/npm/node_modules/validate-npm-package-name/package.json
+++ b/deps/npm/node_modules/validate-npm-package-name/package.json
@@ -1,42 +1,90 @@
 {
-  "name": "validate-npm-package-name",
-  "version": "2.2.2",
-  "description": "Give me a string and I'll tell you if it's a valid npm package name",
-  "main": "index.js",
-  "directories": {
-    "test": "test"
+  "_args": [
+    [
+      "validate-npm-package-name@~2.2.0",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "validate-npm-package-name@>=2.2.0 <2.3.0",
+  "_id": "validate-npm-package-name@2.2.2",
+  "_inCache": true,
+  "_location": "/validate-npm-package-name",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "email": "kat@sykosomatic.org",
+    "name": "zkat"
+  },
+  "_npmVersion": "3.0.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "validate-npm-package-name",
+    "raw": "validate-npm-package-name@~2.2.0",
+    "rawSpec": "~2.2.0",
+    "scope": null,
+    "spec": ">=2.2.0 <2.3.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/",
+    "/init-package-json"
+  ],
+  "_resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz",
+  "_shasum": "f65695b22f7324442019a3c7fa39a6e7fd299085",
+  "_shrinkwrap": null,
+  "_spec": "validate-npm-package-name@~2.2.0",
+  "_where": "/Users/rebecca/code/npm",
+  "author": {
+    "name": "zeke"
+  },
+  "bugs": {
+    "url": "https://github.com/npm/validate-npm-package-name/issues"
   },
   "dependencies": {
     "builtins": "0.0.7"
   },
+  "description": "Give me a string and I'll tell you if it's a valid npm package name",
   "devDependencies": {
     "tap": "^0.4.13"
   },
-  "scripts": {
-    "test": "tap test/*.js"
+  "directories": {
+    "test": "test"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/validate-npm-package-name.git"
+  "dist": {
+    "shasum": "f65695b22f7324442019a3c7fa39a6e7fd299085",
+    "tarball": "http://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz"
   },
+  "gitHead": "3af92c881549f1b96f05ab6bfb5768bba94ad72d",
+  "homepage": "https://github.com/npm/validate-npm-package-name",
   "keywords": [
+    "names",
     "npm",
     "package",
-    "names",
     "validation"
   ],
-  "author": {
-    "name": "zeke"
-  },
   "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/npm/validate-npm-package-name/issues"
+  "main": "index.js",
+  "maintainers": [
+    {
+      "name": "zeke",
+      "email": "zeke@sikelianos.com"
+    },
+    {
+      "name": "bcoe",
+      "email": "ben@npmjs.com"
+    },
+    {
+      "name": "zkat",
+      "email": "kat@sykosomatic.org"
+    }
+  ],
+  "name": "validate-npm-package-name",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/validate-npm-package-name.git"
   },
-  "homepage": "https://github.com/npm/validate-npm-package-name",
-  "readme": "# validate-npm-package-name\n\nGive me a string and I'll tell you if it's a valid `npm` package name.\n\nThis package exports a single synchronous function that takes a `string` as\ninput and returns an object with two properties:\n\n- `validForNewPackages` :: `Boolean`\n- `validForOldPackages` :: `Boolean`\n\n## Contents\n\n- [Naming rules](#naming-rules)\n- [Examples](#examples)\n    + [Valid Names](#valid-names)\n    + [Invalid Names](#invalid-names)\n- [Legacy Names](#legacy-names)\n- [Tests](#tests)\n- [License](#license)\n\n## Naming Rules\n\nBelow is a list of rules that valid `npm` package name should conform to.\n\n- package name length should be greater than zero\n- all the characters in the package name must be lowercase i.e., no uppercase or mixed case names are allowed\n- package name *can* consist of hyphens\n- package name must *not* contain any non-url-safe characters (since name ends up being part of a URL)\n- package name should not start with `.` or `_`\n- package name should *not* contain any leading or trailing spaces\n- package name *cannot* be the same as a node.js/io.js core module nor a reserved/blacklisted name. For example, the following names are invalid:\n    + http\n    + stream\n    + node_modules\n    + favicon.ico\n- package name length cannot exceed 214\n\n\n## Examples\n\n### Valid Names\n\n```js\nvar validate = require(\"validate-npm-package-name\")\n\nvalidate(\"some-package\")\nvalidate(\"example.com\")\nvalidate(\"under_score\")\nvalidate(\"123numeric\")\nvalidate(\"crazy!\")\nvalidate(\"@npm/thingy\")\nvalidate(\"@jane/foo.js\")\n```\n\nAll of the above names are valid, so you'll get this object back:\n\n```js\n{\n  validForNewPackages: true,\n  validForOldPackages: true\n}\n```\n\n### Invalid Names\n\n```js\nvalidate(\" leading-space:and:weirdchars\")\n```\n\nThat was never a valid package name, so you get this:\n\n```js\n{\n  validForNewPackages: false,\n  validForOldPackages: false,\n  errors: [\n    'name cannot contain leading or trailing spaces',\n    'name can only contain URL-friendly characters'\n  ]\n}\n```\n\n## Legacy Names\n\nIn the old days of npm, package names were wild. They could have capital\nletters in them. They could be really long. They could be the name of an\nexisting module in node core.\n\nIf you give this function a package name that **used to be valid**, you'll see\na change in the value of `validForNewPackages` property, and a warnings array\nwill be present:\n\n```js\nvalidate(\"cRaZY-paCkAgE-with-mixed-case-and-more-than-214-characters-----------------------------------------------------------------------------------------------------------------------------------------------------------\")\n```\n\nreturns:\n\n```js\n{\n  validForNewPackages: false,\n  validForOldPackages: true,\n  warnings: [\n    \"name can no longer contain capital letters\",\n    \"name can no longer contain more than 214 characters\"\n  ]\n}\n```\n\n## Tests\n\n```sh\nnpm install\nnpm test\n```\n\n## License\n\nISC\n",
-  "readmeFilename": "README.md",
-  "gitHead": "3af92c881549f1b96f05ab6bfb5768bba94ad72d",
-  "_id": "validate-npm-package-name@2.2.2",
-  "_shasum": "f65695b22f7324442019a3c7fa39a6e7fd299085",
-  "_from": "validate-npm-package-name@2.2.2"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "2.2.2"
 }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/.npmignore b/deps/npm/node_modules/wcwidth/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/.npmignore
rename to deps/npm/node_modules/wcwidth/.npmignore
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/LICENSE b/deps/npm/node_modules/wcwidth/LICENSE
similarity index 99%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/LICENSE
rename to deps/npm/node_modules/wcwidth/LICENSE
index 313ef1e888e41b..14deaf94b8162d 100644
--- a/deps/npm/node_modules/columnify/node_modules/wcwidth/LICENSE
+++ b/deps/npm/node_modules/wcwidth/LICENSE
@@ -27,4 +27,3 @@ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
 IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/Readme.md b/deps/npm/node_modules/wcwidth/Readme.md
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/Readme.md
rename to deps/npm/node_modules/wcwidth/Readme.md
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/combining.js b/deps/npm/node_modules/wcwidth/combining.js
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/combining.js
rename to deps/npm/node_modules/wcwidth/combining.js
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/docs/index.md b/deps/npm/node_modules/wcwidth/docs/index.md
similarity index 99%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/docs/index.md
rename to deps/npm/node_modules/wcwidth/docs/index.md
index 5c5126d03287b4..64c1f3f7cd8a8a 100644
--- a/deps/npm/node_modules/columnify/node_modules/wcwidth/docs/index.md
+++ b/deps/npm/node_modules/wcwidth/docs/index.md
@@ -60,6 +60,3 @@ for any purpose and without fee is hereby granted. The author
 disclaims all warranties with regard to this software.
 
 Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
-
-
-
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/index.js b/deps/npm/node_modules/wcwidth/index.js
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/index.js
rename to deps/npm/node_modules/wcwidth/index.js
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/package.json b/deps/npm/node_modules/wcwidth/package.json
similarity index 64%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/package.json
rename to deps/npm/node_modules/wcwidth/package.json
index 4744d9dc3f7f7b..a950ab260c2a7d 100644
--- a/deps/npm/node_modules/columnify/node_modules/wcwidth/package.json
+++ b/deps/npm/node_modules/wcwidth/package.json
@@ -1,7 +1,36 @@
 {
-  "name": "wcwidth",
-  "version": "1.0.0",
-  "description": "Port of C's wcwidth() and wcswidth()",
+  "_args": [
+    [
+      "wcwidth@^1.0.0",
+      "/Users/rebecca/code/npm/node_modules/columnify"
+    ]
+  ],
+  "_from": "wcwidth@>=1.0.0 <2.0.0",
+  "_id": "wcwidth@1.0.0",
+  "_inCache": true,
+  "_location": "/wcwidth",
+  "_npmUser": {
+    "email": "secoif@gmail.com",
+    "name": "timoxley"
+  },
+  "_npmVersion": "1.4.23",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "wcwidth",
+    "raw": "wcwidth@^1.0.0",
+    "rawSpec": "^1.0.0",
+    "scope": null,
+    "spec": ">=1.0.0 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/columnify"
+  ],
+  "_resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz",
+  "_shasum": "02d059ff7a8fc741e0f6b5da1e69b2b40daeca6f",
+  "_shrinkwrap": null,
+  "_spec": "wcwidth@^1.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/columnify",
   "author": {
     "name": "Tim Oxley"
   },
@@ -12,49 +41,44 @@
       "url": "http://code.woong.org/"
     }
   ],
-  "main": "index.js",
   "dependencies": {
     "defaults": "^1.0.0"
   },
+  "description": "Port of C's wcwidth() and wcswidth()",
   "devDependencies": {
     "tape": "^2.13.4"
   },
-  "license": "MIT",
-  "keywords": [
-    "wide character",
-    "wc",
-    "wide character string",
-    "wcs",
-    "terminal",
-    "width",
-    "wcwidth",
-    "wcswidth"
-  ],
   "directories": {
     "doc": "docs",
     "test": "test"
   },
-  "scripts": {
-    "test": "tape test/*.js"
+  "dist": {
+    "shasum": "02d059ff7a8fc741e0f6b5da1e69b2b40daeca6f",
+    "tarball": "http://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz"
   },
   "gitHead": "5bc3aafd45c89f233c27b9479c18a23ca91ba660",
-  "_id": "wcwidth@1.0.0",
-  "_shasum": "02d059ff7a8fc741e0f6b5da1e69b2b40daeca6f",
-  "_from": "wcwidth@>=1.0.0 <2.0.0",
-  "_npmVersion": "1.4.23",
-  "_npmUser": {
-    "name": "timoxley",
-    "email": "secoif@gmail.com"
-  },
+  "keywords": [
+    "terminal",
+    "wc",
+    "wcs",
+    "wcswidth",
+    "wcwidth",
+    "wide character",
+    "wide character string",
+    "width"
+  ],
+  "license": "MIT",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "timoxley",
       "email": "secoif@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "02d059ff7a8fc741e0f6b5da1e69b2b40daeca6f",
-    "tarball": "http://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz"
+  "name": "wcwidth",
+  "optionalDependencies": {},
+  "scripts": {
+    "test": "tape test/*.js"
   },
-  "_resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz"
+  "version": "1.0.0"
 }
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/test/index.js b/deps/npm/node_modules/wcwidth/test/index.js
similarity index 100%
rename from deps/npm/node_modules/columnify/node_modules/wcwidth/test/index.js
rename to deps/npm/node_modules/wcwidth/test/index.js
diff --git a/deps/npm/node_modules/which/package.json b/deps/npm/node_modules/which/package.json
index 0213e184e7b746..af78bbeb3860c7 100644
--- a/deps/npm/node_modules/which/package.json
+++ b/deps/npm/node_modules/which/package.json
@@ -1,57 +1,82 @@
 {
+  "_args": [
+    [
+      "which@~1.1.1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "which@>=1.1.1 <1.2.0",
+  "_id": "which@1.1.2",
+  "_inCache": true,
+  "_location": "/which",
+  "_nodeVersion": "2.5.0",
+  "_npmUser": {
+    "email": "isaacs@npmjs.com",
+    "name": "isaacs"
+  },
+  "_npmVersion": "3.3.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "which",
+    "raw": "which@~1.1.1",
+    "rawSpec": "~1.1.1",
+    "scope": null,
+    "spec": ">=1.1.1 <1.2.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/",
+    "/node-gyp"
+  ],
+  "_resolved": "https://registry.npmjs.org/which/-/which-1.1.2.tgz",
+  "_shasum": "486c48af6dfecc7a7dcf9c655acf108d2dcbdf3d",
+  "_shrinkwrap": null,
+  "_spec": "which@~1.1.1",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me"
   },
-  "name": "which",
-  "description": "Like which(1) unix command. Find the first instance of an executable in the PATH.",
-  "version": "1.1.2",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/node-which.git"
-  },
-  "main": "which.js",
   "bin": {
     "which": "./bin/which"
   },
-  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/isaacs/node-which/issues"
+  },
   "dependencies": {
     "is-absolute": "^0.1.7"
   },
+  "description": "Like which(1) unix command. Find the first instance of an executable in the PATH.",
   "devDependencies": {
     "mkdirp": "^0.5.0",
     "rimraf": "^2.3.3",
     "tap": "^1.0.2"
   },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "gitHead": "e576e42f0c377571884f844eec58b3ca4a331681",
-  "bugs": {
-    "url": "https://github.com/isaacs/node-which/issues"
-  },
-  "homepage": "https://github.com/isaacs/node-which#readme",
-  "_id": "which@1.1.2",
-  "_shasum": "486c48af6dfecc7a7dcf9c655acf108d2dcbdf3d",
-  "_from": "which@1.1.2",
-  "_npmVersion": "3.3.1",
-  "_nodeVersion": "2.5.0",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
-  },
+  "directories": {},
   "dist": {
     "shasum": "486c48af6dfecc7a7dcf9c655acf108d2dcbdf3d",
     "tarball": "http://registry.npmjs.org/which/-/which-1.1.2.tgz"
   },
+  "gitHead": "e576e42f0c377571884f844eec58b3ca4a331681",
+  "homepage": "https://github.com/isaacs/node-which#readme",
+  "installable": true,
+  "license": "ISC",
+  "main": "which.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/which/-/which-1.1.2.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "which",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/node-which.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.1.2"
 }
diff --git a/deps/npm/node_modules/wrappy/package.json b/deps/npm/node_modules/wrappy/package.json
index b88e66283290ba..3c4e03b037d4b9 100644
--- a/deps/npm/node_modules/wrappy/package.json
+++ b/deps/npm/node_modules/wrappy/package.json
@@ -1,52 +1,78 @@
 {
-  "name": "wrappy",
-  "version": "1.0.1",
-  "description": "Callback wrapping utility",
-  "main": "wrappy.js",
-  "directories": {
-    "test": "test"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "tap": "^0.4.12"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "_args": [
+    [
+      "wrappy@~1.0.1",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "wrappy@>=1.0.1 <1.1.0",
+  "_id": "wrappy@1.0.1",
+  "_inCache": true,
+  "_location": "/wrappy",
+  "_nodeVersion": "0.10.31",
+  "_npmUser": {
+    "email": "i@izs.me",
+    "name": "isaacs"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/npm/wrappy"
+  "_npmVersion": "2.0.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "wrappy",
+    "raw": "wrappy@~1.0.1",
+    "rawSpec": "~1.0.1",
+    "scope": null,
+    "spec": ">=1.0.1 <1.1.0",
+    "type": "range"
   },
+  "_requiredBy": [
+    "/",
+    "/dezalgo",
+    "/inflight",
+    "/once"
+  ],
+  "_resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+  "_shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739",
+  "_shrinkwrap": null,
+  "_spec": "wrappy@~1.0.1",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
+    "name": "Isaac Z. Schlueter",
     "url": "http://blog.izs.me/"
   },
-  "license": "ISC",
   "bugs": {
     "url": "https://github.com/npm/wrappy/issues"
   },
-  "homepage": "https://github.com/npm/wrappy",
-  "gitHead": "006a8cbac6b99988315834c207896eed71fd069a",
-  "_id": "wrappy@1.0.1",
-  "_shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739",
-  "_from": "wrappy@1.0.1",
-  "_npmVersion": "2.0.0",
-  "_nodeVersion": "0.10.31",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "i@izs.me"
+  "dependencies": {},
+  "description": "Callback wrapping utility",
+  "devDependencies": {
+    "tap": "^0.4.12"
+  },
+  "directories": {
+    "test": "test"
+  },
+  "dist": {
+    "shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739",
+    "tarball": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
   },
+  "gitHead": "006a8cbac6b99988315834c207896eed71fd069a",
+  "homepage": "https://github.com/npm/wrappy",
+  "license": "ISC",
+  "main": "wrappy.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "dist": {
-    "shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739",
-    "tarball": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+  "name": "wrappy",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/npm/wrappy"
   },
-  "_resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.0.1"
 }
diff --git a/deps/npm/node_modules/write-file-atomic/package.json b/deps/npm/node_modules/write-file-atomic/package.json
index 4fad94d3dd42dc..1dbe79432ba1f3 100644
--- a/deps/npm/node_modules/write-file-atomic/package.json
+++ b/deps/npm/node_modules/write-file-atomic/package.json
@@ -1,57 +1,81 @@
 {
-  "name": "write-file-atomic",
-  "version": "1.1.3",
-  "description": "Write files in an atomic fashion w/configurable ownership",
-  "main": "index.js",
-  "scripts": {
-    "test": "tap test/*.js"
+  "_args": [
+    [
+      "write-file-atomic@~1.1.2",
+      "/Users/rebecca/code/npm"
+    ]
+  ],
+  "_from": "write-file-atomic@>=1.1.2 <1.2.0",
+  "_id": "write-file-atomic@1.1.3",
+  "_inCache": true,
+  "_location": "/write-file-atomic",
+  "_nodeVersion": "3.1.0",
+  "_npmUser": {
+    "email": "me@re-becca.org",
+    "name": "iarna"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/iarna/write-file-atomic.git"
+  "_npmVersion": "3.3.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "write-file-atomic",
+    "raw": "write-file-atomic@~1.1.2",
+    "rawSpec": "~1.1.2",
+    "scope": null,
+    "spec": ">=1.1.2 <1.2.0",
+    "type": "range"
   },
-  "keywords": [
-    "writeFile",
-    "atomic"
+  "_requiredBy": [
+    "/"
   ],
+  "_shasum": "60eaca258a0b559b37aca82b21d64a293b4b90d0",
+  "_shrinkwrap": null,
+  "_spec": "write-file-atomic@~1.1.2",
+  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "name": "Rebecca Turner",
     "email": "me@re-becca.org",
+    "name": "Rebecca Turner",
     "url": "http://re-becca.org"
   },
-  "license": "ISC",
   "bugs": {
     "url": "https://github.com/iarna/write-file-atomic/issues"
   },
-  "homepage": "https://github.com/iarna/write-file-atomic",
   "dependencies": {
     "graceful-fs": "^4.1.2",
     "slide": "^1.1.5"
   },
+  "description": "Write files in an atomic fashion w/configurable ownership",
   "devDependencies": {
     "require-inject": "^1.1.0",
     "tap": "^0.4.12"
   },
-  "gitHead": "65a1e2e156c0d0bfb7acac2e039b943d6ec9876d",
-  "_id": "write-file-atomic@1.1.3",
-  "_shasum": "60eaca258a0b559b37aca82b21d64a293b4b90d0",
-  "_from": "write-file-atomic@1.1.3",
-  "_npmVersion": "3.3.0",
-  "_nodeVersion": "3.1.0",
-  "_npmUser": {
-    "name": "iarna",
-    "email": "me@re-becca.org"
-  },
+  "directories": {},
   "dist": {
     "shasum": "60eaca258a0b559b37aca82b21d64a293b4b90d0",
     "tarball": "http://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.3.tgz"
   },
+  "gitHead": "65a1e2e156c0d0bfb7acac2e039b943d6ec9876d",
+  "homepage": "https://github.com/iarna/write-file-atomic",
+  "installable": true,
+  "keywords": [
+    "atomic",
+    "writeFile"
+  ],
+  "license": "ISC",
+  "main": "index.js",
   "maintainers": [
     {
       "name": "iarna",
       "email": "me@re-becca.org"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.3.tgz"
+  "name": "write-file-atomic",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/iarna/write-file-atomic.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "version": "1.1.3"
 }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/.npmignore b/deps/npm/node_modules/xtend/.npmignore
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/.npmignore
rename to deps/npm/node_modules/xtend/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/LICENCE b/deps/npm/node_modules/xtend/LICENCE
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/LICENCE
rename to deps/npm/node_modules/xtend/LICENCE
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/Makefile b/deps/npm/node_modules/xtend/Makefile
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/Makefile
rename to deps/npm/node_modules/xtend/Makefile
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/README.md b/deps/npm/node_modules/xtend/README.md
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/README.md
rename to deps/npm/node_modules/xtend/README.md
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/immutable.js b/deps/npm/node_modules/xtend/immutable.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/immutable.js
rename to deps/npm/node_modules/xtend/immutable.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/mutable.js b/deps/npm/node_modules/xtend/mutable.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/mutable.js
rename to deps/npm/node_modules/xtend/mutable.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/package.json b/deps/npm/node_modules/xtend/package.json
similarity index 63%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/package.json
rename to deps/npm/node_modules/xtend/package.json
index 907a720da7e2f6..116a2797fc286b 100644
--- a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/package.json
+++ b/deps/npm/node_modules/xtend/package.json
@@ -1,32 +1,44 @@
 {
-  "name": "xtend",
-  "version": "4.0.0",
-  "description": "extend like a boss",
-  "keywords": [
-    "extend",
-    "merge",
-    "options",
-    "opts",
-    "object",
-    "array"
+  "_args": [
+    [
+      "xtend@^4.0.0",
+      "/Users/rebecca/code/npm/node_modules/is-my-json-valid"
+    ]
   ],
-  "author": {
-    "name": "Raynos",
-    "email": "raynos2@gmail.com"
+  "_from": "xtend@>=4.0.0 <5.0.0",
+  "_id": "xtend@4.0.0",
+  "_inCache": true,
+  "_location": "/xtend",
+  "_npmUser": {
+    "email": "raynos2@gmail.com",
+    "name": "raynos"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/Raynos/xtend.git"
+  "_npmVersion": "1.4.15",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "xtend",
+    "raw": "xtend@^4.0.0",
+    "rawSpec": "^4.0.0",
+    "scope": null,
+    "spec": ">=4.0.0 <5.0.0",
+    "type": "range"
   },
-  "main": "immutable",
-  "scripts": {
-    "test": "node test"
+  "_requiredBy": [
+    "/is-my-json-valid"
+  ],
+  "_resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+  "_shasum": "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f",
+  "_shrinkwrap": null,
+  "_spec": "xtend@^4.0.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/is-my-json-valid",
+  "author": {
+    "email": "raynos2@gmail.com",
+    "name": "Raynos"
   },
-  "dependencies": {},
-  "devDependencies": {
-    "tape": "~1.1.0"
+  "bugs": {
+    "email": "raynos2@gmail.com",
+    "url": "https://github.com/Raynos/xtend/issues"
   },
-  "homepage": "https://github.com/Raynos/xtend",
   "contributors": [
     {
       "name": "Jake Verbaten"
@@ -35,54 +47,65 @@
       "name": "Matt Esch"
     }
   ],
-  "bugs": {
-    "url": "https://github.com/Raynos/xtend/issues",
-    "email": "raynos2@gmail.com"
+  "dependencies": {},
+  "description": "extend like a boss",
+  "devDependencies": {
+    "tape": "~1.1.0"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f",
+    "tarball": "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+  },
+  "engines": {
+    "node": ">=0.4"
   },
+  "gitHead": "94a95d76154103290533b2c55ffa0fe4be16bfef",
+  "homepage": "https://github.com/Raynos/xtend",
+  "keywords": [
+    "array",
+    "extend",
+    "merge",
+    "object",
+    "options",
+    "opts"
+  ],
   "licenses": [
     {
       "type": "MIT",
       "url": "http://github.com/raynos/xtend/raw/master/LICENSE"
     }
   ],
-  "testling": {
-    "files": "test.js",
-    "browsers": [
-      "ie/7..latest",
-      "firefox/16..latest",
-      "firefox/nightly",
-      "chrome/22..latest",
-      "chrome/canary",
-      "opera/12..latest",
-      "opera/next",
-      "safari/5.1..latest",
-      "ipad/6.0..latest",
-      "iphone/6.0..latest"
-    ]
-  },
-  "engines": {
-    "node": ">=0.4"
-  },
-  "gitHead": "94a95d76154103290533b2c55ffa0fe4be16bfef",
-  "_id": "xtend@4.0.0",
-  "_shasum": "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f",
-  "_from": "xtend@>=4.0.0 <5.0.0",
-  "_npmVersion": "1.4.15",
-  "_npmUser": {
-    "name": "raynos",
-    "email": "raynos2@gmail.com"
-  },
+  "main": "immutable",
   "maintainers": [
     {
       "name": "raynos",
       "email": "raynos2@gmail.com"
     }
   ],
-  "dist": {
-    "shasum": "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f",
-    "tarball": "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+  "name": "xtend",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/Raynos/xtend.git"
   },
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "scripts": {
+    "test": "node test"
+  },
+  "testling": {
+    "browsers": [
+      "chrome/22..latest",
+      "chrome/canary",
+      "firefox/16..latest",
+      "firefox/nightly",
+      "ie/7..latest",
+      "ipad/6.0..latest",
+      "iphone/6.0..latest",
+      "opera/12..latest",
+      "opera/next",
+      "safari/5.1..latest"
+    ],
+    "files": "test.js"
+  },
+  "version": "4.0.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/test.js b/deps/npm/node_modules/xtend/test.js
similarity index 100%
rename from deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/test.js
rename to deps/npm/node_modules/xtend/test.js
diff --git a/deps/npm/package.json b/deps/npm/package.json
index 6d2f755d383dd5..274a9f0cb8fb34 100644
--- a/deps/npm/package.json
+++ b/deps/npm/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "2.14.7",
+  "version": "3.3.6",
   "name": "npm",
   "description": "a package manager for JavaScript",
   "keywords": [
-    "package manager",
-    "modules",
     "install",
+    "modules",
+    "package manager",
     "package.json"
   ],
   "preferGlobal": true,
@@ -22,23 +22,20 @@
     "url": "http://github.com/npm/npm/issues"
   },
   "directories": {
+    "bin": "./bin",
     "doc": "./doc",
-    "man": "./man",
     "lib": "./lib",
-    "bin": "./bin"
+    "man": "./man"
   },
   "main": "./lib/npm.js",
   "bin": "./bin/npm-cli.js",
   "dependencies": {
     "abbrev": "~1.0.7",
-    "ansi": "~0.3.0",
     "ansicolors": "~0.3.2",
     "ansistyles": "~0.1.3",
+    "aproba": "~1.0.1",
     "archy": "~1.0.0",
     "async-some": "~1.0.2",
-    "block-stream": "0.0.8",
-    "char-spinner": "~1.0.1",
-    "chmodr": "~1.0.1",
     "chownr": "~1.0.1",
     "cmd-shim": "~2.0.1",
     "columnify": "~1.5.2",
@@ -49,25 +46,27 @@
     "fs-write-stream-atomic": "~1.0.4",
     "fstream": "~1.0.8",
     "fstream-npm": "~1.0.5",
-    "github-url-from-git": "~1.4.0",
-    "github-url-from-username-repo": "~1.0.2",
     "glob": "~5.0.15",
     "graceful-fs": "~4.1.2",
+    "has-unicode": "~1.0.0",
     "hosted-git-info": "~2.1.4",
+    "iferr": "~0.1.5",
     "inflight": "~1.0.4",
     "inherits": "~2.0.1",
     "ini": "~1.3.4",
     "init-package-json": "~1.9.1",
     "lockfile": "~1.0.1",
-    "lru-cache": "~2.7.0",
-    "minimatch": "~2.0.10",
+    "lodash.clonedeep": "~3.0.2",
+    "lodash.union": "~3.1.0",
+    "lodash.uniq": "~3.2.2",
+    "lodash.without": "~3.2.1",
     "mkdirp": "~0.5.1",
     "node-gyp": "~3.0.3",
     "nopt": "~3.0.4",
     "normalize-git-url": "~3.0.1",
     "normalize-package-data": "~2.3.4",
     "npm-cache-filename": "~1.0.2",
-    "npm-install-checks": "~1.0.6",
+    "npm-install-checks": "~2.0.1",
     "npm-package-arg": "~4.0.2",
     "npm-registry-client": "~7.0.7",
     "npm-user-validate": "~0.1.2",
@@ -75,25 +74,25 @@
     "once": "~1.3.2",
     "opener": "~1.4.1",
     "osenv": "~0.1.3",
-    "path-is-inside": "~1.0.0",
+    "path-is-inside": "~1.0.1",
     "read": "~1.0.7",
+    "read-cmd-shim": "~1.0.1",
     "read-installed": "~4.0.3",
     "read-package-json": "~2.0.1",
-    "readable-stream": "~1.1.13",
+    "read-package-tree": "~5.1.2",
     "realize-package-specifier": "~3.0.1",
-    "request": "~2.64.0",
     "retry": "~0.8.0",
     "rimraf": "~2.4.3",
     "semver": "~5.0.3",
     "sha": "~2.0.1",
     "slide": "~1.1.6",
     "sorted-object": "~1.0.0",
-    "spdx": "~0.4.1",
     "tar": "~2.2.1",
     "text-table": "~0.2.0",
     "uid-number": "0.0.6",
     "umask": "~1.1.0",
-    "validate-npm-package-license": "~3.0.1",
+    "unique-filename": "~1.0.0",
+    "unpipe": "~1.0.0",
     "validate-npm-package-name": "~2.2.2",
     "which": "~1.1.2",
     "wrappy": "~1.0.1",
@@ -101,14 +100,11 @@
   },
   "bundleDependencies": [
     "abbrev",
-    "ansi",
     "ansicolors",
     "ansistyles",
+    "aproba",
     "archy",
     "async-some",
-    "block-stream",
-    "char-spinner",
-    "chmodr",
     "chownr",
     "cmd-shim",
     "columnify",
@@ -119,18 +115,20 @@
     "fs-write-stream-atomic",
     "fstream",
     "fstream-npm",
-    "github-url-from-git",
-    "github-url-from-username-repo",
     "glob",
     "graceful-fs",
+    "has-unicode",
     "hosted-git-info",
+    "iferr",
     "inflight",
     "inherits",
     "ini",
     "init-package-json",
     "lockfile",
-    "lru-cache",
-    "minimatch",
+    "lodash.clonedeep",
+    "lodash.union",
+    "lodash.uniq",
+    "lodash.without",
     "mkdirp",
     "node-gyp",
     "nopt",
@@ -147,23 +145,23 @@
     "osenv",
     "path-is-inside",
     "read",
+    "read-cmd-shim",
     "read-installed",
     "read-package-json",
-    "readable-stream",
+    "read-package-tree",
     "realize-package-specifier",
-    "request",
     "retry",
     "rimraf",
     "semver",
     "sha",
     "slide",
     "sorted-object",
-    "spdx",
     "tar",
     "text-table",
     "uid-number",
     "umask",
-    "validate-npm-package-license",
+    "unique-filename",
+    "unpipe",
     "validate-npm-package-name",
     "which",
     "wrappy",
@@ -171,22 +169,23 @@
   ],
   "devDependencies": {
     "deep-equal": "~1.0.1",
-    "marked": "~0.3.3",
+    "estraverse": "~4.1.0",
+    "marked": "~0.3.5",
     "marked-man": "~0.1.5",
     "nock": "~2.13.0",
-    "npm-registry-couchapp": "~2.6.7",
-    "npm-registry-mock": "~1.0.0",
-    "require-inject": "~1.2.0",
-    "sprintf-js": "~1.0.2",
-    "tap": "~1.4.1"
+    "npm-registry-couchapp": "~2.6.11",
+    "npm-registry-mock": "~1.0.1",
+    "require-inject": "~1.2.1",
+    "standard": "~4.5.4",
+    "tap": "~2.0.0"
   },
   "scripts": {
     "dumpconf": "env | grep npm | sort | uniq",
-    "prepublish": "node bin/npm-cli.js prune --prefix=. --no-global && rimraf test/*/*/node_modules && make -j4 doc",
+    "prepublish": "bash scripts/installable.sh && node bin/npm-cli.js prune --prefix=. --no-global && rimraf test/*/*/node_modules && make -j4 doc",
     "preversion": "bash scripts/update-authors.sh && git add AUTHORS && git commit -m \"update AUTHORS\" || true",
     "tap": "tap --timeout 240",
-    "test": "npm run test-tap",
-    "test-all": "npm run test-legacy && npm run test-tap",
+    "test": "standard && npm run test-tap",
+    "test-all": "standard && npm run test-legacy && npm run test-tap",
     "test-legacy": "node ./test/run.js",
     "test-tap": "npm run tap -- \"test/tap/*.js\""
   },
diff --git a/deps/npm/scripts/index-build.js b/deps/npm/scripts/index-build.js
index 21297cc93ec1d3..8fbbf8595d5fd7 100755
--- a/deps/npm/scripts/index-build.js
+++ b/deps/npm/scripts/index-build.js
@@ -1,63 +1,58 @@
 #!/usr/bin/env node
-var fs = require("fs")
-  , path = require("path")
-  , root = path.resolve(__dirname, "..")
-  , glob = require("glob")
-  , conversion = { "cli": 1, "api": 3, "files": 5, "misc": 7 }
-
-glob(root + "/{README.md,doc/*/*.md}", function (er, files) {
-  if (er)
-    throw er
+var fs = require('fs')
+var path = require('path')
+var root = path.resolve(__dirname, '..')
+var glob = require('glob')
+var conversion = { 'cli': 1, 'api': 3, 'files': 5, 'misc': 7 }
+
+glob(root + '/{README.md,doc/*/*.md}', function (er, files) {
+  if (er) throw er
+
   output(files.map(function (f) {
     var b = path.basename(f)
-    if (b === "README.md")
-      return [0, b]
-    if (b === "index.md")
-      return null
+    if (b === 'README.md') return [0, b]
+    if (b === 'index.md') return null
     var s = conversion[path.basename(path.dirname(f))]
     return [s, f]
   }).filter(function (f) {
     return f
   }).sort(function (a, b) {
-    return (a[0] === b[0])
-           ? ( path.basename(a[1]) === "npm.md" ? -1
-             : path.basename(b[1]) === "npm.md" ? 1
-             : a[1] > b[1] ? 1 : -1 )
-           : a[0] - b[0]
+    return (a[0] === b[0]) ?
+              (path.basename(a[1]) === 'npm.md' ? -1 :
+               path.basename(b[1]) === 'npm.md' ? 1 :
+               a[1] > b[1] ? 1 : -1) :
+              a[0] - b[0]
   }))
 })
 
-return
-
 function output (files) {
   console.log(
-    "npm-index(7) -- Index of all npm documentation\n" +
-    "==============================================\n")
+    'npm-index(7) -- Index of all npm documentation\n' +
+    '==============================================\n')
 
   writeLines(files, 0)
-  writeLines(files, 1, "Command Line Documentation", "Using npm on the command line")
-  writeLines(files, 3, "API Documentation", "Using npm in your Node programs")
-  writeLines(files, 5, "Files", "File system structures npm uses")
-  writeLines(files, 7, "Misc", "Various other bits and bobs")
+  writeLines(files, 1, 'Command Line Documentation', 'Using npm on the command line')
+  writeLines(files, 3, 'API Documentation', 'Using npm in your Node programs')
+  writeLines(files, 5, 'Files', 'File system structures npm uses')
+  writeLines(files, 7, 'Misc', 'Various other bits and bobs')
 }
 
 function writeLines (files, sxn, heading, desc) {
   if (heading) {
-    console.log("## %s\n\n%s\n", heading, desc)
+    console.log('## %s\n\n%s\n', heading, desc)
   }
   files.filter(function (f) {
     return f[0] === sxn
   }).forEach(writeLine)
 }
 
-
 function writeLine (sd) {
   var sxn = sd[0] || 1
-    , doc = sd[1]
-    , d = path.basename(doc, ".md")
+  var doc = sd[1]
+  var d = path.basename(doc, '.md')
 
-  var content = fs.readFileSync(doc, "utf8").split("\n")[0].split("-- ")[1]
+  var content = fs.readFileSync(doc, 'utf8').split('\n')[0].split('-- ')[1]
 
-  console.log("### %s(%d)\n", d, sxn)
-  console.log(content + "\n")
+  console.log('### %s(%d)\n', d, sxn)
+  console.log(content + '\n')
 }
diff --git a/deps/npm/scripts/installable.sh b/deps/npm/scripts/installable.sh
new file mode 100644
index 00000000000000..1d5a90c290bcc8
--- /dev/null
+++ b/deps/npm/scripts/installable.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+npmver=$(perl -E "say q{$npm_config_user_agent} =~ m{/(\S+)}")
+
+if semver -r ^3.0.0-0 $npmver > /dev/null; then
+	echo "Packaging with $npmver"
+else
+	echo "Packaging or installing npm@$npm_package_version with npm@$npmver is impossible." 1>&2
+	echo "Please install npm@^3.0.0-0 from the registry and use that or run your command with" 1>&2
+	echo "this version of npm with:" 1>&2
+	npmargs=$(node -e "a=$npm_config_argv; console.log(a.original.join(' '))")
+	echo "    $npm_node_execpath $PWD $npmargs" 1>&2
+	exit 1
+fi
diff --git a/deps/npm/scripts/publish-tag.js b/deps/npm/scripts/publish-tag.js
index 046ec9888109c4..d0c04556e1b322 100644
--- a/deps/npm/scripts/publish-tag.js
+++ b/deps/npm/scripts/publish-tag.js
@@ -1,3 +1,3 @@
-var semver = require("semver")
-var version = semver.parse(require("../package.json").version)
+var semver = require('semver')
+var version = semver.parse(require('../package.json').version)
 console.log('v%s.%s-next', version.major, version.minor)
diff --git a/deps/npm/test/common.js b/deps/npm/test/common.js
deleted file mode 100644
index 2755056b1b491c..00000000000000
--- a/deps/npm/test/common.js
+++ /dev/null
@@ -1,7 +0,0 @@
-
-// whatever, it's just tests.
-;["util","assert"].forEach(function (thing) {
-  thing = require("thing")
-  for (var i in thing) global[i] = thing[i]
-}
-
diff --git a/deps/npm/test/disabled/package-config/test.js b/deps/npm/test/disabled/package-config/test.js
index 7337b237b5f4fb..386891d312167e 100755
--- a/deps/npm/test/disabled/package-config/test.js
+++ b/deps/npm/test/disabled/package-config/test.js
@@ -1,17 +1,20 @@
 #!/usr/bin/env node
 
 var env = process.env
-  , orig = require(process.env.npm_package_name+"/package.json").config
-  , assert = require("assert")
+var orig = require(process.env.npm_package_name + '/package.json').config
+var assert = require('assert')
 
-console.log("Before running this test, do:\n"
-           +"  npm config set package-config:foo boo\n"
-           +"or else it's about to fail.")
-assert.equal(env.npm_package_config_foo, "boo", "foo != boo")
-assert.equal(orig.foo, "bar", "original foo != bar")
-assert.equal(env["npm_config_package-config:foo"], "boo",
-             "package-config:foo != boo")
-console.log({ foo: env.npm_package_config_foo
-            , orig_foo: orig.foo
-            , "package-config:foo": env["npm_config_package-config:foo"]
-            })
+console.log(
+  'Before running this test, do:\n' +
+  '  npm config set package-config:foo boo\n' +
+  "or else it's about to fail."
+)
+assert.equal(env.npm_package_config_foo, 'boo', 'foo != boo')
+assert.equal(orig.foo, 'bar', 'original foo != bar')
+assert.equal(env['npm_config_package-config:foo'], 'boo',
+             'package-config:foo != boo')
+console.log({
+  foo: env.npm_package_config_foo,
+  orig_foo: orig.foo,
+  'package-config:foo': env['npm_config_package-config:foo']
+})
diff --git a/deps/npm/test/fixtures/config/userconfig-with-gc b/deps/npm/test/fixtures/config/userconfig-with-gc
index 62ad80be113e5e..ad4dd54c1ed00c 100644
--- a/deps/npm/test/fixtures/config/userconfig-with-gc
+++ b/deps/npm/test/fixtures/config/userconfig-with-gc
@@ -1,22 +1,24 @@
-globalconfig=/Users/zkat/Documents/code/npm/test/fixtures/config/globalconfig
-email=i@izs.me
-env-thing=asdf
-init.author.name=Isaac Z. Schlueter
-init.author.email=i@izs.me
-init.author.url=http://blog.izs.me/
-init.version=1.2.3
-proprietary-attribs=false
-npm:publishtest=true
-_npmjs.org:couch=https://admin:password@localhost:5984/registry
-npm-www:nocache=1
-sign-git-tag=false
-message=v%s
-strict-ssl=false
-_auth="dXNlcm5hbWU6cGFzc3dvcmQ="
+globalconfig = /Users/rebecca/code/release/npm-3/test/fixtures/config/globalconfig
+email = i@izs.me
+env-thing = ${random_env_var}
+init.author.name = Isaac Z. Schlueter
+init.author.email = i@izs.me
+init.author.url = http://blog.izs.me/
+init.version = 1.2.3
+proprietary-attribs = false
+npm:publishtest = true
+_npmjs.org:couch = https://admin:password@localhost:5984/registry
+npm-www:nocache = 1
+nodedir = /Users/isaacs/dev/js/node-v0.8
+sign-git-tag = true
+message = v%s
+strict-ssl = false
+tmp = ~/.tmp
+_auth = dXNlcm5hbWU6cGFzc3dvcmQ=
 
 [_token]
-AuthSession=yabba-dabba-doodle
-version=1
-expires=1345001053415
-path=/
-httponly=true
+AuthSession = yabba-dabba-doodle
+version = 1
+expires = 1345001053415
+path = /
+httponly = true
diff --git a/deps/npm/test/packages/npm-test-blerg/test.js b/deps/npm/test/packages/npm-test-blerg/test.js
index f548458ac042c5..cc8d2da546e5b5 100644
--- a/deps/npm/test/packages/npm-test-blerg/test.js
+++ b/deps/npm/test/packages/npm-test-blerg/test.js
@@ -1,5 +1,4 @@
-
-var assert = require("assert")
-assert.equal(undefined, process.env.npm_config__password, "password exposed!")
-assert.equal(undefined, process.env.npm_config__auth, "auth exposed!")
-assert.equal(undefined, process.env.npm_config__authCrypt, "authCrypt exposed!")
+var assert = require('assert')
+assert.equal(undefined, process.env.npm_config__password, 'password exposed!')
+assert.equal(undefined, process.env.npm_config__auth, 'auth exposed!')
+assert.equal(undefined, process.env.npm_config__authCrypt, 'authCrypt exposed!')
diff --git a/deps/npm/test/packages/npm-test-blerg3/test.js b/deps/npm/test/packages/npm-test-blerg3/test.js
index f548458ac042c5..cc8d2da546e5b5 100644
--- a/deps/npm/test/packages/npm-test-blerg3/test.js
+++ b/deps/npm/test/packages/npm-test-blerg3/test.js
@@ -1,5 +1,4 @@
-
-var assert = require("assert")
-assert.equal(undefined, process.env.npm_config__password, "password exposed!")
-assert.equal(undefined, process.env.npm_config__auth, "auth exposed!")
-assert.equal(undefined, process.env.npm_config__authCrypt, "authCrypt exposed!")
+var assert = require('assert')
+assert.equal(undefined, process.env.npm_config__password, 'password exposed!')
+assert.equal(undefined, process.env.npm_config__auth, 'auth exposed!')
+assert.equal(undefined, process.env.npm_config__authCrypt, 'authCrypt exposed!')
diff --git a/deps/npm/test/packages/npm-test-bundled-git/test.js b/deps/npm/test/packages/npm-test-bundled-git/test.js
index 4fcc54cafe4b34..793cc55a881cd2 100644
--- a/deps/npm/test/packages/npm-test-bundled-git/test.js
+++ b/deps/npm/test/packages/npm-test-bundled-git/test.js
@@ -1,4 +1,4 @@
-var a = require("./node_modules/glob/node_modules/minimatch/package.json")
-var e = require("./minimatch-expected.json")
-var assert = require("assert")
+var a = require('./node_modules/glob/node_modules/minimatch/package.json')
+var e = require('./minimatch-expected.json')
+var assert = require('assert')
 assert.deepEqual(a, e, "didn't get expected minimatch/package.json")
diff --git a/deps/npm/test/packages/npm-test-ignore-nested-nm/test.js b/deps/npm/test/packages/npm-test-ignore-nested-nm/test.js
index 308c66b500be99..18a0f0b56b9ba5 100644
--- a/deps/npm/test/packages/npm-test-ignore-nested-nm/test.js
+++ b/deps/npm/test/packages/npm-test-ignore-nested-nm/test.js
@@ -1,2 +1,2 @@
-fs = require('fs')
+var fs = require('fs')
 fs.statSync(__dirname + '/lib/node_modules/foo')
diff --git a/deps/npm/test/packages/npm-test-missing-bindir/test.js b/deps/npm/test/packages/npm-test-missing-bindir/test.js
index f548458ac042c5..cc8d2da546e5b5 100644
--- a/deps/npm/test/packages/npm-test-missing-bindir/test.js
+++ b/deps/npm/test/packages/npm-test-missing-bindir/test.js
@@ -1,5 +1,4 @@
-
-var assert = require("assert")
-assert.equal(undefined, process.env.npm_config__password, "password exposed!")
-assert.equal(undefined, process.env.npm_config__auth, "auth exposed!")
-assert.equal(undefined, process.env.npm_config__authCrypt, "authCrypt exposed!")
+var assert = require('assert')
+assert.equal(undefined, process.env.npm_config__password, 'password exposed!')
+assert.equal(undefined, process.env.npm_config__auth, 'auth exposed!')
+assert.equal(undefined, process.env.npm_config__authCrypt, 'authCrypt exposed!')
diff --git a/deps/npm/test/packages/npm-test-optional-deps/test.js b/deps/npm/test/packages/npm-test-optional-deps/test.js
index 2232906d64711b..b9dc2c79bbd4f5 100644
--- a/deps/npm/test/packages/npm-test-optional-deps/test.js
+++ b/deps/npm/test/packages/npm-test-optional-deps/test.js
@@ -1,9 +1,9 @@
-var fs = require("fs")
-var assert = require("assert")
-var path = require("path")
+var fs = require('fs')
+var assert = require('assert')
+var path = require('path')
 
 // sax should be the only dep that ends up installed
 
-var dir = path.resolve(__dirname, "node_modules")
-assert.deepEqual(fs.readdirSync(dir), ["sax"])
-assert.equal(require("sax/package.json").version, "0.3.5")
+var dir = path.resolve(__dirname, 'node_modules')
+assert.deepEqual(fs.readdirSync(dir), ['sax'])
+assert.equal(require('sax/package.json').version, '0.3.5')
diff --git a/deps/npm/test/packages/npm-test-shrinkwrap/npm-shrinkwrap.json b/deps/npm/test/packages/npm-test-shrinkwrap/npm-shrinkwrap.json
index 09a034141f7f6e..4f8b22d0554345 100644
--- a/deps/npm/test/packages/npm-test-shrinkwrap/npm-shrinkwrap.json
+++ b/deps/npm/test/packages/npm-test-shrinkwrap/npm-shrinkwrap.json
@@ -2,22 +2,11 @@
   "name": "npm-test-shrinkwrap",
   "version": "0.0.0",
   "dependencies": {
-    "npm-test-single-file": {
-      "version": "1.2.3",
-      "resolved": "https://gist.github.com/isaacs/1837112/raw/9ef57a59fc22aeb1d1ca346b68826dcb638b8416/index.js"
-    },
     "glob": {
       "version": "3.1.5",
+      "from": "git://github.com/isaacs/node-glob.git#npm-test",
       "resolved": "git://github.com/isaacs/node-glob.git#67bda227fd7a559cca5620307c7d30a6732a792f",
       "dependencies": {
-        "minimatch": {
-          "version": "0.2.1",
-          "dependencies": {
-            "lru-cache": {
-              "version": "1.0.5"
-            }
-          }
-        },
         "graceful-fs": {
           "version": "1.1.5",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.1.5.tgz",
@@ -31,6 +20,14 @@
         "inherits": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
+        },
+        "minimatch": {
+          "version": "0.2.1",
+          "dependencies": {
+            "lru-cache": {
+              "version": "1.0.5"
+            }
+          }
         }
       }
     },
@@ -43,6 +40,10 @@
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-1.0.5.tgz"
         }
       }
+    },
+    "npm-test-single-file": {
+      "version": "1.2.3",
+      "resolved": "https://gist.github.com/isaacs/1837112/raw/9ef57a59fc22aeb1d1ca346b68826dcb638b8416/index.js"
     }
   }
 }
diff --git a/deps/npm/test/packages/npm-test-shrinkwrap/test.js b/deps/npm/test/packages/npm-test-shrinkwrap/test.js
index fba90ec6516311..34638c2ce5148b 100644
--- a/deps/npm/test/packages/npm-test-shrinkwrap/test.js
+++ b/deps/npm/test/packages/npm-test-shrinkwrap/test.js
@@ -1,5 +1,4 @@
-var path = require("path")
-var assert = require("assert")
+var assert = require('assert')
 
 process.env.npm_config_prefix = process.cwd()
 delete process.env.npm_config_global
@@ -7,13 +6,13 @@ delete process.env.npm_config_depth
 
 var npm = process.env.npm_execpath
 
-require("child_process").execFile(process.execPath, [npm, "ls", "--json"], {
-    stdio: "pipe", env: process.env, cwd: process.cwd() },
+require('child_process').execFile(process.execPath, [npm, 'ls', '--json'], {
+    stdio: 'pipe', env: process.env, cwd: process.cwd() },
     function (err, stdout, stderr) {
   if (err) throw err
 
   var actual = JSON.parse(stdout)
-  var expected = require("./npm-shrinkwrap.json")
+  var expected = require('./npm-shrinkwrap.json')
   rmFrom(actual)
   actual = actual.dependencies
   rmFrom(expected)
@@ -26,10 +25,12 @@ require("child_process").execFile(process.execPath, [npm, "ls", "--json"], {
 
 function rmFrom (obj) {
   for (var i in obj) {
-    if (i === "from")
+    if (i === 'from') {
       delete obj[i]
-    else if (i === "dependencies")
-      for (var j in obj[i])
+    } else if (i === 'dependencies') {
+      for (var j in obj[i]) {
         rmFrom(obj[i][j])
+      }
+    }
   }
 }
diff --git a/deps/npm/test/run.js b/deps/npm/test/run.js
index 5b33e68ab47a77..c9eb9756906a09 100644
--- a/deps/npm/test/run.js
+++ b/deps/npm/test/run.js
@@ -1,35 +1,35 @@
 // Everything in this file uses child processes, because we're
 // testing a command line utility.
 
-var chain = require("slide").chain
-var child_process = require("child_process")
-var path = require("path")
-  , testdir = __dirname
-  , fs = require("graceful-fs")
-  , npmpkg = path.dirname(testdir)
-  , npmcli = path.resolve(npmpkg, "bin", "npm-cli.js")
-
-var temp = process.env.TMPDIR
-         || process.env.TMP
-         || process.env.TEMP
-         || ( process.platform === "win32"
-            ? "c:\\windows\\temp"
-            : "/tmp" )
-
-temp = path.resolve(temp, "npm-test-" + process.pid)
-
-var root = path.resolve(temp, "root")
-  , cache = path.resolve(temp, "npm_cache")
+var chain = require('slide').chain
+var child_process = require('child_process')
+var path = require('path')
+var testdir = __dirname
+var fs = require('graceful-fs')
+var npmpkg = path.dirname(testdir)
+var npmcli = path.resolve(npmpkg, 'bin', 'npm-cli.js')
+
+var temp = process.env.TMPDIR ||
+           process.env.TMP ||
+           process.env.TEMP ||
+           (process.platform === 'win32' ?
+              'c:\\windows\\temp' :
+              '/tmp')
+
+temp = path.resolve(temp, 'npm-test-' + process.pid)
+
+var root = path.resolve(temp, 'root')
+var cache = path.resolve(temp, 'npm_cache')
 
 var failures = 0
-  , mkdir = require("mkdirp")
-  , rimraf = require("rimraf")
+var mkdir = require('mkdirp')
+var rimraf = require('rimraf')
 
-var pathEnvSplit = process.platform === "win32" ? ";" : ":"
-  , pathEnv = process.env.PATH.split(pathEnvSplit)
-  , npmPath = process.platform === "win32" ? root : path.join(root, "bin")
+var pathEnvSplit = process.platform === 'win32' ? ';' : ':'
+var pathEnv = process.env.PATH.split(pathEnvSplit)
+var npmPath = process.platform === 'win32' ? root : path.join(root, 'bin')
 
-pathEnv.unshift(npmPath, path.join(root, "node_modules", ".bin"))
+pathEnv.unshift(npmPath, path.join(root, 'node_modules', '.bin'))
 
 // lastly, make sure that we get the same node that is being used to do
 // run this script.  That's very important, especially when running this
@@ -42,66 +42,65 @@ Object.keys(process.env).forEach(function (i) {
   env[i] = process.env[i]
 })
 env.npm_config_prefix = root
-env.npm_config_color = "always"
-env.npm_config_global = "true"
+env.npm_config_color = 'always'
+env.npm_config_global = 'true'
 // have to set this to false, or it'll try to test itself forever
-env.npm_config_npat = "false"
+env.npm_config_npat = 'false'
 env.PATH = pathEnv.join(pathEnvSplit)
-env.NODE_PATH = path.join(root, "node_modules")
+env.NODE_PATH = path.join(root, 'node_modules')
 env.npm_config_cache = cache
 
-
-
 function cleanup (cb) {
   if (failures !== 0) return
   rimraf(root, function (er) {
     if (er) cb(er)
-    mkdir(root, 0755, cb)
+    mkdir(root, parseInt('0755', 8), cb)
   })
 }
 
 function prefix (content, pref) {
-  return pref + (content.trim().split(/\r?\n/).join("\n" + pref))
+  return pref + (content.trim().split(/\r?\n/).join('\n' + pref))
 }
 
 var execCount = 0
 function exec (cmd, cwd, shouldFail, cb) {
-  if (typeof shouldFail === "function") {
-    cb = shouldFail, shouldFail = false
+  if (typeof shouldFail === 'function') {
+    cb = shouldFail
+    shouldFail = false
   }
-  console.error("\n+"+cmd + (shouldFail ? " (expect failure)" : ""))
+  console.error('\n+' + cmd + (shouldFail ? ' (expect failure)' : ''))
 
   // special: replace 'node' with the current execPath,
   // and 'npm' with the thing we installed.
   var cmdShow = cmd
-  var npmReplace = path.resolve(npmPath, "npm")
+  var npmReplace = path.resolve(npmPath, 'npm')
   var nodeReplace = process.execPath
-  if (process.platform === "win32") {
+  if (process.platform === 'win32') {
     npmReplace = '"' + npmReplace + '"'
     nodeReplace = '"' + nodeReplace + '"'
   }
-  cmd = cmd.replace(/^npm /, npmReplace + " ")
-  cmd = cmd.replace(/^node /, nodeReplace + " ")
+  cmd = cmd.replace(/^npm /, npmReplace + ' ')
+  cmd = cmd.replace(/^node /, nodeReplace + ' ')
 
-  console.error("$$$$$$ cd %s; PATH=%s %s", cwd, env.PATH, cmd)
+  console.error('$$$$$$ cd %s; PATH=%s %s', cwd, env.PATH, cmd)
 
   child_process.exec(cmd, {cwd: cwd, env: env}, function (er, stdout, stderr) {
-    console.error("$$$$$$ after command", cmd, cwd)
+    console.error('$$$$$$ after command', cmd, cwd)
     if (stdout) {
-      console.error(prefix(stdout, " 1> "))
+      console.error(prefix(stdout, ' 1> '))
     }
     if (stderr) {
-      console.error(prefix(stderr, " 2> "))
+      console.error(prefix(stderr, ' 2> '))
     }
 
-    execCount ++
+    execCount++
     if (!shouldFail && !er || shouldFail && er) {
-      // stdout = (""+stdout).trim()
-      console.log("ok " + execCount + " " + cmdShow)
+      // stdout = (''+stdout).trim()
+      console.log('ok ' + execCount + ' ' + cmdShow)
       return cb()
     } else {
-      console.log("not ok " + execCount + " " + cmdShow)
-      cb(new Error("failed "+cmdShow))
+      console.log('not ok ' + execCount + ' ' + cmdShow)
+      cb(new Error('failed ' + cmdShow))
     }
   })
 }
@@ -121,23 +120,21 @@ function flatten (arr) {
 function setup (cb) {
   cleanup(function (er) {
     if (er) return cb(er)
-    exec("node \""+npmcli+"\" install \""+npmpkg+"\"", root, false, cb)
+    exec('node \'' + npmcli + '\' install \'' + npmpkg + '\'', root, false, cb)
   })
 }
 
 function main (cb) {
-  console.log("# testing in %s", temp)
-  console.log("# global prefix = %s", root)
-
-
+  console.log('# testing in %s', temp)
+  console.log('# global prefix = %s', root)
 
   failures = 0
 
   process.chdir(testdir)
-  var base = path.resolve(root, path.join("lib", "node_modules"))
+  var base = path.resolve(root, path.join('lib', 'node_modules'))
 
   // get the list of packages
-  var packages = fs.readdirSync(path.resolve(testdir, "packages"))
+  var packages = fs.readdirSync(path.resolve(testdir, 'packages'))
   packages = packages.filter(function (p) {
     return p && !p.match(/^\./)
   })
@@ -146,41 +143,44 @@ function main (cb) {
 
   function installAllThenTestAll () {
     var packagesToRm = packages.slice(0)
-    if (process.platform !== "win32") {
+    if (process.platform !== 'win32') {
       // Windows can't handle npm rm npm due to file-in-use issues.
-      packagesToRm.push("npm")
+      packagesToRm.push('npm')
     }
 
     chain(
-        [ setup
-        , [ exec, "npm install "+npmpkg, testdir ]
-        , [ execChain, packages.map(function (p) {
-              return [ "npm install packages/"+p, testdir ]
-            }) ]
-        , [ execChain, packages.map(function (p) {
-              return [ "npm test -ddd", path.resolve(base, p) ]
-            }) ]
-        , [ execChain, packagesToRm.map(function (p) {
-              return [ "npm rm "+p, root ]
-            }) ]
-        , installAndTestEach
-        ]
-      , cb
-      )
+      [
+        setup,
+        [exec, 'npm install ' + npmpkg, testdir],
+        [execChain, packages.map(function (p) {
+          return [ 'npm install packages/' + p, testdir ]
+        })],
+        [execChain, packages.map(function (p) {
+          return [ 'npm test -ddd', path.resolve(base, p) ]
+        })],
+        [execChain, packagesToRm.map(function (p) {
+          return [ 'npm rm ' + p, root ]
+        })],
+        installAndTestEach
+      ],
+      cb
+    )
   }
 
   function installAndTestEach (cb) {
     var thingsToChain = [
-        setup
-        , [ execChain, flatten(packages.map(function (p) {
-              return [ [ "npm install packages/"+p, testdir ]
-                     , [ "npm test", path.resolve(base, p) ]
-                     , [ "npm rm "+p, root ] ]
-            })) ]
+        setup,
+        [execChain, flatten(packages.map(function (p) {
+          return [
+            ['npm install packages/' + p, testdir],
+            ['npm test', path.resolve(base, p)],
+            ['npm rm ' + p, root]
+          ]
+        }))]
       ]
-    if (process.platform !== "win32") {
+    if (process.platform !== 'win32') {
       // Windows can't handle npm rm npm due to file-in-use issues.
-      thingsToChain.push([exec, "npm rm npm", testdir])
+      thingsToChain.push([exec, 'npm rm npm', testdir])
     }
 
     chain(thingsToChain, cb)
@@ -188,6 +188,6 @@ function main (cb) {
 }
 
 main(function (er) {
-  console.log("1.." + execCount)
+  console.log('1..' + execCount)
   if (er) throw er
 })
diff --git a/deps/npm/test/tap/00-check-mock-dep.js b/deps/npm/test/tap/00-check-mock-dep.js
index 1c862317c9a971..cdc7af852b344c 100644
--- a/deps/npm/test/tap/00-check-mock-dep.js
+++ b/deps/npm/test/tap/00-check-mock-dep.js
@@ -1,17 +1,17 @@
-console.log("TAP Version 13")
+console.log('TAP Version 13')
 
-process.on("uncaughtException", function (er) {
+process.on('uncaughtException', function (er) {
   if (er) { throw er }
-  console.log("not ok - Failed checking mock registry dep. Expect much fail!")
-  console.log("1..1")
+  console.log('not ok - Failed checking mock registry dep. Expect much fail!')
+  console.log('1..1')
   process.exit(1)
 })
 
-var assert = require("assert")
-var semver = require("semver")
-var mock = require("npm-registry-mock/package.json").version
-var req = require("../../package.json").devDependencies["npm-registry-mock"]
+var assert = require('assert')
+var semver = require('semver')
+var mock = require('npm-registry-mock/package.json').version
+var req = require('../../package.json').devDependencies['npm-registry-mock']
 
 assert(semver.satisfies(mock, req))
-console.log("ok")
-console.log("1..1")
+console.log('ok')
+console.log('1..1')
diff --git a/deps/npm/test/tap/00-config-setup.js b/deps/npm/test/tap/00-config-setup.js
index 0daf0decd6a546..0d267851eb7fea 100644
--- a/deps/npm/test/tap/00-config-setup.js
+++ b/deps/npm/test/tap/00-config-setup.js
@@ -1,33 +1,33 @@
-var fs = require("graceful-fs")
-var path = require("path")
-var userconfigSrc = path.resolve(__dirname, "..", "fixtures", "config", "userconfig")
-exports.userconfig = userconfigSrc + "-with-gc"
-exports.globalconfig = path.resolve(__dirname, "..", "fixtures", "config", "globalconfig")
-exports.builtin = path.resolve(__dirname, "..", "fixtures", "config", "builtin")
-exports.malformed = path.resolve(__dirname, "..", "fixtures", "config", "malformed")
+var fs = require('graceful-fs')
+var path = require('path')
+var userconfigSrc = path.resolve(__dirname, '..', 'fixtures', 'config', 'userconfig')
+exports.userconfig = userconfigSrc + '-with-gc'
+exports.globalconfig = path.resolve(__dirname, '..', 'fixtures', 'config', 'globalconfig')
+exports.builtin = path.resolve(__dirname, '..', 'fixtures', 'config', 'builtin')
+exports.malformed = path.resolve(__dirname, '..', 'fixtures', 'config', 'malformed')
 exports.ucData =
   { globalconfig: exports.globalconfig,
-    email: "i@izs.me",
-    "env-thing": "asdf",
-    "init.author.name": "Isaac Z. Schlueter",
-    "init.author.email": "i@izs.me",
-    "init.author.url": "http://blog.izs.me/",
-    "init.version": "1.2.3",
-    "proprietary-attribs": false,
-    "npm:publishtest": true,
-    "_npmjs.org:couch": "https://admin:password@localhost:5984/registry",
-    "npm-www:nocache": "1",
-    nodedir: "/Users/isaacs/dev/js/node-v0.8",
-    "sign-git-tag": true,
-    message: "v%s",
-    "strict-ssl": false,
-    "tmp": process.env.HOME + "/.tmp",
-    _auth: "dXNlcm5hbWU6cGFzc3dvcmQ=",
+    email: 'i@izs.me',
+    'env-thing': 'asdf',
+    'init.author.name': 'Isaac Z. Schlueter',
+    'init.author.email': 'i@izs.me',
+    'init.author.url': 'http://blog.izs.me/',
+    'init.version': '1.2.3',
+    'proprietary-attribs': false,
+    'npm:publishtest': true,
+    '_npmjs.org:couch': 'https://admin:password@localhost:5984/registry',
+    'npm-www:nocache': '1',
+    nodedir: '/Users/isaacs/dev/js/node-v0.8',
+    'sign-git-tag': true,
+    message: 'v%s',
+    'strict-ssl': false,
+    'tmp': process.env.HOME + '/.tmp',
+    _auth: 'dXNlcm5hbWU6cGFzc3dvcmQ=',
     _token:
-     { AuthSession: "yabba-dabba-doodle",
-       version: "1",
-       expires: "1345001053415",
-       path: "/",
+     { AuthSession: 'yabba-dabba-doodle',
+       version: '1',
+       expires: '1345001053415',
+       path: '/',
        httponly: true } }
 
 // set the userconfig in the env
@@ -39,21 +39,21 @@ Object.keys(process.env).forEach(function (k) {
 })
 process.env.npm_config_userconfig = exports.userconfig
 process.env.npm_config_other_env_thing = 1000
-process.env.random_env_var = "asdf"
-process.env.npm_config__underbar_env_thing = "underful"
+process.env.random_env_var = 'asdf'
+process.env.npm_config__underbar_env_thing = 'underful'
 process.env.NPM_CONFIG_UPPERCASE_ENV_THING = 42
 
 exports.envData = {
   userconfig: exports.userconfig,
-  "_underbar-env-thing": "underful",
-  "uppercase-env-thing": "42",
-  "other-env-thing": "1000"
+  '_underbar-env-thing': 'underful',
+  'uppercase-env-thing': '42',
+  'other-env-thing': '1000'
 }
 exports.envDataFix = {
   userconfig: exports.userconfig,
-  "_underbar-env-thing": "underful",
-  "uppercase-env-thing": 42,
-  "other-env-thing": 1000
+  '_underbar-env-thing': 'underful',
+  'uppercase-env-thing': 42,
+  'other-env-thing': 1000
 }
 
 var projectConf = path.resolve(__dirname, '..', '..', '.npmrc')
@@ -75,9 +75,9 @@ try {
 if (module === require.main) {
   // set the globalconfig in the userconfig
   var uc = fs.readFileSync(userconfigSrc)
-  var gcini = "globalconfig = " + exports.globalconfig + "\n"
+  var gcini = 'globalconfig = ' + exports.globalconfig + '\n'
   fs.writeFileSync(exports.userconfig, gcini + uc)
 
-  console.log("1..1")
-  console.log("ok 1 setup done")
+  console.log('1..1')
+  console.log('ok 1 setup done')
 }
diff --git a/deps/npm/test/tap/00-verify-bundle-deps.js b/deps/npm/test/tap/00-verify-bundle-deps.js
index 9d16b2d3b1220b..75ea81c593e76f 100644
--- a/deps/npm/test/tap/00-verify-bundle-deps.js
+++ b/deps/npm/test/tap/00-verify-bundle-deps.js
@@ -1,27 +1,16 @@
-var fs = require("fs")
-var path = require("path")
-var test = require("tap").test
+var test = require('tap').test
 
-var manifest = require("../../package.json")
+var manifest = require('../../package.json')
 var deps = Object.keys(manifest.dependencies)
-var dev = Object.keys(manifest.devDependencies)
 var bundled = manifest.bundleDependencies
 
-test("all deps are bundled deps or dev deps", function (t) {
+test('all deps are bundled deps or dev deps', function (t) {
   deps.forEach(function (name) {
     t.assert(
       bundled.indexOf(name) !== -1,
-      name + " is in bundledDependencies"
+      name + ' is in bundledDependencies'
     )
   })
 
-  t.same(
-    fs.readdirSync(path.resolve(__dirname, "../../node_modules")).filter(function (name) {
-      return (dev.indexOf(name) === -1) && (name !== ".bin")
-    }).sort(),
-    bundled.sort(),
-    "bundleDependencies matches what's in node_modules"
-  )
-
   t.end()
 })
diff --git a/deps/npm/test/tap/00-verify-ls-ok.js b/deps/npm/test/tap/00-verify-ls-ok.js
index aa6acdbc56f8ac..2d20e500b71cd8 100644
--- a/deps/npm/test/tap/00-verify-ls-ok.js
+++ b/deps/npm/test/tap/00-verify-ls-ok.js
@@ -1,18 +1,18 @@
-var common = require("../common-tap")
-var test = require("tap").test
-var path = require("path")
-var cwd = path.resolve(__dirname, "..", "..")
-var fs = require("fs")
+var common = require('../common-tap')
+var test = require('tap').test
+var path = require('path')
+var cwd = path.resolve(__dirname, '..', '..')
+var fs = require('fs')
 
-test("npm ls in npm", function (t) {
-  t.ok(fs.existsSync(cwd), "ensure that the path we are calling ls within exists")
+test('npm ls in npm', function (t) {
+  t.ok(fs.existsSync(cwd), 'ensure that the path we are calling ls within exists')
   var files = fs.readdirSync(cwd)
-  t.notEqual(files.length, 0, "ensure there are files in the directory we are to ls")
+  t.notEqual(files.length, 0, 'ensure there are files in the directory we are to ls')
 
-  var opt = { cwd: cwd, stdio: [ "ignore", "ignore", 2 ] }
-  common.npm(["ls"], opt, function (err, code) {
-    t.ifError(err, "error should not exist")
-    t.equal(code, 0, "npm ls exited with code")
+  var opt = { cwd: cwd, stdio: [ 'ignore', 'ignore', 2 ] }
+  common.npm(['ls'], opt, function (err, code) {
+    t.ifError(err, 'error should not exist')
+    t.equal(code, 0, 'npm ls exited with code')
     t.end()
   })
 })
diff --git a/deps/npm/test/tap/404-parent.js b/deps/npm/test/tap/404-parent.js
index eb8ae9bb150d8b..a8bd951636e888 100644
--- a/deps/npm/test/tap/404-parent.js
+++ b/deps/npm/test/tap/404-parent.js
@@ -1,54 +1,57 @@
-var common = require("../common-tap.js")
-var test = require("tap").test
-var npm = require("../../")
-var osenv = require("osenv")
-var path = require("path")
-var fs = require("fs")
-var rimraf = require("rimraf")
-var mkdirp = require("mkdirp")
-var pkg = path.resolve(__dirname, "404-parent")
-var mr = require("npm-registry-mock")
+var common = require('../common-tap.js')
+var test = require('tap').test
+var npm = require('../../')
+var osenv = require('osenv')
+var path = require('path')
+var fs = require('fs')
+var rimraf = require('rimraf')
+var mkdirp = require('mkdirp')
+var pkg = path.resolve(__dirname, '404-parent')
+var mr = require('npm-registry-mock')
 
-test("404-parent: if parent exists, specify parent in error message", function (t) {
+test('404-parent: if parent exists, specify parent in error message', function (t) {
   setup()
-  rimraf.sync(path.resolve(pkg, "node_modules"))
+  rimraf.sync(path.resolve(pkg, 'node_modules'))
   performInstall(function (err) {
-    t.ok(err instanceof Error, "error was returned")
-    t.ok(err.parent === "404-parent-test", "error's parent set")
+    t.ok(err instanceof Error, 'error was returned')
+    t.ok(err.parent === '404-parent-test', "error's parent set")
     t.end()
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   process.chdir(osenv.tmpdir())
   rimraf.sync(pkg)
   t.end()
 })
 
-function setup() {
+function setup () {
   mkdirp.sync(pkg)
-  mkdirp.sync(path.resolve(pkg, "cache"))
-  fs.writeFileSync(path.resolve(pkg, "package.json"), JSON.stringify({
-    author: "Evan Lucas",
-    name: "404-parent-test",
-    version: "0.0.0",
-    description: "Test for 404-parent",
+  mkdirp.sync(path.resolve(pkg, 'cache'))
+  fs.writeFileSync(path.resolve(pkg, 'package.json'), JSON.stringify({
+    author: 'Evan Lucas',
+    name: '404-parent-test',
+    version: '0.0.0',
+    description: 'Test for 404-parent',
     dependencies: {
-      "test-npm-404-parent-test": "*"
+      'test-npm-404-parent-test': '*'
     }
-  }), "utf8")
+  }), 'utf8')
   process.chdir(pkg)
 }
 
 function plugin (server) {
-  server.get("/test-npm-404-parent-test")
-    .reply(404, {"error": "version not found"})
+  server.get('/test-npm-404-parent-test')
+    .reply(404, {'error': 'version not found'})
 }
 
 function performInstall (cb) {
-  mr({port : common.port, plugin : plugin}, function (er, s) { // create mock registry.
+  mr({port: common.port, plugin: plugin}, function (er, s) { // create mock registry.
     npm.load({registry: common.registry}, function () {
-      npm.commands.install(pkg, [], function (err) {
+      var pwd = process.cwd()
+      process.chdir(pkg)
+      npm.commands.install([], function (err) {
+        process.chdir(pwd)
         cb(err)
         s.close() // shutdown mock npm server.
       })
diff --git a/deps/npm/test/tap/404-private-registry.js b/deps/npm/test/tap/404-private-registry.js
index 698f5b86133d35..dfe893eb1c06a5 100644
--- a/deps/npm/test/tap/404-private-registry.js
+++ b/deps/npm/test/tap/404-private-registry.js
@@ -4,7 +4,7 @@ var path = require('path')
 var npm = require('../../')
 var addNamed = require('../../lib/cache/add-named')
 
-var packageName = path.basename(__filename,'.js')
+var packageName = path.basename(__filename, '.js')
 
 test('package names not mangled on error with non-root registry', function test404 (t) {
   nock('http://localhost:1337')
diff --git a/deps/npm/test/tap/access.js b/deps/npm/test/tap/access.js
index c72ea5c8986c5f..5e13a23cd5ab44 100644
--- a/deps/npm/test/tap/access.js
+++ b/deps/npm/test/tap/access.js
@@ -15,10 +15,6 @@ var scoped = {
   version: '1.1.1'
 }
 
-var body = {
-  access: 'public'
-}
-
 test('setup', function (t) {
   mkdirp(pkg, function (er) {
     t.ifError(er, pkg + ' made successfully')
@@ -385,7 +381,6 @@ test('npm access ls-collaborators on current w/user filter', function (t) {
   )
 })
 
-
 test('npm access edit', function (t) {
   common.npm(
     [
diff --git a/deps/npm/test/tap/add-remote-git-fake-windows.js b/deps/npm/test/tap/add-remote-git-fake-windows.js
index c9c9dd446b9e1a..33b38781a8c116 100644
--- a/deps/npm/test/tap/add-remote-git-fake-windows.js
+++ b/deps/npm/test/tap/add-remote-git-fake-windows.js
@@ -29,7 +29,6 @@ var pjChild = JSON.stringify({
   version: '1.0.3'
 }, null, 2) + '\n'
 
-
 test('setup', function (t) {
   bootstrap()
   setup(function (er, r) {
diff --git a/deps/npm/test/tap/add-remote-git-get-resolved.js b/deps/npm/test/tap/add-remote-git-get-resolved.js
index 0bd0f29eb11aeb..3f31467285a50c 100644
--- a/deps/npm/test/tap/add-remote-git-get-resolved.js
+++ b/deps/npm/test/tap/add-remote-git-get-resolved.js
@@ -11,7 +11,7 @@ var getResolved = null
  * Note: This is here because `normalizeGitUrl` is usually called
  * before getResolved is, and receives *that* URL.
  */
-function tryGetResolved(uri, treeish) {
+function tryGetResolved (uri, treeish) {
   return getResolved(normalizeGitUrl(uri).url, treeish)
 }
 
diff --git a/deps/npm/test/tap/adduser-always-auth.js b/deps/npm/test/tap/adduser-always-auth.js
index 6a451b451c3c62..3ec8190006b369 100644
--- a/deps/npm/test/tap/adduser-always-auth.js
+++ b/deps/npm/test/tap/adduser-always-auth.js
@@ -1,142 +1,147 @@
-var fs = require("fs")
-var path = require("path")
-var rimraf = require("rimraf")
-var mr = require("npm-registry-mock")
+var fs = require('fs')
+var path = require('path')
+var rimraf = require('rimraf')
+var mr = require('npm-registry-mock')
 
-var test = require("tap").test
-var common = require("../common-tap.js")
+var test = require('tap').test
+var common = require('../common-tap.js')
 
-var opts = {cwd : __dirname}
-var outfile = path.resolve(__dirname, "_npmrc")
+var opts = {cwd: __dirname}
+var outfile = path.resolve(__dirname, '_npmrc')
 var responses = {
-  "Username" : "u\n",
-  "Password" : "p\n",
-  "Email"    : "u@p.me\n"
+  'Username': 'u\n',
+  'Password': 'p\n',
+  'Email': 'u@p.me\n'
 }
 
-function mocks(server) {
+function mocks (server) {
   server.filteringRequestBody(function (r) {
     if (r.match(/\"_id\":\"org\.couchdb\.user:u\"/)) {
-      return "auth"
+      return 'auth'
     }
   })
-  server.put("/-/user/org.couchdb.user:u", "auth")
-    .reply(201, {username : "u", password : "p", email : "u@p.me"})
+  server.put('/-/user/org.couchdb.user:u', 'auth')
+    .reply(201, { username: 'u', password: 'p', email: 'u@p.me' })
 }
 
-test("npm login", function (t) {
-  mr({port : common.port, plugin : mocks}, function (er, s) {
+test('npm login', function (t) {
+  mr({ port: common.port, plugin: mocks }, function (er, s) {
     var runner = common.npm(
     [
-      "login",
-      "--registry", common.registry,
-      "--loglevel", "silent",
-      "--userconfig", outfile
+      'login',
+      '--registry', common.registry,
+      '--loglevel', 'silent',
+      '--userconfig', outfile
     ],
     opts,
     function (err, code) {
-      t.notOk(code, "exited OK")
-      t.notOk(err, "no error output")
-      var config = fs.readFileSync(outfile, "utf8")
-      t.like(config, /:always-auth=false/, "always-auth is scoped and false (by default)")
+      t.notOk(code, 'exited OK')
+      t.notOk(err, 'no error output')
+      var config = fs.readFileSync(outfile, 'utf8')
+      t.like(config, /:always-auth=false/, 'always-auth is scoped and false (by default)')
       s.close()
       rimraf(outfile, function (err) {
-        t.ifError(err, "removed config file OK")
+        t.ifError(err, 'removed config file OK')
         t.end()
       })
     })
 
-    var o = "", e = "", remaining = Object.keys(responses).length
-    runner.stdout.on("data", function (chunk) {
+    var o = ''
+    var e = ''
+    var remaining = Object.keys(responses).length
+    runner.stdout.on('data', function (chunk) {
       remaining--
       o += chunk
 
-      var label = chunk.toString("utf8").split(":")[0]
+      var label = chunk.toString('utf8').split(':')[0]
       runner.stdin.write(responses[label])
 
       if (remaining === 0) runner.stdin.end()
     })
-    runner.stderr.on("data", function (chunk) { e += chunk })
+    runner.stderr.on('data', function (chunk) { e += chunk })
   })
 })
 
-test("npm login --always-auth", function (t) {
-  mr({port : common.port, plugin : mocks}, function (er, s) {
+test('npm login --always-auth', function (t) {
+  mr({ port: common.port, plugin: mocks }, function (er, s) {
     var runner = common.npm(
     [
-      "login",
-      "--registry", common.registry,
-      "--loglevel", "silent",
-      "--userconfig", outfile,
-      "--always-auth"
+      'login',
+      '--registry', common.registry,
+      '--loglevel', 'silent',
+      '--userconfig', outfile,
+      '--always-auth'
     ],
     opts,
     function (err, code) {
-      t.notOk(code, "exited OK")
-      t.notOk(err, "no error output")
-      var config = fs.readFileSync(outfile, "utf8")
-      t.like(config, /:always-auth=true/, "always-auth is scoped and true")
+      t.notOk(code, 'exited OK')
+      t.notOk(err, 'no error output')
+      var config = fs.readFileSync(outfile, 'utf8')
+      t.like(config, /:always-auth=true/, 'always-auth is scoped and true')
       s.close()
       rimraf(outfile, function (err) {
-        t.ifError(err, "removed config file OK")
+        t.ifError(err, 'removed config file OK')
         t.end()
       })
     })
 
-    var o = "", e = "", remaining = Object.keys(responses).length
-    runner.stdout.on("data", function (chunk) {
+    var o = ''
+    var e = ''
+    var remaining = Object.keys(responses).length
+    runner.stdout.on('data', function (chunk) {
       remaining--
       o += chunk
 
-      var label = chunk.toString("utf8").split(":")[0]
+      var label = chunk.toString('utf8').split(':')[0]
       runner.stdin.write(responses[label])
 
       if (remaining === 0) runner.stdin.end()
     })
-    runner.stderr.on("data", function (chunk) { e += chunk })
+    runner.stderr.on('data', function (chunk) { e += chunk })
   })
 })
 
-test("npm login --no-always-auth", function (t) {
-  mr({port : common.port, plugin : mocks}, function (er, s) {
+test('npm login --no-always-auth', function (t) {
+  mr({ port: common.port, plugin: mocks }, function (er, s) {
     var runner = common.npm(
     [
-      "login",
-      "--registry", common.registry,
-      "--loglevel", "silent",
-      "--userconfig", outfile,
-      "--no-always-auth"
+      'login',
+      '--registry', common.registry,
+      '--loglevel', 'silent',
+      '--userconfig', outfile,
+      '--no-always-auth'
     ],
     opts,
     function (err, code) {
-      t.notOk(code, "exited OK")
-      t.notOk(err, "no error output")
-      var config = fs.readFileSync(outfile, "utf8")
-      t.like(config, /:always-auth=false/, "always-auth is scoped and false")
+      t.notOk(code, 'exited OK')
+      t.notOk(err, 'no error output')
+      var config = fs.readFileSync(outfile, 'utf8')
+      t.like(config, /:always-auth=false/, 'always-auth is scoped and false')
       s.close()
       rimraf(outfile, function (err) {
-        t.ifError(err, "removed config file OK")
+        t.ifError(err, 'removed config file OK')
         t.end()
       })
     })
 
-    var o = "", e = "", remaining = Object.keys(responses).length
-    runner.stdout.on("data", function (chunk) {
+    var o = ''
+    var e = ''
+    var remaining = Object.keys(responses).length
+    runner.stdout.on('data', function (chunk) {
       remaining--
       o += chunk
 
-      var label = chunk.toString("utf8").split(":")[0]
+      var label = chunk.toString('utf8').split(':')[0]
       runner.stdin.write(responses[label])
 
       if (remaining === 0) runner.stdin.end()
     })
-    runner.stderr.on("data", function (chunk) { e += chunk })
+    runner.stderr.on('data', function (chunk) { e += chunk })
   })
 })
 
-
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   rimraf.sync(outfile)
-  t.pass("cleaned up")
+  t.pass('cleaned up')
   t.end()
 })
diff --git a/deps/npm/test/tap/adduser-legacy-auth.js b/deps/npm/test/tap/adduser-legacy-auth.js
index f9829c618ac7e8..885a685b9db87b 100644
--- a/deps/npm/test/tap/adduser-legacy-auth.js
+++ b/deps/npm/test/tap/adduser-legacy-auth.js
@@ -73,7 +73,9 @@ test('npm login', function (t) {
       })
     })
 
-    var o = '', e = '', remaining = Object.keys(responses).length
+    var o = ''
+    var e = ''
+    var remaining = Object.keys(responses).length
     runner.stdout.on('data', function (chunk) {
       remaining--
       o += chunk
diff --git a/deps/npm/test/tap/bin.js b/deps/npm/test/tap/bin.js
index ee4e1ff28c4827..33320bc21f59a1 100644
--- a/deps/npm/test/tap/bin.js
+++ b/deps/npm/test/tap/bin.js
@@ -1,17 +1,23 @@
-var path = require("path")
-var test = require("tap").test
-var common = require("../common-tap.js")
+var path = require('path')
+var test = require('tap').test
+var rimraf = require('rimraf')
+var common = require('../common-tap.js')
 var opts = { cwd: __dirname }
-var binDir = "../../node_modules/.bin"
+var binDir = '../../node_modules/.bin'
 var fixture = path.resolve(__dirname, binDir)
 
+test('setup', function (t) {
+  rimraf.sync(path.join(__dirname, 'node_modules'))
+  t.end()
+})
+
 test('npm bin', function (t) {
-  common.npm(["bin"], opts, function (err, code, stdout, stderr) {
-    t.ifError(err, "bin ran without issue")
-    t.notOk(stderr, "should have no stderr")
-    t.equal(code, 0, "exit ok")
+  common.npm(['bin'], opts, function (err, code, stdout, stderr) {
+    t.ifError(err, 'bin ran without issue')
+    t.notOk(stderr, 'should have no stderr')
+    t.equal(code, 0, 'exit ok')
     var res = path.resolve(stdout)
-    t.equal(res, fixture + "\n")
+    t.equal(res, fixture + '\n')
     t.end()
   })
 })
diff --git a/deps/npm/test/tap/bitbucket-https-url-with-creds.js b/deps/npm/test/tap/bitbucket-https-url-with-creds.js
index 3f39e3be45a3b5..4e9d14d7e01a17 100644
--- a/deps/npm/test/tap/bitbucket-https-url-with-creds.js
+++ b/deps/npm/test/tap/bitbucket-https-url-with-creds.js
@@ -38,7 +38,7 @@ test('bitbucket-https-url-with-creds', function (t) {
           } else {
             t.fail('too many attempts to clone')
           }
-          cb(new Error())
+          cb(new Error('execFile mock fails on purpose'))
         })
       }
     }
diff --git a/deps/npm/test/tap/bitbucket-shortcut-package.js b/deps/npm/test/tap/bitbucket-shortcut-package.js
index bc38bd02fe571c..69cfe6c2059203 100644
--- a/deps/npm/test/tap/bitbucket-shortcut-package.js
+++ b/deps/npm/test/tap/bitbucket-shortcut-package.js
@@ -27,8 +27,8 @@ test('setup', function (t) {
 
 test('bitbucket-shortcut', function (t) {
   var cloneUrls = [
-    ['git@bitbucket.org:foo/private.git', 'Bitbucket shortcuts try SSH first'],
-    ['https://bitbucket.org/foo/private.git', 'Bitbucket shortcuts try HTTPS URLs second']
+    ['https://bitbucket.org/foo/private.git', 'Bitbucket shortcuts try HTTPS URLs first'],
+    ['git@bitbucket.org:foo/private.git', 'Bitbucket shortcuts try SSH second']
   ]
 
   var npm = requireInject.installGlobally('../../lib/npm.js', {
diff --git a/deps/npm/test/tap/bitbucket-shortcut.js b/deps/npm/test/tap/bitbucket-shortcut.js
index 51afe19926d947..a9b60f8b56818a 100644
--- a/deps/npm/test/tap/bitbucket-shortcut.js
+++ b/deps/npm/test/tap/bitbucket-shortcut.js
@@ -24,8 +24,8 @@ test('setup', function (t) {
 
 test('bitbucket-shortcut', function (t) {
   var cloneUrls = [
-    ['git@bitbucket.org:foo/private.git', 'Bitbucket shortcuts try SSH first'],
-    ['https://bitbucket.org/foo/private.git', 'Bitbucket shortcuts try HTTPS URLs second']
+    ['https://bitbucket.org/foo/private.git', 'Bitbucket shortcuts try HTTPS URLs first'],
+    ['git@bitbucket.org:foo/private.git', 'Bitbucket shortcuts try SSH second']
   ]
 
   var npm = requireInject.installGlobally('../../lib/npm.js', {
@@ -39,7 +39,7 @@ test('bitbucket-shortcut', function (t) {
           } else {
             t.fail('too many attempts to clone')
           }
-          cb(new Error())
+          cb(new Error('execFile mock fails on purpose'))
         })
       }
     }
diff --git a/deps/npm/test/tap/bugs.js b/deps/npm/test/tap/bugs.js
index 51ba5d3fe1efbb..a0a3be1b8dfec5 100644
--- a/deps/npm/test/tap/bugs.js
+++ b/deps/npm/test/tap/bugs.js
@@ -1,151 +1,151 @@
-if (process.platform === "win32") {
-  console.error("skipping test, because windows and shebangs")
-  return
+if (process.platform === 'win32') {
+  console.error('skipping test, because windows and shebangs')
+  process.exit(0)
 }
 
-var common = require("../common-tap.js")
-var mr = require("npm-registry-mock")
+var common = require('../common-tap.js')
+var mr = require('npm-registry-mock')
 
-var test = require("tap").test
-var rimraf = require("rimraf")
-var fs = require("fs")
-var path = require("path")
+var test = require('tap').test
+var rimraf = require('rimraf')
+var fs = require('fs')
+var path = require('path')
 var join = path.join
-var outFile = path.join(__dirname, "/_output")
+var outFile = path.join(__dirname, '/_output')
 
 var opts = { cwd: __dirname }
 
-test("setup", function (t) {
-  var s = "#!/usr/bin/env bash\n" +
-          "echo \"$@\" > " + JSON.stringify(__dirname) + "/_output\n"
-  fs.writeFileSync(join(__dirname, "/_script.sh"), s, "ascii")
-  fs.chmodSync(join(__dirname, "/_script.sh"), "0755")
-  t.pass("made script")
+test('setup', function (t) {
+  var s = '#!/usr/bin/env bash\n' +
+          'echo \"$@\" > ' + JSON.stringify(__dirname) + '/_output\n'
+  fs.writeFileSync(join(__dirname, '/_script.sh'), s, 'ascii')
+  fs.chmodSync(join(__dirname, '/_script.sh'), '0755')
+  t.pass('made script')
   t.end()
 })
 
-test("npm bugs underscore", function (t) {
-  mr({port : common.port}, function (er, s) {
+test('npm bugs underscore', function (t) {
+  mr({ port: common.port }, function (er, s) {
     common.npm([
-      "bugs", "underscore",
-      "--registry=" + common.registry,
-      "--loglevel=silent",
-      "--browser=" + join(__dirname, "/_script.sh")
+      'bugs', 'underscore',
+      '--registry=' + common.registry,
+      '--loglevel=silent',
+      '--browser=' + join(__dirname, '/_script.sh')
     ], opts, function (err, code, stdout, stderr) {
-      t.ifError(err, "bugs ran without issue")
-      t.notOk(stderr, "should have no stderr")
-      t.equal(code, 0, "exit ok")
-      var res = fs.readFileSync(outFile, "ascii")
+      t.ifError(err, 'bugs ran without issue')
+      t.notOk(stderr, 'should have no stderr')
+      t.equal(code, 0, 'exit ok')
+      var res = fs.readFileSync(outFile, 'ascii')
       s.close()
-      t.equal(res, "https://github.com/jashkenas/underscore/issues\n")
+      t.equal(res, 'https://github.com/jashkenas/underscore/issues\n')
       rimraf.sync(outFile)
       t.end()
     })
   })
 })
 
-test("npm bugs optimist - github (https://)", function (t) {
-  mr({port : common.port}, function (er, s) {
+test('npm bugs optimist - github (https://)', function (t) {
+  mr({ port: common.port }, function (er, s) {
     common.npm([
-      "bugs", "optimist",
-      "--registry=" + common.registry,
-      "--loglevel=silent",
-      "--browser=" + join(__dirname, "/_script.sh")
+      'bugs', 'optimist',
+      '--registry=' + common.registry,
+      '--loglevel=silent',
+      '--browser=' + join(__dirname, '/_script.sh')
     ], opts, function (err, code, stdout, stderr) {
-      t.ifError(err, "bugs ran without issue")
-      t.notOk(stderr, "should have no stderr")
-      t.equal(code, 0, "exit ok")
-      var res = fs.readFileSync(outFile, "ascii")
+      t.ifError(err, 'bugs ran without issue')
+      t.notOk(stderr, 'should have no stderr')
+      t.equal(code, 0, 'exit ok')
+      var res = fs.readFileSync(outFile, 'ascii')
       s.close()
-      t.equal(res, "https://github.com/substack/node-optimist/issues\n")
+      t.equal(res, 'https://github.com/substack/node-optimist/issues\n')
       rimraf.sync(outFile)
       t.end()
     })
   })
 })
 
-test("npm bugs npm-test-peer-deps - no repo", function (t) {
-  mr({port : common.port}, function (er, s) {
+test('npm bugs npm-test-peer-deps - no repo', function (t) {
+  mr({ port: common.port }, function (er, s) {
     common.npm([
-      "bugs", "npm-test-peer-deps",
-      "--registry=" + common.registry,
-      "--loglevel=silent",
-      "--browser=" + join(__dirname, "/_script.sh")
+      'bugs', 'npm-test-peer-deps',
+      '--registry=' + common.registry,
+      '--loglevel=silent',
+      '--browser=' + join(__dirname, '/_script.sh')
     ], opts, function (err, code, stdout, stderr) {
-      t.ifError(err, "bugs ran without issue")
-      t.notOk(stderr, "should have no stderr")
-      t.equal(code, 0, "exit ok")
-      var res = fs.readFileSync(outFile, "ascii")
+      t.ifError(err, 'bugs ran without issue')
+      t.notOk(stderr, 'should have no stderr')
+      t.equal(code, 0, 'exit ok')
+      var res = fs.readFileSync(outFile, 'ascii')
       s.close()
-      t.equal(res, "https://www.npmjs.org/package/npm-test-peer-deps\n")
+      t.equal(res, 'https://www.npmjs.org/package/npm-test-peer-deps\n')
       rimraf.sync(outFile)
       t.end()
     })
   })
 })
 
-test("npm bugs test-repo-url-http - non-github (http://)", function (t) {
-  mr({port : common.port}, function (er, s) {
+test('npm bugs test-repo-url-http - non-github (http://)', function (t) {
+  mr({ port: common.port }, function (er, s) {
     common.npm([
-      "bugs", "test-repo-url-http",
-      "--registry=" + common.registry,
-      "--loglevel=silent",
-      "--browser=" + join(__dirname, "/_script.sh")
+      'bugs', 'test-repo-url-http',
+      '--registry=' + common.registry,
+      '--loglevel=silent',
+      '--browser=' + join(__dirname, '/_script.sh')
     ], opts, function (err, code, stdout, stderr) {
-      t.ifError(err, "bugs ran without issue")
-      t.notOk(stderr, "should have no stderr")
-      t.equal(code, 0, "exit ok")
-      var res = fs.readFileSync(outFile, "ascii")
+      t.ifError(err, 'bugs ran without issue')
+      t.notOk(stderr, 'should have no stderr')
+      t.equal(code, 0, 'exit ok')
+      var res = fs.readFileSync(outFile, 'ascii')
       s.close()
-      t.equal(res, "https://www.npmjs.org/package/test-repo-url-http\n")
+      t.equal(res, 'https://www.npmjs.org/package/test-repo-url-http\n')
       rimraf.sync(outFile)
       t.end()
     })
   })
 })
 
-test("npm bugs test-repo-url-https - non-github (https://)", function (t) {
-  mr({port : common.port}, function (er, s) {
+test('npm bugs test-repo-url-https - non-github (https://)', function (t) {
+  mr({ port: common.port }, function (er, s) {
     common.npm([
-      "bugs", "test-repo-url-https",
-      "--registry=" + common.registry,
-      "--loglevel=silent",
-      "--browser=" + join(__dirname, "/_script.sh")
+      'bugs', 'test-repo-url-https',
+      '--registry=' + common.registry,
+      '--loglevel=silent',
+      '--browser=' + join(__dirname, '/_script.sh')
     ], opts, function (err, code, stdout, stderr) {
-      t.ifError(err, "bugs ran without issue")
-      t.notOk(stderr, "should have no stderr")
-      t.equal(code, 0, "exit ok")
-      var res = fs.readFileSync(outFile, "ascii")
+      t.ifError(err, 'bugs ran without issue')
+      t.notOk(stderr, 'should have no stderr')
+      t.equal(code, 0, 'exit ok')
+      var res = fs.readFileSync(outFile, 'ascii')
       s.close()
-      t.equal(res, "https://www.npmjs.org/package/test-repo-url-https\n")
+      t.equal(res, 'https://www.npmjs.org/package/test-repo-url-https\n')
       rimraf.sync(outFile)
       t.end()
     })
   })
 })
 
-test("npm bugs test-repo-url-ssh - non-github (ssh://)", function (t) {
-  mr({port : common.port}, function (er, s) {
+test('npm bugs test-repo-url-ssh - non-github (ssh://)', function (t) {
+  mr({ port: common.port }, function (er, s) {
     common.npm([
-      "bugs", "test-repo-url-ssh",
-      "--registry=" + common.registry,
-      "--loglevel=silent",
-      "--browser=" + join(__dirname, "/_script.sh")
+      'bugs', 'test-repo-url-ssh',
+      '--registry=' + common.registry,
+      '--loglevel=silent',
+      '--browser=' + join(__dirname, '/_script.sh')
     ], opts, function (err, code, stdout, stderr) {
-      t.ifError(err, "bugs ran without issue")
-      t.notOk(stderr, "should have no stderr")
-      t.equal(code, 0, "exit ok")
-      var res = fs.readFileSync(outFile, "ascii")
+      t.ifError(err, 'bugs ran without issue')
+      t.notOk(stderr, 'should have no stderr')
+      t.equal(code, 0, 'exit ok')
+      var res = fs.readFileSync(outFile, 'ascii')
       s.close()
-      t.equal(res, "https://www.npmjs.org/package/test-repo-url-ssh\n")
+      t.equal(res, 'https://www.npmjs.org/package/test-repo-url-ssh\n')
       rimraf.sync(outFile)
       t.end()
     })
   })
 })
 
-test("cleanup", function (t) {
-  fs.unlinkSync(join(__dirname, "/_script.sh"))
-  t.pass("cleaned up")
+test('cleanup', function (t) {
+  fs.unlinkSync(join(__dirname, '/_script.sh'))
+  t.pass('cleaned up')
   t.end()
 })
diff --git a/deps/npm/test/tap/build-already-built.js b/deps/npm/test/tap/build-already-built.js
index 8e5546fe4dd2b9..45aa1ba1c97d42 100644
--- a/deps/npm/test/tap/build-already-built.js
+++ b/deps/npm/test/tap/build-already-built.js
@@ -1,64 +1,64 @@
 // if "npm rebuild" is run with bundled dependencies,
 // message "already built" should not be error
-var test = require("tap").test
-var path = require("path")
-var osenv = require("osenv")
-var rimraf = require("rimraf")
-var npmlog = require("npmlog")
-var mkdirp = require("mkdirp")
-var requireInject = require("require-inject")
+var test = require('tap').test
+var path = require('path')
+var osenv = require('osenv')
+var rimraf = require('rimraf')
+var npmlog = require('npmlog')
+var mkdirp = require('mkdirp')
+var requireInject = require('require-inject')
 
-var npm = require("../../lib/npm.js")
+var npm = require('../../lib/npm.js')
 
-var PKG_DIR = path.resolve(__dirname, "build-already-built")
-var fakePkg = "foo"
+var PKG_DIR = path.resolve(__dirname, 'build-already-built')
+var fakePkg = 'foo'
 
-test("setup", function (t) {
+test('setup', function (t) {
   cleanup()
 
   t.end()
 })
 
 test("issue #6735 build 'already built' message", function (t) {
-  npm.load({loglevel : "warn"}, function () {
+  npm.load({ loglevel: 'warn' }, function () {
     // capture log messages with level
-    var log = ""
-    npmlog.on("log", function (chunk) {
-      log += chunk.level + " " + chunk.message + "\n"
+    var log = ''
+    npmlog.on('log', function (chunk) {
+      log += chunk.level + ' ' + chunk.message + '\n'
     })
 
     mkdirp.sync(fakePkg)
     var folder = path.resolve(fakePkg)
 
-    var global = npm.config.get("global")
+    var global = npm.config.get('global')
 
-    var build = requireInject("../../lib/build", {
+    var build = requireInject('../../lib/build', {
     })
 
-    t.test("pin previous behavior", function (t) {
+    t.test('pin previous behavior', function (t) {
 
       build([fakePkg], global, false, false, function (err) {
-        t.ok(err, "build failed as expected")
-        t.similar(err.message, /package.json/, "missing package.json as expected")
-        t.notSimilar(log, /already built/, "no already built message written")
+        t.ok(err, 'build failed as expected')
+        t.similar(err.message, /package.json/, 'missing package.json as expected')
+        t.notSimilar(log, /already built/, 'no already built message written')
 
         t.end()
       })
     })
 
-    t.test("simulate rebuild of bundledDependency", function (t) {
+    t.test('simulate rebuild of bundledDependency', function (t) {
 
-      log = ""
+      log = ''
 
       build._didBuild[folder] = true
 
       build([fakePkg], global, false, false, function (err) {
-        t.ok(err, "build failed as expected")
-        t.similar(err.message, /package.json/, "missing package.json as expected")
+        t.ok(err, 'build failed as expected')
+        t.similar(err.message, /package.json/, 'missing package.json as expected')
 
-        t.similar(log, /already built/, "already built message written")
-        t.notSimilar(log, /ERR! already built/, "already built message written is not error")
-        t.similar(log, /info already built/, "already built message written is info")
+        t.similar(log, /already built/, 'already built message written')
+        t.notSimilar(log, /ERR! already built/, 'already built message written is not error')
+        t.similar(log, /info already built/, 'already built message written is info')
 
         t.end()
       })
@@ -68,8 +68,7 @@ test("issue #6735 build 'already built' message", function (t) {
   })
 })
 
-
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   cleanup()
 
   t.end()
diff --git a/deps/npm/test/tap/builtin-config.js b/deps/npm/test/tap/builtin-config.js
index d92551ed6ea227..333282e685509a 100644
--- a/deps/npm/test/tap/builtin-config.js
+++ b/deps/npm/test/tap/builtin-config.js
@@ -1,59 +1,58 @@
-var fs = require("fs")
+var fs = require('fs')
 
-if (process.argv[2] === "write-builtin") {
+if (process.argv[2] === 'write-builtin') {
   var pid = process.argv[3]
-  fs.writeFileSync("npmrc", "foo=bar\npid=" + pid + "\n")
-  return
+  fs.writeFileSync('npmrc', 'foo=bar\npid=' + pid + '\n')
+  process.exit(0)
 }
 
-var rcdata = "foo=bar\npid=" + process.pid + "\n"
-var common = require("../common-tap.js")
-var path = require("path")
-var rimraf = require("rimraf")
-var mkdirp = require("mkdirp")
-var folder = path.resolve(__dirname, "builtin-config")
-var test = require("tap").test
-var npm = path.resolve(__dirname, "../..")
-var spawn = require("child_process").spawn
+var common = require('../common-tap.js')
+var path = require('path')
+var rimraf = require('rimraf')
+var mkdirp = require('mkdirp')
+var folder = path.resolve(__dirname, 'builtin-config')
+var test = require('tap').test
+var npm = path.resolve(__dirname, '../..')
+var spawn = require('child_process').spawn
 var node = process.execPath
 
-test("setup", function (t) {
+test('setup', function (t) {
+  t.plan(1)
   rimraf.sync(folder)
-  mkdirp.sync(folder + "/first")
-  mkdirp.sync(folder + "/second")
-  mkdirp.sync(folder + "/cache")
-  mkdirp.sync(folder + "/tmp")
+  mkdirp.sync(folder + '/first')
+  mkdirp.sync(folder + '/second')
+  mkdirp.sync(folder + '/cache')
+  mkdirp.sync(folder + '/tmp')
 
-  t.pass("finished setup")
+  t.pass('finished setup')
   t.end()
 })
 
-
-test("install npm into first folder", function (t) {
-  var args = ["install", npm, "-g",
-              "--prefix=" + folder + "/first",
-              "--ignore-scripts",
-              "--cache=" + folder + "/cache",
-              "--no-spin",
-              "--loglevel=silent",
-              "--tmp=" + folder + "/tmp"]
-  common.npm(args, {stdio: "inherit"}, function (er, code) {
+test('install npm into first folder', function (t) {
+  t.plan(1)
+  var args = ['install', npm, '-g',
+              '--prefix=' + folder + '/first',
+              '--ignore-scripts',
+              '--cache=' + folder + '/cache',
+              '--loglevel=silent',
+              '--tmp=' + folder + '/tmp']
+  common.npm(args, {stdio: 'inherit'}, function (er, code) {
     if (er) throw er
     t.equal(code, 0)
     t.end()
   })
 })
 
-test("write npmrc file", function (t) {
-  common.npm(["explore", "npm", "-g",
-              "--prefix=" + folder + "/first",
-              "--cache=" + folder + "/cache",
-              "--tmp=" + folder + "/tmp",
-              "--no-spin",
-              "--",
-              node, __filename, "write-builtin", process.pid
+test('write npmrc file', function (t) {
+  t.plan(1)
+  common.npm(['explore', 'npm', '-g',
+              '--prefix=' + folder + '/first',
+              '--cache=' + folder + '/cache',
+              '--tmp=' + folder + '/tmp',
+              '--',
+              node, __filename, 'write-builtin', process.pid
              ],
-             {"stdio": "inherit"},
+             {'stdio': 'inherit'},
              function (er, code) {
     if (er) throw er
     t.equal(code, 0)
@@ -61,66 +60,73 @@ test("write npmrc file", function (t) {
   })
 })
 
-test("use first npm to install second npm", function (t) {
+test('use first npm to install second npm', function (t) {
+  t.plan(3)
   // get the root location
-  common.npm([ "root", "-g",
-               "--prefix=" + folder + "/first",
-               "--cache=" + folder + "/cache",
-               "--tmp=" + folder + "/tmp",
-               "--no-spin"
-             ], {}, function (er, code, so) {
-    if (er) throw er
-    t.equal(code, 0)
-    var root = so.trim()
-    t.ok(fs.statSync(root).isDirectory())
+  common.npm(
+    [
+      'root', '-g',
+      '--prefix=' + folder + '/first',
+      '--cache=' + folder + '/cache',
+      '--tmp=' + folder + '/tmp'
+    ],
+    {},
+    function (er, code, so) {
+      if (er) throw er
+      t.equal(code, 0)
+      var root = so.trim()
+      t.ok(fs.statSync(root).isDirectory())
 
-    var bin = path.resolve(root, "npm/bin/npm-cli.js")
-    spawn( node
-         , [ bin
-           , "install", npm
-           , "-g"
-           , "--prefix=" + folder + "/second"
-           , "--cache=" + folder + "/cache"
-           , "--tmp=" + folder + "/tmp"
-           , "--no-spin"
-           ])
-    .on("error", function (er) { throw er })
-    .on("close", function (code) {
-      t.equal(code, 0, "code is zero")
-      t.end()
-    })
-  })
+      var bin = path.resolve(root, 'npm/bin/npm-cli.js')
+      spawn(
+        node,
+        [
+          bin,
+          'install', npm,
+          '-g',
+          '--prefix=' + folder + '/second',
+          '--cache=' + folder + '/cache',
+          '--tmp=' + folder + '/tmp'
+        ]
+      )
+      .on('error', function (er) { throw er })
+      .on('close', function (code) {
+        t.equal(code, 0, 'code is zero')
+        t.end()
+      })
+    }
+  )
 })
 
-test("verify that the builtin config matches", function (t) {
-  common.npm([ "root", "-g",
-               "--prefix=" + folder + "/first",
-               "--cache=" + folder + "/cache",
-               "--tmp=" + folder + "/tmp"
+test('verify that the builtin config matches', function (t) {
+  t.plan(3)
+  common.npm([ 'root', '-g',
+               '--prefix=' + folder + '/first',
+               '--cache=' + folder + '/cache',
+               '--tmp=' + folder + '/tmp'
              ], {}, function (er, code, so) {
     if (er) throw er
     t.equal(code, 0)
     var firstRoot = so.trim()
-    common.npm([ "root", "-g",
-                 "--prefix=" + folder + "/second",
-                 "--cache=" + folder + "/cache",
-                 "--tmp=" + folder + "/tmp"
+    common.npm([ 'root', '-g',
+                 '--prefix=' + folder + '/second',
+                 '--cache=' + folder + '/cache',
+                 '--tmp=' + folder + '/tmp'
                ], {}, function (er, code, so) {
       if (er) throw er
       t.equal(code, 0)
       var secondRoot = so.trim()
-      var firstRc = path.resolve(firstRoot, "npm", "npmrc")
-      var secondRc = path.resolve(secondRoot, "npm", "npmrc")
-      var firstData = fs.readFileSync(firstRc, "utf8")
-      var secondData = fs.readFileSync(secondRc, "utf8")
+      var firstRc = path.resolve(firstRoot, 'npm', 'npmrc')
+      var secondRc = path.resolve(secondRoot, 'npm', 'npmrc')
+      var firstData = fs.readFileSync(firstRc, 'utf8')
+      var secondData = fs.readFileSync(secondRc, 'utf8')
       t.equal(firstData, secondData)
       t.end()
     })
   })
 })
 
-
-test("clean", function (t) {
+test('clean', function (t) {
   rimraf.sync(folder)
   t.end()
 })
diff --git a/deps/npm/test/tap/bundled-dependencies-nonarray.js b/deps/npm/test/tap/bundled-dependencies-nonarray.js
index bff0522d03122e..2a082720084ab7 100644
--- a/deps/npm/test/tap/bundled-dependencies-nonarray.js
+++ b/deps/npm/test/tap/bundled-dependencies-nonarray.js
@@ -1,12 +1,10 @@
 var fs = require('graceful-fs')
 var path = require('path')
 
-var osenv = require('osenv')
 var mkdirp = require('mkdirp')
 var rimraf = require('rimraf')
 var test = require('tap').test
 
-var npm = require('../../lib/npm.js')
 var common = require('../common-tap.js')
 
 var dir = path.resolve(__dirname, 'bundleddependencies')
@@ -36,24 +34,19 @@ test('setup', function (t) {
 
 test('errors on non-array bundleddependencies', function (t) {
   t.plan(6)
-  process.chdir(pkg)
-  npm.load({},
-    function () {
-      common.npm(['install'], { cwd: pkg }, function (err, code, stdout, stderr) {
-        t.ifError(err, 'npm install ran without issue')
-        t.notOk(code, 'exited with a non-error code')
-        t.notOk(stderr, 'no error output')
+  common.npm(['install'], { cwd: pkg }, function (err, code, stdout, stderr) {
+    t.ifError(err, 'npm install ran without issue')
+    t.is(code, 0, 'exited with a non-error code')
+    t.is(stderr, '', 'no error output')
 
-        common.npm(['install', './pkg-with-bundled'], { cwd: dir },
-          function (err, code, stdout, stderr) {
-            t.ifError(err, 'npm install ran without issue')
-            t.ok(code, 'exited with a error code')
-            t.ok(stderr.indexOf('be an array') > -1, 'nice error output')
-          }
-        )
-      })
-    }
-  )
+    common.npm(['install', './pkg-with-bundled'], { cwd: dir },
+      function (err, code, stdout, stderr) {
+        t.ifError(err, 'npm install ran without issue')
+        t.notEqual(code, 0, 'exited with a error code')
+        t.like(stderr, /be an array/, 'nice error output')
+      }
+    )
+  })
 })
 
 test('cleanup', function (t) {
@@ -62,7 +55,9 @@ test('cleanup', function (t) {
 })
 
 function bootstrap () {
+  cleanup()
   mkdirp.sync(dir)
+  mkdirp.sync(path.join(dir, 'node_modules'))
 
   mkdirp.sync(pkg)
   fs.writeFileSync(path.resolve(pkg, 'package.json'), pj)
@@ -72,6 +67,5 @@ function bootstrap () {
 }
 
 function cleanup () {
-  process.chdir(osenv.tmpdir())
   rimraf.sync(dir)
 }
diff --git a/deps/npm/test/tap/cache-add-localdir-fallback.js b/deps/npm/test/tap/cache-add-localdir-fallback.js
index facd95c3ad483b..ca8696d2231c93 100644
--- a/deps/npm/test/tap/cache-add-localdir-fallback.js
+++ b/deps/npm/test/tap/cache-add-localdir-fallback.js
@@ -1,84 +1,84 @@
-var path = require("path")
-var test = require("tap").test
-var npm = require("../../lib/npm.js")
-var requireInject = require("require-inject")
+var path = require('path')
+var test = require('tap').test
+var npm = require('../../lib/npm.js')
+var requireInject = require('require-inject')
 
-var realizePackageSpecifier = requireInject("realize-package-specifier", {
-  "fs": {
+var realizePackageSpecifier = requireInject('realize-package-specifier', {
+  'fs': {
     stat: function (file, cb) {
       process.nextTick(function () {
         switch (file) {
-        case path.resolve("named"):
-          cb(new Error("ENOENT"))
+        case path.resolve('named'):
+          cb(new Error('ENOENT'))
           break
-        case path.resolve("file.tgz"):
+        case path.resolve('file.tgz'):
           cb(null, { isDirectory: function () { return false } })
           break
-        case path.resolve("dir-no-package"):
+        case path.resolve('dir-no-package'):
           cb(null, { isDirectory: function () { return true } })
           break
-        case path.resolve("dir-no-package/package.json"):
-          cb(new Error("ENOENT"))
+        case path.resolve('dir-no-package/package.json'):
+          cb(new Error('ENOENT'))
           break
-        case path.resolve("dir-with-package"):
+        case path.resolve('dir-with-package'):
           cb(null, { isDirectory: function () { return true } })
           break
-        case path.resolve("dir-with-package/package.json"):
+        case path.resolve('dir-with-package/package.json'):
           cb(null, {})
           break
-        case path.resolve(__dirname, "dir-with-package"):
+        case path.resolve(__dirname, 'dir-with-package'):
           cb(null, { isDirectory: function () { return true } })
           break
-        case path.join(__dirname, "dir-with-package", "package.json"):
+        case path.join(__dirname, 'dir-with-package', 'package.json'):
           cb(null, {})
           break
-        case path.resolve(__dirname, "file.tgz"):
+        case path.resolve(__dirname, 'file.tgz'):
           cb(null, { isDirectory: function () { return false } })
           break
         default:
-          throw new Error("Unknown test file passed to stat: " + file)
+          throw new Error('Unknown test file passed to stat: ' + file)
         }
       })
     }
   }
 })
 
-npm.load({loglevel : "silent"}, function () {
-  var cache = requireInject("../../lib/cache.js", {
-    "realize-package-specifier":  realizePackageSpecifier,
-    "../../lib/cache/add-named.js": function addNamed (name, version, data, cb) {
-      cb(null, "addNamed")
+npm.load({ loglevel: 'silent' }, function () {
+  var cache = requireInject('../../lib/cache.js', {
+    'realize-package-specifier': realizePackageSpecifier,
+    '../../lib/cache/add-named.js': function addNamed (name, version, data, cb) {
+      cb(null, 'addNamed')
     },
-    "../../lib/cache/add-local.js": function addLocal (name, data, cb) {
-      cb(null, "addLocal")
+    '../../lib/cache/add-local.js': function addLocal (name, data, cb) {
+      cb(null, 'addLocal')
     }
   })
 
-  test("npm install localdir fallback", function (t) {
+  test('npm install localdir fallback', function (t) {
     t.plan(12)
-    cache.add("named", null, null, false, function (er, which) {
-      t.ifError(er, "named was cached")
-      t.is(which, "addNamed", "registry package name")
+    cache.add('named', null, null, false, function (er, which) {
+      t.ifError(er, 'named was cached')
+      t.is(which, 'addNamed', 'registry package name')
     })
-    cache.add("file.tgz", null, null, false, function (er, which) {
-      t.ifError(er, "file.tgz was cached")
-      t.is(which, "addLocal", "local file")
+    cache.add('file.tgz', null, null, false, function (er, which) {
+      t.ifError(er, 'file.tgz was cached')
+      t.is(which, 'addLocal', 'local file')
     })
-    cache.add("dir-no-package", null, null, false, function (er, which) {
-      t.ifError(er, "local directory was cached")
-      t.is(which, "addNamed", "local directory w/o package.json")
+    cache.add('dir-no-package', null, null, false, function (er, which) {
+      t.ifError(er, 'local directory was cached')
+      t.is(which, 'addNamed', 'local directory w/o package.json')
     })
-    cache.add("dir-with-package", null, null, false, function (er, which) {
-      t.ifError(er, "local directory with package was cached")
-      t.is(which,"addLocal", "local directory with package.json")
+    cache.add('dir-with-package', null, null, false, function (er, which) {
+      t.ifError(er, 'local directory with package was cached')
+      t.is(which, 'addLocal', 'local directory with package.json')
     })
-    cache.add("file:./dir-with-package", null, __dirname, false, function (er, which) {
-      t.ifError(er, "local directory (as URI) with package was cached")
-      t.is(which, "addLocal", "file: URI to local directory with package.json")
+    cache.add('file:./dir-with-package', null, __dirname, false, function (er, which) {
+      t.ifError(er, 'local directory (as URI) with package was cached')
+      t.is(which, 'addLocal', 'file: URI to local directory with package.json')
     })
-    cache.add("file:./file.tgz", null, __dirname, false, function (er, which) {
-      t.ifError(er, "local file (as URI) with package was cached")
-      t.is(which, "addLocal", "file: URI to local file with package.json")
+    cache.add('file:./file.tgz', null, __dirname, false, function (er, which) {
+      t.ifError(er, 'local file (as URI) with package was cached')
+      t.is(which, 'addLocal', 'file: URI to local file with package.json')
     })
   })
 })
diff --git a/deps/npm/test/tap/cache-add-unpublished.js b/deps/npm/test/tap/cache-add-unpublished.js
index fe26929fce23ff..fe6807f19f987c 100644
--- a/deps/npm/test/tap/cache-add-unpublished.js
+++ b/deps/npm/test/tap/cache-add-unpublished.js
@@ -1,22 +1,21 @@
-var common = require("../common-tap.js")
-var test = require("tap").test
-var mr = require("npm-registry-mock")
+var common = require('../common-tap.js')
+var test = require('tap').test
 
-test("cache add", function (t) {
+test('cache add', function (t) {
   setup(function (er, s) {
     if (er) {
       throw er
     }
     common.npm([
-      "cache",
-      "add",
-      "superfoo",
-      "--registry=http://localhost:1337/"
+      'cache',
+      'add',
+      'superfoo',
+      '--registry=http://localhost:1337/'
     ], {}, function (er, c, so, se) {
       if (er) throw er
-      t.ok(c, "got non-zero exit code")
-      t.equal(so, "", "nothing printed to stdout")
-      t.similar(se, /404 Not Found: superfoo/, "got expected error")
+      t.ok(c, 'got non-zero exit code')
+      t.equal(so, '', 'nothing printed to stdout')
+      t.similar(se, /404 Not Found: superfoo/, 'got expected error')
       s.close()
       t.end()
     })
@@ -24,9 +23,9 @@ test("cache add", function (t) {
 })
 
 function setup (cb) {
-  var s = require("http").createServer(function (req, res) {
+  var s = require('http').createServer(function (req, res) {
     res.statusCode = 404
-    res.end("{\"error\":\"not_found\"}\n")
+    res.end('{\"error\":\"not_found\"}\n')
   })
   s.listen(1337, function () {
     cb(null, s)
diff --git a/deps/npm/test/tap/cache-shasum-fork.js b/deps/npm/test/tap/cache-shasum-fork.js
index f16404cb213392..01c2f68fb7df83 100644
--- a/deps/npm/test/tap/cache-shasum-fork.js
+++ b/deps/npm/test/tap/cache-shasum-fork.js
@@ -18,6 +18,9 @@ var pkg = path.resolve(__dirname, 'cache-shasum-fork')
 var cache = path.join(pkg, 'cache')
 var server
 
+var installed_output = path.join(__dirname, 'cache-shasum-fork') +
+  '\n`-- underscore@1.5.1 \n\n'
+
 test('setup', function (t) {
   setup()
   t.comment('test for https://github.com/npm/npm/issues/3265')
@@ -44,7 +47,7 @@ test('npm cache - install from fork', function (t) {
       t.notOk(stderr, 'Should not get data on stderr: ' + stderr)
       t.equal(code, 0, 'install finished successfully')
 
-      t.equal(stdout, 'underscore@1.5.1 node_modules/underscore\n')
+      t.equal(stdout, installed_output)
       var index = fs.readFileSync(
         path.join(pkg, 'node_modules', 'underscore', 'index.js'),
         'utf8'
@@ -72,7 +75,7 @@ test('npm cache - install from origin', function (t) {
       t.ifErr(err, 'install finished without error')
       t.equal(code, 0, 'install finished successfully')
       t.notOk(stderr, 'Should not get data on stderr: ' + stderr)
-      t.equal(stdout, 'underscore@1.5.1 node_modules/underscore\n')
+      t.equal(stdout, installed_output)
       var index = fs.readFileSync(
         path.join(pkg, 'node_modules', 'underscore', 'index.js'),
         'utf8'
diff --git a/deps/npm/test/tap/cache-shasum.js b/deps/npm/test/tap/cache-shasum.js
index f86037cc80cd4b..90915ed850a7c3 100644
--- a/deps/npm/test/tap/cache-shasum.js
+++ b/deps/npm/test/tap/cache-shasum.js
@@ -1,58 +1,57 @@
-var npm = require.resolve("../../")
-var test = require("tap").test
-var path = require("path")
-var rimraf = require("rimraf")
-var mkdirp = require("mkdirp")
-var mr = require("npm-registry-mock")
-var common = require("../common-tap.js")
-var cache = path.resolve(__dirname, "cache-shasum")
-var spawn = require("child_process").spawn
-var sha = require("sha")
+var npm = require.resolve('../../')
+var test = require('tap').test
+var path = require('path')
+var rimraf = require('rimraf')
+var mkdirp = require('mkdirp')
+var mr = require('npm-registry-mock')
+var common = require('../common-tap.js')
+var cache = path.resolve(__dirname, 'cache-shasum')
+var spawn = require('child_process').spawn
+var sha = require('sha')
 var server
 
-test("mock reg", function (t) {
+test('mock reg', function (t) {
   rimraf.sync(cache)
   mkdirp.sync(cache)
-  mr({port : common.port}, function (er, s) {
+  mr({ port: common.port }, function (er, s) {
     server = s
-    t.pass("ok")
+    t.pass('ok')
     t.end()
   })
 })
 
-test("npm cache add request", function (t) {
+test('npm cache add request', function (t) {
   var c = spawn(process.execPath, [
-    npm, "cache", "add", "request@2.27.0",
-    "--cache=" + cache,
-    "--registry=" + common.registry,
-    "--loglevel=quiet"
+    npm, 'cache', 'add', 'request@2.27.0',
+    '--cache=' + cache,
+    '--registry=' + common.registry,
+    '--loglevel=quiet'
   ])
   c.stderr.pipe(process.stderr)
 
-  c.stdout.on("data", function (d) {
-    t.fail("Should not get data on stdout: " + d)
+  c.stdout.on('data', function (d) {
+    t.fail('Should not get data on stdout: ' + d)
   })
 
-  c.on("close", function (code) {
-    t.notOk(code, "exit ok")
+  c.on('close', function (code) {
+    t.notOk(code, 'exit ok')
     t.end()
   })
 })
 
-test("compare", function (t) {
-  var d = path.resolve(__dirname, "cache-shasum/request")
-  var p = path.resolve(d, "2.27.0/package.tgz")
-  var r = require("./cache-shasum/localhost_1337/request/.cache.json")
-  var rshasum = r.versions["2.27.0"].dist.shasum
+test('compare', function (t) {
+  var d = path.resolve(__dirname, 'cache-shasum/request')
+  var p = path.resolve(d, '2.27.0/package.tgz')
+  var r = require('./cache-shasum/localhost_1337/request/.cache.json')
+  var rshasum = r.versions['2.27.0'].dist.shasum
   sha.get(p, function (er, pshasum) {
-    if (er)
-      throw er
+    if (er) throw er
     t.equal(pshasum, rshasum)
     t.end()
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   server.close()
   rimraf.sync(cache)
   t.end()
diff --git a/deps/npm/test/tap/check-cpu-reqs.js b/deps/npm/test/tap/check-cpu-reqs.js
new file mode 100644
index 00000000000000..4d8c3dc6551c4b
--- /dev/null
+++ b/deps/npm/test/tap/check-cpu-reqs.js
@@ -0,0 +1,63 @@
+'use strict'
+var path = require('path')
+var fs = require('fs')
+var test = require('tap').test
+var osenv = require('osenv')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var common = require('../common-tap.js')
+
+var base = path.join(__dirname, path.basename(__filename, '.js'))
+var installFrom = path.join(base, 'from')
+var installIn = path.join(base, 'in')
+
+var json = {
+  name: 'check-cpu-reqs',
+  version: '0.0.1',
+  description: 'fixture',
+  cpu: ['fake-cpu']
+}
+
+test('setup', function (t) {
+  setup()
+  t.end()
+})
+
+var INSTALL_OPTS = ['--loglevel', 'silly']
+var EXEC_OPTS = {cwd: installIn}
+
+test('install bad cpu', function (t) {
+  common.npm(['install', installFrom].concat(INSTALL_OPTS), EXEC_OPTS, function (err, code) {
+    t.ifError(err, 'npm ran without issue')
+    t.is(code, 1, 'npm install refused to install a package in itself')
+    t.end()
+  })
+})
+test('force install bad cpu', function (t) {
+  common.npm(['install', '--force', installFrom].concat(INSTALL_OPTS), EXEC_OPTS, function (err, code) {
+    t.ifError(err, 'npm ran without issue')
+    t.is(code, 0, 'npm install happily installed a package in itself with --force')
+    t.end()
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
+
+function cleanup () {
+  process.chdir(osenv.tmpdir())
+  rimraf.sync(base)
+}
+
+function setup () {
+  cleanup()
+  mkdirp.sync(path.resolve(installFrom, 'node_modules'))
+  fs.writeFileSync(
+    path.join(installFrom, 'package.json'),
+    JSON.stringify(json, null, 2)
+  )
+  mkdirp.sync(path.resolve(installIn, 'node_modules'))
+  process.chdir(base)
+}
diff --git a/deps/npm/test/tap/check-engine-reqs.js b/deps/npm/test/tap/check-engine-reqs.js
new file mode 100644
index 00000000000000..8dd9b8231fb5ed
--- /dev/null
+++ b/deps/npm/test/tap/check-engine-reqs.js
@@ -0,0 +1,65 @@
+'use strict'
+var path = require('path')
+var fs = require('fs')
+var test = require('tap').test
+var osenv = require('osenv')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var common = require('../common-tap.js')
+
+var base = path.join(__dirname, path.basename(__filename, '.js'))
+var installFrom = path.join(base, 'from')
+var installIn = path.join(base, 'in')
+
+var json = {
+  name: 'check-engine-reqs',
+  version: '0.0.1',
+  description: 'fixture',
+  engines: {
+    node: '1.0.0-not-a-real-version'
+  }
+}
+
+test('setup', function (t) {
+  setup()
+  t.end()
+})
+
+var INSTALL_OPTS = ['--loglevel', 'silly']
+var EXEC_OPTS = {cwd: installIn}
+
+test('install bad engine', function (t) {
+  common.npm(['install', '--engine-strict', installFrom].concat(INSTALL_OPTS), EXEC_OPTS, function (err, code) {
+    t.ifError(err, 'npm ran without issue')
+    t.is(code, 1, 'npm install refused to install a package in itself')
+    t.end()
+  })
+})
+test('force install bad engine', function (t) {
+  common.npm(['install', '--engine-strict', '--force', installFrom].concat(INSTALL_OPTS), EXEC_OPTS, function (err, code) {
+    t.ifError(err, 'npm ran without issue')
+    t.is(code, 0, 'npm install happily installed a package in itself with --force')
+    t.end()
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
+
+function cleanup () {
+  process.chdir(osenv.tmpdir())
+  rimraf.sync(base)
+}
+
+function setup () {
+  cleanup()
+  mkdirp.sync(path.resolve(installFrom, 'node_modules'))
+  fs.writeFileSync(
+    path.join(installFrom, 'package.json'),
+    JSON.stringify(json, null, 2)
+  )
+  mkdirp.sync(path.resolve(installIn, 'node_modules'))
+  process.chdir(base)
+}
diff --git a/deps/npm/test/tap/check-install-self.js b/deps/npm/test/tap/check-install-self.js
new file mode 100644
index 00000000000000..821d8eb4d4994c
--- /dev/null
+++ b/deps/npm/test/tap/check-install-self.js
@@ -0,0 +1,66 @@
+'use strict'
+var path = require('path')
+var fs = require('fs')
+var test = require('tap').test
+var osenv = require('osenv')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var common = require('../common-tap.js')
+
+var base = path.join(__dirname, path.basename(__filename, '.js'))
+var installFrom = path.join(base, 'from')
+var installIn = path.join(base, 'in')
+
+var json = {
+  name: 'check-install-self',
+  version: '0.0.1',
+  description: 'fixture'
+}
+
+test('setup', function (t) {
+  setup()
+  t.end()
+})
+
+var INSTALL_OPTS = ['--loglevel', 'silent']
+var EXEC_OPTS = {cwd: installIn}
+
+test('install self', function (t) {
+  common.npm(['install', installFrom].concat(INSTALL_OPTS), EXEC_OPTS, function (err, code) {
+    t.ifError(err, 'npm ran without issue')
+    t.is(code, 1, 'npm install refused to install a package in itself')
+    t.end()
+  })
+})
+test('force install self', function (t) {
+  common.npm(['install', '--force', installFrom].concat(INSTALL_OPTS), EXEC_OPTS, function (err, code) {
+    t.ifError(err, 'npm ran without issue')
+    t.is(code, 0, 'npm install happily installed a package in itself with --force')
+    t.end()
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
+
+function cleanup () {
+  process.chdir(osenv.tmpdir())
+  rimraf.sync(base)
+}
+
+function setup () {
+  cleanup()
+  mkdirp.sync(path.resolve(installFrom, 'node_modules'))
+  fs.writeFileSync(
+    path.join(installFrom, 'package.json'),
+    JSON.stringify(json, null, 2)
+  )
+  mkdirp.sync(path.resolve(installIn, 'node_modules'))
+  fs.writeFileSync(
+    path.join(installIn, 'package.json'),
+    JSON.stringify(json, null, 2)
+  )
+  process.chdir(base)
+}
diff --git a/deps/npm/test/tap/check-os-reqs.js b/deps/npm/test/tap/check-os-reqs.js
new file mode 100644
index 00000000000000..5d0c1ecf78b07c
--- /dev/null
+++ b/deps/npm/test/tap/check-os-reqs.js
@@ -0,0 +1,63 @@
+'use strict'
+var path = require('path')
+var fs = require('fs')
+var test = require('tap').test
+var osenv = require('osenv')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var common = require('../common-tap.js')
+
+var base = path.join(__dirname, path.basename(__filename, '.js'))
+var installFrom = path.join(base, 'from')
+var installIn = path.join(base, 'in')
+
+var json = {
+  name: 'check-os-reqs',
+  version: '0.0.1',
+  description: 'fixture',
+  os: ['fake-os']
+}
+
+test('setup', function (t) {
+  setup()
+  t.end()
+})
+
+var INSTALL_OPTS = ['--loglevel', 'silly']
+var EXEC_OPTS = {cwd: installIn}
+
+test('install bad os', function (t) {
+  common.npm(['install', installFrom].concat(INSTALL_OPTS), EXEC_OPTS, function (err, code) {
+    t.ifError(err, 'npm ran without issue')
+    t.is(code, 1, 'npm install refused to install a package in itself')
+    t.end()
+  })
+})
+test('force install bad os', function (t) {
+  common.npm(['install', '--force', installFrom].concat(INSTALL_OPTS), EXEC_OPTS, function (err, code) {
+    t.ifError(err, 'npm ran without issue')
+    t.is(code, 0, 'npm install happily installed a package in itself with --force')
+    t.end()
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
+
+function cleanup () {
+  process.chdir(osenv.tmpdir())
+  rimraf.sync(base)
+}
+
+function setup () {
+  cleanup()
+  mkdirp.sync(path.resolve(installFrom, 'node_modules'))
+  fs.writeFileSync(
+    path.join(installFrom, 'package.json'),
+    JSON.stringify(json, null, 2)
+  )
+  mkdirp.sync(path.resolve(installIn, 'node_modules'))
+  process.chdir(base)
+}
diff --git a/deps/npm/test/tap/check-permissions.js b/deps/npm/test/tap/check-permissions.js
new file mode 100644
index 00000000000000..d3c0c6da25032f
--- /dev/null
+++ b/deps/npm/test/tap/check-permissions.js
@@ -0,0 +1,88 @@
+'use strict'
+var fs = require('fs')
+var path = require('path')
+var test = require('tap').test
+var rimraf = require('rimraf')
+var writable = require('../../lib/install/writable.js').fsAccessImplementation
+var writableFallback = require('../../lib/install/writable.js').fsOpenImplementation
+var exists = require('../../lib/install/exists.js').fsAccessImplementation
+var existsFallback = require('../../lib/install/exists.js').fsStatImplementation
+
+var testBase = path.resolve(__dirname, 'check-permissions')
+var existingDir = path.resolve(testBase, 'exists')
+var nonExistingDir = path.resolve(testBase, 'does-not-exist')
+var writableDir = path.resolve(testBase, 'writable')
+var nonWritableDir = path.resolve(testBase, 'non-writable')
+
+test('setup', function (t) {
+  cleanup()
+  setup()
+  t.end()
+})
+
+test('exists', function (t) {
+  t.plan(2)
+  // fs.access first introduced in node 0.12 / io.js
+  if (fs.access) {
+    existsTests(t, exists)
+  } else {
+    t.pass('# skip fs.access not available in this version')
+    t.pass('# skip fs.access not available in this version')
+  }
+})
+
+test('exists-fallback', function (t) {
+  t.plan(2)
+  existsTests(t, existsFallback)
+})
+
+test('writable', function (t) {
+  t.plan(2)
+  // fs.access first introduced in node 0.12 / io.js
+  if (fs.access) {
+    writableTests(t, writable)
+  } else {
+    t.pass('# skip fs.access not available in this version')
+    t.pass('# skip fs.access not available in this version')
+  }
+})
+
+test('writable-fallback', function (t) {
+  t.plan(2)
+  writableTests(t, writableFallback)
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
+
+function setup () {
+  fs.mkdirSync(testBase)
+  fs.mkdirSync(existingDir)
+  fs.mkdirSync(writableDir)
+  fs.mkdirSync(nonWritableDir)
+  fs.chmodSync(nonWritableDir, '555')
+}
+
+function existsTests (t, exists) {
+  exists(existingDir, function (er) {
+    t.error(er, 'exists dir is exists')
+  })
+  exists(nonExistingDir, function (er) {
+    t.ok(er, 'non-existing dir resulted in an error')
+  })
+}
+
+function writableTests (t, writable) {
+  writable(writableDir, function (er) {
+    t.error(er, 'writable dir is writable')
+  })
+  writable(nonWritableDir, function (er) {
+    t.ok(er, 'non-writable dir resulted in an error')
+  })
+}
+
+function cleanup () {
+  rimraf.sync(testBase)
+}
diff --git a/deps/npm/test/tap/circular-dep.js b/deps/npm/test/tap/circular-dep.js
index 002b30cd7856d3..d7f66eacef1ac9 100644
--- a/deps/npm/test/tap/circular-dep.js
+++ b/deps/npm/test/tap/circular-dep.js
@@ -61,7 +61,10 @@ test('installing a package that depends on the current package', function (t) {
 
           t.ok(existsSync(path.resolve(
             minimist,
-            'node_modules', 'optimist',
+            'node_modules', 'optimist'
+          )), 'optimist in place')
+          t.ok(existsSync(path.resolve(
+            minimist,
             'node_modules', 'minimist'
           )), 'circular dependency uncircled')
           t.end()
diff --git a/deps/npm/test/tap/config-basic.js b/deps/npm/test/tap/config-basic.js
index d5a950a8e5a00a..82fa8ab5856d7e 100644
--- a/deps/npm/test/tap/config-basic.js
+++ b/deps/npm/test/tap/config-basic.js
@@ -1,57 +1,58 @@
-var test = require("tap").test
-var npmconf = require("../../lib/config/core.js")
-var common = require("./00-config-setup.js")
-var path = require("path")
+var test = require('tap').test
+var npmconf = require('../../lib/config/core.js')
+var common = require('./00-config-setup.js')
+var path = require('path')
 
 var projectData = {
-  "save-prefix": "~",
-  "proprietary-attribs": false
+  'save-prefix': '~',
+  'proprietary-attribs': false
 }
 
 var ucData = common.ucData
 var envData = common.envData
 var envDataFix = common.envDataFix
 
-var gcData = { "package-config:foo": "boo" }
+var gcData = { 'package-config:foo': 'boo' }
 
 var biData = {}
 
-var cli = { foo: "bar", umask: 022 }
+var cli = { foo: 'bar', umask: parseInt('022', 8) }
 
-var expectList =
-[ cli,
+var expectList = [
+  cli,
   envDataFix,
   projectData,
   ucData,
   gcData,
-  biData ]
+  biData
+]
 
 var expectSources = {
   cli: { data: cli },
   env: {
     data: envDataFix,
     source: envData,
-    prefix: ""
+    prefix: ''
   },
   project: {
-    path: path.resolve(__dirname, "..", "..", ".npmrc"),
-    type: "ini",
+    path: path.resolve(__dirname, '..', '..', '.npmrc'),
+    type: 'ini',
     data: projectData
   },
   user: {
     path: common.userconfig,
-    type: "ini",
+    type: 'ini',
     data: ucData
   },
   global: {
     path: common.globalconfig,
-    type: "ini",
+    type: 'ini',
     data: gcData
   },
   builtin: { data: biData }
 }
 
-test("no builtin", function (t) {
+test('no builtin', function (t) {
   npmconf.load(cli, function (er, conf) {
     if (er) throw er
     t.same(conf.list, expectList)
@@ -59,8 +60,8 @@ test("no builtin", function (t) {
     t.same(npmconf.rootConf.list, [])
     t.equal(npmconf.rootConf.root, npmconf.defs.defaults)
     t.equal(conf.root, npmconf.defs.defaults)
-    t.equal(conf.get("umask"), 022)
-    t.equal(conf.get("heading"), "npm")
+    t.equal(conf.get('umask'), parseInt('022', 8))
+    t.equal(conf.get('heading'), 'npm')
     t.end()
   })
 })
diff --git a/deps/npm/test/tap/config-builtin.js b/deps/npm/test/tap/config-builtin.js
index 5a1589ff6a224b..708eb305657923 100644
--- a/deps/npm/test/tap/config-builtin.js
+++ b/deps/npm/test/tap/config-builtin.js
@@ -1,22 +1,22 @@
-var test = require("tap").test
-var npmconf = require("../../lib/config/core.js")
-var common = require("./00-config-setup.js")
-var path = require("path")
+var test = require('tap').test
+var npmconf = require('../../lib/config/core.js')
+var common = require('./00-config-setup.js')
+var path = require('path')
 
 var ucData = common.ucData
 
 var envData = common.envData
 var envDataFix = common.envDataFix
 
-var gcData = { "package-config:foo": "boo" }
+var gcData = { 'package-config:foo': 'boo' }
 
-var biData = { "builtin-config": true }
+var biData = { 'builtin-config': true }
 
-var cli = { foo: "bar", heading: "foo", "git-tag-version": false }
+var cli = { foo: 'bar', heading: 'foo', 'git-tag-version': false }
 
 var projectData = {
-  "save-prefix": "~",
-  "proprietary-attribs": false
+  'save-prefix': '~',
+  'proprietary-attribs': false
 }
 
 var expectList = [
@@ -33,27 +33,27 @@ var expectSources = {
   env: {
     data: envDataFix,
     source: envData,
-    prefix: ""
+    prefix: ''
   },
   project: {
-    path: path.resolve(__dirname, "..", "..", ".npmrc"),
-    type: "ini",
+    path: path.resolve(__dirname, '..', '..', '.npmrc'),
+    type: 'ini',
     data: projectData
   },
   user: {
     path: common.userconfig,
-    type: "ini",
+    type: 'ini',
     data: ucData
   },
   global: {
     path: common.globalconfig,
-    type: "ini",
+    type: 'ini',
     data: gcData
   },
   builtin: { data: biData }
 }
 
-test("with builtin", function (t) {
+test('with builtin', function (t) {
   npmconf.load(cli, common.builtin, function (er, conf) {
     if (er) throw er
     t.same(conf.list, expectList)
@@ -61,8 +61,8 @@ test("with builtin", function (t) {
     t.same(npmconf.rootConf.list, [])
     t.equal(npmconf.rootConf.root, npmconf.defs.defaults)
     t.equal(conf.root, npmconf.defs.defaults)
-    t.equal(conf.get("heading"), "foo")
-    t.equal(conf.get("git-tag-version"), false)
+    t.equal(conf.get('heading'), 'foo')
+    t.equal(conf.get('git-tag-version'), false)
     t.end()
   })
 })
diff --git a/deps/npm/test/tap/config-certfile.js b/deps/npm/test/tap/config-certfile.js
index 25de9963a9fc96..223ff34196f5eb 100644
--- a/deps/npm/test/tap/config-certfile.js
+++ b/deps/npm/test/tap/config-certfile.js
@@ -1,18 +1,18 @@
-require("./00-config-setup.js")
+require('./00-config-setup.js')
 
-var path = require("path")
-var fs = require("fs")
-var test = require("tap").test
-var npmconf = require("../../lib/config/core.js")
+var path = require('path')
+var fs = require('fs')
+var test = require('tap').test
+var npmconf = require('../../lib/config/core.js')
 
-test("cafile loads as ca", function (t) {
-  var cafile = path.join(__dirname, "..", "fixtures", "config", "multi-ca")
+test('cafile loads as ca', function (t) {
+  var cafile = path.join(__dirname, '..', 'fixtures', 'config', 'multi-ca')
 
   npmconf.load({cafile: cafile}, function (er, conf) {
     if (er) throw er
 
-    t.same(conf.get("cafile"), cafile)
-    t.same(conf.get("ca").join("\n"), fs.readFileSync(cafile, "utf8").trim())
+    t.same(conf.get('cafile'), cafile)
+    t.same(conf.get('ca').join('\n'), fs.readFileSync(cafile, 'utf8').trim())
     t.end()
   })
 })
diff --git a/deps/npm/test/tap/config-credentials.js b/deps/npm/test/tap/config-credentials.js
index 1cb2a7eb410c59..c1b981d0a51312 100644
--- a/deps/npm/test/tap/config-credentials.js
+++ b/deps/npm/test/tap/config-credentials.js
@@ -1,350 +1,350 @@
-var test = require("tap").test
+var test = require('tap').test
 
-var npmconf = require("../../lib/config/core.js")
-var common = require("./00-config-setup.js")
+var npmconf = require('../../lib/config/core.js')
+var common = require('./00-config-setup.js')
 
-var URI = "https://registry.lvh.me:8661/"
+var URI = 'https://registry.lvh.me:8661/'
 
-test("getting scope with no credentials set", function (t) {
+test('getting scope with no credentials set', function (t) {
   npmconf.load({}, function (er, conf) {
-    t.ifError(er, "configuration loaded")
+    t.ifError(er, 'configuration loaded')
 
     var basic = conf.getCredentialsByURI(URI)
-    t.equal(basic.scope, "//registry.lvh.me:8661/", "nerfed URL extracted")
+    t.equal(basic.scope, '//registry.lvh.me:8661/', 'nerfed URL extracted')
 
     t.end()
   })
 })
 
-test("trying to set credentials with no URI", function (t) {
+test('trying to set credentials with no URI', function (t) {
   npmconf.load(common.builtin, function (er, conf) {
-    t.ifError(er, "configuration loaded")
+    t.ifError(er, 'configuration loaded')
 
     t.throws(function () {
       conf.setCredentialsByURI()
-    }, "enforced missing URI")
+    }, 'enforced missing URI')
 
     t.end()
   })
 })
 
-test("trying to clear credentials with no URI", function (t) {
+test('trying to clear credentials with no URI', function (t) {
   npmconf.load(common.builtin, function (er, conf) {
-    t.ifError(er, "configuration loaded")
+    t.ifError(er, 'configuration loaded')
 
     t.throws(function () {
       conf.clearCredentialsByURI()
-    }, "enforced missing URI")
+    }, 'enforced missing URI')
 
     t.end()
   })
 })
 
-test("set with missing credentials object", function (t) {
+test('set with missing credentials object', function (t) {
   npmconf.load(common.builtin, function (er, conf) {
-    t.ifError(er, "configuration loaded")
+    t.ifError(er, 'configuration loaded')
 
     t.throws(function () {
       conf.setCredentialsByURI(URI)
-    }, "enforced missing credentials")
+    }, 'enforced missing credentials')
 
     t.end()
   })
 })
 
-test("set with empty credentials object", function (t) {
+test('set with empty credentials object', function (t) {
   npmconf.load(common.builtin, function (er, conf) {
-    t.ifError(er, "configuration loaded")
+    t.ifError(er, 'configuration loaded')
 
     t.throws(function () {
       conf.setCredentialsByURI(URI, {})
-    }, "enforced missing credentials")
+    }, 'enforced missing credentials')
 
     t.end()
   })
 })
 
-test("set with token", function (t) {
+test('set with token', function (t) {
   npmconf.load(common.builtin, function (er, conf) {
-    t.ifError(er, "configuration loaded")
+    t.ifError(er, 'configuration loaded')
 
     t.doesNotThrow(function () {
-      conf.setCredentialsByURI(URI, {token : "simple-token"})
-    }, "needs only token")
+      conf.setCredentialsByURI(URI, { token: 'simple-token' })
+    }, 'needs only token')
 
     var expected = {
-      scope      : "//registry.lvh.me:8661/",
-      token      : "simple-token",
-      username   : undefined,
-      password   : undefined,
-      email      : undefined,
-      auth       : undefined,
-      alwaysAuth : undefined
+      scope: '//registry.lvh.me:8661/',
+      token: 'simple-token',
+      username: undefined,
+      password: undefined,
+      email: undefined,
+      auth: undefined,
+      alwaysAuth: undefined
     }
 
-    t.same(conf.getCredentialsByURI(URI), expected, "got bearer token and scope")
+    t.same(conf.getCredentialsByURI(URI), expected, 'got bearer token and scope')
 
     t.end()
   })
 })
 
-test("clear with token", function (t) {
+test('clear with token', function (t) {
   npmconf.load(common.builtin, function (er, conf) {
-    t.ifError(er, "configuration loaded")
+    t.ifError(er, 'configuration loaded')
 
     t.doesNotThrow(function () {
-      conf.setCredentialsByURI(URI, {token : "simple-token"})
-    }, "needs only token")
+      conf.setCredentialsByURI(URI, { token: 'simple-token' })
+    }, 'needs only token')
 
     t.doesNotThrow(function () {
       conf.clearCredentialsByURI(URI)
-    }, "needs only URI")
+    }, 'needs only URI')
 
-    t.notOk(conf.getCredentialsByURI(URI).token, "token all gone")
+    t.notOk(conf.getCredentialsByURI(URI).token, 'token all gone')
 
     t.end()
   })
 })
 
-test("set with missing username", function (t) {
+test('set with missing username', function (t) {
   npmconf.load(common.builtin, function (er, conf) {
-    t.ifError(er, "configuration loaded")
+    t.ifError(er, 'configuration loaded')
 
     var credentials = {
-      password : "password",
-      email    : "ogd@aoaioxxysz.net"
+      password: 'password',
+      email: 'ogd@aoaioxxysz.net'
     }
 
     t.throws(function () {
       conf.setCredentialsByURI(URI, credentials)
-    }, "enforced missing email")
+    }, 'enforced missing email')
 
     t.end()
   })
 })
 
-test("set with missing password", function (t) {
+test('set with missing password', function (t) {
   npmconf.load(common.builtin, function (er, conf) {
-    t.ifError(er, "configuration loaded")
+    t.ifError(er, 'configuration loaded')
 
     var credentials = {
-      username : "username",
-      email    : "ogd@aoaioxxysz.net"
+      username: 'username',
+      email: 'ogd@aoaioxxysz.net'
     }
 
     t.throws(function () {
       conf.setCredentialsByURI(URI, credentials)
-    }, "enforced missing email")
+    }, 'enforced missing email')
 
     t.end()
   })
 })
 
-test("set with missing email", function (t) {
+test('set with missing email', function (t) {
   npmconf.load(common.builtin, function (er, conf) {
-    t.ifError(er, "configuration loaded")
+    t.ifError(er, 'configuration loaded')
 
     var credentials = {
-      username : "username",
-      password : "password"
+      username: 'username',
+      password: 'password'
     }
 
     t.throws(function () {
       conf.setCredentialsByURI(URI, credentials)
-    }, "enforced missing email")
+    }, 'enforced missing email')
 
     t.end()
   })
 })
 
-test("set with old-style credentials", function (t) {
+test('set with old-style credentials', function (t) {
   npmconf.load(common.builtin, function (er, conf) {
-    t.ifError(er, "configuration loaded")
+    t.ifError(er, 'configuration loaded')
 
     var credentials = {
-      username : "username",
-      password : "password",
-      email    : "ogd@aoaioxxysz.net"
+      username: 'username',
+      password: 'password',
+      email: 'ogd@aoaioxxysz.net'
     }
 
     t.doesNotThrow(function () {
       conf.setCredentialsByURI(URI, credentials)
-    }, "requires all of username, password, and email")
+    }, 'requires all of username, password, and email')
 
     var expected = {
-      scope      : "//registry.lvh.me:8661/",
-      token      : undefined,
-      username   : "username",
-      password   : "password",
-      email      : "ogd@aoaioxxysz.net",
-      auth       : "dXNlcm5hbWU6cGFzc3dvcmQ=",
-      alwaysAuth : false
+      scope: '//registry.lvh.me:8661/',
+      token: undefined,
+      username: 'username',
+      password: 'password',
+      email: 'ogd@aoaioxxysz.net',
+      auth: 'dXNlcm5hbWU6cGFzc3dvcmQ=',
+      alwaysAuth: false
     }
 
-    t.same(conf.getCredentialsByURI(URI), expected, "got credentials")
+    t.same(conf.getCredentialsByURI(URI), expected, 'got credentials')
 
     t.end()
   })
 })
 
-test("clear with old-style credentials", function (t) {
+test('clear with old-style credentials', function (t) {
   npmconf.load(common.builtin, function (er, conf) {
-    t.ifError(er, "configuration loaded")
+    t.ifError(er, 'configuration loaded')
 
     var credentials = {
-      username : "username",
-      password : "password",
-      email    : "ogd@aoaioxxysz.net"
+      username: 'username',
+      password: 'password',
+      email: 'ogd@aoaioxxysz.net'
     }
 
     t.doesNotThrow(function () {
       conf.setCredentialsByURI(URI, credentials)
-    }, "requires all of username, password, and email")
+    }, 'requires all of username, password, and email')
 
     t.doesNotThrow(function () {
       conf.clearCredentialsByURI(URI)
-    }, "clearing only required URI")
+    }, 'clearing only required URI')
 
-    t.notOk(conf.getCredentialsByURI(URI).username, "username cleared")
-    t.notOk(conf.getCredentialsByURI(URI).password, "password cleared")
+    t.notOk(conf.getCredentialsByURI(URI).username, 'username cleared')
+    t.notOk(conf.getCredentialsByURI(URI).password, 'password cleared')
 
     t.end()
   })
 })
 
-test("get old-style credentials for default registry", function (t) {
+test('get old-style credentials for default registry', function (t) {
   npmconf.load(common.builtin, function (er, conf) {
-    var actual = conf.getCredentialsByURI(conf.get("registry"))
+    var actual = conf.getCredentialsByURI(conf.get('registry'))
     var expected = {
-      scope      : "//registry.npmjs.org/",
-      token      : undefined,
-      password   : "password",
-      username   : "username",
-      email      : "i@izs.me",
-      auth       : "dXNlcm5hbWU6cGFzc3dvcmQ=",
-      alwaysAuth : false
+      scope: '//registry.npmjs.org/',
+      token: undefined,
+      password: 'password',
+      username: 'username',
+      email: 'i@izs.me',
+      auth: 'dXNlcm5hbWU6cGFzc3dvcmQ=',
+      alwaysAuth: false
     }
     t.same(actual, expected)
     t.end()
   })
 })
 
-test("set with always-auth enabled", function (t) {
+test('set with always-auth enabled', function (t) {
   npmconf.load(common.builtin, function (er, conf) {
-    t.ifError(er, "configuration loaded")
+    t.ifError(er, 'configuration loaded')
 
     var credentials = {
-      username   : "username",
-      password   : "password",
-      email      : "ogd@aoaioxxysz.net",
-      alwaysAuth : true
+      username: 'username',
+      password: 'password',
+      email: 'ogd@aoaioxxysz.net',
+      alwaysAuth: true
     }
 
     conf.setCredentialsByURI(URI, credentials)
 
     var expected = {
-      scope      : "//registry.lvh.me:8661/",
-      token      : undefined,
-      username   : "username",
-      password   : "password",
-      email      : "ogd@aoaioxxysz.net",
-      auth       : "dXNlcm5hbWU6cGFzc3dvcmQ=",
-      alwaysAuth : true
+      scope: '//registry.lvh.me:8661/',
+      token: undefined,
+      username: 'username',
+      password: 'password',
+      email: 'ogd@aoaioxxysz.net',
+      auth: 'dXNlcm5hbWU6cGFzc3dvcmQ=',
+      alwaysAuth: true
     }
 
-    t.same(conf.getCredentialsByURI(URI), expected, "got credentials")
+    t.same(conf.getCredentialsByURI(URI), expected, 'got credentials')
 
     t.end()
   })
 })
 
-test("set with always-auth disabled", function (t) {
+test('set with always-auth disabled', function (t) {
   npmconf.load(common.builtin, function (er, conf) {
-    t.ifError(er, "configuration loaded")
+    t.ifError(er, 'configuration loaded')
 
     var credentials = {
-      username   : "username",
-      password   : "password",
-      email      : "ogd@aoaioxxysz.net",
-      alwaysAuth : false
+      username: 'username',
+      password: 'password',
+      email: 'ogd@aoaioxxysz.net',
+      alwaysAuth: false
     }
 
     conf.setCredentialsByURI(URI, credentials)
 
     var expected = {
-      scope      : "//registry.lvh.me:8661/",
-      token      : undefined,
-      username   : "username",
-      password   : "password",
-      email      : "ogd@aoaioxxysz.net",
-      auth       : "dXNlcm5hbWU6cGFzc3dvcmQ=",
-      alwaysAuth : false
+      scope: '//registry.lvh.me:8661/',
+      token: undefined,
+      username: 'username',
+      password: 'password',
+      email: 'ogd@aoaioxxysz.net',
+      auth: 'dXNlcm5hbWU6cGFzc3dvcmQ=',
+      alwaysAuth: false
     }
 
-    t.same(conf.getCredentialsByURI(URI), expected, "got credentials")
+    t.same(conf.getCredentialsByURI(URI), expected, 'got credentials')
 
     t.end()
   })
 })
 
-test("set with global always-auth enabled", function (t) {
+test('set with global always-auth enabled', function (t) {
   npmconf.load(common.builtin, function (er, conf) {
-    t.ifError(er, "configuration loaded")
-    var original = conf.get("always-auth")
-    conf.set("always-auth", true)
+    t.ifError(er, 'configuration loaded')
+    var original = conf.get('always-auth')
+    conf.set('always-auth', true)
 
     var credentials = {
-      username   : "username",
-      password   : "password",
-      email      : "ogd@aoaioxxysz.net"
+      username: 'username',
+      password: 'password',
+      email: 'ogd@aoaioxxysz.net'
     }
 
     conf.setCredentialsByURI(URI, credentials)
 
     var expected = {
-      scope      : "//registry.lvh.me:8661/",
-      token      : undefined,
-      username   : "username",
-      password   : "password",
-      email      : "ogd@aoaioxxysz.net",
-      auth       : "dXNlcm5hbWU6cGFzc3dvcmQ=",
-      alwaysAuth : true
+      scope: '//registry.lvh.me:8661/',
+      token: undefined,
+      username: 'username',
+      password: 'password',
+      email: 'ogd@aoaioxxysz.net',
+      auth: 'dXNlcm5hbWU6cGFzc3dvcmQ=',
+      alwaysAuth: true
     }
 
-    t.same(conf.getCredentialsByURI(URI), expected, "got credentials")
+    t.same(conf.getCredentialsByURI(URI), expected, 'got credentials')
 
-    conf.set("always-auth", original)
+    conf.set('always-auth', original)
     t.end()
   })
 })
 
-test("set with global always-auth disabled", function (t) {
+test('set with global always-auth disabled', function (t) {
   npmconf.load(common.builtin, function (er, conf) {
-    t.ifError(er, "configuration loaded")
-    var original = conf.get("always-auth")
-    conf.set("always-auth", false)
+    t.ifError(er, 'configuration loaded')
+    var original = conf.get('always-auth')
+    conf.set('always-auth', false)
 
     var credentials = {
-      username   : "username",
-      password   : "password",
-      email      : "ogd@aoaioxxysz.net"
+      username: 'username',
+      password: 'password',
+      email: 'ogd@aoaioxxysz.net'
     }
 
     conf.setCredentialsByURI(URI, credentials)
 
     var expected = {
-      scope      : "//registry.lvh.me:8661/",
-      token      : undefined,
-      username   : "username",
-      password   : "password",
-      email      : "ogd@aoaioxxysz.net",
-      auth       : "dXNlcm5hbWU6cGFzc3dvcmQ=",
-      alwaysAuth : false
+      scope: '//registry.lvh.me:8661/',
+      token: undefined,
+      username: 'username',
+      password: 'password',
+      email: 'ogd@aoaioxxysz.net',
+      auth: 'dXNlcm5hbWU6cGFzc3dvcmQ=',
+      alwaysAuth: false
     }
 
-    t.same(conf.getCredentialsByURI(URI), expected, "got credentials")
+    t.same(conf.getCredentialsByURI(URI), expected, 'got credentials')
 
-    conf.set("always-auth", original)
+    conf.set('always-auth', original)
     t.end()
   })
 })
diff --git a/deps/npm/test/tap/config-edit.js b/deps/npm/test/tap/config-edit.js
index 97a54d2ece58da..f9e09aba3a74a3 100644
--- a/deps/npm/test/tap/config-edit.js
+++ b/deps/npm/test/tap/config-edit.js
@@ -1,39 +1,39 @@
-var fs = require("fs")
-var path = require("path")
+var fs = require('fs')
+var path = require('path')
 
-var mkdirp = require("mkdirp")
-var rimraf = require("rimraf")
-var test = require("tap").test
-var common = require("../common-tap.js")
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var test = require('tap').test
+var common = require('../common-tap.js')
 
-var pkg = path.resolve(__dirname, "npm-global-edit")
+var pkg = path.resolve(__dirname, 'npm-global-edit')
 
 var editorSrc = function () {/*
 #!/usr/bin/env node
-var fs = require("fs")
+var fs = require('fs')
 if (fs.existsSync(process.argv[2])) {
-  console.log("success")
+  console.log('success')
 } else {
-  console.log("error")
+  console.log('error')
   process.exit(1)
 }
-*/}.toString().split("\n").slice(1, -1).join("\n")
-var editorPath = path.join(pkg, "editor")
+*/}.toString().split('\n').slice(1, -1).join('\n')
+var editorPath = path.join(pkg, 'editor')
 
-test("setup", function (t) {
+test('setup', function (t) {
   cleanup(function (er) {
-    t.ifError(er, "old directory removed")
+    t.ifError(er, 'old directory removed')
 
-    mkdirp(pkg, "0777", function (er) {
+    mkdirp(pkg, '0777', function (er) {
       fs.writeFileSync(editorPath, editorSrc)
-      fs.chmodSync(editorPath, "0777")
-      t.ifError(er, "created package directory correctly")
+      fs.chmodSync(editorPath, '0777')
+      t.ifError(er, 'created package directory correctly')
       t.end()
     })
   })
 })
 
-test("saving configs", function (t) {
+test('saving configs', function (t) {
   var opts = {
     cwd: pkg,
     env: {
@@ -43,26 +43,26 @@ test("saving configs", function (t) {
   }
   common.npm(
     [
-      "config",
-      "--prefix", pkg,
-      "--global",
-      "edit"
+      'config',
+      '--prefix', pkg,
+      '--global',
+      'edit'
     ],
     opts,
     function (err, code, stdout, stderr) {
-      t.ifError(err, "command ran without issue")
+      t.ifError(err, 'command ran without issue')
 
-      t.equal(stderr, "", "got nothing on stderr")
-      t.equal(code, 0, "exit ok")
-      t.equal(stdout, "success\n", "got success message")
+      t.equal(stderr, '', 'got nothing on stderr')
+      t.equal(code, 0, 'exit ok')
+      t.equal(stdout, 'success\n', 'got success message')
       t.end()
     }
   )
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   cleanup(function (er) {
-    t.ifError(er, "test directory removed OK")
+    t.ifError(er, 'test directory removed OK')
     t.end()
   })
 })
diff --git a/deps/npm/test/tap/config-malformed.js b/deps/npm/test/tap/config-malformed.js
index 0450221462193f..4f74ea5387e59c 100644
--- a/deps/npm/test/tap/config-malformed.js
+++ b/deps/npm/test/tap/config-malformed.js
@@ -1,7 +1,7 @@
 var test = require('tap').test
 
-var npmconf = require("../../lib/config/core.js")
-var common = require("./00-config-setup.js")
+var npmconf = require('../../lib/config/core.js')
+var common = require('./00-config-setup.js')
 
 test('with malformed', function (t) {
   npmconf.load({}, common.malformed, function (er, conf) {
diff --git a/deps/npm/test/tap/config-meta.js b/deps/npm/test/tap/config-meta.js
index 3da27a872b3183..bb40e2038d6555 100644
--- a/deps/npm/test/tap/config-meta.js
+++ b/deps/npm/test/tap/config-meta.js
@@ -4,34 +4,34 @@
 // b) Documented
 // c) Defined in the `npmconf` package.
 
-var test = require("tap").test
-var fs = require("fs")
-var path = require("path")
-var root = path.resolve(__dirname, "..", "..")
-var lib = path.resolve(root, "lib")
-var nm = path.resolve(root, "node_modules")
-var doc = path.resolve(root, "doc/misc/npm-config.md")
+var test = require('tap').test
+var fs = require('fs')
+var path = require('path')
+var root = path.resolve(__dirname, '..', '..')
+var lib = path.resolve(root, 'lib')
+var nm = path.resolve(root, 'node_modules')
+var doc = path.resolve(root, 'doc/misc/npm-config.md')
 var FILES = []
 var CONFS = {}
 var DOC = {}
 
 var exceptions = [
-  path.resolve(lib, "adduser.js"),
-  path.resolve(lib, "config.js"),
-  path.resolve(lib, "publish.js"),
-  path.resolve(lib, "utils", "lifecycle.js"),
-  path.resolve(lib, "utils", "map-to-registry.js"),
-  path.resolve(nm, "npm-registry-client", "lib", "publish.js"),
-  path.resolve(nm, "npm-registry-client", "lib", "request.js")
+  path.resolve(lib, 'adduser.js'),
+  path.resolve(lib, 'config.js'),
+  path.resolve(lib, 'publish.js'),
+  path.resolve(lib, 'utils', 'lifecycle.js'),
+  path.resolve(lib, 'utils', 'map-to-registry.js'),
+  path.resolve(nm, 'npm-registry-client', 'lib', 'publish.js'),
+  path.resolve(nm, 'npm-registry-client', 'lib', 'request.js')
 ]
 
-test("get files", function (t) {
+test('get files', function (t) {
   walk(nm)
   walk(lib)
-  t.pass("got files")
+  t.pass('got files')
   t.end()
 
-  function walk(lib) {
+  function walk (lib) {
     var files = fs.readdirSync(lib).map(function (f) {
       return path.resolve(lib, f)
     })
@@ -41,86 +41,89 @@ test("get files", function (t) {
       } catch (er) {
         return
       }
-      if (s.isDirectory())
+      if (s.isDirectory()) {
         walk(f)
-      else if (f.match(/\.js$/))
+      } else if (f.match(/\.js$/)) {
         FILES.push(f)
+      }
     })
   }
 })
 
-test("get lines", function (t) {
+test('get lines', function (t) {
   FILES.forEach(function (f) {
-    var lines = fs.readFileSync(f, "utf8").split(/\r|\n/)
+    var lines = fs.readFileSync(f, 'utf8').split(/\r|\n/)
     lines.forEach(function (l, i) {
       var matches = l.split(/conf(?:ig)?\.get\(/g)
       matches.shift()
       matches.forEach(function (m) {
-        m = m.split(")").shift()
-        var literal = m.match(/^['"].+?['"]/)
+        m = m.split(')').shift()
+        var literal = m.match(/^[''].+?['']/)
         if (literal) {
           m = literal[0].slice(1, -1)
-          if (!m.match(/^\_/) && m !== "argv")
+          if (!m.match(/^\_/) && m !== 'argv') {
             CONFS[m] = {
               file: f,
               line: i
             }
+          }
         } else if (exceptions.indexOf(f) === -1) {
-          t.fail("non-string-literal config used in " + f + ":" + i)
+          t.fail('non-string-literal config used in ' + f + ':' + i)
         }
       })
     })
   })
-  t.pass("got lines")
+  t.pass('got lines')
   t.end()
 })
 
-test("get docs", function (t) {
-  var d = fs.readFileSync(doc, "utf8").split(/\r|\n/)
-  // walk down until the "## Config Settings" section
-  for (var i = 0; i < d.length && d[i] !== "## Config Settings"; i++);
+test('get docs', function (t) {
+  var d = fs.readFileSync(doc, 'utf8').split(/\r|\n/)
+  // walk down until the '## Config Settings' section
+  for (var i = 0; i < d.length && d[i] !== '## Config Settings'; i++);
   i++
   // now gather up all the ^###\s lines until the next ^##\s
   for (; i < d.length && !d[i].match(/^## /); i++) {
-    if (d[i].match(/^### /))
-      DOC[ d[i].replace(/^### /, "").trim() ] = true
+    if (d[i].match(/^### /)) {
+      DOC[ d[i].replace(/^### /, '').trim() ] = true
+    }
   }
-  t.pass("read the docs")
+  t.pass('read the docs')
   t.end()
 })
 
-test("check configs", function (t) {
-  var defs = require("../../lib/config/defaults.js")
+test('check configs', function (t) {
+  var defs = require('../../lib/config/defaults.js')
   var types = Object.keys(defs.types)
   var defaults = Object.keys(defs.defaults)
   for (var c1 in CONFS) {
     if (CONFS[c1].file.indexOf(lib) === 0) {
-      t.ok(DOC[c1], "should be documented " + c1 + " "
-          + CONFS[c1].file + ":" + CONFS[c1].line)
-      t.ok(types.indexOf(c1) !== -1, "should be defined in npmconf " + c1)
-      t.ok(defaults.indexOf(c1) !== -1, "should have default in npmconf " + c1)
+      t.ok(DOC[c1], 'should be documented ' + c1 + ' ' +
+           CONFS[c1].file + ':' + CONFS[c1].line)
+      t.ok(types.indexOf(c1) !== -1, 'should be defined in npmconf ' + c1)
+      t.ok(defaults.indexOf(c1) !== -1, 'should have default in npmconf ' + c1)
     }
   }
 
   for (var c2 in DOC) {
-    if (c2 !== "versions" && c2 !== "version" && c2 !== "init.version") {
-      t.ok(CONFS[c2], "config in doc should be used somewhere " + c2)
-      t.ok(types.indexOf(c2) !== -1, "should be defined in npmconf " + c2)
-      t.ok(defaults.indexOf(c2) !== -1, "should have default in npmconf " + c2)
+    if (c2 !== 'versions' && c2 !== 'version' && c2 !== 'init.version') {
+      t.ok(CONFS[c2], 'config in doc should be used somewhere ' + c2)
+      t.ok(types.indexOf(c2) !== -1, 'should be defined in npmconf ' + c2)
+      t.ok(defaults.indexOf(c2) !== -1, 'should have default in npmconf ' + c2)
     }
   }
 
   types.forEach(function (c) {
-    if (!c.match(/^\_/) && c !== "argv" && !c.match(/^versions?$/)) {
-      t.ok(DOC[c], "defined type should be documented " + c)
-      t.ok(CONFS[c], "defined type should be used " + c)
+    if (!c.match(/^\_/) && c !== 'argv' && !c.match(/^versions?$/)) {
+      t.ok(DOC[c], 'defined type should be documented ' + c)
+      t.ok(CONFS[c], 'defined type should be used ' + c)
     }
   })
 
   defaults.forEach(function (c) {
-    if (!c.match(/^\_/) && c !== "argv" && !c.match(/^versions?$/)) {
-      t.ok(DOC[c], "defaulted type should be documented " + c)
-      t.ok(CONFS[c], "defaulted type should be used " + c)
+    if (!c.match(/^\_/) && c !== 'argv' && !c.match(/^versions?$/)) {
+      t.ok(DOC[c], 'defaulted type should be documented ' + c)
+      t.ok(CONFS[c], 'defaulted type should be used ' + c)
     }
   })
 
diff --git a/deps/npm/test/tap/config-private.js b/deps/npm/test/tap/config-private.js
index 37e283eec321e4..97c6a73f14e27c 100644
--- a/deps/npm/test/tap/config-private.js
+++ b/deps/npm/test/tap/config-private.js
@@ -1,81 +1,81 @@
-var fs = require("fs")
-var path = require("path")
-var test = require("tap").test
-var rimraf = require("rimraf")
-var mkdirp = require("mkdirp")
-var common = require("../common-tap.js")
+var fs = require('fs')
+var path = require('path')
+var test = require('tap').test
+var rimraf = require('rimraf')
+var mkdirp = require('mkdirp')
+var common = require('../common-tap.js')
 
-var pkg = path.resolve(__dirname, "config-private")
+var pkg = path.resolve(__dirname, 'config-private')
 var opts = { cwd: pkg }
 
-test("setup", function (t) {
+test('setup', function (t) {
   rimraf.sync(pkg)
   mkdirp.sync(pkg)
   t.end()
 })
 
-test("config get private var (old auth)", function (t) {
+test('config get private var (old auth)', function (t) {
   common.npm([
-      "config",
-      "get",
-      "_auth"
+      'config',
+      'get',
+      '_auth'
     ],
     opts,
     function (err, code, stdout, stderr) {
       t.ifError(err)
 
-      t.similar(stderr, /sekretz/, "password blocked on stderr")
-      t.equal(stdout, "", "no output")
+      t.similar(stderr, /sekretz/, 'password blocked on stderr')
+      t.equal(stdout, '', 'no output')
       t.end()
     }
   )
 })
 
-test("config get private var (new auth)", function (t) {
+test('config get private var (new auth)', function (t) {
   common.npm([
-      "config",
-      "get",
-      "//registry.npmjs.org/:_password"
+      'config',
+      'get',
+      '//registry.npmjs.org/:_password'
     ],
     opts,
     function (err, code, stdout, stderr) {
       t.ifError(err)
 
-      t.similar(stderr, /sekretz/, "password blocked on stderr")
-      t.equal(stdout, "", "no output")
+      t.similar(stderr, /sekretz/, 'password blocked on stderr')
+      t.equal(stdout, '', 'no output')
       t.end()
     }
   )
 })
 
-test("config get public var (new username)", function (t) {
-  var FIXTURE_PATH = path.resolve(pkg, "fixture_npmrc")
-  var s = "//registry.lvh.me/:username = wombat\n" +
-          "//registry.lvh.me/:_password = YmFkIHBhc3N3b3Jk\n" +
-          "//registry.lvh.me/:email = lindsay@wdu.org.au\n"
-  fs.writeFileSync(FIXTURE_PATH, s, "ascii")
-  fs.chmodSync(FIXTURE_PATH, "0444")
+test('config get public var (new username)', function (t) {
+  var FIXTURE_PATH = path.resolve(pkg, 'fixture_npmrc')
+  var s = '//registry.lvh.me/:username = wombat\n' +
+          '//registry.lvh.me/:_password = YmFkIHBhc3N3b3Jk\n' +
+          '//registry.lvh.me/:email = lindsay@wdu.org.au\n'
+  fs.writeFileSync(FIXTURE_PATH, s, 'ascii')
+  fs.chmodSync(FIXTURE_PATH, '0444')
 
   common.npm(
     [
-      "config",
-      "get",
-      "//registry.lvh.me/:username",
-      "--userconfig=" + FIXTURE_PATH,
-      "--registry=http://registry.lvh.me/"
+      'config',
+      'get',
+      '//registry.lvh.me/:username',
+      '--userconfig=' + FIXTURE_PATH,
+      '--registry=http://registry.lvh.me/'
     ],
     opts,
     function (err, code, stdout, stderr) {
       t.ifError(err)
 
-      t.equal(stderr, "", "stderr is empty")
-      t.equal(stdout, "wombat\n", "got usename is output")
+      t.equal(stderr, '', 'stderr is empty')
+      t.equal(stdout, 'wombat\n', 'got usename is output')
       t.end()
     }
   )
 })
 
-test("clean", function (t) {
+test('clean', function (t) {
   rimraf.sync(pkg)
   t.end()
 })
diff --git a/deps/npm/test/tap/config-project.js b/deps/npm/test/tap/config-project.js
index 337355bf286c16..b9e8b7ac04a2ef 100644
--- a/deps/npm/test/tap/config-project.js
+++ b/deps/npm/test/tap/config-project.js
@@ -1,21 +1,21 @@
-var test = require("tap").test
-var path = require("path")
-var fix = path.resolve(__dirname, "..", "fixtures", "config")
-var projectRc = path.resolve(fix, ".npmrc")
-var npmconf = require("../../lib/config/core.js")
-var common = require("./00-config-setup.js")
+var test = require('tap').test
+var path = require('path')
+var fix = path.resolve(__dirname, '..', 'fixtures', 'config')
+var projectRc = path.resolve(fix, '.npmrc')
+var npmconf = require('../../lib/config/core.js')
+var common = require('./00-config-setup.js')
 
-var projectData = { just: "testing" }
+var projectData = { just: 'testing' }
 
 var ucData = common.ucData
 var envData = common.envData
 var envDataFix = common.envDataFix
 
-var gcData = { "package-config:foo": "boo" }
+var gcData = { 'package-config:foo': 'boo' }
 
 var biData = {}
 
-var cli = { foo: "bar", umask: 022, prefix: fix }
+var cli = { foo: 'bar', umask: parseInt('022', 8), prefix: fix }
 
 var expectList = [
   cli,
@@ -31,27 +31,27 @@ var expectSources = {
   env: {
     data: envDataFix,
     source: envData,
-    prefix: ""
+    prefix: ''
   },
   project: {
     path: projectRc,
-    type: "ini",
+    type: 'ini',
     data: projectData
   },
   user: {
     path: common.userconfig,
-    type: "ini",
+    type: 'ini',
     data: ucData
   },
   global: {
     path: common.globalconfig,
-    type: "ini",
+    type: 'ini',
     data: gcData
   },
   builtin: { data: biData }
 }
 
-test("no builtin", function (t) {
+test('no builtin', function (t) {
   npmconf.load(cli, function (er, conf) {
     if (er) throw er
     t.same(conf.list, expectList)
@@ -59,8 +59,8 @@ test("no builtin", function (t) {
     t.same(npmconf.rootConf.list, [])
     t.equal(npmconf.rootConf.root, npmconf.defs.defaults)
     t.equal(conf.root, npmconf.defs.defaults)
-    t.equal(conf.get("umask"), 022)
-    t.equal(conf.get("heading"), "npm")
+    t.equal(conf.get('umask'), parseInt('022', 8))
+    t.equal(conf.get('heading'), 'npm')
     t.end()
   })
 })
diff --git a/deps/npm/test/tap/config-save.js b/deps/npm/test/tap/config-save.js
index 88526a38af8b87..903bac7ae3a4a2 100644
--- a/deps/npm/test/tap/config-save.js
+++ b/deps/npm/test/tap/config-save.js
@@ -1,88 +1,87 @@
-var fs = require("fs")
-var ini = require("ini")
-var test = require("tap").test
-var npmconf = require("../../lib/config/core.js")
-var common = require("./00-config-setup.js")
+var fs = require('fs')
+var ini = require('ini')
+var test = require('tap').test
+var npmconf = require('../../lib/config/core.js')
+var common = require('./00-config-setup.js')
 
 var expectConf = [
-  "globalconfig = " + common.globalconfig,
-  "email = i@izs.me",
-  "env-thing = asdf",
-  "init.author.name = Isaac Z. Schlueter",
-  "init.author.email = i@izs.me",
-  "init.author.url = http://blog.izs.me/",
-  "init.version = 1.2.3",
-  "proprietary-attribs = false",
-  "npm:publishtest = true",
-  "_npmjs.org:couch = https://admin:password@localhost:5984/registry",
-  "npm-www:nocache = 1",
-  "sign-git-tag = false",
-  "message = v%s",
-  "strict-ssl = false",
-  "_auth = dXNlcm5hbWU6cGFzc3dvcmQ=",
-  "",
-  "[_token]",
-  "AuthSession = yabba-dabba-doodle",
-  "version = 1",
-  "expires = 1345001053415",
-  "path = /",
-  "httponly = true",
-  ""
-].join("\n")
+  'globalconfig = ' + common.globalconfig,
+  'email = i@izs.me',
+  'env-thing = asdf',
+  'init.author.name = Isaac Z. Schlueter',
+  'init.author.email = i@izs.me',
+  'init.author.url = http://blog.izs.me/',
+  'init.version = 1.2.3',
+  'proprietary-attribs = false',
+  'npm:publishtest = true',
+  '_npmjs.org:couch = https://admin:password@localhost:5984/registry',
+  'npm-www:nocache = 1',
+  'sign-git-tag = false',
+  'message = v%s',
+  'strict-ssl = false',
+  '_auth = dXNlcm5hbWU6cGFzc3dvcmQ=',
+  '',
+  '[_token]',
+  'AuthSession = yabba-dabba-doodle',
+  'version = 1',
+  'expires = 1345001053415',
+  'path = /',
+  'httponly = true',
+  ''
+].join('\n')
 
 var expectFile = [
-  "globalconfig = " + common.globalconfig,
-  "email = i@izs.me",
-  "env-thing = asdf",
-  "init.author.name = Isaac Z. Schlueter",
-  "init.author.email = i@izs.me",
-  "init.author.url = http://blog.izs.me/",
-  "init.version = 1.2.3",
-  "proprietary-attribs = false",
-  "npm:publishtest = true",
-  "_npmjs.org:couch = https://admin:password@localhost:5984/registry",
-  "npm-www:nocache = 1",
-  "sign-git-tag = false",
-  "message = v%s",
-  "strict-ssl = false",
-  "_auth = dXNlcm5hbWU6cGFzc3dvcmQ=",
-  "",
-  "[_token]",
-  "AuthSession = yabba-dabba-doodle",
-  "version = 1",
-  "expires = 1345001053415",
-  "path = /",
-  "httponly = true",
-  ""
-].join("\n")
+  'globalconfig = ' + common.globalconfig,
+  'email = i@izs.me',
+  'env-thing = asdf',
+  'init.author.name = Isaac Z. Schlueter',
+  'init.author.email = i@izs.me',
+  'init.author.url = http://blog.izs.me/',
+  'init.version = 1.2.3',
+  'proprietary-attribs = false',
+  'npm:publishtest = true',
+  '_npmjs.org:couch = https://admin:password@localhost:5984/registry',
+  'npm-www:nocache = 1',
+  'sign-git-tag = false',
+  'message = v%s',
+  'strict-ssl = false',
+  '_auth = dXNlcm5hbWU6cGFzc3dvcmQ=',
+  '',
+  '[_token]',
+  'AuthSession = yabba-dabba-doodle',
+  'version = 1',
+  'expires = 1345001053415',
+  'path = /',
+  'httponly = true',
+  ''
+].join('\n')
 
-test("saving configs", function (t) {
+test('saving configs', function (t) {
   npmconf.load(function (er, conf) {
-    if (er)
-      throw er
-    conf.set("sign-git-tag", false, "user")
-    conf.del("nodedir")
-    conf.del("tmp")
+    if (er) throw er
+
+    conf.set('sign-git-tag', false, 'user')
+    conf.del('nodedir')
+    conf.del('tmp')
     var foundConf = ini.stringify(conf.sources.user.data)
     t.same(ini.parse(foundConf), ini.parse(expectConf))
     fs.unlinkSync(common.userconfig)
-    conf.save("user", function (er) {
-      if (er)
-        throw er
-      var uc = fs.readFileSync(conf.get("userconfig"), "utf8")
+    conf.save('user', function (er) {
+      if (er) throw er
+
+      var uc = fs.readFileSync(conf.get('userconfig'), 'utf8')
       t.same(ini.parse(uc), ini.parse(expectFile))
       t.end()
     })
   })
 })
 
-test("setting prefix", function (t) {
+test('setting prefix', function (t) {
   npmconf.load(function (er, conf) {
-    if (er)
-      throw er
+    if (er) throw er
 
-    conf.prefix = "newvalue"
-    t.same(conf.prefix, "newvalue")
+    conf.prefix = 'newvalue'
+    t.same(conf.prefix, 'newvalue')
     t.end()
   })
 })
diff --git a/deps/npm/test/tap/cruft-test.js b/deps/npm/test/tap/cruft-test.js
new file mode 100644
index 00000000000000..0cbcc6f56c61d6
--- /dev/null
+++ b/deps/npm/test/tap/cruft-test.js
@@ -0,0 +1,43 @@
+'use strict'
+var fs = require('graceful-fs')
+var path = require('path')
+var mkdirpSync = require('mkdirp').sync
+var rimraf = require('rimraf')
+var test = require('tap').test
+var common = require('../common-tap.js')
+
+var base = path.join(__dirname, path.basename(__filename, '.js'))
+var cruft = path.join(base, 'node_modules', 'cruuuft')
+var pkg = {
+  name: 'example',
+  version: '1.0.0',
+  dependencies: {}
+}
+
+function setup () {
+  mkdirpSync(path.dirname(cruft))
+  fs.writeFileSync(cruft, 'this is some cruft for sure')
+  fs.writeFileSync(path.join(base, 'package.json'), JSON.stringify(pkg))
+}
+
+function cleanup () {
+  rimraf.sync(base)
+}
+
+test('setup', function (t) {
+  cleanup()
+  setup()
+  t.done()
+})
+
+test('cruft', function (t) {
+  common.npm(['ls'], {cwd: base}, function (er, code, stdout, stderr) {
+    t.is(stderr, '', 'no warnings or errors from ls')
+    t.done()
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.done()
+})
diff --git a/deps/npm/test/tap/dedupe-scoped.js b/deps/npm/test/tap/dedupe-scoped.js
index a093e1f8c064bf..bc352356d43d04 100644
--- a/deps/npm/test/tap/dedupe-scoped.js
+++ b/deps/npm/test/tap/dedupe-scoped.js
@@ -11,12 +11,11 @@ var modules = join(pkg, 'node_modules')
 
 var EXEC_OPTS = { cwd: pkg }
 
-var prolog = 'dedupe@0.0.0 ' + pkg
 var body = function () {/*
-├─┬ first@1.0.0
-│ └── @scope/shared@2.1.6
-└─┬ second@2.0.0
-  └── @scope/shared@2.1.6
+@scope/shared@2.1.6 node_modules/first/node_modules/@scope/shared -> node_modules/@scope/shared
+firstUnique@0.6.0 node_modules/first/node_modules/firstUnique -> node_modules/firstUnique
+secondUnique@1.2.0 node_modules/second/node_modules/secondUnique -> node_modules/secondUnique
+- @scope/shared@2.1.6 node_modules/second/node_modules/@scope/shared
 */}.toString().split('\n').slice(1, -1)
 
 var deduper = {
@@ -61,7 +60,6 @@ var secondUnique = {
   'version': '1.2.0'
 }
 
-
 test('setup', function (t) {
   setup()
   t.end()
@@ -82,7 +80,7 @@ test('dedupe finds the common scoped modules and moves it up one level', functio
       t.notOk(stderr, 'npm printed no errors')
       t.same(
         stdout.trim().split('\n').map(ltrimm),
-        [prolog].concat(body).map(ltrimm),
+        body.map(ltrimm),
         'got expected output'
       )
 
diff --git a/deps/npm/test/tap/dedupe.js b/deps/npm/test/tap/dedupe.js
index 7b80102b33458c..4c342481891b67 100644
--- a/deps/npm/test/tap/dedupe.js
+++ b/deps/npm/test/tap/dedupe.js
@@ -24,6 +24,32 @@ var json = {
   }
 }
 
+var shrinkwrap = {
+  name: 'dedupe',
+  version: '0.0.0',
+  dependencies: {
+    clean: {
+      version: '2.1.6',
+      dependencies: {
+        checker: {
+          version: '0.5.2',
+          dependencies: {
+            async: { version: '0.2.10' }
+          }
+        },
+        minimist: { version: '0.0.5' }
+      }
+    },
+    optimist: {
+      version: '0.6.0',
+      dependencies: {
+        wordwrap: { version: '0.0.2' },
+        minimist: { version: '0.0.5' }
+      }
+    }
+  }
+}
+
 test('setup', function (t) {
   t.comment('test for https://github.com/npm/npm/issues/4675')
   setup(function () {
@@ -50,9 +76,15 @@ test('dedupe finds the common module and moves it up one level', function (t) {
         t.ifError(err, 'successfully deduped against previous install')
         t.notOk(code, 'npm dedupe exited with code')
 
-        t.ok(existsSync(path.join(pkg, 'node_modules', 'minimist')))
-        t.notOk(existsSync(path.join(pkg, 'node_modules', 'checker')))
-
+        t.ok(existsSync(path.join(pkg, 'node_modules', 'minimist')), 'minimist module exists')
+        t.notOk(
+          existsSync(path.join(pkg, 'node_modules', 'clean', 'node_modules', 'minimist')),
+          'no clean/minimist'
+        )
+        t.notOk(
+          existsSync(path.join(pkg, 'node_modules', 'optimist', 'node_modules', 'minimist')),
+          'no optmist/minimist'
+        )
         t.end()
       }
     )
@@ -72,11 +104,15 @@ function cleanup () {
 
 function setup (cb) {
   cleanup()
-  mkdirp.sync(path.join(pkg, 'node_modules'))
+  mkdirp.sync(pkg)
   fs.writeFileSync(
     path.join(pkg, 'package.json'),
     JSON.stringify(json, null, 2)
   )
+  fs.writeFileSync(
+    path.join(pkg, 'npm-shrinkwrap.json'),
+    JSON.stringify(shrinkwrap, null, 2)
+  )
   process.chdir(pkg)
 
   mr({ port: common.port }, function (er, s) {
diff --git a/deps/npm/test/tap/deprecate.js b/deps/npm/test/tap/deprecate.js
index 0c46453559609d..1d9a867cd7488f 100644
--- a/deps/npm/test/tap/deprecate.js
+++ b/deps/npm/test/tap/deprecate.js
@@ -1,14 +1,8 @@
-var fs = require('fs')
-var path = require('path')
-var mkdirp = require('mkdirp')
-var rimraf = require('rimraf')
 var mr = require('npm-registry-mock')
-var semver = require('semver')
 
 var test = require('tap').test
 var common = require('../common-tap.js')
 
-var pkg = path.resolve(__dirname, 'deprecate')
 var server
 
 var cache = {
diff --git a/deps/npm/test/tap/dist-tag.js b/deps/npm/test/tap/dist-tag.js
index 08a5ca438c6e40..62ecab2c0a5301 100644
--- a/deps/npm/test/tap/dist-tag.js
+++ b/deps/npm/test/tap/dist-tag.js
@@ -1,62 +1,62 @@
-var fs = require("fs")
-var path = require("path")
-var mkdirp = require("mkdirp")
-var rimraf = require("rimraf")
-var mr = require("npm-registry-mock")
+var fs = require('fs')
+var path = require('path')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var mr = require('npm-registry-mock')
 
-var test = require("tap").test
-var common = require("../common-tap.js")
+var test = require('tap').test
+var common = require('../common-tap.js')
 
-var pkg = path.resolve(__dirname, "dist-tag")
+var pkg = path.resolve(__dirname, 'dist-tag')
 var server
 
 var scoped = {
-  name : "@scoped/pkg",
-  version : "1.1.1"
+  name: '@scoped/pkg',
+  version: '1.1.1'
 }
 
 function mocks (server) {
   // ls current package
-  server.get("/-/package/@scoped%2fpkg/dist-tags")
-    .reply(200, { latest : "1.0.0", a : "0.0.1", b : "0.5.0" })
+  server.get('/-/package/@scoped%2fpkg/dist-tags')
+    .reply(200, { latest: '1.0.0', a: '0.0.1', b: '0.5.0' })
 
   // ls named package
-  server.get("/-/package/@scoped%2fanother/dist-tags")
-    .reply(200, { latest : "2.0.0", a : "0.0.2", b : "0.6.0" })
+  server.get('/-/package/@scoped%2fanother/dist-tags')
+    .reply(200, { latest: '2.0.0', a: '0.0.2', b: '0.6.0' })
 
   // add c
-  server.get("/-/package/@scoped%2fanother/dist-tags")
-    .reply(200, { latest : "2.0.0", a : "0.0.2", b : "0.6.0" })
-  server.put("/-/package/@scoped%2fanother/dist-tags/c", "\"7.7.7\"")
-    .reply(200, { latest : "7.7.7", a : "0.0.2", b : "0.6.0", c : "7.7.7" })
+  server.get('/-/package/@scoped%2fanother/dist-tags')
+    .reply(200, { latest: '2.0.0', a: '0.0.2', b: '0.6.0' })
+  server.put('/-/package/@scoped%2fanother/dist-tags/c', '\"7.7.7\"')
+    .reply(200, { latest: '7.7.7', a: '0.0.2', b: '0.6.0', c: '7.7.7' })
 
   // set same version
-  server.get("/-/package/@scoped%2fanother/dist-tags")
-    .reply(200, { latest : "2.0.0", b : "0.6.0" })
+  server.get('/-/package/@scoped%2fanother/dist-tags')
+    .reply(200, { latest: '2.0.0', b: '0.6.0' })
 
   // rm
-  server.get("/-/package/@scoped%2fanother/dist-tags")
-    .reply(200, { latest : "2.0.0", a : "0.0.2", b : "0.6.0", c : "7.7.7" })
-  server.delete("/-/package/@scoped%2fanother/dist-tags/c")
-    .reply(200, { c : "7.7.7" })
+  server.get('/-/package/@scoped%2fanother/dist-tags')
+    .reply(200, { latest: '2.0.0', a: '0.0.2', b: '0.6.0', c: '7.7.7' })
+  server.delete('/-/package/@scoped%2fanother/dist-tags/c')
+    .reply(200, { c: '7.7.7' })
 
   // rm
-  server.get("/-/package/@scoped%2fanother/dist-tags")
-    .reply(200, { latest : "4.0.0" })
+  server.get('/-/package/@scoped%2fanother/dist-tags')
+    .reply(200, { latest: '4.0.0' })
 }
 
-test("setup", function (t) {
+test('setup', function (t) {
   mkdirp(pkg, function (er) {
-    t.ifError(er, pkg + " made successfully")
+    t.ifError(er, pkg + ' made successfully')
 
-    mr({port : common.port, plugin : mocks}, function (er, s) {
+    mr({ port: common.port, plugin: mocks }, function (er, s) {
       server = s
 
       fs.writeFile(
-        path.join(pkg, "package.json"),
+        path.join(pkg, 'package.json'),
         JSON.stringify(scoped),
         function (er) {
-          t.ifError(er, "wrote package.json")
+          t.ifError(er, 'wrote package.json')
           t.end()
         }
       )
@@ -64,131 +64,131 @@ test("setup", function (t) {
   })
 })
 
-test("npm dist-tags ls in current package", function (t) {
+test('npm dist-tags ls in current package', function (t) {
   common.npm(
     [
-      "dist-tags", "ls",
-      "--registry", common.registry,
-      "--loglevel", "silent"
+      'dist-tags', 'ls',
+      '--registry', common.registry,
+      '--loglevel', 'silent'
     ],
-    { cwd : pkg },
+    { cwd: pkg },
     function (er, code, stdout, stderr) {
-      t.ifError(er, "npm access")
-      t.notOk(code, "exited OK")
-      t.notOk(stderr, "no error output")
-      t.equal(stdout, "a: 0.0.1\nb: 0.5.0\nlatest: 1.0.0\n")
+      t.ifError(er, 'npm access')
+      t.notOk(code, 'exited OK')
+      t.notOk(stderr, 'no error output')
+      t.equal(stdout, 'a: 0.0.1\nb: 0.5.0\nlatest: 1.0.0\n')
 
       t.end()
     }
   )
 })
 
-test("npm dist-tags ls on named package", function (t) {
+test('npm dist-tags ls on named package', function (t) {
   common.npm(
     [
-      "dist-tags",
-      "ls", "@scoped/another",
-      "--registry", common.registry,
-      "--loglevel", "silent"
+      'dist-tags',
+      'ls', '@scoped/another',
+      '--registry', common.registry,
+      '--loglevel', 'silent'
     ],
-    { cwd : pkg },
+    { cwd: pkg },
     function (er, code, stdout, stderr) {
-      t.ifError(er, "npm access")
-      t.notOk(code, "exited OK")
-      t.notOk(stderr, "no error output")
-      t.equal(stdout, "a: 0.0.2\nb: 0.6.0\nlatest: 2.0.0\n")
+      t.ifError(er, 'npm access')
+      t.notOk(code, 'exited OK')
+      t.notOk(stderr, 'no error output')
+      t.equal(stdout, 'a: 0.0.2\nb: 0.6.0\nlatest: 2.0.0\n')
 
       t.end()
     }
   )
 })
 
-test("npm dist-tags add @scoped/another@7.7.7 c", function (t) {
+test('npm dist-tags add @scoped/another@7.7.7 c', function (t) {
   common.npm(
     [
-      "dist-tags",
-      "add", "@scoped/another@7.7.7", "c",
-      "--registry", common.registry,
-      "--loglevel", "silent"
+      'dist-tags',
+      'add', '@scoped/another@7.7.7', 'c',
+      '--registry', common.registry,
+      '--loglevel', 'silent'
     ],
-    { cwd : pkg },
+    { cwd: pkg },
     function (er, code, stdout, stderr) {
-      t.ifError(er, "npm access")
-      t.notOk(code, "exited OK")
-      t.notOk(stderr, "no error output")
-      t.equal(stdout, "+c: @scoped/another@7.7.7\n")
+      t.ifError(er, 'npm access')
+      t.notOk(code, 'exited OK')
+      t.notOk(stderr, 'no error output')
+      t.equal(stdout, '+c: @scoped/another@7.7.7\n')
 
       t.end()
     }
   )
 })
 
-test("npm dist-tags set same version", function (t) {
+test('npm dist-tags set same version', function (t) {
   common.npm(
     [
-      "dist-tag",
-      "set", "@scoped/another@0.6.0", "b",
-      "--registry", common.registry,
-      "--loglevel", "warn"
+      'dist-tag',
+      'set', '@scoped/another@0.6.0', 'b',
+      '--registry', common.registry,
+      '--loglevel', 'warn'
     ],
-    { cwd : pkg },
+    { cwd: pkg },
     function (er, code, stdout, stderr) {
-      t.ifError(er, "npm access")
-      t.notOk(code, "exited OK")
+      t.ifError(er, 'npm access')
+      t.notOk(code, 'exited OK')
       t.equal(
         stderr,
-        "npm WARN dist-tag add b is already set to version 0.6.0\n",
-        "warned about setting same version"
+        'npm WARN dist-tag add b is already set to version 0.6.0\n',
+        'warned about setting same version'
       )
-      t.notOk(stdout, "only expecting warning message")
+      t.notOk(stdout, 'only expecting warning message')
 
       t.end()
     }
   )
 })
 
-test("npm dist-tags rm @scoped/another c", function (t) {
+test('npm dist-tags rm @scoped/another c', function (t) {
   common.npm(
     [
-      "dist-tags",
-      "rm", "@scoped/another", "c",
-      "--registry", common.registry,
-      "--loglevel", "silent"
+      'dist-tags',
+      'rm', '@scoped/another', 'c',
+      '--registry', common.registry,
+      '--loglevel', 'silent'
     ],
-    { cwd : pkg },
+    { cwd: pkg },
     function (er, code, stdout, stderr) {
-      t.ifError(er, "npm access")
-      t.notOk(code, "exited OK")
-      t.notOk(stderr, "no error output")
-      t.equal(stdout, "-c: @scoped/another@7.7.7\n")
+      t.ifError(er, 'npm access')
+      t.notOk(code, 'exited OK')
+      t.notOk(stderr, 'no error output')
+      t.equal(stdout, '-c: @scoped/another@7.7.7\n')
 
       t.end()
     }
   )
 })
 
-test("npm dist-tags rm @scoped/another nonexistent", function (t) {
+test('npm dist-tags rm @scoped/another nonexistent', function (t) {
   common.npm(
     [
-      "dist-tags",
-      "rm", "@scoped/another", "nonexistent",
-      "--registry", common.registry,
-      "--loglevel", "silent"
+      'dist-tags',
+      'rm', '@scoped/another', 'nonexistent',
+      '--registry', common.registry,
+      '--loglevel', 'silent'
     ],
-    { cwd : pkg },
+    { cwd: pkg },
     function (er, code, stdout, stderr) {
-      t.ifError(er, "npm dist-tag")
-      t.ok(code, "expecting nonzero exit code")
-      t.notOk(stderr, "no error output")
-      t.notOk(stdout, "not expecting output")
+      t.ifError(er, 'npm dist-tag')
+      t.ok(code, 'expecting nonzero exit code')
+      t.notOk(stderr, 'no error output')
+      t.notOk(stdout, 'not expecting output')
 
       t.end()
     }
   )
 })
 
-test("cleanup", function (t) {
-  t.pass("cleaned up")
+test('cleanup', function (t) {
+  t.pass('cleaned up')
   rimraf.sync(pkg)
   server.close()
   t.end()
diff --git a/deps/npm/test/tap/do-not-remove-other-bins.js b/deps/npm/test/tap/do-not-remove-other-bins.js
new file mode 100644
index 00000000000000..af6de62305469b
--- /dev/null
+++ b/deps/npm/test/tap/do-not-remove-other-bins.js
@@ -0,0 +1,131 @@
+'use strict'
+var fs = require('fs')
+var path = require('path')
+
+var mkdirp = require('mkdirp')
+var osenv = require('osenv')
+var rimraf = require('rimraf')
+var test = require('tap').test
+
+var common = require('../common-tap')
+
+var base = path.resolve(__dirname, path.basename(__filename, '.js'))
+var installPath = path.resolve(base, 'install')
+var installBin = path.resolve(installPath, 'node_modules', '.bin')
+var packageApath = path.resolve(base, 'packageA')
+var packageBpath = path.resolve(base, 'packageB')
+
+var packageA = {
+  name: 'a',
+  version: '1.0.0',
+  description: 'x',
+  repository: 'x',
+  license: 'MIT',
+  bin: {
+    testbin: './testbin.js'
+  }
+}
+var packageB = {
+  name: 'b',
+  version: '1.0.0',
+  description: 'x',
+  repository: 'x',
+  license: 'MIT',
+  bin: {
+    testbin: './testbin.js'
+  }
+}
+
+var EXEC_OPTS = {
+  cwd: installPath
+}
+
+test('setup', function (t) {
+  cleanup()
+  mkdirp.sync(path.join(installPath, 'node_modules'))
+  mkdirp.sync(packageApath)
+  fs.writeFileSync(
+    path.join(packageApath, 'package.json'),
+    JSON.stringify(packageA, null, 2)
+  )
+  fs.writeFileSync(
+    path.join(packageApath, packageA.bin.testbin),
+    ''
+  )
+  mkdirp.sync(packageBpath)
+  fs.writeFileSync(
+    path.join(packageBpath, 'package.json'),
+    JSON.stringify(packageB, null, 2)
+  )
+  fs.writeFileSync(
+    path.join(packageBpath, packageB.bin.testbin),
+    ''
+  )
+  t.end()
+})
+
+test('npm install A', function (t) {
+  process.chdir(installPath)
+  common.npm([
+    'install', packageApath
+  ], EXEC_OPTS, function (err, code, stdout, stderr) {
+    console.log(stdout, stderr)
+    t.ifErr(err, 'install finished successfully')
+    t.notOk(code, 'exit ok')
+    t.notOk(stderr, 'Should not get data on stderr: ' + stderr)
+    t.end()
+  })
+})
+
+test('npm install B', function (t) {
+  process.chdir(installPath)
+  common.npm([
+    'install', packageBpath
+  ], EXEC_OPTS, function (err, code, stdout, stderr) {
+    t.ifErr(err, 'install finished successfully')
+    t.notOk(code, 'exit ok')
+    t.notOk(stderr, 'Should not get data on stderr: ' + stderr)
+    t.end()
+  })
+})
+
+test('verify bins', function (t) {
+  var bin = path.dirname(
+    path.resolve(
+      installBin,
+      fs.readlinkSync(path.join(installBin, 'testbin'))))
+  t.is(bin, path.join(installPath, 'node_modules', 'b'))
+  t.end()
+})
+
+test('rm install A', function (t) {
+  process.chdir(installPath)
+  common.npm([
+    'rm', packageApath
+  ], EXEC_OPTS, function (err, code, stdout, stderr) {
+    t.ifErr(err, 'install finished successfully')
+    t.notOk(code, 'exit ok')
+    t.notOk(stderr, 'Should not get data on stderr: ' + stderr)
+    t.end()
+  })
+})
+
+test('verify postremoval bins', function (t) {
+  var bin = path.dirname(
+    path.resolve(
+      installBin,
+      fs.readlinkSync(path.join(installBin, 'testbin'))))
+  t.is(bin, path.join(installPath, 'node_modules', 'b'))
+  t.end()
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.pass('cleaned up')
+  t.end()
+})
+
+function cleanup () {
+  process.chdir(osenv.tmpdir())
+  rimraf.sync(base)
+}
diff --git a/deps/npm/test/tap/extraneous-dep-cycle-ls-ok.js b/deps/npm/test/tap/extraneous-dep-cycle-ls-ok.js
new file mode 100644
index 00000000000000..23b75193613152
--- /dev/null
+++ b/deps/npm/test/tap/extraneous-dep-cycle-ls-ok.js
@@ -0,0 +1,70 @@
+'use strict'
+var fs = require('fs')
+var path = require('path')
+
+var test = require('tap').test
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+
+var common = require('../common-tap')
+
+var pkg = path.resolve(__dirname, path.basename(__filename, '.js'))
+var pathModA = path.join(pkg, 'node_modules', 'moduleA')
+var pathModB = path.join(pkg, 'node_modules', 'moduleB')
+
+var modA = {
+  name: 'moduleA',
+  version: '1.0.0',
+  _requiredBy: [ '#USER', '/moduleB' ],
+  dependencies: {
+    moduleB: '1.0.0'
+  }
+}
+var modB = {
+  name: 'moduleB',
+  version: '1.0.0',
+  _requiredBy: [ '/moduleA' ],
+  dependencies: {
+    moduleA: '1.0.0'
+  }
+}
+
+function setup () {
+  mkdirp.sync(pathModA)
+  fs.writeFileSync(
+    path.join(pathModA, 'package.json'),
+    JSON.stringify(modA, null, 2)
+  )
+  mkdirp.sync(pathModB)
+  fs.writeFileSync(
+    path.join(pathModB, 'package.json'),
+    JSON.stringify(modB, null, 2)
+  )
+}
+
+function cleanup () {
+  rimraf.sync(pkg)
+}
+
+test('setup', function (t) {
+  cleanup()
+  setup()
+  t.end()
+})
+
+var expected = pkg + '\n' +
+               '└─┬ moduleA@1.0.0\n' +
+               '  └── moduleB@1.0.0\n\n'
+
+test('extraneous-dep-cycle', function (t) {
+  common.npm(['ls'], {cwd: pkg}, function (er, code, stdout, stderr) {
+    t.ifErr(er, 'install finished successfully')
+    t.is(stdout, expected, 'ls output shows module')
+    t.end()
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
diff --git a/deps/npm/test/tap/false-name.js b/deps/npm/test/tap/false-name.js
index c98a5103b272bf..1e2a4d43ddbb93 100644
--- a/deps/npm/test/tap/false-name.js
+++ b/deps/npm/test/tap/false-name.js
@@ -54,11 +54,14 @@ test('not every pkg.name can be required', function (t) {
     function (err, code) {
       t.ifErr(err, 'install finished without error')
       t.equal(code, 0, 'install exited ok')
-      t.ok(existsSync(path.join(
-        pkg,
-        'node_modules/test-package-with-one-dep',
-        'node_modules/test-package'
-      )), 'package installed OK')
+      t.ok(
+        existsSync(path.join(pkg, 'node_modules', 'test-package-with-one-dep')),
+        'test-package-with-one-dep installed OK'
+      )
+      t.ok(
+        existsSync(path.join(pkg, 'node_modules', 'test-package')),
+        'test-pacakge subdep installed OK'
+      )
       t.end()
     }
   )
diff --git a/deps/npm/test/tap/gently-rm-cmdshims.js b/deps/npm/test/tap/gently-rm-cmdshims.js
new file mode 100644
index 00000000000000..ebe0b7d7a71a7f
--- /dev/null
+++ b/deps/npm/test/tap/gently-rm-cmdshims.js
@@ -0,0 +1,157 @@
+'use strict'
+var path = require('path')
+var fs = require('graceful-fs')
+var test = require('tap').test
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var npm = require('../../lib/npm.js')
+
+var work = path.join(__dirname, path.basename(__filename, '.js'))
+var doremove = path.join(work, 'doremove')
+var dontremove = path.join(work, 'dontremove')
+var example_json = {
+  name: 'example',
+  version: '1.0.0',
+  bin: {
+    'example': 'example.js'
+  }
+}
+var example_bin =
+  '#!/usr/bin/env node\n' +
+  'true\n'
+
+// NOTE: if this were actually produced on windows it would be \ not / of
+// course, buuut, path.resolve doesn't understand \ outside of windows =/
+var do_example_cmd =
+  '@IF EXIST "%~dp0\\node.exe" (\n' +
+  '  "%~dp0\\node.exe"  "%~dp0\\../example/example.js" %*\n' +
+  ') ELSE (\n' +
+  '  @SETLOCAL\n' +
+  '  @SET PATHEXT=%PATHEXT:;.JS;=;%\n' +
+  '  node  "%~dp0\\../example/example.js" %*\n' +
+  ')\n'
+
+var do_example_cygwin =
+  '#!/bin/sh\n' +
+  'basedir=`dirname "$0"`\n' +
+  '\n' +
+  'case `uname` in\n' +
+  '    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;\n' +
+  'esac\n' +
+  '\n' +
+  'if [ -x "$basedir/node" ]; then\n' +
+  '  "$basedir/node"  "$basedir/../example/example.js" "$@"\n' +
+  '  ret=$?\n' +
+  'else\n' +
+  '  node  "$basedir/../example/example.js" "$@"\n' +
+  '  ret=$?\n' +
+  'fi\n' +
+  'exit $ret\n'
+
+var dont_example_cmd =
+  '@IF EXIST "%~dp0\\node.exe" (\n' +
+  '  "%~dp0\\node.exe"  "%~dp0\\../example-other/example.js" %*\n' +
+  ') ELSE (\n' +
+  '  @SETLOCAL\n' +
+  '  @SET PATHEXT=%PATHEXT:;.JS;=;%\n' +
+  '  node  "%~dp0\\../example-other/example.js" %*\n' +
+  ')\n'
+
+var dont_example_cygwin =
+  '#!/bin/sh\n' +
+  'basedir=`dirname "$0"`\n' +
+  '\n' +
+  'case `uname` in\n' +
+  '    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;\n' +
+  'esac\n' +
+  '\n' +
+  'if [ -x "$basedir/node" ]; then\n' +
+  '  "$basedir/node"  "$basedir/../example-other/example.js" "$@"\n' +
+  '  ret=$?\n' +
+  'else\n' +
+  '  node  "$basedir/../example-other/example.js" "$@"\n' +
+  '  ret=$?\n' +
+  'fi\n' +
+  'exit $ret\n'
+
+function cleanup () {
+  rimraf.sync(work)
+}
+
+var doremove_module = path.join(doremove, 'node_modules', 'example')
+var doremove_example_cmd = path.join(doremove, 'node_modules', '.bin', 'example.cmd')
+var doremove_example_cygwin = path.join(doremove, 'node_modules', '.bin', 'example')
+var dontremove_module = path.join(dontremove, 'node_modules', 'example')
+var dontremove_example_cmd = path.join(dontremove, 'node_modules', '.bin', 'example.cmd')
+var dontremove_example_cygwin = path.join(dontremove, 'node_modules', '.bin', 'example')
+
+function setup () {
+  mkdirp.sync(doremove_module)
+  mkdirp.sync(path.join(doremove, 'node_modules', '.bin'))
+  fs.writeFileSync(path.join(doremove, 'node_modules', 'example', 'package.json'), JSON.stringify(example_json))
+  fs.writeFileSync(path.join(doremove, 'node_modules', 'example', 'example.js'), JSON.stringify(example_bin))
+  fs.writeFileSync(doremove_example_cmd, do_example_cmd)
+  fs.writeFileSync(doremove_example_cygwin, do_example_cygwin)
+
+  mkdirp.sync(dontremove_module)
+  mkdirp.sync(path.join(dontremove, 'node_modules', '.bin'))
+  fs.writeFileSync(path.join(dontremove, 'node_modules', 'example', 'package.json'), JSON.stringify(example_json))
+  fs.writeFileSync(path.join(dontremove, 'node_modules', 'example', 'example.js'), JSON.stringify(example_bin))
+  fs.writeFileSync(dontremove_example_cmd, dont_example_cmd)
+  fs.writeFileSync(dontremove_example_cygwin, dont_example_cygwin)
+}
+
+test('setup', function (t) {
+  cleanup()
+  setup()
+  npm.load({}, function () {
+    t.done()
+  })
+})
+
+// Like slide.chain, but runs all commands even if they have errors, also
+// throws away results.
+function runAll (cmds, done) {
+  runNext()
+  function runNext () {
+    if (cmds.length === 0) return done()
+    var cmdline = cmds.shift()
+    var cmd = cmdline.shift()
+    cmdline.push(runNext)
+    cmd.apply(null, cmdline)
+  }
+}
+
+test('remove-cmd-shims', function (t) {
+  t.plan(2)
+
+  var gentlyRm = require('../../lib/utils/gently-rm.js')
+  runAll([ [gentlyRm, doremove_example_cmd, true, doremove_module],
+           [gentlyRm, doremove_example_cygwin, true, doremove_module] ], function () {
+    fs.stat(doremove_example_cmd, function (er) {
+      t.is(er && er.code, 'ENOENT', 'cmd-shim was removed')
+    })
+    fs.stat(doremove_example_cygwin, function (er) {
+      t.is(er && er.code, 'ENOENT', 'cmd-shim cygwin script was removed')
+    })
+  })
+})
+
+test('dont-remove-cmd-shims', function (t) {
+  t.plan(2)
+  var gentlyRm = require('../../lib/utils/gently-rm.js')
+  runAll([ [gentlyRm, dontremove_example_cmd, true, dontremove_module],
+           [gentlyRm, dontremove_example_cygwin, true, dontremove_module] ], function () {
+    fs.stat(dontremove_example_cmd, function (er) {
+      t.is(er, null, 'cmd-shim was not removed')
+    })
+    fs.stat(dontremove_example_cygwin, function (er) {
+      t.is(er, null, 'cmd-shim cygwin script was not removed')
+    })
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.done()
+})
diff --git a/deps/npm/test/tap/gently-rm-overeager.js b/deps/npm/test/tap/gently-rm-overeager.js
index 35f46cc2195280..c266f1c4dc1202 100644
--- a/deps/npm/test/tap/gently-rm-overeager.js
+++ b/deps/npm/test/tap/gently-rm-overeager.js
@@ -1,53 +1,50 @@
-var resolve = require("path").resolve
-var fs = require("graceful-fs")
-var test = require("tap").test
-var mkdirp = require("mkdirp")
-var rimraf = require("rimraf")
+var resolve = require('path').resolve
+var fs = require('graceful-fs')
+var test = require('tap').test
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
 
-var common = require("../common-tap.js")
+var common = require('../common-tap.js')
 
-var pkg = resolve(__dirname, "gently-rm-overeager")
-var dep = resolve(__dirname, "test-whoops")
+var pkg = resolve(__dirname, 'gently-rm-overeager')
+var dep = resolve(__dirname, 'test-whoops')
 
-var EXEC_OPTS = {
-  cwd : pkg
-}
+var EXEC_OPTS = { cwd: pkg }
 
 var fixture = {
-  name: "@test/whoops",
-  version: "1.0.0",
+  name: '@test/whoops',
+  version: '1.0.0',
   scripts: {
-    postinstall: "echo \"nope\" && exit 1"
+    postinstall: 'echo \'nope\' && exit 1'
   }
 }
 
-test("setup", function (t) {
+test('setup', function (t) {
   cleanup()
   setup()
 
   t.end()
 })
 
-test("cache add", function (t) {
-  common.npm(["install", "../test-whoops"], EXEC_OPTS, function (er, c) {
+test('cache add', function (t) {
+  common.npm(['install', '../test-whoops'], EXEC_OPTS, function (er, c) {
     t.ifError(er, "test-whoops install didn't explode")
-    t.ok(c, "test-whoops install also failed")
+    t.ok(c, 'test-whoops install also failed')
     fs.readdir(pkg, function (er, files) {
-      t.ifError(er, "package directory is still there")
-      t.deepEqual(files, ["npm-debug.log"], "only debug log remains")
+      t.ifError(er, 'package directory is still there')
+      t.deepEqual(files, ['npm-debug.log'], 'only debug log remains')
 
       t.end()
     })
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   cleanup()
 
   t.end()
 })
 
-
 function cleanup () {
   rimraf.sync(pkg)
   rimraf.sync(dep)
@@ -56,7 +53,7 @@ function cleanup () {
 function setup () {
   mkdirp.sync(pkg)
   // so it doesn't try to install into npm's own node_modules
-  mkdirp.sync(resolve(pkg, "node_modules"))
+  mkdirp.sync(resolve(pkg, 'node_modules'))
   mkdirp.sync(dep)
-  fs.writeFileSync(resolve(dep, "package.json"), JSON.stringify(fixture))
+  fs.writeFileSync(resolve(dep, 'package.json'), JSON.stringify(fixture))
 }
diff --git a/deps/npm/test/tap/gently-rm-symlink.js b/deps/npm/test/tap/gently-rm-symlink.js
index d69b62e5b271bd..93ed3edaa45899 100644
--- a/deps/npm/test/tap/gently-rm-symlink.js
+++ b/deps/npm/test/tap/gently-rm-symlink.js
@@ -1,73 +1,70 @@
-var resolve = require("path").resolve
-var fs = require("graceful-fs")
-var test = require("tap").test
-var mkdirp = require("mkdirp")
-var rimraf = require("rimraf")
+var resolve = require('path').resolve
+var fs = require('graceful-fs')
+var test = require('tap').test
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
 
-var common = require("../common-tap.js")
+var common = require('../common-tap.js')
 
-var pkg = resolve(__dirname, "gently-rm-linked")
-var dep = resolve(__dirname, "test-linked")
-var glb = resolve(__dirname, "test-global")
-var lnk = resolve(__dirname, "test-global-link")
-
-var EXEC_OPTS = {
-  cwd : pkg
-}
+var pkg = resolve(__dirname, 'gently-rm-linked')
+var dep = resolve(__dirname, 'test-linked')
+var glb = resolve(__dirname, 'test-global')
+var lnk = resolve(__dirname, 'test-global-link')
 
+var EXEC_OPTS = { cwd: pkg }
 
 var index = "module.exports = function () { console.log('whoop whoop') }"
 
 var fixture = {
-  name: "@test/linked",
-  version: "1.0.0",
+  name: '@test/linked',
+  version: '1.0.0',
   bin: {
-    linked: "./index.js"
+    linked: './index.js'
   }
 }
 
-test("setup", function (t) {
+test('setup', function (t) {
   cleanup()
   setup()
 
   t.end()
 })
 
-test("install and link", function (t) {
+test('install and link', function (t) {
   common.npm(
     [
-      "--global",
-      "--prefix",   lnk,
-      "--loglevel", "silent",
-      "install",    "../test-linked"
+      '--global',
+      '--prefix', lnk,
+      '--loglevel', 'silent',
+      'install', '../test-linked'
     ],
     EXEC_OPTS,
     function (er, code, stdout, stderr) {
       t.ifError(er, "test-linked install didn't explode")
-      t.notOk(code, "test-linked install also failed")
-      t.notOk(stderr, "no log output")
+      t.notOk(code, 'test-linked install also failed')
+      t.notOk(stderr, 'no log output')
 
       verify(t, stdout)
 
       // again, to make sure unlinking works properlyt
       common.npm(
         [
-          "--global",
-          "--prefix", lnk,
-          "--loglevel", "silent",
-          "install", "../test-linked"
+          '--global',
+          '--prefix', lnk,
+          '--loglevel', 'silent',
+          'install', '../test-linked'
         ],
         EXEC_OPTS,
         function (er, code, stdout, stderr) {
           t.ifError(er, "test-linked install didn't explode")
-          t.notOk(code, "test-linked install also failed")
-          t.notOk(stderr, "no log output")
+          t.notOk(code, 'test-linked install also failed')
+          t.notOk(stderr, 'no log output')
 
           verify(t, stdout)
 
           fs.readdir(pkg, function (er, files) {
-            t.ifError(er, "package directory is still there")
-            t.deepEqual(files, ["node_modules"], "only stub modules dir remains")
+            t.ifError(er, 'package directory is still there')
+            t.deepEqual(files, ['node_modules'], 'only stub modules dir remains')
 
             t.end()
           })
@@ -77,20 +74,27 @@ test("install and link", function (t) {
   )
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   cleanup()
 
   t.end()
 })
 
+function removeBlank (line) {
+  return line !== ''
+}
+
 function verify (t, stdout) {
-  var binPath = resolve(lnk, "bin", "linked")
-  var pkgPath = resolve(lnk, "lib", "node_modules", "@test", "linked")
-  var trgPath = resolve(pkgPath, "index.js")
-  t.equal(
-    stdout,
-    binPath+" -> "+trgPath+"\n@test/linked@1.0.0 "+pkgPath+"\n",
-    "got expected install output"
+  var binPath = resolve(lnk, 'bin', 'linked')
+  var pkgPath = resolve(lnk, 'lib', 'node_modules', '@test', 'linked')
+  var trgPath = resolve(pkgPath, 'index.js')
+  t.deepEqual(
+    stdout.split('\n').filter(removeBlank),
+    [ binPath + ' -> ' + trgPath,
+      resolve(lnk, 'lib'),
+      '└── @test/linked@1.0.0 '
+    ],
+    'got expected install output'
   )
 }
 
@@ -106,8 +110,8 @@ function setup () {
   mkdirp.sync(glb)
   fs.symlinkSync(glb, lnk)
   // so it doesn't try to install into npm's own node_modules
-  mkdirp.sync(resolve(pkg, "node_modules"))
+  mkdirp.sync(resolve(pkg, 'node_modules'))
   mkdirp.sync(dep)
-  fs.writeFileSync(resolve(dep, "package.json"), JSON.stringify(fixture))
-  fs.writeFileSync(resolve(dep, "index.js"), index)
+  fs.writeFileSync(resolve(dep, 'package.json'), JSON.stringify(fixture))
+  fs.writeFileSync(resolve(dep, 'index.js'), index)
 }
diff --git a/deps/npm/test/tap/get.js b/deps/npm/test/tap/get.js
index 983243025b274d..62bb05fda7622e 100644
--- a/deps/npm/test/tap/get.js
+++ b/deps/npm/test/tap/get.js
@@ -1,52 +1,50 @@
-var common = require("../common-tap.js")
-var test = require("tap").test
-var cacheFile = require("npm-cache-filename")
-var npm = require("../../")
-var mkdirp = require("mkdirp")
-var rimraf = require("rimraf")
-var path = require("path")
-var mr = require("npm-registry-mock")
-var fs = require("graceful-fs")
+var common = require('../common-tap.js')
+var test = require('tap').test
+var cacheFile = require('npm-cache-filename')
+var npm = require('../../')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var path = require('path')
+var mr = require('npm-registry-mock')
+var fs = require('graceful-fs')
 
 function nop () {}
 
-var URI      = "https://npm.registry:8043/rewrite"
-var TIMEOUT  = 3600
-var FOLLOW   = false
+var URI = 'https://npm.registry:8043/rewrite'
+var TIMEOUT = 3600
+var FOLLOW = false
 var STALE_OK = true
-var TOKEN    = "lolbutts"
-var AUTH     = {
-  token   : TOKEN
+var TOKEN = 'lolbutts'
+var AUTH = { token: TOKEN }
+var PARAMS = {
+  timeout: TIMEOUT,
+  follow: FOLLOW,
+  staleOk: STALE_OK,
+  auth: AUTH
 }
-var PARAMS   = {
-  timeout : TIMEOUT,
-  follow  : FOLLOW,
-  staleOk : STALE_OK,
-  auth    : AUTH
-}
-var PKG_DIR = path.resolve(__dirname, "get-basic")
-var CACHE_DIR = path.resolve(PKG_DIR, "cache")
+var PKG_DIR = path.resolve(__dirname, 'get-basic')
+var CACHE_DIR = path.resolve(PKG_DIR, 'cache')
 var BIGCO_SAMPLE = {
-  name : "@bigco/sample",
-  version : "1.2.3"
+  name: '@bigco/sample',
+  version: '1.2.3'
 }
 
 // mock server reference
 var server
 
 var mocks = {
-  "get": {
-    "/@bigco%2fsample/1.2.3" : [200, BIGCO_SAMPLE]
+  'get': {
+    '/@bigco%2fsample/1.2.3': [200, BIGCO_SAMPLE]
   }
 }
 
 var mapper = cacheFile(CACHE_DIR)
 
 function getCachePath (uri) {
-  return path.join(mapper(uri), ".cache.json")
+  return path.join(mapper(uri), '.cache.json')
 }
 
-test("setup", function (t) {
+test('setup', function (t) {
   mkdirp.sync(CACHE_DIR)
 
   mr({port: common.port, mocks: mocks}, function (er, s) {
@@ -59,66 +57,66 @@ test("setup", function (t) {
   })
 })
 
-test("get call contract", function (t) {
+test('get call contract', function (t) {
   t.throws(function () {
     npm.registry.get(undefined, PARAMS, nop)
-  }, "requires a URI")
+  }, 'requires a URI')
 
   t.throws(function () {
     npm.registry.get([], PARAMS, nop)
-  }, "requires URI to be a string")
+  }, 'requires URI to be a string')
 
   t.throws(function () {
     npm.registry.get(URI, undefined, nop)
-  }, "requires params object")
+  }, 'requires params object')
 
   t.throws(function () {
-    npm.registry.get(URI, "", nop)
-  }, "params must be object")
+    npm.registry.get(URI, '', nop)
+  }, 'params must be object')
 
   t.throws(function () {
     npm.registry.get(URI, PARAMS, undefined)
-  }, "requires callback")
+  }, 'requires callback')
 
   t.throws(function () {
-    npm.registry.get(URI, PARAMS, "callback")
-  }, "callback must be function")
+    npm.registry.get(URI, PARAMS, 'callback')
+  }, 'callback must be function')
 
   t.end()
 })
 
-test("basic request", function (t) {
+test('basic request', function (t) {
   t.plan(9)
 
-  var versioned = common.registry + "/underscore/1.3.3"
+  var versioned = common.registry + '/underscore/1.3.3'
   npm.registry.get(versioned, PARAMS, function (er, data) {
-    t.ifError(er, "loaded specified version underscore data")
-    t.equal(data.version, "1.3.3")
+    t.ifError(er, 'loaded specified version underscore data')
+    t.equal(data.version, '1.3.3')
     fs.stat(getCachePath(versioned), function (er) {
-      t.ifError(er, "underscore 1.3.3 cache data written")
+      t.ifError(er, 'underscore 1.3.3 cache data written')
     })
   })
 
-  var rollup = common.registry + "/underscore"
+  var rollup = common.registry + '/underscore'
   npm.registry.get(rollup, PARAMS, function (er, data) {
-    t.ifError(er, "loaded all metadata")
-    t.deepEqual(data.name, "underscore")
+    t.ifError(er, 'loaded all metadata')
+    t.deepEqual(data.name, 'underscore')
     fs.stat(getCachePath(rollup), function (er) {
-      t.ifError(er, "underscore rollup cache data written")
+      t.ifError(er, 'underscore rollup cache data written')
     })
   })
 
-  var scoped = common.registry + "/@bigco%2fsample/1.2.3"
+  var scoped = common.registry + '/@bigco%2fsample/1.2.3'
   npm.registry.get(scoped, PARAMS, function (er, data) {
-    t.ifError(er, "loaded all metadata")
-    t.equal(data.name, "@bigco/sample")
+    t.ifError(er, 'loaded all metadata')
+    t.equal(data.name, '@bigco/sample')
     fs.stat(getCachePath(scoped), function (er) {
-      t.ifError(er, "scoped cache data written")
+      t.ifError(er, 'scoped cache data written')
     })
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   server.close()
   rimraf.sync(PKG_DIR)
 
diff --git a/deps/npm/test/tap/gist-short-shortcut.js b/deps/npm/test/tap/gist-short-shortcut.js
index 57f2006b7a3f51..58dcf78e8d2229 100644
--- a/deps/npm/test/tap/gist-short-shortcut.js
+++ b/deps/npm/test/tap/gist-short-shortcut.js
@@ -39,7 +39,7 @@ test('gist-shortcut', function (t) {
           } else {
             t.fail('too many attempts to clone')
           }
-          cb(new Error())
+          cb(new Error('execFile mock fails on purpose'))
         })
       }
     }
diff --git a/deps/npm/test/tap/git-cache-no-hooks.js b/deps/npm/test/tap/git-cache-no-hooks.js
index 32731fa1b0164f..e5d862919a8071 100644
--- a/deps/npm/test/tap/git-cache-no-hooks.js
+++ b/deps/npm/test/tap/git-cache-no-hooks.js
@@ -1,63 +1,63 @@
-var test = require("tap").test
-  , fs = require("fs")
-  , path = require("path")
-  , rimraf = require("rimraf")
-  , mkdirp = require("mkdirp")
-  , spawn = require("child_process").spawn
-  , npmCli = require.resolve("../../bin/npm-cli.js")
-  , node = process.execPath
-  , pkg = path.resolve(__dirname, "git-cache-no-hooks")
-  , tmp = path.join(pkg, "tmp")
-  , cache = path.join(pkg, "cache")
-
-
-test("setup", function (t) {
+var test = require('tap').test
+var fs = require('fs')
+var path = require('path')
+var rimraf = require('rimraf')
+var mkdirp = require('mkdirp')
+var spawn = require('child_process').spawn
+var npmCli = require.resolve('../../bin/npm-cli.js')
+var node = process.execPath
+var pkg = path.resolve(__dirname, 'git-cache-no-hooks')
+var tmp = path.join(pkg, 'tmp')
+var cache = path.join(pkg, 'cache')
+
+test('setup', function (t) {
   rimraf.sync(pkg)
   mkdirp.sync(pkg)
   mkdirp.sync(cache)
   mkdirp.sync(tmp)
-  mkdirp.sync(path.resolve(pkg, "node_modules"))
+  mkdirp.sync(path.resolve(pkg, 'node_modules'))
   t.end()
 })
 
-test("git-cache-no-hooks: install a git dependency", function (t) {
+test('git-cache-no-hooks: install a git dependency', function (t) {
 
   // disable git integration tests on Travis.
   if (process.env.TRAVIS) return t.end()
 
-  var command = [ npmCli
-                , "install"
-                , "git://github.com/nigelzor/npm-4503-a.git"
-                ]
+  var command = [
+    npmCli,
+    'install',
+    'git://github.com/nigelzor/npm-4503-a.git'
+  ]
   var child = spawn(node, command, {
     cwd: pkg,
     env: {
-      "npm_config_cache"  : cache,
-      "npm_config_tmp"    : tmp,
-      "npm_config_prefix" : pkg,
-      "npm_config_global" : "false",
-      "npm_config_umask"  : "00",
-      HOME                : process.env.HOME,
-      Path                : process.env.PATH,
-      PATH                : process.env.PATH
+      'npm_config_cache': cache,
+      'npm_config_tmp': tmp,
+      'npm_config_prefix': pkg,
+      'npm_config_global': 'false',
+      'npm_config_umask': '00',
+      HOME: process.env.HOME,
+      Path: process.env.PATH,
+      PATH: process.env.PATH
     },
-    stdio: "inherit"
+    stdio: 'inherit'
   })
 
-  child.on("close", function (code) {
-    t.equal(code, 0, "npm install should succeed")
+  child.on('close', function (code) {
+    t.equal(code, 0, 'npm install should succeed')
 
     // verify permissions on git hooks
-    var repoDir = "git-github-com-nigelzor-npm-4503-a-git-40c5cb24"
-    var hooksPath = path.join(cache, "_git-remotes", repoDir, "hooks")
+    var repoDir = 'git-github-com-nigelzor-npm-4503-a-git-40c5cb24'
+    var hooksPath = path.join(cache, '_git-remotes', repoDir, 'hooks')
     fs.readdir(hooksPath, function (err) {
-      t.equal(err && err.code, "ENOENT", "hooks are not brought along with repo")
+      t.equal(err && err.code, 'ENOENT', 'hooks are not brought along with repo')
       t.end()
     })
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   rimraf.sync(pkg)
   t.end()
 })
diff --git a/deps/npm/test/tap/git-dependency-install-link.js b/deps/npm/test/tap/git-dependency-install-link.js
index cbb256d983d0f0..1eba7ff85573ce 100644
--- a/deps/npm/test/tap/git-dependency-install-link.js
+++ b/deps/npm/test/tap/git-dependency-install-link.js
@@ -39,7 +39,6 @@ var pjChild = JSON.stringify({
   version: '1.0.3'
 }, null, 2) + '\n'
 
-
 test('setup', function (t) {
   bootstrap()
   setup(function (er, r) {
diff --git a/deps/npm/test/tap/git-npmignore.js b/deps/npm/test/tap/git-npmignore.js
index 5e915a706faea7..4cd98987225f4b 100644
--- a/deps/npm/test/tap/git-npmignore.js
+++ b/deps/npm/test/tap/git-npmignore.js
@@ -1,62 +1,59 @@
-var cat = require("graceful-fs").writeFileSync
-var exec = require("child_process").exec
-var readdir = require("graceful-fs").readdirSync
-var resolve = require("path").resolve
-
-var mkdirp = require("mkdirp")
-var rimraf = require("rimraf")
-var test = require("tap").test
-var tmpdir = require("osenv").tmpdir
-var which = require("which")
-
-var common = require("../common-tap.js")
-
-var pkg = resolve(__dirname, "git-npmignore")
-var dep = resolve(pkg, "deps", "gitch")
-var packname = "gitch-1.0.0.tgz"
+var cat = require('graceful-fs').writeFileSync
+var exec = require('child_process').exec
+var readdir = require('graceful-fs').readdirSync
+var resolve = require('path').resolve
+
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var test = require('tap').test
+var tmpdir = require('osenv').tmpdir
+var which = require('which')
+
+var common = require('../common-tap.js')
+
+var pkg = resolve(__dirname, 'git-npmignore')
+var dep = resolve(pkg, 'deps', 'gitch')
+var packname = 'gitch-1.0.0.tgz'
 var packed = resolve(pkg, packname)
-var modules = resolve(pkg, "node_modules")
-var installed = resolve(modules, "gitch")
+var modules = resolve(pkg, 'node_modules')
+var installed = resolve(modules, 'gitch')
 var expected = [
-  "a.js",
-  "package.json",
-  ".npmignore"
+  'a.js',
+  'package.json',
+  '.npmignore'
 ].sort()
 
-var EXEC_OPTS = {
-  cwd : pkg
-}
+var EXEC_OPTS = { cwd: pkg }
 
-var gitignore = "node_modules/\n"
-var npmignore = "t.js\n"
+var gitignore = 'node_modules/\n'
+var npmignore = 't.js\n'
 
 var a = "console.log('hi');"
 var t = "require('tap').test(function (t) { t.pass('I am a test!'); t.end(); });"
 var fixture = {
-  "name" : "gitch",
-  "version" : "1.0.0",
-  "private" : true,
-  "main" : "a.js"
+  'name': 'gitch',
+  'version': '1.0.0',
+  'private': true,
+  'main': 'a.js'
 }
 
-
-test("setup", function (t) {
+test('setup', function (t) {
   setup(function (er) {
-    t.ifError(er, "setup ran OK")
+    t.ifError(er, 'setup ran OK')
 
     t.end()
   })
 })
 
-test("npm pack directly from directory", function (t) {
+test('npm pack directly from directory', function (t) {
   packInstallTest(dep, t)
 })
 
-test("npm pack via git", function (t) {
-  packInstallTest("git+file://"+dep, t)
+test('npm pack via git', function (t) {
+  packInstallTest('git+file://' + dep, t)
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   cleanup()
 
   t.end()
@@ -65,29 +62,29 @@ test("cleanup", function (t) {
 function packInstallTest (spec, t) {
   common.npm(
     [
-      "--loglevel", "silent",
-      "pack", spec
+      '--loglevel', 'silent',
+      'pack', spec
     ],
     EXEC_OPTS,
     function (err, code, stdout, stderr) {
-      t.ifError(err,  "npm pack ran without error")
-      t.notOk(code,   "npm pack exited cleanly")
-      t.notOk(stderr, "npm pack ran silently")
-      t.equal(stdout.trim(), packname, "got expected package name")
+      t.ifError(err, 'npm pack ran without error')
+      t.notOk(code, 'npm pack exited cleanly')
+      t.notOk(stderr, 'npm pack ran silently')
+      t.equal(stdout.trim(), packname, 'got expected package name')
 
       common.npm(
         [
-          "--loglevel", "silent",
-          "install", packed
+          '--loglevel', 'silent',
+          'install', packed
         ],
         EXEC_OPTS,
         function (err, code, stdout, stderr) {
-          t.ifError(err,  "npm install ran without error")
-          t.notOk(code,   "npm install exited cleanly")
-          t.notOk(stderr, "npm install ran silently")
+          t.ifError(err, 'npm install ran without error')
+          t.notOk(code, 'npm install exited cleanly')
+          t.notOk(stderr, 'npm install ran silently')
 
           var actual = readdir(installed).sort()
-          t.same(actual, expected, "no unexpected files in packed directory")
+          t.same(actual, expected, 'no unexpected files in packed directory')
 
           rimraf(packed, function () {
             t.end()
@@ -111,59 +108,59 @@ function setup (cb) {
 
   process.chdir(dep)
 
-  cat(resolve(dep, ".npmignore"), npmignore)
-  cat(resolve(dep, ".gitignore"), gitignore)
-  cat(resolve(dep, "a.js"), a)
-  cat(resolve(dep, "t.js"), t)
-  cat(resolve(dep, "package.json"), JSON.stringify(fixture))
+  cat(resolve(dep, '.npmignore'), npmignore)
+  cat(resolve(dep, '.gitignore'), gitignore)
+  cat(resolve(dep, 'a.js'), a)
+  cat(resolve(dep, 't.js'), t)
+  cat(resolve(dep, 'package.json'), JSON.stringify(fixture))
 
   common.npm(
     [
-      "--loglevel", "silent",
-      "cache", "clean"
+      '--loglevel', 'silent',
+      'cache', 'clean'
     ],
     EXEC_OPTS,
     function (er, code, _, stderr) {
       if (er) return cb(er)
-      if (code) return cb(new Error("npm cache nonzero exit: "+code))
-      if (stderr) return cb(new Error("npm cache clean error: "+stderr))
+      if (code) return cb(new Error('npm cache nonzero exit: ' + code))
+      if (stderr) return cb(new Error('npm cache clean error: ' + stderr))
 
-      which("git", function found (er, git) {
+      which('git', function found (er, git) {
         if (er) return cb(er)
 
-        exec(git+" init", init)
+        exec(git + ' init', init)
 
         function init (er, _, stderr) {
           if (er) return cb(er)
-          if (stderr) return cb(new Error("git init error: "+stderr))
+          if (stderr) return cb(new Error('git init error: ' + stderr))
 
-          exec(git+" config user.name 'Phantom Faker'", user)
+          exec(git + " config user.name 'Phantom Faker'", user)
         }
 
         function user (er, _, stderr) {
           if (er) return cb(er)
-          if (stderr) return cb(new Error("git config error: "+stderr))
+          if (stderr) return cb(new Error('git config error: ' + stderr))
 
-          exec(git+" config user.email nope@not.real", email)
+          exec(git + ' config user.email nope@not.real', email)
         }
 
         function email (er, _, stderr) {
           if (er) return cb(er)
-          if (stderr) return cb(new Error("git config error: "+stderr))
+          if (stderr) return cb(new Error('git config error: ' + stderr))
 
-          exec(git+" add .", addAll)
+          exec(git + ' add .', addAll)
         }
 
         function addAll (er, _, stderr) {
           if (er) return cb(er)
-          if (stderr) return cb(new Error("git add . error: "+stderr))
+          if (stderr) return cb(new Error('git add . error: ' + stderr))
 
-          exec(git+" commit -m boot", commit)
+          exec(git + ' commit -m boot', commit)
         }
 
         function commit (er, _, stderr) {
           if (er) return cb(er)
-          if (stderr) return cb(new Error("git commit error: "+stderr))
+          if (stderr) return cb(new Error('git commit error: ' + stderr))
 
           cb()
         }
diff --git a/deps/npm/test/tap/github-shortcut.js b/deps/npm/test/tap/github-shortcut.js
index 598aa686446c9b..1b01de4cff1db9 100644
--- a/deps/npm/test/tap/github-shortcut.js
+++ b/deps/npm/test/tap/github-shortcut.js
@@ -25,8 +25,8 @@ test('setup', function (t) {
 test('github-shortcut', function (t) {
   var cloneUrls = [
     ['git://github.com/foo/private.git', 'GitHub shortcuts try git URLs first'],
-    ['https://github.com/foo/private.git', 'GitHub shortcuts try HTTPS URLs third'],
-    ['git@github.com:foo/private.git', 'GitHub shortcuts try SSH second']
+    ['https://github.com/foo/private.git', 'GitHub shortcuts try HTTPS URLs second'],
+    ['git@github.com:foo/private.git', 'GitHub shortcuts try SSH third']
   ]
   var npm = requireInject.installGlobally('../../lib/npm.js', {
     'child_process': {
@@ -39,7 +39,7 @@ test('github-shortcut', function (t) {
           } else {
             t.fail('too many attempts to clone')
           }
-          cb(new Error())
+          cb(new Error('execFile mock fails on purpose'))
         })
       }
     }
@@ -51,10 +51,10 @@ test('github-shortcut', function (t) {
     registry: common.registry,
     loglevel: 'silent'
   }
+  t.plan(1 + cloneUrls.length)
   npm.load(opts, function (er) {
     t.ifError(er, 'npm loaded without error')
     npm.commands.install(['foo/private'], function (er, result) {
-      t.ok(er, 'mocked install failed as expected')
       t.end()
     })
   })
diff --git a/deps/npm/test/tap/gitlab-shortcut-package.js b/deps/npm/test/tap/gitlab-shortcut-package.js
index 657808447174cf..76cd7f911bb277 100644
--- a/deps/npm/test/tap/gitlab-shortcut-package.js
+++ b/deps/npm/test/tap/gitlab-shortcut-package.js
@@ -27,8 +27,8 @@ test('setup', function (t) {
 
 test('gitlab-shortcut-package', function (t) {
   var cloneUrls = [
-    ['git@gitlab.com:foo/private.git', 'GitLab shortcuts try SSH first'],
-    ['https://gitlab.com/foo/private.git', 'GitLab shortcuts try HTTPS URLs second']
+    ['https://gitlab.com/foo/private.git', 'GitLab shortcuts try HTTPS URLs second'],
+    ['git@gitlab.com:foo/private.git', 'GitLab shortcuts try SSH first']
   ]
   var npm = requireInject.installGlobally('../../lib/npm.js', {
     'child_process': {
diff --git a/deps/npm/test/tap/gitlab-shortcut.js b/deps/npm/test/tap/gitlab-shortcut.js
index 4a1e2b0bb17144..96da268ee03c05 100644
--- a/deps/npm/test/tap/gitlab-shortcut.js
+++ b/deps/npm/test/tap/gitlab-shortcut.js
@@ -24,8 +24,8 @@ test('setup', function (t) {
 
 test('gitlab-shortcut', function (t) {
   var cloneUrls = [
-    ['git@gitlab.com:foo/private.git', 'GitLab shortcuts try SSH first'],
-    ['https://gitlab.com/foo/private.git', 'GitLab shortcuts try HTTPS URLs second']
+    ['https://gitlab.com/foo/private.git', 'GitLab shortcuts try HTTPS URLs second'],
+    ['git@gitlab.com:foo/private.git', 'GitLab shortcuts try SSH first']
   ]
   var npm = requireInject.installGlobally('../../lib/npm.js', {
     'child_process': {
@@ -38,7 +38,7 @@ test('gitlab-shortcut', function (t) {
           } else {
             t.fail('too many attempts to clone')
           }
-          cb(new Error())
+          cb(new Error('execFile mock fails on purpose'))
         })
       }
     }
diff --git a/deps/npm/test/tap/global-prefix-set-in-userconfig.js b/deps/npm/test/tap/global-prefix-set-in-userconfig.js
index f820a27727d8ef..422bcb2477ec63 100644
--- a/deps/npm/test/tap/global-prefix-set-in-userconfig.js
+++ b/deps/npm/test/tap/global-prefix-set-in-userconfig.js
@@ -1,36 +1,36 @@
-var common = require("../common-tap.js")
-var test = require("tap").test
-var rimraf = require("rimraf")
-var prefix = __filename.replace(/\.js$/, "")
-var rcfile = __filename.replace(/\.js$/, ".npmrc")
-var fs = require("fs")
-var conf = "prefix = " + prefix + "\n"
+var common = require('../common-tap.js')
+var test = require('tap').test
+var rimraf = require('rimraf')
+var prefix = __filename.replace(/\.js$/, '')
+var rcfile = __filename.replace(/\.js$/, '.npmrc')
+var fs = require('fs')
+var conf = 'prefix = ' + prefix + '\n'
 
-test("setup", function (t) {
+test('setup', function (t) {
   rimraf.sync(prefix)
   fs.writeFileSync(rcfile, conf)
-  t.pass("ready")
+  t.pass('ready')
   t.end()
 })
 
-test("run command", function (t) {
-  var args = ["prefix", "-g", "--userconfig=" + rcfile]
+test('run command', function (t) {
+  var args = ['prefix', '-g', '--userconfig=' + rcfile]
   common.npm(args, {env: {}}, function (er, code, so) {
     if (er) throw er
-    t.notOk(code, "npm prefix exited with code 0")
+    t.notOk(code, 'npm prefix exited with code 0')
     t.equal(so.trim(), prefix)
     t.end()
   })
 })
 
-test("made dir", function (t) {
+test('made dir', function (t) {
   t.ok(fs.statSync(prefix).isDirectory())
   t.end()
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   rimraf.sync(prefix)
   rimraf.sync(rcfile)
-  t.pass("clean")
+  t.pass('clean')
   t.end()
 })
diff --git a/deps/npm/test/tap/graceful-restart.js b/deps/npm/test/tap/graceful-restart.js
index 53264748056507..21da0d99042d5e 100644
--- a/deps/npm/test/tap/graceful-restart.js
+++ b/deps/npm/test/tap/graceful-restart.js
@@ -107,8 +107,9 @@ function createChild (args, cb) {
     'npm_config_loglevel': 'silent'
   }
 
-  if (process.platform === 'win32')
+  if (process.platform === 'win32') {
     env.npm_config_cache = '%APPDATA%\\npm-cache'
+  }
 
   return common.npm(args, {
     cwd: pkg,
diff --git a/deps/npm/test/tap/ignore-install-link.js b/deps/npm/test/tap/ignore-install-link.js
index 45db51d30f7bbf..684c6a05b24c09 100644
--- a/deps/npm/test/tap/ignore-install-link.js
+++ b/deps/npm/test/tap/ignore-install-link.js
@@ -1,68 +1,73 @@
-if (process.platform === "win32") {
-  console.log("ok - symlinks are weird on windows, skip this test")
-  return
+if (process.platform === 'win32') {
+  console.log('ok - symlinks are weird on windows, skip this test')
+  process.exit(0)
 }
-var common = require("../common-tap.js")
-var test = require("tap").test
-var path = require("path")
-var fs = require("fs")
-var rimraf = require("rimraf")
-var mkdirp = require("mkdirp")
+var common = require('../common-tap.js')
+var test = require('tap').test
+var path = require('path')
+var fs = require('fs')
+var rimraf = require('rimraf')
+var mkdirp = require('mkdirp')
 
-var root = path.resolve(__dirname, "ignore-install-link")
-var pkg = path.resolve(root, "pkg")
-var dep = path.resolve(root, "dep")
-var target = path.resolve(pkg, "node_modules", "dep")
-var cache = path.resolve(root, "cache")
-var globalPath = path.resolve(root, "global")
+var root = path.resolve(__dirname, 'ignore-install-link')
+var pkg = path.resolve(root, 'pkg')
+var dep = path.resolve(root, 'dep')
+var target = path.resolve(pkg, 'node_modules', 'dep')
+var cache = path.resolve(root, 'cache')
+var globalPath = path.resolve(root, 'global')
 
-var pkgj = { "name":"pkg", "version": "1.2.3"
-           , "dependencies": { "dep": "1.2.3" } }
-var depj = { "name": "dep", "version": "1.2.3" }
+var pkgj = {
+  'name': 'pkg',
+  'version': '1.2.3',
+  'dependencies': {
+    'dep': '1.2.3'
+  }
+}
+var depj = { 'name': 'dep', 'version': '1.2.3' }
 
-var myreg = require("http").createServer(function (q, s) {
+var myreg = require('http').createServer(function (q, s) {
   s.statusCode = 403
-  s.end(JSON.stringify({"error":"forbidden"}) + "\n")
+  s.end(JSON.stringify({'error': 'forbidden'}) + '\n')
 }).listen(common.port)
 
-test("setup", function (t) {
+test('setup', function (t) {
   rimraf.sync(root)
   mkdirp.sync(root)
-  mkdirp.sync(path.resolve(pkg, "node_modules"))
+  mkdirp.sync(path.resolve(pkg, 'node_modules'))
   mkdirp.sync(dep)
   mkdirp.sync(cache)
   mkdirp.sync(globalPath)
-  fs.writeFileSync(path.resolve(pkg, "package.json"), JSON.stringify(pkgj))
-  fs.writeFileSync(path.resolve(dep, "package.json"), JSON.stringify(depj))
-  fs.symlinkSync(dep, target, "dir")
+  fs.writeFileSync(path.resolve(pkg, 'package.json'), JSON.stringify(pkgj))
+  fs.writeFileSync(path.resolve(dep, 'package.json'), JSON.stringify(depj))
+  fs.symlinkSync(dep, target, 'dir')
   t.end()
 })
 
-test("ignore install if package is linked", function (t) {
-  common.npm(["install"], {
+test('ignore install if package is linked', function (t) {
+  common.npm(['install'], {
     cwd: pkg,
     env: {
       PATH: process.env.PATH || process.env.Path,
       HOME: process.env.HOME,
-      "npm_config_prefix": globalPath,
-      "npm_config_cache": cache,
-      "npm_config_registry": common.registry,
-      "npm_config_loglevel": "silent"
+      'npm_config_prefix': globalPath,
+      'npm_config_cache': cache,
+      'npm_config_registry': common.registry,
+      'npm_config_loglevel': 'silent'
     },
-    stdio: "inherit"
+    stdio: 'inherit'
   }, function (er, code) {
     if (er) throw er
-    t.equal(code, 0, "npm install exited with code")
+    t.equal(code, 0, 'npm install exited with code')
     t.end()
   })
 })
 
-test("still a symlink", function (t) {
+test('still a symlink', function (t) {
   t.equal(true, fs.lstatSync(target).isSymbolicLink())
   t.end()
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   rimraf.sync(root)
   myreg.close()
   t.end()
diff --git a/deps/npm/test/tap/init-interrupt.js b/deps/npm/test/tap/init-interrupt.js
index 962ab72444747b..2e85a5d1b98a68 100644
--- a/deps/npm/test/tap/init-interrupt.js
+++ b/deps/npm/test/tap/init-interrupt.js
@@ -1,52 +1,52 @@
-// if "npm init" is interrupted with ^C, don't report
-// "init written successfully"
-var test = require("tap").test
-var path = require("path")
-var osenv = require("osenv")
-var rimraf = require("rimraf")
-var npmlog = require("npmlog")
-var requireInject = require("require-inject")
+// if 'npm init' is interrupted with ^C, don't report
+// 'init written successfully'
+var test = require('tap').test
+var path = require('path')
+var osenv = require('osenv')
+var rimraf = require('rimraf')
+var npmlog = require('npmlog')
+var requireInject = require('require-inject')
 
-var npm = require("../../lib/npm.js")
+var npm = require('../../lib/npm.js')
 
-var PKG_DIR = path.resolve(__dirname, "init-interrupt")
+var PKG_DIR = path.resolve(__dirname, 'init-interrupt')
 
-test("setup", function (t) {
+test('setup', function (t) {
   cleanup()
 
   t.end()
 })
 
-test("issue #6684 remove confusing message", function (t) {
+test('issue #6684 remove confusing message', function (t) {
 
   var initJsonMock = function (dir, input, config, cb) {
     process.nextTick(function () {
-      cb({message : "canceled"})
+      cb({ message: 'canceled' })
     })
   }
   initJsonMock.yes = function () { return true }
 
-  npm.load({loglevel : "silent"}, function () {
-    var log = ""
-    var init = requireInject("../../lib/init", {
-      "init-package-json": initJsonMock
+  npm.load({ loglevel: 'silent' }, function () {
+    var log = ''
+    var init = requireInject('../../lib/init', {
+      'init-package-json': initJsonMock
     })
 
     // capture log messages
-    npmlog.on("log", function (chunk) { log += chunk.message + "\n" } )
+    npmlog.on('log', function (chunk) { log += chunk.message + '\n' })
 
     init([], function (err, code) {
-      t.ifError(err, "init ran successfully")
-      t.notOk(code, "exited without issue")
-      t.notSimilar(log, /written successfully/, "no success message written")
-      t.similar(log, /canceled/, "alerted that init was canceled")
+      t.ifError(err, 'init ran successfully')
+      t.notOk(code, 'exited without issue')
+      t.notSimilar(log, /written successfully/, 'no success message written')
+      t.similar(log, /canceled/, 'alerted that init was canceled')
 
       t.end()
     })
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   cleanup()
 
   t.end()
diff --git a/deps/npm/test/tap/install-actions.js b/deps/npm/test/tap/install-actions.js
new file mode 100644
index 00000000000000..c71b0044e1d603
--- /dev/null
+++ b/deps/npm/test/tap/install-actions.js
@@ -0,0 +1,108 @@
+'use strict'
+var npm = require('../../lib/npm.js')
+var log = require('npmlog')
+var test = require('tap').test
+
+var mockLog = {
+  finish: function () {},
+  silly: function () {}
+}
+
+var actions
+test('setup', function (t) {
+  npm.load(function () {
+    log.disableProgress()
+    actions = require('../../lib/install/actions.js').actions
+    t.end()
+  })
+})
+
+test('->optdep:a->dep:b', function (t) {
+  var moduleA = {
+    name: 'a',
+    path: '/',
+    package: {
+      scripts: {
+        postinstall: 'false'
+      },
+      dependencies: {
+        b: '*'
+      }
+    }
+  }
+  var moduleB = {
+    name: 'b',
+    path: '/',
+    package: {},
+    requires: [],
+    requiredBy: [moduleA]
+  }
+  moduleA.requires = [moduleB]
+
+  var tree = {
+    path: '/',
+    package: {
+      optionalDependencies: {
+        a: '*'
+      }
+    },
+    children: [moduleA, moduleB],
+    requires: [moduleA]
+  }
+  moduleA.requiredBy = [tree]
+
+  t.plan(3)
+  actions.postinstall('/', '/', moduleA, mockLog, function (er) {
+    t.ok(er && er.code === 'ELIFECYCLE', 'Lifecycle failed')
+    t.ok(moduleA.failed, 'moduleA (optional dep) is marked failed')
+    t.ok(moduleB.failed, 'moduleB (direct dep of moduleA) is marked as failed')
+    t.end()
+  })
+})
+
+test('->dep:b,->optdep:a->dep:b', function (t) {
+  var moduleA = {
+    name: 'a',
+    path: '/',
+    package: {
+      scripts: {
+        postinstall: 'false'
+      },
+      dependencies: {
+        b: '*'
+      }
+    }
+  }
+  var moduleB = {
+    name: 'b',
+    path: '/',
+    package: {},
+    requires: [],
+    requiredBy: [moduleA]
+  }
+  moduleA.requires = [moduleB]
+
+  var tree = {
+    path: '/',
+    package: {
+      dependencies: {
+        b: '*'
+      },
+      optionalDependencies: {
+        a: '*'
+      }
+    },
+    children: [moduleA, moduleB],
+    requires: [moduleA, moduleB]
+  }
+  moduleA.requiredBy = [tree]
+  moduleB.requiredBy.push(tree)
+
+  t.plan(3)
+  actions.postinstall('/', '/', moduleA, mockLog, function (er) {
+    t.ok(er && er.code === 'ELIFECYCLE', 'Lifecycle failed')
+    t.ok(moduleA.failed, 'moduleA (optional dep) is marked failed')
+    t.ok(!moduleB.failed, 'moduleB (direct dep of moduleA) is marked as failed')
+    t.end()
+  })
+})
diff --git a/deps/npm/test/tap/install-at-locally.js b/deps/npm/test/tap/install-at-locally.js
index 9c5d85980cb325..8745c4d60ecfe8 100644
--- a/deps/npm/test/tap/install-at-locally.js
+++ b/deps/npm/test/tap/install-at-locally.js
@@ -13,7 +13,7 @@ var pkg = path.join(__dirname, 'install-at-locally')
 var EXEC_OPTS = { cwd: pkg }
 
 var json = {
-  name: 'install-at-locally',
+  name: 'install-at-locally-mock',
   version: '0.0.0'
 }
 
@@ -25,8 +25,8 @@ test('setup', function (t) {
 test('\'npm install ./package@1.2.3\' should install local pkg', function (t) {
   var target = './package@1.2.3'
   setup(target)
-  common.npm(['install', target], EXEC_OPTS, function (err, code) {
-    var p = path.resolve(pkg, 'node_modules/install-at-locally/package.json')
+  common.npm(['install', '--loglevel=silent', target], EXEC_OPTS, function (err, code) {
+    var p = path.resolve(pkg, 'node_modules/install-at-locally-mock/package.json')
     t.ifError(err, 'install local package successful')
     t.equal(code, 0, 'npm install exited with code')
     t.ok(JSON.parse(fs.readFileSync(p, 'utf8')))
@@ -38,7 +38,7 @@ test('\'npm install install/at/locally@./package@1.2.3\' should install local pk
   var target = 'install/at/locally@./package@1.2.3'
   setup(target)
   common.npm(['install', target], EXEC_OPTS, function (err, code) {
-    var p = path.resolve(pkg, 'node_modules/install-at-locally/package.json')
+    var p = path.resolve(pkg, 'node_modules/install-at-locally-mock/package.json')
     t.ifError(err, 'install local package in explicit directory successful')
     t.equal(code, 0, 'npm install exited with code')
     t.ok(JSON.parse(fs.readFileSync(p, 'utf8')))
diff --git a/deps/npm/test/tap/install-bad-dep-format.js b/deps/npm/test/tap/install-bad-dep-format.js
new file mode 100644
index 00000000000000..01d253c9e53e52
--- /dev/null
+++ b/deps/npm/test/tap/install-bad-dep-format.js
@@ -0,0 +1,58 @@
+var fs = require('graceful-fs')
+var path = require('path')
+
+var mkdirp = require('mkdirp')
+var osenv = require('osenv')
+var rimraf = require('rimraf')
+var test = require('tap').test
+
+var common = require('../common-tap.js')
+
+var json = {
+  author: 'John Foo',
+  name: 'bad-dep-format',
+  version: '0.0.0',
+  dependencies: {
+    'not-legit': 'npm:not-legit@1.0'
+  }
+}
+
+test('invalid url format returns appropriate error', function (t) {
+  setup(json)
+  common.npm(['install'], {}, function (err, code, stdout, stderr) {
+    t.ifError(err, 'install ran without error')
+    t.equals(code, 1, 'inall exited with code 1')
+    t.match(stderr,
+      /ERR.*Unsupported URL Type/,
+      'Error should report that invalid url-style formats are used')
+    t.end()
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
+
+function setup (json) {
+  cleanup()
+  process.chdir(mkPkg(json))
+}
+
+function cleanup () {
+  process.chdir(osenv.tmpdir())
+  var pkgs = [json]
+  pkgs.forEach(function (json) {
+    rimraf.sync(path.resolve(__dirname, json.name))
+  })
+}
+
+function mkPkg (json) {
+  var pkgPath = path.resolve(__dirname, json.name)
+  mkdirp.sync(pkgPath)
+  fs.writeFileSync(
+    path.join(pkgPath, 'package.json'),
+    JSON.stringify(json, null, 2)
+  )
+  return pkgPath
+}
diff --git a/deps/npm/test/tap/install-bad-man.js b/deps/npm/test/tap/install-bad-man.js
index 9ec8a84734b755..756b4a5902c151 100644
--- a/deps/npm/test/tap/install-bad-man.js
+++ b/deps/npm/test/tap/install-bad-man.js
@@ -1,53 +1,52 @@
-var fs = require("fs")
-var resolve = require("path").resolve
+var fs = require('fs')
+var resolve = require('path').resolve
 
-var osenv = require("osenv")
-var mkdirp = require("mkdirp")
-var rimraf = require("rimraf")
-var test = require("tap").test
+var osenv = require('osenv')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var test = require('tap').test
 
-var common = require("../common-tap.js")
+var common = require('../common-tap.js')
 
-var pkg = resolve(__dirname, "install-bad-man")
-var target = resolve(__dirname, "install-bad-man-target")
+var pkg = resolve(__dirname, 'install-bad-man')
+var target = resolve(__dirname, 'install-bad-man-target')
 
 var EXEC_OPTS = {
   cwd: target
 }
 
 var json = {
-  name    : "install-bad-man",
-  version : "1.2.3",
-  man     : [ "./install-bad-man.1.lol" ]
+  name: 'install-bad-man',
+  version: '1.2.3',
+  man: [ './install-bad-man.1.lol' ]
 }
 
-
-test("setup", function (t) {
+test('setup', function (t) {
   setup()
-  t.pass("setup ran")
+  t.pass('setup ran')
   t.end()
 })
 
 test("install from repo on 'OS X'", function (t) {
   common.npm(
     [
-      "install",
-      "--prefix", target,
-      "--global",
+      'install',
+      '--prefix', target,
+      '--global',
       pkg
     ],
     EXEC_OPTS,
     function (err, code, stdout, stderr) {
-      t.ifError(err, "npm command ran from test")
-      t.equals(code, 1, "install exited with failure (1)")
-      t.notOk(stdout, "no output indicating success")
+      t.ifError(err, 'npm command ran from test')
+      t.equals(code, 1, 'install exited with failure (1)')
+      t.notOk(stdout, 'no output indicating success')
       t.notOk(
         stderr.match(/Cannot read property '1' of null/),
-        "no longer has cryptic error output"
+        'no longer has cryptic error output'
       )
       t.ok(
         stderr.match(/install-bad-man\.1\.lol is not a valid name/),
-        "got expected error output"
+        'got expected error output'
       )
 
       t.end()
@@ -55,9 +54,9 @@ test("install from repo on 'OS X'", function (t) {
   )
 })
 
-test("clean", function (t) {
+test('clean', function (t) {
   cleanup()
-  t.pass("cleaned up")
+  t.pass('cleaned up')
   t.end()
 })
 
@@ -65,12 +64,12 @@ function setup () {
   cleanup()
   mkdirp.sync(pkg)
   // make sure it installs locally
-  mkdirp.sync(resolve(target, "node_modules"))
+  mkdirp.sync(resolve(target, 'node_modules'))
   fs.writeFileSync(
-    resolve(pkg, "package.json"),
-    JSON.stringify(json, null, 2)+"\n"
+    resolve(pkg, 'package.json'),
+    JSON.stringify(json, null, 2) + '\n'
   )
-  fs.writeFileSync(resolve(pkg, "install-bad-man.1.lol"), "lol\n")
+  fs.writeFileSync(resolve(pkg, 'install-bad-man.1.lol'), 'lol\n')
 }
 
 function cleanup () {
diff --git a/deps/npm/test/tap/install-cli-only-development.js b/deps/npm/test/tap/install-cli-only-development.js
new file mode 100644
index 00000000000000..21c30378e4ce47
--- /dev/null
+++ b/deps/npm/test/tap/install-cli-only-development.js
@@ -0,0 +1,85 @@
+var fs = require('graceful-fs')
+var path = require('path')
+var existsSync = fs.existsSync || path.existsSync
+
+var mkdirp = require('mkdirp')
+var osenv = require('osenv')
+var rimraf = require('rimraf')
+var test = require('tap').test
+
+var common = require('../common-tap.js')
+
+var pkg = path.join(__dirname, 'install-cli-development')
+
+var EXEC_OPTS = { cwd: pkg }
+
+var json = {
+  name: 'install-cli-development',
+  description: 'fixture',
+  version: '0.0.0',
+  dependencies: {
+    dependency: 'file:./dependency'
+  },
+  devDependencies: {
+    'dev-dependency': 'file:./dev-dependency'
+  }
+}
+
+var dependency = {
+  name: 'dependency',
+  description: 'fixture',
+  version: '0.0.0'
+}
+
+var devDependency = {
+  name: 'dev-dependency',
+  description: 'fixture',
+  version: '0.0.0'
+}
+
+test('setup', function (t) {
+  mkdirp.sync(path.join(pkg, 'dependency'))
+  fs.writeFileSync(
+    path.join(pkg, 'dependency', 'package.json'),
+    JSON.stringify(dependency, null, 2)
+  )
+
+  mkdirp.sync(path.join(pkg, 'dev-dependency'))
+  fs.writeFileSync(
+    path.join(pkg, 'dev-dependency', 'package.json'),
+    JSON.stringify(devDependency, null, 2)
+  )
+
+  mkdirp.sync(path.join(pkg, 'node_modules'))
+  fs.writeFileSync(
+    path.join(pkg, 'package.json'),
+    JSON.stringify(json, null, 2)
+  )
+
+  process.chdir(pkg)
+  t.end()
+})
+
+test('\'npm install --only=development\' should only install devDependencies', function (t) {
+  common.npm(['install', '--only=development'], EXEC_OPTS, function (err, code) {
+    t.ifError(err, 'install development successful')
+    t.equal(code, 0, 'npm install did not raise error code')
+    t.ok(
+      JSON.parse(fs.readFileSync(
+        path.resolve(pkg, 'node_modules/dev-dependency/package.json'), 'utf8')
+      ),
+      'devDependency was installed'
+    )
+    t.notOk(
+      existsSync(path.resolve(pkg, 'node_modules/dependency/package.json')),
+      'dependency was NOT installed'
+    )
+    t.end()
+  })
+})
+
+test('cleanup', function (t) {
+  process.chdir(osenv.tmpdir())
+  rimraf.sync(pkg)
+  t.end()
+})
diff --git a/deps/npm/test/tap/install-cli-only-production.js b/deps/npm/test/tap/install-cli-only-production.js
new file mode 100644
index 00000000000000..7f46a23e15df89
--- /dev/null
+++ b/deps/npm/test/tap/install-cli-only-production.js
@@ -0,0 +1,88 @@
+var fs = require('graceful-fs')
+var path = require('path')
+var existsSync = fs.existsSync || path.existsSync
+
+var mkdirp = require('mkdirp')
+var osenv = require('osenv')
+var rimraf = require('rimraf')
+var test = require('tap').test
+
+var common = require('../common-tap.js')
+
+var pkg = path.join(__dirname, 'install-cli-only-production')
+
+var EXEC_OPTS = { cwd: pkg }
+
+var json = {
+  name: 'install-cli-only-production',
+  description: 'fixture',
+  version: '0.0.0',
+  scripts: {
+    prepublish: 'exit 123'
+  },
+  dependencies: {
+    dependency: 'file:./dependency'
+  },
+  devDependencies: {
+    'dev-dependency': 'file:./dev-dependency'
+  }
+}
+
+var dependency = {
+  name: 'dependency',
+  description: 'fixture',
+  version: '0.0.0'
+}
+
+var devDependency = {
+  name: 'dev-dependency',
+  description: 'fixture',
+  version: '0.0.0'
+}
+
+test('setup', function (t) {
+  mkdirp.sync(path.join(pkg, 'dependency'))
+  fs.writeFileSync(
+    path.join(pkg, 'dependency', 'package.json'),
+    JSON.stringify(dependency, null, 2)
+  )
+
+  mkdirp.sync(path.join(pkg, 'devDependency'))
+  fs.writeFileSync(
+    path.join(pkg, 'devDependency', 'package.json'),
+    JSON.stringify(devDependency, null, 2)
+  )
+
+  mkdirp.sync(path.join(pkg, 'node_modules'))
+  fs.writeFileSync(
+    path.join(pkg, 'package.json'),
+    JSON.stringify(json, null, 2)
+  )
+
+  process.chdir(pkg)
+  t.end()
+})
+
+test('\'npm install --only=production\' should only install dependencies', function (t) {
+  common.npm(['install', '--only=production'], EXEC_OPTS, function (err, code) {
+    t.ifError(err, 'install production successful')
+    t.equal(code, 0, 'npm install did not raise error code')
+    t.ok(
+      JSON.parse(fs.readFileSync(
+        path.resolve(pkg, 'node_modules/dependency/package.json'), 'utf8')
+      ),
+      'dependency was installed'
+    )
+    t.notOk(
+      existsSync(path.resolve(pkg, 'node_modules/dev-dependency/package.json')),
+      'devDependency was NOT installed'
+    )
+    t.end()
+  })
+})
+
+test('cleanup', function (t) {
+  process.chdir(osenv.tmpdir())
+  rimraf.sync(pkg)
+  t.end()
+})
diff --git a/deps/npm/test/tap/install-cli-production.js b/deps/npm/test/tap/install-cli-production.js
index fbaf23afb48195..a1fdac6e880d5a 100644
--- a/deps/npm/test/tap/install-cli-production.js
+++ b/deps/npm/test/tap/install-cli-production.js
@@ -47,9 +47,9 @@ test('setup', function (t) {
     JSON.stringify(dependency, null, 2)
   )
 
-  mkdirp.sync(path.join(pkg, 'devDependency'))
+  mkdirp.sync(path.join(pkg, 'dev-dependency'))
   fs.writeFileSync(
-    path.join(pkg, 'devDependency', 'package.json'),
+    path.join(pkg, 'dev-dependency', 'package.json'),
     JSON.stringify(devDependency, null, 2)
   )
 
diff --git a/deps/npm/test/tap/install-into-likenamed-folder.js b/deps/npm/test/tap/install-into-likenamed-folder.js
new file mode 100644
index 00000000000000..187d5fbf11bca9
--- /dev/null
+++ b/deps/npm/test/tap/install-into-likenamed-folder.js
@@ -0,0 +1,44 @@
+'use strict'
+var path = require('path')
+var fs = require('graceful-fs')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var test = require('tap').test
+var common = require('../common-tap.js')
+
+var base = path.join(__dirname, path.basename(__filename, '.js'))
+var moduleDir = path.join(base, 'example-src')
+var destDir = path.join(base, 'example')
+var moduleJson = {
+  name: 'example',
+  version: '1.0.0'
+}
+
+function setup () {
+  cleanup()
+  mkdirp.sync(moduleDir)
+  mkdirp.sync(path.join(destDir, 'node_modules'))
+  fs.writeFileSync(path.join(moduleDir, 'package.json'), JSON.stringify(moduleJson))
+}
+
+function cleanup () {
+  rimraf.sync(base)
+}
+
+test('setup', function (t) {
+  setup()
+  t.end()
+})
+
+test('like-named', function (t) {
+  common.npm(['install', '../example-src'], {cwd: destDir}, function (er, code, stdout, stderr) {
+    t.is(code, 0, 'no error code')
+    t.is(stderr, '', 'no error output')
+    t.end()
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
diff --git a/deps/npm/test/tap/install-local-dep-cycle.js b/deps/npm/test/tap/install-local-dep-cycle.js
new file mode 100644
index 00000000000000..1f76ad9598a2d0
--- /dev/null
+++ b/deps/npm/test/tap/install-local-dep-cycle.js
@@ -0,0 +1,79 @@
+'use strict'
+var path = require('path')
+var fs = require('graceful-fs')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var test = require('tap').test
+var common = require('../common-tap.js')
+
+var base = path.join(__dirname, path.basename(__filename, '.js'))
+
+var baseJSON = {
+  name: 'base',
+  version: '1.0.0',
+  dependencies: {
+    a: 'file:a/',
+    b: 'file:b/'
+  }
+}
+
+var aPath = path.join(base, 'a')
+var aJSON = {
+  name: 'a',
+  version: '1.0.0',
+  dependencies: {
+    b: 'file:../b',
+    c: 'file:../c'
+  }
+}
+
+var bPath = path.join(base, 'b')
+var bJSON = {
+  name: 'b',
+  version: '1.0.0'
+}
+
+var cPath = path.join(base, 'c')
+var cJSON = {
+  name: 'c',
+  version: '1.0.0',
+  dependencies: {
+    b: 'file:../b'
+  }
+}
+
+test('setup', function (t) {
+  cleanup()
+  setup()
+  t.end()
+})
+
+test('install', function (t) {
+  common.npm(['install'], {cwd: base}, function (er, code, stdout, stderr) {
+    t.ifError(er, 'npm config ran without issue')
+    t.is(code, 0, 'exited with a non-error code')
+    t.is(stderr, '', 'Ran without errors')
+    t.end()
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
+
+function saveJson (pkgPath, json) {
+  mkdirp.sync(pkgPath)
+  fs.writeFileSync(path.join(pkgPath, 'package.json'), JSON.stringify(json, null, 2))
+}
+
+function setup () {
+  saveJson(base, baseJSON)
+  saveJson(aPath, aJSON)
+  saveJson(bPath, bJSON)
+  saveJson(cPath, cJSON)
+}
+
+function cleanup () {
+  rimraf.sync(base)
+}
diff --git a/deps/npm/test/tap/install-man.js b/deps/npm/test/tap/install-man.js
index ebba5d87b01100..d309788b25515e 100644
--- a/deps/npm/test/tap/install-man.js
+++ b/deps/npm/test/tap/install-man.js
@@ -1,48 +1,48 @@
-var fs = require("fs")
-var resolve = require("path").resolve
+var fs = require('fs')
+var resolve = require('path').resolve
 
-var osenv = require("osenv")
-var mkdirp = require("mkdirp")
-var rimraf = require("rimraf")
-var test = require("tap").test
+var osenv = require('osenv')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var test = require('tap').test
 
-var common = require("../common-tap.js")
+var common = require('../common-tap.js')
 
-var pkg = resolve(__dirname, "install-man")
-var target = resolve(__dirname, "install-man-target")
+var pkg = resolve(__dirname, 'install-man')
+var target = resolve(__dirname, 'install-man-target')
 
 var EXEC_OPTS = {
   cwd: target
 }
 
 var json = {
-  name    : "install-man",
-  version : "1.2.3",
-  man     : [ "./install-man.1" ]
+  name: 'install-man',
+  version: '1.2.3',
+  man: [ './install-man.1' ]
 }
 
-test("setup", function (t) {
+test('setup', function (t) {
   setup()
-  t.pass("setup ran")
+  t.pass('setup ran')
   t.end()
 })
 
-test("install man page", function (t) {
+test('install man page', function (t) {
   common.npm(
     [
-      "install",
-      "--prefix", target,
-      "--global",
+      'install',
+      '--prefix', target,
+      '--global',
       pkg
     ],
     EXEC_OPTS,
     function (err, code, stdout, stderr) {
-      t.ifError(err, "npm command ran from test")
-      t.equals(code, 0, "install exited with success (0)")
-      t.ok(stdout, "output indicating success")
+      t.ifError(err, 'npm command ran from test')
+      t.equals(code, 0, 'install exited with success (0)')
+      t.ok(stdout, 'output indicating success')
       t.ok(
-        fs.existsSync(resolve(target, "share", "man", "man1", "install-man.1")),
-        "man page link was created"
+        fs.existsSync(resolve(target, 'share', 'man', 'man1', 'install-man.1')),
+        'man page link was created'
       )
 
       t.end()
@@ -50,9 +50,9 @@ test("install man page", function (t) {
   )
 })
 
-test("clean", function (t) {
+test('clean', function (t) {
   cleanup()
-  t.pass("cleaned up")
+  t.pass('cleaned up')
   t.end()
 })
 
@@ -60,12 +60,12 @@ function setup () {
   cleanup()
   mkdirp.sync(pkg)
   // make sure it installs locally
-  mkdirp.sync(resolve(target, "node_modules"))
+  mkdirp.sync(resolve(target, 'node_modules'))
   fs.writeFileSync(
-    resolve(pkg, "package.json"),
-    JSON.stringify(json, null, 2)+"\n"
+    resolve(pkg, 'package.json'),
+    JSON.stringify(json, null, 2) + '\n'
   )
-  fs.writeFileSync(resolve(pkg, "install-man.1"), "THIS IS A MANPAGE\n")
+  fs.writeFileSync(resolve(pkg, 'install-man.1'), 'THIS IS A MANPAGE\n')
 }
 
 function cleanup () {
diff --git a/deps/npm/test/tap/install-order.js b/deps/npm/test/tap/install-order.js
new file mode 100644
index 00000000000000..c1c4e9dca61f9f
--- /dev/null
+++ b/deps/npm/test/tap/install-order.js
@@ -0,0 +1,37 @@
+'use strict'
+var test = require('tap').test
+var sortActions = require('../../lib/install/diff-trees.js').sortActions
+
+var a = {
+  package: {_location: '/a', _requiredBy: []}
+}
+var b = {
+  package: {_location: '/b', _requiredBy: []}
+}
+var c = {
+  package: {_location: '/c', _requiredBy: ['/a', '/b']}
+}
+
+test('install-order when installing deps', function (t) {
+  var plain = [
+    ['add', a],
+    ['add', b],
+    ['add', c]]
+  var sorted = [
+    ['add', c],
+    ['add', a],
+    ['add', b]]
+  t.isDeeply(sortActions(plain), sorted)
+  t.end()
+})
+
+test('install-order when not installing deps', function (t) {
+  var plain = [
+    ['add', a],
+    ['add', b]]
+  var sorted = [
+    ['add', a],
+    ['add', b]]
+  t.isDeeply(sortActions(plain), sorted)
+  t.end()
+})
diff --git a/deps/npm/test/tap/install-save-local.js b/deps/npm/test/tap/install-save-local.js
index 33a1c613f19412..a9de5ba1941823 100644
--- a/deps/npm/test/tap/install-save-local.js
+++ b/deps/npm/test/tap/install-save-local.js
@@ -51,9 +51,9 @@ test('\'npm install --save ../local/path\' should save to package.json', functio
       t.ok(JSON.parse(fs.readFileSync(dependencyPackageJson, 'utf8')))
 
       var pkgJson = JSON.parse(fs.readFileSync(pkg + '/package.json', 'utf8'))
-      t.deepEqual(
-        pkgJson.dependencies,
-        { 'package-local-dependency': 'file:../package-local-dependency' },
+      t.is(Object.keys(pkgJson.dependencies).length, 1, 'only one dep')
+      t.ok(
+        /file:.*?[/]package-local-dependency$/.test(pkgJson.dependencies['package-local-dependency']),
         'local package saved correctly'
       )
       t.end()
@@ -80,9 +80,9 @@ test('\'npm install --save-dev ../local/path\' should save to package.json', fun
       t.ok(JSON.parse(fs.readFileSync(dependencyPackageJson, 'utf8')))
 
       var pkgJson = JSON.parse(fs.readFileSync(pkg + '/package.json', 'utf8'))
-      t.deepEqual(
-        pkgJson.devDependencies,
-        { 'package-local-dev-dependency': 'file:../package-local-dev-dependency' },
+      t.is(Object.keys(pkgJson.devDependencies).length, 1, 'only one dep')
+      t.ok(
+        /file:.*?[/]package-local-dev-dependency$/.test(pkgJson.devDependencies['package-local-dev-dependency']),
         'local package saved correctly'
       )
 
diff --git a/deps/npm/test/tap/install-scoped-already-installed.js b/deps/npm/test/tap/install-scoped-already-installed.js
index 1446897d442261..f3c191ddb00dd8 100644
--- a/deps/npm/test/tap/install-scoped-already-installed.js
+++ b/deps/npm/test/tap/install-scoped-already-installed.js
@@ -31,7 +31,7 @@ var localDependency = {
 }
 
 var scopedDependency = {
-  name: '@scoped/package',
+  name: '@scoped/package-scoped-dependency',
   version: '0.0.0',
   description: 'Test for local installs'
 }
@@ -64,6 +64,7 @@ test('installing already installed local scoped package', function (t) {
   common.npm(
     [
       '--loglevel', 'silent',
+      '--parseable',
       'install'
     ],
     EXEC_OPTS,
@@ -71,14 +72,13 @@ test('installing already installed local scoped package', function (t) {
       var installed = parseNpmInstallOutput(stdout)
       t.ifError(err, 'install ran to completion without error')
       t.notOk(code, 'npm install exited with code 0')
-
       t.ok(
-        existsSync(path.join(modules, '@scoped', 'package', 'package.json')),
+        existsSync(path.join(modules, '@scoped', 'package-scoped-dependency', 'package.json')),
         'package installed'
       )
       t.ok(
-        contains(installed, 'node_modules/@scoped/package'),
-        'installed @scoped/package'
+        contains(installed, 'node_modules/@scoped/package-scoped-dependency'),
+        'installed @scoped/package-scoped-dependency'
       )
       t.ok(
         contains(installed, 'node_modules/package-local-dependency'),
@@ -88,6 +88,7 @@ test('installing already installed local scoped package', function (t) {
       common.npm(
         [
           '--loglevel', 'silent',
+          '--parseable',
           'install'
         ],
         EXEC_OPTS,
@@ -98,13 +99,13 @@ test('installing already installed local scoped package', function (t) {
           installed = parseNpmInstallOutput(stdout)
 
           t.ok(
-            existsSync(path.join(modules, '@scoped', 'package', 'package.json')),
+            existsSync(path.join(modules, '@scoped', 'package-scoped-dependency', 'package.json')),
             'package installed'
           )
 
           t.notOk(
-            contains(installed, 'node_modules/@scoped/package'),
-            'did not reinstall @scoped/package'
+            contains(installed, 'node_modules/@scoped/package-scoped-dependency'),
+            'did not reinstall @scoped/package-scoped-dependency'
           )
           t.notOk(
             contains(installed, 'node_modules/package-local-dependency'),
@@ -124,8 +125,9 @@ test('cleanup', function (t) {
 })
 
 function contains (list, element) {
+  var matcher = new RegExp(element + '$')
   for (var i = 0; i < list.length; ++i) {
-    if (list[i] === element) {
+    if (matcher.test(list[i])) {
       return true
     }
   }
diff --git a/deps/npm/test/tap/install-scoped-with-peer-dependency.js b/deps/npm/test/tap/install-scoped-with-peer-dependency.js
index 3a54b9a11f2daf..da571ae5496923 100644
--- a/deps/npm/test/tap/install-scoped-with-peer-dependency.js
+++ b/deps/npm/test/tap/install-scoped-with-peer-dependency.js
@@ -27,13 +27,12 @@ test('setup', function (t) {
 })
 
 test('it should install peerDependencies in same tree level as the parent package', function (t) {
-  common.npm(['install', './package'], EXEC_OPTS, function (err, code, stdout, stderr) {
+  common.npm(['install', '--loglevel=warn', './package'], EXEC_OPTS, function (err, code, stdout, stderr) {
     t.ifError(err, 'install local package successful')
     t.equal(code, 0, 'npm install exited with code')
-    t.notOk(stderr, 'npm install exited without any error output')
+    t.match(stderr, /npm WARN EPEERINVALID @scope[/]package@0[.]0[.]0 requires a peer of underscore@[*] but none was installed[.]\n/,
+      'npm install warned about unresolved peer dep')
 
-    var p = path.resolve(pkg, 'node_modules/underscore/package.json')
-    t.ok(JSON.parse(fs.readFileSync(p, 'utf8')))
     t.end()
   })
 })
diff --git a/deps/npm/test/tap/install-with-dev-dep-duplicate.js b/deps/npm/test/tap/install-with-dev-dep-duplicate.js
index 19ad0c2bf47da6..41eb8233114962 100644
--- a/deps/npm/test/tap/install-with-dev-dep-duplicate.js
+++ b/deps/npm/test/tap/install-with-dev-dep-duplicate.js
@@ -31,7 +31,8 @@ var expected = {
     underscore: {
       version: '1.5.1',
       from: 'underscore@1.5.1',
-      resolved: common.registry + '/underscore/-/underscore-1.5.1.tgz'
+      resolved: common.registry + '/underscore/-/underscore-1.5.1.tgz',
+      invalid: true
     }
   }
 }
@@ -49,6 +50,10 @@ test('prefers version from dependencies over devDependencies', function (t) {
         npm.commands.ls([], true, function (err, _, results) {
           if (err) return t.fail(err)
 
+          // these contain full paths so we can't do an exact match
+          // with them
+          delete results.problems
+          delete results.dependencies.underscore.problems
           t.deepEqual(results, expected)
           s.close()
           t.end()
diff --git a/deps/npm/test/tap/invalid-cmd-exit-code.js b/deps/npm/test/tap/invalid-cmd-exit-code.js
index c9918e5a79d8b6..f4bb444a179690 100644
--- a/deps/npm/test/tap/invalid-cmd-exit-code.js
+++ b/deps/npm/test/tap/invalid-cmd-exit-code.js
@@ -1,28 +1,28 @@
-var test = require("tap").test
-var common = require("../common-tap.js")
+var test = require('tap').test
+var common = require('../common-tap.js')
 
 var opts = { cwd: process.cwd() }
 
-test("npm asdf should return exit code 1", function (t) {
-  common.npm(["asdf"], opts, function (er, c) {
+test('npm asdf should return exit code 1', function (t) {
+  common.npm(['asdf'], opts, function (er, c) {
     if (er) throw er
-    t.ok(c, "exit code should not be zero")
+    t.ok(c, 'exit code should not be zero')
     t.end()
   })
 })
 
-test("npm help should return exit code 0", function (t) {
-  common.npm(["help"], opts, function (er, c) {
+test('npm help should return exit code 0', function (t) {
+  common.npm(['help'], opts, function (er, c) {
     if (er) throw er
-    t.equal(c, 0, "exit code should be 0")
+    t.equal(c, 0, 'exit code should be 0')
     t.end()
   })
 })
 
-test("npm help fadf should return exit code 0", function (t) {
-  common.npm(["help", "fadf"], opts, function (er, c) {
+test('npm help fadf should return exit code 0', function (t) {
+  common.npm(['help', 'fadf'], opts, function (er, c) {
     if (er) throw er
-    t.equal(c, 0, "exit code should be 0")
+    t.equal(c, 0, 'exit code should be 0')
     t.end()
   })
 })
diff --git a/deps/npm/test/tap/is-fs-access-available.js b/deps/npm/test/tap/is-fs-access-available.js
new file mode 100644
index 00000000000000..7374e40223267a
--- /dev/null
+++ b/deps/npm/test/tap/is-fs-access-available.js
@@ -0,0 +1,54 @@
+'use strict'
+var test = require('tap').test
+var requireInject = require('require-inject')
+var semver = require('semver')
+
+var globalProcess = global.process
+
+function loadIsFsAccessAvailable (newProcess, fs) {
+  global.process = newProcess
+  var mocks = {fs: fs}
+  var isFsAccessAvailable = requireInject('../../lib/install/is-fs-access-available.js', mocks)
+  global.process = globalProcess
+  return isFsAccessAvailable
+}
+
+var fsWithAccess = {access: function () {}}
+var fsWithoutAccess = {}
+
+if (semver.lt(process.version, '0.12.0')) {
+  test('skipping', function (t) {
+    t.pass('skipping all tests on < 0.12.0 due to process not being injectable')
+    t.end()
+  })
+} else {
+  test('mac + !fs.access', function (t) {
+    var isFsAccessAvailable = loadIsFsAccessAvailable({platform: 'darwin'}, fsWithoutAccess)
+    t.is(isFsAccessAvailable, false, 'not available')
+    t.end()
+  })
+
+  test('mac + fs.access', function (t) {
+    var isFsAccessAvailable = loadIsFsAccessAvailable({platform: 'darwin'}, fsWithAccess)
+    t.is(isFsAccessAvailable, true, 'available')
+    t.end()
+  })
+
+  test('windows + !fs.access', function (t) {
+    var isFsAccessAvailable = loadIsFsAccessAvailable({platform: 'win32'}, fsWithoutAccess)
+    t.is(isFsAccessAvailable, false, 'not available')
+    t.end()
+  })
+
+  test('windows + fs.access + node 0.12.7', function (t) {
+    var isFsAccessAvailable = loadIsFsAccessAvailable({platform: 'win32', version: '0.12.7'}, fsWithAccess)
+    t.is(isFsAccessAvailable, false, 'not available')
+    t.end()
+  })
+
+  test('windows + fs.access + node 2.4.0', function (t) {
+    var isFsAccessAvailable = loadIsFsAccessAvailable({platform: 'win32', version: '2.4.0'}, fsWithAccess)
+    t.is(isFsAccessAvailable, true, 'available')
+    t.end()
+  })
+}
diff --git a/deps/npm/test/tap/lifecycle.js b/deps/npm/test/tap/lifecycle.js
index aa0efc52669f2c..1bd77c383bfaaf 100644
--- a/deps/npm/test/tap/lifecycle.js
+++ b/deps/npm/test/tap/lifecycle.js
@@ -1,12 +1,12 @@
-var test = require("tap").test
-var npm = require("../../")
-var lifecycle = require("../../lib/utils/lifecycle")
+var test = require('tap').test
+var npm = require('../../')
+var lifecycle = require('../../lib/utils/lifecycle')
 
-test("lifecycle: make env correctly", function (t) {
+test('lifecycle: make env correctly', function (t) {
   npm.load({enteente: Infinity}, function () {
     var env = lifecycle.makeEnv({}, null, process.env)
 
-    t.equal("Infinity", env.npm_config_enteente)
+    t.equal('Infinity', env.npm_config_enteente)
     t.end()
   })
 })
diff --git a/deps/npm/test/tap/link.js b/deps/npm/test/tap/link.js
index ea47e8296a15c5..869364c29b5e7e 100644
--- a/deps/npm/test/tap/link.js
+++ b/deps/npm/test/tap/link.js
@@ -8,6 +8,7 @@ var writeFileSync = require('fs').writeFileSync
 var common = require('../common-tap.js')
 
 var link = path.join(__dirname, 'link')
+var linkScoped = path.join(__dirname, 'link-scoped')
 var linkInstall = path.join(__dirname, 'link-install')
 var linkRoot = path.join(__dirname, 'link-root')
 
@@ -32,6 +33,18 @@ var readJSON = {
   license: 'ISC'
 }
 
+var readScopedJSON = {
+  name: '@scope/foo',
+  version: '1.0.0',
+  description: '',
+  main: 'index.js',
+  scripts: {
+    test: 'echo \"Error: no test specified\" && exit 1'
+  },
+  author: '',
+  license: 'ISC'
+}
+
 var installJSON = {
   name: 'bar',
   version: '1.0.0',
@@ -44,7 +57,6 @@ var installJSON = {
   license: 'ISC'
 }
 
-
 test('setup', function (t) {
   setup()
   common.npm(['ls', '-g', '--depth=0'], OPTS, function (err, c, out) {
@@ -55,7 +67,7 @@ test('setup', function (t) {
   })
 })
 
-test('creates global link', function (t) {
+test('create global link', function (t) {
   process.chdir(link)
   common.npm(['link'], OPTS, function (err, c, out) {
     t.ifError(err, 'link has no error')
@@ -69,6 +81,20 @@ test('creates global link', function (t) {
   })
 })
 
+test('create scoped global link', function (t) {
+  process.chdir(linkScoped)
+  common.npm(['link'], OPTS, function (err, c, out) {
+    t.ifError(err, 'link has no error')
+    common.npm(['ls', '-g'], OPTS, function (err, c, out, stderr) {
+      t.ifError(err)
+      t.equal(c, 0)
+      t.equal(stderr, '', 'got expected stderr')
+      t.has(out, /@scope[/]foo@1.0.0/, 'creates global link ok')
+      t.end()
+    })
+  })
+})
+
 test('link-install the package', function (t) {
   process.chdir(linkInstall)
   common.npm(['link', 'foo'], OPTS, function (err) {
@@ -82,6 +108,19 @@ test('link-install the package', function (t) {
   })
 })
 
+test('link-install the scoped package', function (t) {
+  process.chdir(linkInstall)
+  common.npm(['link', linkScoped], OPTS, function (err) {
+    t.ifError(err, 'link-install has no error')
+    common.npm(['ls'], OPTS, function (err, c, out) {
+      t.ifError(err)
+      t.equal(c, 1)
+      t.has(out, /@scope[/]foo@1.0.0/, 'link-install ok')
+      t.end()
+    })
+  })
+})
+
 test('cleanup', function (t) {
   process.chdir(osenv.tmpdir())
   common.npm(['rm', 'foo'], OPTS, function (err, code) {
@@ -100,6 +139,7 @@ test('cleanup', function (t) {
 function cleanup () {
   rimraf.sync(linkRoot)
   rimraf.sync(link)
+  rimraf.sync(linkScoped)
   rimraf.sync(linkInstall)
 }
 
@@ -111,6 +151,11 @@ function setup () {
     path.join(link, 'package.json'),
     JSON.stringify(readJSON, null, 2)
   )
+  mkdirp.sync(linkScoped)
+  writeFileSync(
+    path.join(linkScoped, 'package.json'),
+    JSON.stringify(readScopedJSON, null, 2)
+  )
   mkdirp.sync(linkInstall)
   writeFileSync(
     path.join(linkInstall, 'package.json'),
diff --git a/deps/npm/test/tap/locker.js b/deps/npm/test/tap/locker.js
index bc43c30e95e653..8c548095f7f54a 100644
--- a/deps/npm/test/tap/locker.js
+++ b/deps/npm/test/tap/locker.js
@@ -1,54 +1,54 @@
-var test = require("tap").test
-  , path = require("path")
-  , fs = require("graceful-fs")
-  , crypto = require("crypto")
-  , rimraf = require("rimraf")
-  , osenv = require("osenv")
-  , mkdirp = require("mkdirp")
-  , npm = require("../../")
-  , locker = require("../../lib/utils/locker.js")
-  , lock = locker.lock
-  , unlock = locker.unlock
+var test = require('tap').test
+var path = require('path')
+var fs = require('graceful-fs')
+var crypto = require('crypto')
+var rimraf = require('rimraf')
+var osenv = require('osenv')
+var mkdirp = require('mkdirp')
+var npm = require('../../')
+var locker = require('../../lib/utils/locker.js')
+var lock = locker.lock
+var unlock = locker.unlock
 
-var pkg = path.join(__dirname, "/locker")
-  , cache = path.join(pkg, "/cache")
-  , tmp = path.join(pkg, "/tmp")
-  , nm = path.join(pkg, "/node_modules")
+var pkg = path.join(__dirname, '/locker')
+var cache = path.join(pkg, '/cache')
+var tmp = path.join(pkg, '/tmp')
+var nm = path.join(pkg, '/node_modules')
 
 function cleanup () {
   process.chdir(osenv.tmpdir())
   rimraf.sync(pkg)
 }
 
-test("setup", function (t) {
+test('setup', function (t) {
   cleanup()
   mkdirp.sync(cache)
   mkdirp.sync(tmp)
   t.end()
 })
 
-test("locking file puts lock in correct place", function (t) {
+test('locking file puts lock in correct place', function (t) {
   npm.load({cache: cache, tmpdir: tmp}, function (er) {
-    t.ifError(er, "npm bootstrapped OK")
+    t.ifError(er, 'npm bootstrapped OK')
 
-    var n = "correct"
-      , c = n.replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-+|-+$/g, "")
-      , p = path.resolve(nm, n)
-      , h = crypto.createHash("sha1").update(p).digest("hex")
-      , l = c.substr(0, 24)+"-"+h.substr(0, 16)+".lock"
-      , v = path.join(cache, "_locks",  l)
+    var n = 'correct'
+    var c = n.replace(/[^a-zA-Z0-9]+/g, '-').replace(/^-+|-+$/g, '')
+    var p = path.resolve(nm, n)
+    var h = crypto.createHash('sha1').update(p).digest('hex')
+    var l = c.substr(0, 24) + '-' + h.substr(0, 16) + '.lock'
+    var v = path.join(cache, '_locks', l)
 
     lock(nm, n, function (er) {
-      t.ifError(er, "locked path")
+      t.ifError(er, 'locked path')
 
       fs.exists(v, function (found) {
-        t.ok(found, "lock found OK")
+        t.ok(found, 'lock found OK')
 
         unlock(nm, n, function (er) {
-          t.ifError(er, "unlocked path")
+          t.ifError(er, 'unlocked path')
 
           fs.exists(v, function (found) {
-            t.notOk(found, "lock deleted OK")
+            t.notOk(found, 'lock deleted OK')
             t.end()
           })
         })
@@ -57,33 +57,33 @@ test("locking file puts lock in correct place", function (t) {
   })
 })
 
-test("unlocking out of order errors out", function (t) {
+test('unlocking out of order errors out', function (t) {
   npm.load({cache: cache, tmpdir: tmp}, function (er) {
-    t.ifError(er, "npm bootstrapped OK")
+    t.ifError(er, 'npm bootstrapped OK')
 
-    var n = "busted"
-      , c = n.replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-+|-+$/g, "")
-      , p = path.resolve(nm, n)
-      , h = crypto.createHash("sha1").update(p).digest("hex")
-      , l = c.substr(0, 24)+"-"+h.substr(0, 16)+".lock"
-      , v = path.join(cache, "_locks",  l)
+    var n = 'busted'
+    var c = n.replace(/[^a-zA-Z0-9]+/g, '-').replace(/^-+|-+$/g, '')
+    var p = path.resolve(nm, n)
+    var h = crypto.createHash('sha1').update(p).digest('hex')
+    var l = c.substr(0, 24) + '-' + h.substr(0, 16) + '.lock'
+    var v = path.join(cache, '_locks', l)
 
     fs.exists(v, function (found) {
-      t.notOk(found, "no lock to unlock")
+      t.notOk(found, 'no lock to unlock')
 
       t.throws(function () {
         unlock(nm, n, function () {
           t.fail("shouldn't get here")
           t.end()
         })
-      }, "blew up as expected")
+      }, 'blew up as expected')
 
       t.end()
     })
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   cleanup()
   t.end()
 })
diff --git a/deps/npm/test/tap/logout.js b/deps/npm/test/tap/logout.js
index 1d9392ad16ae65..3a62cc2737b2c1 100644
--- a/deps/npm/test/tap/logout.js
+++ b/deps/npm/test/tap/logout.js
@@ -1,58 +1,58 @@
-var fs = require("fs")
-var path = require("path")
+var fs = require('fs')
+var path = require('path')
 
-var mkdirp = require("mkdirp")
-var mr = require("npm-registry-mock")
-var rimraf = require("rimraf")
-var test = require("tap").test
+var mkdirp = require('mkdirp')
+var mr = require('npm-registry-mock')
+var rimraf = require('rimraf')
+var test = require('tap').test
 
-var common = require("../common-tap.js")
+var common = require('../common-tap.js')
 
-var pkg = path.resolve(__dirname, "logout")
-var outfile = path.join(pkg, "_npmrc")
+var pkg = path.resolve(__dirname, 'logout')
+var outfile = path.join(pkg, '_npmrc')
 var opts = { cwd: pkg }
 
 var contents = function () {/*
 foo=boo
 //localhost:1337/:_authToken=glarb
-*/}.toString().split("\n").slice(1, -1).join("\n")
+*/}.toString().split('\n').slice(1, -1).join('\n')
 
 function mocks (server) {
-  server.delete("/-/user/token/glarb")
+  server.delete('/-/user/token/glarb')
     .reply(200, {})
 }
 
-test("setup", function (t) {
+test('setup', function (t) {
   cleanup()
   setup()
   t.end()
 })
 
-test("npm logout", function (t) {
+test('npm logout', function (t) {
   mr({ port: common.port, plugin: mocks }, function (err, s) {
     if (err) throw err
 
     common.npm(
     [
-      "logout",
-      "--registry", common.registry,
-      "--loglevel", "silent",
-      "--userconfig", outfile
+      'logout',
+      '--registry', common.registry,
+      '--loglevel', 'silent',
+      '--userconfig', outfile
     ],
     opts,
     function (err, code) {
-      t.ifError(err, "no error output")
-      t.notOk(code, "exited OK")
+      t.ifError(err, 'no error output')
+      t.notOk(code, 'exited OK')
 
-      var config = fs.readFileSync(outfile, "utf8")
-      t.equal(config, "foo=boo\n", "creds gone")
+      var config = fs.readFileSync(outfile, 'utf8')
+      t.equal(config, 'foo=boo\n', 'creds gone')
       s.close()
       t.end()
     })
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   cleanup()
   t.end()
 })
diff --git a/deps/npm/test/tap/ls-env.js b/deps/npm/test/tap/ls-env.js
index 30039b5b30819f..29058d9245836f 100644
--- a/deps/npm/test/tap/ls-env.js
+++ b/deps/npm/test/tap/ls-env.js
@@ -54,6 +54,24 @@ test('npm ls --dev', function (t) {
   })
 })
 
+test('npm ls --only=development', function (t) {
+  common.npm(['ls', '--only=development'], EXEC_OPTS, function (er, code, stdout) {
+    t.ifError(er, 'ls --only=development ran without issue')
+    t.equal(code, 0)
+    t.has(stdout, /(empty)/, 'output contains (empty)')
+    t.end()
+  })
+})
+
+test('npm ls --only=dev', function (t) {
+  common.npm(['ls', '--only=dev'], EXEC_OPTS, function (er, code, stdout) {
+    t.ifError(er, 'ls --only=dev ran without issue')
+    t.equal(code, 0)
+    t.has(stdout, /(empty)/, 'output contains (empty)')
+    t.end()
+  })
+})
+
 test('npm ls --production', function (t) {
   common.npm(['ls', '--production'], EXEC_OPTS, function (er, code, stdout) {
     t.ifError(er, 'ls --production ran without issue')
@@ -80,6 +98,32 @@ test('npm ls --prod', function (t) {
   })
 })
 
+test('npm ls --only=production', function (t) {
+  common.npm(['ls', '--only=production'], EXEC_OPTS, function (er, code, stdout) {
+    t.ifError(er, 'ls --only=production ran without issue')
+    t.notOk(code, 'npm exited ok')
+    t.has(
+      stdout,
+      /test-package-with-one-dep@0\.0\.0/,
+      'output contains test-package-with-one-dep@0.0.0'
+    )
+    t.end()
+  })
+})
+
+test('npm ls --only=prod', function (t) {
+  common.npm(['ls', '--only=prod'], EXEC_OPTS, function (er, code, stdout) {
+    t.ifError(er, 'ls --only=prod ran without issue')
+    t.notOk(code, 'npm exited ok')
+    t.has(
+      stdout,
+      /test-package-with-one-dep@0\.0\.0/,
+      'output contains test-package-with-one-dep@0.0.0'
+    )
+    t.end()
+  })
+})
+
 test('cleanup', function (t) {
   cleanup()
   t.end()
diff --git a/deps/npm/test/tap/ls-l-depth-0.js b/deps/npm/test/tap/ls-l-depth-0.js
index 3b5ae4d20234cd..24fa0629087829 100644
--- a/deps/npm/test/tap/ls-l-depth-0.js
+++ b/deps/npm/test/tap/ls-l-depth-0.js
@@ -62,7 +62,9 @@ test('#6311: npm ll --depth=0 duplicates listing', function (t) {
       t.notOk(stderr, 'npm install ran silently')
       t.equal(
         stdout.trim(),
-        'glock@1.8.7 node_modules/glock\n└── underscore@1.5.1',
+        resolve(__dirname, 'ls-l-depth-0') +
+          '\n└─┬ glock@1.8.7 ' +
+          '\n  └── underscore@1.5.1',
         'got expected install output'
       )
 
@@ -75,7 +77,7 @@ test('#6311: npm ll --depth=0 duplicates listing', function (t) {
         EXEC_OPTS,
         function (err, code, stdout, stderr) {
           t.ifError(err, 'npm ll ran without error')
-          t.notOk(code, 'npm ll exited cleanly')
+          t.is(code, 0, 'npm ll exited cleanly')
           t.notOk(stderr, 'npm ll ran silently')
           t.equal(
             stdout,
diff --git a/deps/npm/test/tap/ls-no-results.js b/deps/npm/test/tap/ls-no-results.js
index 10f3ce00145c35..9792774c69b296 100644
--- a/deps/npm/test/tap/ls-no-results.js
+++ b/deps/npm/test/tap/ls-no-results.js
@@ -1,11 +1,11 @@
-var test = require("tap").test
-var spawn = require("child_process").spawn
+var test = require('tap').test
+var spawn = require('child_process').spawn
 var node = process.execPath
-var npm = require.resolve("../../")
-var args = [ npm, "ls", "ceci n’est pas une package" ]
-test("ls exits non-zero when nothing found", function (t) {
+var npm = require.resolve('../../')
+var args = [ npm, 'ls', 'ceci n’est pas une package' ]
+test('ls exits non-zero when nothing found', function (t) {
   var child = spawn(node, args)
-  child.on("exit", function (code) {
+  child.on('exit', function (code) {
     t.notEqual(code, 0)
     t.end()
   })
diff --git a/deps/npm/test/tap/ls-top-errors.js b/deps/npm/test/tap/ls-top-errors.js
new file mode 100644
index 00000000000000..69b8b299c81710
--- /dev/null
+++ b/deps/npm/test/tap/ls-top-errors.js
@@ -0,0 +1,71 @@
+'use strict'
+var fs = require('fs')
+var path = require('path')
+
+var test = require('tap').test
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+
+var common = require('../common-tap')
+
+var pkg = path.resolve(__dirname, path.basename(__filename, '.js'))
+var pathModA = path.join(pkg, 'node_modules', 'moduleA')
+var pathModB = path.join(pkg, 'node_modules', 'moduleB')
+
+var modA = {
+  name: 'moduleA',
+  version: '1.0.0',
+  _requiredBy: [ '#USER', '/moduleB' ],
+  dependencies: {
+    moduleB: '1.0.0'
+  }
+}
+var modB = {
+  name: 'moduleB',
+  version: '1.0.0',
+  _requiredBy: [ '/moduleA' ],
+  dependencies: {
+    moduleA: '1.0.0'
+  }
+}
+
+function setup () {
+  mkdirp.sync(pkg)
+  fs.writeFileSync(
+    path.join(pkg, 'package.json'),
+    '{broken json'
+  )
+  mkdirp.sync(pathModA)
+  fs.writeFileSync(
+    path.join(pathModA, 'package.json'),
+    JSON.stringify(modA, null, 2)
+  )
+  mkdirp.sync(pathModB)
+  fs.writeFileSync(
+    path.join(pathModB, 'package.json'),
+    JSON.stringify(modB, null, 2)
+  )
+}
+
+function cleanup () {
+  rimraf.sync(pkg)
+}
+
+test('setup', function (t) {
+  cleanup()
+  setup()
+  t.end()
+})
+
+test('ls-top-errors', function (t) {
+  common.npm(['ls'], {cwd: pkg}, function (er, code, stdout, stderr) {
+    t.ifErr(er, 'install finished successfully')
+    t.match(stderr, /Failed to parse json/)
+    t.end()
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
diff --git a/deps/npm/test/tap/nerf-dart.js b/deps/npm/test/tap/nerf-dart.js
index 157f6c7dfe4b5d..a6df7272c304af 100644
--- a/deps/npm/test/tap/nerf-dart.js
+++ b/deps/npm/test/tap/nerf-dart.js
@@ -1,32 +1,32 @@
 // taken from https://raw.githubusercontent.com/indexzero/npm/bd3cad01fbd3ab481d2f5da441b9eead16029123/test/tap/config-nerf-dart.js
 // originally written by Charlie Robbins, https://github.com/indexzero
-var test = require("tap").test
-var toNerfDart = require("../../lib/config/nerf-dart.js")
+var test = require('tap').test
+var toNerfDart = require('../../lib/config/nerf-dart.js')
 
 function validNerfDart (uri, valid) {
-  if (!valid) valid = "//registry.npmjs.org/"
+  if (!valid) valid = '//registry.npmjs.org/'
   test(uri, function (t) {
     t.equal(toNerfDart(uri), valid)
     t.end()
   })
 }
 
-validNerfDart("http://registry.npmjs.org")
-validNerfDart("http://registry.npmjs.org/some-package")
-validNerfDart("http://registry.npmjs.org/some-package?write=true")
-validNerfDart("http://user:pass@registry.npmjs.org/some-package?write=true")
-validNerfDart("http://registry.npmjs.org/#random-hash")
-validNerfDart("http://registry.npmjs.org/some-package#random-hash")
+validNerfDart('http://registry.npmjs.org')
+validNerfDart('http://registry.npmjs.org/some-package')
+validNerfDart('http://registry.npmjs.org/some-package?write=true')
+validNerfDart('http://user:pass@registry.npmjs.org/some-package?write=true')
+validNerfDart('http://registry.npmjs.org/#random-hash')
+validNerfDart('http://registry.npmjs.org/some-package#random-hash')
 
 validNerfDart(
-  "http://relative.couchapp.npm/design/-/rewrite/",
-       "//relative.couchapp.npm/design/-/rewrite/"
+  'http://relative.couchapp.npm/design/-/rewrite/',
+       '//relative.couchapp.npm/design/-/rewrite/'
 )
 validNerfDart(
-  "http://relative.couchapp.npm:8080/design/-/rewrite/",
-       "//relative.couchapp.npm:8080/design/-/rewrite/"
+  'http://relative.couchapp.npm:8080/design/-/rewrite/',
+       '//relative.couchapp.npm:8080/design/-/rewrite/'
 )
 validNerfDart(
-  "http://relative.couchapp.npm:8080/design/-/rewrite/some-package",
-       "//relative.couchapp.npm:8080/design/-/rewrite/"
+  'http://relative.couchapp.npm:8080/design/-/rewrite/some-package',
+       '//relative.couchapp.npm:8080/design/-/rewrite/'
 )
diff --git a/deps/npm/test/tap/nested-extraneous.js b/deps/npm/test/tap/nested-extraneous.js
index fcba0418e6869b..99d4bea5b9b1c5 100644
--- a/deps/npm/test/tap/nested-extraneous.js
+++ b/deps/npm/test/tap/nested-extraneous.js
@@ -1,42 +1,42 @@
-var common = require("../common-tap.js")
-var test = require("tap").test
-var mkdirp = require("mkdirp")
-var fs = require("fs")
-var rimraf = require("rimraf")
-var path = require("path")
+var common = require('../common-tap.js')
+var test = require('tap').test
+var mkdirp = require('mkdirp')
+var fs = require('fs')
+var rimraf = require('rimraf')
+var path = require('path')
 
-var pkg = path.resolve(__dirname, "nested-extraneous")
+var pkg = path.resolve(__dirname, 'nested-extraneous')
 var pj = {
-  name: "nested-extraneous",
-  version: "1.2.3"
+  name: 'nested-extraneous',
+  version: '1.2.3'
 }
 
-var dep = path.resolve(pkg, "node_modules", "dep")
+var dep = path.resolve(pkg, 'node_modules', 'dep')
 var deppj = {
-  name: "nested-extraneous-dep",
-  version: "1.2.3",
+  name: 'nested-extraneous-dep',
+  version: '1.2.3',
   dependencies: {
-    "nested-extra-depdep": "*"
+    'nested-extra-depdep': '*'
   }
 }
 
-var depdep = path.resolve(dep, "node_modules", "depdep")
+var depdep = path.resolve(dep, 'node_modules', 'depdep')
 var depdeppj = {
-  name: "nested-extra-depdep",
-  version: "1.2.3"
+  name: 'nested-extra-depdep',
+  version: '1.2.3'
 }
 
-test("setup", function (t) {
+test('setup', function (t) {
   rimraf.sync(pkg)
   mkdirp.sync(depdep)
-  fs.writeFileSync(path.resolve(pkg, "package.json"), JSON.stringify(pj))
-  fs.writeFileSync(path.resolve(dep, "package.json"), JSON.stringify(deppj))
-  fs.writeFileSync(path.resolve(depdep, "package.json"), JSON.stringify(depdeppj))
+  fs.writeFileSync(path.resolve(pkg, 'package.json'), JSON.stringify(pj))
+  fs.writeFileSync(path.resolve(dep, 'package.json'), JSON.stringify(deppj))
+  fs.writeFileSync(path.resolve(depdep, 'package.json'), JSON.stringify(depdeppj))
   t.end()
 })
 
-test("test", function (t) {
-  common.npm(["ls"], {
+test('test', function (t) {
+  common.npm(['ls'], {
     cwd: pkg
   }, function (er, code, sto, ste) {
     if (er) throw er
@@ -47,7 +47,7 @@ test("test", function (t) {
   })
 })
 
-test("clean", function (t) {
+test('clean', function (t) {
   rimraf.sync(pkg)
   t.end()
 })
diff --git a/deps/npm/test/tap/no-global-warns.js b/deps/npm/test/tap/no-global-warns.js
new file mode 100644
index 00000000000000..439388fe19c480
--- /dev/null
+++ b/deps/npm/test/tap/no-global-warns.js
@@ -0,0 +1,67 @@
+'use strict'
+var path = require('path')
+var test = require('tap').test
+var mkdirp = require('mkdirp')
+var osenv = require('osenv')
+var rimraf = require('rimraf')
+var writeFileSync = require('fs').writeFileSync
+var common = require('../common-tap.js')
+
+var base = path.join(__dirname, path.basename(__filename, '.js'))
+var mockGlobal = path.join(base, 'global')
+var toInstall = path.join(base, 'to-install')
+
+var config = 'prefix = ' + base
+var configPath = path.join(base, '_npmrc')
+
+var OPTS = {
+  env: {
+    'npm_config_userconfig': configPath
+  }
+}
+
+var installJSON = {
+  name: 'to-install',
+  version: '1.0.0',
+  description: '',
+  main: 'index.js',
+  scripts: {
+    test: 'echo \"Error: no test specified\" && exit 1'
+  },
+  author: '',
+  license: 'ISC'
+}
+
+test('setup', function (t) {
+  setup()
+  t.end()
+})
+
+test('no-global-warns', function (t) {
+  common.npm(['install', '-g', toInstall], OPTS, function (err, code, stdout, stderr) {
+    t.ifError(err, 'installed w/o error')
+    t.is(stderr, '', 'no warnings printed to stderr')
+    t.end()
+  })
+})
+
+test('cleanup', function (t) {
+  process.chdir(osenv.tmpdir())
+  cleanup()
+  t.end()
+})
+
+function cleanup () {
+  rimraf.sync(base)
+}
+
+function setup () {
+  cleanup()
+  mkdirp.sync(mockGlobal)
+  mkdirp.sync(toInstall)
+  writeFileSync(
+    path.join(toInstall, 'package.json'),
+    JSON.stringify(installJSON, null, 2)
+  )
+  writeFileSync(configPath, config)
+}
diff --git a/deps/npm/test/tap/no-scan-full-global-dir.js b/deps/npm/test/tap/no-scan-full-global-dir.js
new file mode 100644
index 00000000000000..b2863c88199ace
--- /dev/null
+++ b/deps/npm/test/tap/no-scan-full-global-dir.js
@@ -0,0 +1,100 @@
+'use strict'
+var path = require('path')
+var test = require('tap').test
+var requireInject = require('require-inject')
+var osenv = require('osenv')
+var inherits = require('inherits')
+var npm = require('../../lib/npm.js')
+
+var packages = {
+  test: {package: {name: 'test'}, path: __dirname, children: ['abc', 'def', 'ghi', 'jkl']},
+  abc: {package: {name: 'abc'}, path: path.join(__dirname, 'node_modules', 'abc')},
+  def: {package: {name: 'def'}, path: path.join(__dirname, 'node_modules', 'def')},
+  ghi: {package: {name: 'ghi'}, path: path.join(__dirname, 'node_modules', 'ghi')},
+  jkl: {package: {name: 'jkl'}, path: path.join(__dirname, 'node_modules', 'jkl')}
+}
+var dirs = {}
+var files = {}
+Object.keys(packages).forEach(function (name) {
+  dirs[path.join(packages[name].path, 'node_modules')] = packages[name].children || []
+  files[path.join(packages[name].path, 'package.json')] = packages[name].package
+})
+
+process.chdir(osenv.tmpdir())
+
+var mockReaddir = function (name, cb) {
+  if (dirs[name]) return cb(null, dirs[name])
+  var er = new Error('No such mock: ' + name)
+  er.code = 'ENOENT'
+  cb(er)
+}
+var mockReadPackageJson = function (file, cb) {
+  if (files[file]) return cb(null, files[file])
+  var er = new Error('No such mock: ' + file)
+  er.code = 'ENOENT'
+  cb(er)
+}
+var mockFs = {
+  realpath: function (dir, cb) {
+    return cb(null, dir)
+  }
+}
+
+test('setup', function (t) {
+  npm.load(function () {
+    t.pass('npm loaded')
+    t.end()
+  })
+})
+
+function loadArgMetadata (cb) {
+  this.args = this.args.map(function (arg) { return {name: arg} })
+  cb()
+}
+
+test('installer', function (t) {
+  t.plan(1)
+  var installer = requireInject('../../lib/install.js', {
+    'fs': mockFs,
+    'readdir-scoped-modules': mockReaddir,
+    'read-package-json': mockReadPackageJson
+  })
+
+  var Installer = installer.Installer
+  var TestInstaller = function () {
+    Installer.apply(this, arguments)
+    this.global = true
+  }
+  inherits(TestInstaller, Installer)
+  TestInstaller.prototype.loadArgMetadata = loadArgMetadata
+
+  var inst = new TestInstaller(__dirname, false, ['def', 'abc'])
+  inst.loadCurrentTree(function () {
+    var kids = inst.currentTree.children.map(function (child) { return child.package.name })
+    t.isDeeply(kids, ['abc', 'def'])
+    t.end()
+  })
+})
+
+test('uninstaller', function (t) {
+  t.plan(1)
+  var uninstaller = requireInject('../../lib/uninstall.js', {
+    'fs': mockFs,
+    'readdir-scoped-modules': mockReaddir,
+    'read-package-json': mockReadPackageJson
+  })
+
+  var Uninstaller = uninstaller.Uninstaller
+  var TestUninstaller = function () {
+    Uninstaller.apply(this, arguments)
+    this.global = true
+  }
+  inherits(TestUninstaller, Uninstaller)
+
+  var uninst = new TestUninstaller(__dirname, false, ['ghi', 'jkl'])
+  uninst.loadCurrentTree(function () {
+    var kids = uninst.currentTree.children.map(function (child) { return child.package.name })
+    t.isDeeply(kids, ['ghi', 'jkl'])
+    t.end()
+  })
+})
diff --git a/deps/npm/test/tap/noargs-install-config-save.js b/deps/npm/test/tap/noargs-install-config-save.js
index b6900b431740d2..7b13f3bdc45813 100644
--- a/deps/npm/test/tap/noargs-install-config-save.js
+++ b/deps/npm/test/tap/noargs-install-config-save.js
@@ -1,46 +1,47 @@
-var common = require("../common-tap.js")
-var test = require("tap").test
-var npm = require.resolve("../../bin/npm-cli.js")
-var path = require("path")
-var fs = require("fs")
-var rimraf = require("rimraf")
-var mkdirp = require("mkdirp")
+var common = require('../common-tap.js')
+var test = require('tap').test
+var npm = require.resolve('../../bin/npm-cli.js')
+var path = require('path')
+var fs = require('fs')
+var rimraf = require('rimraf')
+var mkdirp = require('mkdirp')
 
-var mr = require("npm-registry-mock")
+var mr = require('npm-registry-mock')
 
-var spawn = require("child_process").spawn
+var spawn = require('child_process').spawn
 var node = process.execPath
 
-var pkg = path.resolve(process.env.npm_config_tmp || "/tmp",
-  "noargs-install-config-save")
+var pkg = path.resolve(process.env.npm_config_tmp || '/tmp',
+  'noargs-install-config-save')
 
-function writePackageJson() {
+function writePackageJson () {
   rimraf.sync(pkg)
   mkdirp.sync(pkg)
-  mkdirp.sync(pkg + "/cache")
+  mkdirp.sync(pkg + '/cache')
 
-  fs.writeFileSync(pkg + "/package.json", JSON.stringify({
-    "author": "Rocko Artischocko",
-    "name": "noargs",
-    "version": "0.0.0",
-    "devDependencies": {
-      "underscore": "1.3.1"
+  fs.writeFileSync(pkg + '/package.json', JSON.stringify({
+    'author': 'Rocko Artischocko',
+    'name': 'noargs',
+    'version': '0.0.0',
+    'devDependencies': {
+      'underscore': '1.3.1'
     }
-  }), "utf8")
+  }), 'utf8')
 }
 
 function createChild (args) {
   var env = {
-    "npm_config_save": true,
-    "npm_config_registry": common.registry,
-    "npm_config_cache": pkg + "/cache",
+    'npm_config_save': true,
+    'npm_config_registry': common.registry,
+    'npm_config_cache': pkg + '/cache',
     HOME: process.env.HOME,
     Path: process.env.PATH,
     PATH: process.env.PATH
   }
 
-  if (process.platform === "win32")
-    env.npm_config_cache = "%APPDATA%\\npm-cache"
+  if (process.platform === 'win32') {
+    env.npm_config_cache = '%APPDATA%\\npm-cache'
+  }
 
   return spawn(node, args, {
     cwd: pkg,
@@ -48,35 +49,35 @@ function createChild (args) {
   })
 }
 
-test("does not update the package.json with empty arguments", function (t) {
+test('does not update the package.json with empty arguments', function (t) {
   writePackageJson()
   t.plan(1)
 
-  mr({port : common.port}, function (er, s) {
-    var child = createChild([npm, "install"])
-    child.on("close", function () {
-      var text = JSON.stringify(fs.readFileSync(pkg + "/package.json", "utf8"))
+  mr({ port: common.port }, function (er, s) {
+    var child = createChild([npm, 'install'])
+    child.on('close', function () {
+      var text = JSON.stringify(fs.readFileSync(pkg + '/package.json', 'utf8'))
       s.close()
-      t.ok(text.indexOf("\"dependencies") === -1)
+      t.equal(text.indexOf('"dependencies'), -1, 'dependencies do not exist in file')
     })
   })
 })
 
-test("updates the package.json (adds dependencies) with an argument", function (t) {
+test('updates the package.json (adds dependencies) with an argument', function (t) {
   writePackageJson()
   t.plan(1)
 
-  mr({port : common.port}, function (er, s) {
-    var child = createChild([npm, "install", "underscore"])
-    child.on("close", function () {
+  mr({ port: common.port }, function (er, s) {
+    var child = createChild([npm, 'install', 'underscore'])
+    child.on('close', function () {
       s.close()
-      var text = JSON.stringify(fs.readFileSync(pkg + "/package.json", "utf8"))
-      t.ok(text.indexOf("\"dependencies") !== -1)
+      var text = JSON.stringify(fs.readFileSync(pkg + '/package.json', 'utf8'))
+      t.notEqual(text.indexOf('"dependencies'), -1, 'dependencies exist in file')
     })
   })
 })
 
-test("cleanup", function (t) {
-  rimraf.sync(pkg + "/cache")
+test('cleanup', function (t) {
+  rimraf.sync(pkg + '/cache')
   t.end()
 })
diff --git a/deps/npm/test/tap/normalize-package-explode.js b/deps/npm/test/tap/normalize-package-explode.js
new file mode 100644
index 00000000000000..57faec8b60250d
--- /dev/null
+++ b/deps/npm/test/tap/normalize-package-explode.js
@@ -0,0 +1,26 @@
+'use strict'
+var test = require('tap').test
+var log = require('npmlog')
+var npm = require('../../lib/npm.js')
+
+var idealTree = {
+  package: {
+    name: 'a b c',
+    version: '3.what'
+  },
+  children: [],
+  warnings: []
+}
+
+test('setup', function (t) {
+  npm.load({}, t.end)
+})
+
+test('validate-tree', function (t) {
+  log.disableProgress()
+  var validateTree = require('../../lib/install/validate-tree.js')
+  validateTree(idealTree, log.newGroup('validate'), function (er) {
+    t.pass("we didn't crash")
+    t.end()
+  })
+})
diff --git a/deps/npm/test/tap/npm-api-not-loaded-error.js b/deps/npm/test/tap/npm-api-not-loaded-error.js
index afedfbcd076f50..48b71e5213a7c8 100644
--- a/deps/npm/test/tap/npm-api-not-loaded-error.js
+++ b/deps/npm/test/tap/npm-api-not-loaded-error.js
@@ -1,47 +1,47 @@
-var test = require("tap").test
-var npm = require("../..")
-var path = require("path")
-var rimraf = require("rimraf")
-var npmrc = path.join(__dirname, "npmrc")
-var fs = require("fs")
+var test = require('tap').test
+var npm = require('../..')
+var path = require('path')
+var rimraf = require('rimraf')
+var npmrc = path.join(__dirname, 'npmrc')
+var fs = require('fs')
 
-test("setup", function (t) {
-  fs.writeFileSync(npmrc, "foo = bar\n", "ascii")
+test('setup', function (t) {
+  fs.writeFileSync(npmrc, 'foo = bar\n', 'ascii')
   t.end()
 })
 
-test("calling set/get on config pre-load should throw", function (t) {
+test('calling set/get on config pre-load should throw', function (t) {
   var threw = true
   try {
-    npm.config.get("foo")
+    npm.config.get('foo')
     threw = false
   } catch (er) {
-    t.equal(er.message, "npm.load() required")
+    t.equal(er.message, 'npm.load() required')
   } finally {
-    t.ok(threw, "get before load should throw")
+    t.ok(threw, 'get before load should throw')
   }
 
   threw = true
   try {
-    npm.config.set("foo", "bar")
+    npm.config.set('foo', 'bar')
     threw = false
   } catch (er) {
-    t.equal(er.message, "npm.load() required")
+    t.equal(er.message, 'npm.load() required')
   } finally {
-    t.ok(threw, "set before load should throw")
+    t.ok(threw, 'set before load should throw')
   }
 
   npm.load({ userconfig: npmrc }, function (er) {
-    if (er)
-      throw er
-    t.equal(npm.config.get("foo"), "bar")
-    npm.config.set("foo", "baz")
-    t.equal(npm.config.get("foo"), "baz")
+    if (er) throw er
+
+    t.equal(npm.config.get('foo'), 'bar')
+    npm.config.set('foo', 'baz')
+    t.equal(npm.config.get('foo'), 'baz')
     t.end()
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   rimraf.sync(npmrc)
   t.end()
 })
diff --git a/deps/npm/test/tap/optional-metadep-rollback-collision.js b/deps/npm/test/tap/optional-metadep-rollback-collision.js
index 4b21f965ed12fc..d5116f30fc32cf 100644
--- a/deps/npm/test/tap/optional-metadep-rollback-collision.js
+++ b/deps/npm/test/tap/optional-metadep-rollback-collision.js
@@ -10,7 +10,7 @@ var common = require('../common-tap.js')
 
 var pkg = path.resolve(__dirname, 'optional-metadep-rollback-collision')
 var deps = path.resolve(pkg, 'deps')
-var nm = path.resolve(pkg, 'node_modules')
+var opdep = path.resolve(pkg, 'node_modules', 'opdep')
 var cache = path.resolve(pkg, 'cache')
 var pidfile = path.resolve(pkg, 'child.pid')
 
@@ -49,7 +49,7 @@ var d2 = {
   }
 }
 
-var opdep = {
+var opdep_json = {
   name: 'opdep',
   version: '1.0.0',
   description: 'To explode, of course!',
@@ -63,7 +63,6 @@ var opdep = {
   }
 }
 
-
 var badServer = function () {/*
 var createServer = require('http').createServer
 var spawn = require('child_process').spawn
@@ -179,7 +178,7 @@ test('setup', function (t) {
   mkdirp.sync(path.join(deps, 'opdep'))
   fs.writeFileSync(
     path.join(deps, 'opdep', 'package.json'),
-    JSON.stringify(opdep, null, 2)
+    JSON.stringify(opdep_json, null, 2)
   )
   fs.writeFileSync(path.join(deps, 'opdep', 'bad-server.js'), badServer)
 
@@ -205,9 +204,12 @@ test('go go test racer', function (t) {
     },
     function (er, code, stdout, stderr) {
       t.ifError(er, 'install ran to completion without error')
-      t.notOk(code, 'npm install exited with code 0')
+      t.is(code, 0, 'npm install exited with code 0')
+      t.is(stderr, '')
 
-      t.equal(stdout, 'ok\nok\n')
+      // stdout should be empty, because we only have one, optional, dep and
+      // if it fails we shouldn't try installing anything
+      t.equal(stdout, '')
       t.notOk(/not ok/.test(stdout), 'should not contain the string \'not ok\'')
       t.end()
     }
@@ -216,7 +218,7 @@ test('go go test racer', function (t) {
 
 test('verify results', function (t) {
   t.throws(function () {
-    fs.statSync(nm)
+    fs.statSync(opdep)
   })
   t.end()
 })
diff --git a/deps/npm/test/tap/outdated-depth-deep.js b/deps/npm/test/tap/outdated-depth-deep.js
index c208669b377877..c39e029aaec2f6 100644
--- a/deps/npm/test/tap/outdated-depth-deep.js
+++ b/deps/npm/test/tap/outdated-depth-deep.js
@@ -1,26 +1,26 @@
-var common = require("../common-tap")
-  , path = require("path")
-  , test = require("tap").test
-  , rimraf = require("rimraf")
-  , npm = require("../../")
-  , mr = require("npm-registry-mock")
-  , pkg = path.resolve(__dirname, "outdated-depth-deep")
-  , cache = path.resolve(pkg, "cache")
+var common = require('../common-tap')
+var path = require('path')
+var test = require('tap').test
+var rimraf = require('rimraf')
+var npm = require('../../')
+var mr = require('npm-registry-mock')
+var pkg = path.resolve(__dirname, 'outdated-depth-deep')
+var cache = path.resolve(pkg, 'cache')
 
-var osenv = require("osenv")
-var mkdirp = require("mkdirp")
-var fs = require("fs")
+var osenv = require('osenv')
+var mkdirp = require('mkdirp')
+var fs = require('fs')
 
 var pj = JSON.stringify({
-  "name": "whatever",
-  "description": "yeah idk",
-  "version": "1.2.3",
-  "main": "index.js",
-  "dependencies": {
-    "underscore": "1.3.1",
-    "npm-test-peer-deps": "0.0.0"
+  'name': 'whatever',
+  'description': 'yeah idk',
+  'version': '1.2.3',
+  'main': 'index.js',
+  'dependencies': {
+    'underscore': '1.3.1',
+    'npm-test-peer-deps': '0.0.0'
   },
-  "repository": "git://github.com/luk-/whatever"
+  'repository': 'git://github.com/luk-/whatever'
 }, null, 2)
 
 function cleanup () {
@@ -31,33 +31,35 @@ function cleanup () {
 function setup () {
   mkdirp.sync(pkg)
   process.chdir(pkg)
-  fs.writeFileSync(path.resolve(pkg, "package.json"), pj)
+  fs.writeFileSync(path.resolve(pkg, 'package.json'), pj)
 }
 
-test("setup", function (t) {
+test('setup', function (t) {
   cleanup()
   setup()
   t.end()
 })
 
-test("outdated depth deep (9999)", function (t) {
-  var underscoreOutdated = ["underscore", "1.3.1", "1.3.1", "1.5.1", "1.3.1"]
-  var childPkg = path.resolve(pkg, "node_modules", "npm-test-peer-deps")
+test('outdated depth deep (9999)', function (t) {
+  var underscoreOutdated = ['underscore', '1.3.1', '1.3.1', '1.5.1', '1.3.1']
+  var childPkg = path.resolve(pkg, 'node_modules', 'npm-test-peer-deps')
 
-  var expected = [ [pkg].concat(underscoreOutdated),
-                   [childPkg].concat(underscoreOutdated) ]
+  var expected = [ [childPkg].concat(underscoreOutdated).concat([null]),
+                   [pkg].concat(underscoreOutdated).concat([null]) ]
 
   process.chdir(pkg)
 
-  mr({port : common.port}, function (er, s) {
+  mr({ port: common.port }, function (er, s) {
     npm.load({
-      cache: cache
-    , loglevel: "silent"
-    , registry: common.registry
-    , depth: 9999
-    }
-    , function () {
-        npm.install(".", function (er) {
+      cache: cache,
+      loglevel: 'silent',
+      registry: common.registry,
+      depth: 9999
+    },
+    function () {
+      npm.install('.', function (er) {
+        if (er) throw new Error(er)
+        npm.explore('npm-test-peer-deps', 'npm', 'install', 'underscore', function (er) {
           if (er) throw new Error(er)
           npm.outdated(function (err, d) {
             if (err) throw new Error(err)
@@ -66,13 +68,12 @@ test("outdated depth deep (9999)", function (t) {
             t.end()
           })
         })
-      }
-    )
+      })
+    })
   })
 })
 
-
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   cleanup()
   t.end()
 })
diff --git a/deps/npm/test/tap/outdated-depth-integer.js b/deps/npm/test/tap/outdated-depth-integer.js
index 485e84e30f2631..ddd2dd7c35f7bb 100644
--- a/deps/npm/test/tap/outdated-depth-integer.js
+++ b/deps/npm/test/tap/outdated-depth-integer.js
@@ -1,24 +1,24 @@
 var common = require('../common-tap')
-  , test = require('tap').test
-  , rimraf = require('rimraf')
-  , npm = require('../../')
-  , mr = require('npm-registry-mock')
-  , pkg = __dirname + '/outdated-depth-integer'
+var test = require('tap').test
+var rimraf = require('rimraf')
+var npm = require('../../')
+var mr = require('npm-registry-mock')
+var pkg = __dirname + '/outdated-depth-integer'
 
-var osenv = require("osenv")
-var mkdirp = require("mkdirp")
-var fs = require("fs")
+var osenv = require('osenv')
+var mkdirp = require('mkdirp')
+var fs = require('fs')
 
 var pj = JSON.stringify({
-  "name": "whatever",
-  "description": "yeah idk",
-  "version": "1.2.3",
-  "main": "index.js",
-  "dependencies": {
-    "underscore": "1.3.1"
+  'name': 'whatever',
+  'description': 'yeah idk',
+  'version': '1.2.3',
+  'main': 'index.js',
+  'dependencies': {
+    'underscore': '1.3.1'
   },
-  "repository": "git://github.com/luk-/whatever"
-}, null, 2);
+  'repository': 'git://github.com/luk-/whatever'
+}, null, 2)
 
 function cleanup () {
   process.chdir(osenv.tmpdir())
@@ -28,10 +28,10 @@ function cleanup () {
 function setup () {
   mkdirp.sync(pkg)
   process.chdir(pkg)
-  fs.writeFileSync("package.json", pj)
+  fs.writeFileSync('package.json', pj)
 }
 
-test("setup", function (t) {
+test('setup', function (t) {
   cleanup()
   setup()
   t.end()
@@ -46,15 +46,16 @@ test('outdated depth integer', function (t) {
     undefined, // no version installed
     '1.3.1',   // wanted
     '1.5.1',   // latest
-    '1.3.1'
+    '1.3.1',
+    null
   ]]
 
-  mr({port : common.port}, function (er, s) {
+  mr({ port: common.port }, function (er, s) {
     npm.load({
-      cache: pkg + '/cache'
-    , loglevel: 'silent'
-    , registry: common.registry
-    , depth: 5
+      cache: pkg + '/cache',
+      loglevel: 'silent',
+      registry: common.registry,
+      depth: 5
     }
     , function () {
         npm.install('request@0.9.0', function (er) {
@@ -71,7 +72,7 @@ test('outdated depth integer', function (t) {
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   cleanup()
   t.end()
 })
diff --git a/deps/npm/test/tap/outdated-depth.js b/deps/npm/test/tap/outdated-depth.js
index 2f06127917446d..13220dfa7bf6cb 100644
--- a/deps/npm/test/tap/outdated-depth.js
+++ b/deps/npm/test/tap/outdated-depth.js
@@ -40,7 +40,8 @@ test('outdated depth zero', function (t) {
     '1.3.1',
     '1.3.1',
     '1.5.1',
-    '1.3.1'
+    '1.3.1',
+    null
   ]
 
   mr({ port: common.port }, function (er, s) {
diff --git a/deps/npm/test/tap/outdated-git.js b/deps/npm/test/tap/outdated-git.js
index 2162c743c142eb..1a61a0c4d2719f 100644
--- a/deps/npm/test/tap/outdated-git.js
+++ b/deps/npm/test/tap/outdated-git.js
@@ -2,7 +2,7 @@ var path = require('path')
 
 var test = require('tap').test
 var mkdirp = require('mkdirp')
-var fs = require("graceful-fs")
+var fs = require('graceful-fs')
 var rimraf = require('rimraf')
 
 var common = require('../common-tap.js')
diff --git a/deps/npm/test/tap/outdated-local.js b/deps/npm/test/tap/outdated-local.js
index f9b8af4420f861..067696ca903510 100644
--- a/deps/npm/test/tap/outdated-local.js
+++ b/deps/npm/test/tap/outdated-local.js
@@ -65,7 +65,6 @@ var pjLocalOptimistBumped = JSON.stringify({
   version: '0.5.0'
 }, null, 2) + '\n'
 
-
 function mocks (server) {
   server.get('/local-module')
     .reply(404)
diff --git a/deps/npm/test/tap/outdated-notarget.js b/deps/npm/test/tap/outdated-notarget.js
index 6058ddee422fcc..5fd2b0634d2d21 100644
--- a/deps/npm/test/tap/outdated-notarget.js
+++ b/deps/npm/test/tap/outdated-notarget.js
@@ -1,23 +1,23 @@
 // Fixes Issue #1770
-var common = require("../common-tap.js")
-var test = require("tap").test
-var npm = require("../../")
-var osenv = require("osenv")
-var path = require("path")
-var fs = require("fs")
-var rimraf = require("rimraf")
-var mkdirp = require("mkdirp")
-var pkg = path.resolve(__dirname, "outdated-notarget")
-var cache = path.resolve(pkg, "cache")
-var mr = require("npm-registry-mock")
+var common = require('../common-tap.js')
+var test = require('tap').test
+var npm = require('../../')
+var osenv = require('osenv')
+var path = require('path')
+var fs = require('fs')
+var rimraf = require('rimraf')
+var mkdirp = require('mkdirp')
+var pkg = path.resolve(__dirname, 'outdated-notarget')
+var cache = path.resolve(pkg, 'cache')
+var mr = require('npm-registry-mock')
 
-test("outdated-target: if no viable version is found, show error", function (t) {
+test('outdated-target: if no viable version is found, show error', function (t) {
   t.plan(1)
   setup()
-  mr({port : common.port}, function (er, s) {
+  mr({ port: common.port }, function (er, s) {
     npm.load({ cache: cache, registry: common.registry}, function () {
       npm.commands.update(function (er) {
-        t.equal(er.code, "ETARGET")
+        t.equal(er.code, 'ETARGET')
         s.close()
         t.end()
       })
@@ -25,23 +25,23 @@ test("outdated-target: if no viable version is found, show error", function (t)
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   process.chdir(osenv.tmpdir())
   rimraf.sync(pkg)
   t.end()
 })
 
-function setup() {
+function setup () {
   mkdirp.sync(pkg)
   mkdirp.sync(cache)
-  fs.writeFileSync(path.resolve(pkg, "package.json"), JSON.stringify({
-    author: "Evan Lucas",
-    name: "outdated-notarget",
-    version: "0.0.0",
-    description: "Test for outdated-target",
+  fs.writeFileSync(path.resolve(pkg, 'package.json'), JSON.stringify({
+    author: 'Evan Lucas',
+    name: 'outdated-notarget',
+    version: '0.0.0',
+    description: 'Test for outdated-target',
     dependencies: {
-      underscore: "~199.7.1"
+      underscore: '~199.7.1'
     }
-  }), "utf8")
+  }), 'utf8')
   process.chdir(pkg)
 }
diff --git a/deps/npm/test/tap/outdated-private.js b/deps/npm/test/tap/outdated-private.js
index 882d7d9479cf4c..1d5e460c6eab6c 100644
--- a/deps/npm/test/tap/outdated-private.js
+++ b/deps/npm/test/tap/outdated-private.js
@@ -1,79 +1,80 @@
-var common = require("../common-tap.js")
-var test = require("tap").test
-var npm = require("../../")
-var rimraf = require("rimraf")
-var path = require("path")
-var mr = require("npm-registry-mock")
-var osenv = require("osenv")
-var mkdirp = require("mkdirp")
-var fs = require("graceful-fs")
+var common = require('../common-tap.js')
+var test = require('tap').test
+var npm = require('../../')
+var rimraf = require('rimraf')
+var path = require('path')
+var mr = require('npm-registry-mock')
+var osenv = require('osenv')
+var mkdirp = require('mkdirp')
+var fs = require('graceful-fs')
 
-var pkg = path.resolve(__dirname, "outdated-private")
-var pkgLocalPrivate = path.resolve(pkg, "local-private")
-var pkgScopedLocalPrivate = path.resolve(pkg, "another-local-private")
-var pkgLocalUnderscore = path.resolve(pkg, "underscore")
+var pkg = path.resolve(__dirname, 'outdated-private')
+var pkgLocalPrivate = path.resolve(pkg, 'local-private')
+var pkgScopedLocalPrivate = path.resolve(pkg, 'another-local-private')
+var pkgLocalUnderscore = path.resolve(pkg, 'underscore')
 
 var pjParent = JSON.stringify({
-  name         : "outdated-private",
-  version      : "1.0.0",
-  dependencies : {
-    "local-private" : "file:local-private",
-    "@scoped/another-local-private" : "file:another-local-private",
-    "underscore" : "file:underscore"
+  name: 'outdated-private',
+  version: '1.0.0',
+  dependencies: {
+    'local-private': 'file:local-private',
+    '@scoped/another-local-private': 'file:another-local-private',
+    'underscore': 'file:underscore'
   }
-}, null, 2) + "\n"
+}, null, 2) + '\n'
 
 var pjLocalPrivate = JSON.stringify({
-  name         : "local-private",
-  version      : "1.0.0",
-  private      : true
-}, null, 2) + "\n"
+  name: 'local-private',
+  version: '1.0.0',
+  'private': true
+}, null, 2) + '\n'
 
 var pjLocalPrivateBumped = JSON.stringify({
-  name         : "local-private",
-  version      : "1.1.0",
-  private      : true
-}, null, 2) + "\n"
+  name: 'local-private',
+  version: '1.1.0',
+  'private': true
+}, null, 2) + '\n'
 
 var pjScopedLocalPrivate = JSON.stringify({
-  name         : "@scoped/another-local-private",
-  version      : "1.0.0",
-  private      : true
-}, null, 2) + "\n"
+  name: '@scoped/another-local-private',
+  version: '1.0.0',
+  'private': true
+}, null, 2) + '\n'
 
 var pjLocalUnderscore = JSON.stringify({
-  name         : "underscore",
-  version      : "1.3.1"
-}, null, 2) + "\n"
+  name: 'underscore',
+  version: '1.3.1'
+}, null, 2) + '\n'
 
-test("setup", function (t) {
+test('setup', function (t) {
   bootstrap()
   t.end()
 })
 
-test("outdated ignores private modules", function (t) {
+test('outdated ignores private modules', function (t) {
   t.plan(3)
   process.chdir(pkg)
-  mr({ port : common.port }, function (err, s) {
+  mr({ port: common.port }, function (er, s) {
     npm.load(
       {
-        loglevel  : "silent",
-        parseable : true,
-        registry  : common.registry
+        loglevel: 'silent',
+        parseable: true,
+        registry: common.registry
       },
       function () {
-        npm.install(".", function (err) {
-          t.ifError(err, "install success")
+        npm.install('.', function (err) {
+          t.ifError(err, 'install success')
           bumpLocalPrivate()
           npm.outdated(function (er, d) {
-            t.ifError(er, "outdated success")
+            t.ifError(er, 'outdated success')
             t.deepEqual(d, [[
-              path.resolve(__dirname, "outdated-private"),
-              "underscore",
-              "1.3.1",
-              "1.5.1",
-              "1.5.1",
-              "underscore@1.5.1"
+              path.resolve(__dirname, 'outdated-private'),
+              'underscore',
+              '1.3.1',
+              '1.5.1',
+              '1.5.1',
+              'underscore@1.5.1',
+              null
             ]])
             s.close()
           })
@@ -83,27 +84,27 @@ test("outdated ignores private modules", function (t) {
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   cleanup()
   t.end()
 })
 
 function bootstrap () {
   mkdirp.sync(pkg)
-  fs.writeFileSync(path.resolve(pkg, "package.json"), pjParent)
+  fs.writeFileSync(path.resolve(pkg, 'package.json'), pjParent)
 
   mkdirp.sync(pkgLocalPrivate)
-  fs.writeFileSync(path.resolve(pkgLocalPrivate, "package.json"), pjLocalPrivate)
+  fs.writeFileSync(path.resolve(pkgLocalPrivate, 'package.json'), pjLocalPrivate)
 
   mkdirp.sync(pkgScopedLocalPrivate)
-  fs.writeFileSync(path.resolve(pkgScopedLocalPrivate, "package.json"), pjScopedLocalPrivate)
+  fs.writeFileSync(path.resolve(pkgScopedLocalPrivate, 'package.json'), pjScopedLocalPrivate)
 
   mkdirp.sync(pkgLocalUnderscore)
-  fs.writeFileSync(path.resolve(pkgLocalUnderscore, "package.json"), pjLocalUnderscore)
+  fs.writeFileSync(path.resolve(pkgLocalUnderscore, 'package.json'), pjLocalUnderscore)
 }
 
 function bumpLocalPrivate () {
-  fs.writeFileSync(path.resolve(pkgLocalPrivate, "package.json"), pjLocalPrivateBumped)
+  fs.writeFileSync(path.resolve(pkgLocalPrivate, 'package.json'), pjLocalPrivateBumped)
 }
 
 function cleanup () {
diff --git a/deps/npm/test/tap/outdated.js b/deps/npm/test/tap/outdated.js
index 146c2007a37330..c5ce8d182f476d 100644
--- a/deps/npm/test/tap/outdated.js
+++ b/deps/npm/test/tap/outdated.js
@@ -64,7 +64,8 @@ test('it should not throw', function (t) {
       '0.2.9',
       '0.2.9',
       '0.2.10',
-      '0.2.9'
+      '0.2.9',
+      null
     ],
     [
       pkg,
@@ -72,7 +73,8 @@ test('it should not throw', function (t) {
       '0.5.1',
       '0.5.1',
       '0.5.2',
-      '0.5.1'
+      '0.5.1',
+      null
     ],
     [
       pkg,
@@ -80,7 +82,8 @@ test('it should not throw', function (t) {
       '1.3.1',
       '1.3.1',
       '1.5.1',
-      '1.3.1'
+      '1.3.1',
+      null
     ]
   ]
 
diff --git a/deps/npm/test/tap/owner.js b/deps/npm/test/tap/owner.js
index 938c2166572c39..4bef1a0d87b259 100644
--- a/deps/npm/test/tap/owner.js
+++ b/deps/npm/test/tap/owner.js
@@ -1,79 +1,79 @@
-var mr = require("npm-registry-mock")
-var test = require("tap").test
+var mr = require('npm-registry-mock')
+var test = require('tap').test
 
-var common = require("../common-tap.js")
+var common = require('../common-tap.js')
 
 var server
 
 var EXEC_OPTS = {}
 
 var jashkenas = {
-  name  : "jashkenas",
-  email : "jashkenas@gmail.com"
+  name: 'jashkenas',
+  email: 'jashkenas@gmail.com'
 }
 
 var othiym23 = {
-  name  : "othiym23",
-  email : "forrest@npmjs.com"
+  name: 'othiym23',
+  email: 'forrest@npmjs.com'
 }
 
 var bcoe = {
-  name  : "bcoe",
-  email : "ben@npmjs.com"
+  name: 'bcoe',
+  email: 'ben@npmjs.com'
 }
 
 function shrt (user) {
-  return user.name+" <"+user.email+">\n"
+  return user.name + ' <' + user.email + '>\n'
 }
 
 function mocks (server) {
-  server.get("/-/user/org.couchdb.user:othiym23")
+  server.get('/-/user/org.couchdb.user:othiym23')
     .many().reply(200, othiym23)
 
   // test 1
-  server.get("/underscore")
-    .reply(200, {_id:"underscore",_rev:1,maintainers:[jashkenas]})
+  server.get('/underscore')
+    .reply(200, { _id: 'underscore', _rev: 1, maintainers: [jashkenas] })
   server.put(
-    "/underscore/-rev/1",
-    {_id:"underscore",_rev:1,maintainers:[jashkenas,othiym23]},
+    '/underscore/-rev/1',
+    { _id: 'underscore', _rev: 1, maintainers: [jashkenas, othiym23] },
     {}
-  ).reply(200, {_id:"underscore",_rev:2,maintainers:[jashkenas,othiym23]})
+  ).reply(200, { _id: 'underscore', _rev: 2, maintainers: [jashkenas, othiym23] })
 
   // test 2
-  server.get("/@xxx%2fscoped")
-    .reply(200, {_id:"@xxx/scoped",_rev:1,maintainers:[bcoe]})
+  server.get('/@xxx%2fscoped')
+    .reply(200, { _id: '@xxx/scoped', _rev: 1, maintainers: [bcoe] })
   server.put(
-    "/@xxx%2fscoped/-rev/1",
-    {_id:"@xxx/scoped",_rev:1,maintainers:[bcoe,othiym23]},
+    '/@xxx%2fscoped/-rev/1',
+    { _id: '@xxx/scoped', _rev: 1, maintainers: [bcoe, othiym23] },
     {}
-  ).reply(200, {_id:"@xxx/scoped",_rev:2,maintainers:[bcoe,othiym23]})
+  ).reply(200, { _id: '@xxx/scoped', _rev: 2, maintainers: [bcoe, othiym23] })
 
   // test 3
-  server.get("/underscore")
-    .reply(200, {_id:"underscore",_rev:2,maintainers:[jashkenas,othiym23]})
+  server.get('/underscore')
+    .reply(200, { _id: 'underscore', _rev: 2, maintainers: [jashkenas, othiym23] })
 
   // test 4
-  server.get("/underscore")
-    .reply(200, {_id:"underscore",_rev:2,maintainers:[jashkenas,othiym23]})
+  server.get('/underscore')
+    .reply(200, { _id: 'underscore', _rev: 2, maintainers: [jashkenas, othiym23] })
   server.put(
-    "/underscore/-rev/2",
-    {_id:"underscore",_rev:2,maintainers:[jashkenas]},
+    '/underscore/-rev/2',
+    { _id: 'underscore', _rev: 2, maintainers: [jashkenas] },
     {}
-  ).reply(200, {_id:"underscore",_rev:3,maintainers:[jashkenas]})
+  ).reply(200, { _id: 'underscore', _rev: 3, maintainers: [jashkenas] })
 }
 
-test("setup", function (t) {
+test('setup', function (t) {
   common.npm(
     [
-      "--loglevel", "silent",
-      "cache", "clean"
+      '--loglevel', 'silent',
+      'cache', 'clean'
     ],
     EXEC_OPTS,
     function (err, code) {
-      t.ifError(err,  "npm cache clean ran without error")
-      t.notOk(code,   "npm cache clean exited cleanly")
+      t.ifError(err, 'npm cache clean ran without error')
+      t.notOk(code, 'npm cache clean exited cleanly')
 
-      mr({ port : common.port, plugin : mocks }, function (err, s) {
+      mr({ port: common.port, plugin: mocks }, function (er, s) {
         server = s
         t.end()
       })
@@ -81,83 +81,83 @@ test("setup", function (t) {
   )
 })
 
-test("npm owner add", function (t) {
+test('npm owner add', function (t) {
   common.npm(
     [
-      "--loglevel", "silent",
-      "--registry", common.registry,
-      "owner", "add", "othiym23", "underscore"
+      '--loglevel', 'silent',
+      '--registry', common.registry,
+      'owner', 'add', 'othiym23', 'underscore'
     ],
     EXEC_OPTS,
     function (err, code, stdout, stderr) {
-      t.ifError(err,  "npm owner add ran without error")
-      t.notOk(code,   "npm owner add exited cleanly")
-      t.notOk(stderr, "npm owner add ran silently")
-      t.equal(stdout, "+ othiym23 (underscore)\n", "got expected add output")
+      t.ifError(err, 'npm owner add ran without error')
+      t.notOk(code, 'npm owner add exited cleanly')
+      t.notOk(stderr, 'npm owner add ran silently')
+      t.equal(stdout, '+ othiym23 (underscore)\n', 'got expected add output')
 
       t.end()
     }
   )
 })
 
-test("npm owner add (scoped)", function (t) {
+test('npm owner add (scoped)', function (t) {
   common.npm(
     [
-      "--loglevel", "silent",
-      "--registry", common.registry,
-      "owner", "add", "othiym23", "@xxx/scoped"
+      '--loglevel', 'silent',
+      '--registry', common.registry,
+      'owner', 'add', 'othiym23', '@xxx/scoped'
     ],
     EXEC_OPTS,
     function (err, code, stdout, stderr) {
-      t.ifError(err,  "npm owner add (scoped) ran without error")
-      t.notOk(code,   "npm owner add (scoped) exited cleanly")
-      t.notOk(stderr, "npm owner add (scoped) ran silently")
-      t.equal(stdout, "+ othiym23 (@xxx/scoped)\n", "got expected scoped add output")
+      t.ifError(err, 'npm owner add (scoped) ran without error')
+      t.notOk(code, 'npm owner add (scoped) exited cleanly')
+      t.notOk(stderr, 'npm owner add (scoped) ran silently')
+      t.equal(stdout, '+ othiym23 (@xxx/scoped)\n', 'got expected scoped add output')
 
       t.end()
     }
   )
 })
 
-test("npm owner ls", function (t) {
+test('npm owner ls', function (t) {
   common.npm(
     [
-      "--loglevel", "silent",
-      "--registry", common.registry,
-      "owner", "ls", "underscore"
+      '--loglevel', 'silent',
+      '--registry', common.registry,
+      'owner', 'ls', 'underscore'
     ],
     EXEC_OPTS,
     function (err, code, stdout, stderr) {
-      t.ifError(err,  "npm owner ls ran without error")
-      t.notOk(code,   "npm owner ls exited cleanly")
-      t.notOk(stderr, "npm owner ls ran silently")
-      t.equal(stdout, shrt(jashkenas)+shrt(othiym23), "got expected ls output")
+      t.ifError(err, 'npm owner ls ran without error')
+      t.notOk(code, 'npm owner ls exited cleanly')
+      t.notOk(stderr, 'npm owner ls ran silently')
+      t.equal(stdout, shrt(jashkenas) + shrt(othiym23), 'got expected ls output')
 
       t.end()
     }
   )
 })
 
-test("npm owner rm", function (t) {
+test('npm owner rm', function (t) {
   common.npm(
     [
-      "--loglevel", "silent",
-      "--registry", common.registry,
-      "owner", "rm", "othiym23", "underscore"
+      '--loglevel', 'silent',
+      '--registry', common.registry,
+      'owner', 'rm', 'othiym23', 'underscore'
     ],
     EXEC_OPTS,
     function (err, code, stdout, stderr) {
-      t.ifError(err,  "npm owner rm ran without error")
-      t.notOk(code,   "npm owner rm exited cleanly")
-      t.notOk(stderr, "npm owner rm ran silently")
-      t.equal(stdout, "- othiym23 (underscore)\n", "got expected rm output")
+      t.ifError(err, 'npm owner rm ran without error')
+      t.notOk(code, 'npm owner rm exited cleanly')
+      t.notOk(stderr, 'npm owner rm ran silently')
+      t.equal(stdout, '- othiym23 (underscore)\n', 'got expected rm output')
 
       t.end()
     }
   )
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   server.close()
   t.end()
 })
diff --git a/deps/npm/test/tap/pack-scoped.js b/deps/npm/test/tap/pack-scoped.js
index 5c351339cb61c6..05b9d12a833192 100644
--- a/deps/npm/test/tap/pack-scoped.js
+++ b/deps/npm/test/tap/pack-scoped.js
@@ -1,29 +1,29 @@
 // verify that prepublish runs on pack and publish
-var test = require("tap").test
-var common = require("../common-tap")
-var fs = require("graceful-fs")
-var join = require("path").join
-var mkdirp = require("mkdirp")
-var rimraf = require("rimraf")
+var test = require('tap').test
+var common = require('../common-tap')
+var fs = require('graceful-fs')
+var join = require('path').join
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
 
-var pkg      = join(__dirname, "scoped_package")
-var manifest = join(pkg, "package.json")
-var tmp      = join(pkg, "tmp")
-var cache    = join(pkg, "cache")
+var pkg = join(__dirname, 'scoped_package')
+var manifest = join(pkg, 'package.json')
+var tmp = join(pkg, 'tmp')
+var cache = join(pkg, 'cache')
 
 var data = {
-  name    : "@scope/generic-package",
-  version : "90000.100001.5"
+  name: '@scope/generic-package',
+  version: '90000.100001.5'
 }
 
-test("setup", function (t) {
+test('setup', function (t) {
   var n = 0
 
   rimraf.sync(pkg)
 
-  mkdirp(pkg,   then())
+  mkdirp(pkg, then())
   mkdirp(cache, then())
-  mkdirp(tmp,   then())
+  mkdirp(tmp, then())
 
   function then () {
     n++
@@ -34,23 +34,23 @@ test("setup", function (t) {
   }
 
   function next () {
-    fs.writeFile(manifest, JSON.stringify(data), "ascii", done)
+    fs.writeFile(manifest, JSON.stringify(data), 'ascii', done)
   }
 
   function done (er) {
     t.ifError(er)
 
-    t.pass("setup done")
+    t.pass('setup done')
     t.end()
   }
 })
 
-test("test", function (t) {
+test('test', function (t) {
   var env = {
-    "npm_config_cache"  : cache,
-    "npm_config_tmp"    : tmp,
-    "npm_config_prefix" : pkg,
-    "npm_config_global" : "false"
+    'npm_config_cache': cache,
+    'npm_config_tmp': tmp,
+    'npm_config_prefix': pkg,
+    'npm_config_global': 'false'
   }
 
   for (var i in process.env) {
@@ -58,24 +58,24 @@ test("test", function (t) {
   }
 
   common.npm([
-    "pack",
-    "--loglevel", "warn"
+    'pack',
+    '--loglevel', 'warn'
   ], {
     cwd: pkg,
     env: env
-  }, function(err, code, stdout, stderr) {
-    t.ifErr(err, "npm pack finished without error")
-    t.equal(code, 0, "npm pack exited ok")
-    t.notOk(stderr, "got stderr data: " + JSON.stringify("" + stderr))
+  }, function (err, code, stdout, stderr) {
+    t.ifErr(err, 'npm pack finished without error')
+    t.equal(code, 0, 'npm pack exited ok')
+    t.notOk(stderr, 'got stderr data: ' + JSON.stringify('' + stderr))
     stdout = stdout.trim()
-    var regex = new RegExp("scope-generic-package-90000.100001.5.tgz", "ig")
-    t.ok(stdout.match(regex), "found package")
+    var regex = new RegExp('scope-generic-package-90000.100001.5.tgz', 'ig')
+    t.ok(stdout.match(regex), 'found package')
     t.end()
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   rimraf.sync(pkg)
-  t.pass("cleaned up")
+  t.pass('cleaned up')
   t.end()
 })
diff --git a/deps/npm/test/tap/peer-deps-invalid.js b/deps/npm/test/tap/peer-deps-invalid.js
index 453f9617f38e34..39ad612e5a9bef 100644
--- a/deps/npm/test/tap/peer-deps-invalid.js
+++ b/deps/npm/test/tap/peer-deps-invalid.js
@@ -69,25 +69,23 @@ test('installing dependencies that have conflicting peerDependencies', function
       '/invalid.js': [200, path.join(pkg, 'file-fail.js')]
     }
   }
-  mr({port: common.port, mocks: customMocks}, function (err, s) { // create mock registry.
+  mr({port: common.port, mocks: customMocks}, function (err, s) {
     t.ifError(err, 'mock registry started')
-    npm.load({
-      cache: pkg + "/cache",
-      registry: common.registry
-    }, function () {
-      npm.commands.install([], function (err) {
-        if (!err) {
-          t.fail("No error!")
-        } else {
-          t.equal(err.code, "EPEERINVALID")
-          t.equal(err.packageName, "underscore")
-          t.equal(err.packageVersion, "1.3.3")
-          t.equal(err.message, "The package underscore@1.3.3 does not satisfy its siblings' peerDependencies requirements!")
-        }
-        s.close() // shutdown mock registry.
-        t.end()
-      })
-    })
+    npm.load(
+      {
+        cache: cache,
+        registry: common.registry
+      },
+      function () {
+        npm.commands.install([], function (err, additions, tree) {
+          t.error(err)
+          var invalid = tree.warnings.filter(function (warning) { return warning.code === 'EPEERINVALID' })
+          t.is(invalid.length, 2)
+          s.close()
+          t.end()
+        })
+      }
+    )
   })
 })
 
diff --git a/deps/npm/test/tap/peer-deps-toplevel.js b/deps/npm/test/tap/peer-deps-toplevel.js
index 5b5e29b06ea991..61c3ecb0d747b3 100644
--- a/deps/npm/test/tap/peer-deps-toplevel.js
+++ b/deps/npm/test/tap/peer-deps-toplevel.js
@@ -15,6 +15,10 @@ var pkg = path.resolve(__dirname, 'peer-deps-toplevel')
 var expected = {
   name: 'npm-test-peer-deps-toplevel',
   version: '0.0.0',
+  problems: [
+    'peer dep missing: mkdirp@*, required by npm-test-peer-deps-toplevel@0.0.0',
+    'peer dep missing: request@0.9.x, required by npm-test-peer-deps@0.0.0'
+  ],
   dependencies: {
     'npm-test-peer-deps': {
       version: '0.0.0',
@@ -29,14 +33,28 @@ var expected = {
       }
     },
     mkdirp: {
-      version: '0.3.5',
-      from: 'mkdirp@*',
-      resolved: common.registry + '/mkdirp/-/mkdirp-0.3.5.tgz'
+      peerMissing: true,
+      required: {
+        _id: 'mkdirp@*',
+        name: 'mkdirp',
+        version: '*',
+        peerMissing: [
+          {requiredBy: 'npm-test-peer-deps-toplevel@0.0.0', requires: 'mkdirp@*'}
+        ],
+        dependencies: {}
+      }
     },
     request: {
-      version: '0.9.5',
-      from: 'request@>=0.9.0 <0.10.0',
-      resolved: common.registry + '/request/-/request-0.9.5.tgz'
+      peerMissing: true,
+      required: {
+        _id: 'request@0.9.x',
+        dependencies: {},
+        name: 'request',
+        peerMissing: [
+          {requiredBy: 'npm-test-peer-deps@0.0.0', requires: 'request@0.9.x'}
+        ],
+        version: '0.9.x'
+      }
     }
   }
 }
diff --git a/deps/npm/test/tap/peer-deps-without-package-json.js b/deps/npm/test/tap/peer-deps-without-package-json.js
index 08322eefaa5035..ad863e9f974f31 100644
--- a/deps/npm/test/tap/peer-deps-without-package-json.js
+++ b/deps/npm/test/tap/peer-deps-without-package-json.js
@@ -51,17 +51,15 @@ test('installing a peerDeps-using package without package.json', function (t) {
       registry: common.registry,
       cache: cache
     }, function () {
-      npm.install(common.registry + '/ok.js', function (err) {
+      npm.install(common.registry + '/ok.js', function (err, additions, result) {
         t.ifError(err, 'installed ok.js')
 
         t.ok(
           fs.existsSync(path.join(nodeModules, 'npm-test-peer-deps-file')),
           'passive peer dep installed'
         )
-        t.ok(
-          fs.existsSync(path.join(nodeModules, 'underscore')),
-          'underscore installed'
-        )
+        var invalid = result.warnings.filter(function (warning) { return warning.code === 'EPEERINVALID' })
+        t.is(invalid.length, 1, 'got a warning for a missing/invalid peer dep')
 
         t.end()
         s.close() // shutdown mock registry.
diff --git a/deps/npm/test/tap/peer-deps.js b/deps/npm/test/tap/peer-deps.js
index 48023d7ac77cca..7116e428b49b78 100644
--- a/deps/npm/test/tap/peer-deps.js
+++ b/deps/npm/test/tap/peer-deps.js
@@ -12,29 +12,7 @@ var npm = npm = require('../../')
 
 var pkg = path.resolve(__dirname, 'peer-deps')
 
-var expected = {
-  name: 'npm-test-peer-deps-installer',
-  version: '0.0.0',
-  dependencies: {
-    'npm-test-peer-deps': {
-      version: '0.0.0',
-      from: 'npm-test-peer-deps@*',
-      resolved: common.registry + '/npm-test-peer-deps/-/npm-test-peer-deps-0.0.0.tgz',
-      dependencies: {
-        underscore: {
-          version: '1.3.1',
-          from: 'underscore@1.3.1',
-          resolved: common.registry + '/underscore/-/underscore-1.3.1.tgz'
-        }
-      }
-    },
-    request: {
-      version: '0.9.5',
-      from: 'request@>=0.9.0 <0.10.0',
-      resolved: common.registry + '/request/-/request-0.9.5.tgz'
-    }
-  }
-}
+var expected = [ 'peer dep missing: request@0.9.x, required by npm-test-peer-deps@0.0.0' ]
 
 var json = {
   author: 'Domenic Denicola',
@@ -56,7 +34,7 @@ test('installs the peer dependency directory structure', function (t) {
         npm.commands.ls([], true, function (err, _, results) {
           if (err) return t.fail(err)
 
-          t.deepEqual(results, expected)
+          t.deepEqual(results.problems, expected)
           s.close()
           t.end()
         })
diff --git a/deps/npm/test/tap/prepublish.js b/deps/npm/test/tap/prepublish.js
index 36391beeb340fa..f065a656a9c167 100644
--- a/deps/npm/test/tap/prepublish.js
+++ b/deps/npm/test/tap/prepublish.js
@@ -1,16 +1,16 @@
 // verify that prepublish runs on pack and publish
-var common = require("../common-tap")
-var test = require("tap").test
-var fs = require("graceful-fs")
-var join = require("path").join
-var mkdirp = require("mkdirp")
-var rimraf = require("rimraf")
+var common = require('../common-tap')
+var test = require('tap').test
+var fs = require('graceful-fs')
+var join = require('path').join
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
 
-var pkg = join(__dirname, "prepublish_package")
-var tmp = join(pkg, "tmp")
-var cache = join(pkg, "cache")
+var pkg = join(__dirname, 'prepublish_package')
+var tmp = join(pkg, 'tmp')
+var cache = join(pkg, 'cache')
 
-test("setup", function (t) {
+test('setup', function (t) {
   var n = 0
   cleanup()
   mkdirp(pkg, then())
@@ -25,58 +25,60 @@ test("setup", function (t) {
   }
 
   function next () {
-    fs.writeFile(join(pkg, "package.json"), JSON.stringify({
-      name: "npm-test-prepublish",
-      version: "1.2.5",
-      scripts: { prepublish: "echo ok" }
-    }), "ascii", function (er) {
+    fs.writeFile(join(pkg, 'package.json'), JSON.stringify({
+      name: 'npm-test-prepublish',
+      version: '1.2.5',
+      scripts: { prepublish: 'echo ok' }
+    }), 'ascii', function (er) {
       if (er) throw er
 
-      t.pass("setup done")
+      t.pass('setup done')
       t.end()
     })
   }
 })
 
-test("test", function (t) {
+test('test', function (t) {
   var env = {
-    "npm_config_cache"  : cache,
-    "npm_config_tmp"    : tmp,
-    "npm_config_prefix" : pkg,
-    "npm_config_global" : "false"
+    'npm_config_cache': cache,
+    'npm_config_tmp': tmp,
+    'npm_config_prefix': pkg,
+    'npm_config_global': 'false'
   }
+
   for (var i in process.env) {
-    if (!/^npm_config_/.test(i))
+    if (!/^npm_config_/.test(i)) {
       env[i] = process.env[i]
+    }
   }
 
   common.npm([
-      "pack",
-      "--loglevel", "warn"
-    ], { cwd: pkg, env: env }, function(err, code, stdout, stderr) {
-    t.equal(code, 0, "pack finished successfully")
-    t.ifErr(err, "pack finished successfully")
+      'pack',
+      '--loglevel', 'warn'
+    ], { cwd: pkg, env: env }, function (err, code, stdout, stderr) {
+    t.equal(code, 0, 'pack finished successfully')
+    t.ifErr(err, 'pack finished successfully')
 
-    t.notOk(stderr, "got stderr data:" + JSON.stringify("" + stderr))
+    t.notOk(stderr, 'got stderr data:' + JSON.stringify('' + stderr))
     var c = stdout.trim()
-    var regex = new RegExp("" +
-      "> npm-test-prepublish@1.2.5 prepublish [^\\r\\n]+\\r?\\n" +
-      "> echo ok\\r?\\n" +
-      "\\r?\\n" +
-      "ok\\r?\\n" +
-      "npm-test-prepublish-1.2.5.tgz", "ig")
+    var regex = new RegExp('' +
+      '> npm-test-prepublish@1.2.5 prepublish [^\\r\\n]+\\r?\\n' +
+      '> echo ok\\r?\\n' +
+      '\\r?\\n' +
+      'ok\\r?\\n' +
+      'npm-test-prepublish-1.2.5.tgz', 'ig')
 
     t.ok(c.match(regex))
     t.end()
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   cleanup()
-  t.pass("cleaned up")
+  t.pass('cleaned up')
   t.end()
 })
 
-function cleanup() {
+function cleanup () {
   rimraf.sync(pkg)
 }
diff --git a/deps/npm/test/tap/progress-config.js b/deps/npm/test/tap/progress-config.js
new file mode 100644
index 00000000000000..4b6f806dd3fccb
--- /dev/null
+++ b/deps/npm/test/tap/progress-config.js
@@ -0,0 +1,56 @@
+'use strict'
+var test = require('tap').test
+var log = require('npmlog')
+
+// We use requireInject to get a fresh copy of
+// the npm singleton each time we require it.
+// If we didn't, we'd have shared state between
+// these various tests.
+var requireInject = require('require-inject')
+
+// Make sure existing environment vars don't muck up the test
+process.env = {}
+
+test('disabled', function (t) {
+  t.plan(1)
+  var npm = requireInject('../../lib/npm.js', {})
+  npm.load({progress: false}, function () {
+    t.is(log.progressEnabled, false, 'should be disabled')
+  })
+})
+
+test('enabled', function (t) {
+  t.plan(1)
+  var npm = requireInject('../../lib/npm.js', {})
+  npm.load({progress: true}, function () {
+    t.is(log.progressEnabled, true, 'should be enabled')
+  })
+})
+
+test('default', function (t) {
+  t.plan(1)
+  var npm = requireInject('../../lib/npm.js', {})
+  npm.load({}, function () {
+    t.is(log.progressEnabled, true, 'should be enabled')
+  })
+})
+
+test('default-travis', function (t) {
+  t.plan(1)
+  global.process.env.TRAVIS = 'true'
+  var npm = requireInject('../../lib/npm.js', {})
+  npm.load({}, function () {
+    t.is(log.progressEnabled, false, 'should be disabled')
+    delete global.process.env.TRAVIS
+  })
+})
+
+test('default-ci', function (t) {
+  t.plan(1)
+  global.process.env.CI = 'true'
+  var npm = requireInject('../../lib/npm.js', {})
+  npm.load({}, function () {
+    t.is(log.progressEnabled, false, 'should be disabled')
+    delete global.process.env.CI
+  })
+})
diff --git a/deps/npm/test/tap/publish-access-scoped.js b/deps/npm/test/tap/publish-access-scoped.js
index e734ebfd783193..adc67a48e3a682 100644
--- a/deps/npm/test/tap/publish-access-scoped.js
+++ b/deps/npm/test/tap/publish-access-scoped.js
@@ -1,15 +1,15 @@
-var fs = require("fs")
-var path = require("path")
+var fs = require('fs')
+var path = require('path')
 
-var test = require("tap").test
-var mkdirp = require("mkdirp")
-var rimraf = require("rimraf")
-var nock = require("nock")
+var test = require('tap').test
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var nock = require('nock')
 
-var npm = require("../../")
-var common = require("../common-tap.js")
+var npm = require('../../')
+var common = require('../common-tap.js')
 
-var pkg = path.join(__dirname, "publish-access")
+var pkg = path.join(__dirname, 'publish-access')
 
 // TODO: nock uses setImmediate, breaks 0.8: replace with mockRegistry
 if (!global.setImmediate) {
@@ -19,46 +19,46 @@ if (!global.setImmediate) {
   }
 }
 
-test("setup", function (t) {
-  mkdirp(path.join(pkg, "cache"), function () {
+test('setup', function (t) {
+  mkdirp(path.join(pkg, 'cache'), function () {
     var configuration = {
-      cache    : path.join(pkg, "cache"),
-      loglevel : "silent",
-      registry : common.registry
+      cache: path.join(pkg, 'cache'),
+      loglevel: 'silent',
+      registry: common.registry
     }
 
     npm.load(configuration, next)
   })
 
   function next (er) {
-    t.ifError(er, "npm loaded successfully")
+    t.ifError(er, 'npm loaded successfully')
 
     process.chdir(pkg)
     fs.writeFile(
-      path.join(pkg, "package.json"),
+      path.join(pkg, 'package.json'),
       JSON.stringify({
-        name: "@bigco/publish-access",
-        version: "1.2.5"
+        name: '@bigco/publish-access',
+        version: '1.2.5'
       }),
-      "ascii",
+      'ascii',
       function (er) {
         t.ifError(er)
 
-        t.pass("setup done")
+        t.pass('setup done')
         t.end()
       }
     )
   }
 })
 
-test("scoped packages pass public access if set", function (t) {
+test('scoped packages pass public access if set', function (t) {
   var put = nock(common.registry)
-              .put("/@bigco%2fpublish-access")
+              .put('/@bigco%2fpublish-access')
               .reply(201, verify)
 
-  npm.config.set("access", "public")
+  npm.config.set('access', 'public')
   npm.commands.publish([], false, function (er) {
-    t.ifError(er, "published without error")
+    t.ifError(er, 'published without error')
 
     put.done()
     t.end()
@@ -67,14 +67,14 @@ test("scoped packages pass public access if set", function (t) {
   function verify (_, body) {
     t.doesNotThrow(function () {
       var parsed = JSON.parse(body)
-      t.equal(parsed.access, "public", "access level is correct")
-    }, "converted body back into object")
+      t.equal(parsed.access, 'public', 'access level is correct')
+    }, 'converted body back into object')
 
     return {ok: true}
   }
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   process.chdir(__dirname)
   rimraf(pkg, function (er) {
     t.ifError(er)
diff --git a/deps/npm/test/tap/publish-access-unscoped-restricted-fails.js b/deps/npm/test/tap/publish-access-unscoped-restricted-fails.js
index 4d39b00b16702d..b9753993840c3c 100644
--- a/deps/npm/test/tap/publish-access-unscoped-restricted-fails.js
+++ b/deps/npm/test/tap/publish-access-unscoped-restricted-fails.js
@@ -1,14 +1,14 @@
-var fs = require("fs")
-var path = require("path")
+var fs = require('fs')
+var path = require('path')
 
-var test = require("tap").test
-var mkdirp = require("mkdirp")
-var rimraf = require("rimraf")
+var test = require('tap').test
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
 
-var npm = require("../../")
-var common = require("../common-tap.js")
+var npm = require('../../')
+var common = require('../common-tap.js')
 
-var pkg = path.join(__dirname, "publish-access-unscoped")
+var pkg = path.join(__dirname, 'publish-access-unscoped')
 
 // TODO: nock uses setImmediate, breaks 0.8: replace with mockRegistry
 if (!global.setImmediate) {
@@ -18,49 +18,49 @@ if (!global.setImmediate) {
   }
 }
 
-test("setup", function (t) {
-  mkdirp(path.join(pkg, "cache"), function () {
+test('setup', function (t) {
+  mkdirp(path.join(pkg, 'cache'), function () {
     var configuration = {
-      cache    : path.join(pkg, "cache"),
-      loglevel : "silent",
-      registry : common.registry
+      cache: path.join(pkg, 'cache'),
+      loglevel: 'silent',
+      registry: common.registry
     }
 
     npm.load(configuration, next)
   })
 
   function next (er) {
-    t.ifError(er, "npm loaded successfully")
+    t.ifError(er, 'npm loaded successfully')
 
     process.chdir(pkg)
     fs.writeFile(
-      path.join(pkg, "package.json"),
+      path.join(pkg, 'package.json'),
       JSON.stringify({
-        name: "publish-access",
-        version: "1.2.5"
+        name: 'publish-access',
+        version: '1.2.5'
       }),
-      "ascii",
+      'ascii',
       function (er) {
         t.ifError(er)
 
-        t.pass("setup done")
+        t.pass('setup done')
         t.end()
       }
     )
   }
 })
 
-test("unscoped packages cannot be restricted", function (t) {
-  npm.config.set("access", "restricted")
+test('unscoped packages cannot be restricted', function (t) {
+  npm.config.set('access', 'restricted')
   npm.commands.publish([], false, function (er) {
-    t.ok(er, "got an error back")
+    t.ok(er, 'got an error back')
     t.equal(er.message, "Can't restrict access to unscoped packages.")
 
     t.end()
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   process.chdir(__dirname)
   rimraf(pkg, function (er) {
     t.ifError(er)
diff --git a/deps/npm/test/tap/publish-access-unscoped.js b/deps/npm/test/tap/publish-access-unscoped.js
index 023bfba5f2dd82..48b12ed521ebd6 100644
--- a/deps/npm/test/tap/publish-access-unscoped.js
+++ b/deps/npm/test/tap/publish-access-unscoped.js
@@ -1,15 +1,15 @@
-var fs = require("fs")
-var path = require("path")
+var fs = require('fs')
+var path = require('path')
 
-var test = require("tap").test
-var mkdirp = require("mkdirp")
-var rimraf = require("rimraf")
-var nock = require("nock")
+var test = require('tap').test
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var nock = require('nock')
 
-var npm = require("../../")
-var common = require("../common-tap.js")
+var npm = require('../../')
+var common = require('../common-tap.js')
 
-var pkg = path.join(__dirname, "publish-access-unscoped")
+var pkg = path.join(__dirname, 'publish-access-unscoped')
 
 // TODO: nock uses setImmediate, breaks 0.8: replace with mockRegistry
 if (!global.setImmediate) {
@@ -19,46 +19,46 @@ if (!global.setImmediate) {
   }
 }
 
-test("setup", function (t) {
-  mkdirp(path.join(pkg, "cache"), function () {
+test('setup', function (t) {
+  mkdirp(path.join(pkg, 'cache'), function () {
     var configuration = {
-      cache    : path.join(pkg, "cache"),
-      loglevel : "silent",
-      registry : common.registry
+      cache: path.join(pkg, 'cache'),
+      loglevel: 'silent',
+      registry: common.registry
     }
 
     npm.load(configuration, next)
   })
 
   function next (er) {
-    t.ifError(er, "npm loaded successfully")
+    t.ifError(er, 'npm loaded successfully')
 
     process.chdir(pkg)
     fs.writeFile(
-      path.join(pkg, "package.json"),
+      path.join(pkg, 'package.json'),
       JSON.stringify({
-        name: "publish-access",
-        version: "1.2.5"
+        name: 'publish-access',
+        version: '1.2.5'
       }),
-      "ascii",
+      'ascii',
       function (er) {
         t.ifError(er)
 
-        t.pass("setup done")
+        t.pass('setup done')
         t.end()
       }
     )
   }
 })
 
-test("unscoped packages can be explicitly set as public", function (t) {
+test('unscoped packages can be explicitly set as public', function (t) {
   var put = nock(common.registry)
-              .put("/publish-access")
+              .put('/publish-access')
               .reply(201, verify)
 
-  npm.config.set("access", "public")
+  npm.config.set('access', 'public')
   npm.commands.publish([], false, function (er) {
-    t.ifError(er, "published without error")
+    t.ifError(er, 'published without error')
 
     put.done()
     t.end()
@@ -67,14 +67,14 @@ test("unscoped packages can be explicitly set as public", function (t) {
   function verify (_, body) {
     t.doesNotThrow(function () {
       var parsed = JSON.parse(body)
-      t.equal(parsed.access, "public", "access level is correct")
-    }, "converted body back into object")
+      t.equal(parsed.access, 'public', 'access level is correct')
+    }, 'converted body back into object')
 
     return {ok: true}
   }
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   process.chdir(__dirname)
   rimraf(pkg, function (er) {
     t.ifError(er)
diff --git a/deps/npm/test/tap/publish-config.js b/deps/npm/test/tap/publish-config.js
index 1d063535b84987..57070f78ba4c59 100644
--- a/deps/npm/test/tap/publish-config.js
+++ b/deps/npm/test/tap/publish-config.js
@@ -1,37 +1,37 @@
-var common = require("../common-tap.js")
-var test = require("tap").test
-var fs = require("fs")
-var osenv = require("osenv")
-var pkg = process.env.npm_config_tmp || "/tmp"
-pkg += "/npm-test-publish-config"
+var common = require('../common-tap.js')
+var test = require('tap').test
+var fs = require('fs')
+var osenv = require('osenv')
+var pkg = process.env.npm_config_tmp || '/tmp'
+pkg += '/npm-test-publish-config'
 
-require("mkdirp").sync(pkg)
+require('mkdirp').sync(pkg)
 
-fs.writeFileSync(pkg + "/package.json", JSON.stringify({
-  name: "npm-test-publish-config",
-  version: "1.2.3",
+fs.writeFileSync(pkg + '/package.json', JSON.stringify({
+  name: 'npm-test-publish-config',
+  version: '1.2.3',
   publishConfig: { registry: common.registry }
-}), "utf8")
+}), 'utf8')
 
-fs.writeFileSync(pkg + "/fixture_npmrc",
-  "//localhost:1337/:email = fancy@feast.net\n" +
-  "//localhost:1337/:username = fancy\n" +
-  "//localhost:1337/:_password = " + new Buffer("feast").toString("base64") + "\n" +
-  "registry = http://localhost:1337/")
+fs.writeFileSync(pkg + '/fixture_npmrc',
+  '//localhost:1337/:email = fancy@feast.net\n' +
+  '//localhost:1337/:username = fancy\n' +
+  '//localhost:1337/:_password = ' + new Buffer('feast').toString('base64') + '\n' +
+  'registry = http://localhost:1337/')
 
 test(function (t) {
   var child
   t.plan(4)
-  require("http").createServer(function (req, res) {
-    t.pass("got request on the fakey fake registry")
+  require('http').createServer(function (req, res) {
+    t.pass('got request on the fakey fake registry')
     this.close()
     res.statusCode = 500
     res.end(JSON.stringify({
-      error: "sshhh. naptime nao. \\^O^/ <(YAWWWWN!)"
+      error: 'sshhh. naptime nao. \\^O^/ <(YAWWWWN!)'
     }))
     child.kill('SIGHUP')
   }).listen(common.port, function () {
-    t.pass("server is listening")
+    t.pass('server is listening')
 
     // don't much care about listening to the child's results
     // just wanna make sure it hits the server we just set up.
@@ -40,20 +40,20 @@ test(function (t) {
     // itself functions normally.
     //
     // Make sure that we don't sit around waiting for lock files
-    child = common.npm(["publish", "--userconfig=" + pkg + "/fixture_npmrc"], {
+    child = common.npm(['publish', '--userconfig=' + pkg + '/fixture_npmrc'], {
       cwd: pkg,
-      stdio: "inherit",
+      stdio: 'inherit',
       env: {
-        "npm_config_cache_lock_stale": 1000,
-        "npm_config_cache_lock_wait": 1000,
+        'npm_config_cache_lock_stale': 1000,
+        'npm_config_cache_lock_wait': 1000,
         HOME: process.env.HOME,
         Path: process.env.PATH,
         PATH: process.env.PATH,
         USERPROFILE: osenv.home()
       }
     }, function (err, code) {
-      t.ifError(err, "publish command finished successfully")
-      t.notOk(code, "npm install exited with code 0")
+      t.ifError(err, 'publish command finished successfully')
+      t.notOk(code, 'npm install exited with code 0')
     })
   })
 })
diff --git a/deps/npm/test/tap/publish-scoped.js b/deps/npm/test/tap/publish-scoped.js
index f74ca2e6160f60..eb14ae5049d611 100644
--- a/deps/npm/test/tap/publish-scoped.js
+++ b/deps/npm/test/tap/publish-scoped.js
@@ -1,60 +1,60 @@
-var fs = require("fs")
-var path = require("path")
+var fs = require('fs')
+var path = require('path')
 
-var test = require("tap").test
-var mkdirp = require("mkdirp")
-var rimraf = require("rimraf")
-var nock = require("nock")
+var test = require('tap').test
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var nock = require('nock')
 
-var npm = require("../../")
-var common = require("../common-tap.js")
+var npm = require('../../')
+var common = require('../common-tap.js')
 
-var pkg = path.join(__dirname, "prepublish_package")
+var pkg = path.join(__dirname, 'prepublish_package')
 
-test("setup", function (t) {
-  mkdirp(path.join(pkg, "cache"), next)
+test('setup', function (t) {
+  mkdirp(path.join(pkg, 'cache'), next)
 
   function next () {
     process.chdir(pkg)
     fs.writeFile(
-      path.join(pkg, "package.json"),
+      path.join(pkg, 'package.json'),
       JSON.stringify({
-        name: "@bigco/publish-organized",
-        version: "1.2.5"
+        name: '@bigco/publish-organized',
+        version: '1.2.5'
       }),
-      "ascii",
+      'ascii',
       function (er) {
         t.ifError(er)
 
-        t.pass("setup done")
+        t.pass('setup done')
         t.end()
       }
     )
   }
 })
 
-test("npm publish should honor scoping", function (t) {
+test('npm publish should honor scoping', function (t) {
   var put = nock(common.registry)
-              .put("/@bigco%2fpublish-organized")
+              .put('/@bigco%2fpublish-organized')
               .reply(201, verify)
 
   var configuration = {
-    cache    : path.join(pkg, "cache"),
-    loglevel : "silent",
-    registry : "http://nonexistent.lvh.me",
-    "//localhost:1337/:username" : "username",
-    "//localhost:1337/:_password" : new Buffer("password").toString("base64"),
-    "//localhost:1337/:email" : "ogd@aoaioxxysz.net"
+    cache: path.join(pkg, 'cache'),
+    loglevel: 'silent',
+    registry: 'http://nonexistent.lvh.me',
+    '//localhost:1337/:username': 'username',
+    '//localhost:1337/:_password': new Buffer('password').toString('base64'),
+    '//localhost:1337/:email': 'ogd@aoaioxxysz.net'
   }
 
   npm.load(configuration, onload)
 
   function onload (er) {
-    t.ifError(er, "npm bootstrapped successfully")
+    t.ifError(er, 'npm bootstrapped successfully')
 
-    npm.config.set("@bigco:registry", common.registry)
+    npm.config.set('@bigco:registry', common.registry)
     npm.commands.publish([], false, function (er) {
-      t.ifError(er, "published without error")
+      t.ifError(er, 'published without error')
 
       put.done()
 
@@ -65,25 +65,25 @@ test("npm publish should honor scoping", function (t) {
   function verify (_, body) {
     t.doesNotThrow(function () {
       var parsed = JSON.parse(body)
-      var current = parsed.versions["1.2.5"]
+      var current = parsed.versions['1.2.5']
       t.equal(
         current._npmVersion,
-        require(path.resolve(__dirname, "../../package.json")).version,
-        "npm version is correct"
+        require(path.resolve(__dirname, '../../package.json')).version,
+        'npm version is correct'
       )
 
       t.equal(
         current._nodeVersion,
         process.versions.node,
-        "node version is correct"
+        'node version is correct'
       )
-    }, "converted body back into object")
+    }, 'converted body back into object')
 
     return {ok: true}
   }
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   process.chdir(__dirname)
   rimraf(pkg, function (er) {
     t.ifError(er)
diff --git a/deps/npm/test/tap/pwd-prefix.js b/deps/npm/test/tap/pwd-prefix.js
index 237096e0a2c2a6..1b59f5c838cc85 100644
--- a/deps/npm/test/tap/pwd-prefix.js
+++ b/deps/npm/test/tap/pwd-prefix.js
@@ -2,31 +2,31 @@
 // thing when the cwd is where package.json is, and when
 // the package.json is one level up.
 
-var test = require("tap").test
-var common = require("../common-tap.js")
-var path = require("path")
-var root = path.resolve(__dirname, "../..")
-var lib = path.resolve(root, "lib")
-var commands = ["run", "version"]
+var test = require('tap').test
+var common = require('../common-tap.js')
+var path = require('path')
+var root = path.resolve(__dirname, '../..')
+var lib = path.resolve(root, 'lib')
+var commands = ['run', 'version']
 
 commands.forEach(function (cmd) {
   // Should get the same stdout and stderr each time
   var stdout, stderr
 
-  test(cmd + " in root", function (t) {
+  test(cmd + ' in root', function (t) {
     common.npm([cmd], {cwd: root}, function (er, code, so, se) {
       if (er) throw er
-      t.notOk(code, "npm " + cmd + " exited with code 0")
+      t.notOk(code, 'npm ' + cmd + ' exited with code 0')
       stdout = so
       stderr = se
       t.end()
     })
   })
 
-  test(cmd + " in lib", function (t) {
+  test(cmd + ' in lib', function (t) {
     common.npm([cmd], {cwd: lib}, function (er, code, so, se) {
       if (er) throw er
-      t.notOk(code, "npm " + cmd + " exited with code 0")
+      t.notOk(code, 'npm ' + cmd + ' exited with code 0')
       t.equal(so, stdout)
       t.equal(se, stderr)
       t.end()
diff --git a/deps/npm/test/tap/referer.js b/deps/npm/test/tap/referer.js
index c1b173d9765969..8c3dbed72c319d 100644
--- a/deps/npm/test/tap/referer.js
+++ b/deps/npm/test/tap/referer.js
@@ -1,16 +1,16 @@
-var common = require("../common-tap.js")
-var test = require("tap").test
-var http = require("http")
+var common = require('../common-tap.js')
+var test = require('tap').test
+var http = require('http')
 
-test("should send referer http header", function (t) {
+test('should send referer http header', function (t) {
   http.createServer(function (q, s) {
-    t.equal(q.headers.referer, "install foo")
+    t.equal(q.headers.referer, 'install foo')
     s.statusCode = 404
-    s.end(JSON.stringify({error: "whatever"}))
+    s.end(JSON.stringify({error: 'whatever'}))
     this.close()
   }).listen(common.port, function () {
-    var reg = "http://localhost:" + common.port
-    var args = [ "install", "foo", "--registry", reg ]
+    var reg = 'http://localhost:' + common.port
+    var args = [ 'install', 'foo', '--registry', reg ]
     common.npm(args, {}, function (er, code) {
       if (er) {
         throw er
diff --git a/deps/npm/test/tap/registry.js b/deps/npm/test/tap/registry.js
index 060d9b67b67fcc..7ff4075bf23bf0 100644
--- a/deps/npm/test/tap/registry.js
+++ b/deps/npm/test/tap/registry.js
@@ -1,34 +1,31 @@
 // Run all the tests in the `npm-registry-couchapp` suite
 // This verifies that the server-side stuff still works.
 
-var common = require("../common-tap")
-var test = require("tap").test
+var common = require('../common-tap')
+var test = require('tap').test
 
-var npmExec = require.resolve("../../bin/npm-cli.js")
-var path = require("path")
-var ca = path.resolve(__dirname, "../../node_modules/npm-registry-couchapp")
+var npmExec = require.resolve('../../bin/npm-cli.js')
+var path = require('path')
+var ca = path.resolve(__dirname, '../../node_modules/npm-registry-couchapp')
 
-var which = require("which")
+var which = require('which')
 
-var v = process.versions.node.split(".").map(function (n) { return parseInt(n, 10) })
+var v = process.versions.node.split('.').map(function (n) { return parseInt(n, 10) })
 if (v[0] === 0 && v[1] < 10) {
   console.error(
-    "WARNING: need a recent Node for npm-registry-couchapp tests to run, have",
+    'WARNING: need a recent Node for npm-registry-couchapp tests to run, have',
     process.versions.node
   )
-}
-else {
-  which("couchdb", function (er) {
+} else {
+  which('couchdb', function (er) {
     if (er) {
-      console.error("WARNING: need couch to run test: " + er.message)
-    }
-    else {
+      console.error('WARNING: need couch to run test: ' + er.message)
+    } else {
       runTests()
     }
   })
 }
 
-
 function runTests () {
   var env = { TAP: 1 }
   for (var i in process.env) env[i] = process.env[i]
@@ -36,13 +33,13 @@ function runTests () {
 
   var opts = {
     cwd: ca,
-    stdio: "inherit"
+    stdio: 'inherit'
   }
-  common.npm(["install"], opts, function (err, code) {
+  common.npm(['install'], opts, function (err, code) {
     if (err) { throw err }
     if (code) {
-      return test("need install to work", function (t) {
-        t.fail("install failed with: " + code)
+      return test('need install to work', function (t) {
+        t.fail('install failed with: ' + code)
         t.end()
       })
 
@@ -50,22 +47,22 @@ function runTests () {
       opts = {
         cwd: ca,
         env: env,
-        stdio: "inherit"
+        stdio: 'inherit'
       }
-      common.npm(["test", "--", "-Rtap"], opts, function (err, code) {
+      common.npm(['test', '--', '-Rtap'], opts, function (err, code) {
         if (err) { throw err }
         if (code) {
-          return test("need test to work", function (t) {
-            t.fail("test failed with: " + code)
+          return test('need test to work', function (t) {
+            t.fail('test failed with: ' + code)
             t.end()
           })
         }
         opts = {
           cwd: ca,
           env: env,
-          stdio: "inherit"
+          stdio: 'inherit'
         }
-        common.npm(["prune", "--production"], opts, function (err, code) {
+        common.npm(['prune', '--production'], opts, function (err, code) {
           if (err) { throw err }
           process.exit(code || 0)
         })
diff --git a/deps/npm/test/tap/repo.js b/deps/npm/test/tap/repo.js
index 565842b9a61625..292415705ef4f2 100644
--- a/deps/npm/test/tap/repo.js
+++ b/deps/npm/test/tap/repo.js
@@ -1,76 +1,75 @@
-if (process.platform === "win32") {
-  console.error("skipping test, because windows and shebangs")
-  return
+if (process.platform === 'win32') {
+  console.error('skipping test, because windows and shebangs')
+  process.exit(0)
 }
 
-var common = require("../common-tap.js")
-var mr = require("npm-registry-mock")
+var common = require('../common-tap.js')
+var mr = require('npm-registry-mock')
 
-var test = require("tap").test
-var npm = require.resolve("../../bin/npm-cli.js")
-var node = process.execPath
-var rimraf = require("rimraf")
-var spawn = require("child_process").spawn
-var fs = require("fs")
+var test = require('tap').test
+var rimraf = require('rimraf')
+var fs = require('fs')
 var path = require('path')
 var outFile = path.join(__dirname, '/_output')
 
 var opts = { cwd: __dirname }
 
-test("setup", function (t) {
-  var s = "#!/usr/bin/env bash\n" +
-          "echo \"$@\" > " + JSON.stringify(__dirname) + "/_output\n"
-  fs.writeFileSync(__dirname + "/_script.sh", s, "ascii")
-  fs.chmodSync(__dirname + "/_script.sh", "0755")
-  t.pass("made script")
+test('setup', function (t) {
+  var s = '#!/usr/bin/env bash\n' +
+          'echo \"$@\" > ' + JSON.stringify(__dirname) + '/_output\n'
+  fs.writeFileSync(__dirname + '/_script.sh', s, 'ascii')
+  fs.chmodSync(__dirname + '/_script.sh', '0755')
+  t.pass('made script')
   t.end()
 })
 
-test("npm repo underscore", function (t) {
-  mr({port : common.port}, function (er, s) {
+test('npm repo underscore', function (t) {
+  mr({ port: common.port }, function (er, s) {
     common.npm([
       'repo', 'underscore',
       '--registry=' + common.registry,
       '--loglevel=silent',
       '--browser=' + __dirname + '/_script.sh'
     ], opts, function (err, code, stdout, stderr) {
+      t.ifError(err, 'repo command ran without error')
       t.equal(code, 0, 'exit ok')
       var res = fs.readFileSync(outFile, 'ascii')
       s.close()
-      t.equal(res, "https://github.com/jashkenas/underscore\n")
+      t.equal(res, 'https://github.com/jashkenas/underscore\n')
       rimraf.sync(outFile)
       t.end()
     })
   })
 })
 
-
 test('npm repo optimist - github (https://)', function (t) {
-  mr({port : common.port}, function (er, s) {
+  mr({ port: common.port }, function (er, s) {
     common.npm([
       'repo', 'optimist',
       '--registry=' + common.registry,
       '--loglevel=silent',
       '--browser=' + __dirname + '/_script.sh'
     ], opts, function (err, code, stdout, stderr) {
+      t.ifError(err, 'repo command ran without error')
       t.equal(code, 0, 'exit ok')
       var res = fs.readFileSync(outFile, 'ascii')
       s.close()
-      t.equal(res, "https://github.com/substack/node-optimist\n")
+      t.equal(res, 'https://github.com/substack/node-optimist\n')
       rimraf.sync(outFile)
       t.end()
     })
   })
 })
 
-test("npm repo npm-test-peer-deps - no repo", function (t) {
-  mr({port : common.port}, function (er, s) {
+test('npm repo npm-test-peer-deps - no repo', function (t) {
+  mr({ port: common.port }, function (er, s) {
     common.npm([
       'repo', 'npm-test-peer-deps',
       '--registry=' + common.registry,
       '--loglevel=silent',
       '--browser=' + __dirname + '/_script.sh'
     ], opts, function (err, code, stdout, stderr) {
+      t.ifError(err, 'repo command ran without error')
       t.equal(code, 1, 'exit not ok')
       s.close()
       t.end()
@@ -78,62 +77,65 @@ test("npm repo npm-test-peer-deps - no repo", function (t) {
   })
 })
 
-test("npm repo test-repo-url-http - non-github (http://)", function (t) {
-  mr({port : common.port}, function (er, s) {
+test('npm repo test-repo-url-http - non-github (http://)', function (t) {
+  mr({ port: common.port }, function (er, s) {
     common.npm([
       'repo', 'test-repo-url-http',
       '--registry=' + common.registry,
       '--loglevel=silent',
       '--browser=' + __dirname + '/_script.sh'
     ], opts, function (err, code, stdout, stderr) {
+      t.ifError(err, 'repo command ran without error')
       t.equal(code, 0, 'exit ok')
       var res = fs.readFileSync(outFile, 'ascii')
       s.close()
-      t.equal(res, "http://gitlab.com/evanlucas/test-repo-url-http\n")
+      t.equal(res, 'http://gitlab.com/evanlucas/test-repo-url-http\n')
       rimraf.sync(outFile)
       t.end()
     })
   })
 })
 
-test("npm repo test-repo-url-https - non-github (https://)", function (t) {
-  mr({port : common.port}, function (er, s) {
+test('npm repo test-repo-url-https - non-github (https://)', function (t) {
+  mr({ port: common.port }, function (er, s) {
     common.npm([
       'repo', 'test-repo-url-https',
       '--registry=' + common.registry,
       '--loglevel=silent',
       '--browser=' + __dirname + '/_script.sh'
     ], opts, function (err, code, stdout, stderr) {
+      t.ifError(err, 'repo command ran without error')
       t.equal(code, 0, 'exit ok')
       var res = fs.readFileSync(outFile, 'ascii')
       s.close()
-      t.equal(res, "https://gitlab.com/evanlucas/test-repo-url-https\n")
+      t.equal(res, 'https://gitlab.com/evanlucas/test-repo-url-https\n')
       rimraf.sync(outFile)
       t.end()
     })
   })
 })
 
-test("npm repo test-repo-url-ssh - non-github (ssh://)", function (t) {
-  mr({port : common.port}, function (er, s) {
+test('npm repo test-repo-url-ssh - non-github (ssh://)', function (t) {
+  mr({ port: common.port }, function (er, s) {
     common.npm([
       'repo', 'test-repo-url-ssh',
       '--registry=' + common.registry,
       '--loglevel=silent',
       '--browser=' + __dirname + '/_script.sh'
     ], opts, function (err, code, stdout, stderr) {
+      t.ifError(err, 'repo command ran without error')
       t.equal(code, 0, 'exit ok')
       var res = fs.readFileSync(outFile, 'ascii')
       s.close()
-      t.equal(res, "http://gitlab.com/evanlucas/test-repo-url-ssh\n")
+      t.equal(res, 'https://gitlab.com/evanlucas/test-repo-url-ssh\n')
       rimraf.sync(outFile)
       t.end()
     })
   })
 })
 
-test("cleanup", function (t) {
-  fs.unlinkSync(__dirname + "/_script.sh")
-  t.pass("cleaned up")
+test('cleanup', function (t) {
+  fs.unlinkSync(__dirname + '/_script.sh')
+  t.pass('cleaned up')
   t.end()
 })
diff --git a/deps/npm/test/tap/rm-linked.js b/deps/npm/test/tap/rm-linked.js
new file mode 100644
index 00000000000000..cd46c013adf13d
--- /dev/null
+++ b/deps/npm/test/tap/rm-linked.js
@@ -0,0 +1,136 @@
+var mkdirp = require('mkdirp')
+var osenv = require('osenv')
+var path = require('path')
+var rimraf = require('rimraf')
+var test = require('tap').test
+var writeFileSync = require('fs').writeFileSync
+
+var common = require('../common-tap.js')
+
+var link = path.join(__dirname, 'rmlinked')
+var linkDep = path.join(link, 'node_modules', 'baz')
+var linkInstall = path.join(__dirname, 'rmlinked-install')
+var linkRoot = path.join(__dirname, 'rmlinked-root')
+
+var config = 'prefix = ' + linkRoot
+var configPath = path.join(link, '_npmrc')
+
+var OPTS = {
+  env: {
+    'npm_config_userconfig': configPath
+  }
+}
+
+var linkedJSON = {
+  name: 'foo',
+  version: '1.0.0',
+  description: '',
+  main: 'index.js',
+  scripts: {
+    test: 'echo \"Error: no test specified\" && exit 1'
+  },
+  dependencies: {
+    'baz': '1.0.0'
+  },
+  author: '',
+  license: 'ISC'
+}
+
+var linkedDepJSON = {
+  name: 'baz',
+  version: '1.0.0',
+  description: '',
+  main: 'index.js',
+  scripts: {
+    test: 'echo \"Error: no test specified\" && exit 1'
+  },
+  author: '',
+  license: 'ISC'
+}
+
+var installJSON = {
+  name: 'bar',
+  version: '1.0.0',
+  description: '',
+  main: 'index.js',
+  scripts: {
+    test: 'echo \"Error: no test specified\" && exit 1'
+  },
+  dependencies: {
+    'foo': '1.0.0'
+  },
+  author: '',
+  license: 'ISC'
+}
+
+test('setup', function (t) {
+  setup()
+  common.npm(['ls', '-g', '--depth=0'], OPTS, function (err, c, out) {
+    t.ifError(err)
+    t.equal(c, 0, 'set up ok')
+    t.notOk(out.match(/UNMET DEPENDENCY foo@/), "foo isn't in global")
+    t.end()
+  })
+})
+
+test('creates global link', function (t) {
+  process.chdir(link)
+  common.npm(['link'], OPTS, function (err, c, out) {
+    t.ifError(err, 'link has no error')
+    common.npm(['ls', '-g'], OPTS, function (err, c, out, stderr) {
+      t.ifError(err)
+      t.equal(c, 0)
+      t.equal(stderr, '', 'got expected stderr')
+      t.has(out, /foo@1.0.0/, 'creates global link ok')
+      t.end()
+    })
+  })
+})
+
+test('uninstall the global linked package', function (t) {
+  process.chdir(osenv.tmpdir())
+  common.npm(['uninstall', '-g', 'foo'], OPTS, function (err) {
+    t.ifError(err, 'uninstall has no error')
+    process.chdir(link)
+    common.npm(['ls'], OPTS, function (err, c, out) {
+      t.ifError(err)
+      t.equal(c, 0)
+      t.has(out, /baz@1.0.0/, "uninstall didn't remove dep")
+      t.end()
+    })
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
+
+function cleanup () {
+  process.chdir(osenv.tmpdir())
+  try { rimraf.sync(linkRoot) } catch (e) { }
+  try { rimraf.sync(linkDep) } catch (e) { }
+  try { rimraf.sync(link) } catch (e) { }
+  try { rimraf.sync(linkInstall) } catch (e) { }
+}
+
+function setup () {
+  cleanup()
+  mkdirp.sync(linkRoot)
+  mkdirp.sync(link)
+  writeFileSync(
+    path.join(link, 'package.json'),
+    JSON.stringify(linkedJSON, null, 2)
+  )
+  mkdirp.sync(linkDep)
+  writeFileSync(
+    path.join(linkDep, 'package.json'),
+    JSON.stringify(linkedDepJSON, null, 2)
+  )
+  mkdirp.sync(linkInstall)
+  writeFileSync(
+    path.join(linkInstall, 'package.json'),
+    JSON.stringify(installJSON, null, 2)
+  )
+  writeFileSync(configPath, config)
+}
diff --git a/deps/npm/test/tap/run-script.js b/deps/npm/test/tap/run-script.js
index 5d414d8e9249f9..d7087693df7c44 100644
--- a/deps/npm/test/tap/run-script.js
+++ b/deps/npm/test/tap/run-script.js
@@ -62,15 +62,14 @@ var preversionOnly = {
   }
 }
 
-
 function testOutput (t, command, er, code, stdout, stderr) {
   var lines
 
-  if (er)
-    throw er
+  if (er) throw er
 
-  if (stderr)
+  if (stderr) {
     throw new Error('npm ' + command + ' stderr: ' + stderr.toString())
+  }
 
   lines = stdout.trim().split('\n')
   stdout = lines.filter(function (line) {
diff --git a/deps/npm/test/tap/semver-doc.js b/deps/npm/test/tap/semver-doc.js
index 963cace101fbdd..31c75fffd8ad7b 100644
--- a/deps/npm/test/tap/semver-doc.js
+++ b/deps/npm/test/tap/semver-doc.js
@@ -1,12 +1,12 @@
-var test = require("tap").test
+var test = require('tap').test
 
-test("semver doc is up to date", function (t) {
-  var path = require("path")
-  var moddoc = path.join(__dirname, "../../node_modules/semver/README.md")
-  var mydoc = path.join(__dirname, "../../doc/misc/semver.md")
-  var fs = require("fs")
-  var mod = fs.readFileSync(moddoc, "utf8").replace(/semver\(1\)/, "semver(7)")
-  var my = fs.readFileSync(mydoc, "utf8")
+test('semver doc is up to date', function (t) {
+  var path = require('path')
+  var moddoc = path.join(__dirname, '../../node_modules/semver/README.md')
+  var mydoc = path.join(__dirname, '../../doc/misc/semver.md')
+  var fs = require('fs')
+  var mod = fs.readFileSync(moddoc, 'utf8').replace(/semver\(1\)/, 'semver(7)')
+  var my = fs.readFileSync(mydoc, 'utf8')
   t.equal(my, mod)
   t.end()
 })
diff --git a/deps/npm/test/tap/semver-tag.js b/deps/npm/test/tap/semver-tag.js
index 03dcdf85b6466f..b4feb75176c4ac 100644
--- a/deps/npm/test/tap/semver-tag.js
+++ b/deps/npm/test/tap/semver-tag.js
@@ -1,11 +1,11 @@
 // should not allow tagging with a valid semver range
-var common = require("../common-tap.js")
-var test = require("tap").test
+var common = require('../common-tap.js')
+var test = require('tap').test
 
-test("try to tag with semver range as tag name", function (t) {
-  var cmd = ["tag", "zzzz@1.2.3", "v2.x", "--registry=http://localhost"]
+test('try to tag with semver range as tag name', function (t) {
+  var cmd = ['tag', 'zzzz@1.2.3', 'v2.x', '--registry=http://localhost']
   common.npm(cmd, {
-    stdio: "pipe"
+    stdio: 'pipe'
   }, function (er, code, so, se) {
     if (er) throw er
     t.similar(se, /Tag name must not be a valid SemVer range: v2.x\n/)
diff --git a/deps/npm/test/tap/shrinkwrap-dev-dependency.js b/deps/npm/test/tap/shrinkwrap-dev-dependency.js
index a124c2b7fe6ba6..0a239e97ce43af 100644
--- a/deps/npm/test/tap/shrinkwrap-dev-dependency.js
+++ b/deps/npm/test/tap/shrinkwrap-dev-dependency.js
@@ -77,9 +77,7 @@ function setup (cb) {
 
   var opts = {
     cache: path.resolve(pkg, 'cache'),
-    registry: common.registry,
-    // important to make sure devDependencies don't get stripped
-    dev: true
+    registry: common.registry
   }
   npm.load(opts, cb)
 }
diff --git a/deps/npm/test/tap/shrinkwrap-empty-deps.js b/deps/npm/test/tap/shrinkwrap-empty-deps.js
index 32cbd5eb40d21e..cf7e9a6e80427a 100644
--- a/deps/npm/test/tap/shrinkwrap-empty-deps.js
+++ b/deps/npm/test/tap/shrinkwrap-empty-deps.js
@@ -51,8 +51,7 @@ test('returns a list of removed items', function (t) {
           t.same(
             {
               'name': 'shrinkwrap-empty-deps',
-              'version': '0.0.0',
-              'dependencies': {}
+              'version': '0.0.0'
             },
             JSON.parse(desired),
             'shrinkwrap handled empty deps without exploding'
diff --git a/deps/npm/test/tap/shrinkwrap-local-dependency.js b/deps/npm/test/tap/shrinkwrap-local-dependency.js
index ffbde6574ee86a..8d7c0712f9ae58 100644
--- a/deps/npm/test/tap/shrinkwrap-local-dependency.js
+++ b/deps/npm/test/tap/shrinkwrap-local-dependency.js
@@ -1,63 +1,62 @@
-var test = require("tap").test
-var path = require("path")
-var fs = require("fs")
-var osenv = require("osenv")
-var rimraf = require("rimraf")
-var mkdirp = require("mkdirp")
-var common = require("../common-tap.js")
-
-var PKG_DIR = path.resolve(__dirname, "shrinkwrap-local-dependency")
-var CACHE_DIR = path.resolve(PKG_DIR, "cache")
-var DEP_DIR = path.resolve(PKG_DIR, "dep")
+var test = require('tap').test
+var path = require('path')
+var fs = require('fs')
+var osenv = require('osenv')
+var rimraf = require('rimraf')
+var mkdirp = require('mkdirp')
+var common = require('../common-tap.js')
+
+var PKG_DIR = path.resolve(__dirname, 'shrinkwrap-local-dependency')
+var CACHE_DIR = path.resolve(PKG_DIR, 'cache')
+var DEP_DIR = path.resolve(PKG_DIR, 'dep')
 
 var desired = {
-  "name": "npm-test-shrinkwrap-local-dependency",
-  "version": "0.0.0",
-  "dependencies": {
-    "npm-test-shrinkwrap-local-dependency-dep": {
-      "version": "0.0.0",
-      "from": "dep",
-      "resolved": "file:dep"
+  'name': 'npm-test-shrinkwrap-local-dependency',
+  'version': '0.0.0',
+  'dependencies': {
+    'npm-test-shrinkwrap-local-dependency-dep': {
+      'version': '0.0.0',
+      'from': 'dep',
+      'resolved': 'file:dep'
     }
   }
 }
 
 var root = {
-  "author": "Thomas Torp",
-  "name": "npm-test-shrinkwrap-local-dependency",
-  "version": "0.0.0",
-  "dependencies": {
-    "npm-test-shrinkwrap-local-dependency-dep": "file:./dep"
+  'author': 'Thomas Torp',
+  'name': 'npm-test-shrinkwrap-local-dependency',
+  'version': '0.0.0',
+  'dependencies': {
+    'npm-test-shrinkwrap-local-dependency-dep': 'file:./dep'
   }
 }
 
 var dependency = {
-  "author": "Thomas Torp",
-  "name": "npm-test-shrinkwrap-local-dependency-dep",
-  "version": "0.0.0"
+  'author': 'Thomas Torp',
+  'name': 'npm-test-shrinkwrap-local-dependency-dep',
+  'version': '0.0.0'
 }
 
-
-test("shrinkwrap uses resolved with file: on local deps", function(t) {
+test('shrinkwrap uses resolved with file: on local deps', function (t) {
   setup()
 
   common.npm(
-    ["--cache="+CACHE_DIR, "--loglevel=silent", "install", "."],
+    ['--cache=' + CACHE_DIR, '--loglevel=silent', 'install', '.'],
     {},
     function (err, code) {
-      t.ifError(err, "npm install worked")
-      t.equal(code, 0, "npm exited normally")
+      t.ifError(err, 'npm install worked')
+      t.equal(code, 0, 'npm exited normally')
 
       common.npm(
-        ["--cache="+CACHE_DIR, "--loglevel=silent", "shrinkwrap"],
+        ['--cache=' + CACHE_DIR, '--loglevel=silent', 'shrinkwrap'],
         {},
         function (err, code) {
-          t.ifError(err, "npm shrinkwrap worked")
-          t.equal(code, 0, "npm exited normally")
+          t.ifError(err, 'npm shrinkwrap worked')
+          t.equal(code, 0, 'npm exited normally')
 
-          fs.readFile("npm-shrinkwrap.json", { encoding : "utf8" }, function (err, data) {
-            t.ifError(err, "read file correctly")
-            t.deepEqual(JSON.parse(data), desired, "shrinkwrap looks correct")
+          fs.readFile('npm-shrinkwrap.json', { encoding: 'utf8' }, function (err, data) {
+            t.ifError(err, 'read file correctly')
+            t.deepEqual(JSON.parse(data), desired, 'shrinkwrap looks correct')
 
             t.end()
           })
@@ -67,22 +66,22 @@ test("shrinkwrap uses resolved with file: on local deps", function(t) {
   )
 })
 
-test('"npm install" should install local packages from shrinkwrap', function (t) {
+test("'npm install' should install local packages from shrinkwrap", function (t) {
   cleanNodeModules()
 
   common.npm(
-    ["--cache="+CACHE_DIR, "--loglevel=silent", "install", "."],
+    ['--cache=' + CACHE_DIR, '--loglevel=silent', 'install', '.'],
     {},
     function (err, code) {
-      t.ifError(err, "install ran correctly")
-      t.notOk(code, "npm install exited with code 0")
+      t.ifError(err, 'install ran correctly')
+      t.notOk(code, 'npm install exited with code 0')
       var dependencyPackageJson = path.resolve(
         PKG_DIR,
-        "node_modules/npm-test-shrinkwrap-local-dependency-dep/package.json"
+        'node_modules/npm-test-shrinkwrap-local-dependency-dep/package.json'
       )
       t.ok(
-        JSON.parse(fs.readFileSync(dependencyPackageJson, "utf8")),
-        "package with local dependency installed from shrinkwrap"
+        JSON.parse(fs.readFileSync(dependencyPackageJson, 'utf8')),
+        'package with local dependency installed from shrinkwrap'
       )
 
       t.end()
@@ -90,32 +89,32 @@ test('"npm install" should install local packages from shrinkwrap', function (t)
   )
 })
 
-test("cleanup", function(t) {
+test('cleanup', function (t) {
   cleanup()
   t.end()
 })
 
-function setup() {
+function setup () {
   cleanup()
   mkdirp.sync(PKG_DIR)
   mkdirp.sync(CACHE_DIR)
   mkdirp.sync(DEP_DIR)
   fs.writeFileSync(
-    path.resolve(PKG_DIR, "package.json"),
+    path.resolve(PKG_DIR, 'package.json'),
     JSON.stringify(root, null, 2)
   )
   fs.writeFileSync(
-    path.resolve(DEP_DIR, "package.json"),
+    path.resolve(DEP_DIR, 'package.json'),
     JSON.stringify(dependency, null, 2)
   )
   process.chdir(PKG_DIR)
 }
 
-function cleanNodeModules() {
-  rimraf.sync(path.resolve(PKG_DIR, "node_modules"))
+function cleanNodeModules () {
+  rimraf.sync(path.resolve(PKG_DIR, 'node_modules'))
 }
 
-function cleanup() {
+function cleanup () {
   process.chdir(osenv.tmpdir())
   cleanNodeModules()
   rimraf.sync(PKG_DIR)
diff --git a/deps/npm/test/tap/shrinkwrap-prod-dependency-also.js b/deps/npm/test/tap/shrinkwrap-prod-dependency-also.js
new file mode 100644
index 00000000000000..5bcae6d2f58d1d
--- /dev/null
+++ b/deps/npm/test/tap/shrinkwrap-prod-dependency-also.js
@@ -0,0 +1,93 @@
+var fs = require('fs')
+var path = require('path')
+
+var mkdirp = require('mkdirp')
+var mr = require('npm-registry-mock')
+var osenv = require('osenv')
+var rimraf = require('rimraf')
+var test = require('tap').test
+
+var npm = npm = require('../../')
+
+var common = require('../common-tap.js')
+var pkg = path.resolve(__dirname, 'shrinkwrap-prod-dependency')
+
+test("shrinkwrap --also=development doesn't strip out prod dependencies", function (t) {
+  t.plan(1)
+
+  mr({port: common.port}, function (er, s) {
+    setup({}, function (err) {
+      if (err) return t.fail(err)
+
+      npm.install('.', function (err) {
+        if (err) return t.fail(err)
+
+        npm.config.set('also', 'development')
+        npm.commands.shrinkwrap([], true, function (err, results) {
+          if (err) return t.fail(err)
+
+          t.deepEqual(results, desired)
+          s.close()
+          t.end()
+        })
+      })
+    })
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
+
+var desired = {
+  name: 'npm-test-shrinkwrap-prod-dependency',
+  version: '0.0.0',
+  dependencies: {
+    request: {
+      version: '0.9.0',
+      from: 'request@0.9.0',
+      resolved: common.registry + '/request/-/request-0.9.0.tgz'
+    },
+    underscore: {
+      version: '1.5.1',
+      from: 'underscore@1.5.1',
+      resolved: common.registry + '/underscore/-/underscore-1.5.1.tgz'
+    }
+  }
+}
+
+var json = {
+  author: 'Domenic Denicola',
+  name: 'npm-test-shrinkwrap-prod-dependency',
+  version: '0.0.0',
+  dependencies: {
+    request: '0.9.0'
+  },
+  devDependencies: {
+    underscore: '1.5.1'
+  }
+}
+
+function setup (opts, cb) {
+  cleanup()
+  mkdirp.sync(pkg)
+  fs.writeFileSync(path.join(pkg, 'package.json'), JSON.stringify(json, null, 2))
+  process.chdir(pkg)
+
+  var allOpts = {
+    cache: path.resolve(pkg, 'cache'),
+    registry: common.registry
+  }
+
+  for (var key in opts) {
+    allOpts[key] = opts[key]
+  }
+
+  npm.load(allOpts, cb)
+}
+
+function cleanup () {
+  process.chdir(osenv.tmpdir())
+  rimraf.sync(pkg)
+}
diff --git a/deps/npm/test/tap/shrinkwrap-scoped-auth.js b/deps/npm/test/tap/shrinkwrap-scoped-auth.js
index 79414ccd22b937..8fe0d1e23e2816 100644
--- a/deps/npm/test/tap/shrinkwrap-scoped-auth.js
+++ b/deps/npm/test/tap/shrinkwrap-scoped-auth.js
@@ -1,92 +1,102 @@
-var resolve = require("path").resolve
-var writeFileSync = require("graceful-fs").writeFileSync
-
-var mkdirp = require("mkdirp")
-var mr = require("npm-registry-mock")
-var osenv = require("osenv")
-var rimraf = require("rimraf")
-var test = require("tap").test
-
-var common = require("../common-tap.js")
-var toNerfDart = require("../../lib/config/nerf-dart.js")
-
-var pkg = resolve(__dirname, "shrinkwrap-scoped-auth")
-var outfile = resolve(pkg, "_npmrc")
-var modules = resolve(pkg, "node_modules")
-var tarballPath = "/scoped-underscore/-/scoped-underscore-1.3.1.tgz"
+var resolve = require('path').resolve
+var writeFileSync = require('graceful-fs').writeFileSync
+
+var mkdirp = require('mkdirp')
+var mr = require('npm-registry-mock')
+var osenv = require('osenv')
+var rimraf = require('rimraf')
+var test = require('tap').test
+
+var common = require('../common-tap.js')
+var toNerfDart = require('../../lib/config/nerf-dart.js')
+
+var pkg = resolve(__dirname, 'shrinkwrap-scoped-auth')
+var outfile = resolve(pkg, '_npmrc')
+var modules = resolve(pkg, 'node_modules')
+var tarballPath = '/scoped-underscore/-/scoped-underscore-1.3.1.tgz'
 var tarballURL = common.registry + tarballPath
-var tarball = resolve(__dirname, "../fixtures/scoped-underscore-1.3.1.tgz")
+var tarball = resolve(__dirname, '../fixtures/scoped-underscore-1.3.1.tgz')
 
 var server
 
-var EXEC_OPTS = {
-  cwd : pkg
-}
+var EXEC_OPTS = { cwd: pkg }
 
 function mocks (server) {
-  var auth = "Bearer 0xabad1dea"
-  server.get(tarballPath, { authorization : auth }).replyWithFile(200, tarball)
+  var auth = 'Bearer 0xabad1dea'
+  server.get(tarballPath, { authorization: auth }).replyWithFile(200, tarball)
   server.get(tarballPath).reply(401, {
-    error  : "unauthorized",
-    reason : "You are not authorized to access this db."
+    error: 'unauthorized',
+    reason: 'You are not authorized to access this db.'
   })
 }
 
-test("setup", function (t) {
-  mr({ port : common.port, plugin : mocks }, function (err, s) {
+test('setup', function (t) {
+  mr({ port: common.port, plugin: mocks }, function (er, s) {
     server = s
-    t.ok(s, "set up mock registry")
+    t.ok(s, 'set up mock registry')
     setup()
     t.end()
   })
 })
 
-test("authed npm install with shrinkwrapped scoped package", function (t) {
+test('authed npm install with shrinkwrapped scoped package', function (t) {
   common.npm(
     [
-      "install",
-      "--loglevel", "silent",
-      "--fetch-retries", 0,
-      "--userconfig", outfile
+      'install',
+      '--loglevel', 'silent',
+      '--json',
+      '--fetch-retries', 0,
+      '--userconfig', outfile
     ],
     EXEC_OPTS,
     function (err, code, stdout, stderr) {
-      t.ifError(err, "test runner executed without error")
-      t.equal(code, 0, "npm install exited OK")
-      t.notOk(stderr, "no output on stderr")
-      t.equal(
-        stdout,
-        "@scoped/underscore@1.3.1 node_modules/@scoped/underscore\n",
-        "module installed where expected"
-      )
+      console.error(stderr)
+      t.ifError(err, 'test runner executed without error')
+      t.equal(code, 0, 'npm install exited OK')
+      t.notOk(stderr, 'no output on stderr')
+      try {
+        var results = JSON.parse(stdout)
+      } catch (ex) {
+        console.error('#', ex)
+        t.ifError(ex, 'stdout was valid JSON')
+      }
+
+      if (results) {
+        var installedversion = {
+          'version': '1.3.1',
+          'from': '>=1.3.1 <2',
+          'resolved': 'http://localhost:1337/scoped-underscore/-/scoped-underscore-1.3.1.tgz'
+        }
+        t.isDeeply(results.dependencies['@scoped/underscore'], installedversion, '@scoped/underscore installed')
+      }
 
       t.end()
     }
   )
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   server.close()
   cleanup()
   t.end()
 })
 
-var contents = "@scoped:registry="+common.registry+"\n" +
-               toNerfDart(common.registry)+":_authToken=0xabad1dea\n"
+var contents = '@scoped:registry=' + common.registry + '\n' +
+               toNerfDart(common.registry) + ':_authToken=0xabad1dea\n'
 
 var json = {
-  name : "test-package-install",
-  version : "1.0.0"
+  name: 'test-package-install',
+  version: '1.0.0'
 }
 
 var shrinkwrap = {
-  name : "test-package-install",
-  version : "1.0.0",
-  dependencies : {
-    "@scoped/underscore" : {
-      resolved : tarballURL,
-      from     : ">=1.3.1 <2",
-      version  : "1.3.1"
+  name: 'test-package-install',
+  version: '1.0.0',
+  dependencies: {
+    '@scoped/underscore': {
+      resolved: tarballURL,
+      from: '>=1.3.1 <2',
+      version: '1.3.1'
     }
   }
 }
@@ -94,15 +104,15 @@ var shrinkwrap = {
 function setup () {
   cleanup()
   mkdirp.sync(modules)
-  writeFileSync(resolve(pkg, "package.json"), JSON.stringify(json, null, 2)+"\n")
+  writeFileSync(resolve(pkg, 'package.json'), JSON.stringify(json, null, 2) + '\n')
   writeFileSync(outfile, contents)
   writeFileSync(
-    resolve(pkg, "npm-shrinkwrap.json"),
-    JSON.stringify(shrinkwrap, null, 2)+"\n"
+    resolve(pkg, 'npm-shrinkwrap.json'),
+    JSON.stringify(shrinkwrap, null, 2) + '\n'
   )
 }
 
-function cleanup() {
+function cleanup () {
   process.chdir(osenv.tmpdir())
   rimraf.sync(pkg)
 }
diff --git a/deps/npm/test/tap/sorted-package-json.js b/deps/npm/test/tap/sorted-package-json.js
index 6853cf3020637d..9b2e935926b066 100644
--- a/deps/npm/test/tap/sorted-package-json.js
+++ b/deps/npm/test/tap/sorted-package-json.js
@@ -1,21 +1,20 @@
-var test = require("tap").test
-  , path = require("path")
-  , rimraf = require("rimraf")
-  , mkdirp = require("mkdirp")
-  , spawn = require("child_process").spawn
-  , npm = require.resolve("../../bin/npm-cli.js")
-  , node = process.execPath
-  , pkg = path.resolve(__dirname, "sorted-package-json")
-  , tmp = path.join(pkg, "tmp")
-  , cache = path.join(pkg, "cache")
-  , fs = require("fs")
-  , common = require("../common-tap.js")
-  , mr = require("npm-registry-mock")
-  , osenv = require("osenv")
+var test = require('tap').test
+var path = require('path')
+var rimraf = require('rimraf')
+var mkdirp = require('mkdirp')
+var spawn = require('child_process').spawn
+var npm = require.resolve('../../bin/npm-cli.js')
+var node = process.execPath
+var pkg = path.resolve(__dirname, 'sorted-package-json')
+var tmp = path.join(pkg, 'tmp')
+var cache = path.join(pkg, 'cache')
+var fs = require('fs')
+var common = require('../common-tap.js')
+var mr = require('npm-registry-mock')
+var osenv = require('osenv')
 
-
-test("sorting dependencies", function (t) {
-  var packageJson = path.resolve(pkg, "package.json")
+test('sorting dependencies', function (t) {
+  var packageJson = path.resolve(pkg, 'package.json')
 
   cleanup()
   mkdirp.sync(cache)
@@ -24,27 +23,27 @@ test("sorting dependencies", function (t) {
 
   var before = JSON.parse(fs.readFileSync(packageJson).toString())
 
-  mr({port : common.port}, function (er, s) {
+  mr({ port: common.port }, function (er, s) {
     // underscore is already in the package.json,
     // but --save will trigger a rewrite with sort
-    var child = spawn(node, [npm, "install", "--save", "underscore@1.3.3"], {
+    var child = spawn(node, [npm, 'install', '--save', 'underscore@1.3.3'], {
       cwd: pkg,
       env: {
-        "npm_config_registry": common.registry,
-        "npm_config_cache": cache,
-        "npm_config_tmp": tmp,
-        "npm_config_prefix": pkg,
-        "npm_config_global": "false",
+        'npm_config_registry': common.registry,
+        'npm_config_cache': cache,
+        'npm_config_tmp': tmp,
+        'npm_config_prefix': pkg,
+        'npm_config_global': 'false',
         HOME: process.env.HOME,
         Path: process.env.PATH,
         PATH: process.env.PATH
       }
     })
 
-    child.on("close", function (code) {
-      t.equal(code, 0, "npm install exited with code")
+    child.on('close', function (code) {
+      t.equal(code, 0, 'npm install exited with code')
       var result = fs.readFileSync(packageJson).toString()
-        , resultAsJson = JSON.parse(result)
+      var resultAsJson = JSON.parse(result)
 
       s.close()
 
@@ -61,33 +60,33 @@ test("sorting dependencies", function (t) {
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   cleanup()
-  t.pass("cleaned up")
+  t.pass('cleaned up')
   t.end()
 })
 
-function setup() {
+function setup () {
   mkdirp.sync(pkg)
 
-  fs.writeFileSync(path.resolve(pkg, "package.json"), JSON.stringify({
-    "name": "sorted-package-json",
-    "version": "0.0.0",
-    "description": "",
-    "main": "index.js",
-    "scripts": {
-      "test": "echo \"Error: no test specified\" && exit 1"
+  fs.writeFileSync(path.resolve(pkg, 'package.json'), JSON.stringify({
+    'name': 'sorted-package-json',
+    'version': '0.0.0',
+    'description': '',
+    'main': 'index.js',
+    'scripts': {
+      'test': 'echo \'Error: no test specified\' && exit 1'
     },
-    "author": "Rocko Artischocko",
-    "license": "ISC",
-    "dependencies": {
-      "underscore": "^1.3.3",
-      "request": "^0.9.0"
+    'author': 'Rocko Artischocko',
+    'license': 'ISC',
+    'dependencies': {
+      'underscore': '^1.3.3',
+      'request': '^0.9.0'
     }
-  }, null, 2), "utf8")
+  }, null, 2), 'utf8')
 }
 
-function cleanup() {
+function cleanup () {
   process.chdir(osenv.tmpdir())
   rimraf.sync(cache)
   rimraf.sync(pkg)
diff --git a/deps/npm/test/tap/spawn-enoent-help.js b/deps/npm/test/tap/spawn-enoent-help.js
index 70fb078faf77e8..716f6ebd1537fe 100644
--- a/deps/npm/test/tap/spawn-enoent-help.js
+++ b/deps/npm/test/tap/spawn-enoent-help.js
@@ -1,25 +1,25 @@
-var path = require("path")
-var test = require("tap").test
-var rimraf = require("rimraf")
-var mkdirp = require("mkdirp")
-var common = require("../common-tap.js")
+var path = require('path')
+var test = require('tap').test
+var rimraf = require('rimraf')
+var mkdirp = require('mkdirp')
+var common = require('../common-tap.js')
 
-var pkg = path.resolve(__dirname, "spawn-enoent-help")
+var pkg = path.resolve(__dirname, 'spawn-enoent-help')
 
-test("setup", function (t) {
+test('setup', function (t) {
   rimraf.sync(pkg)
   mkdirp.sync(pkg)
   t.end()
 })
 
-test("enoent help", function (t) {
-  common.npm(["help", "config"], {
+test('enoent help', function (t) {
+  common.npm(['help', 'config'], {
     cwd: pkg,
     env: {
-      PATH: "",
-      Path: "",
-      "npm_config_loglevel": "warn",
-      "npm_config_viewer": "woman"
+      PATH: '',
+      Path: '',
+      'npm_config_loglevel': 'warn',
+      'npm_config_viewer': 'woman'
     }
   }, function (er, code, sout, serr) {
     t.similar(serr, /Check if the file 'emacsclient' is present./)
@@ -28,7 +28,7 @@ test("enoent help", function (t) {
   })
 })
 
-test("clean", function (t) {
+test('clean', function (t) {
   rimraf.sync(pkg)
   t.end()
 })
diff --git a/deps/npm/test/tap/spawn-enoent.js b/deps/npm/test/tap/spawn-enoent.js
index 29b70f6f8ac19e..320e477e0ec4e0 100644
--- a/deps/npm/test/tap/spawn-enoent.js
+++ b/deps/npm/test/tap/spawn-enoent.js
@@ -1,32 +1,31 @@
-var path = require("path")
-var test = require("tap").test
-var fs = require("fs")
-var rimraf = require("rimraf")
-var mkdirp = require("mkdirp")
-var common = require("../common-tap.js")
+var path = require('path')
+var test = require('tap').test
+var fs = require('fs')
+var rimraf = require('rimraf')
+var mkdirp = require('mkdirp')
+var common = require('../common-tap.js')
 
-var pkg = path.resolve(__dirname, "spawn-enoent")
+var pkg = path.resolve(__dirname, 'spawn-enoent')
 var pj = JSON.stringify({
-  name:"x",
-  version: "1.2.3",
-  scripts: { start: "wharble-garble-blorst" }
-}, null, 2) + "\n"
+  name: 'x',
+  version: '1.2.3',
+  scripts: { start: 'wharble-garble-blorst' }
+}, null, 2) + '\n'
 
-
-test("setup", function (t) {
+test('setup', function (t) {
   rimraf.sync(pkg)
   mkdirp.sync(pkg)
-  fs.writeFileSync(pkg + "/package.json", pj)
+  fs.writeFileSync(pkg + '/package.json', pj)
   t.end()
 })
 
-test("enoent script", function (t) {
-  common.npm(["start"], {
+test('enoent script', function (t) {
+  common.npm(['start'], {
     cwd: pkg,
     env: {
       PATH: process.env.PATH,
       Path: process.env.Path,
-      "npm_config_loglevel": "warn"
+      'npm_config_loglevel': 'warn'
     }
   }, function (er, code, sout, serr) {
     t.similar(serr, /npm ERR! Failed at the x@1\.2\.3 start script 'wharble-garble-blorst'\./)
@@ -34,7 +33,7 @@ test("enoent script", function (t) {
   })
 })
 
-test("clean", function (t) {
+test('clean', function (t) {
   rimraf.sync(pkg)
   t.end()
 })
diff --git a/deps/npm/test/tap/splat-with-only-prerelease-to-latest.js b/deps/npm/test/tap/splat-with-only-prerelease-to-latest.js
index d402bed2961866..09eb4ebe3b8336 100644
--- a/deps/npm/test/tap/splat-with-only-prerelease-to-latest.js
+++ b/deps/npm/test/tap/splat-with-only-prerelease-to-latest.js
@@ -1,7 +1,6 @@
 'use strict'
 var test = require('tap').test
 var npm = require('../../lib/npm')
-var log = require('npmlog')
 var stream = require('readable-stream')
 
 var moduleName = 'xyzzy-wibble'
@@ -42,13 +41,13 @@ var testModule = {
         shasum: 'da39a3ee5e6b4b0d3255bfef95601890afd80709',
         tarball: 'http://registry.npmjs.org/aproba/-/xyzzy-wibble-1.3.0-a.tgz'
       }
-    },
-  },
+    }
+  }
 }
 
 var lastFetched
 test('setup', function (t) {
-  npm.load(function(){
+  npm.load(function () {
     npm.config.set('loglevel', 'silly')
     npm.registry = {
       get: function (uri, opts, cb) {
@@ -69,13 +68,13 @@ test('setup', function (t) {
   })
 })
 
-
 test('splat', function (t) {
-  t.plan(3)
+  t.plan(4)
   var addNamed = require('../../lib/cache/add-named.js')
   addNamed('xyzzy-wibble', '*', testModule, function (err, pkg) {
     t.error(err, 'Succesfully resolved a splat package')
     t.is(pkg.name, moduleName)
     t.is(pkg.version, testModule['dist-tags'].latest)
+    t.is(lastFetched, 'https://registry.npmjs.org/aproba/-/xyzzy-wibble-1.3.0-a.tgz')
   })
 })
diff --git a/deps/npm/test/tap/symlink-cycle.js b/deps/npm/test/tap/symlink-cycle.js
new file mode 100644
index 00000000000000..b09b25acc8676f
--- /dev/null
+++ b/deps/npm/test/tap/symlink-cycle.js
@@ -0,0 +1,61 @@
+'use strict'
+var fs = require('fs')
+var path = require('path')
+var test = require('tap').test
+var mkdirp = require('mkdirp')
+var osenv = require('osenv')
+var rimraf = require('rimraf')
+var writeFileSync = require('fs').writeFileSync
+var common = require('../common-tap.js')
+
+var base = path.join(__dirname, path.basename(__filename, '.js'))
+var cycle = path.join(base, 'cycle')
+
+var cycleJSON = {
+  name: 'cycle',
+  version: '1.0.0',
+  description: '',
+  main: 'index.js',
+  scripts: {
+    test: 'echo \"Error: no test specified\" && exit 1'
+  },
+  dependencies: {
+    'cycle': '*'
+  },
+  author: '',
+  license: 'ISC'
+}
+
+test('setup', function (t) {
+  setup()
+  t.end()
+})
+
+test('ls', function (t) {
+  process.chdir(cycle)
+  common.npm(['ls'], {}, function (err, code, stdout, stderr) {
+    t.ifError(err, 'installed w/o error')
+    t.is(stderr, '', 'no warnings printed to stderr')
+    t.end()
+  })
+})
+
+test('cleanup', function (t) {
+  process.chdir(osenv.tmpdir())
+  cleanup()
+  t.end()
+})
+
+function cleanup () {
+  rimraf.sync(base)
+}
+
+function setup () {
+  cleanup()
+  mkdirp.sync(path.join(cycle, 'node_modules'))
+  writeFileSync(
+    path.join(cycle, 'package.json'),
+    JSON.stringify(cycleJSON, null, 2)
+  )
+  fs.symlinkSync(cycle, path.join(cycle, 'node_modules', 'cycle'))
+}
diff --git a/deps/npm/test/tap/team.js b/deps/npm/test/tap/team.js
index 4bfcbaddb2d90b..b13fa86e8b8df0 100644
--- a/deps/npm/test/tap/team.js
+++ b/deps/npm/test/tap/team.js
@@ -1,6 +1,3 @@
-var fs = require('fs')
-var path = require('path')
-var rimraf = require('rimraf')
 var mr = require('npm-registry-mock')
 
 var test = require('tap').test
diff --git a/deps/npm/test/tap/test-run-ls.js b/deps/npm/test/tap/test-run-ls.js
index 252c6e8f931e6e..ea495879f31025 100644
--- a/deps/npm/test/tap/test-run-ls.js
+++ b/deps/npm/test/tap/test-run-ls.js
@@ -1,30 +1,30 @@
-var common = require("../common-tap.js")
-var test = require("tap").test
-var path = require("path")
-var cwd = path.resolve(__dirname, "..", "..")
-var testscript = require("../../package.json").scripts.test
-var tsregexp = testscript.replace(/([\[\.\*\]])/g, "\\$1")
+var common = require('../common-tap.js')
+var test = require('tap').test
+var path = require('path')
+var cwd = path.resolve(__dirname, '..', '..')
+var testscript = require('../../package.json').scripts.test
+var tsregexp = testscript.replace(/([\[\.\*\]])/g, '\\$1')
 
-test("default", function (t) {
-  common.npm(["run"], { cwd: cwd }, function (er, code, so) {
+test('default', function (t) {
+  common.npm(['run'], { cwd: cwd }, function (er, code, so) {
     if (er) throw er
     t.notOk(code)
-    t.similar(so, new RegExp("\\n  test\\n    " + tsregexp + "\\n"))
+    t.similar(so, new RegExp('\\n  test\\n    ' + tsregexp + '\\n'))
     t.end()
   })
 })
 
-test("parseable", function (t) {
-  common.npm(["run", "-p"], { cwd: cwd }, function (er, code, so) {
+test('parseable', function (t) {
+  common.npm(['run', '-p'], { cwd: cwd }, function (er, code, so) {
     if (er) throw er
     t.notOk(code)
-    t.similar(so, new RegExp("\\ntest:" + tsregexp + "\\n"))
+    t.similar(so, new RegExp('\\ntest:' + tsregexp + '\\n'))
     t.end()
   })
 })
 
-test("parseable", function (t) {
-  common.npm(["run", "--json"], { cwd: cwd }, function (er, code, so) {
+test('parseable', function (t) {
+  common.npm(['run', '--json'], { cwd: cwd }, function (er, code, so) {
     if (er) throw er
     t.notOk(code)
     t.equal(JSON.parse(so).test, testscript)
diff --git a/deps/npm/test/tap/uninstall-in-reverse.js b/deps/npm/test/tap/uninstall-in-reverse.js
new file mode 100644
index 00000000000000..2d8fe2bcfccfb9
--- /dev/null
+++ b/deps/npm/test/tap/uninstall-in-reverse.js
@@ -0,0 +1,38 @@
+'use strict'
+var test = require('tap').test
+var requireInject = require('require-inject')
+var log = require('npmlog')
+
+/*
+The remove actions need to happen in the opposite of their normally defined
+order. That is, they need to go shallow -> deep.
+*/
+
+var removed = []
+var npm = requireInject.installGlobally('../../lib/npm.js', {
+  '../../lib/install/action/remove.js': function (top, buildpath, pkg, log, next) {
+    removed.push(pkg.package.name)
+    next()
+  }
+})
+
+test('setup', function (t) {
+  npm.load(function () {
+    t.pass('npm loaded')
+    t.end()
+  })
+})
+
+test('abc', function (t) {
+  var Installer = require('../../lib/install.js').Installer
+  var inst = new Installer(__dirname, false, [])
+  inst.progress = {executeActions: log}
+  inst.todo = [
+    ['remove', {package: {name: 'first'}}],
+    ['remove', {package: {name: 'second'}}]
+  ]
+  inst.executeActions(function () {
+    t.isDeeply(removed, ['second', 'first'])
+    t.end()
+  })
+})
diff --git a/deps/npm/test/tap/uninstall-package.js b/deps/npm/test/tap/uninstall-package.js
index 6e86df531aacb7..549b403ccfd556 100644
--- a/deps/npm/test/tap/uninstall-package.js
+++ b/deps/npm/test/tap/uninstall-package.js
@@ -56,8 +56,8 @@ test('returns a list of removed items', function (t) {
           function (err, code, stdout, stderr) {
             t.ifError(err, 'uninstall ran without issue')
             t.notOk(code, 'uninstall ran without raising error code')
-            t.has(stdout, /unbuild underscore@1.3.3/, 'underscore uninstalled')
-            t.has(stdout, /unbuild request@0.9.5/, 'request uninstalled')
+            t.has(stdout, /- underscore@1.3.3/, 'underscore uninstalled')
+            t.has(stdout, /- request@0.9.5/, 'request uninstalled')
 
             s.close()
             t.end()
diff --git a/deps/npm/test/tap/update-examples.js b/deps/npm/test/tap/update-examples.js
index 633713d9d7a8cf..ae67e4a911a72b 100644
--- a/deps/npm/test/tap/update-examples.js
+++ b/deps/npm/test/tap/update-examples.js
@@ -1,6 +1,5 @@
 var common = require('../common-tap.js')
 var test = require('tap').test
-var npm = require('../../lib/npm.js')
 var mkdirp = require('mkdirp')
 var rimraf = require('rimraf')
 var path = require('path')
@@ -29,9 +28,19 @@ var DEP_PKG = {
 }
 
 var INSTALLED = {
-  dependencies: {
-    'dep1': '1.1.1'
-  }
+  path: '/mock/root',
+  realpath: '/mock/root',
+  isLink: false,
+  package: DEFAULT_PKG,
+  children: [
+    {
+      path: '/mock/root/node_modules/dep1',
+      realpath: '/mock/root/node_modules/dep1',
+      isLink: false,
+      package: DEP_PKG,
+      children: []
+    }
+  ]
 }
 
 var DEP1_REGISTRY = { name: 'dep1',
@@ -87,16 +96,18 @@ function resetPackage (options) {
 
   if (options.wanted) {
     mockParentJson.dependencies.dep1 = options.wanted
+    mockInstalled.package.dependencies.dep1 = options.wanted
     mockDepJson._from = options.wanted
   }
 
   if (options.installed) {
-    mockInstalled.dependencies.dep1 = options.installed
+    mockInstalled.package.dependencies.dep1 = options.installed
+    mockInstalled.children[0].package.version = options.installed
     mockDepJson.version = options.installed
   }
 }
 
-function mockReadInstalled (dir, opts, cb) {
+function mockReadPackageTree (dir, cb) {
   cb(null, mockInstalled)
 }
 
@@ -109,30 +120,47 @@ function mockCommand (npm, name, fn) {
   npm.commands[name] = fn
 }
 
+function mockInstaller (where, dryrun, what) {
+  installAskedFor = what[0]
+}
+mockInstaller.prototype = {}
+mockInstaller.prototype.run = function (cb) {
+  cb()
+}
+
+var npm = requireInject.installGlobally('../../lib/npm.js', {
+  'read-package-tree': mockReadPackageTree,
+  'read-package-json': mockReadJson,
+  '../../lib/install': {
+    Installer: mockInstaller
+  }
+})
+
 test('setup', function (t) {
+  t.plan(5)
   process.chdir(osenv.tmpdir())
   mkdirp.sync(PKG_DIR)
   process.chdir(PKG_DIR)
+  t.pass('made ' + PKG_DIR)
 
   resetPackage({})
 
   mr({ port: common.port, mocks: registryMocks }, function (er, server) {
+    t.pass('mock registry active')
     npm.load({ cache: CACHE_DIR,
       registry: common.registry,
     cwd: PKG_DIR }, function (err) {
         t.ifError(err, 'started server')
         mockServer = server
 
+        t.pass('npm.load complete')
+
         mockCommand(npm, 'install', function mockInstall (where, what, cb) {
           installAskedFor = what
           cb(null)
         })
 
-        mockCommand(npm, 'outdated', requireInject('../../lib/outdated', {
-          'read-installed': mockReadInstalled,
-          'read-package-json': mockReadJson
-        }))
-
+        t.pass('mocks configured')
         t.end()
       })
   })
@@ -141,9 +169,10 @@ test('setup', function (t) {
 test('update caret dependency to latest', function (t) {
   resetPackage({ wanted: '^1.1.1' })
 
+  npm.config.set('loglevel', 'silly')
   npm.commands.update([], function (err) {
     t.ifError(err)
-    t.equal('dep1@1.2.2', installAskedFor, 'should want to install dep@1.2.2')
+    t.equal(installAskedFor, 'dep1@1.2.2', 'should want to install dep@1.2.2')
     t.end()
   })
 })
@@ -153,7 +182,7 @@ test('update tilde dependency to latest', function (t) {
 
   npm.commands.update([], function (err) {
     t.ifError(err)
-    t.equal('dep1@1.1.2', installAskedFor, 'should want to install dep@1.1.2')
+    t.equal(installAskedFor, 'dep1@1.1.2', 'should want to install dep@1.1.2')
     t.end()
   })
 })
@@ -173,7 +202,7 @@ test('update old caret dependency with no newer', function (t) {
 
   npm.commands.update([], function (err) {
     t.ifError(err)
-    t.equal('dep1@0.2.0', installAskedFor, 'should want to install dep@0.2.0')
+    t.equal(installAskedFor, 'dep1@0.2.0', 'should want to install dep@0.2.0')
     t.end()
   })
 })
@@ -183,7 +212,7 @@ test('update old caret dependency with newer', function (t) {
 
   npm.commands.update([], function (err) {
     t.ifError(err)
-    t.equal('dep1@0.4.1', installAskedFor, 'should want to install dep@0.4.1')
+    t.equal(installAskedFor, 'dep1@0.4.1', 'should want to install dep@0.4.1')
     t.end()
   })
 })
diff --git a/deps/npm/test/tap/update-path.js b/deps/npm/test/tap/update-path.js
new file mode 100644
index 00000000000000..1578669a253fb9
--- /dev/null
+++ b/deps/npm/test/tap/update-path.js
@@ -0,0 +1,35 @@
+'use strict'
+var test = require('tap').test
+var requireInject = require('require-inject')
+
+var mockNpm = {
+  config: {
+    get: function (key) {
+      return false
+    }
+  },
+  commands: {
+    outdated: function (args, silent, cb) {
+      cb(null, [
+        [{path: '/incorrect', parent: {path: '/correct'}}, 'abc', '1.0.0', '1.1.0', '1.1.0', '^1.1.0']
+      ])
+    }
+  }
+}
+
+// What we're testing here is that updates use the parent module's path to
+// install from.
+test('update', function (t) {
+  var update = requireInject('../../lib/update.js', {
+    '../../lib/npm.js': mockNpm,
+    '../../lib/install.js': {
+      'Installer': function (where, dryrun, args) {
+        t.is(where, '/correct', 'We should be installing to the parent of the modules being updated')
+        this.run = function (cb) { cb() }
+      }
+    }
+  })
+  update(['abc'], function () {
+    t.end()
+  })
+})
diff --git a/deps/npm/test/tap/verify-no-lifecycle-on-repo.js b/deps/npm/test/tap/verify-no-lifecycle-on-repo.js
new file mode 100644
index 00000000000000..29f79e29833bab
--- /dev/null
+++ b/deps/npm/test/tap/verify-no-lifecycle-on-repo.js
@@ -0,0 +1,54 @@
+'use strict'
+var path = require('path')
+var fs = require('graceful-fs')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var test = require('tap').test
+var common = require('../common-tap.js')
+
+var base = path.join(__dirname, path.basename(__filename, '.js'))
+
+var baseJSON = {
+  name: 'base',
+  version: '1.0.0',
+  repository: {
+    type: 'git',
+    url: 'http://example.com'
+  },
+  scripts: {
+    prepublish: 'false'
+  }
+}
+
+test('setup', function (t) {
+  cleanup()
+  setup()
+  t.end()
+})
+
+test('repo', function (t) {
+  common.npm(['repo', '--browser=echo'], {cwd: base}, function (er, code, stdout, stderr) {
+    t.ifError(er, 'npm config ran without issue')
+    t.is(code, 0, 'exited with a non-error code')
+    t.is(stderr, '', 'Ran without errors')
+    t.end()
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
+
+function saveJson (pkgPath, json) {
+  mkdirp.sync(pkgPath)
+  fs.writeFileSync(path.join(pkgPath, 'package.json'), JSON.stringify(json, null, 2))
+}
+
+function setup () {
+  saveJson(base, baseJSON)
+}
+
+function cleanup () {
+  rimraf.sync(base)
+}
diff --git a/deps/npm/test/tap/version-no-git.js b/deps/npm/test/tap/version-no-git.js
index 0acd0ab6a56a04..0a859c7af2170a 100644
--- a/deps/npm/test/tap/version-no-git.js
+++ b/deps/npm/test/tap/version-no-git.js
@@ -1,54 +1,54 @@
-var common = require("../common-tap.js")
-var test = require("tap").test
-var npm = require("../../")
-var osenv = require("osenv")
-var path = require("path")
-var fs = require("fs")
-var mkdirp = require("mkdirp")
-var rimraf = require("rimraf")
-var requireInject = require("require-inject")
+var common = require('../common-tap.js')
+var test = require('tap').test
+var npm = require('../../')
+var osenv = require('osenv')
+var path = require('path')
+var fs = require('fs')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var requireInject = require('require-inject')
 
-var pkg = path.resolve(__dirname, "version-no-git")
-var cache = path.resolve(pkg, "cache")
-var gitDir = path.resolve(pkg, ".git")
+var pkg = path.resolve(__dirname, 'version-no-git')
+var cache = path.resolve(pkg, 'cache')
+var gitDir = path.resolve(pkg, '.git')
 
-test("npm version <semver> in a git repo without the git binary", function(t) {
+test('npm version <semver> in a git repo without the git binary', function (t) {
   setup()
-  npm.load({cache: cache, registry: common.registry}, function() {
-    var version = requireInject("../../lib/version", {
-      which: function(cmd, cb) {
-        process.nextTick(function() {
+  npm.load({cache: cache, registry: common.registry}, function () {
+    var version = requireInject('../../lib/version', {
+      which: function (cmd, cb) {
+        process.nextTick(function () {
           cb(new Error('ENOGIT!'))
         })
       }
     })
 
-    version(["patch"], function(err) {
-      if (! t.error(err)) return t.end()
-      var p = path.resolve(pkg, "package")
+    version(['patch'], function (err) {
+      if (!t.error(err)) return t.end()
+      var p = path.resolve(pkg, 'package')
       var testPkg = require(p)
-      t.equal("0.0.1", testPkg.version, "\"" + testPkg.version+"\" === \"0.0.1\"")
+      t.equal('0.0.1', testPkg.version, '\'' + testPkg.version + '\' === \'0.0.1\'')
       t.end()
     })
   })
 })
 
-test("cleanup", function(t) {
+test('cleanup', function (t) {
   process.chdir(osenv.tmpdir())
 
   rimraf.sync(pkg)
   t.end()
 })
 
-function setup() {
+function setup () {
   mkdirp.sync(pkg)
   mkdirp.sync(cache)
   mkdirp.sync(gitDir)
-  fs.writeFileSync(path.resolve(pkg, "package.json"), JSON.stringify({
-    author: "Terin Stock",
-    name: "version-no-git-test",
-    version: "0.0.0",
+  fs.writeFileSync(path.resolve(pkg, 'package.json'), JSON.stringify({
+    author: 'Terin Stock',
+    name: 'version-no-git-test',
+    version: '0.0.0',
     description: "Test for npm version if git binary doesn't exist"
-  }), "utf8")
+  }), 'utf8')
   process.chdir(pkg)
 }
diff --git a/deps/npm/test/tap/version-no-package.js b/deps/npm/test/tap/version-no-package.js
index 539f53feb72ca9..755f99317e6e09 100644
--- a/deps/npm/test/tap/version-no-package.js
+++ b/deps/npm/test/tap/version-no-package.js
@@ -1,45 +1,45 @@
-var common = require("../common-tap.js")
-var test = require("tap").test
-var osenv = require("osenv")
-var path = require("path")
-var mkdirp = require("mkdirp")
-var rimraf = require("rimraf")
+var common = require('../common-tap.js')
+var test = require('tap').test
+var osenv = require('osenv')
+var path = require('path')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
 
-var pkg = path.resolve(__dirname, "version-no-package")
+var pkg = path.resolve(__dirname, 'version-no-package')
 
-test("setup", function (t) {
+test('setup', function (t) {
   setup()
   t.end()
 })
 
-test("npm version in a prefix with no package.json", function(t) {
+test('npm version in a prefix with no package.json', function (t) {
   setup()
   common.npm(
-    ["version", "--json", "--prefix", pkg],
-    { cwd : pkg },
+    ['version', '--json', '--prefix', pkg],
+    { cwd: pkg },
     function (er, code, stdout, stderr) {
       t.ifError(er, "npm version doesn't care that there's no package.json")
-      t.notOk(code, "npm version ran without barfing")
-      t.ok(stdout, "got version output")
-      t.notOk(stderr, "no error output")
+      t.notOk(code, 'npm version ran without barfing')
+      t.ok(stdout, 'got version output')
+      t.notOk(stderr, 'no error output')
       t.doesNotThrow(function () {
         var metadata = JSON.parse(stdout)
-        t.equal(metadata.node, process.versions.node, "node versions match")
+        t.equal(metadata.node, process.versions.node, 'node versions match')
 
         t.end()
-      }, "able to reconstitute version object from stdout")
+      }, 'able to reconstitute version object from stdout')
     }
   )
 })
 
-test("cleanup", function(t) {
+test('cleanup', function (t) {
   process.chdir(osenv.tmpdir())
 
   rimraf.sync(pkg)
   t.end()
 })
 
-function setup() {
+function setup () {
   mkdirp.sync(pkg)
   process.chdir(pkg)
 }
diff --git a/deps/npm/test/tap/version-no-tags.js b/deps/npm/test/tap/version-no-tags.js
index cb6f195f8ba599..ed2bed32c29dee 100644
--- a/deps/npm/test/tap/version-no-tags.js
+++ b/deps/npm/test/tap/version-no-tags.js
@@ -1,47 +1,47 @@
-var common = require("../common-tap.js")
-var test = require("tap").test
-var npm = require("../../")
-var osenv = require("osenv")
-var path = require("path")
-var fs = require("fs")
-var rimraf = require("rimraf")
-var mkdirp = require("mkdirp")
-var which = require("which")
-var spawn = require("child_process").spawn
+var common = require('../common-tap.js')
+var test = require('tap').test
+var npm = require('../../')
+var osenv = require('osenv')
+var path = require('path')
+var fs = require('fs')
+var rimraf = require('rimraf')
+var mkdirp = require('mkdirp')
+var which = require('which')
+var spawn = require('child_process').spawn
 
-var pkg = path.resolve(__dirname, "version-no-tags")
-var cache = path.resolve(pkg, "cache")
+var pkg = path.resolve(__dirname, 'version-no-tags')
+var cache = path.resolve(pkg, 'cache')
 
-test("npm version <semver> without git tag", function (t) {
+test('npm version <semver> without git tag', function (t) {
   setup()
   npm.load({ cache: cache, registry: common.registry}, function () {
-    which("git", function (err, git) {
-      t.ifError(err, "git found on system")
-      function tagExists(tag, _cb) {
-        var child1 = spawn(git, ["tag", "-l", tag])
-        var out = ""
-        child1.stdout.on("data", function (d) {
+    which('git', function (err, git) {
+      t.ifError(err, 'git found on system')
+      function tagExists (tag, _cb) {
+        var child1 = spawn(git, ['tag', '-l', tag])
+        var out = ''
+        child1.stdout.on('data', function (d) {
           out += d.toString()
         })
-        child1.on("exit", function () {
+        child1.on('exit', function () {
           return _cb(null, Boolean(~out.indexOf(tag)))
         })
       }
 
-      var child2 = spawn(git, ["init"])
+      var child2 = spawn(git, ['init'])
       child2.stdout.pipe(process.stdout)
-      child2.on("exit", function () {
-        npm.config.set("git-tag-version", false)
-        npm.commands.version(["patch"], function (err) {
-          if (err) return t.fail("Error perform version patch")
-          var p = path.resolve(pkg, "package")
+      child2.on('exit', function () {
+        npm.config.set('git-tag-version', false)
+        npm.commands.version(['patch'], function (err) {
+          if (err) return t.fail('Error perform version patch')
+          var p = path.resolve(pkg, 'package')
           var testPkg = require(p)
-          if (testPkg.version !== "0.0.1") t.fail(testPkg.version+" !== \"0.0.1\"")
-          t.equal("0.0.1", testPkg.version)
-          tagExists("v0.0.1", function (err, exists) {
-            t.ifError(err, "tag found to exist")
-            t.equal(exists, false, "git tag DOES exist")
-            t.pass("git tag does not exist")
+          if (testPkg.version !== '0.0.1') t.fail(testPkg.version + ' !== \'0.0.1\'')
+          t.equal('0.0.1', testPkg.version)
+          tagExists('v0.0.1', function (err, exists) {
+            t.ifError(err, 'tag found to exist')
+            t.equal(exists, false, 'git tag DOES exist')
+            t.pass('git tag does not exist')
             t.end()
           })
         })
@@ -50,7 +50,7 @@ test("npm version <semver> without git tag", function (t) {
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   // windows fix for locked files
   process.chdir(osenv.tmpdir())
 
@@ -58,14 +58,14 @@ test("cleanup", function (t) {
   t.end()
 })
 
-function setup() {
+function setup () {
   mkdirp.sync(pkg)
   mkdirp.sync(cache)
-  fs.writeFileSync(path.resolve(pkg, "package.json"), JSON.stringify({
-    author: "Evan Lucas",
-    name: "version-no-tags-test",
-    version: "0.0.0",
-    description: "Test for git-tag-version flag"
-  }), "utf8")
+  fs.writeFileSync(path.resolve(pkg, 'package.json'), JSON.stringify({
+    author: 'Evan Lucas',
+    name: 'version-no-tags-test',
+    version: '0.0.0',
+    description: 'Test for git-tag-version flag'
+  }), 'utf8')
   process.chdir(pkg)
 }
diff --git a/deps/npm/test/tap/view.js b/deps/npm/test/tap/view.js
index dcfd2810115d3a..84a0a69d30c428 100644
--- a/deps/npm/test/tap/view.js
+++ b/deps/npm/test/tap/view.js
@@ -1,97 +1,97 @@
-var common = require("../common-tap.js")
-var test = require("tap").test
-var osenv = require("osenv")
-var path = require("path")
-var fs = require("fs")
-var rimraf = require("rimraf")
-var mkdirp = require("mkdirp")
+var common = require('../common-tap.js')
+var test = require('tap').test
+var osenv = require('osenv')
+var path = require('path')
+var fs = require('fs')
+var rimraf = require('rimraf')
+var mkdirp = require('mkdirp')
 var tmp = osenv.tmpdir()
-var t1dir = path.resolve(tmp, "view-local-no-pkg")
-var t2dir = path.resolve(tmp, "view-local-notmine")
-var t3dir = path.resolve(tmp, "view-local-mine")
-var mr = require("npm-registry-mock")
+var t1dir = path.resolve(tmp, 'view-local-no-pkg')
+var t2dir = path.resolve(tmp, 'view-local-notmine')
+var t3dir = path.resolve(tmp, 'view-local-mine')
+var mr = require('npm-registry-mock')
 
-test("setup", function (t) {
+test('setup', function (t) {
   mkdirp.sync(t1dir)
   mkdirp.sync(t2dir)
   mkdirp.sync(t3dir)
 
-  fs.writeFileSync(t2dir + "/package.json", JSON.stringify({
-    author: "Evan Lucas"
-  , name: "test-repo-url-https"
-  , version: "0.0.1"
-  }), "utf8")
+  fs.writeFileSync(t2dir + '/package.json', JSON.stringify({
+    author: 'Evan Lucas',
+    name: 'test-repo-url-https',
+    version: '0.0.1'
+  }), 'utf8')
 
-  fs.writeFileSync(t3dir + "/package.json", JSON.stringify({
-    author: "Evan Lucas"
-  , name: "biscuits"
-  , version: "0.0.1"
-  }), "utf8")
+  fs.writeFileSync(t3dir + '/package.json', JSON.stringify({
+    author: 'Evan Lucas',
+    name: 'biscuits',
+    version: '0.0.1'
+  }), 'utf8')
 
-  t.pass("created fixtures")
+  t.pass('created fixtures')
   t.end()
 })
 
 function plugin (server) {
   server
-    .get("/biscuits")
+    .get('/biscuits')
     .many()
-    .reply(404, {"error": "version not found"})
+    .reply(404, {'error': 'version not found'})
 }
 
-test("npm view . in global mode", function (t) {
+test('npm view . in global mode', function (t) {
   process.chdir(t1dir)
   common.npm([
-    "view"
-  , "."
-  , "--registry=" + common.registry
-  , "--global"
+    'view',
+    '.',
+    '--registry=' + common.registry,
+    '--global'
   ], { cwd: t1dir }, function (err, code, stdout, stderr) {
-    t.ifError(err, "view command finished successfully")
-    t.equal(code, 1, "exit not ok")
+    t.ifError(err, 'view command finished successfully')
+    t.equal(code, 1, 'exit not ok')
     t.similar(stderr, /Cannot use view command in global mode./m)
     t.end()
   })
 })
 
-test("npm view --global", function(t) {
+test('npm view --global', function (t) {
   process.chdir(t1dir)
   common.npm([
-    "view"
-  , "--registry=" + common.registry
-  , "--global"
-  ], { cwd: t1dir }, function(err, code, stdout, stderr) {
-    t.ifError(err, "view command finished successfully")
-    t.equal(code, 1, "exit not ok")
+    'view',
+    '--registry=' + common.registry,
+    '--global'
+  ], { cwd: t1dir }, function (err, code, stdout, stderr) {
+    t.ifError(err, 'view command finished successfully')
+    t.equal(code, 1, 'exit not ok')
     t.similar(stderr, /Cannot use view command in global mode./m)
     t.end()
   })
 })
 
-test("npm view . with no package.json", function(t) {
+test('npm view . with no package.json', function (t) {
   process.chdir(t1dir)
   common.npm([
-    "view"
-  , "."
-  , "--registry=" + common.registry
+    'view',
+    '.',
+    '--registry=' + common.registry
   ], { cwd: t1dir }, function (err, code, stdout, stderr) {
-    t.ifError(err, "view command finished successfully")
-    t.equal(code, 1, "exit not ok")
+    t.ifError(err, 'view command finished successfully')
+    t.equal(code, 1, 'exit not ok')
     t.similar(stderr, /Invalid package.json/m)
     t.end()
   })
 })
 
-test("npm view . with no published package", function (t) {
+test('npm view . with no published package', function (t) {
   process.chdir(t3dir)
-  mr({port : common.port, plugin : plugin}, function (er, s) {
+  mr({ port: common.port, plugin: plugin}, function (er, s) {
     common.npm([
-      "view"
-    , "."
-    , "--registry=" + common.registry
+      'view',
+      '.',
+      '--registry=' + common.registry
     ], { cwd: t3dir }, function (err, code, stdout, stderr) {
-      t.ifError(err, "view command finished successfully")
-      t.equal(code, 1, "exit not ok")
+      t.ifError(err, 'view command finished successfully')
+      t.equal(code, 1, 'exit not ok')
       t.similar(stderr, /version not found/m)
       s.close()
       t.end()
@@ -99,16 +99,16 @@ test("npm view . with no published package", function (t) {
   })
 })
 
-test("npm view .", function (t) {
+test('npm view .', function (t) {
   process.chdir(t2dir)
-  mr({port : common.port, plugin : plugin}, function (er, s) {
+  mr({ port: common.port, plugin: plugin }, function (er, s) {
     common.npm([
-      "view"
-    , "."
-    , "--registry=" + common.registry
+      'view',
+      '.',
+      '--registry=' + common.registry
     ], { cwd: t2dir }, function (err, code, stdout) {
-      t.ifError(err, "view command finished successfully")
-      t.equal(code, 0, "exit ok")
+      t.ifError(err, 'view command finished successfully')
+      t.equal(code, 0, 'exit ok')
       var re = new RegExp("name: 'test-repo-url-https'")
       t.similar(stdout, re)
       s.close()
@@ -117,161 +117,160 @@ test("npm view .", function (t) {
   })
 })
 
-test("npm view . select fields", function (t) {
+test('npm view . select fields', function (t) {
   process.chdir(t2dir)
-  mr({port : common.port, plugin : plugin}, function (er, s) {
+  mr({ port: common.port, plugin: plugin }, function (er, s) {
     common.npm([
-      "view"
-    , "."
-    , "main"
-    , "--registry=" + common.registry
+      'view',
+      '.',
+      'main',
+      '--registry=' + common.registry
     ], { cwd: t2dir }, function (err, code, stdout) {
-      t.ifError(err, "view command finished successfully")
-      t.equal(code, 0, "exit ok")
-      t.equal(stdout.trim(), "index.js", "should print `index.js`")
+      t.ifError(err, 'view command finished successfully')
+      t.equal(code, 0, 'exit ok')
+      t.equal(stdout.trim(), 'index.js', 'should print `index.js`')
       s.close()
       t.end()
     })
   })
 })
 
-test("npm view .@<version>", function (t) {
+test('npm view .@<version>', function (t) {
   process.chdir(t2dir)
-  mr({port : common.port, plugin : plugin}, function (er, s) {
+  mr({ port: common.port, plugin: plugin }, function (er, s) {
     common.npm([
-      "view"
-    , ".@0.0.0"
-    , "version"
-    , "--registry=" + common.registry
+      'view',
+      '.@0.0.0',
+      'version',
+      '--registry=' + common.registry
     ], { cwd: t2dir }, function (err, code, stdout) {
-      t.ifError(err, "view command finished successfully")
-      t.equal(code, 0, "exit ok")
-      t.equal(stdout.trim(), "0.0.0", "should print `0.0.0`")
+      t.ifError(err, 'view command finished successfully')
+      t.equal(code, 0, 'exit ok')
+      t.equal(stdout.trim(), '0.0.0', 'should print `0.0.0`')
       s.close()
       t.end()
     })
   })
 })
 
-test("npm view .@<version> --json", function (t) {
+test('npm view .@<version> --json', function (t) {
   process.chdir(t2dir)
-  mr({port : common.port, plugin : plugin}, function (er, s) {
+  mr({ port: common.port, plugin: plugin }, function (er, s) {
     common.npm([
-      "view"
-    , ".@0.0.0"
-    , "version"
-    , "--json"
-    , "--registry=" + common.registry
+      'view',
+      '.@0.0.0',
+      'version',
+      '--json',
+      '--registry=' + common.registry
     ], { cwd: t2dir }, function (err, code, stdout) {
-      t.ifError(err, "view command finished successfully")
-      t.equal(code, 0, "exit ok")
-      t.equal(stdout.trim(), "\"0.0.0\"", "should print `\"0.0.0\"`")
+      t.ifError(err, 'view command finished successfully')
+      t.equal(code, 0, 'exit ok')
+      t.equal(stdout.trim(), '"0.0.0"', 'should print `"0.0.0"`')
       s.close()
       t.end()
     })
   })
 })
 
-test("npm view <package name>", function (t) {
-  mr({port : common.port, plugin : plugin}, function (er, s) {
+test('npm view <package name>', function (t) {
+  mr({ port: common.port, plugin: plugin }, function (er, s) {
     common.npm([
-      "view"
-    , "underscore"
-    , "--registry=" + common.registry
+      'view',
+      'underscore',
+      '--registry=' + common.registry
     ], { cwd: t2dir }, function (err, code, stdout) {
-      t.ifError(err, "view command finished successfully")
-      t.equal(code, 0, "exit ok")
+      t.ifError(err, 'view command finished successfully')
+      t.equal(code, 0, 'exit ok')
       var re = new RegExp("name: 'underscore'")
-      t.similar(stdout, re, "should have name `underscore`")
+      t.similar(stdout, re, 'should have name `underscore`')
       s.close()
       t.end()
     })
   })
 })
 
-test("npm view <package name> --global", function(t) {
-  mr({port : common.port, plugin : plugin}, function (er, s) {
+test('npm view <package name> --global', function (t) {
+  mr({ port: common.port, plugin: plugin }, function (er, s) {
     common.npm([
-      "view"
-    , "underscore"
-    , "--global"
-    , "--registry=" + common.registry
-    ], { cwd: t2dir }, function(err, code, stdout) {
-      t.ifError(err, "view command finished successfully")
-      t.equal(code, 0, "exit ok")
+      'view',
+      'underscore',
+      '--global',
+      '--registry=' + common.registry
+    ], { cwd: t2dir }, function (err, code, stdout) {
+      t.ifError(err, 'view command finished successfully')
+      t.equal(code, 0, 'exit ok')
       var re = new RegExp("name: 'underscore'")
-      t.similar(stdout, re, "should have name `underscore`")
+      t.similar(stdout, re, 'should have name `underscore`')
       s.close()
       t.end()
     })
   })
 })
 
-test("npm view <package name> --json", function(t) {
+test('npm view <package name> --json', function (t) {
   t.plan(3)
-  mr({port : common.port, plugin : plugin}, function (er, s) {
+  mr({ port: common.port, plugin: plugin }, function (er, s) {
     common.npm([
-      "view"
-    , "underscore"
-    , "--json"
-    , "--registry=" + common.registry
+      'view',
+      'underscore',
+      '--json',
+      '--registry=' + common.registry
     ], { cwd: t2dir }, function (err, code, stdout) {
-      t.ifError(err, "view command finished successfully")
-      t.equal(code, 0, "exit ok")
+      t.ifError(err, 'view command finished successfully')
+      t.equal(code, 0, 'exit ok')
       s.close()
       try {
         var out = JSON.parse(stdout.trim())
         t.similar(out, {
-          maintainers: "jashkenas <jashkenas@gmail.com>"
-        }, "should have the same maintainer")
-      }
-      catch (er) {
-        t.fail("Unable to parse JSON")
+          maintainers: ['jashkenas <jashkenas@gmail.com>']
+        }, 'should have the same maintainer')
+      } catch (er) {
+        t.fail('Unable to parse JSON')
       }
     })
   })
 })
 
-test("npm view <package name> <field>", function (t) {
-  mr({port : common.port, plugin : plugin}, function (er, s) {
+test('npm view <package name> <field>', function (t) {
+  mr({ port: common.port, plugin: plugin }, function (er, s) {
     common.npm([
-      "view"
-    , "underscore"
-    , "homepage"
-    , "--registry=" + common.registry
+      'view',
+      'underscore',
+      'homepage',
+      '--registry=' + common.registry
     ], { cwd: t2dir }, function (err, code, stdout) {
-      t.ifError(err, "view command finished successfully")
-      t.equal(code, 0, "exit ok")
-      t.equal(stdout.trim(), "http://underscorejs.org",
-        "homepage should equal `http://underscorejs.org`")
+      t.ifError(err, 'view command finished successfully')
+      t.equal(code, 0, 'exit ok')
+      t.equal(stdout.trim(), 'http://underscorejs.org',
+        'homepage should equal `http://underscorejs.org`')
       s.close()
       t.end()
     })
   })
 })
 
-test("npm view with invalid package name", function (t) {
-  var invalidName = "InvalidPackage"
-      obj = {}
-  obj["/" + invalidName] = [404, {"error": "not found"}]
+test('npm view with invalid package name', function (t) {
+  var invalidName = 'InvalidPackage'
+  var obj = {}
+  obj['/' + invalidName] = [404, {'error': 'not found'}]
 
-  mr({port : common.port, mocks: {"get": obj}}, function (er, s) {
+  mr({ port: common.port, mocks: { 'get': obj } }, function (er, s) {
     common.npm([
-      "view"
-    , invalidName
-    , "--registry=" + common.registry
+      'view',
+      invalidName,
+      '--registry=' + common.registry
     ], {}, function (err, code, stdout, stderr) {
-      t.ifError(err, "view command finished successfully")
-      t.equal(code, 1, "exit not ok")
+      t.ifError(err, 'view command finished successfully')
+      t.equal(code, 1, 'exit not ok')
 
-      t.similar(stderr, new RegExp("is not in the npm registry"),
-        "Package should NOT be found")
+      t.similar(stderr, new RegExp('is not in the npm registry'),
+        'Package should NOT be found')
 
-      t.dissimilar(stderr, new RegExp("use the name yourself!"),
-        "Suggestion should not be there")
+      t.dissimilar(stderr, new RegExp('use the name yourself!'),
+        'Suggestion should not be there')
 
-      t.similar(stderr, new RegExp("name can no longer contain capital letters"),
-        "Suggestion about Capital letter should be there")
+      t.similar(stderr, new RegExp('name can no longer contain capital letters'),
+        'Suggestion about Capital letter should be there')
 
       s.close()
       t.end()
@@ -279,27 +278,26 @@ test("npm view with invalid package name", function (t) {
   })
 })
 
-
-test("npm view with valid but non existent package name", function (t) {
-  mr({port : common.port, mocks: {
-      "get": {
-          "/valid-but-non-existent-package" : [404, {"error": "not found"}]
+test('npm view with valid but non existent package name', function (t) {
+  mr({ port: common.port, mocks: {
+      'get': {
+          '/valid-but-non-existent-package': [404, {'error': 'not found'}]
       }
   }}, function (er, s) {
     common.npm([
-      "view"
-    , "valid-but-non-existent-package"
-    , "--registry=" + common.registry
+      'view',
+      'valid-but-non-existent-package',
+      '--registry=' + common.registry
     ], {}, function (err, code, stdout, stderr) {
-      t.ifError(err, "view command finished successfully")
-      t.equal(code, 1, "exit not ok")
+      t.ifError(err, 'view command finished successfully')
+      t.equal(code, 1, 'exit not ok')
 
       t.similar(stderr,
         new RegExp("'valid-but-non-existent-package' is not in the npm registry\."),
-        "Package should NOT be found")
+        'Package should NOT be found')
 
-      t.similar(stderr, new RegExp("use the name yourself!"),
-        "Suggestion should be there")
+      t.similar(stderr, new RegExp('use the name yourself!'),
+        'Suggestion should be there')
 
       s.close()
       t.end()
@@ -307,11 +305,11 @@ test("npm view with valid but non existent package name", function (t) {
   })
 })
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   process.chdir(osenv.tmpdir())
   rimraf.sync(t1dir)
   rimraf.sync(t2dir)
   rimraf.sync(t3dir)
-  t.pass("cleaned up")
+  t.pass('cleaned up')
   t.end()
 })
diff --git a/deps/npm/test/tap/whoami.js b/deps/npm/test/tap/whoami.js
index 558d0db9aefeb1..268e0f94feb095 100644
--- a/deps/npm/test/tap/whoami.js
+++ b/deps/npm/test/tap/whoami.js
@@ -1,55 +1,55 @@
-var common = require("../common-tap.js")
+var common = require('../common-tap.js')
 
-var fs = require("fs")
-var path = require("path")
-var createServer = require("http").createServer
+var fs = require('fs')
+var path = require('path')
+var createServer = require('http').createServer
 
-var test = require("tap").test
-var rimraf = require("rimraf")
+var test = require('tap').test
+var rimraf = require('rimraf')
 
 var opts = { cwd: __dirname }
 
-var FIXTURE_PATH = path.resolve(__dirname, "fixture_npmrc")
+var FIXTURE_PATH = path.resolve(__dirname, 'fixture_npmrc')
 
-test("npm whoami with basic auth", function (t) {
-  var s = "//registry.lvh.me/:username = wombat\n" +
-          "//registry.lvh.me/:_password = YmFkIHBhc3N3b3Jk\n" +
-          "//registry.lvh.me/:email = lindsay@wdu.org.au\n"
-  fs.writeFileSync(FIXTURE_PATH, s, "ascii")
-  fs.chmodSync(FIXTURE_PATH, "0444")
+test('npm whoami with basic auth', function (t) {
+  var s = '//registry.lvh.me/:username = wombat\n' +
+          '//registry.lvh.me/:_password = YmFkIHBhc3N3b3Jk\n' +
+          '//registry.lvh.me/:email = lindsay@wdu.org.au\n'
+  fs.writeFileSync(FIXTURE_PATH, s, 'ascii')
+  fs.chmodSync(FIXTURE_PATH, '0444')
 
   common.npm(
     [
-      "whoami",
-      "--userconfig=" + FIXTURE_PATH,
-      "--registry=http://registry.lvh.me/"
+      'whoami',
+      '--userconfig=' + FIXTURE_PATH,
+      '--registry=http://registry.lvh.me/'
     ],
     opts,
     function (err, code, stdout, stderr) {
       t.ifError(err)
 
-      t.equal(stderr, "", "got nothing on stderr")
-      t.equal(code, 0, "exit ok")
-      t.equal(stdout, "wombat\n", "got username")
+      t.equal(stderr, '', 'got nothing on stderr')
+      t.equal(code, 0, 'exit ok')
+      t.equal(stdout, 'wombat\n', 'got username')
       rimraf.sync(FIXTURE_PATH)
       t.end()
     }
   )
 })
 
-test("npm whoami with bearer auth", {timeout : 2 * 1000}, function (t) {
-  var s = "//localhost:" + common.port +
-          "/:_authToken = wombat-developers-union\n"
-  fs.writeFileSync(FIXTURE_PATH, s, "ascii")
-  fs.chmodSync(FIXTURE_PATH, "0444")
+test('npm whoami with bearer auth', { timeout: 2 * 1000 }, function (t) {
+  var s = '//localhost:' + common.port +
+          '/:_authToken = wombat-developers-union\n'
+  fs.writeFileSync(FIXTURE_PATH, s, 'ascii')
+  fs.chmodSync(FIXTURE_PATH, '0444')
 
-  function verify(req, res) {
-    t.equal(req.method, "GET")
-    t.equal(req.url, "/-/whoami")
+  function verify (req, res) {
+    t.equal(req.method, 'GET')
+    t.equal(req.url, '/-/whoami')
 
-    res.setHeader("content-type", "application/json")
+    res.setHeader('content-type', 'application/json')
     res.writeHeader(200)
-    res.end(JSON.stringify({username : "wombat"}), "utf8")
+    res.end(JSON.stringify({ username: 'wombat' }), 'utf8')
   }
 
   var server = createServer(verify)
@@ -57,17 +57,17 @@ test("npm whoami with bearer auth", {timeout : 2 * 1000}, function (t) {
   server.listen(common.port, function () {
     common.npm(
       [
-        "whoami",
-        "--userconfig=" + FIXTURE_PATH,
-        "--registry=http://localhost:" + common.port + "/"
+        'whoami',
+        '--userconfig=' + FIXTURE_PATH,
+        '--registry=http://localhost:' + common.port + '/'
       ],
       opts,
       function (err, code, stdout, stderr) {
         t.ifError(err)
 
-        t.equal(stderr, "", "got nothing on stderr")
-        t.equal(code, 0, "exit ok")
-        t.equal(stdout, "wombat\n", "got username")
+        t.equal(stderr, '', 'got nothing on stderr')
+        t.equal(code, 0, 'exit ok')
+        t.equal(stdout, 'wombat\n', 'got username')
         rimraf.sync(FIXTURE_PATH)
         server.close()
         t.end()
diff --git a/deps/npm/test/tap/zz-cleanup.js b/deps/npm/test/tap/zz-cleanup.js
index c491cbf0711f1c..e1020aa3b11b51 100644
--- a/deps/npm/test/tap/zz-cleanup.js
+++ b/deps/npm/test/tap/zz-cleanup.js
@@ -1,8 +1,8 @@
-var common = require("../common-tap")
-var test = require("tap").test
-var rimraf = require("rimraf")
+var common = require('../common-tap')
+var test = require('tap').test
+var rimraf = require('rimraf')
 
-test("cleanup", function (t) {
+test('cleanup', function (t) {
   rimraf.sync(common.npm_config_cache)
   t.end()
 })

From 718c304a4f781a183cc4c437b7c4373ab3ff530e Mon Sep 17 00:00:00 2001
From: Michael Dawson <michael_dawson@ca.ibm.com>
Date: Wed, 21 Oct 2015 16:40:27 -0400
Subject: [PATCH 042/323] v8: pull fix for builtin code size on PPC

Pull in the change that has been committed to v8 master in
https://codereview.chromium.org/1415463002/.  We are currently
cherry-picking into 4.6 and 4.7 but until next next v8 update
into Node Master I'd like to float it as it will make PPC LE
go green in the CI

Fixes: https://github.com/nodejs/node/issues/3390
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <ben@strongloop.com>
PR-URL: https://github.com/nodejs/node/pull/3474
---
 deps/v8/src/builtins.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/deps/v8/src/builtins.cc b/deps/v8/src/builtins.cc
index aa7268f6b6ccfb..31649d0fc27432 100644
--- a/deps/v8/src/builtins.cc
+++ b/deps/v8/src/builtins.cc
@@ -1430,6 +1430,9 @@ void Builtins::SetUp(Isolate* isolate, bool create_heap_objects) {
 #ifdef DEBUG
   // We can generate a lot of debug code on Arm64.
   const size_t buffer_size = 32*KB;
+#elif V8_TARGET_ARCH_PPC64
+  // 8 KB is insufficient on PPC64 when FLAG_debug_code is on.
+  const size_t buffer_size = 10 * KB;
 #else
   const size_t buffer_size = 8*KB;
 #endif

From cd245b12e08de19f5ad6c261cfc2a77bc880dfc6 Mon Sep 17 00:00:00 2001
From: Martii <thalamew@q.com>
Date: Wed, 7 Oct 2015 21:14:16 -0600
Subject: [PATCH 043/323] doc: clarify API buffer.concat

* Add a simple example for buffer.concat
* Change grammar slightly.

Fixes: #3219
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/3255
---
 doc/api/buffer.markdown | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/doc/api/buffer.markdown b/doc/api/buffer.markdown
index 0f3a2ff2f72c4d..c678c4a2da8b13 100644
--- a/doc/api/buffer.markdown
+++ b/doc/api/buffer.markdown
@@ -126,7 +126,7 @@ Example:
 ### Class Method: Buffer.concat(list[, totalLength])
 
 * `list` {Array} List of Buffer objects to concat
-* `totalLength` {Number} Total length of the buffers when concatenated
+* `totalLength` {Number} Total length of the buffers in the list when concatenated
 
 Returns a buffer which is the result of concatenating all the buffers in
 the list together.
@@ -138,6 +138,32 @@ If totalLength is not provided, it is read from the buffers in the list.
 However, this adds an additional loop to the function, so it is faster
 to provide the length explicitly.
 
+Example: build a single buffer from a list of three buffers:
+
+    var buf1 = new Buffer(10);
+    var buf2 = new Buffer(14);
+    var buf3 = new Buffer(18);
+
+    buf1.fill(0);
+    buf2.fill(0);
+    buf3.fill(0);
+
+    var buffers = [buf1, buf2, buf3];
+
+    var totalLength = 0;
+    for (var i = 0; i < buffers.length; i++) {
+      totalLength += buffers[i].length;
+    }
+
+    console.log(totalLength);
+    var bufA = Buffer.concat(buffers, totalLength);
+    console.log(bufA);
+    console.log(bufA.length);
+
+    // 42
+    // <Buffer 00 00 00 00 ...>
+    // 42
+
 ### Class Method: Buffer.compare(buf1, buf2)
 
 * `buf1` {Buffer}

From f76af49b13d03775843accd8a623b14eee7aef49 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <me@re-becca.org>
Date: Thu, 22 Oct 2015 17:19:31 -0700
Subject: [PATCH 044/323] deps: fix upgrade to npm 3.3.6

41923c0 broke things. This fixes them.

Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
PR-URL: https://github.com/nodejs/node/pull/3494
---
 deps/npm/node_modules/debug/.npmignore     |   6 +
 deps/npm/node_modules/debug/History.md     | 195 +++++++++++++++++++
 deps/npm/node_modules/debug/Makefile       |  36 ++++
 deps/npm/node_modules/debug/Readme.md      | 188 ++++++++++++++++++
 deps/npm/node_modules/debug/bower.json     |  28 +++
 deps/npm/node_modules/debug/browser.js     | 168 +++++++++++++++++
 deps/npm/node_modules/debug/component.json |  19 ++
 deps/npm/node_modules/debug/debug.js       | 197 +++++++++++++++++++
 deps/npm/node_modules/debug/node.js        | 209 +++++++++++++++++++++
 deps/npm/node_modules/debug/package.json   |  96 ++++++++++
 10 files changed, 1142 insertions(+)
 create mode 100644 deps/npm/node_modules/debug/.npmignore
 create mode 100644 deps/npm/node_modules/debug/History.md
 create mode 100644 deps/npm/node_modules/debug/Makefile
 create mode 100644 deps/npm/node_modules/debug/Readme.md
 create mode 100644 deps/npm/node_modules/debug/bower.json
 create mode 100644 deps/npm/node_modules/debug/browser.js
 create mode 100644 deps/npm/node_modules/debug/component.json
 create mode 100644 deps/npm/node_modules/debug/debug.js
 create mode 100644 deps/npm/node_modules/debug/node.js
 create mode 100644 deps/npm/node_modules/debug/package.json

diff --git a/deps/npm/node_modules/debug/.npmignore b/deps/npm/node_modules/debug/.npmignore
new file mode 100644
index 00000000000000..7e6163db02e5e7
--- /dev/null
+++ b/deps/npm/node_modules/debug/.npmignore
@@ -0,0 +1,6 @@
+support
+test
+examples
+example
+*.sock
+dist
diff --git a/deps/npm/node_modules/debug/History.md b/deps/npm/node_modules/debug/History.md
new file mode 100644
index 00000000000000..854c9711c6fd68
--- /dev/null
+++ b/deps/npm/node_modules/debug/History.md
@@ -0,0 +1,195 @@
+
+2.2.0 / 2015-05-09
+==================
+
+  * package: update "ms" to v0.7.1 (#202, @dougwilson)
+  * README: add logging to file example (#193, @DanielOchoa)
+  * README: fixed a typo (#191, @amir-s)
+  * browser: expose `storage` (#190, @stephenmathieson)
+  * Makefile: add a `distclean` target (#189, @stephenmathieson)
+
+2.1.3 / 2015-03-13
+==================
+
+  * Updated stdout/stderr example (#186)
+  * Updated example/stdout.js to match debug current behaviour
+  * Renamed example/stderr.js to stdout.js
+  * Update Readme.md (#184)
+  * replace high intensity foreground color for bold (#182, #183)
+
+2.1.2 / 2015-03-01
+==================
+
+  * dist: recompile
+  * update "ms" to v0.7.0
+  * package: update "browserify" to v9.0.3
+  * component: fix "ms.js" repo location
+  * changed bower package name
+  * updated documentation about using debug in a browser
+  * fix: security error on safari (#167, #168, @yields)
+
+2.1.1 / 2014-12-29
+==================
+
+  * browser: use `typeof` to check for `console` existence
+  * browser: check for `console.log` truthiness (fix IE 8/9)
+  * browser: add support for Chrome apps
+  * Readme: added Windows usage remarks
+  * Add `bower.json` to properly support bower install
+
+2.1.0 / 2014-10-15
+==================
+
+  * node: implement `DEBUG_FD` env variable support
+  * package: update "browserify" to v6.1.0
+  * package: add "license" field to package.json (#135, @panuhorsmalahti)
+
+2.0.0 / 2014-09-01
+==================
+
+  * package: update "browserify" to v5.11.0
+  * node: use stderr rather than stdout for logging (#29, @stephenmathieson)
+
+1.0.4 / 2014-07-15
+==================
+
+  * dist: recompile
+  * example: remove `console.info()` log usage
+  * example: add "Content-Type" UTF-8 header to browser example
+  * browser: place %c marker after the space character
+  * browser: reset the "content" color via `color: inherit`
+  * browser: add colors support for Firefox >= v31
+  * debug: prefer an instance `log()` function over the global one (#119)
+  * Readme: update documentation about styled console logs for FF v31 (#116, @wryk)
+
+1.0.3 / 2014-07-09
+==================
+
+  * Add support for multiple wildcards in namespaces (#122, @seegno)
+  * browser: fix lint
+
+1.0.2 / 2014-06-10
+==================
+
+  * browser: update color palette (#113, @gscottolson)
+  * common: make console logging function configurable (#108, @timoxley)
+  * node: fix %o colors on old node <= 0.8.x
+  * Makefile: find node path using shell/which (#109, @timoxley)
+
+1.0.1 / 2014-06-06
+==================
+
+  * browser: use `removeItem()` to clear localStorage
+  * browser, node: don't set DEBUG if namespaces is undefined (#107, @leedm777)
+  * package: add "contributors" section
+  * node: fix comment typo
+  * README: list authors
+
+1.0.0 / 2014-06-04
+==================
+
+  * make ms diff be global, not be scope
+  * debug: ignore empty strings in enable()
+  * node: make DEBUG_COLORS able to disable coloring
+  * *: export the `colors` array
+  * npmignore: don't publish the `dist` dir
+  * Makefile: refactor to use browserify
+  * package: add "browserify" as a dev dependency
+  * Readme: add Web Inspector Colors section
+  * node: reset terminal color for the debug content
+  * node: map "%o" to `util.inspect()`
+  * browser: map "%j" to `JSON.stringify()`
+  * debug: add custom "formatters"
+  * debug: use "ms" module for humanizing the diff
+  * Readme: add "bash" syntax highlighting
+  * browser: add Firebug color support
+  * browser: add colors for WebKit browsers
+  * node: apply log to `console`
+  * rewrite: abstract common logic for Node & browsers
+  * add .jshintrc file
+
+0.8.1 / 2014-04-14
+==================
+
+  * package: re-add the "component" section
+
+0.8.0 / 2014-03-30
+==================
+
+  * add `enable()` method for nodejs. Closes #27
+  * change from stderr to stdout
+  * remove unnecessary index.js file
+
+0.7.4 / 2013-11-13
+==================
+
+  * remove "browserify" key from package.json (fixes something in browserify)
+
+0.7.3 / 2013-10-30
+==================
+
+  * fix: catch localStorage security error when cookies are blocked (Chrome)
+  * add debug(err) support. Closes #46
+  * add .browser prop to package.json. Closes #42
+
+0.7.2 / 2013-02-06
+==================
+
+  * fix package.json
+  * fix: Mobile Safari (private mode) is broken with debug
+  * fix: Use unicode to send escape character to shell instead of octal to work with strict mode javascript
+
+0.7.1 / 2013-02-05
+==================
+
+  * add repository URL to package.json
+  * add DEBUG_COLORED to force colored output
+  * add browserify support
+  * fix component. Closes #24
+
+0.7.0 / 2012-05-04
+==================
+
+  * Added .component to package.json
+  * Added debug.component.js build
+
+0.6.0 / 2012-03-16
+==================
+
+  * Added support for "-" prefix in DEBUG [Vinay Pulim]
+  * Added `.enabled` flag to the node version [TooTallNate]
+
+0.5.0 / 2012-02-02
+==================
+
+  * Added: humanize diffs. Closes #8
+  * Added `debug.disable()` to the CS variant
+  * Removed padding. Closes #10
+  * Fixed: persist client-side variant again. Closes #9
+
+0.4.0 / 2012-02-01
+==================
+
+  * Added browser variant support for older browsers [TooTallNate]
+  * Added `debug.enable('project:*')` to browser variant [TooTallNate]
+  * Added padding to diff (moved it to the right)
+
+0.3.0 / 2012-01-26
+==================
+
+  * Added millisecond diff when isatty, otherwise UTC string
+
+0.2.0 / 2012-01-22
+==================
+
+  * Added wildcard support
+
+0.1.0 / 2011-12-02
+==================
+
+  * Added: remove colors unless stderr isatty [TooTallNate]
+
+0.0.1 / 2010-01-03
+==================
+
+  * Initial release
diff --git a/deps/npm/node_modules/debug/Makefile b/deps/npm/node_modules/debug/Makefile
new file mode 100644
index 00000000000000..5cf4a5962b8ba3
--- /dev/null
+++ b/deps/npm/node_modules/debug/Makefile
@@ -0,0 +1,36 @@
+
+# get Makefile directory name: http://stackoverflow.com/a/5982798/376773
+THIS_MAKEFILE_PATH:=$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
+THIS_DIR:=$(shell cd $(dir $(THIS_MAKEFILE_PATH));pwd)
+
+# BIN directory
+BIN := $(THIS_DIR)/node_modules/.bin
+
+# applications
+NODE ?= $(shell which node)
+NPM ?= $(NODE) $(shell which npm)
+BROWSERIFY ?= $(NODE) $(BIN)/browserify
+
+all: dist/debug.js
+
+install: node_modules
+
+clean:
+	@rm -rf dist
+
+dist:
+	@mkdir -p $@
+
+dist/debug.js: node_modules browser.js debug.js dist
+	@$(BROWSERIFY) \
+		--standalone debug \
+		. > $@
+
+distclean: clean
+	@rm -rf node_modules
+
+node_modules: package.json
+	@NODE_ENV= $(NPM) install
+	@touch node_modules
+
+.PHONY: all install clean distclean
diff --git a/deps/npm/node_modules/debug/Readme.md b/deps/npm/node_modules/debug/Readme.md
new file mode 100644
index 00000000000000..b4f45e3cc6a33a
--- /dev/null
+++ b/deps/npm/node_modules/debug/Readme.md
@@ -0,0 +1,188 @@
+# debug
+
+  tiny node.js debugging utility modelled after node core's debugging technique.
+
+## Installation
+
+```bash
+$ npm install debug
+```
+
+## Usage
+
+ With `debug` you simply invoke the exported function to generate your debug function, passing it a name which will determine if a noop function is returned, or a decorated `console.error`, so all of the `console` format string goodies you're used to work fine. A unique color is selected per-function for visibility.
+
+Example _app.js_:
+
+```js
+var debug = require('debug')('http')
+  , http = require('http')
+  , name = 'My App';
+
+// fake app
+
+debug('booting %s', name);
+
+http.createServer(function(req, res){
+  debug(req.method + ' ' + req.url);
+  res.end('hello\n');
+}).listen(3000, function(){
+  debug('listening');
+});
+
+// fake worker of some kind
+
+require('./worker');
+```
+
+Example _worker.js_:
+
+```js
+var debug = require('debug')('worker');
+
+setInterval(function(){
+  debug('doing some work');
+}, 1000);
+```
+
+ The __DEBUG__ environment variable is then used to enable these based on space or comma-delimited names. Here are some examples:
+
+  ![debug http and worker](http://f.cl.ly/items/18471z1H402O24072r1J/Screenshot.png)
+
+  ![debug worker](http://f.cl.ly/items/1X413v1a3M0d3C2c1E0i/Screenshot.png)
+
+#### Windows note
+
+ On Windows the environment variable is set using the `set` command.
+
+ ```cmd
+ set DEBUG=*,-not_this
+ ```
+
+Then, run the program to be debugged as usual.
+
+## Millisecond diff
+
+  When actively developing an application it can be useful to see when the time spent between one `debug()` call and the next. Suppose for example you invoke `debug()` before requesting a resource, and after as well, the "+NNNms" will show you how much time was spent between calls.
+
+  ![](http://f.cl.ly/items/2i3h1d3t121M2Z1A3Q0N/Screenshot.png)
+
+  When stdout is not a TTY, `Date#toUTCString()` is used, making it more useful for logging the debug information as shown below:
+
+  ![](http://f.cl.ly/items/112H3i0e0o0P0a2Q2r11/Screenshot.png)
+
+## Conventions
+
+ If you're using this in one or more of your libraries, you _should_ use the name of your library so that developers may toggle debugging as desired without guessing names. If you have more than one debuggers you _should_ prefix them with your library name and use ":" to separate features. For example "bodyParser" from Connect would then be "connect:bodyParser".
+
+## Wildcards
+
+  The `*` character may be used as a wildcard. Suppose for example your library has debuggers named "connect:bodyParser", "connect:compress", "connect:session", instead of listing all three with `DEBUG=connect:bodyParser,connect:compress,connect:session`, you may simply do `DEBUG=connect:*`, or to run everything using this module simply use `DEBUG=*`.
+
+  You can also exclude specific debuggers by prefixing them with a "-" character.  For example, `DEBUG=*,-connect:*` would include all debuggers except those starting with "connect:".
+
+## Browser support
+
+  Debug works in the browser as well, currently persisted by `localStorage`. Consider the situation shown below where you have `worker:a` and `worker:b`, and wish to debug both. Somewhere in the code on your page, include:
+
+```js
+window.myDebug = require("debug");
+```
+
+  ("debug" is a global object in the browser so we give this object a different name.) When your page is open in the browser, type the following in the console:
+
+```js
+myDebug.enable("worker:*")
+```
+
+  Refresh the page. Debug output will continue to be sent to the console until it is disabled by typing `myDebug.disable()` in the console.
+
+```js
+a = debug('worker:a');
+b = debug('worker:b');
+
+setInterval(function(){
+  a('doing some work');
+}, 1000);
+
+setInterval(function(){
+  b('doing some work');
+}, 1200);
+```
+
+#### Web Inspector Colors
+
+  Colors are also enabled on "Web Inspectors" that understand the `%c` formatting
+  option. These are WebKit web inspectors, Firefox ([since version
+  31](https://hacks.mozilla.org/2014/05/editable-box-model-multiple-selection-sublime-text-keys-much-more-firefox-developer-tools-episode-31/))
+  and the Firebug plugin for Firefox (any version).
+
+  Colored output looks something like:
+
+  ![](https://cloud.githubusercontent.com/assets/71256/3139768/b98c5fd8-e8ef-11e3-862a-f7253b6f47c6.png)
+
+### stderr vs stdout
+
+You can set an alternative logging method per-namespace by overriding the `log` method on a per-namespace or globally:
+
+Example _stdout.js_:
+
+```js
+var debug = require('debug');
+var error = debug('app:error');
+
+// by default stderr is used
+error('goes to stderr!');
+
+var log = debug('app:log');
+// set this namespace to log via console.log
+log.log = console.log.bind(console); // don't forget to bind to console!
+log('goes to stdout');
+error('still goes to stderr!');
+
+// set all output to go via console.info
+// overrides all per-namespace log settings
+debug.log = console.info.bind(console);
+error('now goes to stdout via console.info');
+log('still goes to stdout, but via console.info now');
+```
+
+### Save debug output to a file
+
+You can save all debug statements to a file by piping them.
+
+Example:
+
+```bash
+$ DEBUG_FD=3 node your-app.js 3> whatever.log
+```
+
+## Authors
+
+ - TJ Holowaychuk
+ - Nathan Rajlich
+
+## License
+
+(The MIT License)
+
+Copyright (c) 2014 TJ Holowaychuk &lt;tj@vision-media.ca&gt;
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/debug/bower.json b/deps/npm/node_modules/debug/bower.json
new file mode 100644
index 00000000000000..6af573ff5c260d
--- /dev/null
+++ b/deps/npm/node_modules/debug/bower.json
@@ -0,0 +1,28 @@
+{
+  "name": "visionmedia-debug",
+  "main": "dist/debug.js",
+  "version": "2.2.0",
+  "homepage": "https://github.com/visionmedia/debug",
+  "authors": [
+    "TJ Holowaychuk <tj@vision-media.ca>"
+  ],
+  "description": "visionmedia-debug",
+  "moduleType": [
+    "amd",
+    "es6",
+    "globals",
+    "node"
+  ],
+  "keywords": [
+    "visionmedia",
+    "debug"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ]
+}
diff --git a/deps/npm/node_modules/debug/browser.js b/deps/npm/node_modules/debug/browser.js
new file mode 100644
index 00000000000000..7c76452219939f
--- /dev/null
+++ b/deps/npm/node_modules/debug/browser.js
@@ -0,0 +1,168 @@
+
+/**
+ * This is the web browser implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
+
+exports = module.exports = require('./debug');
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
+exports.storage = 'undefined' != typeof chrome
+               && 'undefined' != typeof chrome.storage
+                  ? chrome.storage.local
+                  : localstorage();
+
+/**
+ * Colors.
+ */
+
+exports.colors = [
+  'lightseagreen',
+  'forestgreen',
+  'goldenrod',
+  'dodgerblue',
+  'darkorchid',
+  'crimson'
+];
+
+/**
+ * Currently only WebKit-based Web Inspectors, Firefox >= v31,
+ * and the Firebug extension (any Firefox version) are known
+ * to support "%c" CSS customizations.
+ *
+ * TODO: add a `localStorage` variable to explicitly enable/disable colors
+ */
+
+function useColors() {
+  // is webkit? http://stackoverflow.com/a/16459606/376773
+  return ('WebkitAppearance' in document.documentElement.style) ||
+    // is firebug? http://stackoverflow.com/a/398120/376773
+    (window.console && (console.firebug || (console.exception && console.table))) ||
+    // is firefox >= v31?
+    // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
+    (navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31);
+}
+
+/**
+ * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
+ */
+
+exports.formatters.j = function(v) {
+  return JSON.stringify(v);
+};
+
+
+/**
+ * Colorize log arguments if enabled.
+ *
+ * @api public
+ */
+
+function formatArgs() {
+  var args = arguments;
+  var useColors = this.useColors;
+
+  args[0] = (useColors ? '%c' : '')
+    + this.namespace
+    + (useColors ? ' %c' : ' ')
+    + args[0]
+    + (useColors ? '%c ' : ' ')
+    + '+' + exports.humanize(this.diff);
+
+  if (!useColors) return args;
+
+  var c = 'color: ' + this.color;
+  args = [args[0], c, 'color: inherit'].concat(Array.prototype.slice.call(args, 1));
+
+  // the final "%c" is somewhat tricky, because there could be other
+  // arguments passed either before or after the %c, so we need to
+  // figure out the correct index to insert the CSS into
+  var index = 0;
+  var lastC = 0;
+  args[0].replace(/%[a-z%]/g, function(match) {
+    if ('%%' === match) return;
+    index++;
+    if ('%c' === match) {
+      // we only are interested in the *last* %c
+      // (the user may have provided their own)
+      lastC = index;
+    }
+  });
+
+  args.splice(lastC, 0, c);
+  return args;
+}
+
+/**
+ * Invokes `console.log()` when available.
+ * No-op when `console.log` is not a "function".
+ *
+ * @api public
+ */
+
+function log() {
+  // this hackery is required for IE8/9, where
+  // the `console.log` function doesn't have 'apply'
+  return 'object' === typeof console
+    && console.log
+    && Function.prototype.apply.call(console.log, console, arguments);
+}
+
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
+
+function save(namespaces) {
+  try {
+    if (null == namespaces) {
+      exports.storage.removeItem('debug');
+    } else {
+      exports.storage.debug = namespaces;
+    }
+  } catch(e) {}
+}
+
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
+
+function load() {
+  var r;
+  try {
+    r = exports.storage.debug;
+  } catch(e) {}
+  return r;
+}
+
+/**
+ * Enable namespaces listed in `localStorage.debug` initially.
+ */
+
+exports.enable(load());
+
+/**
+ * Localstorage attempts to return the localstorage.
+ *
+ * This is necessary because safari throws
+ * when a user disables cookies/localstorage
+ * and you attempt to access it.
+ *
+ * @return {LocalStorage}
+ * @api private
+ */
+
+function localstorage(){
+  try {
+    return window.localStorage;
+  } catch (e) {}
+}
diff --git a/deps/npm/node_modules/debug/component.json b/deps/npm/node_modules/debug/component.json
new file mode 100644
index 00000000000000..ca1063724a4498
--- /dev/null
+++ b/deps/npm/node_modules/debug/component.json
@@ -0,0 +1,19 @@
+{
+  "name": "debug",
+  "repo": "visionmedia/debug",
+  "description": "small debugging utility",
+  "version": "2.2.0",
+  "keywords": [
+    "debug",
+    "log",
+    "debugger"
+  ],
+  "main": "browser.js",
+  "scripts": [
+    "browser.js",
+    "debug.js"
+  ],
+  "dependencies": {
+    "rauchg/ms.js": "0.7.1"
+  }
+}
diff --git a/deps/npm/node_modules/debug/debug.js b/deps/npm/node_modules/debug/debug.js
new file mode 100644
index 00000000000000..7571a86058aec0
--- /dev/null
+++ b/deps/npm/node_modules/debug/debug.js
@@ -0,0 +1,197 @@
+
+/**
+ * This is the common logic for both the Node.js and web browser
+ * implementations of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
+
+exports = module.exports = debug;
+exports.coerce = coerce;
+exports.disable = disable;
+exports.enable = enable;
+exports.enabled = enabled;
+exports.humanize = require('ms');
+
+/**
+ * The currently active debug mode names, and names to skip.
+ */
+
+exports.names = [];
+exports.skips = [];
+
+/**
+ * Map of special "%n" handling functions, for the debug "format" argument.
+ *
+ * Valid key names are a single, lowercased letter, i.e. "n".
+ */
+
+exports.formatters = {};
+
+/**
+ * Previously assigned color.
+ */
+
+var prevColor = 0;
+
+/**
+ * Previous log timestamp.
+ */
+
+var prevTime;
+
+/**
+ * Select a color.
+ *
+ * @return {Number}
+ * @api private
+ */
+
+function selectColor() {
+  return exports.colors[prevColor++ % exports.colors.length];
+}
+
+/**
+ * Create a debugger with the given `namespace`.
+ *
+ * @param {String} namespace
+ * @return {Function}
+ * @api public
+ */
+
+function debug(namespace) {
+
+  // define the `disabled` version
+  function disabled() {
+  }
+  disabled.enabled = false;
+
+  // define the `enabled` version
+  function enabled() {
+
+    var self = enabled;
+
+    // set `diff` timestamp
+    var curr = +new Date();
+    var ms = curr - (prevTime || curr);
+    self.diff = ms;
+    self.prev = prevTime;
+    self.curr = curr;
+    prevTime = curr;
+
+    // add the `color` if not set
+    if (null == self.useColors) self.useColors = exports.useColors();
+    if (null == self.color && self.useColors) self.color = selectColor();
+
+    var args = Array.prototype.slice.call(arguments);
+
+    args[0] = exports.coerce(args[0]);
+
+    if ('string' !== typeof args[0]) {
+      // anything else let's inspect with %o
+      args = ['%o'].concat(args);
+    }
+
+    // apply any `formatters` transformations
+    var index = 0;
+    args[0] = args[0].replace(/%([a-z%])/g, function(match, format) {
+      // if we encounter an escaped % then don't increase the array index
+      if (match === '%%') return match;
+      index++;
+      var formatter = exports.formatters[format];
+      if ('function' === typeof formatter) {
+        var val = args[index];
+        match = formatter.call(self, val);
+
+        // now we need to remove `args[index]` since it's inlined in the `format`
+        args.splice(index, 1);
+        index--;
+      }
+      return match;
+    });
+
+    if ('function' === typeof exports.formatArgs) {
+      args = exports.formatArgs.apply(self, args);
+    }
+    var logFn = enabled.log || exports.log || console.log.bind(console);
+    logFn.apply(self, args);
+  }
+  enabled.enabled = true;
+
+  var fn = exports.enabled(namespace) ? enabled : disabled;
+
+  fn.namespace = namespace;
+
+  return fn;
+}
+
+/**
+ * Enables a debug mode by namespaces. This can include modes
+ * separated by a colon and wildcards.
+ *
+ * @param {String} namespaces
+ * @api public
+ */
+
+function enable(namespaces) {
+  exports.save(namespaces);
+
+  var split = (namespaces || '').split(/[\s,]+/);
+  var len = split.length;
+
+  for (var i = 0; i < len; i++) {
+    if (!split[i]) continue; // ignore empty strings
+    namespaces = split[i].replace(/\*/g, '.*?');
+    if (namespaces[0] === '-') {
+      exports.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));
+    } else {
+      exports.names.push(new RegExp('^' + namespaces + '$'));
+    }
+  }
+}
+
+/**
+ * Disable debug output.
+ *
+ * @api public
+ */
+
+function disable() {
+  exports.enable('');
+}
+
+/**
+ * Returns true if the given mode name is enabled, false otherwise.
+ *
+ * @param {String} name
+ * @return {Boolean}
+ * @api public
+ */
+
+function enabled(name) {
+  var i, len;
+  for (i = 0, len = exports.skips.length; i < len; i++) {
+    if (exports.skips[i].test(name)) {
+      return false;
+    }
+  }
+  for (i = 0, len = exports.names.length; i < len; i++) {
+    if (exports.names[i].test(name)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * Coerce `val`.
+ *
+ * @param {Mixed} val
+ * @return {Mixed}
+ * @api private
+ */
+
+function coerce(val) {
+  if (val instanceof Error) return val.stack || val.message;
+  return val;
+}
diff --git a/deps/npm/node_modules/debug/node.js b/deps/npm/node_modules/debug/node.js
new file mode 100644
index 00000000000000..1d392a81d6c785
--- /dev/null
+++ b/deps/npm/node_modules/debug/node.js
@@ -0,0 +1,209 @@
+
+/**
+ * Module dependencies.
+ */
+
+var tty = require('tty');
+var util = require('util');
+
+/**
+ * This is the Node.js implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
+
+exports = module.exports = require('./debug');
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
+
+/**
+ * Colors.
+ */
+
+exports.colors = [6, 2, 3, 4, 5, 1];
+
+/**
+ * The file descriptor to write the `debug()` calls to.
+ * Set the `DEBUG_FD` env variable to override with another value. i.e.:
+ *
+ *   $ DEBUG_FD=3 node script.js 3>debug.log
+ */
+
+var fd = parseInt(process.env.DEBUG_FD, 10) || 2;
+var stream = 1 === fd ? process.stdout :
+             2 === fd ? process.stderr :
+             createWritableStdioStream(fd);
+
+/**
+ * Is stdout a TTY? Colored output is enabled when `true`.
+ */
+
+function useColors() {
+  var debugColors = (process.env.DEBUG_COLORS || '').trim().toLowerCase();
+  if (0 === debugColors.length) {
+    return tty.isatty(fd);
+  } else {
+    return '0' !== debugColors
+        && 'no' !== debugColors
+        && 'false' !== debugColors
+        && 'disabled' !== debugColors;
+  }
+}
+
+/**
+ * Map %o to `util.inspect()`, since Node doesn't do that out of the box.
+ */
+
+var inspect = (4 === util.inspect.length ?
+  // node <= 0.8.x
+  function (v, colors) {
+    return util.inspect(v, void 0, void 0, colors);
+  } :
+  // node > 0.8.x
+  function (v, colors) {
+    return util.inspect(v, { colors: colors });
+  }
+);
+
+exports.formatters.o = function(v) {
+  return inspect(v, this.useColors)
+    .replace(/\s*\n\s*/g, ' ');
+};
+
+/**
+ * Adds ANSI color escape codes if enabled.
+ *
+ * @api public
+ */
+
+function formatArgs() {
+  var args = arguments;
+  var useColors = this.useColors;
+  var name = this.namespace;
+
+  if (useColors) {
+    var c = this.color;
+
+    args[0] = '  \u001b[3' + c + ';1m' + name + ' '
+      + '\u001b[0m'
+      + args[0] + '\u001b[3' + c + 'm'
+      + ' +' + exports.humanize(this.diff) + '\u001b[0m';
+  } else {
+    args[0] = new Date().toUTCString()
+      + ' ' + name + ' ' + args[0];
+  }
+  return args;
+}
+
+/**
+ * Invokes `console.error()` with the specified arguments.
+ */
+
+function log() {
+  return stream.write(util.format.apply(this, arguments) + '\n');
+}
+
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
+
+function save(namespaces) {
+  if (null == namespaces) {
+    // If you set a process.env field to null or undefined, it gets cast to the
+    // string 'null' or 'undefined'. Just delete instead.
+    delete process.env.DEBUG;
+  } else {
+    process.env.DEBUG = namespaces;
+  }
+}
+
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
+
+function load() {
+  return process.env.DEBUG;
+}
+
+/**
+ * Copied from `node/src/node.js`.
+ *
+ * XXX: It's lame that node doesn't expose this API out-of-the-box. It also
+ * relies on the undocumented `tty_wrap.guessHandleType()` which is also lame.
+ */
+
+function createWritableStdioStream (fd) {
+  var stream;
+  var tty_wrap = process.binding('tty_wrap');
+
+  // Note stream._type is used for test-module-load-list.js
+
+  switch (tty_wrap.guessHandleType(fd)) {
+    case 'TTY':
+      stream = new tty.WriteStream(fd);
+      stream._type = 'tty';
+
+      // Hack to have stream not keep the event loop alive.
+      // See https://github.com/joyent/node/issues/1726
+      if (stream._handle && stream._handle.unref) {
+        stream._handle.unref();
+      }
+      break;
+
+    case 'FILE':
+      var fs = require('fs');
+      stream = new fs.SyncWriteStream(fd, { autoClose: false });
+      stream._type = 'fs';
+      break;
+
+    case 'PIPE':
+    case 'TCP':
+      var net = require('net');
+      stream = new net.Socket({
+        fd: fd,
+        readable: false,
+        writable: true
+      });
+
+      // FIXME Should probably have an option in net.Socket to create a
+      // stream from an existing fd which is writable only. But for now
+      // we'll just add this hack and set the `readable` member to false.
+      // Test: ./node test/fixtures/echo.js < /etc/passwd
+      stream.readable = false;
+      stream.read = null;
+      stream._type = 'pipe';
+
+      // FIXME Hack to have stream not keep the event loop alive.
+      // See https://github.com/joyent/node/issues/1726
+      if (stream._handle && stream._handle.unref) {
+        stream._handle.unref();
+      }
+      break;
+
+    default:
+      // Probably an error on in uv_guess_handle()
+      throw new Error('Implement me. Unknown stream file type!');
+  }
+
+  // For supporting legacy API we put the FD here.
+  stream.fd = fd;
+
+  stream._isStdio = true;
+
+  return stream;
+}
+
+/**
+ * Enable namespaces listed in `process.env.DEBUG` initially.
+ */
+
+exports.enable(load());
diff --git a/deps/npm/node_modules/debug/package.json b/deps/npm/node_modules/debug/package.json
new file mode 100644
index 00000000000000..aa5fea850b6f39
--- /dev/null
+++ b/deps/npm/node_modules/debug/package.json
@@ -0,0 +1,96 @@
+{
+  "_args": [
+    [
+      "debug@*",
+      "/Users/rebecca/code/npm/node_modules/array-index"
+    ]
+  ],
+  "_from": "debug@*",
+  "_id": "debug@2.2.0",
+  "_inCache": true,
+  "_location": "/debug",
+  "_nodeVersion": "0.12.2",
+  "_npmUser": {
+    "email": "nathan@tootallnate.net",
+    "name": "tootallnate"
+  },
+  "_npmVersion": "2.7.4",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "debug",
+    "raw": "debug@*",
+    "rawSpec": "*",
+    "scope": null,
+    "spec": "*",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/array-index"
+  ],
+  "_resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+  "_shasum": "f87057e995b1a1f6ae6a4960664137bc56f039da",
+  "_shrinkwrap": null,
+  "_spec": "debug@*",
+  "_where": "/Users/rebecca/code/npm/node_modules/array-index",
+  "author": {
+    "email": "tj@vision-media.ca",
+    "name": "TJ Holowaychuk"
+  },
+  "browser": "./browser.js",
+  "bugs": {
+    "url": "https://github.com/visionmedia/debug/issues"
+  },
+  "component": {
+    "scripts": {
+      "debug/debug.js": "debug.js",
+      "debug/index.js": "browser.js"
+    }
+  },
+  "contributors": [
+    {
+      "name": "Nathan Rajlich",
+      "email": "nathan@tootallnate.net",
+      "url": "http://n8.io"
+    }
+  ],
+  "dependencies": {
+    "ms": "0.7.1"
+  },
+  "description": "small debugging utility",
+  "devDependencies": {
+    "browserify": "9.0.3",
+    "mocha": "*"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "f87057e995b1a1f6ae6a4960664137bc56f039da",
+    "tarball": "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
+  },
+  "gitHead": "b38458422b5aa8aa6d286b10dfe427e8a67e2b35",
+  "homepage": "https://github.com/visionmedia/debug",
+  "keywords": [
+    "debug",
+    "debugger",
+    "log"
+  ],
+  "license": "MIT",
+  "main": "./node.js",
+  "maintainers": [
+    {
+      "name": "tjholowaychuk",
+      "email": "tj@vision-media.ca"
+    },
+    {
+      "name": "tootallnate",
+      "email": "nathan@tootallnate.net"
+    }
+  ],
+  "name": "debug",
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/visionmedia/debug.git"
+  },
+  "scripts": {},
+  "version": "2.2.0"
+}

From 2974debc6e7646bad4016dd3b97b040f3e872c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <mic.besace@gmail.com>
Date: Thu, 22 Oct 2015 10:36:00 +0200
Subject: [PATCH 045/323] deps: update V8 to 4.6.85.28

This update fixes a breaking regression in the date parser.

Ref: https://code.google.com/p/chromium/issues/detail?id=539813
Ref: https://code.google.com/p/chromium/issues/detail?id=543320
PR-URL: https://github.com/nodejs/node/pull/3484
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 deps/v8/include/v8-version.h                |   2 +-
 deps/v8/src/dateparser-inl.h                |  24 +++--
 deps/v8/src/dateparser.h                    |   4 +-
 deps/v8/test/mjsunit/date-parse.js          |   6 +-
 deps/v8/test/mjsunit/date.js                | 108 ++++++++++----------
 deps/v8/test/test262-es6/test262-es6.status |   3 +
 deps/v8/test/test262/test262.status         |   3 -
 deps/v8/tools/run-tests.py                  |  22 ++++
 8 files changed, 99 insertions(+), 73 deletions(-)

diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h
index 54fd822efe41ed..3cbc65c53aaa55 100644
--- a/deps/v8/include/v8-version.h
+++ b/deps/v8/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 4
 #define V8_MINOR_VERSION 6
 #define V8_BUILD_NUMBER 85
-#define V8_PATCH_LEVEL 25
+#define V8_PATCH_LEVEL 28
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
diff --git a/deps/v8/src/dateparser-inl.h b/deps/v8/src/dateparser-inl.h
index 8973aa0d4ff286..d405ab64935e49 100644
--- a/deps/v8/src/dateparser-inl.h
+++ b/deps/v8/src/dateparser-inl.h
@@ -23,9 +23,9 @@ bool DateParser::Parse(Vector<Char> str,
   DayComposer day;
 
   // Specification:
-  // Accept ES6 ISO 8601 date-time-strings or legacy dates compatible
+  // Accept ES5 ISO 8601 date-time-strings or legacy dates compatible
   // with Safari.
-  // ES6 ISO 8601 dates:
+  // ES5 ISO 8601 dates:
   //   [('-'|'+')yy]yyyy[-MM[-DD]][THH:mm[:ss[.sss]][Z|(+|-)hh:mm]]
   //   where yyyy is in the range 0000..9999 and
   //         +/-yyyyyy is in the range -999999..+999999 -
@@ -40,7 +40,8 @@ bool DateParser::Parse(Vector<Char> str,
   //         sss is in the range 000..999,
   //         hh is in the range 00..23,
   //         mm, ss, and sss default to 00 if missing, and
-  //         timezone defaults to local time if missing.
+  //         timezone defaults to Z if missing
+  //           (following Safari, ISO actually demands local time).
   //  Extensions:
   //   We also allow sss to have more or less than three digits (but at
   //   least one).
@@ -62,13 +63,15 @@ bool DateParser::Parse(Vector<Char> str,
   //  is allowed).
   // Intersection of the two:
   //  A string that matches both formats (e.g. 1970-01-01) will be
-  //  parsed as an ES6 date-time string.
-  //  After a valid "T" has been read while scanning an ES6 datetime string,
+  //  parsed as an ES5 date-time string - which means it will default
+  //  to UTC time-zone. That's unavoidable if following the ES5
+  //  specification.
+  //  After a valid "T" has been read while scanning an ES5 datetime string,
   //  the input can no longer be a valid legacy date, since the "T" is a
   //  garbage string after a number has been read.
 
-  // First try getting as far as possible with as ES6 Date Time String.
-  DateToken next_unhandled_token = ParseES6DateTime(&scanner, &day, &time, &tz);
+  // First try getting as far as possible with as ES5 Date Time String.
+  DateToken next_unhandled_token = ParseES5DateTime(&scanner, &day, &time, &tz);
   if (next_unhandled_token.IsInvalid()) return false;
   bool has_read_number = !day.IsEmpty();
   // If there's anything left, continue with the legacy parser.
@@ -193,7 +196,7 @@ DateParser::DateToken DateParser::DateStringTokenizer<CharType>::Scan() {
 
 
 template <typename Char>
-DateParser::DateToken DateParser::ParseES6DateTime(
+DateParser::DateToken DateParser::ParseES5DateTime(
     DateStringTokenizer<Char>* scanner,
     DayComposer* day,
     TimeComposer* time,
@@ -231,7 +234,7 @@ DateParser::DateToken DateParser::ParseES6DateTime(
   if (!scanner->Peek().IsKeywordType(TIME_SEPARATOR)) {
     if (!scanner->Peek().IsEndOfInput()) return scanner->Next();
   } else {
-    // ES6 Date Time String time part is present.
+    // ES5 Date Time String time part is present.
     scanner->Next();
     if (!scanner->Peek().IsFixedLengthNumber(2) ||
         !Between(scanner->Peek().number(), 0, 24)) {
@@ -297,7 +300,8 @@ DateParser::DateToken DateParser::ParseES6DateTime(
     }
     if (!scanner->Peek().IsEndOfInput()) return DateToken::Invalid();
   }
-  // Successfully parsed ES6 Date Time String.
+  // Successfully parsed ES5 Date Time String. Default to UTC if no TZ given.
+  if (tz->IsEmpty()) tz->Set(0);
   day->set_iso_date();
   return DateToken::EndOfInput();
 }
diff --git a/deps/v8/src/dateparser.h b/deps/v8/src/dateparser.h
index a9db8685d90466..aa57bb1c667f8e 100644
--- a/deps/v8/src/dateparser.h
+++ b/deps/v8/src/dateparser.h
@@ -368,13 +368,13 @@ class DateParser : public AllStatic {
     bool is_iso_date_;
   };
 
-  // Tries to parse an ES6 Date Time String. Returns the next token
+  // Tries to parse an ES5 Date Time String. Returns the next token
   // to continue with in the legacy date string parser. If parsing is
   // complete, returns DateToken::EndOfInput(). If terminally unsuccessful,
   // returns DateToken::Invalid(). Otherwise parsing continues in the
   // legacy parser.
   template <typename Char>
-  static DateParser::DateToken ParseES6DateTime(
+  static DateParser::DateToken ParseES5DateTime(
       DateStringTokenizer<Char>* scanner,
       DayComposer* day,
       TimeComposer* time,
diff --git a/deps/v8/test/mjsunit/date-parse.js b/deps/v8/test/mjsunit/date-parse.js
index 4cd8aa9c3eba0e..e623827df7b823 100644
--- a/deps/v8/test/mjsunit/date-parse.js
+++ b/deps/v8/test/mjsunit/date-parse.js
@@ -245,9 +245,9 @@ var testCasesES5Misc = [
     ['2000-01T08:00:00.099Z', 946713600099],
     ['2000-01T08:00:00.999Z', 946713600999],
     ['2000-01T00:00:00.001-08:00', 946713600001],
-    ['2000-01-01T24:00Z', 946771200000],
-    ['2000-01-01T24:00:00Z', 946771200000],
-    ['2000-01-01T24:00:00.000Z', 946771200000],
+    ['2000-01-01T24:00', 946771200000],
+    ['2000-01-01T24:00:00', 946771200000],
+    ['2000-01-01T24:00:00.000', 946771200000],
     ['2000-01-01T24:00:00.000Z', 946771200000]];
 
 var testCasesES5MiscNegative = [
diff --git a/deps/v8/test/mjsunit/date.js b/deps/v8/test/mjsunit/date.js
index adebbd141f704c..0fa23f8de169bf 100644
--- a/deps/v8/test/mjsunit/date.js
+++ b/deps/v8/test/mjsunit/date.js
@@ -203,110 +203,110 @@ assertEquals(-8640000000000000, Date.UTC(1970, 0, 1 - 100000001, 24));
 
 
 // Parsing ES5 ISO-8601 dates.
-// When TZ is omitted, it defaults to the local timezone
+// When TZ is omitted, it defaults to 'Z' meaning UTC.
 
 // Check epoch.
 assertEquals(0, Date.parse("1970-01-01T00:00:00.000+00:00"));
 assertEquals(0, Date.parse("1970-01-01T00:00:00.000-00:00"));
 assertEquals(0, Date.parse("1970-01-01T00:00:00.000Z"));
-assertEquals(0, Date.parse("1970-01-01T00:00:00.000Z"));
-assertEquals(0, Date.parse("1970-01-01T00:00:00Z"));
-assertEquals(0, Date.parse("1970-01-01T00:00Z"));
-assertEquals(0, Date.parse("1970-01-01Z"));
+assertEquals(0, Date.parse("1970-01-01T00:00:00.000"));
+assertEquals(0, Date.parse("1970-01-01T00:00:00"));
+assertEquals(0, Date.parse("1970-01-01T00:00"));
+assertEquals(0, Date.parse("1970-01-01"));
 
 assertEquals(0, Date.parse("1970-01T00:00:00.000+00:00"));
 assertEquals(0, Date.parse("1970-01T00:00:00.000-00:00"));
 assertEquals(0, Date.parse("1970-01T00:00:00.000Z"));
-assertEquals(0, Date.parse("1970-01T00:00:00.000Z"));
-assertEquals(0, Date.parse("1970-01T00:00:00Z"));
-assertEquals(0, Date.parse("1970-01T00:00Z"));
-assertEquals(0, Date.parse("1970-01Z"));
+assertEquals(0, Date.parse("1970-01T00:00:00.000"));
+assertEquals(0, Date.parse("1970-01T00:00:00"));
+assertEquals(0, Date.parse("1970-01T00:00"));
+assertEquals(0, Date.parse("1970-01"));
 
 assertEquals(0, Date.parse("1970T00:00:00.000+00:00"));
 assertEquals(0, Date.parse("1970T00:00:00.000-00:00"));
 assertEquals(0, Date.parse("1970T00:00:00.000Z"));
-assertEquals(0, Date.parse("1970T00:00:00.000Z"));
-assertEquals(0, Date.parse("1970T00:00:00Z"));
-assertEquals(0, Date.parse("1970T00:00Z"));
-assertEquals(0, Date.parse("1970Z"));
+assertEquals(0, Date.parse("1970T00:00:00.000"));
+assertEquals(0, Date.parse("1970T00:00:00"));
+assertEquals(0, Date.parse("1970T00:00"));
+assertEquals(0, Date.parse("1970"));
 
 assertEquals(0, Date.parse("+001970-01-01T00:00:00.000+00:00"));
 assertEquals(0, Date.parse("+001970-01-01T00:00:00.000-00:00"));
 assertEquals(0, Date.parse("+001970-01-01T00:00:00.000Z"));
-assertEquals(0, Date.parse("+001970-01-01T00:00:00.000Z"));
-assertEquals(0, Date.parse("+001970-01-01T00:00:00Z"));
-assertEquals(0, Date.parse("+001970-01-01T00:00Z"));
-assertEquals(0, Date.parse("+001970-01-01Z"));
+assertEquals(0, Date.parse("+001970-01-01T00:00:00.000"));
+assertEquals(0, Date.parse("+001970-01-01T00:00:00"));
+assertEquals(0, Date.parse("+001970-01-01T00:00"));
+assertEquals(0, Date.parse("+001970-01-01"));
 
 assertEquals(0, Date.parse("+001970-01T00:00:00.000+00:00"));
 assertEquals(0, Date.parse("+001970-01T00:00:00.000-00:00"));
 assertEquals(0, Date.parse("+001970-01T00:00:00.000Z"));
-assertEquals(0, Date.parse("+001970-01T00:00:00.000Z"));
-assertEquals(0, Date.parse("+001970-01T00:00:00Z"));
-assertEquals(0, Date.parse("+001970-01T00:00Z"));
-assertEquals(0, Date.parse("+001970-01Z"));
+assertEquals(0, Date.parse("+001970-01T00:00:00.000"));
+assertEquals(0, Date.parse("+001970-01T00:00:00"));
+assertEquals(0, Date.parse("+001970-01T00:00"));
+assertEquals(0, Date.parse("+001970-01"));
 
 assertEquals(0, Date.parse("+001970T00:00:00.000+00:00"));
 assertEquals(0, Date.parse("+001970T00:00:00.000-00:00"));
 assertEquals(0, Date.parse("+001970T00:00:00.000Z"));
-assertEquals(0, Date.parse("+001970T00:00:00.000Z"));
-assertEquals(0, Date.parse("+001970T00:00:00Z"));
-assertEquals(0, Date.parse("+001970T00:00Z"));
-assertEquals(0, Date.parse("+001970Z"));
+assertEquals(0, Date.parse("+001970T00:00:00.000"));
+assertEquals(0, Date.parse("+001970T00:00:00"));
+assertEquals(0, Date.parse("+001970T00:00"));
+assertEquals(0, Date.parse("+001970"));
 
 // Check random date.
 assertEquals(70671003500, Date.parse("1972-03-28T23:50:03.500+01:00"));
 assertEquals(70674603500, Date.parse("1972-03-28T23:50:03.500Z"));
-assertEquals(70674603500, Date.parse("1972-03-28T23:50:03.500Z"));
-assertEquals(70674603000, Date.parse("1972-03-28T23:50:03Z"));
-assertEquals(70674600000, Date.parse("1972-03-28T23:50Z"));
-assertEquals(70588800000, Date.parse("1972-03-28Z"));
+assertEquals(70674603500, Date.parse("1972-03-28T23:50:03.500"));
+assertEquals(70674603000, Date.parse("1972-03-28T23:50:03"));
+assertEquals(70674600000, Date.parse("1972-03-28T23:50"));
+assertEquals(70588800000, Date.parse("1972-03-28"));
 
 assertEquals(68338203500, Date.parse("1972-03T23:50:03.500+01:00"));
 assertEquals(68341803500, Date.parse("1972-03T23:50:03.500Z"));
-assertEquals(68341803500, Date.parse("1972-03T23:50:03.500Z"));
-assertEquals(68341803000, Date.parse("1972-03T23:50:03Z"));
-assertEquals(68341800000, Date.parse("1972-03T23:50Z"));
-assertEquals(68256000000, Date.parse("1972-03Z"));
+assertEquals(68341803500, Date.parse("1972-03T23:50:03.500"));
+assertEquals(68341803000, Date.parse("1972-03T23:50:03"));
+assertEquals(68341800000, Date.parse("1972-03T23:50"));
+assertEquals(68256000000, Date.parse("1972-03"));
 
 assertEquals(63154203500, Date.parse("1972T23:50:03.500+01:00"));
 assertEquals(63157803500, Date.parse("1972T23:50:03.500Z"));
-assertEquals(63157803500, Date.parse("1972T23:50:03.500Z"));
-assertEquals(63157803000, Date.parse("1972T23:50:03Z"));
-assertEquals(63072000000, Date.parse("1972Z"));
+assertEquals(63157803500, Date.parse("1972T23:50:03.500"));
+assertEquals(63157803000, Date.parse("1972T23:50:03"));
+assertEquals(63072000000, Date.parse("1972"));
 
 assertEquals(70671003500, Date.parse("+001972-03-28T23:50:03.500+01:00"));
 assertEquals(70674603500, Date.parse("+001972-03-28T23:50:03.500Z"));
-assertEquals(70674603500, Date.parse("+001972-03-28T23:50:03.500Z"));
-assertEquals(70674603000, Date.parse("+001972-03-28T23:50:03Z"));
-assertEquals(70674600000, Date.parse("+001972-03-28T23:50Z"));
-assertEquals(70588800000, Date.parse("+001972-03-28Z"));
+assertEquals(70674603500, Date.parse("+001972-03-28T23:50:03.500"));
+assertEquals(70674603000, Date.parse("+001972-03-28T23:50:03"));
+assertEquals(70674600000, Date.parse("+001972-03-28T23:50"));
+assertEquals(70588800000, Date.parse("+001972-03-28"));
 
 assertEquals(68338203500, Date.parse("+001972-03T23:50:03.500+01:00"));
 assertEquals(68341803500, Date.parse("+001972-03T23:50:03.500Z"));
-assertEquals(68341803500, Date.parse("+001972-03T23:50:03.500Z"));
-assertEquals(68341803000, Date.parse("+001972-03T23:50:03Z"));
-assertEquals(68341800000, Date.parse("+001972-03T23:50Z"));
-assertEquals(68256000000, Date.parse("+001972-03Z"));
+assertEquals(68341803500, Date.parse("+001972-03T23:50:03.500"));
+assertEquals(68341803000, Date.parse("+001972-03T23:50:03"));
+assertEquals(68341800000, Date.parse("+001972-03T23:50"));
+assertEquals(68256000000, Date.parse("+001972-03"));
 
 assertEquals(63154203500, Date.parse("+001972T23:50:03.500+01:00"));
 assertEquals(63157803500, Date.parse("+001972T23:50:03.500Z"));
-assertEquals(63157803500, Date.parse("+001972T23:50:03.500Z"));
-assertEquals(63157803000, Date.parse("+001972T23:50:03Z"));
-assertEquals(63072000000, Date.parse("+001972Z"));
+assertEquals(63157803500, Date.parse("+001972T23:50:03.500"));
+assertEquals(63157803000, Date.parse("+001972T23:50:03"));
+assertEquals(63072000000, Date.parse("+001972"));
 
 
 // Ensure that ISO-years in the range 00-99 aren't translated to the range
 // 1950..2049.
-assertEquals(-60904915200000, Date.parse("0040-01-01T00:00Z"));
-assertEquals(-60273763200000, Date.parse("0060-01-01T00:00Z"));
-assertEquals(-62167219200000, Date.parse("0000-01-01T00:00Z"));
-assertEquals(-62167219200000, Date.parse("+000000-01-01T00:00Z"));
+assertEquals(-60904915200000, Date.parse("0040-01-01"));
+assertEquals(-60273763200000, Date.parse("0060-01-01"));
+assertEquals(-62167219200000, Date.parse("0000-01-01"));
+assertEquals(-62167219200000, Date.parse("+000000-01-01"));
 
 // Test negative years.
-assertEquals(-63429523200000, Date.parse("-000040-01-01Z"));
-assertEquals(-64060675200000, Date.parse("-000060-01-01Z"));
-assertEquals(-124397510400000, Date.parse("-001972-01-01Z"));
+assertEquals(-63429523200000, Date.parse("-000040-01-01"));
+assertEquals(-64060675200000, Date.parse("-000060-01-01"));
+assertEquals(-124397510400000, Date.parse("-001972-01-01"));
 
 // Check time-zones.
 assertEquals(70674603500, Date.parse("1972-03-28T23:50:03.500Z"));
diff --git a/deps/v8/test/test262-es6/test262-es6.status b/deps/v8/test/test262-es6/test262-es6.status
index 16068bf0cacbe0..b01b46ece207bb 100644
--- a/deps/v8/test/test262-es6/test262-es6.status
+++ b/deps/v8/test/test262-es6/test262-es6.status
@@ -295,6 +295,9 @@
   'built-ins/Symbol/species/builtin-getter-name': [FAIL],
   'built-ins/Symbol/species/subclassing': [FAIL],
 
+  # https://code.google.com/p/v8/issues/detail?id=4242
+  'built-ins/Date/15.9.1.15-1': [FAIL],
+
   # https://code.google.com/p/v8/issues/detail?id=4004
   'built-ins/Date/prototype/setFullYear/15.9.5.40_1': [FAIL],
 
diff --git a/deps/v8/test/test262/test262.status b/deps/v8/test/test262/test262.status
index b9ef3c68f4f58e..feed1a320662db 100644
--- a/deps/v8/test/test262/test262.status
+++ b/deps/v8/test/test262/test262.status
@@ -281,9 +281,6 @@
   '15.2.3.13-1-3': [FAIL],
   '15.2.3.13-1-4': [FAIL],
 
-  # ES6 says for dates to default to the local timezone if none is specified
-  '15.9.1.15-1': [FAIL],
-
   ######################## NEEDS INVESTIGATION ###########################
 
   # These test failures are specific to the intl402 suite and need investigation
diff --git a/deps/v8/tools/run-tests.py b/deps/v8/tools/run-tests.py
index 971843cc678c44..516582ef0cbf75 100755
--- a/deps/v8/tools/run-tests.py
+++ b/deps/v8/tools/run-tests.py
@@ -57,6 +57,15 @@
 # expected runtimes (suites with slow test cases first). These groups are
 # invoked in seperate steps on the bots.
 TEST_MAP = {
+  "bot_default": [
+    "mjsunit",
+    "cctest",
+    "webkit",
+    "message",
+    "preparser",
+    "intl",
+    "unittests",
+  ],
   "default": [
     "mjsunit",
     "cctest",
@@ -80,6 +89,10 @@
 
 VARIANTS = ["default", "stress", "turbofan", "nocrankshaft"]
 
+EXHAUSTIVE_VARIANTS = VARIANTS + [
+  # TODO(machenbach): Add always opt turbo variant.
+]
+
 DEBUG_FLAGS = ["--nohard-abort", "--nodead-code-elimination",
                "--nofold-constants", "--enable-slow-asserts",
                "--debug-code", "--verify-heap"]
@@ -250,6 +263,9 @@ def BuildOptions():
                     default=False, dest="no_variants", action="store_true")
   result.add_option("--variants",
                     help="Comma-separated list of testing variants: %s" % VARIANTS)
+  result.add_option("--exhaustive-variants",
+                    default=False, action="store_true",
+                    help="Use exhaustive set of default variants.")
   result.add_option("--outdir", help="Base directory with compile output",
                     default="out")
   result.add_option("--predictable",
@@ -334,6 +350,7 @@ def BuildbotToV8Mode(config):
 
 def ProcessOptions(options):
   global ALL_VARIANTS
+  global EXHAUSTIVE_VARIANTS
   global VARIANTS
 
   # Architecture and mode related stuff.
@@ -385,6 +402,11 @@ def ProcessOptions(options):
   if options.novfp3:
     options.extra_flags.append("--noenable-vfp3")
 
+  if options.exhaustive_variants:
+    # This is used on many bots. It includes a larger set of default variants.
+    # Other options for manipulating variants still apply afterwards.
+    VARIANTS = EXHAUSTIVE_VARIANTS
+
   if options.msan:
     VARIANTS = ["default"]
 

From 70fca2a81e4e72946dd1586e821be0382060c1c2 Mon Sep 17 00:00:00 2001
From: Michael Dawson <michael_dawson@ca.ibm.com>
Date: Tue, 29 Sep 2015 10:22:00 -0400
Subject: [PATCH 046/323] build: Updates for AIX npm support - part 1

This PR is the first step enabling support for native modules
for AIX.  The main issue is that unlike linux where all
symbols within the Node executable are available to the shared
library for a native module (npm), on AIX the symbols must
be explicitly exported.  In addition, when the shared library is
built it must be linked using a list of the available symbols.

This patch covers the changes need to:

 1) Export the symbols when building the node executable
 2) Generate the file listing the symbols that can be used when
    building the shared library.

For AIX, it breaks the build process into 2 steps.  The first builds
a static library and then generates a node.exp file which contains
the symbols from that library.  The second builds the node executable
and uses the node.exp file to specify which symbols should be
exported.  In addition, it save the node.exp file so that it can
later be used in the creation of the shared library when building
a native module.

The following additional steps will be required in dependent projects
to fully enable AIX for native modules and are being worked
separately:

 - Updates to node-gyp to use node.exp when creating the
   shared library for a native module
 - Fixes to gyp related to copying files as covered in
      https://codereview.chromium.org/1368133002/patch/1/10001
 - Pulling in updated gyp versions to Node and node-gyp
 - Pulling latest libuv

These changes were done to minimize the change to other platforms
by working within the existing structure to add the 2 step process
for AIX without changing the process for other platforms.

PR-URL: https://github.com/nodejs/node/pull/3114
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 configure               |  4 ++++
 node.gyp                | 53 +++++++++++++++++++++++++++++++++++++++--
 tools/create_expfile.sh | 48 +++++++++++++++++++++++++++++++++++++
 tools/install.py        |  4 ++++
 4 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100755 tools/create_expfile.sh

diff --git a/configure b/configure
index d4aff36268ed93..2e4cc087c14aee 100755
--- a/configure
+++ b/configure
@@ -675,6 +675,10 @@ def configure_node(o):
   elif target_arch in ('mips', 'mipsel'):
     configure_mips(o)
 
+  if flavor == 'aix':
+    o['variables']['node_core_target_name'] = 'node_base'
+    o['variables']['node_target_type'] = 'static_library'
+
   if flavor in ('solaris', 'mac', 'linux', 'freebsd'):
     use_dtrace = not options.without_dtrace
     # Don't enable by default on linux and freebsd
diff --git a/node.gyp b/node.gyp
index b35c8a508a7589..e63e750414ee60 100644
--- a/node.gyp
+++ b/node.gyp
@@ -13,6 +13,7 @@
     'node_shared_openssl%': 'false',
     'node_v8_options%': '',
     'node_target_type%': 'executable',
+    'node_core_target_name%': 'node',
     'library_files': [
       'src/node.js',
       'lib/_debug_agent.js',
@@ -81,7 +82,7 @@
 
   'targets': [
     {
-      'target_name': 'node',
+      'target_name': '<(node_core_target_name)',
       'type': '<(node_target_type)',
 
       'dependencies': [
@@ -673,5 +674,53 @@
         'test/cctest/util.cc',
       ],
     }
-  ] # end targets
+  ], # end targets
+
+  'conditions': [
+    ['OS=="aix"', {
+      'targets': [
+        {
+          'target_name': 'node',
+          'type': 'executable',
+          'dependencies': ['<(node_core_target_name)', 'node_exp'],
+
+          'include_dirs': [
+            'src',
+            'deps/v8/include',
+          ],
+
+          'sources': [
+            'src/node_main.cc',
+            '<@(library_files)',
+            # node.gyp is added to the project by default.
+            'common.gypi',
+          ],
+
+          'ldflags': ['-Wl,-bbigtoc,-bE:<(PRODUCT_DIR)/node.exp'],
+        },
+        {
+          'target_name': 'node_exp',
+          'type': 'none',
+          'dependencies': [
+            '<(node_core_target_name)',
+          ],
+          'actions': [
+            {
+              'action_name': 'expfile',
+              'inputs': [
+                '<(OBJ_DIR)'
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/node.exp'
+              ],
+              'action': [
+                'sh', 'tools/create_expfile.sh',
+                      '<@(_inputs)', '<@(_outputs)'
+              ],
+            }
+          ]
+        }
+      ], # end targets
+    }], # end aix section
+  ], # end conditions block
 }
diff --git a/tools/create_expfile.sh b/tools/create_expfile.sh
new file mode 100755
index 00000000000000..ff4420a9e87218
--- /dev/null
+++ b/tools/create_expfile.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+# This script writes out all the exported symbols to a file
+# AIX needs this as sybmols are not exported by an
+# executable by default and we need to list
+# them specifically in order to export them
+# so that they can be used by native add-ons
+#
+# The raw symbol data is objtained by using nm on
+# the .a files which make up the node executable
+#
+# -Xany makes sure we get symbols on both
+# 32 bit and 64 bit as by default we'd only get those
+# for 32 bit
+#
+# -g selects only exported symbols
+#
+# -C, -B and -p ensure the output is in a format we
+# can easily parse and convert into the symbol we need
+#
+# -C suppresses the demangling of C++ names
+# -B gives us output in BSD format
+# -p displays the info in a standard portable output format
+#
+# We only include symbols if they are of the
+# following types and don't start with a dot.
+#
+# T - Global text symbol
+# D - Global data symbol
+# B - Gobal bss symbol.
+#
+# the final sort allows us to remove any duplicates
+#
+# We need to exclude gtest libraries as they are not
+# linked into the node executable
+#
+echo "Searching $1 to write out expfile to $2"
+
+# this special sequence must be at the start of the exp file
+echo "#!." > $2
+
+# pull the symbols from the .a files
+find $1 -name "*.a" | grep -v gtest \
+  | xargs nm -Xany -BCpg \
+  | awk '{
+      if ((($2 == "T") || ($2 == "D") || ($2 == "B")) &&
+          (substr($3,1,1) != ".")) { print $3 }
+    }' \
+  | sort -u >> $2
diff --git a/tools/install.py b/tools/install.py
index ff460bbc0f8306..cb86c65699df88 100755
--- a/tools/install.py
+++ b/tools/install.py
@@ -160,6 +160,10 @@ def headers(action):
     'src/node_version.h',
   ], 'include/node/')
 
+  # Add the expfile that is created on AIX
+  if sys.platform.startswith('aix'):
+    action(['out/Release/node.exp'], 'include/node/')
+
   subdir_files('deps/cares/include', 'include/node/', action)
   subdir_files('deps/v8/include', 'include/node/', action)
 

From 08da5c2a06d3d90c79272b748b27d24397361b77 Mon Sep 17 00:00:00 2001
From: Michael Dawson <michael_dawson@ca.ibm.com>
Date: Thu, 22 Oct 2015 16:15:33 -0400
Subject: [PATCH 047/323] test: disable test-tick-processor - aix and be ppc

This test is already partially disabled for several platforms with
the comment that the required info is not provided at the C++ level.
I'm adding AIX as and PPC BE linux as they currently fall into
the same category.  We are working to see if we can change that
in v8 but it will be non-trivial if is possible at all so I don't
want to leave the CI with failing tests until that point.

PR-URL: https://github.com/nodejs/node/pull/3491
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
---
 test/common.js                       | 5 +++++
 test/parallel/test-tick-processor.js | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/test/common.js b/test/common.js
index b4aa4edaf3dca0..b7ddaf92b482b7 100644
--- a/test/common.js
+++ b/test/common.js
@@ -14,6 +14,11 @@ exports.tmpDirName = 'tmp';
 exports.PORT = +process.env.NODE_COMMON_PORT || 12346;
 exports.isWindows = process.platform === 'win32';
 exports.isAix = process.platform === 'aix';
+exports.isLinuxPPCBE = (process.platform === 'linux') &&
+                       (process.arch === 'ppc64') &&
+                       (os.endianness() === 'BE');
+exports.isSunOS = process.platform === 'sunos';
+exports.isFreeBSD = process.platform === 'freebsd';
 
 function rimrafSync(p) {
   try {
diff --git a/test/parallel/test-tick-processor.js b/test/parallel/test-tick-processor.js
index cd110e1a87ed3d..65da7362d9a915 100644
--- a/test/parallel/test-tick-processor.js
+++ b/test/parallel/test-tick-processor.js
@@ -20,9 +20,11 @@ runTest(/LazyCompile.*\[eval\]:1|.*%  UNKNOWN/,
    };
    setTimeout(function() { process.exit(0); }, 2000);
    f();`);
-if (process.platform === 'win32' ||
-    process.platform === 'sunos' ||
-    process.platform === 'freebsd') {
+if (common.isWindows ||
+    common.isSunOS ||
+    common.isAix ||
+    common.isLinuxPPCBE ||
+    common.isFreeBSD) {
   console.log('1..0 # Skipped: C++ symbols are not mapped for this os.');
   return;
 }

From cd83f7ed7fd90c29d65ffbcc89f2b554332eaf41 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Thu, 22 Oct 2015 01:30:19 +0200
Subject: [PATCH 048/323] test: add node::MakeCallback() test coverage

PR-URL: https://github.com/nodejs/node/pull/3478
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 test/addons/make-callback/binding.cc  | 40 ++++++++++++++++++
 test/addons/make-callback/binding.gyp |  8 ++++
 test/addons/make-callback/test.js     | 61 +++++++++++++++++++++++++++
 3 files changed, 109 insertions(+)
 create mode 100644 test/addons/make-callback/binding.cc
 create mode 100644 test/addons/make-callback/binding.gyp
 create mode 100644 test/addons/make-callback/test.js

diff --git a/test/addons/make-callback/binding.cc b/test/addons/make-callback/binding.cc
new file mode 100644
index 00000000000000..3012a39ff70a73
--- /dev/null
+++ b/test/addons/make-callback/binding.cc
@@ -0,0 +1,40 @@
+#include "node.h"
+#include "v8.h"
+
+#include "../../../src/util.h"
+
+#include <vector>
+
+namespace {
+
+void MakeCallback(const v8::FunctionCallbackInfo<v8::Value>& args) {
+  CHECK(args[0]->IsObject());
+  CHECK(args[1]->IsFunction() || args[1]->IsString());
+  auto isolate = args.GetIsolate();
+  auto recv = args[0].As<v8::Object>();
+  std::vector<v8::Local<v8::Value>> argv;
+  for (size_t n = 2; n < static_cast<size_t>(args.Length()); n += 1) {
+    argv.push_back(args[n]);
+  }
+  v8::Local<v8::Value> result;
+  if (args[1]->IsFunction()) {
+    auto method = args[1].As<v8::Function>();
+    result =
+        node::MakeCallback(isolate, recv, method, argv.size(), argv.data());
+  } else if (args[1]->IsString()) {
+    auto method = args[1].As<v8::String>();
+    result =
+        node::MakeCallback(isolate, recv, method, argv.size(), argv.data());
+  } else {
+    UNREACHABLE();
+  }
+  args.GetReturnValue().Set(result);
+}
+
+void Initialize(v8::Local<v8::Object> target) {
+  NODE_SET_METHOD(target, "makeCallback", MakeCallback);
+}
+
+}  // namespace anonymous
+
+NODE_MODULE(binding, Initialize)
diff --git a/test/addons/make-callback/binding.gyp b/test/addons/make-callback/binding.gyp
new file mode 100644
index 00000000000000..3bfb84493f3e87
--- /dev/null
+++ b/test/addons/make-callback/binding.gyp
@@ -0,0 +1,8 @@
+{
+  'targets': [
+    {
+      'target_name': 'binding',
+      'sources': [ 'binding.cc' ]
+    }
+  ]
+}
diff --git a/test/addons/make-callback/test.js b/test/addons/make-callback/test.js
new file mode 100644
index 00000000000000..80ea0db796ab30
--- /dev/null
+++ b/test/addons/make-callback/test.js
@@ -0,0 +1,61 @@
+'use strict';
+
+const common = require('../../common');
+const assert = require('assert');
+const vm = require('vm');
+const binding = require('./build/Release/binding');
+const makeCallback = binding.makeCallback;
+
+assert.strictEqual(42, makeCallback(process, common.mustCall(function() {
+  assert.strictEqual(0, arguments.length);
+  assert.strictEqual(this, process);
+  return 42;
+})));
+
+assert.strictEqual(42, makeCallback(process, common.mustCall(function(x) {
+  assert.strictEqual(1, arguments.length);
+  assert.strictEqual(this, process);
+  assert.strictEqual(x, 1337);
+  return 42;
+}), 1337));
+
+const recv = {
+  one: common.mustCall(function() {
+    assert.strictEqual(0, arguments.length);
+    assert.strictEqual(this, recv);
+    return 42;
+  }),
+  two: common.mustCall(function(x) {
+    assert.strictEqual(1, arguments.length);
+    assert.strictEqual(this, recv);
+    assert.strictEqual(x, 1337);
+    return 42;
+  }),
+};
+
+assert.strictEqual(42, makeCallback(recv, 'one'));
+assert.strictEqual(42, makeCallback(recv, 'two', 1337));
+
+// Check that the callback is made in the context of the receiver.
+const target = vm.runInNewContext(`
+    (function($Object) {
+      if (Object === $Object)
+        throw Error('bad');
+      return Object;
+    })
+`);
+assert.notStrictEqual(Object, makeCallback(process, target, Object));
+
+// Runs in inner context.
+const forward = vm.runInNewContext(`
+    (function(forward) {
+      return forward(Object);
+    })
+`);
+// Runs in outer context.
+const endpoint = function($Object) {
+  if (Object === $Object)
+    throw Error('bad');
+  return Object;
+};
+assert.strictEqual(Object, makeCallback(process, forward, endpoint));

From 1a41feb559bd907ca0640b979909cdb0448c3064 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Fri, 23 Oct 2015 19:10:49 +0200
Subject: [PATCH 049/323] buffer: don't CHECK on zero-sized realloc

malloc(0) and realloc(ptr, 0) have implementation-defined behavior in
that the standard allows them to either return a unique pointer or a
nullptr for zero-sized allocation requests.  Normalize by always using
a nullptr.

Fixes: https://github.com/nodejs/node/issues/3496
PR-URL: https://github.com/nodejs/node/pull/3499
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 src/node_buffer.cc           | 30 +++++++++++++++++++++---------
 test/parallel/test-buffer.js |  3 +++
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/node_buffer.cc b/src/node_buffer.cc
index a472d0c95e9225..7d428b2b134b51 100644
--- a/src/node_buffer.cc
+++ b/src/node_buffer.cc
@@ -211,18 +211,30 @@ MaybeLocal<Object> New(Isolate* isolate,
                        enum encoding enc) {
   EscapableHandleScope scope(isolate);
 
-  size_t length = StringBytes::Size(isolate, string, enc);
-  char* data = static_cast<char*>(malloc(length));
+  const size_t length = StringBytes::Size(isolate, string, enc);
+  size_t actual = 0;
+  char* data = nullptr;
+
+  // malloc(0) and realloc(ptr, 0) have implementation-defined behavior in
+  // that the standard allows them to either return a unique pointer or a
+  // nullptr for zero-sized allocation requests.  Normalize by always using
+  // a nullptr.
+  if (length > 0) {
+    data = static_cast<char*>(malloc(length));
 
-  if (data == nullptr)
-    return Local<Object>();
+    if (data == nullptr)
+      return Local<Object>();
 
-  size_t actual = StringBytes::Write(isolate, data, length, string, enc);
-  CHECK(actual <= length);
+    actual = StringBytes::Write(isolate, data, length, string, enc);
+    CHECK(actual <= length);
 
-  if (actual < length) {
-    data = static_cast<char*>(realloc(data, actual));
-    CHECK_NE(data, nullptr);
+    if (actual == 0) {
+      free(data);
+      data = nullptr;
+    } else if (actual < length) {
+      data = static_cast<char*>(realloc(data, actual));
+      CHECK_NE(data, nullptr);
+    }
   }
 
   Local<Object> buf;
diff --git a/test/parallel/test-buffer.js b/test/parallel/test-buffer.js
index 1be4f3b8424352..37c9e6431e9c86 100644
--- a/test/parallel/test-buffer.js
+++ b/test/parallel/test-buffer.js
@@ -550,6 +550,9 @@ for (var i = 0; i < segments.length; ++i) {
 }
 assert.equal(b.toString('binary', 0, pos), 'Madness?! This is node.js!');
 
+// Regression test for https://github.com/nodejs/node/issues/3496.
+assert.equal(Buffer('=bad'.repeat(1e4), 'base64').length, 0);
+
 // Creating buffers larger than pool size.
 var l = Buffer.poolSize + 5;
 var s = '';

From 7added3b39f13c89aee72491be3d082c2bc56250 Mon Sep 17 00:00:00 2001
From: Evan Lucas <evanlucas@me.com>
Date: Thu, 22 Oct 2015 06:58:26 -0500
Subject: [PATCH 050/323] fs: pass err to callback if buffer is too big

In fs.readFile, if an encoding is specified and toString fails, do not
throw an error. Instead, pass the error to the callback.

Fixes: https://github.com/nodejs/node/issues/2767
PR-URL: https://github.com/nodejs/node/pull/3485
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 lib/fs.js                                     | 18 +++++--
 .../test-fs-readfile-tostring-fail.js         | 52 +++++++++++++++++++
 2 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 test/parallel/test-fs-readfile-tostring-fail.js

diff --git a/lib/fs.js b/lib/fs.js
index 76873be14ab3de..6345497c4f2c48 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -395,12 +395,24 @@ function readFileAfterClose(err) {
   else
     buffer = context.buffer;
 
-  if (context.encoding)
-    buffer = buffer.toString(context.encoding);
+  if (err) return callback(err, buffer);
 
-  callback(err, buffer);
+  if (context.encoding) {
+    return tryToString(buffer, context.encoding, callback);
+  }
+
+  callback(null, buffer);
 }
 
+function tryToString(buf, encoding, callback) {
+  var e;
+  try {
+    buf = buf.toString(encoding);
+  } catch (err) {
+    e = err;
+  }
+  callback(e, buf);
+}
 
 fs.readFileSync = function(path, options) {
   if (!options) {
diff --git a/test/parallel/test-fs-readfile-tostring-fail.js b/test/parallel/test-fs-readfile-tostring-fail.js
new file mode 100644
index 00000000000000..b5c4ea8f7a0b17
--- /dev/null
+++ b/test/parallel/test-fs-readfile-tostring-fail.js
@@ -0,0 +1,52 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const fs = require('fs');
+const path = require('path');
+const kStringMaxLength = process.binding('buffer').kStringMaxLength;
+
+common.refreshTmpDir();
+
+const file = path.join(common.tmpDir, 'toobig.txt');
+const stream = fs.createWriteStream(file, {
+  flags: 'a'
+});
+
+const size = kStringMaxLength / 200;
+const a = new Buffer(size).fill('a');
+
+for (var i = 0; i < 201; i++) {
+  stream.write(a);
+}
+
+stream.end();
+stream.on('finish', common.mustCall(function() {
+  // make sure that the toString does not throw an error
+  fs.readFile(file, 'utf8', common.mustCall(function(err, buf) {
+    assert.ok(err instanceof Error);
+    assert.strictEqual('toString failed', err.message);
+  }));
+}));
+
+function destroy() {
+  try {
+    fs.unlinkSync(file);
+  } catch (err) {
+    // it may not exist
+  }
+}
+
+process.on('exit', destroy);
+
+process.on('SIGINT', function() {
+  destroy();
+  process.exit();
+});
+
+// To make sure we don't leave a very large file
+// on test machines in the event this test fails.
+process.on('uncaughtException', function(err) {
+  destroy();
+  throw err;
+});

From 60de9f8d7bf746c5573cb8e25325e265e3b5455d Mon Sep 17 00:00:00 2001
From: Myles Borins <mborins@us.ibm.com>
Date: Tue, 20 Oct 2015 11:40:54 -0700
Subject: [PATCH 051/323] test: wrap assert.fail when passed to callback

Currently there are many instances where assert.fail is directly passed
to a callback for error handling. Unfortunately this will swallow the
error as it is the third argument of assert.fail that sets the message
not the first.

This commit adds a new function to test/common.js that simply wraps
assert.fail and calls it with the provided message.

Tip of the hat to @trott for pointing me in the direction of this.

PR-URL: https://github.com/nodejs/node/pull/3453
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
---
 test/common.js                                |  4 +++
 .../test-child-process-recv-handle.js         |  2 +-
 .../test-child-process-spawn-typeerror.js     |  2 +-
 .../test-cluster-bind-privileged-port.js      |  4 +--
 test/parallel/test-cluster-bind-twice.js      |  6 ++--
 test/parallel/test-cluster-eaddrinuse.js      |  8 +++---
 test/parallel/test-cluster-net-listen.js      |  2 +-
 test/parallel/test-cluster-rr-ref.js          |  2 +-
 .../test-cluster-setup-master-argv.js         |  2 +-
 .../test-cluster-shared-handle-bind-error.js  |  6 ++--
 ...ster-shared-handle-bind-privileged-port.js |  4 +--
 test/parallel/test-crypto-pbkdf2.js           |  8 +++---
 .../test-dgram-error-message-address.js       |  4 +--
 test/parallel/test-dgram-oob-buffer.js        | 12 ++++----
 .../test-event-emitter-remove-listeners.js    |  2 +-
 test/parallel/test-fs-null-bytes.js           |  6 ++--
 test/parallel/test-fs-read-stream-err.js      |  2 +-
 .../test-http-client-unescaped-path.js        |  2 +-
 test/parallel/test-http-set-trailers.js       |  2 +-
 test/parallel/test-https-timeout-server-2.js  |  2 +-
 test/parallel/test-https-timeout-server.js    |  2 +-
 test/parallel/test-listen-fd-ebadf.js         |  4 +--
 ...t-net-better-error-messages-listen-path.js |  4 +--
 .../test-net-better-error-messages-listen.js  |  4 +--
 .../test-net-better-error-messages-path.js    |  2 +-
 ...net-better-error-messages-port-hostname.js |  2 +-
 .../test-net-better-error-messages-port.js    |  2 +-
 test/parallel/test-net-dns-lookup-skip.js     |  2 +-
 test/parallel/test-net-listen-fd0.js          |  2 +-
 .../test-promises-unhandled-rejections.js     | 28 +++++++++----------
 ...-timers-unref-remove-other-unref-timers.js |  2 +-
 test/parallel/test-tls-cipher-list.js         |  4 +--
 test/parallel/test-tls-no-sslv3.js            |  2 +-
 test/parallel/test-tls-timeout-server.js      |  2 +-
 test/parallel/test-vm-debug-context.js        |  8 +++---
 test/pummel/test-fs-watch-non-recursive.js    |  2 +-
 .../sequential/test-cluster-listening-port.js |  4 +--
 37 files changed, 81 insertions(+), 77 deletions(-)

diff --git a/test/common.js b/test/common.js
index b7ddaf92b482b7..eb802cc8856377 100644
--- a/test/common.js
+++ b/test/common.js
@@ -442,3 +442,7 @@ exports.fileExists = function(pathname) {
     return false;
   }
 };
+
+exports.fail = function(msg) {
+  assert.fail(null, null, msg);
+};
diff --git a/test/parallel/test-child-process-recv-handle.js b/test/parallel/test-child-process-recv-handle.js
index b992445f186383..5c16c7a1c65850 100644
--- a/test/parallel/test-child-process-recv-handle.js
+++ b/test/parallel/test-child-process-recv-handle.js
@@ -24,7 +24,7 @@ function master() {
   });
   proc.stdout.on('data', function(data) {
     assert.equal(data, 'ok\r\n');
-    net.createServer(assert.fail).listen(common.PORT, function() {
+    net.createServer(common.fail).listen(common.PORT, function() {
       handle = this._handle;
       proc.send('one');
       proc.send('two', handle);
diff --git a/test/parallel/test-child-process-spawn-typeerror.js b/test/parallel/test-child-process-spawn-typeerror.js
index 44d67e86086f0b..46216b63d569ef 100644
--- a/test/parallel/test-child-process-spawn-typeerror.js
+++ b/test/parallel/test-child-process-spawn-typeerror.js
@@ -13,7 +13,7 @@ const empty = common.fixturesDir + '/empty.js';
 
 assert.throws(function() {
   var child = spawn(invalidcmd, 'this is not an array');
-  child.on('error', assert.fail);
+  child.on('error', common.fail);
 }, TypeError);
 
 // verify that valid argument combinations do not throw
diff --git a/test/parallel/test-cluster-bind-privileged-port.js b/test/parallel/test-cluster-bind-privileged-port.js
index d173762575cb8f..56449eaaf2e02f 100644
--- a/test/parallel/test-cluster-bind-privileged-port.js
+++ b/test/parallel/test-cluster-bind-privileged-port.js
@@ -20,8 +20,8 @@ if (cluster.isMaster) {
   }));
 }
 else {
-  var s = net.createServer(assert.fail);
-  s.listen(42, assert.fail.bind(null, 'listen should have failed'));
+  var s = net.createServer(common.fail);
+  s.listen(42, common.fail.bind(null, 'listen should have failed'));
   s.on('error', common.mustCall(function(err) {
     assert.equal(err.code, 'EACCES');
     process.disconnect();
diff --git a/test/parallel/test-cluster-bind-twice.js b/test/parallel/test-cluster-bind-twice.js
index ec6faa83c1151b..b3046cd8d5e1cc 100644
--- a/test/parallel/test-cluster-bind-twice.js
+++ b/test/parallel/test-cluster-bind-twice.js
@@ -68,7 +68,7 @@ if (!id) {
 else if (id === 'one') {
   if (cluster.isMaster) return startWorker();
 
-  var server = http.createServer(assert.fail).listen(common.PORT, function() {
+  var server = http.createServer(common.fail).listen(common.PORT, function() {
     process.send('READY');
   });
 
@@ -84,12 +84,12 @@ else if (id === 'two') {
     assert(ok);
   });
 
-  var server = http.createServer(assert.fail);
+  var server = http.createServer(common.fail);
   process.on('message', function(m) {
     if (typeof m === 'object') return; // ignore system messages
     if (m === 'QUIT') process.exit();
     assert.equal(m, 'START');
-    server.listen(common.PORT, assert.fail);
+    server.listen(common.PORT, common.fail);
     server.on('error', function(e) {
       assert.equal(e.code, 'EADDRINUSE');
       process.send(e.code);
diff --git a/test/parallel/test-cluster-eaddrinuse.js b/test/parallel/test-cluster-eaddrinuse.js
index 509dbb664e1d5d..6ff68252d9d867 100644
--- a/test/parallel/test-cluster-eaddrinuse.js
+++ b/test/parallel/test-cluster-eaddrinuse.js
@@ -12,7 +12,7 @@ var net = require('net');
 var id = '' + process.argv[2];
 
 if (id === 'undefined') {
-  var server = net.createServer(assert.fail);
+  var server = net.createServer(common.fail);
   server.listen(common.PORT, function() {
     var worker = fork(__filename, ['worker']);
     worker.on('message', function(msg) {
@@ -24,14 +24,14 @@ if (id === 'undefined') {
   });
 }
 else if (id === 'worker') {
-  var server = net.createServer(assert.fail);
-  server.listen(common.PORT, assert.fail);
+  var server = net.createServer(common.fail);
+  server.listen(common.PORT, common.fail);
   server.on('error', common.mustCall(function(e) {
     assert(e.code, 'EADDRINUSE');
     process.send('stop-listening');
     process.once('message', function(msg) {
       if (msg !== 'stopped-listening') return;
-      server = net.createServer(assert.fail);
+      server = net.createServer(common.fail);
       server.listen(common.PORT, common.mustCall(function() {
         server.close();
       }));
diff --git a/test/parallel/test-cluster-net-listen.js b/test/parallel/test-cluster-net-listen.js
index 741cacc75897e3..c79d4cf1a27dad 100644
--- a/test/parallel/test-cluster-net-listen.js
+++ b/test/parallel/test-cluster-net-listen.js
@@ -17,5 +17,5 @@ if (cluster.isMaster) {
 }
 else {
   // listen() without port should not trigger a libuv assert
-  net.createServer(assert.fail).listen(process.exit);
+  net.createServer(common.fail).listen(process.exit);
 }
diff --git a/test/parallel/test-cluster-rr-ref.js b/test/parallel/test-cluster-rr-ref.js
index 606ff708e94029..474e4d69f225c6 100644
--- a/test/parallel/test-cluster-rr-ref.js
+++ b/test/parallel/test-cluster-rr-ref.js
@@ -10,7 +10,7 @@ if (cluster.isMaster) {
     if (msg === 'done') this.kill();
   });
 } else {
-  const server = net.createServer(assert.fail);
+  const server = net.createServer(common.fail);
   server.listen(common.PORT, function() {
     server.unref();
     server.ref();
diff --git a/test/parallel/test-cluster-setup-master-argv.js b/test/parallel/test-cluster-setup-master-argv.js
index b406c76cbbfe0b..e111ba9ffa1548 100644
--- a/test/parallel/test-cluster-setup-master-argv.js
+++ b/test/parallel/test-cluster-setup-master-argv.js
@@ -3,7 +3,7 @@ var common = require('../common');
 var assert = require('assert');
 var cluster = require('cluster');
 
-setTimeout(assert.fail.bind(assert, 'setup not emitted'), 1000).unref();
+setTimeout(common.fail.bind(assert, 'setup not emitted'), 1000).unref();
 
 cluster.on('setup', function() {
   var clusterArgs = cluster.settings.args;
diff --git a/test/parallel/test-cluster-shared-handle-bind-error.js b/test/parallel/test-cluster-shared-handle-bind-error.js
index a93b07ba30e27b..288b4b443a45bc 100644
--- a/test/parallel/test-cluster-shared-handle-bind-error.js
+++ b/test/parallel/test-cluster-shared-handle-bind-error.js
@@ -8,7 +8,7 @@ if (cluster.isMaster) {
   // Master opens and binds the socket and shares it with the worker.
   cluster.schedulingPolicy = cluster.SCHED_NONE;
   // Hog the TCP port so that when the worker tries to bind, it'll fail.
-  net.createServer(assert.fail).listen(common.PORT, function() {
+  net.createServer(common.fail).listen(common.PORT, function() {
     var server = this;
     var worker = cluster.fork();
     worker.on('exit', common.mustCall(function(exitCode) {
@@ -18,8 +18,8 @@ if (cluster.isMaster) {
   });
 }
 else {
-  var s = net.createServer(assert.fail);
-  s.listen(common.PORT, assert.fail.bind(null, 'listen should have failed'));
+  var s = net.createServer(common.fail);
+  s.listen(common.PORT, common.fail.bind(null, 'listen should have failed'));
   s.on('error', common.mustCall(function(err) {
     assert.equal(err.code, 'EADDRINUSE');
     process.disconnect();
diff --git a/test/parallel/test-cluster-shared-handle-bind-privileged-port.js b/test/parallel/test-cluster-shared-handle-bind-privileged-port.js
index f524d6bda9d946..a02a2ef5b6b4f1 100644
--- a/test/parallel/test-cluster-shared-handle-bind-privileged-port.js
+++ b/test/parallel/test-cluster-shared-handle-bind-privileged-port.js
@@ -22,8 +22,8 @@ if (cluster.isMaster) {
   }));
 }
 else {
-  var s = net.createServer(assert.fail);
-  s.listen(42, assert.fail.bind(null, 'listen should have failed'));
+  var s = net.createServer(common.fail);
+  s.listen(42, common.fail.bind(null, 'listen should have failed'));
   s.on('error', common.mustCall(function(err) {
     assert.equal(err.code, 'EACCES');
     process.disconnect();
diff --git a/test/parallel/test-crypto-pbkdf2.js b/test/parallel/test-crypto-pbkdf2.js
index 51759ca8357ee7..39b98b38e2710e 100644
--- a/test/parallel/test-crypto-pbkdf2.js
+++ b/test/parallel/test-crypto-pbkdf2.js
@@ -62,28 +62,28 @@ assert.throws(function() {
 
 // Should not work with Infinity key length
 assert.throws(function() {
-  crypto.pbkdf2('password', 'salt', 1, Infinity, assert.fail);
+  crypto.pbkdf2('password', 'salt', 1, Infinity, common.fail);
 }, function(err) {
   return err instanceof Error && err.message === 'Bad key length';
 });
 
 // Should not work with negative Infinity key length
 assert.throws(function() {
-  crypto.pbkdf2('password', 'salt', 1, -Infinity, assert.fail);
+  crypto.pbkdf2('password', 'salt', 1, -Infinity, common.fail);
 }, function(err) {
   return err instanceof Error && err.message === 'Bad key length';
 });
 
 // Should not work with NaN key length
 assert.throws(function() {
-  crypto.pbkdf2('password', 'salt', 1, NaN, assert.fail);
+  crypto.pbkdf2('password', 'salt', 1, NaN, common.fail);
 }, function(err) {
   return err instanceof Error && err.message === 'Bad key length';
 });
 
 // Should not work with negative key length
 assert.throws(function() {
-  crypto.pbkdf2('password', 'salt', 1, -1, assert.fail);
+  crypto.pbkdf2('password', 'salt', 1, -1, common.fail);
 }, function(err) {
   return err instanceof Error && err.message === 'Bad key length';
 });
diff --git a/test/parallel/test-dgram-error-message-address.js b/test/parallel/test-dgram-error-message-address.js
index eca2ccce4f1b65..e307a23e2451db 100644
--- a/test/parallel/test-dgram-error-message-address.js
+++ b/test/parallel/test-dgram-error-message-address.js
@@ -6,7 +6,7 @@ var dgram = require('dgram');
 // IPv4 Test
 var socket_ipv4 = dgram.createSocket('udp4');
 
-socket_ipv4.on('listening', assert.fail);
+socket_ipv4.on('listening', common.fail);
 
 socket_ipv4.on('error', common.mustCall(function(e) {
   assert.equal(e.message, 'bind EADDRNOTAVAIL 1.1.1.1:' + common.PORT);
@@ -22,7 +22,7 @@ socket_ipv4.bind(common.PORT, '1.1.1.1');
 var socket_ipv6 = dgram.createSocket('udp6');
 var family_ipv6 = 'IPv6';
 
-socket_ipv6.on('listening', assert.fail);
+socket_ipv6.on('listening', common.fail);
 
 socket_ipv6.on('error', common.mustCall(function(e) {
   // EAFNOSUPPORT or EPROTONOSUPPORT means IPv6 is disabled on this system.
diff --git a/test/parallel/test-dgram-oob-buffer.js b/test/parallel/test-dgram-oob-buffer.js
index e873715e4e14de..6d0626fc2d40db 100644
--- a/test/parallel/test-dgram-oob-buffer.js
+++ b/test/parallel/test-dgram-oob-buffer.js
@@ -19,22 +19,22 @@ socket.send(buf, 3, 1, common.PORT, '127.0.0.1', ok);
 socket.send(buf, 4, 0, common.PORT, '127.0.0.1', ok);
 
 assert.throws(function() {
-  socket.send(buf, 0, 5, common.PORT, '127.0.0.1', assert.fail);
+  socket.send(buf, 0, 5, common.PORT, '127.0.0.1', common.fail);
 });
 assert.throws(function() {
-  socket.send(buf, 2, 3, common.PORT, '127.0.0.1', assert.fail);
+  socket.send(buf, 2, 3, common.PORT, '127.0.0.1', common.fail);
 });
 assert.throws(function() {
-  socket.send(buf, 4, 4, common.PORT, '127.0.0.1', assert.fail);
+  socket.send(buf, 4, 4, common.PORT, '127.0.0.1', common.fail);
 });
 assert.throws(function() {
-  socket.send('abc', 4, 1, common.PORT, '127.0.0.1', assert.fail);
+  socket.send('abc', 4, 1, common.PORT, '127.0.0.1', common.fail);
 });
 assert.throws(function() {
-  socket.send('abc', 0, 4, common.PORT, '127.0.0.1', assert.fail);
+  socket.send('abc', 0, 4, common.PORT, '127.0.0.1', common.fail);
 });
 assert.throws(function() {
-  socket.send('abc', -1, 2, common.PORT, '127.0.0.1', assert.fail);
+  socket.send('abc', -1, 2, common.PORT, '127.0.0.1', common.fail);
 });
 
 socket.close(); // FIXME should not be necessary
diff --git a/test/parallel/test-event-emitter-remove-listeners.js b/test/parallel/test-event-emitter-remove-listeners.js
index 409ccbebe25b86..8993aadf51a46e 100644
--- a/test/parallel/test-event-emitter-remove-listeners.js
+++ b/test/parallel/test-event-emitter-remove-listeners.js
@@ -39,7 +39,7 @@ assert.deepEqual([], e1.listeners('hello'));
 
 var e2 = new events.EventEmitter();
 e2.on('hello', listener1);
-e2.on('removeListener', assert.fail);
+e2.on('removeListener', common.fail);
 e2.removeListener('hello', listener2);
 assert.deepEqual([listener1], e2.listeners('hello'));
 
diff --git a/test/parallel/test-fs-null-bytes.js b/test/parallel/test-fs-null-bytes.js
index 77228521e6fc9d..c80588486d97d6 100644
--- a/test/parallel/test-fs-null-bytes.js
+++ b/test/parallel/test-fs-null-bytes.js
@@ -43,10 +43,10 @@ check(fs.symlink,     fs.symlinkSync,     'foo\u0000bar', 'foobar');
 check(fs.symlink,     fs.symlinkSync,     'foobar', 'foo\u0000bar');
 check(fs.truncate,    fs.truncateSync,    'foo\u0000bar');
 check(fs.unlink,      fs.unlinkSync,      'foo\u0000bar');
-check(null,           fs.unwatchFile,     'foo\u0000bar', assert.fail);
+check(null,           fs.unwatchFile,     'foo\u0000bar', common.fail);
 check(fs.utimes,      fs.utimesSync,      'foo\u0000bar', 0, 0);
-check(null,           fs.watch,           'foo\u0000bar', assert.fail);
-check(null,           fs.watchFile,       'foo\u0000bar', assert.fail);
+check(null,           fs.watch,           'foo\u0000bar', common.fail);
+check(null,           fs.watchFile,       'foo\u0000bar', common.fail);
 check(fs.writeFile,   fs.writeFileSync,   'foo\u0000bar');
 
 // an 'error' for exists means that it doesn't exist.
diff --git a/test/parallel/test-fs-read-stream-err.js b/test/parallel/test-fs-read-stream-err.js
index 1eb6aa57906b05..1bc2b6f0b0239c 100644
--- a/test/parallel/test-fs-read-stream-err.js
+++ b/test/parallel/test-fs-read-stream-err.js
@@ -39,5 +39,5 @@ fs.read = function() {
 };
 
 stream.on('data', function(buf) {
-  stream.on('data', assert.fail);  // no more 'data' events should follow
+  stream.on('data', common.fail);  // no more 'data' events should follow
 });
diff --git a/test/parallel/test-http-client-unescaped-path.js b/test/parallel/test-http-client-unescaped-path.js
index 1536916ae9b49c..e01df255a8042c 100644
--- a/test/parallel/test-http-client-unescaped-path.js
+++ b/test/parallel/test-http-client-unescaped-path.js
@@ -5,5 +5,5 @@ var http = require('http');
 
 assert.throws(function() {
   // Path with spaces in it should throw.
-  http.get({ path: 'bad path' }, assert.fail);
+  http.get({ path: 'bad path' }, common.fail);
 }, /contains unescaped characters/);
diff --git a/test/parallel/test-http-set-trailers.js b/test/parallel/test-http-set-trailers.js
index 6f5c02f5605969..f3ee5b157f7915 100644
--- a/test/parallel/test-http-set-trailers.js
+++ b/test/parallel/test-http-set-trailers.js
@@ -53,7 +53,7 @@ server.on('listening', function() {
   c.on('connect', function() {
     outstanding_reqs++;
     c.write('GET / HTTP/1.1\r\n\r\n');
-    tid = setTimeout(assert.fail, 2000, 'Couldn\'t find last chunk.');
+    tid = setTimeout(common.fail, 2000, 'Couldn\'t find last chunk.');
   });
 
   c.on('data', function(chunk) {
diff --git a/test/parallel/test-https-timeout-server-2.js b/test/parallel/test-https-timeout-server-2.js
index 9970688fe7c1e8..df605958cf42df 100644
--- a/test/parallel/test-https-timeout-server-2.js
+++ b/test/parallel/test-https-timeout-server-2.js
@@ -18,7 +18,7 @@ var options = {
   cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
 };
 
-var server = https.createServer(options, assert.fail);
+var server = https.createServer(options, common.fail);
 
 server.on('secureConnection', function(cleartext) {
   var s = cleartext.setTimeout(50, function() {
diff --git a/test/parallel/test-https-timeout-server.js b/test/parallel/test-https-timeout-server.js
index 0db7ad533d9868..ba175ecf763ecf 100644
--- a/test/parallel/test-https-timeout-server.js
+++ b/test/parallel/test-https-timeout-server.js
@@ -24,7 +24,7 @@ var options = {
   handshakeTimeout: 50
 };
 
-var server = https.createServer(options, assert.fail);
+var server = https.createServer(options, common.fail);
 
 server.on('clientError', function(err, conn) {
   // Don't hesitate to update the asserts if the internal structure of
diff --git a/test/parallel/test-listen-fd-ebadf.js b/test/parallel/test-listen-fd-ebadf.js
index db905dfa35e966..51e09a7907f18e 100644
--- a/test/parallel/test-listen-fd-ebadf.js
+++ b/test/parallel/test-listen-fd-ebadf.js
@@ -9,8 +9,8 @@ process.on('exit', function() {
   assert.equal(gotError, 2);
 });
 
-net.createServer(assert.fail).listen({fd:2}).on('error', onError);
-net.createServer(assert.fail).listen({fd:42}).on('error', onError);
+net.createServer(common.fail).listen({fd:2}).on('error', onError);
+net.createServer(common.fail).listen({fd:42}).on('error', onError);
 
 function onError(ex) {
   assert.equal(ex.code, 'EINVAL');
diff --git a/test/parallel/test-net-better-error-messages-listen-path.js b/test/parallel/test-net-better-error-messages-listen-path.js
index 8a7e0220b36dfa..41d22c3fb9a4b5 100644
--- a/test/parallel/test-net-better-error-messages-listen-path.js
+++ b/test/parallel/test-net-better-error-messages-listen-path.js
@@ -3,8 +3,8 @@ var common = require('../common');
 var assert = require('assert');
 var net = require('net');
 var fp = '/blah/fadfa';
-var server = net.createServer(assert.fail);
-server.listen(fp, assert.fail);
+var server = net.createServer(common.fail);
+server.listen(fp, common.fail);
 server.on('error', common.mustCall(function(e) {
   assert.equal(e.address, fp);
 }));
diff --git a/test/parallel/test-net-better-error-messages-listen.js b/test/parallel/test-net-better-error-messages-listen.js
index 7e5fad925aeb92..44adce71a7d541 100644
--- a/test/parallel/test-net-better-error-messages-listen.js
+++ b/test/parallel/test-net-better-error-messages-listen.js
@@ -3,8 +3,8 @@ var common = require('../common');
 var assert = require('assert');
 var net = require('net');
 
-var server = net.createServer(assert.fail);
-server.listen(1, '1.1.1.1', assert.fail);
+var server = net.createServer(common.fail);
+server.listen(1, '1.1.1.1', common.fail);
 server.on('error', common.mustCall(function(e) {
   assert.equal(e.address, '1.1.1.1');
   assert.equal(e.port, 1);
diff --git a/test/parallel/test-net-better-error-messages-path.js b/test/parallel/test-net-better-error-messages-path.js
index 06cfecbd7c6af1..9222a1cc758aaa 100644
--- a/test/parallel/test-net-better-error-messages-path.js
+++ b/test/parallel/test-net-better-error-messages-path.js
@@ -5,7 +5,7 @@ var assert = require('assert');
 var fp = '/tmp/fadagagsdfgsdf';
 var c = net.connect(fp);
 
-c.on('connect', assert.fail);
+c.on('connect', common.fail);
 
 c.on('error', common.mustCall(function(e) {
   assert.equal(e.code, 'ENOENT');
diff --git a/test/parallel/test-net-better-error-messages-port-hostname.js b/test/parallel/test-net-better-error-messages-port-hostname.js
index bdca6c2b3ca00d..9db6fb26f57285 100644
--- a/test/parallel/test-net-better-error-messages-port-hostname.js
+++ b/test/parallel/test-net-better-error-messages-port-hostname.js
@@ -5,7 +5,7 @@ var assert = require('assert');
 
 var c = net.createConnection(common.PORT, '...');
 
-c.on('connect', assert.fail);
+c.on('connect', common.fail);
 
 c.on('error', common.mustCall(function(e) {
   assert.equal(e.code, 'ENOTFOUND');
diff --git a/test/parallel/test-net-better-error-messages-port.js b/test/parallel/test-net-better-error-messages-port.js
index 0f90089c0509fe..514e317fbb0b15 100644
--- a/test/parallel/test-net-better-error-messages-port.js
+++ b/test/parallel/test-net-better-error-messages-port.js
@@ -5,7 +5,7 @@ var assert = require('assert');
 
 var c = net.createConnection(common.PORT);
 
-c.on('connect', assert.fail);
+c.on('connect', common.fail);
 
 c.on('error', common.mustCall(function(e) {
   assert.equal(e.code, 'ECONNREFUSED');
diff --git a/test/parallel/test-net-dns-lookup-skip.js b/test/parallel/test-net-dns-lookup-skip.js
index 1083ed9fc0ad8f..b293196ad45c7e 100644
--- a/test/parallel/test-net-dns-lookup-skip.js
+++ b/test/parallel/test-net-dns-lookup-skip.js
@@ -11,7 +11,7 @@ function check(addressType) {
 
   var address = addressType === 4 ? '127.0.0.1' : '::1';
   server.listen(common.PORT, address, function() {
-    net.connect(common.PORT, address).on('lookup', assert.fail);
+    net.connect(common.PORT, address).on('lookup', common.fail);
   });
 }
 
diff --git a/test/parallel/test-net-listen-fd0.js b/test/parallel/test-net-listen-fd0.js
index e326ac2b60beb1..1a6c4716eb6178 100644
--- a/test/parallel/test-net-listen-fd0.js
+++ b/test/parallel/test-net-listen-fd0.js
@@ -10,7 +10,7 @@ process.on('exit', function() {
 });
 
 // this should fail with an async EINVAL error, not throw an exception
-net.createServer(assert.fail).listen({fd:0}).on('error', function(e) {
+net.createServer(common.fail).listen({fd:0}).on('error', function(e) {
   switch (e.code) {
     case 'EINVAL':
     case 'ENOTSOCK':
diff --git a/test/parallel/test-promises-unhandled-rejections.js b/test/parallel/test-promises-unhandled-rejections.js
index e5b3e6f35c0d45..e229bada3a10e2 100644
--- a/test/parallel/test-promises-unhandled-rejections.js
+++ b/test/parallel/test-promises-unhandled-rejections.js
@@ -164,7 +164,7 @@ asyncTest('Catching a promise rejection after setImmediate is not' +
   });
   _reject(e);
   setImmediate(function() {
-    promise.then(assert.fail, function() {});
+    promise.then(common.fail, function() {});
   });
 });
 
@@ -176,7 +176,7 @@ asyncTest('When re-throwing new errors in a promise catch, only the' +
     assert.strictEqual(e2, reason);
     assert.strictEqual(promise2, promise);
   });
-  var promise2 = Promise.reject(e).then(assert.fail, function(reason) {
+  var promise2 = Promise.reject(e).then(common.fail, function(reason) {
     assert.strictEqual(e, reason);
     throw e2;
   });
@@ -206,7 +206,7 @@ asyncTest('When re-throwing new errors in a promise catch, only the ' +
     setTimeout(function() {
       reject(e);
     }, 1);
-  }).then(assert.fail, function(reason) {
+  }).then(common.fail, function(reason) {
     assert.strictEqual(e, reason);
     throw e2;
   });
@@ -225,7 +225,7 @@ asyncTest('When re-throwing new errors in a promise catch, only the re-thrown' +
     setTimeout(function() {
       reject(e);
       process.nextTick(function() {
-        promise2 = promise.then(assert.fail, function(reason) {
+        promise2 = promise.then(common.fail, function(reason) {
           assert.strictEqual(e, reason);
           throw e2;
         });
@@ -240,7 +240,7 @@ asyncTest('unhandledRejection should not be triggered if a promise catch is' +
           function(done) {
   var e = new Error();
   onUnhandledFail(done);
-  Promise.reject(e).then(assert.fail, function() {});
+  Promise.reject(e).then(common.fail, function() {});
 });
 
 asyncTest('unhandledRejection should not be triggered if a promise catch is' +
@@ -250,7 +250,7 @@ asyncTest('unhandledRejection should not be triggered if a promise catch is' +
   onUnhandledFail(done);
   new Promise(function(_, reject) {
     reject(e);
-  }).then(assert.fail, function() {});
+  }).then(common.fail, function() {});
 });
 
 asyncTest('Attaching a promise catch in a process.nextTick is soon enough to' +
@@ -259,7 +259,7 @@ asyncTest('Attaching a promise catch in a process.nextTick is soon enough to' +
   onUnhandledFail(done);
   var promise = Promise.reject(e);
   process.nextTick(function() {
-    promise.then(assert.fail, function() {});
+    promise.then(common.fail, function() {});
   });
 });
 
@@ -271,7 +271,7 @@ asyncTest('Attaching a promise catch in a process.nextTick is soon enough to' +
     reject(e);
   });
   process.nextTick(function() {
-    promise.then(assert.fail, function() {});
+    promise.then(common.fail, function() {});
   });
 });
 
@@ -302,7 +302,7 @@ asyncTest('catching a promise which is asynchronously rejected (via' +
         reject(e);
       }, 1);
     });
-  }).then(assert.fail, function(reason) {
+  }).then(common.fail, function(reason) {
     assert.strictEqual(e, reason);
   });
 });
@@ -313,7 +313,7 @@ asyncTest('Catching a rejected promise derived from throwing in a' +
   onUnhandledFail(done);
   Promise.resolve().then(function() {
     throw e;
-  }).then(assert.fail, function(reason) {
+  }).then(common.fail, function(reason) {
     assert.strictEqual(e, reason);
   });
 });
@@ -325,7 +325,7 @@ asyncTest('Catching a rejected promise derived from returning a' +
   onUnhandledFail(done);
   Promise.resolve().then(function() {
     return Promise.reject(e);
-  }).then(assert.fail, function(reason) {
+  }).then(common.fail, function(reason) {
     assert.strictEqual(e, reason);
   });
 });
@@ -380,7 +380,7 @@ asyncTest('Catching the Promise.all() of a collection that includes a' +
           'rejected promise prevents unhandledRejection', function(done) {
   var e = new Error();
   onUnhandledFail(done);
-  Promise.all([Promise.reject(e)]).then(assert.fail, function() {});
+  Promise.all([Promise.reject(e)]).then(common.fail, function() {});
 });
 
 asyncTest('Catching the Promise.all() of a collection that includes a ' +
@@ -395,7 +395,7 @@ asyncTest('Catching the Promise.all() of a collection that includes a ' +
   });
   p = Promise.all([p]);
   process.nextTick(function() {
-    p.then(assert.fail, function() {});
+    p.then(common.fail, function() {});
   });
 });
 
@@ -430,7 +430,7 @@ asyncTest('Waiting setTimeout(, 10) to catch a promise causes an' +
     throw e;
   });
   setTimeout(function() {
-    thePromise.then(assert.fail, function(reason) {
+    thePromise.then(common.fail, function(reason) {
       assert.strictEqual(e, reason);
     });
   }, 10);
diff --git a/test/parallel/test-timers-unref-remove-other-unref-timers.js b/test/parallel/test-timers-unref-remove-other-unref-timers.js
index f727d5f86fd7b3..8c1864f1a7da01 100644
--- a/test/parallel/test-timers-unref-remove-other-unref-timers.js
+++ b/test/parallel/test-timers-unref-remove-other-unref-timers.js
@@ -11,7 +11,7 @@ const assert = require('assert');
 const timers = require('timers');
 
 const foo = {
-  _onTimeout: assert.fail
+  _onTimeout: common.fail
 };
 
 const bar = {
diff --git a/test/parallel/test-tls-cipher-list.js b/test/parallel/test-tls-cipher-list.js
index 9ae8fefa0f4351..f20a0a6a249aed 100644
--- a/test/parallel/test-tls-cipher-list.js
+++ b/test/parallel/test-tls-cipher-list.js
@@ -17,12 +17,12 @@ function doCheck(arg, check) {
     'require("constants").defaultCipherList'
   ]);
   spawn(process.execPath, arg, {}).
-    on('error', assert.fail).
+    on('error', common.fail).
     stdout.on('data', function(chunk) {
       out += chunk;
     }).on('end', function() {
       assert.equal(out.trim(), check);
-    }).on('error', assert.fail);
+    }).on('error', common.fail);
 }
 
 // test the default unmodified version
diff --git a/test/parallel/test-tls-no-sslv3.js b/test/parallel/test-tls-no-sslv3.js
index 9777397758e3fb..ce5a9d395d6a47 100644
--- a/test/parallel/test-tls-no-sslv3.js
+++ b/test/parallel/test-tls-no-sslv3.js
@@ -18,7 +18,7 @@ if (common.opensslCli === false) {
 
 var cert = fs.readFileSync(common.fixturesDir + '/test_cert.pem');
 var key = fs.readFileSync(common.fixturesDir + '/test_key.pem');
-var server = tls.createServer({ cert: cert, key: key }, assert.fail);
+var server = tls.createServer({ cert: cert, key: key }, common.fail);
 
 server.listen(common.PORT, '127.0.0.1', function() {
   var address = this.address().address + ':' + this.address().port;
diff --git a/test/parallel/test-tls-timeout-server.js b/test/parallel/test-tls-timeout-server.js
index ee932c9b1fca6d..e3ed246386647f 100644
--- a/test/parallel/test-tls-timeout-server.js
+++ b/test/parallel/test-tls-timeout-server.js
@@ -23,7 +23,7 @@ var options = {
   handshakeTimeout: 50
 };
 
-var server = tls.createServer(options, assert.fail);
+var server = tls.createServer(options, common.fail);
 
 server.on('clientError', function(err, conn) {
   conn.destroy();
diff --git a/test/parallel/test-vm-debug-context.js b/test/parallel/test-vm-debug-context.js
index 0f15d40ef14c59..2e86d136bea2fa 100644
--- a/test/parallel/test-vm-debug-context.js
+++ b/test/parallel/test-vm-debug-context.js
@@ -10,7 +10,7 @@ assert.throws(function() {
 }, /SyntaxError/);
 
 assert.throws(function() {
-  vm.runInDebugContext({ toString: assert.fail });
+  vm.runInDebugContext({ toString: common.fail });
 }, /AssertionError/);
 
 assert.throws(function() {
@@ -58,7 +58,7 @@ assert.strictEqual(vm.runInDebugContext(undefined), undefined);
 var script = common.fixturesDir + '/vm-run-in-debug-context.js';
 var proc = spawn(process.execPath, [script]);
 var data = [];
-proc.stdout.on('data', assert.fail);
+proc.stdout.on('data', common.fail);
 proc.stderr.on('data', data.push.bind(data));
 proc.stderr.once('end', common.mustCall(function() {
   var haystack = Buffer.concat(data).toString('utf8');
@@ -70,8 +70,8 @@ proc.once('exit', common.mustCall(function(exitCode, signalCode) {
 }));
 
 var proc = spawn(process.execPath, [script, 'handle-fatal-exception']);
-proc.stdout.on('data', assert.fail);
-proc.stderr.on('data', assert.fail);
+proc.stdout.on('data', common.fail);
+proc.stderr.on('data', common.fail);
 proc.once('exit', common.mustCall(function(exitCode, signalCode) {
   assert.equal(exitCode, 42);
   assert.equal(signalCode, null);
diff --git a/test/pummel/test-fs-watch-non-recursive.js b/test/pummel/test-fs-watch-non-recursive.js
index 6adb193928e44f..2586aec59b2d94 100644
--- a/test/pummel/test-fs-watch-non-recursive.js
+++ b/test/pummel/test-fs-watch-non-recursive.js
@@ -19,7 +19,7 @@ try { fs.mkdirSync(testsubdir, 0o700); } catch (e) {}
 
 // Need a grace period, else the mkdirSync() above fires off an event.
 setTimeout(function() {
-  var watcher = fs.watch(testDir, { persistent: true }, assert.fail);
+  var watcher = fs.watch(testDir, { persistent: true }, common.fail);
   setTimeout(function() {
     fs.writeFileSync(filepath, 'test');
   }, 100);
diff --git a/test/sequential/test-cluster-listening-port.js b/test/sequential/test-cluster-listening-port.js
index c9c65389036ec9..aaad1ff620b191 100644
--- a/test/sequential/test-cluster-listening-port.js
+++ b/test/sequential/test-cluster-listening-port.js
@@ -1,5 +1,5 @@
 'use strict';
-require('../common');
+var common = require('../common');
 var assert = require('assert');
 var cluster = require('cluster');
 var net = require('net');
@@ -21,5 +21,5 @@ if (cluster.isMaster) {
   });
 }
 else {
-  net.createServer(assert.fail).listen(0);
+  net.createServer(common.fail).listen(0);
 }

From 9d8d7524564f3cb2a140c47a77deee10020524e5 Mon Sep 17 00:00:00 2001
From: Junliang Yan <jyan@ca.ibm.com>
Date: Fri, 23 Oct 2015 12:48:36 -0400
Subject: [PATCH 052/323] test: print helpful err msg on test-dns-ipv6.js

The test sometimes fail on an assertion but no useful error message
was generated for debugging. Modify the test to generate useful
debugging message.

PR-URL: https://github.com/nodejs/node/pull/3501
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
---
 test/internet/test-dns-ipv6.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/internet/test-dns-ipv6.js b/test/internet/test-dns-ipv6.js
index 5a66f8db783f4b..27547edcd84b46 100644
--- a/test/internet/test-dns-ipv6.js
+++ b/test/internet/test-dns-ipv6.js
@@ -165,7 +165,8 @@ TEST(function test_lookup_all_ipv6(done) {
     assert.ok(ips.length > 0);
 
     ips.forEach(function(ip) {
-      assert.ok(isIPv6(ip.address));
+      assert.ok(isIPv6(ip.address),
+                'Invalid IPv6: ' + ip.address.toString());
       assert.strictEqual(ip.family, 6);
     });
 

From 2bb147535ef9f9cfcd9ac8ca99d70102a5984134 Mon Sep 17 00:00:00 2001
From: Evan Lucas <evanlucas@me.com>
Date: Fri, 23 Oct 2015 16:54:04 -0500
Subject: [PATCH 053/323] fs: don't throw in read if buffer too big

If the resulting buffer.toString() call in fs.read throws, catch the
error and pass it back in the callback.

This issue only presents itself when fs.read is called using the legacy
string interface:

fs.read(fd, length, position, encoding, callback)

PR-URL: https://github.com/nodejs/node/pull/3503
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 lib/fs.js                                     | 19 +++++-
 .../test-fs-read-buffer-tostring-fail.js      | 58 +++++++++++++++++++
 2 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 test/parallel/test-fs-read-buffer-tostring-fail.js

diff --git a/lib/fs.js b/lib/fs.js
index 6345497c4f2c48..42d02baa9e5d91 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -599,10 +599,13 @@ fs.read = function(fd, buffer, offset, length, position, callback) {
 
     callback = function(err, bytesRead) {
       if (!cb) return;
+      if (err) return cb(err);
 
-      var str = (bytesRead > 0) ? buffer.toString(encoding, 0, bytesRead) : '';
-
-      (cb)(err, str, bytesRead);
+      if (bytesRead > 0) {
+        tryToStringWithEnd(buffer, encoding, bytesRead, cb);
+      } else {
+        (cb)(err, '', bytesRead);
+      }
     };
   }
 
@@ -617,6 +620,16 @@ fs.read = function(fd, buffer, offset, length, position, callback) {
   binding.read(fd, buffer, offset, length, position, req);
 };
 
+function tryToStringWithEnd(buf, encoding, end, callback) {
+  var e;
+  try {
+    buf = buf.toString(encoding, 0, end);
+  } catch (err) {
+    e = err;
+  }
+  callback(e, buf, end);
+}
+
 fs.readSync = function(fd, buffer, offset, length, position) {
   var legacy = false;
   var encoding;
diff --git a/test/parallel/test-fs-read-buffer-tostring-fail.js b/test/parallel/test-fs-read-buffer-tostring-fail.js
new file mode 100644
index 00000000000000..3ec1491d2b4768
--- /dev/null
+++ b/test/parallel/test-fs-read-buffer-tostring-fail.js
@@ -0,0 +1,58 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const fs = require('fs');
+const path = require('path');
+const Buffer = require('buffer').Buffer;
+const kStringMaxLength = process.binding('buffer').kStringMaxLength;
+const kMaxLength = process.binding('buffer').kMaxLength;
+
+var fd;
+
+common.refreshTmpDir();
+
+const file = path.join(common.tmpDir, 'toobig2.txt');
+const stream = fs.createWriteStream(file, {
+  flags: 'a'
+});
+
+const size = kStringMaxLength / 200;
+const a = new Buffer(size).fill('a');
+
+for (var i = 0; i < 201; i++) {
+  stream.write(a);
+}
+
+stream.end();
+stream.on('finish', common.mustCall(function() {
+  fd = fs.openSync(file, 'r');
+  fs.read(fd, kStringMaxLength + 1, 0, 'utf8', common.mustCall(function(err) {
+    assert.ok(err instanceof Error);
+    assert.strictEqual('toString failed', err.message);
+  }));
+}));
+
+function destroy() {
+  try {
+    // Make sure we close fd and unlink the file
+    fs.closeSync(fd);
+    fs.unlinkSync(file);
+  } catch (err) {
+    // it may not exist
+  }
+}
+
+process.on('exit', destroy);
+
+process.on('SIGINT', function() {
+  destroy();
+  process.exit();
+});
+
+// To make sure we don't leave a very large file
+// on test machines in the event this test fails.
+process.on('uncaughtException', function(err) {
+  destroy();
+  throw err;
+});

From 1a968e67a523f90f5db6aa43888d1c2182b18a97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <mic.besace@gmail.com>
Date: Sat, 24 Oct 2015 10:42:29 +0200
Subject: [PATCH 054/323] test: improve tests for util.inherits

inherits is used in lib and tests but its functionality itself is not
tested yet.

PR-URL: https://github.com/nodejs/node/pull/3507
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
---
 test/parallel/test-util-inherits.js | 46 +++++++++++++++++++++++++++++
 test/parallel/test-util.js          |  7 -----
 2 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 test/parallel/test-util-inherits.js

diff --git a/test/parallel/test-util-inherits.js b/test/parallel/test-util-inherits.js
new file mode 100644
index 00000000000000..baa77ea4405484
--- /dev/null
+++ b/test/parallel/test-util-inherits.js
@@ -0,0 +1,46 @@
+'use strict';
+
+require('../common');
+const assert = require('assert');
+const inherits = require('util').inherits;
+
+// super constructor
+function A() {
+  this._a = 'a';
+}
+A.prototype.a = function() { return this._a; };
+
+// one level of inheritance
+function B(value) {
+  A.call(this);
+  this._b = value;
+}
+inherits(B, A);
+B.prototype.b = function() { return this._b; };
+
+assert.strictEqual(B.super_, A);
+
+const b = new B('b');
+assert.strictEqual(b.a(), 'a');
+assert.strictEqual(b.b(), 'b');
+assert.strictEqual(b.constructor, B);
+
+ // two levels of inheritance
+function C() {
+  B.call(this, 'b');
+  this._c = 'c';
+}
+inherits(C, B);
+C.prototype.c = function() { return this._c; };
+C.prototype.getValue = function() { return this.a() + this.b() + this.c(); };
+
+assert.strictEqual(C.super_, B);
+
+const c = new C();
+assert.strictEqual(c.getValue(), 'abc');
+assert.strictEqual(c.constructor, C);
+
+// should throw with invalid arguments
+assert.throws(function() { inherits(A, {}); }, TypeError);
+assert.throws(function() { inherits(A, null); }, TypeError);
+assert.throws(function() { inherits(null, A); }, TypeError);
diff --git a/test/parallel/test-util.js b/test/parallel/test-util.js
index 79e104546b7f37..700532bd5a397b 100644
--- a/test/parallel/test-util.js
+++ b/test/parallel/test-util.js
@@ -83,10 +83,3 @@ assert.deepEqual(util._extend({a:1}, true),       {a:1});
 assert.deepEqual(util._extend({a:1}, false),      {a:1});
 assert.deepEqual(util._extend({a:1}, {b:2}),      {a:1, b:2});
 assert.deepEqual(util._extend({a:1, b:2}, {b:3}), {a:1, b:3});
-
-// inherits
-var ctor = function() {};
-assert.throws(function() { util.inherits(ctor, {}); }, TypeError);
-assert.throws(function() { util.inherits(ctor, null); }, TypeError);
-assert.throws(function() { util.inherits(null, ctor); }, TypeError);
-assert.doesNotThrow(function() { util.inherits(ctor, ctor); }, TypeError);

From 62ad1d0113d450e5e0b7021ff5168b719605c364 Mon Sep 17 00:00:00 2001
From: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Date: Thu, 23 Apr 2015 15:25:15 +0900
Subject: [PATCH 055/323] tls, crypto: add ALPN Support

ALPN is added to tls according to RFC7301, which supersedes NPN.
When the server receives both NPN and ALPN extensions from the client,
ALPN takes precedence over NPN and the server does not send NPN
extension to the client. alpnProtocol in TLSSocket always returns
false when no selected protocol exists by ALPN.
In https server, http/1.1 token is always set when no
options.ALPNProtocols exists.

PR-URL: https://github.com/nodejs/node/pull/2564
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 doc/api/tls.markdown                         |  41 +-
 lib/_tls_legacy.js                           |  15 +-
 lib/_tls_wrap.js                             |  17 +
 lib/https.js                                 |   7 +
 lib/tls.js                                   |  51 +-
 src/env.h                                    |   2 +
 src/node.cc                                  |   7 +
 src/node_constants.cc                        |   5 +
 src/node_crypto.cc                           | 104 ++++
 src/node_crypto.h                            |  13 +-
 test/parallel/test-tls-alpn-server-client.js | 540 +++++++++++++++++++
 11 files changed, 771 insertions(+), 31 deletions(-)
 create mode 100644 test/parallel/test-tls-alpn-server-client.js

diff --git a/doc/api/tls.markdown b/doc/api/tls.markdown
index 4907c65328cab0..ca891bb40fc5ce 100644
--- a/doc/api/tls.markdown
+++ b/doc/api/tls.markdown
@@ -66,14 +66,15 @@ and tap `R<CR>` (that's the letter `R` followed by a carriage return) a few
 times.
 
 
-## NPN and SNI
+## ALPN, NPN and SNI
 
 <!-- type=misc -->
 
-NPN (Next Protocol Negotiation) and SNI (Server Name Indication) are TLS
+ALPN (Application-Layer Protocol Negotiation Extension), NPN (Next
+Protocol Negotiation) and SNI (Server Name Indication) are TLS
 handshake extensions allowing you:
 
-  * NPN - to use one TLS server for multiple protocols (HTTP, SPDY)
+  * ALPN/NPN - to use one TLS server for multiple protocols (HTTP, SPDY, HTTP/2)
   * SNI - to use one TLS server for multiple hostnames with different SSL
     certificates.
 
@@ -249,6 +250,12 @@ automatically set as a listener for the [secureConnection][] event.  The
   - `NPNProtocols`: An array or `Buffer` of possible NPN protocols. (Protocols
     should be ordered by their priority).
 
+  - `ALPNProtocols`: An array or `Buffer` of possible ALPN
+    protocols. (Protocols should be ordered by their priority). When
+    the server receives both NPN and ALPN extensions from the client,
+    ALPN takes precedence over NPN and the server does not send an NPN
+    extension to the client.
+
   - `SNICallback(servername, cb)`: A function that will be called if client
     supports SNI TLS extension. Two argument will be passed to it: `servername`,
     and `cb`. `SNICallback` should invoke `cb(null, ctx)`, where `ctx` is a
@@ -372,9 +379,16 @@ Creates a new client connection to the given `port` and `host` (old API) or
     fails; `err.code` contains the OpenSSL error code. Default: `true`.
 
   - `NPNProtocols`: An array of strings or `Buffer`s containing supported NPN
-    protocols. `Buffer`s should have following format: `0x05hello0x05world`,
-    where first byte is next protocol name's length. (Passing array should
-    usually be much simpler: `['hello', 'world']`.)
+    protocols. `Buffer`s should have the following format:
+    `0x05hello0x05world`, where first byte is next protocol name's
+    length. (Passing array should usually be much simpler:
+    `['hello', 'world']`.)
+
+  - `ALPNProtocols`: An array of strings or `Buffer`s containing
+    supported ALPN protocols. `Buffer`s should have following format:
+    `0x05hello0x05world`, where the first byte is the next protocol
+    name's length. (Passing array should usually be much simpler:
+    `['hello', 'world']`.)
 
   - `servername`: Servername for SNI (Server Name Indication) TLS extension.
 
@@ -476,6 +490,8 @@ Construct a new TLSSocket object from existing TCP socket.
 
   - `NPNProtocols`: Optional, see [tls.createServer][]
 
+  - `ALPNProtocols`: Optional, see [tls.createServer][]
+
   - `SNICallback`: Optional, see [tls.createServer][]
 
   - `session`: Optional, a `Buffer` instance, containing TLS session
@@ -571,7 +587,13 @@ server. If `socket.authorized` is false, then
 `socket.authorizationError` is set to describe how authorization
 failed. Implied but worth mentioning: depending on the settings of the TLS
 server, you unauthorized connections may be accepted.
-`socket.npnProtocol` is a string containing selected NPN protocol.
+
+`socket.npnProtocol` is a string containing the selected NPN protocol
+and `socket.alpnProtocol` is a string containing the selected ALPN
+protocol, When both NPN and ALPN extensions are received, ALPN takes
+precedence over NPN and the next protocol is selected by ALPN. When
+ALPN has no selected protocol, this returns false.
+
 `socket.servername` is a string containing servername requested with
 SNI.
 
@@ -744,8 +766,9 @@ The listener will be called no matter if the server's certificate was
 authorized or not. It is up to the user to test `tlsSocket.authorized`
 to see if the server certificate was signed by one of the specified CAs.
 If `tlsSocket.authorized === false` then the error can be found in
-`tlsSocket.authorizationError`. Also if NPN was used - you can check
-`tlsSocket.npnProtocol` for negotiated protocol.
+`tlsSocket.authorizationError`. Also if ALPN or NPN was used - you can
+check `tlsSocket.alpnProtocol` or `tlsSocket.npnProtocol` for the
+negotiated protocol.
 
 ### Event: 'OCSPResponse'
 
diff --git a/lib/_tls_legacy.js b/lib/_tls_legacy.js
index 7f7707d149dfa2..8c079e341b5b05 100644
--- a/lib/_tls_legacy.js
+++ b/lib/_tls_legacy.js
@@ -177,7 +177,7 @@ CryptoStream.prototype._write = function write(data, encoding, cb) {
     if (this.pair.encrypted._internallyPendingBytes())
       this.pair.encrypted.read(0);
 
-    // Get NPN and Server name when ready
+    // Get ALPN, NPN and Server name when ready
     this.pair.maybeInitFinished();
 
     // Whole buffer was written
@@ -273,7 +273,7 @@ CryptoStream.prototype._read = function read(size) {
            bytesRead < size &&
            this.pair.ssl !== null);
 
-  // Get NPN and Server name when ready
+  // Get ALPN, NPN and Server name when ready
   this.pair.maybeInitFinished();
 
   // Create new buffer if previous was filled up
@@ -726,6 +726,13 @@ function SecurePair(context, isServer, requestCert, rejectUnauthorized,
     this.npnProtocol = null;
   }
 
+  if (process.features.tls_alpn && options.ALPNProtocols) {
+    // keep reference in secureContext not to be GC-ed
+    this.ssl._secureContext.alpnBuffer = options.ALPNProtocols;
+    this.ssl.setALPNrotocols(this.ssl._secureContext.alpnBuffer);
+    this.alpnProtocol = null;
+  }
+
   /* Acts as a r/w stream to the cleartext side of the stream. */
   this.cleartext = new CleartextStream(this, options.cleartext);
 
@@ -778,6 +785,10 @@ SecurePair.prototype.maybeInitFinished = function() {
       this.npnProtocol = this.ssl.getNegotiatedProtocol();
     }
 
+    if (process.features.tls_alpn) {
+      this.alpnProtocol = this.ssl.getALPNNegotiatedProtocol();
+    }
+
     if (process.features.tls_sni) {
       this.servername = this.ssl.getServername();
     }
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
index f0273471772137..d918656a360c7a 100644
--- a/lib/_tls_wrap.js
+++ b/lib/_tls_wrap.js
@@ -239,6 +239,7 @@ function TLSSocket(socket, options) {
   this._SNICallback = null;
   this.servername = null;
   this.npnProtocol = null;
+  this.alpnProtocol = null;
   this.authorized = false;
   this.authorizationError = null;
 
@@ -453,6 +454,12 @@ TLSSocket.prototype._init = function(socket, wrap) {
   if (process.features.tls_npn && options.NPNProtocols)
     ssl.setNPNProtocols(options.NPNProtocols);
 
+  if (process.features.tls_alpn && options.ALPNProtocols) {
+    // keep reference in secureContext not to be GC-ed
+    ssl._secureContext.alpnBuffer = options.ALPNProtocols;
+    ssl.setALPNProtocols(ssl._secureContext.alpnBuffer);
+  }
+
   if (options.handshakeTimeout > 0)
     this.setTimeout(options.handshakeTimeout, this._handleTimeout);
 
@@ -559,6 +566,10 @@ TLSSocket.prototype._finishInit = function() {
     this.npnProtocol = this._handle.getNegotiatedProtocol();
   }
 
+  if (process.features.tls_alpn) {
+    this.alpnProtocol = this.ssl.getALPNNegotiatedProtocol();
+  }
+
   if (process.features.tls_sni && this._tlsOptions.isServer) {
     this.servername = this._handle.getServername();
   }
@@ -766,6 +777,7 @@ function Server(/* [options], listener */) {
       rejectUnauthorized: self.rejectUnauthorized,
       handshakeTimeout: timeout,
       NPNProtocols: self.NPNProtocols,
+      ALPNProtocols: self.ALPNProtocols,
       SNICallback: options.SNICallback || SNICallback
     });
 
@@ -876,6 +888,8 @@ Server.prototype.setOptions = function(options) {
     this.honorCipherOrder = true;
   if (secureOptions) this.secureOptions = secureOptions;
   if (options.NPNProtocols) tls.convertNPNProtocols(options.NPNProtocols, this);
+  if (options.ALPNProtocols)
+    tls.convertALPNProtocols(options.ALPNProtocols, this);
   if (options.sessionIdContext) {
     this.sessionIdContext = options.sessionIdContext;
   } else {
@@ -968,8 +982,10 @@ exports.connect = function(/* [port, host], options, cb */) {
                  (options.socket && options.socket._host) ||
                  'localhost',
       NPN = {},
+      ALPN = {},
       context = tls.createSecureContext(options);
   tls.convertNPNProtocols(options.NPNProtocols, NPN);
+  tls.convertALPNProtocols(options.ALPNProtocols, ALPN);
 
   var socket = new TLSSocket(options.socket, {
     pipe: options.path && !options.port,
@@ -979,6 +995,7 @@ exports.connect = function(/* [port, host], options, cb */) {
     rejectUnauthorized: options.rejectUnauthorized,
     session: options.session,
     NPNProtocols: NPN.NPNProtocols,
+    ALPNProtocols: ALPN.ALPNProtocols,
     requestOCSP: options.requestOCSP
   });
 
diff --git a/lib/https.js b/lib/https.js
index abe4a20907dfdd..edf0aa4432f82d 100644
--- a/lib/https.js
+++ b/lib/https.js
@@ -14,6 +14,13 @@ function Server(opts, requestListener) {
     opts.NPNProtocols = ['http/1.1', 'http/1.0'];
   }
 
+  if (process.features.tls_alpn && !opts.ALPNProtocols) {
+    // http/1.0 is not defined as Protocol IDs in IANA
+    // http://www.iana.org/assignments/tls-extensiontype-values
+    //       /tls-extensiontype-values.xhtml#alpn-protocol-ids
+    opts.ALPNProtocols = ['http/1.1'];
+  }
+
   tls.Server.call(this, opts, http._connectionListener);
 
   this.httpAllowHalfOpen = false;
diff --git a/lib/tls.js b/lib/tls.js
index 0d85a948dcc511..e269e800d31d1c 100644
--- a/lib/tls.js
+++ b/lib/tls.js
@@ -33,27 +33,42 @@ exports.getCiphers = function() {
 
 // Convert protocols array into valid OpenSSL protocols list
 // ("\x06spdy/2\x08http/1.1\x08http/1.0")
-exports.convertNPNProtocols = function convertNPNProtocols(NPNProtocols, out) {
-  // If NPNProtocols is Array - translate it into buffer
-  if (Array.isArray(NPNProtocols)) {
-    var buff = new Buffer(NPNProtocols.reduce(function(p, c) {
-      return p + 1 + Buffer.byteLength(c);
-    }, 0));
-
-    NPNProtocols.reduce(function(offset, c) {
-      var clen = Buffer.byteLength(c);
-      buff[offset] = clen;
-      buff.write(c, offset + 1);
-
-      return offset + 1 + clen;
-    }, 0);
-
-    NPNProtocols = buff;
+function convertProtocols(protocols) {
+  var buff = new Buffer(protocols.reduce(function(p, c) {
+    return p + 1 + Buffer.byteLength(c);
+  }, 0));
+
+  protocols.reduce(function(offset, c) {
+    var clen = Buffer.byteLength(c);
+    buff[offset] = clen;
+    buff.write(c, offset + 1);
+
+    return offset + 1 + clen;
+  }, 0);
+
+  return buff;
+};
+
+exports.convertNPNProtocols  = function(protocols, out) {
+  // If protocols is Array - translate it into buffer
+  if (Array.isArray(protocols)) {
+    protocols = convertProtocols(protocols);
   }
+  // If it's already a Buffer - store it
+  if (protocols instanceof Buffer) {
+    out.NPNProtocols = protocols;
+  }
+};
 
+exports.convertALPNProtocols = function(protocols, out) {
+  // If protocols is Array - translate it into buffer
+  if (Array.isArray(protocols)) {
+    protocols = convertProtocols(protocols);
+  }
   // If it's already a Buffer - store it
-  if (NPNProtocols instanceof Buffer) {
-    out.NPNProtocols = NPNProtocols;
+  if (protocols instanceof Buffer) {
+    // copy new buffer not to be modified by user
+    out.ALPNProtocols = new Buffer(protocols);
   }
 };
 
diff --git a/src/env.h b/src/env.h
index b79ef4ae3e6587..b3f55c173a239e 100644
--- a/src/env.h
+++ b/src/env.h
@@ -42,6 +42,7 @@ namespace node {
 // for the sake of convenience.  Strings should be ASCII-only.
 #define PER_ISOLATE_STRING_PROPERTIES(V)                                      \
   V(address_string, "address")                                                \
+  V(alpn_buffer_string, "alpnBuffer")                                         \
   V(args_string, "args")                                                      \
   V(argv_string, "argv")                                                      \
   V(arrow_message_string, "arrowMessage")                                     \
@@ -205,6 +206,7 @@ namespace node {
   V(timestamp_string, "timestamp")                                            \
   V(title_string, "title")                                                    \
   V(tls_npn_string, "tls_npn")                                                \
+  V(tls_alpn_string, "tls_alpn")                                              \
   V(tls_ocsp_string, "tls_ocsp")                                              \
   V(tls_sni_string, "tls_sni")                                                \
   V(tls_string, "tls")                                                        \
diff --git a/src/node.cc b/src/node.cc
index 10e7da125d49a7..4de2f97491cf46 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -2582,6 +2582,13 @@ static Local<Object> GetFeatures(Environment* env) {
 #endif
   obj->Set(env->tls_npn_string(), tls_npn);
 
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+  Local<Boolean> tls_alpn = True(env->isolate());
+#else
+  Local<Boolean> tls_alpn = False(env->isolate());
+#endif
+  obj->Set(env->tls_alpn_string(), tls_alpn);
+
 #ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
   Local<Boolean> tls_sni = True(env->isolate());
 #else
diff --git a/src/node_constants.cc b/src/node_constants.cc
index 51c2ee814ae504..1259f83697c015 100644
--- a/src/node_constants.cc
+++ b/src/node_constants.cc
@@ -935,6 +935,11 @@ void DefineOpenSSLConstants(Local<Object> target) {
     NODE_DEFINE_CONSTANT(target, NPN_ENABLED);
 #endif
 
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+#define ALPN_ENABLED 1
+    NODE_DEFINE_CONSTANT(target, ALPN_ENABLED);
+#endif
+
 #ifdef RSA_PKCS1_PADDING
     NODE_DEFINE_CONSTANT(target, RSA_PKCS1_PADDING);
 #endif
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 0185970c1cfcfa..1f50b643b5900f 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -167,6 +167,15 @@ template void SSLWrap<TLSWrap>::DestroySSL();
 template int SSLWrap<TLSWrap>::SSLCertCallback(SSL* s, void* arg);
 template void SSLWrap<TLSWrap>::WaitForCertCb(CertCb cb, void* arg);
 
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+template int SSLWrap<TLSWrap>::SelectALPNCallback(
+    SSL* s,
+    const unsigned char** out,
+    unsigned char* outlen,
+    const unsigned char* in,
+    unsigned int inlen,
+    void* arg);
+#endif  // TLSEXT_TYPE_application_layer_protocol_negotiation
 
 static void crypto_threadid_cb(CRYPTO_THREADID* tid) {
   static_assert(sizeof(uv_thread_t) <= sizeof(void*),  // NOLINT(runtime/sizeof)
@@ -1148,6 +1157,9 @@ void SSLWrap<Base>::AddMethods(Environment* env, Local<FunctionTemplate> t) {
   env->SetProtoMethod(t, "setNPNProtocols", SetNPNProtocols);
 #endif
 
+  env->SetProtoMethod(t, "getALPNNegotiatedProtocol", GetALPNNegotiatedProto);
+  env->SetProtoMethod(t, "setALPNProtocols", SetALPNProtocols);
+
   t->PrototypeTemplate()->SetAccessor(
       FIXED_ONE_BYTE_STRING(env->isolate(), "_external"),
       SSLGetter,
@@ -2010,6 +2022,98 @@ void SSLWrap<Base>::SetNPNProtocols(const FunctionCallbackInfo<Value>& args) {
 }
 #endif  // OPENSSL_NPN_NEGOTIATED
 
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+typedef struct tlsextalpnctx_st {
+  unsigned char* data;
+  unsigned short len;
+} tlsextalpnctx;
+
+template <class Base>
+int SSLWrap<Base>::SelectALPNCallback(SSL* s,
+                                      const unsigned char** out,
+                                      unsigned char* outlen,
+                                      const unsigned char* in,
+                                      unsigned int inlen,
+                                      void* arg) {
+  Base* w = static_cast<Base*>(SSL_get_app_data(s));
+  Environment* env = w->env();
+  HandleScope handle_scope(env->isolate());
+  Context::Scope context_scope(env->context());
+
+  Local<Value> alpn_buffer =
+      w->object()->GetHiddenValue(env->alpn_buffer_string());
+  CHECK(Buffer::HasInstance(alpn_buffer));
+  const unsigned char* alpn_protos =
+      reinterpret_cast<const unsigned char*>(Buffer::Data(alpn_buffer));
+  unsigned alpn_protos_len = Buffer::Length(alpn_buffer);
+  int status = SSL_select_next_proto(const_cast<unsigned char**>(out), outlen,
+                                     alpn_protos, alpn_protos_len, in, inlen);
+
+  switch (status) {
+    case OPENSSL_NPN_NO_OVERLAP:
+      // According to 3.2. Protocol Selection of RFC7301,
+      // fatal no_application_protocol alert shall be sent
+      // but current openssl does not support it yet. See
+      // https://rt.openssl.org/Ticket/Display.html?id=3463&user=guest&pass=guest
+      // Instead, we send a warning alert for now.
+      return SSL_TLSEXT_ERR_ALERT_WARNING;
+    case OPENSSL_NPN_NEGOTIATED:
+      return SSL_TLSEXT_ERR_OK;
+    default:
+      return SSL_TLSEXT_ERR_ALERT_FATAL;
+  }
+}
+#endif  // TLSEXT_TYPE_application_layer_protocol_negotiation
+
+
+template <class Base>
+void SSLWrap<Base>::GetALPNNegotiatedProto(
+    const FunctionCallbackInfo<v8::Value>& args) {
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+  HandleScope scope(args.GetIsolate());
+  Base* w = Unwrap<Base>(args.Holder());
+
+  const unsigned char* alpn_proto;
+  unsigned int alpn_proto_len;
+
+  SSL_get0_alpn_selected(w->ssl_, &alpn_proto, &alpn_proto_len);
+
+  if (!alpn_proto)
+    return args.GetReturnValue().Set(false);
+
+  args.GetReturnValue().Set(
+      OneByteString(args.GetIsolate(), alpn_proto, alpn_proto_len));
+#endif  // TLSEXT_TYPE_application_layer_protocol_negotiation
+}
+
+
+template <class Base>
+void SSLWrap<Base>::SetALPNProtocols(
+    const FunctionCallbackInfo<v8::Value>& args) {
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+  HandleScope scope(args.GetIsolate());
+  Base* w = Unwrap<Base>(args.Holder());
+  Environment* env = w->env();
+  if (args.Length() < 1 || !Buffer::HasInstance(args[0]))
+    return env->ThrowTypeError("Must give a Buffer as first argument");
+
+  if (w->is_client()) {
+    const unsigned char* alpn_protos =
+        reinterpret_cast<const unsigned char*>(Buffer::Data(args[0]));
+    unsigned alpn_protos_len = Buffer::Length(args[0]);
+    int r = SSL_set_alpn_protos(w->ssl_, alpn_protos, alpn_protos_len);
+    CHECK_EQ(r, 0);
+  } else {
+    Local<Value> alpn_buffer =  Local<Value>::New(env->isolate(), args[0]);
+    bool ret = w->object()->SetHiddenValue(env->alpn_buffer_string(),
+                                           alpn_buffer);
+    CHECK(ret);
+    // Server should select ALPN protocol from list of advertised by client
+    SSL_CTX_set_alpn_select_cb(w->ssl_->ctx, SelectALPNCallback, nullptr);
+  }
+#endif  // TLSEXT_TYPE_application_layer_protocol_negotiation
+}
+
 
 #ifdef NODE__HAVE_TLSEXT_STATUS_CB
 template <class Base>
diff --git a/src/node_crypto.h b/src/node_crypto.h
index c276df04748942..4aceb41cb8ce19 100644
--- a/src/node_crypto.h
+++ b/src/node_crypto.h
@@ -5,9 +5,7 @@
 #include "node_crypto_clienthello.h"  // ClientHelloParser
 #include "node_crypto_clienthello-inl.h"
 
-#ifdef OPENSSL_NPN_NEGOTIATED
 #include "node_buffer.h"
-#endif
 
 #include "env.h"
 #include "async-wrap.h"
@@ -187,6 +185,7 @@ class SSLWrap {
 #ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
     sni_context_.Reset();
 #endif
+
 #ifdef NODE__HAVE_TLSEXT_STATUS_CB
     ocsp_response_.Reset();
 #endif  // NODE__HAVE_TLSEXT_STATUS_CB
@@ -259,6 +258,16 @@ class SSLWrap {
                                      unsigned int inlen,
                                      void* arg);
 #endif  // OPENSSL_NPN_NEGOTIATED
+
+  static void GetALPNNegotiatedProto(
+      const v8::FunctionCallbackInfo<v8::Value>& args);
+  static void SetALPNProtocols(const v8::FunctionCallbackInfo<v8::Value>& args);
+  static int SelectALPNCallback(SSL* s,
+                                const unsigned char** out,
+                                unsigned char* outlen,
+                                const unsigned char* in,
+                                unsigned int inlen,
+                                void* arg);
   static int TLSExtStatusCallback(SSL* s, void* arg);
   static int SSLCertCallback(SSL* s, void* arg);
   static void SSLGetter(v8::Local<v8::String> property,
diff --git a/test/parallel/test-tls-alpn-server-client.js b/test/parallel/test-tls-alpn-server-client.js
new file mode 100644
index 00000000000000..e5d809d1489aee
--- /dev/null
+++ b/test/parallel/test-tls-alpn-server-client.js
@@ -0,0 +1,540 @@
+'use strict';
+const common = require('../common');
+
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
+  return;
+}
+
+if (!process.features.tls_alpn) {
+  console.error('Skipping because node compiled without OpenSSL or ' +
+                'with old OpenSSL version.');
+  process.exit(0);
+}
+
+const assert = require('assert');
+const fs = require('fs');
+const tls = require('tls');
+
+function filenamePEM(n) {
+  return require('path').join(common.fixturesDir, 'keys', n + '.pem');
+}
+
+function loadPEM(n) {
+  return fs.readFileSync(filenamePEM(n));
+}
+
+var serverPort = common.PORT;
+var serverIP = common.localhostIPv4;
+
+function checkResults(result, expected) {
+  assert.strictEqual(result.server.ALPN, expected.server.ALPN);
+  assert.strictEqual(result.server.NPN, expected.server.NPN);
+  assert.strictEqual(result.client.ALPN, expected.client.ALPN);
+  assert.strictEqual(result.client.NPN, expected.client.NPN);
+}
+
+function runTest(clientsOptions, serverOptions, cb) {
+  serverOptions.key = loadPEM('agent2-key');
+  serverOptions.cert = loadPEM('agent2-cert');
+  var results = [];
+  var index = 0;
+  var server = tls.createServer(serverOptions, function(c) {
+    results[index].server = {ALPN: c.alpnProtocol, NPN: c.npnProtocol};
+  });
+
+  server.listen(serverPort, serverIP, function() {
+    connectClient(clientsOptions);
+  });
+
+  function connectClient(options) {
+    var opt = options.shift();
+    opt.port = serverPort;
+    opt.host = serverIP;
+    opt.rejectUnauthorized = false;
+
+    results[index] = {};
+    var client = tls.connect(opt, function() {
+      results[index].client = {ALPN: client.alpnProtocol,
+                               NPN: client.npnProtocol};
+      client.destroy();
+      if (options.length) {
+        index++;
+        connectClient(options);
+      } else {
+        server.close();
+        cb(results);
+      }
+    });
+  };
+
+}
+
+// Server: ALPN/NPN, Client: ALPN/NPN
+function Test1() {
+  var serverOptions = {
+    ALPNProtocols: ['a', 'b', 'c'],
+    NPNProtocols: ['a', 'b', 'c']
+  };
+
+  var clientsOptions = [{
+    ALPNProtocols: ['a', 'b', 'c'],
+    NPNProtocols: ['a', 'b', 'c']
+  }, {
+    ALPNProtocols: ['c', 'b', 'e'],
+    NPNProtocols: ['c', 'b', 'e']
+  }, {
+    ALPNProtocols: ['first-priority-unsupported', 'x', 'y'],
+    NPNProtocols: ['first-priority-unsupported', 'x', 'y']
+  }];
+
+  runTest(clientsOptions, serverOptions, function(results) {
+    // 'a' is selected by ALPN
+    checkResults(results[0],
+                 {server: {ALPN: 'a', NPN: false},
+                  client: {ALPN: 'a', NPN: undefined}});
+    // 'b' is selected by ALPN
+    checkResults(results[1],
+                 {server: {ALPN: 'b', NPN: false},
+                  client: {ALPN: 'b', NPN: undefined}});
+    // nothing is selected by ALPN
+    checkResults(results[2],
+                 {server: {ALPN: false, NPN: false},
+                  client: {ALPN: false, NPN: undefined}});
+    // execute next test
+    Test2();
+  });
+}
+
+// Server: ALPN/NPN, Client: ALPN
+function Test2() {
+  var serverOptions = {
+    ALPNProtocols: ['a', 'b', 'c'],
+    NPNProtocols: ['a', 'b', 'c']
+  };
+
+  var clientsOptions = [{
+    ALPNProtocols: ['a', 'b', 'c']
+  }, {
+    ALPNProtocols: ['c', 'b', 'e']
+  }, {
+    ALPNProtocols: ['first-priority-unsupported', 'x', 'y']
+  }];
+
+  runTest(clientsOptions, serverOptions, function(results) {
+    // 'a' is selected by ALPN
+    checkResults(results[0],
+                 {server: {ALPN: 'a', NPN: false},
+                  client: {ALPN: 'a', NPN: undefined}});
+    // 'b' is selected by ALPN
+    checkResults(results[1],
+                 {server: {ALPN: 'b', NPN: false},
+                  client: {ALPN: 'b', NPN: undefined}});
+    // nothing is selected by ALPN
+    checkResults(results[2],
+                 {server: {ALPN: false, NPN: false},
+                  client: {ALPN: false, NPN: undefined}});
+    // execute next test
+    Test3();
+  });
+}
+
+// Server: ALPN/NPN, Client: NPN
+function Test3() {
+  var serverOptions = {
+    ALPNProtocols: ['a', 'b', 'c'],
+    NPNProtocols: ['a', 'b', 'c']
+  };
+
+  var clientsOptions = [{
+    NPNProtocols: ['a', 'b', 'c']
+  }, {
+    NPPNProtocols: ['c', 'b', 'e']
+  }, {
+    NPPNProtocols: ['first-priority-unsupported', 'x', 'y']
+  }];
+
+  runTest(clientsOptions, serverOptions, function(results) {
+    // 'a' is selected by NPN
+    checkResults(results[0],
+                 {server: {ALPN: false, NPN: 'a'},
+                  client: {ALPN: false, NPN: 'a'}});
+    // nothing is selected by ALPN
+    checkResults(results[1],
+                 {server: {ALPN: false, NPN: 'http/1.1'},
+                  client: {ALPN: false, NPN: false}});
+    // nothing is selected by ALPN
+    checkResults(results[2],
+                 {server: {ALPN: false, NPN: 'http/1.1'},
+                  client: {ALPN: false, NPN: false}});
+    // execute next test
+    Test4();
+  });
+}
+
+// Server: ALPN/NPN, Client: Nothing
+function Test4() {
+  var serverOptions = {
+    ALPNProtocols: ['a', 'b', 'c'],
+    NPNProtocols: ['a', 'b', 'c']
+  };
+
+  var clientsOptions = [{}, {}, {}];
+
+  runTest(clientsOptions, serverOptions, function(results) {
+    // nothing is selected by ALPN
+    checkResults(results[0],
+                 {server: {ALPN: false, NPN: 'http/1.1'},
+                  client: {ALPN: false, NPN: false}});
+    // nothing is selected by ALPN
+    checkResults(results[1],
+                 {server: {ALPN: false, NPN: 'http/1.1'},
+                  client: {ALPN: false, NPN: false}});
+    // nothing is selected by ALPN
+    checkResults(results[2],
+                 {server: {ALPN: false, NPN: 'http/1.1'},
+                  client: {ALPN: false, NPN: false}});
+    // execute next test
+    Test5();
+  });
+}
+
+// Server: ALPN, Client: ALPN/NPN
+function Test5() {
+  var serverOptions = {
+    ALPNProtocols: ['a', 'b', 'c']
+  };
+
+  var clientsOptions = [{
+    ALPNProtocols: ['a', 'b', 'c'],
+    NPNProtocols: ['a', 'b', 'c']
+  }, {
+    ALPNProtocols: ['c', 'b', 'e'],
+    NPNProtocols: ['c', 'b', 'e']
+  }, {
+    ALPNProtocols: ['first-priority-unsupported', 'x', 'y'],
+    NPNProtocols: ['first-priority-unsupported', 'x', 'y']
+  }];
+
+  runTest(clientsOptions, serverOptions, function(results) {
+    // 'a' is selected by ALPN
+    checkResults(results[0], {server: {ALPN: 'a', NPN: false},
+                              client: {ALPN: 'a', NPN: undefined}});
+    // 'b' is selected by ALPN
+    checkResults(results[1], {server: {ALPN: 'b', NPN: false},
+                              client: {ALPN: 'b', NPN: undefined}});
+    // nothing is selected by ALPN
+    checkResults(results[2], {server: {ALPN: false, NPN: false},
+                              client: {ALPN: false, NPN: undefined}});
+    // execute next test
+    Test6();
+  });
+}
+
+// Server: ALPN, Client: ALPN
+function Test6() {
+  var serverOptions = {
+    ALPNProtocols: ['a', 'b', 'c']
+  };
+
+  var clientsOptions = [{
+    ALPNProtocols: ['a', 'b', 'c']
+  }, {
+    ALPNProtocols: ['c', 'b', 'e']
+  }, {
+    ALPNProtocols: ['first-priority-unsupported', 'x', 'y']
+  }];
+
+  runTest(clientsOptions, serverOptions, function(results) {
+    // 'a' is selected by ALPN
+    checkResults(results[0], {server: {ALPN: 'a', NPN: false},
+                              client: {ALPN: 'a', NPN: undefined}});
+    // 'b' is selected by ALPN
+    checkResults(results[1], {server: {ALPN: 'b', NPN: false},
+                              client: {ALPN: 'b', NPN: undefined}});
+    // nothing is selected by ALPN
+    checkResults(results[2], {server: {ALPN: false, NPN: false},
+                              client: {ALPN: false, NPN: undefined}});
+    // execute next test
+    Test7();
+  });
+}
+
+// Server: ALPN, Client: NPN
+function Test7() {
+  var serverOptions = {
+    ALPNProtocols: ['a', 'b', 'c']
+  };
+
+  var clientsOptions = [{
+    NPNProtocols: ['a', 'b', 'c']
+  }, {
+    NPNProtocols: ['c', 'b', 'e']
+  }, {
+    NPNProtocols: ['first-priority-unsupported', 'x', 'y']
+  }];
+
+  runTest(clientsOptions, serverOptions, function(results) {
+    // nothing is selected by ALPN
+    checkResults(results[0], {server: {ALPN: false, NPN: 'a'},
+                              client: {ALPN: false, NPN: false}});
+    // nothing is selected by ALPN
+    checkResults(results[1], {server: {ALPN: false, NPN: 'c'},
+                              client: {ALPN: false, NPN: false}});
+    // nothing is selected by ALPN
+    checkResults(results[2],
+                 {server: {ALPN: false, NPN:  'first-priority-unsupported'},
+                  client: {ALPN: false, NPN: false}});
+    // execute next test
+    Test8();
+  });
+}
+
+// Server: ALPN, Client: Nothing
+function Test8() {
+  var serverOptions = {
+    ALPNProtocols: ['a', 'b', 'c']
+  };
+
+  var clientsOptions = [{}, {}, {}];
+
+  runTest(clientsOptions, serverOptions, function(results) {
+    // nothing is selected by ALPN
+    checkResults(results[0], {server: {ALPN: false, NPN: 'http/1.1'},
+                              client: {ALPN: false, NPN: false}});
+    // nothing is selected by ALPN
+    checkResults(results[1], {server: {ALPN: false, NPN: 'http/1.1'},
+                              client: {ALPN: false, NPN: false}});
+    // nothing is selected by ALPN
+    checkResults(results[2],
+                 {server: {ALPN: false, NPN:  'http/1.1'},
+                  client: {ALPN: false, NPN: false}});
+    // execute next test
+    Test9();
+  });
+}
+
+// Server: NPN, Client: ALPN/NPN
+function Test9() {
+  var serverOptions = {
+    NPNProtocols: ['a', 'b', 'c']
+  };
+
+  var clientsOptions = [{
+    ALPNrotocols: ['a', 'b', 'c'],
+    NPNProtocols: ['a', 'b', 'c']
+  }, {
+    ALPNProtocols: ['c', 'b', 'e'],
+    NPNProtocols: ['c', 'b', 'e']
+  }, {
+    ALPNProtocols: ['first-priority-unsupported', 'x', 'y'],
+    NPNProtocols: ['first-priority-unsupported', 'x', 'y']
+  }];
+
+  runTest(clientsOptions, serverOptions, function(results) {
+    // 'a' is selected by NPN
+    checkResults(results[0], {server: {ALPN: false, NPN: 'a'},
+                              client: {ALPN: false, NPN: 'a'}});
+    // 'b' is selected by NPN
+    checkResults(results[1], {server: {ALPN: false, NPN: 'b'},
+                              client: {ALPN: false, NPN: 'b'}});
+    // nothing is selected
+    checkResults(results[2],
+                 {server: {ALPN: false, NPN: 'first-priority-unsupported'},
+                  client: {ALPN: false, NPN: false}});
+    // execute next test
+    Test10();
+  });
+}
+
+// Server: NPN, Client: ALPN
+function Test10() {
+  var serverOptions = {
+    NPNProtocols: ['a', 'b', 'c']
+  };
+
+  var clientsOptions = [{
+    ALPNProtocols: ['a', 'b', 'c']
+  }, {
+    ALPNProtocols: ['c', 'b', 'e']
+  }, {
+    ALPNProtocols: ['first-priority-unsupported', 'x', 'y']
+  }];
+
+  runTest(clientsOptions, serverOptions, function(results) {
+    // nothing is selected
+    checkResults(results[0], {server: {ALPN: false, NPN: 'http/1.1'},
+                              client: {ALPN: false, NPN: false}});
+    // nothing is selected
+    checkResults(results[1], {server: {ALPN: false, NPN: 'http/1.1'},
+                              client: {ALPN: false, NPN: false}});
+    // nothing is selected
+    checkResults(results[2], {server: {ALPN: false, NPN: 'http/1.1'},
+                              client: {ALPN: false, NPN: false}});
+    // execute next test
+    Test11();
+  });
+}
+
+// Server: NPN, Client: NPN
+function Test11() {
+  var serverOptions = {
+    NPNProtocols: ['a', 'b', 'c']
+  };
+
+  var clientsOptions = [{
+    NPNProtocols: ['a', 'b', 'c']
+  }, {
+    NPNProtocols: ['c', 'b', 'e']
+  }, {
+    NPNProtocols: ['first-priority-unsupported', 'x', 'y']
+  }];
+
+  runTest(clientsOptions, serverOptions, function(results) {
+    // 'a' is selected by NPN
+    checkResults(results[0], {server: {ALPN: false, NPN: 'a'},
+                              client: {ALPN: false, NPN: 'a'}});
+    // 'b' is selected by NPN
+    checkResults(results[1], {server: {ALPN: false, NPN: 'b'},
+                              client: {ALPN: false, NPN: 'b'}});
+    // nothing is selected
+    checkResults(results[2],
+                 {server: {ALPN: false, NPN: 'first-priority-unsupported'},
+                  client: {ALPN: false, NPN: false}});
+    // execute next test
+    Test12();
+  });
+}
+
+// Server: NPN, Client: Nothing
+function Test12() {
+  var serverOptions = {
+    NPNProtocols: ['a', 'b', 'c']
+  };
+
+  var clientsOptions = [{}, {}, {}];
+
+  runTest(clientsOptions, serverOptions, function(results) {
+    // nothing is selected
+    checkResults(results[0], {server: {ALPN: false, NPN: 'http/1.1'},
+                              client: {ALPN: false, NPN: false}});
+    // nothing is selected
+    checkResults(results[1], {server: {ALPN: false, NPN: 'http/1.1'},
+                              client: {ALPN: false, NPN: false}});
+    // nothing is selected
+    checkResults(results[2],
+                 {server: {ALPN: false, NPN: 'http/1.1'},
+                  client: {ALPN: false, NPN: false}});
+    // execute next test
+    Test13();
+  });
+}
+
+// Server: Nothing, Client: ALPN/NPN
+function Test13() {
+  var serverOptions = {};
+
+  var clientsOptions = [{
+    ALPNrotocols: ['a', 'b', 'c'],
+    NPNProtocols: ['a', 'b', 'c']
+  }, {
+    ALPNProtocols: ['c', 'b', 'e'],
+    NPNProtocols: ['c', 'b', 'e']
+  }, {
+    ALPNProtocols: ['first-priority-unsupported', 'x', 'y'],
+    NPNProtocols: ['first-priority-unsupported', 'x', 'y']
+  }];
+
+  runTest(clientsOptions, serverOptions, function(results) {
+    // nothing is selected
+    checkResults(results[0], {server: {ALPN: false, NPN: 'a'},
+                              client: {ALPN: false, NPN: false}});
+    // nothing is selected
+    checkResults(results[1], {server: {ALPN: false, NPN: 'c'},
+                              client: {ALPN: false, NPN: false}});
+    // nothing is selected
+    checkResults(results[2],
+                 {server: {ALPN: false, NPN: 'first-priority-unsupported'},
+                  client: {ALPN: false, NPN: false}});
+    // execute next test
+    Test14();
+  });
+}
+
+// Server: Nothing, Client: ALPN
+function Test14() {
+  var serverOptions = {};
+
+  var clientsOptions = [{
+    ALPNrotocols: ['a', 'b', 'c']
+  }, {
+    ALPNProtocols: ['c', 'b', 'e']
+  }, {
+    ALPNProtocols: ['first-priority-unsupported', 'x', 'y']
+  }];
+
+  runTest(clientsOptions, serverOptions, function(results) {
+    // nothing is selected
+    checkResults(results[0], {server: {ALPN: false, NPN: 'http/1.1'},
+                              client: {ALPN: false, NPN: false}});
+    // nothing is selected
+    checkResults(results[1], {server: {ALPN: false, NPN: 'http/1.1'},
+                              client: {ALPN: false, NPN: false}});
+    // nothing is selected
+    checkResults(results[2],
+                 {server: {ALPN: false, NPN: 'http/1.1'},
+                  client: {ALPN: false, NPN: false}});
+    // execute next test
+    Test15();
+  });
+}
+
+// Server: Nothing, Client: NPN
+function Test15() {
+  var serverOptions = {};
+
+  var clientsOptions = [{
+    NPNProtocols: ['a', 'b', 'c']
+  }, {
+    NPNProtocols: ['c', 'b', 'e']
+  }, {
+    NPNProtocols: ['first-priority-unsupported', 'x', 'y']
+  }];
+
+  runTest(clientsOptions, serverOptions, function(results) {
+    // nothing is selected
+    checkResults(results[0], {server: {ALPN: false, NPN: 'a'},
+                              client: {ALPN: false, NPN: false}});
+    // nothing is selected
+    checkResults(results[1], {server: {ALPN: false, NPN: 'c'},
+                              client: {ALPN: false, NPN: false}});
+    // nothing is selected
+    checkResults(results[2],
+                 {server: {ALPN: false, NPN: 'first-priority-unsupported'},
+                  client: {ALPN: false, NPN: false}});
+    // execute next test
+    Test16();
+  });
+}
+
+// Server: Nothing, Client: Nothing
+function Test16() {
+  var serverOptions = {};
+
+  var clientsOptions = [{}, {}, {}];
+
+  runTest(clientsOptions, serverOptions, function(results) {
+    // nothing is selected
+    checkResults(results[0], {server: {ALPN: false, NPN: 'http/1.1'},
+                              client: {ALPN: false, NPN: false}});
+    // nothing is selected
+    checkResults(results[1], {server: {ALPN: false, NPN: 'http/1.1'},
+                              client: {ALPN: false, NPN: false}});
+    // nothing is selected
+    checkResults(results[2],
+                 {server: {ALPN: false, NPN: 'http/1.1'},
+                  client: {ALPN: false, NPN: false}});
+  });
+}
+
+Test1();

From 5029f41b2f37d911eeeedde7ea30bdbaf99efb7c Mon Sep 17 00:00:00 2001
From: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Date: Tue, 27 Oct 2015 00:10:24 +0900
Subject: [PATCH 056/323] tls,crypto: move NPN protcol data to hidden value

This fix is to be consistent implementation with ALPN. Tow NPN
protocol data in the persistent memebers move to hidden variables in
the wrap object.

PR-URL: https://github.com/nodejs/node/pull/2564
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 src/env.h          |  2 ++
 src/node_crypto.cc | 48 +++++++++++++++++++++++++++++-----------------
 src/node_crypto.h  |  9 ---------
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/src/env.h b/src/env.h
index b3f55c173a239e..c558764c671a21 100644
--- a/src/env.h
+++ b/src/env.h
@@ -131,6 +131,7 @@ namespace node {
   V(netmask_string, "netmask")                                                \
   V(nice_string, "nice")                                                      \
   V(nlink_string, "nlink")                                                    \
+  V(npn_buffer_string, "npnBuffer")                                           \
   V(nsname_string, "nsname")                                                  \
   V(ocsp_request_string, "OCSPRequest")                                       \
   V(offset_string, "offset")                                                  \
@@ -181,6 +182,7 @@ namespace node {
   V(serial_string, "serial")                                                  \
   V(scavenge_string, "scavenge")                                              \
   V(scopeid_string, "scopeid")                                                \
+  V(selected_npn_buffer_string, "selectedNpnBuffer")                          \
   V(sent_shutdown_string, "sentShutdown")                                     \
   V(serial_number_string, "serialNumber")                                     \
   V(service_string, "service")                                                \
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 1f50b643b5900f..2bbfa0552b2f3f 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -1917,14 +1917,17 @@ int SSLWrap<Base>::AdvertiseNextProtoCallback(SSL* s,
   HandleScope handle_scope(env->isolate());
   Context::Scope context_scope(env->context());
 
-  if (w->npn_protos_.IsEmpty()) {
+  Local<Value> npn_buffer =
+      w->object()->GetHiddenValue(env->npn_buffer_string());
+
+  if (npn_buffer.IsEmpty()) {
     // No initialization - no NPN protocols
     *data = reinterpret_cast<const unsigned char*>("");
     *len = 0;
   } else {
-    Local<Object> obj = PersistentToLocal(env->isolate(), w->npn_protos_);
-    *data = reinterpret_cast<const unsigned char*>(Buffer::Data(obj));
-    *len = Buffer::Length(obj);
+    CHECK(Buffer::HasInstance(npn_buffer));
+    *data = reinterpret_cast<const unsigned char*>(Buffer::Data(npn_buffer));
+    *len = Buffer::Length(npn_buffer);
   }
 
   return SSL_TLSEXT_ERR_OK;
@@ -1943,25 +1946,27 @@ int SSLWrap<Base>::SelectNextProtoCallback(SSL* s,
   HandleScope handle_scope(env->isolate());
   Context::Scope context_scope(env->context());
 
-  // Release old protocol handler if present
-  w->selected_npn_proto_.Reset();
+  Local<Value> npn_buffer =
+      w->object()->GetHiddenValue(env->npn_buffer_string());
 
-  if (w->npn_protos_.IsEmpty()) {
+  if (npn_buffer.IsEmpty()) {
     // We should at least select one protocol
     // If server is using NPN
     *out = reinterpret_cast<unsigned char*>(const_cast<char*>("http/1.1"));
     *outlen = 8;
 
     // set status: unsupported
-    w->selected_npn_proto_.Reset(env->isolate(), False(env->isolate()));
+    bool r = w->object()->SetHiddenValue(env->selected_npn_buffer_string(),
+                                         False(env->isolate()));
+    CHECK(r);
 
     return SSL_TLSEXT_ERR_OK;
   }
 
-  Local<Object> obj = PersistentToLocal(env->isolate(), w->npn_protos_);
+  CHECK(Buffer::HasInstance(npn_buffer));
   const unsigned char* npn_protos =
-      reinterpret_cast<const unsigned char*>(Buffer::Data(obj));
-  size_t len = Buffer::Length(obj);
+      reinterpret_cast<const unsigned char*>(Buffer::Data(npn_buffer));
+  size_t len = Buffer::Length(npn_buffer);
 
   int status = SSL_select_next_proto(out, outlen, in, inlen, npn_protos, len);
   Local<Value> result;
@@ -1979,8 +1984,9 @@ int SSLWrap<Base>::SelectNextProtoCallback(SSL* s,
       break;
   }
 
-  if (!result.IsEmpty())
-    w->selected_npn_proto_.Reset(env->isolate(), result);
+  bool r = w->object()->SetHiddenValue(env->selected_npn_buffer_string(),
+                                       result);
+  CHECK(r);
 
   return SSL_TLSEXT_ERR_OK;
 }
@@ -1992,9 +1998,12 @@ void SSLWrap<Base>::GetNegotiatedProto(
   Base* w = Unwrap<Base>(args.Holder());
 
   if (w->is_client()) {
-    if (w->selected_npn_proto_.IsEmpty() == false) {
-      args.GetReturnValue().Set(w->selected_npn_proto_);
-    }
+    Local<Value> selected_npn_buffer =
+        w->object()->GetHiddenValue(w->env()->selected_npn_buffer_string());
+
+    if (selected_npn_buffer.IsEmpty() == false)
+      args.GetReturnValue().Set(selected_npn_buffer);
+
     return;
   }
 
@@ -2014,11 +2023,14 @@ void SSLWrap<Base>::GetNegotiatedProto(
 template <class Base>
 void SSLWrap<Base>::SetNPNProtocols(const FunctionCallbackInfo<Value>& args) {
   Base* w = Unwrap<Base>(args.Holder());
+  Environment* env = w->env();
 
   if (args.Length() < 1 || !Buffer::HasInstance(args[0]))
-    return w->env()->ThrowTypeError("Must give a Buffer as first argument");
+    return env->ThrowTypeError("Must give a Buffer as first argument");
 
-  w->npn_protos_.Reset(args.GetIsolate(), args[0].As<Object>());
+  Local<Value> npn_buffer =  Local<Value>::New(env->isolate(), args[0]);
+  bool r = w->object()->SetHiddenValue(env->npn_buffer_string(), npn_buffer);
+  CHECK(r);
 }
 #endif  // OPENSSL_NPN_NEGOTIATED
 
diff --git a/src/node_crypto.h b/src/node_crypto.h
index 4aceb41cb8ce19..06e2ad40fba201 100644
--- a/src/node_crypto.h
+++ b/src/node_crypto.h
@@ -178,10 +178,6 @@ class SSLWrap {
       next_sess_ = nullptr;
     }
 
-#ifdef OPENSSL_NPN_NEGOTIATED
-    npn_protos_.Reset();
-    selected_npn_proto_.Reset();
-#endif
 #ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
     sni_context_.Reset();
 #endif
@@ -298,11 +294,6 @@ class SSLWrap {
   v8::Persistent<v8::Object> ocsp_response_;
 #endif  // NODE__HAVE_TLSEXT_STATUS_CB
 
-#ifdef OPENSSL_NPN_NEGOTIATED
-  v8::Persistent<v8::Object> npn_protos_;
-  v8::Persistent<v8::Value> selected_npn_proto_;
-#endif  // OPENSSL_NPN_NEGOTIATED
-
 #ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
   v8::Persistent<v8::Value> sni_context_;
 #endif

From 0317c880da5a6c77dcda0c5eac3548e40568142e Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Wed, 21 Oct 2015 23:42:27 -0400
Subject: [PATCH 057/323] doc: add TSC meeting minutes 2015-10-21

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/3480
---
 doc/tsc-meetings/2015-10-21.md | 214 +++++++++++++++++++++++++++++++++
 1 file changed, 214 insertions(+)
 create mode 100644 doc/tsc-meetings/2015-10-21.md

diff --git a/doc/tsc-meetings/2015-10-21.md b/doc/tsc-meetings/2015-10-21.md
new file mode 100644
index 00000000000000..5aad511600bb88
--- /dev/null
+++ b/doc/tsc-meetings/2015-10-21.md
@@ -0,0 +1,214 @@
+# Node Foundation Core Technical Committee (CTC) Meeting 2015-10-21
+
+## Links
+
+* **Audio Recording**: https://soundcloud.com/node-foundation/tsc-meeting-2015-10-21
+* **GitHub Issue**: https://github.com/nodejs/node/issues/3464
+* **Minutes Google Doc**: <https://docs.google.com/document/d/1ad8Xlza_B-iWexdlAd1Z5muzBy_HH88t_iSD31OUepA>
+* _Previous Minutes Google Doc: <https://docs.google.com/document/d/1tVPxA4Y3n3dmICJFZN2vK93PXjCaUQ-eiN2mvt7zqbE>_
+
+## Present
+
+* Rod Vagg (CTC)
+* Brian White (CTC)
+* Steven R. Loomis (observer)
+* James Snell (CTC)
+* Michael Dawson (observer)
+* Chris Dickinson (CTC)
+* Ben Noordhuis (CTC)
+* Jeremiah Senkpiel (CTC)
+* Trevor Norris (CTC)
+* Alexis Campailla (CTC)
+* Mikeal Rogers (observer)
+* Shigeki Ohtsu (CTC)
+* Seth Thompson (observer)
+* Bert Belder (CTC)
+* Fedor Indutny (CTC)
+## Agenda
+
+Extracted from **tsc-agenda** labelled issues and pull requests in the nodejs org prior to meeting.
+
+### nodejs/node
+
+* governance: add new collaborators #VIII [#3472](https://github.com/nodejs/node/issues/3472)
+* detect "full-icu" module [#3460](https://github.com/nodejs/node/issues/3460)
+* WG: Considering a new HTTP WG [#3214](https://github.com/nodejs/node/issues/3214)
+* node: deprecate public access to `process.binding` [#2768](https://github.com/nodejs/node/pull/2768)
+
+## Minutes
+
+### Review of previous meeting
+
+* V8 security reporting [#3348](https://github.com/nodejs/node/issues/3348)
+* doc: add information about Assert behavior and maintenance [#3330](https://github.com/nodejs/node/pull/3330)
+* WG: Considering a new HTTP WG [#3214](https://github.com/nodejs/node/issues/3214)
+* Discussion: LTS & v5 release planning [#3000](https://github.com/nodejs/node/issues/3000)
+* Compiling node v4.0.0 with OpenSSL 1.0.1 fails [#2783](https://github.com/nodejs/node/issues/2783)
+* Umbrella Program [#2](https://github.com/nodejs/TSC/pull/2)
+
+### Standup
+
+* Rod Vagg: index.tab and index.json updates (nodejs.org/dist/index.*) including an “lts” field, also made consistent directories for ancient Node tarballs with shasums files so nvm and other tools can simplify their access. v5 and other build yak shaving.
+* Brian White: usual triaging and PR and Issues commenting, not much else
+* Steven R. Loomis: Intl meeting, "full-icu" npm module [will be away until Nov 11 meeting, Unicode conf/Unicode-TC]
+* James Snell: Working on localization for the node runtime [#3413](https://github.com/nodejs/node/pull/3413)
+* Michael Dawson: Working through PPC and AIX PRs and issues, LTS WG discussions, Benchmarking WG, working with Stefan on agenda items for API WG meeting.
+* Chris Dickinson: was busy with vacation and conferences, but looking into the WhatWG Streams spec, next up is static analysis server
+* Ben Noordhuis: The usual. Looking into make the debugger better. The test suite is in bad shape
+* Jeremiah Senkpiel: issue and PR work — going back through the backlog now, helping with v5 release + npm@3
+* Trevor Norris: flurry of AsyncWrap PRs, trying to get it to a point where people could more reliably use it, it can’t be hidden forever.
+* Alexis Campailla: Sick, traveling; CI progress on flakiness, some progress on native module build service
+* Mikeal Rogers: Foundation resources for v5 release: PR folks wrote a blog post, expectation setting, make sure enterprises are still using LTS, if you’re a dev here’s what to be excited about, etc.
+* Shigeki Ohtsu: Worked semver-major fix to limit DH key size [#1831] (https://github.com/nodejs/node/pull/1831) and some works for root certs.
+* Seth Thompson: Security mailing list stuff went through this week, working on v8 side of things to create a new version of the octane benchmark, excited about the benchmarking WG
+* Bert Belder: nothing
+* Fedor Indutny: reviewing PRs, helped fix a beforeExit bug, fixing yet another V8’s ArrayBuffer issue
+  - Discussed the ArrayBuffer issue in detail
+
+* (Aside: Shigeki and Fedor were asked to look at [#3406](https://github.com/nodejs/node/issues/3406) - “p1/p2” issue )
+
+### governance: add new collaborators #VIII [#3472](https://github.com/nodejs/node/issues/3472)
+
+- Discussed onboarding.
+
+- Action: Jeremiah to schedule and run another onaboarding, Chris to tune in.
+
+### detect "full-icu" module [#3460](https://github.com/nodejs/node/issues/3460)
+
+Stems from conversation from the 0.X days about whether Node should ship other languages separately.
+
+This is a module published on npm as an alternative to shipping with Node proper.
+
+Whether node can detect a full-icu install in a special place (node_modules/full-icu, global/node_modules/full-icu)
+
+Nathan7 commented with a concern about coupling npm to node
+
+Currently have to start node with ICU_DATA_PATH=some/path/to/file
+
+Rod: Couple it to `execPath`
+
+James: globally installed could install into a well known global location
+
+Rod: Does this have to be done at startup?
+
+Stephen: Yes. V8 has to have the data available before starting.
+
+James: Happens right after parsing args
+
+Rod: Could use HOME?
+
+Stephen: Could use NODE_PATH?
+
+Rod: Trying to move away from NODE_PATH
+
+Ben: Might just bite the bullet and include ICU?
+
+Stephen: I would like that, but I am sympathetic to folks running on OpenWRT
+
+Ben: I can see that, but all this installing in special paths leaves a lot of margin for error.
+
+James: Full ICU will double the size of the Node binary. Hard pill to swallow.
+
+Rod: We could offer alternative downloads?
+
+Stephen: Two downloads would work as well. We could do this all from build infra.
+
+Bert: I would not be in favor of that. We end up with “oh my module doesn’t work” “oh you didn’t download the right flavor of Node”
+
+Jeremiah: It’s going to make it confusing no matter what
+
+... [I missed this]
+
+Chris: could we offer better error messages?
+
+Rod: it peeks through in a lot of places — the ICU object, strings, etc. Maybe best to leave to module authors? Include a process.versions.icu object?
+
+James: small-icu is the default build running locally — CI doesn’t run with ICU enabled?
+
+Trevor: even if small-icu is there, it means less data, but not less build time. I would like to see how that affects the raspberry pi’s build time.
+
+Ben: we could avoid rebuilding ICU on rasppis
+
+Stephen: or use a precompiled ICU
+
+Jeremiah: Assumes an internet connected machine
+
+Rod: If we go with small-icu we should make it available
+
+Ben: should we add it to the repo?
+
+Alexis: I think so, it’s causing problems
+
+[???]: It’s about 80mb
+
+Rod: How big is it?
+
+Stephen: The source size & binary size was comparable to Node.
+We could have a non-standard source checked in.
+
+Mikeal: we could use the large file storage stuff GH just added.
+Stephen: 25mb uncompressed, 130mb for source tree
+
+Mikeal: if we say “you need ICU to build”  we need to make it available
+
+Trevor: How’s this going to work with bouncing between branches?
+
+Alexis: What about keeping it as text?
+
+Ben:
+
+Steven: We have a 25mb compressed zip of source, that itself contains a 25mb compressed zip. We could strip that down — what would it take to delete the tests, etc — a subset
+
+Mikeal: so could we just install this 25mb file?
+
+Rod: This adds a dep on Git LFS
+
+Mikeal: Let’s try to solve one problem at a time — fix downloading, not making the default
+
+Rod: I’m happy with how the CI does it
+
+…
+
+Stephen: The first time you hit something ICU-based it loads it.
+
+Rod: I’m just wondering if this could be turned into a proper npm module.
+
+Stephen: I’m not sure — it looks pretty deeply enmeshed into V8
+
+Seth: I don’t have answers off the top of my head on that one, I responded on the thread; we don’t currently have a priority to mess
+around with localization. If there’s a design doc that proposes cleaning things up we’d be interested
+
+James: Resource bundle mechanism — [Note: didn’t get all of this] “using the same startup sequence as Intl.. so needs to be configured at start time” (https://github.com/nodejs/node/pull/3413 uses ICU’s resource bundle mechanism, which uses the same init path as the core data. ICU does not allow multiple initializations.
+
+Alexis: If the only reason we’re trying to package it is to use npm to install it, maybe we’re complicating this unnecessarily
+
+Rod: On the iojs side we decided not to go with ICU. It’s in core because it has to be initialized before v8 is started, my question is this something that could be changed upstream in v8? Ideally this should not be in core.
+
+Steven: It didn’t look like it could be split off easily.
+
+Chris: JS proxies
+
+Steven: Possible, but _very_ tricky
+
+[Moving conversation to GH]
+
+
+### WG: Considering a new HTTP WG [#3214](https://github.com/nodejs/node/issues/3214)
+
+HTTP WG first meeting is tomorrow at 1pm Pacific, nothing to discuss yet
+
+### node: deprecate public access to `process.binding` [#2768](https://github.com/nodejs/node/pull/2768)
+
+Lots of discussion, focused on `process.binding('natives')`. Summary: We should at least try to make it read-only first. Ben said he would follow up with a PR.
+
+### node: make listen address configurable [#3316](https://github.com/nodejs/node/pull/3316)
+
+Fedor: Ben suggested commandline argument to submit hostname and port. Fedor concerned about the amout of code required to parse and separate the two parts of the option. Would be better to have a separate argument for hostname.
+
+Discussion about usability vs simplicity of code.
+
+Quick vote on whether to move forward with the PR in its current form, no objections.
+
+## Next Meeting
+
+October 28th, 2015

From 6a04cc0a438ae94f30224f224fcb7080d3078cb7 Mon Sep 17 00:00:00 2001
From: Trevor Norris <trev.norris@gmail.com>
Date: Fri, 23 Oct 2015 12:34:11 -0600
Subject: [PATCH 058/323] buffer: fix value check for writeUInt{B,L}E

Fixes: https://github.com/nodejs/node/issues/3497
PR-URL: https://github.com/nodejs/node/pull/3500
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 lib/buffer.js                   | 12 ++++++++----
 test/parallel/test-writeuint.js | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/lib/buffer.js b/lib/buffer.js
index 41d5e0aba2d536..53553253209923 100644
--- a/lib/buffer.js
+++ b/lib/buffer.js
@@ -832,8 +832,10 @@ Buffer.prototype.writeUIntLE = function(value, offset, byteLength, noAssert) {
   value = +value;
   offset = offset >>> 0;
   byteLength = byteLength >>> 0;
-  if (!noAssert)
-    checkInt(this, value, offset, byteLength, Math.pow(2, 8 * byteLength), 0);
+  if (!noAssert) {
+    const maxBytes = Math.pow(2, 8 * byteLength) - 1;
+    checkInt(this, value, offset, byteLength, maxBytes, 0);
+  }
 
   var mul = 1;
   var i = 0;
@@ -849,8 +851,10 @@ Buffer.prototype.writeUIntBE = function(value, offset, byteLength, noAssert) {
   value = +value;
   offset = offset >>> 0;
   byteLength = byteLength >>> 0;
-  if (!noAssert)
-    checkInt(this, value, offset, byteLength, Math.pow(2, 8 * byteLength), 0);
+  if (!noAssert) {
+    const maxBytes = Math.pow(2, 8 * byteLength) - 1;
+    checkInt(this, value, offset, byteLength, maxBytes, 0);
+  }
 
   var i = byteLength - 1;
   var mul = 1;
diff --git a/test/parallel/test-writeuint.js b/test/parallel/test-writeuint.js
index 22579ceecaef2d..baa12aa57666f3 100644
--- a/test/parallel/test-writeuint.js
+++ b/test/parallel/test-writeuint.js
@@ -122,6 +122,25 @@ function test32(clazz) {
 }
 
 
+function testUint(clazz) {
+  const data = new clazz(8);
+  var val = 1;
+
+  // Test 0 to 5 bytes.
+  for (var i = 0; i <= 5; i++) {
+    const errmsg = `byteLength: ${i}`;
+    ASSERT.throws(function() {
+      data.writeUIntBE(val, 0, i);
+    }, /value is out of bounds/, errmsg);
+    ASSERT.throws(function() {
+      data.writeUIntLE(val, 0, i);
+    }, /value is out of bounds/, errmsg);
+    val *= 0x100;
+  }
+}
+
+
 test8(Buffer);
 test16(Buffer);
 test32(Buffer);
+testUint(Buffer);

From c9786bb68003135676cf742bb4ad4dc160eaa0d2 Mon Sep 17 00:00:00 2001
From: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Date: Sun, 20 Sep 2015 13:07:03 +0530
Subject: [PATCH 059/323] http{s}: don't connect to localhost on invalid URL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the URL passed to `http{s}.request` or `http{s}.get` is not properly
parsable by `url.parse`, we fall back to use `localhost` and port 80.
This creates confusing error messages like in this question
http://stackoverflow.com/q/32675907/1903116.

This patch throws an error message, if `url.parse` fails to parse the
URL properly.

Previous Discussion: https://github.com/nodejs/node/pull/2966
PR-URL: https://github.com/nodejs/node/pull/2967

Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/_http_client.js                     |  3 +++
 lib/https.js                            |  3 +++
 test/parallel/test-http-invalid-urls.js | 19 +++++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 test/parallel/test-http-invalid-urls.js

diff --git a/lib/_http_client.js b/lib/_http_client.js
index 201593e61da5ac..02d6e7ed374a98 100644
--- a/lib/_http_client.js
+++ b/lib/_http_client.js
@@ -22,6 +22,9 @@ function ClientRequest(options, cb) {
 
   if (typeof options === 'string') {
     options = url.parse(options);
+    if (!options.hostname) {
+      throw new Error('Unable to determine the domain name');
+    }
   } else {
     options = util._extend({}, options);
   }
diff --git a/lib/https.js b/lib/https.js
index edf0aa4432f82d..90b6346bd95f20 100644
--- a/lib/https.js
+++ b/lib/https.js
@@ -163,6 +163,9 @@ exports.Agent = Agent;
 exports.request = function(options, cb) {
   if (typeof options === 'string') {
     options = url.parse(options);
+    if (!options.hostname) {
+      throw new Error('Unable to determine the domain name');
+    }
   } else {
     options = util._extend({}, options);
   }
diff --git a/test/parallel/test-http-invalid-urls.js b/test/parallel/test-http-invalid-urls.js
new file mode 100644
index 00000000000000..678e8eceeb2d46
--- /dev/null
+++ b/test/parallel/test-http-invalid-urls.js
@@ -0,0 +1,19 @@
+'use strict';
+
+require('../common');
+const assert = require('assert');
+const http = require('http');
+const https = require('https');
+const error = 'Unable to determine the domain name';
+
+function test(host) {
+  ['get', 'request'].forEach((method) => {
+    [http, https].forEach((module) => {
+      assert.throws(() => module[method](host, () => {
+        throw new Error(`${module}.${method} should not connect to ${host}`);
+      }), error);
+    });
+  });
+}
+
+['www.nodejs.org', 'localhost', '127.0.0.1', 'http://:80/'].forEach(test);

From 80573153b8b314178437ea8557b2fd67e5c2c098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <mic.besace@gmail.com>
Date: Tue, 20 Oct 2015 21:39:49 +0200
Subject: [PATCH 060/323] util: make inherits work with classes

The current implementation overwrites the prototype of the target
constructor. It is not allowed with ES2015 classes because the prototype
property is read only. Use Object.setPrototypeOf instead.

Fixes: https://github.com/nodejs/node/issues/3452
PR-URL: https://github.com/nodejs/node/pull/3455
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/util.js                         |  9 +-------
 test/parallel/test-util-inherits.js | 34 +++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/lib/util.js b/lib/util.js
index 19d3d464f104d4..d143552615baa2 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -761,14 +761,7 @@ exports.inherits = function(ctor, superCtor) {
                         'have a prototype.');
 
   ctor.super_ = superCtor;
-  ctor.prototype = Object.create(superCtor.prototype, {
-    constructor: {
-      value: ctor,
-      enumerable: false,
-      writable: true,
-      configurable: true
-    }
-  });
+  Object.setPrototypeOf(ctor.prototype, superCtor.prototype);
 };
 
 exports._extend = function(origin, add) {
diff --git a/test/parallel/test-util-inherits.js b/test/parallel/test-util-inherits.js
index baa77ea4405484..a3c5786fe261d0 100644
--- a/test/parallel/test-util-inherits.js
+++ b/test/parallel/test-util-inherits.js
@@ -40,6 +40,40 @@ const c = new C();
 assert.strictEqual(c.getValue(), 'abc');
 assert.strictEqual(c.constructor, C);
 
+// inherits can be called after setting prototype properties
+function D() {
+  C.call(this);
+  this._d = 'd';
+}
+
+D.prototype.d = function() { return this._d; };
+inherits(D, C);
+
+assert.strictEqual(D.super_, C);
+
+const d = new D();
+assert.strictEqual(d.c(), 'c');
+assert.strictEqual(d.d(), 'd');
+assert.strictEqual(d.constructor, D);
+
+// ES6 classes can inherit from a constructor function
+class E {
+  constructor() {
+    D.call(this);
+    this._e = 'e';
+  }
+  e() { return this._e; }
+}
+inherits(E, D);
+
+assert.strictEqual(E.super_, D);
+
+const e = new E();
+assert.strictEqual(e.getValue(), 'abc');
+assert.strictEqual(e.d(), 'd');
+assert.strictEqual(e.e(), 'e');
+assert.strictEqual(e.constructor, E);
+
 // should throw with invalid arguments
 assert.throws(function() { inherits(A, {}); }, TypeError);
 assert.throws(function() { inherits(A, null); }, TypeError);

From 134a60c7858be73506cbd9133b1c23e8df2886a5 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Mon, 26 Oct 2015 14:11:03 +0100
Subject: [PATCH 061/323] src: fix race condition in debug signal on exit

Before this commit, sending a SIGUSR1 at program exit could trigger a
hard to reproduce race condition where `v8::Debug::DebugBreak(isolate)`
got called when the isolate was in the process of being torn down.

A similar race condition is in theory possible when sending signals
to two threads simultaneously but I haven't been able to reproduce
that myself (and I tried, oh how I tried.)

This commit fixes the race condition by turning `node_isolate` into
a `std::atomic` and using it as an ad hoc synchronization primitive
in places where that is necessary.

A bare minimum std::atomic polyfill is added for OS X because Apple
wouldn't be Apple if things just worked out of the box.

PR-URL: https://github.com/nodejs/node/pull/3528
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 src/atomic-polyfill.h | 18 ++++++++++++++
 src/node.cc           | 55 +++++++++++++++++++++++++++++++++----------
 2 files changed, 60 insertions(+), 13 deletions(-)
 create mode 100644 src/atomic-polyfill.h

diff --git a/src/atomic-polyfill.h b/src/atomic-polyfill.h
new file mode 100644
index 00000000000000..1c5f414fa13a81
--- /dev/null
+++ b/src/atomic-polyfill.h
@@ -0,0 +1,18 @@
+#ifndef SRC_ATOMIC_POLYFILL_H_
+#define SRC_ATOMIC_POLYFILL_H_
+
+#include "util.h"
+
+namespace nonstd {
+
+template <typename T>
+struct atomic {
+  atomic() = default;
+  T exchange(T value) { return __sync_lock_test_and_set(&value_, value); }
+  T value_ = T();
+  DISALLOW_COPY_AND_ASSIGN(atomic);
+};
+
+}  // namespace nonstd
+
+#endif  // SRC_ATOMIC_POLYFILL_H_
diff --git a/src/node.cc b/src/node.cc
index 4de2f97491cf46..d6ba87d72fd23e 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -86,6 +86,14 @@ typedef int mode_t;
 extern char **environ;
 #endif
 
+#ifdef __APPLE__
+#include "atomic-polyfill.h"  // NOLINT(build/include_order)
+namespace node { template <typename T> using atomic = nonstd::atomic<T>; }
+#else
+#include <atomic>
+namespace node { template <typename T> using atomic = std::atomic<T>; }
+#endif
+
 namespace node {
 
 using v8::Array;
@@ -153,7 +161,7 @@ static double prog_start_time;
 static bool debugger_running;
 static uv_async_t dispatch_debug_messages_async;
 
-static Isolate* node_isolate = nullptr;
+static node::atomic<Isolate*> node_isolate;
 static v8::Platform* default_platform;
 
 
@@ -3410,28 +3418,46 @@ static void EnableDebug(Environment* env) {
 }
 
 
+// Called from an arbitrary thread.
+static void TryStartDebugger() {
+  // Call only async signal-safe functions here!  Don't retry the exchange,
+  // it will deadlock when the thread is interrupted inside a critical section.
+  if (auto isolate = node_isolate.exchange(nullptr)) {
+    v8::Debug::DebugBreak(isolate);
+    uv_async_send(&dispatch_debug_messages_async);
+    CHECK_EQ(nullptr, node_isolate.exchange(isolate));
+  }
+}
+
+
 // Called from the main thread.
 static void DispatchDebugMessagesAsyncCallback(uv_async_t* handle) {
+  // Synchronize with signal handler, see TryStartDebugger.
+  Isolate* isolate;
+  do {
+    isolate = node_isolate.exchange(nullptr);
+  } while (isolate == nullptr);
+
   if (debugger_running == false) {
     fprintf(stderr, "Starting debugger agent.\n");
 
-    HandleScope scope(node_isolate);
-    Environment* env = Environment::GetCurrent(node_isolate);
+    HandleScope scope(isolate);
+    Environment* env = Environment::GetCurrent(isolate);
     Context::Scope context_scope(env->context());
 
     StartDebug(env, false);
     EnableDebug(env);
   }
-  Isolate::Scope isolate_scope(node_isolate);
+
+  Isolate::Scope isolate_scope(isolate);
   v8::Debug::ProcessDebugMessages();
+  CHECK_EQ(nullptr, node_isolate.exchange(isolate));
 }
 
 
 #ifdef __POSIX__
 static void EnableDebugSignalHandler(int signo) {
-  // Call only async signal-safe functions here!
-  v8::Debug::DebugBreak(*static_cast<Isolate* volatile*>(&node_isolate));
-  uv_async_send(&dispatch_debug_messages_async);
+  TryStartDebugger();
 }
 
 
@@ -3485,8 +3511,7 @@ static int RegisterDebugSignalHandler() {
 
 #ifdef _WIN32
 DWORD WINAPI EnableDebugThreadProc(void* arg) {
-  v8::Debug::DebugBreak(*static_cast<Isolate* volatile*>(&node_isolate));
-  uv_async_send(&dispatch_debug_messages_async);
+  TryStartDebugger();
   return 0;
 }
 
@@ -4006,7 +4031,8 @@ static void StartNodeInstance(void* arg) {
   // Fetch a reference to the main isolate, so we have a reference to it
   // even when we need it to access it from another (debugger) thread.
   if (instance_data->is_main())
-    node_isolate = isolate;
+    CHECK_EQ(nullptr, node_isolate.exchange(isolate));
+
   {
     Locker locker(isolate);
     Isolate::Scope isolate_scope(isolate);
@@ -4016,7 +4042,7 @@ static void StartNodeInstance(void* arg) {
     array_buffer_allocator->set_env(env);
     Context::Scope context_scope(context);
 
-    node_isolate->SetAbortOnUncaughtExceptionCallback(
+    isolate->SetAbortOnUncaughtExceptionCallback(
         ShouldAbortOnUncaughtException);
 
     // Start debug agent when argv has --debug
@@ -4070,12 +4096,15 @@ static void StartNodeInstance(void* arg) {
     env = nullptr;
   }
 
+  if (instance_data->is_main()) {
+    // Synchronize with signal handler, see TryStartDebugger.
+    while (isolate != node_isolate.exchange(nullptr));  // NOLINT
+  }
+
   CHECK_NE(isolate, nullptr);
   isolate->Dispose();
   isolate = nullptr;
   delete array_buffer_allocator;
-  if (instance_data->is_main())
-    node_isolate = nullptr;
 }
 
 int Start(int argc, char** argv) {

From 4c9abbd1bb7a38b78680e3496f4f2a82802cb0bc Mon Sep 17 00:00:00 2001
From: ronkorving <rkorving@wizcorp.jp>
Date: Fri, 18 Sep 2015 17:36:57 +0900
Subject: [PATCH 062/323] fs: reduced duplicate code in fs.write()

PR-URL: https://github.com/nodejs/node/pull/2947
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 lib/fs.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/fs.js b/lib/fs.js
index 42d02baa9e5d91..22e00c703020d3 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -662,17 +662,14 @@ fs.readSync = function(fd, buffer, offset, length, position) {
 // OR
 //  fs.write(fd, string[, position[, encoding]], callback);
 fs.write = function(fd, buffer, offset, length, position, callback) {
-  function strWrapper(err, written) {
+  function wrapper(err, written) {
     // Retain a reference to buffer so that it can't be GC'ed too soon.
     callback(err, written || 0, buffer);
   }
 
-  function bufWrapper(err, written) {
-    // retain reference to string in case it's external
-    callback(err, written || 0, buffer);
-  }
-
   var req = new FSReqWrap();
+  req.oncomplete = wrapper;
+
   if (buffer instanceof Buffer) {
     // if no position is passed then assume null
     if (typeof position === 'function') {
@@ -680,7 +677,6 @@ fs.write = function(fd, buffer, offset, length, position, callback) {
       position = null;
     }
     callback = maybeCallback(callback);
-    req.oncomplete = strWrapper;
     return binding.writeBuffer(fd, buffer, offset, length, position, req);
   }
 
@@ -696,7 +692,6 @@ fs.write = function(fd, buffer, offset, length, position, callback) {
     length = 'utf8';
   }
   callback = maybeCallback(position);
-  req.oncomplete = bufWrapper;
   return binding.writeString(fd, buffer, offset, length, req);
 };
 

From 1929d5be735cb990711f8c86da94d4bbe8f6b6fa Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 24 Oct 2015 11:51:10 -0700
Subject: [PATCH 063/323] lib: fix cluster handle leak

It is possible to cause a resource leak in SharedHandle. This commit
fixes the leak.

Fixes: https://github.com/nodejs/node/issues/2510
PR-URL: https://github.com/nodejs/node/pull/3510
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 lib/cluster.js                            |  5 ++-
 test/parallel/test-cluster-shared-leak.js | 53 +++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 test/parallel/test-cluster-shared-leak.js

diff --git a/lib/cluster.js b/lib/cluster.js
index 602cc8d60b9200..eef8bd25639dd2 100644
--- a/lib/cluster.js
+++ b/lib/cluster.js
@@ -345,7 +345,10 @@ function masterInit() {
        * if it has disconnected, otherwise we might
        * still want to access it.
        */
-      if (!worker.isConnected()) removeWorker(worker);
+      if (!worker.isConnected()) {
+        removeHandlesForWorker(worker);
+        removeWorker(worker);
+      }
 
       worker.suicide = !!worker.suicide;
       worker.state = 'dead';
diff --git a/test/parallel/test-cluster-shared-leak.js b/test/parallel/test-cluster-shared-leak.js
new file mode 100644
index 00000000000000..a4de1d33a29b8d
--- /dev/null
+++ b/test/parallel/test-cluster-shared-leak.js
@@ -0,0 +1,53 @@
+// In Node 4.2.1 on operating systems other than Linux, this test triggers an
+// assertion in cluster.js. The assertion protects against memory leaks.
+// https://github.com/nodejs/node/pull/3510
+
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const net = require('net');
+const cluster = require('cluster');
+cluster.schedulingPolicy = cluster.SCHED_NONE;
+
+if (cluster.isMaster) {
+  var conn, worker1, worker2;
+
+  worker1 = cluster.fork();
+  worker1.on('message', common.mustCall(function() {
+    worker2 = cluster.fork();
+    conn = net.connect(common.PORT, common.mustCall(function() {
+      worker1.send('die');
+      worker2.send('die');
+    }));
+    conn.on('error', function(e) {
+      // ECONNRESET is OK
+      if (e.code !== 'ECONNRESET')
+        throw e;
+    });
+  }));
+
+  cluster.on('exit', function(worker, exitCode, signalCode) {
+    assert(worker === worker1 || worker === worker2);
+    assert.strictEqual(exitCode, 0);
+    assert.strictEqual(signalCode, null);
+    if (Object.keys(cluster.workers).length === 0)
+      conn.destroy();
+  });
+
+  return;
+}
+
+var server = net.createServer(function(c) {
+  c.end('bye');
+});
+
+server.listen(common.PORT, function() {
+  process.send('listening');
+});
+
+process.on('message', function(msg) {
+  if (msg !== 'die') return;
+  server.close(function() {
+    setImmediate(() => process.disconnect());
+  });
+});

From 701e38c25fa5156a86bf46c3c7dcc01f2c1a697e Mon Sep 17 00:00:00 2001
From: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Date: Thu, 8 Oct 2015 23:10:10 +0530
Subject: [PATCH 064/323] tools: enable prefer-const eslint rule
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Description from: http://eslint.org/docs/rules/prefer-const.html

If a variable is never modified, using the `const` declaration is
better. `const` declaration tells readers, "this variable is never
modified," reducing cognitive load and improving maintainability.

Refer: https://github.com/nodejs/node/issues/3118
PR-URL: https://github.com/nodejs/node/pull/3152
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
---
 .eslintrc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.eslintrc b/.eslintrc
index cf1f7682cdcf91..1d14b72abb2bf3 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -70,6 +70,11 @@ rules:
   # require space after keywords, eg 'for (..)'
   space-after-keywords: 2
 
+  # ECMAScript 6
+  # list: http://eslint.org/docs/rules/#ecmascript-6
+  ## Suggest using 'const' wherever possible
+  prefer-const: 2
+
   # Strict Mode
   # list: https://github.com/eslint/eslint/tree/master/docs/rules#strict-mode
   ## 'use strict' on top

From 6e887cc630ea735163c1c960ef37bf5a790fc018 Mon Sep 17 00:00:00 2001
From: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Date: Thu, 8 Oct 2015 23:11:29 +0530
Subject: [PATCH 065/323] lib,test: update let to const where applicable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As per the `prefer-const` eslint rule, few instances of `let` have been
identified to be better with `const`. This patch updates all those
instances.

Refer: https://github.com/nodejs/node/issues/3118
PR-URL: https://github.com/nodejs/node/pull/3152
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
---
 lib/cluster.js                                      |  2 +-
 lib/util.js                                         |  2 +-
 test/parallel/test-async-wrap-check-providers.js    | 13 +++++++------
 test/parallel/test-buffer-zero-fill-reset.js        |  2 +-
 test/parallel/test-http-flush-headers.js            |  2 +-
 test/parallel/test-http-response-multiheaders.js    |  8 ++++----
 test/parallel/test-tls-socket-default-options.js    |  2 +-
 test/parallel/test-util-inspect.js                  |  2 +-
 test/parallel/test-zlib-truncated.js                |  4 ++--
 .../test-child-process-fork-getconnections.js       |  4 ++--
 10 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/lib/cluster.js b/lib/cluster.js
index eef8bd25639dd2..fbad0b08212384 100644
--- a/lib/cluster.js
+++ b/lib/cluster.js
@@ -291,7 +291,7 @@ function masterInit() {
       var match = execArgv[i].match(/^(--debug|--debug-(brk|port))(=\d+)?$/);
 
       if (match) {
-        let debugPort = process.debugPort + debugPortOffset;
+        const debugPort = process.debugPort + debugPortOffset;
         ++debugPortOffset;
         execArgv[i] = match[1] + '=' + debugPort;
       }
diff --git a/lib/util.js b/lib/util.js
index d143552615baa2..3335faf3d8c51e 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -517,7 +517,7 @@ function formatCollectionIterator(ctx, value, recurseTimes, visibleKeys, keys) {
   var nextRecurseTimes = recurseTimes === null ? null : recurseTimes - 1;
   var vals = mirror.preview();
   var output = [];
-  for (let o of vals) {
+  for (const o of vals) {
     output.push(formatValue(ctx, o, nextRecurseTimes));
   }
   return output;
diff --git a/test/parallel/test-async-wrap-check-providers.js b/test/parallel/test-async-wrap-check-providers.js
index 2d7d318885eb16..45dd8d4f24048b 100644
--- a/test/parallel/test-async-wrap-check-providers.js
+++ b/test/parallel/test-async-wrap-check-providers.js
@@ -73,16 +73,17 @@ process.on('SIGINT', () => process.exit());
 
 // Run from closed net server above.
 function checkTLS() {
-  let options = {
+  const options = {
     key: fs.readFileSync(common.fixturesDir + '/keys/ec-key.pem'),
     cert: fs.readFileSync(common.fixturesDir + '/keys/ec-cert.pem')
   };
-  let server = tls.createServer(options, noop).listen(common.PORT, function() {
-    tls.connect(common.PORT, { rejectUnauthorized: false }, function() {
-      this.destroy();
-      server.close();
+  const server = tls.createServer(options, noop)
+    .listen(common.PORT, function() {
+      tls.connect(common.PORT, { rejectUnauthorized: false }, function() {
+        this.destroy();
+        server.close();
+      });
     });
-  });
 }
 
 zlib.createGzip();
diff --git a/test/parallel/test-buffer-zero-fill-reset.js b/test/parallel/test-buffer-zero-fill-reset.js
index 52203a997e89f5..56fb77818a1284 100644
--- a/test/parallel/test-buffer-zero-fill-reset.js
+++ b/test/parallel/test-buffer-zero-fill-reset.js
@@ -14,6 +14,6 @@ function testUint8Array(ui) {
 
 for (let i = 0; i < 100; i++) {
   new Buffer(0);
-  let ui = new Uint8Array(65);
+  const ui = new Uint8Array(65);
   assert.ok(testUint8Array(ui), 'Uint8Array is not zero-filled');
 }
diff --git a/test/parallel/test-http-flush-headers.js b/test/parallel/test-http-flush-headers.js
index e3c9761cff5d34..5e91a4643a9019 100644
--- a/test/parallel/test-http-flush-headers.js
+++ b/test/parallel/test-http-flush-headers.js
@@ -10,7 +10,7 @@ server.on('request', function(req, res) {
   server.close();
 });
 server.listen(common.PORT, '127.0.0.1', function() {
-  let req = http.request({
+  const req = http.request({
     method: 'GET',
     host: '127.0.0.1',
     port: common.PORT,
diff --git a/test/parallel/test-http-response-multiheaders.js b/test/parallel/test-http-response-multiheaders.js
index da6cd73a38ffaa..572ce2e128bf29 100644
--- a/test/parallel/test-http-response-multiheaders.js
+++ b/test/parallel/test-http-response-multiheaders.js
@@ -17,13 +17,13 @@ const norepeat = [
 const server = http.createServer(function(req, res) {
   var num = req.headers['x-num'];
   if (num == 1) {
-    for (let name of norepeat) {
+    for (const name of norepeat) {
       res.setHeader(name, ['A', 'B']);
     }
     res.setHeader('X-A', ['A', 'B']);
   } else if (num == 2) {
-    let headers = {};
-    for (let name of norepeat) {
+    const headers = {};
+    for (const name of norepeat) {
       headers[name] = ['A', 'B'];
     }
     headers['X-A'] = ['A', 'B'];
@@ -44,7 +44,7 @@ server.listen(common.PORT, common.mustCall(function() {
       {port:common.PORT, headers:{'x-num': n}},
       common.mustCall(function(res) {
         if (n == 2) server.close();
-        for (let name of norepeat) {
+        for (const name of norepeat) {
           assert.equal(res.headers[name], 'A');
         }
         assert.equal(res.headers['x-a'], 'A, B');
diff --git a/test/parallel/test-tls-socket-default-options.js b/test/parallel/test-tls-socket-default-options.js
index 3af03a0ba9269a..7b41d0f5a9ec23 100644
--- a/test/parallel/test-tls-socket-default-options.js
+++ b/test/parallel/test-tls-socket-default-options.js
@@ -33,7 +33,7 @@ function testSocketOptions(socket, socketOptions) {
       setImmediate(runTests);
     });
   }).listen(common.PORT, function() {
-    let c = new tls.TLSSocket(socket, socketOptions);
+    const c = new tls.TLSSocket(socket, socketOptions);
     c.connect(common.PORT, function() {
       c.end(sent);
     });
diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js
index 444c0168a42fa7..320d5e444ad80a 100644
--- a/test/parallel/test-util-inspect.js
+++ b/test/parallel/test-util-inspect.js
@@ -135,7 +135,7 @@ map.set(1, 2);
 var mirror = Debug.MakeMirror(map.entries(), true);
 var vals = mirror.preview();
 var valsOutput = [];
-for (let o of vals) {
+for (const o of vals) {
   valsOutput.push(o);
 }
 
diff --git a/test/parallel/test-zlib-truncated.js b/test/parallel/test-zlib-truncated.js
index 9a716f8d0b2110..46bd83960bba36 100644
--- a/test/parallel/test-zlib-truncated.js
+++ b/test/parallel/test-zlib-truncated.js
@@ -22,11 +22,11 @@ const inputString = 'ΩΩLorem ipsum dolor sit amet, consectetur adipiscing el'
 ].forEach(function(methods) {
   zlib[methods.comp](inputString, function(err, compressed) {
     assert(!err);
-    let truncated = compressed.slice(0, compressed.length / 2);
+    const truncated = compressed.slice(0, compressed.length / 2);
 
     // sync sanity
     assert.doesNotThrow(function() {
-      let decompressed = zlib[methods.decompSync](compressed);
+      const decompressed = zlib[methods.decompSync](compressed);
       assert.equal(decompressed, inputString);
     });
 
diff --git a/test/sequential/test-child-process-fork-getconnections.js b/test/sequential/test-child-process-fork-getconnections.js
index 934df28d7988b7..a7521f1635fb39 100644
--- a/test/sequential/test-child-process-fork-getconnections.js
+++ b/test/sequential/test-child-process-fork-getconnections.js
@@ -6,7 +6,7 @@ const net = require('net');
 const count = 12;
 
 if (process.argv[2] === 'child') {
-  let sockets = [];
+  const sockets = [];
 
   process.on('message', function(m, socket) {
     function sendClosed(id) {
@@ -42,7 +42,7 @@ if (process.argv[2] === 'child') {
   });
 
   const server = net.createServer();
-  let sockets = [];
+  const sockets = [];
   let sent = 0;
 
   server.on('connection', function(socket) {

From 8c0318ce8d8beb046d884e2cbd8780e95fcb364b Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Tue, 27 Oct 2015 12:54:42 -0400
Subject: [PATCH 066/323] deps: backport 8d6a228 from the v8's upstream

Original commit message:

    [heap] fix crash during the scavenge of ArrayBuffer
    Scavenger should not attempt to visit ArrayBuffer's storage, it is a
    user-supplied pointer that may have any alignment. Visiting it, may
    result in a crash.

    BUG=
    R=jochen

    Review URL: https://codereview.chromium.org/1406133003

    Cr-Commit-Position: refs/heads/master@{#31611}

PR-URL: https://github.com/nodejs/node/pull/3549
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 deps/v8/src/heap/heap.cc        | 100 ++++++++++++++++++++------------
 deps/v8/src/heap/heap.h         |   3 +
 deps/v8/test/cctest/test-api.cc |  26 +++++++++
 3 files changed, 93 insertions(+), 36 deletions(-)

diff --git a/deps/v8/src/heap/heap.cc b/deps/v8/src/heap/heap.cc
index 6c8c3ce34e0a92..edf9dea31dc7d8 100644
--- a/deps/v8/src/heap/heap.cc
+++ b/deps/v8/src/heap/heap.cc
@@ -2016,42 +2016,8 @@ Address Heap::DoScavenge(ObjectVisitor* scavenge_visitor,
         // for pointers to from semispace instead of looking for pointers
         // to new space.
         DCHECK(!target->IsMap());
-        Address obj_address = target->address();
-
-        // We are not collecting slots on new space objects during mutation
-        // thus we have to scan for pointers to evacuation candidates when we
-        // promote objects. But we should not record any slots in non-black
-        // objects. Grey object's slots would be rescanned.
-        // White object might not survive until the end of collection
-        // it would be a violation of the invariant to record it's slots.
-        bool record_slots = false;
-        if (incremental_marking()->IsCompacting()) {
-          MarkBit mark_bit = Marking::MarkBitFrom(target);
-          record_slots = Marking::IsBlack(mark_bit);
-        }
-#if V8_DOUBLE_FIELDS_UNBOXING
-        LayoutDescriptorHelper helper(target->map());
-        bool has_only_tagged_fields = helper.all_fields_tagged();
-
-        if (!has_only_tagged_fields) {
-          for (int offset = 0; offset < size;) {
-            int end_of_region_offset;
-            if (helper.IsTagged(offset, size, &end_of_region_offset)) {
-              IterateAndMarkPointersToFromSpace(
-                  target, obj_address + offset,
-                  obj_address + end_of_region_offset, record_slots,
-                  &ScavengeObject);
-            }
-            offset = end_of_region_offset;
-          }
-        } else {
-#endif
-          IterateAndMarkPointersToFromSpace(target, obj_address,
-                                            obj_address + size, record_slots,
-                                            &ScavengeObject);
-#if V8_DOUBLE_FIELDS_UNBOXING
-        }
-#endif
+
+        IteratePointersToFromSpace(target, size, &ScavengeObject);
       }
     }
 
@@ -5184,6 +5150,68 @@ void Heap::IterateAndMarkPointersToFromSpace(HeapObject* object, Address start,
 }
 
 
+void Heap::IteratePointersToFromSpace(HeapObject* target, int size,
+                                      ObjectSlotCallback callback) {
+  Address obj_address = target->address();
+
+  // We are not collecting slots on new space objects during mutation
+  // thus we have to scan for pointers to evacuation candidates when we
+  // promote objects. But we should not record any slots in non-black
+  // objects. Grey object's slots would be rescanned.
+  // White object might not survive until the end of collection
+  // it would be a violation of the invariant to record it's slots.
+  bool record_slots = false;
+  if (incremental_marking()->IsCompacting()) {
+    MarkBit mark_bit = Marking::MarkBitFrom(target);
+    record_slots = Marking::IsBlack(mark_bit);
+  }
+
+  // Do not scavenge JSArrayBuffer's contents
+  switch (target->ContentType()) {
+    case HeapObjectContents::kTaggedValues: {
+      IterateAndMarkPointersToFromSpace(target, obj_address, obj_address + size,
+                                        record_slots, callback);
+      break;
+    }
+    case HeapObjectContents::kMixedValues: {
+      if (target->IsFixedTypedArrayBase()) {
+        IterateAndMarkPointersToFromSpace(
+            target, obj_address + FixedTypedArrayBase::kBasePointerOffset,
+            obj_address + FixedTypedArrayBase::kHeaderSize, record_slots,
+            callback);
+      } else if (target->IsJSArrayBuffer()) {
+        IterateAndMarkPointersToFromSpace(
+            target, obj_address,
+            obj_address + JSArrayBuffer::kByteLengthOffset + kPointerSize,
+            record_slots, callback);
+        IterateAndMarkPointersToFromSpace(
+            target, obj_address + JSArrayBuffer::kSize, obj_address + size,
+            record_slots, callback);
+#if V8_DOUBLE_FIELDS_UNBOXING
+      } else if (FLAG_unbox_double_fields) {
+        LayoutDescriptorHelper helper(target->map());
+        DCHECK(!helper.all_fields_tagged());
+
+        for (int offset = 0; offset < size;) {
+          int end_of_region_offset;
+          if (helper.IsTagged(offset, size, &end_of_region_offset)) {
+            IterateAndMarkPointersToFromSpace(
+                target, obj_address + offset,
+                obj_address + end_of_region_offset, record_slots, callback);
+          }
+          offset = end_of_region_offset;
+        }
+#endif
+      }
+      break;
+    }
+    case HeapObjectContents::kRawValues: {
+      break;
+    }
+  }
+}
+
+
 void Heap::IterateRoots(ObjectVisitor* v, VisitMode mode) {
   IterateStrongRoots(v, mode);
   IterateWeakRoots(v, mode);
diff --git a/deps/v8/src/heap/heap.h b/deps/v8/src/heap/heap.h
index 0da6f5e6c05ae4..a33a98226c6b91 100644
--- a/deps/v8/src/heap/heap.h
+++ b/deps/v8/src/heap/heap.h
@@ -961,6 +961,9 @@ class Heap {
 
   // Iterate pointers to from semispace of new space found in memory interval
   // from start to end within |object|.
+  void IteratePointersToFromSpace(HeapObject* target, int size,
+                                  ObjectSlotCallback callback);
+
   void IterateAndMarkPointersToFromSpace(HeapObject* object, Address start,
                                          Address end, bool record_slots,
                                          ObjectSlotCallback callback);
diff --git a/deps/v8/test/cctest/test-api.cc b/deps/v8/test/cctest/test-api.cc
index d465f2f87a96ee..e0f9d30b7cba14 100644
--- a/deps/v8/test/cctest/test-api.cc
+++ b/deps/v8/test/cctest/test-api.cc
@@ -14242,6 +14242,32 @@ THREADED_TEST(SkipArrayBufferBackingStoreDuringGC) {
 }
 
 
+THREADED_TEST(SkipArrayBufferDuringScavenge) {
+  LocalContext env;
+  v8::Isolate* isolate = env->GetIsolate();
+  v8::HandleScope handle_scope(isolate);
+
+  // Make sure the pointer looks like a heap object
+  Local<v8::Object> tmp = v8::Object::New(isolate);
+  uint8_t* store_ptr =
+      reinterpret_cast<uint8_t*>(*reinterpret_cast<uintptr_t*>(*tmp));
+
+  // Make `store_ptr` point to from space
+  CcTest::heap()->CollectGarbage(i::NEW_SPACE);
+
+  // Create ArrayBuffer with pointer-that-cannot-be-visited in the backing store
+  Local<v8::ArrayBuffer> ab = v8::ArrayBuffer::New(isolate, store_ptr, 8);
+
+  // Should not crash,
+  // i.e. backing store pointer should not be treated as a heap object pointer
+  CcTest::heap()->CollectGarbage(i::NEW_SPACE);  // in survivor space now
+  CcTest::heap()->CollectGarbage(i::NEW_SPACE);  // in old gen now
+
+  // Use `ab` to silence compiler warning
+  CHECK_EQ(ab->GetContents().Data(), store_ptr);
+}
+
+
 THREADED_TEST(SharedUint8Array) {
   i::FLAG_harmony_sharedarraybuffer = true;
   TypedArrayTestHelper<uint8_t, v8::Uint8Array, i::FixedUint8Array,

From bd4311bc9cd2eaede03a99396ad0f396b83e8c4f Mon Sep 17 00:00:00 2001
From: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Date: Sat, 24 Oct 2015 13:16:08 +0530
Subject: [PATCH 067/323] repl: handle comments properly

As it is, the comments are not handled properly in REPL. So, if the
comments have `'` or `"`, then they are treated as incomplete string
literals and the error is thrown in REPL.

This patch refactors the existing logic and groups everything in a
class.

Fixes: https://github.com/nodejs/node/issues/3421
PR-URL: https://github.com/nodejs/node/pull/3515
Reviewed-By: Brian White <mscdex@mscdex.net>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 lib/repl.js                | 172 ++++++++++++++++++++-----------------
 test/parallel/test-repl.js |  28 ++++++
 2 files changed, 122 insertions(+), 78 deletions(-)

diff --git a/lib/repl.js b/lib/repl.js
index ed3df92e08526b..f17a9260772ebf 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -70,6 +70,88 @@ const BLOCK_SCOPED_ERROR = 'Block-scoped declarations (let, ' +
     'const, function, class) not yet supported outside strict mode';
 
 
+class LineParser {
+
+  constructor() {
+    this.reset();
+  }
+
+  reset() {
+    this._literal = null;
+    this.shouldFail = false;
+    this.blockComment = false;
+  }
+
+  parseLine(line) {
+    var previous = null;
+    this.shouldFail = false;
+    const wasWithinStrLiteral = this._literal !== null;
+
+    for (const current of line) {
+      if (previous === '\\') {
+        // valid escaping, skip processing. previous doesn't matter anymore
+        previous = null;
+        continue;
+      }
+
+      if (!this._literal) {
+        if (previous === '*' && current === '/') {
+          if (this.blockComment) {
+            this.blockComment = false;
+            previous = null;
+            continue;
+          } else {
+            this.shouldFail = true;
+            break;
+          }
+        }
+
+        // ignore rest of the line if `current` and `previous` are `/`s
+        if (previous === current && previous === '/' && !this.blockComment) {
+          break;
+        }
+
+        if (previous === '/' && current === '*') {
+          this.blockComment = true;
+          previous = null;
+        }
+      }
+
+      if (this.blockComment) continue;
+
+      if (current === this._literal) {
+        this._literal = null;
+      } else if (current === '\'' || current === '"') {
+        this._literal = this._literal || current;
+      }
+
+      previous = current;
+    }
+
+    const isWithinStrLiteral = this._literal !== null;
+
+    if (!wasWithinStrLiteral && !isWithinStrLiteral) {
+      // Current line has nothing to do with String literals, trim both ends
+      line = line.trim();
+    } else if (wasWithinStrLiteral && !isWithinStrLiteral) {
+      // was part of a string literal, but it is over now, trim only the end
+      line = line.trimRight();
+    } else if (isWithinStrLiteral && !wasWithinStrLiteral) {
+      // was not part of a string literal, but it is now, trim only the start
+      line = line.trimLeft();
+    }
+
+    const lastChar = line.charAt(line.length - 1);
+
+    this.shouldFail = this.shouldFail ||
+                      ((!this._literal && lastChar === '\\') ||
+                      (this._literal   && lastChar !== '\\'));
+
+    return line;
+  }
+}
+
+
 function REPLServer(prompt,
                     stream,
                     eval_,
@@ -193,7 +275,7 @@ function REPLServer(prompt,
     debug('domain error');
     const top = replMap.get(self);
     top.outputStream.write((e.stack || e) + '\n');
-    top._currentStringLiteral = null;
+    top.lineParser.reset();
     top.bufferedCommand = '';
     top.lines.level = [];
     top.displayPrompt();
@@ -220,8 +302,7 @@ function REPLServer(prompt,
   self.outputStream = output;
 
   self.resetContext();
-  // Initialize the current string literal found, to be null
-  self._currentStringLiteral = null;
+  self.lineParser = new LineParser();
   self.bufferedCommand = '';
   self.lines.level = [];
 
@@ -280,87 +361,22 @@ function REPLServer(prompt,
       sawSIGINT = false;
     }
 
-    self._currentStringLiteral = null;
+    self.lineParser.reset();
     self.bufferedCommand = '';
     self.lines.level = [];
     self.displayPrompt();
   });
 
-  function parseLine(line, currentStringLiteral) {
-    var previous = null, current = null;
-
-    for (var i = 0; i < line.length; i += 1) {
-      if (previous === '\\') {
-        // if it is a valid escaping, then skip processing and the previous
-        // character doesn't matter anymore.
-        previous = null;
-        continue;
-      }
-
-      current = line.charAt(i);
-      if (current === currentStringLiteral) {
-        currentStringLiteral = null;
-      } else if (current === '\'' ||
-                 current === '"' &&
-                 currentStringLiteral === null) {
-        currentStringLiteral = current;
-      }
-      previous = current;
-    }
-
-    return currentStringLiteral;
-  }
-
-  function getFinisherFunction(cmd, defaultFn) {
-    if ((self._currentStringLiteral === null &&
-         cmd.charAt(cmd.length - 1) === '\\') ||
-        (self._currentStringLiteral !== null &&
-         cmd.charAt(cmd.length - 1) !== '\\')) {
-
-      // If the line continuation is used outside string literal or if the
-      // string continuation happens with out line continuation, then fail hard.
-      // Even if the error is recoverable, get the underlying error and use it.
-      return function(e, ret) {
-        var error = e instanceof Recoverable ? e.err : e;
-
-        if (arguments.length === 2) {
-          // using second argument only if it is actually passed. Otherwise
-          // `undefined` will be printed when invalid REPL commands are used.
-          return defaultFn(error, ret);
-        }
-
-        return defaultFn(error);
-      };
-    }
-    return defaultFn;
-  }
-
   self.on('line', function(cmd) {
     debug('line %j', cmd);
     sawSIGINT = false;
     var skipCatchall = false;
-    var finisherFn = finish;
 
     // leading whitespaces in template literals should not be trimmed.
     if (self._inTemplateLiteral) {
       self._inTemplateLiteral = false;
     } else {
-      const wasWithinStrLiteral = self._currentStringLiteral !== null;
-      self._currentStringLiteral = parseLine(cmd, self._currentStringLiteral);
-      const isWithinStrLiteral = self._currentStringLiteral !== null;
-
-      if (!wasWithinStrLiteral && !isWithinStrLiteral) {
-        // Current line has nothing to do with String literals, trim both ends
-        cmd = cmd.trim();
-      } else if (wasWithinStrLiteral && !isWithinStrLiteral) {
-        // was part of a string literal, but it is over now, trim only the end
-        cmd = cmd.trimRight();
-      } else if (isWithinStrLiteral && !wasWithinStrLiteral) {
-        // was not part of a string literal, but it is now, trim only the start
-        cmd = cmd.trimLeft();
-      }
-
-      finisherFn = getFinisherFunction(cmd, finish);
+      cmd = self.lineParser.parseLine(cmd);
     }
 
     // Check to see if a REPL keyword was used. If it returns true,
@@ -393,9 +409,9 @@ function REPLServer(prompt,
       }
 
       debug('eval %j', evalCmd);
-      self.eval(evalCmd, self.context, 'repl', finisherFn);
+      self.eval(evalCmd, self.context, 'repl', finish);
     } else {
-      finisherFn(null);
+      finish(null);
     }
 
     function finish(e, ret) {
@@ -406,7 +422,7 @@ function REPLServer(prompt,
         self.outputStream.write('npm should be run outside of the ' +
                                 'node repl, in your normal shell.\n' +
                                 '(Press Control-D to exit.)\n');
-        self._currentStringLiteral = null;
+        self.lineParser.reset();
         self.bufferedCommand = '';
         self.displayPrompt();
         return;
@@ -414,7 +430,7 @@ function REPLServer(prompt,
 
       // If error was SyntaxError and not JSON.parse error
       if (e) {
-        if (e instanceof Recoverable) {
+        if (e instanceof Recoverable && !self.lineParser.shouldFail) {
           // Start buffering data like that:
           // {
           // ...  x: 1
@@ -423,12 +439,12 @@ function REPLServer(prompt,
           self.displayPrompt();
           return;
         } else {
-          self._domain.emit('error', e);
+          self._domain.emit('error', e.err || e);
         }
       }
 
       // Clear buffer if no SyntaxErrors
-      self._currentStringLiteral = null;
+      self.lineParser.reset();
       self.bufferedCommand = '';
 
       // If we got any output - print it (if no error)
@@ -985,7 +1001,7 @@ function defineDefaultCommands(repl) {
   repl.defineCommand('break', {
     help: 'Sometimes you get stuck, this gets you out',
     action: function() {
-      this._currentStringLiteral = null;
+      this.lineParser.reset();
       this.bufferedCommand = '';
       this.displayPrompt();
     }
@@ -1000,7 +1016,7 @@ function defineDefaultCommands(repl) {
   repl.defineCommand('clear', {
     help: clearMessage,
     action: function() {
-      this._currentStringLiteral = null;
+      this.lineParser.reset();
       this.bufferedCommand = '';
       if (!this.useGlobal) {
         this.outputStream.write('Clearing context...\n');
diff --git a/test/parallel/test-repl.js b/test/parallel/test-repl.js
index 43e144d87ce441..5234d8e009ee58 100644
--- a/test/parallel/test-repl.js
+++ b/test/parallel/test-repl.js
@@ -250,6 +250,34 @@ function error_test() {
     { client: client_unix, send: 'function x() {\nreturn \'\\\\\';\n }',
       expect: prompt_multiline + prompt_multiline +
               'undefined\n' + prompt_unix },
+    // regression tests for https://github.com/nodejs/node/issues/3421
+    { client: client_unix, send: 'function x() {\n//\'\n }',
+      expect: prompt_multiline + prompt_multiline +
+              'undefined\n' + prompt_unix },
+    { client: client_unix, send: 'function x() {\n//"\n }',
+      expect: prompt_multiline + prompt_multiline +
+              'undefined\n' + prompt_unix },
+    { client: client_unix, send: 'function x() {//\'\n }',
+      expect: prompt_multiline + 'undefined\n' + prompt_unix },
+    { client: client_unix, send: 'function x() {//"\n }',
+      expect: prompt_multiline + 'undefined\n' + prompt_unix },
+    { client: client_unix, send: 'function x() {\nvar i = "\'";\n }',
+      expect: prompt_multiline + prompt_multiline +
+              'undefined\n' + prompt_unix },
+    { client: client_unix, send: 'function x(/*optional*/) {}',
+      expect: 'undefined\n' + prompt_unix },
+    { client: client_unix, send: 'function x(/* // 5 */) {}',
+      expect: 'undefined\n' + prompt_unix },
+    { client: client_unix, send: '// /* 5 */',
+      expect: 'undefined\n' + prompt_unix },
+    { client: client_unix, send: '"//"',
+      expect: '\'//\'\n' + prompt_unix },
+    { client: client_unix, send: '"data /*with*/ comment"',
+      expect: '\'data /*with*/ comment\'\n' + prompt_unix },
+    { client: client_unix, send: 'function x(/*fn\'s optional params*/) {}',
+      expect: 'undefined\n' + prompt_unix },
+    { client: client_unix, send: '/* \'\n"\n\'"\'\n*/',
+      expect: 'undefined\n' + prompt_unix },
   ]);
 }
 

From 5e76587fdf240bab40424f50f3ffc71f91b8609a Mon Sep 17 00:00:00 2001
From: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Date: Wed, 30 Sep 2015 08:03:43 +0530
Subject: [PATCH 068/323] doc: createServer's key option can be an array

The `tls` module's `createServer` and `createSecureContext` accept
`key` option and it can be an array of keys as well. This patch
explains the format of the entries in that array.

Corresponding code:
https://github.com/nodejs/node/blob/v4.1.1/lib/_tls_common.js#L73-L90

PR-URL: https://github.com/nodejs/node/pull/3123
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
---
 doc/api/tls.markdown | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/api/tls.markdown b/doc/api/tls.markdown
index ca891bb40fc5ce..8e64bc98a098a2 100644
--- a/doc/api/tls.markdown
+++ b/doc/api/tls.markdown
@@ -163,7 +163,9 @@ automatically set as a listener for the [secureConnection][] event.  The
     the `key`, `cert` and `ca` options.)
 
   - `key`: A string or `Buffer` containing the private key of the server in
-    PEM format. (Could be an array of keys). (Required)
+    PEM format. To support multiple keys using different algorithms, an array
+    can be provided. It can either be a plain array of keys, or an array of
+    objects in the format `{pem: key, passphrase: passphrase}`. (Required)
 
   - `passphrase`: A string of passphrase for the private key or pfx.
 
@@ -508,7 +510,10 @@ dictionary with keys:
 
 * `pfx` : A string or buffer holding the PFX or PKCS12 encoded private
   key, certificate and CA certificates
-* `key` : A string holding the PEM encoded private key
+* `key`: A string or `Buffer` containing the private key of the server in
+  PEM format. To support multiple keys using different algorithms, an array
+  can be provided. It can either be a plain array of keys, or an array of
+  objects in the format `{pem: key, passphrase: passphrase}`. (Required)
 * `passphrase` : A string of passphrase for the private key or pfx
 * `cert` : A string holding the PEM encoded certificate
 * `ca` : Either a string or list of strings of PEM encoded CA

From 8c6c0f915a6e0cfb29d8e52542447b30d7e751f1 Mon Sep 17 00:00:00 2001
From: Stefan Budeanu <stefan@budeanu.com>
Date: Tue, 27 Oct 2015 22:52:15 -0400
Subject: [PATCH 069/323] test: use port number from env in tls socket test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tests normally use common.PORT to allow the user to select which port
number to listen on. Hardcoding the port number will cause parallel
instances of the test to fail.

PR-URL: https://github.com/nodejs/node/pull/3557
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
---
 test/parallel/test-tls-async-cb-after-socket-end.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/parallel/test-tls-async-cb-after-socket-end.js b/test/parallel/test-tls-async-cb-after-socket-end.js
index 87258cb32c5085..ea40205bfff06f 100644
--- a/test/parallel/test-tls-async-cb-after-socket-end.js
+++ b/test/parallel/test-tls-async-cb-after-socket-end.js
@@ -36,9 +36,9 @@ server.on('resumeSession', function(id, cb) {
   next();
 });
 
-server.listen(1443, function() {
+server.listen(common.PORT, function() {
   var clientOpts = {
-    port: 1443,
+    port: common.PORT,
     rejectUnauthorized: false,
     session: false
   };

From 0a43697ce8168bf1d6bec85f0ed334145d6cc001 Mon Sep 17 00:00:00 2001
From: Ali Ijaz Sheikh <ofrobots@google.com>
Date: Sun, 25 Oct 2015 17:19:58 -0700
Subject: [PATCH 070/323] deps: backport 010897c from V8 upstream

This is a reland of https://github.com/nodejs/node/pull/3165. The patch abates
the truncation of script filenames in the perf-event output produced by V8.

V8 commits:
Original: https://github.com/v8/v8/commit/03ef3cd004c2fd31ae7e48772f106df67b8c2feb
Reland: https://github.com/v8/v8/commit/010897c16adb46d3fe403eab525502a63e174b0c

Original commit message:
  improve perf_basic_prof filename reporting

  The buffer used for appending filenames to the string printed to the
  perf_basic_prof log was unnecessarily too small. Bump it up to be at least
  kUtf8BufferSize.

  Truncation of filenames makes it really hard to work with profiles gathered on
  Node.js. Because of the way Node.js works, you can have node module dependencies
  in deeply nested directories. The last thing you want when investigating a
  performance problem is to have script names be truncated.

  This patch is a stop-gap. Ideally, I want no truncation of the filename at all
  and use a dynamically growing buffer. That would be a larger change, and I
  wanted to have a quick fix available that can be back-ported to Node.js LTS
  release.

  R=yangguo@chromium.org,yurys@chromium.org
  BUG=

  Review URL: https://codereview.chromium.org/1388543002

PR-URL: https://github.com/nodejs/node/pull/3520
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
---
 deps/v8/src/log.cc              | 12 ++++---
 deps/v8/test/cctest/test-log.cc | 55 +++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/deps/v8/src/log.cc b/deps/v8/src/log.cc
index 044250f1197070..84c863b6545ac5 100644
--- a/deps/v8/src/log.cc
+++ b/deps/v8/src/log.cc
@@ -125,8 +125,9 @@ class CodeEventLogger::NameBuffer {
   }
 
   void AppendInt(int n) {
-    Vector<char> buffer(utf8_buffer_ + utf8_pos_,
-                        kUtf8BufferSize - utf8_pos_);
+    int space = kUtf8BufferSize - utf8_pos_;
+    if (space <= 0) return;
+    Vector<char> buffer(utf8_buffer_ + utf8_pos_, space);
     int size = SNPrintF(buffer, "%d", n);
     if (size > 0 && utf8_pos_ + size <= kUtf8BufferSize) {
       utf8_pos_ += size;
@@ -134,8 +135,9 @@ class CodeEventLogger::NameBuffer {
   }
 
   void AppendHex(uint32_t n) {
-    Vector<char> buffer(utf8_buffer_ + utf8_pos_,
-                        kUtf8BufferSize - utf8_pos_);
+    int space = kUtf8BufferSize - utf8_pos_;
+    if (space <= 0) return;
+    Vector<char> buffer(utf8_buffer_ + utf8_pos_, space);
     int size = SNPrintF(buffer, "%x", n);
     if (size > 0 && utf8_pos_ + size <= kUtf8BufferSize) {
       utf8_pos_ += size;
@@ -147,7 +149,7 @@ class CodeEventLogger::NameBuffer {
 
  private:
   static const int kUtf8BufferSize = 512;
-  static const int kUtf16BufferSize = 128;
+  static const int kUtf16BufferSize = kUtf8BufferSize;
 
   int utf8_pos_;
   char utf8_buffer_[kUtf8BufferSize];
diff --git a/deps/v8/test/cctest/test-log.cc b/deps/v8/test/cctest/test-log.cc
index 0938a9ede21053..daf2e688b6541d 100644
--- a/deps/v8/test/cctest/test-log.cc
+++ b/deps/v8/test/cctest/test-log.cc
@@ -531,3 +531,58 @@ TEST(LogVersion) {
   }
   isolate->Dispose();
 }
+
+
+// https://crbug.com/539892
+// CodeCreateEvents with really large names should not crash.
+TEST(Issue539892) {
+  class : public i::CodeEventLogger {
+   public:
+    virtual void CodeMoveEvent(Address from, Address to) {}
+    virtual void CodeDeleteEvent(Address from) {}
+    virtual void CodeDisableOptEvent(i::Code* code,
+                                     i::SharedFunctionInfo* shared) {}
+
+   private:
+    virtual void LogRecordedBuffer(i::Code* code, i::SharedFunctionInfo* shared,
+                                   const char* name, int length) {}
+  } code_event_logger;
+  SETUP_FLAGS();
+  v8::Isolate::CreateParams create_params;
+  create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
+  v8::Isolate* isolate = v8::Isolate::New(create_params);
+
+  {
+    ScopedLoggerInitializer initialize_logger(saved_log, saved_prof, isolate);
+    Logger* logger = initialize_logger.logger();
+    logger->addCodeEventListener(&code_event_logger);
+
+    // Function with a really large name.
+    const char* source_text =
+        "(function "
+        "baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaac"
+        "(){})();";
+
+    CompileRun(source_text);
+
+    // Must not crash.
+    logger->LogCompiledFunctions();
+  }
+  isolate->Dispose();
+}

From 239ad899a393b3c0bcc65b1dece4e16402f6a8ea Mon Sep 17 00:00:00 2001
From: Myles Borins <mborins@us.ibm.com>
Date: Mon, 19 Oct 2015 13:26:30 -0700
Subject: [PATCH 071/323] doc: add LTS info to COLLABORATOR_GUIDE.md

There is currently no information in the Collaborators guide regarding
LTS. This commit adds some basic copy explaining what LTS is, what is
considered for LTS, and a simple way collaborators can help.

Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Steven R. Loomis <srloomis@us.ibm.com>
PR-URL: https://github.com/nodejs/node/pull/3442
---
 COLLABORATOR_GUIDE.md | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md
index c5a13a5c9f2f09..6b718b887b7f42 100644
--- a/COLLABORATOR_GUIDE.md
+++ b/COLLABORATOR_GUIDE.md
@@ -8,6 +8,7 @@
 * [Landing Pull Requests](#landing-pull-requests)
  - [Technical HOWTO](#technical-howto)
  - [I Just Made a Mistake](#i-just-made-a-mistake)
+ - [Long Term Support](#long-term-support)
 
 This document contains information for Collaborators of the Node.js
 project regarding maintaining the code, documentation and issues.
@@ -227,3 +228,41 @@ messages. However, you are only allowed to force push to any Node.js
 branch within 10 minutes from your original push. If someone else
 pushes to the branch or the 10 minute period passes, consider the
 commit final.
+
+### Long Term Support
+
+#### What is LTS?
+
+Long Term Support (often referred to as *LTS*) guarantees application developers
+a 30 month support cycle with specific versions of Node.js.
+
+You can find more information [in the full LTS plan](https://github.com/nodejs/lts#lts-plan).
+
+#### How does LTS work?
+
+Once a stable branch enters LTS, no new features may be added to that release. Changes are
+limited to bug fixes, security updates, possible npm updates, documentation updates, and certain
+performance improvements that can be demonstrated to not break existing applications.
+Semver-minor changes are only permitted if required for bug fixes. Semver-major changes are only
+permitted if required for critical security and bug fixes.
+
+Once a stable branch moves into Maintenance mode, only **critical** bugs, **critical** security fixes,
+and documentation updates will be permitted.
+
+#### How can I help?
+
+When you send your pull request, consider including information about
+whether your change is breaking. If you think your patch can be backported,
+please feel free to include that information in the PR thread.
+
+#### Who is doing the backporting?
+
+The current plan is for commits to cherry pick into a staging branch (e.g. v4.x-staging),
+which can be done by anyone. The preference would be for the individual landing the commit
+on master to backport to staging branches if it is appropriate.
+
+#### How is an LTS release cut?
+
+When the LTS working group determines that a new LTS release is required, selected commits
+will be picked from the staging branch to be included in the release. This process of making
+a release will be a collaboration between the LTS working group and the Release team.

From 74e2328b3a1d6fcab508a6890adadeecbac9ec39 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Tue, 27 Oct 2015 09:40:41 -0700
Subject: [PATCH 072/323] test: split independent tests into separate files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move ENOENT related tests out of general fs.watch() test file and into
its own file. This may help diagnose
https://github.com/nodejs/node/issues/3541.

PR-URL: https://github.com/nodejs/node/pull/3548
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
---
 test/parallel/test-fs-watch-enoent.js | 21 +++++++++++++++++++++
 test/sequential/test-fs-watch.js      | 17 -----------------
 2 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 test/parallel/test-fs-watch-enoent.js

diff --git a/test/parallel/test-fs-watch-enoent.js b/test/parallel/test-fs-watch-enoent.js
new file mode 100644
index 00000000000000..f9aa58c3d522cc
--- /dev/null
+++ b/test/parallel/test-fs-watch-enoent.js
@@ -0,0 +1,21 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const fs = require('fs');
+
+assert.throws(function() {
+  fs.watch('non-existent-file');
+}, function(err) {
+  assert(err);
+  assert(/non-existent-file/.test(err));
+  assert.equal(err.filename, 'non-existent-file');
+  return true;
+});
+
+const watcher = fs.watch(__filename);
+watcher.on('error', common.mustCall(function(err) {
+  assert(err);
+  assert(/non-existent-file/.test(err));
+  assert.equal(err.filename, 'non-existent-file');
+}));
+watcher._handle.onchange(-1, 'ENOENT', 'non-existent-file');
diff --git a/test/sequential/test-fs-watch.js b/test/sequential/test-fs-watch.js
index 385cf47686f2a8..10f4baf591ae0b 100644
--- a/test/sequential/test-fs-watch.js
+++ b/test/sequential/test-fs-watch.js
@@ -126,20 +126,3 @@ assert.throws(function() {
   w.stop();
 }, TypeError);
 oldhandle.stop(); // clean up
-
-assert.throws(function() {
-  fs.watch('non-existent-file');
-}, function(err) {
-  assert(err);
-  assert(/non-existent-file/.test(err));
-  assert.equal(err.filename, 'non-existent-file');
-  return true;
-});
-
-var watcher = fs.watch(__filename);
-watcher.on('error', common.mustCall(function(err) {
-  assert(err);
-  assert(/non-existent-file/.test(err));
-  assert.equal(err.filename, 'non-existent-file');
-}));
-watcher._handle.onchange(-1, 'ENOENT', 'non-existent-file');

From 4a5dbeab43120b7580f67eed1ed930f1ea991189 Mon Sep 17 00:00:00 2001
From: Junliang Yan <jyan@ca.ibm.com>
Date: Mon, 26 Oct 2015 08:39:13 -0400
Subject: [PATCH 073/323] test: fix missing unistd.h on windows

PR-URL: https://github.com/nodejs/node/pull/3532
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 test/addons/async-hello-world/binding.cc | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/test/addons/async-hello-world/binding.cc b/test/addons/async-hello-world/binding.cc
index b087bf9aa0dca0..e6033fc4fd420c 100644
--- a/test/addons/async-hello-world/binding.cc
+++ b/test/addons/async-hello-world/binding.cc
@@ -1,8 +1,14 @@
-#include <unistd.h>
 #include <node.h>
 #include <v8.h>
 #include <uv.h>
 
+#if defined _WIN32
+#include <windows.h>
+#else
+#include <unistd.h>
+#endif
+
+
 struct async_req {
   uv_work_t req;
   int input;
@@ -13,7 +19,12 @@ struct async_req {
 
 void DoAsync(uv_work_t* r) {
   async_req* req = reinterpret_cast<async_req*>(r->data);
-  sleep(1);  // Simulate CPU intensive process...
+  // Simulate CPU intensive process...
+#if defined _WIN32
+  Sleep(1000);
+#else
+  sleep(1);
+#endif
   req->output = req->input * 2;
 }
 

From b8cea49c88c70e2020d04922d32d694b1b1ad850 Mon Sep 17 00:00:00 2001
From: Junliang Yan <jyan@ca.ibm.com>
Date: Wed, 28 Oct 2015 15:57:13 -0400
Subject: [PATCH 074/323] test: fix heap-profiler link error LNK1194 on win

Fix the following error message in windows using VS 2013:

    LINK : fatal error LNK1194: cannot delay-load 'node.exe'
    due to import of data symbol '"__declspec(dllimport)
    const v8::OutputStream::`vftable'"
    (__imp_??_7OutputStream@v8@@6B@)'; link without
    /DELAYLOAD:node.exe

PR-URL: https://github.com/nodejs/node/pull/3572
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 test/addons/heap-profiler/binding.gyp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/addons/heap-profiler/binding.gyp b/test/addons/heap-profiler/binding.gyp
index 3bfb84493f3e87..b75f68fe3a4e84 100644
--- a/test/addons/heap-profiler/binding.gyp
+++ b/test/addons/heap-profiler/binding.gyp
@@ -2,7 +2,8 @@
   'targets': [
     {
       'target_name': 'binding',
-      'sources': [ 'binding.cc' ]
+      'sources': [ 'binding.cc' ],
+      'win_delay_load_hook': 'false'
     }
   ]
 }

From f236b3a904da15606cf95df51e90f9f15876e65a Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sun, 25 Oct 2015 11:48:41 -0700
Subject: [PATCH 075/323] lib,doc: return boolean from child.send()

The documentation indicates that child.send() returns a boolean but it
has returned undefinined at since v0.12.0. It now returns a boolean per
the (slightly updated) documentation.

PR-URL: https://github.com/nodejs/node/pull/3516
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 doc/api/child_process.markdown                           | 5 +++--
 lib/internal/child_process.js                            | 6 +++---
 test/parallel/test-child-process-send-returns-boolean.js | 9 +++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 test/parallel/test-child-process-send-returns-boolean.js

diff --git a/doc/api/child_process.markdown b/doc/api/child_process.markdown
index 13997d65452909..954354cc32a810 100644
--- a/doc/api/child_process.markdown
+++ b/doc/api/child_process.markdown
@@ -266,9 +266,10 @@ argument: `null` on success, or an `Error` object on failure.
 `child.send()` emits an `'error'` event if no callback was given and the message
 cannot be sent, for example because the child process has already exited.
 
-Returns `true` under normal circumstances or `false` when the backlog of
+`child.send()` returns `false` if the channel has closed or when the backlog of
 unsent messages exceeds a threshold that makes it unwise to send more.
-Use the callback mechanism to implement flow control.
+Otherwise, it returns `true`. Use the callback mechanism to implement flow
+control.
 
 #### Example: sending server object
 
diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js
index 8c1abc5f746fc8..da213955a59345 100644
--- a/lib/internal/child_process.js
+++ b/lib/internal/child_process.js
@@ -504,8 +504,7 @@ function setupChannel(target, channel) {
       handle = undefined;
     }
     if (this.connected) {
-      this._send(message, handle, false, callback);
-      return;
+      return this._send(message, handle, false, callback);
     }
     const ex = new Error('channel closed');
     if (typeof callback === 'function') {
@@ -513,6 +512,7 @@ function setupChannel(target, channel) {
     } else {
       this.emit('error', ex);  // FIXME(bnoordhuis) Defer to next tick.
     }
+    return false;
   };
 
   target._send = function(message, handle, swallowErrors, callback) {
@@ -577,7 +577,7 @@ function setupChannel(target, channel) {
         handle: null,
         message: message,
       });
-      return;
+      return this._handleQueue.length === 1;
     }
 
     var req = new WriteWrap();
diff --git a/test/parallel/test-child-process-send-returns-boolean.js b/test/parallel/test-child-process-send-returns-boolean.js
new file mode 100644
index 00000000000000..b751846947822c
--- /dev/null
+++ b/test/parallel/test-child-process-send-returns-boolean.js
@@ -0,0 +1,9 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const fork = require('child_process').fork;
+
+const n = fork(common.fixturesDir + '/empty.js');
+
+const rv = n.send({ hello: 'world' });
+assert.strictEqual(rv, true);

From b64ce5960f993cbca712bc97f5a40f8dc86a3fc1 Mon Sep 17 00:00:00 2001
From: Myles Borins <mborins@us.ibm.com>
Date: Tue, 20 Oct 2015 13:29:18 -0700
Subject: [PATCH 076/323] tls: remove util and calls to util.format

Currently util.format is being used for string templating in tls.
By replacing all of the instances of util.format with backtick
string we can remove the need to require util in tls all together.

PR-URL: https://github.com/nodejs/node/pull/3456
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Fedor Indutny <fedor@indutny.com>
---
 lib/tls.js | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/lib/tls.js b/lib/tls.js
index e269e800d31d1c..24062832a5b9d3 100644
--- a/lib/tls.js
+++ b/lib/tls.js
@@ -2,7 +2,6 @@
 
 const net = require('net');
 const url = require('url');
-const util = require('util');
 const binding = process.binding('crypto');
 const Buffer = require('buffer').Buffer;
 const constants = require('constants');
@@ -141,9 +140,7 @@ exports.checkServerIdentity = function checkServerIdentity(host, cert) {
       return ip === host;
     });
     if (!valid) {
-      reason = util.format('IP: %s is not in the cert\'s list: %s',
-                           host,
-                           ips.join(', '));
+      reason = `IP: ${host} is not in the cert's list: ${ips.join(', ')}`;
     }
   } else if (cert.subject) {
     // Transform hostname to canonical form
@@ -189,13 +186,11 @@ exports.checkServerIdentity = function checkServerIdentity(host, cert) {
 
     if (!valid) {
       if (cert.subjectaltname) {
-        reason = util.format('Host: %s is not in the cert\'s altnames: %s',
-                             host,
-                             cert.subjectaltname);
+        reason =
+            `Host: ${host} is not in the cert's altnames: ` +
+            `${cert.subjectaltname}`;
       } else {
-        reason = util.format('Host: %s is not cert\'s CN: %s',
-                             host,
-                             cert.subject.CN);
+        reason = `Host: ${host} is not cert's CN: ${cert.subject.CN}`;
       }
     }
   } else {
@@ -204,8 +199,7 @@ exports.checkServerIdentity = function checkServerIdentity(host, cert) {
 
   if (!valid) {
     var err = new Error(
-        util.format('Hostname/IP doesn\'t match certificate\'s altnames: %j',
-                    reason));
+        `Hostname/IP doesn't match certificate's altnames: "${reason}"`);
     err.reason = reason;
     err.host = host;
     err.cert = cert;

From 384e6c2dfe968002800bc3d3224a57aa19ffdfee Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Tue, 20 Oct 2015 23:18:30 -0400
Subject: [PATCH 077/323] 2015-10-29, Version 5.0.0 (Stable)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Notable changes:

* buffer: (Breaking) Removed both 'raw' and 'raws' encoding types from Buffer,
  these have been deprecated for a long time (Sakthipriyan Vairamani) #2859.
* console: (Breaking) Values reported by console.time() now have 3 decimals of
  accuracy added (Michaël Zasso) #3166.
* fs:
  - fs.readFile*(), fs.writeFile*(), and fs.appendFile*() now also accept a file
    descriptor as their first argument (Johannes Wüller) #3163.
  - (Breaking) In fs.readFile(), if an encoding is specified and the internal
    toString() fails the error is no longer thrown but is passed to the callback
    (Evan Lucas) #3485.
  - (Breaking) In fs.read() (using the fs.read(fd, length, position, encoding,
    callback) form), if the internal toString() fails the error is no longer
    thrown but is passed to the callback (Evan Lucas) #3503.
* http:
  - Fixed a bug where pipelined http requests would stall (Fedor Indutny) #3342.
  - (Breaking) When parsing HTTP, don't add duplicates of the following headers:
    Retry-After, ETag, Last-Modified, Server, Age, Expires. This is in addition
    to the following headers which already block duplicates: Content-Type,
    Content-Length, User-Agent, Referer, Host, Authorization,
    Proxy-Authorization, If-Modified-Since, If-Unmodified-Since, From, Location,
    Max-Forwards (James M Snell) #3090.
  - (Breaking) The callback argument to OutgoingMessage#setTimeout() must be a
    function or a TypeError is thrown (James M Snell) #3090.
  - (Breaking) HTTP methods and header names must now conform to the RFC 2616
    "token" rule, a list of allowed characters that excludes control characters
    and a number of separator characters. Specifically, methods and header names
    must now match /^[a-zA-Z0-9_!#$%&'*+.^`|~-]+$/ or a TypeError will be thrown
    (James M Snell) #2526.
* node:
  - (Breaking) Deprecated the _linklist module (Rich Trott) #3078.
  - (Breaking) Removed require.paths and require.registerExtension(), both had
    been previously set to throw Error when accessed
    (Sakthipriyan Vairamani) #2922.
* npm: Upgraded to version 3.3.6 from 2.14.7, see
  https://github.com/npm/npm/releases/tag/v3.3.6 for more details. This is a
  major version bump for npm and it has seen a significant amount of change.
  Please see the original npm v3.0.0 release notes for a list of major changes
  (Rebecca Turner) #3310.
* src: (Breaking) Bumped NODE_MODULE_VERSION to 47 from 46, this is necessary
  due to the V8 upgrade. Native add-ons will need to be recompiled
  (Rod Vagg) #3400.
* timers: Attempt to reuse the timer handle for setTimeout().unref(). This fixes
  a long-standing known issue where unrefed timers would perviously hold
  beforeExit open (Fedor Indutny) #3407.
* tls:
  - Added ALPN Support (Shigeki Ohtsu) #2564.
  - TLS options can now be passed in an object to createSecurePair()
    (Коренберг Марк) #2441.
  - (Breaking) The default minimum DH key size for tls.connect() is now 1024
    bits and a warning is shown when DH key size is less than 2048 bits. This a security consideration to prevent "logjam" attacks. A new minDHSize TLS
    option can be used to override the default. (Shigeki Ohtsu) #1831.
* util:
  - (Breaking) util.p() was deprecated for years, and has now been removed
    (Wyatt Preul) #3432.
  - (Breaking) util.inherits() can now work with ES6 classes. This is considered
    a breaking change because of potential subtle side-effects caused by a
    change from directly reassigning the prototype of the constructor using
    `ctor.prototype = Object.create(superCtor.prototype, { constructor: { ... } })`
    to using `Object.setPrototypeOf(ctor.prototype, superCtor.prototype)`
    (Michaël Zasso) #3455.
* v8: (Breaking) Upgraded to 4.6.85.25 from 4.5.103.35 (Ali Ijaz Sheikh) #3351.
  - Implements the spread operator, see
    https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Spread_operator
    for further information.
  - Implements new.target, see
    https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/new.target
    for further information.
* zlib: Decompression now throws on truncated input (e.g. unexpected end of
  file) (Yuval Brik) #2595.

PR-URL: https://github.com/nodejs/node/pull/3466
---
 CHANGELOG.md       | 163 ++++++++++++++++++++++++++++++++++++++++++++-
 src/node_version.h |   2 +-
 2 files changed, 163 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1a164265cdec6..a1dca484c32997 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,167 @@
-
 # Node.js ChangeLog
 
+## 2015-10-29, Version 5.0.0 (Stable), @rvagg
+
+### Notable Changes
+
+* **buffer**: _(Breaking)_ Removed both `'raw'` and `'raws'` encoding types from `Buffer`, these have been deprecated for a long time (Sakthipriyan Vairamani) [#2859](https://github.com/nodejs/node/pull/2859).
+* **console**: _(Breaking)_ Values reported by `console.time()` now have 3 decimals of accuracy added (Michaël Zasso) [#3166](https://github.com/nodejs/node/pull/3166).
+* **fs**:
+  - `fs.readFile*()`, `fs.writeFile*()`, and `fs.appendFile*()` now also accept a file descriptor as their first argument (Johannes Wüller) [#3163](https://github.com/nodejs/node/pull/3163).
+  - _(Breaking)_ In `fs.readFile()`, if an encoding is specified and the internal `toString()` fails the error is no longer _thrown_ but is passed to the callback (Evan Lucas) [#3485](https://github.com/nodejs/node/pull/3485).
+  - _(Breaking)_ In `fs.read()` (using the `fs.read(fd, length, position, encoding, callback)` form), if the internal `toString()` fails the error is no longer _thrown_ but is passed to the callback (Evan Lucas) [#3503](https://github.com/nodejs/node/pull/3503).
+* **http**:
+  - Fixed a bug where pipelined http requests would stall (Fedor Indutny) [#3342](https://github.com/nodejs/node/pull/3342).
+  - _(Breaking)_ When parsing HTTP, don't add duplicates of the following headers: `Retry-After`, `ETag`, `Last-Modified`, `Server`, `Age`, `Expires`. This is in addition to the following headers which already block duplicates: `Content-Type`, `Content-Length`, `User-Agent`, `Referer`, `Host`, `Authorization`, `Proxy-Authorization`, `If-Modified-Since`, `If-Unmodified-Since`, `From`, `Location`, `Max-Forwards` (James M Snell) [#3090](https://github.com/nodejs/node/pull/3090).
+  - _(Breaking)_ The `callback` argument to `OutgoingMessage#setTimeout()` must be a function or a `TypeError` is thrown (James M Snell) [#3090](https://github.com/nodejs/node/pull/3090).
+  - _(Breaking)_ HTTP methods and header names must now conform to the RFC 2616 "token" rule, a list of allowed characters that excludes control characters and a number of _separator_ characters. Specifically, methods and header names must now match ```/^[a-zA-Z0-9_!#$%&'*+.^`|~-]+$/``` or a `TypeError` will be thrown (James M Snell) [#2526](https://github.com/nodejs/node/pull/2526).
+* **node**:
+  - _(Breaking)_ Deprecated the `_linklist` module (Rich Trott) [#3078](https://github.com/nodejs/node/pull/3078).
+  - _(Breaking)_ Removed `require.paths` and `require.registerExtension()`, both had been previously set to throw `Error` when accessed (Sakthipriyan Vairamani) [#2922](https://github.com/nodejs/node/pull/2922).
+* **npm**: Upgraded to version 3.3.6 from 2.14.7, see https://github.com/npm/npm/releases/tag/v3.3.6 for more details. This is a major version bump for npm and it has seen a significant amount of change. Please see the original [npm v3.0.0 release notes](https://github.com/npm/npm/blob/master/CHANGELOG.md#v300-2015-06-25) for a list of major changes (Rebecca Turner) [#3310](https://github.com/nodejs/node/pull/3310).
+* **src**: _(Breaking)_ Bumped `NODE_MODULE_VERSION` to `47` from `46`, this is necessary due to the V8 upgrade. Native add-ons will need to be recompiled (Rod Vagg) [#3400](https://github.com/nodejs/node/pull/3400).
+* **timers**: Attempt to reuse the timer handle for `setTimeout().unref()`. This fixes a long-standing known issue where unrefed timers would perviously hold `beforeExit` open (Fedor Indutny) [#3407](https://github.com/nodejs/node/pull/3407).
+* **tls**:
+  - Added ALPN Support (Shigeki Ohtsu) [#2564](https://github.com/nodejs/node/pull/2564).
+  - TLS options can now be passed in an object to `createSecurePair()` (Коренберг Марк) [#2441](https://github.com/nodejs/node/pull/2441).
+  - _(Breaking)_ The default minimum DH key size for `tls.connect()` is now 1024 bits and a warning is shown when DH key size is less than 2048 bits. This a security consideration to prevent "logjam" attacks. A new `minDHSize` TLS option can be used to override the default. (Shigeki Ohtsu) [#1831](https://github.com/nodejs/node/pull/1831).
+* **util**:
+  - _(Breaking)_ `util.p()` was deprecated for years, and has now been removed (Wyatt Preul) [#3432](https://github.com/nodejs/node/pull/3432).
+  - _(Breaking)_ `util.inherits()` can now work with ES6 classes. This is considered a breaking change because of potential subtle side-effects caused by a change from directly reassigning the prototype of the constructor using `ctor.prototype = Object.create(superCtor.prototype, { constructor: { ... } })` to using `Object.setPrototypeOf(ctor.prototype, superCtor.prototype)` (Michaël Zasso) [#3455](https://github.com/nodejs/node/pull/3455).
+* **v8**: _(Breaking)_ Upgraded to 4.6.85.25 from 4.5.103.35  (Ali Ijaz Sheikh) [#3351](https://github.com/nodejs/node/pull/3351).
+  - Implements the spread operator, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Spread_operator for further information.
+  - Implements `new.target`, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/new.target for further information.
+* **zlib**: Decompression now throws on truncated input (e.g. unexpected end of file) (Yuval Brik) [#2595](https://github.com/nodejs/node/pull/2595).
+
+### Known issues
+
+* Surrogate pair in REPL can freeze terminal. [#690](https://github.com/nodejs/node/issues/690)
+* Calling `dns.setServers()` while a DNS query is in progress can cause the process to crash on a failed assertion. [#894](https://github.com/nodejs/node/issues/894)
+* `url.resolve` may transfer the auth portion of the url when resolving between two full hosts, see [#1435](https://github.com/nodejs/node/issues/1435).
+* Unicode characters in filesystem paths are not handled consistently across platforms or Node.js APIs. See [#2088](https://github.com/nodejs/node/issues/2088), [#3401](https://github.com/nodejs/node/issues/3401) and [#3519](https://github.com/nodejs/node/issues/3519).
+
+
+### Commits
+
+* [[`6a04cc0a43`](https://github.com/nodejs/node/commit/6a04cc0a43)] - **buffer**: fix value check for writeUInt{B,L}E (Trevor Norris) [#3500](https://github.com/nodejs/node/pull/3500)
+* [[`1a41feb559`](https://github.com/nodejs/node/commit/1a41feb559)] - **buffer**: don't CHECK on zero-sized realloc (Ben Noordhuis) [#3499](https://github.com/nodejs/node/pull/3499)
+* [[`5f6579d366`](https://github.com/nodejs/node/commit/5f6579d366)] - **(SEMVER-MAJOR)** **buffer**: remove raw & raws encoding (Sakthipriyan Vairamani) [#2859](https://github.com/nodejs/node/pull/2859)
+* [[`70fca2a81e`](https://github.com/nodejs/node/commit/70fca2a81e)] - **build**: Updates for AIX npm support - part 1 (Michael Dawson) [#3114](https://github.com/nodejs/node/pull/3114)
+* [[`b36b4f385a`](https://github.com/nodejs/node/commit/b36b4f385a)] - **build**: rectify --link-module help text (P.S.V.R) [#3379](https://github.com/nodejs/node/pull/3379)
+* [[`a89eeca590`](https://github.com/nodejs/node/commit/a89eeca590)] - **console**: rename argument of time and timeEnd (Michaël Zasso) [#3166](https://github.com/nodejs/node/pull/3166)
+* [[`870108aaa8`](https://github.com/nodejs/node/commit/870108aaa8)] - **(SEMVER-MAJOR)** **console**: sub-millisecond accuracy for console.time (Michaël Zasso) [#3166](https://github.com/nodejs/node/pull/3166)
+* [[`0a43697ce8`](https://github.com/nodejs/node/commit/0a43697ce8)] - **deps**: backport 010897c from V8 upstream (Ali Ijaz Sheikh) [#3520](https://github.com/nodejs/node/pull/3520)
+* [[`8c0318ce8d`](https://github.com/nodejs/node/commit/8c0318ce8d)] - **deps**: backport 8d6a228 from the v8's upstream (Fedor Indutny) [#3549](https://github.com/nodejs/node/pull/3549)
+* [[`2974debc6e`](https://github.com/nodejs/node/commit/2974debc6e)] - **deps**: update V8 to 4.6.85.28 (Michaël Zasso) [#3484](https://github.com/nodejs/node/pull/3484)
+* [[`f76af49b13`](https://github.com/nodejs/node/commit/f76af49b13)] - **deps**: fix upgrade to npm 3.3.6 (Rebecca Turner) [#3494](https://github.com/nodejs/node/pull/3494)
+* [[`32b51c97ec`](https://github.com/nodejs/node/commit/32b51c97ec)] - **deps**: upgrade npm to 3.3.6 (Rebecca Turner) [#3310](https://github.com/nodejs/node/pull/3310)
+* [[`770cd229f9`](https://github.com/nodejs/node/commit/770cd229f9)] - **deps**: upgrade V8 to 4.6.85.25 (Ali Ijaz Sheikh) [#3351](https://github.com/nodejs/node/pull/3351)
+* [[`972a0c8515`](https://github.com/nodejs/node/commit/972a0c8515)] - **deps**: backport 0d01728 from v8's upstream (Fedor Indutny) [#3351](https://github.com/nodejs/node/pull/3351)
+* [[`1fdec65203`](https://github.com/nodejs/node/commit/1fdec65203)] - **deps**: improve ArrayBuffer performance in v8 (Fedor Indutny) [#3351](https://github.com/nodejs/node/pull/3351)
+* [[`5cd1fd836a`](https://github.com/nodejs/node/commit/5cd1fd836a)] - **deps**: backport 56a0a79 from V8 upstream (Julien Gilli) [#3351](https://github.com/nodejs/node/pull/3351)
+* [[`7fb128d8df`](https://github.com/nodejs/node/commit/7fb128d8df)] - **deps**: cherry-pick backports to V8 (Michaël Zasso) [#3351](https://github.com/nodejs/node/pull/3351)
+* [[`d8011d1683`](https://github.com/nodejs/node/commit/d8011d1683)] - **(SEMVER-MAJOR)** **deps**: upgrade V8 to 4.6.85.23 (Michaël Zasso) [#3351](https://github.com/nodejs/node/pull/3351)
+* [[`a334ddc467`](https://github.com/nodejs/node/commit/a334ddc467)] - ***Revert*** "**deps**: backport 03ef3cd from V8 upstream" (Ali Ijaz Sheikh) [#3237](https://github.com/nodejs/node/pull/3237)
+* [[`6fff47ffac`](https://github.com/nodejs/node/commit/6fff47ffac)] - **deps**: backport 03ef3cd from V8 upstream (Ali Ijaz Sheikh) [#3165](https://github.com/nodejs/node/pull/3165)
+* [[`680dda8023`](https://github.com/nodejs/node/commit/680dda8023)] - **dns**: remove nonexistant exports.ADNAME (Roman Reiss) [#3051](https://github.com/nodejs/node/pull/3051)
+* [[`239ad899a3`](https://github.com/nodejs/node/commit/239ad899a3)] - **doc**: add LTS info to COLLABORATOR_GUIDE.md (Myles Borins) [#3442](https://github.com/nodejs/node/pull/3442)
+* [[`5e76587fdf`](https://github.com/nodejs/node/commit/5e76587fdf)] - **doc**: createServer's key option can be an array (Sakthipriyan Vairamani) [#3123](https://github.com/nodejs/node/pull/3123)
+* [[`0317c880da`](https://github.com/nodejs/node/commit/0317c880da)] - **doc**: add TSC meeting minutes 2015-10-21 (Rod Vagg) [#3480](https://github.com/nodejs/node/pull/3480)
+* [[`cd245b12e0`](https://github.com/nodejs/node/commit/cd245b12e0)] - **doc**: clarify API buffer.concat (Martii) [#3255](https://github.com/nodejs/node/pull/3255)
+* [[`ff9ef893fd`](https://github.com/nodejs/node/commit/ff9ef893fd)] - **doc**: add TSC meeting minutes 2015-10-14 (Rod Vagg) [#3463](https://github.com/nodejs/node/pull/3463)
+* [[`605c5a7754`](https://github.com/nodejs/node/commit/605c5a7754)] - **doc**: clarify the use of `option.detached` (Kyle Smith) [#3250](https://github.com/nodejs/node/pull/3250)
+* [[`cf75a175e5`](https://github.com/nodejs/node/commit/cf75a175e5)] - **doc**: more use-cases for promise events (Domenic Denicola) [#3438](https://github.com/nodejs/node/pull/3438)
+* [[`1b75d4bda3`](https://github.com/nodejs/node/commit/1b75d4bda3)] - **doc**: update WORKING_GROUPS.md - add missing groups (Michael Dawson) [#3450](https://github.com/nodejs/node/pull/3450)
+* [[`c658de2f99`](https://github.com/nodejs/node/commit/c658de2f99)] - **doc**: add TSC meeting minutes 2015-09-30 (Rod Vagg) [#3235](https://github.com/nodejs/node/pull/3235)
+* [[`d0b8c5d3a4`](https://github.com/nodejs/node/commit/d0b8c5d3a4)] - **doc**: add TSC meeting minutes 2015-10-07 (Rod Vagg) [#3364](https://github.com/nodejs/node/pull/3364)
+* [[`b483afcb20`](https://github.com/nodejs/node/commit/b483afcb20)] - **doc**: binary encoding is not deprecated (Trevor Norris) [#3441](https://github.com/nodejs/node/pull/3441)
+* [[`b607366a1c`](https://github.com/nodejs/node/commit/b607366a1c)] - **doc**: add information about Assert behavior and maintenance (Rich Trott) [#3330](https://github.com/nodejs/node/pull/3330)
+* [[`086103b32e`](https://github.com/nodejs/node/commit/086103b32e)] - **doc**: show keylen in pbkdf2 as a byte length (calebboyd) [#3334](https://github.com/nodejs/node/pull/3334)
+* [[`f6ebc8277b`](https://github.com/nodejs/node/commit/f6ebc8277b)] - **doc**: reword description of console.time (Michaël Zasso) [#3166](https://github.com/nodejs/node/pull/3166)
+* [[`503f279527`](https://github.com/nodejs/node/commit/503f279527)] - **doc**: fix indent in tls resumption example (Roman Reiss) [#3372](https://github.com/nodejs/node/pull/3372)
+* [[`dae9fae0fe`](https://github.com/nodejs/node/commit/dae9fae0fe)] - **doc**: label v4.2.1 as LTS in changelog heading (Phillip Johnsen) [#3360](https://github.com/nodejs/node/pull/3360)
+* [[`4fc638804c`](https://github.com/nodejs/node/commit/4fc638804c)] - **doc**: update V8 options in man page (Michaël Zasso) [#3351](https://github.com/nodejs/node/pull/3351)
+* [[`a441aa6e1d`](https://github.com/nodejs/node/commit/a441aa6e1d)] - **doc**: update WORKING_GROUPS.md to include Intl (Steven R. Loomis) [#3251](https://github.com/nodejs/node/pull/3251)
+* [[`81503e597b`](https://github.com/nodejs/node/commit/81503e597b)] - **doc**: fix typo in changelog (Timothy Gu) [#3353](https://github.com/nodejs/node/pull/3353)
+* [[`3ef2e4acf3`](https://github.com/nodejs/node/commit/3ef2e4acf3)] - **doc**: fix typos in changelog (reggi) [#3291](https://github.com/nodejs/node/pull/3291)
+* [[`b9279aa193`](https://github.com/nodejs/node/commit/b9279aa193)] - **doc**: remove old note, 'cluster' is marked stable (Balázs Galambosi) [#3314](https://github.com/nodejs/node/pull/3314)
+* [[`cdfa271164`](https://github.com/nodejs/node/commit/cdfa271164)] - **doc**: update AUTHORS list (Rod Vagg)
+* [[`47b06f6bb1`](https://github.com/nodejs/node/commit/47b06f6bb1)] - **docs**: add missing shell option to execSync (fansworld-claudio) [#3440](https://github.com/nodejs/node/pull/3440)
+* [[`4c9abbd1bb`](https://github.com/nodejs/node/commit/4c9abbd1bb)] - **fs**: reduced duplicate code in fs.write() (ronkorving) [#2947](https://github.com/nodejs/node/pull/2947)
+* [[`2bb147535e`](https://github.com/nodejs/node/commit/2bb147535e)] - **(SEMVER-MAJOR)** **fs**: don't throw in read if buffer too big (Evan Lucas) [#3503](https://github.com/nodejs/node/pull/3503)
+* [[`7added3b39`](https://github.com/nodejs/node/commit/7added3b39)] - **(SEMVER-MAJOR)** **fs**: pass err to callback if buffer is too big (Evan Lucas) [#3485](https://github.com/nodejs/node/pull/3485)
+* [[`5e0759f6fd`](https://github.com/nodejs/node/commit/5e0759f6fd)] - **(SEMVER-MINOR)** **fs**: add file descriptor support to *File() funcs (Johannes Wüller) [#3163](https://github.com/nodejs/node/pull/3163)
+* [[`d1a2e5357e`](https://github.com/nodejs/node/commit/d1a2e5357e)] - **gitignore**: don't ignore debug source directory in V8 (Michaël Zasso) [#3351](https://github.com/nodejs/node/pull/3351)
+* [[`ab03635fb1`](https://github.com/nodejs/node/commit/ab03635fb1)] - **http**: fix stalled pipeline bug (Fedor Indutny) [#3342](https://github.com/nodejs/node/pull/3342)
+* [[`e655a437b3`](https://github.com/nodejs/node/commit/e655a437b3)] - **(SEMVER-MAJOR)** **http**: do not allow multiple instances of certain response headers (James M Snell) [#3090](https://github.com/nodejs/node/pull/3090)
+* [[`0094a8dad7`](https://github.com/nodejs/node/commit/0094a8dad7)] - **(SEMVER-MAJOR)** **http**: add callback is function check (James M Snell) [#3090](https://github.com/nodejs/node/pull/3090)
+* [[`6192c9892f`](https://github.com/nodejs/node/commit/6192c9892f)] - **(SEMVER-MAJOR)** **http**: add checkIsHttpToken check for header fields (James M Snell) [#2526](https://github.com/nodejs/node/pull/2526)
+* [[`c9786bb680`](https://github.com/nodejs/node/commit/c9786bb680)] - **(SEMVER-MAJOR)** http{s}: don't connect to localhost on invalid URL (Sakthipriyan Vairamani) [#2967](https://github.com/nodejs/node/pull/2967)
+* [[`1929d5be73`](https://github.com/nodejs/node/commit/1929d5be73)] - **lib**: fix cluster handle leak (Rich Trott) [#3510](https://github.com/nodejs/node/pull/3510)
+* [[`97d081709e`](https://github.com/nodejs/node/commit/97d081709e)] - **lib**: avoid REPL exit on completion error (Rich Trott) [#3358](https://github.com/nodejs/node/pull/3358)
+* [[`f236b3a904`](https://github.com/nodejs/node/commit/f236b3a904)] - **(SEMVER-MINOR)** **lib,doc**: return boolean from child.send() (Rich Trott) [#3516](https://github.com/nodejs/node/pull/3516)
+* [[`6e887cc630`](https://github.com/nodejs/node/commit/6e887cc630)] - **lib,test**: update let to const where applicable (Sakthipriyan Vairamani) [#3152](https://github.com/nodejs/node/pull/3152)
+* [[`47befffc53`](https://github.com/nodejs/node/commit/47befffc53)] - **(SEMVER-MAJOR)** **lib,test**: deprecate _linklist (Rich Trott) [#3078](https://github.com/nodejs/node/pull/3078)
+* [[`d5ce53458e`](https://github.com/nodejs/node/commit/d5ce53458e)] - **lttng**: update flags for gc tracing (Glen Keane) [#3388](https://github.com/nodejs/node/pull/3388)
+* [[`6ad458b752`](https://github.com/nodejs/node/commit/6ad458b752)] - **(SEMVER-MAJOR)** **module**: remove unnecessary property and method (Sakthipriyan Vairamani) [#2922](https://github.com/nodejs/node/pull/2922)
+* [[`ae196175f4`](https://github.com/nodejs/node/commit/ae196175f4)] - **node**: improve GetActiveRequests performance (Trevor Norris) [#3375](https://github.com/nodejs/node/pull/3375)
+* [[`bd4311bc9c`](https://github.com/nodejs/node/commit/bd4311bc9c)] - **repl**: handle comments properly (Sakthipriyan Vairamani) [#3515](https://github.com/nodejs/node/pull/3515)
+* [[`ce391ed849`](https://github.com/nodejs/node/commit/ce391ed849)] - **(SEMVER-MAJOR)** **repl**: event ordering: delay 'close' until 'flushHistory' (Jeremiah Senkpiel) [#3435](https://github.com/nodejs/node/pull/3435)
+* [[`4c80c02ac7`](https://github.com/nodejs/node/commit/4c80c02ac7)] - **repl**: limit persistent history correctly on load (Jeremiah Senkpiel) [#2356](https://github.com/nodejs/node/pull/2356)
+* [[`134a60c785`](https://github.com/nodejs/node/commit/134a60c785)] - **src**: fix race condition in debug signal on exit (Ben Noordhuis) [#3528](https://github.com/nodejs/node/pull/3528)
+* [[`bf7c3dabb4`](https://github.com/nodejs/node/commit/bf7c3dabb4)] - **(SEMVER-MAJOR)** **src**: bump NODE_MODULE_VERSION To 47 (Rod Vagg) [#3400](https://github.com/nodejs/node/pull/3400)
+* [[`2d3560767e`](https://github.com/nodejs/node/commit/2d3560767e)] - **src**: fix exception message encoding on Windows (Brian White) [#3288](https://github.com/nodejs/node/pull/3288)
+* [[`ff877e93e1`](https://github.com/nodejs/node/commit/ff877e93e1)] - **src**: fix stuck debugger process (Liang-Chi Hsieh) [#2778](https://github.com/nodejs/node/pull/2778)
+* [[`8854183fe5`](https://github.com/nodejs/node/commit/8854183fe5)] - **stream**: avoid unnecessary concat of a single buffer. (Calvin Metcalf) [#3300](https://github.com/nodejs/node/pull/3300)
+* [[`85b74de9de`](https://github.com/nodejs/node/commit/85b74de9de)] - **stream**: fix signature of _write() in a comment (Fábio Santos) [#3248](https://github.com/nodejs/node/pull/3248)
+* [[`b8cea49c88`](https://github.com/nodejs/node/commit/b8cea49c88)] - **test**: fix heap-profiler link error LNK1194 on win (Junliang Yan) [#3572](https://github.com/nodejs/node/pull/3572)
+* [[`4a5dbeab43`](https://github.com/nodejs/node/commit/4a5dbeab43)] - **test**: fix missing unistd.h on windows (Junliang Yan) [#3532](https://github.com/nodejs/node/pull/3532)
+* [[`74e2328b3a`](https://github.com/nodejs/node/commit/74e2328b3a)] - **test**: split independent tests into separate files (Rich Trott) [#3548](https://github.com/nodejs/node/pull/3548)
+* [[`8c6c0f915a`](https://github.com/nodejs/node/commit/8c6c0f915a)] - **test**: use port number from env in tls socket test (Stefan Budeanu) [#3557](https://github.com/nodejs/node/pull/3557)
+* [[`1a968e67a5`](https://github.com/nodejs/node/commit/1a968e67a5)] - **test**: improve tests for util.inherits (Michaël Zasso) [#3507](https://github.com/nodejs/node/pull/3507)
+* [[`9d8d752456`](https://github.com/nodejs/node/commit/9d8d752456)] - **test**: print helpful err msg on test-dns-ipv6.js (Junliang Yan) [#3501](https://github.com/nodejs/node/pull/3501)
+* [[`60de9f8d7b`](https://github.com/nodejs/node/commit/60de9f8d7b)] - **test**: wrap assert.fail when passed to callback (Myles Borins) [#3453](https://github.com/nodejs/node/pull/3453)
+* [[`cd83f7ed7f`](https://github.com/nodejs/node/commit/cd83f7ed7f)] - **test**: add node::MakeCallback() test coverage (Ben Noordhuis) [#3478](https://github.com/nodejs/node/pull/3478)
+* [[`08da5c2a06`](https://github.com/nodejs/node/commit/08da5c2a06)] - **test**: disable test-tick-processor - aix and be ppc (Michael Dawson) [#3491](https://github.com/nodejs/node/pull/3491)
+* [[`7c35fbcb14`](https://github.com/nodejs/node/commit/7c35fbcb14)] - **test**: harden test-child-process-fork-regr-gh-2847 (Michael Dawson) [#3459](https://github.com/nodejs/node/pull/3459)
+* [[`ad2b272417`](https://github.com/nodejs/node/commit/ad2b272417)] - **test**: fix test-net-keepalive for AIX (Imran Iqbal) [#3458](https://github.com/nodejs/node/pull/3458)
+* [[`04fb14cc35`](https://github.com/nodejs/node/commit/04fb14cc35)] - **test**: fix flaky test-child-process-emfile (Rich Trott) [#3430](https://github.com/nodejs/node/pull/3430)
+* [[`eef0f0cd63`](https://github.com/nodejs/node/commit/eef0f0cd63)] - **test**: remove flaky status from eval_messages test (Rich Trott) [#3420](https://github.com/nodejs/node/pull/3420)
+* [[`bbbd81eab2`](https://github.com/nodejs/node/commit/bbbd81eab2)] - **test**: skip test-dns-ipv6.js if ipv6 is unavailable (Junliang Yan) [#3444](https://github.com/nodejs/node/pull/3444)
+* [[`f78c8e7426`](https://github.com/nodejs/node/commit/f78c8e7426)] - **test**: fix flaky test for symlinks (Rich Trott) [#3418](https://github.com/nodejs/node/pull/3418)
+* [[`28e9a4f41b`](https://github.com/nodejs/node/commit/28e9a4f41b)] - **test**: repl-persistent-history is no longer flaky (Jeremiah Senkpiel) [#3437](https://github.com/nodejs/node/pull/3437)
+* [[`9e981556e5`](https://github.com/nodejs/node/commit/9e981556e5)] - **test**: cleanup, improve repl-persistent-history (Jeremiah Senkpiel) [#2356](https://github.com/nodejs/node/pull/2356)
+* [[`ee2e641e0a`](https://github.com/nodejs/node/commit/ee2e641e0a)] - **test**: add Symbol test for assert.deepEqual() (Rich Trott) [#3327](https://github.com/nodejs/node/pull/3327)
+* [[`e2b8393ee8`](https://github.com/nodejs/node/commit/e2b8393ee8)] - **test**: port domains regression test from v0.10 (Jonas Dohse) [#3356](https://github.com/nodejs/node/pull/3356)
+* [[`676e61872f`](https://github.com/nodejs/node/commit/676e61872f)] - **test**: apply correct assert.fail() arguments (Rich Trott) [#3378](https://github.com/nodejs/node/pull/3378)
+* [[`bbdbef9274`](https://github.com/nodejs/node/commit/bbdbef9274)] - **test**: fix tests after V8 upgrade (Michaël Zasso) [#3351](https://github.com/nodejs/node/pull/3351)
+* [[`6c032a8333`](https://github.com/nodejs/node/commit/6c032a8333)] - **test**: replace util with backtick strings (Myles Borins) [#3359](https://github.com/nodejs/node/pull/3359)
+* [[`f45c315763`](https://github.com/nodejs/node/commit/f45c315763)] - **test**: fix domain with abort-on-uncaught on PPC (Julien Gilli) [#3354](https://github.com/nodejs/node/pull/3354)
+* [[`e3d9d25083`](https://github.com/nodejs/node/commit/e3d9d25083)] - **test**: add test-child-process-emfile fail message (Rich Trott) [#3335](https://github.com/nodejs/node/pull/3335)
+* [[`6f14b3a7db`](https://github.com/nodejs/node/commit/6f14b3a7db)] - **test**: remove util from common (Rich Trott) [#3324](https://github.com/nodejs/node/pull/3324)
+* [[`7d94611ac9`](https://github.com/nodejs/node/commit/7d94611ac9)] - **test**: split up buffer tests for reliability (Rich Trott) [#3323](https://github.com/nodejs/node/pull/3323)
+* [[`3202456baa`](https://github.com/nodejs/node/commit/3202456baa)] - **test**: remove util properties from common (Rich Trott) [#3304](https://github.com/nodejs/node/pull/3304)
+* [[`31c971d641`](https://github.com/nodejs/node/commit/31c971d641)] - **test**: parallelize long-running test (Rich Trott) [#3287](https://github.com/nodejs/node/pull/3287)
+* [[`5bbc6df7de`](https://github.com/nodejs/node/commit/5bbc6df7de)] - **test**: change call to deprecated util.isError() (Rich Trott) [#3084](https://github.com/nodejs/node/pull/3084)
+* [[`522e3d3cd3`](https://github.com/nodejs/node/commit/522e3d3cd3)] - **timers**: reuse timer in `setTimeout().unref()` (Fedor Indutny) [#3407](https://github.com/nodejs/node/pull/3407)
+* [[`b64ce5960f`](https://github.com/nodejs/node/commit/b64ce5960f)] - **tls**: remove util and calls to util.format (Myles Borins) [#3456](https://github.com/nodejs/node/pull/3456)
+* [[`c64af7d99e`](https://github.com/nodejs/node/commit/c64af7d99e)] - **tls**: TLSSocket options default isServer false (Yuval Brik) [#2614](https://github.com/nodejs/node/pull/2614)
+* [[`2296a4fc0f`](https://github.com/nodejs/node/commit/2296a4fc0f)] - **(SEMVER-MINOR)** **tls**: add `options` argument to createSecurePair (Коренберг Марк) [#2441](https://github.com/nodejs/node/pull/2441)
+* [[`0140e1b5e3`](https://github.com/nodejs/node/commit/0140e1b5e3)] - **tls**: output warning of setDHParam to console.trace (Shigeki Ohtsu) [#1831](https://github.com/nodejs/node/pull/1831)
+* [[`f72e178a78`](https://github.com/nodejs/node/commit/f72e178a78)] - **(SEMVER-MAJOR)** **tls**: add minDHSize option to tls.connect() (Shigeki Ohtsu) [#1831](https://github.com/nodejs/node/pull/1831)
+* [[`6d92ebac11`](https://github.com/nodejs/node/commit/6d92ebac11)] - **tls**: add TLSSocket.getEphemeralKeyInfo() (Shigeki Ohtsu) [#1831](https://github.com/nodejs/node/pull/1831)
+* [[`62ad1d0113`](https://github.com/nodejs/node/commit/62ad1d0113)] - **(SEMVER-MINOR)** **tls, crypto**: add ALPN Support (Shigeki Ohtsu) [#2564](https://github.com/nodejs/node/pull/2564)
+* [[`5029f41b2f`](https://github.com/nodejs/node/commit/5029f41b2f)] - **(SEMVER-MINOR)** **tls,crypto**: move NPN protcol data to hidden value (Shigeki Ohtsu) [#2564](https://github.com/nodejs/node/pull/2564)
+* [[`701e38c25f`](https://github.com/nodejs/node/commit/701e38c25f)] - **tools**: enable prefer-const eslint rule (Sakthipriyan Vairamani) [#3152](https://github.com/nodejs/node/pull/3152)
+* [[`6e78382605`](https://github.com/nodejs/node/commit/6e78382605)] - **tools**: ensure npm always uses the local node (Jeremiah Senkpiel) [#3489](https://github.com/nodejs/node/pull/3489)
+* [[`3c3435d017`](https://github.com/nodejs/node/commit/3c3435d017)] - **tools**: update test-npm to work with npm 3 (Rebecca Turner) [#3489](https://github.com/nodejs/node/pull/3489)
+* [[`b4f4c24539`](https://github.com/nodejs/node/commit/b4f4c24539)] - **tools**: use absolute paths in test-npm (Rebecca Turner) [#3309](https://github.com/nodejs/node/pull/3309)
+* [[`80573153b8`](https://github.com/nodejs/node/commit/80573153b8)] - **(SEMVER-MAJOR)** **util**: make inherits work with classes (Michaël Zasso) [#3455](https://github.com/nodejs/node/pull/3455)
+* [[`412252ca04`](https://github.com/nodejs/node/commit/412252ca04)] - **(SEMVER-MAJOR)** **util**: Remove p, has been deprecated for years (Wyatt Preul) [#3432](https://github.com/nodejs/node/pull/3432)
+* [[`718c304a4f`](https://github.com/nodejs/node/commit/718c304a4f)] - **v8**: pull fix for builtin code size on PPC (Michael Dawson) [#3474](https://github.com/nodejs/node/pull/3474)
+* [[`6936468de2`](https://github.com/nodejs/node/commit/6936468de2)] - **vm**: remove Watchdog dependency on Environment (Ido Ben-Yair) [#3274](https://github.com/nodejs/node/pull/3274)
+* [[`80169b1f0a`](https://github.com/nodejs/node/commit/80169b1f0a)] - **(SEMVER-MAJOR)** **zlib**: decompression throw on truncated input (Yuval Brik) [#2595](https://github.com/nodejs/node/pull/2595)
+
 ## 2015-10-13, Version 4.2.1 'Argon' (LTS), @jasnell
 
 ### Notable changes
diff --git a/src/node_version.h b/src/node_version.h
index 58753e3edf320c..97bd5907420050 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -5,7 +5,7 @@
 #define NODE_MINOR_VERSION 0
 #define NODE_PATCH_VERSION 0
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)

From 4e54dbec51cdc3155de5a2acb0d3eef9777b00f0 Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Fri, 30 Oct 2015 07:26:34 +1100
Subject: [PATCH 078/323] Working on v5.0.1

PR-URL: https://github.com/nodejs/node/pull/3466
---
 src/node_version.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/node_version.h b/src/node_version.h
index 97bd5907420050..79502bb74ee44b 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -3,9 +3,9 @@
 
 #define NODE_MAJOR_VERSION 5
 #define NODE_MINOR_VERSION 0
-#define NODE_PATCH_VERSION 0
+#define NODE_PATCH_VERSION 1
 
-#define NODE_VERSION_IS_RELEASE 1
+#define NODE_VERSION_IS_RELEASE 0
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)

From e888471a110ece958bec53661605f2ffde31dfac Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Wed, 28 Oct 2015 23:06:40 +0100
Subject: [PATCH 079/323] child_process: don't fork bomb ourselves from -e

Remove the `-e` argument from process.execArgv in child_process.fork()
to keep `node -e 'require("child_process").fork("empty.js")'` from
spawning itself recursively.

Fixes: https://github.com/nodejs/node/issues/3574
PR-URL: https://github.com/nodejs/node/pull/3575
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
---
 lib/child_process.js           | 10 ++++++++++
 test/parallel/test-cli-eval.js |  9 +++++++++
 2 files changed, 19 insertions(+)

diff --git a/lib/child_process.js b/lib/child_process.js
index 0fe9ca75c7794a..151fb51fc8b0f4 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -32,6 +32,16 @@ exports.fork = function(modulePath /*, args, options*/) {
 
   // Prepare arguments for fork:
   execArgv = options.execArgv || process.execArgv;
+
+  if (execArgv === process.execArgv && process._eval != null) {
+    const index = execArgv.lastIndexOf(process._eval);
+    if (index > 0) {
+      // Remove the -e switch to avoid fork bombing ourselves.
+      execArgv = execArgv.slice();
+      execArgv.splice(index - 1, 2);
+    }
+  }
+
   args = execArgv.concat([modulePath], args);
 
   // Leave stdin open for the IPC channel. stdout and stderr should be the
diff --git a/test/parallel/test-cli-eval.js b/test/parallel/test-cli-eval.js
index 10a77c4a67b8a4..15f59c8f37717c 100644
--- a/test/parallel/test-cli-eval.js
+++ b/test/parallel/test-cli-eval.js
@@ -8,6 +8,7 @@ if (module.parent) {
 var common = require('../common'),
     assert = require('assert'),
     child = require('child_process'),
+    path = require('path'),
     nodejs = '"' + process.execPath + '"';
 
 
@@ -75,3 +76,11 @@ child.exec(nodejs + ' --use-strict -p process.execArgv',
     function(status, stdout, stderr) {
       assert.equal(stdout, "[ '--use-strict', '-p', 'process.execArgv' ]\n");
     });
+
+// Regression test for https://github.com/nodejs/node/issues/3574
+const emptyFile = path.join(common.fixturesDir, 'empty.js');
+child.exec(nodejs + ` -e 'require("child_process").fork("${emptyFile}")'`,
+    function(status, stdout, stderr) {
+      assert.equal(stdout, '');
+      assert.equal(stderr, '');
+    });

From d72bb1e96ad78cd2e9635d08ba923dca4c6a5b62 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Thu, 29 Oct 2015 13:33:03 +0100
Subject: [PATCH 080/323] Revert "src: fix stuck debugger process"

This reverts commit ff877e93e16971ab8514772bd8d112e240b74803.

Reverted for breaking `node --debug-brk -e 0`.  It should immediately
quit but instead it hangs now.

PR-URL: https://github.com/nodejs/node/pull/3585
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 src/node.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/node.cc b/src/node.cc
index d6ba87d72fd23e..892a76b63ed2e3 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -3747,6 +3747,7 @@ void Init(int* argc,
   uv_async_init(uv_default_loop(),
                 &dispatch_debug_messages_async,
                 DispatchDebugMessagesAsyncCallback);
+  uv_unref(reinterpret_cast<uv_handle_t*>(&dispatch_debug_messages_async));
 
 #if defined(NODE_V8_OPTIONS)
   // Should come before the call to V8::SetFlagsFromCommandLine()
@@ -4054,11 +4055,8 @@ static void StartNodeInstance(void* arg) {
     env->set_trace_sync_io(trace_sync_io);
 
     // Enable debugger
-    if (instance_data->use_debug_agent()) {
+    if (instance_data->use_debug_agent())
       EnableDebug(env);
-    } else {
-      uv_unref(reinterpret_cast<uv_handle_t*>(&dispatch_debug_messages_async));
-    }
 
     {
       SealHandleScope seal(isolate);

From 1e98d90db87fae1b5ebd9f51453ad593ae0034f9 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Thu, 29 Oct 2015 13:39:56 +0100
Subject: [PATCH 081/323] test: add regression test for --debug-brk -e 0

Check that `node --debug-brk -e 0` immediately quits.

PR-URL: https://github.com/nodejs/node/pull/3585
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/parallel/test-debug-brk.js | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 test/parallel/test-debug-brk.js

diff --git a/test/parallel/test-debug-brk.js b/test/parallel/test-debug-brk.js
new file mode 100644
index 00000000000000..49b19898e030b9
--- /dev/null
+++ b/test/parallel/test-debug-brk.js
@@ -0,0 +1,9 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const spawnSync = require('child_process').spawnSync;
+
+const args = [`--debug-brk=${common.PORT}`, `-e`, `0`];
+const proc = spawnSync(process.execPath, args, {encoding: 'utf8'});
+assert(/Debugger listening on/.test(proc.stderr));

From 65cd03cda648b63fabde245e61cce258d5a450df Mon Sep 17 00:00:00 2001
From: Evan Lucas <evanlucas@me.com>
Date: Thu, 29 Oct 2015 11:22:00 -0500
Subject: [PATCH 082/323] src: wrap source before doing syntax check

This is to ensure that it is evaluated the same way it would be if it
were to be run by node or required.

Before, the following would pass if run by node, but fail if run via
the syntax check flag:

    if (true) {
      return;
    }

Now, this will pass the syntax check

PR-URL: https://github.com/nodejs/node/pull/3587
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
---
 src/node.js                                    | 2 ++
 test/fixtures/syntax/illegal_if_not_wrapped.js | 3 +++
 test/parallel/test-cli-syntax.js               | 1 +
 3 files changed, 6 insertions(+)
 create mode 100644 test/fixtures/syntax/illegal_if_not_wrapped.js

diff --git a/src/node.js b/src/node.js
index d47a129635e25c..ed74480289a9da 100644
--- a/src/node.js
+++ b/src/node.js
@@ -106,6 +106,8 @@
           var source = fs.readFileSync(filename, 'utf-8');
           // remove shebang and BOM
           source = internalModule.stripBOM(source.replace(/^\#\!.*/, ''));
+          // wrap it
+          source = Module.wrap(source);
           // compile the script, this will throw if it fails
           new vm.Script(source, {filename: filename, displayErrors: true});
           process.exit(0);
diff --git a/test/fixtures/syntax/illegal_if_not_wrapped.js b/test/fixtures/syntax/illegal_if_not_wrapped.js
new file mode 100644
index 00000000000000..d76a836c882b23
--- /dev/null
+++ b/test/fixtures/syntax/illegal_if_not_wrapped.js
@@ -0,0 +1,3 @@
+if (true) {
+  return;
+}
diff --git a/test/parallel/test-cli-syntax.js b/test/parallel/test-cli-syntax.js
index 20fdfdc995acbb..1118a63934d747 100644
--- a/test/parallel/test-cli-syntax.js
+++ b/test/parallel/test-cli-syntax.js
@@ -20,6 +20,7 @@ var syntaxArgs = [
   'syntax/good_syntax',
   'syntax/good_syntax_shebang.js',
   'syntax/good_syntax_shebang',
+  'syntax/illegal_if_not_wrapped.js'
 ].forEach(function(file) {
   file = path.join(common.fixturesDir, file);
 

From 90723afe328be01d1ad394b800f04aa66644968a Mon Sep 17 00:00:00 2001
From: phijohns <phillip.johnsen@finn.no>
Date: Wed, 28 Oct 2015 20:59:02 +0100
Subject: [PATCH 083/323] doc: made code spans more visible in the API docs

This makes the code spans in the API docs more visible and
therefore readable by adding some background color.

PR-URL: https://github.com/nodejs/node/pull/3573
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
---
 doc/api_assets/style.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/api_assets/style.css b/doc/api_assets/style.css
index d40253e5ae1d4a..3be4c88f960d86 100644
--- a/doc/api_assets/style.css
+++ b/doc/api_assets/style.css
@@ -339,6 +339,8 @@ p code,
 li code {
   font-size: 0.9em;
   color: #040404;
+  background-color: #f2f5f0;
+  padding: 0.2em 0.4em;
 }
 
 span.type {

From d2b5dcb2de518a520d9092bf19f54aad1e58dc55 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sun, 25 Oct 2015 11:48:41 -0700
Subject: [PATCH 084/323] lib: return boolean from child.send()

Previous change reinstated returning boolean from child.send() but
missed one instance where undefined might be returned instead.

PR-URL: https://github.com/nodejs/node/pull/3577
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 lib/internal/child_process.js                 |  2 +-
 ...test-child-process-send-returns-boolean.js | 22 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js
index da213955a59345..e93e1ae2e62c79 100644
--- a/lib/internal/child_process.js
+++ b/lib/internal/child_process.js
@@ -551,7 +551,7 @@ function setupChannel(target, channel) {
           handle: handle,
           message: message.msg,
         });
-        return;
+        return this._handleQueue.length === 1;
       }
 
       var obj = handleConversion[message.type];
diff --git a/test/parallel/test-child-process-send-returns-boolean.js b/test/parallel/test-child-process-send-returns-boolean.js
index b751846947822c..73d4454087ec8e 100644
--- a/test/parallel/test-child-process-send-returns-boolean.js
+++ b/test/parallel/test-child-process-send-returns-boolean.js
@@ -1,9 +1,29 @@
 'use strict';
 const common = require('../common');
 const assert = require('assert');
+const path = require('path');
+const net = require('net');
 const fork = require('child_process').fork;
+const spawn = require('child_process').spawn;
 
-const n = fork(common.fixturesDir + '/empty.js');
+const emptyFile = path.join(common.fixturesDir, 'empty.js');
+
+const n = fork(emptyFile);
 
 const rv = n.send({ hello: 'world' });
 assert.strictEqual(rv, true);
+
+const spawnOptions = { stdio: ['pipe', 'pipe', 'pipe', 'ipc'] };
+const s = spawn(process.execPath, [emptyFile], spawnOptions);
+var handle = null;
+s.on('exit', function() {
+  handle.close();
+});
+
+net.createServer(common.fail).listen(common.PORT, function() {
+  handle = this._handle;
+  assert.strictEqual(s.send('one', handle), true);
+  assert.strictEqual(s.send('two', handle), true);
+  assert.strictEqual(s.send('three'), false);
+  assert.strictEqual(s.send('four'), false);
+});

From 3137e46cb853523442fd340593d8d505efc9f348 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <imrani@ca.ibm.com>
Date: Mon, 19 Oct 2015 15:57:06 -0400
Subject: [PATCH 085/323] tools: update gyp to b3cef02

Includes two patches for AIX. Adds support for both 32-bit and 64-bit
files[0] and uses -RPf for cp instead of -af (which is unsupported)[1]

[0] https://codereview.chromium.org/1319663007
[1] https://codereview.chromium.org/1368133002

PR-URL: https://github.com/nodejs/node/pull/3487
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
---
 tools/gyp/PRESUBMIT.py                    |  9 ++++-----
 tools/gyp/gyp_main.py                     | 12 +++++-------
 tools/gyp/pylib/gyp/MSVSSettings.py       |  5 +----
 tools/gyp/pylib/gyp/MSVSSettings_test.py  |  2 +-
 tools/gyp/pylib/gyp/common.py             | 11 +++++++++--
 tools/gyp/pylib/gyp/generator/analyzer.py |  4 ++--
 tools/gyp/pylib/gyp/generator/make.py     | 18 +++++++++++-------
 tools/gyp/pylib/gyp/generator/msvs.py     | 13 +++++++++++++
 tools/gyp/pylib/gyp/generator/ninja.py    | 19 +++++++++++++++----
 tools/gyp/pylib/gyp/input.py              | 20 ++++++++++++--------
 tools/gyp/pylib/gyp/msvs_emulation.py     | 10 ++++++++++
 tools/gyp/pylib/gyp/win_tool.py           |  4 +++-
 tools/gyp/pylib/gyp/xcode_emulation.py    | 20 +++++++++++++++++---
 13 files changed, 103 insertions(+), 44 deletions(-)

diff --git a/tools/gyp/PRESUBMIT.py b/tools/gyp/PRESUBMIT.py
index acdb34b2bb2e20..dde025383c3276 100644
--- a/tools/gyp/PRESUBMIT.py
+++ b/tools/gyp/PRESUBMIT.py
@@ -125,14 +125,13 @@ def CheckChangeOnCommit(input_api, output_api):
 
 
 TRYBOTS = [
-    'gyp-win32',
-    'gyp-win64',
-    'gyp-linux',
-    'gyp-mac',
+    'linux_try',
+    'mac_try',
+    'win_try',
 ]
 
 
 def GetPreferredTryMasters(_, change):
   return {
-      'tryserver.nacl': { t: set(['defaulttests']) for t in TRYBOTS },
+      'client.gyp': { t: set(['defaulttests']) for t in TRYBOTS },
   }
diff --git a/tools/gyp/gyp_main.py b/tools/gyp/gyp_main.py
index 4ec872f0f95aa3..25a6eba94aae7d 100755
--- a/tools/gyp/gyp_main.py
+++ b/tools/gyp/gyp_main.py
@@ -4,15 +4,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import os
 import sys
 
-# TODO(mark): sys.path manipulation is some temporary testing stuff.
-try:
-  import gyp
-except ImportError, e:
-  import os.path
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), 'pylib'))
-  import gyp
+# Make sure we're using the version of pylib in this repo, not one installed
+# elsewhere on the system.
+sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), 'pylib'))
+import gyp
 
 if __name__ == '__main__':
   sys.exit(gyp.script_main())
diff --git a/tools/gyp/pylib/gyp/MSVSSettings.py b/tools/gyp/pylib/gyp/MSVSSettings.py
index dde0e07092b167..4985756bdde76a 100644
--- a/tools/gyp/pylib/gyp/MSVSSettings.py
+++ b/tools/gyp/pylib/gyp/MSVSSettings.py
@@ -708,10 +708,7 @@ def _ValidateSettings(validators, settings, stderr):
 _MSBuildOnly(_compile, 'BuildingInIDE', _boolean)
 _MSBuildOnly(_compile, 'CompileAsManaged',
              _Enumeration([], new=['false',
-                                   'true',  # /clr
-                                   'Pure',  # /clr:pure
-                                   'Safe',  # /clr:safe
-                                   'OldSyntax']))  # /clr:oldSyntax
+                                   'true']))  # /clr
 _MSBuildOnly(_compile, 'CreateHotpatchableImage', _boolean)  # /hotpatch
 _MSBuildOnly(_compile, 'MultiProcessorCompilation', _boolean)  # /MP
 _MSBuildOnly(_compile, 'PreprocessOutputPath', _string)  # /Fi
diff --git a/tools/gyp/pylib/gyp/MSVSSettings_test.py b/tools/gyp/pylib/gyp/MSVSSettings_test.py
index d24dcac4d5e13e..bf6ea6b802ff91 100755
--- a/tools/gyp/pylib/gyp/MSVSSettings_test.py
+++ b/tools/gyp/pylib/gyp/MSVSSettings_test.py
@@ -296,7 +296,7 @@ def testValidateMSBuildSettings_settings(self):
             'BuildingInIDE': 'true',
             'CallingConvention': 'Cdecl',
             'CompileAs': 'CompileAsC',
-            'CompileAsManaged': 'Pure',
+            'CompileAsManaged': 'true',
             'CreateHotpatchableImage': 'true',
             'DebugInformationFormat': 'ProgramDatabase',
             'DisableLanguageExtensions': 'true',
diff --git a/tools/gyp/pylib/gyp/common.py b/tools/gyp/pylib/gyp/common.py
index b6875e43efcbc4..d482a20df3cdd9 100644
--- a/tools/gyp/pylib/gyp/common.py
+++ b/tools/gyp/pylib/gyp/common.py
@@ -131,13 +131,20 @@ def QualifiedTarget(build_file, target, toolset):
 
 
 @memoize
-def RelativePath(path, relative_to):
+def RelativePath(path, relative_to, follow_path_symlink=True):
   # Assuming both |path| and |relative_to| are relative to the current
   # directory, returns a relative path that identifies path relative to
   # relative_to.
+  # If |follow_symlink_path| is true (default) and |path| is a symlink, then
+  # this method returns a path to the real file represented by |path|. If it is
+  # false, this method returns a path to the symlink. If |path| is not a
+  # symlink, this option has no effect.
 
   # Convert to normalized (and therefore absolute paths).
-  path = os.path.realpath(path)
+  if follow_path_symlink:
+    path = os.path.realpath(path)
+  else:
+    path = os.path.abspath(path)
   relative_to = os.path.realpath(relative_to)
 
   # On Windows, we can't create a relative path to a different drive, so just
diff --git a/tools/gyp/pylib/gyp/generator/analyzer.py b/tools/gyp/pylib/gyp/generator/analyzer.py
index 3a0ec9baff2786..f403d4e266b048 100644
--- a/tools/gyp/pylib/gyp/generator/analyzer.py
+++ b/tools/gyp/pylib/gyp/generator/analyzer.py
@@ -338,7 +338,7 @@ def _GenerateTargets(data, target_list, target_dicts, toplevel_dir, files,
       sources = _ExtractSources(target_name, target_dicts[target_name],
                                 toplevel_dir)
       for source in sources:
-        if source in files:
+        if _ToGypPath(os.path.normpath(source)) in files:
           print 'target', target_name, 'matches', source
           target.match_status = MATCH_STATUS_MATCHES
           matching_targets.append(target)
@@ -498,7 +498,7 @@ def _WasGypIncludeFileModified(params, files):
   files."""
   if params['options'].includes:
     for include in params['options'].includes:
-      if _ToGypPath(include) in files:
+      if _ToGypPath(os.path.normpath(include)) in files:
         print 'Include file modified, assuming all changed', include
         return True
   return False
diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py
index 5cf2fe76be2841..786b4e079197e5 100644
--- a/tools/gyp/pylib/gyp/generator/make.py
+++ b/tools/gyp/pylib/gyp/generator/make.py
@@ -211,10 +211,10 @@ def CalculateGeneratorInputInfo(params):
 
 LINK_COMMANDS_AIX = """\
 quiet_cmd_alink = AR($(TOOLSET)) $@
-cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) crs $@ $(filter %.o,$^)
+cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) -X32_64 crs $@ $(filter %.o,$^)
 
 quiet_cmd_alink_thin = AR($(TOOLSET)) $@
-cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crs $@ $(filter %.o,$^)
+cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) -X32_64 crs $@ $(filter %.o,$^)
 
 quiet_cmd_link = LINK($(TOOLSET)) $@
 cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(LD_INPUTS) $(LIBS)
@@ -273,9 +273,9 @@ def CalculateGeneratorInputInfo(params):
 %(make_global_settings)s
 
 CC.target ?= %(CC.target)s
-CFLAGS.target ?= $(CFLAGS)
+CFLAGS.target ?= $(CPPFLAGS) $(CFLAGS)
 CXX.target ?= %(CXX.target)s
-CXXFLAGS.target ?= $(CXXFLAGS)
+CXXFLAGS.target ?= $(CPPFLAGS) $(CXXFLAGS)
 LINK.target ?= %(LINK.target)s
 LDFLAGS.target ?= $(LDFLAGS)
 AR.target ?= $(AR)
@@ -286,9 +286,9 @@ def CalculateGeneratorInputInfo(params):
 # TODO(evan): move all cross-compilation logic to gyp-time so we don't need
 # to replicate this environment fallback in make as well.
 CC.host ?= %(CC.host)s
-CFLAGS.host ?=
+CFLAGS.host ?= $(CPPFLAGS_host) $(CFLAGS_host)
 CXX.host ?= %(CXX.host)s
-CXXFLAGS.host ?=
+CXXFLAGS.host ?= $(CPPFLAGS_host) $(CXXFLAGS_host)
 LINK.host ?= %(LINK.host)s
 LDFLAGS.host ?=
 AR.host ?= %(AR.host)s
@@ -365,7 +365,7 @@ def CalculateGeneratorInputInfo(params):
 
 quiet_cmd_copy = COPY $@
 # send stderr to /dev/null to ignore messages when linking directories.
-cmd_copy = ln -f "$<" "$@" 2>/dev/null || (rm -rf "$@" && cp -af "$<" "$@")
+cmd_copy = ln -f "$<" "$@" 2>/dev/null || (rm -rf "$@" && cp %(copy_archive_args)s "$<" "$@")
 
 %(link_commands)s
 """
@@ -2010,6 +2010,7 @@ def CalculateMakefilePath(build_file, base_name):
     srcdir_prefix = '$(srcdir)/'
 
   flock_command= 'flock'
+  copy_archive_arguments = '-af'
   header_params = {
       'default_target': default_target,
       'builddir': builddir_name,
@@ -2019,6 +2020,7 @@ def CalculateMakefilePath(build_file, base_name):
       'link_commands': LINK_COMMANDS_LINUX,
       'extra_commands': '',
       'srcdir': srcdir,
+      'copy_archive_args': copy_archive_arguments,
     }
   if flavor == 'mac':
     flock_command = './gyp-mac-tool flock'
@@ -2043,7 +2045,9 @@ def CalculateMakefilePath(build_file, base_name):
         'flock': 'lockf',
     })
   elif flavor == 'aix':
+    copy_archive_arguments = '-pPRf'
     header_params.update({
+        'copy_archive_args': copy_archive_arguments,
         'link_commands': LINK_COMMANDS_AIX,
         'flock': './gyp-flock-tool flock',
         'flock_index': 2,
diff --git a/tools/gyp/pylib/gyp/generator/msvs.py b/tools/gyp/pylib/gyp/generator/msvs.py
index 1338790ef68f9c..44cc1304a2e8ed 100644
--- a/tools/gyp/pylib/gyp/generator/msvs.py
+++ b/tools/gyp/pylib/gyp/generator/msvs.py
@@ -87,6 +87,8 @@ def _import_OrderedDict():
     'msvs_requires_importlibrary',
     'msvs_enable_winphone',
     'msvs_application_type_revision',
+    'msvs_target_platform_version',
+    'msvs_target_platform_minversion',
 ]
 
 
@@ -2644,6 +2646,17 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
     else:
       properties[0].append(['ApplicationTypeRevision', '8.1'])
 
+    if spec.get('msvs_target_platform_version'):
+      target_platform_version = spec.get('msvs_target_platform_version')
+      properties[0].append(['WindowsTargetPlatformVersion',
+                            target_platform_version])
+      if spec.get('msvs_target_platform_minversion'):
+        target_platform_minversion = spec.get('msvs_target_platform_minversion')
+        properties[0].append(['WindowsTargetPlatformMinVersion',
+                              target_platform_minversion])
+      else:
+        properties[0].append(['WindowsTargetPlatformMinVersion',
+                              target_platform_version])
     if spec.get('msvs_enable_winphone'):
       properties[0].append(['ApplicationType', 'Windows Phone'])
     else:
diff --git a/tools/gyp/pylib/gyp/generator/ninja.py b/tools/gyp/pylib/gyp/generator/ninja.py
index c2437822a7f85b..0e8ae9790853ea 100644
--- a/tools/gyp/pylib/gyp/generator/ninja.py
+++ b/tools/gyp/pylib/gyp/generator/ninja.py
@@ -921,6 +921,11 @@ def WriteSourcesForArch(self, ninja_file, config_name, config, sources,
                   os.environ.get('CFLAGS', '').split() + cflags_c)
       cflags_cc = (os.environ.get('CPPFLAGS', '').split() +
                    os.environ.get('CXXFLAGS', '').split() + cflags_cc)
+    elif self.toolset == 'host':
+      cflags_c = (os.environ.get('CPPFLAGS_host', '').split() +
+                  os.environ.get('CFLAGS_host', '').split() + cflags_c)
+      cflags_cc = (os.environ.get('CPPFLAGS_host', '').split() +
+                   os.environ.get('CXXFLAGS_host', '').split() + cflags_cc)
 
     defines = config.get('defines', []) + extra_defines
     self.WriteVariableList(ninja_file, 'defines',
@@ -1672,7 +1677,7 @@ def CommandWithWrapper(cmd, wrappers, prog):
 
 def GetDefaultConcurrentLinks():
   """Returns a best-guess for a number of concurrent links."""
-  pool_size = int(os.getenv('GYP_LINK_CONCURRENCY', 0))
+  pool_size = int(os.environ.get('GYP_LINK_CONCURRENCY', 0))
   if pool_size:
     return pool_size
 
@@ -1696,8 +1701,10 @@ class MEMORYSTATUSEX(ctypes.Structure):
     stat.dwLength = ctypes.sizeof(stat)
     ctypes.windll.kernel32.GlobalMemoryStatusEx(ctypes.byref(stat))
 
-    mem_limit = max(1, stat.ullTotalPhys / (4 * (2 ** 30)))  # total / 4GB
-    hard_cap = max(1, int(os.getenv('GYP_LINK_CONCURRENCY_MAX', 2**32)))
+    # VS 2015 uses 20% more working set than VS 2013 and can consume all RAM
+    # on a 64 GB machine.
+    mem_limit = max(1, stat.ullTotalPhys / (5 * (2 ** 30)))  # total / 5GB
+    hard_cap = max(1, int(os.environ.get('GYP_LINK_CONCURRENCY_MAX', 2**32)))
     return min(mem_limit, hard_cap)
   elif sys.platform.startswith('linux'):
     if os.path.exists("/proc/meminfo"):
@@ -2275,7 +2282,11 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
     if flavor == 'mac':
       gyp.xcode_emulation.MergeGlobalXcodeSettingsToSpec(data[build_file], spec)
 
-    build_file = gyp.common.RelativePath(build_file, options.toplevel_dir)
+    # If build_file is a symlink, we must not follow it because there's a chance
+    # it could point to a path above toplevel_dir, and we cannot correctly deal
+    # with that case at the moment.
+    build_file = gyp.common.RelativePath(build_file, options.toplevel_dir,
+                                         False)
 
     qualified_target_for_hash = gyp.common.QualifiedTarget(build_file, name,
                                                            toolset)
diff --git a/tools/gyp/pylib/gyp/input.py b/tools/gyp/pylib/gyp/input.py
index c7efe99a122c0b..bc68c3765dba98 100644
--- a/tools/gyp/pylib/gyp/input.py
+++ b/tools/gyp/pylib/gyp/input.py
@@ -57,7 +57,7 @@ def IsPathSection(section):
   # If section ends in one of the '=+?!' characters, it's applied to a section
   # without the trailing characters.  '/' is notably absent from this list,
   # because there's no way for a regular expression to be treated as a path.
-  while section[-1:] in '=+?!':
+  while section and section[-1:] in '=+?!':
     section = section[:-1]
 
   if section in path_sections:
@@ -893,11 +893,15 @@ def ExpandVariables(input, phase, variables, build_file):
         else:
           # Fix up command with platform specific workarounds.
           contents = FixupPlatformCommand(contents)
-          p = subprocess.Popen(contents, shell=use_shell,
-                               stdout=subprocess.PIPE,
-                               stderr=subprocess.PIPE,
-                               stdin=subprocess.PIPE,
-                               cwd=build_file_dir)
+          try:
+            p = subprocess.Popen(contents, shell=use_shell,
+                                 stdout=subprocess.PIPE,
+                                 stderr=subprocess.PIPE,
+                                 stdin=subprocess.PIPE,
+                                 cwd=build_file_dir)
+          except Exception, e:
+            raise GypError("%s while executing command '%s' in %s" %
+                           (e, contents, build_file))
 
           p_stdout, p_stderr = p.communicate('')
 
@@ -905,8 +909,8 @@ def ExpandVariables(input, phase, variables, build_file):
             sys.stderr.write(p_stderr)
             # Simulate check_call behavior, since check_call only exists
             # in python 2.5 and later.
-            raise GypError("Call to '%s' returned exit status %d." %
-                           (contents, p.returncode))
+            raise GypError("Call to '%s' returned exit status %d while in %s." %
+                           (contents, p.returncode, build_file))
           replacement = p_stdout.rstrip()
 
         cached_command_results[cache_key] = replacement
diff --git a/tools/gyp/pylib/gyp/msvs_emulation.py b/tools/gyp/pylib/gyp/msvs_emulation.py
index ce5c46ea5b3d95..ca67b122f0b9b1 100644
--- a/tools/gyp/pylib/gyp/msvs_emulation.py
+++ b/tools/gyp/pylib/gyp/msvs_emulation.py
@@ -442,6 +442,7 @@ def GetCflags(self, config):
     cl('FloatingPointModel',
         map={'0': 'precise', '1': 'strict', '2': 'fast'}, prefix='/fp:',
         default='0')
+    cl('CompileAsManaged', map={'false': '', 'true': '/clr'})
     cl('WholeProgramOptimization', map={'true': '/GL'})
     cl('WarningLevel', prefix='/W')
     cl('WarnAsError', map={'true': '/WX'})
@@ -593,6 +594,15 @@ def GetLdflags(self, config, gyp_to_build_path, expand_special,
             '2': 'WINDOWS%s' % minimum_required_version},
        prefix='/SUBSYSTEM:')
 
+    stack_reserve_size = self._Setting(
+        ('VCLinkerTool', 'StackReserveSize'), config, default='')
+    if stack_reserve_size:
+      stack_commit_size = self._Setting(
+          ('VCLinkerTool', 'StackCommitSize'), config, default='')
+      if stack_commit_size:
+        stack_commit_size = ',' + stack_commit_size
+      ldflags.append('/STACK:%s%s' % (stack_reserve_size, stack_commit_size))
+
     ld('TerminalServerAware', map={'1': ':NO', '2': ''}, prefix='/TSAWARE')
     ld('LinkIncremental', map={'1': ':NO', '2': ''}, prefix='/INCREMENTAL')
     ld('BaseAddress', prefix='/BASE:')
diff --git a/tools/gyp/pylib/gyp/win_tool.py b/tools/gyp/pylib/gyp/win_tool.py
index 417e465f7853f4..bb6f1ea436f258 100755
--- a/tools/gyp/pylib/gyp/win_tool.py
+++ b/tools/gyp/pylib/gyp/win_tool.py
@@ -123,7 +123,9 @@ def ExecLinkWrapper(self, arch, use_separate_mspdbsrv, *args):
                             stderr=subprocess.STDOUT)
     out, _ = link.communicate()
     for line in out.splitlines():
-      if not line.startswith('   Creating library '):
+      if (not line.startswith('   Creating library ') and
+          not line.startswith('Generating code') and
+          not line.startswith('Finished generating code')):
         print line
     return link.returncode
 
diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
index c002b112c54cee..5de9ac121d61f9 100644
--- a/tools/gyp/pylib/gyp/xcode_emulation.py
+++ b/tools/gyp/pylib/gyp/xcode_emulation.py
@@ -1032,7 +1032,23 @@ def _AdjustLibrary(self, library, config_name=None):
     sdk_root = self._SdkPath(config_name)
     if not sdk_root:
       sdk_root = ''
-    return l.replace('$(SDKROOT)', sdk_root)
+    # Xcode 7 started shipping with ".tbd" (text based stubs) files instead of
+    # ".dylib" without providing a real support for them. What it does, for
+    # "/usr/lib" libraries, is do "-L/usr/lib -lname" which is dependent on the
+    # library order and cause collision when building Chrome.
+    #
+    # Instead substitude ".tbd" to ".dylib" in the generated project when the
+    # following conditions are both true:
+    # - library is referenced in the gyp file as "$(SDKROOT)/**/*.dylib",
+    # - the ".dylib" file does not exists but a ".tbd" file do.
+    library = l.replace('$(SDKROOT)', sdk_root)
+    if l.startswith('$(SDKROOT)'):
+      basename, ext = os.path.splitext(library)
+      if ext == '.dylib' and not os.path.exists(library):
+        tbd_library = basename + '.tbd'
+        if os.path.exists(tbd_library):
+          library = tbd_library
+    return library
 
   def AdjustLibraries(self, libraries, config_name=None):
     """Transforms entries like 'Cocoa.framework' in libraries into entries like
@@ -1479,8 +1495,6 @@ def _GetXcodeEnv(xcode_settings, built_products_dir, srcroot, configuration,
     sdk_root = xcode_settings._SdkRoot(configuration)
     if not sdk_root:
       sdk_root = xcode_settings._XcodeSdkPath('')
-    if sdk_root is None:
-      sdk_root = ''
     env['SDKROOT'] = sdk_root
 
   if not additional_settings:

From cbd358ce33505d2ea3069562855ef432a0a831be Mon Sep 17 00:00:00 2001
From: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Date: Tue, 10 Feb 2015 09:27:52 +0900
Subject: [PATCH 086/323] tools: fix gyp to work on MacOSX without XCode

This issue has already submitted to the upstream in
https://code.google.com/p/gyp/issues/detail?id=477
Use this commit until the upstream is to be fixed.

PR-URL: https://github.com/iojs/io.js/pull/1325
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 tools/gyp/pylib/gyp/xcode_emulation.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
index 5de9ac121d61f9..407ead074bbe7e 100644
--- a/tools/gyp/pylib/gyp/xcode_emulation.py
+++ b/tools/gyp/pylib/gyp/xcode_emulation.py
@@ -1495,6 +1495,8 @@ def _GetXcodeEnv(xcode_settings, built_products_dir, srcroot, configuration,
     sdk_root = xcode_settings._SdkRoot(configuration)
     if not sdk_root:
       sdk_root = xcode_settings._XcodeSdkPath('')
+    if sdk_root is None:
+      sdk_root = ''
     env['SDKROOT'] = sdk_root
 
   if not additional_settings:

From efa19bdcb55518031530f5e476dbaca8162de264 Mon Sep 17 00:00:00 2001
From: Emily Aviva Kapor-Mater <emily@emilyaviva.com>
Date: Thu, 29 Oct 2015 14:52:36 -0700
Subject: [PATCH 087/323] doc: add final full stop in CONTRIBUTING.md

PR-URL: https://github.com/nodejs/node/pull/3576
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
---
 CONTRIBUTING.md | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3b3bf08b538707..8da5d14f8ad63d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -45,21 +45,21 @@ and built upon.
 The rules for the master branch are less strict; consult the
 [stability index](./doc/api/documentation.markdown#stability-index) for details.
 
-In a nutshell, modules are at varying levels of API stability.  Bug fixes are
+In a nutshell, modules are at varying levels of API stability. Bug fixes are
 always welcome but API or behavioral changes to modules at stability level 3
 (Locked) are off-limits.
 
 #### Dependencies
 
 Node.js has several bundled dependencies in the *deps/* and the *tools/*
-directories that are not part of the project proper.  Any changes to files
+directories that are not part of the project proper. Any changes to files
 in those directories or its subdirectories should be sent to their respective
-projects.  Do not send your patch to us, we cannot accept it.
+projects. Do not send your patch to us, we cannot accept it.
 
 In case of doubt, open an issue in the
 [issue tracker](https://github.com/nodejs/node/issues/) or contact one of the
 [project Collaborators](https://github.com/nodejs/node/#current-project-team-members).
-([IRC](http://webchat.freenode.net/?channels=io.js) is often the best medium.) Especially do so if you plan to work on something big.  Nothing is more
+([IRC](http://webchat.freenode.net/?channels=io.js) is often the best medium.) Especially do so if you plan to work on something big. Nothing is more
 frustrating than seeing your hard work go to waste because your vision
 does not align with the project team.
 
@@ -81,8 +81,8 @@ $ git config --global user.name "J. Random User"
 $ git config --global user.email "j.random.user@example.com"
 ```
 
-Writing good commit logs is important.  A commit log should describe what
-changed and why.  Follow these guidelines when writing one:
+Writing good commit logs is important. A commit log should describe what
+changed and why. Follow these guidelines when writing one:
 
 1. The first line should be 50 characters or less and contain a short
    description of the change prefixed with the name of the changed
@@ -124,15 +124,15 @@ $ git rebase upstream/master
 
 ### Step 5: Test
 
-Bug fixes and features **should come with tests**.  Add your tests in the
-test/parallel/ directory.  Look at other tests to see how they should be
+Bug fixes and features **should come with tests**. Add your tests in the
+test/parallel/ directory. Look at other tests to see how they should be
 structured (license boilerplate, common includes, etc.).
 
 ```text
 $ ./configure && make -j8 test
 ```
 
-Make sure the linter is happy and that all tests pass.  Please, do not submit
+Make sure the linter is happy and that all tests pass. Please, do not submit
 patches that fail either check.
 
 If you are updating tests and just want to run a single test to check it, you
@@ -160,9 +160,9 @@ $ git push origin my-feature-branch
 Go to https://github.com/yourusername/node and select your feature branch.
 Click the 'Pull Request' button and fill out the form.
 
-Pull requests are usually reviewed within a few days.  If there are comments
+Pull requests are usually reviewed within a few days. If there are comments
 to address, apply your changes in a separate commit and push that to your
-feature branch.  Post a comment in the pull request afterwards; GitHub does
+feature branch. Post a comment in the pull request afterwards; GitHub does
 not send out notifications when you add commits.
 
 
@@ -201,7 +201,7 @@ CoC](http://www.rust-lang.org/conduct.html).
 * Please keep unstructured critique to a minimum. If you have solid
   ideas you want to experiment with, make a fork and see how it works.
 * We will exclude you from interaction if you insult, demean or harass
-  anyone.  That is not welcome behavior. We interpret the term
+  anyone. That is not welcome behavior. We interpret the term
   "harassment" as including the definition in the [Citizen Code of
   Conduct](http://citizencodeofconduct.org/); if you have any lack of
   clarity about what might be included in that concept, please read
@@ -211,11 +211,11 @@ CoC](http://www.rust-lang.org/conduct.html).
   you feel you have been or are being harassed or made uncomfortable
   by a community member, please contact one of the channel ops or any
   of the TC members immediately with a capture (log, photo, email) of
-  the harassment if possible.  Whether you're a regular contributor or
+  the harassment if possible. Whether you're a regular contributor or
   a newcomer, we care about making this community a safe place for you
   and we've got your back.
 * Likewise any spamming, trolling, flaming, baiting or other
   attention-stealing behavior is not welcome.
 * Avoid the use of personal pronouns in code comments or
   documentation. There is no need to address persons when explaining
-  code (e.g. "When the developer")
+  code (e.g. "When the developer").

From 7d0b58964416a1260246f456e8326b2442633194 Mon Sep 17 00:00:00 2001
From: Jason Gerfen <jason.gerfen@gmail.com>
Date: Sat, 31 Oct 2015 09:24:08 -0600
Subject: [PATCH 088/323] doc: fix crypto spkac function descriptions

Fix regarding description of the following functions:

Certificate.exportPublicKey(spkac)
Certificate.exportChallenge(spkac)

The descriptions were applied incorrectly.

PR-URL: https://github.com/nodejs/node/pull/3614
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 doc/api/crypto.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/api/crypto.markdown b/doc/api/crypto.markdown
index 04d7af6a168334..6511cfadc9b7c0 100644
--- a/doc/api/crypto.markdown
+++ b/doc/api/crypto.markdown
@@ -673,11 +673,11 @@ Returns true of false based on the validity of the SPKAC.
 
 ### Certificate.exportChallenge(spkac)
 
-Exports the encoded public key from the supplied SPKAC.
+Exports the encoded challenge associated with the SPKAC.
 
 ### Certificate.exportPublicKey(spkac)
 
-Exports the encoded challenge associated with the SPKAC.
+Exports the encoded public key from the supplied SPKAC.
 
 ## crypto.publicEncrypt(public_key, buffer)
 

From 56673693cd6654c44af4c5741a51104050172630 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Sun, 1 Nov 2015 19:34:19 -0500
Subject: [PATCH 089/323] buffer: neuter external `nullptr` buffers

Neuter external `nullptr` buffers, otherwise their contents will be
materialized on access, and the buffer instance will be internalized.

This leads to a crash like this:

    v8::ArrayBuffer::Neuter Only externalized ArrayBuffers can be
    neutered

Fix: #3619
PR-URL: https://github.com/nodejs/node/pull/3624
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 src/node_buffer.cc                         |  5 +++
 test/addons/null-buffer-neuter/binding.cc  | 40 ++++++++++++++++++++++
 test/addons/null-buffer-neuter/binding.gyp |  8 +++++
 test/addons/null-buffer-neuter/test.js     |  7 ++++
 4 files changed, 60 insertions(+)
 create mode 100644 test/addons/null-buffer-neuter/binding.cc
 create mode 100644 test/addons/null-buffer-neuter/binding.gyp
 create mode 100644 test/addons/null-buffer-neuter/test.js

diff --git a/src/node_buffer.cc b/src/node_buffer.cc
index 7d428b2b134b51..e4af4909ffbe59 100644
--- a/src/node_buffer.cc
+++ b/src/node_buffer.cc
@@ -362,6 +362,11 @@ MaybeLocal<Object> New(Environment* env,
   }
 
   Local<ArrayBuffer> ab = ArrayBuffer::New(env->isolate(), data, length);
+  // `Neuter()`ing is required here to prevent materialization of the backing
+  // store in v8. `nullptr` buffers are not writable, so this is semantically
+  // correct.
+  if (data == nullptr)
+    ab->Neuter();
   Local<Uint8Array> ui = Uint8Array::New(ab, 0, length);
   Maybe<bool> mb =
       ui->SetPrototype(env->context(), env->buffer_prototype_object());
diff --git a/test/addons/null-buffer-neuter/binding.cc b/test/addons/null-buffer-neuter/binding.cc
new file mode 100644
index 00000000000000..da75919011f58b
--- /dev/null
+++ b/test/addons/null-buffer-neuter/binding.cc
@@ -0,0 +1,40 @@
+#include <node.h>
+#include <node_buffer.h>
+#include <util.h>
+#include <v8.h>
+
+static int alive;
+
+static void FreeCallback(char* data, void* hint) {
+  CHECK_EQ(data, nullptr);
+  alive--;
+}
+
+void Run(const v8::FunctionCallbackInfo<v8::Value>& args) {
+  v8::Isolate* isolate = args.GetIsolate();
+  alive++;
+
+  {
+    v8::HandleScope scope(isolate);
+    v8::Local<v8::Object> buf = node::Buffer::New(
+          isolate,
+          nullptr,
+          0,
+          FreeCallback,
+          nullptr).ToLocalChecked();
+
+    char* data = node::Buffer::Data(buf);
+    CHECK_EQ(data, nullptr);
+  }
+
+  isolate->RequestGarbageCollectionForTesting(
+      v8::Isolate::kFullGarbageCollection);
+
+  CHECK_EQ(alive, 0);
+}
+
+void init(v8::Local<v8::Object> target) {
+  NODE_SET_METHOD(target, "run", Run);
+}
+
+NODE_MODULE(binding, init);
diff --git a/test/addons/null-buffer-neuter/binding.gyp b/test/addons/null-buffer-neuter/binding.gyp
new file mode 100644
index 00000000000000..3bfb84493f3e87
--- /dev/null
+++ b/test/addons/null-buffer-neuter/binding.gyp
@@ -0,0 +1,8 @@
+{
+  'targets': [
+    {
+      'target_name': 'binding',
+      'sources': [ 'binding.cc' ]
+    }
+  ]
+}
diff --git a/test/addons/null-buffer-neuter/test.js b/test/addons/null-buffer-neuter/test.js
new file mode 100644
index 00000000000000..bca76e27afa4c5
--- /dev/null
+++ b/test/addons/null-buffer-neuter/test.js
@@ -0,0 +1,7 @@
+'use strict';
+// Flags: --expose-gc
+
+require('../../common');
+var binding = require('./build/Release/binding');
+
+binding.run();

From e40d28283a176257e4ace423ae0c915c05851720 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <me@re-becca.org>
Date: Thu, 29 Oct 2015 16:40:20 -0700
Subject: [PATCH 090/323] tools: update npm test tooling for 3.3.10+

PR-URL: https://github.com/nodejs/node/pull/3599
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 tools/test-npm.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/test-npm.sh b/tools/test-npm.sh
index 9cb5a80100352e..51a2a5225a6929 100755
--- a/tools/test-npm.sh
+++ b/tools/test-npm.sh
@@ -30,11 +30,14 @@ export npm_config_tmp="$(pwd)/npm-tmp"
 
 # ensure npm always uses the local node
 export PATH="$(../$NODE -p 'require("path").resolve("..")'):$PATH"
+unset NODE
 
+# make sure the binaries from the non-dev-deps are available
+node cli.js rebuild
 # install npm devDependencies and run npm's tests
-../$NODE cli.js install --ignore-scripts
-../$NODE test/run.js
-../$NODE cli.js run-script tap -- "test/tap/*.js"
+node cli.js install --ignore-scripts
+# run the tests
+node cli.js run-script test-node
 
 # clean up everything one single shot
 cd .. && rm -rf test-npm

From c96400c572f8dc7ae4e71d361ed0c0a27676101d Mon Sep 17 00:00:00 2001
From: Rebecca Turner <me@re-becca.org>
Date: Thu, 29 Oct 2015 16:51:09 -0700
Subject: [PATCH 091/323] gitignore: don't ignore 'debug' in deps/npm

PR-URL: https://github.com/nodejs/node/pull/3599
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 18240c442e00cf..2e6f583bf732b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,7 @@ icu_config.gypi
 
 # various stuff that VC++ produces/uses
 Debug/
-!node_modules/debug/
+!deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug
 !deps/v8/src/debug/
 Release/
 !doc/blog/**

From 08e0de59fadb56b2556b03736a3c7ccb872de4a3 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <me@re-becca.org>
Date: Thu, 29 Oct 2015 16:50:12 -0700
Subject: [PATCH 092/323] deps: upgrade npm to 3.3.10

PR-URL: https://github.com/nodejs/node/pull/3599
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 deps/npm/.mailmap                             |     2 +
 deps/npm/.travis.yml                          |     2 +
 deps/npm/AUTHORS                              |    11 +
 deps/npm/CHANGELOG.md                         |   514 +-
 deps/npm/README.md                            |     2 +-
 deps/npm/bin/npm-cli.js                       |     1 -
 deps/npm/doc/cli/npm-bin.md                   |     2 +-
 deps/npm/doc/cli/npm-config.md                |     4 +-
 deps/npm/doc/cli/npm-init.md                  |     2 +-
 deps/npm/doc/cli/npm-install.md               |    22 +-
 deps/npm/doc/cli/npm-search.md                |     2 +-
 deps/npm/doc/cli/npm-shrinkwrap.md            |     2 +-
 deps/npm/doc/cli/npm-team.md                  |     4 +-
 deps/npm/doc/cli/npm-uninstall.md             |     8 +-
 deps/npm/doc/cli/npm-update.md                |     3 +-
 deps/npm/doc/cli/npm-version.md               |     8 +-
 deps/npm/doc/cli/npm-view.md                  |     2 +-
 deps/npm/doc/cli/npm.md                       |     2 +-
 deps/npm/doc/files/package.json.md            |     4 +-
 deps/npm/doc/misc/npm-coding-style.md         |    32 +-
 deps/npm/doc/misc/npm-config.md               |     4 +-
 deps/npm/doc/misc/npm-faq.md                  |    11 +-
 deps/npm/doc/misc/npm-index.md                |     4 +
 deps/npm/doc/misc/npm-orgs.md                 |    90 +
 deps/npm/doc/misc/npm-scripts.md              |     2 +-
 deps/npm/html/doc/README.html                 |     6 +-
 deps/npm/html/doc/api/npm-bin.html            |    32 -
 deps/npm/html/doc/api/npm-bugs.html           |    37 -
 deps/npm/html/doc/api/npm-cache.html          |    46 -
 deps/npm/html/doc/api/npm-commands.html       |    40 -
 deps/npm/html/doc/api/npm-config.html         |    61 -
 deps/npm/html/doc/api/npm-deprecate.html      |    51 -
 deps/npm/html/doc/api/npm-docs.html           |    37 -
 deps/npm/html/doc/api/npm-edit.html           |    40 -
 deps/npm/html/doc/api/npm-explore.html        |    35 -
 deps/npm/html/doc/api/npm-help-search.html    |    48 -
 deps/npm/html/doc/api/npm-init.html           |    43 -
 deps/npm/html/doc/api/npm-install.html        |    36 -
 deps/npm/html/doc/api/npm-link.html           |    46 -
 deps/npm/html/doc/api/npm-load.html           |    41 -
 deps/npm/html/doc/api/npm-ls.html             |    67 -
 deps/npm/html/doc/api/npm-outdated.html       |    32 -
 deps/npm/html/doc/api/npm-owner.html          |    51 -
 deps/npm/html/doc/api/npm-pack.html           |    37 -
 deps/npm/html/doc/api/npm-ping.html           |    32 -
 deps/npm/html/doc/api/npm-prefix.html         |    33 -
 deps/npm/html/doc/api/npm-prune.html          |    34 -
 deps/npm/html/doc/api/npm-publish.html        |    50 -
 deps/npm/html/doc/api/npm-rebuild.html        |    34 -
 deps/npm/html/doc/api/npm-repo.html           |    37 -
 deps/npm/html/doc/api/npm-restart.html        |    56 -
 deps/npm/html/doc/api/npm-root.html           |    33 -
 deps/npm/html/doc/api/npm-run-script.html     |    45 -
 deps/npm/html/doc/api/npm-search.html         |    57 -
 deps/npm/html/doc/api/npm-shrinkwrap.html     |    37 -
 deps/npm/html/doc/api/npm-start.html          |    32 -
 deps/npm/html/doc/api/npm-stop.html           |    32 -
 deps/npm/html/doc/api/npm-tag.html            |    40 -
 deps/npm/html/doc/api/npm-test.html           |    34 -
 deps/npm/html/doc/api/npm-uninstall.html      |    34 -
 deps/npm/html/doc/api/npm-unpublish.html      |    37 -
 deps/npm/html/doc/api/npm-update.html         |    37 -
 deps/npm/html/doc/api/npm-version.html        |    36 -
 deps/npm/html/doc/api/npm-view.html           |    85 -
 deps/npm/html/doc/api/npm-whoami.html         |    33 -
 deps/npm/html/doc/api/npm.html                |   113 -
 deps/npm/html/doc/cli/npm-access.html         |     2 +-
 deps/npm/html/doc/cli/npm-adduser.html        |     2 +-
 deps/npm/html/doc/cli/npm-bin.html            |     4 +-
 deps/npm/html/doc/cli/npm-bugs.html           |     2 +-
 deps/npm/html/doc/cli/npm-build.html          |     2 +-
 deps/npm/html/doc/cli/npm-bundle.html         |     2 +-
 deps/npm/html/doc/cli/npm-cache.html          |     2 +-
 deps/npm/html/doc/cli/npm-completion.html     |     2 +-
 deps/npm/html/doc/cli/npm-config.html         |     6 +-
 deps/npm/html/doc/cli/npm-dedupe.html         |     2 +-
 deps/npm/html/doc/cli/npm-deprecate.html      |     2 +-
 deps/npm/html/doc/cli/npm-dist-tag.html       |     2 +-
 deps/npm/html/doc/cli/npm-docs.html           |     2 +-
 deps/npm/html/doc/cli/npm-edit.html           |     2 +-
 deps/npm/html/doc/cli/npm-explore.html        |     2 +-
 deps/npm/html/doc/cli/npm-help-search.html    |     2 +-
 deps/npm/html/doc/cli/npm-help.html           |     2 +-
 deps/npm/html/doc/cli/npm-init.html           |     4 +-
 deps/npm/html/doc/cli/npm-install.html        |    24 +-
 deps/npm/html/doc/cli/npm-link.html           |     2 +-
 deps/npm/html/doc/cli/npm-logout.html         |     2 +-
 deps/npm/html/doc/cli/npm-ls.html             |     4 +-
 deps/npm/html/doc/cli/npm-outdated.html       |     2 +-
 deps/npm/html/doc/cli/npm-owner.html          |     2 +-
 deps/npm/html/doc/cli/npm-pack.html           |     2 +-
 deps/npm/html/doc/cli/npm-ping.html           |     2 +-
 deps/npm/html/doc/cli/npm-prefix.html         |     2 +-
 deps/npm/html/doc/cli/npm-prune.html          |     2 +-
 deps/npm/html/doc/cli/npm-publish.html        |     2 +-
 deps/npm/html/doc/cli/npm-rebuild.html        |     2 +-
 deps/npm/html/doc/cli/npm-repo.html           |     2 +-
 deps/npm/html/doc/cli/npm-restart.html        |     2 +-
 deps/npm/html/doc/cli/npm-root.html           |     2 +-
 deps/npm/html/doc/cli/npm-run-script.html     |     2 +-
 deps/npm/html/doc/cli/npm-search.html         |     4 +-
 deps/npm/html/doc/cli/npm-shrinkwrap.html     |     4 +-
 deps/npm/html/doc/cli/npm-star.html           |     2 +-
 deps/npm/html/doc/cli/npm-stars.html          |     2 +-
 deps/npm/html/doc/cli/npm-start.html          |     2 +-
 deps/npm/html/doc/cli/npm-stop.html           |     2 +-
 deps/npm/html/doc/cli/npm-tag.html            |     2 +-
 deps/npm/html/doc/cli/npm-team.html           |     6 +-
 deps/npm/html/doc/cli/npm-test.html           |     2 +-
 deps/npm/html/doc/cli/npm-uninstall.html      |    10 +-
 deps/npm/html/doc/cli/npm-unpublish.html      |     2 +-
 deps/npm/html/doc/cli/npm-update.html         |     5 +-
 deps/npm/html/doc/cli/npm-version.html        |    10 +-
 deps/npm/html/doc/cli/npm-view.html           |     4 +-
 deps/npm/html/doc/cli/npm-whoami.html         |     2 +-
 deps/npm/html/doc/cli/npm.html                |    12 +-
 deps/npm/html/doc/files/npm-folders.html      |     2 +-
 deps/npm/html/doc/files/npm-global.html       |     2 +-
 deps/npm/html/doc/files/npm-json.html         |     6 +-
 deps/npm/html/doc/files/npmrc.html            |     2 +-
 deps/npm/html/doc/files/package.json.html     |     6 +-
 deps/npm/html/doc/index.html                  |     4 +-
 deps/npm/html/doc/misc/npm-coding-style.html  |    29 +-
 deps/npm/html/doc/misc/npm-config.html        |     6 +-
 deps/npm/html/doc/misc/npm-developers.html    |     2 +-
 deps/npm/html/doc/misc/npm-disputes.html      |     8 +-
 deps/npm/html/doc/misc/npm-faq.html           |    14 +-
 deps/npm/html/doc/misc/npm-index.html         |   164 -
 deps/npm/html/doc/misc/npm-orgs.html          |     2 +-
 deps/npm/html/doc/misc/npm-registry.html      |     2 +-
 deps/npm/html/doc/misc/npm-scope.html         |     2 +-
 deps/npm/html/doc/misc/npm-scripts.html       |     4 +-
 deps/npm/html/doc/misc/removing-npm.html      |     2 +-
 deps/npm/html/doc/misc/semver.html            |     2 +-
 deps/npm/lib/build.js                         |    18 +-
 deps/npm/lib/cache.js                         |     1 -
 deps/npm/lib/cache/add-local-tarball.js       |    10 +-
 deps/npm/lib/cache/add-named.js               |    10 +-
 deps/npm/lib/cache/caching-client.js          |     2 +-
 deps/npm/lib/completion.js                    |     6 +-
 deps/npm/lib/config.js                        |    28 +-
 deps/npm/lib/config/core.js                   |     1 -
 deps/npm/lib/config/load-cafile.js            |     1 -
 deps/npm/lib/config/load-prefix.js            |     6 +-
 deps/npm/lib/dedupe.js                        |    17 +-
 deps/npm/lib/fetch-package-metadata.js        |     5 +-
 deps/npm/lib/help-search.js                   |    41 +-
 deps/npm/lib/install.js                       |    21 +-
 deps/npm/lib/install/action/build.js          |     5 +-
 deps/npm/lib/install/action/extract.js        |    12 +-
 deps/npm/lib/install/action/fetch.js          |     6 +-
 deps/npm/lib/install/action/global-install.js |     3 +-
 deps/npm/lib/install/action/global-link.js    |     3 +-
 deps/npm/lib/install/action/install.js        |     3 +-
 deps/npm/lib/install/action/postinstall.js    |     3 +-
 deps/npm/lib/install/action/preinstall.js     |     3 +-
 deps/npm/lib/install/action/prepublish.js     |     3 +-
 deps/npm/lib/install/action/test.js           |     3 +-
 deps/npm/lib/install/actions.js               |    10 +-
 deps/npm/lib/install/decompose-actions.js     |    13 +-
 deps/npm/lib/install/deps.js                  |   112 +-
 deps/npm/lib/install/diff-trees.js            |     6 +-
 .../npm/lib/install/filter-invalid-actions.js |     4 +-
 deps/npm/lib/install/flatten-tree.js          |     3 +-
 deps/npm/lib/install/inflate-bundled.js       |     6 +-
 deps/npm/lib/install/inflate-shrinkwrap.js    |     9 +-
 .../lib/install/mutate-into-logical-tree.js   |    17 +-
 deps/npm/lib/install/save.js                  |    28 +-
 deps/npm/lib/install/validate-args.js         |     2 +-
 deps/npm/lib/install/validate-tree.js         |     6 +-
 deps/npm/lib/link.js                          |     6 +-
 deps/npm/lib/ls.js                            |    10 +-
 deps/npm/lib/npm.js                           |    22 +-
 deps/npm/lib/outdated.js                      |    19 +-
 deps/npm/lib/repo.js                          |     2 +-
 deps/npm/lib/run-script.js                    |     1 -
 deps/npm/lib/search.js                        |    22 +-
 deps/npm/lib/shrinkwrap.js                    |    15 +-
 deps/npm/lib/utils/child-path.js              |    10 +
 .../lib/utils/completion/installed-deep.js    |     2 -
 deps/npm/lib/utils/error-handler.js           |   577 +-
 deps/npm/lib/utils/lifecycle.js               |    18 +-
 deps/npm/lib/utils/module-name.js             |    33 +
 .../get-package-id.js => utils/package-id.js} |    12 +-
 deps/npm/lib/utils/tar.js                     |    14 +-
 deps/npm/man/man1/npm-README.1                |     2 +-
 deps/npm/man/man1/npm-bin.1                   |     2 +-
 deps/npm/man/man1/npm-config.1                |     4 +-
 deps/npm/man/man1/npm-init.1                  |     2 +-
 deps/npm/man/man1/npm-install.1               |    22 +-
 deps/npm/man/man1/npm-ls.1                    |     2 +-
 deps/npm/man/man1/npm-search.1                |     2 +-
 deps/npm/man/man1/npm-shrinkwrap.1            |     2 +-
 deps/npm/man/man1/npm-team.1                  |     4 +-
 deps/npm/man/man1/npm-uninstall.1             |     8 +-
 deps/npm/man/man1/npm-update.1                |     3 +-
 deps/npm/man/man1/npm-version.1               |     8 +-
 deps/npm/man/man1/npm-view.1                  |     2 +-
 deps/npm/man/man1/npm.1                       |     4 +-
 deps/npm/man/man3/npm-bin.3                   |    17 -
 deps/npm/man/man3/npm-bugs.3                  |    23 -
 deps/npm/man/man3/npm-cache.3                 |    34 -
 deps/npm/man/man3/npm-commands.3              |    28 -
 deps/npm/man/man3/npm-config.3                |    49 -
 deps/npm/man/man3/npm-deprecate.3             |    43 -
 deps/npm/man/man3/npm-docs.3                  |    23 -
 deps/npm/man/man3/npm-edit.3                  |    28 -
 deps/npm/man/man3/npm-explore.3               |    22 -
 deps/npm/man/man3/npm-help-search.3           |    41 -
 deps/npm/man/man3/npm-init.3                  |    32 -
 deps/npm/man/man3/npm-install.3               |    23 -
 deps/npm/man/man3/npm-link.3                  |    41 -
 deps/npm/man/man3/npm-load.3                  |    34 -
 deps/npm/man/man3/npm-ls.3                    |    68 -
 deps/npm/man/man3/npm-outdated.3              |    17 -
 deps/npm/man/man3/npm-owner.3                 |    43 -
 deps/npm/man/man3/npm-pack.3                  |    23 -
 deps/npm/man/man3/npm-ping.3                  |    17 -
 deps/npm/man/man3/npm-prefix.3                |    19 -
 deps/npm/man/man3/npm-prune.3                 |    21 -
 deps/npm/man/man3/npm-publish.3               |    41 -
 deps/npm/man/man3/npm-rebuild.3               |    19 -
 deps/npm/man/man3/npm-repo.3                  |    23 -
 deps/npm/man/man3/npm-restart.3               |    58 -
 deps/npm/man/man3/npm-root.3                  |    19 -
 deps/npm/man/man3/npm-run-script.3            |    37 -
 deps/npm/man/man3/npm-search.3                |    52 -
 deps/npm/man/man3/npm-shrinkwrap.3            |    24 -
 deps/npm/man/man3/npm-start.3                 |    17 -
 deps/npm/man/man3/npm-stop.3                  |    17 -
 deps/npm/man/man3/npm-tag.3                   |    27 -
 deps/npm/man/man3/npm-test.3                  |    20 -
 deps/npm/man/man3/npm-uninstall.3             |    20 -
 deps/npm/man/man3/npm-unpublish.3             |    24 -
 deps/npm/man/man3/npm-update.3                |    26 -
 deps/npm/man/man3/npm-version.3               |    22 -
 deps/npm/man/man3/npm-view.3                  |   131 -
 deps/npm/man/man3/npm-whoami.3                |    19 -
 deps/npm/man/man3/npm.3                       |   124 -
 deps/npm/man/man5/npm-json.5                  |     4 +-
 deps/npm/man/man5/package.json.5              |     4 +-
 deps/npm/man/man7/npm-coding-style.7          |    40 +-
 deps/npm/man/man7/npm-config.7                |     4 +-
 deps/npm/man/man7/npm-faq.7                   |    11 +-
 deps/npm/man/man7/npm-index.7                 |     3 +
 deps/npm/man/man7/npm-scripts.7               |     2 +-
 deps/npm/node_modules/abbrev/package.json     |    84 +-
 deps/npm/node_modules/ansi-regex/package.json |   137 +-
 .../npm/node_modules/ansi-styles/package.json |   104 -
 deps/npm/node_modules/ansicolors/package.json |    84 +-
 deps/npm/node_modules/ansistyles/package.json |    84 +-
 deps/npm/node_modules/aproba/package.json     |    89 +-
 deps/npm/node_modules/archy/package.json      |   136 +-
 deps/npm/node_modules/asap/package.json       |   109 -
 deps/npm/node_modules/asn1/package.json       |    82 -
 .../npm/node_modules/assert-plus/package.json |    66 -
 deps/npm/node_modules/async-some/package.json |    88 +-
 deps/npm/node_modules/aws-sign2/package.json  |    68 -
 .../node_modules/balanced-match/package.json  |    96 -
 .../node_modules/readable-stream/package.json |    98 -
 deps/npm/node_modules/bluebird/README.md      |   679 -
 deps/npm/node_modules/bluebird/changelog.md   |  1717 ---
 .../bluebird/js/browser/bluebird.js           |  4881 --------
 .../bluebird/js/browser/bluebird.min.js       |    31 -
 deps/npm/node_modules/bluebird/js/main/any.js |    21 -
 .../node_modules/bluebird/js/main/assert.js   |    55 -
 .../node_modules/bluebird/js/main/async.js    |   150 -
 .../npm/node_modules/bluebird/js/main/bind.js |    72 -
 .../node_modules/bluebird/js/main/bluebird.js |    11 -
 .../node_modules/bluebird/js/main/call_get.js |   123 -
 .../node_modules/bluebird/js/main/cancel.js   |    48 -
 .../bluebird/js/main/captured_trace.js        |   493 -
 .../bluebird/js/main/catch_filter.js          |    66 -
 .../node_modules/bluebird/js/main/context.js  |    38 -
 .../bluebird/js/main/debuggability.js         |   162 -
 .../bluebird/js/main/direct_resolve.js        |    63 -
 .../npm/node_modules/bluebird/js/main/each.js |    12 -
 .../node_modules/bluebird/js/main/errors.js   |   111 -
 deps/npm/node_modules/bluebird/js/main/es5.js |    80 -
 .../node_modules/bluebird/js/main/filter.js   |    12 -
 .../node_modules/bluebird/js/main/finally.js  |    98 -
 .../bluebird/js/main/generators.js            |   136 -
 .../npm/node_modules/bluebird/js/main/join.js |   107 -
 deps/npm/node_modules/bluebird/js/main/map.js |   133 -
 .../node_modules/bluebird/js/main/method.js   |    44 -
 .../node_modules/bluebird/js/main/nodeify.js  |    59 -
 .../node_modules/bluebird/js/main/progress.js |    76 -
 .../node_modules/bluebird/js/main/promise.js  |   754 --
 .../bluebird/js/main/promise_array.js         |   142 -
 .../bluebird/js/main/promise_resolver.js      |   123 -
 .../bluebird/js/main/promisify.js             |   306 -
 .../node_modules/bluebird/js/main/props.js    |    79 -
 .../node_modules/bluebird/js/main/queue.js    |    90 -
 .../npm/node_modules/bluebird/js/main/race.js |    47 -
 .../node_modules/bluebird/js/main/reduce.js   |   148 -
 .../node_modules/bluebird/js/main/schedule.js |    35 -
 .../node_modules/bluebird/js/main/settle.js   |    40 -
 .../npm/node_modules/bluebird/js/main/some.js |   125 -
 .../js/main/synchronous_inspection.js         |    94 -
 .../bluebird/js/main/thenables.js             |    84 -
 .../node_modules/bluebird/js/main/timers.js   |    58 -
 .../node_modules/bluebird/js/main/using.js    |   213 -
 .../npm/node_modules/bluebird/js/main/util.js |   321 -
 deps/npm/node_modules/bluebird/package.json   |   126 -
 deps/npm/node_modules/chalk/package.json      |   130 -
 deps/npm/node_modules/chownr/package.json     |    89 +-
 deps/npm/node_modules/clone/package.json      |   149 -
 deps/npm/node_modules/clone/test.js           |   289 -
 .../node_modules/graceful-fs/package.json     |   110 +-
 deps/npm/node_modules/cmd-shim/package.json   |    78 +-
 .../node_modules/wcwidth}/.npmignore          |     0
 .../node_modules}/wcwidth/LICENSE             |     0
 .../node_modules}/wcwidth/Readme.md           |     0
 .../node_modules}/wcwidth/combining.js        |     0
 .../node_modules}/wcwidth/docs/index.md       |     0
 .../node_modules}/wcwidth/index.js            |     0
 .../wcwidth/node_modules/defaults}/.npmignore |     0
 .../wcwidth/node_modules}/defaults/LICENSE    |     0
 .../wcwidth/node_modules}/defaults/README.md  |     0
 .../wcwidth/node_modules}/defaults/index.js   |     0
 .../defaults/node_modules}/clone/.npmignore   |     0
 .../defaults/node_modules}/clone/.travis.yml  |     2 -
 .../defaults/node_modules}/clone/LICENSE      |     2 +-
 .../defaults/node_modules}/clone/README.md    |    10 +-
 .../defaults/node_modules}/clone/clone.js     |    86 +-
 .../defaults/node_modules/clone/package.json  |   118 +
 .../node_modules/clone/test-apart-ctx.html    |    22 +
 .../defaults/node_modules/clone/test.html     |   148 +
 .../defaults/node_modules/clone/test.js       |   372 +
 .../node_modules/defaults/package.json        |    54 +
 .../wcwidth/node_modules}/defaults/test.js    |     0
 .../node_modules}/wcwidth/package.json        |    83 +-
 .../node_modules}/wcwidth/test/index.js       |     0
 deps/npm/node_modules/columnify/package.json  |   110 +-
 deps/npm/node_modules/commander/package.json  |    98 -
 .../node_modules/readable-stream/package.json |    98 -
 .../node_modules/concat-stream/package.json   |   111 -
 .../node_modules/proto-list}/LICENSE          |     0
 .../node_modules}/proto-list/README.md        |     0
 .../node_modules/proto-list/package.json      |    32 +
 .../node_modules}/proto-list/proto-list.js    |     0
 .../node_modules}/proto-list/test/basic.js    |     0
 .../node_modules/config-chain/package.json    |    96 +-
 .../node_modules/core-util-is/package.json    |    81 -
 deps/npm/node_modules/ctype/package.json      |    64 -
 deps/npm/node_modules/debug/package.json      |    96 -
 deps/npm/node_modules/debuglog/package.json   |    75 +-
 deps/npm/node_modules/defaults/package.json   |    77 -
 .../node_modules}/asap/CHANGES.md             |     0
 .../node_modules}/asap/LICENSE.md             |     0
 .../{ => dezalgo/node_modules}/asap/README.md |     0
 .../{ => dezalgo/node_modules}/asap/asap.js   |     0
 .../node_modules}/asap/browser-asap.js        |     0
 .../node_modules}/asap/browser-raw.js         |     0
 .../dezalgo/node_modules/asap/package.json    |    64 +
 .../{ => dezalgo/node_modules}/asap/raw.js    |     0
 deps/npm/node_modules/dezalgo/package.json    |   113 +-
 deps/npm/node_modules/editor/package.json     |    99 +-
 .../escape-string-regexp/package.json         |    94 -
 .../node_modules/forever-agent/package.json   |    78 -
 deps/npm/node_modules/fs-vacuum/package.json  |    91 +-
 .../fs-write-stream-atomic/package.json       |    87 +-
 .../node_modules}/fstream-ignore/.npmignore   |     0
 .../node_modules}/fstream-ignore/LICENSE      |     0
 .../node_modules}/fstream-ignore/README.md    |     0
 .../fstream-ignore/example/basic.js           |     0
 .../node_modules}/fstream-ignore/ignore.js    |     0
 .../node_modules/minimatch}/LICENSE           |     0
 .../node_modules}/minimatch/README.md         |     0
 .../node_modules}/minimatch/browser.js        |     0
 .../node_modules}/minimatch/minimatch.js      |     0
 .../node_modules}/brace-expansion/.npmignore  |     0
 .../node_modules}/brace-expansion/README.md   |     0
 .../node_modules}/brace-expansion/example.js  |     0
 .../node_modules}/brace-expansion/index.js    |     0
 .../node_modules}/balanced-match/.npmignore   |     0
 .../node_modules}/balanced-match/.travis.yml  |     0
 .../node_modules}/balanced-match/Makefile     |     0
 .../node_modules}/balanced-match/README.md    |     0
 .../node_modules}/balanced-match/example.js   |     0
 .../node_modules}/balanced-match/index.js     |     0
 .../node_modules/balanced-match/package.json  |    56 +
 .../balanced-match/test/balanced.js           |     0
 .../node_modules}/concat-map/.travis.yml      |     0
 .../node_modules}/concat-map/LICENSE          |     0
 .../node_modules}/concat-map/README.markdown  |     0
 .../node_modules}/concat-map/example/map.js   |     0
 .../node_modules}/concat-map/index.js         |     0
 .../node_modules}/concat-map/package.json     |   138 +-
 .../node_modules}/concat-map/test/map.js      |     0
 .../brace-expansion/package.json              |   129 +-
 .../node_modules/minimatch/package.json       |    46 +
 .../node_modules}/fstream-ignore/package.json |    87 +-
 .../node_modules}/fstream-ignore/test/.ignore |     0
 .../fstream-ignore/test/.npmignore            |     0
 .../fstream-ignore/test/00-setup.js           |     0
 .../fstream-ignore/test/basic.js              |     0
 .../fstream-ignore/test/common.js             |     0
 .../fstream-ignore/test/ignore-most.js        |     0
 .../fstream-ignore/test/nested-ignores.js     |     0
 .../fstream-ignore/test/read-file-order.js    |     0
 .../fstream-ignore/test/unignore-child.js     |     0
 .../fstream-ignore/test/zz-cleanup.js         |     0
 .../npm/node_modules/fstream-npm/package.json |    89 +-
 deps/npm/node_modules/fstream/package.json    |    92 +-
 .../generate-function/package.json            |    77 -
 .../generate-object-property/package.json     |    74 -
 .../node_modules/minimatch}/LICENSE           |     0
 .../glob/node_modules/minimatch/README.md     |   216 +
 .../glob/node_modules/minimatch/minimatch.js  |   912 ++
 .../node_modules/brace-expansion/.npmignore   |     3 +
 .../node_modules/brace-expansion/README.md    |   122 +
 .../node_modules/brace-expansion/example.js   |     7 +
 .../node_modules/brace-expansion/index.js     |   190 +
 .../node_modules/balanced-match}/.npmignore   |     0
 .../node_modules/balanced-match}/.travis.yml  |     0
 .../node_modules/balanced-match/Makefile      |     5 +
 .../node_modules/balanced-match/README.md     |    80 +
 .../node_modules/balanced-match/example.js    |     4 +
 .../node_modules/balanced-match/index.js      |    38 +
 .../node_modules/balanced-match/package.json  |    56 +
 .../balanced-match/test/balanced.js           |    56 +
 .../node_modules/concat-map}/.travis.yml      |     0
 .../node_modules/concat-map}/LICENSE          |     0
 .../node_modules/concat-map/README.markdown   |    62 +
 .../node_modules/concat-map/example/map.js    |     6 +
 .../node_modules/concat-map/index.js          |    13 +
 .../node_modules/concat-map/package.json      |    82 +
 .../node_modules/concat-map/test/map.js       |    39 +
 .../node_modules/brace-expansion/package.json |    75 +
 .../glob/node_modules/minimatch/package.json  |    60 +
 .../node_modules}/path-is-absolute/index.js   |     0
 .../node_modules/path-is-absolute}/license    |     0
 .../path-is-absolute/package.json             |    53 +
 .../node_modules}/path-is-absolute/readme.md  |     0
 deps/npm/node_modules/glob/package.json       |   113 +-
 .../npm/node_modules/graceful-fs/package.json |   119 +-
 .../graceful-readlink/package.json            |    73 -
 .../har-validator/bin/har-validator           |    45 -
 deps/npm/node_modules/has-ansi/package.json   |   108 -
 deps/npm/node_modules/has-unicode/index.js    |     1 -
 .../npm/node_modules/has-unicode/package.json |    87 +-
 deps/npm/node_modules/hoek/package.json       |    87 -
 .../node_modules/hosted-git-info/package.json |    93 +-
 deps/npm/node_modules/iferr/package.json      |    75 +-
 deps/npm/node_modules/inflight/package.json   |    95 +-
 deps/npm/node_modules/inherits/package.json   |    92 +-
 deps/npm/node_modules/ini/package.json        |    87 +-
 .../node_modules}/promzard/.npmignore         |     0
 .../node_modules}/promzard/LICENSE            |     0
 .../node_modules}/promzard/README.md          |     0
 .../node_modules}/promzard/example/buffer.js  |     0
 .../node_modules}/promzard/example/index.js   |     0
 .../promzard/example/npm-init/README.md       |     0
 .../promzard/example/npm-init/init-input.js   |     0
 .../promzard/example/npm-init/init.js         |     0
 .../promzard/example/npm-init/package.json    |     0
 .../promzard/example/substack-input.js        |     0
 .../node_modules}/promzard/package.json       |    79 +-
 .../node_modules}/promzard/promzard.js        |     0
 .../node_modules}/promzard/test/basic.js      |     0
 .../node_modules}/promzard/test/buffer.js     |     0
 .../node_modules}/promzard/test/exports.input |     0
 .../node_modules}/promzard/test/exports.js    |     0
 .../node_modules}/promzard/test/fn.input      |     0
 .../node_modules}/promzard/test/fn.js         |     0
 .../node_modules}/promzard/test/simple.input  |     0
 .../node_modules}/promzard/test/simple.js     |     0
 .../promzard/test/validate.input              |     0
 .../node_modules}/promzard/test/validate.js   |     0
 .../init-package-json/package.json            |   101 +-
 .../is-my-json-valid/package.json             |    92 -
 .../npm/node_modules/is-property/package.json |    82 -
 deps/npm/node_modules/isarray/package.json    |    75 -
 deps/npm/node_modules/isstream/package.json   |    83 -
 .../json-stringify-safe/package.json          |    92 -
 .../npm/node_modules/jsonpointer/package.json |    93 -
 deps/npm/node_modules/lockfile/package.json   |    97 +-
 .../lodash._basecopy/package.json             |   113 -
 .../lodash._baseindexof/package.json          |    92 +-
 .../lodash._baseuniq/package.json             |    87 +-
 .../lodash._bindcallback/package.json         |    92 +-
 .../lodash._cacheindexof/package.json         |    90 +-
 .../lodash._createcache/package.json          |    95 +-
 .../lodash._getnative/package.json            |    87 +-
 .../node_modules/lodash._baseclone}/LICENSE   |     0
 .../node_modules}/lodash._baseclone/README.md |     0
 .../node_modules}/lodash._baseclone/index.js  |     0
 .../lodash._arraycopy/LICENSE.txt             |     0
 .../node_modules}/lodash._arraycopy/README.md |     0
 .../node_modules}/lodash._arraycopy/index.js  |     0
 .../lodash._arraycopy/package.json            |    75 +-
 .../lodash._arrayeach/LICENSE.txt             |     0
 .../node_modules}/lodash._arrayeach/README.md |     0
 .../node_modules}/lodash._arrayeach/index.js  |     0
 .../lodash._arrayeach/package.json            |    75 +-
 .../lodash._baseassign/LICENSE.txt            |     0
 .../lodash._baseassign/README.md              |     0
 .../node_modules}/lodash._baseassign/index.js |     0
 .../lodash._basecopy/LICENSE.txt              |     0
 .../node_modules}/lodash._basecopy/README.md  |     0
 .../node_modules}/lodash._basecopy/index.js   |     0
 .../lodash._basecopy/package.json             |    56 +
 .../lodash._baseassign/package.json           |    96 +-
 .../node_modules}/lodash._basefor/LICENSE.txt |     0
 .../node_modules}/lodash._basefor/README.md   |     0
 .../node_modules}/lodash._basefor/index.js    |     0
 .../lodash._basefor/package.json              |    89 +-
 .../lodash._baseclone/package.json            |   100 +-
 .../lodash.clonedeep/package.json             |   107 +-
 .../lodash.isarguments/package.json           |   100 +-
 .../node_modules/lodash.isarray/package.json  |   104 +-
 .../npm/node_modules/lodash.keys/package.json |   111 +-
 .../lodash.restparam/package.json             |   102 +-
 .../node_modules/lodash._baseflatten}/LICENSE |     0
 .../lodash._baseflatten/README.md             |     0
 .../lodash._baseflatten/index.js              |     0
 .../lodash._baseflatten/package.json          |    96 +-
 .../node_modules/lodash.union/package.json    |    95 +-
 .../lodash._basecallback}/LICENSE             |     0
 .../lodash._basecallback/README.md            |     0
 .../lodash._basecallback/index.js             |     0
 .../lodash._baseisequal/LICENSE.txt           |     0
 .../lodash._baseisequal/README.md             |     0
 .../lodash._baseisequal/index.js              |     0
 .../lodash.istypedarray}/LICENSE.txt          |     0
 .../lodash.istypedarray/README.md             |     0
 .../lodash.istypedarray/index.js              |     0
 .../lodash.istypedarray/package.json          |    99 +-
 .../lodash._baseisequal/package.json          |    98 +-
 .../node_modules/lodash.pairs}/LICENSE.txt    |     0
 .../node_modules}/lodash.pairs/README.md      |     0
 .../node_modules}/lodash.pairs/index.js       |     0
 .../node_modules}/lodash.pairs/package.json   |   104 +-
 .../lodash._basecallback/package.json         |   100 +-
 .../lodash._isiterateecall}/LICENSE.txt       |     0
 .../lodash._isiterateecall/README.md          |     0
 .../lodash._isiterateecall/index.js           |     0
 .../lodash._isiterateecall/package.json       |    89 +-
 .../npm/node_modules/lodash.uniq/package.json |    96 +-
 .../lodash._basedifference}/LICENSE           |     0
 .../lodash._basedifference/README.md          |     0
 .../lodash._basedifference/index.js           |     0
 .../lodash._basedifference/package.json       |    98 +-
 .../node_modules/lodash.without/package.json  |    95 +-
 deps/npm/node_modules/lru-cache/package.json  |    82 -
 deps/npm/node_modules/mime-types/package.json |   109 -
 deps/npm/node_modules/minimatch/package.json  |    87 -
 deps/npm/node_modules/minimist/package.json   |    91 -
 .../node_modules}/minimist/.travis.yml        |     0
 .../mkdirp/node_modules/minimist/LICENSE      |    18 +
 .../node_modules}/minimist/example/parse.js   |     0
 .../node_modules}/minimist/index.js           |     0
 .../mkdirp/node_modules/minimist/package.json |    52 +
 .../node_modules}/minimist/readme.markdown    |     0
 .../node_modules}/minimist/test/dash.js       |     0
 .../minimist/test/default_bool.js             |     0
 .../node_modules}/minimist/test/dotted.js     |     0
 .../node_modules}/minimist/test/long.js       |     0
 .../node_modules}/minimist/test/parse.js      |     0
 .../minimist/test/parse_modified.js           |     0
 .../node_modules}/minimist/test/short.js      |     0
 .../node_modules}/minimist/test/whitespace.js |     0
 deps/npm/node_modules/mkdirp/package.json     |    98 +-
 deps/npm/node_modules/ms/package.json         |    72 -
 .../npm/node_modules/mute-stream/package.json |    80 -
 .../node_modules/brace-expansion/.npmignore   |     3 +
 .../node_modules/brace-expansion/README.md    |   122 +
 .../node_modules/brace-expansion/example.js   |     7 +
 .../node_modules/brace-expansion/index.js     |   190 +
 .../node_modules/balanced-match/.npmignore    |     2 +
 .../node_modules/balanced-match}/.travis.yml  |     0
 .../node_modules/balanced-match/Makefile      |     5 +
 .../node_modules/balanced-match/README.md     |    80 +
 .../node_modules/balanced-match/example.js    |     4 +
 .../node_modules/balanced-match/index.js      |    38 +
 .../node_modules/balanced-match/package.json  |    56 +
 .../balanced-match/test/balanced.js           |    56 +
 .../node_modules/concat-map/.travis.yml       |     4 +
 .../node_modules/concat-map/LICENSE           |    18 +
 .../node_modules/concat-map/README.markdown   |    62 +
 .../node_modules/concat-map/example/map.js    |     6 +
 .../node_modules/concat-map/index.js          |    13 +
 .../node_modules/concat-map/package.json      |    83 +
 .../node_modules/concat-map/test/map.js       |    39 +
 .../node_modules/brace-expansion/package.json |    75 +
 .../glob/node_modules/minimatch/package.json  |    98 +-
 .../node-gyp/node_modules/glob/package.json   |   104 +-
 .../node_modules}/lru-cache/.npmignore        |     0
 .../node_modules}/lru-cache/.travis.yml       |     0
 .../node_modules}/lru-cache/CONTRIBUTORS      |     0
 .../minimatch/node_modules/lru-cache}/LICENSE |     0
 .../node_modules}/lru-cache/README.md         |    14 +-
 .../node_modules}/lru-cache/lib/lru-cache.js  |    52 +-
 .../node_modules/lru-cache/package.json       |    37 +
 .../node_modules}/lru-cache/test/basic.js     |    51 +-
 .../node_modules}/lru-cache/test/foreach.js   |     0
 .../lru-cache/test/memory-leak.js             |     0
 .../node_modules/lru-cache/test/serialize.js  |   215 +
 .../minimatch/node_modules/sigmund}/LICENSE   |     0
 .../minimatch/node_modules}/sigmund/README.md |     0
 .../minimatch/node_modules}/sigmund/bench.js  |     0
 .../node_modules/sigmund/package.json         |    44 +
 .../node_modules}/sigmund/sigmund.js          |     0
 .../node_modules}/sigmund/test/basic.js       |     0
 .../node_modules/minimatch/package.json       |    89 +-
 .../node_modules}/path-array/.npmignore       |     0
 .../node_modules}/path-array/.travis.yml      |     0
 .../node_modules}/path-array/History.md       |     0
 .../node_modules}/path-array/README.md        |     0
 .../node_modules}/path-array/index.js         |     0
 .../node_modules/array-index}/.npmignore      |     0
 .../node_modules}/array-index/.travis.yml     |     0
 .../node_modules}/array-index/History.md      |     0
 .../node_modules}/array-index/Makefile        |     0
 .../node_modules}/array-index/README.md       |     0
 .../node_modules}/array-index/component.json  |     0
 .../node_modules}/array-index/index.js        |     0
 .../node_modules}/debug/.npmignore            |     0
 .../node_modules}/debug/History.md            |     0
 .../array-index/node_modules}/debug/Makefile  |     0
 .../array-index/node_modules}/debug/Readme.md |     0
 .../node_modules}/debug/bower.json            |     0
 .../node_modules}/debug/browser.js            |     0
 .../node_modules}/debug/component.json        |     0
 .../array-index/node_modules}/debug/debug.js  |     0
 .../array-index/node_modules}/debug/node.js   |     0
 .../debug/node_modules}/ms/.npmignore         |     0
 .../debug/node_modules}/ms/History.md         |     0
 .../debug/node_modules}/ms/LICENSE            |     0
 .../debug/node_modules}/ms/README.md          |     0
 .../debug/node_modules}/ms/index.js           |     0
 .../debug/node_modules/ms/package.json        |    30 +
 .../node_modules/debug/package.json           |    51 +
 .../node_modules}/array-index/package.json    |    94 +-
 .../node_modules}/array-index/test.js         |     0
 .../node_modules}/path-array/package.json     |    83 +-
 .../node_modules}/path-array/test/test.js     |     0
 .../tar/node_modules}/block-stream/LICENCE    |     0
 .../tar/node_modules/block-stream}/LICENSE    |     0
 .../tar/node_modules}/block-stream/README.md  |     0
 .../block-stream/bench/block-stream-pause.js  |     0
 .../block-stream/bench/block-stream.js        |     0
 .../block-stream/bench/dropper-pause.js       |     0
 .../block-stream/bench/dropper.js             |     0
 .../block-stream/block-stream.js              |     0
 .../node_modules}/block-stream/package.json   |    88 +-
 .../node_modules}/block-stream/test/basic.js  |     0
 .../block-stream/test/nopad-thorough.js       |     0
 .../node_modules}/block-stream/test/nopad.js  |     0
 .../block-stream/test/pause-resume.js         |     0
 .../block-stream/test/thorough.js             |     0
 .../block-stream/test/two-stream.js           |     4 +-
 .../node-gyp/node_modules/tar/package.json    |    87 +-
 deps/npm/node_modules/node-gyp/package.json   |   119 +-
 deps/npm/node_modules/node-uuid/package.json  |    90 -
 deps/npm/node_modules/nopt/package.json       |    88 +-
 .../normalize-git-url/package.json            |    96 +-
 .../node_modules}/is-builtin-module/index.js  |     0
 .../node_modules/is-builtin-module}/license   |     0
 .../builtin-modules/builtin-modules.json      |     0
 .../node_modules}/builtin-modules/index.js    |     0
 .../node_modules/builtin-modules}/license     |     0
 .../builtin-modules/package.json              |   115 +-
 .../node_modules}/builtin-modules/readme.md   |     0
 .../node_modules}/builtin-modules/static.js   |     0
 .../is-builtin-module/package.json            |   118 +-
 .../node_modules}/is-builtin-module/readme.md |     0
 .../normalize-package-data/package.json       |   102 +-
 .../npm-cache-filename/package.json           |    78 +-
 .../npm-install-checks/package.json           |    94 +-
 .../node_modules/npm-package-arg/package.json |    96 +-
 .../node_modules}/concat-stream/LICENSE       |     0
 .../node_modules}/concat-stream/index.js      |     0
 .../node_modules/readable-stream/.npmignore   |     0
 .../node_modules/readable-stream/.travis.yml  |     0
 .../node_modules/readable-stream/.zuul.yml    |     0
 .../node_modules/readable-stream/LICENSE      |     0
 .../node_modules/readable-stream/README.md    |     0
 .../readable-stream/doc/stream.markdown       |     0
 .../doc/wg-meetings/2015-01-30.md             |     0
 .../node_modules/readable-stream/duplex.js    |     0
 .../readable-stream/lib/_stream_duplex.js     |     0
 .../lib/_stream_passthrough.js                |     0
 .../readable-stream/lib/_stream_readable.js   |     0
 .../readable-stream/lib/_stream_transform.js  |     0
 .../readable-stream/lib/_stream_writable.js   |     0
 .../node_modules}/core-util-is/README.md      |     0
 .../node_modules}/core-util-is/float.patch    |     0
 .../node_modules}/core-util-is/lib/util.js    |     0
 .../node_modules/core-util-is/package.json    |    37 +
 .../node_modules}/core-util-is/util.js        |     0
 .../node_modules}/isarray/README.md           |     0
 .../node_modules}/isarray/build/build.js      |     0
 .../node_modules}/isarray/component.json      |     0
 .../node_modules}/isarray/index.js            |     0
 .../node_modules/isarray/package.json         |    38 +
 .../process-nextick-args/.travis.yml          |     0
 .../process-nextick-args/index.js             |     0
 .../process-nextick-args/license.md           |     0
 .../process-nextick-args/package.json         |    28 +
 .../process-nextick-args/readme.md            |     0
 .../process-nextick-args/test.js              |     0
 .../node_modules}/string_decoder/.npmignore   |     0
 .../node_modules}/string_decoder/LICENSE      |     0
 .../node_modules}/string_decoder/README.md    |     0
 .../node_modules}/string_decoder/index.js     |     0
 .../node_modules/string_decoder/package.json  |    34 +
 .../node_modules}/util-deprecate/History.md   |     5 +
 .../node_modules}/util-deprecate/LICENSE      |     0
 .../node_modules}/util-deprecate/README.md    |     0
 .../node_modules}/util-deprecate/browser.js   |     7 +-
 .../node_modules}/util-deprecate/node.js      |     0
 .../node_modules/util-deprecate/package.json  |    54 +
 .../node_modules/readable-stream/package.json |    46 +
 .../readable-stream/passthrough.js            |     0
 .../node_modules/readable-stream/readable.js  |     0
 .../node_modules/readable-stream/transform.js |     0
 .../node_modules/readable-stream/writable.js  |     0
 .../node_modules/typedarray/.travis.yml       |     4 +
 .../node_modules}/typedarray/LICENSE          |     0
 .../typedarray/example/tarray.js              |     0
 .../node_modules}/typedarray/index.js         |     0
 .../node_modules/typedarray/package.json      |    64 +
 .../node_modules}/typedarray/readme.markdown  |     0
 .../typedarray/test/server/undef_globals.js   |     0
 .../node_modules}/typedarray/test/tarray.js   |     0
 .../node_modules/concat-stream/package.json   |    64 +
 .../node_modules}/concat-stream/readme.md     |     0
 .../npm-registry-client/package.json          |    88 +-
 .../npm-user-validate/package.json            |    87 +-
 .../node_modules/ansi}/.npmignore             |     0
 .../{ => npmlog/node_modules}/ansi/History.md |     0
 .../{ => npmlog/node_modules}/ansi/README.md  |     0
 .../node_modules}/ansi/examples/beep/index.js |     0
 .../ansi/examples/clear/index.js              |     0
 .../ansi/examples/cursorPosition.js           |     0
 .../ansi/examples/progress/index.js           |     0
 .../node_modules}/ansi/lib/ansi.js            |     0
 .../node_modules}/ansi/lib/newlines.js        |     0
 .../node_modules}/ansi/package.json           |    90 +-
 .../node_modules}/are-we-there-yet/.npmignore |     0
 .../node_modules}/are-we-there-yet/README.md  |     0
 .../node_modules}/are-we-there-yet/index.js   |     0
 .../node_modules}/delegates/.npmignore        |     0
 .../node_modules}/delegates/History.md        |     0
 .../node_modules}/delegates/Makefile          |     0
 .../node_modules}/delegates/Readme.md         |     0
 .../node_modules}/delegates/index.js          |     0
 .../node_modules}/delegates/package.json      |    75 +-
 .../node_modules}/delegates/test/index.js     |     0
 .../node_modules/readable-stream/.npmignore   |     0
 .../node_modules/readable-stream/LICENSE      |     0
 .../node_modules}/readable-stream/README.md   |     1 -
 .../node_modules/readable-stream/duplex.js    |     0
 .../node_modules}/readable-stream/float.patch |     0
 .../readable-stream/lib/_stream_duplex.js     |     0
 .../lib/_stream_passthrough.js                |     0
 .../readable-stream/lib/_stream_readable.js   |     0
 .../readable-stream/lib/_stream_transform.js  |     0
 .../readable-stream/lib/_stream_writable.js   |     0
 .../node_modules/core-util-is/README.md       |     3 +
 .../node_modules/core-util-is/float.patch     |   604 +
 .../node_modules/core-util-is/lib/util.js     |   107 +
 .../node_modules/core-util-is/package.json    |    37 +
 .../node_modules/core-util-is/util.js         |   106 +
 .../node_modules/isarray/README.md            |    54 +
 .../node_modules/isarray/build/build.js       |   208 +
 .../node_modules/isarray/component.json       |    19 +
 .../node_modules/isarray/index.js             |     3 +
 .../node_modules/isarray/package.json         |    38 +
 .../node_modules/string_decoder/.npmignore    |     2 +
 .../node_modules/string_decoder/LICENSE       |    20 +
 .../node_modules/string_decoder/README.md     |     7 +
 .../node_modules/string_decoder/index.js      |   221 +
 .../node_modules/string_decoder/package.json  |    34 +
 .../node_modules/readable-stream/package.json |    46 +
 .../readable-stream/passthrough.js            |     0
 .../node_modules}/readable-stream/readable.js |     0
 .../node_modules/readable-stream/transform.js |     0
 .../node_modules/readable-stream/writable.js  |     0
 .../are-we-there-yet/package.json             |    79 +-
 .../are-we-there-yet/test/tracker.js          |     0
 .../are-we-there-yet/test/trackergroup.js     |     0
 .../are-we-there-yet/test/trackerstream.js    |     0
 .../node_modules}/gauge/.npmignore            |     0
 .../{ => npmlog/node_modules}/gauge/LICENSE   |     0
 .../{ => npmlog/node_modules}/gauge/README.md |     0
 .../node_modules}/gauge/example.png           |   Bin
 .../lodash._basetostring/LICENSE              |     0
 .../lodash._basetostring/README.md            |     0
 .../lodash._basetostring/index.js             |     0
 .../lodash._basetostring/package.json         |    90 +-
 .../lodash._createpadding/LICENSE             |     0
 .../lodash._createpadding/README.md           |     0
 .../lodash._createpadding/index.js            |     0
 .../node_modules/lodash.repeat}/LICENSE       |     0
 .../node_modules}/lodash.repeat/README.md     |     0
 .../node_modules}/lodash.repeat/index.js      |     0
 .../node_modules}/lodash.repeat/package.json  |    96 +-
 .../lodash._createpadding/package.json        |    88 +-
 .../gauge/node_modules/lodash.pad}/LICENSE    |     0
 .../gauge/node_modules}/lodash.pad/README.md  |     0
 .../gauge/node_modules}/lodash.pad/index.js   |     0
 .../node_modules}/lodash.pad/package.json     |    96 +-
 .../node_modules/lodash.padleft}/LICENSE.txt  |     0
 .../node_modules}/lodash.padleft/README.md    |     0
 .../node_modules}/lodash.padleft/index.js     |     0
 .../node_modules}/lodash.padleft/package.json |    96 +-
 .../node_modules/lodash.padright}/LICENSE.txt |     0
 .../node_modules}/lodash.padright/README.md   |     0
 .../node_modules}/lodash.padright/index.js    |     0
 .../lodash.padright/package.json              |    96 +-
 .../node_modules}/gauge/package.json          |    82 +-
 .../node_modules}/gauge/progress-bar.js       |     0
 .../node_modules}/gauge/test/progress-bar.js  |     0
 deps/npm/node_modules/npmlog/package.json     |    84 +-
 deps/npm/node_modules/once/package.json       |    98 +-
 deps/npm/node_modules/opener/package.json     |    90 +-
 deps/npm/node_modules/os-homedir/package.json |    94 -
 deps/npm/node_modules/os-tmpdir/package.json  |    94 -
 .../node_modules}/os-homedir/index.js         |     0
 .../node_modules/os-homedir}/license          |     0
 .../node_modules/os-homedir/package.json      |    53 +
 .../node_modules}/os-homedir/readme.md        |     0
 .../node_modules}/os-tmpdir/index.js          |     0
 .../node_modules/os-tmpdir}/license           |     0
 .../osenv/node_modules/os-tmpdir/package.json |    53 +
 .../node_modules}/os-tmpdir/readme.md         |     0
 deps/npm/node_modules/osenv/package.json      |   108 +-
 .../path-is-absolute/package.json             |    95 -
 .../node_modules/path-is-inside/package.json  |    90 +-
 .../process-nextick-args/package.json         |    73 -
 deps/npm/node_modules/proto-list/package.json |    73 -
 deps/npm/node_modules/qs/package.json         |    83 -
 .../node_modules/read-cmd-shim/package.json   |    88 +-
 .../node_modules}/util-extend/README.md       |     0
 .../node_modules}/util-extend/extend.js       |     0
 .../node_modules}/util-extend/package.json    |    71 +-
 .../node_modules}/util-extend/test.js         |     0
 .../node_modules/read-installed/package.json  |    96 +-
 .../json-parse-helpfulerror/.editorconfig     |     0
 .../json-parse-helpfulerror/.npmignore        |     0
 .../json-parse-helpfulerror/LICENSE           |     0
 .../json-parse-helpfulerror/README.md         |     0
 .../json-parse-helpfulerror/index.js          |     0
 .../node_modules}/jju/.npmignore              |     0
 .../node_modules}/jju/README.md               |     0
 .../node_modules}/jju/index.js                |     0
 .../node_modules}/jju/lib/analyze.js          |     0
 .../node_modules}/jju/lib/document.js         |     0
 .../node_modules}/jju/lib/parse.js            |     0
 .../node_modules}/jju/lib/stringify.js        |     0
 .../node_modules}/jju/lib/unicode.js          |     0
 .../node_modules}/jju/lib/utils.js            |     0
 .../node_modules}/jju/package.json            |    97 +-
 .../node_modules}/jju/package.yaml            |     0
 .../json-parse-helpfulerror/package.json      |    97 +-
 .../json-parse-helpfulerror/test/test.js      |     0
 .../read-package-json/package.json            |    94 +-
 .../read-package-tree/package.json            |    90 +-
 .../node_modules/mute-stream}/LICENSE         |     0
 .../node_modules}/mute-stream/README.md       |     0
 .../node_modules}/mute-stream/mute.js         |     0
 .../node_modules/mute-stream/package.json     |    40 +
 .../node_modules}/mute-stream/test/basic.js   |     0
 deps/npm/node_modules/read/package.json       |    89 +-
 .../node_modules/readable-stream/package.json |    94 -
 .../readdir-scoped-modules/package.json       |    93 +-
 .../realize-package-specifier/package.json    |    82 +-
 deps/npm/node_modules/request/CHANGELOG.md    |    15 +
 deps/npm/node_modules/request/lib/auth.js     |    23 +-
 deps/npm/node_modules/request/lib/cookies.js  |     4 +-
 .../node_modules}/aws-sign2/LICENSE           |     0
 .../node_modules}/aws-sign2/README.md         |     0
 .../node_modules}/aws-sign2/index.js          |    16 +-
 .../node_modules/aws-sign2/package.json       |    49 +
 .../{ => request/node_modules}/bl/.npmignore  |     0
 .../{ => request/node_modules}/bl/.travis.yml |     0
 .../{ => request/node_modules}/bl/LICENSE.md  |     0
 .../{ => request/node_modules}/bl/README.md   |     0
 .../{ => request/node_modules}/bl/bl.js       |     0
 .../node_modules}/readable-stream/.npmignore  |     0
 .../node_modules/readable-stream/.travis.yml  |     0
 .../node_modules/readable-stream/.zuul.yml    |     0
 .../bl/node_modules}/readable-stream/LICENSE  |     0
 .../node_modules/readable-stream/README.md    |     0
 .../readable-stream/doc/stream.markdown       |     0
 .../doc/wg-meetings/2015-01-30.md             |     0
 .../node_modules}/readable-stream/duplex.js   |     0
 .../readable-stream/lib/_stream_duplex.js     |     0
 .../lib/_stream_passthrough.js                |     0
 .../readable-stream/lib/_stream_readable.js   |     0
 .../readable-stream/lib/_stream_transform.js  |     0
 .../readable-stream/lib/_stream_writable.js   |     0
 .../node_modules/core-util-is/README.md       |     3 +
 .../node_modules/core-util-is/float.patch     |   604 +
 .../node_modules/core-util-is/lib/util.js     |   107 +
 .../node_modules/core-util-is/package.json    |    37 +
 .../node_modules/core-util-is/util.js         |   106 +
 .../node_modules/isarray/README.md            |    54 +
 .../node_modules/isarray/build/build.js       |   208 +
 .../node_modules/isarray/component.json       |    19 +
 .../node_modules/isarray/index.js             |     3 +
 .../node_modules/isarray/package.json         |    38 +
 .../process-nextick-args/.travis.yml          |     7 +
 .../process-nextick-args/index.js             |    13 +
 .../process-nextick-args/license.md           |    19 +
 .../process-nextick-args/package.json         |    28 +
 .../process-nextick-args/readme.md            |    18 +
 .../node_modules/process-nextick-args/test.js |    24 +
 .../node_modules/string_decoder/.npmignore    |     2 +
 .../node_modules/string_decoder/LICENSE       |    20 +
 .../node_modules/string_decoder/README.md     |     7 +
 .../node_modules/string_decoder/index.js      |   221 +
 .../node_modules/string_decoder/package.json  |    34 +
 .../node_modules/util-deprecate/History.md    |    16 +
 .../node_modules/util-deprecate/LICENSE       |    24 +
 .../node_modules/util-deprecate/README.md     |    53 +
 .../node_modules/util-deprecate/browser.js    |    67 +
 .../node_modules/util-deprecate/node.js       |     6 +
 .../node_modules/util-deprecate/package.json  |    54 +
 .../node_modules/readable-stream/package.json |    46 +
 .../readable-stream/passthrough.js            |     0
 .../node_modules/readable-stream/readable.js  |     0
 .../readable-stream/transform.js              |     0
 .../node_modules}/readable-stream/writable.js |     0
 .../node_modules}/bl/package.json             |   112 +-
 .../node_modules}/bl/test/basic-test.js       |     0
 .../node_modules}/bl/test/sauce.js            |     0
 .../node_modules}/bl/test/test.js             |     0
 .../node_modules}/caseless/LICENSE            |     0
 .../node_modules}/caseless/README.md          |     0
 .../node_modules}/caseless/index.js           |     0
 .../node_modules}/caseless/package.json       |    88 +-
 .../node_modules}/caseless/test.js            |     0
 .../node_modules}/combined-stream/License     |     0
 .../node_modules}/combined-stream/Readme.md   |     0
 .../combined-stream/lib/combined_stream.js    |     0
 .../node_modules}/delayed-stream/.npmignore   |     0
 .../node_modules}/delayed-stream/License      |     0
 .../node_modules}/delayed-stream/Makefile     |     0
 .../node_modules}/delayed-stream/Readme.md    |     0
 .../delayed-stream/lib/delayed_stream.js      |     0
 .../node_modules}/delayed-stream/package.json |    89 +-
 .../combined-stream/package.json              |    88 +-
 .../node_modules}/extend/.jscs.json           |     0
 .../node_modules}/extend/.npmignore           |     0
 .../node_modules}/extend/.travis.yml          |     0
 .../node_modules}/extend/CHANGELOG.md         |     0
 .../{ => request/node_modules}/extend/LICENSE |     0
 .../node_modules}/extend/README.md            |     0
 .../node_modules}/extend/component.json       |     0
 .../node_modules}/extend/index.js             |     0
 .../node_modules}/extend/package.json         |   105 +-
 .../node_modules}/forever-agent/LICENSE       |     0
 .../node_modules}/forever-agent/README.md     |     0
 .../node_modules}/forever-agent/index.js      |     0
 .../node_modules/forever-agent/package.json   |    31 +
 .../node_modules}/form-data/License           |     0
 .../node_modules}/form-data/Readme.md         |     0
 .../node_modules}/form-data/lib/browser.js    |     0
 .../node_modules}/form-data/lib/form_data.js  |     0
 .../node_modules}/async/CHANGELOG.md          |     0
 .../form-data/node_modules}/async/LICENSE     |     0
 .../node_modules}/async/lib/async.js          |     0
 .../node_modules}/async/package.json          |   132 +-
 .../node_modules}/form-data/package.json      |    94 +-
 .../node_modules}/har-validator/LICENSE       |     0
 .../node_modules}/har-validator/README.md     |   326 +-
 .../har-validator/bin/har-validator           |    56 +
 .../node_modules/har-validator/lib/async.js   |    14 +
 .../node_modules}/har-validator/lib/error.js  |     0
 .../node_modules/har-validator/lib/index.js   |    22 +
 .../node_modules/har-validator/lib/runner.js} |    24 +-
 .../har-validator/lib/schemas/cache.json      |     0
 .../har-validator/lib/schemas/cacheEntry.json |     0
 .../har-validator/lib/schemas/content.json    |     0
 .../har-validator/lib/schemas/cookie.json     |     0
 .../har-validator/lib/schemas/creator.json    |     0
 .../har-validator/lib/schemas/entry.json      |     0
 .../har-validator/lib/schemas/har.json        |     0
 .../har-validator/lib/schemas/index.js        |     0
 .../har-validator/lib/schemas/log.json        |     0
 .../har-validator/lib/schemas/page.json       |     0
 .../lib/schemas/pageTimings.json              |     0
 .../har-validator/lib/schemas/postData.json   |     0
 .../har-validator/lib/schemas/record.json     |     0
 .../har-validator/lib/schemas/request.json    |     0
 .../har-validator/lib/schemas/response.json   |     0
 .../har-validator/lib/schemas/timings.json    |     0
 .../node_modules}/chalk/index.js              |     0
 .../har-validator/node_modules/chalk}/license |     0
 .../chalk/node_modules}/ansi-styles/index.js  |     0
 .../chalk/node_modules/ansi-styles}/license   |     0
 .../node_modules/ansi-styles/package.json     |    71 +
 .../chalk/node_modules}/ansi-styles/readme.md |     0
 .../escape-string-regexp/index.js             |     0
 .../escape-string-regexp}/license             |     0
 .../escape-string-regexp/package.json         |    61 +
 .../escape-string-regexp/readme.md            |     0
 .../chalk/node_modules}/has-ansi/index.js     |     0
 .../chalk/node_modules/has-ansi}/license      |     0
 .../chalk/node_modules/has-ansi/package.json  |    76 +
 .../chalk/node_modules}/has-ansi/readme.md    |     0
 .../node_modules}/supports-color/index.js     |     0
 .../node_modules}/supports-color/license      |     0
 .../node_modules/supports-color/package.json  |    70 +
 .../node_modules}/supports-color/readme.md    |     0
 .../node_modules/chalk/package.json           |    95 +
 .../node_modules}/chalk/readme.md             |     0
 .../node_modules}/commander/History.md        |     9 +-
 .../node_modules}/commander/LICENSE           |     0
 .../node_modules}/commander/Readme.md         |    17 +-
 .../node_modules}/commander/index.js          |    51 +-
 .../graceful-readlink/.npmignore              |     0
 .../graceful-readlink/.travis.yml             |     0
 .../node_modules}/graceful-readlink/LICENSE   |     0
 .../node_modules}/graceful-readlink/README.md |     0
 .../node_modules}/graceful-readlink/index.js  |     0
 .../graceful-readlink/package.json            |    31 +
 .../node_modules/commander/package.json       |    71 +
 .../node_modules}/is-my-json-valid/.npmignore |     0
 .../is-my-json-valid}/.travis.yml             |     0
 .../node_modules/is-my-json-valid}/LICENSE    |     0
 .../node_modules}/is-my-json-valid/README.md  |     0
 .../node_modules}/is-my-json-valid/example.js |     0
 .../node_modules}/is-my-json-valid/formats.js |     0
 .../node_modules}/is-my-json-valid/index.js   |     0
 .../generate-function}/.npmignore             |     0
 .../generate-function}/.travis.yml            |     0
 .../node_modules}/generate-function/README.md |     0
 .../generate-function/example.js              |     0
 .../node_modules}/generate-function/index.js  |     0
 .../generate-function/package.json            |    37 +
 .../node_modules}/generate-function/test.js   |     0
 .../generate-object-property}/.npmignore      |     0
 .../generate-object-property}/.travis.yml     |     0
 .../generate-object-property}/LICENSE         |     0
 .../generate-object-property/README.md        |     0
 .../generate-object-property/index.js         |     0
 .../node_modules}/is-property/.npmignore      |     0
 .../node_modules}/is-property/LICENSE         |     0
 .../node_modules}/is-property/README.md       |     0
 .../node_modules}/is-property/is-property.js  |     0
 .../node_modules/is-property/package.json     |    44 +
 .../generate-object-property/package.json     |    34 +
 .../generate-object-property/test.js          |     0
 .../node_modules}/jsonpointer/.travis.yml     |     0
 .../node_modules}/jsonpointer/README.md       |     0
 .../node_modules}/jsonpointer/jsonpointer.js  |     0
 .../node_modules/jsonpointer/package.json     |    64 +
 .../node_modules}/jsonpointer/test.js         |     0
 .../node_modules}/xtend/.npmignore            |     0
 .../node_modules}/xtend/LICENCE               |     0
 .../node_modules}/xtend/Makefile              |     0
 .../node_modules}/xtend/README.md             |     0
 .../node_modules}/xtend/immutable.js          |     0
 .../node_modules}/xtend/mutable.js            |     0
 .../node_modules/xtend/package.json           |    72 +
 .../node_modules}/xtend/test.js               |     0
 .../is-my-json-valid/package.json             |    42 +
 .../node_modules}/is-my-json-valid/require.js |     0
 .../is-my-json-valid/test/fixtures/cosmic.js  |     0
 .../json-schema-draft4/additionalItems.json   |     0
 .../additionalProperties.json                 |     0
 .../test/json-schema-draft4/allOf.json        |     0
 .../test/json-schema-draft4/anyOf.json        |     0
 .../test/json-schema-draft4/bignum.json       |     0
 .../test/json-schema-draft4/default.json      |     0
 .../test/json-schema-draft4/definitions.json  |     0
 .../test/json-schema-draft4/dependencies.json |     0
 .../test/json-schema-draft4/enum.json         |     0
 .../test/json-schema-draft4/format.json       |     0
 .../test/json-schema-draft4/items.json        |     0
 .../test/json-schema-draft4/maxItems.json     |     0
 .../test/json-schema-draft4/maxLength.json    |     0
 .../json-schema-draft4/maxProperties.json     |     0
 .../test/json-schema-draft4/maximum.json      |     0
 .../test/json-schema-draft4/minItems.json     |     0
 .../test/json-schema-draft4/minLength.json    |     0
 .../json-schema-draft4/minProperties.json     |     0
 .../test/json-schema-draft4/minimum.json      |     0
 .../test/json-schema-draft4/multipleOf.json   |     0
 .../test/json-schema-draft4/not.json          |     0
 .../json-schema-draft4/nullAndFormat.json     |     0
 .../json-schema-draft4/nullAndObject.json     |     0
 .../test/json-schema-draft4/oneOf.json        |     0
 .../test/json-schema-draft4/pattern.json      |     0
 .../json-schema-draft4/patternProperties.json |     0
 .../test/json-schema-draft4/properties.json   |     0
 .../test/json-schema-draft4/ref.json          |     0
 .../test/json-schema-draft4/refRemote.json    |     0
 .../test/json-schema-draft4/required.json     |     0
 .../test/json-schema-draft4/type.json         |     0
 .../test/json-schema-draft4/uniqueItems.json  |     0
 .../is-my-json-valid/test/json-schema.js      |     0
 .../is-my-json-valid/test/misc.js             |     0
 .../node_modules/pinkie-promise/index.js      |     3 +
 .../node_modules/pinkie-promise/license}      |     4 +-
 .../node_modules/pinkie/index.js              |   276 +
 .../node_modules/pinkie/license               |    21 +
 .../node_modules/pinkie/package.json          |    43 +
 .../node_modules/pinkie/readme.md             |    75 +
 .../node_modules/pinkie-promise/package.json  |    46 +
 .../node_modules/pinkie-promise/readme.md     |    26 +
 .../node_modules}/har-validator/package.json  |   146 +-
 .../node_modules}/hawk/.npmignore             |     0
 .../node_modules}/hawk/.travis.yml            |     0
 .../{ => request/node_modules}/hawk/LICENSE   |     0
 .../{ => request/node_modules}/hawk/README.md |     0
 .../node_modules}/hawk/bower.json             |     0
 .../node_modules}/hawk/component.json         |     0
 .../node_modules}/hawk/example/usage.js       |     0
 .../node_modules}/hawk/images/hawk.png        |   Bin
 .../node_modules}/hawk/images/logo.png        |   Bin
 .../node_modules}/hawk/lib/browser.js         |     0
 .../node_modules}/hawk/lib/client.js          |     0
 .../node_modules}/hawk/lib/crypto.js          |     0
 .../node_modules}/hawk/lib/index.js           |     0
 .../node_modules}/hawk/lib/server.js          |     0
 .../node_modules}/hawk/lib/utils.js           |     0
 .../hawk/node_modules}/boom/.npmignore        |     0
 .../hawk/node_modules}/boom/.travis.yml       |     0
 .../hawk/node_modules}/boom/CONTRIBUTING.md   |     0
 .../hawk/node_modules}/boom/LICENSE           |     0
 .../hawk/node_modules}/boom/README.md         |     0
 .../hawk/node_modules}/boom/images/boom.png   |   Bin
 .../hawk/node_modules}/boom/lib/index.js      |     0
 .../hawk/node_modules}/boom/package.json      |    93 +-
 .../hawk/node_modules}/boom/test/index.js     |     0
 .../hawk/node_modules}/cryptiles/.npmignore   |     0
 .../hawk/node_modules}/cryptiles/.travis.yml  |     0
 .../hawk/node_modules}/cryptiles/LICENSE      |     0
 .../hawk/node_modules}/cryptiles/README.md    |     0
 .../hawk/node_modules}/cryptiles/lib/index.js |     0
 .../hawk/node_modules}/cryptiles/package.json |    95 +-
 .../node_modules}/cryptiles/test/index.js     |     0
 .../hawk/node_modules}/hoek/.npmignore        |     0
 .../hawk/node_modules}/hoek/.travis.yml       |     0
 .../hawk/node_modules}/hoek/CONTRIBUTING.md   |     0
 .../hawk/node_modules}/hoek/LICENSE           |     0
 .../hawk/node_modules}/hoek/README.md         |     0
 .../hawk/node_modules}/hoek/images/hoek.png   |   Bin
 .../hawk/node_modules}/hoek/lib/escape.js     |     0
 .../hawk/node_modules}/hoek/lib/index.js      |     0
 .../hawk/node_modules/hoek/package.json       |    36 +
 .../hawk/node_modules}/hoek/test/escaper.js   |     0
 .../hawk/node_modules}/hoek/test/index.js     |     0
 .../hoek/test/modules/ignore.txt              |     0
 .../node_modules}/hoek/test/modules/test1.js  |     0
 .../node_modules}/hoek/test/modules/test2.js  |     0
 .../node_modules}/hoek/test/modules/test3.js  |     0
 .../hawk/node_modules}/sntp/.npmignore        |     0
 .../hawk/node_modules}/sntp/.travis.yml       |     0
 .../hawk/node_modules}/sntp/LICENSE           |     0
 .../hawk/node_modules}/sntp/Makefile          |     0
 .../hawk/node_modules}/sntp/README.md         |     0
 .../node_modules}/sntp/examples/offset.js     |     0
 .../hawk/node_modules}/sntp/examples/time.js  |     0
 .../hawk/node_modules}/sntp/index.js          |     0
 .../hawk/node_modules}/sntp/lib/index.js      |     0
 .../hawk/node_modules/sntp/package.json       |    49 +
 .../hawk/node_modules}/sntp/test/index.js     |     0
 .../node_modules}/hawk/package.json           |   105 +-
 .../node_modules}/hawk/test/browser.js        |     0
 .../node_modules}/hawk/test/client.js         |     0
 .../node_modules}/hawk/test/crypto.js         |     0
 .../node_modules}/hawk/test/index.js          |     0
 .../node_modules}/hawk/test/readme.js         |     0
 .../node_modules}/hawk/test/server.js         |     0
 .../node_modules}/hawk/test/uri.js            |     0
 .../node_modules}/hawk/test/utils.js          |     0
 .../http-signature/.dir-locals.el             |     0
 .../node_modules}/http-signature/.npmignore   |     0
 .../node_modules}/http-signature/LICENSE      |     0
 .../node_modules}/http-signature/README.md    |     0
 .../http-signature/http_signing.md            |     0
 .../node_modules}/http-signature/lib/index.js |     0
 .../http-signature/lib/parser.js              |     0
 .../http-signature/lib/signer.js              |     0
 .../node_modules}/http-signature/lib/util.js  |     0
 .../http-signature/lib/verify.js              |     0
 .../node_modules}/asn1/.npmignore             |     0
 .../http-signature/node_modules}/asn1/LICENSE |     0
 .../node_modules}/asn1/README.md              |     0
 .../node_modules}/asn1/lib/ber/errors.js      |     0
 .../node_modules}/asn1/lib/ber/index.js       |     0
 .../node_modules}/asn1/lib/ber/reader.js      |     0
 .../node_modules}/asn1/lib/ber/types.js       |     0
 .../node_modules}/asn1/lib/ber/writer.js      |     0
 .../node_modules}/asn1/lib/index.js           |     0
 .../node_modules/asn1/package.json            |    45 +
 .../node_modules}/asn1/tst/ber/reader.test.js |     0
 .../node_modules}/asn1/tst/ber/writer.test.js |     0
 .../node_modules}/assert-plus/README.md       |     0
 .../node_modules}/assert-plus/assert.js       |     0
 .../node_modules/assert-plus/package.json     |    30 +
 .../node_modules}/ctype/.npmignore            |     0
 .../node_modules}/ctype/CHANGELOG             |     0
 .../node_modules}/ctype/LICENSE               |     0
 .../http-signature/node_modules}/ctype/README |     0
 .../node_modules}/ctype/README.old            |     0
 .../http-signature/node_modules}/ctype/ctf.js |     0
 .../node_modules}/ctype/ctio.js               |     0
 .../node_modules}/ctype/ctype.js              |     0
 .../ctype/man/man3ctype/ctio.3ctype           |     0
 .../node_modules/ctype/package.json           |    42 +
 .../node_modules}/ctype/tools/jsl.conf        |     0
 .../node_modules}/ctype/tools/jsstyle         |     0
 .../node_modules}/http-signature/package.json |    99 +-
 .../node_modules}/isstream/.npmignore         |     0
 .../node_modules}/isstream/.travis.yml        |     0
 .../node_modules}/isstream/LICENSE.md         |     0
 .../node_modules}/isstream/README.md          |     0
 .../node_modules}/isstream/isstream.js        |     0
 .../node_modules/isstream/package.json        |    42 +
 .../node_modules}/isstream/test.js            |     0
 .../json-stringify-safe/.npmignore            |     0
 .../json-stringify-safe/CHANGELOG.md          |     0
 .../node_modules/json-stringify-safe/LICENSE  |    15 +
 .../json-stringify-safe/Makefile              |     0
 .../json-stringify-safe/README.md             |     0
 .../json-stringify-safe/package.json          |    47 +
 .../json-stringify-safe/stringify.js          |     0
 .../json-stringify-safe/test/mocha.opts       |     0
 .../test/stringify_test.js                    |     0
 .../node_modules}/mime-types/HISTORY.md       |     0
 .../node_modules}/mime-types/LICENSE          |     0
 .../node_modules}/mime-types/README.md        |     0
 .../node_modules}/mime-types/index.js         |     0
 .../node_modules}/mime-db/HISTORY.md          |     0
 .../mime-types/node_modules}/mime-db/LICENSE  |     0
 .../node_modules}/mime-db/README.md           |     0
 .../mime-types/node_modules}/mime-db/db.json  |     0
 .../mime-types/node_modules}/mime-db/index.js |     0
 .../node_modules}/mime-db/package.json        |   105 +-
 .../node_modules/mime-types/package.json      |    60 +
 .../request/node_modules/node-uuid/.npmignore |     2 +
 .../node_modules}/node-uuid/LICENSE.md        |     0
 .../node_modules}/node-uuid/README.md         |     0
 .../node-uuid/benchmark/README.md             |     0
 .../node-uuid/benchmark/bench.gnu             |     0
 .../node-uuid/benchmark/bench.sh              |     0
 .../node-uuid/benchmark/benchmark-native.c    |     0
 .../node-uuid/benchmark/benchmark.js          |     0
 .../node_modules}/node-uuid/bin/uuid          |     0
 .../node_modules}/node-uuid/bower.json        |     0
 .../node_modules}/node-uuid/component.json    |     0
 .../node_modules/node-uuid/package.json       |    49 +
 .../node-uuid/test/compare_v1.js              |     0
 .../node_modules}/node-uuid/test/test.html    |     0
 .../node_modules}/node-uuid/test/test.js      |     0
 .../node_modules}/node-uuid/uuid.js           |     0
 .../node_modules}/oauth-sign/LICENSE          |     0
 .../node_modules}/oauth-sign/README.md        |     0
 .../node_modules}/oauth-sign/index.js         |     0
 .../node_modules}/oauth-sign/package.json     |    82 +-
 .../node_modules}/oauth-sign/test.js          |     0
 .../node_modules}/qs/.eslintignore            |     0
 .../{ => request/node_modules}/qs/.npmignore  |     0
 .../{ => request/node_modules}/qs/.travis.yml |     1 +
 .../node_modules}/qs/CHANGELOG.md             |     0
 .../node_modules}/qs/CONTRIBUTING.md          |     0
 .../{ => request/node_modules}/qs/LICENSE     |     0
 .../{ => request/node_modules}/qs/README.md   |     9 +-
 .../{ => request/node_modules}/qs/bower.json  |     0
 .../node_modules}/qs/component.json           |     0
 .../{ => request/node_modules}/qs/dist/qs.js  |    35 +-
 .../node_modules}/qs/lib/index.js             |     0
 .../node_modules}/qs/lib/parse.js             |     0
 .../node_modules}/qs/lib/stringify.js         |    18 +-
 .../node_modules}/qs/lib/utils.js             |     0
 .../request/node_modules/qs/package.json      |    59 +
 .../node_modules}/qs/test/parse.js            |     0
 .../node_modules}/qs/test/stringify.js        |    12 +
 .../node_modules}/qs/test/utils.js            |     0
 .../node_modules}/stringstream/.npmignore     |     0
 .../node_modules/stringstream/.travis.yml     |     4 +
 .../node_modules}/stringstream/LICENSE.txt    |     0
 .../node_modules}/stringstream/README.md      |     0
 .../node_modules}/stringstream/example.js     |     0
 .../node_modules}/stringstream/package.json   |    76 +-
 .../stringstream/stringstream.js              |     0
 .../request/node_modules/tough-cookie/LICENSE |    27 +
 .../node_modules}/tough-cookie/README.md      |    28 +-
 .../node_modules}/tough-cookie/lib/cookie.js  |    63 +-
 .../tough-cookie/lib/memstore.js              |     0
 .../tough-cookie/lib/pathMatch.js             |     0
 .../tough-cookie/lib/permuteDomain.js         |     0
 .../tough-cookie/lib/pubsuffix.js             |    98 +
 .../node_modules}/tough-cookie/lib/store.js   |     0
 .../node_modules/tough-cookie/package.json    |    90 +
 .../node_modules}/tunnel-agent/LICENSE        |     0
 .../node_modules}/tunnel-agent/README.md      |     0
 .../node_modules}/tunnel-agent/index.js       |     0
 .../node_modules/tunnel-agent/package.json    |    30 +
 deps/npm/node_modules/request/package.json    |   173 +-
 deps/npm/node_modules/request/request.js      |   108 +-
 deps/npm/node_modules/retry/package.json      |    87 +-
 deps/npm/node_modules/rimraf/package.json     |    97 +-
 deps/npm/node_modules/semver/package.json     |    89 +-
 .../node_modules/core-util-is/README.md       |     3 +
 .../node_modules/core-util-is/float.patch     |   604 +
 .../node_modules/core-util-is/lib/util.js     |   107 +
 .../node_modules/core-util-is/package.json    |    37 +
 .../node_modules/core-util-is/util.js         |   106 +
 .../node_modules/isarray/README.md            |    54 +
 .../node_modules/isarray/build/build.js       |   208 +
 .../node_modules/isarray/component.json       |    19 +
 .../node_modules/isarray/index.js             |     3 +
 .../node_modules/isarray/package.json         |    38 +
 .../process-nextick-args/.travis.yml          |     7 +
 .../process-nextick-args/index.js             |    13 +
 .../process-nextick-args/license.md           |    19 +
 .../process-nextick-args/package.json         |    28 +
 .../process-nextick-args/readme.md            |    18 +
 .../node_modules/process-nextick-args/test.js |    24 +
 .../node_modules/string_decoder/.npmignore    |     2 +
 .../node_modules/string_decoder/LICENSE       |    20 +
 .../node_modules/string_decoder/README.md     |     7 +
 .../node_modules/string_decoder/index.js      |   221 +
 .../node_modules/string_decoder/package.json  |    34 +
 .../node_modules/util-deprecate/History.md    |    16 +
 .../node_modules/util-deprecate/LICENSE       |    24 +
 .../node_modules/util-deprecate/README.md     |    53 +
 .../node_modules/util-deprecate/browser.js    |    67 +
 .../node_modules/util-deprecate/node.js       |     6 +
 .../node_modules/util-deprecate/package.json  |    53 +
 .../node_modules/readable-stream/package.json |   103 +-
 deps/npm/node_modules/sha/package.json        |    84 +-
 deps/npm/node_modules/sigmund/package.json    |    83 -
 deps/npm/node_modules/slide/package.json      |    82 +-
 deps/npm/node_modules/sntp/package.json       |    88 -
 .../node_modules/sorted-object/package.json   |    83 +-
 .../node_modules/spdx-exceptions/.npmignore   |     2 -
 .../node_modules/spdx-exceptions/LICENSE.md   |     9 -
 .../node_modules/spdx-exceptions/README.md    |    13 -
 .../node_modules/spdx-exceptions/package.json |    78 -
 .../node_modules/string_decoder/package.json  |    79 -
 deps/npm/node_modules/strip-ansi/package.json |   135 +-
 .../node_modules/supports-color/package.json  |   103 -
 .../tar/node_modules/block-stream/LICENCE     |    25 +
 .../tar/node_modules/block-stream/LICENSE     |    15 +
 .../tar/node_modules/block-stream/README.md   |    14 +
 .../block-stream/bench/block-stream-pause.js  |    70 +
 .../block-stream/bench/block-stream.js        |    68 +
 .../block-stream/bench/dropper-pause.js       |    70 +
 .../block-stream/bench/dropper.js             |    68 +
 .../node_modules/block-stream/block-stream.js |   209 +
 .../node_modules/block-stream/package.json    |    55 +
 .../node_modules/block-stream/test/basic.js   |    27 +
 .../block-stream/test/nopad-thorough.js       |    68 +
 .../node_modules/block-stream/test/nopad.js   |    57 +
 .../block-stream/test/pause-resume.js         |    73 +
 .../block-stream/test/thorough.js             |    68 +
 .../block-stream/test/two-stream.js           |    59 +
 deps/npm/node_modules/tar/package.json        |    86 +-
 deps/npm/node_modules/text-table/package.json |   115 +-
 .../node_modules/tough-cookie/.editorconfig   |    12 -
 deps/npm/node_modules/tough-cookie/.npmignore |     4 -
 .../npm/node_modules/tough-cookie/.travis.yml |     9 -
 deps/npm/node_modules/tough-cookie/LICENSE    |    74 -
 .../tough-cookie/generate-pubsuffix.js        |   293 -
 .../tough-cookie/lib/pubsuffix.js             |    98 -
 .../node_modules/tough-cookie/package.json    |    90 -
 .../tough-cookie/public-suffix.txt            | 10309 ----------------
 .../tough-cookie/test/api_test.js             |   372 -
 .../tough-cookie/test/cookie_jar_test.js      |   468 -
 .../tough-cookie/test/cookie_sorting_test.js  |   156 -
 .../tough-cookie/test/cookie_to_json_test.js  |   164 -
 .../test/cookie_to_string_test.js             |   162 -
 .../tough-cookie/test/date_test.js            |    79 -
 .../tough-cookie/test/domain_and_path_test.js |   200 -
 .../test/ietf_data/dates/bsd-examples.json    |   168 -
 .../test/ietf_data/dates/examples.json        |    48 -
 .../tough-cookie/test/ietf_data/parser.json   |  1959 ---
 .../tough-cookie/test/ietf_test.js            |   105 -
 .../test/jar_serialization_test.js            |   348 -
 .../tough-cookie/test/lifetime_test.js        |    97 -
 .../tough-cookie/test/parsing_test.js         |   294 -
 .../tough-cookie/test/regression_test.js      |   143 -
 .../node_modules/tunnel-agent/package.json    |    82 -
 deps/npm/node_modules/typedarray/package.json |   103 -
 deps/npm/node_modules/uid-number/package.json |    79 +-
 deps/npm/node_modules/umask/package.json      |    85 +-
 .../node_modules}/unique-slug/.npmignore      |     0
 .../node_modules}/unique-slug/README.md       |     0
 .../node_modules}/unique-slug/index.js        |     0
 .../node_modules}/unique-slug/package.json    |    82 +-
 .../node_modules}/unique-slug/test/index.js   |     0
 .../node_modules/unique-filename/package.json |    81 +-
 deps/npm/node_modules/unpipe/package.json     |    82 +-
 .../node_modules/util-deprecate/package.json  |    78 -
 .../node_modules}/spdx-correct/README.md      |     0
 .../node_modules}/spdx-correct/index.js       |     0
 .../node_modules}/spdx-correct/package.json   |    88 +-
 .../spdx-expression-parse/LICENSE             |     0
 .../spdx-expression-parse/README.md           |     0
 .../spdx-expression-parse/index.js            |     0
 .../node_modules/spdx-exceptions/README.md    |     1 +
 .../node_modules}/spdx-exceptions/index.json  |     0
 .../node_modules/spdx-exceptions/package.json |    48 +
 .../spdx-expression-parse/package.json        |    86 +-
 .../spdx-expression-parse/parser.generated.js |     0
 .../node_modules}/spdx-license-ids/LICENSE    |     0
 .../node_modules}/spdx-license-ids/README.md  |     0
 .../spdx-license-ids/package.json             |   122 +-
 .../spdx-license-ids/spdx-license-ids.json    |     0
 .../validate-npm-package-license/package.json |    91 +-
 .../node_modules/builtins/.travis.yml         |     4 +
 .../node_modules}/builtins/History.md         |     0
 .../node_modules}/builtins/Readme.md          |     0
 .../node_modules}/builtins/builtins.json      |     0
 .../node_modules}/builtins/package.json       |    75 +-
 .../validate-npm-package-name/package.json    |    94 +-
 deps/npm/node_modules/which/.travis.yml       |     6 +-
 deps/npm/node_modules/which/README.md         |     8 +-
 deps/npm/node_modules/which/bin/which         |    52 +-
 .../node_modules}/is-absolute/LICENSE         |     0
 .../node_modules}/is-absolute/README.md       |     0
 .../node_modules}/is-absolute/index.js        |     0
 .../node_modules}/is-relative/LICENSE-MIT     |     0
 .../node_modules}/is-relative/README.md       |     0
 .../node_modules}/is-relative/index.js        |     0
 .../node_modules}/is-relative/package.json    |   108 +-
 .../node_modules}/is-absolute/package.json    |    97 +-
 deps/npm/node_modules/which/package.json      |    91 +-
 deps/npm/node_modules/which/test/bin.js       |   119 +
 deps/npm/node_modules/which/which.js          |    25 +-
 deps/npm/node_modules/wrappy/package.json     |    90 +-
 .../write-file-atomic/package.json            |    79 +-
 deps/npm/node_modules/xtend/package.json      |   111 -
 deps/npm/package.json                         |    36 +-
 deps/npm/scripts/index-build.js               |    10 +-
 deps/npm/scripts/installable.sh               |    13 -
 deps/npm/test/common-tap.js                   |     2 +-
 .../test/fixtures/config/userconfig-with-gc   |    24 -
 .../test/packages/npm-test-array-bin/test.js  |     7 +-
 .../test/packages/npm-test-dir-bin/test.js    |     9 +-
 .../test/packages/npm-test-shrinkwrap/test.js |    29 +-
 deps/npm/test/run.js                          |    25 +-
 deps/npm/test/tap/access.js                   |    60 +-
 .../tap/add-named-update-protocol-port.js     |     2 -
 .../test/tap/add-remote-git-get-resolved.js   |     1 -
 .../npm/test/tap/add-remote-git-shrinkwrap.js |     4 +-
 deps/npm/test/tap/adduser-always-auth.js      |    40 +-
 deps/npm/test/tap/adduser-legacy-auth.js      |    39 +-
 deps/npm/test/tap/bugs.js                     |   204 +-
 deps/npm/test/tap/build-already-built.js      |     2 -
 deps/npm/test/tap/builtin-config.js           |    50 +-
 .../test/tap/cache-add-localdir-fallback.js   |    58 +-
 deps/npm/test/tap/cache-add-unpublished.js    |    30 +-
 deps/npm/test/tap/config-private.js           |     6 +-
 deps/npm/test/tap/dedupe.js                   |     3 +-
 deps/npm/test/tap/gently-rm-cmdshims.js       |    34 +-
 deps/npm/test/tap/git-cache-no-hooks.js       |     1 -
 .../test/tap/git-dependency-install-link.js   |    76 +-
 deps/npm/test/tap/init-interrupt.js           |     1 -
 .../test/tap/install-cli-only-development.js  |    72 +-
 deps/npm/test/tap/logout.js                   |    31 +-
 deps/npm/test/tap/outdated-color.js           |     8 +-
 deps/npm/test/tap/outdated-depth-deep.js      |     4 +-
 deps/npm/test/tap/outdated-depth-integer.js   |    19 +-
 deps/npm/test/tap/outdated-notarget.js        |     2 +-
 deps/npm/test/tap/peer-deps-toplevel.js       |     2 +-
 deps/npm/test/tap/peer-deps.js                |     2 +-
 deps/npm/test/tap/prepublish.js               |     6 +-
 .../test/tap/publish-invalid-semver-tag.js    |     8 +-
 deps/npm/test/tap/registry.js                 |     1 -
 .../test/tap/scripts-whitespace-windows.js    |     1 -
 deps/npm/test/tap/search.js                   |   174 +-
 .../tap/shrinkwrap-optional-dependency.js     |   101 +
 .../shrinkwrap-save-with-existing-dev-deps.js |    87 +
 deps/npm/test/tap/tag-version-prefix.js       |    85 +-
 deps/npm/test/tap/unit-child-path.js          |     9 +
 deps/npm/test/tap/unit-deps-replaceModule.js  |    50 +
 deps/npm/test/tap/unit-module-name.js         |    40 +
 deps/npm/test/tap/unit-package-id.js          |    17 +
 deps/npm/test/tap/update-examples.js          |    20 +-
 deps/npm/test/tap/update-index.js             |   174 +-
 deps/npm/test/tap/version-no-tags.js          |     2 +-
 .../npm/test/tap/version-update-shrinkwrap.js |     4 +-
 deps/npm/test/tap/view.js                     |     8 +-
 1484 files changed, 20956 insertions(+), 47688 deletions(-)
 create mode 100644 deps/npm/doc/misc/npm-orgs.md
 delete mode 100644 deps/npm/html/doc/api/npm-bin.html
 delete mode 100644 deps/npm/html/doc/api/npm-bugs.html
 delete mode 100644 deps/npm/html/doc/api/npm-cache.html
 delete mode 100644 deps/npm/html/doc/api/npm-commands.html
 delete mode 100644 deps/npm/html/doc/api/npm-config.html
 delete mode 100644 deps/npm/html/doc/api/npm-deprecate.html
 delete mode 100644 deps/npm/html/doc/api/npm-docs.html
 delete mode 100644 deps/npm/html/doc/api/npm-edit.html
 delete mode 100644 deps/npm/html/doc/api/npm-explore.html
 delete mode 100644 deps/npm/html/doc/api/npm-help-search.html
 delete mode 100644 deps/npm/html/doc/api/npm-init.html
 delete mode 100644 deps/npm/html/doc/api/npm-install.html
 delete mode 100644 deps/npm/html/doc/api/npm-link.html
 delete mode 100644 deps/npm/html/doc/api/npm-load.html
 delete mode 100644 deps/npm/html/doc/api/npm-ls.html
 delete mode 100644 deps/npm/html/doc/api/npm-outdated.html
 delete mode 100644 deps/npm/html/doc/api/npm-owner.html
 delete mode 100644 deps/npm/html/doc/api/npm-pack.html
 delete mode 100644 deps/npm/html/doc/api/npm-ping.html
 delete mode 100644 deps/npm/html/doc/api/npm-prefix.html
 delete mode 100644 deps/npm/html/doc/api/npm-prune.html
 delete mode 100644 deps/npm/html/doc/api/npm-publish.html
 delete mode 100644 deps/npm/html/doc/api/npm-rebuild.html
 delete mode 100644 deps/npm/html/doc/api/npm-repo.html
 delete mode 100644 deps/npm/html/doc/api/npm-restart.html
 delete mode 100644 deps/npm/html/doc/api/npm-root.html
 delete mode 100644 deps/npm/html/doc/api/npm-run-script.html
 delete mode 100644 deps/npm/html/doc/api/npm-search.html
 delete mode 100644 deps/npm/html/doc/api/npm-shrinkwrap.html
 delete mode 100644 deps/npm/html/doc/api/npm-start.html
 delete mode 100644 deps/npm/html/doc/api/npm-stop.html
 delete mode 100644 deps/npm/html/doc/api/npm-tag.html
 delete mode 100644 deps/npm/html/doc/api/npm-test.html
 delete mode 100644 deps/npm/html/doc/api/npm-uninstall.html
 delete mode 100644 deps/npm/html/doc/api/npm-unpublish.html
 delete mode 100644 deps/npm/html/doc/api/npm-update.html
 delete mode 100644 deps/npm/html/doc/api/npm-version.html
 delete mode 100644 deps/npm/html/doc/api/npm-view.html
 delete mode 100644 deps/npm/html/doc/api/npm-whoami.html
 delete mode 100644 deps/npm/html/doc/api/npm.html
 delete mode 100644 deps/npm/html/doc/misc/npm-index.html
 create mode 100644 deps/npm/lib/utils/child-path.js
 create mode 100644 deps/npm/lib/utils/module-name.js
 rename deps/npm/lib/{install/get-package-id.js => utils/package-id.js} (58%)
 delete mode 100644 deps/npm/man/man3/npm-bin.3
 delete mode 100644 deps/npm/man/man3/npm-bugs.3
 delete mode 100644 deps/npm/man/man3/npm-cache.3
 delete mode 100644 deps/npm/man/man3/npm-commands.3
 delete mode 100644 deps/npm/man/man3/npm-config.3
 delete mode 100644 deps/npm/man/man3/npm-deprecate.3
 delete mode 100644 deps/npm/man/man3/npm-docs.3
 delete mode 100644 deps/npm/man/man3/npm-edit.3
 delete mode 100644 deps/npm/man/man3/npm-explore.3
 delete mode 100644 deps/npm/man/man3/npm-help-search.3
 delete mode 100644 deps/npm/man/man3/npm-init.3
 delete mode 100644 deps/npm/man/man3/npm-install.3
 delete mode 100644 deps/npm/man/man3/npm-link.3
 delete mode 100644 deps/npm/man/man3/npm-load.3
 delete mode 100644 deps/npm/man/man3/npm-ls.3
 delete mode 100644 deps/npm/man/man3/npm-outdated.3
 delete mode 100644 deps/npm/man/man3/npm-owner.3
 delete mode 100644 deps/npm/man/man3/npm-pack.3
 delete mode 100644 deps/npm/man/man3/npm-ping.3
 delete mode 100644 deps/npm/man/man3/npm-prefix.3
 delete mode 100644 deps/npm/man/man3/npm-prune.3
 delete mode 100644 deps/npm/man/man3/npm-publish.3
 delete mode 100644 deps/npm/man/man3/npm-rebuild.3
 delete mode 100644 deps/npm/man/man3/npm-repo.3
 delete mode 100644 deps/npm/man/man3/npm-restart.3
 delete mode 100644 deps/npm/man/man3/npm-root.3
 delete mode 100644 deps/npm/man/man3/npm-run-script.3
 delete mode 100644 deps/npm/man/man3/npm-search.3
 delete mode 100644 deps/npm/man/man3/npm-shrinkwrap.3
 delete mode 100644 deps/npm/man/man3/npm-start.3
 delete mode 100644 deps/npm/man/man3/npm-stop.3
 delete mode 100644 deps/npm/man/man3/npm-tag.3
 delete mode 100644 deps/npm/man/man3/npm-test.3
 delete mode 100644 deps/npm/man/man3/npm-uninstall.3
 delete mode 100644 deps/npm/man/man3/npm-unpublish.3
 delete mode 100644 deps/npm/man/man3/npm-update.3
 delete mode 100644 deps/npm/man/man3/npm-version.3
 delete mode 100644 deps/npm/man/man3/npm-view.3
 delete mode 100644 deps/npm/man/man3/npm-whoami.3
 delete mode 100644 deps/npm/man/man3/npm.3
 delete mode 100644 deps/npm/node_modules/ansi-styles/package.json
 delete mode 100644 deps/npm/node_modules/asap/package.json
 delete mode 100644 deps/npm/node_modules/asn1/package.json
 delete mode 100644 deps/npm/node_modules/assert-plus/package.json
 delete mode 100644 deps/npm/node_modules/aws-sign2/package.json
 delete mode 100644 deps/npm/node_modules/balanced-match/package.json
 delete mode 100644 deps/npm/node_modules/bl/node_modules/readable-stream/package.json
 delete mode 100644 deps/npm/node_modules/bluebird/README.md
 delete mode 100644 deps/npm/node_modules/bluebird/changelog.md
 delete mode 100644 deps/npm/node_modules/bluebird/js/browser/bluebird.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/browser/bluebird.min.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/any.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/assert.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/async.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/bind.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/bluebird.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/call_get.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/cancel.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/captured_trace.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/catch_filter.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/context.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/debuggability.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/direct_resolve.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/each.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/errors.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/es5.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/filter.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/finally.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/generators.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/join.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/map.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/method.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/nodeify.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/progress.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/promise.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/promise_array.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/promise_resolver.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/promisify.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/props.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/queue.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/race.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/reduce.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/schedule.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/settle.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/some.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/synchronous_inspection.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/thenables.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/timers.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/using.js
 delete mode 100644 deps/npm/node_modules/bluebird/js/main/util.js
 delete mode 100644 deps/npm/node_modules/bluebird/package.json
 delete mode 100644 deps/npm/node_modules/chalk/package.json
 delete mode 100644 deps/npm/node_modules/clone/package.json
 delete mode 100644 deps/npm/node_modules/clone/test.js
 rename deps/npm/node_modules/{ansi => columnify/node_modules/wcwidth}/.npmignore (100%)
 rename deps/npm/node_modules/{ => columnify/node_modules}/wcwidth/LICENSE (100%)
 rename deps/npm/node_modules/{ => columnify/node_modules}/wcwidth/Readme.md (100%)
 rename deps/npm/node_modules/{ => columnify/node_modules}/wcwidth/combining.js (100%)
 rename deps/npm/node_modules/{ => columnify/node_modules}/wcwidth/docs/index.md (100%)
 rename deps/npm/node_modules/{ => columnify/node_modules}/wcwidth/index.js (100%)
 rename deps/npm/node_modules/{array-index => columnify/node_modules/wcwidth/node_modules/defaults}/.npmignore (100%)
 rename deps/npm/node_modules/{ => columnify/node_modules/wcwidth/node_modules}/defaults/LICENSE (100%)
 rename deps/npm/node_modules/{ => columnify/node_modules/wcwidth/node_modules}/defaults/README.md (100%)
 rename deps/npm/node_modules/{ => columnify/node_modules/wcwidth/node_modules}/defaults/index.js (100%)
 rename deps/npm/node_modules/{ => columnify/node_modules/wcwidth/node_modules/defaults/node_modules}/clone/.npmignore (100%)
 rename deps/npm/node_modules/{ => columnify/node_modules/wcwidth/node_modules/defaults/node_modules}/clone/.travis.yml (69%)
 rename deps/npm/node_modules/{ => columnify/node_modules/wcwidth/node_modules/defaults/node_modules}/clone/LICENSE (95%)
 rename deps/npm/node_modules/{ => columnify/node_modules/wcwidth/node_modules/defaults/node_modules}/clone/README.md (90%)
 rename deps/npm/node_modules/{ => columnify/node_modules/wcwidth/node_modules/defaults/node_modules}/clone/clone.js (71%)
 create mode 100644 deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/package.json
 create mode 100644 deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/test-apart-ctx.html
 create mode 100644 deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/test.html
 create mode 100644 deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/test.js
 create mode 100644 deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/package.json
 rename deps/npm/node_modules/{ => columnify/node_modules/wcwidth/node_modules}/defaults/test.js (100%)
 rename deps/npm/node_modules/{ => columnify/node_modules}/wcwidth/package.json (64%)
 rename deps/npm/node_modules/{ => columnify/node_modules}/wcwidth/test/index.js (100%)
 delete mode 100644 deps/npm/node_modules/commander/package.json
 delete mode 100644 deps/npm/node_modules/concat-stream/node_modules/readable-stream/package.json
 delete mode 100644 deps/npm/node_modules/concat-stream/package.json
 rename deps/npm/node_modules/{block-stream => config-chain/node_modules/proto-list}/LICENSE (100%)
 rename deps/npm/node_modules/{ => config-chain/node_modules}/proto-list/README.md (100%)
 create mode 100644 deps/npm/node_modules/config-chain/node_modules/proto-list/package.json
 rename deps/npm/node_modules/{ => config-chain/node_modules}/proto-list/proto-list.js (100%)
 rename deps/npm/node_modules/{ => config-chain/node_modules}/proto-list/test/basic.js (100%)
 delete mode 100644 deps/npm/node_modules/core-util-is/package.json
 delete mode 100644 deps/npm/node_modules/ctype/package.json
 delete mode 100644 deps/npm/node_modules/debug/package.json
 delete mode 100644 deps/npm/node_modules/defaults/package.json
 rename deps/npm/node_modules/{ => dezalgo/node_modules}/asap/CHANGES.md (100%)
 rename deps/npm/node_modules/{ => dezalgo/node_modules}/asap/LICENSE.md (100%)
 rename deps/npm/node_modules/{ => dezalgo/node_modules}/asap/README.md (100%)
 rename deps/npm/node_modules/{ => dezalgo/node_modules}/asap/asap.js (100%)
 rename deps/npm/node_modules/{ => dezalgo/node_modules}/asap/browser-asap.js (100%)
 rename deps/npm/node_modules/{ => dezalgo/node_modules}/asap/browser-raw.js (100%)
 create mode 100644 deps/npm/node_modules/dezalgo/node_modules/asap/package.json
 rename deps/npm/node_modules/{ => dezalgo/node_modules}/asap/raw.js (100%)
 delete mode 100644 deps/npm/node_modules/escape-string-regexp/package.json
 delete mode 100644 deps/npm/node_modules/forever-agent/package.json
 rename deps/npm/node_modules/{ => fstream-npm/node_modules}/fstream-ignore/.npmignore (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules}/fstream-ignore/LICENSE (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules}/fstream-ignore/README.md (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules}/fstream-ignore/example/basic.js (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules}/fstream-ignore/ignore.js (100%)
 rename deps/npm/node_modules/{json-stringify-safe => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch}/LICENSE (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules}/minimatch/README.md (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules}/minimatch/browser.js (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules}/minimatch/minimatch.js (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules}/brace-expansion/.npmignore (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules}/brace-expansion/README.md (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules}/brace-expansion/example.js (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules}/brace-expansion/index.js (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules}/balanced-match/.npmignore (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules}/balanced-match/.travis.yml (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules}/balanced-match/Makefile (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules}/balanced-match/README.md (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules}/balanced-match/example.js (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules}/balanced-match/index.js (100%)
 create mode 100644 deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules}/balanced-match/test/balanced.js (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules}/concat-map/.travis.yml (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules}/concat-map/LICENSE (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules}/concat-map/README.markdown (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules}/concat-map/example/map.js (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules}/concat-map/index.js (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules}/concat-map/package.json (66%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules}/concat-map/test/map.js (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules}/brace-expansion/package.json (60%)
 create mode 100644 deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/package.json
 rename deps/npm/node_modules/{ => fstream-npm/node_modules}/fstream-ignore/package.json (65%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules}/fstream-ignore/test/.ignore (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules}/fstream-ignore/test/.npmignore (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules}/fstream-ignore/test/00-setup.js (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules}/fstream-ignore/test/basic.js (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules}/fstream-ignore/test/common.js (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules}/fstream-ignore/test/ignore-most.js (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules}/fstream-ignore/test/nested-ignores.js (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules}/fstream-ignore/test/read-file-order.js (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules}/fstream-ignore/test/unignore-child.js (100%)
 rename deps/npm/node_modules/{ => fstream-npm/node_modules}/fstream-ignore/test/zz-cleanup.js (100%)
 delete mode 100644 deps/npm/node_modules/generate-function/package.json
 delete mode 100644 deps/npm/node_modules/generate-object-property/package.json
 rename deps/npm/node_modules/{lru-cache => glob/node_modules/minimatch}/LICENSE (100%)
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/README.md
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/minimatch.js
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js
 rename deps/npm/node_modules/{node-uuid => glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match}/.npmignore (100%)
 rename deps/npm/node_modules/{builtins => glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match}/.travis.yml (100%)
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js
 rename deps/npm/node_modules/{stringstream => glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map}/.travis.yml (100%)
 rename deps/npm/node_modules/{minimist => glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map}/LICENSE (100%)
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
 create mode 100644 deps/npm/node_modules/glob/node_modules/minimatch/package.json
 rename deps/npm/node_modules/{ => glob/node_modules}/path-is-absolute/index.js (100%)
 rename deps/npm/node_modules/{ansi-styles => glob/node_modules/path-is-absolute}/license (100%)
 create mode 100644 deps/npm/node_modules/glob/node_modules/path-is-absolute/package.json
 rename deps/npm/node_modules/{ => glob/node_modules}/path-is-absolute/readme.md (100%)
 delete mode 100644 deps/npm/node_modules/graceful-readlink/package.json
 delete mode 100755 deps/npm/node_modules/har-validator/bin/har-validator
 delete mode 100644 deps/npm/node_modules/has-ansi/package.json
 delete mode 100644 deps/npm/node_modules/hoek/package.json
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/.npmignore (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/LICENSE (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/README.md (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/example/buffer.js (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/example/index.js (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/example/npm-init/README.md (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/example/npm-init/init-input.js (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/example/npm-init/init.js (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/example/npm-init/package.json (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/example/substack-input.js (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/package.json (61%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/promzard.js (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/test/basic.js (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/test/buffer.js (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/test/exports.input (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/test/exports.js (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/test/fn.input (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/test/fn.js (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/test/simple.input (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/test/simple.js (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/test/validate.input (100%)
 rename deps/npm/node_modules/{ => init-package-json/node_modules}/promzard/test/validate.js (100%)
 delete mode 100644 deps/npm/node_modules/is-my-json-valid/package.json
 delete mode 100644 deps/npm/node_modules/is-property/package.json
 delete mode 100644 deps/npm/node_modules/isarray/package.json
 delete mode 100644 deps/npm/node_modules/isstream/package.json
 delete mode 100644 deps/npm/node_modules/json-stringify-safe/package.json
 delete mode 100644 deps/npm/node_modules/jsonpointer/package.json
 delete mode 100644 deps/npm/node_modules/lodash._basecopy/package.json
 rename deps/npm/node_modules/{lodash._basecallback => lodash.clonedeep/node_modules/lodash._baseclone}/LICENSE (100%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules}/lodash._baseclone/README.md (100%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules}/lodash._baseclone/index.js (100%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules}/lodash._arraycopy/LICENSE.txt (100%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules}/lodash._arraycopy/README.md (100%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules}/lodash._arraycopy/index.js (100%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules}/lodash._arraycopy/package.json (53%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules}/lodash._arrayeach/LICENSE.txt (100%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules}/lodash._arrayeach/README.md (100%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules}/lodash._arrayeach/index.js (100%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules}/lodash._arrayeach/package.json (53%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules}/lodash._baseassign/LICENSE.txt (100%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules}/lodash._baseassign/README.md (100%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules}/lodash._baseassign/index.js (100%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/node_modules}/lodash._basecopy/LICENSE.txt (100%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/node_modules}/lodash._basecopy/README.md (100%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/node_modules}/lodash._basecopy/index.js (100%)
 create mode 100644 deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/node_modules/lodash._basecopy/package.json
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules}/lodash._baseassign/package.json (51%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules}/lodash._basefor/LICENSE.txt (100%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules}/lodash._basefor/README.md (100%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules}/lodash._basefor/index.js (100%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules/lodash._baseclone/node_modules}/lodash._basefor/package.json (50%)
 rename deps/npm/node_modules/{ => lodash.clonedeep/node_modules}/lodash._baseclone/package.json (53%)
 rename deps/npm/node_modules/{lodash._baseclone => lodash.union/node_modules/lodash._baseflatten}/LICENSE (100%)
 rename deps/npm/node_modules/{ => lodash.union/node_modules}/lodash._baseflatten/README.md (100%)
 rename deps/npm/node_modules/{ => lodash.union/node_modules}/lodash._baseflatten/index.js (100%)
 rename deps/npm/node_modules/{ => lodash.union/node_modules}/lodash._baseflatten/package.json (52%)
 rename deps/npm/node_modules/{lodash._basedifference => lodash.uniq/node_modules/lodash._basecallback}/LICENSE (100%)
 rename deps/npm/node_modules/{ => lodash.uniq/node_modules}/lodash._basecallback/README.md (100%)
 rename deps/npm/node_modules/{ => lodash.uniq/node_modules}/lodash._basecallback/index.js (100%)
 rename deps/npm/node_modules/{ => lodash.uniq/node_modules/lodash._basecallback/node_modules}/lodash._baseisequal/LICENSE.txt (100%)
 rename deps/npm/node_modules/{ => lodash.uniq/node_modules/lodash._basecallback/node_modules}/lodash._baseisequal/README.md (100%)
 rename deps/npm/node_modules/{ => lodash.uniq/node_modules/lodash._basecallback/node_modules}/lodash._baseisequal/index.js (100%)
 rename deps/npm/node_modules/{lodash._isiterateecall => lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/node_modules/lodash.istypedarray}/LICENSE.txt (100%)
 rename deps/npm/node_modules/{ => lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/node_modules}/lodash.istypedarray/README.md (100%)
 rename deps/npm/node_modules/{ => lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/node_modules}/lodash.istypedarray/index.js (100%)
 rename deps/npm/node_modules/{ => lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/node_modules}/lodash.istypedarray/package.json (51%)
 rename deps/npm/node_modules/{ => lodash.uniq/node_modules/lodash._basecallback/node_modules}/lodash._baseisequal/package.json (52%)
 rename deps/npm/node_modules/{lodash.istypedarray => lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash.pairs}/LICENSE.txt (100%)
 rename deps/npm/node_modules/{ => lodash.uniq/node_modules/lodash._basecallback/node_modules}/lodash.pairs/README.md (100%)
 rename deps/npm/node_modules/{ => lodash.uniq/node_modules/lodash._basecallback/node_modules}/lodash.pairs/index.js (100%)
 rename deps/npm/node_modules/{ => lodash.uniq/node_modules/lodash._basecallback/node_modules}/lodash.pairs/package.json (52%)
 rename deps/npm/node_modules/{ => lodash.uniq/node_modules}/lodash._basecallback/package.json (53%)
 rename deps/npm/node_modules/{lodash.padleft => lodash.uniq/node_modules/lodash._isiterateecall}/LICENSE.txt (100%)
 rename deps/npm/node_modules/{ => lodash.uniq/node_modules}/lodash._isiterateecall/README.md (100%)
 rename deps/npm/node_modules/{ => lodash.uniq/node_modules}/lodash._isiterateecall/index.js (100%)
 rename deps/npm/node_modules/{ => lodash.uniq/node_modules}/lodash._isiterateecall/package.json (50%)
 rename deps/npm/node_modules/{lodash._baseflatten => lodash.without/node_modules/lodash._basedifference}/LICENSE (100%)
 rename deps/npm/node_modules/{ => lodash.without/node_modules}/lodash._basedifference/README.md (100%)
 rename deps/npm/node_modules/{ => lodash.without/node_modules}/lodash._basedifference/index.js (100%)
 rename deps/npm/node_modules/{ => lodash.without/node_modules}/lodash._basedifference/package.json (52%)
 delete mode 100644 deps/npm/node_modules/lru-cache/package.json
 delete mode 100644 deps/npm/node_modules/mime-types/package.json
 delete mode 100644 deps/npm/node_modules/minimatch/package.json
 delete mode 100644 deps/npm/node_modules/minimist/package.json
 rename deps/npm/node_modules/{ => mkdirp/node_modules}/minimist/.travis.yml (100%)
 create mode 100644 deps/npm/node_modules/mkdirp/node_modules/minimist/LICENSE
 rename deps/npm/node_modules/{ => mkdirp/node_modules}/minimist/example/parse.js (100%)
 rename deps/npm/node_modules/{ => mkdirp/node_modules}/minimist/index.js (100%)
 create mode 100644 deps/npm/node_modules/mkdirp/node_modules/minimist/package.json
 rename deps/npm/node_modules/{ => mkdirp/node_modules}/minimist/readme.markdown (100%)
 rename deps/npm/node_modules/{ => mkdirp/node_modules}/minimist/test/dash.js (100%)
 rename deps/npm/node_modules/{ => mkdirp/node_modules}/minimist/test/default_bool.js (100%)
 rename deps/npm/node_modules/{ => mkdirp/node_modules}/minimist/test/dotted.js (100%)
 rename deps/npm/node_modules/{ => mkdirp/node_modules}/minimist/test/long.js (100%)
 rename deps/npm/node_modules/{ => mkdirp/node_modules}/minimist/test/parse.js (100%)
 rename deps/npm/node_modules/{ => mkdirp/node_modules}/minimist/test/parse_modified.js (100%)
 rename deps/npm/node_modules/{ => mkdirp/node_modules}/minimist/test/short.js (100%)
 rename deps/npm/node_modules/{ => mkdirp/node_modules}/minimist/test/whitespace.js (100%)
 delete mode 100644 deps/npm/node_modules/ms/package.json
 delete mode 100644 deps/npm/node_modules/mute-stream/package.json
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore
 rename deps/npm/node_modules/{typedarray => node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match}/.travis.yml (100%)
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
 rename deps/npm/node_modules/{ => node-gyp/node_modules/minimatch/node_modules}/lru-cache/.npmignore (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/minimatch/node_modules}/lru-cache/.travis.yml (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/minimatch/node_modules}/lru-cache/CONTRIBUTORS (100%)
 rename deps/npm/node_modules/{minimatch => node-gyp/node_modules/minimatch/node_modules/lru-cache}/LICENSE (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/minimatch/node_modules}/lru-cache/README.md (89%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/minimatch/node_modules}/lru-cache/lib/lru-cache.js (85%)
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/package.json
 rename deps/npm/node_modules/{ => node-gyp/node_modules/minimatch/node_modules}/lru-cache/test/basic.js (92%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/minimatch/node_modules}/lru-cache/test/foreach.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/minimatch/node_modules}/lru-cache/test/memory-leak.js (100%)
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/test/serialize.js
 rename deps/npm/node_modules/{mute-stream => node-gyp/node_modules/minimatch/node_modules/sigmund}/LICENSE (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/minimatch/node_modules}/sigmund/README.md (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/minimatch/node_modules}/sigmund/bench.js (100%)
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/package.json
 rename deps/npm/node_modules/{ => node-gyp/node_modules/minimatch/node_modules}/sigmund/sigmund.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/minimatch/node_modules}/sigmund/test/basic.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules}/path-array/.npmignore (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules}/path-array/.travis.yml (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules}/path-array/History.md (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules}/path-array/README.md (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules}/path-array/index.js (100%)
 rename deps/npm/node_modules/{defaults => node-gyp/node_modules/path-array/node_modules/array-index}/.npmignore (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules}/array-index/.travis.yml (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules}/array-index/History.md (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules}/array-index/Makefile (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules}/array-index/README.md (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules}/array-index/component.json (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules}/array-index/index.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules/array-index/node_modules}/debug/.npmignore (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules/array-index/node_modules}/debug/History.md (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules/array-index/node_modules}/debug/Makefile (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules/array-index/node_modules}/debug/Readme.md (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules/array-index/node_modules}/debug/bower.json (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules/array-index/node_modules}/debug/browser.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules/array-index/node_modules}/debug/component.json (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules/array-index/node_modules}/debug/debug.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules/array-index/node_modules}/debug/node.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules}/ms/.npmignore (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules}/ms/History.md (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules}/ms/LICENSE (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules}/ms/README.md (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules}/ms/index.js (100%)
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/package.json
 create mode 100644 deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/package.json
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules}/array-index/package.json (65%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/path-array/node_modules}/array-index/test.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules}/path-array/package.json (66%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules}/path-array/test/test.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/tar/node_modules}/block-stream/LICENCE (100%)
 rename deps/npm/node_modules/{proto-list => node-gyp/node_modules/tar/node_modules/block-stream}/LICENSE (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/tar/node_modules}/block-stream/README.md (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/tar/node_modules}/block-stream/bench/block-stream-pause.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/tar/node_modules}/block-stream/bench/block-stream.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/tar/node_modules}/block-stream/bench/dropper-pause.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/tar/node_modules}/block-stream/bench/dropper.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/tar/node_modules}/block-stream/block-stream.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/tar/node_modules}/block-stream/package.json (65%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/tar/node_modules}/block-stream/test/basic.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/tar/node_modules}/block-stream/test/nopad-thorough.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/tar/node_modules}/block-stream/test/nopad.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/tar/node_modules}/block-stream/test/pause-resume.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/tar/node_modules}/block-stream/test/thorough.js (100%)
 rename deps/npm/node_modules/{ => node-gyp/node_modules/tar/node_modules}/block-stream/test/two-stream.js (96%)
 delete mode 100644 deps/npm/node_modules/node-uuid/package.json
 rename deps/npm/node_modules/{ => normalize-package-data/node_modules}/is-builtin-module/index.js (100%)
 rename deps/npm/node_modules/{builtin-modules => normalize-package-data/node_modules/is-builtin-module}/license (100%)
 rename deps/npm/node_modules/{ => normalize-package-data/node_modules/is-builtin-module/node_modules}/builtin-modules/builtin-modules.json (100%)
 rename deps/npm/node_modules/{ => normalize-package-data/node_modules/is-builtin-module/node_modules}/builtin-modules/index.js (100%)
 rename deps/npm/node_modules/{chalk => normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules}/license (100%)
 rename deps/npm/node_modules/{ => normalize-package-data/node_modules/is-builtin-module/node_modules}/builtin-modules/package.json (62%)
 rename deps/npm/node_modules/{ => normalize-package-data/node_modules/is-builtin-module/node_modules}/builtin-modules/readme.md (100%)
 rename deps/npm/node_modules/{ => normalize-package-data/node_modules/is-builtin-module/node_modules}/builtin-modules/static.js (100%)
 rename deps/npm/node_modules/{ => normalize-package-data/node_modules}/is-builtin-module/package.json (64%)
 rename deps/npm/node_modules/{ => normalize-package-data/node_modules}/is-builtin-module/readme.md (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules}/concat-stream/LICENSE (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules}/concat-stream/index.js (100%)
 rename deps/npm/node_modules/{bl => npm-registry-client/node_modules/concat-stream}/node_modules/readable-stream/.npmignore (100%)
 rename deps/npm/node_modules/{bl => npm-registry-client/node_modules/concat-stream}/node_modules/readable-stream/.travis.yml (100%)
 rename deps/npm/node_modules/{bl => npm-registry-client/node_modules/concat-stream}/node_modules/readable-stream/.zuul.yml (100%)
 rename deps/npm/node_modules/{bl => npm-registry-client/node_modules/concat-stream}/node_modules/readable-stream/LICENSE (100%)
 rename deps/npm/node_modules/{bl => npm-registry-client/node_modules/concat-stream}/node_modules/readable-stream/README.md (100%)
 rename deps/npm/node_modules/{bl => npm-registry-client/node_modules/concat-stream}/node_modules/readable-stream/doc/stream.markdown (100%)
 rename deps/npm/node_modules/{bl => npm-registry-client/node_modules/concat-stream}/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md (100%)
 rename deps/npm/node_modules/{bl => npm-registry-client/node_modules/concat-stream}/node_modules/readable-stream/duplex.js (100%)
 rename deps/npm/node_modules/{bl => npm-registry-client/node_modules/concat-stream}/node_modules/readable-stream/lib/_stream_duplex.js (100%)
 rename deps/npm/node_modules/{bl => npm-registry-client/node_modules/concat-stream}/node_modules/readable-stream/lib/_stream_passthrough.js (100%)
 rename deps/npm/node_modules/{bl => npm-registry-client/node_modules/concat-stream}/node_modules/readable-stream/lib/_stream_readable.js (100%)
 rename deps/npm/node_modules/{bl => npm-registry-client/node_modules/concat-stream}/node_modules/readable-stream/lib/_stream_transform.js (100%)
 rename deps/npm/node_modules/{bl => npm-registry-client/node_modules/concat-stream}/node_modules/readable-stream/lib/_stream_writable.js (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/core-util-is/README.md (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/core-util-is/float.patch (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/core-util-is/lib/util.js (100%)
 create mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/package.json
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/core-util-is/util.js (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/isarray/README.md (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/isarray/build/build.js (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/isarray/component.json (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/isarray/index.js (100%)
 create mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/package.json
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/process-nextick-args/.travis.yml (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/process-nextick-args/index.js (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/process-nextick-args/license.md (100%)
 create mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/package.json
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/process-nextick-args/readme.md (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/process-nextick-args/test.js (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/string_decoder/.npmignore (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/string_decoder/LICENSE (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/string_decoder/README.md (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/string_decoder/index.js (100%)
 create mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/package.json
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/util-deprecate/History.md (63%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/util-deprecate/LICENSE (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/util-deprecate/README.md (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/util-deprecate/browser.js (89%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules}/util-deprecate/node.js (100%)
 create mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/package.json
 create mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/package.json
 rename deps/npm/node_modules/{bl => npm-registry-client/node_modules/concat-stream}/node_modules/readable-stream/passthrough.js (100%)
 rename deps/npm/node_modules/{bl => npm-registry-client/node_modules/concat-stream}/node_modules/readable-stream/readable.js (100%)
 rename deps/npm/node_modules/{bl => npm-registry-client/node_modules/concat-stream}/node_modules/readable-stream/transform.js (100%)
 rename deps/npm/node_modules/{bl => npm-registry-client/node_modules/concat-stream}/node_modules/readable-stream/writable.js (100%)
 create mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/.travis.yml
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules}/typedarray/LICENSE (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules}/typedarray/example/tarray.js (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules}/typedarray/index.js (100%)
 create mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/package.json
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules}/typedarray/readme.markdown (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules}/typedarray/test/server/undef_globals.js (100%)
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules/concat-stream/node_modules}/typedarray/test/tarray.js (100%)
 create mode 100644 deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/package.json
 rename deps/npm/node_modules/{ => npm-registry-client/node_modules}/concat-stream/readme.md (100%)
 rename deps/npm/node_modules/{generate-function => npmlog/node_modules/ansi}/.npmignore (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/ansi/History.md (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/ansi/README.md (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/ansi/examples/beep/index.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/ansi/examples/clear/index.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/ansi/examples/cursorPosition.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/ansi/examples/progress/index.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/ansi/lib/ansi.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/ansi/lib/newlines.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/ansi/package.json (62%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/are-we-there-yet/.npmignore (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/are-we-there-yet/README.md (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/are-we-there-yet/index.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/are-we-there-yet/node_modules}/delegates/.npmignore (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/are-we-there-yet/node_modules}/delegates/History.md (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/are-we-there-yet/node_modules}/delegates/Makefile (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/are-we-there-yet/node_modules}/delegates/Readme.md (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/are-we-there-yet/node_modules}/delegates/index.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/are-we-there-yet/node_modules}/delegates/package.json (59%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/are-we-there-yet/node_modules}/delegates/test/index.js (100%)
 rename deps/npm/node_modules/{concat-stream => npmlog/node_modules/are-we-there-yet}/node_modules/readable-stream/.npmignore (100%)
 rename deps/npm/node_modules/{concat-stream => npmlog/node_modules/are-we-there-yet}/node_modules/readable-stream/LICENSE (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/are-we-there-yet/node_modules}/readable-stream/README.md (99%)
 rename deps/npm/node_modules/{concat-stream => npmlog/node_modules/are-we-there-yet}/node_modules/readable-stream/duplex.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/are-we-there-yet/node_modules}/readable-stream/float.patch (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/are-we-there-yet/node_modules}/readable-stream/lib/_stream_duplex.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/are-we-there-yet/node_modules}/readable-stream/lib/_stream_passthrough.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/are-we-there-yet/node_modules}/readable-stream/lib/_stream_readable.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/are-we-there-yet/node_modules}/readable-stream/lib/_stream_transform.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/are-we-there-yet/node_modules}/readable-stream/lib/_stream_writable.js (100%)
 create mode 100644 deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/README.md
 create mode 100644 deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/float.patch
 create mode 100644 deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
 create mode 100644 deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/package.json
 create mode 100644 deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/util.js
 create mode 100644 deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/README.md
 create mode 100644 deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/build/build.js
 create mode 100644 deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/component.json
 create mode 100644 deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/index.js
 create mode 100644 deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/package.json
 create mode 100644 deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/.npmignore
 create mode 100644 deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/LICENSE
 create mode 100644 deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/README.md
 create mode 100644 deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/index.js
 create mode 100644 deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/package.json
 create mode 100644 deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/package.json
 rename deps/npm/node_modules/{concat-stream => npmlog/node_modules/are-we-there-yet}/node_modules/readable-stream/passthrough.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/are-we-there-yet/node_modules}/readable-stream/readable.js (100%)
 rename deps/npm/node_modules/{concat-stream => npmlog/node_modules/are-we-there-yet}/node_modules/readable-stream/transform.js (100%)
 rename deps/npm/node_modules/{concat-stream => npmlog/node_modules/are-we-there-yet}/node_modules/readable-stream/writable.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/are-we-there-yet/package.json (63%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/are-we-there-yet/test/tracker.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/are-we-there-yet/test/trackergroup.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/are-we-there-yet/test/trackerstream.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/gauge/.npmignore (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/gauge/LICENSE (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/gauge/README.md (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/gauge/example.png (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules}/lodash._basetostring/LICENSE (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules}/lodash._basetostring/README.md (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules}/lodash._basetostring/index.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules}/lodash._basetostring/package.json (71%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules}/lodash._createpadding/LICENSE (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules}/lodash._createpadding/README.md (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules}/lodash._createpadding/index.js (100%)
 rename deps/npm/node_modules/{lodash.pad => npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat}/LICENSE (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules}/lodash.repeat/README.md (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules}/lodash.repeat/index.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules}/lodash.repeat/package.json (76%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules}/lodash._createpadding/package.json (72%)
 rename deps/npm/node_modules/{lodash.repeat => npmlog/node_modules/gauge/node_modules/lodash.pad}/LICENSE (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules}/lodash.pad/README.md (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules}/lodash.pad/index.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules}/lodash.pad/package.json (77%)
 rename deps/npm/node_modules/{lodash.padright => npmlog/node_modules/gauge/node_modules/lodash.padleft}/LICENSE.txt (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules}/lodash.padleft/README.md (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules}/lodash.padleft/index.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules}/lodash.padleft/package.json (77%)
 rename deps/npm/node_modules/{lodash.pairs => npmlog/node_modules/gauge/node_modules/lodash.padright}/LICENSE.txt (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules}/lodash.padright/README.md (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules}/lodash.padright/index.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules/gauge/node_modules}/lodash.padright/package.json (77%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/gauge/package.json (64%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/gauge/progress-bar.js (100%)
 rename deps/npm/node_modules/{ => npmlog/node_modules}/gauge/test/progress-bar.js (100%)
 delete mode 100644 deps/npm/node_modules/os-homedir/package.json
 delete mode 100644 deps/npm/node_modules/os-tmpdir/package.json
 rename deps/npm/node_modules/{ => osenv/node_modules}/os-homedir/index.js (100%)
 rename deps/npm/node_modules/{escape-string-regexp => osenv/node_modules/os-homedir}/license (100%)
 create mode 100644 deps/npm/node_modules/osenv/node_modules/os-homedir/package.json
 rename deps/npm/node_modules/{ => osenv/node_modules}/os-homedir/readme.md (100%)
 rename deps/npm/node_modules/{ => osenv/node_modules}/os-tmpdir/index.js (100%)
 rename deps/npm/node_modules/{has-ansi => osenv/node_modules/os-tmpdir}/license (100%)
 create mode 100644 deps/npm/node_modules/osenv/node_modules/os-tmpdir/package.json
 rename deps/npm/node_modules/{ => osenv/node_modules}/os-tmpdir/readme.md (100%)
 delete mode 100644 deps/npm/node_modules/path-is-absolute/package.json
 delete mode 100644 deps/npm/node_modules/process-nextick-args/package.json
 delete mode 100644 deps/npm/node_modules/proto-list/package.json
 delete mode 100644 deps/npm/node_modules/qs/package.json
 rename deps/npm/node_modules/{ => read-installed/node_modules}/util-extend/README.md (100%)
 rename deps/npm/node_modules/{ => read-installed/node_modules}/util-extend/extend.js (100%)
 rename deps/npm/node_modules/{ => read-installed/node_modules}/util-extend/package.json (61%)
 rename deps/npm/node_modules/{ => read-installed/node_modules}/util-extend/test.js (100%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules}/json-parse-helpfulerror/.editorconfig (100%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules}/json-parse-helpfulerror/.npmignore (100%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules}/json-parse-helpfulerror/LICENSE (100%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules}/json-parse-helpfulerror/README.md (100%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules}/json-parse-helpfulerror/index.js (100%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules/json-parse-helpfulerror/node_modules}/jju/.npmignore (100%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules/json-parse-helpfulerror/node_modules}/jju/README.md (100%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules/json-parse-helpfulerror/node_modules}/jju/index.js (100%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules/json-parse-helpfulerror/node_modules}/jju/lib/analyze.js (100%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules/json-parse-helpfulerror/node_modules}/jju/lib/document.js (100%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules/json-parse-helpfulerror/node_modules}/jju/lib/parse.js (100%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules/json-parse-helpfulerror/node_modules}/jju/lib/stringify.js (100%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules/json-parse-helpfulerror/node_modules}/jju/lib/unicode.js (100%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules/json-parse-helpfulerror/node_modules}/jju/lib/utils.js (100%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules/json-parse-helpfulerror/node_modules}/jju/package.json (54%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules/json-parse-helpfulerror/node_modules}/jju/package.yaml (100%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules}/json-parse-helpfulerror/package.json (58%)
 rename deps/npm/node_modules/{ => read-package-json/node_modules}/json-parse-helpfulerror/test/test.js (100%)
 rename deps/npm/node_modules/{sigmund => read/node_modules/mute-stream}/LICENSE (100%)
 rename deps/npm/node_modules/{ => read/node_modules}/mute-stream/README.md (100%)
 rename deps/npm/node_modules/{ => read/node_modules}/mute-stream/mute.js (100%)
 create mode 100644 deps/npm/node_modules/read/node_modules/mute-stream/package.json
 rename deps/npm/node_modules/{ => read/node_modules}/mute-stream/test/basic.js (100%)
 delete mode 100644 deps/npm/node_modules/readable-stream/package.json
 rename deps/npm/node_modules/{ => request/node_modules}/aws-sign2/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/aws-sign2/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/aws-sign2/index.js (86%)
 create mode 100644 deps/npm/node_modules/request/node_modules/aws-sign2/package.json
 rename deps/npm/node_modules/{ => request/node_modules}/bl/.npmignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/bl/.travis.yml (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/bl/LICENSE.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/bl/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/bl/bl.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/bl/node_modules}/readable-stream/.npmignore (100%)
 rename deps/npm/node_modules/{concat-stream => request/node_modules/bl}/node_modules/readable-stream/.travis.yml (100%)
 rename deps/npm/node_modules/{concat-stream => request/node_modules/bl}/node_modules/readable-stream/.zuul.yml (100%)
 rename deps/npm/node_modules/{ => request/node_modules/bl/node_modules}/readable-stream/LICENSE (100%)
 rename deps/npm/node_modules/{concat-stream => request/node_modules/bl}/node_modules/readable-stream/README.md (100%)
 rename deps/npm/node_modules/{concat-stream => request/node_modules/bl}/node_modules/readable-stream/doc/stream.markdown (100%)
 rename deps/npm/node_modules/{concat-stream => request/node_modules/bl}/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/bl/node_modules}/readable-stream/duplex.js (100%)
 rename deps/npm/node_modules/{concat-stream => request/node_modules/bl}/node_modules/readable-stream/lib/_stream_duplex.js (100%)
 rename deps/npm/node_modules/{concat-stream => request/node_modules/bl}/node_modules/readable-stream/lib/_stream_passthrough.js (100%)
 rename deps/npm/node_modules/{concat-stream => request/node_modules/bl}/node_modules/readable-stream/lib/_stream_readable.js (100%)
 rename deps/npm/node_modules/{concat-stream => request/node_modules/bl}/node_modules/readable-stream/lib/_stream_transform.js (100%)
 rename deps/npm/node_modules/{concat-stream => request/node_modules/bl}/node_modules/readable-stream/lib/_stream_writable.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/README.md
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/float.patch
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/package.json
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/util.js
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/README.md
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/build/build.js
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/component.json
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/index.js
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/index.js
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/license.md
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/package.json
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/readme.md
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/test.js
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/.npmignore
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/LICENSE
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/README.md
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/index.js
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/package.json
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/History.md
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/LICENSE
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/README.md
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/browser.js
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/node.js
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/package.json
 create mode 100644 deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/package.json
 rename deps/npm/node_modules/{ => request/node_modules/bl/node_modules}/readable-stream/passthrough.js (100%)
 rename deps/npm/node_modules/{concat-stream => request/node_modules/bl}/node_modules/readable-stream/readable.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/bl/node_modules}/readable-stream/transform.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/bl/node_modules}/readable-stream/writable.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/bl/package.json (61%)
 rename deps/npm/node_modules/{ => request/node_modules}/bl/test/basic-test.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/bl/test/sauce.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/bl/test/test.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/caseless/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/caseless/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/caseless/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/caseless/package.json (64%)
 rename deps/npm/node_modules/{ => request/node_modules}/caseless/test.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/combined-stream/License (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/combined-stream/Readme.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/combined-stream/lib/combined_stream.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/combined-stream/node_modules}/delayed-stream/.npmignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules/combined-stream/node_modules}/delayed-stream/License (100%)
 rename deps/npm/node_modules/{ => request/node_modules/combined-stream/node_modules}/delayed-stream/Makefile (100%)
 rename deps/npm/node_modules/{ => request/node_modules/combined-stream/node_modules}/delayed-stream/Readme.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/combined-stream/node_modules}/delayed-stream/lib/delayed_stream.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/combined-stream/node_modules}/delayed-stream/package.json (69%)
 rename deps/npm/node_modules/{ => request/node_modules}/combined-stream/package.json (68%)
 rename deps/npm/node_modules/{ => request/node_modules}/extend/.jscs.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/extend/.npmignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/extend/.travis.yml (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/extend/CHANGELOG.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/extend/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/extend/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/extend/component.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/extend/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/extend/package.json (70%)
 rename deps/npm/node_modules/{ => request/node_modules}/forever-agent/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/forever-agent/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/forever-agent/index.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/forever-agent/package.json
 rename deps/npm/node_modules/{ => request/node_modules}/form-data/License (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/form-data/Readme.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/form-data/lib/browser.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/form-data/lib/form_data.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/form-data/node_modules}/async/CHANGELOG.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/form-data/node_modules}/async/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules/form-data/node_modules}/async/lib/async.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/form-data/node_modules}/async/package.json (59%)
 rename deps/npm/node_modules/{ => request/node_modules}/form-data/package.json (74%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/README.md (54%)
 create mode 100755 deps/npm/node_modules/request/node_modules/har-validator/bin/har-validator
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/lib/async.js
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/lib/error.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/lib/index.js
 rename deps/npm/node_modules/{har-validator/lib/index.js => request/node_modules/har-validator/lib/runner.js} (56%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/lib/schemas/cache.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/lib/schemas/cacheEntry.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/lib/schemas/content.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/lib/schemas/cookie.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/lib/schemas/creator.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/lib/schemas/entry.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/lib/schemas/har.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/lib/schemas/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/lib/schemas/log.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/lib/schemas/page.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/lib/schemas/pageTimings.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/lib/schemas/postData.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/lib/schemas/record.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/lib/schemas/request.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/lib/schemas/response.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/lib/schemas/timings.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/chalk/index.js (100%)
 rename deps/npm/node_modules/{is-builtin-module => request/node_modules/har-validator/node_modules/chalk}/license (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/chalk/node_modules}/ansi-styles/index.js (100%)
 rename deps/npm/node_modules/{os-homedir => request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles}/license (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/package.json
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/chalk/node_modules}/ansi-styles/readme.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/chalk/node_modules}/escape-string-regexp/index.js (100%)
 rename deps/npm/node_modules/{os-tmpdir => request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp}/license (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/package.json
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/chalk/node_modules}/escape-string-regexp/readme.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/chalk/node_modules}/has-ansi/index.js (100%)
 rename deps/npm/node_modules/{path-is-absolute => request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi}/license (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/package.json
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/chalk/node_modules}/has-ansi/readme.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/chalk/node_modules}/supports-color/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/chalk/node_modules}/supports-color/license (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/package.json
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/chalk/node_modules}/supports-color/readme.md (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/package.json
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/chalk/readme.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/commander/History.md (96%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/commander/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/commander/Readme.md (93%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/commander/index.js (95%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/commander/node_modules}/graceful-readlink/.npmignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/commander/node_modules}/graceful-readlink/.travis.yml (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/commander/node_modules}/graceful-readlink/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/commander/node_modules}/graceful-readlink/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/commander/node_modules}/graceful-readlink/index.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/package.json
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/package.json
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/.npmignore (100%)
 rename deps/npm/node_modules/{generate-function => request/node_modules/har-validator/node_modules/is-my-json-valid}/.travis.yml (100%)
 rename deps/npm/node_modules/{generate-object-property => request/node_modules/har-validator/node_modules/is-my-json-valid}/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/example.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/formats.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/index.js (100%)
 rename deps/npm/node_modules/{generate-object-property => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function}/.npmignore (100%)
 rename deps/npm/node_modules/{generate-object-property => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function}/.travis.yml (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/generate-function/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/generate-function/example.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/generate-function/index.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/package.json
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/generate-function/test.js (100%)
 rename deps/npm/node_modules/{wcwidth => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property}/.npmignore (100%)
 rename deps/npm/node_modules/{is-my-json-valid => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property}/.travis.yml (100%)
 rename deps/npm/node_modules/{is-my-json-valid => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property}/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/generate-object-property/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/generate-object-property/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules}/is-property/.npmignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules}/is-property/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules}/is-property/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules}/is-property/is-property.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/package.json
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/package.json
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/generate-object-property/test.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/jsonpointer/.travis.yml (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/jsonpointer/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/jsonpointer/jsonpointer.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/jsonpointer/test.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/xtend/.npmignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/xtend/LICENCE (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/xtend/Makefile (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/xtend/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/xtend/immutable.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/xtend/mutable.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/package.json
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules}/xtend/test.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/require.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/fixtures/cosmic.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/additionalItems.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/additionalProperties.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/allOf.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/anyOf.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/bignum.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/default.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/definitions.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/dependencies.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/enum.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/format.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/items.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/maxItems.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/maxLength.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/maxProperties.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/maximum.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/minItems.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/minLength.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/minProperties.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/minimum.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/multipleOf.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/not.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/nullAndFormat.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/nullAndObject.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/oneOf.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/pattern.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/patternProperties.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/properties.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/ref.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/refRemote.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/required.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/type.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema-draft4/uniqueItems.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/json-schema.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/har-validator/node_modules}/is-my-json-valid/test/misc.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/index.js
 rename deps/npm/node_modules/{bluebird/LICENSE => request/node_modules/har-validator/node_modules/pinkie-promise/license} (86%)
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/index.js
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/license
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/package.json
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/readme.md
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/package.json
 create mode 100644 deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/readme.md
 rename deps/npm/node_modules/{ => request/node_modules}/har-validator/package.json (51%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/.npmignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/.travis.yml (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/bower.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/component.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/example/usage.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/images/hawk.png (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/images/logo.png (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/lib/browser.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/lib/client.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/lib/crypto.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/lib/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/lib/server.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/lib/utils.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/boom/.npmignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/boom/.travis.yml (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/boom/CONTRIBUTING.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/boom/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/boom/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/boom/images/boom.png (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/boom/lib/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/boom/package.json (68%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/boom/test/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/cryptiles/.npmignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/cryptiles/.travis.yml (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/cryptiles/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/cryptiles/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/cryptiles/lib/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/cryptiles/package.json (68%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/cryptiles/test/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/hoek/.npmignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/hoek/.travis.yml (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/hoek/CONTRIBUTING.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/hoek/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/hoek/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/hoek/images/hoek.png (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/hoek/lib/escape.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/hoek/lib/index.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/package.json
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/hoek/test/escaper.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/hoek/test/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/hoek/test/modules/ignore.txt (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/hoek/test/modules/test1.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/hoek/test/modules/test2.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/hoek/test/modules/test3.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/sntp/.npmignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/sntp/.travis.yml (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/sntp/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/sntp/Makefile (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/sntp/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/sntp/examples/offset.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/sntp/examples/time.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/sntp/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/sntp/lib/index.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/package.json
 rename deps/npm/node_modules/{ => request/node_modules/hawk/node_modules}/sntp/test/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/package.json (70%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/test/browser.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/test/client.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/test/crypto.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/test/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/test/readme.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/test/server.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/test/uri.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/hawk/test/utils.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/http-signature/.dir-locals.el (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/http-signature/.npmignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/http-signature/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/http-signature/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/http-signature/http_signing.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/http-signature/lib/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/http-signature/lib/parser.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/http-signature/lib/signer.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/http-signature/lib/util.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/http-signature/lib/verify.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/asn1/.npmignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/asn1/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/asn1/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/asn1/lib/ber/errors.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/asn1/lib/ber/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/asn1/lib/ber/reader.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/asn1/lib/ber/types.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/asn1/lib/ber/writer.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/asn1/lib/index.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/package.json
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/asn1/tst/ber/reader.test.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/asn1/tst/ber/writer.test.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/assert-plus/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/assert-plus/assert.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/ctype/.npmignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/ctype/CHANGELOG (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/ctype/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/ctype/README (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/ctype/README.old (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/ctype/ctf.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/ctype/ctio.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/ctype/ctype.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/ctype/man/man3ctype/ctio.3ctype (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/ctype/tools/jsl.conf (100%)
 rename deps/npm/node_modules/{ => request/node_modules/http-signature/node_modules}/ctype/tools/jsstyle (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/http-signature/package.json (71%)
 rename deps/npm/node_modules/{ => request/node_modules}/isstream/.npmignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/isstream/.travis.yml (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/isstream/LICENSE.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/isstream/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/isstream/isstream.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/isstream/package.json
 rename deps/npm/node_modules/{ => request/node_modules}/isstream/test.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/json-stringify-safe/.npmignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/json-stringify-safe/CHANGELOG.md (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/json-stringify-safe/LICENSE
 rename deps/npm/node_modules/{ => request/node_modules}/json-stringify-safe/Makefile (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/json-stringify-safe/README.md (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/json-stringify-safe/package.json
 rename deps/npm/node_modules/{ => request/node_modules}/json-stringify-safe/stringify.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/json-stringify-safe/test/mocha.opts (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/json-stringify-safe/test/stringify_test.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/mime-types/HISTORY.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/mime-types/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/mime-types/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/mime-types/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/mime-types/node_modules}/mime-db/HISTORY.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/mime-types/node_modules}/mime-db/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules/mime-types/node_modules}/mime-db/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules/mime-types/node_modules}/mime-db/db.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules/mime-types/node_modules}/mime-db/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules/mime-types/node_modules}/mime-db/package.json (79%)
 create mode 100644 deps/npm/node_modules/request/node_modules/mime-types/package.json
 create mode 100644 deps/npm/node_modules/request/node_modules/node-uuid/.npmignore
 rename deps/npm/node_modules/{ => request/node_modules}/node-uuid/LICENSE.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/node-uuid/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/node-uuid/benchmark/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/node-uuid/benchmark/bench.gnu (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/node-uuid/benchmark/bench.sh (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/node-uuid/benchmark/benchmark-native.c (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/node-uuid/benchmark/benchmark.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/node-uuid/bin/uuid (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/node-uuid/bower.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/node-uuid/component.json (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/node-uuid/package.json
 rename deps/npm/node_modules/{ => request/node_modules}/node-uuid/test/compare_v1.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/node-uuid/test/test.html (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/node-uuid/test/test.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/node-uuid/uuid.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/oauth-sign/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/oauth-sign/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/oauth-sign/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/oauth-sign/package.json (70%)
 rename deps/npm/node_modules/{ => request/node_modules}/oauth-sign/test.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/qs/.eslintignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/qs/.npmignore (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/qs/.travis.yml (90%)
 rename deps/npm/node_modules/{ => request/node_modules}/qs/CHANGELOG.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/qs/CONTRIBUTING.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/qs/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/qs/README.md (96%)
 rename deps/npm/node_modules/{ => request/node_modules}/qs/bower.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/qs/component.json (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/qs/dist/qs.js (94%)
 rename deps/npm/node_modules/{ => request/node_modules}/qs/lib/index.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/qs/lib/parse.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/qs/lib/stringify.js (90%)
 rename deps/npm/node_modules/{ => request/node_modules}/qs/lib/utils.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/qs/package.json
 rename deps/npm/node_modules/{ => request/node_modules}/qs/test/parse.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/qs/test/stringify.js (95%)
 rename deps/npm/node_modules/{ => request/node_modules}/qs/test/utils.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/stringstream/.npmignore (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/stringstream/.travis.yml
 rename deps/npm/node_modules/{ => request/node_modules}/stringstream/LICENSE.txt (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/stringstream/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/stringstream/example.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/stringstream/package.json (59%)
 rename deps/npm/node_modules/{ => request/node_modules}/stringstream/stringstream.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/tough-cookie/LICENSE
 rename deps/npm/node_modules/{ => request/node_modules}/tough-cookie/README.md (95%)
 rename deps/npm/node_modules/{ => request/node_modules}/tough-cookie/lib/cookie.js (95%)
 rename deps/npm/node_modules/{ => request/node_modules}/tough-cookie/lib/memstore.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/tough-cookie/lib/pathMatch.js (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/tough-cookie/lib/permuteDomain.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/tough-cookie/lib/pubsuffix.js
 rename deps/npm/node_modules/{ => request/node_modules}/tough-cookie/lib/store.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/tough-cookie/package.json
 rename deps/npm/node_modules/{ => request/node_modules}/tunnel-agent/LICENSE (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/tunnel-agent/README.md (100%)
 rename deps/npm/node_modules/{ => request/node_modules}/tunnel-agent/index.js (100%)
 create mode 100644 deps/npm/node_modules/request/node_modules/tunnel-agent/package.json
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/README.md
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/float.patch
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/package.json
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/util.js
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/README.md
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/build/build.js
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/component.json
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/index.js
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/package.json
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/index.js
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/license.md
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/package.json
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/readme.md
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/test.js
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/.npmignore
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/LICENSE
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/README.md
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/index.js
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/package.json
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/History.md
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/LICENSE
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/README.md
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/browser.js
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/node.js
 create mode 100644 deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/package.json
 delete mode 100644 deps/npm/node_modules/sigmund/package.json
 delete mode 100644 deps/npm/node_modules/sntp/package.json
 delete mode 100644 deps/npm/node_modules/spdx-exceptions/.npmignore
 delete mode 100644 deps/npm/node_modules/spdx-exceptions/LICENSE.md
 delete mode 100644 deps/npm/node_modules/spdx-exceptions/README.md
 delete mode 100644 deps/npm/node_modules/spdx-exceptions/package.json
 delete mode 100644 deps/npm/node_modules/string_decoder/package.json
 delete mode 100644 deps/npm/node_modules/supports-color/package.json
 create mode 100644 deps/npm/node_modules/tar/node_modules/block-stream/LICENCE
 create mode 100644 deps/npm/node_modules/tar/node_modules/block-stream/LICENSE
 create mode 100644 deps/npm/node_modules/tar/node_modules/block-stream/README.md
 create mode 100644 deps/npm/node_modules/tar/node_modules/block-stream/bench/block-stream-pause.js
 create mode 100644 deps/npm/node_modules/tar/node_modules/block-stream/bench/block-stream.js
 create mode 100644 deps/npm/node_modules/tar/node_modules/block-stream/bench/dropper-pause.js
 create mode 100644 deps/npm/node_modules/tar/node_modules/block-stream/bench/dropper.js
 create mode 100644 deps/npm/node_modules/tar/node_modules/block-stream/block-stream.js
 create mode 100644 deps/npm/node_modules/tar/node_modules/block-stream/package.json
 create mode 100644 deps/npm/node_modules/tar/node_modules/block-stream/test/basic.js
 create mode 100644 deps/npm/node_modules/tar/node_modules/block-stream/test/nopad-thorough.js
 create mode 100644 deps/npm/node_modules/tar/node_modules/block-stream/test/nopad.js
 create mode 100644 deps/npm/node_modules/tar/node_modules/block-stream/test/pause-resume.js
 create mode 100644 deps/npm/node_modules/tar/node_modules/block-stream/test/thorough.js
 create mode 100644 deps/npm/node_modules/tar/node_modules/block-stream/test/two-stream.js
 delete mode 100644 deps/npm/node_modules/tough-cookie/.editorconfig
 delete mode 100644 deps/npm/node_modules/tough-cookie/.npmignore
 delete mode 100644 deps/npm/node_modules/tough-cookie/.travis.yml
 delete mode 100644 deps/npm/node_modules/tough-cookie/LICENSE
 delete mode 100644 deps/npm/node_modules/tough-cookie/generate-pubsuffix.js
 delete mode 100644 deps/npm/node_modules/tough-cookie/lib/pubsuffix.js
 delete mode 100644 deps/npm/node_modules/tough-cookie/package.json
 delete mode 100644 deps/npm/node_modules/tough-cookie/public-suffix.txt
 delete mode 100644 deps/npm/node_modules/tough-cookie/test/api_test.js
 delete mode 100644 deps/npm/node_modules/tough-cookie/test/cookie_jar_test.js
 delete mode 100644 deps/npm/node_modules/tough-cookie/test/cookie_sorting_test.js
 delete mode 100644 deps/npm/node_modules/tough-cookie/test/cookie_to_json_test.js
 delete mode 100644 deps/npm/node_modules/tough-cookie/test/cookie_to_string_test.js
 delete mode 100644 deps/npm/node_modules/tough-cookie/test/date_test.js
 delete mode 100644 deps/npm/node_modules/tough-cookie/test/domain_and_path_test.js
 delete mode 100644 deps/npm/node_modules/tough-cookie/test/ietf_data/dates/bsd-examples.json
 delete mode 100644 deps/npm/node_modules/tough-cookie/test/ietf_data/dates/examples.json
 delete mode 100644 deps/npm/node_modules/tough-cookie/test/ietf_data/parser.json
 delete mode 100644 deps/npm/node_modules/tough-cookie/test/ietf_test.js
 delete mode 100644 deps/npm/node_modules/tough-cookie/test/jar_serialization_test.js
 delete mode 100644 deps/npm/node_modules/tough-cookie/test/lifetime_test.js
 delete mode 100644 deps/npm/node_modules/tough-cookie/test/parsing_test.js
 delete mode 100644 deps/npm/node_modules/tough-cookie/test/regression_test.js
 delete mode 100644 deps/npm/node_modules/tunnel-agent/package.json
 delete mode 100644 deps/npm/node_modules/typedarray/package.json
 rename deps/npm/node_modules/{ => unique-filename/node_modules}/unique-slug/.npmignore (100%)
 rename deps/npm/node_modules/{ => unique-filename/node_modules}/unique-slug/README.md (100%)
 rename deps/npm/node_modules/{ => unique-filename/node_modules}/unique-slug/index.js (100%)
 rename deps/npm/node_modules/{ => unique-filename/node_modules}/unique-slug/package.json (63%)
 rename deps/npm/node_modules/{ => unique-filename/node_modules}/unique-slug/test/index.js (100%)
 delete mode 100644 deps/npm/node_modules/util-deprecate/package.json
 rename deps/npm/node_modules/{ => validate-npm-package-license/node_modules}/spdx-correct/README.md (100%)
 rename deps/npm/node_modules/{ => validate-npm-package-license/node_modules}/spdx-correct/index.js (100%)
 rename deps/npm/node_modules/{ => validate-npm-package-license/node_modules}/spdx-correct/package.json (68%)
 rename deps/npm/node_modules/{ => validate-npm-package-license/node_modules}/spdx-expression-parse/LICENSE (100%)
 rename deps/npm/node_modules/{ => validate-npm-package-license/node_modules}/spdx-expression-parse/README.md (100%)
 rename deps/npm/node_modules/{ => validate-npm-package-license/node_modules}/spdx-expression-parse/index.js (100%)
 create mode 100644 deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/README.md
 rename deps/npm/node_modules/{ => validate-npm-package-license/node_modules/spdx-expression-parse/node_modules}/spdx-exceptions/index.json (100%)
 create mode 100644 deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/package.json
 rename deps/npm/node_modules/{ => validate-npm-package-license/node_modules}/spdx-expression-parse/package.json (66%)
 rename deps/npm/node_modules/{ => validate-npm-package-license/node_modules}/spdx-expression-parse/parser.generated.js (100%)
 rename deps/npm/node_modules/{ => validate-npm-package-license/node_modules}/spdx-license-ids/LICENSE (100%)
 rename deps/npm/node_modules/{ => validate-npm-package-license/node_modules}/spdx-license-ids/README.md (100%)
 rename deps/npm/node_modules/{ => validate-npm-package-license/node_modules}/spdx-license-ids/package.json (71%)
 rename deps/npm/node_modules/{ => validate-npm-package-license/node_modules}/spdx-license-ids/spdx-license-ids.json (100%)
 create mode 100644 deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/.travis.yml
 rename deps/npm/node_modules/{ => validate-npm-package-name/node_modules}/builtins/History.md (100%)
 rename deps/npm/node_modules/{ => validate-npm-package-name/node_modules}/builtins/Readme.md (100%)
 rename deps/npm/node_modules/{ => validate-npm-package-name/node_modules}/builtins/builtins.json (100%)
 rename deps/npm/node_modules/{ => validate-npm-package-name/node_modules}/builtins/package.json (57%)
 rename deps/npm/node_modules/{ => which/node_modules}/is-absolute/LICENSE (100%)
 rename deps/npm/node_modules/{ => which/node_modules}/is-absolute/README.md (100%)
 rename deps/npm/node_modules/{ => which/node_modules}/is-absolute/index.js (100%)
 rename deps/npm/node_modules/{ => which/node_modules/is-absolute/node_modules}/is-relative/LICENSE-MIT (100%)
 rename deps/npm/node_modules/{ => which/node_modules/is-absolute/node_modules}/is-relative/README.md (100%)
 rename deps/npm/node_modules/{ => which/node_modules/is-absolute/node_modules}/is-relative/index.js (100%)
 rename deps/npm/node_modules/{ => which/node_modules/is-absolute/node_modules}/is-relative/package.json (69%)
 rename deps/npm/node_modules/{ => which/node_modules}/is-absolute/package.json (72%)
 create mode 100644 deps/npm/node_modules/which/test/bin.js
 delete mode 100644 deps/npm/node_modules/xtend/package.json
 delete mode 100644 deps/npm/scripts/installable.sh
 delete mode 100644 deps/npm/test/fixtures/config/userconfig-with-gc
 create mode 100644 deps/npm/test/tap/shrinkwrap-optional-dependency.js
 create mode 100644 deps/npm/test/tap/shrinkwrap-save-with-existing-dev-deps.js
 create mode 100644 deps/npm/test/tap/unit-child-path.js
 create mode 100644 deps/npm/test/tap/unit-deps-replaceModule.js
 create mode 100644 deps/npm/test/tap/unit-module-name.js
 create mode 100644 deps/npm/test/tap/unit-package-id.js

diff --git a/deps/npm/.mailmap b/deps/npm/.mailmap
index 55383ba8df11d2..14d71809c1d708 100644
--- a/deps/npm/.mailmap
+++ b/deps/npm/.mailmap
@@ -43,7 +43,9 @@ Rebecca Turner <me@re-becca.org> <turner@mikomi.org>
 Rebecca Turner <me@re-becca.org> <rebecca@npmjs.com>
 Ryan Emery <seebees@gmail.com>
 Sam Mikes <smikes@cubane.com>
+Stephanie Snopek <stephaniesnopek@gmail.com>
 Takaya Kobayashi <jigsaw@live.jp>
+Thomas Reggi <thomas@reggi.com>
 Timo Weiß <timoweiss@Timo-MBP.local>
 Tony <zearin@gonk.net>
 Trent Mick <trentm@gmail.com> <trent.mick@joyent.com>
diff --git a/deps/npm/.travis.yml b/deps/npm/.travis.yml
index e5828a39759b6e..d0cde08d369054 100644
--- a/deps/npm/.travis.yml
+++ b/deps/npm/.travis.yml
@@ -1,5 +1,7 @@
 language: node_js
 node_js:
+  - "4.1"
+  - "4.0"
   - iojs
   - "0.12"
   - "0.10"
diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS
index cbafe00659c6bd..6ed24fdd6f907c 100644
--- a/deps/npm/AUTHORS
+++ b/deps/npm/AUTHORS
@@ -313,3 +313,14 @@ Jon Hall <jon_hall@outlook.com>
 Anna Henningsen <sqrt@entless.org>
 James Treworgy <jamietre@gmail.com>
 James Hartig <james@levenlabs.com>
+Stephanie Snopek <stephaniesnopek@gmail.com>
+Kent C. Dodds <kent@doddsfamily.us>
+Aaron Krause <aaronjkrause@gmail.com>
+Daniel K O'Leary <daniel@dko.io>
+fscherwi <fscherwi@users.noreply.github.com>
+Thomas Reggi <thomas@reggi.com>
+Thomas Michael McTiernan <thomasmctiernan@gmail.com>
+Jason Kurian <JaKXz@users.noreply.github.com>
+Sebastiaan Deckers <seb@ninja.sg>
+lady3bean <lady3bean@users.noreply.github.com>
+Tomi Carr <TaMe3971@users.noreply.github.com>
diff --git a/deps/npm/CHANGELOG.md b/deps/npm/CHANGELOG.md
index d4c1ba4aa2fa8f..a37a68bd7c965e 100644
--- a/deps/npm/CHANGELOG.md
+++ b/deps/npm/CHANGELOG.md
@@ -1,20 +1,292 @@
+### v3.3.10 (2015-10-22):
+
+Hey you all!  Welcome to a busy bug fix and PR week.  We've got changes
+to how `npm install` replaces dependencies during updates, improvements
+to shrinkwrap behavior, and all sorts of doc updates.
+
+In other news, `npm@3` landed in node master in preparation for `node@5`
+with [`41923c0`](https://github.com/nodejs/node/commit/41923c0).
+
+#### UPDATED DEPS NOW MAKE MORE SENSE
+
+* [`971fd47`](https://github.com/npm/npm/commit/971fd47)
+  [#9929](https://github.com/npm/npm/pull/9929)
+  Make the tree more consistent by doing updates in place. This means
+  that trees after a dependency version update will more often look
+  the same as after a fresh install.
+  ([@iarna](https://github.com/iarna))
+
+#### SHRINKWRAP + DEV DEPS NOW RESPECTED
+
+* [`eb28a8c`](https://github.com/npm/npm/commit/eb28a8c)
+  [#9647](https://github.com/npm/npm/issues/9647)
+  If a shrinkwrap already has dev deps, don't throw them away when
+  someone later runs `npm install --save`.
+  ([@iarna](https://github.com/iarna))
+
+#### FANTASTIC DOCUMENTATION UPDATES
+
+* [`291162c`](https://github.com/npm/npm/commit/291162c)
+  [#10021](https://github.com/npm/npm/pull/10021)
+  Improve wording in the FAQ to be more empathetic and less jokey.
+  ([@TaMe3971](https://github.com/TaMe3971))
+* [`9a28c54`](https://github.com/npm/npm/commit/9a28c54)
+  [#10020](https://github.com/npm/npm/pull/10020)
+  Document the command to see the list of config defaults in the section
+  on config defaults.
+  ([@lady3bean](https://github.com/lady3bean))
+* [`8770b0a`](https://github.com/npm/npm/commit/8770b0a)
+  [#7600](https://github.com/npm/npm/issues/7600)
+  Add shortcuts to all command documentation.
+  ([@RichardLitt](https://github.com/RichardLitt))
+* [`e9b7d0d`](https://github.com/npm/npm/commit/e9b7d0d)
+  [#9950](https://github.com/npm/npm/pull/9950)
+  On errors that can be caused by outdated node & npm, suggest updating
+  as a part of the error message.
+  ([@ForbesLindesay](https://github.com/ForbesLindesay))
+
+#### NEW STANDARD HAS ALWAYS BEEN STANDARD
+
+* [`40c1b0f`](https://github.com/npm/npm/commit/40c1b0f)
+  [#9954](https://github.com/npm/npm/pull/9954)
+  Update to `standard@5` and reformat the source to work with it.
+  ([@cbas](https://github.com/cbas))
+
+### v3.3.9 (2015-10-15):
+
+This week sees a few small changes ready to land:
+
+#### TRAVIS NODE 0.8 BUILDS REJOICE
+
+* [`25a234b`](https://github.com/npm/npm/commit/25a234b)
+  [#9668](https://github.com/npm/npm/issues/9668)
+  Install `npm@3`'s bundled dependencies with `npm@2`, so that the ancient npm
+  that ships with node 0.8 can install `npm@3` directly.
+  ([@othiym23](https://github.com/othiym23))
+
+#### SMALL ERROR MESSAGE IMPROVEMENT
+
+* [`a332f61`](https://github.com/npm/npm/commit/a332f61)
+  [#9927](https://github.com/npm/npm/pull/9927)
+  Update error messages where we report a list of versions that you could
+  have installed to show this as a comma separated list instead of as JSON.
+  ([@iarna](https://github.com/iarna))
+
+#### DEPENDENCY UPDATES
+
+* [`4cd74b0`](https://github.com/npm/npm/commit/4cd74b0)
+  `nock@2.15.0`
+  ([@pgte](https://github.com/pgte))
+* [`9360976`](https://github.com/npm/npm/commit/9360976)
+  `tap@2.1.1`
+  ([@isaacs](https://github.com/isaacs))
+* [`1ead0a4`](https://github.com/npm/npm/commit/1ead0a4)
+  `which@1.2.0`
+  ([@isaacs](https://github.com/isaacs))
+* [`759f88a`](https://github.com/npm/npm/commit/759f88a)
+  `has-unicode@1.0.1`
+  ([@iarna](https://github.com/iarna))
+
+### v3.3.8 (2015-10-12):
+
+This is a small update release, we're reverting
+[`22a3af0`](https://github.com/npm/npm/commit/22a3af0) from last week's
+release, as it is resulting in crashes.  We'll revisit this PR during this
+week.
+
+* [`ddde1d5`](https://github.com/npm/npm/commit/ddde1d5)
+  Revert "lifecycle: Swap out custom logic with add-to-path module"
+  ([@iarna](https://github.com/iarna))
+
+### v3.3.7 (2015-10-08):
+
+So, as Kat mentioned in last week's 2.x release, we're now swapping weeks
+between accepting PRs and doing dependency updates, in an effort to keep
+release management work from taking over our lives.  This week is a PR week,
+so we've got a bunch of goodies for you.
+
+Relatedly, this week means 3.3.6 is now `latest` and it is WAY faster than
+previous 3.x releases. Give it or this a look!
+
+#### OPTIONAL DEPS, MORE OPTIONAL
+
+* [`2289234`](https://github.com/npm/npm/commit/2289234)
+  [#9643](https://github.com/npm/npm/issues/9643)
+  [#9664](https://github.com/npm/npm/issues/9664)
+  `npm@3` was triggering `npm@2`'s build mechanics when it was linking bin files
+  into the tree.  This was originally intended to trigger rebuilds of
+  bundled modules, but `npm@3`'s flat module structure confused it.  This
+  caused two seemingly unrelated issues.  First, failing optional
+  dependencies could under some circumstances (if they were built during
+  this phase) trigger a full build failure.  And second, rebuilds were being
+  triggered of already installed modules, again, in some circumstances.
+  Both of these are fixed by disabling the `npm@2` mechanics and adding a
+  special rebuild phase for the initial installation of bundled modules.
+  ([@iarna](https://github.com/iarna))
+
+#### BAD NAME, NO CRASH
+
+* [`b78fec9`](https://github.com/npm/npm/commit/b78fec9)
+  [#9766](https://github.com/npm/npm/issues/9766)
+  Refactor all attempts to read the module name or package name to go via a
+  single function, with appropriate guards unusual circumstances where they
+  aren't where we expect them.  This ultimately will ensure we don't see any
+  more recurrences of the `localeCompare` error and related crashers.
+  ([@iarna](https://github.com/iarna))
+
+#### MISCELLANEOUS BUG FIXES
+
+* [`22a3af0`](https://github.com/npm/npm/commit/22a3af0)
+  [#9553](https://github.com/npm/npm/pull/9553)
+  Factor the lifecycle code to manage paths out into its own module and use that.
+  ([@kentcdodds](https://github.com/kentcdodds))
+* [`6a29fe3`](https://github.com/npm/npm/commit/6a29fe3)
+  [#9677](https://github.com/npm/npm/pull/9677)
+  Start testing our stuff in node 4 on travis
+  ([@fscherwi](https://github.com/fscherwi))
+* [`508c6a4`](https://github.com/npm/npm/commit/508c6a4)
+  [#9669](https://github.com/npm/npm/issues/9669)
+  Make `recalculateMetadata` more resilient to unexpectedly bogus dependency specifiers.
+  ([@tmct](https://github.com/tmct))
+* [`3c44763`](https://github.com/npm/npm/commit/3c44763)
+  [#9643](https://github.com/npm/npm/issues/9463)
+  Update `install --only` to ignore the `NODE_ENV` var and _just_ use the only
+  value, if specified.
+  ([@watilde](https://github.com/watilde))
+* [`87336c3`](https://github.com/npm/npm/commit/87336c3)
+  [#9879](https://github.com/npm/npm/pull/9879)
+  `npm@3`'s shrinkwrap was refusing to shrinkwrap if an optional dependency
+  was missing– patch it to allow this.
+  ([@mantoni](https://github.com/mantoni))
+
+#### DOCUMENTATION UPDATES
+
+* [`82659fd`](https://github.com/npm/npm/commit/82659fd)
+  [#9208](https://github.com/npm/npm/issues/9208)
+  Correct the npm style guide around quote usage
+  ([@aaroncrows](https://github.com/aaroncrows))
+* [`a69c83a`](https://github.com/npm/npm/commit/a69c83a)
+  [#9645](https://github.com/npm/npm/pull/9645)
+  Fix spelling error in README
+  ([@dkoleary88](https://github.com/dkoleary88))
+* [`f2cf054`](https://github.com/npm/npm/commit/f2cf054)
+  [#9714](https://github.com/npm/npm/pull/9714)
+  Fix typos in our documentation
+  ([@reggi](https://github.com/reggi))
+* [`7224bef`](https://github.com/npm/npm/commit/7224bef)
+  [#9759](https://github.com/npm/npm/pull/9759)
+  Fix typo in npm-team docs
+  ([@zkat](https://github.com/zkat))
+* [`7e6e007`](https://github.com/npm/npm/commit/7e6e007)
+  [#9820](https://github.com/npm/npm/pull/9820)
+  Correct documentation as to `binding.gyp`
+  ([@KenanY](https://github.com/KenanY))
+
+### v2.14.8 (2015-10-08):
+
+#### SLOWLY RECOVERING FROM FEELINGS
+
+OS&F is definitely my favorite convention I've gone to. Y'all should check it
+out next year! Rebecca and Kat are back, although Forrest is out at
+[&yet conf](http://andyetconf.com/).
+
+This week sees another tiny LTS release with non-code-related patches -- just
+CI/release things.
+
+Meanwhile, have you heard? `npm@3` is much faster now! Go upgrade with `npm
+install -g npm@latest` and give it a whirl if you haven't already!
+
+#### IF YOU CHANGE CASING ON A FILE, YOU ARE NOT MY FRIEND
+
+Seriously. I love me some case-sensitive filesystems, but a lot of us have to
+deal with `git` and its funky support for case normalizing systems. Have mercy
+and just don't bother if all you're changing is casing, please? Otherwise, I
+have to do this little dance to prevent horrible conflicts.
+
+* [`c3a7b61`](https://github.com/npm/npm/commit/c3a7b619786650a45653c8b55b8741fc7bb5cfda)
+  [#9804](https://github.com/npm/npm/pulls/9804) Remove the readme file with
+  weird casing.
+  ([@zkat](https://github.com/zkat))
+* [`f3f619e`](https://github.com/npm/npm/commit/f3f619e06e4be1378dbf286f897b50e9c69c9557)
+  [#9804](https://github.com/npm/npm/pulls/9804) Add the readme file back in,
+  with desired casing.
+  ([@zkat](https://github.com/zkat))
+
+#### IDK. OUR CI DOESN'T EVEN FULLY WORK YET BUT SURE
+
+Either way, it's nice to make sure we're running stuff on the latest Node. `4.2`
+is getting released very soon, though (this week?), and that'll be the first
+official LTS release!
+
+* [`bd0b9ab`](https://github.com/npm/npm/commit/bd0b9ab6e60a31448794bbd88f94672572c3cb55)
+  [#9827](https://github.com/npm/npm/pulls/9827) Add node `4.0` and `4.1` to
+  TravisCI
+  ([@JaKXz](https://github.com/JaKXz))
+
+### v2.14.7 (2015-10-01):
+
+#### MORE RELEASE STAGGERING?!
+
+Hi all, and greetings from [Open Source & Feelings](http://osfeels.com)!
+
+So we're switching gears a little with how we handle our weekly releases: from
+now on, we're going to stagger release weeks between dependency bumps and
+regular patches. So, this week, aside from a doc change, we'll be doing only
+version bumps. Expect actual patches next week!
+
+#### TOTALLY FOLLOWING THE RULES ALREADY
+
+So I snuck this in, because it's our own [@snopeks](https://github.com/snopeks)'
+first contribution to the main `npm` repo. She's been helping with building
+support documents for Orgs, and contributed her general intro guide to the new
+feature so you can read it with `npm help orgs` right in your terminal!
+
+* [`8324ea0`](https://github.com/npm/npm/commit/8324ea023ace4e08b6b8959ad199e2457af9f9cf)
+  [#9761](https://github.com/npm/npm/pull/9761) Added general user guide for
+  Orgs.
+  ([@snopeks](https://github.com/snopeks))
+
+#### JUST. ONE. MORE.
+
+* [`9a502ca`](https://github.com/npm/npm/commit/9a502ca96e2d43ec75a8f684c9ca33af7e910f0a)
+  Use unique package name in tests to work around weird test-state-based
+  failures.
+  ([@iarna](https://github.com/iarna))
+
+#### OKAY ACTUALLY THE THING I WAS SUPPOSED TO DO
+
+Anyway -- here's your version bump! :)
+
+* [`4aeb94c`](https://github.com/npm/npm/commit/4aeb94c9f0df3f41802cf2e0397a998f3b527c25)
+  `request@2.64.0`: No longer defaulting to `application/json` for `json`
+  requests. Also some minor doc and packaging patches.
+  ([@simov](https://github.com/simov))
+  `minimatch@3.0.0`: No longer packaging browser modules.
+  ([@isaacs](https://github.com/isaacs))
+* [`a18b213`](https://github.com/npm/npm/commit/a18b213e6945a8f5faf882927829ac95f844e2aa)
+  `glob@5.0.15`: Upgraded `minimatch` dependency.
+  ([@isaacs](https://github.com/isaacs))
+* [`9eb64d4`](https://github.com/npm/npm/commit/9eb64e44509519ca9d788502edb2eba4cea5c86b)
+  `nock@2.13.0`
+  ([@pgte](https://github.com/pgte))
+
 ### v3.3.6 (2015-09-30):
 
 I have the most exciting news for you this week.  YOU HAVE NO IDEA.  Well,
 ok, maybe you do if you follow my twitter.
 
 Performance just got 5 bazillion times better (under some circumstances,
-ymmv, etc).  So– my test scenario is our very own website.  In npm@2, on my
+ymmv, etc).  So– my test scenario is our very own website.  In `npm@2`, on my
 macbook running `npm ls` takes about 5 seconds. Personally it's more than
-I'd like, but it's entire workable. In npm@3 it has been taking _50_ seconds,
+I'd like, but it's entire workable. In `npm@3` it has been taking _50_ seconds,
 which is appalling. But after doing some work on Monday isolating the performance
-issues I've been able to reduce npm@3's run time back down to 5 seconds.
+issues I've been able to reduce `npm@3`'s run time back down to 5 seconds.
 
-Other scenarios were even worse, there was one that until now in npm@3 that
+Other scenarios were even worse, there was one that until now in `npm@3` that
 took almost 6 minutes, and has been reduced to 14 seconds.
 
-* [`7bc0d4c`](https:github.com/npm/npm/commit/7bc0d4c)
-  [`cf42217`](https:github.com/npm/npm/commit/cf42217)
+* [`7bc0d4c`](https://github.com/npm/npm/commit/7bc0d4c)
+  [`cf42217`](https://github.com/npm/npm/commit/cf42217)
   [#8826](https://github.com/npm/npm/issues/8826)
   Stop using deepclone on super big datastructures. Avoid cloning
   all-together even when that means mutating things, when possible.
@@ -29,29 +301,29 @@ third of the company will be attending.
 
 #### And finally a dependency update
 
-* [`a6a4437`](https:github.com/npm/npm/commit/a6a4437)
-  glob@5.0.15
+* [`a6a4437`](https://github.com/npm/npm/commit/a6a4437)
+  `glob@5.0.15`
   ([@isaacs](https://github.com/isaacs))
 
 #### And some subdep updates
 
-* [`cc5e6a0`](https:github.com/npm/npm/commit/cc5e6a0)
-  hoek@2.16.3
+* [`cc5e6a0`](https://github.com/npm/npm/commit/cc5e6a0)
+  `hoek@2.16.3`
   ([@nlf](https://github.com/nlf))
-* [`912a516`](https:github.com/npm/npm/commit/912a516)
-  boom@2.9.0
+* [`912a516`](https://github.com/npm/npm/commit/912a516)
+  `boom@2.9.0`
   ([@arb](https://github.com/arb))
-* [`63944e9`](https:github.com/npm/npm/commit/63944e9)
-  bluebird@2.10.1
+* [`63944e9`](https://github.com/npm/npm/commit/63944e9)
+  `bluebird@2.10.1`
   ([@petkaantonov](https://github.com/petkaantonov))
-* [`ef16003`](https:github.com/npm/npm/commit/ef16003)
-  mime-types@2.1.7 & mime-db@1.19.0
+* [`ef16003`](https://github.com/npm/npm/commit/ef16003)
+  `mime-types@2.1.7` & `mime-db@1.19.0`
   ([@dougwilson](https://github.com/dougwilson))
-* [`2b8c0dd`](https:github.com/npm/npm/commit/2b8c0dd)
-  request@2.64.0
+* [`2b8c0dd`](https://github.com/npm/npm/commit/2b8c0dd)
+  `request@2.64.0`
   ([@simov](https://github.com/simov))
-* [`8139124`](https:github.com/npm/npm/commit/8139124)
-  brace-expansion@1.1.1
+* [`8139124`](https://github.com/npm/npm/commit/8139124)
+  `brace-expansion@1.1.1`
   ([@juliangruber](https://github.com/juliangruber))
 
 ### v3.3.5 (2015-09-24):
@@ -72,7 +344,7 @@ are at 3.3.5 or greater, you can get around this with `npm install -f -g npm`.
 
 * [`bef06f5`](https://github.com/npm/npm/commit/bef06f5)
   [#9741](https://github.com/npm/npm/pull/9741) Uh...  so...  er...  it
-  seems that since npm@3.2.0 on Windows with a default configuration, it's
+  seems that since `npm@3.2.0` on Windows with a default configuration, it's
   been impossible to update npm.  Well, that's not actually true, there's a
   work around (see above), but it shouldn't be complaining in the first
   place.
@@ -105,13 +377,13 @@ are at 3.3.5 or greater, you can get around this with `npm install -f -g npm`.
 #### ONE DEPENDENCY UPDATE
 
 * [`963295c`](https://github.com/npm/npm/commit/963295c)
-  npm-install-checks@2.0.1
+  `npm-install-checks@2.0.1`
   ([@iarna](https://github.com/iarna))
 
 #### AND ONE SUBDEPENDENCY
 
 * [`448737d`](https://github.com/npm/npm/commit/448737d)
-  request@2.63.0
+  `request@2.63.0`
   ([@simov](https://github.com/simov))
 
 ### v2.14.6 (2015-09-24):
@@ -144,7 +416,7 @@ aren't yet released.
 
 #### NO BETA NOTICE THIS TIME!!
 
-But, EXCITING NEWS FRIENDS, this week marks the exit of npm@3
+But, EXCITING NEWS FRIENDS, this week marks the exit of `npm@3`
 from beta. This means that the week of this release,
 [v3.3.3](https://github.com/npm/npm/releases/tag/v3.3.3) will
 become `latest` and this version (v3.3.4) will become `next`!!
@@ -153,8 +425,8 @@ become `latest` and this version (v3.3.4) will become `next`!!
 
 What I call "cruft", by which I mean, files sitting around in
 your `node_modules` folder, will no longer produce warnings in
-`npm ls` nor during `npm install`. This brings npm@3's behavior
-in line with npm@2.
+`npm ls` nor during `npm install`. This brings `npm@3`'s behavior
+in line with `npm@2`.
 
 * [`a127801`](https://github.com/npm/npm/commit/a127801)
   [#9285](https://github.com/npm/npm/pull/9586)
@@ -172,24 +444,24 @@ in line with npm@2.
 #### MODULE UPDATES
 
 * [`ebb92ca`](https://github.com/npm/npm/commit/ebb92ca)
-  retry@0.8.0 [(@tim-kos](https://github.com/tim-kos))
+  `retry@0.8.0` ([@tim-kos](https://github.com/tim-kos))
 * [`55f1285`](https://github.com/npm/npm/commit/55f1285)
-  normalize-package-data@2.3.4 [(@zkat](https://github.com/zkat))
+  `normalize-package-data@2.3.4` ([@zkat](https://github.com/zkat))
 * [`6d4ebff`](https://github.com/npm/npm/commit/6d4ebff)
-  sha@2.0.1 [(@ForbesLindesay](https://github.com/ForbesLindesay))
+  `sha@2.0.1` ([@ForbesLindesay](https://github.com/ForbesLindesay))
 * [`09a9c7a`](https://github.com/npm/npm/commit/09a9c7a)
-  semver@5.0.3 [(@isaacs](https://github.com/isaacs))
+  `semver@5.0.3` ([@isaacs](https://github.com/isaacs))
 * [`745000f`](https://github.com/npm/npm/commit/745000f)
-  node-gyp@3.0.3 [(@rvagg](https://github.com/rvagg))
+  `node-gyp@3.0.3` ([@rvagg](https://github.com/rvagg))
 
 #### SUB DEP MODULE UPDATES
 
 * [`578ca25`](https://github.com/npm/npm/commit/578ca25)
-  request@2.62.0 [(@simov](https://github.com/simov))
+  `request@2.62.0` ([@simov](https://github.com/simov))
 * [`1d8996e`](https://github.com/npm/npm/commit/1d8996e)
-  jju@1.2.1 [(@rlidwka](https://github.com/rlidwka))
+  `jju@1.2.1` ([@rlidwka](https://github.com/rlidwka))
 * [`6da1ba4`](https://github.com/npm/npm/commit/6da1ba4)
-  hoek@2.16.2 [(@nlf](https://github.com/nlf))
+  `hoek@2.16.2` ([@nlf](https://github.com/nlf))
 
 ### v2.14.5 (2015-09-17):
 
@@ -346,59 +618,59 @@ definitely shouldn't have been using. We're not done yet, but
 this is the bulk of them.
 
 * [`e7bc98e`](https://github.com/npm/npm/commit/e7bc98e)
-  write-file-atomic@1.1.3
+  `write-file-atomic@1.1.3`
   ([@iarna](https://github.com/iarna))
 * [`7417600`](https://github.com/npm/npm/commit/7417600)
-  tar@2.2.1
+  `tar@2.2.1`
   ([@zkat](https://github.com/zkat))
 * [`e4e9d40`](https://github.com/npm/npm/commit/e4e9d40)
-  read-package-json@2.0.1
+  `read-package-json@2.0.1`
   ([@zkat](https://github.com/zkat))
 * [`481611d`](https://github.com/npm/npm/commit/481611d)
-  read-installed@4.0.3
+  `read-installed@4.0.3`
   ([@zkat](https://github.com/zkat))
 * [`0dabbda`](https://github.com/npm/npm/commit/0dabbda)
-  npm-registry-client@7.0.4
+  `npm-registry-client@7.0.4`
   ([@zkat](https://github.com/zkat))
 * [`c075a91`](https://github.com/npm/npm/commit/c075a91)
-  fstream@1.0.8
+  `fstream@1.0.8`
   ([@zkat](https://github.com/zkat))
 * [`2e4341a`](https://github.com/npm/npm/commit/2e4341a)
-  fs-write-stream-atomic@1.0.4
+  `fs-write-stream-atomic@1.0.4`
   ([@zkat](https://github.com/zkat))
 * [`18ad16e`](https://github.com/npm/npm/commit/18ad16e)
-  fs-vacuum@1.2.7
+  `fs-vacuum@1.2.7`
   ([@zkat](https://github.com/zkat))
 
 #### DEPENDENCY UPDATES
 
 * [`9d6666b`](https://github.com/npm/npm/commit/9d6666b)
-  node-gyp@3.0.1
+  `node-gyp@3.0.1`
   ([@rvagg](https://github.com/rvagg))
 * [`349c4df`](https://github.com/npm/npm/commit/349c4df)
-  retry@0.7.0
+  `retry@0.7.0`
   ([@tim-kos](https://github.com/tim-kos))
 * [`f507551`](https://github.com/npm/npm/commit/f507551)
-  which@1.1.2
+  `which@1.1.2`
   ([@isaacs](https://github.com/isaacs))
 * [`e5b6743`](https://github.com/npm/npm/commit/e5b6743)
-  nopt@3.0.4
+  `nopt@3.0.4`
   ([@zkat](https://github.com/zkat))
 
 #### THE DEPENDENCIES OF OUR DEPENDENCIES ARE OUR DEPENDENCIES UPDATES
 
 * [`316382d`](https://github.com/npm/npm/commit/316382d)
-  mime-types@2.1.6 & mime-db@1.18.0
+  `mime-types@2.1.6` & `mime-db@1.18.0`
 * [`64b741e`](https://github.com/npm/npm/commit/64b741e)
-  spdx-correct@1.0.1
+  `spdx-correct@1.0.1`
 * [`fff62ac`](https://github.com/npm/npm/commit/fff62ac)
-  process-nextick-args@1.0.3
+  `process-nextick-args@1.0.3`
 * [`9d6488c`](https://github.com/npm/npm/commit/9d6488c)
-  cryptiles@2.0.5
+  `cryptiles@2.0.5`
 * [`1912012`](https://github.com/npm/npm/commit/1912012)
-  bluebird@2.10.0
+  `bluebird@2.10.0`
 * [`4d09402`](https://github.com/npm/npm/commit/4d09402)
-  readdir-scoped-modules@1.0.2
+  `readdir-scoped-modules@1.0.2`
 
 ### v2.14.4 (2015-09-10):
 
@@ -637,21 +909,21 @@ frontline continuous deployment just yet.
 
 #### SOME DEP UPDATES
 
-* [`1ed1364`](https://github.com/npm/npm/commit/1ed1364) rimraf@2.4.3
+* [`1ed1364`](https://github.com/npm/npm/commit/1ed1364) `rimraf@2.4.3`
   ([@isaacs](https://github.com/isaacs)) Added EPERM to delay/retry loop
-* [`e7b8315`](https://github.com/npm/npm/commit/e7b8315) read@1.0.7
+* [`e7b8315`](https://github.com/npm/npm/commit/e7b8315) `read@1.0.7`
   Smaller distribution package, better metadata
   ([@isaacs](https://github.com/isaacs))
 
 #### SOME DEPS OF DEPS UPDATES
 
-* [`b273bcc`](https://github.com/npm/npm/commit/b273bcc) mime-types@2.1.5
-* [`df6e225`](https://github.com/npm/npm/commit/df6e225) mime-db@1.17.0
-* [`785f2ad`](https://github.com/npm/npm/commit/785f2ad) is-my-json-valid@2.12.1
-* [`88170dd`](https://github.com/npm/npm/commit/88170dd) form-data@1.0.0-rc3
-* [`af5357b`](https://github.com/npm/npm/commit/af5357b) request@2.61.0
-* [`337f96a`](https://github.com/npm/npm/commit/337f96a) chalk@1.1.1
-* [`3dfd74d`](https://github.com/npm/npm/commit/3dfd74d) async@1.4.2
+* [`b273bcc`](https://github.com/npm/npm/commit/b273bcc) `mime-types@2.1.5`
+* [`df6e225`](https://github.com/npm/npm/commit/df6e225) `mime-db@1.17.0`
+* [`785f2ad`](https://github.com/npm/npm/commit/785f2ad) `is-my-json-valid@2.12.1`
+* [`88170dd`](https://github.com/npm/npm/commit/88170dd) `form-data@1.0.0-rc3`
+* [`af5357b`](https://github.com/npm/npm/commit/af5357b) `request@2.61.0`
+* [`337f96a`](https://github.com/npm/npm/commit/337f96a) `chalk@1.1.1`
+* [`3dfd74d`](https://github.com/npm/npm/commit/3dfd74d) `async@1.4.2`
 
 ### v2.14.2 (2015-08-27):
 
@@ -954,8 +1226,8 @@ think we have a handle on stack explosions that effect a small portion of
 our users.  We also have some tantalizing clues as to where some low hanging
 fruit may be for performance issues.
 
-And of course, in addition to the npm@3 specific bug fixes, there are some
-great one's coming in from npm@2!  [@othiym23](https://github.com/othiym23)
+And of course, in addition to the `npm@3` specific bug fixes, there are some
+great one's coming in from `npm@2`!  [@othiym23](https://github.com/othiym23)
 put together that release this week– check out its
 [release notes](https://github.com/npm/npm/releases/tag/v2.13.4) for the deets.
 
@@ -998,17 +1270,17 @@ maintenance or frontline continuous deployment just yet.
 #### DEP VERSION BUMPS
 
 * [`990ee4f`](https://github.com/npm/npm/commit/990ee4f)
-  path-is-inside@1.0.1 ([@domenic](https://github.com/domenic))
+  `path-is-inside@1.0.1` ([@domenic](https://github.com/domenic))
 * [`1f71ec0`](https://github.com/npm/npm/commit/1f71ec0)
-  lodash.clonedeep@3.0.2 ([@jdalton](https://github.com/jdalton))
+  `lodash.clonedeep@3.0.2` ([@jdalton](https://github.com/jdalton))
 * [`a091354`](https://github.com/npm/npm/commit/a091354)
-  marked@0.3.5 ([@chjj](https://github.com/chjj))
+  `marked@0.3.5` ([@chjj](https://github.com/chjj))
 * [`fc51f28`](https://github.com/npm/npm/commit/fc51f28)
-  tap@1.3.2 ([@isaacs](https://github.com/isaacs))
+  `tap@1.3.2` ([@isaacs](https://github.com/isaacs))
 * [`3569ec0`](https://github.com/npm/npm/commit/3569ec0)
-  nock@2.10.0 ([@pgte](https://github.com/pgte))
+  `nock@2.10.0` ([@pgte](https://github.com/pgte))
 * [`ad5f6fd`](https://github.com/npm/npm/commit/ad5f6fd)
-  npm-registry-mock@1.0.1 ([@isaacs](https://github.com/isaacs))
+  `npm-registry-mock@1.0.1` ([@isaacs](https://github.com/isaacs))
 
 ### v2.13.5 (2015-08-07):
 
@@ -1103,7 +1375,7 @@ just yet.
 
 #### DEV DEP UPDATE
 
-* [`555f60c`](https://github.com/npm/npm/commit/555f60c) marked@0.3.4
+* [`555f60c`](https://github.com/npm/npm/commit/555f60c) `marked@0.3.4`
 
 ### v2.13.4 (2015-07-30):
 
@@ -1133,7 +1405,7 @@ So here it is. The patch. Hope it helps. (Thanks,
 Hooray.
 
 * [`d204683`](https://github.com/npm/npm/commit/d2046839d471322e61e3ceb0f00e78e5c481f967)
-  nock@2.9.1
+  `nock@2.9.1`
   ([@pgte](https://github.com/pgte))
 
 ### v3.2.0 (2015-07-24):
@@ -1171,7 +1443,7 @@ just yet.
 * [`b3ee452`](https://github.com/npm/npm/commit/b3ee452)
   [#9038](https://github.com/npm/npm/pull/9038)
   We previously disabled the use of the new `fs.access` API on Windows, but
-  the bug we were seeing is fixed in io.js@1.5.0 so we now use `fs.access`
+  the bug we were seeing is fixed in `io.js@1.5.0` so we now use `fs.access`
   if you're using that version or greater.
   ([@iarna](https://github.com/iarna))
 
@@ -1189,47 +1461,47 @@ just yet.
 These are all development dependencies and semver-compatible subdep
 upgrades, so they should not have visible impact on users.
 
-* [`6b3f6d9`](https://github.com/npm/npm/commit/6b3f6d9) standard@4.3.3
-* [`f4e22e5`](https://github.com/npm/npm/commit/f4e22e5) readable-stream@2.0.2 (inside concat-stream)
-* [`f130bfc`](https://github.com/npm/npm/commit/f130bfc) minimatch@2.0.10 (inside node-gyp's copy of glob)
-* [`36c6a0d`](https://github.com/npm/npm/commit/36c6a0d) caseless@0.11.0
-* [`80df59c`](https://github.com/npm/npm/commit/80df59c) chalk@1.1.0
-* [`ea935d9`](https://github.com/npm/npm/commit/ea935d9) bluebird@2.9.34
-* [`3588a0c`](https://github.com/npm/npm/commit/3588a0c) extend@3.0.0
-* [`c6a8450`](https://github.com/npm/npm/commit/c6a8450) form-data@1.0.0-rc2
-* [`a04925b`](https://github.com/npm/npm/commit/a04925b) har-validator@1.8.0
-* [`ee7c095`](https://github.com/npm/npm/commit/ee7c095) has-ansi@2.0.0
-* [`944fc34`](https://github.com/npm/npm/commit/944fc34) hawk@3.1.0
-* [`783dc7b`](https://github.com/npm/npm/commit/783dc7b) lodash._basecallback@3.3.1
-* [`acef0fe`](https://github.com/npm/npm/commit/acef0fe) lodash._baseclone@3.3.0
-* [`dfe959a`](https://github.com/npm/npm/commit/dfe959a) lodash._basedifference@3.0.3
-* [`a03bc76`](https://github.com/npm/npm/commit/a03bc76) lodash._baseflatten@3.1.4
-* [`8a07d50`](https://github.com/npm/npm/commit/8a07d50) lodash._basetostring@3.0.1
-* [`7785e3f`](https://github.com/npm/npm/commit/7785e3f) lodash._baseuniq@3.0.3
-* [`826fb35`](https://github.com/npm/npm/commit/826fb35) lodash._createcache@3.1.2
-* [`76030b3`](https://github.com/npm/npm/commit/76030b3) lodash._createpadding@3.6.1
-* [`1a49ec6`](https://github.com/npm/npm/commit/1a49ec6) lodash._getnative@3.9.1
-* [`eebe47f`](https://github.com/npm/npm/commit/eebe47f) lodash.isarguments@3.0.4
-* [`09994d4`](https://github.com/npm/npm/commit/09994d4) lodash.isarray@3.0.4
-* [`b6f8dbf`](https://github.com/npm/npm/commit/b6f8dbf) lodash.keys@3.1.2
-* [`c67dd6b`](https://github.com/npm/npm/commit/c67dd6b) lodash.pad@3.1.1
-* [`4add042`](https://github.com/npm/npm/commit/4add042) lodash.repeat@3.0.1
-* [`e04993c`](https://github.com/npm/npm/commit/e04993c) lru-cache@2.6.5
-* [`2ed7da4`](https://github.com/npm/npm/commit/2ed7da4) mime-db@1.15.0
-* [`ae08244`](https://github.com/npm/npm/commit/ae08244) mime-types@2.1.3
-* [`e71410e`](https://github.com/npm/npm/commit/e71410e) os-homedir@1.0.1
-* [`67c13e0`](https://github.com/npm/npm/commit/67c13e0) process-nextick-args@1.0.2
-* [`12ee041`](https://github.com/npm/npm/commit/12ee041) qs@4.0.0
-* [`15564a6`](https://github.com/npm/npm/commit/15564a6) spdx-license-ids@1.0.2
-* [`8733bff`](https://github.com/npm/npm/commit/8733bff) supports-color@2.0.0
-* [`230943c`](https://github.com/npm/npm/commit/230943c) tunnel-agent@0.4.1
-* [`26a4653`](https://github.com/npm/npm/commit/26a4653) ansi-styles@2.1.0
-* [`3d27081`](https://github.com/npm/npm/commit/3d27081) bl@1.0.0
-* [`9efa110`](https://github.com/npm/npm/commit/9efa110) async@1.4.0
+* [`6b3f6d9`](https://github.com/npm/npm/commit/6b3f6d9) `standard@4.3.3`
+* [`f4e22e5`](https://github.com/npm/npm/commit/f4e22e5) `readable-stream@2.0.2` (inside concat-stream)
+* [`f130bfc`](https://github.com/npm/npm/commit/f130bfc) `minimatch@2.0.10` (inside node-gyp's copy of glob)
+* [`36c6a0d`](https://github.com/npm/npm/commit/36c6a0d) `caseless@0.11.0`
+* [`80df59c`](https://github.com/npm/npm/commit/80df59c) `chalk@1.1.0`
+* [`ea935d9`](https://github.com/npm/npm/commit/ea935d9) `bluebird@2.9.34`
+* [`3588a0c`](https://github.com/npm/npm/commit/3588a0c) `extend@3.0.0`
+* [`c6a8450`](https://github.com/npm/npm/commit/c6a8450) `form-data@1.0.0-rc2`
+* [`a04925b`](https://github.com/npm/npm/commit/a04925b) `har-validator@1.8.0`
+* [`ee7c095`](https://github.com/npm/npm/commit/ee7c095) `has-ansi@2.0.0`
+* [`944fc34`](https://github.com/npm/npm/commit/944fc34) `hawk@3.1.0`
+* [`783dc7b`](https://github.com/npm/npm/commit/783dc7b) `lodash._basecallback@3.3.1`
+* [`acef0fe`](https://github.com/npm/npm/commit/acef0fe) `lodash._baseclone@3.3.0`
+* [`dfe959a`](https://github.com/npm/npm/commit/dfe959a) `lodash._basedifference@3.0.3`
+* [`a03bc76`](https://github.com/npm/npm/commit/a03bc76) `lodash._baseflatten@3.1.4`
+* [`8a07d50`](https://github.com/npm/npm/commit/8a07d50) `lodash._basetostring@3.0.1`
+* [`7785e3f`](https://github.com/npm/npm/commit/7785e3f) `lodash._baseuniq@3.0.3`
+* [`826fb35`](https://github.com/npm/npm/commit/826fb35) `lodash._createcache@3.1.2`
+* [`76030b3`](https://github.com/npm/npm/commit/76030b3) `lodash._createpadding@3.6.1`
+* [`1a49ec6`](https://github.com/npm/npm/commit/1a49ec6) `lodash._getnative@3.9.1`
+* [`eebe47f`](https://github.com/npm/npm/commit/eebe47f) `lodash.isarguments@3.0.4`
+* [`09994d4`](https://github.com/npm/npm/commit/09994d4) `lodash.isarray@3.0.4`
+* [`b6f8dbf`](https://github.com/npm/npm/commit/b6f8dbf) `lodash.keys@3.1.2`
+* [`c67dd6b`](https://github.com/npm/npm/commit/c67dd6b) `lodash.pad@3.1.1`
+* [`4add042`](https://github.com/npm/npm/commit/4add042) `lodash.repeat@3.0.1`
+* [`e04993c`](https://github.com/npm/npm/commit/e04993c) `lru-cache@2.6.5`
+* [`2ed7da4`](https://github.com/npm/npm/commit/2ed7da4) `mime-db@1.15.0`
+* [`ae08244`](https://github.com/npm/npm/commit/ae08244) `mime-types@2.1.3`
+* [`e71410e`](https://github.com/npm/npm/commit/e71410e) `os-homedir@1.0.1`
+* [`67c13e0`](https://github.com/npm/npm/commit/67c13e0) `process-nextick-args@1.0.2`
+* [`12ee041`](https://github.com/npm/npm/commit/12ee041) `qs@4.0.0`
+* [`15564a6`](https://github.com/npm/npm/commit/15564a6) `spdx-license-ids@1.0.2`
+* [`8733bff`](https://github.com/npm/npm/commit/8733bff) `supports-color@2.0.0`
+* [`230943c`](https://github.com/npm/npm/commit/230943c) `tunnel-agent@0.4.1`
+* [`26a4653`](https://github.com/npm/npm/commit/26a4653) `ansi-styles@2.1.0`
+* [`3d27081`](https://github.com/npm/npm/commit/3d27081) `bl@1.0.0`
+* [`9efa110`](https://github.com/npm/npm/commit/9efa110) `async@1.4.0`
 
 #### MERGED FORWARD
 
-* As usual, we've ported all the npm@2 goodies in this week's
+* As usual, we've ported all the `npm@2` goodies in this week's
   [v2.13.3](https://github.com/npm/npm/releases/tag/v2.13.3)
   release.
 
@@ -1339,7 +1611,7 @@ explain what changed?
 
 Kat: Well, you could say that…
 
-Rebecca: I would! This week I fixed more npm@3 bugs!
+Rebecca: I would! This week I fixed more `npm@3` bugs!
 
 Kat: That sounds familiar.
 
@@ -1384,7 +1656,7 @@ kids, betas hide in dark hallways waiting to break your stuff, stuff like…
 
 * [`9fafb18`](https://github.com/npm/npm/9fafb18)
   [#8701](https://github.com/npm/npm/issues/8701)
-  npm@3 introduced permissions checks that run before it actually tries to
+  `npm@3` introduced permissions checks that run before it actually tries to
   do something. This saves you from having an install fail half way
   through. We did this using the shiny new `fs.access` function available
   in `node 0.12` and `io.js`, with fallback options for older nodes. Unfortunately
@@ -1403,7 +1675,7 @@ kids, betas hide in dark hallways waiting to break your stuff, stuff like…
 #### MERGED FORWARD
 
 * Check out Kat's [super-fresh release notes for v2.13.2](https://github.com/npm/npm/releases/tag/v2.13.2)
-  and see all the changes we ported from npm@2.
+  and see all the changes we ported from `npm@2`.
 
 ### v2.13.2 (2015-07-16):
 
@@ -1516,7 +1788,7 @@ just yet.
 
 #### RED EYE RELEASE
 
-Rebecca's up too late writing tests, so you can have npm@3 bug fixes!  Lots
+Rebecca's up too late writing tests, so you can have `npm@3` bug fixes!  Lots
 of great new issues from you all! ❤️️  Keep it up!
 
 #### YUP STILL BETA, PLEASE PAY ATTENTION
@@ -1562,7 +1834,7 @@ just yet.
 #### MERGED FORWARD
 
 * Check out the [v2.13.1 release notes](https://github.com/npm/npm/releases/tag/v2.13.1)
-  and see all the changes we ported from npm@2.
+  and see all the changes we ported from `npm@2`.
 
 ### v2.13.1 (2015-07-09):
 
@@ -1624,7 +1896,7 @@ for details on that.
 You all have been AWESOME with
 [all](https://github.com/npm/npm/milestones/3.x)
 [the](https://github.com/npm/npm/milestones/3.2.0)
-npm@3 bug reports! Thank you and keep up the great work!
+`npm@3` bug reports! Thank you and keep up the great work!
 
 #### NEW PLACE, SAME CODE
 
@@ -1690,7 +1962,7 @@ or frontline continuous deployment just yet.
     ([@iarna](https://github.com/iarna))
   * [`3cb6ad2`](https://github.com/npm/npm/commit/3cb6ad2)
     [#8736](https://github.com/npm/npm/issues/8766)
-    npm@3 wasn't running the "install" lifecycle in your current (toplevel)
+    `npm@3` wasn't running the "install" lifecycle in your current (toplevel)
     module. This broke modules that relied on C compilation. BOO.
     ([@iarna](https://github.com/iarna))
   * [`68da583`](https://github.com/npm/npm/commit/68da583)
@@ -1699,8 +1971,8 @@ or frontline continuous deployment just yet.
     didn't have `package` already installed.
     ([@iarna](https://github.com/iarna))
   * [`edd7448`](https://github.com/npm/npm/commit/edd7448)
-    read-package-tree@5.0.0: This update makes read-package-tree not explode
-    when there's bad data in your node_modules folder. npm@2 silently
+    `read-package-tree@5.0.0`: This update makes read-package-tree not explode
+    when there's bad data in your node_modules folder. `npm@2` silently
     ignores this sort of thing.
     ([@iarna](https://github.com/iarna))
   * [`0bb08c8`](https://github.com/npm/npm/commit/0bb08c8)
@@ -1726,7 +1998,7 @@ or frontline continuous deployment just yet.
 Just the one. Others came in via the 2.x release. Do check out its
 changelog, immediately following this message.
 
-  * [`4e602c5`](https://github.com/npm/npm/commit/4e602c5) lodash@3.2.2
+  * [`4e602c5`](https://github.com/npm/npm/commit/4e602c5) `lodash@3.2.2`
 
 ### v2.13.0 (2015-07-02):
 
@@ -1980,7 +2252,7 @@ that isn't on this list,
   Local deps where the dep name and the name in the package.json differ
   don't result in an error.
 * [#8637](https://github.com/npm/npm/issues/8637)
-  Modules can install themselves as direct dependencies. npm@2 declined to
+  Modules can install themselves as direct dependencies. `npm@2` declined to
   do this.
 * [#8660](https://github.com/npm/npm/issues/8660)
   Dependencies of failed optional dependencies aren't rolled back when the
diff --git a/deps/npm/README.md b/deps/npm/README.md
index ceaefb8f6c3438..694d9cf0d643d0 100644
--- a/deps/npm/README.md
+++ b/deps/npm/README.md
@@ -208,7 +208,7 @@ Any data published to The npm Registry (including user account
 information) may be removed or modified at the sole discretion of the
 npm server administrators.
 
-### In plainer english
+### In plainer English
 
 npm is the property of npm, Inc.
 
diff --git a/deps/npm/bin/npm-cli.js b/deps/npm/bin/npm-cli.js
index 60d00bf29ab918..2346feba47d604 100755
--- a/deps/npm/bin/npm-cli.js
+++ b/deps/npm/bin/npm-cli.js
@@ -73,5 +73,4 @@
     if (er) return errorHandler(er)
     npm.commands[npm.command](npm.argv, errorHandler)
   })
-
 })()
diff --git a/deps/npm/doc/cli/npm-bin.md b/deps/npm/doc/cli/npm-bin.md
index 8e1abbee8f0fca..9b76ec529e30a0 100644
--- a/deps/npm/doc/cli/npm-bin.md
+++ b/deps/npm/doc/cli/npm-bin.md
@@ -3,7 +3,7 @@ npm-bin(1) -- Display npm bin folder
 
 ## SYNOPSIS
 
-    npm bin [--global]
+    npm bin [-g|--global]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-config.md b/deps/npm/doc/cli/npm-config.md
index 119840ef010f17..ec5c4eb14be8ab 100644
--- a/deps/npm/doc/cli/npm-config.md
+++ b/deps/npm/doc/cli/npm-config.md
@@ -3,13 +3,13 @@ npm-config(1) -- Manage the npm configuration files
 
 ## SYNOPSIS
 
-    npm config set <key> <value> [--global]
+    npm config set <key> <value> [-g|--global]
     npm config get <key>
     npm config delete <key>
     npm config list
     npm config edit
     npm get <key>
-    npm set <key> <value> [--global]
+    npm set <key> <value> [-g|--global]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-init.md b/deps/npm/doc/cli/npm-init.md
index e90f9ef04d91a2..ec4c25bedaab44 100644
--- a/deps/npm/doc/cli/npm-init.md
+++ b/deps/npm/doc/cli/npm-init.md
@@ -3,7 +3,7 @@ npm-init(1) -- Interactively create a package.json file
 
 ## SYNOPSIS
 
-    npm init [--force|-f|--yes|-y]
+    npm init [-f|--force|-y|--yes]
 
 ## DESCRIPTION
 
diff --git a/deps/npm/doc/cli/npm-install.md b/deps/npm/doc/cli/npm-install.md
index 07c61e174aa725..75e9e13fd9398a 100644
--- a/deps/npm/doc/cli/npm-install.md
+++ b/deps/npm/doc/cli/npm-install.md
@@ -13,7 +13,7 @@ npm-install(1) -- Install a package
     npm install <folder>
 
     alias: npm i
-    common options: [--save|--save-dev|--save-optional] [--save-exact] [--dry-run]
+    common options: [-S|--save|-D|--save-dev|-O|--save-optional] [-E|--save-exact] [--dry-run]
 
 ## DESCRIPTION
 
@@ -73,7 +73,7 @@ after packing it up into a tarball (b).
 
           npm install https://github.com/indexzero/forever/tarball/v0.5.6
 
-* `npm install [<@scope>/]<name> [--save|--save-dev|--save-optional]`:
+* `npm install [<@scope>/]<name> [-S|--save|-D|--save-dev|-O|--save-optional]`:
 
     Do a `<name>@<tag>` install, where `<tag>` is the "tag" config. (See
     `npm-config(7)`.)
@@ -88,16 +88,16 @@ after packing it up into a tarball (b).
     `npm install` takes 3 exclusive, optional flags which save or update
     the package version in your main package.json:
 
-    * `--save`: Package will appear in your `dependencies`.
+    * `-S, --save`: Package will appear in your `dependencies`.
 
-    * `--save-dev`: Package will appear in your `devDependencies`.
+    * `-D, --save-dev`: Package will appear in your `devDependencies`.
 
-    * `--save-optional`: Package will appear in your `optionalDependencies`.
+    * `-O, --save-optional`: Package will appear in your `optionalDependencies`.
 
     When using any of the above options to save dependencies to your
     package.json, there is an additional, optional flag:
 
-    * `--save-exact`: Saved dependencies will be configured with an
+    * `-E, --save-exact`: Saved dependencies will be configured with an
       exact version rather than using npm's default semver range
       operator.
 
@@ -207,7 +207,7 @@ after packing it up into a tarball (b).
 
     Install the package at `https://gist.github.com/gistID` by attempting to
     clone it using `git`. The GitHub username associated with the gist is
-    optional and will not be saved in `package.json` if `--save` is used.
+    optional and will not be saved in `package.json` if `-S` or `--save` is used.
 
     If you don't specify a *commit-ish* then `master` will be used.
 
@@ -249,12 +249,12 @@ versions.
 The `--dry-run` argument will report in the usual way what the install would
 have done without actually installing anything.
 
-The `--force` argument will force npm to fetch remote resources even if a
+The `-f` or `--force` argument will force npm to fetch remote resources even if a
 local copy exists on disk.
 
     npm install sax --force
 
-The `--global` argument will cause npm to install the package globally
+The `-g` or `--global` argument will cause npm to install the package globally
 rather than locally.  See `npm-folders(5)`.
 
 The `--link` argument will cause npm to link global installs into the
@@ -273,7 +273,7 @@ The `--nodedir=/path/to/node/source` argument will allow npm to find the
 node source code so that npm can compile native modules.
 
 The `--only={prod[uction]|dev[elopment]}` argument will cause either only
-`devDependencies` or only non-`devDependencies` to be installed.
+`devDependencies` or only non-`devDependencies` to be installed regardless of the `NODE_ENV`.
 
 See `npm-config(7)`.  Many of the configuration params have some
 effect on installation, since that's most of what npm does.
@@ -313,7 +313,7 @@ For `A{B,C}, B{C,D@1}, C{D@2}`, this algorithm produces:
        `-- D@2
     +-- D@1
 
-Because B's D@1 will be installed in the top leve, C now has to install D@2
+Because B's D@1 will be installed in the top level, C now has to install D@2
 privately for itself.
 
 See npm-folders(5) for a more detailed description of the specific
diff --git a/deps/npm/doc/cli/npm-search.md b/deps/npm/doc/cli/npm-search.md
index e7e0defa07a879..a14b9c353de24c 100644
--- a/deps/npm/doc/cli/npm-search.md
+++ b/deps/npm/doc/cli/npm-search.md
@@ -3,7 +3,7 @@ npm-search(1) -- Search for packages
 
 ## SYNOPSIS
 
-    npm search [--long] [search terms ...]
+    npm search [-l|--long] [search terms ...]
 
     aliases: s, se
 
diff --git a/deps/npm/doc/cli/npm-shrinkwrap.md b/deps/npm/doc/cli/npm-shrinkwrap.md
index b4548ca7c05aab..5156d339a74b16 100644
--- a/deps/npm/doc/cli/npm-shrinkwrap.md
+++ b/deps/npm/doc/cli/npm-shrinkwrap.md
@@ -107,7 +107,7 @@ reproducing the structure described in the file, using the specific files
 referenced in "resolved" if available, falling back to normal package
 resolution using "version" if one isn't.
 
-2. The tree is walked and any missing dependencies are installed in the usual fasion.
+2. The tree is walked and any missing dependencies are installed in the usual fashion.
 
 ### Using shrinkwrapped packages
 
diff --git a/deps/npm/doc/cli/npm-team.md b/deps/npm/doc/cli/npm-team.md
index 2ed9b367b56d30..08856ed3ec68cc 100644
--- a/deps/npm/doc/cli/npm-team.md
+++ b/deps/npm/doc/cli/npm-team.md
@@ -18,7 +18,7 @@ npm-team(1) -- Manage organization teams and team memberships
 Used to manage teams in organizations, and change team memberships. Does not
 handle permissions for packages.
 
-Teams must always be fully qualified with the organization/scope they belond to
+Teams must always be fully qualified with the organization/scope they belong to
 when operating on them, separated by a colon (`:`). That is, if you have a
 `developers` team on a `foo` organization, you must always refer to that team as
 `developers:foo` in these commands.
@@ -52,4 +52,4 @@ use the `npm access` command to grant or revoke the appropriate permissions.
 ## SEE ALSO
 
 * npm-access(1)
-* npm-registr(7)
+* npm-registry(7)
diff --git a/deps/npm/doc/cli/npm-uninstall.md b/deps/npm/doc/cli/npm-uninstall.md
index 73e39a5fb0c258..97d72d2c5c56ae 100644
--- a/deps/npm/doc/cli/npm-uninstall.md
+++ b/deps/npm/doc/cli/npm-uninstall.md
@@ -3,7 +3,7 @@ npm-rm(1) -- Remove a package
 
 ## SYNOPSIS
 
-    npm uninstall [<@scope>/]<pkg>[@<version>]... [--save|--save-dev|--save-optional]
+    npm uninstall [<@scope>/]<pkg>[@<version>]... [-S|--save|-D|--save-dev|-O|--save-optional]
 
     aliases: remove, rm, r, un, unlink
 
@@ -22,11 +22,11 @@ it uninstalls the current package context as a global package.
 `npm uninstall` takes 3 exclusive, optional flags which save or update
 the package version in your main package.json:
 
-* `--save`: Package will be removed from your `dependencies`.
+* `-S, --save`: Package will be removed from your `dependencies`.
 
-* `--save-dev`: Package will be removed from your `devDependencies`.
+* `-D, --save-dev`: Package will be removed from your `devDependencies`.
 
-* `--save-optional`: Package will be removed from your `optionalDependencies`.
+* `-O, --save-optional`: Package will be removed from your `optionalDependencies`.
 
 Further, if you have an `npm-shrinkwrap.json` then it will be updated as
 well.
diff --git a/deps/npm/doc/cli/npm-update.md b/deps/npm/doc/cli/npm-update.md
index 30a0702d7dd7f0..72719670dd0cb0 100644
--- a/deps/npm/doc/cli/npm-update.md
+++ b/deps/npm/doc/cli/npm-update.md
@@ -114,7 +114,8 @@ version that satisfies `^0.4.0` (`>= 0.4.0 <0.5.0`)
 
 When you want to update a package and save the new version as
 the minimum required dependency in `package.json`, you can use
-`npm update --save`.  For example if `package.json` contains
+`npm update -S` or `npm update --save`.  For example if
+`package.json` contains:
 
 ```
 dependencies: {
diff --git a/deps/npm/doc/cli/npm-version.md b/deps/npm/doc/cli/npm-version.md
index 0527a4d71352a1..6bd550659d54e8 100644
--- a/deps/npm/doc/cli/npm-version.md
+++ b/deps/npm/doc/cli/npm-version.md
@@ -5,7 +5,7 @@ npm-version(1) -- Bump a package version
 
     npm version [<newversion> | major | minor | patch | premajor | preminor | prepatch | prerelease]
 
-    'npm -v' or 'npm --version' to print npm version
+    'npm [-v | --version]' to print npm version
     'npm view <pkg> version' to view a package's published version
     'npm ls' to inspect current package/dependency versions
 
@@ -22,10 +22,10 @@ the existing version will be incremented by 1 in the specified field.
 If run in a git repo, it will also create a version commit and tag.
 This behavior is controlled by `git-tag-version` (see below), and can
 be disabled on the command line by running `npm --no-git-tag-version version`.
-It will fail if the working directory is not clean, unless the `--force`
-flag is set.
+It will fail if the working directory is not clean, unless the `-f` or
+`--force` flag is set.
 
-If supplied with `--message` (shorthand: `-m`) config option, npm will
+If supplied with `-m` or `--message` config option, npm will
 use it as a commit message when creating a version commit.  If the
 `message` config contains `%s` then that will be replaced with the
 resulting version number.  For example:
diff --git a/deps/npm/doc/cli/npm-view.md b/deps/npm/doc/cli/npm-view.md
index 2330c016ec36aa..2215818a457d89 100644
--- a/deps/npm/doc/cli/npm-view.md
+++ b/deps/npm/doc/cli/npm-view.md
@@ -50,7 +50,7 @@ contributor in the list, you can do this:
     npm view express contributors[0].email
 
 Multiple fields may be specified, and will be printed one after another.
-For exampls, to get all the contributor names and email addresses, you
+For example, to get all the contributor names and email addresses, you
 can do this:
 
     npm view express contributors.name contributors.email
diff --git a/deps/npm/doc/cli/npm.md b/deps/npm/doc/cli/npm.md
index 331a03577b20d0..8a05d0605a6b5c 100644
--- a/deps/npm/doc/cli/npm.md
+++ b/deps/npm/doc/cli/npm.md
@@ -61,7 +61,7 @@ In particular, npm has two modes of operation:
   defaults to the current working directory.  Packages are installed to
   `./node_modules`, and bins are installed to `./node_modules/.bin`.
 
-Local mode is the default.  Use `--global` or `-g` on any command to
+Local mode is the default.  Use `-g` or `--global` on any command to
 operate in global mode instead.
 
 ## DEVELOPER USAGE
diff --git a/deps/npm/doc/files/package.json.md b/deps/npm/doc/files/package.json.md
index 82e174677d8c79..d907945194a72d 100644
--- a/deps/npm/doc/files/package.json.md
+++ b/deps/npm/doc/files/package.json.md
@@ -468,8 +468,8 @@ included.  For example:
 ## Local Paths
 
 As of version 2.0.0 you can provide a path to a local directory that contains a
-package. Local paths can be saved using `npm install --save`, using any of
-these forms:
+package. Local paths can be saved using `npm install -S` or
+`npm install --save`, using any of these forms:
 
     ../foo/bar
     ~/foo/bar
diff --git a/deps/npm/doc/misc/npm-coding-style.md b/deps/npm/doc/misc/npm-coding-style.md
index 7dd7ad556deba1..81dadf83473d2c 100644
--- a/deps/npm/doc/misc/npm-coding-style.md
+++ b/deps/npm/doc/misc/npm-coding-style.md
@@ -61,7 +61,7 @@ Don't use them except in four situations:
 * `for (;;)` loops.  They're actually required.
 * null loops like: `while (something) ;` (But you'd better have a good
   reason for doing that.)
-* `case "foo": doSomething(); break`
+* `case 'foo': doSomething(); break`
 * In front of a leading `(` or `[` at the start of the line.
   This prevents the expression from being interpreted
   as a function call or property access, respectively.
@@ -72,9 +72,9 @@ Some examples of good semicolon usage:
     ;[a, b, c].forEach(doSomething)
     for (var i = 0; i < 10; i ++) {
       switch (state) {
-        case "begin": start(); continue
-        case "end": finish(); break
-        default: throw new Error("unknown state")
+        case 'begin': start(); continue
+        case 'end': finish(); break
+        default: throw new Error('unknown state')
       }
       end()
     }
@@ -89,18 +89,30 @@ across multiple lines, put the comma at the start of the next
 line, directly below the token that starts the list.  Put the
 final token in the list on a line by itself.  For example:
 
-    var magicWords = [ "abracadabra"
-                     , "gesundheit"
-                     , "ventrilo"
+    var magicWords = [ 'abracadabra'
+                     , 'gesundheit'
+                     , 'ventrilo'
                      ]
-      , spells = { "fireball" : function () { setOnFire() }
-                 , "water" : function () { putOut() }
+      , spells = { 'fireball' : function () { setOnFire() }
+                 , 'water' : function () { putOut() }
                  }
       , a = 1
-      , b = "abc"
+      , b = 'abc'
       , etc
       , somethingElse
 
+## Quotes
+Use single quotes for strings except to avoid escaping.
+
+Bad:
+
+    var notOk = "Just double quotes"
+
+Good:
+
+    var ok = 'String contains "double" quotes'
+    var alsoOk = "String contains 'single' quotes or apostrophe"
+
 ## Whitespace
 
 Put a single space in front of ( for anything other than a function call.
diff --git a/deps/npm/doc/misc/npm-config.md b/deps/npm/doc/misc/npm-config.md
index a28dd61d128568..f88bf9f8a048dc 100644
--- a/deps/npm/doc/misc/npm-config.md
+++ b/deps/npm/doc/misc/npm-config.md
@@ -35,8 +35,8 @@ See npmrc(5) for more details.
 
 ### Default Configs
 
-A set of configuration parameters that are internal to npm, and are
-defaults if nothing else is specified.
+Run `npm config ls -l` to see a set of configuration parameters that are
+internal to npm, and are defaults if nothing else is specified.
 
 ## Shorthands and Other CLI Niceties
 
diff --git a/deps/npm/doc/misc/npm-faq.md b/deps/npm/doc/misc/npm-faq.md
index 557ec1a9c6c27a..cc1c19e61a7458 100644
--- a/deps/npm/doc/misc/npm-faq.md
+++ b/deps/npm/doc/misc/npm-faq.md
@@ -7,18 +7,19 @@ npm-faq(7) -- Frequently Asked Questions
 
     npm config set viewer browser
 
-to open these documents in your default web browser rather than `man`.
+This command will set the npm docs to open in your default web browser rather than `man`.
 
 ## It didn't work.
 
-That's not really a question.
+Please provide a little more detail, search for the error via [Google](https://google.com) or [StackOverflow npm](http://stackoverflow.com/search?q=npm) to see if another developer has encountered a similar problem.
 
 ## Why didn't it work?
 
 I don't know yet.
 
-Read the error output, and if you can't figure out what it means,
-do what it says and post a bug with all the information it asks for.
+Try reading the error output first, ensure this is a true npm issue and not a package issue. If you are having an issue with a package dependency, please submit your error to that particular package maintainer.
+
+For any npm issues, try following the instructions, or even retracing your steps. If the issue continues to persist, submit a bug with the steps to reproduce, please include the operating system you are working on, along with the error you recieve.
 
 ## Where does npm put stuff?
 
@@ -28,7 +29,7 @@ tl;dr:
 
 * Use the `npm root` command to see where modules go, and the `npm bin`
   command to see where executables go
-* Global installs are different from local installs.  If you install
+* Global installs are different from local installs. If you install
   something with the `-g` flag, then its executables go in `npm bin -g`
   and its modules go in `npm root -g`.
 
diff --git a/deps/npm/doc/misc/npm-index.md b/deps/npm/doc/misc/npm-index.md
index 4af01fd6890510..1bf102f4e49ab0 100644
--- a/deps/npm/doc/misc/npm-index.md
+++ b/deps/npm/doc/misc/npm-index.md
@@ -257,6 +257,10 @@ Frequently Asked Questions
 
 Index of all npm documentation
 
+### npm-orgs(7)
+
+Working with Teams & Orgs
+
 ### npm-registry(7)
 
 The JavaScript Package Registry
diff --git a/deps/npm/doc/misc/npm-orgs.md b/deps/npm/doc/misc/npm-orgs.md
new file mode 100644
index 00000000000000..1f9977eaddf4be
--- /dev/null
+++ b/deps/npm/doc/misc/npm-orgs.md
@@ -0,0 +1,90 @@
+npm-orgs(7) -- Working with Teams & Orgs
+========================================
+
+## DESCRIPTION
+
+There are three levels of org users:
+
+1. Super admin, controls billing & adding people to the org.
+2. Team admin, manages team membership & package access.
+3. Developer, works on packages they are given access to.
+
+The super admin is the only person who can add users to the org because it impacts the monthly bill. The super admin will use the website to manage membership. Every org has a `developers` team that all users are automatically added to.
+
+The team admin is the person who manages team creation, team membership, and package access for teams. The team admin grants package access to teams, not individuals.
+
+The developer will be able to access packages based on the teams they are on. Access is either read-write or read-only.
+
+There are two main commands:
+
+1. `npm team` see npm-access(1) for more details
+2. `npm access` see npm-team(1) for more details
+
+## Team Admins create teams
+
+* Check who you’ve added to your org:
+
+```
+npm team ls <org>:developers
+```
+
+* Each org is automatically given a `developers` team, so you can see the whole list of team members in your org. This team automatically gets read-write access to all packages, but you can change that with the `access` command.
+
+* Create a new team:
+
+```
+npm team create <org:team>
+```
+
+* Add members to that team:
+
+```
+npm team add <org:team> <user>
+```
+
+## Publish a package and adjust package access
+
+* In package directory, run
+
+```
+npm init --scope=<org>
+```
+to scope it for your org & publish as usual
+
+* Grant access:
+
+```
+npm access grant <read-only|read-write> <org:team> [<package>]
+```
+
+* Revoke access:
+
+```
+npm access revoke <org:team> [<package>]
+```
+
+## Monitor your package access
+
+* See what org packages a team member can access:
+
+```
+npm access ls-packages <org> <user>
+```
+
+* See packages available to a specific team:
+
+```
+npm access ls-packages <org:team>
+```
+
+* Check which teams are collaborating on a package:
+
+```
+npm access ls-collaborators <pkg>
+```
+
+## SEE ALSO
+
+* npm-team(1)
+* npm-access(1)
+* npm-scope(7)
diff --git a/deps/npm/doc/misc/npm-scripts.md b/deps/npm/doc/misc/npm-scripts.md
index 12c7f23167d4d8..c7f8b20ce68eae 100644
--- a/deps/npm/doc/misc/npm-scripts.md
+++ b/deps/npm/doc/misc/npm-scripts.md
@@ -71,7 +71,7 @@ npm will default some script values based on package contents.
 
 * `"install": "node-gyp rebuild"`:
 
-  If there is a `bindings.gyp` file in the root of your package, npm will
+  If there is a `binding.gyp` file in the root of your package, npm will
   default the `install` command to compile using node-gyp.
 
 ## USER
diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html
index 537f3c06598d98..e5c8288d6bb268 100644
--- a/deps/npm/html/doc/README.html
+++ b/deps/npm/html/doc/README.html
@@ -140,11 +140,11 @@ <h2 id="legal-stuff">Legal Stuff</h2>
 <p>If you have a complaint about a package in the public npm registry,
 and cannot <a href="https://docs.npmjs.com/misc/disputes">resolve it with the package
 owner</a>, please email
-<a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#111;&#x3a;&#x73;&#117;&#x70;&#x70;&#111;&#x72;&#x74;&#64;&#x6e;&#x70;&#x6d;&#x6a;&#x73;&#x2e;&#99;&#x6f;&#109;">&#x73;&#117;&#x70;&#x70;&#111;&#x72;&#x74;&#64;&#x6e;&#x70;&#x6d;&#x6a;&#x73;&#x2e;&#99;&#x6f;&#109;</a> and explain the situation.</p>
+<a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#111;&#x3a;&#x73;&#117;&#x70;&#112;&#x6f;&#114;&#116;&#64;&#110;&#x70;&#109;&#106;&#115;&#46;&#x63;&#x6f;&#109;">&#x73;&#117;&#x70;&#112;&#x6f;&#114;&#116;&#64;&#110;&#x70;&#109;&#106;&#115;&#46;&#x63;&#x6f;&#109;</a> and explain the situation.</p>
 <p>Any data published to The npm Registry (including user account
 information) may be removed or modified at the sole discretion of the
 npm server administrators.</p>
-<h3 id="in-plainer-english">In plainer english</h3>
+<h3 id="in-plainer-english">In plainer English</h3>
 <p>npm is the property of npm, Inc.</p>
 <p>If you publish something, it&#39;s yours, and you are solely accountable
 for it.</p>
@@ -183,5 +183,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@3.3.6</p>
+<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/api/npm-bin.html b/deps/npm/html/doc/api/npm-bin.html
deleted file mode 100644
index 1fb691d340844e..00000000000000
--- a/deps/npm/html/doc/api/npm-bin.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-bin</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-bin.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-bin.html">npm-bin</a></h1> <p>Display npm bin folder</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.bin(args, cb)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>Print the folder where npm will install executables.</p>
-<p>This function should not be used programmatically.  Instead, just refer
-to the <code>npm.bin</code> property.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-bin &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-bugs.html b/deps/npm/html/doc/api/npm-bugs.html
deleted file mode 100644
index e63c7875cd2a30..00000000000000
--- a/deps/npm/html/doc/api/npm-bugs.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-bugs</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-bugs.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-bugs.html">npm-bugs</a></h1> <p>Bugs for a package in a web browser maybe</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.bugs(package, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This command tries to guess at the likely location of a package&#39;s
-bug tracker URL, and then tries to open it using the <code>--browser</code>
-config param.</p>
-<p>Like other commands, the first parameter is an array. This command only
-uses the first element, which is expected to be a package name with an
-optional version number.</p>
-<p>This command will launch a browser, so this command may not be the most
-friendly for programmatic use.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-bugs &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-cache.html b/deps/npm/html/doc/api/npm-cache.html
deleted file mode 100644
index 1dd1447942f76a..00000000000000
--- a/deps/npm/html/doc/api/npm-cache.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-cache</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-cache.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-cache.html">npm-cache</a></h1> <p>manage the npm cache programmatically</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.cache([args], callback)
-
-// helpers
-npm.commands.cache.clean([args], callback)
-npm.commands.cache.add([args], callback)
-npm.commands.cache.read(name, version, forceBypass, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This acts much the same ways as the <a href="../cli/npm-cache.html">npm-cache(1)</a> command line
-functionality.</p>
-<p>The callback is called with the package.json data of the thing that is
-eventually added to or read from the cache.</p>
-<p>The top level <code>npm.commands.cache(...)</code> functionality is a public
-interface, and like all commands on the <code>npm.commands</code> object, it will
-match the command line behavior exactly.</p>
-<p>However, the cache folder structure and the cache helper functions are
-considered <strong>internal</strong> API surface, and as such, may change in future
-releases of npm, potentially without warning or significant version
-incrementation.</p>
-<p>Use at your own risk.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-cache &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-commands.html b/deps/npm/html/doc/api/npm-commands.html
deleted file mode 100644
index 278f9d6aad8c08..00000000000000
--- a/deps/npm/html/doc/api/npm-commands.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-commands</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-commands.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-commands.html">npm-commands</a></h1> <p>npm commands</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands[&lt;command&gt;](args, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>npm comes with a full set of commands, and each of the commands takes a
-similar set of arguments.</p>
-<p>In general, all commands on the command object take an <strong>array</strong> of positional
-argument <strong>strings</strong>. The last argument to any function is a callback. Some
-commands are special and take other optional arguments.</p>
-<p>All commands have their own man page. See <code>man npm-&lt;command&gt;</code> for command-line
-usage, or <code>man 3 npm-&lt;command&gt;</code> for programmatic usage.</p>
-<h2 id="see-also">SEE ALSO</h2>
-<ul>
-<li><a href="../misc/npm-index.html">npm-index(7)</a></li>
-</ul>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-commands &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-config.html b/deps/npm/html/doc/api/npm-config.html
deleted file mode 100644
index ec60c18660d29d..00000000000000
--- a/deps/npm/html/doc/api/npm-config.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-config</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-config.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-config.html">npm-config</a></h1> <p>Manage the npm configuration files</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.config(args, callback)
-var val = npm.config.get(key)
-npm.config.set(key, val)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This function acts much the same way as the command-line version.  The first
-element in the array tells config what to do. Possible values are:</p>
-<ul>
-<li><p><code>set</code></p>
-<p>  Sets a config parameter.  The second element in <code>args</code> is interpreted as the
-  key, and the third element is interpreted as the value.</p>
-</li>
-<li><p><code>get</code></p>
-<p>  Gets the value of a config parameter. The second element in <code>args</code> is the
-  key to get the value of.</p>
-</li>
-<li><p><code>delete</code> (<code>rm</code> or <code>del</code>)</p>
-<p>  Deletes a parameter from the config. The second element in <code>args</code> is the
-  key to delete.</p>
-</li>
-<li><p><code>list</code> (<code>ls</code>)</p>
-<p>  Show all configs that aren&#39;t secret. No parameters necessary.</p>
-</li>
-<li><p><code>edit</code>:</p>
-<p>  Opens the config file in the default editor. This command isn&#39;t very useful
-  programmatically, but it is made available.</p>
-</li>
-</ul>
-<p>To programmatically access npm configuration settings, or set them for
-the duration of a program, use the <code>npm.config.set</code> and <code>npm.config.get</code>
-functions instead.</p>
-<h2 id="see-also">SEE ALSO</h2>
-<ul>
-<li><a href="../api/npm.html">npm(3)</a></li>
-</ul>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-config &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-deprecate.html b/deps/npm/html/doc/api/npm-deprecate.html
deleted file mode 100644
index 6f3dd8a3523a5b..00000000000000
--- a/deps/npm/html/doc/api/npm-deprecate.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-deprecate</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-deprecate.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-deprecate.html">npm-deprecate</a></h1> <p>Deprecate a version of a package</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.deprecate(args, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This command will update the npm registry entry for a package, providing
-a deprecation warning to all who attempt to install it.</p>
-<p>The &#39;args&#39; parameter must have exactly two elements:</p>
-<ul>
-<li><p><code>package[@version]</code></p>
-<p>  The <code>version</code> portion is optional, and may be either a range, or a
-  specific version, or a tag.</p>
-</li>
-<li><p><code>message</code></p>
-<p>  The warning message that will be printed whenever a user attempts to
-  install the package.</p>
-</li>
-</ul>
-<p>Note that you must be the package owner to deprecate something.  See the
-<code>owner</code> and <code>adduser</code> help topics.</p>
-<p>To un-deprecate a package, specify an empty string (<code>&quot;&quot;</code>) for the <code>message</code> argument.</p>
-<h2 id="see-also">SEE ALSO</h2>
-<ul>
-<li><a href="../api/npm-publish.html">npm-publish(3)</a></li>
-<li><a href="../api/npm-unpublish.html">npm-unpublish(3)</a></li>
-<li><a href="../misc/npm-registry.html">npm-registry(7)</a></li>
-</ul>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-deprecate &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-docs.html b/deps/npm/html/doc/api/npm-docs.html
deleted file mode 100644
index 8465f623973114..00000000000000
--- a/deps/npm/html/doc/api/npm-docs.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-docs</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-docs.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-docs.html">npm-docs</a></h1> <p>Docs for a package in a web browser maybe</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.docs(package, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This command tries to guess at the likely location of a package&#39;s
-documentation URL, and then tries to open it using the <code>--browser</code>
-config param.</p>
-<p>Like other commands, the first parameter is an array. This command only
-uses the first element, which is expected to be a package name with an
-optional version number.</p>
-<p>This command will launch a browser, so this command may not be the most
-friendly for programmatic use.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-docs &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-edit.html b/deps/npm/html/doc/api/npm-edit.html
deleted file mode 100644
index 1a51093886cdc4..00000000000000
--- a/deps/npm/html/doc/api/npm-edit.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-edit</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-edit.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-edit.html">npm-edit</a></h1> <p>Edit an installed package</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.edit(package, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>Opens the package folder in the default editor (or whatever you&#39;ve
-configured as the npm <code>editor</code> config -- see <code>npm help config</code>.)</p>
-<p>After it has been edited, the package is rebuilt so as to pick up any
-changes in compiled packages.</p>
-<p>For instance, you can do <code>npm install connect</code> to install connect
-into your package, and then <code>npm.commands.edit([&quot;connect&quot;], callback)</code>
-to make a few changes to your locally installed copy.</p>
-<p>The first parameter is a string array with a single element, the package
-to open. The package can optionally have a version number attached.</p>
-<p>Since this command opens an editor in a new process, be careful about where
-and how this is used.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-edit &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-explore.html b/deps/npm/html/doc/api/npm-explore.html
deleted file mode 100644
index fed88f0f13b028..00000000000000
--- a/deps/npm/html/doc/api/npm-explore.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-explore</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-explore.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-explore.html">npm-explore</a></h1> <p>Browse an installed package</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.explore(args, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>Spawn a subshell in the directory of the installed package specified.</p>
-<p>If a command is specified, then it is run in the subshell, which then
-immediately terminates.</p>
-<p>Note that the package is <em>not</em> automatically rebuilt afterwards, so be
-sure to use <code>npm rebuild &lt;pkg&gt;</code> if you make any changes.</p>
-<p>The first element in the &#39;args&#39; parameter must be a package name.  After that is the optional command, which can be any number of strings. All of the strings will be combined into one, space-delimited command.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-explore &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-help-search.html b/deps/npm/html/doc/api/npm-help-search.html
deleted file mode 100644
index e3560fe62c8cfb..00000000000000
--- a/deps/npm/html/doc/api/npm-help-search.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-help-search</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-help-search.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-help-search.html">npm-help-search</a></h1> <p>Search the help pages</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.helpSearch(args, [silent,] callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This command is rarely useful, but it exists in the rare case that it is.</p>
-<p>This command takes an array of search terms and returns the help pages that
-match in order of best match.</p>
-<p>If there is only one match, then npm displays that help section. If there
-are multiple results, the results are printed to the screen formatted and the
-array of results is returned. Each result is an object with these properties:</p>
-<ul>
-<li>hits:
-A map of args to number of hits on that arg. For example, {&quot;npm&quot;: 3}</li>
-<li>found:
-Total number of unique args that matched.</li>
-<li>totalHits:
-Total number of hits.</li>
-<li>lines:
-An array of all matching lines (and some adjacent lines).</li>
-<li>file:
-Name of the file that matched</li>
-</ul>
-<p>The silent parameter is not necessary not used, but it may in the future.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-help-search &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-init.html b/deps/npm/html/doc/api/npm-init.html
deleted file mode 100644
index c43ad57aff108a..00000000000000
--- a/deps/npm/html/doc/api/npm-init.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-init</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-init.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1>npm <a href="../api/init.html">init</a></h1> <p>Interactively create a package.json file</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.init(args, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This will ask you a bunch of questions, and then write a package.json for you.</p>
-<p>It attempts to make reasonable guesses about what you want things to be set to,
-and then writes a package.json file with the options you&#39;ve selected.</p>
-<p>If you already have a package.json file, it&#39;ll read that first, and default to
-the options in there.</p>
-<p>It is strictly additive, so it does not delete options from your package.json
-without a really good reason to do so.</p>
-<p>Since this function expects to be run on the command-line, it doesn&#39;t work very
-well as a programmatically. The best option is to roll your own, and since
-JavaScript makes it stupid simple to output formatted JSON, that is the
-preferred method. If you&#39;re sure you want to handle command-line prompting,
-then go ahead and use this programmatically.</p>
-<h2 id="see-also">SEE ALSO</h2>
-<p><a href="../files/package.json.html">package.json(5)</a></p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-init &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-install.html b/deps/npm/html/doc/api/npm-install.html
deleted file mode 100644
index 6d16e5f360fcd5..00000000000000
--- a/deps/npm/html/doc/api/npm-install.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-install</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-install.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-install.html">npm-install</a></h1> <p>install a package programmatically</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.install([where,] packages, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This acts much the same ways as installing on the command-line.</p>
-<p>The &#39;where&#39; parameter is optional and only used internally, and it specifies
-where the packages should be installed to.</p>
-<p>The &#39;packages&#39; parameter is an array of strings. Each element in the array is
-the name of a package to be installed.</p>
-<p>Finally, &#39;callback&#39; is a function that will be called when all packages have been
-installed or when an error has been encountered.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-install &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-link.html b/deps/npm/html/doc/api/npm-link.html
deleted file mode 100644
index 6ff53ac7992371..00000000000000
--- a/deps/npm/html/doc/api/npm-link.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-link</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-link.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-link.html">npm-link</a></h1> <p>Symlink a package folder</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.link(callback)
-npm.commands.link(packages, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>Package linking is a two-step process.</p>
-<p>Without parameters, link will create a globally-installed
-symbolic link from <code>prefix/package-name</code> to the current folder.</p>
-<p>With a parameters, link will create a symlink from the local <code>node_modules</code>
-folder to the global symlink.</p>
-<p>When creating tarballs for <code>npm publish</code>, the linked packages are
-&quot;snapshotted&quot; to their current state by resolving the symbolic links.</p>
-<p>This is
-handy for installing your own stuff, so that you can work on it and test it
-iteratively without having to continually rebuild.</p>
-<p>For example:</p>
-<pre><code>npm.commands.link(cb)           # creates global link from the cwd
-                                # (say redis package)
-npm.commands.link(&#39;redis&#39;, cb)  # link-install the package
-</code></pre><p>Now, any changes to the redis package will be reflected in
-the package in the current working directory</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-link &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-load.html b/deps/npm/html/doc/api/npm-load.html
deleted file mode 100644
index a500b7ac5cfd41..00000000000000
--- a/deps/npm/html/doc/api/npm-load.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-load</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-load.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-load.html">npm-load</a></h1> <p>Load config settings</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.load(conf, cb)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>npm.load() must be called before any other function call.  Both parameters are
-optional, but the second is recommended.</p>
-<p>The first parameter is an object containing command-line config params, and the
-second parameter is a callback that will be called when npm is loaded and ready
-to serve.</p>
-<p>The first parameter should follow a similar structure as the package.json
-config object.</p>
-<p>For example, to emulate the --dev flag, pass an object that looks like this:</p>
-<pre><code>{
-  &quot;dev&quot;: true
-}
-</code></pre><p>For a list of all the available command-line configs, see <code>npm help config</code></p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-load &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-ls.html b/deps/npm/html/doc/api/npm-ls.html
deleted file mode 100644
index fec0008537023f..00000000000000
--- a/deps/npm/html/doc/api/npm-ls.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-ls</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-ls.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-ls.html">npm-ls</a></h1> <p>List installed packages</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.ls(args, [silent,] callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This command will print to stdout all the versions of packages that are
-installed, as well as their dependencies, in a tree-structure. It will also
-return that data using the callback.</p>
-<p>This command does not take any arguments, but args must be defined.
-Beyond that, if any arguments are passed in, npm will politely warn that it
-does not take positional arguments, though you may set config flags
-like with any other command, such as <code>global</code> to list global packages.</p>
-<p>It will print out extraneous, missing, and invalid packages.</p>
-<p>If the silent parameter is set to true, nothing will be output to the screen,
-but the data will still be returned.</p>
-<p>Callback is provided an error if one occurred, the full data about which
-packages are installed and which dependencies they will receive, and a
-&quot;lite&quot; data object which just shows which versions are installed where.
-Note that the full data object is a circular structure, so care must be
-taken if it is serialized to JSON.</p>
-<h2 id="configuration">CONFIGURATION</h2>
-<h3 id="long">long</h3>
-<ul>
-<li>Default: false</li>
-<li>Type: Boolean</li>
-</ul>
-<p>Show extended information.</p>
-<h3 id="parseable">parseable</h3>
-<ul>
-<li>Default: false</li>
-<li>Type: Boolean</li>
-</ul>
-<p>Show parseable output instead of tree view.</p>
-<h3 id="global">global</h3>
-<ul>
-<li>Default: false</li>
-<li>Type: Boolean</li>
-</ul>
-<p>List packages in the global install prefix instead of in the current
-project.</p>
-<p>Note, if parseable is set or long isn&#39;t set, then duplicates will be trimmed.
-This means that if a submodule has the same dependency as a parent module, then the
-dependency will only be output once.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-ls &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-outdated.html b/deps/npm/html/doc/api/npm-outdated.html
deleted file mode 100644
index 560d73908ef862..00000000000000
--- a/deps/npm/html/doc/api/npm-outdated.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-outdated</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-outdated.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-outdated.html">npm-outdated</a></h1> <p>Check for outdated packages</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.outdated([packages,] callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This command will check the registry to see if the specified packages are
-currently outdated.</p>
-<p>If the &#39;packages&#39; parameter is left out, npm will check all packages.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-outdated &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-owner.html b/deps/npm/html/doc/api/npm-owner.html
deleted file mode 100644
index b725cab7595014..00000000000000
--- a/deps/npm/html/doc/api/npm-owner.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-owner</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-owner.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-owner.html">npm-owner</a></h1> <p>Manage package owners</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.owner(args, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>The first element of the &#39;args&#39; parameter defines what to do, and the subsequent
-elements depend on the action. Possible values for the action are (order of
-parameters are given in parenthesis):</p>
-<ul>
-<li>ls (package):
-List all the users who have access to modify a package and push new versions.
-Handy when you need to know who to bug for help.</li>
-<li>add (user, package):
-Add a new user as a maintainer of a package.  This user is enabled to modify
-metadata, publish new versions, and add other owners.</li>
-<li>rm (user, package):
-Remove a user from the package owner list.  This immediately revokes their
-privileges.</li>
-</ul>
-<p>Note that there is only one level of access.  Either you can modify a package,
-or you can&#39;t.  Future versions may contain more fine-grained access levels, but
-that is not implemented at this time.</p>
-<h2 id="see-also">SEE ALSO</h2>
-<ul>
-<li><a href="../api/npm-publish.html">npm-publish(3)</a></li>
-<li><a href="../misc/npm-registry.html">npm-registry(7)</a></li>
-</ul>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-owner &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-pack.html b/deps/npm/html/doc/api/npm-pack.html
deleted file mode 100644
index f4086f3b1d2d86..00000000000000
--- a/deps/npm/html/doc/api/npm-pack.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-pack</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-pack.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-pack.html">npm-pack</a></h1> <p>Create a tarball from a package</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.pack([packages,] callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>For anything that&#39;s installable (that is, a package folder, tarball,
-tarball url, name@tag, name@version, or name), this command will fetch
-it to the cache, and then copy the tarball to the current working
-directory as <code>&lt;name&gt;-&lt;version&gt;.tgz</code>, and then write the filenames out to
-stdout.</p>
-<p>If the same package is specified multiple times, then the file will be
-overwritten the second time.</p>
-<p>If no arguments are supplied, then npm packs the current package folder.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-pack &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-ping.html b/deps/npm/html/doc/api/npm-ping.html
deleted file mode 100644
index 1bafcbffc5869e..00000000000000
--- a/deps/npm/html/doc/api/npm-ping.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-ping</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-ping.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-ping.html">npm-ping</a></h1> <p>Ping npm registry</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.registry.ping(registry, options, function (er, pong))
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>Attempts to connect to the given registry, returning a <code>pong</code>
-object with various metadata if it succeeds.</p>
-<p>This function is primarily useful for debugging connection issues
-to npm registries.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-ping &mdash; npm@3.3.0</p>
diff --git a/deps/npm/html/doc/api/npm-prefix.html b/deps/npm/html/doc/api/npm-prefix.html
deleted file mode 100644
index 87cb6cc9ecbd40..00000000000000
--- a/deps/npm/html/doc/api/npm-prefix.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-prefix</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-prefix.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-prefix.html">npm-prefix</a></h1> <p>Display prefix</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.prefix(args, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>Print the prefix to standard out.</p>
-<p>&#39;args&#39; is never used and callback is never called with data.
-&#39;args&#39; must be present or things will break.</p>
-<p>This function is not useful programmatically</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-prefix &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-prune.html b/deps/npm/html/doc/api/npm-prune.html
deleted file mode 100644
index 886a63134fcfe7..00000000000000
--- a/deps/npm/html/doc/api/npm-prune.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-prune</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-prune.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-prune.html">npm-prune</a></h1> <p>Remove extraneous packages</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.prune([packages,] callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This command removes &quot;extraneous&quot; packages.</p>
-<p>The first parameter is optional, and it specifies packages to be removed.</p>
-<p>No packages are specified, then all packages will be checked.</p>
-<p>Extraneous packages are packages that are not listed on the parent
-package&#39;s dependencies list.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-prune &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-publish.html b/deps/npm/html/doc/api/npm-publish.html
deleted file mode 100644
index 4ca8c6897fc571..00000000000000
--- a/deps/npm/html/doc/api/npm-publish.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-publish</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-publish.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-publish.html">npm-publish</a></h1> <p>Publish a package</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.publish([packages,] callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>Publishes a package to the registry so that it can be installed by name.
-Possible values in the &#39;packages&#39; array are:</p>
-<ul>
-<li><p><code>&lt;folder&gt;</code>:
-A folder containing a package.json file</p>
-</li>
-<li><p><code>&lt;tarball&gt;</code>:
-A url or file path to a gzipped tar archive containing a single folder
-with a package.json file inside.</p>
-</li>
-</ul>
-<p>If the package array is empty, npm will try to publish something in the
-current working directory.</p>
-<p>This command could fails if one of the packages specified already exists in
-the registry.  Overwrites when the &quot;force&quot; environment variable is set.</p>
-<h2 id="see-also">SEE ALSO</h2>
-<ul>
-<li><a href="../misc/npm-registry.html">npm-registry(7)</a></li>
-<li><a href="../cli/npm-adduser.html">npm-adduser(1)</a></li>
-<li><a href="../api/npm-owner.html">npm-owner(3)</a></li>
-</ul>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-publish &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-rebuild.html b/deps/npm/html/doc/api/npm-rebuild.html
deleted file mode 100644
index 6f5c40d403fea3..00000000000000
--- a/deps/npm/html/doc/api/npm-rebuild.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-rebuild</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-rebuild.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-rebuild.html">npm-rebuild</a></h1> <p>Rebuild a package</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.rebuild([packages,] callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This command runs the <code>npm build</code> command on each of the matched packages.  This is useful
-when you install a new version of node, and must recompile all your C++ addons with
-the new binary. If no &#39;packages&#39; parameter is specify, every package will be rebuilt.</p>
-<h2 id="configuration">CONFIGURATION</h2>
-<p>See <code>npm help build</code></p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-rebuild &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-repo.html b/deps/npm/html/doc/api/npm-repo.html
deleted file mode 100644
index 44f799e7c2416d..00000000000000
--- a/deps/npm/html/doc/api/npm-repo.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-repo</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-repo.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-repo.html">npm-repo</a></h1> <p>Open package repository page in the browser</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.repo(package, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This command tries to guess at the likely location of a package&#39;s
-repository URL, and then tries to open it using the <code>--browser</code>
-config param.</p>
-<p>Like other commands, the first parameter is an array. This command only
-uses the first element, which is expected to be a package name with an
-optional version number.</p>
-<p>This command will launch a browser, so this command may not be the most
-friendly for programmatic use.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-repo &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-restart.html b/deps/npm/html/doc/api/npm-restart.html
deleted file mode 100644
index f31a949fe40d14..00000000000000
--- a/deps/npm/html/doc/api/npm-restart.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-restart</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-restart.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-restart.html">npm-restart</a></h1> <p>Restart a package</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.restart(packages, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This restarts a package (or multiple packages).</p>
-<p>This runs a package&#39;s &quot;stop&quot;, &quot;restart&quot;, and &quot;start&quot; scripts, and associated
-pre- and post- scripts, in the order given below:</p>
-<ol>
-<li>prerestart</li>
-<li>prestop</li>
-<li>stop</li>
-<li>poststop</li>
-<li>restart</li>
-<li>prestart</li>
-<li>start</li>
-<li>poststart</li>
-<li>postrestart</li>
-</ol>
-<p>If no version is specified, then it restarts the &quot;active&quot; version.</p>
-<p>npm can restart multiple packages. Just specify multiple packages in
-the <code>packages</code> parameter.</p>
-<h2 id="note">NOTE</h2>
-<p>Note that the &quot;restart&quot; script is run <strong>in addition to</strong> the &quot;stop&quot;
-and &quot;start&quot; scripts, not instead of them.</p>
-<p>This is the behavior as of <code>npm</code> major version 2.  A change in this
-behavior will be accompanied by an increase in major version number</p>
-<h2 id="see-also">SEE ALSO</h2>
-<ul>
-<li><a href="../api/npm-start.html">npm-start(3)</a></li>
-<li><a href="../api/npm-stop.html">npm-stop(3)</a></li>
-</ul>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-restart &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-root.html b/deps/npm/html/doc/api/npm-root.html
deleted file mode 100644
index bb10d3bd67ea42..00000000000000
--- a/deps/npm/html/doc/api/npm-root.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-root</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-root.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-root.html">npm-root</a></h1> <p>Display npm root</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.root(args, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>Print the effective <code>node_modules</code> folder to standard out.</p>
-<p>&#39;args&#39; is never used and callback is never called with data.
-&#39;args&#39; must be present or things will break.</p>
-<p>This function is not useful programmatically.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-root &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-run-script.html b/deps/npm/html/doc/api/npm-run-script.html
deleted file mode 100644
index 6625e0ec80264e..00000000000000
--- a/deps/npm/html/doc/api/npm-run-script.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-run-script</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-run-script.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-run-script.html">npm-run-script</a></h1> <p>Run arbitrary package scripts</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.run-script(args, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This runs an arbitrary command from a package&#39;s &quot;scripts&quot; object.</p>
-<p>It is used by the test, start, restart, and stop commands, but can be
-called directly, as well.</p>
-<p>The &#39;args&#39; parameter is an array of strings. Behavior depends on the number
-of elements.  If there is only one element, npm assumes that the element
-represents a command to be run on the local repository. If there is more than
-one element, then the first is assumed to be the package and the second is
-assumed to be the command to run. All other elements are ignored.</p>
-<h2 id="see-also">SEE ALSO</h2>
-<ul>
-<li><a href="../misc/npm-scripts.html">npm-scripts(7)</a></li>
-<li><a href="../api/npm-test.html">npm-test(3)</a></li>
-<li><a href="../api/npm-start.html">npm-start(3)</a></li>
-<li><a href="../api/npm-restart.html">npm-restart(3)</a></li>
-<li><a href="../api/npm-stop.html">npm-stop(3)</a></li>
-</ul>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-run-script &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-search.html b/deps/npm/html/doc/api/npm-search.html
deleted file mode 100644
index a7376b23ea799a..00000000000000
--- a/deps/npm/html/doc/api/npm-search.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-search</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-search.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-search.html">npm-search</a></h1> <p>Search for packages</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.search(searchTerms, [silent,] [staleness,] callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>Search the registry for packages matching the search terms. The available parameters are:</p>
-<ul>
-<li>searchTerms:
-Array of search terms. These terms are case-insensitive.</li>
-<li>silent:
-If true, npm will not log anything to the console.</li>
-<li>staleness:
-This is the threshold for stale packages. &quot;Fresh&quot; packages are not refreshed
-from the registry. This value is measured in seconds.</li>
-<li><p>callback:
-Returns an object where each key is the name of a package, and the value
-is information about that package along with a &#39;words&#39; property, which is
-a space-delimited string of all of the interesting words in that package.
-The only properties included are those that are searched, which generally include:</p>
-<ul>
-<li>name</li>
-<li>description</li>
-<li>maintainers</li>
-<li>url</li>
-<li>keywords</li>
-</ul>
-</li>
-</ul>
-<p>A search on the registry excludes any result that does not match all of the
-search terms. It also removes any items from the results that contain an
-excluded term (the &quot;searchexclude&quot; config). The search is case insensitive
-and doesn&#39;t try to read your mind (it doesn&#39;t do any verb tense matching or the
-like).</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-search &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-shrinkwrap.html b/deps/npm/html/doc/api/npm-shrinkwrap.html
deleted file mode 100644
index 5764ab1fd546fd..00000000000000
--- a/deps/npm/html/doc/api/npm-shrinkwrap.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-shrinkwrap</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-shrinkwrap.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-shrinkwrap.html">npm-shrinkwrap</a></h1> <p>programmatically generate package shrinkwrap file</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.shrinkwrap(args, [silent,] callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This acts much the same ways as shrinkwrapping on the command-line.</p>
-<p>This command does not take any arguments, but &#39;args&#39; must be defined.
-Beyond that, if any arguments are passed in, npm will politely warn that it
-does not take positional arguments.</p>
-<p>If the &#39;silent&#39; parameter is set to true, nothing will be output to the screen,
-but the shrinkwrap file will still be written.</p>
-<p>Finally, &#39;callback&#39; is a function that will be called when the shrinkwrap has
-been saved.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-shrinkwrap &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-start.html b/deps/npm/html/doc/api/npm-start.html
deleted file mode 100644
index 79eaea8608f3cd..00000000000000
--- a/deps/npm/html/doc/api/npm-start.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-start</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-start.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-start.html">npm-start</a></h1> <p>Start a package</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.start(packages, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This runs a package&#39;s &quot;start&quot; script, if one was provided.</p>
-<p>npm can start multiple packages. Just specify multiple packages in the
-<code>packages</code> parameter.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-start &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-stop.html b/deps/npm/html/doc/api/npm-stop.html
deleted file mode 100644
index e6dda89c7923cc..00000000000000
--- a/deps/npm/html/doc/api/npm-stop.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-stop</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-stop.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-stop.html">npm-stop</a></h1> <p>Stop a package</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.stop(packages, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This runs a package&#39;s &quot;stop&quot; script, if one was provided.</p>
-<p>npm can run stop on multiple packages. Just specify multiple packages
-in the <code>packages</code> parameter.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-stop &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-tag.html b/deps/npm/html/doc/api/npm-tag.html
deleted file mode 100644
index ccd9da2099cb7d..00000000000000
--- a/deps/npm/html/doc/api/npm-tag.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-tag</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-tag.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-tag.html">npm-tag</a></h1> <p>Tag a published version</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.tag(package@version, tag, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>Tags the specified version of the package with the specified tag, or the
-<code>--tag</code> config if not specified.</p>
-<p>The &#39;package@version&#39; is an array of strings, but only the first two elements are
-currently used.</p>
-<p>The first element must be in the form package@version, where package
-is the package name and version is the version number (much like installing a
-specific version).</p>
-<p>The second element is the name of the tag to tag this version with. If this
-parameter is missing or falsey (empty), the default from the config will be
-used. For more information about how to set this config, check
-<code>man 3 npm-config</code> for programmatic usage or <code>man npm-config</code> for cli usage.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-tag &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-test.html b/deps/npm/html/doc/api/npm-test.html
deleted file mode 100644
index 69bdab014bb7cd..00000000000000
--- a/deps/npm/html/doc/api/npm-test.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-test</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-test.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-test.html">npm-test</a></h1> <p>Test a package</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>  npm.commands.test(packages, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This runs a package&#39;s &quot;test&quot; script, if one was provided.</p>
-<p>To run tests as a condition of installation, set the <code>npat</code> config to
-true.</p>
-<p>npm can run tests on multiple packages. Just specify multiple packages
-in the <code>packages</code> parameter.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-test &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-uninstall.html b/deps/npm/html/doc/api/npm-uninstall.html
deleted file mode 100644
index c9cdf9f5da9d70..00000000000000
--- a/deps/npm/html/doc/api/npm-uninstall.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-uninstall</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-uninstall.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-uninstall.html">npm-uninstall</a></h1> <p>uninstall a package programmatically</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.uninstall(packages, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This acts much the same ways as uninstalling on the command-line.</p>
-<p>The &#39;packages&#39; parameter is an array of strings. Each element in the array is
-the name of a package to be uninstalled.</p>
-<p>Finally, &#39;callback&#39; is a function that will be called when all packages have been
-uninstalled or when an error has been encountered.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-uninstall &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-unpublish.html b/deps/npm/html/doc/api/npm-unpublish.html
deleted file mode 100644
index e489cef1115b56..00000000000000
--- a/deps/npm/html/doc/api/npm-unpublish.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-unpublish</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-unpublish.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-unpublish.html">npm-unpublish</a></h1> <p>Remove a package from the registry</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.unpublish(package, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This removes a package version from the registry, deleting its
-entry and removing the tarball.</p>
-<p>The package parameter must be defined.</p>
-<p>Only the first element in the package parameter is used.  If there is no first
-element, then npm assumes that the package at the current working directory
-is what is meant.</p>
-<p>If no version is specified, or if all versions are removed then
-the root package entry is removed from the registry entirely.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-unpublish &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-update.html b/deps/npm/html/doc/api/npm-update.html
deleted file mode 100644
index 7492b63ee8a89d..00000000000000
--- a/deps/npm/html/doc/api/npm-update.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-update</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-update.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-update.html">npm-update</a></h1> <p>Update a package</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.update(packages, callback)
-</code></pre><h1 id="description">DESCRIPTION</h1>
-<p>Updates a package, upgrading it to the latest version. It also installs any
-missing packages.</p>
-<p>The <code>packages</code> argument is an array of packages to update. The <code>callback</code>
-parameter will be called when done or when an error occurs.</p>
-<h2 id="see-also">SEE ALSO</h2>
-<ul>
-<li><a href="../cli/npm-update.html">npm-update(1)</a></li>
-</ul>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-update &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-version.html b/deps/npm/html/doc/api/npm-version.html
deleted file mode 100644
index 7ff3a475d967ee..00000000000000
--- a/deps/npm/html/doc/api/npm-version.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-version</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-version.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-version.html">npm-version</a></h1> <p>Bump a package version</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.version(newversion, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>Run this in a package directory to bump the version and write the new
-data back to the package.json file.</p>
-<p>If run in a git repo, it will also create a version commit and tag, and
-fail if the repo is not clean.</p>
-<p>Like all other commands, this function takes a string array as its first
-parameter. The difference, however, is this function will fail if it does
-not have exactly one element. The only element should be a version number.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-version &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-view.html b/deps/npm/html/doc/api/npm-view.html
deleted file mode 100644
index 8f8ccdff4ab9ad..00000000000000
--- a/deps/npm/html/doc/api/npm-view.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-view</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-view.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-view.html">npm-view</a></h1> <p>View registry info</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.view(args, [silent,] callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This command shows data about a package and prints it to the stream
-referenced by the <code>outfd</code> config, which defaults to stdout.</p>
-<p>The &quot;args&quot; parameter is an ordered list that closely resembles the command-line
-usage. The elements should be ordered such that the first element is
-the package and version (package@version). The version is optional. After that,
-the rest of the parameters are fields with optional subfields (&quot;field.subfield&quot;)
-which can be used to get only the information desired from the registry.</p>
-<p>The callback will be passed all of the data returned by the query.</p>
-<p>For example, to get the package registry entry for the <code>connect</code> package,
-you can do this:</p>
-<pre><code>npm.commands.view([&quot;connect&quot;], callback)
-</code></pre><p>If no version is specified, &quot;latest&quot; is assumed.</p>
-<p>Field names can be specified after the package descriptor.
-For example, to show the dependencies of the <code>ronn</code> package at version
-0.3.5, you could do the following:</p>
-<pre><code>npm.commands.view([&quot;ronn@0.3.5&quot;, &quot;dependencies&quot;], callback)
-</code></pre><p>You can view child field by separating them with a period.
-To view the git repository URL for the latest version of npm, you could
-do this:</p>
-<pre><code>npm.commands.view([&quot;npm&quot;, &quot;repository.url&quot;], callback)
-</code></pre><p>For fields that are arrays, requesting a non-numeric field will return
-all of the values from the objects in the list.  For example, to get all
-the contributor names for the &quot;express&quot; project, you can do this:</p>
-<pre><code>npm.commands.view([&quot;express&quot;, &quot;contributors.email&quot;], callback)
-</code></pre><p>You may also use numeric indices in square braces to specifically select
-an item in an array field.  To just get the email address of the first
-contributor in the list, you can do this:</p>
-<pre><code>npm.commands.view([&quot;express&quot;, &quot;contributors[0].email&quot;], callback)
-</code></pre><p>Multiple fields may be specified, and will be printed one after another.
-For exampls, to get all the contributor names and email addresses, you
-can do this:</p>
-<pre><code>npm.commands.view([&quot;express&quot;, &quot;contributors.name&quot;, &quot;contributors.email&quot;], callback)
-</code></pre><p>&quot;Person&quot; fields are shown as a string if they would be shown as an
-object.  So, for example, this will show the list of npm contributors in
-the shortened string format.  (See <code>npm help json</code> for more on this.)</p>
-<pre><code>npm.commands.view([&quot;npm&quot;, &quot;contributors&quot;], callback)
-</code></pre><p>If a version range is provided, then data will be printed for every
-matching version of the package.  This will show which version of jsdom
-was required by each matching version of yui3:</p>
-<pre><code>npm.commands.view([&quot;yui3@&gt;0.5.4&quot;, &quot;dependencies.jsdom&quot;], callback)
-</code></pre><h2 id="output">OUTPUT</h2>
-<p>If only a single string field for a single version is output, then it
-will not be colorized or quoted, so as to enable piping the output to
-another command.</p>
-<p>If the version range matches multiple versions, than each printed value
-will be prefixed with the version it applies to.</p>
-<p>If multiple fields are requested, than each of them are prefixed with
-the field name.</p>
-<p>Console output can be disabled by setting the &#39;silent&#39; parameter to true.</p>
-<h2 id="return-value">RETURN VALUE</h2>
-<p>The data returned will be an object in this formation:</p>
-<pre><code>{ &lt;version&gt;:
-  { &lt;field&gt;: &lt;value&gt;
-  , ... }
-, ... }
-</code></pre><p>corresponding to the list of fields selected.</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-view &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm-whoami.html b/deps/npm/html/doc/api/npm-whoami.html
deleted file mode 100644
index e56a2e5d837583..00000000000000
--- a/deps/npm/html/doc/api/npm-whoami.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-whoami</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-whoami.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm-whoami.html">npm-whoami</a></h1> <p>Display npm username</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm.commands.whoami(args, callback)
-</code></pre><h2 id="description">DESCRIPTION</h2>
-<p>Print the <code>username</code> config to standard output.</p>
-<p>&#39;args&#39; is never used and callback is never called with data.
-&#39;args&#39; must be present or things will break.</p>
-<p>This function is not useful programmatically</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-whoami &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/api/npm.html b/deps/npm/html/doc/api/npm.html
deleted file mode 100644
index 4911e3d59f257f..00000000000000
--- a/deps/npm/html/doc/api/npm.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../api/npm.html">npm</a></h1> <p>javascript package manager</p>
-<h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>var npm = require(&quot;npm&quot;)
-npm.load([configObject, ]function (er, npm) {
-  // use the npm object, now that it&#39;s loaded.
-
-  npm.config.set(key, val)
-  val = npm.config.get(key)
-
-  console.log(&quot;prefix = %s&quot;, npm.prefix)
-
-  npm.commands.install([&quot;package&quot;], cb)
-})
-</code></pre><h2 id="version">VERSION</h2>
-<p>3.3.0</p>
-<h2 id="description">DESCRIPTION</h2>
-<p>This is the API documentation for npm.
-To find documentation of the command line
-client, see <code><a href="../cli/npm.html">npm(1)</a></code>.</p>
-<p>Prior to using npm&#39;s commands, <code>npm.load()</code> must be called.  If you provide
-<code>configObject</code> as an object map of top-level configs, they override the values
-stored in the various config locations. In the npm command line client, this
-set of configs is parsed from the command line options. Additional
-configuration params are loaded from two configuration files. See
-<code><a href="../cli/npm-config.html">npm-config(1)</a></code>, <code><a href="../misc/npm-config.html">npm-config(7)</a></code>, and <code><a href="../files/npmrc.html">npmrc(5)</a></code> for more information.</p>
-<p>After that, each of the functions are accessible in the
-commands object: <code>npm.commands.&lt;cmd&gt;</code>.  See <code><a href="../misc/npm-index.html">npm-index(7)</a></code> for a list of
-all possible commands.</p>
-<p>All commands on the command object take an <strong>array</strong> of positional argument
-<strong>strings</strong>. The last argument to any function is a callback. Some
-commands take other optional arguments.</p>
-<p>Configs cannot currently be set on a per function basis, as each call to
-npm.config.set will change the value for <em>all</em> npm commands in that process.</p>
-<p>To find API documentation for a specific command, run the <code>npm apihelp</code>
-command.</p>
-<h2 id="methods-and-properties">METHODS AND PROPERTIES</h2>
-<ul>
-<li><p><code>npm.load(configs, cb)</code></p>
-<p>  Load the configuration params, and call the <code>cb</code> function once the
-  globalconfig and userconfig files have been loaded as well, or on
-  nextTick if they&#39;ve already been loaded.</p>
-</li>
-<li><p><code>npm.config</code></p>
-<p>  An object for accessing npm configuration parameters.</p>
-<ul>
-<li><code>npm.config.get(key)</code></li>
-<li><code>npm.config.set(key, val)</code></li>
-<li><code>npm.config.del(key)</code></li>
-</ul>
-</li>
-<li><p><code>npm.dir</code> or <code>npm.root</code></p>
-<p>  The <code>node_modules</code> directory where npm will operate.</p>
-</li>
-<li><p><code>npm.prefix</code></p>
-<p>  The prefix where npm is operating.  (Most often the current working
-  directory.)</p>
-</li>
-<li><p><code>npm.cache</code></p>
-<p>  The place where npm keeps JSON and tarballs it fetches from the
-  registry (or uploads to the registry).</p>
-</li>
-<li><p><code>npm.tmp</code></p>
-<p>  npm&#39;s temporary working directory.</p>
-</li>
-<li><p><code>npm.deref</code></p>
-<p>  Get the &quot;real&quot; name for a command that has either an alias or
-  abbreviation.</p>
-</li>
-</ul>
-<h2 id="magic">MAGIC</h2>
-<p>For each of the methods in the <code>npm.commands</code> object, a method is added to the
-npm object, which takes a set of positional string arguments rather than an
-array and a callback.</p>
-<p>If the last argument is a callback, then it will use the supplied
-callback.  However, if no callback is provided, then it will print out
-the error or results.</p>
-<p>For example, this would work in a node repl:</p>
-<pre><code>&gt; npm = require(&quot;npm&quot;)
-&gt; npm.load()  // wait a sec...
-&gt; npm.install(&quot;dnode&quot;, &quot;express&quot;)
-</code></pre><p>Note that that <em>won&#39;t</em> work in a node program, since the <code>install</code>
-method will get called before the configuration load is completed.</p>
-<h2 id="abbrevs">ABBREVS</h2>
-<p>In order to support <code>npm ins foo</code> instead of <code>npm install foo</code>, the
-<code>npm.commands</code> object has a set of abbreviations as well as the full
-method names.  Use the <code>npm.deref</code> method to find the real name.</p>
-<p>For example:</p>
-<pre><code>var cmd = npm.deref(&quot;unp&quot;) // cmd === &quot;unpublish&quot;
-</code></pre>
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm &mdash; npm@3.3.0</p>
-
diff --git a/deps/npm/html/doc/cli/npm-access.html b/deps/npm/html/doc/cli/npm-access.html
index 15eb34c86a811f..4dc5109437d1f3 100644
--- a/deps/npm/html/doc/cli/npm-access.html
+++ b/deps/npm/html/doc/cli/npm-access.html
@@ -84,5 +84,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-access &mdash; npm@3.3.6</p>
+<p id="footer">npm-access &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-adduser.html b/deps/npm/html/doc/cli/npm-adduser.html
index 5b19a67f4f4d85..6a2cfe30b2df55 100644
--- a/deps/npm/html/doc/cli/npm-adduser.html
+++ b/deps/npm/html/doc/cli/npm-adduser.html
@@ -68,5 +68,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-adduser &mdash; npm@3.3.6</p>
+<p id="footer">npm-adduser &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-bin.html b/deps/npm/html/doc/cli/npm-bin.html
index 050f8642595478..66deeef77ad1ed 100644
--- a/deps/npm/html/doc/cli/npm-bin.html
+++ b/deps/npm/html/doc/cli/npm-bin.html
@@ -11,7 +11,7 @@
 
 <h1><a href="../cli/npm-bin.html">npm-bin</a></h1> <p>Display npm bin folder</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm bin [--global]
+<pre><code>npm bin [-g|--global]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>Print the folder where npm will install executables.</p>
 <h2 id="see-also">SEE ALSO</h2>
@@ -35,5 +35,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bin &mdash; npm@3.3.6</p>
+<p id="footer">npm-bin &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-bugs.html b/deps/npm/html/doc/cli/npm-bugs.html
index 02a2e932c151ee..3012d3bc3bef9f 100644
--- a/deps/npm/html/doc/cli/npm-bugs.html
+++ b/deps/npm/html/doc/cli/npm-bugs.html
@@ -53,5 +53,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bugs &mdash; npm@3.3.6</p>
+<p id="footer">npm-bugs &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-build.html b/deps/npm/html/doc/cli/npm-build.html
index b8689f190ee471..20c93e65da201c 100644
--- a/deps/npm/html/doc/cli/npm-build.html
+++ b/deps/npm/html/doc/cli/npm-build.html
@@ -40,5 +40,5 @@ <h2 id="description">DESCRIPTION</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-build &mdash; npm@3.3.6</p>
+<p id="footer">npm-build &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-bundle.html b/deps/npm/html/doc/cli/npm-bundle.html
index 18cb054696e918..e5451025f4f43e 100644
--- a/deps/npm/html/doc/cli/npm-bundle.html
+++ b/deps/npm/html/doc/cli/npm-bundle.html
@@ -31,5 +31,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bundle &mdash; npm@3.3.6</p>
+<p id="footer">npm-bundle &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-cache.html b/deps/npm/html/doc/cli/npm-cache.html
index e9da236630f631..f21cd7129ae3b3 100644
--- a/deps/npm/html/doc/cli/npm-cache.html
+++ b/deps/npm/html/doc/cli/npm-cache.html
@@ -81,5 +81,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-cache &mdash; npm@3.3.6</p>
+<p id="footer">npm-cache &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-completion.html b/deps/npm/html/doc/cli/npm-completion.html
index 48f05ec3f6fef3..97231f7bcb2099 100644
--- a/deps/npm/html/doc/cli/npm-completion.html
+++ b/deps/npm/html/doc/cli/npm-completion.html
@@ -44,5 +44,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-completion &mdash; npm@3.3.6</p>
+<p id="footer">npm-completion &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-config.html b/deps/npm/html/doc/cli/npm-config.html
index 86b13ad58172a6..bae456681fd22e 100644
--- a/deps/npm/html/doc/cli/npm-config.html
+++ b/deps/npm/html/doc/cli/npm-config.html
@@ -11,13 +11,13 @@
 
 <h1><a href="../cli/npm-config.html">npm-config</a></h1> <p>Manage the npm configuration files</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm config set &lt;key&gt; &lt;value&gt; [--global]
+<pre><code>npm config set &lt;key&gt; &lt;value&gt; [-g|--global]
 npm config get &lt;key&gt;
 npm config delete &lt;key&gt;
 npm config list
 npm config edit
 npm get &lt;key&gt;
-npm set &lt;key&gt; &lt;value&gt; [--global]
+npm set &lt;key&gt; &lt;value&gt; [-g|--global]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>npm gets its config settings from the command line, environment
 variables, <code>npmrc</code> files, and in some cases, the <code>package.json</code> file.</p>
@@ -65,5 +65,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-config &mdash; npm@3.3.6</p>
+<p id="footer">npm-config &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-dedupe.html b/deps/npm/html/doc/cli/npm-dedupe.html
index 520d5158d73314..29a829d8b80fab 100644
--- a/deps/npm/html/doc/cli/npm-dedupe.html
+++ b/deps/npm/html/doc/cli/npm-dedupe.html
@@ -59,5 +59,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-dedupe &mdash; npm@3.3.6</p>
+<p id="footer">npm-dedupe &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-deprecate.html b/deps/npm/html/doc/cli/npm-deprecate.html
index 33d09e1959e0f1..3d979c7f6ace64 100644
--- a/deps/npm/html/doc/cli/npm-deprecate.html
+++ b/deps/npm/html/doc/cli/npm-deprecate.html
@@ -38,5 +38,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-deprecate &mdash; npm@3.3.6</p>
+<p id="footer">npm-deprecate &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-dist-tag.html b/deps/npm/html/doc/cli/npm-dist-tag.html
index 3435ecc32bbf15..971b4da97f9206 100644
--- a/deps/npm/html/doc/cli/npm-dist-tag.html
+++ b/deps/npm/html/doc/cli/npm-dist-tag.html
@@ -77,5 +77,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-dist-tag &mdash; npm@3.3.6</p>
+<p id="footer">npm-dist-tag &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-docs.html b/deps/npm/html/doc/cli/npm-docs.html
index 7a9028f783e3b1..e8567ed8140e5e 100644
--- a/deps/npm/html/doc/cli/npm-docs.html
+++ b/deps/npm/html/doc/cli/npm-docs.html
@@ -56,5 +56,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-docs &mdash; npm@3.3.6</p>
+<p id="footer">npm-docs &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-edit.html b/deps/npm/html/doc/cli/npm-edit.html
index 8d1bfc1efad920..5e1c5bab5d9b17 100644
--- a/deps/npm/html/doc/cli/npm-edit.html
+++ b/deps/npm/html/doc/cli/npm-edit.html
@@ -49,5 +49,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-edit &mdash; npm@3.3.6</p>
+<p id="footer">npm-edit &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-explore.html b/deps/npm/html/doc/cli/npm-explore.html
index 8be4b5af9a3806..ed8115d17f0027 100644
--- a/deps/npm/html/doc/cli/npm-explore.html
+++ b/deps/npm/html/doc/cli/npm-explore.html
@@ -49,5 +49,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-explore &mdash; npm@3.3.6</p>
+<p id="footer">npm-explore &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-help-search.html b/deps/npm/html/doc/cli/npm-help-search.html
index ad9182bfdf40c6..945211aa0ebb38 100644
--- a/deps/npm/html/doc/cli/npm-help-search.html
+++ b/deps/npm/html/doc/cli/npm-help-search.html
@@ -46,5 +46,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-help-search &mdash; npm@3.3.6</p>
+<p id="footer">npm-help-search &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-help.html b/deps/npm/html/doc/cli/npm-help.html
index 6678a564a3d81d..4c8a49404dfec6 100644
--- a/deps/npm/html/doc/cli/npm-help.html
+++ b/deps/npm/html/doc/cli/npm-help.html
@@ -51,5 +51,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-help &mdash; npm@3.3.6</p>
+<p id="footer">npm-help &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-init.html b/deps/npm/html/doc/cli/npm-init.html
index c3e3443039e77d..8d659da98bf80b 100644
--- a/deps/npm/html/doc/cli/npm-init.html
+++ b/deps/npm/html/doc/cli/npm-init.html
@@ -11,7 +11,7 @@
 
 <h1><a href="../cli/npm-init.html">npm-init</a></h1> <p>Interactively create a package.json file</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm init [--force|-f|--yes|-y]
+<pre><code>npm init [-f|--force|-y|--yes]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This will ask you a bunch of questions, and then write a package.json for you.</p>
 <p>It attempts to make reasonable guesses about what you want things to be set to,
@@ -48,5 +48,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-init &mdash; npm@3.3.6</p>
+<p id="footer">npm-init &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-install.html b/deps/npm/html/doc/cli/npm-install.html
index 63057da690606d..f9b2466670fab0 100644
--- a/deps/npm/html/doc/cli/npm-install.html
+++ b/deps/npm/html/doc/cli/npm-install.html
@@ -21,7 +21,7 @@ <h2 id="synopsis">SYNOPSIS</h2>
 npm install &lt;folder&gt;
 
 alias: npm i
-common options: [--save|--save-dev|--save-optional] [--save-exact] [--dry-run]
+common options: [-S|--save|-D|--save-dev|-O|--save-optional] [-E|--save-exact] [--dry-run]
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This command installs a package, and any packages that it depends on. If the
 package has a shrinkwrap file, the installation of dependencies will be driven
@@ -67,7 +67,7 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <p>  Example:</p>
 <pre><code>    npm install https://github.com/indexzero/forever/tarball/v0.5.6
 </code></pre></li>
-<li><p><code>npm install [&lt;@scope&gt;/]&lt;name&gt; [--save|--save-dev|--save-optional]</code>:</p>
+<li><p><code>npm install [&lt;@scope&gt;/]&lt;name&gt; [-S|--save|-D|--save-dev|-O|--save-optional]</code>:</p>
 <p>  Do a <code>&lt;name&gt;@&lt;tag&gt;</code> install, where <code>&lt;tag&gt;</code> is the &quot;tag&quot; config. (See
   <code><a href="../misc/npm-config.html">npm-config(7)</a></code>.)</p>
 <p>  In most cases, this will install the latest version
@@ -77,15 +77,15 @@ <h2 id="synopsis">SYNOPSIS</h2>
 </code></pre><p>  <code>npm install</code> takes 3 exclusive, optional flags which save or update
   the package version in your main package.json:</p>
 <ul>
-<li><p><code>--save</code>: Package will appear in your <code>dependencies</code>.</p>
+<li><p><code>-S, --save</code>: Package will appear in your <code>dependencies</code>.</p>
 </li>
-<li><p><code>--save-dev</code>: Package will appear in your <code>devDependencies</code>.</p>
+<li><p><code>-D, --save-dev</code>: Package will appear in your <code>devDependencies</code>.</p>
 </li>
-<li><p><code>--save-optional</code>: Package will appear in your <code>optionalDependencies</code>.</p>
+<li><p><code>-O, --save-optional</code>: Package will appear in your <code>optionalDependencies</code>.</p>
 <p>When using any of the above options to save dependencies to your
 package.json, there is an additional, optional flag:</p>
 </li>
-<li><p><code>--save-exact</code>: Saved dependencies will be configured with an
+<li><p><code>-E, --save-exact</code>: Saved dependencies will be configured with an
 exact version rather than using npm&#39;s default semver range
 operator.</p>
 <p>Further, if you have an <code>npm-shrinkwrap.json</code> then it will be updated as
@@ -173,7 +173,7 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <li><p><code>npm install gist:[&lt;githubname&gt;/]&lt;gistID&gt;[#&lt;commit-ish&gt;]</code>:</p>
 <p>  Install the package at <code>https://gist.github.com/gistID</code> by attempting to
   clone it using <code>git</code>. The GitHub username associated with the gist is
-  optional and will not be saved in <code>package.json</code> if <code>--save</code> is used.</p>
+  optional and will not be saved in <code>package.json</code> if <code>-S</code> or <code>--save</code> is used.</p>
 <p>  If you don&#39;t specify a <em>commit-ish</em> then <code>master</code> will be used.</p>
 <p>  Example:</p>
 <pre><code>    npm install gist:101a11beef
@@ -201,10 +201,10 @@ <h2 id="synopsis">SYNOPSIS</h2>
 versions.</p>
 <p>The <code>--dry-run</code> argument will report in the usual way what the install would
 have done without actually installing anything.</p>
-<p>The <code>--force</code> argument will force npm to fetch remote resources even if a
+<p>The <code>-f</code> or <code>--force</code> argument will force npm to fetch remote resources even if a
 local copy exists on disk.</p>
 <pre><code>npm install sax --force
-</code></pre><p>The <code>--global</code> argument will cause npm to install the package globally
+</code></pre><p>The <code>-g</code> or <code>--global</code> argument will cause npm to install the package globally
 rather than locally.  See <code><a href="../files/npm-folders.html">npm-folders(5)</a></code>.</p>
 <p>The <code>--link</code> argument will cause npm to link global installs into the
 local space in some cases.</p>
@@ -217,7 +217,7 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <p>The <code>--nodedir=/path/to/node/source</code> argument will allow npm to find the
 node source code so that npm can compile native modules.</p>
 <p>The <code>--only={prod[uction]|dev[elopment]}</code> argument will cause either only
-<code>devDependencies</code> or only non-<code>devDependencies</code> to be installed.</p>
+<code>devDependencies</code> or only non-<code>devDependencies</code> to be installed regardless of the <code>NODE_ENV</code>.</p>
 <p>See <code><a href="../misc/npm-config.html">npm-config(7)</a></code>.  Many of the configuration params have some
 effect on installation, since that&#39;s most of what npm does.</p>
 <h2 id="algorithm">ALGORITHM</h2>
@@ -247,7 +247,7 @@ <h2 id="algorithm">ALGORITHM</h2>
 +-- C
    `-- D@2
 +-- D@1
-</code></pre><p>Because B&#39;s D@1 will be installed in the top leve, C now has to install D@2
+</code></pre><p>Because B&#39;s D@1 will be installed in the top level, C now has to install D@2
 privately for itself.</p>
 <p>See <a href="../files/npm-folders.html">npm-folders(5)</a> for a more detailed description of the specific
 folder structures that npm creates.</p>
@@ -295,5 +295,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-install &mdash; npm@3.3.6</p>
+<p id="footer">npm-install &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-link.html b/deps/npm/html/doc/cli/npm-link.html
index 0a944aff94d27f..bd635316f6a2b2 100644
--- a/deps/npm/html/doc/cli/npm-link.html
+++ b/deps/npm/html/doc/cli/npm-link.html
@@ -73,5 +73,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-link &mdash; npm@3.3.6</p>
+<p id="footer">npm-link &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-logout.html b/deps/npm/html/doc/cli/npm-logout.html
index 7fa51c9c136675..c4c06c5f6ca35b 100644
--- a/deps/npm/html/doc/cli/npm-logout.html
+++ b/deps/npm/html/doc/cli/npm-logout.html
@@ -55,5 +55,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-logout &mdash; npm@3.3.6</p>
+<p id="footer">npm-logout &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-ls.html b/deps/npm/html/doc/cli/npm-ls.html
index 73144c1681f530..37efcccbda80ab 100644
--- a/deps/npm/html/doc/cli/npm-ls.html
+++ b/deps/npm/html/doc/cli/npm-ls.html
@@ -21,7 +21,7 @@ <h2 id="synopsis">SYNOPSIS</h2>
 limit the results to only the paths to the packages named.  Note that
 nested packages will <em>also</em> show the paths to the specified packages.
 For example, running <code>npm ls promzard</code> in npm&#39;s source tree will show:</p>
-<pre><code>npm@3.3.6 /path/to/npm
+<pre><code>npm@3.3.10 /path/to/npm
 └─┬ init-package-json@0.0.4
   └── promzard@0.1.5
 </code></pre><p>It will print out extraneous, missing, and invalid packages.</p>
@@ -104,5 +104,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-ls &mdash; npm@3.3.6</p>
+<p id="footer">npm-ls &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-outdated.html b/deps/npm/html/doc/cli/npm-outdated.html
index 5a5f67b9421320..3f2962a73389e8 100644
--- a/deps/npm/html/doc/cli/npm-outdated.html
+++ b/deps/npm/html/doc/cli/npm-outdated.html
@@ -67,5 +67,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-outdated &mdash; npm@3.3.6</p>
+<p id="footer">npm-outdated &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-owner.html b/deps/npm/html/doc/cli/npm-owner.html
index 6cbc0f4bdef925..896c36ef3fdcfa 100644
--- a/deps/npm/html/doc/cli/npm-owner.html
+++ b/deps/npm/html/doc/cli/npm-owner.html
@@ -49,5 +49,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-owner &mdash; npm@3.3.6</p>
+<p id="footer">npm-owner &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-pack.html b/deps/npm/html/doc/cli/npm-pack.html
index 7abf2f572b8140..33866136f16bbf 100644
--- a/deps/npm/html/doc/cli/npm-pack.html
+++ b/deps/npm/html/doc/cli/npm-pack.html
@@ -41,5 +41,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-pack &mdash; npm@3.3.6</p>
+<p id="footer">npm-pack &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-ping.html b/deps/npm/html/doc/cli/npm-ping.html
index 4a78052b6c172c..1bdcbae6600002 100644
--- a/deps/npm/html/doc/cli/npm-ping.html
+++ b/deps/npm/html/doc/cli/npm-ping.html
@@ -32,4 +32,4 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-ping &mdash; npm@3.3.6</p>
+<p id="footer">npm-ping &mdash; npm@3.3.10</p>
diff --git a/deps/npm/html/doc/cli/npm-prefix.html b/deps/npm/html/doc/cli/npm-prefix.html
index 26aa01fda04d6b..f011cd8cdede1d 100644
--- a/deps/npm/html/doc/cli/npm-prefix.html
+++ b/deps/npm/html/doc/cli/npm-prefix.html
@@ -38,5 +38,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-prefix &mdash; npm@3.3.6</p>
+<p id="footer">npm-prefix &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-prune.html b/deps/npm/html/doc/cli/npm-prune.html
index 88d57ece8c8af5..bea2e1dcb828df 100644
--- a/deps/npm/html/doc/cli/npm-prune.html
+++ b/deps/npm/html/doc/cli/npm-prune.html
@@ -40,5 +40,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-prune &mdash; npm@3.3.6</p>
+<p id="footer">npm-prune &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-publish.html b/deps/npm/html/doc/cli/npm-publish.html
index bc5884d872a797..6111db07add5dc 100644
--- a/deps/npm/html/doc/cli/npm-publish.html
+++ b/deps/npm/html/doc/cli/npm-publish.html
@@ -68,5 +68,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-publish &mdash; npm@3.3.6</p>
+<p id="footer">npm-publish &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-rebuild.html b/deps/npm/html/doc/cli/npm-rebuild.html
index 92ef96425b8a16..c27b9386ab5c45 100644
--- a/deps/npm/html/doc/cli/npm-rebuild.html
+++ b/deps/npm/html/doc/cli/npm-rebuild.html
@@ -35,5 +35,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-rebuild &mdash; npm@3.3.6</p>
+<p id="footer">npm-rebuild &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-repo.html b/deps/npm/html/doc/cli/npm-repo.html
index 1d1445eafb492e..b2b723baf08bb9 100644
--- a/deps/npm/html/doc/cli/npm-repo.html
+++ b/deps/npm/html/doc/cli/npm-repo.html
@@ -41,5 +41,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-repo &mdash; npm@3.3.6</p>
+<p id="footer">npm-repo &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-restart.html b/deps/npm/html/doc/cli/npm-restart.html
index 555c9fbeedda8f..05763c00ede120 100644
--- a/deps/npm/html/doc/cli/npm-restart.html
+++ b/deps/npm/html/doc/cli/npm-restart.html
@@ -53,5 +53,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-restart &mdash; npm@3.3.6</p>
+<p id="footer">npm-restart &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-root.html b/deps/npm/html/doc/cli/npm-root.html
index e8e2a1890f1fe7..293f363ff1c3ea 100644
--- a/deps/npm/html/doc/cli/npm-root.html
+++ b/deps/npm/html/doc/cli/npm-root.html
@@ -35,5 +35,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-root &mdash; npm@3.3.6</p>
+<p id="footer">npm-root &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-run-script.html b/deps/npm/html/doc/cli/npm-run-script.html
index 39f4d0d60b123a..9aaf6d9282a26f 100644
--- a/deps/npm/html/doc/cli/npm-run-script.html
+++ b/deps/npm/html/doc/cli/npm-run-script.html
@@ -58,5 +58,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-run-script &mdash; npm@3.3.6</p>
+<p id="footer">npm-run-script &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-search.html b/deps/npm/html/doc/cli/npm-search.html
index 25ff96e1e85e47..3aaabac7efefb8 100644
--- a/deps/npm/html/doc/cli/npm-search.html
+++ b/deps/npm/html/doc/cli/npm-search.html
@@ -11,7 +11,7 @@
 
 <h1><a href="../cli/npm-search.html">npm-search</a></h1> <p>Search for packages</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm search [--long] [search terms ...]
+<pre><code>npm search [-l|--long] [search terms ...]
 
 aliases: s, se
 </code></pre><h2 id="description">DESCRIPTION</h2>
@@ -49,5 +49,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-search &mdash; npm@3.3.6</p>
+<p id="footer">npm-search &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-shrinkwrap.html b/deps/npm/html/doc/cli/npm-shrinkwrap.html
index 66e3b084869395..80d619900cc7be 100644
--- a/deps/npm/html/doc/cli/npm-shrinkwrap.html
+++ b/deps/npm/html/doc/cli/npm-shrinkwrap.html
@@ -96,7 +96,7 @@ <h2 id="synopsis">SYNOPSIS</h2>
 referenced in &quot;resolved&quot; if available, falling back to normal package
 resolution using &quot;version&quot; if one isn&#39;t.</p>
 </li>
-<li><p>The tree is walked and any missing dependencies are installed in the usual fasion.</p>
+<li><p>The tree is walked and any missing dependencies are installed in the usual fashion.</p>
 </li>
 </ol>
 <h3 id="using-shrinkwrapped-packages">Using shrinkwrapped packages</h3>
@@ -169,5 +169,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-shrinkwrap &mdash; npm@3.3.6</p>
+<p id="footer">npm-shrinkwrap &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-star.html b/deps/npm/html/doc/cli/npm-star.html
index c6a97f4192d3c6..912b5c9c9219d9 100644
--- a/deps/npm/html/doc/cli/npm-star.html
+++ b/deps/npm/html/doc/cli/npm-star.html
@@ -36,5 +36,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-star &mdash; npm@3.3.6</p>
+<p id="footer">npm-star &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-stars.html b/deps/npm/html/doc/cli/npm-stars.html
index 47aac754d33cab..d10998a7bbdde8 100644
--- a/deps/npm/html/doc/cli/npm-stars.html
+++ b/deps/npm/html/doc/cli/npm-stars.html
@@ -36,5 +36,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-stars &mdash; npm@3.3.6</p>
+<p id="footer">npm-stars &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-start.html b/deps/npm/html/doc/cli/npm-start.html
index 1b5fb427f15ce3..67541cf105abc4 100644
--- a/deps/npm/html/doc/cli/npm-start.html
+++ b/deps/npm/html/doc/cli/npm-start.html
@@ -34,5 +34,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-start &mdash; npm@3.3.6</p>
+<p id="footer">npm-start &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-stop.html b/deps/npm/html/doc/cli/npm-stop.html
index b7b63c246289ca..272b1671ae91cf 100644
--- a/deps/npm/html/doc/cli/npm-stop.html
+++ b/deps/npm/html/doc/cli/npm-stop.html
@@ -34,5 +34,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-stop &mdash; npm@3.3.6</p>
+<p id="footer">npm-stop &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-tag.html b/deps/npm/html/doc/cli/npm-tag.html
index 2a23eccd4a71ae..a1a8fae758f1ef 100644
--- a/deps/npm/html/doc/cli/npm-tag.html
+++ b/deps/npm/html/doc/cli/npm-tag.html
@@ -63,5 +63,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-tag &mdash; npm@3.3.6</p>
+<p id="footer">npm-tag &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-team.html b/deps/npm/html/doc/cli/npm-team.html
index 60333b6c37669b..be30e097d4761f 100644
--- a/deps/npm/html/doc/cli/npm-team.html
+++ b/deps/npm/html/doc/cli/npm-team.html
@@ -23,7 +23,7 @@ <h2 id="synopsis">SYNOPSIS</h2>
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>Used to manage teams in organizations, and change team memberships. Does not
 handle permissions for packages.</p>
-<p>Teams must always be fully qualified with the organization/scope they belond to
+<p>Teams must always be fully qualified with the organization/scope they belong to
 when operating on them, separated by a colon (<code>:</code>). That is, if you have a
 <code>developers</code> team on a <code>foo</code> organization, you must always refer to that team as
 <code>developers:foo</code> in these commands.</p>
@@ -53,7 +53,7 @@ <h2 id="details">DETAILS</h2>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
 <li><a href="../cli/npm-access.html">npm-access(1)</a></li>
-<li><a href="../misc/npm-registr.html">npm-registr(7)</a></li>
+<li><a href="../misc/npm-registry.html">npm-registry(7)</a></li>
 </ul>
 
 </div>
@@ -67,4 +67,4 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-team &mdash; npm@3.3.6</p>
+<p id="footer">npm-team &mdash; npm@3.3.10</p>
diff --git a/deps/npm/html/doc/cli/npm-test.html b/deps/npm/html/doc/cli/npm-test.html
index c48b3f6070740e..6b14474fe31f91 100644
--- a/deps/npm/html/doc/cli/npm-test.html
+++ b/deps/npm/html/doc/cli/npm-test.html
@@ -37,5 +37,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-test &mdash; npm@3.3.6</p>
+<p id="footer">npm-test &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-uninstall.html b/deps/npm/html/doc/cli/npm-uninstall.html
index 6d7429bbd7af95..3d27d4c34446df 100644
--- a/deps/npm/html/doc/cli/npm-uninstall.html
+++ b/deps/npm/html/doc/cli/npm-uninstall.html
@@ -11,7 +11,7 @@
 
 <h1><a href="../cli/npm-rm.html">npm-rm</a></h1> <p>Remove a package</p>
 <h2 id="synopsis">SYNOPSIS</h2>
-<pre><code>npm uninstall [&lt;@scope&gt;/]&lt;pkg&gt;[@&lt;version&gt;]... [--save|--save-dev|--save-optional]
+<pre><code>npm uninstall [&lt;@scope&gt;/]&lt;pkg&gt;[@&lt;version&gt;]... [-S|--save|-D|--save-dev|-O|--save-optional]
 
 aliases: remove, rm, r, un, unlink
 </code></pre><h2 id="description">DESCRIPTION</h2>
@@ -24,11 +24,11 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <p><code>npm uninstall</code> takes 3 exclusive, optional flags which save or update
 the package version in your main package.json:</p>
 <ul>
-<li><p><code>--save</code>: Package will be removed from your <code>dependencies</code>.</p>
+<li><p><code>-S, --save</code>: Package will be removed from your <code>dependencies</code>.</p>
 </li>
-<li><p><code>--save-dev</code>: Package will be removed from your <code>devDependencies</code>.</p>
+<li><p><code>-D, --save-dev</code>: Package will be removed from your <code>devDependencies</code>.</p>
 </li>
-<li><p><code>--save-optional</code>: Package will be removed from your <code>optionalDependencies</code>.</p>
+<li><p><code>-O, --save-optional</code>: Package will be removed from your <code>optionalDependencies</code>.</p>
 </li>
 </ul>
 <p>Further, if you have an <code>npm-shrinkwrap.json</code> then it will be updated as
@@ -60,5 +60,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-uninstall &mdash; npm@3.3.6</p>
+<p id="footer">npm-uninstall &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-unpublish.html b/deps/npm/html/doc/cli/npm-unpublish.html
index a5495578f4049e..cdc95a6d8857e4 100644
--- a/deps/npm/html/doc/cli/npm-unpublish.html
+++ b/deps/npm/html/doc/cli/npm-unpublish.html
@@ -47,5 +47,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-unpublish &mdash; npm@3.3.6</p>
+<p id="footer">npm-unpublish &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-update.html b/deps/npm/html/doc/cli/npm-update.html
index 0dcbb63f3058cc..9b943b8a944072 100644
--- a/deps/npm/html/doc/cli/npm-update.html
+++ b/deps/npm/html/doc/cli/npm-update.html
@@ -81,7 +81,8 @@ <h3 id="caret-dependencies-below-1-0-0">Caret Dependencies below 1.0.0</h3>
 <h3 id="recording-updates-with-save-">Recording Updates with <code>--save</code></h3>
 <p>When you want to update a package and save the new version as
 the minimum required dependency in <code>package.json</code>, you can use
-<code>npm update --save</code>.  For example if <code>package.json</code> contains</p>
+<code>npm update -S</code> or <code>npm update --save</code>.  For example if
+<code>package.json</code> contains:</p>
 <pre><code>dependencies: {
   dep1: &quot;^1.1.1&quot;
 }
@@ -119,5 +120,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-update &mdash; npm@3.3.6</p>
+<p id="footer">npm-update &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-version.html b/deps/npm/html/doc/cli/npm-version.html
index 3c03604995ba4a..df22f0ac08b126 100644
--- a/deps/npm/html/doc/cli/npm-version.html
+++ b/deps/npm/html/doc/cli/npm-version.html
@@ -13,7 +13,7 @@ <h1><a href="../cli/npm-version.html">npm-version</a></h1> <p>Bump a package ver
 <h2 id="synopsis">SYNOPSIS</h2>
 <pre><code>npm version [&lt;newversion&gt; | major | minor | patch | premajor | preminor | prepatch | prerelease]
 
-&#39;npm -v&#39; or &#39;npm --version&#39; to print npm version
+&#39;npm [-v | --version]&#39; to print npm version
 &#39;npm view &lt;pkg&gt; version&#39; to view a package&#39;s published version
 &#39;npm ls&#39; to inspect current package/dependency versions
 </code></pre><h2 id="description">DESCRIPTION</h2>
@@ -26,9 +26,9 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <p>If run in a git repo, it will also create a version commit and tag.
 This behavior is controlled by <code>git-tag-version</code> (see below), and can
 be disabled on the command line by running <code>npm --no-git-tag-version version</code>.
-It will fail if the working directory is not clean, unless the <code>--force</code>
-flag is set.</p>
-<p>If supplied with <code>--message</code> (shorthand: <code>-m</code>) config option, npm will
+It will fail if the working directory is not clean, unless the <code>-f</code> or
+<code>--force</code> flag is set.</p>
+<p>If supplied with <code>-m</code> or <code>--message</code> config option, npm will
 use it as a commit message when creating a version commit.  If the
 <code>message</code> config contains <code>%s</code> then that will be replaced with the
 resulting version number.  For example:</p>
@@ -99,5 +99,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-version &mdash; npm@3.3.6</p>
+<p id="footer">npm-version &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-view.html b/deps/npm/html/doc/cli/npm-view.html
index af6d7360110f51..a39eb98aa0f788 100644
--- a/deps/npm/html/doc/cli/npm-view.html
+++ b/deps/npm/html/doc/cli/npm-view.html
@@ -42,7 +42,7 @@ <h2 id="synopsis">SYNOPSIS</h2>
 contributor in the list, you can do this:</p>
 <pre><code>npm view express contributors[0].email
 </code></pre><p>Multiple fields may be specified, and will be printed one after another.
-For exampls, to get all the contributor names and email addresses, you
+For example, to get all the contributor names and email addresses, you
 can do this:</p>
 <pre><code>npm view express contributors.name contributors.email
 </code></pre><p>&quot;Person&quot; fields are shown as a string if they would be shown as an
@@ -83,5 +83,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-view &mdash; npm@3.3.6</p>
+<p id="footer">npm-view &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm-whoami.html b/deps/npm/html/doc/cli/npm-whoami.html
index 2cb374a5ed0699..4461b9e5f97cc8 100644
--- a/deps/npm/html/doc/cli/npm-whoami.html
+++ b/deps/npm/html/doc/cli/npm-whoami.html
@@ -33,5 +33,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-whoami &mdash; npm@3.3.6</p>
+<p id="footer">npm-whoami &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/cli/npm.html b/deps/npm/html/doc/cli/npm.html
index 7581ad5a29efa6..56647fa029119d 100644
--- a/deps/npm/html/doc/cli/npm.html
+++ b/deps/npm/html/doc/cli/npm.html
@@ -13,7 +13,7 @@ <h1><a href="../cli/npm.html">npm</a></h1> <p>javascript package manager</p>
 <h2 id="synopsis">SYNOPSIS</h2>
 <pre><code>npm &lt;command&gt; [args]
 </code></pre><h2 id="version">VERSION</h2>
-<p>3.3.6</p>
+<p>3.3.10</p>
 <h2 id="description">DESCRIPTION</h2>
 <p>npm is the package manager for the Node JavaScript platform.  It puts
 modules in place so that node can find them, and manages dependency
@@ -51,7 +51,7 @@ <h2 id="directories">DIRECTORIES</h2>
 defaults to the current working directory.  Packages are installed to
 <code>./node_modules</code>, and bins are installed to <code>./node_modules/.bin</code>.</li>
 </ul>
-<p>Local mode is the default.  Use <code>--global</code> or <code>-g</code> on any command to
+<p>Local mode is the default.  Use <code>-g</code> or <code>--global</code> on any command to
 operate in global mode instead.</p>
 <h2 id="developer-usage">DEVELOPER USAGE</h2>
 <p>If you&#39;re using npm to develop and publish your code, check out the
@@ -110,7 +110,7 @@ <h2 id="contributions">CONTRIBUTIONS</h2>
 the issues list or ask on the mailing list.</p>
 <ul>
 <li><a href="http://github.com/npm/npm/issues">http://github.com/npm/npm/issues</a></li>
-<li><a href="&#x6d;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#x6e;&#x70;&#109;&#45;&#64;&#x67;&#x6f;&#111;&#103;&#x6c;&#x65;&#x67;&#x72;&#x6f;&#x75;&#112;&#x73;&#46;&#x63;&#x6f;&#109;">&#x6e;&#x70;&#109;&#45;&#64;&#x67;&#x6f;&#111;&#103;&#x6c;&#x65;&#x67;&#x72;&#x6f;&#x75;&#112;&#x73;&#46;&#x63;&#x6f;&#109;</a></li>
+<li><a href="&#x6d;&#x61;&#x69;&#108;&#116;&#111;&#58;&#110;&#112;&#109;&#x2d;&#x40;&#x67;&#x6f;&#111;&#103;&#108;&#101;&#x67;&#114;&#111;&#117;&#112;&#115;&#x2e;&#x63;&#111;&#109;">&#110;&#112;&#109;&#x2d;&#x40;&#x67;&#x6f;&#111;&#103;&#108;&#101;&#x67;&#114;&#111;&#117;&#112;&#115;&#x2e;&#x63;&#111;&#109;</a></li>
 </ul>
 <h2 id="bugs">BUGS</h2>
 <p>When you find issues, please report them:</p>
@@ -118,7 +118,7 @@ <h2 id="bugs">BUGS</h2>
 <li>web:
 <a href="http://github.com/npm/npm/issues">http://github.com/npm/npm/issues</a></li>
 <li>email:
-<a href="&#109;&#97;&#105;&#x6c;&#x74;&#111;&#x3a;&#x6e;&#112;&#x6d;&#x2d;&#64;&#103;&#111;&#111;&#x67;&#x6c;&#101;&#103;&#x72;&#111;&#117;&#x70;&#x73;&#46;&#x63;&#111;&#109;">&#x6e;&#112;&#x6d;&#x2d;&#64;&#103;&#111;&#111;&#x67;&#x6c;&#101;&#103;&#x72;&#111;&#117;&#x70;&#x73;&#46;&#x63;&#111;&#109;</a></li>
+<a href="&#109;&#97;&#x69;&#x6c;&#116;&#111;&#58;&#x6e;&#x70;&#x6d;&#x2d;&#x40;&#x67;&#x6f;&#x6f;&#x67;&#x6c;&#x65;&#x67;&#x72;&#x6f;&#x75;&#112;&#x73;&#46;&#99;&#111;&#x6d;">&#x6e;&#x70;&#x6d;&#x2d;&#x40;&#x67;&#x6f;&#x6f;&#x67;&#x6c;&#x65;&#x67;&#x72;&#x6f;&#x75;&#112;&#x73;&#46;&#99;&#111;&#x6d;</a></li>
 </ul>
 <p>Be sure to include <em>all</em> of the output from the npm command that didn&#39;t work
 as expected.  The <code>npm-debug.log</code> file is also helpful to provide.</p>
@@ -128,7 +128,7 @@ <h2 id="author">AUTHOR</h2>
 <p><a href="http://blog.izs.me/">Isaac Z. Schlueter</a> ::
 <a href="https://github.com/isaacs/">isaacs</a> ::
 <a href="http://twitter.com/izs">@izs</a> ::
-<a href="&#109;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#105;&#64;&#x69;&#122;&#x73;&#46;&#x6d;&#101;">&#105;&#64;&#x69;&#122;&#x73;&#46;&#x6d;&#101;</a></p>
+<a href="&#109;&#97;&#105;&#108;&#x74;&#x6f;&#58;&#x69;&#64;&#x69;&#122;&#115;&#46;&#x6d;&#x65;">&#x69;&#64;&#x69;&#122;&#115;&#46;&#x6d;&#x65;</a></p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
 <li><a href="../cli/npm-help.html">npm-help(1)</a></li>
@@ -154,5 +154,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm &mdash; npm@3.3.6</p>
+<p id="footer">npm &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/files/npm-folders.html b/deps/npm/html/doc/files/npm-folders.html
index 95b1a32575936f..b6573644add374 100644
--- a/deps/npm/html/doc/files/npm-folders.html
+++ b/deps/npm/html/doc/files/npm-folders.html
@@ -184,5 +184,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-folders &mdash; npm@3.3.6</p>
+<p id="footer">npm-folders &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/files/npm-global.html b/deps/npm/html/doc/files/npm-global.html
index 95b1a32575936f..b6573644add374 100644
--- a/deps/npm/html/doc/files/npm-global.html
+++ b/deps/npm/html/doc/files/npm-global.html
@@ -184,5 +184,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-folders &mdash; npm@3.3.6</p>
+<p id="footer">npm-folders &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/files/npm-json.html b/deps/npm/html/doc/files/npm-json.html
index e9f9c2f78d3aea..b901f73b494d06 100644
--- a/deps/npm/html/doc/files/npm-json.html
+++ b/deps/npm/html/doc/files/npm-json.html
@@ -354,8 +354,8 @@ <h2 id="github-urls">GitHub URLs</h2>
 }
 </code></pre><h2 id="local-paths">Local Paths</h2>
 <p>As of version 2.0.0 you can provide a path to a local directory that contains a
-package. Local paths can be saved using <code>npm install --save</code>, using any of
-these forms:</p>
+package. Local paths can be saved using <code>npm install -S</code> or
+<code>npm install --save</code>, using any of these forms:</p>
 <pre><code>../foo/bar
 ~/foo/bar
 ./foo/bar
@@ -559,5 +559,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">package.json &mdash; npm@3.3.6</p>
+<p id="footer">package.json &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/files/npmrc.html b/deps/npm/html/doc/files/npmrc.html
index 86742503c32f50..998d5fd7dd1b31 100644
--- a/deps/npm/html/doc/files/npmrc.html
+++ b/deps/npm/html/doc/files/npmrc.html
@@ -83,5 +83,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npmrc &mdash; npm@3.3.6</p>
+<p id="footer">npmrc &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/files/package.json.html b/deps/npm/html/doc/files/package.json.html
index e9f9c2f78d3aea..b901f73b494d06 100644
--- a/deps/npm/html/doc/files/package.json.html
+++ b/deps/npm/html/doc/files/package.json.html
@@ -354,8 +354,8 @@ <h2 id="github-urls">GitHub URLs</h2>
 }
 </code></pre><h2 id="local-paths">Local Paths</h2>
 <p>As of version 2.0.0 you can provide a path to a local directory that contains a
-package. Local paths can be saved using <code>npm install --save</code>, using any of
-these forms:</p>
+package. Local paths can be saved using <code>npm install -S</code> or
+<code>npm install --save</code>, using any of these forms:</p>
 <pre><code>../foo/bar
 ~/foo/bar
 ./foo/bar
@@ -559,5 +559,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">package.json &mdash; npm@3.3.6</p>
+<p id="footer">package.json &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/index.html b/deps/npm/html/doc/index.html
index 721c111d9518e4..9c48c201830f27 100644
--- a/deps/npm/html/doc/index.html
+++ b/deps/npm/html/doc/index.html
@@ -138,6 +138,8 @@ <h3 id="npm-faq-7-"><a href="misc/npm-faq.html">npm-faq(7)</a></h3>
 <p>Frequently Asked Questions</p>
 <h3 id="npm-index-7-"><a href="misc/npm-index.html">npm-index(7)</a></h3>
 <p>Index of all npm documentation</p>
+<h3 id="npm-orgs-7-"><a href="misc/npm-orgs.html">npm-orgs(7)</a></h3>
+<p>Working with Teams &amp; Orgs</p>
 <h3 id="npm-registry-7-"><a href="misc/npm-registry.html">npm-registry(7)</a></h3>
 <p>The JavaScript Package Registry</p>
 <h3 id="npm-scope-7-"><a href="misc/npm-scope.html">npm-scope(7)</a></h3>
@@ -160,5 +162,5 @@ <h3 id="semver-7-"><a href="misc/semver.html">semver(7)</a></h3>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-index &mdash; npm@3.3.6</p>
+<p id="footer">npm-index &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/misc/npm-coding-style.html b/deps/npm/html/doc/misc/npm-coding-style.html
index ef9d62dca79de5..5c0b11b268b8b4 100644
--- a/deps/npm/html/doc/misc/npm-coding-style.html
+++ b/deps/npm/html/doc/misc/npm-coding-style.html
@@ -49,7 +49,7 @@ <h2 id="curly-braces">Curly braces</h2>
 <li><code>for (;;)</code> loops.  They&#39;re actually required.</li>
 <li>null loops like: <code>while (something) ;</code> (But you&#39;d better have a good
 reason for doing that.)</li>
-<li><code>case &quot;foo&quot;: doSomething(); break</code></li>
+<li><code>case &#39;foo&#39;: doSomething(); break</code></li>
 <li>In front of a leading <code>(</code> or <code>[</code> at the start of the line.
 This prevents the expression from being interpreted
 as a function call or property access, respectively.</li>
@@ -59,9 +59,9 @@ <h2 id="curly-braces">Curly braces</h2>
 ;[a, b, c].forEach(doSomething)
 for (var i = 0; i &lt; 10; i ++) {
   switch (state) {
-    case &quot;begin&quot;: start(); continue
-    case &quot;end&quot;: finish(); break
-    default: throw new Error(&quot;unknown state&quot;)
+    case &#39;begin&#39;: start(); continue
+    case &#39;end&#39;: finish(); break
+    default: throw new Error(&#39;unknown state&#39;)
   }
   end()
 }
@@ -72,17 +72,24 @@ <h2 id="comma-first">Comma First</h2>
 across multiple lines, put the comma at the start of the next
 line, directly below the token that starts the list.  Put the
 final token in the list on a line by itself.  For example:</p>
-<pre><code>var magicWords = [ &quot;abracadabra&quot;
-                 , &quot;gesundheit&quot;
-                 , &quot;ventrilo&quot;
+<pre><code>var magicWords = [ &#39;abracadabra&#39;
+                 , &#39;gesundheit&#39;
+                 , &#39;ventrilo&#39;
                  ]
-  , spells = { &quot;fireball&quot; : function () { setOnFire() }
-             , &quot;water&quot; : function () { putOut() }
+  , spells = { &#39;fireball&#39; : function () { setOnFire() }
+             , &#39;water&#39; : function () { putOut() }
              }
   , a = 1
-  , b = &quot;abc&quot;
+  , b = &#39;abc&#39;
   , etc
   , somethingElse
+</code></pre><h2 id="quotes">Quotes</h2>
+<p>Use single quotes for strings except to avoid escaping.</p>
+<p>Bad:</p>
+<pre><code>var notOk = &quot;Just double quotes&quot;
+</code></pre><p>Good:</p>
+<pre><code>var ok = &#39;String contains &quot;double&quot; quotes&#39;
+var alsoOk = &quot;String contains &#39;single&#39; quotes or apostrophe&quot;
 </code></pre><h2 id="whitespace">Whitespace</h2>
 <p>Put a single space in front of ( for anything other than a function call.
 Also use a single space wherever it makes things more readable.</p>
@@ -147,5 +154,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-coding-style &mdash; npm@3.3.6</p>
+<p id="footer">npm-coding-style &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/misc/npm-config.html b/deps/npm/html/doc/misc/npm-config.html
index e715e0541eb3cf..c9be4343205bb8 100644
--- a/deps/npm/html/doc/misc/npm-config.html
+++ b/deps/npm/html/doc/misc/npm-config.html
@@ -35,8 +35,8 @@ <h3 id="npmrc-files">npmrc Files</h3>
 </ul>
 <p>See <a href="../files/npmrc.html">npmrc(5)</a> for more details.</p>
 <h3 id="default-configs">Default Configs</h3>
-<p>A set of configuration parameters that are internal to npm, and are
-defaults if nothing else is specified.</p>
+<p>Run <code>npm config ls -l</code> to see a set of configuration parameters that are
+internal to npm, and are defaults if nothing else is specified.</p>
 <h2 id="shorthands-and-other-cli-niceties">Shorthands and Other CLI Niceties</h2>
 <p>The following shorthands are parsed on the command-line:</p>
 <ul>
@@ -829,5 +829,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-config &mdash; npm@3.3.6</p>
+<p id="footer">npm-config &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/misc/npm-developers.html b/deps/npm/html/doc/misc/npm-developers.html
index f291fb4e1d7a1b..93766569250818 100644
--- a/deps/npm/html/doc/misc/npm-developers.html
+++ b/deps/npm/html/doc/misc/npm-developers.html
@@ -195,5 +195,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-developers &mdash; npm@3.3.6</p>
+<p id="footer">npm-developers &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/misc/npm-disputes.html b/deps/npm/html/doc/misc/npm-disputes.html
index d7c75970855206..16683231e1f677 100644
--- a/deps/npm/html/doc/misc/npm-disputes.html
+++ b/deps/npm/html/doc/misc/npm-disputes.html
@@ -13,7 +13,7 @@ <h1><a href="../misc/npm-disputes.html">npm-disputes</a></h1> <p>Handling Module
 <h2 id="synopsis">SYNOPSIS</h2>
 <ol>
 <li>Get the author email with <code>npm owner ls &lt;pkgname&gt;</code></li>
-<li>Email the author, CC <a href="&#109;&#x61;&#105;&#108;&#x74;&#111;&#58;&#115;&#x75;&#x70;&#x70;&#111;&#114;&#x74;&#64;&#x6e;&#x70;&#109;&#106;&#x73;&#x2e;&#99;&#x6f;&#x6d;">&#115;&#x75;&#x70;&#x70;&#111;&#114;&#x74;&#64;&#x6e;&#x70;&#109;&#106;&#x73;&#x2e;&#99;&#x6f;&#x6d;</a></li>
+<li>Email the author, CC <a href="&#x6d;&#97;&#105;&#108;&#116;&#111;&#58;&#x73;&#x75;&#x70;&#x70;&#111;&#114;&#116;&#x40;&#110;&#x70;&#109;&#106;&#x73;&#x2e;&#x63;&#111;&#x6d;">&#x73;&#x75;&#x70;&#x70;&#111;&#114;&#116;&#x40;&#110;&#x70;&#109;&#106;&#x73;&#x2e;&#x63;&#111;&#x6d;</a></li>
 <li>After a few weeks, if there&#39;s no resolution, we&#39;ll sort it out.</li>
 </ol>
 <p>Don&#39;t squat on package names.  Publish code or move out of the way.</p>
@@ -51,12 +51,12 @@ <h2 id="description">DESCRIPTION</h2>
 owner (Bob).</li>
 <li>Joe emails Bob, explaining the situation <strong>as respectfully as
 possible</strong>, and what he would like to do with the module name.  He
-adds the npm support staff <a href="&#109;&#x61;&#105;&#108;&#116;&#111;&#x3a;&#115;&#117;&#112;&#x70;&#111;&#x72;&#116;&#x40;&#110;&#112;&#x6d;&#106;&#x73;&#46;&#99;&#111;&#109;">&#115;&#117;&#112;&#x70;&#111;&#x72;&#116;&#x40;&#110;&#112;&#x6d;&#106;&#x73;&#46;&#99;&#111;&#109;</a> to the CC list of
+adds the npm support staff <a href="&#x6d;&#97;&#x69;&#108;&#x74;&#111;&#58;&#115;&#x75;&#112;&#112;&#111;&#114;&#x74;&#64;&#x6e;&#112;&#109;&#x6a;&#x73;&#46;&#x63;&#111;&#x6d;">&#115;&#x75;&#112;&#112;&#111;&#114;&#x74;&#64;&#x6e;&#112;&#109;&#x6a;&#x73;&#46;&#x63;&#111;&#x6d;</a> to the CC list of
 the email.  Mention in the email that Bob can run <code>npm owner add
 joe foo</code> to add Joe as an owner of the <code>foo</code> package.</li>
 <li>After a reasonable amount of time, if Bob has not responded, or if
 Bob and Joe can&#39;t come to any sort of resolution, email support
-<a href="&#x6d;&#97;&#x69;&#x6c;&#x74;&#111;&#58;&#x73;&#x75;&#112;&#x70;&#111;&#114;&#116;&#x40;&#110;&#112;&#x6d;&#x6a;&#115;&#x2e;&#99;&#111;&#x6d;">&#x73;&#x75;&#112;&#x70;&#111;&#114;&#116;&#x40;&#110;&#112;&#x6d;&#x6a;&#115;&#x2e;&#99;&#111;&#x6d;</a> and we&#39;ll sort it out.  (&quot;Reasonable&quot; is
+<a href="&#109;&#x61;&#105;&#108;&#x74;&#x6f;&#x3a;&#115;&#x75;&#x70;&#x70;&#111;&#x72;&#116;&#64;&#x6e;&#112;&#109;&#x6a;&#x73;&#46;&#99;&#x6f;&#109;">&#115;&#x75;&#x70;&#x70;&#111;&#x72;&#116;&#64;&#x6e;&#112;&#109;&#x6a;&#x73;&#46;&#99;&#x6f;&#109;</a> and we&#39;ll sort it out.  (&quot;Reasonable&quot; is
 usually at least 4 weeks, but extra time is allowed around common
 holidays.)</li>
 </ol>
@@ -112,5 +112,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-disputes &mdash; npm@3.3.6</p>
+<p id="footer">npm-disputes &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/misc/npm-faq.html b/deps/npm/html/doc/misc/npm-faq.html
index a6eaaaedba4b3f..fa5ec1cfc8ffe3 100644
--- a/deps/npm/html/doc/misc/npm-faq.html
+++ b/deps/npm/html/doc/misc/npm-faq.html
@@ -13,20 +13,20 @@ <h1><a href="../misc/npm-faq.html">npm-faq</a></h1> <p>Frequently Asked Question
 <h2 id="where-can-i-find-these-docs-in-html-">Where can I find these docs in HTML?</h2>
 <p><a href="https://docs.npmjs.com/">https://docs.npmjs.com/</a>, or run:</p>
 <pre><code>npm config set viewer browser
-</code></pre><p>to open these documents in your default web browser rather than <code>man</code>.</p>
+</code></pre><p>This command will set the npm docs to open in your default web browser rather than <code>man</code>.</p>
 <h2 id="it-didn-t-work-">It didn&#39;t work.</h2>
-<p>That&#39;s not really a question.</p>
+<p>Please provide a little more detail, search for the error via <a href="https://google.com">Google</a> or <a href="http://stackoverflow.com/search?q=npm">StackOverflow npm</a> to see if another developer has encountered a similar problem.</p>
 <h2 id="why-didn-t-it-work-">Why didn&#39;t it work?</h2>
 <p>I don&#39;t know yet.</p>
-<p>Read the error output, and if you can&#39;t figure out what it means,
-do what it says and post a bug with all the information it asks for.</p>
+<p>Try reading the error output first, ensure this is a true npm issue and not a package issue. If you are having an issue with a package dependency, please submit your error to that particular package maintainer.</p>
+<p>For any npm issues, try following the instructions, or even retracing your steps. If the issue continues to persist, submit a bug with the steps to reproduce, please include the operating system you are working on, along with the error you recieve.</p>
 <h2 id="where-does-npm-put-stuff-">Where does npm put stuff?</h2>
 <p>See <code><a href="../files/npm-folders.html">npm-folders(5)</a></code></p>
 <p>tl;dr:</p>
 <ul>
 <li>Use the <code>npm root</code> command to see where modules go, and the <code>npm bin</code>
 command to see where executables go</li>
-<li>Global installs are different from local installs.  If you install
+<li>Global installs are different from local installs. If you install
 something with the <code>-g</code> flag, then its executables go in <code>npm bin -g</code>
 and its modules go in <code>npm root -g</code>.</li>
 </ul>
@@ -237,7 +237,7 @@ <h2 id="i-get-econnrefused-a-lot-what-s-up-">I get ECONNREFUSED a lot.  What&#39
 <p>To check if the registry is down, open up
 <a href="https://registry.npmjs.org/">https://registry.npmjs.org/</a> in a web browser.  This will also tell
 you if you are just unable to access the internet for some reason.</p>
-<p>If the registry IS down, let us know by emailing <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#111;&#58;&#115;&#x75;&#112;&#x70;&#111;&#114;&#x74;&#64;&#x6e;&#x70;&#x6d;&#106;&#x73;&#x2e;&#x63;&#x6f;&#x6d;">&#115;&#x75;&#112;&#x70;&#111;&#114;&#x74;&#64;&#x6e;&#x70;&#x6d;&#106;&#x73;&#x2e;&#x63;&#x6f;&#x6d;</a>
+<p>If the registry IS down, let us know by emailing <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#x73;&#x75;&#x70;&#112;&#x6f;&#114;&#116;&#x40;&#x6e;&#112;&#x6d;&#x6a;&#115;&#x2e;&#x63;&#x6f;&#109;">&#x73;&#x75;&#x70;&#112;&#x6f;&#114;&#116;&#x40;&#x6e;&#112;&#x6d;&#x6a;&#115;&#x2e;&#x63;&#x6f;&#109;</a>
 or posting an issue at <a href="https://github.com/npm/npm/issues">https://github.com/npm/npm/issues</a>.  If it&#39;s
 down for the world (and not just on your local network) then we&#39;re
 probably already being pinged about it.</p>
@@ -308,5 +308,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-faq &mdash; npm@3.3.6</p>
+<p id="footer">npm-faq &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/misc/npm-index.html b/deps/npm/html/doc/misc/npm-index.html
deleted file mode 100644
index d91644ad5dbd75..00000000000000
--- a/deps/npm/html/doc/misc/npm-index.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!doctype html>
-<html>
-  <title>npm-index</title>
-  <meta http-equiv="content-type" value="text/html;utf-8">
-  <link rel="stylesheet" type="text/css" href="../../static/style.css">
-  <link rel="canonical" href="https://www.npmjs.org/doc/misc/npm-index.html">
-  <script async=true src="../../static/toc.js"></script>
-
-  <body>
-    <div id="wrapper">
-
-<h1><a href="../misc/npm-index.html">npm-index</a></h1> <p>Index of all npm documentation</p>
-<h3 id="readme-1-"><a href="../../doc/README.html">README</a></h3>
-<p>a JavaScript package manager</p>
-<h2 id="command-line-documentation">Command Line Documentation</h2>
-<p>Using npm on the command line</p>
-<h3 id="npm-1-"><a href="../cli/npm.html">npm(1)</a></h3>
-<p>javascript package manager</p>
-<h3 id="npm-access-1-"><a href="../cli/npm-access.html">npm-access(1)</a></h3>
-<p>Set access level on published packages</p>
-<h3 id="npm-adduser-1-"><a href="../cli/npm-adduser.html">npm-adduser(1)</a></h3>
-<p>Add a registry user account</p>
-<h3 id="npm-bin-1-"><a href="../cli/npm-bin.html">npm-bin(1)</a></h3>
-<p>Display npm bin folder</p>
-<h3 id="npm-bugs-1-"><a href="../cli/npm-bugs.html">npm-bugs(1)</a></h3>
-<p>Bugs for a package in a web browser maybe</p>
-<h3 id="npm-build-1-"><a href="../cli/npm-build.html">npm-build(1)</a></h3>
-<p>Build a package</p>
-<h3 id="npm-bundle-1-"><a href="../cli/npm-bundle.html">npm-bundle(1)</a></h3>
-<p>REMOVED</p>
-<h3 id="npm-cache-1-"><a href="../cli/npm-cache.html">npm-cache(1)</a></h3>
-<p>Manipulates packages cache</p>
-<h3 id="npm-completion-1-"><a href="../cli/npm-completion.html">npm-completion(1)</a></h3>
-<p>Tab Completion for npm</p>
-<h3 id="npm-config-1-"><a href="../cli/npm-config.html">npm-config(1)</a></h3>
-<p>Manage the npm configuration files</p>
-<h3 id="npm-dedupe-1-"><a href="../cli/npm-dedupe.html">npm-dedupe(1)</a></h3>
-<p>Reduce duplication</p>
-<h3 id="npm-deprecate-1-"><a href="../cli/npm-deprecate.html">npm-deprecate(1)</a></h3>
-<p>Deprecate a version of a package</p>
-<h3 id="npm-dist-tag-1-"><a href="../cli/npm-dist-tag.html">npm-dist-tag(1)</a></h3>
-<p>Modify package distribution tags</p>
-<h3 id="npm-docs-1-"><a href="../cli/npm-docs.html">npm-docs(1)</a></h3>
-<p>Docs for a package in a web browser maybe</p>
-<h3 id="npm-edit-1-"><a href="../cli/npm-edit.html">npm-edit(1)</a></h3>
-<p>Edit an installed package</p>
-<h3 id="npm-explore-1-"><a href="../cli/npm-explore.html">npm-explore(1)</a></h3>
-<p>Browse an installed package</p>
-<h3 id="npm-help-search-1-"><a href="../cli/npm-help-search.html">npm-help-search(1)</a></h3>
-<p>Search npm help documentation</p>
-<h3 id="npm-help-1-"><a href="../cli/npm-help.html">npm-help(1)</a></h3>
-<p>Get help on npm</p>
-<h3 id="npm-init-1-"><a href="../cli/npm-init.html">npm-init(1)</a></h3>
-<p>Interactively create a package.json file</p>
-<h3 id="npm-install-1-"><a href="../cli/npm-install.html">npm-install(1)</a></h3>
-<p>Install a package</p>
-<h3 id="npm-link-1-"><a href="../cli/npm-link.html">npm-link(1)</a></h3>
-<p>Symlink a package folder</p>
-<h3 id="npm-logout-1-"><a href="../cli/npm-logout.html">npm-logout(1)</a></h3>
-<p>Log out of the registry</p>
-<h3 id="npm-ls-1-"><a href="../cli/npm-ls.html">npm-ls(1)</a></h3>
-<p>List installed packages</p>
-<h3 id="npm-outdated-1-"><a href="../cli/npm-outdated.html">npm-outdated(1)</a></h3>
-<p>Check for outdated packages</p>
-<h3 id="npm-owner-1-"><a href="../cli/npm-owner.html">npm-owner(1)</a></h3>
-<p>Manage package owners</p>
-<h3 id="npm-pack-1-"><a href="../cli/npm-pack.html">npm-pack(1)</a></h3>
-<p>Create a tarball from a package</p>
-<h3 id="npm-ping-1-"><a href="../cli/npm-ping.html">npm-ping(1)</a></h3>
-<p>Ping npm registry</p>
-<h3 id="npm-prefix-1-"><a href="../cli/npm-prefix.html">npm-prefix(1)</a></h3>
-<p>Display prefix</p>
-<h3 id="npm-prune-1-"><a href="../cli/npm-prune.html">npm-prune(1)</a></h3>
-<p>Remove extraneous packages</p>
-<h3 id="npm-publish-1-"><a href="../cli/npm-publish.html">npm-publish(1)</a></h3>
-<p>Publish a package</p>
-<h3 id="npm-rebuild-1-"><a href="../cli/npm-rebuild.html">npm-rebuild(1)</a></h3>
-<p>Rebuild a package</p>
-<h3 id="npm-repo-1-"><a href="../cli/npm-repo.html">npm-repo(1)</a></h3>
-<p>Open package repository page in the browser</p>
-<h3 id="npm-restart-1-"><a href="../cli/npm-restart.html">npm-restart(1)</a></h3>
-<p>Restart a package</p>
-<h3 id="npm-root-1-"><a href="../cli/npm-root.html">npm-root(1)</a></h3>
-<p>Display npm root</p>
-<h3 id="npm-run-script-1-"><a href="../cli/npm-run-script.html">npm-run-script(1)</a></h3>
-<p>Run arbitrary package scripts</p>
-<h3 id="npm-search-1-"><a href="../cli/npm-search.html">npm-search(1)</a></h3>
-<p>Search for packages</p>
-<h3 id="npm-shrinkwrap-1-"><a href="../cli/npm-shrinkwrap.html">npm-shrinkwrap(1)</a></h3>
-<p>Lock down dependency versions</p>
-<h3 id="npm-star-1-"><a href="../cli/npm-star.html">npm-star(1)</a></h3>
-<p>Mark your favorite packages</p>
-<h3 id="npm-stars-1-"><a href="../cli/npm-stars.html">npm-stars(1)</a></h3>
-<p>View packages marked as favorites</p>
-<h3 id="npm-start-1-"><a href="../cli/npm-start.html">npm-start(1)</a></h3>
-<p>Start a package</p>
-<h3 id="npm-stop-1-"><a href="../cli/npm-stop.html">npm-stop(1)</a></h3>
-<p>Stop a package</p>
-<h3 id="npm-tag-1-"><a href="../cli/npm-tag.html">npm-tag(1)</a></h3>
-<p>Tag a published version</p>
-<h3 id="npm-team-1-"><a href="../cli/npm-team.html">npm-team(1)</a></h3>
-<p>Manage organization teams and team memberships</p>
-<h3 id="npm-test-1-"><a href="../cli/npm-test.html">npm-test(1)</a></h3>
-<p>Test a package</p>
-<h3 id="npm-uninstall-1-"><a href="../cli/npm-uninstall.html">npm-uninstall(1)</a></h3>
-<p>Remove a package</p>
-<h3 id="npm-unpublish-1-"><a href="../cli/npm-unpublish.html">npm-unpublish(1)</a></h3>
-<p>Remove a package from the registry</p>
-<h3 id="npm-update-1-"><a href="../cli/npm-update.html">npm-update(1)</a></h3>
-<p>Update a package</p>
-<h3 id="npm-version-1-"><a href="../cli/npm-version.html">npm-version(1)</a></h3>
-<p>Bump a package version</p>
-<h3 id="npm-view-1-"><a href="../cli/npm-view.html">npm-view(1)</a></h3>
-<p>View registry info</p>
-<h3 id="npm-whoami-1-"><a href="../cli/npm-whoami.html">npm-whoami(1)</a></h3>
-<p>Display npm username</p>
-<h2 id="api-documentation">API Documentation</h2>
-<p>Using npm in your Node programs</p>
-<h2 id="files">Files</h2>
-<p>File system structures npm uses</p>
-<h3 id="npm-folders-5-"><a href="../files/npm-folders.html">npm-folders(5)</a></h3>
-<p>Folder Structures Used by npm</p>
-<h3 id="npmrc-5-"><a href="../files/npmrc.html">npmrc(5)</a></h3>
-<p>The npm config files</p>
-<h3 id="package-json-5-"><a href="../files/package.json.html">package.json(5)</a></h3>
-<p>Specifics of npm&#39;s package.json handling</p>
-<h2 id="misc">Misc</h2>
-<p>Various other bits and bobs</p>
-<h3 id="npm-coding-style-7-"><a href="../misc/npm-coding-style.html">npm-coding-style(7)</a></h3>
-<p>npm&#39;s &quot;funny&quot; coding style</p>
-<h3 id="npm-config-7-"><a href="../misc/npm-config.html">npm-config(7)</a></h3>
-<p>More than you probably want to know about npm configuration</p>
-<h3 id="npm-developers-7-"><a href="../misc/npm-developers.html">npm-developers(7)</a></h3>
-<p>Developer Guide</p>
-<h3 id="npm-disputes-7-"><a href="../misc/npm-disputes.html">npm-disputes(7)</a></h3>
-<p>Handling Module Name Disputes</p>
-<h3 id="npm-faq-7-"><a href="../misc/npm-faq.html">npm-faq(7)</a></h3>
-<p>Frequently Asked Questions</p>
-<h3 id="npm-index-7-"><a href="../misc/npm-index.html">npm-index(7)</a></h3>
-<p>Index of all npm documentation</p>
-<h3 id="npm-registry-7-"><a href="../misc/npm-registry.html">npm-registry(7)</a></h3>
-<p>The JavaScript Package Registry</p>
-<h3 id="npm-scope-7-"><a href="../misc/npm-scope.html">npm-scope(7)</a></h3>
-<p>Scoped packages</p>
-<h3 id="npm-scripts-7-"><a href="../misc/npm-scripts.html">npm-scripts(7)</a></h3>
-<p>How npm handles the &quot;scripts&quot; field</p>
-<h3 id="removing-npm-7-"><a href="../misc/removing-npm.html">removing-npm(7)</a></h3>
-<p>Cleaning the Slate</p>
-<h3 id="semver-7-"><a href="../misc/semver.html">semver(7)</a></h3>
-<p>The semantic versioner for npm</p>
-
-</div>
-
-<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
-<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
-<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
-<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
-<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
-<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
-<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
-</table>
-<p id="footer">npm-index &mdash; npm@3.3.6</p>
-
diff --git a/deps/npm/html/doc/misc/npm-orgs.html b/deps/npm/html/doc/misc/npm-orgs.html
index 2d92acc116d4b8..286435bafe92d8 100644
--- a/deps/npm/html/doc/misc/npm-orgs.html
+++ b/deps/npm/html/doc/misc/npm-orgs.html
@@ -86,4 +86,4 @@ <h2 id="team-admins-create-teams">Team Admins create teams</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-orgs &mdash; npm@3.3.7</p>
+<p id="footer">npm-orgs &mdash; npm@3.3.10</p>
diff --git a/deps/npm/html/doc/misc/npm-registry.html b/deps/npm/html/doc/misc/npm-registry.html
index 00065142cebe1d..3c14be6e209fe7 100644
--- a/deps/npm/html/doc/misc/npm-registry.html
+++ b/deps/npm/html/doc/misc/npm-registry.html
@@ -70,5 +70,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-registry &mdash; npm@3.3.6</p>
+<p id="footer">npm-registry &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/misc/npm-scope.html b/deps/npm/html/doc/misc/npm-scope.html
index de22c23db4702b..d5bab8230926f8 100644
--- a/deps/npm/html/doc/misc/npm-scope.html
+++ b/deps/npm/html/doc/misc/npm-scope.html
@@ -91,5 +91,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-scope &mdash; npm@3.3.6</p>
+<p id="footer">npm-scope &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/misc/npm-scripts.html b/deps/npm/html/doc/misc/npm-scripts.html
index 62100d82606e6f..2fd860cf6352e8 100644
--- a/deps/npm/html/doc/misc/npm-scripts.html
+++ b/deps/npm/html/doc/misc/npm-scripts.html
@@ -74,7 +74,7 @@ <h2 id="default-values">DEFAULT VALUES</h2>
 will default the <code>start</code> command to <code>node server.js</code>.</p>
 </li>
 <li><p><code>&quot;install&quot;: &quot;node-gyp rebuild&quot;</code>:</p>
-<p>If there is a <code>bindings.gyp</code> file in the root of your package, npm will
+<p>If there is a <code>binding.gyp</code> file in the root of your package, npm will
 default the <code>install</code> command to compile using node-gyp.</p>
 </li>
 </ul>
@@ -207,5 +207,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-scripts &mdash; npm@3.3.6</p>
+<p id="footer">npm-scripts &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/misc/removing-npm.html b/deps/npm/html/doc/misc/removing-npm.html
index c41aa6d71d0f65..a1c7885b816234 100644
--- a/deps/npm/html/doc/misc/removing-npm.html
+++ b/deps/npm/html/doc/misc/removing-npm.html
@@ -57,5 +57,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">removing-npm &mdash; npm@3.3.6</p>
+<p id="footer">removing-npm &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/html/doc/misc/semver.html b/deps/npm/html/doc/misc/semver.html
index 3207ecacdbe449..f87b8e0a0e0051 100644
--- a/deps/npm/html/doc/misc/semver.html
+++ b/deps/npm/html/doc/misc/semver.html
@@ -282,5 +282,5 @@ <h3 id="ranges">Ranges</h3>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">semver &mdash; npm@3.3.6</p>
+<p id="footer">semver &mdash; npm@3.3.10</p>
 
diff --git a/deps/npm/lib/build.js b/deps/npm/lib/build.js
index 8d62cb61f80f22..e9da59a23dc5a3 100644
--- a/deps/npm/lib/build.js
+++ b/deps/npm/lib/build.js
@@ -21,7 +21,7 @@ var cmdShimIfExists = cmdShim.ifExists
 var asyncMap = require('slide').asyncMap
 var ini = require('ini')
 var writeFile = require('write-file-atomic')
-var getPackageId = require('./install/get-package-id.js')
+var packageId = require('./utils/package-id.js')
 
 module.exports = build
 build.usage = 'npm build [<folder>]'
@@ -101,18 +101,18 @@ var linkStuff = build.linkStuff = function (pkg, folder, global, didRB, cb) {
   var gnm = global && npm.globalDir
   var gtop = parent === gnm
 
-  log.info('linkStuff', getPackageId(pkg))
-  log.silly('linkStuff', getPackageId(pkg), 'has', parent, 'as its parent node_modules')
-  if (global) log.silly('linkStuff', getPackageId(pkg), 'is part of a global install')
-  if (gnm) log.silly('linkStuff', getPackageId(pkg), 'is installed into a global node_modules')
-  if (gtop) log.silly('linkStuff', getPackageId(pkg), 'is installed into the top-level global node_modules')
+  log.info('linkStuff', packageId(pkg))
+  log.silly('linkStuff', packageId(pkg), 'has', parent, 'as its parent node_modules')
+  if (global) log.silly('linkStuff', packageId(pkg), 'is part of a global install')
+  if (gnm) log.silly('linkStuff', packageId(pkg), 'is installed into a global node_modules')
+  if (gtop) log.silly('linkStuff', packageId(pkg), 'is installed into the top-level global node_modules')
 
   shouldWarn(pkg, folder, global, function () {
     asyncMap(
       [linkBins, linkMans, !didRB && rebuildBundles],
       function (fn, cb) {
         if (!fn) return cb()
-        log.verbose(fn.name, getPackageId(pkg))
+        log.verbose(fn.name, packageId(pkg))
         fn(pkg, folder, parent, gtop, cb)
       },
       cb
@@ -133,14 +133,12 @@ function shouldWarn (pkg, folder, global, cb) {
 
     // current searched package is the linked package on first call
     if (linkedPkg !== currentPkg) {
-
       // don't generate a warning if it's listed in dependencies
       if (Object.keys(topPkg.dependencies || {})
           .concat(Object.keys(topPkg.devDependencies || {}))
           .indexOf(currentPkg) === -1) {
-
         if (top && pkg.preferGlobal && !global) {
-          log.warn('prefer global', getPackageId(pkg) + ' should be installed with -g')
+          log.warn('prefer global', packageId(pkg) + ' should be installed with -g')
         }
       }
     }
diff --git a/deps/npm/lib/cache.js b/deps/npm/lib/cache.js
index b4b04819c98b9e..eb5a1e413771dc 100644
--- a/deps/npm/lib/cache.js
+++ b/deps/npm/lib/cache.js
@@ -92,7 +92,6 @@ cache.usage = 'npm cache add <tarball file>' +
               '\nnpm cache clean [<pkg>[@<version>]]'
 
 cache.completion = function (opts, cb) {
-
   var argv = opts.conf.argv.remain
   if (argv.length === 2) {
     return cb(null, ['add', 'ls', 'clean'])
diff --git a/deps/npm/lib/cache/add-local-tarball.js b/deps/npm/lib/cache/add-local-tarball.js
index 1bcb4862321dd4..7d747ea80444c5 100644
--- a/deps/npm/lib/cache/add-local-tarball.js
+++ b/deps/npm/lib/cache/add-local-tarball.js
@@ -16,7 +16,7 @@ var once = require('once')
 var writeStream = require('fs-write-stream-atomic')
 var tempFilename = require('../utils/temp-filename.js')
 var rimraf = require('rimraf')
-var getPackageId = require('../install/get-package-id.js')
+var packageId = require('../utils/package-id.js')
 
 module.exports = addLocalTarball
 
@@ -97,7 +97,7 @@ function addTmpTarball (tgz, pkgData, shasum, cb) {
     log.verbose(
       'addTmpTarball',
       'already have metadata; skipping unpack for',
-      getPackageId(pkgData)
+      packageId(pkgData)
     )
     return addTmpTarball_(tgz, pkgData, shasum, cb)
   }
@@ -130,8 +130,8 @@ function addTmpTarball (tgz, pkgData, shasum, cb) {
           return cb(new Error('No version provided'))
         } else if (pkgData.version && data.version !== pkgData.version) {
           return cb(new Error('Invalid Package: expected ' +
-                              getPackageId(pkgData) +
-                              ' but found ' + getPackageId(data)))
+                              packageId(pkgData) +
+                              ' but found ' + packageId(data)))
         }
 
         addTmpTarball_(tgz, data, shasum, cb)
@@ -153,7 +153,6 @@ function addTmpTarball_ (tgz, data, shasum, cb) {
   getCacheStat(function (er, cs) {
     if (er) return cb(er)
     mkdir(pkg, function (er, created) {
-
       // chown starting from the first dir created by mkdirp,
       // or the root dir, if none had to be created, so that
       // we know that we get all the children.
@@ -167,7 +166,6 @@ function addTmpTarball_ (tgz, data, shasum, cb) {
       var fin = cs.uid && cs.gid ? chown : done
       read.on('error', cb).pipe(write).on('error', cb).on('close', fin)
     })
-
   })
 
   function done () {
diff --git a/deps/npm/lib/cache/add-named.js b/deps/npm/lib/cache/add-named.js
index b90d313984ad43..f0e5e2c33a8f31 100644
--- a/deps/npm/lib/cache/add-named.js
+++ b/deps/npm/lib/cache/add-named.js
@@ -13,7 +13,7 @@ var addRemoteTarball = require('./add-remote-tarball.js')
 var cachedPackageRoot = require('./cached-package-root.js')
 var mapToRegistry = require('../utils/map-to-registry.js')
 var pulseTillDone = require('../utils/pulse-till-done.js')
-var getPackageId = require('../install/get-package-id.js')
+var packageId = require('../utils/package-id.js')
 
 module.exports = addNamed
 
@@ -148,11 +148,11 @@ function addNameVersion (name, v, data, cb) {
     deprCheck(data)
     var dist = data.dist
 
-    if (!dist) return cb(new Error('No dist in ' + getPackageId(data) + ' package'))
+    if (!dist) return cb(new Error('No dist in ' + packageId(data) + ' package'))
 
     if (!dist.tarball) {
       return cb(new Error(
-      'No dist.tarball in ' + getPackageId(data) + ' package'
+      'No dist.tarball in ' + packageId(data) + ' package'
       ))
     }
 
@@ -210,7 +210,7 @@ function addNameVersion (name, v, data, cb) {
         // Only add non-shasum'ed packages if --forced. Only ancient things
         // would lack this for good reasons nowadays.
         if (!dist.shasum && !npm.config.get('force')) {
-          return cb(new Error('package lacks shasum: ' + getPackageId(data)))
+          return cb(new Error('package lacks shasum: ' + packageId(data)))
         }
 
         addRemoteTarball(tb, data, dist.shasum, auth, cb)
@@ -285,7 +285,7 @@ function installTargetsError (requested, data) {
   requested = data.name + (requested ? "@'" + requested + "'" : '')
 
   targets = targets.length
-          ? 'Valid install targets:\n' + JSON.stringify(targets) + '\n'
+          ? 'Valid install targets:\n' + targets.join(', ') + '\n'
           : 'No valid targets found.\n' +
             'Perhaps not compatible with your version of node?'
 
diff --git a/deps/npm/lib/cache/caching-client.js b/deps/npm/lib/cache/caching-client.js
index 77d8d66cb248fa..f70271127cae2a 100644
--- a/deps/npm/lib/cache/caching-client.js
+++ b/deps/npm/lib/cache/caching-client.js
@@ -31,7 +31,7 @@ inherits(CachingRegistryClient, RegistryClient)
 
 CachingRegistryClient.prototype._invalidatingRequest = function (uri, params, cb) {
   var client = this
-  this._request.call(this, uri, params, function () {
+  this._request(uri, params, function () {
     var args = arguments
 
     var method = params.method
diff --git a/deps/npm/lib/completion.js b/deps/npm/lib/completion.js
index e9a838d484f508..4aa3ae13a7cf28 100644
--- a/deps/npm/lib/completion.js
+++ b/deps/npm/lib/completion.js
@@ -9,9 +9,8 @@ var configDefs = npmconf.defs
 var configTypes = configDefs.types
 var shorthands = configDefs.shorthands
 var nopt = require('nopt')
-var configNames = Object.keys(configTypes).filter(function (e) {
-      return e.charAt(0) !== '_'
-    })
+var configNames = Object.keys(configTypes)
+  .filter(function (e) { return e.charAt(0) !== '_' })
 var shorthandNames = Object.keys(shorthands)
 var allConfs = configNames.concat(shorthandNames)
 var once = require('once')
@@ -167,7 +166,6 @@ function dumpScript (cb) {
       if (er.errno === 'EPIPE') er = null
       cb(er)
     })
-
   })
 }
 
diff --git a/deps/npm/lib/config.js b/deps/npm/lib/config.js
index 305e6bc8a5d3a7..8570537d0da95b 100644
--- a/deps/npm/lib/config.js
+++ b/deps/npm/lib/config.js
@@ -73,8 +73,8 @@ function edit (cb) {
       if (er) data = ''
       data = [
         ';;;;',
-        '; npm ' + (npm.config.get('global') ?
-                  'globalconfig' : 'userconfig') + ' file',
+        '; npm ' + (npm.config.get('global')
+                  ? 'globalconfig' : 'userconfig') + ' file',
         '; this is a simple ini-formatted file',
         '; lines that start with semi-colons are comments.',
         '; read `npm help config` for help on the various options',
@@ -86,18 +86,18 @@ function edit (cb) {
         '; all options with default values',
         ';;;;'
       ]).concat(Object.keys(npmconf.defaults).reduce(function (arr, key) {
-                var obj = {}
-                obj[key] = npmconf.defaults[key]
-                if (key === 'logstream') return arr
-                return arr.concat(
-                  ini.stringify(obj)
-                    .replace(/\n$/m, '')
-                    .replace(/^/g, '; ')
-                    .replace(/\n/g, '\n; ')
-                    .split('\n'))
-              }, []))
-              .concat([''])
-              .join(os.EOL)
+        var obj = {}
+        obj[key] = npmconf.defaults[key]
+        if (key === 'logstream') return arr
+        return arr.concat(
+          ini.stringify(obj)
+            .replace(/\n$/m, '')
+            .replace(/^/g, '; ')
+            .replace(/\n/g, '\n; ')
+            .split('\n'))
+      }, []))
+      .concat([''])
+      .join(os.EOL)
       writeFileAtomic(
         f,
         data,
diff --git a/deps/npm/lib/config/core.js b/deps/npm/lib/config/core.js
index 0c6d3ecdb76b43..d1306eb4c85d01 100644
--- a/deps/npm/lib/config/core.js
+++ b/deps/npm/lib/config/core.js
@@ -297,7 +297,6 @@ Conf.prototype.save = function (where, cb) {
       fs.writeFile(target.path, data, 'utf8', function (er) {
         if (er) return then(er)
         if (where === 'user' && myUid && myGid) {
-
           fs.chown(target.path, +myUid, +myGid, then)
         } else {
           then()
diff --git a/deps/npm/lib/config/load-cafile.js b/deps/npm/lib/config/load-cafile.js
index 1bf9cc49005670..de8f61625a6b17 100644
--- a/deps/npm/lib/config/load-cafile.js
+++ b/deps/npm/lib/config/load-cafile.js
@@ -8,7 +8,6 @@ function loadCAFile (cafilePath, cb) {
   fs.readFile(cafilePath, 'utf8', afterCARead.bind(this))
 
   function afterCARead (er, cadata) {
-
     if (er) {
       // previous cafile no longer exists, so just continue on gracefully
       if (er.code === 'ENOENT') return cb()
diff --git a/deps/npm/lib/config/load-prefix.js b/deps/npm/lib/config/load-prefix.js
index 01a9252803b74d..bb5d9f3be56bf1 100644
--- a/deps/npm/lib/config/load-prefix.js
+++ b/deps/npm/lib/config/load-prefix.js
@@ -7,7 +7,8 @@ function loadPrefix (cb) {
   var cli = this.list[0]
 
   Object.defineProperty(this, 'prefix',
-    { set: function (prefix) {
+    {
+      set: function (prefix) {
         var g = this.get('global')
         this[g ? 'globalPrefix' : 'localPrefix'] = prefix
       }.bind(this),
@@ -19,7 +20,8 @@ function loadPrefix (cb) {
     })
 
   Object.defineProperty(this, 'globalPrefix',
-    { set: function (prefix) {
+    {
+      set: function (prefix) {
         this.set('prefix', prefix)
       }.bind(this),
       get: function () {
diff --git a/deps/npm/lib/dedupe.js b/deps/npm/lib/dedupe.js
index 2feaa9f8893f03..2cb85990ce5ff1 100644
--- a/deps/npm/lib/dedupe.js
+++ b/deps/npm/lib/dedupe.js
@@ -16,6 +16,9 @@ var loadExtraneous = require('./install/deps.js').loadExtraneous
 var filterInvalidActions = require('./install/filter-invalid-actions.js')
 var recalculateMetadata = require('./install/deps.js').recalculateMetadata
 var sortActions = require('./install/diff-trees.js').sortActions
+var moduleName = require('./utils/module-name.js')
+var packageId = require('./utils/package-id.js')
+var childPath = require('./utils/child-path.js')
 
 module.exports = dedupe
 module.exports.Deduper = Deduper
@@ -48,7 +51,7 @@ Deduper.prototype.normalizeTree = function (log, cb) {
   if (npm.config.get('global')) {
     var args = this.args
     this.currentTree.children = this.currentTree.children.filter(function (child) {
-      return args.filter(function (arg) { return arg === child.package.name }).length
+      return args.filter(function (arg) { return arg === moduleName(child) }).length
     })
   }
   Installer.prototype.normalizeTree.call(this, log, cb)
@@ -65,9 +68,9 @@ Deduper.prototype.loadIdealTree = function (cb) {
     [this, this.finishTracker, 'cloneCurrentTree'],
 
     [this.newTracker(this.progress.loadIdealTree, 'loadAllDepsIntoIdealTree', 10)],
-    [function (next) {
+    [ function (next) {
       loadExtraneous(self.idealTree, self.progress.loadAllDepsIntoIdealTree, next)
-    }],
+    } ],
     [this, this.finishTracker, 'loadAllDepsIntoIdealTree'],
 
     [this, function (next) { recalculateMetadata(this.idealTree, log, next) }]
@@ -97,7 +100,7 @@ function move (node, hoistTo, diff) {
   node.parent.children = without(node.parent.children, node)
   hoistTo.children.push(node)
   node.fromPath = node.path
-  node.path = path.resolve(hoistTo.path, 'node_modules', node.package.name)
+  node.path = childPath(hoistTo.path, node)
   node.parent = hoistTo
   if (!diff.filter(function (action) { return action[0] === 'move' && action[1] === node }).length) {
     diff.push(['move', node])
@@ -135,7 +138,7 @@ function hoistChildren_ (tree, diff, seen, next) {
   seen[tree.path] = true
   asyncMap(tree.children, function (child, done) {
     if (!tree.parent) return hoistChildren_(child, diff, seen, done)
-    var better = findRequirement(tree.parent, child.package.name, child.package._requested || npa(child.package.name + '@' + child.package.version))
+    var better = findRequirement(tree.parent, moduleName(child), child.package._requested || npa(packageId(child)))
     if (better) {
       return chain([
         [remove, child, diff],
@@ -148,10 +151,10 @@ function hoistChildren_ (tree, diff, seen, next) {
       chain([
         [recalculateMetadata, hoistTo, log],
         [hoistChildren_, child, diff, seen],
-        [function (next) {
+        [ function (next) {
           moveRemainingChildren(child, diff)
           next()
-        }]
+        } ]
       ], done)
     } else {
       done()
diff --git a/deps/npm/lib/fetch-package-metadata.js b/deps/npm/lib/fetch-package-metadata.js
index 4efc37806e8b49..103ed2fc6af29c 100644
--- a/deps/npm/lib/fetch-package-metadata.js
+++ b/deps/npm/lib/fetch-package-metadata.js
@@ -141,7 +141,7 @@ function fetchNamedPackageData (dep, next) {
 
       // And failing that, we error out
       var targets = versions.length
-                  ? 'Valid install targets:\n' + JSON.stringify(versions) + '\n'
+                  ? 'Valid install targets:\n' + versions.join(', ') + '\n'
                   : 'No valid targets found.'
       var er = new Error('No compatible version found: ' +
                          dep.raw + '\n' + targets)
@@ -283,7 +283,8 @@ function untarStream (tarball, cb) {
     } else if (hasTarHeader(c)) {
       doUntar()
     } else {
-      file.close()
+      if (file.close) file.close()
+      if (file.destroy) file.destroy()
       var er = new Error('Non-gzip/tarball ' + tarball)
       er.code = 'ENOTTARBALL'
       return cb(er)
diff --git a/deps/npm/lib/help-search.js b/deps/npm/lib/help-search.js
index 16f389027fa9d6..8a138feebed420 100644
--- a/deps/npm/lib/help-search.js
+++ b/deps/npm/lib/help-search.js
@@ -161,11 +161,12 @@ function formatResults (args, results, cb) {
 
   var out = results.map(function (res) {
     var out = res.cmd
-    var r = Object.keys(res.hits).map(function (k) {
-          return k + ':' + res.hits[k]
-        }).sort(function (a, b) {
-          return a > b ? 1 : -1
-        }).join(' ')
+    var r = Object.keys(res.hits)
+      .map(function (k) {
+        return k + ':' + res.hits[k]
+      }).sort(function (a, b) {
+        return a > b ? 1 : -1
+      }).join(' ')
 
     out += ((new Array(Math.max(1, cols - out.length - r.length)))
              .join(' ')) + r
@@ -175,25 +176,25 @@ function formatResults (args, results, cb) {
     out = '\n\n' + out + '\n' +
       (new Array(cols)).join('—') + '\n' +
       res.lines.map(function (line, i) {
-      if (line === null || i > 3) return ''
-      for (var out = line, a = 0, l = args.length; a < l; a++) {
-        var finder = out.toLowerCase().split(args[a].toLowerCase())
-        var newOut = ''
-        var p = 0
+        if (line === null || i > 3) return ''
+        for (var out = line, a = 0, l = args.length; a < l; a++) {
+          var finder = out.toLowerCase().split(args[a].toLowerCase())
+          var newOut = ''
+          var p = 0
 
-        finder.forEach(function (f) {
-          newOut += out.substr(p, f.length)
+          finder.forEach(function (f) {
+            newOut += out.substr(p, f.length)
 
-          var hilit = out.substr(p + f.length, args[a].length)
-          if (npm.color) hilit = color.bgBlack(color.red(hilit))
-          newOut += hilit
+            var hilit = out.substr(p + f.length, args[a].length)
+            if (npm.color) hilit = color.bgBlack(color.red(hilit))
+            newOut += hilit
 
-          p += f.length + args[a].length
-        })
-      }
+            p += f.length + args[a].length
+          })
+        }
 
-      return newOut
-    }).join('\n').trim()
+        return newOut
+      }).join('\n').trim()
     return out
   }).join('\n')
 
diff --git a/deps/npm/lib/install.js b/deps/npm/lib/install.js
index 3ebb3b3bb02595..773ed5405e9bf1 100644
--- a/deps/npm/lib/install.js
+++ b/deps/npm/lib/install.js
@@ -132,7 +132,8 @@ var doSerialActions = require('./install/actions.js').doSerial
 var doReverseSerialActions = require('./install/actions.js').doReverseSerial
 var doParallelActions = require('./install/actions.js').doParallel
 var doOneAction = require('./install/actions.js').doOne
-var getPackageId = require('./install/get-package-id.js')
+var packageId = require('./utils/package-id.js')
+var moduleName = require('./utils/module-name.js')
 
 function unlockCB (lockPath, name, cb) {
   validate('SSF', arguments)
@@ -201,7 +202,7 @@ function Installer (where, dryrun, args) {
   this.noPackageJsonOk = !!args.length
   this.topLevelLifecycles = !args.length
   this.npat = npm.config.get('npat')
-  this.dev = npm.config.get('dev') || (!/^prod(uction)?$/.test(npm.config.get('only')) && !npm.config.get('production'))
+  this.dev = npm.config.get('dev') || (!/^prod(uction)?$/.test(npm.config.get('only')) && !npm.config.get('production')) || /^dev(elopment)?$/.test(npm.config.get('only'))
   this.prod = !/^dev(elopment)?$/.test(npm.config.get('only'))
   this.rollback = npm.config.get('rollback')
   this.link = npm.config.get('link')
@@ -350,9 +351,9 @@ Installer.prototype.loadIdealTree = function (cb) {
     [this, this.loadAllDepsIntoIdealTree],
     [this, this.finishTracker, 'loadAllDepsIntoIdealTree'],
 
-    [this, function (next) { recalculateMetadata(this.idealTree, log, next) } ],
+    [this, function (next) { recalculateMetadata(this.idealTree, log, next) }],
     [this, this.debugTree, 'idealTree:prePrune', 'idealTree'],
-    [this, function (next) { next(pruneTree(this.idealTree)) } ]
+    [this, function (next) { next(pruneTree(this.idealTree)) }]
   ], cb)
 }
 
@@ -428,7 +429,7 @@ Installer.prototype.computeLinked = function (cb) {
 }
 
 function isLinkable (pkg, cb) {
-  var globalPackage = path.resolve(npm.globalPrefix, 'lib', 'node_modules', pkg.package.name)
+  var globalPackage = path.resolve(npm.globalPrefix, 'lib', 'node_modules', moduleName(pkg))
   var globalPackageJson = path.resolve(globalPackage, 'package.json')
   fs.stat(globalPackage, function (er) {
     if (er) return cb(true, true)
@@ -649,7 +650,7 @@ Installer.prototype.printInstalled = function (cb) {
   this.differences.forEach(function (action) {
     var mutation = action[0]
     var child = action[1]
-    var name = getPackageId(child)
+    var name = packageId(child)
     var where = path.relative(self.where, child.path)
     if (mutation === 'remove') {
       console.log('- ' + name + ' ' + where)
@@ -664,7 +665,7 @@ Installer.prototype.printInstalled = function (cb) {
     return !child.failed && (mutation === 'add' || mutation === 'update')
   }).map(function (action) {
     var child = action[1]
-    return getPackageId(child)
+    return packageId(child)
   })
   log.showProgress()
   if (!addedOrMoved.length) return cb()
@@ -683,7 +684,7 @@ Installer.prototype.debugActions = function (name, actionListName, cb) {
   log.silly(name, 'action count', actionsToLog.length)
   actionsToLog.forEach(function (action) {
     log.silly(name, action.map(function (value) {
-      return (value && value.package) ? getPackageId(value) : value
+      return (value && value.package) ? packageId(value) : value
     }).join(' '))
   })
   cb()
@@ -701,12 +702,12 @@ Installer.prototype.prettify = function (tree) {
   validate('O', arguments)
   var seen = {}
   function byName (aa, bb) {
-    return getPackageId(aa).localeCompare(getPackageId(bb))
+    return packageId(aa).localeCompare(packageId(bb))
   }
   function expandTree (tree) {
     seen[tree.path] = true
     return {
-      label: getPackageId(tree),
+      label: packageId(tree),
       nodes: tree.children.filter(function (tree) { return !seen[tree.path] }).sort(byName).map(expandTree)
     }
   }
diff --git a/deps/npm/lib/install/action/build.js b/deps/npm/lib/install/action/build.js
index 0feb3a0fbf88fa..ffb870d6865888 100644
--- a/deps/npm/lib/install/action/build.js
+++ b/deps/npm/lib/install/action/build.js
@@ -2,11 +2,12 @@
 var chain = require('slide').chain
 var build = require('../../build.js')
 var npm = require('../../npm.js')
+var packageId = require('../../utils/package-id.js')
 
 module.exports = function (top, buildpath, pkg, log, next) {
-  log.silly('build', pkg.package.name)
+  log.silly('build', packageId(pkg))
   chain([
-    [build.linkStuff, pkg.package, pkg.path, npm.config.get('global'), false],
+    [build.linkStuff, pkg.package, pkg.path, npm.config.get('global'), true],
     [build.writeBuiltinConf, pkg.package, pkg.path]
   ], next)
 }
diff --git a/deps/npm/lib/install/action/extract.js b/deps/npm/lib/install/action/extract.js
index f9a4f8b2fab407..b427768498461e 100644
--- a/deps/npm/lib/install/action/extract.js
+++ b/deps/npm/lib/install/action/extract.js
@@ -1,17 +1,19 @@
 'use strict'
 var updatePackageJson = require('../update-package-json')
 var npm = require('../../npm.js')
+var packageId = require('../../utils/package-id.js')
 var cache = require('../../cache.js')
 
 module.exports = function (top, buildpath, pkg, log, next) {
-  log.silly('extract', pkg.package.name)
+  log.silly('extract', packageId(pkg))
   var up = npm.config.get('unsafe-perm')
   var user = up ? null : npm.config.get('user')
   var group = up ? null : npm.config.get('group')
   cache.unpack(pkg.package.name, pkg.package.version
         , buildpath
-        , null, null, user, group, function (er) {
-    if (er) return next(er)
-    updatePackageJson(pkg, buildpath, next)
-  })
+        , null, null, user, group,
+        function (er) {
+          if (er) return next(er)
+          updatePackageJson(pkg, buildpath, next)
+        })
 }
diff --git a/deps/npm/lib/install/action/fetch.js b/deps/npm/lib/install/action/fetch.js
index 16a94244b15496..a706b1967b172d 100644
--- a/deps/npm/lib/install/action/fetch.js
+++ b/deps/npm/lib/install/action/fetch.js
@@ -1,5 +1,7 @@
 'use strict'
 // var cache = require('../../cache.js')
+// var packageId = require('../../utils/package-id.js')
+// var moduleName = require('../../utils/module-name.js')
 
 module.exports = function (top, buildpath, pkg, log, next) {
   next()
@@ -8,7 +10,7 @@ module.exports = function (top, buildpath, pkg, log, next) {
 // is progressively seeming to be likely for the indefinite future.
 // ALSO fails for local deps specified with relative URLs outside of the top level.
 
-  var name = pkg.package.name
+  var name = moduleName(pkg)
   var version
   switch (pkg.package._requested.type) {
     case 'version':
@@ -21,7 +23,7 @@ module.exports = function (top, buildpath, pkg, log, next) {
     default:
       name = pkg.package._requested.raw
   }
-  log.silly('fetch', name, version)
+  log.silly('fetch', packageId(pkg))
   cache.add(name, version, top, false, next)
 */
 }
diff --git a/deps/npm/lib/install/action/global-install.js b/deps/npm/lib/install/action/global-install.js
index 25c61aebd8bf11..a2aa59402568c5 100644
--- a/deps/npm/lib/install/action/global-install.js
+++ b/deps/npm/lib/install/action/global-install.js
@@ -2,9 +2,10 @@
 var path = require('path')
 var npm = require('../../npm.js')
 var Installer = require('../../install.js').Installer
+var packageId = require('../../utils/package-id.js')
 
 module.exports = function (top, buildpath, pkg, log, next) {
-  log.silly('global-install', pkg.package.name)
+  log.silly('global-install', packageId(pkg))
   var globalRoot = path.resolve(npm.globalDir, '..')
   npm.config.set('global', true)
   var install = new Installer(globalRoot, false, [pkg.package.name + '@' + pkg.package._requested.spec])
diff --git a/deps/npm/lib/install/action/global-link.js b/deps/npm/lib/install/action/global-link.js
index 80eb46b95ad5cb..daad48e97425ef 100644
--- a/deps/npm/lib/install/action/global-link.js
+++ b/deps/npm/lib/install/action/global-link.js
@@ -1,7 +1,8 @@
 'use strict'
 var npm = require('../../npm.js')
+var packageId = require('../../utils/package-id.js')
 
 module.exports = function (top, buildpath, pkg, log, next) {
-  log.silly('global-link', pkg.package.name)
+  log.silly('global-link', packageId(pkg))
   npm.link(pkg.package.name, next)
 }
diff --git a/deps/npm/lib/install/action/install.js b/deps/npm/lib/install/action/install.js
index f6c8d56e086a29..f7b3295534c8b0 100644
--- a/deps/npm/lib/install/action/install.js
+++ b/deps/npm/lib/install/action/install.js
@@ -1,7 +1,8 @@
 'use strict'
 var lifecycle = require('../../utils/lifecycle.js')
+var packageId = require('../../utils/package-id.js')
 
 module.exports = function (top, buildpath, pkg, log, next) {
-  log.silly('install', pkg.package.name, buildpath)
+  log.silly('install', packageId(pkg), buildpath)
   lifecycle(pkg.package, 'install', pkg.path, false, false, next)
 }
diff --git a/deps/npm/lib/install/action/postinstall.js b/deps/npm/lib/install/action/postinstall.js
index 5460c8364d572a..4ca4c8baec272f 100644
--- a/deps/npm/lib/install/action/postinstall.js
+++ b/deps/npm/lib/install/action/postinstall.js
@@ -1,7 +1,8 @@
 'use strict'
 var lifecycle = require('../../utils/lifecycle.js')
+var packageId = require('../../utils/package-id.js')
 
 module.exports = function (top, buildpath, pkg, log, next) {
-  log.silly('postinstall', pkg.package.name, buildpath)
+  log.silly('postinstall', packageId(pkg), buildpath)
   lifecycle(pkg.package, 'postinstall', pkg.path, false, false, next)
 }
diff --git a/deps/npm/lib/install/action/preinstall.js b/deps/npm/lib/install/action/preinstall.js
index 989519c26f86da..abd767016e36ab 100644
--- a/deps/npm/lib/install/action/preinstall.js
+++ b/deps/npm/lib/install/action/preinstall.js
@@ -1,7 +1,8 @@
 'use strict'
 var lifecycle = require('../../utils/lifecycle.js')
+var packageId = require('../../utils/package-id.js')
 
 module.exports = function (top, buildpath, pkg, log, next) {
-  log.silly('preinstall', pkg.package.name, buildpath)
+  log.silly('preinstall', packageId(pkg), buildpath)
   lifecycle(pkg.package, 'preinstall', buildpath, false, false, next)
 }
diff --git a/deps/npm/lib/install/action/prepublish.js b/deps/npm/lib/install/action/prepublish.js
index 95ff22b66edd8a..b9a5a5d6f1ba67 100644
--- a/deps/npm/lib/install/action/prepublish.js
+++ b/deps/npm/lib/install/action/prepublish.js
@@ -1,7 +1,8 @@
 'use strict'
 var lifecycle = require('../../utils/lifecycle.js')
+var packageId = require('../../utils/package-id.js')
 
 module.exports = function (top, buildpath, pkg, log, next) {
-  log.silly('prepublish', pkg.package.name, buildpath)
+  log.silly('prepublish', packageId(pkg), buildpath)
   lifecycle(pkg.package, 'prepublish', buildpath, false, false, next)
 }
diff --git a/deps/npm/lib/install/action/test.js b/deps/npm/lib/install/action/test.js
index 354519d06fd042..ee315290ad0554 100644
--- a/deps/npm/lib/install/action/test.js
+++ b/deps/npm/lib/install/action/test.js
@@ -1,7 +1,8 @@
 'use strict'
 var lifecycle = require('../../utils/lifecycle.js')
+var packageId = require('../../utils/package-id.js')
 
 module.exports = function (top, buildpath, pkg, log, next) {
-  log.silly('test', pkg.package.name, buildpath)
+  log.silly('test', packageId(pkg), buildpath)
   lifecycle(pkg.package, 'test', buildpath, false, false, next)
 }
diff --git a/deps/npm/lib/install/actions.js b/deps/npm/lib/install/actions.js
index 84d987faf0a0d9..face4b457bced4 100644
--- a/deps/npm/lib/install/actions.js
+++ b/deps/npm/lib/install/actions.js
@@ -8,6 +8,8 @@ var log = require('npmlog')
 var andFinishTracker = require('./and-finish-tracker.js')
 var andAddParentToErrors = require('./and-add-parent-to-errors.js')
 var failedDependency = require('./deps.js').failedDependency
+var packageId = require('../utils/package-id.js')
+var moduleName = require('../utils/module-name.js')
 
 var actions = {}
 
@@ -68,8 +70,8 @@ function andHandleOptionalDepErrors (pkg, next) {
       if (isFatal) anyFatal = true
     }
     if (anyFatal) return next.apply(null, arguments)
-    log.warn('install:' + pkg.package.name, er.message)
-    log.verbose('install:' + pkg.package.name, er.stack)
+    log.warn('install:' + packageId(pkg), er.message)
+    log.verbose('install:' + packageId(pkg), er.stack)
     next()
   }
 }
@@ -81,9 +83,9 @@ function prepareAction (staging, log) {
     var cmd = action[0]
     var pkg = action[1]
     if (!actions[cmd]) throw new Error('Unknown decomposed command "' + cmd + '" (is it new?)')
-    var buildpath = uniqueFilename(staging, pkg.package.name, pkg.realpath)
+    var buildpath = uniqueFilename(staging, moduleName(pkg), pkg.realpath)
     var top = path.resolve(staging, '../..')
-    return [actions[cmd], top, buildpath, pkg, log.newGroup(cmd + ':' + pkg.package.name)]
+    return [actions[cmd], top, buildpath, pkg, log.newGroup(cmd + ':' + moduleName(pkg))]
   }
 }
 
diff --git a/deps/npm/lib/install/decompose-actions.js b/deps/npm/lib/install/decompose-actions.js
index b345ba5d09ea10..b5390c0b22644b 100644
--- a/deps/npm/lib/install/decompose-actions.js
+++ b/deps/npm/lib/install/decompose-actions.js
@@ -10,11 +10,14 @@ module.exports = function (differences, decomposed, next) {
     switch (cmd) {
       case 'add':
       case 'update':
-          addSteps(decomposed, pkg, done)
+        addSteps(decomposed, pkg, done)
         break
       case 'move':
         moveSteps(decomposed, pkg, done)
         break
+      case 'rebuild':
+        rebuildSteps(decomposed, pkg, done)
+        break
       case 'remove':
       case 'update-linked':
       default:
@@ -44,6 +47,14 @@ function moveSteps (decomposed, pkg, done) {
   done()
 }
 
+function rebuildSteps (decomposed, pkg, done) {
+  decomposed.push(['preinstall', pkg])
+  decomposed.push(['build', pkg])
+  decomposed.push(['install', pkg])
+  decomposed.push(['postinstall', pkg])
+  done()
+}
+
 function defaultSteps (decomposed, cmd, pkg, done) {
   decomposed.push([cmd, pkg])
   done()
diff --git a/deps/npm/lib/install/deps.js b/deps/npm/lib/install/deps.js
index ab162087407102..d2486419fc146d 100644
--- a/deps/npm/lib/install/deps.js
+++ b/deps/npm/lib/install/deps.js
@@ -25,18 +25,22 @@ var createChild = require('./node.js').create
 var resetMetadata = require('./node.js').reset
 var andIgnoreErrors = require('./and-ignore-errors.js')
 var isInstallable = require('./validate-args.js').isInstallable
-var getPackageId = require('./get-package-id.js')
+var packageId = require('../utils/package-id.js')
+var moduleName = require('../utils/module-name.js')
+
+exports.test = {} // used to hold functions for testing by unit tests
 
 // The export functions in this module mutate a dependency tree, adding
 // items to them.
 
 function isDep (tree, child) {
   if (child.fromShrinkwrap) return true
-  var requested = isProdDep(tree, child.package.name)
+  var name = moduleName(child)
+  var requested = isProdDep(tree, name)
   var matches
   if (requested) matches = doesChildVersionMatch(child, requested)
   if (matches) return matches
-  requested = isDevDep(tree, child.package.name)
+  requested = isDevDep(tree, name)
   if (!requested) return
   return doesChildVersionMatch(child, requested)
 }
@@ -86,7 +90,7 @@ function recalculateMetadata (tree, log, seen, next) {
   function markDeps (spec, done) {
     validate('SF', arguments)
     realizePackageSpecifier(spec, packageRelativePath(tree), function (er, req) {
-      if (er) return done()
+      if (er || !req.name) return done()
       var child = findRequirement(tree, req.name, req)
       if (child) {
         resolveWithExistingModule(child, tree, log, andIgnoreErrors(done))
@@ -122,13 +126,23 @@ function recalculateMetadata (tree, log, seen, next) {
 
 function addRequiredDep (tree, child) {
   if (!isDep(tree, child)) return false
-  var name = isProdDep(tree, child.package.name) ? flatNameFromTree(tree) : '#DEV:' + flatNameFromTree(tree)
-  child.package._requiredBy = union(child.package._requiredBy || [], [name])
-  child.requiredBy = union(child.requiredBy || [], [tree])
-  tree.requires = union(tree.requires || [], [child])
+  var name = isProdDep(tree, moduleName(child)) ? flatNameFromTree(tree) : '#DEV:' + flatNameFromTree(tree)
+  replaceModuleName(child.package, '_requiredBy', name)
+  replaceModule(child, 'requiredBy', tree)
+  replaceModule(tree, 'requires', child)
   return true
 }
 
+function removeObsoleteDep (child) {
+  if (child.removed) return
+  child.removed = true
+  var requires = child.requires || []
+  requires.forEach(function (requirement) {
+    requirement.requiredBy = requirement.requiredBy.filter(function (reqBy) { reqBy !== child })
+    if (requirement.requiredBy.length === 0) removeObsoleteDep(requirement)
+  })
+}
+
 function matchingDep (tree, name) {
   if (tree.package.dependencies && tree.package.dependencies[name]) return tree.package.dependencies[name]
   if (tree.package.devDependencies && tree.package.devDependencies[name]) return tree.package.devDependencies[name]
@@ -174,20 +188,18 @@ exports.loadRequestedDeps = function (args, tree, saveToDependencies, log, next)
   validate('AOOF', [args, tree, log, next])
   asyncMap(args, function (pkg, done) {
     var depLoaded = andAddParentToErrors(tree, done)
-    tree.children = tree.children.filter(function (child) {
-      return child.package.name !== pkg.name
-    })
     resolveWithNewModule(pkg, tree, log.newGroup('loadRequestedDeps'), iferr(depLoaded, function (child, tracker) {
       validate('OO', arguments)
       if (npm.config.get('global')) {
         child.isGlobal = true
       }
+      var childName = moduleName(child)
       if (saveToDependencies) {
-        tree.package[saveToDependencies][child.package.name] =
+        tree.package[saveToDependencies][childName] =
           child.package._requested.rawSpec || child.package._requested.spec
       }
       if (saveToDependencies && saveToDependencies !== 'devDependencies') {
-        tree.package.dependencies[child.package.name] =
+        tree.package.dependencies[childName] =
           child.package._requested.rawSpec || child.package._requested.spec
       }
       child.directlyRequested = true
@@ -197,7 +209,7 @@ exports.loadRequestedDeps = function (args, tree, saveToDependencies, log, next)
       // won't be when we're done), flag it as "depending" on the user
       // themselves, so we don't remove it as a dep that no longer exists
       if (!addRequiredDep(tree, child)) {
-        child.package._requiredBy = union(child.package._requiredBy, ['#USER'])
+        replaceModuleName(child.package, '_requiredBy', '#USER')
         child.directlyRequested = true
       }
       depLoaded(null, child, tracker)
@@ -205,19 +217,28 @@ exports.loadRequestedDeps = function (args, tree, saveToDependencies, log, next)
   }, andForEachChild(loadDeps, andFinishTracker(log, next)))
 }
 
+function moduleNameMatches (name) {
+  return function (child) { return moduleName(child) === name }
+}
+
+function noModuleNameMatches (name) {
+  return function (child) { return moduleName(child) !== name }
+}
+
 // while this implementation does not require async calling, doing so
 // gives this a consistent interface with loadDeps et al
 exports.removeDeps = function (args, tree, saveToDependencies, log, next) {
   validate('AOOF', [args, tree, log, next])
   args.forEach(function (pkg) {
+    var pkgName = moduleName(pkg)
     if (saveToDependencies) {
-      var toRemove = tree.children.filter(function (child) { return child.package.name === pkg.name })
-      tree.removed = union(tree.removed || [], toRemove)
+      var toRemove = tree.children.filter(moduleNameMatches(pkgName))
+      replaceModule(tree, 'removed', toRemove[0])
       toRemove.forEach(function (parent) {
         parent.save = saveToDependencies
       })
     }
-    tree.children = tree.children.filter(function (child) { return child.package.name !== pkg.name })
+    tree.children = tree.children.filter(noModuleNameMatches(pkgName))
   })
   log.finish()
   next()
@@ -238,7 +259,7 @@ function andForEachChild (load, next) {
       cmds.push([load, children[ii], logs[ii]])
     }
     var sortedCmds = cmds.sort(function installOrder (aa, bb) {
-      return aa[1].package.name.localeCompare(bb[1].package.name)
+      return moduleName(aa[1]).localeCompare(moduleName(bb[1]))
     })
     chain(sortedCmds, next)
   }
@@ -256,10 +277,10 @@ var failedDependency = exports.failedDependency = function (tree, name_pkg) {
     name = name_pkg
   } else {
     pkg = name_pkg
-    name = pkg.name || pkg.package.name
+    name = moduleName(pkg)
   }
 
-  tree.children = tree.children.filter(function (child) { return child.package.name !== name })
+  tree.children = tree.children.filter(noModuleNameMatches(name))
 
   if (isDepOptional(tree, name)) {
     return false
@@ -285,7 +306,7 @@ function andHandleOptionalErrors (log, tree, name, done) {
     if (!er) return done(er, child, childLog)
     var isFatal = failedDependency(tree, name)
     if (er && !isFatal) {
-      tree.children = tree.children.filter(function (child) { return child.package.name !== name })
+      tree.children = tree.children.filter(noModuleNameMatches(name))
       log.warn('install', "Couldn't install optional dependency:", er.message)
       log.verbose('install', er.stack)
       return done()
@@ -382,7 +403,7 @@ var updatePhantomChildren = exports.updatePhantomChildren = function (current, c
   while (current && current !== child.parent) {
     // FIXME: phantomChildren doesn't actually belong in the package.json
     if (!current.package._phantomChildren) current.package._phantomChildren = {}
-    current.package._phantomChildren[child.package.name] = child.package.version
+    current.package._phantomChildren[moduleName(child)] = child.package.version
     current = current.parent
   }
 }
@@ -395,6 +416,29 @@ function flatNameFromTree (tree) {
   return flatName(path, tree)
 }
 
+exports.test.replaceModuleName = replaceModuleName
+function replaceModuleName (obj, key, name) {
+  validate('OSS', arguments)
+  obj[key] = union(obj[key] || [], [name])
+}
+
+exports.test.replaceModule = replaceModule
+function replaceModule (obj, key, child) {
+  validate('OSO', arguments)
+  if (!obj[key]) obj[key] = []
+  // we replace children with a new array object instead of mutating it
+  // because mutating it results in weird failure states.
+  // I would very much like to know _why_ this is. =/
+  var children = [].concat(obj[key])
+  var childName = moduleName(child)
+  for (var replaceAt = 0; replaceAt < children.length; ++replaceAt) {
+    if (moduleName(children[replaceAt]) === childName) break
+  }
+  var replacing = children.splice(replaceAt, 1, child)
+  obj[key] = children
+  return replacing[0]
+}
+
 function resolveWithNewModule (pkg, tree, log, next) {
   validate('OOOF', arguments)
   if (pkg.type) {
@@ -403,10 +447,10 @@ function resolveWithNewModule (pkg, tree, log, next) {
     }))
   }
 
-  if (!pkg.installable) {
-    log.silly('resolveWithNewModule', getPackageId(pkg), 'checking installable status')
+  if (!pkg._installable) {
+    log.silly('resolveWithNewModule', packageId(pkg), 'checking installable status')
     return isInstallable(pkg, iferr(next, function () {
-      pkg.installable = true
+      pkg._installable = true
       resolveWithNewModule(pkg, tree, log, next)
     }))
   }
@@ -426,8 +470,8 @@ function resolveWithNewModule (pkg, tree, log, next) {
         isLink: tree.isLink
       })
 
-      parent.children = parent.children.filter(function (pkg) { return pkg.package.name !== child.package.name })
-      parent.children.push(child)
+      var replaced = replaceModule(parent, 'children', child)
+      if (replaced) removeObsoleteDep(replaced)
       addRequiredDep(tree, child)
       pkg._location = flatNameFromTree(child)
 
@@ -474,7 +518,7 @@ function validateAllPeerDeps (tree, onInvalid, seen) {
 var findRequirement = exports.findRequirement = function (tree, name, requested) {
   validate('OSO', arguments)
   var nameMatch = function (child) {
-    return child.package.name === name && child.parent
+    return moduleName(child) === name && child.parent && !child.removed
   }
   var versionMatch = function (child) {
     return doesChildVersionMatch(child, requested)
@@ -502,15 +546,16 @@ var findRequirement = exports.findRequirement = function (tree, name, requested)
 // If it is, then it's the level below where its installed.
 var earliestInstallable = exports.earliestInstallable = function (requiredBy, tree, pkg) {
   validate('OOO', arguments)
-  var nameMatch = function (child) {
-    return child.package.name === pkg.name
-  }
 
-  if (tree.children.some(nameMatch)) return null
+  function undeletedModuleMatches (child) {
+    return !child.removed && moduleName(child) === pkg.name
+  }
+  if (tree.children.some(undeletedModuleMatches)) return null
 
   // If any of the children of this tree have conflicting
   // binaries then we need to decline to install this package here.
   var binaryMatches = tree.children.some(function (child) {
+    if (child.removed) return false
     return Object.keys(child.package.bin || {}).some(function (bin) {
       return pkg.bin && pkg.bin[bin]
     })
@@ -520,7 +565,8 @@ var earliestInstallable = exports.earliestInstallable = function (requiredBy, tr
   // if this tree location requested the same module then we KNOW it
   // isn't compatible because if it were findRequirement would have
   // found that version.
-  if (requiredBy !== tree && tree.package.dependencies && tree.package.dependencies[pkg.name]) {
+  var deps = tree.package.dependencies || {}
+  if (!tree.removed && requiredBy !== tree && deps[pkg.name]) {
     return null
   }
 
diff --git a/deps/npm/lib/install/diff-trees.js b/deps/npm/lib/install/diff-trees.js
index 768bcde55f0fd3..9e9d6c44860090 100644
--- a/deps/npm/lib/install/diff-trees.js
+++ b/deps/npm/lib/install/diff-trees.js
@@ -1,6 +1,7 @@
 'use strict'
 var validate = require('aproba')
 var npa = require('npm-package-arg')
+var npm = require('../npm.js')
 var flattenTree = require('./flatten-tree.js')
 
 function nonRegistrySource (pkg) {
@@ -129,8 +130,9 @@ function diffTrees (oldTree, newTree) {
     pkg.isInLink = (pkg.oldPkg && isLink(pkg.oldPkg.parent)) ||
                    (pkg.parent && isLink(pkg.parent)) ||
                    requiredByAllLinked(pkg)
-    if (pkg.fromBundle) return
-    if (pkg.oldPkg) {
+    if (pkg.fromBundle) {
+      if (npm.config.get('rebuild-bundle')) differences.push(['rebuild', pkg])
+    } else if (pkg.oldPkg) {
       if (!pkg.directlyRequested && pkgAreEquiv(pkg.oldPkg.package, pkg.package)) return
       if (!pkg.isInLink && (isLink(pkg.oldPkg) || isLink(pkg))) {
         differences.push(['update-linked', pkg])
diff --git a/deps/npm/lib/install/filter-invalid-actions.js b/deps/npm/lib/install/filter-invalid-actions.js
index 55278ed829d2dd..f90bf0b4ea6f73 100644
--- a/deps/npm/lib/install/filter-invalid-actions.js
+++ b/deps/npm/lib/install/filter-invalid-actions.js
@@ -2,7 +2,7 @@
 var path = require('path')
 var validate = require('aproba')
 var log = require('npmlog')
-var getPackageId = require('./get-package-id.js')
+var packageId = require('../utils/package-id.js')
 
 module.exports = function (top, differences, next) {
   validate('SAF', arguments)
@@ -25,7 +25,7 @@ module.exports = function (top, differences, next) {
       // we want to skip warning if this is a child of another module that we're removing
       if (!pkg.parent.removing) {
         log.warn('skippingAction', 'Module is inside a symlinked module: not running ' +
-          cmd + ' ' + getPackageId(pkg) + ' ' + path.relative(top, pkg.path))
+          cmd + ' ' + packageId(pkg) + ' ' + path.relative(top, pkg.path))
       }
     } else {
       keep.push(action)
diff --git a/deps/npm/lib/install/flatten-tree.js b/deps/npm/lib/install/flatten-tree.js
index a0c6b7a79d1508..869685a4e8450c 100644
--- a/deps/npm/lib/install/flatten-tree.js
+++ b/deps/npm/lib/install/flatten-tree.js
@@ -1,5 +1,6 @@
 'use strict'
 var validate = require('aproba')
+var moduleName = require('../utils/module-name.js')
 
 module.exports = function (tree) {
   validate('O', arguments)
@@ -25,5 +26,5 @@ module.exports = function (tree) {
 
 var flatName = module.exports.flatName = function (path, child) {
   validate('SO', arguments)
-  return path + (child.package.name || 'TOP')
+  return path + (moduleName(child) || 'TOP')
 }
diff --git a/deps/npm/lib/install/inflate-bundled.js b/deps/npm/lib/install/inflate-bundled.js
index c27acd1dc0f4c4..c597e7a566dbb7 100644
--- a/deps/npm/lib/install/inflate-bundled.js
+++ b/deps/npm/lib/install/inflate-bundled.js
@@ -1,14 +1,14 @@
 'use strict'
-var path = require('path')
 var validate = require('aproba')
+var childPath = require('../utils/child-path.js')
 
 module.exports = function inflateBundled (parent, children) {
   validate('OA', arguments)
   children.forEach(function (child) {
     child.fromBundle = true
     child.parent = parent
-    child.path = path.join(parent.path, child.package.name)
-    child.realpath = path.resolve(parent.realpath, child.package.name)
+    child.path = childPath(parent.path, child)
+    child.realpath = childPath(parent.path, child)
     child.isLink = child.isLink || parent.isLink || parent.target
     inflateBundled(child, child.children)
   })
diff --git a/deps/npm/lib/install/inflate-shrinkwrap.js b/deps/npm/lib/install/inflate-shrinkwrap.js
index dd32583f6da829..ce22f4e4c53734 100644
--- a/deps/npm/lib/install/inflate-shrinkwrap.js
+++ b/deps/npm/lib/install/inflate-shrinkwrap.js
@@ -1,5 +1,4 @@
 'use strict'
-var path = require('path')
 var url = require('url')
 var asyncMap = require('slide').asyncMap
 var validate = require('aproba')
@@ -10,12 +9,14 @@ var addBundled = require('../fetch-package-metadata.js').addBundled
 var inflateBundled = require('./inflate-bundled.js')
 var npm = require('../npm.js')
 var createChild = require('./node.js').create
+var moduleName = require('../utils/module-name.js')
+var childPath = require('../utils/child-path.js')
 
 var inflateShrinkwrap = module.exports = function (tree, swdeps, finishInflating) {
   validate('OOF', arguments)
   if (!npm.config.get('shrinkwrap')) return finishInflating()
   var onDisk = {}
-  tree.children.forEach(function (child) { onDisk[child.package.name] = child })
+  tree.children.forEach(function (child) { onDisk[moduleName(child)] = child })
   tree.children = []
   asyncMap(Object.keys(swdeps), function (name, next) {
     var sw = swdeps[name]
@@ -42,8 +43,8 @@ var inflateShrinkwrap = module.exports = function (tree, swdeps, finishInflating
             loaded: false,
             parent: tree,
             fromShrinkwrap: spec,
-            path: path.join(tree.path, 'node_modules', pkg.name),
-            realpath: path.resolve(tree.realpath, 'node_modules', pkg.name),
+            path: childPath(tree.path, pkg),
+            realpath: childPath(tree.realpath, pkg),
             children: pkg._bundled || []
           })
           tree.children.push(child)
diff --git a/deps/npm/lib/install/mutate-into-logical-tree.js b/deps/npm/lib/install/mutate-into-logical-tree.js
index 0fbedcb9d27fe8..833aa94c9400cc 100644
--- a/deps/npm/lib/install/mutate-into-logical-tree.js
+++ b/deps/npm/lib/install/mutate-into-logical-tree.js
@@ -5,7 +5,8 @@ var validate = require('aproba')
 var flattenTree = require('./flatten-tree.js')
 var isExtraneous = require('./is-extraneous.js')
 var validateAllPeerDeps = require('./deps.js').validateAllPeerDeps
-var getPackageId = require('./get-package-id.js')
+var packageId = require('../utils/package-id.js')
+var moduleName = require('../utils/module-name.js')
 
 var mutateIntoLogicalTree = module.exports = function (tree) {
   validate('O', arguments)
@@ -18,9 +19,9 @@ var mutateIntoLogicalTree = module.exports = function (tree) {
   var flat = flattenTree(tree)
 
   function getNode (flatname) {
-    return flatname.substr(0, 5) === '#DEV:' ?
-           flat[flatname.substr(5)] :
-           flat[flatname]
+    return flatname.substr(0, 5) === '#DEV:'
+           ? flat[flatname.substr(5)]
+           : flat[flatname]
   }
 
   Object.keys(flat).sort().forEach(function (flatname) {
@@ -29,8 +30,8 @@ var mutateIntoLogicalTree = module.exports = function (tree) {
     var requiredByNames = requiredBy.filter(function (parentFlatname) {
       var parentNode = getNode(parentFlatname)
       if (!parentNode) return false
-      return parentNode.package.dependencies[node.package.name] ||
-             (parentNode.package.devDependencies && parentNode.package.devDependencies[node.package.name])
+      return parentNode.package.dependencies[moduleName(node)] ||
+             (parentNode.package.devDependencies && parentNode.package.devDependencies[moduleName(node)])
     })
     requiredBy = requiredByNames.map(getNode)
 
@@ -67,7 +68,7 @@ function translateTree_ (tree, seen) {
   pkg._dependencies = pkg.dependencies
   pkg.dependencies = {}
   tree.children.forEach(function (child) {
-    pkg.dependencies[child.package.name] = translateTree_(child, seen)
+    pkg.dependencies[moduleName(child)] = translateTree_(child, seen)
   })
   Object.keys(tree.missingDeps).forEach(function (name) {
     if (pkg.dependencies[name]) {
@@ -98,7 +99,7 @@ function translateTree_ (tree, seen) {
       }
       if (!peerPkg.peerMissing) peerPkg.peerMissing = []
       peerPkg.peerMissing.push({
-        requiredBy: getPackageId(child),
+        requiredBy: packageId(child),
         requires: pkgname + '@' + version
       })
     })
diff --git a/deps/npm/lib/install/save.js b/deps/npm/lib/install/save.js
index dffd3a0cd5d176..efe0e20ad7cfd7 100644
--- a/deps/npm/lib/install/save.js
+++ b/deps/npm/lib/install/save.js
@@ -11,6 +11,7 @@ var without = require('lodash.without')
 var npm = require('../npm.js')
 var deepSortObject = require('../utils/deep-sort-object.js')
 var parseJSON = require('../utils/parse-json.js')
+var moduleName = require('../utils/module-name.js')
 
 // if the -S|--save option is specified, then write installed packages
 // as dependencies to a package.json file.
@@ -45,9 +46,28 @@ function saveShrinkwrap (tree, next) {
     var save = npm.config.get('save')
     var saveDev = npm.config.get('save-dev')
     var saveOptional = npm.config.get('save-optional')
-    if (!saveOptional && saveDev) return next()
+
+    var shrinkwrap = tree.package._shrinkwrap || {dependencies: {}}
+    var hasDevOnlyDeps = tree.requires.filter(function (dep) {
+      var devReqs = dep.package._requiredBy.filter(function (name) { return name.substr(0, 4) === '#DEV' })
+      return devReqs.length === dep.package._requiredBy.length
+    }).some(function (dep) {
+      return shrinkwrap.dependencies[dep.package.name] != null
+    })
+
+    if (!saveOptional && saveDev && !hasDevOnlyDeps) return next()
     if (saveOptional || !save) return next()
-    npm.commands.shrinkwrap([], true, next)
+
+    if (hasDevOnlyDeps) {
+      var dev = npm.config.get('dev')
+      npm.config.set('dev', true)
+      npm.commands.shrinkwrap([], true, function () {
+        npm.config.set('dev', dev)
+        next.apply(this, arguments)
+      })
+    } else {
+      npm.commands.shrinkwrap([], true, next)
+    }
   })
 }
 
@@ -171,7 +191,7 @@ function getThingsToSave (tree) {
     return child.save
   }).map(function (child) {
     return {
-      name: child.package.name,
+      name: moduleName(child),
       spec: computeVersionSpec(child),
       save: child.save
     }
@@ -184,7 +204,7 @@ function getThingsToRemove (args, tree) {
   if (!tree.removed) return []
   var toRemove = tree.removed.map(function (child) {
     return {
-      name: child.package.name,
+      name: moduleName(child),
       save: child.save
     }
   })
diff --git a/deps/npm/lib/install/validate-args.js b/deps/npm/lib/install/validate-args.js
index 75ae3e362ad036..653dc1b4aeb570 100644
--- a/deps/npm/lib/install/validate-args.js
+++ b/deps/npm/lib/install/validate-args.js
@@ -30,7 +30,7 @@ var isInstallable = module.exports.isInstallable = function (pkg, next) {
 }
 
 function checkSelf (idealTree, pkg, force, next) {
-  if (idealTree.package.name !== pkg.name) return next()
+  if (idealTree.package && idealTree.package.name !== pkg.name) return next()
   if (force) {
     var warn = new Error("Wouldn't install " + pkg.name + ' as a dependency of itself, but being forced')
     warn.code = 'ENOSELF'
diff --git a/deps/npm/lib/install/validate-tree.js b/deps/npm/lib/install/validate-tree.js
index f09abedcbee6e0..b3caefb55617f2 100644
--- a/deps/npm/lib/install/validate-tree.js
+++ b/deps/npm/lib/install/validate-tree.js
@@ -11,7 +11,7 @@ var npm = require('../npm.js')
 var andFinishTracker = require('./and-finish-tracker.js')
 var flattenTree = require('./flatten-tree.js')
 var validateAllPeerDeps = require('./deps.js').validateAllPeerDeps
-var getPackageId = require('./get-package-id.js')
+var packageId = require('../utils/package-id.js')
 
 module.exports = function (idealTree, log, next) {
   validate('OOF', arguments)
@@ -38,7 +38,7 @@ function checkErrors (mod, idealTree, next) {
 function thenValidateAllPeerDeps (idealTree, next) {
   validate('OF', arguments)
   validateAllPeerDeps(idealTree, function (tree, pkgname, version) {
-    var warn = new Error(getPackageId(tree) + ' requires a peer of ' + pkgname + '@' +
+    var warn = new Error(packageId(tree) + ' requires a peer of ' + pkgname + '@' +
       version + ' but none was installed.')
     warn.code = 'EPEERINVALID'
     idealTree.warnings.push(warn)
@@ -57,7 +57,7 @@ function thenCheckTop (idealTree, next) {
   var pkg = clone(idealTree.package)
   try {
     normalizePackageData(pkg, function (warn) {
-      var warnObj = new Error(getPackageId(idealTree) + ' ' + warn)
+      var warnObj = new Error(packageId(idealTree) + ' ' + warn)
       warnObj.code = 'EPACKAGEJSON'
       idealTree.warnings.push(warnObj)
     }, false)
diff --git a/deps/npm/lib/link.js b/deps/npm/lib/link.js
index 9a62b063384b7e..7ee518419fe7af 100644
--- a/deps/npm/lib/link.js
+++ b/deps/npm/lib/link.js
@@ -114,14 +114,14 @@ function linkInstall (pkgs, cb) {
       if (npm.config.get('dry-run')) return resultPrinter(pkg, pp, target, rp, cb)
       chain(
         [
-          [function (cb) {
+          [ function (cb) {
             log.verbose('link', 'symlinking %s to %s', pp, target)
             cb()
-          }],
+          } ],
           [symlink, pp, target],
           // do not run any scripts
           rp && [build, [target], npm.config.get('global'), build._noLC, true],
-          [resultPrinter, pkg, pp, target, rp ]
+          [resultPrinter, pkg, pp, target, rp]
         ],
         cb
       )
diff --git a/deps/npm/lib/ls.js b/deps/npm/lib/ls.js
index 1854938eb6919a..51f0b51550085a 100644
--- a/deps/npm/lib/ls.js
+++ b/deps/npm/lib/ls.js
@@ -18,7 +18,7 @@ var iferr = require('iferr')
 var npm = require('./npm.js')
 var mutateIntoLogicalTree = require('./install/mutate-into-logical-tree.js')
 var recalculateMetadata = require('./install/deps.js').recalculateMetadata
-var getPackageId = require('./install/get-package-id.js')
+var packageId = require('./utils/package-id.js')
 
 ls.usage = 'npm ls [[<@scope>/]<pkg> ...]' +
     '\n\naliases: list, la, ll'
@@ -151,7 +151,7 @@ function getLite (data, noname) {
   if (data.extraneous) {
     lite.extraneous = true
     lite.problems = lite.problems || []
-    lite.problems.push('extraneous: ' + getPackageId(data) + ' ' + (data.path || ''))
+    lite.problems.push('extraneous: ' + packageId(data) + ' ' + (data.path || ''))
   }
 
   if (data.error && data.path !== path.resolve(npm.globalDir, '..') &&
@@ -174,7 +174,7 @@ function getLite (data, noname) {
     lite.invalid = true
     lite.problems = lite.problems || []
     lite.problems.push('invalid: ' +
-                       getPackageId(data) +
+                       packageId(data) +
                        ' ' + (data.path || ''))
   }
 
@@ -182,7 +182,7 @@ function getLite (data, noname) {
     lite.peerInvalid = true
     lite.problems = lite.problems || []
     lite.problems.push('peer dep not met: ' +
-                       getPackageId(data) +
+                       packageId(data) +
                        ' ' + (data.path || ''))
   }
 
@@ -200,7 +200,7 @@ function getLite (data, noname) {
         }
         p += d + '@' + dep.requiredBy +
             ', required by ' +
-            getPackageId(data)
+            packageId(data)
         lite.problems.push(p)
         return [d, { required: dep.requiredBy, missing: true }]
       } else if (dep.peerMissing) {
diff --git a/deps/npm/lib/npm.js b/deps/npm/lib/npm.js
index 264ad3636e5806..b714a82481ec64 100644
--- a/deps/npm/lib/npm.js
+++ b/deps/npm/lib/npm.js
@@ -162,8 +162,8 @@
   ]
   var littleGuys = [ 'isntall' ]
   var fullList = cmdList.concat(aliasNames).filter(function (c) {
-        return plumbing.indexOf(c) === -1
-      })
+    return plumbing.indexOf(c) === -1
+  })
   var abbrevs = abbrev(fullList)
 
   // we have our reasons
@@ -387,7 +387,8 @@
   }
 
   Object.defineProperty(npm, 'prefix',
-    { get: function () {
+    {
+      get: function () {
         return npm.config.get('global') ? npm.globalPrefix : npm.localPrefix
       },
       set: function (r) {
@@ -399,7 +400,8 @@
     })
 
   Object.defineProperty(npm, 'bin',
-    { get: function () {
+    {
+      get: function () {
         if (npm.config.get('global')) return npm.globalBin
         return path.resolve(npm.root, '.bin')
       },
@@ -407,7 +409,8 @@
     })
 
   Object.defineProperty(npm, 'globalBin',
-    { get: function () {
+    {
+      get: function () {
         var b = npm.globalPrefix
         if (process.platform !== 'win32') b = path.resolve(b, 'bin')
         return b
@@ -415,7 +418,8 @@
     })
 
   Object.defineProperty(npm, 'dir',
-    { get: function () {
+    {
+      get: function () {
         if (npm.config.get('global')) return npm.globalDir
         return path.resolve(npm.prefix, 'node_modules')
       },
@@ -423,7 +427,8 @@
     })
 
   Object.defineProperty(npm, 'globalDir',
-    { get: function () {
+    {
+      get: function () {
         return (process.platform !== 'win32')
              ? path.resolve(npm.globalPrefix, 'lib', 'node_modules')
              : path.resolve(npm.globalPrefix, 'node_modules')
@@ -443,7 +448,8 @@
   var tmpFolder
   var rand = require('crypto').randomBytes(4).toString('hex')
   Object.defineProperty(npm, 'tmp',
-    { get: function () {
+    {
+      get: function () {
         if (!tmpFolder) tmpFolder = 'npm-' + process.pid + '-' + rand
         return path.resolve(npm.config.get('tmp'), tmpFolder)
       },
diff --git a/deps/npm/lib/outdated.js b/deps/npm/lib/outdated.js
index 61eb3beb9a3151..44dd8bf0067252 100644
--- a/deps/npm/lib/outdated.js
+++ b/deps/npm/lib/outdated.js
@@ -39,6 +39,7 @@ var long = npm.config.get('long')
 var mapToRegistry = require('./utils/map-to-registry.js')
 var isExtraneous = require('./install/is-extraneous.js')
 var recalculateMetadata = require('./install/deps.js').recalculateMetadata
+var moduleName = require('./utils/module-name.js')
 
 function uniqName (item) {
   return item[0].path + '|' + item[1] + '|' + item[7]
@@ -212,7 +213,7 @@ function outdated_ (args, path, tree, parentHas, depth, cb) {
   var deps = tree.children.filter(function (child) { return !isExtraneous(child) }) || []
 
   deps.forEach(function (dep) {
-    types[dep.package.name] = 'dependencies'
+    types[moduleName(dep)] = 'dependencies'
   })
 
   Object.keys(tree.missingDeps).forEach(function (name) {
@@ -250,17 +251,17 @@ function outdated_ (args, path, tree, parentHas, depth, cb) {
   }
 
   if (npm.config.get('save-dev')) {
-    deps = deps.filter(function (dep) { return pkg.devDependencies[dep.package.name] })
+    deps = deps.filter(function (dep) { return pkg.devDependencies[moduleName(dep)] })
     deps.forEach(function (dep) {
-      types[dep.package.name] = 'devDependencies'
+      types[moduleName(dep)] = 'devDependencies'
     })
   } else if (npm.config.get('save')) {
     // remove optional dependencies from dependencies during --save.
-    deps = deps.filter(function (dep) { return !pkg.optionalDependencies[dep.package.name] })
+    deps = deps.filter(function (dep) { return !pkg.optionalDependencies[moduleName(dep)] })
   } else if (npm.config.get('save-optional')) {
-    deps = deps.filter(function (dep) { return pkg.optionalDependencies[dep.package.name] })
+    deps = deps.filter(function (dep) { return pkg.optionalDependencies[moduleName(dep)] })
     deps.forEach(function (dep) {
-      types[dep.package.name] = 'optionalDependencies'
+      types[moduleName(dep)] = 'optionalDependencies'
     })
   }
   var doUpdate = dev || (
@@ -292,7 +293,7 @@ function outdated_ (args, path, tree, parentHas, depth, cb) {
   // if has[dep] !== shouldHave[dep], then cb with the data
   // otherwise dive into the folder
   asyncMap(deps, function (dep, cb) {
-    var name = dep.package.name
+    var name = moduleName(dep)
     var required = (tree.package.dependencies)[name] ||
                    (tree.package.optionalDependencies)[name] ||
                    (tree.package.devDependencies)[name] ||
@@ -325,9 +326,9 @@ function shouldUpdate (args, tree, dep, has, req, depth, pkgpath, cb, type) {
 
   function doIt (wanted, latest) {
     if (!long) {
-      return cb(null, [[ tree, dep, curr && curr.version, wanted, latest, req, null, pkgpath]])
+      return cb(null, [[tree, dep, curr && curr.version, wanted, latest, req, null, pkgpath]])
     }
-    cb(null, [[ tree, dep, curr && curr.version, wanted, latest, req, type, pkgpath]])
+    cb(null, [[tree, dep, curr && curr.version, wanted, latest, req, type, pkgpath]])
   }
 
   if (args.length && args.indexOf(dep) === -1) return skip()
diff --git a/deps/npm/lib/repo.js b/deps/npm/lib/repo.js
index 4bd200aff91832..caaf422cfeee2c 100644
--- a/deps/npm/lib/repo.js
+++ b/deps/npm/lib/repo.js
@@ -47,5 +47,5 @@ function unknownHostedUrl (url) {
                  : 'http:'
     return protocol + '//' + (url.host || '') +
       url.path.replace(/\.git$/, '')
-  } catch(e) {}
+  } catch (e) {}
 }
diff --git a/deps/npm/lib/run-script.js b/deps/npm/lib/run-script.js
index 8c99c29b82a6d2..ef5e6560047763 100644
--- a/deps/npm/lib/run-script.js
+++ b/deps/npm/lib/run-script.js
@@ -11,7 +11,6 @@ runScript.usage = 'npm run-script <command> [-- <args>...]' +
                   '\n\nalias: npm run'
 
 runScript.completion = function (opts, cb) {
-
   // see if there's already a package specified.
   var argv = opts.conf.argv.remain
 
diff --git a/deps/npm/lib/search.js b/deps/npm/lib/search.js
index a029d62eb18d25..4877417f0d79c7 100644
--- a/deps/npm/lib/search.js
+++ b/deps/npm/lib/search.js
@@ -196,16 +196,16 @@ function prettify (data, args) {
   var output = columnify(
     lines,
     {
-        include: columns,
-        truncate: truncate,
-        config: {
-          name: { maxWidth: 40, truncate: false, truncateMarker: '' },
-          description: { maxWidth: 60 },
-          author: { maxWidth: 20 },
-          date: { maxWidth: 11 },
-          version: { maxWidth: 11 },
-          keywords: { maxWidth: Infinity }
-        }
+      include: columns,
+      truncate: truncate,
+      config: {
+        name: { maxWidth: 40, truncate: false, truncateMarker: '' },
+        description: { maxWidth: 60 },
+        author: { maxWidth: 20 },
+        date: { maxWidth: 11 },
+        version: { maxWidth: 11 },
+        keywords: { maxWidth: Infinity }
+      }
     }
   )
   output = trimToMaxWidth(output)
@@ -214,7 +214,7 @@ function prettify (data, args) {
   return output
 }
 
-var colors = [31, 33, 32, 36, 34, 35 ]
+var colors = [31, 33, 32, 36, 34, 35]
 var cl = colors.length
 
 function addColorMarker (str, arg, i) {
diff --git a/deps/npm/lib/shrinkwrap.js b/deps/npm/lib/shrinkwrap.js
index 2a8cc7a29fa2e8..9a6d8e76bd549e 100644
--- a/deps/npm/lib/shrinkwrap.js
+++ b/deps/npm/lib/shrinkwrap.js
@@ -14,7 +14,8 @@ var recalculateMetadata = require('./install/deps.js').recalculateMetadata
 var validatePeerDeps = require('./install/deps.js').validatePeerDeps
 var isExtraneous = require('./install/is-extraneous.js')
 var isOnlyDev = require('./install/is-dev.js').isOnlyDev
-var getPackageId = require('./install/get-package-id.js')
+var packageId = require('./utils/package-id.js')
+var moduleName = require('./utils/module-name.js')
 
 shrinkwrap.usage = 'npm shrinkwrap'
 
@@ -64,21 +65,21 @@ function shrinkwrapDeps (dev, problems, deps, tree, seen) {
   if (seen[tree.path]) return
   seen[tree.path] = true
   Object.keys(tree.missingDeps).forEach(function (name) {
-    var invalid = tree.children.filter(function (dep) { return dep.package.name === name })[0]
+    var invalid = tree.children.filter(function (dep) { return moduleName(dep) === name })[0]
     if (invalid) {
       problems.push('invalid: have ' + invalid.package._id + ' (expected: ' + tree.missingDeps[name] + ') ' + invalid.path)
-    } else {
-      var topname = getPackageId(tree)
+    } else if (!tree.package.optionalDependencies || !tree.package.optionalDependencies[name]) {
+      var topname = packageId(tree)
       problems.push('missing: ' + name + '@' + tree.package.dependencies[name] +
         (topname ? ', required by ' + topname : ''))
     }
   })
-  tree.children.sort(function (aa, bb) { return aa.package.name.localeCompare(bb.package.name) }).forEach(function (child) {
+  tree.children.sort(function (aa, bb) { return moduleName(aa).localeCompare(moduleName(bb)) }).forEach(function (child) {
     if (!dev && isOnlyDev(child)) {
-      log.warn('shrinkwrap', 'Excluding devDependency: %s', child.package.name, child.parent.package.dependencies)
+      log.warn('shrinkwrap', 'Excluding devDependency: %s', packageId(child), child.parent.package.dependencies)
       return
     }
-    var pkginfo = deps[child.package.name] = {}
+    var pkginfo = deps[moduleName(child)] = {}
     pkginfo.version = child.package.version
     pkginfo.from = child.package._from
     pkginfo.resolved = child.package._resolved
diff --git a/deps/npm/lib/utils/child-path.js b/deps/npm/lib/utils/child-path.js
new file mode 100644
index 00000000000000..4594f43221ff62
--- /dev/null
+++ b/deps/npm/lib/utils/child-path.js
@@ -0,0 +1,10 @@
+'use strict'
+var path = require('path')
+var validate = require('aproba')
+var moduleName = require('../utils/module-name.js')
+
+module.exports = childPath
+function childPath (parentPath, child) {
+  validate('SO', arguments)
+  return path.join(parentPath, 'node_modules', moduleName(child))
+}
diff --git a/deps/npm/lib/utils/completion/installed-deep.js b/deps/npm/lib/utils/completion/installed-deep.js
index 146a4d7908eead..dc9bfbee8a2da7 100644
--- a/deps/npm/lib/utils/completion/installed-deep.js
+++ b/deps/npm/lib/utils/completion/installed-deep.js
@@ -49,6 +49,4 @@ function installedDeep (opts, cb) {
     var names = local.concat(global)
     return cb(null, names)
   }
-
 }
-
diff --git a/deps/npm/lib/utils/error-handler.js b/deps/npm/lib/utils/error-handler.js
index cd61f7912993fb..8a7b1c06daa4fc 100644
--- a/deps/npm/lib/utils/error-handler.js
+++ b/deps/npm/lib/utils/error-handler.js
@@ -171,316 +171,317 @@ function errorHandler (er) {
   if (log.levels[log.level] <= log.levels.error) console.error('')
 
   switch (er.code) {
-  case 'ECONNREFUSED':
-    log.error('', er)
-    log.error(
-      '',
-      [
-        '\nIf you are behind a proxy, please make sure that the',
-        "'proxy' config is set properly.  See: 'npm help config'"
-      ].join('\n')
-    )
-    break
-
-  case 'EACCES':
-  case 'EPERM':
-    log.error('', er)
-    log.error('', ['\nPlease try running this command again as root/Administrator.'
-              ].join('\n'))
-    break
-
-  case 'ELIFECYCLE':
-    log.error('', er.message)
-    log.error(
-      '',
-      [
+    case 'ECONNREFUSED':
+      log.error('', er)
+      log.error(
         '',
-        'Failed at the ' + er.pkgid + ' ' + er.stage + " script '" + er.script + "'.",
-        'This is most likely a problem with the ' + er.pkgname + ' package,',
-        'not with npm itself.',
-        'Tell the author that this fails on your system:',
-        '    ' + er.script,
-        'You can get their info via:',
-        '    npm owner ls ' + er.pkgname,
-        'There is likely additional logging output above.'
-      ].join('\n')
-    )
-    break
-
-  case 'ENOGIT':
-    log.error('', er.message)
-    log.error(
-      '',
-      [
+        [
+          '\nIf you are behind a proxy, please make sure that the',
+          "'proxy' config is set properly.  See: 'npm help config'"
+        ].join('\n')
+      )
+      break
+
+    case 'EACCES':
+    case 'EPERM':
+      log.error('', er)
+      log.error('', ['\nPlease try running this command again as root/Administrator.'
+                ].join('\n'))
+      break
+
+    case 'ELIFECYCLE':
+      log.error('', er.message)
+      log.error(
         '',
-        'Failed using git.',
-        'This is most likely not a problem with npm itself.',
-        'Please check if you have git installed and in your PATH.'
-      ].join('\n')
-    )
-    break
-
-  case 'EJSONPARSE':
-    log.error('', er.message)
-    log.error('', 'File: ' + er.file)
-    log.error(
-      '',
-      [
-        'Failed to parse package.json data.',
-        'package.json must be actual JSON, not just JavaScript.',
+        [
+          '',
+          'Failed at the ' + er.pkgid + ' ' + er.stage + " script '" + er.script + "'.",
+          'Make sure you have the latest version of node.js and npm installed.',
+          'If you do, this is most likely a problem with the ' + er.pkgname + ' package,',
+          'not with npm itself.',
+          'Tell the author that this fails on your system:',
+          '    ' + er.script,
+          'You can get their info via:',
+          '    npm owner ls ' + er.pkgname,
+          'There is likely additional logging output above.'
+        ].join('\n')
+      )
+      break
+
+    case 'ENOGIT':
+      log.error('', er.message)
+      log.error(
         '',
-        'This is not a bug in npm.',
-        'Tell the package author to fix their package.json file.'
-      ].join('\n'),
-      'JSON.parse'
-    )
-    break
+        [
+          '',
+          'Failed using git.',
+          'This is most likely not a problem with npm itself.',
+          'Please check if you have git installed and in your PATH.'
+        ].join('\n')
+      )
+      break
+
+    case 'EJSONPARSE':
+      log.error('', er.message)
+      log.error('', 'File: ' + er.file)
+      log.error(
+        '',
+        [
+          'Failed to parse package.json data.',
+          'package.json must be actual JSON, not just JavaScript.',
+          '',
+          'This is not a bug in npm.',
+          'Tell the package author to fix their package.json file.'
+        ].join('\n'),
+        'JSON.parse'
+      )
+      break
 
-  // TODO(isaacs)
-  // Add a special case here for E401 and E403 explaining auth issues?
+    // TODO(isaacs)
+    // Add a special case here for E401 and E403 explaining auth issues?
 
-  case 'E404':
-    var msg = [er.message]
-    if (er.pkgid && er.pkgid !== '-') {
-      msg.push('', "'" + er.pkgid + "' is not in the npm registry.")
+    case 'E404':
+      var msg = [er.message]
+      if (er.pkgid && er.pkgid !== '-') {
+        msg.push('', "'" + er.pkgid + "' is not in the npm registry.")
 
-      var valResult = nameValidator(er.pkgid)
+        var valResult = nameValidator(er.pkgid)
 
-      if (valResult.validForNewPackages) {
-        msg.push('You should bug the author to publish it (or use the name yourself!)')
-      } else {
-        msg.push('Your package name is not valid, because', '')
+        if (valResult.validForNewPackages) {
+          msg.push('You should bug the author to publish it (or use the name yourself!)')
+        } else {
+          msg.push('Your package name is not valid, because', '')
 
-        var errorsArray = (valResult.errors || []).concat(valResult.warnings || [])
-        errorsArray.forEach(function (item, idx) {
-          msg.push(' ' + (idx + 1) + '. ' + item)
-        })
+          var errorsArray = (valResult.errors || []).concat(valResult.warnings || [])
+          errorsArray.forEach(function (item, idx) {
+            msg.push(' ' + (idx + 1) + '. ' + item)
+          })
+        }
+
+        if (er.parent) {
+          msg.push("It was specified as a dependency of '" + er.parent + "'")
+        }
+        msg.push(
+          '\nNote that you can also install from a',
+          'tarball, folder, http url, or git url.'
+        )
       }
+      // There's no need to have 404 in the message as well.
+      msg[0] = msg[0].replace(/^404\s+/, '')
+      log.error('404', msg.join('\n'))
+      break
 
-      if (er.parent) {
-        msg.push("It was specified as a dependency of '" + er.parent + "'")
-      }
-      msg.push(
-        '\nNote that you can also install from a',
-        'tarball, folder, http url, or git url.'
+    case 'EPUBLISHCONFLICT':
+      log.error(
+        'publish fail',
+        [
+          'Cannot publish over existing version.',
+          "Update the 'version' field in package.json and try again.",
+          '',
+          'To automatically increment version numbers, see:',
+          '    npm help version'
+        ].join('\n')
       )
-    }
-    // There's no need to have 404 in the message as well.
-    msg[0] = msg[0].replace(/^404\s+/, '')
-    log.error('404', msg.join('\n'))
-    break
-
-  case 'EPUBLISHCONFLICT':
-    log.error(
-      'publish fail',
-      [
-        'Cannot publish over existing version.',
-        "Update the 'version' field in package.json and try again.",
-        '',
-        'To automatically increment version numbers, see:',
-        '    npm help version'
-      ].join('\n')
-    )
-    break
-
-  case 'EISGIT':
-    log.error(
-      'git',
-      [
-        er.message,
-        '    ' + er.path,
-        'Refusing to remove it. Update manually,',
-        'or move it out of the way first.'
-      ].join('\n')
-    )
-    break
-
-  case 'ECYCLE':
-    log.error(
-      'cycle',
-      [
-        er.message,
-        'While installing: ' + er.pkgid,
-        'Found a pathological dependency case that npm cannot solve.',
-        'Please report this to the package author.'
-      ].join('\n')
-    )
-    break
-
-  case 'EBADPLATFORM':
-    log.error(
-      'notsup',
-      [
-        er.message,
-        'Not compatible with your operating system or architecture: ' + er.pkgid,
-        'Valid OS:    ' + er.os.join(','),
-        'Valid Arch:  ' + er.cpu.join(','),
-        'Actual OS:   ' + process.platform,
-        'Actual Arch: ' + process.arch
-      ].join('\n')
-    )
-    break
-
-  case 'EEXIST':
-    log.error(
-      [
-        er.message,
-        'File exists: ' + er.path,
-        'Move it away, and try again.'
-      ].join('\n')
-    )
-    break
-
-  case 'ENEEDAUTH':
-    log.error(
-      'need auth',
-      [
-        er.message,
-        'You need to authorize this machine using `npm adduser`'
-      ].join('\n')
-    )
-    break
-
-  case 'EPEERINVALID':
-    var peerErrors = Object.keys(er.peersDepending).map(function (peer) {
-      return 'Peer ' + peer + ' wants ' +
-        er.packageName + '@' + er.peersDepending[peer]
-    })
-    log.error('peerinvalid', [er.message].concat(peerErrors).join('\n'))
-    break
-
-  case 'ECONNRESET':
-  case 'ENOTFOUND':
-  case 'ETIMEDOUT':
-  case 'EAI_FAIL':
-    log.error(
-      'network',
-      [
-        er.message,
-        'This is most likely not a problem with npm itself',
-        'and is related to network connectivity.',
-        'In most cases you are behind a proxy or have bad network settings.',
-        '\nIf you are behind a proxy, please make sure that the',
-        "'proxy' config is set properly.  See: 'npm help config'"
-      ].join('\n')
-    )
-    break
-
-  case 'ENOPACKAGEJSON':
-    log.error(
-      'package.json',
-      [
-        er.message,
-        'This is most likely not a problem with npm itself.',
-        "npm can't find a package.json file in your current directory."
-      ].join('\n')
-    )
-    break
-
-  case 'ETARGET':
-    msg = [
-      er.message,
-      'This is most likely not a problem with npm itself.',
-      'In most cases you or one of your dependencies are requesting',
-      "a package version that doesn't exist."
-    ]
-    if (er.parent) {
-      msg.push("\nIt was specified as a dependency of '" + er.parent + "'\n")
-    }
-    log.error('notarget', msg.join('\n'))
-    break
+      break
 
-  case 'ENOTSUP':
-    if (er.required) {
+    case 'EISGIT':
+      log.error(
+        'git',
+        [
+          er.message,
+          '    ' + er.path,
+          'Refusing to remove it. Update manually,',
+          'or move it out of the way first.'
+        ].join('\n')
+      )
+      break
+
+    case 'ECYCLE':
+      log.error(
+        'cycle',
+        [
+          er.message,
+          'While installing: ' + er.pkgid,
+          'Found a pathological dependency case that npm cannot solve.',
+          'Please report this to the package author.'
+        ].join('\n')
+      )
+      break
+
+    case 'EBADPLATFORM':
       log.error(
         'notsup',
         [
           er.message,
-          'Not compatible with your version of node/npm: ' + er.pkgid,
-          'Required: ' + JSON.stringify(er.required),
-          'Actual:   ' + JSON.stringify({
-            npm: npm.version,
-            node: npm.config.get('node-version')
-          })
+          'Not compatible with your operating system or architecture: ' + er.pkgid,
+          'Valid OS:    ' + er.os.join(','),
+          'Valid Arch:  ' + er.cpu.join(','),
+          'Actual OS:   ' + process.platform,
+          'Actual Arch: ' + process.arch
         ].join('\n')
       )
       break
-    } // else passthrough
-    /*eslint no-fallthrough:0*/
 
-  case 'ENOSPC':
-    log.error(
-      'nospc',
-      [
-        er.message,
-        'This is most likely not a problem with npm itself',
-        'and is related to insufficient space on your system.'
-      ].join('\n')
-    )
-    break
-
-  case 'EROFS':
-    log.error(
-      'rofs',
-      [
-        er.message,
-        'This is most likely not a problem with npm itself',
-        'and is related to the file system being read-only.',
-        '\nOften virtualized file systems, or other file systems',
-        "that don't support symlinks, give this error."
-      ].join('\n')
-    )
-    break
-
-  case 'ENOENT':
-    log.error(
-      'enoent',
-      [
-        er.message,
-        'This is most likely not a problem with npm itself',
-        'and is related to npm not being able to find a file.',
-        er.file ? "\nCheck if the file '" + er.file + "' is present." : ''
-      ].join('\n')
-    )
-    break
-
-  case 'EMISSINGARG':
-  case 'EUNKNOWNTYPE':
-  case 'EINVALIDTYPE':
-  case 'ETOOMANYARGS':
-    log.error(
-      'typeerror',
-      [
-        er.stack,
-        'This is an error with npm itself. Please report this error at:',
-        '    <http://github.com/npm/npm/issues>'
-      ].join('\n')
-    )
-    break
-
-  case 'EISDIR':
-    log.error(
-      'eisdir',
-      [
+    case 'EEXIST':
+      log.error(
+        [
+          er.message,
+          'File exists: ' + er.path,
+          'Move it away, and try again.'
+        ].join('\n')
+      )
+      break
+
+    case 'ENEEDAUTH':
+      log.error(
+        'need auth',
+        [
+          er.message,
+          'You need to authorize this machine using `npm adduser`'
+        ].join('\n')
+      )
+      break
+
+    case 'EPEERINVALID':
+      var peerErrors = Object.keys(er.peersDepending).map(function (peer) {
+        return 'Peer ' + peer + ' wants ' +
+          er.packageName + '@' + er.peersDepending[peer]
+      })
+      log.error('peerinvalid', [er.message].concat(peerErrors).join('\n'))
+      break
+
+    case 'ECONNRESET':
+    case 'ENOTFOUND':
+    case 'ETIMEDOUT':
+    case 'EAI_FAIL':
+      log.error(
+        'network',
+        [
+          er.message,
+          'This is most likely not a problem with npm itself',
+          'and is related to network connectivity.',
+          'In most cases you are behind a proxy or have bad network settings.',
+          '\nIf you are behind a proxy, please make sure that the',
+          "'proxy' config is set properly.  See: 'npm help config'"
+        ].join('\n')
+      )
+      break
+
+    case 'ENOPACKAGEJSON':
+      log.error(
+        'package.json',
+        [
+          er.message,
+          'This is most likely not a problem with npm itself.',
+          "npm can't find a package.json file in your current directory."
+        ].join('\n')
+      )
+      break
+
+    case 'ETARGET':
+      msg = [
         er.message,
-        'This is most likely not a problem with npm itself',
-        'and is related to npm not being able to find a package.json in',
-        'a package you are trying to install.'
-      ].join('\n')
-    )
-    break
-
-  default:
-    log.error('', er.message || er)
-    log.error(
-      '',
-      [
+        'This is most likely not a problem with npm itself.',
+        'In most cases you or one of your dependencies are requesting',
+        "a package version that doesn't exist."
+      ]
+      if (er.parent) {
+        msg.push("\nIt was specified as a dependency of '" + er.parent + "'\n")
+      }
+      log.error('notarget', msg.join('\n'))
+      break
+
+    case 'ENOTSUP':
+      if (er.required) {
+        log.error(
+          'notsup',
+          [
+            er.message,
+            'Not compatible with your version of node/npm: ' + er.pkgid,
+            'Required: ' + JSON.stringify(er.required),
+            'Actual:   ' + JSON.stringify({
+              npm: npm.version,
+              node: npm.config.get('node-version')
+            })
+          ].join('\n')
+        )
+        break
+      } // else passthrough
+      /*eslint no-fallthrough:0*/
+
+    case 'ENOSPC':
+      log.error(
+        'nospc',
+        [
+          er.message,
+          'This is most likely not a problem with npm itself',
+          'and is related to insufficient space on your system.'
+        ].join('\n')
+      )
+      break
+
+    case 'EROFS':
+      log.error(
+        'rofs',
+        [
+          er.message,
+          'This is most likely not a problem with npm itself',
+          'and is related to the file system being read-only.',
+          '\nOften virtualized file systems, or other file systems',
+          "that don't support symlinks, give this error."
+        ].join('\n')
+      )
+      break
+
+    case 'ENOENT':
+      log.error(
+        'enoent',
+        [
+          er.message,
+          'This is most likely not a problem with npm itself',
+          'and is related to npm not being able to find a file.',
+          er.file ? "\nCheck if the file '" + er.file + "' is present." : ''
+        ].join('\n')
+      )
+      break
+
+    case 'EMISSINGARG':
+    case 'EUNKNOWNTYPE':
+    case 'EINVALIDTYPE':
+    case 'ETOOMANYARGS':
+      log.error(
+        'typeerror',
+        [
+          er.stack,
+          'This is an error with npm itself. Please report this error at:',
+          '    <http://github.com/npm/npm/issues>'
+        ].join('\n')
+      )
+      break
+
+    case 'EISDIR':
+      log.error(
+        'eisdir',
+        [
+          er.message,
+          'This is most likely not a problem with npm itself',
+          'and is related to npm not being able to find a package.json in',
+          'a package you are trying to install.'
+        ].join('\n')
+      )
+      break
+
+    default:
+      log.error('', er.message || er)
+      log.error(
         '',
-        'If you need help, you may report this error at:',
-        '    <https://github.com/npm/npm/issues>'
-      ].join('\n')
-    )
-    break
+        [
+          '',
+          'If you need help, you may report this error at:',
+          '    <https://github.com/npm/npm/issues>'
+        ].join('\n')
+      )
+      break
   }
 
   exit(typeof er.errno === 'number' ? er.errno : 1)
diff --git a/deps/npm/lib/utils/lifecycle.js b/deps/npm/lib/utils/lifecycle.js
index 1c0d437a907bf7..e2ec37c24114ac 100644
--- a/deps/npm/lib/utils/lifecycle.js
+++ b/deps/npm/lib/utils/lifecycle.js
@@ -189,7 +189,6 @@ function runCmd (note, cmd, pkg, env, stage, wd, unsafe, cb) {
 }
 
 function runCmd_ (cmd, pkg, env, wd, stage, unsafe, uid, gid, cb_) {
-
   function cb (er) {
     cb_.apply(null, arguments)
     log.resume()
@@ -237,7 +236,7 @@ function runCmd_ (cmd, pkg, env, wd, stage, unsafe, uid, gid, cb_) {
 
   function procError (er) {
     if (progressEnabled) log.enableProgress()
-    if (er && !npm.ROLLBACK) {
+    if (er) {
       log.info('lifecycle', logid(pkg, stage), 'Failed to exec ' + stage + ' script')
       er.message = pkg._id + ' ' + stage + ': `' + cmd + '`\n' +
                    er.message
@@ -248,13 +247,8 @@ function runCmd_ (cmd, pkg, env, wd, stage, unsafe, uid, gid, cb_) {
       er.stage = stage
       er.script = cmd
       er.pkgname = pkg.name
-      return cb(er)
-    } else if (er) {
-      log.error('lifecycle', logid(pkg, stage), er)
-      log.error('lifecycle', logid(pkg, stage), 'continuing anyway')
-      return cb()
     }
-    cb(er)
+    return cb(er)
   }
 }
 
@@ -285,7 +279,6 @@ function makeEnv (data, prefix, env) {
 
     // express and others respect the NODE_ENV value.
     if (npm.config.get('production')) env.NODE_ENV = 'production'
-
   } else if (!data.hasOwnProperty('_lifecycleEnv')) {
     Object.defineProperty(data, '_lifecycleEnv',
       {
@@ -317,11 +310,10 @@ function makeEnv (data, prefix, env) {
       }
     } else {
       env[envKey] = String(data[i])
-      env[envKey] = env[envKey].indexOf('\n') !== -1 ?
-                      JSON.stringify(env[envKey]) :
-                      env[envKey]
+      env[envKey] = env[envKey].indexOf('\n') !== -1
+                      ? JSON.stringify(env[envKey])
+                      : env[envKey]
     }
-
   }
 
   if (prefix !== 'npm_package_') return env
diff --git a/deps/npm/lib/utils/module-name.js b/deps/npm/lib/utils/module-name.js
new file mode 100644
index 00000000000000..7ca175487c0989
--- /dev/null
+++ b/deps/npm/lib/utils/module-name.js
@@ -0,0 +1,33 @@
+'use strict'
+var path = require('path')
+var validate = require('aproba')
+
+module.exports = moduleName
+module.exports.test = {}
+
+module.exports.test.pathToPackageName = pathToPackageName
+function pathToPackageName (dir) {
+  if (dir == null) return ''
+  if (dir === '') return ''
+  var name = path.relative(path.resolve(dir, '..'), dir)
+  var scoped = path.relative(path.resolve(dir, '../..'), dir)
+  if (scoped[0] === '@') return scoped
+  return name
+}
+
+module.exports.test.isNotEmpty = isNotEmpty
+function isNotEmpty (str) {
+  return str != null && str !== ''
+}
+
+var unknown = 0
+function moduleName (tree) {
+  validate('O', arguments)
+  var pkg = tree.package || tree
+  if (isNotEmpty(pkg.name)) return pkg.name
+  var pkgName = pathToPackageName(tree.path)
+  if (pkgName !== '') return pkgName
+  if (tree._invalidName != null) return tree._invalidName
+  tree._invalidName = '!invalid#' + (++unknown)
+  return tree._invalidName
+}
diff --git a/deps/npm/lib/install/get-package-id.js b/deps/npm/lib/utils/package-id.js
similarity index 58%
rename from deps/npm/lib/install/get-package-id.js
rename to deps/npm/lib/utils/package-id.js
index 076eb1423a2fd5..2c5e3314694c31 100644
--- a/deps/npm/lib/install/get-package-id.js
+++ b/deps/npm/lib/utils/package-id.js
@@ -1,19 +1,15 @@
 'use strict'
-var path = require('path')
+var moduleName = require('./module-name.js')
 
 module.exports = function (tree) {
   var pkg = tree.package || tree
   // FIXME: Excluding the '@' here is cleaning up after the mess that
   // read-package-json makes. =(
   if (pkg._id && pkg._id !== '@') return pkg._id
-  var name = pkg.name || (tree && tree.logical && path.basename(tree.logical))
-  if (name && pkg.version) {
+  var name = moduleName(tree)
+  if (pkg.version) {
     return name + '@' + pkg.version
-  } else if (tree) {
-    return tree.path
-  } else if (name) {
-    return name
   } else {
-    return ''
+    return name
   }
 }
diff --git a/deps/npm/lib/utils/tar.js b/deps/npm/lib/utils/tar.js
index 5b20160ea5d46d..8eb2311d096a6c 100644
--- a/deps/npm/lib/utils/tar.js
+++ b/deps/npm/lib/utils/tar.js
@@ -21,6 +21,8 @@ var myGid = process.getgid && process.getgid()
 var readPackageTree = require('read-package-tree')
 var union = require('lodash.union')
 var flattenTree = require('../install/flatten-tree.js')
+var moduleName = require('./module-name.js')
+var packageId = require('./package-id.js')
 
 if (process.env.SUDO_UID && myUid === 0) {
   if (!isNaN(process.env.SUDO_UID)) myUid = +process.env.SUDO_UID
@@ -133,7 +135,7 @@ BundledPacker.prototype.applyIgnores = function (entry, partial, entryObj) {
   return Packer.prototype.applyIgnores.call(this, entry, partial, entryObj)
 }
 
-function nameMatch (name) { return function (other) { return name === other.package.name } }
+function nameMatch (name) { return function (other) { return name === moduleName(other) } }
 
 function pack_ (tarball, folder, tree, flatTree, pkg, cb) {
   function InstancePacker (props) {
@@ -145,7 +147,7 @@ function pack_ (tarball, folder, tree, flatTree, pkg, cb) {
     if (!bd) return false
 
     if (!Array.isArray(bd)) {
-      throw new Error(this.package.name + '\'s `bundledDependencies` should ' +
+      throw new Error(packageId(this) + '\'s `bundledDependencies` should ' +
                       'be an array')
     }
     if (!tree) return false
@@ -161,7 +163,7 @@ function pack_ (tarball, folder, tree, flatTree, pkg, cb) {
       seen[req] = true
       var reqPkg = flatTree[req]
       if (!reqPkg) continue
-      if (reqPkg.parent === tree && bd.indexOf(reqPkg.package.name) !== -1) {
+      if (reqPkg.parent === tree && bd.indexOf(moduleName(reqPkg)) !== -1) {
         return true
       }
       requiredBy = union(requiredBy, reqPkg.package._requiredBy)
@@ -233,9 +235,9 @@ function unpack_ (tarball, unpackTarget, dMode, fMode, uid, gid, cb) {
                 dMode, fMode,
                 uid, gid,
                 function (er, folder) {
-      if (er) return cb(er)
-      readJson(path.resolve(folder, 'package.json'), cb)
-    })
+                  if (er) return cb(er)
+                  readJson(path.resolve(folder, 'package.json'), cb)
+                })
   })
 }
 
diff --git a/deps/npm/man/man1/npm-README.1 b/deps/npm/man/man1/npm-README.1
index 423811f5be80f1..d3a7274bd8cdbe 100644
--- a/deps/npm/man/man1/npm-README.1
+++ b/deps/npm/man/man1/npm-README.1
@@ -211,7 +211,7 @@ support@npmjs\.com and explain the situation\.
 Any data published to The npm Registry (including user account
 information) may be removed or modified at the sole discretion of the
 npm server administrators\.
-.SS In plainer english
+.SS In plainer English
 .P
 npm is the property of npm, Inc\.
 .P
diff --git a/deps/npm/man/man1/npm-bin.1 b/deps/npm/man/man1/npm-bin.1
index 12e182d9a17ad4..c629415eb883c3 100644
--- a/deps/npm/man/man1/npm-bin.1
+++ b/deps/npm/man/man1/npm-bin.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm bin [\-\-global]
+npm bin [\-g|\-\-global]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-config.1 b/deps/npm/man/man1/npm-config.1
index 4ff3ac37ea1550..d6369755a11316 100644
--- a/deps/npm/man/man1/npm-config.1
+++ b/deps/npm/man/man1/npm-config.1
@@ -5,13 +5,13 @@
 .P
 .RS 2
 .nf
-npm config set <key> <value> [\-\-global]
+npm config set <key> <value> [\-g|\-\-global]
 npm config get <key>
 npm config delete <key>
 npm config list
 npm config edit
 npm get <key>
-npm set <key> <value> [\-\-global]
+npm set <key> <value> [\-g|\-\-global]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-init.1 b/deps/npm/man/man1/npm-init.1
index 5fabda5543f809..56da738cb8d521 100644
--- a/deps/npm/man/man1/npm-init.1
+++ b/deps/npm/man/man1/npm-init.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm init [\-\-force|\-f|\-\-yes|\-y]
+npm init [\-f|\-\-force|\-y|\-\-yes]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-install.1 b/deps/npm/man/man1/npm-install.1
index 8e78558ba4a2fc..536b9f3c66b47e 100644
--- a/deps/npm/man/man1/npm-install.1
+++ b/deps/npm/man/man1/npm-install.1
@@ -15,7 +15,7 @@ npm install <tarball url>
 npm install <folder>
 
 alias: npm i
-common options: [\-\-save|\-\-save\-dev|\-\-save\-optional] [\-\-save\-exact] [\-\-dry\-run]
+common options: [\-S|\-\-save|\-D|\-\-save\-dev|\-O|\-\-save\-optional] [\-E|\-\-save\-exact] [\-\-dry\-run]
 .fi
 .RE
 .SH DESCRIPTION
@@ -85,7 +85,7 @@ after packing it up into a tarball (b)\.
 .fi
 .RE
 .IP \(bu 2
-\fBnpm install [<@scope>/]<name> [\-\-save|\-\-save\-dev|\-\-save\-optional]\fP:
+\fBnpm install [<@scope>/]<name> [\-S|\-\-save|\-D|\-\-save\-dev|\-O|\-\-save\-optional]\fP:
   Do a \fB<name>@<tag>\fP install, where \fB<tag>\fP is the "tag" config\. (See
   npm help 7 \fBnpm\-config\fP\|\.)
   In most cases, this will install the latest version
@@ -101,15 +101,15 @@ after packing it up into a tarball (b)\.
   the package version in your main package\.json:
 .RS 0
 .IP \(bu 2
-\fB\-\-save\fP: Package will appear in your \fBdependencies\fP\|\.
+\fB\-S, \-\-save\fP: Package will appear in your \fBdependencies\fP\|\.
 .IP \(bu 2
-\fB\-\-save\-dev\fP: Package will appear in your \fBdevDependencies\fP\|\.
+\fB\-D, \-\-save\-dev\fP: Package will appear in your \fBdevDependencies\fP\|\.
 .IP \(bu 2
-\fB\-\-save\-optional\fP: Package will appear in your \fBoptionalDependencies\fP\|\.
+\fB\-O, \-\-save\-optional\fP: Package will appear in your \fBoptionalDependencies\fP\|\.
 When using any of the above options to save dependencies to your
 package\.json, there is an additional, optional flag:
 .IP \(bu 2
-\fB\-\-save\-exact\fP: Saved dependencies will be configured with an
+\fB\-E, \-\-save\-exact\fP: Saved dependencies will be configured with an
 exact version rather than using npm's default semver range
 operator\.
 Further, if you have an \fBnpm\-shrinkwrap\.json\fP then it will be updated as
@@ -244,7 +244,7 @@ GIT_SSH_COMMAND='ssh \-i ~/\.ssh/custom_ident' npm install git+ssh://git@github\
 \fBnpm install gist:[<githubname>/]<gistID>[#<commit\-ish>]\fP:
   Install the package at \fBhttps://gist\.github\.com/gistID\fP by attempting to
   clone it using \fBgit\fP\|\. The GitHub username associated with the gist is
-  optional and will not be saved in \fBpackage\.json\fP if \fB\-\-save\fP is used\.
+  optional and will not be saved in \fBpackage\.json\fP if \fB\-S\fP or \fB\-\-save\fP is used\.
   If you don't specify a \fIcommit\-ish\fR then \fBmaster\fP will be used\.
   Example:
 .P
@@ -296,7 +296,7 @@ versions\.
 The \fB\-\-dry\-run\fP argument will report in the usual way what the install would
 have done without actually installing anything\.
 .P
-The \fB\-\-force\fP argument will force npm to fetch remote resources even if a
+The \fB\-f\fP or \fB\-\-force\fP argument will force npm to fetch remote resources even if a
 local copy exists on disk\.
 .P
 .RS 2
@@ -305,7 +305,7 @@ npm install sax \-\-force
 .fi
 .RE
 .P
-The \fB\-\-global\fP argument will cause npm to install the package globally
+The \fB\-g\fP or \fB\-\-global\fP argument will cause npm to install the package globally
 rather than locally\.  See npm help 5 \fBnpm\-folders\fP\|\.
 .P
 The \fB\-\-link\fP argument will cause npm to link global installs into the
@@ -324,7 +324,7 @@ The \fB\-\-nodedir=/path/to/node/source\fP argument will allow npm to find the
 node source code so that npm can compile native modules\.
 .P
 The \fB\-\-only={prod[uction]|dev[elopment]}\fP argument will cause either only
-\fBdevDependencies\fP or only non\-\fBdevDependencies\fP to be installed\.
+\fBdevDependencies\fP or only non\-\fBdevDependencies\fP to be installed regardless of the \fBNODE_ENV\fP\|\.
 .P
 See npm help 7 \fBnpm\-config\fP\|\.  Many of the configuration params have some
 effect on installation, since that's most of what npm does\.
@@ -375,7 +375,7 @@ A
 .fi
 .RE
 .P
-Because B's D@1 will be installed in the top leve, C now has to install D@2
+Because B's D@1 will be installed in the top level, C now has to install D@2
 privately for itself\.
 .P
 See npm help 5 folders for a more detailed description of the specific
diff --git a/deps/npm/man/man1/npm-ls.1 b/deps/npm/man/man1/npm-ls.1
index d246286fd5c565..20bf3f57597bad 100644
--- a/deps/npm/man/man1/npm-ls.1
+++ b/deps/npm/man/man1/npm-ls.1
@@ -22,7 +22,7 @@ For example, running \fBnpm ls promzard\fP in npm's source tree will show:
 .P
 .RS 2
 .nf
-npm@3.3.6 /path/to/npm
+npm@3.3.10 /path/to/npm
 └─┬ init\-package\-json@0\.0\.4
   └── promzard@0\.1\.5
 .fi
diff --git a/deps/npm/man/man1/npm-search.1 b/deps/npm/man/man1/npm-search.1
index c3d1a6d0c9c7e3..87ad71ad5fd0c8 100644
--- a/deps/npm/man/man1/npm-search.1
+++ b/deps/npm/man/man1/npm-search.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm search [\-\-long] [search terms \.\.\.]
+npm search [\-l|\-\-long] [search terms \.\.\.]
 
 aliases: s, se
 .fi
diff --git a/deps/npm/man/man1/npm-shrinkwrap.1 b/deps/npm/man/man1/npm-shrinkwrap.1
index a3d7940478b49c..d8a6049dbd4e20 100644
--- a/deps/npm/man/man1/npm-shrinkwrap.1
+++ b/deps/npm/man/man1/npm-shrinkwrap.1
@@ -139,7 +139,7 @@ reproducing the structure described in the file, using the specific files
 referenced in "resolved" if available, falling back to normal package
 resolution using "version" if one isn't\.
 .IP 2. 3
-The tree is walked and any missing dependencies are installed in the usual fasion\.
+The tree is walked and any missing dependencies are installed in the usual fashion\.
 
 .RE
 .SS Using shrinkwrapped packages
diff --git a/deps/npm/man/man1/npm-team.1 b/deps/npm/man/man1/npm-team.1
index afe5434c1ebb7c..0e6efae707d7a1 100644
--- a/deps/npm/man/man1/npm-team.1
+++ b/deps/npm/man/man1/npm-team.1
@@ -21,7 +21,7 @@ npm team edit <scope:team>
 Used to manage teams in organizations, and change team memberships\. Does not
 handle permissions for packages\.
 .P
-Teams must always be fully qualified with the organization/scope they belond to
+Teams must always be fully qualified with the organization/scope they belong to
 when operating on them, separated by a colon (\fB:\fP)\. That is, if you have a
 \fBdevelopers\fP team on a \fBfoo\fP organization, you must always refer to that team as
 \fBdevelopers:foo\fP in these commands\.
@@ -58,6 +58,6 @@ use the \fBnpm access\fP command to grant or revoke the appropriate permissions\
 .IP \(bu 2
 npm help access
 .IP \(bu 2
-npm help 7 registr
+npm help 7 registry
 
 .RE
diff --git a/deps/npm/man/man1/npm-uninstall.1 b/deps/npm/man/man1/npm-uninstall.1
index d254c8142d8050..0a6e0640fb4e4b 100644
--- a/deps/npm/man/man1/npm-uninstall.1
+++ b/deps/npm/man/man1/npm-uninstall.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm uninstall [<@scope>/]<pkg>[@<version>]\.\.\. [\-\-save|\-\-save\-dev|\-\-save\-optional]
+npm uninstall [<@scope>/]<pkg>[@<version>]\.\.\. [\-S|\-\-save|\-D|\-\-save\-dev|\-O|\-\-save\-optional]
 
 aliases: remove, rm, r, un, unlink
 .fi
@@ -30,11 +30,11 @@ it uninstalls the current package context as a global package\.
 the package version in your main package\.json:
 .RS 0
 .IP \(bu 2
-\fB\-\-save\fP: Package will be removed from your \fBdependencies\fP\|\.
+\fB\-S, \-\-save\fP: Package will be removed from your \fBdependencies\fP\|\.
 .IP \(bu 2
-\fB\-\-save\-dev\fP: Package will be removed from your \fBdevDependencies\fP\|\.
+\fB\-D, \-\-save\-dev\fP: Package will be removed from your \fBdevDependencies\fP\|\.
 .IP \(bu 2
-\fB\-\-save\-optional\fP: Package will be removed from your \fBoptionalDependencies\fP\|\.
+\fB\-O, \-\-save\-optional\fP: Package will be removed from your \fBoptionalDependencies\fP\|\.
 
 .RE
 .P
diff --git a/deps/npm/man/man1/npm-update.1 b/deps/npm/man/man1/npm-update.1
index ec9d93a9e9bd85..b700378245c1c8 100644
--- a/deps/npm/man/man1/npm-update.1
+++ b/deps/npm/man/man1/npm-update.1
@@ -124,7 +124,8 @@ version that satisfies \fB^0\.4\.0\fP (\fB>= 0\.4\.0 <0\.5\.0\fP)
 .P
 When you want to update a package and save the new version as
 the minimum required dependency in \fBpackage\.json\fP, you can use
-\fBnpm update \-\-save\fP\|\.  For example if \fBpackage\.json\fP contains
+\fBnpm update \-S\fP or \fBnpm update \-\-save\fP\|\.  For example if
+\fBpackage\.json\fP contains:
 .P
 .RS 2
 .nf
diff --git a/deps/npm/man/man1/npm-version.1 b/deps/npm/man/man1/npm-version.1
index b7f9bca0cd8788..abd22a5e5fd70d 100644
--- a/deps/npm/man/man1/npm-version.1
+++ b/deps/npm/man/man1/npm-version.1
@@ -7,7 +7,7 @@
 .nf
 npm version [<newversion> | major | minor | patch | premajor | preminor | prepatch | prerelease]
 
-\|'npm \-v' or 'npm \-\-version' to print npm version
+\|'npm [\-v | \-\-version]' to print npm version
 \|'npm view <pkg> version' to view a package's published version
 \|'npm ls' to inspect current package/dependency versions
 .fi
@@ -25,10 +25,10 @@ the existing version will be incremented by 1 in the specified field\.
 If run in a git repo, it will also create a version commit and tag\.
 This behavior is controlled by \fBgit\-tag\-version\fP (see below), and can
 be disabled on the command line by running \fBnpm \-\-no\-git\-tag\-version version\fP\|\.
-It will fail if the working directory is not clean, unless the \fB\-\-force\fP
-flag is set\.
+It will fail if the working directory is not clean, unless the \fB\-f\fP or
+\fB\-\-force\fP flag is set\.
 .P
-If supplied with \fB\-\-message\fP (shorthand: \fB\-m\fP) config option, npm will
+If supplied with \fB\-m\fP or \fB\-\-message\fP config option, npm will
 use it as a commit message when creating a version commit\.  If the
 \fBmessage\fP config contains \fB%s\fP then that will be replaced with the
 resulting version number\.  For example:
diff --git a/deps/npm/man/man1/npm-view.1 b/deps/npm/man/man1/npm-view.1
index 55f1f6ae15d080..75caecf28e25b2 100644
--- a/deps/npm/man/man1/npm-view.1
+++ b/deps/npm/man/man1/npm-view.1
@@ -77,7 +77,7 @@ npm view express contributors[0]\.email
 .RE
 .P
 Multiple fields may be specified, and will be printed one after another\.
-For exampls, to get all the contributor names and email addresses, you
+For example, to get all the contributor names and email addresses, you
 can do this:
 .P
 .RS 2
diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1
index 38dab77422217a..c2df4eb71981bc 100644
--- a/deps/npm/man/man1/npm.1
+++ b/deps/npm/man/man1/npm.1
@@ -10,7 +10,7 @@ npm <command> [args]
 .RE
 .SH VERSION
 .P
-3.3.6
+3.3.10
 .SH DESCRIPTION
 .P
 npm is the package manager for the Node JavaScript platform\.  It puts
@@ -66,7 +66,7 @@ defaults to the current working directory\.  Packages are installed to
 
 .RE
 .P
-Local mode is the default\.  Use \fB\-\-global\fP or \fB\-g\fP on any command to
+Local mode is the default\.  Use \fB\-g\fP or \fB\-\-global\fP on any command to
 operate in global mode instead\.
 .SH DEVELOPER USAGE
 .P
diff --git a/deps/npm/man/man3/npm-bin.3 b/deps/npm/man/man3/npm-bin.3
deleted file mode 100644
index bfb93455d8a789..00000000000000
--- a/deps/npm/man/man3/npm-bin.3
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH "NPM\-BIN" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-bin\fR \- Display npm bin folder
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.bin(args, cb)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-Print the folder where npm will install executables\.
-.P
-This function should not be used programmatically\.  Instead, just refer
-to the \fBnpm\.bin\fP property\.
-
diff --git a/deps/npm/man/man3/npm-bugs.3 b/deps/npm/man/man3/npm-bugs.3
deleted file mode 100644
index 2740034a58c71b..00000000000000
--- a/deps/npm/man/man3/npm-bugs.3
+++ /dev/null
@@ -1,23 +0,0 @@
-.TH "NPM\-BUGS" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-bugs\fR \- Bugs for a package in a web browser maybe
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.bugs(package, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This command tries to guess at the likely location of a package's
-bug tracker URL, and then tries to open it using the \fB\-\-browser\fP
-config param\.
-.P
-Like other commands, the first parameter is an array\. This command only
-uses the first element, which is expected to be a package name with an
-optional version number\.
-.P
-This command will launch a browser, so this command may not be the most
-friendly for programmatic use\.
-
diff --git a/deps/npm/man/man3/npm-cache.3 b/deps/npm/man/man3/npm-cache.3
deleted file mode 100644
index 50a6b7a38c0e82..00000000000000
--- a/deps/npm/man/man3/npm-cache.3
+++ /dev/null
@@ -1,34 +0,0 @@
-.TH "NPM\-CACHE" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-cache\fR \- manage the npm cache programmatically
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.cache([args], callback)
-
-// helpers
-npm\.commands\.cache\.clean([args], callback)
-npm\.commands\.cache\.add([args], callback)
-npm\.commands\.cache\.read(name, version, forceBypass, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This acts much the same ways as the npm help cache command line
-functionality\.
-.P
-The callback is called with the package\.json data of the thing that is
-eventually added to or read from the cache\.
-.P
-The top level \fBnpm\.commands\.cache(\.\.\.)\fP functionality is a public
-interface, and like all commands on the \fBnpm\.commands\fP object, it will
-match the command line behavior exactly\.
-.P
-However, the cache folder structure and the cache helper functions are
-considered \fBinternal\fR API surface, and as such, may change in future
-releases of npm, potentially without warning or significant version
-incrementation\.
-.P
-Use at your own risk\.
-
diff --git a/deps/npm/man/man3/npm-commands.3 b/deps/npm/man/man3/npm-commands.3
deleted file mode 100644
index 03d0dc40bd190d..00000000000000
--- a/deps/npm/man/man3/npm-commands.3
+++ /dev/null
@@ -1,28 +0,0 @@
-.TH "NPM\-COMMANDS" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-commands\fR \- npm commands
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands[<command>](args, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-npm comes with a full set of commands, and each of the commands takes a
-similar set of arguments\.
-.P
-In general, all commands on the command object take an \fBarray\fR of positional
-argument \fBstrings\fR\|\. The last argument to any function is a callback\. Some
-commands are special and take other optional arguments\.
-.P
-All commands have their own man page\. See \fBman npm\-<command>\fP for command\-line
-usage, or \fBman 3 npm\-<command>\fP for programmatic usage\.
-.SH SEE ALSO
-.RS 0
-.IP \(bu 2
-npm help 7 index
-
-.RE
-
diff --git a/deps/npm/man/man3/npm-config.3 b/deps/npm/man/man3/npm-config.3
deleted file mode 100644
index d2e57c26b57509..00000000000000
--- a/deps/npm/man/man3/npm-config.3
+++ /dev/null
@@ -1,49 +0,0 @@
-.TH "NPM\-CONFIG" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-config\fR \- Manage the npm configuration files
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.config(args, callback)
-var val = npm\.config\.get(key)
-npm\.config\.set(key, val)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This function acts much the same way as the command\-line version\.  The first
-element in the array tells config what to do\. Possible values are:
-.RS 0
-.IP \(bu 2
-\fBset\fP
-  Sets a config parameter\.  The second element in \fBargs\fP is interpreted as the
-  key, and the third element is interpreted as the value\.
-.IP \(bu 2
-\fBget\fP
-  Gets the value of a config parameter\. The second element in \fBargs\fP is the
-  key to get the value of\.
-.IP \(bu 2
-\fBdelete\fP (\fBrm\fP or \fBdel\fP)
-  Deletes a parameter from the config\. The second element in \fBargs\fP is the
-  key to delete\.
-.IP \(bu 2
-\fBlist\fP (\fBls\fP)
-  Show all configs that aren't secret\. No parameters necessary\.
-.IP \(bu 2
-\fBedit\fP:
-  Opens the config file in the default editor\. This command isn't very useful
-  programmatically, but it is made available\.
-
-.RE
-.P
-To programmatically access npm configuration settings, or set them for
-the duration of a program, use the \fBnpm\.config\.set\fP and \fBnpm\.config\.get\fP
-functions instead\.
-.SH SEE ALSO
-.RS 0
-.IP \(bu 2
-npm apihelp npm
-
-.RE
-
diff --git a/deps/npm/man/man3/npm-deprecate.3 b/deps/npm/man/man3/npm-deprecate.3
deleted file mode 100644
index f0e35ab9d33fe2..00000000000000
--- a/deps/npm/man/man3/npm-deprecate.3
+++ /dev/null
@@ -1,43 +0,0 @@
-.TH "NPM\-DEPRECATE" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-deprecate\fR \- Deprecate a version of a package
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.deprecate(args, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This command will update the npm registry entry for a package, providing
-a deprecation warning to all who attempt to install it\.
-.P
-The 'args' parameter must have exactly two elements:
-.RS 0
-.IP \(bu 2
-\fBpackage[@version]\fP
-  The \fBversion\fP portion is optional, and may be either a range, or a
-  specific version, or a tag\.
-.IP \(bu 2
-\fBmessage\fP
-  The warning message that will be printed whenever a user attempts to
-  install the package\.
-
-.RE
-.P
-Note that you must be the package owner to deprecate something\.  See the
-\fBowner\fP and \fBadduser\fP help topics\.
-.P
-To un\-deprecate a package, specify an empty string (\fB""\fP) for the \fBmessage\fP argument\.
-.SH SEE ALSO
-.RS 0
-.IP \(bu 2
-npm apihelp publish
-.IP \(bu 2
-npm apihelp unpublish
-.IP \(bu 2
-npm help 7 registry
-
-.RE
-
diff --git a/deps/npm/man/man3/npm-docs.3 b/deps/npm/man/man3/npm-docs.3
deleted file mode 100644
index 4305dae16399f2..00000000000000
--- a/deps/npm/man/man3/npm-docs.3
+++ /dev/null
@@ -1,23 +0,0 @@
-.TH "NPM\-DOCS" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-docs\fR \- Docs for a package in a web browser maybe
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.docs(package, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This command tries to guess at the likely location of a package's
-documentation URL, and then tries to open it using the \fB\-\-browser\fP
-config param\.
-.P
-Like other commands, the first parameter is an array\. This command only
-uses the first element, which is expected to be a package name with an
-optional version number\.
-.P
-This command will launch a browser, so this command may not be the most
-friendly for programmatic use\.
-
diff --git a/deps/npm/man/man3/npm-edit.3 b/deps/npm/man/man3/npm-edit.3
deleted file mode 100644
index 27ccd879fac3ef..00000000000000
--- a/deps/npm/man/man3/npm-edit.3
+++ /dev/null
@@ -1,28 +0,0 @@
-.TH "NPM\-EDIT" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-edit\fR \- Edit an installed package
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.edit(package, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-Opens the package folder in the default editor (or whatever you've
-configured as the npm \fBeditor\fP config \-\- see \fBnpm help config\fP\|\.)
-.P
-After it has been edited, the package is rebuilt so as to pick up any
-changes in compiled packages\.
-.P
-For instance, you can do \fBnpm install connect\fP to install connect
-into your package, and then \fBnpm\.commands\.edit(["connect"], callback)\fP
-to make a few changes to your locally installed copy\.
-.P
-The first parameter is a string array with a single element, the package
-to open\. The package can optionally have a version number attached\.
-.P
-Since this command opens an editor in a new process, be careful about where
-and how this is used\.
-
diff --git a/deps/npm/man/man3/npm-explore.3 b/deps/npm/man/man3/npm-explore.3
deleted file mode 100644
index 9fb6e008aad2bc..00000000000000
--- a/deps/npm/man/man3/npm-explore.3
+++ /dev/null
@@ -1,22 +0,0 @@
-.TH "NPM\-EXPLORE" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-explore\fR \- Browse an installed package
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.explore(args, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-Spawn a subshell in the directory of the installed package specified\.
-.P
-If a command is specified, then it is run in the subshell, which then
-immediately terminates\.
-.P
-Note that the package is \fInot\fR automatically rebuilt afterwards, so be
-sure to use \fBnpm rebuild <pkg>\fP if you make any changes\.
-.P
-The first element in the 'args' parameter must be a package name\.  After that is the optional command, which can be any number of strings\. All of the strings will be combined into one, space\-delimited command\.
-
diff --git a/deps/npm/man/man3/npm-help-search.3 b/deps/npm/man/man3/npm-help-search.3
deleted file mode 100644
index 243e5d2a28dcb7..00000000000000
--- a/deps/npm/man/man3/npm-help-search.3
+++ /dev/null
@@ -1,41 +0,0 @@
-.TH "NPM\-HELP\-SEARCH" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-help-search\fR \- Search the help pages
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.helpSearch(args, [silent,] callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This command is rarely useful, but it exists in the rare case that it is\.
-.P
-This command takes an array of search terms and returns the help pages that
-match in order of best match\.
-.P
-If there is only one match, then npm displays that help section\. If there
-are multiple results, the results are printed to the screen formatted and the
-array of results is returned\. Each result is an object with these properties:
-.RS 0
-.IP \(bu 2
-hits:
-A map of args to number of hits on that arg\. For example, {"npm": 3}
-.IP \(bu 2
-found:
-Total number of unique args that matched\.
-.IP \(bu 2
-totalHits:
-Total number of hits\.
-.IP \(bu 2
-lines:
-An array of all matching lines (and some adjacent lines)\.
-.IP \(bu 2
-file:
-Name of the file that matched
-
-.RE
-.P
-The silent parameter is not necessary not used, but it may in the future\.
-
diff --git a/deps/npm/man/man3/npm-init.3 b/deps/npm/man/man3/npm-init.3
deleted file mode 100644
index 947398d7a864d9..00000000000000
--- a/deps/npm/man/man3/npm-init.3
+++ /dev/null
@@ -1,32 +0,0 @@
-.TH "NPM" "" "August 2015" "" ""
-.SH "NAME"
-\fBnpm\fR
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.init(args, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This will ask you a bunch of questions, and then write a package\.json for you\.
-.P
-It attempts to make reasonable guesses about what you want things to be set to,
-and then writes a package\.json file with the options you've selected\.
-.P
-If you already have a package\.json file, it'll read that first, and default to
-the options in there\.
-.P
-It is strictly additive, so it does not delete options from your package\.json
-without a really good reason to do so\.
-.P
-Since this function expects to be run on the command\-line, it doesn't work very
-well as a programmatically\. The best option is to roll your own, and since
-JavaScript makes it stupid simple to output formatted JSON, that is the
-preferred method\. If you're sure you want to handle command\-line prompting,
-then go ahead and use this programmatically\.
-.SH SEE ALSO
-.P
-npm help 5 package\.json
-
diff --git a/deps/npm/man/man3/npm-install.3 b/deps/npm/man/man3/npm-install.3
deleted file mode 100644
index d2951dd0d45f74..00000000000000
--- a/deps/npm/man/man3/npm-install.3
+++ /dev/null
@@ -1,23 +0,0 @@
-.TH "NPM\-INSTALL" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-install\fR \- install a package programmatically
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.install([where,] packages, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This acts much the same ways as installing on the command\-line\.
-.P
-The 'where' parameter is optional and only used internally, and it specifies
-where the packages should be installed to\.
-.P
-The 'packages' parameter is an array of strings\. Each element in the array is
-the name of a package to be installed\.
-.P
-Finally, 'callback' is a function that will be called when all packages have been
-installed or when an error has been encountered\.
-
diff --git a/deps/npm/man/man3/npm-link.3 b/deps/npm/man/man3/npm-link.3
deleted file mode 100644
index 5877e03fbe8fb7..00000000000000
--- a/deps/npm/man/man3/npm-link.3
+++ /dev/null
@@ -1,41 +0,0 @@
-.TH "NPM\-LINK" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-link\fR \- Symlink a package folder
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.link(callback)
-npm\.commands\.link(packages, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-Package linking is a two\-step process\.
-.P
-Without parameters, link will create a globally\-installed
-symbolic link from \fBprefix/package\-name\fP to the current folder\.
-.P
-With a parameters, link will create a symlink from the local \fBnode_modules\fP
-folder to the global symlink\.
-.P
-When creating tarballs for \fBnpm publish\fP, the linked packages are
-"snapshotted" to their current state by resolving the symbolic links\.
-.P
-This is
-handy for installing your own stuff, so that you can work on it and test it
-iteratively without having to continually rebuild\.
-.P
-For example:
-.P
-.RS 2
-.nf
-npm\.commands\.link(cb)           # creates global link from the cwd
-                                # (say redis package)
-npm\.commands\.link('redis', cb)  # link\-install the package
-.fi
-.RE
-.P
-Now, any changes to the redis package will be reflected in
-the package in the current working directory
-
diff --git a/deps/npm/man/man3/npm-load.3 b/deps/npm/man/man3/npm-load.3
deleted file mode 100644
index ce409b6a5f66aa..00000000000000
--- a/deps/npm/man/man3/npm-load.3
+++ /dev/null
@@ -1,34 +0,0 @@
-.TH "NPM\-LOAD" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-load\fR \- Load config settings
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.load(conf, cb)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-npm\.load() must be called before any other function call\.  Both parameters are
-optional, but the second is recommended\.
-.P
-The first parameter is an object containing command\-line config params, and the
-second parameter is a callback that will be called when npm is loaded and ready
-to serve\.
-.P
-The first parameter should follow a similar structure as the package\.json
-config object\.
-.P
-For example, to emulate the \-\-dev flag, pass an object that looks like this:
-.P
-.RS 2
-.nf
-{
-  "dev": true
-}
-.fi
-.RE
-.P
-For a list of all the available command\-line configs, see \fBnpm help config\fP
-
diff --git a/deps/npm/man/man3/npm-ls.3 b/deps/npm/man/man3/npm-ls.3
deleted file mode 100644
index 4fc976f2ede0f3..00000000000000
--- a/deps/npm/man/man3/npm-ls.3
+++ /dev/null
@@ -1,68 +0,0 @@
-.TH "NPM\-LS" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-ls\fR \- List installed packages
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.ls(args, [silent,] callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This command will print to stdout all the versions of packages that are
-installed, as well as their dependencies, in a tree\-structure\. It will also
-return that data using the callback\.
-.P
-This command does not take any arguments, but args must be defined\.
-Beyond that, if any arguments are passed in, npm will politely warn that it
-does not take positional arguments, though you may set config flags
-like with any other command, such as \fBglobal\fP to list global packages\.
-.P
-It will print out extraneous, missing, and invalid packages\.
-.P
-If the silent parameter is set to true, nothing will be output to the screen,
-but the data will still be returned\.
-.P
-Callback is provided an error if one occurred, the full data about which
-packages are installed and which dependencies they will receive, and a
-"lite" data object which just shows which versions are installed where\.
-Note that the full data object is a circular structure, so care must be
-taken if it is serialized to JSON\.
-.SH CONFIGURATION
-.SS long
-.RS 0
-.IP \(bu 2
-Default: false
-.IP \(bu 2
-Type: Boolean
-
-.RE
-.P
-Show extended information\.
-.SS parseable
-.RS 0
-.IP \(bu 2
-Default: false
-.IP \(bu 2
-Type: Boolean
-
-.RE
-.P
-Show parseable output instead of tree view\.
-.SS global
-.RS 0
-.IP \(bu 2
-Default: false
-.IP \(bu 2
-Type: Boolean
-
-.RE
-.P
-List packages in the global install prefix instead of in the current
-project\.
-.P
-Note, if parseable is set or long isn't set, then duplicates will be trimmed\.
-This means that if a submodule has the same dependency as a parent module, then the
-dependency will only be output once\.
-
diff --git a/deps/npm/man/man3/npm-outdated.3 b/deps/npm/man/man3/npm-outdated.3
deleted file mode 100644
index f2fd1f73b70f41..00000000000000
--- a/deps/npm/man/man3/npm-outdated.3
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH "NPM\-OUTDATED" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-outdated\fR \- Check for outdated packages
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.outdated([packages,] callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This command will check the registry to see if the specified packages are
-currently outdated\.
-.P
-If the 'packages' parameter is left out, npm will check all packages\.
-
diff --git a/deps/npm/man/man3/npm-owner.3 b/deps/npm/man/man3/npm-owner.3
deleted file mode 100644
index 16e2c54019676b..00000000000000
--- a/deps/npm/man/man3/npm-owner.3
+++ /dev/null
@@ -1,43 +0,0 @@
-.TH "NPM\-OWNER" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-owner\fR \- Manage package owners
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.owner(args, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-The first element of the 'args' parameter defines what to do, and the subsequent
-elements depend on the action\. Possible values for the action are (order of
-parameters are given in parenthesis):
-.RS 0
-.IP \(bu 2
-ls (package):
-List all the users who have access to modify a package and push new versions\.
-Handy when you need to know who to bug for help\.
-.IP \(bu 2
-add (user, package):
-Add a new user as a maintainer of a package\.  This user is enabled to modify
-metadata, publish new versions, and add other owners\.
-.IP \(bu 2
-rm (user, package):
-Remove a user from the package owner list\.  This immediately revokes their
-privileges\.
-
-.RE
-.P
-Note that there is only one level of access\.  Either you can modify a package,
-or you can't\.  Future versions may contain more fine\-grained access levels, but
-that is not implemented at this time\.
-.SH SEE ALSO
-.RS 0
-.IP \(bu 2
-npm apihelp publish
-.IP \(bu 2
-npm help 7 registry
-
-.RE
-
diff --git a/deps/npm/man/man3/npm-pack.3 b/deps/npm/man/man3/npm-pack.3
deleted file mode 100644
index 037ec3c3467b55..00000000000000
--- a/deps/npm/man/man3/npm-pack.3
+++ /dev/null
@@ -1,23 +0,0 @@
-.TH "NPM\-PACK" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-pack\fR \- Create a tarball from a package
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.pack([packages,] callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-For anything that's installable (that is, a package folder, tarball,
-tarball url, name@tag, name@version, or name), this command will fetch
-it to the cache, and then copy the tarball to the current working
-directory as \fB<name>\-<version>\.tgz\fP, and then write the filenames out to
-stdout\.
-.P
-If the same package is specified multiple times, then the file will be
-overwritten the second time\.
-.P
-If no arguments are supplied, then npm packs the current package folder\.
-
diff --git a/deps/npm/man/man3/npm-ping.3 b/deps/npm/man/man3/npm-ping.3
deleted file mode 100644
index 607fc8423e8da3..00000000000000
--- a/deps/npm/man/man3/npm-ping.3
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH "NPM\-PING" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-ping\fR \- Ping npm registry
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.registry\.ping(registry, options, function (er, pong))
-.fi
-.RE
-.SH DESCRIPTION
-.P
-Attempts to connect to the given registry, returning a \fBpong\fP
-object with various metadata if it succeeds\.
-.P
-This function is primarily useful for debugging connection issues
-to npm registries\.
diff --git a/deps/npm/man/man3/npm-prefix.3 b/deps/npm/man/man3/npm-prefix.3
deleted file mode 100644
index 5ca38b5ec214ff..00000000000000
--- a/deps/npm/man/man3/npm-prefix.3
+++ /dev/null
@@ -1,19 +0,0 @@
-.TH "NPM\-PREFIX" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-prefix\fR \- Display prefix
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.prefix(args, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-Print the prefix to standard out\.
-.P
-\|'args' is never used and callback is never called with data\.
-\|'args' must be present or things will break\.
-.P
-This function is not useful programmatically
-
diff --git a/deps/npm/man/man3/npm-prune.3 b/deps/npm/man/man3/npm-prune.3
deleted file mode 100644
index 4bf3f28039ce39..00000000000000
--- a/deps/npm/man/man3/npm-prune.3
+++ /dev/null
@@ -1,21 +0,0 @@
-.TH "NPM\-PRUNE" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-prune\fR \- Remove extraneous packages
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.prune([packages,] callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This command removes "extraneous" packages\.
-.P
-The first parameter is optional, and it specifies packages to be removed\.
-.P
-No packages are specified, then all packages will be checked\.
-.P
-Extraneous packages are packages that are not listed on the parent
-package's dependencies list\.
-
diff --git a/deps/npm/man/man3/npm-publish.3 b/deps/npm/man/man3/npm-publish.3
deleted file mode 100644
index 4a303370b0ed84..00000000000000
--- a/deps/npm/man/man3/npm-publish.3
+++ /dev/null
@@ -1,41 +0,0 @@
-.TH "NPM\-PUBLISH" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-publish\fR \- Publish a package
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.publish([packages,] callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-Publishes a package to the registry so that it can be installed by name\.
-Possible values in the 'packages' array are:
-.RS 0
-.IP \(bu 2
-\fB<folder>\fP:
-A folder containing a package\.json file
-.IP \(bu 2
-\fB<tarball>\fP:
-A url or file path to a gzipped tar archive containing a single folder
-with a package\.json file inside\.
-
-.RE
-.P
-If the package array is empty, npm will try to publish something in the
-current working directory\.
-.P
-This command could fails if one of the packages specified already exists in
-the registry\.  Overwrites when the "force" environment variable is set\.
-.SH SEE ALSO
-.RS 0
-.IP \(bu 2
-npm help 7 registry
-.IP \(bu 2
-npm help adduser
-.IP \(bu 2
-npm apihelp owner
-
-.RE
-
diff --git a/deps/npm/man/man3/npm-rebuild.3 b/deps/npm/man/man3/npm-rebuild.3
deleted file mode 100644
index b59df54005ac93..00000000000000
--- a/deps/npm/man/man3/npm-rebuild.3
+++ /dev/null
@@ -1,19 +0,0 @@
-.TH "NPM\-REBUILD" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-rebuild\fR \- Rebuild a package
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.rebuild([packages,] callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This command runs the \fBnpm build\fP command on each of the matched packages\.  This is useful
-when you install a new version of node, and must recompile all your C++ addons with
-the new binary\. If no 'packages' parameter is specify, every package will be rebuilt\.
-.SH CONFIGURATION
-.P
-See \fBnpm help build\fP
-
diff --git a/deps/npm/man/man3/npm-repo.3 b/deps/npm/man/man3/npm-repo.3
deleted file mode 100644
index 53983bca9b9466..00000000000000
--- a/deps/npm/man/man3/npm-repo.3
+++ /dev/null
@@ -1,23 +0,0 @@
-.TH "NPM\-REPO" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-repo\fR \- Open package repository page in the browser
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.repo(package, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This command tries to guess at the likely location of a package's
-repository URL, and then tries to open it using the \fB\-\-browser\fP
-config param\.
-.P
-Like other commands, the first parameter is an array\. This command only
-uses the first element, which is expected to be a package name with an
-optional version number\.
-.P
-This command will launch a browser, so this command may not be the most
-friendly for programmatic use\.
-
diff --git a/deps/npm/man/man3/npm-restart.3 b/deps/npm/man/man3/npm-restart.3
deleted file mode 100644
index 478c2f5f30dec4..00000000000000
--- a/deps/npm/man/man3/npm-restart.3
+++ /dev/null
@@ -1,58 +0,0 @@
-.TH "NPM\-RESTART" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-restart\fR \- Restart a package
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.restart(packages, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This restarts a package (or multiple packages)\.
-.P
-This runs a package's "stop", "restart", and "start" scripts, and associated
-pre\- and post\- scripts, in the order given below:
-.RS 0
-.IP 1. 3
-prerestart
-.IP 2. 3
-prestop
-.IP 3. 3
-stop
-.IP 4. 3
-poststop
-.IP 5. 3
-restart
-.IP 6. 3
-prestart
-.IP 7. 3
-start
-.IP 8. 3
-poststart
-.IP 9. 3
-postrestart
-
-.RE
-.P
-If no version is specified, then it restarts the "active" version\.
-.P
-npm can restart multiple packages\. Just specify multiple packages in
-the \fBpackages\fP parameter\.
-.SH NOTE
-.P
-Note that the "restart" script is run \fBin addition to\fR the "stop"
-and "start" scripts, not instead of them\.
-.P
-This is the behavior as of \fBnpm\fP major version 2\.  A change in this
-behavior will be accompanied by an increase in major version number
-.SH SEE ALSO
-.RS 0
-.IP \(bu 2
-npm apihelp start
-.IP \(bu 2
-npm apihelp stop
-
-.RE
-
diff --git a/deps/npm/man/man3/npm-root.3 b/deps/npm/man/man3/npm-root.3
deleted file mode 100644
index 8ade1a6826a613..00000000000000
--- a/deps/npm/man/man3/npm-root.3
+++ /dev/null
@@ -1,19 +0,0 @@
-.TH "NPM\-ROOT" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-root\fR \- Display npm root
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.root(args, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-Print the effective \fBnode_modules\fP folder to standard out\.
-.P
-\|'args' is never used and callback is never called with data\.
-\|'args' must be present or things will break\.
-.P
-This function is not useful programmatically\.
-
diff --git a/deps/npm/man/man3/npm-run-script.3 b/deps/npm/man/man3/npm-run-script.3
deleted file mode 100644
index 416f1ff79203bb..00000000000000
--- a/deps/npm/man/man3/npm-run-script.3
+++ /dev/null
@@ -1,37 +0,0 @@
-.TH "NPM\-RUN\-SCRIPT" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-run-script\fR \- Run arbitrary package scripts
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.run\-script(args, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This runs an arbitrary command from a package's "scripts" object\.
-.P
-It is used by the test, start, restart, and stop commands, but can be
-called directly, as well\.
-.P
-The 'args' parameter is an array of strings\. Behavior depends on the number
-of elements\.  If there is only one element, npm assumes that the element
-represents a command to be run on the local repository\. If there is more than
-one element, then the first is assumed to be the package and the second is
-assumed to be the command to run\. All other elements are ignored\.
-.SH SEE ALSO
-.RS 0
-.IP \(bu 2
-npm help 7 scripts
-.IP \(bu 2
-npm apihelp test
-.IP \(bu 2
-npm apihelp start
-.IP \(bu 2
-npm apihelp restart
-.IP \(bu 2
-npm apihelp stop
-
-.RE
-
diff --git a/deps/npm/man/man3/npm-search.3 b/deps/npm/man/man3/npm-search.3
deleted file mode 100644
index 823eff13b03c0f..00000000000000
--- a/deps/npm/man/man3/npm-search.3
+++ /dev/null
@@ -1,52 +0,0 @@
-.TH "NPM\-SEARCH" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-search\fR \- Search for packages
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.search(searchTerms, [silent,] [staleness,] callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-Search the registry for packages matching the search terms\. The available parameters are:
-.RS 0
-.IP \(bu 2
-searchTerms:
-Array of search terms\. These terms are case\-insensitive\.
-.IP \(bu 2
-silent:
-If true, npm will not log anything to the console\.
-.IP \(bu 2
-staleness:
-This is the threshold for stale packages\. "Fresh" packages are not refreshed
-from the registry\. This value is measured in seconds\.
-.IP \(bu 2
-callback:
-Returns an object where each key is the name of a package, and the value
-is information about that package along with a 'words' property, which is
-a space\-delimited string of all of the interesting words in that package\.
-The only properties included are those that are searched, which generally include:
-.RS 0
-.IP \(bu 2
-name
-.IP \(bu 2
-description
-.IP \(bu 2
-maintainers
-.IP \(bu 2
-url
-.IP \(bu 2
-keywords
-
-.RE
-
-.RE
-.P
-A search on the registry excludes any result that does not match all of the
-search terms\. It also removes any items from the results that contain an
-excluded term (the "searchexclude" config)\. The search is case insensitive
-and doesn't try to read your mind (it doesn't do any verb tense matching or the
-like)\.
-
diff --git a/deps/npm/man/man3/npm-shrinkwrap.3 b/deps/npm/man/man3/npm-shrinkwrap.3
deleted file mode 100644
index fa89d927ddbc4f..00000000000000
--- a/deps/npm/man/man3/npm-shrinkwrap.3
+++ /dev/null
@@ -1,24 +0,0 @@
-.TH "NPM\-SHRINKWRAP" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-shrinkwrap\fR \- programmatically generate package shrinkwrap file
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.shrinkwrap(args, [silent,] callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This acts much the same ways as shrinkwrapping on the command\-line\.
-.P
-This command does not take any arguments, but 'args' must be defined\.
-Beyond that, if any arguments are passed in, npm will politely warn that it
-does not take positional arguments\.
-.P
-If the 'silent' parameter is set to true, nothing will be output to the screen,
-but the shrinkwrap file will still be written\.
-.P
-Finally, 'callback' is a function that will be called when the shrinkwrap has
-been saved\.
-
diff --git a/deps/npm/man/man3/npm-start.3 b/deps/npm/man/man3/npm-start.3
deleted file mode 100644
index 050c108e818b19..00000000000000
--- a/deps/npm/man/man3/npm-start.3
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH "NPM\-START" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-start\fR \- Start a package
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.start(packages, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This runs a package's "start" script, if one was provided\.
-.P
-npm can start multiple packages\. Just specify multiple packages in the
-\fBpackages\fP parameter\.
-
diff --git a/deps/npm/man/man3/npm-stop.3 b/deps/npm/man/man3/npm-stop.3
deleted file mode 100644
index 9df3b4c69b85fd..00000000000000
--- a/deps/npm/man/man3/npm-stop.3
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH "NPM\-STOP" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-stop\fR \- Stop a package
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.stop(packages, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This runs a package's "stop" script, if one was provided\.
-.P
-npm can run stop on multiple packages\. Just specify multiple packages
-in the \fBpackages\fP parameter\.
-
diff --git a/deps/npm/man/man3/npm-tag.3 b/deps/npm/man/man3/npm-tag.3
deleted file mode 100644
index 5c3f3558309124..00000000000000
--- a/deps/npm/man/man3/npm-tag.3
+++ /dev/null
@@ -1,27 +0,0 @@
-.TH "NPM\-TAG" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-tag\fR \- Tag a published version
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.tag(package@version, tag, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-Tags the specified version of the package with the specified tag, or the
-\fB\-\-tag\fP config if not specified\.
-.P
-The 'package@version' is an array of strings, but only the first two elements are
-currently used\.
-.P
-The first element must be in the form package@version, where package
-is the package name and version is the version number (much like installing a
-specific version)\.
-.P
-The second element is the name of the tag to tag this version with\. If this
-parameter is missing or falsey (empty), the default from the config will be
-used\. For more information about how to set this config, check
-\fBman 3 npm\-config\fP for programmatic usage or \fBman npm\-config\fP for cli usage\.
-
diff --git a/deps/npm/man/man3/npm-test.3 b/deps/npm/man/man3/npm-test.3
deleted file mode 100644
index f0a67f1241c0d5..00000000000000
--- a/deps/npm/man/man3/npm-test.3
+++ /dev/null
@@ -1,20 +0,0 @@
-.TH "NPM\-TEST" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-test\fR \- Test a package
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-  npm\.commands\.test(packages, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This runs a package's "test" script, if one was provided\.
-.P
-To run tests as a condition of installation, set the \fBnpat\fP config to
-true\.
-.P
-npm can run tests on multiple packages\. Just specify multiple packages
-in the \fBpackages\fP parameter\.
-
diff --git a/deps/npm/man/man3/npm-uninstall.3 b/deps/npm/man/man3/npm-uninstall.3
deleted file mode 100644
index fe9ebaaf1729ca..00000000000000
--- a/deps/npm/man/man3/npm-uninstall.3
+++ /dev/null
@@ -1,20 +0,0 @@
-.TH "NPM\-UNINSTALL" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-uninstall\fR \- uninstall a package programmatically
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.uninstall(packages, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This acts much the same ways as uninstalling on the command\-line\.
-.P
-The 'packages' parameter is an array of strings\. Each element in the array is
-the name of a package to be uninstalled\.
-.P
-Finally, 'callback' is a function that will be called when all packages have been
-uninstalled or when an error has been encountered\.
-
diff --git a/deps/npm/man/man3/npm-unpublish.3 b/deps/npm/man/man3/npm-unpublish.3
deleted file mode 100644
index 721bf206b55839..00000000000000
--- a/deps/npm/man/man3/npm-unpublish.3
+++ /dev/null
@@ -1,24 +0,0 @@
-.TH "NPM\-UNPUBLISH" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-unpublish\fR \- Remove a package from the registry
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.unpublish(package, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This removes a package version from the registry, deleting its
-entry and removing the tarball\.
-.P
-The package parameter must be defined\.
-.P
-Only the first element in the package parameter is used\.  If there is no first
-element, then npm assumes that the package at the current working directory
-is what is meant\.
-.P
-If no version is specified, or if all versions are removed then
-the root package entry is removed from the registry entirely\.
-
diff --git a/deps/npm/man/man3/npm-update.3 b/deps/npm/man/man3/npm-update.3
deleted file mode 100644
index da780d598e8131..00000000000000
--- a/deps/npm/man/man3/npm-update.3
+++ /dev/null
@@ -1,26 +0,0 @@
-.TH "NPM\-UPDATE" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-update\fR \- Update a package
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.update(packages, callback)
-.fi
-.RE
-.TH "DESCRIPTION" "" "August 2015" "" ""
-.SH "NAME"
-\fBDESCRIPTION\fR
-.P
-Updates a package, upgrading it to the latest version\. It also installs any
-missing packages\.
-.P
-The \fBpackages\fP argument is an array of packages to update\. The \fBcallback\fP
-parameter will be called when done or when an error occurs\.
-.SH SEE ALSO
-.RS 0
-.IP \(bu 2
-npm help update
-
-.RE
-
diff --git a/deps/npm/man/man3/npm-version.3 b/deps/npm/man/man3/npm-version.3
deleted file mode 100644
index 7a13475c43363a..00000000000000
--- a/deps/npm/man/man3/npm-version.3
+++ /dev/null
@@ -1,22 +0,0 @@
-.TH "NPM\-VERSION" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-version\fR \- Bump a package version
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.version(newversion, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-Run this in a package directory to bump the version and write the new
-data back to the package\.json file\.
-.P
-If run in a git repo, it will also create a version commit and tag, and
-fail if the repo is not clean\.
-.P
-Like all other commands, this function takes a string array as its first
-parameter\. The difference, however, is this function will fail if it does
-not have exactly one element\. The only element should be a version number\.
-
diff --git a/deps/npm/man/man3/npm-view.3 b/deps/npm/man/man3/npm-view.3
deleted file mode 100644
index 8c3d191f54a2ff..00000000000000
--- a/deps/npm/man/man3/npm-view.3
+++ /dev/null
@@ -1,131 +0,0 @@
-.TH "NPM\-VIEW" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-view\fR \- View registry info
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.view(args, [silent,] callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This command shows data about a package and prints it to the stream
-referenced by the \fBoutfd\fP config, which defaults to stdout\.
-.P
-The "args" parameter is an ordered list that closely resembles the command\-line
-usage\. The elements should be ordered such that the first element is
-the package and version (package@version)\. The version is optional\. After that,
-the rest of the parameters are fields with optional subfields ("field\.subfield")
-which can be used to get only the information desired from the registry\.
-.P
-The callback will be passed all of the data returned by the query\.
-.P
-For example, to get the package registry entry for the \fBconnect\fP package,
-you can do this:
-.P
-.RS 2
-.nf
-npm\.commands\.view(["connect"], callback)
-.fi
-.RE
-.P
-If no version is specified, "latest" is assumed\.
-.P
-Field names can be specified after the package descriptor\.
-For example, to show the dependencies of the \fBronn\fP package at version
-0\.3\.5, you could do the following:
-.P
-.RS 2
-.nf
-npm\.commands\.view(["ronn@0\.3\.5", "dependencies"], callback)
-.fi
-.RE
-.P
-You can view child field by separating them with a period\.
-To view the git repository URL for the latest version of npm, you could
-do this:
-.P
-.RS 2
-.nf
-npm\.commands\.view(["npm", "repository\.url"], callback)
-.fi
-.RE
-.P
-For fields that are arrays, requesting a non\-numeric field will return
-all of the values from the objects in the list\.  For example, to get all
-the contributor names for the "express" project, you can do this:
-.P
-.RS 2
-.nf
-npm\.commands\.view(["express", "contributors\.email"], callback)
-.fi
-.RE
-.P
-You may also use numeric indices in square braces to specifically select
-an item in an array field\.  To just get the email address of the first
-contributor in the list, you can do this:
-.P
-.RS 2
-.nf
-npm\.commands\.view(["express", "contributors[0]\.email"], callback)
-.fi
-.RE
-.P
-Multiple fields may be specified, and will be printed one after another\.
-For exampls, to get all the contributor names and email addresses, you
-can do this:
-.P
-.RS 2
-.nf
-npm\.commands\.view(["express", "contributors\.name", "contributors\.email"], callback)
-.fi
-.RE
-.P
-"Person" fields are shown as a string if they would be shown as an
-object\.  So, for example, this will show the list of npm contributors in
-the shortened string format\.  (See \fBnpm help json\fP for more on this\.)
-.P
-.RS 2
-.nf
-npm\.commands\.view(["npm", "contributors"], callback)
-.fi
-.RE
-.P
-If a version range is provided, then data will be printed for every
-matching version of the package\.  This will show which version of jsdom
-was required by each matching version of yui3:
-.P
-.RS 2
-.nf
-npm\.commands\.view(["yui3@>0\.5\.4", "dependencies\.jsdom"], callback)
-.fi
-.RE
-.SH OUTPUT
-.P
-If only a single string field for a single version is output, then it
-will not be colorized or quoted, so as to enable piping the output to
-another command\.
-.P
-If the version range matches multiple versions, than each printed value
-will be prefixed with the version it applies to\.
-.P
-If multiple fields are requested, than each of them are prefixed with
-the field name\.
-.P
-Console output can be disabled by setting the 'silent' parameter to true\.
-.SH RETURN VALUE
-.P
-The data returned will be an object in this formation:
-.P
-.RS 2
-.nf
-{ <version>:
-  { <field>: <value>
-  , \.\.\. }
-, \.\.\. }
-.fi
-.RE
-.P
-corresponding to the list of fields selected\.
-
diff --git a/deps/npm/man/man3/npm-whoami.3 b/deps/npm/man/man3/npm-whoami.3
deleted file mode 100644
index 0c29cf74846061..00000000000000
--- a/deps/npm/man/man3/npm-whoami.3
+++ /dev/null
@@ -1,19 +0,0 @@
-.TH "NPM\-WHOAMI" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm-whoami\fR \- Display npm username
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm\.commands\.whoami(args, callback)
-.fi
-.RE
-.SH DESCRIPTION
-.P
-Print the \fBusername\fP config to standard output\.
-.P
-\|'args' is never used and callback is never called with data\.
-\|'args' must be present or things will break\.
-.P
-This function is not useful programmatically
-
diff --git a/deps/npm/man/man3/npm.3 b/deps/npm/man/man3/npm.3
deleted file mode 100644
index c45b9788a31747..00000000000000
--- a/deps/npm/man/man3/npm.3
+++ /dev/null
@@ -1,124 +0,0 @@
-.TH "NPM" "3" "August 2015" "" ""
-.SH "NAME"
-\fBnpm\fR \- javascript package manager
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-var npm = require("npm")
-npm\.load([configObject, ]function (er, npm) {
-  // use the npm object, now that it's loaded\.
-
-  npm\.config\.set(key, val)
-  val = npm\.config\.get(key)
-
-  console\.log("prefix = %s", npm\.prefix)
-
-  npm\.commands\.install(["package"], cb)
-})
-.fi
-.RE
-.SH VERSION
-.P
-3.3.0
-.SH DESCRIPTION
-.P
-This is the API documentation for npm\.
-To find documentation of the command line
-client, see npm help \fBnpm\fP\|\.
-.P
-Prior to using npm's commands, \fBnpm\.load()\fP must be called\.  If you provide
-\fBconfigObject\fP as an object map of top\-level configs, they override the values
-stored in the various config locations\. In the npm command line client, this
-set of configs is parsed from the command line options\. Additional
-configuration params are loaded from two configuration files\. See
-npm help \fBnpm\-config\fP, npm help 7 \fBnpm\-config\fP, and npm help 5 \fBnpmrc\fP for more information\.
-.P
-After that, each of the functions are accessible in the
-commands object: \fBnpm\.commands\.<cmd>\fP\|\.  See npm help 7 \fBnpm\-index\fP for a list of
-all possible commands\.
-.P
-All commands on the command object take an \fBarray\fR of positional argument
-\fBstrings\fR\|\. The last argument to any function is a callback\. Some
-commands take other optional arguments\.
-.P
-Configs cannot currently be set on a per function basis, as each call to
-npm\.config\.set will change the value for \fIall\fR npm commands in that process\.
-.P
-To find API documentation for a specific command, run the \fBnpm apihelp\fP
-command\.
-.SH METHODS AND PROPERTIES
-.RS 0
-.IP \(bu 2
-\fBnpm\.load(configs, cb)\fP
-  Load the configuration params, and call the \fBcb\fP function once the
-  globalconfig and userconfig files have been loaded as well, or on
-  nextTick if they've already been loaded\.
-.IP \(bu 2
-\fBnpm\.config\fP
-  An object for accessing npm configuration parameters\.
-.RS 0
-.IP \(bu 2
-\fBnpm\.config\.get(key)\fP
-.IP \(bu 2
-\fBnpm\.config\.set(key, val)\fP
-.IP \(bu 2
-\fBnpm\.config\.del(key)\fP
-
-.RE
-.IP \(bu 2
-\fBnpm\.dir\fP or \fBnpm\.root\fP
-  The \fBnode_modules\fP directory where npm will operate\.
-.IP \(bu 2
-\fBnpm\.prefix\fP
-  The prefix where npm is operating\.  (Most often the current working
-  directory\.)
-.IP \(bu 2
-\fBnpm\.cache\fP
-  The place where npm keeps JSON and tarballs it fetches from the
-  registry (or uploads to the registry)\.
-.IP \(bu 2
-\fBnpm\.tmp\fP
-  npm's temporary working directory\.
-.IP \(bu 2
-\fBnpm\.deref\fP
-  Get the "real" name for a command that has either an alias or
-  abbreviation\.
-
-.RE
-.SH MAGIC
-.P
-For each of the methods in the \fBnpm\.commands\fP object, a method is added to the
-npm object, which takes a set of positional string arguments rather than an
-array and a callback\.
-.P
-If the last argument is a callback, then it will use the supplied
-callback\.  However, if no callback is provided, then it will print out
-the error or results\.
-.P
-For example, this would work in a node repl:
-.P
-.RS 2
-.nf
-> npm = require("npm")
-> npm\.load()  // wait a sec\.\.\.
-> npm\.install("dnode", "express")
-.fi
-.RE
-.P
-Note that that \fIwon't\fR work in a node program, since the \fBinstall\fP
-method will get called before the configuration load is completed\.
-.SH ABBREVS
-.P
-In order to support \fBnpm ins foo\fP instead of \fBnpm install foo\fP, the
-\fBnpm\.commands\fP object has a set of abbreviations as well as the full
-method names\.  Use the \fBnpm\.deref\fP method to find the real name\.
-.P
-For example:
-.P
-.RS 2
-.nf
-var cmd = npm\.deref("unp") // cmd === "unpublish"
-.fi
-.RE
-
diff --git a/deps/npm/man/man5/npm-json.5 b/deps/npm/man/man5/npm-json.5
index 0aed3a4db09d35..e110187fce73d4 100644
--- a/deps/npm/man/man5/npm-json.5
+++ b/deps/npm/man/man5/npm-json.5
@@ -574,8 +574,8 @@ included\.  For example:
 .SH Local Paths
 .P
 As of version 2\.0\.0 you can provide a path to a local directory that contains a
-package\. Local paths can be saved using \fBnpm install \-\-save\fP, using any of
-these forms:
+package\. Local paths can be saved using \fBnpm install \-S\fP or
+\fBnpm install \-\-save\fP, using any of these forms:
 .P
 .RS 2
 .nf
diff --git a/deps/npm/man/man5/package.json.5 b/deps/npm/man/man5/package.json.5
index 0aed3a4db09d35..e110187fce73d4 100644
--- a/deps/npm/man/man5/package.json.5
+++ b/deps/npm/man/man5/package.json.5
@@ -574,8 +574,8 @@ included\.  For example:
 .SH Local Paths
 .P
 As of version 2\.0\.0 you can provide a path to a local directory that contains a
-package\. Local paths can be saved using \fBnpm install \-\-save\fP, using any of
-these forms:
+package\. Local paths can be saved using \fBnpm install \-S\fP or
+\fBnpm install \-\-save\fP, using any of these forms:
 .P
 .RS 2
 .nf
diff --git a/deps/npm/man/man7/npm-coding-style.7 b/deps/npm/man/man7/npm-coding-style.7
index afed87ce6ba4ca..b9bf4dbcfb5846 100644
--- a/deps/npm/man/man7/npm-coding-style.7
+++ b/deps/npm/man/man7/npm-coding-style.7
@@ -76,7 +76,7 @@ Don't use them except in four situations:
 null loops like: \fBwhile (something) ;\fP (But you'd better have a good
 reason for doing that\.)
 .IP \(bu 2
-\fBcase "foo": doSomething(); break\fP
+\fBcase 'foo': doSomething(); break\fP
 .IP \(bu 2
 In front of a leading \fB(\fP or \fB[\fP at the start of the line\.
 This prevents the expression from being interpreted
@@ -92,9 +92,9 @@ Some examples of good semicolon usage:
 ;[a, b, c]\.forEach(doSomething)
 for (var i = 0; i < 10; i ++) {
   switch (state) {
-    case "begin": start(); continue
-    case "end": finish(); break
-    default: throw new Error("unknown state")
+    case 'begin': start(); continue
+    case 'end': finish(); break
+    default: throw new Error('unknown state')
   }
   end()
 }
@@ -112,19 +112,39 @@ final token in the list on a line by itself\.  For example:
 .P
 .RS 2
 .nf
-var magicWords = [ "abracadabra"
-                 , "gesundheit"
-                 , "ventrilo"
+var magicWords = [ 'abracadabra'
+                 , 'gesundheit'
+                 , 'ventrilo'
                  ]
-  , spells = { "fireball" : function () { setOnFire() }
-             , "water" : function () { putOut() }
+  , spells = { 'fireball' : function () { setOnFire() }
+             , 'water' : function () { putOut() }
              }
   , a = 1
-  , b = "abc"
+  , b = 'abc'
   , etc
   , somethingElse
 .fi
 .RE
+.SH Quotes
+.P
+Use single quotes for strings except to avoid escaping\.
+.P
+Bad:
+.P
+.RS 2
+.nf
+var notOk = "Just double quotes"
+.fi
+.RE
+.P
+Good:
+.P
+.RS 2
+.nf
+var ok = 'String contains "double" quotes'
+var alsoOk = "String contains 'single' quotes or apostrophe"
+.fi
+.RE
 .SH Whitespace
 .P
 Put a single space in front of ( for anything other than a function call\.
diff --git a/deps/npm/man/man7/npm-config.7 b/deps/npm/man/man7/npm-config.7
index c810392761cdd1..bff35612e7d180 100644
--- a/deps/npm/man/man7/npm-config.7
+++ b/deps/npm/man/man7/npm-config.7
@@ -37,8 +37,8 @@ npm builtin config file (/path/to/npm/npmrc)
 See npm help 5 npmrc for more details\.
 .SS Default Configs
 .P
-A set of configuration parameters that are internal to npm, and are
-defaults if nothing else is specified\.
+Run \fBnpm config ls \-l\fP to see a set of configuration parameters that are
+internal to npm, and are defaults if nothing else is specified\.
 .SH Shorthands and Other CLI Niceties
 .P
 The following shorthands are parsed on the command\-line:
diff --git a/deps/npm/man/man7/npm-faq.7 b/deps/npm/man/man7/npm-faq.7
index ba392cd67e854c..f41fdf621d4696 100644
--- a/deps/npm/man/man7/npm-faq.7
+++ b/deps/npm/man/man7/npm-faq.7
@@ -11,16 +11,17 @@ npm config set viewer browser
 .fi
 .RE
 .P
-to open these documents in your default web browser rather than \fBman\fP\|\.
+This command will set the npm docs to open in your default web browser rather than \fBman\fP\|\.
 .SH It didn't work\.
 .P
-That's not really a question\.
+Please provide a little more detail, search for the error via Google \fIhttps://google\.com\fR or StackOverflow npm \fIhttp://stackoverflow\.com/search?q=npm\fR to see if another developer has encountered a similar problem\.
 .SH Why didn't it work?
 .P
 I don't know yet\.
 .P
-Read the error output, and if you can't figure out what it means,
-do what it says and post a bug with all the information it asks for\.
+Try reading the error output first, ensure this is a true npm issue and not a package issue\. If you are having an issue with a package dependency, please submit your error to that particular package maintainer\.
+.P
+For any npm issues, try following the instructions, or even retracing your steps\. If the issue continues to persist, submit a bug with the steps to reproduce, please include the operating system you are working on, along with the error you recieve\.
 .SH Where does npm put stuff?
 .P
 See npm help 5 \fBnpm\-folders\fP
@@ -31,7 +32,7 @@ tl;dr:
 Use the \fBnpm root\fP command to see where modules go, and the \fBnpm bin\fP
 command to see where executables go
 .IP \(bu 2
-Global installs are different from local installs\.  If you install
+Global installs are different from local installs\. If you install
 something with the \fB\-g\fP flag, then its executables go in \fBnpm bin \-g\fP
 and its modules go in \fBnpm root \-g\fP\|\.
 
diff --git a/deps/npm/man/man7/npm-index.7 b/deps/npm/man/man7/npm-index.7
index 8134075c0d043f..b9e193195f8c2c 100644
--- a/deps/npm/man/man7/npm-index.7
+++ b/deps/npm/man/man7/npm-index.7
@@ -193,6 +193,9 @@ Frequently Asked Questions
 .SS npm help 7 index
 .P
 Index of all npm documentation
+.SS npm help 7 orgs
+.P
+Working with Teams & Orgs
 .SS npm help 7 registry
 .P
 The JavaScript Package Registry
diff --git a/deps/npm/man/man7/npm-scripts.7 b/deps/npm/man/man7/npm-scripts.7
index 20ca80b0e2fa54..3cb4e75cd1a84a 100644
--- a/deps/npm/man/man7/npm-scripts.7
+++ b/deps/npm/man/man7/npm-scripts.7
@@ -92,7 +92,7 @@ If there is a \fBserver\.js\fP file in the root of your package, then npm
 will default the \fBstart\fP command to \fBnode server\.js\fP\|\.
 .IP \(bu 2
 \fB"install": "node\-gyp rebuild"\fP:
-If there is a \fBbindings\.gyp\fP file in the root of your package, npm will
+If there is a \fBbinding\.gyp\fP file in the root of your package, npm will
 default the \fBinstall\fP command to compile using node\-gyp\.
 
 .RE
diff --git a/deps/npm/node_modules/abbrev/package.json b/deps/npm/node_modules/abbrev/package.json
index b86461cfaef2fe..d3e3a661edcd3c 100644
--- a/deps/npm/node_modules/abbrev/package.json
+++ b/deps/npm/node_modules/abbrev/package.json
@@ -1,73 +1,31 @@
 {
-  "_args": [
-    [
-      "abbrev@~1.0.7",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "abbrev@>=1.0.7 <1.1.0",
-  "_id": "abbrev@1.0.7",
-  "_inCache": true,
-  "_location": "/abbrev",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "2.10.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "abbrev",
-    "raw": "abbrev@~1.0.7",
-    "rawSpec": "~1.0.7",
-    "scope": null,
-    "spec": ">=1.0.7 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/nopt"
-  ],
-  "_resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz",
-  "_shasum": "5b6035b2ee9d4fb5cf859f08a9be81b208491843",
-  "_shrinkwrap": null,
-  "_spec": "abbrev@~1.0.7",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter"
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/abbrev-js/issues"
-  },
-  "dependencies": {},
+  "name": "abbrev",
+  "version": "1.0.7",
   "description": "Like ruby's abbrev module, but in js",
-  "devDependencies": {
-    "tap": "^1.2.0"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "5b6035b2ee9d4fb5cf859f08a9be81b208491843",
-    "tarball": "http://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me"
   },
-  "gitHead": "821d09ce7da33627f91bbd8ed631497ed6f760c2",
-  "homepage": "https://github.com/isaacs/abbrev-js#readme",
-  "license": "ISC",
   "main": "abbrev.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "name": "abbrev",
-  "optionalDependencies": {},
+  "scripts": {
+    "test": "tap test.js --cov"
+  },
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/isaacs/abbrev-js.git"
   },
-  "scripts": {
-    "test": "tap test.js --cov"
+  "license": "ISC",
+  "devDependencies": {
+    "tap": "^1.2.0"
+  },
+  "readme": "# abbrev-js\n\nJust like [ruby's Abbrev](http://apidock.com/ruby/Abbrev).\n\nUsage:\n\n    var abbrev = require(\"abbrev\");\n    abbrev(\"foo\", \"fool\", \"folding\", \"flop\");\n    \n    // returns:\n    { fl: 'flop'\n    , flo: 'flop'\n    , flop: 'flop'\n    , fol: 'folding'\n    , fold: 'folding'\n    , foldi: 'folding'\n    , foldin: 'folding'\n    , folding: 'folding'\n    , foo: 'foo'\n    , fool: 'fool'\n    }\n\nThis is handy for command-line scripts, or other cases where you want to be able to accept shorthands.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/isaacs/abbrev-js/issues"
   },
-  "version": "1.0.7"
+  "homepage": "https://github.com/isaacs/abbrev-js#readme",
+  "_id": "abbrev@1.0.7",
+  "_shasum": "5b6035b2ee9d4fb5cf859f08a9be81b208491843",
+  "_resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz",
+  "_from": "abbrev@>=1.0.7 <1.1.0"
 }
diff --git a/deps/npm/node_modules/ansi-regex/package.json b/deps/npm/node_modules/ansi-regex/package.json
index 5f3f32c654231d..36b92255d4d2c5 100644
--- a/deps/npm/node_modules/ansi-regex/package.json
+++ b/deps/npm/node_modules/ansi-regex/package.json
@@ -1,114 +1,77 @@
 {
-  "_args": [
-    [
-      "ansi-regex@^2.0.0",
-      "/Users/rebecca/code/npm/node_modules/chalk/node_modules/strip-ansi"
-    ]
-  ],
-  "_from": "ansi-regex@>=2.0.0 <3.0.0",
-  "_id": "ansi-regex@2.0.0",
-  "_inCache": true,
-  "_location": "/ansi-regex",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "sindresorhus@gmail.com",
-    "name": "sindresorhus"
-  },
-  "_npmVersion": "2.11.2",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "ansi-regex",
-    "raw": "ansi-regex@^2.0.0",
-    "rawSpec": "^2.0.0",
-    "scope": null,
-    "spec": ">=2.0.0 <3.0.0",
-    "type": "range"
+  "name": "ansi-regex",
+  "version": "2.0.0",
+  "description": "Regular expression for matching ANSI escape codes",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sindresorhus/ansi-regex.git"
   },
-  "_requiredBy": [
-    "/columnify/strip-ansi",
-    "/has-ansi",
-    "/strip-ansi"
-  ],
-  "_resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
-  "_shasum": "c5061b6e0ef8a81775e50f5d66151bf6bf371107",
-  "_shrinkwrap": null,
-  "_spec": "ansi-regex@^2.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/chalk/node_modules/strip-ansi",
   "author": {
-    "email": "sindresorhus@gmail.com",
     "name": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com"
   },
-  "bugs": {
-    "url": "https://github.com/sindresorhus/ansi-regex/issues"
-  },
-  "dependencies": {},
-  "description": "Regular expression for matching ANSI escape codes",
-  "devDependencies": {
-    "mocha": "*"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "c5061b6e0ef8a81775e50f5d66151bf6bf371107",
-    "tarball": "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
-  },
+  "maintainers": [
+    {
+      "name": "Sindre Sorhus",
+      "email": "sindresorhus@gmail.com",
+      "url": "sindresorhus.com"
+    },
+    {
+      "name": "Joshua Appelman",
+      "email": "jappelman@xebia.com",
+      "url": "jbnicolai.com"
+    }
+  ],
   "engines": {
     "node": ">=0.10.0"
   },
+  "scripts": {
+    "test": "mocha test/test.js",
+    "view-supported": "node test/viewCodes.js"
+  },
   "files": [
     "index.js"
   ],
-  "gitHead": "57c3f2941a73079fa8b081e02a522e3d29913e2f",
-  "homepage": "https://github.com/sindresorhus/ansi-regex",
   "keywords": [
-    "256",
     "ansi",
-    "cli",
+    "styles",
     "color",
-    "colors",
     "colour",
-    "command-line",
+    "colors",
+    "terminal",
     "console",
+    "cli",
+    "string",
+    "tty",
     "escape",
-    "find",
     "formatting",
-    "match",
-    "pattern",
-    "re",
-    "regex",
-    "regexp",
     "rgb",
+    "256",
     "shell",
-    "string",
-    "styles",
-    "terminal",
-    "test",
+    "xterm",
+    "command-line",
     "text",
-    "tty",
-    "xterm"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    },
-    {
-      "name": "jbnicolai",
-      "email": "jappelman@xebia.com"
-    }
+    "regex",
+    "regexp",
+    "re",
+    "match",
+    "test",
+    "find",
+    "pattern"
   ],
-  "name": "ansi-regex",
-  "optionalDependencies": {},
+  "devDependencies": {
+    "mocha": "*"
+  },
   "readme": "# ansi-regex [![Build Status](https://travis-ci.org/sindresorhus/ansi-regex.svg?branch=master)](https://travis-ci.org/sindresorhus/ansi-regex)\n\n> Regular expression for matching [ANSI escape codes](http://en.wikipedia.org/wiki/ANSI_escape_code)\n\n\n## Install\n\n```\n$ npm install --save ansi-regex\n```\n\n\n## Usage\n\n```js\nvar ansiRegex = require('ansi-regex');\n\nansiRegex().test('\\u001b[4mcake\\u001b[0m');\n//=> true\n\nansiRegex().test('cake');\n//=> false\n\n'\\u001b[4mcake\\u001b[0m'.match(ansiRegex());\n//=> ['\\u001b[4m', '\\u001b[0m']\n```\n\n\n## License\n\nMIT © [Sindre Sorhus](http://sindresorhus.com)\n",
   "readmeFilename": "readme.md",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sindresorhus/ansi-regex.git"
-  },
-  "scripts": {
-    "test": "mocha test/test.js",
-    "view-supported": "node test/viewCodes.js"
+  "bugs": {
+    "url": "https://github.com/sindresorhus/ansi-regex/issues"
   },
-  "version": "2.0.0"
+  "homepage": "https://github.com/sindresorhus/ansi-regex#readme",
+  "_id": "ansi-regex@2.0.0",
+  "_shasum": "c5061b6e0ef8a81775e50f5d66151bf6bf371107",
+  "_resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
+  "_from": "ansi-regex@2.0.0"
 }
diff --git a/deps/npm/node_modules/ansi-styles/package.json b/deps/npm/node_modules/ansi-styles/package.json
deleted file mode 100644
index 98210c30fdc266..00000000000000
--- a/deps/npm/node_modules/ansi-styles/package.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "_args": [
-    [
-      "ansi-styles@^2.1.0",
-      "/Users/rebecca/code/npm/node_modules/chalk"
-    ]
-  ],
-  "_from": "ansi-styles@>=2.1.0 <3.0.0",
-  "_id": "ansi-styles@2.1.0",
-  "_inCache": true,
-  "_location": "/ansi-styles",
-  "_nodeVersion": "0.12.4",
-  "_npmUser": {
-    "email": "jappelman@xebia.com",
-    "name": "jbnicolai"
-  },
-  "_npmVersion": "2.10.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "ansi-styles",
-    "raw": "ansi-styles@^2.1.0",
-    "rawSpec": "^2.1.0",
-    "scope": null,
-    "spec": ">=2.1.0 <3.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/chalk"
-  ],
-  "_resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz",
-  "_shasum": "990f747146927b559a932bf92959163d60c0d0e2",
-  "_shrinkwrap": null,
-  "_spec": "ansi-styles@^2.1.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/chalk",
-  "author": {
-    "email": "sindresorhus@gmail.com",
-    "name": "Sindre Sorhus",
-    "url": "sindresorhus.com"
-  },
-  "bugs": {
-    "url": "https://github.com/chalk/ansi-styles/issues"
-  },
-  "dependencies": {},
-  "description": "ANSI escape codes for styling strings in the terminal",
-  "devDependencies": {
-    "mocha": "*"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "990f747146927b559a932bf92959163d60c0d0e2",
-    "tarball": "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
-  },
-  "engines": {
-    "node": ">=0.10.0"
-  },
-  "files": [
-    "index.js"
-  ],
-  "gitHead": "18421cbe4a2d93359ec2599a894f704be126d066",
-  "homepage": "https://github.com/chalk/ansi-styles",
-  "keywords": [
-    "256",
-    "ansi",
-    "cli",
-    "color",
-    "colors",
-    "colour",
-    "command-line",
-    "console",
-    "escape",
-    "formatting",
-    "log",
-    "logging",
-    "rgb",
-    "shell",
-    "string",
-    "styles",
-    "terminal",
-    "text",
-    "tty",
-    "xterm"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    },
-    {
-      "name": "jbnicolai",
-      "email": "jappelman@xebia.com"
-    }
-  ],
-  "name": "ansi-styles",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/chalk/ansi-styles"
-  },
-  "scripts": {
-    "test": "mocha"
-  },
-  "version": "2.1.0"
-}
diff --git a/deps/npm/node_modules/ansicolors/package.json b/deps/npm/node_modules/ansicolors/package.json
index b759eb47cd3d68..6eef1fd18e95d4 100644
--- a/deps/npm/node_modules/ansicolors/package.json
+++ b/deps/npm/node_modules/ansicolors/package.json
@@ -1,77 +1,51 @@
 {
-  "_args": [
-    [
-      "ansicolors@~0.3.2",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "ansicolors@>=0.3.2 <0.4.0",
-  "_id": "ansicolors@0.3.2",
-  "_inCache": true,
-  "_location": "/ansicolors",
-  "_npmUser": {
-    "email": "thlorenz@gmx.de",
-    "name": "thlorenz"
+  "name": "ansicolors",
+  "version": "0.3.2",
+  "description": "Functions that surround a string with ansicolor codes so it prints in color.",
+  "main": "ansicolors.js",
+  "scripts": {
+    "test": "node test/*.js"
   },
-  "_npmVersion": "1.3.11",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "ansicolors",
-    "raw": "ansicolors@~0.3.2",
-    "rawSpec": "~0.3.2",
-    "scope": null,
-    "spec": ">=0.3.2 <0.4.0",
-    "type": "range"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/thlorenz/ansicolors.git"
   },
-  "_requiredBy": [
-    "/"
+  "keywords": [
+    "ansi",
+    "colors",
+    "highlight",
+    "string"
   ],
-  "_resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz",
-  "_shasum": "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979",
-  "_shrinkwrap": null,
-  "_spec": "ansicolors@~0.3.2",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "thlorenz@gmx.de",
     "name": "Thorsten Lorenz",
+    "email": "thlorenz@gmx.de",
     "url": "thlorenz.com"
   },
+  "license": "MIT",
+  "readmeFilename": "README.md",
+  "gitHead": "858847ca28e8b360d9b70eee0592700fa2ab087d",
+  "readme": "# ansicolors [![build status](https://secure.travis-ci.org/thlorenz/ansicolors.png)](http://next.travis-ci.org/thlorenz/ansicolors)\n\nFunctions that surround a string with ansicolor codes so it prints in color.\n\nIn case you need styles, like `bold`, have a look at [ansistyles](https://github.com/thlorenz/ansistyles).\n\n## Installation\n\n    npm install ansicolors\n\n## Usage\n\n```js\nvar colors = require('ansicolors');\n\n// foreground colors\nvar redHerring = colors.red('herring');\nvar blueMoon = colors.blue('moon');\nvar brighBlueMoon = colors.brightBlue('moon');\n\nconsole.log(redHerring);      // this will print 'herring' in red\nconsole.log(blueMoon);        // this 'moon' in blue\nconsole.log(brightBlueMoon);  // I think you got the idea\n\n// background colors\nconsole.log(colors.bgYellow('printed on yellow background'));\nconsole.log(colors.bgBrightBlue('printed on bright blue background'));\n\n// mixing background and foreground colors\n// below two lines have same result (order in which bg and fg are combined doesn't matter)\nconsole.log(colors.bgYellow(colors.blue('printed on yellow background in blue')));\nconsole.log(colors.blue(colors.bgYellow('printed on yellow background in blue')));\n```\n\n## Advanced API\n\n**ansicolors** allows you to access opening and closing escape sequences separately.\n\n```js\nvar colors = require('ansicolors');\n\nfunction inspect(obj, depth) {\n  return require('util').inspect(obj, false, depth || 5, true);\n}\n\nconsole.log('open blue', inspect(colors.open.blue));\nconsole.log('close bgBlack', inspect(colors.close.bgBlack));\n\n// => open blue '\\u001b[34m'\n//    close bgBlack '\\u001b[49m'\n```\n\n## Tests\n\nLook at the [tests](https://github.com/thlorenz/ansicolors/blob/master/test/ansicolors.js) to see more examples and/or run them via: \n\n    npm explore ansicolors && npm test\n\n## Alternatives\n\n**ansicolors** tries to meet simple use cases with a very simple API. However, if you need a more powerful ansi formatting tool, \nI'd suggest to look at the [features](https://github.com/TooTallNate/ansi.js#features) of the [ansi module](https://github.com/TooTallNate/ansi.js).\n",
   "bugs": {
     "url": "https://github.com/thlorenz/ansicolors/issues"
   },
-  "dependencies": {},
-  "description": "Functions that surround a string with ansicolor codes so it prints in color.",
-  "devDependencies": {},
-  "directories": {},
+  "_id": "ansicolors@0.3.2",
   "dist": {
     "shasum": "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979",
     "tarball": "http://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"
   },
-  "gitHead": "858847ca28e8b360d9b70eee0592700fa2ab087d",
-  "keywords": [
-    "ansi",
-    "colors",
-    "highlight",
-    "string"
-  ],
-  "license": "MIT",
-  "main": "ansicolors.js",
+  "_from": "ansicolors@>=0.3.2 <0.4.0",
+  "_npmVersion": "1.3.11",
+  "_npmUser": {
+    "name": "thlorenz",
+    "email": "thlorenz@gmx.de"
+  },
   "maintainers": [
     {
       "name": "thlorenz",
       "email": "thlorenz@gmx.de"
     }
   ],
-  "name": "ansicolors",
-  "optionalDependencies": {},
-  "readme": "# ansicolors [![build status](https://secure.travis-ci.org/thlorenz/ansicolors.png)](http://next.travis-ci.org/thlorenz/ansicolors)\n\nFunctions that surround a string with ansicolor codes so it prints in color.\n\nIn case you need styles, like `bold`, have a look at [ansistyles](https://github.com/thlorenz/ansistyles).\n\n## Installation\n\n    npm install ansicolors\n\n## Usage\n\n```js\nvar colors = require('ansicolors');\n\n// foreground colors\nvar redHerring = colors.red('herring');\nvar blueMoon = colors.blue('moon');\nvar brighBlueMoon = colors.brightBlue('moon');\n\nconsole.log(redHerring);      // this will print 'herring' in red\nconsole.log(blueMoon);        // this 'moon' in blue\nconsole.log(brightBlueMoon);  // I think you got the idea\n\n// background colors\nconsole.log(colors.bgYellow('printed on yellow background'));\nconsole.log(colors.bgBrightBlue('printed on bright blue background'));\n\n// mixing background and foreground colors\n// below two lines have same result (order in which bg and fg are combined doesn't matter)\nconsole.log(colors.bgYellow(colors.blue('printed on yellow background in blue')));\nconsole.log(colors.blue(colors.bgYellow('printed on yellow background in blue')));\n```\n\n## Advanced API\n\n**ansicolors** allows you to access opening and closing escape sequences separately.\n\n```js\nvar colors = require('ansicolors');\n\nfunction inspect(obj, depth) {\n  return require('util').inspect(obj, false, depth || 5, true);\n}\n\nconsole.log('open blue', inspect(colors.open.blue));\nconsole.log('close bgBlack', inspect(colors.close.bgBlack));\n\n// => open blue '\\u001b[34m'\n//    close bgBlack '\\u001b[49m'\n```\n\n## Tests\n\nLook at the [tests](https://github.com/thlorenz/ansicolors/blob/master/test/ansicolors.js) to see more examples and/or run them via: \n\n    npm explore ansicolors && npm test\n\n## Alternatives\n\n**ansicolors** tries to meet simple use cases with a very simple API. However, if you need a more powerful ansi formatting tool, \nI'd suggest to look at the [features](https://github.com/TooTallNate/ansi.js#features) of the [ansi module](https://github.com/TooTallNate/ansi.js).\n",
-  "readmeFilename": "README.md",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/thlorenz/ansicolors.git"
-  },
-  "scripts": {
-    "test": "node test/*.js"
-  },
-  "version": "0.3.2"
+  "directories": {},
+  "_shasum": "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979",
+  "_resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"
 }
diff --git a/deps/npm/node_modules/ansistyles/package.json b/deps/npm/node_modules/ansistyles/package.json
index 3f523f2e9ee34b..12ddf0d45ec56d 100644
--- a/deps/npm/node_modules/ansistyles/package.json
+++ b/deps/npm/node_modules/ansistyles/package.json
@@ -1,77 +1,51 @@
 {
-  "_args": [
-    [
-      "ansistyles@~0.1.3",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "ansistyles@>=0.1.3 <0.2.0",
-  "_id": "ansistyles@0.1.3",
-  "_inCache": true,
-  "_location": "/ansistyles",
-  "_npmUser": {
-    "email": "thlorenz@gmx.de",
-    "name": "thlorenz"
+  "name": "ansistyles",
+  "version": "0.1.3",
+  "description": "Functions that surround a string with ansistyle codes so it prints in style.",
+  "main": "ansistyles.js",
+  "scripts": {
+    "test": "node test/ansistyles.js"
   },
-  "_npmVersion": "1.3.11",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "ansistyles",
-    "raw": "ansistyles@~0.1.3",
-    "rawSpec": "~0.1.3",
-    "scope": null,
-    "spec": ">=0.1.3 <0.2.0",
-    "type": "range"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/thlorenz/ansistyles.git"
   },
-  "_requiredBy": [
-    "/"
+  "keywords": [
+    "ansi",
+    "style",
+    "terminal",
+    "console"
   ],
-  "_resolved": "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz",
-  "_shasum": "5de60415bda071bb37127854c864f41b23254539",
-  "_shrinkwrap": null,
-  "_spec": "ansistyles@~0.1.3",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "thlorenz@gmx.de",
     "name": "Thorsten Lorenz",
+    "email": "thlorenz@gmx.de",
     "url": "thlorenz.com"
   },
+  "license": "MIT",
+  "readmeFilename": "README.md",
+  "gitHead": "27bf1bc65231bcc7fd109bf13b13601b51f8cd04",
+  "readme": "# ansistyles [![build status](https://secure.travis-ci.org/thlorenz/ansistyles.png)](http://next.travis-ci.org/thlorenz/ansistyles)\n\nFunctions that surround a string with ansistyle codes so it prints in style.\n\nIn case you need colors, like `red`, have a look at [ansicolors](https://github.com/thlorenz/ansicolors).\n\n## Installation\n\n    npm install ansistyles\n\n## Usage\n\n```js\nvar styles = require('ansistyles');\n\nconsole.log(styles.bright('hello world'));    // prints hello world in 'bright' white\nconsole.log(styles.underline('hello world')); // prints hello world underlined\nconsole.log(styles.inverse('hello world'));   // prints hello world black on white\n```\n\n## Combining with ansicolors\n\nGet the ansicolors module:\n\n    npm install ansicolors\n\n```js\nvar styles = require('ansistyles')\n  , colors = require('ansicolors');\n\n  console.log(\n    // prints hello world underlined in blue on a green background\n    colors.bgGreen(colors.blue(styles.underline('hello world'))) \n  );\n```\n\n## Tests\n\nLook at the [tests](https://github.com/thlorenz/ansistyles/blob/master/test/ansistyles.js) to see more examples and/or run them via: \n\n    npm explore ansistyles && npm test\n\n## More Styles\n\nAs you can see from [here](https://github.com/thlorenz/ansistyles/blob/master/ansistyles.js#L4-L15), more styles are available,\nbut didn't have any effect on the terminals that I tested on Mac Lion and Ubuntu Linux.\n\nI included them for completeness, but didn't show them in the examples because they seem to have no effect.\n\n### reset\n\nA style reset function is also included, please note however that this is not nestable.\n\nTherefore the below only underlines `hell` only, but not `world`.\n\n```js\nconsole.log(styles.underline('hell' + styles.reset('o') + ' world'));\n```\n\nIt is essentially the same as:\n\n```js\nconsole.log(styles.underline('hell') + styles.reset('') + 'o world');\n```\n\n\n\n## Alternatives\n\n**ansistyles** tries to meet simple use cases with a very simple API. However, if you need a more powerful ansi formatting tool, \nI'd suggest to look at the [features](https://github.com/TooTallNate/ansi.js#features) of the [ansi module](https://github.com/TooTallNate/ansi.js).\n",
   "bugs": {
     "url": "https://github.com/thlorenz/ansistyles/issues"
   },
-  "dependencies": {},
-  "description": "Functions that surround a string with ansistyle codes so it prints in style.",
-  "devDependencies": {},
-  "directories": {},
+  "_id": "ansistyles@0.1.3",
   "dist": {
     "shasum": "5de60415bda071bb37127854c864f41b23254539",
     "tarball": "http://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"
   },
-  "gitHead": "27bf1bc65231bcc7fd109bf13b13601b51f8cd04",
-  "keywords": [
-    "ansi",
-    "console",
-    "style",
-    "terminal"
-  ],
-  "license": "MIT",
-  "main": "ansistyles.js",
+  "_from": "ansistyles@>=0.1.3 <0.2.0",
+  "_npmVersion": "1.3.11",
+  "_npmUser": {
+    "name": "thlorenz",
+    "email": "thlorenz@gmx.de"
+  },
   "maintainers": [
     {
       "name": "thlorenz",
       "email": "thlorenz@gmx.de"
     }
   ],
-  "name": "ansistyles",
-  "optionalDependencies": {},
-  "readme": "# ansistyles [![build status](https://secure.travis-ci.org/thlorenz/ansistyles.png)](http://next.travis-ci.org/thlorenz/ansistyles)\n\nFunctions that surround a string with ansistyle codes so it prints in style.\n\nIn case you need colors, like `red`, have a look at [ansicolors](https://github.com/thlorenz/ansicolors).\n\n## Installation\n\n    npm install ansistyles\n\n## Usage\n\n```js\nvar styles = require('ansistyles');\n\nconsole.log(styles.bright('hello world'));    // prints hello world in 'bright' white\nconsole.log(styles.underline('hello world')); // prints hello world underlined\nconsole.log(styles.inverse('hello world'));   // prints hello world black on white\n```\n\n## Combining with ansicolors\n\nGet the ansicolors module:\n\n    npm install ansicolors\n\n```js\nvar styles = require('ansistyles')\n  , colors = require('ansicolors');\n\n  console.log(\n    // prints hello world underlined in blue on a green background\n    colors.bgGreen(colors.blue(styles.underline('hello world'))) \n  );\n```\n\n## Tests\n\nLook at the [tests](https://github.com/thlorenz/ansistyles/blob/master/test/ansistyles.js) to see more examples and/or run them via: \n\n    npm explore ansistyles && npm test\n\n## More Styles\n\nAs you can see from [here](https://github.com/thlorenz/ansistyles/blob/master/ansistyles.js#L4-L15), more styles are available,\nbut didn't have any effect on the terminals that I tested on Mac Lion and Ubuntu Linux.\n\nI included them for completeness, but didn't show them in the examples because they seem to have no effect.\n\n### reset\n\nA style reset function is also included, please note however that this is not nestable.\n\nTherefore the below only underlines `hell` only, but not `world`.\n\n```js\nconsole.log(styles.underline('hell' + styles.reset('o') + ' world'));\n```\n\nIt is essentially the same as:\n\n```js\nconsole.log(styles.underline('hell') + styles.reset('') + 'o world');\n```\n\n\n\n## Alternatives\n\n**ansistyles** tries to meet simple use cases with a very simple API. However, if you need a more powerful ansi formatting tool, \nI'd suggest to look at the [features](https://github.com/TooTallNate/ansi.js#features) of the [ansi module](https://github.com/TooTallNate/ansi.js).\n",
-  "readmeFilename": "README.md",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/thlorenz/ansistyles.git"
-  },
-  "scripts": {
-    "test": "node test/ansistyles.js"
-  },
-  "version": "0.1.3"
+  "directories": {},
+  "_shasum": "5de60415bda071bb37127854c864f41b23254539",
+  "_resolved": "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"
 }
diff --git a/deps/npm/node_modules/aproba/package.json b/deps/npm/node_modules/aproba/package.json
index 16f35b0a5541d6..b41acdf973396c 100644
--- a/deps/npm/node_modules/aproba/package.json
+++ b/deps/npm/node_modules/aproba/package.json
@@ -1,77 +1,54 @@
 {
-  "_args": [
-    [
-      "aproba@~1.0.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "aproba@>=1.0.1 <1.1.0",
-  "_id": "aproba@1.0.1",
-  "_inCache": true,
-  "_location": "/aproba",
-  "_nodeVersion": "1.6.2",
-  "_npmUser": {
-    "email": "me@re-becca.org",
-    "name": "iarna"
-  },
-  "_npmVersion": "2.7.5",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "aproba",
-    "raw": "aproba@~1.0.1",
-    "rawSpec": "~1.0.1",
-    "scope": null,
-    "spec": ">=1.0.1 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_shasum": "c4ac2cc5becfb8b099de7ef9f02790e7d32d99ef",
-  "_shrinkwrap": null,
-  "_spec": "aproba@~1.0.1",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "me@re-becca.org",
-    "name": "Rebecca Turner"
-  },
-  "bugs": {
-    "url": "https://github.com/iarna/aproba/issues"
+  "name": "aproba",
+  "version": "1.0.1",
+  "description": "A rediculously light-weight argument validator",
+  "main": "index.js",
+  "directories": {
+    "test": "test"
   },
   "dependencies": {},
-  "description": "A rediculously light-weight argument validator",
   "devDependencies": {
     "tap": "^0.7.0"
   },
-  "directories": {
-    "test": "test"
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "dist": {
-    "shasum": "c4ac2cc5becfb8b099de7ef9f02790e7d32d99ef",
-    "tarball": "http://registry.npmjs.org/aproba/-/aproba-1.0.1.tgz"
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/iarna/aproba"
   },
-  "gitHead": "a2ea029793a14cddb9457afd0a83dc421889c7ad",
-  "homepage": "https://github.com/iarna/aproba",
   "keywords": [
     "argument",
     "validate"
   ],
+  "author": {
+    "name": "Rebecca Turner",
+    "email": "me@re-becca.org"
+  },
   "license": "ISC",
-  "main": "index.js",
+  "bugs": {
+    "url": "https://github.com/iarna/aproba/issues"
+  },
+  "homepage": "https://github.com/iarna/aproba",
+  "gitHead": "a2ea029793a14cddb9457afd0a83dc421889c7ad",
+  "_id": "aproba@1.0.1",
+  "_shasum": "c4ac2cc5becfb8b099de7ef9f02790e7d32d99ef",
+  "_from": "aproba@>=1.0.1 <1.1.0",
+  "_npmVersion": "2.7.5",
+  "_nodeVersion": "1.6.2",
+  "_npmUser": {
+    "name": "iarna",
+    "email": "me@re-becca.org"
+  },
   "maintainers": [
     {
       "name": "iarna",
       "email": "me@re-becca.org"
     }
   ],
-  "name": "aproba",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/iarna/aproba"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "dist": {
+    "shasum": "c4ac2cc5becfb8b099de7ef9f02790e7d32d99ef",
+    "tarball": "http://registry.npmjs.org/aproba/-/aproba-1.0.1.tgz"
   },
-  "version": "1.0.1"
+  "_resolved": "https://registry.npmjs.org/aproba/-/aproba-1.0.1.tgz"
 }
diff --git a/deps/npm/node_modules/archy/package.json b/deps/npm/node_modules/archy/package.json
index 9c7188b9cc9cae..d49bc87768d96b 100644
--- a/deps/npm/node_modules/archy/package.json
+++ b/deps/npm/node_modules/archy/package.json
@@ -1,83 +1,24 @@
 {
-  "_args": [
-    [
-      "archy@~1.0.0",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "archy@>=1.0.0 <1.1.0",
-  "_id": "archy@1.0.0",
-  "_inCache": true,
-  "_location": "/archy",
-  "_npmUser": {
-    "email": "mail@substack.net",
-    "name": "substack"
-  },
-  "_npmVersion": "1.4.25",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "archy",
-    "raw": "archy@~1.0.0",
-    "rawSpec": "~1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-  "_shasum": "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40",
-  "_shrinkwrap": null,
-  "_spec": "archy@~1.0.0",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "mail@substack.net",
-    "name": "James Halliday",
-    "url": "http://substack.net"
-  },
-  "bugs": {
-    "url": "https://github.com/substack/node-archy/issues"
-  },
-  "dependencies": {},
+  "name": "archy",
+  "version": "1.0.0",
   "description": "render nested hierarchies `npm ls` style with unicode pipes",
+  "main": "index.js",
   "devDependencies": {
     "tap": "~0.3.3",
     "tape": "~0.1.1"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40",
-    "tarball": "http://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
-  },
-  "gitHead": "30223c16191e877bf027b15b12daf077b9b55b84",
-  "homepage": "https://github.com/substack/node-archy",
-  "keywords": [
-    "hierarchy",
-    "npm ls",
-    "pretty",
-    "print",
-    "unicode"
-  ],
-  "license": "MIT",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "substack",
-      "email": "mail@substack.net"
-    }
-  ],
-  "name": "archy",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "http://github.com/substack/node-archy.git"
-  },
   "scripts": {
     "test": "tap test"
   },
   "testling": {
+    "files": "test/*.js",
     "browsers": {
+      "iexplore": [
+        "6.0",
+        "7.0",
+        "8.0",
+        "9.0"
+      ],
       "chrome": [
         "20.0"
       ],
@@ -85,20 +26,55 @@
         "10.0",
         "15.0"
       ],
-      "iexplore": [
-        "6.0",
-        "7.0",
-        "8.0",
-        "9.0"
+      "safari": [
+        "5.1"
       ],
       "opera": [
         "12.0"
-      ],
-      "safari": [
-        "5.1"
       ]
-    },
-    "files": "test/*.js"
+    }
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/substack/node-archy.git"
+  },
+  "keywords": [
+    "hierarchy",
+    "npm ls",
+    "unicode",
+    "pretty",
+    "print"
+  ],
+  "author": {
+    "name": "James Halliday",
+    "email": "mail@substack.net",
+    "url": "http://substack.net"
   },
-  "version": "1.0.0"
+  "license": "MIT",
+  "gitHead": "30223c16191e877bf027b15b12daf077b9b55b84",
+  "bugs": {
+    "url": "https://github.com/substack/node-archy/issues"
+  },
+  "homepage": "https://github.com/substack/node-archy",
+  "_id": "archy@1.0.0",
+  "_shasum": "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40",
+  "_from": "archy@>=1.0.0 <1.1.0",
+  "_npmVersion": "1.4.25",
+  "_npmUser": {
+    "name": "substack",
+    "email": "mail@substack.net"
+  },
+  "maintainers": [
+    {
+      "name": "substack",
+      "email": "mail@substack.net"
+    }
+  ],
+  "dist": {
+    "shasum": "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40",
+    "tarball": "http://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
+  },
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/asap/package.json b/deps/npm/node_modules/asap/package.json
deleted file mode 100644
index 6c4417126b110b..00000000000000
--- a/deps/npm/node_modules/asap/package.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "_args": [
-    [
-      "asap@^2.0.0",
-      "/Users/rebecca/code/npm/node_modules/dezalgo"
-    ]
-  ],
-  "_from": "asap@>=2.0.0 <3.0.0",
-  "_id": "asap@2.0.3",
-  "_inCache": true,
-  "_location": "/asap",
-  "_nodeVersion": "1.8.1",
-  "_npmUser": {
-    "email": "kris.kowal@cixar.com",
-    "name": "kriskowal"
-  },
-  "_npmVersion": "2.8.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "asap",
-    "raw": "asap@^2.0.0",
-    "rawSpec": "^2.0.0",
-    "scope": null,
-    "spec": ">=2.0.0 <3.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/dezalgo"
-  ],
-  "_resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz",
-  "_shasum": "1fc1d1564ee11620dfca6d67029850913f9f4679",
-  "_shrinkwrap": null,
-  "_spec": "asap@^2.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/dezalgo",
-  "browser": {
-    "./asap.js": "./browser-asap.js",
-    "./raw.js": "./browser-raw.js",
-    "./test/domain.js": "./test/browser-domain.js"
-  },
-  "bugs": {
-    "url": "https://github.com/kriskowal/asap/issues"
-  },
-  "dependencies": {},
-  "description": "High-priority task queue for Node.js and browsers",
-  "devDependencies": {
-    "events": "^1.0.1",
-    "jshint": "^2.5.1",
-    "knox": "^0.8.10",
-    "mr": "^2.0.5",
-    "opener": "^1.3.0",
-    "q": "^2.0.3",
-    "q-io": "^2.0.3",
-    "saucelabs": "^0.1.1",
-    "wd": "^0.2.21",
-    "weak-map": "^1.0.5"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "1fc1d1564ee11620dfca6d67029850913f9f4679",
-    "tarball": "http://registry.npmjs.org/asap/-/asap-2.0.3.tgz"
-  },
-  "files": [
-    "asap.js",
-    "browser-asap.js",
-    "browser-raw.js",
-    "raw.js"
-  ],
-  "gitHead": "ccbf94d4e4a0c3afc2df13331044020a46a74ab6",
-  "homepage": "https://github.com/kriskowal/asap#readme",
-  "keywords": [
-    "event",
-    "queue",
-    "task"
-  ],
-  "license": {
-    "type": "MIT",
-    "url": "https://github.com/kriskowal/asap/raw/master/LICENSE.md"
-  },
-  "main": "./asap.js",
-  "maintainers": [
-    {
-      "name": "kriskowal",
-      "email": "kris.kowal@cixar.com"
-    },
-    {
-      "name": "forbeslindesay",
-      "email": "forbes@lindesay.co.uk"
-    }
-  ],
-  "name": "asap",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/kriskowal/asap.git"
-  },
-  "scripts": {
-    "lint": "jshint raw.js asap.js browser-raw.js browser-asap.js $(find scripts -name '*.js' | grep -v gauntlet)",
-    "test": "npm run lint && npm run test-node",
-    "test-browser": "node scripts/publish-bundle.js test/asap-test.js | xargs opener",
-    "test-node": "node test/asap-test.js",
-    "test-publish": "node scripts/publish-bundle.js test/asap-test.js | pbcopy",
-    "test-saucelabs": "node scripts/saucelabs.js test/asap-test.js scripts/saucelabs-spot-configurations.json",
-    "test-saucelabs-all": "node scripts/saucelabs.js test/asap-test.js scripts/saucelabs-all-configurations.json",
-    "test-saucelabs-worker": "node scripts/saucelabs-worker-test.js scripts/saucelabs-spot-configurations.json",
-    "test-saucelabs-worker-all": "node scripts/saucelabs-worker-test.js scripts/saucelabs-all-configurations.json",
-    "test-travis": "npm run lint && npm run test-node && npm run test-saucelabs && npm run test-saucelabs-worker"
-  },
-  "version": "2.0.3"
-}
diff --git a/deps/npm/node_modules/asn1/package.json b/deps/npm/node_modules/asn1/package.json
deleted file mode 100644
index 3cfaafd3e53695..00000000000000
--- a/deps/npm/node_modules/asn1/package.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "_args": [
-    [
-      "asn1@0.1.11",
-      "/Users/rebecca/code/npm/node_modules/http-signature"
-    ]
-  ],
-  "_defaultsLoaded": true,
-  "_engineSupported": true,
-  "_from": "asn1@0.1.11",
-  "_id": "asn1@0.1.11",
-  "_inCache": true,
-  "_location": "/asn1",
-  "_nodeVersion": "v0.6.6",
-  "_npmUser": {
-    "email": "mcavage@gmail.com",
-    "name": "mcavage"
-  },
-  "_npmVersion": "1.1.0-beta-4",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "asn1",
-    "raw": "asn1@0.1.11",
-    "rawSpec": "0.1.11",
-    "scope": null,
-    "spec": "0.1.11",
-    "type": "version"
-  },
-  "_requiredBy": [
-    "/http-signature"
-  ],
-  "_resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
-  "_shasum": "559be18376d08a4ec4dbe80877d27818639b2df7",
-  "_shrinkwrap": null,
-  "_spec": "asn1@0.1.11",
-  "_where": "/Users/rebecca/code/npm/node_modules/http-signature",
-  "author": {
-    "email": "mcavage@gmail.com",
-    "name": "Mark Cavage"
-  },
-  "contributors": [
-    {
-      "name": "David Gwynne",
-      "email": "loki@animata.net"
-    },
-    {
-      "name": "Yunong Xiao",
-      "email": "yunong@joyent.com"
-    }
-  ],
-  "dependencies": {},
-  "description": "Contains parsers and serializers for ASN.1 (currently BER only)",
-  "devDependencies": {
-    "tap": "0.1.4"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "559be18376d08a4ec4dbe80877d27818639b2df7",
-    "tarball": "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-  },
-  "engines": {
-    "node": ">=0.4.9"
-  },
-  "main": "lib/index.js",
-  "maintainers": [
-    {
-      "name": "mcavage",
-      "email": "mcavage@gmail.com"
-    }
-  ],
-  "name": "asn1",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/mcavage/node-asn1.git"
-  },
-  "scripts": {
-    "pretest": "which gjslint; if [[ \"$?\" = 0 ]] ; then  gjslint --nojsdoc -r lib -r tst; else echo \"Missing gjslint. Skipping lint\"; fi",
-    "test": "./node_modules/.bin/tap ./tst"
-  },
-  "version": "0.1.11"
-}
diff --git a/deps/npm/node_modules/assert-plus/package.json b/deps/npm/node_modules/assert-plus/package.json
deleted file mode 100644
index 37eeed1d2bc3c4..00000000000000
--- a/deps/npm/node_modules/assert-plus/package.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "_args": [
-    [
-      "assert-plus@^0.1.5",
-      "/Users/rebecca/code/npm/node_modules/http-signature"
-    ]
-  ],
-  "_from": "assert-plus@>=0.1.5 <0.2.0",
-  "_id": "assert-plus@0.1.5",
-  "_inCache": true,
-  "_location": "/assert-plus",
-  "_npmUser": {
-    "email": "mcavage@gmail.com",
-    "name": "mcavage"
-  },
-  "_npmVersion": "1.3.11",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "assert-plus",
-    "raw": "assert-plus@^0.1.5",
-    "rawSpec": "^0.1.5",
-    "scope": null,
-    "spec": ">=0.1.5 <0.2.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/http-signature"
-  ],
-  "_resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-  "_shasum": "ee74009413002d84cec7219c6ac811812e723160",
-  "_shrinkwrap": null,
-  "_spec": "assert-plus@^0.1.5",
-  "_where": "/Users/rebecca/code/npm/node_modules/http-signature",
-  "author": {
-    "email": "mcavage@gmail.com",
-    "name": "Mark Cavage"
-  },
-  "bugs": {
-    "url": "https://github.com/mcavage/node-assert-plus/issues"
-  },
-  "dependencies": {},
-  "description": "Extra assertions on top of node's assert module",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "ee74009413002d84cec7219c6ac811812e723160",
-    "tarball": "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-  },
-  "engines": {
-    "node": ">=0.8"
-  },
-  "main": "./assert.js",
-  "maintainers": [
-    {
-      "name": "mcavage",
-      "email": "mcavage@gmail.com"
-    }
-  ],
-  "name": "assert-plus",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/mcavage/node-assert-plus.git"
-  },
-  "version": "0.1.5"
-}
diff --git a/deps/npm/node_modules/async-some/package.json b/deps/npm/node_modules/async-some/package.json
index e2b7ad635a9c6f..b7d5521e58dfba 100644
--- a/deps/npm/node_modules/async-some/package.json
+++ b/deps/npm/node_modules/async-some/package.json
@@ -1,81 +1,41 @@
 {
-  "_args": [
-    [
-      "async-some@~1.0.2",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "async-some@>=1.0.2 <1.1.0",
-  "_id": "async-some@1.0.2",
-  "_inCache": true,
-  "_location": "/async-some",
-  "_nodeVersion": "2.0.2",
-  "_npmUser": {
-    "email": "ogd@aoaioxxysz.net",
-    "name": "othiym23"
+  "name": "async-some",
+  "version": "1.0.2",
+  "description": "short-circuited, asynchronous version of Array.protototype.some",
+  "main": "some.js",
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "_npmVersion": "2.10.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "async-some",
-    "raw": "async-some@~1.0.2",
-    "rawSpec": "~1.0.2",
-    "scope": null,
-    "spec": ">=1.0.2 <1.1.0",
-    "type": "range"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/othiym23/async-some.git"
   },
-  "_requiredBy": [
-    "/"
+  "keywords": [
+    "async",
+    "some",
+    "array",
+    "collections",
+    "fp"
   ],
-  "_resolved": "https://registry.npmjs.org/async-some/-/async-some-1.0.2.tgz",
-  "_shasum": "4d8a81620d5958791b5b98f802d3207776e95509",
-  "_shrinkwrap": null,
-  "_spec": "async-some@~1.0.2",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "ogd@aoaioxxysz.net",
-    "name": "Forrest L Norvell"
+    "name": "Forrest L Norvell",
+    "email": "ogd@aoaioxxysz.net"
   },
+  "license": "ISC",
   "bugs": {
     "url": "https://github.com/othiym23/async-some/issues"
   },
+  "homepage": "https://github.com/othiym23/async-some",
   "dependencies": {
     "dezalgo": "^1.0.2"
   },
-  "description": "short-circuited, asynchronous version of Array.protototype.some",
   "devDependencies": {
     "tap": "^1.1.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "4d8a81620d5958791b5b98f802d3207776e95509",
-    "tarball": "http://registry.npmjs.org/async-some/-/async-some-1.0.2.tgz"
-  },
+  "readme": "# some\n\nShort-circuited async Array.prototype.some implementation.\n\nSerially evaluates a list of values from a JS array or arraylike\nagainst an asynchronous predicate, terminating on the first truthy\nvalue. If the predicate encounters an error, pass it to the completion\ncallback. Otherwise, pass the truthy value passed by the predicate, or\n`false` if no truthy value was passed.\n\nIs\n[Zalgo](http://blog.izs.me/post/59142742143/designing-apis-for-asynchrony)-proof,\nbrowser-safe, and pretty efficient.\n\n## Usage\n\n```javascript\nvar some = require(\"async-some\");\nvar resolve = require(\"path\").resolve;\nvar stat = require(\"fs\").stat;\nvar readFileSync = require(\"fs\").readFileSync;\n\nsome([\"apple\", \"seaweed\", \"ham\", \"quince\"], porkDetector, function (error, match) {\n  if (error) return console.error(error);\n\n  if (match) return console.dir(JSON.parse(readFileSync(match)));\n\n  console.error(\"time to buy more Sporkle™!\");\n});\n\nvar PREFIX = resolve(__dirname, \"../pork_store\");\nfunction porkDetector(value, cb) {\n  var path = resolve(PREFIX, value + \".json\");\n  stat(path, function (er, stat) {\n    if (er) {\n      if (er.code === \"ENOENT\") return cb(null, false);\n\n      return cb(er);\n    }\n\n    cb(er, path);\n  });\n}\n```\n\n### some(list, test, callback)\n\n* `list` {Object} An arraylike (either an Array or the arguments arraylike) to\n  be checked.\n* `test` {Function} The predicate against which the elements of `list` will be\n  tested. Takes two parameters:\n  * `element` {any} The element of the list to be tested.\n  * `callback` {Function} The continuation to be called once the test is\n    complete. Takes (again) two values:\n    * `error` {Error} Any errors that the predicate encountered.\n    * `value` {any} A truthy value. A non-falsy result terminates checking the\n      entire list.\n* `callback` {Function} The callback to invoke when either a value has been\n  found or the entire input list has been processed with no result. Is invoked\n  with the traditional two parameters:\n  * `error` {Error} Errors that were encountered during the evaluation of some().\n  * `match` {any} Value successfully matched by `test`, if any.\n",
+  "readmeFilename": "README.md",
   "gitHead": "3a5086ad54739c48b2bbf073f23bcc95658199e3",
-  "homepage": "https://github.com/othiym23/async-some",
-  "keywords": [
-    "array",
-    "async",
-    "collections",
-    "fp",
-    "some"
-  ],
-  "license": "ISC",
-  "main": "some.js",
-  "maintainers": [
-    {
-      "name": "othiym23",
-      "email": "ogd@aoaioxxysz.net"
-    }
-  ],
-  "name": "async-some",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/othiym23/async-some.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "1.0.2"
+  "_id": "async-some@1.0.2",
+  "_shasum": "4d8a81620d5958791b5b98f802d3207776e95509",
+  "_from": "async-some@>=1.0.2 <1.1.0"
 }
diff --git a/deps/npm/node_modules/aws-sign2/package.json b/deps/npm/node_modules/aws-sign2/package.json
deleted file mode 100644
index 8bb70110aae105..00000000000000
--- a/deps/npm/node_modules/aws-sign2/package.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "_args": [
-    [
-      "aws-sign2@~0.5.0",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "aws-sign2@>=0.5.0 <0.6.0",
-  "_id": "aws-sign2@0.5.0",
-  "_inCache": true,
-  "_location": "/aws-sign2",
-  "_npmUser": {
-    "email": "mikeal.rogers@gmail.com",
-    "name": "mikeal"
-  },
-  "_npmVersion": "1.3.2",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "aws-sign2",
-    "raw": "aws-sign2@~0.5.0",
-    "rawSpec": "~0.5.0",
-    "scope": null,
-    "spec": ">=0.5.0 <0.6.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/request"
-  ],
-  "_resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
-  "_shasum": "c57103f7a17fc037f02d7c2e64b602ea223f7d63",
-  "_shrinkwrap": null,
-  "_spec": "aws-sign2@~0.5.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
-  "author": {
-    "email": "mikeal.rogers@gmail.com",
-    "name": "Mikeal Rogers",
-    "url": "http://www.futurealoof.com"
-  },
-  "bugs": {
-    "url": "https://github.com/mikeal/aws-sign/issues"
-  },
-  "dependencies": {},
-  "description": "AWS signing. Originally pulled from LearnBoost/knox, maintained as vendor in request, now a standalone module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "c57103f7a17fc037f02d7c2e64b602ea223f7d63",
-    "tarball": "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
-  },
-  "engines": {
-    "node": "*"
-  },
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "mikeal",
-      "email": "mikeal.rogers@gmail.com"
-    }
-  ],
-  "name": "aws-sign2",
-  "optionalDependencies": {},
-  "readme": "aws-sign\n========\n\nAWS signing. Originally pulled from LearnBoost/knox, maintained as vendor in request, now a standalone module.\n",
-  "readmeFilename": "README.md",
-  "repository": {
-    "url": "https://github.com/mikeal/aws-sign"
-  },
-  "version": "0.5.0"
-}
diff --git a/deps/npm/node_modules/balanced-match/package.json b/deps/npm/node_modules/balanced-match/package.json
deleted file mode 100644
index 3f11aaccbff0ba..00000000000000
--- a/deps/npm/node_modules/balanced-match/package.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "_args": [
-    [
-      "balanced-match@^0.2.0",
-      "/Users/rebecca/code/npm/node_modules/brace-expansion"
-    ]
-  ],
-  "_from": "balanced-match@>=0.2.0 <0.3.0",
-  "_id": "balanced-match@0.2.0",
-  "_inCache": true,
-  "_location": "/balanced-match",
-  "_nodeVersion": "0.10.32",
-  "_npmUser": {
-    "email": "julian@juliangruber.com",
-    "name": "juliangruber"
-  },
-  "_npmVersion": "2.1.8",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "balanced-match",
-    "raw": "balanced-match@^0.2.0",
-    "rawSpec": "^0.2.0",
-    "scope": null,
-    "spec": ">=0.2.0 <0.3.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/brace-expansion"
-  ],
-  "_resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
-  "_shasum": "38f6730c03aab6d5edbb52bd934885e756d71674",
-  "_shrinkwrap": null,
-  "_spec": "balanced-match@^0.2.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/brace-expansion",
-  "author": {
-    "email": "mail@juliangruber.com",
-    "name": "Julian Gruber",
-    "url": "http://juliangruber.com"
-  },
-  "bugs": {
-    "url": "https://github.com/juliangruber/balanced-match/issues"
-  },
-  "dependencies": {},
-  "description": "Match balanced character pairs, like \"{\" and \"}\"",
-  "devDependencies": {
-    "tape": "~1.1.1"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "38f6730c03aab6d5edbb52bd934885e756d71674",
-    "tarball": "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
-  },
-  "gitHead": "ba40ed78e7114a4a67c51da768a100184dead39c",
-  "homepage": "https://github.com/juliangruber/balanced-match",
-  "keywords": [
-    "balanced",
-    "match",
-    "parse",
-    "regexp",
-    "test"
-  ],
-  "license": "MIT",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "juliangruber",
-      "email": "julian@juliangruber.com"
-    }
-  ],
-  "name": "balanced-match",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/juliangruber/balanced-match.git"
-  },
-  "scripts": {
-    "test": "make test"
-  },
-  "testling": {
-    "browsers": [
-      "android-browser/4.2..latest",
-      "chrome/25..latest",
-      "chrome/canary",
-      "firefox/20..latest",
-      "firefox/nightly",
-      "ie/8..latest",
-      "ipad/6.0..latest",
-      "iphone/6.0..latest",
-      "opera/12..latest",
-      "opera/next",
-      "safari/5.1..latest"
-    ],
-    "files": "test/*.js"
-  },
-  "version": "0.2.0"
-}
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/package.json b/deps/npm/node_modules/bl/node_modules/readable-stream/package.json
deleted file mode 100644
index dc64209734e4a2..00000000000000
--- a/deps/npm/node_modules/bl/node_modules/readable-stream/package.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-  "_args": [
-    [
-      "readable-stream@~2.0.0",
-      "/Users/rebecca/code/npm/node_modules/bl"
-    ]
-  ],
-  "_from": "readable-stream@>=2.0.0 <2.1.0",
-  "_id": "readable-stream@2.0.2",
-  "_inCache": true,
-  "_location": "/bl/readable-stream",
-  "_nodeVersion": "2.3.0",
-  "_npmUser": {
-    "email": "calvin.metcalf@gmail.com",
-    "name": "cwmma"
-  },
-  "_npmVersion": "2.11.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "readable-stream",
-    "raw": "readable-stream@~2.0.0",
-    "rawSpec": "~2.0.0",
-    "scope": null,
-    "spec": ">=2.0.0 <2.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/bl"
-  ],
-  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
-  "_shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
-  "_shrinkwrap": null,
-  "_spec": "readable-stream@~2.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/bl",
-  "browser": {
-    "util": false
-  },
-  "bugs": {
-    "url": "https://github.com/nodejs/readable-stream/issues"
-  },
-  "dependencies": {
-    "core-util-is": "~1.0.0",
-    "inherits": "~2.0.1",
-    "isarray": "0.0.1",
-    "process-nextick-args": "~1.0.0",
-    "string_decoder": "~0.10.x",
-    "util-deprecate": "~1.0.1"
-  },
-  "description": "Streams3, a user-land copy of the stream library from iojs v2.x",
-  "devDependencies": {
-    "tap": "~0.2.6",
-    "tape": "~4.0.0",
-    "zuul": "~3.0.0"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
-    "tarball": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz"
-  },
-  "gitHead": "1a70134a71196eeabb5e27bc7580faaa68d30513",
-  "homepage": "https://github.com/nodejs/readable-stream#readme",
-  "keywords": [
-    "pipe",
-    "readable",
-    "stream"
-  ],
-  "license": "MIT",
-  "main": "readable.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "isaacs@npmjs.com"
-    },
-    {
-      "name": "tootallnate",
-      "email": "nathan@tootallnate.net"
-    },
-    {
-      "name": "rvagg",
-      "email": "rod@vagg.org"
-    },
-    {
-      "name": "cwmma",
-      "email": "calvin.metcalf@gmail.com"
-    }
-  ],
-  "name": "readable-stream",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/nodejs/readable-stream.git"
-  },
-  "scripts": {
-    "browser": "zuul --browser-name $BROWSER_NAME --browser-version $BROWSER_VERSION -- test/browser.js",
-    "test": "tap test/parallel/*.js"
-  },
-  "version": "2.0.2"
-}
diff --git a/deps/npm/node_modules/bluebird/README.md b/deps/npm/node_modules/bluebird/README.md
deleted file mode 100644
index 949f6257990d1b..00000000000000
--- a/deps/npm/node_modules/bluebird/README.md
+++ /dev/null
@@ -1,679 +0,0 @@
-<a href="http://promisesaplus.com/">
-    <img src="http://promisesaplus.com/assets/logo-small.png" alt="Promises/A+ logo"
-         title="Promises/A+ 1.1 compliant" align="right" />
-</a>
-[![Build Status](https://travis-ci.org/petkaantonov/bluebird.svg?branch=master)](https://travis-ci.org/petkaantonov/bluebird)
-[![coverage-98%](http://img.shields.io/badge/coverage-98%-brightgreen.svg?style=flat)](http://petkaantonov.github.io/bluebird/coverage/debug/index.html)
-
-**Got a question?** Join us on [stackoverflow](http://stackoverflow.com/questions/tagged/bluebird), the [mailing list](https://groups.google.com/forum/#!forum/bluebird-js) or chat on [IRC](https://webchat.freenode.net/?channels=#promises)
-
-# Introduction
-
-Bluebird is a fully featured [promise](#what-are-promises-and-why-should-i-use-them) library with focus on innovative features and performance
-
-
-
-# Topics
-
-- [Features](#features)
-- [Quick start](#quick-start)
-- [API Reference and examples](API.md)
-- [Support](#support)
-- [What are promises and why should I use them?](#what-are-promises-and-why-should-i-use-them)
-- [Questions and issues](#questions-and-issues)
-- [Error handling](#error-handling)
-- [Development](#development)
-    - [Testing](#testing)
-    - [Benchmarking](#benchmarks)
-    - [Custom builds](#custom-builds)
-    - [For library authors](#for-library-authors)
-- [What is the sync build?](#what-is-the-sync-build)
-- [License](#license)
-- [Snippets for common problems](https://github.com/petkaantonov/bluebird/wiki/Snippets)
-- [Promise anti-patterns](https://github.com/petkaantonov/bluebird/wiki/Promise-anti-patterns)
-- [Changelog](changelog.md)
-- [Optimization guide](#optimization-guide)
-
-# Features
-<img src="http://petkaantonov.github.io/bluebird/logo.png" alt="bluebird logo" align="right" />
-
-- [Promises A+](http://promisesaplus.com)
-- [Synchronous inspection](API.md#synchronous-inspection)
-- [Concurrency coordination](API.md#collections)
-- [Promisification on steroids](API.md#promisification)
-- [Resource management through a parallel of python `with`/C# `using`](API.md#resource-management)
-- [Cancellation and timeouts](API.md#cancellation)
-- [Parallel for C# `async` and `await`](API.md#generators)
-- Mind blowing utilities such as
-    - [`.bind()`](API.md#binddynamic-thisarg---promise)
-    - [`.call()`](API.md#callstring-propertyname--dynamic-arg---promise)
-    - [`Promise.join()`](API.md#promisejoinpromisethenablevalue-promises-function-handler---promise)
-    - [And](API.md#core) [much](API.md#timers) [more](API.md#utility)!
-- [Practical debugging solutions and sane defaults](#error-handling)
-- [Sick performance](benchmark/)
-
-<hr>
-
-# Quick start
-
-## Node.js
-
-    npm install bluebird
-
-Then:
-
-```js
-var Promise = require("bluebird");
-```
-
-## Browsers
-
-There are many ways to use bluebird in browsers:
-
-- Direct downloads
-    - Full build [bluebird.js](https://cdn.jsdelivr.net/bluebird/latest/bluebird.js)
-    - Full build minified [bluebird.min.js](https://cdn.jsdelivr.net/bluebird/latest/bluebird.min.js)
-    - Core build [bluebird.core.js](https://cdn.jsdelivr.net/bluebird/latest/bluebird.core.js)
-    - Core build minified [bluebird.core.min.js](https://cdn.jsdelivr.net/bluebird/latest/bluebird.core.min.js)
-- You may use browserify on the main export
-- You may use the [bower](http://bower.io) package.
-
-When using script tags the global variables `Promise` and `P` (alias for `Promise`) become available.
-
-A [minimal bluebird browser build](#custom-builds) is &asymp;38.92KB minified*, 11.65KB gzipped and has no external dependencies.
-
-*Google Closure Compiler using Simple.
-
-#### Browser support
-
-Browsers that [implement ECMA-262, edition 3](http://en.wikipedia.org/wiki/Ecmascript#Implementations) and later are supported.
-
-[![Selenium Test Status](https://saucelabs.com/browser-matrix/petka_antonov.svg)](https://saucelabs.com/u/petka_antonov)
-
-**Note** that in ECMA-262, edition 3 (IE7, IE8 etc.) it is not possible to use methods that have keyword names like `.catch` and `.finally`. The [API documentation](API.md) always lists a compatible alternative name that you can use if you need to support these browsers. For example `.catch` is replaced with `.caught` and `.finally` with `.lastly`.
-
-Also, [long stack trace](API.md#promiselongstacktraces---void) support is only available in Chrome, Firefox and Internet Explorer 10+.
-
-After quick start, see [API Reference and examples](API.md)
-
-<hr>
-
-# Support
-
-- Mailing list: [bluebird-js@googlegroups.com](https://groups.google.com/forum/#!forum/bluebird-js)
-- IRC: #promises @freenode
-- StackOverflow: [bluebird tag](http://stackoverflow.com/questions/tagged/bluebird)
-- Bugs and feature requests: [github issue tracker](https://github.com/petkaantonov/bluebird/issues?state=open)
-
-<hr>
-
-# What are promises and why should I use them?
-
-You should use promises to turn this:
-
-```js
-fs.readFile("file.json", function(err, val) {
-    if( err ) {
-        console.error("unable to read file");
-    }
-    else {
-        try {
-            val = JSON.parse(val);
-            console.log(val.success);
-        }
-        catch( e ) {
-            console.error("invalid json in file");
-        }
-    }
-});
-```
-
-Into this:
-
-```js
-fs.readFileAsync("file.json").then(JSON.parse).then(function(val) {
-    console.log(val.success);
-})
-.catch(SyntaxError, function(e) {
-    console.error("invalid json in file");
-})
-.catch(function(e) {
-    console.error("unable to read file");
-});
-```
-
-*If you are wondering "there is no `readFileAsync` method on `fs` that returns a promise", see [promisification](API.md#promisification)*
-
-Actually you might notice the latter has a lot in common with code that would do the same using synchronous I/O:
-
-```js
-try {
-    var val = JSON.parse(fs.readFileSync("file.json"));
-    console.log(val.success);
-}
-//Syntax actually not supported in JS but drives the point
-catch(SyntaxError e) {
-    console.error("invalid json in file");
-}
-catch(Error e) {
-    console.error("unable to read file");
-}
-```
-
-And that is the point - being able to have something that is a lot like `return` and `throw` in synchronous code.
-
-You can also use promises to improve code that was written with callback helpers:
-
-
-```js
-//Copyright Plato http://stackoverflow.com/a/19385911/995876
-//CC BY-SA 2.5
-mapSeries(URLs, function (URL, done) {
-    var options = {};
-    needle.get(URL, options, function (error, response, body) {
-        if (error) {
-            return done(error);
-        }
-        try {
-            var ret = JSON.parse(body);
-            return done(null, ret);
-        }
-        catch (e) {
-            done(e);
-        }
-    });
-}, function (err, results) {
-    if (err) {
-        console.log(err);
-    } else {
-        console.log('All Needle requests successful');
-        // results is a 1 to 1 mapping in order of URLs > needle.body
-        processAndSaveAllInDB(results, function (err) {
-            if (err) {
-                return done(err);
-            }
-            console.log('All Needle requests saved');
-            done(null);
-        });
-    }
-});
-```
-
-Is more pleasing to the eye when done with promises:
-
-```js
-Promise.promisifyAll(needle);
-var options = {};
-
-var current = Promise.resolve();
-Promise.map(URLs, function(URL) {
-    current = current.then(function () {
-        return needle.getAsync(URL, options);
-    });
-    return current;
-}).map(function(responseAndBody){
-    return JSON.parse(responseAndBody[1]);
-}).then(function (results) {
-    return processAndSaveAllInDB(results);
-}).then(function(){
-    console.log('All Needle requests saved');
-}).catch(function (e) {
-    console.log(e);
-});
-```
-
-Also promises don't just give you correspondences for synchronous features but can also be used as limited event emitters or callback aggregators.
-
-More reading:
-
- - [Promise nuggets](https://promise-nuggets.github.io/)
- - [Why I am switching to promises](http://spion.github.io/posts/why-i-am-switching-to-promises.html)
- - [What is the the point of promises](http://domenic.me/2012/10/14/youre-missing-the-point-of-promises/#toc_1)
- - [Snippets for common problems](https://github.com/petkaantonov/bluebird/wiki/Snippets)
- - [Promise anti-patterns](https://github.com/petkaantonov/bluebird/wiki/Promise-anti-patterns)
-
-# Questions and issues
-
-The [github issue tracker](https://github.com/petkaantonov/bluebird/issues) is **_only_** for bug reports and feature requests. Anything else, such as questions for help in using the library, should be posted in [StackOverflow](http://stackoverflow.com/questions/tagged/bluebird) under tags `promise` and `bluebird`.
-
-# Error handling
-
-This is a problem every promise library needs to handle in some way. Unhandled rejections/exceptions don't really have a good agreed-on asynchronous correspondence. The problem is that it is impossible to predict the future and know if a rejected promise will eventually be handled.
-
-There are two common pragmatic attempts at solving the problem that promise libraries do.
-
-The more popular one is to have the user explicitly communicate that they are done and any unhandled rejections should be thrown, like so:
-
-```js
-download().then(...).then(...).done();
-```
-
-For handling this problem, in my opinion, this is completely unacceptable and pointless. The user must remember to explicitly call `.done` and that cannot be justified when the problem is forgetting to create an error handler in the first place.
-
-The second approach, which is what bluebird by default takes, is to call a registered handler if a rejection is unhandled by the start of a second turn. The default handler is to write the stack trace to `stderr` or `console.error` in browsers. This is close to what happens with synchronous code - your code doesn't work as expected and you open console and see a stack trace. Nice.
-
-Of course this is not perfect, if your code for some reason needs to swoop in and attach error handler to some promise after the promise has been hanging around a while then you will see annoying messages. In that case you can use the `.done()` method to signal that any hanging exceptions should be thrown.
-
-If you want to override the default handler for these possibly unhandled rejections, you can pass yours like so:
-
-```js
-Promise.onPossiblyUnhandledRejection(function(error){
-    throw error;
-});
-```
-
-If you want to also enable long stack traces, call:
-
-```js
-Promise.longStackTraces();
-```
-
-right after the library is loaded.
-
-In node.js use the environment flag `BLUEBIRD_DEBUG`:
-
-```
-BLUEBIRD_DEBUG=1 node server.js
-```
-
-to enable long stack traces in all instances of bluebird.
-
-Long stack traces cannot be disabled after being enabled, and cannot be enabled after promises have already been created. Long stack traces imply a substantial performance penalty, even after using every trick to optimize them.
-
-Long stack traces are enabled by default in the debug build.
-
-#### Expected and unexpected errors
-
-A practical problem with Promises/A+ is that it models Javascript `try-catch` too closely for its own good. Therefore by default promises inherit `try-catch` warts such as the inability to specify the error types that the catch block is eligible for. It is an anti-pattern in every other language to use catch-all handlers because they swallow exceptions that you might not know about.
-
-Now, Javascript does have a perfectly fine and working way of creating error type hierarchies. It is still quite awkward to use them with the built-in `try-catch` however:
-
-```js
-try {
-    //code
-}
-catch(e) {
-    if( e instanceof WhatIWantError) {
-        //handle
-    }
-    else {
-        throw e;
-    }
-}
-```
-
-Without such checking, unexpected errors would be silently swallowed. However, with promises, bluebird brings the future (hopefully) here now and extends the `.catch` to [accept potential error type eligibility](API.md#catchfunction-errorclass-function-handler---promise).
-
-For instance here it is expected that some evil or incompetent entity will try to crash our server from `SyntaxError` by providing syntactically invalid JSON:
-
-```js
-getJSONFromSomewhere().then(function(jsonString) {
-    return JSON.parse(jsonString);
-}).then(function(object) {
-    console.log("it was valid json: ", object);
-}).catch(SyntaxError, function(e){
-    console.log("don't be evil");
-});
-```
-
-Here any kind of unexpected error will be automatically reported on `stderr` along with a stack trace because we only register a handler for the expected `SyntaxError`.
-
-Ok, so, that's pretty neat. But actually not many libraries define error types and it is in fact a complete ghetto out there with ad hoc strings being attached as some arbitrary property name like `.name`, `.type`, `.code`, not having any property at all or even throwing strings as errors and so on. So how can we still listen for expected errors?
-
-Bluebird defines a special error type `OperationalError` (you can get a reference from `Promise.OperationalError`). This type of error is given as rejection reason by promisified methods when
-their underlying library gives an untyped, but expected error. Primitives such as strings, and error objects that are directly created like `new Error("database didn't respond")` are considered untyped.
-
-Example of such library is the node core library `fs`. So if we promisify it, we can catch just the errors we want pretty easily and have programmer errors be redirected to unhandled rejection handler so that we notice them:
-
-```js
-//Read more about promisification in the API Reference:
-//API.md
-var fs = Promise.promisifyAll(require("fs"));
-
-fs.readFileAsync("myfile.json").then(JSON.parse).then(function (json) {
-    console.log("Successful json");
-}).catch(SyntaxError, function (e) {
-    console.error("file contains invalid json");
-}).catch(Promise.OperationalError, function (e) {
-    console.error("unable to read file, because: ", e.message);
-});
-```
-
-The last `catch` handler is only invoked when the `fs` module explicitly used the `err` argument convention of async callbacks to inform of an expected error. The `OperationalError` instance will contain the original error in its `.cause` property but it does have a direct copy of the `.message` and `.stack` too. In this code any unexpected error - be it in our code or the `fs` module - would not be caught by these handlers and therefore not swallowed.
-
-Since a `catch` handler typed to `Promise.OperationalError` is expected to be used very often, it has a neat shorthand:
-
-```js
-.error(function (e) {
-    console.error("unable to read file, because: ", e.message);
-});
-```
-
-See [API documentation for `.error()`](API.md#error-rejectedhandler----promise)
-
-Finally, Bluebird also supports predicate-based filters. If you pass a
-predicate function instead of an error type, the predicate will receive
-the error as an argument. The return result will be used to determine whether
-the error handler should be called.
-
-Predicates should allow for very fine grained control over caught errors:
-pattern matching, error typesets with set operations and many other techniques
-can be implemented on top of them.
-
-Example of using a predicate-based filter:
-
-```js
-var Promise = require("bluebird");
-var request = Promise.promisify(require("request"));
-
-function clientError(e) {
-    return e.code >= 400 && e.code < 500;
-}
-
-request("http://www.google.com").then(function(contents){
-    console.log(contents);
-}).catch(clientError, function(e){
-   //A client error like 400 Bad Request happened
-});
-```
-
-**Danger:** The JavaScript language allows throwing primitive values like strings. Throwing primitives can lead to worse or no stack traces. Primitives [are not exceptions](http://www.devthought.com/2011/12/22/a-string-is-not-an-error/). You should consider always throwing Error objects when handling exceptions.
-
-<hr>
-
-#### How do long stack traces differ from e.g. Q?
-
-Bluebird attempts to have more elaborate traces. Consider:
-
-```js
-Error.stackTraceLimit = 25;
-Q.longStackSupport = true;
-Q().then(function outer() {
-    return Q().then(function inner() {
-        return Q().then(function evenMoreInner() {
-            a.b.c.d();
-        }).catch(function catcher(e){
-            console.error(e.stack);
-        });
-    })
-});
-```
-
-You will see
-
-    ReferenceError: a is not defined
-        at evenMoreInner (<anonymous>:7:13)
-    From previous event:
-        at inner (<anonymous>:6:20)
-
-Compare to:
-
-```js
-Error.stackTraceLimit = 25;
-Promise.longStackTraces();
-Promise.resolve().then(function outer() {
-    return Promise.resolve().then(function inner() {
-        return Promise.resolve().then(function evenMoreInner() {
-            a.b.c.d();
-        }).catch(function catcher(e){
-            console.error(e.stack);
-        });
-    });
-});
-```
-
-    ReferenceError: a is not defined
-        at evenMoreInner (<anonymous>:7:13)
-    From previous event:
-        at inner (<anonymous>:6:36)
-    From previous event:
-        at outer (<anonymous>:5:32)
-    From previous event:
-        at <anonymous>:4:21
-        at Object.InjectedScript._evaluateOn (<anonymous>:572:39)
-        at Object.InjectedScript._evaluateAndWrap (<anonymous>:531:52)
-        at Object.InjectedScript.evaluate (<anonymous>:450:21)
-
-
-A better and more practical example of the differences can be seen in gorgikosev's [debuggability competition](https://github.com/spion/async-compare#debuggability).
-
-<hr>
-
-# Development
-
-For development tasks such as running benchmarks or testing, you need to clone the repository and install dev-dependencies.
-
-Install [node](http://nodejs.org/) and [npm](https://npmjs.org/)
-
-    git clone git@github.com:petkaantonov/bluebird.git
-    cd bluebird
-    npm install
-
-## Testing
-
-To run all tests, run
-
-    node tools/test
-
-If you need to run generator tests run the `tool/test.js` script with `--harmony` argument and node 0.11+:
-
-    node-dev --harmony tools/test
-
-You may specify an individual test file to run with the `--run` script flag:
-
-    node tools/test --run=cancel.js
-
-
-This enables output from the test and may give a better idea where the test is failing. The paramter to `--run` can be any file name located in `test/mocha` folder.
-
-#### Testing in browsers
-
-To run the test in a browser instead of node, pass the flag `--browser` to the test tool
-
-    node tools/test --run=cancel.js --browser
-
-This will automatically create a server (default port 9999) and open it in your default browser once the tests have been compiled.
-
-Keep the test tab active because some tests are timing-sensitive and will fail if the browser is throttling timeouts. Chrome will do this for example when the tab is not active.
-
-#### Supported options by the test tool
-
-The value of boolean flags is determined by presence, if you want to pass false value for a boolean flag, use the `no-`-prefix e.g. `--no-browser`.
-
- - `--run=String` - Which tests to run (or compile when testing in browser). Default `"all"`. Can also be a glob string (relative to ./test/mocha folder).
- - `--cover=String`. Create code coverage using the String as istanbul reporter. Coverage is created in the ./coverage folder. No coverage is created by default, default reporter is `"html"` (use `--cover` to use default reporter).
- - `--browser` - Whether to compile tests for browsers. Default `false`.
- - `--port=Number` - Port where local server is hosted when testing in browser. Default `9999`
- - `--execute-browser-tests` - Whether to execute the compiled tests for browser when using `--browser`. Default `true`.
- - `--open-browser` - Whether to open the default browser when executing browser tests. Default `true`.
- - `--fake-timers` - Whether to use fake timers (`setTimeout` etc) when running tests in node. Default `true`.
- - `--js-hint` - Whether to run JSHint on source files. Default `true`.
- - `--saucelabs` - Whether to create a tunnel to sauce labs and run tests in their VMs instead of your browser when compiling tests for browser. Default `false`.
-
-## Benchmarks
-
-To run a benchmark, run the given command for a benchmark while on the project root. Requires bash (on windows the mingw32 that comes with git works fine too).
-
-Node 0.11.2+ is required to run the generator examples.
-
-### 1\. DoxBee sequential
-
-Currently the most relevant benchmark is @gorkikosev's benchmark in the article [Analysis of generators and other async patterns in node](http://spion.github.io/posts/analysis-generators-and-other-async-patterns-node.html). The benchmark emulates a situation where n amount of users are making a request in parallel to execute some mixed async/sync action. The benchmark has been modified to include a warm-up phase to minimize any JITing during timed sections.
-
-Command: `bench doxbee`
-
-### 2\. Made-up parallel
-
-This made-up scenario runs 15 shimmed queries in parallel.
-
-Command: `bench parallel`
-
-## Custom builds
-
-Custom builds for browsers are supported through a command-line utility.
-
-
-<table>
-    <caption>The following features can be disabled</caption>
-    <thead>
-        <tr>
-            <th>Feature(s)</th>
-            <th>Command line identifier</th>
-        </tr>
-    </thead>
-    <tbody>
-
-        <tr><td><a href="API.md#any---promise"><code>.any</code></a> and <a href="API.md#promiseanyarraydynamicpromise-values---promise"><code>Promise.any</code></a></td><td><code>any</code></td></tr>
-        <tr><td><a href="API.md#race---promise"><code>.race</code></a> and <a href="API.md#promiseracearraypromise-promises---promise"><code>Promise.race</code></a></td><td><code>race</code></td></tr>
-        <tr><td><a href="API.md#callstring-propertyname--dynamic-arg---promise"><code>.call</code></a> and <a href="API.md#getstring-propertyname---promise"><code>.get</code></a></td><td><code>call_get</code></td></tr>
-        <tr><td><a href="API.md#filterfunction-filterer---promise"><code>.filter</code></a> and <a href="API.md#promisefilterarraydynamicpromise-values-function-filterer---promise"><code>Promise.filter</code></a></td><td><code>filter</code></td></tr>
-        <tr><td><a href="API.md#mapfunction-mapper---promise"><code>.map</code></a> and <a href="API.md#promisemaparraydynamicpromise-values-function-mapper---promise"><code>Promise.map</code></a></td><td><code>map</code></td></tr>
-        <tr><td><a href="API.md#reducefunction-reducer--dynamic-initialvalue---promise"><code>.reduce</code></a> and <a href="API.md#promisereducearraydynamicpromise-values-function-reducer--dynamic-initialvalue---promise"><code>Promise.reduce</code></a></td><td><code>reduce</code></td></tr>
-        <tr><td><a href="API.md#props---promise"><code>.props</code></a> and <a href="API.md#promisepropsobjectpromise-object---promise"><code>Promise.props</code></a></td><td><code>props</code></td></tr>
-        <tr><td><a href="API.md#settle---promise"><code>.settle</code></a> and <a href="API.md#promisesettlearraydynamicpromise-values---promise"><code>Promise.settle</code></a></td><td><code>settle</code></td></tr>
-        <tr><td><a href="API.md#someint-count---promise"><code>.some</code></a> and <a href="API.md#promisesomearraydynamicpromise-values-int-count---promise"><code>Promise.some</code></a></td><td><code>some</code></td></tr>
-        <tr><td><a href="API.md#nodeifyfunction-callback---promise"><code>.nodeify</code></a></td><td><code>nodeify</code></td></tr>
-        <tr><td><a href="API.md#promisecoroutinegeneratorfunction-generatorfunction---function"><code>Promise.coroutine</code></a> and <a href="API.md#promisespawngeneratorfunction-generatorfunction---promise"><code>Promise.spawn</code></a></td><td><code>generators</code></td></tr>
-        <tr><td><a href="API.md#progression">Progression</a></td><td><code>progress</code></td></tr>
-        <tr><td><a href="API.md#promisification">Promisification</a></td><td><code>promisify</code></td></tr>
-        <tr><td><a href="API.md#cancellation">Cancellation</a></td><td><code>cancel</code></td></tr>
-        <tr><td><a href="API.md#timers">Timers</a></td><td><code>timers</code></td></tr>
-        <tr><td><a href="API.md#resource-management">Resource management</a></td><td><code>using</code></td></tr>
-
-    </tbody>
-</table>
-
-
-Make sure you have cloned the repo somewhere and did `npm install` successfully.
-
-After that you can run:
-
-    node tools/build --features="core"
-
-
-The above builds the most minimal build you can get. You can add more features separated by spaces from the above list:
-
-    node tools/build --features="core filter map reduce"
-
-The custom build file will be found from `/js/browser/bluebird.js`. It will have a comment that lists the disabled and enabled features.
-
-Note that the build leaves the `/js/main` etc folders with same features so if you use the folder for node.js at the same time, don't forget to build
-a full version afterwards (after having taken a copy of the bluebird.js somewhere):
-
-    node tools/build --debug --main --zalgo --browser --minify
-
-#### Supported options by the build tool
-
-The value of boolean flags is determined by presence, if you want to pass false value for a boolean flag, use the `no-`-prefix e.g. `--no-debug`.
-
- - `--main` - Whether to build the main build. The main build is placed at `js/main` directory. Default `false`.
- - `--debug` - Whether to build the debug build. The debug build is placed at `js/debug` directory. Default `false`.
- - `--zalgo` - Whether to build the zalgo build. The zalgo build is placed at `js/zalgo` directory. Default `false`.
- - `--browser` - Whether to compile the browser build. The browser build file is placed at `js/browser/bluebird.js` Default `false`.
- - `--minify` - Whether to minify the compiled browser build. The minified browser build file is placed at `js/browser/bluebird.min.js` Default `true`.
- - `--features=String` - See [custom builds](#custom-builds)
-
-<hr>
-
-## For library authors
-
-Building a library that depends on bluebird? You should know about a few features.
-
-If your library needs to do something obtrusive like adding or modifying methods on the `Promise` prototype, uses long stack traces or uses a custom unhandled rejection handler then... that's totally ok as long as you don't use `require("bluebird")`. Instead you should create a file
-that creates an isolated copy. For example, creating a file called `bluebird-extended.js` that contains:
-
-```js
-                //NOTE the function call right after
-module.exports = require("bluebird/js/main/promise")();
-```
-
-Your library can then use `var Promise = require("bluebird-extended");` and do whatever it wants with it. Then if the application or other library uses their own bluebird promises they will all play well together because of Promises/A+ thenable assimilation magic.
-
-You should also know about [`.nodeify()`](API.md#nodeifyfunction-callback---promise) which makes it easy to provide a dual callback/promise API.
-
-<hr>
-
-## What is the sync build?
-
-You may now use sync build by:
-
-    var Promise = require("bluebird/zalgo");
-
-The sync build is provided to see how forced asynchronity affects benchmarks. It should not be used in real code due to the implied hazards.
-
-The normal async build gives Promises/A+ guarantees about asynchronous resolution of promises. Some people think this affects performance or just plain love their code having a possibility
-of stack overflow errors and non-deterministic behavior.
-
-The sync build skips the async call trampoline completely, e.g code like:
-
-    async.invoke( this.fn, this, val );
-
-Appears as this in the sync build:
-
-    this.fn(val);
-
-This should pressure the CPU slightly less and thus the sync build should perform better. Indeed it does, but only marginally. The biggest performance boosts are from writing efficient Javascript, not from compromising determinism.
-
-Note that while some benchmarks are waiting for the next event tick, the CPU is actually not in use during that time. So the resulting benchmark result is not completely accurate because on node.js you only care about how much the CPU is taxed. Any time spent on CPU is time the whole process (or server) is paralyzed. And it is not graceful like it would be with threads.
-
-
-```js
-var cache = new Map(); //ES6 Map or DataStructures/Map or whatever...
-function getResult(url) {
-    var resolver = Promise.pending();
-    if (cache.has(url)) {
-        resolver.resolve(cache.get(url));
-    }
-    else {
-        http.get(url, function(err, content) {
-            if (err) resolver.reject(err);
-            else {
-                cache.set(url, content);
-                resolver.resolve(content);
-            }
-        });
-    }
-    return resolver.promise;
-}
-
-
-
-//The result of console.log is truly random without async guarantees
-function guessWhatItPrints( url ) {
-    var i = 3;
-    getResult(url).then(function(){
-        i = 4;
-    });
-    console.log(i);
-}
-```
-
-# Optimization guide
-
-Articles about optimization will be periodically posted in [the wiki section](https://github.com/petkaantonov/bluebird/wiki), polishing edits are welcome.
-
-A single cohesive guide compiled from the articles will probably be done eventually.
-
-# License
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Petka Antonov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/deps/npm/node_modules/bluebird/changelog.md b/deps/npm/node_modules/bluebird/changelog.md
deleted file mode 100644
index f300fe9f0c41f1..00000000000000
--- a/deps/npm/node_modules/bluebird/changelog.md
+++ /dev/null
@@ -1,1717 +0,0 @@
-## 2.10.1 (2015-09-21)
-
- - Fix error "Cannot promisify an API that has normal methods with 'Async'-suffix" when promisifying certain objects with a custom promisifier
-
-## 2.10.0 (2015-09-08)
-
-Features:
-
- - `Promise.using` can now take the promises-for-resources as an array ([#733](.)).
- - Browser builds for minimal core are now hosted on CDN ([#724](.)).
-
-Bugfixes:
-
- - Disabling debug mode with `BLUEBIRD_DEBUG=0` environment variable now works ([#719](.)).
- - Fix unhandled rejection reporting when passing rejected promise to `.return()` ([#721](.)).
- - Fix unbound promise's then handlers being called with wrong `this` value ([#738](.)).
-
-## 2.9.34 (2015-07-15)
-
-Bugfixes:
-
--  Correct domain for .map, .each, .filter, .reduce callbacks ([#701](.)).
- - Preserve bound-with-promise promises across the entire chain ([#702](.)).
-
-## 2.9.33 (2015-07-09)
-
-Bugfixes:
-
- - Methods on `Function.prototype` are no longer promisified ([#680](.)).
-
-## 2.9.32 (2015-07-03)
-
-Bugfixes:
-
- - Fix `.return(primitiveValue)` returning a wrapped version of the primitive value when a Node.js domain is active ([#689](.)).
-
-## 2.9.31 (2015-07-03)
-
-Bugfixes:
-
- - Fix Promises/A+ compliance issue regarding circular thenables: the correct behavior is to go into an infinite loop instead of warning with an error (Fixes [#682](.)).
- - Fix "(node) warning: possible EventEmitter memory leak detected" ([#661](.)).
- - Fix callbacks sometimes being called with a wrong node.js domain ([#664](.)).
- - Fix callbacks sometimes not being called at all in iOS 8.1 WebApp mode ([#666](.), [#687](.)).
-
-## 2.9.30 (2015-06-14)
-
-Bugfixes:
-
- - Fix regression with `promisifyAll` not promisifying certain methods
-
-## 2.9.29 (2015-06-14)
-
-Bugfixes:
-
- - Improve `promisifyAll` detection of functions that are class constructors. Fixes mongodb 2.x promisification.
-
-## 2.9.28 (2015-06-14)
-
-Bugfixes:
-
- - Fix handled rejection being reported as unhandled in certain scenarios when using [.all](.) or [Promise.join](.) ([#645](.))
- - Fix custom scheduler not being called in Google Chrome when long stack traces are enabled ([#650](.))
-
-## 2.9.27 (2015-05-30)
-
-Bugfixes:
-
- - Fix `sinon.useFakeTimers()` breaking scheduler ([#631](.))
-
-Misc:
-
- - Add nw testing facilities (`node tools/test --nw`)
-
-## 2.9.26 (2015-05-25)
-
-Bugfixes:
-
- - Fix crash in NW [#624](.)
- - Fix [`.return()`](.) not supporting `undefined` as return value [#627](.)
-
-## 2.9.25 (2015-04-28)
-
-Bugfixes:
-
- - Fix crash in node 0.8
-
-## 2.9.24 (2015-04-02)
-
-Bugfixes:
-
- - Fix not being able to load multiple bluebird copies introduced in 2.9.22 ([#559](.), [#561](.), [#560](.)).
-
-## 2.9.23 (2015-04-02)
-
-Bugfixes:
-
- - Fix node.js domain propagation ([#521](.)).
-
-## 2.9.22 (2015-04-02)
-
- - Fix `.promisify` crashing in phantom JS ([#556](.))
-
-## 2.9.21 (2015-03-30)
-
- - Fix error object's `'stack'`' overwriting causing an error when its defined to be a setter that throws an error ([#552](.)).
-
-## 2.9.20 (2015-03-29)
-
-Bugfixes:
-
- - Fix regression where there is a long delay between calling `.cancel()` and promise actually getting cancelled in Chrome when long stack traces are enabled
-
-## 2.9.19 (2015-03-29)
-
-Bugfixes:
-
- - Fix crashing in Chrome when long stack traces are disabled
-
-## 2.9.18 (2015-03-29)
-
-Bugfixes:
-
- - Fix settlePromises using trampoline
-
-## 2.9.17 (2015-03-29)
-
-
-Bugfixes:
-
- - Fix Chrome DevTools async stack traceability ([#542](.)).
-
-## 2.9.16 (2015-03-28)
-
-Features:
-
- - Use setImmediate if available
-
-## 2.9.15 (2015-03-26)
-
-Features:
-
- - Added `.asCallback` alias for `.nodeify`.
-
-Bugfixes:
-
- - Don't always use nextTick, but try to pick up setImmediate or setTimeout in NW. Fixes [#534](.), [#525](.)
- - Make progress a core feature. Fixes [#535](.) Note that progress has been removed in 3.x - this is only a fix necessary for 2.x custom builds.
-
-## 2.9.14 (2015-03-12)
-
-Bugfixes:
-
- - Always use process.nextTick. Fixes [#525](.)
-
-## 2.9.13 (2015-02-27)
-
-Bugfixes:
-
- - Fix .each, .filter, .reduce and .map callbacks being called synchornously if the input is immediate. ([#513](.))
-
-## 2.9.12 (2015-02-19)
-
-Bugfixes:
-
- - Fix memory leak introduced in 2.9.0 ([#502](.))
-
-## 2.9.11 (2015-02-19)
-
-Bugfixes:
-
- - Fix [#503](.)
-
-## 2.9.10 (2015-02-18)
-
-Bugfixes:
-
- - Fix [#501](.)
-
-## 2.9.9 (2015-02-12)
-
-Bugfixes:
-
- - Fix `TypeError: Cannot assign to read only property 'length'` when jsdom has declared a read-only length for all objects to inherit.
-
-## 2.9.8 (2015-02-10)
-
-Bugfixes:
-
- - Fix regression introduced in 2.9.7 where promisify didn't properly dynamically look up methods on `this`
-
-## 2.9.7 (2015-02-08)
-
-Bugfixes:
-
- - Fix `promisify` not retaining custom properties of the function. This enables promisifying the `"request"` module's export function and its methods at the same time.
- - Fix `promisifyAll` methods being dependent on `this` when they are not originally dependent on `this`. This enables e.g. passing promisified `fs` functions directly as callbacks without having to bind them to `fs`.
- - Fix `process.nextTick` being used over `setImmediate` in node.
-
-## 2.9.6 (2015-02-02)
-
-Bugfixes:
-
- - Node environment detection can no longer be fooled
-
-## 2.9.5 (2015-02-02)
-
-Misc:
-
- - Warn when [`.then()`](.) is passed non-functions
-
-## 2.9.4 (2015-01-30)
-
-Bugfixes:
-
- - Fix [.timeout()](.) not calling `clearTimeout` with the proper handle in node causing the process to wait for unneeded timeout. This was a regression introduced in 2.9.1.
-
-## 2.9.3 (2015-01-27)
-
-Bugfixes:
-
- - Fix node-webkit compatibility issue ([#467](https://github.com/petkaantonov/bluebird/pull/467))
- - Fix long stack trace support in recent firefox versions
-
-## 2.9.2 (2015-01-26)
-
-Bugfixes:
-
- - Fix critical bug regarding to using promisifyAll in browser that was introduced in 2.9.0 ([#466](https://github.com/petkaantonov/bluebird/issues/466)).
-
-Misc:
-
- - Add `"browser"` entry point to package.json
-
-## 2.9.1 (2015-01-24)
-
-Features:
-
- - If a bound promise is returned by the callback to [`Promise.method`](#promisemethodfunction-fn---function) and [`Promise.try`](#promisetryfunction-fn--arraydynamicdynamic-arguments--dynamic-ctx----promise), the returned promise will be bound to the same value
-
-## 2.9.0 (2015-01-24)
-
-Features:
-
- - Add [`Promise.fromNode`](API.md#promisefromnodefunction-resolver---promise)
- - Add new paramter `value` for [`Promise.bind`](API.md#promisebinddynamic-thisarg--dynamic-value---promise)
-
-Bugfixes:
-
- - Fix several issues with [`cancellation`](API.md#cancellation) and [`.bind()`](API.md#binddynamic-thisarg---promise) interoperation when `thisArg` is a promise or thenable
- - Fix promises created in [`disposers`](API#disposerfunction-disposer---disposer) not having proper long stack trace context
- - Fix [`Promise.join`](API.md#promisejoinpromisethenablevalue-promises-function-handler---promise) sometimes passing the passed in callback function as the last argument to itself.
-
-Misc:
-
- - Reduce minified full browser build file size by not including unused code generation functionality.
- - Major internal refactoring related to testing code and source code file layout
-
-## 2.8.2 (2015-01-20)
-
-Features:
-
- - [Global rejection events](https://github.com/petkaantonov/bluebird/blob/master/API.md#global-rejection-events) are now fired both as DOM3 events and as legacy events in browsers
-
-## 2.8.1 (2015-01-20)
-
-Bugfixes:
-
- - Fix long stack trace stiching consistency when rejected from thenables
-
-## 2.8.0 (2015-01-19)
-
-Features:
-
- - Major debuggability improvements:
-    - Long stack traces have been re-designed. They are now much more readable,
-      succint, relevant and consistent across bluebird features.
-    - Long stack traces are supported now in IE10+
-
-## 2.7.1 (2015-01-15)
-
-Bugfixes:
-
- - Fix [#447](https://github.com/petkaantonov/bluebird/issues/447)
-
-## 2.7.0 (2015-01-15)
-
-Features:
-
- - Added more context to stack traces originating from coroutines ([#421](https://github.com/petkaantonov/bluebird/issues/421))
- - Implemented [global rejection events](https://github.com/petkaantonov/bluebird/blob/master/API.md#global-rejection-events) ([#428](https://github.com/petkaantonov/bluebird/issues/428), [#357](https://github.com/petkaantonov/bluebird/issues/357))
- - [Custom promisifiers](https://github.com/petkaantonov/bluebird/blob/master/API.md#option-promisifier) are now passed the default promisifier which can be used to add enhancements on top of normal node promisification
- - [Promisification filters](https://github.com/petkaantonov/bluebird/blob/master/API.md#option-filter) are now passed `passesDefaultFilter` boolean
-
-Bugfixes:
-
- - Fix `.noConflict()` call signature ([#446]())
- - Fix `Promise.method`ified functions being called with `undefined` when they were called with no arguments
-
-## 2.6.4 (2015-01-12)
-
-Bugfixes:
-
- - `OperationalErrors` thrown by promisified functions retain custom properties, such as `.code` and `.path`.
-
-## 2.6.3 (2015-01-12)
-
-Bugfixes:
-
- - Fix [#429](https://github.com/petkaantonov/bluebird/issues/429)
- - Fix [#432](https://github.com/petkaantonov/bluebird/issues/432)
- - Fix [#433](https://github.com/petkaantonov/bluebird/issues/433)
-
-## 2.6.2 (2015-01-07)
-
-Bugfixes:
-
- - Fix [#426](https://github.com/petkaantonov/bluebird/issues/426)
-
-## 2.6.1 (2015-01-07)
-
-Bugfixes:
-
- - Fixed built browser files not being included in the git tag release for bower
-
-## 2.6.0 (2015-01-06)
-
-Features:
-
- - Significantly improve parallel promise performance and memory usage (+50% faster, -50% less memory)
-
-
-## 2.5.3 (2014-12-30)
-
-## 2.5.2 (2014-12-29)
-
-Bugfixes:
-
- - Fix bug where already resolved promise gets attached more handlers while calling its handlers resulting in some handlers not being called
- - Fix bug where then handlers are not called in the same order as they would run if Promises/A+ 2.3.2 was implemented as adoption
- - Fix bug where using `Object.create(null)` as a rejection reason would crash bluebird
-
-## 2.5.1 (2014-12-29)
-
-Bugfixes:
-
- - Fix `.finally` throwing null error when it is derived from a promise that is resolved with a promise that is resolved with a promise
-
-## 2.5.0 (2014-12-28)
-
-Features:
-
- - [`.get`](#API.md#https://github.com/petkaantonov/bluebird/blob/master/API.md#getstring-propertyname---promise) now supports negative indexing.
-
-Bugfixes:
-
- - Fix bug with `Promise.method` wrapped function returning a promise that never resolves if the function returns a promise that is resolved with another promise
- - Fix bug with `Promise.delay` never resolving if the value is a promise that is resolved with another promise
-
-## 2.4.3 (2014-12-28)
-
-Bugfixes:
-
- - Fix memory leak as described in [this Promises/A+ spec issue](https://github.com/promises-aplus/promises-spec/issues/179).
-
-## 2.4.2 (2014-12-21)
-
-Bugfixes:
-
- - Fix bug where spread rejected handler is ignored in case of rejection
- - Fix synchronous scheduler passed to `setScheduler` causing infinite loop
-
-## 2.4.1 (2014-12-20)
-
-Features:
-
- - Error messages now have links to wiki pages for additional information
- - Promises now clean up all references (to handlers, child promises etc) as soon as possible.
-
-## 2.4.0 (2014-12-18)
-
-Features:
-
- - Better filtering of bluebird internal calls in long stack traces, especially when using minified file in browsers
- - Small performance improvements for all collection methods
- - Promises now delete references to handlers attached to them as soon as possible
- - Additional stack traces are now output on stderr/`console.warn` for errors that are thrown in the process/window from rejected `.done()` promises. See [#411](https://github.com/petkaantonov/bluebird/issues/411)
-
-## 2.3.11 (2014-10-31)
-
-Bugfixes:
-
- - Fix [#371](https://github.com/petkaantonov/bluebird/issues/371), [#373](https://github.com/petkaantonov/bluebird/issues/373)
-
-
-## 2.3.10 (2014-10-28)
-
-Features:
-
- - `Promise.method` no longer wraps primitive errors
- - `Promise.try` no longer wraps primitive errors
-
-## 2.3.7 (2014-10-25)
-
-Bugfixes:
-
- - Fix [#359](https://github.com/petkaantonov/bluebird/issues/359), [#362](https://github.com/petkaantonov/bluebird/issues/362) and [#364](https://github.com/petkaantonov/bluebird/issues/364)
-
-## 2.3.6 (2014-10-15)
-
-Features:
-
- - Implement [`.reflect()`](API.md#reflect---promisepromiseinspection)
-
-## 2.3.5 (2014-10-06)
-
-Bugfixes:
-
- - Fix issue when promisifying methods whose names contain the string 'args'
-
-## 2.3.4 (2014-09-27)
-
- - `P` alias was not declared inside WebWorkers
-
-## 2.3.3 (2014-09-27)
-
-Bugfixes:
-
- - Fix [#318](https://github.com/petkaantonov/bluebird/issues/318), [#314](https://github.com/petkaantonov/bluebird/issues/#314)
-
-## 2.3.2 (2014-08-25)
-
-Bugfixes:
-
- - `P` alias for `Promise` now exists in global scope when using browser builds without a module loader, fixing an issue with firefox extensions
-
-## 2.3.1 (2014-08-23)
-
-Features:
-
- - `.using` can now be used with disposers created from different bluebird copy
-
-## 2.3.0 (2014-08-13)
-
-Features:
-
- - [`.bind()`](API.md#binddynamic-thisarg---promise) and [`Promise.bind()`](API.md#promisebinddynamic-thisarg---promise) now await for the resolution of the `thisArg` if it's a promise or a thenable
-
-Bugfixes:
-
- - Fix [#276](https://github.com/petkaantonov/bluebird/issues/276)
-
-## 2.2.2 (2014-07-14)
-
- - Fix [#259](https://github.com/petkaantonov/bluebird/issues/259)
-
-## 2.2.1 (2014-07-07)
-
- - Fix multiline error messages only showing the first line
-
-## 2.2.0 (2014-07-07)
-
-Bugfixes:
-
- - `.any` and `.some` now consistently reject with RangeError when input array contains too few promises
- - Fix iteration bug with `.reduce` when input array contains already fulfilled promises
-
-## 2.1.3 (2014-06-18)
-
-Bugfixes:
-
- - Fix [#235](https://github.com/petkaantonov/bluebird/issues/235)
-
-## 2.1.2 (2014-06-15)
-
-Bugfixes:
-
- - Fix [#232](https://github.com/petkaantonov/bluebird/issues/232)
-
-## 2.1.1 (2014-06-11)
-
-## 2.1.0 (2014-06-11)
-
-Features:
-
- - Add [`promisifier`](API.md#option-promisifier) option to `Promise.promisifyAll()`
- - Improve performance of `.props()` and collection methods when used with immediate values
-
-
-Bugfixes:
-
- - Fix a bug where .reduce calls the callback for an already visited item
- - Fix a bug where stack trace limit is calculated to be too small, which resulted in too short stack traces
-
-<sub>Add undocumented experimental `yieldHandler` option to `Promise.coroutine`</sub>
-
-## 2.0.7 (2014-06-08)
-## 2.0.6 (2014-06-07)
-## 2.0.5 (2014-06-05)
-## 2.0.4 (2014-06-05)
-## 2.0.3 (2014-06-05)
-## 2.0.2 (2014-06-04)
-## 2.0.1 (2014-06-04)
-
-## 2.0.0 (2014-06-04)
-
-#What's new in 2.0
-
-- [Resource management](API.md#resource-management) - never leak resources again
-- [Promisification](API.md#promisification) on steroids - entire modules can now be promisified with one line of code
-- [`.map()`](API.md#mapfunction-mapper--object-options---promise), [`.each()`](API.md#eachfunction-iterator---promise), [`.filter()`](API.md#filterfunction-filterer--object-options---promise), [`.reduce()`](API.md#reducefunction-reducer--dynamic-initialvalue---promise) reimagined from simple sugar to powerful concurrency coordination tools
-- [API Documentation](API.md) has been reorganized and more elaborate examples added
-- Deprecated [progression](#progression-migration) and [deferreds](#deferred-migration)
-- Improved performance and readability
-
-Features:
-
-- Added [`using()`](API.md#promiseusingpromisedisposer-promise-promisedisposer-promise--function-handler---promise) and [`disposer()`](API.md#disposerfunction-disposer---disposer)
-- [`.map()`](API.md#mapfunction-mapper--object-options---promise) now calls the handler as soon as items in the input array become fulfilled
-- Added a concurrency option to [`.map()`](API.md#mapfunction-mapper--object-options---promise)
-- [`.filter()`](API.md#filterfunction-filterer--object-options---promise) now calls the handler as soon as items in the input array become fulfilled
-- Added a concurrency option to [`.filter()`](API.md#filterfunction-filterer--object-options---promise)
-- [`.reduce()`](API.md#reducefunction-reducer--dynamic-initialvalue---promise) now calls the handler as soon as items in the input array become fulfilled, but in-order
-- Added [`.each()`](API.md#eachfunction-iterator---promise)
-- [`Promise.resolve()`](API.md#promiseresolvedynamic-value---promise) behaves like `Promise.cast`. `Promise.cast` deprecated.
-- [Synchronous inspection](API.md#synchronous-inspection): Removed `.inspect()`, added [`.value()`](API.md#value---dynamic) and [`.reason()`](API.md#reason---dynamic)
-- [`Promise.join()`](API.md#promisejoinpromisethenablevalue-promises-function-handler---promise) now takes a function as the last argument
-- Added [`Promise.setScheduler()`](API.md#promisesetschedulerfunction-scheduler---void)
-- [`.cancel()`](API.md#cancelerror-reason---promise) supports a custom cancellation reason
-- [`.timeout()`](API.md#timeoutint-ms--string-message---promise) now cancels the promise instead of rejecting it
-- [`.nodeify()`](API.md#nodeifyfunction-callback--object-options---promise) now supports passing multiple success results when mapping promises to nodebacks
-- Added `suffix` and `filter` options to [`Promise.promisifyAll()`](API.md#promisepromisifyallobject-target--object-options---object)
-
-Breaking changes:
-
-- Sparse array holes are not skipped by collection methods but treated as existing elements with `undefined` value
-- `.map()` and `.filter()` do not call the given mapper or filterer function in any specific order
-- Removed the `.inspect()` method
-- Yielding an array from a coroutine is not supported by default. You can use [`coroutine.addYieldHandler()`](API.md#promisecoroutineaddyieldhandlerfunction-handler---void) to configure the old behavior (or any behavior you want).
-- [`.any()`](API.md#any---promise) and [`.some()`](API.md#someint-count---promise) no longer use an array as the rejection reason. [`AggregateError`](API.md#aggregateerror) is used instead.
-
-
-## 1.2.4 (2014-04-27)
-
-Bugfixes:
-
- - Fix promisifyAll causing a syntax error when a method name is not a valid identifier
- - Fix syntax error when es5.js is used in strict mode
-
-## 1.2.3 (2014-04-17)
-
-Bugfixes:
-
- - Fix [#179](https://github.com/petkaantonov/bluebird/issues/179)
-
-## 1.2.2 (2014-04-09)
-
-Bugfixes:
-
- - Promisified methods from promisifyAll no longer call the original method when it is overriden
- - Nodeify doesn't pass second argument to the callback if the promise is fulfilled with `undefined`
-
-## 1.2.1 (2014-03-31)
-
-Bugfixes:
-
- - Fix [#168](https://github.com/petkaantonov/bluebird/issues/168)
-
-## 1.2.0 (2014-03-29)
-
-Features:
-
- - New method: [`.value()`](https://github.com/petkaantonov/bluebird/blob/master/API.md#value---dynamic)
- - New method: [`.reason()`](https://github.com/petkaantonov/bluebird/blob/master/API.md#reason---dynamic)
- - New method: [`Promise.onUnhandledRejectionHandled()`](https://github.com/petkaantonov/bluebird/blob/master/API.md#promiseonunhandledrejectionhandledfunction-handler---undefined)
- - `Promise.map()`, `.map()`, `Promise.filter()` and `.filter()` start calling their callbacks as soon as possible while retaining a correct order. See [`8085922f`](https://github.com/petkaantonov/bluebird/commit/8085922fb95a9987fda0cf2337598ab4a98dc315).
-
-Bugfixes:
-
- - Fix [#165](https://github.com/petkaantonov/bluebird/issues/165)
- - Fix [#166](https://github.com/petkaantonov/bluebird/issues/166)
-
-## 1.1.1 (2014-03-18)
-
-Bugfixes:
-
- - [#138](https://github.com/petkaantonov/bluebird/issues/138)
- - [#144](https://github.com/petkaantonov/bluebird/issues/144)
- - [#148](https://github.com/petkaantonov/bluebird/issues/148)
- - [#151](https://github.com/petkaantonov/bluebird/issues/151)
-
-## 1.1.0 (2014-03-08)
-
-Features:
-
- - Implement [`Promise.prototype.tap()`](https://github.com/petkaantonov/bluebird/blob/master/API.md#tapfunction-handler---promise)
- - Implement [`Promise.coroutine.addYieldHandler()`](https://github.com/petkaantonov/bluebird/blob/master/API.md#promisecoroutineaddyieldhandlerfunction-handler---void)
- - Deprecate `Promise.prototype.spawn`
-
-Bugfixes:
-
- - Fix already rejected promises being reported as unhandled when handled through collection methods
- - Fix browserisfy crashing from checking `process.version.indexOf`
-
-## 1.0.8 (2014-03-03)
-
-Bugfixes:
-
- - Fix active domain being lost across asynchronous boundaries in Node.JS 10.xx
-
-## 1.0.7 (2014-02-25)
-
-Bugfixes:
-
- - Fix handled errors being reported
-
-## 1.0.6 (2014-02-17)
-
-Bugfixes:
-
- -  Fix bug with unhandled rejections not being reported
-    when using `Promise.try` or `Promise.method` without
-    attaching further handlers
-
-## 1.0.5 (2014-02-15)
-
-Features:
-
- - Node.js performance: promisified functions try to check amount of passed arguments in most optimal order
- - Node.js promisified functions will have same `.length` as the original function minus one (for the callback parameter)
-
-## 1.0.4 (2014-02-09)
-
-Features:
-
- - Possibly unhandled rejection handler will always get a stack trace, even if the rejection or thrown error was not an error
- - Unhandled rejections are tracked per promise, not per error. So if you create multiple branches from a single ancestor and that ancestor gets rejected, each branch with no error handler with the end will cause a possibly unhandled rejection handler invocation
-
-Bugfixes:
-
- - Fix unhandled non-writable objects or primitives not reported by possibly unhandled rejection handler
-
-## 1.0.3 (2014-02-05)
-
-Bugfixes:
-
- - [#93](https://github.com/petkaantonov/bluebird/issues/88)
-
-## 1.0.2 (2014-02-04)
-
-Features:
-
- - Significantly improve performance of foreign bluebird thenables
-
-Bugfixes:
-
- - [#88](https://github.com/petkaantonov/bluebird/issues/88)
-
-## 1.0.1 (2014-01-28)
-
-Features:
-
- - Error objects that have property `.isAsync = true` will now be caught by `.error()`
-
-Bugfixes:
-
- - Fix TypeError and RangeError shims not working without `new` operator
-
-## 1.0.0 (2014-01-12)
-
-Features:
-
- - `.filter`, `.map`, and `.reduce` no longer skip sparse array holes. This is a backwards incompatible change.
- - Like `.map` and `.filter`, `.reduce` now allows returning promises and thenables from the iteration function.
-
-Bugfixes:
-
- - [#58](https://github.com/petkaantonov/bluebird/issues/58)
- - [#61](https://github.com/petkaantonov/bluebird/issues/61)
- - [#64](https://github.com/petkaantonov/bluebird/issues/64)
- - [#60](https://github.com/petkaantonov/bluebird/issues/60)
-
-## 0.11.6-1 (2013-12-29)
-
-## 0.11.6-0 (2013-12-29)
-
-Features:
-
- - You may now return promises and thenables from the filterer function used in `Promise.filter` and `Promise.prototype.filter`.
-
- - `.error()` now catches additional sources of rejections:
-
-    - Rejections originating from `Promise.reject`
-
-    - Rejections originating from thenables using
-    the `reject` callback
-
-    - Rejections originating from promisified callbacks
-    which use the `errback` argument
-
-    - Rejections originating from `new Promise` constructor
-    where the `reject` callback is called explicitly
-
-    - Rejections originating from `PromiseResolver` where
-    `.reject()` method is called explicitly
-
-Bugfixes:
-
- - Fix `captureStackTrace` being called when it was `null`
- - Fix `Promise.map` not unwrapping thenables
-
-## 0.11.5-1 (2013-12-15)
-
-## 0.11.5-0 (2013-12-03)
-
-Features:
-
- - Improve performance of collection methods
- - Improve performance of promise chains
-
-## 0.11.4-1 (2013-12-02)
-
-## 0.11.4-0 (2013-12-02)
-
-Bugfixes:
-
- - Fix `Promise.some` behavior with arguments like negative integers, 0...
- - Fix stack traces of synchronously throwing promisified functions'
-
-## 0.11.3-0 (2013-12-02)
-
-Features:
-
- - Improve performance of generators
-
-Bugfixes:
-
- - Fix critical bug with collection methods.
-
-## 0.11.2-0 (2013-12-02)
-
-Features:
-
- - Improve performance of all collection methods
-
-## 0.11.1-0 (2013-12-02)
-
-Features:
-
-- Improve overall performance.
-- Improve performance of promisified functions.
-- Improve performance of catch filters.
-- Improve performance of .finally.
-
-Bugfixes:
-
-- Fix `.finally()` rejecting if passed non-function. It will now ignore non-functions like `.then`.
-- Fix `.finally()` not converting thenables returned from the handler to promises.
-- `.spread()` now rejects if the ultimate value given to it is not spreadable.
-
-## 0.11.0-0 (2013-12-02)
-
-Features:
-
- - Improve overall performance when not using `.bind()` or cancellation.
- - Promises are now not cancellable by default. This is backwards incompatible change - see [`.cancellable()`](https://github.com/petkaantonov/bluebird/blob/master/API.md#cancellable---promise)
- - [`Promise.delay`](https://github.com/petkaantonov/bluebird/blob/master/API.md#promisedelaydynamic-value-int-ms---promise)
- - [`.delay()`](https://github.com/petkaantonov/bluebird/blob/master/API.md#delayint-ms---promise)
- - [`.timeout()`](https://github.com/petkaantonov/bluebird/blob/master/API.md#timeoutint-ms--string-message---promise)
-
-## 0.10.14-0 (2013-12-01)
-
-Bugfixes:
-
- - Fix race condition when mixing 3rd party asynchrony.
-
-## 0.10.13-1 (2013-11-30)
-
-## 0.10.13-0 (2013-11-30)
-
-Bugfixes:
-
- - Fix another bug with progression.
-
-## 0.10.12-0 (2013-11-30)
-
-Bugfixes:
-
- - Fix bug with progression.
-
-## 0.10.11-4 (2013-11-29)
-
-## 0.10.11-2 (2013-11-29)
-
-Bugfixes:
-
- - Fix `.race()` not propagating bound values.
-
-## 0.10.11-1 (2013-11-29)
-
-Features:
-
- - Improve performance of `Promise.race`
-
-## 0.10.11-0 (2013-11-29)
-
-Bugfixes:
-
- - Fixed `Promise.promisifyAll` invoking property accessors. Only data properties with function values are considered.
-
-## 0.10.10-0 (2013-11-28)
-
-Features:
-
- - Disable long stack traces in browsers by default. Call `Promise.longStackTraces()` to enable them.
-
-## 0.10.9-1 (2013-11-27)
-
-Bugfixes:
-
- - Fail early when `new Promise` is constructed incorrectly
-
-## 0.10.9-0 (2013-11-27)
-
-Bugfixes:
-
- - Promise.props now takes a [thenable-for-collection](https://github.com/petkaantonov/bluebird/blob/f41edac61b7c421608ff439bb5a09b7cffeadcf9/test/mocha/props.js#L197-L217)
- - All promise collection methods now reject when a promise-or-thenable-for-collection turns out not to give a collection
-
-## 0.10.8-0 (2013-11-25)
-
-Features:
-
- - All static collection methods take thenable-for-collection
-
-## 0.10.7-0 (2013-11-25)
-
-Features:
-
- - throw TypeError when thenable resolves with itself
- - Make .race() and Promise.race() forever pending on empty collections
-
-## 0.10.6-0 (2013-11-25)
-
-Bugfixes:
-
- - Promise.resolve and PromiseResolver.resolve follow thenables too.
-
-## 0.10.5-0 (2013-11-24)
-
-Bugfixes:
-
- - Fix infinite loop when thenable resolves with itself
-
-## 0.10.4-1 (2013-11-24)
-
-Bugfixes:
-
- - Fix a file missing from build. (Critical fix)
-
-## 0.10.4-0 (2013-11-24)
-
-Features:
-
- - Remove dependency of es5-shim and es5-sham when using ES3.
-
-## 0.10.3-0 (2013-11-24)
-
-Features:
-
- - Improve performance of `Promise.method`
-
-## 0.10.2-1 (2013-11-24)
-
-Features:
-
- - Rename PromiseResolver#asCallback to PromiseResolver#callback
-
-## 0.10.2-0 (2013-11-24)
-
-Features:
-
- - Remove memoization of thenables
-
-## 0.10.1-0 (2013-11-21)
-
-Features:
-
- - Add methods `Promise.resolve()`, `Promise.reject()`, `Promise.defer()` and `.resolve()`.
-
-## 0.10.0-1 (2013-11-17)
-
-## 0.10.0-0 (2013-11-17)
-
-Features:
-
- - Implement `Promise.method()`
- - Implement `.return()`
- - Implement `.throw()`
-
-Bugfixes:
-
- - Fix promises being able to use themselves as resolution or follower value
-
-## 0.9.11-1 (2013-11-14)
-
-Features:
-
- - Implicit `Promise.all()` when yielding an array from generators
-
-## 0.9.11-0 (2013-11-13)
-
-Bugfixes:
-
- - Fix `.spread` not unwrapping thenables
-
-## 0.9.10-2 (2013-11-13)
-
-Features:
-
- - Improve performance of promisified functions on V8
-
-Bugfixes:
-
- - Report unhandled rejections even when long stack traces are disabled
- - Fix `.error()` showing up in stack traces
-
-## 0.9.10-1 (2013-11-05)
-
-Bugfixes:
-
- - Catch filter method calls showing in stack traces
-
-## 0.9.10-0 (2013-11-05)
-
-Bugfixes:
-
- - Support primitives in catch filters
-
-## 0.9.9-0 (2013-11-05)
-
-Features:
-
- - Add `Promise.race()` and `.race()`
-
-## 0.9.8-0 (2013-11-01)
-
-Bugfixes:
-
- - Fix bug with `Promise.try` not unwrapping returned promises and thenables
-
-## 0.9.7-0 (2013-10-29)
-
-Bugfixes:
-
- - Fix bug with build files containing duplicated code for promise.js
-
-## 0.9.6-0 (2013-10-28)
-
-Features:
-
- - Improve output of reporting unhandled non-errors
- - Implement RejectionError wrapping and `.error()` method
-
-## 0.9.5-0 (2013-10-27)
-
-Features:
-
- - Allow fresh copies of the library to be made
-
-## 0.9.4-1 (2013-10-27)
-
-## 0.9.4-0 (2013-10-27)
-
-Bugfixes:
-
- - Rollback non-working multiple fresh copies feature
-
-## 0.9.3-0 (2013-10-27)
-
-Features:
-
- - Allow fresh copies of the library to be made
- - Add more components to customized builds
-
-## 0.9.2-1 (2013-10-25)
-
-## 0.9.2-0 (2013-10-25)
-
-Features:
-
- - Allow custom builds
-
-## 0.9.1-1 (2013-10-22)
-
-Bugfixes:
-
- - Fix unhandled rethrown exceptions not reported
-
-## 0.9.1-0 (2013-10-22)
-
-Features:
-
- - Improve performance of `Promise.try`
- - Extend `Promise.try` to accept arguments and ctx to make it more usable in promisification of synchronous functions.
-
-## 0.9.0-0 (2013-10-18)
-
-Features:
-
- - Implement `.bind` and `Promise.bind`
-
-Bugfixes:
-
- - Fix `.some()` when argument is a pending promise that later resolves to an array
-
-## 0.8.5-1 (2013-10-17)
-
-Features:
-
- - Enable process wide long stack traces through BLUEBIRD_DEBUG environment variable
-
-## 0.8.5-0 (2013-10-16)
-
-Features:
-
- - Improve performance of all collection methods
-
-Bugfixes:
-
- - Fix .finally passing the value to handlers
- - Remove kew from benchmarks due to bugs in the library breaking the benchmark
- - Fix some bluebird library calls potentially appearing in stack traces
-
-## 0.8.4-1 (2013-10-15)
-
-Bugfixes:
-
- - Fix .pending() call showing in long stack traces
-
-## 0.8.4-0 (2013-10-15)
-
-Bugfixes:
-
- - Fix PromiseArray and its sub-classes swallowing possibly unhandled rejections
-
-## 0.8.3-3 (2013-10-14)
-
-Bugfixes:
-
- - Fix AMD-declaration using named module.
-
-## 0.8.3-2 (2013-10-14)
-
-Features:
-
- - The mortals that can handle it may now release Zalgo by `require("bluebird/zalgo");`
-
-## 0.8.3-1 (2013-10-14)
-
-Bugfixes:
-
- - Fix memory leak when using the same promise to attach handlers over and over again
-
-## 0.8.3-0 (2013-10-13)
-
-Features:
-
- - Add `Promise.props()` and `Promise.prototype.props()`. They work like `.all()` for object properties.
-
-Bugfixes:
-
- - Fix bug with .some returning garbage when sparse arrays have rejections
-
-## 0.8.2-2 (2013-10-13)
-
-Features:
-
- - Improve performance of `.reduce()` when `initialValue` can be synchronously cast to a value
-
-## 0.8.2-1 (2013-10-12)
-
-Bugfixes:
-
- - Fix .npmignore having irrelevant files
-
-## 0.8.2-0 (2013-10-12)
-
-Features:
-
- - Improve performance of `.some()`
-
-## 0.8.1-0 (2013-10-11)
-
-Bugfixes:
-
- - Remove uses of dynamic evaluation (`new Function`, `eval` etc) when strictly not necessary. Use feature detection to use static evaluation to avoid errors when dynamic evaluation is prohibited.
-
-## 0.8.0-3 (2013-10-10)
-
-Features:
-
- - Add `.asCallback` property to `PromiseResolver`s
-
-## 0.8.0-2 (2013-10-10)
-
-## 0.8.0-1 (2013-10-09)
-
-Features:
-
- - Improve overall performance. Be able to sustain infinite recursion when using promises.
-
-## 0.8.0-0 (2013-10-09)
-
-Bugfixes:
-
- - Fix stackoverflow error when function calls itself "synchronously" from a promise handler
-
-## 0.7.12-2 (2013-10-09)
-
-Bugfixes:
-
- - Fix safari 6 not using `MutationObserver` as a scheduler
- - Fix process exceptions interfering with internal queue flushing
-
-## 0.7.12-1 (2013-10-09)
-
-Bugfixes:
-
- - Don't try to detect if generators are available to allow shims to be used
-
-## 0.7.12-0 (2013-10-08)
-
-Features:
-
- - Promisification now consider all functions on the object and its prototype chain
- - Individual promisifcation uses current `this` if no explicit receiver is given
- - Give better stack traces when promisified callbacks throw or errback primitives such as strings by wrapping them in an `Error` object.
-
-Bugfixes:
-
- - Fix runtime APIs throwing synchronous errors
-
-## 0.7.11-0 (2013-10-08)
-
-Features:
-
- - Deprecate `Promise.promisify(Object target)` in favor of `Promise.promisifyAll(Object target)` to avoid confusion with function objects
- - Coroutines now throw error when a non-promise is `yielded`
-
-## 0.7.10-1 (2013-10-05)
-
-Features:
-
- - Make tests pass Internet Explorer 8
-
-## 0.7.10-0 (2013-10-05)
-
-Features:
-
- - Create browser tests
-
-## 0.7.9-1 (2013-10-03)
-
-Bugfixes:
-
- - Fix promise cast bug when thenable fulfills using itself as the fulfillment value
-
-## 0.7.9-0 (2013-10-03)
-
-Features:
-
- - More performance improvements when long stack traces are enabled
-
-## 0.7.8-1 (2013-10-02)
-
-Features:
-
- - Performance improvements when long stack traces are enabled
-
-## 0.7.8-0 (2013-10-02)
-
-Bugfixes:
-
- - Fix promisified methods not turning synchronous exceptions into rejections
-
-## 0.7.7-1 (2013-10-02)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.7.7-0 (2013-10-01)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.7.6-0 (2013-09-29)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.7.5-0 (2013-09-28)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.7.4-1 (2013-09-28)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.7.4-0 (2013-09-28)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.7.3-1 (2013-09-28)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.7.3-0 (2013-09-27)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.7.2-0 (2013-09-27)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.7.1-5 (2013-09-26)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.7.1-4 (2013-09-25)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.7.1-3 (2013-09-25)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.7.1-2 (2013-09-24)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.7.1-1 (2013-09-24)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.7.1-0 (2013-09-24)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.7.0-1 (2013-09-23)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.7.0-0 (2013-09-23)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.6.5-2 (2013-09-20)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.6.5-1 (2013-09-18)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.6.5-0 (2013-09-18)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.6.4-1 (2013-09-18)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.6.4-0 (2013-09-18)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.6.3-4 (2013-09-18)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.6.3-3 (2013-09-18)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.6.3-2 (2013-09-16)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.6.3-1 (2013-09-16)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.6.3-0 (2013-09-15)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.6.2-1 (2013-09-14)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.6.2-0 (2013-09-14)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.6.1-0 (2013-09-14)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.6.0-0 (2013-09-13)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.9-6 (2013-09-12)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.9-5 (2013-09-12)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.9-4 (2013-09-12)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.9-3 (2013-09-11)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.9-2 (2013-09-11)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.9-1 (2013-09-11)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.9-0 (2013-09-11)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.8-1 (2013-09-11)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.8-0 (2013-09-11)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.7-0 (2013-09-11)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.6-1 (2013-09-10)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.6-0 (2013-09-10)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.5-1 (2013-09-10)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.5-0 (2013-09-09)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.4-1 (2013-09-08)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.4-0 (2013-09-08)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.3-0 (2013-09-07)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.2-0 (2013-09-07)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.1-0 (2013-09-07)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.5.0-0 (2013-09-07)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.4.0-0 (2013-09-06)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.3.0-1 (2013-09-06)
-
-Features:
-
- - feature
-
-Bugfixes:
-
- - bugfix
-
-## 0.3.0 (2013-09-06)
diff --git a/deps/npm/node_modules/bluebird/js/browser/bluebird.js b/deps/npm/node_modules/bluebird/js/browser/bluebird.js
deleted file mode 100644
index 2f9380ef5af3be..00000000000000
--- a/deps/npm/node_modules/bluebird/js/browser/bluebird.js
+++ /dev/null
@@ -1,4881 +0,0 @@
-/* @preserve
- * The MIT License (MIT)
- *
- * Copyright (c) 2013-2015 Petka Antonov
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- */
-/**
- * bluebird build version 2.10.1
- * Features enabled: core, race, call_get, generators, map, nodeify, promisify, props, reduce, settle, some, cancel, using, filter, any, each, timers
-*/
-!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.Promise=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof _dereq_=="function"&&_dereq_;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof _dereq_=="function"&&_dereq_;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise) {
-var SomePromiseArray = Promise._SomePromiseArray;
-function any(promises) {
-    var ret = new SomePromiseArray(promises);
-    var promise = ret.promise();
-    ret.setHowMany(1);
-    ret.setUnwrap();
-    ret.init();
-    return promise;
-}
-
-Promise.any = function (promises) {
-    return any(promises);
-};
-
-Promise.prototype.any = function () {
-    return any(this);
-};
-
-};
-
-},{}],2:[function(_dereq_,module,exports){
-"use strict";
-var firstLineError;
-try {throw new Error(); } catch (e) {firstLineError = e;}
-var schedule = _dereq_("./schedule.js");
-var Queue = _dereq_("./queue.js");
-var util = _dereq_("./util.js");
-
-function Async() {
-    this._isTickUsed = false;
-    this._lateQueue = new Queue(16);
-    this._normalQueue = new Queue(16);
-    this._trampolineEnabled = true;
-    var self = this;
-    this.drainQueues = function () {
-        self._drainQueues();
-    };
-    this._schedule =
-        schedule.isStatic ? schedule(this.drainQueues) : schedule;
-}
-
-Async.prototype.disableTrampolineIfNecessary = function() {
-    if (util.hasDevTools) {
-        this._trampolineEnabled = false;
-    }
-};
-
-Async.prototype.enableTrampoline = function() {
-    if (!this._trampolineEnabled) {
-        this._trampolineEnabled = true;
-        this._schedule = function(fn) {
-            setTimeout(fn, 0);
-        };
-    }
-};
-
-Async.prototype.haveItemsQueued = function () {
-    return this._normalQueue.length() > 0;
-};
-
-Async.prototype.throwLater = function(fn, arg) {
-    if (arguments.length === 1) {
-        arg = fn;
-        fn = function () { throw arg; };
-    }
-    if (typeof setTimeout !== "undefined") {
-        setTimeout(function() {
-            fn(arg);
-        }, 0);
-    } else try {
-        this._schedule(function() {
-            fn(arg);
-        });
-    } catch (e) {
-        throw new Error("No async scheduler available\u000a\u000a    See http://goo.gl/m3OTXk\u000a");
-    }
-};
-
-function AsyncInvokeLater(fn, receiver, arg) {
-    this._lateQueue.push(fn, receiver, arg);
-    this._queueTick();
-}
-
-function AsyncInvoke(fn, receiver, arg) {
-    this._normalQueue.push(fn, receiver, arg);
-    this._queueTick();
-}
-
-function AsyncSettlePromises(promise) {
-    this._normalQueue._pushOne(promise);
-    this._queueTick();
-}
-
-if (!util.hasDevTools) {
-    Async.prototype.invokeLater = AsyncInvokeLater;
-    Async.prototype.invoke = AsyncInvoke;
-    Async.prototype.settlePromises = AsyncSettlePromises;
-} else {
-    if (schedule.isStatic) {
-        schedule = function(fn) { setTimeout(fn, 0); };
-    }
-    Async.prototype.invokeLater = function (fn, receiver, arg) {
-        if (this._trampolineEnabled) {
-            AsyncInvokeLater.call(this, fn, receiver, arg);
-        } else {
-            this._schedule(function() {
-                setTimeout(function() {
-                    fn.call(receiver, arg);
-                }, 100);
-            });
-        }
-    };
-
-    Async.prototype.invoke = function (fn, receiver, arg) {
-        if (this._trampolineEnabled) {
-            AsyncInvoke.call(this, fn, receiver, arg);
-        } else {
-            this._schedule(function() {
-                fn.call(receiver, arg);
-            });
-        }
-    };
-
-    Async.prototype.settlePromises = function(promise) {
-        if (this._trampolineEnabled) {
-            AsyncSettlePromises.call(this, promise);
-        } else {
-            this._schedule(function() {
-                promise._settlePromises();
-            });
-        }
-    };
-}
-
-Async.prototype.invokeFirst = function (fn, receiver, arg) {
-    this._normalQueue.unshift(fn, receiver, arg);
-    this._queueTick();
-};
-
-Async.prototype._drainQueue = function(queue) {
-    while (queue.length() > 0) {
-        var fn = queue.shift();
-        if (typeof fn !== "function") {
-            fn._settlePromises();
-            continue;
-        }
-        var receiver = queue.shift();
-        var arg = queue.shift();
-        fn.call(receiver, arg);
-    }
-};
-
-Async.prototype._drainQueues = function () {
-    this._drainQueue(this._normalQueue);
-    this._reset();
-    this._drainQueue(this._lateQueue);
-};
-
-Async.prototype._queueTick = function () {
-    if (!this._isTickUsed) {
-        this._isTickUsed = true;
-        this._schedule(this.drainQueues);
-    }
-};
-
-Async.prototype._reset = function () {
-    this._isTickUsed = false;
-};
-
-module.exports = new Async();
-module.exports.firstLineError = firstLineError;
-
-},{"./queue.js":28,"./schedule.js":31,"./util.js":38}],3:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise, INTERNAL, tryConvertToPromise) {
-var rejectThis = function(_, e) {
-    this._reject(e);
-};
-
-var targetRejected = function(e, context) {
-    context.promiseRejectionQueued = true;
-    context.bindingPromise._then(rejectThis, rejectThis, null, this, e);
-};
-
-var bindingResolved = function(thisArg, context) {
-    if (this._isPending()) {
-        this._resolveCallback(context.target);
-    }
-};
-
-var bindingRejected = function(e, context) {
-    if (!context.promiseRejectionQueued) this._reject(e);
-};
-
-Promise.prototype.bind = function (thisArg) {
-    var maybePromise = tryConvertToPromise(thisArg);
-    var ret = new Promise(INTERNAL);
-    ret._propagateFrom(this, 1);
-    var target = this._target();
-
-    ret._setBoundTo(maybePromise);
-    if (maybePromise instanceof Promise) {
-        var context = {
-            promiseRejectionQueued: false,
-            promise: ret,
-            target: target,
-            bindingPromise: maybePromise
-        };
-        target._then(INTERNAL, targetRejected, ret._progress, ret, context);
-        maybePromise._then(
-            bindingResolved, bindingRejected, ret._progress, ret, context);
-    } else {
-        ret._resolveCallback(target);
-    }
-    return ret;
-};
-
-Promise.prototype._setBoundTo = function (obj) {
-    if (obj !== undefined) {
-        this._bitField = this._bitField | 131072;
-        this._boundTo = obj;
-    } else {
-        this._bitField = this._bitField & (~131072);
-    }
-};
-
-Promise.prototype._isBound = function () {
-    return (this._bitField & 131072) === 131072;
-};
-
-Promise.bind = function (thisArg, value) {
-    var maybePromise = tryConvertToPromise(thisArg);
-    var ret = new Promise(INTERNAL);
-
-    ret._setBoundTo(maybePromise);
-    if (maybePromise instanceof Promise) {
-        maybePromise._then(function() {
-            ret._resolveCallback(value);
-        }, ret._reject, ret._progress, ret, null);
-    } else {
-        ret._resolveCallback(value);
-    }
-    return ret;
-};
-};
-
-},{}],4:[function(_dereq_,module,exports){
-"use strict";
-var old;
-if (typeof Promise !== "undefined") old = Promise;
-function noConflict() {
-    try { if (Promise === bluebird) Promise = old; }
-    catch (e) {}
-    return bluebird;
-}
-var bluebird = _dereq_("./promise.js")();
-bluebird.noConflict = noConflict;
-module.exports = bluebird;
-
-},{"./promise.js":23}],5:[function(_dereq_,module,exports){
-"use strict";
-var cr = Object.create;
-if (cr) {
-    var callerCache = cr(null);
-    var getterCache = cr(null);
-    callerCache[" size"] = getterCache[" size"] = 0;
-}
-
-module.exports = function(Promise) {
-var util = _dereq_("./util.js");
-var canEvaluate = util.canEvaluate;
-var isIdentifier = util.isIdentifier;
-
-var getMethodCaller;
-var getGetter;
-if (!true) {
-var makeMethodCaller = function (methodName) {
-    return new Function("ensureMethod", "                                    \n\
-        return function(obj) {                                               \n\
-            'use strict'                                                     \n\
-            var len = this.length;                                           \n\
-            ensureMethod(obj, 'methodName');                                 \n\
-            switch(len) {                                                    \n\
-                case 1: return obj.methodName(this[0]);                      \n\
-                case 2: return obj.methodName(this[0], this[1]);             \n\
-                case 3: return obj.methodName(this[0], this[1], this[2]);    \n\
-                case 0: return obj.methodName();                             \n\
-                default:                                                     \n\
-                    return obj.methodName.apply(obj, this);                  \n\
-            }                                                                \n\
-        };                                                                   \n\
-        ".replace(/methodName/g, methodName))(ensureMethod);
-};
-
-var makeGetter = function (propertyName) {
-    return new Function("obj", "                                             \n\
-        'use strict';                                                        \n\
-        return obj.propertyName;                                             \n\
-        ".replace("propertyName", propertyName));
-};
-
-var getCompiled = function(name, compiler, cache) {
-    var ret = cache[name];
-    if (typeof ret !== "function") {
-        if (!isIdentifier(name)) {
-            return null;
-        }
-        ret = compiler(name);
-        cache[name] = ret;
-        cache[" size"]++;
-        if (cache[" size"] > 512) {
-            var keys = Object.keys(cache);
-            for (var i = 0; i < 256; ++i) delete cache[keys[i]];
-            cache[" size"] = keys.length - 256;
-        }
-    }
-    return ret;
-};
-
-getMethodCaller = function(name) {
-    return getCompiled(name, makeMethodCaller, callerCache);
-};
-
-getGetter = function(name) {
-    return getCompiled(name, makeGetter, getterCache);
-};
-}
-
-function ensureMethod(obj, methodName) {
-    var fn;
-    if (obj != null) fn = obj[methodName];
-    if (typeof fn !== "function") {
-        var message = "Object " + util.classString(obj) + " has no method '" +
-            util.toString(methodName) + "'";
-        throw new Promise.TypeError(message);
-    }
-    return fn;
-}
-
-function caller(obj) {
-    var methodName = this.pop();
-    var fn = ensureMethod(obj, methodName);
-    return fn.apply(obj, this);
-}
-Promise.prototype.call = function (methodName) {
-    var $_len = arguments.length;var args = new Array($_len - 1); for(var $_i = 1; $_i < $_len; ++$_i) {args[$_i - 1] = arguments[$_i];}
-    if (!true) {
-        if (canEvaluate) {
-            var maybeCaller = getMethodCaller(methodName);
-            if (maybeCaller !== null) {
-                return this._then(
-                    maybeCaller, undefined, undefined, args, undefined);
-            }
-        }
-    }
-    args.push(methodName);
-    return this._then(caller, undefined, undefined, args, undefined);
-};
-
-function namedGetter(obj) {
-    return obj[this];
-}
-function indexedGetter(obj) {
-    var index = +this;
-    if (index < 0) index = Math.max(0, index + obj.length);
-    return obj[index];
-}
-Promise.prototype.get = function (propertyName) {
-    var isIndex = (typeof propertyName === "number");
-    var getter;
-    if (!isIndex) {
-        if (canEvaluate) {
-            var maybeGetter = getGetter(propertyName);
-            getter = maybeGetter !== null ? maybeGetter : namedGetter;
-        } else {
-            getter = namedGetter;
-        }
-    } else {
-        getter = indexedGetter;
-    }
-    return this._then(getter, undefined, undefined, propertyName, undefined);
-};
-};
-
-},{"./util.js":38}],6:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise) {
-var errors = _dereq_("./errors.js");
-var async = _dereq_("./async.js");
-var CancellationError = errors.CancellationError;
-
-Promise.prototype._cancel = function (reason) {
-    if (!this.isCancellable()) return this;
-    var parent;
-    var promiseToReject = this;
-    while ((parent = promiseToReject._cancellationParent) !== undefined &&
-        parent.isCancellable()) {
-        promiseToReject = parent;
-    }
-    this._unsetCancellable();
-    promiseToReject._target()._rejectCallback(reason, false, true);
-};
-
-Promise.prototype.cancel = function (reason) {
-    if (!this.isCancellable()) return this;
-    if (reason === undefined) reason = new CancellationError();
-    async.invokeLater(this._cancel, this, reason);
-    return this;
-};
-
-Promise.prototype.cancellable = function () {
-    if (this._cancellable()) return this;
-    async.enableTrampoline();
-    this._setCancellable();
-    this._cancellationParent = undefined;
-    return this;
-};
-
-Promise.prototype.uncancellable = function () {
-    var ret = this.then();
-    ret._unsetCancellable();
-    return ret;
-};
-
-Promise.prototype.fork = function (didFulfill, didReject, didProgress) {
-    var ret = this._then(didFulfill, didReject, didProgress,
-                         undefined, undefined);
-
-    ret._setCancellable();
-    ret._cancellationParent = undefined;
-    return ret;
-};
-};
-
-},{"./async.js":2,"./errors.js":13}],7:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function() {
-var async = _dereq_("./async.js");
-var util = _dereq_("./util.js");
-var bluebirdFramePattern =
-    /[\\\/]bluebird[\\\/]js[\\\/](main|debug|zalgo|instrumented)/;
-var stackFramePattern = null;
-var formatStack = null;
-var indentStackFrames = false;
-var warn;
-
-function CapturedTrace(parent) {
-    this._parent = parent;
-    var length = this._length = 1 + (parent === undefined ? 0 : parent._length);
-    captureStackTrace(this, CapturedTrace);
-    if (length > 32) this.uncycle();
-}
-util.inherits(CapturedTrace, Error);
-
-CapturedTrace.prototype.uncycle = function() {
-    var length = this._length;
-    if (length < 2) return;
-    var nodes = [];
-    var stackToIndex = {};
-
-    for (var i = 0, node = this; node !== undefined; ++i) {
-        nodes.push(node);
-        node = node._parent;
-    }
-    length = this._length = i;
-    for (var i = length - 1; i >= 0; --i) {
-        var stack = nodes[i].stack;
-        if (stackToIndex[stack] === undefined) {
-            stackToIndex[stack] = i;
-        }
-    }
-    for (var i = 0; i < length; ++i) {
-        var currentStack = nodes[i].stack;
-        var index = stackToIndex[currentStack];
-        if (index !== undefined && index !== i) {
-            if (index > 0) {
-                nodes[index - 1]._parent = undefined;
-                nodes[index - 1]._length = 1;
-            }
-            nodes[i]._parent = undefined;
-            nodes[i]._length = 1;
-            var cycleEdgeNode = i > 0 ? nodes[i - 1] : this;
-
-            if (index < length - 1) {
-                cycleEdgeNode._parent = nodes[index + 1];
-                cycleEdgeNode._parent.uncycle();
-                cycleEdgeNode._length =
-                    cycleEdgeNode._parent._length + 1;
-            } else {
-                cycleEdgeNode._parent = undefined;
-                cycleEdgeNode._length = 1;
-            }
-            var currentChildLength = cycleEdgeNode._length + 1;
-            for (var j = i - 2; j >= 0; --j) {
-                nodes[j]._length = currentChildLength;
-                currentChildLength++;
-            }
-            return;
-        }
-    }
-};
-
-CapturedTrace.prototype.parent = function() {
-    return this._parent;
-};
-
-CapturedTrace.prototype.hasParent = function() {
-    return this._parent !== undefined;
-};
-
-CapturedTrace.prototype.attachExtraTrace = function(error) {
-    if (error.__stackCleaned__) return;
-    this.uncycle();
-    var parsed = CapturedTrace.parseStackAndMessage(error);
-    var message = parsed.message;
-    var stacks = [parsed.stack];
-
-    var trace = this;
-    while (trace !== undefined) {
-        stacks.push(cleanStack(trace.stack.split("\n")));
-        trace = trace._parent;
-    }
-    removeCommonRoots(stacks);
-    removeDuplicateOrEmptyJumps(stacks);
-    util.notEnumerableProp(error, "stack", reconstructStack(message, stacks));
-    util.notEnumerableProp(error, "__stackCleaned__", true);
-};
-
-function reconstructStack(message, stacks) {
-    for (var i = 0; i < stacks.length - 1; ++i) {
-        stacks[i].push("From previous event:");
-        stacks[i] = stacks[i].join("\n");
-    }
-    if (i < stacks.length) {
-        stacks[i] = stacks[i].join("\n");
-    }
-    return message + "\n" + stacks.join("\n");
-}
-
-function removeDuplicateOrEmptyJumps(stacks) {
-    for (var i = 0; i < stacks.length; ++i) {
-        if (stacks[i].length === 0 ||
-            ((i + 1 < stacks.length) && stacks[i][0] === stacks[i+1][0])) {
-            stacks.splice(i, 1);
-            i--;
-        }
-    }
-}
-
-function removeCommonRoots(stacks) {
-    var current = stacks[0];
-    for (var i = 1; i < stacks.length; ++i) {
-        var prev = stacks[i];
-        var currentLastIndex = current.length - 1;
-        var currentLastLine = current[currentLastIndex];
-        var commonRootMeetPoint = -1;
-
-        for (var j = prev.length - 1; j >= 0; --j) {
-            if (prev[j] === currentLastLine) {
-                commonRootMeetPoint = j;
-                break;
-            }
-        }
-
-        for (var j = commonRootMeetPoint; j >= 0; --j) {
-            var line = prev[j];
-            if (current[currentLastIndex] === line) {
-                current.pop();
-                currentLastIndex--;
-            } else {
-                break;
-            }
-        }
-        current = prev;
-    }
-}
-
-function cleanStack(stack) {
-    var ret = [];
-    for (var i = 0; i < stack.length; ++i) {
-        var line = stack[i];
-        var isTraceLine = stackFramePattern.test(line) ||
-            "    (No stack trace)" === line;
-        var isInternalFrame = isTraceLine && shouldIgnore(line);
-        if (isTraceLine && !isInternalFrame) {
-            if (indentStackFrames && line.charAt(0) !== " ") {
-                line = "    " + line;
-            }
-            ret.push(line);
-        }
-    }
-    return ret;
-}
-
-function stackFramesAsArray(error) {
-    var stack = error.stack.replace(/\s+$/g, "").split("\n");
-    for (var i = 0; i < stack.length; ++i) {
-        var line = stack[i];
-        if ("    (No stack trace)" === line || stackFramePattern.test(line)) {
-            break;
-        }
-    }
-    if (i > 0) {
-        stack = stack.slice(i);
-    }
-    return stack;
-}
-
-CapturedTrace.parseStackAndMessage = function(error) {
-    var stack = error.stack;
-    var message = error.toString();
-    stack = typeof stack === "string" && stack.length > 0
-                ? stackFramesAsArray(error) : ["    (No stack trace)"];
-    return {
-        message: message,
-        stack: cleanStack(stack)
-    };
-};
-
-CapturedTrace.formatAndLogError = function(error, title) {
-    if (typeof console !== "undefined") {
-        var message;
-        if (typeof error === "object" || typeof error === "function") {
-            var stack = error.stack;
-            message = title + formatStack(stack, error);
-        } else {
-            message = title + String(error);
-        }
-        if (typeof warn === "function") {
-            warn(message);
-        } else if (typeof console.log === "function" ||
-            typeof console.log === "object") {
-            console.log(message);
-        }
-    }
-};
-
-CapturedTrace.unhandledRejection = function (reason) {
-    CapturedTrace.formatAndLogError(reason, "^--- With additional stack trace: ");
-};
-
-CapturedTrace.isSupported = function () {
-    return typeof captureStackTrace === "function";
-};
-
-CapturedTrace.fireRejectionEvent =
-function(name, localHandler, reason, promise) {
-    var localEventFired = false;
-    try {
-        if (typeof localHandler === "function") {
-            localEventFired = true;
-            if (name === "rejectionHandled") {
-                localHandler(promise);
-            } else {
-                localHandler(reason, promise);
-            }
-        }
-    } catch (e) {
-        async.throwLater(e);
-    }
-
-    var globalEventFired = false;
-    try {
-        globalEventFired = fireGlobalEvent(name, reason, promise);
-    } catch (e) {
-        globalEventFired = true;
-        async.throwLater(e);
-    }
-
-    var domEventFired = false;
-    if (fireDomEvent) {
-        try {
-            domEventFired = fireDomEvent(name.toLowerCase(), {
-                reason: reason,
-                promise: promise
-            });
-        } catch (e) {
-            domEventFired = true;
-            async.throwLater(e);
-        }
-    }
-
-    if (!globalEventFired && !localEventFired && !domEventFired &&
-        name === "unhandledRejection") {
-        CapturedTrace.formatAndLogError(reason, "Unhandled rejection ");
-    }
-};
-
-function formatNonError(obj) {
-    var str;
-    if (typeof obj === "function") {
-        str = "[function " +
-            (obj.name || "anonymous") +
-            "]";
-    } else {
-        str = obj.toString();
-        var ruselessToString = /\[object [a-zA-Z0-9$_]+\]/;
-        if (ruselessToString.test(str)) {
-            try {
-                var newStr = JSON.stringify(obj);
-                str = newStr;
-            }
-            catch(e) {
-
-            }
-        }
-        if (str.length === 0) {
-            str = "(empty array)";
-        }
-    }
-    return ("(<" + snip(str) + ">, no stack trace)");
-}
-
-function snip(str) {
-    var maxChars = 41;
-    if (str.length < maxChars) {
-        return str;
-    }
-    return str.substr(0, maxChars - 3) + "...";
-}
-
-var shouldIgnore = function() { return false; };
-var parseLineInfoRegex = /[\/<\(]([^:\/]+):(\d+):(?:\d+)\)?\s*$/;
-function parseLineInfo(line) {
-    var matches = line.match(parseLineInfoRegex);
-    if (matches) {
-        return {
-            fileName: matches[1],
-            line: parseInt(matches[2], 10)
-        };
-    }
-}
-CapturedTrace.setBounds = function(firstLineError, lastLineError) {
-    if (!CapturedTrace.isSupported()) return;
-    var firstStackLines = firstLineError.stack.split("\n");
-    var lastStackLines = lastLineError.stack.split("\n");
-    var firstIndex = -1;
-    var lastIndex = -1;
-    var firstFileName;
-    var lastFileName;
-    for (var i = 0; i < firstStackLines.length; ++i) {
-        var result = parseLineInfo(firstStackLines[i]);
-        if (result) {
-            firstFileName = result.fileName;
-            firstIndex = result.line;
-            break;
-        }
-    }
-    for (var i = 0; i < lastStackLines.length; ++i) {
-        var result = parseLineInfo(lastStackLines[i]);
-        if (result) {
-            lastFileName = result.fileName;
-            lastIndex = result.line;
-            break;
-        }
-    }
-    if (firstIndex < 0 || lastIndex < 0 || !firstFileName || !lastFileName ||
-        firstFileName !== lastFileName || firstIndex >= lastIndex) {
-        return;
-    }
-
-    shouldIgnore = function(line) {
-        if (bluebirdFramePattern.test(line)) return true;
-        var info = parseLineInfo(line);
-        if (info) {
-            if (info.fileName === firstFileName &&
-                (firstIndex <= info.line && info.line <= lastIndex)) {
-                return true;
-            }
-        }
-        return false;
-    };
-};
-
-var captureStackTrace = (function stackDetection() {
-    var v8stackFramePattern = /^\s*at\s*/;
-    var v8stackFormatter = function(stack, error) {
-        if (typeof stack === "string") return stack;
-
-        if (error.name !== undefined &&
-            error.message !== undefined) {
-            return error.toString();
-        }
-        return formatNonError(error);
-    };
-
-    if (typeof Error.stackTraceLimit === "number" &&
-        typeof Error.captureStackTrace === "function") {
-        Error.stackTraceLimit = Error.stackTraceLimit + 6;
-        stackFramePattern = v8stackFramePattern;
-        formatStack = v8stackFormatter;
-        var captureStackTrace = Error.captureStackTrace;
-
-        shouldIgnore = function(line) {
-            return bluebirdFramePattern.test(line);
-        };
-        return function(receiver, ignoreUntil) {
-            Error.stackTraceLimit = Error.stackTraceLimit + 6;
-            captureStackTrace(receiver, ignoreUntil);
-            Error.stackTraceLimit = Error.stackTraceLimit - 6;
-        };
-    }
-    var err = new Error();
-
-    if (typeof err.stack === "string" &&
-        err.stack.split("\n")[0].indexOf("stackDetection@") >= 0) {
-        stackFramePattern = /@/;
-        formatStack = v8stackFormatter;
-        indentStackFrames = true;
-        return function captureStackTrace(o) {
-            o.stack = new Error().stack;
-        };
-    }
-
-    var hasStackAfterThrow;
-    try { throw new Error(); }
-    catch(e) {
-        hasStackAfterThrow = ("stack" in e);
-    }
-    if (!("stack" in err) && hasStackAfterThrow &&
-        typeof Error.stackTraceLimit === "number") {
-        stackFramePattern = v8stackFramePattern;
-        formatStack = v8stackFormatter;
-        return function captureStackTrace(o) {
-            Error.stackTraceLimit = Error.stackTraceLimit + 6;
-            try { throw new Error(); }
-            catch(e) { o.stack = e.stack; }
-            Error.stackTraceLimit = Error.stackTraceLimit - 6;
-        };
-    }
-
-    formatStack = function(stack, error) {
-        if (typeof stack === "string") return stack;
-
-        if ((typeof error === "object" ||
-            typeof error === "function") &&
-            error.name !== undefined &&
-            error.message !== undefined) {
-            return error.toString();
-        }
-        return formatNonError(error);
-    };
-
-    return null;
-
-})([]);
-
-var fireDomEvent;
-var fireGlobalEvent = (function() {
-    if (util.isNode) {
-        return function(name, reason, promise) {
-            if (name === "rejectionHandled") {
-                return process.emit(name, promise);
-            } else {
-                return process.emit(name, reason, promise);
-            }
-        };
-    } else {
-        var customEventWorks = false;
-        var anyEventWorks = true;
-        try {
-            var ev = new self.CustomEvent("test");
-            customEventWorks = ev instanceof CustomEvent;
-        } catch (e) {}
-        if (!customEventWorks) {
-            try {
-                var event = document.createEvent("CustomEvent");
-                event.initCustomEvent("testingtheevent", false, true, {});
-                self.dispatchEvent(event);
-            } catch (e) {
-                anyEventWorks = false;
-            }
-        }
-        if (anyEventWorks) {
-            fireDomEvent = function(type, detail) {
-                var event;
-                if (customEventWorks) {
-                    event = new self.CustomEvent(type, {
-                        detail: detail,
-                        bubbles: false,
-                        cancelable: true
-                    });
-                } else if (self.dispatchEvent) {
-                    event = document.createEvent("CustomEvent");
-                    event.initCustomEvent(type, false, true, detail);
-                }
-
-                return event ? !self.dispatchEvent(event) : false;
-            };
-        }
-
-        var toWindowMethodNameMap = {};
-        toWindowMethodNameMap["unhandledRejection"] = ("on" +
-            "unhandledRejection").toLowerCase();
-        toWindowMethodNameMap["rejectionHandled"] = ("on" +
-            "rejectionHandled").toLowerCase();
-
-        return function(name, reason, promise) {
-            var methodName = toWindowMethodNameMap[name];
-            var method = self[methodName];
-            if (!method) return false;
-            if (name === "rejectionHandled") {
-                method.call(self, promise);
-            } else {
-                method.call(self, reason, promise);
-            }
-            return true;
-        };
-    }
-})();
-
-if (typeof console !== "undefined" && typeof console.warn !== "undefined") {
-    warn = function (message) {
-        console.warn(message);
-    };
-    if (util.isNode && process.stderr.isTTY) {
-        warn = function(message) {
-            process.stderr.write("\u001b[31m" + message + "\u001b[39m\n");
-        };
-    } else if (!util.isNode && typeof (new Error().stack) === "string") {
-        warn = function(message) {
-            console.warn("%c" + message, "color: red");
-        };
-    }
-}
-
-return CapturedTrace;
-};
-
-},{"./async.js":2,"./util.js":38}],8:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(NEXT_FILTER) {
-var util = _dereq_("./util.js");
-var errors = _dereq_("./errors.js");
-var tryCatch = util.tryCatch;
-var errorObj = util.errorObj;
-var keys = _dereq_("./es5.js").keys;
-var TypeError = errors.TypeError;
-
-function CatchFilter(instances, callback, promise) {
-    this._instances = instances;
-    this._callback = callback;
-    this._promise = promise;
-}
-
-function safePredicate(predicate, e) {
-    var safeObject = {};
-    var retfilter = tryCatch(predicate).call(safeObject, e);
-
-    if (retfilter === errorObj) return retfilter;
-
-    var safeKeys = keys(safeObject);
-    if (safeKeys.length) {
-        errorObj.e = new TypeError("Catch filter must inherit from Error or be a simple predicate function\u000a\u000a    See http://goo.gl/o84o68\u000a");
-        return errorObj;
-    }
-    return retfilter;
-}
-
-CatchFilter.prototype.doFilter = function (e) {
-    var cb = this._callback;
-    var promise = this._promise;
-    var boundTo = promise._boundValue();
-    for (var i = 0, len = this._instances.length; i < len; ++i) {
-        var item = this._instances[i];
-        var itemIsErrorType = item === Error ||
-            (item != null && item.prototype instanceof Error);
-
-        if (itemIsErrorType && e instanceof item) {
-            var ret = tryCatch(cb).call(boundTo, e);
-            if (ret === errorObj) {
-                NEXT_FILTER.e = ret.e;
-                return NEXT_FILTER;
-            }
-            return ret;
-        } else if (typeof item === "function" && !itemIsErrorType) {
-            var shouldHandle = safePredicate(item, e);
-            if (shouldHandle === errorObj) {
-                e = errorObj.e;
-                break;
-            } else if (shouldHandle) {
-                var ret = tryCatch(cb).call(boundTo, e);
-                if (ret === errorObj) {
-                    NEXT_FILTER.e = ret.e;
-                    return NEXT_FILTER;
-                }
-                return ret;
-            }
-        }
-    }
-    NEXT_FILTER.e = e;
-    return NEXT_FILTER;
-};
-
-return CatchFilter;
-};
-
-},{"./errors.js":13,"./es5.js":14,"./util.js":38}],9:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise, CapturedTrace, isDebugging) {
-var contextStack = [];
-function Context() {
-    this._trace = new CapturedTrace(peekContext());
-}
-Context.prototype._pushContext = function () {
-    if (!isDebugging()) return;
-    if (this._trace !== undefined) {
-        contextStack.push(this._trace);
-    }
-};
-
-Context.prototype._popContext = function () {
-    if (!isDebugging()) return;
-    if (this._trace !== undefined) {
-        contextStack.pop();
-    }
-};
-
-function createContext() {
-    if (isDebugging()) return new Context();
-}
-
-function peekContext() {
-    var lastIndex = contextStack.length - 1;
-    if (lastIndex >= 0) {
-        return contextStack[lastIndex];
-    }
-    return undefined;
-}
-
-Promise.prototype._peekContext = peekContext;
-Promise.prototype._pushContext = Context.prototype._pushContext;
-Promise.prototype._popContext = Context.prototype._popContext;
-
-return createContext;
-};
-
-},{}],10:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise, CapturedTrace) {
-var getDomain = Promise._getDomain;
-var async = _dereq_("./async.js");
-var Warning = _dereq_("./errors.js").Warning;
-var util = _dereq_("./util.js");
-var canAttachTrace = util.canAttachTrace;
-var unhandledRejectionHandled;
-var possiblyUnhandledRejection;
-var debugging = false || (util.isNode &&
-                    (!!process.env["BLUEBIRD_DEBUG"] ||
-                     process.env["NODE_ENV"] === "development"));
-
-if (util.isNode && process.env["BLUEBIRD_DEBUG"] == 0) debugging = false;
-
-if (debugging) {
-    async.disableTrampolineIfNecessary();
-}
-
-Promise.prototype._ignoreRejections = function() {
-    this._unsetRejectionIsUnhandled();
-    this._bitField = this._bitField | 16777216;
-};
-
-Promise.prototype._ensurePossibleRejectionHandled = function () {
-    if ((this._bitField & 16777216) !== 0) return;
-    this._setRejectionIsUnhandled();
-    async.invokeLater(this._notifyUnhandledRejection, this, undefined);
-};
-
-Promise.prototype._notifyUnhandledRejectionIsHandled = function () {
-    CapturedTrace.fireRejectionEvent("rejectionHandled",
-                                  unhandledRejectionHandled, undefined, this);
-};
-
-Promise.prototype._notifyUnhandledRejection = function () {
-    if (this._isRejectionUnhandled()) {
-        var reason = this._getCarriedStackTrace() || this._settledValue;
-        this._setUnhandledRejectionIsNotified();
-        CapturedTrace.fireRejectionEvent("unhandledRejection",
-                                      possiblyUnhandledRejection, reason, this);
-    }
-};
-
-Promise.prototype._setUnhandledRejectionIsNotified = function () {
-    this._bitField = this._bitField | 524288;
-};
-
-Promise.prototype._unsetUnhandledRejectionIsNotified = function () {
-    this._bitField = this._bitField & (~524288);
-};
-
-Promise.prototype._isUnhandledRejectionNotified = function () {
-    return (this._bitField & 524288) > 0;
-};
-
-Promise.prototype._setRejectionIsUnhandled = function () {
-    this._bitField = this._bitField | 2097152;
-};
-
-Promise.prototype._unsetRejectionIsUnhandled = function () {
-    this._bitField = this._bitField & (~2097152);
-    if (this._isUnhandledRejectionNotified()) {
-        this._unsetUnhandledRejectionIsNotified();
-        this._notifyUnhandledRejectionIsHandled();
-    }
-};
-
-Promise.prototype._isRejectionUnhandled = function () {
-    return (this._bitField & 2097152) > 0;
-};
-
-Promise.prototype._setCarriedStackTrace = function (capturedTrace) {
-    this._bitField = this._bitField | 1048576;
-    this._fulfillmentHandler0 = capturedTrace;
-};
-
-Promise.prototype._isCarryingStackTrace = function () {
-    return (this._bitField & 1048576) > 0;
-};
-
-Promise.prototype._getCarriedStackTrace = function () {
-    return this._isCarryingStackTrace()
-        ? this._fulfillmentHandler0
-        : undefined;
-};
-
-Promise.prototype._captureStackTrace = function () {
-    if (debugging) {
-        this._trace = new CapturedTrace(this._peekContext());
-    }
-    return this;
-};
-
-Promise.prototype._attachExtraTrace = function (error, ignoreSelf) {
-    if (debugging && canAttachTrace(error)) {
-        var trace = this._trace;
-        if (trace !== undefined) {
-            if (ignoreSelf) trace = trace._parent;
-        }
-        if (trace !== undefined) {
-            trace.attachExtraTrace(error);
-        } else if (!error.__stackCleaned__) {
-            var parsed = CapturedTrace.parseStackAndMessage(error);
-            util.notEnumerableProp(error, "stack",
-                parsed.message + "\n" + parsed.stack.join("\n"));
-            util.notEnumerableProp(error, "__stackCleaned__", true);
-        }
-    }
-};
-
-Promise.prototype._warn = function(message) {
-    var warning = new Warning(message);
-    var ctx = this._peekContext();
-    if (ctx) {
-        ctx.attachExtraTrace(warning);
-    } else {
-        var parsed = CapturedTrace.parseStackAndMessage(warning);
-        warning.stack = parsed.message + "\n" + parsed.stack.join("\n");
-    }
-    CapturedTrace.formatAndLogError(warning, "");
-};
-
-Promise.onPossiblyUnhandledRejection = function (fn) {
-    var domain = getDomain();
-    possiblyUnhandledRejection =
-        typeof fn === "function" ? (domain === null ? fn : domain.bind(fn))
-                                 : undefined;
-};
-
-Promise.onUnhandledRejectionHandled = function (fn) {
-    var domain = getDomain();
-    unhandledRejectionHandled =
-        typeof fn === "function" ? (domain === null ? fn : domain.bind(fn))
-                                 : undefined;
-};
-
-Promise.longStackTraces = function () {
-    if (async.haveItemsQueued() &&
-        debugging === false
-   ) {
-        throw new Error("cannot enable long stack traces after promises have been created\u000a\u000a    See http://goo.gl/DT1qyG\u000a");
-    }
-    debugging = CapturedTrace.isSupported();
-    if (debugging) {
-        async.disableTrampolineIfNecessary();
-    }
-};
-
-Promise.hasLongStackTraces = function () {
-    return debugging && CapturedTrace.isSupported();
-};
-
-if (!CapturedTrace.isSupported()) {
-    Promise.longStackTraces = function(){};
-    debugging = false;
-}
-
-return function() {
-    return debugging;
-};
-};
-
-},{"./async.js":2,"./errors.js":13,"./util.js":38}],11:[function(_dereq_,module,exports){
-"use strict";
-var util = _dereq_("./util.js");
-var isPrimitive = util.isPrimitive;
-
-module.exports = function(Promise) {
-var returner = function () {
-    return this;
-};
-var thrower = function () {
-    throw this;
-};
-var returnUndefined = function() {};
-var throwUndefined = function() {
-    throw undefined;
-};
-
-var wrapper = function (value, action) {
-    if (action === 1) {
-        return function () {
-            throw value;
-        };
-    } else if (action === 2) {
-        return function () {
-            return value;
-        };
-    }
-};
-
-
-Promise.prototype["return"] =
-Promise.prototype.thenReturn = function (value) {
-    if (value === undefined) return this.then(returnUndefined);
-
-    if (isPrimitive(value)) {
-        return this._then(
-            wrapper(value, 2),
-            undefined,
-            undefined,
-            undefined,
-            undefined
-       );
-    } else if (value instanceof Promise) {
-        value._ignoreRejections();
-    }
-    return this._then(returner, undefined, undefined, value, undefined);
-};
-
-Promise.prototype["throw"] =
-Promise.prototype.thenThrow = function (reason) {
-    if (reason === undefined) return this.then(throwUndefined);
-
-    if (isPrimitive(reason)) {
-        return this._then(
-            wrapper(reason, 1),
-            undefined,
-            undefined,
-            undefined,
-            undefined
-       );
-    }
-    return this._then(thrower, undefined, undefined, reason, undefined);
-};
-};
-
-},{"./util.js":38}],12:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise, INTERNAL) {
-var PromiseReduce = Promise.reduce;
-
-Promise.prototype.each = function (fn) {
-    return PromiseReduce(this, fn, null, INTERNAL);
-};
-
-Promise.each = function (promises, fn) {
-    return PromiseReduce(promises, fn, null, INTERNAL);
-};
-};
-
-},{}],13:[function(_dereq_,module,exports){
-"use strict";
-var es5 = _dereq_("./es5.js");
-var Objectfreeze = es5.freeze;
-var util = _dereq_("./util.js");
-var inherits = util.inherits;
-var notEnumerableProp = util.notEnumerableProp;
-
-function subError(nameProperty, defaultMessage) {
-    function SubError(message) {
-        if (!(this instanceof SubError)) return new SubError(message);
-        notEnumerableProp(this, "message",
-            typeof message === "string" ? message : defaultMessage);
-        notEnumerableProp(this, "name", nameProperty);
-        if (Error.captureStackTrace) {
-            Error.captureStackTrace(this, this.constructor);
-        } else {
-            Error.call(this);
-        }
-    }
-    inherits(SubError, Error);
-    return SubError;
-}
-
-var _TypeError, _RangeError;
-var Warning = subError("Warning", "warning");
-var CancellationError = subError("CancellationError", "cancellation error");
-var TimeoutError = subError("TimeoutError", "timeout error");
-var AggregateError = subError("AggregateError", "aggregate error");
-try {
-    _TypeError = TypeError;
-    _RangeError = RangeError;
-} catch(e) {
-    _TypeError = subError("TypeError", "type error");
-    _RangeError = subError("RangeError", "range error");
-}
-
-var methods = ("join pop push shift unshift slice filter forEach some " +
-    "every map indexOf lastIndexOf reduce reduceRight sort reverse").split(" ");
-
-for (var i = 0; i < methods.length; ++i) {
-    if (typeof Array.prototype[methods[i]] === "function") {
-        AggregateError.prototype[methods[i]] = Array.prototype[methods[i]];
-    }
-}
-
-es5.defineProperty(AggregateError.prototype, "length", {
-    value: 0,
-    configurable: false,
-    writable: true,
-    enumerable: true
-});
-AggregateError.prototype["isOperational"] = true;
-var level = 0;
-AggregateError.prototype.toString = function() {
-    var indent = Array(level * 4 + 1).join(" ");
-    var ret = "\n" + indent + "AggregateError of:" + "\n";
-    level++;
-    indent = Array(level * 4 + 1).join(" ");
-    for (var i = 0; i < this.length; ++i) {
-        var str = this[i] === this ? "[Circular AggregateError]" : this[i] + "";
-        var lines = str.split("\n");
-        for (var j = 0; j < lines.length; ++j) {
-            lines[j] = indent + lines[j];
-        }
-        str = lines.join("\n");
-        ret += str + "\n";
-    }
-    level--;
-    return ret;
-};
-
-function OperationalError(message) {
-    if (!(this instanceof OperationalError))
-        return new OperationalError(message);
-    notEnumerableProp(this, "name", "OperationalError");
-    notEnumerableProp(this, "message", message);
-    this.cause = message;
-    this["isOperational"] = true;
-
-    if (message instanceof Error) {
-        notEnumerableProp(this, "message", message.message);
-        notEnumerableProp(this, "stack", message.stack);
-    } else if (Error.captureStackTrace) {
-        Error.captureStackTrace(this, this.constructor);
-    }
-
-}
-inherits(OperationalError, Error);
-
-var errorTypes = Error["__BluebirdErrorTypes__"];
-if (!errorTypes) {
-    errorTypes = Objectfreeze({
-        CancellationError: CancellationError,
-        TimeoutError: TimeoutError,
-        OperationalError: OperationalError,
-        RejectionError: OperationalError,
-        AggregateError: AggregateError
-    });
-    notEnumerableProp(Error, "__BluebirdErrorTypes__", errorTypes);
-}
-
-module.exports = {
-    Error: Error,
-    TypeError: _TypeError,
-    RangeError: _RangeError,
-    CancellationError: errorTypes.CancellationError,
-    OperationalError: errorTypes.OperationalError,
-    TimeoutError: errorTypes.TimeoutError,
-    AggregateError: errorTypes.AggregateError,
-    Warning: Warning
-};
-
-},{"./es5.js":14,"./util.js":38}],14:[function(_dereq_,module,exports){
-var isES5 = (function(){
-    "use strict";
-    return this === undefined;
-})();
-
-if (isES5) {
-    module.exports = {
-        freeze: Object.freeze,
-        defineProperty: Object.defineProperty,
-        getDescriptor: Object.getOwnPropertyDescriptor,
-        keys: Object.keys,
-        names: Object.getOwnPropertyNames,
-        getPrototypeOf: Object.getPrototypeOf,
-        isArray: Array.isArray,
-        isES5: isES5,
-        propertyIsWritable: function(obj, prop) {
-            var descriptor = Object.getOwnPropertyDescriptor(obj, prop);
-            return !!(!descriptor || descriptor.writable || descriptor.set);
-        }
-    };
-} else {
-    var has = {}.hasOwnProperty;
-    var str = {}.toString;
-    var proto = {}.constructor.prototype;
-
-    var ObjectKeys = function (o) {
-        var ret = [];
-        for (var key in o) {
-            if (has.call(o, key)) {
-                ret.push(key);
-            }
-        }
-        return ret;
-    };
-
-    var ObjectGetDescriptor = function(o, key) {
-        return {value: o[key]};
-    };
-
-    var ObjectDefineProperty = function (o, key, desc) {
-        o[key] = desc.value;
-        return o;
-    };
-
-    var ObjectFreeze = function (obj) {
-        return obj;
-    };
-
-    var ObjectGetPrototypeOf = function (obj) {
-        try {
-            return Object(obj).constructor.prototype;
-        }
-        catch (e) {
-            return proto;
-        }
-    };
-
-    var ArrayIsArray = function (obj) {
-        try {
-            return str.call(obj) === "[object Array]";
-        }
-        catch(e) {
-            return false;
-        }
-    };
-
-    module.exports = {
-        isArray: ArrayIsArray,
-        keys: ObjectKeys,
-        names: ObjectKeys,
-        defineProperty: ObjectDefineProperty,
-        getDescriptor: ObjectGetDescriptor,
-        freeze: ObjectFreeze,
-        getPrototypeOf: ObjectGetPrototypeOf,
-        isES5: isES5,
-        propertyIsWritable: function() {
-            return true;
-        }
-    };
-}
-
-},{}],15:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise, INTERNAL) {
-var PromiseMap = Promise.map;
-
-Promise.prototype.filter = function (fn, options) {
-    return PromiseMap(this, fn, options, INTERNAL);
-};
-
-Promise.filter = function (promises, fn, options) {
-    return PromiseMap(promises, fn, options, INTERNAL);
-};
-};
-
-},{}],16:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise, NEXT_FILTER, tryConvertToPromise) {
-var util = _dereq_("./util.js");
-var isPrimitive = util.isPrimitive;
-var thrower = util.thrower;
-
-function returnThis() {
-    return this;
-}
-function throwThis() {
-    throw this;
-}
-function return$(r) {
-    return function() {
-        return r;
-    };
-}
-function throw$(r) {
-    return function() {
-        throw r;
-    };
-}
-function promisedFinally(ret, reasonOrValue, isFulfilled) {
-    var then;
-    if (isPrimitive(reasonOrValue)) {
-        then = isFulfilled ? return$(reasonOrValue) : throw$(reasonOrValue);
-    } else {
-        then = isFulfilled ? returnThis : throwThis;
-    }
-    return ret._then(then, thrower, undefined, reasonOrValue, undefined);
-}
-
-function finallyHandler(reasonOrValue) {
-    var promise = this.promise;
-    var handler = this.handler;
-
-    var ret = promise._isBound()
-                    ? handler.call(promise._boundValue())
-                    : handler();
-
-    if (ret !== undefined) {
-        var maybePromise = tryConvertToPromise(ret, promise);
-        if (maybePromise instanceof Promise) {
-            maybePromise = maybePromise._target();
-            return promisedFinally(maybePromise, reasonOrValue,
-                                    promise.isFulfilled());
-        }
-    }
-
-    if (promise.isRejected()) {
-        NEXT_FILTER.e = reasonOrValue;
-        return NEXT_FILTER;
-    } else {
-        return reasonOrValue;
-    }
-}
-
-function tapHandler(value) {
-    var promise = this.promise;
-    var handler = this.handler;
-
-    var ret = promise._isBound()
-                    ? handler.call(promise._boundValue(), value)
-                    : handler(value);
-
-    if (ret !== undefined) {
-        var maybePromise = tryConvertToPromise(ret, promise);
-        if (maybePromise instanceof Promise) {
-            maybePromise = maybePromise._target();
-            return promisedFinally(maybePromise, value, true);
-        }
-    }
-    return value;
-}
-
-Promise.prototype._passThroughHandler = function (handler, isFinally) {
-    if (typeof handler !== "function") return this.then();
-
-    var promiseAndHandler = {
-        promise: this,
-        handler: handler
-    };
-
-    return this._then(
-            isFinally ? finallyHandler : tapHandler,
-            isFinally ? finallyHandler : undefined, undefined,
-            promiseAndHandler, undefined);
-};
-
-Promise.prototype.lastly =
-Promise.prototype["finally"] = function (handler) {
-    return this._passThroughHandler(handler, true);
-};
-
-Promise.prototype.tap = function (handler) {
-    return this._passThroughHandler(handler, false);
-};
-};
-
-},{"./util.js":38}],17:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise,
-                          apiRejection,
-                          INTERNAL,
-                          tryConvertToPromise) {
-var errors = _dereq_("./errors.js");
-var TypeError = errors.TypeError;
-var util = _dereq_("./util.js");
-var errorObj = util.errorObj;
-var tryCatch = util.tryCatch;
-var yieldHandlers = [];
-
-function promiseFromYieldHandler(value, yieldHandlers, traceParent) {
-    for (var i = 0; i < yieldHandlers.length; ++i) {
-        traceParent._pushContext();
-        var result = tryCatch(yieldHandlers[i])(value);
-        traceParent._popContext();
-        if (result === errorObj) {
-            traceParent._pushContext();
-            var ret = Promise.reject(errorObj.e);
-            traceParent._popContext();
-            return ret;
-        }
-        var maybePromise = tryConvertToPromise(result, traceParent);
-        if (maybePromise instanceof Promise) return maybePromise;
-    }
-    return null;
-}
-
-function PromiseSpawn(generatorFunction, receiver, yieldHandler, stack) {
-    var promise = this._promise = new Promise(INTERNAL);
-    promise._captureStackTrace();
-    this._stack = stack;
-    this._generatorFunction = generatorFunction;
-    this._receiver = receiver;
-    this._generator = undefined;
-    this._yieldHandlers = typeof yieldHandler === "function"
-        ? [yieldHandler].concat(yieldHandlers)
-        : yieldHandlers;
-}
-
-PromiseSpawn.prototype.promise = function () {
-    return this._promise;
-};
-
-PromiseSpawn.prototype._run = function () {
-    this._generator = this._generatorFunction.call(this._receiver);
-    this._receiver =
-        this._generatorFunction = undefined;
-    this._next(undefined);
-};
-
-PromiseSpawn.prototype._continue = function (result) {
-    if (result === errorObj) {
-        return this._promise._rejectCallback(result.e, false, true);
-    }
-
-    var value = result.value;
-    if (result.done === true) {
-        this._promise._resolveCallback(value);
-    } else {
-        var maybePromise = tryConvertToPromise(value, this._promise);
-        if (!(maybePromise instanceof Promise)) {
-            maybePromise =
-                promiseFromYieldHandler(maybePromise,
-                                        this._yieldHandlers,
-                                        this._promise);
-            if (maybePromise === null) {
-                this._throw(
-                    new TypeError(
-                        "A value %s was yielded that could not be treated as a promise\u000a\u000a    See http://goo.gl/4Y4pDk\u000a\u000a".replace("%s", value) +
-                        "From coroutine:\u000a" +
-                        this._stack.split("\n").slice(1, -7).join("\n")
-                    )
-                );
-                return;
-            }
-        }
-        maybePromise._then(
-            this._next,
-            this._throw,
-            undefined,
-            this,
-            null
-       );
-    }
-};
-
-PromiseSpawn.prototype._throw = function (reason) {
-    this._promise._attachExtraTrace(reason);
-    this._promise._pushContext();
-    var result = tryCatch(this._generator["throw"])
-        .call(this._generator, reason);
-    this._promise._popContext();
-    this._continue(result);
-};
-
-PromiseSpawn.prototype._next = function (value) {
-    this._promise._pushContext();
-    var result = tryCatch(this._generator.next).call(this._generator, value);
-    this._promise._popContext();
-    this._continue(result);
-};
-
-Promise.coroutine = function (generatorFunction, options) {
-    if (typeof generatorFunction !== "function") {
-        throw new TypeError("generatorFunction must be a function\u000a\u000a    See http://goo.gl/6Vqhm0\u000a");
-    }
-    var yieldHandler = Object(options).yieldHandler;
-    var PromiseSpawn$ = PromiseSpawn;
-    var stack = new Error().stack;
-    return function () {
-        var generator = generatorFunction.apply(this, arguments);
-        var spawn = new PromiseSpawn$(undefined, undefined, yieldHandler,
-                                      stack);
-        spawn._generator = generator;
-        spawn._next(undefined);
-        return spawn.promise();
-    };
-};
-
-Promise.coroutine.addYieldHandler = function(fn) {
-    if (typeof fn !== "function") throw new TypeError("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-    yieldHandlers.push(fn);
-};
-
-Promise.spawn = function (generatorFunction) {
-    if (typeof generatorFunction !== "function") {
-        return apiRejection("generatorFunction must be a function\u000a\u000a    See http://goo.gl/6Vqhm0\u000a");
-    }
-    var spawn = new PromiseSpawn(generatorFunction, this);
-    var ret = spawn.promise();
-    spawn._run(Promise.spawn);
-    return ret;
-};
-};
-
-},{"./errors.js":13,"./util.js":38}],18:[function(_dereq_,module,exports){
-"use strict";
-module.exports =
-function(Promise, PromiseArray, tryConvertToPromise, INTERNAL) {
-var util = _dereq_("./util.js");
-var canEvaluate = util.canEvaluate;
-var tryCatch = util.tryCatch;
-var errorObj = util.errorObj;
-var reject;
-
-if (!true) {
-if (canEvaluate) {
-    var thenCallback = function(i) {
-        return new Function("value", "holder", "                             \n\
-            'use strict';                                                    \n\
-            holder.pIndex = value;                                           \n\
-            holder.checkFulfillment(this);                                   \n\
-            ".replace(/Index/g, i));
-    };
-
-    var caller = function(count) {
-        var values = [];
-        for (var i = 1; i <= count; ++i) values.push("holder.p" + i);
-        return new Function("holder", "                                      \n\
-            'use strict';                                                    \n\
-            var callback = holder.fn;                                        \n\
-            return callback(values);                                         \n\
-            ".replace(/values/g, values.join(", ")));
-    };
-    var thenCallbacks = [];
-    var callers = [undefined];
-    for (var i = 1; i <= 5; ++i) {
-        thenCallbacks.push(thenCallback(i));
-        callers.push(caller(i));
-    }
-
-    var Holder = function(total, fn) {
-        this.p1 = this.p2 = this.p3 = this.p4 = this.p5 = null;
-        this.fn = fn;
-        this.total = total;
-        this.now = 0;
-    };
-
-    Holder.prototype.callers = callers;
-    Holder.prototype.checkFulfillment = function(promise) {
-        var now = this.now;
-        now++;
-        var total = this.total;
-        if (now >= total) {
-            var handler = this.callers[total];
-            promise._pushContext();
-            var ret = tryCatch(handler)(this);
-            promise._popContext();
-            if (ret === errorObj) {
-                promise._rejectCallback(ret.e, false, true);
-            } else {
-                promise._resolveCallback(ret);
-            }
-        } else {
-            this.now = now;
-        }
-    };
-
-    var reject = function (reason) {
-        this._reject(reason);
-    };
-}
-}
-
-Promise.join = function () {
-    var last = arguments.length - 1;
-    var fn;
-    if (last > 0 && typeof arguments[last] === "function") {
-        fn = arguments[last];
-        if (!true) {
-            if (last < 6 && canEvaluate) {
-                var ret = new Promise(INTERNAL);
-                ret._captureStackTrace();
-                var holder = new Holder(last, fn);
-                var callbacks = thenCallbacks;
-                for (var i = 0; i < last; ++i) {
-                    var maybePromise = tryConvertToPromise(arguments[i], ret);
-                    if (maybePromise instanceof Promise) {
-                        maybePromise = maybePromise._target();
-                        if (maybePromise._isPending()) {
-                            maybePromise._then(callbacks[i], reject,
-                                               undefined, ret, holder);
-                        } else if (maybePromise._isFulfilled()) {
-                            callbacks[i].call(ret,
-                                              maybePromise._value(), holder);
-                        } else {
-                            ret._reject(maybePromise._reason());
-                        }
-                    } else {
-                        callbacks[i].call(ret, maybePromise, holder);
-                    }
-                }
-                return ret;
-            }
-        }
-    }
-    var $_len = arguments.length;var args = new Array($_len); for(var $_i = 0; $_i < $_len; ++$_i) {args[$_i] = arguments[$_i];}
-    if (fn) args.pop();
-    var ret = new PromiseArray(args).promise();
-    return fn !== undefined ? ret.spread(fn) : ret;
-};
-
-};
-
-},{"./util.js":38}],19:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise,
-                          PromiseArray,
-                          apiRejection,
-                          tryConvertToPromise,
-                          INTERNAL) {
-var getDomain = Promise._getDomain;
-var async = _dereq_("./async.js");
-var util = _dereq_("./util.js");
-var tryCatch = util.tryCatch;
-var errorObj = util.errorObj;
-var PENDING = {};
-var EMPTY_ARRAY = [];
-
-function MappingPromiseArray(promises, fn, limit, _filter) {
-    this.constructor$(promises);
-    this._promise._captureStackTrace();
-    var domain = getDomain();
-    this._callback = domain === null ? fn : domain.bind(fn);
-    this._preservedValues = _filter === INTERNAL
-        ? new Array(this.length())
-        : null;
-    this._limit = limit;
-    this._inFlight = 0;
-    this._queue = limit >= 1 ? [] : EMPTY_ARRAY;
-    async.invoke(init, this, undefined);
-}
-util.inherits(MappingPromiseArray, PromiseArray);
-function init() {this._init$(undefined, -2);}
-
-MappingPromiseArray.prototype._init = function () {};
-
-MappingPromiseArray.prototype._promiseFulfilled = function (value, index) {
-    var values = this._values;
-    var length = this.length();
-    var preservedValues = this._preservedValues;
-    var limit = this._limit;
-    if (values[index] === PENDING) {
-        values[index] = value;
-        if (limit >= 1) {
-            this._inFlight--;
-            this._drainQueue();
-            if (this._isResolved()) return;
-        }
-    } else {
-        if (limit >= 1 && this._inFlight >= limit) {
-            values[index] = value;
-            this._queue.push(index);
-            return;
-        }
-        if (preservedValues !== null) preservedValues[index] = value;
-
-        var callback = this._callback;
-        var receiver = this._promise._boundValue();
-        this._promise._pushContext();
-        var ret = tryCatch(callback).call(receiver, value, index, length);
-        this._promise._popContext();
-        if (ret === errorObj) return this._reject(ret.e);
-
-        var maybePromise = tryConvertToPromise(ret, this._promise);
-        if (maybePromise instanceof Promise) {
-            maybePromise = maybePromise._target();
-            if (maybePromise._isPending()) {
-                if (limit >= 1) this._inFlight++;
-                values[index] = PENDING;
-                return maybePromise._proxyPromiseArray(this, index);
-            } else if (maybePromise._isFulfilled()) {
-                ret = maybePromise._value();
-            } else {
-                return this._reject(maybePromise._reason());
-            }
-        }
-        values[index] = ret;
-    }
-    var totalResolved = ++this._totalResolved;
-    if (totalResolved >= length) {
-        if (preservedValues !== null) {
-            this._filter(values, preservedValues);
-        } else {
-            this._resolve(values);
-        }
-
-    }
-};
-
-MappingPromiseArray.prototype._drainQueue = function () {
-    var queue = this._queue;
-    var limit = this._limit;
-    var values = this._values;
-    while (queue.length > 0 && this._inFlight < limit) {
-        if (this._isResolved()) return;
-        var index = queue.pop();
-        this._promiseFulfilled(values[index], index);
-    }
-};
-
-MappingPromiseArray.prototype._filter = function (booleans, values) {
-    var len = values.length;
-    var ret = new Array(len);
-    var j = 0;
-    for (var i = 0; i < len; ++i) {
-        if (booleans[i]) ret[j++] = values[i];
-    }
-    ret.length = j;
-    this._resolve(ret);
-};
-
-MappingPromiseArray.prototype.preservedValues = function () {
-    return this._preservedValues;
-};
-
-function map(promises, fn, options, _filter) {
-    var limit = typeof options === "object" && options !== null
-        ? options.concurrency
-        : 0;
-    limit = typeof limit === "number" &&
-        isFinite(limit) && limit >= 1 ? limit : 0;
-    return new MappingPromiseArray(promises, fn, limit, _filter);
-}
-
-Promise.prototype.map = function (fn, options) {
-    if (typeof fn !== "function") return apiRejection("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-
-    return map(this, fn, options, null).promise();
-};
-
-Promise.map = function (promises, fn, options, _filter) {
-    if (typeof fn !== "function") return apiRejection("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-    return map(promises, fn, options, _filter).promise();
-};
-
-
-};
-
-},{"./async.js":2,"./util.js":38}],20:[function(_dereq_,module,exports){
-"use strict";
-module.exports =
-function(Promise, INTERNAL, tryConvertToPromise, apiRejection) {
-var util = _dereq_("./util.js");
-var tryCatch = util.tryCatch;
-
-Promise.method = function (fn) {
-    if (typeof fn !== "function") {
-        throw new Promise.TypeError("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-    }
-    return function () {
-        var ret = new Promise(INTERNAL);
-        ret._captureStackTrace();
-        ret._pushContext();
-        var value = tryCatch(fn).apply(this, arguments);
-        ret._popContext();
-        ret._resolveFromSyncValue(value);
-        return ret;
-    };
-};
-
-Promise.attempt = Promise["try"] = function (fn, args, ctx) {
-    if (typeof fn !== "function") {
-        return apiRejection("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-    }
-    var ret = new Promise(INTERNAL);
-    ret._captureStackTrace();
-    ret._pushContext();
-    var value = util.isArray(args)
-        ? tryCatch(fn).apply(ctx, args)
-        : tryCatch(fn).call(ctx, args);
-    ret._popContext();
-    ret._resolveFromSyncValue(value);
-    return ret;
-};
-
-Promise.prototype._resolveFromSyncValue = function (value) {
-    if (value === util.errorObj) {
-        this._rejectCallback(value.e, false, true);
-    } else {
-        this._resolveCallback(value, true);
-    }
-};
-};
-
-},{"./util.js":38}],21:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise) {
-var util = _dereq_("./util.js");
-var async = _dereq_("./async.js");
-var tryCatch = util.tryCatch;
-var errorObj = util.errorObj;
-
-function spreadAdapter(val, nodeback) {
-    var promise = this;
-    if (!util.isArray(val)) return successAdapter.call(promise, val, nodeback);
-    var ret =
-        tryCatch(nodeback).apply(promise._boundValue(), [null].concat(val));
-    if (ret === errorObj) {
-        async.throwLater(ret.e);
-    }
-}
-
-function successAdapter(val, nodeback) {
-    var promise = this;
-    var receiver = promise._boundValue();
-    var ret = val === undefined
-        ? tryCatch(nodeback).call(receiver, null)
-        : tryCatch(nodeback).call(receiver, null, val);
-    if (ret === errorObj) {
-        async.throwLater(ret.e);
-    }
-}
-function errorAdapter(reason, nodeback) {
-    var promise = this;
-    if (!reason) {
-        var target = promise._target();
-        var newReason = target._getCarriedStackTrace();
-        newReason.cause = reason;
-        reason = newReason;
-    }
-    var ret = tryCatch(nodeback).call(promise._boundValue(), reason);
-    if (ret === errorObj) {
-        async.throwLater(ret.e);
-    }
-}
-
-Promise.prototype.asCallback =
-Promise.prototype.nodeify = function (nodeback, options) {
-    if (typeof nodeback == "function") {
-        var adapter = successAdapter;
-        if (options !== undefined && Object(options).spread) {
-            adapter = spreadAdapter;
-        }
-        this._then(
-            adapter,
-            errorAdapter,
-            undefined,
-            this,
-            nodeback
-        );
-    }
-    return this;
-};
-};
-
-},{"./async.js":2,"./util.js":38}],22:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise, PromiseArray) {
-var util = _dereq_("./util.js");
-var async = _dereq_("./async.js");
-var tryCatch = util.tryCatch;
-var errorObj = util.errorObj;
-
-Promise.prototype.progressed = function (handler) {
-    return this._then(undefined, undefined, handler, undefined, undefined);
-};
-
-Promise.prototype._progress = function (progressValue) {
-    if (this._isFollowingOrFulfilledOrRejected()) return;
-    this._target()._progressUnchecked(progressValue);
-
-};
-
-Promise.prototype._progressHandlerAt = function (index) {
-    return index === 0
-        ? this._progressHandler0
-        : this[(index << 2) + index - 5 + 2];
-};
-
-Promise.prototype._doProgressWith = function (progression) {
-    var progressValue = progression.value;
-    var handler = progression.handler;
-    var promise = progression.promise;
-    var receiver = progression.receiver;
-
-    var ret = tryCatch(handler).call(receiver, progressValue);
-    if (ret === errorObj) {
-        if (ret.e != null &&
-            ret.e.name !== "StopProgressPropagation") {
-            var trace = util.canAttachTrace(ret.e)
-                ? ret.e : new Error(util.toString(ret.e));
-            promise._attachExtraTrace(trace);
-            promise._progress(ret.e);
-        }
-    } else if (ret instanceof Promise) {
-        ret._then(promise._progress, null, null, promise, undefined);
-    } else {
-        promise._progress(ret);
-    }
-};
-
-
-Promise.prototype._progressUnchecked = function (progressValue) {
-    var len = this._length();
-    var progress = this._progress;
-    for (var i = 0; i < len; i++) {
-        var handler = this._progressHandlerAt(i);
-        var promise = this._promiseAt(i);
-        if (!(promise instanceof Promise)) {
-            var receiver = this._receiverAt(i);
-            if (typeof handler === "function") {
-                handler.call(receiver, progressValue, promise);
-            } else if (receiver instanceof PromiseArray &&
-                       !receiver._isResolved()) {
-                receiver._promiseProgressed(progressValue, promise);
-            }
-            continue;
-        }
-
-        if (typeof handler === "function") {
-            async.invoke(this._doProgressWith, this, {
-                handler: handler,
-                promise: promise,
-                receiver: this._receiverAt(i),
-                value: progressValue
-            });
-        } else {
-            async.invoke(progress, promise, progressValue);
-        }
-    }
-};
-};
-
-},{"./async.js":2,"./util.js":38}],23:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function() {
-var makeSelfResolutionError = function () {
-    return new TypeError("circular promise resolution chain\u000a\u000a    See http://goo.gl/LhFpo0\u000a");
-};
-var reflect = function() {
-    return new Promise.PromiseInspection(this._target());
-};
-var apiRejection = function(msg) {
-    return Promise.reject(new TypeError(msg));
-};
-
-var util = _dereq_("./util.js");
-
-var getDomain;
-if (util.isNode) {
-    getDomain = function() {
-        var ret = process.domain;
-        if (ret === undefined) ret = null;
-        return ret;
-    };
-} else {
-    getDomain = function() {
-        return null;
-    };
-}
-util.notEnumerableProp(Promise, "_getDomain", getDomain);
-
-var UNDEFINED_BINDING = {};
-var async = _dereq_("./async.js");
-var errors = _dereq_("./errors.js");
-var TypeError = Promise.TypeError = errors.TypeError;
-Promise.RangeError = errors.RangeError;
-Promise.CancellationError = errors.CancellationError;
-Promise.TimeoutError = errors.TimeoutError;
-Promise.OperationalError = errors.OperationalError;
-Promise.RejectionError = errors.OperationalError;
-Promise.AggregateError = errors.AggregateError;
-var INTERNAL = function(){};
-var APPLY = {};
-var NEXT_FILTER = {e: null};
-var tryConvertToPromise = _dereq_("./thenables.js")(Promise, INTERNAL);
-var PromiseArray =
-    _dereq_("./promise_array.js")(Promise, INTERNAL,
-                                    tryConvertToPromise, apiRejection);
-var CapturedTrace = _dereq_("./captured_trace.js")();
-var isDebugging = _dereq_("./debuggability.js")(Promise, CapturedTrace);
- /*jshint unused:false*/
-var createContext =
-    _dereq_("./context.js")(Promise, CapturedTrace, isDebugging);
-var CatchFilter = _dereq_("./catch_filter.js")(NEXT_FILTER);
-var PromiseResolver = _dereq_("./promise_resolver.js");
-var nodebackForPromise = PromiseResolver._nodebackForPromise;
-var errorObj = util.errorObj;
-var tryCatch = util.tryCatch;
-function Promise(resolver) {
-    if (typeof resolver !== "function") {
-        throw new TypeError("the promise constructor requires a resolver function\u000a\u000a    See http://goo.gl/EC22Yn\u000a");
-    }
-    if (this.constructor !== Promise) {
-        throw new TypeError("the promise constructor cannot be invoked directly\u000a\u000a    See http://goo.gl/KsIlge\u000a");
-    }
-    this._bitField = 0;
-    this._fulfillmentHandler0 = undefined;
-    this._rejectionHandler0 = undefined;
-    this._progressHandler0 = undefined;
-    this._promise0 = undefined;
-    this._receiver0 = undefined;
-    this._settledValue = undefined;
-    if (resolver !== INTERNAL) this._resolveFromResolver(resolver);
-}
-
-Promise.prototype.toString = function () {
-    return "[object Promise]";
-};
-
-Promise.prototype.caught = Promise.prototype["catch"] = function (fn) {
-    var len = arguments.length;
-    if (len > 1) {
-        var catchInstances = new Array(len - 1),
-            j = 0, i;
-        for (i = 0; i < len - 1; ++i) {
-            var item = arguments[i];
-            if (typeof item === "function") {
-                catchInstances[j++] = item;
-            } else {
-                return Promise.reject(
-                    new TypeError("Catch filter must inherit from Error or be a simple predicate function\u000a\u000a    See http://goo.gl/o84o68\u000a"));
-            }
-        }
-        catchInstances.length = j;
-        fn = arguments[i];
-        var catchFilter = new CatchFilter(catchInstances, fn, this);
-        return this._then(undefined, catchFilter.doFilter, undefined,
-            catchFilter, undefined);
-    }
-    return this._then(undefined, fn, undefined, undefined, undefined);
-};
-
-Promise.prototype.reflect = function () {
-    return this._then(reflect, reflect, undefined, this, undefined);
-};
-
-Promise.prototype.then = function (didFulfill, didReject, didProgress) {
-    if (isDebugging() && arguments.length > 0 &&
-        typeof didFulfill !== "function" &&
-        typeof didReject !== "function") {
-        var msg = ".then() only accepts functions but was passed: " +
-                util.classString(didFulfill);
-        if (arguments.length > 1) {
-            msg += ", " + util.classString(didReject);
-        }
-        this._warn(msg);
-    }
-    return this._then(didFulfill, didReject, didProgress,
-        undefined, undefined);
-};
-
-Promise.prototype.done = function (didFulfill, didReject, didProgress) {
-    var promise = this._then(didFulfill, didReject, didProgress,
-        undefined, undefined);
-    promise._setIsFinal();
-};
-
-Promise.prototype.spread = function (didFulfill, didReject) {
-    return this.all()._then(didFulfill, didReject, undefined, APPLY, undefined);
-};
-
-Promise.prototype.isCancellable = function () {
-    return !this.isResolved() &&
-        this._cancellable();
-};
-
-Promise.prototype.toJSON = function () {
-    var ret = {
-        isFulfilled: false,
-        isRejected: false,
-        fulfillmentValue: undefined,
-        rejectionReason: undefined
-    };
-    if (this.isFulfilled()) {
-        ret.fulfillmentValue = this.value();
-        ret.isFulfilled = true;
-    } else if (this.isRejected()) {
-        ret.rejectionReason = this.reason();
-        ret.isRejected = true;
-    }
-    return ret;
-};
-
-Promise.prototype.all = function () {
-    return new PromiseArray(this).promise();
-};
-
-Promise.prototype.error = function (fn) {
-    return this.caught(util.originatesFromRejection, fn);
-};
-
-Promise.is = function (val) {
-    return val instanceof Promise;
-};
-
-Promise.fromNode = function(fn) {
-    var ret = new Promise(INTERNAL);
-    var result = tryCatch(fn)(nodebackForPromise(ret));
-    if (result === errorObj) {
-        ret._rejectCallback(result.e, true, true);
-    }
-    return ret;
-};
-
-Promise.all = function (promises) {
-    return new PromiseArray(promises).promise();
-};
-
-Promise.defer = Promise.pending = function () {
-    var promise = new Promise(INTERNAL);
-    return new PromiseResolver(promise);
-};
-
-Promise.cast = function (obj) {
-    var ret = tryConvertToPromise(obj);
-    if (!(ret instanceof Promise)) {
-        var val = ret;
-        ret = new Promise(INTERNAL);
-        ret._fulfillUnchecked(val);
-    }
-    return ret;
-};
-
-Promise.resolve = Promise.fulfilled = Promise.cast;
-
-Promise.reject = Promise.rejected = function (reason) {
-    var ret = new Promise(INTERNAL);
-    ret._captureStackTrace();
-    ret._rejectCallback(reason, true);
-    return ret;
-};
-
-Promise.setScheduler = function(fn) {
-    if (typeof fn !== "function") throw new TypeError("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-    var prev = async._schedule;
-    async._schedule = fn;
-    return prev;
-};
-
-Promise.prototype._then = function (
-    didFulfill,
-    didReject,
-    didProgress,
-    receiver,
-    internalData
-) {
-    var haveInternalData = internalData !== undefined;
-    var ret = haveInternalData ? internalData : new Promise(INTERNAL);
-
-    if (!haveInternalData) {
-        ret._propagateFrom(this, 4 | 1);
-        ret._captureStackTrace();
-    }
-
-    var target = this._target();
-    if (target !== this) {
-        if (receiver === undefined) receiver = this._boundTo;
-        if (!haveInternalData) ret._setIsMigrated();
-    }
-
-    var callbackIndex = target._addCallbacks(didFulfill,
-                                             didReject,
-                                             didProgress,
-                                             ret,
-                                             receiver,
-                                             getDomain());
-
-    if (target._isResolved() && !target._isSettlePromisesQueued()) {
-        async.invoke(
-            target._settlePromiseAtPostResolution, target, callbackIndex);
-    }
-
-    return ret;
-};
-
-Promise.prototype._settlePromiseAtPostResolution = function (index) {
-    if (this._isRejectionUnhandled()) this._unsetRejectionIsUnhandled();
-    this._settlePromiseAt(index);
-};
-
-Promise.prototype._length = function () {
-    return this._bitField & 131071;
-};
-
-Promise.prototype._isFollowingOrFulfilledOrRejected = function () {
-    return (this._bitField & 939524096) > 0;
-};
-
-Promise.prototype._isFollowing = function () {
-    return (this._bitField & 536870912) === 536870912;
-};
-
-Promise.prototype._setLength = function (len) {
-    this._bitField = (this._bitField & -131072) |
-        (len & 131071);
-};
-
-Promise.prototype._setFulfilled = function () {
-    this._bitField = this._bitField | 268435456;
-};
-
-Promise.prototype._setRejected = function () {
-    this._bitField = this._bitField | 134217728;
-};
-
-Promise.prototype._setFollowing = function () {
-    this._bitField = this._bitField | 536870912;
-};
-
-Promise.prototype._setIsFinal = function () {
-    this._bitField = this._bitField | 33554432;
-};
-
-Promise.prototype._isFinal = function () {
-    return (this._bitField & 33554432) > 0;
-};
-
-Promise.prototype._cancellable = function () {
-    return (this._bitField & 67108864) > 0;
-};
-
-Promise.prototype._setCancellable = function () {
-    this._bitField = this._bitField | 67108864;
-};
-
-Promise.prototype._unsetCancellable = function () {
-    this._bitField = this._bitField & (~67108864);
-};
-
-Promise.prototype._setIsMigrated = function () {
-    this._bitField = this._bitField | 4194304;
-};
-
-Promise.prototype._unsetIsMigrated = function () {
-    this._bitField = this._bitField & (~4194304);
-};
-
-Promise.prototype._isMigrated = function () {
-    return (this._bitField & 4194304) > 0;
-};
-
-Promise.prototype._receiverAt = function (index) {
-    var ret = index === 0
-        ? this._receiver0
-        : this[
-            index * 5 - 5 + 4];
-    if (ret === UNDEFINED_BINDING) {
-        return undefined;
-    } else if (ret === undefined && this._isBound()) {
-        return this._boundValue();
-    }
-    return ret;
-};
-
-Promise.prototype._promiseAt = function (index) {
-    return index === 0
-        ? this._promise0
-        : this[index * 5 - 5 + 3];
-};
-
-Promise.prototype._fulfillmentHandlerAt = function (index) {
-    return index === 0
-        ? this._fulfillmentHandler0
-        : this[index * 5 - 5 + 0];
-};
-
-Promise.prototype._rejectionHandlerAt = function (index) {
-    return index === 0
-        ? this._rejectionHandler0
-        : this[index * 5 - 5 + 1];
-};
-
-Promise.prototype._boundValue = function() {
-    var ret = this._boundTo;
-    if (ret !== undefined) {
-        if (ret instanceof Promise) {
-            if (ret.isFulfilled()) {
-                return ret.value();
-            } else {
-                return undefined;
-            }
-        }
-    }
-    return ret;
-};
-
-Promise.prototype._migrateCallbacks = function (follower, index) {
-    var fulfill = follower._fulfillmentHandlerAt(index);
-    var reject = follower._rejectionHandlerAt(index);
-    var progress = follower._progressHandlerAt(index);
-    var promise = follower._promiseAt(index);
-    var receiver = follower._receiverAt(index);
-    if (promise instanceof Promise) promise._setIsMigrated();
-    if (receiver === undefined) receiver = UNDEFINED_BINDING;
-    this._addCallbacks(fulfill, reject, progress, promise, receiver, null);
-};
-
-Promise.prototype._addCallbacks = function (
-    fulfill,
-    reject,
-    progress,
-    promise,
-    receiver,
-    domain
-) {
-    var index = this._length();
-
-    if (index >= 131071 - 5) {
-        index = 0;
-        this._setLength(0);
-    }
-
-    if (index === 0) {
-        this._promise0 = promise;
-        if (receiver !== undefined) this._receiver0 = receiver;
-        if (typeof fulfill === "function" && !this._isCarryingStackTrace()) {
-            this._fulfillmentHandler0 =
-                domain === null ? fulfill : domain.bind(fulfill);
-        }
-        if (typeof reject === "function") {
-            this._rejectionHandler0 =
-                domain === null ? reject : domain.bind(reject);
-        }
-        if (typeof progress === "function") {
-            this._progressHandler0 =
-                domain === null ? progress : domain.bind(progress);
-        }
-    } else {
-        var base = index * 5 - 5;
-        this[base + 3] = promise;
-        this[base + 4] = receiver;
-        if (typeof fulfill === "function") {
-            this[base + 0] =
-                domain === null ? fulfill : domain.bind(fulfill);
-        }
-        if (typeof reject === "function") {
-            this[base + 1] =
-                domain === null ? reject : domain.bind(reject);
-        }
-        if (typeof progress === "function") {
-            this[base + 2] =
-                domain === null ? progress : domain.bind(progress);
-        }
-    }
-    this._setLength(index + 1);
-    return index;
-};
-
-Promise.prototype._setProxyHandlers = function (receiver, promiseSlotValue) {
-    var index = this._length();
-
-    if (index >= 131071 - 5) {
-        index = 0;
-        this._setLength(0);
-    }
-    if (index === 0) {
-        this._promise0 = promiseSlotValue;
-        this._receiver0 = receiver;
-    } else {
-        var base = index * 5 - 5;
-        this[base + 3] = promiseSlotValue;
-        this[base + 4] = receiver;
-    }
-    this._setLength(index + 1);
-};
-
-Promise.prototype._proxyPromiseArray = function (promiseArray, index) {
-    this._setProxyHandlers(promiseArray, index);
-};
-
-Promise.prototype._resolveCallback = function(value, shouldBind) {
-    if (this._isFollowingOrFulfilledOrRejected()) return;
-    if (value === this)
-        return this._rejectCallback(makeSelfResolutionError(), false, true);
-    var maybePromise = tryConvertToPromise(value, this);
-    if (!(maybePromise instanceof Promise)) return this._fulfill(value);
-
-    var propagationFlags = 1 | (shouldBind ? 4 : 0);
-    this._propagateFrom(maybePromise, propagationFlags);
-    var promise = maybePromise._target();
-    if (promise._isPending()) {
-        var len = this._length();
-        for (var i = 0; i < len; ++i) {
-            promise._migrateCallbacks(this, i);
-        }
-        this._setFollowing();
-        this._setLength(0);
-        this._setFollowee(promise);
-    } else if (promise._isFulfilled()) {
-        this._fulfillUnchecked(promise._value());
-    } else {
-        this._rejectUnchecked(promise._reason(),
-            promise._getCarriedStackTrace());
-    }
-};
-
-Promise.prototype._rejectCallback =
-function(reason, synchronous, shouldNotMarkOriginatingFromRejection) {
-    if (!shouldNotMarkOriginatingFromRejection) {
-        util.markAsOriginatingFromRejection(reason);
-    }
-    var trace = util.ensureErrorObject(reason);
-    var hasStack = trace === reason;
-    this._attachExtraTrace(trace, synchronous ? hasStack : false);
-    this._reject(reason, hasStack ? undefined : trace);
-};
-
-Promise.prototype._resolveFromResolver = function (resolver) {
-    var promise = this;
-    this._captureStackTrace();
-    this._pushContext();
-    var synchronous = true;
-    var r = tryCatch(resolver)(function(value) {
-        if (promise === null) return;
-        promise._resolveCallback(value);
-        promise = null;
-    }, function (reason) {
-        if (promise === null) return;
-        promise._rejectCallback(reason, synchronous);
-        promise = null;
-    });
-    synchronous = false;
-    this._popContext();
-
-    if (r !== undefined && r === errorObj && promise !== null) {
-        promise._rejectCallback(r.e, true, true);
-        promise = null;
-    }
-};
-
-Promise.prototype._settlePromiseFromHandler = function (
-    handler, receiver, value, promise
-) {
-    if (promise._isRejected()) return;
-    promise._pushContext();
-    var x;
-    if (receiver === APPLY && !this._isRejected()) {
-        x = tryCatch(handler).apply(this._boundValue(), value);
-    } else {
-        x = tryCatch(handler).call(receiver, value);
-    }
-    promise._popContext();
-
-    if (x === errorObj || x === promise || x === NEXT_FILTER) {
-        var err = x === promise ? makeSelfResolutionError() : x.e;
-        promise._rejectCallback(err, false, true);
-    } else {
-        promise._resolveCallback(x);
-    }
-};
-
-Promise.prototype._target = function() {
-    var ret = this;
-    while (ret._isFollowing()) ret = ret._followee();
-    return ret;
-};
-
-Promise.prototype._followee = function() {
-    return this._rejectionHandler0;
-};
-
-Promise.prototype._setFollowee = function(promise) {
-    this._rejectionHandler0 = promise;
-};
-
-Promise.prototype._cleanValues = function () {
-    if (this._cancellable()) {
-        this._cancellationParent = undefined;
-    }
-};
-
-Promise.prototype._propagateFrom = function (parent, flags) {
-    if ((flags & 1) > 0 && parent._cancellable()) {
-        this._setCancellable();
-        this._cancellationParent = parent;
-    }
-    if ((flags & 4) > 0 && parent._isBound()) {
-        this._setBoundTo(parent._boundTo);
-    }
-};
-
-Promise.prototype._fulfill = function (value) {
-    if (this._isFollowingOrFulfilledOrRejected()) return;
-    this._fulfillUnchecked(value);
-};
-
-Promise.prototype._reject = function (reason, carriedStackTrace) {
-    if (this._isFollowingOrFulfilledOrRejected()) return;
-    this._rejectUnchecked(reason, carriedStackTrace);
-};
-
-Promise.prototype._settlePromiseAt = function (index) {
-    var promise = this._promiseAt(index);
-    var isPromise = promise instanceof Promise;
-
-    if (isPromise && promise._isMigrated()) {
-        promise._unsetIsMigrated();
-        return async.invoke(this._settlePromiseAt, this, index);
-    }
-    var handler = this._isFulfilled()
-        ? this._fulfillmentHandlerAt(index)
-        : this._rejectionHandlerAt(index);
-
-    var carriedStackTrace =
-        this._isCarryingStackTrace() ? this._getCarriedStackTrace() : undefined;
-    var value = this._settledValue;
-    var receiver = this._receiverAt(index);
-    this._clearCallbackDataAtIndex(index);
-
-    if (typeof handler === "function") {
-        if (!isPromise) {
-            handler.call(receiver, value, promise);
-        } else {
-            this._settlePromiseFromHandler(handler, receiver, value, promise);
-        }
-    } else if (receiver instanceof PromiseArray) {
-        if (!receiver._isResolved()) {
-            if (this._isFulfilled()) {
-                receiver._promiseFulfilled(value, promise);
-            }
-            else {
-                receiver._promiseRejected(value, promise);
-            }
-        }
-    } else if (isPromise) {
-        if (this._isFulfilled()) {
-            promise._fulfill(value);
-        } else {
-            promise._reject(value, carriedStackTrace);
-        }
-    }
-
-    if (index >= 4 && (index & 31) === 4)
-        async.invokeLater(this._setLength, this, 0);
-};
-
-Promise.prototype._clearCallbackDataAtIndex = function(index) {
-    if (index === 0) {
-        if (!this._isCarryingStackTrace()) {
-            this._fulfillmentHandler0 = undefined;
-        }
-        this._rejectionHandler0 =
-        this._progressHandler0 =
-        this._receiver0 =
-        this._promise0 = undefined;
-    } else {
-        var base = index * 5 - 5;
-        this[base + 3] =
-        this[base + 4] =
-        this[base + 0] =
-        this[base + 1] =
-        this[base + 2] = undefined;
-    }
-};
-
-Promise.prototype._isSettlePromisesQueued = function () {
-    return (this._bitField &
-            -1073741824) === -1073741824;
-};
-
-Promise.prototype._setSettlePromisesQueued = function () {
-    this._bitField = this._bitField | -1073741824;
-};
-
-Promise.prototype._unsetSettlePromisesQueued = function () {
-    this._bitField = this._bitField & (~-1073741824);
-};
-
-Promise.prototype._queueSettlePromises = function() {
-    async.settlePromises(this);
-    this._setSettlePromisesQueued();
-};
-
-Promise.prototype._fulfillUnchecked = function (value) {
-    if (value === this) {
-        var err = makeSelfResolutionError();
-        this._attachExtraTrace(err);
-        return this._rejectUnchecked(err, undefined);
-    }
-    this._setFulfilled();
-    this._settledValue = value;
-    this._cleanValues();
-
-    if (this._length() > 0) {
-        this._queueSettlePromises();
-    }
-};
-
-Promise.prototype._rejectUncheckedCheckError = function (reason) {
-    var trace = util.ensureErrorObject(reason);
-    this._rejectUnchecked(reason, trace === reason ? undefined : trace);
-};
-
-Promise.prototype._rejectUnchecked = function (reason, trace) {
-    if (reason === this) {
-        var err = makeSelfResolutionError();
-        this._attachExtraTrace(err);
-        return this._rejectUnchecked(err);
-    }
-    this._setRejected();
-    this._settledValue = reason;
-    this._cleanValues();
-
-    if (this._isFinal()) {
-        async.throwLater(function(e) {
-            if ("stack" in e) {
-                async.invokeFirst(
-                    CapturedTrace.unhandledRejection, undefined, e);
-            }
-            throw e;
-        }, trace === undefined ? reason : trace);
-        return;
-    }
-
-    if (trace !== undefined && trace !== reason) {
-        this._setCarriedStackTrace(trace);
-    }
-
-    if (this._length() > 0) {
-        this._queueSettlePromises();
-    } else {
-        this._ensurePossibleRejectionHandled();
-    }
-};
-
-Promise.prototype._settlePromises = function () {
-    this._unsetSettlePromisesQueued();
-    var len = this._length();
-    for (var i = 0; i < len; i++) {
-        this._settlePromiseAt(i);
-    }
-};
-
-util.notEnumerableProp(Promise,
-                       "_makeSelfResolutionError",
-                       makeSelfResolutionError);
-
-_dereq_("./progress.js")(Promise, PromiseArray);
-_dereq_("./method.js")(Promise, INTERNAL, tryConvertToPromise, apiRejection);
-_dereq_("./bind.js")(Promise, INTERNAL, tryConvertToPromise);
-_dereq_("./finally.js")(Promise, NEXT_FILTER, tryConvertToPromise);
-_dereq_("./direct_resolve.js")(Promise);
-_dereq_("./synchronous_inspection.js")(Promise);
-_dereq_("./join.js")(Promise, PromiseArray, tryConvertToPromise, INTERNAL);
-Promise.Promise = Promise;
-_dereq_('./map.js')(Promise, PromiseArray, apiRejection, tryConvertToPromise, INTERNAL);
-_dereq_('./cancel.js')(Promise);
-_dereq_('./using.js')(Promise, apiRejection, tryConvertToPromise, createContext);
-_dereq_('./generators.js')(Promise, apiRejection, INTERNAL, tryConvertToPromise);
-_dereq_('./nodeify.js')(Promise);
-_dereq_('./call_get.js')(Promise);
-_dereq_('./props.js')(Promise, PromiseArray, tryConvertToPromise, apiRejection);
-_dereq_('./race.js')(Promise, INTERNAL, tryConvertToPromise, apiRejection);
-_dereq_('./reduce.js')(Promise, PromiseArray, apiRejection, tryConvertToPromise, INTERNAL);
-_dereq_('./settle.js')(Promise, PromiseArray);
-_dereq_('./some.js')(Promise, PromiseArray, apiRejection);
-_dereq_('./promisify.js')(Promise, INTERNAL);
-_dereq_('./any.js')(Promise);
-_dereq_('./each.js')(Promise, INTERNAL);
-_dereq_('./timers.js')(Promise, INTERNAL);
-_dereq_('./filter.js')(Promise, INTERNAL);
-
-    util.toFastProperties(Promise);
-    util.toFastProperties(Promise.prototype);
-    function fillTypes(value) {
-        var p = new Promise(INTERNAL);
-        p._fulfillmentHandler0 = value;
-        p._rejectionHandler0 = value;
-        p._progressHandler0 = value;
-        p._promise0 = value;
-        p._receiver0 = value;
-        p._settledValue = value;
-    }
-    // Complete slack tracking, opt out of field-type tracking and
-    // stabilize map
-    fillTypes({a: 1});
-    fillTypes({b: 2});
-    fillTypes({c: 3});
-    fillTypes(1);
-    fillTypes(function(){});
-    fillTypes(undefined);
-    fillTypes(false);
-    fillTypes(new Promise(INTERNAL));
-    CapturedTrace.setBounds(async.firstLineError, util.lastLineError);
-    return Promise;
-
-};
-
-},{"./any.js":1,"./async.js":2,"./bind.js":3,"./call_get.js":5,"./cancel.js":6,"./captured_trace.js":7,"./catch_filter.js":8,"./context.js":9,"./debuggability.js":10,"./direct_resolve.js":11,"./each.js":12,"./errors.js":13,"./filter.js":15,"./finally.js":16,"./generators.js":17,"./join.js":18,"./map.js":19,"./method.js":20,"./nodeify.js":21,"./progress.js":22,"./promise_array.js":24,"./promise_resolver.js":25,"./promisify.js":26,"./props.js":27,"./race.js":29,"./reduce.js":30,"./settle.js":32,"./some.js":33,"./synchronous_inspection.js":34,"./thenables.js":35,"./timers.js":36,"./using.js":37,"./util.js":38}],24:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise, INTERNAL, tryConvertToPromise,
-    apiRejection) {
-var util = _dereq_("./util.js");
-var isArray = util.isArray;
-
-function toResolutionValue(val) {
-    switch(val) {
-    case -2: return [];
-    case -3: return {};
-    }
-}
-
-function PromiseArray(values) {
-    var promise = this._promise = new Promise(INTERNAL);
-    var parent;
-    if (values instanceof Promise) {
-        parent = values;
-        promise._propagateFrom(parent, 1 | 4);
-    }
-    this._values = values;
-    this._length = 0;
-    this._totalResolved = 0;
-    this._init(undefined, -2);
-}
-PromiseArray.prototype.length = function () {
-    return this._length;
-};
-
-PromiseArray.prototype.promise = function () {
-    return this._promise;
-};
-
-PromiseArray.prototype._init = function init(_, resolveValueIfEmpty) {
-    var values = tryConvertToPromise(this._values, this._promise);
-    if (values instanceof Promise) {
-        values = values._target();
-        this._values = values;
-        if (values._isFulfilled()) {
-            values = values._value();
-            if (!isArray(values)) {
-                var err = new Promise.TypeError("expecting an array, a promise or a thenable\u000a\u000a    See http://goo.gl/s8MMhc\u000a");
-                this.__hardReject__(err);
-                return;
-            }
-        } else if (values._isPending()) {
-            values._then(
-                init,
-                this._reject,
-                undefined,
-                this,
-                resolveValueIfEmpty
-           );
-            return;
-        } else {
-            this._reject(values._reason());
-            return;
-        }
-    } else if (!isArray(values)) {
-        this._promise._reject(apiRejection("expecting an array, a promise or a thenable\u000a\u000a    See http://goo.gl/s8MMhc\u000a")._reason());
-        return;
-    }
-
-    if (values.length === 0) {
-        if (resolveValueIfEmpty === -5) {
-            this._resolveEmptyArray();
-        }
-        else {
-            this._resolve(toResolutionValue(resolveValueIfEmpty));
-        }
-        return;
-    }
-    var len = this.getActualLength(values.length);
-    this._length = len;
-    this._values = this.shouldCopyValues() ? new Array(len) : this._values;
-    var promise = this._promise;
-    for (var i = 0; i < len; ++i) {
-        var isResolved = this._isResolved();
-        var maybePromise = tryConvertToPromise(values[i], promise);
-        if (maybePromise instanceof Promise) {
-            maybePromise = maybePromise._target();
-            if (isResolved) {
-                maybePromise._ignoreRejections();
-            } else if (maybePromise._isPending()) {
-                maybePromise._proxyPromiseArray(this, i);
-            } else if (maybePromise._isFulfilled()) {
-                this._promiseFulfilled(maybePromise._value(), i);
-            } else {
-                this._promiseRejected(maybePromise._reason(), i);
-            }
-        } else if (!isResolved) {
-            this._promiseFulfilled(maybePromise, i);
-        }
-    }
-};
-
-PromiseArray.prototype._isResolved = function () {
-    return this._values === null;
-};
-
-PromiseArray.prototype._resolve = function (value) {
-    this._values = null;
-    this._promise._fulfill(value);
-};
-
-PromiseArray.prototype.__hardReject__ =
-PromiseArray.prototype._reject = function (reason) {
-    this._values = null;
-    this._promise._rejectCallback(reason, false, true);
-};
-
-PromiseArray.prototype._promiseProgressed = function (progressValue, index) {
-    this._promise._progress({
-        index: index,
-        value: progressValue
-    });
-};
-
-
-PromiseArray.prototype._promiseFulfilled = function (value, index) {
-    this._values[index] = value;
-    var totalResolved = ++this._totalResolved;
-    if (totalResolved >= this._length) {
-        this._resolve(this._values);
-    }
-};
-
-PromiseArray.prototype._promiseRejected = function (reason, index) {
-    this._totalResolved++;
-    this._reject(reason);
-};
-
-PromiseArray.prototype.shouldCopyValues = function () {
-    return true;
-};
-
-PromiseArray.prototype.getActualLength = function (len) {
-    return len;
-};
-
-return PromiseArray;
-};
-
-},{"./util.js":38}],25:[function(_dereq_,module,exports){
-"use strict";
-var util = _dereq_("./util.js");
-var maybeWrapAsError = util.maybeWrapAsError;
-var errors = _dereq_("./errors.js");
-var TimeoutError = errors.TimeoutError;
-var OperationalError = errors.OperationalError;
-var haveGetters = util.haveGetters;
-var es5 = _dereq_("./es5.js");
-
-function isUntypedError(obj) {
-    return obj instanceof Error &&
-        es5.getPrototypeOf(obj) === Error.prototype;
-}
-
-var rErrorKey = /^(?:name|message|stack|cause)$/;
-function wrapAsOperationalError(obj) {
-    var ret;
-    if (isUntypedError(obj)) {
-        ret = new OperationalError(obj);
-        ret.name = obj.name;
-        ret.message = obj.message;
-        ret.stack = obj.stack;
-        var keys = es5.keys(obj);
-        for (var i = 0; i < keys.length; ++i) {
-            var key = keys[i];
-            if (!rErrorKey.test(key)) {
-                ret[key] = obj[key];
-            }
-        }
-        return ret;
-    }
-    util.markAsOriginatingFromRejection(obj);
-    return obj;
-}
-
-function nodebackForPromise(promise) {
-    return function(err, value) {
-        if (promise === null) return;
-
-        if (err) {
-            var wrapped = wrapAsOperationalError(maybeWrapAsError(err));
-            promise._attachExtraTrace(wrapped);
-            promise._reject(wrapped);
-        } else if (arguments.length > 2) {
-            var $_len = arguments.length;var args = new Array($_len - 1); for(var $_i = 1; $_i < $_len; ++$_i) {args[$_i - 1] = arguments[$_i];}
-            promise._fulfill(args);
-        } else {
-            promise._fulfill(value);
-        }
-
-        promise = null;
-    };
-}
-
-
-var PromiseResolver;
-if (!haveGetters) {
-    PromiseResolver = function (promise) {
-        this.promise = promise;
-        this.asCallback = nodebackForPromise(promise);
-        this.callback = this.asCallback;
-    };
-}
-else {
-    PromiseResolver = function (promise) {
-        this.promise = promise;
-    };
-}
-if (haveGetters) {
-    var prop = {
-        get: function() {
-            return nodebackForPromise(this.promise);
-        }
-    };
-    es5.defineProperty(PromiseResolver.prototype, "asCallback", prop);
-    es5.defineProperty(PromiseResolver.prototype, "callback", prop);
-}
-
-PromiseResolver._nodebackForPromise = nodebackForPromise;
-
-PromiseResolver.prototype.toString = function () {
-    return "[object PromiseResolver]";
-};
-
-PromiseResolver.prototype.resolve =
-PromiseResolver.prototype.fulfill = function (value) {
-    if (!(this instanceof PromiseResolver)) {
-        throw new TypeError("Illegal invocation, resolver resolve/reject must be called within a resolver context. Consider using the promise constructor instead.\u000a\u000a    See http://goo.gl/sdkXL9\u000a");
-    }
-    this.promise._resolveCallback(value);
-};
-
-PromiseResolver.prototype.reject = function (reason) {
-    if (!(this instanceof PromiseResolver)) {
-        throw new TypeError("Illegal invocation, resolver resolve/reject must be called within a resolver context. Consider using the promise constructor instead.\u000a\u000a    See http://goo.gl/sdkXL9\u000a");
-    }
-    this.promise._rejectCallback(reason);
-};
-
-PromiseResolver.prototype.progress = function (value) {
-    if (!(this instanceof PromiseResolver)) {
-        throw new TypeError("Illegal invocation, resolver resolve/reject must be called within a resolver context. Consider using the promise constructor instead.\u000a\u000a    See http://goo.gl/sdkXL9\u000a");
-    }
-    this.promise._progress(value);
-};
-
-PromiseResolver.prototype.cancel = function (err) {
-    this.promise.cancel(err);
-};
-
-PromiseResolver.prototype.timeout = function () {
-    this.reject(new TimeoutError("timeout"));
-};
-
-PromiseResolver.prototype.isResolved = function () {
-    return this.promise.isResolved();
-};
-
-PromiseResolver.prototype.toJSON = function () {
-    return this.promise.toJSON();
-};
-
-module.exports = PromiseResolver;
-
-},{"./errors.js":13,"./es5.js":14,"./util.js":38}],26:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise, INTERNAL) {
-var THIS = {};
-var util = _dereq_("./util.js");
-var nodebackForPromise = _dereq_("./promise_resolver.js")
-    ._nodebackForPromise;
-var withAppended = util.withAppended;
-var maybeWrapAsError = util.maybeWrapAsError;
-var canEvaluate = util.canEvaluate;
-var TypeError = _dereq_("./errors").TypeError;
-var defaultSuffix = "Async";
-var defaultPromisified = {__isPromisified__: true};
-var noCopyProps = [
-    "arity",    "length",
-    "name",
-    "arguments",
-    "caller",
-    "callee",
-    "prototype",
-    "__isPromisified__"
-];
-var noCopyPropsPattern = new RegExp("^(?:" + noCopyProps.join("|") + ")$");
-
-var defaultFilter = function(name) {
-    return util.isIdentifier(name) &&
-        name.charAt(0) !== "_" &&
-        name !== "constructor";
-};
-
-function propsFilter(key) {
-    return !noCopyPropsPattern.test(key);
-}
-
-function isPromisified(fn) {
-    try {
-        return fn.__isPromisified__ === true;
-    }
-    catch (e) {
-        return false;
-    }
-}
-
-function hasPromisified(obj, key, suffix) {
-    var val = util.getDataPropertyOrDefault(obj, key + suffix,
-                                            defaultPromisified);
-    return val ? isPromisified(val) : false;
-}
-function checkValid(ret, suffix, suffixRegexp) {
-    for (var i = 0; i < ret.length; i += 2) {
-        var key = ret[i];
-        if (suffixRegexp.test(key)) {
-            var keyWithoutAsyncSuffix = key.replace(suffixRegexp, "");
-            for (var j = 0; j < ret.length; j += 2) {
-                if (ret[j] === keyWithoutAsyncSuffix) {
-                    throw new TypeError("Cannot promisify an API that has normal methods with '%s'-suffix\u000a\u000a    See http://goo.gl/iWrZbw\u000a"
-                        .replace("%s", suffix));
-                }
-            }
-        }
-    }
-}
-
-function promisifiableMethods(obj, suffix, suffixRegexp, filter) {
-    var keys = util.inheritedDataKeys(obj);
-    var ret = [];
-    for (var i = 0; i < keys.length; ++i) {
-        var key = keys[i];
-        var value = obj[key];
-        var passesDefaultFilter = filter === defaultFilter
-            ? true : defaultFilter(key, value, obj);
-        if (typeof value === "function" &&
-            !isPromisified(value) &&
-            !hasPromisified(obj, key, suffix) &&
-            filter(key, value, obj, passesDefaultFilter)) {
-            ret.push(key, value);
-        }
-    }
-    checkValid(ret, suffix, suffixRegexp);
-    return ret;
-}
-
-var escapeIdentRegex = function(str) {
-    return str.replace(/([$])/, "\\$");
-};
-
-var makeNodePromisifiedEval;
-if (!true) {
-var switchCaseArgumentOrder = function(likelyArgumentCount) {
-    var ret = [likelyArgumentCount];
-    var min = Math.max(0, likelyArgumentCount - 1 - 3);
-    for(var i = likelyArgumentCount - 1; i >= min; --i) {
-        ret.push(i);
-    }
-    for(var i = likelyArgumentCount + 1; i <= 3; ++i) {
-        ret.push(i);
-    }
-    return ret;
-};
-
-var argumentSequence = function(argumentCount) {
-    return util.filledRange(argumentCount, "_arg", "");
-};
-
-var parameterDeclaration = function(parameterCount) {
-    return util.filledRange(
-        Math.max(parameterCount, 3), "_arg", "");
-};
-
-var parameterCount = function(fn) {
-    if (typeof fn.length === "number") {
-        return Math.max(Math.min(fn.length, 1023 + 1), 0);
-    }
-    return 0;
-};
-
-makeNodePromisifiedEval =
-function(callback, receiver, originalName, fn) {
-    var newParameterCount = Math.max(0, parameterCount(fn) - 1);
-    var argumentOrder = switchCaseArgumentOrder(newParameterCount);
-    var shouldProxyThis = typeof callback === "string" || receiver === THIS;
-
-    function generateCallForArgumentCount(count) {
-        var args = argumentSequence(count).join(", ");
-        var comma = count > 0 ? ", " : "";
-        var ret;
-        if (shouldProxyThis) {
-            ret = "ret = callback.call(this, {{args}}, nodeback); break;\n";
-        } else {
-            ret = receiver === undefined
-                ? "ret = callback({{args}}, nodeback); break;\n"
-                : "ret = callback.call(receiver, {{args}}, nodeback); break;\n";
-        }
-        return ret.replace("{{args}}", args).replace(", ", comma);
-    }
-
-    function generateArgumentSwitchCase() {
-        var ret = "";
-        for (var i = 0; i < argumentOrder.length; ++i) {
-            ret += "case " + argumentOrder[i] +":" +
-                generateCallForArgumentCount(argumentOrder[i]);
-        }
-
-        ret += "                                                             \n\
-        default:                                                             \n\
-            var args = new Array(len + 1);                                   \n\
-            var i = 0;                                                       \n\
-            for (var i = 0; i < len; ++i) {                                  \n\
-               args[i] = arguments[i];                                       \n\
-            }                                                                \n\
-            args[i] = nodeback;                                              \n\
-            [CodeForCall]                                                    \n\
-            break;                                                           \n\
-        ".replace("[CodeForCall]", (shouldProxyThis
-                                ? "ret = callback.apply(this, args);\n"
-                                : "ret = callback.apply(receiver, args);\n"));
-        return ret;
-    }
-
-    var getFunctionCode = typeof callback === "string"
-                                ? ("this != null ? this['"+callback+"'] : fn")
-                                : "fn";
-
-    return new Function("Promise",
-                        "fn",
-                        "receiver",
-                        "withAppended",
-                        "maybeWrapAsError",
-                        "nodebackForPromise",
-                        "tryCatch",
-                        "errorObj",
-                        "notEnumerableProp",
-                        "INTERNAL","'use strict';                            \n\
-        var ret = function (Parameters) {                                    \n\
-            'use strict';                                                    \n\
-            var len = arguments.length;                                      \n\
-            var promise = new Promise(INTERNAL);                             \n\
-            promise._captureStackTrace();                                    \n\
-            var nodeback = nodebackForPromise(promise);                      \n\
-            var ret;                                                         \n\
-            var callback = tryCatch([GetFunctionCode]);                      \n\
-            switch(len) {                                                    \n\
-                [CodeForSwitchCase]                                          \n\
-            }                                                                \n\
-            if (ret === errorObj) {                                          \n\
-                promise._rejectCallback(maybeWrapAsError(ret.e), true, true);\n\
-            }                                                                \n\
-            return promise;                                                  \n\
-        };                                                                   \n\
-        notEnumerableProp(ret, '__isPromisified__', true);                   \n\
-        return ret;                                                          \n\
-        "
-        .replace("Parameters", parameterDeclaration(newParameterCount))
-        .replace("[CodeForSwitchCase]", generateArgumentSwitchCase())
-        .replace("[GetFunctionCode]", getFunctionCode))(
-            Promise,
-            fn,
-            receiver,
-            withAppended,
-            maybeWrapAsError,
-            nodebackForPromise,
-            util.tryCatch,
-            util.errorObj,
-            util.notEnumerableProp,
-            INTERNAL
-        );
-};
-}
-
-function makeNodePromisifiedClosure(callback, receiver, _, fn) {
-    var defaultThis = (function() {return this;})();
-    var method = callback;
-    if (typeof method === "string") {
-        callback = fn;
-    }
-    function promisified() {
-        var _receiver = receiver;
-        if (receiver === THIS) _receiver = this;
-        var promise = new Promise(INTERNAL);
-        promise._captureStackTrace();
-        var cb = typeof method === "string" && this !== defaultThis
-            ? this[method] : callback;
-        var fn = nodebackForPromise(promise);
-        try {
-            cb.apply(_receiver, withAppended(arguments, fn));
-        } catch(e) {
-            promise._rejectCallback(maybeWrapAsError(e), true, true);
-        }
-        return promise;
-    }
-    util.notEnumerableProp(promisified, "__isPromisified__", true);
-    return promisified;
-}
-
-var makeNodePromisified = canEvaluate
-    ? makeNodePromisifiedEval
-    : makeNodePromisifiedClosure;
-
-function promisifyAll(obj, suffix, filter, promisifier) {
-    var suffixRegexp = new RegExp(escapeIdentRegex(suffix) + "$");
-    var methods =
-        promisifiableMethods(obj, suffix, suffixRegexp, filter);
-
-    for (var i = 0, len = methods.length; i < len; i+= 2) {
-        var key = methods[i];
-        var fn = methods[i+1];
-        var promisifiedKey = key + suffix;
-        if (promisifier === makeNodePromisified) {
-            obj[promisifiedKey] =
-                makeNodePromisified(key, THIS, key, fn, suffix);
-        } else {
-            var promisified = promisifier(fn, function() {
-                return makeNodePromisified(key, THIS, key, fn, suffix);
-            });
-            util.notEnumerableProp(promisified, "__isPromisified__", true);
-            obj[promisifiedKey] = promisified;
-        }
-    }
-    util.toFastProperties(obj);
-    return obj;
-}
-
-function promisify(callback, receiver) {
-    return makeNodePromisified(callback, receiver, undefined, callback);
-}
-
-Promise.promisify = function (fn, receiver) {
-    if (typeof fn !== "function") {
-        throw new TypeError("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-    }
-    if (isPromisified(fn)) {
-        return fn;
-    }
-    var ret = promisify(fn, arguments.length < 2 ? THIS : receiver);
-    util.copyDescriptors(fn, ret, propsFilter);
-    return ret;
-};
-
-Promise.promisifyAll = function (target, options) {
-    if (typeof target !== "function" && typeof target !== "object") {
-        throw new TypeError("the target of promisifyAll must be an object or a function\u000a\u000a    See http://goo.gl/9ITlV0\u000a");
-    }
-    options = Object(options);
-    var suffix = options.suffix;
-    if (typeof suffix !== "string") suffix = defaultSuffix;
-    var filter = options.filter;
-    if (typeof filter !== "function") filter = defaultFilter;
-    var promisifier = options.promisifier;
-    if (typeof promisifier !== "function") promisifier = makeNodePromisified;
-
-    if (!util.isIdentifier(suffix)) {
-        throw new RangeError("suffix must be a valid identifier\u000a\u000a    See http://goo.gl/8FZo5V\u000a");
-    }
-
-    var keys = util.inheritedDataKeys(target);
-    for (var i = 0; i < keys.length; ++i) {
-        var value = target[keys[i]];
-        if (keys[i] !== "constructor" &&
-            util.isClass(value)) {
-            promisifyAll(value.prototype, suffix, filter, promisifier);
-            promisifyAll(value, suffix, filter, promisifier);
-        }
-    }
-
-    return promisifyAll(target, suffix, filter, promisifier);
-};
-};
-
-
-},{"./errors":13,"./promise_resolver.js":25,"./util.js":38}],27:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(
-    Promise, PromiseArray, tryConvertToPromise, apiRejection) {
-var util = _dereq_("./util.js");
-var isObject = util.isObject;
-var es5 = _dereq_("./es5.js");
-
-function PropertiesPromiseArray(obj) {
-    var keys = es5.keys(obj);
-    var len = keys.length;
-    var values = new Array(len * 2);
-    for (var i = 0; i < len; ++i) {
-        var key = keys[i];
-        values[i] = obj[key];
-        values[i + len] = key;
-    }
-    this.constructor$(values);
-}
-util.inherits(PropertiesPromiseArray, PromiseArray);
-
-PropertiesPromiseArray.prototype._init = function () {
-    this._init$(undefined, -3) ;
-};
-
-PropertiesPromiseArray.prototype._promiseFulfilled = function (value, index) {
-    this._values[index] = value;
-    var totalResolved = ++this._totalResolved;
-    if (totalResolved >= this._length) {
-        var val = {};
-        var keyOffset = this.length();
-        for (var i = 0, len = this.length(); i < len; ++i) {
-            val[this._values[i + keyOffset]] = this._values[i];
-        }
-        this._resolve(val);
-    }
-};
-
-PropertiesPromiseArray.prototype._promiseProgressed = function (value, index) {
-    this._promise._progress({
-        key: this._values[index + this.length()],
-        value: value
-    });
-};
-
-PropertiesPromiseArray.prototype.shouldCopyValues = function () {
-    return false;
-};
-
-PropertiesPromiseArray.prototype.getActualLength = function (len) {
-    return len >> 1;
-};
-
-function props(promises) {
-    var ret;
-    var castValue = tryConvertToPromise(promises);
-
-    if (!isObject(castValue)) {
-        return apiRejection("cannot await properties of a non-object\u000a\u000a    See http://goo.gl/OsFKC8\u000a");
-    } else if (castValue instanceof Promise) {
-        ret = castValue._then(
-            Promise.props, undefined, undefined, undefined, undefined);
-    } else {
-        ret = new PropertiesPromiseArray(castValue).promise();
-    }
-
-    if (castValue instanceof Promise) {
-        ret._propagateFrom(castValue, 4);
-    }
-    return ret;
-}
-
-Promise.prototype.props = function () {
-    return props(this);
-};
-
-Promise.props = function (promises) {
-    return props(promises);
-};
-};
-
-},{"./es5.js":14,"./util.js":38}],28:[function(_dereq_,module,exports){
-"use strict";
-function arrayMove(src, srcIndex, dst, dstIndex, len) {
-    for (var j = 0; j < len; ++j) {
-        dst[j + dstIndex] = src[j + srcIndex];
-        src[j + srcIndex] = void 0;
-    }
-}
-
-function Queue(capacity) {
-    this._capacity = capacity;
-    this._length = 0;
-    this._front = 0;
-}
-
-Queue.prototype._willBeOverCapacity = function (size) {
-    return this._capacity < size;
-};
-
-Queue.prototype._pushOne = function (arg) {
-    var length = this.length();
-    this._checkCapacity(length + 1);
-    var i = (this._front + length) & (this._capacity - 1);
-    this[i] = arg;
-    this._length = length + 1;
-};
-
-Queue.prototype._unshiftOne = function(value) {
-    var capacity = this._capacity;
-    this._checkCapacity(this.length() + 1);
-    var front = this._front;
-    var i = (((( front - 1 ) &
-                    ( capacity - 1) ) ^ capacity ) - capacity );
-    this[i] = value;
-    this._front = i;
-    this._length = this.length() + 1;
-};
-
-Queue.prototype.unshift = function(fn, receiver, arg) {
-    this._unshiftOne(arg);
-    this._unshiftOne(receiver);
-    this._unshiftOne(fn);
-};
-
-Queue.prototype.push = function (fn, receiver, arg) {
-    var length = this.length() + 3;
-    if (this._willBeOverCapacity(length)) {
-        this._pushOne(fn);
-        this._pushOne(receiver);
-        this._pushOne(arg);
-        return;
-    }
-    var j = this._front + length - 3;
-    this._checkCapacity(length);
-    var wrapMask = this._capacity - 1;
-    this[(j + 0) & wrapMask] = fn;
-    this[(j + 1) & wrapMask] = receiver;
-    this[(j + 2) & wrapMask] = arg;
-    this._length = length;
-};
-
-Queue.prototype.shift = function () {
-    var front = this._front,
-        ret = this[front];
-
-    this[front] = undefined;
-    this._front = (front + 1) & (this._capacity - 1);
-    this._length--;
-    return ret;
-};
-
-Queue.prototype.length = function () {
-    return this._length;
-};
-
-Queue.prototype._checkCapacity = function (size) {
-    if (this._capacity < size) {
-        this._resizeTo(this._capacity << 1);
-    }
-};
-
-Queue.prototype._resizeTo = function (capacity) {
-    var oldCapacity = this._capacity;
-    this._capacity = capacity;
-    var front = this._front;
-    var length = this._length;
-    var moveItemsCount = (front + length) & (oldCapacity - 1);
-    arrayMove(this, 0, this, oldCapacity, moveItemsCount);
-};
-
-module.exports = Queue;
-
-},{}],29:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(
-    Promise, INTERNAL, tryConvertToPromise, apiRejection) {
-var isArray = _dereq_("./util.js").isArray;
-
-var raceLater = function (promise) {
-    return promise.then(function(array) {
-        return race(array, promise);
-    });
-};
-
-function race(promises, parent) {
-    var maybePromise = tryConvertToPromise(promises);
-
-    if (maybePromise instanceof Promise) {
-        return raceLater(maybePromise);
-    } else if (!isArray(promises)) {
-        return apiRejection("expecting an array, a promise or a thenable\u000a\u000a    See http://goo.gl/s8MMhc\u000a");
-    }
-
-    var ret = new Promise(INTERNAL);
-    if (parent !== undefined) {
-        ret._propagateFrom(parent, 4 | 1);
-    }
-    var fulfill = ret._fulfill;
-    var reject = ret._reject;
-    for (var i = 0, len = promises.length; i < len; ++i) {
-        var val = promises[i];
-
-        if (val === undefined && !(i in promises)) {
-            continue;
-        }
-
-        Promise.cast(val)._then(fulfill, reject, undefined, ret, null);
-    }
-    return ret;
-}
-
-Promise.race = function (promises) {
-    return race(promises, undefined);
-};
-
-Promise.prototype.race = function () {
-    return race(this, undefined);
-};
-
-};
-
-},{"./util.js":38}],30:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise,
-                          PromiseArray,
-                          apiRejection,
-                          tryConvertToPromise,
-                          INTERNAL) {
-var getDomain = Promise._getDomain;
-var async = _dereq_("./async.js");
-var util = _dereq_("./util.js");
-var tryCatch = util.tryCatch;
-var errorObj = util.errorObj;
-function ReductionPromiseArray(promises, fn, accum, _each) {
-    this.constructor$(promises);
-    this._promise._captureStackTrace();
-    this._preservedValues = _each === INTERNAL ? [] : null;
-    this._zerothIsAccum = (accum === undefined);
-    this._gotAccum = false;
-    this._reducingIndex = (this._zerothIsAccum ? 1 : 0);
-    this._valuesPhase = undefined;
-    var maybePromise = tryConvertToPromise(accum, this._promise);
-    var rejected = false;
-    var isPromise = maybePromise instanceof Promise;
-    if (isPromise) {
-        maybePromise = maybePromise._target();
-        if (maybePromise._isPending()) {
-            maybePromise._proxyPromiseArray(this, -1);
-        } else if (maybePromise._isFulfilled()) {
-            accum = maybePromise._value();
-            this._gotAccum = true;
-        } else {
-            this._reject(maybePromise._reason());
-            rejected = true;
-        }
-    }
-    if (!(isPromise || this._zerothIsAccum)) this._gotAccum = true;
-    var domain = getDomain();
-    this._callback = domain === null ? fn : domain.bind(fn);
-    this._accum = accum;
-    if (!rejected) async.invoke(init, this, undefined);
-}
-function init() {
-    this._init$(undefined, -5);
-}
-util.inherits(ReductionPromiseArray, PromiseArray);
-
-ReductionPromiseArray.prototype._init = function () {};
-
-ReductionPromiseArray.prototype._resolveEmptyArray = function () {
-    if (this._gotAccum || this._zerothIsAccum) {
-        this._resolve(this._preservedValues !== null
-                        ? [] : this._accum);
-    }
-};
-
-ReductionPromiseArray.prototype._promiseFulfilled = function (value, index) {
-    var values = this._values;
-    values[index] = value;
-    var length = this.length();
-    var preservedValues = this._preservedValues;
-    var isEach = preservedValues !== null;
-    var gotAccum = this._gotAccum;
-    var valuesPhase = this._valuesPhase;
-    var valuesPhaseIndex;
-    if (!valuesPhase) {
-        valuesPhase = this._valuesPhase = new Array(length);
-        for (valuesPhaseIndex=0; valuesPhaseIndex<length; ++valuesPhaseIndex) {
-            valuesPhase[valuesPhaseIndex] = 0;
-        }
-    }
-    valuesPhaseIndex = valuesPhase[index];
-
-    if (index === 0 && this._zerothIsAccum) {
-        this._accum = value;
-        this._gotAccum = gotAccum = true;
-        valuesPhase[index] = ((valuesPhaseIndex === 0)
-            ? 1 : 2);
-    } else if (index === -1) {
-        this._accum = value;
-        this._gotAccum = gotAccum = true;
-    } else {
-        if (valuesPhaseIndex === 0) {
-            valuesPhase[index] = 1;
-        } else {
-            valuesPhase[index] = 2;
-            this._accum = value;
-        }
-    }
-    if (!gotAccum) return;
-
-    var callback = this._callback;
-    var receiver = this._promise._boundValue();
-    var ret;
-
-    for (var i = this._reducingIndex; i < length; ++i) {
-        valuesPhaseIndex = valuesPhase[i];
-        if (valuesPhaseIndex === 2) {
-            this._reducingIndex = i + 1;
-            continue;
-        }
-        if (valuesPhaseIndex !== 1) return;
-        value = values[i];
-        this._promise._pushContext();
-        if (isEach) {
-            preservedValues.push(value);
-            ret = tryCatch(callback).call(receiver, value, i, length);
-        }
-        else {
-            ret = tryCatch(callback)
-                .call(receiver, this._accum, value, i, length);
-        }
-        this._promise._popContext();
-
-        if (ret === errorObj) return this._reject(ret.e);
-
-        var maybePromise = tryConvertToPromise(ret, this._promise);
-        if (maybePromise instanceof Promise) {
-            maybePromise = maybePromise._target();
-            if (maybePromise._isPending()) {
-                valuesPhase[i] = 4;
-                return maybePromise._proxyPromiseArray(this, i);
-            } else if (maybePromise._isFulfilled()) {
-                ret = maybePromise._value();
-            } else {
-                return this._reject(maybePromise._reason());
-            }
-        }
-
-        this._reducingIndex = i + 1;
-        this._accum = ret;
-    }
-
-    this._resolve(isEach ? preservedValues : this._accum);
-};
-
-function reduce(promises, fn, initialValue, _each) {
-    if (typeof fn !== "function") return apiRejection("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-    var array = new ReductionPromiseArray(promises, fn, initialValue, _each);
-    return array.promise();
-}
-
-Promise.prototype.reduce = function (fn, initialValue) {
-    return reduce(this, fn, initialValue, null);
-};
-
-Promise.reduce = function (promises, fn, initialValue, _each) {
-    return reduce(promises, fn, initialValue, _each);
-};
-};
-
-},{"./async.js":2,"./util.js":38}],31:[function(_dereq_,module,exports){
-"use strict";
-var schedule;
-var util = _dereq_("./util");
-var noAsyncScheduler = function() {
-    throw new Error("No async scheduler available\u000a\u000a    See http://goo.gl/m3OTXk\u000a");
-};
-if (util.isNode && typeof MutationObserver === "undefined") {
-    var GlobalSetImmediate = global.setImmediate;
-    var ProcessNextTick = process.nextTick;
-    schedule = util.isRecentNode
-                ? function(fn) { GlobalSetImmediate.call(global, fn); }
-                : function(fn) { ProcessNextTick.call(process, fn); };
-} else if ((typeof MutationObserver !== "undefined") &&
-          !(typeof window !== "undefined" &&
-            window.navigator &&
-            window.navigator.standalone)) {
-    schedule = function(fn) {
-        var div = document.createElement("div");
-        var observer = new MutationObserver(fn);
-        observer.observe(div, {attributes: true});
-        return function() { div.classList.toggle("foo"); };
-    };
-    schedule.isStatic = true;
-} else if (typeof setImmediate !== "undefined") {
-    schedule = function (fn) {
-        setImmediate(fn);
-    };
-} else if (typeof setTimeout !== "undefined") {
-    schedule = function (fn) {
-        setTimeout(fn, 0);
-    };
-} else {
-    schedule = noAsyncScheduler;
-}
-module.exports = schedule;
-
-},{"./util":38}],32:[function(_dereq_,module,exports){
-"use strict";
-module.exports =
-    function(Promise, PromiseArray) {
-var PromiseInspection = Promise.PromiseInspection;
-var util = _dereq_("./util.js");
-
-function SettledPromiseArray(values) {
-    this.constructor$(values);
-}
-util.inherits(SettledPromiseArray, PromiseArray);
-
-SettledPromiseArray.prototype._promiseResolved = function (index, inspection) {
-    this._values[index] = inspection;
-    var totalResolved = ++this._totalResolved;
-    if (totalResolved >= this._length) {
-        this._resolve(this._values);
-    }
-};
-
-SettledPromiseArray.prototype._promiseFulfilled = function (value, index) {
-    var ret = new PromiseInspection();
-    ret._bitField = 268435456;
-    ret._settledValue = value;
-    this._promiseResolved(index, ret);
-};
-SettledPromiseArray.prototype._promiseRejected = function (reason, index) {
-    var ret = new PromiseInspection();
-    ret._bitField = 134217728;
-    ret._settledValue = reason;
-    this._promiseResolved(index, ret);
-};
-
-Promise.settle = function (promises) {
-    return new SettledPromiseArray(promises).promise();
-};
-
-Promise.prototype.settle = function () {
-    return new SettledPromiseArray(this).promise();
-};
-};
-
-},{"./util.js":38}],33:[function(_dereq_,module,exports){
-"use strict";
-module.exports =
-function(Promise, PromiseArray, apiRejection) {
-var util = _dereq_("./util.js");
-var RangeError = _dereq_("./errors.js").RangeError;
-var AggregateError = _dereq_("./errors.js").AggregateError;
-var isArray = util.isArray;
-
-
-function SomePromiseArray(values) {
-    this.constructor$(values);
-    this._howMany = 0;
-    this._unwrap = false;
-    this._initialized = false;
-}
-util.inherits(SomePromiseArray, PromiseArray);
-
-SomePromiseArray.prototype._init = function () {
-    if (!this._initialized) {
-        return;
-    }
-    if (this._howMany === 0) {
-        this._resolve([]);
-        return;
-    }
-    this._init$(undefined, -5);
-    var isArrayResolved = isArray(this._values);
-    if (!this._isResolved() &&
-        isArrayResolved &&
-        this._howMany > this._canPossiblyFulfill()) {
-        this._reject(this._getRangeError(this.length()));
-    }
-};
-
-SomePromiseArray.prototype.init = function () {
-    this._initialized = true;
-    this._init();
-};
-
-SomePromiseArray.prototype.setUnwrap = function () {
-    this._unwrap = true;
-};
-
-SomePromiseArray.prototype.howMany = function () {
-    return this._howMany;
-};
-
-SomePromiseArray.prototype.setHowMany = function (count) {
-    this._howMany = count;
-};
-
-SomePromiseArray.prototype._promiseFulfilled = function (value) {
-    this._addFulfilled(value);
-    if (this._fulfilled() === this.howMany()) {
-        this._values.length = this.howMany();
-        if (this.howMany() === 1 && this._unwrap) {
-            this._resolve(this._values[0]);
-        } else {
-            this._resolve(this._values);
-        }
-    }
-
-};
-SomePromiseArray.prototype._promiseRejected = function (reason) {
-    this._addRejected(reason);
-    if (this.howMany() > this._canPossiblyFulfill()) {
-        var e = new AggregateError();
-        for (var i = this.length(); i < this._values.length; ++i) {
-            e.push(this._values[i]);
-        }
-        this._reject(e);
-    }
-};
-
-SomePromiseArray.prototype._fulfilled = function () {
-    return this._totalResolved;
-};
-
-SomePromiseArray.prototype._rejected = function () {
-    return this._values.length - this.length();
-};
-
-SomePromiseArray.prototype._addRejected = function (reason) {
-    this._values.push(reason);
-};
-
-SomePromiseArray.prototype._addFulfilled = function (value) {
-    this._values[this._totalResolved++] = value;
-};
-
-SomePromiseArray.prototype._canPossiblyFulfill = function () {
-    return this.length() - this._rejected();
-};
-
-SomePromiseArray.prototype._getRangeError = function (count) {
-    var message = "Input array must contain at least " +
-            this._howMany + " items but contains only " + count + " items";
-    return new RangeError(message);
-};
-
-SomePromiseArray.prototype._resolveEmptyArray = function () {
-    this._reject(this._getRangeError(0));
-};
-
-function some(promises, howMany) {
-    if ((howMany | 0) !== howMany || howMany < 0) {
-        return apiRejection("expecting a positive integer\u000a\u000a    See http://goo.gl/1wAmHx\u000a");
-    }
-    var ret = new SomePromiseArray(promises);
-    var promise = ret.promise();
-    ret.setHowMany(howMany);
-    ret.init();
-    return promise;
-}
-
-Promise.some = function (promises, howMany) {
-    return some(promises, howMany);
-};
-
-Promise.prototype.some = function (howMany) {
-    return some(this, howMany);
-};
-
-Promise._SomePromiseArray = SomePromiseArray;
-};
-
-},{"./errors.js":13,"./util.js":38}],34:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise) {
-function PromiseInspection(promise) {
-    if (promise !== undefined) {
-        promise = promise._target();
-        this._bitField = promise._bitField;
-        this._settledValue = promise._settledValue;
-    }
-    else {
-        this._bitField = 0;
-        this._settledValue = undefined;
-    }
-}
-
-PromiseInspection.prototype.value = function () {
-    if (!this.isFulfilled()) {
-        throw new TypeError("cannot get fulfillment value of a non-fulfilled promise\u000a\u000a    See http://goo.gl/hc1DLj\u000a");
-    }
-    return this._settledValue;
-};
-
-PromiseInspection.prototype.error =
-PromiseInspection.prototype.reason = function () {
-    if (!this.isRejected()) {
-        throw new TypeError("cannot get rejection reason of a non-rejected promise\u000a\u000a    See http://goo.gl/hPuiwB\u000a");
-    }
-    return this._settledValue;
-};
-
-PromiseInspection.prototype.isFulfilled =
-Promise.prototype._isFulfilled = function () {
-    return (this._bitField & 268435456) > 0;
-};
-
-PromiseInspection.prototype.isRejected =
-Promise.prototype._isRejected = function () {
-    return (this._bitField & 134217728) > 0;
-};
-
-PromiseInspection.prototype.isPending =
-Promise.prototype._isPending = function () {
-    return (this._bitField & 402653184) === 0;
-};
-
-PromiseInspection.prototype.isResolved =
-Promise.prototype._isResolved = function () {
-    return (this._bitField & 402653184) > 0;
-};
-
-Promise.prototype.isPending = function() {
-    return this._target()._isPending();
-};
-
-Promise.prototype.isRejected = function() {
-    return this._target()._isRejected();
-};
-
-Promise.prototype.isFulfilled = function() {
-    return this._target()._isFulfilled();
-};
-
-Promise.prototype.isResolved = function() {
-    return this._target()._isResolved();
-};
-
-Promise.prototype._value = function() {
-    return this._settledValue;
-};
-
-Promise.prototype._reason = function() {
-    this._unsetRejectionIsUnhandled();
-    return this._settledValue;
-};
-
-Promise.prototype.value = function() {
-    var target = this._target();
-    if (!target.isFulfilled()) {
-        throw new TypeError("cannot get fulfillment value of a non-fulfilled promise\u000a\u000a    See http://goo.gl/hc1DLj\u000a");
-    }
-    return target._settledValue;
-};
-
-Promise.prototype.reason = function() {
-    var target = this._target();
-    if (!target.isRejected()) {
-        throw new TypeError("cannot get rejection reason of a non-rejected promise\u000a\u000a    See http://goo.gl/hPuiwB\u000a");
-    }
-    target._unsetRejectionIsUnhandled();
-    return target._settledValue;
-};
-
-
-Promise.PromiseInspection = PromiseInspection;
-};
-
-},{}],35:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise, INTERNAL) {
-var util = _dereq_("./util.js");
-var errorObj = util.errorObj;
-var isObject = util.isObject;
-
-function tryConvertToPromise(obj, context) {
-    if (isObject(obj)) {
-        if (obj instanceof Promise) {
-            return obj;
-        }
-        else if (isAnyBluebirdPromise(obj)) {
-            var ret = new Promise(INTERNAL);
-            obj._then(
-                ret._fulfillUnchecked,
-                ret._rejectUncheckedCheckError,
-                ret._progressUnchecked,
-                ret,
-                null
-            );
-            return ret;
-        }
-        var then = util.tryCatch(getThen)(obj);
-        if (then === errorObj) {
-            if (context) context._pushContext();
-            var ret = Promise.reject(then.e);
-            if (context) context._popContext();
-            return ret;
-        } else if (typeof then === "function") {
-            return doThenable(obj, then, context);
-        }
-    }
-    return obj;
-}
-
-function getThen(obj) {
-    return obj.then;
-}
-
-var hasProp = {}.hasOwnProperty;
-function isAnyBluebirdPromise(obj) {
-    return hasProp.call(obj, "_promise0");
-}
-
-function doThenable(x, then, context) {
-    var promise = new Promise(INTERNAL);
-    var ret = promise;
-    if (context) context._pushContext();
-    promise._captureStackTrace();
-    if (context) context._popContext();
-    var synchronous = true;
-    var result = util.tryCatch(then).call(x,
-                                        resolveFromThenable,
-                                        rejectFromThenable,
-                                        progressFromThenable);
-    synchronous = false;
-    if (promise && result === errorObj) {
-        promise._rejectCallback(result.e, true, true);
-        promise = null;
-    }
-
-    function resolveFromThenable(value) {
-        if (!promise) return;
-        promise._resolveCallback(value);
-        promise = null;
-    }
-
-    function rejectFromThenable(reason) {
-        if (!promise) return;
-        promise._rejectCallback(reason, synchronous, true);
-        promise = null;
-    }
-
-    function progressFromThenable(value) {
-        if (!promise) return;
-        if (typeof promise._progress === "function") {
-            promise._progress(value);
-        }
-    }
-    return ret;
-}
-
-return tryConvertToPromise;
-};
-
-},{"./util.js":38}],36:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function(Promise, INTERNAL) {
-var util = _dereq_("./util.js");
-var TimeoutError = Promise.TimeoutError;
-
-var afterTimeout = function (promise, message) {
-    if (!promise.isPending()) return;
-    if (typeof message !== "string") {
-        message = "operation timed out";
-    }
-    var err = new TimeoutError(message);
-    util.markAsOriginatingFromRejection(err);
-    promise._attachExtraTrace(err);
-    promise._cancel(err);
-};
-
-var afterValue = function(value) { return delay(+this).thenReturn(value); };
-var delay = Promise.delay = function (value, ms) {
-    if (ms === undefined) {
-        ms = value;
-        value = undefined;
-        var ret = new Promise(INTERNAL);
-        setTimeout(function() { ret._fulfill(); }, ms);
-        return ret;
-    }
-    ms = +ms;
-    return Promise.resolve(value)._then(afterValue, null, null, ms, undefined);
-};
-
-Promise.prototype.delay = function (ms) {
-    return delay(this, ms);
-};
-
-function successClear(value) {
-    var handle = this;
-    if (handle instanceof Number) handle = +handle;
-    clearTimeout(handle);
-    return value;
-}
-
-function failureClear(reason) {
-    var handle = this;
-    if (handle instanceof Number) handle = +handle;
-    clearTimeout(handle);
-    throw reason;
-}
-
-Promise.prototype.timeout = function (ms, message) {
-    ms = +ms;
-    var ret = this.then().cancellable();
-    ret._cancellationParent = this;
-    var handle = setTimeout(function timeoutTimeout() {
-        afterTimeout(ret, message);
-    }, ms);
-    return ret._then(successClear, failureClear, undefined, handle, undefined);
-};
-
-};
-
-},{"./util.js":38}],37:[function(_dereq_,module,exports){
-"use strict";
-module.exports = function (Promise, apiRejection, tryConvertToPromise,
-    createContext) {
-    var TypeError = _dereq_("./errors.js").TypeError;
-    var inherits = _dereq_("./util.js").inherits;
-    var PromiseInspection = Promise.PromiseInspection;
-
-    function inspectionMapper(inspections) {
-        var len = inspections.length;
-        for (var i = 0; i < len; ++i) {
-            var inspection = inspections[i];
-            if (inspection.isRejected()) {
-                return Promise.reject(inspection.error());
-            }
-            inspections[i] = inspection._settledValue;
-        }
-        return inspections;
-    }
-
-    function thrower(e) {
-        setTimeout(function(){throw e;}, 0);
-    }
-
-    function castPreservingDisposable(thenable) {
-        var maybePromise = tryConvertToPromise(thenable);
-        if (maybePromise !== thenable &&
-            typeof thenable._isDisposable === "function" &&
-            typeof thenable._getDisposer === "function" &&
-            thenable._isDisposable()) {
-            maybePromise._setDisposable(thenable._getDisposer());
-        }
-        return maybePromise;
-    }
-    function dispose(resources, inspection) {
-        var i = 0;
-        var len = resources.length;
-        var ret = Promise.defer();
-        function iterator() {
-            if (i >= len) return ret.resolve();
-            var maybePromise = castPreservingDisposable(resources[i++]);
-            if (maybePromise instanceof Promise &&
-                maybePromise._isDisposable()) {
-                try {
-                    maybePromise = tryConvertToPromise(
-                        maybePromise._getDisposer().tryDispose(inspection),
-                        resources.promise);
-                } catch (e) {
-                    return thrower(e);
-                }
-                if (maybePromise instanceof Promise) {
-                    return maybePromise._then(iterator, thrower,
-                                              null, null, null);
-                }
-            }
-            iterator();
-        }
-        iterator();
-        return ret.promise;
-    }
-
-    function disposerSuccess(value) {
-        var inspection = new PromiseInspection();
-        inspection._settledValue = value;
-        inspection._bitField = 268435456;
-        return dispose(this, inspection).thenReturn(value);
-    }
-
-    function disposerFail(reason) {
-        var inspection = new PromiseInspection();
-        inspection._settledValue = reason;
-        inspection._bitField = 134217728;
-        return dispose(this, inspection).thenThrow(reason);
-    }
-
-    function Disposer(data, promise, context) {
-        this._data = data;
-        this._promise = promise;
-        this._context = context;
-    }
-
-    Disposer.prototype.data = function () {
-        return this._data;
-    };
-
-    Disposer.prototype.promise = function () {
-        return this._promise;
-    };
-
-    Disposer.prototype.resource = function () {
-        if (this.promise().isFulfilled()) {
-            return this.promise().value();
-        }
-        return null;
-    };
-
-    Disposer.prototype.tryDispose = function(inspection) {
-        var resource = this.resource();
-        var context = this._context;
-        if (context !== undefined) context._pushContext();
-        var ret = resource !== null
-            ? this.doDispose(resource, inspection) : null;
-        if (context !== undefined) context._popContext();
-        this._promise._unsetDisposable();
-        this._data = null;
-        return ret;
-    };
-
-    Disposer.isDisposer = function (d) {
-        return (d != null &&
-                typeof d.resource === "function" &&
-                typeof d.tryDispose === "function");
-    };
-
-    function FunctionDisposer(fn, promise, context) {
-        this.constructor$(fn, promise, context);
-    }
-    inherits(FunctionDisposer, Disposer);
-
-    FunctionDisposer.prototype.doDispose = function (resource, inspection) {
-        var fn = this.data();
-        return fn.call(resource, resource, inspection);
-    };
-
-    function maybeUnwrapDisposer(value) {
-        if (Disposer.isDisposer(value)) {
-            this.resources[this.index]._setDisposable(value);
-            return value.promise();
-        }
-        return value;
-    }
-
-    Promise.using = function () {
-        var len = arguments.length;
-        if (len < 2) return apiRejection(
-                        "you must pass at least 2 arguments to Promise.using");
-        var fn = arguments[len - 1];
-        if (typeof fn !== "function") return apiRejection("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-
-        var input;
-        var spreadArgs = true;
-        if (len === 2 && Array.isArray(arguments[0])) {
-            input = arguments[0];
-            len = input.length;
-            spreadArgs = false;
-        } else {
-            input = arguments;
-            len--;
-        }
-        var resources = new Array(len);
-        for (var i = 0; i < len; ++i) {
-            var resource = input[i];
-            if (Disposer.isDisposer(resource)) {
-                var disposer = resource;
-                resource = resource.promise();
-                resource._setDisposable(disposer);
-            } else {
-                var maybePromise = tryConvertToPromise(resource);
-                if (maybePromise instanceof Promise) {
-                    resource =
-                        maybePromise._then(maybeUnwrapDisposer, null, null, {
-                            resources: resources,
-                            index: i
-                    }, undefined);
-                }
-            }
-            resources[i] = resource;
-        }
-
-        var promise = Promise.settle(resources)
-            .then(inspectionMapper)
-            .then(function(vals) {
-                promise._pushContext();
-                var ret;
-                try {
-                    ret = spreadArgs
-                        ? fn.apply(undefined, vals) : fn.call(undefined,  vals);
-                } finally {
-                    promise._popContext();
-                }
-                return ret;
-            })
-            ._then(
-                disposerSuccess, disposerFail, undefined, resources, undefined);
-        resources.promise = promise;
-        return promise;
-    };
-
-    Promise.prototype._setDisposable = function (disposer) {
-        this._bitField = this._bitField | 262144;
-        this._disposer = disposer;
-    };
-
-    Promise.prototype._isDisposable = function () {
-        return (this._bitField & 262144) > 0;
-    };
-
-    Promise.prototype._getDisposer = function () {
-        return this._disposer;
-    };
-
-    Promise.prototype._unsetDisposable = function () {
-        this._bitField = this._bitField & (~262144);
-        this._disposer = undefined;
-    };
-
-    Promise.prototype.disposer = function (fn) {
-        if (typeof fn === "function") {
-            return new FunctionDisposer(fn, this, createContext());
-        }
-        throw new TypeError();
-    };
-
-};
-
-},{"./errors.js":13,"./util.js":38}],38:[function(_dereq_,module,exports){
-"use strict";
-var es5 = _dereq_("./es5.js");
-var canEvaluate = typeof navigator == "undefined";
-var haveGetters = (function(){
-    try {
-        var o = {};
-        es5.defineProperty(o, "f", {
-            get: function () {
-                return 3;
-            }
-        });
-        return o.f === 3;
-    }
-    catch (e) {
-        return false;
-    }
-
-})();
-
-var errorObj = {e: {}};
-var tryCatchTarget;
-function tryCatcher() {
-    try {
-        var target = tryCatchTarget;
-        tryCatchTarget = null;
-        return target.apply(this, arguments);
-    } catch (e) {
-        errorObj.e = e;
-        return errorObj;
-    }
-}
-function tryCatch(fn) {
-    tryCatchTarget = fn;
-    return tryCatcher;
-}
-
-var inherits = function(Child, Parent) {
-    var hasProp = {}.hasOwnProperty;
-
-    function T() {
-        this.constructor = Child;
-        this.constructor$ = Parent;
-        for (var propertyName in Parent.prototype) {
-            if (hasProp.call(Parent.prototype, propertyName) &&
-                propertyName.charAt(propertyName.length-1) !== "$"
-           ) {
-                this[propertyName + "$"] = Parent.prototype[propertyName];
-            }
-        }
-    }
-    T.prototype = Parent.prototype;
-    Child.prototype = new T();
-    return Child.prototype;
-};
-
-
-function isPrimitive(val) {
-    return val == null || val === true || val === false ||
-        typeof val === "string" || typeof val === "number";
-
-}
-
-function isObject(value) {
-    return !isPrimitive(value);
-}
-
-function maybeWrapAsError(maybeError) {
-    if (!isPrimitive(maybeError)) return maybeError;
-
-    return new Error(safeToString(maybeError));
-}
-
-function withAppended(target, appendee) {
-    var len = target.length;
-    var ret = new Array(len + 1);
-    var i;
-    for (i = 0; i < len; ++i) {
-        ret[i] = target[i];
-    }
-    ret[i] = appendee;
-    return ret;
-}
-
-function getDataPropertyOrDefault(obj, key, defaultValue) {
-    if (es5.isES5) {
-        var desc = Object.getOwnPropertyDescriptor(obj, key);
-
-        if (desc != null) {
-            return desc.get == null && desc.set == null
-                    ? desc.value
-                    : defaultValue;
-        }
-    } else {
-        return {}.hasOwnProperty.call(obj, key) ? obj[key] : undefined;
-    }
-}
-
-function notEnumerableProp(obj, name, value) {
-    if (isPrimitive(obj)) return obj;
-    var descriptor = {
-        value: value,
-        configurable: true,
-        enumerable: false,
-        writable: true
-    };
-    es5.defineProperty(obj, name, descriptor);
-    return obj;
-}
-
-function thrower(r) {
-    throw r;
-}
-
-var inheritedDataKeys = (function() {
-    var excludedPrototypes = [
-        Array.prototype,
-        Object.prototype,
-        Function.prototype
-    ];
-
-    var isExcludedProto = function(val) {
-        for (var i = 0; i < excludedPrototypes.length; ++i) {
-            if (excludedPrototypes[i] === val) {
-                return true;
-            }
-        }
-        return false;
-    };
-
-    if (es5.isES5) {
-        var getKeys = Object.getOwnPropertyNames;
-        return function(obj) {
-            var ret = [];
-            var visitedKeys = Object.create(null);
-            while (obj != null && !isExcludedProto(obj)) {
-                var keys;
-                try {
-                    keys = getKeys(obj);
-                } catch (e) {
-                    return ret;
-                }
-                for (var i = 0; i < keys.length; ++i) {
-                    var key = keys[i];
-                    if (visitedKeys[key]) continue;
-                    visitedKeys[key] = true;
-                    var desc = Object.getOwnPropertyDescriptor(obj, key);
-                    if (desc != null && desc.get == null && desc.set == null) {
-                        ret.push(key);
-                    }
-                }
-                obj = es5.getPrototypeOf(obj);
-            }
-            return ret;
-        };
-    } else {
-        var hasProp = {}.hasOwnProperty;
-        return function(obj) {
-            if (isExcludedProto(obj)) return [];
-            var ret = [];
-
-            /*jshint forin:false */
-            enumeration: for (var key in obj) {
-                if (hasProp.call(obj, key)) {
-                    ret.push(key);
-                } else {
-                    for (var i = 0; i < excludedPrototypes.length; ++i) {
-                        if (hasProp.call(excludedPrototypes[i], key)) {
-                            continue enumeration;
-                        }
-                    }
-                    ret.push(key);
-                }
-            }
-            return ret;
-        };
-    }
-
-})();
-
-var thisAssignmentPattern = /this\s*\.\s*\S+\s*=/;
-function isClass(fn) {
-    try {
-        if (typeof fn === "function") {
-            var keys = es5.names(fn.prototype);
-
-            var hasMethods = es5.isES5 && keys.length > 1;
-            var hasMethodsOtherThanConstructor = keys.length > 0 &&
-                !(keys.length === 1 && keys[0] === "constructor");
-            var hasThisAssignmentAndStaticMethods =
-                thisAssignmentPattern.test(fn + "") && es5.names(fn).length > 0;
-
-            if (hasMethods || hasMethodsOtherThanConstructor ||
-                hasThisAssignmentAndStaticMethods) {
-                return true;
-            }
-        }
-        return false;
-    } catch (e) {
-        return false;
-    }
-}
-
-function toFastProperties(obj) {
-    /*jshint -W027,-W055,-W031*/
-    function f() {}
-    f.prototype = obj;
-    var l = 8;
-    while (l--) new f();
-    return obj;
-    eval(obj);
-}
-
-var rident = /^[a-z$_][a-z$_0-9]*$/i;
-function isIdentifier(str) {
-    return rident.test(str);
-}
-
-function filledRange(count, prefix, suffix) {
-    var ret = new Array(count);
-    for(var i = 0; i < count; ++i) {
-        ret[i] = prefix + i + suffix;
-    }
-    return ret;
-}
-
-function safeToString(obj) {
-    try {
-        return obj + "";
-    } catch (e) {
-        return "[no string representation]";
-    }
-}
-
-function markAsOriginatingFromRejection(e) {
-    try {
-        notEnumerableProp(e, "isOperational", true);
-    }
-    catch(ignore) {}
-}
-
-function originatesFromRejection(e) {
-    if (e == null) return false;
-    return ((e instanceof Error["__BluebirdErrorTypes__"].OperationalError) ||
-        e["isOperational"] === true);
-}
-
-function canAttachTrace(obj) {
-    return obj instanceof Error && es5.propertyIsWritable(obj, "stack");
-}
-
-var ensureErrorObject = (function() {
-    if (!("stack" in new Error())) {
-        return function(value) {
-            if (canAttachTrace(value)) return value;
-            try {throw new Error(safeToString(value));}
-            catch(err) {return err;}
-        };
-    } else {
-        return function(value) {
-            if (canAttachTrace(value)) return value;
-            return new Error(safeToString(value));
-        };
-    }
-})();
-
-function classString(obj) {
-    return {}.toString.call(obj);
-}
-
-function copyDescriptors(from, to, filter) {
-    var keys = es5.names(from);
-    for (var i = 0; i < keys.length; ++i) {
-        var key = keys[i];
-        if (filter(key)) {
-            try {
-                es5.defineProperty(to, key, es5.getDescriptor(from, key));
-            } catch (ignore) {}
-        }
-    }
-}
-
-var ret = {
-    isClass: isClass,
-    isIdentifier: isIdentifier,
-    inheritedDataKeys: inheritedDataKeys,
-    getDataPropertyOrDefault: getDataPropertyOrDefault,
-    thrower: thrower,
-    isArray: es5.isArray,
-    haveGetters: haveGetters,
-    notEnumerableProp: notEnumerableProp,
-    isPrimitive: isPrimitive,
-    isObject: isObject,
-    canEvaluate: canEvaluate,
-    errorObj: errorObj,
-    tryCatch: tryCatch,
-    inherits: inherits,
-    withAppended: withAppended,
-    maybeWrapAsError: maybeWrapAsError,
-    toFastProperties: toFastProperties,
-    filledRange: filledRange,
-    toString: safeToString,
-    canAttachTrace: canAttachTrace,
-    ensureErrorObject: ensureErrorObject,
-    originatesFromRejection: originatesFromRejection,
-    markAsOriginatingFromRejection: markAsOriginatingFromRejection,
-    classString: classString,
-    copyDescriptors: copyDescriptors,
-    hasDevTools: typeof chrome !== "undefined" && chrome &&
-                 typeof chrome.loadTimes === "function",
-    isNode: typeof process !== "undefined" &&
-        classString(process).toLowerCase() === "[object process]"
-};
-ret.isRecentNode = ret.isNode && (function() {
-    var version = process.versions.node.split(".").map(Number);
-    return (version[0] === 0 && version[1] > 10) || (version[0] > 0);
-})();
-
-if (ret.isNode) ret.toFastProperties(process);
-
-try {throw new Error(); } catch (e) {ret.lastLineError = e;}
-module.exports = ret;
-
-},{"./es5.js":14}]},{},[4])(4)
-});                    ;if (typeof window !== 'undefined' && window !== null) {                               window.P = window.Promise;                                                     } else if (typeof self !== 'undefined' && self !== null) {                             self.P = self.Promise;                                                         }
\ No newline at end of file
diff --git a/deps/npm/node_modules/bluebird/js/browser/bluebird.min.js b/deps/npm/node_modules/bluebird/js/browser/bluebird.min.js
deleted file mode 100644
index 34dce5096318d9..00000000000000
--- a/deps/npm/node_modules/bluebird/js/browser/bluebird.min.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/* @preserve
- * The MIT License (MIT)
- *
- * Copyright (c) 2013-2015 Petka Antonov
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- */
-/**
- * bluebird build version 2.10.1
- * Features enabled: core, race, call_get, generators, map, nodeify, promisify, props, reduce, settle, some, cancel, using, filter, any, each, timers
-*/
-!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var e;"undefined"!=typeof window?e=window:"undefined"!=typeof global?e=global:"undefined"!=typeof self&&(e=self),e.Promise=t()}}(function(){var t,e,r;return function n(t,e,r){function i(s,a){if(!e[s]){if(!t[s]){var u="function"==typeof _dereq_&&_dereq_;if(!a&&u)return u(s,!0);if(o)return o(s,!0);var c=new Error("Cannot find module '"+s+"'");throw c.code="MODULE_NOT_FOUND",c}var l=e[s]={exports:{}};t[s][0].call(l.exports,function(e){var r=t[s][1][e];return i(r?r:e)},l,l.exports,n,t,e,r)}return e[s].exports}for(var o="function"==typeof _dereq_&&_dereq_,s=0;s<r.length;s++)i(r[s]);return i}({1:[function(t,e){"use strict";e.exports=function(t){function e(t){var e=new r(t),n=e.promise();return e.setHowMany(1),e.setUnwrap(),e.init(),n}var r=t._SomePromiseArray;t.any=function(t){return e(t)},t.prototype.any=function(){return e(this)}}},{}],2:[function(t,e){"use strict";function r(){this._isTickUsed=!1,this._lateQueue=new c(16),this._normalQueue=new c(16),this._trampolineEnabled=!0;var t=this;this.drainQueues=function(){t._drainQueues()},this._schedule=u.isStatic?u(this.drainQueues):u}function n(t,e,r){this._lateQueue.push(t,e,r),this._queueTick()}function i(t,e,r){this._normalQueue.push(t,e,r),this._queueTick()}function o(t){this._normalQueue._pushOne(t),this._queueTick()}var s;try{throw new Error}catch(a){s=a}var u=t("./schedule.js"),c=t("./queue.js"),l=t("./util.js");r.prototype.disableTrampolineIfNecessary=function(){l.hasDevTools&&(this._trampolineEnabled=!1)},r.prototype.enableTrampoline=function(){this._trampolineEnabled||(this._trampolineEnabled=!0,this._schedule=function(t){setTimeout(t,0)})},r.prototype.haveItemsQueued=function(){return this._normalQueue.length()>0},r.prototype.throwLater=function(t,e){if(1===arguments.length&&(e=t,t=function(){throw e}),"undefined"!=typeof setTimeout)setTimeout(function(){t(e)},0);else try{this._schedule(function(){t(e)})}catch(r){throw new Error("No async scheduler available\n\n    See http://goo.gl/m3OTXk\n")}},l.hasDevTools?(u.isStatic&&(u=function(t){setTimeout(t,0)}),r.prototype.invokeLater=function(t,e,r){this._trampolineEnabled?n.call(this,t,e,r):this._schedule(function(){setTimeout(function(){t.call(e,r)},100)})},r.prototype.invoke=function(t,e,r){this._trampolineEnabled?i.call(this,t,e,r):this._schedule(function(){t.call(e,r)})},r.prototype.settlePromises=function(t){this._trampolineEnabled?o.call(this,t):this._schedule(function(){t._settlePromises()})}):(r.prototype.invokeLater=n,r.prototype.invoke=i,r.prototype.settlePromises=o),r.prototype.invokeFirst=function(t,e,r){this._normalQueue.unshift(t,e,r),this._queueTick()},r.prototype._drainQueue=function(t){for(;t.length()>0;){var e=t.shift();if("function"==typeof e){var r=t.shift(),n=t.shift();e.call(r,n)}else e._settlePromises()}},r.prototype._drainQueues=function(){this._drainQueue(this._normalQueue),this._reset(),this._drainQueue(this._lateQueue)},r.prototype._queueTick=function(){this._isTickUsed||(this._isTickUsed=!0,this._schedule(this.drainQueues))},r.prototype._reset=function(){this._isTickUsed=!1},e.exports=new r,e.exports.firstLineError=s},{"./queue.js":28,"./schedule.js":31,"./util.js":38}],3:[function(t,e){"use strict";e.exports=function(t,e,r){var n=function(t,e){this._reject(e)},i=function(t,e){e.promiseRejectionQueued=!0,e.bindingPromise._then(n,n,null,this,t)},o=function(t,e){this._isPending()&&this._resolveCallback(e.target)},s=function(t,e){e.promiseRejectionQueued||this._reject(t)};t.prototype.bind=function(n){var a=r(n),u=new t(e);u._propagateFrom(this,1);var c=this._target();if(u._setBoundTo(a),a instanceof t){var l={promiseRejectionQueued:!1,promise:u,target:c,bindingPromise:a};c._then(e,i,u._progress,u,l),a._then(o,s,u._progress,u,l)}else u._resolveCallback(c);return u},t.prototype._setBoundTo=function(t){void 0!==t?(this._bitField=131072|this._bitField,this._boundTo=t):this._bitField=-131073&this._bitField},t.prototype._isBound=function(){return 131072===(131072&this._bitField)},t.bind=function(n,i){var o=r(n),s=new t(e);return s._setBoundTo(o),o instanceof t?o._then(function(){s._resolveCallback(i)},s._reject,s._progress,s,null):s._resolveCallback(i),s}}},{}],4:[function(t,e){"use strict";function r(){try{Promise===i&&(Promise=n)}catch(t){}return i}var n;"undefined"!=typeof Promise&&(n=Promise);var i=t("./promise.js")();i.noConflict=r,e.exports=i},{"./promise.js":23}],5:[function(t,e){"use strict";var r=Object.create;if(r){var n=r(null),i=r(null);n[" size"]=i[" size"]=0}e.exports=function(e){function r(t,r){var n;if(null!=t&&(n=t[r]),"function"!=typeof n){var i="Object "+a.classString(t)+" has no method '"+a.toString(r)+"'";throw new e.TypeError(i)}return n}function n(t){var e=this.pop(),n=r(t,e);return n.apply(t,this)}function i(t){return t[this]}function o(t){var e=+this;return 0>e&&(e=Math.max(0,e+t.length)),t[e]}{var s,a=t("./util.js"),u=a.canEvaluate;a.isIdentifier}e.prototype.call=function(t){for(var e=arguments.length,r=new Array(e-1),i=1;e>i;++i)r[i-1]=arguments[i];return r.push(t),this._then(n,void 0,void 0,r,void 0)},e.prototype.get=function(t){var e,r="number"==typeof t;if(r)e=o;else if(u){var n=s(t);e=null!==n?n:i}else e=i;return this._then(e,void 0,void 0,t,void 0)}}},{"./util.js":38}],6:[function(t,e){"use strict";e.exports=function(e){var r=t("./errors.js"),n=t("./async.js"),i=r.CancellationError;e.prototype._cancel=function(t){if(!this.isCancellable())return this;for(var e,r=this;void 0!==(e=r._cancellationParent)&&e.isCancellable();)r=e;this._unsetCancellable(),r._target()._rejectCallback(t,!1,!0)},e.prototype.cancel=function(t){return this.isCancellable()?(void 0===t&&(t=new i),n.invokeLater(this._cancel,this,t),this):this},e.prototype.cancellable=function(){return this._cancellable()?this:(n.enableTrampoline(),this._setCancellable(),this._cancellationParent=void 0,this)},e.prototype.uncancellable=function(){var t=this.then();return t._unsetCancellable(),t},e.prototype.fork=function(t,e,r){var n=this._then(t,e,r,void 0,void 0);return n._setCancellable(),n._cancellationParent=void 0,n}}},{"./async.js":2,"./errors.js":13}],7:[function(t,e){"use strict";e.exports=function(){function e(t){this._parent=t;var r=this._length=1+(void 0===t?0:t._length);j(this,e),r>32&&this.uncycle()}function r(t,e){for(var r=0;r<e.length-1;++r)e[r].push("From previous event:"),e[r]=e[r].join("\n");return r<e.length&&(e[r]=e[r].join("\n")),t+"\n"+e.join("\n")}function n(t){for(var e=0;e<t.length;++e)(0===t[e].length||e+1<t.length&&t[e][0]===t[e+1][0])&&(t.splice(e,1),e--)}function i(t){for(var e=t[0],r=1;r<t.length;++r){for(var n=t[r],i=e.length-1,o=e[i],s=-1,a=n.length-1;a>=0;--a)if(n[a]===o){s=a;break}for(var a=s;a>=0;--a){var u=n[a];if(e[i]!==u)break;e.pop(),i--}e=n}}function o(t){for(var e=[],r=0;r<t.length;++r){var n=t[r],i=_.test(n)||"    (No stack trace)"===n,o=i&&y(n);i&&!o&&(v&&" "!==n.charAt(0)&&(n="    "+n),e.push(n))}return e}function s(t){for(var e=t.stack.replace(/\s+$/g,"").split("\n"),r=0;r<e.length;++r){var n=e[r];if("    (No stack trace)"===n||_.test(n))break}return r>0&&(e=e.slice(r)),e}function a(t){var e;if("function"==typeof t)e="[function "+(t.name||"anonymous")+"]";else{e=t.toString();var r=/\[object [a-zA-Z0-9$_]+\]/;if(r.test(e))try{var n=JSON.stringify(t);e=n}catch(i){}0===e.length&&(e="(empty array)")}return"(<"+u(e)+">, no stack trace)"}function u(t){var e=41;return t.length<e?t:t.substr(0,e-3)+"..."}function c(t){var e=t.match(g);return e?{fileName:e[1],line:parseInt(e[2],10)}:void 0}var l,h=t("./async.js"),p=t("./util.js"),f=/[\\\/]bluebird[\\\/]js[\\\/](main|debug|zalgo|instrumented)/,_=null,d=null,v=!1;p.inherits(e,Error),e.prototype.uncycle=function(){var t=this._length;if(!(2>t)){for(var e=[],r={},n=0,i=this;void 0!==i;++n)e.push(i),i=i._parent;t=this._length=n;for(var n=t-1;n>=0;--n){var o=e[n].stack;void 0===r[o]&&(r[o]=n)}for(var n=0;t>n;++n){var s=e[n].stack,a=r[s];if(void 0!==a&&a!==n){a>0&&(e[a-1]._parent=void 0,e[a-1]._length=1),e[n]._parent=void 0,e[n]._length=1;var u=n>0?e[n-1]:this;t-1>a?(u._parent=e[a+1],u._parent.uncycle(),u._length=u._parent._length+1):(u._parent=void 0,u._length=1);for(var c=u._length+1,l=n-2;l>=0;--l)e[l]._length=c,c++;return}}}},e.prototype.parent=function(){return this._parent},e.prototype.hasParent=function(){return void 0!==this._parent},e.prototype.attachExtraTrace=function(t){if(!t.__stackCleaned__){this.uncycle();for(var s=e.parseStackAndMessage(t),a=s.message,u=[s.stack],c=this;void 0!==c;)u.push(o(c.stack.split("\n"))),c=c._parent;i(u),n(u),p.notEnumerableProp(t,"stack",r(a,u)),p.notEnumerableProp(t,"__stackCleaned__",!0)}},e.parseStackAndMessage=function(t){var e=t.stack,r=t.toString();return e="string"==typeof e&&e.length>0?s(t):["    (No stack trace)"],{message:r,stack:o(e)}},e.formatAndLogError=function(t,e){if("undefined"!=typeof console){var r;if("object"==typeof t||"function"==typeof t){var n=t.stack;r=e+d(n,t)}else r=e+String(t);"function"==typeof l?l(r):("function"==typeof console.log||"object"==typeof console.log)&&console.log(r)}},e.unhandledRejection=function(t){e.formatAndLogError(t,"^--- With additional stack trace: ")},e.isSupported=function(){return"function"==typeof j},e.fireRejectionEvent=function(t,r,n,i){var o=!1;try{"function"==typeof r&&(o=!0,"rejectionHandled"===t?r(i):r(n,i))}catch(s){h.throwLater(s)}var a=!1;try{a=b(t,n,i)}catch(s){a=!0,h.throwLater(s)}var u=!1;if(m)try{u=m(t.toLowerCase(),{reason:n,promise:i})}catch(s){u=!0,h.throwLater(s)}a||o||u||"unhandledRejection"!==t||e.formatAndLogError(n,"Unhandled rejection ")};var y=function(){return!1},g=/[\/<\(]([^:\/]+):(\d+):(?:\d+)\)?\s*$/;e.setBounds=function(t,r){if(e.isSupported()){for(var n,i,o=t.stack.split("\n"),s=r.stack.split("\n"),a=-1,u=-1,l=0;l<o.length;++l){var h=c(o[l]);if(h){n=h.fileName,a=h.line;break}}for(var l=0;l<s.length;++l){var h=c(s[l]);if(h){i=h.fileName,u=h.line;break}}0>a||0>u||!n||!i||n!==i||a>=u||(y=function(t){if(f.test(t))return!0;var e=c(t);return e&&e.fileName===n&&a<=e.line&&e.line<=u?!0:!1})}};var m,j=function(){var t=/^\s*at\s*/,e=function(t,e){return"string"==typeof t?t:void 0!==e.name&&void 0!==e.message?e.toString():a(e)};if("number"==typeof Error.stackTraceLimit&&"function"==typeof Error.captureStackTrace){Error.stackTraceLimit=Error.stackTraceLimit+6,_=t,d=e;var r=Error.captureStackTrace;return y=function(t){return f.test(t)},function(t,e){Error.stackTraceLimit=Error.stackTraceLimit+6,r(t,e),Error.stackTraceLimit=Error.stackTraceLimit-6}}var n=new Error;if("string"==typeof n.stack&&n.stack.split("\n")[0].indexOf("stackDetection@")>=0)return _=/@/,d=e,v=!0,function(t){t.stack=(new Error).stack};var i;try{throw new Error}catch(o){i="stack"in o}return"stack"in n||!i||"number"!=typeof Error.stackTraceLimit?(d=function(t,e){return"string"==typeof t?t:"object"!=typeof e&&"function"!=typeof e||void 0===e.name||void 0===e.message?a(e):e.toString()},null):(_=t,d=e,function(t){Error.stackTraceLimit=Error.stackTraceLimit+6;try{throw new Error}catch(e){t.stack=e.stack}Error.stackTraceLimit=Error.stackTraceLimit-6})}([]),b=function(){if(p.isNode)return function(t,e,r){return"rejectionHandled"===t?process.emit(t,r):process.emit(t,e,r)};var t=!1,e=!0;try{var r=new self.CustomEvent("test");t=r instanceof CustomEvent}catch(n){}if(!t)try{var i=document.createEvent("CustomEvent");i.initCustomEvent("testingtheevent",!1,!0,{}),self.dispatchEvent(i)}catch(n){e=!1}e&&(m=function(e,r){var n;return t?n=new self.CustomEvent(e,{detail:r,bubbles:!1,cancelable:!0}):self.dispatchEvent&&(n=document.createEvent("CustomEvent"),n.initCustomEvent(e,!1,!0,r)),n?!self.dispatchEvent(n):!1});var o={};return o.unhandledRejection="onunhandledRejection".toLowerCase(),o.rejectionHandled="onrejectionHandled".toLowerCase(),function(t,e,r){var n=o[t],i=self[n];return i?("rejectionHandled"===t?i.call(self,r):i.call(self,e,r),!0):!1}}();return"undefined"!=typeof console&&"undefined"!=typeof console.warn&&(l=function(t){console.warn(t)},p.isNode&&process.stderr.isTTY?l=function(t){process.stderr.write(""+t+"\n")}:p.isNode||"string"!=typeof(new Error).stack||(l=function(t){console.warn("%c"+t,"color: red")})),e}},{"./async.js":2,"./util.js":38}],8:[function(t,e){"use strict";e.exports=function(e){function r(t,e,r){this._instances=t,this._callback=e,this._promise=r}function n(t,e){var r={},n=s(t).call(r,e);if(n===a)return n;var i=u(r);return i.length?(a.e=new c("Catch filter must inherit from Error or be a simple predicate function\n\n    See http://goo.gl/o84o68\n"),a):n}var i=t("./util.js"),o=t("./errors.js"),s=i.tryCatch,a=i.errorObj,u=t("./es5.js").keys,c=o.TypeError;return r.prototype.doFilter=function(t){for(var r=this._callback,i=this._promise,o=i._boundValue(),u=0,c=this._instances.length;c>u;++u){var l=this._instances[u],h=l===Error||null!=l&&l.prototype instanceof Error;if(h&&t instanceof l){var p=s(r).call(o,t);return p===a?(e.e=p.e,e):p}if("function"==typeof l&&!h){var f=n(l,t);if(f===a){t=a.e;break}if(f){var p=s(r).call(o,t);return p===a?(e.e=p.e,e):p}}}return e.e=t,e},r}},{"./errors.js":13,"./es5.js":14,"./util.js":38}],9:[function(t,e){"use strict";e.exports=function(t,e,r){function n(){this._trace=new e(o())}function i(){return r()?new n:void 0}function o(){var t=s.length-1;return t>=0?s[t]:void 0}var s=[];return n.prototype._pushContext=function(){r()&&void 0!==this._trace&&s.push(this._trace)},n.prototype._popContext=function(){r()&&void 0!==this._trace&&s.pop()},t.prototype._peekContext=o,t.prototype._pushContext=n.prototype._pushContext,t.prototype._popContext=n.prototype._popContext,i}},{}],10:[function(t,e){"use strict";e.exports=function(e,r){var n,i,o=e._getDomain,s=t("./async.js"),a=t("./errors.js").Warning,u=t("./util.js"),c=u.canAttachTrace,l=!1||u.isNode&&(!!process.env.BLUEBIRD_DEBUG||"development"===process.env.NODE_ENV);return u.isNode&&0==process.env.BLUEBIRD_DEBUG&&(l=!1),l&&s.disableTrampolineIfNecessary(),e.prototype._ignoreRejections=function(){this._unsetRejectionIsUnhandled(),this._bitField=16777216|this._bitField},e.prototype._ensurePossibleRejectionHandled=function(){0===(16777216&this._bitField)&&(this._setRejectionIsUnhandled(),s.invokeLater(this._notifyUnhandledRejection,this,void 0))},e.prototype._notifyUnhandledRejectionIsHandled=function(){r.fireRejectionEvent("rejectionHandled",n,void 0,this)},e.prototype._notifyUnhandledRejection=function(){if(this._isRejectionUnhandled()){var t=this._getCarriedStackTrace()||this._settledValue;this._setUnhandledRejectionIsNotified(),r.fireRejectionEvent("unhandledRejection",i,t,this)}},e.prototype._setUnhandledRejectionIsNotified=function(){this._bitField=524288|this._bitField},e.prototype._unsetUnhandledRejectionIsNotified=function(){this._bitField=-524289&this._bitField},e.prototype._isUnhandledRejectionNotified=function(){return(524288&this._bitField)>0},e.prototype._setRejectionIsUnhandled=function(){this._bitField=2097152|this._bitField},e.prototype._unsetRejectionIsUnhandled=function(){this._bitField=-2097153&this._bitField,this._isUnhandledRejectionNotified()&&(this._unsetUnhandledRejectionIsNotified(),this._notifyUnhandledRejectionIsHandled())},e.prototype._isRejectionUnhandled=function(){return(2097152&this._bitField)>0},e.prototype._setCarriedStackTrace=function(t){this._bitField=1048576|this._bitField,this._fulfillmentHandler0=t},e.prototype._isCarryingStackTrace=function(){return(1048576&this._bitField)>0},e.prototype._getCarriedStackTrace=function(){return this._isCarryingStackTrace()?this._fulfillmentHandler0:void 0},e.prototype._captureStackTrace=function(){return l&&(this._trace=new r(this._peekContext())),this},e.prototype._attachExtraTrace=function(t,e){if(l&&c(t)){var n=this._trace;if(void 0!==n&&e&&(n=n._parent),void 0!==n)n.attachExtraTrace(t);else if(!t.__stackCleaned__){var i=r.parseStackAndMessage(t);u.notEnumerableProp(t,"stack",i.message+"\n"+i.stack.join("\n")),u.notEnumerableProp(t,"__stackCleaned__",!0)}}},e.prototype._warn=function(t){var e=new a(t),n=this._peekContext();if(n)n.attachExtraTrace(e);else{var i=r.parseStackAndMessage(e);e.stack=i.message+"\n"+i.stack.join("\n")}r.formatAndLogError(e,"")},e.onPossiblyUnhandledRejection=function(t){var e=o();i="function"==typeof t?null===e?t:e.bind(t):void 0},e.onUnhandledRejectionHandled=function(t){var e=o();n="function"==typeof t?null===e?t:e.bind(t):void 0},e.longStackTraces=function(){if(s.haveItemsQueued()&&l===!1)throw new Error("cannot enable long stack traces after promises have been created\n\n    See http://goo.gl/DT1qyG\n");l=r.isSupported(),l&&s.disableTrampolineIfNecessary()},e.hasLongStackTraces=function(){return l&&r.isSupported()},r.isSupported()||(e.longStackTraces=function(){},l=!1),function(){return l}}},{"./async.js":2,"./errors.js":13,"./util.js":38}],11:[function(t,e){"use strict";var r=t("./util.js"),n=r.isPrimitive;e.exports=function(t){var e=function(){return this},r=function(){throw this},i=function(){},o=function(){throw void 0},s=function(t,e){return 1===e?function(){throw t}:2===e?function(){return t}:void 0};t.prototype["return"]=t.prototype.thenReturn=function(r){return void 0===r?this.then(i):n(r)?this._then(s(r,2),void 0,void 0,void 0,void 0):(r instanceof t&&r._ignoreRejections(),this._then(e,void 0,void 0,r,void 0))},t.prototype["throw"]=t.prototype.thenThrow=function(t){return void 0===t?this.then(o):n(t)?this._then(s(t,1),void 0,void 0,void 0,void 0):this._then(r,void 0,void 0,t,void 0)}}},{"./util.js":38}],12:[function(t,e){"use strict";e.exports=function(t,e){var r=t.reduce;t.prototype.each=function(t){return r(this,t,null,e)},t.each=function(t,n){return r(t,n,null,e)}}},{}],13:[function(t,e){"use strict";function r(t,e){function r(n){return this instanceof r?(l(this,"message","string"==typeof n?n:e),l(this,"name",t),void(Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):Error.call(this))):new r(n)}return c(r,Error),r}function n(t){return this instanceof n?(l(this,"name","OperationalError"),l(this,"message",t),this.cause=t,this.isOperational=!0,void(t instanceof Error?(l(this,"message",t.message),l(this,"stack",t.stack)):Error.captureStackTrace&&Error.captureStackTrace(this,this.constructor))):new n(t)}var i,o,s=t("./es5.js"),a=s.freeze,u=t("./util.js"),c=u.inherits,l=u.notEnumerableProp,h=r("Warning","warning"),p=r("CancellationError","cancellation error"),f=r("TimeoutError","timeout error"),_=r("AggregateError","aggregate error");try{i=TypeError,o=RangeError}catch(d){i=r("TypeError","type error"),o=r("RangeError","range error")}for(var v="join pop push shift unshift slice filter forEach some every map indexOf lastIndexOf reduce reduceRight sort reverse".split(" "),y=0;y<v.length;++y)"function"==typeof Array.prototype[v[y]]&&(_.prototype[v[y]]=Array.prototype[v[y]]);s.defineProperty(_.prototype,"length",{value:0,configurable:!1,writable:!0,enumerable:!0}),_.prototype.isOperational=!0;var g=0;_.prototype.toString=function(){var t=Array(4*g+1).join(" "),e="\n"+t+"AggregateError of:\n";g++,t=Array(4*g+1).join(" ");for(var r=0;r<this.length;++r){for(var n=this[r]===this?"[Circular AggregateError]":this[r]+"",i=n.split("\n"),o=0;o<i.length;++o)i[o]=t+i[o];n=i.join("\n"),e+=n+"\n"}return g--,e},c(n,Error);var m=Error.__BluebirdErrorTypes__;m||(m=a({CancellationError:p,TimeoutError:f,OperationalError:n,RejectionError:n,AggregateError:_}),l(Error,"__BluebirdErrorTypes__",m)),e.exports={Error:Error,TypeError:i,RangeError:o,CancellationError:m.CancellationError,OperationalError:m.OperationalError,TimeoutError:m.TimeoutError,AggregateError:m.AggregateError,Warning:h}},{"./es5.js":14,"./util.js":38}],14:[function(t,e){var r=function(){"use strict";return void 0===this}();if(r)e.exports={freeze:Object.freeze,defineProperty:Object.defineProperty,getDescriptor:Object.getOwnPropertyDescriptor,keys:Object.keys,names:Object.getOwnPropertyNames,getPrototypeOf:Object.getPrototypeOf,isArray:Array.isArray,isES5:r,propertyIsWritable:function(t,e){var r=Object.getOwnPropertyDescriptor(t,e);return!(r&&!r.writable&&!r.set)}};else{var n={}.hasOwnProperty,i={}.toString,o={}.constructor.prototype,s=function(t){var e=[];for(var r in t)n.call(t,r)&&e.push(r);return e},a=function(t,e){return{value:t[e]}},u=function(t,e,r){return t[e]=r.value,t},c=function(t){return t},l=function(t){try{return Object(t).constructor.prototype}catch(e){return o}},h=function(t){try{return"[object Array]"===i.call(t)}catch(e){return!1}};e.exports={isArray:h,keys:s,names:s,defineProperty:u,getDescriptor:a,freeze:c,getPrototypeOf:l,isES5:r,propertyIsWritable:function(){return!0}}}},{}],15:[function(t,e){"use strict";e.exports=function(t,e){var r=t.map;t.prototype.filter=function(t,n){return r(this,t,n,e)},t.filter=function(t,n,i){return r(t,n,i,e)}}},{}],16:[function(t,e){"use strict";e.exports=function(e,r,n){function i(){return this}function o(){throw this}function s(t){return function(){return t}}function a(t){return function(){throw t}}function u(t,e,r){var n;return n=p(e)?r?s(e):a(e):r?i:o,t._then(n,f,void 0,e,void 0)}function c(t){var i=this.promise,o=this.handler,s=i._isBound()?o.call(i._boundValue()):o();if(void 0!==s){var a=n(s,i);if(a instanceof e)return a=a._target(),u(a,t,i.isFulfilled())}return i.isRejected()?(r.e=t,r):t}function l(t){var r=this.promise,i=this.handler,o=r._isBound()?i.call(r._boundValue(),t):i(t);if(void 0!==o){var s=n(o,r);if(s instanceof e)return s=s._target(),u(s,t,!0)}return t}var h=t("./util.js"),p=h.isPrimitive,f=h.thrower;e.prototype._passThroughHandler=function(t,e){if("function"!=typeof t)return this.then();var r={promise:this,handler:t};return this._then(e?c:l,e?c:void 0,void 0,r,void 0)},e.prototype.lastly=e.prototype["finally"]=function(t){return this._passThroughHandler(t,!0)},e.prototype.tap=function(t){return this._passThroughHandler(t,!1)}}},{"./util.js":38}],17:[function(t,e){"use strict";e.exports=function(e,r,n,i){function o(t,r,n){for(var o=0;o<r.length;++o){n._pushContext();var s=h(r[o])(t);if(n._popContext(),s===l){n._pushContext();var a=e.reject(l.e);return n._popContext(),a}var u=i(s,n);if(u instanceof e)return u}return null}function s(t,r,i,o){var s=this._promise=new e(n);s._captureStackTrace(),this._stack=o,this._generatorFunction=t,this._receiver=r,this._generator=void 0,this._yieldHandlers="function"==typeof i?[i].concat(p):p}var a=t("./errors.js"),u=a.TypeError,c=t("./util.js"),l=c.errorObj,h=c.tryCatch,p=[];s.prototype.promise=function(){return this._promise},s.prototype._run=function(){this._generator=this._generatorFunction.call(this._receiver),this._receiver=this._generatorFunction=void 0,this._next(void 0)},s.prototype._continue=function(t){if(t===l)return this._promise._rejectCallback(t.e,!1,!0);var r=t.value;if(t.done===!0)this._promise._resolveCallback(r);else{var n=i(r,this._promise);if(!(n instanceof e)&&(n=o(n,this._yieldHandlers,this._promise),null===n))return void this._throw(new u("A value %s was yielded that could not be treated as a promise\n\n    See http://goo.gl/4Y4pDk\n\n".replace("%s",r)+"From coroutine:\n"+this._stack.split("\n").slice(1,-7).join("\n")));n._then(this._next,this._throw,void 0,this,null)}},s.prototype._throw=function(t){this._promise._attachExtraTrace(t),this._promise._pushContext();var e=h(this._generator["throw"]).call(this._generator,t);this._promise._popContext(),this._continue(e)},s.prototype._next=function(t){this._promise._pushContext();var e=h(this._generator.next).call(this._generator,t);this._promise._popContext(),this._continue(e)},e.coroutine=function(t,e){if("function"!=typeof t)throw new u("generatorFunction must be a function\n\n    See http://goo.gl/6Vqhm0\n");var r=Object(e).yieldHandler,n=s,i=(new Error).stack;return function(){var e=t.apply(this,arguments),o=new n(void 0,void 0,r,i);return o._generator=e,o._next(void 0),o.promise()}},e.coroutine.addYieldHandler=function(t){if("function"!=typeof t)throw new u("fn must be a function\n\n    See http://goo.gl/916lJJ\n");p.push(t)},e.spawn=function(t){if("function"!=typeof t)return r("generatorFunction must be a function\n\n    See http://goo.gl/6Vqhm0\n");var n=new s(t,this),i=n.promise();return n._run(e.spawn),i}}},{"./errors.js":13,"./util.js":38}],18:[function(t,e){"use strict";e.exports=function(e,r,n,i){{var o=t("./util.js");o.canEvaluate,o.tryCatch,o.errorObj}e.join=function(){var t,e=arguments.length-1;if(e>0&&"function"==typeof arguments[e]){t=arguments[e];var n}for(var i=arguments.length,o=new Array(i),s=0;i>s;++s)o[s]=arguments[s];t&&o.pop();var n=new r(o).promise();return void 0!==t?n.spread(t):n}}},{"./util.js":38}],19:[function(t,e){"use strict";e.exports=function(e,r,n,i,o){function s(t,e,r,n){this.constructor$(t),this._promise._captureStackTrace();var i=c();this._callback=null===i?e:i.bind(e),this._preservedValues=n===o?new Array(this.length()):null,this._limit=r,this._inFlight=0,this._queue=r>=1?[]:d,l.invoke(a,this,void 0)}function a(){this._init$(void 0,-2)}function u(t,e,r,n){var i="object"==typeof r&&null!==r?r.concurrency:0;return i="number"==typeof i&&isFinite(i)&&i>=1?i:0,new s(t,e,i,n)}var c=e._getDomain,l=t("./async.js"),h=t("./util.js"),p=h.tryCatch,f=h.errorObj,_={},d=[];h.inherits(s,r),s.prototype._init=function(){},s.prototype._promiseFulfilled=function(t,r){var n=this._values,o=this.length(),s=this._preservedValues,a=this._limit;if(n[r]===_){if(n[r]=t,a>=1&&(this._inFlight--,this._drainQueue(),this._isResolved()))return}else{if(a>=1&&this._inFlight>=a)return n[r]=t,void this._queue.push(r);null!==s&&(s[r]=t);var u=this._callback,c=this._promise._boundValue();this._promise._pushContext();var l=p(u).call(c,t,r,o);if(this._promise._popContext(),l===f)return this._reject(l.e);var h=i(l,this._promise);if(h instanceof e){if(h=h._target(),h._isPending())return a>=1&&this._inFlight++,n[r]=_,h._proxyPromiseArray(this,r);if(!h._isFulfilled())return this._reject(h._reason());l=h._value()}n[r]=l}var d=++this._totalResolved;d>=o&&(null!==s?this._filter(n,s):this._resolve(n))},s.prototype._drainQueue=function(){for(var t=this._queue,e=this._limit,r=this._values;t.length>0&&this._inFlight<e;){if(this._isResolved())return;var n=t.pop();this._promiseFulfilled(r[n],n)}},s.prototype._filter=function(t,e){for(var r=e.length,n=new Array(r),i=0,o=0;r>o;++o)t[o]&&(n[i++]=e[o]);n.length=i,this._resolve(n)},s.prototype.preservedValues=function(){return this._preservedValues},e.prototype.map=function(t,e){return"function"!=typeof t?n("fn must be a function\n\n    See http://goo.gl/916lJJ\n"):u(this,t,e,null).promise()},e.map=function(t,e,r,i){return"function"!=typeof e?n("fn must be a function\n\n    See http://goo.gl/916lJJ\n"):u(t,e,r,i).promise()}}},{"./async.js":2,"./util.js":38}],20:[function(t,e){"use strict";e.exports=function(e,r,n,i){var o=t("./util.js"),s=o.tryCatch;e.method=function(t){if("function"!=typeof t)throw new e.TypeError("fn must be a function\n\n    See http://goo.gl/916lJJ\n");return function(){var n=new e(r);n._captureStackTrace(),n._pushContext();var i=s(t).apply(this,arguments);return n._popContext(),n._resolveFromSyncValue(i),n}},e.attempt=e["try"]=function(t,n,a){if("function"!=typeof t)return i("fn must be a function\n\n    See http://goo.gl/916lJJ\n");var u=new e(r);u._captureStackTrace(),u._pushContext();var c=o.isArray(n)?s(t).apply(a,n):s(t).call(a,n);return u._popContext(),u._resolveFromSyncValue(c),u},e.prototype._resolveFromSyncValue=function(t){t===o.errorObj?this._rejectCallback(t.e,!1,!0):this._resolveCallback(t,!0)}}},{"./util.js":38}],21:[function(t,e){"use strict";e.exports=function(e){function r(t,e){var r=this;if(!o.isArray(t))return n.call(r,t,e);var i=a(e).apply(r._boundValue(),[null].concat(t));i===u&&s.throwLater(i.e)}function n(t,e){var r=this,n=r._boundValue(),i=void 0===t?a(e).call(n,null):a(e).call(n,null,t);i===u&&s.throwLater(i.e)}function i(t,e){var r=this;if(!t){var n=r._target(),i=n._getCarriedStackTrace();i.cause=t,t=i}var o=a(e).call(r._boundValue(),t);o===u&&s.throwLater(o.e)}var o=t("./util.js"),s=t("./async.js"),a=o.tryCatch,u=o.errorObj;e.prototype.asCallback=e.prototype.nodeify=function(t,e){if("function"==typeof t){var o=n;void 0!==e&&Object(e).spread&&(o=r),this._then(o,i,void 0,this,t)}return this}}},{"./async.js":2,"./util.js":38}],22:[function(t,e){"use strict";e.exports=function(e,r){var n=t("./util.js"),i=t("./async.js"),o=n.tryCatch,s=n.errorObj;e.prototype.progressed=function(t){return this._then(void 0,void 0,t,void 0,void 0)},e.prototype._progress=function(t){this._isFollowingOrFulfilledOrRejected()||this._target()._progressUnchecked(t)},e.prototype._progressHandlerAt=function(t){return 0===t?this._progressHandler0:this[(t<<2)+t-5+2]},e.prototype._doProgressWith=function(t){var r=t.value,i=t.handler,a=t.promise,u=t.receiver,c=o(i).call(u,r);if(c===s){if(null!=c.e&&"StopProgressPropagation"!==c.e.name){var l=n.canAttachTrace(c.e)?c.e:new Error(n.toString(c.e));a._attachExtraTrace(l),a._progress(c.e)}}else c instanceof e?c._then(a._progress,null,null,a,void 0):a._progress(c)},e.prototype._progressUnchecked=function(t){for(var n=this._length(),o=this._progress,s=0;n>s;s++){var a=this._progressHandlerAt(s),u=this._promiseAt(s);if(u instanceof e)"function"==typeof a?i.invoke(this._doProgressWith,this,{handler:a,promise:u,receiver:this._receiverAt(s),value:t}):i.invoke(o,u,t);else{var c=this._receiverAt(s);"function"==typeof a?a.call(c,t,u):c instanceof r&&!c._isResolved()&&c._promiseProgressed(t,u)}}}}},{"./async.js":2,"./util.js":38}],23:[function(t,e){"use strict";e.exports=function(){function e(t){if("function"!=typeof t)throw new h("the promise constructor requires a resolver function\n\n    See http://goo.gl/EC22Yn\n");if(this.constructor!==e)throw new h("the promise constructor cannot be invoked directly\n\n    See http://goo.gl/KsIlge\n");this._bitField=0,this._fulfillmentHandler0=void 0,this._rejectionHandler0=void 0,this._progressHandler0=void 0,this._promise0=void 0,this._receiver0=void 0,this._settledValue=void 0,t!==p&&this._resolveFromResolver(t)}function r(t){var r=new e(p);r._fulfillmentHandler0=t,r._rejectionHandler0=t,r._progressHandler0=t,r._promise0=t,r._receiver0=t,r._settledValue=t}var n,i=function(){return new h("circular promise resolution chain\n\n    See http://goo.gl/LhFpo0\n")},o=function(){return new e.PromiseInspection(this._target())},s=function(t){return e.reject(new h(t))},a=t("./util.js");n=a.isNode?function(){var t=process.domain;return void 0===t&&(t=null),t}:function(){return null},a.notEnumerableProp(e,"_getDomain",n);var u={},c=t("./async.js"),l=t("./errors.js"),h=e.TypeError=l.TypeError;e.RangeError=l.RangeError,e.CancellationError=l.CancellationError,e.TimeoutError=l.TimeoutError,e.OperationalError=l.OperationalError,e.RejectionError=l.OperationalError,e.AggregateError=l.AggregateError;var p=function(){},f={},_={e:null},d=t("./thenables.js")(e,p),v=t("./promise_array.js")(e,p,d,s),y=t("./captured_trace.js")(),g=t("./debuggability.js")(e,y),m=t("./context.js")(e,y,g),j=t("./catch_filter.js")(_),b=t("./promise_resolver.js"),w=b._nodebackForPromise,k=a.errorObj,E=a.tryCatch;return e.prototype.toString=function(){return"[object Promise]"},e.prototype.caught=e.prototype["catch"]=function(t){var r=arguments.length;if(r>1){var n,i=new Array(r-1),o=0;for(n=0;r-1>n;++n){var s=arguments[n];if("function"!=typeof s)return e.reject(new h("Catch filter must inherit from Error or be a simple predicate function\n\n    See http://goo.gl/o84o68\n"));i[o++]=s}i.length=o,t=arguments[n];var a=new j(i,t,this);return this._then(void 0,a.doFilter,void 0,a,void 0)}return this._then(void 0,t,void 0,void 0,void 0)},e.prototype.reflect=function(){return this._then(o,o,void 0,this,void 0)},e.prototype.then=function(t,e,r){if(g()&&arguments.length>0&&"function"!=typeof t&&"function"!=typeof e){var n=".then() only accepts functions but was passed: "+a.classString(t);arguments.length>1&&(n+=", "+a.classString(e)),this._warn(n)}return this._then(t,e,r,void 0,void 0)},e.prototype.done=function(t,e,r){var n=this._then(t,e,r,void 0,void 0);
-n._setIsFinal()},e.prototype.spread=function(t,e){return this.all()._then(t,e,void 0,f,void 0)},e.prototype.isCancellable=function(){return!this.isResolved()&&this._cancellable()},e.prototype.toJSON=function(){var t={isFulfilled:!1,isRejected:!1,fulfillmentValue:void 0,rejectionReason:void 0};return this.isFulfilled()?(t.fulfillmentValue=this.value(),t.isFulfilled=!0):this.isRejected()&&(t.rejectionReason=this.reason(),t.isRejected=!0),t},e.prototype.all=function(){return new v(this).promise()},e.prototype.error=function(t){return this.caught(a.originatesFromRejection,t)},e.is=function(t){return t instanceof e},e.fromNode=function(t){var r=new e(p),n=E(t)(w(r));return n===k&&r._rejectCallback(n.e,!0,!0),r},e.all=function(t){return new v(t).promise()},e.defer=e.pending=function(){var t=new e(p);return new b(t)},e.cast=function(t){var r=d(t);if(!(r instanceof e)){var n=r;r=new e(p),r._fulfillUnchecked(n)}return r},e.resolve=e.fulfilled=e.cast,e.reject=e.rejected=function(t){var r=new e(p);return r._captureStackTrace(),r._rejectCallback(t,!0),r},e.setScheduler=function(t){if("function"!=typeof t)throw new h("fn must be a function\n\n    See http://goo.gl/916lJJ\n");var e=c._schedule;return c._schedule=t,e},e.prototype._then=function(t,r,i,o,s){var a=void 0!==s,u=a?s:new e(p);a||(u._propagateFrom(this,5),u._captureStackTrace());var l=this._target();l!==this&&(void 0===o&&(o=this._boundTo),a||u._setIsMigrated());var h=l._addCallbacks(t,r,i,u,o,n());return l._isResolved()&&!l._isSettlePromisesQueued()&&c.invoke(l._settlePromiseAtPostResolution,l,h),u},e.prototype._settlePromiseAtPostResolution=function(t){this._isRejectionUnhandled()&&this._unsetRejectionIsUnhandled(),this._settlePromiseAt(t)},e.prototype._length=function(){return 131071&this._bitField},e.prototype._isFollowingOrFulfilledOrRejected=function(){return(939524096&this._bitField)>0},e.prototype._isFollowing=function(){return 536870912===(536870912&this._bitField)},e.prototype._setLength=function(t){this._bitField=-131072&this._bitField|131071&t},e.prototype._setFulfilled=function(){this._bitField=268435456|this._bitField},e.prototype._setRejected=function(){this._bitField=134217728|this._bitField},e.prototype._setFollowing=function(){this._bitField=536870912|this._bitField},e.prototype._setIsFinal=function(){this._bitField=33554432|this._bitField},e.prototype._isFinal=function(){return(33554432&this._bitField)>0},e.prototype._cancellable=function(){return(67108864&this._bitField)>0},e.prototype._setCancellable=function(){this._bitField=67108864|this._bitField},e.prototype._unsetCancellable=function(){this._bitField=-67108865&this._bitField},e.prototype._setIsMigrated=function(){this._bitField=4194304|this._bitField},e.prototype._unsetIsMigrated=function(){this._bitField=-4194305&this._bitField},e.prototype._isMigrated=function(){return(4194304&this._bitField)>0},e.prototype._receiverAt=function(t){var e=0===t?this._receiver0:this[5*t-5+4];return e===u?void 0:void 0===e&&this._isBound()?this._boundValue():e},e.prototype._promiseAt=function(t){return 0===t?this._promise0:this[5*t-5+3]},e.prototype._fulfillmentHandlerAt=function(t){return 0===t?this._fulfillmentHandler0:this[5*t-5+0]},e.prototype._rejectionHandlerAt=function(t){return 0===t?this._rejectionHandler0:this[5*t-5+1]},e.prototype._boundValue=function(){var t=this._boundTo;return void 0!==t&&t instanceof e?t.isFulfilled()?t.value():void 0:t},e.prototype._migrateCallbacks=function(t,r){var n=t._fulfillmentHandlerAt(r),i=t._rejectionHandlerAt(r),o=t._progressHandlerAt(r),s=t._promiseAt(r),a=t._receiverAt(r);s instanceof e&&s._setIsMigrated(),void 0===a&&(a=u),this._addCallbacks(n,i,o,s,a,null)},e.prototype._addCallbacks=function(t,e,r,n,i,o){var s=this._length();if(s>=131066&&(s=0,this._setLength(0)),0===s)this._promise0=n,void 0!==i&&(this._receiver0=i),"function"!=typeof t||this._isCarryingStackTrace()||(this._fulfillmentHandler0=null===o?t:o.bind(t)),"function"==typeof e&&(this._rejectionHandler0=null===o?e:o.bind(e)),"function"==typeof r&&(this._progressHandler0=null===o?r:o.bind(r));else{var a=5*s-5;this[a+3]=n,this[a+4]=i,"function"==typeof t&&(this[a+0]=null===o?t:o.bind(t)),"function"==typeof e&&(this[a+1]=null===o?e:o.bind(e)),"function"==typeof r&&(this[a+2]=null===o?r:o.bind(r))}return this._setLength(s+1),s},e.prototype._setProxyHandlers=function(t,e){var r=this._length();if(r>=131066&&(r=0,this._setLength(0)),0===r)this._promise0=e,this._receiver0=t;else{var n=5*r-5;this[n+3]=e,this[n+4]=t}this._setLength(r+1)},e.prototype._proxyPromiseArray=function(t,e){this._setProxyHandlers(t,e)},e.prototype._resolveCallback=function(t,r){if(!this._isFollowingOrFulfilledOrRejected()){if(t===this)return this._rejectCallback(i(),!1,!0);var n=d(t,this);if(!(n instanceof e))return this._fulfill(t);var o=1|(r?4:0);this._propagateFrom(n,o);var s=n._target();if(s._isPending()){for(var a=this._length(),u=0;a>u;++u)s._migrateCallbacks(this,u);this._setFollowing(),this._setLength(0),this._setFollowee(s)}else s._isFulfilled()?this._fulfillUnchecked(s._value()):this._rejectUnchecked(s._reason(),s._getCarriedStackTrace())}},e.prototype._rejectCallback=function(t,e,r){r||a.markAsOriginatingFromRejection(t);var n=a.ensureErrorObject(t),i=n===t;this._attachExtraTrace(n,e?i:!1),this._reject(t,i?void 0:n)},e.prototype._resolveFromResolver=function(t){var e=this;this._captureStackTrace(),this._pushContext();var r=!0,n=E(t)(function(t){null!==e&&(e._resolveCallback(t),e=null)},function(t){null!==e&&(e._rejectCallback(t,r),e=null)});r=!1,this._popContext(),void 0!==n&&n===k&&null!==e&&(e._rejectCallback(n.e,!0,!0),e=null)},e.prototype._settlePromiseFromHandler=function(t,e,r,n){if(!n._isRejected()){n._pushContext();var o;if(o=e!==f||this._isRejected()?E(t).call(e,r):E(t).apply(this._boundValue(),r),n._popContext(),o===k||o===n||o===_){var s=o===n?i():o.e;n._rejectCallback(s,!1,!0)}else n._resolveCallback(o)}},e.prototype._target=function(){for(var t=this;t._isFollowing();)t=t._followee();return t},e.prototype._followee=function(){return this._rejectionHandler0},e.prototype._setFollowee=function(t){this._rejectionHandler0=t},e.prototype._cleanValues=function(){this._cancellable()&&(this._cancellationParent=void 0)},e.prototype._propagateFrom=function(t,e){(1&e)>0&&t._cancellable()&&(this._setCancellable(),this._cancellationParent=t),(4&e)>0&&t._isBound()&&this._setBoundTo(t._boundTo)},e.prototype._fulfill=function(t){this._isFollowingOrFulfilledOrRejected()||this._fulfillUnchecked(t)},e.prototype._reject=function(t,e){this._isFollowingOrFulfilledOrRejected()||this._rejectUnchecked(t,e)},e.prototype._settlePromiseAt=function(t){var r=this._promiseAt(t),n=r instanceof e;if(n&&r._isMigrated())return r._unsetIsMigrated(),c.invoke(this._settlePromiseAt,this,t);var i=this._isFulfilled()?this._fulfillmentHandlerAt(t):this._rejectionHandlerAt(t),o=this._isCarryingStackTrace()?this._getCarriedStackTrace():void 0,s=this._settledValue,a=this._receiverAt(t);this._clearCallbackDataAtIndex(t),"function"==typeof i?n?this._settlePromiseFromHandler(i,a,s,r):i.call(a,s,r):a instanceof v?a._isResolved()||(this._isFulfilled()?a._promiseFulfilled(s,r):a._promiseRejected(s,r)):n&&(this._isFulfilled()?r._fulfill(s):r._reject(s,o)),t>=4&&4===(31&t)&&c.invokeLater(this._setLength,this,0)},e.prototype._clearCallbackDataAtIndex=function(t){if(0===t)this._isCarryingStackTrace()||(this._fulfillmentHandler0=void 0),this._rejectionHandler0=this._progressHandler0=this._receiver0=this._promise0=void 0;else{var e=5*t-5;this[e+3]=this[e+4]=this[e+0]=this[e+1]=this[e+2]=void 0}},e.prototype._isSettlePromisesQueued=function(){return-1073741824===(-1073741824&this._bitField)},e.prototype._setSettlePromisesQueued=function(){this._bitField=-1073741824|this._bitField},e.prototype._unsetSettlePromisesQueued=function(){this._bitField=1073741823&this._bitField},e.prototype._queueSettlePromises=function(){c.settlePromises(this),this._setSettlePromisesQueued()},e.prototype._fulfillUnchecked=function(t){if(t===this){var e=i();return this._attachExtraTrace(e),this._rejectUnchecked(e,void 0)}this._setFulfilled(),this._settledValue=t,this._cleanValues(),this._length()>0&&this._queueSettlePromises()},e.prototype._rejectUncheckedCheckError=function(t){var e=a.ensureErrorObject(t);this._rejectUnchecked(t,e===t?void 0:e)},e.prototype._rejectUnchecked=function(t,e){if(t===this){var r=i();return this._attachExtraTrace(r),this._rejectUnchecked(r)}return this._setRejected(),this._settledValue=t,this._cleanValues(),this._isFinal()?void c.throwLater(function(t){throw"stack"in t&&c.invokeFirst(y.unhandledRejection,void 0,t),t},void 0===e?t:e):(void 0!==e&&e!==t&&this._setCarriedStackTrace(e),void(this._length()>0?this._queueSettlePromises():this._ensurePossibleRejectionHandled()))},e.prototype._settlePromises=function(){this._unsetSettlePromisesQueued();for(var t=this._length(),e=0;t>e;e++)this._settlePromiseAt(e)},a.notEnumerableProp(e,"_makeSelfResolutionError",i),t("./progress.js")(e,v),t("./method.js")(e,p,d,s),t("./bind.js")(e,p,d),t("./finally.js")(e,_,d),t("./direct_resolve.js")(e),t("./synchronous_inspection.js")(e),t("./join.js")(e,v,d,p),e.Promise=e,t("./map.js")(e,v,s,d,p),t("./cancel.js")(e),t("./using.js")(e,s,d,m),t("./generators.js")(e,s,p,d),t("./nodeify.js")(e),t("./call_get.js")(e),t("./props.js")(e,v,d,s),t("./race.js")(e,p,d,s),t("./reduce.js")(e,v,s,d,p),t("./settle.js")(e,v),t("./some.js")(e,v,s),t("./promisify.js")(e,p),t("./any.js")(e),t("./each.js")(e,p),t("./timers.js")(e,p),t("./filter.js")(e,p),a.toFastProperties(e),a.toFastProperties(e.prototype),r({a:1}),r({b:2}),r({c:3}),r(1),r(function(){}),r(void 0),r(!1),r(new e(p)),y.setBounds(c.firstLineError,a.lastLineError),e}},{"./any.js":1,"./async.js":2,"./bind.js":3,"./call_get.js":5,"./cancel.js":6,"./captured_trace.js":7,"./catch_filter.js":8,"./context.js":9,"./debuggability.js":10,"./direct_resolve.js":11,"./each.js":12,"./errors.js":13,"./filter.js":15,"./finally.js":16,"./generators.js":17,"./join.js":18,"./map.js":19,"./method.js":20,"./nodeify.js":21,"./progress.js":22,"./promise_array.js":24,"./promise_resolver.js":25,"./promisify.js":26,"./props.js":27,"./race.js":29,"./reduce.js":30,"./settle.js":32,"./some.js":33,"./synchronous_inspection.js":34,"./thenables.js":35,"./timers.js":36,"./using.js":37,"./util.js":38}],24:[function(t,e){"use strict";e.exports=function(e,r,n,i){function o(t){switch(t){case-2:return[];case-3:return{}}}function s(t){var n,i=this._promise=new e(r);t instanceof e&&(n=t,i._propagateFrom(n,5)),this._values=t,this._length=0,this._totalResolved=0,this._init(void 0,-2)}var a=t("./util.js"),u=a.isArray;return s.prototype.length=function(){return this._length},s.prototype.promise=function(){return this._promise},s.prototype._init=function c(t,r){var s=n(this._values,this._promise);if(s instanceof e){if(s=s._target(),this._values=s,!s._isFulfilled())return s._isPending()?void s._then(c,this._reject,void 0,this,r):void this._reject(s._reason());if(s=s._value(),!u(s)){var a=new e.TypeError("expecting an array, a promise or a thenable\n\n    See http://goo.gl/s8MMhc\n");return void this.__hardReject__(a)}}else if(!u(s))return void this._promise._reject(i("expecting an array, a promise or a thenable\n\n    See http://goo.gl/s8MMhc\n")._reason());if(0===s.length)return void(-5===r?this._resolveEmptyArray():this._resolve(o(r)));var l=this.getActualLength(s.length);this._length=l,this._values=this.shouldCopyValues()?new Array(l):this._values;for(var h=this._promise,p=0;l>p;++p){var f=this._isResolved(),_=n(s[p],h);_ instanceof e?(_=_._target(),f?_._ignoreRejections():_._isPending()?_._proxyPromiseArray(this,p):_._isFulfilled()?this._promiseFulfilled(_._value(),p):this._promiseRejected(_._reason(),p)):f||this._promiseFulfilled(_,p)}},s.prototype._isResolved=function(){return null===this._values},s.prototype._resolve=function(t){this._values=null,this._promise._fulfill(t)},s.prototype.__hardReject__=s.prototype._reject=function(t){this._values=null,this._promise._rejectCallback(t,!1,!0)},s.prototype._promiseProgressed=function(t,e){this._promise._progress({index:e,value:t})},s.prototype._promiseFulfilled=function(t,e){this._values[e]=t;var r=++this._totalResolved;r>=this._length&&this._resolve(this._values)},s.prototype._promiseRejected=function(t){this._totalResolved++,this._reject(t)},s.prototype.shouldCopyValues=function(){return!0},s.prototype.getActualLength=function(t){return t},s}},{"./util.js":38}],25:[function(t,e){"use strict";function r(t){return t instanceof Error&&p.getPrototypeOf(t)===Error.prototype}function n(t){var e;if(r(t)){e=new l(t),e.name=t.name,e.message=t.message,e.stack=t.stack;for(var n=p.keys(t),i=0;i<n.length;++i){var o=n[i];f.test(o)||(e[o]=t[o])}return e}return s.markAsOriginatingFromRejection(t),t}function i(t){return function(e,r){if(null!==t){if(e){var i=n(a(e));t._attachExtraTrace(i),t._reject(i)}else if(arguments.length>2){for(var o=arguments.length,s=new Array(o-1),u=1;o>u;++u)s[u-1]=arguments[u];t._fulfill(s)}else t._fulfill(r);t=null}}}var o,s=t("./util.js"),a=s.maybeWrapAsError,u=t("./errors.js"),c=u.TimeoutError,l=u.OperationalError,h=s.haveGetters,p=t("./es5.js"),f=/^(?:name|message|stack|cause)$/;if(o=h?function(t){this.promise=t}:function(t){this.promise=t,this.asCallback=i(t),this.callback=this.asCallback},h){var _={get:function(){return i(this.promise)}};p.defineProperty(o.prototype,"asCallback",_),p.defineProperty(o.prototype,"callback",_)}o._nodebackForPromise=i,o.prototype.toString=function(){return"[object PromiseResolver]"},o.prototype.resolve=o.prototype.fulfill=function(t){if(!(this instanceof o))throw new TypeError("Illegal invocation, resolver resolve/reject must be called within a resolver context. Consider using the promise constructor instead.\n\n    See http://goo.gl/sdkXL9\n");this.promise._resolveCallback(t)},o.prototype.reject=function(t){if(!(this instanceof o))throw new TypeError("Illegal invocation, resolver resolve/reject must be called within a resolver context. Consider using the promise constructor instead.\n\n    See http://goo.gl/sdkXL9\n");this.promise._rejectCallback(t)},o.prototype.progress=function(t){if(!(this instanceof o))throw new TypeError("Illegal invocation, resolver resolve/reject must be called within a resolver context. Consider using the promise constructor instead.\n\n    See http://goo.gl/sdkXL9\n");this.promise._progress(t)},o.prototype.cancel=function(t){this.promise.cancel(t)},o.prototype.timeout=function(){this.reject(new c("timeout"))},o.prototype.isResolved=function(){return this.promise.isResolved()},o.prototype.toJSON=function(){return this.promise.toJSON()},e.exports=o},{"./errors.js":13,"./es5.js":14,"./util.js":38}],26:[function(t,e){"use strict";e.exports=function(e,r){function n(t){return!w.test(t)}function i(t){try{return t.__isPromisified__===!0}catch(e){return!1}}function o(t,e,r){var n=f.getDataPropertyOrDefault(t,e+r,j);return n?i(n):!1}function s(t,e,r){for(var n=0;n<t.length;n+=2){var i=t[n];if(r.test(i))for(var o=i.replace(r,""),s=0;s<t.length;s+=2)if(t[s]===o)throw new g("Cannot promisify an API that has normal methods with '%s'-suffix\n\n    See http://goo.gl/iWrZbw\n".replace("%s",e))}}function a(t,e,r,n){for(var a=f.inheritedDataKeys(t),u=[],c=0;c<a.length;++c){var l=a[c],h=t[l],p=n===k?!0:k(l,h,t);"function"!=typeof h||i(h)||o(t,l,e)||!n(l,h,t,p)||u.push(l,h)}return s(u,e,r),u}function u(t,n,i,o){function s(){var i=n;n===p&&(i=this);var o=new e(r);o._captureStackTrace();var s="string"==typeof u&&this!==a?this[u]:t,c=_(o);try{s.apply(i,d(arguments,c))}catch(l){o._rejectCallback(v(l),!0,!0)}return o}var a=function(){return this}(),u=t;return"string"==typeof u&&(t=o),f.notEnumerableProp(s,"__isPromisified__",!0),s}function c(t,e,r,n){for(var i=new RegExp(E(e)+"$"),o=a(t,e,i,r),s=0,u=o.length;u>s;s+=2){var c=o[s],l=o[s+1],h=c+e;if(n===F)t[h]=F(c,p,c,l,e);else{var _=n(l,function(){return F(c,p,c,l,e)});f.notEnumerableProp(_,"__isPromisified__",!0),t[h]=_}}return f.toFastProperties(t),t}function l(t,e){return F(t,e,void 0,t)}var h,p={},f=t("./util.js"),_=t("./promise_resolver.js")._nodebackForPromise,d=f.withAppended,v=f.maybeWrapAsError,y=f.canEvaluate,g=t("./errors").TypeError,m="Async",j={__isPromisified__:!0},b=["arity","length","name","arguments","caller","callee","prototype","__isPromisified__"],w=new RegExp("^(?:"+b.join("|")+")$"),k=function(t){return f.isIdentifier(t)&&"_"!==t.charAt(0)&&"constructor"!==t},E=function(t){return t.replace(/([$])/,"\\$")},F=y?h:u;e.promisify=function(t,e){if("function"!=typeof t)throw new g("fn must be a function\n\n    See http://goo.gl/916lJJ\n");if(i(t))return t;var r=l(t,arguments.length<2?p:e);return f.copyDescriptors(t,r,n),r},e.promisifyAll=function(t,e){if("function"!=typeof t&&"object"!=typeof t)throw new g("the target of promisifyAll must be an object or a function\n\n    See http://goo.gl/9ITlV0\n");e=Object(e);var r=e.suffix;"string"!=typeof r&&(r=m);var n=e.filter;"function"!=typeof n&&(n=k);var i=e.promisifier;if("function"!=typeof i&&(i=F),!f.isIdentifier(r))throw new RangeError("suffix must be a valid identifier\n\n    See http://goo.gl/8FZo5V\n");for(var o=f.inheritedDataKeys(t),s=0;s<o.length;++s){var a=t[o[s]];"constructor"!==o[s]&&f.isClass(a)&&(c(a.prototype,r,n,i),c(a,r,n,i))}return c(t,r,n,i)}}},{"./errors":13,"./promise_resolver.js":25,"./util.js":38}],27:[function(t,e){"use strict";e.exports=function(e,r,n,i){function o(t){for(var e=c.keys(t),r=e.length,n=new Array(2*r),i=0;r>i;++i){var o=e[i];n[i]=t[o],n[i+r]=o}this.constructor$(n)}function s(t){var r,s=n(t);return u(s)?(r=s instanceof e?s._then(e.props,void 0,void 0,void 0,void 0):new o(s).promise(),s instanceof e&&r._propagateFrom(s,4),r):i("cannot await properties of a non-object\n\n    See http://goo.gl/OsFKC8\n")}var a=t("./util.js"),u=a.isObject,c=t("./es5.js");a.inherits(o,r),o.prototype._init=function(){this._init$(void 0,-3)},o.prototype._promiseFulfilled=function(t,e){this._values[e]=t;var r=++this._totalResolved;if(r>=this._length){for(var n={},i=this.length(),o=0,s=this.length();s>o;++o)n[this._values[o+i]]=this._values[o];this._resolve(n)}},o.prototype._promiseProgressed=function(t,e){this._promise._progress({key:this._values[e+this.length()],value:t})},o.prototype.shouldCopyValues=function(){return!1},o.prototype.getActualLength=function(t){return t>>1},e.prototype.props=function(){return s(this)},e.props=function(t){return s(t)}}},{"./es5.js":14,"./util.js":38}],28:[function(t,e){"use strict";function r(t,e,r,n,i){for(var o=0;i>o;++o)r[o+n]=t[o+e],t[o+e]=void 0}function n(t){this._capacity=t,this._length=0,this._front=0}n.prototype._willBeOverCapacity=function(t){return this._capacity<t},n.prototype._pushOne=function(t){var e=this.length();this._checkCapacity(e+1);var r=this._front+e&this._capacity-1;this[r]=t,this._length=e+1},n.prototype._unshiftOne=function(t){var e=this._capacity;this._checkCapacity(this.length()+1);var r=this._front,n=(r-1&e-1^e)-e;this[n]=t,this._front=n,this._length=this.length()+1},n.prototype.unshift=function(t,e,r){this._unshiftOne(r),this._unshiftOne(e),this._unshiftOne(t)},n.prototype.push=function(t,e,r){var n=this.length()+3;if(this._willBeOverCapacity(n))return this._pushOne(t),this._pushOne(e),void this._pushOne(r);var i=this._front+n-3;this._checkCapacity(n);var o=this._capacity-1;this[i+0&o]=t,this[i+1&o]=e,this[i+2&o]=r,this._length=n},n.prototype.shift=function(){var t=this._front,e=this[t];return this[t]=void 0,this._front=t+1&this._capacity-1,this._length--,e},n.prototype.length=function(){return this._length},n.prototype._checkCapacity=function(t){this._capacity<t&&this._resizeTo(this._capacity<<1)},n.prototype._resizeTo=function(t){var e=this._capacity;this._capacity=t;var n=this._front,i=this._length,o=n+i&e-1;r(this,0,this,e,o)},e.exports=n},{}],29:[function(t,e){"use strict";e.exports=function(e,r,n,i){function o(t,o){var u=n(t);if(u instanceof e)return a(u);if(!s(t))return i("expecting an array, a promise or a thenable\n\n    See http://goo.gl/s8MMhc\n");var c=new e(r);void 0!==o&&c._propagateFrom(o,5);for(var l=c._fulfill,h=c._reject,p=0,f=t.length;f>p;++p){var _=t[p];(void 0!==_||p in t)&&e.cast(_)._then(l,h,void 0,c,null)}return c}var s=t("./util.js").isArray,a=function(t){return t.then(function(e){return o(e,t)})};e.race=function(t){return o(t,void 0)},e.prototype.race=function(){return o(this,void 0)}}},{"./util.js":38}],30:[function(t,e){"use strict";e.exports=function(e,r,n,i,o){function s(t,r,n,s){this.constructor$(t),this._promise._captureStackTrace(),this._preservedValues=s===o?[]:null,this._zerothIsAccum=void 0===n,this._gotAccum=!1,this._reducingIndex=this._zerothIsAccum?1:0,this._valuesPhase=void 0;var u=i(n,this._promise),h=!1,p=u instanceof e;p&&(u=u._target(),u._isPending()?u._proxyPromiseArray(this,-1):u._isFulfilled()?(n=u._value(),this._gotAccum=!0):(this._reject(u._reason()),h=!0)),p||this._zerothIsAccum||(this._gotAccum=!0);var f=c();this._callback=null===f?r:f.bind(r),this._accum=n,h||l.invoke(a,this,void 0)}function a(){this._init$(void 0,-5)}function u(t,e,r,i){if("function"!=typeof e)return n("fn must be a function\n\n    See http://goo.gl/916lJJ\n");var o=new s(t,e,r,i);return o.promise()}var c=e._getDomain,l=t("./async.js"),h=t("./util.js"),p=h.tryCatch,f=h.errorObj;h.inherits(s,r),s.prototype._init=function(){},s.prototype._resolveEmptyArray=function(){(this._gotAccum||this._zerothIsAccum)&&this._resolve(null!==this._preservedValues?[]:this._accum)},s.prototype._promiseFulfilled=function(t,r){var n=this._values;n[r]=t;var o,s=this.length(),a=this._preservedValues,u=null!==a,c=this._gotAccum,l=this._valuesPhase;if(!l)for(l=this._valuesPhase=new Array(s),o=0;s>o;++o)l[o]=0;if(o=l[r],0===r&&this._zerothIsAccum?(this._accum=t,this._gotAccum=c=!0,l[r]=0===o?1:2):-1===r?(this._accum=t,this._gotAccum=c=!0):0===o?l[r]=1:(l[r]=2,this._accum=t),c){for(var h,_=this._callback,d=this._promise._boundValue(),v=this._reducingIndex;s>v;++v)if(o=l[v],2!==o){if(1!==o)return;if(t=n[v],this._promise._pushContext(),u?(a.push(t),h=p(_).call(d,t,v,s)):h=p(_).call(d,this._accum,t,v,s),this._promise._popContext(),h===f)return this._reject(h.e);var y=i(h,this._promise);if(y instanceof e){if(y=y._target(),y._isPending())return l[v]=4,y._proxyPromiseArray(this,v);if(!y._isFulfilled())return this._reject(y._reason());h=y._value()}this._reducingIndex=v+1,this._accum=h}else this._reducingIndex=v+1;this._resolve(u?a:this._accum)}},e.prototype.reduce=function(t,e){return u(this,t,e,null)},e.reduce=function(t,e,r,n){return u(t,e,r,n)}}},{"./async.js":2,"./util.js":38}],31:[function(t,e){"use strict";var r,n=t("./util"),i=function(){throw new Error("No async scheduler available\n\n    See http://goo.gl/m3OTXk\n")};if(n.isNode&&"undefined"==typeof MutationObserver){var o=global.setImmediate,s=process.nextTick;r=n.isRecentNode?function(t){o.call(global,t)}:function(t){s.call(process,t)}}else"undefined"==typeof MutationObserver||"undefined"!=typeof window&&window.navigator&&window.navigator.standalone?r="undefined"!=typeof setImmediate?function(t){setImmediate(t)}:"undefined"!=typeof setTimeout?function(t){setTimeout(t,0)}:i:(r=function(t){var e=document.createElement("div"),r=new MutationObserver(t);return r.observe(e,{attributes:!0}),function(){e.classList.toggle("foo")}},r.isStatic=!0);e.exports=r},{"./util":38}],32:[function(t,e){"use strict";e.exports=function(e,r){function n(t){this.constructor$(t)}var i=e.PromiseInspection,o=t("./util.js");o.inherits(n,r),n.prototype._promiseResolved=function(t,e){this._values[t]=e;var r=++this._totalResolved;r>=this._length&&this._resolve(this._values)},n.prototype._promiseFulfilled=function(t,e){var r=new i;r._bitField=268435456,r._settledValue=t,this._promiseResolved(e,r)},n.prototype._promiseRejected=function(t,e){var r=new i;r._bitField=134217728,r._settledValue=t,this._promiseResolved(e,r)},e.settle=function(t){return new n(t).promise()},e.prototype.settle=function(){return new n(this).promise()}}},{"./util.js":38}],33:[function(t,e){"use strict";e.exports=function(e,r,n){function i(t){this.constructor$(t),this._howMany=0,this._unwrap=!1,this._initialized=!1}function o(t,e){if((0|e)!==e||0>e)return n("expecting a positive integer\n\n    See http://goo.gl/1wAmHx\n");var r=new i(t),o=r.promise();return r.setHowMany(e),r.init(),o}var s=t("./util.js"),a=t("./errors.js").RangeError,u=t("./errors.js").AggregateError,c=s.isArray;s.inherits(i,r),i.prototype._init=function(){if(this._initialized){if(0===this._howMany)return void this._resolve([]);this._init$(void 0,-5);var t=c(this._values);!this._isResolved()&&t&&this._howMany>this._canPossiblyFulfill()&&this._reject(this._getRangeError(this.length()))}},i.prototype.init=function(){this._initialized=!0,this._init()},i.prototype.setUnwrap=function(){this._unwrap=!0},i.prototype.howMany=function(){return this._howMany},i.prototype.setHowMany=function(t){this._howMany=t},i.prototype._promiseFulfilled=function(t){this._addFulfilled(t),this._fulfilled()===this.howMany()&&(this._values.length=this.howMany(),this._resolve(1===this.howMany()&&this._unwrap?this._values[0]:this._values))},i.prototype._promiseRejected=function(t){if(this._addRejected(t),this.howMany()>this._canPossiblyFulfill()){for(var e=new u,r=this.length();r<this._values.length;++r)e.push(this._values[r]);this._reject(e)}},i.prototype._fulfilled=function(){return this._totalResolved},i.prototype._rejected=function(){return this._values.length-this.length()},i.prototype._addRejected=function(t){this._values.push(t)},i.prototype._addFulfilled=function(t){this._values[this._totalResolved++]=t},i.prototype._canPossiblyFulfill=function(){return this.length()-this._rejected()},i.prototype._getRangeError=function(t){var e="Input array must contain at least "+this._howMany+" items but contains only "+t+" items";return new a(e)},i.prototype._resolveEmptyArray=function(){this._reject(this._getRangeError(0))},e.some=function(t,e){return o(t,e)},e.prototype.some=function(t){return o(this,t)},e._SomePromiseArray=i}},{"./errors.js":13,"./util.js":38}],34:[function(t,e){"use strict";e.exports=function(t){function e(t){void 0!==t?(t=t._target(),this._bitField=t._bitField,this._settledValue=t._settledValue):(this._bitField=0,this._settledValue=void 0)}e.prototype.value=function(){if(!this.isFulfilled())throw new TypeError("cannot get fulfillment value of a non-fulfilled promise\n\n    See http://goo.gl/hc1DLj\n");return this._settledValue},e.prototype.error=e.prototype.reason=function(){if(!this.isRejected())throw new TypeError("cannot get rejection reason of a non-rejected promise\n\n    See http://goo.gl/hPuiwB\n");return this._settledValue},e.prototype.isFulfilled=t.prototype._isFulfilled=function(){return(268435456&this._bitField)>0},e.prototype.isRejected=t.prototype._isRejected=function(){return(134217728&this._bitField)>0},e.prototype.isPending=t.prototype._isPending=function(){return 0===(402653184&this._bitField)},e.prototype.isResolved=t.prototype._isResolved=function(){return(402653184&this._bitField)>0},t.prototype.isPending=function(){return this._target()._isPending()},t.prototype.isRejected=function(){return this._target()._isRejected()},t.prototype.isFulfilled=function(){return this._target()._isFulfilled()},t.prototype.isResolved=function(){return this._target()._isResolved()},t.prototype._value=function(){return this._settledValue},t.prototype._reason=function(){return this._unsetRejectionIsUnhandled(),this._settledValue},t.prototype.value=function(){var t=this._target();if(!t.isFulfilled())throw new TypeError("cannot get fulfillment value of a non-fulfilled promise\n\n    See http://goo.gl/hc1DLj\n");return t._settledValue},t.prototype.reason=function(){var t=this._target();if(!t.isRejected())throw new TypeError("cannot get rejection reason of a non-rejected promise\n\n    See http://goo.gl/hPuiwB\n");return t._unsetRejectionIsUnhandled(),t._settledValue},t.PromiseInspection=e}},{}],35:[function(t,e){"use strict";e.exports=function(e,r){function n(t,n){if(c(t)){if(t instanceof e)return t;if(o(t)){var l=new e(r);return t._then(l._fulfillUnchecked,l._rejectUncheckedCheckError,l._progressUnchecked,l,null),l}var h=a.tryCatch(i)(t);if(h===u){n&&n._pushContext();var l=e.reject(h.e);return n&&n._popContext(),l}if("function"==typeof h)return s(t,h,n)}return t}function i(t){return t.then}function o(t){return l.call(t,"_promise0")}function s(t,n,i){function o(t){l&&(l._resolveCallback(t),l=null)}function s(t){l&&(l._rejectCallback(t,p,!0),l=null)}function c(t){l&&"function"==typeof l._progress&&l._progress(t)}var l=new e(r),h=l;i&&i._pushContext(),l._captureStackTrace(),i&&i._popContext();var p=!0,f=a.tryCatch(n).call(t,o,s,c);return p=!1,l&&f===u&&(l._rejectCallback(f.e,!0,!0),l=null),h}var a=t("./util.js"),u=a.errorObj,c=a.isObject,l={}.hasOwnProperty;return n}},{"./util.js":38}],36:[function(t,e){"use strict";e.exports=function(e,r){function n(t){var e=this;return e instanceof Number&&(e=+e),clearTimeout(e),t}function i(t){var e=this;throw e instanceof Number&&(e=+e),clearTimeout(e),t}var o=t("./util.js"),s=e.TimeoutError,a=function(t,e){if(t.isPending()){"string"!=typeof e&&(e="operation timed out");var r=new s(e);o.markAsOriginatingFromRejection(r),t._attachExtraTrace(r),t._cancel(r)}},u=function(t){return c(+this).thenReturn(t)},c=e.delay=function(t,n){if(void 0===n){n=t,t=void 0;var i=new e(r);return setTimeout(function(){i._fulfill()},n),i}return n=+n,e.resolve(t)._then(u,null,null,n,void 0)};e.prototype.delay=function(t){return c(this,t)},e.prototype.timeout=function(t,e){t=+t;var r=this.then().cancellable();r._cancellationParent=this;var o=setTimeout(function(){a(r,e)},t);return r._then(n,i,void 0,o,void 0)}}},{"./util.js":38}],37:[function(t,e){"use strict";e.exports=function(e,r,n,i){function o(t){for(var r=t.length,n=0;r>n;++n){var i=t[n];if(i.isRejected())return e.reject(i.error());t[n]=i._settledValue}return t}function s(t){setTimeout(function(){throw t},0)}function a(t){var e=n(t);return e!==t&&"function"==typeof t._isDisposable&&"function"==typeof t._getDisposer&&t._isDisposable()&&e._setDisposable(t._getDisposer()),e}function u(t,r){function i(){if(o>=u)return c.resolve();var l=a(t[o++]);if(l instanceof e&&l._isDisposable()){try{l=n(l._getDisposer().tryDispose(r),t.promise)}catch(h){return s(h)}if(l instanceof e)return l._then(i,s,null,null,null)}i()}var o=0,u=t.length,c=e.defer();return i(),c.promise}function c(t){var e=new v;return e._settledValue=t,e._bitField=268435456,u(this,e).thenReturn(t)}function l(t){var e=new v;return e._settledValue=t,e._bitField=134217728,u(this,e).thenThrow(t)}function h(t,e,r){this._data=t,this._promise=e,this._context=r}function p(t,e,r){this.constructor$(t,e,r)}function f(t){return h.isDisposer(t)?(this.resources[this.index]._setDisposable(t),t.promise()):t}var _=t("./errors.js").TypeError,d=t("./util.js").inherits,v=e.PromiseInspection;h.prototype.data=function(){return this._data},h.prototype.promise=function(){return this._promise},h.prototype.resource=function(){return this.promise().isFulfilled()?this.promise().value():null},h.prototype.tryDispose=function(t){var e=this.resource(),r=this._context;void 0!==r&&r._pushContext();var n=null!==e?this.doDispose(e,t):null;return void 0!==r&&r._popContext(),this._promise._unsetDisposable(),this._data=null,n},h.isDisposer=function(t){return null!=t&&"function"==typeof t.resource&&"function"==typeof t.tryDispose},d(p,h),p.prototype.doDispose=function(t,e){var r=this.data();return r.call(t,t,e)},e.using=function(){var t=arguments.length;if(2>t)return r("you must pass at least 2 arguments to Promise.using");var i=arguments[t-1];if("function"!=typeof i)return r("fn must be a function\n\n    See http://goo.gl/916lJJ\n");var s,a=!0;2===t&&Array.isArray(arguments[0])?(s=arguments[0],t=s.length,a=!1):(s=arguments,t--);for(var u=new Array(t),p=0;t>p;++p){var _=s[p];if(h.isDisposer(_)){var d=_;_=_.promise(),_._setDisposable(d)}else{var v=n(_);v instanceof e&&(_=v._then(f,null,null,{resources:u,index:p},void 0))
-}u[p]=_}var y=e.settle(u).then(o).then(function(t){y._pushContext();var e;try{e=a?i.apply(void 0,t):i.call(void 0,t)}finally{y._popContext()}return e})._then(c,l,void 0,u,void 0);return u.promise=y,y},e.prototype._setDisposable=function(t){this._bitField=262144|this._bitField,this._disposer=t},e.prototype._isDisposable=function(){return(262144&this._bitField)>0},e.prototype._getDisposer=function(){return this._disposer},e.prototype._unsetDisposable=function(){this._bitField=-262145&this._bitField,this._disposer=void 0},e.prototype.disposer=function(t){if("function"==typeof t)return new p(t,this,i());throw new _}}},{"./errors.js":13,"./util.js":38}],38:[function(t,e,r){"use strict";function n(){try{var t=C;return C=null,t.apply(this,arguments)}catch(e){return F.e=e,F}}function i(t){return C=t,n}function o(t){return null==t||t===!0||t===!1||"string"==typeof t||"number"==typeof t}function s(t){return!o(t)}function a(t){return o(t)?new Error(v(t)):t}function u(t,e){var r,n=t.length,i=new Array(n+1);for(r=0;n>r;++r)i[r]=t[r];return i[r]=e,i}function c(t,e,r){if(!w.isES5)return{}.hasOwnProperty.call(t,e)?t[e]:void 0;var n=Object.getOwnPropertyDescriptor(t,e);return null!=n?null==n.get&&null==n.set?n.value:r:void 0}function l(t,e,r){if(o(t))return t;var n={value:r,configurable:!0,enumerable:!1,writable:!0};return w.defineProperty(t,e,n),t}function h(t){throw t}function p(t){try{if("function"==typeof t){var e=w.names(t.prototype),r=w.isES5&&e.length>1,n=e.length>0&&!(1===e.length&&"constructor"===e[0]),i=x.test(t+"")&&w.names(t).length>0;if(r||n||i)return!0}return!1}catch(o){return!1}}function f(t){function e(){}e.prototype=t;for(var r=8;r--;)new e;return t}function _(t){return R.test(t)}function d(t,e,r){for(var n=new Array(t),i=0;t>i;++i)n[i]=e+i+r;return n}function v(t){try{return t+""}catch(e){return"[no string representation]"}}function y(t){try{l(t,"isOperational",!0)}catch(e){}}function g(t){return null==t?!1:t instanceof Error.__BluebirdErrorTypes__.OperationalError||t.isOperational===!0}function m(t){return t instanceof Error&&w.propertyIsWritable(t,"stack")}function j(t){return{}.toString.call(t)}function b(t,e,r){for(var n=w.names(t),i=0;i<n.length;++i){var o=n[i];if(r(o))try{w.defineProperty(e,o,w.getDescriptor(t,o))}catch(s){}}}var w=t("./es5.js"),k="undefined"==typeof navigator,E=function(){try{var t={};return w.defineProperty(t,"f",{get:function(){return 3}}),3===t.f}catch(e){return!1}}(),F={e:{}},C,P=function(t,e){function r(){this.constructor=t,this.constructor$=e;for(var r in e.prototype)n.call(e.prototype,r)&&"$"!==r.charAt(r.length-1)&&(this[r+"$"]=e.prototype[r])}var n={}.hasOwnProperty;return r.prototype=e.prototype,t.prototype=new r,t.prototype},T=function(){var t=[Array.prototype,Object.prototype,Function.prototype],e=function(e){for(var r=0;r<t.length;++r)if(t[r]===e)return!0;return!1};if(w.isES5){var r=Object.getOwnPropertyNames;return function(t){for(var n=[],i=Object.create(null);null!=t&&!e(t);){var o;try{o=r(t)}catch(s){return n}for(var a=0;a<o.length;++a){var u=o[a];if(!i[u]){i[u]=!0;var c=Object.getOwnPropertyDescriptor(t,u);null!=c&&null==c.get&&null==c.set&&n.push(u)}}t=w.getPrototypeOf(t)}return n}}var n={}.hasOwnProperty;return function(r){if(e(r))return[];var i=[];t:for(var o in r)if(n.call(r,o))i.push(o);else{for(var s=0;s<t.length;++s)if(n.call(t[s],o))continue t;i.push(o)}return i}}(),x=/this\s*\.\s*\S+\s*=/,R=/^[a-z$_][a-z$_0-9]*$/i,S=function(){return"stack"in new Error?function(t){return m(t)?t:new Error(v(t))}:function(t){if(m(t))return t;try{throw new Error(v(t))}catch(e){return e}}}(),A={isClass:p,isIdentifier:_,inheritedDataKeys:T,getDataPropertyOrDefault:c,thrower:h,isArray:w.isArray,haveGetters:E,notEnumerableProp:l,isPrimitive:o,isObject:s,canEvaluate:k,errorObj:F,tryCatch:i,inherits:P,withAppended:u,maybeWrapAsError:a,toFastProperties:f,filledRange:d,toString:v,canAttachTrace:m,ensureErrorObject:S,originatesFromRejection:g,markAsOriginatingFromRejection:y,classString:j,copyDescriptors:b,hasDevTools:"undefined"!=typeof chrome&&chrome&&"function"==typeof chrome.loadTimes,isNode:"undefined"!=typeof process&&"[object process]"===j(process).toLowerCase()};A.isRecentNode=A.isNode&&function(){var t=process.versions.node.split(".").map(Number);return 0===t[0]&&t[1]>10||t[0]>0}(),A.isNode&&A.toFastProperties(process);try{throw new Error}catch(O){A.lastLineError=O}e.exports=A},{"./es5.js":14}]},{},[4])(4)}),"undefined"!=typeof window&&null!==window?window.P=window.Promise:"undefined"!=typeof self&&null!==self&&(self.P=self.Promise);
\ No newline at end of file
diff --git a/deps/npm/node_modules/bluebird/js/main/any.js b/deps/npm/node_modules/bluebird/js/main/any.js
deleted file mode 100644
index 05a6228ef9c901..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/any.js
+++ /dev/null
@@ -1,21 +0,0 @@
-"use strict";
-module.exports = function(Promise) {
-var SomePromiseArray = Promise._SomePromiseArray;
-function any(promises) {
-    var ret = new SomePromiseArray(promises);
-    var promise = ret.promise();
-    ret.setHowMany(1);
-    ret.setUnwrap();
-    ret.init();
-    return promise;
-}
-
-Promise.any = function (promises) {
-    return any(promises);
-};
-
-Promise.prototype.any = function () {
-    return any(this);
-};
-
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/assert.js b/deps/npm/node_modules/bluebird/js/main/assert.js
deleted file mode 100644
index a98955c475ecbd..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/assert.js
+++ /dev/null
@@ -1,55 +0,0 @@
-"use strict";
-module.exports = (function(){
-var AssertionError = (function() {
-    function AssertionError(a) {
-        this.constructor$(a);
-        this.message = a;
-        this.name = "AssertionError";
-    }
-    AssertionError.prototype = new Error();
-    AssertionError.prototype.constructor = AssertionError;
-    AssertionError.prototype.constructor$ = Error;
-    return AssertionError;
-})();
-
-function getParams(args) {
-    var params = [];
-    for (var i = 0; i < args.length; ++i) params.push("arg" + i);
-    return params;
-}
-
-function nativeAssert(callName, args, expect) {
-    try {
-        var params = getParams(args);
-        var constructorArgs = params;
-        constructorArgs.push("return " +
-                callName + "("+ params.join(",") + ");");
-        var fn = Function.apply(null, constructorArgs);
-        return fn.apply(null, args);
-    } catch (e) {
-        if (!(e instanceof SyntaxError)) {
-            throw e;
-        } else {
-            return expect;
-        }
-    }
-}
-
-return function assert(boolExpr, message) {
-    if (boolExpr === true) return;
-
-    if (typeof boolExpr === "string" &&
-        boolExpr.charAt(0) === "%") {
-        var nativeCallName = boolExpr;
-        var $_len = arguments.length;var args = new Array($_len - 2); for(var $_i = 2; $_i < $_len; ++$_i) {args[$_i - 2] = arguments[$_i];}
-        if (nativeAssert(nativeCallName, args, message) === message) return;
-        message = (nativeCallName + " !== " + message);
-    }
-
-    var ret = new AssertionError(message);
-    if (Error.captureStackTrace) {
-        Error.captureStackTrace(ret, assert);
-    }
-    throw ret;
-};
-})();
diff --git a/deps/npm/node_modules/bluebird/js/main/async.js b/deps/npm/node_modules/bluebird/js/main/async.js
deleted file mode 100644
index 01044596119410..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/async.js
+++ /dev/null
@@ -1,150 +0,0 @@
-"use strict";
-var firstLineError;
-try {throw new Error(); } catch (e) {firstLineError = e;}
-var schedule = require("./schedule.js");
-var Queue = require("./queue.js");
-var util = require("./util.js");
-
-function Async() {
-    this._isTickUsed = false;
-    this._lateQueue = new Queue(16);
-    this._normalQueue = new Queue(16);
-    this._trampolineEnabled = true;
-    var self = this;
-    this.drainQueues = function () {
-        self._drainQueues();
-    };
-    this._schedule =
-        schedule.isStatic ? schedule(this.drainQueues) : schedule;
-}
-
-Async.prototype.disableTrampolineIfNecessary = function() {
-    if (util.hasDevTools) {
-        this._trampolineEnabled = false;
-    }
-};
-
-Async.prototype.enableTrampoline = function() {
-    if (!this._trampolineEnabled) {
-        this._trampolineEnabled = true;
-        this._schedule = function(fn) {
-            setTimeout(fn, 0);
-        };
-    }
-};
-
-Async.prototype.haveItemsQueued = function () {
-    return this._normalQueue.length() > 0;
-};
-
-Async.prototype.throwLater = function(fn, arg) {
-    if (arguments.length === 1) {
-        arg = fn;
-        fn = function () { throw arg; };
-    }
-    if (typeof setTimeout !== "undefined") {
-        setTimeout(function() {
-            fn(arg);
-        }, 0);
-    } else try {
-        this._schedule(function() {
-            fn(arg);
-        });
-    } catch (e) {
-        throw new Error("No async scheduler available\u000a\u000a    See http://goo.gl/m3OTXk\u000a");
-    }
-};
-
-function AsyncInvokeLater(fn, receiver, arg) {
-    this._lateQueue.push(fn, receiver, arg);
-    this._queueTick();
-}
-
-function AsyncInvoke(fn, receiver, arg) {
-    this._normalQueue.push(fn, receiver, arg);
-    this._queueTick();
-}
-
-function AsyncSettlePromises(promise) {
-    this._normalQueue._pushOne(promise);
-    this._queueTick();
-}
-
-if (!util.hasDevTools) {
-    Async.prototype.invokeLater = AsyncInvokeLater;
-    Async.prototype.invoke = AsyncInvoke;
-    Async.prototype.settlePromises = AsyncSettlePromises;
-} else {
-    if (schedule.isStatic) {
-        schedule = function(fn) { setTimeout(fn, 0); };
-    }
-    Async.prototype.invokeLater = function (fn, receiver, arg) {
-        if (this._trampolineEnabled) {
-            AsyncInvokeLater.call(this, fn, receiver, arg);
-        } else {
-            this._schedule(function() {
-                setTimeout(function() {
-                    fn.call(receiver, arg);
-                }, 100);
-            });
-        }
-    };
-
-    Async.prototype.invoke = function (fn, receiver, arg) {
-        if (this._trampolineEnabled) {
-            AsyncInvoke.call(this, fn, receiver, arg);
-        } else {
-            this._schedule(function() {
-                fn.call(receiver, arg);
-            });
-        }
-    };
-
-    Async.prototype.settlePromises = function(promise) {
-        if (this._trampolineEnabled) {
-            AsyncSettlePromises.call(this, promise);
-        } else {
-            this._schedule(function() {
-                promise._settlePromises();
-            });
-        }
-    };
-}
-
-Async.prototype.invokeFirst = function (fn, receiver, arg) {
-    this._normalQueue.unshift(fn, receiver, arg);
-    this._queueTick();
-};
-
-Async.prototype._drainQueue = function(queue) {
-    while (queue.length() > 0) {
-        var fn = queue.shift();
-        if (typeof fn !== "function") {
-            fn._settlePromises();
-            continue;
-        }
-        var receiver = queue.shift();
-        var arg = queue.shift();
-        fn.call(receiver, arg);
-    }
-};
-
-Async.prototype._drainQueues = function () {
-    this._drainQueue(this._normalQueue);
-    this._reset();
-    this._drainQueue(this._lateQueue);
-};
-
-Async.prototype._queueTick = function () {
-    if (!this._isTickUsed) {
-        this._isTickUsed = true;
-        this._schedule(this.drainQueues);
-    }
-};
-
-Async.prototype._reset = function () {
-    this._isTickUsed = false;
-};
-
-module.exports = new Async();
-module.exports.firstLineError = firstLineError;
diff --git a/deps/npm/node_modules/bluebird/js/main/bind.js b/deps/npm/node_modules/bluebird/js/main/bind.js
deleted file mode 100644
index 9d8257ae5cfd04..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/bind.js
+++ /dev/null
@@ -1,72 +0,0 @@
-"use strict";
-module.exports = function(Promise, INTERNAL, tryConvertToPromise) {
-var rejectThis = function(_, e) {
-    this._reject(e);
-};
-
-var targetRejected = function(e, context) {
-    context.promiseRejectionQueued = true;
-    context.bindingPromise._then(rejectThis, rejectThis, null, this, e);
-};
-
-var bindingResolved = function(thisArg, context) {
-    if (this._isPending()) {
-        this._resolveCallback(context.target);
-    }
-};
-
-var bindingRejected = function(e, context) {
-    if (!context.promiseRejectionQueued) this._reject(e);
-};
-
-Promise.prototype.bind = function (thisArg) {
-    var maybePromise = tryConvertToPromise(thisArg);
-    var ret = new Promise(INTERNAL);
-    ret._propagateFrom(this, 1);
-    var target = this._target();
-
-    ret._setBoundTo(maybePromise);
-    if (maybePromise instanceof Promise) {
-        var context = {
-            promiseRejectionQueued: false,
-            promise: ret,
-            target: target,
-            bindingPromise: maybePromise
-        };
-        target._then(INTERNAL, targetRejected, ret._progress, ret, context);
-        maybePromise._then(
-            bindingResolved, bindingRejected, ret._progress, ret, context);
-    } else {
-        ret._resolveCallback(target);
-    }
-    return ret;
-};
-
-Promise.prototype._setBoundTo = function (obj) {
-    if (obj !== undefined) {
-        this._bitField = this._bitField | 131072;
-        this._boundTo = obj;
-    } else {
-        this._bitField = this._bitField & (~131072);
-    }
-};
-
-Promise.prototype._isBound = function () {
-    return (this._bitField & 131072) === 131072;
-};
-
-Promise.bind = function (thisArg, value) {
-    var maybePromise = tryConvertToPromise(thisArg);
-    var ret = new Promise(INTERNAL);
-
-    ret._setBoundTo(maybePromise);
-    if (maybePromise instanceof Promise) {
-        maybePromise._then(function() {
-            ret._resolveCallback(value);
-        }, ret._reject, ret._progress, ret, null);
-    } else {
-        ret._resolveCallback(value);
-    }
-    return ret;
-};
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/bluebird.js b/deps/npm/node_modules/bluebird/js/main/bluebird.js
deleted file mode 100644
index ed6226e7ea397c..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/bluebird.js
+++ /dev/null
@@ -1,11 +0,0 @@
-"use strict";
-var old;
-if (typeof Promise !== "undefined") old = Promise;
-function noConflict() {
-    try { if (Promise === bluebird) Promise = old; }
-    catch (e) {}
-    return bluebird;
-}
-var bluebird = require("./promise.js")();
-bluebird.noConflict = noConflict;
-module.exports = bluebird;
diff --git a/deps/npm/node_modules/bluebird/js/main/call_get.js b/deps/npm/node_modules/bluebird/js/main/call_get.js
deleted file mode 100644
index 62c166d5c083bf..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/call_get.js
+++ /dev/null
@@ -1,123 +0,0 @@
-"use strict";
-var cr = Object.create;
-if (cr) {
-    var callerCache = cr(null);
-    var getterCache = cr(null);
-    callerCache[" size"] = getterCache[" size"] = 0;
-}
-
-module.exports = function(Promise) {
-var util = require("./util.js");
-var canEvaluate = util.canEvaluate;
-var isIdentifier = util.isIdentifier;
-
-var getMethodCaller;
-var getGetter;
-if (!false) {
-var makeMethodCaller = function (methodName) {
-    return new Function("ensureMethod", "                                    \n\
-        return function(obj) {                                               \n\
-            'use strict'                                                     \n\
-            var len = this.length;                                           \n\
-            ensureMethod(obj, 'methodName');                                 \n\
-            switch(len) {                                                    \n\
-                case 1: return obj.methodName(this[0]);                      \n\
-                case 2: return obj.methodName(this[0], this[1]);             \n\
-                case 3: return obj.methodName(this[0], this[1], this[2]);    \n\
-                case 0: return obj.methodName();                             \n\
-                default:                                                     \n\
-                    return obj.methodName.apply(obj, this);                  \n\
-            }                                                                \n\
-        };                                                                   \n\
-        ".replace(/methodName/g, methodName))(ensureMethod);
-};
-
-var makeGetter = function (propertyName) {
-    return new Function("obj", "                                             \n\
-        'use strict';                                                        \n\
-        return obj.propertyName;                                             \n\
-        ".replace("propertyName", propertyName));
-};
-
-var getCompiled = function(name, compiler, cache) {
-    var ret = cache[name];
-    if (typeof ret !== "function") {
-        if (!isIdentifier(name)) {
-            return null;
-        }
-        ret = compiler(name);
-        cache[name] = ret;
-        cache[" size"]++;
-        if (cache[" size"] > 512) {
-            var keys = Object.keys(cache);
-            for (var i = 0; i < 256; ++i) delete cache[keys[i]];
-            cache[" size"] = keys.length - 256;
-        }
-    }
-    return ret;
-};
-
-getMethodCaller = function(name) {
-    return getCompiled(name, makeMethodCaller, callerCache);
-};
-
-getGetter = function(name) {
-    return getCompiled(name, makeGetter, getterCache);
-};
-}
-
-function ensureMethod(obj, methodName) {
-    var fn;
-    if (obj != null) fn = obj[methodName];
-    if (typeof fn !== "function") {
-        var message = "Object " + util.classString(obj) + " has no method '" +
-            util.toString(methodName) + "'";
-        throw new Promise.TypeError(message);
-    }
-    return fn;
-}
-
-function caller(obj) {
-    var methodName = this.pop();
-    var fn = ensureMethod(obj, methodName);
-    return fn.apply(obj, this);
-}
-Promise.prototype.call = function (methodName) {
-    var $_len = arguments.length;var args = new Array($_len - 1); for(var $_i = 1; $_i < $_len; ++$_i) {args[$_i - 1] = arguments[$_i];}
-    if (!false) {
-        if (canEvaluate) {
-            var maybeCaller = getMethodCaller(methodName);
-            if (maybeCaller !== null) {
-                return this._then(
-                    maybeCaller, undefined, undefined, args, undefined);
-            }
-        }
-    }
-    args.push(methodName);
-    return this._then(caller, undefined, undefined, args, undefined);
-};
-
-function namedGetter(obj) {
-    return obj[this];
-}
-function indexedGetter(obj) {
-    var index = +this;
-    if (index < 0) index = Math.max(0, index + obj.length);
-    return obj[index];
-}
-Promise.prototype.get = function (propertyName) {
-    var isIndex = (typeof propertyName === "number");
-    var getter;
-    if (!isIndex) {
-        if (canEvaluate) {
-            var maybeGetter = getGetter(propertyName);
-            getter = maybeGetter !== null ? maybeGetter : namedGetter;
-        } else {
-            getter = namedGetter;
-        }
-    } else {
-        getter = indexedGetter;
-    }
-    return this._then(getter, undefined, undefined, propertyName, undefined);
-};
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/cancel.js b/deps/npm/node_modules/bluebird/js/main/cancel.js
deleted file mode 100644
index 9eb40b6fb14f33..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/cancel.js
+++ /dev/null
@@ -1,48 +0,0 @@
-"use strict";
-module.exports = function(Promise) {
-var errors = require("./errors.js");
-var async = require("./async.js");
-var CancellationError = errors.CancellationError;
-
-Promise.prototype._cancel = function (reason) {
-    if (!this.isCancellable()) return this;
-    var parent;
-    var promiseToReject = this;
-    while ((parent = promiseToReject._cancellationParent) !== undefined &&
-        parent.isCancellable()) {
-        promiseToReject = parent;
-    }
-    this._unsetCancellable();
-    promiseToReject._target()._rejectCallback(reason, false, true);
-};
-
-Promise.prototype.cancel = function (reason) {
-    if (!this.isCancellable()) return this;
-    if (reason === undefined) reason = new CancellationError();
-    async.invokeLater(this._cancel, this, reason);
-    return this;
-};
-
-Promise.prototype.cancellable = function () {
-    if (this._cancellable()) return this;
-    async.enableTrampoline();
-    this._setCancellable();
-    this._cancellationParent = undefined;
-    return this;
-};
-
-Promise.prototype.uncancellable = function () {
-    var ret = this.then();
-    ret._unsetCancellable();
-    return ret;
-};
-
-Promise.prototype.fork = function (didFulfill, didReject, didProgress) {
-    var ret = this._then(didFulfill, didReject, didProgress,
-                         undefined, undefined);
-
-    ret._setCancellable();
-    ret._cancellationParent = undefined;
-    return ret;
-};
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/captured_trace.js b/deps/npm/node_modules/bluebird/js/main/captured_trace.js
deleted file mode 100644
index 802acd35b0c8bf..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/captured_trace.js
+++ /dev/null
@@ -1,493 +0,0 @@
-"use strict";
-module.exports = function() {
-var async = require("./async.js");
-var util = require("./util.js");
-var bluebirdFramePattern =
-    /[\\\/]bluebird[\\\/]js[\\\/](main|debug|zalgo|instrumented)/;
-var stackFramePattern = null;
-var formatStack = null;
-var indentStackFrames = false;
-var warn;
-
-function CapturedTrace(parent) {
-    this._parent = parent;
-    var length = this._length = 1 + (parent === undefined ? 0 : parent._length);
-    captureStackTrace(this, CapturedTrace);
-    if (length > 32) this.uncycle();
-}
-util.inherits(CapturedTrace, Error);
-
-CapturedTrace.prototype.uncycle = function() {
-    var length = this._length;
-    if (length < 2) return;
-    var nodes = [];
-    var stackToIndex = {};
-
-    for (var i = 0, node = this; node !== undefined; ++i) {
-        nodes.push(node);
-        node = node._parent;
-    }
-    length = this._length = i;
-    for (var i = length - 1; i >= 0; --i) {
-        var stack = nodes[i].stack;
-        if (stackToIndex[stack] === undefined) {
-            stackToIndex[stack] = i;
-        }
-    }
-    for (var i = 0; i < length; ++i) {
-        var currentStack = nodes[i].stack;
-        var index = stackToIndex[currentStack];
-        if (index !== undefined && index !== i) {
-            if (index > 0) {
-                nodes[index - 1]._parent = undefined;
-                nodes[index - 1]._length = 1;
-            }
-            nodes[i]._parent = undefined;
-            nodes[i]._length = 1;
-            var cycleEdgeNode = i > 0 ? nodes[i - 1] : this;
-
-            if (index < length - 1) {
-                cycleEdgeNode._parent = nodes[index + 1];
-                cycleEdgeNode._parent.uncycle();
-                cycleEdgeNode._length =
-                    cycleEdgeNode._parent._length + 1;
-            } else {
-                cycleEdgeNode._parent = undefined;
-                cycleEdgeNode._length = 1;
-            }
-            var currentChildLength = cycleEdgeNode._length + 1;
-            for (var j = i - 2; j >= 0; --j) {
-                nodes[j]._length = currentChildLength;
-                currentChildLength++;
-            }
-            return;
-        }
-    }
-};
-
-CapturedTrace.prototype.parent = function() {
-    return this._parent;
-};
-
-CapturedTrace.prototype.hasParent = function() {
-    return this._parent !== undefined;
-};
-
-CapturedTrace.prototype.attachExtraTrace = function(error) {
-    if (error.__stackCleaned__) return;
-    this.uncycle();
-    var parsed = CapturedTrace.parseStackAndMessage(error);
-    var message = parsed.message;
-    var stacks = [parsed.stack];
-
-    var trace = this;
-    while (trace !== undefined) {
-        stacks.push(cleanStack(trace.stack.split("\n")));
-        trace = trace._parent;
-    }
-    removeCommonRoots(stacks);
-    removeDuplicateOrEmptyJumps(stacks);
-    util.notEnumerableProp(error, "stack", reconstructStack(message, stacks));
-    util.notEnumerableProp(error, "__stackCleaned__", true);
-};
-
-function reconstructStack(message, stacks) {
-    for (var i = 0; i < stacks.length - 1; ++i) {
-        stacks[i].push("From previous event:");
-        stacks[i] = stacks[i].join("\n");
-    }
-    if (i < stacks.length) {
-        stacks[i] = stacks[i].join("\n");
-    }
-    return message + "\n" + stacks.join("\n");
-}
-
-function removeDuplicateOrEmptyJumps(stacks) {
-    for (var i = 0; i < stacks.length; ++i) {
-        if (stacks[i].length === 0 ||
-            ((i + 1 < stacks.length) && stacks[i][0] === stacks[i+1][0])) {
-            stacks.splice(i, 1);
-            i--;
-        }
-    }
-}
-
-function removeCommonRoots(stacks) {
-    var current = stacks[0];
-    for (var i = 1; i < stacks.length; ++i) {
-        var prev = stacks[i];
-        var currentLastIndex = current.length - 1;
-        var currentLastLine = current[currentLastIndex];
-        var commonRootMeetPoint = -1;
-
-        for (var j = prev.length - 1; j >= 0; --j) {
-            if (prev[j] === currentLastLine) {
-                commonRootMeetPoint = j;
-                break;
-            }
-        }
-
-        for (var j = commonRootMeetPoint; j >= 0; --j) {
-            var line = prev[j];
-            if (current[currentLastIndex] === line) {
-                current.pop();
-                currentLastIndex--;
-            } else {
-                break;
-            }
-        }
-        current = prev;
-    }
-}
-
-function cleanStack(stack) {
-    var ret = [];
-    for (var i = 0; i < stack.length; ++i) {
-        var line = stack[i];
-        var isTraceLine = stackFramePattern.test(line) ||
-            "    (No stack trace)" === line;
-        var isInternalFrame = isTraceLine && shouldIgnore(line);
-        if (isTraceLine && !isInternalFrame) {
-            if (indentStackFrames && line.charAt(0) !== " ") {
-                line = "    " + line;
-            }
-            ret.push(line);
-        }
-    }
-    return ret;
-}
-
-function stackFramesAsArray(error) {
-    var stack = error.stack.replace(/\s+$/g, "").split("\n");
-    for (var i = 0; i < stack.length; ++i) {
-        var line = stack[i];
-        if ("    (No stack trace)" === line || stackFramePattern.test(line)) {
-            break;
-        }
-    }
-    if (i > 0) {
-        stack = stack.slice(i);
-    }
-    return stack;
-}
-
-CapturedTrace.parseStackAndMessage = function(error) {
-    var stack = error.stack;
-    var message = error.toString();
-    stack = typeof stack === "string" && stack.length > 0
-                ? stackFramesAsArray(error) : ["    (No stack trace)"];
-    return {
-        message: message,
-        stack: cleanStack(stack)
-    };
-};
-
-CapturedTrace.formatAndLogError = function(error, title) {
-    if (typeof console !== "undefined") {
-        var message;
-        if (typeof error === "object" || typeof error === "function") {
-            var stack = error.stack;
-            message = title + formatStack(stack, error);
-        } else {
-            message = title + String(error);
-        }
-        if (typeof warn === "function") {
-            warn(message);
-        } else if (typeof console.log === "function" ||
-            typeof console.log === "object") {
-            console.log(message);
-        }
-    }
-};
-
-CapturedTrace.unhandledRejection = function (reason) {
-    CapturedTrace.formatAndLogError(reason, "^--- With additional stack trace: ");
-};
-
-CapturedTrace.isSupported = function () {
-    return typeof captureStackTrace === "function";
-};
-
-CapturedTrace.fireRejectionEvent =
-function(name, localHandler, reason, promise) {
-    var localEventFired = false;
-    try {
-        if (typeof localHandler === "function") {
-            localEventFired = true;
-            if (name === "rejectionHandled") {
-                localHandler(promise);
-            } else {
-                localHandler(reason, promise);
-            }
-        }
-    } catch (e) {
-        async.throwLater(e);
-    }
-
-    var globalEventFired = false;
-    try {
-        globalEventFired = fireGlobalEvent(name, reason, promise);
-    } catch (e) {
-        globalEventFired = true;
-        async.throwLater(e);
-    }
-
-    var domEventFired = false;
-    if (fireDomEvent) {
-        try {
-            domEventFired = fireDomEvent(name.toLowerCase(), {
-                reason: reason,
-                promise: promise
-            });
-        } catch (e) {
-            domEventFired = true;
-            async.throwLater(e);
-        }
-    }
-
-    if (!globalEventFired && !localEventFired && !domEventFired &&
-        name === "unhandledRejection") {
-        CapturedTrace.formatAndLogError(reason, "Unhandled rejection ");
-    }
-};
-
-function formatNonError(obj) {
-    var str;
-    if (typeof obj === "function") {
-        str = "[function " +
-            (obj.name || "anonymous") +
-            "]";
-    } else {
-        str = obj.toString();
-        var ruselessToString = /\[object [a-zA-Z0-9$_]+\]/;
-        if (ruselessToString.test(str)) {
-            try {
-                var newStr = JSON.stringify(obj);
-                str = newStr;
-            }
-            catch(e) {
-
-            }
-        }
-        if (str.length === 0) {
-            str = "(empty array)";
-        }
-    }
-    return ("(<" + snip(str) + ">, no stack trace)");
-}
-
-function snip(str) {
-    var maxChars = 41;
-    if (str.length < maxChars) {
-        return str;
-    }
-    return str.substr(0, maxChars - 3) + "...";
-}
-
-var shouldIgnore = function() { return false; };
-var parseLineInfoRegex = /[\/<\(]([^:\/]+):(\d+):(?:\d+)\)?\s*$/;
-function parseLineInfo(line) {
-    var matches = line.match(parseLineInfoRegex);
-    if (matches) {
-        return {
-            fileName: matches[1],
-            line: parseInt(matches[2], 10)
-        };
-    }
-}
-CapturedTrace.setBounds = function(firstLineError, lastLineError) {
-    if (!CapturedTrace.isSupported()) return;
-    var firstStackLines = firstLineError.stack.split("\n");
-    var lastStackLines = lastLineError.stack.split("\n");
-    var firstIndex = -1;
-    var lastIndex = -1;
-    var firstFileName;
-    var lastFileName;
-    for (var i = 0; i < firstStackLines.length; ++i) {
-        var result = parseLineInfo(firstStackLines[i]);
-        if (result) {
-            firstFileName = result.fileName;
-            firstIndex = result.line;
-            break;
-        }
-    }
-    for (var i = 0; i < lastStackLines.length; ++i) {
-        var result = parseLineInfo(lastStackLines[i]);
-        if (result) {
-            lastFileName = result.fileName;
-            lastIndex = result.line;
-            break;
-        }
-    }
-    if (firstIndex < 0 || lastIndex < 0 || !firstFileName || !lastFileName ||
-        firstFileName !== lastFileName || firstIndex >= lastIndex) {
-        return;
-    }
-
-    shouldIgnore = function(line) {
-        if (bluebirdFramePattern.test(line)) return true;
-        var info = parseLineInfo(line);
-        if (info) {
-            if (info.fileName === firstFileName &&
-                (firstIndex <= info.line && info.line <= lastIndex)) {
-                return true;
-            }
-        }
-        return false;
-    };
-};
-
-var captureStackTrace = (function stackDetection() {
-    var v8stackFramePattern = /^\s*at\s*/;
-    var v8stackFormatter = function(stack, error) {
-        if (typeof stack === "string") return stack;
-
-        if (error.name !== undefined &&
-            error.message !== undefined) {
-            return error.toString();
-        }
-        return formatNonError(error);
-    };
-
-    if (typeof Error.stackTraceLimit === "number" &&
-        typeof Error.captureStackTrace === "function") {
-        Error.stackTraceLimit = Error.stackTraceLimit + 6;
-        stackFramePattern = v8stackFramePattern;
-        formatStack = v8stackFormatter;
-        var captureStackTrace = Error.captureStackTrace;
-
-        shouldIgnore = function(line) {
-            return bluebirdFramePattern.test(line);
-        };
-        return function(receiver, ignoreUntil) {
-            Error.stackTraceLimit = Error.stackTraceLimit + 6;
-            captureStackTrace(receiver, ignoreUntil);
-            Error.stackTraceLimit = Error.stackTraceLimit - 6;
-        };
-    }
-    var err = new Error();
-
-    if (typeof err.stack === "string" &&
-        err.stack.split("\n")[0].indexOf("stackDetection@") >= 0) {
-        stackFramePattern = /@/;
-        formatStack = v8stackFormatter;
-        indentStackFrames = true;
-        return function captureStackTrace(o) {
-            o.stack = new Error().stack;
-        };
-    }
-
-    var hasStackAfterThrow;
-    try { throw new Error(); }
-    catch(e) {
-        hasStackAfterThrow = ("stack" in e);
-    }
-    if (!("stack" in err) && hasStackAfterThrow &&
-        typeof Error.stackTraceLimit === "number") {
-        stackFramePattern = v8stackFramePattern;
-        formatStack = v8stackFormatter;
-        return function captureStackTrace(o) {
-            Error.stackTraceLimit = Error.stackTraceLimit + 6;
-            try { throw new Error(); }
-            catch(e) { o.stack = e.stack; }
-            Error.stackTraceLimit = Error.stackTraceLimit - 6;
-        };
-    }
-
-    formatStack = function(stack, error) {
-        if (typeof stack === "string") return stack;
-
-        if ((typeof error === "object" ||
-            typeof error === "function") &&
-            error.name !== undefined &&
-            error.message !== undefined) {
-            return error.toString();
-        }
-        return formatNonError(error);
-    };
-
-    return null;
-
-})([]);
-
-var fireDomEvent;
-var fireGlobalEvent = (function() {
-    if (util.isNode) {
-        return function(name, reason, promise) {
-            if (name === "rejectionHandled") {
-                return process.emit(name, promise);
-            } else {
-                return process.emit(name, reason, promise);
-            }
-        };
-    } else {
-        var customEventWorks = false;
-        var anyEventWorks = true;
-        try {
-            var ev = new self.CustomEvent("test");
-            customEventWorks = ev instanceof CustomEvent;
-        } catch (e) {}
-        if (!customEventWorks) {
-            try {
-                var event = document.createEvent("CustomEvent");
-                event.initCustomEvent("testingtheevent", false, true, {});
-                self.dispatchEvent(event);
-            } catch (e) {
-                anyEventWorks = false;
-            }
-        }
-        if (anyEventWorks) {
-            fireDomEvent = function(type, detail) {
-                var event;
-                if (customEventWorks) {
-                    event = new self.CustomEvent(type, {
-                        detail: detail,
-                        bubbles: false,
-                        cancelable: true
-                    });
-                } else if (self.dispatchEvent) {
-                    event = document.createEvent("CustomEvent");
-                    event.initCustomEvent(type, false, true, detail);
-                }
-
-                return event ? !self.dispatchEvent(event) : false;
-            };
-        }
-
-        var toWindowMethodNameMap = {};
-        toWindowMethodNameMap["unhandledRejection"] = ("on" +
-            "unhandledRejection").toLowerCase();
-        toWindowMethodNameMap["rejectionHandled"] = ("on" +
-            "rejectionHandled").toLowerCase();
-
-        return function(name, reason, promise) {
-            var methodName = toWindowMethodNameMap[name];
-            var method = self[methodName];
-            if (!method) return false;
-            if (name === "rejectionHandled") {
-                method.call(self, promise);
-            } else {
-                method.call(self, reason, promise);
-            }
-            return true;
-        };
-    }
-})();
-
-if (typeof console !== "undefined" && typeof console.warn !== "undefined") {
-    warn = function (message) {
-        console.warn(message);
-    };
-    if (util.isNode && process.stderr.isTTY) {
-        warn = function(message) {
-            process.stderr.write("\u001b[31m" + message + "\u001b[39m\n");
-        };
-    } else if (!util.isNode && typeof (new Error().stack) === "string") {
-        warn = function(message) {
-            console.warn("%c" + message, "color: red");
-        };
-    }
-}
-
-return CapturedTrace;
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/catch_filter.js b/deps/npm/node_modules/bluebird/js/main/catch_filter.js
deleted file mode 100644
index df127333992b39..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/catch_filter.js
+++ /dev/null
@@ -1,66 +0,0 @@
-"use strict";
-module.exports = function(NEXT_FILTER) {
-var util = require("./util.js");
-var errors = require("./errors.js");
-var tryCatch = util.tryCatch;
-var errorObj = util.errorObj;
-var keys = require("./es5.js").keys;
-var TypeError = errors.TypeError;
-
-function CatchFilter(instances, callback, promise) {
-    this._instances = instances;
-    this._callback = callback;
-    this._promise = promise;
-}
-
-function safePredicate(predicate, e) {
-    var safeObject = {};
-    var retfilter = tryCatch(predicate).call(safeObject, e);
-
-    if (retfilter === errorObj) return retfilter;
-
-    var safeKeys = keys(safeObject);
-    if (safeKeys.length) {
-        errorObj.e = new TypeError("Catch filter must inherit from Error or be a simple predicate function\u000a\u000a    See http://goo.gl/o84o68\u000a");
-        return errorObj;
-    }
-    return retfilter;
-}
-
-CatchFilter.prototype.doFilter = function (e) {
-    var cb = this._callback;
-    var promise = this._promise;
-    var boundTo = promise._boundValue();
-    for (var i = 0, len = this._instances.length; i < len; ++i) {
-        var item = this._instances[i];
-        var itemIsErrorType = item === Error ||
-            (item != null && item.prototype instanceof Error);
-
-        if (itemIsErrorType && e instanceof item) {
-            var ret = tryCatch(cb).call(boundTo, e);
-            if (ret === errorObj) {
-                NEXT_FILTER.e = ret.e;
-                return NEXT_FILTER;
-            }
-            return ret;
-        } else if (typeof item === "function" && !itemIsErrorType) {
-            var shouldHandle = safePredicate(item, e);
-            if (shouldHandle === errorObj) {
-                e = errorObj.e;
-                break;
-            } else if (shouldHandle) {
-                var ret = tryCatch(cb).call(boundTo, e);
-                if (ret === errorObj) {
-                    NEXT_FILTER.e = ret.e;
-                    return NEXT_FILTER;
-                }
-                return ret;
-            }
-        }
-    }
-    NEXT_FILTER.e = e;
-    return NEXT_FILTER;
-};
-
-return CatchFilter;
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/context.js b/deps/npm/node_modules/bluebird/js/main/context.js
deleted file mode 100644
index ccd7702b7e9924..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/context.js
+++ /dev/null
@@ -1,38 +0,0 @@
-"use strict";
-module.exports = function(Promise, CapturedTrace, isDebugging) {
-var contextStack = [];
-function Context() {
-    this._trace = new CapturedTrace(peekContext());
-}
-Context.prototype._pushContext = function () {
-    if (!isDebugging()) return;
-    if (this._trace !== undefined) {
-        contextStack.push(this._trace);
-    }
-};
-
-Context.prototype._popContext = function () {
-    if (!isDebugging()) return;
-    if (this._trace !== undefined) {
-        contextStack.pop();
-    }
-};
-
-function createContext() {
-    if (isDebugging()) return new Context();
-}
-
-function peekContext() {
-    var lastIndex = contextStack.length - 1;
-    if (lastIndex >= 0) {
-        return contextStack[lastIndex];
-    }
-    return undefined;
-}
-
-Promise.prototype._peekContext = peekContext;
-Promise.prototype._pushContext = Context.prototype._pushContext;
-Promise.prototype._popContext = Context.prototype._popContext;
-
-return createContext;
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/debuggability.js b/deps/npm/node_modules/bluebird/js/main/debuggability.js
deleted file mode 100644
index 106baf65975006..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/debuggability.js
+++ /dev/null
@@ -1,162 +0,0 @@
-"use strict";
-module.exports = function(Promise, CapturedTrace) {
-var getDomain = Promise._getDomain;
-var async = require("./async.js");
-var Warning = require("./errors.js").Warning;
-var util = require("./util.js");
-var canAttachTrace = util.canAttachTrace;
-var unhandledRejectionHandled;
-var possiblyUnhandledRejection;
-var debugging = false || (util.isNode &&
-                    (!!process.env["BLUEBIRD_DEBUG"] ||
-                     process.env["NODE_ENV"] === "development"));
-
-if (util.isNode && process.env["BLUEBIRD_DEBUG"] == 0) debugging = false;
-
-if (debugging) {
-    async.disableTrampolineIfNecessary();
-}
-
-Promise.prototype._ignoreRejections = function() {
-    this._unsetRejectionIsUnhandled();
-    this._bitField = this._bitField | 16777216;
-};
-
-Promise.prototype._ensurePossibleRejectionHandled = function () {
-    if ((this._bitField & 16777216) !== 0) return;
-    this._setRejectionIsUnhandled();
-    async.invokeLater(this._notifyUnhandledRejection, this, undefined);
-};
-
-Promise.prototype._notifyUnhandledRejectionIsHandled = function () {
-    CapturedTrace.fireRejectionEvent("rejectionHandled",
-                                  unhandledRejectionHandled, undefined, this);
-};
-
-Promise.prototype._notifyUnhandledRejection = function () {
-    if (this._isRejectionUnhandled()) {
-        var reason = this._getCarriedStackTrace() || this._settledValue;
-        this._setUnhandledRejectionIsNotified();
-        CapturedTrace.fireRejectionEvent("unhandledRejection",
-                                      possiblyUnhandledRejection, reason, this);
-    }
-};
-
-Promise.prototype._setUnhandledRejectionIsNotified = function () {
-    this._bitField = this._bitField | 524288;
-};
-
-Promise.prototype._unsetUnhandledRejectionIsNotified = function () {
-    this._bitField = this._bitField & (~524288);
-};
-
-Promise.prototype._isUnhandledRejectionNotified = function () {
-    return (this._bitField & 524288) > 0;
-};
-
-Promise.prototype._setRejectionIsUnhandled = function () {
-    this._bitField = this._bitField | 2097152;
-};
-
-Promise.prototype._unsetRejectionIsUnhandled = function () {
-    this._bitField = this._bitField & (~2097152);
-    if (this._isUnhandledRejectionNotified()) {
-        this._unsetUnhandledRejectionIsNotified();
-        this._notifyUnhandledRejectionIsHandled();
-    }
-};
-
-Promise.prototype._isRejectionUnhandled = function () {
-    return (this._bitField & 2097152) > 0;
-};
-
-Promise.prototype._setCarriedStackTrace = function (capturedTrace) {
-    this._bitField = this._bitField | 1048576;
-    this._fulfillmentHandler0 = capturedTrace;
-};
-
-Promise.prototype._isCarryingStackTrace = function () {
-    return (this._bitField & 1048576) > 0;
-};
-
-Promise.prototype._getCarriedStackTrace = function () {
-    return this._isCarryingStackTrace()
-        ? this._fulfillmentHandler0
-        : undefined;
-};
-
-Promise.prototype._captureStackTrace = function () {
-    if (debugging) {
-        this._trace = new CapturedTrace(this._peekContext());
-    }
-    return this;
-};
-
-Promise.prototype._attachExtraTrace = function (error, ignoreSelf) {
-    if (debugging && canAttachTrace(error)) {
-        var trace = this._trace;
-        if (trace !== undefined) {
-            if (ignoreSelf) trace = trace._parent;
-        }
-        if (trace !== undefined) {
-            trace.attachExtraTrace(error);
-        } else if (!error.__stackCleaned__) {
-            var parsed = CapturedTrace.parseStackAndMessage(error);
-            util.notEnumerableProp(error, "stack",
-                parsed.message + "\n" + parsed.stack.join("\n"));
-            util.notEnumerableProp(error, "__stackCleaned__", true);
-        }
-    }
-};
-
-Promise.prototype._warn = function(message) {
-    var warning = new Warning(message);
-    var ctx = this._peekContext();
-    if (ctx) {
-        ctx.attachExtraTrace(warning);
-    } else {
-        var parsed = CapturedTrace.parseStackAndMessage(warning);
-        warning.stack = parsed.message + "\n" + parsed.stack.join("\n");
-    }
-    CapturedTrace.formatAndLogError(warning, "");
-};
-
-Promise.onPossiblyUnhandledRejection = function (fn) {
-    var domain = getDomain();
-    possiblyUnhandledRejection =
-        typeof fn === "function" ? (domain === null ? fn : domain.bind(fn))
-                                 : undefined;
-};
-
-Promise.onUnhandledRejectionHandled = function (fn) {
-    var domain = getDomain();
-    unhandledRejectionHandled =
-        typeof fn === "function" ? (domain === null ? fn : domain.bind(fn))
-                                 : undefined;
-};
-
-Promise.longStackTraces = function () {
-    if (async.haveItemsQueued() &&
-        debugging === false
-   ) {
-        throw new Error("cannot enable long stack traces after promises have been created\u000a\u000a    See http://goo.gl/DT1qyG\u000a");
-    }
-    debugging = CapturedTrace.isSupported();
-    if (debugging) {
-        async.disableTrampolineIfNecessary();
-    }
-};
-
-Promise.hasLongStackTraces = function () {
-    return debugging && CapturedTrace.isSupported();
-};
-
-if (!CapturedTrace.isSupported()) {
-    Promise.longStackTraces = function(){};
-    debugging = false;
-}
-
-return function() {
-    return debugging;
-};
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/direct_resolve.js b/deps/npm/node_modules/bluebird/js/main/direct_resolve.js
deleted file mode 100644
index 054685a1c31713..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/direct_resolve.js
+++ /dev/null
@@ -1,63 +0,0 @@
-"use strict";
-var util = require("./util.js");
-var isPrimitive = util.isPrimitive;
-
-module.exports = function(Promise) {
-var returner = function () {
-    return this;
-};
-var thrower = function () {
-    throw this;
-};
-var returnUndefined = function() {};
-var throwUndefined = function() {
-    throw undefined;
-};
-
-var wrapper = function (value, action) {
-    if (action === 1) {
-        return function () {
-            throw value;
-        };
-    } else if (action === 2) {
-        return function () {
-            return value;
-        };
-    }
-};
-
-
-Promise.prototype["return"] =
-Promise.prototype.thenReturn = function (value) {
-    if (value === undefined) return this.then(returnUndefined);
-
-    if (isPrimitive(value)) {
-        return this._then(
-            wrapper(value, 2),
-            undefined,
-            undefined,
-            undefined,
-            undefined
-       );
-    } else if (value instanceof Promise) {
-        value._ignoreRejections();
-    }
-    return this._then(returner, undefined, undefined, value, undefined);
-};
-
-Promise.prototype["throw"] =
-Promise.prototype.thenThrow = function (reason) {
-    if (reason === undefined) return this.then(throwUndefined);
-
-    if (isPrimitive(reason)) {
-        return this._then(
-            wrapper(reason, 1),
-            undefined,
-            undefined,
-            undefined,
-            undefined
-       );
-    }
-    return this._then(thrower, undefined, undefined, reason, undefined);
-};
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/each.js b/deps/npm/node_modules/bluebird/js/main/each.js
deleted file mode 100644
index a37e22c058bdd5..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/each.js
+++ /dev/null
@@ -1,12 +0,0 @@
-"use strict";
-module.exports = function(Promise, INTERNAL) {
-var PromiseReduce = Promise.reduce;
-
-Promise.prototype.each = function (fn) {
-    return PromiseReduce(this, fn, null, INTERNAL);
-};
-
-Promise.each = function (promises, fn) {
-    return PromiseReduce(promises, fn, null, INTERNAL);
-};
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/errors.js b/deps/npm/node_modules/bluebird/js/main/errors.js
deleted file mode 100644
index c334bb1c83f504..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/errors.js
+++ /dev/null
@@ -1,111 +0,0 @@
-"use strict";
-var es5 = require("./es5.js");
-var Objectfreeze = es5.freeze;
-var util = require("./util.js");
-var inherits = util.inherits;
-var notEnumerableProp = util.notEnumerableProp;
-
-function subError(nameProperty, defaultMessage) {
-    function SubError(message) {
-        if (!(this instanceof SubError)) return new SubError(message);
-        notEnumerableProp(this, "message",
-            typeof message === "string" ? message : defaultMessage);
-        notEnumerableProp(this, "name", nameProperty);
-        if (Error.captureStackTrace) {
-            Error.captureStackTrace(this, this.constructor);
-        } else {
-            Error.call(this);
-        }
-    }
-    inherits(SubError, Error);
-    return SubError;
-}
-
-var _TypeError, _RangeError;
-var Warning = subError("Warning", "warning");
-var CancellationError = subError("CancellationError", "cancellation error");
-var TimeoutError = subError("TimeoutError", "timeout error");
-var AggregateError = subError("AggregateError", "aggregate error");
-try {
-    _TypeError = TypeError;
-    _RangeError = RangeError;
-} catch(e) {
-    _TypeError = subError("TypeError", "type error");
-    _RangeError = subError("RangeError", "range error");
-}
-
-var methods = ("join pop push shift unshift slice filter forEach some " +
-    "every map indexOf lastIndexOf reduce reduceRight sort reverse").split(" ");
-
-for (var i = 0; i < methods.length; ++i) {
-    if (typeof Array.prototype[methods[i]] === "function") {
-        AggregateError.prototype[methods[i]] = Array.prototype[methods[i]];
-    }
-}
-
-es5.defineProperty(AggregateError.prototype, "length", {
-    value: 0,
-    configurable: false,
-    writable: true,
-    enumerable: true
-});
-AggregateError.prototype["isOperational"] = true;
-var level = 0;
-AggregateError.prototype.toString = function() {
-    var indent = Array(level * 4 + 1).join(" ");
-    var ret = "\n" + indent + "AggregateError of:" + "\n";
-    level++;
-    indent = Array(level * 4 + 1).join(" ");
-    for (var i = 0; i < this.length; ++i) {
-        var str = this[i] === this ? "[Circular AggregateError]" : this[i] + "";
-        var lines = str.split("\n");
-        for (var j = 0; j < lines.length; ++j) {
-            lines[j] = indent + lines[j];
-        }
-        str = lines.join("\n");
-        ret += str + "\n";
-    }
-    level--;
-    return ret;
-};
-
-function OperationalError(message) {
-    if (!(this instanceof OperationalError))
-        return new OperationalError(message);
-    notEnumerableProp(this, "name", "OperationalError");
-    notEnumerableProp(this, "message", message);
-    this.cause = message;
-    this["isOperational"] = true;
-
-    if (message instanceof Error) {
-        notEnumerableProp(this, "message", message.message);
-        notEnumerableProp(this, "stack", message.stack);
-    } else if (Error.captureStackTrace) {
-        Error.captureStackTrace(this, this.constructor);
-    }
-
-}
-inherits(OperationalError, Error);
-
-var errorTypes = Error["__BluebirdErrorTypes__"];
-if (!errorTypes) {
-    errorTypes = Objectfreeze({
-        CancellationError: CancellationError,
-        TimeoutError: TimeoutError,
-        OperationalError: OperationalError,
-        RejectionError: OperationalError,
-        AggregateError: AggregateError
-    });
-    notEnumerableProp(Error, "__BluebirdErrorTypes__", errorTypes);
-}
-
-module.exports = {
-    Error: Error,
-    TypeError: _TypeError,
-    RangeError: _RangeError,
-    CancellationError: errorTypes.CancellationError,
-    OperationalError: errorTypes.OperationalError,
-    TimeoutError: errorTypes.TimeoutError,
-    AggregateError: errorTypes.AggregateError,
-    Warning: Warning
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/es5.js b/deps/npm/node_modules/bluebird/js/main/es5.js
deleted file mode 100644
index ea41d5a566921d..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/es5.js
+++ /dev/null
@@ -1,80 +0,0 @@
-var isES5 = (function(){
-    "use strict";
-    return this === undefined;
-})();
-
-if (isES5) {
-    module.exports = {
-        freeze: Object.freeze,
-        defineProperty: Object.defineProperty,
-        getDescriptor: Object.getOwnPropertyDescriptor,
-        keys: Object.keys,
-        names: Object.getOwnPropertyNames,
-        getPrototypeOf: Object.getPrototypeOf,
-        isArray: Array.isArray,
-        isES5: isES5,
-        propertyIsWritable: function(obj, prop) {
-            var descriptor = Object.getOwnPropertyDescriptor(obj, prop);
-            return !!(!descriptor || descriptor.writable || descriptor.set);
-        }
-    };
-} else {
-    var has = {}.hasOwnProperty;
-    var str = {}.toString;
-    var proto = {}.constructor.prototype;
-
-    var ObjectKeys = function (o) {
-        var ret = [];
-        for (var key in o) {
-            if (has.call(o, key)) {
-                ret.push(key);
-            }
-        }
-        return ret;
-    };
-
-    var ObjectGetDescriptor = function(o, key) {
-        return {value: o[key]};
-    };
-
-    var ObjectDefineProperty = function (o, key, desc) {
-        o[key] = desc.value;
-        return o;
-    };
-
-    var ObjectFreeze = function (obj) {
-        return obj;
-    };
-
-    var ObjectGetPrototypeOf = function (obj) {
-        try {
-            return Object(obj).constructor.prototype;
-        }
-        catch (e) {
-            return proto;
-        }
-    };
-
-    var ArrayIsArray = function (obj) {
-        try {
-            return str.call(obj) === "[object Array]";
-        }
-        catch(e) {
-            return false;
-        }
-    };
-
-    module.exports = {
-        isArray: ArrayIsArray,
-        keys: ObjectKeys,
-        names: ObjectKeys,
-        defineProperty: ObjectDefineProperty,
-        getDescriptor: ObjectGetDescriptor,
-        freeze: ObjectFreeze,
-        getPrototypeOf: ObjectGetPrototypeOf,
-        isES5: isES5,
-        propertyIsWritable: function() {
-            return true;
-        }
-    };
-}
diff --git a/deps/npm/node_modules/bluebird/js/main/filter.js b/deps/npm/node_modules/bluebird/js/main/filter.js
deleted file mode 100644
index ed57bf0159212e..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/filter.js
+++ /dev/null
@@ -1,12 +0,0 @@
-"use strict";
-module.exports = function(Promise, INTERNAL) {
-var PromiseMap = Promise.map;
-
-Promise.prototype.filter = function (fn, options) {
-    return PromiseMap(this, fn, options, INTERNAL);
-};
-
-Promise.filter = function (promises, fn, options) {
-    return PromiseMap(promises, fn, options, INTERNAL);
-};
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/finally.js b/deps/npm/node_modules/bluebird/js/main/finally.js
deleted file mode 100644
index c9342bcf23d9bb..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/finally.js
+++ /dev/null
@@ -1,98 +0,0 @@
-"use strict";
-module.exports = function(Promise, NEXT_FILTER, tryConvertToPromise) {
-var util = require("./util.js");
-var isPrimitive = util.isPrimitive;
-var thrower = util.thrower;
-
-function returnThis() {
-    return this;
-}
-function throwThis() {
-    throw this;
-}
-function return$(r) {
-    return function() {
-        return r;
-    };
-}
-function throw$(r) {
-    return function() {
-        throw r;
-    };
-}
-function promisedFinally(ret, reasonOrValue, isFulfilled) {
-    var then;
-    if (isPrimitive(reasonOrValue)) {
-        then = isFulfilled ? return$(reasonOrValue) : throw$(reasonOrValue);
-    } else {
-        then = isFulfilled ? returnThis : throwThis;
-    }
-    return ret._then(then, thrower, undefined, reasonOrValue, undefined);
-}
-
-function finallyHandler(reasonOrValue) {
-    var promise = this.promise;
-    var handler = this.handler;
-
-    var ret = promise._isBound()
-                    ? handler.call(promise._boundValue())
-                    : handler();
-
-    if (ret !== undefined) {
-        var maybePromise = tryConvertToPromise(ret, promise);
-        if (maybePromise instanceof Promise) {
-            maybePromise = maybePromise._target();
-            return promisedFinally(maybePromise, reasonOrValue,
-                                    promise.isFulfilled());
-        }
-    }
-
-    if (promise.isRejected()) {
-        NEXT_FILTER.e = reasonOrValue;
-        return NEXT_FILTER;
-    } else {
-        return reasonOrValue;
-    }
-}
-
-function tapHandler(value) {
-    var promise = this.promise;
-    var handler = this.handler;
-
-    var ret = promise._isBound()
-                    ? handler.call(promise._boundValue(), value)
-                    : handler(value);
-
-    if (ret !== undefined) {
-        var maybePromise = tryConvertToPromise(ret, promise);
-        if (maybePromise instanceof Promise) {
-            maybePromise = maybePromise._target();
-            return promisedFinally(maybePromise, value, true);
-        }
-    }
-    return value;
-}
-
-Promise.prototype._passThroughHandler = function (handler, isFinally) {
-    if (typeof handler !== "function") return this.then();
-
-    var promiseAndHandler = {
-        promise: this,
-        handler: handler
-    };
-
-    return this._then(
-            isFinally ? finallyHandler : tapHandler,
-            isFinally ? finallyHandler : undefined, undefined,
-            promiseAndHandler, undefined);
-};
-
-Promise.prototype.lastly =
-Promise.prototype["finally"] = function (handler) {
-    return this._passThroughHandler(handler, true);
-};
-
-Promise.prototype.tap = function (handler) {
-    return this._passThroughHandler(handler, false);
-};
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/generators.js b/deps/npm/node_modules/bluebird/js/main/generators.js
deleted file mode 100644
index 4c0568d21f9eaf..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/generators.js
+++ /dev/null
@@ -1,136 +0,0 @@
-"use strict";
-module.exports = function(Promise,
-                          apiRejection,
-                          INTERNAL,
-                          tryConvertToPromise) {
-var errors = require("./errors.js");
-var TypeError = errors.TypeError;
-var util = require("./util.js");
-var errorObj = util.errorObj;
-var tryCatch = util.tryCatch;
-var yieldHandlers = [];
-
-function promiseFromYieldHandler(value, yieldHandlers, traceParent) {
-    for (var i = 0; i < yieldHandlers.length; ++i) {
-        traceParent._pushContext();
-        var result = tryCatch(yieldHandlers[i])(value);
-        traceParent._popContext();
-        if (result === errorObj) {
-            traceParent._pushContext();
-            var ret = Promise.reject(errorObj.e);
-            traceParent._popContext();
-            return ret;
-        }
-        var maybePromise = tryConvertToPromise(result, traceParent);
-        if (maybePromise instanceof Promise) return maybePromise;
-    }
-    return null;
-}
-
-function PromiseSpawn(generatorFunction, receiver, yieldHandler, stack) {
-    var promise = this._promise = new Promise(INTERNAL);
-    promise._captureStackTrace();
-    this._stack = stack;
-    this._generatorFunction = generatorFunction;
-    this._receiver = receiver;
-    this._generator = undefined;
-    this._yieldHandlers = typeof yieldHandler === "function"
-        ? [yieldHandler].concat(yieldHandlers)
-        : yieldHandlers;
-}
-
-PromiseSpawn.prototype.promise = function () {
-    return this._promise;
-};
-
-PromiseSpawn.prototype._run = function () {
-    this._generator = this._generatorFunction.call(this._receiver);
-    this._receiver =
-        this._generatorFunction = undefined;
-    this._next(undefined);
-};
-
-PromiseSpawn.prototype._continue = function (result) {
-    if (result === errorObj) {
-        return this._promise._rejectCallback(result.e, false, true);
-    }
-
-    var value = result.value;
-    if (result.done === true) {
-        this._promise._resolveCallback(value);
-    } else {
-        var maybePromise = tryConvertToPromise(value, this._promise);
-        if (!(maybePromise instanceof Promise)) {
-            maybePromise =
-                promiseFromYieldHandler(maybePromise,
-                                        this._yieldHandlers,
-                                        this._promise);
-            if (maybePromise === null) {
-                this._throw(
-                    new TypeError(
-                        "A value %s was yielded that could not be treated as a promise\u000a\u000a    See http://goo.gl/4Y4pDk\u000a\u000a".replace("%s", value) +
-                        "From coroutine:\u000a" +
-                        this._stack.split("\n").slice(1, -7).join("\n")
-                    )
-                );
-                return;
-            }
-        }
-        maybePromise._then(
-            this._next,
-            this._throw,
-            undefined,
-            this,
-            null
-       );
-    }
-};
-
-PromiseSpawn.prototype._throw = function (reason) {
-    this._promise._attachExtraTrace(reason);
-    this._promise._pushContext();
-    var result = tryCatch(this._generator["throw"])
-        .call(this._generator, reason);
-    this._promise._popContext();
-    this._continue(result);
-};
-
-PromiseSpawn.prototype._next = function (value) {
-    this._promise._pushContext();
-    var result = tryCatch(this._generator.next).call(this._generator, value);
-    this._promise._popContext();
-    this._continue(result);
-};
-
-Promise.coroutine = function (generatorFunction, options) {
-    if (typeof generatorFunction !== "function") {
-        throw new TypeError("generatorFunction must be a function\u000a\u000a    See http://goo.gl/6Vqhm0\u000a");
-    }
-    var yieldHandler = Object(options).yieldHandler;
-    var PromiseSpawn$ = PromiseSpawn;
-    var stack = new Error().stack;
-    return function () {
-        var generator = generatorFunction.apply(this, arguments);
-        var spawn = new PromiseSpawn$(undefined, undefined, yieldHandler,
-                                      stack);
-        spawn._generator = generator;
-        spawn._next(undefined);
-        return spawn.promise();
-    };
-};
-
-Promise.coroutine.addYieldHandler = function(fn) {
-    if (typeof fn !== "function") throw new TypeError("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-    yieldHandlers.push(fn);
-};
-
-Promise.spawn = function (generatorFunction) {
-    if (typeof generatorFunction !== "function") {
-        return apiRejection("generatorFunction must be a function\u000a\u000a    See http://goo.gl/6Vqhm0\u000a");
-    }
-    var spawn = new PromiseSpawn(generatorFunction, this);
-    var ret = spawn.promise();
-    spawn._run(Promise.spawn);
-    return ret;
-};
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/join.js b/deps/npm/node_modules/bluebird/js/main/join.js
deleted file mode 100644
index cf33eb1d073b48..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/join.js
+++ /dev/null
@@ -1,107 +0,0 @@
-"use strict";
-module.exports =
-function(Promise, PromiseArray, tryConvertToPromise, INTERNAL) {
-var util = require("./util.js");
-var canEvaluate = util.canEvaluate;
-var tryCatch = util.tryCatch;
-var errorObj = util.errorObj;
-var reject;
-
-if (!false) {
-if (canEvaluate) {
-    var thenCallback = function(i) {
-        return new Function("value", "holder", "                             \n\
-            'use strict';                                                    \n\
-            holder.pIndex = value;                                           \n\
-            holder.checkFulfillment(this);                                   \n\
-            ".replace(/Index/g, i));
-    };
-
-    var caller = function(count) {
-        var values = [];
-        for (var i = 1; i <= count; ++i) values.push("holder.p" + i);
-        return new Function("holder", "                                      \n\
-            'use strict';                                                    \n\
-            var callback = holder.fn;                                        \n\
-            return callback(values);                                         \n\
-            ".replace(/values/g, values.join(", ")));
-    };
-    var thenCallbacks = [];
-    var callers = [undefined];
-    for (var i = 1; i <= 5; ++i) {
-        thenCallbacks.push(thenCallback(i));
-        callers.push(caller(i));
-    }
-
-    var Holder = function(total, fn) {
-        this.p1 = this.p2 = this.p3 = this.p4 = this.p5 = null;
-        this.fn = fn;
-        this.total = total;
-        this.now = 0;
-    };
-
-    Holder.prototype.callers = callers;
-    Holder.prototype.checkFulfillment = function(promise) {
-        var now = this.now;
-        now++;
-        var total = this.total;
-        if (now >= total) {
-            var handler = this.callers[total];
-            promise._pushContext();
-            var ret = tryCatch(handler)(this);
-            promise._popContext();
-            if (ret === errorObj) {
-                promise._rejectCallback(ret.e, false, true);
-            } else {
-                promise._resolveCallback(ret);
-            }
-        } else {
-            this.now = now;
-        }
-    };
-
-    var reject = function (reason) {
-        this._reject(reason);
-    };
-}
-}
-
-Promise.join = function () {
-    var last = arguments.length - 1;
-    var fn;
-    if (last > 0 && typeof arguments[last] === "function") {
-        fn = arguments[last];
-        if (!false) {
-            if (last < 6 && canEvaluate) {
-                var ret = new Promise(INTERNAL);
-                ret._captureStackTrace();
-                var holder = new Holder(last, fn);
-                var callbacks = thenCallbacks;
-                for (var i = 0; i < last; ++i) {
-                    var maybePromise = tryConvertToPromise(arguments[i], ret);
-                    if (maybePromise instanceof Promise) {
-                        maybePromise = maybePromise._target();
-                        if (maybePromise._isPending()) {
-                            maybePromise._then(callbacks[i], reject,
-                                               undefined, ret, holder);
-                        } else if (maybePromise._isFulfilled()) {
-                            callbacks[i].call(ret,
-                                              maybePromise._value(), holder);
-                        } else {
-                            ret._reject(maybePromise._reason());
-                        }
-                    } else {
-                        callbacks[i].call(ret, maybePromise, holder);
-                    }
-                }
-                return ret;
-            }
-        }
-    }
-    var $_len = arguments.length;var args = new Array($_len); for(var $_i = 0; $_i < $_len; ++$_i) {args[$_i] = arguments[$_i];}
-    if (fn) args.pop();
-    var ret = new PromiseArray(args).promise();
-    return fn !== undefined ? ret.spread(fn) : ret;
-};
-
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/map.js b/deps/npm/node_modules/bluebird/js/main/map.js
deleted file mode 100644
index 2f40efd2493529..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/map.js
+++ /dev/null
@@ -1,133 +0,0 @@
-"use strict";
-module.exports = function(Promise,
-                          PromiseArray,
-                          apiRejection,
-                          tryConvertToPromise,
-                          INTERNAL) {
-var getDomain = Promise._getDomain;
-var async = require("./async.js");
-var util = require("./util.js");
-var tryCatch = util.tryCatch;
-var errorObj = util.errorObj;
-var PENDING = {};
-var EMPTY_ARRAY = [];
-
-function MappingPromiseArray(promises, fn, limit, _filter) {
-    this.constructor$(promises);
-    this._promise._captureStackTrace();
-    var domain = getDomain();
-    this._callback = domain === null ? fn : domain.bind(fn);
-    this._preservedValues = _filter === INTERNAL
-        ? new Array(this.length())
-        : null;
-    this._limit = limit;
-    this._inFlight = 0;
-    this._queue = limit >= 1 ? [] : EMPTY_ARRAY;
-    async.invoke(init, this, undefined);
-}
-util.inherits(MappingPromiseArray, PromiseArray);
-function init() {this._init$(undefined, -2);}
-
-MappingPromiseArray.prototype._init = function () {};
-
-MappingPromiseArray.prototype._promiseFulfilled = function (value, index) {
-    var values = this._values;
-    var length = this.length();
-    var preservedValues = this._preservedValues;
-    var limit = this._limit;
-    if (values[index] === PENDING) {
-        values[index] = value;
-        if (limit >= 1) {
-            this._inFlight--;
-            this._drainQueue();
-            if (this._isResolved()) return;
-        }
-    } else {
-        if (limit >= 1 && this._inFlight >= limit) {
-            values[index] = value;
-            this._queue.push(index);
-            return;
-        }
-        if (preservedValues !== null) preservedValues[index] = value;
-
-        var callback = this._callback;
-        var receiver = this._promise._boundValue();
-        this._promise._pushContext();
-        var ret = tryCatch(callback).call(receiver, value, index, length);
-        this._promise._popContext();
-        if (ret === errorObj) return this._reject(ret.e);
-
-        var maybePromise = tryConvertToPromise(ret, this._promise);
-        if (maybePromise instanceof Promise) {
-            maybePromise = maybePromise._target();
-            if (maybePromise._isPending()) {
-                if (limit >= 1) this._inFlight++;
-                values[index] = PENDING;
-                return maybePromise._proxyPromiseArray(this, index);
-            } else if (maybePromise._isFulfilled()) {
-                ret = maybePromise._value();
-            } else {
-                return this._reject(maybePromise._reason());
-            }
-        }
-        values[index] = ret;
-    }
-    var totalResolved = ++this._totalResolved;
-    if (totalResolved >= length) {
-        if (preservedValues !== null) {
-            this._filter(values, preservedValues);
-        } else {
-            this._resolve(values);
-        }
-
-    }
-};
-
-MappingPromiseArray.prototype._drainQueue = function () {
-    var queue = this._queue;
-    var limit = this._limit;
-    var values = this._values;
-    while (queue.length > 0 && this._inFlight < limit) {
-        if (this._isResolved()) return;
-        var index = queue.pop();
-        this._promiseFulfilled(values[index], index);
-    }
-};
-
-MappingPromiseArray.prototype._filter = function (booleans, values) {
-    var len = values.length;
-    var ret = new Array(len);
-    var j = 0;
-    for (var i = 0; i < len; ++i) {
-        if (booleans[i]) ret[j++] = values[i];
-    }
-    ret.length = j;
-    this._resolve(ret);
-};
-
-MappingPromiseArray.prototype.preservedValues = function () {
-    return this._preservedValues;
-};
-
-function map(promises, fn, options, _filter) {
-    var limit = typeof options === "object" && options !== null
-        ? options.concurrency
-        : 0;
-    limit = typeof limit === "number" &&
-        isFinite(limit) && limit >= 1 ? limit : 0;
-    return new MappingPromiseArray(promises, fn, limit, _filter);
-}
-
-Promise.prototype.map = function (fn, options) {
-    if (typeof fn !== "function") return apiRejection("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-
-    return map(this, fn, options, null).promise();
-};
-
-Promise.map = function (promises, fn, options, _filter) {
-    if (typeof fn !== "function") return apiRejection("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-    return map(promises, fn, options, _filter).promise();
-};
-
-
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/method.js b/deps/npm/node_modules/bluebird/js/main/method.js
deleted file mode 100644
index 3d3eeb17c8386e..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/method.js
+++ /dev/null
@@ -1,44 +0,0 @@
-"use strict";
-module.exports =
-function(Promise, INTERNAL, tryConvertToPromise, apiRejection) {
-var util = require("./util.js");
-var tryCatch = util.tryCatch;
-
-Promise.method = function (fn) {
-    if (typeof fn !== "function") {
-        throw new Promise.TypeError("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-    }
-    return function () {
-        var ret = new Promise(INTERNAL);
-        ret._captureStackTrace();
-        ret._pushContext();
-        var value = tryCatch(fn).apply(this, arguments);
-        ret._popContext();
-        ret._resolveFromSyncValue(value);
-        return ret;
-    };
-};
-
-Promise.attempt = Promise["try"] = function (fn, args, ctx) {
-    if (typeof fn !== "function") {
-        return apiRejection("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-    }
-    var ret = new Promise(INTERNAL);
-    ret._captureStackTrace();
-    ret._pushContext();
-    var value = util.isArray(args)
-        ? tryCatch(fn).apply(ctx, args)
-        : tryCatch(fn).call(ctx, args);
-    ret._popContext();
-    ret._resolveFromSyncValue(value);
-    return ret;
-};
-
-Promise.prototype._resolveFromSyncValue = function (value) {
-    if (value === util.errorObj) {
-        this._rejectCallback(value.e, false, true);
-    } else {
-        this._resolveCallback(value, true);
-    }
-};
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/nodeify.js b/deps/npm/node_modules/bluebird/js/main/nodeify.js
deleted file mode 100644
index 257565db5ec0f6..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/nodeify.js
+++ /dev/null
@@ -1,59 +0,0 @@
-"use strict";
-module.exports = function(Promise) {
-var util = require("./util.js");
-var async = require("./async.js");
-var tryCatch = util.tryCatch;
-var errorObj = util.errorObj;
-
-function spreadAdapter(val, nodeback) {
-    var promise = this;
-    if (!util.isArray(val)) return successAdapter.call(promise, val, nodeback);
-    var ret =
-        tryCatch(nodeback).apply(promise._boundValue(), [null].concat(val));
-    if (ret === errorObj) {
-        async.throwLater(ret.e);
-    }
-}
-
-function successAdapter(val, nodeback) {
-    var promise = this;
-    var receiver = promise._boundValue();
-    var ret = val === undefined
-        ? tryCatch(nodeback).call(receiver, null)
-        : tryCatch(nodeback).call(receiver, null, val);
-    if (ret === errorObj) {
-        async.throwLater(ret.e);
-    }
-}
-function errorAdapter(reason, nodeback) {
-    var promise = this;
-    if (!reason) {
-        var target = promise._target();
-        var newReason = target._getCarriedStackTrace();
-        newReason.cause = reason;
-        reason = newReason;
-    }
-    var ret = tryCatch(nodeback).call(promise._boundValue(), reason);
-    if (ret === errorObj) {
-        async.throwLater(ret.e);
-    }
-}
-
-Promise.prototype.asCallback =
-Promise.prototype.nodeify = function (nodeback, options) {
-    if (typeof nodeback == "function") {
-        var adapter = successAdapter;
-        if (options !== undefined && Object(options).spread) {
-            adapter = spreadAdapter;
-        }
-        this._then(
-            adapter,
-            errorAdapter,
-            undefined,
-            this,
-            nodeback
-        );
-    }
-    return this;
-};
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/progress.js b/deps/npm/node_modules/bluebird/js/main/progress.js
deleted file mode 100644
index 2e3e95e564b5bb..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/progress.js
+++ /dev/null
@@ -1,76 +0,0 @@
-"use strict";
-module.exports = function(Promise, PromiseArray) {
-var util = require("./util.js");
-var async = require("./async.js");
-var tryCatch = util.tryCatch;
-var errorObj = util.errorObj;
-
-Promise.prototype.progressed = function (handler) {
-    return this._then(undefined, undefined, handler, undefined, undefined);
-};
-
-Promise.prototype._progress = function (progressValue) {
-    if (this._isFollowingOrFulfilledOrRejected()) return;
-    this._target()._progressUnchecked(progressValue);
-
-};
-
-Promise.prototype._progressHandlerAt = function (index) {
-    return index === 0
-        ? this._progressHandler0
-        : this[(index << 2) + index - 5 + 2];
-};
-
-Promise.prototype._doProgressWith = function (progression) {
-    var progressValue = progression.value;
-    var handler = progression.handler;
-    var promise = progression.promise;
-    var receiver = progression.receiver;
-
-    var ret = tryCatch(handler).call(receiver, progressValue);
-    if (ret === errorObj) {
-        if (ret.e != null &&
-            ret.e.name !== "StopProgressPropagation") {
-            var trace = util.canAttachTrace(ret.e)
-                ? ret.e : new Error(util.toString(ret.e));
-            promise._attachExtraTrace(trace);
-            promise._progress(ret.e);
-        }
-    } else if (ret instanceof Promise) {
-        ret._then(promise._progress, null, null, promise, undefined);
-    } else {
-        promise._progress(ret);
-    }
-};
-
-
-Promise.prototype._progressUnchecked = function (progressValue) {
-    var len = this._length();
-    var progress = this._progress;
-    for (var i = 0; i < len; i++) {
-        var handler = this._progressHandlerAt(i);
-        var promise = this._promiseAt(i);
-        if (!(promise instanceof Promise)) {
-            var receiver = this._receiverAt(i);
-            if (typeof handler === "function") {
-                handler.call(receiver, progressValue, promise);
-            } else if (receiver instanceof PromiseArray &&
-                       !receiver._isResolved()) {
-                receiver._promiseProgressed(progressValue, promise);
-            }
-            continue;
-        }
-
-        if (typeof handler === "function") {
-            async.invoke(this._doProgressWith, this, {
-                handler: handler,
-                promise: promise,
-                receiver: this._receiverAt(i),
-                value: progressValue
-            });
-        } else {
-            async.invoke(progress, promise, progressValue);
-        }
-    }
-};
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/promise.js b/deps/npm/node_modules/bluebird/js/main/promise.js
deleted file mode 100644
index 8e2ccfbd361e58..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/promise.js
+++ /dev/null
@@ -1,754 +0,0 @@
-"use strict";
-module.exports = function() {
-var makeSelfResolutionError = function () {
-    return new TypeError("circular promise resolution chain\u000a\u000a    See http://goo.gl/LhFpo0\u000a");
-};
-var reflect = function() {
-    return new Promise.PromiseInspection(this._target());
-};
-var apiRejection = function(msg) {
-    return Promise.reject(new TypeError(msg));
-};
-
-var util = require("./util.js");
-
-var getDomain;
-if (util.isNode) {
-    getDomain = function() {
-        var ret = process.domain;
-        if (ret === undefined) ret = null;
-        return ret;
-    };
-} else {
-    getDomain = function() {
-        return null;
-    };
-}
-util.notEnumerableProp(Promise, "_getDomain", getDomain);
-
-var UNDEFINED_BINDING = {};
-var async = require("./async.js");
-var errors = require("./errors.js");
-var TypeError = Promise.TypeError = errors.TypeError;
-Promise.RangeError = errors.RangeError;
-Promise.CancellationError = errors.CancellationError;
-Promise.TimeoutError = errors.TimeoutError;
-Promise.OperationalError = errors.OperationalError;
-Promise.RejectionError = errors.OperationalError;
-Promise.AggregateError = errors.AggregateError;
-var INTERNAL = function(){};
-var APPLY = {};
-var NEXT_FILTER = {e: null};
-var tryConvertToPromise = require("./thenables.js")(Promise, INTERNAL);
-var PromiseArray =
-    require("./promise_array.js")(Promise, INTERNAL,
-                                    tryConvertToPromise, apiRejection);
-var CapturedTrace = require("./captured_trace.js")();
-var isDebugging = require("./debuggability.js")(Promise, CapturedTrace);
- /*jshint unused:false*/
-var createContext =
-    require("./context.js")(Promise, CapturedTrace, isDebugging);
-var CatchFilter = require("./catch_filter.js")(NEXT_FILTER);
-var PromiseResolver = require("./promise_resolver.js");
-var nodebackForPromise = PromiseResolver._nodebackForPromise;
-var errorObj = util.errorObj;
-var tryCatch = util.tryCatch;
-function Promise(resolver) {
-    if (typeof resolver !== "function") {
-        throw new TypeError("the promise constructor requires a resolver function\u000a\u000a    See http://goo.gl/EC22Yn\u000a");
-    }
-    if (this.constructor !== Promise) {
-        throw new TypeError("the promise constructor cannot be invoked directly\u000a\u000a    See http://goo.gl/KsIlge\u000a");
-    }
-    this._bitField = 0;
-    this._fulfillmentHandler0 = undefined;
-    this._rejectionHandler0 = undefined;
-    this._progressHandler0 = undefined;
-    this._promise0 = undefined;
-    this._receiver0 = undefined;
-    this._settledValue = undefined;
-    if (resolver !== INTERNAL) this._resolveFromResolver(resolver);
-}
-
-Promise.prototype.toString = function () {
-    return "[object Promise]";
-};
-
-Promise.prototype.caught = Promise.prototype["catch"] = function (fn) {
-    var len = arguments.length;
-    if (len > 1) {
-        var catchInstances = new Array(len - 1),
-            j = 0, i;
-        for (i = 0; i < len - 1; ++i) {
-            var item = arguments[i];
-            if (typeof item === "function") {
-                catchInstances[j++] = item;
-            } else {
-                return Promise.reject(
-                    new TypeError("Catch filter must inherit from Error or be a simple predicate function\u000a\u000a    See http://goo.gl/o84o68\u000a"));
-            }
-        }
-        catchInstances.length = j;
-        fn = arguments[i];
-        var catchFilter = new CatchFilter(catchInstances, fn, this);
-        return this._then(undefined, catchFilter.doFilter, undefined,
-            catchFilter, undefined);
-    }
-    return this._then(undefined, fn, undefined, undefined, undefined);
-};
-
-Promise.prototype.reflect = function () {
-    return this._then(reflect, reflect, undefined, this, undefined);
-};
-
-Promise.prototype.then = function (didFulfill, didReject, didProgress) {
-    if (isDebugging() && arguments.length > 0 &&
-        typeof didFulfill !== "function" &&
-        typeof didReject !== "function") {
-        var msg = ".then() only accepts functions but was passed: " +
-                util.classString(didFulfill);
-        if (arguments.length > 1) {
-            msg += ", " + util.classString(didReject);
-        }
-        this._warn(msg);
-    }
-    return this._then(didFulfill, didReject, didProgress,
-        undefined, undefined);
-};
-
-Promise.prototype.done = function (didFulfill, didReject, didProgress) {
-    var promise = this._then(didFulfill, didReject, didProgress,
-        undefined, undefined);
-    promise._setIsFinal();
-};
-
-Promise.prototype.spread = function (didFulfill, didReject) {
-    return this.all()._then(didFulfill, didReject, undefined, APPLY, undefined);
-};
-
-Promise.prototype.isCancellable = function () {
-    return !this.isResolved() &&
-        this._cancellable();
-};
-
-Promise.prototype.toJSON = function () {
-    var ret = {
-        isFulfilled: false,
-        isRejected: false,
-        fulfillmentValue: undefined,
-        rejectionReason: undefined
-    };
-    if (this.isFulfilled()) {
-        ret.fulfillmentValue = this.value();
-        ret.isFulfilled = true;
-    } else if (this.isRejected()) {
-        ret.rejectionReason = this.reason();
-        ret.isRejected = true;
-    }
-    return ret;
-};
-
-Promise.prototype.all = function () {
-    return new PromiseArray(this).promise();
-};
-
-Promise.prototype.error = function (fn) {
-    return this.caught(util.originatesFromRejection, fn);
-};
-
-Promise.is = function (val) {
-    return val instanceof Promise;
-};
-
-Promise.fromNode = function(fn) {
-    var ret = new Promise(INTERNAL);
-    var result = tryCatch(fn)(nodebackForPromise(ret));
-    if (result === errorObj) {
-        ret._rejectCallback(result.e, true, true);
-    }
-    return ret;
-};
-
-Promise.all = function (promises) {
-    return new PromiseArray(promises).promise();
-};
-
-Promise.defer = Promise.pending = function () {
-    var promise = new Promise(INTERNAL);
-    return new PromiseResolver(promise);
-};
-
-Promise.cast = function (obj) {
-    var ret = tryConvertToPromise(obj);
-    if (!(ret instanceof Promise)) {
-        var val = ret;
-        ret = new Promise(INTERNAL);
-        ret._fulfillUnchecked(val);
-    }
-    return ret;
-};
-
-Promise.resolve = Promise.fulfilled = Promise.cast;
-
-Promise.reject = Promise.rejected = function (reason) {
-    var ret = new Promise(INTERNAL);
-    ret._captureStackTrace();
-    ret._rejectCallback(reason, true);
-    return ret;
-};
-
-Promise.setScheduler = function(fn) {
-    if (typeof fn !== "function") throw new TypeError("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-    var prev = async._schedule;
-    async._schedule = fn;
-    return prev;
-};
-
-Promise.prototype._then = function (
-    didFulfill,
-    didReject,
-    didProgress,
-    receiver,
-    internalData
-) {
-    var haveInternalData = internalData !== undefined;
-    var ret = haveInternalData ? internalData : new Promise(INTERNAL);
-
-    if (!haveInternalData) {
-        ret._propagateFrom(this, 4 | 1);
-        ret._captureStackTrace();
-    }
-
-    var target = this._target();
-    if (target !== this) {
-        if (receiver === undefined) receiver = this._boundTo;
-        if (!haveInternalData) ret._setIsMigrated();
-    }
-
-    var callbackIndex = target._addCallbacks(didFulfill,
-                                             didReject,
-                                             didProgress,
-                                             ret,
-                                             receiver,
-                                             getDomain());
-
-    if (target._isResolved() && !target._isSettlePromisesQueued()) {
-        async.invoke(
-            target._settlePromiseAtPostResolution, target, callbackIndex);
-    }
-
-    return ret;
-};
-
-Promise.prototype._settlePromiseAtPostResolution = function (index) {
-    if (this._isRejectionUnhandled()) this._unsetRejectionIsUnhandled();
-    this._settlePromiseAt(index);
-};
-
-Promise.prototype._length = function () {
-    return this._bitField & 131071;
-};
-
-Promise.prototype._isFollowingOrFulfilledOrRejected = function () {
-    return (this._bitField & 939524096) > 0;
-};
-
-Promise.prototype._isFollowing = function () {
-    return (this._bitField & 536870912) === 536870912;
-};
-
-Promise.prototype._setLength = function (len) {
-    this._bitField = (this._bitField & -131072) |
-        (len & 131071);
-};
-
-Promise.prototype._setFulfilled = function () {
-    this._bitField = this._bitField | 268435456;
-};
-
-Promise.prototype._setRejected = function () {
-    this._bitField = this._bitField | 134217728;
-};
-
-Promise.prototype._setFollowing = function () {
-    this._bitField = this._bitField | 536870912;
-};
-
-Promise.prototype._setIsFinal = function () {
-    this._bitField = this._bitField | 33554432;
-};
-
-Promise.prototype._isFinal = function () {
-    return (this._bitField & 33554432) > 0;
-};
-
-Promise.prototype._cancellable = function () {
-    return (this._bitField & 67108864) > 0;
-};
-
-Promise.prototype._setCancellable = function () {
-    this._bitField = this._bitField | 67108864;
-};
-
-Promise.prototype._unsetCancellable = function () {
-    this._bitField = this._bitField & (~67108864);
-};
-
-Promise.prototype._setIsMigrated = function () {
-    this._bitField = this._bitField | 4194304;
-};
-
-Promise.prototype._unsetIsMigrated = function () {
-    this._bitField = this._bitField & (~4194304);
-};
-
-Promise.prototype._isMigrated = function () {
-    return (this._bitField & 4194304) > 0;
-};
-
-Promise.prototype._receiverAt = function (index) {
-    var ret = index === 0
-        ? this._receiver0
-        : this[
-            index * 5 - 5 + 4];
-    if (ret === UNDEFINED_BINDING) {
-        return undefined;
-    } else if (ret === undefined && this._isBound()) {
-        return this._boundValue();
-    }
-    return ret;
-};
-
-Promise.prototype._promiseAt = function (index) {
-    return index === 0
-        ? this._promise0
-        : this[index * 5 - 5 + 3];
-};
-
-Promise.prototype._fulfillmentHandlerAt = function (index) {
-    return index === 0
-        ? this._fulfillmentHandler0
-        : this[index * 5 - 5 + 0];
-};
-
-Promise.prototype._rejectionHandlerAt = function (index) {
-    return index === 0
-        ? this._rejectionHandler0
-        : this[index * 5 - 5 + 1];
-};
-
-Promise.prototype._boundValue = function() {
-    var ret = this._boundTo;
-    if (ret !== undefined) {
-        if (ret instanceof Promise) {
-            if (ret.isFulfilled()) {
-                return ret.value();
-            } else {
-                return undefined;
-            }
-        }
-    }
-    return ret;
-};
-
-Promise.prototype._migrateCallbacks = function (follower, index) {
-    var fulfill = follower._fulfillmentHandlerAt(index);
-    var reject = follower._rejectionHandlerAt(index);
-    var progress = follower._progressHandlerAt(index);
-    var promise = follower._promiseAt(index);
-    var receiver = follower._receiverAt(index);
-    if (promise instanceof Promise) promise._setIsMigrated();
-    if (receiver === undefined) receiver = UNDEFINED_BINDING;
-    this._addCallbacks(fulfill, reject, progress, promise, receiver, null);
-};
-
-Promise.prototype._addCallbacks = function (
-    fulfill,
-    reject,
-    progress,
-    promise,
-    receiver,
-    domain
-) {
-    var index = this._length();
-
-    if (index >= 131071 - 5) {
-        index = 0;
-        this._setLength(0);
-    }
-
-    if (index === 0) {
-        this._promise0 = promise;
-        if (receiver !== undefined) this._receiver0 = receiver;
-        if (typeof fulfill === "function" && !this._isCarryingStackTrace()) {
-            this._fulfillmentHandler0 =
-                domain === null ? fulfill : domain.bind(fulfill);
-        }
-        if (typeof reject === "function") {
-            this._rejectionHandler0 =
-                domain === null ? reject : domain.bind(reject);
-        }
-        if (typeof progress === "function") {
-            this._progressHandler0 =
-                domain === null ? progress : domain.bind(progress);
-        }
-    } else {
-        var base = index * 5 - 5;
-        this[base + 3] = promise;
-        this[base + 4] = receiver;
-        if (typeof fulfill === "function") {
-            this[base + 0] =
-                domain === null ? fulfill : domain.bind(fulfill);
-        }
-        if (typeof reject === "function") {
-            this[base + 1] =
-                domain === null ? reject : domain.bind(reject);
-        }
-        if (typeof progress === "function") {
-            this[base + 2] =
-                domain === null ? progress : domain.bind(progress);
-        }
-    }
-    this._setLength(index + 1);
-    return index;
-};
-
-Promise.prototype._setProxyHandlers = function (receiver, promiseSlotValue) {
-    var index = this._length();
-
-    if (index >= 131071 - 5) {
-        index = 0;
-        this._setLength(0);
-    }
-    if (index === 0) {
-        this._promise0 = promiseSlotValue;
-        this._receiver0 = receiver;
-    } else {
-        var base = index * 5 - 5;
-        this[base + 3] = promiseSlotValue;
-        this[base + 4] = receiver;
-    }
-    this._setLength(index + 1);
-};
-
-Promise.prototype._proxyPromiseArray = function (promiseArray, index) {
-    this._setProxyHandlers(promiseArray, index);
-};
-
-Promise.prototype._resolveCallback = function(value, shouldBind) {
-    if (this._isFollowingOrFulfilledOrRejected()) return;
-    if (value === this)
-        return this._rejectCallback(makeSelfResolutionError(), false, true);
-    var maybePromise = tryConvertToPromise(value, this);
-    if (!(maybePromise instanceof Promise)) return this._fulfill(value);
-
-    var propagationFlags = 1 | (shouldBind ? 4 : 0);
-    this._propagateFrom(maybePromise, propagationFlags);
-    var promise = maybePromise._target();
-    if (promise._isPending()) {
-        var len = this._length();
-        for (var i = 0; i < len; ++i) {
-            promise._migrateCallbacks(this, i);
-        }
-        this._setFollowing();
-        this._setLength(0);
-        this._setFollowee(promise);
-    } else if (promise._isFulfilled()) {
-        this._fulfillUnchecked(promise._value());
-    } else {
-        this._rejectUnchecked(promise._reason(),
-            promise._getCarriedStackTrace());
-    }
-};
-
-Promise.prototype._rejectCallback =
-function(reason, synchronous, shouldNotMarkOriginatingFromRejection) {
-    if (!shouldNotMarkOriginatingFromRejection) {
-        util.markAsOriginatingFromRejection(reason);
-    }
-    var trace = util.ensureErrorObject(reason);
-    var hasStack = trace === reason;
-    this._attachExtraTrace(trace, synchronous ? hasStack : false);
-    this._reject(reason, hasStack ? undefined : trace);
-};
-
-Promise.prototype._resolveFromResolver = function (resolver) {
-    var promise = this;
-    this._captureStackTrace();
-    this._pushContext();
-    var synchronous = true;
-    var r = tryCatch(resolver)(function(value) {
-        if (promise === null) return;
-        promise._resolveCallback(value);
-        promise = null;
-    }, function (reason) {
-        if (promise === null) return;
-        promise._rejectCallback(reason, synchronous);
-        promise = null;
-    });
-    synchronous = false;
-    this._popContext();
-
-    if (r !== undefined && r === errorObj && promise !== null) {
-        promise._rejectCallback(r.e, true, true);
-        promise = null;
-    }
-};
-
-Promise.prototype._settlePromiseFromHandler = function (
-    handler, receiver, value, promise
-) {
-    if (promise._isRejected()) return;
-    promise._pushContext();
-    var x;
-    if (receiver === APPLY && !this._isRejected()) {
-        x = tryCatch(handler).apply(this._boundValue(), value);
-    } else {
-        x = tryCatch(handler).call(receiver, value);
-    }
-    promise._popContext();
-
-    if (x === errorObj || x === promise || x === NEXT_FILTER) {
-        var err = x === promise ? makeSelfResolutionError() : x.e;
-        promise._rejectCallback(err, false, true);
-    } else {
-        promise._resolveCallback(x);
-    }
-};
-
-Promise.prototype._target = function() {
-    var ret = this;
-    while (ret._isFollowing()) ret = ret._followee();
-    return ret;
-};
-
-Promise.prototype._followee = function() {
-    return this._rejectionHandler0;
-};
-
-Promise.prototype._setFollowee = function(promise) {
-    this._rejectionHandler0 = promise;
-};
-
-Promise.prototype._cleanValues = function () {
-    if (this._cancellable()) {
-        this._cancellationParent = undefined;
-    }
-};
-
-Promise.prototype._propagateFrom = function (parent, flags) {
-    if ((flags & 1) > 0 && parent._cancellable()) {
-        this._setCancellable();
-        this._cancellationParent = parent;
-    }
-    if ((flags & 4) > 0 && parent._isBound()) {
-        this._setBoundTo(parent._boundTo);
-    }
-};
-
-Promise.prototype._fulfill = function (value) {
-    if (this._isFollowingOrFulfilledOrRejected()) return;
-    this._fulfillUnchecked(value);
-};
-
-Promise.prototype._reject = function (reason, carriedStackTrace) {
-    if (this._isFollowingOrFulfilledOrRejected()) return;
-    this._rejectUnchecked(reason, carriedStackTrace);
-};
-
-Promise.prototype._settlePromiseAt = function (index) {
-    var promise = this._promiseAt(index);
-    var isPromise = promise instanceof Promise;
-
-    if (isPromise && promise._isMigrated()) {
-        promise._unsetIsMigrated();
-        return async.invoke(this._settlePromiseAt, this, index);
-    }
-    var handler = this._isFulfilled()
-        ? this._fulfillmentHandlerAt(index)
-        : this._rejectionHandlerAt(index);
-
-    var carriedStackTrace =
-        this._isCarryingStackTrace() ? this._getCarriedStackTrace() : undefined;
-    var value = this._settledValue;
-    var receiver = this._receiverAt(index);
-    this._clearCallbackDataAtIndex(index);
-
-    if (typeof handler === "function") {
-        if (!isPromise) {
-            handler.call(receiver, value, promise);
-        } else {
-            this._settlePromiseFromHandler(handler, receiver, value, promise);
-        }
-    } else if (receiver instanceof PromiseArray) {
-        if (!receiver._isResolved()) {
-            if (this._isFulfilled()) {
-                receiver._promiseFulfilled(value, promise);
-            }
-            else {
-                receiver._promiseRejected(value, promise);
-            }
-        }
-    } else if (isPromise) {
-        if (this._isFulfilled()) {
-            promise._fulfill(value);
-        } else {
-            promise._reject(value, carriedStackTrace);
-        }
-    }
-
-    if (index >= 4 && (index & 31) === 4)
-        async.invokeLater(this._setLength, this, 0);
-};
-
-Promise.prototype._clearCallbackDataAtIndex = function(index) {
-    if (index === 0) {
-        if (!this._isCarryingStackTrace()) {
-            this._fulfillmentHandler0 = undefined;
-        }
-        this._rejectionHandler0 =
-        this._progressHandler0 =
-        this._receiver0 =
-        this._promise0 = undefined;
-    } else {
-        var base = index * 5 - 5;
-        this[base + 3] =
-        this[base + 4] =
-        this[base + 0] =
-        this[base + 1] =
-        this[base + 2] = undefined;
-    }
-};
-
-Promise.prototype._isSettlePromisesQueued = function () {
-    return (this._bitField &
-            -1073741824) === -1073741824;
-};
-
-Promise.prototype._setSettlePromisesQueued = function () {
-    this._bitField = this._bitField | -1073741824;
-};
-
-Promise.prototype._unsetSettlePromisesQueued = function () {
-    this._bitField = this._bitField & (~-1073741824);
-};
-
-Promise.prototype._queueSettlePromises = function() {
-    async.settlePromises(this);
-    this._setSettlePromisesQueued();
-};
-
-Promise.prototype._fulfillUnchecked = function (value) {
-    if (value === this) {
-        var err = makeSelfResolutionError();
-        this._attachExtraTrace(err);
-        return this._rejectUnchecked(err, undefined);
-    }
-    this._setFulfilled();
-    this._settledValue = value;
-    this._cleanValues();
-
-    if (this._length() > 0) {
-        this._queueSettlePromises();
-    }
-};
-
-Promise.prototype._rejectUncheckedCheckError = function (reason) {
-    var trace = util.ensureErrorObject(reason);
-    this._rejectUnchecked(reason, trace === reason ? undefined : trace);
-};
-
-Promise.prototype._rejectUnchecked = function (reason, trace) {
-    if (reason === this) {
-        var err = makeSelfResolutionError();
-        this._attachExtraTrace(err);
-        return this._rejectUnchecked(err);
-    }
-    this._setRejected();
-    this._settledValue = reason;
-    this._cleanValues();
-
-    if (this._isFinal()) {
-        async.throwLater(function(e) {
-            if ("stack" in e) {
-                async.invokeFirst(
-                    CapturedTrace.unhandledRejection, undefined, e);
-            }
-            throw e;
-        }, trace === undefined ? reason : trace);
-        return;
-    }
-
-    if (trace !== undefined && trace !== reason) {
-        this._setCarriedStackTrace(trace);
-    }
-
-    if (this._length() > 0) {
-        this._queueSettlePromises();
-    } else {
-        this._ensurePossibleRejectionHandled();
-    }
-};
-
-Promise.prototype._settlePromises = function () {
-    this._unsetSettlePromisesQueued();
-    var len = this._length();
-    for (var i = 0; i < len; i++) {
-        this._settlePromiseAt(i);
-    }
-};
-
-util.notEnumerableProp(Promise,
-                       "_makeSelfResolutionError",
-                       makeSelfResolutionError);
-
-require("./progress.js")(Promise, PromiseArray);
-require("./method.js")(Promise, INTERNAL, tryConvertToPromise, apiRejection);
-require("./bind.js")(Promise, INTERNAL, tryConvertToPromise);
-require("./finally.js")(Promise, NEXT_FILTER, tryConvertToPromise);
-require("./direct_resolve.js")(Promise);
-require("./synchronous_inspection.js")(Promise);
-require("./join.js")(Promise, PromiseArray, tryConvertToPromise, INTERNAL);
-Promise.Promise = Promise;
-require('./map.js')(Promise, PromiseArray, apiRejection, tryConvertToPromise, INTERNAL);
-require('./cancel.js')(Promise);
-require('./using.js')(Promise, apiRejection, tryConvertToPromise, createContext);
-require('./generators.js')(Promise, apiRejection, INTERNAL, tryConvertToPromise);
-require('./nodeify.js')(Promise);
-require('./call_get.js')(Promise);
-require('./props.js')(Promise, PromiseArray, tryConvertToPromise, apiRejection);
-require('./race.js')(Promise, INTERNAL, tryConvertToPromise, apiRejection);
-require('./reduce.js')(Promise, PromiseArray, apiRejection, tryConvertToPromise, INTERNAL);
-require('./settle.js')(Promise, PromiseArray);
-require('./some.js')(Promise, PromiseArray, apiRejection);
-require('./promisify.js')(Promise, INTERNAL);
-require('./any.js')(Promise);
-require('./each.js')(Promise, INTERNAL);
-require('./timers.js')(Promise, INTERNAL);
-require('./filter.js')(Promise, INTERNAL);
-
-    util.toFastProperties(Promise);
-    util.toFastProperties(Promise.prototype);
-    function fillTypes(value) {
-        var p = new Promise(INTERNAL);
-        p._fulfillmentHandler0 = value;
-        p._rejectionHandler0 = value;
-        p._progressHandler0 = value;
-        p._promise0 = value;
-        p._receiver0 = value;
-        p._settledValue = value;
-    }
-    // Complete slack tracking, opt out of field-type tracking and
-    // stabilize map
-    fillTypes({a: 1});
-    fillTypes({b: 2});
-    fillTypes({c: 3});
-    fillTypes(1);
-    fillTypes(function(){});
-    fillTypes(undefined);
-    fillTypes(false);
-    fillTypes(new Promise(INTERNAL));
-    CapturedTrace.setBounds(async.firstLineError, util.lastLineError);
-    return Promise;
-
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/promise_array.js b/deps/npm/node_modules/bluebird/js/main/promise_array.js
deleted file mode 100644
index b2e8f1cc580c22..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/promise_array.js
+++ /dev/null
@@ -1,142 +0,0 @@
-"use strict";
-module.exports = function(Promise, INTERNAL, tryConvertToPromise,
-    apiRejection) {
-var util = require("./util.js");
-var isArray = util.isArray;
-
-function toResolutionValue(val) {
-    switch(val) {
-    case -2: return [];
-    case -3: return {};
-    }
-}
-
-function PromiseArray(values) {
-    var promise = this._promise = new Promise(INTERNAL);
-    var parent;
-    if (values instanceof Promise) {
-        parent = values;
-        promise._propagateFrom(parent, 1 | 4);
-    }
-    this._values = values;
-    this._length = 0;
-    this._totalResolved = 0;
-    this._init(undefined, -2);
-}
-PromiseArray.prototype.length = function () {
-    return this._length;
-};
-
-PromiseArray.prototype.promise = function () {
-    return this._promise;
-};
-
-PromiseArray.prototype._init = function init(_, resolveValueIfEmpty) {
-    var values = tryConvertToPromise(this._values, this._promise);
-    if (values instanceof Promise) {
-        values = values._target();
-        this._values = values;
-        if (values._isFulfilled()) {
-            values = values._value();
-            if (!isArray(values)) {
-                var err = new Promise.TypeError("expecting an array, a promise or a thenable\u000a\u000a    See http://goo.gl/s8MMhc\u000a");
-                this.__hardReject__(err);
-                return;
-            }
-        } else if (values._isPending()) {
-            values._then(
-                init,
-                this._reject,
-                undefined,
-                this,
-                resolveValueIfEmpty
-           );
-            return;
-        } else {
-            this._reject(values._reason());
-            return;
-        }
-    } else if (!isArray(values)) {
-        this._promise._reject(apiRejection("expecting an array, a promise or a thenable\u000a\u000a    See http://goo.gl/s8MMhc\u000a")._reason());
-        return;
-    }
-
-    if (values.length === 0) {
-        if (resolveValueIfEmpty === -5) {
-            this._resolveEmptyArray();
-        }
-        else {
-            this._resolve(toResolutionValue(resolveValueIfEmpty));
-        }
-        return;
-    }
-    var len = this.getActualLength(values.length);
-    this._length = len;
-    this._values = this.shouldCopyValues() ? new Array(len) : this._values;
-    var promise = this._promise;
-    for (var i = 0; i < len; ++i) {
-        var isResolved = this._isResolved();
-        var maybePromise = tryConvertToPromise(values[i], promise);
-        if (maybePromise instanceof Promise) {
-            maybePromise = maybePromise._target();
-            if (isResolved) {
-                maybePromise._ignoreRejections();
-            } else if (maybePromise._isPending()) {
-                maybePromise._proxyPromiseArray(this, i);
-            } else if (maybePromise._isFulfilled()) {
-                this._promiseFulfilled(maybePromise._value(), i);
-            } else {
-                this._promiseRejected(maybePromise._reason(), i);
-            }
-        } else if (!isResolved) {
-            this._promiseFulfilled(maybePromise, i);
-        }
-    }
-};
-
-PromiseArray.prototype._isResolved = function () {
-    return this._values === null;
-};
-
-PromiseArray.prototype._resolve = function (value) {
-    this._values = null;
-    this._promise._fulfill(value);
-};
-
-PromiseArray.prototype.__hardReject__ =
-PromiseArray.prototype._reject = function (reason) {
-    this._values = null;
-    this._promise._rejectCallback(reason, false, true);
-};
-
-PromiseArray.prototype._promiseProgressed = function (progressValue, index) {
-    this._promise._progress({
-        index: index,
-        value: progressValue
-    });
-};
-
-
-PromiseArray.prototype._promiseFulfilled = function (value, index) {
-    this._values[index] = value;
-    var totalResolved = ++this._totalResolved;
-    if (totalResolved >= this._length) {
-        this._resolve(this._values);
-    }
-};
-
-PromiseArray.prototype._promiseRejected = function (reason, index) {
-    this._totalResolved++;
-    this._reject(reason);
-};
-
-PromiseArray.prototype.shouldCopyValues = function () {
-    return true;
-};
-
-PromiseArray.prototype.getActualLength = function (len) {
-    return len;
-};
-
-return PromiseArray;
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/promise_resolver.js b/deps/npm/node_modules/bluebird/js/main/promise_resolver.js
deleted file mode 100644
index b180a328037d8f..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/promise_resolver.js
+++ /dev/null
@@ -1,123 +0,0 @@
-"use strict";
-var util = require("./util.js");
-var maybeWrapAsError = util.maybeWrapAsError;
-var errors = require("./errors.js");
-var TimeoutError = errors.TimeoutError;
-var OperationalError = errors.OperationalError;
-var haveGetters = util.haveGetters;
-var es5 = require("./es5.js");
-
-function isUntypedError(obj) {
-    return obj instanceof Error &&
-        es5.getPrototypeOf(obj) === Error.prototype;
-}
-
-var rErrorKey = /^(?:name|message|stack|cause)$/;
-function wrapAsOperationalError(obj) {
-    var ret;
-    if (isUntypedError(obj)) {
-        ret = new OperationalError(obj);
-        ret.name = obj.name;
-        ret.message = obj.message;
-        ret.stack = obj.stack;
-        var keys = es5.keys(obj);
-        for (var i = 0; i < keys.length; ++i) {
-            var key = keys[i];
-            if (!rErrorKey.test(key)) {
-                ret[key] = obj[key];
-            }
-        }
-        return ret;
-    }
-    util.markAsOriginatingFromRejection(obj);
-    return obj;
-}
-
-function nodebackForPromise(promise) {
-    return function(err, value) {
-        if (promise === null) return;
-
-        if (err) {
-            var wrapped = wrapAsOperationalError(maybeWrapAsError(err));
-            promise._attachExtraTrace(wrapped);
-            promise._reject(wrapped);
-        } else if (arguments.length > 2) {
-            var $_len = arguments.length;var args = new Array($_len - 1); for(var $_i = 1; $_i < $_len; ++$_i) {args[$_i - 1] = arguments[$_i];}
-            promise._fulfill(args);
-        } else {
-            promise._fulfill(value);
-        }
-
-        promise = null;
-    };
-}
-
-
-var PromiseResolver;
-if (!haveGetters) {
-    PromiseResolver = function (promise) {
-        this.promise = promise;
-        this.asCallback = nodebackForPromise(promise);
-        this.callback = this.asCallback;
-    };
-}
-else {
-    PromiseResolver = function (promise) {
-        this.promise = promise;
-    };
-}
-if (haveGetters) {
-    var prop = {
-        get: function() {
-            return nodebackForPromise(this.promise);
-        }
-    };
-    es5.defineProperty(PromiseResolver.prototype, "asCallback", prop);
-    es5.defineProperty(PromiseResolver.prototype, "callback", prop);
-}
-
-PromiseResolver._nodebackForPromise = nodebackForPromise;
-
-PromiseResolver.prototype.toString = function () {
-    return "[object PromiseResolver]";
-};
-
-PromiseResolver.prototype.resolve =
-PromiseResolver.prototype.fulfill = function (value) {
-    if (!(this instanceof PromiseResolver)) {
-        throw new TypeError("Illegal invocation, resolver resolve/reject must be called within a resolver context. Consider using the promise constructor instead.\u000a\u000a    See http://goo.gl/sdkXL9\u000a");
-    }
-    this.promise._resolveCallback(value);
-};
-
-PromiseResolver.prototype.reject = function (reason) {
-    if (!(this instanceof PromiseResolver)) {
-        throw new TypeError("Illegal invocation, resolver resolve/reject must be called within a resolver context. Consider using the promise constructor instead.\u000a\u000a    See http://goo.gl/sdkXL9\u000a");
-    }
-    this.promise._rejectCallback(reason);
-};
-
-PromiseResolver.prototype.progress = function (value) {
-    if (!(this instanceof PromiseResolver)) {
-        throw new TypeError("Illegal invocation, resolver resolve/reject must be called within a resolver context. Consider using the promise constructor instead.\u000a\u000a    See http://goo.gl/sdkXL9\u000a");
-    }
-    this.promise._progress(value);
-};
-
-PromiseResolver.prototype.cancel = function (err) {
-    this.promise.cancel(err);
-};
-
-PromiseResolver.prototype.timeout = function () {
-    this.reject(new TimeoutError("timeout"));
-};
-
-PromiseResolver.prototype.isResolved = function () {
-    return this.promise.isResolved();
-};
-
-PromiseResolver.prototype.toJSON = function () {
-    return this.promise.toJSON();
-};
-
-module.exports = PromiseResolver;
diff --git a/deps/npm/node_modules/bluebird/js/main/promisify.js b/deps/npm/node_modules/bluebird/js/main/promisify.js
deleted file mode 100644
index 1558e8cbd96e53..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/promisify.js
+++ /dev/null
@@ -1,306 +0,0 @@
-"use strict";
-module.exports = function(Promise, INTERNAL) {
-var THIS = {};
-var util = require("./util.js");
-var nodebackForPromise = require("./promise_resolver.js")
-    ._nodebackForPromise;
-var withAppended = util.withAppended;
-var maybeWrapAsError = util.maybeWrapAsError;
-var canEvaluate = util.canEvaluate;
-var TypeError = require("./errors").TypeError;
-var defaultSuffix = "Async";
-var defaultPromisified = {__isPromisified__: true};
-var noCopyProps = [
-    "arity",    "length",
-    "name",
-    "arguments",
-    "caller",
-    "callee",
-    "prototype",
-    "__isPromisified__"
-];
-var noCopyPropsPattern = new RegExp("^(?:" + noCopyProps.join("|") + ")$");
-
-var defaultFilter = function(name) {
-    return util.isIdentifier(name) &&
-        name.charAt(0) !== "_" &&
-        name !== "constructor";
-};
-
-function propsFilter(key) {
-    return !noCopyPropsPattern.test(key);
-}
-
-function isPromisified(fn) {
-    try {
-        return fn.__isPromisified__ === true;
-    }
-    catch (e) {
-        return false;
-    }
-}
-
-function hasPromisified(obj, key, suffix) {
-    var val = util.getDataPropertyOrDefault(obj, key + suffix,
-                                            defaultPromisified);
-    return val ? isPromisified(val) : false;
-}
-function checkValid(ret, suffix, suffixRegexp) {
-    for (var i = 0; i < ret.length; i += 2) {
-        var key = ret[i];
-        if (suffixRegexp.test(key)) {
-            var keyWithoutAsyncSuffix = key.replace(suffixRegexp, "");
-            for (var j = 0; j < ret.length; j += 2) {
-                if (ret[j] === keyWithoutAsyncSuffix) {
-                    throw new TypeError("Cannot promisify an API that has normal methods with '%s'-suffix\u000a\u000a    See http://goo.gl/iWrZbw\u000a"
-                        .replace("%s", suffix));
-                }
-            }
-        }
-    }
-}
-
-function promisifiableMethods(obj, suffix, suffixRegexp, filter) {
-    var keys = util.inheritedDataKeys(obj);
-    var ret = [];
-    for (var i = 0; i < keys.length; ++i) {
-        var key = keys[i];
-        var value = obj[key];
-        var passesDefaultFilter = filter === defaultFilter
-            ? true : defaultFilter(key, value, obj);
-        if (typeof value === "function" &&
-            !isPromisified(value) &&
-            !hasPromisified(obj, key, suffix) &&
-            filter(key, value, obj, passesDefaultFilter)) {
-            ret.push(key, value);
-        }
-    }
-    checkValid(ret, suffix, suffixRegexp);
-    return ret;
-}
-
-var escapeIdentRegex = function(str) {
-    return str.replace(/([$])/, "\\$");
-};
-
-var makeNodePromisifiedEval;
-if (!false) {
-var switchCaseArgumentOrder = function(likelyArgumentCount) {
-    var ret = [likelyArgumentCount];
-    var min = Math.max(0, likelyArgumentCount - 1 - 3);
-    for(var i = likelyArgumentCount - 1; i >= min; --i) {
-        ret.push(i);
-    }
-    for(var i = likelyArgumentCount + 1; i <= 3; ++i) {
-        ret.push(i);
-    }
-    return ret;
-};
-
-var argumentSequence = function(argumentCount) {
-    return util.filledRange(argumentCount, "_arg", "");
-};
-
-var parameterDeclaration = function(parameterCount) {
-    return util.filledRange(
-        Math.max(parameterCount, 3), "_arg", "");
-};
-
-var parameterCount = function(fn) {
-    if (typeof fn.length === "number") {
-        return Math.max(Math.min(fn.length, 1023 + 1), 0);
-    }
-    return 0;
-};
-
-makeNodePromisifiedEval =
-function(callback, receiver, originalName, fn) {
-    var newParameterCount = Math.max(0, parameterCount(fn) - 1);
-    var argumentOrder = switchCaseArgumentOrder(newParameterCount);
-    var shouldProxyThis = typeof callback === "string" || receiver === THIS;
-
-    function generateCallForArgumentCount(count) {
-        var args = argumentSequence(count).join(", ");
-        var comma = count > 0 ? ", " : "";
-        var ret;
-        if (shouldProxyThis) {
-            ret = "ret = callback.call(this, {{args}}, nodeback); break;\n";
-        } else {
-            ret = receiver === undefined
-                ? "ret = callback({{args}}, nodeback); break;\n"
-                : "ret = callback.call(receiver, {{args}}, nodeback); break;\n";
-        }
-        return ret.replace("{{args}}", args).replace(", ", comma);
-    }
-
-    function generateArgumentSwitchCase() {
-        var ret = "";
-        for (var i = 0; i < argumentOrder.length; ++i) {
-            ret += "case " + argumentOrder[i] +":" +
-                generateCallForArgumentCount(argumentOrder[i]);
-        }
-
-        ret += "                                                             \n\
-        default:                                                             \n\
-            var args = new Array(len + 1);                                   \n\
-            var i = 0;                                                       \n\
-            for (var i = 0; i < len; ++i) {                                  \n\
-               args[i] = arguments[i];                                       \n\
-            }                                                                \n\
-            args[i] = nodeback;                                              \n\
-            [CodeForCall]                                                    \n\
-            break;                                                           \n\
-        ".replace("[CodeForCall]", (shouldProxyThis
-                                ? "ret = callback.apply(this, args);\n"
-                                : "ret = callback.apply(receiver, args);\n"));
-        return ret;
-    }
-
-    var getFunctionCode = typeof callback === "string"
-                                ? ("this != null ? this['"+callback+"'] : fn")
-                                : "fn";
-
-    return new Function("Promise",
-                        "fn",
-                        "receiver",
-                        "withAppended",
-                        "maybeWrapAsError",
-                        "nodebackForPromise",
-                        "tryCatch",
-                        "errorObj",
-                        "notEnumerableProp",
-                        "INTERNAL","'use strict';                            \n\
-        var ret = function (Parameters) {                                    \n\
-            'use strict';                                                    \n\
-            var len = arguments.length;                                      \n\
-            var promise = new Promise(INTERNAL);                             \n\
-            promise._captureStackTrace();                                    \n\
-            var nodeback = nodebackForPromise(promise);                      \n\
-            var ret;                                                         \n\
-            var callback = tryCatch([GetFunctionCode]);                      \n\
-            switch(len) {                                                    \n\
-                [CodeForSwitchCase]                                          \n\
-            }                                                                \n\
-            if (ret === errorObj) {                                          \n\
-                promise._rejectCallback(maybeWrapAsError(ret.e), true, true);\n\
-            }                                                                \n\
-            return promise;                                                  \n\
-        };                                                                   \n\
-        notEnumerableProp(ret, '__isPromisified__', true);                   \n\
-        return ret;                                                          \n\
-        "
-        .replace("Parameters", parameterDeclaration(newParameterCount))
-        .replace("[CodeForSwitchCase]", generateArgumentSwitchCase())
-        .replace("[GetFunctionCode]", getFunctionCode))(
-            Promise,
-            fn,
-            receiver,
-            withAppended,
-            maybeWrapAsError,
-            nodebackForPromise,
-            util.tryCatch,
-            util.errorObj,
-            util.notEnumerableProp,
-            INTERNAL
-        );
-};
-}
-
-function makeNodePromisifiedClosure(callback, receiver, _, fn) {
-    var defaultThis = (function() {return this;})();
-    var method = callback;
-    if (typeof method === "string") {
-        callback = fn;
-    }
-    function promisified() {
-        var _receiver = receiver;
-        if (receiver === THIS) _receiver = this;
-        var promise = new Promise(INTERNAL);
-        promise._captureStackTrace();
-        var cb = typeof method === "string" && this !== defaultThis
-            ? this[method] : callback;
-        var fn = nodebackForPromise(promise);
-        try {
-            cb.apply(_receiver, withAppended(arguments, fn));
-        } catch(e) {
-            promise._rejectCallback(maybeWrapAsError(e), true, true);
-        }
-        return promise;
-    }
-    util.notEnumerableProp(promisified, "__isPromisified__", true);
-    return promisified;
-}
-
-var makeNodePromisified = canEvaluate
-    ? makeNodePromisifiedEval
-    : makeNodePromisifiedClosure;
-
-function promisifyAll(obj, suffix, filter, promisifier) {
-    var suffixRegexp = new RegExp(escapeIdentRegex(suffix) + "$");
-    var methods =
-        promisifiableMethods(obj, suffix, suffixRegexp, filter);
-
-    for (var i = 0, len = methods.length; i < len; i+= 2) {
-        var key = methods[i];
-        var fn = methods[i+1];
-        var promisifiedKey = key + suffix;
-        if (promisifier === makeNodePromisified) {
-            obj[promisifiedKey] =
-                makeNodePromisified(key, THIS, key, fn, suffix);
-        } else {
-            var promisified = promisifier(fn, function() {
-                return makeNodePromisified(key, THIS, key, fn, suffix);
-            });
-            util.notEnumerableProp(promisified, "__isPromisified__", true);
-            obj[promisifiedKey] = promisified;
-        }
-    }
-    util.toFastProperties(obj);
-    return obj;
-}
-
-function promisify(callback, receiver) {
-    return makeNodePromisified(callback, receiver, undefined, callback);
-}
-
-Promise.promisify = function (fn, receiver) {
-    if (typeof fn !== "function") {
-        throw new TypeError("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-    }
-    if (isPromisified(fn)) {
-        return fn;
-    }
-    var ret = promisify(fn, arguments.length < 2 ? THIS : receiver);
-    util.copyDescriptors(fn, ret, propsFilter);
-    return ret;
-};
-
-Promise.promisifyAll = function (target, options) {
-    if (typeof target !== "function" && typeof target !== "object") {
-        throw new TypeError("the target of promisifyAll must be an object or a function\u000a\u000a    See http://goo.gl/9ITlV0\u000a");
-    }
-    options = Object(options);
-    var suffix = options.suffix;
-    if (typeof suffix !== "string") suffix = defaultSuffix;
-    var filter = options.filter;
-    if (typeof filter !== "function") filter = defaultFilter;
-    var promisifier = options.promisifier;
-    if (typeof promisifier !== "function") promisifier = makeNodePromisified;
-
-    if (!util.isIdentifier(suffix)) {
-        throw new RangeError("suffix must be a valid identifier\u000a\u000a    See http://goo.gl/8FZo5V\u000a");
-    }
-
-    var keys = util.inheritedDataKeys(target);
-    for (var i = 0; i < keys.length; ++i) {
-        var value = target[keys[i]];
-        if (keys[i] !== "constructor" &&
-            util.isClass(value)) {
-            promisifyAll(value.prototype, suffix, filter, promisifier);
-            promisifyAll(value, suffix, filter, promisifier);
-        }
-    }
-
-    return promisifyAll(target, suffix, filter, promisifier);
-};
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/props.js b/deps/npm/node_modules/bluebird/js/main/props.js
deleted file mode 100644
index d6f9e64b074f28..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/props.js
+++ /dev/null
@@ -1,79 +0,0 @@
-"use strict";
-module.exports = function(
-    Promise, PromiseArray, tryConvertToPromise, apiRejection) {
-var util = require("./util.js");
-var isObject = util.isObject;
-var es5 = require("./es5.js");
-
-function PropertiesPromiseArray(obj) {
-    var keys = es5.keys(obj);
-    var len = keys.length;
-    var values = new Array(len * 2);
-    for (var i = 0; i < len; ++i) {
-        var key = keys[i];
-        values[i] = obj[key];
-        values[i + len] = key;
-    }
-    this.constructor$(values);
-}
-util.inherits(PropertiesPromiseArray, PromiseArray);
-
-PropertiesPromiseArray.prototype._init = function () {
-    this._init$(undefined, -3) ;
-};
-
-PropertiesPromiseArray.prototype._promiseFulfilled = function (value, index) {
-    this._values[index] = value;
-    var totalResolved = ++this._totalResolved;
-    if (totalResolved >= this._length) {
-        var val = {};
-        var keyOffset = this.length();
-        for (var i = 0, len = this.length(); i < len; ++i) {
-            val[this._values[i + keyOffset]] = this._values[i];
-        }
-        this._resolve(val);
-    }
-};
-
-PropertiesPromiseArray.prototype._promiseProgressed = function (value, index) {
-    this._promise._progress({
-        key: this._values[index + this.length()],
-        value: value
-    });
-};
-
-PropertiesPromiseArray.prototype.shouldCopyValues = function () {
-    return false;
-};
-
-PropertiesPromiseArray.prototype.getActualLength = function (len) {
-    return len >> 1;
-};
-
-function props(promises) {
-    var ret;
-    var castValue = tryConvertToPromise(promises);
-
-    if (!isObject(castValue)) {
-        return apiRejection("cannot await properties of a non-object\u000a\u000a    See http://goo.gl/OsFKC8\u000a");
-    } else if (castValue instanceof Promise) {
-        ret = castValue._then(
-            Promise.props, undefined, undefined, undefined, undefined);
-    } else {
-        ret = new PropertiesPromiseArray(castValue).promise();
-    }
-
-    if (castValue instanceof Promise) {
-        ret._propagateFrom(castValue, 4);
-    }
-    return ret;
-}
-
-Promise.prototype.props = function () {
-    return props(this);
-};
-
-Promise.props = function (promises) {
-    return props(promises);
-};
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/queue.js b/deps/npm/node_modules/bluebird/js/main/queue.js
deleted file mode 100644
index 84d57d5f62da4b..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/queue.js
+++ /dev/null
@@ -1,90 +0,0 @@
-"use strict";
-function arrayMove(src, srcIndex, dst, dstIndex, len) {
-    for (var j = 0; j < len; ++j) {
-        dst[j + dstIndex] = src[j + srcIndex];
-        src[j + srcIndex] = void 0;
-    }
-}
-
-function Queue(capacity) {
-    this._capacity = capacity;
-    this._length = 0;
-    this._front = 0;
-}
-
-Queue.prototype._willBeOverCapacity = function (size) {
-    return this._capacity < size;
-};
-
-Queue.prototype._pushOne = function (arg) {
-    var length = this.length();
-    this._checkCapacity(length + 1);
-    var i = (this._front + length) & (this._capacity - 1);
-    this[i] = arg;
-    this._length = length + 1;
-};
-
-Queue.prototype._unshiftOne = function(value) {
-    var capacity = this._capacity;
-    this._checkCapacity(this.length() + 1);
-    var front = this._front;
-    var i = (((( front - 1 ) &
-                    ( capacity - 1) ) ^ capacity ) - capacity );
-    this[i] = value;
-    this._front = i;
-    this._length = this.length() + 1;
-};
-
-Queue.prototype.unshift = function(fn, receiver, arg) {
-    this._unshiftOne(arg);
-    this._unshiftOne(receiver);
-    this._unshiftOne(fn);
-};
-
-Queue.prototype.push = function (fn, receiver, arg) {
-    var length = this.length() + 3;
-    if (this._willBeOverCapacity(length)) {
-        this._pushOne(fn);
-        this._pushOne(receiver);
-        this._pushOne(arg);
-        return;
-    }
-    var j = this._front + length - 3;
-    this._checkCapacity(length);
-    var wrapMask = this._capacity - 1;
-    this[(j + 0) & wrapMask] = fn;
-    this[(j + 1) & wrapMask] = receiver;
-    this[(j + 2) & wrapMask] = arg;
-    this._length = length;
-};
-
-Queue.prototype.shift = function () {
-    var front = this._front,
-        ret = this[front];
-
-    this[front] = undefined;
-    this._front = (front + 1) & (this._capacity - 1);
-    this._length--;
-    return ret;
-};
-
-Queue.prototype.length = function () {
-    return this._length;
-};
-
-Queue.prototype._checkCapacity = function (size) {
-    if (this._capacity < size) {
-        this._resizeTo(this._capacity << 1);
-    }
-};
-
-Queue.prototype._resizeTo = function (capacity) {
-    var oldCapacity = this._capacity;
-    this._capacity = capacity;
-    var front = this._front;
-    var length = this._length;
-    var moveItemsCount = (front + length) & (oldCapacity - 1);
-    arrayMove(this, 0, this, oldCapacity, moveItemsCount);
-};
-
-module.exports = Queue;
diff --git a/deps/npm/node_modules/bluebird/js/main/race.js b/deps/npm/node_modules/bluebird/js/main/race.js
deleted file mode 100644
index 30e7bb094ea664..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/race.js
+++ /dev/null
@@ -1,47 +0,0 @@
-"use strict";
-module.exports = function(
-    Promise, INTERNAL, tryConvertToPromise, apiRejection) {
-var isArray = require("./util.js").isArray;
-
-var raceLater = function (promise) {
-    return promise.then(function(array) {
-        return race(array, promise);
-    });
-};
-
-function race(promises, parent) {
-    var maybePromise = tryConvertToPromise(promises);
-
-    if (maybePromise instanceof Promise) {
-        return raceLater(maybePromise);
-    } else if (!isArray(promises)) {
-        return apiRejection("expecting an array, a promise or a thenable\u000a\u000a    See http://goo.gl/s8MMhc\u000a");
-    }
-
-    var ret = new Promise(INTERNAL);
-    if (parent !== undefined) {
-        ret._propagateFrom(parent, 4 | 1);
-    }
-    var fulfill = ret._fulfill;
-    var reject = ret._reject;
-    for (var i = 0, len = promises.length; i < len; ++i) {
-        var val = promises[i];
-
-        if (val === undefined && !(i in promises)) {
-            continue;
-        }
-
-        Promise.cast(val)._then(fulfill, reject, undefined, ret, null);
-    }
-    return ret;
-}
-
-Promise.race = function (promises) {
-    return race(promises, undefined);
-};
-
-Promise.prototype.race = function () {
-    return race(this, undefined);
-};
-
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/reduce.js b/deps/npm/node_modules/bluebird/js/main/reduce.js
deleted file mode 100644
index 1f92dafacd6856..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/reduce.js
+++ /dev/null
@@ -1,148 +0,0 @@
-"use strict";
-module.exports = function(Promise,
-                          PromiseArray,
-                          apiRejection,
-                          tryConvertToPromise,
-                          INTERNAL) {
-var getDomain = Promise._getDomain;
-var async = require("./async.js");
-var util = require("./util.js");
-var tryCatch = util.tryCatch;
-var errorObj = util.errorObj;
-function ReductionPromiseArray(promises, fn, accum, _each) {
-    this.constructor$(promises);
-    this._promise._captureStackTrace();
-    this._preservedValues = _each === INTERNAL ? [] : null;
-    this._zerothIsAccum = (accum === undefined);
-    this._gotAccum = false;
-    this._reducingIndex = (this._zerothIsAccum ? 1 : 0);
-    this._valuesPhase = undefined;
-    var maybePromise = tryConvertToPromise(accum, this._promise);
-    var rejected = false;
-    var isPromise = maybePromise instanceof Promise;
-    if (isPromise) {
-        maybePromise = maybePromise._target();
-        if (maybePromise._isPending()) {
-            maybePromise._proxyPromiseArray(this, -1);
-        } else if (maybePromise._isFulfilled()) {
-            accum = maybePromise._value();
-            this._gotAccum = true;
-        } else {
-            this._reject(maybePromise._reason());
-            rejected = true;
-        }
-    }
-    if (!(isPromise || this._zerothIsAccum)) this._gotAccum = true;
-    var domain = getDomain();
-    this._callback = domain === null ? fn : domain.bind(fn);
-    this._accum = accum;
-    if (!rejected) async.invoke(init, this, undefined);
-}
-function init() {
-    this._init$(undefined, -5);
-}
-util.inherits(ReductionPromiseArray, PromiseArray);
-
-ReductionPromiseArray.prototype._init = function () {};
-
-ReductionPromiseArray.prototype._resolveEmptyArray = function () {
-    if (this._gotAccum || this._zerothIsAccum) {
-        this._resolve(this._preservedValues !== null
-                        ? [] : this._accum);
-    }
-};
-
-ReductionPromiseArray.prototype._promiseFulfilled = function (value, index) {
-    var values = this._values;
-    values[index] = value;
-    var length = this.length();
-    var preservedValues = this._preservedValues;
-    var isEach = preservedValues !== null;
-    var gotAccum = this._gotAccum;
-    var valuesPhase = this._valuesPhase;
-    var valuesPhaseIndex;
-    if (!valuesPhase) {
-        valuesPhase = this._valuesPhase = new Array(length);
-        for (valuesPhaseIndex=0; valuesPhaseIndex<length; ++valuesPhaseIndex) {
-            valuesPhase[valuesPhaseIndex] = 0;
-        }
-    }
-    valuesPhaseIndex = valuesPhase[index];
-
-    if (index === 0 && this._zerothIsAccum) {
-        this._accum = value;
-        this._gotAccum = gotAccum = true;
-        valuesPhase[index] = ((valuesPhaseIndex === 0)
-            ? 1 : 2);
-    } else if (index === -1) {
-        this._accum = value;
-        this._gotAccum = gotAccum = true;
-    } else {
-        if (valuesPhaseIndex === 0) {
-            valuesPhase[index] = 1;
-        } else {
-            valuesPhase[index] = 2;
-            this._accum = value;
-        }
-    }
-    if (!gotAccum) return;
-
-    var callback = this._callback;
-    var receiver = this._promise._boundValue();
-    var ret;
-
-    for (var i = this._reducingIndex; i < length; ++i) {
-        valuesPhaseIndex = valuesPhase[i];
-        if (valuesPhaseIndex === 2) {
-            this._reducingIndex = i + 1;
-            continue;
-        }
-        if (valuesPhaseIndex !== 1) return;
-        value = values[i];
-        this._promise._pushContext();
-        if (isEach) {
-            preservedValues.push(value);
-            ret = tryCatch(callback).call(receiver, value, i, length);
-        }
-        else {
-            ret = tryCatch(callback)
-                .call(receiver, this._accum, value, i, length);
-        }
-        this._promise._popContext();
-
-        if (ret === errorObj) return this._reject(ret.e);
-
-        var maybePromise = tryConvertToPromise(ret, this._promise);
-        if (maybePromise instanceof Promise) {
-            maybePromise = maybePromise._target();
-            if (maybePromise._isPending()) {
-                valuesPhase[i] = 4;
-                return maybePromise._proxyPromiseArray(this, i);
-            } else if (maybePromise._isFulfilled()) {
-                ret = maybePromise._value();
-            } else {
-                return this._reject(maybePromise._reason());
-            }
-        }
-
-        this._reducingIndex = i + 1;
-        this._accum = ret;
-    }
-
-    this._resolve(isEach ? preservedValues : this._accum);
-};
-
-function reduce(promises, fn, initialValue, _each) {
-    if (typeof fn !== "function") return apiRejection("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-    var array = new ReductionPromiseArray(promises, fn, initialValue, _each);
-    return array.promise();
-}
-
-Promise.prototype.reduce = function (fn, initialValue) {
-    return reduce(this, fn, initialValue, null);
-};
-
-Promise.reduce = function (promises, fn, initialValue, _each) {
-    return reduce(promises, fn, initialValue, _each);
-};
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/schedule.js b/deps/npm/node_modules/bluebird/js/main/schedule.js
deleted file mode 100644
index bb04a8a2d4a1b0..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/schedule.js
+++ /dev/null
@@ -1,35 +0,0 @@
-"use strict";
-var schedule;
-var util = require("./util");
-var noAsyncScheduler = function() {
-    throw new Error("No async scheduler available\u000a\u000a    See http://goo.gl/m3OTXk\u000a");
-};
-if (util.isNode && typeof MutationObserver === "undefined") {
-    var GlobalSetImmediate = global.setImmediate;
-    var ProcessNextTick = process.nextTick;
-    schedule = util.isRecentNode
-                ? function(fn) { GlobalSetImmediate.call(global, fn); }
-                : function(fn) { ProcessNextTick.call(process, fn); };
-} else if ((typeof MutationObserver !== "undefined") &&
-          !(typeof window !== "undefined" &&
-            window.navigator &&
-            window.navigator.standalone)) {
-    schedule = function(fn) {
-        var div = document.createElement("div");
-        var observer = new MutationObserver(fn);
-        observer.observe(div, {attributes: true});
-        return function() { div.classList.toggle("foo"); };
-    };
-    schedule.isStatic = true;
-} else if (typeof setImmediate !== "undefined") {
-    schedule = function (fn) {
-        setImmediate(fn);
-    };
-} else if (typeof setTimeout !== "undefined") {
-    schedule = function (fn) {
-        setTimeout(fn, 0);
-    };
-} else {
-    schedule = noAsyncScheduler;
-}
-module.exports = schedule;
diff --git a/deps/npm/node_modules/bluebird/js/main/settle.js b/deps/npm/node_modules/bluebird/js/main/settle.js
deleted file mode 100644
index f9299c25898cc6..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/settle.js
+++ /dev/null
@@ -1,40 +0,0 @@
-"use strict";
-module.exports =
-    function(Promise, PromiseArray) {
-var PromiseInspection = Promise.PromiseInspection;
-var util = require("./util.js");
-
-function SettledPromiseArray(values) {
-    this.constructor$(values);
-}
-util.inherits(SettledPromiseArray, PromiseArray);
-
-SettledPromiseArray.prototype._promiseResolved = function (index, inspection) {
-    this._values[index] = inspection;
-    var totalResolved = ++this._totalResolved;
-    if (totalResolved >= this._length) {
-        this._resolve(this._values);
-    }
-};
-
-SettledPromiseArray.prototype._promiseFulfilled = function (value, index) {
-    var ret = new PromiseInspection();
-    ret._bitField = 268435456;
-    ret._settledValue = value;
-    this._promiseResolved(index, ret);
-};
-SettledPromiseArray.prototype._promiseRejected = function (reason, index) {
-    var ret = new PromiseInspection();
-    ret._bitField = 134217728;
-    ret._settledValue = reason;
-    this._promiseResolved(index, ret);
-};
-
-Promise.settle = function (promises) {
-    return new SettledPromiseArray(promises).promise();
-};
-
-Promise.prototype.settle = function () {
-    return new SettledPromiseArray(this).promise();
-};
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/some.js b/deps/npm/node_modules/bluebird/js/main/some.js
deleted file mode 100644
index f3968cf1fadc2c..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/some.js
+++ /dev/null
@@ -1,125 +0,0 @@
-"use strict";
-module.exports =
-function(Promise, PromiseArray, apiRejection) {
-var util = require("./util.js");
-var RangeError = require("./errors.js").RangeError;
-var AggregateError = require("./errors.js").AggregateError;
-var isArray = util.isArray;
-
-
-function SomePromiseArray(values) {
-    this.constructor$(values);
-    this._howMany = 0;
-    this._unwrap = false;
-    this._initialized = false;
-}
-util.inherits(SomePromiseArray, PromiseArray);
-
-SomePromiseArray.prototype._init = function () {
-    if (!this._initialized) {
-        return;
-    }
-    if (this._howMany === 0) {
-        this._resolve([]);
-        return;
-    }
-    this._init$(undefined, -5);
-    var isArrayResolved = isArray(this._values);
-    if (!this._isResolved() &&
-        isArrayResolved &&
-        this._howMany > this._canPossiblyFulfill()) {
-        this._reject(this._getRangeError(this.length()));
-    }
-};
-
-SomePromiseArray.prototype.init = function () {
-    this._initialized = true;
-    this._init();
-};
-
-SomePromiseArray.prototype.setUnwrap = function () {
-    this._unwrap = true;
-};
-
-SomePromiseArray.prototype.howMany = function () {
-    return this._howMany;
-};
-
-SomePromiseArray.prototype.setHowMany = function (count) {
-    this._howMany = count;
-};
-
-SomePromiseArray.prototype._promiseFulfilled = function (value) {
-    this._addFulfilled(value);
-    if (this._fulfilled() === this.howMany()) {
-        this._values.length = this.howMany();
-        if (this.howMany() === 1 && this._unwrap) {
-            this._resolve(this._values[0]);
-        } else {
-            this._resolve(this._values);
-        }
-    }
-
-};
-SomePromiseArray.prototype._promiseRejected = function (reason) {
-    this._addRejected(reason);
-    if (this.howMany() > this._canPossiblyFulfill()) {
-        var e = new AggregateError();
-        for (var i = this.length(); i < this._values.length; ++i) {
-            e.push(this._values[i]);
-        }
-        this._reject(e);
-    }
-};
-
-SomePromiseArray.prototype._fulfilled = function () {
-    return this._totalResolved;
-};
-
-SomePromiseArray.prototype._rejected = function () {
-    return this._values.length - this.length();
-};
-
-SomePromiseArray.prototype._addRejected = function (reason) {
-    this._values.push(reason);
-};
-
-SomePromiseArray.prototype._addFulfilled = function (value) {
-    this._values[this._totalResolved++] = value;
-};
-
-SomePromiseArray.prototype._canPossiblyFulfill = function () {
-    return this.length() - this._rejected();
-};
-
-SomePromiseArray.prototype._getRangeError = function (count) {
-    var message = "Input array must contain at least " +
-            this._howMany + " items but contains only " + count + " items";
-    return new RangeError(message);
-};
-
-SomePromiseArray.prototype._resolveEmptyArray = function () {
-    this._reject(this._getRangeError(0));
-};
-
-function some(promises, howMany) {
-    if ((howMany | 0) !== howMany || howMany < 0) {
-        return apiRejection("expecting a positive integer\u000a\u000a    See http://goo.gl/1wAmHx\u000a");
-    }
-    var ret = new SomePromiseArray(promises);
-    var promise = ret.promise();
-    ret.setHowMany(howMany);
-    ret.init();
-    return promise;
-}
-
-Promise.some = function (promises, howMany) {
-    return some(promises, howMany);
-};
-
-Promise.prototype.some = function (howMany) {
-    return some(this, howMany);
-};
-
-Promise._SomePromiseArray = SomePromiseArray;
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/synchronous_inspection.js b/deps/npm/node_modules/bluebird/js/main/synchronous_inspection.js
deleted file mode 100644
index 7aac1496d5f4f0..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/synchronous_inspection.js
+++ /dev/null
@@ -1,94 +0,0 @@
-"use strict";
-module.exports = function(Promise) {
-function PromiseInspection(promise) {
-    if (promise !== undefined) {
-        promise = promise._target();
-        this._bitField = promise._bitField;
-        this._settledValue = promise._settledValue;
-    }
-    else {
-        this._bitField = 0;
-        this._settledValue = undefined;
-    }
-}
-
-PromiseInspection.prototype.value = function () {
-    if (!this.isFulfilled()) {
-        throw new TypeError("cannot get fulfillment value of a non-fulfilled promise\u000a\u000a    See http://goo.gl/hc1DLj\u000a");
-    }
-    return this._settledValue;
-};
-
-PromiseInspection.prototype.error =
-PromiseInspection.prototype.reason = function () {
-    if (!this.isRejected()) {
-        throw new TypeError("cannot get rejection reason of a non-rejected promise\u000a\u000a    See http://goo.gl/hPuiwB\u000a");
-    }
-    return this._settledValue;
-};
-
-PromiseInspection.prototype.isFulfilled =
-Promise.prototype._isFulfilled = function () {
-    return (this._bitField & 268435456) > 0;
-};
-
-PromiseInspection.prototype.isRejected =
-Promise.prototype._isRejected = function () {
-    return (this._bitField & 134217728) > 0;
-};
-
-PromiseInspection.prototype.isPending =
-Promise.prototype._isPending = function () {
-    return (this._bitField & 402653184) === 0;
-};
-
-PromiseInspection.prototype.isResolved =
-Promise.prototype._isResolved = function () {
-    return (this._bitField & 402653184) > 0;
-};
-
-Promise.prototype.isPending = function() {
-    return this._target()._isPending();
-};
-
-Promise.prototype.isRejected = function() {
-    return this._target()._isRejected();
-};
-
-Promise.prototype.isFulfilled = function() {
-    return this._target()._isFulfilled();
-};
-
-Promise.prototype.isResolved = function() {
-    return this._target()._isResolved();
-};
-
-Promise.prototype._value = function() {
-    return this._settledValue;
-};
-
-Promise.prototype._reason = function() {
-    this._unsetRejectionIsUnhandled();
-    return this._settledValue;
-};
-
-Promise.prototype.value = function() {
-    var target = this._target();
-    if (!target.isFulfilled()) {
-        throw new TypeError("cannot get fulfillment value of a non-fulfilled promise\u000a\u000a    See http://goo.gl/hc1DLj\u000a");
-    }
-    return target._settledValue;
-};
-
-Promise.prototype.reason = function() {
-    var target = this._target();
-    if (!target.isRejected()) {
-        throw new TypeError("cannot get rejection reason of a non-rejected promise\u000a\u000a    See http://goo.gl/hPuiwB\u000a");
-    }
-    target._unsetRejectionIsUnhandled();
-    return target._settledValue;
-};
-
-
-Promise.PromiseInspection = PromiseInspection;
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/thenables.js b/deps/npm/node_modules/bluebird/js/main/thenables.js
deleted file mode 100644
index eadfffb59d76f4..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/thenables.js
+++ /dev/null
@@ -1,84 +0,0 @@
-"use strict";
-module.exports = function(Promise, INTERNAL) {
-var util = require("./util.js");
-var errorObj = util.errorObj;
-var isObject = util.isObject;
-
-function tryConvertToPromise(obj, context) {
-    if (isObject(obj)) {
-        if (obj instanceof Promise) {
-            return obj;
-        }
-        else if (isAnyBluebirdPromise(obj)) {
-            var ret = new Promise(INTERNAL);
-            obj._then(
-                ret._fulfillUnchecked,
-                ret._rejectUncheckedCheckError,
-                ret._progressUnchecked,
-                ret,
-                null
-            );
-            return ret;
-        }
-        var then = util.tryCatch(getThen)(obj);
-        if (then === errorObj) {
-            if (context) context._pushContext();
-            var ret = Promise.reject(then.e);
-            if (context) context._popContext();
-            return ret;
-        } else if (typeof then === "function") {
-            return doThenable(obj, then, context);
-        }
-    }
-    return obj;
-}
-
-function getThen(obj) {
-    return obj.then;
-}
-
-var hasProp = {}.hasOwnProperty;
-function isAnyBluebirdPromise(obj) {
-    return hasProp.call(obj, "_promise0");
-}
-
-function doThenable(x, then, context) {
-    var promise = new Promise(INTERNAL);
-    var ret = promise;
-    if (context) context._pushContext();
-    promise._captureStackTrace();
-    if (context) context._popContext();
-    var synchronous = true;
-    var result = util.tryCatch(then).call(x,
-                                        resolveFromThenable,
-                                        rejectFromThenable,
-                                        progressFromThenable);
-    synchronous = false;
-    if (promise && result === errorObj) {
-        promise._rejectCallback(result.e, true, true);
-        promise = null;
-    }
-
-    function resolveFromThenable(value) {
-        if (!promise) return;
-        promise._resolveCallback(value);
-        promise = null;
-    }
-
-    function rejectFromThenable(reason) {
-        if (!promise) return;
-        promise._rejectCallback(reason, synchronous, true);
-        promise = null;
-    }
-
-    function progressFromThenable(value) {
-        if (!promise) return;
-        if (typeof promise._progress === "function") {
-            promise._progress(value);
-        }
-    }
-    return ret;
-}
-
-return tryConvertToPromise;
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/timers.js b/deps/npm/node_modules/bluebird/js/main/timers.js
deleted file mode 100644
index ecf1b57658af5f..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/timers.js
+++ /dev/null
@@ -1,58 +0,0 @@
-"use strict";
-module.exports = function(Promise, INTERNAL) {
-var util = require("./util.js");
-var TimeoutError = Promise.TimeoutError;
-
-var afterTimeout = function (promise, message) {
-    if (!promise.isPending()) return;
-    if (typeof message !== "string") {
-        message = "operation timed out";
-    }
-    var err = new TimeoutError(message);
-    util.markAsOriginatingFromRejection(err);
-    promise._attachExtraTrace(err);
-    promise._cancel(err);
-};
-
-var afterValue = function(value) { return delay(+this).thenReturn(value); };
-var delay = Promise.delay = function (value, ms) {
-    if (ms === undefined) {
-        ms = value;
-        value = undefined;
-        var ret = new Promise(INTERNAL);
-        setTimeout(function() { ret._fulfill(); }, ms);
-        return ret;
-    }
-    ms = +ms;
-    return Promise.resolve(value)._then(afterValue, null, null, ms, undefined);
-};
-
-Promise.prototype.delay = function (ms) {
-    return delay(this, ms);
-};
-
-function successClear(value) {
-    var handle = this;
-    if (handle instanceof Number) handle = +handle;
-    clearTimeout(handle);
-    return value;
-}
-
-function failureClear(reason) {
-    var handle = this;
-    if (handle instanceof Number) handle = +handle;
-    clearTimeout(handle);
-    throw reason;
-}
-
-Promise.prototype.timeout = function (ms, message) {
-    ms = +ms;
-    var ret = this.then().cancellable();
-    ret._cancellationParent = this;
-    var handle = setTimeout(function timeoutTimeout() {
-        afterTimeout(ret, message);
-    }, ms);
-    return ret._then(successClear, failureClear, undefined, handle, undefined);
-};
-
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/using.js b/deps/npm/node_modules/bluebird/js/main/using.js
deleted file mode 100644
index 957182d093cafd..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/using.js
+++ /dev/null
@@ -1,213 +0,0 @@
-"use strict";
-module.exports = function (Promise, apiRejection, tryConvertToPromise,
-    createContext) {
-    var TypeError = require("./errors.js").TypeError;
-    var inherits = require("./util.js").inherits;
-    var PromiseInspection = Promise.PromiseInspection;
-
-    function inspectionMapper(inspections) {
-        var len = inspections.length;
-        for (var i = 0; i < len; ++i) {
-            var inspection = inspections[i];
-            if (inspection.isRejected()) {
-                return Promise.reject(inspection.error());
-            }
-            inspections[i] = inspection._settledValue;
-        }
-        return inspections;
-    }
-
-    function thrower(e) {
-        setTimeout(function(){throw e;}, 0);
-    }
-
-    function castPreservingDisposable(thenable) {
-        var maybePromise = tryConvertToPromise(thenable);
-        if (maybePromise !== thenable &&
-            typeof thenable._isDisposable === "function" &&
-            typeof thenable._getDisposer === "function" &&
-            thenable._isDisposable()) {
-            maybePromise._setDisposable(thenable._getDisposer());
-        }
-        return maybePromise;
-    }
-    function dispose(resources, inspection) {
-        var i = 0;
-        var len = resources.length;
-        var ret = Promise.defer();
-        function iterator() {
-            if (i >= len) return ret.resolve();
-            var maybePromise = castPreservingDisposable(resources[i++]);
-            if (maybePromise instanceof Promise &&
-                maybePromise._isDisposable()) {
-                try {
-                    maybePromise = tryConvertToPromise(
-                        maybePromise._getDisposer().tryDispose(inspection),
-                        resources.promise);
-                } catch (e) {
-                    return thrower(e);
-                }
-                if (maybePromise instanceof Promise) {
-                    return maybePromise._then(iterator, thrower,
-                                              null, null, null);
-                }
-            }
-            iterator();
-        }
-        iterator();
-        return ret.promise;
-    }
-
-    function disposerSuccess(value) {
-        var inspection = new PromiseInspection();
-        inspection._settledValue = value;
-        inspection._bitField = 268435456;
-        return dispose(this, inspection).thenReturn(value);
-    }
-
-    function disposerFail(reason) {
-        var inspection = new PromiseInspection();
-        inspection._settledValue = reason;
-        inspection._bitField = 134217728;
-        return dispose(this, inspection).thenThrow(reason);
-    }
-
-    function Disposer(data, promise, context) {
-        this._data = data;
-        this._promise = promise;
-        this._context = context;
-    }
-
-    Disposer.prototype.data = function () {
-        return this._data;
-    };
-
-    Disposer.prototype.promise = function () {
-        return this._promise;
-    };
-
-    Disposer.prototype.resource = function () {
-        if (this.promise().isFulfilled()) {
-            return this.promise().value();
-        }
-        return null;
-    };
-
-    Disposer.prototype.tryDispose = function(inspection) {
-        var resource = this.resource();
-        var context = this._context;
-        if (context !== undefined) context._pushContext();
-        var ret = resource !== null
-            ? this.doDispose(resource, inspection) : null;
-        if (context !== undefined) context._popContext();
-        this._promise._unsetDisposable();
-        this._data = null;
-        return ret;
-    };
-
-    Disposer.isDisposer = function (d) {
-        return (d != null &&
-                typeof d.resource === "function" &&
-                typeof d.tryDispose === "function");
-    };
-
-    function FunctionDisposer(fn, promise, context) {
-        this.constructor$(fn, promise, context);
-    }
-    inherits(FunctionDisposer, Disposer);
-
-    FunctionDisposer.prototype.doDispose = function (resource, inspection) {
-        var fn = this.data();
-        return fn.call(resource, resource, inspection);
-    };
-
-    function maybeUnwrapDisposer(value) {
-        if (Disposer.isDisposer(value)) {
-            this.resources[this.index]._setDisposable(value);
-            return value.promise();
-        }
-        return value;
-    }
-
-    Promise.using = function () {
-        var len = arguments.length;
-        if (len < 2) return apiRejection(
-                        "you must pass at least 2 arguments to Promise.using");
-        var fn = arguments[len - 1];
-        if (typeof fn !== "function") return apiRejection("fn must be a function\u000a\u000a    See http://goo.gl/916lJJ\u000a");
-
-        var input;
-        var spreadArgs = true;
-        if (len === 2 && Array.isArray(arguments[0])) {
-            input = arguments[0];
-            len = input.length;
-            spreadArgs = false;
-        } else {
-            input = arguments;
-            len--;
-        }
-        var resources = new Array(len);
-        for (var i = 0; i < len; ++i) {
-            var resource = input[i];
-            if (Disposer.isDisposer(resource)) {
-                var disposer = resource;
-                resource = resource.promise();
-                resource._setDisposable(disposer);
-            } else {
-                var maybePromise = tryConvertToPromise(resource);
-                if (maybePromise instanceof Promise) {
-                    resource =
-                        maybePromise._then(maybeUnwrapDisposer, null, null, {
-                            resources: resources,
-                            index: i
-                    }, undefined);
-                }
-            }
-            resources[i] = resource;
-        }
-
-        var promise = Promise.settle(resources)
-            .then(inspectionMapper)
-            .then(function(vals) {
-                promise._pushContext();
-                var ret;
-                try {
-                    ret = spreadArgs
-                        ? fn.apply(undefined, vals) : fn.call(undefined,  vals);
-                } finally {
-                    promise._popContext();
-                }
-                return ret;
-            })
-            ._then(
-                disposerSuccess, disposerFail, undefined, resources, undefined);
-        resources.promise = promise;
-        return promise;
-    };
-
-    Promise.prototype._setDisposable = function (disposer) {
-        this._bitField = this._bitField | 262144;
-        this._disposer = disposer;
-    };
-
-    Promise.prototype._isDisposable = function () {
-        return (this._bitField & 262144) > 0;
-    };
-
-    Promise.prototype._getDisposer = function () {
-        return this._disposer;
-    };
-
-    Promise.prototype._unsetDisposable = function () {
-        this._bitField = this._bitField & (~262144);
-        this._disposer = undefined;
-    };
-
-    Promise.prototype.disposer = function (fn) {
-        if (typeof fn === "function") {
-            return new FunctionDisposer(fn, this, createContext());
-        }
-        throw new TypeError();
-    };
-
-};
diff --git a/deps/npm/node_modules/bluebird/js/main/util.js b/deps/npm/node_modules/bluebird/js/main/util.js
deleted file mode 100644
index ea3934471ed7ef..00000000000000
--- a/deps/npm/node_modules/bluebird/js/main/util.js
+++ /dev/null
@@ -1,321 +0,0 @@
-"use strict";
-var es5 = require("./es5.js");
-var canEvaluate = typeof navigator == "undefined";
-var haveGetters = (function(){
-    try {
-        var o = {};
-        es5.defineProperty(o, "f", {
-            get: function () {
-                return 3;
-            }
-        });
-        return o.f === 3;
-    }
-    catch (e) {
-        return false;
-    }
-
-})();
-
-var errorObj = {e: {}};
-var tryCatchTarget;
-function tryCatcher() {
-    try {
-        var target = tryCatchTarget;
-        tryCatchTarget = null;
-        return target.apply(this, arguments);
-    } catch (e) {
-        errorObj.e = e;
-        return errorObj;
-    }
-}
-function tryCatch(fn) {
-    tryCatchTarget = fn;
-    return tryCatcher;
-}
-
-var inherits = function(Child, Parent) {
-    var hasProp = {}.hasOwnProperty;
-
-    function T() {
-        this.constructor = Child;
-        this.constructor$ = Parent;
-        for (var propertyName in Parent.prototype) {
-            if (hasProp.call(Parent.prototype, propertyName) &&
-                propertyName.charAt(propertyName.length-1) !== "$"
-           ) {
-                this[propertyName + "$"] = Parent.prototype[propertyName];
-            }
-        }
-    }
-    T.prototype = Parent.prototype;
-    Child.prototype = new T();
-    return Child.prototype;
-};
-
-
-function isPrimitive(val) {
-    return val == null || val === true || val === false ||
-        typeof val === "string" || typeof val === "number";
-
-}
-
-function isObject(value) {
-    return !isPrimitive(value);
-}
-
-function maybeWrapAsError(maybeError) {
-    if (!isPrimitive(maybeError)) return maybeError;
-
-    return new Error(safeToString(maybeError));
-}
-
-function withAppended(target, appendee) {
-    var len = target.length;
-    var ret = new Array(len + 1);
-    var i;
-    for (i = 0; i < len; ++i) {
-        ret[i] = target[i];
-    }
-    ret[i] = appendee;
-    return ret;
-}
-
-function getDataPropertyOrDefault(obj, key, defaultValue) {
-    if (es5.isES5) {
-        var desc = Object.getOwnPropertyDescriptor(obj, key);
-
-        if (desc != null) {
-            return desc.get == null && desc.set == null
-                    ? desc.value
-                    : defaultValue;
-        }
-    } else {
-        return {}.hasOwnProperty.call(obj, key) ? obj[key] : undefined;
-    }
-}
-
-function notEnumerableProp(obj, name, value) {
-    if (isPrimitive(obj)) return obj;
-    var descriptor = {
-        value: value,
-        configurable: true,
-        enumerable: false,
-        writable: true
-    };
-    es5.defineProperty(obj, name, descriptor);
-    return obj;
-}
-
-function thrower(r) {
-    throw r;
-}
-
-var inheritedDataKeys = (function() {
-    var excludedPrototypes = [
-        Array.prototype,
-        Object.prototype,
-        Function.prototype
-    ];
-
-    var isExcludedProto = function(val) {
-        for (var i = 0; i < excludedPrototypes.length; ++i) {
-            if (excludedPrototypes[i] === val) {
-                return true;
-            }
-        }
-        return false;
-    };
-
-    if (es5.isES5) {
-        var getKeys = Object.getOwnPropertyNames;
-        return function(obj) {
-            var ret = [];
-            var visitedKeys = Object.create(null);
-            while (obj != null && !isExcludedProto(obj)) {
-                var keys;
-                try {
-                    keys = getKeys(obj);
-                } catch (e) {
-                    return ret;
-                }
-                for (var i = 0; i < keys.length; ++i) {
-                    var key = keys[i];
-                    if (visitedKeys[key]) continue;
-                    visitedKeys[key] = true;
-                    var desc = Object.getOwnPropertyDescriptor(obj, key);
-                    if (desc != null && desc.get == null && desc.set == null) {
-                        ret.push(key);
-                    }
-                }
-                obj = es5.getPrototypeOf(obj);
-            }
-            return ret;
-        };
-    } else {
-        var hasProp = {}.hasOwnProperty;
-        return function(obj) {
-            if (isExcludedProto(obj)) return [];
-            var ret = [];
-
-            /*jshint forin:false */
-            enumeration: for (var key in obj) {
-                if (hasProp.call(obj, key)) {
-                    ret.push(key);
-                } else {
-                    for (var i = 0; i < excludedPrototypes.length; ++i) {
-                        if (hasProp.call(excludedPrototypes[i], key)) {
-                            continue enumeration;
-                        }
-                    }
-                    ret.push(key);
-                }
-            }
-            return ret;
-        };
-    }
-
-})();
-
-var thisAssignmentPattern = /this\s*\.\s*\S+\s*=/;
-function isClass(fn) {
-    try {
-        if (typeof fn === "function") {
-            var keys = es5.names(fn.prototype);
-
-            var hasMethods = es5.isES5 && keys.length > 1;
-            var hasMethodsOtherThanConstructor = keys.length > 0 &&
-                !(keys.length === 1 && keys[0] === "constructor");
-            var hasThisAssignmentAndStaticMethods =
-                thisAssignmentPattern.test(fn + "") && es5.names(fn).length > 0;
-
-            if (hasMethods || hasMethodsOtherThanConstructor ||
-                hasThisAssignmentAndStaticMethods) {
-                return true;
-            }
-        }
-        return false;
-    } catch (e) {
-        return false;
-    }
-}
-
-function toFastProperties(obj) {
-    /*jshint -W027,-W055,-W031*/
-    function f() {}
-    f.prototype = obj;
-    var l = 8;
-    while (l--) new f();
-    return obj;
-    eval(obj);
-}
-
-var rident = /^[a-z$_][a-z$_0-9]*$/i;
-function isIdentifier(str) {
-    return rident.test(str);
-}
-
-function filledRange(count, prefix, suffix) {
-    var ret = new Array(count);
-    for(var i = 0; i < count; ++i) {
-        ret[i] = prefix + i + suffix;
-    }
-    return ret;
-}
-
-function safeToString(obj) {
-    try {
-        return obj + "";
-    } catch (e) {
-        return "[no string representation]";
-    }
-}
-
-function markAsOriginatingFromRejection(e) {
-    try {
-        notEnumerableProp(e, "isOperational", true);
-    }
-    catch(ignore) {}
-}
-
-function originatesFromRejection(e) {
-    if (e == null) return false;
-    return ((e instanceof Error["__BluebirdErrorTypes__"].OperationalError) ||
-        e["isOperational"] === true);
-}
-
-function canAttachTrace(obj) {
-    return obj instanceof Error && es5.propertyIsWritable(obj, "stack");
-}
-
-var ensureErrorObject = (function() {
-    if (!("stack" in new Error())) {
-        return function(value) {
-            if (canAttachTrace(value)) return value;
-            try {throw new Error(safeToString(value));}
-            catch(err) {return err;}
-        };
-    } else {
-        return function(value) {
-            if (canAttachTrace(value)) return value;
-            return new Error(safeToString(value));
-        };
-    }
-})();
-
-function classString(obj) {
-    return {}.toString.call(obj);
-}
-
-function copyDescriptors(from, to, filter) {
-    var keys = es5.names(from);
-    for (var i = 0; i < keys.length; ++i) {
-        var key = keys[i];
-        if (filter(key)) {
-            try {
-                es5.defineProperty(to, key, es5.getDescriptor(from, key));
-            } catch (ignore) {}
-        }
-    }
-}
-
-var ret = {
-    isClass: isClass,
-    isIdentifier: isIdentifier,
-    inheritedDataKeys: inheritedDataKeys,
-    getDataPropertyOrDefault: getDataPropertyOrDefault,
-    thrower: thrower,
-    isArray: es5.isArray,
-    haveGetters: haveGetters,
-    notEnumerableProp: notEnumerableProp,
-    isPrimitive: isPrimitive,
-    isObject: isObject,
-    canEvaluate: canEvaluate,
-    errorObj: errorObj,
-    tryCatch: tryCatch,
-    inherits: inherits,
-    withAppended: withAppended,
-    maybeWrapAsError: maybeWrapAsError,
-    toFastProperties: toFastProperties,
-    filledRange: filledRange,
-    toString: safeToString,
-    canAttachTrace: canAttachTrace,
-    ensureErrorObject: ensureErrorObject,
-    originatesFromRejection: originatesFromRejection,
-    markAsOriginatingFromRejection: markAsOriginatingFromRejection,
-    classString: classString,
-    copyDescriptors: copyDescriptors,
-    hasDevTools: typeof chrome !== "undefined" && chrome &&
-                 typeof chrome.loadTimes === "function",
-    isNode: typeof process !== "undefined" &&
-        classString(process).toLowerCase() === "[object process]"
-};
-ret.isRecentNode = ret.isNode && (function() {
-    var version = process.versions.node.split(".").map(Number);
-    return (version[0] === 0 && version[1] > 10) || (version[0] > 0);
-})();
-
-if (ret.isNode) ret.toFastProperties(process);
-
-try {throw new Error(); } catch (e) {ret.lastLineError = e;}
-module.exports = ret;
diff --git a/deps/npm/node_modules/bluebird/package.json b/deps/npm/node_modules/bluebird/package.json
deleted file mode 100644
index 891665390c0c96..00000000000000
--- a/deps/npm/node_modules/bluebird/package.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-  "_args": [
-    [
-      "bluebird@^2.9.30",
-      "/Users/rebecca/code/npm/node_modules/har-validator"
-    ]
-  ],
-  "_from": "bluebird@>=2.9.30 <3.0.0",
-  "_id": "bluebird@2.10.1",
-  "_inCache": true,
-  "_location": "/bluebird",
-  "_nodeVersion": "2.3.0",
-  "_npmUser": {
-    "email": "petka_antonov@hotmail.com",
-    "name": "esailija"
-  },
-  "_npmVersion": "2.11.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "bluebird",
-    "raw": "bluebird@^2.9.30",
-    "rawSpec": "^2.9.30",
-    "scope": null,
-    "spec": ">=2.9.30 <3.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/har-validator"
-  ],
-  "_resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.1.tgz",
-  "_shasum": "3aeb31bdd92e52df50cba95303e281f94448ce06",
-  "_shrinkwrap": null,
-  "_spec": "bluebird@^2.9.30",
-  "_where": "/Users/rebecca/code/npm/node_modules/har-validator",
-  "author": {
-    "email": "petka_antonov@hotmail.com",
-    "name": "Petka Antonov",
-    "url": "http://github.com/petkaantonov/"
-  },
-  "browser": "./js/browser/bluebird.js",
-  "bugs": {
-    "url": "http://github.com/petkaantonov/bluebird/issues"
-  },
-  "dependencies": {},
-  "description": "Full featured Promises/A+ implementation with exceptionally good performance",
-  "devDependencies": {
-    "acorn": "~0.6.0",
-    "baconjs": "^0.7.43",
-    "bluebird": "^2.9.2",
-    "body-parser": "^1.10.2",
-    "browserify": "^8.1.1",
-    "cli-table": "~0.3.1",
-    "co": "^4.2.0",
-    "cross-spawn": "^0.2.3",
-    "glob": "^4.3.2",
-    "grunt-saucelabs": "~8.4.1",
-    "highland": "^2.3.0",
-    "istanbul": "^0.3.5",
-    "jshint": "^2.6.0",
-    "jshint-stylish": "~0.2.0",
-    "kefir": "^2.4.1",
-    "mkdirp": "~0.5.0",
-    "mocha": "~2.1",
-    "open": "~0.0.5",
-    "optimist": "~0.6.1",
-    "rimraf": "~2.2.6",
-    "rx": "^2.3.25",
-    "serve-static": "^1.7.1",
-    "sinon": "~1.7.3",
-    "uglify-js": "~2.4.16"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "3aeb31bdd92e52df50cba95303e281f94448ce06",
-    "tarball": "http://registry.npmjs.org/bluebird/-/bluebird-2.10.1.tgz"
-  },
-  "files": [
-    "js/browser",
-    "js/main",
-    "js/zalgo",
-    "zalgo.js"
-  ],
-  "gitHead": "41b23cce935e77b851e076928745ad4c3cebba42",
-  "homepage": "https://github.com/petkaantonov/bluebird",
-  "installable": true,
-  "keywords": [
-    "async",
-    "await",
-    "concurrency",
-    "deferred",
-    "deferreds",
-    "dsl",
-    "flow control",
-    "fluent interface",
-    "future",
-    "parallel",
-    "performance",
-    "promise",
-    "promises",
-    "promises-a",
-    "promises-aplus",
-    "thread"
-  ],
-  "license": "MIT",
-  "main": "./js/main/bluebird.js",
-  "maintainers": [
-    {
-      "name": "esailija",
-      "email": "petka_antonov@hotmail.com"
-    }
-  ],
-  "name": "bluebird",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/petkaantonov/bluebird.git"
-  },
-  "scripts": {
-    "generate-browser-core": "node tools/build.js --features=core --no-debug --main --zalgo --browser --minify && mv js/browser/bluebird.js js/browser/bluebird.core.js && mv js/browser/bluebird.min.js js/browser/bluebird.core.min.js",
-    "istanbul": "istanbul",
-    "lint": "node scripts/jshint.js",
-    "prepublish": "node tools/build.js --no-debug --main --zalgo --browser --minify",
-    "test": "node tools/test.js"
-  },
-  "version": "2.10.1"
-}
diff --git a/deps/npm/node_modules/chalk/package.json b/deps/npm/node_modules/chalk/package.json
deleted file mode 100644
index f1773ed151a2bf..00000000000000
--- a/deps/npm/node_modules/chalk/package.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-  "_args": [
-    [
-      "chalk@1.1.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "chalk@1.1.1",
-  "_id": "chalk@1.1.1",
-  "_inCache": true,
-  "_location": "/chalk",
-  "_nodeVersion": "0.12.7",
-  "_npmUser": {
-    "email": "sindresorhus@gmail.com",
-    "name": "sindresorhus"
-  },
-  "_npmVersion": "2.13.5",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "chalk",
-    "raw": "chalk@1.1.1",
-    "rawSpec": "1.1.1",
-    "scope": null,
-    "spec": "1.1.1",
-    "type": "version"
-  },
-  "_requiredBy": [
-    "/eslint",
-    "/har-validator",
-    "/inquirer",
-    "/unicode-length"
-  ],
-  "_resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
-  "_shasum": "509afb67066e7499f7eb3535c77445772ae2d019",
-  "_shrinkwrap": null,
-  "_spec": "chalk@1.1.1",
-  "_where": "/Users/rebecca/code/npm",
-  "bugs": {
-    "url": "https://github.com/chalk/chalk/issues"
-  },
-  "dependencies": {
-    "ansi-styles": "^2.1.0",
-    "escape-string-regexp": "^1.0.2",
-    "has-ansi": "^2.0.0",
-    "strip-ansi": "^3.0.0",
-    "supports-color": "^2.0.0"
-  },
-  "description": "Terminal string styling done right. Much color.",
-  "devDependencies": {
-    "coveralls": "^2.11.2",
-    "matcha": "^0.6.0",
-    "mocha": "*",
-    "nyc": "^3.0.0",
-    "require-uncached": "^1.0.2",
-    "resolve-from": "^1.0.0",
-    "semver": "^4.3.3",
-    "xo": "*"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "509afb67066e7499f7eb3535c77445772ae2d019",
-    "tarball": "http://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"
-  },
-  "engines": {
-    "node": ">=0.10.0"
-  },
-  "files": [
-    "index.js"
-  ],
-  "gitHead": "8b554e254e89c85c1fd04dcc444beeb15824e1a5",
-  "homepage": "https://github.com/chalk/chalk#readme",
-  "installable": true,
-  "keywords": [
-    "256",
-    "ansi",
-    "cli",
-    "color",
-    "colors",
-    "colour",
-    "command-line",
-    "console",
-    "formatting",
-    "log",
-    "logging",
-    "rgb",
-    "shell",
-    "str",
-    "string",
-    "style",
-    "styles",
-    "terminal",
-    "text",
-    "tty",
-    "xterm"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    },
-    {
-      "name": "jbnicolai",
-      "email": "jappelman@xebia.com"
-    },
-    {
-      "name": "unicorn",
-      "email": "sindresorhus+unicorn@gmail.com"
-    }
-  ],
-  "name": "chalk",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/chalk/chalk.git"
-  },
-  "scripts": {
-    "bench": "matcha benchmark.js",
-    "coverage": "nyc npm test && nyc report",
-    "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls",
-    "test": "xo && mocha"
-  },
-  "version": "1.1.1",
-  "xo": {
-    "envs": [
-      "mocha",
-      "node"
-    ]
-  }
-}
diff --git a/deps/npm/node_modules/chownr/package.json b/deps/npm/node_modules/chownr/package.json
index 527fe0fa3edd8c..700666e4deba20 100644
--- a/deps/npm/node_modules/chownr/package.json
+++ b/deps/npm/node_modules/chownr/package.json
@@ -1,79 +1,54 @@
 {
-  "_args": [
-    [
-      "chownr@1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "chownr@>=1.0.0 <2.0.0",
-  "_id": "chownr@1.0.1",
-  "_inCache": true,
-  "_location": "/chownr",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "3.2.2",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "chownr",
-    "raw": "chownr@1",
-    "rawSpec": "1",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
-  "_shasum": "e2a75042a9551908bebd25b8523d5f9769d79181",
-  "_shrinkwrap": null,
-  "_spec": "chownr@1",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/chownr/issues"
-  },
-  "dependencies": {},
+  "name": "chownr",
   "description": "like `chown -R`",
+  "version": "1.0.1",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/chownr.git"
+  },
+  "main": "chownr.js",
+  "files": [
+    "chownr.js"
+  ],
   "devDependencies": {
     "mkdirp": "0.3",
     "rimraf": "",
     "tap": "^1.2.0"
   },
-  "directories": {},
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "license": "ISC",
+  "gitHead": "c6c43844e80d7c7045e737a72b9fbb1ba0579a26",
+  "bugs": {
+    "url": "https://github.com/isaacs/chownr/issues"
+  },
+  "homepage": "https://github.com/isaacs/chownr#readme",
+  "_id": "chownr@1.0.1",
+  "_shasum": "e2a75042a9551908bebd25b8523d5f9769d79181",
+  "_from": "chownr@>=1.0.1 <1.1.0",
+  "_npmVersion": "3.2.2",
+  "_nodeVersion": "2.2.1",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "isaacs@npmjs.com"
+  },
   "dist": {
     "shasum": "e2a75042a9551908bebd25b8523d5f9769d79181",
     "tarball": "http://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"
   },
-  "files": [
-    "chownr.js"
-  ],
-  "gitHead": "c6c43844e80d7c7045e737a72b9fbb1ba0579a26",
-  "homepage": "https://github.com/isaacs/chownr#readme",
-  "installable": true,
-  "license": "ISC",
-  "main": "chownr.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "name": "chownr",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/chownr.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "1.0.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/clone/package.json b/deps/npm/node_modules/clone/package.json
deleted file mode 100644
index c5de8f778617d4..00000000000000
--- a/deps/npm/node_modules/clone/package.json
+++ /dev/null
@@ -1,149 +0,0 @@
-{
-  "_args": [
-    [
-      "clone@~0.1.5",
-      "/Users/rebecca/code/npm/node_modules/defaults"
-    ]
-  ],
-  "_from": "clone@>=0.1.5 <0.2.0",
-  "_id": "clone@0.1.19",
-  "_inCache": true,
-  "_location": "/clone",
-  "_npmUser": {
-    "email": "paul@vorba.ch",
-    "name": "pvorb"
-  },
-  "_npmVersion": "1.4.14",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "clone",
-    "raw": "clone@~0.1.5",
-    "rawSpec": "~0.1.5",
-    "scope": null,
-    "spec": ">=0.1.5 <0.2.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/defaults"
-  ],
-  "_resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz",
-  "_shasum": "613fb68639b26a494ac53253e15b1a6bd88ada85",
-  "_shrinkwrap": null,
-  "_spec": "clone@~0.1.5",
-  "_where": "/Users/rebecca/code/npm/node_modules/defaults",
-  "author": {
-    "email": "paul@vorba.ch",
-    "name": "Paul Vorbach",
-    "url": "http://paul.vorba.ch/"
-  },
-  "bugs": {
-    "url": "https://github.com/pvorb/node-clone/issues"
-  },
-  "contributors": [
-    {
-      "name": "Hugh Kennedy",
-      "url": "http://twitter.com/hughskennedy"
-    },
-    {
-      "name": "Blake Miner",
-      "email": "miner.blake@gmail.com",
-      "url": "http://www.blakeminer.com/"
-    },
-    {
-      "name": "George Stagas",
-      "email": "gstagas@gmail.com",
-      "url": "http://stagas.com/"
-    },
-    {
-      "name": "Tobiasz Cudnik",
-      "email": "tobiasz.cudnik@gmail.com",
-      "url": "https://github.com/TobiaszCudnik"
-    },
-    {
-      "name": "Pavel Lang",
-      "email": "langpavel@phpskelet.org",
-      "url": "https://github.com/langpavel"
-    },
-    {
-      "name": "Dan MacTough",
-      "url": "http://yabfog.com/"
-    },
-    {
-      "name": "w1nk",
-      "url": "https://github.com/w1nk"
-    },
-    {
-      "name": "Tian You",
-      "email": "axqd001@gmail.com",
-      "url": "http://blog.axqd.net/"
-    },
-    {
-      "name": "Dustin Diaz",
-      "url": "http://dustindiaz.com"
-    },
-    {
-      "name": "Ilya Shaisultanov",
-      "url": "https://github.com/diversario"
-    },
-    {
-      "name": "Nathan MacInnes",
-      "email": "nathan@macinn.es",
-      "url": "http://macinn.es/"
-    },
-    {
-      "name": "Benjamin E. Coe",
-      "email": "ben@npmjs.com",
-      "url": "https://twitter.com/benjamincoe"
-    },
-    {
-      "name": "Nathan Zadoks",
-      "url": "https://github.com/nathan7"
-    },
-    {
-      "name": "Róbert Oroszi",
-      "email": "robert+gh@oroszi.net",
-      "url": "https://github.com/oroce"
-    }
-  ],
-  "dependencies": {},
-  "description": "deep cloning of objects and arrays",
-  "devDependencies": {
-    "nodeunit": "*",
-    "underscore": "*"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "613fb68639b26a494ac53253e15b1a6bd88ada85",
-    "tarball": "http://registry.npmjs.org/clone/-/clone-0.1.19.tgz"
-  },
-  "engines": {
-    "node": "*"
-  },
-  "gitHead": "bb11a43363a0f69e8ac014cb5376ce215ea1f8fd",
-  "homepage": "https://github.com/pvorb/node-clone",
-  "license": "MIT",
-  "main": "clone.js",
-  "maintainers": [
-    {
-      "name": "pvorb",
-      "email": "paul@vorb.de"
-    }
-  ],
-  "name": "clone",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/pvorb/node-clone.git"
-  },
-  "scripts": {
-    "test": "nodeunit test.js"
-  },
-  "tags": [
-    "array",
-    "clone",
-    "date",
-    "function",
-    "object"
-  ],
-  "version": "0.1.19"
-}
diff --git a/deps/npm/node_modules/clone/test.js b/deps/npm/node_modules/clone/test.js
deleted file mode 100644
index cb3d16631ab87f..00000000000000
--- a/deps/npm/node_modules/clone/test.js
+++ /dev/null
@@ -1,289 +0,0 @@
-if(module.parent === null) {
-  console.log('Run this test file with nodeunit:');
-  console.log('$ nodeunit test.js');
-}
-
-
-var clone = require('./');
-var util = require('util');
-var _ = require('underscore');
-
-
-
-exports["clone string"] = function(test) {
-  test.expect(2); // how many tests?
-
-  var a = "foo";
-  test.strictEqual(clone(a), a);
-  a = "";
-  test.strictEqual(clone(a), a);
-
-  test.done();
-};
-
-
-
-exports["clone number"] = function(test) {
-  test.expect(5); // how many tests?
-
-  var a = 0;
-  test.strictEqual(clone(a), a);
-  a = 1;
-  test.strictEqual(clone(a), a);
-  a = -1000;
-  test.strictEqual(clone(a), a);
-  a = 3.1415927;
-  test.strictEqual(clone(a), a);
-  a = -3.1415927;
-  test.strictEqual(clone(a), a);
-
-  test.done();
-};
-
-
-
-exports["clone date"] = function(test) {
-  test.expect(3); // how many tests?
-
-  var a = new Date;
-  var c = clone(a);
-  test.ok(a instanceof Date);
-  test.ok(c instanceof Date);
-  test.equal(c.getTime(), a.getTime());
-
-  test.done();
-};
-
-
-
-exports["clone object"] = function(test) {
-  test.expect(2); // how many tests?
-
-  var a = { foo: { bar: "baz" } };
-  var b = clone(a);
-
-  test.ok(_(a).isEqual(b), "underscore equal");
-  test.deepEqual(b, a);
-
-  test.done();
-};
-
-
-
-exports["clone array"] = function(test) {
-  test.expect(2); // how many tests?
-
-  var a = [
-    { foo: "bar" },
-    "baz"
-  ];
-  var b = clone(a);
-
-  test.ok(_(a).isEqual(b), "underscore equal");
-  test.deepEqual(b, a);
-
-  test.done();
-};
-
-exports["clone buffer"] = function(test) {
-  test.expect(1);
-
-  var a = new Buffer("this is a test buffer");
-  var b = clone(a);
-
-  // no underscore equal since it has no concept of Buffers
-  test.deepEqual(b, a);
-  test.done();
-};
-
-
-
-exports["clone regexp"] = function(test) {
-  test.expect(5);
-
-  var a = /abc123/gi;
-  var b = clone(a);
-
-  test.deepEqual(b, a);
-
-  var c = /a/g;
-  test.ok(c.lastIndex === 0);
-
-  c.exec('123a456a');
-  test.ok(c.lastIndex === 4);
-
-  var d = clone(c);
-  test.ok(d.global);
-  test.ok(d.lastIndex === 4);
-
-  test.done();
-};
-
-
-exports["clone object containing array"] = function(test) {
-  test.expect(2); // how many tests?
-
-  var a = {
-    arr1: [ { a: '1234', b: '2345' } ],
-    arr2: [ { c: '345', d: '456' } ]
-  };
-  var b = clone(a);
-
-  test.ok(_(a).isEqual(b), "underscore equal");
-  test.deepEqual(b, a);
-
-  test.done();
-};
-
-
-
-exports["clone object with circular reference"] = function(test) {
-  test.expect(8); // how many tests?
-
-  var _ = test.ok;
-  var c = [1, "foo", {'hello': 'bar'}, function() {}, false, [2]];
-  var b = [c, 2, 3, 4];
-  var a = {'b': b, 'c': c};
-  a.loop = a;
-  a.loop2 = a;
-  c.loop = c;
-  c.aloop = a;
-  var aCopy = clone(a);
-  _(a != aCopy);
-  _(a.c != aCopy.c);
-  _(aCopy.c == aCopy.b[0]);
-  _(aCopy.c.loop.loop.aloop == aCopy);
-  _(aCopy.c[0] == a.c[0]);
-
-  //console.log(util.inspect(aCopy, true, null) );
-  //console.log("------------------------------------------------------------");
-  //console.log(util.inspect(a, true, null) );
-  _(eq(a, aCopy));
-  aCopy.c[0] = 2;
-  _(!eq(a, aCopy));
-  aCopy.c = "2";
-  _(!eq(a, aCopy));
-  //console.log("------------------------------------------------------------");
-  //console.log(util.inspect(aCopy, true, null) );
-
-  function eq(x, y) {
-    return util.inspect(x, true, null) === util.inspect(y, true, null);
-  }
-
-  test.done();
-};
-
-
-
-exports['clonePrototype'] = function(test) {
-  test.expect(3); // how many tests?
-
-  var a = {
-    a: "aaa",
-    x: 123,
-    y: 45.65
-  };
-  var b = clone.clonePrototype(a);
-
-  test.strictEqual(b.a, a.a);
-  test.strictEqual(b.x, a.x);
-  test.strictEqual(b.y, a.y);
-
-  test.done();
-}
-
-exports['cloneWithinNewVMContext'] = function(test) {
-  test.expect(3);
-  var vm = require('vm');
-  var ctx = vm.createContext({ clone: clone });
-  var script = "clone( {array: [1, 2, 3], date: new Date(), regex: /^foo$/ig} );";
-  var results = vm.runInContext(script, ctx);
-  test.ok(results.array instanceof Array);
-  test.ok(results.date instanceof Date);
-  test.ok(results.regex instanceof RegExp);
-  test.done();
-}
-
-exports['cloneObjectWithNoConstructor'] = function(test) {
-  test.expect(3);
-  var n = null;
-  var a = { foo: 'bar' };
-  a.__proto__ = n;
-  test.ok(typeof a === 'object');
-  test.ok(typeof a !== null);
-  var b = clone(a);
-  test.ok(a.foo, b.foo);
-  test.done();
-}
-
-exports['clone object with depth argument'] = function (test) {
-  test.expect(6);
-  var a = {
-    foo: {
-      bar : {
-        baz : 'qux'
-      }
-    }
-  };
-  var b = clone(a, false, 1);
-  test.deepEqual(b, a);
-  test.notEqual(b, a);
-  test.strictEqual(b.foo, a.foo);
-
-  b = clone(a, true, 2);
-  test.deepEqual(b, a);
-  test.notEqual(b.foo, a.foo);
-  test.strictEqual(b.foo.bar, a.foo.bar);
-  test.done();
-}
-
-exports['maintain prototype chain in clones'] = function (test) {
-  test.expect(1);
-  function Constructor() {}
-  var a = new Constructor();
-  var b = clone(a);
-  test.strictEqual(Object.getPrototypeOf(a), Object.getPrototypeOf(b));
-  test.done();
-}
-
-exports['parent prototype is overriden with prototype provided'] = function (test) {
-  test.expect(1);
-  function Constructor() {}
-  var a = new Constructor();
-  var b = clone(a, true, Infinity, null);
-  test.strictEqual(b.__defineSetter__, undefined);
-  test.done();
-}
-
-exports['clone object with null children'] = function(test) {
-  test.expect(1);
-  var a = {
-    foo: {
-      bar: null,
-      baz: {
-        qux: false
-      }
-    }
-  };
-  var b = clone(a);
-  test.deepEqual(b, a);
-  test.done();
-}
-
-exports['clone instance with getter'] = function(test) {
-  test.expect(1);
-  function Ctor() {};
-  Object.defineProperty(Ctor.prototype, 'prop', {
-    configurable: true,
-    enumerable: true,
-    get: function() {
-      return 'value';
-    }
-  });
-
-  var a = new Ctor();
-  var b = clone(a);
-
-  test.strictEqual(b.prop, 'value');
-  test.done();
-};
\ No newline at end of file
diff --git a/deps/npm/node_modules/cmd-shim/node_modules/graceful-fs/package.json b/deps/npm/node_modules/cmd-shim/node_modules/graceful-fs/package.json
index dc3ce5501994a8..3cf87fb43a6565 100644
--- a/deps/npm/node_modules/cmd-shim/node_modules/graceful-fs/package.json
+++ b/deps/npm/node_modules/cmd-shim/node_modules/graceful-fs/package.json
@@ -1,96 +1,56 @@
 {
-  "_args": [
-    [
-      "graceful-fs@>3.0.1 <4.0.0-0",
-      "/Users/isaacs/dev/npm/npm/node_modules/cmd-shim"
-    ]
-  ],
-  "_from": "graceful-fs@>3.0.1 <4.0.0-0",
-  "_id": "graceful-fs@3.0.8",
-  "_inCache": true,
-  "_location": "/cmd-shim/graceful-fs",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "2.10.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "graceful-fs",
-    "raw": "graceful-fs@>3.0.1 <4.0.0-0",
-    "rawSpec": ">3.0.1 <4.0.0-0",
-    "scope": null,
-    "spec": ">3.0.1 <4.0.0-0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/cmd-shim"
-  ],
-  "_resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz",
-  "_shasum": "ce813e725fa82f7e6147d51c9a5ca68270551c22",
-  "_shrinkwrap": null,
-  "_spec": "graceful-fs@>3.0.1 <4.0.0-0",
-  "_where": "/Users/isaacs/dev/npm/npm/node_modules/cmd-shim",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/node-graceful-fs/issues"
-  },
-  "dependencies": {},
+  "name": "graceful-fs",
   "description": "A drop-in replacement for fs, making various improvements.",
-  "devDependencies": {
-    "mkdirp": "^0.5.0",
-    "rimraf": "^2.2.8",
-    "tap": "^1.2.0"
+  "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"
   },
-  "dist": {
-    "shasum": "ce813e725fa82f7e6147d51c9a5ca68270551c22",
-    "tarball": "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
-  },
-  "engines": {
-    "node": ">=0.4.0"
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "gitHead": "45c57aa5e323c35a985a525de6f0c9a6ef59e1f8",
-  "homepage": "https://github.com/isaacs/node-graceful-fs#readme",
   "keywords": [
-    "EACCESS",
-    "EAGAIN",
-    "EINVAL",
-    "EMFILE",
-    "EPERM",
-    "error",
-    "errors",
     "fs",
-    "handling",
     "module",
-    "queue",
     "reading",
+    "retry",
     "retries",
-    "retry"
+    "queue",
+    "error",
+    "errors",
+    "handling",
+    "EMFILE",
+    "EAGAIN",
+    "EINVAL",
+    "EPERM",
+    "EACCESS"
   ],
   "license": "ISC",
-  "main": "graceful-fs.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "name": "graceful-fs",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/node-graceful-fs.git"
+  "devDependencies": {
+    "mkdirp": "^0.5.0",
+    "rimraf": "^2.2.8",
+    "tap": "^1.2.0"
   },
-  "scripts": {
-    "test": "tap test/*.js"
+  "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"
   },
-  "version": "3.0.8"
+  "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/deps/npm/node_modules/cmd-shim/package.json b/deps/npm/node_modules/cmd-shim/package.json
index 47058a16f12ccf..3833cf976c4b9c 100644
--- a/deps/npm/node_modules/cmd-shim/package.json
+++ b/deps/npm/node_modules/cmd-shim/package.json
@@ -1,70 +1,46 @@
 {
-  "_args": [
-    [
-      "cmd-shim@~2.0.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "cmd-shim@>=2.0.1 <2.1.0",
-  "_id": "cmd-shim@2.0.1",
-  "_inCache": true,
-  "_location": "/cmd-shim",
-  "_npmUser": {
-    "email": "forbes@lindesay.co.uk",
-    "name": "forbeslindesay"
-  },
-  "_npmVersion": "1.5.0-alpha-4",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "cmd-shim",
-    "raw": "cmd-shim@~2.0.1",
-    "rawSpec": "~2.0.1",
-    "scope": null,
-    "spec": ">=2.0.1 <2.1.0",
-    "type": "range"
+  "name": "cmd-shim",
+  "version": "2.0.1",
+  "description": "Used in npm for command line application support",
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz",
-  "_shasum": "4512a373d2391679aec51ad1d4733559e9b85d4a",
-  "_shrinkwrap": null,
-  "_spec": "cmd-shim@~2.0.1",
-  "_where": "/Users/rebecca/code/npm",
-  "bugs": {
-    "url": "https://github.com/ForbesLindesay/cmd-shim/issues"
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ForbesLindesay/cmd-shim.git"
   },
+  "license": "BSD",
   "dependencies": {
     "graceful-fs": ">3.0.1 <4.0.0-0",
     "mkdirp": "~0.5.0"
   },
-  "description": "Used in npm for command line application support",
   "devDependencies": {
-    "rimraf": "~2.2.8",
-    "tap": "~0.4.11"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "4512a373d2391679aec51ad1d4733559e9b85d4a",
-    "tarball": "http://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz"
+    "tap": "~0.4.11",
+    "rimraf": "~2.2.8"
   },
   "gitHead": "6f53d506be590fe9ac20c9801512cd1a3aad5974",
+  "bugs": {
+    "url": "https://github.com/ForbesLindesay/cmd-shim/issues"
+  },
   "homepage": "https://github.com/ForbesLindesay/cmd-shim",
-  "license": "BSD",
+  "_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"
+  },
   "maintainers": [
     {
       "name": "forbeslindesay",
       "email": "forbes@lindesay.co.uk"
     }
   ],
-  "name": "cmd-shim",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ForbesLindesay/cmd-shim.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "dist": {
+    "shasum": "4512a373d2391679aec51ad1d4733559e9b85d4a",
+    "tarball": "http://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz"
   },
-  "version": "2.0.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz"
 }
diff --git a/deps/npm/node_modules/ansi/.npmignore b/deps/npm/node_modules/columnify/node_modules/wcwidth/.npmignore
similarity index 100%
rename from deps/npm/node_modules/ansi/.npmignore
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/.npmignore
diff --git a/deps/npm/node_modules/wcwidth/LICENSE b/deps/npm/node_modules/columnify/node_modules/wcwidth/LICENSE
similarity index 100%
rename from deps/npm/node_modules/wcwidth/LICENSE
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/LICENSE
diff --git a/deps/npm/node_modules/wcwidth/Readme.md b/deps/npm/node_modules/columnify/node_modules/wcwidth/Readme.md
similarity index 100%
rename from deps/npm/node_modules/wcwidth/Readme.md
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/Readme.md
diff --git a/deps/npm/node_modules/wcwidth/combining.js b/deps/npm/node_modules/columnify/node_modules/wcwidth/combining.js
similarity index 100%
rename from deps/npm/node_modules/wcwidth/combining.js
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/combining.js
diff --git a/deps/npm/node_modules/wcwidth/docs/index.md b/deps/npm/node_modules/columnify/node_modules/wcwidth/docs/index.md
similarity index 100%
rename from deps/npm/node_modules/wcwidth/docs/index.md
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/docs/index.md
diff --git a/deps/npm/node_modules/wcwidth/index.js b/deps/npm/node_modules/columnify/node_modules/wcwidth/index.js
similarity index 100%
rename from deps/npm/node_modules/wcwidth/index.js
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/index.js
diff --git a/deps/npm/node_modules/array-index/.npmignore b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/.npmignore
similarity index 100%
rename from deps/npm/node_modules/array-index/.npmignore
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/.npmignore
diff --git a/deps/npm/node_modules/defaults/LICENSE b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/LICENSE
similarity index 100%
rename from deps/npm/node_modules/defaults/LICENSE
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/LICENSE
diff --git a/deps/npm/node_modules/defaults/README.md b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/README.md
similarity index 100%
rename from deps/npm/node_modules/defaults/README.md
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/README.md
diff --git a/deps/npm/node_modules/defaults/index.js b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/index.js
similarity index 100%
rename from deps/npm/node_modules/defaults/index.js
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/index.js
diff --git a/deps/npm/node_modules/clone/.npmignore b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/.npmignore
similarity index 100%
rename from deps/npm/node_modules/clone/.npmignore
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/.npmignore
diff --git a/deps/npm/node_modules/clone/.travis.yml b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/.travis.yml
similarity index 69%
rename from deps/npm/node_modules/clone/.travis.yml
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/.travis.yml
index 58f23716aefb94..20fd86b6a5bee3 100644
--- a/deps/npm/node_modules/clone/.travis.yml
+++ b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/.travis.yml
@@ -1,5 +1,3 @@
 language: node_js
 node_js:
-  - 0.6
-  - 0.8
   - 0.10
diff --git a/deps/npm/node_modules/clone/LICENSE b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/LICENSE
similarity index 95%
rename from deps/npm/node_modules/clone/LICENSE
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/LICENSE
index fc808cce89d4a4..cc3c87bc3bfd85 100644
--- a/deps/npm/node_modules/clone/LICENSE
+++ b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/LICENSE
@@ -1,4 +1,4 @@
-Copyright © 2011-2014 Paul Vorbach <paul@vorba.ch>
+Copyright © 2011-2015 Paul Vorbach <paul@vorba.ch>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the “Software”), to deal in
diff --git a/deps/npm/node_modules/clone/README.md b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/README.md
similarity index 90%
rename from deps/npm/node_modules/clone/README.md
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/README.md
index d7231cfca7daa7..0b6cecae29b52d 100644
--- a/deps/npm/node_modules/clone/README.md
+++ b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/README.md
@@ -2,16 +2,16 @@
 
 [![build status](https://secure.travis-ci.org/pvorb/node-clone.png)](http://travis-ci.org/pvorb/node-clone)
 
-offers foolproof _deep cloning_ of variables in JavaScript.
+[![info badge](https://nodei.co/npm/clone.png?downloads=true&downloadRank=true&stars=true)](http://npm-stat.com/charts.html?package=clone)
+
+offers foolproof _deep cloning_ of objects, arrays, numbers, strings etc. in JavaScript.
 
 
 ## Installation
 
     npm install clone
 
-or
-
-    ender build clone
+(It also works with browserify, ender or standalone.)
 
 
 ## Example
@@ -105,7 +105,7 @@ github](https://github.com/pvorb/node-clone/issues) or send me an email to
 
 ## License
 
-Copyright © 2011-2014 [Paul Vorbach](http://paul.vorba.ch/) and
+Copyright © 2011-2015 [Paul Vorbach](http://paul.vorba.ch/) and
 [contributors](https://github.com/pvorb/node-clone/graphs/contributors).
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/deps/npm/node_modules/clone/clone.js b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/clone.js
similarity index 71%
rename from deps/npm/node_modules/clone/clone.js
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/clone.js
index 321ffa30f5e2ab..6263759203bd5d 100644
--- a/deps/npm/node_modules/clone/clone.js
+++ b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/clone.js
@@ -1,34 +1,6 @@
+var clone = (function() {
 'use strict';
 
-function objectToString(o) {
-  return Object.prototype.toString.call(o);
-}
-
-// shim for Node's 'util' package
-// DO NOT REMOVE THIS! It is required for compatibility with EnderJS (http://enderjs.com/).
-var util = {
-  isArray: function (ar) {
-    return Array.isArray(ar) || (typeof ar === 'object' && objectToString(ar) === '[object Array]');
-  },
-  isDate: function (d) {
-    return typeof d === 'object' && objectToString(d) === '[object Date]';
-  },
-  isRegExp: function (re) {
-    return typeof re === 'object' && objectToString(re) === '[object RegExp]';
-  },
-  getRegExpFlags: function (re) {
-    var flags = '';
-    re.global && (flags += 'g');
-    re.ignoreCase && (flags += 'i');
-    re.multiline && (flags += 'm');
-    return flags;
-  }
-};
-
-
-if (typeof module === 'object')
-  module.exports = clone;
-
 /**
  * Clones (copies) an Object using deep copying.
  *
@@ -47,8 +19,14 @@ if (typeof module === 'object')
  * @param `prototype` - sets the prototype to be used when cloning an object.
  *    (optional - defaults to parent prototype).
 */
-
 function clone(parent, circular, depth, prototype) {
+  var filter;
+  if (typeof circular === 'object') {
+    depth = circular.depth;
+    prototype = circular.prototype;
+    filter = circular.filter;
+    circular = circular.circular
+  }
   // maintain two arrays for circular references, where corresponding parents
   // and children have the same index
   var allParents = [];
@@ -77,12 +55,12 @@ function clone(parent, circular, depth, prototype) {
       return parent;
     }
 
-    if (util.isArray(parent)) {
+    if (clone.__isArray(parent)) {
       child = [];
-    } else if (util.isRegExp(parent)) {
-      child = new RegExp(parent.source, util.getRegExpFlags(parent));
+    } else if (clone.__isRegExp(parent)) {
+      child = new RegExp(parent.source, __getRegExpFlags(parent));
       if (parent.lastIndex) child.lastIndex = parent.lastIndex;
-    } else if (util.isDate(parent)) {
+    } else if (clone.__isDate(parent)) {
       child = new Date(parent.getTime());
     } else if (useBuffer && Buffer.isBuffer(parent)) {
       child = new Buffer(parent.length);
@@ -134,7 +112,7 @@ function clone(parent, circular, depth, prototype) {
  * USE WITH CAUTION! This may not behave as you wish if you do not know how this
  * works.
  */
-clone.clonePrototype = function(parent) {
+clone.clonePrototype = function clonePrototype(parent) {
   if (parent === null)
     return null;
 
@@ -142,3 +120,41 @@ clone.clonePrototype = function(parent) {
   c.prototype = parent;
   return new c();
 };
+
+// private utility functions
+
+function __objToStr(o) {
+  return Object.prototype.toString.call(o);
+};
+clone.__objToStr = __objToStr;
+
+function __isDate(o) {
+  return typeof o === 'object' && __objToStr(o) === '[object Date]';
+};
+clone.__isDate = __isDate;
+
+function __isArray(o) {
+  return typeof o === 'object' && __objToStr(o) === '[object Array]';
+};
+clone.__isArray = __isArray;
+
+function __isRegExp(o) {
+  return typeof o === 'object' && __objToStr(o) === '[object RegExp]';
+};
+clone.__isRegExp = __isRegExp;
+
+function __getRegExpFlags(re) {
+  var flags = '';
+  if (re.global) flags += 'g';
+  if (re.ignoreCase) flags += 'i';
+  if (re.multiline) flags += 'm';
+  return flags;
+};
+clone.__getRegExpFlags = __getRegExpFlags;
+
+return clone;
+})();
+
+if (typeof module === 'object' && module.exports) {
+  module.exports = clone;
+}
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/package.json b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/package.json
new file mode 100644
index 00000000000000..d401747f6d5b33
--- /dev/null
+++ b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/package.json
@@ -0,0 +1,118 @@
+{
+  "name": "clone",
+  "description": "deep cloning of objects and arrays",
+  "tags": [
+    "clone",
+    "object",
+    "array",
+    "function",
+    "date"
+  ],
+  "version": "1.0.2",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/pvorb/node-clone.git"
+  },
+  "bugs": {
+    "url": "https://github.com/pvorb/node-clone/issues"
+  },
+  "main": "clone.js",
+  "author": {
+    "name": "Paul Vorbach",
+    "email": "paul@vorba.ch",
+    "url": "http://paul.vorba.ch/"
+  },
+  "contributors": [
+    {
+      "name": "Blake Miner",
+      "email": "miner.blake@gmail.com",
+      "url": "http://www.blakeminer.com/"
+    },
+    {
+      "name": "Tian You",
+      "email": "axqd001@gmail.com",
+      "url": "http://blog.axqd.net/"
+    },
+    {
+      "name": "George Stagas",
+      "email": "gstagas@gmail.com",
+      "url": "http://stagas.com/"
+    },
+    {
+      "name": "Tobiasz Cudnik",
+      "email": "tobiasz.cudnik@gmail.com",
+      "url": "https://github.com/TobiaszCudnik"
+    },
+    {
+      "name": "Pavel Lang",
+      "email": "langpavel@phpskelet.org",
+      "url": "https://github.com/langpavel"
+    },
+    {
+      "name": "Dan MacTough",
+      "url": "http://yabfog.com/"
+    },
+    {
+      "name": "w1nk",
+      "url": "https://github.com/w1nk"
+    },
+    {
+      "name": "Hugh Kennedy",
+      "url": "http://twitter.com/hughskennedy"
+    },
+    {
+      "name": "Dustin Diaz",
+      "url": "http://dustindiaz.com"
+    },
+    {
+      "name": "Ilya Shaisultanov",
+      "url": "https://github.com/diversario"
+    },
+    {
+      "name": "Nathan MacInnes",
+      "email": "nathan@macinn.es",
+      "url": "http://macinn.es/"
+    },
+    {
+      "name": "Benjamin E. Coe",
+      "email": "ben@npmjs.com",
+      "url": "https://twitter.com/benjamincoe"
+    },
+    {
+      "name": "Nathan Zadoks",
+      "url": "https://github.com/nathan7"
+    },
+    {
+      "name": "Róbert Oroszi",
+      "email": "robert+gh@oroszi.net",
+      "url": "https://github.com/oroce"
+    },
+    {
+      "name": "Aurélio A. Heckert",
+      "url": "http://softwarelivre.org/aurium"
+    },
+    {
+      "name": "Guy Ellis",
+      "url": "http://www.guyellisrocks.com/"
+    }
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">=0.8"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "nodeunit": "~0.9.0"
+  },
+  "optionalDependencies": {},
+  "scripts": {
+    "test": "nodeunit test.js"
+  },
+  "readme": "# clone\n\n[![build status](https://secure.travis-ci.org/pvorb/node-clone.png)](http://travis-ci.org/pvorb/node-clone)\n\n[![info badge](https://nodei.co/npm/clone.png?downloads=true&downloadRank=true&stars=true)](http://npm-stat.com/charts.html?package=clone)\n\noffers foolproof _deep cloning_ of objects, arrays, numbers, strings etc. in JavaScript.\n\n\n## Installation\n\n    npm install clone\n\n(It also works with browserify, ender or standalone.)\n\n\n## Example\n\n~~~ javascript\nvar clone = require('clone');\n\nvar a, b;\n\na = { foo: { bar: 'baz' } };  // initial value of a\n\nb = clone(a);                 // clone a -> b\na.foo.bar = 'foo';            // change a\n\nconsole.log(a);               // show a\nconsole.log(b);               // show b\n~~~\n\nThis will print:\n\n~~~ javascript\n{ foo: { bar: 'foo' } }\n{ foo: { bar: 'baz' } }\n~~~\n\n**clone** masters cloning simple objects (even with custom prototype), arrays,\nDate objects, and RegExp objects. Everything is cloned recursively, so that you\ncan clone dates in arrays in objects, for example.\n\n\n## API\n\n`clone(val, circular, depth)`\n\n  * `val` -- the value that you want to clone, any type allowed\n  * `circular` -- boolean\n\n    Call `clone` with `circular` set to `false` if you are certain that `obj`\n    contains no circular references. This will give better performance if needed.\n    There is no error if `undefined` or `null` is passed as `obj`.\n  * `depth` -- depth to which the object is to be cloned (optional,\n    defaults to infinity)\n\n`clone.clonePrototype(obj)`\n\n  * `obj` -- the object that you want to clone\n\nDoes a prototype clone as\n[described by Oran Looney](http://oranlooney.com/functional-javascript/).\n\n\n## Circular References\n\n~~~ javascript\nvar a, b;\n\na = { hello: 'world' };\n\na.myself = a;\nb = clone(a);\n\nconsole.log(b);\n~~~\n\nThis will print:\n\n~~~ javascript\n{ hello: \"world\", myself: [Circular] }\n~~~\n\nSo, `b.myself` points to `b`, not `a`. Neat!\n\n\n## Test\n\n    npm test\n\n\n## Caveat\n\nSome special objects like a socket or `process.stdout`/`stderr` are known to not\nbe cloneable. If you find other objects that cannot be cloned, please [open an\nissue](https://github.com/pvorb/node-clone/issues/new).\n\n\n## Bugs and Issues\n\nIf you encounter any bugs or issues, feel free to [open an issue at\ngithub](https://github.com/pvorb/node-clone/issues) or send me an email to\n<paul@vorba.ch>. I also always like to hear from you, if you’re using my code.\n\n## License\n\nCopyright © 2011-2015 [Paul Vorbach](http://paul.vorba.ch/) and\n[contributors](https://github.com/pvorb/node-clone/graphs/contributors).\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the “Software”), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of\nthe Software, and to permit persons to whom the Software is furnished to do so,\nsubject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\nFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\nCOPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\nIN AN ACTION OF CONTRACT, TORT OR OTHERWISE, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n",
+  "readmeFilename": "README.md",
+  "homepage": "https://github.com/pvorb/node-clone#readme",
+  "_id": "clone@1.0.2",
+  "_shasum": "260b7a99ebb1edfe247538175f783243cb19d149",
+  "_resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+  "_from": "clone@>=1.0.2 <2.0.0"
+}
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/test-apart-ctx.html b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/test-apart-ctx.html
new file mode 100644
index 00000000000000..4d532bb7175192
--- /dev/null
+++ b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/test-apart-ctx.html
@@ -0,0 +1,22 @@
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Clone Test-Suite (Browser)</title>
+  </head>
+  <body>
+    <script>
+      var data = document.location.search.substr(1).split('&');
+      try {
+        ctx = parent[data[0]];
+        eval(decodeURIComponent(data[1]));
+        window.results = results;
+      } catch(e) {
+        var extra = '';
+        if (e.name == 'SecurityError')
+          extra = 'This test suite needs to be run on an http server.';
+        alert('Apart Context iFrame Error\n' + e + '\n\n' + extra);
+        throw e;
+      }
+    </script>
+  </body>
+</html>
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/test.html b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/test.html
new file mode 100644
index 00000000000000..a955702516dfb3
--- /dev/null
+++ b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/test.html
@@ -0,0 +1,148 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Clone Test-Suite (Browser)</title>
+    <script>
+      var module = {};
+      var tests = exports = module.exports = {};
+
+      function require(moduleName) {
+        if (moduleName == './') {
+          return clone;
+        }
+      }
+
+      function log(str) {
+        logList.innerHTML += '<li>' + str + '</li>';
+      }
+    </script>
+    <script src="clone.js"></script>
+    <script src="test.js"></script>
+  </head>
+  <body>
+    <h1 id="nodeunit-header">Clone Test-Suite (Browser)</h1>
+    Tests started: <span id="testsStarted"></span>;
+    Tests finished: <span id="testsFinished"></span>.
+    <ul id="logList"></ul>
+    <script>
+      /* Methods copied from
+       * https://github.com/caolan/nodeunit/blob/master/lib/assert.js
+       */
+      function isUndefinedOrNull(value) {
+        return value === null || value === undefined;
+      }
+
+      function isArguments(object) {
+        return Object.prototype.toString.call(object) == '[object Arguments]';
+      }
+
+      var _keys = function (obj){
+        if (Object.keys) return Object.keys(obj);
+        if (typeof obj != 'object' && typeof obj != 'function') {
+          throw new TypeError('-');
+        }
+        var keys = [];
+        for(var k in obj) if(obj.hasOwnProperty(k)) keys.push(k);
+        return keys;
+      };
+
+      function objEquiv(a, b) {
+        if (isUndefinedOrNull(a) || isUndefinedOrNull(b))
+          return false;
+
+        if (a.prototype !== b.prototype)
+          return false;
+
+        if (isArguments(a)) {
+          if (!isArguments(b)) return false;
+          a = pSlice.call(a);
+          b = pSlice.call(b);
+          return _deepEqual(a, b);
+        }
+
+        try {
+          var ka = _keys(a), kb = _keys(b), key, i;
+        } catch (e) {
+          return false
+        }
+
+        if (ka.length != kb.length)
+          return false;
+
+        ka.sort();
+        kb.sort();
+
+        for (i = ka.length - 1; i >= 0; i--) {
+          if (ka[i] != kb[i]) return false;
+        }
+
+        for (i = ka.length - 1; i >= 0; i--) {
+          key = ka[i];
+          if (!_deepEqual(a[key], b[key] ))
+            return false;
+        }
+
+        return true;
+      }
+      function _deepEqual(actual, expected) {
+        if (actual === expected) {
+          return true;
+        } else if (actual instanceof Date && expected instanceof Date) {
+          return actual.getTime() === expected.getTime();
+        } else if (actual instanceof RegExp && expected instanceof RegExp) {
+          return actual.source === expected.source &&
+              actual.global === expected.global &&
+              actual.ignoreCase === expected.ignoreCase &&
+              actual.multiline === expected.multiline;
+        } else if (typeof actual != 'object' && typeof expected != 'object') {
+          return actual == expected;
+        } else {
+          return objEquiv(actual, expected);
+        }
+      }
+
+      for (var testName in tests) {
+        setTimeout((function (testName) {
+          try {
+            testsStarted.innerHTML = (parseInt(testsStarted.innerHTML) || 0) + 1;
+            function incFinished() {
+              testsFinished.innerHTML = (parseInt(testsFinished.innerHTML) || 0) + 1;
+            }
+
+            tests[testName]({
+              expect: function (num) {
+                this._expect = num
+              },
+              ok: function (val) {
+                if(!val) throw new Error(val + ' is not ok.')
+              },
+              equal: function (a,b) {
+                if (a != b) throw new Error(a + ' is not equal to ' + b)
+              },
+              notEqual: function (a,b) {
+                if (a == b) throw new Error(a + ' is equal to ' + b)
+              },
+              strictEqual: function (a,b) {
+                if (a !== b) throw new Error(a + ' is not strict equal to ' + b)
+              },
+              deepEqual: function (a,b) {
+                if (!_deepEqual(a,b))
+                  throw new Error(JSON.stringify(a) + ' is not deep equal to ' +
+                                  JSON.stringify(b))
+              },
+              done: function () {
+                log(testName + ' <span style="color:blue">is ok</span>.');
+                incFinished();
+              }
+            });
+          } catch(e) {
+            log(testName + ' <span style="color:red">FAIL.</span> <small>'+ e +'</small>');
+            incFinished();
+            console.log(e);
+          }
+        })(testName), 1);
+      }
+    </script>
+  </body>
+</html>
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/test.js b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/test.js
new file mode 100644
index 00000000000000..e8b65b3fed93c5
--- /dev/null
+++ b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/node_modules/clone/test.js
@@ -0,0 +1,372 @@
+var clone = require('./');
+
+function inspect(obj) {
+  seen = [];
+  return JSON.stringify(obj, function (key, val) {
+    if (val != null && typeof val == "object") {
+      if (seen.indexOf(val) >= 0) {
+        return '[cyclic]';
+      }
+
+      seen.push(val);
+    }
+
+    return val;
+  });
+}
+
+// Creates a new VM in node, or an iframe in a browser in order to run the
+// script
+function apartContext(context, script, callback) {
+  var vm = require('vm');
+
+  if (vm) {
+    var ctx = vm.createContext({ ctx: context });
+    callback(vm.runInContext(script, ctx));
+  } else if (document && document.createElement) {
+    var iframe = document.createElement('iframe');
+    iframe.style.display = 'none';
+    document.body.appendChild(iframe);
+
+    var myCtxId = 'tmpCtx' + Math.random();
+
+    window[myCtxId] = context;
+    iframe.src = 'test-apart-ctx.html?' + myCtxId + '&' + encodeURIComponent(script);
+    iframe.onload = function() {
+      try {
+        callback(iframe.contentWindow.results);
+      } catch (e) {
+        throw e;
+      }
+    };
+  } else {
+    console.log('WARNING: cannot create an apart context.');
+  }
+}
+
+exports["clone string"] = function (test) {
+  test.expect(2); // how many tests?
+
+  var a = "foo";
+  test.strictEqual(clone(a), a);
+  a = "";
+  test.strictEqual(clone(a), a);
+
+  test.done();
+};
+
+exports["clone number"] = function (test) {
+  test.expect(5); // how many tests?
+
+  var a = 0;
+  test.strictEqual(clone(a), a);
+  a = 1;
+  test.strictEqual(clone(a), a);
+  a = -1000;
+  test.strictEqual(clone(a), a);
+  a = 3.1415927;
+  test.strictEqual(clone(a), a);
+  a = -3.1415927;
+  test.strictEqual(clone(a), a);
+
+  test.done();
+};
+
+exports["clone date"] = function (test) {
+  test.expect(3); // how many tests?
+
+  var a = new Date;
+  var c = clone(a);
+  test.ok(!!a.getUTCDate && !!a.toUTCString);
+  test.ok(!!c.getUTCDate && !!c.toUTCString);
+  test.equal(a.getTime(), c.getTime());
+
+  test.done();
+};
+
+exports["clone object"] = function (test) {
+  test.expect(1); // how many tests?
+
+  var a = { foo: { bar: "baz" } };
+  var b = clone(a);
+
+  test.deepEqual(b, a);
+
+  test.done();
+};
+
+exports["clone array"] = function (test) {
+  test.expect(2); // how many tests?
+
+  var a = [
+    { foo: "bar" },
+    "baz"
+  ];
+  var b = clone(a);
+
+  test.ok(b instanceof Array);
+  test.deepEqual(b, a);
+
+  test.done();
+};
+
+exports["clone buffer"] = function (test) {
+  if (typeof Buffer == 'undefined') {
+    return test.done();
+  }
+
+  test.expect(1);
+
+  var a = new Buffer("this is a test buffer");
+  var b = clone(a);
+
+  // no underscore equal since it has no concept of Buffers
+  test.deepEqual(b, a);
+  test.done();
+};
+
+exports["clone regexp"] = function (test) {
+  test.expect(5);
+
+  var a = /abc123/gi;
+  var b = clone(a);
+  test.deepEqual(b, a);
+
+  var c = /a/g;
+  test.ok(c.lastIndex === 0);
+
+  c.exec('123a456a');
+  test.ok(c.lastIndex === 4);
+
+  var d = clone(c);
+  test.ok(d.global);
+  test.ok(d.lastIndex === 4);
+
+  test.done();
+};
+
+exports["clone object containing array"] = function (test) {
+  test.expect(1); // how many tests?
+
+  var a = {
+    arr1: [ { a: '1234', b: '2345' } ],
+    arr2: [ { c: '345', d: '456' } ]
+  };
+
+  var b = clone(a);
+
+  test.deepEqual(b, a);
+
+  test.done();
+};
+
+exports["clone object with circular reference"] = function (test) {
+  test.expect(8); // how many tests?
+
+  var c = [1, "foo", {'hello': 'bar'}, function () {}, false, [2]];
+  var b = [c, 2, 3, 4];
+
+  var a = {'b': b, 'c': c};
+  a.loop = a;
+  a.loop2 = a;
+  c.loop = c;
+  c.aloop = a;
+
+  var aCopy = clone(a);
+  test.ok(a != aCopy);
+  test.ok(a.c != aCopy.c);
+  test.ok(aCopy.c == aCopy.b[0]);
+  test.ok(aCopy.c.loop.loop.aloop == aCopy);
+  test.ok(aCopy.c[0] == a.c[0]);
+
+  test.ok(eq(a, aCopy));
+  aCopy.c[0] = 2;
+  test.ok(!eq(a, aCopy));
+  aCopy.c = "2";
+  test.ok(!eq(a, aCopy));
+
+  function eq(x, y) {
+    return inspect(x) === inspect(y);
+  }
+
+  test.done();
+};
+
+exports['clone prototype'] = function (test) {
+  test.expect(3); // how many tests?
+
+  var a = {
+    a: "aaa",
+    x: 123,
+    y: 45.65
+  };
+  var b = clone.clonePrototype(a);
+
+  test.strictEqual(b.a, a.a);
+  test.strictEqual(b.x, a.x);
+  test.strictEqual(b.y, a.y);
+
+  test.done();
+};
+
+exports['clone within an apart context'] = function (test) {
+  var results = apartContext({ clone: clone },
+      "results = ctx.clone({ a: [1, 2, 3], d: new Date(), r: /^foo$/ig })",
+      function (results) {
+    test.ok(results.a.constructor.toString() === Array.toString());
+    test.ok(results.d.constructor.toString() === Date.toString());
+    test.ok(results.r.constructor.toString() === RegExp.toString());
+    test.done();
+  });
+};
+
+exports['clone object with no constructor'] = function (test) {
+  test.expect(3);
+
+  var n = null;
+
+  var a = { foo: 'bar' };
+  a.__proto__ = n;
+  test.ok(typeof a === 'object');
+  test.ok(typeof a !== null);
+
+  var b = clone(a);
+  test.ok(a.foo, b.foo);
+
+  test.done();
+};
+
+exports['clone object with depth argument'] = function (test) {
+  test.expect(6);
+
+  var a = {
+    foo: {
+      bar : {
+        baz : 'qux'
+      }
+    }
+  };
+
+  var b = clone(a, false, 1);
+  test.deepEqual(b, a);
+  test.notEqual(b, a);
+  test.strictEqual(b.foo, a.foo);
+
+  b = clone(a, true, 2);
+  test.deepEqual(b, a);
+  test.notEqual(b.foo, a.foo);
+  test.strictEqual(b.foo.bar, a.foo.bar);
+
+  test.done();
+};
+
+exports['maintain prototype chain in clones'] = function (test) {
+  test.expect(1);
+
+  function T() {}
+
+  var a = new T();
+  var b = clone(a);
+  test.strictEqual(Object.getPrototypeOf(a), Object.getPrototypeOf(b));
+
+  test.done();
+};
+
+exports['parent prototype is overriden with prototype provided'] = function (test) {
+  test.expect(1);
+
+  function T() {}
+
+  var a = new T();
+  var b = clone(a, true, Infinity, null);
+  test.strictEqual(b.__defineSetter__, undefined);
+
+  test.done();
+};
+
+exports['clone object with null children'] = function (test) {
+  test.expect(1);
+  var a = {
+    foo: {
+      bar: null,
+      baz: {
+        qux: false
+      }
+    }
+  };
+
+  var b = clone(a);
+
+  test.deepEqual(b, a);
+  test.done();
+};
+
+exports['clone instance with getter'] = function (test) {
+  test.expect(1);
+  function Ctor() {};
+  Object.defineProperty(Ctor.prototype, 'prop', {
+    configurable: true,
+    enumerable: true,
+    get: function() {
+      return 'value';
+    }
+  });
+
+  var a = new Ctor();
+  var b = clone(a);
+
+  test.strictEqual(b.prop, 'value');
+  test.done();
+};
+
+exports['get RegExp flags'] = function (test) {
+  test.strictEqual(clone.__getRegExpFlags(/a/),   ''  );
+  test.strictEqual(clone.__getRegExpFlags(/a/i),  'i' );
+  test.strictEqual(clone.__getRegExpFlags(/a/g),  'g' );
+  test.strictEqual(clone.__getRegExpFlags(/a/gi), 'gi');
+  test.strictEqual(clone.__getRegExpFlags(/a/m),  'm' );
+
+  test.done();
+};
+
+exports["recognize Array object"] = function (test) {
+  var results = apartContext(null, "results = [1, 2, 3]", function(alien) {
+    var local = [4, 5, 6];
+    test.ok(clone.__isArray(alien)); // recognize in other context.
+    test.ok(clone.__isArray(local)); // recognize in local context.
+    test.ok(!clone.__isDate(alien));
+    test.ok(!clone.__isDate(local));
+    test.ok(!clone.__isRegExp(alien));
+    test.ok(!clone.__isRegExp(local));
+    test.done();
+  });
+};
+
+exports["recognize Date object"] = function (test) {
+  var results = apartContext(null, "results = new Date()", function(alien) {
+    var local = new Date();
+
+    test.ok(clone.__isDate(alien)); // recognize in other context.
+    test.ok(clone.__isDate(local)); // recognize in local context.
+    test.ok(!clone.__isArray(alien));
+    test.ok(!clone.__isArray(local));
+    test.ok(!clone.__isRegExp(alien));
+    test.ok(!clone.__isRegExp(local));
+
+    test.done();
+  });
+};
+
+exports["recognize RegExp object"] = function (test) {
+  var results = apartContext(null, "results = /foo/", function(alien) {
+    var local = /bar/;
+
+    test.ok(clone.__isRegExp(alien)); // recognize in other context.
+    test.ok(clone.__isRegExp(local)); // recognize in local context.
+    test.ok(!clone.__isArray(alien));
+    test.ok(!clone.__isArray(local));
+    test.ok(!clone.__isDate(alien));
+    test.ok(!clone.__isDate(local));
+    test.done();
+  });
+};
diff --git a/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/package.json b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/package.json
new file mode 100644
index 00000000000000..ef5197861a276e
--- /dev/null
+++ b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/package.json
@@ -0,0 +1,54 @@
+{
+  "name": "defaults",
+  "version": "1.0.3",
+  "description": "merge single level defaults over a config object",
+  "main": "index.js",
+  "scripts": {
+    "test": "node test.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/tmpvar/defaults.git"
+  },
+  "keywords": [
+    "config",
+    "defaults"
+  ],
+  "author": {
+    "name": "Elijah Insua",
+    "email": "tmpvar@gmail.com"
+  },
+  "license": "MIT",
+  "dependencies": {
+    "clone": "^1.0.2"
+  },
+  "devDependencies": {
+    "tap": "^2.0.0"
+  },
+  "gitHead": "8831ec32a5f999bfae1a8c9bf32880971ed7c6f2",
+  "bugs": {
+    "url": "https://github.com/tmpvar/defaults/issues"
+  },
+  "homepage": "https://github.com/tmpvar/defaults#readme",
+  "_id": "defaults@1.0.3",
+  "_shasum": "c656051e9817d9ff08ed881477f3fe4019f3ef7d",
+  "_from": "defaults@>=1.0.0 <2.0.0",
+  "_npmVersion": "2.14.4",
+  "_nodeVersion": "4.1.1",
+  "_npmUser": {
+    "name": "tmpvar",
+    "email": "tmpvar@gmail.com"
+  },
+  "dist": {
+    "shasum": "c656051e9817d9ff08ed881477f3fe4019f3ef7d",
+    "tarball": "http://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"
+  },
+  "maintainers": [
+    {
+      "name": "tmpvar",
+      "email": "tmpvar@gmail.com"
+    }
+  ],
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"
+}
diff --git a/deps/npm/node_modules/defaults/test.js b/deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/test.js
similarity index 100%
rename from deps/npm/node_modules/defaults/test.js
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/node_modules/defaults/test.js
diff --git a/deps/npm/node_modules/wcwidth/package.json b/deps/npm/node_modules/columnify/node_modules/wcwidth/package.json
similarity index 64%
rename from deps/npm/node_modules/wcwidth/package.json
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/package.json
index a950ab260c2a7d..49fc6f0408a7a5 100644
--- a/deps/npm/node_modules/wcwidth/package.json
+++ b/deps/npm/node_modules/columnify/node_modules/wcwidth/package.json
@@ -1,36 +1,7 @@
 {
-  "_args": [
-    [
-      "wcwidth@^1.0.0",
-      "/Users/rebecca/code/npm/node_modules/columnify"
-    ]
-  ],
-  "_from": "wcwidth@>=1.0.0 <2.0.0",
-  "_id": "wcwidth@1.0.0",
-  "_inCache": true,
-  "_location": "/wcwidth",
-  "_npmUser": {
-    "email": "secoif@gmail.com",
-    "name": "timoxley"
-  },
-  "_npmVersion": "1.4.23",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "wcwidth",
-    "raw": "wcwidth@^1.0.0",
-    "rawSpec": "^1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/columnify"
-  ],
-  "_resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz",
-  "_shasum": "02d059ff7a8fc741e0f6b5da1e69b2b40daeca6f",
-  "_shrinkwrap": null,
-  "_spec": "wcwidth@^1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/columnify",
+  "name": "wcwidth",
+  "version": "1.0.0",
+  "description": "Port of C's wcwidth() and wcswidth()",
   "author": {
     "name": "Tim Oxley"
   },
@@ -41,44 +12,50 @@
       "url": "http://code.woong.org/"
     }
   ],
+  "main": "index.js",
   "dependencies": {
     "defaults": "^1.0.0"
   },
-  "description": "Port of C's wcwidth() and wcswidth()",
   "devDependencies": {
     "tape": "^2.13.4"
   },
+  "license": "MIT",
+  "keywords": [
+    "wide character",
+    "wc",
+    "wide character string",
+    "wcs",
+    "terminal",
+    "width",
+    "wcwidth",
+    "wcswidth"
+  ],
   "directories": {
     "doc": "docs",
     "test": "test"
   },
-  "dist": {
-    "shasum": "02d059ff7a8fc741e0f6b5da1e69b2b40daeca6f",
-    "tarball": "http://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz"
+  "scripts": {
+    "test": "tape test/*.js"
   },
   "gitHead": "5bc3aafd45c89f233c27b9479c18a23ca91ba660",
-  "keywords": [
-    "terminal",
-    "wc",
-    "wcs",
-    "wcswidth",
-    "wcwidth",
-    "wide character",
-    "wide character string",
-    "width"
-  ],
-  "license": "MIT",
-  "main": "index.js",
+  "_id": "wcwidth@1.0.0",
+  "_shasum": "02d059ff7a8fc741e0f6b5da1e69b2b40daeca6f",
+  "_from": "wcwidth@>=1.0.0 <2.0.0",
+  "_npmVersion": "1.4.23",
+  "_npmUser": {
+    "name": "timoxley",
+    "email": "secoif@gmail.com"
+  },
   "maintainers": [
     {
       "name": "timoxley",
       "email": "secoif@gmail.com"
     }
   ],
-  "name": "wcwidth",
-  "optionalDependencies": {},
-  "scripts": {
-    "test": "tape test/*.js"
+  "dist": {
+    "shasum": "02d059ff7a8fc741e0f6b5da1e69b2b40daeca6f",
+    "tarball": "http://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz"
   },
-  "version": "1.0.0"
+  "_resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/wcwidth/test/index.js b/deps/npm/node_modules/columnify/node_modules/wcwidth/test/index.js
similarity index 100%
rename from deps/npm/node_modules/wcwidth/test/index.js
rename to deps/npm/node_modules/columnify/node_modules/wcwidth/test/index.js
diff --git a/deps/npm/node_modules/columnify/package.json b/deps/npm/node_modules/columnify/package.json
index 1c9b23ddfbc5a4..c4345001f31339 100644
--- a/deps/npm/node_modules/columnify/package.json
+++ b/deps/npm/node_modules/columnify/package.json
@@ -1,92 +1,68 @@
 {
-  "_args": [
-    [
-      "columnify@~1.5.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "columnify@>=1.5.1 <1.6.0",
-  "_id": "columnify@1.5.2",
-  "_inCache": true,
-  "_location": "/columnify",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "email": "secoif@gmail.com",
-    "name": "timoxley"
-  },
-  "_npmVersion": "2.9.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "columnify",
-    "raw": "columnify@~1.5.1",
-    "rawSpec": "~1.5.1",
-    "scope": null,
-    "spec": ">=1.5.1 <1.6.0",
-    "type": "range"
+  "name": "columnify",
+  "version": "1.5.2",
+  "description": "Render data in text columns. Supports in-column text-wrap.",
+  "main": "columnify.js",
+  "scripts": {
+    "pretest": "npm prune",
+    "test": "make prepublish && tape test/*.js | tap-spec",
+    "bench": "npm test && node bench",
+    "prepublish": "make prepublish"
   },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.2.tgz",
-  "_shasum": "6937930d47c22a9bfa20732a7fd619d47eaba65a",
-  "_shrinkwrap": null,
-  "_spec": "columnify@~1.5.1",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
     "name": "Tim Oxley"
   },
-  "bugs": {
-    "url": "https://github.com/timoxley/columnify/issues"
-  },
-  "dependencies": {
-    "strip-ansi": "^3.0.0",
-    "wcwidth": "^1.0.0"
-  },
-  "description": "Render data in text columns. Supports in-column text-wrap.",
+  "license": "MIT",
   "devDependencies": {
     "babel": "^5.8.21",
     "chalk": "^1.1.0",
     "tap-spec": "^4.0.2",
     "tape": "^4.0.3"
   },
-  "directories": {
-    "test": "test"
-  },
-  "dist": {
-    "shasum": "6937930d47c22a9bfa20732a7fd619d47eaba65a",
-    "tarball": "http://registry.npmjs.org/columnify/-/columnify-1.5.2.tgz"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/timoxley/columnify.git"
   },
-  "gitHead": "e7417b78091844ff2f3ba62551a4817c7ae217bd",
-  "homepage": "https://github.com/timoxley/columnify",
-  "installable": true,
   "keywords": [
-    "ansi",
     "column",
+    "text",
+    "ansi",
     "console",
-    "table",
     "terminal",
-    "text",
-    "wrap"
+    "wrap",
+    "table"
   ],
-  "license": "MIT",
-  "main": "columnify.js",
+  "bugs": {
+    "url": "https://github.com/timoxley/columnify/issues"
+  },
+  "homepage": "https://github.com/timoxley/columnify",
+  "dependencies": {
+    "strip-ansi": "^3.0.0",
+    "wcwidth": "^1.0.0"
+  },
+  "directories": {
+    "test": "test"
+  },
+  "gitHead": "e7417b78091844ff2f3ba62551a4817c7ae217bd",
+  "_id": "columnify@1.5.2",
+  "_shasum": "6937930d47c22a9bfa20732a7fd619d47eaba65a",
+  "_from": "columnify@>=1.5.2 <1.6.0",
+  "_npmVersion": "2.9.0",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "name": "timoxley",
+    "email": "secoif@gmail.com"
+  },
   "maintainers": [
     {
       "name": "timoxley",
       "email": "secoif@gmail.com"
     }
   ],
-  "name": "columnify",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/timoxley/columnify.git"
-  },
-  "scripts": {
-    "bench": "npm test && node bench",
-    "prepublish": "make prepublish",
-    "pretest": "npm prune",
-    "test": "make prepublish && tape test/*.js | tap-spec"
+  "dist": {
+    "shasum": "6937930d47c22a9bfa20732a7fd619d47eaba65a",
+    "tarball": "http://registry.npmjs.org/columnify/-/columnify-1.5.2.tgz"
   },
-  "version": "1.5.2"
+  "_resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.2.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/commander/package.json b/deps/npm/node_modules/commander/package.json
deleted file mode 100644
index ba89d2e64e1c89..00000000000000
--- a/deps/npm/node_modules/commander/package.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-  "_args": [
-    [
-      "commander@^2.8.1",
-      "/Users/rebecca/code/npm/node_modules/har-validator"
-    ]
-  ],
-  "_from": "commander@>=2.8.1 <3.0.0",
-  "_id": "commander@2.8.1",
-  "_inCache": true,
-  "_location": "/commander",
-  "_nodeVersion": "0.12.0",
-  "_npmUser": {
-    "email": "zhiyelee@gmail.com",
-    "name": "zhiyelee"
-  },
-  "_npmVersion": "2.5.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "commander",
-    "raw": "commander@^2.8.1",
-    "rawSpec": "^2.8.1",
-    "scope": null,
-    "spec": ">=2.8.1 <3.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/har-validator"
-  ],
-  "_resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
-  "_shasum": "06be367febfda0c330aa1e2a072d3dc9762425d4",
-  "_shrinkwrap": null,
-  "_spec": "commander@^2.8.1",
-  "_where": "/Users/rebecca/code/npm/node_modules/har-validator",
-  "author": {
-    "email": "tj@vision-media.ca",
-    "name": "TJ Holowaychuk"
-  },
-  "bugs": {
-    "url": "https://github.com/tj/commander.js/issues"
-  },
-  "dependencies": {
-    "graceful-readlink": ">= 1.0.0"
-  },
-  "description": "the complete solution for node.js command-line programs",
-  "devDependencies": {
-    "should": ">= 0.0.1",
-    "sinon": ">= 1.14.1"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "06be367febfda0c330aa1e2a072d3dc9762425d4",
-    "tarball": "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz"
-  },
-  "engines": {
-    "node": ">= 0.6.x"
-  },
-  "files": [
-    "index.js"
-  ],
-  "gitHead": "c6c84726050b19c0373de27cd359f3baddff579f",
-  "homepage": "https://github.com/tj/commander.js",
-  "keywords": [
-    "command",
-    "option",
-    "parser"
-  ],
-  "license": "MIT",
-  "main": "index",
-  "maintainers": [
-    {
-      "name": "tjholowaychuk",
-      "email": "tj@vision-media.ca"
-    },
-    {
-      "name": "somekittens",
-      "email": "rkoutnik@gmail.com"
-    },
-    {
-      "name": "zhiyelee",
-      "email": "zhiyelee@gmail.com"
-    },
-    {
-      "name": "thethomaseffect",
-      "email": "thethomaseffect@gmail.com"
-    }
-  ],
-  "name": "commander",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/tj/commander.js.git"
-  },
-  "scripts": {
-    "test": "make test"
-  },
-  "version": "2.8.1"
-}
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/package.json b/deps/npm/node_modules/concat-stream/node_modules/readable-stream/package.json
deleted file mode 100644
index a3289c74d132ba..00000000000000
--- a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/package.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-  "_args": [
-    [
-      "readable-stream@~2.0.0",
-      "/Users/rebecca/code/npm/node_modules/concat-stream"
-    ]
-  ],
-  "_from": "readable-stream@>=2.0.0 <2.1.0",
-  "_id": "readable-stream@2.0.2",
-  "_inCache": true,
-  "_location": "/concat-stream/readable-stream",
-  "_nodeVersion": "2.3.0",
-  "_npmUser": {
-    "email": "calvin.metcalf@gmail.com",
-    "name": "cwmma"
-  },
-  "_npmVersion": "2.11.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "readable-stream",
-    "raw": "readable-stream@~2.0.0",
-    "rawSpec": "~2.0.0",
-    "scope": null,
-    "spec": ">=2.0.0 <2.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/concat-stream"
-  ],
-  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
-  "_shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
-  "_shrinkwrap": null,
-  "_spec": "readable-stream@~2.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/concat-stream",
-  "browser": {
-    "util": false
-  },
-  "bugs": {
-    "url": "https://github.com/nodejs/readable-stream/issues"
-  },
-  "dependencies": {
-    "core-util-is": "~1.0.0",
-    "inherits": "~2.0.1",
-    "isarray": "0.0.1",
-    "process-nextick-args": "~1.0.0",
-    "string_decoder": "~0.10.x",
-    "util-deprecate": "~1.0.1"
-  },
-  "description": "Streams3, a user-land copy of the stream library from iojs v2.x",
-  "devDependencies": {
-    "tap": "~0.2.6",
-    "tape": "~4.0.0",
-    "zuul": "~3.0.0"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
-    "tarball": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz"
-  },
-  "gitHead": "1a70134a71196eeabb5e27bc7580faaa68d30513",
-  "homepage": "https://github.com/nodejs/readable-stream#readme",
-  "keywords": [
-    "pipe",
-    "readable",
-    "stream"
-  ],
-  "license": "MIT",
-  "main": "readable.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "isaacs@npmjs.com"
-    },
-    {
-      "name": "tootallnate",
-      "email": "nathan@tootallnate.net"
-    },
-    {
-      "name": "rvagg",
-      "email": "rod@vagg.org"
-    },
-    {
-      "name": "cwmma",
-      "email": "calvin.metcalf@gmail.com"
-    }
-  ],
-  "name": "readable-stream",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/nodejs/readable-stream.git"
-  },
-  "scripts": {
-    "browser": "zuul --browser-name $BROWSER_NAME --browser-version $BROWSER_VERSION -- test/browser.js",
-    "test": "tap test/parallel/*.js"
-  },
-  "version": "2.0.2"
-}
diff --git a/deps/npm/node_modules/concat-stream/package.json b/deps/npm/node_modules/concat-stream/package.json
deleted file mode 100644
index 276492319d8eb1..00000000000000
--- a/deps/npm/node_modules/concat-stream/package.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "_args": [
-    [
-      "concat-stream@^1.4.6",
-      "/Users/rebecca/code/npm/node_modules/npm-registry-client"
-    ]
-  ],
-  "_from": "concat-stream@>=1.4.6 <2.0.0",
-  "_id": "concat-stream@1.5.0",
-  "_inCache": true,
-  "_location": "/concat-stream",
-  "_nodeVersion": "1.8.2",
-  "_npmUser": {
-    "email": "max@maxogden.com",
-    "name": "maxogden"
-  },
-  "_npmVersion": "2.9.0",
-  "_phantomChildren": {
-    "core-util-is": "1.0.1",
-    "inherits": "2.0.1",
-    "isarray": "0.0.1",
-    "process-nextick-args": "1.0.1",
-    "string_decoder": "0.10.31",
-    "util-deprecate": "1.0.1"
-  },
-  "_requested": {
-    "name": "concat-stream",
-    "raw": "concat-stream@^1.4.6",
-    "rawSpec": "^1.4.6",
-    "scope": null,
-    "spec": ">=1.4.6 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/npm-registry-client"
-  ],
-  "_resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
-  "_shasum": "53f7d43c51c5e43f81c8fdd03321c631be68d611",
-  "_shrinkwrap": null,
-  "_spec": "concat-stream@^1.4.6",
-  "_where": "/Users/rebecca/code/npm/node_modules/npm-registry-client",
-  "author": {
-    "email": "max@maxogden.com",
-    "name": "Max Ogden"
-  },
-  "bugs": {
-    "url": "http://github.com/maxogden/concat-stream/issues"
-  },
-  "dependencies": {
-    "inherits": "~2.0.1",
-    "readable-stream": "~2.0.0",
-    "typedarray": "~0.0.5"
-  },
-  "description": "writable stream that concatenates strings or binary data and calls a callback with the result",
-  "devDependencies": {
-    "tape": "~2.3.2"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "53f7d43c51c5e43f81c8fdd03321c631be68d611",
-    "tarball": "http://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz"
-  },
-  "engines": [
-    "node >= 0.8"
-  ],
-  "files": [
-    "index.js"
-  ],
-  "gitHead": "7cb37c8ddc0fd2ea03c104d07d44d84b83a31185",
-  "homepage": "https://github.com/maxogden/concat-stream#readme",
-  "license": "MIT",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "maxogden",
-      "email": "max@maxogden.com"
-    }
-  ],
-  "name": "concat-stream",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/maxogden/concat-stream.git"
-  },
-  "scripts": {
-    "test": "tape test/*.js test/server/*.js"
-  },
-  "tags": [
-    "simple",
-    "stream",
-    "util",
-    "utility"
-  ],
-  "testling": {
-    "browsers": [
-      "android-browser/4.2..latest",
-      "chrome/22..latest",
-      "chrome/canary",
-      "firefox/17..latest",
-      "firefox/nightly",
-      "ie/8..latest",
-      "ipad/6.0..latest",
-      "iphone/6.0..latest",
-      "opera/12..latest",
-      "opera/next",
-      "safari/5.1..latest"
-    ],
-    "files": "test/*.js"
-  },
-  "version": "1.5.0"
-}
diff --git a/deps/npm/node_modules/block-stream/LICENSE b/deps/npm/node_modules/config-chain/node_modules/proto-list/LICENSE
similarity index 100%
rename from deps/npm/node_modules/block-stream/LICENSE
rename to deps/npm/node_modules/config-chain/node_modules/proto-list/LICENSE
diff --git a/deps/npm/node_modules/proto-list/README.md b/deps/npm/node_modules/config-chain/node_modules/proto-list/README.md
similarity index 100%
rename from deps/npm/node_modules/proto-list/README.md
rename to deps/npm/node_modules/config-chain/node_modules/proto-list/README.md
diff --git a/deps/npm/node_modules/config-chain/node_modules/proto-list/package.json b/deps/npm/node_modules/config-chain/node_modules/proto-list/package.json
new file mode 100644
index 00000000000000..1a0d0a8ce24262
--- /dev/null
+++ b/deps/npm/node_modules/config-chain/node_modules/proto-list/package.json
@@ -0,0 +1,32 @@
+{
+  "name": "proto-list",
+  "version": "1.2.4",
+  "description": "A utility for managing a prototype chain",
+  "main": "./proto-list.js",
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/isaacs/proto-list.git"
+  },
+  "license": "ISC",
+  "devDependencies": {
+    "tap": "0"
+  },
+  "readme": "A list of objects, bound by their prototype chain.\n\nUsed in npm's config stuff.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/isaacs/proto-list/issues"
+  },
+  "homepage": "https://github.com/isaacs/proto-list#readme",
+  "_id": "proto-list@1.2.4",
+  "_shasum": "212d5bfe1318306a420f6402b8e26ff39647a849",
+  "_resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+  "_from": "proto-list@>=1.2.1 <1.3.0"
+}
diff --git a/deps/npm/node_modules/proto-list/proto-list.js b/deps/npm/node_modules/config-chain/node_modules/proto-list/proto-list.js
similarity index 100%
rename from deps/npm/node_modules/proto-list/proto-list.js
rename to deps/npm/node_modules/config-chain/node_modules/proto-list/proto-list.js
diff --git a/deps/npm/node_modules/proto-list/test/basic.js b/deps/npm/node_modules/config-chain/node_modules/proto-list/test/basic.js
similarity index 100%
rename from deps/npm/node_modules/proto-list/test/basic.js
rename to deps/npm/node_modules/config-chain/node_modules/proto-list/test/basic.js
diff --git a/deps/npm/node_modules/config-chain/package.json b/deps/npm/node_modules/config-chain/package.json
index b9ab7365b72804..a8b63880e9ebc2 100644
--- a/deps/npm/node_modules/config-chain/package.json
+++ b/deps/npm/node_modules/config-chain/package.json
@@ -1,84 +1,40 @@
 {
-  "_args": [
-    [
-      "config-chain@~1.1.9",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "config-chain@>=1.1.9 <1.2.0",
-  "_id": "config-chain@1.1.9",
-  "_inCache": true,
-  "_location": "/config-chain",
-  "_nodeVersion": "0.12.4",
-  "_npmUser": {
-    "email": "dominic.tarr@gmail.com",
-    "name": "dominictarr"
-  },
-  "_npmVersion": "2.11.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "config-chain",
-    "raw": "config-chain@~1.1.9",
-    "rawSpec": "~1.1.9",
-    "scope": null,
-    "spec": ">=1.1.9 <1.2.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
-  "_shasum": "39ac7d4dca84faad926124c54cff25a53aa8bf6e",
-  "_shrinkwrap": null,
-  "_spec": "config-chain@~1.1.9",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "dominic.tarr@gmail.com",
-    "name": "Dominic Tarr",
-    "url": "http://dominictarr.com"
-  },
-  "bugs": {
-    "url": "https://github.com/dominictarr/config-chain/issues"
-  },
-  "dependencies": {
-    "ini": "1",
-    "proto-list": "~1.2.1"
-  },
-  "description": "HANDLE CONFIGURATION ONCE AND FOR ALL",
-  "devDependencies": {
-    "tap": "0.3.0"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "39ac7d4dca84faad926124c54cff25a53aa8bf6e",
-    "tarball": "http://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz"
-  },
-  "gitHead": "832609897082a0a887c59dadb105f4db6de1ab4c",
-  "homepage": "http://github.com/dominictarr/config-chain",
+  "name": "config-chain",
+  "version": "1.1.9",
   "licenses": [
     {
       "type": "MIT",
       "url": "https://raw.githubusercontent.com/dominictarr/config-chain/master/LICENCE"
     }
   ],
-  "maintainers": [
-    {
-      "name": "dominictarr",
-      "email": "dominic.tarr@gmail.com"
-    },
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "name": "config-chain",
-  "optionalDependencies": {},
+  "description": "HANDLE CONFIGURATION ONCE AND FOR ALL",
+  "homepage": "http://github.com/dominictarr/config-chain",
   "repository": {
     "type": "git",
-    "url": "https://github.com/dominictarr/config-chain.git"
+    "url": "git+https://github.com/dominictarr/config-chain.git"
+  },
+  "dependencies": {
+    "proto-list": "~1.2.1",
+    "ini": "1"
+  },
+  "devDependencies": {
+    "tap": "0.3.0"
+  },
+  "author": {
+    "name": "Dominic Tarr",
+    "email": "dominic.tarr@gmail.com",
+    "url": "http://dominictarr.com"
   },
   "scripts": {
     "test": "tap test/"
   },
-  "version": "1.1.9"
+  "readme": "#config-chain\n\nUSE THIS MODULE TO LOAD ALL YOUR CONFIGURATIONS\n\n``` js\n\n  //npm install config-chain\n\n  var cc = require('config-chain')\n    , opts = require('optimist').argv //ALWAYS USE OPTIMIST FOR COMMAND LINE OPTIONS.\n    , env = opts.env || process.env.YOUR_APP_ENV || 'dev' //SET YOUR ENV LIKE THIS.\n\n  // EACH ARG TO CONFIGURATOR IS LOADED INTO CONFIGURATION CHAIN\n  // EARLIER ITEMS OVERIDE LATER ITEMS\n  // PUTS COMMAND LINE OPTS FIRST, AND DEFAULTS LAST!\n\n  //strings are interpereted as filenames.\n  //will be loaded synchronously\n\n  var conf =\n  cc(\n    //OVERRIDE SETTINGS WITH COMMAND LINE OPTS\n    opts,\n\n    //ENV VARS IF PREFIXED WITH 'myApp_'\n\n    cc.env('myApp_'), //myApp_foo = 'like this'\n\n    //FILE NAMED BY ENV\n    path.join(__dirname,  'config.' + env + '.json'),\n\n    //IF `env` is PRODUCTION\n    env === 'prod'\n      ? path.join(__dirname, 'special.json') //load a special file\n      : null //NULL IS IGNORED!\n\n    //SUBDIR FOR ENV CONFIG\n    path.join(__dirname,  'config', env, 'config.json'),\n\n    //SEARCH PARENT DIRECTORIES FROM CURRENT DIR FOR FILE\n    cc.find('config.json'),\n\n    //PUT DEFAULTS LAST\n    {\n      host: 'localhost'\n      port: 8000\n    })\n\n  var host = conf.get('host')\n\n  // or\n\n  var host = conf.store.host\n\n```\n\nFINALLY, EASY FLEXIBLE CONFIGURATIONS!\n\n##see also: [proto-list](https://github.com/isaacs/proto-list/)\n\nWHATS THAT YOU SAY?\n\nYOU WANT A \"CLASS\" SO THAT YOU CAN DO CRAYCRAY JQUERY CRAPS?\n\nEXTEND WITH YOUR OWN FUNCTIONALTY!?\n\n## CONFIGCHAIN LIVES TO SERVE ONLY YOU!\n\n```javascript\nvar cc = require('config-chain')\n\n// all the stuff you did before\nvar config = cc({\n      some: 'object'\n    },\n    cc.find('config.json'),\n    cc.env('myApp_')\n  )\n  // CONFIGS AS A SERVICE, aka \"CaaS\", aka EVERY DEVOPS DREAM OMG!\n  .addUrl('http://configurator:1234/my-configs')\n  // ASYNC FTW!\n  .addFile('/path/to/file.json')\n\n  // OBJECTS ARE OK TOO, they're SYNC but they still ORDER RIGHT\n  // BECAUSE PROMISES ARE USED BUT NO, NOT *THOSE* PROMISES, JUST\n  // ACTUAL PROMISES LIKE YOU MAKE TO YOUR MOM, KEPT OUT OF LOVE\n  .add({ another: 'object' })\n\n  // DIE A THOUSAND DEATHS IF THIS EVER HAPPENS!!\n  .on('error', function (er) {\n    // IF ONLY THERE WAS SOMETHIGN HARDER THAN THROW\n    // MY SORROW COULD BE ADEQUATELY EXPRESSED.  /o\\\n    throw er\n  })\n\n  // THROW A PARTY IN YOUR FACE WHEN ITS ALL LOADED!!\n  .on('load', function (config) {\n    console.awesome('HOLY SHIT!')\n  })\n```\n\n# BORING API DOCS\n\n## cc(...args)\n\nMAKE A CHAIN AND ADD ALL THE ARGS.\n\nIf the arg is a STRING, then it shall be a JSON FILENAME.\n\nSYNC I/O!\n\nRETURN THE CHAIN!\n\n## cc.json(...args)\n\nJoin the args INTO A JSON FILENAME!\n\nSYNC I/O!\n\n## cc.find(relativePath)\n\nSEEK the RELATIVE PATH by climbing the TREE OF DIRECTORIES.\n\nRETURN THE FOUND PATH!\n\nSYNC I/O!\n\n## cc.parse(content, file, type)\n\nParse the content string, and guess the type from either the\nspecified type or the filename.\n\nRETURN THE RESULTING OBJECT!\n\nNO I/O!\n\n## cc.env(prefix, env=process.env)\n\nGet all the keys on the provided env object (or process.env) which are\nprefixed by the specified prefix, and put the values on a new object.\n\nRETURN THE RESULTING OBJECT!\n\nNO I/O!\n\n## cc.ConfigChain()\n\nThe ConfigChain class for CRAY CRAY JQUERY STYLE METHOD CHAINING!\n\nOne of these is returned by the main exported function, as well.\n\nIt inherits (prototypically) from\n[ProtoList](https://github.com/isaacs/proto-list/), and also inherits\n(parasitically) from\n[EventEmitter](http://nodejs.org/api/events.html#events_class_events_eventemitter)\n\nIt has all the methods from both, and except where noted, they are\nunchanged.\n\n### LET IT BE KNOWN THAT chain IS AN INSTANCE OF ConfigChain.\n\n## chain.sources\n\nA list of all the places where it got stuff.  The keys are the names\npassed to addFile or addUrl etc, and the value is an object with some\ninfo about the data source.\n\n## chain.addFile(filename, type, [name=filename])\n\nFilename is the name of the file.  Name is an arbitrary string to be\nused later if you desire.  Type is either 'ini' or 'json', and will\ntry to guess intelligently if omitted.\n\nLoaded files can be saved later.\n\n## chain.addUrl(url, type, [name=url])\n\nSame as the filename thing, but with a url.\n\nCan't be saved later.\n\n## chain.addEnv(prefix, env, [name='env'])\n\nAdd all the keys from the env object that start with the prefix.\n\n## chain.addString(data, file, type, [name])\n\nParse the string and add it to the set.  (Mainly used internally.)\n\n## chain.add(object, [name])\n\nAdd the object to the set.\n\n## chain.root {Object}\n\nThe root from which all the other config objects in the set descend\nprototypically.\n\nPut your defaults here.\n\n## chain.set(key, value, name)\n\nSet the key to the value on the named config object.  If name is\nunset, then set it on the first config object in the set.  (That is,\nthe one with the highest priority, which was added first.)\n\n## chain.get(key, [name])\n\nGet the key from the named config object explicitly, or from the\nresolved configs if not specified.\n\n## chain.save(name, type)\n\nWrite the named config object back to its origin.\n\nCurrently only supported for env and file config types.\n\nFor files, encode the data according to the type.\n\n## chain.on('save', function () {})\n\nWhen one or more files are saved, emits `save` event when they're all\nsaved.\n\n## chain.on('load', function (chain) {})\n\nWhen the config chain has loaded all the specified files and urls and\nsuch, the 'load' event fires.\n",
+  "readmeFilename": "readme.markdown",
+  "bugs": {
+    "url": "https://github.com/dominictarr/config-chain/issues"
+  },
+  "_id": "config-chain@1.1.9",
+  "_shasum": "39ac7d4dca84faad926124c54cff25a53aa8bf6e",
+  "_resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.9.tgz",
+  "_from": "config-chain@>=1.1.9 <1.2.0"
 }
diff --git a/deps/npm/node_modules/core-util-is/package.json b/deps/npm/node_modules/core-util-is/package.json
deleted file mode 100644
index 3e3708371a710a..00000000000000
--- a/deps/npm/node_modules/core-util-is/package.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "_args": [
-    [
-      "core-util-is@~1.0.0",
-      "/Users/rebecca/code/npm/node_modules/readable-stream"
-    ]
-  ],
-  "_from": "core-util-is@>=1.0.0 <1.1.0",
-  "_id": "core-util-is@1.0.1",
-  "_inCache": true,
-  "_location": "/core-util-is",
-  "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
-  },
-  "_npmVersion": "1.3.23",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "core-util-is",
-    "raw": "core-util-is@~1.0.0",
-    "rawSpec": "~1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/bl/readable-stream",
-    "/concat-stream/readable-stream",
-    "/readable-stream"
-  ],
-  "_resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
-  "_shasum": "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538",
-  "_shrinkwrap": null,
-  "_spec": "core-util-is@~1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/readable-stream",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/core-util-is/issues"
-  },
-  "dependencies": {},
-  "description": "The `util.is*` functions introduced in Node v0.12.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538",
-    "tarball": "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-  },
-  "homepage": "https://github.com/isaacs/core-util-is",
-  "keywords": [
-    "isArray",
-    "isBuffer",
-    "isNumber",
-    "isRegExp",
-    "isString",
-    "isThat",
-    "isThis",
-    "polyfill",
-    "util"
-  ],
-  "license": "MIT",
-  "main": "lib/util.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "name": "core-util-is",
-  "optionalDependencies": {},
-  "readme": "# core-util-is\n\nThe `util.is*` functions introduced in Node v0.12.\n",
-  "readmeFilename": "README.md",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/core-util-is"
-  },
-  "version": "1.0.1"
-}
diff --git a/deps/npm/node_modules/ctype/package.json b/deps/npm/node_modules/ctype/package.json
deleted file mode 100644
index a4d41f6d5cbd49..00000000000000
--- a/deps/npm/node_modules/ctype/package.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "_args": [
-    [
-      "ctype@0.5.3",
-      "/Users/rebecca/code/npm/node_modules/http-signature"
-    ]
-  ],
-  "_from": "ctype@0.5.3",
-  "_id": "ctype@0.5.3",
-  "_inCache": true,
-  "_location": "/ctype",
-  "_npmUser": {
-    "email": "rm@fingolfin.org",
-    "name": "rm"
-  },
-  "_npmVersion": "1.1.59",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "ctype",
-    "raw": "ctype@0.5.3",
-    "rawSpec": "0.5.3",
-    "scope": null,
-    "spec": "0.5.3",
-    "type": "version"
-  },
-  "_requiredBy": [
-    "/http-signature"
-  ],
-  "_resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
-  "_shasum": "82c18c2461f74114ef16c135224ad0b9144ca12f",
-  "_shrinkwrap": null,
-  "_spec": "ctype@0.5.3",
-  "_where": "/Users/rebecca/code/npm/node_modules/http-signature",
-  "author": {
-    "email": "rm@fingolfin.org",
-    "name": "Robert Mustacchi"
-  },
-  "dependencies": {},
-  "description": "read and write binary structures and data types",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "82c18c2461f74114ef16c135224ad0b9144ca12f",
-    "tarball": "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
-  },
-  "engines": {
-    "node": ">= 0.4"
-  },
-  "homepage": "https://github.com/rmustacc/node-ctype",
-  "main": "ctype.js",
-  "maintainers": [
-    {
-      "name": "rm",
-      "email": "rm@fingolfin.org"
-    }
-  ],
-  "name": "ctype",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/rmustacc/node-ctype.git"
-  },
-  "version": "0.5.3"
-}
diff --git a/deps/npm/node_modules/debug/package.json b/deps/npm/node_modules/debug/package.json
deleted file mode 100644
index aa5fea850b6f39..00000000000000
--- a/deps/npm/node_modules/debug/package.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "_args": [
-    [
-      "debug@*",
-      "/Users/rebecca/code/npm/node_modules/array-index"
-    ]
-  ],
-  "_from": "debug@*",
-  "_id": "debug@2.2.0",
-  "_inCache": true,
-  "_location": "/debug",
-  "_nodeVersion": "0.12.2",
-  "_npmUser": {
-    "email": "nathan@tootallnate.net",
-    "name": "tootallnate"
-  },
-  "_npmVersion": "2.7.4",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "debug",
-    "raw": "debug@*",
-    "rawSpec": "*",
-    "scope": null,
-    "spec": "*",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/array-index"
-  ],
-  "_resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-  "_shasum": "f87057e995b1a1f6ae6a4960664137bc56f039da",
-  "_shrinkwrap": null,
-  "_spec": "debug@*",
-  "_where": "/Users/rebecca/code/npm/node_modules/array-index",
-  "author": {
-    "email": "tj@vision-media.ca",
-    "name": "TJ Holowaychuk"
-  },
-  "browser": "./browser.js",
-  "bugs": {
-    "url": "https://github.com/visionmedia/debug/issues"
-  },
-  "component": {
-    "scripts": {
-      "debug/debug.js": "debug.js",
-      "debug/index.js": "browser.js"
-    }
-  },
-  "contributors": [
-    {
-      "name": "Nathan Rajlich",
-      "email": "nathan@tootallnate.net",
-      "url": "http://n8.io"
-    }
-  ],
-  "dependencies": {
-    "ms": "0.7.1"
-  },
-  "description": "small debugging utility",
-  "devDependencies": {
-    "browserify": "9.0.3",
-    "mocha": "*"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "f87057e995b1a1f6ae6a4960664137bc56f039da",
-    "tarball": "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
-  },
-  "gitHead": "b38458422b5aa8aa6d286b10dfe427e8a67e2b35",
-  "homepage": "https://github.com/visionmedia/debug",
-  "keywords": [
-    "debug",
-    "debugger",
-    "log"
-  ],
-  "license": "MIT",
-  "main": "./node.js",
-  "maintainers": [
-    {
-      "name": "tjholowaychuk",
-      "email": "tj@vision-media.ca"
-    },
-    {
-      "name": "tootallnate",
-      "email": "nathan@tootallnate.net"
-    }
-  ],
-  "name": "debug",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/visionmedia/debug.git"
-  },
-  "scripts": {},
-  "version": "2.2.0"
-}
diff --git a/deps/npm/node_modules/debuglog/package.json b/deps/npm/node_modules/debuglog/package.json
index e7fe99f56e34f1..b192d407f7e062 100644
--- a/deps/npm/node_modules/debuglog/package.json
+++ b/deps/npm/node_modules/debuglog/package.json
@@ -1,41 +1,19 @@
 {
-  "_args": [
-    [
-      "debuglog@^1.0.1",
-      "/Users/rebecca/code/npm/node_modules/read-installed"
-    ]
-  ],
-  "_from": "debuglog@>=1.0.1 <2.0.0",
-  "_id": "debuglog@1.0.1",
-  "_inCache": true,
-  "_location": "/debuglog",
-  "_npmUser": {
-    "email": "sam@strongloop.com",
-    "name": "octet"
-  },
-  "_npmVersion": "1.4.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "debuglog",
-    "raw": "debuglog@^1.0.1",
-    "rawSpec": "^1.0.1",
-    "scope": null,
-    "spec": ">=1.0.1 <2.0.0",
-    "type": "range"
+  "name": "debuglog",
+  "version": "1.0.1",
+  "description": "backport of util.debuglog from node v0.11",
+  "license": "MIT",
+  "main": "debuglog.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sam-github/node-debuglog.git"
   },
-  "_requiredBy": [
-    "/read-installed",
-    "/read-package-tree",
-    "/readdir-scoped-modules"
-  ],
-  "_resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
-  "_shasum": "aa24ffb9ac3df9a2351837cfb2d279360cd78492",
-  "_shrinkwrap": null,
-  "_spec": "debuglog@^1.0.1",
-  "_where": "/Users/rebecca/code/npm/node_modules/read-installed",
   "author": {
-    "email": "sam@strongloop.com",
-    "name": "Sam Roberts"
+    "name": "Sam Roberts",
+    "email": "sam@strongloop.com"
+  },
+  "engines": {
+    "node": "*"
   },
   "browser": {
     "util": false
@@ -43,31 +21,26 @@
   "bugs": {
     "url": "https://github.com/sam-github/node-debuglog/issues"
   },
-  "dependencies": {},
-  "description": "backport of util.debuglog from node v0.11",
-  "devDependencies": {},
-  "directories": {},
+  "homepage": "https://github.com/sam-github/node-debuglog",
+  "_id": "debuglog@1.0.1",
   "dist": {
     "shasum": "aa24ffb9ac3df9a2351837cfb2d279360cd78492",
     "tarball": "http://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"
   },
-  "engines": {
-    "node": "*"
+  "_from": "debuglog@1.0.1",
+  "_npmVersion": "1.4.3",
+  "_npmUser": {
+    "name": "octet",
+    "email": "sam@strongloop.com"
   },
-  "homepage": "https://github.com/sam-github/node-debuglog",
-  "license": "MIT",
-  "main": "debuglog.js",
   "maintainers": [
     {
       "name": "octet",
       "email": "sam@strongloop.com"
     }
   ],
-  "name": "debuglog",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/sam-github/node-debuglog.git"
-  },
-  "version": "1.0.1"
+  "directories": {},
+  "_shasum": "aa24ffb9ac3df9a2351837cfb2d279360cd78492",
+  "_resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/defaults/package.json b/deps/npm/node_modules/defaults/package.json
deleted file mode 100644
index 7c025a16873369..00000000000000
--- a/deps/npm/node_modules/defaults/package.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "_args": [
-    [
-      "defaults@^1.0.0",
-      "/Users/rebecca/code/npm/node_modules/wcwidth"
-    ]
-  ],
-  "_from": "defaults@>=1.0.0 <2.0.0",
-  "_id": "defaults@1.0.2",
-  "_inCache": true,
-  "_location": "/defaults",
-  "_npmUser": {
-    "email": "tmpvar@gmail.com",
-    "name": "tmpvar"
-  },
-  "_npmVersion": "1.4.23",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "defaults",
-    "raw": "defaults@^1.0.0",
-    "rawSpec": "^1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/wcwidth"
-  ],
-  "_resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz",
-  "_shasum": "6902e25aa047649a501e19ef9e98f3e8365c109a",
-  "_shrinkwrap": null,
-  "_spec": "defaults@^1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/wcwidth",
-  "author": {
-    "email": "tmpvar@gmail.com",
-    "name": "Elijah Insua"
-  },
-  "bugs": {
-    "url": "https://github.com/tmpvar/defaults/issues"
-  },
-  "dependencies": {
-    "clone": "~0.1.5"
-  },
-  "description": "merge single level defaults over a config object",
-  "devDependencies": {
-    "tap": "~0.4.0"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "6902e25aa047649a501e19ef9e98f3e8365c109a",
-    "tarball": "http://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz"
-  },
-  "gitHead": "22c57d1f87a2f03c1f9d21bd39c67db8553a0064",
-  "homepage": "https://github.com/tmpvar/defaults",
-  "keywords": [
-    "config",
-    "defaults"
-  ],
-  "license": "MIT",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "tmpvar",
-      "email": "tmpvar@gmail.com"
-    }
-  ],
-  "name": "defaults",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/tmpvar/defaults.git"
-  },
-  "scripts": {
-    "test": "node test.js"
-  },
-  "version": "1.0.2"
-}
diff --git a/deps/npm/node_modules/asap/CHANGES.md b/deps/npm/node_modules/dezalgo/node_modules/asap/CHANGES.md
similarity index 100%
rename from deps/npm/node_modules/asap/CHANGES.md
rename to deps/npm/node_modules/dezalgo/node_modules/asap/CHANGES.md
diff --git a/deps/npm/node_modules/asap/LICENSE.md b/deps/npm/node_modules/dezalgo/node_modules/asap/LICENSE.md
similarity index 100%
rename from deps/npm/node_modules/asap/LICENSE.md
rename to deps/npm/node_modules/dezalgo/node_modules/asap/LICENSE.md
diff --git a/deps/npm/node_modules/asap/README.md b/deps/npm/node_modules/dezalgo/node_modules/asap/README.md
similarity index 100%
rename from deps/npm/node_modules/asap/README.md
rename to deps/npm/node_modules/dezalgo/node_modules/asap/README.md
diff --git a/deps/npm/node_modules/asap/asap.js b/deps/npm/node_modules/dezalgo/node_modules/asap/asap.js
similarity index 100%
rename from deps/npm/node_modules/asap/asap.js
rename to deps/npm/node_modules/dezalgo/node_modules/asap/asap.js
diff --git a/deps/npm/node_modules/asap/browser-asap.js b/deps/npm/node_modules/dezalgo/node_modules/asap/browser-asap.js
similarity index 100%
rename from deps/npm/node_modules/asap/browser-asap.js
rename to deps/npm/node_modules/dezalgo/node_modules/asap/browser-asap.js
diff --git a/deps/npm/node_modules/asap/browser-raw.js b/deps/npm/node_modules/dezalgo/node_modules/asap/browser-raw.js
similarity index 100%
rename from deps/npm/node_modules/asap/browser-raw.js
rename to deps/npm/node_modules/dezalgo/node_modules/asap/browser-raw.js
diff --git a/deps/npm/node_modules/dezalgo/node_modules/asap/package.json b/deps/npm/node_modules/dezalgo/node_modules/asap/package.json
new file mode 100644
index 00000000000000..ba54d711f849cd
--- /dev/null
+++ b/deps/npm/node_modules/dezalgo/node_modules/asap/package.json
@@ -0,0 +1,64 @@
+{
+  "name": "asap",
+  "version": "2.0.3",
+  "description": "High-priority task queue for Node.js and browsers",
+  "keywords": [
+    "event",
+    "task",
+    "queue"
+  ],
+  "license": {
+    "type": "MIT",
+    "url": "https://github.com/kriskowal/asap/raw/master/LICENSE.md"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/kriskowal/asap.git"
+  },
+  "main": "./asap.js",
+  "browser": {
+    "./asap.js": "./browser-asap.js",
+    "./raw.js": "./browser-raw.js",
+    "./test/domain.js": "./test/browser-domain.js"
+  },
+  "files": [
+    "raw.js",
+    "asap.js",
+    "browser-raw.js",
+    "browser-asap.js"
+  ],
+  "scripts": {
+    "test": "npm run lint && npm run test-node",
+    "test-travis": "npm run lint && npm run test-node && npm run test-saucelabs && npm run test-saucelabs-worker",
+    "test-node": "node test/asap-test.js",
+    "test-publish": "node scripts/publish-bundle.js test/asap-test.js | pbcopy",
+    "test-browser": "node scripts/publish-bundle.js test/asap-test.js | xargs opener",
+    "test-saucelabs": "node scripts/saucelabs.js test/asap-test.js scripts/saucelabs-spot-configurations.json",
+    "test-saucelabs-all": "node scripts/saucelabs.js test/asap-test.js scripts/saucelabs-all-configurations.json",
+    "test-saucelabs-worker": "node scripts/saucelabs-worker-test.js scripts/saucelabs-spot-configurations.json",
+    "test-saucelabs-worker-all": "node scripts/saucelabs-worker-test.js scripts/saucelabs-all-configurations.json",
+    "lint": "jshint raw.js asap.js browser-raw.js browser-asap.js $(find scripts -name '*.js' | grep -v gauntlet)"
+  },
+  "devDependencies": {
+    "events": "^1.0.1",
+    "jshint": "^2.5.1",
+    "knox": "^0.8.10",
+    "mr": "^2.0.5",
+    "opener": "^1.3.0",
+    "q": "^2.0.3",
+    "q-io": "^2.0.3",
+    "saucelabs": "^0.1.1",
+    "wd": "^0.2.21",
+    "weak-map": "^1.0.5"
+  },
+  "readme": "# ASAP\n\n[![Build Status](https://travis-ci.org/kriskowal/asap.png?branch=master)](https://travis-ci.org/kriskowal/asap)\n\nPromise and asynchronous observer libraries, as well as hand-rolled callback\nprograms and libraries, often need a mechanism to postpone the execution of a\ncallback until the next available event.\n(See [Designing API’s for Asynchrony][Zalgo].)\nThe `asap` function executes a task **as soon as possible** but not before it\nreturns, waiting only for the completion of the current event and previously\nscheduled tasks.\n\n```javascript\nasap(function () {\n    // ...\n});\n```\n\n[Zalgo]: http://blog.izs.me/post/59142742143/designing-apis-for-asynchrony\n\nThis CommonJS package provides an `asap` module that exports a function that\nexecutes a task function *as soon as possible*.\n\nASAP strives to schedule events to occur before yielding for IO, reflow,\nor redrawing.\nEach event receives an independent stack, with only platform code in parent\nframes and the events run in the order they are scheduled.\n\nASAP provides a fast event queue that will execute tasks until it is\nempty before yielding to the JavaScript engine's underlying event-loop.\nWhen a task gets added to a previously empty event queue, ASAP schedules a flush\nevent, preferring for that event to occur before the JavaScript engine has an\nopportunity to perform IO tasks or rendering, thus making the first task and\nsubsequent tasks semantically indistinguishable.\nASAP uses a variety of techniques to preserve this invariant on different\nversions of browsers and Node.js.\n\nBy design, ASAP prevents input events from being handled until the task\nqueue is empty.\nIf the process is busy enough, this may cause incoming connection requests to be\ndropped, and may cause existing connections to inform the sender to reduce the\ntransmission rate or stall.\nASAP allows this on the theory that, if there is enough work to do, there is no\nsense in looking for trouble.\nAs a consequence, ASAP can interfere with smooth animation.\nIf your task should be tied to the rendering loop, consider using\n`requestAnimationFrame` instead.\nA long sequence of tasks can also effect the long running script dialog.\nIf this is a problem, you may be able to use ASAP’s cousin `setImmediate` to\nbreak long processes into shorter intervals and periodically allow the browser\nto breathe.\n`setImmediate` will yield for IO, reflow, and repaint events.\nIt also returns a handler and can be canceled.\nFor a `setImmediate` shim, consider [YuzuJS setImmediate][setImmediate].\n\n[setImmediate]: https://github.com/YuzuJS/setImmediate\n\nTake care.\nASAP can sustain infinite recursive calls without warning.\nIt will not halt from a stack overflow, and it will not consume unbounded\nmemory.\nThis is behaviorally equivalent to an infinite loop.\nJust as with infinite loops, you can monitor a Node.js process for this behavior\nwith a heart-beat signal.\nAs with infinite loops, a very small amount of caution goes a long way to\navoiding problems.\n\n```javascript\nfunction loop() {\n    asap(loop);\n}\nloop();\n```\n\nIn browsers, if a task throws an exception, it will not interrupt the flushing\nof high-priority tasks.\nThe exception will be postponed to a later, low-priority event to avoid\nslow-downs.\nIn Node.js, if a task throws an exception, ASAP will resume flushing only if—and\nonly after—the error is handled by `domain.on(\"error\")` or\n`process.on(\"uncaughtException\")`.\n\n## Raw ASAP\n\nChecking for exceptions comes at a cost.\nThe package also provides an `asap/raw` module that exports the underlying\nimplementation which is faster but stalls if a task throws an exception.\nThis internal version of the ASAP function does not check for errors.\nIf a task does throw an error, it will stall the event queue unless you manually\ncall `rawAsap.requestFlush()` before throwing the error, or any time after.\n\nIn Node.js, `asap/raw` also runs all tasks outside any domain.\nIf you need a task to be bound to your domain, you will have to do it manually.\n\n```js\nif (process.domain) {\n    task = process.domain.bind(task);\n}\nrawAsap(task);\n```\n\n## Tasks\n\nA task may be any object that implements `call()`.\nA function will suffice, but closures tend not to be reusable and can cause\ngarbage collector churn.\nBoth `asap` and `rawAsap` accept task objects to give you the option of\nrecycling task objects or using higher callable object abstractions.\nSee the `asap` source for an illustration.\n\n\n## Compatibility\n\nASAP is tested on Node.js v0.10 and in a broad spectrum of web browsers.\nThe following charts capture the browser test results for the most recent\nrelease.\nThe first chart shows test results for ASAP running in the main window context.\nThe second chart shows test results for ASAP running in a web worker context.\nTest results are inconclusive (grey) on browsers that do not support web\nworkers.\nThese data are captured automatically by [Continuous\nIntegration][].\n\n[Continuous Integration]: https://github.com/kriskowal/asap/blob/master/CONTRIBUTING.md\n\n![Browser Compatibility](http://kriskowal-asap.s3-website-us-west-2.amazonaws.com/train/integration-2/saucelabs-results-matrix.svg)\n\n![Compatibility in Web Workers](http://kriskowal-asap.s3-website-us-west-2.amazonaws.com/train/integration-2/saucelabs-worker-results-matrix.svg)\n\n## Caveats\n\nWhen a task is added to an empty event queue, it is not always possible to\nguarantee that the task queue will begin flushing immediately after the current\nevent.\nHowever, once the task queue begins flushing, it will not yield until the queue\nis empty, even if the queue grows while executing tasks.\n\nThe following browsers allow the use of [DOM mutation observers][] to access\nthe HTML [microtask queue][], and thus begin flushing ASAP's task queue\nimmediately at the end of the current event loop turn, before any rendering or\nIO:\n\n[microtask queue]: http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#microtask-queue\n[DOM mutation observers]: http://dom.spec.whatwg.org/#mutation-observers\n\n- Android 4–4.3\n- Chrome 26–34\n- Firefox 14–29\n- Internet Explorer 11\n- iPad Safari 6–7.1\n- iPhone Safari 7–7.1\n- Safari 6–7\n\nIn the absense of mutation observers, there are a few browsers, and situations\nlike web workers in some of the above browsers,  where [message channels][]\nwould be a useful way to avoid falling back to timers.\nMessage channels give direct access to the HTML [task queue][], so the ASAP\ntask queue would flush after any already queued rendering and IO tasks, but\nwithout having the minimum delay imposed by timers.\nHowever, among these browsers, Internet Explorer 10 and Safari do not reliably\ndispatch messages, so they are not worth the trouble to implement.\n\n[message channels]: http://www.whatwg.org/specs/web-apps/current-work/multipage/web-messaging.html#message-channels\n[task queue]: http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#concept-task\n\n- Internet Explorer 10\n- Safair 5.0-1\n- Opera 11-12\n\nIn the absense of mutation observers, these browsers and the following browsers\nall fall back to using `setTimeout` and `setInterval` to ensure that a `flush`\noccurs.\nThe implementation uses both and cancels whatever handler loses the race, since\n`setTimeout` tends to occasionally skip tasks in unisolated circumstances.\nTimers generally delay the flushing of ASAP's task queue for four milliseconds.\n\n- Firefox 3–13\n- Internet Explorer 6–10\n- iPad Safari 4.3\n- Lynx 2.8.7\n\n\n## Heritage\n\nASAP has been factored out of the [Q][] asynchronous promise library.\nIt originally had a naïve implementation in terms of `setTimeout`, but\n[Malte Ubl][NonBlocking] provided an insight that `postMessage` might be\nuseful for creating a high-priority, no-delay event dispatch hack.\nSince then, Internet Explorer proposed and implemented `setImmediate`.\nRobert Katić began contributing to Q by measuring the performance of\nthe internal implementation of `asap`, paying particular attention to\nerror recovery.\nDomenic, Robert, and Kris Kowal collectively settled on the current strategy of\nunrolling the high-priority event queue internally regardless of what strategy\nwe used to dispatch the potentially lower-priority flush event.\nDomenic went on to make ASAP cooperate with Node.js domains.\n\n[Q]: https://github.com/kriskowal/q\n[NonBlocking]: http://www.nonblocking.io/2011/06/windownexttick.html\n\nFor further reading, Nicholas Zakas provided a thorough article on [The\nCase for setImmediate][NCZ].\n\n[NCZ]: http://www.nczonline.net/blog/2013/07/09/the-case-for-setimmediate/\n\nEmber’s RSVP promise implementation later [adopted][RSVP ASAP] the name ASAP but\nfurther developed the implentation.\nParticularly, The `MessagePort` implementation was abandoned due to interaction\n[problems with Mobile Internet Explorer][IE Problems] in favor of an\nimplementation backed on the newer and more reliable DOM `MutationObserver`\ninterface.\nThese changes were back-ported into this library.\n\n[IE Problems]: https://github.com/cujojs/when/issues/197\n[RSVP ASAP]: https://github.com/tildeio/rsvp.js/blob/cddf7232546a9cf858524b75cde6f9edf72620a7/lib/rsvp/asap.js\n\nIn addition, ASAP factored into `asap` and `asap/raw`, such that `asap` remained\nexception-safe, but `asap/raw` provided a tight kernel that could be used for\ntasks that guaranteed that they would not throw exceptions.\nThis core is useful for promise implementations that capture thrown errors in\nrejected promises and do not need a second safety net.\nAt the same time, the exception handling in `asap` was factored into separate\nimplementations for Node.js and browsers, using the the [Browserify][Browser\nConfig] `browser` property in `package.json` to instruct browser module loaders\nand bundlers, including [Browserify][], [Mr][], and [Mop][],  to use the\nbrowser-only implementation.\n\n[Browser Config]: https://gist.github.com/defunctzombie/4339901\n[Browserify]: https://github.com/substack/node-browserify\n[Mr]: https://github.com/montagejs/mr\n[Mop]: https://github.com/montagejs/mop\n\n## License\n\nCopyright 2009-2014 by Contributors\nMIT License (enclosed)\n\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/kriskowal/asap/issues"
+  },
+  "homepage": "https://github.com/kriskowal/asap#readme",
+  "_id": "asap@2.0.3",
+  "_shasum": "1fc1d1564ee11620dfca6d67029850913f9f4679",
+  "_resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz",
+  "_from": "asap@>=2.0.0 <3.0.0"
+}
diff --git a/deps/npm/node_modules/asap/raw.js b/deps/npm/node_modules/dezalgo/node_modules/asap/raw.js
similarity index 100%
rename from deps/npm/node_modules/asap/raw.js
rename to deps/npm/node_modules/dezalgo/node_modules/asap/raw.js
diff --git a/deps/npm/node_modules/dezalgo/package.json b/deps/npm/node_modules/dezalgo/package.json
index b59399450ddc4c..ea2b1a6d30d219 100644
--- a/deps/npm/node_modules/dezalgo/package.json
+++ b/deps/npm/node_modules/dezalgo/package.json
@@ -1,99 +1,52 @@
 {
-  "_args": [
-    [
-      "dezalgo@~1.0.3",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "dezalgo@>=1.0.3 <1.1.0",
-  "_id": "dezalgo@1.0.3",
-  "_inCache": true,
-  "_location": "/dezalgo",
-  "_nodeVersion": "2.0.2",
-  "_npmUser": {
-    "email": "ogd@aoaioxxysz.net",
-    "name": "othiym23"
-  },
-  "_npmVersion": "2.11.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "dezalgo",
-    "raw": "dezalgo@~1.0.3",
-    "rawSpec": "~1.0.3",
-    "scope": null,
-    "spec": ">=1.0.3 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/async-some",
-    "/read-package-tree",
-    "/readdir-scoped-modules",
-    "/realize-package-specifier"
-  ],
-  "_resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
-  "_shasum": "7f742de066fc748bc8db820569dddce49bf0d456",
-  "_shrinkwrap": null,
-  "_spec": "dezalgo@~1.0.3",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/npm/dezalgo/issues"
+  "name": "dezalgo",
+  "version": "1.0.3",
+  "description": "Contain async insanity so that the dark pony lord doesn't eat souls",
+  "main": "dezalgo.js",
+  "directories": {
+    "test": "test"
   },
   "dependencies": {
     "asap": "^2.0.0",
     "wrappy": "1"
   },
-  "description": "Contain async insanity so that the dark pony lord doesn't eat souls",
   "devDependencies": {
     "tap": "^1.2.0"
   },
-  "directories": {
-    "test": "test"
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "dist": {
-    "shasum": "7f742de066fc748bc8db820569dddce49bf0d456",
-    "tarball": "http://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/dezalgo.git"
   },
-  "gitHead": "d4d3f3f6f47b1a326194d5281349c83dde258458",
-  "homepage": "https://github.com/npm/dezalgo",
   "keywords": [
-    "H̝̪̜͓̀̌̂̒E̢̙̠̣ ̴̳͇̥̟̠͍̐C̹̓̑̐̆͝Ó̶̭͓̚M̬̼Ĕ̖̤͔͔̟̹̽̿̊ͥ̍ͫS̻̰̦̻̖̘̱̒ͪ͌̅͟",
-    "H̴̱̦̗̬̣͓̺e̮ ͉̠̰̞͎̖͟ẁh̛̺̯ͅo̖̫͡ ̢Ẁa̡̗i̸t͖̣͉̀ş͔̯̩ ̤̦̮͇̞̦̲B͎̭͇̦̼e̢hin͏͙̟̪d̴̰͓̻̣̮͕ͅ T͖̮̕h͖e̘̺̰̙͘ ̥Ẁ̦͔̻͚a̞͖̪͉l̪̠̻̰̣̠l̲͎͞",
-    "T̯̪ͅo̯͖̹ ̻̮̖̲͢i̥̖n̢͈͇̝͍v͏͉ok̭̬̝ͅe̞͍̩̫͍̩͝ ̩̮̖̟͇͉́t͔͔͎̗h͏̗̟e̘͉̰̦̠̞͓ ͕h͉̟͎̪̠̱͠ḭ̮̩v̺͉͇̩e̵͖-̺̪m͍i̜n̪̲̲̲̮d̷ ̢r̠̼̯̹̦̦͘ͅe͓̳͓̙p̺̗̫͙͘ͅr͔̰͜e̴͓̞s͉̩̩͟ͅe͏̣n͚͇̗̭̺͍tì͙̣n͏̖̥̗͎̰̪g̞͓̭̱̯̫̕ ̣̱͜ͅc̦̰̰̠̮͎͙̀hao̺̜̻͍͙ͅs͉͓̘.͎̼̺̼͕̹͘",
-    "Z̘͍̼͎̣͔͝Ą̲̜̱̱̹̤͇L̶̝̰̭͔G͍̖͍O̫͜ͅ!̼̤ͅ",
     "async",
-    "asynchrony of all holy and good",
-    "he comes",
-    "the dark pony",
     "zalgo",
+    "the dark pony",
+    "he comes",
+    "asynchrony of all holy and good",
+    "T̯̪ͅo̯͖̹ ̻̮̖̲͢i̥̖n̢͈͇̝͍v͏͉ok̭̬̝ͅe̞͍̩̫͍̩͝ ̩̮̖̟͇͉́t͔͔͎̗h͏̗̟e̘͉̰̦̠̞͓ ͕h͉̟͎̪̠̱͠ḭ̮̩v̺͉͇̩e̵͖-̺̪m͍i̜n̪̲̲̲̮d̷ ̢r̠̼̯̹̦̦͘ͅe͓̳͓̙p̺̗̫͙͘ͅr͔̰͜e̴͓̞s͉̩̩͟ͅe͏̣n͚͇̗̭̺͍tì͙̣n͏̖̥̗͎̰̪g̞͓̭̱̯̫̕ ̣̱͜ͅc̦̰̰̠̮͎͙̀hao̺̜̻͍͙ͅs͉͓̘.͎̼̺̼͕̹͘",
     "̠̞̱̰I͖͇̝̻n̦̰͍̰̟v̤̺̫̳̭̼̗͘ò̹̟̩̩͚k̢̥̠͍͉̦̬i̖͓͔̮̱̻͘n̶̳͙̫͎g̖̯̣̲̪͉ ̞͎̗͕͚ͅt̲͕̘̺̯̗̦h̘̦̲̜̻e̳͎͉̬͙ ̴̞̪̲̥f̜̯͓͓̭̭͢e̱̘͔̮e̜̤l̺̱͖̯͓͙͈͢i̵̦̬͉͔̫͚͕n͉g̨͖̙̙̹̹̟̤ ͉̪o̞̠͍̪̰͙ͅf̬̲̺ ͔͕̲͕͕̲̕c̙͉h̝͔̩̙̕ͅa̲͖̻̗̹o̥̼̫s̝̖̜̝͚̫̟.̺͚  ̸̱̲W̶̥̣͖̦i͏̤̬̱̳̣ͅt͉h̗̪̪ ̷̱͚̹̪ǫ͕̗̣̳̦͎u̼̦͔̥̮̕ţ͖͎̻͔͉ ̴͎̩òr̹̰̖͉͈͝d̷̲̦̖͓e̲͓̠r",
-    "̧͚̜͓̰̭̭Ṯ̫̹̜̮̟̮͝h͚̘̩̘̖̰́e ̥̘͓͉͔͙̼N̟̜̣̘͔̪e̞̞̤͢z̰̖̘͇p̠͟e̺̱̣͍͙̝ṛ̘̬͔̙͇̠d͝ḭ̯̱̥̗̩a̛ͅn͏̦ ̷̥hi̥v̖̳̹͉̮̱͝e̹̪̘̖̰̟-̴͙͓͚̜̻mi̗̺̻͙̺ͅn̪̯͈d ͏̘͓̫̳ͅơ̹͔̳̖̣͓f͈̹̘ ͕ͅc̗̤̠̜̮̥̥h̡͍̩̭̫͚̱a̤͉̤͔͜os͕̤̼͍̲̀ͅ.̡̱ ̦Za̯̱̗̭͍̣͚l̗͉̰̤g͏̣̭̬̗̲͖ͅo̶̭̩̳̟͈.̪̦̰̳"
-  ],
-  "license": "ISC",
-  "main": "dezalgo.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "isaacs@npmjs.com"
-    },
-    {
-      "name": "othiym23",
-      "email": "ogd@aoaioxxysz.net"
-    }
+    "̧͚̜͓̰̭̭Ṯ̫̹̜̮̟̮͝h͚̘̩̘̖̰́e ̥̘͓͉͔͙̼N̟̜̣̘͔̪e̞̞̤͢z̰̖̘͇p̠͟e̺̱̣͍͙̝ṛ̘̬͔̙͇̠d͝ḭ̯̱̥̗̩a̛ͅn͏̦ ̷̥hi̥v̖̳̹͉̮̱͝e̹̪̘̖̰̟-̴͙͓͚̜̻mi̗̺̻͙̺ͅn̪̯͈d ͏̘͓̫̳ͅơ̹͔̳̖̣͓f͈̹̘ ͕ͅc̗̤̠̜̮̥̥h̡͍̩̭̫͚̱a̤͉̤͔͜os͕̤̼͍̲̀ͅ.̡̱ ̦Za̯̱̗̭͍̣͚l̗͉̰̤g͏̣̭̬̗̲͖ͅo̶̭̩̳̟͈.̪̦̰̳",
+    "H̴̱̦̗̬̣͓̺e̮ ͉̠̰̞͎̖͟ẁh̛̺̯ͅo̖̫͡ ̢Ẁa̡̗i̸t͖̣͉̀ş͔̯̩ ̤̦̮͇̞̦̲B͎̭͇̦̼e̢hin͏͙̟̪d̴̰͓̻̣̮͕ͅ T͖̮̕h͖e̘̺̰̙͘ ̥Ẁ̦͔̻͚a̞͖̪͉l̪̠̻̰̣̠l̲͎͞",
+    "Z̘͍̼͎̣͔͝Ą̲̜̱̱̹̤͇L̶̝̰̭͔G͍̖͍O̫͜ͅ!̼̤ͅ",
+    "H̝̪̜͓̀̌̂̒E̢̙̠̣ ̴̳͇̥̟̠͍̐C̹̓̑̐̆͝Ó̶̭͓̚M̬̼Ĕ̖̤͔͔̟̹̽̿̊ͥ̍ͫS̻̰̦̻̖̘̱̒ͪ͌̅͟"
   ],
-  "name": "dezalgo",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/dezalgo.git"
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
   },
-  "scripts": {
-    "test": "tap test/*.js"
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/npm/dezalgo/issues"
   },
-  "version": "1.0.3"
+  "homepage": "https://github.com/npm/dezalgo",
+  "readme": "# dezalgo\n\nContain async insanity so that the dark pony lord doesn't eat souls\n\nSee [this blog\npost](http://blog.izs.me/post/59142742143/designing-apis-for-asynchrony).\n\n## USAGE\n\nPass a callback to `dezalgo` and it will ensure that it is *always*\ncalled in a future tick, and never in this tick.\n\n```javascript\nvar dz = require('dezalgo')\n\nvar cache = {}\nfunction maybeSync(arg, cb) {\n  cb = dz(cb)\n\n  // this will actually defer to nextTick\n  if (cache[arg]) cb(null, cache[arg])\n\n  fs.readFile(arg, function (er, data) {\n    // since this is *already* defered, it will call immediately\n    if (er) cb(er)\n    cb(null, cache[arg] = data)\n  })\n}\n```\n",
+  "readmeFilename": "README.md",
+  "gitHead": "d4d3f3f6f47b1a326194d5281349c83dde258458",
+  "_id": "dezalgo@1.0.3",
+  "_shasum": "7f742de066fc748bc8db820569dddce49bf0d456",
+  "_from": "dezalgo@>=1.0.3 <1.1.0"
 }
diff --git a/deps/npm/node_modules/editor/package.json b/deps/npm/node_modules/editor/package.json
index 8627e32661956d..48c09bff305707 100644
--- a/deps/npm/node_modules/editor/package.json
+++ b/deps/npm/node_modules/editor/package.json
@@ -1,84 +1,61 @@
 {
-  "_args": [
-    [
-      "editor@~1.0.0",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "editor@>=1.0.0 <1.1.0",
-  "_id": "editor@1.0.0",
-  "_inCache": true,
-  "_location": "/editor",
-  "_nodeVersion": "1.6.3",
-  "_npmUser": {
-    "email": "substack@gmail.com",
-    "name": "substack"
+  "name": "editor",
+  "version": "1.0.0",
+  "description": "launch $EDITOR in your program",
+  "main": "index.js",
+  "directories": {
+    "example": "example",
+    "test": "test"
   },
-  "_npmVersion": "2.7.5",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "editor",
-    "raw": "editor@~1.0.0",
-    "rawSpec": "~1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <1.1.0",
-    "type": "range"
+  "dependencies": {},
+  "devDependencies": {
+    "tap": "~0.4.4"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/substack/node-editor.git"
   },
-  "_requiredBy": [
-    "/"
+  "homepage": "https://github.com/substack/node-editor",
+  "keywords": [
+    "text",
+    "edit",
+    "shell"
   ],
-  "_resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz",
-  "_shasum": "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742",
-  "_shrinkwrap": null,
-  "_spec": "editor@~1.0.0",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "mail@substack.net",
     "name": "James Halliday",
+    "email": "mail@substack.net",
     "url": "http://substack.net"
   },
+  "license": "MIT",
+  "engine": {
+    "node": ">=0.6"
+  },
+  "gitHead": "15200af2c417c65a4df153f39f32143dcd476375",
   "bugs": {
     "url": "https://github.com/substack/node-editor/issues"
   },
-  "dependencies": {},
-  "description": "launch $EDITOR in your program",
-  "devDependencies": {
-    "tap": "~0.4.4"
-  },
-  "directories": {
-    "example": "example",
-    "test": "test"
+  "_id": "editor@1.0.0",
+  "_shasum": "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742",
+  "_from": "editor@>=1.0.0 <1.1.0",
+  "_npmVersion": "2.7.5",
+  "_nodeVersion": "1.6.3",
+  "_npmUser": {
+    "name": "substack",
+    "email": "substack@gmail.com"
   },
   "dist": {
     "shasum": "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742",
     "tarball": "http://registry.npmjs.org/editor/-/editor-1.0.0.tgz"
   },
-  "engine": {
-    "node": ">=0.6"
-  },
-  "gitHead": "15200af2c417c65a4df153f39f32143dcd476375",
-  "homepage": "https://github.com/substack/node-editor",
-  "keywords": [
-    "edit",
-    "shell",
-    "text"
-  ],
-  "license": "MIT",
-  "main": "index.js",
   "maintainers": [
     {
       "name": "substack",
       "email": "mail@substack.net"
     }
   ],
-  "name": "editor",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/substack/node-editor.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "1.0.0"
+  "_resolved": "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/escape-string-regexp/package.json b/deps/npm/node_modules/escape-string-regexp/package.json
deleted file mode 100644
index 18bc92013065f9..00000000000000
--- a/deps/npm/node_modules/escape-string-regexp/package.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "_args": [
-    [
-      "escape-string-regexp@^1.0.2",
-      "/Users/rebecca/code/npm/node_modules/chalk"
-    ]
-  ],
-  "_from": "escape-string-regexp@>=1.0.2 <2.0.0",
-  "_id": "escape-string-regexp@1.0.3",
-  "_inCache": true,
-  "_location": "/escape-string-regexp",
-  "_nodeVersion": "0.10.35",
-  "_npmUser": {
-    "email": "jappelman@xebia.com",
-    "name": "jbnicolai"
-  },
-  "_npmVersion": "2.1.16",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "escape-string-regexp",
-    "raw": "escape-string-regexp@^1.0.2",
-    "rawSpec": "^1.0.2",
-    "scope": null,
-    "spec": ">=1.0.2 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/chalk"
-  ],
-  "_resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
-  "_shasum": "9e2d8b25bc2555c3336723750e03f099c2735bb5",
-  "_shrinkwrap": null,
-  "_spec": "escape-string-regexp@^1.0.2",
-  "_where": "/Users/rebecca/code/npm/node_modules/chalk",
-  "author": {
-    "email": "sindresorhus@gmail.com",
-    "name": "Sindre Sorhus",
-    "url": "http://sindresorhus.com"
-  },
-  "bugs": {
-    "url": "https://github.com/sindresorhus/escape-string-regexp/issues"
-  },
-  "dependencies": {},
-  "description": "Escape RegExp special characters",
-  "devDependencies": {
-    "mocha": "*"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "9e2d8b25bc2555c3336723750e03f099c2735bb5",
-    "tarball": "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
-  },
-  "engines": {
-    "node": ">=0.8.0"
-  },
-  "files": [
-    "index.js"
-  ],
-  "gitHead": "1e446e6b4449b5f1f8868cd31bf8fd25ee37fb4b",
-  "homepage": "https://github.com/sindresorhus/escape-string-regexp",
-  "keywords": [
-    "characters",
-    "escape",
-    "expression",
-    "re",
-    "regex",
-    "regexp",
-    "regular",
-    "special",
-    "str",
-    "string"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    },
-    {
-      "name": "jbnicolai",
-      "email": "jappelman@xebia.com"
-    }
-  ],
-  "name": "escape-string-regexp",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/sindresorhus/escape-string-regexp"
-  },
-  "scripts": {
-    "test": "mocha"
-  },
-  "version": "1.0.3"
-}
diff --git a/deps/npm/node_modules/forever-agent/package.json b/deps/npm/node_modules/forever-agent/package.json
deleted file mode 100644
index d22d4c03223118..00000000000000
--- a/deps/npm/node_modules/forever-agent/package.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "_args": [
-    [
-      "forever-agent@~0.6.0",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "forever-agent@>=0.6.0 <0.7.0",
-  "_id": "forever-agent@0.6.1",
-  "_inCache": true,
-  "_location": "/forever-agent",
-  "_npmUser": {
-    "email": "simeonvelichkov@gmail.com",
-    "name": "simov"
-  },
-  "_npmVersion": "1.4.28",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "forever-agent",
-    "raw": "forever-agent@~0.6.0",
-    "rawSpec": "~0.6.0",
-    "scope": null,
-    "spec": ">=0.6.0 <0.7.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/request"
-  ],
-  "_resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-  "_shasum": "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91",
-  "_shrinkwrap": null,
-  "_spec": "forever-agent@~0.6.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
-  "author": {
-    "email": "mikeal.rogers@gmail.com",
-    "name": "Mikeal Rogers",
-    "url": "http://www.futurealoof.com"
-  },
-  "bugs": {
-    "url": "https://github.com/mikeal/forever-agent/issues"
-  },
-  "dependencies": {},
-  "description": "HTTP Agent that keeps socket connections alive between keep-alive requests. Formerly part of mikeal/request, now a standalone module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91",
-    "tarball": "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
-  },
-  "engines": {
-    "node": "*"
-  },
-  "gitHead": "1b3b6163f2b3c2c4122bbfa288c1325c0df9871d",
-  "homepage": "https://github.com/mikeal/forever-agent",
-  "license": "Apache-2.0",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "mikeal",
-      "email": "mikeal.rogers@gmail.com"
-    },
-    {
-      "name": "nylen",
-      "email": "jnylen@gmail.com"
-    },
-    {
-      "name": "simov",
-      "email": "simeonvelichkov@gmail.com"
-    }
-  ],
-  "name": "forever-agent",
-  "optionalDependencies": {},
-  "repository": {
-    "url": "https://github.com/mikeal/forever-agent"
-  },
-  "scripts": {},
-  "version": "0.6.1"
-}
diff --git a/deps/npm/node_modules/fs-vacuum/package.json b/deps/npm/node_modules/fs-vacuum/package.json
index da4465c95ad119..a1eb3f128684da 100644
--- a/deps/npm/node_modules/fs-vacuum/package.json
+++ b/deps/npm/node_modules/fs-vacuum/package.json
@@ -1,70 +1,53 @@
 {
-  "_args": [
-    [
-      "fs-vacuum@~1.2.6",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "fs-vacuum@>=1.2.6 <1.3.0",
-  "_id": "fs-vacuum@1.2.7",
-  "_inCache": true,
-  "_location": "/fs-vacuum",
-  "_nodeVersion": "2.2.2",
-  "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
+  "name": "fs-vacuum",
+  "version": "1.2.7",
+  "description": "recursively remove empty directories -- to a point",
+  "main": "vacuum.js",
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "_npmVersion": "2.14.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "fs-vacuum",
-    "raw": "fs-vacuum@~1.2.6",
-    "rawSpec": "~1.2.6",
-    "scope": null,
-    "spec": ">=1.2.6 <1.3.0",
-    "type": "range"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/fs-vacuum.git"
   },
-  "_requiredBy": [
-    "/"
+  "keywords": [
+    "rm",
+    "rimraf",
+    "clean"
   ],
-  "_resolved": "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.7.tgz",
-  "_shasum": "75e501f9d2889ba2fe9fe12f936ba5dad50ca35a",
-  "_shrinkwrap": null,
-  "_spec": "fs-vacuum@~1.2.6",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "ogd@aoaioxxysz.net",
-    "name": "Forrest L Norvell"
+    "name": "Forrest L Norvell",
+    "email": "ogd@aoaioxxysz.net"
   },
+  "license": "ISC",
   "bugs": {
     "url": "https://github.com/npm/fs-vacuum/issues"
   },
+  "homepage": "https://github.com/npm/fs-vacuum",
+  "devDependencies": {
+    "mkdirp": "^0.5.0",
+    "tap": "^0.4.11",
+    "tmp": "0.0.24"
+  },
   "dependencies": {
     "graceful-fs": "^4.1.2",
     "path-is-inside": "^1.0.1",
     "rimraf": "^2.2.8"
   },
-  "description": "recursively remove empty directories -- to a point",
-  "devDependencies": {
-    "mkdirp": "^0.5.0",
-    "tap": "^0.4.11",
-    "tmp": "0.0.24"
+  "gitHead": "498a44d987ee11bc355fe1ec479d55a689fc37ef",
+  "_id": "fs-vacuum@1.2.7",
+  "_shasum": "75e501f9d2889ba2fe9fe12f936ba5dad50ca35a",
+  "_from": "fs-vacuum@>=1.2.7 <1.3.0",
+  "_npmVersion": "2.14.3",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
   },
-  "directories": {},
   "dist": {
     "shasum": "75e501f9d2889ba2fe9fe12f936ba5dad50ca35a",
     "tarball": "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.7.tgz"
   },
-  "gitHead": "498a44d987ee11bc355fe1ec479d55a689fc37ef",
-  "homepage": "https://github.com/npm/fs-vacuum",
-  "installable": true,
-  "keywords": [
-    "clean",
-    "rimraf",
-    "rm"
-  ],
-  "license": "ISC",
-  "main": "vacuum.js",
   "maintainers": [
     {
       "name": "othiym23",
@@ -75,14 +58,6 @@
       "email": "kat@sykosomatic.org"
     }
   ],
-  "name": "fs-vacuum",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/fs-vacuum.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "1.2.7"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.7.tgz"
 }
diff --git a/deps/npm/node_modules/fs-write-stream-atomic/package.json b/deps/npm/node_modules/fs-write-stream-atomic/package.json
index 46a8546ba8befd..a226dbe48dfa68 100644
--- a/deps/npm/node_modules/fs-write-stream-atomic/package.json
+++ b/deps/npm/node_modules/fs-write-stream-atomic/package.json
@@ -1,64 +1,48 @@
 {
-  "_args": [
-    [
-      "fs-write-stream-atomic@~1.0.3",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "fs-write-stream-atomic@>=1.0.3 <1.1.0",
-  "_id": "fs-write-stream-atomic@1.0.4",
-  "_inCache": true,
-  "_location": "/fs-write-stream-atomic",
-  "_nodeVersion": "2.2.2",
-  "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
+  "name": "fs-write-stream-atomic",
+  "version": "1.0.4",
+  "description": "Like `fs.createWriteStream(...)`, but atomic.",
+  "main": "index.js",
+  "directories": {
+    "test": "test"
   },
-  "_npmVersion": "2.14.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "fs-write-stream-atomic",
-    "raw": "fs-write-stream-atomic@~1.0.3",
-    "rawSpec": "~1.0.3",
-    "scope": null,
-    "spec": ">=1.0.3 <1.1.0",
-    "type": "range"
+  "dependencies": {
+    "graceful-fs": "^4.1.2"
+  },
+  "devDependencies": {
+    "tap": "^1.2.0"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/fs-write-stream-atomic.git"
   },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.4.tgz",
-  "_shasum": "c1ea55889f036ceebdead7d1055edbad998fe5e9",
-  "_shrinkwrap": null,
-  "_spec": "fs-write-stream-atomic@~1.0.3",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
+  "license": "ISC",
   "bugs": {
     "url": "https://github.com/npm/fs-write-stream-atomic/issues"
   },
-  "dependencies": {
-    "graceful-fs": "^4.1.2"
-  },
-  "description": "Like `fs.createWriteStream(...)`, but atomic.",
-  "devDependencies": {
-    "tap": "^1.2.0"
-  },
-  "directories": {
-    "test": "test"
+  "homepage": "https://github.com/npm/fs-write-stream-atomic",
+  "gitHead": "6ca2651b913149543c5390c6c4f7d370bdca42b5",
+  "_id": "fs-write-stream-atomic@1.0.4",
+  "_shasum": "c1ea55889f036ceebdead7d1055edbad998fe5e9",
+  "_from": "fs-write-stream-atomic@>=1.0.4 <1.1.0",
+  "_npmVersion": "2.14.3",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
   },
   "dist": {
     "shasum": "c1ea55889f036ceebdead7d1055edbad998fe5e9",
     "tarball": "http://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.4.tgz"
   },
-  "gitHead": "6ca2651b913149543c5390c6c4f7d370bdca42b5",
-  "homepage": "https://github.com/npm/fs-write-stream-atomic",
-  "installable": true,
-  "license": "ISC",
-  "main": "index.js",
   "maintainers": [
     {
       "name": "iarna",
@@ -73,14 +57,5 @@
       "email": "kat@sykosomatic.org"
     }
   ],
-  "name": "fs-write-stream-atomic",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/fs-write-stream-atomic.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "1.0.4"
+  "_resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.4.tgz"
 }
diff --git a/deps/npm/node_modules/fstream-ignore/.npmignore b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/.npmignore
similarity index 100%
rename from deps/npm/node_modules/fstream-ignore/.npmignore
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/.npmignore
diff --git a/deps/npm/node_modules/fstream-ignore/LICENSE b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/LICENSE
similarity index 100%
rename from deps/npm/node_modules/fstream-ignore/LICENSE
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/LICENSE
diff --git a/deps/npm/node_modules/fstream-ignore/README.md b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/README.md
similarity index 100%
rename from deps/npm/node_modules/fstream-ignore/README.md
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/README.md
diff --git a/deps/npm/node_modules/fstream-ignore/example/basic.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/example/basic.js
similarity index 100%
rename from deps/npm/node_modules/fstream-ignore/example/basic.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/example/basic.js
diff --git a/deps/npm/node_modules/fstream-ignore/ignore.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/ignore.js
similarity index 100%
rename from deps/npm/node_modules/fstream-ignore/ignore.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/ignore.js
diff --git a/deps/npm/node_modules/json-stringify-safe/LICENSE b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/LICENSE
similarity index 100%
rename from deps/npm/node_modules/json-stringify-safe/LICENSE
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/LICENSE
diff --git a/deps/npm/node_modules/minimatch/README.md b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/README.md
similarity index 100%
rename from deps/npm/node_modules/minimatch/README.md
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/README.md
diff --git a/deps/npm/node_modules/minimatch/browser.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/browser.js
similarity index 100%
rename from deps/npm/node_modules/minimatch/browser.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/browser.js
diff --git a/deps/npm/node_modules/minimatch/minimatch.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/minimatch.js
similarity index 100%
rename from deps/npm/node_modules/minimatch/minimatch.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/minimatch.js
diff --git a/deps/npm/node_modules/brace-expansion/.npmignore b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/.npmignore
similarity index 100%
rename from deps/npm/node_modules/brace-expansion/.npmignore
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/.npmignore
diff --git a/deps/npm/node_modules/brace-expansion/README.md b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/README.md
similarity index 100%
rename from deps/npm/node_modules/brace-expansion/README.md
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/README.md
diff --git a/deps/npm/node_modules/brace-expansion/example.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/example.js
similarity index 100%
rename from deps/npm/node_modules/brace-expansion/example.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/example.js
diff --git a/deps/npm/node_modules/brace-expansion/index.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/index.js
similarity index 100%
rename from deps/npm/node_modules/brace-expansion/index.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/index.js
diff --git a/deps/npm/node_modules/balanced-match/.npmignore b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore
similarity index 100%
rename from deps/npm/node_modules/balanced-match/.npmignore
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore
diff --git a/deps/npm/node_modules/balanced-match/.travis.yml b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/balanced-match/.travis.yml
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml
diff --git a/deps/npm/node_modules/balanced-match/Makefile b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
similarity index 100%
rename from deps/npm/node_modules/balanced-match/Makefile
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
diff --git a/deps/npm/node_modules/balanced-match/README.md b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
similarity index 100%
rename from deps/npm/node_modules/balanced-match/README.md
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
diff --git a/deps/npm/node_modules/balanced-match/example.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
similarity index 100%
rename from deps/npm/node_modules/balanced-match/example.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
diff --git a/deps/npm/node_modules/balanced-match/index.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
similarity index 100%
rename from deps/npm/node_modules/balanced-match/index.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
new file mode 100644
index 00000000000000..35332a3c4eb366
--- /dev/null
+++ b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
@@ -0,0 +1,56 @@
+{
+  "name": "balanced-match",
+  "description": "Match balanced character pairs, like \"{\" and \"}\"",
+  "version": "0.2.0",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/juliangruber/balanced-match.git"
+  },
+  "homepage": "https://github.com/juliangruber/balanced-match",
+  "main": "index.js",
+  "scripts": {
+    "test": "make test"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "tape": "~1.1.1"
+  },
+  "keywords": [
+    "match",
+    "regexp",
+    "test",
+    "balanced",
+    "parse"
+  ],
+  "author": {
+    "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
+    "url": "http://juliangruber.com"
+  },
+  "license": "MIT",
+  "testling": {
+    "files": "test/*.js",
+    "browsers": [
+      "ie/8..latest",
+      "firefox/20..latest",
+      "firefox/nightly",
+      "chrome/25..latest",
+      "chrome/canary",
+      "opera/12..latest",
+      "opera/next",
+      "safari/5.1..latest",
+      "ipad/6.0..latest",
+      "iphone/6.0..latest",
+      "android-browser/4.2..latest"
+    ]
+  },
+  "readme": "# balanced-match\n\nMatch balanced string pairs, like `{` and `}` or `<b>` and `</b>`.\n\n[![build status](https://secure.travis-ci.org/juliangruber/balanced-match.svg)](http://travis-ci.org/juliangruber/balanced-match)\n[![downloads](https://img.shields.io/npm/dm/balanced-match.svg)](https://www.npmjs.org/package/balanced-match)\n\n[![testling badge](https://ci.testling.com/juliangruber/balanced-match.png)](https://ci.testling.com/juliangruber/balanced-match)\n\n## Example\n\nGet the first matching pair of braces:\n\n```js\nvar balanced = require('balanced-match');\n\nconsole.log(balanced('{', '}', 'pre{in{nested}}post'));\nconsole.log(balanced('{', '}', 'pre{first}between{second}post'));\n```\n\nThe matches are:\n\n```bash\n$ node example.js\n{ start: 3, end: 14, pre: 'pre', body: 'in{nested}', post: 'post' }\n{ start: 3,\n  end: 9,\n  pre: 'pre',\n  body: 'first',\n  post: 'between{second}post' }\n```\n\n## API\n\n### var m = balanced(a, b, str)\n\nFor the first non-nested matching pair of `a` and `b` in `str`, return an\nobject with those keys:\n\n* **start** the index of the first match of `a`\n* **end** the index of the matching `b`\n* **pre** the preamble, `a` and `b` not included\n* **body** the match, `a` and `b` not included\n* **post** the postscript, `a` and `b` not included\n\nIf there's no match, `undefined` will be returned.\n\nIf the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `['{', 'a', '']`.\n\n## Installation\n\nWith [npm](https://npmjs.org) do:\n\n```bash\nnpm install balanced-match\n```\n\n## License\n\n(MIT)\n\nCopyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the \"Software\"), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\nof the Software, and to permit persons to whom the Software is furnished to do\nso, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/juliangruber/balanced-match/issues"
+  },
+  "_id": "balanced-match@0.2.0",
+  "_shasum": "38f6730c03aab6d5edbb52bd934885e756d71674",
+  "_resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+  "_from": "balanced-match@>=0.2.0 <0.3.0"
+}
diff --git a/deps/npm/node_modules/balanced-match/test/balanced.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js
similarity index 100%
rename from deps/npm/node_modules/balanced-match/test/balanced.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js
diff --git a/deps/npm/node_modules/concat-map/.travis.yml b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/concat-map/.travis.yml
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml
diff --git a/deps/npm/node_modules/concat-map/LICENSE b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE
similarity index 100%
rename from deps/npm/node_modules/concat-map/LICENSE
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE
diff --git a/deps/npm/node_modules/concat-map/README.markdown b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
similarity index 100%
rename from deps/npm/node_modules/concat-map/README.markdown
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
diff --git a/deps/npm/node_modules/concat-map/example/map.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js
similarity index 100%
rename from deps/npm/node_modules/concat-map/example/map.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js
diff --git a/deps/npm/node_modules/concat-map/index.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
similarity index 100%
rename from deps/npm/node_modules/concat-map/index.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
diff --git a/deps/npm/node_modules/concat-map/package.json b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
similarity index 66%
rename from deps/npm/node_modules/concat-map/package.json
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
index 6b398a35026372..b516138098fba9 100644
--- a/deps/npm/node_modules/concat-map/package.json
+++ b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
@@ -1,107 +1,83 @@
 {
-  "_args": [
-    [
-      "concat-map@0.0.1",
-      "/Users/rebecca/code/npm/node_modules/brace-expansion"
-    ]
-  ],
-  "_from": "concat-map@0.0.1",
-  "_id": "concat-map@0.0.1",
-  "_inCache": true,
-  "_location": "/concat-map",
-  "_npmUser": {
-    "email": "mail@substack.net",
-    "name": "substack"
-  },
-  "_npmVersion": "1.3.21",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "concat-map",
-    "raw": "concat-map@0.0.1",
-    "rawSpec": "0.0.1",
-    "scope": null,
-    "spec": "0.0.1",
-    "type": "version"
-  },
-  "_requiredBy": [
-    "/brace-expansion"
-  ],
-  "_resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-  "_shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
-  "_shrinkwrap": null,
-  "_spec": "concat-map@0.0.1",
-  "_where": "/Users/rebecca/code/npm/node_modules/brace-expansion",
-  "author": {
-    "email": "mail@substack.net",
-    "name": "James Halliday",
-    "url": "http://substack.net"
-  },
-  "bugs": {
-    "url": "https://github.com/substack/node-concat-map/issues"
-  },
-  "dependencies": {},
+  "name": "concat-map",
   "description": "concatenative mapdashery",
-  "devDependencies": {
-    "tape": "~2.4.0"
-  },
-  "directories": {
-    "example": "example",
-    "test": "test"
-  },
-  "dist": {
-    "shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
-    "tarball": "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+  "version": "0.0.1",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/substack/node-concat-map.git"
   },
-  "homepage": "https://github.com/substack/node-concat-map",
+  "main": "index.js",
   "keywords": [
     "concat",
     "concatMap",
+    "map",
     "functional",
-    "higher-order",
-    "map"
+    "higher-order"
   ],
-  "license": "MIT",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "substack",
-      "email": "mail@substack.net"
-    }
-  ],
-  "name": "concat-map",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/substack/node-concat-map.git"
+  "directories": {
+    "example": "example",
+    "test": "test"
   },
   "scripts": {
     "test": "tape test/*.js"
   },
+  "devDependencies": {
+    "tape": "~2.4.0"
+  },
+  "license": "MIT",
+  "author": {
+    "name": "James Halliday",
+    "email": "mail@substack.net",
+    "url": "http://substack.net"
+  },
   "testling": {
+    "files": "test/*.js",
     "browsers": {
-      "chrome": [
-        10,
-        22
-      ],
-      "ff": [
-        10,
-        15,
-        3.5
-      ],
       "ie": [
         6,
         7,
         8,
         9
       ],
-      "opera": [
-        12
+      "ff": [
+        3.5,
+        10,
+        15
+      ],
+      "chrome": [
+        10,
+        22
       ],
       "safari": [
         5.1
+      ],
+      "opera": [
+        12
       ]
-    },
-    "files": "test/*.js"
+    }
+  },
+  "bugs": {
+    "url": "https://github.com/substack/node-concat-map/issues"
+  },
+  "homepage": "https://github.com/substack/node-concat-map",
+  "_id": "concat-map@0.0.1",
+  "dist": {
+    "shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
+    "tarball": "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
   },
-  "version": "0.0.1"
+  "_from": "concat-map@0.0.1",
+  "_npmVersion": "1.3.21",
+  "_npmUser": {
+    "name": "substack",
+    "email": "mail@substack.net"
+  },
+  "maintainers": [
+    {
+      "name": "substack",
+      "email": "mail@substack.net"
+    }
+  ],
+  "_shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
+  "_resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/concat-map/test/map.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
similarity index 100%
rename from deps/npm/node_modules/concat-map/test/map.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
diff --git a/deps/npm/node_modules/brace-expansion/package.json b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/package.json
similarity index 60%
rename from deps/npm/node_modules/brace-expansion/package.json
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/package.json
index 5e70336f86ed64..4cb3e05d7ceb6c 100644
--- a/deps/npm/node_modules/brace-expansion/package.json
+++ b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/package.json
@@ -1,67 +1,60 @@
 {
-  "_args": [
-    [
-      "brace-expansion@^1.0.0",
-      "/Users/rebecca/code/npm/node_modules/glob/node_modules/minimatch"
-    ],
-    [
-      "brace-expansion@^1.0.0",
-      "/Users/rebecca/code/npm/node_modules/minimatch"
-    ]
-  ],
-  "_from": "brace-expansion@>=1.0.0 <2.0.0",
-  "_id": "brace-expansion@1.1.1",
-  "_inCache": true,
-  "_location": "/brace-expansion",
-  "_nodeVersion": "0.10.36",
-  "_npmUser": {
-    "email": "julian@juliangruber.com",
-    "name": "juliangruber"
-  },
-  "_npmVersion": "2.6.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "brace-expansion",
-    "raw": "brace-expansion@^1.0.0",
-    "rawSpec": "^1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/minimatch",
-    "/node-gyp/glob/minimatch"
-  ],
-  "_shrinkwrap": null,
-  "_spec": "brace-expansion@^1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/minimatch",
-  "author": {
-    "email": "mail@juliangruber.com",
-    "name": "Julian Gruber",
-    "url": "http://juliangruber.com"
+  "name": "brace-expansion",
+  "description": "Brace expansion as known from sh/bash",
+  "version": "1.1.1",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/juliangruber/brace-expansion.git"
   },
-  "bugs": {
-    "url": "https://github.com/juliangruber/brace-expansion/issues"
+  "homepage": "https://github.com/juliangruber/brace-expansion",
+  "main": "index.js",
+  "scripts": {
+    "test": "tape test/*.js",
+    "gentest": "bash test/generate.sh"
   },
   "dependencies": {
     "balanced-match": "^0.2.0",
     "concat-map": "0.0.1"
   },
-  "description": "Brace expansion as known from sh/bash",
   "devDependencies": {
     "tape": "^3.0.3"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "da5fb78aef4c44c9e4acf525064fb3208ebab045",
-    "tarball": "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz"
-  },
-  "gitHead": "f50da498166d76ea570cf3b30179f01f0f119612",
-  "homepage": "https://github.com/juliangruber/brace-expansion",
-  "installable": true,
   "keywords": [],
+  "author": {
+    "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
+    "url": "http://juliangruber.com"
+  },
   "license": "MIT",
-  "main": "index.js",
+  "testling": {
+    "files": "test/*.js",
+    "browsers": [
+      "ie/8..latest",
+      "firefox/20..latest",
+      "firefox/nightly",
+      "chrome/25..latest",
+      "chrome/canary",
+      "opera/12..latest",
+      "opera/next",
+      "safari/5.1..latest",
+      "ipad/6.0..latest",
+      "iphone/6.0..latest",
+      "android-browser/4.2..latest"
+    ]
+  },
+  "gitHead": "f50da498166d76ea570cf3b30179f01f0f119612",
+  "bugs": {
+    "url": "https://github.com/juliangruber/brace-expansion/issues"
+  },
+  "_id": "brace-expansion@1.1.1",
+  "_shasum": "da5fb78aef4c44c9e4acf525064fb3208ebab045",
+  "_from": "brace-expansion@>=1.0.0 <2.0.0",
+  "_npmVersion": "2.6.1",
+  "_nodeVersion": "0.10.36",
+  "_npmUser": {
+    "name": "juliangruber",
+    "email": "julian@juliangruber.com"
+  },
   "maintainers": [
     {
       "name": "juliangruber",
@@ -72,31 +65,11 @@
       "email": "isaacs@npmjs.com"
     }
   ],
-  "name": "brace-expansion",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/juliangruber/brace-expansion.git"
-  },
-  "scripts": {
-    "gentest": "bash test/generate.sh",
-    "test": "tape test/*.js"
-  },
-  "testling": {
-    "browsers": [
-      "android-browser/4.2..latest",
-      "chrome/25..latest",
-      "chrome/canary",
-      "firefox/20..latest",
-      "firefox/nightly",
-      "ie/8..latest",
-      "ipad/6.0..latest",
-      "iphone/6.0..latest",
-      "opera/12..latest",
-      "opera/next",
-      "safari/5.1..latest"
-    ],
-    "files": "test/*.js"
+  "dist": {
+    "shasum": "da5fb78aef4c44c9e4acf525064fb3208ebab045",
+    "tarball": "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz"
   },
-  "version": "1.1.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/package.json b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/package.json
new file mode 100644
index 00000000000000..e9256630aa3819
--- /dev/null
+++ b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/package.json
@@ -0,0 +1,46 @@
+{
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me"
+  },
+  "name": "minimatch",
+  "description": "a glob matcher in javascript",
+  "version": "2.0.10",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/minimatch.git"
+  },
+  "main": "minimatch.js",
+  "scripts": {
+    "posttest": "standard minimatch.js test/*.js",
+    "test": "tap test/*.js",
+    "prepublish": "browserify -o browser.js -e minimatch.js -s minimatch --bare"
+  },
+  "engines": {
+    "node": "*"
+  },
+  "dependencies": {
+    "brace-expansion": "^1.0.0"
+  },
+  "devDependencies": {
+    "browserify": "^9.0.3",
+    "standard": "^3.7.2",
+    "tap": "^1.2.0"
+  },
+  "license": "ISC",
+  "files": [
+    "minimatch.js",
+    "browser.js"
+  ],
+  "readme": "# minimatch\n\nA minimal matching utility.\n\n[![Build Status](https://secure.travis-ci.org/isaacs/minimatch.png)](http://travis-ci.org/isaacs/minimatch)\n\n\nThis is the matching library used internally by npm.\n\nIt works by converting glob expressions into JavaScript `RegExp`\nobjects.\n\n## Usage\n\n```javascript\nvar minimatch = require(\"minimatch\")\n\nminimatch(\"bar.foo\", \"*.foo\") // true!\nminimatch(\"bar.foo\", \"*.bar\") // false!\nminimatch(\"bar.foo\", \"*.+(bar|foo)\", { debug: true }) // true, and noisy!\n```\n\n## Features\n\nSupports these glob features:\n\n* Brace Expansion\n* Extended glob matching\n* \"Globstar\" `**` matching\n\nSee:\n\n* `man sh`\n* `man bash`\n* `man 3 fnmatch`\n* `man 5 gitignore`\n\n## Minimatch Class\n\nCreate a minimatch object by instanting the `minimatch.Minimatch` class.\n\n```javascript\nvar Minimatch = require(\"minimatch\").Minimatch\nvar mm = new Minimatch(pattern, options)\n```\n\n### Properties\n\n* `pattern` The original pattern the minimatch object represents.\n* `options` The options supplied to the constructor.\n* `set` A 2-dimensional array of regexp or string expressions.\n  Each row in the\n  array corresponds to a brace-expanded pattern.  Each item in the row\n  corresponds to a single path-part.  For example, the pattern\n  `{a,b/c}/d` would expand to a set of patterns like:\n\n        [ [ a, d ]\n        , [ b, c, d ] ]\n\n    If a portion of the pattern doesn't have any \"magic\" in it\n    (that is, it's something like `\"foo\"` rather than `fo*o?`), then it\n    will be left as a string rather than converted to a regular\n    expression.\n\n* `regexp` Created by the `makeRe` method.  A single regular expression\n  expressing the entire pattern.  This is useful in cases where you wish\n  to use the pattern somewhat like `fnmatch(3)` with `FNM_PATH` enabled.\n* `negate` True if the pattern is negated.\n* `comment` True if the pattern is a comment.\n* `empty` True if the pattern is `\"\"`.\n\n### Methods\n\n* `makeRe` Generate the `regexp` member if necessary, and return it.\n  Will return `false` if the pattern is invalid.\n* `match(fname)` Return true if the filename matches the pattern, or\n  false otherwise.\n* `matchOne(fileArray, patternArray, partial)` Take a `/`-split\n  filename, and match it against a single row in the `regExpSet`.  This\n  method is mainly for internal use, but is exposed so that it can be\n  used by a glob-walker that needs to avoid excessive filesystem calls.\n\nAll other methods are internal, and will be called as necessary.\n\n## Functions\n\nThe top-level exported function has a `cache` property, which is an LRU\ncache set to store 100 items.  So, calling these methods repeatedly\nwith the same pattern and options will use the same Minimatch object,\nsaving the cost of parsing it multiple times.\n\n### minimatch(path, pattern, options)\n\nMain export.  Tests a path against the pattern using the options.\n\n```javascript\nvar isJS = minimatch(file, \"*.js\", { matchBase: true })\n```\n\n### minimatch.filter(pattern, options)\n\nReturns a function that tests its\nsupplied argument, suitable for use with `Array.filter`.  Example:\n\n```javascript\nvar javascripts = fileList.filter(minimatch.filter(\"*.js\", {matchBase: true}))\n```\n\n### minimatch.match(list, pattern, options)\n\nMatch against the list of\nfiles, in the style of fnmatch or glob.  If nothing is matched, and\noptions.nonull is set, then return a list containing the pattern itself.\n\n```javascript\nvar javascripts = minimatch.match(fileList, \"*.js\", {matchBase: true}))\n```\n\n### minimatch.makeRe(pattern, options)\n\nMake a regular expression object from the pattern.\n\n## Options\n\nAll options are `false` by default.\n\n### debug\n\nDump a ton of stuff to stderr.\n\n### nobrace\n\nDo not expand `{a,b}` and `{1..3}` brace sets.\n\n### noglobstar\n\nDisable `**` matching against multiple folder names.\n\n### dot\n\nAllow patterns to match filenames starting with a period, even if\nthe pattern does not explicitly have a period in that spot.\n\nNote that by default, `a/**/b` will **not** match `a/.d/b`, unless `dot`\nis set.\n\n### noext\n\nDisable \"extglob\" style patterns like `+(a|b)`.\n\n### nocase\n\nPerform a case-insensitive match.\n\n### nonull\n\nWhen a match is not found by `minimatch.match`, return a list containing\nthe pattern itself if this option is set.  When not set, an empty list\nis returned if there are no matches.\n\n### matchBase\n\nIf set, then patterns without slashes will be matched\nagainst the basename of the path if it contains slashes.  For example,\n`a?b` would match the path `/xyz/123/acb`, but not `/xyz/acb/123`.\n\n### nocomment\n\nSuppress the behavior of treating `#` at the start of a pattern as a\ncomment.\n\n### nonegate\n\nSuppress the behavior of treating a leading `!` character as negation.\n\n### flipNegate\n\nReturns from negate expressions the same as if they were not negated.\n(Ie, true on a hit, false on a miss.)\n\n\n## Comparisons to other fnmatch/glob implementations\n\nWhile strict compliance with the existing standards is a worthwhile\ngoal, some discrepancies exist between minimatch and other\nimplementations, and are intentional.\n\nIf the pattern starts with a `!` character, then it is negated.  Set the\n`nonegate` flag to suppress this behavior, and treat leading `!`\ncharacters normally.  This is perhaps relevant if you wish to start the\npattern with a negative extglob pattern like `!(a|B)`.  Multiple `!`\ncharacters at the start of a pattern will negate the pattern multiple\ntimes.\n\nIf a pattern starts with `#`, then it is treated as a comment, and\nwill not match anything.  Use `\\#` to match a literal `#` at the\nstart of a line, or set the `nocomment` flag to suppress this behavior.\n\nThe double-star character `**` is supported by default, unless the\n`noglobstar` flag is set.  This is supported in the manner of bsdglob\nand bash 4.1, where `**` only has special significance if it is the only\nthing in a path part.  That is, `a/**/b` will match `a/x/y/b`, but\n`a/**b` will not.\n\nIf an escaped pattern has no matches, and the `nonull` flag is set,\nthen minimatch.match returns the pattern as-provided, rather than\ninterpreting the character escapes.  For example,\n`minimatch.match([], \"\\\\*a\\\\?\")` will return `\"\\\\*a\\\\?\"` rather than\n`\"*a?\"`.  This is akin to setting the `nullglob` option in bash, except\nthat it does not resolve escaped pattern characters.\n\nIf brace expansion is not disabled, then it is performed before any\nother interpretation of the glob pattern.  Thus, a pattern like\n`+(a|{b),c)}`, which would not be valid in bash or zsh, is expanded\n**first** into the set of `+(a|b)` and `+(a|c)`, and those patterns are\nchecked for validity.  Since those two are valid, matching proceeds.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/isaacs/minimatch/issues"
+  },
+  "homepage": "https://github.com/isaacs/minimatch#readme",
+  "_id": "minimatch@2.0.10",
+  "_shasum": "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7",
+  "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+  "_from": "minimatch@>=2.0.1 <3.0.0"
+}
diff --git a/deps/npm/node_modules/fstream-ignore/package.json b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json
similarity index 65%
rename from deps/npm/node_modules/fstream-ignore/package.json
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json
index 05416ea99b2184..1a505bd4a2afc2 100644
--- a/deps/npm/node_modules/fstream-ignore/package.json
+++ b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json
@@ -1,79 +1,56 @@
 {
-  "_args": [
-    [
-      "fstream-ignore@^1.0.0",
-      "/Users/rebecca/code/npm/node_modules/fstream-npm"
-    ]
-  ],
-  "_from": "fstream-ignore@>=1.0.0 <2.0.0",
-  "_id": "fstream-ignore@1.0.2",
-  "_inCache": true,
-  "_location": "/fstream-ignore",
-  "_nodeVersion": "0.10.16",
-  "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
-  },
-  "_npmVersion": "2.1.11",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "fstream-ignore",
-    "raw": "fstream-ignore@^1.0.0",
-    "rawSpec": "^1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/fstream-npm"
-  ],
-  "_resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz",
-  "_shasum": "18c891db01b782a74a7bff936a0f24997741c7ab",
-  "_shrinkwrap": null,
-  "_spec": "fstream-ignore@^1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/fstream-npm",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/fstream-ignore/issues"
+  "name": "fstream-ignore",
+  "description": "A thing for ignoring files based on globs",
+  "version": "1.0.2",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/fstream-ignore.git"
+  },
+  "main": "ignore.js",
+  "scripts": {
+    "test": "tap test/*.js"
   },
   "dependencies": {
     "fstream": "^1.0.0",
     "inherits": "2",
     "minimatch": "^2.0.1"
   },
-  "description": "A thing for ignoring files based on globs",
   "devDependencies": {
-    "mkdirp": "",
+    "tap": "",
     "rimraf": "",
-    "tap": ""
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "18c891db01b782a74a7bff936a0f24997741c7ab",
-    "tarball": "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz"
+    "mkdirp": ""
   },
+  "license": "ISC",
   "gitHead": "20363d39660671c0de746bd07a0d07de7090d085",
+  "bugs": {
+    "url": "https://github.com/isaacs/fstream-ignore/issues"
+  },
   "homepage": "https://github.com/isaacs/fstream-ignore",
-  "license": "ISC",
-  "main": "ignore.js",
+  "_id": "fstream-ignore@1.0.2",
+  "_shasum": "18c891db01b782a74a7bff936a0f24997741c7ab",
+  "_from": "fstream-ignore@>=1.0.0 <2.0.0",
+  "_npmVersion": "2.1.11",
+  "_nodeVersion": "0.10.16",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "i@izs.me"
+  },
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "name": "fstream-ignore",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/fstream-ignore.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "dist": {
+    "shasum": "18c891db01b782a74a7bff936a0f24997741c7ab",
+    "tarball": "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz"
   },
-  "version": "1.0.2"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/fstream-ignore/test/.ignore b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/.ignore
similarity index 100%
rename from deps/npm/node_modules/fstream-ignore/test/.ignore
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/.ignore
diff --git a/deps/npm/node_modules/fstream-ignore/test/.npmignore b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/.npmignore
similarity index 100%
rename from deps/npm/node_modules/fstream-ignore/test/.npmignore
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/.npmignore
diff --git a/deps/npm/node_modules/fstream-ignore/test/00-setup.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/00-setup.js
similarity index 100%
rename from deps/npm/node_modules/fstream-ignore/test/00-setup.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/00-setup.js
diff --git a/deps/npm/node_modules/fstream-ignore/test/basic.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/basic.js
similarity index 100%
rename from deps/npm/node_modules/fstream-ignore/test/basic.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/basic.js
diff --git a/deps/npm/node_modules/fstream-ignore/test/common.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/common.js
similarity index 100%
rename from deps/npm/node_modules/fstream-ignore/test/common.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/common.js
diff --git a/deps/npm/node_modules/fstream-ignore/test/ignore-most.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/ignore-most.js
similarity index 100%
rename from deps/npm/node_modules/fstream-ignore/test/ignore-most.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/ignore-most.js
diff --git a/deps/npm/node_modules/fstream-ignore/test/nested-ignores.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/nested-ignores.js
similarity index 100%
rename from deps/npm/node_modules/fstream-ignore/test/nested-ignores.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/nested-ignores.js
diff --git a/deps/npm/node_modules/fstream-ignore/test/read-file-order.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/read-file-order.js
similarity index 100%
rename from deps/npm/node_modules/fstream-ignore/test/read-file-order.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/read-file-order.js
diff --git a/deps/npm/node_modules/fstream-ignore/test/unignore-child.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/unignore-child.js
similarity index 100%
rename from deps/npm/node_modules/fstream-ignore/test/unignore-child.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/unignore-child.js
diff --git a/deps/npm/node_modules/fstream-ignore/test/zz-cleanup.js b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/zz-cleanup.js
similarity index 100%
rename from deps/npm/node_modules/fstream-ignore/test/zz-cleanup.js
rename to deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/test/zz-cleanup.js
diff --git a/deps/npm/node_modules/fstream-npm/package.json b/deps/npm/node_modules/fstream-npm/package.json
index f4deee360d7c7c..f3ab7b8faf1adc 100644
--- a/deps/npm/node_modules/fstream-npm/package.json
+++ b/deps/npm/node_modules/fstream-npm/package.json
@@ -1,50 +1,24 @@
 {
-  "_args": [
-    [
-      "fstream-npm@~1.0.5",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "fstream-npm@>=1.0.5 <1.1.0",
-  "_id": "fstream-npm@1.0.5",
-  "_inCache": true,
-  "_location": "/fstream-npm",
-  "_nodeVersion": "2.5.0",
-  "_npmUser": {
-    "email": "ogd@aoaioxxysz.net",
-    "name": "othiym23"
-  },
-  "_npmVersion": "2.14.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "fstream-npm",
-    "raw": "fstream-npm@~1.0.5",
-    "rawSpec": "~1.0.5",
-    "scope": null,
-    "spec": ">=1.0.5 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.5.tgz",
-  "_shasum": "4c1d1cbc6da95c745f8d2c52077a1d2e7b337206",
-  "_shrinkwrap": null,
-  "_spec": "fstream-npm@~1.0.5",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/fstream-npm/issues"
+  "name": "fstream-npm",
+  "description": "fstream class for creating npm packages",
+  "version": "1.0.5",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/fstream-npm.git"
   },
+  "scripts": {
+    "test": "standard && tap test/*.js"
+  },
+  "main": "./fstream-npm.js",
   "dependencies": {
     "fstream-ignore": "^1.0.0",
     "inherits": "2"
   },
-  "description": "fstream class for creating npm packages",
   "devDependencies": {
     "graceful-fs": "^4.1.2",
     "mkdirp": "^0.5.1",
@@ -52,38 +26,15 @@
     "standard": "^4.3.1",
     "tap": "^1.3.2"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "4c1d1cbc6da95c745f8d2c52077a1d2e7b337206",
-    "tarball": "http://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.5.tgz"
-  },
-  "gitHead": "f6ec06b9c45d7330213a5b446fff424b5a74e197",
-  "homepage": "https://github.com/isaacs/fstream-npm#readme",
-  "installable": true,
   "license": "ISC",
-  "main": "./fstream-npm.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "isaacs@npmjs.com"
-    },
-    {
-      "name": "othiym23",
-      "email": "ogd@aoaioxxysz.net"
-    },
-    {
-      "name": "iarna",
-      "email": "me@re-becca.org"
-    }
-  ],
-  "name": "fstream-npm",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/fstream-npm.git"
-  },
-  "scripts": {
-    "test": "standard && tap test/*.js"
+  "readme": "# fstream-npm\n\nThis is an fstream DirReader class that will read a directory and filter\nthings according to the semantics of what goes in an npm package.\n\nFor example:\n\n```javascript\n// This will print out all the files that would be included\n// by 'npm publish' or 'npm install' of this directory.\n\nvar FN = require(\"fstream-npm\")\nFN({ path: \"./\" })\n  .on(\"child\", function (e) {\n    console.error(e.path.substr(e.root.path.length + 1))\n  })\n```\n\n",
+  "readmeFilename": "README.md",
+  "gitHead": "f6ec06b9c45d7330213a5b446fff424b5a74e197",
+  "bugs": {
+    "url": "https://github.com/isaacs/fstream-npm/issues"
   },
-  "version": "1.0.5"
+  "homepage": "https://github.com/isaacs/fstream-npm#readme",
+  "_id": "fstream-npm@1.0.5",
+  "_shasum": "4c1d1cbc6da95c745f8d2c52077a1d2e7b337206",
+  "_from": "fstream-npm@>=1.0.5 <1.1.0"
 }
diff --git a/deps/npm/node_modules/fstream/package.json b/deps/npm/node_modules/fstream/package.json
index 6eeeffe499607b..dd1f45fc99faf6 100644
--- a/deps/npm/node_modules/fstream/package.json
+++ b/deps/npm/node_modules/fstream/package.json
@@ -1,48 +1,19 @@
 {
-  "_args": [
-    [
-      "fstream@~1.0.7",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "fstream@>=1.0.7 <1.1.0",
-  "_id": "fstream@1.0.8",
-  "_inCache": true,
-  "_location": "/fstream",
-  "_nodeVersion": "2.2.2",
-  "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
-  },
-  "_npmVersion": "2.14.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "fstream",
-    "raw": "fstream@~1.0.7",
-    "rawSpec": "~1.0.7",
-    "scope": null,
-    "spec": ">=1.0.7 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/fstream-ignore",
-    "/node-gyp",
-    "/node-gyp/tar",
-    "/tar"
-  ],
-  "_resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz",
-  "_shasum": "7e8d7a73abb3647ef36e4b8a15ca801dba03d038",
-  "_shrinkwrap": null,
-  "_spec": "fstream@~1.0.7",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/fstream/issues"
+  "name": "fstream",
+  "description": "Advanced file system stream things",
+  "version": "1.0.8",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/fstream.git"
+  },
+  "main": "fstream.js",
+  "engines": {
+    "node": ">=0.6"
   },
   "dependencies": {
     "graceful-fs": "^4.1.2",
@@ -50,24 +21,32 @@
     "mkdirp": ">=0.5 0",
     "rimraf": "2"
   },
-  "description": "Advanced file system stream things",
   "devDependencies": {
     "standard": "^4.0.0",
     "tap": "^1.2.0"
   },
-  "directories": {},
+  "scripts": {
+    "test": "standard && tap examples/*.js"
+  },
+  "license": "ISC",
+  "gitHead": "d9f81146c50e687f1df04c1a0e7e4c173eb3dae2",
+  "bugs": {
+    "url": "https://github.com/isaacs/fstream/issues"
+  },
+  "homepage": "https://github.com/isaacs/fstream#readme",
+  "_id": "fstream@1.0.8",
+  "_shasum": "7e8d7a73abb3647ef36e4b8a15ca801dba03d038",
+  "_from": "fstream@>=1.0.8 <1.1.0",
+  "_npmVersion": "2.14.3",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
+  },
   "dist": {
     "shasum": "7e8d7a73abb3647ef36e4b8a15ca801dba03d038",
     "tarball": "http://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz"
   },
-  "engines": {
-    "node": ">=0.6"
-  },
-  "gitHead": "d9f81146c50e687f1df04c1a0e7e4c173eb3dae2",
-  "homepage": "https://github.com/isaacs/fstream#readme",
-  "installable": true,
-  "license": "ISC",
-  "main": "fstream.js",
   "maintainers": [
     {
       "name": "iarna",
@@ -86,14 +65,7 @@
       "email": "kat@sykosomatic.org"
     }
   ],
-  "name": "fstream",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/fstream.git"
-  },
-  "scripts": {
-    "test": "standard && tap examples/*.js"
-  },
-  "version": "1.0.8"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/generate-function/package.json b/deps/npm/node_modules/generate-function/package.json
deleted file mode 100644
index 5980efe9995320..00000000000000
--- a/deps/npm/node_modules/generate-function/package.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "_args": [
-    [
-      "generate-function@^2.0.0",
-      "/Users/rebecca/code/npm/node_modules/is-my-json-valid"
-    ]
-  ],
-  "_from": "generate-function@>=2.0.0 <3.0.0",
-  "_id": "generate-function@2.0.0",
-  "_inCache": true,
-  "_location": "/generate-function",
-  "_npmUser": {
-    "email": "mathiasbuus@gmail.com",
-    "name": "mafintosh"
-  },
-  "_npmVersion": "1.4.23",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "generate-function",
-    "raw": "generate-function@^2.0.0",
-    "rawSpec": "^2.0.0",
-    "scope": null,
-    "spec": ">=2.0.0 <3.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/is-my-json-valid"
-  ],
-  "_resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-  "_shasum": "6858fe7c0969b7d4e9093337647ac79f60dfbe74",
-  "_shrinkwrap": null,
-  "_spec": "generate-function@^2.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/is-my-json-valid",
-  "author": {
-    "name": "Mathias Buus"
-  },
-  "bugs": {
-    "url": "https://github.com/mafintosh/generate-function/issues"
-  },
-  "dependencies": {},
-  "description": "Module that helps you write generated functions in Node",
-  "devDependencies": {
-    "tape": "^2.13.4"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "6858fe7c0969b7d4e9093337647ac79f60dfbe74",
-    "tarball": "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
-  },
-  "gitHead": "3d5fc8de5859be95f58e3af9bfb5f663edd95149",
-  "homepage": "https://github.com/mafintosh/generate-function",
-  "keywords": [
-    "code",
-    "function",
-    "generate",
-    "generation",
-    "performance"
-  ],
-  "license": "MIT",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "mafintosh",
-      "email": "mathiasbuus@gmail.com"
-    }
-  ],
-  "name": "generate-function",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/mafintosh/generate-function"
-  },
-  "scripts": {
-    "test": "tape test.js"
-  },
-  "version": "2.0.0"
-}
diff --git a/deps/npm/node_modules/generate-object-property/package.json b/deps/npm/node_modules/generate-object-property/package.json
deleted file mode 100644
index ac179d2e368314..00000000000000
--- a/deps/npm/node_modules/generate-object-property/package.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "_args": [
-    [
-      "generate-object-property@^1.1.0",
-      "/Users/rebecca/code/npm/node_modules/is-my-json-valid"
-    ]
-  ],
-  "_from": "generate-object-property@>=1.1.0 <2.0.0",
-  "_id": "generate-object-property@1.2.0",
-  "_inCache": true,
-  "_location": "/generate-object-property",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "email": "mathiasbuus@gmail.com",
-    "name": "mafintosh"
-  },
-  "_npmVersion": "2.9.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "generate-object-property",
-    "raw": "generate-object-property@^1.1.0",
-    "rawSpec": "^1.1.0",
-    "scope": null,
-    "spec": ">=1.1.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/is-my-json-valid"
-  ],
-  "_resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-  "_shasum": "9c0e1c40308ce804f4783618b937fa88f99d50d0",
-  "_shrinkwrap": null,
-  "_spec": "generate-object-property@^1.1.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/is-my-json-valid",
-  "author": {
-    "name": "Mathias Buus",
-    "url": "@mafintosh"
-  },
-  "bugs": {
-    "url": "https://github.com/mafintosh/generate-object-property/issues"
-  },
-  "dependencies": {
-    "is-property": "^1.0.0"
-  },
-  "description": "Generate safe JS code that can used to reference a object property",
-  "devDependencies": {
-    "tape": "^2.13.0"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "9c0e1c40308ce804f4783618b937fa88f99d50d0",
-    "tarball": "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
-  },
-  "gitHead": "0dd7d411018de54b2eae63b424c15b3e50bd678c",
-  "homepage": "https://github.com/mafintosh/generate-object-property",
-  "license": "MIT",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "mafintosh",
-      "email": "mathiasbuus@gmail.com"
-    }
-  ],
-  "name": "generate-object-property",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/mafintosh/generate-object-property"
-  },
-  "scripts": {
-    "test": "tape test.js"
-  },
-  "version": "1.2.0"
-}
diff --git a/deps/npm/node_modules/lru-cache/LICENSE b/deps/npm/node_modules/glob/node_modules/minimatch/LICENSE
similarity index 100%
rename from deps/npm/node_modules/lru-cache/LICENSE
rename to deps/npm/node_modules/glob/node_modules/minimatch/LICENSE
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/README.md b/deps/npm/node_modules/glob/node_modules/minimatch/README.md
new file mode 100644
index 00000000000000..d458bc2e0a6b03
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/README.md
@@ -0,0 +1,216 @@
+# minimatch
+
+A minimal matching utility.
+
+[![Build Status](https://secure.travis-ci.org/isaacs/minimatch.png)](http://travis-ci.org/isaacs/minimatch)
+
+
+This is the matching library used internally by npm.
+
+It works by converting glob expressions into JavaScript `RegExp`
+objects.
+
+## Usage
+
+```javascript
+var minimatch = require("minimatch")
+
+minimatch("bar.foo", "*.foo") // true!
+minimatch("bar.foo", "*.bar") // false!
+minimatch("bar.foo", "*.+(bar|foo)", { debug: true }) // true, and noisy!
+```
+
+## Features
+
+Supports these glob features:
+
+* Brace Expansion
+* Extended glob matching
+* "Globstar" `**` matching
+
+See:
+
+* `man sh`
+* `man bash`
+* `man 3 fnmatch`
+* `man 5 gitignore`
+
+## Minimatch Class
+
+Create a minimatch object by instanting the `minimatch.Minimatch` class.
+
+```javascript
+var Minimatch = require("minimatch").Minimatch
+var mm = new Minimatch(pattern, options)
+```
+
+### Properties
+
+* `pattern` The original pattern the minimatch object represents.
+* `options` The options supplied to the constructor.
+* `set` A 2-dimensional array of regexp or string expressions.
+  Each row in the
+  array corresponds to a brace-expanded pattern.  Each item in the row
+  corresponds to a single path-part.  For example, the pattern
+  `{a,b/c}/d` would expand to a set of patterns like:
+
+        [ [ a, d ]
+        , [ b, c, d ] ]
+
+    If a portion of the pattern doesn't have any "magic" in it
+    (that is, it's something like `"foo"` rather than `fo*o?`), then it
+    will be left as a string rather than converted to a regular
+    expression.
+
+* `regexp` Created by the `makeRe` method.  A single regular expression
+  expressing the entire pattern.  This is useful in cases where you wish
+  to use the pattern somewhat like `fnmatch(3)` with `FNM_PATH` enabled.
+* `negate` True if the pattern is negated.
+* `comment` True if the pattern is a comment.
+* `empty` True if the pattern is `""`.
+
+### Methods
+
+* `makeRe` Generate the `regexp` member if necessary, and return it.
+  Will return `false` if the pattern is invalid.
+* `match(fname)` Return true if the filename matches the pattern, or
+  false otherwise.
+* `matchOne(fileArray, patternArray, partial)` Take a `/`-split
+  filename, and match it against a single row in the `regExpSet`.  This
+  method is mainly for internal use, but is exposed so that it can be
+  used by a glob-walker that needs to avoid excessive filesystem calls.
+
+All other methods are internal, and will be called as necessary.
+
+## Functions
+
+The top-level exported function has a `cache` property, which is an LRU
+cache set to store 100 items.  So, calling these methods repeatedly
+with the same pattern and options will use the same Minimatch object,
+saving the cost of parsing it multiple times.
+
+### minimatch(path, pattern, options)
+
+Main export.  Tests a path against the pattern using the options.
+
+```javascript
+var isJS = minimatch(file, "*.js", { matchBase: true })
+```
+
+### minimatch.filter(pattern, options)
+
+Returns a function that tests its
+supplied argument, suitable for use with `Array.filter`.  Example:
+
+```javascript
+var javascripts = fileList.filter(minimatch.filter("*.js", {matchBase: true}))
+```
+
+### minimatch.match(list, pattern, options)
+
+Match against the list of
+files, in the style of fnmatch or glob.  If nothing is matched, and
+options.nonull is set, then return a list containing the pattern itself.
+
+```javascript
+var javascripts = minimatch.match(fileList, "*.js", {matchBase: true}))
+```
+
+### minimatch.makeRe(pattern, options)
+
+Make a regular expression object from the pattern.
+
+## Options
+
+All options are `false` by default.
+
+### debug
+
+Dump a ton of stuff to stderr.
+
+### nobrace
+
+Do not expand `{a,b}` and `{1..3}` brace sets.
+
+### noglobstar
+
+Disable `**` matching against multiple folder names.
+
+### dot
+
+Allow patterns to match filenames starting with a period, even if
+the pattern does not explicitly have a period in that spot.
+
+Note that by default, `a/**/b` will **not** match `a/.d/b`, unless `dot`
+is set.
+
+### noext
+
+Disable "extglob" style patterns like `+(a|b)`.
+
+### nocase
+
+Perform a case-insensitive match.
+
+### nonull
+
+When a match is not found by `minimatch.match`, return a list containing
+the pattern itself if this option is set.  When not set, an empty list
+is returned if there are no matches.
+
+### matchBase
+
+If set, then patterns without slashes will be matched
+against the basename of the path if it contains slashes.  For example,
+`a?b` would match the path `/xyz/123/acb`, but not `/xyz/acb/123`.
+
+### nocomment
+
+Suppress the behavior of treating `#` at the start of a pattern as a
+comment.
+
+### nonegate
+
+Suppress the behavior of treating a leading `!` character as negation.
+
+### flipNegate
+
+Returns from negate expressions the same as if they were not negated.
+(Ie, true on a hit, false on a miss.)
+
+
+## Comparisons to other fnmatch/glob implementations
+
+While strict compliance with the existing standards is a worthwhile
+goal, some discrepancies exist between minimatch and other
+implementations, and are intentional.
+
+If the pattern starts with a `!` character, then it is negated.  Set the
+`nonegate` flag to suppress this behavior, and treat leading `!`
+characters normally.  This is perhaps relevant if you wish to start the
+pattern with a negative extglob pattern like `!(a|B)`.  Multiple `!`
+characters at the start of a pattern will negate the pattern multiple
+times.
+
+If a pattern starts with `#`, then it is treated as a comment, and
+will not match anything.  Use `\#` to match a literal `#` at the
+start of a line, or set the `nocomment` flag to suppress this behavior.
+
+The double-star character `**` is supported by default, unless the
+`noglobstar` flag is set.  This is supported in the manner of bsdglob
+and bash 4.1, where `**` only has special significance if it is the only
+thing in a path part.  That is, `a/**/b` will match `a/x/y/b`, but
+`a/**b` will not.
+
+If an escaped pattern has no matches, and the `nonull` flag is set,
+then minimatch.match returns the pattern as-provided, rather than
+interpreting the character escapes.  For example,
+`minimatch.match([], "\\*a\\?")` will return `"\\*a\\?"` rather than
+`"*a?"`.  This is akin to setting the `nullglob` option in bash, except
+that it does not resolve escaped pattern characters.
+
+If brace expansion is not disabled, then it is performed before any
+other interpretation of the glob pattern.  Thus, a pattern like
+`+(a|{b),c)}`, which would not be valid in bash or zsh, is expanded
+**first** into the set of `+(a|b)` and `+(a|c)`, and those patterns are
+checked for validity.  Since those two are valid, matching proceeds.
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/minimatch.js b/deps/npm/node_modules/glob/node_modules/minimatch/minimatch.js
new file mode 100644
index 00000000000000..ec4c05c570c52e
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/minimatch.js
@@ -0,0 +1,912 @@
+module.exports = minimatch
+minimatch.Minimatch = Minimatch
+
+var path = { sep: '/' }
+try {
+  path = require('path')
+} catch (er) {}
+
+var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
+var expand = require('brace-expansion')
+
+// any single thing other than /
+// don't need to escape / when using new RegExp()
+var qmark = '[^/]'
+
+// * => any number of characters
+var star = qmark + '*?'
+
+// ** when dots are allowed.  Anything goes, except .. and .
+// not (^ or / followed by one or two dots followed by $ or /),
+// followed by anything, any number of times.
+var twoStarDot = '(?:(?!(?:\\\/|^)(?:\\.{1,2})($|\\\/)).)*?'
+
+// not a ^ or / followed by a dot,
+// followed by anything, any number of times.
+var twoStarNoDot = '(?:(?!(?:\\\/|^)\\.).)*?'
+
+// characters that need to be escaped in RegExp.
+var reSpecials = charSet('().*{}+?[]^$\\!')
+
+// "abc" -> { a:true, b:true, c:true }
+function charSet (s) {
+  return s.split('').reduce(function (set, c) {
+    set[c] = true
+    return set
+  }, {})
+}
+
+// normalizes slashes.
+var slashSplit = /\/+/
+
+minimatch.filter = filter
+function filter (pattern, options) {
+  options = options || {}
+  return function (p, i, list) {
+    return minimatch(p, pattern, options)
+  }
+}
+
+function ext (a, b) {
+  a = a || {}
+  b = b || {}
+  var t = {}
+  Object.keys(b).forEach(function (k) {
+    t[k] = b[k]
+  })
+  Object.keys(a).forEach(function (k) {
+    t[k] = a[k]
+  })
+  return t
+}
+
+minimatch.defaults = function (def) {
+  if (!def || !Object.keys(def).length) return minimatch
+
+  var orig = minimatch
+
+  var m = function minimatch (p, pattern, options) {
+    return orig.minimatch(p, pattern, ext(def, options))
+  }
+
+  m.Minimatch = function Minimatch (pattern, options) {
+    return new orig.Minimatch(pattern, ext(def, options))
+  }
+
+  return m
+}
+
+Minimatch.defaults = function (def) {
+  if (!def || !Object.keys(def).length) return Minimatch
+  return minimatch.defaults(def).Minimatch
+}
+
+function minimatch (p, pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('glob pattern string required')
+  }
+
+  if (!options) options = {}
+
+  // shortcut: comments match nothing.
+  if (!options.nocomment && pattern.charAt(0) === '#') {
+    return false
+  }
+
+  // "" only matches ""
+  if (pattern.trim() === '') return p === ''
+
+  return new Minimatch(pattern, options).match(p)
+}
+
+function Minimatch (pattern, options) {
+  if (!(this instanceof Minimatch)) {
+    return new Minimatch(pattern, options)
+  }
+
+  if (typeof pattern !== 'string') {
+    throw new TypeError('glob pattern string required')
+  }
+
+  if (!options) options = {}
+  pattern = pattern.trim()
+
+  // windows support: need to use /, not \
+  if (path.sep !== '/') {
+    pattern = pattern.split(path.sep).join('/')
+  }
+
+  this.options = options
+  this.set = []
+  this.pattern = pattern
+  this.regexp = null
+  this.negate = false
+  this.comment = false
+  this.empty = false
+
+  // make the set of regexps etc.
+  this.make()
+}
+
+Minimatch.prototype.debug = function () {}
+
+Minimatch.prototype.make = make
+function make () {
+  // don't do it more than once.
+  if (this._made) return
+
+  var pattern = this.pattern
+  var options = this.options
+
+  // empty patterns and comments match nothing.
+  if (!options.nocomment && pattern.charAt(0) === '#') {
+    this.comment = true
+    return
+  }
+  if (!pattern) {
+    this.empty = true
+    return
+  }
+
+  // step 1: figure out negation, etc.
+  this.parseNegate()
+
+  // step 2: expand braces
+  var set = this.globSet = this.braceExpand()
+
+  if (options.debug) this.debug = console.error
+
+  this.debug(this.pattern, set)
+
+  // step 3: now we have a set, so turn each one into a series of path-portion
+  // matching patterns.
+  // These will be regexps, except in the case of "**", which is
+  // set to the GLOBSTAR object for globstar behavior,
+  // and will not contain any / characters
+  set = this.globParts = set.map(function (s) {
+    return s.split(slashSplit)
+  })
+
+  this.debug(this.pattern, set)
+
+  // glob --> regexps
+  set = set.map(function (s, si, set) {
+    return s.map(this.parse, this)
+  }, this)
+
+  this.debug(this.pattern, set)
+
+  // filter out everything that didn't compile properly.
+  set = set.filter(function (s) {
+    return s.indexOf(false) === -1
+  })
+
+  this.debug(this.pattern, set)
+
+  this.set = set
+}
+
+Minimatch.prototype.parseNegate = parseNegate
+function parseNegate () {
+  var pattern = this.pattern
+  var negate = false
+  var options = this.options
+  var negateOffset = 0
+
+  if (options.nonegate) return
+
+  for (var i = 0, l = pattern.length
+    ; i < l && pattern.charAt(i) === '!'
+    ; i++) {
+    negate = !negate
+    negateOffset++
+  }
+
+  if (negateOffset) this.pattern = pattern.substr(negateOffset)
+  this.negate = negate
+}
+
+// Brace expansion:
+// a{b,c}d -> abd acd
+// a{b,}c -> abc ac
+// a{0..3}d -> a0d a1d a2d a3d
+// a{b,c{d,e}f}g -> abg acdfg acefg
+// a{b,c}d{e,f}g -> abdeg acdeg abdeg abdfg
+//
+// Invalid sets are not expanded.
+// a{2..}b -> a{2..}b
+// a{b}c -> a{b}c
+minimatch.braceExpand = function (pattern, options) {
+  return braceExpand(pattern, options)
+}
+
+Minimatch.prototype.braceExpand = braceExpand
+
+function braceExpand (pattern, options) {
+  if (!options) {
+    if (this instanceof Minimatch) {
+      options = this.options
+    } else {
+      options = {}
+    }
+  }
+
+  pattern = typeof pattern === 'undefined'
+    ? this.pattern : pattern
+
+  if (typeof pattern === 'undefined') {
+    throw new Error('undefined pattern')
+  }
+
+  if (options.nobrace ||
+    !pattern.match(/\{.*\}/)) {
+    // shortcut. no need to expand.
+    return [pattern]
+  }
+
+  return expand(pattern)
+}
+
+// parse a component of the expanded set.
+// At this point, no pattern may contain "/" in it
+// so we're going to return a 2d array, where each entry is the full
+// pattern, split on '/', and then turned into a regular expression.
+// A regexp is made at the end which joins each array with an
+// escaped /, and another full one which joins each regexp with |.
+//
+// Following the lead of Bash 4.1, note that "**" only has special meaning
+// when it is the *only* thing in a path portion.  Otherwise, any series
+// of * is equivalent to a single *.  Globstar behavior is enabled by
+// default, and can be disabled by setting options.noglobstar.
+Minimatch.prototype.parse = parse
+var SUBPARSE = {}
+function parse (pattern, isSub) {
+  var options = this.options
+
+  // shortcuts
+  if (!options.noglobstar && pattern === '**') return GLOBSTAR
+  if (pattern === '') return ''
+
+  var re = ''
+  var hasMagic = !!options.nocase
+  var escaping = false
+  // ? => one single character
+  var patternListStack = []
+  var negativeLists = []
+  var plType
+  var stateChar
+  var inClass = false
+  var reClassStart = -1
+  var classStart = -1
+  // . and .. never match anything that doesn't start with .,
+  // even when options.dot is set.
+  var patternStart = pattern.charAt(0) === '.' ? '' // anything
+  // not (start or / followed by . or .. followed by / or end)
+  : options.dot ? '(?!(?:^|\\\/)\\.{1,2}(?:$|\\\/))'
+  : '(?!\\.)'
+  var self = this
+
+  function clearStateChar () {
+    if (stateChar) {
+      // we had some state-tracking character
+      // that wasn't consumed by this pass.
+      switch (stateChar) {
+        case '*':
+          re += star
+          hasMagic = true
+        break
+        case '?':
+          re += qmark
+          hasMagic = true
+        break
+        default:
+          re += '\\' + stateChar
+        break
+      }
+      self.debug('clearStateChar %j %j', stateChar, re)
+      stateChar = false
+    }
+  }
+
+  for (var i = 0, len = pattern.length, c
+    ; (i < len) && (c = pattern.charAt(i))
+    ; i++) {
+    this.debug('%s\t%s %s %j', pattern, i, re, c)
+
+    // skip over any that are escaped.
+    if (escaping && reSpecials[c]) {
+      re += '\\' + c
+      escaping = false
+      continue
+    }
+
+    switch (c) {
+      case '/':
+        // completely not allowed, even escaped.
+        // Should already be path-split by now.
+        return false
+
+      case '\\':
+        clearStateChar()
+        escaping = true
+      continue
+
+      // the various stateChar values
+      // for the "extglob" stuff.
+      case '?':
+      case '*':
+      case '+':
+      case '@':
+      case '!':
+        this.debug('%s\t%s %s %j <-- stateChar', pattern, i, re, c)
+
+        // all of those are literals inside a class, except that
+        // the glob [!a] means [^a] in regexp
+        if (inClass) {
+          this.debug('  in class')
+          if (c === '!' && i === classStart + 1) c = '^'
+          re += c
+          continue
+        }
+
+        // if we already have a stateChar, then it means
+        // that there was something like ** or +? in there.
+        // Handle the stateChar, then proceed with this one.
+        self.debug('call clearStateChar %j', stateChar)
+        clearStateChar()
+        stateChar = c
+        // if extglob is disabled, then +(asdf|foo) isn't a thing.
+        // just clear the statechar *now*, rather than even diving into
+        // the patternList stuff.
+        if (options.noext) clearStateChar()
+      continue
+
+      case '(':
+        if (inClass) {
+          re += '('
+          continue
+        }
+
+        if (!stateChar) {
+          re += '\\('
+          continue
+        }
+
+        plType = stateChar
+        patternListStack.push({
+          type: plType,
+          start: i - 1,
+          reStart: re.length
+        })
+        // negation is (?:(?!js)[^/]*)
+        re += stateChar === '!' ? '(?:(?!(?:' : '(?:'
+        this.debug('plType %j %j', stateChar, re)
+        stateChar = false
+      continue
+
+      case ')':
+        if (inClass || !patternListStack.length) {
+          re += '\\)'
+          continue
+        }
+
+        clearStateChar()
+        hasMagic = true
+        re += ')'
+        var pl = patternListStack.pop()
+        plType = pl.type
+        // negation is (?:(?!js)[^/]*)
+        // The others are (?:<pattern>)<type>
+        switch (plType) {
+          case '!':
+            negativeLists.push(pl)
+            re += ')[^/]*?)'
+            pl.reEnd = re.length
+            break
+          case '?':
+          case '+':
+          case '*':
+            re += plType
+            break
+          case '@': break // the default anyway
+        }
+      continue
+
+      case '|':
+        if (inClass || !patternListStack.length || escaping) {
+          re += '\\|'
+          escaping = false
+          continue
+        }
+
+        clearStateChar()
+        re += '|'
+      continue
+
+      // these are mostly the same in regexp and glob
+      case '[':
+        // swallow any state-tracking char before the [
+        clearStateChar()
+
+        if (inClass) {
+          re += '\\' + c
+          continue
+        }
+
+        inClass = true
+        classStart = i
+        reClassStart = re.length
+        re += c
+      continue
+
+      case ']':
+        //  a right bracket shall lose its special
+        //  meaning and represent itself in
+        //  a bracket expression if it occurs
+        //  first in the list.  -- POSIX.2 2.8.3.2
+        if (i === classStart + 1 || !inClass) {
+          re += '\\' + c
+          escaping = false
+          continue
+        }
+
+        // handle the case where we left a class open.
+        // "[z-a]" is valid, equivalent to "\[z-a\]"
+        if (inClass) {
+          // split where the last [ was, make sure we don't have
+          // an invalid re. if so, re-walk the contents of the
+          // would-be class to re-translate any characters that
+          // were passed through as-is
+          // TODO: It would probably be faster to determine this
+          // without a try/catch and a new RegExp, but it's tricky
+          // to do safely.  For now, this is safe and works.
+          var cs = pattern.substring(classStart + 1, i)
+          try {
+            RegExp('[' + cs + ']')
+          } catch (er) {
+            // not a valid class!
+            var sp = this.parse(cs, SUBPARSE)
+            re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]'
+            hasMagic = hasMagic || sp[1]
+            inClass = false
+            continue
+          }
+        }
+
+        // finish up the class.
+        hasMagic = true
+        inClass = false
+        re += c
+      continue
+
+      default:
+        // swallow any state char that wasn't consumed
+        clearStateChar()
+
+        if (escaping) {
+          // no need
+          escaping = false
+        } else if (reSpecials[c]
+          && !(c === '^' && inClass)) {
+          re += '\\'
+        }
+
+        re += c
+
+    } // switch
+  } // for
+
+  // handle the case where we left a class open.
+  // "[abc" is valid, equivalent to "\[abc"
+  if (inClass) {
+    // split where the last [ was, and escape it
+    // this is a huge pita.  We now have to re-walk
+    // the contents of the would-be class to re-translate
+    // any characters that were passed through as-is
+    cs = pattern.substr(classStart + 1)
+    sp = this.parse(cs, SUBPARSE)
+    re = re.substr(0, reClassStart) + '\\[' + sp[0]
+    hasMagic = hasMagic || sp[1]
+  }
+
+  // handle the case where we had a +( thing at the *end*
+  // of the pattern.
+  // each pattern list stack adds 3 chars, and we need to go through
+  // and escape any | chars that were passed through as-is for the regexp.
+  // Go through and escape them, taking care not to double-escape any
+  // | chars that were already escaped.
+  for (pl = patternListStack.pop(); pl; pl = patternListStack.pop()) {
+    var tail = re.slice(pl.reStart + 3)
+    // maybe some even number of \, then maybe 1 \, followed by a |
+    tail = tail.replace(/((?:\\{2})*)(\\?)\|/g, function (_, $1, $2) {
+      if (!$2) {
+        // the | isn't already escaped, so escape it.
+        $2 = '\\'
+      }
+
+      // need to escape all those slashes *again*, without escaping the
+      // one that we need for escaping the | character.  As it works out,
+      // escaping an even number of slashes can be done by simply repeating
+      // it exactly after itself.  That's why this trick works.
+      //
+      // I am sorry that you have to see this.
+      return $1 + $1 + $2 + '|'
+    })
+
+    this.debug('tail=%j\n   %s', tail, tail)
+    var t = pl.type === '*' ? star
+      : pl.type === '?' ? qmark
+      : '\\' + pl.type
+
+    hasMagic = true
+    re = re.slice(0, pl.reStart) + t + '\\(' + tail
+  }
+
+  // handle trailing things that only matter at the very end.
+  clearStateChar()
+  if (escaping) {
+    // trailing \\
+    re += '\\\\'
+  }
+
+  // only need to apply the nodot start if the re starts with
+  // something that could conceivably capture a dot
+  var addPatternStart = false
+  switch (re.charAt(0)) {
+    case '.':
+    case '[':
+    case '(': addPatternStart = true
+  }
+
+  // Hack to work around lack of negative lookbehind in JS
+  // A pattern like: *.!(x).!(y|z) needs to ensure that a name
+  // like 'a.xyz.yz' doesn't match.  So, the first negative
+  // lookahead, has to look ALL the way ahead, to the end of
+  // the pattern.
+  for (var n = negativeLists.length - 1; n > -1; n--) {
+    var nl = negativeLists[n]
+
+    var nlBefore = re.slice(0, nl.reStart)
+    var nlFirst = re.slice(nl.reStart, nl.reEnd - 8)
+    var nlLast = re.slice(nl.reEnd - 8, nl.reEnd)
+    var nlAfter = re.slice(nl.reEnd)
+
+    nlLast += nlAfter
+
+    // Handle nested stuff like *(*.js|!(*.json)), where open parens
+    // mean that we should *not* include the ) in the bit that is considered
+    // "after" the negated section.
+    var openParensBefore = nlBefore.split('(').length - 1
+    var cleanAfter = nlAfter
+    for (i = 0; i < openParensBefore; i++) {
+      cleanAfter = cleanAfter.replace(/\)[+*?]?/, '')
+    }
+    nlAfter = cleanAfter
+
+    var dollar = ''
+    if (nlAfter === '' && isSub !== SUBPARSE) {
+      dollar = '$'
+    }
+    var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast
+    re = newRe
+  }
+
+  // if the re is not "" at this point, then we need to make sure
+  // it doesn't match against an empty path part.
+  // Otherwise a/* will match a/, which it should not.
+  if (re !== '' && hasMagic) {
+    re = '(?=.)' + re
+  }
+
+  if (addPatternStart) {
+    re = patternStart + re
+  }
+
+  // parsing just a piece of a larger pattern.
+  if (isSub === SUBPARSE) {
+    return [re, hasMagic]
+  }
+
+  // skip the regexp for non-magical patterns
+  // unescape anything in it, though, so that it'll be
+  // an exact match against a file etc.
+  if (!hasMagic) {
+    return globUnescape(pattern)
+  }
+
+  var flags = options.nocase ? 'i' : ''
+  var regExp = new RegExp('^' + re + '$', flags)
+
+  regExp._glob = pattern
+  regExp._src = re
+
+  return regExp
+}
+
+minimatch.makeRe = function (pattern, options) {
+  return new Minimatch(pattern, options || {}).makeRe()
+}
+
+Minimatch.prototype.makeRe = makeRe
+function makeRe () {
+  if (this.regexp || this.regexp === false) return this.regexp
+
+  // at this point, this.set is a 2d array of partial
+  // pattern strings, or "**".
+  //
+  // It's better to use .match().  This function shouldn't
+  // be used, really, but it's pretty convenient sometimes,
+  // when you just want to work with a regex.
+  var set = this.set
+
+  if (!set.length) {
+    this.regexp = false
+    return this.regexp
+  }
+  var options = this.options
+
+  var twoStar = options.noglobstar ? star
+    : options.dot ? twoStarDot
+    : twoStarNoDot
+  var flags = options.nocase ? 'i' : ''
+
+  var re = set.map(function (pattern) {
+    return pattern.map(function (p) {
+      return (p === GLOBSTAR) ? twoStar
+      : (typeof p === 'string') ? regExpEscape(p)
+      : p._src
+    }).join('\\\/')
+  }).join('|')
+
+  // must match entire pattern
+  // ending in a * or ** will make it less strict.
+  re = '^(?:' + re + ')$'
+
+  // can match anything, as long as it's not this.
+  if (this.negate) re = '^(?!' + re + ').*$'
+
+  try {
+    this.regexp = new RegExp(re, flags)
+  } catch (ex) {
+    this.regexp = false
+  }
+  return this.regexp
+}
+
+minimatch.match = function (list, pattern, options) {
+  options = options || {}
+  var mm = new Minimatch(pattern, options)
+  list = list.filter(function (f) {
+    return mm.match(f)
+  })
+  if (mm.options.nonull && !list.length) {
+    list.push(pattern)
+  }
+  return list
+}
+
+Minimatch.prototype.match = match
+function match (f, partial) {
+  this.debug('match', f, this.pattern)
+  // short-circuit in the case of busted things.
+  // comments, etc.
+  if (this.comment) return false
+  if (this.empty) return f === ''
+
+  if (f === '/' && partial) return true
+
+  var options = this.options
+
+  // windows: need to use /, not \
+  if (path.sep !== '/') {
+    f = f.split(path.sep).join('/')
+  }
+
+  // treat the test path as a set of pathparts.
+  f = f.split(slashSplit)
+  this.debug(this.pattern, 'split', f)
+
+  // just ONE of the pattern sets in this.set needs to match
+  // in order for it to be valid.  If negating, then just one
+  // match means that we have failed.
+  // Either way, return on the first hit.
+
+  var set = this.set
+  this.debug(this.pattern, 'set', set)
+
+  // Find the basename of the path by looking for the last non-empty segment
+  var filename
+  var i
+  for (i = f.length - 1; i >= 0; i--) {
+    filename = f[i]
+    if (filename) break
+  }
+
+  for (i = 0; i < set.length; i++) {
+    var pattern = set[i]
+    var file = f
+    if (options.matchBase && pattern.length === 1) {
+      file = [filename]
+    }
+    var hit = this.matchOne(file, pattern, partial)
+    if (hit) {
+      if (options.flipNegate) return true
+      return !this.negate
+    }
+  }
+
+  // didn't get any hits.  this is success if it's a negative
+  // pattern, failure otherwise.
+  if (options.flipNegate) return false
+  return this.negate
+}
+
+// set partial to true to test if, for example,
+// "/a/b" matches the start of "/*/b/*/d"
+// Partial means, if you run out of file before you run
+// out of pattern, then that's fine, as long as all
+// the parts match.
+Minimatch.prototype.matchOne = function (file, pattern, partial) {
+  var options = this.options
+
+  this.debug('matchOne',
+    { 'this': this, file: file, pattern: pattern })
+
+  this.debug('matchOne', file.length, pattern.length)
+
+  for (var fi = 0,
+      pi = 0,
+      fl = file.length,
+      pl = pattern.length
+      ; (fi < fl) && (pi < pl)
+      ; fi++, pi++) {
+    this.debug('matchOne loop')
+    var p = pattern[pi]
+    var f = file[fi]
+
+    this.debug(pattern, p, f)
+
+    // should be impossible.
+    // some invalid regexp stuff in the set.
+    if (p === false) return false
+
+    if (p === GLOBSTAR) {
+      this.debug('GLOBSTAR', [pattern, p, f])
+
+      // "**"
+      // a/**/b/**/c would match the following:
+      // a/b/x/y/z/c
+      // a/x/y/z/b/c
+      // a/b/x/b/x/c
+      // a/b/c
+      // To do this, take the rest of the pattern after
+      // the **, and see if it would match the file remainder.
+      // If so, return success.
+      // If not, the ** "swallows" a segment, and try again.
+      // This is recursively awful.
+      //
+      // a/**/b/**/c matching a/b/x/y/z/c
+      // - a matches a
+      // - doublestar
+      //   - matchOne(b/x/y/z/c, b/**/c)
+      //     - b matches b
+      //     - doublestar
+      //       - matchOne(x/y/z/c, c) -> no
+      //       - matchOne(y/z/c, c) -> no
+      //       - matchOne(z/c, c) -> no
+      //       - matchOne(c, c) yes, hit
+      var fr = fi
+      var pr = pi + 1
+      if (pr === pl) {
+        this.debug('** at the end')
+        // a ** at the end will just swallow the rest.
+        // We have found a match.
+        // however, it will not swallow /.x, unless
+        // options.dot is set.
+        // . and .. are *never* matched by **, for explosively
+        // exponential reasons.
+        for (; fi < fl; fi++) {
+          if (file[fi] === '.' || file[fi] === '..' ||
+            (!options.dot && file[fi].charAt(0) === '.')) return false
+        }
+        return true
+      }
+
+      // ok, let's see if we can swallow whatever we can.
+      while (fr < fl) {
+        var swallowee = file[fr]
+
+        this.debug('\nglobstar while', file, fr, pattern, pr, swallowee)
+
+        // XXX remove this slice.  Just pass the start index.
+        if (this.matchOne(file.slice(fr), pattern.slice(pr), partial)) {
+          this.debug('globstar found match!', fr, fl, swallowee)
+          // found a match.
+          return true
+        } else {
+          // can't swallow "." or ".." ever.
+          // can only swallow ".foo" when explicitly asked.
+          if (swallowee === '.' || swallowee === '..' ||
+            (!options.dot && swallowee.charAt(0) === '.')) {
+            this.debug('dot detected!', file, fr, pattern, pr)
+            break
+          }
+
+          // ** swallows a segment, and continue.
+          this.debug('globstar swallow a segment, and continue')
+          fr++
+        }
+      }
+
+      // no match was found.
+      // However, in partial mode, we can't say this is necessarily over.
+      // If there's more *pattern* left, then
+      if (partial) {
+        // ran out of file
+        this.debug('\n>>> no match, partial?', file, fr, pattern, pr)
+        if (fr === fl) return true
+      }
+      return false
+    }
+
+    // something other than **
+    // non-magic patterns just have to match exactly
+    // patterns with magic have been turned into regexps.
+    var hit
+    if (typeof p === 'string') {
+      if (options.nocase) {
+        hit = f.toLowerCase() === p.toLowerCase()
+      } else {
+        hit = f === p
+      }
+      this.debug('string match', p, f, hit)
+    } else {
+      hit = f.match(p)
+      this.debug('pattern match', p, f, hit)
+    }
+
+    if (!hit) return false
+  }
+
+  // Note: ending in / means that we'll get a final ""
+  // at the end of the pattern.  This can only match a
+  // corresponding "" at the end of the file.
+  // If the file ends in /, then it can only match a
+  // a pattern that ends in /, unless the pattern just
+  // doesn't have any more for it. But, a/b/ should *not*
+  // match "a/b/*", even though "" matches against the
+  // [^/]*? pattern, except in partial mode, where it might
+  // simply not be reached yet.
+  // However, a/b/ should still satisfy a/*
+
+  // now either we fell off the end of the pattern, or we're done.
+  if (fi === fl && pi === pl) {
+    // ran out of pattern and filename at the same time.
+    // an exact hit!
+    return true
+  } else if (fi === fl) {
+    // ran out of file, but still had pattern left.
+    // this is ok if we're doing the match as part of
+    // a glob fs traversal.
+    return partial
+  } else if (pi === pl) {
+    // ran out of pattern, still have file left.
+    // this is only acceptable if we're on the very last
+    // empty segment of a file with a trailing slash.
+    // a/* should match a/b/
+    var emptyFileEnd = (fi === fl - 1) && (file[fi] === '')
+    return emptyFileEnd
+  }
+
+  // should be unreachable.
+  throw new Error('wtf?')
+}
+
+// replace stuff like \* with *
+function globUnescape (s) {
+  return s.replace(/\\(.)/g, '$1')
+}
+
+function regExpEscape (s) {
+  return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
+}
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore
new file mode 100644
index 00000000000000..353546af2368e1
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore
@@ -0,0 +1,3 @@
+test
+.gitignore
+.travis.yml
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md
new file mode 100644
index 00000000000000..b0d793ed5d9016
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md
@@ -0,0 +1,122 @@
+# brace-expansion
+
+[Brace expansion](https://www.gnu.org/software/bash/manual/html_node/Brace-Expansion.html),
+as known from sh/bash, in JavaScript.
+
+[![build status](https://secure.travis-ci.org/juliangruber/brace-expansion.svg)](http://travis-ci.org/juliangruber/brace-expansion)
+[![downloads](https://img.shields.io/npm/dm/brace-expansion.svg)](https://www.npmjs.org/package/brace-expansion)
+
+[![testling badge](https://ci.testling.com/juliangruber/brace-expansion.png)](https://ci.testling.com/juliangruber/brace-expansion)
+
+## Example
+
+```js
+var expand = require('brace-expansion');
+
+expand('file-{a,b,c}.jpg')
+// => ['file-a.jpg', 'file-b.jpg', 'file-c.jpg']
+
+expand('-v{,,}')
+// => ['-v', '-v', '-v']
+
+expand('file{0..2}.jpg')
+// => ['file0.jpg', 'file1.jpg', 'file2.jpg']
+
+expand('file-{a..c}.jpg')
+// => ['file-a.jpg', 'file-b.jpg', 'file-c.jpg']
+
+expand('file{2..0}.jpg')
+// => ['file2.jpg', 'file1.jpg', 'file0.jpg']
+
+expand('file{0..4..2}.jpg')
+// => ['file0.jpg', 'file2.jpg', 'file4.jpg']
+
+expand('file-{a..e..2}.jpg')
+// => ['file-a.jpg', 'file-c.jpg', 'file-e.jpg']
+
+expand('file{00..10..5}.jpg')
+// => ['file00.jpg', 'file05.jpg', 'file10.jpg']
+
+expand('{{A..C},{a..c}}')
+// => ['A', 'B', 'C', 'a', 'b', 'c']
+
+expand('ppp{,config,oe{,conf}}')
+// => ['ppp', 'pppconfig', 'pppoe', 'pppoeconf']
+```
+
+## API
+
+```js
+var expand = require('brace-expansion');
+```
+
+### var expanded = expand(str)
+
+Return an array of all possible and valid expansions of `str`. If none are
+found, `[str]` is returned.
+
+Valid expansions are:
+
+```js
+/^(.*,)+(.+)?$/
+// {a,b,...}
+```
+
+A comma seperated list of options, like `{a,b}` or `{a,{b,c}}` or `{,a,}`.
+
+```js
+/^-?\d+\.\.-?\d+(\.\.-?\d+)?$/
+// {x..y[..incr]}
+```
+
+A numeric sequence from `x` to `y` inclusive, with optional increment.
+If `x` or `y` start with a leading `0`, all the numbers will be padded
+to have equal length. Negative numbers and backwards iteration work too.
+
+```js
+/^-?\d+\.\.-?\d+(\.\.-?\d+)?$/
+// {x..y[..incr]}
+```
+
+An alphabetic sequence from `x` to `y` inclusive, with optional increment.
+`x` and `y` must be exactly one character, and if given, `incr` must be a
+number.
+
+For compatibility reasons, the string `${` is not eligible for brace expansion.
+
+## Installation
+
+With [npm](https://npmjs.org) do:
+
+```bash
+npm install brace-expansion
+```
+
+## Contributors
+
+- [Julian Gruber](https://github.com/juliangruber)
+- [Isaac Z. Schlueter](https://github.com/isaacs)
+
+## License
+
+(MIT)
+
+Copyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js
new file mode 100644
index 00000000000000..36cde4de5c114b
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js
@@ -0,0 +1,7 @@
+var expand = require('./');
+
+console.log(expand('http://any.org/archive{1996..1999}/vol{1..4}/part{a,b,c}.html'));
+console.log(expand('http://www.numericals.com/file{1..100..10}.txt'));
+console.log(expand('http://www.letters.com/file{a..z..2}.txt'));
+console.log(expand('mkdir /usr/local/src/bash/{old,new,dist,bugs}'));
+console.log(expand('chown root /usr/{ucb/{ex,edit},lib/{ex?.?*,how_ex}}'));
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js
new file mode 100644
index 00000000000000..f8d40f79acde0a
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js
@@ -0,0 +1,190 @@
+var concatMap = require('concat-map');
+var balanced = require('balanced-match');
+
+module.exports = expandTop;
+
+var escSlash = '\0SLASH'+Math.random()+'\0';
+var escOpen = '\0OPEN'+Math.random()+'\0';
+var escClose = '\0CLOSE'+Math.random()+'\0';
+var escComma = '\0COMMA'+Math.random()+'\0';
+var escPeriod = '\0PERIOD'+Math.random()+'\0';
+
+function numeric(str) {
+  return parseInt(str, 10) == str
+    ? parseInt(str, 10)
+    : str.charCodeAt(0);
+}
+
+function escapeBraces(str) {
+  return str.split('\\\\').join(escSlash)
+            .split('\\{').join(escOpen)
+            .split('\\}').join(escClose)
+            .split('\\,').join(escComma)
+            .split('\\.').join(escPeriod);
+}
+
+function unescapeBraces(str) {
+  return str.split(escSlash).join('\\')
+            .split(escOpen).join('{')
+            .split(escClose).join('}')
+            .split(escComma).join(',')
+            .split(escPeriod).join('.');
+}
+
+
+// Basically just str.split(","), but handling cases
+// where we have nested braced sections, which should be
+// treated as individual members, like {a,{b,c},d}
+function parseCommaParts(str) {
+  if (!str)
+    return [''];
+
+  var parts = [];
+  var m = balanced('{', '}', str);
+
+  if (!m)
+    return str.split(',');
+
+  var pre = m.pre;
+  var body = m.body;
+  var post = m.post;
+  var p = pre.split(',');
+
+  p[p.length-1] += '{' + body + '}';
+  var postParts = parseCommaParts(post);
+  if (post.length) {
+    p[p.length-1] += postParts.shift();
+    p.push.apply(p, postParts);
+  }
+
+  parts.push.apply(parts, p);
+
+  return parts;
+}
+
+function expandTop(str) {
+  if (!str)
+    return [];
+
+  return expand(escapeBraces(str), true).map(unescapeBraces);
+}
+
+function identity(e) {
+  return e;
+}
+
+function embrace(str) {
+  return '{' + str + '}';
+}
+function isPadded(el) {
+  return /^-?0\d/.test(el);
+}
+
+function lte(i, y) {
+  return i <= y;
+}
+function gte(i, y) {
+  return i >= y;
+}
+
+function expand(str, isTop) {
+  var expansions = [];
+
+  var m = balanced('{', '}', str);
+  if (!m || /\$$/.test(m.pre)) return [str];
+
+  var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
+  var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
+  var isSequence = isNumericSequence || isAlphaSequence;
+  var isOptions = /^(.*,)+(.+)?$/.test(m.body);
+  if (!isSequence && !isOptions) {
+    // {a},b}
+    if (m.post.match(/,.*}/)) {
+      str = m.pre + '{' + m.body + escClose + m.post;
+      return expand(str);
+    }
+    return [str];
+  }
+
+  var n;
+  if (isSequence) {
+    n = m.body.split(/\.\./);
+  } else {
+    n = parseCommaParts(m.body);
+    if (n.length === 1) {
+      // x{{a,b}}y ==> x{a}y x{b}y
+      n = expand(n[0], false).map(embrace);
+      if (n.length === 1) {
+        var post = m.post.length
+          ? expand(m.post, false)
+          : [''];
+        return post.map(function(p) {
+          return m.pre + n[0] + p;
+        });
+      }
+    }
+  }
+
+  // at this point, n is the parts, and we know it's not a comma set
+  // with a single entry.
+
+  // no need to expand pre, since it is guaranteed to be free of brace-sets
+  var pre = m.pre;
+  var post = m.post.length
+    ? expand(m.post, false)
+    : [''];
+
+  var N;
+
+  if (isSequence) {
+    var x = numeric(n[0]);
+    var y = numeric(n[1]);
+    var width = Math.max(n[0].length, n[1].length)
+    var incr = n.length == 3
+      ? Math.abs(numeric(n[2]))
+      : 1;
+    var test = lte;
+    var reverse = y < x;
+    if (reverse) {
+      incr *= -1;
+      test = gte;
+    }
+    var pad = n.some(isPadded);
+
+    N = [];
+
+    for (var i = x; test(i, y); i += incr) {
+      var c;
+      if (isAlphaSequence) {
+        c = String.fromCharCode(i);
+        if (c === '\\')
+          c = '';
+      } else {
+        c = String(i);
+        if (pad) {
+          var need = width - c.length;
+          if (need > 0) {
+            var z = new Array(need + 1).join('0');
+            if (i < 0)
+              c = '-' + z + c.slice(1);
+            else
+              c = z + c;
+          }
+        }
+      }
+      N.push(c);
+    }
+  } else {
+    N = concatMap(n, function(el) { return expand(el, false) });
+  }
+
+  for (var j = 0; j < N.length; j++) {
+    for (var k = 0; k < post.length; k++) {
+      var expansion = pre + N[j] + post[k];
+      if (!isTop || isSequence || expansion)
+        expansions.push(expansion);
+    }
+  }
+
+  return expansions;
+}
diff --git a/deps/npm/node_modules/node-uuid/.npmignore b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore
similarity index 100%
rename from deps/npm/node_modules/node-uuid/.npmignore
rename to deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore
diff --git a/deps/npm/node_modules/builtins/.travis.yml b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/builtins/.travis.yml
rename to deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
new file mode 100644
index 00000000000000..dd2730cfde0cab
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
@@ -0,0 +1,5 @@
+
+test:
+	@node_modules/.bin/tape test/*.js
+
+.PHONY: test
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
new file mode 100644
index 00000000000000..2aff0ebff4403e
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
@@ -0,0 +1,80 @@
+# balanced-match
+
+Match balanced string pairs, like `{` and `}` or `<b>` and `</b>`.
+
+[![build status](https://secure.travis-ci.org/juliangruber/balanced-match.svg)](http://travis-ci.org/juliangruber/balanced-match)
+[![downloads](https://img.shields.io/npm/dm/balanced-match.svg)](https://www.npmjs.org/package/balanced-match)
+
+[![testling badge](https://ci.testling.com/juliangruber/balanced-match.png)](https://ci.testling.com/juliangruber/balanced-match)
+
+## Example
+
+Get the first matching pair of braces:
+
+```js
+var balanced = require('balanced-match');
+
+console.log(balanced('{', '}', 'pre{in{nested}}post'));
+console.log(balanced('{', '}', 'pre{first}between{second}post'));
+```
+
+The matches are:
+
+```bash
+$ node example.js
+{ start: 3, end: 14, pre: 'pre', body: 'in{nested}', post: 'post' }
+{ start: 3,
+  end: 9,
+  pre: 'pre',
+  body: 'first',
+  post: 'between{second}post' }
+```
+
+## API
+
+### var m = balanced(a, b, str)
+
+For the first non-nested matching pair of `a` and `b` in `str`, return an
+object with those keys:
+
+* **start** the index of the first match of `a`
+* **end** the index of the matching `b`
+* **pre** the preamble, `a` and `b` not included
+* **body** the match, `a` and `b` not included
+* **post** the postscript, `a` and `b` not included
+
+If there's no match, `undefined` will be returned.
+
+If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `['{', 'a', '']`.
+
+## Installation
+
+With [npm](https://npmjs.org) do:
+
+```bash
+npm install balanced-match
+```
+
+## License
+
+(MIT)
+
+Copyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
new file mode 100644
index 00000000000000..9ce76f480a4321
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
@@ -0,0 +1,4 @@
+var balanced = require('./');
+
+console.log(balanced('{', '}', 'pre{in{nested}}post'));
+console.log(balanced('{', '}', 'pre{first}between{second}post'));
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
new file mode 100644
index 00000000000000..d165ae8174ca82
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
@@ -0,0 +1,38 @@
+module.exports = balanced;
+function balanced(a, b, str) {
+  var bal = 0;
+  var m = {};
+  var ended = false;
+
+  for (var i = 0; i < str.length; i++) {
+    if (a == str.substr(i, a.length)) {
+      if (!('start' in m)) m.start = i;
+      bal++;
+    }
+    else if (b == str.substr(i, b.length) && 'start' in m) {
+      ended = true;
+      bal--;
+      if (!bal) {
+        m.end = i;
+        m.pre = str.substr(0, m.start);
+        m.body = (m.end - m.start > 1)
+          ? str.substring(m.start + a.length, m.end)
+          : '';
+        m.post = str.slice(m.end + b.length);
+        return m;
+      }
+    }
+  }
+
+  // if we opened more than we closed, find the one we closed
+  if (bal && ended) {
+    var start = m.start + a.length;
+    m = balanced(a, b, str.substr(start));
+    if (m) {
+      m.start += start;
+      m.end += start;
+      m.pre = str.slice(0, start) + m.pre;
+    }
+    return m;
+  }
+}
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
new file mode 100644
index 00000000000000..35332a3c4eb366
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
@@ -0,0 +1,56 @@
+{
+  "name": "balanced-match",
+  "description": "Match balanced character pairs, like \"{\" and \"}\"",
+  "version": "0.2.0",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/juliangruber/balanced-match.git"
+  },
+  "homepage": "https://github.com/juliangruber/balanced-match",
+  "main": "index.js",
+  "scripts": {
+    "test": "make test"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "tape": "~1.1.1"
+  },
+  "keywords": [
+    "match",
+    "regexp",
+    "test",
+    "balanced",
+    "parse"
+  ],
+  "author": {
+    "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
+    "url": "http://juliangruber.com"
+  },
+  "license": "MIT",
+  "testling": {
+    "files": "test/*.js",
+    "browsers": [
+      "ie/8..latest",
+      "firefox/20..latest",
+      "firefox/nightly",
+      "chrome/25..latest",
+      "chrome/canary",
+      "opera/12..latest",
+      "opera/next",
+      "safari/5.1..latest",
+      "ipad/6.0..latest",
+      "iphone/6.0..latest",
+      "android-browser/4.2..latest"
+    ]
+  },
+  "readme": "# balanced-match\n\nMatch balanced string pairs, like `{` and `}` or `<b>` and `</b>`.\n\n[![build status](https://secure.travis-ci.org/juliangruber/balanced-match.svg)](http://travis-ci.org/juliangruber/balanced-match)\n[![downloads](https://img.shields.io/npm/dm/balanced-match.svg)](https://www.npmjs.org/package/balanced-match)\n\n[![testling badge](https://ci.testling.com/juliangruber/balanced-match.png)](https://ci.testling.com/juliangruber/balanced-match)\n\n## Example\n\nGet the first matching pair of braces:\n\n```js\nvar balanced = require('balanced-match');\n\nconsole.log(balanced('{', '}', 'pre{in{nested}}post'));\nconsole.log(balanced('{', '}', 'pre{first}between{second}post'));\n```\n\nThe matches are:\n\n```bash\n$ node example.js\n{ start: 3, end: 14, pre: 'pre', body: 'in{nested}', post: 'post' }\n{ start: 3,\n  end: 9,\n  pre: 'pre',\n  body: 'first',\n  post: 'between{second}post' }\n```\n\n## API\n\n### var m = balanced(a, b, str)\n\nFor the first non-nested matching pair of `a` and `b` in `str`, return an\nobject with those keys:\n\n* **start** the index of the first match of `a`\n* **end** the index of the matching `b`\n* **pre** the preamble, `a` and `b` not included\n* **body** the match, `a` and `b` not included\n* **post** the postscript, `a` and `b` not included\n\nIf there's no match, `undefined` will be returned.\n\nIf the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `['{', 'a', '']`.\n\n## Installation\n\nWith [npm](https://npmjs.org) do:\n\n```bash\nnpm install balanced-match\n```\n\n## License\n\n(MIT)\n\nCopyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the \"Software\"), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\nof the Software, and to permit persons to whom the Software is furnished to do\nso, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/juliangruber/balanced-match/issues"
+  },
+  "_id": "balanced-match@0.2.0",
+  "_shasum": "38f6730c03aab6d5edbb52bd934885e756d71674",
+  "_resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+  "_from": "balanced-match@>=0.2.0 <0.3.0"
+}
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js
new file mode 100644
index 00000000000000..36bfd39954850d
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js
@@ -0,0 +1,56 @@
+var test = require('tape');
+var balanced = require('..');
+
+test('balanced', function(t) {
+  t.deepEqual(balanced('{', '}', 'pre{in{nest}}post'), {
+    start: 3,
+    end: 12,
+    pre: 'pre',
+    body: 'in{nest}',
+    post: 'post'
+  });
+  t.deepEqual(balanced('{', '}', '{{{{{{{{{in}post'), {
+    start: 8,
+    end: 11,
+    pre: '{{{{{{{{',
+    body: 'in',
+    post: 'post'
+  });
+  t.deepEqual(balanced('{', '}', 'pre{body{in}post'), {
+    start: 8,
+    end: 11,
+    pre: 'pre{body',
+    body: 'in',
+    post: 'post'
+  });
+  t.deepEqual(balanced('{', '}', 'pre}{in{nest}}post'), {
+    start: 4,
+    end: 13,
+    pre: 'pre}',
+    body: 'in{nest}',
+    post: 'post'
+  });
+  t.deepEqual(balanced('{', '}', 'pre{body}between{body2}post'), {
+    start: 3,
+    end: 8,
+    pre: 'pre',
+    body: 'body',
+    post: 'between{body2}post'
+  });
+  t.notOk(balanced('{', '}', 'nope'), 'should be notOk');
+  t.deepEqual(balanced('<b>', '</b>', 'pre<b>in<b>nest</b></b>post'), {
+    start: 3,
+    end: 19,
+    pre: 'pre',
+    body: 'in<b>nest</b>',
+    post: 'post'
+  });
+  t.deepEqual(balanced('<b>', '</b>', 'pre</b><b>in<b>nest</b></b>post'), {
+    start: 7,
+    end: 23,
+    pre: 'pre</b>',
+    body: 'in<b>nest</b>',
+    post: 'post'
+  });
+  t.end();
+});
diff --git a/deps/npm/node_modules/stringstream/.travis.yml b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/stringstream/.travis.yml
rename to deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml
diff --git a/deps/npm/node_modules/minimist/LICENSE b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE
similarity index 100%
rename from deps/npm/node_modules/minimist/LICENSE
rename to deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
new file mode 100644
index 00000000000000..408f70a1be473c
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
@@ -0,0 +1,62 @@
+concat-map
+==========
+
+Concatenative mapdashery.
+
+[![browser support](http://ci.testling.com/substack/node-concat-map.png)](http://ci.testling.com/substack/node-concat-map)
+
+[![build status](https://secure.travis-ci.org/substack/node-concat-map.png)](http://travis-ci.org/substack/node-concat-map)
+
+example
+=======
+
+``` js
+var concatMap = require('concat-map');
+var xs = [ 1, 2, 3, 4, 5, 6 ];
+var ys = concatMap(xs, function (x) {
+    return x % 2 ? [ x - 0.1, x, x + 0.1 ] : [];
+});
+console.dir(ys);
+```
+
+***
+
+```
+[ 0.9, 1, 1.1, 2.9, 3, 3.1, 4.9, 5, 5.1 ]
+```
+
+methods
+=======
+
+``` js
+var concatMap = require('concat-map')
+```
+
+concatMap(xs, fn)
+-----------------
+
+Return an array of concatenated elements by calling `fn(x, i)` for each element
+`x` and each index `i` in the array `xs`.
+
+When `fn(x, i)` returns an array, its result will be concatenated with the
+result array. If `fn(x, i)` returns anything else, that value will be pushed
+onto the end of the result array.
+
+install
+=======
+
+With [npm](http://npmjs.org) do:
+
+```
+npm install concat-map
+```
+
+license
+=======
+
+MIT
+
+notes
+=====
+
+This module was written while sitting high above the ground in a tree.
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js
new file mode 100644
index 00000000000000..33656217b61d8f
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js
@@ -0,0 +1,6 @@
+var concatMap = require('../');
+var xs = [ 1, 2, 3, 4, 5, 6 ];
+var ys = concatMap(xs, function (x) {
+    return x % 2 ? [ x - 0.1, x, x + 0.1 ] : [];
+});
+console.dir(ys);
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
new file mode 100644
index 00000000000000..b29a7812e5055a
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
@@ -0,0 +1,13 @@
+module.exports = function (xs, fn) {
+    var res = [];
+    for (var i = 0; i < xs.length; i++) {
+        var x = fn(xs[i], i);
+        if (isArray(x)) res.push.apply(res, x);
+        else res.push(x);
+    }
+    return res;
+};
+
+var isArray = Array.isArray || function (xs) {
+    return Object.prototype.toString.call(xs) === '[object Array]';
+};
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
new file mode 100644
index 00000000000000..386ed516010565
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
@@ -0,0 +1,82 @@
+{
+  "name": "concat-map",
+  "description": "concatenative mapdashery",
+  "version": "0.0.1",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/substack/node-concat-map.git"
+  },
+  "main": "index.js",
+  "keywords": [
+    "concat",
+    "concatMap",
+    "map",
+    "functional",
+    "higher-order"
+  ],
+  "directories": {
+    "example": "example",
+    "test": "test"
+  },
+  "scripts": {
+    "test": "tape test/*.js"
+  },
+  "devDependencies": {
+    "tape": "~2.4.0"
+  },
+  "license": "MIT",
+  "author": {
+    "name": "James Halliday",
+    "email": "mail@substack.net",
+    "url": "http://substack.net"
+  },
+  "testling": {
+    "files": "test/*.js",
+    "browsers": {
+      "ie": [
+        6,
+        7,
+        8,
+        9
+      ],
+      "ff": [
+        3.5,
+        10,
+        15
+      ],
+      "chrome": [
+        10,
+        22
+      ],
+      "safari": [
+        5.1
+      ],
+      "opera": [
+        12
+      ]
+    }
+  },
+  "bugs": {
+    "url": "https://github.com/substack/node-concat-map/issues"
+  },
+  "homepage": "https://github.com/substack/node-concat-map",
+  "_id": "concat-map@0.0.1",
+  "dist": {
+    "shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
+    "tarball": "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+  },
+  "_from": "concat-map@0.0.1",
+  "_npmVersion": "1.3.21",
+  "_npmUser": {
+    "name": "substack",
+    "email": "mail@substack.net"
+  },
+  "maintainers": [
+    {
+      "name": "substack",
+      "email": "mail@substack.net"
+    }
+  ],
+  "_shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
+  "_resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+}
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
new file mode 100644
index 00000000000000..fdbd7022f6da17
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
@@ -0,0 +1,39 @@
+var concatMap = require('../');
+var test = require('tape');
+
+test('empty or not', function (t) {
+    var xs = [ 1, 2, 3, 4, 5, 6 ];
+    var ixes = [];
+    var ys = concatMap(xs, function (x, ix) {
+        ixes.push(ix);
+        return x % 2 ? [ x - 0.1, x, x + 0.1 ] : [];
+    });
+    t.same(ys, [ 0.9, 1, 1.1, 2.9, 3, 3.1, 4.9, 5, 5.1 ]);
+    t.same(ixes, [ 0, 1, 2, 3, 4, 5 ]);
+    t.end();
+});
+
+test('always something', function (t) {
+    var xs = [ 'a', 'b', 'c', 'd' ];
+    var ys = concatMap(xs, function (x) {
+        return x === 'b' ? [ 'B', 'B', 'B' ] : [ x ];
+    });
+    t.same(ys, [ 'a', 'B', 'B', 'B', 'c', 'd' ]);
+    t.end();
+});
+
+test('scalars', function (t) {
+    var xs = [ 'a', 'b', 'c', 'd' ];
+    var ys = concatMap(xs, function (x) {
+        return x === 'b' ? [ 'B', 'B', 'B' ] : x;
+    });
+    t.same(ys, [ 'a', 'B', 'B', 'B', 'c', 'd' ]);
+    t.end();
+});
+
+test('undefs', function (t) {
+    var xs = [ 'a', 'b', 'c', 'd' ];
+    var ys = concatMap(xs, function () {});
+    t.same(ys, [ undefined, undefined, undefined, undefined ]);
+    t.end();
+});
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
new file mode 100644
index 00000000000000..4cb3e05d7ceb6c
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
@@ -0,0 +1,75 @@
+{
+  "name": "brace-expansion",
+  "description": "Brace expansion as known from sh/bash",
+  "version": "1.1.1",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/juliangruber/brace-expansion.git"
+  },
+  "homepage": "https://github.com/juliangruber/brace-expansion",
+  "main": "index.js",
+  "scripts": {
+    "test": "tape test/*.js",
+    "gentest": "bash test/generate.sh"
+  },
+  "dependencies": {
+    "balanced-match": "^0.2.0",
+    "concat-map": "0.0.1"
+  },
+  "devDependencies": {
+    "tape": "^3.0.3"
+  },
+  "keywords": [],
+  "author": {
+    "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
+    "url": "http://juliangruber.com"
+  },
+  "license": "MIT",
+  "testling": {
+    "files": "test/*.js",
+    "browsers": [
+      "ie/8..latest",
+      "firefox/20..latest",
+      "firefox/nightly",
+      "chrome/25..latest",
+      "chrome/canary",
+      "opera/12..latest",
+      "opera/next",
+      "safari/5.1..latest",
+      "ipad/6.0..latest",
+      "iphone/6.0..latest",
+      "android-browser/4.2..latest"
+    ]
+  },
+  "gitHead": "f50da498166d76ea570cf3b30179f01f0f119612",
+  "bugs": {
+    "url": "https://github.com/juliangruber/brace-expansion/issues"
+  },
+  "_id": "brace-expansion@1.1.1",
+  "_shasum": "da5fb78aef4c44c9e4acf525064fb3208ebab045",
+  "_from": "brace-expansion@>=1.0.0 <2.0.0",
+  "_npmVersion": "2.6.1",
+  "_nodeVersion": "0.10.36",
+  "_npmUser": {
+    "name": "juliangruber",
+    "email": "julian@juliangruber.com"
+  },
+  "maintainers": [
+    {
+      "name": "juliangruber",
+      "email": "julian@juliangruber.com"
+    },
+    {
+      "name": "isaacs",
+      "email": "isaacs@npmjs.com"
+    }
+  ],
+  "dist": {
+    "shasum": "da5fb78aef4c44c9e4acf525064fb3208ebab045",
+    "tarball": "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz"
+  },
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+  "readme": "ERROR: No README data found!"
+}
diff --git a/deps/npm/node_modules/glob/node_modules/minimatch/package.json b/deps/npm/node_modules/glob/node_modules/minimatch/package.json
new file mode 100644
index 00000000000000..4944eb0bccfada
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/minimatch/package.json
@@ -0,0 +1,60 @@
+{
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me"
+  },
+  "name": "minimatch",
+  "description": "a glob matcher in javascript",
+  "version": "3.0.0",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/minimatch.git"
+  },
+  "main": "minimatch.js",
+  "scripts": {
+    "posttest": "standard minimatch.js test/*.js",
+    "test": "tap test/*.js"
+  },
+  "engines": {
+    "node": "*"
+  },
+  "dependencies": {
+    "brace-expansion": "^1.0.0"
+  },
+  "devDependencies": {
+    "standard": "^3.7.2",
+    "tap": "^1.2.0"
+  },
+  "license": "ISC",
+  "files": [
+    "minimatch.js"
+  ],
+  "gitHead": "270dbea567f0af6918cb18103e98c612aa717a20",
+  "bugs": {
+    "url": "https://github.com/isaacs/minimatch/issues"
+  },
+  "homepage": "https://github.com/isaacs/minimatch#readme",
+  "_id": "minimatch@3.0.0",
+  "_shasum": "5236157a51e4f004c177fb3c527ff7dd78f0ef83",
+  "_from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+  "_npmVersion": "3.3.2",
+  "_nodeVersion": "4.0.0",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "isaacs@npmjs.com"
+  },
+  "dist": {
+    "shasum": "5236157a51e4f004c177fb3c527ff7dd78f0ef83",
+    "tarball": "http://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
+  },
+  "maintainers": [
+    {
+      "name": "isaacs",
+      "email": "i@izs.me"
+    }
+  ],
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+  "readme": "ERROR: No README data found!"
+}
diff --git a/deps/npm/node_modules/path-is-absolute/index.js b/deps/npm/node_modules/glob/node_modules/path-is-absolute/index.js
similarity index 100%
rename from deps/npm/node_modules/path-is-absolute/index.js
rename to deps/npm/node_modules/glob/node_modules/path-is-absolute/index.js
diff --git a/deps/npm/node_modules/ansi-styles/license b/deps/npm/node_modules/glob/node_modules/path-is-absolute/license
similarity index 100%
rename from deps/npm/node_modules/ansi-styles/license
rename to deps/npm/node_modules/glob/node_modules/path-is-absolute/license
diff --git a/deps/npm/node_modules/glob/node_modules/path-is-absolute/package.json b/deps/npm/node_modules/glob/node_modules/path-is-absolute/package.json
new file mode 100644
index 00000000000000..bf60d74dbd3297
--- /dev/null
+++ b/deps/npm/node_modules/glob/node_modules/path-is-absolute/package.json
@@ -0,0 +1,53 @@
+{
+  "name": "path-is-absolute",
+  "version": "1.0.0",
+  "description": "Node.js 0.12 path.isAbsolute() ponyfill",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sindresorhus/path-is-absolute.git"
+  },
+  "author": {
+    "name": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
+    "url": "sindresorhus.com"
+  },
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "scripts": {
+    "test": "node test.js"
+  },
+  "files": [
+    "index.js"
+  ],
+  "keywords": [
+    "path",
+    "paths",
+    "file",
+    "dir",
+    "absolute",
+    "isabsolute",
+    "is-absolute",
+    "built-in",
+    "util",
+    "utils",
+    "core",
+    "ponyfill",
+    "polyfill",
+    "shim",
+    "is",
+    "detect",
+    "check"
+  ],
+  "readme": "# path-is-absolute [![Build Status](https://travis-ci.org/sindresorhus/path-is-absolute.svg?branch=master)](https://travis-ci.org/sindresorhus/path-is-absolute)\n\n> Node.js 0.12 [`path.isAbsolute()`](http://nodejs.org/api/path.html#path_path_isabsolute_path) ponyfill\n\n> Ponyfill: A polyfill that doesn't overwrite the native method\n\n\n## Install\n\n```\n$ npm install --save path-is-absolute\n```\n\n\n## Usage\n\n```js\nvar pathIsAbsolute = require('path-is-absolute');\n\n// Linux\npathIsAbsolute('/home/foo');\n//=> true\n\n// Windows\npathIsAbsolute('C:/Users/');\n//=> true\n\n// Any OS\npathIsAbsolute.posix('/home/foo');\n//=> true\n```\n\n\n## API\n\nSee the [`path.isAbsolute()` docs](http://nodejs.org/api/path.html#path_path_isabsolute_path).\n\n### pathIsAbsolute(path)\n\n### pathIsAbsolute.posix(path)\n\nThe Posix specific version.\n\n### pathIsAbsolute.win32(path)\n\nThe Windows specific version.\n\n\n## License\n\nMIT © [Sindre Sorhus](http://sindresorhus.com)\n",
+  "readmeFilename": "readme.md",
+  "bugs": {
+    "url": "https://github.com/sindresorhus/path-is-absolute/issues"
+  },
+  "homepage": "https://github.com/sindresorhus/path-is-absolute#readme",
+  "_id": "path-is-absolute@1.0.0",
+  "_shasum": "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912",
+  "_resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
+  "_from": "path-is-absolute@>=1.0.0 <2.0.0"
+}
diff --git a/deps/npm/node_modules/path-is-absolute/readme.md b/deps/npm/node_modules/glob/node_modules/path-is-absolute/readme.md
similarity index 100%
rename from deps/npm/node_modules/path-is-absolute/readme.md
rename to deps/npm/node_modules/glob/node_modules/path-is-absolute/readme.md
diff --git a/deps/npm/node_modules/glob/package.json b/deps/npm/node_modules/glob/package.json
index d93b6fcc167e24..21725064f52f42 100644
--- a/deps/npm/node_modules/glob/package.json
+++ b/deps/npm/node_modules/glob/package.json
@@ -1,47 +1,24 @@
 {
-  "_args": [
-    [
-      "glob@~5.0.15",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "glob@>=5.0.15 <5.1.0",
-  "_id": "glob@5.0.15",
-  "_inCache": true,
-  "_location": "/glob",
-  "_nodeVersion": "4.0.0",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "3.3.2",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "glob",
-    "raw": "glob@~5.0.15",
-    "rawSpec": "~5.0.15",
-    "scope": null,
-    "spec": ">=5.0.15 <5.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/init-package-json",
-    "/read-package-json",
-    "/rimraf"
-  ],
-  "_resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-  "_shasum": "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1",
-  "_shrinkwrap": null,
-  "_spec": "glob@~5.0.15",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/node-glob/issues"
+  "name": "glob",
+  "description": "a little globber",
+  "version": "5.0.15",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/node-glob.git"
+  },
+  "main": "glob.js",
+  "files": [
+    "glob.js",
+    "sync.js",
+    "common.js"
+  ],
+  "engines": {
+    "node": "*"
   },
   "dependencies": {
     "inflight": "^1.0.4",
@@ -50,51 +27,47 @@
     "once": "^1.3.0",
     "path-is-absolute": "^1.0.0"
   },
-  "description": "a little globber",
   "devDependencies": {
     "mkdirp": "0",
     "rimraf": "^2.2.8",
     "tap": "^1.1.4",
     "tick": "0.0.6"
   },
-  "directories": {},
+  "scripts": {
+    "prepublish": "npm run benchclean",
+    "profclean": "rm -f v8.log profile.txt",
+    "test": "tap test/*.js --cov",
+    "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js",
+    "bench": "bash benchmark.sh",
+    "prof": "bash prof.sh && cat profile.txt",
+    "benchclean": "node benchclean.js"
+  },
+  "license": "ISC",
+  "gitHead": "3a7e71d453dd80e75b196fd262dd23ed54beeceb",
+  "bugs": {
+    "url": "https://github.com/isaacs/node-glob/issues"
+  },
+  "homepage": "https://github.com/isaacs/node-glob#readme",
+  "_id": "glob@5.0.15",
+  "_shasum": "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1",
+  "_from": "glob@>=5.0.15 <5.1.0",
+  "_npmVersion": "3.3.2",
+  "_nodeVersion": "4.0.0",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "isaacs@npmjs.com"
+  },
   "dist": {
     "shasum": "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1",
     "tarball": "http://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
   },
-  "engines": {
-    "node": "*"
-  },
-  "files": [
-    "common.js",
-    "glob.js",
-    "sync.js"
-  ],
-  "gitHead": "3a7e71d453dd80e75b196fd262dd23ed54beeceb",
-  "homepage": "https://github.com/isaacs/node-glob#readme",
-  "installable": true,
-  "license": "ISC",
-  "main": "glob.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "name": "glob",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/node-glob.git"
-  },
-  "scripts": {
-    "bench": "bash benchmark.sh",
-    "benchclean": "node benchclean.js",
-    "prepublish": "npm run benchclean",
-    "prof": "bash prof.sh && cat profile.txt",
-    "profclean": "rm -f v8.log profile.txt",
-    "test": "tap test/*.js --cov",
-    "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js"
-  },
-  "version": "5.0.15"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/graceful-fs/package.json b/deps/npm/node_modules/graceful-fs/package.json
index b01932d06af216..629ec7f8d28983 100644
--- a/deps/npm/node_modules/graceful-fs/package.json
+++ b/deps/npm/node_modules/graceful-fs/package.json
@@ -1,96 +1,57 @@
 {
-  "_args": [
-    [
-      "graceful-fs@latest",
-      "/Users/isaacs/dev/npm/npm"
-    ]
-  ],
-  "_from": "graceful-fs@latest",
-  "_id": "graceful-fs@4.1.2",
-  "_inCache": true,
-  "_location": "/graceful-fs",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "3.0.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "graceful-fs",
-    "raw": "graceful-fs@latest",
-    "rawSpec": "latest",
-    "scope": null,
-    "spec": "latest",
-    "type": "tag"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_shasum": "fe2239b7574972e67e41f808823f9bfa4a991e37",
-  "_shrinkwrap": null,
-  "_spec": "graceful-fs@latest",
-  "_where": "/Users/isaacs/dev/npm/npm",
-  "bugs": {
-    "url": "https://github.com/isaacs/node-graceful-fs/issues"
-  },
-  "dependencies": {},
+  "name": "graceful-fs",
   "description": "A drop-in replacement for fs, making various improvements.",
-  "devDependencies": {
-    "mkdirp": "^0.5.0",
-    "rimraf": "^2.2.8",
-    "tap": "^1.2.0"
+  "version": "4.1.2",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/isaacs/node-graceful-fs.git"
+  },
+  "main": "graceful-fs.js",
+  "engines": {
+    "node": ">=0.4.0"
   },
   "directories": {
     "test": "test"
   },
-  "dist": {
-    "shasum": "fe2239b7574972e67e41f808823f9bfa4a991e37",
-    "tarball": "http://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"
-  },
-  "engines": {
-    "node": ">=0.4.0"
+  "scripts": {
+    "test": "node test.js | tap -"
   },
-  "files": [
-    "fs.js",
-    "graceful-fs.js",
-    "legacy-streams.js",
-    "polyfills.js"
-  ],
-  "gitHead": "c286080071b6be9aa9ba108b0bb9b44ff122926d",
-  "homepage": "https://github.com/isaacs/node-graceful-fs#readme",
   "keywords": [
-    "EACCESS",
-    "EAGAIN",
-    "EINVAL",
-    "EMFILE",
-    "EPERM",
-    "error",
-    "errors",
     "fs",
-    "handling",
     "module",
-    "queue",
     "reading",
+    "retry",
     "retries",
-    "retry"
+    "queue",
+    "error",
+    "errors",
+    "handling",
+    "EMFILE",
+    "EAGAIN",
+    "EINVAL",
+    "EPERM",
+    "EACCESS"
   ],
   "license": "ISC",
-  "main": "graceful-fs.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "name": "graceful-fs",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/isaacs/node-graceful-fs.git"
+  "devDependencies": {
+    "mkdirp": "^0.5.0",
+    "rimraf": "^2.2.8",
+    "tap": "^1.2.0"
   },
-  "scripts": {
-    "test": "node test.js | tap -"
+  "files": [
+    "fs.js",
+    "graceful-fs.js",
+    "legacy-streams.js",
+    "polyfills.js"
+  ],
+  "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"
   },
-  "version": "4.1.2"
+  "homepage": "https://github.com/isaacs/node-graceful-fs#readme",
+  "_id": "graceful-fs@4.1.2",
+  "_shasum": "fe2239b7574972e67e41f808823f9bfa4a991e37",
+  "_resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz",
+  "_from": "graceful-fs@>=4.1.2 <4.2.0"
 }
diff --git a/deps/npm/node_modules/graceful-readlink/package.json b/deps/npm/node_modules/graceful-readlink/package.json
deleted file mode 100644
index 60665a7562a630..00000000000000
--- a/deps/npm/node_modules/graceful-readlink/package.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "_args": [
-    [
-      "graceful-readlink@>= 1.0.0",
-      "/Users/rebecca/code/npm/node_modules/commander"
-    ]
-  ],
-  "_from": "graceful-readlink@>=1.0.0",
-  "_id": "graceful-readlink@1.0.1",
-  "_inCache": true,
-  "_location": "/graceful-readlink",
-  "_nodeVersion": "0.11.14",
-  "_npmUser": {
-    "email": "zhiyelee@gmail.com",
-    "name": "zhiyelee"
-  },
-  "_npmVersion": "2.1.17",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "graceful-readlink",
-    "raw": "graceful-readlink@>= 1.0.0",
-    "rawSpec": ">= 1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/commander"
-  ],
-  "_resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-  "_shasum": "4cafad76bc62f02fa039b2f94e9a3dd3a391a725",
-  "_shrinkwrap": null,
-  "_spec": "graceful-readlink@>= 1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/commander",
-  "author": {
-    "name": "zhiyelee"
-  },
-  "bugs": {
-    "url": "https://github.com/zhiyelee/graceful-readlink/issues"
-  },
-  "dependencies": {},
-  "description": "graceful fs.readlink",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "4cafad76bc62f02fa039b2f94e9a3dd3a391a725",
-    "tarball": "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
-  },
-  "gitHead": "f6655275bebef706fb63fd01b5f062a7052419a5",
-  "homepage": "https://github.com/zhiyelee/graceful-readlink",
-  "keywords": [
-    "fs.readlink",
-    "readlink"
-  ],
-  "license": "MIT",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "zhiyelee",
-      "email": "zhiyelee@gmail.com"
-    }
-  ],
-  "name": "graceful-readlink",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/zhiyelee/graceful-readlink.git"
-  },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "version": "1.0.1"
-}
diff --git a/deps/npm/node_modules/har-validator/bin/har-validator b/deps/npm/node_modules/har-validator/bin/har-validator
deleted file mode 100755
index ab1db256f798e2..00000000000000
--- a/deps/npm/node_modules/har-validator/bin/har-validator
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env node
-
-'use strict'
-
-var Promise = require('bluebird')
-
-var chalk = require('chalk')
-var cmd = require('commander')
-var fs = Promise.promisifyAll(require('fs'))
-var path = require('path')
-var pkg = require('../package.json')
-var validate = Promise.promisifyAll(require('..'))
-
-cmd
-  .version(pkg.version)
-  .usage('[options] <files ...>')
-  .option('-s, --schema [name]', 'validate schema name (log, request, response, etc ...)')
-  .parse(process.argv)
-
-if (!cmd.args.length) {
-  cmd.help()
-}
-
-if (!cmd.schema) {
-  cmd.schema = 'har'
-}
-
-cmd.args.map(function (fileName) {
-  var file = chalk.yellow.italic(path.basename(fileName))
-
-  fs.readFileAsync(fileName)
-    .then(JSON.parse)
-    .then(validate[cmd.schema + 'Async'])
-    .then(function () {
-      console.log('%s [%s] is valid', chalk.green('✓'), file)
-    })
-    .catch(SyntaxError, function (e) {
-      console.error('%s [%s] failed to read JSON: %s', chalk.red('✖'), file, chalk.red(e.message))
-    })
-    .catch(function (e) {
-      e.errors.map(function (err) {
-        console.error('%s [%s] failed validation: (%s: %s) %s', chalk.red('✖'), file, chalk.cyan.italic(err.field), chalk.magenta.italic(err.value), chalk.red(err.message))
-      })
-    })
-})
diff --git a/deps/npm/node_modules/has-ansi/package.json b/deps/npm/node_modules/has-ansi/package.json
deleted file mode 100644
index a7ec031ca3082c..00000000000000
--- a/deps/npm/node_modules/has-ansi/package.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-  "_args": [
-    [
-      "has-ansi@^2.0.0",
-      "/Users/rebecca/code/npm/node_modules/chalk"
-    ]
-  ],
-  "_from": "has-ansi@>=2.0.0 <3.0.0",
-  "_id": "has-ansi@2.0.0",
-  "_inCache": true,
-  "_location": "/has-ansi",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "sindresorhus@gmail.com",
-    "name": "sindresorhus"
-  },
-  "_npmVersion": "2.11.2",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "has-ansi",
-    "raw": "has-ansi@^2.0.0",
-    "rawSpec": "^2.0.0",
-    "scope": null,
-    "spec": ">=2.0.0 <3.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/chalk"
-  ],
-  "_resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-  "_shasum": "34f5049ce1ecdf2b0649af3ef24e45ed35416d91",
-  "_shrinkwrap": null,
-  "_spec": "has-ansi@^2.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/chalk",
-  "author": {
-    "email": "sindresorhus@gmail.com",
-    "name": "Sindre Sorhus",
-    "url": "sindresorhus.com"
-  },
-  "bugs": {
-    "url": "https://github.com/sindresorhus/has-ansi/issues"
-  },
-  "dependencies": {
-    "ansi-regex": "^2.0.0"
-  },
-  "description": "Check if a string has ANSI escape codes",
-  "devDependencies": {
-    "ava": "0.0.4"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "34f5049ce1ecdf2b0649af3ef24e45ed35416d91",
-    "tarball": "http://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
-  },
-  "engines": {
-    "node": ">=0.10.0"
-  },
-  "files": [
-    "index.js"
-  ],
-  "gitHead": "0722275e1bef139fcd09137da6e5550c3cd368b9",
-  "homepage": "https://github.com/sindresorhus/has-ansi",
-  "keywords": [
-    "ansi",
-    "color",
-    "colors",
-    "colour",
-    "command-line",
-    "console",
-    "escape",
-    "find",
-    "has",
-    "match",
-    "pattern",
-    "re",
-    "regex",
-    "regexp",
-    "shell",
-    "string",
-    "styles",
-    "terminal",
-    "test",
-    "text",
-    "tty",
-    "xterm"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    },
-    {
-      "name": "jbnicolai",
-      "email": "jappelman@xebia.com"
-    }
-  ],
-  "name": "has-ansi",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/sindresorhus/has-ansi"
-  },
-  "scripts": {
-    "test": "node test.js"
-  },
-  "version": "2.0.0"
-}
diff --git a/deps/npm/node_modules/has-unicode/index.js b/deps/npm/node_modules/has-unicode/index.js
index edceb703094082..e0907b510a8b9a 100644
--- a/deps/npm/node_modules/has-unicode/index.js
+++ b/deps/npm/node_modules/has-unicode/index.js
@@ -1,6 +1,5 @@
 "use strict"
 var os = require("os")
-var child_process = require("child_process")
 
 var hasUnicode = module.exports = function () {
   // Supported Win32 platforms (>XP) support unicode in the console, though
diff --git a/deps/npm/node_modules/has-unicode/package.json b/deps/npm/node_modules/has-unicode/package.json
index de92acfcac4a32..3f0aa0581830c5 100644
--- a/deps/npm/node_modules/has-unicode/package.json
+++ b/deps/npm/node_modules/has-unicode/package.json
@@ -1,78 +1,53 @@
 {
-  "_args": [
-    [
-      "has-unicode@~1.0.0",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "has-unicode@>=1.0.0 <1.1.0",
-  "_id": "has-unicode@1.0.0",
-  "_inCache": true,
-  "_location": "/has-unicode",
-  "_nodeVersion": "0.10.33",
-  "_npmUser": {
-    "email": "me@re-becca.org",
-    "name": "iarna"
+  "name": "has-unicode",
+  "version": "1.0.1",
+  "description": "Try to guess if your terminal supports unicode",
+  "main": "index.js",
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "_npmVersion": "2.1.11",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "has-unicode",
-    "raw": "has-unicode@~1.0.0",
-    "rawSpec": "~1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <1.1.0",
-    "type": "range"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/iarna/has-unicode.git"
   },
-  "_requiredBy": [
-    "/",
-    "/gauge"
+  "keywords": [
+    "unicode",
+    "terminal"
   ],
-  "_resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz",
-  "_shasum": "bac5c44e064c2ffc3b8fcbd8c71afe08f9afc8cc",
-  "_shrinkwrap": null,
-  "_spec": "has-unicode@~1.0.0",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "me@re-becca.org",
-    "name": "Rebecca Turner"
+    "name": "Rebecca Turner",
+    "email": "me@re-becca.org"
   },
+  "license": "ISC",
   "bugs": {
     "url": "https://github.com/iarna/has-unicode/issues"
   },
-  "dependencies": {},
-  "description": "Try to guess if your terminal supports unicode",
+  "homepage": "https://github.com/iarna/has-unicode",
   "devDependencies": {
     "require-inject": "^1.1.1",
     "tap": "^0.4.13"
   },
-  "directories": {},
+  "gitHead": "d4ad300c67b25c197582e42e936ea928f7935d01",
+  "_id": "has-unicode@1.0.1",
+  "_shasum": "c46fceea053eb8ec789bffbba25fca52dfdcf38e",
+  "_from": "has-unicode@>=1.0.1 <1.1.0",
+  "_npmVersion": "3.3.6",
+  "_nodeVersion": "4.1.1",
+  "_npmUser": {
+    "name": "iarna",
+    "email": "me@re-becca.org"
+  },
   "dist": {
-    "shasum": "bac5c44e064c2ffc3b8fcbd8c71afe08f9afc8cc",
-    "tarball": "http://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz"
+    "shasum": "c46fceea053eb8ec789bffbba25fca52dfdcf38e",
+    "tarball": "http://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz"
   },
-  "gitHead": "a8c3dcf3be5f0c8f8e26a3e7ffea7da24344a006",
-  "homepage": "https://github.com/iarna/has-unicode",
-  "keywords": [
-    "terminal",
-    "unicode"
-  ],
-  "license": "ISC",
-  "main": "index.js",
   "maintainers": [
     {
       "name": "iarna",
       "email": "me@re-becca.org"
     }
   ],
-  "name": "has-unicode",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/iarna/has-unicode"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "1.0.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/hoek/package.json b/deps/npm/node_modules/hoek/package.json
deleted file mode 100644
index 58a346a4360456..00000000000000
--- a/deps/npm/node_modules/hoek/package.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  "_args": [
-    [
-      "hoek@2.x.x",
-      "/Users/rebecca/code/npm/node_modules/hawk"
-    ]
-  ],
-  "_from": "hoek@>=2.0.0 <3.0.0",
-  "_id": "hoek@2.16.3",
-  "_inCache": true,
-  "_location": "/hoek",
-  "_nodeVersion": "4.1.0",
-  "_npmUser": {
-    "email": "quitlahok@gmail.com",
-    "name": "nlf"
-  },
-  "_npmVersion": "3.3.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "hoek",
-    "raw": "hoek@2.x.x",
-    "rawSpec": "2.x.x",
-    "scope": null,
-    "spec": ">=2.0.0 <3.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/boom",
-    "/hawk",
-    "/sntp"
-  ],
-  "_resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-  "_shasum": "20bb7403d3cea398e91dc4710a8ff1b8274a25ed",
-  "_shrinkwrap": null,
-  "_spec": "hoek@2.x.x",
-  "_where": "/Users/rebecca/code/npm/node_modules/hawk",
-  "bugs": {
-    "url": "https://github.com/hapijs/hoek/issues"
-  },
-  "dependencies": {},
-  "description": "General purpose node utilities",
-  "devDependencies": {
-    "code": "1.x.x",
-    "lab": "5.x.x"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "20bb7403d3cea398e91dc4710a8ff1b8274a25ed",
-    "tarball": "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
-  },
-  "engines": {
-    "node": ">=0.10.40"
-  },
-  "gitHead": "20f36e85616264d4b73a64a374803175213a9121",
-  "homepage": "https://github.com/hapijs/hoek#readme",
-  "installable": true,
-  "keywords": [
-    "utilities"
-  ],
-  "license": "BSD-3-Clause",
-  "main": "lib/index.js",
-  "maintainers": [
-    {
-      "name": "hueniverse",
-      "email": "eran@hueniverse.com"
-    },
-    {
-      "name": "wyatt",
-      "email": "wpreul@gmail.com"
-    },
-    {
-      "name": "nlf",
-      "email": "quitlahok@gmail.com"
-    }
-  ],
-  "name": "hoek",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/hapijs/hoek.git"
-  },
-  "scripts": {
-    "test": "lab -a code -t 100 -L",
-    "test-cov-html": "lab -a code -t 100 -L -r html -o coverage.html"
-  },
-  "version": "2.16.3"
-}
diff --git a/deps/npm/node_modules/hosted-git-info/package.json b/deps/npm/node_modules/hosted-git-info/package.json
index e77f5f18329c69..1f78066ca45c1d 100644
--- a/deps/npm/node_modules/hosted-git-info/package.json
+++ b/deps/npm/node_modules/hosted-git-info/package.json
@@ -1,86 +1,39 @@
 {
-  "_args": [
-    [
-      "hosted-git-info@~2.1.4",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "hosted-git-info@>=2.1.4 <2.2.0",
-  "_id": "hosted-git-info@2.1.4",
-  "_inCache": true,
-  "_location": "/hosted-git-info",
-  "_nodeVersion": "2.0.2",
-  "_npmUser": {
-    "email": "ogd@aoaioxxysz.net",
-    "name": "othiym23"
-  },
-  "_npmVersion": "2.10.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "hosted-git-info",
-    "raw": "hosted-git-info@~2.1.4",
-    "rawSpec": "~2.1.4",
-    "scope": null,
-    "spec": ">=2.1.4 <2.2.0",
-    "type": "range"
+  "name": "hosted-git-info",
+  "version": "2.1.4",
+  "description": "Provides metadata and conversions from repository urls for Github, Bitbucket and Gitlab",
+  "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/hosted-git-info.git"
   },
-  "_requiredBy": [
-    "/",
-    "/normalize-package-data",
-    "/npm-package-arg"
+  "keywords": [
+    "git",
+    "github",
+    "bitbucket",
+    "gitlab"
   ],
-  "_resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz",
-  "_shasum": "d9e953b26988be88096c46e926494d9604c300f8",
-  "_shrinkwrap": null,
-  "_spec": "hosted-git-info@~2.1.4",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "me@re-becca.org",
     "name": "Rebecca Turner",
+    "email": "me@re-becca.org",
     "url": "http://re-becca.org"
   },
+  "license": "ISC",
   "bugs": {
     "url": "https://github.com/npm/hosted-git-info/issues"
   },
-  "dependencies": {},
-  "description": "Provides metadata and conversions from repository urls for Github, Bitbucket and Gitlab",
+  "homepage": "https://github.com/npm/hosted-git-info",
+  "scripts": {
+    "test": "standard && tap test/*.js"
+  },
   "devDependencies": {
     "standard": "^3.3.2",
     "tap": "^0.4.13"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "d9e953b26988be88096c46e926494d9604c300f8",
-    "tarball": "http://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
-  },
+  "readme": "# hosted-git-info\n\nThis will let you identify and transform various git hosts URLs between\nprotocols.  It also can tell you what the URL is for the raw path for\nparticular file for direct access without git.\n\n## Usage\n\n```javascript\nvar hostedGitInfo = require(\"hosted-git-info\")\nvar info = hostedGitInfo.fromUrl(\"git@github.com:npm/hosted-git-info.git\")\n/* info looks like:\n{\n  type: \"github\",\n  domain: \"github.com\",\n  user: \"npm\",\n  project: \"hosted-git-info\"\n}\n*/\n```\n\nIf the URL can't be matched with a git host, `null` will be returned.  We\ncan match git, ssh and https urls.  Additionally, we can match ssh connect\nstrings (`git@github.com:npm/hosted-git-info`) and shortcuts (eg,\n`github:npm/hosted-git-info`).  Github specifically, is detected in the case\nof a third, unprefixed, form: `npm/hosted-git-info`.\n\nIf it does match, the returned object has properties of:\n\n* info.type -- The short name of the service\n* info.domain -- The domain for git protocol use\n* info.user -- The name of the user/org on the git host\n* info.project -- The name of the project on the git host\n\nAnd methods of:\n\n* info.file(path)\n\nGiven the path of a file relative to the repository, returns a URL for\ndirectly fetching it from the githost.  If no committish was set then\n`master` will be used as the default.\n\nFor example `hostedGitInfo.fromUrl(\"git@github.com:npm/hosted-git-info.git#v1.0.0\").file(\"package.json\")`\nwould return `https://raw.githubusercontent.com/npm/hosted-git-info/v1.0.0/package.json`\n\n* info.shortcut()\n\neg, `github:npm/hosted-git-info`\n\n* info.browse()\n\neg, `https://github.com/npm/hosted-git-info/tree/v1.2.0`\n\n* info.bugs()\n\neg, `https://github.com/npm/hosted-git-info/issues`\n\n* info.docs()\n\neg, `https://github.com/npm/hosted-git-info/tree/v1.2.0#readme`\n\n* info.https()\n\neg, `git+https://github.com/npm/hosted-git-info.git`\n\n* info.sshurl()\n\neg, `git+ssh://git@github.com/npm/hosted-git-info.git`\n\n* info.ssh()\n\neg, `git@github.com:npm/hosted-git-info.git`\n\n* info.path()\n\neg, `npm/hosted-git-info`\n\n* info.getDefaultRepresentation()\n\nReturns the default output type. The default output type is based on the\nstring you passed in to be parsed\n\n* info.toString()\n\nUses the getDefaultRepresentation to call one of the other methods to get a URL for\nthis resource. As such `hostedGitInfo.fromUrl(url).toString()` will give\nyou a normalized version of the URL that still uses the same protocol.\n\nShortcuts will still be returned as shortcuts, but the special case github\nform of `org/project` will be normalized to `github:org/project`.\n\nSSH connect strings will be normalized into `git+ssh` URLs.\n\n\n## Supported hosts\n\nCurrently this supports Github, Bitbucket and Gitlab. Pull requests for\nadditional hosts welcome.\n\n",
+  "readmeFilename": "README.md",
   "gitHead": "9e1a36df8eb050a663713c79e56d89dadba2bd8d",
-  "homepage": "https://github.com/npm/hosted-git-info",
-  "keywords": [
-    "bitbucket",
-    "git",
-    "github",
-    "gitlab"
-  ],
-  "license": "ISC",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "iarna",
-      "email": "me@re-becca.org"
-    },
-    {
-      "name": "othiym23",
-      "email": "ogd@aoaioxxysz.net"
-    }
-  ],
-  "name": "hosted-git-info",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/hosted-git-info.git"
-  },
-  "scripts": {
-    "test": "standard && tap test/*.js"
-  },
-  "version": "2.1.4"
+  "_id": "hosted-git-info@2.1.4",
+  "_shasum": "d9e953b26988be88096c46e926494d9604c300f8",
+  "_from": "hosted-git-info@>=2.1.4 <2.2.0"
 }
diff --git a/deps/npm/node_modules/iferr/package.json b/deps/npm/node_modules/iferr/package.json
index f746e2862c9125..9017857c56ddbc 100644
--- a/deps/npm/node_modules/iferr/package.json
+++ b/deps/npm/node_modules/iferr/package.json
@@ -1,75 +1,50 @@
 {
-  "_args": [
-    [
-      "iferr@~0.1.5",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "iferr@>=0.1.5 <0.2.0",
-  "_id": "iferr@0.1.5",
-  "_inCache": true,
-  "_location": "/iferr",
-  "_npmUser": {
-    "email": "npm@shesek.info",
-    "name": "nadav"
+  "name": "iferr",
+  "version": "0.1.5",
+  "description": "Higher-order functions for easier error handling",
+  "main": "index.js",
+  "scripts": {
+    "test": "mocha",
+    "prepublish": "coffee -c index.coffee"
   },
-  "_npmVersion": "1.4.4",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "iferr",
-    "raw": "iferr@~0.1.5",
-    "rawSpec": "~0.1.5",
-    "scope": null,
-    "spec": ">=0.1.5 <0.2.0",
-    "type": "range"
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/shesek/iferr"
   },
-  "_requiredBy": [
-    "/"
+  "keywords": [
+    "error",
+    "errors"
   ],
-  "_resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-  "_shasum": "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501",
-  "_shrinkwrap": null,
-  "_spec": "iferr@~0.1.5",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
     "name": "Nadav Ivgi"
   },
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/shesek/iferr/issues"
   },
-  "dependencies": {},
-  "description": "Higher-order functions for easier error handling",
+  "homepage": "https://github.com/shesek/iferr",
   "devDependencies": {
     "coffee-script": "^1.7.1",
     "mocha": "^1.18.2"
   },
-  "directories": {},
+  "_id": "iferr@0.1.5",
   "dist": {
     "shasum": "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501",
     "tarball": "http://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"
   },
-  "homepage": "https://github.com/shesek/iferr",
-  "keywords": [
-    "error",
-    "errors"
-  ],
-  "license": "MIT",
-  "main": "index.js",
+  "_from": "iferr@>=0.1.5 <0.2.0",
+  "_npmVersion": "1.4.4",
+  "_npmUser": {
+    "name": "nadav",
+    "email": "npm@shesek.info"
+  },
   "maintainers": [
     {
       "name": "nadav",
       "email": "npm@shesek.info"
     }
   ],
-  "name": "iferr",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/shesek/iferr"
-  },
-  "scripts": {
-    "prepublish": "coffee -c index.coffee",
-    "test": "mocha"
-  },
-  "version": "0.1.5"
+  "directories": {},
+  "_shasum": "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501",
+  "_resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"
 }
diff --git a/deps/npm/node_modules/inflight/package.json b/deps/npm/node_modules/inflight/package.json
index 7e3c816bd39ea4..48b4c0e1605a36 100644
--- a/deps/npm/node_modules/inflight/package.json
+++ b/deps/npm/node_modules/inflight/package.json
@@ -1,87 +1,36 @@
 {
-  "_args": [
-    [
-      "inflight@~1.0.4",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "inflight@>=1.0.4 <1.1.0",
-  "_id": "inflight@1.0.4",
-  "_inCache": true,
-  "_location": "/inflight",
-  "_nodeVersion": "0.10.32",
-  "_npmUser": {
-    "email": "ogd@aoaioxxysz.net",
-    "name": "othiym23"
-  },
-  "_npmVersion": "2.1.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "inflight",
-    "raw": "inflight@~1.0.4",
-    "rawSpec": "~1.0.4",
-    "scope": null,
-    "spec": ">=1.0.4 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/glob",
-    "/node-gyp/glob",
-    "/rimraf/glob"
-  ],
-  "_resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-  "_shasum": "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a",
-  "_shrinkwrap": null,
-  "_spec": "inflight@~1.0.4",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/inflight/issues"
-  },
+  "name": "inflight",
+  "version": "1.0.4",
+  "description": "Add callbacks to requests in flight to avoid async duplication",
+  "main": "inflight.js",
   "dependencies": {
     "once": "^1.3.0",
     "wrappy": "1"
   },
-  "description": "Add callbacks to requests in flight to avoid async duplication",
   "devDependencies": {
     "tap": "^0.4.10"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a",
-    "tarball": "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"
+  "scripts": {
+    "test": "tap test.js"
   },
-  "gitHead": "c7b5531d572a867064d4a1da9e013e8910b7d1ba",
-  "homepage": "https://github.com/isaacs/inflight",
-  "license": "ISC",
-  "main": "inflight.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    },
-    {
-      "name": "othiym23",
-      "email": "ogd@aoaioxxysz.net"
-    },
-    {
-      "name": "iarna",
-      "email": "me@re-becca.org"
-    }
-  ],
-  "name": "inflight",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
-    "url": "git://github.com/isaacs/inflight"
+    "url": "git://github.com/isaacs/inflight.git"
   },
-  "scripts": {
-    "test": "tap test.js"
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
   },
-  "version": "1.0.4"
+  "bugs": {
+    "url": "https://github.com/isaacs/inflight/issues"
+  },
+  "homepage": "https://github.com/isaacs/inflight",
+  "license": "ISC",
+  "readme": "# inflight\n\nAdd callbacks to requests in flight to avoid async duplication\n\n## USAGE\n\n```javascript\nvar inflight = require('inflight')\n\n// some request that does some stuff\nfunction req(key, callback) {\n  // key is any random string.  like a url or filename or whatever.\n  //\n  // will return either a falsey value, indicating that the\n  // request for this key is already in flight, or a new callback\n  // which when called will call all callbacks passed to inflightk\n  // with the same key\n  callback = inflight(key, callback)\n\n  // If we got a falsey value back, then there's already a req going\n  if (!callback) return\n\n  // this is where you'd fetch the url or whatever\n  // callback is also once()-ified, so it can safely be assigned\n  // to multiple events etc.  First call wins.\n  setTimeout(function() {\n    callback(null, key)\n  }, 100)\n}\n\n// only assigns a single setTimeout\n// when it dings, all cbs get called\nreq('foo', cb1)\nreq('foo', cb2)\nreq('foo', cb3)\nreq('foo', cb4)\n```\n",
+  "readmeFilename": "README.md",
+  "_id": "inflight@1.0.4",
+  "_shasum": "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a",
+  "_resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+  "_from": "inflight@>=1.0.4 <1.1.0"
 }
diff --git a/deps/npm/node_modules/inherits/package.json b/deps/npm/node_modules/inherits/package.json
index 9407a1962e3b71..933382a7f44bac 100644
--- a/deps/npm/node_modules/inherits/package.json
+++ b/deps/npm/node_modules/inherits/package.json
@@ -1,87 +1,35 @@
 {
-  "_args": [
-    [
-      "inherits@~2.0.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "inherits@>=2.0.1 <2.1.0",
-  "_id": "inherits@2.0.1",
-  "_inCache": true,
-  "_location": "/inherits",
-  "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
-  },
-  "_npmVersion": "1.3.8",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "inherits",
-    "raw": "inherits@~2.0.1",
-    "rawSpec": "~2.0.1",
-    "scope": null,
-    "spec": ">=2.0.1 <2.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/bl/readable-stream",
-    "/block-stream",
-    "/concat-stream",
-    "/concat-stream/readable-stream",
-    "/fstream",
-    "/fstream-ignore",
-    "/fstream-npm",
-    "/glob",
-    "/node-gyp/glob",
-    "/node-gyp/tar",
-    "/readable-stream",
-    "/rimraf/glob",
-    "/tar"
-  ],
-  "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-  "_shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1",
-  "_shrinkwrap": null,
-  "_spec": "inherits@~2.0.1",
-  "_where": "/Users/rebecca/code/npm",
-  "browser": "./inherits_browser.js",
-  "bugs": {
-    "url": "https://github.com/isaacs/inherits/issues"
-  },
-  "dependencies": {},
+  "name": "inherits",
   "description": "Browser-friendly inheritance fully compatible with standard node.js inherits()",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1",
-    "tarball": "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-  },
+  "version": "2.0.1",
   "keywords": [
-    "browser",
-    "browserify",
-    "class",
     "inheritance",
-    "inherits",
+    "class",
     "klass",
+    "oop",
     "object-oriented",
-    "oop"
+    "inherits",
+    "browser",
+    "browserify"
   ],
-  "license": "ISC",
   "main": "./inherits.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "name": "inherits",
-  "optionalDependencies": {},
+  "browser": "./inherits_browser.js",
   "repository": {
     "type": "git",
-    "url": "git://github.com/isaacs/inherits"
+    "url": "git://github.com/isaacs/inherits.git"
   },
+  "license": "ISC",
   "scripts": {
     "test": "node test"
   },
-  "version": "2.0.1"
+  "readme": "Browser-friendly inheritance fully compatible with standard node.js\n[inherits](http://nodejs.org/api/util.html#util_util_inherits_constructor_superconstructor).\n\nThis package exports standard `inherits` from node.js `util` module in\nnode environment, but also provides alternative browser-friendly\nimplementation through [browser\nfield](https://gist.github.com/shtylman/4339901). Alternative\nimplementation is a literal copy of standard one located in standalone\nmodule to avoid requiring of `util`. It also has a shim for old\nbrowsers with no `Object.create` support.\n\nWhile keeping you sure you are using standard `inherits`\nimplementation in node.js environment, it allows bundlers such as\n[browserify](https://github.com/substack/node-browserify) to not\ninclude full `util` package to your client code if all you need is\njust `inherits` function. It worth, because browser shim for `util`\npackage is large and `inherits` is often the single function you need\nfrom it.\n\nIt's recommended to use this package instead of\n`require('util').inherits` for any code that has chances to be used\nnot only in node.js but in browser too.\n\n## usage\n\n```js\nvar inherits = require('inherits');\n// then use exactly as the standard one\n```\n\n## note on version ~1.0\n\nVersion ~1.0 had completely different motivation and is not compatible\nneither with 2.0 nor with standard node.js `inherits`.\n\nIf you are using version ~1.0 and planning to switch to ~2.0, be\ncareful:\n\n* new version uses `super_` instead of `super` for referencing\n  superclass\n* new version overwrites current prototype while old one preserves any\n  existing fields on it\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/isaacs/inherits/issues"
+  },
+  "homepage": "https://github.com/isaacs/inherits#readme",
+  "_id": "inherits@2.0.1",
+  "_shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1",
+  "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+  "_from": "inherits@>=2.0.1 <2.1.0"
 }
diff --git a/deps/npm/node_modules/ini/package.json b/deps/npm/node_modules/ini/package.json
index ca9e5bfd546f6c..7ea6710a9ae381 100644
--- a/deps/npm/node_modules/ini/package.json
+++ b/deps/npm/node_modules/ini/package.json
@@ -1,80 +1,39 @@
 {
-  "_args": [
-    [
-      "ini@~1.3.4",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "ini@>=1.3.4 <1.4.0",
-  "_id": "ini@1.3.4",
-  "_inCache": true,
-  "_location": "/ini",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "2.10.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "ini",
-    "raw": "ini@~1.3.4",
-    "rawSpec": "~1.3.4",
-    "scope": null,
-    "spec": ">=1.3.4 <1.4.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/config-chain"
-  ],
-  "_resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-  "_shasum": "0537cb79daf59b59a1a517dff706c86ec039162e",
-  "_shrinkwrap": null,
-  "_spec": "ini@~1.3.4",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/ini/issues"
-  },
-  "dependencies": {},
+  "name": "ini",
   "description": "An ini encoder/decoder for node",
-  "devDependencies": {
-    "tap": "^1.2.0"
+  "version": "1.3.4",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/ini.git"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "0537cb79daf59b59a1a517dff706c86ec039162e",
-    "tarball": "http://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+  "main": "ini.js",
+  "scripts": {
+    "test": "tap test/*.js"
   },
   "engines": {
     "node": "*"
   },
+  "dependencies": {},
+  "devDependencies": {
+    "tap": "^1.2.0"
+  },
+  "license": "ISC",
   "files": [
     "ini.js"
   ],
-  "gitHead": "4a3001abc4c608e51add9f1d2b2cadf02b8e6dea",
-  "homepage": "https://github.com/isaacs/ini#readme",
-  "license": "ISC",
-  "main": "ini.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "name": "ini",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/ini.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "readme": "An ini format parser and serializer for node.\n\nSections are treated as nested objects.  Items before the first\nheading are saved on the object directly.\n\n## Usage\n\nConsider an ini-file `config.ini` that looks like this:\n\n    ; this comment is being ignored\n    scope = global\n\n    [database]\n    user = dbuser\n    password = dbpassword\n    database = use_this_database\n\n    [paths.default]\n    datadir = /var/lib/data\n    array[] = first value\n    array[] = second value\n    array[] = third value\n\nYou can read, manipulate and write the ini-file like so:\n\n    var fs = require('fs')\n      , ini = require('ini')\n\n    var config = ini.parse(fs.readFileSync('./config.ini', 'utf-8'))\n\n    config.scope = 'local'\n    config.database.database = 'use_another_database'\n    config.paths.default.tmpdir = '/tmp'\n    delete config.paths.default.datadir\n    config.paths.default.array.push('fourth value')\n\n    fs.writeFileSync('./config_modified.ini', ini.stringify(config, { section: 'section' }))\n\nThis will result in a file called `config_modified.ini` being written\nto the filesystem with the following content:\n\n    [section]\n    scope=local\n    [section.database]\n    user=dbuser\n    password=dbpassword\n    database=use_another_database\n    [section.paths.default]\n    tmpdir=/tmp\n    array[]=first value\n    array[]=second value\n    array[]=third value\n    array[]=fourth value\n\n\n## API\n\n### decode(inistring)\n\nDecode the ini-style formatted `inistring` into a nested object.\n\n### parse(inistring)\n\nAlias for `decode(inistring)`\n\n### encode(object, [options])\n\nEncode the object `object` into an ini-style formatted string. If the\noptional parameter `section` is given, then all top-level properties\nof the object are put into this section and the `section`-string is\nprepended to all sub-sections, see the usage example above.\n\nThe `options` object may contain the following:\n\n* `section` A string which will be the first `section` in the encoded\n  ini data.  Defaults to none.\n* `whitespace` Boolean to specify whether to put whitespace around the\n  `=` character.  By default, whitespace is omitted, to be friendly to\n  some persnickety old parsers that don't tolerate it well.  But some\n  find that it's more human-readable and pretty with the whitespace.\n\nFor backwards compatibility reasons, if a `string` options is passed\nin, then it is assumed to be the `section` value.\n\n### stringify(object, [options])\n\nAlias for `encode(object, [options])`\n\n### safe(val)\n\nEscapes the string `val` such that it is safe to be used as a key or\nvalue in an ini-file. Basically escapes quotes. For example\n\n    ini.safe('\"unsafe string\"')\n\nwould result in\n\n    \"\\\"unsafe string\\\"\"\n\n### unsafe(val)\n\nUnescapes the string `val`\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/isaacs/ini/issues"
   },
-  "version": "1.3.4"
+  "homepage": "https://github.com/isaacs/ini#readme",
+  "_id": "ini@1.3.4",
+  "_shasum": "0537cb79daf59b59a1a517dff706c86ec039162e",
+  "_resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+  "_from": "ini@>=1.3.4 <1.4.0"
 }
diff --git a/deps/npm/node_modules/promzard/.npmignore b/deps/npm/node_modules/init-package-json/node_modules/promzard/.npmignore
similarity index 100%
rename from deps/npm/node_modules/promzard/.npmignore
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/.npmignore
diff --git a/deps/npm/node_modules/promzard/LICENSE b/deps/npm/node_modules/init-package-json/node_modules/promzard/LICENSE
similarity index 100%
rename from deps/npm/node_modules/promzard/LICENSE
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/LICENSE
diff --git a/deps/npm/node_modules/promzard/README.md b/deps/npm/node_modules/init-package-json/node_modules/promzard/README.md
similarity index 100%
rename from deps/npm/node_modules/promzard/README.md
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/README.md
diff --git a/deps/npm/node_modules/promzard/example/buffer.js b/deps/npm/node_modules/init-package-json/node_modules/promzard/example/buffer.js
similarity index 100%
rename from deps/npm/node_modules/promzard/example/buffer.js
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/example/buffer.js
diff --git a/deps/npm/node_modules/promzard/example/index.js b/deps/npm/node_modules/init-package-json/node_modules/promzard/example/index.js
similarity index 100%
rename from deps/npm/node_modules/promzard/example/index.js
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/example/index.js
diff --git a/deps/npm/node_modules/promzard/example/npm-init/README.md b/deps/npm/node_modules/init-package-json/node_modules/promzard/example/npm-init/README.md
similarity index 100%
rename from deps/npm/node_modules/promzard/example/npm-init/README.md
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/example/npm-init/README.md
diff --git a/deps/npm/node_modules/promzard/example/npm-init/init-input.js b/deps/npm/node_modules/init-package-json/node_modules/promzard/example/npm-init/init-input.js
similarity index 100%
rename from deps/npm/node_modules/promzard/example/npm-init/init-input.js
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/example/npm-init/init-input.js
diff --git a/deps/npm/node_modules/promzard/example/npm-init/init.js b/deps/npm/node_modules/init-package-json/node_modules/promzard/example/npm-init/init.js
similarity index 100%
rename from deps/npm/node_modules/promzard/example/npm-init/init.js
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/example/npm-init/init.js
diff --git a/deps/npm/node_modules/promzard/example/npm-init/package.json b/deps/npm/node_modules/init-package-json/node_modules/promzard/example/npm-init/package.json
similarity index 100%
rename from deps/npm/node_modules/promzard/example/npm-init/package.json
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/example/npm-init/package.json
diff --git a/deps/npm/node_modules/promzard/example/substack-input.js b/deps/npm/node_modules/init-package-json/node_modules/promzard/example/substack-input.js
similarity index 100%
rename from deps/npm/node_modules/promzard/example/substack-input.js
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/example/substack-input.js
diff --git a/deps/npm/node_modules/promzard/package.json b/deps/npm/node_modules/init-package-json/node_modules/promzard/package.json
similarity index 61%
rename from deps/npm/node_modules/promzard/package.json
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/package.json
index e91ad77dd899ac..1407e97be584d7 100644
--- a/deps/npm/node_modules/promzard/package.json
+++ b/deps/npm/node_modules/init-package-json/node_modules/promzard/package.json
@@ -1,74 +1,51 @@
 {
-  "_args": [
-    [
-      "promzard@^0.3.0",
-      "/Users/rebecca/code/npm/node_modules/init-package-json"
-    ]
-  ],
-  "_from": "promzard@>=0.3.0 <0.4.0",
-  "_id": "promzard@0.3.0",
-  "_inCache": true,
-  "_location": "/promzard",
-  "_nodeVersion": "1.4.2",
-  "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
-  },
-  "_npmVersion": "2.7.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "promzard",
-    "raw": "promzard@^0.3.0",
-    "rawSpec": "^0.3.0",
-    "scope": null,
-    "spec": ">=0.3.0 <0.4.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/init-package-json"
-  ],
-  "_resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz",
-  "_shasum": "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee",
-  "_shrinkwrap": null,
-  "_spec": "promzard@^0.3.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/init-package-json",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/promzard/issues"
+  "name": "promzard",
+  "description": "prompting wizardly",
+  "version": "0.3.0",
+  "repository": {
+    "url": "git://github.com/isaacs/promzard.git"
   },
   "dependencies": {
     "read": "1"
   },
-  "description": "prompting wizardly",
   "devDependencies": {
     "tap": "~0.2.5"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee",
-    "tarball": "http://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
+  "main": "promzard.js",
+  "scripts": {
+    "test": "tap test/*.js"
   },
+  "license": "ISC",
   "gitHead": "780ead051299aa28be2584199ab6fa503a32d354",
+  "bugs": {
+    "url": "https://github.com/isaacs/promzard/issues"
+  },
   "homepage": "https://github.com/isaacs/promzard",
-  "license": "ISC",
-  "main": "promzard.js",
+  "_id": "promzard@0.3.0",
+  "_shasum": "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee",
+  "_from": "promzard@>=0.3.0 <0.4.0",
+  "_npmVersion": "2.7.1",
+  "_nodeVersion": "1.4.2",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "i@izs.me"
+  },
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "name": "promzard",
-  "optionalDependencies": {},
-  "repository": {
-    "url": "git://github.com/isaacs/promzard"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "dist": {
+    "shasum": "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee",
+    "tarball": "http://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"
   },
-  "version": "0.3.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/promzard/promzard.js b/deps/npm/node_modules/init-package-json/node_modules/promzard/promzard.js
similarity index 100%
rename from deps/npm/node_modules/promzard/promzard.js
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/promzard.js
diff --git a/deps/npm/node_modules/promzard/test/basic.js b/deps/npm/node_modules/init-package-json/node_modules/promzard/test/basic.js
similarity index 100%
rename from deps/npm/node_modules/promzard/test/basic.js
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/test/basic.js
diff --git a/deps/npm/node_modules/promzard/test/buffer.js b/deps/npm/node_modules/init-package-json/node_modules/promzard/test/buffer.js
similarity index 100%
rename from deps/npm/node_modules/promzard/test/buffer.js
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/test/buffer.js
diff --git a/deps/npm/node_modules/promzard/test/exports.input b/deps/npm/node_modules/init-package-json/node_modules/promzard/test/exports.input
similarity index 100%
rename from deps/npm/node_modules/promzard/test/exports.input
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/test/exports.input
diff --git a/deps/npm/node_modules/promzard/test/exports.js b/deps/npm/node_modules/init-package-json/node_modules/promzard/test/exports.js
similarity index 100%
rename from deps/npm/node_modules/promzard/test/exports.js
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/test/exports.js
diff --git a/deps/npm/node_modules/promzard/test/fn.input b/deps/npm/node_modules/init-package-json/node_modules/promzard/test/fn.input
similarity index 100%
rename from deps/npm/node_modules/promzard/test/fn.input
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/test/fn.input
diff --git a/deps/npm/node_modules/promzard/test/fn.js b/deps/npm/node_modules/init-package-json/node_modules/promzard/test/fn.js
similarity index 100%
rename from deps/npm/node_modules/promzard/test/fn.js
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/test/fn.js
diff --git a/deps/npm/node_modules/promzard/test/simple.input b/deps/npm/node_modules/init-package-json/node_modules/promzard/test/simple.input
similarity index 100%
rename from deps/npm/node_modules/promzard/test/simple.input
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/test/simple.input
diff --git a/deps/npm/node_modules/promzard/test/simple.js b/deps/npm/node_modules/init-package-json/node_modules/promzard/test/simple.js
similarity index 100%
rename from deps/npm/node_modules/promzard/test/simple.js
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/test/simple.js
diff --git a/deps/npm/node_modules/promzard/test/validate.input b/deps/npm/node_modules/init-package-json/node_modules/promzard/test/validate.input
similarity index 100%
rename from deps/npm/node_modules/promzard/test/validate.input
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/test/validate.input
diff --git a/deps/npm/node_modules/promzard/test/validate.js b/deps/npm/node_modules/init-package-json/node_modules/promzard/test/validate.js
similarity index 100%
rename from deps/npm/node_modules/promzard/test/validate.js
rename to deps/npm/node_modules/init-package-json/node_modules/promzard/test/validate.js
diff --git a/deps/npm/node_modules/init-package-json/package.json b/deps/npm/node_modules/init-package-json/package.json
index a3ee5eea9fed45..102bdb8c96e2a9 100644
--- a/deps/npm/node_modules/init-package-json/package.json
+++ b/deps/npm/node_modules/init-package-json/package.json
@@ -1,48 +1,21 @@
 {
-  "_args": [
-    [
-      "init-package-json@~1.9.1",
-      "/Users/ogd/Documents/projects/npm/npm"
-    ]
-  ],
-  "_from": "init-package-json@>=1.9.1 <1.10.0",
-  "_id": "init-package-json@1.9.1",
-  "_inCache": true,
-  "_location": "/init-package-json",
-  "_nodeVersion": "2.2.2",
-  "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
-  },
-  "_npmVersion": "2.14.1",
-  "_phantomChildren": {
-    "spdx-correct": "1.0.0",
-    "spdx-expression-parse": "1.0.0"
+  "name": "init-package-json",
+  "version": "1.9.1",
+  "main": "init-package-json.js",
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "_requested": {
-    "name": "init-package-json",
-    "raw": "init-package-json@~1.9.1",
-    "rawSpec": "~1.9.1",
-    "scope": null,
-    "spec": ">=1.9.1 <1.10.0",
-    "type": "range"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/init-package-json.git"
   },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz",
-  "_shasum": "a28e05b5baeb3363cd473df68d30d3a80523a31c",
-  "_shrinkwrap": null,
-  "_spec": "init-package-json@~1.9.1",
-  "_where": "/Users/ogd/Documents/projects/npm/npm",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/init-package-json/issues"
-  },
+  "license": "ISC",
+  "description": "A node module to get your node module started",
   "dependencies": {
     "glob": "^5.0.3",
     "npm-package-arg": "^4.0.0",
@@ -53,32 +26,39 @@
     "validate-npm-package-license": "^3.0.1",
     "validate-npm-package-name": "^2.0.1"
   },
-  "description": "A node module to get your node module started",
   "devDependencies": {
     "npm": "^2",
     "rimraf": "^2.1.4",
     "tap": "^1.2.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "a28e05b5baeb3363cd473df68d30d3a80523a31c",
-    "tarball": "http://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz"
-  },
-  "gitHead": "37c38b4e23189eb5645901fa6851f343fddd4b73",
-  "homepage": "https://github.com/isaacs/init-package-json#readme",
-  "installable": true,
   "keywords": [
-    "helper",
     "init",
-    "package",
     "package.json",
-    "prompt",
-    "start",
+    "package",
+    "helper",
     "wizard",
-    "wizerd"
+    "wizerd",
+    "prompt",
+    "start"
   ],
-  "license": "ISC",
-  "main": "init-package-json.js",
+  "gitHead": "37c38b4e23189eb5645901fa6851f343fddd4b73",
+  "bugs": {
+    "url": "https://github.com/isaacs/init-package-json/issues"
+  },
+  "homepage": "https://github.com/isaacs/init-package-json#readme",
+  "_id": "init-package-json@1.9.1",
+  "_shasum": "a28e05b5baeb3363cd473df68d30d3a80523a31c",
+  "_from": "init-package-json@>=1.9.1 <1.10.0",
+  "_npmVersion": "2.14.1",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
+  },
+  "dist": {
+    "shasum": "a28e05b5baeb3363cd473df68d30d3a80523a31c",
+    "tarball": "http://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz"
+  },
   "maintainers": [
     {
       "name": "isaacs",
@@ -97,14 +77,7 @@
       "email": "kat@sykosomatic.org"
     }
   ],
-  "name": "init-package-json",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/init-package-json.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "1.9.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/is-my-json-valid/package.json b/deps/npm/node_modules/is-my-json-valid/package.json
deleted file mode 100644
index e217ecb50e4c2a..00000000000000
--- a/deps/npm/node_modules/is-my-json-valid/package.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "_args": [
-    [
-      "is-my-json-valid@~2.12.2",
-      "/Users/ogd/Documents/projects/npm/npm"
-    ]
-  ],
-  "_from": "is-my-json-valid@>=2.12.2 <2.13.0",
-  "_id": "is-my-json-valid@2.12.2",
-  "_inCache": true,
-  "_location": "/is-my-json-valid",
-  "_nodeVersion": "2.5.0",
-  "_npmUser": {
-    "email": "mathiasbuus@gmail.com",
-    "name": "mafintosh"
-  },
-  "_npmVersion": "2.13.4",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "is-my-json-valid",
-    "raw": "is-my-json-valid@~2.12.2",
-    "rawSpec": "~2.12.2",
-    "scope": null,
-    "spec": ">=2.12.2 <2.13.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/eslint",
-    "/har-validator"
-  ],
-  "_resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz",
-  "_shasum": "0d65859318c846ce3a134402fd3fbc504272ccc9",
-  "_shrinkwrap": null,
-  "_spec": "is-my-json-valid@~2.12.2",
-  "_where": "/Users/ogd/Documents/projects/npm/npm",
-  "author": {
-    "name": "Mathias Buus"
-  },
-  "bugs": {
-    "url": "https://github.com/mafintosh/is-my-json-valid/issues"
-  },
-  "dependencies": {
-    "generate-function": "^2.0.0",
-    "generate-object-property": "^1.1.0",
-    "jsonpointer": "2.0.0",
-    "xtend": "^4.0.0"
-  },
-  "description": "A JSONSchema validator that uses code generation to be extremely fast",
-  "devDependencies": {
-    "tape": "^2.13.4"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "0d65859318c846ce3a134402fd3fbc504272ccc9",
-    "tarball": "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz"
-  },
-  "gitHead": "48040cf001f661bcaa31f09bdc7fe3939ac2253b",
-  "homepage": "https://github.com/mafintosh/is-my-json-valid",
-  "installable": true,
-  "keywords": [
-    "json",
-    "jsonschema",
-    "orderly",
-    "schema"
-  ],
-  "license": "MIT",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "mafintosh",
-      "email": "mathiasbuus@gmail.com"
-    },
-    {
-      "name": "watson",
-      "email": "w@tson.dk"
-    },
-    {
-      "name": "freeall",
-      "email": "freeall@gmail.com"
-    }
-  ],
-  "name": "is-my-json-valid",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mafintosh/is-my-json-valid.git"
-  },
-  "scripts": {
-    "test": "tape test/*.js"
-  },
-  "version": "2.12.2"
-}
diff --git a/deps/npm/node_modules/is-property/package.json b/deps/npm/node_modules/is-property/package.json
deleted file mode 100644
index 1842f7e7a24988..00000000000000
--- a/deps/npm/node_modules/is-property/package.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "_args": [
-    [
-      "is-property@^1.0.0",
-      "/Users/rebecca/code/npm/node_modules/generate-object-property"
-    ]
-  ],
-  "_from": "is-property@>=1.0.0 <2.0.0",
-  "_id": "is-property@1.0.2",
-  "_inCache": true,
-  "_location": "/is-property",
-  "_nodeVersion": "0.10.26",
-  "_npmUser": {
-    "email": "mikolalysenko@gmail.com",
-    "name": "mikolalysenko"
-  },
-  "_npmVersion": "2.1.4",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "is-property",
-    "raw": "is-property@^1.0.0",
-    "rawSpec": "^1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/generate-object-property"
-  ],
-  "_resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-  "_shasum": "57fe1c4e48474edd65b09911f26b1cd4095dda84",
-  "_shrinkwrap": null,
-  "_spec": "is-property@^1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/generate-object-property",
-  "author": {
-    "name": "Mikola Lysenko"
-  },
-  "bugs": {
-    "url": "https://github.com/mikolalysenko/is-property/issues"
-  },
-  "dependencies": {},
-  "description": "Tests if a JSON property can be accessed using . syntax",
-  "devDependencies": {
-    "tape": "~1.0.4"
-  },
-  "directories": {
-    "test": "test"
-  },
-  "dist": {
-    "shasum": "57fe1c4e48474edd65b09911f26b1cd4095dda84",
-    "tarball": "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
-  },
-  "gitHead": "0a85ea5b6b1264ea1cdecc6e5cf186adbb3ffc50",
-  "homepage": "https://github.com/mikolalysenko/is-property",
-  "keywords": [
-    ".",
-    "[]",
-    "bracket",
-    "dot",
-    "is",
-    "json",
-    "property"
-  ],
-  "license": "MIT",
-  "main": "is-property.js",
-  "maintainers": [
-    {
-      "name": "mikolalysenko",
-      "email": "mikolalysenko@gmail.com"
-    }
-  ],
-  "name": "is-property",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/mikolalysenko/is-property.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "1.0.2"
-}
diff --git a/deps/npm/node_modules/isarray/package.json b/deps/npm/node_modules/isarray/package.json
deleted file mode 100644
index 7a923d7baf3bc1..00000000000000
--- a/deps/npm/node_modules/isarray/package.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "_args": [
-    [
-      "isarray@0.0.1",
-      "/Users/rebecca/code/npm/node_modules/readable-stream"
-    ]
-  ],
-  "_from": "isarray@0.0.1",
-  "_id": "isarray@0.0.1",
-  "_inCache": true,
-  "_location": "/isarray",
-  "_npmUser": {
-    "email": "julian@juliangruber.com",
-    "name": "juliangruber"
-  },
-  "_npmVersion": "1.2.18",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "isarray",
-    "raw": "isarray@0.0.1",
-    "rawSpec": "0.0.1",
-    "scope": null,
-    "spec": "0.0.1",
-    "type": "version"
-  },
-  "_requiredBy": [
-    "/bl/readable-stream",
-    "/concat-stream/readable-stream",
-    "/readable-stream"
-  ],
-  "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-  "_shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf",
-  "_shrinkwrap": null,
-  "_spec": "isarray@0.0.1",
-  "_where": "/Users/rebecca/code/npm/node_modules/readable-stream",
-  "author": {
-    "email": "mail@juliangruber.com",
-    "name": "Julian Gruber",
-    "url": "http://juliangruber.com"
-  },
-  "dependencies": {},
-  "description": "Array#isArray for older browsers",
-  "devDependencies": {
-    "tap": "*"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf",
-    "tarball": "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-  },
-  "homepage": "https://github.com/juliangruber/isarray",
-  "keywords": [
-    "array",
-    "browser",
-    "isarray"
-  ],
-  "license": "MIT",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "juliangruber",
-      "email": "julian@juliangruber.com"
-    }
-  ],
-  "name": "isarray",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/juliangruber/isarray.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "0.0.1"
-}
diff --git a/deps/npm/node_modules/isstream/package.json b/deps/npm/node_modules/isstream/package.json
deleted file mode 100644
index 54d8b76a0b6e49..00000000000000
--- a/deps/npm/node_modules/isstream/package.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "_args": [
-    [
-      "isstream@~0.1.1",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "isstream@>=0.1.1 <0.2.0",
-  "_id": "isstream@0.1.2",
-  "_inCache": true,
-  "_location": "/isstream",
-  "_nodeVersion": "1.4.3",
-  "_npmUser": {
-    "email": "rod@vagg.org",
-    "name": "rvagg"
-  },
-  "_npmVersion": "2.6.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "isstream",
-    "raw": "isstream@~0.1.1",
-    "rawSpec": "~0.1.1",
-    "scope": null,
-    "spec": ">=0.1.1 <0.2.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/request"
-  ],
-  "_resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-  "_shasum": "47e63f7af55afa6f92e1500e690eb8b8529c099a",
-  "_shrinkwrap": null,
-  "_spec": "isstream@~0.1.1",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
-  "author": {
-    "email": "rod@vagg.org",
-    "name": "Rod Vagg"
-  },
-  "bugs": {
-    "url": "https://github.com/rvagg/isstream/issues"
-  },
-  "dependencies": {},
-  "description": "Determine if an object is a Stream",
-  "devDependencies": {
-    "core-util-is": "~1.0.0",
-    "inherits": "~2.0.1",
-    "isarray": "0.0.1",
-    "string_decoder": "~0.10.x",
-    "tape": "~2.12.3"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "47e63f7af55afa6f92e1500e690eb8b8529c099a",
-    "tarball": "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
-  },
-  "gitHead": "cd39cba6da939b4fc9110825203adc506422c3dc",
-  "homepage": "https://github.com/rvagg/isstream",
-  "keywords": [
-    "hippo",
-    "readable-stream",
-    "stream",
-    "streams",
-    "type"
-  ],
-  "license": "MIT",
-  "main": "isstream.js",
-  "maintainers": [
-    {
-      "name": "rvagg",
-      "email": "rod@vagg.org"
-    }
-  ],
-  "name": "isstream",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/rvagg/isstream.git"
-  },
-  "scripts": {
-    "test": "tar --xform 's/^package/readable-stream-1.0/' -zxf readable-stream-1.0.*.tgz && tar --xform 's/^package/readable-stream-1.1/' -zxf readable-stream-1.1.*.tgz && node test.js; rm -rf readable-stream-1.?/"
-  },
-  "version": "0.1.2"
-}
diff --git a/deps/npm/node_modules/json-stringify-safe/package.json b/deps/npm/node_modules/json-stringify-safe/package.json
deleted file mode 100644
index 812c93422961b0..00000000000000
--- a/deps/npm/node_modules/json-stringify-safe/package.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "_args": [
-    [
-      "json-stringify-safe@~5.0.0",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "json-stringify-safe@>=5.0.0 <5.1.0",
-  "_id": "json-stringify-safe@5.0.1",
-  "_inCache": true,
-  "_location": "/json-stringify-safe",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "2.10.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "json-stringify-safe",
-    "raw": "json-stringify-safe@~5.0.0",
-    "rawSpec": "~5.0.0",
-    "scope": null,
-    "spec": ">=5.0.0 <5.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/request"
-  ],
-  "_resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-  "_shasum": "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb",
-  "_shrinkwrap": null,
-  "_spec": "json-stringify-safe@~5.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me"
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/json-stringify-safe/issues"
-  },
-  "contributors": [
-    {
-      "name": "Andri Möll",
-      "email": "andri@dot.ee",
-      "url": "http://themoll.com"
-    }
-  ],
-  "dependencies": {},
-  "description": "Like JSON.stringify, but doesn't blow up on circular refs.",
-  "devDependencies": {
-    "mocha": ">= 2.1.0 < 3",
-    "must": ">= 0.12 < 0.13",
-    "sinon": ">= 1.12.2 < 2"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb",
-    "tarball": "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-  },
-  "gitHead": "3890dceab3ad14f8701e38ca74f38276abc76de5",
-  "homepage": "https://github.com/isaacs/json-stringify-safe",
-  "keywords": [
-    "circular",
-    "json",
-    "safe",
-    "stringify"
-  ],
-  "license": "ISC",
-  "main": "stringify.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    },
-    {
-      "name": "moll",
-      "email": "andri@dot.ee"
-    }
-  ],
-  "name": "json-stringify-safe",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/json-stringify-safe.git"
-  },
-  "scripts": {
-    "test": "node test.js"
-  },
-  "version": "5.0.1"
-}
diff --git a/deps/npm/node_modules/jsonpointer/package.json b/deps/npm/node_modules/jsonpointer/package.json
deleted file mode 100644
index 1a2dab55960709..00000000000000
--- a/deps/npm/node_modules/jsonpointer/package.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-  "_args": [
-    [
-      "jsonpointer@2.0.0",
-      "/Users/ogd/Documents/projects/npm/npm/node_modules/is-my-json-valid"
-    ]
-  ],
-  "_from": "jsonpointer@2.0.0",
-  "_id": "jsonpointer@2.0.0",
-  "_inCache": true,
-  "_location": "/jsonpointer",
-  "_nodeVersion": "0.10.36",
-  "_npmUser": {
-    "email": "marc.brookman@gmail.com",
-    "name": "marcbachmann"
-  },
-  "_npmVersion": "2.10.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "jsonpointer",
-    "raw": "jsonpointer@2.0.0",
-    "rawSpec": "2.0.0",
-    "scope": null,
-    "spec": "2.0.0",
-    "type": "version"
-  },
-  "_requiredBy": [
-    "/is-my-json-valid",
-    "/npm-registry-couchapp/is-my-json-valid"
-  ],
-  "_resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz",
-  "_shasum": "3af1dd20fe85463910d469a385e33017d2a030d9",
-  "_shrinkwrap": null,
-  "_spec": "jsonpointer@2.0.0",
-  "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/is-my-json-valid",
-  "author": {
-    "email": "jan@apache.org",
-    "name": "Jan Lehnardt"
-  },
-  "bugs": {
-    "url": "http://github.com/janl/node-jsonpointer/issues"
-  },
-  "contributors": [
-    {
-      "name": "Joe Hildebrand",
-      "email": "joe-github@cursive.net"
-    }
-  ],
-  "dependencies": {},
-  "description": "Simple JSON Addressing.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "3af1dd20fe85463910d469a385e33017d2a030d9",
-    "tarball": "http://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
-  },
-  "engines": {
-    "node": ">=0.6.0"
-  },
-  "gitHead": "26ea4a5c0fcb6d9a2e87f733403791dd05637af8",
-  "homepage": "https://github.com/janl/node-jsonpointer#readme",
-  "installable": true,
-  "license": "MIT",
-  "main": "./jsonpointer",
-  "maintainers": [
-    {
-      "name": "jan",
-      "email": "jan@apache.org"
-    },
-    {
-      "name": "marcbachmann",
-      "email": "marc.brookman@gmail.com"
-    }
-  ],
-  "name": "jsonpointer",
-  "optionalDependencies": {},
-  "readme": "# JSON Pointer for nodejs\n\nThis is an implementation of [JSON Pointer](http://tools.ietf.org/html/draft-ietf-appsawg-json-pointer-08).\n\n## Usage\n\n    var jsonpointer = require(\"jsonpointer\");\n    var obj = { foo: 1, bar: { baz: 2}, qux: [3, 4, 5]};\n    var one = jsonpointer.get(obj, \"/foo\");\n    var two = jsonpointer.get(obj, \"/bar/baz\");\n    var three = jsonpointer.get(obj, \"/qux/0\");\n    var four = jsonpointer.get(obj, \"/qux/1\");\n    var five = jsonpointer.get(obj, \"/qux/2\");\n    var notfound = jsonpointer.get(obj, \"/quo\"); // returns null\n\n    jsonpointer.set(obj, \"/foo\", 6); // obj.foo = 6;\n\n## Testing\n\n    $ node test.js\n    All tests pass.\n    $\n\n[![Build Status](https://travis-ci.org/janl/node-jsonpointer.png?branch=master)](https://travis-ci.org/janl/node-jsonpointer)\n\n## Author\n\n(c) 2011 Jan Lehnardt <jan@apache.org>\n\n## License\n\nMIT License.\n",
-  "readmeFilename": "README.md",
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/janl/node-jsonpointer.git"
-  },
-  "scripts": {
-    "test": "node test.js"
-  },
-  "tags": [
-    "simple",
-    "util",
-    "util",
-    "utility"
-  ],
-  "version": "2.0.0"
-}
diff --git a/deps/npm/node_modules/lockfile/package.json b/deps/npm/node_modules/lockfile/package.json
index 43a798e6e1ade2..dcb230e26165a1 100644
--- a/deps/npm/node_modules/lockfile/package.json
+++ b/deps/npm/node_modules/lockfile/package.json
@@ -1,69 +1,54 @@
 {
-  "_args": [
-    [
-      "lockfile@~1.0.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "lockfile@>=1.0.1 <1.1.0",
-  "_id": "lockfile@1.0.1",
-  "_inCache": true,
-  "_location": "/lockfile",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
+  "name": "lockfile",
+  "version": "1.0.1",
+  "main": "lockfile.js",
+  "directories": {
+    "test": "test"
   },
-  "_npmVersion": "2.10.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lockfile",
-    "raw": "lockfile@~1.0.1",
-    "rawSpec": "~1.0.1",
-    "scope": null,
-    "spec": ">=1.0.1 <1.1.0",
-    "type": "range"
+  "dependencies": {},
+  "devDependencies": {
+    "tap": "~0.2.5",
+    "touch": "0"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "_requiredBy": [
-    "/"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/lockfile.git"
+  },
+  "keywords": [
+    "lockfile",
+    "lock",
+    "file",
+    "fs",
+    "O_EXCL"
   ],
-  "_resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz",
-  "_shasum": "9d353ecfe3f54d150bb57f89d51746935a39c4f5",
-  "_shrinkwrap": null,
-  "_spec": "lockfile@~1.0.1",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
+  "license": "ISC",
+  "description": "A very polite lock file utility, which endeavors to not litter, and to wait patiently for others.",
+  "gitHead": "9d338ed8e3e3a166955d051f6b5fb6bb1e563ca8",
   "bugs": {
     "url": "https://github.com/isaacs/lockfile/issues"
   },
-  "dependencies": {},
-  "description": "A very polite lock file utility, which endeavors to not litter, and to wait patiently for others.",
-  "devDependencies": {
-    "tap": "~0.2.5",
-    "touch": "0"
-  },
-  "directories": {
-    "test": "test"
+  "homepage": "https://github.com/isaacs/lockfile#readme",
+  "_id": "lockfile@1.0.1",
+  "_shasum": "9d353ecfe3f54d150bb57f89d51746935a39c4f5",
+  "_from": "lockfile@>=1.0.1 <1.1.0",
+  "_npmVersion": "2.10.0",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "isaacs@npmjs.com"
   },
   "dist": {
     "shasum": "9d353ecfe3f54d150bb57f89d51746935a39c4f5",
     "tarball": "http://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"
   },
-  "gitHead": "9d338ed8e3e3a166955d051f6b5fb6bb1e563ca8",
-  "homepage": "https://github.com/isaacs/lockfile#readme",
-  "keywords": [
-    "O_EXCL",
-    "file",
-    "fs",
-    "lock",
-    "lockfile"
-  ],
-  "license": "ISC",
-  "main": "lockfile.js",
   "maintainers": [
     {
       "name": "trevorburnham",
@@ -74,14 +59,6 @@
       "email": "i@izs.me"
     }
   ],
-  "name": "lockfile",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/lockfile.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "1.0.1"
+  "_resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/lodash._basecopy/package.json b/deps/npm/node_modules/lodash._basecopy/package.json
deleted file mode 100644
index 34df84a4df08b3..00000000000000
--- a/deps/npm/node_modules/lodash._basecopy/package.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-  "_args": [
-    [
-      "lodash._basecopy@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash._baseassign"
-    ]
-  ],
-  "_from": "lodash._basecopy@>=3.0.0 <4.0.0",
-  "_id": "lodash._basecopy@3.0.1",
-  "_inCache": true,
-  "_location": "/lodash._basecopy",
-  "_nodeVersion": "0.12.2",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.7.6",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._basecopy",
-    "raw": "lodash._basecopy@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash._baseassign"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-  "_shasum": "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36",
-  "_shrinkwrap": null,
-  "_spec": "lodash._basecopy@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseassign",
-  "author": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "John-David Dalton",
-    "url": "http://allyoucanleet.com/"
-  },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
-  "contributors": [
-    {
-      "name": "John-David Dalton",
-      "email": "john.david.dalton@gmail.com",
-      "url": "http://allyoucanleet.com/"
-    },
-    {
-      "name": "Benjamin Tan",
-      "email": "demoneaux@gmail.com",
-      "url": "https://d10.github.io/"
-    },
-    {
-      "name": "Blaine Bublitz",
-      "email": "blaine@iceddev.com",
-      "url": "http://www.iceddev.com/"
-    },
-    {
-      "name": "Kit Cambridge",
-      "email": "github@kitcambridge.be",
-      "url": "http://kitcambridge.be/"
-    },
-    {
-      "name": "Mathias Bynens",
-      "email": "mathias@qiwi.be",
-      "url": "https://mathiasbynens.be/"
-    }
-  ],
-  "dependencies": {},
-  "description": "The modern build of lodash’s internal `baseCopy` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36",
-    "tarball": "http://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    }
-  ],
-  "name": "lodash._basecopy",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/lodash/lodash"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
-  },
-  "version": "3.0.1"
-}
diff --git a/deps/npm/node_modules/lodash._baseindexof/package.json b/deps/npm/node_modules/lodash._baseindexof/package.json
index 9c14340985446a..e95728db128a6b 100644
--- a/deps/npm/node_modules/lodash._baseindexof/package.json
+++ b/deps/npm/node_modules/lodash._baseindexof/package.json
@@ -1,46 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._baseindexof@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash._baseuniq"
-    ]
-  ],
-  "_from": "lodash._baseindexof@>=3.0.0 <4.0.0",
-  "_id": "lodash._baseindexof@3.1.0",
-  "_inCache": true,
-  "_location": "/lodash._baseindexof",
-  "_nodeVersion": "0.12.0",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.6.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._baseindexof",
-    "raw": "lodash._baseindexof@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash._basedifference",
-    "/lodash._baseuniq"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz",
-  "_shasum": "fe52b53a1c6761e42618d654e4a25789ed61822c",
-  "_shrinkwrap": null,
-  "_spec": "lodash._baseindexof@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseuniq",
+  "name": "lodash._baseindexof",
+  "version": "3.1.0",
+  "description": "The modern build of lodash’s internal `baseIndexOf` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -68,47 +37,20 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {},
-  "description": "The modern build of lodash’s internal `baseIndexOf` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "fe52b53a1c6761e42618d654e4a25789ed61822c",
-    "tarball": "http://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    }
-  ],
-  "name": "lodash._baseindexof",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
-    "url": "https://github.com/lodash/lodash"
+    "url": "git+https://github.com/lodash/lodash.git"
   },
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.1.0"
+  "readme": "# lodash._baseindexof v3.1.0\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseIndexOf` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash._baseindexof\n```\n\nIn Node.js/io.js:\n\n```js\nvar baseIndexOf = require('lodash._baseindexof');\n```\n\nSee the [package source](https://github.com/lodash/lodash/blob/3.1.0-npm-packages/lodash._baseindexof) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._baseindexof@3.1.0",
+  "_shasum": "fe52b53a1c6761e42618d654e4a25789ed61822c",
+  "_resolved": "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz",
+  "_from": "lodash._baseindexof@3.1.0"
 }
diff --git a/deps/npm/node_modules/lodash._baseuniq/package.json b/deps/npm/node_modules/lodash._baseuniq/package.json
index b98e6e7b2e669d..b08778532a3e25 100644
--- a/deps/npm/node_modules/lodash._baseuniq/package.json
+++ b/deps/npm/node_modules/lodash._baseuniq/package.json
@@ -1,46 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._baseuniq@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash.union"
-    ]
-  ],
-  "_from": "lodash._baseuniq@>=3.0.0 <4.0.0",
-  "_id": "lodash._baseuniq@3.0.3",
-  "_inCache": true,
-  "_location": "/lodash._baseuniq",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.12.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._baseuniq",
-    "raw": "lodash._baseuniq@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash.union",
-    "/lodash.uniq"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-3.0.3.tgz",
-  "_shasum": "2123fa0db2d69c28d5beb1c1f36d61522a740234",
-  "_shrinkwrap": null,
-  "_spec": "lodash._baseuniq@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash.union",
+  "name": "lodash._baseuniq",
+  "version": "3.0.3",
+  "description": "The modern build of lodash’s internal `baseUniq` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -68,21 +37,30 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
   "dependencies": {
     "lodash._baseindexof": "^3.0.0",
     "lodash._cacheindexof": "^3.0.0",
     "lodash._createcache": "^3.0.0"
   },
-  "description": "The modern build of lodash’s internal `baseUniq` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "2123fa0db2d69c28d5beb1c1f36d61522a740234",
-    "tarball": "http://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-3.0.3.tgz"
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._baseuniq@3.0.3",
+  "_shasum": "2123fa0db2d69c28d5beb1c1f36d61522a740234",
+  "_from": "lodash._baseuniq@3.0.3",
+  "_npmVersion": "2.12.0",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "name": "jdalton",
+    "email": "john.david.dalton@gmail.com"
   },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
   "maintainers": [
     {
       "name": "jdalton",
@@ -105,14 +83,11 @@
       "email": "demoneaux@gmail.com"
     }
   ],
-  "name": "lodash._baseuniq",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lodash/lodash.git"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  "dist": {
+    "shasum": "2123fa0db2d69c28d5beb1c1f36d61522a740234",
+    "tarball": "http://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-3.0.3.tgz"
   },
-  "version": "3.0.3"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-3.0.3.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/lodash._bindcallback/package.json b/deps/npm/node_modules/lodash._bindcallback/package.json
index 272cb6a29b71a9..551b321e44136e 100644
--- a/deps/npm/node_modules/lodash._bindcallback/package.json
+++ b/deps/npm/node_modules/lodash._bindcallback/package.json
@@ -1,46 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._bindcallback@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash.clonedeep"
-    ]
-  ],
-  "_from": "lodash._bindcallback@>=3.0.0 <4.0.0",
-  "_id": "lodash._bindcallback@3.0.1",
-  "_inCache": true,
-  "_location": "/lodash._bindcallback",
-  "_nodeVersion": "0.12.2",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.7.6",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._bindcallback",
-    "raw": "lodash._bindcallback@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash._basecallback",
-    "/lodash.clonedeep"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
-  "_shasum": "e531c27644cf8b57a99e17ed95b35c748789392e",
-  "_shrinkwrap": null,
-  "_spec": "lodash._bindcallback@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash.clonedeep",
+  "name": "lodash._bindcallback",
+  "version": "3.0.1",
+  "description": "The modern build of lodash’s internal `bindCallback` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -68,47 +37,20 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {},
-  "description": "The modern build of lodash’s internal `bindCallback` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "e531c27644cf8b57a99e17ed95b35c748789392e",
-    "tarball": "http://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    }
-  ],
-  "name": "lodash._bindcallback",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
-    "url": "https://github.com/lodash/lodash"
+    "url": "git+https://github.com/lodash/lodash.git"
   },
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.0.1"
+  "readme": "# lodash._bindcallback v3.0.1\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `bindCallback` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash._bindcallback\n```\n\nIn Node.js/io.js:\n\n```js\nvar bindCallback = require('lodash._bindcallback');\n```\n\nSee the [package source](https://github.com/lodash/lodash/blob/3.0.1-npm-packages/lodash._bindcallback) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._bindcallback@3.0.1",
+  "_shasum": "e531c27644cf8b57a99e17ed95b35c748789392e",
+  "_resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
+  "_from": "lodash._bindcallback@3.0.1"
 }
diff --git a/deps/npm/node_modules/lodash._cacheindexof/package.json b/deps/npm/node_modules/lodash._cacheindexof/package.json
index c87fc6b14d0f94..c46ba3bd3fad64 100644
--- a/deps/npm/node_modules/lodash._cacheindexof/package.json
+++ b/deps/npm/node_modules/lodash._cacheindexof/package.json
@@ -1,46 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._cacheindexof@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash._baseuniq"
-    ]
-  ],
-  "_from": "lodash._cacheindexof@>=3.0.0 <4.0.0",
-  "_id": "lodash._cacheindexof@3.0.2",
-  "_inCache": true,
-  "_location": "/lodash._cacheindexof",
-  "_nodeVersion": "0.12.3",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.10.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._cacheindexof",
-    "raw": "lodash._cacheindexof@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash._basedifference",
-    "/lodash._baseuniq"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz",
-  "_shasum": "3dc69ac82498d2ee5e3ce56091bafd2adc7bde92",
-  "_shrinkwrap": null,
-  "_spec": "lodash._cacheindexof@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseuniq",
+  "name": "lodash._cacheindexof",
+  "version": "3.0.2",
+  "description": "The modern build of lodash’s internal `cacheIndexOf` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -68,41 +37,6 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {},
-  "description": "The modern build of lodash’s internal `cacheIndexOf` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "3dc69ac82498d2ee5e3ce56091bafd2adc7bde92",
-    "tarball": "http://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    }
-  ],
-  "name": "lodash._cacheindexof",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lodash/lodash.git"
@@ -110,5 +44,13 @@
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.0.2"
+  "readme": "# lodash._cacheindexof v3.0.2\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `cacheIndexOf` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash._cacheindexof\n```\n\nIn Node.js/io.js:\n\n```js\nvar cacheIndexOf = require('lodash._cacheindexof');\n```\n\nSee the [package source](https://github.com/lodash/lodash/blob/3.0.2-npm-packages/lodash._cacheindexof) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._cacheindexof@3.0.2",
+  "_shasum": "3dc69ac82498d2ee5e3ce56091bafd2adc7bde92",
+  "_resolved": "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz",
+  "_from": "lodash._cacheindexof@3.0.2"
 }
diff --git a/deps/npm/node_modules/lodash._createcache/package.json b/deps/npm/node_modules/lodash._createcache/package.json
index 8417cf9d67cf4f..844c9c04a6b066 100644
--- a/deps/npm/node_modules/lodash._createcache/package.json
+++ b/deps/npm/node_modules/lodash._createcache/package.json
@@ -1,46 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._createcache@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash._baseuniq"
-    ]
-  ],
-  "_from": "lodash._createcache@>=3.0.0 <4.0.0",
-  "_id": "lodash._createcache@3.1.2",
-  "_inCache": true,
-  "_location": "/lodash._createcache",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.12.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._createcache",
-    "raw": "lodash._createcache@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash._basedifference",
-    "/lodash._baseuniq"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz",
-  "_shasum": "56d6a064017625e79ebca6b8018e17440bdcf093",
-  "_shrinkwrap": null,
-  "_spec": "lodash._createcache@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseuniq",
+  "name": "lodash._createcache",
+  "version": "3.1.2",
+  "description": "The modern build of lodash’s internal `createCache` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -68,43 +37,6 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {
-    "lodash._getnative": "^3.0.0"
-  },
-  "description": "The modern build of lodash’s internal `createCache` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "56d6a064017625e79ebca6b8018e17440bdcf093",
-    "tarball": "http://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    }
-  ],
-  "name": "lodash._createcache",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lodash/lodash.git"
@@ -112,5 +44,16 @@
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.1.2"
+  "dependencies": {
+    "lodash._getnative": "^3.0.0"
+  },
+  "readme": "# lodash._createcache v3.1.2\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `createCache` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash._createcache\n```\n\nIn Node.js/io.js:\n\n```js\nvar createCache = require('lodash._createcache');\n```\n\nSee the [package source](https://github.com/lodash/lodash/blob/3.1.2-npm-packages/lodash._createcache) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._createcache@3.1.2",
+  "_shasum": "56d6a064017625e79ebca6b8018e17440bdcf093",
+  "_resolved": "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz",
+  "_from": "lodash._createcache@3.1.2"
 }
diff --git a/deps/npm/node_modules/lodash._getnative/package.json b/deps/npm/node_modules/lodash._getnative/package.json
index 2f5c5eb3b58cb1..455383d29fce10 100644
--- a/deps/npm/node_modules/lodash._getnative/package.json
+++ b/deps/npm/node_modules/lodash._getnative/package.json
@@ -1,47 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._getnative@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash.keys"
-    ]
-  ],
-  "_from": "lodash._getnative@>=3.0.0 <4.0.0",
-  "_id": "lodash._getnative@3.9.1",
-  "_inCache": true,
-  "_location": "/lodash._getnative",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.12.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._getnative",
-    "raw": "lodash._getnative@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash._createcache",
-    "/lodash.keys",
-    "/lodash.uniq"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-  "_shasum": "570bc7dede46d61cdcde687d65d3eecbaa3aaff5",
-  "_shrinkwrap": null,
-  "_spec": "lodash._getnative@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash.keys",
+  "name": "lodash._getnative",
+  "version": "3.9.1",
+  "description": "The modern build of lodash’s internal `getNative` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -69,37 +37,6 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {},
-  "description": "The modern build of lodash’s internal `getNative` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "570bc7dede46d61cdcde687d65d3eecbaa3aaff5",
-    "tarball": "http://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    }
-  ],
-  "name": "lodash._getnative",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lodash/lodash.git"
@@ -107,5 +44,13 @@
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.9.1"
+  "readme": "# lodash._getnative v3.9.1\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `getNative` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash._getnative\n```\n\nIn Node.js/io.js:\n\n```js\nvar getNative = require('lodash._getnative');\n```\n\nSee the [package source](https://github.com/lodash/lodash/blob/3.9.1-npm-packages/lodash._getnative) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._getnative@3.9.1",
+  "_shasum": "570bc7dede46d61cdcde687d65d3eecbaa3aaff5",
+  "_resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+  "_from": "lodash._getnative@3.9.1"
 }
diff --git a/deps/npm/node_modules/lodash._basecallback/LICENSE b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/LICENSE
similarity index 100%
rename from deps/npm/node_modules/lodash._basecallback/LICENSE
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/LICENSE
diff --git a/deps/npm/node_modules/lodash._baseclone/README.md b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash._baseclone/README.md
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/README.md
diff --git a/deps/npm/node_modules/lodash._baseclone/index.js b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash._baseclone/index.js
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/index.js
diff --git a/deps/npm/node_modules/lodash._arraycopy/LICENSE.txt b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arraycopy/LICENSE.txt
similarity index 100%
rename from deps/npm/node_modules/lodash._arraycopy/LICENSE.txt
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arraycopy/LICENSE.txt
diff --git a/deps/npm/node_modules/lodash._arraycopy/README.md b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arraycopy/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash._arraycopy/README.md
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arraycopy/README.md
diff --git a/deps/npm/node_modules/lodash._arraycopy/index.js b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arraycopy/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash._arraycopy/index.js
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arraycopy/index.js
diff --git a/deps/npm/node_modules/lodash._arraycopy/package.json b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arraycopy/package.json
similarity index 53%
rename from deps/npm/node_modules/lodash._arraycopy/package.json
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arraycopy/package.json
index acad533065ff8d..f99b36cfeca9c9 100644
--- a/deps/npm/node_modules/lodash._arraycopy/package.json
+++ b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arraycopy/package.json
@@ -1,45 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._arraycopy@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash._baseclone"
-    ]
-  ],
-  "_from": "lodash._arraycopy@>=3.0.0 <4.0.0",
-  "_id": "lodash._arraycopy@3.0.0",
-  "_inCache": true,
-  "_location": "/lodash._arraycopy",
-  "_nodeVersion": "0.10.35",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.3.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._arraycopy",
-    "raw": "lodash._arraycopy@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash._baseclone"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz",
-  "_shasum": "76e7b7c1f1fb92547374878a562ed06a3e50f6e1",
-  "_shrinkwrap": null,
-  "_spec": "lodash._arraycopy@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseclone",
+  "name": "lodash._arraycopy",
+  "version": "3.0.0",
+  "description": "The modern build of lodash’s internal `arrayCopy` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,31 +37,20 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {},
-  "description": "The modern build of lodash’s internal `arrayCopy` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "76e7b7c1f1fb92547374878a562ed06a3e50f6e1",
-    "tarball": "http://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    }
-  ],
-  "name": "lodash._arraycopy",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
-    "url": "https://github.com/lodash/lodash"
+    "url": "git+https://github.com/lodash/lodash.git"
   },
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.0.0"
+  "readme": "# lodash._arraycopy v3.0.0\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `arrayCopy` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash._arraycopy\n```\n\nIn Node.js/io.js:\n\n```js\nvar arrayCopy = require('lodash._arraycopy');\n```\n\nSee the [package source](https://github.com/lodash/lodash/blob/3.0.0-npm-packages/lodash._arraycopy) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._arraycopy@3.0.0",
+  "_shasum": "76e7b7c1f1fb92547374878a562ed06a3e50f6e1",
+  "_resolved": "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz",
+  "_from": "lodash._arraycopy@>=3.0.0 <4.0.0"
 }
diff --git a/deps/npm/node_modules/lodash._arrayeach/LICENSE.txt b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arrayeach/LICENSE.txt
similarity index 100%
rename from deps/npm/node_modules/lodash._arrayeach/LICENSE.txt
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arrayeach/LICENSE.txt
diff --git a/deps/npm/node_modules/lodash._arrayeach/README.md b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arrayeach/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash._arrayeach/README.md
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arrayeach/README.md
diff --git a/deps/npm/node_modules/lodash._arrayeach/index.js b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arrayeach/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash._arrayeach/index.js
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arrayeach/index.js
diff --git a/deps/npm/node_modules/lodash._arrayeach/package.json b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arrayeach/package.json
similarity index 53%
rename from deps/npm/node_modules/lodash._arrayeach/package.json
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arrayeach/package.json
index 7036298dbf9013..63072607e9a869 100644
--- a/deps/npm/node_modules/lodash._arrayeach/package.json
+++ b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._arrayeach/package.json
@@ -1,45 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._arrayeach@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash._baseclone"
-    ]
-  ],
-  "_from": "lodash._arrayeach@>=3.0.0 <4.0.0",
-  "_id": "lodash._arrayeach@3.0.0",
-  "_inCache": true,
-  "_location": "/lodash._arrayeach",
-  "_nodeVersion": "0.10.35",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.3.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._arrayeach",
-    "raw": "lodash._arrayeach@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash._baseclone"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz",
-  "_shasum": "bab156b2a90d3f1bbd5c653403349e5e5933ef9e",
-  "_shrinkwrap": null,
-  "_spec": "lodash._arrayeach@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseclone",
+  "name": "lodash._arrayeach",
+  "version": "3.0.0",
+  "description": "The modern build of lodash’s internal `arrayEach` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,31 +37,20 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {},
-  "description": "The modern build of lodash’s internal `arrayEach` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "bab156b2a90d3f1bbd5c653403349e5e5933ef9e",
-    "tarball": "http://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    }
-  ],
-  "name": "lodash._arrayeach",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
-    "url": "https://github.com/lodash/lodash"
+    "url": "git+https://github.com/lodash/lodash.git"
   },
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.0.0"
+  "readme": "# lodash._arrayeach v3.0.0\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `arrayEach` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash._arrayeach\n```\n\nIn Node.js/io.js:\n\n```js\nvar arrayEach = require('lodash._arrayeach');\n```\n\nSee the [package source](https://github.com/lodash/lodash/blob/3.0.0-npm-packages/lodash._arrayeach) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._arrayeach@3.0.0",
+  "_shasum": "bab156b2a90d3f1bbd5c653403349e5e5933ef9e",
+  "_resolved": "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz",
+  "_from": "lodash._arrayeach@>=3.0.0 <4.0.0"
 }
diff --git a/deps/npm/node_modules/lodash._baseassign/LICENSE.txt b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/LICENSE.txt
similarity index 100%
rename from deps/npm/node_modules/lodash._baseassign/LICENSE.txt
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/LICENSE.txt
diff --git a/deps/npm/node_modules/lodash._baseassign/README.md b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash._baseassign/README.md
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/README.md
diff --git a/deps/npm/node_modules/lodash._baseassign/index.js b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash._baseassign/index.js
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/index.js
diff --git a/deps/npm/node_modules/lodash._basecopy/LICENSE.txt b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/node_modules/lodash._basecopy/LICENSE.txt
similarity index 100%
rename from deps/npm/node_modules/lodash._basecopy/LICENSE.txt
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/node_modules/lodash._basecopy/LICENSE.txt
diff --git a/deps/npm/node_modules/lodash._basecopy/README.md b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/node_modules/lodash._basecopy/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash._basecopy/README.md
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/node_modules/lodash._basecopy/README.md
diff --git a/deps/npm/node_modules/lodash._basecopy/index.js b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/node_modules/lodash._basecopy/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash._basecopy/index.js
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/node_modules/lodash._basecopy/index.js
diff --git a/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/node_modules/lodash._basecopy/package.json b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/node_modules/lodash._basecopy/package.json
new file mode 100644
index 00000000000000..a704063e0ae4a1
--- /dev/null
+++ b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/node_modules/lodash._basecopy/package.json
@@ -0,0 +1,56 @@
+{
+  "name": "lodash._basecopy",
+  "version": "3.0.1",
+  "description": "The modern build of lodash’s internal `baseCopy` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "author": {
+    "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
+    "url": "http://allyoucanleet.com/"
+  },
+  "contributors": [
+    {
+      "name": "John-David Dalton",
+      "email": "john.david.dalton@gmail.com",
+      "url": "http://allyoucanleet.com/"
+    },
+    {
+      "name": "Benjamin Tan",
+      "email": "demoneaux@gmail.com",
+      "url": "https://d10.github.io/"
+    },
+    {
+      "name": "Blaine Bublitz",
+      "email": "blaine@iceddev.com",
+      "url": "http://www.iceddev.com/"
+    },
+    {
+      "name": "Kit Cambridge",
+      "email": "github@kitcambridge.be",
+      "url": "http://kitcambridge.be/"
+    },
+    {
+      "name": "Mathias Bynens",
+      "email": "mathias@qiwi.be",
+      "url": "https://mathiasbynens.be/"
+    }
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "readme": "# lodash._basecopy v3.0.1\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseCopy` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash._basecopy\n```\n\nIn Node.js/io.js:\n\n```js\nvar baseCopy = require('lodash._basecopy');\n```\n\nSee the [package source](https://github.com/lodash/lodash/blob/3.0.1-npm-packages/lodash._basecopy) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._basecopy@3.0.1",
+  "_shasum": "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36",
+  "_resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+  "_from": "lodash._basecopy@>=3.0.0 <4.0.0"
+}
diff --git a/deps/npm/node_modules/lodash._baseassign/package.json b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/package.json
similarity index 51%
rename from deps/npm/node_modules/lodash._baseassign/package.json
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/package.json
index 5c5c487719127c..65386d8bd02aba 100644
--- a/deps/npm/node_modules/lodash._baseassign/package.json
+++ b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._baseassign/package.json
@@ -1,45 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._baseassign@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash._baseclone"
-    ]
-  ],
-  "_from": "lodash._baseassign@>=3.0.0 <4.0.0",
-  "_id": "lodash._baseassign@3.2.0",
-  "_inCache": true,
-  "_location": "/lodash._baseassign",
-  "_nodeVersion": "0.12.3",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.10.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._baseassign",
-    "raw": "lodash._baseassign@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash._baseclone"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-  "_shasum": "8c38a099500f215ad09e59f1722fd0c52bfe0a4e",
-  "_shrinkwrap": null,
-  "_spec": "lodash._baseassign@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseclone",
+  "name": "lodash._baseassign",
+  "version": "3.2.0",
+  "description": "The modern build of lodash’s internal `baseAssign` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,44 +37,6 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {
-    "lodash._basecopy": "^3.0.0",
-    "lodash.keys": "^3.0.0"
-  },
-  "description": "The modern build of lodash’s internal `baseAssign` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "8c38a099500f215ad09e59f1722fd0c52bfe0a4e",
-    "tarball": "http://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    }
-  ],
-  "name": "lodash._baseassign",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lodash/lodash.git"
@@ -112,5 +44,17 @@
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.2.0"
+  "dependencies": {
+    "lodash._basecopy": "^3.0.0",
+    "lodash.keys": "^3.0.0"
+  },
+  "readme": "# lodash._baseassign v3.2.0\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseAssign` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash._baseassign\n```\n\nIn Node.js/io.js:\n\n```js\nvar baseAssign = require('lodash._baseassign');\n```\n\nSee the [package source](https://github.com/lodash/lodash/blob/3.2.0-npm-packages/lodash._baseassign) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._baseassign@3.2.0",
+  "_shasum": "8c38a099500f215ad09e59f1722fd0c52bfe0a4e",
+  "_resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+  "_from": "lodash._baseassign@>=3.0.0 <4.0.0"
 }
diff --git a/deps/npm/node_modules/lodash._basefor/LICENSE.txt b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._basefor/LICENSE.txt
similarity index 100%
rename from deps/npm/node_modules/lodash._basefor/LICENSE.txt
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._basefor/LICENSE.txt
diff --git a/deps/npm/node_modules/lodash._basefor/README.md b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._basefor/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash._basefor/README.md
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._basefor/README.md
diff --git a/deps/npm/node_modules/lodash._basefor/index.js b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._basefor/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash._basefor/index.js
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._basefor/index.js
diff --git a/deps/npm/node_modules/lodash._basefor/package.json b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._basefor/package.json
similarity index 50%
rename from deps/npm/node_modules/lodash._basefor/package.json
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._basefor/package.json
index 898b10c857e37d..85421f441af04b 100644
--- a/deps/npm/node_modules/lodash._basefor/package.json
+++ b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/node_modules/lodash._basefor/package.json
@@ -1,45 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._basefor@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash._baseclone"
-    ]
-  ],
-  "_from": "lodash._basefor@>=3.0.0 <4.0.0",
-  "_id": "lodash._basefor@3.0.2",
-  "_inCache": true,
-  "_location": "/lodash._basefor",
-  "_nodeVersion": "0.12.3",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.10.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._basefor",
-    "raw": "lodash._basefor@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash._baseclone"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.2.tgz",
-  "_shasum": "3a4cece5b7031eae78a441c5416b90878eeee5a1",
-  "_shrinkwrap": null,
-  "_spec": "lodash._basefor@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseclone",
+  "name": "lodash._basefor",
+  "version": "3.0.2",
+  "description": "The modern build of lodash’s internal `baseFor` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,41 +37,6 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {},
-  "description": "The modern build of lodash’s internal `baseFor` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "3a4cece5b7031eae78a441c5416b90878eeee5a1",
-    "tarball": "http://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.2.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    }
-  ],
-  "name": "lodash._basefor",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lodash/lodash.git"
@@ -109,5 +44,13 @@
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.0.2"
+  "readme": "# lodash._basefor v3.0.2\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseFor` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash._basefor\n```\n\nIn Node.js/io.js:\n\n```js\nvar baseFor = require('lodash._basefor');\n```\n\nSee the [package source](https://github.com/lodash/lodash/blob/3.0.2-npm-packages/lodash._basefor) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._basefor@3.0.2",
+  "_shasum": "3a4cece5b7031eae78a441c5416b90878eeee5a1",
+  "_resolved": "https://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.2.tgz",
+  "_from": "lodash._basefor@>=3.0.0 <4.0.0"
 }
diff --git a/deps/npm/node_modules/lodash._baseclone/package.json b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/package.json
similarity index 53%
rename from deps/npm/node_modules/lodash._baseclone/package.json
rename to deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/package.json
index ebfea785ecf519..1aca59200aefd9 100644
--- a/deps/npm/node_modules/lodash._baseclone/package.json
+++ b/deps/npm/node_modules/lodash.clonedeep/node_modules/lodash._baseclone/package.json
@@ -1,45 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._baseclone@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash.clonedeep"
-    ]
-  ],
-  "_from": "lodash._baseclone@>=3.0.0 <4.0.0",
-  "_id": "lodash._baseclone@3.3.0",
-  "_inCache": true,
-  "_location": "/lodash._baseclone",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.12.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._baseclone",
-    "raw": "lodash._baseclone@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash.clonedeep"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz",
-  "_shasum": "303519bf6393fe7e42f34d8b630ef7794e3542b7",
-  "_shrinkwrap": null,
-  "_spec": "lodash._baseclone@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash.clonedeep",
+  "name": "lodash._baseclone",
+  "version": "3.3.0",
+  "description": "The modern build of lodash’s internal `baseClone` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,6 +37,13 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
   "dependencies": {
     "lodash._arraycopy": "^3.0.0",
     "lodash._arrayeach": "^3.0.0",
@@ -75,46 +52,13 @@
     "lodash.isarray": "^3.0.0",
     "lodash.keys": "^3.0.0"
   },
-  "description": "The modern build of lodash’s internal `baseClone` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "303519bf6393fe7e42f34d8b630ef7794e3542b7",
-    "tarball": "http://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    }
-  ],
-  "name": "lodash._baseclone",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lodash/lodash.git"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  "readme": "# lodash._baseclone v3.3.0\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseClone` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash._baseclone\n```\n\nIn Node.js/io.js:\n\n```js\nvar baseClone = require('lodash._baseclone');\n```\n\nSee the [package source](https://github.com/lodash/lodash/blob/3.3.0-npm-packages/lodash._baseclone) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
   },
-  "version": "3.3.0"
+  "_id": "lodash._baseclone@3.3.0",
+  "_shasum": "303519bf6393fe7e42f34d8b630ef7794e3542b7",
+  "_resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz",
+  "_from": "lodash._baseclone@>=3.0.0 <4.0.0"
 }
diff --git a/deps/npm/node_modules/lodash.clonedeep/package.json b/deps/npm/node_modules/lodash.clonedeep/package.json
index 83c6e3b1fc0744..05fe4afe9c8539 100644
--- a/deps/npm/node_modules/lodash.clonedeep/package.json
+++ b/deps/npm/node_modules/lodash.clonedeep/package.json
@@ -1,45 +1,21 @@
 {
-  "_args": [
-    [
-      "lodash.clonedeep@~3.0.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "lodash.clonedeep@>=3.0.1 <3.1.0",
-  "_id": "lodash.clonedeep@3.0.2",
-  "_inCache": true,
-  "_location": "/lodash.clonedeep",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.13.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash.clonedeep",
-    "raw": "lodash.clonedeep@~3.0.1",
-    "rawSpec": "~3.0.1",
-    "scope": null,
-    "spec": ">=3.0.1 <3.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
+  "name": "lodash.clonedeep",
+  "version": "3.0.2",
+  "description": "The modern build of lodash’s `_.cloneDeep` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
   ],
-  "_resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz",
-  "_shasum": "a0a1e40d82a5ea89ff5b147b8444ed63d92827db",
-  "_shrinkwrap": null,
-  "_spec": "lodash.clonedeep@~3.0.1",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,51 +43,6 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {
-    "lodash._baseclone": "^3.0.0",
-    "lodash._bindcallback": "^3.0.0"
-  },
-  "description": "The modern build of lodash’s `_.cloneDeep` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "a0a1e40d82a5ea89ff5b147b8444ed63d92827db",
-    "tarball": "http://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "installable": true,
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    }
-  ],
-  "name": "lodash.clonedeep",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lodash/lodash.git"
@@ -119,5 +50,17 @@
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.0.2"
+  "dependencies": {
+    "lodash._baseclone": "^3.0.0",
+    "lodash._bindcallback": "^3.0.0"
+  },
+  "readme": "# lodash.clonedeep v3.0.2\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.cloneDeep` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash.clonedeep\n```\n\nIn Node.js/io.js:\n\n```js\nvar cloneDeep = require('lodash.clonedeep');\n```\n\nSee the [documentation](https://lodash.com/docs#cloneDeep) or [package source](https://github.com/lodash/lodash/blob/3.0.2-npm-packages/lodash.clonedeep) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash.clonedeep@3.0.2",
+  "_shasum": "a0a1e40d82a5ea89ff5b147b8444ed63d92827db",
+  "_resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz",
+  "_from": "lodash.clonedeep@>=3.0.2 <3.1.0"
 }
diff --git a/deps/npm/node_modules/lodash.isarguments/package.json b/deps/npm/node_modules/lodash.isarguments/package.json
index de5c561d5eb2ea..2c7c609ed147cf 100644
--- a/deps/npm/node_modules/lodash.isarguments/package.json
+++ b/deps/npm/node_modules/lodash.isarguments/package.json
@@ -1,46 +1,21 @@
 {
-  "_args": [
-    [
-      "lodash.isarguments@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash.keys"
-    ]
-  ],
-  "_from": "lodash.isarguments@>=3.0.0 <4.0.0",
-  "_id": "lodash.isarguments@3.0.4",
-  "_inCache": true,
-  "_location": "/lodash.isarguments",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.12.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash.isarguments",
-    "raw": "lodash.isarguments@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash._baseflatten",
-    "/lodash.keys"
+  "name": "lodash.isarguments",
+  "version": "3.0.4",
+  "description": "The modern build of lodash’s `_.isArguments` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
   ],
-  "_resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz",
-  "_shasum": "ebbb884c48d27366a44ea6fee57ed7b5a32a81e0",
-  "_shrinkwrap": null,
-  "_spec": "lodash.isarguments@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash.keys",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -68,47 +43,6 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {},
-  "description": "The modern build of lodash’s `_.isArguments` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "ebbb884c48d27366a44ea6fee57ed7b5a32a81e0",
-    "tarball": "http://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    }
-  ],
-  "name": "lodash.isarguments",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lodash/lodash.git"
@@ -116,5 +50,13 @@
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.0.4"
+  "readme": "# lodash.isarguments v3.0.4\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.isArguments` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash.isarguments\n```\n\nIn Node.js/io.js:\n\n```js\nvar isArguments = require('lodash.isarguments');\n```\n\nSee the [documentation](https://lodash.com/docs#isArguments) or [package source](https://github.com/lodash/lodash/blob/3.0.4-npm-packages/lodash.isarguments) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash.isarguments@3.0.4",
+  "_shasum": "ebbb884c48d27366a44ea6fee57ed7b5a32a81e0",
+  "_resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz",
+  "_from": "lodash.isarguments@3.0.4"
 }
diff --git a/deps/npm/node_modules/lodash.isarray/package.json b/deps/npm/node_modules/lodash.isarray/package.json
index 47cb23f1e91886..0d8a02c800e787 100644
--- a/deps/npm/node_modules/lodash.isarray/package.json
+++ b/deps/npm/node_modules/lodash.isarray/package.json
@@ -1,50 +1,21 @@
 {
-  "_args": [
-    [
-      "lodash.isarray@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash._baseclone"
-    ]
-  ],
-  "_from": "lodash.isarray@>=3.0.0 <4.0.0",
-  "_id": "lodash.isarray@3.0.4",
-  "_inCache": true,
-  "_location": "/lodash.isarray",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.12.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash.isarray",
-    "raw": "lodash.isarray@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash._basecallback",
-    "/lodash._baseclone",
-    "/lodash._baseflatten",
-    "/lodash._baseisequal",
-    "/lodash.keys",
-    "/lodash.uniq"
+  "name": "lodash.isarray",
+  "version": "3.0.4",
+  "description": "The modern build of lodash’s `_.isArray` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
   ],
-  "_resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-  "_shasum": "79e4eb88c36a8122af86f844aa9bcd851b5fbb55",
-  "_shrinkwrap": null,
-  "_spec": "lodash.isarray@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseclone",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -72,47 +43,6 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {},
-  "description": "The modern build of lodash’s `_.isArray` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "79e4eb88c36a8122af86f844aa9bcd851b5fbb55",
-    "tarball": "http://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    }
-  ],
-  "name": "lodash.isarray",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lodash/lodash.git"
@@ -120,5 +50,13 @@
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.0.4"
+  "readme": "# lodash.isarray v3.0.4\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.isArray` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash.isarray\n```\n\nIn Node.js/io.js:\n\n```js\nvar isArray = require('lodash.isarray');\n```\n\nSee the [documentation](https://lodash.com/docs#isArray) or [package source](https://github.com/lodash/lodash/blob/3.0.4-npm-packages/lodash.isarray) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash.isarray@3.0.4",
+  "_shasum": "79e4eb88c36a8122af86f844aa9bcd851b5fbb55",
+  "_resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+  "_from": "lodash.isarray@3.0.4"
 }
diff --git a/deps/npm/node_modules/lodash.keys/package.json b/deps/npm/node_modules/lodash.keys/package.json
index 606a4d98524817..588c63e9ea0e41 100644
--- a/deps/npm/node_modules/lodash.keys/package.json
+++ b/deps/npm/node_modules/lodash.keys/package.json
@@ -1,48 +1,21 @@
 {
-  "_args": [
-    [
-      "lodash.keys@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash._baseclone"
-    ]
-  ],
-  "_from": "lodash.keys@>=3.0.0 <4.0.0",
-  "_id": "lodash.keys@3.1.2",
-  "_inCache": true,
-  "_location": "/lodash.keys",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.12.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash.keys",
-    "raw": "lodash.keys@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash._baseassign",
-    "/lodash._baseclone",
-    "/lodash._baseisequal",
-    "/lodash.pairs"
+  "name": "lodash.keys",
+  "version": "3.1.2",
+  "description": "The modern build of lodash’s `_.keys` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
   ],
-  "_resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-  "_shasum": "4dbc0472b156be50a0b286855d1bd0b0c656098a",
-  "_shrinkwrap": null,
-  "_spec": "lodash.keys@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseclone",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -70,51 +43,6 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {
-    "lodash._getnative": "^3.0.0",
-    "lodash.isarguments": "^3.0.0",
-    "lodash.isarray": "^3.0.0"
-  },
-  "description": "The modern build of lodash’s `_.keys` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "4dbc0472b156be50a0b286855d1bd0b0c656098a",
-    "tarball": "http://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    }
-  ],
-  "name": "lodash.keys",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lodash/lodash.git"
@@ -122,5 +50,18 @@
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.1.2"
+  "dependencies": {
+    "lodash._getnative": "^3.0.0",
+    "lodash.isarguments": "^3.0.0",
+    "lodash.isarray": "^3.0.0"
+  },
+  "readme": "# lodash.keys v3.1.2\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.keys` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash.keys\n```\n\nIn Node.js/io.js:\n\n```js\nvar keys = require('lodash.keys');\n```\n\nSee the [documentation](https://lodash.com/docs#keys) or [package source](https://github.com/lodash/lodash/blob/3.1.2-npm-packages/lodash.keys) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash.keys@3.1.2",
+  "_shasum": "4dbc0472b156be50a0b286855d1bd0b0c656098a",
+  "_resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+  "_from": "lodash.keys@3.1.2"
 }
diff --git a/deps/npm/node_modules/lodash.restparam/package.json b/deps/npm/node_modules/lodash.restparam/package.json
index b57d381a17af73..f3a9247f460609 100644
--- a/deps/npm/node_modules/lodash.restparam/package.json
+++ b/deps/npm/node_modules/lodash.restparam/package.json
@@ -1,46 +1,21 @@
 {
-  "_args": [
-    [
-      "lodash.restparam@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash.union"
-    ]
-  ],
-  "_from": "lodash.restparam@>=3.0.0 <4.0.0",
-  "_id": "lodash.restparam@3.6.1",
-  "_inCache": true,
-  "_location": "/lodash.restparam",
-  "_nodeVersion": "0.12.2",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.7.6",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash.restparam",
-    "raw": "lodash.restparam@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash.union",
-    "/lodash.without"
+  "name": "lodash.restparam",
+  "version": "3.6.1",
+  "description": "The modern build of lodash’s `_.restParam` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
   ],
-  "_resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-  "_shasum": "936a4e309ef330a7645ed4145986c85ae5b20805",
-  "_shrinkwrap": null,
-  "_spec": "lodash.restparam@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash.union",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -68,53 +43,20 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {},
-  "description": "The modern build of lodash’s `_.restParam` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "936a4e309ef330a7645ed4145986c85ae5b20805",
-    "tarball": "http://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    }
-  ],
-  "name": "lodash.restparam",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
-    "url": "https://github.com/lodash/lodash"
+    "url": "git+https://github.com/lodash/lodash.git"
   },
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.6.1"
+  "readme": "# lodash.restparam v3.6.1\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.restParam` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash.restparam\n```\n\nIn Node.js/io.js:\n\n```js\nvar restParam = require('lodash.restparam');\n```\n\nSee the [documentation](https://lodash.com/docs#restParam) or [package source](https://github.com/lodash/lodash/blob/3.6.1-npm-packages/lodash.restparam) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash.restparam@3.6.1",
+  "_shasum": "936a4e309ef330a7645ed4145986c85ae5b20805",
+  "_resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+  "_from": "lodash.restparam@3.6.1"
 }
diff --git a/deps/npm/node_modules/lodash._baseclone/LICENSE b/deps/npm/node_modules/lodash.union/node_modules/lodash._baseflatten/LICENSE
similarity index 100%
rename from deps/npm/node_modules/lodash._baseclone/LICENSE
rename to deps/npm/node_modules/lodash.union/node_modules/lodash._baseflatten/LICENSE
diff --git a/deps/npm/node_modules/lodash._baseflatten/README.md b/deps/npm/node_modules/lodash.union/node_modules/lodash._baseflatten/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash._baseflatten/README.md
rename to deps/npm/node_modules/lodash.union/node_modules/lodash._baseflatten/README.md
diff --git a/deps/npm/node_modules/lodash._baseflatten/index.js b/deps/npm/node_modules/lodash.union/node_modules/lodash._baseflatten/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash._baseflatten/index.js
rename to deps/npm/node_modules/lodash.union/node_modules/lodash._baseflatten/index.js
diff --git a/deps/npm/node_modules/lodash._baseflatten/package.json b/deps/npm/node_modules/lodash.union/node_modules/lodash._baseflatten/package.json
similarity index 52%
rename from deps/npm/node_modules/lodash._baseflatten/package.json
rename to deps/npm/node_modules/lodash.union/node_modules/lodash._baseflatten/package.json
index 48b2545dcad0c9..6d142e1cbaaa4f 100644
--- a/deps/npm/node_modules/lodash._baseflatten/package.json
+++ b/deps/npm/node_modules/lodash.union/node_modules/lodash._baseflatten/package.json
@@ -1,45 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._baseflatten@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash.union"
-    ]
-  ],
-  "_from": "lodash._baseflatten@>=3.0.0 <4.0.0",
-  "_id": "lodash._baseflatten@3.1.4",
-  "_inCache": true,
-  "_location": "/lodash._baseflatten",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.12.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._baseflatten",
-    "raw": "lodash._baseflatten@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash.union"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz",
-  "_shasum": "0770ff80131af6e34f3b511796a7ba5214e65ff7",
-  "_shrinkwrap": null,
-  "_spec": "lodash._baseflatten@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash.union",
+  "name": "lodash._baseflatten",
+  "version": "3.1.4",
+  "description": "The modern build of lodash’s internal `baseFlatten` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,44 +37,6 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {
-    "lodash.isarguments": "^3.0.0",
-    "lodash.isarray": "^3.0.0"
-  },
-  "description": "The modern build of lodash’s internal `baseFlatten` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "0770ff80131af6e34f3b511796a7ba5214e65ff7",
-    "tarball": "http://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    }
-  ],
-  "name": "lodash._baseflatten",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lodash/lodash.git"
@@ -112,5 +44,17 @@
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.1.4"
+  "dependencies": {
+    "lodash.isarguments": "^3.0.0",
+    "lodash.isarray": "^3.0.0"
+  },
+  "readme": "# lodash._baseflatten v3.1.4\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseFlatten` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash._baseflatten\n```\n\nIn Node.js/io.js:\n\n```js\nvar baseFlatten = require('lodash._baseflatten');\n```\n\nSee the [package source](https://github.com/lodash/lodash/blob/3.1.4-npm-packages/lodash._baseflatten) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._baseflatten@3.1.4",
+  "_shasum": "0770ff80131af6e34f3b511796a7ba5214e65ff7",
+  "_resolved": "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz",
+  "_from": "lodash._baseflatten@>=3.0.0 <4.0.0"
 }
diff --git a/deps/npm/node_modules/lodash.union/package.json b/deps/npm/node_modules/lodash.union/package.json
index 4359aa2c3a486a..7c82a1ef4b536b 100644
--- a/deps/npm/node_modules/lodash.union/package.json
+++ b/deps/npm/node_modules/lodash.union/package.json
@@ -1,45 +1,21 @@
 {
-  "_args": [
-    [
-      "lodash.union@~3.1.0",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "lodash.union@>=3.1.0 <3.2.0",
-  "_id": "lodash.union@3.1.0",
-  "_inCache": true,
-  "_location": "/lodash.union",
-  "_nodeVersion": "0.12.0",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.7.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash.union",
-    "raw": "lodash.union@~3.1.0",
-    "rawSpec": "~3.1.0",
-    "scope": null,
-    "spec": ">=3.1.0 <3.2.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
+  "name": "lodash.union",
+  "version": "3.1.0",
+  "description": "The modern build of lodash’s `_.union` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
   ],
-  "_resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-3.1.0.tgz",
-  "_shasum": "a4a3066fc15d6a7f8151cce9bdfe63dce7f5bcff",
-  "_shrinkwrap": null,
-  "_spec": "lodash.union@~3.1.0",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,27 +43,30 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/lodash/lodash"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
   "dependencies": {
     "lodash._baseflatten": "^3.0.0",
     "lodash._baseuniq": "^3.0.0",
     "lodash.restparam": "^3.0.0"
   },
-  "description": "The modern build of lodash’s `_.union` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "a4a3066fc15d6a7f8151cce9bdfe63dce7f5bcff",
-    "tarball": "http://registry.npmjs.org/lodash.union/-/lodash.union-3.1.0.tgz"
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash.union@3.1.0",
+  "_shasum": "a4a3066fc15d6a7f8151cce9bdfe63dce7f5bcff",
+  "_from": "lodash.union@>=3.1.0 <3.2.0",
+  "_npmVersion": "2.7.3",
+  "_nodeVersion": "0.12.0",
+  "_npmUser": {
+    "name": "jdalton",
+    "email": "john.david.dalton@gmail.com"
   },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
-  ],
-  "license": "MIT",
   "maintainers": [
     {
       "name": "jdalton",
@@ -110,14 +89,10 @@
       "email": "demoneaux@gmail.com"
     }
   ],
-  "name": "lodash.union",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/lodash/lodash"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  "dist": {
+    "shasum": "a4a3066fc15d6a7f8151cce9bdfe63dce7f5bcff",
+    "tarball": "http://registry.npmjs.org/lodash.union/-/lodash.union-3.1.0.tgz"
   },
-  "version": "3.1.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-3.1.0.tgz"
 }
diff --git a/deps/npm/node_modules/lodash._basedifference/LICENSE b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/LICENSE
similarity index 100%
rename from deps/npm/node_modules/lodash._basedifference/LICENSE
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/LICENSE
diff --git a/deps/npm/node_modules/lodash._basecallback/README.md b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash._basecallback/README.md
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/README.md
diff --git a/deps/npm/node_modules/lodash._basecallback/index.js b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash._basecallback/index.js
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/index.js
diff --git a/deps/npm/node_modules/lodash._baseisequal/LICENSE.txt b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/LICENSE.txt
similarity index 100%
rename from deps/npm/node_modules/lodash._baseisequal/LICENSE.txt
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/LICENSE.txt
diff --git a/deps/npm/node_modules/lodash._baseisequal/README.md b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash._baseisequal/README.md
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/README.md
diff --git a/deps/npm/node_modules/lodash._baseisequal/index.js b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash._baseisequal/index.js
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/index.js
diff --git a/deps/npm/node_modules/lodash._isiterateecall/LICENSE.txt b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/node_modules/lodash.istypedarray/LICENSE.txt
similarity index 100%
rename from deps/npm/node_modules/lodash._isiterateecall/LICENSE.txt
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/node_modules/lodash.istypedarray/LICENSE.txt
diff --git a/deps/npm/node_modules/lodash.istypedarray/README.md b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/node_modules/lodash.istypedarray/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash.istypedarray/README.md
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/node_modules/lodash.istypedarray/README.md
diff --git a/deps/npm/node_modules/lodash.istypedarray/index.js b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/node_modules/lodash.istypedarray/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash.istypedarray/index.js
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/node_modules/lodash.istypedarray/index.js
diff --git a/deps/npm/node_modules/lodash.istypedarray/package.json b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/node_modules/lodash.istypedarray/package.json
similarity index 51%
rename from deps/npm/node_modules/lodash.istypedarray/package.json
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/node_modules/lodash.istypedarray/package.json
index 4177313505326b..1de8c845f39558 100644
--- a/deps/npm/node_modules/lodash.istypedarray/package.json
+++ b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/node_modules/lodash.istypedarray/package.json
@@ -1,45 +1,21 @@
 {
-  "_args": [
-    [
-      "lodash.istypedarray@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash._baseisequal"
-    ]
-  ],
-  "_from": "lodash.istypedarray@>=3.0.0 <4.0.0",
-  "_id": "lodash.istypedarray@3.0.2",
-  "_inCache": true,
-  "_location": "/lodash.istypedarray",
-  "_nodeVersion": "0.12.3",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.10.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash.istypedarray",
-    "raw": "lodash.istypedarray@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash._baseisequal"
+  "name": "lodash.istypedarray",
+  "version": "3.0.2",
+  "description": "The modern build of lodash’s `_.isTypedArray` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
   ],
-  "_resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.2.tgz",
-  "_shasum": "9397b113c15f424f320af06caa59cc495e2093ce",
-  "_shrinkwrap": null,
-  "_spec": "lodash.istypedarray@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash._baseisequal",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,47 +43,6 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {},
-  "description": "The modern build of lodash’s `_.isTypedArray` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "9397b113c15f424f320af06caa59cc495e2093ce",
-    "tarball": "http://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.2.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    }
-  ],
-  "name": "lodash.istypedarray",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lodash/lodash.git"
@@ -115,5 +50,13 @@
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.0.2"
+  "readme": "# lodash.istypedarray v3.0.2\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.isTypedArray` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash.istypedarray\n```\n\nIn Node.js/io.js:\n\n```js\nvar isTypedArray = require('lodash.istypedarray');\n```\n\nSee the [documentation](https://lodash.com/docs#isTypedArray) or [package source](https://github.com/lodash/lodash/blob/3.0.2-npm-packages/lodash.istypedarray) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash.istypedarray@3.0.2",
+  "_shasum": "9397b113c15f424f320af06caa59cc495e2093ce",
+  "_resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.2.tgz",
+  "_from": "lodash.istypedarray@>=3.0.0 <4.0.0"
 }
diff --git a/deps/npm/node_modules/lodash._baseisequal/package.json b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/package.json
similarity index 52%
rename from deps/npm/node_modules/lodash._baseisequal/package.json
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/package.json
index 8fe01997710cbf..33b1d56dc75614 100644
--- a/deps/npm/node_modules/lodash._baseisequal/package.json
+++ b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash._baseisequal/package.json
@@ -1,45 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._baseisequal@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash._basecallback"
-    ]
-  ],
-  "_from": "lodash._baseisequal@>=3.0.0 <4.0.0",
-  "_id": "lodash._baseisequal@3.0.7",
-  "_inCache": true,
-  "_location": "/lodash._baseisequal",
-  "_nodeVersion": "2.0.2",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.10.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._baseisequal",
-    "raw": "lodash._baseisequal@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash._basecallback"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz",
-  "_shasum": "d8025f76339d29342767dcc887ce5cb95a5b51f1",
-  "_shrinkwrap": null,
-  "_spec": "lodash._baseisequal@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash._basecallback",
+  "name": "lodash._baseisequal",
+  "version": "3.0.7",
+  "description": "The modern build of lodash’s internal `baseIsEqual` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,45 +37,6 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {
-    "lodash.isarray": "^3.0.0",
-    "lodash.istypedarray": "^3.0.0",
-    "lodash.keys": "^3.0.0"
-  },
-  "description": "The modern build of lodash’s internal `baseIsEqual` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "d8025f76339d29342767dcc887ce5cb95a5b51f1",
-    "tarball": "http://registry.npmjs.org/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    }
-  ],
-  "name": "lodash._baseisequal",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lodash/lodash.git"
@@ -113,5 +44,18 @@
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.0.7"
+  "dependencies": {
+    "lodash.isarray": "^3.0.0",
+    "lodash.istypedarray": "^3.0.0",
+    "lodash.keys": "^3.0.0"
+  },
+  "readme": "# lodash._baseisequal v3.0.7\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseIsEqual` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash._baseisequal\n```\n\nIn Node.js/io.js:\n\n```js\nvar baseIsEqual = require('lodash._baseisequal');\n```\n\nSee the [package source](https://github.com/lodash/lodash/blob/3.0.7-npm-packages/lodash._baseisequal) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._baseisequal@3.0.7",
+  "_shasum": "d8025f76339d29342767dcc887ce5cb95a5b51f1",
+  "_resolved": "https://registry.npmjs.org/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz",
+  "_from": "lodash._baseisequal@>=3.0.0 <4.0.0"
 }
diff --git a/deps/npm/node_modules/lodash.istypedarray/LICENSE.txt b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash.pairs/LICENSE.txt
similarity index 100%
rename from deps/npm/node_modules/lodash.istypedarray/LICENSE.txt
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash.pairs/LICENSE.txt
diff --git a/deps/npm/node_modules/lodash.pairs/README.md b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash.pairs/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash.pairs/README.md
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash.pairs/README.md
diff --git a/deps/npm/node_modules/lodash.pairs/index.js b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash.pairs/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash.pairs/index.js
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash.pairs/index.js
diff --git a/deps/npm/node_modules/lodash.pairs/package.json b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash.pairs/package.json
similarity index 52%
rename from deps/npm/node_modules/lodash.pairs/package.json
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash.pairs/package.json
index 8a172572239dbe..49df669149c7b0 100644
--- a/deps/npm/node_modules/lodash.pairs/package.json
+++ b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/node_modules/lodash.pairs/package.json
@@ -1,45 +1,21 @@
 {
-  "_args": [
-    [
-      "lodash.pairs@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash._basecallback"
-    ]
-  ],
-  "_from": "lodash.pairs@>=3.0.0 <4.0.0",
-  "_id": "lodash.pairs@3.0.1",
-  "_inCache": true,
-  "_location": "/lodash.pairs",
-  "_nodeVersion": "0.12.3",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.10.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash.pairs",
-    "raw": "lodash.pairs@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash._basecallback"
+  "name": "lodash.pairs",
+  "version": "3.0.1",
+  "description": "The modern build of lodash’s `_.pairs` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
   ],
-  "_resolved": "https://registry.npmjs.org/lodash.pairs/-/lodash.pairs-3.0.1.tgz",
-  "_shasum": "bbe08d5786eeeaa09a15c91ebf0dcb7d2be326a9",
-  "_shrinkwrap": null,
-  "_spec": "lodash.pairs@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash._basecallback",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,49 +43,6 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {
-    "lodash.keys": "^3.0.0"
-  },
-  "description": "The modern build of lodash’s `_.pairs` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "bbe08d5786eeeaa09a15c91ebf0dcb7d2be326a9",
-    "tarball": "http://registry.npmjs.org/lodash.pairs/-/lodash.pairs-3.0.1.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    }
-  ],
-  "name": "lodash.pairs",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lodash/lodash.git"
@@ -117,5 +50,16 @@
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.0.1"
+  "dependencies": {
+    "lodash.keys": "^3.0.0"
+  },
+  "readme": "# lodash.pairs v3.0.1\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) `_.pairs` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash.pairs\n```\n\nIn Node.js/io.js:\n\n```js\nvar pairs = require('lodash.pairs');\n```\n\nSee the [documentation](https://lodash.com/docs#pairs) or [package source](https://github.com/lodash/lodash/blob/3.0.1-npm-packages/lodash.pairs) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash.pairs@3.0.1",
+  "_shasum": "bbe08d5786eeeaa09a15c91ebf0dcb7d2be326a9",
+  "_resolved": "https://registry.npmjs.org/lodash.pairs/-/lodash.pairs-3.0.1.tgz",
+  "_from": "lodash.pairs@>=3.0.0 <4.0.0"
 }
diff --git a/deps/npm/node_modules/lodash._basecallback/package.json b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/package.json
similarity index 53%
rename from deps/npm/node_modules/lodash._basecallback/package.json
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/package.json
index 26f29994f7a060..3a13a7f014288c 100644
--- a/deps/npm/node_modules/lodash._basecallback/package.json
+++ b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._basecallback/package.json
@@ -1,45 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._basecallback@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash.uniq"
-    ]
-  ],
-  "_from": "lodash._basecallback@>=3.0.0 <4.0.0",
-  "_id": "lodash._basecallback@3.3.1",
-  "_inCache": true,
-  "_location": "/lodash._basecallback",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.12.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._basecallback",
-    "raw": "lodash._basecallback@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash.uniq"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._basecallback/-/lodash._basecallback-3.3.1.tgz",
-  "_shasum": "b7b2bb43dc2160424a21ccf26c57e443772a8e27",
-  "_shrinkwrap": null,
-  "_spec": "lodash._basecallback@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash.uniq",
+  "name": "lodash._basecallback",
+  "version": "3.3.1",
+  "description": "The modern build of lodash’s internal `baseCallback` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,46 +37,6 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {
-    "lodash._baseisequal": "^3.0.0",
-    "lodash._bindcallback": "^3.0.0",
-    "lodash.isarray": "^3.0.0",
-    "lodash.pairs": "^3.0.0"
-  },
-  "description": "The modern build of lodash’s internal `baseCallback` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "b7b2bb43dc2160424a21ccf26c57e443772a8e27",
-    "tarball": "http://registry.npmjs.org/lodash._basecallback/-/lodash._basecallback-3.3.1.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    }
-  ],
-  "name": "lodash._basecallback",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lodash/lodash.git"
@@ -114,5 +44,19 @@
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.3.1"
+  "dependencies": {
+    "lodash._baseisequal": "^3.0.0",
+    "lodash._bindcallback": "^3.0.0",
+    "lodash.isarray": "^3.0.0",
+    "lodash.pairs": "^3.0.0"
+  },
+  "readme": "# lodash._basecallback v3.3.1\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseCallback` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash._basecallback\n```\n\nIn Node.js/io.js:\n\n```js\nvar baseCallback = require('lodash._basecallback');\n```\n\nSee the [package source](https://github.com/lodash/lodash/blob/3.3.1-npm-packages/lodash._basecallback) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._basecallback@3.3.1",
+  "_shasum": "b7b2bb43dc2160424a21ccf26c57e443772a8e27",
+  "_resolved": "https://registry.npmjs.org/lodash._basecallback/-/lodash._basecallback-3.3.1.tgz",
+  "_from": "lodash._basecallback@>=3.0.0 <4.0.0"
 }
diff --git a/deps/npm/node_modules/lodash.padleft/LICENSE.txt b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._isiterateecall/LICENSE.txt
similarity index 100%
rename from deps/npm/node_modules/lodash.padleft/LICENSE.txt
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._isiterateecall/LICENSE.txt
diff --git a/deps/npm/node_modules/lodash._isiterateecall/README.md b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._isiterateecall/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash._isiterateecall/README.md
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._isiterateecall/README.md
diff --git a/deps/npm/node_modules/lodash._isiterateecall/index.js b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._isiterateecall/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash._isiterateecall/index.js
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._isiterateecall/index.js
diff --git a/deps/npm/node_modules/lodash._isiterateecall/package.json b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._isiterateecall/package.json
similarity index 50%
rename from deps/npm/node_modules/lodash._isiterateecall/package.json
rename to deps/npm/node_modules/lodash.uniq/node_modules/lodash._isiterateecall/package.json
index 075ad22405f810..233f1f94305f24 100644
--- a/deps/npm/node_modules/lodash._isiterateecall/package.json
+++ b/deps/npm/node_modules/lodash.uniq/node_modules/lodash._isiterateecall/package.json
@@ -1,45 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._isiterateecall@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash.uniq"
-    ]
-  ],
-  "_from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
-  "_id": "lodash._isiterateecall@3.0.9",
-  "_inCache": true,
-  "_location": "/lodash._isiterateecall",
-  "_nodeVersion": "2.0.2",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.10.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._isiterateecall",
-    "raw": "lodash._isiterateecall@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash.uniq"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-  "_shasum": "5203ad7ba425fae842460e696db9cf3e6aac057c",
-  "_shrinkwrap": null,
-  "_spec": "lodash._isiterateecall@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash.uniq",
+  "name": "lodash._isiterateecall",
+  "version": "3.0.9",
+  "description": "The modern build of lodash’s internal `isIterateeCall` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,41 +37,6 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {},
-  "description": "The modern build of lodash’s internal `isIterateeCall` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "5203ad7ba425fae842460e696db9cf3e6aac057c",
-    "tarball": "http://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    }
-  ],
-  "name": "lodash._isiterateecall",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lodash/lodash.git"
@@ -109,5 +44,13 @@
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.0.9"
+  "readme": "# lodash._isiterateecall v3.0.9\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `isIterateeCall` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash._isiterateecall\n```\n\nIn Node.js/io.js:\n\n```js\nvar isIterateeCall = require('lodash._isiterateecall');\n```\n\nSee the [package source](https://github.com/lodash/lodash/blob/3.0.9-npm-packages/lodash._isiterateecall) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._isiterateecall@3.0.9",
+  "_shasum": "5203ad7ba425fae842460e696db9cf3e6aac057c",
+  "_resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+  "_from": "lodash._isiterateecall@>=3.0.0 <4.0.0"
 }
diff --git a/deps/npm/node_modules/lodash.uniq/package.json b/deps/npm/node_modules/lodash.uniq/package.json
index 0e06bfe287aa56..e29a590d959696 100644
--- a/deps/npm/node_modules/lodash.uniq/package.json
+++ b/deps/npm/node_modules/lodash.uniq/package.json
@@ -1,45 +1,21 @@
 {
-  "_args": [
-    [
-      "lodash.uniq@~3.2.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "lodash.uniq@>=3.2.1 <3.3.0",
-  "_id": "lodash.uniq@3.2.2",
-  "_inCache": true,
-  "_location": "/lodash.uniq",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.12.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash.uniq",
-    "raw": "lodash.uniq@~3.2.1",
-    "rawSpec": "~3.2.1",
-    "scope": null,
-    "spec": ">=3.2.1 <3.3.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
+  "name": "lodash.uniq",
+  "version": "3.2.2",
+  "description": "The modern build of lodash’s `_.uniq` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
   ],
-  "_resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-3.2.2.tgz",
-  "_shasum": "146c36f25e75d19501ba402e88ba14937f63cd8b",
-  "_shrinkwrap": null,
-  "_spec": "lodash.uniq@~3.2.1",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,6 +43,13 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
   "dependencies": {
     "lodash._basecallback": "^3.0.0",
     "lodash._baseuniq": "^3.0.0",
@@ -74,22 +57,18 @@
     "lodash._isiterateecall": "^3.0.0",
     "lodash.isarray": "^3.0.0"
   },
-  "description": "The modern build of lodash’s `_.uniq` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "146c36f25e75d19501ba402e88ba14937f63cd8b",
-    "tarball": "http://registry.npmjs.org/lodash.uniq/-/lodash.uniq-3.2.2.tgz"
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash.uniq@3.2.2",
+  "_shasum": "146c36f25e75d19501ba402e88ba14937f63cd8b",
+  "_from": "lodash.uniq@>=3.2.2 <3.3.0",
+  "_npmVersion": "2.12.0",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "name": "jdalton",
+    "email": "john.david.dalton@gmail.com"
   },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
-  ],
-  "license": "MIT",
   "maintainers": [
     {
       "name": "jdalton",
@@ -112,14 +91,11 @@
       "email": "demoneaux@gmail.com"
     }
   ],
-  "name": "lodash.uniq",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lodash/lodash.git"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  "dist": {
+    "shasum": "146c36f25e75d19501ba402e88ba14937f63cd8b",
+    "tarball": "http://registry.npmjs.org/lodash.uniq/-/lodash.uniq-3.2.2.tgz"
   },
-  "version": "3.2.2"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-3.2.2.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/lodash._baseflatten/LICENSE b/deps/npm/node_modules/lodash.without/node_modules/lodash._basedifference/LICENSE
similarity index 100%
rename from deps/npm/node_modules/lodash._baseflatten/LICENSE
rename to deps/npm/node_modules/lodash.without/node_modules/lodash._basedifference/LICENSE
diff --git a/deps/npm/node_modules/lodash._basedifference/README.md b/deps/npm/node_modules/lodash.without/node_modules/lodash._basedifference/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash._basedifference/README.md
rename to deps/npm/node_modules/lodash.without/node_modules/lodash._basedifference/README.md
diff --git a/deps/npm/node_modules/lodash._basedifference/index.js b/deps/npm/node_modules/lodash.without/node_modules/lodash._basedifference/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash._basedifference/index.js
rename to deps/npm/node_modules/lodash.without/node_modules/lodash._basedifference/index.js
diff --git a/deps/npm/node_modules/lodash._basedifference/package.json b/deps/npm/node_modules/lodash.without/node_modules/lodash._basedifference/package.json
similarity index 52%
rename from deps/npm/node_modules/lodash._basedifference/package.json
rename to deps/npm/node_modules/lodash.without/node_modules/lodash._basedifference/package.json
index e44ef4e8fa750c..380d53b289b4e4 100644
--- a/deps/npm/node_modules/lodash._basedifference/package.json
+++ b/deps/npm/node_modules/lodash.without/node_modules/lodash._basedifference/package.json
@@ -1,45 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._basedifference@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash.without"
-    ]
-  ],
-  "_from": "lodash._basedifference@>=3.0.0 <4.0.0",
-  "_id": "lodash._basedifference@3.0.3",
-  "_inCache": true,
-  "_location": "/lodash._basedifference",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.12.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._basedifference",
-    "raw": "lodash._basedifference@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash.without"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-3.0.3.tgz",
-  "_shasum": "f2c204296c2a78e02b389081b6edcac933cf629c",
-  "_shrinkwrap": null,
-  "_spec": "lodash._basedifference@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash.without",
+  "name": "lodash._basedifference",
+  "version": "3.0.3",
+  "description": "The modern build of lodash’s internal `baseDifference` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,45 +37,6 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {
-    "lodash._baseindexof": "^3.0.0",
-    "lodash._cacheindexof": "^3.0.0",
-    "lodash._createcache": "^3.0.0"
-  },
-  "description": "The modern build of lodash’s internal `baseDifference` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "f2c204296c2a78e02b389081b6edcac933cf629c",
-    "tarball": "http://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-3.0.3.tgz"
-  },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jdalton",
-      "email": "john.david.dalton@gmail.com"
-    },
-    {
-      "name": "kitcambridge",
-      "email": "github@kitcambridge.be"
-    },
-    {
-      "name": "mathias",
-      "email": "mathias@qiwi.be"
-    },
-    {
-      "name": "phated",
-      "email": "blaine@iceddev.com"
-    },
-    {
-      "name": "d10",
-      "email": "demoneaux@gmail.com"
-    }
-  ],
-  "name": "lodash._basedifference",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lodash/lodash.git"
@@ -113,5 +44,18 @@
   "scripts": {
     "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
   },
-  "version": "3.0.3"
+  "dependencies": {
+    "lodash._baseindexof": "^3.0.0",
+    "lodash._cacheindexof": "^3.0.0",
+    "lodash._createcache": "^3.0.0"
+  },
+  "readme": "# lodash._basedifference v3.0.3\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash’s](https://lodash.com/) internal `baseDifference` exported as a [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) module.\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash._basedifference\n```\n\nIn Node.js/io.js:\n\n```js\nvar baseDifference = require('lodash._basedifference');\n```\n\nSee the [package source](https://github.com/lodash/lodash/blob/3.0.3-npm-packages/lodash._basedifference) for more details.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._basedifference@3.0.3",
+  "_shasum": "f2c204296c2a78e02b389081b6edcac933cf629c",
+  "_resolved": "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-3.0.3.tgz",
+  "_from": "lodash._basedifference@>=3.0.0 <4.0.0"
 }
diff --git a/deps/npm/node_modules/lodash.without/package.json b/deps/npm/node_modules/lodash.without/package.json
index 3463a8fc9faaaf..9e15bfac021dd0 100644
--- a/deps/npm/node_modules/lodash.without/package.json
+++ b/deps/npm/node_modules/lodash.without/package.json
@@ -1,45 +1,21 @@
 {
-  "_args": [
-    [
-      "lodash.without@~3.2.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "lodash.without@>=3.2.1 <3.3.0",
-  "_id": "lodash.without@3.2.1",
-  "_inCache": true,
-  "_location": "/lodash.without",
-  "_nodeVersion": "0.12.3",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.10.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash.without",
-    "raw": "lodash.without@~3.2.1",
-    "rawSpec": "~3.2.1",
-    "scope": null,
-    "spec": ">=3.2.1 <3.3.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
+  "name": "lodash.without",
+  "version": "3.2.1",
+  "description": "The modern build of lodash’s `_.without` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
   ],
-  "_resolved": "https://registry.npmjs.org/lodash.without/-/lodash.without-3.2.1.tgz",
-  "_shasum": "d69614b3512e52294b6abab782e7ca96538ce816",
-  "_shrinkwrap": null,
-  "_spec": "lodash.without@~3.2.1",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,26 +43,29 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
   "dependencies": {
     "lodash._basedifference": "^3.0.0",
     "lodash.restparam": "^3.0.0"
   },
-  "description": "The modern build of lodash’s `_.without` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "d69614b3512e52294b6abab782e7ca96538ce816",
-    "tarball": "http://registry.npmjs.org/lodash.without/-/lodash.without-3.2.1.tgz"
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash.without@3.2.1",
+  "_shasum": "d69614b3512e52294b6abab782e7ca96538ce816",
+  "_from": "lodash.without@>=3.2.1 <3.3.0",
+  "_npmVersion": "2.10.0",
+  "_nodeVersion": "0.12.3",
+  "_npmUser": {
+    "name": "jdalton",
+    "email": "john.david.dalton@gmail.com"
   },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
-  ],
-  "license": "MIT",
   "maintainers": [
     {
       "name": "jdalton",
@@ -109,14 +88,10 @@
       "email": "demoneaux@gmail.com"
     }
   ],
-  "name": "lodash.without",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lodash/lodash.git"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  "dist": {
+    "shasum": "d69614b3512e52294b6abab782e7ca96538ce816",
+    "tarball": "http://registry.npmjs.org/lodash.without/-/lodash.without-3.2.1.tgz"
   },
-  "version": "3.2.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/lodash.without/-/lodash.without-3.2.1.tgz"
 }
diff --git a/deps/npm/node_modules/lru-cache/package.json b/deps/npm/node_modules/lru-cache/package.json
deleted file mode 100644
index 97472d1fb19cce..00000000000000
--- a/deps/npm/node_modules/lru-cache/package.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "_args": [
-    [
-      "lru-cache@2",
-      "/Users/rebecca/code/npm/node_modules/node-gyp/node_modules/minimatch"
-    ]
-  ],
-  "_from": "lru-cache@>=2.0.0 <3.0.0",
-  "_id": "lru-cache@2.6.5",
-  "_inCache": true,
-  "_location": "/lru-cache",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "3.0.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lru-cache",
-    "raw": "lru-cache@2",
-    "rawSpec": "2",
-    "scope": null,
-    "spec": ">=2.0.0 <3.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/node-gyp/minimatch"
-  ],
-  "_resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz",
-  "_shasum": "e56d6354148ede8d7707b58d143220fd08df0fd5",
-  "_shrinkwrap": null,
-  "_spec": "lru-cache@2",
-  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp/node_modules/minimatch",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter"
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/node-lru-cache/issues"
-  },
-  "dependencies": {},
-  "description": "A cache object that deletes the least-recently-used items.",
-  "devDependencies": {
-    "tap": "^1.2.0",
-    "weak": ""
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "e56d6354148ede8d7707b58d143220fd08df0fd5",
-    "tarball": "http://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
-  },
-  "gitHead": "7062a0c891bfb80a294be9217e4de0f882e75776",
-  "homepage": "https://github.com/isaacs/node-lru-cache#readme",
-  "keywords": [
-    "cache",
-    "lru",
-    "mru"
-  ],
-  "license": "ISC",
-  "main": "lib/lru-cache.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "isaacs@npmjs.com"
-    },
-    {
-      "name": "othiym23",
-      "email": "ogd@aoaioxxysz.net"
-    }
-  ],
-  "name": "lru-cache",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/node-lru-cache.git"
-  },
-  "scripts": {
-    "test": "tap test --gc"
-  },
-  "version": "2.6.5"
-}
diff --git a/deps/npm/node_modules/mime-types/package.json b/deps/npm/node_modules/mime-types/package.json
deleted file mode 100644
index 5cd56a93b42521..00000000000000
--- a/deps/npm/node_modules/mime-types/package.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "_args": [
-    [
-      "mime-types@~2.1.2",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "mime-types@>=2.1.2 <2.2.0",
-  "_id": "mime-types@2.1.7",
-  "_inCache": true,
-  "_location": "/mime-types",
-  "_npmUser": {
-    "email": "doug@somethingdoug.com",
-    "name": "dougwilson"
-  },
-  "_npmVersion": "1.4.28",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "mime-types",
-    "raw": "mime-types@~2.1.2",
-    "rawSpec": "~2.1.2",
-    "scope": null,
-    "spec": ">=2.1.2 <2.2.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/form-data",
-    "/request"
-  ],
-  "_resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
-  "_shasum": "ff603970e3c731ef6f7f4df3c9a0f463a13c2755",
-  "_shrinkwrap": null,
-  "_spec": "mime-types@~2.1.2",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
-  "bugs": {
-    "url": "https://github.com/jshttp/mime-types/issues"
-  },
-  "contributors": [
-    {
-      "name": "Douglas Christopher Wilson",
-      "email": "doug@somethingdoug.com"
-    },
-    {
-      "name": "Jeremiah Senkpiel",
-      "email": "fishrock123@rocketmail.com",
-      "url": "https://searchbeam.jit.su"
-    },
-    {
-      "name": "Jonathan Ong",
-      "email": "me@jongleberry.com",
-      "url": "http://jongleberry.com"
-    }
-  ],
-  "dependencies": {
-    "mime-db": "~1.19.0"
-  },
-  "description": "The ultimate javascript content-type utility.",
-  "devDependencies": {
-    "istanbul": "0.3.20",
-    "mocha": "~1.21.5"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "ff603970e3c731ef6f7f4df3c9a0f463a13c2755",
-    "tarball": "http://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz"
-  },
-  "engines": {
-    "node": ">= 0.6"
-  },
-  "files": [
-    "HISTORY.md",
-    "LICENSE",
-    "index.js"
-  ],
-  "gitHead": "43f860c7df4a70246272194d601348865d550298",
-  "homepage": "https://github.com/jshttp/mime-types",
-  "installable": true,
-  "keywords": [
-    "mime",
-    "types"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jongleberry",
-      "email": "jonathanrichardong@gmail.com"
-    },
-    {
-      "name": "fishrock123",
-      "email": "fishrock123@rocketmail.com"
-    },
-    {
-      "name": "dougwilson",
-      "email": "doug@somethingdoug.com"
-    }
-  ],
-  "name": "mime-types",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/jshttp/mime-types"
-  },
-  "scripts": {
-    "test": "mocha --reporter spec test/test.js",
-    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot test/test.js",
-    "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter dot test/test.js"
-  },
-  "version": "2.1.7"
-}
diff --git a/deps/npm/node_modules/minimatch/package.json b/deps/npm/node_modules/minimatch/package.json
deleted file mode 100644
index 9d97a256b68b14..00000000000000
--- a/deps/npm/node_modules/minimatch/package.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  "_args": [
-    [
-      "minimatch@^2.0.1",
-      "/Users/rebecca/code/npm/node_modules/glob"
-    ]
-  ],
-  "_from": "minimatch@>=2.0.1 <3.0.0",
-  "_id": "minimatch@2.0.10",
-  "_inCache": true,
-  "_location": "/minimatch",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "3.1.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "minimatch",
-    "raw": "minimatch@^2.0.1",
-    "rawSpec": "^2.0.1",
-    "scope": null,
-    "spec": ">=2.0.1 <3.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/fstream-ignore",
-    "/glob"
-  ],
-  "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-  "_shasum": "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7",
-  "_shrinkwrap": null,
-  "_spec": "minimatch@^2.0.1",
-  "_where": "/Users/rebecca/code/npm/node_modules/glob",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me"
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/minimatch/issues"
-  },
-  "dependencies": {
-    "brace-expansion": "^1.0.0"
-  },
-  "description": "a glob matcher in javascript",
-  "devDependencies": {
-    "browserify": "^9.0.3",
-    "standard": "^3.7.2",
-    "tap": "^1.2.0"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7",
-    "tarball": "http://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"
-  },
-  "engines": {
-    "node": "*"
-  },
-  "files": [
-    "browser.js",
-    "minimatch.js"
-  ],
-  "gitHead": "6afb85f0c324b321f76a38df81891e562693e257",
-  "homepage": "https://github.com/isaacs/minimatch#readme",
-  "license": "ISC",
-  "main": "minimatch.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "name": "minimatch",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/minimatch.git"
-  },
-  "scripts": {
-    "posttest": "standard minimatch.js test/*.js",
-    "prepublish": "browserify -o browser.js -e minimatch.js -s minimatch --bare",
-    "test": "tap test/*.js"
-  },
-  "version": "2.0.10"
-}
diff --git a/deps/npm/node_modules/minimist/package.json b/deps/npm/node_modules/minimist/package.json
deleted file mode 100644
index c59b424193c390..00000000000000
--- a/deps/npm/node_modules/minimist/package.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "_args": [
-    [
-      "minimist@0.0.8",
-      "/Users/rebecca/code/npm/node_modules/mkdirp"
-    ]
-  ],
-  "_from": "minimist@0.0.8",
-  "_id": "minimist@0.0.8",
-  "_inCache": true,
-  "_location": "/minimist",
-  "_npmUser": {
-    "email": "mail@substack.net",
-    "name": "substack"
-  },
-  "_npmVersion": "1.4.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "minimist",
-    "raw": "minimist@0.0.8",
-    "rawSpec": "0.0.8",
-    "scope": null,
-    "spec": "0.0.8",
-    "type": "version"
-  },
-  "_requiredBy": [
-    "/mkdirp"
-  ],
-  "_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-  "_shasum": "857fcabfc3397d2625b8228262e86aa7a011b05d",
-  "_shrinkwrap": null,
-  "_spec": "minimist@0.0.8",
-  "_where": "/Users/rebecca/code/npm/node_modules/mkdirp",
-  "author": {
-    "email": "mail@substack.net",
-    "name": "James Halliday",
-    "url": "http://substack.net"
-  },
-  "bugs": {
-    "url": "https://github.com/substack/minimist/issues"
-  },
-  "dependencies": {},
-  "description": "parse argument options",
-  "devDependencies": {
-    "tap": "~0.4.0",
-    "tape": "~1.0.4"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "857fcabfc3397d2625b8228262e86aa7a011b05d",
-    "tarball": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-  },
-  "homepage": "https://github.com/substack/minimist",
-  "keywords": [
-    "argv",
-    "getopt",
-    "optimist",
-    "parser"
-  ],
-  "license": "MIT",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "substack",
-      "email": "mail@substack.net"
-    }
-  ],
-  "name": "minimist",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/substack/minimist.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "testling": {
-    "browsers": [
-      "chrome/10",
-      "chrome/latest",
-      "ff/5",
-      "firefox/latest",
-      "ie/6..latest",
-      "opera/12",
-      "safari/5.1",
-      "safari/latest"
-    ],
-    "files": "test/*.js"
-  },
-  "version": "0.0.8"
-}
diff --git a/deps/npm/node_modules/minimist/.travis.yml b/deps/npm/node_modules/mkdirp/node_modules/minimist/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/minimist/.travis.yml
rename to deps/npm/node_modules/mkdirp/node_modules/minimist/.travis.yml
diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/LICENSE b/deps/npm/node_modules/mkdirp/node_modules/minimist/LICENSE
new file mode 100644
index 00000000000000..ee27ba4b4412b0
--- /dev/null
+++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/LICENSE
@@ -0,0 +1,18 @@
+This software is released under the MIT license:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/minimist/example/parse.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/example/parse.js
similarity index 100%
rename from deps/npm/node_modules/minimist/example/parse.js
rename to deps/npm/node_modules/mkdirp/node_modules/minimist/example/parse.js
diff --git a/deps/npm/node_modules/minimist/index.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/index.js
similarity index 100%
rename from deps/npm/node_modules/minimist/index.js
rename to deps/npm/node_modules/mkdirp/node_modules/minimist/index.js
diff --git a/deps/npm/node_modules/mkdirp/node_modules/minimist/package.json b/deps/npm/node_modules/mkdirp/node_modules/minimist/package.json
new file mode 100644
index 00000000000000..ca6e58da3020e6
--- /dev/null
+++ b/deps/npm/node_modules/mkdirp/node_modules/minimist/package.json
@@ -0,0 +1,52 @@
+{
+  "name": "minimist",
+  "version": "0.0.8",
+  "description": "parse argument options",
+  "main": "index.js",
+  "devDependencies": {
+    "tape": "~1.0.4",
+    "tap": "~0.4.0"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "testling": {
+    "files": "test/*.js",
+    "browsers": [
+      "ie/6..latest",
+      "ff/5",
+      "firefox/latest",
+      "chrome/10",
+      "chrome/latest",
+      "safari/5.1",
+      "safari/latest",
+      "opera/12"
+    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/substack/minimist.git"
+  },
+  "homepage": "https://github.com/substack/minimist",
+  "keywords": [
+    "argv",
+    "getopt",
+    "parser",
+    "optimist"
+  ],
+  "author": {
+    "name": "James Halliday",
+    "email": "mail@substack.net",
+    "url": "http://substack.net"
+  },
+  "license": "MIT",
+  "readme": "# minimist\n\nparse argument options\n\nThis module is the guts of optimist's argument parser without all the\nfanciful decoration.\n\n[![browser support](https://ci.testling.com/substack/minimist.png)](http://ci.testling.com/substack/minimist)\n\n[![build status](https://secure.travis-ci.org/substack/minimist.png)](http://travis-ci.org/substack/minimist)\n\n# example\n\n``` js\nvar argv = require('minimist')(process.argv.slice(2));\nconsole.dir(argv);\n```\n\n```\n$ node example/parse.js -a beep -b boop\n{ _: [], a: 'beep', b: 'boop' }\n```\n\n```\n$ node example/parse.js -x 3 -y 4 -n5 -abc --beep=boop foo bar baz\n{ _: [ 'foo', 'bar', 'baz' ],\n  x: 3,\n  y: 4,\n  n: 5,\n  a: true,\n  b: true,\n  c: true,\n  beep: 'boop' }\n```\n\n# methods\n\n``` js\nvar parseArgs = require('minimist')\n```\n\n## var argv = parseArgs(args, opts={})\n\nReturn an argument object `argv` populated with the array arguments from `args`.\n\n`argv._` contains all the arguments that didn't have an option associated with\nthem.\n\nNumeric-looking arguments will be returned as numbers unless `opts.string` or\n`opts.boolean` is set for that argument name.\n\nAny arguments after `'--'` will not be parsed and will end up in `argv._`.\n\noptions can be:\n\n* `opts.string` - a string or array of strings argument names to always treat as\nstrings\n* `opts.boolean` - a string or array of strings to always treat as booleans\n* `opts.alias` - an object mapping string names to strings or arrays of string\nargument names to use as aliases\n* `opts.default` - an object mapping string argument names to default values\n\n# install\n\nWith [npm](https://npmjs.org) do:\n\n```\nnpm install minimist\n```\n\n# license\n\nMIT\n",
+  "readmeFilename": "readme.markdown",
+  "bugs": {
+    "url": "https://github.com/substack/minimist/issues"
+  },
+  "_id": "minimist@0.0.8",
+  "_shasum": "857fcabfc3397d2625b8228262e86aa7a011b05d",
+  "_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+  "_from": "minimist@0.0.8"
+}
diff --git a/deps/npm/node_modules/minimist/readme.markdown b/deps/npm/node_modules/mkdirp/node_modules/minimist/readme.markdown
similarity index 100%
rename from deps/npm/node_modules/minimist/readme.markdown
rename to deps/npm/node_modules/mkdirp/node_modules/minimist/readme.markdown
diff --git a/deps/npm/node_modules/minimist/test/dash.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/dash.js
similarity index 100%
rename from deps/npm/node_modules/minimist/test/dash.js
rename to deps/npm/node_modules/mkdirp/node_modules/minimist/test/dash.js
diff --git a/deps/npm/node_modules/minimist/test/default_bool.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/default_bool.js
similarity index 100%
rename from deps/npm/node_modules/minimist/test/default_bool.js
rename to deps/npm/node_modules/mkdirp/node_modules/minimist/test/default_bool.js
diff --git a/deps/npm/node_modules/minimist/test/dotted.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/dotted.js
similarity index 100%
rename from deps/npm/node_modules/minimist/test/dotted.js
rename to deps/npm/node_modules/mkdirp/node_modules/minimist/test/dotted.js
diff --git a/deps/npm/node_modules/minimist/test/long.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/long.js
similarity index 100%
rename from deps/npm/node_modules/minimist/test/long.js
rename to deps/npm/node_modules/mkdirp/node_modules/minimist/test/long.js
diff --git a/deps/npm/node_modules/minimist/test/parse.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/parse.js
similarity index 100%
rename from deps/npm/node_modules/minimist/test/parse.js
rename to deps/npm/node_modules/mkdirp/node_modules/minimist/test/parse.js
diff --git a/deps/npm/node_modules/minimist/test/parse_modified.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/parse_modified.js
similarity index 100%
rename from deps/npm/node_modules/minimist/test/parse_modified.js
rename to deps/npm/node_modules/mkdirp/node_modules/minimist/test/parse_modified.js
diff --git a/deps/npm/node_modules/minimist/test/short.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/short.js
similarity index 100%
rename from deps/npm/node_modules/minimist/test/short.js
rename to deps/npm/node_modules/mkdirp/node_modules/minimist/test/short.js
diff --git a/deps/npm/node_modules/minimist/test/whitespace.js b/deps/npm/node_modules/mkdirp/node_modules/minimist/test/whitespace.js
similarity index 100%
rename from deps/npm/node_modules/minimist/test/whitespace.js
rename to deps/npm/node_modules/mkdirp/node_modules/minimist/test/whitespace.js
diff --git a/deps/npm/node_modules/mkdirp/package.json b/deps/npm/node_modules/mkdirp/package.json
index 3e5bbaf3d09a33..8f46140d7fc5d3 100644
--- a/deps/npm/node_modules/mkdirp/package.json
+++ b/deps/npm/node_modules/mkdirp/package.json
@@ -1,87 +1,43 @@
 {
-  "_args": [
-    [
-      "mkdirp@~0.5.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "mkdirp@>=0.5.1 <0.6.0",
-  "_id": "mkdirp@0.5.1",
-  "_inCache": true,
-  "_location": "/mkdirp",
-  "_nodeVersion": "2.0.0",
-  "_npmUser": {
-    "email": "substack@gmail.com",
-    "name": "substack"
-  },
-  "_npmVersion": "2.9.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "mkdirp",
-    "raw": "mkdirp@~0.5.1",
-    "rawSpec": "~0.5.1",
-    "scope": null,
-    "spec": ">=0.5.1 <0.6.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/cmd-shim",
-    "/fstream",
-    "/node-gyp",
-    "/npm-registry-client"
-  ],
-  "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-  "_shasum": "30057438eac6cf7f8c4767f38648d6697d75c903",
-  "_shrinkwrap": null,
-  "_spec": "mkdirp@~0.5.1",
-  "_where": "/Users/rebecca/code/npm",
+  "name": "mkdirp",
+  "description": "Recursively mkdir, like `mkdir -p`",
+  "version": "0.5.1",
   "author": {
-    "email": "mail@substack.net",
     "name": "James Halliday",
+    "email": "mail@substack.net",
     "url": "http://substack.net"
   },
-  "bin": {
-    "mkdirp": "bin/cmd.js"
+  "main": "index.js",
+  "keywords": [
+    "mkdir",
+    "directory"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/substack/node-mkdirp.git"
   },
-  "bugs": {
-    "url": "https://github.com/substack/node-mkdirp/issues"
+  "scripts": {
+    "test": "tap test/*.js"
   },
   "dependencies": {
     "minimist": "0.0.8"
   },
-  "description": "Recursively mkdir, like `mkdir -p`",
   "devDependencies": {
-    "mock-fs": "2 >=2.7.0",
-    "tap": "1"
+    "tap": "1",
+    "mock-fs": "2 >=2.7.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "30057438eac6cf7f8c4767f38648d6697d75c903",
-    "tarball": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
+  "bin": {
+    "mkdirp": "bin/cmd.js"
   },
-  "gitHead": "d4eff0f06093aed4f387e88e9fc301cb76beedc7",
-  "homepage": "https://github.com/substack/node-mkdirp#readme",
-  "keywords": [
-    "directory",
-    "mkdir"
-  ],
   "license": "MIT",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "substack",
-      "email": "mail@substack.net"
-    }
-  ],
-  "name": "mkdirp",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/substack/node-mkdirp.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "readme": "# mkdirp\n\nLike `mkdir -p`, but in node.js!\n\n[![build status](https://secure.travis-ci.org/substack/node-mkdirp.png)](http://travis-ci.org/substack/node-mkdirp)\n\n# example\n\n## pow.js\n\n```js\nvar mkdirp = require('mkdirp');\n    \nmkdirp('/tmp/foo/bar/baz', function (err) {\n    if (err) console.error(err)\n    else console.log('pow!')\n});\n```\n\nOutput\n\n```\npow!\n```\n\nAnd now /tmp/foo/bar/baz exists, huzzah!\n\n# methods\n\n```js\nvar mkdirp = require('mkdirp');\n```\n\n## mkdirp(dir, opts, cb)\n\nCreate a new directory and any necessary subdirectories at `dir` with octal\npermission string `opts.mode`. If `opts` is a non-object, it will be treated as\nthe `opts.mode`.\n\nIf `opts.mode` isn't specified, it defaults to `0777 & (~process.umask())`.\n\n`cb(err, made)` fires with the error or the first directory `made`\nthat had to be created, if any.\n\nYou can optionally pass in an alternate `fs` implementation by passing in\n`opts.fs`. Your implementation should have `opts.fs.mkdir(path, mode, cb)` and\n`opts.fs.stat(path, cb)`.\n\n## mkdirp.sync(dir, opts)\n\nSynchronously create a new directory and any necessary subdirectories at `dir`\nwith octal permission string `opts.mode`. If `opts` is a non-object, it will be\ntreated as the `opts.mode`.\n\nIf `opts.mode` isn't specified, it defaults to `0777 & (~process.umask())`.\n\nReturns the first directory that had to be created, if any.\n\nYou can optionally pass in an alternate `fs` implementation by passing in\n`opts.fs`. Your implementation should have `opts.fs.mkdirSync(path, mode)` and\n`opts.fs.statSync(path)`.\n\n# usage\n\nThis package also ships with a `mkdirp` command.\n\n```\nusage: mkdirp [DIR1,DIR2..] {OPTIONS}\n\n  Create each supplied directory including any necessary parent directories that\n  don't yet exist.\n  \n  If the directory already exists, do nothing.\n\nOPTIONS are:\n\n  -m, --mode   If a directory needs to be created, set the mode as an octal\n               permission string.\n\n```\n\n# install\n\nWith [npm](http://npmjs.org) do:\n\n```\nnpm install mkdirp\n```\n\nto get the library, or\n\n```\nnpm install -g mkdirp\n```\n\nto get the command.\n\n# license\n\nMIT\n",
+  "readmeFilename": "readme.markdown",
+  "bugs": {
+    "url": "https://github.com/substack/node-mkdirp/issues"
   },
-  "version": "0.5.1"
+  "homepage": "https://github.com/substack/node-mkdirp#readme",
+  "_id": "mkdirp@0.5.1",
+  "_shasum": "30057438eac6cf7f8c4767f38648d6697d75c903",
+  "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+  "_from": "mkdirp@>=0.5.1 <0.6.0"
 }
diff --git a/deps/npm/node_modules/ms/package.json b/deps/npm/node_modules/ms/package.json
deleted file mode 100644
index 84a9b7a97a2e89..00000000000000
--- a/deps/npm/node_modules/ms/package.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "_args": [
-    [
-      "ms@0.7.1",
-      "/Users/rebecca/code/npm/node_modules/debug"
-    ]
-  ],
-  "_from": "ms@0.7.1",
-  "_id": "ms@0.7.1",
-  "_inCache": true,
-  "_location": "/ms",
-  "_nodeVersion": "0.12.2",
-  "_npmUser": {
-    "email": "rauchg@gmail.com",
-    "name": "rauchg"
-  },
-  "_npmVersion": "2.7.5",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "ms",
-    "raw": "ms@0.7.1",
-    "rawSpec": "0.7.1",
-    "scope": null,
-    "spec": "0.7.1",
-    "type": "version"
-  },
-  "_requiredBy": [
-    "/debug"
-  ],
-  "_resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-  "_shasum": "9cd13c03adbff25b65effde7ce864ee952017098",
-  "_shrinkwrap": null,
-  "_spec": "ms@0.7.1",
-  "_where": "/Users/rebecca/code/npm/node_modules/debug",
-  "bugs": {
-    "url": "https://github.com/guille/ms.js/issues"
-  },
-  "component": {
-    "scripts": {
-      "ms/index.js": "index.js"
-    }
-  },
-  "dependencies": {},
-  "description": "Tiny ms conversion utility",
-  "devDependencies": {
-    "expect.js": "*",
-    "mocha": "*",
-    "serve": "*"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "9cd13c03adbff25b65effde7ce864ee952017098",
-    "tarball": "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-  },
-  "gitHead": "713dcf26d9e6fd9dbc95affe7eff9783b7f1b909",
-  "homepage": "https://github.com/guille/ms.js",
-  "main": "./index",
-  "maintainers": [
-    {
-      "name": "rauchg",
-      "email": "rauchg@gmail.com"
-    }
-  ],
-  "name": "ms",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/guille/ms.js.git"
-  },
-  "scripts": {},
-  "version": "0.7.1"
-}
diff --git a/deps/npm/node_modules/mute-stream/package.json b/deps/npm/node_modules/mute-stream/package.json
deleted file mode 100644
index 16c475606982a8..00000000000000
--- a/deps/npm/node_modules/mute-stream/package.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  "_args": [
-    [
-      "mute-stream@~0.0.4",
-      "/Users/rebecca/code/npm/node_modules/read"
-    ]
-  ],
-  "_from": "mute-stream@>=0.0.4 <0.1.0",
-  "_id": "mute-stream@0.0.5",
-  "_inCache": true,
-  "_location": "/mute-stream",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "2.10.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "mute-stream",
-    "raw": "mute-stream@~0.0.4",
-    "rawSpec": "~0.0.4",
-    "scope": null,
-    "spec": ">=0.0.4 <0.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/read"
-  ],
-  "_resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
-  "_shasum": "8fbfabb0a98a253d3184331f9e8deb7372fac6c0",
-  "_shrinkwrap": null,
-  "_spec": "mute-stream@~0.0.4",
-  "_where": "/Users/rebecca/code/npm/node_modules/read",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/mute-stream/issues"
-  },
-  "dependencies": {},
-  "description": "Bytes go in, but they don't come out (when muted).",
-  "devDependencies": {
-    "tap": "~0.2.5"
-  },
-  "directories": {
-    "test": "test"
-  },
-  "dist": {
-    "shasum": "8fbfabb0a98a253d3184331f9e8deb7372fac6c0",
-    "tarball": "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
-  },
-  "gitHead": "17d9854a315f56088d039534f87b740e470a9af0",
-  "homepage": "https://github.com/isaacs/mute-stream#readme",
-  "keywords": [
-    "mute",
-    "pipe",
-    "stream"
-  ],
-  "license": "ISC",
-  "main": "mute.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "name": "mute-stream",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/mute-stream.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "0.0.5"
-}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore
new file mode 100644
index 00000000000000..353546af2368e1
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore
@@ -0,0 +1,3 @@
+test
+.gitignore
+.travis.yml
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md
new file mode 100644
index 00000000000000..b0d793ed5d9016
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md
@@ -0,0 +1,122 @@
+# brace-expansion
+
+[Brace expansion](https://www.gnu.org/software/bash/manual/html_node/Brace-Expansion.html),
+as known from sh/bash, in JavaScript.
+
+[![build status](https://secure.travis-ci.org/juliangruber/brace-expansion.svg)](http://travis-ci.org/juliangruber/brace-expansion)
+[![downloads](https://img.shields.io/npm/dm/brace-expansion.svg)](https://www.npmjs.org/package/brace-expansion)
+
+[![testling badge](https://ci.testling.com/juliangruber/brace-expansion.png)](https://ci.testling.com/juliangruber/brace-expansion)
+
+## Example
+
+```js
+var expand = require('brace-expansion');
+
+expand('file-{a,b,c}.jpg')
+// => ['file-a.jpg', 'file-b.jpg', 'file-c.jpg']
+
+expand('-v{,,}')
+// => ['-v', '-v', '-v']
+
+expand('file{0..2}.jpg')
+// => ['file0.jpg', 'file1.jpg', 'file2.jpg']
+
+expand('file-{a..c}.jpg')
+// => ['file-a.jpg', 'file-b.jpg', 'file-c.jpg']
+
+expand('file{2..0}.jpg')
+// => ['file2.jpg', 'file1.jpg', 'file0.jpg']
+
+expand('file{0..4..2}.jpg')
+// => ['file0.jpg', 'file2.jpg', 'file4.jpg']
+
+expand('file-{a..e..2}.jpg')
+// => ['file-a.jpg', 'file-c.jpg', 'file-e.jpg']
+
+expand('file{00..10..5}.jpg')
+// => ['file00.jpg', 'file05.jpg', 'file10.jpg']
+
+expand('{{A..C},{a..c}}')
+// => ['A', 'B', 'C', 'a', 'b', 'c']
+
+expand('ppp{,config,oe{,conf}}')
+// => ['ppp', 'pppconfig', 'pppoe', 'pppoeconf']
+```
+
+## API
+
+```js
+var expand = require('brace-expansion');
+```
+
+### var expanded = expand(str)
+
+Return an array of all possible and valid expansions of `str`. If none are
+found, `[str]` is returned.
+
+Valid expansions are:
+
+```js
+/^(.*,)+(.+)?$/
+// {a,b,...}
+```
+
+A comma seperated list of options, like `{a,b}` or `{a,{b,c}}` or `{,a,}`.
+
+```js
+/^-?\d+\.\.-?\d+(\.\.-?\d+)?$/
+// {x..y[..incr]}
+```
+
+A numeric sequence from `x` to `y` inclusive, with optional increment.
+If `x` or `y` start with a leading `0`, all the numbers will be padded
+to have equal length. Negative numbers and backwards iteration work too.
+
+```js
+/^-?\d+\.\.-?\d+(\.\.-?\d+)?$/
+// {x..y[..incr]}
+```
+
+An alphabetic sequence from `x` to `y` inclusive, with optional increment.
+`x` and `y` must be exactly one character, and if given, `incr` must be a
+number.
+
+For compatibility reasons, the string `${` is not eligible for brace expansion.
+
+## Installation
+
+With [npm](https://npmjs.org) do:
+
+```bash
+npm install brace-expansion
+```
+
+## Contributors
+
+- [Julian Gruber](https://github.com/juliangruber)
+- [Isaac Z. Schlueter](https://github.com/isaacs)
+
+## License
+
+(MIT)
+
+Copyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js
new file mode 100644
index 00000000000000..36cde4de5c114b
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js
@@ -0,0 +1,7 @@
+var expand = require('./');
+
+console.log(expand('http://any.org/archive{1996..1999}/vol{1..4}/part{a,b,c}.html'));
+console.log(expand('http://www.numericals.com/file{1..100..10}.txt'));
+console.log(expand('http://www.letters.com/file{a..z..2}.txt'));
+console.log(expand('mkdir /usr/local/src/bash/{old,new,dist,bugs}'));
+console.log(expand('chown root /usr/{ucb/{ex,edit},lib/{ex?.?*,how_ex}}'));
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js
new file mode 100644
index 00000000000000..f8d40f79acde0a
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js
@@ -0,0 +1,190 @@
+var concatMap = require('concat-map');
+var balanced = require('balanced-match');
+
+module.exports = expandTop;
+
+var escSlash = '\0SLASH'+Math.random()+'\0';
+var escOpen = '\0OPEN'+Math.random()+'\0';
+var escClose = '\0CLOSE'+Math.random()+'\0';
+var escComma = '\0COMMA'+Math.random()+'\0';
+var escPeriod = '\0PERIOD'+Math.random()+'\0';
+
+function numeric(str) {
+  return parseInt(str, 10) == str
+    ? parseInt(str, 10)
+    : str.charCodeAt(0);
+}
+
+function escapeBraces(str) {
+  return str.split('\\\\').join(escSlash)
+            .split('\\{').join(escOpen)
+            .split('\\}').join(escClose)
+            .split('\\,').join(escComma)
+            .split('\\.').join(escPeriod);
+}
+
+function unescapeBraces(str) {
+  return str.split(escSlash).join('\\')
+            .split(escOpen).join('{')
+            .split(escClose).join('}')
+            .split(escComma).join(',')
+            .split(escPeriod).join('.');
+}
+
+
+// Basically just str.split(","), but handling cases
+// where we have nested braced sections, which should be
+// treated as individual members, like {a,{b,c},d}
+function parseCommaParts(str) {
+  if (!str)
+    return [''];
+
+  var parts = [];
+  var m = balanced('{', '}', str);
+
+  if (!m)
+    return str.split(',');
+
+  var pre = m.pre;
+  var body = m.body;
+  var post = m.post;
+  var p = pre.split(',');
+
+  p[p.length-1] += '{' + body + '}';
+  var postParts = parseCommaParts(post);
+  if (post.length) {
+    p[p.length-1] += postParts.shift();
+    p.push.apply(p, postParts);
+  }
+
+  parts.push.apply(parts, p);
+
+  return parts;
+}
+
+function expandTop(str) {
+  if (!str)
+    return [];
+
+  return expand(escapeBraces(str), true).map(unescapeBraces);
+}
+
+function identity(e) {
+  return e;
+}
+
+function embrace(str) {
+  return '{' + str + '}';
+}
+function isPadded(el) {
+  return /^-?0\d/.test(el);
+}
+
+function lte(i, y) {
+  return i <= y;
+}
+function gte(i, y) {
+  return i >= y;
+}
+
+function expand(str, isTop) {
+  var expansions = [];
+
+  var m = balanced('{', '}', str);
+  if (!m || /\$$/.test(m.pre)) return [str];
+
+  var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
+  var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
+  var isSequence = isNumericSequence || isAlphaSequence;
+  var isOptions = /^(.*,)+(.+)?$/.test(m.body);
+  if (!isSequence && !isOptions) {
+    // {a},b}
+    if (m.post.match(/,.*}/)) {
+      str = m.pre + '{' + m.body + escClose + m.post;
+      return expand(str);
+    }
+    return [str];
+  }
+
+  var n;
+  if (isSequence) {
+    n = m.body.split(/\.\./);
+  } else {
+    n = parseCommaParts(m.body);
+    if (n.length === 1) {
+      // x{{a,b}}y ==> x{a}y x{b}y
+      n = expand(n[0], false).map(embrace);
+      if (n.length === 1) {
+        var post = m.post.length
+          ? expand(m.post, false)
+          : [''];
+        return post.map(function(p) {
+          return m.pre + n[0] + p;
+        });
+      }
+    }
+  }
+
+  // at this point, n is the parts, and we know it's not a comma set
+  // with a single entry.
+
+  // no need to expand pre, since it is guaranteed to be free of brace-sets
+  var pre = m.pre;
+  var post = m.post.length
+    ? expand(m.post, false)
+    : [''];
+
+  var N;
+
+  if (isSequence) {
+    var x = numeric(n[0]);
+    var y = numeric(n[1]);
+    var width = Math.max(n[0].length, n[1].length)
+    var incr = n.length == 3
+      ? Math.abs(numeric(n[2]))
+      : 1;
+    var test = lte;
+    var reverse = y < x;
+    if (reverse) {
+      incr *= -1;
+      test = gte;
+    }
+    var pad = n.some(isPadded);
+
+    N = [];
+
+    for (var i = x; test(i, y); i += incr) {
+      var c;
+      if (isAlphaSequence) {
+        c = String.fromCharCode(i);
+        if (c === '\\')
+          c = '';
+      } else {
+        c = String(i);
+        if (pad) {
+          var need = width - c.length;
+          if (need > 0) {
+            var z = new Array(need + 1).join('0');
+            if (i < 0)
+              c = '-' + z + c.slice(1);
+            else
+              c = z + c;
+          }
+        }
+      }
+      N.push(c);
+    }
+  } else {
+    N = concatMap(n, function(el) { return expand(el, false) });
+  }
+
+  for (var j = 0; j < N.length; j++) {
+    for (var k = 0; k < post.length; k++) {
+      var expansion = pre + N[j] + post[k];
+      if (!isTop || isSequence || expansion)
+        expansions.push(expansion);
+    }
+  }
+
+  return expansions;
+}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore
new file mode 100644
index 00000000000000..fd4f2b066b339e
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore
@@ -0,0 +1,2 @@
+node_modules
+.DS_Store
diff --git a/deps/npm/node_modules/typedarray/.travis.yml b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/typedarray/.travis.yml
rename to deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
new file mode 100644
index 00000000000000..dd2730cfde0cab
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
@@ -0,0 +1,5 @@
+
+test:
+	@node_modules/.bin/tape test/*.js
+
+.PHONY: test
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
new file mode 100644
index 00000000000000..2aff0ebff4403e
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
@@ -0,0 +1,80 @@
+# balanced-match
+
+Match balanced string pairs, like `{` and `}` or `<b>` and `</b>`.
+
+[![build status](https://secure.travis-ci.org/juliangruber/balanced-match.svg)](http://travis-ci.org/juliangruber/balanced-match)
+[![downloads](https://img.shields.io/npm/dm/balanced-match.svg)](https://www.npmjs.org/package/balanced-match)
+
+[![testling badge](https://ci.testling.com/juliangruber/balanced-match.png)](https://ci.testling.com/juliangruber/balanced-match)
+
+## Example
+
+Get the first matching pair of braces:
+
+```js
+var balanced = require('balanced-match');
+
+console.log(balanced('{', '}', 'pre{in{nested}}post'));
+console.log(balanced('{', '}', 'pre{first}between{second}post'));
+```
+
+The matches are:
+
+```bash
+$ node example.js
+{ start: 3, end: 14, pre: 'pre', body: 'in{nested}', post: 'post' }
+{ start: 3,
+  end: 9,
+  pre: 'pre',
+  body: 'first',
+  post: 'between{second}post' }
+```
+
+## API
+
+### var m = balanced(a, b, str)
+
+For the first non-nested matching pair of `a` and `b` in `str`, return an
+object with those keys:
+
+* **start** the index of the first match of `a`
+* **end** the index of the matching `b`
+* **pre** the preamble, `a` and `b` not included
+* **body** the match, `a` and `b` not included
+* **post** the postscript, `a` and `b` not included
+
+If there's no match, `undefined` will be returned.
+
+If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `['{', 'a', '']`.
+
+## Installation
+
+With [npm](https://npmjs.org) do:
+
+```bash
+npm install balanced-match
+```
+
+## License
+
+(MIT)
+
+Copyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
new file mode 100644
index 00000000000000..9ce76f480a4321
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
@@ -0,0 +1,4 @@
+var balanced = require('./');
+
+console.log(balanced('{', '}', 'pre{in{nested}}post'));
+console.log(balanced('{', '}', 'pre{first}between{second}post'));
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
new file mode 100644
index 00000000000000..d165ae8174ca82
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
@@ -0,0 +1,38 @@
+module.exports = balanced;
+function balanced(a, b, str) {
+  var bal = 0;
+  var m = {};
+  var ended = false;
+
+  for (var i = 0; i < str.length; i++) {
+    if (a == str.substr(i, a.length)) {
+      if (!('start' in m)) m.start = i;
+      bal++;
+    }
+    else if (b == str.substr(i, b.length) && 'start' in m) {
+      ended = true;
+      bal--;
+      if (!bal) {
+        m.end = i;
+        m.pre = str.substr(0, m.start);
+        m.body = (m.end - m.start > 1)
+          ? str.substring(m.start + a.length, m.end)
+          : '';
+        m.post = str.slice(m.end + b.length);
+        return m;
+      }
+    }
+  }
+
+  // if we opened more than we closed, find the one we closed
+  if (bal && ended) {
+    var start = m.start + a.length;
+    m = balanced(a, b, str.substr(start));
+    if (m) {
+      m.start += start;
+      m.end += start;
+      m.pre = str.slice(0, start) + m.pre;
+    }
+    return m;
+  }
+}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
new file mode 100644
index 00000000000000..35332a3c4eb366
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
@@ -0,0 +1,56 @@
+{
+  "name": "balanced-match",
+  "description": "Match balanced character pairs, like \"{\" and \"}\"",
+  "version": "0.2.0",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/juliangruber/balanced-match.git"
+  },
+  "homepage": "https://github.com/juliangruber/balanced-match",
+  "main": "index.js",
+  "scripts": {
+    "test": "make test"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "tape": "~1.1.1"
+  },
+  "keywords": [
+    "match",
+    "regexp",
+    "test",
+    "balanced",
+    "parse"
+  ],
+  "author": {
+    "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
+    "url": "http://juliangruber.com"
+  },
+  "license": "MIT",
+  "testling": {
+    "files": "test/*.js",
+    "browsers": [
+      "ie/8..latest",
+      "firefox/20..latest",
+      "firefox/nightly",
+      "chrome/25..latest",
+      "chrome/canary",
+      "opera/12..latest",
+      "opera/next",
+      "safari/5.1..latest",
+      "ipad/6.0..latest",
+      "iphone/6.0..latest",
+      "android-browser/4.2..latest"
+    ]
+  },
+  "readme": "# balanced-match\n\nMatch balanced string pairs, like `{` and `}` or `<b>` and `</b>`.\n\n[![build status](https://secure.travis-ci.org/juliangruber/balanced-match.svg)](http://travis-ci.org/juliangruber/balanced-match)\n[![downloads](https://img.shields.io/npm/dm/balanced-match.svg)](https://www.npmjs.org/package/balanced-match)\n\n[![testling badge](https://ci.testling.com/juliangruber/balanced-match.png)](https://ci.testling.com/juliangruber/balanced-match)\n\n## Example\n\nGet the first matching pair of braces:\n\n```js\nvar balanced = require('balanced-match');\n\nconsole.log(balanced('{', '}', 'pre{in{nested}}post'));\nconsole.log(balanced('{', '}', 'pre{first}between{second}post'));\n```\n\nThe matches are:\n\n```bash\n$ node example.js\n{ start: 3, end: 14, pre: 'pre', body: 'in{nested}', post: 'post' }\n{ start: 3,\n  end: 9,\n  pre: 'pre',\n  body: 'first',\n  post: 'between{second}post' }\n```\n\n## API\n\n### var m = balanced(a, b, str)\n\nFor the first non-nested matching pair of `a` and `b` in `str`, return an\nobject with those keys:\n\n* **start** the index of the first match of `a`\n* **end** the index of the matching `b`\n* **pre** the preamble, `a` and `b` not included\n* **body** the match, `a` and `b` not included\n* **post** the postscript, `a` and `b` not included\n\nIf there's no match, `undefined` will be returned.\n\nIf the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `['{', 'a', '']`.\n\n## Installation\n\nWith [npm](https://npmjs.org) do:\n\n```bash\nnpm install balanced-match\n```\n\n## License\n\n(MIT)\n\nCopyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the \"Software\"), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\nof the Software, and to permit persons to whom the Software is furnished to do\nso, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/juliangruber/balanced-match/issues"
+  },
+  "_id": "balanced-match@0.2.0",
+  "_shasum": "38f6730c03aab6d5edbb52bd934885e756d71674",
+  "_resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz",
+  "_from": "balanced-match@>=0.2.0 <0.3.0"
+}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js
new file mode 100644
index 00000000000000..36bfd39954850d
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js
@@ -0,0 +1,56 @@
+var test = require('tape');
+var balanced = require('..');
+
+test('balanced', function(t) {
+  t.deepEqual(balanced('{', '}', 'pre{in{nest}}post'), {
+    start: 3,
+    end: 12,
+    pre: 'pre',
+    body: 'in{nest}',
+    post: 'post'
+  });
+  t.deepEqual(balanced('{', '}', '{{{{{{{{{in}post'), {
+    start: 8,
+    end: 11,
+    pre: '{{{{{{{{',
+    body: 'in',
+    post: 'post'
+  });
+  t.deepEqual(balanced('{', '}', 'pre{body{in}post'), {
+    start: 8,
+    end: 11,
+    pre: 'pre{body',
+    body: 'in',
+    post: 'post'
+  });
+  t.deepEqual(balanced('{', '}', 'pre}{in{nest}}post'), {
+    start: 4,
+    end: 13,
+    pre: 'pre}',
+    body: 'in{nest}',
+    post: 'post'
+  });
+  t.deepEqual(balanced('{', '}', 'pre{body}between{body2}post'), {
+    start: 3,
+    end: 8,
+    pre: 'pre',
+    body: 'body',
+    post: 'between{body2}post'
+  });
+  t.notOk(balanced('{', '}', 'nope'), 'should be notOk');
+  t.deepEqual(balanced('<b>', '</b>', 'pre<b>in<b>nest</b></b>post'), {
+    start: 3,
+    end: 19,
+    pre: 'pre',
+    body: 'in<b>nest</b>',
+    post: 'post'
+  });
+  t.deepEqual(balanced('<b>', '</b>', 'pre</b><b>in<b>nest</b></b>post'), {
+    start: 7,
+    end: 23,
+    pre: 'pre</b>',
+    body: 'in<b>nest</b>',
+    post: 'post'
+  });
+  t.end();
+});
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml
new file mode 100644
index 00000000000000..f1d0f13c8a54d0
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml
@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - 0.4
+  - 0.6
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE
new file mode 100644
index 00000000000000..ee27ba4b4412b0
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE
@@ -0,0 +1,18 @@
+This software is released under the MIT license:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
new file mode 100644
index 00000000000000..408f70a1be473c
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
@@ -0,0 +1,62 @@
+concat-map
+==========
+
+Concatenative mapdashery.
+
+[![browser support](http://ci.testling.com/substack/node-concat-map.png)](http://ci.testling.com/substack/node-concat-map)
+
+[![build status](https://secure.travis-ci.org/substack/node-concat-map.png)](http://travis-ci.org/substack/node-concat-map)
+
+example
+=======
+
+``` js
+var concatMap = require('concat-map');
+var xs = [ 1, 2, 3, 4, 5, 6 ];
+var ys = concatMap(xs, function (x) {
+    return x % 2 ? [ x - 0.1, x, x + 0.1 ] : [];
+});
+console.dir(ys);
+```
+
+***
+
+```
+[ 0.9, 1, 1.1, 2.9, 3, 3.1, 4.9, 5, 5.1 ]
+```
+
+methods
+=======
+
+``` js
+var concatMap = require('concat-map')
+```
+
+concatMap(xs, fn)
+-----------------
+
+Return an array of concatenated elements by calling `fn(x, i)` for each element
+`x` and each index `i` in the array `xs`.
+
+When `fn(x, i)` returns an array, its result will be concatenated with the
+result array. If `fn(x, i)` returns anything else, that value will be pushed
+onto the end of the result array.
+
+install
+=======
+
+With [npm](http://npmjs.org) do:
+
+```
+npm install concat-map
+```
+
+license
+=======
+
+MIT
+
+notes
+=====
+
+This module was written while sitting high above the ground in a tree.
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js
new file mode 100644
index 00000000000000..33656217b61d8f
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js
@@ -0,0 +1,6 @@
+var concatMap = require('../');
+var xs = [ 1, 2, 3, 4, 5, 6 ];
+var ys = concatMap(xs, function (x) {
+    return x % 2 ? [ x - 0.1, x, x + 0.1 ] : [];
+});
+console.dir(ys);
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
new file mode 100644
index 00000000000000..b29a7812e5055a
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
@@ -0,0 +1,13 @@
+module.exports = function (xs, fn) {
+    var res = [];
+    for (var i = 0; i < xs.length; i++) {
+        var x = fn(xs[i], i);
+        if (isArray(x)) res.push.apply(res, x);
+        else res.push(x);
+    }
+    return res;
+};
+
+var isArray = Array.isArray || function (xs) {
+    return Object.prototype.toString.call(xs) === '[object Array]';
+};
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
new file mode 100644
index 00000000000000..b516138098fba9
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
@@ -0,0 +1,83 @@
+{
+  "name": "concat-map",
+  "description": "concatenative mapdashery",
+  "version": "0.0.1",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/substack/node-concat-map.git"
+  },
+  "main": "index.js",
+  "keywords": [
+    "concat",
+    "concatMap",
+    "map",
+    "functional",
+    "higher-order"
+  ],
+  "directories": {
+    "example": "example",
+    "test": "test"
+  },
+  "scripts": {
+    "test": "tape test/*.js"
+  },
+  "devDependencies": {
+    "tape": "~2.4.0"
+  },
+  "license": "MIT",
+  "author": {
+    "name": "James Halliday",
+    "email": "mail@substack.net",
+    "url": "http://substack.net"
+  },
+  "testling": {
+    "files": "test/*.js",
+    "browsers": {
+      "ie": [
+        6,
+        7,
+        8,
+        9
+      ],
+      "ff": [
+        3.5,
+        10,
+        15
+      ],
+      "chrome": [
+        10,
+        22
+      ],
+      "safari": [
+        5.1
+      ],
+      "opera": [
+        12
+      ]
+    }
+  },
+  "bugs": {
+    "url": "https://github.com/substack/node-concat-map/issues"
+  },
+  "homepage": "https://github.com/substack/node-concat-map",
+  "_id": "concat-map@0.0.1",
+  "dist": {
+    "shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
+    "tarball": "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+  },
+  "_from": "concat-map@0.0.1",
+  "_npmVersion": "1.3.21",
+  "_npmUser": {
+    "name": "substack",
+    "email": "mail@substack.net"
+  },
+  "maintainers": [
+    {
+      "name": "substack",
+      "email": "mail@substack.net"
+    }
+  ],
+  "_shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
+  "_resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+  "readme": "ERROR: No README data found!"
+}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
new file mode 100644
index 00000000000000..fdbd7022f6da17
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
@@ -0,0 +1,39 @@
+var concatMap = require('../');
+var test = require('tape');
+
+test('empty or not', function (t) {
+    var xs = [ 1, 2, 3, 4, 5, 6 ];
+    var ixes = [];
+    var ys = concatMap(xs, function (x, ix) {
+        ixes.push(ix);
+        return x % 2 ? [ x - 0.1, x, x + 0.1 ] : [];
+    });
+    t.same(ys, [ 0.9, 1, 1.1, 2.9, 3, 3.1, 4.9, 5, 5.1 ]);
+    t.same(ixes, [ 0, 1, 2, 3, 4, 5 ]);
+    t.end();
+});
+
+test('always something', function (t) {
+    var xs = [ 'a', 'b', 'c', 'd' ];
+    var ys = concatMap(xs, function (x) {
+        return x === 'b' ? [ 'B', 'B', 'B' ] : [ x ];
+    });
+    t.same(ys, [ 'a', 'B', 'B', 'B', 'c', 'd' ]);
+    t.end();
+});
+
+test('scalars', function (t) {
+    var xs = [ 'a', 'b', 'c', 'd' ];
+    var ys = concatMap(xs, function (x) {
+        return x === 'b' ? [ 'B', 'B', 'B' ] : x;
+    });
+    t.same(ys, [ 'a', 'B', 'B', 'B', 'c', 'd' ]);
+    t.end();
+});
+
+test('undefs', function (t) {
+    var xs = [ 'a', 'b', 'c', 'd' ];
+    var ys = concatMap(xs, function () {});
+    t.same(ys, [ undefined, undefined, undefined, undefined ]);
+    t.end();
+});
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
new file mode 100644
index 00000000000000..4cb3e05d7ceb6c
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
@@ -0,0 +1,75 @@
+{
+  "name": "brace-expansion",
+  "description": "Brace expansion as known from sh/bash",
+  "version": "1.1.1",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/juliangruber/brace-expansion.git"
+  },
+  "homepage": "https://github.com/juliangruber/brace-expansion",
+  "main": "index.js",
+  "scripts": {
+    "test": "tape test/*.js",
+    "gentest": "bash test/generate.sh"
+  },
+  "dependencies": {
+    "balanced-match": "^0.2.0",
+    "concat-map": "0.0.1"
+  },
+  "devDependencies": {
+    "tape": "^3.0.3"
+  },
+  "keywords": [],
+  "author": {
+    "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
+    "url": "http://juliangruber.com"
+  },
+  "license": "MIT",
+  "testling": {
+    "files": "test/*.js",
+    "browsers": [
+      "ie/8..latest",
+      "firefox/20..latest",
+      "firefox/nightly",
+      "chrome/25..latest",
+      "chrome/canary",
+      "opera/12..latest",
+      "opera/next",
+      "safari/5.1..latest",
+      "ipad/6.0..latest",
+      "iphone/6.0..latest",
+      "android-browser/4.2..latest"
+    ]
+  },
+  "gitHead": "f50da498166d76ea570cf3b30179f01f0f119612",
+  "bugs": {
+    "url": "https://github.com/juliangruber/brace-expansion/issues"
+  },
+  "_id": "brace-expansion@1.1.1",
+  "_shasum": "da5fb78aef4c44c9e4acf525064fb3208ebab045",
+  "_from": "brace-expansion@>=1.0.0 <2.0.0",
+  "_npmVersion": "2.6.1",
+  "_nodeVersion": "0.10.36",
+  "_npmUser": {
+    "name": "juliangruber",
+    "email": "julian@juliangruber.com"
+  },
+  "maintainers": [
+    {
+      "name": "juliangruber",
+      "email": "julian@juliangruber.com"
+    },
+    {
+      "name": "isaacs",
+      "email": "isaacs@npmjs.com"
+    }
+  ],
+  "dist": {
+    "shasum": "da5fb78aef4c44c9e4acf525064fb3208ebab045",
+    "tarball": "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz"
+  },
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz",
+  "readme": "ERROR: No README data found!"
+}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/package.json b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/package.json
index 17ccc275e3c004..e9256630aa3819 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/package.json
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/package.json
@@ -1,88 +1,46 @@
 {
-  "_args": [
-    [
-      "minimatch@^2.0.1",
-      "/Users/rebecca/code/npm/node_modules/glob"
-    ],
-    [
-      "minimatch@^2.0.1",
-      "/Users/rebecca/code/npm/node_modules/node-gyp/node_modules/glob"
-    ]
-  ],
-  "_from": "minimatch@>=2.0.1 <3.0.0",
-  "_id": "minimatch@2.0.10",
-  "_inCache": true,
-  "_location": "/node-gyp/glob/minimatch",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "3.1.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "minimatch",
-    "raw": "minimatch@^2.0.1",
-    "rawSpec": "^2.0.1",
-    "scope": null,
-    "spec": ">=2.0.1 <3.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/node-gyp/glob"
-  ],
-  "_shrinkwrap": null,
-  "_spec": "minimatch@^2.0.1",
-  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp/node_modules/glob",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/minimatch/issues"
+  "name": "minimatch",
+  "description": "a glob matcher in javascript",
+  "version": "2.0.10",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/minimatch.git"
+  },
+  "main": "minimatch.js",
+  "scripts": {
+    "posttest": "standard minimatch.js test/*.js",
+    "test": "tap test/*.js",
+    "prepublish": "browserify -o browser.js -e minimatch.js -s minimatch --bare"
+  },
+  "engines": {
+    "node": "*"
   },
   "dependencies": {
     "brace-expansion": "^1.0.0"
   },
-  "description": "a glob matcher in javascript",
   "devDependencies": {
     "browserify": "^9.0.3",
     "standard": "^3.7.2",
     "tap": "^1.2.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7",
-    "tarball": "http://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"
-  },
-  "engines": {
-    "node": "*"
-  },
-  "files": [
-    "browser.js",
-    "minimatch.js"
-  ],
-  "gitHead": "6afb85f0c324b321f76a38df81891e562693e257",
-  "homepage": "https://github.com/isaacs/minimatch#readme",
   "license": "ISC",
-  "main": "minimatch.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
+  "files": [
+    "minimatch.js",
+    "browser.js"
   ],
-  "name": "minimatch",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/minimatch.git"
-  },
-  "scripts": {
-    "posttest": "standard minimatch.js test/*.js",
-    "prepublish": "browserify -o browser.js -e minimatch.js -s minimatch --bare",
-    "test": "tap test/*.js"
+  "readme": "# minimatch\n\nA minimal matching utility.\n\n[![Build Status](https://secure.travis-ci.org/isaacs/minimatch.png)](http://travis-ci.org/isaacs/minimatch)\n\n\nThis is the matching library used internally by npm.\n\nIt works by converting glob expressions into JavaScript `RegExp`\nobjects.\n\n## Usage\n\n```javascript\nvar minimatch = require(\"minimatch\")\n\nminimatch(\"bar.foo\", \"*.foo\") // true!\nminimatch(\"bar.foo\", \"*.bar\") // false!\nminimatch(\"bar.foo\", \"*.+(bar|foo)\", { debug: true }) // true, and noisy!\n```\n\n## Features\n\nSupports these glob features:\n\n* Brace Expansion\n* Extended glob matching\n* \"Globstar\" `**` matching\n\nSee:\n\n* `man sh`\n* `man bash`\n* `man 3 fnmatch`\n* `man 5 gitignore`\n\n## Minimatch Class\n\nCreate a minimatch object by instanting the `minimatch.Minimatch` class.\n\n```javascript\nvar Minimatch = require(\"minimatch\").Minimatch\nvar mm = new Minimatch(pattern, options)\n```\n\n### Properties\n\n* `pattern` The original pattern the minimatch object represents.\n* `options` The options supplied to the constructor.\n* `set` A 2-dimensional array of regexp or string expressions.\n  Each row in the\n  array corresponds to a brace-expanded pattern.  Each item in the row\n  corresponds to a single path-part.  For example, the pattern\n  `{a,b/c}/d` would expand to a set of patterns like:\n\n        [ [ a, d ]\n        , [ b, c, d ] ]\n\n    If a portion of the pattern doesn't have any \"magic\" in it\n    (that is, it's something like `\"foo\"` rather than `fo*o?`), then it\n    will be left as a string rather than converted to a regular\n    expression.\n\n* `regexp` Created by the `makeRe` method.  A single regular expression\n  expressing the entire pattern.  This is useful in cases where you wish\n  to use the pattern somewhat like `fnmatch(3)` with `FNM_PATH` enabled.\n* `negate` True if the pattern is negated.\n* `comment` True if the pattern is a comment.\n* `empty` True if the pattern is `\"\"`.\n\n### Methods\n\n* `makeRe` Generate the `regexp` member if necessary, and return it.\n  Will return `false` if the pattern is invalid.\n* `match(fname)` Return true if the filename matches the pattern, or\n  false otherwise.\n* `matchOne(fileArray, patternArray, partial)` Take a `/`-split\n  filename, and match it against a single row in the `regExpSet`.  This\n  method is mainly for internal use, but is exposed so that it can be\n  used by a glob-walker that needs to avoid excessive filesystem calls.\n\nAll other methods are internal, and will be called as necessary.\n\n## Functions\n\nThe top-level exported function has a `cache` property, which is an LRU\ncache set to store 100 items.  So, calling these methods repeatedly\nwith the same pattern and options will use the same Minimatch object,\nsaving the cost of parsing it multiple times.\n\n### minimatch(path, pattern, options)\n\nMain export.  Tests a path against the pattern using the options.\n\n```javascript\nvar isJS = minimatch(file, \"*.js\", { matchBase: true })\n```\n\n### minimatch.filter(pattern, options)\n\nReturns a function that tests its\nsupplied argument, suitable for use with `Array.filter`.  Example:\n\n```javascript\nvar javascripts = fileList.filter(minimatch.filter(\"*.js\", {matchBase: true}))\n```\n\n### minimatch.match(list, pattern, options)\n\nMatch against the list of\nfiles, in the style of fnmatch or glob.  If nothing is matched, and\noptions.nonull is set, then return a list containing the pattern itself.\n\n```javascript\nvar javascripts = minimatch.match(fileList, \"*.js\", {matchBase: true}))\n```\n\n### minimatch.makeRe(pattern, options)\n\nMake a regular expression object from the pattern.\n\n## Options\n\nAll options are `false` by default.\n\n### debug\n\nDump a ton of stuff to stderr.\n\n### nobrace\n\nDo not expand `{a,b}` and `{1..3}` brace sets.\n\n### noglobstar\n\nDisable `**` matching against multiple folder names.\n\n### dot\n\nAllow patterns to match filenames starting with a period, even if\nthe pattern does not explicitly have a period in that spot.\n\nNote that by default, `a/**/b` will **not** match `a/.d/b`, unless `dot`\nis set.\n\n### noext\n\nDisable \"extglob\" style patterns like `+(a|b)`.\n\n### nocase\n\nPerform a case-insensitive match.\n\n### nonull\n\nWhen a match is not found by `minimatch.match`, return a list containing\nthe pattern itself if this option is set.  When not set, an empty list\nis returned if there are no matches.\n\n### matchBase\n\nIf set, then patterns without slashes will be matched\nagainst the basename of the path if it contains slashes.  For example,\n`a?b` would match the path `/xyz/123/acb`, but not `/xyz/acb/123`.\n\n### nocomment\n\nSuppress the behavior of treating `#` at the start of a pattern as a\ncomment.\n\n### nonegate\n\nSuppress the behavior of treating a leading `!` character as negation.\n\n### flipNegate\n\nReturns from negate expressions the same as if they were not negated.\n(Ie, true on a hit, false on a miss.)\n\n\n## Comparisons to other fnmatch/glob implementations\n\nWhile strict compliance with the existing standards is a worthwhile\ngoal, some discrepancies exist between minimatch and other\nimplementations, and are intentional.\n\nIf the pattern starts with a `!` character, then it is negated.  Set the\n`nonegate` flag to suppress this behavior, and treat leading `!`\ncharacters normally.  This is perhaps relevant if you wish to start the\npattern with a negative extglob pattern like `!(a|B)`.  Multiple `!`\ncharacters at the start of a pattern will negate the pattern multiple\ntimes.\n\nIf a pattern starts with `#`, then it is treated as a comment, and\nwill not match anything.  Use `\\#` to match a literal `#` at the\nstart of a line, or set the `nocomment` flag to suppress this behavior.\n\nThe double-star character `**` is supported by default, unless the\n`noglobstar` flag is set.  This is supported in the manner of bsdglob\nand bash 4.1, where `**` only has special significance if it is the only\nthing in a path part.  That is, `a/**/b` will match `a/x/y/b`, but\n`a/**b` will not.\n\nIf an escaped pattern has no matches, and the `nonull` flag is set,\nthen minimatch.match returns the pattern as-provided, rather than\ninterpreting the character escapes.  For example,\n`minimatch.match([], \"\\\\*a\\\\?\")` will return `\"\\\\*a\\\\?\"` rather than\n`\"*a?\"`.  This is akin to setting the `nullglob` option in bash, except\nthat it does not resolve escaped pattern characters.\n\nIf brace expansion is not disabled, then it is performed before any\nother interpretation of the glob pattern.  Thus, a pattern like\n`+(a|{b),c)}`, which would not be valid in bash or zsh, is expanded\n**first** into the set of `+(a|b)` and `+(a|c)`, and those patterns are\nchecked for validity.  Since those two are valid, matching proceeds.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/isaacs/minimatch/issues"
   },
-  "version": "2.0.10"
+  "homepage": "https://github.com/isaacs/minimatch#readme",
+  "_id": "minimatch@2.0.10",
+  "_shasum": "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7",
+  "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+  "_from": "minimatch@>=2.0.1 <3.0.0"
 }
diff --git a/deps/npm/node_modules/node-gyp/node_modules/glob/package.json b/deps/npm/node_modules/node-gyp/node_modules/glob/package.json
index 5e32a7561d6e21..84b72480f8925d 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/glob/package.json
+++ b/deps/npm/node_modules/node-gyp/node_modules/glob/package.json
@@ -1,46 +1,24 @@
 {
-  "_args": [
-    [
-      "glob@3 || 4",
-      "/Users/rebecca/code/npm/node_modules/node-gyp"
-    ]
-  ],
-  "_from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
-  "_id": "glob@4.5.3",
-  "_inCache": true,
-  "_location": "/node-gyp/glob",
-  "_nodeVersion": "1.4.2",
-  "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
-  },
-  "_npmVersion": "2.7.1",
-  "_phantomChildren": {
-    "brace-expansion": "1.1.0"
-  },
-  "_requested": {
-    "name": "glob",
-    "raw": "glob@3 || 4",
-    "rawSpec": "3 || 4",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0||>=4.0.0 <5.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/node-gyp"
-  ],
-  "_resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-  "_shasum": "c6cb73d3226c1efef04de3c56d012f03377ee15f",
-  "_shrinkwrap": null,
-  "_spec": "glob@3 || 4",
-  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/node-glob/issues"
+  "name": "glob",
+  "description": "a little globber",
+  "version": "4.5.3",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/node-glob.git"
+  },
+  "main": "glob.js",
+  "files": [
+    "glob.js",
+    "sync.js",
+    "common.js"
+  ],
+  "engines": {
+    "node": "*"
   },
   "dependencies": {
     "inflight": "^1.0.4",
@@ -48,50 +26,30 @@
     "minimatch": "^2.0.1",
     "once": "^1.3.0"
   },
-  "description": "a little globber",
   "devDependencies": {
     "mkdirp": "0",
     "rimraf": "^2.2.8",
     "tap": "^0.5.0",
     "tick": "0.0.6"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "c6cb73d3226c1efef04de3c56d012f03377ee15f",
-    "tarball": "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz"
-  },
-  "engines": {
-    "node": "*"
-  },
-  "files": [
-    "common.js",
-    "glob.js",
-    "sync.js"
-  ],
-  "gitHead": "a4e461ab59a837eee80a4d8dbdbf5ae1054a646f",
-  "homepage": "https://github.com/isaacs/node-glob",
-  "license": "ISC",
-  "main": "glob.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "name": "glob",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/node-glob.git"
-  },
   "scripts": {
-    "bench": "bash benchmark.sh",
-    "benchclean": "bash benchclean.sh",
     "prepublish": "npm run benchclean",
-    "prof": "bash prof.sh && cat profile.txt",
     "profclean": "rm -f v8.log profile.txt",
     "test": "npm run profclean && tap test/*.js",
-    "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js"
+    "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js",
+    "bench": "bash benchmark.sh",
+    "prof": "bash prof.sh && cat profile.txt",
+    "benchclean": "bash benchclean.sh"
   },
-  "version": "4.5.3"
+  "license": "ISC",
+  "readme": "[![Build Status](https://travis-ci.org/isaacs/node-glob.svg?branch=master)](https://travis-ci.org/isaacs/node-glob/) [![Dependency Status](https://david-dm.org/isaacs/node-glob.svg)](https://david-dm.org/isaacs/node-glob) [![devDependency Status](https://david-dm.org/isaacs/node-glob/dev-status.svg)](https://david-dm.org/isaacs/node-glob#info=devDependencies) [![optionalDependency Status](https://david-dm.org/isaacs/node-glob/optional-status.svg)](https://david-dm.org/isaacs/node-glob#info=optionalDependencies)\n\n# Glob\n\nMatch files using the patterns the shell uses, like stars and stuff.\n\nThis is a glob implementation in JavaScript.  It uses the `minimatch`\nlibrary to do its matching.\n\n![](oh-my-glob.gif)\n\n## Usage\n\n```javascript\nvar glob = require(\"glob\")\n\n// options is optional\nglob(\"**/*.js\", options, function (er, files) {\n  // files is an array of filenames.\n  // If the `nonull` option is set, and nothing\n  // was found, then files is [\"**/*.js\"]\n  // er is an error object or null.\n})\n```\n\n## Glob Primer\n\n\"Globs\" are the patterns you type when you do stuff like `ls *.js` on\nthe command line, or put `build/*` in a `.gitignore` file.\n\nBefore parsing the path part patterns, braced sections are expanded\ninto a set.  Braced sections start with `{` and end with `}`, with any\nnumber of comma-delimited sections within.  Braced sections may contain\nslash characters, so `a{/b/c,bcd}` would expand into `a/b/c` and `abcd`.\n\nThe following characters have special magic meaning when used in a\npath portion:\n\n* `*` Matches 0 or more characters in a single path portion\n* `?` Matches 1 character\n* `[...]` Matches a range of characters, similar to a RegExp range.\n  If the first character of the range is `!` or `^` then it matches\n  any character not in the range.\n* `!(pattern|pattern|pattern)` Matches anything that does not match\n  any of the patterns provided.\n* `?(pattern|pattern|pattern)` Matches zero or one occurrence of the\n  patterns provided.\n* `+(pattern|pattern|pattern)` Matches one or more occurrences of the\n  patterns provided.\n* `*(a|b|c)` Matches zero or more occurrences of the patterns provided\n* `@(pattern|pat*|pat?erN)` Matches exactly one of the patterns\n  provided\n* `**` If a \"globstar\" is alone in a path portion, then it matches\n  zero or more directories and subdirectories searching for matches.\n  It does not crawl symlinked directories.\n\n### Dots\n\nIf a file or directory path portion has a `.` as the first character,\nthen it will not match any glob pattern unless that pattern's\ncorresponding path part also has a `.` as its first character.\n\nFor example, the pattern `a/.*/c` would match the file at `a/.b/c`.\nHowever the pattern `a/*/c` would not, because `*` does not start with\na dot character.\n\nYou can make glob treat dots as normal characters by setting\n`dot:true` in the options.\n\n### Basename Matching\n\nIf you set `matchBase:true` in the options, and the pattern has no\nslashes in it, then it will seek for any file anywhere in the tree\nwith a matching basename.  For example, `*.js` would match\n`test/simple/basic.js`.\n\n### Negation\n\nThe intent for negation would be for a pattern starting with `!` to\nmatch everything that *doesn't* match the supplied pattern.  However,\nthe implementation is weird, and for the time being, this should be\navoided.  The behavior will change or be deprecated in version 5.\n\n### Empty Sets\n\nIf no matching files are found, then an empty array is returned.  This\ndiffers from the shell, where the pattern itself is returned.  For\nexample:\n\n    $ echo a*s*d*f\n    a*s*d*f\n\nTo get the bash-style behavior, set the `nonull:true` in the options.\n\n### See Also:\n\n* `man sh`\n* `man bash` (Search for \"Pattern Matching\")\n* `man 3 fnmatch`\n* `man 5 gitignore`\n* [minimatch documentation](https://github.com/isaacs/minimatch)\n\n## glob.hasMagic(pattern, [options])\n\nReturns `true` if there are any special characters in the pattern, and\n`false` otherwise.\n\nNote that the options affect the results.  If `noext:true` is set in\nthe options object, then `+(a|b)` will not be considered a magic\npattern.  If the pattern has a brace expansion, like `a/{b/c,x/y}`\nthen that is considered magical, unless `nobrace:true` is set in the\noptions.\n\n## glob(pattern, [options], cb)\n\n* `pattern` {String} Pattern to be matched\n* `options` {Object}\n* `cb` {Function}\n  * `err` {Error | null}\n  * `matches` {Array<String>} filenames found matching the pattern\n\nPerform an asynchronous glob search.\n\n## glob.sync(pattern, [options])\n\n* `pattern` {String} Pattern to be matched\n* `options` {Object}\n* return: {Array<String>} filenames found matching the pattern\n\nPerform a synchronous glob search.\n\n## Class: glob.Glob\n\nCreate a Glob object by instantiating the `glob.Glob` class.\n\n```javascript\nvar Glob = require(\"glob\").Glob\nvar mg = new Glob(pattern, options, cb)\n```\n\nIt's an EventEmitter, and starts walking the filesystem to find matches\nimmediately.\n\n### new glob.Glob(pattern, [options], [cb])\n\n* `pattern` {String} pattern to search for\n* `options` {Object}\n* `cb` {Function} Called when an error occurs, or matches are found\n  * `err` {Error | null}\n  * `matches` {Array<String>} filenames found matching the pattern\n\nNote that if the `sync` flag is set in the options, then matches will\nbe immediately available on the `g.found` member.\n\n### Properties\n\n* `minimatch` The minimatch object that the glob uses.\n* `options` The options object passed in.\n* `aborted` Boolean which is set to true when calling `abort()`.  There\n  is no way at this time to continue a glob search after aborting, but\n  you can re-use the statCache to avoid having to duplicate syscalls.\n* `statCache` Collection of all the stat results the glob search\n  performed.\n* `cache` Convenience object.  Each field has the following possible\n  values:\n  * `false` - Path does not exist\n  * `true` - Path exists\n  * `'DIR'` - Path exists, and is not a directory\n  * `'FILE'` - Path exists, and is a directory\n  * `[file, entries, ...]` - Path exists, is a directory, and the\n    array value is the results of `fs.readdir`\n* `statCache` Cache of `fs.stat` results, to prevent statting the same\n  path multiple times.\n* `symlinks` A record of which paths are symbolic links, which is\n  relevant in resolving `**` patterns.\n* `realpathCache` An optional object which is passed to `fs.realpath`\n  to minimize unnecessary syscalls.  It is stored on the instantiated\n  Glob object, and may be re-used.\n\n### Events\n\n* `end` When the matching is finished, this is emitted with all the\n  matches found.  If the `nonull` option is set, and no match was found,\n  then the `matches` list contains the original pattern.  The matches\n  are sorted, unless the `nosort` flag is set.\n* `match` Every time a match is found, this is emitted with the matched.\n* `error` Emitted when an unexpected error is encountered, or whenever\n  any fs error occurs if `options.strict` is set.\n* `abort` When `abort()` is called, this event is raised.\n\n### Methods\n\n* `pause` Temporarily stop the search\n* `resume` Resume the search\n* `abort` Stop the search forever\n\n### Options\n\nAll the options that can be passed to Minimatch can also be passed to\nGlob to change pattern matching behavior.  Also, some have been added,\nor have glob-specific ramifications.\n\nAll options are false by default, unless otherwise noted.\n\nAll options are added to the Glob object, as well.\n\nIf you are running many `glob` operations, you can pass a Glob object\nas the `options` argument to a subsequent operation to shortcut some\n`stat` and `readdir` calls.  At the very least, you may pass in shared\n`symlinks`, `statCache`, `realpathCache`, and `cache` options, so that\nparallel glob operations will be sped up by sharing information about\nthe filesystem.\n\n* `cwd` The current working directory in which to search.  Defaults\n  to `process.cwd()`.\n* `root` The place where patterns starting with `/` will be mounted\n  onto.  Defaults to `path.resolve(options.cwd, \"/\")` (`/` on Unix\n  systems, and `C:\\` or some such on Windows.)\n* `dot` Include `.dot` files in normal matches and `globstar` matches.\n  Note that an explicit dot in a portion of the pattern will always\n  match dot files.\n* `nomount` By default, a pattern starting with a forward-slash will be\n  \"mounted\" onto the root setting, so that a valid filesystem path is\n  returned.  Set this flag to disable that behavior.\n* `mark` Add a `/` character to directory matches.  Note that this\n  requires additional stat calls.\n* `nosort` Don't sort the results.\n* `stat` Set to true to stat *all* results.  This reduces performance\n  somewhat, and is completely unnecessary, unless `readdir` is presumed\n  to be an untrustworthy indicator of file existence.\n* `silent` When an unusual error is encountered when attempting to\n  read a directory, a warning will be printed to stderr.  Set the\n  `silent` option to true to suppress these warnings.\n* `strict` When an unusual error is encountered when attempting to\n  read a directory, the process will just continue on in search of\n  other matches.  Set the `strict` option to raise an error in these\n  cases.\n* `cache` See `cache` property above.  Pass in a previously generated\n  cache object to save some fs calls.\n* `statCache` A cache of results of filesystem information, to prevent\n  unnecessary stat calls.  While it should not normally be necessary\n  to set this, you may pass the statCache from one glob() call to the\n  options object of another, if you know that the filesystem will not\n  change between calls.  (See \"Race Conditions\" below.)\n* `symlinks` A cache of known symbolic links.  You may pass in a\n  previously generated `symlinks` object to save `lstat` calls when\n  resolving `**` matches.\n* `sync` DEPRECATED: use `glob.sync(pattern, opts)` instead.\n* `nounique` In some cases, brace-expanded patterns can result in the\n  same file showing up multiple times in the result set.  By default,\n  this implementation prevents duplicates in the result set.  Set this\n  flag to disable that behavior.\n* `nonull` Set to never return an empty set, instead returning a set\n  containing the pattern itself.  This is the default in glob(3).\n* `debug` Set to enable debug logging in minimatch and glob.\n* `nobrace` Do not expand `{a,b}` and `{1..3}` brace sets.\n* `noglobstar` Do not match `**` against multiple filenames.  (Ie,\n  treat it as a normal `*` instead.)\n* `noext` Do not match `+(a|b)` \"extglob\" patterns.\n* `nocase` Perform a case-insensitive match.  Note: on\n  case-insensitive filesystems, non-magic patterns will match by\n  default, since `stat` and `readdir` will not raise errors.\n* `matchBase` Perform a basename-only match if the pattern does not\n  contain any slash characters.  That is, `*.js` would be treated as\n  equivalent to `**/*.js`, matching all js files in all directories.\n* `nonegate` Suppress `negate` behavior.  (See below.)\n* `nocomment` Suppress `comment` behavior.  (See below.)\n* `nonull` Return the pattern when no matches are found.\n* `nodir` Do not match directories, only files.  (Note: to match\n  *only* directories, simply put a `/` at the end of the pattern.)\n* `ignore` Add a pattern or an array of patterns to exclude matches.\n* `follow` Follow symlinked directories when expanding `**` patterns.\n  Note that this can result in a lot of duplicate references in the\n  presence of cyclic links.\n* `realpath` Set to true to call `fs.realpath` on all of the results.\n  In the case of a symlink that cannot be resolved, the full absolute\n  path to the matched entry is returned (though it will usually be a\n  broken symlink)\n\n## Comparisons to other fnmatch/glob implementations\n\nWhile strict compliance with the existing standards is a worthwhile\ngoal, some discrepancies exist between node-glob and other\nimplementations, and are intentional.\n\nIf the pattern starts with a `!` character, then it is negated.  Set the\n`nonegate` flag to suppress this behavior, and treat leading `!`\ncharacters normally.  This is perhaps relevant if you wish to start the\npattern with a negative extglob pattern like `!(a|B)`.  Multiple `!`\ncharacters at the start of a pattern will negate the pattern multiple\ntimes.\n\nIf a pattern starts with `#`, then it is treated as a comment, and\nwill not match anything.  Use `\\#` to match a literal `#` at the\nstart of a line, or set the `nocomment` flag to suppress this behavior.\n\nThe double-star character `**` is supported by default, unless the\n`noglobstar` flag is set.  This is supported in the manner of bsdglob\nand bash 4.3, where `**` only has special significance if it is the only\nthing in a path part.  That is, `a/**/b` will match `a/x/y/b`, but\n`a/**b` will not.\n\nNote that symlinked directories are not crawled as part of a `**`,\nthough their contents may match against subsequent portions of the\npattern.  This prevents infinite loops and duplicates and the like.\n\nIf an escaped pattern has no matches, and the `nonull` flag is set,\nthen glob returns the pattern as-provided, rather than\ninterpreting the character escapes.  For example,\n`glob.match([], \"\\\\*a\\\\?\")` will return `\"\\\\*a\\\\?\"` rather than\n`\"*a?\"`.  This is akin to setting the `nullglob` option in bash, except\nthat it does not resolve escaped pattern characters.\n\nIf brace expansion is not disabled, then it is performed before any\nother interpretation of the glob pattern.  Thus, a pattern like\n`+(a|{b),c)}`, which would not be valid in bash or zsh, is expanded\n**first** into the set of `+(a|b)` and `+(a|c)`, and those patterns are\nchecked for validity.  Since those two are valid, matching proceeds.\n\n## Windows\n\n**Please only use forward-slashes in glob expressions.**\n\nThough windows uses either `/` or `\\` as its path separator, only `/`\ncharacters are used by this glob implementation.  You must use\nforward-slashes **only** in glob expressions.  Back-slashes will always\nbe interpreted as escape characters, not path separators.\n\nResults from absolute patterns such as `/foo/*` are mounted onto the\nroot setting using `path.join`.  On windows, this will by default result\nin `/foo/*` matching `C:\\foo\\bar.txt`.\n\n## Race Conditions\n\nGlob searching, by its very nature, is susceptible to race conditions,\nsince it relies on directory walking and such.\n\nAs a result, it is possible that a file that exists when glob looks for\nit may have been deleted or modified by the time it returns the result.\n\nAs part of its internal implementation, this program caches all stat\nand readdir calls that it makes, in order to cut down on system\noverhead.  However, this also makes it even more susceptible to races,\nespecially if the cache or statCache objects are reused between glob\ncalls.\n\nUsers are thus advised not to use a glob result as a guarantee of\nfilesystem state in the face of rapid changes.  For the vast majority\nof operations, this is never a problem.\n\n## Contributing\n\nAny change to behavior (including bugfixes) must come with a test.\n\nPatches that fail tests or reduce performance will be rejected.\n\n```\n# to run tests\nnpm test\n\n# to re-generate test fixtures\nnpm run test-regen\n\n# to benchmark against bash/zsh\nnpm run bench\n\n# to profile javascript\nnpm run prof\n```\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/isaacs/node-glob/issues"
+  },
+  "homepage": "https://github.com/isaacs/node-glob#readme",
+  "_id": "glob@4.5.3",
+  "_shasum": "c6cb73d3226c1efef04de3c56d012f03377ee15f",
+  "_resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+  "_from": "glob@>=3.0.0 <4.0.0||>=4.0.0 <5.0.0"
 }
diff --git a/deps/npm/node_modules/lru-cache/.npmignore b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/.npmignore
similarity index 100%
rename from deps/npm/node_modules/lru-cache/.npmignore
rename to deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/.npmignore
diff --git a/deps/npm/node_modules/lru-cache/.travis.yml b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/lru-cache/.travis.yml
rename to deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/.travis.yml
diff --git a/deps/npm/node_modules/lru-cache/CONTRIBUTORS b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/CONTRIBUTORS
similarity index 100%
rename from deps/npm/node_modules/lru-cache/CONTRIBUTORS
rename to deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/CONTRIBUTORS
diff --git a/deps/npm/node_modules/minimatch/LICENSE b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/LICENSE
similarity index 100%
rename from deps/npm/node_modules/minimatch/LICENSE
rename to deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/LICENSE
diff --git a/deps/npm/node_modules/lru-cache/README.md b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/README.md
similarity index 89%
rename from deps/npm/node_modules/lru-cache/README.md
rename to deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/README.md
index a8bba688f7202e..3fd6d0bcae478e 100644
--- a/deps/npm/node_modules/lru-cache/README.md
+++ b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/README.md
@@ -36,7 +36,7 @@ away.
 * `length` Function that is used to calculate the length of stored
   items.  If you're storing strings or buffers, then you probably want
   to do something like `function(n){return n.length}`.  The default is
-  `function(n){return 1}`, which is fine if you want to store `n`
+  `function(n){return 1}`, which is fine if you want to store `max`
   like-sized things.
 * `dispose` Function that is called on items when they are dropped
   from the cache.  This can be handy if you want to close file
@@ -102,8 +102,18 @@ away.
     Return total length of objects in cache taking into account
     `length` options function.
 
-* `itemCount()`
+* `itemCount`
 
     Return total quantity of objects currently in cache. Note, that
     `stale` (see options) items are returned as part of this item
     count.
+
+* `dump()`
+
+    Return an array of the cache entries ready for serialization and usage
+    with 'destinationCache.load(arr)`.
+
+* `load(cacheEntriesArray)`
+
+    Loads another cache entries array, obtained with `sourceCache.dump()`,
+    into the cache. The destination cache is reset before loading new entries
diff --git a/deps/npm/node_modules/lru-cache/lib/lru-cache.js b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/lib/lru-cache.js
similarity index 85%
rename from deps/npm/node_modules/lru-cache/lib/lru-cache.js
rename to deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/lib/lru-cache.js
index d66e7a2382f176..32c2d2d90be150 100644
--- a/deps/npm/node_modules/lru-cache/lib/lru-cache.js
+++ b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/lib/lru-cache.js
@@ -137,10 +137,24 @@ LRUCache.prototype.reset = function () {
   this._itemCount = 0
 }
 
-// Provided for debugging/dev purposes only. No promises whatsoever that
-// this API stays stable.
 LRUCache.prototype.dump = function () {
-  return this._cache
+  var arr = []
+  var i = 0
+
+  for (var k = this._mru - 1; k >= 0 && i < this._itemCount; k--) if (this._lruList[k]) {
+    var hit = this._lruList[k]
+    if (!isStale(this, hit)) {
+      //Do not store staled hits
+      ++i
+      arr.push({
+        k: hit.key,
+        v: hit.value,
+        e: hit.now + (hit.maxAge || 0)
+      });
+    }
+  }
+  //arr has the most read first
+  return arr
 }
 
 LRUCache.prototype.dumpLru = function () {
@@ -150,8 +164,13 @@ LRUCache.prototype.dumpLru = function () {
 LRUCache.prototype.set = function (key, value, maxAge) {
   maxAge = maxAge || this._maxAge
   var now = maxAge ? Date.now() : 0
+  var len = this._lengthCalculator(value)
 
   if (hOP(this._cache, key)) {
+    if (len > this._max) {
+      del(this, this._cache[key])
+      return false
+    }
     // dispose of the old one before overwriting
     if (this._dispose)
       this._dispose(key, this._cache[key].value)
@@ -159,11 +178,16 @@ LRUCache.prototype.set = function (key, value, maxAge) {
     this._cache[key].now = now
     this._cache[key].maxAge = maxAge
     this._cache[key].value = value
+    this._length += (len - this._cache[key].length)
+    this._cache[key].length = len
     this.get(key)
+
+    if (this._length > this._max)
+      trim(this)
+
     return true
   }
 
-  var len = this._lengthCalculator(value)
   var hit = new Entry(key, value, this._mru++, len, now, maxAge)
 
   // oversized objects fall out of cache automatically.
@@ -209,6 +233,26 @@ LRUCache.prototype.del = function (key) {
   del(this, this._cache[key])
 }
 
+LRUCache.prototype.load = function (arr) {
+  //reset the cache
+  this.reset();
+
+  var now = Date.now()
+  //A previous serialized cache has the most recent items first
+  for (var l = arr.length - 1; l >= 0; l-- ) {
+    var hit = arr[l]
+    var expiresAt = hit.e || 0
+    if (expiresAt === 0) {
+      //the item was created without expiration in a non aged cache
+      this.set(hit.k, hit.v)
+    } else {
+      var maxAge = expiresAt - now
+      //dont add already expired items
+      if (maxAge > 0) this.set(hit.k, hit.v, maxAge)
+    }
+  }
+}
+
 function get (self, key, doUse) {
   var hit = self._cache[key]
   if (hit) {
diff --git a/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/package.json b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/package.json
new file mode 100644
index 00000000000000..71a3544fd5a5aa
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/package.json
@@ -0,0 +1,37 @@
+{
+  "name": "lru-cache",
+  "description": "A cache object that deletes the least-recently-used items.",
+  "version": "2.7.0",
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me"
+  },
+  "keywords": [
+    "mru",
+    "lru",
+    "cache"
+  ],
+  "scripts": {
+    "test": "tap test --gc"
+  },
+  "main": "lib/lru-cache.js",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/node-lru-cache.git"
+  },
+  "devDependencies": {
+    "tap": "^1.2.0",
+    "weak": ""
+  },
+  "license": "ISC",
+  "readme": "# lru cache\n\nA cache object that deletes the least-recently-used items.\n\n## Usage:\n\n```javascript\nvar LRU = require(\"lru-cache\")\n  , options = { max: 500\n              , length: function (n) { return n * 2 }\n              , dispose: function (key, n) { n.close() }\n              , maxAge: 1000 * 60 * 60 }\n  , cache = LRU(options)\n  , otherCache = LRU(50) // sets just the max size\n\ncache.set(\"key\", \"value\")\ncache.get(\"key\") // \"value\"\n\ncache.reset()    // empty the cache\n```\n\nIf you put more stuff in it, then items will fall out.\n\nIf you try to put an oversized thing in it, then it'll fall out right\naway.\n\n## Options\n\n* `max` The maximum size of the cache, checked by applying the length\n  function to all values in the cache.  Not setting this is kind of\n  silly, since that's the whole purpose of this lib, but it defaults\n  to `Infinity`.\n* `maxAge` Maximum age in ms.  Items are not pro-actively pruned out\n  as they age, but if you try to get an item that is too old, it'll\n  drop it and return undefined instead of giving it to you.\n* `length` Function that is used to calculate the length of stored\n  items.  If you're storing strings or buffers, then you probably want\n  to do something like `function(n){return n.length}`.  The default is\n  `function(n){return 1}`, which is fine if you want to store `max`\n  like-sized things.\n* `dispose` Function that is called on items when they are dropped\n  from the cache.  This can be handy if you want to close file\n  descriptors or do other cleanup tasks when items are no longer\n  accessible.  Called with `key, value`.  It's called *before*\n  actually removing the item from the internal cache, so if you want\n  to immediately put it back in, you'll have to do that in a\n  `nextTick` or `setTimeout` callback or it won't do anything.\n* `stale` By default, if you set a `maxAge`, it'll only actually pull\n  stale items out of the cache when you `get(key)`.  (That is, it's\n  not pre-emptively doing a `setTimeout` or anything.)  If you set\n  `stale:true`, it'll return the stale value before deleting it.  If\n  you don't set this, then it'll return `undefined` when you try to\n  get a stale entry, as if it had already been deleted.\n\n## API\n\n* `set(key, value, maxAge)`\n* `get(key) => value`\n\n    Both of these will update the \"recently used\"-ness of the key.\n    They do what you think. `max` is optional and overrides the\n    cache `max` option if provided.\n\n* `peek(key)`\n\n    Returns the key value (or `undefined` if not found) without\n    updating the \"recently used\"-ness of the key.\n\n    (If you find yourself using this a lot, you *might* be using the\n    wrong sort of data structure, but there are some use cases where\n    it's handy.)\n\n* `del(key)`\n\n    Deletes a key out of the cache.\n\n* `reset()`\n\n    Clear the cache entirely, throwing away all values.\n\n* `has(key)`\n\n    Check if a key is in the cache, without updating the recent-ness\n    or deleting it for being stale.\n\n* `forEach(function(value,key,cache), [thisp])`\n\n    Just like `Array.prototype.forEach`.  Iterates over all the keys\n    in the cache, in order of recent-ness.  (Ie, more recently used\n    items are iterated over first.)\n\n* `keys()`\n\n    Return an array of the keys in the cache.\n\n* `values()`\n\n    Return an array of the values in the cache.\n\n* `length()`\n\n    Return total length of objects in cache taking into account\n    `length` options function.\n\n* `itemCount`\n\n    Return total quantity of objects currently in cache. Note, that\n    `stale` (see options) items are returned as part of this item\n    count.\n\n* `dump()`\n\n    Return an array of the cache entries ready for serialization and usage\n    with 'destinationCache.load(arr)`.\n\n* `load(cacheEntriesArray)`\n\n    Loads another cache entries array, obtained with `sourceCache.dump()`,\n    into the cache. The destination cache is reset before loading new entries\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/isaacs/node-lru-cache/issues"
+  },
+  "homepage": "https://github.com/isaacs/node-lru-cache#readme",
+  "_id": "lru-cache@2.7.0",
+  "_shasum": "aaa376a4cd970f9cebf5ec1909566ec034f07ee6",
+  "_resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz",
+  "_from": "lru-cache@>=2.0.0 <3.0.0"
+}
diff --git a/deps/npm/node_modules/lru-cache/test/basic.js b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/test/basic.js
similarity index 92%
rename from deps/npm/node_modules/lru-cache/test/basic.js
rename to deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/test/basic.js
index 949113e9ce8bd7..b47225f109891f 100644
--- a/deps/npm/node_modules/lru-cache/test/basic.js
+++ b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/test/basic.js
@@ -93,31 +93,6 @@ test("reset", function (t) {
 })
 
 
-// Note: `<cache>.dump()` is a debugging tool only. No guarantees are made
-// about the format/layout of the response.
-test("dump", function (t) {
-  var cache = new LRU(10)
-  var d = cache.dump();
-  t.equal(Object.keys(d).length, 0, "nothing in dump for empty cache")
-  cache.set("a", "A")
-  var d = cache.dump()  // { a: { key: "a", value: "A", lu: 0 } }
-  t.ok(d.a)
-  t.equal(d.a.key, "a")
-  t.equal(d.a.value, "A")
-  t.equal(d.a.lu, 0)
-
-  cache.set("b", "B")
-  cache.get("b")
-  d = cache.dump()
-  t.ok(d.b)
-  t.equal(d.b.key, "b")
-  t.equal(d.b.value, "B")
-  t.equal(d.b.lu, 2)
-
-  t.end()
-})
-
-
 test("basic with weighed length", function (t) {
   var cache = new LRU({
     max: 100,
@@ -182,6 +157,32 @@ test("lru recently gotten with weighed length", function (t) {
   t.end()
 })
 
+test("lru recently updated with weighed length", function (t) {
+  var cache = new LRU({
+    max: 8,
+    length: function (item) { return item.length }
+  })
+  cache.set("a", "A")
+  cache.set("b", "BB")
+  cache.set("c", "CCC")
+  t.equal(cache.length, 6) //CCC BB A
+  cache.set("a", "+A")
+  t.equal(cache.length, 7) //+A CCC BB
+  cache.set("b", "++BB")
+  t.equal(cache.length, 6) //++BB +A
+  t.equal(cache.get("c"), undefined)
+
+  cache.set("c", "oversized")
+  t.equal(cache.length, 6) //++BB +A
+  t.equal(cache.get("c"), undefined)
+
+  cache.set("a", "oversized")
+  t.equal(cache.length, 4) //++BB
+  t.equal(cache.get("a"), undefined)
+  t.equal(cache.get("b"), "++BB")
+  t.end()
+})
+
 test("set returns proper booleans", function(t) {
   var cache = new LRU({
     max: 5,
diff --git a/deps/npm/node_modules/lru-cache/test/foreach.js b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/test/foreach.js
similarity index 100%
rename from deps/npm/node_modules/lru-cache/test/foreach.js
rename to deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/test/foreach.js
diff --git a/deps/npm/node_modules/lru-cache/test/memory-leak.js b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/test/memory-leak.js
similarity index 100%
rename from deps/npm/node_modules/lru-cache/test/memory-leak.js
rename to deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/test/memory-leak.js
diff --git a/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/test/serialize.js b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/test/serialize.js
new file mode 100644
index 00000000000000..5fe5dc3d371f1e
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/lru-cache/test/serialize.js
@@ -0,0 +1,215 @@
+var test = require('tap').test
+var LRU = require('../')
+
+test('dump', function (t) {
+  var cache = new LRU()
+
+  t.equal(cache.dump().length, 0, "nothing in dump for empty cache")
+
+  cache.set("a", "A")
+  cache.set("b", "B")
+  t.deepEqual(cache.dump(), [
+    { k: "b", v: "B", e: 0 },
+    { k: "a", v: "A", e: 0 }
+  ])
+
+  cache.set("a", "A");
+  t.deepEqual(cache.dump(), [
+    { k: "a", v: "A", e: 0 },
+    { k: "b", v: "B", e: 0 }
+  ])
+
+  cache.get("b");
+  t.deepEqual(cache.dump(), [
+    { k: "b", v: "B", e: 0 },
+    { k: "a", v: "A", e: 0 }
+  ])
+
+  cache.del("a");
+  t.deepEqual(cache.dump(), [
+    { k: "b", v: "B",  e: 0 }
+  ])
+
+  t.end()
+})
+
+test("do not dump stale items", function(t) {
+  var cache = new LRU({
+    max: 5,
+    maxAge: 50
+  })
+
+  //expires at 50
+  cache.set("a", "A")
+
+  setTimeout(function () {
+    //expires at 75
+    cache.set("b", "B")
+    var s = cache.dump()
+    t.equal(s.length, 2)
+    t.equal(s[0].k, "b")
+    t.equal(s[1].k, "a")
+  }, 25)
+
+  setTimeout(function () {
+    //expires at 110
+    cache.set("c", "C")
+    var s = cache.dump()
+    t.equal(s.length, 2)
+    t.equal(s[0].k, "c")
+    t.equal(s[1].k, "b")
+  }, 60)
+
+  setTimeout(function () {
+    //expires at 130
+    cache.set("d", "D", 40)
+    var s = cache.dump()
+    t.equal(s.length, 2)
+    t.equal(s[0].k, "d")
+    t.equal(s[1].k, "c")
+  }, 90)
+
+  setTimeout(function () {
+    var s = cache.dump()
+    t.equal(s.length, 1)
+    t.equal(s[0].k, "d")
+  }, 120)
+
+  setTimeout(function () {
+    var s = cache.dump()
+    t.deepEqual(s, [])
+    t.end()
+  }, 155)
+})
+
+test("load basic cache", function(t) {
+  var cache = new LRU(),
+      copy = new LRU()
+
+  cache.set("a", "A")
+  cache.set("b", "B")
+
+  copy.load(cache.dump())
+  t.deepEquals(cache.dump(), copy.dump())
+
+  t.end()
+})
+
+
+test("load staled cache", function(t) {
+  var cache = new LRU({maxAge: 50}),
+      copy = new LRU({maxAge: 50}),
+      arr
+
+  //expires at 50
+  cache.set("a", "A")
+  setTimeout(function () {
+    //expires at 80
+    cache.set("b", "B")
+    arr = cache.dump()
+    t.equal(arr.length, 2)
+  }, 30)
+
+  setTimeout(function () {
+    copy.load(arr)
+    t.equal(copy.get("a"), undefined)
+    t.equal(copy.get("b"), "B")
+  }, 60)
+
+  setTimeout(function () {
+    t.equal(copy.get("b"), undefined)
+    t.end()
+  }, 90)
+})
+
+test("load to other size cache", function(t) {
+  var cache = new LRU({max: 2}),
+      copy = new LRU({max: 1})
+
+  cache.set("a", "A")
+  cache.set("b", "B")
+
+  copy.load(cache.dump())
+  t.equal(copy.get("a"), undefined)
+  t.equal(copy.get("b"), "B")
+
+  //update the last read from original cache
+  cache.get("a")
+  copy.load(cache.dump())
+  t.equal(copy.get("a"), "A")
+  t.equal(copy.get("b"), undefined)
+
+  t.end()
+})
+
+
+test("load to other age cache", function(t) {
+  var cache = new LRU({maxAge: 50}),
+      aged = new LRU({maxAge: 100}),
+      simple = new LRU(),
+      arr,
+      expired
+
+  //created at 0
+  //a would be valid till 0 + 50
+  cache.set("a", "A")
+  setTimeout(function () {
+    //created at 20
+    //b would be valid till 20 + 50
+    cache.set("b", "B")
+    //b would be valid till 20 + 70
+    cache.set("c", "C", 70)
+    arr = cache.dump()
+    t.equal(arr.length, 3)
+  }, 20)
+
+  setTimeout(function () {
+    t.equal(cache.get("a"), undefined)
+    t.equal(cache.get("b"), "B")
+    t.equal(cache.get("c"), "C")
+
+    aged.load(arr)
+    t.equal(aged.get("a"), undefined)
+    t.equal(aged.get("b"), "B")
+    t.equal(aged.get("c"), "C")
+
+    simple.load(arr)
+    t.equal(simple.get("a"), undefined)
+    t.equal(simple.get("b"), "B")
+    t.equal(simple.get("c"), "C")
+  }, 60)
+
+  setTimeout(function () {
+    t.equal(cache.get("a"), undefined)
+    t.equal(cache.get("b"), undefined)
+    t.equal(cache.get("c"), "C")
+
+    aged.load(arr)
+    t.equal(aged.get("a"), undefined)
+    t.equal(aged.get("b"), undefined)
+    t.equal(aged.get("c"), "C")
+
+    simple.load(arr)
+    t.equal(simple.get("a"), undefined)
+    t.equal(simple.get("b"), undefined)
+    t.equal(simple.get("c"), "C")
+  }, 80)
+
+  setTimeout(function () {
+    t.equal(cache.get("a"), undefined)
+    t.equal(cache.get("b"), undefined)
+    t.equal(cache.get("c"), undefined)
+
+    aged.load(arr)
+    t.equal(aged.get("a"), undefined)
+    t.equal(aged.get("b"), undefined)
+    t.equal(aged.get("c"), undefined)
+
+    simple.load(arr)
+    t.equal(simple.get("a"), undefined)
+    t.equal(simple.get("b"), undefined)
+    t.equal(simple.get("c"), undefined)
+    t.end()
+  }, 100)
+
+})
diff --git a/deps/npm/node_modules/mute-stream/LICENSE b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/LICENSE
similarity index 100%
rename from deps/npm/node_modules/mute-stream/LICENSE
rename to deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/LICENSE
diff --git a/deps/npm/node_modules/sigmund/README.md b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/README.md
similarity index 100%
rename from deps/npm/node_modules/sigmund/README.md
rename to deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/README.md
diff --git a/deps/npm/node_modules/sigmund/bench.js b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/bench.js
similarity index 100%
rename from deps/npm/node_modules/sigmund/bench.js
rename to deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/bench.js
diff --git a/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/package.json b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/package.json
new file mode 100644
index 00000000000000..0432d4e4c55ee5
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/package.json
@@ -0,0 +1,44 @@
+{
+  "name": "sigmund",
+  "version": "1.0.1",
+  "description": "Quick and dirty signatures for Objects.",
+  "main": "sigmund.js",
+  "directories": {
+    "test": "test"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "tap": "~0.3.0"
+  },
+  "scripts": {
+    "test": "tap test/*.js",
+    "bench": "node bench.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/sigmund.git"
+  },
+  "keywords": [
+    "object",
+    "signature",
+    "key",
+    "data",
+    "psychoanalysis"
+  ],
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
+  },
+  "license": "ISC",
+  "readme": "# sigmund\n\nQuick and dirty signatures for Objects.\n\nThis is like a much faster `deepEquals` comparison, which returns a\nstring key suitable for caches and the like.\n\n## Usage\n\n```javascript\nfunction doSomething (someObj) {\n  var key = sigmund(someObj, maxDepth) // max depth defaults to 10\n  var cached = cache.get(key)\n  if (cached) return cached\n\n  var result = expensiveCalculation(someObj)\n  cache.set(key, result)\n  return result\n}\n```\n\nThe resulting key will be as unique and reproducible as calling\n`JSON.stringify` or `util.inspect` on the object, but is much faster.\nIn order to achieve this speed, some differences are glossed over.\nFor example, the object `{0:'foo'}` will be treated identically to the\narray `['foo']`.\n\nAlso, just as there is no way to summon the soul from the scribblings\nof a cocaine-addled psychoanalyst, there is no way to revive the object\nfrom the signature string that sigmund gives you.  In fact, it's\nbarely even readable.\n\nAs with `util.inspect` and `JSON.stringify`, larger objects will\nproduce larger signature strings.\n\nBecause sigmund is a bit less strict than the more thorough\nalternatives, the strings will be shorter, and also there is a\nslightly higher chance for collisions.  For example, these objects\nhave the same signature:\n\n    var obj1 = {a:'b',c:/def/,g:['h','i',{j:'',k:'l'}]}\n    var obj2 = {a:'b',c:'/def/',g:['h','i','{jkl']}\n\nLike a good Freudian, sigmund is most effective when you already have\nsome understanding of what you're looking for.  It can help you help\nyourself, but you must be willing to do some work as well.\n\nCycles are handled, and cyclical objects are silently omitted (though\nthe key is included in the signature output.)\n\nThe second argument is the maximum depth, which defaults to 10,\nbecause that is the maximum object traversal depth covered by most\ninsurance carriers.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/isaacs/sigmund/issues"
+  },
+  "homepage": "https://github.com/isaacs/sigmund#readme",
+  "_id": "sigmund@1.0.1",
+  "_shasum": "3ff21f198cad2175f9f3b781853fd94d0d19b590",
+  "_resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+  "_from": "sigmund@>=1.0.0 <1.1.0"
+}
diff --git a/deps/npm/node_modules/sigmund/sigmund.js b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/sigmund.js
similarity index 100%
rename from deps/npm/node_modules/sigmund/sigmund.js
rename to deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/sigmund.js
diff --git a/deps/npm/node_modules/sigmund/test/basic.js b/deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/test/basic.js
similarity index 100%
rename from deps/npm/node_modules/sigmund/test/basic.js
rename to deps/npm/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/test/basic.js
diff --git a/deps/npm/node_modules/node-gyp/node_modules/minimatch/package.json b/deps/npm/node_modules/node-gyp/node_modules/minimatch/package.json
index 7358ebfad52d1a..8bf46ccae0c4f6 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/minimatch/package.json
+++ b/deps/npm/node_modules/node-gyp/node_modules/minimatch/package.json
@@ -1,81 +1,58 @@
 {
-  "_args": [
-    [
-      "minimatch@1",
-      "/Users/rebecca/code/npm/node_modules/node-gyp"
-    ]
-  ],
-  "_from": "minimatch@>=1.0.0 <2.0.0",
-  "_id": "minimatch@1.0.0",
-  "_inCache": true,
-  "_location": "/node-gyp/minimatch",
-  "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
-  },
-  "_npmVersion": "1.4.21",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "minimatch",
-    "raw": "minimatch@1",
-    "rawSpec": "1",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/node-gyp"
-  ],
-  "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
-  "_shasum": "e0dd2120b49e1b724ce8d714c520822a9438576d",
-  "_shrinkwrap": null,
-  "_spec": "minimatch@1",
-  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/minimatch/issues"
+  "name": "minimatch",
+  "description": "a glob matcher in javascript",
+  "version": "1.0.0",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/minimatch.git"
+  },
+  "main": "minimatch.js",
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "engines": {
+    "node": "*"
   },
   "dependencies": {
     "lru-cache": "2",
     "sigmund": "~1.0.0"
   },
-  "description": "a glob matcher in javascript",
   "devDependencies": {
     "tap": ""
   },
-  "directories": {},
-  "dist": {
-    "shasum": "e0dd2120b49e1b724ce8d714c520822a9438576d",
-    "tarball": "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"
-  },
-  "engines": {
-    "node": "*"
-  },
-  "gitHead": "b374a643976eb55cdc19c60b6dd51ebe9bcc607a",
-  "homepage": "https://github.com/isaacs/minimatch",
   "license": {
     "type": "MIT",
     "url": "http://github.com/isaacs/minimatch/raw/master/LICENSE"
   },
-  "main": "minimatch.js",
+  "gitHead": "b374a643976eb55cdc19c60b6dd51ebe9bcc607a",
+  "bugs": {
+    "url": "https://github.com/isaacs/minimatch/issues"
+  },
+  "homepage": "https://github.com/isaacs/minimatch",
+  "_id": "minimatch@1.0.0",
+  "_shasum": "e0dd2120b49e1b724ce8d714c520822a9438576d",
+  "_from": "minimatch@>=1.0.0 <2.0.0",
+  "_npmVersion": "1.4.21",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "i@izs.me"
+  },
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "name": "minimatch",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/minimatch.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "dist": {
+    "shasum": "e0dd2120b49e1b724ce8d714c520822a9438576d",
+    "tarball": "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"
   },
-  "version": "1.0.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/path-array/.npmignore b/deps/npm/node_modules/node-gyp/node_modules/path-array/.npmignore
similarity index 100%
rename from deps/npm/node_modules/path-array/.npmignore
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/.npmignore
diff --git a/deps/npm/node_modules/path-array/.travis.yml b/deps/npm/node_modules/node-gyp/node_modules/path-array/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/path-array/.travis.yml
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/.travis.yml
diff --git a/deps/npm/node_modules/path-array/History.md b/deps/npm/node_modules/node-gyp/node_modules/path-array/History.md
similarity index 100%
rename from deps/npm/node_modules/path-array/History.md
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/History.md
diff --git a/deps/npm/node_modules/path-array/README.md b/deps/npm/node_modules/node-gyp/node_modules/path-array/README.md
similarity index 100%
rename from deps/npm/node_modules/path-array/README.md
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/README.md
diff --git a/deps/npm/node_modules/path-array/index.js b/deps/npm/node_modules/node-gyp/node_modules/path-array/index.js
similarity index 100%
rename from deps/npm/node_modules/path-array/index.js
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/index.js
diff --git a/deps/npm/node_modules/defaults/.npmignore b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/.npmignore
similarity index 100%
rename from deps/npm/node_modules/defaults/.npmignore
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/.npmignore
diff --git a/deps/npm/node_modules/array-index/.travis.yml b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/array-index/.travis.yml
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/.travis.yml
diff --git a/deps/npm/node_modules/array-index/History.md b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/History.md
similarity index 100%
rename from deps/npm/node_modules/array-index/History.md
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/History.md
diff --git a/deps/npm/node_modules/array-index/Makefile b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/Makefile
similarity index 100%
rename from deps/npm/node_modules/array-index/Makefile
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/Makefile
diff --git a/deps/npm/node_modules/array-index/README.md b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/README.md
similarity index 100%
rename from deps/npm/node_modules/array-index/README.md
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/README.md
diff --git a/deps/npm/node_modules/array-index/component.json b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/component.json
similarity index 100%
rename from deps/npm/node_modules/array-index/component.json
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/component.json
diff --git a/deps/npm/node_modules/array-index/index.js b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/index.js
similarity index 100%
rename from deps/npm/node_modules/array-index/index.js
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/index.js
diff --git a/deps/npm/node_modules/debug/.npmignore b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/.npmignore
similarity index 100%
rename from deps/npm/node_modules/debug/.npmignore
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/.npmignore
diff --git a/deps/npm/node_modules/debug/History.md b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/History.md
similarity index 100%
rename from deps/npm/node_modules/debug/History.md
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/History.md
diff --git a/deps/npm/node_modules/debug/Makefile b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/Makefile
similarity index 100%
rename from deps/npm/node_modules/debug/Makefile
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/Makefile
diff --git a/deps/npm/node_modules/debug/Readme.md b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/Readme.md
similarity index 100%
rename from deps/npm/node_modules/debug/Readme.md
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/Readme.md
diff --git a/deps/npm/node_modules/debug/bower.json b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/bower.json
similarity index 100%
rename from deps/npm/node_modules/debug/bower.json
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/bower.json
diff --git a/deps/npm/node_modules/debug/browser.js b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/browser.js
similarity index 100%
rename from deps/npm/node_modules/debug/browser.js
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/browser.js
diff --git a/deps/npm/node_modules/debug/component.json b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/component.json
similarity index 100%
rename from deps/npm/node_modules/debug/component.json
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/component.json
diff --git a/deps/npm/node_modules/debug/debug.js b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/debug.js
similarity index 100%
rename from deps/npm/node_modules/debug/debug.js
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/debug.js
diff --git a/deps/npm/node_modules/debug/node.js b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node.js
similarity index 100%
rename from deps/npm/node_modules/debug/node.js
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node.js
diff --git a/deps/npm/node_modules/ms/.npmignore b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/.npmignore
similarity index 100%
rename from deps/npm/node_modules/ms/.npmignore
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/.npmignore
diff --git a/deps/npm/node_modules/ms/History.md b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/History.md
similarity index 100%
rename from deps/npm/node_modules/ms/History.md
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/History.md
diff --git a/deps/npm/node_modules/ms/LICENSE b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/LICENSE
similarity index 100%
rename from deps/npm/node_modules/ms/LICENSE
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/LICENSE
diff --git a/deps/npm/node_modules/ms/README.md b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/README.md
similarity index 100%
rename from deps/npm/node_modules/ms/README.md
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/README.md
diff --git a/deps/npm/node_modules/ms/index.js b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/index.js
similarity index 100%
rename from deps/npm/node_modules/ms/index.js
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/index.js
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/package.json b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/package.json
new file mode 100644
index 00000000000000..7b5d86dbbda5e9
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/node_modules/ms/package.json
@@ -0,0 +1,30 @@
+{
+  "name": "ms",
+  "version": "0.7.1",
+  "description": "Tiny ms conversion utility",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/guille/ms.js.git"
+  },
+  "main": "./index",
+  "devDependencies": {
+    "mocha": "*",
+    "expect.js": "*",
+    "serve": "*"
+  },
+  "component": {
+    "scripts": {
+      "ms/index.js": "index.js"
+    }
+  },
+  "readme": "# ms.js: miliseconds conversion utility\n\n```js\nms('2 days')  // 172800000\nms('1d')      // 86400000\nms('10h')     // 36000000\nms('2.5 hrs') // 9000000\nms('2h')      // 7200000\nms('1m')      // 60000\nms('5s')      // 5000\nms('100')     // 100\n```\n\n```js\nms(60000)             // \"1m\"\nms(2 * 60000)         // \"2m\"\nms(ms('10 hours'))    // \"10h\"\n```\n\n```js\nms(60000, { long: true })             // \"1 minute\"\nms(2 * 60000, { long: true })         // \"2 minutes\"\nms(ms('10 hours'), { long: true })    // \"10 hours\"\n```\n\n- Node/Browser compatible. Published as [`ms`](https://www.npmjs.org/package/ms) in [NPM](http://nodejs.org/download).\n- If a number is supplied to `ms`, a string with a unit is returned.\n- If a string that contains the number is supplied, it returns it as\na number (e.g: it returns `100` for `'100'`).\n- If you pass a string with a number and a valid unit, the number of\nequivalent ms is returned.\n\n## License\n\nMIT\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/guille/ms.js/issues"
+  },
+  "homepage": "https://github.com/guille/ms.js#readme",
+  "_id": "ms@0.7.1",
+  "_shasum": "9cd13c03adbff25b65effde7ce864ee952017098",
+  "_resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+  "_from": "ms@0.7.1"
+}
diff --git a/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/package.json b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/package.json
new file mode 100644
index 00000000000000..ebe311fad9ab3a
--- /dev/null
+++ b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/node_modules/debug/package.json
@@ -0,0 +1,51 @@
+{
+  "name": "debug",
+  "version": "2.2.0",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/visionmedia/debug.git"
+  },
+  "description": "small debugging utility",
+  "keywords": [
+    "debug",
+    "log",
+    "debugger"
+  ],
+  "author": {
+    "name": "TJ Holowaychuk",
+    "email": "tj@vision-media.ca"
+  },
+  "contributors": [
+    {
+      "name": "Nathan Rajlich",
+      "email": "nathan@tootallnate.net",
+      "url": "http://n8.io"
+    }
+  ],
+  "license": "MIT",
+  "dependencies": {
+    "ms": "0.7.1"
+  },
+  "devDependencies": {
+    "browserify": "9.0.3",
+    "mocha": "*"
+  },
+  "main": "./node.js",
+  "browser": "./browser.js",
+  "component": {
+    "scripts": {
+      "debug/index.js": "browser.js",
+      "debug/debug.js": "debug.js"
+    }
+  },
+  "readme": "# debug\n\n  tiny node.js debugging utility modelled after node core's debugging technique.\n\n## Installation\n\n```bash\n$ npm install debug\n```\n\n## Usage\n\n With `debug` you simply invoke the exported function to generate your debug function, passing it a name which will determine if a noop function is returned, or a decorated `console.error`, so all of the `console` format string goodies you're used to work fine. A unique color is selected per-function for visibility.\n\nExample _app.js_:\n\n```js\nvar debug = require('debug')('http')\n  , http = require('http')\n  , name = 'My App';\n\n// fake app\n\ndebug('booting %s', name);\n\nhttp.createServer(function(req, res){\n  debug(req.method + ' ' + req.url);\n  res.end('hello\\n');\n}).listen(3000, function(){\n  debug('listening');\n});\n\n// fake worker of some kind\n\nrequire('./worker');\n```\n\nExample _worker.js_:\n\n```js\nvar debug = require('debug')('worker');\n\nsetInterval(function(){\n  debug('doing some work');\n}, 1000);\n```\n\n The __DEBUG__ environment variable is then used to enable these based on space or comma-delimited names. Here are some examples:\n\n  ![debug http and worker](http://f.cl.ly/items/18471z1H402O24072r1J/Screenshot.png)\n\n  ![debug worker](http://f.cl.ly/items/1X413v1a3M0d3C2c1E0i/Screenshot.png)\n\n#### Windows note\n\n On Windows the environment variable is set using the `set` command.\n\n ```cmd\n set DEBUG=*,-not_this\n ```\n\nThen, run the program to be debugged as usual.\n\n## Millisecond diff\n\n  When actively developing an application it can be useful to see when the time spent between one `debug()` call and the next. Suppose for example you invoke `debug()` before requesting a resource, and after as well, the \"+NNNms\" will show you how much time was spent between calls.\n\n  ![](http://f.cl.ly/items/2i3h1d3t121M2Z1A3Q0N/Screenshot.png)\n\n  When stdout is not a TTY, `Date#toUTCString()` is used, making it more useful for logging the debug information as shown below:\n\n  ![](http://f.cl.ly/items/112H3i0e0o0P0a2Q2r11/Screenshot.png)\n\n## Conventions\n\n If you're using this in one or more of your libraries, you _should_ use the name of your library so that developers may toggle debugging as desired without guessing names. If you have more than one debuggers you _should_ prefix them with your library name and use \":\" to separate features. For example \"bodyParser\" from Connect would then be \"connect:bodyParser\".\n\n## Wildcards\n\n  The `*` character may be used as a wildcard. Suppose for example your library has debuggers named \"connect:bodyParser\", \"connect:compress\", \"connect:session\", instead of listing all three with `DEBUG=connect:bodyParser,connect:compress,connect:session`, you may simply do `DEBUG=connect:*`, or to run everything using this module simply use `DEBUG=*`.\n\n  You can also exclude specific debuggers by prefixing them with a \"-\" character.  For example, `DEBUG=*,-connect:*` would include all debuggers except those starting with \"connect:\".\n\n## Browser support\n\n  Debug works in the browser as well, currently persisted by `localStorage`. Consider the situation shown below where you have `worker:a` and `worker:b`, and wish to debug both. Somewhere in the code on your page, include:\n\n```js\nwindow.myDebug = require(\"debug\");\n```\n\n  (\"debug\" is a global object in the browser so we give this object a different name.) When your page is open in the browser, type the following in the console:\n\n```js\nmyDebug.enable(\"worker:*\")\n```\n\n  Refresh the page. Debug output will continue to be sent to the console until it is disabled by typing `myDebug.disable()` in the console.\n\n```js\na = debug('worker:a');\nb = debug('worker:b');\n\nsetInterval(function(){\n  a('doing some work');\n}, 1000);\n\nsetInterval(function(){\n  b('doing some work');\n}, 1200);\n```\n\n#### Web Inspector Colors\n\n  Colors are also enabled on \"Web Inspectors\" that understand the `%c` formatting\n  option. These are WebKit web inspectors, Firefox ([since version\n  31](https://hacks.mozilla.org/2014/05/editable-box-model-multiple-selection-sublime-text-keys-much-more-firefox-developer-tools-episode-31/))\n  and the Firebug plugin for Firefox (any version).\n\n  Colored output looks something like:\n\n  ![](https://cloud.githubusercontent.com/assets/71256/3139768/b98c5fd8-e8ef-11e3-862a-f7253b6f47c6.png)\n\n### stderr vs stdout\n\nYou can set an alternative logging method per-namespace by overriding the `log` method on a per-namespace or globally:\n\nExample _stdout.js_:\n\n```js\nvar debug = require('debug');\nvar error = debug('app:error');\n\n// by default stderr is used\nerror('goes to stderr!');\n\nvar log = debug('app:log');\n// set this namespace to log via console.log\nlog.log = console.log.bind(console); // don't forget to bind to console!\nlog('goes to stdout');\nerror('still goes to stderr!');\n\n// set all output to go via console.info\n// overrides all per-namespace log settings\ndebug.log = console.info.bind(console);\nerror('now goes to stdout via console.info');\nlog('still goes to stdout, but via console.info now');\n```\n\n### Save debug output to a file\n\nYou can save all debug statements to a file by piping them.\n\nExample:\n\n```bash\n$ DEBUG_FD=3 node your-app.js 3> whatever.log\n```\n\n## Authors\n\n - TJ Holowaychuk\n - Nathan Rajlich\n\n## License\n\n(The MIT License)\n\nCopyright (c) 2014 TJ Holowaychuk &lt;tj@vision-media.ca&gt;\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n",
+  "readmeFilename": "Readme.md",
+  "bugs": {
+    "url": "https://github.com/visionmedia/debug/issues"
+  },
+  "homepage": "https://github.com/visionmedia/debug#readme",
+  "_id": "debug@2.2.0",
+  "_shasum": "f87057e995b1a1f6ae6a4960664137bc56f039da",
+  "_resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+  "_from": "debug@*"
+}
diff --git a/deps/npm/node_modules/array-index/package.json b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json
similarity index 65%
rename from deps/npm/node_modules/array-index/package.json
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json
index a30106a99b33e1..6ba9df72c29bc3 100644
--- a/deps/npm/node_modules/array-index/package.json
+++ b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json
@@ -1,82 +1,58 @@
 {
-  "_args": [
-    [
-      "array-index@~0.1.0",
-      "/Users/rebecca/code/npm/node_modules/path-array"
-    ]
-  ],
-  "_from": "array-index@>=0.1.0 <0.2.0",
-  "_id": "array-index@0.1.1",
-  "_inCache": true,
-  "_location": "/array-index",
-  "_nodeVersion": "0.10.32",
-  "_npmUser": {
-    "email": "nathan@tootallnate.net",
-    "name": "tootallnate"
-  },
-  "_npmVersion": "2.1.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "array-index",
-    "raw": "array-index@~0.1.0",
-    "rawSpec": "~0.1.0",
-    "scope": null,
-    "spec": ">=0.1.0 <0.2.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/path-array"
+  "name": "array-index",
+  "description": "Invoke getter/setter functions on array-like objects",
+  "keywords": [
+    "index",
+    "array",
+    "getter",
+    "setter",
+    "proxy"
   ],
-  "_resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
-  "_shasum": "4d5eaf06cc3d925847cd73d1535c217ba306d3e1",
-  "_shrinkwrap": null,
-  "_spec": "array-index@~0.1.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/path-array",
+  "version": "0.1.1",
   "author": {
-    "email": "nathan@tootallnate.net",
     "name": "Nathan Rajlich",
+    "email": "nathan@tootallnate.net",
     "url": "http://tootallnate.net"
   },
-  "bugs": {
-    "url": "https://github.com/TooTallNate/array-index/issues"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/TooTallNate/array-index.git"
+  },
+  "main": "index.js",
+  "scripts": {
+    "test": "node test"
   },
   "dependencies": {
     "debug": "*"
   },
-  "description": "Invoke getter/setter functions on array-like objects",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "4d5eaf06cc3d925847cd73d1535c217ba306d3e1",
-    "tarball": "http://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz"
-  },
   "engines": {
     "node": "*"
   },
   "gitHead": "65a5d884f25b4b7a1608e367d715d713dbd3b3d6",
+  "bugs": {
+    "url": "https://github.com/TooTallNate/array-index/issues"
+  },
   "homepage": "https://github.com/TooTallNate/array-index",
-  "keywords": [
-    "array",
-    "getter",
-    "index",
-    "proxy",
-    "setter"
-  ],
-  "main": "index.js",
+  "_id": "array-index@0.1.1",
+  "_shasum": "4d5eaf06cc3d925847cd73d1535c217ba306d3e1",
+  "_from": "array-index@>=0.1.0 <0.2.0",
+  "_npmVersion": "2.1.3",
+  "_nodeVersion": "0.10.32",
+  "_npmUser": {
+    "name": "tootallnate",
+    "email": "nathan@tootallnate.net"
+  },
   "maintainers": [
     {
       "name": "tootallnate",
       "email": "nathan@tootallnate.net"
     }
   ],
-  "name": "array-index",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/TooTallNate/array-index.git"
-  },
-  "scripts": {
-    "test": "node test"
+  "dist": {
+    "shasum": "4d5eaf06cc3d925847cd73d1535c217ba306d3e1",
+    "tarball": "http://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz"
   },
-  "version": "0.1.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/array-index/test.js b/deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/test.js
similarity index 100%
rename from deps/npm/node_modules/array-index/test.js
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/test.js
diff --git a/deps/npm/node_modules/path-array/package.json b/deps/npm/node_modules/node-gyp/node_modules/path-array/package.json
similarity index 66%
rename from deps/npm/node_modules/path-array/package.json
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/package.json
index 1bb9fe1b1040e6..41d25482b86772 100644
--- a/deps/npm/node_modules/path-array/package.json
+++ b/deps/npm/node_modules/node-gyp/node_modules/path-array/package.json
@@ -1,79 +1,56 @@
 {
-  "_args": [
-    [
-      "path-array@^1.0.0",
-      "/Users/rebecca/code/npm/node_modules/node-gyp"
-    ]
-  ],
-  "_from": "path-array@>=1.0.0 <2.0.0",
-  "_id": "path-array@1.0.0",
-  "_inCache": true,
-  "_location": "/path-array",
-  "_npmUser": {
-    "email": "nathan@tootallnate.net",
-    "name": "tootallnate"
+  "name": "path-array",
+  "version": "1.0.0",
+  "description": "Treat your $PATH like a JavaScript Array",
+  "main": "index.js",
+  "scripts": {
+    "test": "mocha --reporter spec"
   },
-  "_npmVersion": "1.4.28",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "path-array",
-    "raw": "path-array@^1.0.0",
-    "rawSpec": "^1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/TooTallNate/node-path-array.git"
   },
-  "_requiredBy": [
-    "/node-gyp"
+  "keywords": [
+    "PATH",
+    "env",
+    "array"
   ],
-  "_resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
-  "_shasum": "6c14130c33084f0150553c657b38397ab67aaa4e",
-  "_shrinkwrap": null,
-  "_spec": "path-array@^1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp",
   "author": {
-    "email": "nathan@tootallnate.net",
     "name": "Nathan Rajlich",
+    "email": "nathan@tootallnate.net",
     "url": "http://n8.io/"
   },
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/TooTallNate/node-path-array/issues"
   },
+  "homepage": "https://github.com/TooTallNate/node-path-array",
   "dependencies": {
     "array-index": "~0.1.0"
   },
-  "description": "Treat your $PATH like a JavaScript Array",
   "devDependencies": {
     "mocha": "~1.16.1"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "6c14130c33084f0150553c657b38397ab67aaa4e",
-    "tarball": "http://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz"
-  },
   "gitHead": "5d1fedd54e4413459f67e4a4babb024144cd00d0",
-  "homepage": "https://github.com/TooTallNate/node-path-array",
-  "keywords": [
-    "PATH",
-    "array",
-    "env"
-  ],
-  "license": "MIT",
-  "main": "index.js",
+  "_id": "path-array@1.0.0",
+  "_shasum": "6c14130c33084f0150553c657b38397ab67aaa4e",
+  "_from": "path-array@>=1.0.0 <2.0.0",
+  "_npmVersion": "1.4.28",
+  "_npmUser": {
+    "name": "tootallnate",
+    "email": "nathan@tootallnate.net"
+  },
   "maintainers": [
     {
       "name": "tootallnate",
       "email": "nathan@tootallnate.net"
     }
   ],
-  "name": "path-array",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/TooTallNate/node-path-array.git"
-  },
-  "scripts": {
-    "test": "mocha --reporter spec"
+  "dist": {
+    "shasum": "6c14130c33084f0150553c657b38397ab67aaa4e",
+    "tarball": "http://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz"
   },
-  "version": "1.0.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/path-array/test/test.js b/deps/npm/node_modules/node-gyp/node_modules/path-array/test/test.js
similarity index 100%
rename from deps/npm/node_modules/path-array/test/test.js
rename to deps/npm/node_modules/node-gyp/node_modules/path-array/test/test.js
diff --git a/deps/npm/node_modules/block-stream/LICENCE b/deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/LICENCE
similarity index 100%
rename from deps/npm/node_modules/block-stream/LICENCE
rename to deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/LICENCE
diff --git a/deps/npm/node_modules/proto-list/LICENSE b/deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/LICENSE
similarity index 100%
rename from deps/npm/node_modules/proto-list/LICENSE
rename to deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/LICENSE
diff --git a/deps/npm/node_modules/block-stream/README.md b/deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/README.md
similarity index 100%
rename from deps/npm/node_modules/block-stream/README.md
rename to deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/README.md
diff --git a/deps/npm/node_modules/block-stream/bench/block-stream-pause.js b/deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/bench/block-stream-pause.js
similarity index 100%
rename from deps/npm/node_modules/block-stream/bench/block-stream-pause.js
rename to deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/bench/block-stream-pause.js
diff --git a/deps/npm/node_modules/block-stream/bench/block-stream.js b/deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/bench/block-stream.js
similarity index 100%
rename from deps/npm/node_modules/block-stream/bench/block-stream.js
rename to deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/bench/block-stream.js
diff --git a/deps/npm/node_modules/block-stream/bench/dropper-pause.js b/deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/bench/dropper-pause.js
similarity index 100%
rename from deps/npm/node_modules/block-stream/bench/dropper-pause.js
rename to deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/bench/dropper-pause.js
diff --git a/deps/npm/node_modules/block-stream/bench/dropper.js b/deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/bench/dropper.js
similarity index 100%
rename from deps/npm/node_modules/block-stream/bench/dropper.js
rename to deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/bench/dropper.js
diff --git a/deps/npm/node_modules/block-stream/block-stream.js b/deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/block-stream.js
similarity index 100%
rename from deps/npm/node_modules/block-stream/block-stream.js
rename to deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/block-stream.js
diff --git a/deps/npm/node_modules/block-stream/package.json b/deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/package.json
similarity index 65%
rename from deps/npm/node_modules/block-stream/package.json
rename to deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/package.json
index 806b6bf1763b6d..97d9d42abaf911 100644
--- a/deps/npm/node_modules/block-stream/package.json
+++ b/deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/package.json
@@ -1,79 +1,55 @@
 {
-  "_args": [
-    [
-      "block-stream@*",
-      "/Users/rebecca/code/npm/node_modules/node-gyp/node_modules/tar"
-    ]
-  ],
-  "_from": "block-stream@*",
-  "_id": "block-stream@0.0.8",
-  "_inCache": true,
-  "_location": "/block-stream",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "2.10.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "block-stream",
-    "raw": "block-stream@*",
-    "rawSpec": "*",
-    "scope": null,
-    "spec": "*",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/node-gyp/tar",
-    "/tar"
-  ],
-  "_resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz",
-  "_shasum": "0688f46da2bbf9cff0c4f68225a0cb95cbe8a46b",
-  "_shrinkwrap": null,
-  "_spec": "block-stream@*",
-  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp/node_modules/tar",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/block-stream/issues"
+  "name": "block-stream",
+  "description": "a stream of blocks",
+  "version": "0.0.8",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/block-stream.git"
+  },
+  "engines": {
+    "node": "0.4 || >=0.5.8"
   },
+  "main": "block-stream.js",
   "dependencies": {
     "inherits": "~2.0.0"
   },
-  "description": "a stream of blocks",
   "devDependencies": {
     "tap": "0.x"
   },
-  "directories": {},
+  "scripts": {
+    "test": "tap test/"
+  },
+  "license": "ISC",
+  "gitHead": "b35520314f4763af0788d65a846bb43d9c0a8f02",
+  "bugs": {
+    "url": "https://github.com/isaacs/block-stream/issues"
+  },
+  "homepage": "https://github.com/isaacs/block-stream#readme",
+  "_id": "block-stream@0.0.8",
+  "_shasum": "0688f46da2bbf9cff0c4f68225a0cb95cbe8a46b",
+  "_from": "block-stream@*",
+  "_npmVersion": "2.10.0",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "isaacs@npmjs.com"
+  },
   "dist": {
     "shasum": "0688f46da2bbf9cff0c4f68225a0cb95cbe8a46b",
     "tarball": "http://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
   },
-  "engines": {
-    "node": "0.4 || >=0.5.8"
-  },
-  "gitHead": "b35520314f4763af0788d65a846bb43d9c0a8f02",
-  "homepage": "https://github.com/isaacs/block-stream#readme",
-  "license": "ISC",
-  "main": "block-stream.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "name": "block-stream",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/block-stream.git"
-  },
-  "scripts": {
-    "test": "tap test/"
-  },
-  "version": "0.0.8"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/block-stream/test/basic.js b/deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/test/basic.js
similarity index 100%
rename from deps/npm/node_modules/block-stream/test/basic.js
rename to deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/test/basic.js
diff --git a/deps/npm/node_modules/block-stream/test/nopad-thorough.js b/deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/test/nopad-thorough.js
similarity index 100%
rename from deps/npm/node_modules/block-stream/test/nopad-thorough.js
rename to deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/test/nopad-thorough.js
diff --git a/deps/npm/node_modules/block-stream/test/nopad.js b/deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/test/nopad.js
similarity index 100%
rename from deps/npm/node_modules/block-stream/test/nopad.js
rename to deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/test/nopad.js
diff --git a/deps/npm/node_modules/block-stream/test/pause-resume.js b/deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/test/pause-resume.js
similarity index 100%
rename from deps/npm/node_modules/block-stream/test/pause-resume.js
rename to deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/test/pause-resume.js
diff --git a/deps/npm/node_modules/block-stream/test/thorough.js b/deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/test/thorough.js
similarity index 100%
rename from deps/npm/node_modules/block-stream/test/thorough.js
rename to deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/test/thorough.js
diff --git a/deps/npm/node_modules/block-stream/test/two-stream.js b/deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/test/two-stream.js
similarity index 96%
rename from deps/npm/node_modules/block-stream/test/two-stream.js
rename to deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/test/two-stream.js
index c6db79a43d91d7..b0f5d82546823e 100644
--- a/deps/npm/node_modules/block-stream/test/two-stream.js
+++ b/deps/npm/node_modules/node-gyp/node_modules/tar/node_modules/block-stream/test/two-stream.js
@@ -10,10 +10,10 @@ stack = new Buffer( tsize );
 for ( ; i < tsize; i++) stack[i] = "x".charCodeAt(0);
 
 isize = 1 * 1024; // <- initial packet size with 4K no bug!
-fsize = 2 * 1024 ; // <- first block-stream size 
+fsize = 2 * 1024 ; // <- first block-stream size
 psize = Math.ceil( isize / 6 ); // <- second block-stream size
 
-fexpected = Math.ceil( tsize / fsize ); // <- packets expected for first 
+fexpected = Math.ceil( tsize / fsize ); // <- packets expected for first
 pexpected = Math.ceil( tsize / psize ); // <- packets expected for second
 
 
diff --git a/deps/npm/node_modules/node-gyp/node_modules/tar/package.json b/deps/npm/node_modules/node-gyp/node_modules/tar/package.json
index c8bfe8fda9c690..7fab5394cd6ec2 100644
--- a/deps/npm/node_modules/node-gyp/node_modules/tar/package.json
+++ b/deps/npm/node_modules/node-gyp/node_modules/tar/package.json
@@ -1,66 +1,46 @@
 {
-  "_args": [
-    [
-      "tar@^1.0.0",
-      "/Users/rebecca/code/npm/node_modules/node-gyp"
-    ]
-  ],
-  "_from": "tar@>=1.0.0 <2.0.0",
-  "_id": "tar@1.0.3",
-  "_inCache": true,
-  "_location": "/node-gyp/tar",
-  "_nodeVersion": "0.10.33",
-  "_npmUser": {
-    "email": "ogd@aoaioxxysz.net",
-    "name": "othiym23"
-  },
-  "_npmVersion": "2.1.10",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "tar",
-    "raw": "tar@^1.0.0",
-    "rawSpec": "^1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/node-gyp"
-  ],
-  "_resolved": "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz",
-  "_shasum": "15bcdab244fa4add44e4244a0176edb8aa9a2b44",
-  "_shrinkwrap": null,
-  "_spec": "tar@^1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/node-tar/issues"
+  "name": "tar",
+  "description": "tar for node",
+  "version": "1.0.3",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/node-tar.git"
+  },
+  "main": "tar.js",
+  "scripts": {
+    "test": "tap test/*.js"
   },
   "dependencies": {
     "block-stream": "*",
     "fstream": "^1.0.2",
     "inherits": "2"
   },
-  "description": "tar for node",
   "devDependencies": {
     "graceful-fs": "^3.0.2",
-    "mkdirp": "^0.5.0",
     "rimraf": "1.x",
-    "tap": "0.x"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "15bcdab244fa4add44e4244a0176edb8aa9a2b44",
-    "tarball": "http://registry.npmjs.org/tar/-/tar-1.0.3.tgz"
+    "tap": "0.x",
+    "mkdirp": "^0.5.0"
   },
+  "license": "BSD",
   "gitHead": "f4151128c585da236c6b1e278b762ecaedc20c15",
+  "bugs": {
+    "url": "https://github.com/isaacs/node-tar/issues"
+  },
   "homepage": "https://github.com/isaacs/node-tar",
-  "license": "BSD",
-  "main": "tar.js",
+  "_id": "tar@1.0.3",
+  "_shasum": "15bcdab244fa4add44e4244a0176edb8aa9a2b44",
+  "_from": "tar@>=1.0.0 <2.0.0",
+  "_npmVersion": "2.1.10",
+  "_nodeVersion": "0.10.33",
+  "_npmUser": {
+    "name": "othiym23",
+    "email": "ogd@aoaioxxysz.net"
+  },
   "maintainers": [
     {
       "name": "isaacs",
@@ -71,14 +51,11 @@
       "email": "ogd@aoaioxxysz.net"
     }
   ],
-  "name": "tar",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/node-tar.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "dist": {
+    "shasum": "15bcdab244fa4add44e4244a0176edb8aa9a2b44",
+    "tarball": "http://registry.npmjs.org/tar/-/tar-1.0.3.tgz"
   },
-  "version": "1.0.3"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/node-gyp/package.json b/deps/npm/node_modules/node-gyp/package.json
index 6b0bef6e6222f6..6ec7ec50245b6a 100644
--- a/deps/npm/node_modules/node-gyp/package.json
+++ b/deps/npm/node_modules/node-gyp/package.json
@@ -1,57 +1,32 @@
 {
-  "_args": [
-    [
-      "node-gyp@~3.0.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "node-gyp@>=3.0.1 <3.1.0",
-  "_id": "node-gyp@3.0.3",
-  "_inCache": true,
-  "_location": "/node-gyp",
-  "_nodeVersion": "4.0.0",
-  "_npmUser": {
-    "email": "rod@vagg.org",
-    "name": "rvagg"
-  },
-  "_npmVersion": "2.14.2",
-  "_phantomChildren": {
-    "block-stream": "0.0.8",
-    "brace-expansion": "1.1.0",
-    "fstream": "1.0.8",
-    "inflight": "1.0.4",
-    "inherits": "2.0.1",
-    "lru-cache": "2.6.5",
-    "once": "1.3.2",
-    "sigmund": "1.0.1"
-  },
-  "_requested": {
-    "name": "node-gyp",
-    "raw": "node-gyp@~3.0.1",
-    "rawSpec": "~3.0.1",
-    "scope": null,
-    "spec": ">=3.0.1 <3.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
+  "name": "node-gyp",
+  "description": "Node.js native addon build tool",
+  "license": "MIT",
+  "keywords": [
+    "native",
+    "addon",
+    "module",
+    "c",
+    "c++",
+    "bindings",
+    "gyp"
   ],
-  "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.0.3.tgz",
-  "_shasum": "9b004219f4fa9efbfd78c5fc674aa12e58fb8694",
-  "_shrinkwrap": null,
-  "_spec": "node-gyp@~3.0.1",
-  "_where": "/Users/rebecca/code/npm",
+  "version": "3.0.3",
+  "installVersion": 9,
   "author": {
-    "email": "nathan@tootallnate.net",
     "name": "Nathan Rajlich",
+    "email": "nathan@tootallnate.net",
     "url": "http://tootallnate.net"
   },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/nodejs/node-gyp.git"
+  },
+  "preferGlobal": true,
   "bin": {
     "node-gyp": "./bin/node-gyp.js"
   },
-  "bugs": {
-    "url": "https://github.com/nodejs/node-gyp/issues"
-  },
+  "main": "./lib/node-gyp.js",
   "dependencies": {
     "fstream": "^1.0.0",
     "glob": "3 || 4",
@@ -68,33 +43,29 @@
     "tar": "^1.0.0",
     "which": "1"
   },
-  "description": "Node.js native addon build tool",
+  "engines": {
+    "node": ">= 0.8.0"
+  },
   "devDependencies": {
     "tape": "~4.2.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "9b004219f4fa9efbfd78c5fc674aa12e58fb8694",
-    "tarball": "http://registry.npmjs.org/node-gyp/-/node-gyp-3.0.3.tgz"
-  },
-  "engines": {
-    "node": ">= 0.8.0"
+  "scripts": {
+    "test": "tape test/test-*"
   },
   "gitHead": "d6b03851d366c7fa78e7d2f57c61bb074ea45ea3",
+  "bugs": {
+    "url": "https://github.com/nodejs/node-gyp/issues"
+  },
   "homepage": "https://github.com/nodejs/node-gyp",
-  "installVersion": 9,
-  "installable": true,
-  "keywords": [
-    "addon",
-    "bindings",
-    "c",
-    "c++",
-    "gyp",
-    "module",
-    "native"
-  ],
-  "license": "MIT",
-  "main": "./lib/node-gyp.js",
+  "_id": "node-gyp@3.0.3",
+  "_shasum": "9b004219f4fa9efbfd78c5fc674aa12e58fb8694",
+  "_from": "node-gyp@>=3.0.3 <3.1.0",
+  "_npmVersion": "2.14.2",
+  "_nodeVersion": "4.0.0",
+  "_npmUser": {
+    "name": "rvagg",
+    "email": "rod@vagg.org"
+  },
   "maintainers": [
     {
       "name": "TooTallNate",
@@ -117,15 +88,11 @@
       "email": "nathan@tootallnate.net"
     }
   ],
-  "name": "node-gyp",
-  "optionalDependencies": {},
-  "preferGlobal": true,
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/nodejs/node-gyp.git"
-  },
-  "scripts": {
-    "test": "tape test/test-*"
+  "dist": {
+    "shasum": "9b004219f4fa9efbfd78c5fc674aa12e58fb8694",
+    "tarball": "http://registry.npmjs.org/node-gyp/-/node-gyp-3.0.3.tgz"
   },
-  "version": "3.0.3"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.0.3.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/node-uuid/package.json b/deps/npm/node_modules/node-uuid/package.json
deleted file mode 100644
index a95715dd6ed409..00000000000000
--- a/deps/npm/node_modules/node-uuid/package.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "_args": [
-    [
-      "node-uuid@~1.4.0",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "node-uuid@>=1.4.0 <1.5.0",
-  "_id": "node-uuid@1.4.3",
-  "_inCache": true,
-  "_location": "/node-uuid",
-  "_npmUser": {
-    "email": "robert@broofa.com",
-    "name": "broofa"
-  },
-  "_npmVersion": "1.4.28",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "node-uuid",
-    "raw": "node-uuid@~1.4.0",
-    "rawSpec": "~1.4.0",
-    "scope": null,
-    "spec": ">=1.4.0 <1.5.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/request"
-  ],
-  "_resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
-  "_shasum": "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9",
-  "_shrinkwrap": null,
-  "_spec": "node-uuid@~1.4.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
-  "author": {
-    "email": "robert@broofa.com",
-    "name": "Robert Kieffer"
-  },
-  "bin": {
-    "uuid": "./bin/uuid"
-  },
-  "bugs": {
-    "url": "https://github.com/broofa/node-uuid/issues"
-  },
-  "contributors": [
-    {
-      "name": "Christoph Tavan",
-      "email": "dev@tavan.de"
-    }
-  ],
-  "dependencies": {},
-  "description": "Rigorous implementation of RFC4122 (v1 and v4) UUIDs.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9",
-    "tarball": "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
-  },
-  "gitHead": "886463c660a095dfebfa69603921a8d156fdb12c",
-  "homepage": "https://github.com/broofa/node-uuid",
-  "keywords": [
-    "guid",
-    "rfc4122",
-    "uuid"
-  ],
-  "lib": ".",
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "https://raw.github.com/broofa/node-uuid/master/LICENSE.md"
-    }
-  ],
-  "main": "./uuid.js",
-  "maintainers": [
-    {
-      "name": "broofa",
-      "email": "robert@broofa.com"
-    }
-  ],
-  "name": "node-uuid",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/broofa/node-uuid.git"
-  },
-  "scripts": {
-    "test": "node test/test.js"
-  },
-  "url": "http://github.com/broofa/node-uuid",
-  "version": "1.4.3"
-}
diff --git a/deps/npm/node_modules/nopt/package.json b/deps/npm/node_modules/nopt/package.json
index e7272b70180748..728d13627e820d 100644
--- a/deps/npm/node_modules/nopt/package.json
+++ b/deps/npm/node_modules/nopt/package.json
@@ -1,84 +1,38 @@
 {
-  "_args": [
-    [
-      "nopt@~3.0.3",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "nopt@>=3.0.3 <3.1.0",
-  "_id": "nopt@3.0.4",
-  "_inCache": true,
-  "_location": "/nopt",
-  "_nodeVersion": "2.2.2",
-  "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
-  },
-  "_npmVersion": "2.14.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "nopt",
-    "raw": "nopt@~3.0.3",
-    "rawSpec": "~3.0.3",
-    "scope": null,
-    "spec": ">=3.0.3 <3.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/node-gyp"
-  ],
-  "_resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.4.tgz",
-  "_shasum": "dd63bc9c72a6e4e85b85cdc0ca314598facede5e",
-  "_shrinkwrap": null,
-  "_spec": "nopt@~3.0.3",
-  "_where": "/Users/rebecca/code/npm",
+  "name": "nopt",
+  "version": "3.0.4",
+  "description": "Option parsing for Node, supporting types, shorthands, etc. Used by npm.",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
+  "main": "lib/nopt.js",
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/isaacs/nopt.git"
+  },
   "bin": {
     "nopt": "./bin/nopt.js"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/nopt/issues"
-  },
+  "license": "ISC",
   "dependencies": {
     "abbrev": "1"
   },
-  "description": "Option parsing for Node, supporting types, shorthands, etc. Used by npm.",
   "devDependencies": {
     "tap": "^1.2.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "dd63bc9c72a6e4e85b85cdc0ca314598facede5e",
-    "tarball": "http://registry.npmjs.org/nopt/-/nopt-3.0.4.tgz"
+  "readme": "If you want to write an option parser, and have it be good, there are\ntwo ways to do it.  The Right Way, and the Wrong Way.\n\nThe Wrong Way is to sit down and write an option parser.  We've all done\nthat.\n\nThe Right Way is to write some complex configurable program with so many\noptions that you hit the limit of your frustration just trying to\nmanage them all, and defer it with duct-tape solutions until you see\nexactly to the core of the problem, and finally snap and write an\nawesome option parser.\n\nIf you want to write an option parser, don't write an option parser.\nWrite a package manager, or a source control system, or a service\nrestarter, or an operating system.  You probably won't end up with a\ngood one of those, but if you don't give up, and you are relentless and\ndiligent enough in your procrastination, you may just end up with a very\nnice option parser.\n\n## USAGE\n\n    // my-program.js\n    var nopt = require(\"nopt\")\n      , Stream = require(\"stream\").Stream\n      , path = require(\"path\")\n      , knownOpts = { \"foo\" : [String, null]\n                    , \"bar\" : [Stream, Number]\n                    , \"baz\" : path\n                    , \"bloo\" : [ \"big\", \"medium\", \"small\" ]\n                    , \"flag\" : Boolean\n                    , \"pick\" : Boolean\n                    , \"many1\" : [String, Array]\n                    , \"many2\" : [path]\n                    }\n      , shortHands = { \"foofoo\" : [\"--foo\", \"Mr. Foo\"]\n                     , \"b7\" : [\"--bar\", \"7\"]\n                     , \"m\" : [\"--bloo\", \"medium\"]\n                     , \"p\" : [\"--pick\"]\n                     , \"f\" : [\"--flag\"]\n                     }\n                 // everything is optional.\n                 // knownOpts and shorthands default to {}\n                 // arg list defaults to process.argv\n                 // slice defaults to 2\n      , parsed = nopt(knownOpts, shortHands, process.argv, 2)\n    console.log(parsed)\n\nThis would give you support for any of the following:\n\n```bash\n$ node my-program.js --foo \"blerp\" --no-flag\n{ \"foo\" : \"blerp\", \"flag\" : false }\n\n$ node my-program.js ---bar 7 --foo \"Mr. Hand\" --flag\n{ bar: 7, foo: \"Mr. Hand\", flag: true }\n\n$ node my-program.js --foo \"blerp\" -f -----p\n{ foo: \"blerp\", flag: true, pick: true }\n\n$ node my-program.js -fp --foofoo\n{ foo: \"Mr. Foo\", flag: true, pick: true }\n\n$ node my-program.js --foofoo -- -fp  # -- stops the flag parsing.\n{ foo: \"Mr. Foo\", argv: { remain: [\"-fp\"] } }\n\n$ node my-program.js --blatzk -fp # unknown opts are ok.\n{ blatzk: true, flag: true, pick: true }\n\n$ node my-program.js --blatzk=1000 -fp # but you need to use = if they have a value\n{ blatzk: 1000, flag: true, pick: true }\n\n$ node my-program.js --no-blatzk -fp # unless they start with \"no-\"\n{ blatzk: false, flag: true, pick: true }\n\n$ node my-program.js --baz b/a/z # known paths are resolved.\n{ baz: \"/Users/isaacs/b/a/z\" }\n\n# if Array is one of the types, then it can take many\n# values, and will always be an array.  The other types provided\n# specify what types are allowed in the list.\n\n$ node my-program.js --many1 5 --many1 null --many1 foo\n{ many1: [\"5\", \"null\", \"foo\"] }\n\n$ node my-program.js --many2 foo --many2 bar\n{ many2: [\"/path/to/foo\", \"path/to/bar\"] }\n```\n\nRead the tests at the bottom of `lib/nopt.js` for more examples of\nwhat this puppy can do.\n\n## Types\n\nThe following types are supported, and defined on `nopt.typeDefs`\n\n* String: A normal string.  No parsing is done.\n* path: A file system path.  Gets resolved against cwd if not absolute.\n* url: A url.  If it doesn't parse, it isn't accepted.\n* Number: Must be numeric.\n* Date: Must parse as a date. If it does, and `Date` is one of the options,\n  then it will return a Date object, not a string.\n* Boolean: Must be either `true` or `false`.  If an option is a boolean,\n  then it does not need a value, and its presence will imply `true` as\n  the value.  To negate boolean flags, do `--no-whatever` or `--whatever\n  false`\n* NaN: Means that the option is strictly not allowed.  Any value will\n  fail.\n* Stream: An object matching the \"Stream\" class in node.  Valuable\n  for use when validating programmatically.  (npm uses this to let you\n  supply any WriteStream on the `outfd` and `logfd` config options.)\n* Array: If `Array` is specified as one of the types, then the value\n  will be parsed as a list of options.  This means that multiple values\n  can be specified, and that the value will always be an array.\n\nIf a type is an array of values not on this list, then those are\nconsidered valid values.  For instance, in the example above, the\n`--bloo` option can only be one of `\"big\"`, `\"medium\"`, or `\"small\"`,\nand any other value will be rejected.\n\nWhen parsing unknown fields, `\"true\"`, `\"false\"`, and `\"null\"` will be\ninterpreted as their JavaScript equivalents.\n\nYou can also mix types and values, or multiple types, in a list.  For\ninstance `{ blah: [Number, null] }` would allow a value to be set to\neither a Number or null.  When types are ordered, this implies a\npreference, and the first type that can be used to properly interpret\nthe value will be used.\n\nTo define a new type, add it to `nopt.typeDefs`.  Each item in that\nhash is an object with a `type` member and a `validate` method.  The\n`type` member is an object that matches what goes in the type list.  The\n`validate` method is a function that gets called with `validate(data,\nkey, val)`.  Validate methods should assign `data[key]` to the valid\nvalue of `val` if it can be handled properly, or return boolean\n`false` if it cannot.\n\nYou can also call `nopt.clean(data, types, typeDefs)` to clean up a\nconfig object and remove its invalid properties.\n\n## Error Handling\n\nBy default, nopt outputs a warning to standard error when invalid values for\nknown options are found.  You can change this behavior by assigning a method\nto `nopt.invalidHandler`.  This method will be called with\nthe offending `nopt.invalidHandler(key, val, types)`.\n\nIf no `nopt.invalidHandler` is assigned, then it will console.error\nits whining.  If it is assigned to boolean `false` then the warning is\nsuppressed.\n\n## Abbreviations\n\nYes, they are supported.  If you define options like this:\n\n```javascript\n{ \"foolhardyelephants\" : Boolean\n, \"pileofmonkeys\" : Boolean }\n```\n\nThen this will work:\n\n```bash\nnode program.js --foolhar --pil\nnode program.js --no-f --pileofmon\n# etc.\n```\n\n## Shorthands\n\nShorthands are a hash of shorter option names to a snippet of args that\nthey expand to.\n\nIf multiple one-character shorthands are all combined, and the\ncombination does not unambiguously match any other option or shorthand,\nthen they will be broken up into their constituent parts.  For example:\n\n```json\n{ \"s\" : [\"--loglevel\", \"silent\"]\n, \"g\" : \"--global\"\n, \"f\" : \"--force\"\n, \"p\" : \"--parseable\"\n, \"l\" : \"--long\"\n}\n```\n\n```bash\nnpm ls -sgflp\n# just like doing this:\nnpm ls --loglevel silent --global --force --long --parseable\n```\n\n## The Rest of the args\n\nThe config object returned by nopt is given a special member called\n`argv`, which is an object with the following fields:\n\n* `remain`: The remaining args after all the parsing has occurred.\n* `original`: The args as they originally appeared.\n* `cooked`: The args after flags and shorthands are expanded.\n\n## Slicing\n\nNode programs are called with more or less the exact argv as it appears\nin C land, after the v8 and node-specific options have been plucked off.\nAs such, `argv[0]` is always `node` and `argv[1]` is always the\nJavaScript program being run.\n\nThat's usually not very useful to you.  So they're sliced off by\ndefault.  If you want them, then you can pass in `0` as the last\nargument, or any other number that you'd like to slice off the start of\nthe list.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/isaacs/nopt/issues"
   },
-  "gitHead": "f52626631ea1afef5a6dd9acf23ddd1466831a08",
   "homepage": "https://github.com/isaacs/nopt#readme",
-  "installable": true,
-  "license": "ISC",
-  "main": "lib/nopt.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "isaacs@npmjs.com"
-    },
-    {
-      "name": "zkat",
-      "email": "kat@sykosomatic.org"
-    }
-  ],
-  "name": "nopt",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/isaacs/nopt.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "3.0.4"
+  "_id": "nopt@3.0.4",
+  "_shasum": "dd63bc9c72a6e4e85b85cdc0ca314598facede5e",
+  "_resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.4.tgz",
+  "_from": "nopt@>=3.0.4 <3.1.0"
 }
diff --git a/deps/npm/node_modules/normalize-git-url/package.json b/deps/npm/node_modules/normalize-git-url/package.json
index 9028655064b34b..ab01c0e8f3f669 100644
--- a/deps/npm/node_modules/normalize-git-url/package.json
+++ b/deps/npm/node_modules/normalize-git-url/package.json
@@ -1,67 +1,52 @@
 {
-  "_args": [
-    [
-      "normalize-git-url@~3.0.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "normalize-git-url@>=3.0.1 <3.1.0",
-  "_id": "normalize-git-url@3.0.1",
-  "_inCache": true,
-  "_location": "/normalize-git-url",
-  "_nodeVersion": "2.2.2",
-  "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
-  },
-  "_npmVersion": "3.1.2",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "normalize-git-url",
-    "raw": "normalize-git-url@~3.0.1",
-    "rawSpec": "~3.0.1",
-    "scope": null,
-    "spec": ">=3.0.1 <3.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/normalize-git-url/-/normalize-git-url-3.0.1.tgz",
-  "_shasum": "d40d419d05a15870271e50534dbb7b8ccd9b0a5c",
-  "_shrinkwrap": null,
-  "_spec": "normalize-git-url@~3.0.1",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "ogd@aoaioxxysz.net",
-    "name": "Forrest L Norvell"
-  },
-  "bugs": {
-    "url": "https://github.com/npm/normalize-git-url/issues"
+  "name": "normalize-git-url",
+  "version": "3.0.1",
+  "description": "Normalizes Git URLs. For npm, but you can use it too.",
+  "main": "normalize-git-url.js",
+  "directories": {
+    "test": "test"
   },
   "dependencies": {},
-  "description": "Normalizes Git URLs. For npm, but you can use it too.",
   "devDependencies": {
     "tap": "^1.1.0"
   },
-  "directories": {
-    "test": "test"
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "dist": {
-    "shasum": "d40d419d05a15870271e50534dbb7b8ccd9b0a5c",
-    "tarball": "http://registry.npmjs.org/normalize-git-url/-/normalize-git-url-3.0.1.tgz"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/normalize-git-url.git"
   },
-  "gitHead": "8393cd4345e404eb6ad2ff6853dcc8287807ca22",
-  "homepage": "https://github.com/npm/normalize-git-url",
   "keywords": [
     "git",
     "github",
+    "url",
     "normalize",
-    "npm",
-    "url"
+    "npm"
   ],
+  "author": {
+    "name": "Forrest L Norvell",
+    "email": "ogd@aoaioxxysz.net"
+  },
   "license": "ISC",
-  "main": "normalize-git-url.js",
+  "bugs": {
+    "url": "https://github.com/npm/normalize-git-url/issues"
+  },
+  "homepage": "https://github.com/npm/normalize-git-url",
+  "gitHead": "8393cd4345e404eb6ad2ff6853dcc8287807ca22",
+  "_id": "normalize-git-url@3.0.1",
+  "_shasum": "d40d419d05a15870271e50534dbb7b8ccd9b0a5c",
+  "_from": "normalize-git-url@>=3.0.1 <3.1.0",
+  "_npmVersion": "3.1.2",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
+  },
+  "dist": {
+    "shasum": "d40d419d05a15870271e50534dbb7b8ccd9b0a5c",
+    "tarball": "http://registry.npmjs.org/normalize-git-url/-/normalize-git-url-3.0.1.tgz"
+  },
   "maintainers": [
     {
       "name": "othiym23",
@@ -76,14 +61,5 @@
       "email": "kat@sykosomatic.org"
     }
   ],
-  "name": "normalize-git-url",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/normalize-git-url.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "3.0.1"
+  "_resolved": "https://registry.npmjs.org/normalize-git-url/-/normalize-git-url-3.0.1.tgz"
 }
diff --git a/deps/npm/node_modules/is-builtin-module/index.js b/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/index.js
similarity index 100%
rename from deps/npm/node_modules/is-builtin-module/index.js
rename to deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/index.js
diff --git a/deps/npm/node_modules/builtin-modules/license b/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/license
similarity index 100%
rename from deps/npm/node_modules/builtin-modules/license
rename to deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/license
diff --git a/deps/npm/node_modules/builtin-modules/builtin-modules.json b/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/builtin-modules.json
similarity index 100%
rename from deps/npm/node_modules/builtin-modules/builtin-modules.json
rename to deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/builtin-modules.json
diff --git a/deps/npm/node_modules/builtin-modules/index.js b/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/index.js
similarity index 100%
rename from deps/npm/node_modules/builtin-modules/index.js
rename to deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/index.js
diff --git a/deps/npm/node_modules/chalk/license b/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/license
similarity index 100%
rename from deps/npm/node_modules/chalk/license
rename to deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/license
diff --git a/deps/npm/node_modules/builtin-modules/package.json b/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/package.json
similarity index 62%
rename from deps/npm/node_modules/builtin-modules/package.json
rename to deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/package.json
index d509e87c26bc06..453d1632197a53 100644
--- a/deps/npm/node_modules/builtin-modules/package.json
+++ b/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/package.json
@@ -1,95 +1,70 @@
 {
-  "_args": [
-    [
-      "builtin-modules@^1.0.0",
-      "/Users/rebecca/code/npm/node_modules/is-builtin-module"
-    ]
-  ],
-  "_from": "builtin-modules@>=1.0.0 <2.0.0",
-  "_id": "builtin-modules@1.1.0",
-  "_inCache": true,
-  "_location": "/builtin-modules",
-  "_nodeVersion": "3.0.0",
-  "_npmUser": {
-    "email": "sindresorhus@gmail.com",
-    "name": "sindresorhus"
-  },
-  "_npmVersion": "2.13.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "builtin-modules",
-    "raw": "builtin-modules@^1.0.0",
-    "rawSpec": "^1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
+  "name": "builtin-modules",
+  "version": "1.1.0",
+  "description": "List of the Node.js builtin modules",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sindresorhus/builtin-modules.git"
   },
-  "_requiredBy": [
-    "/is-builtin-module"
-  ],
-  "_resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz",
-  "_shasum": "1053955fd994a5746e525e4ac717b81caf07491c",
-  "_shrinkwrap": null,
-  "_spec": "builtin-modules@^1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/is-builtin-module",
   "author": {
-    "email": "sindresorhus@gmail.com",
     "name": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com"
   },
-  "bugs": {
-    "url": "https://github.com/sindresorhus/builtin-modules/issues"
-  },
-  "dependencies": {},
-  "description": "List of the Node.js builtin modules",
-  "devDependencies": {
-    "ava": "*",
-    "xo": "*"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "1053955fd994a5746e525e4ac717b81caf07491c",
-    "tarball": "http://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
-  },
   "engines": {
     "node": ">=0.10.0"
   },
+  "scripts": {
+    "test": "xo && ava",
+    "make": "node make.js"
+  },
   "files": [
-    "builtin-modules.json",
     "index.js",
-    "static.js"
+    "static.js",
+    "builtin-modules.json"
   ],
-  "gitHead": "d317be16fab701f2ac73bc9aa771f60ec052ed66",
-  "homepage": "https://github.com/sindresorhus/builtin-modules#readme",
-  "installable": true,
   "keywords": [
-    "array",
-    "built-in",
     "builtin",
+    "built-in",
     "builtins",
-    "bundled",
+    "node",
+    "modules",
     "core",
+    "bundled",
     "list",
-    "modules",
-    "names",
-    "node"
+    "array",
+    "names"
   ],
-  "license": "MIT",
+  "devDependencies": {
+    "ava": "*",
+    "xo": "*"
+  },
+  "gitHead": "d317be16fab701f2ac73bc9aa771f60ec052ed66",
+  "bugs": {
+    "url": "https://github.com/sindresorhus/builtin-modules/issues"
+  },
+  "homepage": "https://github.com/sindresorhus/builtin-modules#readme",
+  "_id": "builtin-modules@1.1.0",
+  "_shasum": "1053955fd994a5746e525e4ac717b81caf07491c",
+  "_from": "builtin-modules@>=1.0.0 <2.0.0",
+  "_npmVersion": "2.13.3",
+  "_nodeVersion": "3.0.0",
+  "_npmUser": {
+    "name": "sindresorhus",
+    "email": "sindresorhus@gmail.com"
+  },
+  "dist": {
+    "shasum": "1053955fd994a5746e525e4ac717b81caf07491c",
+    "tarball": "http://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"
+  },
   "maintainers": [
     {
       "name": "sindresorhus",
       "email": "sindresorhus@gmail.com"
     }
   ],
-  "name": "builtin-modules",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sindresorhus/builtin-modules.git"
-  },
-  "scripts": {
-    "make": "node make.js",
-    "test": "xo && ava"
-  },
-  "version": "1.1.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/builtin-modules/readme.md b/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/readme.md
similarity index 100%
rename from deps/npm/node_modules/builtin-modules/readme.md
rename to deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/readme.md
diff --git a/deps/npm/node_modules/builtin-modules/static.js b/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/static.js
similarity index 100%
rename from deps/npm/node_modules/builtin-modules/static.js
rename to deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/node_modules/builtin-modules/static.js
diff --git a/deps/npm/node_modules/is-builtin-module/package.json b/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/package.json
similarity index 64%
rename from deps/npm/node_modules/is-builtin-module/package.json
rename to deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/package.json
index 925fc9d27d6625..3e0bf21f85c0c7 100644
--- a/deps/npm/node_modules/is-builtin-module/package.json
+++ b/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/package.json
@@ -1,97 +1,73 @@
 {
-  "_args": [
-    [
-      "is-builtin-module@^1.0.0",
-      "/Users/rebecca/code/npm/node_modules/normalize-package-data"
-    ]
-  ],
-  "_from": "is-builtin-module@>=1.0.0 <2.0.0",
-  "_id": "is-builtin-module@1.0.0",
-  "_inCache": true,
-  "_location": "/is-builtin-module",
-  "_nodeVersion": "0.12.2",
-  "_npmUser": {
-    "email": "sindresorhus@gmail.com",
-    "name": "sindresorhus"
-  },
-  "_npmVersion": "2.7.4",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "is-builtin-module",
-    "raw": "is-builtin-module@^1.0.0",
-    "rawSpec": "^1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
+  "name": "is-builtin-module",
+  "version": "1.0.0",
+  "description": "Check if a string matches the name of a Node.js builtin module",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sindresorhus/is-builtin-module.git"
   },
-  "_requiredBy": [
-    "/normalize-package-data"
-  ],
-  "_resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-  "_shasum": "540572d34f7ac3119f8f76c30cbc1b1e037affbe",
-  "_shrinkwrap": null,
-  "_spec": "is-builtin-module@^1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/normalize-package-data",
   "author": {
-    "email": "sindresorhus@gmail.com",
     "name": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com"
   },
-  "bugs": {
-    "url": "https://github.com/sindresorhus/is-builtin-module/issues"
-  },
-  "dependencies": {
-    "builtin-modules": "^1.0.0"
-  },
-  "description": "Check if a string matches the name of a Node.js builtin module",
-  "devDependencies": {
-    "ava": "0.0.4"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "540572d34f7ac3119f8f76c30cbc1b1e037affbe",
-    "tarball": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"
-  },
   "engines": {
     "node": ">=0.10.0"
   },
+  "scripts": {
+    "test": "node test.js"
+  },
   "files": [
     "index.js"
   ],
-  "gitHead": "da55ebf031f3864c5d309e25e49ed816957d70a2",
-  "homepage": "https://github.com/sindresorhus/is-builtin-module",
-  "installable": true,
   "keywords": [
-    "array",
-    "built-in",
     "builtin",
+    "built-in",
     "builtins",
-    "bundled",
-    "check",
+    "node",
+    "modules",
     "core",
-    "detect",
-    "is",
+    "bundled",
     "list",
-    "match",
-    "modules",
+    "array",
     "names",
-    "node"
+    "is",
+    "detect",
+    "check",
+    "match"
   ],
-  "license": "MIT",
+  "dependencies": {
+    "builtin-modules": "^1.0.0"
+  },
+  "devDependencies": {
+    "ava": "0.0.4"
+  },
+  "gitHead": "da55ebf031f3864c5d309e25e49ed816957d70a2",
+  "bugs": {
+    "url": "https://github.com/sindresorhus/is-builtin-module/issues"
+  },
+  "homepage": "https://github.com/sindresorhus/is-builtin-module",
+  "_id": "is-builtin-module@1.0.0",
+  "_shasum": "540572d34f7ac3119f8f76c30cbc1b1e037affbe",
+  "_from": "is-builtin-module@>=1.0.0 <2.0.0",
+  "_npmVersion": "2.7.4",
+  "_nodeVersion": "0.12.2",
+  "_npmUser": {
+    "name": "sindresorhus",
+    "email": "sindresorhus@gmail.com"
+  },
+  "dist": {
+    "shasum": "540572d34f7ac3119f8f76c30cbc1b1e037affbe",
+    "tarball": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"
+  },
   "maintainers": [
     {
       "name": "sindresorhus",
       "email": "sindresorhus@gmail.com"
     }
   ],
-  "name": "is-builtin-module",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/sindresorhus/is-builtin-module"
-  },
-  "scripts": {
-    "test": "node test.js"
-  },
-  "version": "1.0.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/is-builtin-module/readme.md b/deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/readme.md
similarity index 100%
rename from deps/npm/node_modules/is-builtin-module/readme.md
rename to deps/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/readme.md
diff --git a/deps/npm/node_modules/normalize-package-data/package.json b/deps/npm/node_modules/normalize-package-data/package.json
index 762dd8e2edd0cf..61f9e6f941a8ff 100644
--- a/deps/npm/node_modules/normalize-package-data/package.json
+++ b/deps/npm/node_modules/normalize-package-data/package.json
@@ -1,45 +1,30 @@
 {
-  "_args": [
-    [
-      "normalize-package-data@~2.3.3",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "normalize-package-data@>=2.3.3 <2.4.0",
-  "_id": "normalize-package-data@2.3.4",
-  "_inCache": true,
-  "_location": "/normalize-package-data",
-  "_nodeVersion": "2.2.2",
-  "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
+  "name": "normalize-package-data",
+  "version": "2.3.4",
+  "author": {
+    "name": "Meryn Stol",
+    "email": "merynstol@gmail.com"
   },
-  "_npmVersion": "2.14.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "normalize-package-data",
-    "raw": "normalize-package-data@~2.3.3",
-    "rawSpec": "~2.3.3",
-    "scope": null,
-    "spec": ">=2.3.3 <2.4.0",
-    "type": "range"
+  "description": "Normalizes data that can be found in package.json files.",
+  "license": "BSD-2-Clause",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/npm/normalize-package-data.git"
   },
-  "_requiredBy": [
-    "/",
-    "/npm-registry-client",
-    "/read-package-json"
-  ],
-  "_resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.4.tgz",
-  "_shasum": "b92233ce6ef04fbd6bc0c05dead155af33a623e0",
-  "_shrinkwrap": null,
-  "_spec": "normalize-package-data@~2.3.3",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "merynstol@gmail.com",
-    "name": "Meryn Stol"
+  "main": "lib/normalize.js",
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "bugs": {
-    "url": "https://github.com/npm/normalize-package-data/issues"
+  "dependencies": {
+    "hosted-git-info": "^2.0.2",
+    "is-builtin-module": "^1.0.0",
+    "semver": "2 || 3 || 4 || 5",
+    "validate-npm-package-license": "^3.0.1"
+  },
+  "devDependencies": {
+    "async": "~0.9.0",
+    "tap": "^1.1.0",
+    "underscore": "~1.4.4"
   },
   "contributors": [
     {
@@ -55,28 +40,24 @@
       "email": "rok@kowalski.gd"
     }
   ],
-  "dependencies": {
-    "hosted-git-info": "^2.0.2",
-    "is-builtin-module": "^1.0.0",
-    "semver": "2 || 3 || 4 || 5",
-    "validate-npm-package-license": "^3.0.1"
+  "gitHead": "0aa15b23116f2dfd086f1ed6bf213cbb7e7490dd",
+  "bugs": {
+    "url": "https://github.com/npm/normalize-package-data/issues"
   },
-  "description": "Normalizes data that can be found in package.json files.",
-  "devDependencies": {
-    "async": "~0.9.0",
-    "tap": "^1.1.0",
-    "underscore": "~1.4.4"
+  "homepage": "https://github.com/npm/normalize-package-data#readme",
+  "_id": "normalize-package-data@2.3.4",
+  "_shasum": "b92233ce6ef04fbd6bc0c05dead155af33a623e0",
+  "_from": "normalize-package-data@>=2.3.4 <2.4.0",
+  "_npmVersion": "2.14.3",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
   },
-  "directories": {},
   "dist": {
     "shasum": "b92233ce6ef04fbd6bc0c05dead155af33a623e0",
     "tarball": "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.4.tgz"
   },
-  "gitHead": "0aa15b23116f2dfd086f1ed6bf213cbb7e7490dd",
-  "homepage": "https://github.com/npm/normalize-package-data#readme",
-  "installable": true,
-  "license": "BSD-2-Clause",
-  "main": "lib/normalize.js",
   "maintainers": [
     {
       "name": "iarna",
@@ -99,14 +80,7 @@
       "email": "kat@sykosomatic.org"
     }
   ],
-  "name": "normalize-package-data",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/npm/normalize-package-data.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "2.3.4"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.4.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/npm-cache-filename/package.json b/deps/npm/node_modules/npm-cache-filename/package.json
index 882017f225381f..76ec9d1a1355c2 100644
--- a/deps/npm/node_modules/npm-cache-filename/package.json
+++ b/deps/npm/node_modules/npm-cache-filename/package.json
@@ -1,59 +1,43 @@
 {
-  "_args": [
-    [
-      "npm-cache-filename@~1.0.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "npm-cache-filename@>=1.0.1 <1.1.0",
-  "_id": "npm-cache-filename@1.0.2",
-  "_inCache": true,
-  "_location": "/npm-cache-filename",
-  "_nodeVersion": "2.2.2",
-  "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
+  "name": "npm-cache-filename",
+  "version": "1.0.2",
+  "description": "Given a cache folder and url, return the appropriate cache folder.",
+  "main": "index.js",
+  "dependencies": {},
+  "devDependencies": {
+    "tap": "^1.2.0"
   },
-  "_npmVersion": "2.12.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "npm-cache-filename",
-    "raw": "npm-cache-filename@~1.0.1",
-    "rawSpec": "~1.0.1",
-    "scope": null,
-    "spec": ">=1.0.1 <1.1.0",
-    "type": "range"
+  "scripts": {
+    "test": "tap test.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/npm/npm-cache-filename.git"
   },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz",
-  "_shasum": "ded306c5b0bfc870a9e9faf823bc5f283e05ae11",
-  "_shrinkwrap": null,
-  "_spec": "npm-cache-filename@~1.0.1",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
+  "license": "ISC",
   "bugs": {
     "url": "https://github.com/npm/npm-cache-filename/issues"
   },
-  "dependencies": {},
-  "description": "Given a cache folder and url, return the appropriate cache folder.",
-  "devDependencies": {
-    "tap": "^1.2.0"
+  "homepage": "https://github.com/npm/npm-cache-filename",
+  "gitHead": "b7eef12919fdf544a3b83bba73093f7268c40c1e",
+  "_id": "npm-cache-filename@1.0.2",
+  "_shasum": "ded306c5b0bfc870a9e9faf823bc5f283e05ae11",
+  "_from": "npm-cache-filename@>=1.0.2 <1.1.0",
+  "_npmVersion": "2.12.1",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
   },
-  "directories": {},
   "dist": {
     "shasum": "ded306c5b0bfc870a9e9faf823bc5f283e05ae11",
     "tarball": "http://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"
   },
-  "gitHead": "b7eef12919fdf544a3b83bba73093f7268c40c1e",
-  "homepage": "https://github.com/npm/npm-cache-filename",
-  "license": "ISC",
-  "main": "index.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -68,14 +52,6 @@
       "email": "kat@sykosomatic.org"
     }
   ],
-  "name": "npm-cache-filename",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/npm/npm-cache-filename.git"
-  },
-  "scripts": {
-    "test": "tap test.js"
-  },
-  "version": "1.0.2"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"
 }
diff --git a/deps/npm/node_modules/npm-install-checks/package.json b/deps/npm/node_modules/npm-install-checks/package.json
index a207b2b94e91c7..c504f97d1a3b71 100644
--- a/deps/npm/node_modules/npm-install-checks/package.json
+++ b/deps/npm/node_modules/npm-install-checks/package.json
@@ -1,67 +1,51 @@
 {
-  "_args": [
-    [
-      "npm-install-checks@~2.0.0",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "npm-install-checks@>=2.0.0 <2.1.0",
-  "_id": "npm-install-checks@2.0.1",
-  "_inCache": true,
-  "_location": "/npm-install-checks",
-  "_nodeVersion": "4.0.0",
-  "_npmUser": {
-    "email": "me@re-becca.org",
-    "name": "iarna"
-  },
-  "_npmVersion": "3.3.4",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "npm-install-checks",
-    "raw": "npm-install-checks@~2.0.0",
-    "rawSpec": "~2.0.0",
-    "scope": null,
-    "spec": ">=2.0.0 <2.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_shasum": "a93540b53f04fa9d916d2733d6541f6db7d88e46",
-  "_shrinkwrap": null,
-  "_spec": "npm-install-checks@~2.0.0",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "rok@kowalski.gd",
-    "name": "Robert Kowalski"
-  },
-  "bugs": {
-    "url": "https://github.com/npm/npm-install-checks/issues"
-  },
+  "name": "npm-install-checks",
+  "version": "2.0.1",
+  "description": "checks that npm runs during the installation of a module",
+  "main": "index.js",
   "dependencies": {
     "npmlog": "0.1 || 1",
     "semver": "^2.3.0 || 3.x || 4 || 5"
   },
-  "description": "checks that npm runs during the installation of a module",
   "devDependencies": {
     "mkdirp": "~0.3.5",
     "rimraf": "~2.2.5",
     "tap": "^1.2.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "a93540b53f04fa9d916d2733d6541f6db7d88e46",
-    "tarball": "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-2.0.1.tgz"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/npm/npm-install-checks.git"
   },
-  "gitHead": "1e9474f30490cd7621e976e91fa611d35e644f64",
   "homepage": "https://github.com/npm/npm-install-checks",
-  "installable": true,
   "keywords": [
-    "install",
-    "npm,"
+    "npm,",
+    "install"
   ],
+  "author": {
+    "name": "Robert Kowalski",
+    "email": "rok@kowalski.gd"
+  },
   "license": "BSD-2-Clause",
-  "main": "index.js",
+  "bugs": {
+    "url": "https://github.com/npm/npm-install-checks/issues"
+  },
+  "gitHead": "1e9474f30490cd7621e976e91fa611d35e644f64",
+  "_id": "npm-install-checks@2.0.1",
+  "_shasum": "a93540b53f04fa9d916d2733d6541f6db7d88e46",
+  "_from": "npm-install-checks@>=2.0.1 <2.1.0",
+  "_npmVersion": "3.3.4",
+  "_nodeVersion": "4.0.0",
+  "_npmUser": {
+    "name": "iarna",
+    "email": "me@re-becca.org"
+  },
+  "dist": {
+    "shasum": "a93540b53f04fa9d916d2733d6541f6db7d88e46",
+    "tarball": "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-2.0.1.tgz"
+  },
   "maintainers": [
     {
       "name": "robertkowalski",
@@ -80,14 +64,6 @@
       "email": "ogd@aoaioxxysz.net"
     }
   ],
-  "name": "npm-install-checks",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/npm/npm-install-checks.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "2.0.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-2.0.1.tgz"
 }
diff --git a/deps/npm/node_modules/npm-package-arg/package.json b/deps/npm/node_modules/npm-package-arg/package.json
index 211498c8b0c84f..9caed85e739668 100644
--- a/deps/npm/node_modules/npm-package-arg/package.json
+++ b/deps/npm/node_modules/npm-package-arg/package.json
@@ -1,89 +1,39 @@
 {
-  "_args": [
-    [
-      "npm-package-arg@~4.0.2",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "npm-package-arg@>=4.0.2 <4.1.0",
-  "_id": "npm-package-arg@4.0.2",
-  "_inCache": true,
-  "_location": "/npm-package-arg",
-  "_nodeVersion": "2.3.1",
-  "_npmUser": {
-    "email": "ogd@aoaioxxysz.net",
-    "name": "othiym23"
-  },
-  "_npmVersion": "2.13.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "npm-package-arg",
-    "raw": "npm-package-arg@~4.0.2",
-    "rawSpec": "~4.0.2",
-    "scope": null,
-    "spec": ">=4.0.2 <4.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/init-package-json",
-    "/npm-registry-client",
-    "/realize-package-specifier"
-  ],
-  "_resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.0.2.tgz",
-  "_shasum": "3f28235f9f6428e54bfeca73629e27d6c81a7e82",
-  "_shrinkwrap": null,
-  "_spec": "npm-package-arg@~4.0.2",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/npm/npm-package-arg/issues"
+  "name": "npm-package-arg",
+  "version": "4.0.2",
+  "description": "Parse the things that can be arguments to `npm install`",
+  "main": "npa.js",
+  "directories": {
+    "test": "test"
   },
   "dependencies": {
     "hosted-git-info": "^2.1.4",
     "semver": "4 || 5"
   },
-  "description": "Parse the things that can be arguments to `npm install`",
   "devDependencies": {
     "tap": "^1.2.0"
   },
-  "directories": {
-    "test": "test"
-  },
-  "dist": {
-    "shasum": "3f28235f9f6428e54bfeca73629e27d6c81a7e82",
-    "tarball": "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.0.2.tgz"
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "gitHead": "8d3c51c33807fabde4db86a3811831b756eaf2eb",
-  "homepage": "https://github.com/npm/npm-package-arg",
-  "license": "ISC",
-  "main": "npa.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    },
-    {
-      "name": "othiym23",
-      "email": "ogd@aoaioxxysz.net"
-    },
-    {
-      "name": "iarna",
-      "email": "me@re-becca.org"
-    }
-  ],
-  "name": "npm-package-arg",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/npm/npm-package-arg.git"
   },
-  "scripts": {
-    "test": "tap test/*.js"
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
+  },
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/npm/npm-package-arg/issues"
   },
-  "version": "4.0.2"
+  "homepage": "https://github.com/npm/npm-package-arg",
+  "readme": "# npm-package-arg\n\nParse package name and specifier passed to commands like `npm install` or\n`npm cache add`.  This just parses the text given-- it's worth noting that\n`npm` has further logic it applies by looking at your disk to figure out\nwhat ambiguous specifiers are.  If you want that logic, please see\n[realize-package-specifier].\n\n[realize-package-specifier]: https://www.npmjs.org/package/realize-package-specifier\n\nArguments look like: `foo@1.2`, `@bar/foo@1.2`, `foo@user/foo`, `http://x.com/foo.tgz`,\n`git+https://github.com/user/foo`, `bitbucket:user/foo`, `foo.tar.gz` or `bar`\n\n## EXAMPLES\n\n```javascript\nvar assert = require(\"assert\")\nvar npa = require(\"npm-package-arg\")\n\n// Pass in the descriptor, and it'll return an object\nvar parsed = npa(\"@bar/foo@1.2\")\n\n// Returns an object like:\n{\n  raw: '@bar/foo@1.2',   // what was passed in\n  name: \"@bar/foo\",      // the name of the package\n  scope: \"@bar\",         // the private scope of the package, or null\n  type: \"range\",         // the type of specifier this is\n  spec: \">=1.2.0 <1.3.0\" // the expanded specifier\n  rawSpec: \"1.2\"         // the specifier as passed in\n }\n\n// Parsing urls pointing at hosted git services produces a variation:\nvar parsed = npa(\"git+https://github.com/user/foo\")\n\n// Returns an object like:\n{\n  raw: 'git+https://github.com/user/foo',\n  scope: null,\n  name: null,\n  rawSpec: 'git+https://github.com/user/foo',\n  spec: 'user/foo',\n  type: 'hosted',\n  hosted: {\n    type: 'github',\n    ssh: 'git@github.com:user/foo.git',\n    sshurl: 'git+ssh://git@github.com/user/foo.git',\n    https: 'https://github.com/user/foo.git',\n    directUrl: 'https://raw.githubusercontent.com/user/foo/master/package.json'\n  }\n}\n\n// Completely unreasonable invalid garbage throws an error\n// Make sure you wrap this in a try/catch if you have not\n// already sanitized the inputs!\nassert.throws(function() {\n  npa(\"this is not \\0 a valid package name or url\")\n})\n```\n\n## USING\n\n`var npa = require('npm-package-arg')`\n\n* var result = npa(*arg*)\n\nParses *arg* and returns a result object detailing what *arg* is.\n\n*arg* -- a package descriptor, like: `foo@1.2`, or `foo@user/foo`, or\n`http://x.com/foo.tgz`, or `git+https://github.com/user/foo`\n\n## RESULT OBJECT\n\nThe objects that are returned by npm-package-arg contain the following\nkeys:\n\n* `name` - If known, the `name` field expected in the resulting pkg.\n* `type` - One of the following strings:\n  * `git` - A git repo\n  * `hosted` - A hosted project, from github, bitbucket or gitlab. Originally\n    either a full url pointing at one of these services or a shorthand like\n    `user/project` or `github:user/project` for github or `bitbucket:user/project`\n    for bitbucket.\n  * `tag` - A tagged version, like `\"foo@latest\"`\n  * `version` - A specific version number, like `\"foo@1.2.3\"`\n  * `range` - A version range, like `\"foo@2.x\"`\n  * `local` - A local file or folder path\n  * `remote` - An http url (presumably to a tgz)\n* `spec` - The \"thing\".  URL, the range, git repo, etc.\n* `hosted` - If type=hosted this will be an object with the following keys:\n  * `type` - github, bitbucket or gitlab\n  * `ssh` - The ssh path for this git repo\n  * `sshUrl` - The ssh URL for this git repo\n  * `httpsUrl` - The HTTPS URL for this git repo\n  * `directUrl` - The URL for the package.json in this git repo\n* `raw` - The original un-modified string that was provided.\n* `rawSpec` - The part after the `name@...`, as it was originally\n  provided.\n* `scope` - If a name is something like `@org/module` then the `scope`\n  field will be set to `org`.  If it doesn't have a scoped name, then\n  scope is `null`.\n",
+  "readmeFilename": "README.md",
+  "gitHead": "8d3c51c33807fabde4db86a3811831b756eaf2eb",
+  "_id": "npm-package-arg@4.0.2",
+  "_shasum": "3f28235f9f6428e54bfeca73629e27d6c81a7e82",
+  "_from": "npm-package-arg@>=4.0.2 <4.1.0"
 }
diff --git a/deps/npm/node_modules/concat-stream/LICENSE b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/LICENSE
similarity index 100%
rename from deps/npm/node_modules/concat-stream/LICENSE
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/LICENSE
diff --git a/deps/npm/node_modules/concat-stream/index.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/index.js
similarity index 100%
rename from deps/npm/node_modules/concat-stream/index.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/index.js
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/.npmignore b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/.npmignore
similarity index 100%
rename from deps/npm/node_modules/bl/node_modules/readable-stream/.npmignore
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/.npmignore
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/.travis.yml b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/bl/node_modules/readable-stream/.travis.yml
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/.travis.yml
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/.zuul.yml b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/.zuul.yml
similarity index 100%
rename from deps/npm/node_modules/bl/node_modules/readable-stream/.zuul.yml
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/.zuul.yml
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/LICENSE b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/LICENSE
similarity index 100%
rename from deps/npm/node_modules/bl/node_modules/readable-stream/LICENSE
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/LICENSE
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/README.md b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/README.md
similarity index 100%
rename from deps/npm/node_modules/bl/node_modules/readable-stream/README.md
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/README.md
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/doc/stream.markdown b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/doc/stream.markdown
similarity index 100%
rename from deps/npm/node_modules/bl/node_modules/readable-stream/doc/stream.markdown
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/doc/stream.markdown
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md
similarity index 100%
rename from deps/npm/node_modules/bl/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/duplex.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/duplex.js
similarity index 100%
rename from deps/npm/node_modules/bl/node_modules/readable-stream/duplex.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/duplex.js
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_duplex.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_duplex.js
similarity index 100%
rename from deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_duplex.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_duplex.js
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_passthrough.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_passthrough.js
similarity index 100%
rename from deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_passthrough.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_passthrough.js
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_readable.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_readable.js
similarity index 100%
rename from deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_readable.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_readable.js
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_transform.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_transform.js
similarity index 100%
rename from deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_transform.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_transform.js
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_writable.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_writable.js
similarity index 100%
rename from deps/npm/node_modules/bl/node_modules/readable-stream/lib/_stream_writable.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_writable.js
diff --git a/deps/npm/node_modules/core-util-is/README.md b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/README.md
similarity index 100%
rename from deps/npm/node_modules/core-util-is/README.md
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/README.md
diff --git a/deps/npm/node_modules/core-util-is/float.patch b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/float.patch
similarity index 100%
rename from deps/npm/node_modules/core-util-is/float.patch
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/float.patch
diff --git a/deps/npm/node_modules/core-util-is/lib/util.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
similarity index 100%
rename from deps/npm/node_modules/core-util-is/lib/util.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/package.json b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/package.json
new file mode 100644
index 00000000000000..b67333380c265e
--- /dev/null
+++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/package.json
@@ -0,0 +1,37 @@
+{
+  "name": "core-util-is",
+  "version": "1.0.1",
+  "description": "The `util.is*` functions introduced in Node v0.12.",
+  "main": "lib/util.js",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/core-util-is.git"
+  },
+  "keywords": [
+    "util",
+    "isBuffer",
+    "isArray",
+    "isNumber",
+    "isString",
+    "isRegExp",
+    "isThis",
+    "isThat",
+    "polyfill"
+  ],
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/isaacs/core-util-is/issues"
+  },
+  "readme": "# core-util-is\n\nThe `util.is*` functions introduced in Node v0.12.\n",
+  "readmeFilename": "README.md",
+  "homepage": "https://github.com/isaacs/core-util-is#readme",
+  "_id": "core-util-is@1.0.1",
+  "_shasum": "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538",
+  "_resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+  "_from": "core-util-is@>=1.0.0 <1.1.0"
+}
diff --git a/deps/npm/node_modules/core-util-is/util.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/util.js
similarity index 100%
rename from deps/npm/node_modules/core-util-is/util.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/util.js
diff --git a/deps/npm/node_modules/isarray/README.md b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/README.md
similarity index 100%
rename from deps/npm/node_modules/isarray/README.md
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/README.md
diff --git a/deps/npm/node_modules/isarray/build/build.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/build/build.js
similarity index 100%
rename from deps/npm/node_modules/isarray/build/build.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/build/build.js
diff --git a/deps/npm/node_modules/isarray/component.json b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/component.json
similarity index 100%
rename from deps/npm/node_modules/isarray/component.json
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/component.json
diff --git a/deps/npm/node_modules/isarray/index.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/index.js
similarity index 100%
rename from deps/npm/node_modules/isarray/index.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/index.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/package.json b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/package.json
new file mode 100644
index 00000000000000..fb1eb3786d8168
--- /dev/null
+++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "isarray",
+  "description": "Array#isArray for older browsers",
+  "version": "0.0.1",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/juliangruber/isarray.git"
+  },
+  "homepage": "https://github.com/juliangruber/isarray",
+  "main": "index.js",
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "tap": "*"
+  },
+  "keywords": [
+    "browser",
+    "isarray",
+    "array"
+  ],
+  "author": {
+    "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
+    "url": "http://juliangruber.com"
+  },
+  "license": "MIT",
+  "readme": "\n# isarray\n\n`Array#isArray` for older browsers.\n\n## Usage\n\n```js\nvar isArray = require('isarray');\n\nconsole.log(isArray([])); // => true\nconsole.log(isArray({})); // => false\n```\n\n## Installation\n\nWith [npm](http://npmjs.org) do\n\n```bash\n$ npm install isarray\n```\n\nThen bundle for the browser with\n[browserify](https://github.com/substack/browserify).\n\nWith [component](http://component.io) do\n\n```bash\n$ component install juliangruber/isarray\n```\n\n## License\n\n(MIT)\n\nCopyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the \"Software\"), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\nof the Software, and to permit persons to whom the Software is furnished to do\nso, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/juliangruber/isarray/issues"
+  },
+  "_id": "isarray@0.0.1",
+  "_shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf",
+  "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+  "_from": "isarray@0.0.1"
+}
diff --git a/deps/npm/node_modules/process-nextick-args/.travis.yml b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/process-nextick-args/.travis.yml
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml
diff --git a/deps/npm/node_modules/process-nextick-args/index.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/index.js
similarity index 100%
rename from deps/npm/node_modules/process-nextick-args/index.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/index.js
diff --git a/deps/npm/node_modules/process-nextick-args/license.md b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/license.md
similarity index 100%
rename from deps/npm/node_modules/process-nextick-args/license.md
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/license.md
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/package.json b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/package.json
new file mode 100644
index 00000000000000..bfaa2785f0b685
--- /dev/null
+++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "process-nextick-args",
+  "version": "1.0.3",
+  "description": "process.nextTick but always with args",
+  "main": "index.js",
+  "scripts": {
+    "test": "node test.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/calvinmetcalf/process-nextick-args.git"
+  },
+  "author": "",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/calvinmetcalf/process-nextick-args/issues"
+  },
+  "homepage": "https://github.com/calvinmetcalf/process-nextick-args",
+  "devDependencies": {
+    "tap": "~0.2.6"
+  },
+  "readme": "process-nextick-args\n=====\n\n[![Build Status](https://travis-ci.org/calvinmetcalf/process-nextick-args.svg?branch=master)](https://travis-ci.org/calvinmetcalf/process-nextick-args)\n\n```bash\nnpm install --save process-nextick-args\n```\n\nAlways be able to pass arguments to process.nextTick, no matter the platform\n\n```js\nvar nextTick = require('process-nextick-args');\n\nnextTick(function (a, b, c) {\n  console.log(a, b, c);\n}, 'step', 3,  'profit');\n```\n",
+  "readmeFilename": "readme.md",
+  "_id": "process-nextick-args@1.0.3",
+  "_shasum": "e272eed825d5e9f4ea74d8d73b1fe311c3beb630",
+  "_resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz",
+  "_from": "process-nextick-args@>=1.0.0 <1.1.0"
+}
diff --git a/deps/npm/node_modules/process-nextick-args/readme.md b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/readme.md
similarity index 100%
rename from deps/npm/node_modules/process-nextick-args/readme.md
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/readme.md
diff --git a/deps/npm/node_modules/process-nextick-args/test.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/test.js
similarity index 100%
rename from deps/npm/node_modules/process-nextick-args/test.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/process-nextick-args/test.js
diff --git a/deps/npm/node_modules/string_decoder/.npmignore b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/.npmignore
similarity index 100%
rename from deps/npm/node_modules/string_decoder/.npmignore
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/.npmignore
diff --git a/deps/npm/node_modules/string_decoder/LICENSE b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/LICENSE
similarity index 100%
rename from deps/npm/node_modules/string_decoder/LICENSE
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/LICENSE
diff --git a/deps/npm/node_modules/string_decoder/README.md b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/README.md
similarity index 100%
rename from deps/npm/node_modules/string_decoder/README.md
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/README.md
diff --git a/deps/npm/node_modules/string_decoder/index.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/index.js
similarity index 100%
rename from deps/npm/node_modules/string_decoder/index.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/index.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/package.json b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/package.json
new file mode 100644
index 00000000000000..ee70702359198d
--- /dev/null
+++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/package.json
@@ -0,0 +1,34 @@
+{
+  "name": "string_decoder",
+  "version": "0.10.31",
+  "description": "The string_decoder module from Node core",
+  "main": "index.js",
+  "dependencies": {},
+  "devDependencies": {
+    "tap": "~0.4.8"
+  },
+  "scripts": {
+    "test": "tap test/simple/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/rvagg/string_decoder.git"
+  },
+  "homepage": "https://github.com/rvagg/string_decoder",
+  "keywords": [
+    "string",
+    "decoder",
+    "browser",
+    "browserify"
+  ],
+  "license": "MIT",
+  "readme": "**string_decoder.js** (`require('string_decoder')`) from Node.js core\n\nCopyright Joyent, Inc. and other Node contributors. See LICENCE file for details.\n\nVersion numbers match the versions found in Node core, e.g. 0.10.24 matches Node 0.10.24, likewise 0.11.10 matches Node 0.11.10. **Prefer the stable version over the unstable.**\n\nThe *build/* directory contains a build script that will scrape the source from the [joyent/node](https://github.com/joyent/node) repo given a specific Node version.",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/rvagg/string_decoder/issues"
+  },
+  "_id": "string_decoder@0.10.31",
+  "_shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94",
+  "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+  "_from": "string_decoder@>=0.10.0 <0.11.0"
+}
diff --git a/deps/npm/node_modules/util-deprecate/History.md b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/History.md
similarity index 63%
rename from deps/npm/node_modules/util-deprecate/History.md
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/History.md
index ec010299b1b259..acc8675372e980 100644
--- a/deps/npm/node_modules/util-deprecate/History.md
+++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/History.md
@@ -1,4 +1,9 @@
 
+1.0.2 / 2015-10-07
+==================
+
+  * use try/catch when checking `localStorage` (#3, @kumavis)
+
 1.0.1 / 2014-11-25
 ==================
 
diff --git a/deps/npm/node_modules/util-deprecate/LICENSE b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/LICENSE
similarity index 100%
rename from deps/npm/node_modules/util-deprecate/LICENSE
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/LICENSE
diff --git a/deps/npm/node_modules/util-deprecate/README.md b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/README.md
similarity index 100%
rename from deps/npm/node_modules/util-deprecate/README.md
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/README.md
diff --git a/deps/npm/node_modules/util-deprecate/browser.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/browser.js
similarity index 89%
rename from deps/npm/node_modules/util-deprecate/browser.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/browser.js
index 55fa5a4bc6056a..549ae2f065ea5a 100644
--- a/deps/npm/node_modules/util-deprecate/browser.js
+++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/browser.js
@@ -55,7 +55,12 @@ function deprecate (fn, msg) {
  */
 
 function config (name) {
-  if (!global.localStorage) return false;
+  // accessing global.localStorage can trigger a DOMException in sandboxed iframes
+  try {
+    if (!global.localStorage) return false;
+  } catch (_) {
+    return false;
+  }
   var val = global.localStorage[name];
   if (null == val) return false;
   return String(val).toLowerCase() === 'true';
diff --git a/deps/npm/node_modules/util-deprecate/node.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/node.js
similarity index 100%
rename from deps/npm/node_modules/util-deprecate/node.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/node.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/package.json b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/package.json
new file mode 100644
index 00000000000000..ae0c70f6c633f1
--- /dev/null
+++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/node_modules/util-deprecate/package.json
@@ -0,0 +1,54 @@
+{
+  "name": "util-deprecate",
+  "version": "1.0.2",
+  "description": "The Node.js `util.deprecate()` function with browser support",
+  "main": "node.js",
+  "browser": "browser.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/TooTallNate/util-deprecate.git"
+  },
+  "keywords": [
+    "util",
+    "deprecate",
+    "browserify",
+    "browser",
+    "node"
+  ],
+  "author": {
+    "name": "Nathan Rajlich",
+    "email": "nathan@tootallnate.net",
+    "url": "http://n8.io/"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/TooTallNate/util-deprecate/issues"
+  },
+  "homepage": "https://github.com/TooTallNate/util-deprecate",
+  "gitHead": "475fb6857cd23fafff20c1be846c1350abf8e6d4",
+  "_id": "util-deprecate@1.0.2",
+  "_shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf",
+  "_from": "util-deprecate@>=1.0.1 <1.1.0",
+  "_npmVersion": "2.14.4",
+  "_nodeVersion": "4.1.2",
+  "_npmUser": {
+    "name": "tootallnate",
+    "email": "nathan@tootallnate.net"
+  },
+  "maintainers": [
+    {
+      "name": "tootallnate",
+      "email": "nathan@tootallnate.net"
+    }
+  ],
+  "dist": {
+    "shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf",
+    "tarball": "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+  },
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+  "readme": "ERROR: No README data found!"
+}
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/package.json b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/package.json
new file mode 100644
index 00000000000000..0d67d9bbbfbc67
--- /dev/null
+++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/package.json
@@ -0,0 +1,46 @@
+{
+  "name": "readable-stream",
+  "version": "2.0.2",
+  "description": "Streams3, a user-land copy of the stream library from iojs v2.x",
+  "main": "readable.js",
+  "dependencies": {
+    "core-util-is": "~1.0.0",
+    "inherits": "~2.0.1",
+    "isarray": "0.0.1",
+    "process-nextick-args": "~1.0.0",
+    "string_decoder": "~0.10.x",
+    "util-deprecate": "~1.0.1"
+  },
+  "devDependencies": {
+    "tap": "~0.2.6",
+    "tape": "~4.0.0",
+    "zuul": "~3.0.0"
+  },
+  "scripts": {
+    "test": "tap test/parallel/*.js",
+    "browser": "zuul --browser-name $BROWSER_NAME --browser-version $BROWSER_VERSION -- test/browser.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/nodejs/readable-stream.git"
+  },
+  "keywords": [
+    "readable",
+    "stream",
+    "pipe"
+  ],
+  "browser": {
+    "util": false
+  },
+  "license": "MIT",
+  "readme": "# readable-stream\n\n***Node-core streams for userland*** [![Build Status](https://travis-ci.org/nodejs/readable-stream.svg?branch=master)](https://travis-ci.org/nodejs/readable-stream)\n\n\n[![NPM](https://nodei.co/npm/readable-stream.png?downloads=true&downloadRank=true)](https://nodei.co/npm/readable-stream/)\n[![NPM](https://nodei.co/npm-dl/readable-stream.png?&months=6&height=3)](https://nodei.co/npm/readable-stream/)\n\n\n[![Sauce Test Status](https://saucelabs.com/browser-matrix/readable-stream.svg)](https://saucelabs.com/u/readable-stream)\n\n```bash\nnpm install --save readable-stream\n```\n\n***Node-core streams for userland***\n\nThis package is a mirror of the Streams2 and Streams3 implementations in\nNode-core, including [documentation](doc/stream.markdown).\n\nIf you want to guarantee a stable streams base, regardless of what version of\nNode you, or the users of your libraries are using, use **readable-stream** *only* and avoid the *\"stream\"* module in Node-core, for background see [this blogpost](http://r.va.gg/2014/06/why-i-dont-use-nodes-core-stream-module.html).\n\nAs of version 2.0.0 **readable-stream** uses semantic versioning.  \n\n# Streams WG Team Members\n\n* **Chris Dickinson** ([@chrisdickinson](https://github.com/chrisdickinson)) &lt;christopher.s.dickinson@gmail.com&gt;\n  - Release GPG key: 9554F04D7259F04124DE6B476D5A82AC7E37093B\n* **Calvin Metcalf** ([@calvinmetcalf](https://github.com/calvinmetcalf)) &lt;calvin.metcalf@gmail.com&gt;\n  - Release GPG key: F3EF5F62A87FC27A22E643F714CE4FF5015AA242\n* **Rod Vagg** ([@rvagg](https://github.com/rvagg)) &lt;rod@vagg.org&gt;\n  - Release GPG key: DD8F2338BAE7501E3DD5AC78C273792F7D83545D\n* **Sam Newman** ([@sonewman](https://github.com/sonewman)) &lt;newmansam@outlook.com&gt;\n* **Mathias Buus** ([@mafintosh](https://github.com/mafintosh)) &lt;mathiasbuus@gmail.com&gt;\n* **Domenic Denicola** ([@domenic](https://github.com/domenic)) &lt;d@domenic.me&gt;\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/nodejs/readable-stream/issues"
+  },
+  "homepage": "https://github.com/nodejs/readable-stream#readme",
+  "_id": "readable-stream@2.0.2",
+  "_shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
+  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+  "_from": "readable-stream@>=2.0.0 <2.1.0"
+}
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/passthrough.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/passthrough.js
similarity index 100%
rename from deps/npm/node_modules/bl/node_modules/readable-stream/passthrough.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/passthrough.js
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/readable.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/readable.js
similarity index 100%
rename from deps/npm/node_modules/bl/node_modules/readable-stream/readable.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/readable.js
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/transform.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/transform.js
similarity index 100%
rename from deps/npm/node_modules/bl/node_modules/readable-stream/transform.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/transform.js
diff --git a/deps/npm/node_modules/bl/node_modules/readable-stream/writable.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/writable.js
similarity index 100%
rename from deps/npm/node_modules/bl/node_modules/readable-stream/writable.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/writable.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/.travis.yml b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/.travis.yml
new file mode 100644
index 00000000000000..cc4dba29d959a2
--- /dev/null
+++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/.travis.yml
@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - "0.8"
+  - "0.10"
diff --git a/deps/npm/node_modules/typedarray/LICENSE b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/LICENSE
similarity index 100%
rename from deps/npm/node_modules/typedarray/LICENSE
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/LICENSE
diff --git a/deps/npm/node_modules/typedarray/example/tarray.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/example/tarray.js
similarity index 100%
rename from deps/npm/node_modules/typedarray/example/tarray.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/example/tarray.js
diff --git a/deps/npm/node_modules/typedarray/index.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/index.js
similarity index 100%
rename from deps/npm/node_modules/typedarray/index.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/index.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/package.json b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/package.json
new file mode 100644
index 00000000000000..f946a953af73c6
--- /dev/null
+++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/package.json
@@ -0,0 +1,64 @@
+{
+  "name": "typedarray",
+  "version": "0.0.6",
+  "description": "TypedArray polyfill for old browsers",
+  "main": "index.js",
+  "devDependencies": {
+    "tape": "~2.3.2"
+  },
+  "scripts": {
+    "test": "tape test/*.js test/server/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/substack/typedarray.git"
+  },
+  "homepage": "https://github.com/substack/typedarray",
+  "keywords": [
+    "ArrayBuffer",
+    "DataView",
+    "Float32Array",
+    "Float64Array",
+    "Int8Array",
+    "Int16Array",
+    "Int32Array",
+    "Uint8Array",
+    "Uint8ClampedArray",
+    "Uint16Array",
+    "Uint32Array",
+    "typed",
+    "array",
+    "polyfill"
+  ],
+  "author": {
+    "name": "James Halliday",
+    "email": "mail@substack.net",
+    "url": "http://substack.net"
+  },
+  "license": "MIT",
+  "testling": {
+    "files": "test/*.js",
+    "browsers": [
+      "ie/6..latest",
+      "firefox/16..latest",
+      "firefox/nightly",
+      "chrome/22..latest",
+      "chrome/canary",
+      "opera/12..latest",
+      "opera/next",
+      "safari/5.1..latest",
+      "ipad/6.0..latest",
+      "iphone/6.0..latest",
+      "android-browser/4.2..latest"
+    ]
+  },
+  "readme": "# typedarray\n\nTypedArray polyfill ripped from [this\nmodule](https://raw.github.com/inexorabletash/polyfill).\n\n[![build status](https://secure.travis-ci.org/substack/typedarray.png)](http://travis-ci.org/substack/typedarray)\n\n[![testling badge](https://ci.testling.com/substack/typedarray.png)](https://ci.testling.com/substack/typedarray)\n\n# example\n\n``` js\nvar Uint8Array = require('typedarray').Uint8Array;\nvar ua = new Uint8Array(5);\nua[1] = 256 + 55;\nconsole.log(ua[1]);\n```\n\noutput:\n\n```\n55\n```\n\n# methods\n\n``` js\nvar TA = require('typedarray')\n```\n\nThe `TA` object has the following constructors:\n\n* TA.ArrayBuffer\n* TA.DataView\n* TA.Float32Array\n* TA.Float64Array\n* TA.Int8Array\n* TA.Int16Array\n* TA.Int32Array\n* TA.Uint8Array\n* TA.Uint8ClampedArray\n* TA.Uint16Array\n* TA.Uint32Array\n\n# install\n\nWith [npm](https://npmjs.org) do:\n\n```\nnpm install typedarray\n```\n\nTo use this module in the browser, compile with\n[browserify](http://browserify.org)\nor download a UMD build from browserify CDN:\n\nhttp://wzrd.in/standalone/typedarray@latest\n\n# license\n\nMIT\n",
+  "readmeFilename": "readme.markdown",
+  "bugs": {
+    "url": "https://github.com/substack/typedarray/issues"
+  },
+  "_id": "typedarray@0.0.6",
+  "_shasum": "867ac74e3864187b1d3d47d996a78ec5c8830777",
+  "_resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+  "_from": "typedarray@>=0.0.5 <0.1.0"
+}
diff --git a/deps/npm/node_modules/typedarray/readme.markdown b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/readme.markdown
similarity index 100%
rename from deps/npm/node_modules/typedarray/readme.markdown
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/readme.markdown
diff --git a/deps/npm/node_modules/typedarray/test/server/undef_globals.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/test/server/undef_globals.js
similarity index 100%
rename from deps/npm/node_modules/typedarray/test/server/undef_globals.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/test/server/undef_globals.js
diff --git a/deps/npm/node_modules/typedarray/test/tarray.js b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/test/tarray.js
similarity index 100%
rename from deps/npm/node_modules/typedarray/test/tarray.js
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/typedarray/test/tarray.js
diff --git a/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/package.json b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/package.json
new file mode 100644
index 00000000000000..19d94b3e08154b
--- /dev/null
+++ b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/package.json
@@ -0,0 +1,64 @@
+{
+  "name": "concat-stream",
+  "version": "1.5.0",
+  "description": "writable stream that concatenates strings or binary data and calls a callback with the result",
+  "tags": [
+    "stream",
+    "simple",
+    "util",
+    "utility"
+  ],
+  "author": {
+    "name": "Max Ogden",
+    "email": "max@maxogden.com"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/maxogden/concat-stream.git"
+  },
+  "bugs": {
+    "url": "http://github.com/maxogden/concat-stream/issues"
+  },
+  "engines": [
+    "node >= 0.8"
+  ],
+  "main": "index.js",
+  "files": [
+    "index.js"
+  ],
+  "scripts": {
+    "test": "tape test/*.js test/server/*.js"
+  },
+  "license": "MIT",
+  "dependencies": {
+    "inherits": "~2.0.1",
+    "typedarray": "~0.0.5",
+    "readable-stream": "~2.0.0"
+  },
+  "devDependencies": {
+    "tape": "~2.3.2"
+  },
+  "testling": {
+    "files": "test/*.js",
+    "browsers": [
+      "ie/8..latest",
+      "firefox/17..latest",
+      "firefox/nightly",
+      "chrome/22..latest",
+      "chrome/canary",
+      "opera/12..latest",
+      "opera/next",
+      "safari/5.1..latest",
+      "ipad/6.0..latest",
+      "iphone/6.0..latest",
+      "android-browser/4.2..latest"
+    ]
+  },
+  "readme": "# concat-stream\n\nWritable stream that concatenates strings or binary data and calls a callback with the result. Not a transform stream -- more of a stream sink.\n\n[![Build Status](https://travis-ci.org/maxogden/concat-stream.svg?branch=master)](https://travis-ci.org/maxogden/concat-stream)\n\n[![NPM](https://nodei.co/npm/concat-stream.png)](https://nodei.co/npm/concat-stream/)\n\n### description\n\nStreams emit many buffers. If you want to collect all of the buffers, and when the stream ends concatenate all of the buffers together and receive a single buffer then this is the module for you.\n\nOnly use this if you know you can fit all of the output of your stream into a single Buffer (e.g. in RAM).\n\nThere are also `objectMode` streams that emit things other than Buffers, and you can concatenate these too. See below for details.\n\n### examples\n\n#### Buffers\n\n```js\nvar fs = require('fs')\nvar concat = require('concat-stream')\n\nvar readStream = fs.createReadStream('cat.png')\nvar concatStream = concat(gotPicture)\n\nreadStream.on('error', handleError)\nreadStream.pipe(concatStream)\n\nfunction gotPicture(imageBuffer) {\n  // imageBuffer is all of `cat.png` as a node.js Buffer\n}\n\nfunction handleError(err) {\n  // handle your error appropriately here, e.g.:\n  console.error(err) // print the error to STDERR\n  process.exit(1) // exit program with non-zero exit code\n}\n\n```\n\n#### Arrays\n\n```js\nvar write = concat(function(data) {})\nwrite.write([1,2,3])\nwrite.write([4,5,6])\nwrite.end()\n// data will be [1,2,3,4,5,6] in the above callback\n```\n\n#### Uint8Arrays\n\n```js\nvar write = concat(function(data) {})\nvar a = new Uint8Array(3)\na[0] = 97; a[1] = 98; a[2] = 99\nwrite.write(a)\nwrite.write('!')\nwrite.end(Buffer('!!1'))\n```\n\nSee `test/` for more examples\n\n# methods\n\n```js\nvar concat = require('concat-stream')\n```\n\n## var writable = concat(opts={}, cb)\n\nReturn a `writable` stream that will fire `cb(data)` with all of the data that\nwas written to the stream. Data can be written to `writable` as strings,\nBuffers, arrays of byte integers, and Uint8Arrays. \n\nBy default `concat-stream` will give you back the same data type as the type of the first buffer written to the stream. Use `opts.encoding` to set what format `data` should be returned as, e.g. if you if you don't want to rely on the built-in type checking or for some other reason.\n\n* `string` - get a string\n* `buffer` - get back a Buffer\n* `array` - get an array of byte integers\n* `uint8array`, `u8`, `uint8` - get back a Uint8Array\n* `object`, get back an array of Objects\n\nIf you don't specify an encoding, and the types can't be inferred (e.g. you write things that aren't in the list above), it will try to convert concat them into a `Buffer`.\n\n# error handling\n\n`concat-stream` does not handle errors for you, so you must handle errors on whatever streams you pipe into `concat-stream`. This is a general rule when programming with node.js streams: always handle errors on each and every stream. Since `concat-stream` is not itself a stream it does not emit errors.\n\n# license\n\nMIT LICENSE\n",
+  "readmeFilename": "readme.md",
+  "homepage": "https://github.com/maxogden/concat-stream#readme",
+  "_id": "concat-stream@1.5.0",
+  "_shasum": "53f7d43c51c5e43f81c8fdd03321c631be68d611",
+  "_resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
+  "_from": "concat-stream@>=1.4.6 <2.0.0"
+}
diff --git a/deps/npm/node_modules/concat-stream/readme.md b/deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/readme.md
similarity index 100%
rename from deps/npm/node_modules/concat-stream/readme.md
rename to deps/npm/node_modules/npm-registry-client/node_modules/concat-stream/readme.md
diff --git a/deps/npm/node_modules/npm-registry-client/package.json b/deps/npm/node_modules/npm-registry-client/package.json
index 3ab27508a18eec..c9670d1c571646 100644
--- a/deps/npm/node_modules/npm-registry-client/package.json
+++ b/deps/npm/node_modules/npm-registry-client/package.json
@@ -1,44 +1,18 @@
 {
-  "_args": [
-    [
-      "npm-registry-client@~7.0.7",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "npm-registry-client@>=7.0.7 <7.1.0",
-  "_id": "npm-registry-client@7.0.7",
-  "_inCache": true,
-  "_location": "/npm-registry-client",
-  "_nodeVersion": "2.2.2",
-  "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
-  },
-  "_npmVersion": "2.14.4",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "npm-registry-client",
-    "raw": "npm-registry-client@~7.0.7",
-    "rawSpec": "~7.0.7",
-    "scope": null,
-    "spec": ">=7.0.7 <7.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.0.7.tgz",
-  "_shasum": "899d7c8fefe87b72a70d8c9e075fb874539e0d3e",
-  "_shrinkwrap": null,
-  "_spec": "npm-registry-client@~7.0.7",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/npm-registry-client/issues"
+  "name": "npm-registry-client",
+  "description": "Client for the npm registry",
+  "version": "7.0.7",
+  "repository": {
+    "url": "git://github.com/isaacs/npm-registry-client.git"
+  },
+  "main": "index.js",
+  "scripts": {
+    "test": "standard && tap test/*.js"
   },
   "dependencies": {
     "chownr": "^1.0.1",
@@ -47,15 +21,14 @@
     "mkdirp": "^0.5.0",
     "normalize-package-data": "~1.0.1 || ^2.0.0",
     "npm-package-arg": "^3.0.0 || ^4.0.0",
-    "npmlog": "",
     "once": "^1.3.0",
     "request": "^2.47.0",
     "retry": "^0.8.0",
     "rimraf": "2",
     "semver": "2 >=2.2.1 || 3.x || 4 || 5",
-    "slide": "^1.1.3"
+    "slide": "^1.1.3",
+    "npmlog": ""
   },
-  "description": "Client for the npm registry",
   "devDependencies": {
     "negotiator": "^0.4.9",
     "nock": "^0.56.0",
@@ -63,16 +36,28 @@
     "standard": "^4.0.0",
     "tap": "^1.2.0"
   },
-  "directories": {},
+  "optionalDependencies": {
+    "npmlog": ""
+  },
+  "license": "ISC",
+  "gitHead": "06f188917bf575fe7dc7c2f6d1d4adbaa50bc423",
+  "bugs": {
+    "url": "https://github.com/isaacs/npm-registry-client/issues"
+  },
+  "homepage": "https://github.com/isaacs/npm-registry-client#readme",
+  "_id": "npm-registry-client@7.0.7",
+  "_shasum": "899d7c8fefe87b72a70d8c9e075fb874539e0d3e",
+  "_from": "npm-registry-client@>=7.0.7 <7.1.0",
+  "_npmVersion": "2.14.4",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
+  },
   "dist": {
     "shasum": "899d7c8fefe87b72a70d8c9e075fb874539e0d3e",
     "tarball": "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.0.7.tgz"
   },
-  "gitHead": "06f188917bf575fe7dc7c2f6d1d4adbaa50bc423",
-  "homepage": "https://github.com/isaacs/npm-registry-client#readme",
-  "installable": true,
-  "license": "ISC",
-  "main": "index.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -91,15 +76,6 @@
       "email": "kat@sykosomatic.org"
     }
   ],
-  "name": "npm-registry-client",
-  "optionalDependencies": {
-    "npmlog": ""
-  },
-  "repository": {
-    "url": "git://github.com/isaacs/npm-registry-client.git"
-  },
-  "scripts": {
-    "test": "standard && tap test/*.js"
-  },
-  "version": "7.0.7"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.0.7.tgz"
 }
diff --git a/deps/npm/node_modules/npm-user-validate/package.json b/deps/npm/node_modules/npm-user-validate/package.json
index 69c37fe875acd1..2cc56691ec4fd4 100644
--- a/deps/npm/node_modules/npm-user-validate/package.json
+++ b/deps/npm/node_modules/npm-user-validate/package.json
@@ -1,63 +1,46 @@
 {
-  "_args": [
-    [
-      "npm-user-validate@~0.1.2",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "npm-user-validate@>=0.1.2 <0.2.0",
-  "_id": "npm-user-validate@0.1.2",
-  "_inCache": true,
-  "_location": "/npm-user-validate",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
+  "name": "npm-user-validate",
+  "version": "0.1.2",
+  "description": "User validations for npm",
+  "main": "npm-user-validate.js",
+  "devDependencies": {
+    "tap": "0.4.3"
   },
-  "_npmVersion": "2.10.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "npm-user-validate",
-    "raw": "npm-user-validate@~0.1.2",
-    "rawSpec": "~0.1.2",
-    "scope": null,
-    "spec": ">=0.1.2 <0.2.0",
-    "type": "range"
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "_requiredBy": [
-    "/"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/npm/npm-user-validate.git"
+  },
+  "keywords": [
+    "npm",
+    "validation",
+    "registry"
   ],
-  "_resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz",
-  "_shasum": "d585da0b47c9f41a9e6ca684b6fd84ba41ebe87d",
-  "_shrinkwrap": null,
-  "_spec": "npm-user-validate@~0.1.2",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "rok@kowalski.gd",
-    "name": "Robert Kowalski"
+    "name": "Robert Kowalski",
+    "email": "rok@kowalski.gd"
   },
+  "license": "BSD-2-Clause",
+  "gitHead": "e5b280babff5b73fe74b496461bcf424a51881e1",
   "bugs": {
     "url": "https://github.com/npm/npm-user-validate/issues"
   },
-  "dependencies": {},
-  "description": "User validations for npm",
-  "devDependencies": {
-    "tap": "0.4.3"
+  "homepage": "https://github.com/npm/npm-user-validate#readme",
+  "_id": "npm-user-validate@0.1.2",
+  "_shasum": "d585da0b47c9f41a9e6ca684b6fd84ba41ebe87d",
+  "_from": "npm-user-validate@>=0.1.2 <0.2.0",
+  "_npmVersion": "2.10.0",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "isaacs@npmjs.com"
   },
-  "directories": {},
   "dist": {
     "shasum": "d585da0b47c9f41a9e6ca684b6fd84ba41ebe87d",
     "tarball": "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz"
   },
-  "gitHead": "e5b280babff5b73fe74b496461bcf424a51881e1",
-  "homepage": "https://github.com/npm/npm-user-validate#readme",
-  "keywords": [
-    "npm",
-    "registry",
-    "validation"
-  ],
-  "license": "BSD-2-Clause",
-  "main": "npm-user-validate.js",
   "maintainers": [
     {
       "name": "robertkowalski",
@@ -68,14 +51,6 @@
       "email": "i@izs.me"
     }
   ],
-  "name": "npm-user-validate",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/npm/npm-user-validate.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "0.1.2"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz"
 }
diff --git a/deps/npm/node_modules/generate-function/.npmignore b/deps/npm/node_modules/npmlog/node_modules/ansi/.npmignore
similarity index 100%
rename from deps/npm/node_modules/generate-function/.npmignore
rename to deps/npm/node_modules/npmlog/node_modules/ansi/.npmignore
diff --git a/deps/npm/node_modules/ansi/History.md b/deps/npm/node_modules/npmlog/node_modules/ansi/History.md
similarity index 100%
rename from deps/npm/node_modules/ansi/History.md
rename to deps/npm/node_modules/npmlog/node_modules/ansi/History.md
diff --git a/deps/npm/node_modules/ansi/README.md b/deps/npm/node_modules/npmlog/node_modules/ansi/README.md
similarity index 100%
rename from deps/npm/node_modules/ansi/README.md
rename to deps/npm/node_modules/npmlog/node_modules/ansi/README.md
diff --git a/deps/npm/node_modules/ansi/examples/beep/index.js b/deps/npm/node_modules/npmlog/node_modules/ansi/examples/beep/index.js
similarity index 100%
rename from deps/npm/node_modules/ansi/examples/beep/index.js
rename to deps/npm/node_modules/npmlog/node_modules/ansi/examples/beep/index.js
diff --git a/deps/npm/node_modules/ansi/examples/clear/index.js b/deps/npm/node_modules/npmlog/node_modules/ansi/examples/clear/index.js
similarity index 100%
rename from deps/npm/node_modules/ansi/examples/clear/index.js
rename to deps/npm/node_modules/npmlog/node_modules/ansi/examples/clear/index.js
diff --git a/deps/npm/node_modules/ansi/examples/cursorPosition.js b/deps/npm/node_modules/npmlog/node_modules/ansi/examples/cursorPosition.js
similarity index 100%
rename from deps/npm/node_modules/ansi/examples/cursorPosition.js
rename to deps/npm/node_modules/npmlog/node_modules/ansi/examples/cursorPosition.js
diff --git a/deps/npm/node_modules/ansi/examples/progress/index.js b/deps/npm/node_modules/npmlog/node_modules/ansi/examples/progress/index.js
similarity index 100%
rename from deps/npm/node_modules/ansi/examples/progress/index.js
rename to deps/npm/node_modules/npmlog/node_modules/ansi/examples/progress/index.js
diff --git a/deps/npm/node_modules/ansi/lib/ansi.js b/deps/npm/node_modules/npmlog/node_modules/ansi/lib/ansi.js
similarity index 100%
rename from deps/npm/node_modules/ansi/lib/ansi.js
rename to deps/npm/node_modules/npmlog/node_modules/ansi/lib/ansi.js
diff --git a/deps/npm/node_modules/ansi/lib/newlines.js b/deps/npm/node_modules/npmlog/node_modules/ansi/lib/newlines.js
similarity index 100%
rename from deps/npm/node_modules/ansi/lib/newlines.js
rename to deps/npm/node_modules/npmlog/node_modules/ansi/lib/newlines.js
diff --git a/deps/npm/node_modules/ansi/package.json b/deps/npm/node_modules/npmlog/node_modules/ansi/package.json
similarity index 62%
rename from deps/npm/node_modules/ansi/package.json
rename to deps/npm/node_modules/npmlog/node_modules/ansi/package.json
index cdef43ffa9b855..278a8f272698da 100644
--- a/deps/npm/node_modules/ansi/package.json
+++ b/deps/npm/node_modules/npmlog/node_modules/ansi/package.json
@@ -1,65 +1,39 @@
 {
-  "_args": [
-    [
-      "ansi@~0.3.0",
-      "/Users/rebecca/code/npm/node_modules/npmlog"
-    ]
-  ],
-  "_from": "ansi@>=0.3.0 <0.4.0",
-  "_id": "ansi@0.3.0",
-  "_inCache": true,
-  "_location": "/ansi",
-  "_npmUser": {
-    "email": "nathan@tootallnate.net",
-    "name": "tootallnate"
-  },
-  "_npmVersion": "1.4.9",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "ansi",
-    "raw": "ansi@~0.3.0",
-    "rawSpec": "~0.3.0",
-    "scope": null,
-    "spec": ">=0.3.0 <0.4.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/gauge",
-    "/npmlog"
+  "name": "ansi",
+  "description": "Advanced ANSI formatting tool for Node.js",
+  "keywords": [
+    "ansi",
+    "formatting",
+    "cursor",
+    "color",
+    "terminal",
+    "rgb",
+    "256",
+    "stream"
   ],
-  "_resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz",
-  "_shasum": "74b2f1f187c8553c7f95015bcb76009fb43d38e0",
-  "_shrinkwrap": null,
-  "_spec": "ansi@~0.3.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/npmlog",
+  "version": "0.3.0",
   "author": {
-    "email": "nathan@tootallnate.net",
     "name": "Nathan Rajlich",
+    "email": "nathan@tootallnate.net",
     "url": "http://tootallnate.net"
   },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/TooTallNate/ansi.js.git"
+  },
+  "main": "./lib/ansi.js",
   "bugs": {
     "url": "https://github.com/TooTallNate/ansi.js/issues"
   },
-  "dependencies": {},
-  "description": "Advanced ANSI formatting tool for Node.js",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "74b2f1f187c8553c7f95015bcb76009fb43d38e0",
-    "tarball": "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
-  },
   "homepage": "https://github.com/TooTallNate/ansi.js",
-  "keywords": [
-    "256",
-    "ansi",
-    "color",
-    "cursor",
-    "formatting",
-    "rgb",
-    "stream",
-    "terminal"
-  ],
-  "main": "./lib/ansi.js",
+  "_id": "ansi@0.3.0",
+  "_shasum": "74b2f1f187c8553c7f95015bcb76009fb43d38e0",
+  "_from": "ansi@>=0.3.0 <0.4.0",
+  "_npmVersion": "1.4.9",
+  "_npmUser": {
+    "name": "tootallnate",
+    "email": "nathan@tootallnate.net"
+  },
   "maintainers": [
     {
       "name": "TooTallNate",
@@ -70,11 +44,11 @@
       "email": "nathan@tootallnate.net"
     }
   ],
-  "name": "ansi",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/TooTallNate/ansi.js.git"
+  "dist": {
+    "shasum": "74b2f1f187c8553c7f95015bcb76009fb43d38e0",
+    "tarball": "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
   },
-  "version": "0.3.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/are-we-there-yet/.npmignore b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/.npmignore
similarity index 100%
rename from deps/npm/node_modules/are-we-there-yet/.npmignore
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/.npmignore
diff --git a/deps/npm/node_modules/are-we-there-yet/README.md b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/README.md
similarity index 100%
rename from deps/npm/node_modules/are-we-there-yet/README.md
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/README.md
diff --git a/deps/npm/node_modules/are-we-there-yet/index.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/index.js
similarity index 100%
rename from deps/npm/node_modules/are-we-there-yet/index.js
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/index.js
diff --git a/deps/npm/node_modules/delegates/.npmignore b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/.npmignore
similarity index 100%
rename from deps/npm/node_modules/delegates/.npmignore
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/.npmignore
diff --git a/deps/npm/node_modules/delegates/History.md b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/History.md
similarity index 100%
rename from deps/npm/node_modules/delegates/History.md
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/History.md
diff --git a/deps/npm/node_modules/delegates/Makefile b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/Makefile
similarity index 100%
rename from deps/npm/node_modules/delegates/Makefile
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/Makefile
diff --git a/deps/npm/node_modules/delegates/Readme.md b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/Readme.md
similarity index 100%
rename from deps/npm/node_modules/delegates/Readme.md
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/Readme.md
diff --git a/deps/npm/node_modules/delegates/index.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/index.js
similarity index 100%
rename from deps/npm/node_modules/delegates/index.js
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/index.js
diff --git a/deps/npm/node_modules/delegates/package.json b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/package.json
similarity index 59%
rename from deps/npm/node_modules/delegates/package.json
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/package.json
index 3d6aaa8fa4d883..ea3c1da0d490b2 100644
--- a/deps/npm/node_modules/delegates/package.json
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/package.json
@@ -1,56 +1,33 @@
 {
-  "_args": [
-    [
-      "delegates@^0.1.0",
-      "/Users/rebecca/code/npm/node_modules/are-we-there-yet"
-    ]
-  ],
-  "_from": "delegates@>=0.1.0 <0.2.0",
-  "_id": "delegates@0.1.0",
-  "_inCache": true,
-  "_location": "/delegates",
-  "_npmUser": {
-    "email": "dominic@dbarnes.info",
-    "name": "dominicbarnes"
-  },
-  "_npmVersion": "1.4.9",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "delegates",
-    "raw": "delegates@^0.1.0",
-    "rawSpec": "^0.1.0",
-    "scope": null,
-    "spec": ">=0.1.0 <0.2.0",
-    "type": "range"
+  "name": "delegates",
+  "version": "0.1.0",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/visionmedia/node-delegates.git"
   },
-  "_requiredBy": [
-    "/are-we-there-yet"
+  "description": "delegate methods and accessors to another property",
+  "keywords": [
+    "delegate",
+    "delegation"
   ],
-  "_resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz",
-  "_shasum": "b4b57be11a1653517a04b27f0949bdc327dfe390",
-  "_shrinkwrap": null,
-  "_spec": "delegates@^0.1.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/are-we-there-yet",
-  "bugs": {
-    "url": "https://github.com/visionmedia/node-delegates/issues"
-  },
   "dependencies": {},
-  "description": "delegate methods and accessors to another property",
   "devDependencies": {
     "mocha": "*",
     "should": "*"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "b4b57be11a1653517a04b27f0949bdc327dfe390",
-    "tarball": "http://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/visionmedia/node-delegates/issues"
   },
   "homepage": "https://github.com/visionmedia/node-delegates",
-  "keywords": [
-    "delegate",
-    "delegation"
-  ],
-  "license": "MIT",
+  "_id": "delegates@0.1.0",
+  "_shasum": "b4b57be11a1653517a04b27f0949bdc327dfe390",
+  "_from": "delegates@>=0.1.0 <0.2.0",
+  "_npmVersion": "1.4.9",
+  "_npmUser": {
+    "name": "dominicbarnes",
+    "email": "dominic@dbarnes.info"
+  },
   "maintainers": [
     {
       "name": "tjholowaychuk",
@@ -61,11 +38,11 @@
       "email": "dominic@dbarnes.info"
     }
   ],
-  "name": "delegates",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/visionmedia/node-delegates"
+  "dist": {
+    "shasum": "b4b57be11a1653517a04b27f0949bdc327dfe390",
+    "tarball": "http://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
   },
-  "version": "0.1.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/delegates/test/index.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/test/index.js
similarity index 100%
rename from deps/npm/node_modules/delegates/test/index.js
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/test/index.js
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/.npmignore b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/.npmignore
similarity index 100%
rename from deps/npm/node_modules/concat-stream/node_modules/readable-stream/.npmignore
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/.npmignore
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/LICENSE b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/LICENSE
similarity index 100%
rename from deps/npm/node_modules/concat-stream/node_modules/readable-stream/LICENSE
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/LICENSE
diff --git a/deps/npm/node_modules/readable-stream/README.md b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/README.md
similarity index 99%
rename from deps/npm/node_modules/readable-stream/README.md
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/README.md
index e46b823903d2c6..9e9b6eee9f349f 100644
--- a/deps/npm/node_modules/readable-stream/README.md
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/README.md
@@ -12,4 +12,3 @@ If you want to guarantee a stable streams base, regardless of what version of No
 **readable-stream** comes in two major versions, v1.0.x and v1.1.x. The former tracks the Streams2 implementation in Node 0.10, including bug-fixes and minor improvements as they are added. The latter tracks Streams3 as it develops in Node 0.11; we will likely see a v1.2.x branch for Node 0.12.
 
 **readable-stream** uses proper patch-level versioning so if you pin to `"~1.0.0"` you’ll get the latest Node 0.10 Streams2 implementation, including any fixes and minor non-breaking improvements. The patch-level versions of 1.0.x and 1.1.x should mirror the patch-level versions of Node-core releases. You should prefer the **1.0.x** releases for now and when you’re ready to start using Streams3, pin to `"~1.1.0"`
-
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/duplex.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/duplex.js
similarity index 100%
rename from deps/npm/node_modules/concat-stream/node_modules/readable-stream/duplex.js
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/duplex.js
diff --git a/deps/npm/node_modules/readable-stream/float.patch b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/float.patch
similarity index 100%
rename from deps/npm/node_modules/readable-stream/float.patch
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/float.patch
diff --git a/deps/npm/node_modules/readable-stream/lib/_stream_duplex.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_duplex.js
similarity index 100%
rename from deps/npm/node_modules/readable-stream/lib/_stream_duplex.js
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_duplex.js
diff --git a/deps/npm/node_modules/readable-stream/lib/_stream_passthrough.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_passthrough.js
similarity index 100%
rename from deps/npm/node_modules/readable-stream/lib/_stream_passthrough.js
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_passthrough.js
diff --git a/deps/npm/node_modules/readable-stream/lib/_stream_readable.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_readable.js
similarity index 100%
rename from deps/npm/node_modules/readable-stream/lib/_stream_readable.js
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_readable.js
diff --git a/deps/npm/node_modules/readable-stream/lib/_stream_transform.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_transform.js
similarity index 100%
rename from deps/npm/node_modules/readable-stream/lib/_stream_transform.js
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_transform.js
diff --git a/deps/npm/node_modules/readable-stream/lib/_stream_writable.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_writable.js
similarity index 100%
rename from deps/npm/node_modules/readable-stream/lib/_stream_writable.js
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_writable.js
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/README.md b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/README.md
new file mode 100644
index 00000000000000..5a76b4149c5eb5
--- /dev/null
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/README.md
@@ -0,0 +1,3 @@
+# core-util-is
+
+The `util.is*` functions introduced in Node v0.12.
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/float.patch b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/float.patch
new file mode 100644
index 00000000000000..a06d5c05f75fd5
--- /dev/null
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/float.patch
@@ -0,0 +1,604 @@
+diff --git a/lib/util.js b/lib/util.js
+index a03e874..9074e8e 100644
+--- a/lib/util.js
++++ b/lib/util.js
+@@ -19,430 +19,6 @@
+ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ // USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-var formatRegExp = /%[sdj%]/g;
+-exports.format = function(f) {
+-  if (!isString(f)) {
+-    var objects = [];
+-    for (var i = 0; i < arguments.length; i++) {
+-      objects.push(inspect(arguments[i]));
+-    }
+-    return objects.join(' ');
+-  }
+-
+-  var i = 1;
+-  var args = arguments;
+-  var len = args.length;
+-  var str = String(f).replace(formatRegExp, function(x) {
+-    if (x === '%%') return '%';
+-    if (i >= len) return x;
+-    switch (x) {
+-      case '%s': return String(args[i++]);
+-      case '%d': return Number(args[i++]);
+-      case '%j':
+-        try {
+-          return JSON.stringify(args[i++]);
+-        } catch (_) {
+-          return '[Circular]';
+-        }
+-      default:
+-        return x;
+-    }
+-  });
+-  for (var x = args[i]; i < len; x = args[++i]) {
+-    if (isNull(x) || !isObject(x)) {
+-      str += ' ' + x;
+-    } else {
+-      str += ' ' + inspect(x);
+-    }
+-  }
+-  return str;
+-};
+-
+-
+-// Mark that a method should not be used.
+-// Returns a modified function which warns once by default.
+-// If --no-deprecation is set, then it is a no-op.
+-exports.deprecate = function(fn, msg) {
+-  // Allow for deprecating things in the process of starting up.
+-  if (isUndefined(global.process)) {
+-    return function() {
+-      return exports.deprecate(fn, msg).apply(this, arguments);
+-    };
+-  }
+-
+-  if (process.noDeprecation === true) {
+-    return fn;
+-  }
+-
+-  var warned = false;
+-  function deprecated() {
+-    if (!warned) {
+-      if (process.throwDeprecation) {
+-        throw new Error(msg);
+-      } else if (process.traceDeprecation) {
+-        console.trace(msg);
+-      } else {
+-        console.error(msg);
+-      }
+-      warned = true;
+-    }
+-    return fn.apply(this, arguments);
+-  }
+-
+-  return deprecated;
+-};
+-
+-
+-var debugs = {};
+-var debugEnviron;
+-exports.debuglog = function(set) {
+-  if (isUndefined(debugEnviron))
+-    debugEnviron = process.env.NODE_DEBUG || '';
+-  set = set.toUpperCase();
+-  if (!debugs[set]) {
+-    if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
+-      var pid = process.pid;
+-      debugs[set] = function() {
+-        var msg = exports.format.apply(exports, arguments);
+-        console.error('%s %d: %s', set, pid, msg);
+-      };
+-    } else {
+-      debugs[set] = function() {};
+-    }
+-  }
+-  return debugs[set];
+-};
+-
+-
+-/**
+- * Echos the value of a value. Trys to print the value out
+- * in the best way possible given the different types.
+- *
+- * @param {Object} obj The object to print out.
+- * @param {Object} opts Optional options object that alters the output.
+- */
+-/* legacy: obj, showHidden, depth, colors*/
+-function inspect(obj, opts) {
+-  // default options
+-  var ctx = {
+-    seen: [],
+-    stylize: stylizeNoColor
+-  };
+-  // legacy...
+-  if (arguments.length >= 3) ctx.depth = arguments[2];
+-  if (arguments.length >= 4) ctx.colors = arguments[3];
+-  if (isBoolean(opts)) {
+-    // legacy...
+-    ctx.showHidden = opts;
+-  } else if (opts) {
+-    // got an "options" object
+-    exports._extend(ctx, opts);
+-  }
+-  // set default options
+-  if (isUndefined(ctx.showHidden)) ctx.showHidden = false;
+-  if (isUndefined(ctx.depth)) ctx.depth = 2;
+-  if (isUndefined(ctx.colors)) ctx.colors = false;
+-  if (isUndefined(ctx.customInspect)) ctx.customInspect = true;
+-  if (ctx.colors) ctx.stylize = stylizeWithColor;
+-  return formatValue(ctx, obj, ctx.depth);
+-}
+-exports.inspect = inspect;
+-
+-
+-// http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
+-inspect.colors = {
+-  'bold' : [1, 22],
+-  'italic' : [3, 23],
+-  'underline' : [4, 24],
+-  'inverse' : [7, 27],
+-  'white' : [37, 39],
+-  'grey' : [90, 39],
+-  'black' : [30, 39],
+-  'blue' : [34, 39],
+-  'cyan' : [36, 39],
+-  'green' : [32, 39],
+-  'magenta' : [35, 39],
+-  'red' : [31, 39],
+-  'yellow' : [33, 39]
+-};
+-
+-// Don't use 'blue' not visible on cmd.exe
+-inspect.styles = {
+-  'special': 'cyan',
+-  'number': 'yellow',
+-  'boolean': 'yellow',
+-  'undefined': 'grey',
+-  'null': 'bold',
+-  'string': 'green',
+-  'date': 'magenta',
+-  // "name": intentionally not styling
+-  'regexp': 'red'
+-};
+-
+-
+-function stylizeWithColor(str, styleType) {
+-  var style = inspect.styles[styleType];
+-
+-  if (style) {
+-    return '\u001b[' + inspect.colors[style][0] + 'm' + str +
+-           '\u001b[' + inspect.colors[style][1] + 'm';
+-  } else {
+-    return str;
+-  }
+-}
+-
+-
+-function stylizeNoColor(str, styleType) {
+-  return str;
+-}
+-
+-
+-function arrayToHash(array) {
+-  var hash = {};
+-
+-  array.forEach(function(val, idx) {
+-    hash[val] = true;
+-  });
+-
+-  return hash;
+-}
+-
+-
+-function formatValue(ctx, value, recurseTimes) {
+-  // Provide a hook for user-specified inspect functions.
+-  // Check that value is an object with an inspect function on it
+-  if (ctx.customInspect &&
+-      value &&
+-      isFunction(value.inspect) &&
+-      // Filter out the util module, it's inspect function is special
+-      value.inspect !== exports.inspect &&
+-      // Also filter out any prototype objects using the circular check.
+-      !(value.constructor && value.constructor.prototype === value)) {
+-    var ret = value.inspect(recurseTimes, ctx);
+-    if (!isString(ret)) {
+-      ret = formatValue(ctx, ret, recurseTimes);
+-    }
+-    return ret;
+-  }
+-
+-  // Primitive types cannot have properties
+-  var primitive = formatPrimitive(ctx, value);
+-  if (primitive) {
+-    return primitive;
+-  }
+-
+-  // Look up the keys of the object.
+-  var keys = Object.keys(value);
+-  var visibleKeys = arrayToHash(keys);
+-
+-  if (ctx.showHidden) {
+-    keys = Object.getOwnPropertyNames(value);
+-  }
+-
+-  // Some type of object without properties can be shortcutted.
+-  if (keys.length === 0) {
+-    if (isFunction(value)) {
+-      var name = value.name ? ': ' + value.name : '';
+-      return ctx.stylize('[Function' + name + ']', 'special');
+-    }
+-    if (isRegExp(value)) {
+-      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+-    }
+-    if (isDate(value)) {
+-      return ctx.stylize(Date.prototype.toString.call(value), 'date');
+-    }
+-    if (isError(value)) {
+-      return formatError(value);
+-    }
+-  }
+-
+-  var base = '', array = false, braces = ['{', '}'];
+-
+-  // Make Array say that they are Array
+-  if (isArray(value)) {
+-    array = true;
+-    braces = ['[', ']'];
+-  }
+-
+-  // Make functions say that they are functions
+-  if (isFunction(value)) {
+-    var n = value.name ? ': ' + value.name : '';
+-    base = ' [Function' + n + ']';
+-  }
+-
+-  // Make RegExps say that they are RegExps
+-  if (isRegExp(value)) {
+-    base = ' ' + RegExp.prototype.toString.call(value);
+-  }
+-
+-  // Make dates with properties first say the date
+-  if (isDate(value)) {
+-    base = ' ' + Date.prototype.toUTCString.call(value);
+-  }
+-
+-  // Make error with message first say the error
+-  if (isError(value)) {
+-    base = ' ' + formatError(value);
+-  }
+-
+-  if (keys.length === 0 && (!array || value.length == 0)) {
+-    return braces[0] + base + braces[1];
+-  }
+-
+-  if (recurseTimes < 0) {
+-    if (isRegExp(value)) {
+-      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+-    } else {
+-      return ctx.stylize('[Object]', 'special');
+-    }
+-  }
+-
+-  ctx.seen.push(value);
+-
+-  var output;
+-  if (array) {
+-    output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
+-  } else {
+-    output = keys.map(function(key) {
+-      return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
+-    });
+-  }
+-
+-  ctx.seen.pop();
+-
+-  return reduceToSingleString(output, base, braces);
+-}
+-
+-
+-function formatPrimitive(ctx, value) {
+-  if (isUndefined(value))
+-    return ctx.stylize('undefined', 'undefined');
+-  if (isString(value)) {
+-    var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
+-                                             .replace(/'/g, "\\'")
+-                                             .replace(/\\"/g, '"') + '\'';
+-    return ctx.stylize(simple, 'string');
+-  }
+-  if (isNumber(value)) {
+-    // Format -0 as '-0'. Strict equality won't distinguish 0 from -0,
+-    // so instead we use the fact that 1 / -0 < 0 whereas 1 / 0 > 0 .
+-    if (value === 0 && 1 / value < 0)
+-      return ctx.stylize('-0', 'number');
+-    return ctx.stylize('' + value, 'number');
+-  }
+-  if (isBoolean(value))
+-    return ctx.stylize('' + value, 'boolean');
+-  // For some reason typeof null is "object", so special case here.
+-  if (isNull(value))
+-    return ctx.stylize('null', 'null');
+-}
+-
+-
+-function formatError(value) {
+-  return '[' + Error.prototype.toString.call(value) + ']';
+-}
+-
+-
+-function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
+-  var output = [];
+-  for (var i = 0, l = value.length; i < l; ++i) {
+-    if (hasOwnProperty(value, String(i))) {
+-      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+-          String(i), true));
+-    } else {
+-      output.push('');
+-    }
+-  }
+-  keys.forEach(function(key) {
+-    if (!key.match(/^\d+$/)) {
+-      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+-          key, true));
+-    }
+-  });
+-  return output;
+-}
+-
+-
+-function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
+-  var name, str, desc;
+-  desc = Object.getOwnPropertyDescriptor(value, key) || { value: value[key] };
+-  if (desc.get) {
+-    if (desc.set) {
+-      str = ctx.stylize('[Getter/Setter]', 'special');
+-    } else {
+-      str = ctx.stylize('[Getter]', 'special');
+-    }
+-  } else {
+-    if (desc.set) {
+-      str = ctx.stylize('[Setter]', 'special');
+-    }
+-  }
+-  if (!hasOwnProperty(visibleKeys, key)) {
+-    name = '[' + key + ']';
+-  }
+-  if (!str) {
+-    if (ctx.seen.indexOf(desc.value) < 0) {
+-      if (isNull(recurseTimes)) {
+-        str = formatValue(ctx, desc.value, null);
+-      } else {
+-        str = formatValue(ctx, desc.value, recurseTimes - 1);
+-      }
+-      if (str.indexOf('\n') > -1) {
+-        if (array) {
+-          str = str.split('\n').map(function(line) {
+-            return '  ' + line;
+-          }).join('\n').substr(2);
+-        } else {
+-          str = '\n' + str.split('\n').map(function(line) {
+-            return '   ' + line;
+-          }).join('\n');
+-        }
+-      }
+-    } else {
+-      str = ctx.stylize('[Circular]', 'special');
+-    }
+-  }
+-  if (isUndefined(name)) {
+-    if (array && key.match(/^\d+$/)) {
+-      return str;
+-    }
+-    name = JSON.stringify('' + key);
+-    if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
+-      name = name.substr(1, name.length - 2);
+-      name = ctx.stylize(name, 'name');
+-    } else {
+-      name = name.replace(/'/g, "\\'")
+-                 .replace(/\\"/g, '"')
+-                 .replace(/(^"|"$)/g, "'");
+-      name = ctx.stylize(name, 'string');
+-    }
+-  }
+-
+-  return name + ': ' + str;
+-}
+-
+-
+-function reduceToSingleString(output, base, braces) {
+-  var numLinesEst = 0;
+-  var length = output.reduce(function(prev, cur) {
+-    numLinesEst++;
+-    if (cur.indexOf('\n') >= 0) numLinesEst++;
+-    return prev + cur.replace(/\u001b\[\d\d?m/g, '').length + 1;
+-  }, 0);
+-
+-  if (length > 60) {
+-    return braces[0] +
+-           (base === '' ? '' : base + '\n ') +
+-           ' ' +
+-           output.join(',\n  ') +
+-           ' ' +
+-           braces[1];
+-  }
+-
+-  return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
+-}
+-
+-
+ // NOTE: These type checking functions intentionally don't use `instanceof`
+ // because it is fragile and can be easily faked with `Object.create()`.
+ function isArray(ar) {
+@@ -522,166 +98,10 @@ function isPrimitive(arg) {
+ exports.isPrimitive = isPrimitive;
+
+ function isBuffer(arg) {
+-  return arg instanceof Buffer;
++  return Buffer.isBuffer(arg);
+ }
+ exports.isBuffer = isBuffer;
+
+ function objectToString(o) {
+   return Object.prototype.toString.call(o);
+-}
+-
+-
+-function pad(n) {
+-  return n < 10 ? '0' + n.toString(10) : n.toString(10);
+-}
+-
+-
+-var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',
+-              'Oct', 'Nov', 'Dec'];
+-
+-// 26 Feb 16:19:34
+-function timestamp() {
+-  var d = new Date();
+-  var time = [pad(d.getHours()),
+-              pad(d.getMinutes()),
+-              pad(d.getSeconds())].join(':');
+-  return [d.getDate(), months[d.getMonth()], time].join(' ');
+-}
+-
+-
+-// log is just a thin wrapper to console.log that prepends a timestamp
+-exports.log = function() {
+-  console.log('%s - %s', timestamp(), exports.format.apply(exports, arguments));
+-};
+-
+-
+-/**
+- * Inherit the prototype methods from one constructor into another.
+- *
+- * The Function.prototype.inherits from lang.js rewritten as a standalone
+- * function (not on Function.prototype). NOTE: If this file is to be loaded
+- * during bootstrapping this function needs to be rewritten using some native
+- * functions as prototype setup using normal JavaScript does not work as
+- * expected during bootstrapping (see mirror.js in r114903).
+- *
+- * @param {function} ctor Constructor function which needs to inherit the
+- *     prototype.
+- * @param {function} superCtor Constructor function to inherit prototype from.
+- */
+-exports.inherits = function(ctor, superCtor) {
+-  ctor.super_ = superCtor;
+-  ctor.prototype = Object.create(superCtor.prototype, {
+-    constructor: {
+-      value: ctor,
+-      enumerable: false,
+-      writable: true,
+-      configurable: true
+-    }
+-  });
+-};
+-
+-exports._extend = function(origin, add) {
+-  // Don't do anything if add isn't an object
+-  if (!add || !isObject(add)) return origin;
+-
+-  var keys = Object.keys(add);
+-  var i = keys.length;
+-  while (i--) {
+-    origin[keys[i]] = add[keys[i]];
+-  }
+-  return origin;
+-};
+-
+-function hasOwnProperty(obj, prop) {
+-  return Object.prototype.hasOwnProperty.call(obj, prop);
+-}
+-
+-
+-// Deprecated old stuff.
+-
+-exports.p = exports.deprecate(function() {
+-  for (var i = 0, len = arguments.length; i < len; ++i) {
+-    console.error(exports.inspect(arguments[i]));
+-  }
+-}, 'util.p: Use console.error() instead');
+-
+-
+-exports.exec = exports.deprecate(function() {
+-  return require('child_process').exec.apply(this, arguments);
+-}, 'util.exec is now called `child_process.exec`.');
+-
+-
+-exports.print = exports.deprecate(function() {
+-  for (var i = 0, len = arguments.length; i < len; ++i) {
+-    process.stdout.write(String(arguments[i]));
+-  }
+-}, 'util.print: Use console.log instead');
+-
+-
+-exports.puts = exports.deprecate(function() {
+-  for (var i = 0, len = arguments.length; i < len; ++i) {
+-    process.stdout.write(arguments[i] + '\n');
+-  }
+-}, 'util.puts: Use console.log instead');
+-
+-
+-exports.debug = exports.deprecate(function(x) {
+-  process.stderr.write('DEBUG: ' + x + '\n');
+-}, 'util.debug: Use console.error instead');
+-
+-
+-exports.error = exports.deprecate(function(x) {
+-  for (var i = 0, len = arguments.length; i < len; ++i) {
+-    process.stderr.write(arguments[i] + '\n');
+-  }
+-}, 'util.error: Use console.error instead');
+-
+-
+-exports.pump = exports.deprecate(function(readStream, writeStream, callback) {
+-  var callbackCalled = false;
+-
+-  function call(a, b, c) {
+-    if (callback && !callbackCalled) {
+-      callback(a, b, c);
+-      callbackCalled = true;
+-    }
+-  }
+-
+-  readStream.addListener('data', function(chunk) {
+-    if (writeStream.write(chunk) === false) readStream.pause();
+-  });
+-
+-  writeStream.addListener('drain', function() {
+-    readStream.resume();
+-  });
+-
+-  readStream.addListener('end', function() {
+-    writeStream.end();
+-  });
+-
+-  readStream.addListener('close', function() {
+-    call();
+-  });
+-
+-  readStream.addListener('error', function(err) {
+-    writeStream.end();
+-    call(err);
+-  });
+-
+-  writeStream.addListener('error', function(err) {
+-    readStream.destroy();
+-    call(err);
+-  });
+-}, 'util.pump(): Use readableStream.pipe() instead');
+-
+-
+-var uv;
+-exports._errnoException = function(err, syscall) {
+-  if (isUndefined(uv)) uv = process.binding('uv');
+-  var errname = uv.errname(err);
+-  var e = new Error(syscall + ' ' + errname);
+-  e.code = errname;
+-  e.errno = errname;
+-  e.syscall = syscall;
+-  return e;
+-};
++}
\ No newline at end of file
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/lib/util.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
new file mode 100644
index 00000000000000..9074e8ebcb61e9
--- /dev/null
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
@@ -0,0 +1,107 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// NOTE: These type checking functions intentionally don't use `instanceof`
+// because it is fragile and can be easily faked with `Object.create()`.
+function isArray(ar) {
+  return Array.isArray(ar);
+}
+exports.isArray = isArray;
+
+function isBoolean(arg) {
+  return typeof arg === 'boolean';
+}
+exports.isBoolean = isBoolean;
+
+function isNull(arg) {
+  return arg === null;
+}
+exports.isNull = isNull;
+
+function isNullOrUndefined(arg) {
+  return arg == null;
+}
+exports.isNullOrUndefined = isNullOrUndefined;
+
+function isNumber(arg) {
+  return typeof arg === 'number';
+}
+exports.isNumber = isNumber;
+
+function isString(arg) {
+  return typeof arg === 'string';
+}
+exports.isString = isString;
+
+function isSymbol(arg) {
+  return typeof arg === 'symbol';
+}
+exports.isSymbol = isSymbol;
+
+function isUndefined(arg) {
+  return arg === void 0;
+}
+exports.isUndefined = isUndefined;
+
+function isRegExp(re) {
+  return isObject(re) && objectToString(re) === '[object RegExp]';
+}
+exports.isRegExp = isRegExp;
+
+function isObject(arg) {
+  return typeof arg === 'object' && arg !== null;
+}
+exports.isObject = isObject;
+
+function isDate(d) {
+  return isObject(d) && objectToString(d) === '[object Date]';
+}
+exports.isDate = isDate;
+
+function isError(e) {
+  return isObject(e) &&
+      (objectToString(e) === '[object Error]' || e instanceof Error);
+}
+exports.isError = isError;
+
+function isFunction(arg) {
+  return typeof arg === 'function';
+}
+exports.isFunction = isFunction;
+
+function isPrimitive(arg) {
+  return arg === null ||
+         typeof arg === 'boolean' ||
+         typeof arg === 'number' ||
+         typeof arg === 'string' ||
+         typeof arg === 'symbol' ||  // ES6 symbol
+         typeof arg === 'undefined';
+}
+exports.isPrimitive = isPrimitive;
+
+function isBuffer(arg) {
+  return Buffer.isBuffer(arg);
+}
+exports.isBuffer = isBuffer;
+
+function objectToString(o) {
+  return Object.prototype.toString.call(o);
+}
\ No newline at end of file
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/package.json b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/package.json
new file mode 100644
index 00000000000000..b67333380c265e
--- /dev/null
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/package.json
@@ -0,0 +1,37 @@
+{
+  "name": "core-util-is",
+  "version": "1.0.1",
+  "description": "The `util.is*` functions introduced in Node v0.12.",
+  "main": "lib/util.js",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/core-util-is.git"
+  },
+  "keywords": [
+    "util",
+    "isBuffer",
+    "isArray",
+    "isNumber",
+    "isString",
+    "isRegExp",
+    "isThis",
+    "isThat",
+    "polyfill"
+  ],
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/isaacs/core-util-is/issues"
+  },
+  "readme": "# core-util-is\n\nThe `util.is*` functions introduced in Node v0.12.\n",
+  "readmeFilename": "README.md",
+  "homepage": "https://github.com/isaacs/core-util-is#readme",
+  "_id": "core-util-is@1.0.1",
+  "_shasum": "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538",
+  "_resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+  "_from": "core-util-is@>=1.0.0 <1.1.0"
+}
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/util.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/util.js
new file mode 100644
index 00000000000000..007fa10575636d
--- /dev/null
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/core-util-is/util.js
@@ -0,0 +1,106 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// NOTE: These type checking functions intentionally don't use `instanceof`
+// because it is fragile and can be easily faked with `Object.create()`.
+function isArray(ar) {
+  return Array.isArray(ar);
+}
+exports.isArray = isArray;
+
+function isBoolean(arg) {
+  return typeof arg === 'boolean';
+}
+exports.isBoolean = isBoolean;
+
+function isNull(arg) {
+  return arg === null;
+}
+exports.isNull = isNull;
+
+function isNullOrUndefined(arg) {
+  return arg == null;
+}
+exports.isNullOrUndefined = isNullOrUndefined;
+
+function isNumber(arg) {
+  return typeof arg === 'number';
+}
+exports.isNumber = isNumber;
+
+function isString(arg) {
+  return typeof arg === 'string';
+}
+exports.isString = isString;
+
+function isSymbol(arg) {
+  return typeof arg === 'symbol';
+}
+exports.isSymbol = isSymbol;
+
+function isUndefined(arg) {
+  return arg === void 0;
+}
+exports.isUndefined = isUndefined;
+
+function isRegExp(re) {
+  return isObject(re) && objectToString(re) === '[object RegExp]';
+}
+exports.isRegExp = isRegExp;
+
+function isObject(arg) {
+  return typeof arg === 'object' && arg !== null;
+}
+exports.isObject = isObject;
+
+function isDate(d) {
+  return isObject(d) && objectToString(d) === '[object Date]';
+}
+exports.isDate = isDate;
+
+function isError(e) {
+  return isObject(e) && objectToString(e) === '[object Error]';
+}
+exports.isError = isError;
+
+function isFunction(arg) {
+  return typeof arg === 'function';
+}
+exports.isFunction = isFunction;
+
+function isPrimitive(arg) {
+  return arg === null ||
+         typeof arg === 'boolean' ||
+         typeof arg === 'number' ||
+         typeof arg === 'string' ||
+         typeof arg === 'symbol' ||  // ES6 symbol
+         typeof arg === 'undefined';
+}
+exports.isPrimitive = isPrimitive;
+
+function isBuffer(arg) {
+  return arg instanceof Buffer;
+}
+exports.isBuffer = isBuffer;
+
+function objectToString(o) {
+  return Object.prototype.toString.call(o);
+}
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/README.md b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/README.md
new file mode 100644
index 00000000000000..052a62b8d7b7ae
--- /dev/null
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/README.md
@@ -0,0 +1,54 @@
+
+# isarray
+
+`Array#isArray` for older browsers.
+
+## Usage
+
+```js
+var isArray = require('isarray');
+
+console.log(isArray([])); // => true
+console.log(isArray({})); // => false
+```
+
+## Installation
+
+With [npm](http://npmjs.org) do
+
+```bash
+$ npm install isarray
+```
+
+Then bundle for the browser with
+[browserify](https://github.com/substack/browserify).
+
+With [component](http://component.io) do
+
+```bash
+$ component install juliangruber/isarray
+```
+
+## License
+
+(MIT)
+
+Copyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/build/build.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/build/build.js
new file mode 100644
index 00000000000000..e1856ef0943728
--- /dev/null
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/build/build.js
@@ -0,0 +1,208 @@
+
+/**
+ * Require the given path.
+ *
+ * @param {String} path
+ * @return {Object} exports
+ * @api public
+ */
+
+function require(path, parent, orig) {
+  var resolved = require.resolve(path);
+
+  // lookup failed
+  if (null == resolved) {
+    orig = orig || path;
+    parent = parent || 'root';
+    var err = new Error('Failed to require "' + orig + '" from "' + parent + '"');
+    err.path = orig;
+    err.parent = parent;
+    err.require = true;
+    throw err;
+  }
+
+  var module = require.modules[resolved];
+
+  // perform real require()
+  // by invoking the module's
+  // registered function
+  if (!module.exports) {
+    module.exports = {};
+    module.client = module.component = true;
+    module.call(this, module.exports, require.relative(resolved), module);
+  }
+
+  return module.exports;
+}
+
+/**
+ * Registered modules.
+ */
+
+require.modules = {};
+
+/**
+ * Registered aliases.
+ */
+
+require.aliases = {};
+
+/**
+ * Resolve `path`.
+ *
+ * Lookup:
+ *
+ *   - PATH/index.js
+ *   - PATH.js
+ *   - PATH
+ *
+ * @param {String} path
+ * @return {String} path or null
+ * @api private
+ */
+
+require.resolve = function(path) {
+  if (path.charAt(0) === '/') path = path.slice(1);
+  var index = path + '/index.js';
+
+  var paths = [
+    path,
+    path + '.js',
+    path + '.json',
+    path + '/index.js',
+    path + '/index.json'
+  ];
+
+  for (var i = 0; i < paths.length; i++) {
+    var path = paths[i];
+    if (require.modules.hasOwnProperty(path)) return path;
+  }
+
+  if (require.aliases.hasOwnProperty(index)) {
+    return require.aliases[index];
+  }
+};
+
+/**
+ * Normalize `path` relative to the current path.
+ *
+ * @param {String} curr
+ * @param {String} path
+ * @return {String}
+ * @api private
+ */
+
+require.normalize = function(curr, path) {
+  var segs = [];
+
+  if ('.' != path.charAt(0)) return path;
+
+  curr = curr.split('/');
+  path = path.split('/');
+
+  for (var i = 0; i < path.length; ++i) {
+    if ('..' == path[i]) {
+      curr.pop();
+    } else if ('.' != path[i] && '' != path[i]) {
+      segs.push(path[i]);
+    }
+  }
+
+  return curr.concat(segs).join('/');
+};
+
+/**
+ * Register module at `path` with callback `definition`.
+ *
+ * @param {String} path
+ * @param {Function} definition
+ * @api private
+ */
+
+require.register = function(path, definition) {
+  require.modules[path] = definition;
+};
+
+/**
+ * Alias a module definition.
+ *
+ * @param {String} from
+ * @param {String} to
+ * @api private
+ */
+
+require.alias = function(from, to) {
+  if (!require.modules.hasOwnProperty(from)) {
+    throw new Error('Failed to alias "' + from + '", it does not exist');
+  }
+  require.aliases[to] = from;
+};
+
+/**
+ * Return a require function relative to the `parent` path.
+ *
+ * @param {String} parent
+ * @return {Function}
+ * @api private
+ */
+
+require.relative = function(parent) {
+  var p = require.normalize(parent, '..');
+
+  /**
+   * lastIndexOf helper.
+   */
+
+  function lastIndexOf(arr, obj) {
+    var i = arr.length;
+    while (i--) {
+      if (arr[i] === obj) return i;
+    }
+    return -1;
+  }
+
+  /**
+   * The relative require() itself.
+   */
+
+  function localRequire(path) {
+    var resolved = localRequire.resolve(path);
+    return require(resolved, parent, path);
+  }
+
+  /**
+   * Resolve relative to the parent.
+   */
+
+  localRequire.resolve = function(path) {
+    var c = path.charAt(0);
+    if ('/' == c) return path.slice(1);
+    if ('.' == c) return require.normalize(p, path);
+
+    // resolve deps by returning
+    // the dep in the nearest "deps"
+    // directory
+    var segs = parent.split('/');
+    var i = lastIndexOf(segs, 'deps') + 1;
+    if (!i) i = 0;
+    path = segs.slice(0, i + 1).join('/') + '/deps/' + path;
+    return path;
+  };
+
+  /**
+   * Check if module is defined at `path`.
+   */
+
+  localRequire.exists = function(path) {
+    return require.modules.hasOwnProperty(localRequire.resolve(path));
+  };
+
+  return localRequire;
+};
+require.register("isarray/index.js", function(exports, require, module){
+module.exports = Array.isArray || function (arr) {
+  return Object.prototype.toString.call(arr) == '[object Array]';
+};
+
+});
+require.alias("isarray/index.js", "isarray/index.js");
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/component.json b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/component.json
new file mode 100644
index 00000000000000..9e31b683889015
--- /dev/null
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/component.json
@@ -0,0 +1,19 @@
+{
+  "name" : "isarray",
+  "description" : "Array#isArray for older browsers",
+  "version" : "0.0.1",
+  "repository" : "juliangruber/isarray",
+  "homepage": "https://github.com/juliangruber/isarray",
+  "main" : "index.js",
+  "scripts" : [
+    "index.js"
+  ],
+  "dependencies" : {},
+  "keywords": ["browser","isarray","array"],
+  "author": {
+    "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
+    "url": "http://juliangruber.com"
+  },
+  "license": "MIT"
+}
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/index.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/index.js
new file mode 100644
index 00000000000000..5f5ad45d46dda9
--- /dev/null
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/index.js
@@ -0,0 +1,3 @@
+module.exports = Array.isArray || function (arr) {
+  return Object.prototype.toString.call(arr) == '[object Array]';
+};
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/package.json b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/package.json
new file mode 100644
index 00000000000000..fb1eb3786d8168
--- /dev/null
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/isarray/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "isarray",
+  "description": "Array#isArray for older browsers",
+  "version": "0.0.1",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/juliangruber/isarray.git"
+  },
+  "homepage": "https://github.com/juliangruber/isarray",
+  "main": "index.js",
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "tap": "*"
+  },
+  "keywords": [
+    "browser",
+    "isarray",
+    "array"
+  ],
+  "author": {
+    "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
+    "url": "http://juliangruber.com"
+  },
+  "license": "MIT",
+  "readme": "\n# isarray\n\n`Array#isArray` for older browsers.\n\n## Usage\n\n```js\nvar isArray = require('isarray');\n\nconsole.log(isArray([])); // => true\nconsole.log(isArray({})); // => false\n```\n\n## Installation\n\nWith [npm](http://npmjs.org) do\n\n```bash\n$ npm install isarray\n```\n\nThen bundle for the browser with\n[browserify](https://github.com/substack/browserify).\n\nWith [component](http://component.io) do\n\n```bash\n$ component install juliangruber/isarray\n```\n\n## License\n\n(MIT)\n\nCopyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the \"Software\"), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\nof the Software, and to permit persons to whom the Software is furnished to do\nso, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/juliangruber/isarray/issues"
+  },
+  "_id": "isarray@0.0.1",
+  "_shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf",
+  "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+  "_from": "isarray@0.0.1"
+}
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/.npmignore b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/.npmignore
new file mode 100644
index 00000000000000..206320cc1d21b9
--- /dev/null
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/.npmignore
@@ -0,0 +1,2 @@
+build
+test
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/LICENSE b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/LICENSE
new file mode 100644
index 00000000000000..6de584a48f5c89
--- /dev/null
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/LICENSE
@@ -0,0 +1,20 @@
+Copyright Joyent, Inc. and other Node contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/README.md b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/README.md
new file mode 100644
index 00000000000000..4d2aa001501107
--- /dev/null
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/README.md
@@ -0,0 +1,7 @@
+**string_decoder.js** (`require('string_decoder')`) from Node.js core
+
+Copyright Joyent, Inc. and other Node contributors. See LICENCE file for details.
+
+Version numbers match the versions found in Node core, e.g. 0.10.24 matches Node 0.10.24, likewise 0.11.10 matches Node 0.11.10. **Prefer the stable version over the unstable.**
+
+The *build/* directory contains a build script that will scrape the source from the [joyent/node](https://github.com/joyent/node) repo given a specific Node version.
\ No newline at end of file
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/index.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/index.js
new file mode 100644
index 00000000000000..b00e54fb790982
--- /dev/null
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/index.js
@@ -0,0 +1,221 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var Buffer = require('buffer').Buffer;
+
+var isBufferEncoding = Buffer.isEncoding
+  || function(encoding) {
+       switch (encoding && encoding.toLowerCase()) {
+         case 'hex': case 'utf8': case 'utf-8': case 'ascii': case 'binary': case 'base64': case 'ucs2': case 'ucs-2': case 'utf16le': case 'utf-16le': case 'raw': return true;
+         default: return false;
+       }
+     }
+
+
+function assertEncoding(encoding) {
+  if (encoding && !isBufferEncoding(encoding)) {
+    throw new Error('Unknown encoding: ' + encoding);
+  }
+}
+
+// StringDecoder provides an interface for efficiently splitting a series of
+// buffers into a series of JS strings without breaking apart multi-byte
+// characters. CESU-8 is handled as part of the UTF-8 encoding.
+//
+// @TODO Handling all encodings inside a single object makes it very difficult
+// to reason about this code, so it should be split up in the future.
+// @TODO There should be a utf8-strict encoding that rejects invalid UTF-8 code
+// points as used by CESU-8.
+var StringDecoder = exports.StringDecoder = function(encoding) {
+  this.encoding = (encoding || 'utf8').toLowerCase().replace(/[-_]/, '');
+  assertEncoding(encoding);
+  switch (this.encoding) {
+    case 'utf8':
+      // CESU-8 represents each of Surrogate Pair by 3-bytes
+      this.surrogateSize = 3;
+      break;
+    case 'ucs2':
+    case 'utf16le':
+      // UTF-16 represents each of Surrogate Pair by 2-bytes
+      this.surrogateSize = 2;
+      this.detectIncompleteChar = utf16DetectIncompleteChar;
+      break;
+    case 'base64':
+      // Base-64 stores 3 bytes in 4 chars, and pads the remainder.
+      this.surrogateSize = 3;
+      this.detectIncompleteChar = base64DetectIncompleteChar;
+      break;
+    default:
+      this.write = passThroughWrite;
+      return;
+  }
+
+  // Enough space to store all bytes of a single character. UTF-8 needs 4
+  // bytes, but CESU-8 may require up to 6 (3 bytes per surrogate).
+  this.charBuffer = new Buffer(6);
+  // Number of bytes received for the current incomplete multi-byte character.
+  this.charReceived = 0;
+  // Number of bytes expected for the current incomplete multi-byte character.
+  this.charLength = 0;
+};
+
+
+// write decodes the given buffer and returns it as JS string that is
+// guaranteed to not contain any partial multi-byte characters. Any partial
+// character found at the end of the buffer is buffered up, and will be
+// returned when calling write again with the remaining bytes.
+//
+// Note: Converting a Buffer containing an orphan surrogate to a String
+// currently works, but converting a String to a Buffer (via `new Buffer`, or
+// Buffer#write) will replace incomplete surrogates with the unicode
+// replacement character. See https://codereview.chromium.org/121173009/ .
+StringDecoder.prototype.write = function(buffer) {
+  var charStr = '';
+  // if our last write ended with an incomplete multibyte character
+  while (this.charLength) {
+    // determine how many remaining bytes this buffer has to offer for this char
+    var available = (buffer.length >= this.charLength - this.charReceived) ?
+        this.charLength - this.charReceived :
+        buffer.length;
+
+    // add the new bytes to the char buffer
+    buffer.copy(this.charBuffer, this.charReceived, 0, available);
+    this.charReceived += available;
+
+    if (this.charReceived < this.charLength) {
+      // still not enough chars in this buffer? wait for more ...
+      return '';
+    }
+
+    // remove bytes belonging to the current character from the buffer
+    buffer = buffer.slice(available, buffer.length);
+
+    // get the character that was split
+    charStr = this.charBuffer.slice(0, this.charLength).toString(this.encoding);
+
+    // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character
+    var charCode = charStr.charCodeAt(charStr.length - 1);
+    if (charCode >= 0xD800 && charCode <= 0xDBFF) {
+      this.charLength += this.surrogateSize;
+      charStr = '';
+      continue;
+    }
+    this.charReceived = this.charLength = 0;
+
+    // if there are no more bytes in this buffer, just emit our char
+    if (buffer.length === 0) {
+      return charStr;
+    }
+    break;
+  }
+
+  // determine and set charLength / charReceived
+  this.detectIncompleteChar(buffer);
+
+  var end = buffer.length;
+  if (this.charLength) {
+    // buffer the incomplete character bytes we got
+    buffer.copy(this.charBuffer, 0, buffer.length - this.charReceived, end);
+    end -= this.charReceived;
+  }
+
+  charStr += buffer.toString(this.encoding, 0, end);
+
+  var end = charStr.length - 1;
+  var charCode = charStr.charCodeAt(end);
+  // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character
+  if (charCode >= 0xD800 && charCode <= 0xDBFF) {
+    var size = this.surrogateSize;
+    this.charLength += size;
+    this.charReceived += size;
+    this.charBuffer.copy(this.charBuffer, size, 0, size);
+    buffer.copy(this.charBuffer, 0, 0, size);
+    return charStr.substring(0, end);
+  }
+
+  // or just emit the charStr
+  return charStr;
+};
+
+// detectIncompleteChar determines if there is an incomplete UTF-8 character at
+// the end of the given buffer. If so, it sets this.charLength to the byte
+// length that character, and sets this.charReceived to the number of bytes
+// that are available for this character.
+StringDecoder.prototype.detectIncompleteChar = function(buffer) {
+  // determine how many bytes we have to check at the end of this buffer
+  var i = (buffer.length >= 3) ? 3 : buffer.length;
+
+  // Figure out if one of the last i bytes of our buffer announces an
+  // incomplete char.
+  for (; i > 0; i--) {
+    var c = buffer[buffer.length - i];
+
+    // See http://en.wikipedia.org/wiki/UTF-8#Description
+
+    // 110XXXXX
+    if (i == 1 && c >> 5 == 0x06) {
+      this.charLength = 2;
+      break;
+    }
+
+    // 1110XXXX
+    if (i <= 2 && c >> 4 == 0x0E) {
+      this.charLength = 3;
+      break;
+    }
+
+    // 11110XXX
+    if (i <= 3 && c >> 3 == 0x1E) {
+      this.charLength = 4;
+      break;
+    }
+  }
+  this.charReceived = i;
+};
+
+StringDecoder.prototype.end = function(buffer) {
+  var res = '';
+  if (buffer && buffer.length)
+    res = this.write(buffer);
+
+  if (this.charReceived) {
+    var cr = this.charReceived;
+    var buf = this.charBuffer;
+    var enc = this.encoding;
+    res += buf.slice(0, cr).toString(enc);
+  }
+
+  return res;
+};
+
+function passThroughWrite(buffer) {
+  return buffer.toString(this.encoding);
+}
+
+function utf16DetectIncompleteChar(buffer) {
+  this.charReceived = buffer.length % 2;
+  this.charLength = this.charReceived ? 2 : 0;
+}
+
+function base64DetectIncompleteChar(buffer) {
+  this.charReceived = buffer.length % 3;
+  this.charLength = this.charReceived ? 3 : 0;
+}
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/package.json b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/package.json
new file mode 100644
index 00000000000000..ee70702359198d
--- /dev/null
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/string_decoder/package.json
@@ -0,0 +1,34 @@
+{
+  "name": "string_decoder",
+  "version": "0.10.31",
+  "description": "The string_decoder module from Node core",
+  "main": "index.js",
+  "dependencies": {},
+  "devDependencies": {
+    "tap": "~0.4.8"
+  },
+  "scripts": {
+    "test": "tap test/simple/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/rvagg/string_decoder.git"
+  },
+  "homepage": "https://github.com/rvagg/string_decoder",
+  "keywords": [
+    "string",
+    "decoder",
+    "browser",
+    "browserify"
+  ],
+  "license": "MIT",
+  "readme": "**string_decoder.js** (`require('string_decoder')`) from Node.js core\n\nCopyright Joyent, Inc. and other Node contributors. See LICENCE file for details.\n\nVersion numbers match the versions found in Node core, e.g. 0.10.24 matches Node 0.10.24, likewise 0.11.10 matches Node 0.11.10. **Prefer the stable version over the unstable.**\n\nThe *build/* directory contains a build script that will scrape the source from the [joyent/node](https://github.com/joyent/node) repo given a specific Node version.",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/rvagg/string_decoder/issues"
+  },
+  "_id": "string_decoder@0.10.31",
+  "_shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94",
+  "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+  "_from": "string_decoder@>=0.10.0 <0.11.0"
+}
diff --git a/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/package.json b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/package.json
new file mode 100644
index 00000000000000..5e945ce1121c8c
--- /dev/null
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/package.json
@@ -0,0 +1,46 @@
+{
+  "name": "readable-stream",
+  "version": "1.1.13",
+  "description": "Streams3, a user-land copy of the stream library from Node.js v0.11.x",
+  "main": "readable.js",
+  "dependencies": {
+    "core-util-is": "~1.0.0",
+    "isarray": "0.0.1",
+    "string_decoder": "~0.10.x",
+    "inherits": "~2.0.1"
+  },
+  "devDependencies": {
+    "tap": "~0.2.6"
+  },
+  "scripts": {
+    "test": "tap test/simple/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/readable-stream.git"
+  },
+  "keywords": [
+    "readable",
+    "stream",
+    "pipe"
+  ],
+  "browser": {
+    "util": false
+  },
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
+  },
+  "license": "MIT",
+  "readme": "# readable-stream\n\n***Node-core streams for userland***\n\n[![NPM](https://nodei.co/npm/readable-stream.png?downloads=true&downloadRank=true)](https://nodei.co/npm/readable-stream/)\n[![NPM](https://nodei.co/npm-dl/readable-stream.png&months=6&height=3)](https://nodei.co/npm/readable-stream/)\n\nThis package is a mirror of the Streams2 and Streams3 implementations in Node-core.\n\nIf you want to guarantee a stable streams base, regardless of what version of Node you, or the users of your libraries are using, use **readable-stream** *only* and avoid the *\"stream\"* module in Node-core.\n\n**readable-stream** comes in two major versions, v1.0.x and v1.1.x. The former tracks the Streams2 implementation in Node 0.10, including bug-fixes and minor improvements as they are added. The latter tracks Streams3 as it develops in Node 0.11; we will likely see a v1.2.x branch for Node 0.12.\n\n**readable-stream** uses proper patch-level versioning so if you pin to `\"~1.0.0\"` you’ll get the latest Node 0.10 Streams2 implementation, including any fixes and minor non-breaking improvements. The patch-level versions of 1.0.x and 1.1.x should mirror the patch-level versions of Node-core releases. You should prefer the **1.0.x** releases for now and when you’re ready to start using Streams3, pin to `\"~1.1.0\"`\n\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/isaacs/readable-stream/issues"
+  },
+  "homepage": "https://github.com/isaacs/readable-stream#readme",
+  "_id": "readable-stream@1.1.13",
+  "_shasum": "f6eef764f514c89e2b9e23146a75ba106756d23e",
+  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+  "_from": "readable-stream@>=1.1.13 <2.0.0"
+}
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/passthrough.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/passthrough.js
similarity index 100%
rename from deps/npm/node_modules/concat-stream/node_modules/readable-stream/passthrough.js
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/passthrough.js
diff --git a/deps/npm/node_modules/readable-stream/readable.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/readable.js
similarity index 100%
rename from deps/npm/node_modules/readable-stream/readable.js
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/readable.js
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/transform.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/transform.js
similarity index 100%
rename from deps/npm/node_modules/concat-stream/node_modules/readable-stream/transform.js
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/transform.js
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/writable.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/writable.js
similarity index 100%
rename from deps/npm/node_modules/concat-stream/node_modules/readable-stream/writable.js
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/writable.js
diff --git a/deps/npm/node_modules/are-we-there-yet/package.json b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/package.json
similarity index 63%
rename from deps/npm/node_modules/are-we-there-yet/package.json
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/package.json
index 008eec8352374d..759100666932a3 100644
--- a/deps/npm/node_modules/are-we-there-yet/package.json
+++ b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/package.json
@@ -1,74 +1,51 @@
 {
-  "_args": [
-    [
-      "are-we-there-yet@~1.0.0",
-      "/Users/rebecca/code/npm/node_modules/npmlog"
-    ]
-  ],
-  "_from": "are-we-there-yet@>=1.0.0 <1.1.0",
-  "_id": "are-we-there-yet@1.0.4",
-  "_inCache": true,
-  "_location": "/are-we-there-yet",
-  "_npmUser": {
-    "email": "me@re-becca.org",
-    "name": "iarna"
+  "name": "are-we-there-yet",
+  "version": "1.0.4",
+  "description": "Keep track of the overall completion of many dispirate processes",
+  "main": "index.js",
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "_npmVersion": "2.0.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "are-we-there-yet",
-    "raw": "are-we-there-yet@~1.0.0",
-    "rawSpec": "~1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <1.1.0",
-    "type": "range"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/iarna/are-we-there-yet.git"
   },
-  "_requiredBy": [
-    "/npmlog"
-  ],
-  "_resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
-  "_shasum": "527fe389f7bcba90806106b99244eaa07e886f85",
-  "_shrinkwrap": null,
-  "_spec": "are-we-there-yet@~1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/npmlog",
   "author": {
     "name": "Rebecca Turner",
     "url": "http://re-becca.org"
   },
+  "license": "ISC",
   "bugs": {
     "url": "https://github.com/iarna/are-we-there-yet/issues"
   },
-  "dependencies": {
-    "delegates": "^0.1.0",
-    "readable-stream": "^1.1.13"
-  },
-  "description": "Keep track of the overall completion of many dispirate processes",
+  "homepage": "https://github.com/iarna/are-we-there-yet",
   "devDependencies": {
     "tap": "^0.4.13"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "527fe389f7bcba90806106b99244eaa07e886f85",
-    "tarball": "http://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz"
+  "dependencies": {
+    "delegates": "^0.1.0",
+    "readable-stream": "^1.1.13"
   },
   "gitHead": "7ce414849b81ab83935a935275def01914821bde",
-  "homepage": "https://github.com/iarna/are-we-there-yet",
-  "license": "ISC",
-  "main": "index.js",
+  "_id": "are-we-there-yet@1.0.4",
+  "_shasum": "527fe389f7bcba90806106b99244eaa07e886f85",
+  "_from": "are-we-there-yet@>=1.0.0 <1.1.0",
+  "_npmVersion": "2.0.0",
+  "_npmUser": {
+    "name": "iarna",
+    "email": "me@re-becca.org"
+  },
   "maintainers": [
     {
       "name": "iarna",
       "email": "me@re-becca.org"
     }
   ],
-  "name": "are-we-there-yet",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/iarna/are-we-there-yet.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "dist": {
+    "shasum": "527fe389f7bcba90806106b99244eaa07e886f85",
+    "tarball": "http://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz"
   },
-  "version": "1.0.4"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/are-we-there-yet/test/tracker.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/test/tracker.js
similarity index 100%
rename from deps/npm/node_modules/are-we-there-yet/test/tracker.js
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/test/tracker.js
diff --git a/deps/npm/node_modules/are-we-there-yet/test/trackergroup.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/test/trackergroup.js
similarity index 100%
rename from deps/npm/node_modules/are-we-there-yet/test/trackergroup.js
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/test/trackergroup.js
diff --git a/deps/npm/node_modules/are-we-there-yet/test/trackerstream.js b/deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/test/trackerstream.js
similarity index 100%
rename from deps/npm/node_modules/are-we-there-yet/test/trackerstream.js
rename to deps/npm/node_modules/npmlog/node_modules/are-we-there-yet/test/trackerstream.js
diff --git a/deps/npm/node_modules/gauge/.npmignore b/deps/npm/node_modules/npmlog/node_modules/gauge/.npmignore
similarity index 100%
rename from deps/npm/node_modules/gauge/.npmignore
rename to deps/npm/node_modules/npmlog/node_modules/gauge/.npmignore
diff --git a/deps/npm/node_modules/gauge/LICENSE b/deps/npm/node_modules/npmlog/node_modules/gauge/LICENSE
similarity index 100%
rename from deps/npm/node_modules/gauge/LICENSE
rename to deps/npm/node_modules/npmlog/node_modules/gauge/LICENSE
diff --git a/deps/npm/node_modules/gauge/README.md b/deps/npm/node_modules/npmlog/node_modules/gauge/README.md
similarity index 100%
rename from deps/npm/node_modules/gauge/README.md
rename to deps/npm/node_modules/npmlog/node_modules/gauge/README.md
diff --git a/deps/npm/node_modules/gauge/example.png b/deps/npm/node_modules/npmlog/node_modules/gauge/example.png
similarity index 100%
rename from deps/npm/node_modules/gauge/example.png
rename to deps/npm/node_modules/npmlog/node_modules/gauge/example.png
diff --git a/deps/npm/node_modules/lodash._basetostring/LICENSE b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/LICENSE
similarity index 100%
rename from deps/npm/node_modules/lodash._basetostring/LICENSE
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/LICENSE
diff --git a/deps/npm/node_modules/lodash._basetostring/README.md b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash._basetostring/README.md
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/README.md
diff --git a/deps/npm/node_modules/lodash._basetostring/index.js b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash._basetostring/index.js
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/index.js
diff --git a/deps/npm/node_modules/lodash._basetostring/package.json b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/package.json
similarity index 71%
rename from deps/npm/node_modules/lodash._basetostring/package.json
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/package.json
index 072f16bd0207e2..d89bde9d071ea7 100644
--- a/deps/npm/node_modules/lodash._basetostring/package.json
+++ b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._basetostring/package.json
@@ -1,48 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._basetostring@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash.pad"
-    ]
-  ],
-  "_from": "lodash._basetostring@>=3.0.0 <4.0.0",
-  "_id": "lodash._basetostring@3.0.1",
-  "_inCache": true,
-  "_location": "/lodash._basetostring",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.12.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._basetostring",
-    "raw": "lodash._basetostring@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash.pad",
-    "/lodash.padleft",
-    "/lodash.padright",
-    "/lodash.repeat"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-  "_shasum": "d1861d877f824a52f669832dcaf3ee15566a07d5",
-  "_shrinkwrap": null,
-  "_spec": "lodash._basetostring@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash.pad",
+  "name": "lodash._basetostring",
+  "version": "3.0.1",
+  "description": "The modern build of lodash’s internal `baseToString` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -70,17 +37,25 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
-  "dependencies": {},
-  "description": "The modern build of lodash’s internal `baseToString` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "d1861d877f824a52f669832dcaf3ee15566a07d5",
-    "tarball": "http://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._basetostring@3.0.1",
+  "_shasum": "d1861d877f824a52f669832dcaf3ee15566a07d5",
+  "_from": "lodash._basetostring@3.0.1",
+  "_npmVersion": "2.12.0",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "name": "jdalton",
+    "email": "john.david.dalton@gmail.com"
   },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
   "maintainers": [
     {
       "name": "jdalton",
@@ -103,14 +78,11 @@
       "email": "blaine@iceddev.com"
     }
   ],
-  "name": "lodash._basetostring",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lodash/lodash.git"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  "dist": {
+    "shasum": "d1861d877f824a52f669832dcaf3ee15566a07d5",
+    "tarball": "http://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
   },
-  "version": "3.0.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/lodash._createpadding/LICENSE b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/LICENSE
similarity index 100%
rename from deps/npm/node_modules/lodash._createpadding/LICENSE
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/LICENSE
diff --git a/deps/npm/node_modules/lodash._createpadding/README.md b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash._createpadding/README.md
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/README.md
diff --git a/deps/npm/node_modules/lodash._createpadding/index.js b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash._createpadding/index.js
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/index.js
diff --git a/deps/npm/node_modules/lodash.pad/LICENSE b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/LICENSE
similarity index 100%
rename from deps/npm/node_modules/lodash.pad/LICENSE
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/LICENSE
diff --git a/deps/npm/node_modules/lodash.repeat/README.md b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash.repeat/README.md
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/README.md
diff --git a/deps/npm/node_modules/lodash.repeat/index.js b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash.repeat/index.js
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/index.js
diff --git a/deps/npm/node_modules/lodash.repeat/package.json b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/package.json
similarity index 76%
rename from deps/npm/node_modules/lodash.repeat/package.json
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/package.json
index a7294ef3514575..f941138c4bfdcf 100644
--- a/deps/npm/node_modules/lodash.repeat/package.json
+++ b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/node_modules/lodash.repeat/package.json
@@ -1,45 +1,21 @@
 {
-  "_args": [
-    [
-      "lodash.repeat@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash._createpadding"
-    ]
-  ],
-  "_from": "lodash.repeat@>=3.0.0 <4.0.0",
-  "_id": "lodash.repeat@3.0.1",
-  "_inCache": true,
-  "_location": "/lodash.repeat",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.12.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash.repeat",
-    "raw": "lodash.repeat@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash._createpadding"
+  "name": "lodash.repeat",
+  "version": "3.0.1",
+  "description": "The modern build of lodash’s `_.repeat` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
   ],
-  "_resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz",
-  "_shasum": "f4b98dc7ef67256ce61e7874e1865edb208e0edf",
-  "_shrinkwrap": null,
-  "_spec": "lodash.repeat@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash._createpadding",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,25 +43,28 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
   "dependencies": {
     "lodash._basetostring": "^3.0.0"
   },
-  "description": "The modern build of lodash’s `_.repeat` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "f4b98dc7ef67256ce61e7874e1865edb208e0edf",
-    "tarball": "http://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash.repeat@3.0.1",
+  "_shasum": "f4b98dc7ef67256ce61e7874e1865edb208e0edf",
+  "_from": "lodash.repeat@>=3.0.0 <4.0.0",
+  "_npmVersion": "2.12.0",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "name": "jdalton",
+    "email": "john.david.dalton@gmail.com"
   },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
-  ],
-  "license": "MIT",
   "maintainers": [
     {
       "name": "jdalton",
@@ -108,14 +87,11 @@
       "email": "blaine@iceddev.com"
     }
   ],
-  "name": "lodash.repeat",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lodash/lodash.git"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  "dist": {
+    "shasum": "f4b98dc7ef67256ce61e7874e1865edb208e0edf",
+    "tarball": "http://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz"
   },
-  "version": "3.0.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/lodash._createpadding/package.json b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/package.json
similarity index 72%
rename from deps/npm/node_modules/lodash._createpadding/package.json
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/package.json
index 9801837b99594d..945409f3e1c152 100644
--- a/deps/npm/node_modules/lodash._createpadding/package.json
+++ b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash._createpadding/package.json
@@ -1,47 +1,15 @@
 {
-  "_args": [
-    [
-      "lodash._createpadding@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/lodash.pad"
-    ]
-  ],
-  "_from": "lodash._createpadding@>=3.0.0 <4.0.0",
-  "_id": "lodash._createpadding@3.6.1",
-  "_inCache": true,
-  "_location": "/lodash._createpadding",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.12.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash._createpadding",
-    "raw": "lodash._createpadding@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/lodash.pad",
-    "/lodash.padleft",
-    "/lodash.padright"
-  ],
-  "_resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
-  "_shasum": "4907b438595adc54ee8935527a6c424c02c81a87",
-  "_shrinkwrap": null,
-  "_spec": "lodash._createpadding@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/lodash.pad",
+  "name": "lodash._createpadding",
+  "version": "3.6.1",
+  "description": "The modern build of lodash’s internal `createPadding` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -69,19 +37,28 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
   "dependencies": {
     "lodash.repeat": "^3.0.0"
   },
-  "description": "The modern build of lodash’s internal `createPadding` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "4907b438595adc54ee8935527a6c424c02c81a87",
-    "tarball": "http://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz"
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash._createpadding@3.6.1",
+  "_shasum": "4907b438595adc54ee8935527a6c424c02c81a87",
+  "_from": "lodash._createpadding@3.6.1",
+  "_npmVersion": "2.12.0",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "name": "jdalton",
+    "email": "john.david.dalton@gmail.com"
   },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "license": "MIT",
   "maintainers": [
     {
       "name": "jdalton",
@@ -104,14 +81,11 @@
       "email": "blaine@iceddev.com"
     }
   ],
-  "name": "lodash._createpadding",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lodash/lodash.git"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  "dist": {
+    "shasum": "4907b438595adc54ee8935527a6c424c02c81a87",
+    "tarball": "http://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz"
   },
-  "version": "3.6.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/lodash.repeat/LICENSE b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/LICENSE
similarity index 100%
rename from deps/npm/node_modules/lodash.repeat/LICENSE
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/LICENSE
diff --git a/deps/npm/node_modules/lodash.pad/README.md b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash.pad/README.md
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/README.md
diff --git a/deps/npm/node_modules/lodash.pad/index.js b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash.pad/index.js
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/index.js
diff --git a/deps/npm/node_modules/lodash.pad/package.json b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/package.json
similarity index 77%
rename from deps/npm/node_modules/lodash.pad/package.json
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/package.json
index 283af352801a90..c18ed47167af3a 100644
--- a/deps/npm/node_modules/lodash.pad/package.json
+++ b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.pad/package.json
@@ -1,45 +1,21 @@
 {
-  "_args": [
-    [
-      "lodash.pad@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/gauge"
-    ]
-  ],
-  "_from": "lodash.pad@>=3.0.0 <4.0.0",
-  "_id": "lodash.pad@3.1.1",
-  "_inCache": true,
-  "_location": "/lodash.pad",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.12.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash.pad",
-    "raw": "lodash.pad@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/gauge"
+  "name": "lodash.pad",
+  "version": "3.1.1",
+  "description": "The modern build of lodash’s `_.pad` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
   ],
-  "_resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
-  "_shasum": "2e078ebc33b331d2ba34bf8732af129fd5c04624",
-  "_shrinkwrap": null,
-  "_spec": "lodash.pad@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/gauge",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,26 +43,29 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
   "dependencies": {
     "lodash._basetostring": "^3.0.0",
     "lodash._createpadding": "^3.0.0"
   },
-  "description": "The modern build of lodash’s `_.pad` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "2e078ebc33b331d2ba34bf8732af129fd5c04624",
-    "tarball": "http://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz"
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash.pad@3.1.1",
+  "_shasum": "2e078ebc33b331d2ba34bf8732af129fd5c04624",
+  "_from": "lodash.pad@>=3.0.0 <4.0.0",
+  "_npmVersion": "2.12.0",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "name": "jdalton",
+    "email": "john.david.dalton@gmail.com"
   },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
-  ],
-  "license": "MIT",
   "maintainers": [
     {
       "name": "jdalton",
@@ -109,14 +88,11 @@
       "email": "blaine@iceddev.com"
     }
   ],
-  "name": "lodash.pad",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lodash/lodash.git"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  "dist": {
+    "shasum": "2e078ebc33b331d2ba34bf8732af129fd5c04624",
+    "tarball": "http://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz"
   },
-  "version": "3.1.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/lodash.padright/LICENSE.txt b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/LICENSE.txt
similarity index 100%
rename from deps/npm/node_modules/lodash.padright/LICENSE.txt
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/LICENSE.txt
diff --git a/deps/npm/node_modules/lodash.padleft/README.md b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash.padleft/README.md
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/README.md
diff --git a/deps/npm/node_modules/lodash.padleft/index.js b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash.padleft/index.js
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/index.js
diff --git a/deps/npm/node_modules/lodash.padleft/package.json b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/package.json
similarity index 77%
rename from deps/npm/node_modules/lodash.padleft/package.json
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/package.json
index be544bdce085a4..55b0c256f9d1bc 100644
--- a/deps/npm/node_modules/lodash.padleft/package.json
+++ b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padleft/package.json
@@ -1,45 +1,21 @@
 {
-  "_args": [
-    [
-      "lodash.padleft@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/gauge"
-    ]
-  ],
-  "_from": "lodash.padleft@>=3.0.0 <4.0.0",
-  "_id": "lodash.padleft@3.1.1",
-  "_inCache": true,
-  "_location": "/lodash.padleft",
-  "_nodeVersion": "0.12.2",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.9.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash.padleft",
-    "raw": "lodash.padleft@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/gauge"
+  "name": "lodash.padleft",
+  "version": "3.1.1",
+  "description": "The modern build of lodash’s `_.padLeft` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
   ],
-  "_resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
-  "_shasum": "150151f1e0245edba15d50af2d71f1d5cff46530",
-  "_shrinkwrap": null,
-  "_spec": "lodash.padleft@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/gauge",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,26 +43,29 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
   "dependencies": {
     "lodash._basetostring": "^3.0.0",
     "lodash._createpadding": "^3.0.0"
   },
-  "description": "The modern build of lodash’s `_.padLeft` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "150151f1e0245edba15d50af2d71f1d5cff46530",
-    "tarball": "http://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz"
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash.padleft@3.1.1",
+  "_shasum": "150151f1e0245edba15d50af2d71f1d5cff46530",
+  "_from": "lodash.padleft@>=3.0.0 <4.0.0",
+  "_npmVersion": "2.9.0",
+  "_nodeVersion": "0.12.2",
+  "_npmUser": {
+    "name": "jdalton",
+    "email": "john.david.dalton@gmail.com"
   },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
-  ],
-  "license": "MIT",
   "maintainers": [
     {
       "name": "jdalton",
@@ -109,14 +88,11 @@
       "email": "blaine@iceddev.com"
     }
   ],
-  "name": "lodash.padleft",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lodash/lodash.git"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  "dist": {
+    "shasum": "150151f1e0245edba15d50af2d71f1d5cff46530",
+    "tarball": "http://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz"
   },
-  "version": "3.1.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/lodash.pairs/LICENSE.txt b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/LICENSE.txt
similarity index 100%
rename from deps/npm/node_modules/lodash.pairs/LICENSE.txt
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/LICENSE.txt
diff --git a/deps/npm/node_modules/lodash.padright/README.md b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/README.md
similarity index 100%
rename from deps/npm/node_modules/lodash.padright/README.md
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/README.md
diff --git a/deps/npm/node_modules/lodash.padright/index.js b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/index.js
similarity index 100%
rename from deps/npm/node_modules/lodash.padright/index.js
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/index.js
diff --git a/deps/npm/node_modules/lodash.padright/package.json b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/package.json
similarity index 77%
rename from deps/npm/node_modules/lodash.padright/package.json
rename to deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/package.json
index 13111367ff56c7..2a40f94bfc3bfd 100644
--- a/deps/npm/node_modules/lodash.padright/package.json
+++ b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/lodash.padright/package.json
@@ -1,45 +1,21 @@
 {
-  "_args": [
-    [
-      "lodash.padright@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/gauge"
-    ]
-  ],
-  "_from": "lodash.padright@>=3.0.0 <4.0.0",
-  "_id": "lodash.padright@3.1.1",
-  "_inCache": true,
-  "_location": "/lodash.padright",
-  "_nodeVersion": "0.12.2",
-  "_npmUser": {
-    "email": "john.david.dalton@gmail.com",
-    "name": "jdalton"
-  },
-  "_npmVersion": "2.9.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "lodash.padright",
-    "raw": "lodash.padright@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/gauge"
+  "name": "lodash.padright",
+  "version": "3.1.1",
+  "description": "The modern build of lodash’s `_.padRight` as a module.",
+  "homepage": "https://lodash.com/",
+  "icon": "https://lodash.com/icon.svg",
+  "license": "MIT",
+  "keywords": [
+    "lodash",
+    "lodash-modularized",
+    "stdlib",
+    "util"
   ],
-  "_resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
-  "_shasum": "79f7770baaa39738c040aeb5465e8d88f2aacec0",
-  "_shrinkwrap": null,
-  "_spec": "lodash.padright@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/gauge",
   "author": {
-    "email": "john.david.dalton@gmail.com",
     "name": "John-David Dalton",
+    "email": "john.david.dalton@gmail.com",
     "url": "http://allyoucanleet.com/"
   },
-  "bugs": {
-    "url": "https://github.com/lodash/lodash/issues"
-  },
   "contributors": [
     {
       "name": "John-David Dalton",
@@ -67,26 +43,29 @@
       "url": "https://mathiasbynens.be/"
     }
   ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lodash/lodash.git"
+  },
+  "scripts": {
+    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  },
   "dependencies": {
     "lodash._basetostring": "^3.0.0",
     "lodash._createpadding": "^3.0.0"
   },
-  "description": "The modern build of lodash’s `_.padRight` as a module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "79f7770baaa39738c040aeb5465e8d88f2aacec0",
-    "tarball": "http://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz"
+  "bugs": {
+    "url": "https://github.com/lodash/lodash/issues"
+  },
+  "_id": "lodash.padright@3.1.1",
+  "_shasum": "79f7770baaa39738c040aeb5465e8d88f2aacec0",
+  "_from": "lodash.padright@>=3.0.0 <4.0.0",
+  "_npmVersion": "2.9.0",
+  "_nodeVersion": "0.12.2",
+  "_npmUser": {
+    "name": "jdalton",
+    "email": "john.david.dalton@gmail.com"
   },
-  "homepage": "https://lodash.com/",
-  "icon": "https://lodash.com/icon.svg",
-  "keywords": [
-    "lodash",
-    "lodash-modularized",
-    "stdlib",
-    "util"
-  ],
-  "license": "MIT",
   "maintainers": [
     {
       "name": "jdalton",
@@ -109,14 +88,11 @@
       "email": "blaine@iceddev.com"
     }
   ],
-  "name": "lodash.padright",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lodash/lodash.git"
-  },
-  "scripts": {
-    "test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
+  "dist": {
+    "shasum": "79f7770baaa39738c040aeb5465e8d88f2aacec0",
+    "tarball": "http://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz"
   },
-  "version": "3.1.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/gauge/package.json b/deps/npm/node_modules/npmlog/node_modules/gauge/package.json
similarity index 64%
rename from deps/npm/node_modules/gauge/package.json
rename to deps/npm/node_modules/npmlog/node_modules/gauge/package.json
index a7777aa17e77c0..d16cc33df97528 100644
--- a/deps/npm/node_modules/gauge/package.json
+++ b/deps/npm/node_modules/npmlog/node_modules/gauge/package.json
@@ -1,43 +1,29 @@
 {
-  "_args": [
-    [
-      "gauge",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "gauge@*",
-  "_id": "gauge@1.2.2",
-  "_inCache": true,
-  "_location": "/gauge",
-  "_nodeVersion": "0.10.38",
-  "_npmUser": {
-    "email": "me@re-becca.org",
-    "name": "iarna"
+  "name": "gauge",
+  "version": "1.2.2",
+  "description": "A terminal based horizontal guage",
+  "main": "progress-bar.js",
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "_npmVersion": "3.1.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "gauge",
-    "raw": "gauge",
-    "rawSpec": "",
-    "scope": null,
-    "spec": "*",
-    "type": "range"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/iarna/gauge.git"
   },
-  "_requiredBy": [
-    "/npmlog"
+  "keywords": [
+    "progressbar",
+    "progress",
+    "gauge"
   ],
-  "_shasum": "05b6730a19a8fcad3c340a142f0945222a3f815b",
-  "_shrinkwrap": null,
-  "_spec": "gauge",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "me@re-becca.org",
-    "name": "Rebecca Turner"
+    "name": "Rebecca Turner",
+    "email": "me@re-becca.org"
   },
+  "license": "ISC",
   "bugs": {
     "url": "https://github.com/iarna/gauge/issues"
   },
+  "homepage": "https://github.com/iarna/gauge",
   "dependencies": {
     "ansi": "^0.3.0",
     "has-unicode": "^1.0.0",
@@ -45,38 +31,30 @@
     "lodash.padleft": "^3.0.0",
     "lodash.padright": "^3.0.0"
   },
-  "description": "A terminal based horizontal guage",
   "devDependencies": {
     "tap": "^0.4.13"
   },
-  "directories": {},
+  "gitHead": "9f7eeeeed3b74a70f30b721d570435f6ffbc0168",
+  "_id": "gauge@1.2.2",
+  "_shasum": "05b6730a19a8fcad3c340a142f0945222a3f815b",
+  "_from": "gauge@>=1.2.0 <1.3.0",
+  "_npmVersion": "3.1.0",
+  "_nodeVersion": "0.10.38",
+  "_npmUser": {
+    "name": "iarna",
+    "email": "me@re-becca.org"
+  },
   "dist": {
     "shasum": "05b6730a19a8fcad3c340a142f0945222a3f815b",
     "tarball": "http://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz"
   },
-  "gitHead": "9f7eeeeed3b74a70f30b721d570435f6ffbc0168",
-  "homepage": "https://github.com/iarna/gauge",
-  "keywords": [
-    "gauge",
-    "progress",
-    "progressbar"
-  ],
-  "license": "ISC",
-  "main": "progress-bar.js",
   "maintainers": [
     {
       "name": "iarna",
       "email": "me@re-becca.org"
     }
   ],
-  "name": "gauge",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/iarna/gauge.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "1.2.2"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.2.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/gauge/progress-bar.js b/deps/npm/node_modules/npmlog/node_modules/gauge/progress-bar.js
similarity index 100%
rename from deps/npm/node_modules/gauge/progress-bar.js
rename to deps/npm/node_modules/npmlog/node_modules/gauge/progress-bar.js
diff --git a/deps/npm/node_modules/gauge/test/progress-bar.js b/deps/npm/node_modules/npmlog/node_modules/gauge/test/progress-bar.js
similarity index 100%
rename from deps/npm/node_modules/gauge/test/progress-bar.js
rename to deps/npm/node_modules/npmlog/node_modules/gauge/test/progress-bar.js
diff --git a/deps/npm/node_modules/npmlog/package.json b/deps/npm/node_modules/npmlog/package.json
index 755274a19354aa..1613546d9f195c 100644
--- a/deps/npm/node_modules/npmlog/package.json
+++ b/deps/npm/node_modules/npmlog/package.json
@@ -1,66 +1,47 @@
 {
-  "_args": [
-    [
-      "npmlog@~1.2.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "npmlog@>=1.2.1 <1.3.0",
-  "_id": "npmlog@1.2.1",
-  "_inCache": true,
-  "_location": "/npmlog",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "2.10.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "npmlog",
-    "raw": "npmlog@~1.2.1",
-    "rawSpec": "~1.2.1",
-    "scope": null,
-    "spec": ">=1.2.1 <1.3.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/node-gyp",
-    "/npm-install-checks",
-    "/npm-registry-client"
-  ],
-  "_resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
-  "_shasum": "28e7be619609b53f7ad1dd300a10d64d716268b6",
-  "_shrinkwrap": null,
-  "_spec": "npmlog@~1.2.1",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/npmlog/issues"
+  "name": "npmlog",
+  "description": "logger for npm",
+  "version": "1.2.1",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/npmlog.git"
+  },
+  "main": "log.js",
+  "scripts": {
+    "test": "tap test/*.js"
   },
   "dependencies": {
     "ansi": "~0.3.0",
     "are-we-there-yet": "~1.0.0",
     "gauge": "~1.2.0"
   },
-  "description": "logger for npm",
   "devDependencies": {
     "tap": ""
   },
-  "directories": {},
+  "license": "ISC",
+  "gitHead": "4e1a73a567036064ded425a7d48c863d53550b4f",
+  "bugs": {
+    "url": "https://github.com/isaacs/npmlog/issues"
+  },
+  "homepage": "https://github.com/isaacs/npmlog#readme",
+  "_id": "npmlog@1.2.1",
+  "_shasum": "28e7be619609b53f7ad1dd300a10d64d716268b6",
+  "_from": "npmlog@>=1.2.1 <1.3.0",
+  "_npmVersion": "2.10.0",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "isaacs@npmjs.com"
+  },
   "dist": {
     "shasum": "28e7be619609b53f7ad1dd300a10d64d716268b6",
     "tarball": "http://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz"
   },
-  "gitHead": "4e1a73a567036064ded425a7d48c863d53550b4f",
-  "homepage": "https://github.com/isaacs/npmlog#readme",
-  "license": "ISC",
-  "main": "log.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -71,14 +52,7 @@
       "email": "me@re-becca.org"
     }
   ],
-  "name": "npmlog",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/npmlog.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "1.2.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/once/package.json b/deps/npm/node_modules/once/package.json
index 06f4e27a6c990b..3a714c45e4468b 100644
--- a/deps/npm/node_modules/once/package.json
+++ b/deps/npm/node_modules/once/package.json
@@ -1,90 +1,44 @@
 {
-  "_args": [
-    [
-      "once@~1.3.2",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "once@>=1.3.2 <1.4.0",
-  "_id": "once@1.3.2",
-  "_inCache": true,
-  "_location": "/once",
-  "_nodeVersion": "2.0.0",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "2.9.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "once",
-    "raw": "once@~1.3.2",
-    "rawSpec": "~1.3.2",
-    "scope": null,
-    "spec": ">=1.3.2 <1.4.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/glob",
-    "/inflight",
-    "/node-gyp/glob",
-    "/npm-registry-client",
-    "/read-package-tree",
-    "/readdir-scoped-modules",
-    "/rimraf/glob"
-  ],
-  "_resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
-  "_shasum": "d8feeca93b039ec1dcdee7741c92bdac5e28081b",
-  "_shrinkwrap": null,
-  "_spec": "once@~1.3.2",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/once/issues"
+  "name": "once",
+  "version": "1.3.2",
+  "description": "Run a function exactly one time",
+  "main": "once.js",
+  "directories": {
+    "test": "test"
   },
   "dependencies": {
     "wrappy": "1"
   },
-  "description": "Run a function exactly one time",
   "devDependencies": {
     "tap": "~0.3.0"
   },
-  "directories": {
-    "test": "test"
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "dist": {
-    "shasum": "d8feeca93b039ec1dcdee7741c92bdac5e28081b",
-    "tarball": "http://registry.npmjs.org/once/-/once-1.3.2.tgz"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/once.git"
   },
-  "gitHead": "e35eed5a7867574e2bf2260a1ba23970958b22f2",
-  "homepage": "https://github.com/isaacs/once#readme",
   "keywords": [
-    "function",
     "once",
+    "function",
     "one",
     "single"
   ],
-  "license": "ISC",
-  "main": "once.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "name": "once",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/once.git"
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
   },
-  "scripts": {
-    "test": "tap test/*.js"
+  "license": "ISC",
+  "readme": "# once\n\nOnly call a function once.\n\n## usage\n\n```javascript\nvar once = require('once')\n\nfunction load (file, cb) {\n  cb = once(cb)\n  loader.load('file')\n  loader.once('load', cb)\n  loader.once('error', cb)\n}\n```\n\nOr add to the Function.prototype in a responsible way:\n\n```javascript\n// only has to be done once\nrequire('once').proto()\n\nfunction load (file, cb) {\n  cb = cb.once()\n  loader.load('file')\n  loader.once('load', cb)\n  loader.once('error', cb)\n}\n```\n\nIronically, the prototype feature makes this module twice as\ncomplicated as necessary.\n\nTo check whether you function has been called, use `fn.called`. Once the\nfunction is called for the first time the return value of the original\nfunction is saved in `fn.value` and subsequent calls will continue to\nreturn this value.\n\n```javascript\nvar once = require('once')\n\nfunction load (cb) {\n  cb = once(cb)\n  var stream = createStream()\n  stream.once('data', cb)\n  stream.once('end', function () {\n    if (!cb.called) cb(new Error('not found'))\n  })\n}\n```\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/isaacs/once/issues"
   },
-  "version": "1.3.2"
+  "homepage": "https://github.com/isaacs/once#readme",
+  "_id": "once@1.3.2",
+  "_shasum": "d8feeca93b039ec1dcdee7741c92bdac5e28081b",
+  "_resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+  "_from": "once@>=1.3.2 <1.4.0"
 }
diff --git a/deps/npm/node_modules/opener/package.json b/deps/npm/node_modules/opener/package.json
index 44e43737e07f49..7364b919fc083f 100644
--- a/deps/npm/node_modules/opener/package.json
+++ b/deps/npm/node_modules/opener/package.json
@@ -1,79 +1,55 @@
 {
-  "_args": [
-    [
-      "opener@~1.4.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "opener@>=1.4.1 <1.5.0",
-  "_id": "opener@1.4.1",
-  "_inCache": true,
-  "_location": "/opener",
-  "_nodeVersion": "1.5.1",
-  "_npmUser": {
-    "email": "d@domenic.me",
-    "name": "domenic"
-  },
-  "_npmVersion": "2.7.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "opener",
-    "raw": "opener@~1.4.1",
-    "rawSpec": "~1.4.1",
-    "scope": null,
-    "spec": ">=1.4.1 <1.5.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/opener/-/opener-1.4.1.tgz",
-  "_shasum": "897590acd1aed3311b703b58bccb4d43f56f2895",
-  "_shrinkwrap": null,
-  "_spec": "opener@~1.4.1",
-  "_where": "/Users/rebecca/code/npm",
+  "name": "opener",
+  "description": "Opens stuff, like webpages and files and executables, cross-platform",
+  "version": "1.4.1",
   "author": {
-    "email": "d@domenic.me",
     "name": "Domenic Denicola",
+    "email": "d@domenic.me",
     "url": "https://domenic.me/"
   },
+  "license": "WTFPL",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/domenic/opener.git"
+  },
+  "main": "opener.js",
   "bin": {
     "opener": "opener.js"
   },
-  "bugs": {
-    "url": "https://github.com/domenic/opener/issues"
+  "files": [
+    "opener.js"
+  ],
+  "scripts": {
+    "lint": "jshint opener.js"
   },
-  "dependencies": {},
-  "description": "Opens stuff, like webpages and files and executables, cross-platform",
   "devDependencies": {
     "jshint": "^2.6.3"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "897590acd1aed3311b703b58bccb4d43f56f2895",
-    "tarball": "http://registry.npmjs.org/opener/-/opener-1.4.1.tgz"
-  },
-  "files": [
-    "opener.js"
-  ],
   "gitHead": "d0ee95b19951703462fa593baa16e81fdff7827c",
+  "bugs": {
+    "url": "https://github.com/domenic/opener/issues"
+  },
   "homepage": "https://github.com/domenic/opener",
-  "license": "WTFPL",
-  "main": "opener.js",
+  "_id": "opener@1.4.1",
+  "_shasum": "897590acd1aed3311b703b58bccb4d43f56f2895",
+  "_from": "opener@>=1.4.1 <1.5.0",
+  "_npmVersion": "2.7.0",
+  "_nodeVersion": "1.5.1",
+  "_npmUser": {
+    "name": "domenic",
+    "email": "d@domenic.me"
+  },
   "maintainers": [
     {
       "name": "domenic",
       "email": "domenic@domenicdenicola.com"
     }
   ],
-  "name": "opener",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/domenic/opener"
-  },
-  "scripts": {
-    "lint": "jshint opener.js"
+  "dist": {
+    "shasum": "897590acd1aed3311b703b58bccb4d43f56f2895",
+    "tarball": "http://registry.npmjs.org/opener/-/opener-1.4.1.tgz"
   },
-  "version": "1.4.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/opener/-/opener-1.4.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/os-homedir/package.json b/deps/npm/node_modules/os-homedir/package.json
deleted file mode 100644
index 893ce6c2f60daa..00000000000000
--- a/deps/npm/node_modules/os-homedir/package.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "_args": [
-    [
-      "os-homedir@^1.0.0",
-      "/Users/rebecca/code/npm/node_modules/osenv"
-    ]
-  ],
-  "_from": "os-homedir@>=1.0.0 <2.0.0",
-  "_id": "os-homedir@1.0.1",
-  "_inCache": true,
-  "_location": "/os-homedir",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "sindresorhus@gmail.com",
-    "name": "sindresorhus"
-  },
-  "_npmVersion": "2.11.2",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "os-homedir",
-    "raw": "os-homedir@^1.0.0",
-    "rawSpec": "^1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/osenv"
-  ],
-  "_resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz",
-  "_shasum": "0d62bdf44b916fd3bbdcf2cab191948fb094f007",
-  "_shrinkwrap": null,
-  "_spec": "os-homedir@^1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/osenv",
-  "author": {
-    "email": "sindresorhus@gmail.com",
-    "name": "Sindre Sorhus",
-    "url": "sindresorhus.com"
-  },
-  "bugs": {
-    "url": "https://github.com/sindresorhus/os-homedir/issues"
-  },
-  "dependencies": {},
-  "description": "io.js 2.3.0 os.homedir() ponyfill",
-  "devDependencies": {
-    "ava": "0.0.4",
-    "path-exists": "^1.0.0"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "0d62bdf44b916fd3bbdcf2cab191948fb094f007",
-    "tarball": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"
-  },
-  "engines": {
-    "node": ">=0.10.0"
-  },
-  "files": [
-    "index.js"
-  ],
-  "gitHead": "13ff83fbd13ebe286a6092286b2c634ab4534c5f",
-  "homepage": "https://github.com/sindresorhus/os-homedir",
-  "keywords": [
-    "built-in",
-    "core",
-    "dir",
-    "directory",
-    "folder",
-    "home",
-    "homedir",
-    "os",
-    "path",
-    "polyfill",
-    "ponyfill",
-    "shim",
-    "user"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    }
-  ],
-  "name": "os-homedir",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/sindresorhus/os-homedir"
-  },
-  "scripts": {
-    "test": "node test.js"
-  },
-  "version": "1.0.1"
-}
diff --git a/deps/npm/node_modules/os-tmpdir/package.json b/deps/npm/node_modules/os-tmpdir/package.json
deleted file mode 100644
index 76f16c4895e30f..00000000000000
--- a/deps/npm/node_modules/os-tmpdir/package.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "_args": [
-    [
-      "os-tmpdir@^1.0.0",
-      "/Users/rebecca/code/npm/node_modules/osenv"
-    ]
-  ],
-  "_from": "os-tmpdir@>=1.0.0 <2.0.0",
-  "_id": "os-tmpdir@1.0.1",
-  "_inCache": true,
-  "_location": "/os-tmpdir",
-  "_nodeVersion": "0.12.3",
-  "_npmUser": {
-    "email": "sindresorhus@gmail.com",
-    "name": "sindresorhus"
-  },
-  "_npmVersion": "2.9.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "os-tmpdir",
-    "raw": "os-tmpdir@^1.0.0",
-    "rawSpec": "^1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/osenv"
-  ],
-  "_resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz",
-  "_shasum": "e9b423a1edaf479882562e92ed71d7743a071b6e",
-  "_shrinkwrap": null,
-  "_spec": "os-tmpdir@^1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/osenv",
-  "author": {
-    "email": "sindresorhus@gmail.com",
-    "name": "Sindre Sorhus",
-    "url": "sindresorhus.com"
-  },
-  "bugs": {
-    "url": "https://github.com/sindresorhus/os-tmpdir/issues"
-  },
-  "dependencies": {},
-  "description": "Node.js os.tmpdir() ponyfill",
-  "devDependencies": {
-    "ava": "0.0.4"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "e9b423a1edaf479882562e92ed71d7743a071b6e",
-    "tarball": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
-  },
-  "engines": {
-    "node": ">=0.10.0"
-  },
-  "files": [
-    "index.js"
-  ],
-  "gitHead": "5c5d355f81378980db629d60128ad03e02b1c1e5",
-  "homepage": "https://github.com/sindresorhus/os-tmpdir",
-  "keywords": [
-    "built-in",
-    "core",
-    "dir",
-    "directory",
-    "env",
-    "environment",
-    "os",
-    "polyfill",
-    "ponyfill",
-    "shim",
-    "temp",
-    "tempdir",
-    "tmp",
-    "tmpdir"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    }
-  ],
-  "name": "os-tmpdir",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/sindresorhus/os-tmpdir"
-  },
-  "scripts": {
-    "test": "node test.js"
-  },
-  "version": "1.0.1"
-}
diff --git a/deps/npm/node_modules/os-homedir/index.js b/deps/npm/node_modules/osenv/node_modules/os-homedir/index.js
similarity index 100%
rename from deps/npm/node_modules/os-homedir/index.js
rename to deps/npm/node_modules/osenv/node_modules/os-homedir/index.js
diff --git a/deps/npm/node_modules/escape-string-regexp/license b/deps/npm/node_modules/osenv/node_modules/os-homedir/license
similarity index 100%
rename from deps/npm/node_modules/escape-string-regexp/license
rename to deps/npm/node_modules/osenv/node_modules/os-homedir/license
diff --git a/deps/npm/node_modules/osenv/node_modules/os-homedir/package.json b/deps/npm/node_modules/osenv/node_modules/os-homedir/package.json
new file mode 100644
index 00000000000000..53c8c6e5e62c4d
--- /dev/null
+++ b/deps/npm/node_modules/osenv/node_modules/os-homedir/package.json
@@ -0,0 +1,53 @@
+{
+  "name": "os-homedir",
+  "version": "1.0.1",
+  "description": "io.js 2.3.0 os.homedir() ponyfill",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sindresorhus/os-homedir.git"
+  },
+  "author": {
+    "name": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
+    "url": "sindresorhus.com"
+  },
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "scripts": {
+    "test": "node test.js"
+  },
+  "files": [
+    "index.js"
+  ],
+  "keywords": [
+    "built-in",
+    "core",
+    "ponyfill",
+    "polyfill",
+    "shim",
+    "os",
+    "homedir",
+    "home",
+    "dir",
+    "directory",
+    "folder",
+    "user",
+    "path"
+  ],
+  "devDependencies": {
+    "ava": "0.0.4",
+    "path-exists": "^1.0.0"
+  },
+  "readme": "# os-homedir [![Build Status](https://travis-ci.org/sindresorhus/os-homedir.svg?branch=master)](https://travis-ci.org/sindresorhus/os-homedir)\n\n> io.js 2.3.0 [`os.homedir()`](https://iojs.org/api/os.html#os_os_homedir) ponyfill\n\n> Ponyfill: A polyfill that doesn't overwrite the native method\n\n\n## Install\n\n```\n$ npm install --save os-homedir\n```\n\n\n## Usage\n\n```js\nvar osHomedir = require('os-homedir');\n\nconsole.log(osHomedir());\n//=> /Users/sindresorhus\n```\n\n\n## Related\n\n- [user-home](https://github.com/sindresorhus/user-home) - Same as this module but caches the result\n- [home-or-tmp](https://github.com/sindresorhus/home-or-tmp) - Get the user home directory with fallback to the system temp directory\n\n\n## License\n\nMIT © [Sindre Sorhus](http://sindresorhus.com)\n",
+  "readmeFilename": "readme.md",
+  "bugs": {
+    "url": "https://github.com/sindresorhus/os-homedir/issues"
+  },
+  "homepage": "https://github.com/sindresorhus/os-homedir#readme",
+  "_id": "os-homedir@1.0.1",
+  "_shasum": "0d62bdf44b916fd3bbdcf2cab191948fb094f007",
+  "_resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz",
+  "_from": "os-homedir@>=1.0.0 <2.0.0"
+}
diff --git a/deps/npm/node_modules/os-homedir/readme.md b/deps/npm/node_modules/osenv/node_modules/os-homedir/readme.md
similarity index 100%
rename from deps/npm/node_modules/os-homedir/readme.md
rename to deps/npm/node_modules/osenv/node_modules/os-homedir/readme.md
diff --git a/deps/npm/node_modules/os-tmpdir/index.js b/deps/npm/node_modules/osenv/node_modules/os-tmpdir/index.js
similarity index 100%
rename from deps/npm/node_modules/os-tmpdir/index.js
rename to deps/npm/node_modules/osenv/node_modules/os-tmpdir/index.js
diff --git a/deps/npm/node_modules/has-ansi/license b/deps/npm/node_modules/osenv/node_modules/os-tmpdir/license
similarity index 100%
rename from deps/npm/node_modules/has-ansi/license
rename to deps/npm/node_modules/osenv/node_modules/os-tmpdir/license
diff --git a/deps/npm/node_modules/osenv/node_modules/os-tmpdir/package.json b/deps/npm/node_modules/osenv/node_modules/os-tmpdir/package.json
new file mode 100644
index 00000000000000..071ea5ec83fa23
--- /dev/null
+++ b/deps/npm/node_modules/osenv/node_modules/os-tmpdir/package.json
@@ -0,0 +1,53 @@
+{
+  "name": "os-tmpdir",
+  "version": "1.0.1",
+  "description": "Node.js os.tmpdir() ponyfill",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sindresorhus/os-tmpdir.git"
+  },
+  "author": {
+    "name": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
+    "url": "sindresorhus.com"
+  },
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "scripts": {
+    "test": "node test.js"
+  },
+  "files": [
+    "index.js"
+  ],
+  "keywords": [
+    "built-in",
+    "core",
+    "ponyfill",
+    "polyfill",
+    "shim",
+    "os",
+    "tmpdir",
+    "tempdir",
+    "tmp",
+    "temp",
+    "dir",
+    "directory",
+    "env",
+    "environment"
+  ],
+  "devDependencies": {
+    "ava": "0.0.4"
+  },
+  "readme": "# os-tmpdir [![Build Status](https://travis-ci.org/sindresorhus/os-tmpdir.svg?branch=master)](https://travis-ci.org/sindresorhus/os-tmpdir)\n\n> Node.js [`os.tmpdir()`](https://nodejs.org/api/os.html#os_os_tmpdir) ponyfill\n\n> Ponyfill: A polyfill that doesn't overwrite the native method\n\nUse this instead of `require('os').tmpdir()` to get a consistent behaviour on different Node.js versions (even 0.8).\n\n*This is actually taken from io.js 2.0.2 as it contains some fixes that haven't bubbled up to Node.js yet.*\n\n\n## Install\n\n```\n$ npm install --save os-tmpdir\n```\n\n\n## Usage\n\n```js\nvar osTmpdir = require('os-tmpdir');\n\nosTmpdir();\n//=> /var/folders/m3/5574nnhn0yj488ccryqr7tc80000gn/T\n```\n\n\n## API\n\nSee the [`os.tmpdir()` docs](https://nodejs.org/api/os.html#os_os_tmpdir).\n\n\n## License\n\nMIT © [Sindre Sorhus](http://sindresorhus.com)\n",
+  "readmeFilename": "readme.md",
+  "bugs": {
+    "url": "https://github.com/sindresorhus/os-tmpdir/issues"
+  },
+  "homepage": "https://github.com/sindresorhus/os-tmpdir#readme",
+  "_id": "os-tmpdir@1.0.1",
+  "_shasum": "e9b423a1edaf479882562e92ed71d7743a071b6e",
+  "_resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz",
+  "_from": "os-tmpdir@>=1.0.0 <2.0.0"
+}
diff --git a/deps/npm/node_modules/os-tmpdir/readme.md b/deps/npm/node_modules/osenv/node_modules/os-tmpdir/readme.md
similarity index 100%
rename from deps/npm/node_modules/os-tmpdir/readme.md
rename to deps/npm/node_modules/osenv/node_modules/os-tmpdir/readme.md
diff --git a/deps/npm/node_modules/osenv/package.json b/deps/npm/node_modules/osenv/package.json
index 98144d44157b35..ac0c03cda62409 100644
--- a/deps/npm/node_modules/osenv/package.json
+++ b/deps/npm/node_modules/osenv/package.json
@@ -1,100 +1,48 @@
 {
-  "_args": [
-    [
-      "osenv@~0.1.2",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "osenv@>=0.1.2 <0.2.0",
-  "_id": "osenv@0.1.3",
-  "_inCache": true,
-  "_location": "/osenv",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "3.0.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "osenv",
-    "raw": "osenv@~0.1.2",
-    "rawSpec": "~0.1.2",
-    "scope": null,
-    "spec": ">=0.1.2 <0.2.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/node-gyp"
-  ],
-  "_resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
-  "_shasum": "83cf05c6d6458fc4d5ac6362ea325d92f2754217",
-  "_shrinkwrap": null,
-  "_spec": "osenv@~0.1.2",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/npm/osenv/issues"
+  "name": "osenv",
+  "version": "0.1.3",
+  "main": "osenv.js",
+  "directories": {
+    "test": "test"
   },
   "dependencies": {
     "os-homedir": "^1.0.0",
     "os-tmpdir": "^1.0.0"
   },
-  "description": "Look up environment settings specific to different operating systems",
   "devDependencies": {
     "tap": "^1.2.0"
   },
-  "directories": {
-    "test": "test"
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "dist": {
-    "shasum": "83cf05c6d6458fc4d5ac6362ea325d92f2754217",
-    "tarball": "http://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/osenv.git"
   },
-  "gitHead": "f746b3405d8f9e28054d11b97e1436f6a15016c4",
-  "homepage": "https://github.com/npm/osenv#readme",
   "keywords": [
     "environment",
+    "variable",
     "home",
+    "tmpdir",
     "path",
     "prompt",
-    "ps1",
-    "tmpdir",
-    "variable"
-  ],
-  "license": "ISC",
-  "main": "osenv.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    },
-    {
-      "name": "robertkowalski",
-      "email": "rok@kowalski.gd"
-    },
-    {
-      "name": "othiym23",
-      "email": "ogd@aoaioxxysz.net"
-    },
-    {
-      "name": "iarna",
-      "email": "me@re-becca.org"
-    }
+    "ps1"
   ],
-  "name": "osenv",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/osenv.git"
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
   },
-  "scripts": {
-    "test": "tap test/*.js"
+  "license": "ISC",
+  "description": "Look up environment settings specific to different operating systems",
+  "readme": "# osenv\n\nLook up environment settings specific to different operating systems.\n\n## Usage\n\n```javascript\nvar osenv = require('osenv')\nvar path = osenv.path()\nvar user = osenv.user()\n// etc.\n\n// Some things are not reliably in the env, and have a fallback command:\nvar h = osenv.hostname(function (er, hostname) {\n  h = hostname\n})\n// This will still cause it to be memoized, so calling osenv.hostname()\n// is now an immediate operation.\n\n// You can always send a cb, which will get called in the nextTick\n// if it's been memoized, or wait for the fallback data if it wasn't\n// found in the environment.\nosenv.hostname(function (er, hostname) {\n  if (er) console.error('error looking up hostname')\n  else console.log('this machine calls itself %s', hostname)\n})\n```\n\n## osenv.hostname()\n\nThe machine name.  Calls `hostname` if not found.\n\n## osenv.user()\n\nThe currently logged-in user.  Calls `whoami` if not found.\n\n## osenv.prompt()\n\nEither PS1 on unix, or PROMPT on Windows.\n\n## osenv.tmpdir()\n\nThe place where temporary files should be created.\n\n## osenv.home()\n\nNo place like it.\n\n## osenv.path()\n\nAn array of the places that the operating system will search for\nexecutables.\n\n## osenv.editor() \n\nReturn the executable name of the editor program.  This uses the EDITOR\nand VISUAL environment variables, and falls back to `vi` on Unix, or\n`notepad.exe` on Windows.\n\n## osenv.shell()\n\nThe SHELL on Unix, which Windows calls the ComSpec.  Defaults to 'bash'\nor 'cmd'.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/npm/osenv/issues"
   },
-  "version": "0.1.3"
+  "homepage": "https://github.com/npm/osenv#readme",
+  "_id": "osenv@0.1.3",
+  "_shasum": "83cf05c6d6458fc4d5ac6362ea325d92f2754217",
+  "_resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
+  "_from": "osenv@>=0.1.3 <0.2.0"
 }
diff --git a/deps/npm/node_modules/path-is-absolute/package.json b/deps/npm/node_modules/path-is-absolute/package.json
deleted file mode 100644
index 8a704f11b7b8c0..00000000000000
--- a/deps/npm/node_modules/path-is-absolute/package.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "_args": [
-    [
-      "path-is-absolute@^1.0.0",
-      "/Users/rebecca/code/npm/node_modules/glob"
-    ]
-  ],
-  "_from": "path-is-absolute@>=1.0.0 <2.0.0",
-  "_id": "path-is-absolute@1.0.0",
-  "_inCache": true,
-  "_location": "/path-is-absolute",
-  "_nodeVersion": "0.12.0",
-  "_npmUser": {
-    "email": "sindresorhus@gmail.com",
-    "name": "sindresorhus"
-  },
-  "_npmVersion": "2.5.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "path-is-absolute",
-    "raw": "path-is-absolute@^1.0.0",
-    "rawSpec": "^1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/glob"
-  ],
-  "_resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
-  "_shasum": "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912",
-  "_shrinkwrap": null,
-  "_spec": "path-is-absolute@^1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/glob",
-  "author": {
-    "email": "sindresorhus@gmail.com",
-    "name": "Sindre Sorhus",
-    "url": "sindresorhus.com"
-  },
-  "bugs": {
-    "url": "https://github.com/sindresorhus/path-is-absolute/issues"
-  },
-  "dependencies": {},
-  "description": "Node.js 0.12 path.isAbsolute() ponyfill",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912",
-    "tarball": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
-  },
-  "engines": {
-    "node": ">=0.10.0"
-  },
-  "files": [
-    "index.js"
-  ],
-  "gitHead": "7a76a0c9f2263192beedbe0a820e4d0baee5b7a1",
-  "homepage": "https://github.com/sindresorhus/path-is-absolute",
-  "keywords": [
-    "absolute",
-    "built-in",
-    "check",
-    "core",
-    "detect",
-    "dir",
-    "file",
-    "is",
-    "is-absolute",
-    "isabsolute",
-    "path",
-    "paths",
-    "polyfill",
-    "ponyfill",
-    "shim",
-    "util",
-    "utils"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    }
-  ],
-  "name": "path-is-absolute",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/sindresorhus/path-is-absolute"
-  },
-  "scripts": {
-    "test": "node test.js"
-  },
-  "version": "1.0.0"
-}
diff --git a/deps/npm/node_modules/path-is-inside/package.json b/deps/npm/node_modules/path-is-inside/package.json
index fbcf469a361e60..deced257898031 100644
--- a/deps/npm/node_modules/path-is-inside/package.json
+++ b/deps/npm/node_modules/path-is-inside/package.json
@@ -1,81 +1,41 @@
 {
-  "_args": [
-    [
-      "path-is-inside@~1.0.0",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "path-is-inside@>=1.0.0 <1.1.0",
-  "_id": "path-is-inside@1.0.1",
-  "_inCache": true,
-  "_location": "/path-is-inside",
-  "_npmUser": {
-    "email": "domenic@domenicdenicola.com",
-    "name": "domenic"
-  },
-  "_npmVersion": "1.3.25",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "path-is-inside",
-    "raw": "path-is-inside@~1.0.0",
-    "rawSpec": "~1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz",
-  "_shasum": "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89",
-  "_shrinkwrap": null,
-  "_spec": "path-is-inside@~1.0.0",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "domenic@domenicdenicola.com",
-    "name": "Domenic Denicola",
-    "url": "http://domenic.me"
-  },
-  "bugs": {
-    "url": "http://github.com/domenic/path-is-inside/issues"
-  },
-  "dependencies": {},
+  "name": "path-is-inside",
   "description": "Tests whether one path is inside another path",
-  "devDependencies": {
-    "jshint": "~2.3.0",
-    "mocha": "~1.15.1"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89",
-    "tarball": "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"
-  },
-  "homepage": "https://github.com/domenic/path-is-inside",
-  "installable": true,
   "keywords": [
+    "path",
     "directory",
     "folder",
     "inside",
-    "path",
     "relative"
   ],
+  "version": "1.0.1",
+  "author": {
+    "name": "Domenic Denicola",
+    "email": "domenic@domenicdenicola.com",
+    "url": "http://domenic.me"
+  },
   "license": "WTFPL",
-  "main": "lib/path-is-inside.js",
-  "maintainers": [
-    {
-      "name": "domenic",
-      "email": "domenic@domenicdenicola.com"
-    }
-  ],
-  "name": "path-is-inside",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git://github.com/domenic/path-is-inside.git"
   },
+  "bugs": {
+    "url": "http://github.com/domenic/path-is-inside/issues"
+  },
+  "main": "lib/path-is-inside.js",
   "scripts": {
-    "lint": "jshint lib",
-    "test": "mocha"
+    "test": "mocha",
+    "lint": "jshint lib"
+  },
+  "devDependencies": {
+    "jshint": "~2.3.0",
+    "mocha": "~1.15.1"
   },
-  "version": "1.0.1"
+  "readme": "# Is This Path Inside This Other Path?\n\nIt turns out this question isn't trivial to answer using Node's built-in path APIs. A naive `indexOf`-based solution will fail sometimes on Windows, which is case-insensitive (see e.g. [isaacs/npm#4214][]). You might then think to be clever with `path.resolve`, but you have to be careful to account for situations whether the paths have different drive letters, or else you'll cause bugs like [isaacs/npm#4313][]. And let's not even get started on trailing slashes.\n\nThe **path-is-inside** package will give you a robust, cross-platform way of detecting whether a given path is inside another path.\n\n## Usage\n\nPretty simple. First the path being tested; then the potential parent. Like so:\n\n```js\nvar pathIsInside = require(\"path-is-inside\");\n\npathIsInside(\"/x/y/z\", \"/x/y\") // true\npathIsInside(\"/x/y\", \"/x/y/z\") // false\n```\n\n## OS-Specific Behavior\n\nLike Node's built-in path module, path-is-inside treats all file paths on Windows as case-insensitive, whereas it treats all file paths on *-nix operating systems as case-sensitive. Keep this in mind especially when working on a Mac, where, despite Node's defaults, the OS usually treats paths case-insensitively.\n\nIn practice, this means:\n\n```js\n// On Windows\n\npathIsInside(\"C:\\\\X\\\\Y\\\\Z\", \"C:\\\\x\\\\y\") // true\n\n// On *-nix, including Mac OS X\n\npathIsInside(\"/X/Y/Z\", \"/x/y\") // false\n```\n\n[isaacs/npm#4214]: https://github.com/isaacs/npm/pull/4214\n[isaacs/npm#4313]: https://github.com/isaacs/npm/issues/4313\n",
+  "readmeFilename": "README.md",
+  "homepage": "https://github.com/domenic/path-is-inside#readme",
+  "_id": "path-is-inside@1.0.1",
+  "_shasum": "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89",
+  "_resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz",
+  "_from": "path-is-inside@>=1.0.1 <1.1.0"
 }
diff --git a/deps/npm/node_modules/process-nextick-args/package.json b/deps/npm/node_modules/process-nextick-args/package.json
deleted file mode 100644
index f6f94b306a9aa8..00000000000000
--- a/deps/npm/node_modules/process-nextick-args/package.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "_args": [
-    [
-      "process-nextick-args@~1.0.0",
-      "/Users/rebecca/code/npm/node_modules/bl/node_modules/readable-stream"
-    ]
-  ],
-  "_from": "process-nextick-args@>=1.0.0 <1.1.0",
-  "_id": "process-nextick-args@1.0.3",
-  "_inCache": true,
-  "_location": "/process-nextick-args",
-  "_nodeVersion": "2.5.0",
-  "_npmUser": {
-    "email": "calvin.metcalf@gmail.com",
-    "name": "cwmma"
-  },
-  "_npmVersion": "2.9.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "process-nextick-args",
-    "raw": "process-nextick-args@~1.0.0",
-    "rawSpec": "~1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/bl/readable-stream",
-    "/concat-stream/readable-stream",
-    "/tap-parser/readable-stream",
-    "/tap/readable-stream"
-  ],
-  "_resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz",
-  "_shasum": "e272eed825d5e9f4ea74d8d73b1fe311c3beb630",
-  "_shrinkwrap": null,
-  "_spec": "process-nextick-args@~1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/bl/node_modules/readable-stream",
-  "author": "",
-  "bugs": {
-    "url": "https://github.com/calvinmetcalf/process-nextick-args/issues"
-  },
-  "dependencies": {},
-  "description": "process.nextTick but always with args",
-  "devDependencies": {
-    "tap": "~0.2.6"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "e272eed825d5e9f4ea74d8d73b1fe311c3beb630",
-    "tarball": "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
-  },
-  "gitHead": "e855846a69662b9489f1ad3dde1ebf2ccc4370b8",
-  "homepage": "https://github.com/calvinmetcalf/process-nextick-args",
-  "installable": true,
-  "license": "MIT",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "cwmma",
-      "email": "calvin.metcalf@gmail.com"
-    }
-  ],
-  "name": "process-nextick-args",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/calvinmetcalf/process-nextick-args.git"
-  },
-  "scripts": {
-    "test": "node test.js"
-  },
-  "version": "1.0.3"
-}
diff --git a/deps/npm/node_modules/proto-list/package.json b/deps/npm/node_modules/proto-list/package.json
deleted file mode 100644
index ff0b6b60598cf8..00000000000000
--- a/deps/npm/node_modules/proto-list/package.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "_args": [
-    [
-      "proto-list@~1.2.1",
-      "/Users/rebecca/code/npm/node_modules/config-chain"
-    ]
-  ],
-  "_from": "proto-list@>=1.2.1 <1.3.0",
-  "_id": "proto-list@1.2.4",
-  "_inCache": true,
-  "_location": "/proto-list",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "2.10.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "proto-list",
-    "raw": "proto-list@~1.2.1",
-    "rawSpec": "~1.2.1",
-    "scope": null,
-    "spec": ">=1.2.1 <1.3.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/config-chain"
-  ],
-  "_resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
-  "_shasum": "212d5bfe1318306a420f6402b8e26ff39647a849",
-  "_shrinkwrap": null,
-  "_spec": "proto-list@~1.2.1",
-  "_where": "/Users/rebecca/code/npm/node_modules/config-chain",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/proto-list/issues"
-  },
-  "dependencies": {},
-  "description": "A utility for managing a prototype chain",
-  "devDependencies": {
-    "tap": "0"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "212d5bfe1318306a420f6402b8e26ff39647a849",
-    "tarball": "http://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
-  },
-  "gitHead": "9e4af12d4dddee2fd531f0fe0c21c9cfacb78ac0",
-  "homepage": "https://github.com/isaacs/proto-list#readme",
-  "license": "ISC",
-  "main": "./proto-list.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "name": "proto-list",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/isaacs/proto-list.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "1.2.4"
-}
diff --git a/deps/npm/node_modules/qs/package.json b/deps/npm/node_modules/qs/package.json
deleted file mode 100644
index c2aba945ddc3b8..00000000000000
--- a/deps/npm/node_modules/qs/package.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "_args": [
-    [
-      "qs@~5.1.0",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "qs@>=5.1.0 <5.2.0",
-  "_id": "qs@5.1.0",
-  "_inCache": true,
-  "_location": "/qs",
-  "_nodeVersion": "0.12.7",
-  "_npmUser": {
-    "email": "quitlahok@gmail.com",
-    "name": "nlf"
-  },
-  "_npmVersion": "2.14.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "qs",
-    "raw": "qs@~5.1.0",
-    "rawSpec": "~5.1.0",
-    "scope": null,
-    "spec": ">=5.1.0 <5.2.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/request"
-  ],
-  "_resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz",
-  "_shasum": "4d932e5c7ea411cca76a312d39a606200fd50cd9",
-  "_shrinkwrap": null,
-  "_spec": "qs@~5.1.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
-  "bugs": {
-    "url": "https://github.com/hapijs/qs/issues"
-  },
-  "dependencies": {},
-  "description": "A querystring parser that supports nesting and arrays, with a depth limit",
-  "devDependencies": {
-    "browserify": "^10.2.1",
-    "code": "1.x.x",
-    "lab": "5.x.x"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "4d932e5c7ea411cca76a312d39a606200fd50cd9",
-    "tarball": "http://registry.npmjs.org/qs/-/qs-5.1.0.tgz"
-  },
-  "engines": ">=0.10.40",
-  "gitHead": "9e9759ec5be2dd99ce90961bbff47075cd5a8160",
-  "homepage": "https://github.com/hapijs/qs",
-  "installable": true,
-  "keywords": [
-    "qs",
-    "querystring"
-  ],
-  "license": "BSD-3-Clause",
-  "main": "lib/index.js",
-  "maintainers": [
-    {
-      "name": "nlf",
-      "email": "quitlahok@gmail.com"
-    },
-    {
-      "name": "hueniverse",
-      "email": "eran@hueniverse.com"
-    }
-  ],
-  "name": "qs",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/hapijs/qs.git"
-  },
-  "scripts": {
-    "dist": "browserify --standalone Qs lib/index.js > dist/qs.js",
-    "test": "lab -a code -t 100 -L",
-    "test-cov-html": "lab -a code -r html -o coverage.html",
-    "test-tap": "lab -a code -r tap -o tests.tap"
-  },
-  "version": "5.1.0"
-}
diff --git a/deps/npm/node_modules/read-cmd-shim/package.json b/deps/npm/node_modules/read-cmd-shim/package.json
index 48111968048a2f..04f8addc4d9bb9 100644
--- a/deps/npm/node_modules/read-cmd-shim/package.json
+++ b/deps/npm/node_modules/read-cmd-shim/package.json
@@ -1,78 +1,54 @@
 {
-  "_args": [
-    [
-      "read-cmd-shim",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "read-cmd-shim@*",
-  "_id": "read-cmd-shim@1.0.1",
-  "_inCache": true,
-  "_location": "/read-cmd-shim",
-  "_nodeVersion": "3.1.0",
-  "_npmUser": {
-    "email": "me@re-becca.org",
-    "name": "iarna"
+  "name": "read-cmd-shim",
+  "version": "1.0.1",
+  "description": "Figure out what a cmd-shim is pointing at. This acts as the equivalent of fs.readlink.",
+  "main": "index.js",
+  "dependencies": {
+    "graceful-fs": "^4.1.2"
   },
-  "_npmVersion": "3.3.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "read-cmd-shim",
-    "raw": "read-cmd-shim",
-    "rawSpec": "",
-    "scope": null,
-    "spec": "*",
-    "type": "range"
+  "devDependencies": {
+    "cmd-shim": "^2.0.1",
+    "rimraf": "^2.4.3",
+    "standard": "^5.2.2",
+    "tap": "^1.4.1"
+  },
+  "scripts": {
+    "test": "standard && tap test/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/read-cmd-shim.git"
   },
-  "_requiredBy": [
-    "/"
-  ],
-  "_shasum": "2d5d157786a37c055d22077c32c53f8329e91c7b",
-  "_shrinkwrap": null,
-  "_spec": "read-cmd-shim",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "me@re-becca.org",
     "name": "Rebecca Turner",
+    "email": "me@re-becca.org",
     "url": "http://re-becca.org/"
   },
+  "license": "ISC",
   "bugs": {
     "url": "https://github.com/npm/read-cmd-shim/issues"
   },
-  "dependencies": {
-    "graceful-fs": "^4.1.2"
-  },
-  "description": "Figure out what a cmd-shim is pointing at. This acts as the equivalent of fs.readlink.",
-  "devDependencies": {
-    "cmd-shim": "^2.0.1",
-    "rimraf": "^2.4.3",
-    "standard": "^5.2.2",
-    "tap": "^1.4.1"
+  "homepage": "https://github.com/npm/read-cmd-shim#readme",
+  "gitHead": "7c50879bf49743a1c69f9d7f0ba1638fc46bb40c",
+  "_id": "read-cmd-shim@1.0.1",
+  "_shasum": "2d5d157786a37c055d22077c32c53f8329e91c7b",
+  "_from": "read-cmd-shim@>=1.0.1 <1.1.0",
+  "_npmVersion": "3.3.0",
+  "_nodeVersion": "3.1.0",
+  "_npmUser": {
+    "name": "iarna",
+    "email": "me@re-becca.org"
   },
-  "directories": {},
   "dist": {
     "shasum": "2d5d157786a37c055d22077c32c53f8329e91c7b",
     "tarball": "http://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz"
   },
-  "gitHead": "7c50879bf49743a1c69f9d7f0ba1638fc46bb40c",
-  "homepage": "https://github.com/npm/read-cmd-shim#readme",
-  "installable": true,
-  "license": "ISC",
-  "main": "index.js",
   "maintainers": [
     {
       "name": "iarna",
       "email": "me@re-becca.org"
     }
   ],
-  "name": "read-cmd-shim",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/read-cmd-shim.git"
-  },
-  "scripts": {
-    "test": "standard && tap test/*.js"
-  },
-  "version": "1.0.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz"
 }
diff --git a/deps/npm/node_modules/util-extend/README.md b/deps/npm/node_modules/read-installed/node_modules/util-extend/README.md
similarity index 100%
rename from deps/npm/node_modules/util-extend/README.md
rename to deps/npm/node_modules/read-installed/node_modules/util-extend/README.md
diff --git a/deps/npm/node_modules/util-extend/extend.js b/deps/npm/node_modules/read-installed/node_modules/util-extend/extend.js
similarity index 100%
rename from deps/npm/node_modules/util-extend/extend.js
rename to deps/npm/node_modules/read-installed/node_modules/util-extend/extend.js
diff --git a/deps/npm/node_modules/util-extend/package.json b/deps/npm/node_modules/read-installed/node_modules/util-extend/package.json
similarity index 61%
rename from deps/npm/node_modules/util-extend/package.json
rename to deps/npm/node_modules/read-installed/node_modules/util-extend/package.json
index 90d27e158c0099..259d6c1049fac5 100644
--- a/deps/npm/node_modules/util-extend/package.json
+++ b/deps/npm/node_modules/read-installed/node_modules/util-extend/package.json
@@ -1,66 +1,41 @@
 {
-  "_args": [
-    [
-      "util-extend@^1.0.1",
-      "/Users/rebecca/code/npm/node_modules/read-installed"
-    ]
-  ],
-  "_from": "util-extend@>=1.0.1 <2.0.0",
-  "_id": "util-extend@1.0.1",
-  "_inCache": true,
-  "_location": "/util-extend",
-  "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
+  "name": "util-extend",
+  "version": "1.0.1",
+  "description": "Node's internal object extension function",
+  "main": "extend.js",
+  "scripts": {
+    "test": "node test.js"
   },
-  "_npmVersion": "1.3.4",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "util-extend",
-    "raw": "util-extend@^1.0.1",
-    "rawSpec": "^1.0.1",
-    "scope": null,
-    "spec": ">=1.0.1 <2.0.0",
-    "type": "range"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/util-extend.git"
   },
-  "_requiredBy": [
-    "/read-installed"
-  ],
-  "_resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz",
-  "_shasum": "bb703b79480293ddcdcfb3c6a9fea20f483415bc",
-  "_shrinkwrap": null,
-  "_spec": "util-extend@^1.0.1",
-  "_where": "/Users/rebecca/code/npm/node_modules/read-installed",
   "author": "",
+  "license": "MIT",
+  "readmeFilename": "README.md",
+  "readme": "# util-extend\n\nThe Node object extending function that Node uses for Node!\n\n## Usage\n\n```js\nvar extend = require('util-extend');\nfunction functionThatTakesOptions(options) {\n  var options = extend(defaults, options);\n  // now any unset options are set to the defaults.\n}\n```\n",
   "bugs": {
     "url": "https://github.com/isaacs/util-extend/issues"
   },
-  "dependencies": {},
-  "description": "Node's internal object extension function",
-  "devDependencies": {},
-  "directories": {},
+  "_id": "util-extend@1.0.1",
   "dist": {
     "shasum": "bb703b79480293ddcdcfb3c6a9fea20f483415bc",
     "tarball": "http://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz"
   },
-  "license": "MIT",
-  "main": "extend.js",
+  "_from": "util-extend@>=1.0.1 <2.0.0",
+  "_npmVersion": "1.3.4",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "i@izs.me"
+  },
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "name": "util-extend",
-  "optionalDependencies": {},
-  "readme": "# util-extend\n\nThe Node object extending function that Node uses for Node!\n\n## Usage\n\n```js\nvar extend = require('util-extend');\nfunction functionThatTakesOptions(options) {\n  var options = extend(defaults, options);\n  // now any unset options are set to the defaults.\n}\n```\n",
-  "readmeFilename": "README.md",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/util-extend"
-  },
-  "scripts": {
-    "test": "node test.js"
-  },
-  "version": "1.0.1"
+  "directories": {},
+  "_shasum": "bb703b79480293ddcdcfb3c6a9fea20f483415bc",
+  "_resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz",
+  "homepage": "https://github.com/isaacs/util-extend#readme"
 }
diff --git a/deps/npm/node_modules/util-extend/test.js b/deps/npm/node_modules/read-installed/node_modules/util-extend/test.js
similarity index 100%
rename from deps/npm/node_modules/util-extend/test.js
rename to deps/npm/node_modules/read-installed/node_modules/util-extend/test.js
diff --git a/deps/npm/node_modules/read-installed/package.json b/deps/npm/node_modules/read-installed/package.json
index 546f7f339c5cb1..76977474cddf21 100644
--- a/deps/npm/node_modules/read-installed/package.json
+++ b/deps/npm/node_modules/read-installed/package.json
@@ -1,70 +1,56 @@
 {
-  "_args": [
-    [
-      "read-installed@~4.0.2",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "read-installed@>=4.0.2 <4.1.0",
-  "_id": "read-installed@4.0.3",
-  "_inCache": true,
-  "_location": "/read-installed",
-  "_nodeVersion": "2.2.2",
-  "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
-  },
-  "_npmVersion": "2.14.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "read-installed",
-    "raw": "read-installed@~4.0.2",
-    "rawSpec": "~4.0.2",
-    "scope": null,
-    "spec": ">=4.0.2 <4.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz",
-  "_shasum": "ff9b8b67f187d1e4c29b9feb31f6b223acd19067",
-  "_shrinkwrap": null,
-  "_spec": "read-installed@~4.0.2",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me/"
+  "name": "read-installed",
+  "description": "Read all the installed packages in a folder, and return a tree structure with all the data.",
+  "version": "4.0.3",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/read-installed.git"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/read-installed/issues"
+  "main": "read-installed.js",
+  "scripts": {
+    "test": "tap ./test/*.js"
   },
   "dependencies": {
     "debuglog": "^1.0.1",
-    "graceful-fs": "^4.1.2",
     "read-package-json": "^2.0.0",
     "readdir-scoped-modules": "^1.0.0",
     "semver": "2 || 3 || 4 || 5",
     "slide": "~1.1.3",
-    "util-extend": "^1.0.1"
+    "util-extend": "^1.0.1",
+    "graceful-fs": "^4.1.2"
   },
-  "description": "Read all the installed packages in a folder, and return a tree structure with all the data.",
+  "optionalDependencies": {
+    "graceful-fs": "^4.1.2"
+  },
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
+  },
+  "license": "ISC",
   "devDependencies": {
     "mkdirp": "^0.5.0",
     "rimraf": "^2.2.8",
     "tap": "^1.2.0"
   },
-  "directories": {},
+  "gitHead": "da02df6acdb5f5ee31d8c637ef31fb50efb455c1",
+  "bugs": {
+    "url": "https://github.com/isaacs/read-installed/issues"
+  },
+  "homepage": "https://github.com/isaacs/read-installed#readme",
+  "_id": "read-installed@4.0.3",
+  "_shasum": "ff9b8b67f187d1e4c29b9feb31f6b223acd19067",
+  "_from": "read-installed@>=4.0.3 <4.1.0",
+  "_npmVersion": "2.14.3",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
+  },
   "dist": {
     "shasum": "ff9b8b67f187d1e4c29b9feb31f6b223acd19067",
     "tarball": "http://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz"
   },
-  "gitHead": "da02df6acdb5f5ee31d8c637ef31fb50efb455c1",
-  "homepage": "https://github.com/isaacs/read-installed#readme",
-  "installable": true,
-  "license": "ISC",
-  "main": "read-installed.js",
   "maintainers": [
     {
       "name": "iarna",
@@ -83,16 +69,6 @@
       "email": "kat@sykosomatic.org"
     }
   ],
-  "name": "read-installed",
-  "optionalDependencies": {
-    "graceful-fs": "^4.1.2"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/read-installed.git"
-  },
-  "scripts": {
-    "test": "tap ./test/*.js"
-  },
-  "version": "4.0.3"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz"
 }
diff --git a/deps/npm/node_modules/json-parse-helpfulerror/.editorconfig b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/.editorconfig
similarity index 100%
rename from deps/npm/node_modules/json-parse-helpfulerror/.editorconfig
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/.editorconfig
diff --git a/deps/npm/node_modules/json-parse-helpfulerror/.npmignore b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/.npmignore
similarity index 100%
rename from deps/npm/node_modules/json-parse-helpfulerror/.npmignore
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/.npmignore
diff --git a/deps/npm/node_modules/json-parse-helpfulerror/LICENSE b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/LICENSE
similarity index 100%
rename from deps/npm/node_modules/json-parse-helpfulerror/LICENSE
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/LICENSE
diff --git a/deps/npm/node_modules/json-parse-helpfulerror/README.md b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/README.md
similarity index 100%
rename from deps/npm/node_modules/json-parse-helpfulerror/README.md
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/README.md
diff --git a/deps/npm/node_modules/json-parse-helpfulerror/index.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/index.js
similarity index 100%
rename from deps/npm/node_modules/json-parse-helpfulerror/index.js
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/index.js
diff --git a/deps/npm/node_modules/jju/.npmignore b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/.npmignore
similarity index 100%
rename from deps/npm/node_modules/jju/.npmignore
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/.npmignore
diff --git a/deps/npm/node_modules/jju/README.md b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/README.md
similarity index 100%
rename from deps/npm/node_modules/jju/README.md
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/README.md
diff --git a/deps/npm/node_modules/jju/index.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/index.js
similarity index 100%
rename from deps/npm/node_modules/jju/index.js
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/index.js
diff --git a/deps/npm/node_modules/jju/lib/analyze.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/analyze.js
similarity index 100%
rename from deps/npm/node_modules/jju/lib/analyze.js
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/analyze.js
diff --git a/deps/npm/node_modules/jju/lib/document.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/document.js
similarity index 100%
rename from deps/npm/node_modules/jju/lib/document.js
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/document.js
diff --git a/deps/npm/node_modules/jju/lib/parse.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/parse.js
similarity index 100%
rename from deps/npm/node_modules/jju/lib/parse.js
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/parse.js
diff --git a/deps/npm/node_modules/jju/lib/stringify.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/stringify.js
similarity index 100%
rename from deps/npm/node_modules/jju/lib/stringify.js
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/stringify.js
diff --git a/deps/npm/node_modules/jju/lib/unicode.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/unicode.js
similarity index 100%
rename from deps/npm/node_modules/jju/lib/unicode.js
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/unicode.js
diff --git a/deps/npm/node_modules/jju/lib/utils.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/utils.js
similarity index 100%
rename from deps/npm/node_modules/jju/lib/utils.js
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/lib/utils.js
diff --git a/deps/npm/node_modules/jju/package.json b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/package.json
similarity index 54%
rename from deps/npm/node_modules/jju/package.json
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/package.json
index 215d56ed2c9b9b..f1b467a6ebd039 100644
--- a/deps/npm/node_modules/jju/package.json
+++ b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/package.json
@@ -1,88 +1,63 @@
 {
-  "_args": [
-    [
-      "jju@^1.1.0",
-      "/Users/rebecca/code/npm/node_modules/json-parse-helpfulerror"
-    ]
-  ],
-  "_from": "jju@>=1.1.0 <2.0.0",
-  "_id": "jju@1.2.1",
-  "_inCache": true,
-  "_location": "/jju",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "email": "alex@kocharin.ru",
-    "name": "rlidwka"
-  },
-  "_npmVersion": "2.0.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "jju",
-    "raw": "jju@^1.1.0",
-    "rawSpec": "^1.1.0",
-    "scope": null,
-    "spec": ">=1.1.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/json-parse-helpfulerror"
-  ],
-  "_resolved": "https://registry.npmjs.org/jju/-/jju-1.2.1.tgz",
-  "_shasum": "edf6ec20d5d668c80c2c00cea63f8a9422a4b528",
-  "_shrinkwrap": null,
-  "_spec": "jju@^1.1.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/json-parse-helpfulerror",
+  "name": "jju",
+  "version": "1.2.1",
+  "description": "a set of utilities to work with JSON / JSON5 documents",
   "author": {
-    "email": "alex@kocharin.ru",
-    "name": "Alex Kocharin"
+    "name": "Alex Kocharin",
+    "email": "alex@kocharin.ru"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/rlidwka/jju.git"
   },
   "bugs": {
     "url": "https://github.com/rlidwka/jju/issues"
   },
-  "dependencies": {},
-  "description": "a set of utilities to work with JSON / JSON5 documents",
+  "homepage": "http://rlidwka.github.io/jju/",
   "devDependencies": {
-    "eslint": "~0.4.2",
+    "mocha": ">=1.21.0",
     "js-yaml": ">=3.1.0",
-    "mocha": ">=1.21.0"
+    "eslint": "~0.4.2"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "edf6ec20d5d668c80c2c00cea63f8a9422a4b528",
-    "tarball": "http://registry.npmjs.org/jju/-/jju-1.2.1.tgz"
+  "scripts": {
+    "test": "mocha test/*.js",
+    "lint": "eslint -c ./.eslint.yaml ./lib"
   },
-  "gitHead": "8b079c1d03af527ab28a47c7b714d6f888abc53d",
-  "homepage": "http://rlidwka.github.io/jju/",
-  "installable": true,
   "keywords": [
-    "data",
     "json",
     "json5",
     "parser",
-    "serializer"
+    "serializer",
+    "data"
   ],
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
   "license": {
     "type": "WTFPL",
     "url": "http://www.wtfpl.net/txt/copying/"
   },
+  "gitHead": "8b079c1d03af527ab28a47c7b714d6f888abc53d",
+  "_id": "jju@1.2.1",
+  "_shasum": "edf6ec20d5d668c80c2c00cea63f8a9422a4b528",
+  "_from": "jju@>=1.1.0 <2.0.0",
+  "_npmVersion": "2.0.1",
+  "_nodeVersion": "2.2.1",
+  "_npmUser": {
+    "name": "rlidwka",
+    "email": "alex@kocharin.ru"
+  },
   "maintainers": [
     {
       "name": "rlidwka",
       "email": "alex@kocharin.ru"
     }
   ],
-  "name": "jju",
-  "optionalDependencies": {},
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/rlidwka/jju"
-  },
-  "scripts": {
-    "lint": "eslint -c ./.eslint.yaml ./lib",
-    "test": "mocha test/*.js"
+  "dist": {
+    "shasum": "edf6ec20d5d668c80c2c00cea63f8a9422a4b528",
+    "tarball": "http://registry.npmjs.org/jju/-/jju-1.2.1.tgz"
   },
-  "version": "1.2.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/jju/-/jju-1.2.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/jju/package.yaml b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/package.yaml
similarity index 100%
rename from deps/npm/node_modules/jju/package.yaml
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/node_modules/jju/package.yaml
diff --git a/deps/npm/node_modules/json-parse-helpfulerror/package.json b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/package.json
similarity index 58%
rename from deps/npm/node_modules/json-parse-helpfulerror/package.json
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/package.json
index 6ab518ee986948..2a5a98fc32a02c 100644
--- a/deps/npm/node_modules/json-parse-helpfulerror/package.json
+++ b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/package.json
@@ -1,84 +1,61 @@
 {
-  "_args": [
-    [
-      "json-parse-helpfulerror@^1.0.2",
-      "/Users/rebecca/code/npm/node_modules/read-package-json"
-    ]
-  ],
-  "_from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
-  "_id": "json-parse-helpfulerror@1.0.3",
-  "_inCache": true,
-  "_location": "/json-parse-helpfulerror",
-  "_nodeVersion": "0.10.35",
-  "_npmUser": {
-    "email": "smikes@cubane.com",
-    "name": "smikes"
+  "name": "json-parse-helpfulerror",
+  "version": "1.0.3",
+  "description": "A drop-in replacement for JSON.parse that uses `jju` to give helpful errors",
+  "main": "index.js",
+  "scripts": {
+    "test": "lab -c",
+    "lint": "jslint --edition=latest --terse *.js"
   },
-  "_npmVersion": "2.1.16",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "json-parse-helpfulerror",
-    "raw": "json-parse-helpfulerror@^1.0.2",
-    "rawSpec": "^1.0.2",
-    "scope": null,
-    "spec": ">=1.0.2 <2.0.0",
-    "type": "range"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/smikes/json-parse-helpfulerror.git"
   },
-  "_requiredBy": [
-    "/read-package-json"
+  "keywords": [
+    "json",
+    "parse",
+    "line",
+    "doublequote",
+    "error"
   ],
-  "_resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
-  "_shasum": "13f14ce02eed4e981297b64eb9e3b932e2dd13dc",
-  "_shrinkwrap": null,
-  "_spec": "json-parse-helpfulerror@^1.0.2",
-  "_where": "/Users/rebecca/code/npm/node_modules/read-package-json",
   "author": {
-    "email": "smikes@cubane.com",
-    "name": "Sam Mikes"
+    "name": "Sam Mikes",
+    "email": "smikes@cubane.com"
   },
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/smikes/json-parse-helpfulerror/issues"
   },
-  "dependencies": {
-    "jju": "^1.1.0"
-  },
-  "description": "A drop-in replacement for JSON.parse that uses `jju` to give helpful errors",
+  "homepage": "https://github.com/smikes/json-parse-helpfulerror",
   "devDependencies": {
     "code": "^1.2.1",
     "jslint": "^0.7.1",
     "lab": "^5.1.1"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "13f14ce02eed4e981297b64eb9e3b932e2dd13dc",
-    "tarball": "http://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz"
+  "dependencies": {
+    "jju": "^1.1.0"
   },
   "gitHead": "eedb116ec96b5c479be3919b526d6de0a521be5e",
-  "homepage": "https://github.com/smikes/json-parse-helpfulerror",
-  "keywords": [
-    "doublequote",
-    "error",
-    "json",
-    "line",
-    "parse"
-  ],
-  "license": "MIT",
-  "main": "index.js",
+  "_id": "json-parse-helpfulerror@1.0.3",
+  "_shasum": "13f14ce02eed4e981297b64eb9e3b932e2dd13dc",
+  "_from": "json-parse-helpfulerror@>=1.0.2 <2.0.0",
+  "_npmVersion": "2.1.16",
+  "_nodeVersion": "0.10.35",
+  "_npmUser": {
+    "name": "smikes",
+    "email": "smikes@cubane.com"
+  },
   "maintainers": [
     {
       "name": "smikes",
       "email": "smikes@cubane.com"
     }
   ],
-  "name": "json-parse-helpfulerror",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/smikes/json-parse-helpfulerror.git"
-  },
-  "scripts": {
-    "lint": "jslint --edition=latest --terse *.js",
-    "test": "lab -c"
+  "dist": {
+    "shasum": "13f14ce02eed4e981297b64eb9e3b932e2dd13dc",
+    "tarball": "http://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz"
   },
-  "version": "1.0.3"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/json-parse-helpfulerror/test/test.js b/deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/test/test.js
similarity index 100%
rename from deps/npm/node_modules/json-parse-helpfulerror/test/test.js
rename to deps/npm/node_modules/read-package-json/node_modules/json-parse-helpfulerror/test/test.js
diff --git a/deps/npm/node_modules/read-package-json/package.json b/deps/npm/node_modules/read-package-json/package.json
index b6eadd5d00a9ac..1dc60532c71d75 100644
--- a/deps/npm/node_modules/read-package-json/package.json
+++ b/deps/npm/node_modules/read-package-json/package.json
@@ -1,69 +1,52 @@
 {
-  "_args": [
-    [
-      "read-package-json@~2.0.0",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "read-package-json@>=2.0.0 <2.1.0",
-  "_id": "read-package-json@2.0.1",
-  "_inCache": true,
-  "_location": "/read-package-json",
-  "_nodeVersion": "2.2.2",
-  "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
-  },
-  "_npmVersion": "2.14.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "read-package-json",
-    "raw": "read-package-json@~2.0.0",
-    "rawSpec": "~2.0.0",
-    "scope": null,
-    "spec": ">=2.0.0 <2.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/init-package-json",
-    "/read-installed",
-    "/read-package-tree"
-  ],
-  "_resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.1.tgz",
-  "_shasum": "b822abfc2c4f0abfe7f52de6448be4560b6e7053",
-  "_shrinkwrap": null,
-  "_spec": "read-package-json@~2.0.0",
-  "_where": "/Users/rebecca/code/npm",
+  "name": "read-package-json",
+  "version": "2.0.1",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/read-package-json/issues"
+  "description": "The thing npm uses to read package.json files with semantics and defaults and validation",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/read-package-json.git"
+  },
+  "main": "read-json.js",
+  "scripts": {
+    "test": "standard && tap test/*.js"
   },
   "dependencies": {
     "glob": "^5.0.3",
-    "graceful-fs": "^4.1.2",
     "json-parse-helpfulerror": "^1.0.2",
-    "normalize-package-data": "^2.0.0"
+    "normalize-package-data": "^2.0.0",
+    "graceful-fs": "^4.1.2"
   },
-  "description": "The thing npm uses to read package.json files with semantics and defaults and validation",
   "devDependencies": {
     "standard": "^3.3.1",
     "tap": "^1.2.0"
   },
-  "directories": {},
+  "optionalDependencies": {
+    "graceful-fs": "^4.1.2"
+  },
+  "license": "ISC",
+  "gitHead": "d4f9f52c823750e7f2a7b9069bc56b9fd3a0ee96",
+  "bugs": {
+    "url": "https://github.com/isaacs/read-package-json/issues"
+  },
+  "homepage": "https://github.com/isaacs/read-package-json#readme",
+  "_id": "read-package-json@2.0.1",
+  "_shasum": "b822abfc2c4f0abfe7f52de6448be4560b6e7053",
+  "_from": "read-package-json@>=2.0.1 <2.1.0",
+  "_npmVersion": "2.14.3",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
+  },
   "dist": {
     "shasum": "b822abfc2c4f0abfe7f52de6448be4560b6e7053",
     "tarball": "http://registry.npmjs.org/read-package-json/-/read-package-json-2.0.1.tgz"
   },
-  "gitHead": "d4f9f52c823750e7f2a7b9069bc56b9fd3a0ee96",
-  "homepage": "https://github.com/isaacs/read-package-json#readme",
-  "installable": true,
-  "license": "ISC",
-  "main": "read-json.js",
   "maintainers": [
     {
       "name": "iarna",
@@ -82,16 +65,7 @@
       "email": "kat@sykosomatic.org"
     }
   ],
-  "name": "read-package-json",
-  "optionalDependencies": {
-    "graceful-fs": "^4.1.2"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/read-package-json.git"
-  },
-  "scripts": {
-    "test": "standard && tap test/*.js"
-  },
-  "version": "2.0.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/read-package-tree/package.json b/deps/npm/node_modules/read-package-tree/package.json
index 4f70ab170e7e0e..4691dae1d2ad8b 100644
--- a/deps/npm/node_modules/read-package-tree/package.json
+++ b/deps/npm/node_modules/read-package-tree/package.json
@@ -1,43 +1,10 @@
 {
-  "_args": [
-    [
-      "read-package-tree@~5.1.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "read-package-tree@>=5.1.1 <5.2.0",
-  "_id": "read-package-tree@5.1.2",
-  "_inCache": true,
-  "_location": "/read-package-tree",
-  "_nodeVersion": "0.12.7",
-  "_npmUser": {
-    "email": "me@re-becca.org",
-    "name": "iarna"
-  },
-  "_npmVersion": "2.13.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "read-package-tree",
-    "raw": "read-package-tree@~5.1.1",
-    "rawSpec": "~5.1.1",
-    "scope": null,
-    "spec": ">=5.1.1 <5.2.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_shasum": "e3a488792f40cf470819f01a610e719d64f09094",
-  "_shrinkwrap": null,
-  "_spec": "read-package-tree@~5.1.1",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/npm/read-package-tree/issues"
+  "name": "read-package-tree",
+  "version": "5.1.2",
+  "description": "Read the contents of node_modules.",
+  "main": "rpt.js",
+  "directories": {
+    "test": "test"
   },
   "dependencies": {
     "debuglog": "^1.0.1",
@@ -46,23 +13,41 @@
     "read-package-json": "^2.0.0",
     "readdir-scoped-modules": "^1.0.0"
   },
-  "description": "Read the contents of node_modules.",
   "devDependencies": {
     "archy": "0",
     "tap": "^1.2.0"
   },
-  "directories": {
-    "test": "test"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/read-package-tree.git"
+  },
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
+  },
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/npm/read-package-tree/issues"
+  },
+  "homepage": "https://github.com/npm/read-package-tree",
+  "gitHead": "2ed40c4654804f2a5ddb7b0b2c509080731eea6b",
+  "_id": "read-package-tree@5.1.2",
+  "_shasum": "e3a488792f40cf470819f01a610e719d64f09094",
+  "_from": "read-package-tree@>=5.1.2 <5.2.0",
+  "_npmVersion": "2.13.3",
+  "_nodeVersion": "0.12.7",
+  "_npmUser": {
+    "name": "iarna",
+    "email": "me@re-becca.org"
   },
   "dist": {
     "shasum": "e3a488792f40cf470819f01a610e719d64f09094",
     "tarball": "http://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.2.tgz"
   },
-  "gitHead": "2ed40c4654804f2a5ddb7b0b2c509080731eea6b",
-  "homepage": "https://github.com/npm/read-package-tree",
-  "installable": true,
-  "license": "ISC",
-  "main": "rpt.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -73,14 +58,5 @@
       "email": "me@re-becca.org"
     }
   ],
-  "name": "read-package-tree",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/read-package-tree.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "5.1.2"
+  "_resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.2.tgz"
 }
diff --git a/deps/npm/node_modules/sigmund/LICENSE b/deps/npm/node_modules/read/node_modules/mute-stream/LICENSE
similarity index 100%
rename from deps/npm/node_modules/sigmund/LICENSE
rename to deps/npm/node_modules/read/node_modules/mute-stream/LICENSE
diff --git a/deps/npm/node_modules/mute-stream/README.md b/deps/npm/node_modules/read/node_modules/mute-stream/README.md
similarity index 100%
rename from deps/npm/node_modules/mute-stream/README.md
rename to deps/npm/node_modules/read/node_modules/mute-stream/README.md
diff --git a/deps/npm/node_modules/mute-stream/mute.js b/deps/npm/node_modules/read/node_modules/mute-stream/mute.js
similarity index 100%
rename from deps/npm/node_modules/mute-stream/mute.js
rename to deps/npm/node_modules/read/node_modules/mute-stream/mute.js
diff --git a/deps/npm/node_modules/read/node_modules/mute-stream/package.json b/deps/npm/node_modules/read/node_modules/mute-stream/package.json
new file mode 100644
index 00000000000000..ff64101467594a
--- /dev/null
+++ b/deps/npm/node_modules/read/node_modules/mute-stream/package.json
@@ -0,0 +1,40 @@
+{
+  "name": "mute-stream",
+  "version": "0.0.5",
+  "main": "mute.js",
+  "directories": {
+    "test": "test"
+  },
+  "devDependencies": {
+    "tap": "~0.2.5"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/mute-stream.git"
+  },
+  "keywords": [
+    "mute",
+    "stream",
+    "pipe"
+  ],
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
+  },
+  "license": "ISC",
+  "description": "Bytes go in, but they don't come out (when muted).",
+  "readme": "# mute-stream\n\nBytes go in, but they don't come out (when muted).\n\nThis is a basic pass-through stream, but when muted, the bytes are\nsilently dropped, rather than being passed through.\n\n## Usage\n\n```javascript\nvar MuteStream = require('mute-stream')\n\nvar ms = new MuteStream(options)\n\nms.pipe(process.stdout)\nms.write('foo') // writes 'foo' to stdout\nms.mute()\nms.write('bar') // does not write 'bar'\nms.unmute()\nms.write('baz') // writes 'baz' to stdout\n\n// can also be used to mute incoming data\nvar ms = new MuteStream\ninput.pipe(ms)\n\nms.on('data', function (c) {\n  console.log('data: ' + c)\n})\n\ninput.emit('data', 'foo') // logs 'foo'\nms.mute()\ninput.emit('data', 'bar') // does not log 'bar'\nms.unmute()\ninput.emit('data', 'baz') // logs 'baz'\n```\n\n## Options\n\nAll options are optional.\n\n* `replace` Set to a string to replace each character with the\n  specified string when muted.  (So you can show `****` instead of the\n  password, for example.)\n\n* `prompt` If you are using a replacement char, and also using a\n  prompt with a readline stream (as for a `Password: *****` input),\n  then specify what the prompt is so that backspace will work\n  properly.  Otherwise, pressing backspace will overwrite the prompt\n  with the replacement character, which is weird.\n\n## ms.mute()\n\nSet `muted` to `true`.  Turns `.write()` into a no-op.\n\n## ms.unmute()\n\nSet `muted` to `false`\n\n## ms.isTTY\n\nTrue if the pipe destination is a TTY, or if the incoming pipe source is\na TTY.\n\n## Other stream methods...\n\nThe other standard readable and writable stream methods are all\navailable.  The MuteStream object acts as a facade to its pipe source\nand destination.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/isaacs/mute-stream/issues"
+  },
+  "homepage": "https://github.com/isaacs/mute-stream#readme",
+  "_id": "mute-stream@0.0.5",
+  "_shasum": "8fbfabb0a98a253d3184331f9e8deb7372fac6c0",
+  "_resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
+  "_from": "mute-stream@>=0.0.4 <0.1.0"
+}
diff --git a/deps/npm/node_modules/mute-stream/test/basic.js b/deps/npm/node_modules/read/node_modules/mute-stream/test/basic.js
similarity index 100%
rename from deps/npm/node_modules/mute-stream/test/basic.js
rename to deps/npm/node_modules/read/node_modules/mute-stream/test/basic.js
diff --git a/deps/npm/node_modules/read/package.json b/deps/npm/node_modules/read/package.json
index 04f8459555d6a8..f869931811e2a4 100644
--- a/deps/npm/node_modules/read/package.json
+++ b/deps/npm/node_modules/read/package.json
@@ -1,84 +1,41 @@
 {
-  "_args": [
-    [
-      "read@1.0.7",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "read@1.0.7",
-  "_id": "read@1.0.7",
-  "_inCache": true,
-  "_location": "/read",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "3.2.2",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "read",
-    "raw": "read@1.0.7",
-    "rawSpec": "1.0.7",
-    "scope": null,
-    "spec": "1.0.7",
-    "type": "version"
-  },
-  "_requiredBy": [
-    "/",
-    "/init-package-json",
-    "/promzard"
-  ],
-  "_resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-  "_shasum": "b3da19bd052431a97671d44a42634adf710b40c4",
-  "_shrinkwrap": null,
-  "_spec": "read@1.0.7",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/read/issues"
-  },
+  "name": "read",
+  "version": "1.0.7",
+  "main": "lib/read.js",
   "dependencies": {
     "mute-stream": "~0.0.4"
   },
-  "description": "read(1) for node programs",
   "devDependencies": {
     "tap": "^1.2.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "b3da19bd052431a97671d44a42634adf710b40c4",
-    "tarball": "http://registry.npmjs.org/read/-/read-1.0.7.tgz"
-  },
   "engines": {
     "node": ">=0.8"
   },
-  "files": [
-    "lib/read.js"
-  ],
-  "gitHead": "b14516b9236c40140fd0666567f5d0c588a09a62",
-  "homepage": "https://github.com/isaacs/read#readme",
-  "installable": true,
-  "license": "ISC",
-  "main": "lib/read.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "name": "read",
-  "optionalDependencies": {},
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
+  },
+  "description": "read(1) for node programs",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/read.git"
   },
+  "license": "ISC",
   "scripts": {
     "test": "tap test/*.js"
   },
-  "version": "1.0.7"
+  "files": [
+    "lib/read.js"
+  ],
+  "readme": "## read\n\nFor reading user input from stdin.\n\nSimilar to the `readline` builtin's `question()` method, but with a\nfew more features.\n\n## USAGE\n\n```javascript\nvar read = require(\"read\")\nread(options, callback)\n```\n\nThe callback gets called with either the user input, or the default\nspecified, or an error, as `callback(error, result, isDefault)`\nnode style.\n\n## OPTIONS\n\nEvery option is optional.\n\n* `prompt` What to write to stdout before reading input.\n* `silent` Don't echo the output as the user types it.\n* `replace` Replace silenced characters with the supplied character value.\n* `timeout` Number of ms to wait for user input before giving up.\n* `default` The default value if the user enters nothing.\n* `edit` Allow the user to edit the default value.\n* `terminal` Treat the output as a TTY, whether it is or not.\n* `input` Readable stream to get input data from. (default `process.stdin`)\n* `output` Writeable stream to write prompts to. (default: `process.stdout`)\n\nIf silent is true, and the input is a TTY, then read will set raw\nmode, and read character by character.\n\n## COMPATIBILITY\n\nThis module works sort of with node 0.6.  It does not work with node\nversions less than 0.6.  It is best on node 0.8.\n\nOn node version 0.6, it will remove all listeners on the input\nstream's `data` and `keypress` events, because the readline module did\nnot fully clean up after itself in that version of node, and did not\nmake it possible to clean up after it in a way that has no potential\nfor side effects.\n\nAdditionally, some of the readline options (like `terminal`) will not\nfunction in versions of node before 0.8, because they were not\nimplemented in the builtin readline module.\n\n## CONTRIBUTING\n\nPatches welcome.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/isaacs/read/issues"
+  },
+  "homepage": "https://github.com/isaacs/read#readme",
+  "_id": "read@1.0.7",
+  "_shasum": "b3da19bd052431a97671d44a42634adf710b40c4",
+  "_resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+  "_from": "read@>=1.0.7 <1.1.0"
 }
diff --git a/deps/npm/node_modules/readable-stream/package.json b/deps/npm/node_modules/readable-stream/package.json
deleted file mode 100644
index a82d55fa2424be..00000000000000
--- a/deps/npm/node_modules/readable-stream/package.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "_args": [
-    [
-      "readable-stream@^1.1.13",
-      "/Users/rebecca/code/npm/node_modules/are-we-there-yet"
-    ]
-  ],
-  "_from": "readable-stream@>=1.1.13 <2.0.0",
-  "_id": "readable-stream@1.1.13",
-  "_inCache": true,
-  "_location": "/readable-stream",
-  "_npmUser": {
-    "email": "rod@vagg.org",
-    "name": "rvagg"
-  },
-  "_npmVersion": "1.4.23",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "readable-stream",
-    "raw": "readable-stream@^1.1.13",
-    "rawSpec": "^1.1.13",
-    "scope": null,
-    "spec": ">=1.1.13 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/are-we-there-yet",
-    "/sha"
-  ],
-  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
-  "_shasum": "f6eef764f514c89e2b9e23146a75ba106756d23e",
-  "_shrinkwrap": null,
-  "_spec": "readable-stream@^1.1.13",
-  "_where": "/Users/rebecca/code/npm/node_modules/are-we-there-yet",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me/"
-  },
-  "browser": {
-    "util": false
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/readable-stream/issues"
-  },
-  "dependencies": {
-    "core-util-is": "~1.0.0",
-    "inherits": "~2.0.1",
-    "isarray": "0.0.1",
-    "string_decoder": "~0.10.x"
-  },
-  "description": "Streams3, a user-land copy of the stream library from Node.js v0.11.x",
-  "devDependencies": {
-    "tap": "~0.2.6"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "f6eef764f514c89e2b9e23146a75ba106756d23e",
-    "tarball": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"
-  },
-  "gitHead": "3b672fd7ae92acf5b4ffdbabf74b372a0a56b051",
-  "homepage": "https://github.com/isaacs/readable-stream",
-  "keywords": [
-    "pipe",
-    "readable",
-    "stream"
-  ],
-  "license": "MIT",
-  "main": "readable.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    },
-    {
-      "name": "tootallnate",
-      "email": "nathan@tootallnate.net"
-    },
-    {
-      "name": "rvagg",
-      "email": "rod@vagg.org"
-    }
-  ],
-  "name": "readable-stream",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/readable-stream"
-  },
-  "scripts": {
-    "test": "tap test/simple/*.js"
-  },
-  "version": "1.1.13"
-}
diff --git a/deps/npm/node_modules/readdir-scoped-modules/package.json b/deps/npm/node_modules/readdir-scoped-modules/package.json
index ba44304f444686..7ca808a1f2aecf 100644
--- a/deps/npm/node_modules/readdir-scoped-modules/package.json
+++ b/deps/npm/node_modules/readdir-scoped-modules/package.json
@@ -1,45 +1,10 @@
 {
-  "_args": [
-    [
-      "readdir-scoped-modules@^1.0.0",
-      "/Users/rebecca/code/npm/node_modules/read-installed"
-    ]
-  ],
-  "_from": "readdir-scoped-modules@>=1.0.0 <2.0.0",
-  "_id": "readdir-scoped-modules@1.0.2",
-  "_inCache": true,
-  "_location": "/readdir-scoped-modules",
-  "_nodeVersion": "2.2.2",
-  "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
-  },
-  "_npmVersion": "2.14.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "readdir-scoped-modules",
-    "raw": "readdir-scoped-modules@^1.0.0",
-    "rawSpec": "^1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/read-installed",
-    "/read-package-tree"
-  ],
-  "_resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz",
-  "_shasum": "9fafa37d286be5d92cbaebdee030dc9b5f406747",
-  "_shrinkwrap": null,
-  "_spec": "readdir-scoped-modules@^1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/read-installed",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/npm/readdir-scoped-modules/issues"
+  "name": "readdir-scoped-modules",
+  "version": "1.0.2",
+  "description": "Like `fs.readdir` but handling `@org/module` dirs as if they were a single entry.",
+  "main": "readdir.js",
+  "directories": {
+    "test": "test"
   },
   "dependencies": {
     "debuglog": "^1.0.1",
@@ -47,22 +12,40 @@
     "graceful-fs": "^4.1.2",
     "once": "^1.3.0"
   },
-  "description": "Like `fs.readdir` but handling `@org/module` dirs as if they were a single entry.",
   "devDependencies": {
     "tap": "^1.2.0"
   },
-  "directories": {
-    "test": "test"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/readdir-scoped-modules.git"
+  },
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
+  },
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/npm/readdir-scoped-modules/issues"
+  },
+  "homepage": "https://github.com/npm/readdir-scoped-modules",
+  "gitHead": "d41d5de877cb4e9e3f14b92913132680af73d1b4",
+  "_id": "readdir-scoped-modules@1.0.2",
+  "_shasum": "9fafa37d286be5d92cbaebdee030dc9b5f406747",
+  "_from": "readdir-scoped-modules@1.0.2",
+  "_npmVersion": "2.14.3",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
   },
   "dist": {
     "shasum": "9fafa37d286be5d92cbaebdee030dc9b5f406747",
     "tarball": "http://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz"
   },
-  "gitHead": "d41d5de877cb4e9e3f14b92913132680af73d1b4",
-  "homepage": "https://github.com/npm/readdir-scoped-modules",
-  "installable": true,
-  "license": "ISC",
-  "main": "readdir.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -77,14 +60,6 @@
       "email": "kat@sykosomatic.org"
     }
   ],
-  "name": "readdir-scoped-modules",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/readdir-scoped-modules.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "1.0.2"
+  "_resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/realize-package-specifier/package.json b/deps/npm/node_modules/realize-package-specifier/package.json
index d87b7d9ef5e1c2..6f08eef5be88cc 100644
--- a/deps/npm/node_modules/realize-package-specifier/package.json
+++ b/deps/npm/node_modules/realize-package-specifier/package.json
@@ -1,81 +1,37 @@
 {
-  "_args": [
-    [
-      "realize-package-specifier@~3.0.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "realize-package-specifier@>=3.0.1 <3.1.0",
-  "_id": "realize-package-specifier@3.0.1",
-  "_inCache": true,
-  "_location": "/realize-package-specifier",
-  "_nodeVersion": "2.0.2",
-  "_npmUser": {
-    "email": "ogd@aoaioxxysz.net",
-    "name": "othiym23"
+  "name": "realize-package-specifier",
+  "version": "3.0.1",
+  "description": "Like npm-package-arg, but more so, producing full file paths and differentiating local tar and directory sources.",
+  "main": "index.js",
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "_npmVersion": "2.10.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "realize-package-specifier",
-    "raw": "realize-package-specifier@~3.0.1",
-    "rawSpec": "~3.0.1",
-    "scope": null,
-    "spec": ">=3.0.1 <3.1.0",
-    "type": "range"
+  "license": "ISC",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/realize-package-specifier.git"
   },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz",
-  "_shasum": "fde32e926448e38f99334d95b7b08d51e3a98d9f",
-  "_shrinkwrap": null,
-  "_spec": "realize-package-specifier@~3.0.1",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "me@re-becca.org",
     "name": "Rebecca Turner",
+    "email": "me@re-becca.org",
     "url": "http://re-becca.org"
   },
-  "bugs": {
-    "url": "https://github.com/npm/realize-package-specifier/issues"
-  },
+  "homepage": "https://github.com/npm/realize-package-specifier",
   "dependencies": {
     "dezalgo": "^1.0.1",
     "npm-package-arg": "^4.0.0"
   },
-  "description": "Like npm-package-arg, but more so, producing full file paths and differentiating local tar and directory sources.",
   "devDependencies": {
     "require-inject": "^1.1.0",
     "tap": "^0.4.12"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "fde32e926448e38f99334d95b7b08d51e3a98d9f",
-    "tarball": "http://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz"
-  },
+  "readme": "realize-package-specifier\n-------------------------\n\nParse a package specifier, peeking at the disk to differentiate between\nlocal tarballs, directories and named modules.  This implements the logic\nused by `npm install` and `npm cache` to determine where to get packages\nfrom.\n\n```javascript\nvar realizePackageSpecifier = require(\"realize-package-specifier\")\nrealizePackageSpecifier(\"foo.tar.gz\", \".\", function (err, package) {\n    …\n})\n```\n\n## Using\n\n* realizePackageSpecifier(*spec*, [*where*,] *callback*)\n\nParses *spec* using `npm-package-arg` and then uses stat to check to see if\nit refers to a local tarball or package directory.  Stats are done relative\nto *where*.  If it does then the local module is loaded.  If it doesn't then\ntarget is left as a remote package specifier.  Package directories are\nrecognized by the presence of a package.json in them.\n\n*spec* -- a package specifier, like: `foo@1.2`, or `foo@user/foo`, or\n`http://x.com/foo.tgz`, or `git+https://github.com/user/foo`\n\n*where* (optional, default: .) -- The directory in which we should look for\nlocal tarballs or package directories.\n\n*callback* function(*err*, *result*) -- Called once we've determined what\nkind of specifier this is.  The *result* object will be very like the one\nreturned by `npm-package-arg` except with three differences: 1) There's a\nnew type of `directory`.  2) The `local` type only refers to tarballs.  2)\nFor all `local` and `directory` type results spec will contain the full path of\nthe local package.\n\n## Result Object\n\nThe full definition of the result object is:\n\n* `name` - If known, the `name` field expected in the resulting pkg.\n* `type` - One of the following strings:\n  * `git` - A git repo\n  * `hosted` - A hosted project, from github, bitbucket or gitlab. Originally\n    either a full url pointing at one of these services or a shorthand like\n    `user/project` or `github:user/project` for github or `bitbucket:user/project`\n    for bitbucket.\n  * `tag` - A tagged version, like `\"foo@latest\"`\n  * `version` - A specific version number, like `\"foo@1.2.3\"`\n  * `range` - A version range, like `\"foo@2.x\"`\n  * `local` - A local file path\n  * `directory` - A local package directory\n  * `remote` - An http url (presumably to a tgz)\n* `spec` - The \"thing\".  URL, the range, git repo, etc.\n* `hosted` - If type=hosted this will be an object with the following keys:\n  * `type` - github, bitbucket or gitlab\n  * `ssh` - The ssh path for this git repo\n  * `sshurl` - The ssh URL for this git repo\n  * `https` - The HTTPS URL for this git repo\n  * `directUrl` - The URL for the package.json in this git repo\n* `raw` - The original un-modified string that was provided.\n* `rawSpec` - The part after the `name@...`, as it was originally\n  provided.\n* `scope` - If a name is something like `@org/module` then the `scope`\n  field will be set to `org`.  If it doesn't have a scoped name, then\n  scope is `null`.\n\n",
+  "readmeFilename": "README.md",
   "gitHead": "4f50130fa6b5e80954a90ea12bab382f53d890b1",
-  "homepage": "https://github.com/npm/realize-package-specifier",
-  "license": "ISC",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "iarna",
-      "email": "me@re-becca.org"
-    },
-    {
-      "name": "othiym23",
-      "email": "ogd@aoaioxxysz.net"
-    }
-  ],
-  "name": "realize-package-specifier",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/realize-package-specifier.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "bugs": {
+    "url": "https://github.com/npm/realize-package-specifier/issues"
   },
-  "version": "3.0.1"
+  "_id": "realize-package-specifier@3.0.1",
+  "_shasum": "fde32e926448e38f99334d95b7b08d51e3a98d9f",
+  "_from": "realize-package-specifier@>=3.0.1 <3.1.0"
 }
diff --git a/deps/npm/node_modules/request/CHANGELOG.md b/deps/npm/node_modules/request/CHANGELOG.md
index a5da7d968f7094..a43c6726a479d5 100644
--- a/deps/npm/node_modules/request/CHANGELOG.md
+++ b/deps/npm/node_modules/request/CHANGELOG.md
@@ -1,5 +1,20 @@
 ## Change Log
 
+### v2.65.0 (2015/10/11)
+- [#1833](https://github.com/request/request/pull/1833) Update aws-sign2 to version 0.6.0 🚀 (@greenkeeperio-bot)
+- [#1811](https://github.com/request/request/pull/1811) Enable loose cookie parsing in tough-cookie (@Sebmaster)
+- [#1830](https://github.com/request/request/pull/1830) Bring back tilde ranges for all dependencies (@simov)
+- [#1821](https://github.com/request/request/pull/1821) Implement support for RFC 2617 MD5-sess algorithm. (@BigDSK)
+- [#1828](https://github.com/request/request/pull/1828) Updated qs dependency to 5.2.0 (@acroca)
+- [#1818](https://github.com/request/request/pull/1818) Extract `readResponseBody` method out of `onRequestResponse` (@pvoisin)
+- [#1819](https://github.com/request/request/pull/1819) Run stringify once (@mgenereu)
+- [#1814](https://github.com/request/request/pull/1814) Updated har-validator to version 2.0.2 (@greenkeeperio-bot)
+- [#1807](https://github.com/request/request/pull/1807) Updated tough-cookie to version 2.1.0 (@greenkeeperio-bot)
+- [#1800](https://github.com/request/request/pull/1800) Add caret ranges for devDependencies, except eslint (@simov)
+- [#1799](https://github.com/request/request/pull/1799) Updated karma-browserify to version 4.4.0 (@greenkeeperio-bot)
+- [#1797](https://github.com/request/request/pull/1797) Updated tape to version 4.2.0 (@greenkeeperio-bot)
+- [#1788](https://github.com/request/request/pull/1788) Pinned all dependencies (@greenkeeperio-bot)
+
 ### v2.64.0 (2015/09/25)
 - [#1787](https://github.com/request/request/pull/1787) npm ignore examples, release.sh and disabled.appveyor.yml (@thisconnect)
 - [#1775](https://github.com/request/request/pull/1775) Fix typo in README.md (@djchie)
diff --git a/deps/npm/node_modules/request/lib/auth.js b/deps/npm/node_modules/request/lib/auth.js
index 1be1f42587b1e5..1cb695216f6b16 100644
--- a/deps/npm/node_modules/request/lib/auth.js
+++ b/deps/npm/node_modules/request/lib/auth.js
@@ -50,8 +50,6 @@ Auth.prototype.bearer = function (bearer, sendImmediately) {
 
 Auth.prototype.digest = function (method, path, authHeader) {
   // TODO: More complete implementation of RFC 2617.
-  //   - check challenge.algorithm
-  //   - support algorithm="MD5-sess"
   //   - handle challenge.domain
   //   - support qop="auth-int" only
   //   - handle Authentication-Info (not necessarily?)
@@ -73,11 +71,28 @@ Auth.prototype.digest = function (method, path, authHeader) {
     challenge[match[1]] = match[2] || match[3]
   }
 
-  var ha1 = md5(self.user + ':' + challenge.realm + ':' + self.pass)
-  var ha2 = md5(method + ':' + path)
+  /**
+   * RFC 2617: handle both MD5 and MD5-sess algorithms.
+   *
+   * If the algorithm directive's value is "MD5" or unspecified, then HA1 is
+   *   HA1=MD5(username:realm:password)
+   * If the algorithm directive's value is "MD5-sess", then HA1 is
+   *   HA1=MD5(MD5(username:realm:password):nonce:cnonce)
+   */
+  var ha1Compute = function (algorithm, user, realm, pass, nonce, cnonce) {
+    var ha1 = md5(user + ':' + realm + ':' + pass)
+    if (algorithm && algorithm.toLowerCase() === 'md5-sess') {
+      return md5(ha1 + ':' + nonce + ':' + cnonce)
+    } else {
+      return ha1
+    }
+  }
+
   var qop = /(^|,)\s*auth\s*($|,)/.test(challenge.qop) && 'auth'
   var nc = qop && '00000001'
   var cnonce = qop && uuid().replace(/-/g, '')
+  var ha1 = ha1Compute(challenge.algorithm, self.user, challenge.realm, self.pass, challenge.nonce, cnonce)
+  var ha2 = md5(method + ':' + path)
   var digestResponse = qop
     ? md5(ha1 + ':' + challenge.nonce + ':' + nc + ':' + cnonce + ':' + qop + ':' + ha2)
     : md5(ha1 + ':' + challenge.nonce + ':' + ha2)
diff --git a/deps/npm/node_modules/request/lib/cookies.js b/deps/npm/node_modules/request/lib/cookies.js
index adde7c6012bded..412c07d63becb9 100644
--- a/deps/npm/node_modules/request/lib/cookies.js
+++ b/deps/npm/node_modules/request/lib/cookies.js
@@ -13,13 +13,13 @@ exports.parse = function(str) {
   if (typeof str !== 'string') {
     throw new Error('The cookie function only accepts STRING as param')
   }
-  return Cookie.parse(str)
+  return Cookie.parse(str, {loose: true})
 }
 
 // Adapt the sometimes-Async api of tough.CookieJar to our requirements
 function RequestJar(store) {
   var self = this
-  self._jar = new CookieJar(store)
+  self._jar = new CookieJar(store, {looseMode: true})
 }
 RequestJar.prototype.setCookie = function(cookieOrStr, uri, options) {
   var self = this
diff --git a/deps/npm/node_modules/aws-sign2/LICENSE b/deps/npm/node_modules/request/node_modules/aws-sign2/LICENSE
similarity index 100%
rename from deps/npm/node_modules/aws-sign2/LICENSE
rename to deps/npm/node_modules/request/node_modules/aws-sign2/LICENSE
diff --git a/deps/npm/node_modules/aws-sign2/README.md b/deps/npm/node_modules/request/node_modules/aws-sign2/README.md
similarity index 100%
rename from deps/npm/node_modules/aws-sign2/README.md
rename to deps/npm/node_modules/request/node_modules/aws-sign2/README.md
diff --git a/deps/npm/node_modules/aws-sign2/index.js b/deps/npm/node_modules/request/node_modules/aws-sign2/index.js
similarity index 86%
rename from deps/npm/node_modules/aws-sign2/index.js
rename to deps/npm/node_modules/request/node_modules/aws-sign2/index.js
index d954c3bd079005..54766a13518173 100644
--- a/deps/npm/node_modules/aws-sign2/index.js
+++ b/deps/npm/node_modules/request/node_modules/aws-sign2/index.js
@@ -1,8 +1,18 @@
 
 /*!
- * knox - auth
- * Copyright(c) 2010 LearnBoost <dev@learnboost.com>
- * MIT Licensed
+ *  Copyright 2010 LearnBoost <dev@learnboost.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /**
diff --git a/deps/npm/node_modules/request/node_modules/aws-sign2/package.json b/deps/npm/node_modules/request/node_modules/aws-sign2/package.json
new file mode 100644
index 00000000000000..0fe40d0b6e88b3
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/aws-sign2/package.json
@@ -0,0 +1,49 @@
+{
+  "author": {
+    "name": "Mikeal Rogers",
+    "email": "mikeal.rogers@gmail.com",
+    "url": "http://www.futurealoof.com"
+  },
+  "name": "aws-sign2",
+  "description": "AWS signing. Originally pulled from LearnBoost/knox, maintained as vendor in request, now a standalone module.",
+  "version": "0.6.0",
+  "repository": {
+    "url": "git+https://github.com/mikeal/aws-sign.git"
+  },
+  "license": "Apache-2.0",
+  "main": "index.js",
+  "dependencies": {},
+  "devDependencies": {},
+  "optionalDependencies": {},
+  "engines": {
+    "node": "*"
+  },
+  "gitHead": "8554bdb41268fa295eb1ee300f4adaa9f7f07fec",
+  "bugs": {
+    "url": "https://github.com/mikeal/aws-sign/issues"
+  },
+  "homepage": "https://github.com/mikeal/aws-sign#readme",
+  "_id": "aws-sign2@0.6.0",
+  "scripts": {},
+  "_shasum": "14342dd38dbcc94d0e5b87d763cd63612c0e794f",
+  "_from": "aws-sign2@>=0.6.0 <0.7.0",
+  "_npmVersion": "2.14.4",
+  "_nodeVersion": "4.1.2",
+  "_npmUser": {
+    "name": "mikeal",
+    "email": "mikeal.rogers@gmail.com"
+  },
+  "maintainers": [
+    {
+      "name": "mikeal",
+      "email": "mikeal.rogers@gmail.com"
+    }
+  ],
+  "dist": {
+    "shasum": "14342dd38dbcc94d0e5b87d763cd63612c0e794f",
+    "tarball": "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
+  },
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+  "readme": "ERROR: No README data found!"
+}
diff --git a/deps/npm/node_modules/bl/.npmignore b/deps/npm/node_modules/request/node_modules/bl/.npmignore
similarity index 100%
rename from deps/npm/node_modules/bl/.npmignore
rename to deps/npm/node_modules/request/node_modules/bl/.npmignore
diff --git a/deps/npm/node_modules/bl/.travis.yml b/deps/npm/node_modules/request/node_modules/bl/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/bl/.travis.yml
rename to deps/npm/node_modules/request/node_modules/bl/.travis.yml
diff --git a/deps/npm/node_modules/bl/LICENSE.md b/deps/npm/node_modules/request/node_modules/bl/LICENSE.md
similarity index 100%
rename from deps/npm/node_modules/bl/LICENSE.md
rename to deps/npm/node_modules/request/node_modules/bl/LICENSE.md
diff --git a/deps/npm/node_modules/bl/README.md b/deps/npm/node_modules/request/node_modules/bl/README.md
similarity index 100%
rename from deps/npm/node_modules/bl/README.md
rename to deps/npm/node_modules/request/node_modules/bl/README.md
diff --git a/deps/npm/node_modules/bl/bl.js b/deps/npm/node_modules/request/node_modules/bl/bl.js
similarity index 100%
rename from deps/npm/node_modules/bl/bl.js
rename to deps/npm/node_modules/request/node_modules/bl/bl.js
diff --git a/deps/npm/node_modules/readable-stream/.npmignore b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/.npmignore
similarity index 100%
rename from deps/npm/node_modules/readable-stream/.npmignore
rename to deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/.npmignore
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/.travis.yml b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/concat-stream/node_modules/readable-stream/.travis.yml
rename to deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/.travis.yml
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/.zuul.yml b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/.zuul.yml
similarity index 100%
rename from deps/npm/node_modules/concat-stream/node_modules/readable-stream/.zuul.yml
rename to deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/.zuul.yml
diff --git a/deps/npm/node_modules/readable-stream/LICENSE b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/LICENSE
similarity index 100%
rename from deps/npm/node_modules/readable-stream/LICENSE
rename to deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/LICENSE
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/README.md b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/README.md
similarity index 100%
rename from deps/npm/node_modules/concat-stream/node_modules/readable-stream/README.md
rename to deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/README.md
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/doc/stream.markdown b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/doc/stream.markdown
similarity index 100%
rename from deps/npm/node_modules/concat-stream/node_modules/readable-stream/doc/stream.markdown
rename to deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/doc/stream.markdown
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md
similarity index 100%
rename from deps/npm/node_modules/concat-stream/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md
rename to deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md
diff --git a/deps/npm/node_modules/readable-stream/duplex.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/duplex.js
similarity index 100%
rename from deps/npm/node_modules/readable-stream/duplex.js
rename to deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/duplex.js
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_duplex.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_duplex.js
similarity index 100%
rename from deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_duplex.js
rename to deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_duplex.js
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_passthrough.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_passthrough.js
similarity index 100%
rename from deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_passthrough.js
rename to deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_passthrough.js
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_readable.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_readable.js
similarity index 100%
rename from deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_readable.js
rename to deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_readable.js
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_transform.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_transform.js
similarity index 100%
rename from deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_transform.js
rename to deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_transform.js
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_writable.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_writable.js
similarity index 100%
rename from deps/npm/node_modules/concat-stream/node_modules/readable-stream/lib/_stream_writable.js
rename to deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_writable.js
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/README.md b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/README.md
new file mode 100644
index 00000000000000..5a76b4149c5eb5
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/README.md
@@ -0,0 +1,3 @@
+# core-util-is
+
+The `util.is*` functions introduced in Node v0.12.
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/float.patch b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/float.patch
new file mode 100644
index 00000000000000..a06d5c05f75fd5
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/float.patch
@@ -0,0 +1,604 @@
+diff --git a/lib/util.js b/lib/util.js
+index a03e874..9074e8e 100644
+--- a/lib/util.js
++++ b/lib/util.js
+@@ -19,430 +19,6 @@
+ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ // USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-var formatRegExp = /%[sdj%]/g;
+-exports.format = function(f) {
+-  if (!isString(f)) {
+-    var objects = [];
+-    for (var i = 0; i < arguments.length; i++) {
+-      objects.push(inspect(arguments[i]));
+-    }
+-    return objects.join(' ');
+-  }
+-
+-  var i = 1;
+-  var args = arguments;
+-  var len = args.length;
+-  var str = String(f).replace(formatRegExp, function(x) {
+-    if (x === '%%') return '%';
+-    if (i >= len) return x;
+-    switch (x) {
+-      case '%s': return String(args[i++]);
+-      case '%d': return Number(args[i++]);
+-      case '%j':
+-        try {
+-          return JSON.stringify(args[i++]);
+-        } catch (_) {
+-          return '[Circular]';
+-        }
+-      default:
+-        return x;
+-    }
+-  });
+-  for (var x = args[i]; i < len; x = args[++i]) {
+-    if (isNull(x) || !isObject(x)) {
+-      str += ' ' + x;
+-    } else {
+-      str += ' ' + inspect(x);
+-    }
+-  }
+-  return str;
+-};
+-
+-
+-// Mark that a method should not be used.
+-// Returns a modified function which warns once by default.
+-// If --no-deprecation is set, then it is a no-op.
+-exports.deprecate = function(fn, msg) {
+-  // Allow for deprecating things in the process of starting up.
+-  if (isUndefined(global.process)) {
+-    return function() {
+-      return exports.deprecate(fn, msg).apply(this, arguments);
+-    };
+-  }
+-
+-  if (process.noDeprecation === true) {
+-    return fn;
+-  }
+-
+-  var warned = false;
+-  function deprecated() {
+-    if (!warned) {
+-      if (process.throwDeprecation) {
+-        throw new Error(msg);
+-      } else if (process.traceDeprecation) {
+-        console.trace(msg);
+-      } else {
+-        console.error(msg);
+-      }
+-      warned = true;
+-    }
+-    return fn.apply(this, arguments);
+-  }
+-
+-  return deprecated;
+-};
+-
+-
+-var debugs = {};
+-var debugEnviron;
+-exports.debuglog = function(set) {
+-  if (isUndefined(debugEnviron))
+-    debugEnviron = process.env.NODE_DEBUG || '';
+-  set = set.toUpperCase();
+-  if (!debugs[set]) {
+-    if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
+-      var pid = process.pid;
+-      debugs[set] = function() {
+-        var msg = exports.format.apply(exports, arguments);
+-        console.error('%s %d: %s', set, pid, msg);
+-      };
+-    } else {
+-      debugs[set] = function() {};
+-    }
+-  }
+-  return debugs[set];
+-};
+-
+-
+-/**
+- * Echos the value of a value. Trys to print the value out
+- * in the best way possible given the different types.
+- *
+- * @param {Object} obj The object to print out.
+- * @param {Object} opts Optional options object that alters the output.
+- */
+-/* legacy: obj, showHidden, depth, colors*/
+-function inspect(obj, opts) {
+-  // default options
+-  var ctx = {
+-    seen: [],
+-    stylize: stylizeNoColor
+-  };
+-  // legacy...
+-  if (arguments.length >= 3) ctx.depth = arguments[2];
+-  if (arguments.length >= 4) ctx.colors = arguments[3];
+-  if (isBoolean(opts)) {
+-    // legacy...
+-    ctx.showHidden = opts;
+-  } else if (opts) {
+-    // got an "options" object
+-    exports._extend(ctx, opts);
+-  }
+-  // set default options
+-  if (isUndefined(ctx.showHidden)) ctx.showHidden = false;
+-  if (isUndefined(ctx.depth)) ctx.depth = 2;
+-  if (isUndefined(ctx.colors)) ctx.colors = false;
+-  if (isUndefined(ctx.customInspect)) ctx.customInspect = true;
+-  if (ctx.colors) ctx.stylize = stylizeWithColor;
+-  return formatValue(ctx, obj, ctx.depth);
+-}
+-exports.inspect = inspect;
+-
+-
+-// http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
+-inspect.colors = {
+-  'bold' : [1, 22],
+-  'italic' : [3, 23],
+-  'underline' : [4, 24],
+-  'inverse' : [7, 27],
+-  'white' : [37, 39],
+-  'grey' : [90, 39],
+-  'black' : [30, 39],
+-  'blue' : [34, 39],
+-  'cyan' : [36, 39],
+-  'green' : [32, 39],
+-  'magenta' : [35, 39],
+-  'red' : [31, 39],
+-  'yellow' : [33, 39]
+-};
+-
+-// Don't use 'blue' not visible on cmd.exe
+-inspect.styles = {
+-  'special': 'cyan',
+-  'number': 'yellow',
+-  'boolean': 'yellow',
+-  'undefined': 'grey',
+-  'null': 'bold',
+-  'string': 'green',
+-  'date': 'magenta',
+-  // "name": intentionally not styling
+-  'regexp': 'red'
+-};
+-
+-
+-function stylizeWithColor(str, styleType) {
+-  var style = inspect.styles[styleType];
+-
+-  if (style) {
+-    return '\u001b[' + inspect.colors[style][0] + 'm' + str +
+-           '\u001b[' + inspect.colors[style][1] + 'm';
+-  } else {
+-    return str;
+-  }
+-}
+-
+-
+-function stylizeNoColor(str, styleType) {
+-  return str;
+-}
+-
+-
+-function arrayToHash(array) {
+-  var hash = {};
+-
+-  array.forEach(function(val, idx) {
+-    hash[val] = true;
+-  });
+-
+-  return hash;
+-}
+-
+-
+-function formatValue(ctx, value, recurseTimes) {
+-  // Provide a hook for user-specified inspect functions.
+-  // Check that value is an object with an inspect function on it
+-  if (ctx.customInspect &&
+-      value &&
+-      isFunction(value.inspect) &&
+-      // Filter out the util module, it's inspect function is special
+-      value.inspect !== exports.inspect &&
+-      // Also filter out any prototype objects using the circular check.
+-      !(value.constructor && value.constructor.prototype === value)) {
+-    var ret = value.inspect(recurseTimes, ctx);
+-    if (!isString(ret)) {
+-      ret = formatValue(ctx, ret, recurseTimes);
+-    }
+-    return ret;
+-  }
+-
+-  // Primitive types cannot have properties
+-  var primitive = formatPrimitive(ctx, value);
+-  if (primitive) {
+-    return primitive;
+-  }
+-
+-  // Look up the keys of the object.
+-  var keys = Object.keys(value);
+-  var visibleKeys = arrayToHash(keys);
+-
+-  if (ctx.showHidden) {
+-    keys = Object.getOwnPropertyNames(value);
+-  }
+-
+-  // Some type of object without properties can be shortcutted.
+-  if (keys.length === 0) {
+-    if (isFunction(value)) {
+-      var name = value.name ? ': ' + value.name : '';
+-      return ctx.stylize('[Function' + name + ']', 'special');
+-    }
+-    if (isRegExp(value)) {
+-      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+-    }
+-    if (isDate(value)) {
+-      return ctx.stylize(Date.prototype.toString.call(value), 'date');
+-    }
+-    if (isError(value)) {
+-      return formatError(value);
+-    }
+-  }
+-
+-  var base = '', array = false, braces = ['{', '}'];
+-
+-  // Make Array say that they are Array
+-  if (isArray(value)) {
+-    array = true;
+-    braces = ['[', ']'];
+-  }
+-
+-  // Make functions say that they are functions
+-  if (isFunction(value)) {
+-    var n = value.name ? ': ' + value.name : '';
+-    base = ' [Function' + n + ']';
+-  }
+-
+-  // Make RegExps say that they are RegExps
+-  if (isRegExp(value)) {
+-    base = ' ' + RegExp.prototype.toString.call(value);
+-  }
+-
+-  // Make dates with properties first say the date
+-  if (isDate(value)) {
+-    base = ' ' + Date.prototype.toUTCString.call(value);
+-  }
+-
+-  // Make error with message first say the error
+-  if (isError(value)) {
+-    base = ' ' + formatError(value);
+-  }
+-
+-  if (keys.length === 0 && (!array || value.length == 0)) {
+-    return braces[0] + base + braces[1];
+-  }
+-
+-  if (recurseTimes < 0) {
+-    if (isRegExp(value)) {
+-      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+-    } else {
+-      return ctx.stylize('[Object]', 'special');
+-    }
+-  }
+-
+-  ctx.seen.push(value);
+-
+-  var output;
+-  if (array) {
+-    output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
+-  } else {
+-    output = keys.map(function(key) {
+-      return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
+-    });
+-  }
+-
+-  ctx.seen.pop();
+-
+-  return reduceToSingleString(output, base, braces);
+-}
+-
+-
+-function formatPrimitive(ctx, value) {
+-  if (isUndefined(value))
+-    return ctx.stylize('undefined', 'undefined');
+-  if (isString(value)) {
+-    var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
+-                                             .replace(/'/g, "\\'")
+-                                             .replace(/\\"/g, '"') + '\'';
+-    return ctx.stylize(simple, 'string');
+-  }
+-  if (isNumber(value)) {
+-    // Format -0 as '-0'. Strict equality won't distinguish 0 from -0,
+-    // so instead we use the fact that 1 / -0 < 0 whereas 1 / 0 > 0 .
+-    if (value === 0 && 1 / value < 0)
+-      return ctx.stylize('-0', 'number');
+-    return ctx.stylize('' + value, 'number');
+-  }
+-  if (isBoolean(value))
+-    return ctx.stylize('' + value, 'boolean');
+-  // For some reason typeof null is "object", so special case here.
+-  if (isNull(value))
+-    return ctx.stylize('null', 'null');
+-}
+-
+-
+-function formatError(value) {
+-  return '[' + Error.prototype.toString.call(value) + ']';
+-}
+-
+-
+-function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
+-  var output = [];
+-  for (var i = 0, l = value.length; i < l; ++i) {
+-    if (hasOwnProperty(value, String(i))) {
+-      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+-          String(i), true));
+-    } else {
+-      output.push('');
+-    }
+-  }
+-  keys.forEach(function(key) {
+-    if (!key.match(/^\d+$/)) {
+-      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+-          key, true));
+-    }
+-  });
+-  return output;
+-}
+-
+-
+-function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
+-  var name, str, desc;
+-  desc = Object.getOwnPropertyDescriptor(value, key) || { value: value[key] };
+-  if (desc.get) {
+-    if (desc.set) {
+-      str = ctx.stylize('[Getter/Setter]', 'special');
+-    } else {
+-      str = ctx.stylize('[Getter]', 'special');
+-    }
+-  } else {
+-    if (desc.set) {
+-      str = ctx.stylize('[Setter]', 'special');
+-    }
+-  }
+-  if (!hasOwnProperty(visibleKeys, key)) {
+-    name = '[' + key + ']';
+-  }
+-  if (!str) {
+-    if (ctx.seen.indexOf(desc.value) < 0) {
+-      if (isNull(recurseTimes)) {
+-        str = formatValue(ctx, desc.value, null);
+-      } else {
+-        str = formatValue(ctx, desc.value, recurseTimes - 1);
+-      }
+-      if (str.indexOf('\n') > -1) {
+-        if (array) {
+-          str = str.split('\n').map(function(line) {
+-            return '  ' + line;
+-          }).join('\n').substr(2);
+-        } else {
+-          str = '\n' + str.split('\n').map(function(line) {
+-            return '   ' + line;
+-          }).join('\n');
+-        }
+-      }
+-    } else {
+-      str = ctx.stylize('[Circular]', 'special');
+-    }
+-  }
+-  if (isUndefined(name)) {
+-    if (array && key.match(/^\d+$/)) {
+-      return str;
+-    }
+-    name = JSON.stringify('' + key);
+-    if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
+-      name = name.substr(1, name.length - 2);
+-      name = ctx.stylize(name, 'name');
+-    } else {
+-      name = name.replace(/'/g, "\\'")
+-                 .replace(/\\"/g, '"')
+-                 .replace(/(^"|"$)/g, "'");
+-      name = ctx.stylize(name, 'string');
+-    }
+-  }
+-
+-  return name + ': ' + str;
+-}
+-
+-
+-function reduceToSingleString(output, base, braces) {
+-  var numLinesEst = 0;
+-  var length = output.reduce(function(prev, cur) {
+-    numLinesEst++;
+-    if (cur.indexOf('\n') >= 0) numLinesEst++;
+-    return prev + cur.replace(/\u001b\[\d\d?m/g, '').length + 1;
+-  }, 0);
+-
+-  if (length > 60) {
+-    return braces[0] +
+-           (base === '' ? '' : base + '\n ') +
+-           ' ' +
+-           output.join(',\n  ') +
+-           ' ' +
+-           braces[1];
+-  }
+-
+-  return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
+-}
+-
+-
+ // NOTE: These type checking functions intentionally don't use `instanceof`
+ // because it is fragile and can be easily faked with `Object.create()`.
+ function isArray(ar) {
+@@ -522,166 +98,10 @@ function isPrimitive(arg) {
+ exports.isPrimitive = isPrimitive;
+
+ function isBuffer(arg) {
+-  return arg instanceof Buffer;
++  return Buffer.isBuffer(arg);
+ }
+ exports.isBuffer = isBuffer;
+
+ function objectToString(o) {
+   return Object.prototype.toString.call(o);
+-}
+-
+-
+-function pad(n) {
+-  return n < 10 ? '0' + n.toString(10) : n.toString(10);
+-}
+-
+-
+-var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',
+-              'Oct', 'Nov', 'Dec'];
+-
+-// 26 Feb 16:19:34
+-function timestamp() {
+-  var d = new Date();
+-  var time = [pad(d.getHours()),
+-              pad(d.getMinutes()),
+-              pad(d.getSeconds())].join(':');
+-  return [d.getDate(), months[d.getMonth()], time].join(' ');
+-}
+-
+-
+-// log is just a thin wrapper to console.log that prepends a timestamp
+-exports.log = function() {
+-  console.log('%s - %s', timestamp(), exports.format.apply(exports, arguments));
+-};
+-
+-
+-/**
+- * Inherit the prototype methods from one constructor into another.
+- *
+- * The Function.prototype.inherits from lang.js rewritten as a standalone
+- * function (not on Function.prototype). NOTE: If this file is to be loaded
+- * during bootstrapping this function needs to be rewritten using some native
+- * functions as prototype setup using normal JavaScript does not work as
+- * expected during bootstrapping (see mirror.js in r114903).
+- *
+- * @param {function} ctor Constructor function which needs to inherit the
+- *     prototype.
+- * @param {function} superCtor Constructor function to inherit prototype from.
+- */
+-exports.inherits = function(ctor, superCtor) {
+-  ctor.super_ = superCtor;
+-  ctor.prototype = Object.create(superCtor.prototype, {
+-    constructor: {
+-      value: ctor,
+-      enumerable: false,
+-      writable: true,
+-      configurable: true
+-    }
+-  });
+-};
+-
+-exports._extend = function(origin, add) {
+-  // Don't do anything if add isn't an object
+-  if (!add || !isObject(add)) return origin;
+-
+-  var keys = Object.keys(add);
+-  var i = keys.length;
+-  while (i--) {
+-    origin[keys[i]] = add[keys[i]];
+-  }
+-  return origin;
+-};
+-
+-function hasOwnProperty(obj, prop) {
+-  return Object.prototype.hasOwnProperty.call(obj, prop);
+-}
+-
+-
+-// Deprecated old stuff.
+-
+-exports.p = exports.deprecate(function() {
+-  for (var i = 0, len = arguments.length; i < len; ++i) {
+-    console.error(exports.inspect(arguments[i]));
+-  }
+-}, 'util.p: Use console.error() instead');
+-
+-
+-exports.exec = exports.deprecate(function() {
+-  return require('child_process').exec.apply(this, arguments);
+-}, 'util.exec is now called `child_process.exec`.');
+-
+-
+-exports.print = exports.deprecate(function() {
+-  for (var i = 0, len = arguments.length; i < len; ++i) {
+-    process.stdout.write(String(arguments[i]));
+-  }
+-}, 'util.print: Use console.log instead');
+-
+-
+-exports.puts = exports.deprecate(function() {
+-  for (var i = 0, len = arguments.length; i < len; ++i) {
+-    process.stdout.write(arguments[i] + '\n');
+-  }
+-}, 'util.puts: Use console.log instead');
+-
+-
+-exports.debug = exports.deprecate(function(x) {
+-  process.stderr.write('DEBUG: ' + x + '\n');
+-}, 'util.debug: Use console.error instead');
+-
+-
+-exports.error = exports.deprecate(function(x) {
+-  for (var i = 0, len = arguments.length; i < len; ++i) {
+-    process.stderr.write(arguments[i] + '\n');
+-  }
+-}, 'util.error: Use console.error instead');
+-
+-
+-exports.pump = exports.deprecate(function(readStream, writeStream, callback) {
+-  var callbackCalled = false;
+-
+-  function call(a, b, c) {
+-    if (callback && !callbackCalled) {
+-      callback(a, b, c);
+-      callbackCalled = true;
+-    }
+-  }
+-
+-  readStream.addListener('data', function(chunk) {
+-    if (writeStream.write(chunk) === false) readStream.pause();
+-  });
+-
+-  writeStream.addListener('drain', function() {
+-    readStream.resume();
+-  });
+-
+-  readStream.addListener('end', function() {
+-    writeStream.end();
+-  });
+-
+-  readStream.addListener('close', function() {
+-    call();
+-  });
+-
+-  readStream.addListener('error', function(err) {
+-    writeStream.end();
+-    call(err);
+-  });
+-
+-  writeStream.addListener('error', function(err) {
+-    readStream.destroy();
+-    call(err);
+-  });
+-}, 'util.pump(): Use readableStream.pipe() instead');
+-
+-
+-var uv;
+-exports._errnoException = function(err, syscall) {
+-  if (isUndefined(uv)) uv = process.binding('uv');
+-  var errname = uv.errname(err);
+-  var e = new Error(syscall + ' ' + errname);
+-  e.code = errname;
+-  e.errno = errname;
+-  e.syscall = syscall;
+-  return e;
+-};
++}
\ No newline at end of file
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/lib/util.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
new file mode 100644
index 00000000000000..9074e8ebcb61e9
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
@@ -0,0 +1,107 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// NOTE: These type checking functions intentionally don't use `instanceof`
+// because it is fragile and can be easily faked with `Object.create()`.
+function isArray(ar) {
+  return Array.isArray(ar);
+}
+exports.isArray = isArray;
+
+function isBoolean(arg) {
+  return typeof arg === 'boolean';
+}
+exports.isBoolean = isBoolean;
+
+function isNull(arg) {
+  return arg === null;
+}
+exports.isNull = isNull;
+
+function isNullOrUndefined(arg) {
+  return arg == null;
+}
+exports.isNullOrUndefined = isNullOrUndefined;
+
+function isNumber(arg) {
+  return typeof arg === 'number';
+}
+exports.isNumber = isNumber;
+
+function isString(arg) {
+  return typeof arg === 'string';
+}
+exports.isString = isString;
+
+function isSymbol(arg) {
+  return typeof arg === 'symbol';
+}
+exports.isSymbol = isSymbol;
+
+function isUndefined(arg) {
+  return arg === void 0;
+}
+exports.isUndefined = isUndefined;
+
+function isRegExp(re) {
+  return isObject(re) && objectToString(re) === '[object RegExp]';
+}
+exports.isRegExp = isRegExp;
+
+function isObject(arg) {
+  return typeof arg === 'object' && arg !== null;
+}
+exports.isObject = isObject;
+
+function isDate(d) {
+  return isObject(d) && objectToString(d) === '[object Date]';
+}
+exports.isDate = isDate;
+
+function isError(e) {
+  return isObject(e) &&
+      (objectToString(e) === '[object Error]' || e instanceof Error);
+}
+exports.isError = isError;
+
+function isFunction(arg) {
+  return typeof arg === 'function';
+}
+exports.isFunction = isFunction;
+
+function isPrimitive(arg) {
+  return arg === null ||
+         typeof arg === 'boolean' ||
+         typeof arg === 'number' ||
+         typeof arg === 'string' ||
+         typeof arg === 'symbol' ||  // ES6 symbol
+         typeof arg === 'undefined';
+}
+exports.isPrimitive = isPrimitive;
+
+function isBuffer(arg) {
+  return Buffer.isBuffer(arg);
+}
+exports.isBuffer = isBuffer;
+
+function objectToString(o) {
+  return Object.prototype.toString.call(o);
+}
\ No newline at end of file
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/package.json b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/package.json
new file mode 100644
index 00000000000000..b67333380c265e
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/package.json
@@ -0,0 +1,37 @@
+{
+  "name": "core-util-is",
+  "version": "1.0.1",
+  "description": "The `util.is*` functions introduced in Node v0.12.",
+  "main": "lib/util.js",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/core-util-is.git"
+  },
+  "keywords": [
+    "util",
+    "isBuffer",
+    "isArray",
+    "isNumber",
+    "isString",
+    "isRegExp",
+    "isThis",
+    "isThat",
+    "polyfill"
+  ],
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/isaacs/core-util-is/issues"
+  },
+  "readme": "# core-util-is\n\nThe `util.is*` functions introduced in Node v0.12.\n",
+  "readmeFilename": "README.md",
+  "homepage": "https://github.com/isaacs/core-util-is#readme",
+  "_id": "core-util-is@1.0.1",
+  "_shasum": "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538",
+  "_resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+  "_from": "core-util-is@>=1.0.0 <1.1.0"
+}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/util.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/util.js
new file mode 100644
index 00000000000000..007fa10575636d
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/util.js
@@ -0,0 +1,106 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// NOTE: These type checking functions intentionally don't use `instanceof`
+// because it is fragile and can be easily faked with `Object.create()`.
+function isArray(ar) {
+  return Array.isArray(ar);
+}
+exports.isArray = isArray;
+
+function isBoolean(arg) {
+  return typeof arg === 'boolean';
+}
+exports.isBoolean = isBoolean;
+
+function isNull(arg) {
+  return arg === null;
+}
+exports.isNull = isNull;
+
+function isNullOrUndefined(arg) {
+  return arg == null;
+}
+exports.isNullOrUndefined = isNullOrUndefined;
+
+function isNumber(arg) {
+  return typeof arg === 'number';
+}
+exports.isNumber = isNumber;
+
+function isString(arg) {
+  return typeof arg === 'string';
+}
+exports.isString = isString;
+
+function isSymbol(arg) {
+  return typeof arg === 'symbol';
+}
+exports.isSymbol = isSymbol;
+
+function isUndefined(arg) {
+  return arg === void 0;
+}
+exports.isUndefined = isUndefined;
+
+function isRegExp(re) {
+  return isObject(re) && objectToString(re) === '[object RegExp]';
+}
+exports.isRegExp = isRegExp;
+
+function isObject(arg) {
+  return typeof arg === 'object' && arg !== null;
+}
+exports.isObject = isObject;
+
+function isDate(d) {
+  return isObject(d) && objectToString(d) === '[object Date]';
+}
+exports.isDate = isDate;
+
+function isError(e) {
+  return isObject(e) && objectToString(e) === '[object Error]';
+}
+exports.isError = isError;
+
+function isFunction(arg) {
+  return typeof arg === 'function';
+}
+exports.isFunction = isFunction;
+
+function isPrimitive(arg) {
+  return arg === null ||
+         typeof arg === 'boolean' ||
+         typeof arg === 'number' ||
+         typeof arg === 'string' ||
+         typeof arg === 'symbol' ||  // ES6 symbol
+         typeof arg === 'undefined';
+}
+exports.isPrimitive = isPrimitive;
+
+function isBuffer(arg) {
+  return arg instanceof Buffer;
+}
+exports.isBuffer = isBuffer;
+
+function objectToString(o) {
+  return Object.prototype.toString.call(o);
+}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/README.md b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/README.md
new file mode 100644
index 00000000000000..052a62b8d7b7ae
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/README.md
@@ -0,0 +1,54 @@
+
+# isarray
+
+`Array#isArray` for older browsers.
+
+## Usage
+
+```js
+var isArray = require('isarray');
+
+console.log(isArray([])); // => true
+console.log(isArray({})); // => false
+```
+
+## Installation
+
+With [npm](http://npmjs.org) do
+
+```bash
+$ npm install isarray
+```
+
+Then bundle for the browser with
+[browserify](https://github.com/substack/browserify).
+
+With [component](http://component.io) do
+
+```bash
+$ component install juliangruber/isarray
+```
+
+## License
+
+(MIT)
+
+Copyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/build/build.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/build/build.js
new file mode 100644
index 00000000000000..e1856ef0943728
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/build/build.js
@@ -0,0 +1,208 @@
+
+/**
+ * Require the given path.
+ *
+ * @param {String} path
+ * @return {Object} exports
+ * @api public
+ */
+
+function require(path, parent, orig) {
+  var resolved = require.resolve(path);
+
+  // lookup failed
+  if (null == resolved) {
+    orig = orig || path;
+    parent = parent || 'root';
+    var err = new Error('Failed to require "' + orig + '" from "' + parent + '"');
+    err.path = orig;
+    err.parent = parent;
+    err.require = true;
+    throw err;
+  }
+
+  var module = require.modules[resolved];
+
+  // perform real require()
+  // by invoking the module's
+  // registered function
+  if (!module.exports) {
+    module.exports = {};
+    module.client = module.component = true;
+    module.call(this, module.exports, require.relative(resolved), module);
+  }
+
+  return module.exports;
+}
+
+/**
+ * Registered modules.
+ */
+
+require.modules = {};
+
+/**
+ * Registered aliases.
+ */
+
+require.aliases = {};
+
+/**
+ * Resolve `path`.
+ *
+ * Lookup:
+ *
+ *   - PATH/index.js
+ *   - PATH.js
+ *   - PATH
+ *
+ * @param {String} path
+ * @return {String} path or null
+ * @api private
+ */
+
+require.resolve = function(path) {
+  if (path.charAt(0) === '/') path = path.slice(1);
+  var index = path + '/index.js';
+
+  var paths = [
+    path,
+    path + '.js',
+    path + '.json',
+    path + '/index.js',
+    path + '/index.json'
+  ];
+
+  for (var i = 0; i < paths.length; i++) {
+    var path = paths[i];
+    if (require.modules.hasOwnProperty(path)) return path;
+  }
+
+  if (require.aliases.hasOwnProperty(index)) {
+    return require.aliases[index];
+  }
+};
+
+/**
+ * Normalize `path` relative to the current path.
+ *
+ * @param {String} curr
+ * @param {String} path
+ * @return {String}
+ * @api private
+ */
+
+require.normalize = function(curr, path) {
+  var segs = [];
+
+  if ('.' != path.charAt(0)) return path;
+
+  curr = curr.split('/');
+  path = path.split('/');
+
+  for (var i = 0; i < path.length; ++i) {
+    if ('..' == path[i]) {
+      curr.pop();
+    } else if ('.' != path[i] && '' != path[i]) {
+      segs.push(path[i]);
+    }
+  }
+
+  return curr.concat(segs).join('/');
+};
+
+/**
+ * Register module at `path` with callback `definition`.
+ *
+ * @param {String} path
+ * @param {Function} definition
+ * @api private
+ */
+
+require.register = function(path, definition) {
+  require.modules[path] = definition;
+};
+
+/**
+ * Alias a module definition.
+ *
+ * @param {String} from
+ * @param {String} to
+ * @api private
+ */
+
+require.alias = function(from, to) {
+  if (!require.modules.hasOwnProperty(from)) {
+    throw new Error('Failed to alias "' + from + '", it does not exist');
+  }
+  require.aliases[to] = from;
+};
+
+/**
+ * Return a require function relative to the `parent` path.
+ *
+ * @param {String} parent
+ * @return {Function}
+ * @api private
+ */
+
+require.relative = function(parent) {
+  var p = require.normalize(parent, '..');
+
+  /**
+   * lastIndexOf helper.
+   */
+
+  function lastIndexOf(arr, obj) {
+    var i = arr.length;
+    while (i--) {
+      if (arr[i] === obj) return i;
+    }
+    return -1;
+  }
+
+  /**
+   * The relative require() itself.
+   */
+
+  function localRequire(path) {
+    var resolved = localRequire.resolve(path);
+    return require(resolved, parent, path);
+  }
+
+  /**
+   * Resolve relative to the parent.
+   */
+
+  localRequire.resolve = function(path) {
+    var c = path.charAt(0);
+    if ('/' == c) return path.slice(1);
+    if ('.' == c) return require.normalize(p, path);
+
+    // resolve deps by returning
+    // the dep in the nearest "deps"
+    // directory
+    var segs = parent.split('/');
+    var i = lastIndexOf(segs, 'deps') + 1;
+    if (!i) i = 0;
+    path = segs.slice(0, i + 1).join('/') + '/deps/' + path;
+    return path;
+  };
+
+  /**
+   * Check if module is defined at `path`.
+   */
+
+  localRequire.exists = function(path) {
+    return require.modules.hasOwnProperty(localRequire.resolve(path));
+  };
+
+  return localRequire;
+};
+require.register("isarray/index.js", function(exports, require, module){
+module.exports = Array.isArray || function (arr) {
+  return Object.prototype.toString.call(arr) == '[object Array]';
+};
+
+});
+require.alias("isarray/index.js", "isarray/index.js");
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/component.json b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/component.json
new file mode 100644
index 00000000000000..9e31b683889015
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/component.json
@@ -0,0 +1,19 @@
+{
+  "name" : "isarray",
+  "description" : "Array#isArray for older browsers",
+  "version" : "0.0.1",
+  "repository" : "juliangruber/isarray",
+  "homepage": "https://github.com/juliangruber/isarray",
+  "main" : "index.js",
+  "scripts" : [
+    "index.js"
+  ],
+  "dependencies" : {},
+  "keywords": ["browser","isarray","array"],
+  "author": {
+    "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
+    "url": "http://juliangruber.com"
+  },
+  "license": "MIT"
+}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/index.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/index.js
new file mode 100644
index 00000000000000..5f5ad45d46dda9
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/index.js
@@ -0,0 +1,3 @@
+module.exports = Array.isArray || function (arr) {
+  return Object.prototype.toString.call(arr) == '[object Array]';
+};
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json
new file mode 100644
index 00000000000000..fb1eb3786d8168
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "isarray",
+  "description": "Array#isArray for older browsers",
+  "version": "0.0.1",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/juliangruber/isarray.git"
+  },
+  "homepage": "https://github.com/juliangruber/isarray",
+  "main": "index.js",
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "tap": "*"
+  },
+  "keywords": [
+    "browser",
+    "isarray",
+    "array"
+  ],
+  "author": {
+    "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
+    "url": "http://juliangruber.com"
+  },
+  "license": "MIT",
+  "readme": "\n# isarray\n\n`Array#isArray` for older browsers.\n\n## Usage\n\n```js\nvar isArray = require('isarray');\n\nconsole.log(isArray([])); // => true\nconsole.log(isArray({})); // => false\n```\n\n## Installation\n\nWith [npm](http://npmjs.org) do\n\n```bash\n$ npm install isarray\n```\n\nThen bundle for the browser with\n[browserify](https://github.com/substack/browserify).\n\nWith [component](http://component.io) do\n\n```bash\n$ component install juliangruber/isarray\n```\n\n## License\n\n(MIT)\n\nCopyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the \"Software\"), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\nof the Software, and to permit persons to whom the Software is furnished to do\nso, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/juliangruber/isarray/issues"
+  },
+  "_id": "isarray@0.0.1",
+  "_shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf",
+  "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+  "_from": "isarray@0.0.1"
+}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml
new file mode 100644
index 00000000000000..5ac98855343cee
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml
@@ -0,0 +1,7 @@
+language: node_js
+node_js:
+  - "0.8"
+  - "0.10"
+  - "0.11"
+  - "0.12"
+  - "iojs"
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/index.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/index.js
new file mode 100644
index 00000000000000..049521cad7ba1b
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/index.js
@@ -0,0 +1,13 @@
+'use strict';
+module.exports = nextTick;
+
+function nextTick(fn) {
+  var args = new Array(arguments.length - 1);
+  var i = 0;
+  while (i < args.length) {
+    args[i++] = arguments[i];
+  }
+  process.nextTick(function afterTick() {
+    fn.apply(null, args);
+  });
+}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/license.md b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/license.md
new file mode 100644
index 00000000000000..c67e3532b54245
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/license.md
@@ -0,0 +1,19 @@
+# Copyright (c) 2015 Calvin Metcalf
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+**THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.**
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/package.json b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/package.json
new file mode 100644
index 00000000000000..bfaa2785f0b685
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "process-nextick-args",
+  "version": "1.0.3",
+  "description": "process.nextTick but always with args",
+  "main": "index.js",
+  "scripts": {
+    "test": "node test.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/calvinmetcalf/process-nextick-args.git"
+  },
+  "author": "",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/calvinmetcalf/process-nextick-args/issues"
+  },
+  "homepage": "https://github.com/calvinmetcalf/process-nextick-args",
+  "devDependencies": {
+    "tap": "~0.2.6"
+  },
+  "readme": "process-nextick-args\n=====\n\n[![Build Status](https://travis-ci.org/calvinmetcalf/process-nextick-args.svg?branch=master)](https://travis-ci.org/calvinmetcalf/process-nextick-args)\n\n```bash\nnpm install --save process-nextick-args\n```\n\nAlways be able to pass arguments to process.nextTick, no matter the platform\n\n```js\nvar nextTick = require('process-nextick-args');\n\nnextTick(function (a, b, c) {\n  console.log(a, b, c);\n}, 'step', 3,  'profit');\n```\n",
+  "readmeFilename": "readme.md",
+  "_id": "process-nextick-args@1.0.3",
+  "_shasum": "e272eed825d5e9f4ea74d8d73b1fe311c3beb630",
+  "_resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz",
+  "_from": "process-nextick-args@>=1.0.0 <1.1.0"
+}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/readme.md b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/readme.md
new file mode 100644
index 00000000000000..78e7cfaeb7acde
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/readme.md
@@ -0,0 +1,18 @@
+process-nextick-args
+=====
+
+[![Build Status](https://travis-ci.org/calvinmetcalf/process-nextick-args.svg?branch=master)](https://travis-ci.org/calvinmetcalf/process-nextick-args)
+
+```bash
+npm install --save process-nextick-args
+```
+
+Always be able to pass arguments to process.nextTick, no matter the platform
+
+```js
+var nextTick = require('process-nextick-args');
+
+nextTick(function (a, b, c) {
+  console.log(a, b, c);
+}, 'step', 3,  'profit');
+```
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/test.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/test.js
new file mode 100644
index 00000000000000..ef15721584ac99
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/test.js
@@ -0,0 +1,24 @@
+var test = require("tap").test;
+var nextTick = require('./');
+
+test('should work', function (t) {
+  t.plan(5);
+  nextTick(function (a) {
+    t.ok(a);
+    nextTick(function (thing) {
+      t.equals(thing, 7);
+    }, 7);
+  }, true);
+  nextTick(function (a, b, c) {
+    t.equals(a, 'step');
+    t.equals(b, 3);
+    t.equals(c, 'profit');
+  }, 'step', 3,  'profit');
+});
+
+test('correct number of arguments', function (t) {
+  t.plan(1);
+  nextTick(function () {
+    t.equals(2, arguments.length, 'correct number');
+  }, 1, 2);
+});
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/.npmignore b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/.npmignore
new file mode 100644
index 00000000000000..206320cc1d21b9
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/.npmignore
@@ -0,0 +1,2 @@
+build
+test
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/LICENSE b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/LICENSE
new file mode 100644
index 00000000000000..6de584a48f5c89
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/LICENSE
@@ -0,0 +1,20 @@
+Copyright Joyent, Inc. and other Node contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/README.md b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/README.md
new file mode 100644
index 00000000000000..4d2aa001501107
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/README.md
@@ -0,0 +1,7 @@
+**string_decoder.js** (`require('string_decoder')`) from Node.js core
+
+Copyright Joyent, Inc. and other Node contributors. See LICENCE file for details.
+
+Version numbers match the versions found in Node core, e.g. 0.10.24 matches Node 0.10.24, likewise 0.11.10 matches Node 0.11.10. **Prefer the stable version over the unstable.**
+
+The *build/* directory contains a build script that will scrape the source from the [joyent/node](https://github.com/joyent/node) repo given a specific Node version.
\ No newline at end of file
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/index.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/index.js
new file mode 100644
index 00000000000000..b00e54fb790982
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/index.js
@@ -0,0 +1,221 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var Buffer = require('buffer').Buffer;
+
+var isBufferEncoding = Buffer.isEncoding
+  || function(encoding) {
+       switch (encoding && encoding.toLowerCase()) {
+         case 'hex': case 'utf8': case 'utf-8': case 'ascii': case 'binary': case 'base64': case 'ucs2': case 'ucs-2': case 'utf16le': case 'utf-16le': case 'raw': return true;
+         default: return false;
+       }
+     }
+
+
+function assertEncoding(encoding) {
+  if (encoding && !isBufferEncoding(encoding)) {
+    throw new Error('Unknown encoding: ' + encoding);
+  }
+}
+
+// StringDecoder provides an interface for efficiently splitting a series of
+// buffers into a series of JS strings without breaking apart multi-byte
+// characters. CESU-8 is handled as part of the UTF-8 encoding.
+//
+// @TODO Handling all encodings inside a single object makes it very difficult
+// to reason about this code, so it should be split up in the future.
+// @TODO There should be a utf8-strict encoding that rejects invalid UTF-8 code
+// points as used by CESU-8.
+var StringDecoder = exports.StringDecoder = function(encoding) {
+  this.encoding = (encoding || 'utf8').toLowerCase().replace(/[-_]/, '');
+  assertEncoding(encoding);
+  switch (this.encoding) {
+    case 'utf8':
+      // CESU-8 represents each of Surrogate Pair by 3-bytes
+      this.surrogateSize = 3;
+      break;
+    case 'ucs2':
+    case 'utf16le':
+      // UTF-16 represents each of Surrogate Pair by 2-bytes
+      this.surrogateSize = 2;
+      this.detectIncompleteChar = utf16DetectIncompleteChar;
+      break;
+    case 'base64':
+      // Base-64 stores 3 bytes in 4 chars, and pads the remainder.
+      this.surrogateSize = 3;
+      this.detectIncompleteChar = base64DetectIncompleteChar;
+      break;
+    default:
+      this.write = passThroughWrite;
+      return;
+  }
+
+  // Enough space to store all bytes of a single character. UTF-8 needs 4
+  // bytes, but CESU-8 may require up to 6 (3 bytes per surrogate).
+  this.charBuffer = new Buffer(6);
+  // Number of bytes received for the current incomplete multi-byte character.
+  this.charReceived = 0;
+  // Number of bytes expected for the current incomplete multi-byte character.
+  this.charLength = 0;
+};
+
+
+// write decodes the given buffer and returns it as JS string that is
+// guaranteed to not contain any partial multi-byte characters. Any partial
+// character found at the end of the buffer is buffered up, and will be
+// returned when calling write again with the remaining bytes.
+//
+// Note: Converting a Buffer containing an orphan surrogate to a String
+// currently works, but converting a String to a Buffer (via `new Buffer`, or
+// Buffer#write) will replace incomplete surrogates with the unicode
+// replacement character. See https://codereview.chromium.org/121173009/ .
+StringDecoder.prototype.write = function(buffer) {
+  var charStr = '';
+  // if our last write ended with an incomplete multibyte character
+  while (this.charLength) {
+    // determine how many remaining bytes this buffer has to offer for this char
+    var available = (buffer.length >= this.charLength - this.charReceived) ?
+        this.charLength - this.charReceived :
+        buffer.length;
+
+    // add the new bytes to the char buffer
+    buffer.copy(this.charBuffer, this.charReceived, 0, available);
+    this.charReceived += available;
+
+    if (this.charReceived < this.charLength) {
+      // still not enough chars in this buffer? wait for more ...
+      return '';
+    }
+
+    // remove bytes belonging to the current character from the buffer
+    buffer = buffer.slice(available, buffer.length);
+
+    // get the character that was split
+    charStr = this.charBuffer.slice(0, this.charLength).toString(this.encoding);
+
+    // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character
+    var charCode = charStr.charCodeAt(charStr.length - 1);
+    if (charCode >= 0xD800 && charCode <= 0xDBFF) {
+      this.charLength += this.surrogateSize;
+      charStr = '';
+      continue;
+    }
+    this.charReceived = this.charLength = 0;
+
+    // if there are no more bytes in this buffer, just emit our char
+    if (buffer.length === 0) {
+      return charStr;
+    }
+    break;
+  }
+
+  // determine and set charLength / charReceived
+  this.detectIncompleteChar(buffer);
+
+  var end = buffer.length;
+  if (this.charLength) {
+    // buffer the incomplete character bytes we got
+    buffer.copy(this.charBuffer, 0, buffer.length - this.charReceived, end);
+    end -= this.charReceived;
+  }
+
+  charStr += buffer.toString(this.encoding, 0, end);
+
+  var end = charStr.length - 1;
+  var charCode = charStr.charCodeAt(end);
+  // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character
+  if (charCode >= 0xD800 && charCode <= 0xDBFF) {
+    var size = this.surrogateSize;
+    this.charLength += size;
+    this.charReceived += size;
+    this.charBuffer.copy(this.charBuffer, size, 0, size);
+    buffer.copy(this.charBuffer, 0, 0, size);
+    return charStr.substring(0, end);
+  }
+
+  // or just emit the charStr
+  return charStr;
+};
+
+// detectIncompleteChar determines if there is an incomplete UTF-8 character at
+// the end of the given buffer. If so, it sets this.charLength to the byte
+// length that character, and sets this.charReceived to the number of bytes
+// that are available for this character.
+StringDecoder.prototype.detectIncompleteChar = function(buffer) {
+  // determine how many bytes we have to check at the end of this buffer
+  var i = (buffer.length >= 3) ? 3 : buffer.length;
+
+  // Figure out if one of the last i bytes of our buffer announces an
+  // incomplete char.
+  for (; i > 0; i--) {
+    var c = buffer[buffer.length - i];
+
+    // See http://en.wikipedia.org/wiki/UTF-8#Description
+
+    // 110XXXXX
+    if (i == 1 && c >> 5 == 0x06) {
+      this.charLength = 2;
+      break;
+    }
+
+    // 1110XXXX
+    if (i <= 2 && c >> 4 == 0x0E) {
+      this.charLength = 3;
+      break;
+    }
+
+    // 11110XXX
+    if (i <= 3 && c >> 3 == 0x1E) {
+      this.charLength = 4;
+      break;
+    }
+  }
+  this.charReceived = i;
+};
+
+StringDecoder.prototype.end = function(buffer) {
+  var res = '';
+  if (buffer && buffer.length)
+    res = this.write(buffer);
+
+  if (this.charReceived) {
+    var cr = this.charReceived;
+    var buf = this.charBuffer;
+    var enc = this.encoding;
+    res += buf.slice(0, cr).toString(enc);
+  }
+
+  return res;
+};
+
+function passThroughWrite(buffer) {
+  return buffer.toString(this.encoding);
+}
+
+function utf16DetectIncompleteChar(buffer) {
+  this.charReceived = buffer.length % 2;
+  this.charLength = this.charReceived ? 2 : 0;
+}
+
+function base64DetectIncompleteChar(buffer) {
+  this.charReceived = buffer.length % 3;
+  this.charLength = this.charReceived ? 3 : 0;
+}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/package.json b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/package.json
new file mode 100644
index 00000000000000..ee70702359198d
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/package.json
@@ -0,0 +1,34 @@
+{
+  "name": "string_decoder",
+  "version": "0.10.31",
+  "description": "The string_decoder module from Node core",
+  "main": "index.js",
+  "dependencies": {},
+  "devDependencies": {
+    "tap": "~0.4.8"
+  },
+  "scripts": {
+    "test": "tap test/simple/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/rvagg/string_decoder.git"
+  },
+  "homepage": "https://github.com/rvagg/string_decoder",
+  "keywords": [
+    "string",
+    "decoder",
+    "browser",
+    "browserify"
+  ],
+  "license": "MIT",
+  "readme": "**string_decoder.js** (`require('string_decoder')`) from Node.js core\n\nCopyright Joyent, Inc. and other Node contributors. See LICENCE file for details.\n\nVersion numbers match the versions found in Node core, e.g. 0.10.24 matches Node 0.10.24, likewise 0.11.10 matches Node 0.11.10. **Prefer the stable version over the unstable.**\n\nThe *build/* directory contains a build script that will scrape the source from the [joyent/node](https://github.com/joyent/node) repo given a specific Node version.",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/rvagg/string_decoder/issues"
+  },
+  "_id": "string_decoder@0.10.31",
+  "_shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94",
+  "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+  "_from": "string_decoder@>=0.10.0 <0.11.0"
+}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/History.md b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/History.md
new file mode 100644
index 00000000000000..acc8675372e980
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/History.md
@@ -0,0 +1,16 @@
+
+1.0.2 / 2015-10-07
+==================
+
+  * use try/catch when checking `localStorage` (#3, @kumavis)
+
+1.0.1 / 2014-11-25
+==================
+
+  * browser: use `console.warn()` for deprecation calls
+  * browser: more jsdocs
+
+1.0.0 / 2014-04-30
+==================
+
+  * initial commit
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/LICENSE b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/LICENSE
new file mode 100644
index 00000000000000..6a60e8c225c9ba
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/LICENSE
@@ -0,0 +1,24 @@
+(The MIT License)
+
+Copyright (c) 2014 Nathan Rajlich <nathan@tootallnate.net>
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/README.md b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/README.md
new file mode 100644
index 00000000000000..75622fa7c250a6
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/README.md
@@ -0,0 +1,53 @@
+util-deprecate
+==============
+### The Node.js `util.deprecate()` function with browser support
+
+In Node.js, this module simply re-exports the `util.deprecate()` function.
+
+In the web browser (i.e. via browserify), a browser-specific implementation
+of the `util.deprecate()` function is used.
+
+
+## API
+
+A `deprecate()` function is the only thing exposed by this module.
+
+``` javascript
+// setup:
+exports.foo = deprecate(foo, 'foo() is deprecated, use bar() instead');
+
+
+// users see:
+foo();
+// foo() is deprecated, use bar() instead
+foo();
+foo();
+```
+
+
+## License
+
+(The MIT License)
+
+Copyright (c) 2014 Nathan Rajlich <nathan@tootallnate.net>
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/browser.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/browser.js
new file mode 100644
index 00000000000000..549ae2f065ea5a
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/browser.js
@@ -0,0 +1,67 @@
+
+/**
+ * Module exports.
+ */
+
+module.exports = deprecate;
+
+/**
+ * Mark that a method should not be used.
+ * Returns a modified function which warns once by default.
+ *
+ * If `localStorage.noDeprecation = true` is set, then it is a no-op.
+ *
+ * If `localStorage.throwDeprecation = true` is set, then deprecated functions
+ * will throw an Error when invoked.
+ *
+ * If `localStorage.traceDeprecation = true` is set, then deprecated functions
+ * will invoke `console.trace()` instead of `console.error()`.
+ *
+ * @param {Function} fn - the function to deprecate
+ * @param {String} msg - the string to print to the console when `fn` is invoked
+ * @returns {Function} a new "deprecated" version of `fn`
+ * @api public
+ */
+
+function deprecate (fn, msg) {
+  if (config('noDeprecation')) {
+    return fn;
+  }
+
+  var warned = false;
+  function deprecated() {
+    if (!warned) {
+      if (config('throwDeprecation')) {
+        throw new Error(msg);
+      } else if (config('traceDeprecation')) {
+        console.trace(msg);
+      } else {
+        console.warn(msg);
+      }
+      warned = true;
+    }
+    return fn.apply(this, arguments);
+  }
+
+  return deprecated;
+}
+
+/**
+ * Checks `localStorage` for boolean values for the given `name`.
+ *
+ * @param {String} name
+ * @returns {Boolean}
+ * @api private
+ */
+
+function config (name) {
+  // accessing global.localStorage can trigger a DOMException in sandboxed iframes
+  try {
+    if (!global.localStorage) return false;
+  } catch (_) {
+    return false;
+  }
+  var val = global.localStorage[name];
+  if (null == val) return false;
+  return String(val).toLowerCase() === 'true';
+}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/node.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/node.js
new file mode 100644
index 00000000000000..5e6fcff5ddd3fb
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/node.js
@@ -0,0 +1,6 @@
+
+/**
+ * For Node.js, simply re-export the core `util.deprecate` function.
+ */
+
+module.exports = require('util').deprecate;
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/package.json b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/package.json
new file mode 100644
index 00000000000000..ae0c70f6c633f1
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/package.json
@@ -0,0 +1,54 @@
+{
+  "name": "util-deprecate",
+  "version": "1.0.2",
+  "description": "The Node.js `util.deprecate()` function with browser support",
+  "main": "node.js",
+  "browser": "browser.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/TooTallNate/util-deprecate.git"
+  },
+  "keywords": [
+    "util",
+    "deprecate",
+    "browserify",
+    "browser",
+    "node"
+  ],
+  "author": {
+    "name": "Nathan Rajlich",
+    "email": "nathan@tootallnate.net",
+    "url": "http://n8.io/"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/TooTallNate/util-deprecate/issues"
+  },
+  "homepage": "https://github.com/TooTallNate/util-deprecate",
+  "gitHead": "475fb6857cd23fafff20c1be846c1350abf8e6d4",
+  "_id": "util-deprecate@1.0.2",
+  "_shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf",
+  "_from": "util-deprecate@>=1.0.1 <1.1.0",
+  "_npmVersion": "2.14.4",
+  "_nodeVersion": "4.1.2",
+  "_npmUser": {
+    "name": "tootallnate",
+    "email": "nathan@tootallnate.net"
+  },
+  "maintainers": [
+    {
+      "name": "tootallnate",
+      "email": "nathan@tootallnate.net"
+    }
+  ],
+  "dist": {
+    "shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf",
+    "tarball": "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+  },
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+  "readme": "ERROR: No README data found!"
+}
diff --git a/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/package.json b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/package.json
new file mode 100644
index 00000000000000..0d67d9bbbfbc67
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/package.json
@@ -0,0 +1,46 @@
+{
+  "name": "readable-stream",
+  "version": "2.0.2",
+  "description": "Streams3, a user-land copy of the stream library from iojs v2.x",
+  "main": "readable.js",
+  "dependencies": {
+    "core-util-is": "~1.0.0",
+    "inherits": "~2.0.1",
+    "isarray": "0.0.1",
+    "process-nextick-args": "~1.0.0",
+    "string_decoder": "~0.10.x",
+    "util-deprecate": "~1.0.1"
+  },
+  "devDependencies": {
+    "tap": "~0.2.6",
+    "tape": "~4.0.0",
+    "zuul": "~3.0.0"
+  },
+  "scripts": {
+    "test": "tap test/parallel/*.js",
+    "browser": "zuul --browser-name $BROWSER_NAME --browser-version $BROWSER_VERSION -- test/browser.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/nodejs/readable-stream.git"
+  },
+  "keywords": [
+    "readable",
+    "stream",
+    "pipe"
+  ],
+  "browser": {
+    "util": false
+  },
+  "license": "MIT",
+  "readme": "# readable-stream\n\n***Node-core streams for userland*** [![Build Status](https://travis-ci.org/nodejs/readable-stream.svg?branch=master)](https://travis-ci.org/nodejs/readable-stream)\n\n\n[![NPM](https://nodei.co/npm/readable-stream.png?downloads=true&downloadRank=true)](https://nodei.co/npm/readable-stream/)\n[![NPM](https://nodei.co/npm-dl/readable-stream.png?&months=6&height=3)](https://nodei.co/npm/readable-stream/)\n\n\n[![Sauce Test Status](https://saucelabs.com/browser-matrix/readable-stream.svg)](https://saucelabs.com/u/readable-stream)\n\n```bash\nnpm install --save readable-stream\n```\n\n***Node-core streams for userland***\n\nThis package is a mirror of the Streams2 and Streams3 implementations in\nNode-core, including [documentation](doc/stream.markdown).\n\nIf you want to guarantee a stable streams base, regardless of what version of\nNode you, or the users of your libraries are using, use **readable-stream** *only* and avoid the *\"stream\"* module in Node-core, for background see [this blogpost](http://r.va.gg/2014/06/why-i-dont-use-nodes-core-stream-module.html).\n\nAs of version 2.0.0 **readable-stream** uses semantic versioning.  \n\n# Streams WG Team Members\n\n* **Chris Dickinson** ([@chrisdickinson](https://github.com/chrisdickinson)) &lt;christopher.s.dickinson@gmail.com&gt;\n  - Release GPG key: 9554F04D7259F04124DE6B476D5A82AC7E37093B\n* **Calvin Metcalf** ([@calvinmetcalf](https://github.com/calvinmetcalf)) &lt;calvin.metcalf@gmail.com&gt;\n  - Release GPG key: F3EF5F62A87FC27A22E643F714CE4FF5015AA242\n* **Rod Vagg** ([@rvagg](https://github.com/rvagg)) &lt;rod@vagg.org&gt;\n  - Release GPG key: DD8F2338BAE7501E3DD5AC78C273792F7D83545D\n* **Sam Newman** ([@sonewman](https://github.com/sonewman)) &lt;newmansam@outlook.com&gt;\n* **Mathias Buus** ([@mafintosh](https://github.com/mafintosh)) &lt;mathiasbuus@gmail.com&gt;\n* **Domenic Denicola** ([@domenic](https://github.com/domenic)) &lt;d@domenic.me&gt;\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/nodejs/readable-stream/issues"
+  },
+  "homepage": "https://github.com/nodejs/readable-stream#readme",
+  "_id": "readable-stream@2.0.2",
+  "_shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
+  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+  "_from": "readable-stream@>=2.0.0 <2.1.0"
+}
diff --git a/deps/npm/node_modules/readable-stream/passthrough.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/passthrough.js
similarity index 100%
rename from deps/npm/node_modules/readable-stream/passthrough.js
rename to deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/passthrough.js
diff --git a/deps/npm/node_modules/concat-stream/node_modules/readable-stream/readable.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/readable.js
similarity index 100%
rename from deps/npm/node_modules/concat-stream/node_modules/readable-stream/readable.js
rename to deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/readable.js
diff --git a/deps/npm/node_modules/readable-stream/transform.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/transform.js
similarity index 100%
rename from deps/npm/node_modules/readable-stream/transform.js
rename to deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/transform.js
diff --git a/deps/npm/node_modules/readable-stream/writable.js b/deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/writable.js
similarity index 100%
rename from deps/npm/node_modules/readable-stream/writable.js
rename to deps/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/writable.js
diff --git a/deps/npm/node_modules/bl/package.json b/deps/npm/node_modules/request/node_modules/bl/package.json
similarity index 61%
rename from deps/npm/node_modules/bl/package.json
rename to deps/npm/node_modules/request/node_modules/bl/package.json
index f3ca993c5d086d..1513847030a9eb 100644
--- a/deps/npm/node_modules/bl/package.json
+++ b/deps/npm/node_modules/request/node_modules/bl/package.json
@@ -1,92 +1,62 @@
 {
-  "_args": [
-    [
-      "bl@~1.0.0",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "bl@>=1.0.0 <1.1.0",
-  "_id": "bl@1.0.0",
-  "_inCache": true,
-  "_location": "/bl",
-  "_nodeVersion": "2.0.1-nightly20150618d2e4e03444",
-  "_npmUser": {
-    "email": "rod@vagg.org",
-    "name": "rvagg"
-  },
-  "_npmVersion": "2.9.0",
-  "_phantomChildren": {
-    "core-util-is": "1.0.1",
-    "inherits": "2.0.1",
-    "isarray": "0.0.1",
-    "process-nextick-args": "1.0.2",
-    "string_decoder": "0.10.31",
-    "util-deprecate": "1.0.1"
+  "name": "bl",
+  "version": "1.0.0",
+  "description": "Buffer List: collect buffers and access with a standard readable Buffer interface, streamable too!",
+  "main": "bl.js",
+  "scripts": {
+    "test": "node test/test.js | faucet",
+    "test-local": "brtapsauce-local test/basic-test.js"
   },
-  "_requested": {
-    "name": "bl",
-    "raw": "bl@~1.0.0",
-    "rawSpec": "~1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <1.1.0",
-    "type": "range"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/rvagg/bl.git"
   },
-  "_requiredBy": [
-    "/request"
-  ],
-  "_resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
-  "_shasum": "ada9a8a89a6d7ac60862f7dec7db207873e0c3f5",
-  "_shrinkwrap": null,
-  "_spec": "bl@~1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
+  "homepage": "https://github.com/rvagg/bl",
   "authors": [
-    "Jarett Cruger <jcrugzz@gmail.com> (https://github.com/jcrugzz)",
+    "Rod Vagg <rod@vagg.org> (https://github.com/rvagg)",
     "Matteo Collina <matteo.collina@gmail.com> (https://github.com/mcollina)",
-    "Rod Vagg <rod@vagg.org> (https://github.com/rvagg)"
+    "Jarett Cruger <jcrugzz@gmail.com> (https://github.com/jcrugzz)"
   ],
-  "bugs": {
-    "url": "https://github.com/rvagg/bl/issues"
-  },
+  "keywords": [
+    "buffer",
+    "buffers",
+    "stream",
+    "awesomesauce"
+  ],
+  "license": "MIT",
   "dependencies": {
     "readable-stream": "~2.0.0"
   },
-  "description": "Buffer List: collect buffers and access with a standard readable Buffer interface, streamable too!",
   "devDependencies": {
-    "brtapsauce": "~0.3.0",
-    "faucet": "~0.0.1",
+    "tape": "~2.12.3",
     "hash_file": "~0.1.1",
-    "tape": "~2.12.3"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "ada9a8a89a6d7ac60862f7dec7db207873e0c3f5",
-    "tarball": "http://registry.npmjs.org/bl/-/bl-1.0.0.tgz"
+    "faucet": "~0.0.1",
+    "brtapsauce": "~0.3.0"
   },
   "gitHead": "1794938be6697a6d1e02cd942a4eea59b353347a",
-  "homepage": "https://github.com/rvagg/bl",
-  "keywords": [
-    "awesomesauce",
-    "buffer",
-    "buffers",
-    "stream"
-  ],
-  "license": "MIT",
-  "main": "bl.js",
+  "bugs": {
+    "url": "https://github.com/rvagg/bl/issues"
+  },
+  "_id": "bl@1.0.0",
+  "_shasum": "ada9a8a89a6d7ac60862f7dec7db207873e0c3f5",
+  "_from": "bl@>=1.0.0 <1.1.0",
+  "_npmVersion": "2.9.0",
+  "_nodeVersion": "2.0.1-nightly20150618d2e4e03444",
+  "_npmUser": {
+    "name": "rvagg",
+    "email": "rod@vagg.org"
+  },
   "maintainers": [
     {
       "name": "rvagg",
       "email": "rod@vagg.org"
     }
   ],
-  "name": "bl",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/rvagg/bl.git"
-  },
-  "scripts": {
-    "test": "node test/test.js | faucet",
-    "test-local": "brtapsauce-local test/basic-test.js"
+  "dist": {
+    "shasum": "ada9a8a89a6d7ac60862f7dec7db207873e0c3f5",
+    "tarball": "http://registry.npmjs.org/bl/-/bl-1.0.0.tgz"
   },
-  "version": "1.0.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/bl/test/basic-test.js b/deps/npm/node_modules/request/node_modules/bl/test/basic-test.js
similarity index 100%
rename from deps/npm/node_modules/bl/test/basic-test.js
rename to deps/npm/node_modules/request/node_modules/bl/test/basic-test.js
diff --git a/deps/npm/node_modules/bl/test/sauce.js b/deps/npm/node_modules/request/node_modules/bl/test/sauce.js
similarity index 100%
rename from deps/npm/node_modules/bl/test/sauce.js
rename to deps/npm/node_modules/request/node_modules/bl/test/sauce.js
diff --git a/deps/npm/node_modules/bl/test/test.js b/deps/npm/node_modules/request/node_modules/bl/test/test.js
similarity index 100%
rename from deps/npm/node_modules/bl/test/test.js
rename to deps/npm/node_modules/request/node_modules/bl/test/test.js
diff --git a/deps/npm/node_modules/caseless/LICENSE b/deps/npm/node_modules/request/node_modules/caseless/LICENSE
similarity index 100%
rename from deps/npm/node_modules/caseless/LICENSE
rename to deps/npm/node_modules/request/node_modules/caseless/LICENSE
diff --git a/deps/npm/node_modules/caseless/README.md b/deps/npm/node_modules/request/node_modules/caseless/README.md
similarity index 100%
rename from deps/npm/node_modules/caseless/README.md
rename to deps/npm/node_modules/request/node_modules/caseless/README.md
diff --git a/deps/npm/node_modules/caseless/index.js b/deps/npm/node_modules/request/node_modules/caseless/index.js
similarity index 100%
rename from deps/npm/node_modules/caseless/index.js
rename to deps/npm/node_modules/request/node_modules/caseless/index.js
diff --git a/deps/npm/node_modules/caseless/package.json b/deps/npm/node_modules/request/node_modules/caseless/package.json
similarity index 64%
rename from deps/npm/node_modules/caseless/package.json
rename to deps/npm/node_modules/request/node_modules/caseless/package.json
index eb2fdfd7839c02..2cd79ea01ab69b 100644
--- a/deps/npm/node_modules/caseless/package.json
+++ b/deps/npm/node_modules/request/node_modules/caseless/package.json
@@ -1,63 +1,43 @@
 {
-  "_args": [
-    [
-      "caseless@~0.11.0",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "caseless@>=0.11.0 <0.12.0",
-  "_id": "caseless@0.11.0",
-  "_inCache": true,
-  "_location": "/caseless",
-  "_nodeVersion": "1.8.1",
-  "_npmUser": {
-    "email": "mikeal.rogers@gmail.com",
-    "name": "mikeal"
+  "name": "caseless",
+  "version": "0.11.0",
+  "description": "Caseless object set/get/has, very useful when working with HTTP headers.",
+  "main": "index.js",
+  "scripts": {
+    "test": "node test.js"
   },
-  "_npmVersion": "2.8.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "caseless",
-    "raw": "caseless@~0.11.0",
-    "rawSpec": "~0.11.0",
-    "scope": null,
-    "spec": ">=0.11.0 <0.12.0",
-    "type": "range"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mikeal/caseless.git"
   },
-  "_requiredBy": [
-    "/request"
+  "keywords": [
+    "headers",
+    "http",
+    "caseless"
   ],
-  "_resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-  "_shasum": "715b96ea9841593cc33067923f5ec60ebda4f7d7",
-  "_shrinkwrap": null,
-  "_spec": "caseless@~0.11.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
+  "test": "node test.js",
   "author": {
-    "email": "mikeal.rogers@gmail.com",
-    "name": "Mikeal Rogers"
+    "name": "Mikeal Rogers",
+    "email": "mikeal.rogers@gmail.com"
   },
+  "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/mikeal/caseless/issues"
   },
-  "dependencies": {},
-  "description": "Caseless object set/get/has, very useful when working with HTTP headers.",
   "devDependencies": {
     "tape": "^2.10.2"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "715b96ea9841593cc33067923f5ec60ebda4f7d7",
-    "tarball": "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
-  },
   "gitHead": "c578232a02cc2b46b6da8851caf57fdbfac89ff5",
   "homepage": "https://github.com/mikeal/caseless#readme",
-  "keywords": [
-    "caseless",
-    "headers",
-    "http"
-  ],
-  "license": "Apache-2.0",
-  "main": "index.js",
+  "_id": "caseless@0.11.0",
+  "_shasum": "715b96ea9841593cc33067923f5ec60ebda4f7d7",
+  "_from": "caseless@>=0.11.0 <0.12.0",
+  "_npmVersion": "2.8.3",
+  "_nodeVersion": "1.8.1",
+  "_npmUser": {
+    "name": "mikeal",
+    "email": "mikeal.rogers@gmail.com"
+  },
   "maintainers": [
     {
       "name": "mikeal",
@@ -72,15 +52,11 @@
       "email": "simeonvelichkov@gmail.com"
     }
   ],
-  "name": "caseless",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mikeal/caseless.git"
-  },
-  "scripts": {
-    "test": "node test.js"
+  "dist": {
+    "shasum": "715b96ea9841593cc33067923f5ec60ebda4f7d7",
+    "tarball": "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
   },
-  "test": "node test.js",
-  "version": "0.11.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/caseless/test.js b/deps/npm/node_modules/request/node_modules/caseless/test.js
similarity index 100%
rename from deps/npm/node_modules/caseless/test.js
rename to deps/npm/node_modules/request/node_modules/caseless/test.js
diff --git a/deps/npm/node_modules/combined-stream/License b/deps/npm/node_modules/request/node_modules/combined-stream/License
similarity index 100%
rename from deps/npm/node_modules/combined-stream/License
rename to deps/npm/node_modules/request/node_modules/combined-stream/License
diff --git a/deps/npm/node_modules/combined-stream/Readme.md b/deps/npm/node_modules/request/node_modules/combined-stream/Readme.md
similarity index 100%
rename from deps/npm/node_modules/combined-stream/Readme.md
rename to deps/npm/node_modules/request/node_modules/combined-stream/Readme.md
diff --git a/deps/npm/node_modules/combined-stream/lib/combined_stream.js b/deps/npm/node_modules/request/node_modules/combined-stream/lib/combined_stream.js
similarity index 100%
rename from deps/npm/node_modules/combined-stream/lib/combined_stream.js
rename to deps/npm/node_modules/request/node_modules/combined-stream/lib/combined_stream.js
diff --git a/deps/npm/node_modules/delayed-stream/.npmignore b/deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/.npmignore
similarity index 100%
rename from deps/npm/node_modules/delayed-stream/.npmignore
rename to deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/.npmignore
diff --git a/deps/npm/node_modules/delayed-stream/License b/deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/License
similarity index 100%
rename from deps/npm/node_modules/delayed-stream/License
rename to deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/License
diff --git a/deps/npm/node_modules/delayed-stream/Makefile b/deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/Makefile
similarity index 100%
rename from deps/npm/node_modules/delayed-stream/Makefile
rename to deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/Makefile
diff --git a/deps/npm/node_modules/delayed-stream/Readme.md b/deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/Readme.md
similarity index 100%
rename from deps/npm/node_modules/delayed-stream/Readme.md
rename to deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/Readme.md
diff --git a/deps/npm/node_modules/delayed-stream/lib/delayed_stream.js b/deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/lib/delayed_stream.js
similarity index 100%
rename from deps/npm/node_modules/delayed-stream/lib/delayed_stream.js
rename to deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/lib/delayed_stream.js
diff --git a/deps/npm/node_modules/delayed-stream/package.json b/deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/package.json
similarity index 69%
rename from deps/npm/node_modules/delayed-stream/package.json
rename to deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/package.json
index 7f4cb7f97feab1..8ac66b814c8162 100644
--- a/deps/npm/node_modules/delayed-stream/package.json
+++ b/deps/npm/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/package.json
@@ -1,69 +1,53 @@
 {
-  "_args": [
-    [
-      "delayed-stream@~1.0.0",
-      "/Users/rebecca/code/npm/node_modules/combined-stream"
-    ]
-  ],
-  "_from": "delayed-stream@>=1.0.0 <1.1.0",
-  "_id": "delayed-stream@1.0.0",
-  "_inCache": true,
-  "_location": "/delayed-stream",
-  "_nodeVersion": "1.6.4",
-  "_npmUser": {
-    "email": "apeherder@gmail.com",
-    "name": "apechimp"
-  },
-  "_npmVersion": "2.8.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "delayed-stream",
-    "raw": "delayed-stream@~1.0.0",
-    "rawSpec": "~1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/combined-stream"
-  ],
-  "_resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-  "_shasum": "df3ae199acadfb7d440aaae0b29e2272b24ec619",
-  "_shrinkwrap": null,
-  "_spec": "delayed-stream@~1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/combined-stream",
   "author": {
-    "email": "felix@debuggable.com",
     "name": "Felix Geisendörfer",
+    "email": "felix@debuggable.com",
     "url": "http://debuggable.com/"
   },
-  "bugs": {
-    "url": "https://github.com/felixge/node-delayed-stream/issues"
-  },
   "contributors": [
     {
       "name": "Mike Atkins",
       "email": "apeherder@gmail.com"
     }
   ],
-  "dependencies": {},
+  "name": "delayed-stream",
   "description": "Buffers events from a stream until you are ready to handle them.",
+  "license": "MIT",
+  "version": "1.0.0",
+  "homepage": "https://github.com/felixge/node-delayed-stream",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/felixge/node-delayed-stream.git"
+  },
+  "main": "./lib/delayed_stream",
+  "engines": {
+    "node": ">=0.4.0"
+  },
+  "scripts": {
+    "test": "make test"
+  },
+  "dependencies": {},
   "devDependencies": {
     "fake": "0.2.0",
     "far": "0.0.1"
   },
-  "directories": {},
+  "gitHead": "07a9dc99fb8f1a488160026b9ad77493f766fb84",
+  "bugs": {
+    "url": "https://github.com/felixge/node-delayed-stream/issues"
+  },
+  "_id": "delayed-stream@1.0.0",
+  "_shasum": "df3ae199acadfb7d440aaae0b29e2272b24ec619",
+  "_from": "delayed-stream@>=1.0.0 <1.1.0",
+  "_npmVersion": "2.8.3",
+  "_nodeVersion": "1.6.4",
+  "_npmUser": {
+    "name": "apechimp",
+    "email": "apeherder@gmail.com"
+  },
   "dist": {
     "shasum": "df3ae199acadfb7d440aaae0b29e2272b24ec619",
     "tarball": "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
   },
-  "engines": {
-    "node": ">=0.4.0"
-  },
-  "gitHead": "07a9dc99fb8f1a488160026b9ad77493f766fb84",
-  "homepage": "https://github.com/felixge/node-delayed-stream",
-  "license": "MIT",
-  "main": "./lib/delayed_stream",
   "maintainers": [
     {
       "name": "felixge",
@@ -74,14 +58,7 @@
       "email": "apeherder@gmail.com"
     }
   ],
-  "name": "delayed-stream",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/felixge/node-delayed-stream.git"
-  },
-  "scripts": {
-    "test": "make test"
-  },
-  "version": "1.0.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/combined-stream/package.json b/deps/npm/node_modules/request/node_modules/combined-stream/package.json
similarity index 68%
rename from deps/npm/node_modules/combined-stream/package.json
rename to deps/npm/node_modules/request/node_modules/combined-stream/package.json
index 1c3e72c157f22e..e0cd160ff6dbe5 100644
--- a/deps/npm/node_modules/combined-stream/package.json
+++ b/deps/npm/node_modules/request/node_modules/combined-stream/package.json
@@ -1,65 +1,48 @@
 {
-  "_args": [
-    [
-      "combined-stream@~1.0.1",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "combined-stream@>=1.0.1 <1.1.0",
-  "_id": "combined-stream@1.0.5",
-  "_inCache": true,
-  "_location": "/combined-stream",
-  "_nodeVersion": "0.12.4",
-  "_npmUser": {
-    "email": "iam@alexindigo.com",
-    "name": "alexindigo"
-  },
-  "_npmVersion": "2.10.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "combined-stream",
-    "raw": "combined-stream@~1.0.1",
-    "rawSpec": "~1.0.1",
-    "scope": null,
-    "spec": ">=1.0.1 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/form-data",
-    "/request"
-  ],
-  "_resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-  "_shasum": "938370a57b4a51dea2c77c15d5c5fdf895164009",
-  "_shrinkwrap": null,
-  "_spec": "combined-stream@~1.0.1",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
   "author": {
-    "email": "felix@debuggable.com",
     "name": "Felix Geisendörfer",
+    "email": "felix@debuggable.com",
     "url": "http://debuggable.com/"
   },
-  "bugs": {
-    "url": "https://github.com/felixge/node-combined-stream/issues"
+  "name": "combined-stream",
+  "description": "A stream that emits multiple other streams one after another.",
+  "version": "1.0.5",
+  "homepage": "https://github.com/felixge/node-combined-stream",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/felixge/node-combined-stream.git"
+  },
+  "main": "./lib/combined_stream",
+  "scripts": {
+    "test": "node test/run.js"
+  },
+  "engines": {
+    "node": ">= 0.8"
   },
   "dependencies": {
     "delayed-stream": "~1.0.0"
   },
-  "description": "A stream that emits multiple other streams one after another.",
   "devDependencies": {
     "far": "~0.0.7"
   },
-  "directories": {},
+  "license": "MIT",
+  "gitHead": "cfc7b815d090a109bcedb5bb0f6713148d55a6b7",
+  "bugs": {
+    "url": "https://github.com/felixge/node-combined-stream/issues"
+  },
+  "_id": "combined-stream@1.0.5",
+  "_shasum": "938370a57b4a51dea2c77c15d5c5fdf895164009",
+  "_from": "combined-stream@>=1.0.5 <1.1.0",
+  "_npmVersion": "2.10.1",
+  "_nodeVersion": "0.12.4",
+  "_npmUser": {
+    "name": "alexindigo",
+    "email": "iam@alexindigo.com"
+  },
   "dist": {
     "shasum": "938370a57b4a51dea2c77c15d5c5fdf895164009",
     "tarball": "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
   },
-  "engines": {
-    "node": ">= 0.8"
-  },
-  "gitHead": "cfc7b815d090a109bcedb5bb0f6713148d55a6b7",
-  "homepage": "https://github.com/felixge/node-combined-stream",
-  "license": "MIT",
-  "main": "./lib/combined_stream",
   "maintainers": [
     {
       "name": "felixge",
@@ -78,14 +61,7 @@
       "email": "apeherder@gmail.com"
     }
   ],
-  "name": "combined-stream",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/felixge/node-combined-stream.git"
-  },
-  "scripts": {
-    "test": "node test/run.js"
-  },
-  "version": "1.0.5"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/extend/.jscs.json b/deps/npm/node_modules/request/node_modules/extend/.jscs.json
similarity index 100%
rename from deps/npm/node_modules/extend/.jscs.json
rename to deps/npm/node_modules/request/node_modules/extend/.jscs.json
diff --git a/deps/npm/node_modules/extend/.npmignore b/deps/npm/node_modules/request/node_modules/extend/.npmignore
similarity index 100%
rename from deps/npm/node_modules/extend/.npmignore
rename to deps/npm/node_modules/request/node_modules/extend/.npmignore
diff --git a/deps/npm/node_modules/extend/.travis.yml b/deps/npm/node_modules/request/node_modules/extend/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/extend/.travis.yml
rename to deps/npm/node_modules/request/node_modules/extend/.travis.yml
diff --git a/deps/npm/node_modules/extend/CHANGELOG.md b/deps/npm/node_modules/request/node_modules/extend/CHANGELOG.md
similarity index 100%
rename from deps/npm/node_modules/extend/CHANGELOG.md
rename to deps/npm/node_modules/request/node_modules/extend/CHANGELOG.md
diff --git a/deps/npm/node_modules/extend/LICENSE b/deps/npm/node_modules/request/node_modules/extend/LICENSE
similarity index 100%
rename from deps/npm/node_modules/extend/LICENSE
rename to deps/npm/node_modules/request/node_modules/extend/LICENSE
diff --git a/deps/npm/node_modules/extend/README.md b/deps/npm/node_modules/request/node_modules/extend/README.md
similarity index 100%
rename from deps/npm/node_modules/extend/README.md
rename to deps/npm/node_modules/request/node_modules/extend/README.md
diff --git a/deps/npm/node_modules/extend/component.json b/deps/npm/node_modules/request/node_modules/extend/component.json
similarity index 100%
rename from deps/npm/node_modules/extend/component.json
rename to deps/npm/node_modules/request/node_modules/extend/component.json
diff --git a/deps/npm/node_modules/extend/index.js b/deps/npm/node_modules/request/node_modules/extend/index.js
similarity index 100%
rename from deps/npm/node_modules/extend/index.js
rename to deps/npm/node_modules/request/node_modules/extend/index.js
diff --git a/deps/npm/node_modules/extend/package.json b/deps/npm/node_modules/request/node_modules/extend/package.json
similarity index 70%
rename from deps/npm/node_modules/extend/package.json
rename to deps/npm/node_modules/request/node_modules/extend/package.json
index 64d1715fd7f49f..c8c7cac9967924 100644
--- a/deps/npm/node_modules/extend/package.json
+++ b/deps/npm/node_modules/request/node_modules/extend/package.json
@@ -1,44 +1,20 @@
 {
-  "_args": [
-    [
-      "extend@~3.0.0",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "extend@>=3.0.0 <3.1.0",
-  "_id": "extend@3.0.0",
-  "_inCache": true,
-  "_location": "/extend",
-  "_nodeVersion": "2.3.1",
-  "_npmUser": {
-    "email": "ljharb@gmail.com",
-    "name": "ljharb"
-  },
-  "_npmVersion": "2.11.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "extend",
-    "raw": "extend@~3.0.0",
-    "rawSpec": "~3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <3.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/request"
-  ],
-  "_resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
-  "_shasum": "5a474353b9f3353ddd8176dfd37b91c83a46f1d4",
-  "_shrinkwrap": null,
-  "_spec": "extend@~3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
+  "name": "extend",
   "author": {
-    "email": "justmoon@members.fsf.org",
     "name": "Stefan Thomas",
+    "email": "justmoon@members.fsf.org",
     "url": "http://www.justmoon.net"
   },
-  "bugs": {
-    "url": "https://github.com/justmoon/node-extend/issues"
+  "version": "3.0.0",
+  "description": "Port of jQuery.extend for node.js and the browser",
+  "main": "index",
+  "scripts": {
+    "test": "npm run lint && node test/index.js && npm run coverage-quiet",
+    "coverage": "covert test/index.js",
+    "coverage-quiet": "covert test/index.js --quiet",
+    "lint": "npm run jscs && npm run eslint",
+    "jscs": "jscs *.js */*.js",
+    "eslint": "eslint *.js */*.js"
   },
   "contributors": [
     {
@@ -46,28 +22,41 @@
       "url": "https://github.com/ljharb"
     }
   ],
+  "keywords": [
+    "extend",
+    "clone",
+    "merge"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/justmoon/node-extend.git"
+  },
   "dependencies": {},
-  "description": "Port of jQuery.extend for node.js and the browser",
   "devDependencies": {
+    "tape": "^4.0.0",
     "covert": "^1.1.0",
-    "eslint": "^0.24.0",
     "jscs": "^1.13.1",
-    "tape": "^4.0.0"
+    "eslint": "^0.24.0"
+  },
+  "license": "MIT",
+  "gitHead": "148e7270cab2e9413af2cd0cab147070d755ed6d",
+  "bugs": {
+    "url": "https://github.com/justmoon/node-extend/issues"
+  },
+  "homepage": "https://github.com/justmoon/node-extend#readme",
+  "_id": "extend@3.0.0",
+  "_shasum": "5a474353b9f3353ddd8176dfd37b91c83a46f1d4",
+  "_from": "extend@>=3.0.0 <3.1.0",
+  "_npmVersion": "2.11.3",
+  "_nodeVersion": "2.3.1",
+  "_npmUser": {
+    "name": "ljharb",
+    "email": "ljharb@gmail.com"
   },
-  "directories": {},
   "dist": {
     "shasum": "5a474353b9f3353ddd8176dfd37b91c83a46f1d4",
     "tarball": "http://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
   },
-  "gitHead": "148e7270cab2e9413af2cd0cab147070d755ed6d",
-  "homepage": "https://github.com/justmoon/node-extend#readme",
-  "keywords": [
-    "clone",
-    "extend",
-    "merge"
-  ],
-  "license": "MIT",
-  "main": "index",
   "maintainers": [
     {
       "name": "justmoon",
@@ -78,19 +67,7 @@
       "email": "ljharb@gmail.com"
     }
   ],
-  "name": "extend",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/justmoon/node-extend.git"
-  },
-  "scripts": {
-    "coverage": "covert test/index.js",
-    "coverage-quiet": "covert test/index.js --quiet",
-    "eslint": "eslint *.js */*.js",
-    "jscs": "jscs *.js */*.js",
-    "lint": "npm run jscs && npm run eslint",
-    "test": "npm run lint && node test/index.js && npm run coverage-quiet"
-  },
-  "version": "3.0.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/forever-agent/LICENSE b/deps/npm/node_modules/request/node_modules/forever-agent/LICENSE
similarity index 100%
rename from deps/npm/node_modules/forever-agent/LICENSE
rename to deps/npm/node_modules/request/node_modules/forever-agent/LICENSE
diff --git a/deps/npm/node_modules/forever-agent/README.md b/deps/npm/node_modules/request/node_modules/forever-agent/README.md
similarity index 100%
rename from deps/npm/node_modules/forever-agent/README.md
rename to deps/npm/node_modules/request/node_modules/forever-agent/README.md
diff --git a/deps/npm/node_modules/forever-agent/index.js b/deps/npm/node_modules/request/node_modules/forever-agent/index.js
similarity index 100%
rename from deps/npm/node_modules/forever-agent/index.js
rename to deps/npm/node_modules/request/node_modules/forever-agent/index.js
diff --git a/deps/npm/node_modules/request/node_modules/forever-agent/package.json b/deps/npm/node_modules/request/node_modules/forever-agent/package.json
new file mode 100644
index 00000000000000..1d672c1c9a885e
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/forever-agent/package.json
@@ -0,0 +1,31 @@
+{
+  "author": {
+    "name": "Mikeal Rogers",
+    "email": "mikeal.rogers@gmail.com",
+    "url": "http://www.futurealoof.com"
+  },
+  "name": "forever-agent",
+  "description": "HTTP Agent that keeps socket connections alive between keep-alive requests. Formerly part of mikeal/request, now a standalone module.",
+  "version": "0.6.1",
+  "license": "Apache-2.0",
+  "repository": {
+    "url": "git+https://github.com/mikeal/forever-agent.git"
+  },
+  "main": "index.js",
+  "dependencies": {},
+  "devDependencies": {},
+  "optionalDependencies": {},
+  "engines": {
+    "node": "*"
+  },
+  "readme": "forever-agent\n=============\n\nHTTP Agent that keeps socket connections alive between keep-alive requests. Formerly part of mikeal/request, now a standalone module.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/mikeal/forever-agent/issues"
+  },
+  "homepage": "https://github.com/mikeal/forever-agent#readme",
+  "_id": "forever-agent@0.6.1",
+  "_shasum": "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91",
+  "_resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+  "_from": "forever-agent@>=0.6.1 <0.7.0"
+}
diff --git a/deps/npm/node_modules/form-data/License b/deps/npm/node_modules/request/node_modules/form-data/License
similarity index 100%
rename from deps/npm/node_modules/form-data/License
rename to deps/npm/node_modules/request/node_modules/form-data/License
diff --git a/deps/npm/node_modules/form-data/Readme.md b/deps/npm/node_modules/request/node_modules/form-data/Readme.md
similarity index 100%
rename from deps/npm/node_modules/form-data/Readme.md
rename to deps/npm/node_modules/request/node_modules/form-data/Readme.md
diff --git a/deps/npm/node_modules/form-data/lib/browser.js b/deps/npm/node_modules/request/node_modules/form-data/lib/browser.js
similarity index 100%
rename from deps/npm/node_modules/form-data/lib/browser.js
rename to deps/npm/node_modules/request/node_modules/form-data/lib/browser.js
diff --git a/deps/npm/node_modules/form-data/lib/form_data.js b/deps/npm/node_modules/request/node_modules/form-data/lib/form_data.js
similarity index 100%
rename from deps/npm/node_modules/form-data/lib/form_data.js
rename to deps/npm/node_modules/request/node_modules/form-data/lib/form_data.js
diff --git a/deps/npm/node_modules/async/CHANGELOG.md b/deps/npm/node_modules/request/node_modules/form-data/node_modules/async/CHANGELOG.md
similarity index 100%
rename from deps/npm/node_modules/async/CHANGELOG.md
rename to deps/npm/node_modules/request/node_modules/form-data/node_modules/async/CHANGELOG.md
diff --git a/deps/npm/node_modules/async/LICENSE b/deps/npm/node_modules/request/node_modules/form-data/node_modules/async/LICENSE
similarity index 100%
rename from deps/npm/node_modules/async/LICENSE
rename to deps/npm/node_modules/request/node_modules/form-data/node_modules/async/LICENSE
diff --git a/deps/npm/node_modules/async/lib/async.js b/deps/npm/node_modules/request/node_modules/form-data/node_modules/async/lib/async.js
similarity index 100%
rename from deps/npm/node_modules/async/lib/async.js
rename to deps/npm/node_modules/request/node_modules/form-data/node_modules/async/lib/async.js
diff --git a/deps/npm/node_modules/async/package.json b/deps/npm/node_modules/request/node_modules/form-data/node_modules/async/package.json
similarity index 59%
rename from deps/npm/node_modules/async/package.json
rename to deps/npm/node_modules/request/node_modules/form-data/node_modules/async/package.json
index cd315c1447ea39..cdc0f8ccc894c1 100644
--- a/deps/npm/node_modules/async/package.json
+++ b/deps/npm/node_modules/request/node_modules/form-data/node_modules/async/package.json
@@ -1,46 +1,28 @@
 {
-  "_args": [
-    [
-      "async@1.4.2",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "async@1.4.2",
-  "_id": "async@1.4.2",
-  "_inCache": true,
-  "_location": "/async",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "email": "megawac@gmail.com",
-    "name": "megawac"
-  },
-  "_npmVersion": "2.9.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "async",
-    "raw": "async@1.4.2",
-    "rawSpec": "1.4.2",
-    "scope": null,
-    "spec": "1.4.2",
-    "type": "version"
-  },
-  "_requiredBy": [
-    "/form-data",
-    "/istanbul"
+  "name": "async",
+  "description": "Higher-order functions and common patterns for asynchronous code",
+  "main": "lib/async.js",
+  "files": [
+    "lib"
   ],
-  "_resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz",
-  "_shasum": "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab",
-  "_shrinkwrap": null,
-  "_spec": "async@1.4.2",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
     "name": "Caolan McMahon"
   },
+  "version": "1.4.2",
+  "keywords": [
+    "async",
+    "callback",
+    "utility",
+    "module"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/caolan/async.git"
+  },
   "bugs": {
     "url": "https://github.com/caolan/async/issues"
   },
-  "dependencies": {},
-  "description": "Higher-order functions and common patterns for asynchronous code",
+  "license": "MIT",
   "devDependencies": {
     "benchmark": "github:bestiejs/benchmark.js",
     "bluebird": "^2.9.32",
@@ -65,82 +47,44 @@
     "xyz": "^0.5.0",
     "yargs": "~3.9.1"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab",
-    "tarball": "http://registry.npmjs.org/async/-/async-1.4.2.tgz"
-  },
-  "files": [
-    "lib"
-  ],
-  "gitHead": "92f78aebad222d60c13e4299c0e723f2fe2d6611",
-  "homepage": "https://github.com/caolan/async#readme",
-  "installable": true,
   "jam": {
-    "categories": [
-      "Utilities"
-    ],
+    "main": "lib/async.js",
     "include": [
-      "LICENSE",
+      "lib/async.js",
       "README.md",
-      "lib/async.js"
+      "LICENSE"
     ],
-    "main": "lib/async.js"
-  },
-  "keywords": [
-    "async",
-    "callback",
-    "module",
-    "utility"
-  ],
-  "license": "MIT",
-  "main": "lib/async.js",
-  "maintainers": [
-    {
-      "name": "caolan",
-      "email": "caolan.mcmahon@gmail.com"
-    },
-    {
-      "name": "beaugunderson",
-      "email": "beau@beaugunderson.com"
-    },
-    {
-      "name": "aearly",
-      "email": "alexander.early@gmail.com"
-    },
-    {
-      "name": "megawac",
-      "email": "megawac@gmail.com"
-    }
-  ],
-  "name": "async",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/caolan/async.git"
+    "categories": [
+      "Utilities"
+    ]
   },
   "scripts": {
-    "coverage": "nyc npm test && nyc report",
-    "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls",
-    "lint": "jshint lib/*.js test/*.js perf/*.js && jscs lib/*.js test/*.js perf/*.js",
-    "mocha-browser-test": "karma start",
     "mocha-node-test": "mocha mocha_test/",
+    "mocha-browser-test": "karma start",
     "mocha-test": "npm run mocha-node-test && npm run mocha-browser-test",
     "nodeunit-test": "nodeunit test/test-async.js",
-    "test": "npm run-script lint && npm run nodeunit-test && npm run mocha-test"
+    "test": "npm run-script lint && npm run nodeunit-test && npm run mocha-test",
+    "lint": "jshint lib/*.js test/*.js perf/*.js && jscs lib/*.js test/*.js perf/*.js",
+    "coverage": "nyc npm test && nyc report",
+    "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls"
   },
   "spm": {
     "main": "lib/async.js"
   },
-  "version": "1.4.2",
   "volo": {
+    "main": "lib/async.js",
     "ignore": [
       "**/.*",
-      "bower_components",
       "node_modules",
+      "bower_components",
       "test",
       "tests"
-    ],
-    "main": "lib/async.js"
-  }
+    ]
+  },
+  "readme": "ERROR: No README data found!",
+  "homepage": "https://github.com/caolan/async#readme",
+  "_id": "async@1.4.2",
+  "_shasum": "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab",
+  "_resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz",
+  "_from": "async@>=1.4.0 <2.0.0"
 }
diff --git a/deps/npm/node_modules/form-data/package.json b/deps/npm/node_modules/request/node_modules/form-data/package.json
similarity index 74%
rename from deps/npm/node_modules/form-data/package.json
rename to deps/npm/node_modules/request/node_modules/form-data/package.json
index 01f1798646a0d2..662e628b206630 100644
--- a/deps/npm/node_modules/form-data/package.json
+++ b/deps/npm/node_modules/request/node_modules/form-data/package.json
@@ -1,52 +1,33 @@
 {
-  "_args": [
-    [
-      "form-data@1.0.0-rc3",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "form-data@1.0.0-rc3",
-  "_id": "form-data@1.0.0-rc3",
-  "_inCache": true,
-  "_location": "/form-data",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "email": "pierceydylan@gmail.com",
-    "name": "dylanpiercey"
-  },
-  "_npmVersion": "2.11.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "form-data",
-    "raw": "form-data@1.0.0-rc3",
-    "rawSpec": "1.0.0-rc3",
-    "scope": null,
-    "spec": "1.0.0-rc3",
-    "type": "version"
-  },
-  "_requiredBy": [
-    "/request"
-  ],
-  "_resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
-  "_shasum": "d35bc62e7fbc2937ae78f948aaa0d38d90607577",
-  "_shrinkwrap": null,
-  "_spec": "form-data@1.0.0-rc3",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "felix@debuggable.com",
     "name": "Felix Geisendörfer",
+    "email": "felix@debuggable.com",
     "url": "http://debuggable.com/"
   },
+  "name": "form-data",
+  "description": "A library to create readable \"multipart/form-data\" streams. Can be used to submit forms and file uploads to other web applications.",
+  "version": "1.0.0-rc3",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/form-data/form-data.git"
+  },
+  "main": "./lib/form_data",
   "browser": "./lib/browser",
-  "bugs": {
-    "url": "https://github.com/form-data/form-data/issues"
+  "scripts": {
+    "test": "./test/run.js"
+  },
+  "pre-commit": [
+    "test"
+  ],
+  "engines": {
+    "node": ">= 0.10"
   },
   "dependencies": {
     "async": "^1.4.0",
     "combined-stream": "^1.0.5",
     "mime-types": "^2.1.3"
   },
-  "description": "A library to create readable \"multipart/form-data\" streams. Can be used to submit forms and file uploads to other web applications.",
+  "license": "MIT",
   "devDependencies": {
     "fake": "^0.2.2",
     "far": "^0.0.7",
@@ -54,19 +35,24 @@
     "pre-commit": "^1.0.10",
     "request": "^2.60.0"
   },
-  "directories": {},
+  "gitHead": "c174f1b7f3a78a00ec5af0360469280445e37804",
+  "bugs": {
+    "url": "https://github.com/form-data/form-data/issues"
+  },
+  "homepage": "https://github.com/form-data/form-data#readme",
+  "_id": "form-data@1.0.0-rc3",
+  "_shasum": "d35bc62e7fbc2937ae78f948aaa0d38d90607577",
+  "_from": "form-data@>=1.0.0-rc3 <1.1.0",
+  "_npmVersion": "2.11.0",
+  "_nodeVersion": "2.2.1",
+  "_npmUser": {
+    "name": "dylanpiercey",
+    "email": "pierceydylan@gmail.com"
+  },
   "dist": {
     "shasum": "d35bc62e7fbc2937ae78f948aaa0d38d90607577",
     "tarball": "http://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz"
   },
-  "engines": {
-    "node": ">= 0.10"
-  },
-  "gitHead": "c174f1b7f3a78a00ec5af0360469280445e37804",
-  "homepage": "https://github.com/form-data/form-data#readme",
-  "installable": true,
-  "license": "MIT",
-  "main": "./lib/form_data",
   "maintainers": [
     {
       "name": "felixge",
@@ -93,17 +79,7 @@
       "email": "pierceydylan@gmail.com"
     }
   ],
-  "name": "form-data",
-  "optionalDependencies": {},
-  "pre-commit": [
-    "test"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/form-data/form-data.git"
-  },
-  "scripts": {
-    "test": "./test/run.js"
-  },
-  "version": "1.0.0-rc3"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/har-validator/LICENSE b/deps/npm/node_modules/request/node_modules/har-validator/LICENSE
similarity index 100%
rename from deps/npm/node_modules/har-validator/LICENSE
rename to deps/npm/node_modules/request/node_modules/har-validator/LICENSE
diff --git a/deps/npm/node_modules/har-validator/README.md b/deps/npm/node_modules/request/node_modules/har-validator/README.md
similarity index 54%
rename from deps/npm/node_modules/har-validator/README.md
rename to deps/npm/node_modules/request/node_modules/har-validator/README.md
index f40ab755da29e1..2399b316e07e00 100644
--- a/deps/npm/node_modules/har-validator/README.md
+++ b/deps/npm/node_modules/request/node_modules/har-validator/README.md
@@ -42,282 +42,306 @@ har-validator --schema request request.json
 
 ## API
 
-### Validate(data [, callback])
+**Note**: as of [`v2.0.0`](https://github.com/ahmadnassri/har-validator/releases/tag/v2.0.0) this module defaults to Promise based API. *For backward comptability with `v1.x` an [async/callback API](#callback-api) is provided*
+
+### Validate(data)
 
-Returns `true` or `false`.
+> Returns a promise that resolves to the valid object.
 
 - **data**: `Object` *(Required)*
   a full [HAR](http://www.softwareishard.com/blog/har-12-spec/) object
 
-- **callback**: `Function`
-  gets two arguments (err, valid)
-
 ```js
-var HAR = require('./har.json');
-var validate = require('har-validator');
-
-validate(HAR, function (e, valid) {
-  if (e) console.log(e.errors)
-
-  if (valid) console.log('horray!');
-});
+var HAR = require('./har.json')
+var validate = require('har-validator')
+
+validate(HAR)
+  .then(function (HAR) {
+    console.log('horray!')
+  })
+  .catch(function (error) {
+    console.error(error)
+  })
 ```
 
-### Validate.log(data [, callback])
+### Validate.log(data)
 
-Returns `true` or `false`.
+> Returns a promise that resolves to the valid object.
 
 - **data**: `Object` *(Required)*
   a [log](http://www.softwareishard.com/blog/har-12-spec/#log) object
 
-- **callback**: `Function`
-  gets two arguments (err, valid)
-
 ```js
-var validate = require('har-validator');
-
-validate.log(data, function (e, valid) {
-  if (e) console.log(e.errors)
-});
+var validate = require('har-validator')
+
+validate.log(data.then(function (HAR) {
+    console.log('horray!')
+  })
+  .catch(function (error) {
+    console.error(error)
+  })
 ```
 
-### Validate.cache(data [, callback])
+### Validate.cache(data)
 
-Returns `true` or `false`.
+> Returns a promise that resolves to the valid object.
 
 - **data**: `Object` *(Required)*
   a [cache](http://www.softwareishard.com/blog/har-12-spec/#cache) object
 
-- **callback**: `Function`
-  gets two arguments (err, valid)
-
 ```js
-var validate = require('har-validator');
-
-validate.cache(data, function (e, valid) {
-  if (e) console.log(e.errors)
-});
+var validate = require('har-validator')
+
+validate.cache(data.then(function (HAR) {
+    console.log('horray!')
+  })
+  .catch(function (error) {
+    console.error(error)
+  })
 ```
 
-### Validate.cacheEntry(data [, callback])
+### Validate.cacheEntry(data)
 
-Returns `true` or `false`.
+> Returns a promise that resolves to the valid object.
 
 - **data**: `Object` *(Required)*
   a ["beforeRequest" or "afterRequest"](http://www.softwareishard.com/blog/har-12-spec/#cache) objects
 
-- **callback**: `Function`
-  gets two arguments (err, valid)
-
 ```js
-var validate = require('har-validator');
-
-validate.cacheEntry(data, function (e, valid) {
-  if (e) console.log(e.errors)
-});
+var validate = require('har-validator')
+
+validate.cacheEntry(data.then(function (HAR) {
+    console.log('horray!')
+  })
+  .catch(function (error) {
+    console.error(error)
+  })
 ```
 
-### Validate.content(data [, callback])
+### Validate.content(data)
 
-Returns `true` or `false`.
+> Returns a promise that resolves to the valid object.
 
 - **data**: `Object` *(Required)*
   a [content](http://www.softwareishard.com/blog/har-12-spec/#content) object
 
-- **callback**: `Function`
-  gets two arguments (err, valid)
-
 ```js
-var validate = require('har-validator');
-
-validate.content(data, function (e, valid) {
-  if (e) console.log(e.errors)
-});
+var validate = require('har-validator')
+
+validate.content(data.then(function (HAR) {
+    console.log('horray!')
+  })
+  .catch(function (error) {
+    console.error(error)
+  })
 ```
 
-### Validate.cookie(data [, callback])
+### Validate.cookie(data)
 
-Returns `true` or `false`.
+> Returns a promise that resolves to the valid object.
 
 - **data**: `Object` *(Required)*
   a [cookie](http://www.softwareishard.com/blog/har-12-spec/#cookies) object
 
-- **callback**: `Function`
-  gets two arguments (err, valid)
-
 ```js
-var validate = require('har-validator');
-
-validate.cookie(data, function (e, valid) {
-  if (e) console.log(e.errors)
-});
+var validate = require('har-validator')
+
+validate.cookie(data.then(function (HAR) {
+    console.log('horray!')
+  })
+  .catch(function (error) {
+    console.error(error)
+  })
 ```
 
-### Validate.creator(data [, callback])
+### Validate.creator(data)
 
-Returns `true` or `false`.
+> Returns a promise that resolves to the valid object.
 
 - **data**: `Object` *(Required)*
   a [creator](http://www.softwareishard.com/blog/har-12-spec/#creator) object
 
-- **callback**: `Function`
-  gets two arguments (err, valid)
-
 ```js
-var validate = require('har-validator');
-
-validate.creator(data, function (e, valid) {
-  if (e) console.log(e.errors)
-});
+var validate = require('har-validator')
+
+validate.creator(data.then(function (HAR) {
+    console.log('horray!')
+  })
+  .catch(function (error) {
+    console.error(error)
+  })
 ```
 
-### Validate.entry(data [, callback])
+### Validate.entry(data)
 
-Returns `true` or `false`.
+> Returns a promise that resolves to the valid object.
 
 - **data**: `Object` *(Required)*
   an [entry](http://www.softwareishard.com/blog/har-12-spec/#entries) object
 
-- **callback**: `Function`
-  gets two arguments (err, valid)
-
 ```js
-var validate = require('har-validator');
-
-validate.entry(data, function (e, valid) {
-  if (e) console.log(e.errors)
-});
+var validate = require('har-validator')
+
+validate.entry(data.then(function (HAR) {
+    console.log('horray!')
+  })
+  .catch(function (error) {
+    console.error(error)
+  })
 ```
 
-### Validate.log(data [, callback])
+### Validate.log(data)
 
-alias of [`Validate(data [, callback])`](#validate-data-callback-)
+alias of [`Validate(data)`](#validate-data-callback-)
 
-### Validate.page(data [, callback])
+### Validate.page(data)
 
-Returns `true` or `false`.
+> Returns a promise that resolves to the valid object.
 
 - **data**: `Object` *(Required)*
   a [page](http://www.softwareishard.com/blog/har-12-spec/#pages) object
 
-- **callback**: `Function`
-  gets two arguments (err, valid)
-
 ```js
-var validate = require('har-validator');
-
-validate.page(data, function (e, valid) {
-  if (e) console.log(e.errors)
-});
+var validate = require('har-validator')
+
+validate.page(data.then(function (HAR) {
+    console.log('horray!')
+  })
+  .catch(function (error) {
+    console.error(error)
+  })
 ```
 
-### Validate.pageTimings(data [, callback])
+### Validate.pageTimings(data)
 
-Returns `true` or `false`.
+> Returns a promise that resolves to the valid object.
 
 - **data**: `Object` *(Required)*
   a [pageTimings](http://www.softwareishard.com/blog/har-12-spec/#pageTimings) object
 
-- **callback**: `Function`
-  gets two arguments (err, valid)
-
 ```js
-var validate = require('har-validator');
-
-validate.pageTimings(data, function (e, valid) {
-  if (e) console.log(e.errors)
-});
+var validate = require('har-validator')
+
+validate.pageTimings(data.then(function (HAR) {
+    console.log('horray!')
+  })
+  .catch(function (error) {
+    console.error(error)
+  })
 ```
 
-### Validate.postData(data [, callback])
+### Validate.postData(data)
 
-Returns `true` or `false`.
+> Returns a promise that resolves to the valid object.
 
 - **data**: `Object` *(Required)*
   a [postData](http://www.softwareishard.com/blog/har-12-spec/#postData) object
 
-- **callback**: `Function`
-  gets two arguments (err, valid)
-
 ```js
-var validate = require('har-validator');
-
-validate.postData(data, function (e, valid) {
-  if (e) console.log(e.errors)
-});
+var validate = require('har-validator')
+
+validate.postData(data.then(function (HAR) {
+    console.log('horray!')
+  })
+  .catch(function (error) {
+    console.error(error)
+  })
 ```
 
-### Validate.record(data [, callback])
+### Validate.record(data)
 
-Returns `true` or `false`.
+> Returns a promise that resolves to the valid object.
 
 - **data**: `Object` *(Required)*
   a [record](http://www.softwareishard.com/blog/har-12-spec/#headers) object
 
-- **callback**: `Function`
-  gets two arguments (err, valid)
-
 ```js
-var validate = require('har-validator');
-
-validate.record(data, function (e, valid) {
-  if (e) console.log(e.errors)
-});
+var validate = require('har-validator')
+
+validate.record(data.then(function (HAR) {
+    console.log('horray!')
+  })
+  .catch(function (error) {
+    console.error(error)
+  })
 ```
 
-### Validate.request(data [, callback])
+### Validate.request(data)
 
-Returns `true` or `false`.
+> Returns a promise that resolves to the valid object.
 
 - **data**: `Object` *(Required)*
   a [request](http://www.softwareishard.com/blog/har-12-spec/#request) object
 
-- **callback**: `Function`
-  gets two arguments (err, valid)
-
 ```js
-var validate = require('har-validator');
-
-validate.request(data, function (e, valid) {
-  if (e) console.log(e.errors)
-});
+var validate = require('har-validator')
+
+validate.request(data.then(function (HAR) {
+    console.log('horray!')
+  })
+  .catch(function (error) {
+    console.error(error)
+  })
 ```
 
-### Validate.response(data [, callback])
+### Validate.response(data)
 
-Returns `true` or `false`.
+> Returns a promise that resolves to the valid object.
 
 - **data**: `Object` *(Required)*
   a [response](http://www.softwareishard.com/blog/har-12-spec/#response) object
 
-- **callback**: `Function`
-  gets two arguments (err, valid)
-
 ```js
-var validate = require('har-validator');
-
-validate.cacheEntry(data, function (e, valid) {
-  if (e) console.log(e.errors)
-});
+var validate = require('har-validator')
+
+validate.cacheEntry(data.then(function (HAR) {
+    console.log('horray!')
+  })
+  .catch(function (error) {
+    console.error(error)
+  })
 ```
 
-### Validate.timings(data [, callback])
+### Validate.timings(data)
 
-Returns `true` or `false`.
+> Returns a promise that resolves to the valid object.
 
 - **data**: `Object` *(Required)*
   a [timings](http://www.softwareishard.com/blog/har-12-spec/#timings) object
 
-- **callback**: `Function`
-  gets two arguments (err, valid)
+```js
+var validate = require('har-validator')
+
+validate.timings(data.then(function (HAR) {
+    console.log('horray!')
+  })
+  .catch(function (error) {
+    console.error(error)
+  })
+```
+
+----
+
+## Callback API
+
+### Validate(data [, callback])
+
+> Returns `true` or `false`.
 
 ```js
-var validate = require('har-validator');
+var HAR = require('./har.json');
+var validate = require('har-validator/lib/async');
 
-validate.timings(data, function (e, valid) {
+validate(HAR, function (e, valid) {
   if (e) console.log(e.errors)
+
+  if (valid) console.log('horray!');
 });
+
 ```
+The async API provides exactly the same methods as the [Promise API](#promise-api)
+
+----
 
 ## Support
 
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/bin/har-validator b/deps/npm/node_modules/request/node_modules/har-validator/bin/har-validator
new file mode 100755
index 00000000000000..fd7cc0d34dc42c
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/bin/har-validator
@@ -0,0 +1,56 @@
+#!/usr/bin/env node
+
+'use strict'
+
+var chalk = require('chalk')
+var cmd = require('commander')
+var fs = require('fs')
+var path = require('path')
+var pkg = require('../package.json')
+var Promise = require('pinkie-promise')
+var validate = require('..')
+var ValidationError = require('../lib/error')
+
+cmd
+  .version(pkg.version)
+  .usage('[options] <files ...>')
+  .option('-s, --schema [name]', 'validate schema name (log, request, response, etc ...)')
+  .parse(process.argv)
+
+if (!cmd.args.length) {
+  cmd.help()
+}
+
+cmd.args.map(function (fileName) {
+  var file = chalk.yellow.italic(path.basename(fileName))
+
+  new Promise(function (resolve, reject) {
+    fs.readFile(fileName, function (err, data) {
+      return err === null ? resolve(data) : reject(err)
+    })
+  })
+
+    .then(JSON.parse)
+
+    .then(cmd.schema ? validate[cmd.schema] : validate)
+
+    .then(function (data) {
+      console.log('%s [%s] is valid', chalk.green('✓'), file)
+    })
+
+    .catch(function (err) {
+      if (err instanceof SyntaxError) {
+        return console.error('%s [%s] failed to read JSON: %s', chalk.red('✖'), file, chalk.red(err.message))
+      }
+
+      if (err instanceof ValidationError) {
+        err.errors.forEach(function (details) {
+          console.error('%s [%s] failed validation: (%s: %s) %s', chalk.red('✖'), file, chalk.cyan.italic(details.field), chalk.magenta.italic(details.value), chalk.red(details.message))
+        })
+
+        return
+      }
+
+      console.error('%s [%s] an unknown error has occured: %s', chalk.red('✖'), file, chalk.red(err.message))
+    })
+})
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/async.js b/deps/npm/node_modules/request/node_modules/har-validator/lib/async.js
new file mode 100644
index 00000000000000..77b99a7db7b697
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/lib/async.js
@@ -0,0 +1,14 @@
+'use strict'
+
+var runner = require('./runner')
+var schemas = require('./schemas')
+
+module.exports = function (data, cb) {
+  return runner(schemas.har, data, cb)
+}
+
+Object.keys(schemas).map(function (name) {
+  module.exports[name] = function (data, cb) {
+    return runner(schemas[name], data, cb)
+  }
+})
diff --git a/deps/npm/node_modules/har-validator/lib/error.js b/deps/npm/node_modules/request/node_modules/har-validator/lib/error.js
similarity index 100%
rename from deps/npm/node_modules/har-validator/lib/error.js
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/error.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/lib/index.js b/deps/npm/node_modules/request/node_modules/har-validator/lib/index.js
new file mode 100644
index 00000000000000..e8351b8d568435
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/lib/index.js
@@ -0,0 +1,22 @@
+'use strict'
+
+var Promise = require('pinkie-promise')
+var runner = require('./runner')
+var schemas = require('./schemas')
+
+var promisify = function (schema) {
+  return function (data) {
+    return new Promise(function (resolve, reject) {
+      runner(schema, data, function (err, valid) {
+        return err === null ? resolve(data) : reject(err)
+      })
+    })
+  }
+}
+
+module.exports = promisify(schemas.har)
+
+// utility methods for all parts of the schema
+Object.keys(schemas).map(function (name) {
+  module.exports[name] = promisify(schemas[name])
+})
diff --git a/deps/npm/node_modules/har-validator/lib/index.js b/deps/npm/node_modules/request/node_modules/har-validator/lib/runner.js
similarity index 56%
rename from deps/npm/node_modules/har-validator/lib/index.js
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/runner.js
index 81d55607c9e5ff..f0ed484e155561 100644
--- a/deps/npm/node_modules/har-validator/lib/index.js
+++ b/deps/npm/node_modules/request/node_modules/har-validator/lib/runner.js
@@ -4,36 +4,26 @@ var schemas = require('./schemas')
 var ValidationError = require('./error')
 var validator = require('is-my-json-valid')
 
-var runner = function (schema, data, cb) {
+module.exports = function (schema, data, cb) {
+  // default value
+  var valid = false
+
+  // validator config
   var validate = validator(schema, {
     greedy: true,
     verbose: true,
     schemas: schemas
   })
 
-  var valid = false
-
+  // execute is-my-json-valid
   if (data !== undefined) {
-    // execute is-my-json-valid
     valid = validate(data)
   }
 
   // callback?
-  if (!cb) {
-    return valid
-  } else {
+  if (typeof cb === 'function') {
     return cb(validate.errors ? new ValidationError(validate.errors) : null, valid)
   }
 
   return valid
 }
-
-module.exports = function (data, cb) {
-  return runner(schemas.har, data, cb)
-}
-
-Object.keys(schemas).map(function (name) {
-  module.exports[name] = function (data, cb) {
-    return runner(schemas[name], data, cb)
-  }
-})
diff --git a/deps/npm/node_modules/har-validator/lib/schemas/cache.json b/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/cache.json
similarity index 100%
rename from deps/npm/node_modules/har-validator/lib/schemas/cache.json
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/cache.json
diff --git a/deps/npm/node_modules/har-validator/lib/schemas/cacheEntry.json b/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/cacheEntry.json
similarity index 100%
rename from deps/npm/node_modules/har-validator/lib/schemas/cacheEntry.json
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/cacheEntry.json
diff --git a/deps/npm/node_modules/har-validator/lib/schemas/content.json b/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/content.json
similarity index 100%
rename from deps/npm/node_modules/har-validator/lib/schemas/content.json
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/content.json
diff --git a/deps/npm/node_modules/har-validator/lib/schemas/cookie.json b/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/cookie.json
similarity index 100%
rename from deps/npm/node_modules/har-validator/lib/schemas/cookie.json
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/cookie.json
diff --git a/deps/npm/node_modules/har-validator/lib/schemas/creator.json b/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/creator.json
similarity index 100%
rename from deps/npm/node_modules/har-validator/lib/schemas/creator.json
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/creator.json
diff --git a/deps/npm/node_modules/har-validator/lib/schemas/entry.json b/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/entry.json
similarity index 100%
rename from deps/npm/node_modules/har-validator/lib/schemas/entry.json
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/entry.json
diff --git a/deps/npm/node_modules/har-validator/lib/schemas/har.json b/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/har.json
similarity index 100%
rename from deps/npm/node_modules/har-validator/lib/schemas/har.json
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/har.json
diff --git a/deps/npm/node_modules/har-validator/lib/schemas/index.js b/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/index.js
similarity index 100%
rename from deps/npm/node_modules/har-validator/lib/schemas/index.js
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/index.js
diff --git a/deps/npm/node_modules/har-validator/lib/schemas/log.json b/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/log.json
similarity index 100%
rename from deps/npm/node_modules/har-validator/lib/schemas/log.json
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/log.json
diff --git a/deps/npm/node_modules/har-validator/lib/schemas/page.json b/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/page.json
similarity index 100%
rename from deps/npm/node_modules/har-validator/lib/schemas/page.json
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/page.json
diff --git a/deps/npm/node_modules/har-validator/lib/schemas/pageTimings.json b/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/pageTimings.json
similarity index 100%
rename from deps/npm/node_modules/har-validator/lib/schemas/pageTimings.json
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/pageTimings.json
diff --git a/deps/npm/node_modules/har-validator/lib/schemas/postData.json b/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/postData.json
similarity index 100%
rename from deps/npm/node_modules/har-validator/lib/schemas/postData.json
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/postData.json
diff --git a/deps/npm/node_modules/har-validator/lib/schemas/record.json b/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/record.json
similarity index 100%
rename from deps/npm/node_modules/har-validator/lib/schemas/record.json
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/record.json
diff --git a/deps/npm/node_modules/har-validator/lib/schemas/request.json b/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/request.json
similarity index 100%
rename from deps/npm/node_modules/har-validator/lib/schemas/request.json
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/request.json
diff --git a/deps/npm/node_modules/har-validator/lib/schemas/response.json b/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/response.json
similarity index 100%
rename from deps/npm/node_modules/har-validator/lib/schemas/response.json
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/response.json
diff --git a/deps/npm/node_modules/har-validator/lib/schemas/timings.json b/deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/timings.json
similarity index 100%
rename from deps/npm/node_modules/har-validator/lib/schemas/timings.json
rename to deps/npm/node_modules/request/node_modules/har-validator/lib/schemas/timings.json
diff --git a/deps/npm/node_modules/chalk/index.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/index.js
similarity index 100%
rename from deps/npm/node_modules/chalk/index.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/index.js
diff --git a/deps/npm/node_modules/is-builtin-module/license b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/license
similarity index 100%
rename from deps/npm/node_modules/is-builtin-module/license
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/license
diff --git a/deps/npm/node_modules/ansi-styles/index.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/index.js
similarity index 100%
rename from deps/npm/node_modules/ansi-styles/index.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/index.js
diff --git a/deps/npm/node_modules/os-homedir/license b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/license
similarity index 100%
rename from deps/npm/node_modules/os-homedir/license
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/license
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/package.json
new file mode 100644
index 00000000000000..f2e9595b8b5eb2
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/package.json
@@ -0,0 +1,71 @@
+{
+  "name": "ansi-styles",
+  "version": "2.1.0",
+  "description": "ANSI escape codes for styling strings in the terminal",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/chalk/ansi-styles.git"
+  },
+  "author": {
+    "name": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
+    "url": "sindresorhus.com"
+  },
+  "maintainers": [
+    {
+      "name": "Sindre Sorhus",
+      "email": "sindresorhus@gmail.com",
+      "url": "sindresorhus.com"
+    },
+    {
+      "name": "Joshua Appelman",
+      "email": "jappelman@xebia.com",
+      "url": "jbnicolai.com"
+    }
+  ],
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "scripts": {
+    "test": "mocha"
+  },
+  "files": [
+    "index.js"
+  ],
+  "keywords": [
+    "ansi",
+    "styles",
+    "color",
+    "colour",
+    "colors",
+    "terminal",
+    "console",
+    "cli",
+    "string",
+    "tty",
+    "escape",
+    "formatting",
+    "rgb",
+    "256",
+    "shell",
+    "xterm",
+    "log",
+    "logging",
+    "command-line",
+    "text"
+  ],
+  "devDependencies": {
+    "mocha": "*"
+  },
+  "readme": "# ansi-styles [![Build Status](https://travis-ci.org/chalk/ansi-styles.svg?branch=master)](https://travis-ci.org/chalk/ansi-styles)\n\n> [ANSI escape codes](http://en.wikipedia.org/wiki/ANSI_escape_code#Colors_and_Styles) for styling strings in the terminal\n\nYou probably want the higher-level [chalk](https://github.com/chalk/chalk) module for styling your strings.\n\n![](screenshot.png)\n\n\n## Install\n\n```\n$ npm install --save ansi-styles\n```\n\n\n## Usage\n\n```js\nvar ansi = require('ansi-styles');\n\nconsole.log(ansi.green.open + 'Hello world!' + ansi.green.close);\n```\n\n\n## API\n\nEach style has an `open` and `close` property.\n\n\n## Styles\n\n### Modifiers\n\n- `reset`\n- `bold`\n- `dim`\n- `italic` *(not widely supported)*\n- `underline`\n- `inverse`\n- `hidden`\n- `strikethrough` *(not widely supported)*\n\n### Colors\n\n- `black`\n- `red`\n- `green`\n- `yellow`\n- `blue`\n- `magenta`\n- `cyan`\n- `white`\n- `gray`\n\n### Background colors\n\n- `bgBlack`\n- `bgRed`\n- `bgGreen`\n- `bgYellow`\n- `bgBlue`\n- `bgMagenta`\n- `bgCyan`\n- `bgWhite`\n\n\n## Advanced usage\n\nBy default you get a map of styles, but the styles are also available as groups. They are non-enumerable so they don't show up unless you access them explicitly. This makes it easier to expose only a subset in a higher-level module.\n\n- `ansi.modifiers`\n- `ansi.colors`\n- `ansi.bgColors`\n\n\n###### Example\n\n```js\nconsole.log(ansi.colors.green.open);\n```\n\n\n## License\n\nMIT © [Sindre Sorhus](http://sindresorhus.com)\n",
+  "readmeFilename": "readme.md",
+  "bugs": {
+    "url": "https://github.com/chalk/ansi-styles/issues"
+  },
+  "homepage": "https://github.com/chalk/ansi-styles#readme",
+  "_id": "ansi-styles@2.1.0",
+  "_shasum": "990f747146927b559a932bf92959163d60c0d0e2",
+  "_resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz",
+  "_from": "ansi-styles@>=2.1.0 <3.0.0"
+}
diff --git a/deps/npm/node_modules/ansi-styles/readme.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/readme.md
similarity index 100%
rename from deps/npm/node_modules/ansi-styles/readme.md
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/readme.md
diff --git a/deps/npm/node_modules/escape-string-regexp/index.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/index.js
similarity index 100%
rename from deps/npm/node_modules/escape-string-regexp/index.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/index.js
diff --git a/deps/npm/node_modules/os-tmpdir/license b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/license
similarity index 100%
rename from deps/npm/node_modules/os-tmpdir/license
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/license
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/package.json
new file mode 100644
index 00000000000000..b2bafb26a04f02
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/package.json
@@ -0,0 +1,61 @@
+{
+  "name": "escape-string-regexp",
+  "version": "1.0.3",
+  "description": "Escape RegExp special characters",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sindresorhus/escape-string-regexp.git"
+  },
+  "author": {
+    "name": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
+    "url": "http://sindresorhus.com"
+  },
+  "maintainers": [
+    {
+      "name": "Sindre Sorhus",
+      "email": "sindresorhus@gmail.com",
+      "url": "http://sindresorhus.com"
+    },
+    {
+      "name": "Joshua Appelman",
+      "email": "jappelman@xebia.com",
+      "url": "http://jbnicolai.com"
+    }
+  ],
+  "engines": {
+    "node": ">=0.8.0"
+  },
+  "scripts": {
+    "test": "mocha"
+  },
+  "files": [
+    "index.js"
+  ],
+  "keywords": [
+    "regex",
+    "regexp",
+    "re",
+    "regular",
+    "expression",
+    "escape",
+    "string",
+    "str",
+    "special",
+    "characters"
+  ],
+  "devDependencies": {
+    "mocha": "*"
+  },
+  "readme": "# escape-string-regexp [![Build Status](https://travis-ci.org/sindresorhus/escape-string-regexp.svg?branch=master)](https://travis-ci.org/sindresorhus/escape-string-regexp)\n\n> Escape RegExp special characters\n\n\n## Install\n\n```sh\n$ npm install --save escape-string-regexp\n```\n\n\n## Usage\n\n```js\nvar escapeStringRegexp = require('escape-string-regexp');\n\nvar escapedString = escapeStringRegexp('how much $ for a unicorn?');\n//=> how much \\$ for a unicorn\\?\n\nnew RegExp(escapedString);\n```\n\n\n## License\n\nMIT © [Sindre Sorhus](http://sindresorhus.com)\n",
+  "readmeFilename": "readme.md",
+  "bugs": {
+    "url": "https://github.com/sindresorhus/escape-string-regexp/issues"
+  },
+  "homepage": "https://github.com/sindresorhus/escape-string-regexp#readme",
+  "_id": "escape-string-regexp@1.0.3",
+  "_shasum": "9e2d8b25bc2555c3336723750e03f099c2735bb5",
+  "_resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+  "_from": "escape-string-regexp@>=1.0.2 <2.0.0"
+}
diff --git a/deps/npm/node_modules/escape-string-regexp/readme.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/readme.md
similarity index 100%
rename from deps/npm/node_modules/escape-string-regexp/readme.md
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/readme.md
diff --git a/deps/npm/node_modules/has-ansi/index.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/index.js
similarity index 100%
rename from deps/npm/node_modules/has-ansi/index.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/index.js
diff --git a/deps/npm/node_modules/path-is-absolute/license b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/license
similarity index 100%
rename from deps/npm/node_modules/path-is-absolute/license
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/license
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/package.json
new file mode 100644
index 00000000000000..15f623780f02e6
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/package.json
@@ -0,0 +1,76 @@
+{
+  "name": "has-ansi",
+  "version": "2.0.0",
+  "description": "Check if a string has ANSI escape codes",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sindresorhus/has-ansi.git"
+  },
+  "author": {
+    "name": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
+    "url": "sindresorhus.com"
+  },
+  "maintainers": [
+    {
+      "name": "Sindre Sorhus",
+      "email": "sindresorhus@gmail.com",
+      "url": "sindresorhus.com"
+    },
+    {
+      "name": "Joshua Appelman",
+      "email": "jappelman@xebia.com",
+      "url": "jbnicolai.com"
+    }
+  ],
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "scripts": {
+    "test": "node test.js"
+  },
+  "files": [
+    "index.js"
+  ],
+  "keywords": [
+    "ansi",
+    "styles",
+    "color",
+    "colour",
+    "colors",
+    "terminal",
+    "console",
+    "string",
+    "tty",
+    "escape",
+    "shell",
+    "xterm",
+    "command-line",
+    "text",
+    "regex",
+    "regexp",
+    "re",
+    "match",
+    "test",
+    "find",
+    "pattern",
+    "has"
+  ],
+  "dependencies": {
+    "ansi-regex": "^2.0.0"
+  },
+  "devDependencies": {
+    "ava": "0.0.4"
+  },
+  "readme": "# has-ansi [![Build Status](https://travis-ci.org/sindresorhus/has-ansi.svg?branch=master)](https://travis-ci.org/sindresorhus/has-ansi)\n\n> Check if a string has [ANSI escape codes](http://en.wikipedia.org/wiki/ANSI_escape_code)\n\n\n## Install\n\n```\n$ npm install --save has-ansi\n```\n\n\n## Usage\n\n```js\nvar hasAnsi = require('has-ansi');\n\nhasAnsi('\\u001b[4mcake\\u001b[0m');\n//=> true\n\nhasAnsi('cake');\n//=> false\n```\n\n\n## Related\n\n- [has-ansi-cli](https://github.com/sindresorhus/has-ansi-cli) - CLI for this module\n- [strip-ansi](https://github.com/sindresorhus/strip-ansi) - Strip ANSI escape codes\n- [ansi-regex](https://github.com/sindresorhus/ansi-regex) - Regular expression for matching ANSI escape codes\n- [chalk](https://github.com/sindresorhus/chalk) - Terminal string styling done right\n\n\n## License\n\nMIT © [Sindre Sorhus](http://sindresorhus.com)\n",
+  "readmeFilename": "readme.md",
+  "bugs": {
+    "url": "https://github.com/sindresorhus/has-ansi/issues"
+  },
+  "homepage": "https://github.com/sindresorhus/has-ansi#readme",
+  "_id": "has-ansi@2.0.0",
+  "_shasum": "34f5049ce1ecdf2b0649af3ef24e45ed35416d91",
+  "_resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+  "_from": "has-ansi@>=2.0.0 <3.0.0"
+}
diff --git a/deps/npm/node_modules/has-ansi/readme.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/readme.md
similarity index 100%
rename from deps/npm/node_modules/has-ansi/readme.md
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/readme.md
diff --git a/deps/npm/node_modules/supports-color/index.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/index.js
similarity index 100%
rename from deps/npm/node_modules/supports-color/index.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/index.js
diff --git a/deps/npm/node_modules/supports-color/license b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/license
similarity index 100%
rename from deps/npm/node_modules/supports-color/license
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/license
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/package.json
new file mode 100644
index 00000000000000..c43b7aa8c3a54f
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/package.json
@@ -0,0 +1,70 @@
+{
+  "name": "supports-color",
+  "version": "2.0.0",
+  "description": "Detect whether a terminal supports color",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/chalk/supports-color.git"
+  },
+  "author": {
+    "name": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
+    "url": "sindresorhus.com"
+  },
+  "maintainers": [
+    {
+      "name": "Sindre Sorhus",
+      "email": "sindresorhus@gmail.com",
+      "url": "sindresorhus.com"
+    },
+    {
+      "name": "Joshua Appelman",
+      "email": "jappelman@xebia.com",
+      "url": "jbnicolai.com"
+    }
+  ],
+  "engines": {
+    "node": ">=0.8.0"
+  },
+  "scripts": {
+    "test": "mocha"
+  },
+  "files": [
+    "index.js"
+  ],
+  "keywords": [
+    "color",
+    "colour",
+    "colors",
+    "terminal",
+    "console",
+    "cli",
+    "ansi",
+    "styles",
+    "tty",
+    "rgb",
+    "256",
+    "shell",
+    "xterm",
+    "command-line",
+    "support",
+    "supports",
+    "capability",
+    "detect"
+  ],
+  "devDependencies": {
+    "mocha": "*",
+    "require-uncached": "^1.0.2"
+  },
+  "readme": "# supports-color [![Build Status](https://travis-ci.org/chalk/supports-color.svg?branch=master)](https://travis-ci.org/chalk/supports-color)\n\n> Detect whether a terminal supports color\n\n\n## Install\n\n```\n$ npm install --save supports-color\n```\n\n\n## Usage\n\n```js\nvar supportsColor = require('supports-color');\n\nif (supportsColor) {\n\tconsole.log('Terminal supports color');\n}\n```\n\nIt obeys the `--color` and `--no-color` CLI flags.\n\nFor situations where using `--color` is not possible, add an environment variable `FORCE_COLOR` with any value to force color. Trumps `--no-color`.\n\n\n## Related\n\n- [supports-color-cli](https://github.com/chalk/supports-color-cli) - CLI for this module\n- [chalk](https://github.com/chalk/chalk) - Terminal string styling done right\n\n\n## License\n\nMIT © [Sindre Sorhus](http://sindresorhus.com)\n",
+  "readmeFilename": "readme.md",
+  "bugs": {
+    "url": "https://github.com/chalk/supports-color/issues"
+  },
+  "homepage": "https://github.com/chalk/supports-color#readme",
+  "_id": "supports-color@2.0.0",
+  "_shasum": "535d045ce6b6363fa40117084629995e9df324c7",
+  "_resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+  "_from": "supports-color@>=2.0.0 <3.0.0"
+}
diff --git a/deps/npm/node_modules/supports-color/readme.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/readme.md
similarity index 100%
rename from deps/npm/node_modules/supports-color/readme.md
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/readme.md
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/package.json
new file mode 100644
index 00000000000000..2ad36d4d983cab
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/package.json
@@ -0,0 +1,95 @@
+{
+  "name": "chalk",
+  "version": "1.1.1",
+  "description": "Terminal string styling done right. Much color.",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/chalk/chalk.git"
+  },
+  "maintainers": [
+    {
+      "name": "Sindre Sorhus",
+      "email": "sindresorhus@gmail.com",
+      "url": "sindresorhus.com"
+    },
+    {
+      "name": "Joshua Appelman",
+      "email": "jappelman@xebia.com",
+      "url": "jbnicolai.com"
+    },
+    {
+      "name": "JD Ballard",
+      "email": "i.am.qix@gmail.com",
+      "url": "github.com/qix-"
+    }
+  ],
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "scripts": {
+    "test": "xo && mocha",
+    "bench": "matcha benchmark.js",
+    "coverage": "nyc npm test && nyc report",
+    "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls"
+  },
+  "files": [
+    "index.js"
+  ],
+  "keywords": [
+    "color",
+    "colour",
+    "colors",
+    "terminal",
+    "console",
+    "cli",
+    "string",
+    "str",
+    "ansi",
+    "style",
+    "styles",
+    "tty",
+    "formatting",
+    "rgb",
+    "256",
+    "shell",
+    "xterm",
+    "log",
+    "logging",
+    "command-line",
+    "text"
+  ],
+  "dependencies": {
+    "ansi-styles": "^2.1.0",
+    "escape-string-regexp": "^1.0.2",
+    "has-ansi": "^2.0.0",
+    "strip-ansi": "^3.0.0",
+    "supports-color": "^2.0.0"
+  },
+  "devDependencies": {
+    "coveralls": "^2.11.2",
+    "matcha": "^0.6.0",
+    "mocha": "*",
+    "nyc": "^3.0.0",
+    "require-uncached": "^1.0.2",
+    "resolve-from": "^1.0.0",
+    "semver": "^4.3.3",
+    "xo": "*"
+  },
+  "xo": {
+    "envs": [
+      "node",
+      "mocha"
+    ]
+  },
+  "readme": "<h1 align=\"center\">\n\t<br>\n\t<br>\n\t<img width=\"360\" src=\"https://cdn.rawgit.com/chalk/chalk/19935d6484811c5e468817f846b7b3d417d7bf4a/logo.svg\" alt=\"chalk\">\n\t<br>\n\t<br>\n\t<br>\n</h1>\n\n> Terminal string styling done right\n\n[![Build Status](https://travis-ci.org/chalk/chalk.svg?branch=master)](https://travis-ci.org/chalk/chalk)\n[![Coverage Status](https://coveralls.io/repos/chalk/chalk/badge.svg?branch=master)](https://coveralls.io/r/chalk/chalk?branch=master)\n[![](http://img.shields.io/badge/unicorn-approved-ff69b4.svg)](https://www.youtube.com/watch?v=9auOCbH5Ns4)\n\n\n[colors.js](https://github.com/Marak/colors.js) used to be the most popular string styling module, but it has serious deficiencies like extending `String.prototype` which causes all kinds of [problems](https://github.com/yeoman/yo/issues/68). Although there are other ones, they either do too much or not enough.\n\n**Chalk is a clean and focused alternative.**\n\n![](https://github.com/chalk/ansi-styles/raw/master/screenshot.png)\n\n\n## Why\n\n- Highly performant\n- Doesn't extend `String.prototype`\n- Expressive API\n- Ability to nest styles\n- Clean and focused\n- Auto-detects color support\n- Actively maintained\n- [Used by ~4500 modules](https://www.npmjs.com/browse/depended/chalk) as of July 15, 2015\n\n\n## Install\n\n```\n$ npm install --save chalk\n```\n\n\n## Usage\n\nChalk comes with an easy to use composable API where you just chain and nest the styles you want.\n\n```js\nvar chalk = require('chalk');\n\n// style a string\nchalk.blue('Hello world!');\n\n// combine styled and normal strings\nchalk.blue('Hello') + 'World' + chalk.red('!');\n\n// compose multiple styles using the chainable API\nchalk.blue.bgRed.bold('Hello world!');\n\n// pass in multiple arguments\nchalk.blue('Hello', 'World!', 'Foo', 'bar', 'biz', 'baz');\n\n// nest styles\nchalk.red('Hello', chalk.underline.bgBlue('world') + '!');\n\n// nest styles of the same type even (color, underline, background)\nchalk.green(\n\t'I am a green line ' +\n\tchalk.blue.underline.bold('with a blue substring') +\n\t' that becomes green again!'\n);\n```\n\nEasily define your own themes.\n\n```js\nvar chalk = require('chalk');\nvar error = chalk.bold.red;\nconsole.log(error('Error!'));\n```\n\nTake advantage of console.log [string substitution](http://nodejs.org/docs/latest/api/console.html#console_console_log_data).\n\n```js\nvar name = 'Sindre';\nconsole.log(chalk.green('Hello %s'), name);\n//=> Hello Sindre\n```\n\n\n## API\n\n### chalk.`<style>[.<style>...](string, [string...])`\n\nExample: `chalk.red.bold.underline('Hello', 'world');`\n\nChain [styles](#styles) and call the last one as a method with a string argument. Order doesn't matter, and later styles take precedent in case of a conflict. This simply means that `Chalk.red.yellow.green` is equivalent to `Chalk.green`.\n\nMultiple arguments will be separated by space.\n\n### chalk.enabled\n\nColor support is automatically detected, but you can override it by setting the `enabled` property. You should however only do this in your own code as it applies globally to all chalk consumers.\n\nIf you need to change this in a reusable module create a new instance:\n\n```js\nvar ctx = new chalk.constructor({enabled: false});\n```\n\n### chalk.supportsColor\n\nDetect whether the terminal [supports color](https://github.com/chalk/supports-color). Used internally and handled for you, but exposed for convenience.\n\nCan be overridden by the user with the flags `--color` and `--no-color`. For situations where using `--color` is not possible, add an environment variable `FORCE_COLOR` with any value to force color. Trumps `--no-color`.\n\n### chalk.styles\n\nExposes the styles as [ANSI escape codes](https://github.com/chalk/ansi-styles).\n\nGenerally not useful, but you might need just the `.open` or `.close` escape code if you're mixing externally styled strings with your own.\n\n```js\nvar chalk = require('chalk');\n\nconsole.log(chalk.styles.red);\n//=> {open: '\\u001b[31m', close: '\\u001b[39m'}\n\nconsole.log(chalk.styles.red.open + 'Hello' + chalk.styles.red.close);\n```\n\n### chalk.hasColor(string)\n\nCheck whether a string [has color](https://github.com/chalk/has-ansi).\n\n### chalk.stripColor(string)\n\n[Strip color](https://github.com/chalk/strip-ansi) from a string.\n\nCan be useful in combination with `.supportsColor` to strip color on externally styled text when it's not supported.\n\nExample:\n\n```js\nvar chalk = require('chalk');\nvar styledString = getText();\n\nif (!chalk.supportsColor) {\n\tstyledString = chalk.stripColor(styledString);\n}\n```\n\n\n## Styles\n\n### Modifiers\n\n- `reset`\n- `bold`\n- `dim`\n- `italic` *(not widely supported)*\n- `underline`\n- `inverse`\n- `hidden`\n- `strikethrough` *(not widely supported)*\n\n### Colors\n\n- `black`\n- `red`\n- `green`\n- `yellow`\n- `blue` *(on Windows the bright version is used as normal blue is illegible)*\n- `magenta`\n- `cyan`\n- `white`\n- `gray`\n\n### Background colors\n\n- `bgBlack`\n- `bgRed`\n- `bgGreen`\n- `bgYellow`\n- `bgBlue`\n- `bgMagenta`\n- `bgCyan`\n- `bgWhite`\n\n\n## 256-colors\n\nChalk does not support anything other than the base eight colors, which guarantees it will work on all terminals and systems. Some terminals, specifically `xterm` compliant ones, will support the full range of 8-bit colors. For this the lower level [ansi-256-colors](https://github.com/jbnicolai/ansi-256-colors) package can be used.\n\n\n## Windows\n\nIf you're on Windows, do yourself a favor and use [`cmder`](http://bliker.github.io/cmder/) instead of `cmd.exe`.\n\n\n## Related\n\n- [chalk-cli](https://github.com/chalk/chalk-cli) - CLI for this module\n- [ansi-styles](https://github.com/chalk/ansi-styles/) - ANSI escape codes for styling strings in the terminal\n- [supports-color](https://github.com/chalk/supports-color/) - Detect whether a terminal supports color\n- [strip-ansi](https://github.com/chalk/strip-ansi) - Strip ANSI escape codes\n- [has-ansi](https://github.com/chalk/has-ansi) - Check if a string has ANSI escape codes\n- [ansi-regex](https://github.com/chalk/ansi-regex) - Regular expression for matching ANSI escape codes\n- [wrap-ansi](https://github.com/chalk/wrap-ansi) - Wordwrap a string with ANSI escape codes\n\n\n## License\n\nMIT © [Sindre Sorhus](http://sindresorhus.com)\n",
+  "readmeFilename": "readme.md",
+  "bugs": {
+    "url": "https://github.com/chalk/chalk/issues"
+  },
+  "homepage": "https://github.com/chalk/chalk#readme",
+  "_id": "chalk@1.1.1",
+  "_shasum": "509afb67066e7499f7eb3535c77445772ae2d019",
+  "_resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+  "_from": "chalk@>=1.1.1 <2.0.0"
+}
diff --git a/deps/npm/node_modules/chalk/readme.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/readme.md
similarity index 100%
rename from deps/npm/node_modules/chalk/readme.md
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/chalk/readme.md
diff --git a/deps/npm/node_modules/commander/History.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/History.md
similarity index 96%
rename from deps/npm/node_modules/commander/History.md
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/History.md
index 7b8b2c494fcfb9..1b47439cbe54a6 100644
--- a/deps/npm/node_modules/commander/History.md
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/History.md
@@ -1,10 +1,15 @@
 
-2.8.1 / 2015-04-22
+2.9.0 / 2015-10-13
 ==================
 
- * Back out `support multiline description` Close #396 #397
+  * Add option `isDefault` to set default subcommand #415 @Qix-
+  * Add callback to allow filtering or post-processing of help text #434 @djulien
+  * Fix `undefined` text in help information close #414 #416 @zhiyelee
 
+2.8.1 / 2015-04-22
+==================
 
+ * Back out `support multiline description` Close #396 #397
 
 2.8.0 / 2015-04-07
 ==================
diff --git a/deps/npm/node_modules/commander/LICENSE b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/LICENSE
similarity index 100%
rename from deps/npm/node_modules/commander/LICENSE
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/LICENSE
diff --git a/deps/npm/node_modules/commander/Readme.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/Readme.md
similarity index 93%
rename from deps/npm/node_modules/commander/Readme.md
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/Readme.md
index 5509996c7de697..60eb67599e5288 100644
--- a/deps/npm/node_modules/commander/Readme.md
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/Readme.md
@@ -167,13 +167,15 @@ program
   .version('0.0.1')
   .command('install [name]', 'install one or more packages')
   .command('search [query]', 'search with optional query')
-  .command('list', 'list packages installed')
+  .command('list', 'list packages installed', {isDefault: true})
   .parse(process.argv);
 ```
 
 When `.command()` is invoked with a description argument, no `.action(callback)` should be called to handle sub-commands, otherwise there will be an error. This tells commander that you're going to use separate executables for sub-commands, much like `git(1)` and other popular tools.
 The commander will try to search the executables in the directory of the entry script (like `./examples/pm`) with the name `program-command`, like `pm-install`, `pm-search`.
 
+Options can be passed with the call to `.command()`. Specifying `true` for `opts.noHelp` will remove the option from the generated help output. Specifying `true` for `opts.isDefault` will run the subcommand if no other subcommand is specified.
+
 If the program is designed to be installed globally, make sure the executables have proper modes, like `755`.
 
 ### `--harmony`
@@ -266,14 +268,16 @@ Examples:
 
 ```
 
-## .outputHelp()
+## .outputHelp(cb)
 
 Output help information without exiting.
+Optional callback cb allows post-processing of help text before it is displayed.
 
 If you want to display help by default (e.g. if no command was provided), you can use something like:
 
 ```js
 var program = require('commander');
+var colors = require('colors');
 
 program
   .version('0.0.1')
@@ -281,13 +285,18 @@ program
   .parse(process.argv);
 
   if (!process.argv.slice(2).length) {
-    program.outputHelp();
+    program.outputHelp(make_red);
   }
+
+function make_red(txt) {
+  return colors.red(txt); //display the help text in red on the console
+}
 ```
 
-## .help()
+## .help(cb)
 
   Output help information and exit immediately.
+  Optional callback cb allows post-processing of help text before it is displayed.
 
 ## Examples
 
diff --git a/deps/npm/node_modules/commander/index.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/index.js
similarity index 95%
rename from deps/npm/node_modules/commander/index.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/index.js
index 68387f51693838..8ed463c34ab385 100644
--- a/deps/npm/node_modules/commander/index.js
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/index.js
@@ -1,4 +1,3 @@
-
 /**
  * Module dependencies.
  */
@@ -83,10 +82,10 @@ Option.prototype.is = function(arg) {
 function Command(name) {
   this.commands = [];
   this.options = [];
-  this._execs = [];
+  this._execs = {};
   this._allowUnknownOption = false;
   this._args = [];
-  this._name = name;
+  this._name = name || '';
 }
 
 /**
@@ -165,6 +164,7 @@ Command.prototype.command = function(name, desc, opts) {
     cmd.description(desc);
     this.executables = true;
     this._execs[cmd._name] = true;
+    if (opts.isDefault) this.defaultExecutable = cmd._name;
   }
 
   cmd._noHelp = !!opts.noHelp;
@@ -184,7 +184,7 @@ Command.prototype.command = function(name, desc, opts) {
 
 Command.prototype.arguments = function (desc) {
   return this.parseExpectedArgs(desc.split(/ +/));
-}
+};
 
 /**
  * Add an implicit `help [cmd]` subcommand
@@ -446,7 +446,7 @@ Command.prototype.parse = function(argv) {
   this._name = this._name || basename(argv[1], '.js');
 
   // github-style sub-commands with no sub-command
-  if (this.executables && argv.length < 3) {
+  if (this.executables && argv.length < 3 && !this.defaultExecutable) {
     // this user needs help
     argv.push('--help');
   }
@@ -461,6 +461,10 @@ Command.prototype.parse = function(argv) {
   var name = result.args[0];
   if (this._execs[name] && typeof this._execs[name] != "function") {
     return this.executeSubCommand(argv, args, parsed.unknown);
+  } else if (this.defaultExecutable) {
+    // use the default subcommand
+    args.unshift(name = this.defaultExecutable);
+    return this.executeSubCommand(argv, args, parsed.unknown);
   }
 
   return result;
@@ -544,6 +548,7 @@ Command.prototype.executeSubCommand = function(argv, args, unknown) {
     process.exit(1);
   });
 
+  // Store the reference to the child process
   this.runningCommand = proc;
 };
 
@@ -831,7 +836,7 @@ Command.prototype.version = function(str, flags) {
  */
 
 Command.prototype.description = function(str) {
-  if (0 == arguments.length) return this._description;
+  if (0 === arguments.length) return this._description;
   this._description = str;
   return this;
 };
@@ -910,10 +915,10 @@ Command.prototype.optionHelp = function() {
 
   // Prepend the help information
   return [pad('-h, --help', width) + '  ' + 'output usage information']
-    .concat(this.options.map(function(option) {
-      return pad(option.flags, width) + '  ' + option.description;
+      .concat(this.options.map(function(option) {
+        return pad(option.flags, width) + '  ' + option.description;
       }))
-    .join('\n');
+      .join('\n');
 };
 
 /**
@@ -935,14 +940,10 @@ Command.prototype.commandHelp = function() {
 
     return [
       cmd._name
-        + (cmd._alias
-          ? '|' + cmd._alias
-          : '')
-        + (cmd.options.length
-          ? ' [options]'
-          : '')
+        + (cmd._alias ? '|' + cmd._alias : '')
+        + (cmd.options.length ? ' [options]' : '')
         + ' ' + args
-    , cmd.description()
+      , cmd.description()
     ];
   });
 
@@ -951,11 +952,12 @@ Command.prototype.commandHelp = function() {
   }, 0);
 
   return [
-      ''
+    ''
     , '  Commands:'
     , ''
     , commands.map(function(cmd) {
-      return pad(cmd[0], width) + '  ' + cmd[1];
+      var desc = cmd[1] ? '  ' + cmd[1] : '';
+      return pad(cmd[0], width) + desc;
     }).join('\n').replace(/^/gm, '    ')
     , ''
   ].join('\n');
@@ -1012,8 +1014,13 @@ Command.prototype.helpInformation = function() {
  * @api public
  */
 
-Command.prototype.outputHelp = function() {
-  process.stdout.write(this.helpInformation());
+Command.prototype.outputHelp = function(cb) {
+  if (!cb) {
+    cb = function(passthru) {
+      return passthru;
+    }
+  }
+  process.stdout.write(cb(this.helpInformation()));
   this.emit('--help');
 };
 
@@ -1023,8 +1030,8 @@ Command.prototype.outputHelp = function() {
  * @api public
  */
 
-Command.prototype.help = function() {
-  this.outputHelp();
+Command.prototype.help = function(cb) {
+  this.outputHelp(cb);
   process.exit();
 };
 
diff --git a/deps/npm/node_modules/graceful-readlink/.npmignore b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/.npmignore
similarity index 100%
rename from deps/npm/node_modules/graceful-readlink/.npmignore
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/.npmignore
diff --git a/deps/npm/node_modules/graceful-readlink/.travis.yml b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/graceful-readlink/.travis.yml
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/.travis.yml
diff --git a/deps/npm/node_modules/graceful-readlink/LICENSE b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/LICENSE
similarity index 100%
rename from deps/npm/node_modules/graceful-readlink/LICENSE
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/LICENSE
diff --git a/deps/npm/node_modules/graceful-readlink/README.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/README.md
similarity index 100%
rename from deps/npm/node_modules/graceful-readlink/README.md
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/README.md
diff --git a/deps/npm/node_modules/graceful-readlink/index.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/index.js
similarity index 100%
rename from deps/npm/node_modules/graceful-readlink/index.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/index.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/package.json
new file mode 100644
index 00000000000000..64d7d644dbcb59
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "graceful-readlink",
+  "version": "1.0.1",
+  "description": "graceful fs.readlink",
+  "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/zhiyelee/graceful-readlink.git"
+  },
+  "homepage": "https://github.com/zhiyelee/graceful-readlink",
+  "bugs": {
+    "url": "https://github.com/zhiyelee/graceful-readlink/issues"
+  },
+  "keywords": [
+    "fs.readlink",
+    "readlink"
+  ],
+  "author": {
+    "name": "zhiyelee"
+  },
+  "license": "MIT",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "readme": "# graceful-readlink\n[![NPM Version](http://img.shields.io/npm/v/graceful-readlink.svg?style=flat)](https://www.npmjs.org/package/graceful-readlink)\n[![NPM Downloads](https://img.shields.io/npm/dm/graceful-readlink.svg?style=flat)](https://www.npmjs.org/package/graceful-readlink)\n\n\n## Usage\n\n```js\nvar readlinkSync = require('graceful-readlink').readlinkSync;\nconsole.log(readlinkSync(f));\n// output\n//  the file pointed to when `f` is a symbolic link\n//  the `f` itself when `f` is not a symbolic link\n```\n## Licence\n\nMIT License\n",
+  "readmeFilename": "README.md",
+  "_id": "graceful-readlink@1.0.1",
+  "_shasum": "4cafad76bc62f02fa039b2f94e9a3dd3a391a725",
+  "_resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+  "_from": "graceful-readlink@>=1.0.0"
+}
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/package.json
new file mode 100644
index 00000000000000..ccc77e036e4994
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/commander/package.json
@@ -0,0 +1,71 @@
+{
+  "name": "commander",
+  "version": "2.9.0",
+  "description": "the complete solution for node.js command-line programs",
+  "keywords": [
+    "command",
+    "option",
+    "parser"
+  ],
+  "author": {
+    "name": "TJ Holowaychuk",
+    "email": "tj@vision-media.ca"
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tj/commander.js.git"
+  },
+  "devDependencies": {
+    "should": ">= 0.0.1",
+    "sinon": ">=1.17.1"
+  },
+  "scripts": {
+    "test": "make test"
+  },
+  "main": "index",
+  "engines": {
+    "node": ">= 0.6.x"
+  },
+  "files": [
+    "index.js"
+  ],
+  "dependencies": {
+    "graceful-readlink": ">= 1.0.0"
+  },
+  "gitHead": "b2aad7a8471d434593a85306aa73777a526e9f75",
+  "bugs": {
+    "url": "https://github.com/tj/commander.js/issues"
+  },
+  "homepage": "https://github.com/tj/commander.js#readme",
+  "_id": "commander@2.9.0",
+  "_shasum": "9c99094176e12240cb22d6c5146098400fe0f7d4",
+  "_from": "commander@>=2.8.1 <3.0.0",
+  "_npmVersion": "2.11.3",
+  "_nodeVersion": "0.12.7",
+  "_npmUser": {
+    "name": "zhiyelee",
+    "email": "zhiyelee@gmail.com"
+  },
+  "dist": {
+    "shasum": "9c99094176e12240cb22d6c5146098400fe0f7d4",
+    "tarball": "http://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
+  },
+  "maintainers": [
+    {
+      "name": "tjholowaychuk",
+      "email": "tj@vision-media.ca"
+    },
+    {
+      "name": "somekittens",
+      "email": "rkoutnik@gmail.com"
+    },
+    {
+      "name": "zhiyelee",
+      "email": "zhiyelee@gmail.com"
+    }
+  ],
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+  "readme": "ERROR: No README data found!"
+}
diff --git a/deps/npm/node_modules/is-my-json-valid/.npmignore b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/.npmignore
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/.npmignore
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/.npmignore
diff --git a/deps/npm/node_modules/generate-function/.travis.yml b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/generate-function/.travis.yml
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/.travis.yml
diff --git a/deps/npm/node_modules/generate-object-property/LICENSE b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/LICENSE
similarity index 100%
rename from deps/npm/node_modules/generate-object-property/LICENSE
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/LICENSE
diff --git a/deps/npm/node_modules/is-my-json-valid/README.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/README.md
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/README.md
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/README.md
diff --git a/deps/npm/node_modules/is-my-json-valid/example.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/example.js
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/example.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/example.js
diff --git a/deps/npm/node_modules/is-my-json-valid/formats.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/formats.js
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/formats.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/formats.js
diff --git a/deps/npm/node_modules/is-my-json-valid/index.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/index.js
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/index.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/index.js
diff --git a/deps/npm/node_modules/generate-object-property/.npmignore b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/.npmignore
similarity index 100%
rename from deps/npm/node_modules/generate-object-property/.npmignore
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/.npmignore
diff --git a/deps/npm/node_modules/generate-object-property/.travis.yml b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/generate-object-property/.travis.yml
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/.travis.yml
diff --git a/deps/npm/node_modules/generate-function/README.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/README.md
similarity index 100%
rename from deps/npm/node_modules/generate-function/README.md
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/README.md
diff --git a/deps/npm/node_modules/generate-function/example.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/example.js
similarity index 100%
rename from deps/npm/node_modules/generate-function/example.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/example.js
diff --git a/deps/npm/node_modules/generate-function/index.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/index.js
similarity index 100%
rename from deps/npm/node_modules/generate-function/index.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/index.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/package.json
new file mode 100644
index 00000000000000..e2bc77284d01bc
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/package.json
@@ -0,0 +1,37 @@
+{
+  "name": "generate-function",
+  "version": "2.0.0",
+  "description": "Module that helps you write generated functions in Node",
+  "main": "index.js",
+  "scripts": {
+    "test": "tape test.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mafintosh/generate-function.git"
+  },
+  "keywords": [
+    "generate",
+    "code",
+    "generation",
+    "function",
+    "performance"
+  ],
+  "author": {
+    "name": "Mathias Buus"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/mafintosh/generate-function/issues"
+  },
+  "homepage": "https://github.com/mafintosh/generate-function",
+  "devDependencies": {
+    "tape": "^2.13.4"
+  },
+  "readme": "# generate-function\n\nModule that helps you write generated functions in Node\n\n```\nnpm install generate-function\n```\n\n[![build status](http://img.shields.io/travis/mafintosh/generate-function.svg?style=flat)](http://travis-ci.org/mafintosh/generate-function)\n\n## Disclamer\n\nWriting code that generates code is hard.\nYou should only use this if you really, really, really need this for performance reasons (like schema validators / parsers etc).\n\n## Usage\n\n``` js\nvar genfun = require('generate-function')\n\nvar addNumber = function(val) {\n  var fn = genfun()\n    ('function add(n) {')\n      ('return n + %d', val) // supports format strings to insert values\n    ('}')\n\n  return fn.toFunction() // will compile the function\n}\n\nvar add2 = addNumber(2)\n\nconsole.log('1+2=', add2(1))\nconsole.log(add2.toString()) // prints the generated function\n```\n\nIf you need to close over variables in your generated function pass them to `toFunction(scope)`\n\n``` js\nvar multiply = function(a, b) {\n  return a * b\n}\n\nvar addAndMultiplyNumber = function(val) {\n  var fn = genfun()\n    ('function(n) {')\n      ('if (typeof n !== \"number\") {') // ending a line with { will indent the source\n        ('throw new Error(\"argument should be a number\")')\n      ('}')\n      ('var result = multiply(%d, n+%d)', val, val)\n      ('return result')\n    ('}')\n\n  // use fn.toString() if you want to see the generated source\n\n  return fn.toFunction({\n    multiply: multiply\n  })\n}\n\nvar addAndMultiply2 = addAndMultiplyNumber(2)\n\nconsole.log('(3 + 2) * 2 =', addAndMultiply2(3))\n```\n\n## Related\n\nSee [generate-object-property](https://github.com/mafintosh/generate-object-property) if you need to safely generate code that\ncan be used to reference an object property\n\n## License\n\nMIT",
+  "readmeFilename": "README.md",
+  "_id": "generate-function@2.0.0",
+  "_shasum": "6858fe7c0969b7d4e9093337647ac79f60dfbe74",
+  "_resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+  "_from": "generate-function@>=2.0.0 <3.0.0"
+}
diff --git a/deps/npm/node_modules/generate-function/test.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/test.js
similarity index 100%
rename from deps/npm/node_modules/generate-function/test.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/test.js
diff --git a/deps/npm/node_modules/wcwidth/.npmignore b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/.npmignore
similarity index 100%
rename from deps/npm/node_modules/wcwidth/.npmignore
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/.npmignore
diff --git a/deps/npm/node_modules/is-my-json-valid/.travis.yml b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/.travis.yml
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/.travis.yml
diff --git a/deps/npm/node_modules/is-my-json-valid/LICENSE b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/LICENSE
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/LICENSE
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/LICENSE
diff --git a/deps/npm/node_modules/generate-object-property/README.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/README.md
similarity index 100%
rename from deps/npm/node_modules/generate-object-property/README.md
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/README.md
diff --git a/deps/npm/node_modules/generate-object-property/index.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/index.js
similarity index 100%
rename from deps/npm/node_modules/generate-object-property/index.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/index.js
diff --git a/deps/npm/node_modules/is-property/.npmignore b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/.npmignore
similarity index 100%
rename from deps/npm/node_modules/is-property/.npmignore
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/.npmignore
diff --git a/deps/npm/node_modules/is-property/LICENSE b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/LICENSE
similarity index 100%
rename from deps/npm/node_modules/is-property/LICENSE
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/LICENSE
diff --git a/deps/npm/node_modules/is-property/README.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/README.md
similarity index 100%
rename from deps/npm/node_modules/is-property/README.md
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/README.md
diff --git a/deps/npm/node_modules/is-property/is-property.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/is-property.js
similarity index 100%
rename from deps/npm/node_modules/is-property/is-property.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/is-property.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/package.json
new file mode 100644
index 00000000000000..41225e266e4c80
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/package.json
@@ -0,0 +1,44 @@
+{
+  "name": "is-property",
+  "version": "1.0.2",
+  "description": "Tests if a JSON property can be accessed using . syntax",
+  "main": "is-property.js",
+  "directories": {
+    "test": "test"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "tape": "~1.0.4"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/mikolalysenko/is-property.git"
+  },
+  "keywords": [
+    "is",
+    "property",
+    "json",
+    "dot",
+    "bracket",
+    ".",
+    "[]"
+  ],
+  "author": {
+    "name": "Mikola Lysenko"
+  },
+  "license": "MIT",
+  "readmeFilename": "README.md",
+  "gitHead": "0a85ea5b6b1264ea1cdecc6e5cf186adbb3ffc50",
+  "bugs": {
+    "url": "https://github.com/mikolalysenko/is-property/issues"
+  },
+  "readme": "is-property\n===========\nTests if a property of a JavaScript object can be accessed using the dot (.) notation or if it must be enclosed in brackets, (ie use x[\" ... \"])\n\nExample\n-------\n\n```javascript\nvar isProperty = require(\"is-property\")\n\nconsole.log(isProperty(\"foo\"))  //Prints true\nconsole.log(isProperty(\"0\"))    //Prints false\n```\n\nInstall\n-------\n\n    npm install is-property\n    \n### `require(\"is-property\")(str)`\nChecks if str is a property\n\n* `str` is a string which we will test if it is a property or not\n\n**Returns** true or false depending if str is a property\n\n## Credits\n(c) 2013 Mikola Lysenko. MIT License",
+  "homepage": "https://github.com/mikolalysenko/is-property#readme",
+  "_id": "is-property@1.0.2",
+  "_shasum": "57fe1c4e48474edd65b09911f26b1cd4095dda84",
+  "_resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+  "_from": "is-property@>=1.0.0 <2.0.0"
+}
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/package.json
new file mode 100644
index 00000000000000..0d018abfa04521
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/package.json
@@ -0,0 +1,34 @@
+{
+  "name": "generate-object-property",
+  "version": "1.2.0",
+  "description": "Generate safe JS code that can used to reference a object property",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mafintosh/generate-object-property.git"
+  },
+  "devDependencies": {
+    "tape": "^2.13.0"
+  },
+  "scripts": {
+    "test": "tape test.js"
+  },
+  "dependencies": {
+    "is-property": "^1.0.0"
+  },
+  "bugs": {
+    "url": "https://github.com/mafintosh/generate-object-property/issues"
+  },
+  "homepage": "https://github.com/mafintosh/generate-object-property",
+  "main": "index.js",
+  "author": {
+    "name": "Mathias Buus",
+    "url": "@mafintosh"
+  },
+  "license": "MIT",
+  "readme": "# generate-object-property\n\nGenerate safe JS code that can used to reference a object property\n\n\tnpm install generate-object-property\n\n[![build status](http://img.shields.io/travis/mafintosh/generate-object-property.svg?style=flat)](http://travis-ci.org/mafintosh/generate-object-property)\n\n## Usage\n\n``` js\nvar gen = require('generate-object-property');\nconsole.log(gen('a','b')); // prints a.b\nconsole.log(gen('a', 'foo-bar')); // prints a[\"foo-bar\"]\n```\n\n## License\n\nMIT",
+  "readmeFilename": "README.md",
+  "_id": "generate-object-property@1.2.0",
+  "_shasum": "9c0e1c40308ce804f4783618b937fa88f99d50d0",
+  "_resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+  "_from": "generate-object-property@>=1.1.0 <2.0.0"
+}
diff --git a/deps/npm/node_modules/generate-object-property/test.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/test.js
similarity index 100%
rename from deps/npm/node_modules/generate-object-property/test.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/test.js
diff --git a/deps/npm/node_modules/jsonpointer/.travis.yml b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/jsonpointer/.travis.yml
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/.travis.yml
diff --git a/deps/npm/node_modules/jsonpointer/README.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/README.md
similarity index 100%
rename from deps/npm/node_modules/jsonpointer/README.md
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/README.md
diff --git a/deps/npm/node_modules/jsonpointer/jsonpointer.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/jsonpointer.js
similarity index 100%
rename from deps/npm/node_modules/jsonpointer/jsonpointer.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/jsonpointer.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json
new file mode 100644
index 00000000000000..4b0677650bcd69
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json
@@ -0,0 +1,64 @@
+{
+  "name": "jsonpointer",
+  "description": "Simple JSON Addressing.",
+  "tags": [
+    "util",
+    "simple",
+    "util",
+    "utility"
+  ],
+  "version": "2.0.0",
+  "author": {
+    "name": "Jan Lehnardt",
+    "email": "jan@apache.org"
+  },
+  "contributors": [
+    {
+      "name": "Joe Hildebrand",
+      "email": "joe-github@cursive.net"
+    }
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/janl/node-jsonpointer.git"
+  },
+  "bugs": {
+    "url": "http://github.com/janl/node-jsonpointer/issues"
+  },
+  "engines": {
+    "node": ">=0.6.0"
+  },
+  "main": "./jsonpointer",
+  "scripts": {
+    "test": "node test.js"
+  },
+  "license": "MIT",
+  "gitHead": "26ea4a5c0fcb6d9a2e87f733403791dd05637af8",
+  "homepage": "https://github.com/janl/node-jsonpointer#readme",
+  "_id": "jsonpointer@2.0.0",
+  "_shasum": "3af1dd20fe85463910d469a385e33017d2a030d9",
+  "_from": "jsonpointer@2.0.0",
+  "_npmVersion": "2.10.1",
+  "_nodeVersion": "0.10.36",
+  "_npmUser": {
+    "name": "marcbachmann",
+    "email": "marc.brookman@gmail.com"
+  },
+  "maintainers": [
+    {
+      "name": "jan",
+      "email": "jan@apache.org"
+    },
+    {
+      "name": "marcbachmann",
+      "email": "marc.brookman@gmail.com"
+    }
+  ],
+  "dist": {
+    "shasum": "3af1dd20fe85463910d469a385e33017d2a030d9",
+    "tarball": "http://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
+  },
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz",
+  "readme": "ERROR: No README data found!"
+}
diff --git a/deps/npm/node_modules/jsonpointer/test.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/test.js
similarity index 100%
rename from deps/npm/node_modules/jsonpointer/test.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/test.js
diff --git a/deps/npm/node_modules/xtend/.npmignore b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/.npmignore
similarity index 100%
rename from deps/npm/node_modules/xtend/.npmignore
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/.npmignore
diff --git a/deps/npm/node_modules/xtend/LICENCE b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/LICENCE
similarity index 100%
rename from deps/npm/node_modules/xtend/LICENCE
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/LICENCE
diff --git a/deps/npm/node_modules/xtend/Makefile b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/Makefile
similarity index 100%
rename from deps/npm/node_modules/xtend/Makefile
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/Makefile
diff --git a/deps/npm/node_modules/xtend/README.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/README.md
similarity index 100%
rename from deps/npm/node_modules/xtend/README.md
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/README.md
diff --git a/deps/npm/node_modules/xtend/immutable.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/immutable.js
similarity index 100%
rename from deps/npm/node_modules/xtend/immutable.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/immutable.js
diff --git a/deps/npm/node_modules/xtend/mutable.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/mutable.js
similarity index 100%
rename from deps/npm/node_modules/xtend/mutable.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/mutable.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/package.json
new file mode 100644
index 00000000000000..c087642df8c5e3
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/package.json
@@ -0,0 +1,72 @@
+{
+  "name": "xtend",
+  "version": "4.0.0",
+  "description": "extend like a boss",
+  "keywords": [
+    "extend",
+    "merge",
+    "options",
+    "opts",
+    "object",
+    "array"
+  ],
+  "author": {
+    "name": "Raynos",
+    "email": "raynos2@gmail.com"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/Raynos/xtend.git"
+  },
+  "main": "immutable",
+  "scripts": {
+    "test": "node test"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "tape": "~1.1.0"
+  },
+  "homepage": "https://github.com/Raynos/xtend",
+  "contributors": [
+    {
+      "name": "Jake Verbaten"
+    },
+    {
+      "name": "Matt Esch"
+    }
+  ],
+  "bugs": {
+    "url": "https://github.com/Raynos/xtend/issues",
+    "email": "raynos2@gmail.com"
+  },
+  "licenses": [
+    {
+      "type": "MIT",
+      "url": "http://github.com/raynos/xtend/raw/master/LICENSE"
+    }
+  ],
+  "testling": {
+    "files": "test.js",
+    "browsers": [
+      "ie/7..latest",
+      "firefox/16..latest",
+      "firefox/nightly",
+      "chrome/22..latest",
+      "chrome/canary",
+      "opera/12..latest",
+      "opera/next",
+      "safari/5.1..latest",
+      "ipad/6.0..latest",
+      "iphone/6.0..latest"
+    ]
+  },
+  "engines": {
+    "node": ">=0.4"
+  },
+  "readme": "# xtend\n\n[![browser support][3]][4]\n\n[![locked](http://badges.github.io/stability-badges/dist/locked.svg)](http://github.com/badges/stability-badges)\n\nExtend like a boss\n\nxtend is a basic utility library which allows you to extend an object by appending all of the properties from each object in a list. When there are identical properties, the right-most property takes precedence.\n\n## Examples\n\n```js\nvar extend = require(\"xtend\")\n\n// extend returns a new object. Does not mutate arguments\nvar combination = extend({\n    a: \"a\",\n    b: 'c'\n}, {\n    b: \"b\"\n})\n// { a: \"a\", b: \"b\" }\n```\n\n## Stability status: Locked\n\n## MIT Licenced\n\n\n  [3]: http://ci.testling.com/Raynos/xtend.png\n  [4]: http://ci.testling.com/Raynos/xtend\n",
+  "readmeFilename": "README.md",
+  "_id": "xtend@4.0.0",
+  "_shasum": "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f",
+  "_resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
+  "_from": "xtend@>=4.0.0 <5.0.0"
+}
diff --git a/deps/npm/node_modules/xtend/test.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/test.js
similarity index 100%
rename from deps/npm/node_modules/xtend/test.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/test.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
new file mode 100644
index 00000000000000..4dfb435af06d6f
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
@@ -0,0 +1,42 @@
+{
+  "name": "is-my-json-valid",
+  "version": "2.12.2",
+  "description": "A JSONSchema validator that uses code generation to be extremely fast",
+  "main": "index.js",
+  "dependencies": {
+    "generate-function": "^2.0.0",
+    "generate-object-property": "^1.1.0",
+    "jsonpointer": "2.0.0",
+    "xtend": "^4.0.0"
+  },
+  "devDependencies": {
+    "tape": "^2.13.4"
+  },
+  "scripts": {
+    "test": "tape test/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mafintosh/is-my-json-valid.git"
+  },
+  "keywords": [
+    "json",
+    "schema",
+    "orderly",
+    "jsonschema"
+  ],
+  "author": {
+    "name": "Mathias Buus"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/mafintosh/is-my-json-valid/issues"
+  },
+  "homepage": "https://github.com/mafintosh/is-my-json-valid",
+  "readme": "# is-my-json-valid\n\nA [JSONSchema](http://json-schema.org/) validator that uses code generation\nto be extremely fast\n\n```\nnpm install is-my-json-valid\n```\n\nIt passes the entire JSONSchema v4 test suite except for `remoteRefs` and `maxLength`/`minLength` when using unicode surrogate pairs.\n\n[![build status](http://img.shields.io/travis/mafintosh/is-my-json-valid.svg?style=flat)](http://travis-ci.org/mafintosh/is-my-json-valid)\n\n## Usage\n\nSimply pass a schema to compile it\n\n``` js\nvar validator = require('is-my-json-valid')\n\nvar validate = validator({\n  required: true,\n  type: 'object',\n  properties: {\n    hello: {\n      required: true,\n      type: 'string'\n    }\n  }\n})\n\nconsole.log('should be valid', validate({hello: 'world'}))\nconsole.log('should not be valid', validate({}))\n\n// get the last list of errors by checking validate.errors\n// the following will print [{field: 'data.hello', message: 'is required'}]\nconsole.log(validate.errors)\n```\n\nYou can also pass the schema as a string\n\n``` js\nvar validate = validate('{\"type\": ... }')\n```\n\nOptionally you can use the require submodule to load a schema from `__dirname`\n\n``` js\nvar validator = require('is-my-json-valid/require')\nvar validate = validator('my-schema.json')\n```\n\n## Custom formats\n\nis-my-json-valid supports the formats specified in JSON schema v4 (such as date-time).\nIf you want to add your own custom formats pass them as the formats options to the validator\n\n``` js\nvar validate = validator({\n  type: 'string',\n  required: true,\n  format: 'only-a'\n}, {\n  formats: {\n    'only-a': /^a+$/\n  }\n})\n\nconsole.log(validate('aa')) // true\nconsole.log(validate('ab')) // false\n```\n\n## External schemas\n\nYou can pass in external schemas that you reference using the `$ref` attribute as the `schemas` option\n\n``` js\nvar ext = {\n  required: true,\n  type: 'string'\n}\n\nvar schema = {\n  $ref: '#ext' // references another schema called ext\n}\n\n// pass the external schemas as an option\nvar validate = validator(schema, {schemas: {ext: ext}})\n\nvalidate('hello') // returns true\nvalidate(42) // return false\n```\n\n## Filtering away additional properties\n\nis-my-json-valid supports filtering away properties not in the schema\n\n``` js\nvar filter = validator.filter({\n  required: true,\n  type: 'object',\n  properties: {\n    hello: {type: 'string', required: true}\n  },\n  additionalProperties: false\n})\n\nvar doc = {hello: 'world', notInSchema: true}\nconsole.log(filter(doc)) // {hello: 'world'}\n```\n\n## Verbose mode outputs the value on errors\n\nis-my-json-valid outputs the value causing an error when verbose is set to true\n\n``` js\nvar validate = validator({\n  required: true,\n  type: 'object',\n  properties: {\n    hello: {\n      required: true,\n      type: 'string'\n    }\n  }\n}, {\n  verbose: true\n})\n\nvalidate({hello: 100});\nconsole.log(validate.errors) // {field: 'data.hello', message: 'is the wrong type', value: 100}\n```\n\n## Greedy mode tries to validate as much as possible\n\nBy default is-my-json-valid bails on first validation error but when greedy is\nset to true it tries to validate as much as possible:\n\n``` js\nvar validate = validator({\n  type: 'object',\n  properties: {\n    x: {\n      type: 'number'\n    }\n  },\n  required: ['x', 'y']\n}, {\n  greedy: true\n});\n\nvalidate({x: 'string'});\nconsole.log(validate.errors) // [{field: 'data.y', message: 'is required'},\n                             //  {field: 'data.x', message: 'is the wrong type'}]\n```\n\n## Performance\n\nis-my-json-valid uses code generation to turn your JSON schema into basic javascript code that is easily optimizeable by v8.\n\nAt the time of writing, is-my-json-valid is the __fastest validator__ when running\n\n* [json-schema-benchmark](https://github.com/Muscula/json-schema-benchmark)\n* [cosmicreals.com benchmark](http://cosmicrealms.com/blog/2014/08/29/benchmark-of-node-dot-js-json-validation-modules-part-3/)\n* [jsck benchmark](https://github.com/pandastrike/jsck/issues/72#issuecomment-70992684)\n* [themis benchmark](https://cdn.rawgit.com/playlyfe/themis/master/benchmark/results.html)\n* [z-schema benchmark](https://rawgit.com/zaggino/z-schema/master/benchmark/results.html)\n\nIf you know any other relevant benchmarks open a PR and I'll add them.\n\n## License\n\nMIT\n",
+  "readmeFilename": "README.md",
+  "_id": "is-my-json-valid@2.12.2",
+  "_shasum": "0d65859318c846ce3a134402fd3fbc504272ccc9",
+  "_resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz",
+  "_from": "is-my-json-valid@>=2.12.2 <3.0.0"
+}
diff --git a/deps/npm/node_modules/is-my-json-valid/require.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/require.js
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/require.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/require.js
diff --git a/deps/npm/node_modules/is-my-json-valid/test/fixtures/cosmic.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/fixtures/cosmic.js
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/fixtures/cosmic.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/fixtures/cosmic.js
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/additionalItems.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/additionalItems.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/additionalItems.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/additionalItems.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/additionalProperties.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/additionalProperties.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/additionalProperties.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/additionalProperties.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/allOf.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/allOf.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/allOf.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/allOf.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/anyOf.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/anyOf.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/anyOf.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/anyOf.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/bignum.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/bignum.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/bignum.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/bignum.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/default.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/default.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/default.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/default.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/definitions.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/definitions.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/definitions.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/definitions.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/dependencies.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/dependencies.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/dependencies.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/dependencies.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/enum.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/enum.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/enum.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/enum.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/format.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/format.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/format.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/format.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/items.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/items.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/items.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/items.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/maxItems.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/maxItems.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/maxItems.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/maxItems.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/maxLength.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/maxLength.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/maxLength.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/maxLength.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/maxProperties.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/maxProperties.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/maxProperties.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/maxProperties.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/maximum.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/maximum.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/maximum.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/maximum.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/minItems.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/minItems.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/minItems.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/minItems.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/minLength.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/minLength.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/minLength.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/minLength.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/minProperties.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/minProperties.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/minProperties.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/minProperties.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/minimum.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/minimum.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/minimum.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/minimum.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/multipleOf.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/multipleOf.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/multipleOf.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/multipleOf.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/not.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/not.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/not.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/not.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/nullAndFormat.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/nullAndFormat.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/nullAndFormat.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/nullAndFormat.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/nullAndObject.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/nullAndObject.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/nullAndObject.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/nullAndObject.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/oneOf.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/oneOf.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/oneOf.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/oneOf.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/pattern.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/pattern.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/pattern.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/pattern.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/patternProperties.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/patternProperties.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/patternProperties.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/patternProperties.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/properties.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/properties.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/properties.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/properties.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/ref.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/ref.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/ref.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/ref.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/refRemote.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/refRemote.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/refRemote.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/refRemote.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/required.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/required.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/required.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/required.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/type.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/type.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/type.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/type.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/uniqueItems.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/uniqueItems.json
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema-draft4/uniqueItems.json
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema-draft4/uniqueItems.json
diff --git a/deps/npm/node_modules/is-my-json-valid/test/json-schema.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema.js
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/json-schema.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/json-schema.js
diff --git a/deps/npm/node_modules/is-my-json-valid/test/misc.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/misc.js
similarity index 100%
rename from deps/npm/node_modules/is-my-json-valid/test/misc.js
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/test/misc.js
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/index.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/index.js
new file mode 100644
index 00000000000000..cc64b902c80b4b
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/index.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = global.Promise || require('pinkie');
diff --git a/deps/npm/node_modules/bluebird/LICENSE b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/license
similarity index 86%
rename from deps/npm/node_modules/bluebird/LICENSE
rename to deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/license
index 4182a1e1cce041..1aeb74fd25e171 100644
--- a/deps/npm/node_modules/bluebird/LICENSE
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/license
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2015 Petka Antonov
+Copyright (c) Vsevolod Strukchinsky <floatdrop@gmail.com> (github.com/floatdrop)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -14,7 +14,7 @@ all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/index.js b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/index.js
new file mode 100644
index 00000000000000..a7e3dc38520a4e
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/index.js
@@ -0,0 +1,276 @@
+'use strict';
+
+var PENDING = 'pending';
+var SETTLED = 'settled';
+var FULFILLED = 'fulfilled';
+var REJECTED = 'rejected';
+var NOOP = function () {};
+
+// async calls
+var asyncSetTimer = typeof setImmediate !== 'undefined' ? setImmediate : setTimeout;
+var asyncQueue = [];
+var asyncTimer;
+
+function asyncFlush() {
+	// run promise callbacks
+	for (var i = 0; i < asyncQueue.length; i++) {
+		asyncQueue[i][0](asyncQueue[i][1]);
+	}
+
+	// reset async asyncQueue
+	asyncQueue = [];
+	asyncTimer = false;
+}
+
+function asyncCall(callback, arg) {
+	asyncQueue.push([callback, arg]);
+
+	if (!asyncTimer) {
+		asyncTimer = true;
+		asyncSetTimer(asyncFlush, 0);
+	}
+}
+
+function invokeResolver(resolver, promise) {
+	function resolvePromise(value) {
+		resolve(promise, value);
+	}
+
+	function rejectPromise(reason) {
+		reject(promise, reason);
+	}
+
+	try {
+		resolver(resolvePromise, rejectPromise);
+	} catch (e) {
+		rejectPromise(e);
+	}
+}
+
+function invokeCallback(subscriber) {
+	var owner = subscriber.owner;
+	var settled = owner._state;
+	var value = owner._data;
+	var callback = subscriber[settled];
+	var promise = subscriber.then;
+
+	if (typeof callback === 'function') {
+		settled = FULFILLED;
+		try {
+			value = callback(value);
+		} catch (e) {
+			reject(promise, e);
+		}
+	}
+
+	if (!handleThenable(promise, value)) {
+		if (settled === FULFILLED) {
+			resolve(promise, value);
+		}
+
+		if (settled === REJECTED) {
+			reject(promise, value);
+		}
+	}
+}
+
+function handleThenable(promise, value) {
+	var resolved;
+
+	try {
+		if (promise === value) {
+			throw new TypeError('A promises callback cannot return that same promise.');
+		}
+
+		if (value && (typeof value === 'function' || typeof value === 'object')) {
+			var then = value.then; // then should be retrived only once
+
+			if (typeof then === 'function') {
+				then.call(value, function (val) {
+					if (!resolved) {
+						resolved = true;
+
+						if (value !== val) {
+							resolve(promise, val);
+						} else {
+							fulfill(promise, val);
+						}
+					}
+				}, function (reason) {
+					if (!resolved) {
+						resolved = true;
+
+						reject(promise, reason);
+					}
+				});
+
+				return true;
+			}
+		}
+	} catch (e) {
+		if (!resolved) {
+			reject(promise, e);
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
+function resolve(promise, value) {
+	if (promise === value || !handleThenable(promise, value)) {
+		fulfill(promise, value);
+	}
+}
+
+function fulfill(promise, value) {
+	if (promise._state === PENDING) {
+		promise._state = SETTLED;
+		promise._data = value;
+
+		asyncCall(publishFulfillment, promise);
+	}
+}
+
+function reject(promise, reason) {
+	if (promise._state === PENDING) {
+		promise._state = SETTLED;
+		promise._data = reason;
+
+		asyncCall(publishRejection, promise);
+	}
+}
+
+function publish(promise) {
+	promise._then = promise._then.forEach(invokeCallback);
+}
+
+function publishFulfillment(promise) {
+	promise._state = FULFILLED;
+	publish(promise);
+}
+
+function publishRejection(promise) {
+	promise._state = REJECTED;
+	publish(promise);
+}
+
+/**
+ * @class
+ */
+function Promise(resolver) {
+	if (typeof resolver !== 'function') {
+		throw new TypeError('Promise resolver ' + resolver + ' is not a function');
+	}
+
+	if (this instanceof Promise === false) {
+		throw new TypeError('Failed to construct \'Promise\': Please use the \'new\' operator, this object constructor cannot be called as a function.');
+	}
+
+	this._then = [];
+
+	invokeResolver(resolver, this);
+}
+
+Promise.prototype = {
+	constructor: Promise,
+
+	_state: PENDING,
+	_then: null,
+	_data: undefined,
+
+	then: function (onFulfillment, onRejection) {
+		var subscriber = {
+			owner: this,
+			then: new this.constructor(NOOP),
+			fulfilled: onFulfillment,
+			rejected: onRejection
+		};
+
+		if (this._state === FULFILLED || this._state === REJECTED) {
+			// already resolved, call callback async
+			asyncCall(invokeCallback, subscriber);
+		} else {
+			// subscribe
+			this._then.push(subscriber);
+		}
+
+		return subscriber.then;
+	},
+
+	'catch': function (onRejection) {
+		return this.then(null, onRejection);
+	}
+};
+
+Promise.all = function (promises) {
+	if (!Array.isArray(promises)) {
+		throw new TypeError('You must pass an array to Promise.all().');
+	}
+
+	return new Promise(function (resolve, reject) {
+		var results = [];
+		var remaining = 0;
+
+		function resolver(index) {
+			remaining++;
+			return function (value) {
+				results[index] = value;
+				if (!--remaining) {
+					resolve(results);
+				}
+			};
+		}
+
+		for (var i = 0, promise; i < promises.length; i++) {
+			promise = promises[i];
+
+			if (promise && typeof promise.then === 'function') {
+				promise.then(resolver(i), reject);
+			} else {
+				results[i] = promise;
+			}
+		}
+
+		if (!remaining) {
+			resolve(results);
+		}
+	});
+};
+
+Promise.race = function (promises) {
+	if (!Array.isArray(promises)) {
+		throw new TypeError('You must pass an array to Promise.race().');
+	}
+
+	return new Promise(function (resolve, reject) {
+		for (var i = 0, promise; i < promises.length; i++) {
+			promise = promises[i];
+
+			if (promise && typeof promise.then === 'function') {
+				promise.then(resolve, reject);
+			} else {
+				resolve(promise);
+			}
+		}
+	});
+};
+
+Promise.resolve = function (value) {
+	if (value && typeof value === 'object' && value.constructor === Promise) {
+		return value;
+	}
+
+	return new Promise(function (resolve) {
+		resolve(value);
+	});
+};
+
+Promise.reject = function (reason) {
+	return new Promise(function (resolve, reject) {
+		reject(reason);
+	});
+};
+
+module.exports = Promise;
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/license b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/license
new file mode 100644
index 00000000000000..1aeb74fd25e171
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/license
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Vsevolod Strukchinsky <floatdrop@gmail.com> (github.com/floatdrop)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/package.json
new file mode 100644
index 00000000000000..3a4c8826948b2b
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/package.json
@@ -0,0 +1,43 @@
+{
+  "name": "pinkie",
+  "version": "1.0.0",
+  "description": "Itty bitty little wittle twinkie pinkie ES6 Promise implementation",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/floatdrop/pinkie.git"
+  },
+  "author": {
+    "name": "Vsevolod Strukchinsky",
+    "email": "floatdrop@gmail.com",
+    "url": "github.com/floatdrop"
+  },
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "scripts": {
+    "test": "mocha"
+  },
+  "files": [
+    "index.js"
+  ],
+  "keywords": [
+    "promise",
+    "es6"
+  ],
+  "dependencies": {},
+  "devDependencies": {
+    "mocha": "*",
+    "promises-aplus-tests": "*"
+  },
+  "readme": "<h1 align=\"center\">\n\t<br>\n\t<img width=\"300\" src=\"https://rawgit.com/floatdrop/pinkie/master/media/logo.png\" alt=\"pinkie\">\n\t<br>\n\t<br>\n</h1>\n\n> Itty bitty little wittle twinkie pinkie [ES6 Promise](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-promise-objects) implementation\n\n[![Build Status](https://travis-ci.org/floatdrop/pinkie.svg?branch=master)](https://travis-ci.org/floatdrop/pinkie)\n\nThere are [tons of Promise implementations](https://github.com/sorrycc/awesome-javascript#control-flow) out there, but all of them focused on browser compatibility and often bloated with functionality.\n\nThis module focused to be exactly Promise specification polyfill (like [native-promise-only](https://github.com/getify/native-promise-only)), but in NodeJS land (it should be browserify-able thou).\n\n\n## Install\n\n```\n$ npm install --save pinkie\n```\n\n\n## Usage\n\n```js\nvar Promise = require('pinkie');\n\nnew Promise(function (resolve, reject) {\n\tgot('google.com', function (err, data) {\n\t\tif (err) {\n\t\t\treturn reject(err);\n\t\t}\n\n\t\tresolve(data);\n\t});\n});\n//=> Promise\n```\n\n\n### API\n\n`pinkie` exports bare [ES6 Promise](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-promise-objects) implementation. In case you forgot:\n\n#### new Promise(executor)\n\nReturns new instance of `Promise`.\n\n##### executor\n\n*Required*  \nType: `function`\n\nFunction with two arguments resolve and reject. The first argument fulfills the promise, the second argument rejects it.\n\n#### pinkie.all(promises)\n\nReturns a promise that resolves when all of the promises in the `promises` Array argument have resolved.\n\n#### pinkie.race(promises)\n\nReturns a promise that resolves or rejects as soon as one of the promises in the `promises` Array resolves or rejects, with the value or reason from that promise.\n\n#### pinkie.reject(reason)\n\nReturns a Promise object that is rejected with the given `reason`.\n\n#### pinkie.resolve(value)\n\nReturns a Promise object that is resolved with the given `value`. If the `value` is a thenable (i.e. has a then method), the returned promise will \"follow\" that thenable, adopting its eventual state; otherwise the returned promise will be fulfilled with the `value`.\n\n## License\n\nMIT © [Vsevolod Strukchinsky](http://github.com/floatdrop)\n",
+  "readmeFilename": "readme.md",
+  "bugs": {
+    "url": "https://github.com/floatdrop/pinkie/issues"
+  },
+  "homepage": "https://github.com/floatdrop/pinkie#readme",
+  "_id": "pinkie@1.0.0",
+  "_shasum": "5a47f28ba1015d0201bda7bf0f358e47bec8c7e4",
+  "_resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz",
+  "_from": "pinkie@>=1.0.0 <2.0.0"
+}
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/readme.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/readme.md
new file mode 100644
index 00000000000000..dbbd014f316f0c
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/readme.md
@@ -0,0 +1,75 @@
+<h1 align="center">
+	<br>
+	<img width="300" src="https://rawgit.com/floatdrop/pinkie/master/media/logo.png" alt="pinkie">
+	<br>
+	<br>
+</h1>
+
+> Itty bitty little wittle twinkie pinkie [ES6 Promise](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-promise-objects) implementation
+
+[![Build Status](https://travis-ci.org/floatdrop/pinkie.svg?branch=master)](https://travis-ci.org/floatdrop/pinkie)
+
+There are [tons of Promise implementations](https://github.com/sorrycc/awesome-javascript#control-flow) out there, but all of them focused on browser compatibility and often bloated with functionality.
+
+This module focused to be exactly Promise specification polyfill (like [native-promise-only](https://github.com/getify/native-promise-only)), but in NodeJS land (it should be browserify-able thou).
+
+
+## Install
+
+```
+$ npm install --save pinkie
+```
+
+
+## Usage
+
+```js
+var Promise = require('pinkie');
+
+new Promise(function (resolve, reject) {
+	got('google.com', function (err, data) {
+		if (err) {
+			return reject(err);
+		}
+
+		resolve(data);
+	});
+});
+//=> Promise
+```
+
+
+### API
+
+`pinkie` exports bare [ES6 Promise](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-promise-objects) implementation. In case you forgot:
+
+#### new Promise(executor)
+
+Returns new instance of `Promise`.
+
+##### executor
+
+*Required*
+Type: `function`
+
+Function with two arguments resolve and reject. The first argument fulfills the promise, the second argument rejects it.
+
+#### pinkie.all(promises)
+
+Returns a promise that resolves when all of the promises in the `promises` Array argument have resolved.
+
+#### pinkie.race(promises)
+
+Returns a promise that resolves or rejects as soon as one of the promises in the `promises` Array resolves or rejects, with the value or reason from that promise.
+
+#### pinkie.reject(reason)
+
+Returns a Promise object that is rejected with the given `reason`.
+
+#### pinkie.resolve(value)
+
+Returns a Promise object that is resolved with the given `value`. If the `value` is a thenable (i.e. has a then method), the returned promise will "follow" that thenable, adopting its eventual state; otherwise the returned promise will be fulfilled with the `value`.
+
+## License
+
+MIT © [Vsevolod Strukchinsky](http://github.com/floatdrop)
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/package.json b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/package.json
new file mode 100644
index 00000000000000..bd4e66f8d191b1
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/package.json
@@ -0,0 +1,46 @@
+{
+  "name": "pinkie-promise",
+  "version": "1.0.0",
+  "description": "ES6 Promise ponyfill",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/floatdrop/pinkie-promise.git"
+  },
+  "author": {
+    "name": "Vsevolod Strukchinsky",
+    "email": "floatdrop@gmail.com",
+    "url": "github.com/floatdrop"
+  },
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "scripts": {
+    "test": "mocha"
+  },
+  "files": [
+    "index.js"
+  ],
+  "keywords": [
+    "promise",
+    "es6",
+    "polyfill",
+    "ponyfill"
+  ],
+  "dependencies": {
+    "pinkie": "^1.0.0"
+  },
+  "devDependencies": {
+    "mocha": "*"
+  },
+  "readme": "# pinkie-promise [![Build Status](https://travis-ci.org/floatdrop/pinkie-promise.svg?branch=master)](https://travis-ci.org/floatdrop/pinkie-promise)\n\n> [ES6 Promise](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-promise-objects) ponyfill\n>\n> Ponyfill: A polyfill that doesn't overwrite the native method\n\nModule exports global Promise object (if available) or [`pinkie`](http://github.com/floatdrop/pinkie) Promise polyfill.\n\n## Install\n\n```\n$ npm install --save pinkie-promise\n```\n\n## Usage\n\n```js\nvar Promise = require('pinkie-promise');\n\nnew Promise(function (resolve) { resolve('unicorns'); });\n//=> Promise { 'unicorns' }\n```\n\n## License\n\nMIT © [Vsevolod Strukchinsky](http://github.com/floatdrop)\n",
+  "readmeFilename": "readme.md",
+  "bugs": {
+    "url": "https://github.com/floatdrop/pinkie-promise/issues"
+  },
+  "homepage": "https://github.com/floatdrop/pinkie-promise#readme",
+  "_id": "pinkie-promise@1.0.0",
+  "_shasum": "d1da67f5482563bb7cf57f286ae2822ecfbf3670",
+  "_resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz",
+  "_from": "pinkie-promise@>=1.0.0 <2.0.0"
+}
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/readme.md b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/readme.md
new file mode 100644
index 00000000000000..bb5e9d2e0f7b72
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/readme.md
@@ -0,0 +1,26 @@
+# pinkie-promise [![Build Status](https://travis-ci.org/floatdrop/pinkie-promise.svg?branch=master)](https://travis-ci.org/floatdrop/pinkie-promise)
+
+> [ES6 Promise](https://people.mozilla.org/~jorendorff/es6-draft.html#sec-promise-objects) ponyfill
+>
+> Ponyfill: A polyfill that doesn't overwrite the native method
+
+Module exports global Promise object (if available) or [`pinkie`](http://github.com/floatdrop/pinkie) Promise polyfill.
+
+## Install
+
+```
+$ npm install --save pinkie-promise
+```
+
+## Usage
+
+```js
+var Promise = require('pinkie-promise');
+
+new Promise(function (resolve) { resolve('unicorns'); });
+//=> Promise { 'unicorns' }
+```
+
+## License
+
+MIT © [Vsevolod Strukchinsky](http://github.com/floatdrop)
diff --git a/deps/npm/node_modules/har-validator/package.json b/deps/npm/node_modules/request/node_modules/har-validator/package.json
similarity index 51%
rename from deps/npm/node_modules/har-validator/package.json
rename to deps/npm/node_modules/request/node_modules/har-validator/package.json
index 0604cfc10c3375..7892afc27fd969 100644
--- a/deps/npm/node_modules/har-validator/package.json
+++ b/deps/npm/node_modules/request/node_modules/har-validator/package.json
@@ -1,110 +1,88 @@
 {
-  "_args": [
-    [
-      "har-validator@^1.6.1",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "har-validator@>=1.6.1 <2.0.0",
-  "_id": "har-validator@1.8.0",
-  "_inCache": true,
-  "_location": "/har-validator",
-  "_nodeVersion": "0.12.2",
-  "_npmUser": {
-    "email": "ahmad@ahmadnassri.com",
-    "name": "ahmadnassri"
-  },
-  "_npmVersion": "2.11.2",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "har-validator",
-    "raw": "har-validator@^1.6.1",
-    "rawSpec": "^1.6.1",
-    "scope": null,
-    "spec": ">=1.6.1 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/request"
-  ],
-  "_resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
-  "_shasum": "d83842b0eb4c435960aeb108a067a3aa94c0eeb2",
-  "_shrinkwrap": null,
-  "_spec": "har-validator@^1.6.1",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
+  "version": "2.0.2",
+  "name": "har-validator",
+  "description": "Extremely fast HTTP Archive (HAR) validator using JSON Schema",
   "author": {
-    "email": "ahmad@ahmadnassri.com",
     "name": "Ahmad Nassri",
+    "email": "ahmad@ahmadnassri.com",
     "url": "https://www.ahmadnassri.com/"
   },
+  "homepage": "https://github.com/ahmadnassri/har-validator",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ahmadnassri/har-validator.git"
+  },
+  "license": "ISC",
+  "main": "lib/index",
   "bin": {
     "har-validator": "bin/har-validator"
   },
+  "keywords": [
+    "har",
+    "http",
+    "archive",
+    "validate",
+    "validator"
+  ],
+  "engines": {
+    "node": ">=0.10"
+  },
+  "files": [
+    "bin",
+    "lib"
+  ],
   "bugs": {
     "url": "https://github.com/ahmadnassri/har-validator/issues"
   },
-  "dependencies": {
-    "bluebird": "^2.9.30",
-    "chalk": "^1.0.0",
-    "commander": "^2.8.1",
-    "is-my-json-valid": "^2.12.0"
-  },
-  "description": "Extremely fast HTTP Archive (HAR) validator using JSON Schema",
-  "devDependencies": {
-    "codeclimate-test-reporter": "0.0.4",
-    "echint": "^1.3.0",
-    "istanbul": "^0.3.15",
-    "mocha": "^2.2.5",
-    "require-directory": "^2.1.1",
-    "should": "^7.0.1",
-    "standard": "^4.3.1"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "d83842b0eb4c435960aeb108a067a3aa94c0eeb2",
-    "tarball": "http://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz"
+  "scripts": {
+    "pretest": "standard && echint",
+    "test": "mocha",
+    "posttest": "npm run coverage",
+    "coverage": "istanbul cover --dir coverage _mocha -- -R dot",
+    "codeclimate": "codeclimate < coverage/lcov.info"
   },
   "echint": {
     "ignore": [
       "coverage/**"
     ]
   },
-  "engines": {
-    "node": ">=0.10"
+  "devDependencies": {
+    "codeclimate-test-reporter": "0.1.1",
+    "echint": "^1.5.0",
+    "istanbul": "^0.3.21",
+    "mocha": "^2.3.3",
+    "require-directory": "^2.1.1",
+    "should": "^7.1.0",
+    "should-promised": "^0.3.1",
+    "standard": "^5.3.1"
+  },
+  "dependencies": {
+    "chalk": "^1.1.1",
+    "commander": "^2.8.1",
+    "is-my-json-valid": "^2.12.2",
+    "pinkie-promise": "^1.0.0"
+  },
+  "gitHead": "46efd17253a81fb70614e904d9e766aa4de4f394",
+  "_id": "har-validator@2.0.2",
+  "_shasum": "233d0fa887b98a4f345969f811a2eec70d97aed7",
+  "_from": "har-validator@>=2.0.2 <2.1.0",
+  "_npmVersion": "2.14.4",
+  "_nodeVersion": "4.1.1",
+  "_npmUser": {
+    "name": "ahmadnassri",
+    "email": "ahmad@ahmadnassri.com"
   },
-  "files": [
-    "bin",
-    "lib"
-  ],
-  "gitHead": "8fd21c30edb23a1fed2d50b934d055d1be3dd7c9",
-  "homepage": "https://github.com/ahmadnassri/har-validator",
-  "keywords": [
-    "archive",
-    "har",
-    "http",
-    "validate",
-    "validator"
-  ],
-  "license": "ISC",
-  "main": "lib/index",
   "maintainers": [
     {
       "name": "ahmadnassri",
       "email": "ahmad@ahmadnassri.com"
     }
   ],
-  "name": "har-validator",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ahmadnassri/har-validator.git"
-  },
-  "scripts": {
-    "codeclimate": "codeclimate < coverage/lcov.info",
-    "coverage": "istanbul cover --dir coverage _mocha -- -R dot",
-    "posttest": "npm run coverage",
-    "pretest": "standard && echint",
-    "test": "mocha"
+  "dist": {
+    "shasum": "233d0fa887b98a4f345969f811a2eec70d97aed7",
+    "tarball": "http://registry.npmjs.org/har-validator/-/har-validator-2.0.2.tgz"
   },
-  "version": "1.8.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.2.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/hawk/.npmignore b/deps/npm/node_modules/request/node_modules/hawk/.npmignore
similarity index 100%
rename from deps/npm/node_modules/hawk/.npmignore
rename to deps/npm/node_modules/request/node_modules/hawk/.npmignore
diff --git a/deps/npm/node_modules/hawk/.travis.yml b/deps/npm/node_modules/request/node_modules/hawk/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/hawk/.travis.yml
rename to deps/npm/node_modules/request/node_modules/hawk/.travis.yml
diff --git a/deps/npm/node_modules/hawk/LICENSE b/deps/npm/node_modules/request/node_modules/hawk/LICENSE
similarity index 100%
rename from deps/npm/node_modules/hawk/LICENSE
rename to deps/npm/node_modules/request/node_modules/hawk/LICENSE
diff --git a/deps/npm/node_modules/hawk/README.md b/deps/npm/node_modules/request/node_modules/hawk/README.md
similarity index 100%
rename from deps/npm/node_modules/hawk/README.md
rename to deps/npm/node_modules/request/node_modules/hawk/README.md
diff --git a/deps/npm/node_modules/hawk/bower.json b/deps/npm/node_modules/request/node_modules/hawk/bower.json
similarity index 100%
rename from deps/npm/node_modules/hawk/bower.json
rename to deps/npm/node_modules/request/node_modules/hawk/bower.json
diff --git a/deps/npm/node_modules/hawk/component.json b/deps/npm/node_modules/request/node_modules/hawk/component.json
similarity index 100%
rename from deps/npm/node_modules/hawk/component.json
rename to deps/npm/node_modules/request/node_modules/hawk/component.json
diff --git a/deps/npm/node_modules/hawk/example/usage.js b/deps/npm/node_modules/request/node_modules/hawk/example/usage.js
similarity index 100%
rename from deps/npm/node_modules/hawk/example/usage.js
rename to deps/npm/node_modules/request/node_modules/hawk/example/usage.js
diff --git a/deps/npm/node_modules/hawk/images/hawk.png b/deps/npm/node_modules/request/node_modules/hawk/images/hawk.png
similarity index 100%
rename from deps/npm/node_modules/hawk/images/hawk.png
rename to deps/npm/node_modules/request/node_modules/hawk/images/hawk.png
diff --git a/deps/npm/node_modules/hawk/images/logo.png b/deps/npm/node_modules/request/node_modules/hawk/images/logo.png
similarity index 100%
rename from deps/npm/node_modules/hawk/images/logo.png
rename to deps/npm/node_modules/request/node_modules/hawk/images/logo.png
diff --git a/deps/npm/node_modules/hawk/lib/browser.js b/deps/npm/node_modules/request/node_modules/hawk/lib/browser.js
similarity index 100%
rename from deps/npm/node_modules/hawk/lib/browser.js
rename to deps/npm/node_modules/request/node_modules/hawk/lib/browser.js
diff --git a/deps/npm/node_modules/hawk/lib/client.js b/deps/npm/node_modules/request/node_modules/hawk/lib/client.js
similarity index 100%
rename from deps/npm/node_modules/hawk/lib/client.js
rename to deps/npm/node_modules/request/node_modules/hawk/lib/client.js
diff --git a/deps/npm/node_modules/hawk/lib/crypto.js b/deps/npm/node_modules/request/node_modules/hawk/lib/crypto.js
similarity index 100%
rename from deps/npm/node_modules/hawk/lib/crypto.js
rename to deps/npm/node_modules/request/node_modules/hawk/lib/crypto.js
diff --git a/deps/npm/node_modules/hawk/lib/index.js b/deps/npm/node_modules/request/node_modules/hawk/lib/index.js
similarity index 100%
rename from deps/npm/node_modules/hawk/lib/index.js
rename to deps/npm/node_modules/request/node_modules/hawk/lib/index.js
diff --git a/deps/npm/node_modules/hawk/lib/server.js b/deps/npm/node_modules/request/node_modules/hawk/lib/server.js
similarity index 100%
rename from deps/npm/node_modules/hawk/lib/server.js
rename to deps/npm/node_modules/request/node_modules/hawk/lib/server.js
diff --git a/deps/npm/node_modules/hawk/lib/utils.js b/deps/npm/node_modules/request/node_modules/hawk/lib/utils.js
similarity index 100%
rename from deps/npm/node_modules/hawk/lib/utils.js
rename to deps/npm/node_modules/request/node_modules/hawk/lib/utils.js
diff --git a/deps/npm/node_modules/boom/.npmignore b/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/.npmignore
similarity index 100%
rename from deps/npm/node_modules/boom/.npmignore
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/.npmignore
diff --git a/deps/npm/node_modules/boom/.travis.yml b/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/boom/.travis.yml
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/.travis.yml
diff --git a/deps/npm/node_modules/boom/CONTRIBUTING.md b/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/CONTRIBUTING.md
similarity index 100%
rename from deps/npm/node_modules/boom/CONTRIBUTING.md
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/CONTRIBUTING.md
diff --git a/deps/npm/node_modules/boom/LICENSE b/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/LICENSE
similarity index 100%
rename from deps/npm/node_modules/boom/LICENSE
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/LICENSE
diff --git a/deps/npm/node_modules/boom/README.md b/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/README.md
similarity index 100%
rename from deps/npm/node_modules/boom/README.md
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/README.md
diff --git a/deps/npm/node_modules/boom/images/boom.png b/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/images/boom.png
similarity index 100%
rename from deps/npm/node_modules/boom/images/boom.png
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/images/boom.png
diff --git a/deps/npm/node_modules/boom/lib/index.js b/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/lib/index.js
similarity index 100%
rename from deps/npm/node_modules/boom/lib/index.js
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/lib/index.js
diff --git a/deps/npm/node_modules/boom/package.json b/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/package.json
similarity index 68%
rename from deps/npm/node_modules/boom/package.json
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/package.json
index 47e26632201779..c9d3f09b64718c 100644
--- a/deps/npm/node_modules/boom/package.json
+++ b/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/package.json
@@ -1,66 +1,45 @@
 {
-  "_args": [
-    [
-      "boom@^2.8.x",
-      "/Users/rebecca/code/npm/node_modules/hawk"
-    ]
-  ],
-  "_from": "boom@>=2.8.0 <3.0.0",
-  "_id": "boom@2.9.0",
-  "_inCache": true,
-  "_location": "/boom",
-  "_nodeVersion": "0.10.40",
-  "_npmUser": {
-    "email": "arbretz@gmail.com",
-    "name": "arb"
-  },
-  "_npmVersion": "2.11.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "boom",
-    "raw": "boom@^2.8.x",
-    "rawSpec": "^2.8.x",
-    "scope": null,
-    "spec": ">=2.8.0 <3.0.0",
-    "type": "range"
+  "name": "boom",
+  "description": "HTTP-friendly error objects",
+  "version": "2.9.0",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/hapijs/boom.git"
   },
-  "_requiredBy": [
-    "/cryptiles",
-    "/hawk"
+  "main": "lib/index.js",
+  "keywords": [
+    "error",
+    "http"
   ],
-  "_resolved": "https://registry.npmjs.org/boom/-/boom-2.9.0.tgz",
-  "_shasum": "a54b7fd2fee477d351bf9e371680cbea67f12715",
-  "_shrinkwrap": null,
-  "_spec": "boom@^2.8.x",
-  "_where": "/Users/rebecca/code/npm/node_modules/hawk",
-  "bugs": {
-    "url": "https://github.com/hapijs/boom/issues"
+  "engines": {
+    "node": ">=0.10.40"
   },
   "dependencies": {
     "hoek": "2.x.x"
   },
-  "description": "HTTP-friendly error objects",
   "devDependencies": {
     "code": "1.x.x",
     "lab": "5.x.x"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "a54b7fd2fee477d351bf9e371680cbea67f12715",
-    "tarball": "http://registry.npmjs.org/boom/-/boom-2.9.0.tgz"
-  },
-  "engines": {
-    "node": ">=0.10.40"
+  "scripts": {
+    "test": "lab -a code -t 100 -L",
+    "test-cov-html": "lab -a code -r html -o coverage.html -L"
   },
+  "license": "BSD-3-Clause",
   "gitHead": "2ffee0e9d9868140911d30c7acfd7925e534623e",
+  "bugs": {
+    "url": "https://github.com/hapijs/boom/issues"
+  },
   "homepage": "https://github.com/hapijs/boom#readme",
-  "installable": true,
-  "keywords": [
-    "error",
-    "http"
-  ],
-  "license": "BSD-3-Clause",
-  "main": "lib/index.js",
+  "_id": "boom@2.9.0",
+  "_shasum": "a54b7fd2fee477d351bf9e371680cbea67f12715",
+  "_from": "boom@>=2.8.0 <3.0.0",
+  "_npmVersion": "2.11.1",
+  "_nodeVersion": "0.10.40",
+  "_npmUser": {
+    "name": "arb",
+    "email": "arbretz@gmail.com"
+  },
   "maintainers": [
     {
       "name": "hueniverse",
@@ -75,15 +54,11 @@
       "email": "arbretz@gmail.com"
     }
   ],
-  "name": "boom",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/hapijs/boom.git"
-  },
-  "scripts": {
-    "test": "lab -a code -t 100 -L",
-    "test-cov-html": "lab -a code -r html -o coverage.html -L"
+  "dist": {
+    "shasum": "a54b7fd2fee477d351bf9e371680cbea67f12715",
+    "tarball": "http://registry.npmjs.org/boom/-/boom-2.9.0.tgz"
   },
-  "version": "2.9.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/boom/-/boom-2.9.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/boom/test/index.js b/deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/test/index.js
similarity index 100%
rename from deps/npm/node_modules/boom/test/index.js
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/boom/test/index.js
diff --git a/deps/npm/node_modules/cryptiles/.npmignore b/deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/.npmignore
similarity index 100%
rename from deps/npm/node_modules/cryptiles/.npmignore
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/.npmignore
diff --git a/deps/npm/node_modules/cryptiles/.travis.yml b/deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/cryptiles/.travis.yml
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/.travis.yml
diff --git a/deps/npm/node_modules/cryptiles/LICENSE b/deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/LICENSE
similarity index 100%
rename from deps/npm/node_modules/cryptiles/LICENSE
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/LICENSE
diff --git a/deps/npm/node_modules/cryptiles/README.md b/deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/README.md
similarity index 100%
rename from deps/npm/node_modules/cryptiles/README.md
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/README.md
diff --git a/deps/npm/node_modules/cryptiles/lib/index.js b/deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/lib/index.js
similarity index 100%
rename from deps/npm/node_modules/cryptiles/lib/index.js
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/lib/index.js
diff --git a/deps/npm/node_modules/cryptiles/package.json b/deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/package.json
similarity index 68%
rename from deps/npm/node_modules/cryptiles/package.json
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/package.json
index 75d997644a6fe9..c65fd094047c73 100644
--- a/deps/npm/node_modules/cryptiles/package.json
+++ b/deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/package.json
@@ -1,67 +1,50 @@
 {
-  "_args": [
-    [
-      "cryptiles@2.x.x",
-      "/Users/rebecca/code/npm/node_modules/hawk"
-    ]
-  ],
-  "_from": "cryptiles@>=2.0.0 <3.0.0",
-  "_id": "cryptiles@2.0.5",
-  "_inCache": true,
-  "_location": "/cryptiles",
-  "_nodeVersion": "4.0.0",
-  "_npmUser": {
-    "email": "eran@hammer.io",
-    "name": "hueniverse"
-  },
-  "_npmVersion": "2.14.2",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "cryptiles",
-    "raw": "cryptiles@2.x.x",
-    "rawSpec": "2.x.x",
-    "scope": null,
-    "spec": ">=2.0.0 <3.0.0",
-    "type": "range"
+  "name": "cryptiles",
+  "description": "General purpose crypto utilities",
+  "version": "2.0.5",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/hapijs/cryptiles.git"
   },
-  "_requiredBy": [
-    "/follow/hawk",
-    "/hawk"
+  "main": "lib/index.js",
+  "keywords": [
+    "cryptography",
+    "security",
+    "utilites"
   ],
-  "_resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-  "_shasum": "3bdfecdc608147c1c67202fa291e7dca59eaa3b8",
-  "_shrinkwrap": null,
-  "_spec": "cryptiles@2.x.x",
-  "_where": "/Users/rebecca/code/npm/node_modules/hawk",
-  "bugs": {
-    "url": "https://github.com/hapijs/cryptiles/issues"
+  "engines": {
+    "node": ">=0.10.40"
   },
   "dependencies": {
     "boom": "2.x.x"
   },
-  "description": "General purpose crypto utilities",
   "devDependencies": {
     "code": "1.x.x",
     "lab": "5.x.x"
   },
-  "directories": {},
+  "scripts": {
+    "test": "lab -a code -t 100 -L",
+    "test-cov-html": "lab -a code -r html -o coverage.html"
+  },
+  "license": "BSD-3-Clause",
+  "gitHead": "9bc5a852f01cd51e615814e1cb255fe2df810649",
+  "bugs": {
+    "url": "https://github.com/hapijs/cryptiles/issues"
+  },
+  "homepage": "https://github.com/hapijs/cryptiles#readme",
+  "_id": "cryptiles@2.0.5",
+  "_shasum": "3bdfecdc608147c1c67202fa291e7dca59eaa3b8",
+  "_from": "cryptiles@>=2.0.0 <3.0.0",
+  "_npmVersion": "2.14.2",
+  "_nodeVersion": "4.0.0",
+  "_npmUser": {
+    "name": "hueniverse",
+    "email": "eran@hammer.io"
+  },
   "dist": {
     "shasum": "3bdfecdc608147c1c67202fa291e7dca59eaa3b8",
     "tarball": "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
   },
-  "engines": {
-    "node": ">=0.10.40"
-  },
-  "gitHead": "9bc5a852f01cd51e615814e1cb255fe2df810649",
-  "homepage": "https://github.com/hapijs/cryptiles#readme",
-  "installable": true,
-  "keywords": [
-    "cryptography",
-    "security",
-    "utilites"
-  ],
-  "license": "BSD-3-Clause",
-  "main": "lib/index.js",
   "maintainers": [
     {
       "name": "hueniverse",
@@ -72,15 +55,7 @@
       "email": "ceejceej@gmail.com"
     }
   ],
-  "name": "cryptiles",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/hapijs/cryptiles.git"
-  },
-  "scripts": {
-    "test": "lab -a code -t 100 -L",
-    "test-cov-html": "lab -a code -r html -o coverage.html"
-  },
-  "version": "2.0.5"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/cryptiles/test/index.js b/deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/test/index.js
similarity index 100%
rename from deps/npm/node_modules/cryptiles/test/index.js
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/cryptiles/test/index.js
diff --git a/deps/npm/node_modules/hoek/.npmignore b/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/.npmignore
similarity index 100%
rename from deps/npm/node_modules/hoek/.npmignore
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/.npmignore
diff --git a/deps/npm/node_modules/hoek/.travis.yml b/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/hoek/.travis.yml
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/.travis.yml
diff --git a/deps/npm/node_modules/hoek/CONTRIBUTING.md b/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/CONTRIBUTING.md
similarity index 100%
rename from deps/npm/node_modules/hoek/CONTRIBUTING.md
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/CONTRIBUTING.md
diff --git a/deps/npm/node_modules/hoek/LICENSE b/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/LICENSE
similarity index 100%
rename from deps/npm/node_modules/hoek/LICENSE
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/LICENSE
diff --git a/deps/npm/node_modules/hoek/README.md b/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/README.md
similarity index 100%
rename from deps/npm/node_modules/hoek/README.md
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/README.md
diff --git a/deps/npm/node_modules/hoek/images/hoek.png b/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/images/hoek.png
similarity index 100%
rename from deps/npm/node_modules/hoek/images/hoek.png
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/images/hoek.png
diff --git a/deps/npm/node_modules/hoek/lib/escape.js b/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/lib/escape.js
similarity index 100%
rename from deps/npm/node_modules/hoek/lib/escape.js
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/lib/escape.js
diff --git a/deps/npm/node_modules/hoek/lib/index.js b/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/lib/index.js
similarity index 100%
rename from deps/npm/node_modules/hoek/lib/index.js
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/lib/index.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/package.json b/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/package.json
new file mode 100644
index 00000000000000..6e76778c7aa5f3
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/package.json
@@ -0,0 +1,36 @@
+{
+  "name": "hoek",
+  "description": "General purpose node utilities",
+  "version": "2.16.3",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/hapijs/hoek.git"
+  },
+  "main": "lib/index.js",
+  "keywords": [
+    "utilities"
+  ],
+  "engines": {
+    "node": ">=0.10.40"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "code": "1.x.x",
+    "lab": "5.x.x"
+  },
+  "scripts": {
+    "test": "lab -a code -t 100 -L",
+    "test-cov-html": "lab -a code -t 100 -L -r html -o coverage.html"
+  },
+  "license": "BSD-3-Clause",
+  "readme": "![hoek Logo](https://raw.github.com/hapijs/hoek/master/images/hoek.png)\n\nUtility methods for the hapi ecosystem. This module is not intended to solve every problem for everyone, but rather as a central place to store hapi-specific methods. If you're looking for a general purpose utility module, check out [lodash](https://github.com/lodash/lodash) or [underscore](https://github.com/jashkenas/underscore).\n\n[![Build Status](https://secure.travis-ci.org/hapijs/hoek.svg)](http://travis-ci.org/hapijs/hoek)\n\nLead Maintainer: [Nathan LaFreniere](https://github.com/nlf)\n\n# Table of Contents\n\n* [Introduction](#introduction \"Introduction\")\n* [Object](#object \"Object\")\n  * [clone](#cloneobj \"clone\")\n  * [cloneWithShallow](#clonewithshallowobj-keys \"cloneWithShallow\")\n  * [merge](#mergetarget-source-isnulloverride-ismergearrays \"merge\")\n  * [applyToDefaults](#applytodefaultsdefaults-options-isnulloverride \"applyToDefaults\")\n  * [applyToDefaultsWithShallow](#applytodefaultswithshallowdefaults-options-keys \"applyToDefaultsWithShallow\")\n  * [deepEqual](#deepequala-b \"deepEqual\")\n  * [unique](#uniquearray-key \"unique\")\n  * [mapToObject](#maptoobjectarray-key \"mapToObject\")\n  * [intersect](#intersectarray1-array2 \"intersect\")\n  * [contain](#containref-values-options \"contain\")\n  * [flatten](#flattenarray-target \"flatten\")\n  * [reach](#reachobj-chain-options \"reach\")\n  * [reachTemplate](#reachtemplateobj-template-options \"reachTemplate\")\n  * [transform](#transformobj-transform-options \"transform\")\n  * [shallow](#shallowobj \"shallow\")\n  * [stringify](#stringifyobj \"stringify\")\n* [Timer](#timer \"Timer\")\n* [Bench](#bench \"Bench\")\n* [Binary Encoding/Decoding](#binary-encodingdecoding \"Binary Encoding/Decoding\")\n  * [base64urlEncode](#base64urlencodevalue \"binary64urlEncode\")\n  * [base64urlDecode](#base64urldecodevalue \"binary64urlDecode\")\n* [Escaping Characters](#escaping-characters \"Escaping Characters\")\n  * [escapeHtml](#escapehtmlstring \"escapeHtml\")\n  * [escapeHeaderAttribute](#escapeheaderattributeattribute \"escapeHeaderAttribute\")\n  * [escapeRegex](#escaperegexstring \"escapeRegex\")\n* [Errors](#errors \"Errors\")\n  * [assert](#assertcondition-message \"assert\")\n  * [abort](#abortmessage \"abort\")\n  * [displayStack](#displaystackslice \"displayStack\")\n  * [callStack](#callstackslice \"callStack\")\n* [Function](#function \"Function\")\n  * [nextTick](#nexttickfn \"nextTick\")\n  * [once](#oncefn \"once\")\n  * [ignore](#ignore \"ignore\")\n* [Miscellaneous](#miscellaneous \"Miscellaneous\")\n  * [uniqueFilename](#uniquefilenamepath-extension \"uniqueFilename\")\n  * [isAbsolutePath](#isabsolutepathpath-platform \"isAbsolutePath\")\n  * [isInteger](#isintegervalue \"isInteger\")\n\n\n\n# Introduction\n\nThe *Hoek* library contains some common functions used within the hapi ecosystem. It comes with useful methods for Arrays (clone, merge, applyToDefaults), Objects (removeKeys, copy), Asserting and more.\n\nFor example, to use Hoek to set configuration with default options:\n```javascript\nvar Hoek = require('hoek');\n\nvar default = {url : \"www.github.com\", port : \"8000\", debug : true};\n\nvar config = Hoek.applyToDefaults(default, {port : \"3000\", admin : true});\n\n// In this case, config would be { url: 'www.github.com', port: '3000', debug: true, admin: true }\n```\n\nUnder each of the sections (such as Array), there are subsections which correspond to Hoek methods. Each subsection will explain how to use the corresponding method. In each js excerpt below, the `var Hoek = require('hoek');` is omitted for brevity.\n\n## Object\n\nHoek provides several helpful methods for objects and arrays.\n\n### clone(obj)\n\nThis method is used to clone an object or an array. A *deep copy* is made (duplicates everything, including values that are objects, as well as non-enumerable properties).\n\n```javascript\n\nvar nestedObj = {\n        w: /^something$/ig,\n        x: {\n            a: [1, 2, 3],\n            b: 123456,\n            c: new Date()\n        },\n        y: 'y',\n        z: new Date()\n    };\n\nvar copy = Hoek.clone(nestedObj);\n\ncopy.x.b = 100;\n\nconsole.log(copy.y);        // results in 'y'\nconsole.log(nestedObj.x.b); // results in 123456\nconsole.log(copy.x.b);      // results in 100\n```\n\n### cloneWithShallow(obj, keys)\nkeys is an array of key names to shallow copy\n\nThis method is also used to clone an object or array, however any keys listed in the `keys` array are shallow copied while those not listed are deep copied.\n\n```javascript\n\nvar nestedObj = {\n        w: /^something$/ig,\n        x: {\n            a: [1, 2, 3],\n            b: 123456,\n            c: new Date()\n        },\n        y: 'y',\n        z: new Date()\n    };\n\nvar copy = Hoek.cloneWithShallow(nestedObj, ['x']);\n\ncopy.x.b = 100;\n\nconsole.log(copy.y);        // results in 'y'\nconsole.log(nestedObj.x.b); // results in 100\nconsole.log(copy.x.b);      // results in 100\n```\n\n### merge(target, source, isNullOverride, isMergeArrays)\nisNullOverride, isMergeArrays default to true\n\nMerge all the properties of source into target, source wins in conflict, and by default null and undefined from source are applied.\nMerge is destructive where the target is modified. For non destructive merge, use `applyToDefaults`.\n\n\n```javascript\n\nvar target = {a: 1, b : 2};\nvar source = {a: 0, c: 5};\nvar source2 = {a: null, c: 5};\n\nHoek.merge(target, source);         // results in {a: 0, b: 2, c: 5}\nHoek.merge(target, source2);        // results in {a: null, b: 2, c: 5}\nHoek.merge(target, source2, false); // results in {a: 1, b: 2, c: 5}\n\nvar targetArray = [1, 2, 3];\nvar sourceArray = [4, 5];\n\nHoek.merge(targetArray, sourceArray);              // results in [1, 2, 3, 4, 5]\nHoek.merge(targetArray, sourceArray, true, false); // results in [4, 5]\n```\n\n### applyToDefaults(defaults, options, isNullOverride)\nisNullOverride defaults to false\n\nApply options to a copy of the defaults\n\n```javascript\n\nvar defaults = { host: \"localhost\", port: 8000 };\nvar options = { port: 8080 };\n\nvar config = Hoek.applyToDefaults(defaults, options); // results in { host: \"localhost\", port: 8080 }\n```\n\nApply options with a null value to a copy of the defaults\n\n```javascript\n\nvar defaults = { host: \"localhost\", port: 8000 };\nvar options = { host: null, port: 8080 };\n\nvar config = Hoek.applyToDefaults(defaults, options, true); // results in { host: null, port: 8080 }\n```\n\n### applyToDefaultsWithShallow(defaults, options, keys)\nkeys is an array of key names to shallow copy\n\nApply options to a copy of the defaults. Keys specified in the last parameter are shallow copied from options instead of merged.\n\n```javascript\n\nvar defaults = {\n        server: {\n            host: \"localhost\",\n            port: 8000\n        },\n        name: 'example'\n    };\n\nvar options = { server: { port: 8080 } };\n\nvar config = Hoek.applyToDefaultsWithShallow(defaults, options, ['server']); // results in { server: { port: 8080 }, name: 'example' }\n```\n\n### deepEqual(b, a, [options])\n\nPerforms a deep comparison of the two values including support for circular dependencies, prototype, and properties. To skip prototype comparisons, use `options.prototype = false`\n\n```javascript\nHoek.deepEqual({ a: [1, 2], b: 'string', c: { d: true } }, { a: [1, 2], b: 'string', c: { d: true } }); //results in true\nHoek.deepEqual(Object.create(null), {}, { prototype: false }); //results in true\nHoek.deepEqual(Object.create(null), {}); //results in false\n```\n\n### unique(array, key)\n\nRemove duplicate items from Array\n\n```javascript\n\nvar array = [1, 2, 2, 3, 3, 4, 5, 6];\n\nvar newArray = Hoek.unique(array);    // results in [1,2,3,4,5,6]\n\narray = [{id: 1}, {id: 1}, {id: 2}];\n\nnewArray = Hoek.unique(array, \"id\");  // results in [{id: 1}, {id: 2}]\n```\n\n### mapToObject(array, key)\n\nConvert an Array into an Object\n\n```javascript\n\nvar array = [1,2,3];\nvar newObject = Hoek.mapToObject(array);   // results in [{\"1\": true}, {\"2\": true}, {\"3\": true}]\n\narray = [{id: 1}, {id: 2}];\nnewObject = Hoek.mapToObject(array, \"id\"); // results in [{\"id\": 1}, {\"id\": 2}]\n```\n\n### intersect(array1, array2)\n\nFind the common unique items in two arrays\n\n```javascript\n\nvar array1 = [1, 2, 3];\nvar array2 = [1, 4, 5];\n\nvar newArray = Hoek.intersect(array1, array2); // results in [1]\n```\n\n### contain(ref, values, [options])\n\nTests if the reference value contains the provided values where:\n- `ref` - the reference string, array, or object.\n- `values` - a single or array of values to find within the `ref` value. If `ref` is an object, `values` can be a key name,\n  an array of key names, or an object with key-value pairs to compare.\n- `options` - an optional object with the following optional settings:\n    - `deep` - if `true`, performed a deep comparison of the values.\n    - `once` - if `true`, allows only one occurrence of each value.\n    - `only` - if `true`, does not allow values not explicitly listed.\n    - `part` - if `true`, allows partial match of the values (at least one must always match).\n\nNote: comparing a string to overlapping values will result in failed comparison (e.g. `contain('abc', ['ab', 'bc'])`).\nAlso, if an object key's value does not match the provided value, `false` is returned even when `part` is specified.\n\n```javascript\nHoek.contain('aaa', 'a', { only: true });\t\t\t\t\t\t\t// true\nHoek.contain([{ a: 1 }], [{ a: 1 }], { deep: true });\t\t\t\t// true\nHoek.contain([1, 2, 2], [1, 2], { once: true });\t\t\t\t\t// false\nHoek.contain({ a: 1, b: 2, c: 3 }, { a: 1, d: 4 }, { part: true }); // true\n```\n\n### flatten(array, [target])\n\nFlatten an array\n\n```javascript\n\nvar array = [1, [2, 3]];\n\nvar flattenedArray = Hoek.flatten(array); // results in [1, 2, 3]\n\narray = [1, [2, 3]];\ntarget = [4, [5]];\n\nflattenedArray = Hoek.flatten(array, target); // results in [4, [5], 1, 2, 3]\n```\n\n### reach(obj, chain, [options])\n\nConverts an object key chain string to reference\n\n- `options` - optional settings\n    - `separator` - string to split chain path on, defaults to '.'\n    - `default` - value to return if the path or value is not present, default is `undefined`\n    - `strict` - if `true`, will throw an error on missing member, default is `false`\n    - `functions` - if `true` allow traversing functions for properties. `false` will throw an error if a function is part of the chain.\n\nA chain including negative numbers will work like negative indices on an\narray.\n\nIf chain is `null`, `undefined` or `false`, the object itself will be returned.\n\n```javascript\n\nvar chain = 'a.b.c';\nvar obj = {a : {b : { c : 1}}};\n\nHoek.reach(obj, chain); // returns 1\n\nvar chain = 'a.b.-1';\nvar obj = {a : {b : [2,3,6]}};\n\nHoek.reach(obj, chain); // returns 6\n```\n\n### reachTemplate(obj, template, [options])\n\nReplaces string parameters (`{name}`) with their corresponding object key values by applying the\n(`reach()`)[#reachobj-chain-options] method where:\n\n- `obj` - the context object used for key lookup.\n- `template` - a string containing `{}` parameters.\n- `options` - optional (`reach()`)[#reachobj-chain-options] options.\n\n```javascript\n\nvar chain = 'a.b.c';\nvar obj = {a : {b : { c : 1}}};\n\nHoek.reachTemplate(obj, '1+{a.b.c}=2'); // returns '1+1=2'\n```\n\n### transform(obj, transform, [options])\n\nTransforms an existing object into a new one based on the supplied `obj` and `transform` map. `options` are the same as the `reach` options. The first argument can also be an array of objects. In that case the method will return an array of transformed objects.\n\n```javascript\nvar source = {\n    address: {\n        one: '123 main street',\n        two: 'PO Box 1234'\n    },\n    title: 'Warehouse',\n    state: 'CA'\n};\n\nvar result = Hoek.transform(source, {\n    'person.address.lineOne': 'address.one',\n    'person.address.lineTwo': 'address.two',\n    'title': 'title',\n    'person.address.region': 'state'\n});\n// Results in\n// {\n//     person: {\n//         address: {\n//             lineOne: '123 main street',\n//             lineTwo: 'PO Box 1234',\n//             region: 'CA'\n//         }\n//     },\n//     title: 'Warehouse'\n// }\n```\n\n### shallow(obj)\n\nPerforms a shallow copy by copying the references of all the top level children where:\n- `obj` - the object to be copied.\n\n```javascript\nvar shallow = Hoek.shallow({ a: { b: 1 } });\n```\n\n### stringify(obj)\n\nConverts an object to string using the built-in `JSON.stringify()` method with the difference that any errors are caught\nand reported back in the form of the returned string. Used as a shortcut for displaying information to the console (e.g. in\nerror message) without the need to worry about invalid conversion.\n\n```javascript\nvar a = {};\na.b = a;\nHoek.stringify(a);\t\t// Returns '[Cannot display object: Converting circular structure to JSON]'\n```\n\n# Timer\n\nA Timer object. Initializing a new timer object sets the ts to the number of milliseconds elapsed since 1 January 1970 00:00:00 UTC.\n\n```javascript\n\nvar timerObj = new Hoek.Timer();\nconsole.log(\"Time is now: \" + timerObj.ts);\nconsole.log(\"Elapsed time from initialization: \" + timerObj.elapsed() + 'milliseconds');\n```\n\n\n# Bench\n\nSame as Timer with the exception that `ts` stores the internal node clock which is not related to `Date.now()` and cannot be used to display\nhuman-readable timestamps. More accurate for benchmarking or internal timers.\n\n# Binary Encoding/Decoding\n\n### base64urlEncode(value)\n\nEncodes value in Base64 or URL encoding\n\n### base64urlDecode(value)\n\nDecodes data in Base64 or URL encoding.\n# Escaping Characters\n\nHoek provides convenient methods for escaping html characters. The escaped characters are as followed:\n\n```javascript\n\ninternals.htmlEscaped = {\n    '&': '&amp;',\n    '<': '&lt;',\n    '>': '&gt;',\n    '\"': '&quot;',\n    \"'\": '&#x27;',\n    '`': '&#x60;'\n};\n```\n\n### escapeHtml(string)\n\n```javascript\n\nvar string = '<html> hey </html>';\nvar escapedString = Hoek.escapeHtml(string); // returns &lt;html&gt; hey &lt;/html&gt;\n```\n\n### escapeHeaderAttribute(attribute)\n\nEscape attribute value for use in HTTP header\n\n```javascript\n\nvar a = Hoek.escapeHeaderAttribute('I said \"go w\\\\o me\"');  //returns I said \\\"go w\\\\o me\\\"\n```\n\n\n### escapeRegex(string)\n\nEscape string for Regex construction\n\n```javascript\n\nvar a = Hoek.escapeRegex('4^f$s.4*5+-_?%=#!:@|~\\\\/`\"(>)[<]d{}s,');  // returns 4\\^f\\$s\\.4\\*5\\+\\-_\\?%\\=#\\!\\:@\\|~\\\\\\/`\"\\(>\\)\\[<\\]d\\{\\}s\\,\n```\n\n# Errors\n\n### assert(condition, message)\n\n```javascript\n\nvar a = 1, b = 2;\n\nHoek.assert(a === b, 'a should equal b');  // Throws 'a should equal b'\n```\n\nNote that you may also pass an already created Error object as the second parameter, and `assert` will throw that object.\n\n```javascript\n\nvar a = 1, b = 2;\n\nHoek.assert(a === b, new Error('a should equal b')); // Throws the given error object\n```\n\n### abort(message)\n\nFirst checks if `process.env.NODE_ENV === 'test'`, and if so, throws error message. Otherwise,\ndisplays most recent stack and then exits process.\n\n\n\n### displayStack(slice)\n\nDisplays the trace stack\n\n```javascript\n\nvar stack = Hoek.displayStack();\nconsole.log(stack); // returns something like:\n\n[ 'null (/Users/user/Desktop/hoek/test.js:4:18)',\n  'Module._compile (module.js:449:26)',\n  'Module._extensions..js (module.js:467:10)',\n  'Module.load (module.js:356:32)',\n  'Module._load (module.js:312:12)',\n  'Module.runMain (module.js:492:10)',\n  'startup.processNextTick.process._tickCallback (node.js:244:9)' ]\n```\n\n### callStack(slice)\n\nReturns a trace stack array.\n\n```javascript\n\nvar stack = Hoek.callStack();\nconsole.log(stack);  // returns something like:\n\n[ [ '/Users/user/Desktop/hoek/test.js', 4, 18, null, false ],\n  [ 'module.js', 449, 26, 'Module._compile', false ],\n  [ 'module.js', 467, 10, 'Module._extensions..js', false ],\n  [ 'module.js', 356, 32, 'Module.load', false ],\n  [ 'module.js', 312, 12, 'Module._load', false ],\n  [ 'module.js', 492, 10, 'Module.runMain', false ],\n  [ 'node.js',\n    244,\n    9,\n    'startup.processNextTick.process._tickCallback',\n    false ] ]\n```\n\n## Function\n\n### nextTick(fn)\n\nReturns a new function that wraps `fn` in `process.nextTick`.\n\n```javascript\n\nvar myFn = function () {\n    console.log('Do this later');\n};\n\nvar nextFn = Hoek.nextTick(myFn);\n\nnextFn();\nconsole.log('Do this first');\n\n// Results in:\n//\n// Do this first\n// Do this later\n```\n\n### once(fn)\n\nReturns a new function that can be run multiple times, but makes sure `fn` is only run once.\n\n```javascript\n\nvar myFn = function () {\n    console.log('Ran myFn');\n};\n\nvar onceFn = Hoek.once(myFn);\nonceFn(); // results in \"Ran myFn\"\nonceFn(); // results in undefined\n```\n\n### ignore\n\nA simple no-op function. It does nothing at all.\n\n## Miscellaneous\n\n### uniqueFilename(path, extension)\n`path` to prepend with the randomly generated file name. `extension` is the optional file extension, defaults to `''`.\n\nReturns a randomly generated file name at the specified `path`. The result is a fully resolved path to a file.\n\n```javascript\nvar result = Hoek.uniqueFilename('./test/modules', 'txt'); // results in \"full/path/test/modules/{random}.txt\"\n```\n\n### isAbsolutePath(path, [platform])\n\nDetermines whether `path` is an absolute path. Returns `true` or `false`.\n\n- `path` - A file path to test for whether it is absolute or not.\n- `platform` - An optional parameter used for specifying the platform. Defaults to `process.platform`.\n\n### isInteger(value)\n\nCheck `value` to see if it is an integer.  Returns true/false.\n\n```javascript\nvar result = Hoek.isInteger('23')\n```\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/hapijs/hoek/issues"
+  },
+  "homepage": "https://github.com/hapijs/hoek#readme",
+  "_id": "hoek@2.16.3",
+  "_shasum": "20bb7403d3cea398e91dc4710a8ff1b8274a25ed",
+  "_resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+  "_from": "hoek@>=2.0.0 <3.0.0"
+}
diff --git a/deps/npm/node_modules/hoek/test/escaper.js b/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/escaper.js
similarity index 100%
rename from deps/npm/node_modules/hoek/test/escaper.js
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/escaper.js
diff --git a/deps/npm/node_modules/hoek/test/index.js b/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/index.js
similarity index 100%
rename from deps/npm/node_modules/hoek/test/index.js
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/index.js
diff --git a/deps/npm/node_modules/hoek/test/modules/ignore.txt b/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/ignore.txt
similarity index 100%
rename from deps/npm/node_modules/hoek/test/modules/ignore.txt
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/ignore.txt
diff --git a/deps/npm/node_modules/hoek/test/modules/test1.js b/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test1.js
similarity index 100%
rename from deps/npm/node_modules/hoek/test/modules/test1.js
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test1.js
diff --git a/deps/npm/node_modules/hoek/test/modules/test2.js b/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test2.js
similarity index 100%
rename from deps/npm/node_modules/hoek/test/modules/test2.js
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test2.js
diff --git a/deps/npm/node_modules/hoek/test/modules/test3.js b/deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test3.js
similarity index 100%
rename from deps/npm/node_modules/hoek/test/modules/test3.js
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test3.js
diff --git a/deps/npm/node_modules/sntp/.npmignore b/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/.npmignore
similarity index 100%
rename from deps/npm/node_modules/sntp/.npmignore
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/.npmignore
diff --git a/deps/npm/node_modules/sntp/.travis.yml b/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/sntp/.travis.yml
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/.travis.yml
diff --git a/deps/npm/node_modules/sntp/LICENSE b/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/LICENSE
similarity index 100%
rename from deps/npm/node_modules/sntp/LICENSE
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/LICENSE
diff --git a/deps/npm/node_modules/sntp/Makefile b/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/Makefile
similarity index 100%
rename from deps/npm/node_modules/sntp/Makefile
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/Makefile
diff --git a/deps/npm/node_modules/sntp/README.md b/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/README.md
similarity index 100%
rename from deps/npm/node_modules/sntp/README.md
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/README.md
diff --git a/deps/npm/node_modules/sntp/examples/offset.js b/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/examples/offset.js
similarity index 100%
rename from deps/npm/node_modules/sntp/examples/offset.js
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/examples/offset.js
diff --git a/deps/npm/node_modules/sntp/examples/time.js b/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/examples/time.js
similarity index 100%
rename from deps/npm/node_modules/sntp/examples/time.js
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/examples/time.js
diff --git a/deps/npm/node_modules/sntp/index.js b/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/index.js
similarity index 100%
rename from deps/npm/node_modules/sntp/index.js
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/index.js
diff --git a/deps/npm/node_modules/sntp/lib/index.js b/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/lib/index.js
similarity index 100%
rename from deps/npm/node_modules/sntp/lib/index.js
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/lib/index.js
diff --git a/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/package.json b/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/package.json
new file mode 100644
index 00000000000000..9ae1b926efae26
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/package.json
@@ -0,0 +1,49 @@
+{
+  "name": "sntp",
+  "description": "SNTP Client",
+  "version": "1.0.9",
+  "author": {
+    "name": "Eran Hammer",
+    "email": "eran@hammer.io",
+    "url": "http://hueniverse.com"
+  },
+  "contributors": [],
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/hueniverse/sntp.git"
+  },
+  "main": "index",
+  "keywords": [
+    "sntp",
+    "ntp",
+    "time"
+  ],
+  "engines": {
+    "node": ">=0.8.0"
+  },
+  "dependencies": {
+    "hoek": "2.x.x"
+  },
+  "devDependencies": {
+    "lab": "4.x.x"
+  },
+  "scripts": {
+    "test": "make test-cov"
+  },
+  "licenses": [
+    {
+      "type": "BSD",
+      "url": "http://github.com/hueniverse/sntp/raw/master/LICENSE"
+    }
+  ],
+  "readme": "# sntp\n\nAn SNTP v4 client (RFC4330) for node. Simpy connects to the NTP or SNTP server requested and returns the server time\nalong with the roundtrip duration and clock offset. To adjust the local time to the NTP time, add the returned `t` offset\nto the local time.\n\n[![Build Status](https://secure.travis-ci.org/hueniverse/sntp.png)](http://travis-ci.org/hueniverse/sntp)\n\n# Usage\n\n```javascript\nvar Sntp = require('sntp');\n\n// All options are optional\n\nvar options = {\n    host: 'nist1-sj.ustiming.org',  // Defaults to pool.ntp.org\n    port: 123,                      // Defaults to 123 (NTP)\n    resolveReference: true,         // Default to false (not resolving)\n    timeout: 1000                   // Defaults to zero (no timeout)\n};\n\n// Request server time\n\nSntp.time(options, function (err, time) {\n\n    if (err) {\n        console.log('Failed: ' + err.message);\n        process.exit(1);\n    }\n\n    console.log('Local clock is off by: ' + time.t + ' milliseconds');\n    process.exit(0);\n});\n```\n\nIf an application needs to maintain continuous time synchronization, the module provides a stateful method for\nquerying the current offset only when the last one is too old (defaults to daily).\n\n```javascript\n// Request offset once\n\nSntp.offset(function (err, offset) {\n\n    console.log(offset);                    // New (served fresh)\n\n    // Request offset again\n\n    Sntp.offset(function (err, offset) {\n\n        console.log(offset);                // Identical (served from cache)\n    });\n});\n```\n\nTo set a background offset refresh, start the interval and use the provided now() method. If for any reason the\nclient fails to obtain an up-to-date offset, the current system clock is used.\n\n```javascript\nvar before = Sntp.now();                    // System time without offset\n\nSntp.start(function () {\n\n    var now = Sntp.now();                   // With offset\n    Sntp.stop();\n});\n```\n\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/hueniverse/sntp/issues"
+  },
+  "homepage": "https://github.com/hueniverse/sntp#readme",
+  "_id": "sntp@1.0.9",
+  "_shasum": "6541184cc90aeea6c6e7b35e2659082443c66198",
+  "_resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+  "_from": "sntp@>=1.0.0 <2.0.0"
+}
diff --git a/deps/npm/node_modules/sntp/test/index.js b/deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/test/index.js
similarity index 100%
rename from deps/npm/node_modules/sntp/test/index.js
rename to deps/npm/node_modules/request/node_modules/hawk/node_modules/sntp/test/index.js
diff --git a/deps/npm/node_modules/hawk/package.json b/deps/npm/node_modules/request/node_modules/hawk/package.json
similarity index 70%
rename from deps/npm/node_modules/hawk/package.json
rename to deps/npm/node_modules/request/node_modules/hawk/package.json
index 81abc2e1c658c3..5a835b2e42a959 100644
--- a/deps/npm/node_modules/hawk/package.json
+++ b/deps/npm/node_modules/request/node_modules/hawk/package.json
@@ -1,91 +1,68 @@
 {
-  "_args": [
-    [
-      "hawk@~3.1.0",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "hawk@>=3.1.0 <3.2.0",
-  "_id": "hawk@3.1.0",
-  "_inCache": true,
-  "_location": "/hawk",
-  "_nodeVersion": "0.10.38",
-  "_npmUser": {
+  "name": "hawk",
+  "description": "HTTP Hawk Authentication Scheme",
+  "version": "3.1.0",
+  "author": {
+    "name": "Eran Hammer",
     "email": "eran@hammer.io",
-    "name": "hueniverse"
+    "url": "http://hueniverse.com"
   },
-  "_npmVersion": "2.10.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "hawk",
-    "raw": "hawk@~3.1.0",
-    "rawSpec": "~3.1.0",
-    "scope": null,
-    "spec": ">=3.1.0 <3.2.0",
-    "type": "range"
+  "contributors": [],
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/hueniverse/hawk.git"
   },
-  "_requiredBy": [
-    "/request"
+  "main": "lib/index.js",
+  "keywords": [
+    "http",
+    "authentication",
+    "scheme",
+    "hawk"
   ],
-  "_resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz",
-  "_shasum": "8a13ae19977ec607602f3f0b9fd676f18c384e44",
-  "_shrinkwrap": null,
-  "_spec": "hawk@~3.1.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
-  "author": {
-    "email": "eran@hammer.io",
-    "name": "Eran Hammer",
-    "url": "http://hueniverse.com"
+  "engines": {
+    "node": ">=0.10.32"
   },
   "browser": "./lib/browser.js",
-  "bugs": {
-    "url": "https://github.com/hueniverse/hawk/issues"
-  },
-  "contributors": [],
   "dependencies": {
+    "hoek": "2.x.x",
     "boom": "^2.8.x",
     "cryptiles": "2.x.x",
-    "hoek": "2.x.x",
     "sntp": "1.x.x"
   },
-  "description": "HTTP Hawk Authentication Scheme",
   "devDependencies": {
     "code": "1.x.x",
     "lab": "5.x.x"
   },
-  "directories": {},
+  "scripts": {
+    "test": "lab -a code -t 100 -L",
+    "test-cov-html": "lab -a code -r html -o coverage.html"
+  },
+  "license": "BSD-3-Clause",
+  "gitHead": "fdb9d05e383d5237631eaddc4f51422e54fa8b52",
+  "bugs": {
+    "url": "https://github.com/hueniverse/hawk/issues"
+  },
+  "homepage": "https://github.com/hueniverse/hawk#readme",
+  "_id": "hawk@3.1.0",
+  "_shasum": "8a13ae19977ec607602f3f0b9fd676f18c384e44",
+  "_from": "hawk@>=3.1.0 <3.2.0",
+  "_npmVersion": "2.10.0",
+  "_nodeVersion": "0.10.38",
+  "_npmUser": {
+    "name": "hueniverse",
+    "email": "eran@hammer.io"
+  },
   "dist": {
     "shasum": "8a13ae19977ec607602f3f0b9fd676f18c384e44",
     "tarball": "http://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz"
   },
-  "engines": {
-    "node": ">=0.10.32"
-  },
-  "gitHead": "fdb9d05e383d5237631eaddc4f51422e54fa8b52",
-  "homepage": "https://github.com/hueniverse/hawk#readme",
-  "keywords": [
-    "authentication",
-    "hawk",
-    "http",
-    "scheme"
-  ],
-  "license": "BSD-3-Clause",
-  "main": "lib/index.js",
   "maintainers": [
     {
       "name": "hueniverse",
       "email": "eran@hueniverse.com"
     }
   ],
-  "name": "hawk",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/hueniverse/hawk.git"
-  },
-  "scripts": {
-    "test": "lab -a code -t 100 -L",
-    "test-cov-html": "lab -a code -r html -o coverage.html"
-  },
-  "version": "3.1.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/hawk/test/browser.js b/deps/npm/node_modules/request/node_modules/hawk/test/browser.js
similarity index 100%
rename from deps/npm/node_modules/hawk/test/browser.js
rename to deps/npm/node_modules/request/node_modules/hawk/test/browser.js
diff --git a/deps/npm/node_modules/hawk/test/client.js b/deps/npm/node_modules/request/node_modules/hawk/test/client.js
similarity index 100%
rename from deps/npm/node_modules/hawk/test/client.js
rename to deps/npm/node_modules/request/node_modules/hawk/test/client.js
diff --git a/deps/npm/node_modules/hawk/test/crypto.js b/deps/npm/node_modules/request/node_modules/hawk/test/crypto.js
similarity index 100%
rename from deps/npm/node_modules/hawk/test/crypto.js
rename to deps/npm/node_modules/request/node_modules/hawk/test/crypto.js
diff --git a/deps/npm/node_modules/hawk/test/index.js b/deps/npm/node_modules/request/node_modules/hawk/test/index.js
similarity index 100%
rename from deps/npm/node_modules/hawk/test/index.js
rename to deps/npm/node_modules/request/node_modules/hawk/test/index.js
diff --git a/deps/npm/node_modules/hawk/test/readme.js b/deps/npm/node_modules/request/node_modules/hawk/test/readme.js
similarity index 100%
rename from deps/npm/node_modules/hawk/test/readme.js
rename to deps/npm/node_modules/request/node_modules/hawk/test/readme.js
diff --git a/deps/npm/node_modules/hawk/test/server.js b/deps/npm/node_modules/request/node_modules/hawk/test/server.js
similarity index 100%
rename from deps/npm/node_modules/hawk/test/server.js
rename to deps/npm/node_modules/request/node_modules/hawk/test/server.js
diff --git a/deps/npm/node_modules/hawk/test/uri.js b/deps/npm/node_modules/request/node_modules/hawk/test/uri.js
similarity index 100%
rename from deps/npm/node_modules/hawk/test/uri.js
rename to deps/npm/node_modules/request/node_modules/hawk/test/uri.js
diff --git a/deps/npm/node_modules/hawk/test/utils.js b/deps/npm/node_modules/request/node_modules/hawk/test/utils.js
similarity index 100%
rename from deps/npm/node_modules/hawk/test/utils.js
rename to deps/npm/node_modules/request/node_modules/hawk/test/utils.js
diff --git a/deps/npm/node_modules/http-signature/.dir-locals.el b/deps/npm/node_modules/request/node_modules/http-signature/.dir-locals.el
similarity index 100%
rename from deps/npm/node_modules/http-signature/.dir-locals.el
rename to deps/npm/node_modules/request/node_modules/http-signature/.dir-locals.el
diff --git a/deps/npm/node_modules/http-signature/.npmignore b/deps/npm/node_modules/request/node_modules/http-signature/.npmignore
similarity index 100%
rename from deps/npm/node_modules/http-signature/.npmignore
rename to deps/npm/node_modules/request/node_modules/http-signature/.npmignore
diff --git a/deps/npm/node_modules/http-signature/LICENSE b/deps/npm/node_modules/request/node_modules/http-signature/LICENSE
similarity index 100%
rename from deps/npm/node_modules/http-signature/LICENSE
rename to deps/npm/node_modules/request/node_modules/http-signature/LICENSE
diff --git a/deps/npm/node_modules/http-signature/README.md b/deps/npm/node_modules/request/node_modules/http-signature/README.md
similarity index 100%
rename from deps/npm/node_modules/http-signature/README.md
rename to deps/npm/node_modules/request/node_modules/http-signature/README.md
diff --git a/deps/npm/node_modules/http-signature/http_signing.md b/deps/npm/node_modules/request/node_modules/http-signature/http_signing.md
similarity index 100%
rename from deps/npm/node_modules/http-signature/http_signing.md
rename to deps/npm/node_modules/request/node_modules/http-signature/http_signing.md
diff --git a/deps/npm/node_modules/http-signature/lib/index.js b/deps/npm/node_modules/request/node_modules/http-signature/lib/index.js
similarity index 100%
rename from deps/npm/node_modules/http-signature/lib/index.js
rename to deps/npm/node_modules/request/node_modules/http-signature/lib/index.js
diff --git a/deps/npm/node_modules/http-signature/lib/parser.js b/deps/npm/node_modules/request/node_modules/http-signature/lib/parser.js
similarity index 100%
rename from deps/npm/node_modules/http-signature/lib/parser.js
rename to deps/npm/node_modules/request/node_modules/http-signature/lib/parser.js
diff --git a/deps/npm/node_modules/http-signature/lib/signer.js b/deps/npm/node_modules/request/node_modules/http-signature/lib/signer.js
similarity index 100%
rename from deps/npm/node_modules/http-signature/lib/signer.js
rename to deps/npm/node_modules/request/node_modules/http-signature/lib/signer.js
diff --git a/deps/npm/node_modules/http-signature/lib/util.js b/deps/npm/node_modules/request/node_modules/http-signature/lib/util.js
similarity index 100%
rename from deps/npm/node_modules/http-signature/lib/util.js
rename to deps/npm/node_modules/request/node_modules/http-signature/lib/util.js
diff --git a/deps/npm/node_modules/http-signature/lib/verify.js b/deps/npm/node_modules/request/node_modules/http-signature/lib/verify.js
similarity index 100%
rename from deps/npm/node_modules/http-signature/lib/verify.js
rename to deps/npm/node_modules/request/node_modules/http-signature/lib/verify.js
diff --git a/deps/npm/node_modules/asn1/.npmignore b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/.npmignore
similarity index 100%
rename from deps/npm/node_modules/asn1/.npmignore
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/.npmignore
diff --git a/deps/npm/node_modules/asn1/LICENSE b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/LICENSE
similarity index 100%
rename from deps/npm/node_modules/asn1/LICENSE
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/LICENSE
diff --git a/deps/npm/node_modules/asn1/README.md b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/README.md
similarity index 100%
rename from deps/npm/node_modules/asn1/README.md
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/README.md
diff --git a/deps/npm/node_modules/asn1/lib/ber/errors.js b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/errors.js
similarity index 100%
rename from deps/npm/node_modules/asn1/lib/ber/errors.js
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/errors.js
diff --git a/deps/npm/node_modules/asn1/lib/ber/index.js b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/index.js
similarity index 100%
rename from deps/npm/node_modules/asn1/lib/ber/index.js
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/index.js
diff --git a/deps/npm/node_modules/asn1/lib/ber/reader.js b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/reader.js
similarity index 100%
rename from deps/npm/node_modules/asn1/lib/ber/reader.js
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/reader.js
diff --git a/deps/npm/node_modules/asn1/lib/ber/types.js b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/types.js
similarity index 100%
rename from deps/npm/node_modules/asn1/lib/ber/types.js
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/types.js
diff --git a/deps/npm/node_modules/asn1/lib/ber/writer.js b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/writer.js
similarity index 100%
rename from deps/npm/node_modules/asn1/lib/ber/writer.js
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/ber/writer.js
diff --git a/deps/npm/node_modules/asn1/lib/index.js b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/index.js
similarity index 100%
rename from deps/npm/node_modules/asn1/lib/index.js
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/lib/index.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/package.json b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/package.json
new file mode 100644
index 00000000000000..034c2b48f14c79
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/package.json
@@ -0,0 +1,45 @@
+{
+  "author": {
+    "name": "Mark Cavage",
+    "email": "mcavage@gmail.com"
+  },
+  "contributors": [
+    {
+      "name": "David Gwynne",
+      "email": "loki@animata.net"
+    },
+    {
+      "name": "Yunong Xiao",
+      "email": "yunong@joyent.com"
+    }
+  ],
+  "name": "asn1",
+  "description": "Contains parsers and serializers for ASN.1 (currently BER only)",
+  "version": "0.1.11",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/mcavage/node-asn1.git"
+  },
+  "main": "lib/index.js",
+  "engines": {
+    "node": ">=0.4.9"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "tap": "0.1.4"
+  },
+  "scripts": {
+    "pretest": "which gjslint; if [[ \"$?\" = 0 ]] ; then  gjslint --nojsdoc -r lib -r tst; else echo \"Missing gjslint. Skipping lint\"; fi",
+    "test": "tap ./tst"
+  },
+  "readme": "node-asn1 is a library for encoding and decoding ASN.1 datatypes in pure JS.\nCurrently BER encoding is supported; at some point I'll likely have to do DER.\n\n## Usage\n\nMostly, if you're *actually* needing to read and write ASN.1, you probably don't\nneed this readme to explain what and why.  If you have no idea what ASN.1 is,\nsee this: ftp://ftp.rsa.com/pub/pkcs/ascii/layman.asc\n\nThe source is pretty much self-explanatory, and has read/write methods for the\ncommon types out there.\n\n### Decoding\n\nThe following reads an ASN.1 sequence with a boolean.\n\n    var Ber = require('asn1').Ber;\n\n    var reader = new Ber.Reader(new Buffer([0x30, 0x03, 0x01, 0x01, 0xff]));\n\n    reader.readSequence();\n    console.log('Sequence len: ' + reader.length);\n    if (reader.peek() === Ber.Boolean)\n      console.log(reader.readBoolean());\n\n### Encoding\n\nThe following generates the same payload as above.\n\n    var Ber = require('asn1').Ber;\n\n    var writer = new Ber.Writer();\n\n    writer.startSequence();\n    writer.writeBoolean(true);\n    writer.endSequence();\n\n    console.log(writer.buffer);\n\n## Installation\n\n    npm install asn1\n\n## License\n\nMIT.\n\n## Bugs\n\nSee <https://github.com/mcavage/node-asn1/issues>.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/mcavage/node-asn1/issues"
+  },
+  "homepage": "https://github.com/mcavage/node-asn1#readme",
+  "_id": "asn1@0.1.11",
+  "_shasum": "559be18376d08a4ec4dbe80877d27818639b2df7",
+  "_resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+  "_from": "asn1@0.1.11"
+}
diff --git a/deps/npm/node_modules/asn1/tst/ber/reader.test.js b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/tst/ber/reader.test.js
similarity index 100%
rename from deps/npm/node_modules/asn1/tst/ber/reader.test.js
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/tst/ber/reader.test.js
diff --git a/deps/npm/node_modules/asn1/tst/ber/writer.test.js b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/tst/ber/writer.test.js
similarity index 100%
rename from deps/npm/node_modules/asn1/tst/ber/writer.test.js
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/asn1/tst/ber/writer.test.js
diff --git a/deps/npm/node_modules/assert-plus/README.md b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/README.md
similarity index 100%
rename from deps/npm/node_modules/assert-plus/README.md
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/README.md
diff --git a/deps/npm/node_modules/assert-plus/assert.js b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/assert.js
similarity index 100%
rename from deps/npm/node_modules/assert-plus/assert.js
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/assert.js
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json
new file mode 100644
index 00000000000000..b3317675d295de
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json
@@ -0,0 +1,30 @@
+{
+  "author": {
+    "name": "Mark Cavage",
+    "email": "mcavage@gmail.com"
+  },
+  "name": "assert-plus",
+  "description": "Extra assertions on top of node's assert module",
+  "version": "0.1.5",
+  "main": "./assert.js",
+  "devDependencies": {},
+  "optionalDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mcavage/node-assert-plus.git"
+  },
+  "engines": {
+    "node": ">=0.8"
+  },
+  "readme": "# node-assert-plus\n\nThis library is a super small wrapper over node's assert module that has two\nthings: (1) the ability to disable assertions with the environment variable\nNODE_NDEBUG, and (2) some API wrappers for argument testing.  Like\n`assert.string(myArg, 'myArg')`.  As a simple example, most of my code looks\nlike this:\n\n    var assert = require('assert-plus');\n\n    function fooAccount(options, callback) {\n\t    assert.object(options, 'options');\n\t\tassert.number(options.id, 'options.id);\n\t\tassert.bool(options.isManager, 'options.isManager');\n\t\tassert.string(options.name, 'options.name');\n\t\tassert.arrayOfString(options.email, 'options.email');\n\t\tassert.func(callback, 'callback');\n\n        // Do stuff\n\t\tcallback(null, {});\n    }\n\n# API\n\nAll methods that *aren't* part of node's core assert API are simply assumed to\ntake an argument, and then a string 'name' that's not a message; `AssertionError`\nwill be thrown if the assertion fails with a message like:\n\n    AssertionError: foo (string) is required\n\tat test (/home/mark/work/foo/foo.js:3:9)\n\tat Object.<anonymous> (/home/mark/work/foo/foo.js:15:1)\n\tat Module._compile (module.js:446:26)\n\tat Object..js (module.js:464:10)\n\tat Module.load (module.js:353:31)\n\tat Function._load (module.js:311:12)\n\tat Array.0 (module.js:484:10)\n\tat EventEmitter._tickCallback (node.js:190:38)\n\nfrom:\n\n    function test(foo) {\n\t    assert.string(foo, 'foo');\n    }\n\nThere you go.  You can check that arrays are of a homogenous type with `Arrayof$Type`:\n\n    function test(foo) {\n\t    assert.arrayOfString(foo, 'foo');\n    }\n\nYou can assert IFF an argument is not `undefined` (i.e., an optional arg):\n\n    assert.optionalString(foo, 'foo');\n\nLastly, you can opt-out of assertion checking altogether by setting the\nenvironment variable `NODE_NDEBUG=1`.  This is pseudo-useful if you have\nlots of assertions, and don't want to pay `typeof ()` taxes to v8 in\nproduction.\n\nThe complete list of APIs is:\n\n* assert.bool\n* assert.buffer\n* assert.func\n* assert.number\n* assert.object\n* assert.string\n* assert.arrayOfBool\n* assert.arrayOfFunc\n* assert.arrayOfNumber\n* assert.arrayOfObject\n* assert.arrayOfString\n* assert.optionalBool\n* assert.optionalBuffer\n* assert.optionalFunc\n* assert.optionalNumber\n* assert.optionalObject\n* assert.optionalString\n* assert.optionalArrayOfBool\n* assert.optionalArrayOfFunc\n* assert.optionalArrayOfNumber\n* assert.optionalArrayOfObject\n* assert.optionalArrayOfString\n* assert.AssertionError\n* assert.fail\n* assert.ok\n* assert.equal\n* assert.notEqual\n* assert.deepEqual\n* assert.notDeepEqual\n* assert.strictEqual\n* assert.notStrictEqual\n* assert.throws\n* assert.doesNotThrow\n* assert.ifError\n\n# Installation\n\n    npm install assert-plus\n\n## License\n\nThe MIT License (MIT)\nCopyright (c) 2012 Mark Cavage\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the \"Software\"), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of\nthe Software, and to permit persons to whom the Software is furnished to do so,\nsubject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n\n## Bugs\n\nSee <https://github.com/mcavage/node-assert-plus/issues>.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/mcavage/node-assert-plus/issues"
+  },
+  "homepage": "https://github.com/mcavage/node-assert-plus#readme",
+  "dependencies": {},
+  "_id": "assert-plus@0.1.5",
+  "_shasum": "ee74009413002d84cec7219c6ac811812e723160",
+  "_resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+  "_from": "assert-plus@>=0.1.5 <0.2.0"
+}
diff --git a/deps/npm/node_modules/ctype/.npmignore b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/.npmignore
similarity index 100%
rename from deps/npm/node_modules/ctype/.npmignore
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/.npmignore
diff --git a/deps/npm/node_modules/ctype/CHANGELOG b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/CHANGELOG
similarity index 100%
rename from deps/npm/node_modules/ctype/CHANGELOG
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/CHANGELOG
diff --git a/deps/npm/node_modules/ctype/LICENSE b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/LICENSE
similarity index 100%
rename from deps/npm/node_modules/ctype/LICENSE
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/LICENSE
diff --git a/deps/npm/node_modules/ctype/README b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/README
similarity index 100%
rename from deps/npm/node_modules/ctype/README
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/README
diff --git a/deps/npm/node_modules/ctype/README.old b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/README.old
similarity index 100%
rename from deps/npm/node_modules/ctype/README.old
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/README.old
diff --git a/deps/npm/node_modules/ctype/ctf.js b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/ctf.js
similarity index 100%
rename from deps/npm/node_modules/ctype/ctf.js
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/ctf.js
diff --git a/deps/npm/node_modules/ctype/ctio.js b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/ctio.js
similarity index 100%
rename from deps/npm/node_modules/ctype/ctio.js
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/ctio.js
diff --git a/deps/npm/node_modules/ctype/ctype.js b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/ctype.js
similarity index 100%
rename from deps/npm/node_modules/ctype/ctype.js
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/ctype.js
diff --git a/deps/npm/node_modules/ctype/man/man3ctype/ctio.3ctype b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/man/man3ctype/ctio.3ctype
similarity index 100%
rename from deps/npm/node_modules/ctype/man/man3ctype/ctio.3ctype
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/man/man3ctype/ctio.3ctype
diff --git a/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
new file mode 100644
index 00000000000000..c33f8a5742ae69
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
@@ -0,0 +1,42 @@
+{
+  "name": "ctype",
+  "version": "0.5.3",
+  "description": "read and write binary structures and data types",
+  "homepage": "https://github.com/rmustacc/node-ctype",
+  "author": {
+    "name": "Robert Mustacchi",
+    "email": "rm@fingolfin.org"
+  },
+  "engines": {
+    "node": ">= 0.4"
+  },
+  "main": "ctype.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/rmustacc/node-ctype.git"
+  },
+  "_id": "ctype@0.5.3",
+  "dist": {
+    "shasum": "82c18c2461f74114ef16c135224ad0b9144ca12f",
+    "tarball": "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+  },
+  "_npmVersion": "1.1.59",
+  "_npmUser": {
+    "name": "rm",
+    "email": "rm@fingolfin.org"
+  },
+  "maintainers": [
+    {
+      "name": "rm",
+      "email": "rm@fingolfin.org"
+    }
+  ],
+  "directories": {},
+  "_shasum": "82c18c2461f74114ef16c135224ad0b9144ca12f",
+  "_resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+  "_from": "ctype@0.5.3",
+  "bugs": {
+    "url": "https://github.com/rmustacc/node-ctype/issues"
+  },
+  "readme": "ERROR: No README data found!"
+}
diff --git a/deps/npm/node_modules/ctype/tools/jsl.conf b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/tools/jsl.conf
similarity index 100%
rename from deps/npm/node_modules/ctype/tools/jsl.conf
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/tools/jsl.conf
diff --git a/deps/npm/node_modules/ctype/tools/jsstyle b/deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/tools/jsstyle
similarity index 100%
rename from deps/npm/node_modules/ctype/tools/jsstyle
rename to deps/npm/node_modules/request/node_modules/http-signature/node_modules/ctype/tools/jsstyle
diff --git a/deps/npm/node_modules/http-signature/package.json b/deps/npm/node_modules/request/node_modules/http-signature/package.json
similarity index 71%
rename from deps/npm/node_modules/http-signature/package.json
rename to deps/npm/node_modules/request/node_modules/http-signature/package.json
index 910f8118114417..47d76cffcf9187 100644
--- a/deps/npm/node_modules/http-signature/package.json
+++ b/deps/npm/node_modules/request/node_modules/http-signature/package.json
@@ -1,43 +1,11 @@
 {
-  "_args": [
-    [
-      "http-signature@~0.11.0",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "http-signature@>=0.11.0 <0.12.0",
-  "_id": "http-signature@0.11.0",
-  "_inCache": true,
-  "_location": "/http-signature",
-  "_nodeVersion": "0.10.36",
-  "_npmUser": {
-    "email": "patrick.f.mooney@gmail.com",
-    "name": "pfmooney"
-  },
-  "_npmVersion": "2.5.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "http-signature",
-    "raw": "http-signature@~0.11.0",
-    "rawSpec": "~0.11.0",
-    "scope": null,
-    "spec": ">=0.11.0 <0.12.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/request"
-  ],
-  "_resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz",
-  "_shasum": "1796cf67a001ad5cd6849dca0991485f09089fe6",
-  "_shrinkwrap": null,
-  "_spec": "http-signature@~0.11.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
+  "name": "http-signature",
+  "description": "Reference implementation of Joyent's HTTP Signature scheme.",
+  "version": "0.11.0",
+  "license": "MIT",
   "author": {
     "name": "Joyent, Inc"
   },
-  "bugs": {
-    "url": "https://github.com/joyent/node-http-signature/issues"
-  },
   "contributors": [
     {
       "name": "Mark Cavage",
@@ -52,31 +20,44 @@
       "email": "patrick.f.mooney@gmail.com"
     }
   ],
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/joyent/node-http-signature.git"
+  },
+  "homepage": "https://github.com/joyent/node-http-signature/",
+  "bugs": {
+    "url": "https://github.com/joyent/node-http-signature/issues"
+  },
+  "keywords": [
+    "https",
+    "request"
+  ],
+  "engines": {
+    "node": ">=0.8"
+  },
+  "main": "lib/index.js",
+  "scripts": {
+    "test": "tap test/*.js"
+  },
   "dependencies": {
-    "asn1": "0.1.11",
     "assert-plus": "^0.1.5",
+    "asn1": "0.1.11",
     "ctype": "0.5.3"
   },
-  "description": "Reference implementation of Joyent's HTTP Signature scheme.",
   "devDependencies": {
     "node-uuid": "^1.4.1",
     "tap": "0.4.2"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "1796cf67a001ad5cd6849dca0991485f09089fe6",
-    "tarball": "http://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"
-  },
-  "engines": {
-    "node": ">=0.8"
+  "_id": "http-signature@0.11.0",
+  "_shasum": "1796cf67a001ad5cd6849dca0991485f09089fe6",
+  "_resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz",
+  "_from": "http-signature@>=0.11.0 <0.12.0",
+  "_npmVersion": "2.5.1",
+  "_nodeVersion": "0.10.36",
+  "_npmUser": {
+    "name": "pfmooney",
+    "email": "patrick.f.mooney@gmail.com"
   },
-  "homepage": "https://github.com/joyent/node-http-signature/",
-  "keywords": [
-    "https",
-    "request"
-  ],
-  "license": "MIT",
-  "main": "lib/index.js",
   "maintainers": [
     {
       "name": "mcavage",
@@ -87,14 +68,10 @@
       "email": "patrick.f.mooney@gmail.com"
     }
   ],
-  "name": "http-signature",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/joyent/node-http-signature.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
+  "dist": {
+    "shasum": "1796cf67a001ad5cd6849dca0991485f09089fe6",
+    "tarball": "http://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"
   },
-  "version": "0.11.0"
+  "directories": {},
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/isstream/.npmignore b/deps/npm/node_modules/request/node_modules/isstream/.npmignore
similarity index 100%
rename from deps/npm/node_modules/isstream/.npmignore
rename to deps/npm/node_modules/request/node_modules/isstream/.npmignore
diff --git a/deps/npm/node_modules/isstream/.travis.yml b/deps/npm/node_modules/request/node_modules/isstream/.travis.yml
similarity index 100%
rename from deps/npm/node_modules/isstream/.travis.yml
rename to deps/npm/node_modules/request/node_modules/isstream/.travis.yml
diff --git a/deps/npm/node_modules/isstream/LICENSE.md b/deps/npm/node_modules/request/node_modules/isstream/LICENSE.md
similarity index 100%
rename from deps/npm/node_modules/isstream/LICENSE.md
rename to deps/npm/node_modules/request/node_modules/isstream/LICENSE.md
diff --git a/deps/npm/node_modules/isstream/README.md b/deps/npm/node_modules/request/node_modules/isstream/README.md
similarity index 100%
rename from deps/npm/node_modules/isstream/README.md
rename to deps/npm/node_modules/request/node_modules/isstream/README.md
diff --git a/deps/npm/node_modules/isstream/isstream.js b/deps/npm/node_modules/request/node_modules/isstream/isstream.js
similarity index 100%
rename from deps/npm/node_modules/isstream/isstream.js
rename to deps/npm/node_modules/request/node_modules/isstream/isstream.js
diff --git a/deps/npm/node_modules/request/node_modules/isstream/package.json b/deps/npm/node_modules/request/node_modules/isstream/package.json
new file mode 100644
index 00000000000000..87c26fe121c130
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/isstream/package.json
@@ -0,0 +1,42 @@
+{
+  "name": "isstream",
+  "version": "0.1.2",
+  "description": "Determine if an object is a Stream",
+  "main": "isstream.js",
+  "scripts": {
+    "test": "tar --xform 's/^package/readable-stream-1.0/' -zxf readable-stream-1.0.*.tgz && tar --xform 's/^package/readable-stream-1.1/' -zxf readable-stream-1.1.*.tgz && node test.js; rm -rf readable-stream-1.?/"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/rvagg/isstream.git"
+  },
+  "keywords": [
+    "stream",
+    "type",
+    "streams",
+    "readable-stream",
+    "hippo"
+  ],
+  "devDependencies": {
+    "tape": "~2.12.3",
+    "core-util-is": "~1.0.0",
+    "isarray": "0.0.1",
+    "string_decoder": "~0.10.x",
+    "inherits": "~2.0.1"
+  },
+  "author": {
+    "name": "Rod Vagg",
+    "email": "rod@vagg.org"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/rvagg/isstream/issues"
+  },
+  "homepage": "https://github.com/rvagg/isstream",
+  "readme": "# isStream\n\n[![Build Status](https://secure.travis-ci.org/rvagg/isstream.png)](http://travis-ci.org/rvagg/isstream)\n\n**Test if an object is a `Stream`**\n\n[![NPM](https://nodei.co/npm/isstream.svg)](https://nodei.co/npm/isstream/)\n\nThe missing `Stream.isStream(obj)`: determine if an object is standard Node.js `Stream`. Works for Node-core `Stream` objects (for 0.8, 0.10, 0.11, and in theory, older and newer versions) and all versions of **[readable-stream](https://github.com/isaacs/readable-stream)**.\n\n## Usage:\n\n```js\nvar isStream = require('isstream')\nvar Stream = require('stream')\n\nisStream(new Stream()) // true\n\nisStream({}) // false\n\nisStream(new Stream.Readable())    // true\nisStream(new Stream.Writable())    // true\nisStream(new Stream.Duplex())      // true\nisStream(new Stream.Transform())   // true\nisStream(new Stream.PassThrough()) // true\n```\n\n## But wait! There's more!\n\nYou can also test for `isReadable(obj)`, `isWritable(obj)` and `isDuplex(obj)` to test for implementations of Streams2 (and Streams3) base classes.\n\n```js\nvar isReadable = require('isstream').isReadable\nvar isWritable = require('isstream').isWritable\nvar isDuplex = require('isstream').isDuplex\nvar Stream = require('stream')\n\nisReadable(new Stream()) // false\nisWritable(new Stream()) // false\nisDuplex(new Stream())   // false\n\nisReadable(new Stream.Readable())    // true\nisReadable(new Stream.Writable())    // false\nisReadable(new Stream.Duplex())      // true\nisReadable(new Stream.Transform())   // true\nisReadable(new Stream.PassThrough()) // true\n\nisWritable(new Stream.Readable())    // false\nisWritable(new Stream.Writable())    // true\nisWritable(new Stream.Duplex())      // true\nisWritable(new Stream.Transform())   // true\nisWritable(new Stream.PassThrough()) // true\n\nisDuplex(new Stream.Readable())    // false\nisDuplex(new Stream.Writable())    // false\nisDuplex(new Stream.Duplex())      // true\nisDuplex(new Stream.Transform())   // true\nisDuplex(new Stream.PassThrough()) // true\n```\n\n*Reminder: when implementing your own streams, please [use **readable-stream** rather than core streams](http://r.va.gg/2014/06/why-i-dont-use-nodes-core-stream-module.html).*\n\n\n## License\n\n**isStream** is Copyright (c) 2015 Rod Vagg [@rvagg](https://twitter.com/rvagg) and licenced under the MIT licence. All rights not explicitly granted in the MIT license are reserved. See the included LICENSE.md file for more details.\n",
+  "readmeFilename": "README.md",
+  "_id": "isstream@0.1.2",
+  "_shasum": "47e63f7af55afa6f92e1500e690eb8b8529c099a",
+  "_resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+  "_from": "isstream@>=0.1.2 <0.2.0"
+}
diff --git a/deps/npm/node_modules/isstream/test.js b/deps/npm/node_modules/request/node_modules/isstream/test.js
similarity index 100%
rename from deps/npm/node_modules/isstream/test.js
rename to deps/npm/node_modules/request/node_modules/isstream/test.js
diff --git a/deps/npm/node_modules/json-stringify-safe/.npmignore b/deps/npm/node_modules/request/node_modules/json-stringify-safe/.npmignore
similarity index 100%
rename from deps/npm/node_modules/json-stringify-safe/.npmignore
rename to deps/npm/node_modules/request/node_modules/json-stringify-safe/.npmignore
diff --git a/deps/npm/node_modules/json-stringify-safe/CHANGELOG.md b/deps/npm/node_modules/request/node_modules/json-stringify-safe/CHANGELOG.md
similarity index 100%
rename from deps/npm/node_modules/json-stringify-safe/CHANGELOG.md
rename to deps/npm/node_modules/request/node_modules/json-stringify-safe/CHANGELOG.md
diff --git a/deps/npm/node_modules/request/node_modules/json-stringify-safe/LICENSE b/deps/npm/node_modules/request/node_modules/json-stringify-safe/LICENSE
new file mode 100644
index 00000000000000..19129e315fe593
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/json-stringify-safe/LICENSE
@@ -0,0 +1,15 @@
+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/deps/npm/node_modules/json-stringify-safe/Makefile b/deps/npm/node_modules/request/node_modules/json-stringify-safe/Makefile
similarity index 100%
rename from deps/npm/node_modules/json-stringify-safe/Makefile
rename to deps/npm/node_modules/request/node_modules/json-stringify-safe/Makefile
diff --git a/deps/npm/node_modules/json-stringify-safe/README.md b/deps/npm/node_modules/request/node_modules/json-stringify-safe/README.md
similarity index 100%
rename from deps/npm/node_modules/json-stringify-safe/README.md
rename to deps/npm/node_modules/request/node_modules/json-stringify-safe/README.md
diff --git a/deps/npm/node_modules/request/node_modules/json-stringify-safe/package.json b/deps/npm/node_modules/request/node_modules/json-stringify-safe/package.json
new file mode 100644
index 00000000000000..f09f9d57168c19
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/json-stringify-safe/package.json
@@ -0,0 +1,47 @@
+{
+  "name": "json-stringify-safe",
+  "version": "5.0.1",
+  "description": "Like JSON.stringify, but doesn't blow up on circular refs.",
+  "keywords": [
+    "json",
+    "stringify",
+    "circular",
+    "safe"
+  ],
+  "homepage": "https://github.com/isaacs/json-stringify-safe",
+  "bugs": {
+    "url": "https://github.com/isaacs/json-stringify-safe/issues"
+  },
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me"
+  },
+  "contributors": [
+    {
+      "name": "Andri Möll",
+      "email": "andri@dot.ee",
+      "url": "http://themoll.com"
+    }
+  ],
+  "license": "ISC",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/json-stringify-safe.git"
+  },
+  "main": "stringify.js",
+  "scripts": {
+    "test": "node test.js"
+  },
+  "devDependencies": {
+    "mocha": ">= 2.1.0 < 3",
+    "must": ">= 0.12 < 0.13",
+    "sinon": ">= 1.12.2 < 2"
+  },
+  "readme": "# json-stringify-safe\n\nLike JSON.stringify, but doesn't throw on circular references.\n\n## Usage\n\nTakes the same arguments as `JSON.stringify`.\n\n```javascript\nvar stringify = require('json-stringify-safe');\nvar circularObj = {};\ncircularObj.circularRef = circularObj;\ncircularObj.list = [ circularObj, circularObj ];\nconsole.log(stringify(circularObj, null, 2));\n```\n\nOutput:\n\n```json\n{\n  \"circularRef\": \"[Circular]\",\n  \"list\": [\n    \"[Circular]\",\n    \"[Circular]\"\n  ]\n}\n```\n\n## Details\n\n```\nstringify(obj, serializer, indent, decycler)\n```\n\nThe first three arguments are the same as to JSON.stringify.  The last\nis an argument that's only used when the object has been seen already.\n\nThe default `decycler` function returns the string `'[Circular]'`.\nIf, for example, you pass in `function(k,v){}` (return nothing) then it\nwill prune cycles.  If you pass in `function(k,v){ return {foo: 'bar'}}`,\nthen cyclical objects will always be represented as `{\"foo\":\"bar\"}` in\nthe result.\n\n```\nstringify.getSerialize(serializer, decycler)\n```\n\nReturns a serializer that can be used elsewhere.  This is the actual\nfunction that's passed to JSON.stringify.\n\n**Note** that the function returned from `getSerialize` is stateful for now, so\ndo **not** use it more than once.\n",
+  "readmeFilename": "README.md",
+  "_id": "json-stringify-safe@5.0.1",
+  "_shasum": "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb",
+  "_resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+  "_from": "json-stringify-safe@>=5.0.1 <5.1.0"
+}
diff --git a/deps/npm/node_modules/json-stringify-safe/stringify.js b/deps/npm/node_modules/request/node_modules/json-stringify-safe/stringify.js
similarity index 100%
rename from deps/npm/node_modules/json-stringify-safe/stringify.js
rename to deps/npm/node_modules/request/node_modules/json-stringify-safe/stringify.js
diff --git a/deps/npm/node_modules/json-stringify-safe/test/mocha.opts b/deps/npm/node_modules/request/node_modules/json-stringify-safe/test/mocha.opts
similarity index 100%
rename from deps/npm/node_modules/json-stringify-safe/test/mocha.opts
rename to deps/npm/node_modules/request/node_modules/json-stringify-safe/test/mocha.opts
diff --git a/deps/npm/node_modules/json-stringify-safe/test/stringify_test.js b/deps/npm/node_modules/request/node_modules/json-stringify-safe/test/stringify_test.js
similarity index 100%
rename from deps/npm/node_modules/json-stringify-safe/test/stringify_test.js
rename to deps/npm/node_modules/request/node_modules/json-stringify-safe/test/stringify_test.js
diff --git a/deps/npm/node_modules/mime-types/HISTORY.md b/deps/npm/node_modules/request/node_modules/mime-types/HISTORY.md
similarity index 100%
rename from deps/npm/node_modules/mime-types/HISTORY.md
rename to deps/npm/node_modules/request/node_modules/mime-types/HISTORY.md
diff --git a/deps/npm/node_modules/mime-types/LICENSE b/deps/npm/node_modules/request/node_modules/mime-types/LICENSE
similarity index 100%
rename from deps/npm/node_modules/mime-types/LICENSE
rename to deps/npm/node_modules/request/node_modules/mime-types/LICENSE
diff --git a/deps/npm/node_modules/mime-types/README.md b/deps/npm/node_modules/request/node_modules/mime-types/README.md
similarity index 100%
rename from deps/npm/node_modules/mime-types/README.md
rename to deps/npm/node_modules/request/node_modules/mime-types/README.md
diff --git a/deps/npm/node_modules/mime-types/index.js b/deps/npm/node_modules/request/node_modules/mime-types/index.js
similarity index 100%
rename from deps/npm/node_modules/mime-types/index.js
rename to deps/npm/node_modules/request/node_modules/mime-types/index.js
diff --git a/deps/npm/node_modules/mime-db/HISTORY.md b/deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/HISTORY.md
similarity index 100%
rename from deps/npm/node_modules/mime-db/HISTORY.md
rename to deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/HISTORY.md
diff --git a/deps/npm/node_modules/mime-db/LICENSE b/deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/LICENSE
similarity index 100%
rename from deps/npm/node_modules/mime-db/LICENSE
rename to deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/LICENSE
diff --git a/deps/npm/node_modules/mime-db/README.md b/deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/README.md
similarity index 100%
rename from deps/npm/node_modules/mime-db/README.md
rename to deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/README.md
diff --git a/deps/npm/node_modules/mime-db/db.json b/deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/db.json
similarity index 100%
rename from deps/npm/node_modules/mime-db/db.json
rename to deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/db.json
diff --git a/deps/npm/node_modules/mime-db/index.js b/deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/index.js
similarity index 100%
rename from deps/npm/node_modules/mime-db/index.js
rename to deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/index.js
diff --git a/deps/npm/node_modules/mime-db/package.json b/deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/package.json
similarity index 79%
rename from deps/npm/node_modules/mime-db/package.json
rename to deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/package.json
index 66acfaa43762cb..573cfa53e87bbd 100644
--- a/deps/npm/node_modules/mime-db/package.json
+++ b/deps/npm/node_modules/request/node_modules/mime-types/node_modules/mime-db/package.json
@@ -1,39 +1,7 @@
 {
-  "_args": [
-    [
-      "mime-db@~1.19.0",
-      "/Users/rebecca/code/npm/node_modules/mime-types"
-    ]
-  ],
-  "_from": "mime-db@>=1.19.0 <1.20.0",
-  "_id": "mime-db@1.19.0",
-  "_inCache": true,
-  "_location": "/mime-db",
-  "_npmUser": {
-    "email": "doug@somethingdoug.com",
-    "name": "dougwilson"
-  },
-  "_npmVersion": "1.4.28",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "mime-db",
-    "raw": "mime-db@~1.19.0",
-    "rawSpec": "~1.19.0",
-    "scope": null,
-    "spec": ">=1.19.0 <1.20.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/mime-types"
-  ],
-  "_resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz",
-  "_shasum": "496a18198a7ce8244534e25bb102b74fb420fd56",
-  "_shrinkwrap": null,
-  "_spec": "mime-db@~1.19.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/mime-types",
-  "bugs": {
-    "url": "https://github.com/jshttp/mime-db/issues"
-  },
+  "name": "mime-db",
+  "description": "Media Type Database",
+  "version": "1.19.0",
   "contributors": [
     {
       "name": "Douglas Christopher Wilson",
@@ -50,8 +18,20 @@
       "url": "http://github.com/broofa"
     }
   ],
-  "dependencies": {},
-  "description": "Media Type Database",
+  "license": "MIT",
+  "keywords": [
+    "mime",
+    "db",
+    "type",
+    "types",
+    "database",
+    "charset",
+    "charsets"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jshttp/mime-db.git"
+  },
   "devDependencies": {
     "bluebird": "2.10.0",
     "co": "4.6.0",
@@ -63,14 +43,6 @@
     "raw-body": "2.1.3",
     "stream-to-array": "2"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "496a18198a7ce8244534e25bb102b74fb420fd56",
-    "tarball": "http://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz"
-  },
-  "engines": {
-    "node": ">= 0.6"
-  },
   "files": [
     "HISTORY.md",
     "LICENSE",
@@ -78,36 +50,8 @@
     "db.json",
     "index.js"
   ],
-  "gitHead": "46a40f0524a01fb3075a7ecde92e8e04fc93d599",
-  "homepage": "https://github.com/jshttp/mime-db",
-  "installable": true,
-  "keywords": [
-    "charset",
-    "charsets",
-    "database",
-    "db",
-    "mime",
-    "type",
-    "types"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "jongleberry",
-      "email": "jonathanrichardong@gmail.com"
-    },
-    {
-      "name": "dougwilson",
-      "email": "doug@somethingdoug.com"
-    }
-  ],
-  "name": "mime-db",
-  "optionalDependencies": {},
-  "readme": "# mime-db\n\n[![NPM Version][npm-version-image]][npm-url]\n[![NPM Downloads][npm-downloads-image]][npm-url]\n[![Node.js Version][node-image]][node-url]\n[![Build Status][travis-image]][travis-url]\n[![Coverage Status][coveralls-image]][coveralls-url]\n\nThis is a database of all mime types.\nIt consists of a single, public JSON file and does not include any logic,\nallowing it to remain as un-opinionated as possible with an API.\nIt aggregates data from the following sources:\n\n- http://www.iana.org/assignments/media-types/media-types.xhtml\n- http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types\n- http://hg.nginx.org/nginx/raw-file/default/conf/mime.types\n\n## Installation\n\n```bash\nnpm install mime-db\n```\n\n### Database Download\n\nIf you're crazy enough to use this in the browser, you can just grab the\nJSON file using [RawGit](https://rawgit.com/). It is recommended to replace\n`master` with [a release tag](https://github.com/jshttp/mime-db/tags) as the\nJSON format may change in the future.\n\n```\nhttps://cdn.rawgit.com/jshttp/mime-db/master/db.json\n```\n\n## Usage\n\n```js\nvar db = require('mime-db');\n\n// grab data on .js files\nvar data = db['application/javascript'];\n```\n\n## Data Structure\n\nThe JSON file is a map lookup for lowercased mime types.\nEach mime type has the following properties:\n\n- `.source` - where the mime type is defined.\n    If not set, it's probably a custom media type.\n    - `apache` - [Apache common media types](http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types)\n    - `iana` - [IANA-defined media types](http://www.iana.org/assignments/media-types/media-types.xhtml)\n    - `nginx` - [nginx media types](http://hg.nginx.org/nginx/raw-file/default/conf/mime.types)\n- `.extensions[]` - known extensions associated with this mime type.\n- `.compressible` - whether a file of this type is can be gzipped.\n- `.charset` - the default charset associated with this type, if any.\n\nIf unknown, every property could be `undefined`.\n\n## Contributing\n\nTo edit the database, only make PRs against `src/custom.json` or\n`src/custom-suffix.json`.\n\nTo update the build, run `npm run build`.\n\n## Adding Custom Media Types\n\nThe best way to get new media types included in this library is to register\nthem with the IANA. The community registration procedure is outlined in\n[RFC 6838 section 5](http://tools.ietf.org/html/rfc6838#section-5). Types\nregistered with the IANA are automatically pulled into this library.\n\n[npm-version-image]: https://img.shields.io/npm/v/mime-db.svg\n[npm-downloads-image]: https://img.shields.io/npm/dm/mime-db.svg\n[npm-url]: https://npmjs.org/package/mime-db\n[travis-image]: https://img.shields.io/travis/jshttp/mime-db/master.svg\n[travis-url]: https://travis-ci.org/jshttp/mime-db\n[coveralls-image]: https://img.shields.io/coveralls/jshttp/mime-db/master.svg\n[coveralls-url]: https://coveralls.io/r/jshttp/mime-db?branch=master\n[node-image]: https://img.shields.io/node/v/mime-db.svg\n[node-url]: http://nodejs.org/download/\n",
-  "readmeFilename": "README.md",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/jshttp/mime-db.git"
+  "engines": {
+    "node": ">= 0.6"
   },
   "scripts": {
     "build": "node scripts/build",
@@ -117,5 +61,14 @@
     "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/",
     "update": "npm run fetch && npm run build"
   },
-  "version": "1.19.0"
+  "readme": "# mime-db\n\n[![NPM Version][npm-version-image]][npm-url]\n[![NPM Downloads][npm-downloads-image]][npm-url]\n[![Node.js Version][node-image]][node-url]\n[![Build Status][travis-image]][travis-url]\n[![Coverage Status][coveralls-image]][coveralls-url]\n\nThis is a database of all mime types.\nIt consists of a single, public JSON file and does not include any logic,\nallowing it to remain as un-opinionated as possible with an API.\nIt aggregates data from the following sources:\n\n- http://www.iana.org/assignments/media-types/media-types.xhtml\n- http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types\n- http://hg.nginx.org/nginx/raw-file/default/conf/mime.types\n\n## Installation\n\n```bash\nnpm install mime-db\n```\n\n### Database Download\n\nIf you're crazy enough to use this in the browser, you can just grab the\nJSON file using [RawGit](https://rawgit.com/). It is recommended to replace\n`master` with [a release tag](https://github.com/jshttp/mime-db/tags) as the\nJSON format may change in the future.\n\n```\nhttps://cdn.rawgit.com/jshttp/mime-db/master/db.json\n```\n\n## Usage\n\n```js\nvar db = require('mime-db');\n\n// grab data on .js files\nvar data = db['application/javascript'];\n```\n\n## Data Structure\n\nThe JSON file is a map lookup for lowercased mime types.\nEach mime type has the following properties:\n\n- `.source` - where the mime type is defined.\n    If not set, it's probably a custom media type.\n    - `apache` - [Apache common media types](http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types)\n    - `iana` - [IANA-defined media types](http://www.iana.org/assignments/media-types/media-types.xhtml)\n    - `nginx` - [nginx media types](http://hg.nginx.org/nginx/raw-file/default/conf/mime.types)\n- `.extensions[]` - known extensions associated with this mime type.\n- `.compressible` - whether a file of this type is can be gzipped.\n- `.charset` - the default charset associated with this type, if any.\n\nIf unknown, every property could be `undefined`.\n\n## Contributing\n\nTo edit the database, only make PRs against `src/custom.json` or\n`src/custom-suffix.json`.\n\nTo update the build, run `npm run build`.\n\n## Adding Custom Media Types\n\nThe best way to get new media types included in this library is to register\nthem with the IANA. The community registration procedure is outlined in\n[RFC 6838 section 5](http://tools.ietf.org/html/rfc6838#section-5). Types\nregistered with the IANA are automatically pulled into this library.\n\n[npm-version-image]: https://img.shields.io/npm/v/mime-db.svg\n[npm-downloads-image]: https://img.shields.io/npm/dm/mime-db.svg\n[npm-url]: https://npmjs.org/package/mime-db\n[travis-image]: https://img.shields.io/travis/jshttp/mime-db/master.svg\n[travis-url]: https://travis-ci.org/jshttp/mime-db\n[coveralls-image]: https://img.shields.io/coveralls/jshttp/mime-db/master.svg\n[coveralls-url]: https://coveralls.io/r/jshttp/mime-db?branch=master\n[node-image]: https://img.shields.io/node/v/mime-db.svg\n[node-url]: http://nodejs.org/download/\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/jshttp/mime-db/issues"
+  },
+  "homepage": "https://github.com/jshttp/mime-db#readme",
+  "_id": "mime-db@1.19.0",
+  "_shasum": "496a18198a7ce8244534e25bb102b74fb420fd56",
+  "_resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz",
+  "_from": "mime-db@>=1.19.0 <1.20.0"
 }
diff --git a/deps/npm/node_modules/request/node_modules/mime-types/package.json b/deps/npm/node_modules/request/node_modules/mime-types/package.json
new file mode 100644
index 00000000000000..3292c714cc493f
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/mime-types/package.json
@@ -0,0 +1,60 @@
+{
+  "name": "mime-types",
+  "description": "The ultimate javascript content-type utility.",
+  "version": "2.1.7",
+  "contributors": [
+    {
+      "name": "Douglas Christopher Wilson",
+      "email": "doug@somethingdoug.com"
+    },
+    {
+      "name": "Jeremiah Senkpiel",
+      "email": "fishrock123@rocketmail.com",
+      "url": "https://searchbeam.jit.su"
+    },
+    {
+      "name": "Jonathan Ong",
+      "email": "me@jongleberry.com",
+      "url": "http://jongleberry.com"
+    }
+  ],
+  "license": "MIT",
+  "keywords": [
+    "mime",
+    "types"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jshttp/mime-types.git"
+  },
+  "dependencies": {
+    "mime-db": "~1.19.0"
+  },
+  "devDependencies": {
+    "istanbul": "0.3.20",
+    "mocha": "~1.21.5"
+  },
+  "files": [
+    "HISTORY.md",
+    "LICENSE",
+    "index.js"
+  ],
+  "engines": {
+    "node": ">= 0.6"
+  },
+  "scripts": {
+    "test": "mocha --reporter spec test/test.js",
+    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot test/test.js",
+    "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter dot test/test.js"
+  },
+  "readme": "# mime-types\n\n[![NPM Version][npm-image]][npm-url]\n[![NPM Downloads][downloads-image]][downloads-url]\n[![Node.js Version][node-version-image]][node-version-url]\n[![Build Status][travis-image]][travis-url]\n[![Test Coverage][coveralls-image]][coveralls-url]\n\nThe ultimate javascript content-type utility.\n\nSimilar to [node-mime](https://github.com/broofa/node-mime), except:\n\n- __No fallbacks.__ Instead of naively returning the first available type, `mime-types` simply returns `false`,\n  so do `var type = mime.lookup('unrecognized') || 'application/octet-stream'`.\n- No `new Mime()` business, so you could do `var lookup = require('mime-types').lookup`.\n- Additional mime types are added such as jade and stylus via [mime-db](https://github.com/jshttp/mime-db)\n- No `.define()` functionality\n\nOtherwise, the API is compatible.\n\n## Install\n\n```sh\n$ npm install mime-types\n```\n\n## Adding Types\n\nAll mime types are based on [mime-db](https://github.com/jshttp/mime-db),\nso open a PR there if you'd like to add mime types.\n\n## API\n\n```js\nvar mime = require('mime-types')\n```\n\nAll functions return `false` if input is invalid or not found.\n\n### mime.lookup(path)\n\nLookup the content-type associated with a file.\n\n```js\nmime.lookup('json')             // 'application/json'\nmime.lookup('.md')              // 'text/x-markdown'\nmime.lookup('file.html')        // 'text/html'\nmime.lookup('folder/file.js')   // 'application/javascript'\nmime.lookup('folder/.htaccess') // false\n\nmime.lookup('cats') // false\n```\n\n### mime.contentType(type)\n\nCreate a full content-type header given a content-type or extension.\n\n```js\nmime.contentType('markdown')  // 'text/x-markdown; charset=utf-8'\nmime.contentType('file.json') // 'application/json; charset=utf-8'\n\n// from a full path\nmime.contentType(path.extname('/path/to/file.json')) // 'application/json; charset=utf-8'\n```\n\n### mime.extension(type)\n\nGet the default extension for a content-type.\n\n```js\nmime.extension('application/octet-stream') // 'bin'\n```\n\n### mime.charset(type)\n\nLookup the implied default charset of a content-type.\n\n```js\nmime.charset('text/x-markdown') // 'UTF-8'\n```\n\n### var type = mime.types[extension]\n\nA map of content-types by extension.\n\n### [extensions...] = mime.extensions[type]\n\nA map of extensions by content-type.\n\n## License\n\n[MIT](LICENSE)\n\n[npm-image]: https://img.shields.io/npm/v/mime-types.svg\n[npm-url]: https://npmjs.org/package/mime-types\n[node-version-image]: https://img.shields.io/node/v/mime-types.svg\n[node-version-url]: http://nodejs.org/download/\n[travis-image]: https://img.shields.io/travis/jshttp/mime-types/master.svg\n[travis-url]: https://travis-ci.org/jshttp/mime-types\n[coveralls-image]: https://img.shields.io/coveralls/jshttp/mime-types/master.svg\n[coveralls-url]: https://coveralls.io/r/jshttp/mime-types\n[downloads-image]: https://img.shields.io/npm/dm/mime-types.svg\n[downloads-url]: https://npmjs.org/package/mime-types\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/jshttp/mime-types/issues"
+  },
+  "homepage": "https://github.com/jshttp/mime-types#readme",
+  "_id": "mime-types@2.1.7",
+  "_shasum": "ff603970e3c731ef6f7f4df3c9a0f463a13c2755",
+  "_resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
+  "_from": "mime-types@>=2.1.7 <2.2.0"
+}
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/.npmignore b/deps/npm/node_modules/request/node_modules/node-uuid/.npmignore
new file mode 100644
index 00000000000000..fd4f2b066b339e
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/node-uuid/.npmignore
@@ -0,0 +1,2 @@
+node_modules
+.DS_Store
diff --git a/deps/npm/node_modules/node-uuid/LICENSE.md b/deps/npm/node_modules/request/node_modules/node-uuid/LICENSE.md
similarity index 100%
rename from deps/npm/node_modules/node-uuid/LICENSE.md
rename to deps/npm/node_modules/request/node_modules/node-uuid/LICENSE.md
diff --git a/deps/npm/node_modules/node-uuid/README.md b/deps/npm/node_modules/request/node_modules/node-uuid/README.md
similarity index 100%
rename from deps/npm/node_modules/node-uuid/README.md
rename to deps/npm/node_modules/request/node_modules/node-uuid/README.md
diff --git a/deps/npm/node_modules/node-uuid/benchmark/README.md b/deps/npm/node_modules/request/node_modules/node-uuid/benchmark/README.md
similarity index 100%
rename from deps/npm/node_modules/node-uuid/benchmark/README.md
rename to deps/npm/node_modules/request/node_modules/node-uuid/benchmark/README.md
diff --git a/deps/npm/node_modules/node-uuid/benchmark/bench.gnu b/deps/npm/node_modules/request/node_modules/node-uuid/benchmark/bench.gnu
similarity index 100%
rename from deps/npm/node_modules/node-uuid/benchmark/bench.gnu
rename to deps/npm/node_modules/request/node_modules/node-uuid/benchmark/bench.gnu
diff --git a/deps/npm/node_modules/node-uuid/benchmark/bench.sh b/deps/npm/node_modules/request/node_modules/node-uuid/benchmark/bench.sh
similarity index 100%
rename from deps/npm/node_modules/node-uuid/benchmark/bench.sh
rename to deps/npm/node_modules/request/node_modules/node-uuid/benchmark/bench.sh
diff --git a/deps/npm/node_modules/node-uuid/benchmark/benchmark-native.c b/deps/npm/node_modules/request/node_modules/node-uuid/benchmark/benchmark-native.c
similarity index 100%
rename from deps/npm/node_modules/node-uuid/benchmark/benchmark-native.c
rename to deps/npm/node_modules/request/node_modules/node-uuid/benchmark/benchmark-native.c
diff --git a/deps/npm/node_modules/node-uuid/benchmark/benchmark.js b/deps/npm/node_modules/request/node_modules/node-uuid/benchmark/benchmark.js
similarity index 100%
rename from deps/npm/node_modules/node-uuid/benchmark/benchmark.js
rename to deps/npm/node_modules/request/node_modules/node-uuid/benchmark/benchmark.js
diff --git a/deps/npm/node_modules/node-uuid/bin/uuid b/deps/npm/node_modules/request/node_modules/node-uuid/bin/uuid
similarity index 100%
rename from deps/npm/node_modules/node-uuid/bin/uuid
rename to deps/npm/node_modules/request/node_modules/node-uuid/bin/uuid
diff --git a/deps/npm/node_modules/node-uuid/bower.json b/deps/npm/node_modules/request/node_modules/node-uuid/bower.json
similarity index 100%
rename from deps/npm/node_modules/node-uuid/bower.json
rename to deps/npm/node_modules/request/node_modules/node-uuid/bower.json
diff --git a/deps/npm/node_modules/node-uuid/component.json b/deps/npm/node_modules/request/node_modules/node-uuid/component.json
similarity index 100%
rename from deps/npm/node_modules/node-uuid/component.json
rename to deps/npm/node_modules/request/node_modules/node-uuid/component.json
diff --git a/deps/npm/node_modules/request/node_modules/node-uuid/package.json b/deps/npm/node_modules/request/node_modules/node-uuid/package.json
new file mode 100644
index 00000000000000..076eaa154863ca
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/node-uuid/package.json
@@ -0,0 +1,49 @@
+{
+  "name": "node-uuid",
+  "description": "Rigorous implementation of RFC4122 (v1 and v4) UUIDs.",
+  "url": "http://github.com/broofa/node-uuid",
+  "keywords": [
+    "uuid",
+    "guid",
+    "rfc4122"
+  ],
+  "author": {
+    "name": "Robert Kieffer",
+    "email": "robert@broofa.com"
+  },
+  "contributors": [
+    {
+      "name": "Christoph Tavan",
+      "email": "dev@tavan.de"
+    }
+  ],
+  "bin": {
+    "uuid": "./bin/uuid"
+  },
+  "scripts": {
+    "test": "node test/test.js"
+  },
+  "lib": ".",
+  "main": "./uuid.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/broofa/node-uuid.git"
+  },
+  "version": "1.4.3",
+  "licenses": [
+    {
+      "type": "MIT",
+      "url": "https://raw.github.com/broofa/node-uuid/master/LICENSE.md"
+    }
+  ],
+  "readme": "# node-uuid\n\nSimple, fast generation of [RFC4122](http://www.ietf.org/rfc/rfc4122.txt) UUIDS.\n\nFeatures:\n\n* Generate RFC4122 version 1 or version 4 UUIDs\n* Runs in node.js and all browsers.\n* Registered as a [ComponentJS](https://github.com/component/component) [component](https://github.com/component/component/wiki/Components) ('broofa/node-uuid').\n* Cryptographically strong random # generation on supporting platforms\n* 1.1K minified and gzip'ed  (Want something smaller?  Check this [crazy shit](https://gist.github.com/982883) out! )\n* [Annotated source code](http://broofa.github.com/node-uuid/docs/uuid.html)\n* Comes with a Command Line Interface for generating uuids on the command line\n\n## Getting Started\n\nInstall it in your browser:\n\n```html\n<script src=\"uuid.js\"></script>\n```\n\nOr in node.js:\n\n```\nnpm install node-uuid\n```\n\n```javascript\nvar uuid = require('node-uuid');\n```\n\nThen create some ids ...\n\n```javascript\n// Generate a v1 (time-based) id\nuuid.v1(); // -> '6c84fb90-12c4-11e1-840d-7b25c5ee775a'\n\n// Generate a v4 (random) id\nuuid.v4(); // -> '110ec58a-a0f2-4ac4-8393-c866d813b8d1'\n```\n\n## API\n\n### uuid.v1([`options` [, `buffer` [, `offset`]]])\n\nGenerate and return a RFC4122 v1 (timestamp-based) UUID.\n\n* `options` - (Object) Optional uuid state to apply. Properties may include:\n\n  * `node` - (Array) Node id as Array of 6 bytes (per 4.1.6). Default: Randomly generated ID.  See note 1.\n  * `clockseq` - (Number between 0 - 0x3fff) RFC clock sequence.  Default: An internally maintained clockseq is used.\n  * `msecs` - (Number | Date) Time in milliseconds since unix Epoch.  Default: The current time is used.\n  * `nsecs` - (Number between 0-9999) additional time, in 100-nanosecond units. Ignored if `msecs` is unspecified. Default: internal uuid counter is used, as per 4.2.1.2.\n\n* `buffer` - (Array | Buffer) Array or buffer where UUID bytes are to be written.\n* `offset` - (Number) Starting index in `buffer` at which to begin writing.\n\nReturns `buffer`, if specified, otherwise the string form of the UUID\n\nNotes:\n\n1. The randomly generated node id is only guaranteed to stay constant for the lifetime of the current JS runtime. (Future versions of this module may use persistent storage mechanisms to extend this guarantee.)\n\nExample: Generate string UUID with fully-specified options\n\n```javascript\nuuid.v1({\n  node: [0x01, 0x23, 0x45, 0x67, 0x89, 0xab],\n  clockseq: 0x1234,\n  msecs: new Date('2011-11-01').getTime(),\n  nsecs: 5678\n});   // -> \"710b962e-041c-11e1-9234-0123456789ab\"\n```\n\nExample: In-place generation of two binary IDs\n\n```javascript\n// Generate two ids in an array\nvar arr = new Array(32); // -> []\nuuid.v1(null, arr, 0);   // -> [02 a2 ce 90 14 32 11 e1 85 58 0b 48 8e 4f c1 15]\nuuid.v1(null, arr, 16);  // -> [02 a2 ce 90 14 32 11 e1 85 58 0b 48 8e 4f c1 15 02 a3 1c b0 14 32 11 e1 85 58 0b 48 8e 4f c1 15]\n\n// Optionally use uuid.unparse() to get stringify the ids\nuuid.unparse(buffer);    // -> '02a2ce90-1432-11e1-8558-0b488e4fc115'\nuuid.unparse(buffer, 16) // -> '02a31cb0-1432-11e1-8558-0b488e4fc115'\n```\n\n### uuid.v4([`options` [, `buffer` [, `offset`]]])\n\nGenerate and return a RFC4122 v4 UUID.\n\n* `options` - (Object) Optional uuid state to apply. Properties may include:\n\n  * `random` - (Number[16]) Array of 16 numbers (0-255) to use in place of randomly generated values\n  * `rng` - (Function) Random # generator to use.  Set to one of the built-in generators - `uuid.mathRNG` (all platforms), `uuid.nodeRNG` (node.js only), `uuid.whatwgRNG` (WebKit only) - or a custom function that returns an array[16] of byte values.\n\n* `buffer` - (Array | Buffer) Array or buffer where UUID bytes are to be written.\n* `offset` - (Number) Starting index in `buffer` at which to begin writing.\n\nReturns `buffer`, if specified, otherwise the string form of the UUID\n\nExample: Generate string UUID with fully-specified options\n\n```javascript\nuuid.v4({\n  random: [\n    0x10, 0x91, 0x56, 0xbe, 0xc4, 0xfb, 0xc1, 0xea,\n    0x71, 0xb4, 0xef, 0xe1, 0x67, 0x1c, 0x58, 0x36\n  ]\n});\n// -> \"109156be-c4fb-41ea-b1b4-efe1671c5836\"\n```\n\nExample: Generate two IDs in a single buffer\n\n```javascript\nvar buffer = new Array(32); // (or 'new Buffer' in node.js)\nuuid.v4(null, buffer, 0);\nuuid.v4(null, buffer, 16);\n```\n\n### uuid.parse(id[, buffer[, offset]])\n### uuid.unparse(buffer[, offset])\n\nParse and unparse UUIDs\n\n  * `id` - (String) UUID(-like) string\n  * `buffer` - (Array | Buffer) Array or buffer where UUID bytes are to be written. Default: A new Array or Buffer is used\n  * `offset` - (Number) Starting index in `buffer` at which to begin writing. Default: 0\n\nExample parsing and unparsing a UUID string\n\n```javascript\nvar bytes = uuid.parse('797ff043-11eb-11e1-80d6-510998755d10'); // -> <Buffer 79 7f f0 43 11 eb 11 e1 80 d6 51 09 98 75 5d 10>\nvar string = uuid.unparse(bytes); // -> '797ff043-11eb-11e1-80d6-510998755d10'\n```\n\n### uuid.noConflict()\n\n(Browsers only) Set `uuid` property back to it's previous value.\n\nReturns the node-uuid object.\n\nExample:\n\n```javascript\nvar myUuid = uuid.noConflict();\nmyUuid.v1(); // -> '6c84fb90-12c4-11e1-840d-7b25c5ee775a'\n```\n\n## Deprecated APIs\n\nSupport for the following v1.2 APIs is available in v1.3, but is deprecated and will be removed in the next major version.\n\n### uuid([format [, buffer [, offset]]])\n\nuuid() has become uuid.v4(), and the `format` argument is now implicit in the `buffer` argument. (i.e. if you specify a buffer, the format is assumed to be binary).\n\n### uuid.BufferClass\n\nThe class of container created when generating binary uuid data if no buffer argument is specified.  This is expected to go away, with no replacement API.\n\n## Command Line Interface\n\nTo use the executable, it's probably best to install this library globally.\n\n`npm install -g node-uuid`\n\nUsage:\n\n```\nUSAGE: uuid [version] [options]\n\n\noptions:\n\n--help                     Display this message and exit\n```\n\n`version` must be an RFC4122 version that is supported by this library, which is currently version 1 and version 4 (denoted by \"v1\" and \"v4\", respectively). `version` defaults to version 4 when not supplied.\n\n### Examples\n\n```\n> uuid\n3a91f950-dec8-4688-ba14-5b7bbfc7a563\n```\n\n```\n> uuid v1\n9d0b43e0-7696-11e3-964b-250efa37a98e\n```\n\n```\n> uuid v4\n6790ac7c-24ac-4f98-8464-42f6d98a53ae\n```\n\n## Testing\n\nIn node.js\n\n```\nnpm test\n```\n\nIn Browser\n\n```\nopen test/test.html\n```\n\n### Benchmarking\n\nRequires node.js\n\n```\nnpm install uuid uuid-js\nnode benchmark/benchmark.js\n```\n\nFor a more complete discussion of node-uuid performance, please see the `benchmark/README.md` file, and the [benchmark wiki](https://github.com/broofa/node-uuid/wiki/Benchmark)\n\nFor browser performance [checkout the JSPerf tests](http://jsperf.com/node-uuid-performance).\n\n## Release notes\n\n### 1.4.0\n\n* Improved module context detection\n* Removed public RNG functions\n\n### 1.3.2\n\n* Improve tests and handling of v1() options (Issue #24)\n* Expose RNG option to allow for perf testing with different generators\n\n### 1.3.0\n\n* Support for version 1 ids, thanks to [@ctavan](https://github.com/ctavan)!\n* Support for node.js crypto API\n* De-emphasizing performance in favor of a) cryptographic quality PRNGs where available and b) more manageable code\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/broofa/node-uuid/issues"
+  },
+  "homepage": "https://github.com/broofa/node-uuid#readme",
+  "_id": "node-uuid@1.4.3",
+  "_shasum": "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9",
+  "_resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz",
+  "_from": "node-uuid@>=1.4.3 <1.5.0"
+}
diff --git a/deps/npm/node_modules/node-uuid/test/compare_v1.js b/deps/npm/node_modules/request/node_modules/node-uuid/test/compare_v1.js
similarity index 100%
rename from deps/npm/node_modules/node-uuid/test/compare_v1.js
rename to deps/npm/node_modules/request/node_modules/node-uuid/test/compare_v1.js
diff --git a/deps/npm/node_modules/node-uuid/test/test.html b/deps/npm/node_modules/request/node_modules/node-uuid/test/test.html
similarity index 100%
rename from deps/npm/node_modules/node-uuid/test/test.html
rename to deps/npm/node_modules/request/node_modules/node-uuid/test/test.html
diff --git a/deps/npm/node_modules/node-uuid/test/test.js b/deps/npm/node_modules/request/node_modules/node-uuid/test/test.js
similarity index 100%
rename from deps/npm/node_modules/node-uuid/test/test.js
rename to deps/npm/node_modules/request/node_modules/node-uuid/test/test.js
diff --git a/deps/npm/node_modules/node-uuid/uuid.js b/deps/npm/node_modules/request/node_modules/node-uuid/uuid.js
similarity index 100%
rename from deps/npm/node_modules/node-uuid/uuid.js
rename to deps/npm/node_modules/request/node_modules/node-uuid/uuid.js
diff --git a/deps/npm/node_modules/oauth-sign/LICENSE b/deps/npm/node_modules/request/node_modules/oauth-sign/LICENSE
similarity index 100%
rename from deps/npm/node_modules/oauth-sign/LICENSE
rename to deps/npm/node_modules/request/node_modules/oauth-sign/LICENSE
diff --git a/deps/npm/node_modules/oauth-sign/README.md b/deps/npm/node_modules/request/node_modules/oauth-sign/README.md
similarity index 100%
rename from deps/npm/node_modules/oauth-sign/README.md
rename to deps/npm/node_modules/request/node_modules/oauth-sign/README.md
diff --git a/deps/npm/node_modules/oauth-sign/index.js b/deps/npm/node_modules/request/node_modules/oauth-sign/index.js
similarity index 100%
rename from deps/npm/node_modules/oauth-sign/index.js
rename to deps/npm/node_modules/request/node_modules/oauth-sign/index.js
diff --git a/deps/npm/node_modules/oauth-sign/package.json b/deps/npm/node_modules/request/node_modules/oauth-sign/package.json
similarity index 70%
rename from deps/npm/node_modules/oauth-sign/package.json
rename to deps/npm/node_modules/request/node_modules/oauth-sign/package.json
index 6fd0150221fab1..eeaaa68d3596ce 100644
--- a/deps/npm/node_modules/oauth-sign/package.json
+++ b/deps/npm/node_modules/request/node_modules/oauth-sign/package.json
@@ -1,60 +1,40 @@
 {
-  "_args": [
-    [
-      "oauth-sign@~0.8.0",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "oauth-sign@>=0.8.0 <0.9.0",
-  "_id": "oauth-sign@0.8.0",
-  "_inCache": true,
-  "_location": "/oauth-sign",
-  "_nodeVersion": "0.12.4",
-  "_npmUser": {
-    "email": "simeonvelichkov@gmail.com",
-    "name": "simov"
-  },
-  "_npmVersion": "2.10.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "oauth-sign",
-    "raw": "oauth-sign@~0.8.0",
-    "rawSpec": "~0.8.0",
-    "scope": null,
-    "spec": ">=0.8.0 <0.9.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/request"
-  ],
-  "_resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz",
-  "_shasum": "938fdc875765ba527137d8aec9d178e24debc553",
-  "_shrinkwrap": null,
-  "_spec": "oauth-sign@~0.8.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
   "author": {
-    "email": "mikeal.rogers@gmail.com",
     "name": "Mikeal Rogers",
+    "email": "mikeal.rogers@gmail.com",
     "url": "http://www.futurealoof.com"
   },
-  "bugs": {
-    "url": "https://github.com/mikeal/oauth-sign/issues"
+  "name": "oauth-sign",
+  "description": "OAuth 1 signing. Formerly a vendor lib in mikeal/request, now a standalone module.",
+  "version": "0.8.0",
+  "license": "Apache-2.0",
+  "repository": {
+    "url": "git+https://github.com/mikeal/oauth-sign.git"
   },
+  "main": "index.js",
   "dependencies": {},
-  "description": "OAuth 1 signing. Formerly a vendor lib in mikeal/request, now a standalone module.",
   "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "938fdc875765ba527137d8aec9d178e24debc553",
-    "tarball": "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
-  },
+  "optionalDependencies": {},
   "engines": {
     "node": "*"
   },
+  "scripts": {
+    "test": "node test.js"
+  },
   "gitHead": "e1f2b42ff039901ce977f8e81918767d97d496b5",
+  "bugs": {
+    "url": "https://github.com/mikeal/oauth-sign/issues"
+  },
   "homepage": "https://github.com/mikeal/oauth-sign#readme",
-  "license": "Apache-2.0",
-  "main": "index.js",
+  "_id": "oauth-sign@0.8.0",
+  "_shasum": "938fdc875765ba527137d8aec9d178e24debc553",
+  "_from": "oauth-sign@>=0.8.0 <0.9.0",
+  "_npmVersion": "2.10.1",
+  "_nodeVersion": "0.12.4",
+  "_npmUser": {
+    "name": "simov",
+    "email": "simeonvelichkov@gmail.com"
+  },
   "maintainers": [
     {
       "name": "mikeal",
@@ -69,13 +49,11 @@
       "email": "simeonvelichkov@gmail.com"
     }
   ],
-  "name": "oauth-sign",
-  "optionalDependencies": {},
-  "repository": {
-    "url": "git+https://github.com/mikeal/oauth-sign.git"
-  },
-  "scripts": {
-    "test": "node test.js"
+  "dist": {
+    "shasum": "938fdc875765ba527137d8aec9d178e24debc553",
+    "tarball": "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
   },
-  "version": "0.8.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/oauth-sign/test.js b/deps/npm/node_modules/request/node_modules/oauth-sign/test.js
similarity index 100%
rename from deps/npm/node_modules/oauth-sign/test.js
rename to deps/npm/node_modules/request/node_modules/oauth-sign/test.js
diff --git a/deps/npm/node_modules/qs/.eslintignore b/deps/npm/node_modules/request/node_modules/qs/.eslintignore
similarity index 100%
rename from deps/npm/node_modules/qs/.eslintignore
rename to deps/npm/node_modules/request/node_modules/qs/.eslintignore
diff --git a/deps/npm/node_modules/qs/.npmignore b/deps/npm/node_modules/request/node_modules/qs/.npmignore
similarity index 100%
rename from deps/npm/node_modules/qs/.npmignore
rename to deps/npm/node_modules/request/node_modules/qs/.npmignore
diff --git a/deps/npm/node_modules/qs/.travis.yml b/deps/npm/node_modules/request/node_modules/qs/.travis.yml
similarity index 90%
rename from deps/npm/node_modules/qs/.travis.yml
rename to deps/npm/node_modules/request/node_modules/qs/.travis.yml
index 7a64dd2210cb10..335fded1ab779a 100644
--- a/deps/npm/node_modules/qs/.travis.yml
+++ b/deps/npm/node_modules/request/node_modules/qs/.travis.yml
@@ -3,5 +3,6 @@ language: node_js
 node_js:
   - 0.10
   - 4.0
+  - 4
 
 sudo: false
diff --git a/deps/npm/node_modules/qs/CHANGELOG.md b/deps/npm/node_modules/request/node_modules/qs/CHANGELOG.md
similarity index 100%
rename from deps/npm/node_modules/qs/CHANGELOG.md
rename to deps/npm/node_modules/request/node_modules/qs/CHANGELOG.md
diff --git a/deps/npm/node_modules/qs/CONTRIBUTING.md b/deps/npm/node_modules/request/node_modules/qs/CONTRIBUTING.md
similarity index 100%
rename from deps/npm/node_modules/qs/CONTRIBUTING.md
rename to deps/npm/node_modules/request/node_modules/qs/CONTRIBUTING.md
diff --git a/deps/npm/node_modules/qs/LICENSE b/deps/npm/node_modules/request/node_modules/qs/LICENSE
similarity index 100%
rename from deps/npm/node_modules/qs/LICENSE
rename to deps/npm/node_modules/request/node_modules/qs/LICENSE
diff --git a/deps/npm/node_modules/qs/README.md b/deps/npm/node_modules/request/node_modules/qs/README.md
similarity index 96%
rename from deps/npm/node_modules/qs/README.md
rename to deps/npm/node_modules/request/node_modules/qs/README.md
index 369f385672cff9..3c61db31a2214f 100644
--- a/deps/npm/node_modules/qs/README.md
+++ b/deps/npm/node_modules/request/node_modules/qs/README.md
@@ -201,7 +201,7 @@ Qs.parse('a[][b]=c');
 Qs.stringify(object, [options]);
 ```
 
-When stringifying, **qs** always URI encodes output. Objects are stringified as you would expect:
+When stringifying, **qs** by default URI encodes output. Objects are stringified as you would expect:
 
 ```javascript
 Qs.stringify({ a: 'b' });
@@ -210,6 +210,13 @@ Qs.stringify({ a: { b: 'c' } });
 // 'a%5Bb%5D=c'
 ```
 
+This encoding can be disabled by setting the `encode` option to `false`:
+
+```javascript
+Qs.stringify({ a: { b: 'c' } }, { encode: false });
+// 'a[b]=c'
+```
+
 Examples beyond this point will be shown as though the output is not URI encoded for clarity. Please note that the return values in these cases *will* be URI encoded during real usage.
 
 When arrays are stringified, by default they are given explicit indices:
diff --git a/deps/npm/node_modules/qs/bower.json b/deps/npm/node_modules/request/node_modules/qs/bower.json
similarity index 100%
rename from deps/npm/node_modules/qs/bower.json
rename to deps/npm/node_modules/request/node_modules/qs/bower.json
diff --git a/deps/npm/node_modules/qs/component.json b/deps/npm/node_modules/request/node_modules/qs/component.json
similarity index 100%
rename from deps/npm/node_modules/qs/component.json
rename to deps/npm/node_modules/request/node_modules/qs/component.json
diff --git a/deps/npm/node_modules/qs/dist/qs.js b/deps/npm/node_modules/request/node_modules/qs/dist/qs.js
similarity index 94%
rename from deps/npm/node_modules/qs/dist/qs.js
rename to deps/npm/node_modules/request/node_modules/qs/dist/qs.js
index 2b9fec30183921..b72e97682d4b10 100644
--- a/deps/npm/node_modules/qs/dist/qs.js
+++ b/deps/npm/node_modules/request/node_modules/qs/dist/qs.js
@@ -228,11 +228,13 @@ var internals = {
             return prefix;
         }
     },
-    strictNullHandling: false
+    strictNullHandling: false,
+    skipNulls: false,
+    encode: true
 };
 
 
-internals.stringify = function (obj, prefix, generateArrayPrefix, strictNullHandling, filter) {
+internals.stringify = function (obj, prefix, generateArrayPrefix, strictNullHandling, skipNulls, encode, filter) {
 
     if (typeof filter === 'function') {
         obj = filter(prefix, obj);
@@ -245,7 +247,7 @@ internals.stringify = function (obj, prefix, generateArrayPrefix, strictNullHand
     }
     else if (obj === null) {
         if (strictNullHandling) {
-            return Utils.encode(prefix);
+            return encode ? Utils.encode(prefix) : prefix;
         }
 
         obj = '';
@@ -255,7 +257,10 @@ internals.stringify = function (obj, prefix, generateArrayPrefix, strictNullHand
         typeof obj === 'number' ||
         typeof obj === 'boolean') {
 
-        return [Utils.encode(prefix) + '=' + Utils.encode(obj)];
+        if (encode) {
+            return [Utils.encode(prefix) + '=' + Utils.encode(obj)];
+        }
+        return [prefix + '=' + obj];
     }
 
     var values = [];
@@ -268,11 +273,17 @@ internals.stringify = function (obj, prefix, generateArrayPrefix, strictNullHand
     for (var i = 0, il = objKeys.length; i < il; ++i) {
         var key = objKeys[i];
 
+        if (skipNulls &&
+            obj[key] === null) {
+
+            continue;
+        }
+
         if (Array.isArray(obj)) {
-            values = values.concat(internals.stringify(obj[key], generateArrayPrefix(prefix, key), generateArrayPrefix, strictNullHandling, filter));
+            values = values.concat(internals.stringify(obj[key], generateArrayPrefix(prefix, key), generateArrayPrefix, strictNullHandling, skipNulls, encode, filter));
         }
         else {
-            values = values.concat(internals.stringify(obj[key], prefix + '[' + key + ']', generateArrayPrefix, strictNullHandling, filter));
+            values = values.concat(internals.stringify(obj[key], prefix + '[' + key + ']', generateArrayPrefix, strictNullHandling, skipNulls, encode, filter));
         }
     }
 
@@ -285,6 +296,8 @@ module.exports = function (obj, options) {
     options = options || {};
     var delimiter = typeof options.delimiter === 'undefined' ? internals.delimiter : options.delimiter;
     var strictNullHandling = typeof options.strictNullHandling === 'boolean' ? options.strictNullHandling : internals.strictNullHandling;
+    var skipNulls = typeof options.skipNulls === 'boolean' ? options.skipNulls : internals.skipNulls;
+    var encode = typeof options.encode === 'boolean' ? options.encode : internals.encode;
     var objKeys;
     var filter;
     if (typeof options.filter === 'function') {
@@ -319,9 +332,17 @@ module.exports = function (obj, options) {
     if (!objKeys) {
         objKeys = Object.keys(obj);
     }
+
     for (var i = 0, il = objKeys.length; i < il; ++i) {
         var key = objKeys[i];
-        keys = keys.concat(internals.stringify(obj[key], key, generateArrayPrefix, strictNullHandling, filter));
+
+        if (skipNulls &&
+            obj[key] === null) {
+
+            continue;
+        }
+
+        keys = keys.concat(internals.stringify(obj[key], key, generateArrayPrefix, strictNullHandling, skipNulls, encode, filter));
     }
 
     return keys.join(delimiter);
diff --git a/deps/npm/node_modules/qs/lib/index.js b/deps/npm/node_modules/request/node_modules/qs/lib/index.js
similarity index 100%
rename from deps/npm/node_modules/qs/lib/index.js
rename to deps/npm/node_modules/request/node_modules/qs/lib/index.js
diff --git a/deps/npm/node_modules/qs/lib/parse.js b/deps/npm/node_modules/request/node_modules/qs/lib/parse.js
similarity index 100%
rename from deps/npm/node_modules/qs/lib/parse.js
rename to deps/npm/node_modules/request/node_modules/qs/lib/parse.js
diff --git a/deps/npm/node_modules/qs/lib/stringify.js b/deps/npm/node_modules/request/node_modules/qs/lib/stringify.js
similarity index 90%
rename from deps/npm/node_modules/qs/lib/stringify.js
rename to deps/npm/node_modules/request/node_modules/qs/lib/stringify.js
index 6a73004c4ceb3a..d05aa8752a160f 100644
--- a/deps/npm/node_modules/qs/lib/stringify.js
+++ b/deps/npm/node_modules/request/node_modules/qs/lib/stringify.js
@@ -27,7 +27,7 @@ var internals = {
 };
 
 
-internals.stringify = function (obj, prefix, generateArrayPrefix, strictNullHandling, skipNulls, encode, filter) {
+internals.stringify = function (obj, prefix, generateArrayPrefix, strictNullHandling, skipNulls, encode, filter, sort) {
 
     if (typeof filter === 'function') {
         obj = filter(prefix, obj);
@@ -62,7 +62,14 @@ internals.stringify = function (obj, prefix, generateArrayPrefix, strictNullHand
         return values;
     }
 
-    var objKeys = Array.isArray(filter) ? filter : Object.keys(obj);
+    var objKeys;
+    if (Array.isArray(filter)) {
+        objKeys = filter;
+    } else {
+        var keys = Object.keys(obj);
+        objKeys = sort ? keys.sort(sort) : keys;
+    }
+
     for (var i = 0, il = objKeys.length; i < il; ++i) {
         var key = objKeys[i];
 
@@ -91,6 +98,7 @@ module.exports = function (obj, options) {
     var strictNullHandling = typeof options.strictNullHandling === 'boolean' ? options.strictNullHandling : internals.strictNullHandling;
     var skipNulls = typeof options.skipNulls === 'boolean' ? options.skipNulls : internals.skipNulls;
     var encode = typeof options.encode === 'boolean' ? options.encode : internals.encode;
+    var sort = typeof options.sort === 'function' ? options.sort : null;
     var objKeys;
     var filter;
     if (typeof options.filter === 'function') {
@@ -126,6 +134,10 @@ module.exports = function (obj, options) {
         objKeys = Object.keys(obj);
     }
 
+    if (sort) {
+        objKeys.sort(sort);
+    }
+
     for (var i = 0, il = objKeys.length; i < il; ++i) {
         var key = objKeys[i];
 
@@ -135,7 +147,7 @@ module.exports = function (obj, options) {
             continue;
         }
 
-        keys = keys.concat(internals.stringify(obj[key], key, generateArrayPrefix, strictNullHandling, skipNulls, encode, filter));
+        keys = keys.concat(internals.stringify(obj[key], key, generateArrayPrefix, strictNullHandling, skipNulls, encode, filter, sort));
     }
 
     return keys.join(delimiter);
diff --git a/deps/npm/node_modules/qs/lib/utils.js b/deps/npm/node_modules/request/node_modules/qs/lib/utils.js
similarity index 100%
rename from deps/npm/node_modules/qs/lib/utils.js
rename to deps/npm/node_modules/request/node_modules/qs/lib/utils.js
diff --git a/deps/npm/node_modules/request/node_modules/qs/package.json b/deps/npm/node_modules/request/node_modules/qs/package.json
new file mode 100644
index 00000000000000..7e60df7007dfe5
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/qs/package.json
@@ -0,0 +1,59 @@
+{
+  "name": "qs",
+  "description": "A querystring parser that supports nesting and arrays, with a depth limit",
+  "homepage": "https://github.com/hapijs/qs",
+  "version": "5.2.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/hapijs/qs.git"
+  },
+  "main": "lib/index.js",
+  "keywords": [
+    "querystring",
+    "qs"
+  ],
+  "engines": ">=0.10.40",
+  "dependencies": {},
+  "devDependencies": {
+    "browserify": "^10.2.1",
+    "code": "1.x.x",
+    "lab": "5.x.x"
+  },
+  "scripts": {
+    "test": "lab -a code -t 100 -L",
+    "test-tap": "lab -a code -r tap -o tests.tap",
+    "test-cov-html": "lab -a code -r html -o coverage.html",
+    "dist": "browserify --standalone Qs lib/index.js > dist/qs.js"
+  },
+  "license": "BSD-3-Clause",
+  "gitHead": "a341cdf2fadba5ede1ce6c95c7051f6f31f37b81",
+  "bugs": {
+    "url": "https://github.com/hapijs/qs/issues"
+  },
+  "_id": "qs@5.2.0",
+  "_shasum": "a9f31142af468cb72b25b30136ba2456834916be",
+  "_from": "qs@>=5.2.0 <5.3.0",
+  "_npmVersion": "3.3.5",
+  "_nodeVersion": "0.10.40",
+  "_npmUser": {
+    "name": "nlf",
+    "email": "quitlahok@gmail.com"
+  },
+  "dist": {
+    "shasum": "a9f31142af468cb72b25b30136ba2456834916be",
+    "tarball": "http://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
+  },
+  "maintainers": [
+    {
+      "name": "nlf",
+      "email": "quitlahok@gmail.com"
+    },
+    {
+      "name": "hueniverse",
+      "email": "eran@hueniverse.com"
+    }
+  ],
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz",
+  "readme": "ERROR: No README data found!"
+}
diff --git a/deps/npm/node_modules/qs/test/parse.js b/deps/npm/node_modules/request/node_modules/qs/test/parse.js
similarity index 100%
rename from deps/npm/node_modules/qs/test/parse.js
rename to deps/npm/node_modules/request/node_modules/qs/test/parse.js
diff --git a/deps/npm/node_modules/qs/test/stringify.js b/deps/npm/node_modules/request/node_modules/qs/test/stringify.js
similarity index 95%
rename from deps/npm/node_modules/qs/test/stringify.js
rename to deps/npm/node_modules/request/node_modules/qs/test/stringify.js
index 5163700f301ffe..53139ff90586a9 100644
--- a/deps/npm/node_modules/qs/test/stringify.js
+++ b/deps/npm/node_modules/request/node_modules/qs/test/stringify.js
@@ -278,4 +278,16 @@ describe('stringify()', function () {
         expect(Qs.stringify({ a: 'b', c: null }, { strictNullHandling: true, encode: false })).to.equal('a=b&c');
         done();
     });
+
+    it('can sort the keys', function (done) {
+
+        var sort = function alphabeticalSort (a, b) {
+
+            return a.localeCompare(b);
+        };
+
+        expect(Qs.stringify({ a: 'c', z: 'y', b : 'f' }, { sort : sort })).to.equal('a=c&b=f&z=y');
+        expect(Qs.stringify({ a: 'c', z: { j: 'a', i:'b' }, b : 'f' }, { sort : sort })).to.equal('a=c&b=f&z%5Bi%5D=b&z%5Bj%5D=a');
+        done();
+    });
 });
diff --git a/deps/npm/node_modules/qs/test/utils.js b/deps/npm/node_modules/request/node_modules/qs/test/utils.js
similarity index 100%
rename from deps/npm/node_modules/qs/test/utils.js
rename to deps/npm/node_modules/request/node_modules/qs/test/utils.js
diff --git a/deps/npm/node_modules/stringstream/.npmignore b/deps/npm/node_modules/request/node_modules/stringstream/.npmignore
similarity index 100%
rename from deps/npm/node_modules/stringstream/.npmignore
rename to deps/npm/node_modules/request/node_modules/stringstream/.npmignore
diff --git a/deps/npm/node_modules/request/node_modules/stringstream/.travis.yml b/deps/npm/node_modules/request/node_modules/stringstream/.travis.yml
new file mode 100644
index 00000000000000..f1d0f13c8a54d0
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/stringstream/.travis.yml
@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - 0.4
+  - 0.6
diff --git a/deps/npm/node_modules/stringstream/LICENSE.txt b/deps/npm/node_modules/request/node_modules/stringstream/LICENSE.txt
similarity index 100%
rename from deps/npm/node_modules/stringstream/LICENSE.txt
rename to deps/npm/node_modules/request/node_modules/stringstream/LICENSE.txt
diff --git a/deps/npm/node_modules/stringstream/README.md b/deps/npm/node_modules/request/node_modules/stringstream/README.md
similarity index 100%
rename from deps/npm/node_modules/stringstream/README.md
rename to deps/npm/node_modules/request/node_modules/stringstream/README.md
diff --git a/deps/npm/node_modules/stringstream/example.js b/deps/npm/node_modules/request/node_modules/stringstream/example.js
similarity index 100%
rename from deps/npm/node_modules/stringstream/example.js
rename to deps/npm/node_modules/request/node_modules/stringstream/example.js
diff --git a/deps/npm/node_modules/stringstream/package.json b/deps/npm/node_modules/request/node_modules/stringstream/package.json
similarity index 59%
rename from deps/npm/node_modules/stringstream/package.json
rename to deps/npm/node_modules/request/node_modules/stringstream/package.json
index 890b0ae3d0084d..37b7bec834a17a 100644
--- a/deps/npm/node_modules/stringstream/package.json
+++ b/deps/npm/node_modules/request/node_modules/stringstream/package.json
@@ -1,70 +1,32 @@
 {
-  "_args": [
-    [
-      "stringstream@~0.0.4",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "stringstream@>=0.0.4 <0.1.0",
-  "_id": "stringstream@0.0.4",
-  "_inCache": true,
-  "_location": "/stringstream",
-  "_npmUser": {
-    "email": "michael.hart.au@gmail.com",
-    "name": "hichaelmart"
-  },
-  "_npmVersion": "1.2.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "stringstream",
-    "raw": "stringstream@~0.0.4",
-    "rawSpec": "~0.0.4",
-    "scope": null,
-    "spec": ">=0.0.4 <0.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/request"
-  ],
-  "_resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz",
-  "_shasum": "0f0e3423f942960b5692ac324a57dd093bc41a92",
-  "_shrinkwrap": null,
-  "_spec": "stringstream@~0.0.4",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
+  "name": "stringstream",
+  "version": "0.0.4",
+  "description": "Encode and decode streams into string streams",
   "author": {
-    "email": "michael.hart.au@gmail.com",
     "name": "Michael Hart",
+    "email": "michael.hart.au@gmail.com",
     "url": "http://github.com/mhart"
   },
-  "dependencies": {},
-  "description": "Encode and decode streams into string streams",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "0f0e3423f942960b5692ac324a57dd093bc41a92",
-    "tarball": "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
-  },
+  "main": "stringstream.js",
   "keywords": [
-    "base64",
-    "gzip",
+    "string",
     "stream",
-    "string"
+    "base64",
+    "gzip"
   ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mhart/StringStream.git"
+  },
   "license": "MIT",
-  "main": "stringstream.js",
-  "maintainers": [
-    {
-      "name": "hichaelmart",
-      "email": "michael.hart.au@gmail.com"
-    }
-  ],
-  "name": "stringstream",
-  "optionalDependencies": {},
   "readme": "# Decode streams into strings The Right Way(tm)\n\n```javascript\nvar fs   = require('fs')\nvar zlib = require('zlib')\nvar strs = require('stringstream')\n\nvar utf8Stream = fs.createReadStream('massiveLogFile.gz')\n  .pipe(zlib.createGunzip())\n  .pipe(strs('utf8'))\n```\n\nNo need to deal with `setEncoding()` weirdness, just compose streams\nlike they were supposed to be!\n\nHandles input and output encoding:\n\n```javascript\n// Stream from utf8 to hex to base64... Why not, ay.\nvar hex64Stream = fs.createReadStream('myFile')\n  .pipe(strs('utf8', 'hex'))\n  .pipe(strs('hex', 'base64'))\n```\n\nAlso deals with `base64` output correctly by aligning each emitted data\nchunk so that there are no dangling `=` characters:\n\n```javascript\nvar stream = fs.createReadStream('myFile').pipe(strs('base64'))\n\nvar base64Str = ''\n\nstream.on('data', function(data) { base64Str += data })\nstream.on('end', function() {\n  console.log('My base64 encoded file is: ' + base64Str) // Wouldn't work with setEncoding()\n  console.log('Original file is: ' + new Buffer(base64Str, 'base64'))\n})\n```\n",
   "readmeFilename": "README.md",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/mhart/StringStream.git"
+  "bugs": {
+    "url": "https://github.com/mhart/StringStream/issues"
   },
-  "version": "0.0.4"
+  "homepage": "https://github.com/mhart/StringStream#readme",
+  "_id": "stringstream@0.0.4",
+  "_shasum": "0f0e3423f942960b5692ac324a57dd093bc41a92",
+  "_resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz",
+  "_from": "stringstream@>=0.0.4 <0.1.0"
 }
diff --git a/deps/npm/node_modules/stringstream/stringstream.js b/deps/npm/node_modules/request/node_modules/stringstream/stringstream.js
similarity index 100%
rename from deps/npm/node_modules/stringstream/stringstream.js
rename to deps/npm/node_modules/request/node_modules/stringstream/stringstream.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/LICENSE b/deps/npm/node_modules/request/node_modules/tough-cookie/LICENSE
new file mode 100644
index 00000000000000..1bc286fb579cd7
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/tough-cookie/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2015, Salesforce.com, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of Salesforce.com nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+===
+
+The following exceptions apply:
+
+===
+
+`public_suffix_list.dat` was obtained from
+<https://publicsuffix.org/list/public_suffix_list.dat> via
+<http://publicsuffix.org>. The license for this file is MPL/2.0.  The header of
+that file reads as follows:
+
+  // This Source Code Form is subject to the terms of the Mozilla Public
+  // License, v. 2.0. If a copy of the MPL was not distributed with this
+  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/deps/npm/node_modules/tough-cookie/README.md b/deps/npm/node_modules/request/node_modules/tough-cookie/README.md
similarity index 95%
rename from deps/npm/node_modules/tough-cookie/README.md
rename to deps/npm/node_modules/request/node_modules/tough-cookie/README.md
index 419dd48d580d63..9899dbf6eed156 100644
--- a/deps/npm/node_modules/tough-cookie/README.md
+++ b/deps/npm/node_modules/request/node_modules/tough-cookie/README.md
@@ -68,9 +68,9 @@ Answers "does the request-path path-match a given cookie-path?" as per RFC6265 S
 
 This is essentially a prefix-match where `cookiePath` is a prefix of `reqPath`.
 
-### `parse(header)`
+### `parse(cookieString[, options])`
 
-alias for `Cookie.parse(header)`
+alias for `Cookie.parse(cookieString[, options])`
 
 ### `fromJSON(string)`
 
@@ -112,15 +112,21 @@ Generates a list of all possible paths that `pathMatch()` the parameter.  May be
 
 Exported via `tough.Cookie`.
 
-### `Cookie.parse(header)`
+### `Cookie.parse(cookieString[, options])`
 
 Parses a single Cookie or Set-Cookie HTTP header into a `Cookie` object.  Returns `undefined` if the string can't be parsed.
 
+The options parameter is not required and currently has only one property:
+
+  * _loose_ - boolean - if `true` enable parsing of key-less cookies like `=abc` and `=`, which are not RFC-compliant.
+
+If options is not an object, it is ignored, which means you can use `Array#map` with it.
+
 Here's how to process the Set-Cookie header(s) on a node HTTP/HTTPS response:
 
 ``` javascript
 if (res.headers['set-cookie'] instanceof Array)
-  cookies = res.headers['set-cookie'].map(function (c) { return (Cookie.parse(c)); });
+  cookies = res.headers['set-cookie'].map(Cookie.parse);
 else
   cookies = [Cookie.parse(res.headers['set-cookie'])];
 ```
@@ -231,15 +237,15 @@ if (cookie.validate() === true) {
 
 Exported via `tough.CookieJar`.
 
-### `CookieJar([store],[rejectPublicSuffixes])`
+### `CookieJar([store],[options])`
 
 Simply use `new CookieJar()`.  If you'd like to use a custom store, pass that to the constructor otherwise a `MemoryCookieStore` will be created and used.
 
-### Properties
-
-CookieJar object properties:
+The `options` object can be omitted and can have the following properties:
 
-  * _rejectPublicSuffixes_ - boolean - reject cookies with domains like "com" and "co.uk" (default: `true`)
+  * _rejectPublicSuffixes_ - boolean - default `true` - reject cookies with domains like "com" and "co.uk"
+  * _looseMode_ - boolean - default `false` - accept malformed cookies like `bar` and `=bar`, which have an implied empty name.
+    This is not in the standard, but is used sometimes on the web and is accepted by (most) browsers.
 
 Since eventually this module would like to support database/remote/etc. CookieJars, continuation passing style is used for CookieJar methods.
 
@@ -450,7 +456,7 @@ A just-in-memory CookieJar synchronous store implementation, used by default. De
 
 # Copyright and License
 
-(tl;dr: BSD-3-Clause with some MPL/1.1)
+(tl;dr: BSD-3-Clause with some MPL/2.0)
 
 ```text
  Copyright (c) 2015, Salesforce.com, Inc.
@@ -483,4 +489,4 @@ A just-in-memory CookieJar synchronous store implementation, used by default. De
  POSSIBILITY OF SUCH DAMAGE.
 ```
 
-Portions may be licensed under different licenses (in particular public-suffix.txt is MPL/1.1); please read the LICENSE file for full details.
+Portions may be licensed under different licenses (in particular `public_suffix_list.dat` is MPL/2.0); please read that file and the LICENSE file for full details.
diff --git a/deps/npm/node_modules/tough-cookie/lib/cookie.js b/deps/npm/node_modules/request/node_modules/tough-cookie/lib/cookie.js
similarity index 95%
rename from deps/npm/node_modules/tough-cookie/lib/cookie.js
rename to deps/npm/node_modules/request/node_modules/tough-cookie/lib/cookie.js
index 4f677c387875ab..f1cb5e2872300b 100644
--- a/deps/npm/node_modules/tough-cookie/lib/cookie.js
+++ b/deps/npm/node_modules/request/node_modules/tough-cookie/lib/cookie.js
@@ -49,14 +49,20 @@ var DATE_DELIM = /[\x09\x20-\x2F\x3B-\x40\x5B-\x60\x7B-\x7E]/;
 // From RFC6265 S4.1.1
 // note that it excludes \x3B ";"
 var COOKIE_OCTET  = /[\x21\x23-\x2B\x2D-\x3A\x3C-\x5B\x5D-\x7E]/;
-var COOKIE_OCTETS = new RegExp('^'+COOKIE_OCTET.source+'$');
+var COOKIE_OCTETS = new RegExp('^'+COOKIE_OCTET.source+'+$');
+
+var CONTROL_CHARS = /[\x00-\x1F]/;
 
 // Double quotes are part of the value (see: S4.1.1).
 // '\r', '\n' and '\0' should be treated as a terminator in the "relaxed" mode
 // (see: https://github.com/ChromiumWebApps/chromium/blob/b3d3b4da8bb94c1b2e061600df106d590fda3620/net/cookies/parsed_cookie.cc#L60)
 // '=' and ';' are attribute/values separators
 // (see: https://github.com/ChromiumWebApps/chromium/blob/b3d3b4da8bb94c1b2e061600df106d590fda3620/net/cookies/parsed_cookie.cc#L64)
-var COOKIE_PAIR = /^([^=;]+)\s*=\s*(("?)[^\n\r\0]*\3)/;
+var COOKIE_PAIR = /^(([^=;]+))\s*=\s*(("?)[^\n\r\0]*\3)/
+
+// Used to parse non-RFC-compliant cookies like '=abc' when given the `loose`
+// option in Cookie.parse:
+var LOOSE_COOKIE_PAIR = /^((?:=)?([^=;]*)\s*=\s*)?(("?)[^\n\r\0]*\3)/;
 
 // RFC6265 S4.1.1 defines path value as 'any CHAR except CTLs or ";"'
 // Note ';' is \x3B
@@ -315,7 +321,10 @@ function defaultPath(path) {
 }
 
 
-function parse(str) {
+function parse(str, options) {
+  if (!options || typeof options !== 'object') {
+    options = {};
+  }
   str = str.trim();
 
   // S4.1.1 Trailing semi-colons are not part of the specification.
@@ -326,7 +335,8 @@ function parse(str) {
 
   // We use a regex to parse the "name-value-pair" part of S5.2
   var firstSemi = str.indexOf(';'); // S5.2 step 1
-  var result = COOKIE_PAIR.exec(firstSemi === -1 ? str : str.substr(0,firstSemi));
+  var pairRe = options.loose ? LOOSE_COOKIE_PAIR : COOKIE_PAIR;
+  var result = pairRe.exec(firstSemi === -1 ? str : str.substr(0,firstSemi));
 
   // Rx satisfies the "the name string is empty" and "lacks a %x3D ("=")"
   // constraints as well as trimming any whitespace.
@@ -335,8 +345,15 @@ function parse(str) {
   }
 
   var c = new Cookie();
-  c.key = result[1].trim();
-  c.value = result[2].trim();
+  if (result[1]) {
+    c.key = result[2].trim();
+  } else {
+    c.key = '';
+  }
+  c.value = result[3].trim();
+  if (CONTROL_CHARS.test(c.key) || CONTROL_CHARS.test(c.value)) {
+    return;
+  }
 
   if (firstSemi === -1) {
     return c;
@@ -586,15 +603,15 @@ function getCookieContext(url) {
   return urlParse(url);
 }
 
-function Cookie(opts) {
-  opts = opts || {};
+function Cookie(options) {
+  options = options || {};
 
-  Object.keys(opts).forEach(function(prop) {
+  Object.keys(options).forEach(function(prop) {
     if (Cookie.prototype.hasOwnProperty(prop) &&
-        Cookie.prototype[prop] !== opts[prop] &&
+        Cookie.prototype[prop] !== options[prop] &&
         prop.substr(0,1) !== '_')
     {
-      this[prop] = opts[prop];
+      this[prop] = options[prop];
     }
   }, this);
 
@@ -745,6 +762,9 @@ Cookie.prototype.cookieString = function cookieString() {
   if (val == null) {
     val = '';
   }
+  if (this.key === '') {
+    return val;
+  }
   return this.key+'='+val;
 };
 
@@ -858,9 +878,17 @@ Cookie.prototype.canonicalizedDomain = function canonicalizedDomain() {
   return canonicalDomain(this.domain);
 };
 
-function CookieJar(store, rejectPublicSuffixes) {
-  if (rejectPublicSuffixes != null) {
-    this.rejectPublicSuffixes = rejectPublicSuffixes;
+function CookieJar(store, options) {
+  if (typeof options === "boolean") {
+    options = {rejectPublicSuffixes: options};
+  } else if (options == null) {
+    options = {};
+  }
+  if (options.rejectPublicSuffixes != null) {
+    this.rejectPublicSuffixes = options.rejectPublicSuffixes;
+  }
+  if (options.looseMode != null) {
+    this.enableLooseMode = options.looseMode;
   }
 
   if (!store) {
@@ -870,6 +898,7 @@ function CookieJar(store, rejectPublicSuffixes) {
 }
 CookieJar.prototype.store = null;
 CookieJar.prototype.rejectPublicSuffixes = true;
+CookieJar.prototype.enableLooseMode = false;
 var CAN_BE_SYNC = [];
 
 CAN_BE_SYNC.push('setCookie');
@@ -882,10 +911,14 @@ CookieJar.prototype.setCookie = function(cookie, url, options, cb) {
   }
 
   var host = canonicalDomain(context.hostname);
+  var loose = this.enableLooseMode;
+  if (options.loose != null) {
+    loose = options.loose;
+  }
 
   // S5.3 step 1
   if (!(cookie instanceof Cookie)) {
-    cookie = Cookie.parse(cookie);
+    cookie = Cookie.parse(cookie, { loose: loose });
   }
   if (!cookie) {
     err = new Error("Cookie failed to parse");
diff --git a/deps/npm/node_modules/tough-cookie/lib/memstore.js b/deps/npm/node_modules/request/node_modules/tough-cookie/lib/memstore.js
similarity index 100%
rename from deps/npm/node_modules/tough-cookie/lib/memstore.js
rename to deps/npm/node_modules/request/node_modules/tough-cookie/lib/memstore.js
diff --git a/deps/npm/node_modules/tough-cookie/lib/pathMatch.js b/deps/npm/node_modules/request/node_modules/tough-cookie/lib/pathMatch.js
similarity index 100%
rename from deps/npm/node_modules/tough-cookie/lib/pathMatch.js
rename to deps/npm/node_modules/request/node_modules/tough-cookie/lib/pathMatch.js
diff --git a/deps/npm/node_modules/tough-cookie/lib/permuteDomain.js b/deps/npm/node_modules/request/node_modules/tough-cookie/lib/permuteDomain.js
similarity index 100%
rename from deps/npm/node_modules/tough-cookie/lib/permuteDomain.js
rename to deps/npm/node_modules/request/node_modules/tough-cookie/lib/permuteDomain.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/lib/pubsuffix.js b/deps/npm/node_modules/request/node_modules/tough-cookie/lib/pubsuffix.js
new file mode 100644
index 00000000000000..62fd3da3ffaa4d
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/tough-cookie/lib/pubsuffix.js
@@ -0,0 +1,98 @@
+/****************************************************
+ * AUTOMATICALLY GENERATED by generate-pubsuffix.js *
+ *                  DO NOT EDIT!                    *
+ ****************************************************/
+
+"use strict";
+
+var punycode = require('punycode');
+
+module.exports.getPublicSuffix = function getPublicSuffix(domain) {
+  /*!
+   * Copyright (c) 2015, Salesforce.com, Inc.
+   * All rights reserved.
+   *
+   * Redistribution and use in source and binary forms, with or without
+   * modification, are permitted provided that the following conditions are met:
+   *
+   * 1. Redistributions of source code must retain the above copyright notice,
+   * this list of conditions and the following disclaimer.
+   *
+   * 2. Redistributions in binary form must reproduce the above copyright notice,
+   * this list of conditions and the following disclaimer in the documentation
+   * and/or other materials provided with the distribution.
+   *
+   * 3. Neither the name of Salesforce.com nor the names of its contributors may
+   * be used to endorse or promote products derived from this software without
+   * specific prior written permission.
+   *
+   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+   * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   * POSSIBILITY OF SUCH DAMAGE.
+   */
+  if (!domain) {
+    return null;
+  }
+  if (domain.match(/^\./)) {
+    return null;
+  }
+  var asciiDomain = punycode.toASCII(domain);
+  var converted = false;
+  if (asciiDomain !== domain) {
+    domain = asciiDomain;
+    converted = true;
+  }
+  if (index[domain]) {
+    return null;
+  }
+
+  domain = domain.toLowerCase();
+  var parts = domain.split('.').reverse();
+
+  var suffix = '';
+  var suffixLen = 0;
+  for (var i=0; i<parts.length; i++) {
+    var part = parts[i];
+    var starstr = '*'+suffix;
+    var partstr = part+suffix;
+
+    if (index[starstr]) { // star rule matches
+      suffixLen = i+1;
+      if (index[partstr] === false) { // exception rule matches (NB: false, not undefined)
+        suffixLen--;
+      }
+    } else if (index[partstr]) { // exact match, not exception
+      suffixLen = i+1;
+    }
+
+    suffix = '.'+partstr;
+  }
+
+  if (index['*'+suffix]) { // *.domain exists (e.g. *.kyoto.jp for domain='kyoto.jp');
+    return null;
+  }
+
+  suffixLen = suffixLen || 1;
+  if (parts.length > suffixLen) {
+    var publicSuffix = parts.slice(0,suffixLen+1).reverse().join('.');
+    return converted ? punycode.toUnicode(publicSuffix) : publicSuffix;
+  }
+
+  return null;
+};
+
+// The following generated structure is used under the MPL version 2.0
+// See public-suffix.txt for more information
+
+var index = module.exports.index = Object.freeze(
+{"ac":true,"com.ac":true,"edu.ac":true,"gov.ac":true,"net.ac":true,"mil.ac":true,"org.ac":true,"ad":true,"nom.ad":true,"ae":true,"co.ae":true,"net.ae":true,"org.ae":true,"sch.ae":true,"ac.ae":true,"gov.ae":true,"mil.ae":true,"aero":true,"accident-investigation.aero":true,"accident-prevention.aero":true,"aerobatic.aero":true,"aeroclub.aero":true,"aerodrome.aero":true,"agents.aero":true,"aircraft.aero":true,"airline.aero":true,"airport.aero":true,"air-surveillance.aero":true,"airtraffic.aero":true,"air-traffic-control.aero":true,"ambulance.aero":true,"amusement.aero":true,"association.aero":true,"author.aero":true,"ballooning.aero":true,"broker.aero":true,"caa.aero":true,"cargo.aero":true,"catering.aero":true,"certification.aero":true,"championship.aero":true,"charter.aero":true,"civilaviation.aero":true,"club.aero":true,"conference.aero":true,"consultant.aero":true,"consulting.aero":true,"control.aero":true,"council.aero":true,"crew.aero":true,"design.aero":true,"dgca.aero":true,"educator.aero":true,"emergency.aero":true,"engine.aero":true,"engineer.aero":true,"entertainment.aero":true,"equipment.aero":true,"exchange.aero":true,"express.aero":true,"federation.aero":true,"flight.aero":true,"freight.aero":true,"fuel.aero":true,"gliding.aero":true,"government.aero":true,"groundhandling.aero":true,"group.aero":true,"hanggliding.aero":true,"homebuilt.aero":true,"insurance.aero":true,"journal.aero":true,"journalist.aero":true,"leasing.aero":true,"logistics.aero":true,"magazine.aero":true,"maintenance.aero":true,"marketplace.aero":true,"media.aero":true,"microlight.aero":true,"modelling.aero":true,"navigation.aero":true,"parachuting.aero":true,"paragliding.aero":true,"passenger-association.aero":true,"pilot.aero":true,"press.aero":true,"production.aero":true,"recreation.aero":true,"repbody.aero":true,"res.aero":true,"research.aero":true,"rotorcraft.aero":true,"safety.aero":true,"scientist.aero":true,"services.aero":true,"show.aero":true,"skydiving.aero":true,"software.aero":true,"student.aero":true,"taxi.aero":true,"trader.aero":true,"trading.aero":true,"trainer.aero":true,"union.aero":true,"workinggroup.aero":true,"works.aero":true,"af":true,"gov.af":true,"com.af":true,"org.af":true,"net.af":true,"edu.af":true,"ag":true,"com.ag":true,"org.ag":true,"net.ag":true,"co.ag":true,"nom.ag":true,"ai":true,"off.ai":true,"com.ai":true,"net.ai":true,"org.ai":true,"al":true,"com.al":true,"edu.al":true,"gov.al":true,"mil.al":true,"net.al":true,"org.al":true,"am":true,"an":true,"com.an":true,"net.an":true,"org.an":true,"edu.an":true,"ao":true,"ed.ao":true,"gv.ao":true,"og.ao":true,"co.ao":true,"pb.ao":true,"it.ao":true,"aq":true,"ar":true,"com.ar":true,"edu.ar":true,"gob.ar":true,"gov.ar":true,"int.ar":true,"mil.ar":true,"net.ar":true,"org.ar":true,"tur.ar":true,"arpa":true,"e164.arpa":true,"in-addr.arpa":true,"ip6.arpa":true,"iris.arpa":true,"uri.arpa":true,"urn.arpa":true,"as":true,"gov.as":true,"asia":true,"at":true,"ac.at":true,"co.at":true,"gv.at":true,"or.at":true,"au":true,"com.au":true,"net.au":true,"org.au":true,"edu.au":true,"gov.au":true,"asn.au":true,"id.au":true,"info.au":true,"conf.au":true,"oz.au":true,"act.au":true,"nsw.au":true,"nt.au":true,"qld.au":true,"sa.au":true,"tas.au":true,"vic.au":true,"wa.au":true,"act.edu.au":true,"nsw.edu.au":true,"nt.edu.au":true,"qld.edu.au":true,"sa.edu.au":true,"tas.edu.au":true,"vic.edu.au":true,"wa.edu.au":true,"qld.gov.au":true,"sa.gov.au":true,"tas.gov.au":true,"vic.gov.au":true,"wa.gov.au":true,"aw":true,"com.aw":true,"ax":true,"az":true,"com.az":true,"net.az":true,"int.az":true,"gov.az":true,"org.az":true,"edu.az":true,"info.az":true,"pp.az":true,"mil.az":true,"name.az":true,"pro.az":true,"biz.az":true,"ba":true,"org.ba":true,"net.ba":true,"edu.ba":true,"gov.ba":true,"mil.ba":true,"unsa.ba":true,"unbi.ba":true,"co.ba":true,"com.ba":true,"rs.ba":true,"bb":true,"biz.bb":true,"co.bb":true,"com.bb":true,"edu.bb":true,"gov.bb":true,"info.bb":true,"net.bb":true,"org.bb":true,"store.bb":true,"tv.bb":true,"*.bd":true,"be":true,"ac.be":true,"bf":true,"gov.bf":true,"bg":true,"a.bg":true,"b.bg":true,"c.bg":true,"d.bg":true,"e.bg":true,"f.bg":true,"g.bg":true,"h.bg":true,"i.bg":true,"j.bg":true,"k.bg":true,"l.bg":true,"m.bg":true,"n.bg":true,"o.bg":true,"p.bg":true,"q.bg":true,"r.bg":true,"s.bg":true,"t.bg":true,"u.bg":true,"v.bg":true,"w.bg":true,"x.bg":true,"y.bg":true,"z.bg":true,"0.bg":true,"1.bg":true,"2.bg":true,"3.bg":true,"4.bg":true,"5.bg":true,"6.bg":true,"7.bg":true,"8.bg":true,"9.bg":true,"bh":true,"com.bh":true,"edu.bh":true,"net.bh":true,"org.bh":true,"gov.bh":true,"bi":true,"co.bi":true,"com.bi":true,"edu.bi":true,"or.bi":true,"org.bi":true,"biz":true,"bj":true,"asso.bj":true,"barreau.bj":true,"gouv.bj":true,"bm":true,"com.bm":true,"edu.bm":true,"gov.bm":true,"net.bm":true,"org.bm":true,"*.bn":true,"bo":true,"com.bo":true,"edu.bo":true,"gov.bo":true,"gob.bo":true,"int.bo":true,"org.bo":true,"net.bo":true,"mil.bo":true,"tv.bo":true,"br":true,"adm.br":true,"adv.br":true,"agr.br":true,"am.br":true,"arq.br":true,"art.br":true,"ato.br":true,"b.br":true,"bio.br":true,"blog.br":true,"bmd.br":true,"cim.br":true,"cng.br":true,"cnt.br":true,"com.br":true,"coop.br":true,"ecn.br":true,"eco.br":true,"edu.br":true,"emp.br":true,"eng.br":true,"esp.br":true,"etc.br":true,"eti.br":true,"far.br":true,"flog.br":true,"fm.br":true,"fnd.br":true,"fot.br":true,"fst.br":true,"g12.br":true,"ggf.br":true,"gov.br":true,"imb.br":true,"ind.br":true,"inf.br":true,"jor.br":true,"jus.br":true,"leg.br":true,"lel.br":true,"mat.br":true,"med.br":true,"mil.br":true,"mp.br":true,"mus.br":true,"net.br":true,"*.nom.br":true,"not.br":true,"ntr.br":true,"odo.br":true,"org.br":true,"ppg.br":true,"pro.br":true,"psc.br":true,"psi.br":true,"qsl.br":true,"radio.br":true,"rec.br":true,"slg.br":true,"srv.br":true,"taxi.br":true,"teo.br":true,"tmp.br":true,"trd.br":true,"tur.br":true,"tv.br":true,"vet.br":true,"vlog.br":true,"wiki.br":true,"zlg.br":true,"bs":true,"com.bs":true,"net.bs":true,"org.bs":true,"edu.bs":true,"gov.bs":true,"bt":true,"com.bt":true,"edu.bt":true,"gov.bt":true,"net.bt":true,"org.bt":true,"bv":true,"bw":true,"co.bw":true,"org.bw":true,"by":true,"gov.by":true,"mil.by":true,"com.by":true,"of.by":true,"bz":true,"com.bz":true,"net.bz":true,"org.bz":true,"edu.bz":true,"gov.bz":true,"ca":true,"ab.ca":true,"bc.ca":true,"mb.ca":true,"nb.ca":true,"nf.ca":true,"nl.ca":true,"ns.ca":true,"nt.ca":true,"nu.ca":true,"on.ca":true,"pe.ca":true,"qc.ca":true,"sk.ca":true,"yk.ca":true,"gc.ca":true,"cat":true,"cc":true,"cd":true,"gov.cd":true,"cf":true,"cg":true,"ch":true,"ci":true,"org.ci":true,"or.ci":true,"com.ci":true,"co.ci":true,"edu.ci":true,"ed.ci":true,"ac.ci":true,"net.ci":true,"go.ci":true,"asso.ci":true,"xn--aroport-bya.ci":true,"int.ci":true,"presse.ci":true,"md.ci":true,"gouv.ci":true,"*.ck":true,"www.ck":false,"cl":true,"gov.cl":true,"gob.cl":true,"co.cl":true,"mil.cl":true,"cm":true,"co.cm":true,"com.cm":true,"gov.cm":true,"net.cm":true,"cn":true,"ac.cn":true,"com.cn":true,"edu.cn":true,"gov.cn":true,"net.cn":true,"org.cn":true,"mil.cn":true,"xn--55qx5d.cn":true,"xn--io0a7i.cn":true,"xn--od0alg.cn":true,"ah.cn":true,"bj.cn":true,"cq.cn":true,"fj.cn":true,"gd.cn":true,"gs.cn":true,"gz.cn":true,"gx.cn":true,"ha.cn":true,"hb.cn":true,"he.cn":true,"hi.cn":true,"hl.cn":true,"hn.cn":true,"jl.cn":true,"js.cn":true,"jx.cn":true,"ln.cn":true,"nm.cn":true,"nx.cn":true,"qh.cn":true,"sc.cn":true,"sd.cn":true,"sh.cn":true,"sn.cn":true,"sx.cn":true,"tj.cn":true,"xj.cn":true,"xz.cn":true,"yn.cn":true,"zj.cn":true,"hk.cn":true,"mo.cn":true,"tw.cn":true,"co":true,"arts.co":true,"com.co":true,"edu.co":true,"firm.co":true,"gov.co":true,"info.co":true,"int.co":true,"mil.co":true,"net.co":true,"nom.co":true,"org.co":true,"rec.co":true,"web.co":true,"com":true,"coop":true,"cr":true,"ac.cr":true,"co.cr":true,"ed.cr":true,"fi.cr":true,"go.cr":true,"or.cr":true,"sa.cr":true,"cu":true,"com.cu":true,"edu.cu":true,"org.cu":true,"net.cu":true,"gov.cu":true,"inf.cu":true,"cv":true,"cw":true,"com.cw":true,"edu.cw":true,"net.cw":true,"org.cw":true,"cx":true,"gov.cx":true,"ac.cy":true,"biz.cy":true,"com.cy":true,"ekloges.cy":true,"gov.cy":true,"ltd.cy":true,"name.cy":true,"net.cy":true,"org.cy":true,"parliament.cy":true,"press.cy":true,"pro.cy":true,"tm.cy":true,"cz":true,"de":true,"dj":true,"dk":true,"dm":true,"com.dm":true,"net.dm":true,"org.dm":true,"edu.dm":true,"gov.dm":true,"do":true,"art.do":true,"com.do":true,"edu.do":true,"gob.do":true,"gov.do":true,"mil.do":true,"net.do":true,"org.do":true,"sld.do":true,"web.do":true,"dz":true,"com.dz":true,"org.dz":true,"net.dz":true,"gov.dz":true,"edu.dz":true,"asso.dz":true,"pol.dz":true,"art.dz":true,"ec":true,"com.ec":true,"info.ec":true,"net.ec":true,"fin.ec":true,"k12.ec":true,"med.ec":true,"pro.ec":true,"org.ec":true,"edu.ec":true,"gov.ec":true,"gob.ec":true,"mil.ec":true,"edu":true,"ee":true,"edu.ee":true,"gov.ee":true,"riik.ee":true,"lib.ee":true,"med.ee":true,"com.ee":true,"pri.ee":true,"aip.ee":true,"org.ee":true,"fie.ee":true,"eg":true,"com.eg":true,"edu.eg":true,"eun.eg":true,"gov.eg":true,"mil.eg":true,"name.eg":true,"net.eg":true,"org.eg":true,"sci.eg":true,"*.er":true,"es":true,"com.es":true,"nom.es":true,"org.es":true,"gob.es":true,"edu.es":true,"et":true,"com.et":true,"gov.et":true,"org.et":true,"edu.et":true,"biz.et":true,"name.et":true,"info.et":true,"net.et":true,"eu":true,"fi":true,"aland.fi":true,"*.fj":true,"*.fk":true,"fm":true,"fo":true,"fr":true,"com.fr":true,"asso.fr":true,"nom.fr":true,"prd.fr":true,"presse.fr":true,"tm.fr":true,"aeroport.fr":true,"assedic.fr":true,"avocat.fr":true,"avoues.fr":true,"cci.fr":true,"chambagri.fr":true,"chirurgiens-dentistes.fr":true,"experts-comptables.fr":true,"geometre-expert.fr":true,"gouv.fr":true,"greta.fr":true,"huissier-justice.fr":true,"medecin.fr":true,"notaires.fr":true,"pharmacien.fr":true,"port.fr":true,"veterinaire.fr":true,"ga":true,"gb":true,"gd":true,"ge":true,"com.ge":true,"edu.ge":true,"gov.ge":true,"org.ge":true,"mil.ge":true,"net.ge":true,"pvt.ge":true,"gf":true,"gg":true,"co.gg":true,"net.gg":true,"org.gg":true,"gh":true,"com.gh":true,"edu.gh":true,"gov.gh":true,"org.gh":true,"mil.gh":true,"gi":true,"com.gi":true,"ltd.gi":true,"gov.gi":true,"mod.gi":true,"edu.gi":true,"org.gi":true,"gl":true,"co.gl":true,"com.gl":true,"edu.gl":true,"net.gl":true,"org.gl":true,"gm":true,"gn":true,"ac.gn":true,"com.gn":true,"edu.gn":true,"gov.gn":true,"org.gn":true,"net.gn":true,"gov":true,"gp":true,"com.gp":true,"net.gp":true,"mobi.gp":true,"edu.gp":true,"org.gp":true,"asso.gp":true,"gq":true,"gr":true,"com.gr":true,"edu.gr":true,"net.gr":true,"org.gr":true,"gov.gr":true,"gs":true,"gt":true,"com.gt":true,"edu.gt":true,"gob.gt":true,"ind.gt":true,"mil.gt":true,"net.gt":true,"org.gt":true,"*.gu":true,"gw":true,"gy":true,"co.gy":true,"com.gy":true,"net.gy":true,"hk":true,"com.hk":true,"edu.hk":true,"gov.hk":true,"idv.hk":true,"net.hk":true,"org.hk":true,"xn--55qx5d.hk":true,"xn--wcvs22d.hk":true,"xn--lcvr32d.hk":true,"xn--mxtq1m.hk":true,"xn--gmqw5a.hk":true,"xn--ciqpn.hk":true,"xn--gmq050i.hk":true,"xn--zf0avx.hk":true,"xn--io0a7i.hk":true,"xn--mk0axi.hk":true,"xn--od0alg.hk":true,"xn--od0aq3b.hk":true,"xn--tn0ag.hk":true,"xn--uc0atv.hk":true,"xn--uc0ay4a.hk":true,"hm":true,"hn":true,"com.hn":true,"edu.hn":true,"org.hn":true,"net.hn":true,"mil.hn":true,"gob.hn":true,"hr":true,"iz.hr":true,"from.hr":true,"name.hr":true,"com.hr":true,"ht":true,"com.ht":true,"shop.ht":true,"firm.ht":true,"info.ht":true,"adult.ht":true,"net.ht":true,"pro.ht":true,"org.ht":true,"med.ht":true,"art.ht":true,"coop.ht":true,"pol.ht":true,"asso.ht":true,"edu.ht":true,"rel.ht":true,"gouv.ht":true,"perso.ht":true,"hu":true,"co.hu":true,"info.hu":true,"org.hu":true,"priv.hu":true,"sport.hu":true,"tm.hu":true,"2000.hu":true,"agrar.hu":true,"bolt.hu":true,"casino.hu":true,"city.hu":true,"erotica.hu":true,"erotika.hu":true,"film.hu":true,"forum.hu":true,"games.hu":true,"hotel.hu":true,"ingatlan.hu":true,"jogasz.hu":true,"konyvelo.hu":true,"lakas.hu":true,"media.hu":true,"news.hu":true,"reklam.hu":true,"sex.hu":true,"shop.hu":true,"suli.hu":true,"szex.hu":true,"tozsde.hu":true,"utazas.hu":true,"video.hu":true,"id":true,"ac.id":true,"biz.id":true,"co.id":true,"desa.id":true,"go.id":true,"mil.id":true,"my.id":true,"net.id":true,"or.id":true,"sch.id":true,"web.id":true,"ie":true,"gov.ie":true,"il":true,"ac.il":true,"co.il":true,"gov.il":true,"idf.il":true,"k12.il":true,"muni.il":true,"net.il":true,"org.il":true,"im":true,"ac.im":true,"co.im":true,"com.im":true,"ltd.co.im":true,"net.im":true,"org.im":true,"plc.co.im":true,"tt.im":true,"tv.im":true,"in":true,"co.in":true,"firm.in":true,"net.in":true,"org.in":true,"gen.in":true,"ind.in":true,"nic.in":true,"ac.in":true,"edu.in":true,"res.in":true,"gov.in":true,"mil.in":true,"info":true,"int":true,"eu.int":true,"io":true,"com.io":true,"iq":true,"gov.iq":true,"edu.iq":true,"mil.iq":true,"com.iq":true,"org.iq":true,"net.iq":true,"ir":true,"ac.ir":true,"co.ir":true,"gov.ir":true,"id.ir":true,"net.ir":true,"org.ir":true,"sch.ir":true,"xn--mgba3a4f16a.ir":true,"xn--mgba3a4fra.ir":true,"is":true,"net.is":true,"com.is":true,"edu.is":true,"gov.is":true,"org.is":true,"int.is":true,"it":true,"gov.it":true,"edu.it":true,"abr.it":true,"abruzzo.it":true,"aosta-valley.it":true,"aostavalley.it":true,"bas.it":true,"basilicata.it":true,"cal.it":true,"calabria.it":true,"cam.it":true,"campania.it":true,"emilia-romagna.it":true,"emiliaromagna.it":true,"emr.it":true,"friuli-v-giulia.it":true,"friuli-ve-giulia.it":true,"friuli-vegiulia.it":true,"friuli-venezia-giulia.it":true,"friuli-veneziagiulia.it":true,"friuli-vgiulia.it":true,"friuliv-giulia.it":true,"friulive-giulia.it":true,"friulivegiulia.it":true,"friulivenezia-giulia.it":true,"friuliveneziagiulia.it":true,"friulivgiulia.it":true,"fvg.it":true,"laz.it":true,"lazio.it":true,"lig.it":true,"liguria.it":true,"lom.it":true,"lombardia.it":true,"lombardy.it":true,"lucania.it":true,"mar.it":true,"marche.it":true,"mol.it":true,"molise.it":true,"piedmont.it":true,"piemonte.it":true,"pmn.it":true,"pug.it":true,"puglia.it":true,"sar.it":true,"sardegna.it":true,"sardinia.it":true,"sic.it":true,"sicilia.it":true,"sicily.it":true,"taa.it":true,"tos.it":true,"toscana.it":true,"trentino-a-adige.it":true,"trentino-aadige.it":true,"trentino-alto-adige.it":true,"trentino-altoadige.it":true,"trentino-s-tirol.it":true,"trentino-stirol.it":true,"trentino-sud-tirol.it":true,"trentino-sudtirol.it":true,"trentino-sued-tirol.it":true,"trentino-suedtirol.it":true,"trentinoa-adige.it":true,"trentinoaadige.it":true,"trentinoalto-adige.it":true,"trentinoaltoadige.it":true,"trentinos-tirol.it":true,"trentinostirol.it":true,"trentinosud-tirol.it":true,"trentinosudtirol.it":true,"trentinosued-tirol.it":true,"trentinosuedtirol.it":true,"tuscany.it":true,"umb.it":true,"umbria.it":true,"val-d-aosta.it":true,"val-daosta.it":true,"vald-aosta.it":true,"valdaosta.it":true,"valle-aosta.it":true,"valle-d-aosta.it":true,"valle-daosta.it":true,"valleaosta.it":true,"valled-aosta.it":true,"valledaosta.it":true,"vallee-aoste.it":true,"valleeaoste.it":true,"vao.it":true,"vda.it":true,"ven.it":true,"veneto.it":true,"ag.it":true,"agrigento.it":true,"al.it":true,"alessandria.it":true,"alto-adige.it":true,"altoadige.it":true,"an.it":true,"ancona.it":true,"andria-barletta-trani.it":true,"andria-trani-barletta.it":true,"andriabarlettatrani.it":true,"andriatranibarletta.it":true,"ao.it":true,"aosta.it":true,"aoste.it":true,"ap.it":true,"aq.it":true,"aquila.it":true,"ar.it":true,"arezzo.it":true,"ascoli-piceno.it":true,"ascolipiceno.it":true,"asti.it":true,"at.it":true,"av.it":true,"avellino.it":true,"ba.it":true,"balsan.it":true,"bari.it":true,"barletta-trani-andria.it":true,"barlettatraniandria.it":true,"belluno.it":true,"benevento.it":true,"bergamo.it":true,"bg.it":true,"bi.it":true,"biella.it":true,"bl.it":true,"bn.it":true,"bo.it":true,"bologna.it":true,"bolzano.it":true,"bozen.it":true,"br.it":true,"brescia.it":true,"brindisi.it":true,"bs.it":true,"bt.it":true,"bz.it":true,"ca.it":true,"cagliari.it":true,"caltanissetta.it":true,"campidano-medio.it":true,"campidanomedio.it":true,"campobasso.it":true,"carbonia-iglesias.it":true,"carboniaiglesias.it":true,"carrara-massa.it":true,"carraramassa.it":true,"caserta.it":true,"catania.it":true,"catanzaro.it":true,"cb.it":true,"ce.it":true,"cesena-forli.it":true,"cesenaforli.it":true,"ch.it":true,"chieti.it":true,"ci.it":true,"cl.it":true,"cn.it":true,"co.it":true,"como.it":true,"cosenza.it":true,"cr.it":true,"cremona.it":true,"crotone.it":true,"cs.it":true,"ct.it":true,"cuneo.it":true,"cz.it":true,"dell-ogliastra.it":true,"dellogliastra.it":true,"en.it":true,"enna.it":true,"fc.it":true,"fe.it":true,"fermo.it":true,"ferrara.it":true,"fg.it":true,"fi.it":true,"firenze.it":true,"florence.it":true,"fm.it":true,"foggia.it":true,"forli-cesena.it":true,"forlicesena.it":true,"fr.it":true,"frosinone.it":true,"ge.it":true,"genoa.it":true,"genova.it":true,"go.it":true,"gorizia.it":true,"gr.it":true,"grosseto.it":true,"iglesias-carbonia.it":true,"iglesiascarbonia.it":true,"im.it":true,"imperia.it":true,"is.it":true,"isernia.it":true,"kr.it":true,"la-spezia.it":true,"laquila.it":true,"laspezia.it":true,"latina.it":true,"lc.it":true,"le.it":true,"lecce.it":true,"lecco.it":true,"li.it":true,"livorno.it":true,"lo.it":true,"lodi.it":true,"lt.it":true,"lu.it":true,"lucca.it":true,"macerata.it":true,"mantova.it":true,"massa-carrara.it":true,"massacarrara.it":true,"matera.it":true,"mb.it":true,"mc.it":true,"me.it":true,"medio-campidano.it":true,"mediocampidano.it":true,"messina.it":true,"mi.it":true,"milan.it":true,"milano.it":true,"mn.it":true,"mo.it":true,"modena.it":true,"monza-brianza.it":true,"monza-e-della-brianza.it":true,"monza.it":true,"monzabrianza.it":true,"monzaebrianza.it":true,"monzaedellabrianza.it":true,"ms.it":true,"mt.it":true,"na.it":true,"naples.it":true,"napoli.it":true,"no.it":true,"novara.it":true,"nu.it":true,"nuoro.it":true,"og.it":true,"ogliastra.it":true,"olbia-tempio.it":true,"olbiatempio.it":true,"or.it":true,"oristano.it":true,"ot.it":true,"pa.it":true,"padova.it":true,"padua.it":true,"palermo.it":true,"parma.it":true,"pavia.it":true,"pc.it":true,"pd.it":true,"pe.it":true,"perugia.it":true,"pesaro-urbino.it":true,"pesarourbino.it":true,"pescara.it":true,"pg.it":true,"pi.it":true,"piacenza.it":true,"pisa.it":true,"pistoia.it":true,"pn.it":true,"po.it":true,"pordenone.it":true,"potenza.it":true,"pr.it":true,"prato.it":true,"pt.it":true,"pu.it":true,"pv.it":true,"pz.it":true,"ra.it":true,"ragusa.it":true,"ravenna.it":true,"rc.it":true,"re.it":true,"reggio-calabria.it":true,"reggio-emilia.it":true,"reggiocalabria.it":true,"reggioemilia.it":true,"rg.it":true,"ri.it":true,"rieti.it":true,"rimini.it":true,"rm.it":true,"rn.it":true,"ro.it":true,"roma.it":true,"rome.it":true,"rovigo.it":true,"sa.it":true,"salerno.it":true,"sassari.it":true,"savona.it":true,"si.it":true,"siena.it":true,"siracusa.it":true,"so.it":true,"sondrio.it":true,"sp.it":true,"sr.it":true,"ss.it":true,"suedtirol.it":true,"sv.it":true,"ta.it":true,"taranto.it":true,"te.it":true,"tempio-olbia.it":true,"tempioolbia.it":true,"teramo.it":true,"terni.it":true,"tn.it":true,"to.it":true,"torino.it":true,"tp.it":true,"tr.it":true,"trani-andria-barletta.it":true,"trani-barletta-andria.it":true,"traniandriabarletta.it":true,"tranibarlettaandria.it":true,"trapani.it":true,"trentino.it":true,"trento.it":true,"treviso.it":true,"trieste.it":true,"ts.it":true,"turin.it":true,"tv.it":true,"ud.it":true,"udine.it":true,"urbino-pesaro.it":true,"urbinopesaro.it":true,"va.it":true,"varese.it":true,"vb.it":true,"vc.it":true,"ve.it":true,"venezia.it":true,"venice.it":true,"verbania.it":true,"vercelli.it":true,"verona.it":true,"vi.it":true,"vibo-valentia.it":true,"vibovalentia.it":true,"vicenza.it":true,"viterbo.it":true,"vr.it":true,"vs.it":true,"vt.it":true,"vv.it":true,"je":true,"co.je":true,"net.je":true,"org.je":true,"*.jm":true,"jo":true,"com.jo":true,"org.jo":true,"net.jo":true,"edu.jo":true,"sch.jo":true,"gov.jo":true,"mil.jo":true,"name.jo":true,"jobs":true,"jp":true,"ac.jp":true,"ad.jp":true,"co.jp":true,"ed.jp":true,"go.jp":true,"gr.jp":true,"lg.jp":true,"ne.jp":true,"or.jp":true,"aichi.jp":true,"akita.jp":true,"aomori.jp":true,"chiba.jp":true,"ehime.jp":true,"fukui.jp":true,"fukuoka.jp":true,"fukushima.jp":true,"gifu.jp":true,"gunma.jp":true,"hiroshima.jp":true,"hokkaido.jp":true,"hyogo.jp":true,"ibaraki.jp":true,"ishikawa.jp":true,"iwate.jp":true,"kagawa.jp":true,"kagoshima.jp":true,"kanagawa.jp":true,"kochi.jp":true,"kumamoto.jp":true,"kyoto.jp":true,"mie.jp":true,"miyagi.jp":true,"miyazaki.jp":true,"nagano.jp":true,"nagasaki.jp":true,"nara.jp":true,"niigata.jp":true,"oita.jp":true,"okayama.jp":true,"okinawa.jp":true,"osaka.jp":true,"saga.jp":true,"saitama.jp":true,"shiga.jp":true,"shimane.jp":true,"shizuoka.jp":true,"tochigi.jp":true,"tokushima.jp":true,"tokyo.jp":true,"tottori.jp":true,"toyama.jp":true,"wakayama.jp":true,"yamagata.jp":true,"yamaguchi.jp":true,"yamanashi.jp":true,"xn--4pvxs.jp":true,"xn--vgu402c.jp":true,"xn--c3s14m.jp":true,"xn--f6qx53a.jp":true,"xn--8pvr4u.jp":true,"xn--uist22h.jp":true,"xn--djrs72d6uy.jp":true,"xn--mkru45i.jp":true,"xn--0trq7p7nn.jp":true,"xn--8ltr62k.jp":true,"xn--2m4a15e.jp":true,"xn--efvn9s.jp":true,"xn--32vp30h.jp":true,"xn--4it797k.jp":true,"xn--1lqs71d.jp":true,"xn--5rtp49c.jp":true,"xn--5js045d.jp":true,"xn--ehqz56n.jp":true,"xn--1lqs03n.jp":true,"xn--qqqt11m.jp":true,"xn--kbrq7o.jp":true,"xn--pssu33l.jp":true,"xn--ntsq17g.jp":true,"xn--uisz3g.jp":true,"xn--6btw5a.jp":true,"xn--1ctwo.jp":true,"xn--6orx2r.jp":true,"xn--rht61e.jp":true,"xn--rht27z.jp":true,"xn--djty4k.jp":true,"xn--nit225k.jp":true,"xn--rht3d.jp":true,"xn--klty5x.jp":true,"xn--kltx9a.jp":true,"xn--kltp7d.jp":true,"xn--uuwu58a.jp":true,"xn--zbx025d.jp":true,"xn--ntso0iqx3a.jp":true,"xn--elqq16h.jp":true,"xn--4it168d.jp":true,"xn--klt787d.jp":true,"xn--rny31h.jp":true,"xn--7t0a264c.jp":true,"xn--5rtq34k.jp":true,"xn--k7yn95e.jp":true,"xn--tor131o.jp":true,"xn--d5qv7z876c.jp":true,"*.kawasaki.jp":true,"*.kitakyushu.jp":true,"*.kobe.jp":true,"*.nagoya.jp":true,"*.sapporo.jp":true,"*.sendai.jp":true,"*.yokohama.jp":true,"city.kawasaki.jp":false,"city.kitakyushu.jp":false,"city.kobe.jp":false,"city.nagoya.jp":false,"city.sapporo.jp":false,"city.sendai.jp":false,"city.yokohama.jp":false,"aisai.aichi.jp":true,"ama.aichi.jp":true,"anjo.aichi.jp":true,"asuke.aichi.jp":true,"chiryu.aichi.jp":true,"chita.aichi.jp":true,"fuso.aichi.jp":true,"gamagori.aichi.jp":true,"handa.aichi.jp":true,"hazu.aichi.jp":true,"hekinan.aichi.jp":true,"higashiura.aichi.jp":true,"ichinomiya.aichi.jp":true,"inazawa.aichi.jp":true,"inuyama.aichi.jp":true,"isshiki.aichi.jp":true,"iwakura.aichi.jp":true,"kanie.aichi.jp":true,"kariya.aichi.jp":true,"kasugai.aichi.jp":true,"kira.aichi.jp":true,"kiyosu.aichi.jp":true,"komaki.aichi.jp":true,"konan.aichi.jp":true,"kota.aichi.jp":true,"mihama.aichi.jp":true,"miyoshi.aichi.jp":true,"nishio.aichi.jp":true,"nisshin.aichi.jp":true,"obu.aichi.jp":true,"oguchi.aichi.jp":true,"oharu.aichi.jp":true,"okazaki.aichi.jp":true,"owariasahi.aichi.jp":true,"seto.aichi.jp":true,"shikatsu.aichi.jp":true,"shinshiro.aichi.jp":true,"shitara.aichi.jp":true,"tahara.aichi.jp":true,"takahama.aichi.jp":true,"tobishima.aichi.jp":true,"toei.aichi.jp":true,"togo.aichi.jp":true,"tokai.aichi.jp":true,"tokoname.aichi.jp":true,"toyoake.aichi.jp":true,"toyohashi.aichi.jp":true,"toyokawa.aichi.jp":true,"toyone.aichi.jp":true,"toyota.aichi.jp":true,"tsushima.aichi.jp":true,"yatomi.aichi.jp":true,"akita.akita.jp":true,"daisen.akita.jp":true,"fujisato.akita.jp":true,"gojome.akita.jp":true,"hachirogata.akita.jp":true,"happou.akita.jp":true,"higashinaruse.akita.jp":true,"honjo.akita.jp":true,"honjyo.akita.jp":true,"ikawa.akita.jp":true,"kamikoani.akita.jp":true,"kamioka.akita.jp":true,"katagami.akita.jp":true,"kazuno.akita.jp":true,"kitaakita.akita.jp":true,"kosaka.akita.jp":true,"kyowa.akita.jp":true,"misato.akita.jp":true,"mitane.akita.jp":true,"moriyoshi.akita.jp":true,"nikaho.akita.jp":true,"noshiro.akita.jp":true,"odate.akita.jp":true,"oga.akita.jp":true,"ogata.akita.jp":true,"semboku.akita.jp":true,"yokote.akita.jp":true,"yurihonjo.akita.jp":true,"aomori.aomori.jp":true,"gonohe.aomori.jp":true,"hachinohe.aomori.jp":true,"hashikami.aomori.jp":true,"hiranai.aomori.jp":true,"hirosaki.aomori.jp":true,"itayanagi.aomori.jp":true,"kuroishi.aomori.jp":true,"misawa.aomori.jp":true,"mutsu.aomori.jp":true,"nakadomari.aomori.jp":true,"noheji.aomori.jp":true,"oirase.aomori.jp":true,"owani.aomori.jp":true,"rokunohe.aomori.jp":true,"sannohe.aomori.jp":true,"shichinohe.aomori.jp":true,"shingo.aomori.jp":true,"takko.aomori.jp":true,"towada.aomori.jp":true,"tsugaru.aomori.jp":true,"tsuruta.aomori.jp":true,"abiko.chiba.jp":true,"asahi.chiba.jp":true,"chonan.chiba.jp":true,"chosei.chiba.jp":true,"choshi.chiba.jp":true,"chuo.chiba.jp":true,"funabashi.chiba.jp":true,"futtsu.chiba.jp":true,"hanamigawa.chiba.jp":true,"ichihara.chiba.jp":true,"ichikawa.chiba.jp":true,"ichinomiya.chiba.jp":true,"inzai.chiba.jp":true,"isumi.chiba.jp":true,"kamagaya.chiba.jp":true,"kamogawa.chiba.jp":true,"kashiwa.chiba.jp":true,"katori.chiba.jp":true,"katsuura.chiba.jp":true,"kimitsu.chiba.jp":true,"kisarazu.chiba.jp":true,"kozaki.chiba.jp":true,"kujukuri.chiba.jp":true,"kyonan.chiba.jp":true,"matsudo.chiba.jp":true,"midori.chiba.jp":true,"mihama.chiba.jp":true,"minamiboso.chiba.jp":true,"mobara.chiba.jp":true,"mutsuzawa.chiba.jp":true,"nagara.chiba.jp":true,"nagareyama.chiba.jp":true,"narashino.chiba.jp":true,"narita.chiba.jp":true,"noda.chiba.jp":true,"oamishirasato.chiba.jp":true,"omigawa.chiba.jp":true,"onjuku.chiba.jp":true,"otaki.chiba.jp":true,"sakae.chiba.jp":true,"sakura.chiba.jp":true,"shimofusa.chiba.jp":true,"shirako.chiba.jp":true,"shiroi.chiba.jp":true,"shisui.chiba.jp":true,"sodegaura.chiba.jp":true,"sosa.chiba.jp":true,"tako.chiba.jp":true,"tateyama.chiba.jp":true,"togane.chiba.jp":true,"tohnosho.chiba.jp":true,"tomisato.chiba.jp":true,"urayasu.chiba.jp":true,"yachimata.chiba.jp":true,"yachiyo.chiba.jp":true,"yokaichiba.chiba.jp":true,"yokoshibahikari.chiba.jp":true,"yotsukaido.chiba.jp":true,"ainan.ehime.jp":true,"honai.ehime.jp":true,"ikata.ehime.jp":true,"imabari.ehime.jp":true,"iyo.ehime.jp":true,"kamijima.ehime.jp":true,"kihoku.ehime.jp":true,"kumakogen.ehime.jp":true,"masaki.ehime.jp":true,"matsuno.ehime.jp":true,"matsuyama.ehime.jp":true,"namikata.ehime.jp":true,"niihama.ehime.jp":true,"ozu.ehime.jp":true,"saijo.ehime.jp":true,"seiyo.ehime.jp":true,"shikokuchuo.ehime.jp":true,"tobe.ehime.jp":true,"toon.ehime.jp":true,"uchiko.ehime.jp":true,"uwajima.ehime.jp":true,"yawatahama.ehime.jp":true,"echizen.fukui.jp":true,"eiheiji.fukui.jp":true,"fukui.fukui.jp":true,"ikeda.fukui.jp":true,"katsuyama.fukui.jp":true,"mihama.fukui.jp":true,"minamiechizen.fukui.jp":true,"obama.fukui.jp":true,"ohi.fukui.jp":true,"ono.fukui.jp":true,"sabae.fukui.jp":true,"sakai.fukui.jp":true,"takahama.fukui.jp":true,"tsuruga.fukui.jp":true,"wakasa.fukui.jp":true,"ashiya.fukuoka.jp":true,"buzen.fukuoka.jp":true,"chikugo.fukuoka.jp":true,"chikuho.fukuoka.jp":true,"chikujo.fukuoka.jp":true,"chikushino.fukuoka.jp":true,"chikuzen.fukuoka.jp":true,"chuo.fukuoka.jp":true,"dazaifu.fukuoka.jp":true,"fukuchi.fukuoka.jp":true,"hakata.fukuoka.jp":true,"higashi.fukuoka.jp":true,"hirokawa.fukuoka.jp":true,"hisayama.fukuoka.jp":true,"iizuka.fukuoka.jp":true,"inatsuki.fukuoka.jp":true,"kaho.fukuoka.jp":true,"kasuga.fukuoka.jp":true,"kasuya.fukuoka.jp":true,"kawara.fukuoka.jp":true,"keisen.fukuoka.jp":true,"koga.fukuoka.jp":true,"kurate.fukuoka.jp":true,"kurogi.fukuoka.jp":true,"kurume.fukuoka.jp":true,"minami.fukuoka.jp":true,"miyako.fukuoka.jp":true,"miyama.fukuoka.jp":true,"miyawaka.fukuoka.jp":true,"mizumaki.fukuoka.jp":true,"munakata.fukuoka.jp":true,"nakagawa.fukuoka.jp":true,"nakama.fukuoka.jp":true,"nishi.fukuoka.jp":true,"nogata.fukuoka.jp":true,"ogori.fukuoka.jp":true,"okagaki.fukuoka.jp":true,"okawa.fukuoka.jp":true,"oki.fukuoka.jp":true,"omuta.fukuoka.jp":true,"onga.fukuoka.jp":true,"onojo.fukuoka.jp":true,"oto.fukuoka.jp":true,"saigawa.fukuoka.jp":true,"sasaguri.fukuoka.jp":true,"shingu.fukuoka.jp":true,"shinyoshitomi.fukuoka.jp":true,"shonai.fukuoka.jp":true,"soeda.fukuoka.jp":true,"sue.fukuoka.jp":true,"tachiarai.fukuoka.jp":true,"tagawa.fukuoka.jp":true,"takata.fukuoka.jp":true,"toho.fukuoka.jp":true,"toyotsu.fukuoka.jp":true,"tsuiki.fukuoka.jp":true,"ukiha.fukuoka.jp":true,"umi.fukuoka.jp":true,"usui.fukuoka.jp":true,"yamada.fukuoka.jp":true,"yame.fukuoka.jp":true,"yanagawa.fukuoka.jp":true,"yukuhashi.fukuoka.jp":true,"aizubange.fukushima.jp":true,"aizumisato.fukushima.jp":true,"aizuwakamatsu.fukushima.jp":true,"asakawa.fukushima.jp":true,"bandai.fukushima.jp":true,"date.fukushima.jp":true,"fukushima.fukushima.jp":true,"furudono.fukushima.jp":true,"futaba.fukushima.jp":true,"hanawa.fukushima.jp":true,"higashi.fukushima.jp":true,"hirata.fukushima.jp":true,"hirono.fukushima.jp":true,"iitate.fukushima.jp":true,"inawashiro.fukushima.jp":true,"ishikawa.fukushima.jp":true,"iwaki.fukushima.jp":true,"izumizaki.fukushima.jp":true,"kagamiishi.fukushima.jp":true,"kaneyama.fukushima.jp":true,"kawamata.fukushima.jp":true,"kitakata.fukushima.jp":true,"kitashiobara.fukushima.jp":true,"koori.fukushima.jp":true,"koriyama.fukushima.jp":true,"kunimi.fukushima.jp":true,"miharu.fukushima.jp":true,"mishima.fukushima.jp":true,"namie.fukushima.jp":true,"nango.fukushima.jp":true,"nishiaizu.fukushima.jp":true,"nishigo.fukushima.jp":true,"okuma.fukushima.jp":true,"omotego.fukushima.jp":true,"ono.fukushima.jp":true,"otama.fukushima.jp":true,"samegawa.fukushima.jp":true,"shimogo.fukushima.jp":true,"shirakawa.fukushima.jp":true,"showa.fukushima.jp":true,"soma.fukushima.jp":true,"sukagawa.fukushima.jp":true,"taishin.fukushima.jp":true,"tamakawa.fukushima.jp":true,"tanagura.fukushima.jp":true,"tenei.fukushima.jp":true,"yabuki.fukushima.jp":true,"yamato.fukushima.jp":true,"yamatsuri.fukushima.jp":true,"yanaizu.fukushima.jp":true,"yugawa.fukushima.jp":true,"anpachi.gifu.jp":true,"ena.gifu.jp":true,"gifu.gifu.jp":true,"ginan.gifu.jp":true,"godo.gifu.jp":true,"gujo.gifu.jp":true,"hashima.gifu.jp":true,"hichiso.gifu.jp":true,"hida.gifu.jp":true,"higashishirakawa.gifu.jp":true,"ibigawa.gifu.jp":true,"ikeda.gifu.jp":true,"kakamigahara.gifu.jp":true,"kani.gifu.jp":true,"kasahara.gifu.jp":true,"kasamatsu.gifu.jp":true,"kawaue.gifu.jp":true,"kitagata.gifu.jp":true,"mino.gifu.jp":true,"minokamo.gifu.jp":true,"mitake.gifu.jp":true,"mizunami.gifu.jp":true,"motosu.gifu.jp":true,"nakatsugawa.gifu.jp":true,"ogaki.gifu.jp":true,"sakahogi.gifu.jp":true,"seki.gifu.jp":true,"sekigahara.gifu.jp":true,"shirakawa.gifu.jp":true,"tajimi.gifu.jp":true,"takayama.gifu.jp":true,"tarui.gifu.jp":true,"toki.gifu.jp":true,"tomika.gifu.jp":true,"wanouchi.gifu.jp":true,"yamagata.gifu.jp":true,"yaotsu.gifu.jp":true,"yoro.gifu.jp":true,"annaka.gunma.jp":true,"chiyoda.gunma.jp":true,"fujioka.gunma.jp":true,"higashiagatsuma.gunma.jp":true,"isesaki.gunma.jp":true,"itakura.gunma.jp":true,"kanna.gunma.jp":true,"kanra.gunma.jp":true,"katashina.gunma.jp":true,"kawaba.gunma.jp":true,"kiryu.gunma.jp":true,"kusatsu.gunma.jp":true,"maebashi.gunma.jp":true,"meiwa.gunma.jp":true,"midori.gunma.jp":true,"minakami.gunma.jp":true,"naganohara.gunma.jp":true,"nakanojo.gunma.jp":true,"nanmoku.gunma.jp":true,"numata.gunma.jp":true,"oizumi.gunma.jp":true,"ora.gunma.jp":true,"ota.gunma.jp":true,"shibukawa.gunma.jp":true,"shimonita.gunma.jp":true,"shinto.gunma.jp":true,"showa.gunma.jp":true,"takasaki.gunma.jp":true,"takayama.gunma.jp":true,"tamamura.gunma.jp":true,"tatebayashi.gunma.jp":true,"tomioka.gunma.jp":true,"tsukiyono.gunma.jp":true,"tsumagoi.gunma.jp":true,"ueno.gunma.jp":true,"yoshioka.gunma.jp":true,"asaminami.hiroshima.jp":true,"daiwa.hiroshima.jp":true,"etajima.hiroshima.jp":true,"fuchu.hiroshima.jp":true,"fukuyama.hiroshima.jp":true,"hatsukaichi.hiroshima.jp":true,"higashihiroshima.hiroshima.jp":true,"hongo.hiroshima.jp":true,"jinsekikogen.hiroshima.jp":true,"kaita.hiroshima.jp":true,"kui.hiroshima.jp":true,"kumano.hiroshima.jp":true,"kure.hiroshima.jp":true,"mihara.hiroshima.jp":true,"miyoshi.hiroshima.jp":true,"naka.hiroshima.jp":true,"onomichi.hiroshima.jp":true,"osakikamijima.hiroshima.jp":true,"otake.hiroshima.jp":true,"saka.hiroshima.jp":true,"sera.hiroshima.jp":true,"seranishi.hiroshima.jp":true,"shinichi.hiroshima.jp":true,"shobara.hiroshima.jp":true,"takehara.hiroshima.jp":true,"abashiri.hokkaido.jp":true,"abira.hokkaido.jp":true,"aibetsu.hokkaido.jp":true,"akabira.hokkaido.jp":true,"akkeshi.hokkaido.jp":true,"asahikawa.hokkaido.jp":true,"ashibetsu.hokkaido.jp":true,"ashoro.hokkaido.jp":true,"assabu.hokkaido.jp":true,"atsuma.hokkaido.jp":true,"bibai.hokkaido.jp":true,"biei.hokkaido.jp":true,"bifuka.hokkaido.jp":true,"bihoro.hokkaido.jp":true,"biratori.hokkaido.jp":true,"chippubetsu.hokkaido.jp":true,"chitose.hokkaido.jp":true,"date.hokkaido.jp":true,"ebetsu.hokkaido.jp":true,"embetsu.hokkaido.jp":true,"eniwa.hokkaido.jp":true,"erimo.hokkaido.jp":true,"esan.hokkaido.jp":true,"esashi.hokkaido.jp":true,"fukagawa.hokkaido.jp":true,"fukushima.hokkaido.jp":true,"furano.hokkaido.jp":true,"furubira.hokkaido.jp":true,"haboro.hokkaido.jp":true,"hakodate.hokkaido.jp":true,"hamatonbetsu.hokkaido.jp":true,"hidaka.hokkaido.jp":true,"higashikagura.hokkaido.jp":true,"higashikawa.hokkaido.jp":true,"hiroo.hokkaido.jp":true,"hokuryu.hokkaido.jp":true,"hokuto.hokkaido.jp":true,"honbetsu.hokkaido.jp":true,"horokanai.hokkaido.jp":true,"horonobe.hokkaido.jp":true,"ikeda.hokkaido.jp":true,"imakane.hokkaido.jp":true,"ishikari.hokkaido.jp":true,"iwamizawa.hokkaido.jp":true,"iwanai.hokkaido.jp":true,"kamifurano.hokkaido.jp":true,"kamikawa.hokkaido.jp":true,"kamishihoro.hokkaido.jp":true,"kamisunagawa.hokkaido.jp":true,"kamoenai.hokkaido.jp":true,"kayabe.hokkaido.jp":true,"kembuchi.hokkaido.jp":true,"kikonai.hokkaido.jp":true,"kimobetsu.hokkaido.jp":true,"kitahiroshima.hokkaido.jp":true,"kitami.hokkaido.jp":true,"kiyosato.hokkaido.jp":true,"koshimizu.hokkaido.jp":true,"kunneppu.hokkaido.jp":true,"kuriyama.hokkaido.jp":true,"kuromatsunai.hokkaido.jp":true,"kushiro.hokkaido.jp":true,"kutchan.hokkaido.jp":true,"kyowa.hokkaido.jp":true,"mashike.hokkaido.jp":true,"matsumae.hokkaido.jp":true,"mikasa.hokkaido.jp":true,"minamifurano.hokkaido.jp":true,"mombetsu.hokkaido.jp":true,"moseushi.hokkaido.jp":true,"mukawa.hokkaido.jp":true,"muroran.hokkaido.jp":true,"naie.hokkaido.jp":true,"nakagawa.hokkaido.jp":true,"nakasatsunai.hokkaido.jp":true,"nakatombetsu.hokkaido.jp":true,"nanae.hokkaido.jp":true,"nanporo.hokkaido.jp":true,"nayoro.hokkaido.jp":true,"nemuro.hokkaido.jp":true,"niikappu.hokkaido.jp":true,"niki.hokkaido.jp":true,"nishiokoppe.hokkaido.jp":true,"noboribetsu.hokkaido.jp":true,"numata.hokkaido.jp":true,"obihiro.hokkaido.jp":true,"obira.hokkaido.jp":true,"oketo.hokkaido.jp":true,"okoppe.hokkaido.jp":true,"otaru.hokkaido.jp":true,"otobe.hokkaido.jp":true,"otofuke.hokkaido.jp":true,"otoineppu.hokkaido.jp":true,"oumu.hokkaido.jp":true,"ozora.hokkaido.jp":true,"pippu.hokkaido.jp":true,"rankoshi.hokkaido.jp":true,"rebun.hokkaido.jp":true,"rikubetsu.hokkaido.jp":true,"rishiri.hokkaido.jp":true,"rishirifuji.hokkaido.jp":true,"saroma.hokkaido.jp":true,"sarufutsu.hokkaido.jp":true,"shakotan.hokkaido.jp":true,"shari.hokkaido.jp":true,"shibecha.hokkaido.jp":true,"shibetsu.hokkaido.jp":true,"shikabe.hokkaido.jp":true,"shikaoi.hokkaido.jp":true,"shimamaki.hokkaido.jp":true,"shimizu.hokkaido.jp":true,"shimokawa.hokkaido.jp":true,"shinshinotsu.hokkaido.jp":true,"shintoku.hokkaido.jp":true,"shiranuka.hokkaido.jp":true,"shiraoi.hokkaido.jp":true,"shiriuchi.hokkaido.jp":true,"sobetsu.hokkaido.jp":true,"sunagawa.hokkaido.jp":true,"taiki.hokkaido.jp":true,"takasu.hokkaido.jp":true,"takikawa.hokkaido.jp":true,"takinoue.hokkaido.jp":true,"teshikaga.hokkaido.jp":true,"tobetsu.hokkaido.jp":true,"tohma.hokkaido.jp":true,"tomakomai.hokkaido.jp":true,"tomari.hokkaido.jp":true,"toya.hokkaido.jp":true,"toyako.hokkaido.jp":true,"toyotomi.hokkaido.jp":true,"toyoura.hokkaido.jp":true,"tsubetsu.hokkaido.jp":true,"tsukigata.hokkaido.jp":true,"urakawa.hokkaido.jp":true,"urausu.hokkaido.jp":true,"uryu.hokkaido.jp":true,"utashinai.hokkaido.jp":true,"wakkanai.hokkaido.jp":true,"wassamu.hokkaido.jp":true,"yakumo.hokkaido.jp":true,"yoichi.hokkaido.jp":true,"aioi.hyogo.jp":true,"akashi.hyogo.jp":true,"ako.hyogo.jp":true,"amagasaki.hyogo.jp":true,"aogaki.hyogo.jp":true,"asago.hyogo.jp":true,"ashiya.hyogo.jp":true,"awaji.hyogo.jp":true,"fukusaki.hyogo.jp":true,"goshiki.hyogo.jp":true,"harima.hyogo.jp":true,"himeji.hyogo.jp":true,"ichikawa.hyogo.jp":true,"inagawa.hyogo.jp":true,"itami.hyogo.jp":true,"kakogawa.hyogo.jp":true,"kamigori.hyogo.jp":true,"kamikawa.hyogo.jp":true,"kasai.hyogo.jp":true,"kasuga.hyogo.jp":true,"kawanishi.hyogo.jp":true,"miki.hyogo.jp":true,"minamiawaji.hyogo.jp":true,"nishinomiya.hyogo.jp":true,"nishiwaki.hyogo.jp":true,"ono.hyogo.jp":true,"sanda.hyogo.jp":true,"sannan.hyogo.jp":true,"sasayama.hyogo.jp":true,"sayo.hyogo.jp":true,"shingu.hyogo.jp":true,"shinonsen.hyogo.jp":true,"shiso.hyogo.jp":true,"sumoto.hyogo.jp":true,"taishi.hyogo.jp":true,"taka.hyogo.jp":true,"takarazuka.hyogo.jp":true,"takasago.hyogo.jp":true,"takino.hyogo.jp":true,"tamba.hyogo.jp":true,"tatsuno.hyogo.jp":true,"toyooka.hyogo.jp":true,"yabu.hyogo.jp":true,"yashiro.hyogo.jp":true,"yoka.hyogo.jp":true,"yokawa.hyogo.jp":true,"ami.ibaraki.jp":true,"asahi.ibaraki.jp":true,"bando.ibaraki.jp":true,"chikusei.ibaraki.jp":true,"daigo.ibaraki.jp":true,"fujishiro.ibaraki.jp":true,"hitachi.ibaraki.jp":true,"hitachinaka.ibaraki.jp":true,"hitachiomiya.ibaraki.jp":true,"hitachiota.ibaraki.jp":true,"ibaraki.ibaraki.jp":true,"ina.ibaraki.jp":true,"inashiki.ibaraki.jp":true,"itako.ibaraki.jp":true,"iwama.ibaraki.jp":true,"joso.ibaraki.jp":true,"kamisu.ibaraki.jp":true,"kasama.ibaraki.jp":true,"kashima.ibaraki.jp":true,"kasumigaura.ibaraki.jp":true,"koga.ibaraki.jp":true,"miho.ibaraki.jp":true,"mito.ibaraki.jp":true,"moriya.ibaraki.jp":true,"naka.ibaraki.jp":true,"namegata.ibaraki.jp":true,"oarai.ibaraki.jp":true,"ogawa.ibaraki.jp":true,"omitama.ibaraki.jp":true,"ryugasaki.ibaraki.jp":true,"sakai.ibaraki.jp":true,"sakuragawa.ibaraki.jp":true,"shimodate.ibaraki.jp":true,"shimotsuma.ibaraki.jp":true,"shirosato.ibaraki.jp":true,"sowa.ibaraki.jp":true,"suifu.ibaraki.jp":true,"takahagi.ibaraki.jp":true,"tamatsukuri.ibaraki.jp":true,"tokai.ibaraki.jp":true,"tomobe.ibaraki.jp":true,"tone.ibaraki.jp":true,"toride.ibaraki.jp":true,"tsuchiura.ibaraki.jp":true,"tsukuba.ibaraki.jp":true,"uchihara.ibaraki.jp":true,"ushiku.ibaraki.jp":true,"yachiyo.ibaraki.jp":true,"yamagata.ibaraki.jp":true,"yawara.ibaraki.jp":true,"yuki.ibaraki.jp":true,"anamizu.ishikawa.jp":true,"hakui.ishikawa.jp":true,"hakusan.ishikawa.jp":true,"kaga.ishikawa.jp":true,"kahoku.ishikawa.jp":true,"kanazawa.ishikawa.jp":true,"kawakita.ishikawa.jp":true,"komatsu.ishikawa.jp":true,"nakanoto.ishikawa.jp":true,"nanao.ishikawa.jp":true,"nomi.ishikawa.jp":true,"nonoichi.ishikawa.jp":true,"noto.ishikawa.jp":true,"shika.ishikawa.jp":true,"suzu.ishikawa.jp":true,"tsubata.ishikawa.jp":true,"tsurugi.ishikawa.jp":true,"uchinada.ishikawa.jp":true,"wajima.ishikawa.jp":true,"fudai.iwate.jp":true,"fujisawa.iwate.jp":true,"hanamaki.iwate.jp":true,"hiraizumi.iwate.jp":true,"hirono.iwate.jp":true,"ichinohe.iwate.jp":true,"ichinoseki.iwate.jp":true,"iwaizumi.iwate.jp":true,"iwate.iwate.jp":true,"joboji.iwate.jp":true,"kamaishi.iwate.jp":true,"kanegasaki.iwate.jp":true,"karumai.iwate.jp":true,"kawai.iwate.jp":true,"kitakami.iwate.jp":true,"kuji.iwate.jp":true,"kunohe.iwate.jp":true,"kuzumaki.iwate.jp":true,"miyako.iwate.jp":true,"mizusawa.iwate.jp":true,"morioka.iwate.jp":true,"ninohe.iwate.jp":true,"noda.iwate.jp":true,"ofunato.iwate.jp":true,"oshu.iwate.jp":true,"otsuchi.iwate.jp":true,"rikuzentakata.iwate.jp":true,"shiwa.iwate.jp":true,"shizukuishi.iwate.jp":true,"sumita.iwate.jp":true,"tanohata.iwate.jp":true,"tono.iwate.jp":true,"yahaba.iwate.jp":true,"yamada.iwate.jp":true,"ayagawa.kagawa.jp":true,"higashikagawa.kagawa.jp":true,"kanonji.kagawa.jp":true,"kotohira.kagawa.jp":true,"manno.kagawa.jp":true,"marugame.kagawa.jp":true,"mitoyo.kagawa.jp":true,"naoshima.kagawa.jp":true,"sanuki.kagawa.jp":true,"tadotsu.kagawa.jp":true,"takamatsu.kagawa.jp":true,"tonosho.kagawa.jp":true,"uchinomi.kagawa.jp":true,"utazu.kagawa.jp":true,"zentsuji.kagawa.jp":true,"akune.kagoshima.jp":true,"amami.kagoshima.jp":true,"hioki.kagoshima.jp":true,"isa.kagoshima.jp":true,"isen.kagoshima.jp":true,"izumi.kagoshima.jp":true,"kagoshima.kagoshima.jp":true,"kanoya.kagoshima.jp":true,"kawanabe.kagoshima.jp":true,"kinko.kagoshima.jp":true,"kouyama.kagoshima.jp":true,"makurazaki.kagoshima.jp":true,"matsumoto.kagoshima.jp":true,"minamitane.kagoshima.jp":true,"nakatane.kagoshima.jp":true,"nishinoomote.kagoshima.jp":true,"satsumasendai.kagoshima.jp":true,"soo.kagoshima.jp":true,"tarumizu.kagoshima.jp":true,"yusui.kagoshima.jp":true,"aikawa.kanagawa.jp":true,"atsugi.kanagawa.jp":true,"ayase.kanagawa.jp":true,"chigasaki.kanagawa.jp":true,"ebina.kanagawa.jp":true,"fujisawa.kanagawa.jp":true,"hadano.kanagawa.jp":true,"hakone.kanagawa.jp":true,"hiratsuka.kanagawa.jp":true,"isehara.kanagawa.jp":true,"kaisei.kanagawa.jp":true,"kamakura.kanagawa.jp":true,"kiyokawa.kanagawa.jp":true,"matsuda.kanagawa.jp":true,"minamiashigara.kanagawa.jp":true,"miura.kanagawa.jp":true,"nakai.kanagawa.jp":true,"ninomiya.kanagawa.jp":true,"odawara.kanagawa.jp":true,"oi.kanagawa.jp":true,"oiso.kanagawa.jp":true,"sagamihara.kanagawa.jp":true,"samukawa.kanagawa.jp":true,"tsukui.kanagawa.jp":true,"yamakita.kanagawa.jp":true,"yamato.kanagawa.jp":true,"yokosuka.kanagawa.jp":true,"yugawara.kanagawa.jp":true,"zama.kanagawa.jp":true,"zushi.kanagawa.jp":true,"aki.kochi.jp":true,"geisei.kochi.jp":true,"hidaka.kochi.jp":true,"higashitsuno.kochi.jp":true,"ino.kochi.jp":true,"kagami.kochi.jp":true,"kami.kochi.jp":true,"kitagawa.kochi.jp":true,"kochi.kochi.jp":true,"mihara.kochi.jp":true,"motoyama.kochi.jp":true,"muroto.kochi.jp":true,"nahari.kochi.jp":true,"nakamura.kochi.jp":true,"nankoku.kochi.jp":true,"nishitosa.kochi.jp":true,"niyodogawa.kochi.jp":true,"ochi.kochi.jp":true,"okawa.kochi.jp":true,"otoyo.kochi.jp":true,"otsuki.kochi.jp":true,"sakawa.kochi.jp":true,"sukumo.kochi.jp":true,"susaki.kochi.jp":true,"tosa.kochi.jp":true,"tosashimizu.kochi.jp":true,"toyo.kochi.jp":true,"tsuno.kochi.jp":true,"umaji.kochi.jp":true,"yasuda.kochi.jp":true,"yusuhara.kochi.jp":true,"amakusa.kumamoto.jp":true,"arao.kumamoto.jp":true,"aso.kumamoto.jp":true,"choyo.kumamoto.jp":true,"gyokuto.kumamoto.jp":true,"hitoyoshi.kumamoto.jp":true,"kamiamakusa.kumamoto.jp":true,"kashima.kumamoto.jp":true,"kikuchi.kumamoto.jp":true,"kosa.kumamoto.jp":true,"kumamoto.kumamoto.jp":true,"mashiki.kumamoto.jp":true,"mifune.kumamoto.jp":true,"minamata.kumamoto.jp":true,"minamioguni.kumamoto.jp":true,"nagasu.kumamoto.jp":true,"nishihara.kumamoto.jp":true,"oguni.kumamoto.jp":true,"ozu.kumamoto.jp":true,"sumoto.kumamoto.jp":true,"takamori.kumamoto.jp":true,"uki.kumamoto.jp":true,"uto.kumamoto.jp":true,"yamaga.kumamoto.jp":true,"yamato.kumamoto.jp":true,"yatsushiro.kumamoto.jp":true,"ayabe.kyoto.jp":true,"fukuchiyama.kyoto.jp":true,"higashiyama.kyoto.jp":true,"ide.kyoto.jp":true,"ine.kyoto.jp":true,"joyo.kyoto.jp":true,"kameoka.kyoto.jp":true,"kamo.kyoto.jp":true,"kita.kyoto.jp":true,"kizu.kyoto.jp":true,"kumiyama.kyoto.jp":true,"kyotamba.kyoto.jp":true,"kyotanabe.kyoto.jp":true,"kyotango.kyoto.jp":true,"maizuru.kyoto.jp":true,"minami.kyoto.jp":true,"minamiyamashiro.kyoto.jp":true,"miyazu.kyoto.jp":true,"muko.kyoto.jp":true,"nagaokakyo.kyoto.jp":true,"nakagyo.kyoto.jp":true,"nantan.kyoto.jp":true,"oyamazaki.kyoto.jp":true,"sakyo.kyoto.jp":true,"seika.kyoto.jp":true,"tanabe.kyoto.jp":true,"uji.kyoto.jp":true,"ujitawara.kyoto.jp":true,"wazuka.kyoto.jp":true,"yamashina.kyoto.jp":true,"yawata.kyoto.jp":true,"asahi.mie.jp":true,"inabe.mie.jp":true,"ise.mie.jp":true,"kameyama.mie.jp":true,"kawagoe.mie.jp":true,"kiho.mie.jp":true,"kisosaki.mie.jp":true,"kiwa.mie.jp":true,"komono.mie.jp":true,"kumano.mie.jp":true,"kuwana.mie.jp":true,"matsusaka.mie.jp":true,"meiwa.mie.jp":true,"mihama.mie.jp":true,"minamiise.mie.jp":true,"misugi.mie.jp":true,"miyama.mie.jp":true,"nabari.mie.jp":true,"shima.mie.jp":true,"suzuka.mie.jp":true,"tado.mie.jp":true,"taiki.mie.jp":true,"taki.mie.jp":true,"tamaki.mie.jp":true,"toba.mie.jp":true,"tsu.mie.jp":true,"udono.mie.jp":true,"ureshino.mie.jp":true,"watarai.mie.jp":true,"yokkaichi.mie.jp":true,"furukawa.miyagi.jp":true,"higashimatsushima.miyagi.jp":true,"ishinomaki.miyagi.jp":true,"iwanuma.miyagi.jp":true,"kakuda.miyagi.jp":true,"kami.miyagi.jp":true,"kawasaki.miyagi.jp":true,"kesennuma.miyagi.jp":true,"marumori.miyagi.jp":true,"matsushima.miyagi.jp":true,"minamisanriku.miyagi.jp":true,"misato.miyagi.jp":true,"murata.miyagi.jp":true,"natori.miyagi.jp":true,"ogawara.miyagi.jp":true,"ohira.miyagi.jp":true,"onagawa.miyagi.jp":true,"osaki.miyagi.jp":true,"rifu.miyagi.jp":true,"semine.miyagi.jp":true,"shibata.miyagi.jp":true,"shichikashuku.miyagi.jp":true,"shikama.miyagi.jp":true,"shiogama.miyagi.jp":true,"shiroishi.miyagi.jp":true,"tagajo.miyagi.jp":true,"taiwa.miyagi.jp":true,"tome.miyagi.jp":true,"tomiya.miyagi.jp":true,"wakuya.miyagi.jp":true,"watari.miyagi.jp":true,"yamamoto.miyagi.jp":true,"zao.miyagi.jp":true,"aya.miyazaki.jp":true,"ebino.miyazaki.jp":true,"gokase.miyazaki.jp":true,"hyuga.miyazaki.jp":true,"kadogawa.miyazaki.jp":true,"kawaminami.miyazaki.jp":true,"kijo.miyazaki.jp":true,"kitagawa.miyazaki.jp":true,"kitakata.miyazaki.jp":true,"kitaura.miyazaki.jp":true,"kobayashi.miyazaki.jp":true,"kunitomi.miyazaki.jp":true,"kushima.miyazaki.jp":true,"mimata.miyazaki.jp":true,"miyakonojo.miyazaki.jp":true,"miyazaki.miyazaki.jp":true,"morotsuka.miyazaki.jp":true,"nichinan.miyazaki.jp":true,"nishimera.miyazaki.jp":true,"nobeoka.miyazaki.jp":true,"saito.miyazaki.jp":true,"shiiba.miyazaki.jp":true,"shintomi.miyazaki.jp":true,"takaharu.miyazaki.jp":true,"takanabe.miyazaki.jp":true,"takazaki.miyazaki.jp":true,"tsuno.miyazaki.jp":true,"achi.nagano.jp":true,"agematsu.nagano.jp":true,"anan.nagano.jp":true,"aoki.nagano.jp":true,"asahi.nagano.jp":true,"azumino.nagano.jp":true,"chikuhoku.nagano.jp":true,"chikuma.nagano.jp":true,"chino.nagano.jp":true,"fujimi.nagano.jp":true,"hakuba.nagano.jp":true,"hara.nagano.jp":true,"hiraya.nagano.jp":true,"iida.nagano.jp":true,"iijima.nagano.jp":true,"iiyama.nagano.jp":true,"iizuna.nagano.jp":true,"ikeda.nagano.jp":true,"ikusaka.nagano.jp":true,"ina.nagano.jp":true,"karuizawa.nagano.jp":true,"kawakami.nagano.jp":true,"kiso.nagano.jp":true,"kisofukushima.nagano.jp":true,"kitaaiki.nagano.jp":true,"komagane.nagano.jp":true,"komoro.nagano.jp":true,"matsukawa.nagano.jp":true,"matsumoto.nagano.jp":true,"miasa.nagano.jp":true,"minamiaiki.nagano.jp":true,"minamimaki.nagano.jp":true,"minamiminowa.nagano.jp":true,"minowa.nagano.jp":true,"miyada.nagano.jp":true,"miyota.nagano.jp":true,"mochizuki.nagano.jp":true,"nagano.nagano.jp":true,"nagawa.nagano.jp":true,"nagiso.nagano.jp":true,"nakagawa.nagano.jp":true,"nakano.nagano.jp":true,"nozawaonsen.nagano.jp":true,"obuse.nagano.jp":true,"ogawa.nagano.jp":true,"okaya.nagano.jp":true,"omachi.nagano.jp":true,"omi.nagano.jp":true,"ookuwa.nagano.jp":true,"ooshika.nagano.jp":true,"otaki.nagano.jp":true,"otari.nagano.jp":true,"sakae.nagano.jp":true,"sakaki.nagano.jp":true,"saku.nagano.jp":true,"sakuho.nagano.jp":true,"shimosuwa.nagano.jp":true,"shinanomachi.nagano.jp":true,"shiojiri.nagano.jp":true,"suwa.nagano.jp":true,"suzaka.nagano.jp":true,"takagi.nagano.jp":true,"takamori.nagano.jp":true,"takayama.nagano.jp":true,"tateshina.nagano.jp":true,"tatsuno.nagano.jp":true,"togakushi.nagano.jp":true,"togura.nagano.jp":true,"tomi.nagano.jp":true,"ueda.nagano.jp":true,"wada.nagano.jp":true,"yamagata.nagano.jp":true,"yamanouchi.nagano.jp":true,"yasaka.nagano.jp":true,"yasuoka.nagano.jp":true,"chijiwa.nagasaki.jp":true,"futsu.nagasaki.jp":true,"goto.nagasaki.jp":true,"hasami.nagasaki.jp":true,"hirado.nagasaki.jp":true,"iki.nagasaki.jp":true,"isahaya.nagasaki.jp":true,"kawatana.nagasaki.jp":true,"kuchinotsu.nagasaki.jp":true,"matsuura.nagasaki.jp":true,"nagasaki.nagasaki.jp":true,"obama.nagasaki.jp":true,"omura.nagasaki.jp":true,"oseto.nagasaki.jp":true,"saikai.nagasaki.jp":true,"sasebo.nagasaki.jp":true,"seihi.nagasaki.jp":true,"shimabara.nagasaki.jp":true,"shinkamigoto.nagasaki.jp":true,"togitsu.nagasaki.jp":true,"tsushima.nagasaki.jp":true,"unzen.nagasaki.jp":true,"ando.nara.jp":true,"gose.nara.jp":true,"heguri.nara.jp":true,"higashiyoshino.nara.jp":true,"ikaruga.nara.jp":true,"ikoma.nara.jp":true,"kamikitayama.nara.jp":true,"kanmaki.nara.jp":true,"kashiba.nara.jp":true,"kashihara.nara.jp":true,"katsuragi.nara.jp":true,"kawai.nara.jp":true,"kawakami.nara.jp":true,"kawanishi.nara.jp":true,"koryo.nara.jp":true,"kurotaki.nara.jp":true,"mitsue.nara.jp":true,"miyake.nara.jp":true,"nara.nara.jp":true,"nosegawa.nara.jp":true,"oji.nara.jp":true,"ouda.nara.jp":true,"oyodo.nara.jp":true,"sakurai.nara.jp":true,"sango.nara.jp":true,"shimoichi.nara.jp":true,"shimokitayama.nara.jp":true,"shinjo.nara.jp":true,"soni.nara.jp":true,"takatori.nara.jp":true,"tawaramoto.nara.jp":true,"tenkawa.nara.jp":true,"tenri.nara.jp":true,"uda.nara.jp":true,"yamatokoriyama.nara.jp":true,"yamatotakada.nara.jp":true,"yamazoe.nara.jp":true,"yoshino.nara.jp":true,"aga.niigata.jp":true,"agano.niigata.jp":true,"gosen.niigata.jp":true,"itoigawa.niigata.jp":true,"izumozaki.niigata.jp":true,"joetsu.niigata.jp":true,"kamo.niigata.jp":true,"kariwa.niigata.jp":true,"kashiwazaki.niigata.jp":true,"minamiuonuma.niigata.jp":true,"mitsuke.niigata.jp":true,"muika.niigata.jp":true,"murakami.niigata.jp":true,"myoko.niigata.jp":true,"nagaoka.niigata.jp":true,"niigata.niigata.jp":true,"ojiya.niigata.jp":true,"omi.niigata.jp":true,"sado.niigata.jp":true,"sanjo.niigata.jp":true,"seiro.niigata.jp":true,"seirou.niigata.jp":true,"sekikawa.niigata.jp":true,"shibata.niigata.jp":true,"tagami.niigata.jp":true,"tainai.niigata.jp":true,"tochio.niigata.jp":true,"tokamachi.niigata.jp":true,"tsubame.niigata.jp":true,"tsunan.niigata.jp":true,"uonuma.niigata.jp":true,"yahiko.niigata.jp":true,"yoita.niigata.jp":true,"yuzawa.niigata.jp":true,"beppu.oita.jp":true,"bungoono.oita.jp":true,"bungotakada.oita.jp":true,"hasama.oita.jp":true,"hiji.oita.jp":true,"himeshima.oita.jp":true,"hita.oita.jp":true,"kamitsue.oita.jp":true,"kokonoe.oita.jp":true,"kuju.oita.jp":true,"kunisaki.oita.jp":true,"kusu.oita.jp":true,"oita.oita.jp":true,"saiki.oita.jp":true,"taketa.oita.jp":true,"tsukumi.oita.jp":true,"usa.oita.jp":true,"usuki.oita.jp":true,"yufu.oita.jp":true,"akaiwa.okayama.jp":true,"asakuchi.okayama.jp":true,"bizen.okayama.jp":true,"hayashima.okayama.jp":true,"ibara.okayama.jp":true,"kagamino.okayama.jp":true,"kasaoka.okayama.jp":true,"kibichuo.okayama.jp":true,"kumenan.okayama.jp":true,"kurashiki.okayama.jp":true,"maniwa.okayama.jp":true,"misaki.okayama.jp":true,"nagi.okayama.jp":true,"niimi.okayama.jp":true,"nishiawakura.okayama.jp":true,"okayama.okayama.jp":true,"satosho.okayama.jp":true,"setouchi.okayama.jp":true,"shinjo.okayama.jp":true,"shoo.okayama.jp":true,"soja.okayama.jp":true,"takahashi.okayama.jp":true,"tamano.okayama.jp":true,"tsuyama.okayama.jp":true,"wake.okayama.jp":true,"yakage.okayama.jp":true,"aguni.okinawa.jp":true,"ginowan.okinawa.jp":true,"ginoza.okinawa.jp":true,"gushikami.okinawa.jp":true,"haebaru.okinawa.jp":true,"higashi.okinawa.jp":true,"hirara.okinawa.jp":true,"iheya.okinawa.jp":true,"ishigaki.okinawa.jp":true,"ishikawa.okinawa.jp":true,"itoman.okinawa.jp":true,"izena.okinawa.jp":true,"kadena.okinawa.jp":true,"kin.okinawa.jp":true,"kitadaito.okinawa.jp":true,"kitanakagusuku.okinawa.jp":true,"kumejima.okinawa.jp":true,"kunigami.okinawa.jp":true,"minamidaito.okinawa.jp":true,"motobu.okinawa.jp":true,"nago.okinawa.jp":true,"naha.okinawa.jp":true,"nakagusuku.okinawa.jp":true,"nakijin.okinawa.jp":true,"nanjo.okinawa.jp":true,"nishihara.okinawa.jp":true,"ogimi.okinawa.jp":true,"okinawa.okinawa.jp":true,"onna.okinawa.jp":true,"shimoji.okinawa.jp":true,"taketomi.okinawa.jp":true,"tarama.okinawa.jp":true,"tokashiki.okinawa.jp":true,"tomigusuku.okinawa.jp":true,"tonaki.okinawa.jp":true,"urasoe.okinawa.jp":true,"uruma.okinawa.jp":true,"yaese.okinawa.jp":true,"yomitan.okinawa.jp":true,"yonabaru.okinawa.jp":true,"yonaguni.okinawa.jp":true,"zamami.okinawa.jp":true,"abeno.osaka.jp":true,"chihayaakasaka.osaka.jp":true,"chuo.osaka.jp":true,"daito.osaka.jp":true,"fujiidera.osaka.jp":true,"habikino.osaka.jp":true,"hannan.osaka.jp":true,"higashiosaka.osaka.jp":true,"higashisumiyoshi.osaka.jp":true,"higashiyodogawa.osaka.jp":true,"hirakata.osaka.jp":true,"ibaraki.osaka.jp":true,"ikeda.osaka.jp":true,"izumi.osaka.jp":true,"izumiotsu.osaka.jp":true,"izumisano.osaka.jp":true,"kadoma.osaka.jp":true,"kaizuka.osaka.jp":true,"kanan.osaka.jp":true,"kashiwara.osaka.jp":true,"katano.osaka.jp":true,"kawachinagano.osaka.jp":true,"kishiwada.osaka.jp":true,"kita.osaka.jp":true,"kumatori.osaka.jp":true,"matsubara.osaka.jp":true,"minato.osaka.jp":true,"minoh.osaka.jp":true,"misaki.osaka.jp":true,"moriguchi.osaka.jp":true,"neyagawa.osaka.jp":true,"nishi.osaka.jp":true,"nose.osaka.jp":true,"osakasayama.osaka.jp":true,"sakai.osaka.jp":true,"sayama.osaka.jp":true,"sennan.osaka.jp":true,"settsu.osaka.jp":true,"shijonawate.osaka.jp":true,"shimamoto.osaka.jp":true,"suita.osaka.jp":true,"tadaoka.osaka.jp":true,"taishi.osaka.jp":true,"tajiri.osaka.jp":true,"takaishi.osaka.jp":true,"takatsuki.osaka.jp":true,"tondabayashi.osaka.jp":true,"toyonaka.osaka.jp":true,"toyono.osaka.jp":true,"yao.osaka.jp":true,"ariake.saga.jp":true,"arita.saga.jp":true,"fukudomi.saga.jp":true,"genkai.saga.jp":true,"hamatama.saga.jp":true,"hizen.saga.jp":true,"imari.saga.jp":true,"kamimine.saga.jp":true,"kanzaki.saga.jp":true,"karatsu.saga.jp":true,"kashima.saga.jp":true,"kitagata.saga.jp":true,"kitahata.saga.jp":true,"kiyama.saga.jp":true,"kouhoku.saga.jp":true,"kyuragi.saga.jp":true,"nishiarita.saga.jp":true,"ogi.saga.jp":true,"omachi.saga.jp":true,"ouchi.saga.jp":true,"saga.saga.jp":true,"shiroishi.saga.jp":true,"taku.saga.jp":true,"tara.saga.jp":true,"tosu.saga.jp":true,"yoshinogari.saga.jp":true,"arakawa.saitama.jp":true,"asaka.saitama.jp":true,"chichibu.saitama.jp":true,"fujimi.saitama.jp":true,"fujimino.saitama.jp":true,"fukaya.saitama.jp":true,"hanno.saitama.jp":true,"hanyu.saitama.jp":true,"hasuda.saitama.jp":true,"hatogaya.saitama.jp":true,"hatoyama.saitama.jp":true,"hidaka.saitama.jp":true,"higashichichibu.saitama.jp":true,"higashimatsuyama.saitama.jp":true,"honjo.saitama.jp":true,"ina.saitama.jp":true,"iruma.saitama.jp":true,"iwatsuki.saitama.jp":true,"kamiizumi.saitama.jp":true,"kamikawa.saitama.jp":true,"kamisato.saitama.jp":true,"kasukabe.saitama.jp":true,"kawagoe.saitama.jp":true,"kawaguchi.saitama.jp":true,"kawajima.saitama.jp":true,"kazo.saitama.jp":true,"kitamoto.saitama.jp":true,"koshigaya.saitama.jp":true,"kounosu.saitama.jp":true,"kuki.saitama.jp":true,"kumagaya.saitama.jp":true,"matsubushi.saitama.jp":true,"minano.saitama.jp":true,"misato.saitama.jp":true,"miyashiro.saitama.jp":true,"miyoshi.saitama.jp":true,"moroyama.saitama.jp":true,"nagatoro.saitama.jp":true,"namegawa.saitama.jp":true,"niiza.saitama.jp":true,"ogano.saitama.jp":true,"ogawa.saitama.jp":true,"ogose.saitama.jp":true,"okegawa.saitama.jp":true,"omiya.saitama.jp":true,"otaki.saitama.jp":true,"ranzan.saitama.jp":true,"ryokami.saitama.jp":true,"saitama.saitama.jp":true,"sakado.saitama.jp":true,"satte.saitama.jp":true,"sayama.saitama.jp":true,"shiki.saitama.jp":true,"shiraoka.saitama.jp":true,"soka.saitama.jp":true,"sugito.saitama.jp":true,"toda.saitama.jp":true,"tokigawa.saitama.jp":true,"tokorozawa.saitama.jp":true,"tsurugashima.saitama.jp":true,"urawa.saitama.jp":true,"warabi.saitama.jp":true,"yashio.saitama.jp":true,"yokoze.saitama.jp":true,"yono.saitama.jp":true,"yorii.saitama.jp":true,"yoshida.saitama.jp":true,"yoshikawa.saitama.jp":true,"yoshimi.saitama.jp":true,"aisho.shiga.jp":true,"gamo.shiga.jp":true,"higashiomi.shiga.jp":true,"hikone.shiga.jp":true,"koka.shiga.jp":true,"konan.shiga.jp":true,"kosei.shiga.jp":true,"koto.shiga.jp":true,"kusatsu.shiga.jp":true,"maibara.shiga.jp":true,"moriyama.shiga.jp":true,"nagahama.shiga.jp":true,"nishiazai.shiga.jp":true,"notogawa.shiga.jp":true,"omihachiman.shiga.jp":true,"otsu.shiga.jp":true,"ritto.shiga.jp":true,"ryuoh.shiga.jp":true,"takashima.shiga.jp":true,"takatsuki.shiga.jp":true,"torahime.shiga.jp":true,"toyosato.shiga.jp":true,"yasu.shiga.jp":true,"akagi.shimane.jp":true,"ama.shimane.jp":true,"gotsu.shimane.jp":true,"hamada.shimane.jp":true,"higashiizumo.shimane.jp":true,"hikawa.shimane.jp":true,"hikimi.shimane.jp":true,"izumo.shimane.jp":true,"kakinoki.shimane.jp":true,"masuda.shimane.jp":true,"matsue.shimane.jp":true,"misato.shimane.jp":true,"nishinoshima.shimane.jp":true,"ohda.shimane.jp":true,"okinoshima.shimane.jp":true,"okuizumo.shimane.jp":true,"shimane.shimane.jp":true,"tamayu.shimane.jp":true,"tsuwano.shimane.jp":true,"unnan.shimane.jp":true,"yakumo.shimane.jp":true,"yasugi.shimane.jp":true,"yatsuka.shimane.jp":true,"arai.shizuoka.jp":true,"atami.shizuoka.jp":true,"fuji.shizuoka.jp":true,"fujieda.shizuoka.jp":true,"fujikawa.shizuoka.jp":true,"fujinomiya.shizuoka.jp":true,"fukuroi.shizuoka.jp":true,"gotemba.shizuoka.jp":true,"haibara.shizuoka.jp":true,"hamamatsu.shizuoka.jp":true,"higashiizu.shizuoka.jp":true,"ito.shizuoka.jp":true,"iwata.shizuoka.jp":true,"izu.shizuoka.jp":true,"izunokuni.shizuoka.jp":true,"kakegawa.shizuoka.jp":true,"kannami.shizuoka.jp":true,"kawanehon.shizuoka.jp":true,"kawazu.shizuoka.jp":true,"kikugawa.shizuoka.jp":true,"kosai.shizuoka.jp":true,"makinohara.shizuoka.jp":true,"matsuzaki.shizuoka.jp":true,"minamiizu.shizuoka.jp":true,"mishima.shizuoka.jp":true,"morimachi.shizuoka.jp":true,"nishiizu.shizuoka.jp":true,"numazu.shizuoka.jp":true,"omaezaki.shizuoka.jp":true,"shimada.shizuoka.jp":true,"shimizu.shizuoka.jp":true,"shimoda.shizuoka.jp":true,"shizuoka.shizuoka.jp":true,"susono.shizuoka.jp":true,"yaizu.shizuoka.jp":true,"yoshida.shizuoka.jp":true,"ashikaga.tochigi.jp":true,"bato.tochigi.jp":true,"haga.tochigi.jp":true,"ichikai.tochigi.jp":true,"iwafune.tochigi.jp":true,"kaminokawa.tochigi.jp":true,"kanuma.tochigi.jp":true,"karasuyama.tochigi.jp":true,"kuroiso.tochigi.jp":true,"mashiko.tochigi.jp":true,"mibu.tochigi.jp":true,"moka.tochigi.jp":true,"motegi.tochigi.jp":true,"nasu.tochigi.jp":true,"nasushiobara.tochigi.jp":true,"nikko.tochigi.jp":true,"nishikata.tochigi.jp":true,"nogi.tochigi.jp":true,"ohira.tochigi.jp":true,"ohtawara.tochigi.jp":true,"oyama.tochigi.jp":true,"sakura.tochigi.jp":true,"sano.tochigi.jp":true,"shimotsuke.tochigi.jp":true,"shioya.tochigi.jp":true,"takanezawa.tochigi.jp":true,"tochigi.tochigi.jp":true,"tsuga.tochigi.jp":true,"ujiie.tochigi.jp":true,"utsunomiya.tochigi.jp":true,"yaita.tochigi.jp":true,"aizumi.tokushima.jp":true,"anan.tokushima.jp":true,"ichiba.tokushima.jp":true,"itano.tokushima.jp":true,"kainan.tokushima.jp":true,"komatsushima.tokushima.jp":true,"matsushige.tokushima.jp":true,"mima.tokushima.jp":true,"minami.tokushima.jp":true,"miyoshi.tokushima.jp":true,"mugi.tokushima.jp":true,"nakagawa.tokushima.jp":true,"naruto.tokushima.jp":true,"sanagochi.tokushima.jp":true,"shishikui.tokushima.jp":true,"tokushima.tokushima.jp":true,"wajiki.tokushima.jp":true,"adachi.tokyo.jp":true,"akiruno.tokyo.jp":true,"akishima.tokyo.jp":true,"aogashima.tokyo.jp":true,"arakawa.tokyo.jp":true,"bunkyo.tokyo.jp":true,"chiyoda.tokyo.jp":true,"chofu.tokyo.jp":true,"chuo.tokyo.jp":true,"edogawa.tokyo.jp":true,"fuchu.tokyo.jp":true,"fussa.tokyo.jp":true,"hachijo.tokyo.jp":true,"hachioji.tokyo.jp":true,"hamura.tokyo.jp":true,"higashikurume.tokyo.jp":true,"higashimurayama.tokyo.jp":true,"higashiyamato.tokyo.jp":true,"hino.tokyo.jp":true,"hinode.tokyo.jp":true,"hinohara.tokyo.jp":true,"inagi.tokyo.jp":true,"itabashi.tokyo.jp":true,"katsushika.tokyo.jp":true,"kita.tokyo.jp":true,"kiyose.tokyo.jp":true,"kodaira.tokyo.jp":true,"koganei.tokyo.jp":true,"kokubunji.tokyo.jp":true,"komae.tokyo.jp":true,"koto.tokyo.jp":true,"kouzushima.tokyo.jp":true,"kunitachi.tokyo.jp":true,"machida.tokyo.jp":true,"meguro.tokyo.jp":true,"minato.tokyo.jp":true,"mitaka.tokyo.jp":true,"mizuho.tokyo.jp":true,"musashimurayama.tokyo.jp":true,"musashino.tokyo.jp":true,"nakano.tokyo.jp":true,"nerima.tokyo.jp":true,"ogasawara.tokyo.jp":true,"okutama.tokyo.jp":true,"ome.tokyo.jp":true,"oshima.tokyo.jp":true,"ota.tokyo.jp":true,"setagaya.tokyo.jp":true,"shibuya.tokyo.jp":true,"shinagawa.tokyo.jp":true,"shinjuku.tokyo.jp":true,"suginami.tokyo.jp":true,"sumida.tokyo.jp":true,"tachikawa.tokyo.jp":true,"taito.tokyo.jp":true,"tama.tokyo.jp":true,"toshima.tokyo.jp":true,"chizu.tottori.jp":true,"hino.tottori.jp":true,"kawahara.tottori.jp":true,"koge.tottori.jp":true,"kotoura.tottori.jp":true,"misasa.tottori.jp":true,"nanbu.tottori.jp":true,"nichinan.tottori.jp":true,"sakaiminato.tottori.jp":true,"tottori.tottori.jp":true,"wakasa.tottori.jp":true,"yazu.tottori.jp":true,"yonago.tottori.jp":true,"asahi.toyama.jp":true,"fuchu.toyama.jp":true,"fukumitsu.toyama.jp":true,"funahashi.toyama.jp":true,"himi.toyama.jp":true,"imizu.toyama.jp":true,"inami.toyama.jp":true,"johana.toyama.jp":true,"kamiichi.toyama.jp":true,"kurobe.toyama.jp":true,"nakaniikawa.toyama.jp":true,"namerikawa.toyama.jp":true,"nanto.toyama.jp":true,"nyuzen.toyama.jp":true,"oyabe.toyama.jp":true,"taira.toyama.jp":true,"takaoka.toyama.jp":true,"tateyama.toyama.jp":true,"toga.toyama.jp":true,"tonami.toyama.jp":true,"toyama.toyama.jp":true,"unazuki.toyama.jp":true,"uozu.toyama.jp":true,"yamada.toyama.jp":true,"arida.wakayama.jp":true,"aridagawa.wakayama.jp":true,"gobo.wakayama.jp":true,"hashimoto.wakayama.jp":true,"hidaka.wakayama.jp":true,"hirogawa.wakayama.jp":true,"inami.wakayama.jp":true,"iwade.wakayama.jp":true,"kainan.wakayama.jp":true,"kamitonda.wakayama.jp":true,"katsuragi.wakayama.jp":true,"kimino.wakayama.jp":true,"kinokawa.wakayama.jp":true,"kitayama.wakayama.jp":true,"koya.wakayama.jp":true,"koza.wakayama.jp":true,"kozagawa.wakayama.jp":true,"kudoyama.wakayama.jp":true,"kushimoto.wakayama.jp":true,"mihama.wakayama.jp":true,"misato.wakayama.jp":true,"nachikatsuura.wakayama.jp":true,"shingu.wakayama.jp":true,"shirahama.wakayama.jp":true,"taiji.wakayama.jp":true,"tanabe.wakayama.jp":true,"wakayama.wakayama.jp":true,"yuasa.wakayama.jp":true,"yura.wakayama.jp":true,"asahi.yamagata.jp":true,"funagata.yamagata.jp":true,"higashine.yamagata.jp":true,"iide.yamagata.jp":true,"kahoku.yamagata.jp":true,"kaminoyama.yamagata.jp":true,"kaneyama.yamagata.jp":true,"kawanishi.yamagata.jp":true,"mamurogawa.yamagata.jp":true,"mikawa.yamagata.jp":true,"murayama.yamagata.jp":true,"nagai.yamagata.jp":true,"nakayama.yamagata.jp":true,"nanyo.yamagata.jp":true,"nishikawa.yamagata.jp":true,"obanazawa.yamagata.jp":true,"oe.yamagata.jp":true,"oguni.yamagata.jp":true,"ohkura.yamagata.jp":true,"oishida.yamagata.jp":true,"sagae.yamagata.jp":true,"sakata.yamagata.jp":true,"sakegawa.yamagata.jp":true,"shinjo.yamagata.jp":true,"shirataka.yamagata.jp":true,"shonai.yamagata.jp":true,"takahata.yamagata.jp":true,"tendo.yamagata.jp":true,"tozawa.yamagata.jp":true,"tsuruoka.yamagata.jp":true,"yamagata.yamagata.jp":true,"yamanobe.yamagata.jp":true,"yonezawa.yamagata.jp":true,"yuza.yamagata.jp":true,"abu.yamaguchi.jp":true,"hagi.yamaguchi.jp":true,"hikari.yamaguchi.jp":true,"hofu.yamaguchi.jp":true,"iwakuni.yamaguchi.jp":true,"kudamatsu.yamaguchi.jp":true,"mitou.yamaguchi.jp":true,"nagato.yamaguchi.jp":true,"oshima.yamaguchi.jp":true,"shimonoseki.yamaguchi.jp":true,"shunan.yamaguchi.jp":true,"tabuse.yamaguchi.jp":true,"tokuyama.yamaguchi.jp":true,"toyota.yamaguchi.jp":true,"ube.yamaguchi.jp":true,"yuu.yamaguchi.jp":true,"chuo.yamanashi.jp":true,"doshi.yamanashi.jp":true,"fuefuki.yamanashi.jp":true,"fujikawa.yamanashi.jp":true,"fujikawaguchiko.yamanashi.jp":true,"fujiyoshida.yamanashi.jp":true,"hayakawa.yamanashi.jp":true,"hokuto.yamanashi.jp":true,"ichikawamisato.yamanashi.jp":true,"kai.yamanashi.jp":true,"kofu.yamanashi.jp":true,"koshu.yamanashi.jp":true,"kosuge.yamanashi.jp":true,"minami-alps.yamanashi.jp":true,"minobu.yamanashi.jp":true,"nakamichi.yamanashi.jp":true,"nanbu.yamanashi.jp":true,"narusawa.yamanashi.jp":true,"nirasaki.yamanashi.jp":true,"nishikatsura.yamanashi.jp":true,"oshino.yamanashi.jp":true,"otsuki.yamanashi.jp":true,"showa.yamanashi.jp":true,"tabayama.yamanashi.jp":true,"tsuru.yamanashi.jp":true,"uenohara.yamanashi.jp":true,"yamanakako.yamanashi.jp":true,"yamanashi.yamanashi.jp":true,"*.ke":true,"kg":true,"org.kg":true,"net.kg":true,"com.kg":true,"edu.kg":true,"gov.kg":true,"mil.kg":true,"*.kh":true,"ki":true,"edu.ki":true,"biz.ki":true,"net.ki":true,"org.ki":true,"gov.ki":true,"info.ki":true,"com.ki":true,"km":true,"org.km":true,"nom.km":true,"gov.km":true,"prd.km":true,"tm.km":true,"edu.km":true,"mil.km":true,"ass.km":true,"com.km":true,"coop.km":true,"asso.km":true,"presse.km":true,"medecin.km":true,"notaires.km":true,"pharmaciens.km":true,"veterinaire.km":true,"gouv.km":true,"kn":true,"net.kn":true,"org.kn":true,"edu.kn":true,"gov.kn":true,"kp":true,"com.kp":true,"edu.kp":true,"gov.kp":true,"org.kp":true,"rep.kp":true,"tra.kp":true,"kr":true,"ac.kr":true,"co.kr":true,"es.kr":true,"go.kr":true,"hs.kr":true,"kg.kr":true,"mil.kr":true,"ms.kr":true,"ne.kr":true,"or.kr":true,"pe.kr":true,"re.kr":true,"sc.kr":true,"busan.kr":true,"chungbuk.kr":true,"chungnam.kr":true,"daegu.kr":true,"daejeon.kr":true,"gangwon.kr":true,"gwangju.kr":true,"gyeongbuk.kr":true,"gyeonggi.kr":true,"gyeongnam.kr":true,"incheon.kr":true,"jeju.kr":true,"jeonbuk.kr":true,"jeonnam.kr":true,"seoul.kr":true,"ulsan.kr":true,"*.kw":true,"ky":true,"edu.ky":true,"gov.ky":true,"com.ky":true,"org.ky":true,"net.ky":true,"kz":true,"org.kz":true,"edu.kz":true,"net.kz":true,"gov.kz":true,"mil.kz":true,"com.kz":true,"la":true,"int.la":true,"net.la":true,"info.la":true,"edu.la":true,"gov.la":true,"per.la":true,"com.la":true,"org.la":true,"lb":true,"com.lb":true,"edu.lb":true,"gov.lb":true,"net.lb":true,"org.lb":true,"lc":true,"com.lc":true,"net.lc":true,"co.lc":true,"org.lc":true,"edu.lc":true,"gov.lc":true,"li":true,"lk":true,"gov.lk":true,"sch.lk":true,"net.lk":true,"int.lk":true,"com.lk":true,"org.lk":true,"edu.lk":true,"ngo.lk":true,"soc.lk":true,"web.lk":true,"ltd.lk":true,"assn.lk":true,"grp.lk":true,"hotel.lk":true,"ac.lk":true,"lr":true,"com.lr":true,"edu.lr":true,"gov.lr":true,"org.lr":true,"net.lr":true,"ls":true,"co.ls":true,"org.ls":true,"lt":true,"gov.lt":true,"lu":true,"lv":true,"com.lv":true,"edu.lv":true,"gov.lv":true,"org.lv":true,"mil.lv":true,"id.lv":true,"net.lv":true,"asn.lv":true,"conf.lv":true,"ly":true,"com.ly":true,"net.ly":true,"gov.ly":true,"plc.ly":true,"edu.ly":true,"sch.ly":true,"med.ly":true,"org.ly":true,"id.ly":true,"ma":true,"co.ma":true,"net.ma":true,"gov.ma":true,"org.ma":true,"ac.ma":true,"press.ma":true,"mc":true,"tm.mc":true,"asso.mc":true,"md":true,"me":true,"co.me":true,"net.me":true,"org.me":true,"edu.me":true,"ac.me":true,"gov.me":true,"its.me":true,"priv.me":true,"mg":true,"org.mg":true,"nom.mg":true,"gov.mg":true,"prd.mg":true,"tm.mg":true,"edu.mg":true,"mil.mg":true,"com.mg":true,"co.mg":true,"mh":true,"mil":true,"mk":true,"com.mk":true,"org.mk":true,"net.mk":true,"edu.mk":true,"gov.mk":true,"inf.mk":true,"name.mk":true,"ml":true,"com.ml":true,"edu.ml":true,"gouv.ml":true,"gov.ml":true,"net.ml":true,"org.ml":true,"presse.ml":true,"*.mm":true,"mn":true,"gov.mn":true,"edu.mn":true,"org.mn":true,"mo":true,"com.mo":true,"net.mo":true,"org.mo":true,"edu.mo":true,"gov.mo":true,"mobi":true,"mp":true,"mq":true,"mr":true,"gov.mr":true,"ms":true,"com.ms":true,"edu.ms":true,"gov.ms":true,"net.ms":true,"org.ms":true,"mt":true,"com.mt":true,"edu.mt":true,"net.mt":true,"org.mt":true,"mu":true,"com.mu":true,"net.mu":true,"org.mu":true,"gov.mu":true,"ac.mu":true,"co.mu":true,"or.mu":true,"museum":true,"academy.museum":true,"agriculture.museum":true,"air.museum":true,"airguard.museum":true,"alabama.museum":true,"alaska.museum":true,"amber.museum":true,"ambulance.museum":true,"american.museum":true,"americana.museum":true,"americanantiques.museum":true,"americanart.museum":true,"amsterdam.museum":true,"and.museum":true,"annefrank.museum":true,"anthro.museum":true,"anthropology.museum":true,"antiques.museum":true,"aquarium.museum":true,"arboretum.museum":true,"archaeological.museum":true,"archaeology.museum":true,"architecture.museum":true,"art.museum":true,"artanddesign.museum":true,"artcenter.museum":true,"artdeco.museum":true,"arteducation.museum":true,"artgallery.museum":true,"arts.museum":true,"artsandcrafts.museum":true,"asmatart.museum":true,"assassination.museum":true,"assisi.museum":true,"association.museum":true,"astronomy.museum":true,"atlanta.museum":true,"austin.museum":true,"australia.museum":true,"automotive.museum":true,"aviation.museum":true,"axis.museum":true,"badajoz.museum":true,"baghdad.museum":true,"bahn.museum":true,"bale.museum":true,"baltimore.museum":true,"barcelona.museum":true,"baseball.museum":true,"basel.museum":true,"baths.museum":true,"bauern.museum":true,"beauxarts.museum":true,"beeldengeluid.museum":true,"bellevue.museum":true,"bergbau.museum":true,"berkeley.museum":true,"berlin.museum":true,"bern.museum":true,"bible.museum":true,"bilbao.museum":true,"bill.museum":true,"birdart.museum":true,"birthplace.museum":true,"bonn.museum":true,"boston.museum":true,"botanical.museum":true,"botanicalgarden.museum":true,"botanicgarden.museum":true,"botany.museum":true,"brandywinevalley.museum":true,"brasil.museum":true,"bristol.museum":true,"british.museum":true,"britishcolumbia.museum":true,"broadcast.museum":true,"brunel.museum":true,"brussel.museum":true,"brussels.museum":true,"bruxelles.museum":true,"building.museum":true,"burghof.museum":true,"bus.museum":true,"bushey.museum":true,"cadaques.museum":true,"california.museum":true,"cambridge.museum":true,"can.museum":true,"canada.museum":true,"capebreton.museum":true,"carrier.museum":true,"cartoonart.museum":true,"casadelamoneda.museum":true,"castle.museum":true,"castres.museum":true,"celtic.museum":true,"center.museum":true,"chattanooga.museum":true,"cheltenham.museum":true,"chesapeakebay.museum":true,"chicago.museum":true,"children.museum":true,"childrens.museum":true,"childrensgarden.museum":true,"chiropractic.museum":true,"chocolate.museum":true,"christiansburg.museum":true,"cincinnati.museum":true,"cinema.museum":true,"circus.museum":true,"civilisation.museum":true,"civilization.museum":true,"civilwar.museum":true,"clinton.museum":true,"clock.museum":true,"coal.museum":true,"coastaldefence.museum":true,"cody.museum":true,"coldwar.museum":true,"collection.museum":true,"colonialwilliamsburg.museum":true,"coloradoplateau.museum":true,"columbia.museum":true,"columbus.museum":true,"communication.museum":true,"communications.museum":true,"community.museum":true,"computer.museum":true,"computerhistory.museum":true,"xn--comunicaes-v6a2o.museum":true,"contemporary.museum":true,"contemporaryart.museum":true,"convent.museum":true,"copenhagen.museum":true,"corporation.museum":true,"xn--correios-e-telecomunicaes-ghc29a.museum":true,"corvette.museum":true,"costume.museum":true,"countryestate.museum":true,"county.museum":true,"crafts.museum":true,"cranbrook.museum":true,"creation.museum":true,"cultural.museum":true,"culturalcenter.museum":true,"culture.museum":true,"cyber.museum":true,"cymru.museum":true,"dali.museum":true,"dallas.museum":true,"database.museum":true,"ddr.museum":true,"decorativearts.museum":true,"delaware.museum":true,"delmenhorst.museum":true,"denmark.museum":true,"depot.museum":true,"design.museum":true,"detroit.museum":true,"dinosaur.museum":true,"discovery.museum":true,"dolls.museum":true,"donostia.museum":true,"durham.museum":true,"eastafrica.museum":true,"eastcoast.museum":true,"education.museum":true,"educational.museum":true,"egyptian.museum":true,"eisenbahn.museum":true,"elburg.museum":true,"elvendrell.museum":true,"embroidery.museum":true,"encyclopedic.museum":true,"england.museum":true,"entomology.museum":true,"environment.museum":true,"environmentalconservation.museum":true,"epilepsy.museum":true,"essex.museum":true,"estate.museum":true,"ethnology.museum":true,"exeter.museum":true,"exhibition.museum":true,"family.museum":true,"farm.museum":true,"farmequipment.museum":true,"farmers.museum":true,"farmstead.museum":true,"field.museum":true,"figueres.museum":true,"filatelia.museum":true,"film.museum":true,"fineart.museum":true,"finearts.museum":true,"finland.museum":true,"flanders.museum":true,"florida.museum":true,"force.museum":true,"fortmissoula.museum":true,"fortworth.museum":true,"foundation.museum":true,"francaise.museum":true,"frankfurt.museum":true,"franziskaner.museum":true,"freemasonry.museum":true,"freiburg.museum":true,"fribourg.museum":true,"frog.museum":true,"fundacio.museum":true,"furniture.museum":true,"gallery.museum":true,"garden.museum":true,"gateway.museum":true,"geelvinck.museum":true,"gemological.museum":true,"geology.museum":true,"georgia.museum":true,"giessen.museum":true,"glas.museum":true,"glass.museum":true,"gorge.museum":true,"grandrapids.museum":true,"graz.museum":true,"guernsey.museum":true,"halloffame.museum":true,"hamburg.museum":true,"handson.museum":true,"harvestcelebration.museum":true,"hawaii.museum":true,"health.museum":true,"heimatunduhren.museum":true,"hellas.museum":true,"helsinki.museum":true,"hembygdsforbund.museum":true,"heritage.museum":true,"histoire.museum":true,"historical.museum":true,"historicalsociety.museum":true,"historichouses.museum":true,"historisch.museum":true,"historisches.museum":true,"history.museum":true,"historyofscience.museum":true,"horology.museum":true,"house.museum":true,"humanities.museum":true,"illustration.museum":true,"imageandsound.museum":true,"indian.museum":true,"indiana.museum":true,"indianapolis.museum":true,"indianmarket.museum":true,"intelligence.museum":true,"interactive.museum":true,"iraq.museum":true,"iron.museum":true,"isleofman.museum":true,"jamison.museum":true,"jefferson.museum":true,"jerusalem.museum":true,"jewelry.museum":true,"jewish.museum":true,"jewishart.museum":true,"jfk.museum":true,"journalism.museum":true,"judaica.museum":true,"judygarland.museum":true,"juedisches.museum":true,"juif.museum":true,"karate.museum":true,"karikatur.museum":true,"kids.museum":true,"koebenhavn.museum":true,"koeln.museum":true,"kunst.museum":true,"kunstsammlung.museum":true,"kunstunddesign.museum":true,"labor.museum":true,"labour.museum":true,"lajolla.museum":true,"lancashire.museum":true,"landes.museum":true,"lans.museum":true,"xn--lns-qla.museum":true,"larsson.museum":true,"lewismiller.museum":true,"lincoln.museum":true,"linz.museum":true,"living.museum":true,"livinghistory.museum":true,"localhistory.museum":true,"london.museum":true,"losangeles.museum":true,"louvre.museum":true,"loyalist.museum":true,"lucerne.museum":true,"luxembourg.museum":true,"luzern.museum":true,"mad.museum":true,"madrid.museum":true,"mallorca.museum":true,"manchester.museum":true,"mansion.museum":true,"mansions.museum":true,"manx.museum":true,"marburg.museum":true,"maritime.museum":true,"maritimo.museum":true,"maryland.museum":true,"marylhurst.museum":true,"media.museum":true,"medical.museum":true,"medizinhistorisches.museum":true,"meeres.museum":true,"memorial.museum":true,"mesaverde.museum":true,"michigan.museum":true,"midatlantic.museum":true,"military.museum":true,"mill.museum":true,"miners.museum":true,"mining.museum":true,"minnesota.museum":true,"missile.museum":true,"missoula.museum":true,"modern.museum":true,"moma.museum":true,"money.museum":true,"monmouth.museum":true,"monticello.museum":true,"montreal.museum":true,"moscow.museum":true,"motorcycle.museum":true,"muenchen.museum":true,"muenster.museum":true,"mulhouse.museum":true,"muncie.museum":true,"museet.museum":true,"museumcenter.museum":true,"museumvereniging.museum":true,"music.museum":true,"national.museum":true,"nationalfirearms.museum":true,"nationalheritage.museum":true,"nativeamerican.museum":true,"naturalhistory.museum":true,"naturalhistorymuseum.museum":true,"naturalsciences.museum":true,"nature.museum":true,"naturhistorisches.museum":true,"natuurwetenschappen.museum":true,"naumburg.museum":true,"naval.museum":true,"nebraska.museum":true,"neues.museum":true,"newhampshire.museum":true,"newjersey.museum":true,"newmexico.museum":true,"newport.museum":true,"newspaper.museum":true,"newyork.museum":true,"niepce.museum":true,"norfolk.museum":true,"north.museum":true,"nrw.museum":true,"nuernberg.museum":true,"nuremberg.museum":true,"nyc.museum":true,"nyny.museum":true,"oceanographic.museum":true,"oceanographique.museum":true,"omaha.museum":true,"online.museum":true,"ontario.museum":true,"openair.museum":true,"oregon.museum":true,"oregontrail.museum":true,"otago.museum":true,"oxford.museum":true,"pacific.museum":true,"paderborn.museum":true,"palace.museum":true,"paleo.museum":true,"palmsprings.museum":true,"panama.museum":true,"paris.museum":true,"pasadena.museum":true,"pharmacy.museum":true,"philadelphia.museum":true,"philadelphiaarea.museum":true,"philately.museum":true,"phoenix.museum":true,"photography.museum":true,"pilots.museum":true,"pittsburgh.museum":true,"planetarium.museum":true,"plantation.museum":true,"plants.museum":true,"plaza.museum":true,"portal.museum":true,"portland.museum":true,"portlligat.museum":true,"posts-and-telecommunications.museum":true,"preservation.museum":true,"presidio.museum":true,"press.museum":true,"project.museum":true,"public.museum":true,"pubol.museum":true,"quebec.museum":true,"railroad.museum":true,"railway.museum":true,"research.museum":true,"resistance.museum":true,"riodejaneiro.museum":true,"rochester.museum":true,"rockart.museum":true,"roma.museum":true,"russia.museum":true,"saintlouis.museum":true,"salem.museum":true,"salvadordali.museum":true,"salzburg.museum":true,"sandiego.museum":true,"sanfrancisco.museum":true,"santabarbara.museum":true,"santacruz.museum":true,"santafe.museum":true,"saskatchewan.museum":true,"satx.museum":true,"savannahga.museum":true,"schlesisches.museum":true,"schoenbrunn.museum":true,"schokoladen.museum":true,"school.museum":true,"schweiz.museum":true,"science.museum":true,"scienceandhistory.museum":true,"scienceandindustry.museum":true,"sciencecenter.museum":true,"sciencecenters.museum":true,"science-fiction.museum":true,"sciencehistory.museum":true,"sciences.museum":true,"sciencesnaturelles.museum":true,"scotland.museum":true,"seaport.museum":true,"settlement.museum":true,"settlers.museum":true,"shell.museum":true,"sherbrooke.museum":true,"sibenik.museum":true,"silk.museum":true,"ski.museum":true,"skole.museum":true,"society.museum":true,"sologne.museum":true,"soundandvision.museum":true,"southcarolina.museum":true,"southwest.museum":true,"space.museum":true,"spy.museum":true,"square.museum":true,"stadt.museum":true,"stalbans.museum":true,"starnberg.museum":true,"state.museum":true,"stateofdelaware.museum":true,"station.museum":true,"steam.museum":true,"steiermark.museum":true,"stjohn.museum":true,"stockholm.museum":true,"stpetersburg.museum":true,"stuttgart.museum":true,"suisse.museum":true,"surgeonshall.museum":true,"surrey.museum":true,"svizzera.museum":true,"sweden.museum":true,"sydney.museum":true,"tank.museum":true,"tcm.museum":true,"technology.museum":true,"telekommunikation.museum":true,"television.museum":true,"texas.museum":true,"textile.museum":true,"theater.museum":true,"time.museum":true,"timekeeping.museum":true,"topology.museum":true,"torino.museum":true,"touch.museum":true,"town.museum":true,"transport.museum":true,"tree.museum":true,"trolley.museum":true,"trust.museum":true,"trustee.museum":true,"uhren.museum":true,"ulm.museum":true,"undersea.museum":true,"university.museum":true,"usa.museum":true,"usantiques.museum":true,"usarts.museum":true,"uscountryestate.museum":true,"usculture.museum":true,"usdecorativearts.museum":true,"usgarden.museum":true,"ushistory.museum":true,"ushuaia.museum":true,"uslivinghistory.museum":true,"utah.museum":true,"uvic.museum":true,"valley.museum":true,"vantaa.museum":true,"versailles.museum":true,"viking.museum":true,"village.museum":true,"virginia.museum":true,"virtual.museum":true,"virtuel.museum":true,"vlaanderen.museum":true,"volkenkunde.museum":true,"wales.museum":true,"wallonie.museum":true,"war.museum":true,"washingtondc.museum":true,"watchandclock.museum":true,"watch-and-clock.museum":true,"western.museum":true,"westfalen.museum":true,"whaling.museum":true,"wildlife.museum":true,"williamsburg.museum":true,"windmill.museum":true,"workshop.museum":true,"york.museum":true,"yorkshire.museum":true,"yosemite.museum":true,"youth.museum":true,"zoological.museum":true,"zoology.museum":true,"xn--9dbhblg6di.museum":true,"xn--h1aegh.museum":true,"mv":true,"aero.mv":true,"biz.mv":true,"com.mv":true,"coop.mv":true,"edu.mv":true,"gov.mv":true,"info.mv":true,"int.mv":true,"mil.mv":true,"museum.mv":true,"name.mv":true,"net.mv":true,"org.mv":true,"pro.mv":true,"mw":true,"ac.mw":true,"biz.mw":true,"co.mw":true,"com.mw":true,"coop.mw":true,"edu.mw":true,"gov.mw":true,"int.mw":true,"museum.mw":true,"net.mw":true,"org.mw":true,"mx":true,"com.mx":true,"org.mx":true,"gob.mx":true,"edu.mx":true,"net.mx":true,"my":true,"com.my":true,"net.my":true,"org.my":true,"gov.my":true,"edu.my":true,"mil.my":true,"name.my":true,"*.mz":true,"teledata.mz":false,"na":true,"info.na":true,"pro.na":true,"name.na":true,"school.na":true,"or.na":true,"dr.na":true,"us.na":true,"mx.na":true,"ca.na":true,"in.na":true,"cc.na":true,"tv.na":true,"ws.na":true,"mobi.na":true,"co.na":true,"com.na":true,"org.na":true,"name":true,"nc":true,"asso.nc":true,"ne":true,"net":true,"nf":true,"com.nf":true,"net.nf":true,"per.nf":true,"rec.nf":true,"web.nf":true,"arts.nf":true,"firm.nf":true,"info.nf":true,"other.nf":true,"store.nf":true,"ng":true,"com.ng":true,"edu.ng":true,"name.ng":true,"net.ng":true,"org.ng":true,"sch.ng":true,"gov.ng":true,"mil.ng":true,"mobi.ng":true,"*.ni":true,"nl":true,"bv.nl":true,"no":true,"fhs.no":true,"vgs.no":true,"fylkesbibl.no":true,"folkebibl.no":true,"museum.no":true,"idrett.no":true,"priv.no":true,"mil.no":true,"stat.no":true,"dep.no":true,"kommune.no":true,"herad.no":true,"aa.no":true,"ah.no":true,"bu.no":true,"fm.no":true,"hl.no":true,"hm.no":true,"jan-mayen.no":true,"mr.no":true,"nl.no":true,"nt.no":true,"of.no":true,"ol.no":true,"oslo.no":true,"rl.no":true,"sf.no":true,"st.no":true,"svalbard.no":true,"tm.no":true,"tr.no":true,"va.no":true,"vf.no":true,"gs.aa.no":true,"gs.ah.no":true,"gs.bu.no":true,"gs.fm.no":true,"gs.hl.no":true,"gs.hm.no":true,"gs.jan-mayen.no":true,"gs.mr.no":true,"gs.nl.no":true,"gs.nt.no":true,"gs.of.no":true,"gs.ol.no":true,"gs.oslo.no":true,"gs.rl.no":true,"gs.sf.no":true,"gs.st.no":true,"gs.svalbard.no":true,"gs.tm.no":true,"gs.tr.no":true,"gs.va.no":true,"gs.vf.no":true,"akrehamn.no":true,"xn--krehamn-dxa.no":true,"algard.no":true,"xn--lgrd-poac.no":true,"arna.no":true,"brumunddal.no":true,"bryne.no":true,"bronnoysund.no":true,"xn--brnnysund-m8ac.no":true,"drobak.no":true,"xn--drbak-wua.no":true,"egersund.no":true,"fetsund.no":true,"floro.no":true,"xn--flor-jra.no":true,"fredrikstad.no":true,"hokksund.no":true,"honefoss.no":true,"xn--hnefoss-q1a.no":true,"jessheim.no":true,"jorpeland.no":true,"xn--jrpeland-54a.no":true,"kirkenes.no":true,"kopervik.no":true,"krokstadelva.no":true,"langevag.no":true,"xn--langevg-jxa.no":true,"leirvik.no":true,"mjondalen.no":true,"xn--mjndalen-64a.no":true,"mo-i-rana.no":true,"mosjoen.no":true,"xn--mosjen-eya.no":true,"nesoddtangen.no":true,"orkanger.no":true,"osoyro.no":true,"xn--osyro-wua.no":true,"raholt.no":true,"xn--rholt-mra.no":true,"sandnessjoen.no":true,"xn--sandnessjen-ogb.no":true,"skedsmokorset.no":true,"slattum.no":true,"spjelkavik.no":true,"stathelle.no":true,"stavern.no":true,"stjordalshalsen.no":true,"xn--stjrdalshalsen-sqb.no":true,"tananger.no":true,"tranby.no":true,"vossevangen.no":true,"afjord.no":true,"xn--fjord-lra.no":true,"agdenes.no":true,"al.no":true,"xn--l-1fa.no":true,"alesund.no":true,"xn--lesund-hua.no":true,"alstahaug.no":true,"alta.no":true,"xn--lt-liac.no":true,"alaheadju.no":true,"xn--laheadju-7ya.no":true,"alvdal.no":true,"amli.no":true,"xn--mli-tla.no":true,"amot.no":true,"xn--mot-tla.no":true,"andebu.no":true,"andoy.no":true,"xn--andy-ira.no":true,"andasuolo.no":true,"ardal.no":true,"xn--rdal-poa.no":true,"aremark.no":true,"arendal.no":true,"xn--s-1fa.no":true,"aseral.no":true,"xn--seral-lra.no":true,"asker.no":true,"askim.no":true,"askvoll.no":true,"askoy.no":true,"xn--asky-ira.no":true,"asnes.no":true,"xn--snes-poa.no":true,"audnedaln.no":true,"aukra.no":true,"aure.no":true,"aurland.no":true,"aurskog-holand.no":true,"xn--aurskog-hland-jnb.no":true,"austevoll.no":true,"austrheim.no":true,"averoy.no":true,"xn--avery-yua.no":true,"balestrand.no":true,"ballangen.no":true,"balat.no":true,"xn--blt-elab.no":true,"balsfjord.no":true,"bahccavuotna.no":true,"xn--bhccavuotna-k7a.no":true,"bamble.no":true,"bardu.no":true,"beardu.no":true,"beiarn.no":true,"bajddar.no":true,"xn--bjddar-pta.no":true,"baidar.no":true,"xn--bidr-5nac.no":true,"berg.no":true,"bergen.no":true,"berlevag.no":true,"xn--berlevg-jxa.no":true,"bearalvahki.no":true,"xn--bearalvhki-y4a.no":true,"bindal.no":true,"birkenes.no":true,"bjarkoy.no":true,"xn--bjarky-fya.no":true,"bjerkreim.no":true,"bjugn.no":true,"bodo.no":true,"xn--bod-2na.no":true,"badaddja.no":true,"xn--bdddj-mrabd.no":true,"budejju.no":true,"bokn.no":true,"bremanger.no":true,"bronnoy.no":true,"xn--brnny-wuac.no":true,"bygland.no":true,"bykle.no":true,"barum.no":true,"xn--brum-voa.no":true,"bo.telemark.no":true,"xn--b-5ga.telemark.no":true,"bo.nordland.no":true,"xn--b-5ga.nordland.no":true,"bievat.no":true,"xn--bievt-0qa.no":true,"bomlo.no":true,"xn--bmlo-gra.no":true,"batsfjord.no":true,"xn--btsfjord-9za.no":true,"bahcavuotna.no":true,"xn--bhcavuotna-s4a.no":true,"dovre.no":true,"drammen.no":true,"drangedal.no":true,"dyroy.no":true,"xn--dyry-ira.no":true,"donna.no":true,"xn--dnna-gra.no":true,"eid.no":true,"eidfjord.no":true,"eidsberg.no":true,"eidskog.no":true,"eidsvoll.no":true,"eigersund.no":true,"elverum.no":true,"enebakk.no":true,"engerdal.no":true,"etne.no":true,"etnedal.no":true,"evenes.no":true,"evenassi.no":true,"xn--eveni-0qa01ga.no":true,"evje-og-hornnes.no":true,"farsund.no":true,"fauske.no":true,"fuossko.no":true,"fuoisku.no":true,"fedje.no":true,"fet.no":true,"finnoy.no":true,"xn--finny-yua.no":true,"fitjar.no":true,"fjaler.no":true,"fjell.no":true,"flakstad.no":true,"flatanger.no":true,"flekkefjord.no":true,"flesberg.no":true,"flora.no":true,"fla.no":true,"xn--fl-zia.no":true,"folldal.no":true,"forsand.no":true,"fosnes.no":true,"frei.no":true,"frogn.no":true,"froland.no":true,"frosta.no":true,"frana.no":true,"xn--frna-woa.no":true,"froya.no":true,"xn--frya-hra.no":true,"fusa.no":true,"fyresdal.no":true,"forde.no":true,"xn--frde-gra.no":true,"gamvik.no":true,"gangaviika.no":true,"xn--ggaviika-8ya47h.no":true,"gaular.no":true,"gausdal.no":true,"gildeskal.no":true,"xn--gildeskl-g0a.no":true,"giske.no":true,"gjemnes.no":true,"gjerdrum.no":true,"gjerstad.no":true,"gjesdal.no":true,"gjovik.no":true,"xn--gjvik-wua.no":true,"gloppen.no":true,"gol.no":true,"gran.no":true,"grane.no":true,"granvin.no":true,"gratangen.no":true,"grimstad.no":true,"grong.no":true,"kraanghke.no":true,"xn--kranghke-b0a.no":true,"grue.no":true,"gulen.no":true,"hadsel.no":true,"halden.no":true,"halsa.no":true,"hamar.no":true,"hamaroy.no":true,"habmer.no":true,"xn--hbmer-xqa.no":true,"hapmir.no":true,"xn--hpmir-xqa.no":true,"hammerfest.no":true,"hammarfeasta.no":true,"xn--hmmrfeasta-s4ac.no":true,"haram.no":true,"hareid.no":true,"harstad.no":true,"hasvik.no":true,"aknoluokta.no":true,"xn--koluokta-7ya57h.no":true,"hattfjelldal.no":true,"aarborte.no":true,"haugesund.no":true,"hemne.no":true,"hemnes.no":true,"hemsedal.no":true,"heroy.more-og-romsdal.no":true,"xn--hery-ira.xn--mre-og-romsdal-qqb.no":true,"heroy.nordland.no":true,"xn--hery-ira.nordland.no":true,"hitra.no":true,"hjartdal.no":true,"hjelmeland.no":true,"hobol.no":true,"xn--hobl-ira.no":true,"hof.no":true,"hol.no":true,"hole.no":true,"holmestrand.no":true,"holtalen.no":true,"xn--holtlen-hxa.no":true,"hornindal.no":true,"horten.no":true,"hurdal.no":true,"hurum.no":true,"hvaler.no":true,"hyllestad.no":true,"hagebostad.no":true,"xn--hgebostad-g3a.no":true,"hoyanger.no":true,"xn--hyanger-q1a.no":true,"hoylandet.no":true,"xn--hylandet-54a.no":true,"ha.no":true,"xn--h-2fa.no":true,"ibestad.no":true,"inderoy.no":true,"xn--indery-fya.no":true,"iveland.no":true,"jevnaker.no":true,"jondal.no":true,"jolster.no":true,"xn--jlster-bya.no":true,"karasjok.no":true,"karasjohka.no":true,"xn--krjohka-hwab49j.no":true,"karlsoy.no":true,"galsa.no":true,"xn--gls-elac.no":true,"karmoy.no":true,"xn--karmy-yua.no":true,"kautokeino.no":true,"guovdageaidnu.no":true,"klepp.no":true,"klabu.no":true,"xn--klbu-woa.no":true,"kongsberg.no":true,"kongsvinger.no":true,"kragero.no":true,"xn--krager-gya.no":true,"kristiansand.no":true,"kristiansund.no":true,"krodsherad.no":true,"xn--krdsherad-m8a.no":true,"kvalsund.no":true,"rahkkeravju.no":true,"xn--rhkkervju-01af.no":true,"kvam.no":true,"kvinesdal.no":true,"kvinnherad.no":true,"kviteseid.no":true,"kvitsoy.no":true,"xn--kvitsy-fya.no":true,"kvafjord.no":true,"xn--kvfjord-nxa.no":true,"giehtavuoatna.no":true,"kvanangen.no":true,"xn--kvnangen-k0a.no":true,"navuotna.no":true,"xn--nvuotna-hwa.no":true,"kafjord.no":true,"xn--kfjord-iua.no":true,"gaivuotna.no":true,"xn--givuotna-8ya.no":true,"larvik.no":true,"lavangen.no":true,"lavagis.no":true,"loabat.no":true,"xn--loabt-0qa.no":true,"lebesby.no":true,"davvesiida.no":true,"leikanger.no":true,"leirfjord.no":true,"leka.no":true,"leksvik.no":true,"lenvik.no":true,"leangaviika.no":true,"xn--leagaviika-52b.no":true,"lesja.no":true,"levanger.no":true,"lier.no":true,"lierne.no":true,"lillehammer.no":true,"lillesand.no":true,"lindesnes.no":true,"lindas.no":true,"xn--linds-pra.no":true,"lom.no":true,"loppa.no":true,"lahppi.no":true,"xn--lhppi-xqa.no":true,"lund.no":true,"lunner.no":true,"luroy.no":true,"xn--lury-ira.no":true,"luster.no":true,"lyngdal.no":true,"lyngen.no":true,"ivgu.no":true,"lardal.no":true,"lerdal.no":true,"xn--lrdal-sra.no":true,"lodingen.no":true,"xn--ldingen-q1a.no":true,"lorenskog.no":true,"xn--lrenskog-54a.no":true,"loten.no":true,"xn--lten-gra.no":true,"malvik.no":true,"masoy.no":true,"xn--msy-ula0h.no":true,"muosat.no":true,"xn--muost-0qa.no":true,"mandal.no":true,"marker.no":true,"marnardal.no":true,"masfjorden.no":true,"meland.no":true,"meldal.no":true,"melhus.no":true,"meloy.no":true,"xn--mely-ira.no":true,"meraker.no":true,"xn--merker-kua.no":true,"moareke.no":true,"xn--moreke-jua.no":true,"midsund.no":true,"midtre-gauldal.no":true,"modalen.no":true,"modum.no":true,"molde.no":true,"moskenes.no":true,"moss.no":true,"mosvik.no":true,"malselv.no":true,"xn--mlselv-iua.no":true,"malatvuopmi.no":true,"xn--mlatvuopmi-s4a.no":true,"namdalseid.no":true,"aejrie.no":true,"namsos.no":true,"namsskogan.no":true,"naamesjevuemie.no":true,"xn--nmesjevuemie-tcba.no":true,"laakesvuemie.no":true,"nannestad.no":true,"narvik.no":true,"narviika.no":true,"naustdal.no":true,"nedre-eiker.no":true,"nes.akershus.no":true,"nes.buskerud.no":true,"nesna.no":true,"nesodden.no":true,"nesseby.no":true,"unjarga.no":true,"xn--unjrga-rta.no":true,"nesset.no":true,"nissedal.no":true,"nittedal.no":true,"nord-aurdal.no":true,"nord-fron.no":true,"nord-odal.no":true,"norddal.no":true,"nordkapp.no":true,"davvenjarga.no":true,"xn--davvenjrga-y4a.no":true,"nordre-land.no":true,"nordreisa.no":true,"raisa.no":true,"xn--risa-5na.no":true,"nore-og-uvdal.no":true,"notodden.no":true,"naroy.no":true,"xn--nry-yla5g.no":true,"notteroy.no":true,"xn--nttery-byae.no":true,"odda.no":true,"oksnes.no":true,"xn--ksnes-uua.no":true,"oppdal.no":true,"oppegard.no":true,"xn--oppegrd-ixa.no":true,"orkdal.no":true,"orland.no":true,"xn--rland-uua.no":true,"orskog.no":true,"xn--rskog-uua.no":true,"orsta.no":true,"xn--rsta-fra.no":true,"os.hedmark.no":true,"os.hordaland.no":true,"osen.no":true,"osteroy.no":true,"xn--ostery-fya.no":true,"ostre-toten.no":true,"xn--stre-toten-zcb.no":true,"overhalla.no":true,"ovre-eiker.no":true,"xn--vre-eiker-k8a.no":true,"oyer.no":true,"xn--yer-zna.no":true,"oygarden.no":true,"xn--ygarden-p1a.no":true,"oystre-slidre.no":true,"xn--ystre-slidre-ujb.no":true,"porsanger.no":true,"porsangu.no":true,"xn--porsgu-sta26f.no":true,"porsgrunn.no":true,"radoy.no":true,"xn--rady-ira.no":true,"rakkestad.no":true,"rana.no":true,"ruovat.no":true,"randaberg.no":true,"rauma.no":true,"rendalen.no":true,"rennebu.no":true,"rennesoy.no":true,"xn--rennesy-v1a.no":true,"rindal.no":true,"ringebu.no":true,"ringerike.no":true,"ringsaker.no":true,"rissa.no":true,"risor.no":true,"xn--risr-ira.no":true,"roan.no":true,"rollag.no":true,"rygge.no":true,"ralingen.no":true,"xn--rlingen-mxa.no":true,"rodoy.no":true,"xn--rdy-0nab.no":true,"romskog.no":true,"xn--rmskog-bya.no":true,"roros.no":true,"xn--rros-gra.no":true,"rost.no":true,"xn--rst-0na.no":true,"royken.no":true,"xn--ryken-vua.no":true,"royrvik.no":true,"xn--ryrvik-bya.no":true,"rade.no":true,"xn--rde-ula.no":true,"salangen.no":true,"siellak.no":true,"saltdal.no":true,"salat.no":true,"xn--slt-elab.no":true,"xn--slat-5na.no":true,"samnanger.no":true,"sande.more-og-romsdal.no":true,"sande.xn--mre-og-romsdal-qqb.no":true,"sande.vestfold.no":true,"sandefjord.no":true,"sandnes.no":true,"sandoy.no":true,"xn--sandy-yua.no":true,"sarpsborg.no":true,"sauda.no":true,"sauherad.no":true,"sel.no":true,"selbu.no":true,"selje.no":true,"seljord.no":true,"sigdal.no":true,"siljan.no":true,"sirdal.no":true,"skaun.no":true,"skedsmo.no":true,"ski.no":true,"skien.no":true,"skiptvet.no":true,"skjervoy.no":true,"xn--skjervy-v1a.no":true,"skierva.no":true,"xn--skierv-uta.no":true,"skjak.no":true,"xn--skjk-soa.no":true,"skodje.no":true,"skanland.no":true,"xn--sknland-fxa.no":true,"skanit.no":true,"xn--sknit-yqa.no":true,"smola.no":true,"xn--smla-hra.no":true,"snillfjord.no":true,"snasa.no":true,"xn--snsa-roa.no":true,"snoasa.no":true,"snaase.no":true,"xn--snase-nra.no":true,"sogndal.no":true,"sokndal.no":true,"sola.no":true,"solund.no":true,"songdalen.no":true,"sortland.no":true,"spydeberg.no":true,"stange.no":true,"stavanger.no":true,"steigen.no":true,"steinkjer.no":true,"stjordal.no":true,"xn--stjrdal-s1a.no":true,"stokke.no":true,"stor-elvdal.no":true,"stord.no":true,"stordal.no":true,"storfjord.no":true,"omasvuotna.no":true,"strand.no":true,"stranda.no":true,"stryn.no":true,"sula.no":true,"suldal.no":true,"sund.no":true,"sunndal.no":true,"surnadal.no":true,"sveio.no":true,"svelvik.no":true,"sykkylven.no":true,"sogne.no":true,"xn--sgne-gra.no":true,"somna.no":true,"xn--smna-gra.no":true,"sondre-land.no":true,"xn--sndre-land-0cb.no":true,"sor-aurdal.no":true,"xn--sr-aurdal-l8a.no":true,"sor-fron.no":true,"xn--sr-fron-q1a.no":true,"sor-odal.no":true,"xn--sr-odal-q1a.no":true,"sor-varanger.no":true,"xn--sr-varanger-ggb.no":true,"matta-varjjat.no":true,"xn--mtta-vrjjat-k7af.no":true,"sorfold.no":true,"xn--srfold-bya.no":true,"sorreisa.no":true,"xn--srreisa-q1a.no":true,"sorum.no":true,"xn--srum-gra.no":true,"tana.no":true,"deatnu.no":true,"time.no":true,"tingvoll.no":true,"tinn.no":true,"tjeldsund.no":true,"dielddanuorri.no":true,"tjome.no":true,"xn--tjme-hra.no":true,"tokke.no":true,"tolga.no":true,"torsken.no":true,"tranoy.no":true,"xn--trany-yua.no":true,"tromso.no":true,"xn--troms-zua.no":true,"tromsa.no":true,"romsa.no":true,"trondheim.no":true,"troandin.no":true,"trysil.no":true,"trana.no":true,"xn--trna-woa.no":true,"trogstad.no":true,"xn--trgstad-r1a.no":true,"tvedestrand.no":true,"tydal.no":true,"tynset.no":true,"tysfjord.no":true,"divtasvuodna.no":true,"divttasvuotna.no":true,"tysnes.no":true,"tysvar.no":true,"xn--tysvr-vra.no":true,"tonsberg.no":true,"xn--tnsberg-q1a.no":true,"ullensaker.no":true,"ullensvang.no":true,"ulvik.no":true,"utsira.no":true,"vadso.no":true,"xn--vads-jra.no":true,"cahcesuolo.no":true,"xn--hcesuolo-7ya35b.no":true,"vaksdal.no":true,"valle.no":true,"vang.no":true,"vanylven.no":true,"vardo.no":true,"xn--vard-jra.no":true,"varggat.no":true,"xn--vrggt-xqad.no":true,"vefsn.no":true,"vaapste.no":true,"vega.no":true,"vegarshei.no":true,"xn--vegrshei-c0a.no":true,"vennesla.no":true,"verdal.no":true,"verran.no":true,"vestby.no":true,"vestnes.no":true,"vestre-slidre.no":true,"vestre-toten.no":true,"vestvagoy.no":true,"xn--vestvgy-ixa6o.no":true,"vevelstad.no":true,"vik.no":true,"vikna.no":true,"vindafjord.no":true,"volda.no":true,"voss.no":true,"varoy.no":true,"xn--vry-yla5g.no":true,"vagan.no":true,"xn--vgan-qoa.no":true,"voagat.no":true,"vagsoy.no":true,"xn--vgsy-qoa0j.no":true,"vaga.no":true,"xn--vg-yiab.no":true,"valer.ostfold.no":true,"xn--vler-qoa.xn--stfold-9xa.no":true,"valer.hedmark.no":true,"xn--vler-qoa.hedmark.no":true,"*.np":true,"nr":true,"biz.nr":true,"info.nr":true,"gov.nr":true,"edu.nr":true,"org.nr":true,"net.nr":true,"com.nr":true,"nu":true,"nz":true,"ac.nz":true,"co.nz":true,"cri.nz":true,"geek.nz":true,"gen.nz":true,"govt.nz":true,"health.nz":true,"iwi.nz":true,"kiwi.nz":true,"maori.nz":true,"mil.nz":true,"xn--mori-qsa.nz":true,"net.nz":true,"org.nz":true,"parliament.nz":true,"school.nz":true,"om":true,"co.om":true,"com.om":true,"edu.om":true,"gov.om":true,"med.om":true,"museum.om":true,"net.om":true,"org.om":true,"pro.om":true,"org":true,"pa":true,"ac.pa":true,"gob.pa":true,"com.pa":true,"org.pa":true,"sld.pa":true,"edu.pa":true,"net.pa":true,"ing.pa":true,"abo.pa":true,"med.pa":true,"nom.pa":true,"pe":true,"edu.pe":true,"gob.pe":true,"nom.pe":true,"mil.pe":true,"org.pe":true,"com.pe":true,"net.pe":true,"pf":true,"com.pf":true,"org.pf":true,"edu.pf":true,"*.pg":true,"ph":true,"com.ph":true,"net.ph":true,"org.ph":true,"gov.ph":true,"edu.ph":true,"ngo.ph":true,"mil.ph":true,"i.ph":true,"pk":true,"com.pk":true,"net.pk":true,"edu.pk":true,"org.pk":true,"fam.pk":true,"biz.pk":true,"web.pk":true,"gov.pk":true,"gob.pk":true,"gok.pk":true,"gon.pk":true,"gop.pk":true,"gos.pk":true,"info.pk":true,"pl":true,"com.pl":true,"net.pl":true,"org.pl":true,"aid.pl":true,"agro.pl":true,"atm.pl":true,"auto.pl":true,"biz.pl":true,"edu.pl":true,"gmina.pl":true,"gsm.pl":true,"info.pl":true,"mail.pl":true,"miasta.pl":true,"media.pl":true,"mil.pl":true,"nieruchomosci.pl":true,"nom.pl":true,"pc.pl":true,"powiat.pl":true,"priv.pl":true,"realestate.pl":true,"rel.pl":true,"sex.pl":true,"shop.pl":true,"sklep.pl":true,"sos.pl":true,"szkola.pl":true,"targi.pl":true,"tm.pl":true,"tourism.pl":true,"travel.pl":true,"turystyka.pl":true,"gov.pl":true,"ap.gov.pl":true,"ic.gov.pl":true,"is.gov.pl":true,"us.gov.pl":true,"kmpsp.gov.pl":true,"kppsp.gov.pl":true,"kwpsp.gov.pl":true,"psp.gov.pl":true,"wskr.gov.pl":true,"kwp.gov.pl":true,"mw.gov.pl":true,"ug.gov.pl":true,"um.gov.pl":true,"umig.gov.pl":true,"ugim.gov.pl":true,"upow.gov.pl":true,"uw.gov.pl":true,"starostwo.gov.pl":true,"pa.gov.pl":true,"po.gov.pl":true,"psse.gov.pl":true,"pup.gov.pl":true,"rzgw.gov.pl":true,"sa.gov.pl":true,"so.gov.pl":true,"sr.gov.pl":true,"wsa.gov.pl":true,"sko.gov.pl":true,"uzs.gov.pl":true,"wiih.gov.pl":true,"winb.gov.pl":true,"pinb.gov.pl":true,"wios.gov.pl":true,"witd.gov.pl":true,"wzmiuw.gov.pl":true,"piw.gov.pl":true,"wiw.gov.pl":true,"griw.gov.pl":true,"wif.gov.pl":true,"oum.gov.pl":true,"sdn.gov.pl":true,"zp.gov.pl":true,"uppo.gov.pl":true,"mup.gov.pl":true,"wuoz.gov.pl":true,"konsulat.gov.pl":true,"oirm.gov.pl":true,"augustow.pl":true,"babia-gora.pl":true,"bedzin.pl":true,"beskidy.pl":true,"bialowieza.pl":true,"bialystok.pl":true,"bielawa.pl":true,"bieszczady.pl":true,"boleslawiec.pl":true,"bydgoszcz.pl":true,"bytom.pl":true,"cieszyn.pl":true,"czeladz.pl":true,"czest.pl":true,"dlugoleka.pl":true,"elblag.pl":true,"elk.pl":true,"glogow.pl":true,"gniezno.pl":true,"gorlice.pl":true,"grajewo.pl":true,"ilawa.pl":true,"jaworzno.pl":true,"jelenia-gora.pl":true,"jgora.pl":true,"kalisz.pl":true,"kazimierz-dolny.pl":true,"karpacz.pl":true,"kartuzy.pl":true,"kaszuby.pl":true,"katowice.pl":true,"kepno.pl":true,"ketrzyn.pl":true,"klodzko.pl":true,"kobierzyce.pl":true,"kolobrzeg.pl":true,"konin.pl":true,"konskowola.pl":true,"kutno.pl":true,"lapy.pl":true,"lebork.pl":true,"legnica.pl":true,"lezajsk.pl":true,"limanowa.pl":true,"lomza.pl":true,"lowicz.pl":true,"lubin.pl":true,"lukow.pl":true,"malbork.pl":true,"malopolska.pl":true,"mazowsze.pl":true,"mazury.pl":true,"mielec.pl":true,"mielno.pl":true,"mragowo.pl":true,"naklo.pl":true,"nowaruda.pl":true,"nysa.pl":true,"olawa.pl":true,"olecko.pl":true,"olkusz.pl":true,"olsztyn.pl":true,"opoczno.pl":true,"opole.pl":true,"ostroda.pl":true,"ostroleka.pl":true,"ostrowiec.pl":true,"ostrowwlkp.pl":true,"pila.pl":true,"pisz.pl":true,"podhale.pl":true,"podlasie.pl":true,"polkowice.pl":true,"pomorze.pl":true,"pomorskie.pl":true,"prochowice.pl":true,"pruszkow.pl":true,"przeworsk.pl":true,"pulawy.pl":true,"radom.pl":true,"rawa-maz.pl":true,"rybnik.pl":true,"rzeszow.pl":true,"sanok.pl":true,"sejny.pl":true,"slask.pl":true,"slupsk.pl":true,"sosnowiec.pl":true,"stalowa-wola.pl":true,"skoczow.pl":true,"starachowice.pl":true,"stargard.pl":true,"suwalki.pl":true,"swidnica.pl":true,"swiebodzin.pl":true,"swinoujscie.pl":true,"szczecin.pl":true,"szczytno.pl":true,"tarnobrzeg.pl":true,"tgory.pl":true,"turek.pl":true,"tychy.pl":true,"ustka.pl":true,"walbrzych.pl":true,"warmia.pl":true,"warszawa.pl":true,"waw.pl":true,"wegrow.pl":true,"wielun.pl":true,"wlocl.pl":true,"wloclawek.pl":true,"wodzislaw.pl":true,"wolomin.pl":true,"wroclaw.pl":true,"zachpomor.pl":true,"zagan.pl":true,"zarow.pl":true,"zgora.pl":true,"zgorzelec.pl":true,"pm":true,"pn":true,"gov.pn":true,"co.pn":true,"org.pn":true,"edu.pn":true,"net.pn":true,"post":true,"pr":true,"com.pr":true,"net.pr":true,"org.pr":true,"gov.pr":true,"edu.pr":true,"isla.pr":true,"pro.pr":true,"biz.pr":true,"info.pr":true,"name.pr":true,"est.pr":true,"prof.pr":true,"ac.pr":true,"pro":true,"aca.pro":true,"bar.pro":true,"cpa.pro":true,"jur.pro":true,"law.pro":true,"med.pro":true,"eng.pro":true,"ps":true,"edu.ps":true,"gov.ps":true,"sec.ps":true,"plo.ps":true,"com.ps":true,"org.ps":true,"net.ps":true,"pt":true,"net.pt":true,"gov.pt":true,"org.pt":true,"edu.pt":true,"int.pt":true,"publ.pt":true,"com.pt":true,"nome.pt":true,"pw":true,"co.pw":true,"ne.pw":true,"or.pw":true,"ed.pw":true,"go.pw":true,"belau.pw":true,"py":true,"com.py":true,"coop.py":true,"edu.py":true,"gov.py":true,"mil.py":true,"net.py":true,"org.py":true,"qa":true,"com.qa":true,"edu.qa":true,"gov.qa":true,"mil.qa":true,"name.qa":true,"net.qa":true,"org.qa":true,"sch.qa":true,"re":true,"com.re":true,"asso.re":true,"nom.re":true,"ro":true,"com.ro":true,"org.ro":true,"tm.ro":true,"nt.ro":true,"nom.ro":true,"info.ro":true,"rec.ro":true,"arts.ro":true,"firm.ro":true,"store.ro":true,"www.ro":true,"rs":true,"co.rs":true,"org.rs":true,"edu.rs":true,"ac.rs":true,"gov.rs":true,"in.rs":true,"ru":true,"ac.ru":true,"com.ru":true,"edu.ru":true,"int.ru":true,"net.ru":true,"org.ru":true,"pp.ru":true,"adygeya.ru":true,"altai.ru":true,"amur.ru":true,"arkhangelsk.ru":true,"astrakhan.ru":true,"bashkiria.ru":true,"belgorod.ru":true,"bir.ru":true,"bryansk.ru":true,"buryatia.ru":true,"cbg.ru":true,"chel.ru":true,"chelyabinsk.ru":true,"chita.ru":true,"chukotka.ru":true,"chuvashia.ru":true,"dagestan.ru":true,"dudinka.ru":true,"e-burg.ru":true,"grozny.ru":true,"irkutsk.ru":true,"ivanovo.ru":true,"izhevsk.ru":true,"jar.ru":true,"joshkar-ola.ru":true,"kalmykia.ru":true,"kaluga.ru":true,"kamchatka.ru":true,"karelia.ru":true,"kazan.ru":true,"kchr.ru":true,"kemerovo.ru":true,"khabarovsk.ru":true,"khakassia.ru":true,"khv.ru":true,"kirov.ru":true,"koenig.ru":true,"komi.ru":true,"kostroma.ru":true,"krasnoyarsk.ru":true,"kuban.ru":true,"kurgan.ru":true,"kursk.ru":true,"lipetsk.ru":true,"magadan.ru":true,"mari.ru":true,"mari-el.ru":true,"marine.ru":true,"mordovia.ru":true,"msk.ru":true,"murmansk.ru":true,"nalchik.ru":true,"nnov.ru":true,"nov.ru":true,"novosibirsk.ru":true,"nsk.ru":true,"omsk.ru":true,"orenburg.ru":true,"oryol.ru":true,"palana.ru":true,"penza.ru":true,"perm.ru":true,"ptz.ru":true,"rnd.ru":true,"ryazan.ru":true,"sakhalin.ru":true,"samara.ru":true,"saratov.ru":true,"simbirsk.ru":true,"smolensk.ru":true,"spb.ru":true,"stavropol.ru":true,"stv.ru":true,"surgut.ru":true,"tambov.ru":true,"tatarstan.ru":true,"tom.ru":true,"tomsk.ru":true,"tsaritsyn.ru":true,"tsk.ru":true,"tula.ru":true,"tuva.ru":true,"tver.ru":true,"tyumen.ru":true,"udm.ru":true,"udmurtia.ru":true,"ulan-ude.ru":true,"vladikavkaz.ru":true,"vladimir.ru":true,"vladivostok.ru":true,"volgograd.ru":true,"vologda.ru":true,"voronezh.ru":true,"vrn.ru":true,"vyatka.ru":true,"yakutia.ru":true,"yamal.ru":true,"yaroslavl.ru":true,"yekaterinburg.ru":true,"yuzhno-sakhalinsk.ru":true,"amursk.ru":true,"baikal.ru":true,"cmw.ru":true,"fareast.ru":true,"jamal.ru":true,"kms.ru":true,"k-uralsk.ru":true,"kustanai.ru":true,"kuzbass.ru":true,"magnitka.ru":true,"mytis.ru":true,"nakhodka.ru":true,"nkz.ru":true,"norilsk.ru":true,"oskol.ru":true,"pyatigorsk.ru":true,"rubtsovsk.ru":true,"snz.ru":true,"syzran.ru":true,"vdonsk.ru":true,"zgrad.ru":true,"gov.ru":true,"mil.ru":true,"test.ru":true,"rw":true,"gov.rw":true,"net.rw":true,"edu.rw":true,"ac.rw":true,"com.rw":true,"co.rw":true,"int.rw":true,"mil.rw":true,"gouv.rw":true,"sa":true,"com.sa":true,"net.sa":true,"org.sa":true,"gov.sa":true,"med.sa":true,"pub.sa":true,"edu.sa":true,"sch.sa":true,"sb":true,"com.sb":true,"edu.sb":true,"gov.sb":true,"net.sb":true,"org.sb":true,"sc":true,"com.sc":true,"gov.sc":true,"net.sc":true,"org.sc":true,"edu.sc":true,"sd":true,"com.sd":true,"net.sd":true,"org.sd":true,"edu.sd":true,"med.sd":true,"tv.sd":true,"gov.sd":true,"info.sd":true,"se":true,"a.se":true,"ac.se":true,"b.se":true,"bd.se":true,"brand.se":true,"c.se":true,"d.se":true,"e.se":true,"f.se":true,"fh.se":true,"fhsk.se":true,"fhv.se":true,"g.se":true,"h.se":true,"i.se":true,"k.se":true,"komforb.se":true,"kommunalforbund.se":true,"komvux.se":true,"l.se":true,"lanbib.se":true,"m.se":true,"n.se":true,"naturbruksgymn.se":true,"o.se":true,"org.se":true,"p.se":true,"parti.se":true,"pp.se":true,"press.se":true,"r.se":true,"s.se":true,"t.se":true,"tm.se":true,"u.se":true,"w.se":true,"x.se":true,"y.se":true,"z.se":true,"sg":true,"com.sg":true,"net.sg":true,"org.sg":true,"gov.sg":true,"edu.sg":true,"per.sg":true,"sh":true,"com.sh":true,"net.sh":true,"gov.sh":true,"org.sh":true,"mil.sh":true,"si":true,"sj":true,"sk":true,"sl":true,"com.sl":true,"net.sl":true,"edu.sl":true,"gov.sl":true,"org.sl":true,"sm":true,"sn":true,"art.sn":true,"com.sn":true,"edu.sn":true,"gouv.sn":true,"org.sn":true,"perso.sn":true,"univ.sn":true,"so":true,"com.so":true,"net.so":true,"org.so":true,"sr":true,"st":true,"co.st":true,"com.st":true,"consulado.st":true,"edu.st":true,"embaixada.st":true,"gov.st":true,"mil.st":true,"net.st":true,"org.st":true,"principe.st":true,"saotome.st":true,"store.st":true,"su":true,"adygeya.su":true,"arkhangelsk.su":true,"balashov.su":true,"bashkiria.su":true,"bryansk.su":true,"dagestan.su":true,"grozny.su":true,"ivanovo.su":true,"kalmykia.su":true,"kaluga.su":true,"karelia.su":true,"khakassia.su":true,"krasnodar.su":true,"kurgan.su":true,"lenug.su":true,"mordovia.su":true,"msk.su":true,"murmansk.su":true,"nalchik.su":true,"nov.su":true,"obninsk.su":true,"penza.su":true,"pokrovsk.su":true,"sochi.su":true,"spb.su":true,"togliatti.su":true,"troitsk.su":true,"tula.su":true,"tuva.su":true,"vladikavkaz.su":true,"vladimir.su":true,"vologda.su":true,"sv":true,"com.sv":true,"edu.sv":true,"gob.sv":true,"org.sv":true,"red.sv":true,"sx":true,"gov.sx":true,"sy":true,"edu.sy":true,"gov.sy":true,"net.sy":true,"mil.sy":true,"com.sy":true,"org.sy":true,"sz":true,"co.sz":true,"ac.sz":true,"org.sz":true,"tc":true,"td":true,"tel":true,"tf":true,"tg":true,"th":true,"ac.th":true,"co.th":true,"go.th":true,"in.th":true,"mi.th":true,"net.th":true,"or.th":true,"tj":true,"ac.tj":true,"biz.tj":true,"co.tj":true,"com.tj":true,"edu.tj":true,"go.tj":true,"gov.tj":true,"int.tj":true,"mil.tj":true,"name.tj":true,"net.tj":true,"nic.tj":true,"org.tj":true,"test.tj":true,"web.tj":true,"tk":true,"tl":true,"gov.tl":true,"tm":true,"com.tm":true,"co.tm":true,"org.tm":true,"net.tm":true,"nom.tm":true,"gov.tm":true,"mil.tm":true,"edu.tm":true,"tn":true,"com.tn":true,"ens.tn":true,"fin.tn":true,"gov.tn":true,"ind.tn":true,"intl.tn":true,"nat.tn":true,"net.tn":true,"org.tn":true,"info.tn":true,"perso.tn":true,"tourism.tn":true,"edunet.tn":true,"rnrt.tn":true,"rns.tn":true,"rnu.tn":true,"mincom.tn":true,"agrinet.tn":true,"defense.tn":true,"turen.tn":true,"to":true,"com.to":true,"gov.to":true,"net.to":true,"org.to":true,"edu.to":true,"mil.to":true,"tp":true,"tr":true,"com.tr":true,"info.tr":true,"biz.tr":true,"net.tr":true,"org.tr":true,"web.tr":true,"gen.tr":true,"tv.tr":true,"av.tr":true,"dr.tr":true,"bbs.tr":true,"name.tr":true,"tel.tr":true,"gov.tr":true,"bel.tr":true,"pol.tr":true,"mil.tr":true,"k12.tr":true,"edu.tr":true,"kep.tr":true,"nc.tr":true,"gov.nc.tr":true,"travel":true,"tt":true,"co.tt":true,"com.tt":true,"org.tt":true,"net.tt":true,"biz.tt":true,"info.tt":true,"pro.tt":true,"int.tt":true,"coop.tt":true,"jobs.tt":true,"mobi.tt":true,"travel.tt":true,"museum.tt":true,"aero.tt":true,"name.tt":true,"gov.tt":true,"edu.tt":true,"tv":true,"tw":true,"edu.tw":true,"gov.tw":true,"mil.tw":true,"com.tw":true,"net.tw":true,"org.tw":true,"idv.tw":true,"game.tw":true,"ebiz.tw":true,"club.tw":true,"xn--zf0ao64a.tw":true,"xn--uc0atv.tw":true,"xn--czrw28b.tw":true,"tz":true,"ac.tz":true,"co.tz":true,"go.tz":true,"hotel.tz":true,"info.tz":true,"me.tz":true,"mil.tz":true,"mobi.tz":true,"ne.tz":true,"or.tz":true,"sc.tz":true,"tv.tz":true,"ua":true,"com.ua":true,"edu.ua":true,"gov.ua":true,"in.ua":true,"net.ua":true,"org.ua":true,"cherkassy.ua":true,"cherkasy.ua":true,"chernigov.ua":true,"chernihiv.ua":true,"chernivtsi.ua":true,"chernovtsy.ua":true,"ck.ua":true,"cn.ua":true,"cr.ua":true,"crimea.ua":true,"cv.ua":true,"dn.ua":true,"dnepropetrovsk.ua":true,"dnipropetrovsk.ua":true,"dominic.ua":true,"donetsk.ua":true,"dp.ua":true,"if.ua":true,"ivano-frankivsk.ua":true,"kh.ua":true,"kharkiv.ua":true,"kharkov.ua":true,"kherson.ua":true,"khmelnitskiy.ua":true,"khmelnytskyi.ua":true,"kiev.ua":true,"kirovograd.ua":true,"km.ua":true,"kr.ua":true,"krym.ua":true,"ks.ua":true,"kv.ua":true,"kyiv.ua":true,"lg.ua":true,"lt.ua":true,"lugansk.ua":true,"lutsk.ua":true,"lv.ua":true,"lviv.ua":true,"mk.ua":true,"mykolaiv.ua":true,"nikolaev.ua":true,"od.ua":true,"odesa.ua":true,"odessa.ua":true,"pl.ua":true,"poltava.ua":true,"rivne.ua":true,"rovno.ua":true,"rv.ua":true,"sb.ua":true,"sebastopol.ua":true,"sevastopol.ua":true,"sm.ua":true,"sumy.ua":true,"te.ua":true,"ternopil.ua":true,"uz.ua":true,"uzhgorod.ua":true,"vinnica.ua":true,"vinnytsia.ua":true,"vn.ua":true,"volyn.ua":true,"yalta.ua":true,"zaporizhzhe.ua":true,"zaporizhzhia.ua":true,"zhitomir.ua":true,"zhytomyr.ua":true,"zp.ua":true,"zt.ua":true,"ug":true,"co.ug":true,"or.ug":true,"ac.ug":true,"sc.ug":true,"go.ug":true,"ne.ug":true,"com.ug":true,"org.ug":true,"uk":true,"ac.uk":true,"co.uk":true,"gov.uk":true,"ltd.uk":true,"me.uk":true,"net.uk":true,"nhs.uk":true,"org.uk":true,"plc.uk":true,"police.uk":true,"*.sch.uk":true,"us":true,"dni.us":true,"fed.us":true,"isa.us":true,"kids.us":true,"nsn.us":true,"ak.us":true,"al.us":true,"ar.us":true,"as.us":true,"az.us":true,"ca.us":true,"co.us":true,"ct.us":true,"dc.us":true,"de.us":true,"fl.us":true,"ga.us":true,"gu.us":true,"hi.us":true,"ia.us":true,"id.us":true,"il.us":true,"in.us":true,"ks.us":true,"ky.us":true,"la.us":true,"ma.us":true,"md.us":true,"me.us":true,"mi.us":true,"mn.us":true,"mo.us":true,"ms.us":true,"mt.us":true,"nc.us":true,"nd.us":true,"ne.us":true,"nh.us":true,"nj.us":true,"nm.us":true,"nv.us":true,"ny.us":true,"oh.us":true,"ok.us":true,"or.us":true,"pa.us":true,"pr.us":true,"ri.us":true,"sc.us":true,"sd.us":true,"tn.us":true,"tx.us":true,"ut.us":true,"vi.us":true,"vt.us":true,"va.us":true,"wa.us":true,"wi.us":true,"wv.us":true,"wy.us":true,"k12.ak.us":true,"k12.al.us":true,"k12.ar.us":true,"k12.as.us":true,"k12.az.us":true,"k12.ca.us":true,"k12.co.us":true,"k12.ct.us":true,"k12.dc.us":true,"k12.de.us":true,"k12.fl.us":true,"k12.ga.us":true,"k12.gu.us":true,"k12.ia.us":true,"k12.id.us":true,"k12.il.us":true,"k12.in.us":true,"k12.ks.us":true,"k12.ky.us":true,"k12.la.us":true,"k12.ma.us":true,"k12.md.us":true,"k12.me.us":true,"k12.mi.us":true,"k12.mn.us":true,"k12.mo.us":true,"k12.ms.us":true,"k12.mt.us":true,"k12.nc.us":true,"k12.ne.us":true,"k12.nh.us":true,"k12.nj.us":true,"k12.nm.us":true,"k12.nv.us":true,"k12.ny.us":true,"k12.oh.us":true,"k12.ok.us":true,"k12.or.us":true,"k12.pa.us":true,"k12.pr.us":true,"k12.ri.us":true,"k12.sc.us":true,"k12.tn.us":true,"k12.tx.us":true,"k12.ut.us":true,"k12.vi.us":true,"k12.vt.us":true,"k12.va.us":true,"k12.wa.us":true,"k12.wi.us":true,"k12.wy.us":true,"cc.ak.us":true,"cc.al.us":true,"cc.ar.us":true,"cc.as.us":true,"cc.az.us":true,"cc.ca.us":true,"cc.co.us":true,"cc.ct.us":true,"cc.dc.us":true,"cc.de.us":true,"cc.fl.us":true,"cc.ga.us":true,"cc.gu.us":true,"cc.hi.us":true,"cc.ia.us":true,"cc.id.us":true,"cc.il.us":true,"cc.in.us":true,"cc.ks.us":true,"cc.ky.us":true,"cc.la.us":true,"cc.ma.us":true,"cc.md.us":true,"cc.me.us":true,"cc.mi.us":true,"cc.mn.us":true,"cc.mo.us":true,"cc.ms.us":true,"cc.mt.us":true,"cc.nc.us":true,"cc.nd.us":true,"cc.ne.us":true,"cc.nh.us":true,"cc.nj.us":true,"cc.nm.us":true,"cc.nv.us":true,"cc.ny.us":true,"cc.oh.us":true,"cc.ok.us":true,"cc.or.us":true,"cc.pa.us":true,"cc.pr.us":true,"cc.ri.us":true,"cc.sc.us":true,"cc.sd.us":true,"cc.tn.us":true,"cc.tx.us":true,"cc.ut.us":true,"cc.vi.us":true,"cc.vt.us":true,"cc.va.us":true,"cc.wa.us":true,"cc.wi.us":true,"cc.wv.us":true,"cc.wy.us":true,"lib.ak.us":true,"lib.al.us":true,"lib.ar.us":true,"lib.as.us":true,"lib.az.us":true,"lib.ca.us":true,"lib.co.us":true,"lib.ct.us":true,"lib.dc.us":true,"lib.de.us":true,"lib.fl.us":true,"lib.ga.us":true,"lib.gu.us":true,"lib.hi.us":true,"lib.ia.us":true,"lib.id.us":true,"lib.il.us":true,"lib.in.us":true,"lib.ks.us":true,"lib.ky.us":true,"lib.la.us":true,"lib.ma.us":true,"lib.md.us":true,"lib.me.us":true,"lib.mi.us":true,"lib.mn.us":true,"lib.mo.us":true,"lib.ms.us":true,"lib.mt.us":true,"lib.nc.us":true,"lib.nd.us":true,"lib.ne.us":true,"lib.nh.us":true,"lib.nj.us":true,"lib.nm.us":true,"lib.nv.us":true,"lib.ny.us":true,"lib.oh.us":true,"lib.ok.us":true,"lib.or.us":true,"lib.pa.us":true,"lib.pr.us":true,"lib.ri.us":true,"lib.sc.us":true,"lib.sd.us":true,"lib.tn.us":true,"lib.tx.us":true,"lib.ut.us":true,"lib.vi.us":true,"lib.vt.us":true,"lib.va.us":true,"lib.wa.us":true,"lib.wi.us":true,"lib.wy.us":true,"pvt.k12.ma.us":true,"chtr.k12.ma.us":true,"paroch.k12.ma.us":true,"uy":true,"com.uy":true,"edu.uy":true,"gub.uy":true,"mil.uy":true,"net.uy":true,"org.uy":true,"uz":true,"co.uz":true,"com.uz":true,"net.uz":true,"org.uz":true,"va":true,"vc":true,"com.vc":true,"net.vc":true,"org.vc":true,"gov.vc":true,"mil.vc":true,"edu.vc":true,"ve":true,"arts.ve":true,"co.ve":true,"com.ve":true,"e12.ve":true,"edu.ve":true,"firm.ve":true,"gob.ve":true,"gov.ve":true,"info.ve":true,"int.ve":true,"mil.ve":true,"net.ve":true,"org.ve":true,"rec.ve":true,"store.ve":true,"tec.ve":true,"web.ve":true,"vg":true,"vi":true,"co.vi":true,"com.vi":true,"k12.vi":true,"net.vi":true,"org.vi":true,"vn":true,"com.vn":true,"net.vn":true,"org.vn":true,"edu.vn":true,"gov.vn":true,"int.vn":true,"ac.vn":true,"biz.vn":true,"info.vn":true,"name.vn":true,"pro.vn":true,"health.vn":true,"vu":true,"com.vu":true,"edu.vu":true,"net.vu":true,"org.vu":true,"wf":true,"ws":true,"com.ws":true,"net.ws":true,"org.ws":true,"gov.ws":true,"edu.ws":true,"yt":true,"xn--mgbaam7a8h":true,"xn--y9a3aq":true,"xn--54b7fta0cc":true,"xn--90ais":true,"xn--fiqs8s":true,"xn--fiqz9s":true,"xn--lgbbat1ad8j":true,"xn--wgbh1c":true,"xn--node":true,"xn--qxam":true,"xn--j6w193g":true,"xn--h2brj9c":true,"xn--mgbbh1a71e":true,"xn--fpcrj9c3d":true,"xn--gecrj9c":true,"xn--s9brj9c":true,"xn--45brj9c":true,"xn--xkc2dl3a5ee0h":true,"xn--mgba3a4f16a":true,"xn--mgba3a4fra":true,"xn--mgbtx2b":true,"xn--mgbayh7gpa":true,"xn--3e0b707e":true,"xn--80ao21a":true,"xn--fzc2c9e2c":true,"xn--xkc2al3hye2a":true,"xn--mgbc0a9azcg":true,"xn--d1alf":true,"xn--l1acc":true,"xn--mix891f":true,"xn--mix082f":true,"xn--mgbx4cd0ab":true,"xn--mgb9awbf":true,"xn--mgbai9azgqp6j":true,"xn--mgbai9a5eva00b":true,"xn--ygbi2ammx":true,"xn--90a3ac":true,"xn--o1ac.xn--90a3ac":true,"xn--c1avg.xn--90a3ac":true,"xn--90azh.xn--90a3ac":true,"xn--d1at.xn--90a3ac":true,"xn--o1ach.xn--90a3ac":true,"xn--80au.xn--90a3ac":true,"xn--p1ai":true,"xn--wgbl6a":true,"xn--mgberp4a5d4ar":true,"xn--mgberp4a5d4a87g":true,"xn--mgbqly7c0a67fbc":true,"xn--mgbqly7cvafr":true,"xn--mgbpl2fh":true,"xn--yfro4i67o":true,"xn--clchc0ea0b2g2a9gcd":true,"xn--ogbpf8fl":true,"xn--mgbtf8fl":true,"xn--o3cw4h":true,"xn--pgbs0dh":true,"xn--kpry57d":true,"xn--kprw13d":true,"xn--nnx388a":true,"xn--j1amh":true,"xn--mgb2ddes":true,"xxx":true,"*.ye":true,"ac.za":true,"agrica.za":true,"alt.za":true,"co.za":true,"edu.za":true,"gov.za":true,"grondar.za":true,"law.za":true,"mil.za":true,"net.za":true,"ngo.za":true,"nis.za":true,"nom.za":true,"org.za":true,"school.za":true,"tm.za":true,"web.za":true,"*.zm":true,"*.zw":true,"aaa":true,"aarp":true,"abarth":true,"abb":true,"abbott":true,"abbvie":true,"abc":true,"able":true,"abogado":true,"abudhabi":true,"academy":true,"accenture":true,"accountant":true,"accountants":true,"aco":true,"active":true,"actor":true,"adac":true,"ads":true,"adult":true,"aeg":true,"aetna":true,"afamilycompany":true,"afl":true,"africa":true,"africamagic":true,"agakhan":true,"agency":true,"aig":true,"aigo":true,"airbus":true,"airforce":true,"airtel":true,"akdn":true,"alfaromeo":true,"alibaba":true,"alipay":true,"allfinanz":true,"allstate":true,"ally":true,"alsace":true,"alstom":true,"americanexpress":true,"americanfamily":true,"amex":true,"amfam":true,"amica":true,"amsterdam":true,"analytics":true,"android":true,"anquan":true,"anz":true,"aol":true,"apartments":true,"app":true,"apple":true,"aquarelle":true,"aramco":true,"archi":true,"army":true,"arte":true,"asda":true,"associates":true,"athleta":true,"attorney":true,"auction":true,"audi":true,"audible":true,"audio":true,"auspost":true,"author":true,"auto":true,"autos":true,"avianca":true,"aws":true,"axa":true,"azure":true,"baby":true,"baidu":true,"banamex":true,"bananarepublic":true,"band":true,"bank":true,"bar":true,"barcelona":true,"barclaycard":true,"barclays":true,"barefoot":true,"bargains":true,"basketball":true,"bauhaus":true,"bayern":true,"bbc":true,"bbt":true,"bbva":true,"bcg":true,"bcn":true,"beats":true,"beer":true,"bentley":true,"berlin":true,"best":true,"bestbuy":true,"bet":true,"bharti":true,"bible":true,"bid":true,"bike":true,"bing":true,"bingo":true,"bio":true,"black":true,"blackfriday":true,"blanco":true,"blockbuster":true,"blog":true,"bloomberg":true,"blue":true,"bms":true,"bmw":true,"bnl":true,"bnpparibas":true,"boats":true,"boehringer":true,"bofa":true,"bom":true,"bond":true,"boo":true,"book":true,"booking":true,"boots":true,"bosch":true,"bostik":true,"bot":true,"boutique":true,"bradesco":true,"bridgestone":true,"broadway":true,"broker":true,"brother":true,"brussels":true,"budapest":true,"bugatti":true,"build":true,"builders":true,"business":true,"buy":true,"buzz":true,"bzh":true,"cab":true,"cafe":true,"cal":true,"call":true,"calvinklein":true,"camera":true,"camp":true,"cancerresearch":true,"canon":true,"capetown":true,"capital":true,"capitalone":true,"car":true,"caravan":true,"cards":true,"care":true,"career":true,"careers":true,"cars":true,"cartier":true,"casa":true,"case":true,"caseih":true,"cash":true,"casino":true,"catering":true,"cba":true,"cbn":true,"cbre":true,"cbs":true,"ceb":true,"center":true,"ceo":true,"cern":true,"cfa":true,"cfd":true,"chanel":true,"channel":true,"chase":true,"chat":true,"cheap":true,"chintai":true,"chloe":true,"christmas":true,"chrome":true,"chrysler":true,"church":true,"cipriani":true,"circle":true,"cisco":true,"citadel":true,"citi":true,"citic":true,"city":true,"cityeats":true,"claims":true,"cleaning":true,"click":true,"clinic":true,"clothing":true,"cloud":true,"club":true,"clubmed":true,"coach":true,"codes":true,"coffee":true,"college":true,"cologne":true,"comcast":true,"commbank":true,"community":true,"company":true,"computer":true,"comsec":true,"condos":true,"construction":true,"consulting":true,"contact":true,"contractors":true,"cooking":true,"cookingchannel":true,"cool":true,"corsica":true,"country":true,"coupon":true,"coupons":true,"courses":true,"credit":true,"creditcard":true,"creditunion":true,"cricket":true,"crown":true,"crs":true,"cruises":true,"csc":true,"cuisinella":true,"cymru":true,"cyou":true,"dabur":true,"dad":true,"dance":true,"date":true,"dating":true,"datsun":true,"day":true,"dclk":true,"dds":true,"deal":true,"dealer":true,"deals":true,"degree":true,"delivery":true,"dell":true,"deloitte":true,"delta":true,"democrat":true,"dental":true,"dentist":true,"desi":true,"design":true,"dev":true,"dhl":true,"diamonds":true,"diet":true,"digital":true,"direct":true,"directory":true,"discount":true,"discover":true,"dish":true,"dnp":true,"docs":true,"dodge":true,"dog":true,"doha":true,"domains":true,"doosan":true,"dot":true,"download":true,"drive":true,"dstv":true,"dtv":true,"dubai":true,"duck":true,"dunlop":true,"duns":true,"dupont":true,"durban":true,"dvag":true,"dwg":true,"earth":true,"eat":true,"edeka":true,"education":true,"email":true,"emerck":true,"emerson":true,"energy":true,"engineer":true,"engineering":true,"enterprises":true,"epost":true,"epson":true,"equipment":true,"ericsson":true,"erni":true,"esq":true,"estate":true,"esurance":true,"etisalat":true,"eurovision":true,"eus":true,"events":true,"everbank":true,"exchange":true,"expert":true,"exposed":true,"express":true,"extraspace":true,"fage":true,"fail":true,"fairwinds":true,"faith":true,"family":true,"fan":true,"fans":true,"farm":true,"farmers":true,"fashion":true,"fast":true,"fedex":true,"feedback":true,"ferrari":true,"ferrero":true,"fiat":true,"fidelity":true,"fido":true,"film":true,"final":true,"finance":true,"financial":true,"fire":true,"firestone":true,"firmdale":true,"fish":true,"fishing":true,"fit":true,"fitness":true,"flickr":true,"flights":true,"flir":true,"florist":true,"flowers":true,"flsmidth":true,"fly":true,"foo":true,"foodnetwork":true,"football":true,"ford":true,"forex":true,"forsale":true,"forum":true,"foundation":true,"fox":true,"fresenius":true,"frl":true,"frogans":true,"frontdoor":true,"frontier":true,"ftr":true,"fujitsu":true,"fujixerox":true,"fund":true,"furniture":true,"futbol":true,"fyi":true,"gal":true,"gallery":true,"gallo":true,"gallup":true,"game":true,"games":true,"gap":true,"garden":true,"gbiz":true,"gdn":true,"gea":true,"gent":true,"genting":true,"george":true,"ggee":true,"gift":true,"gifts":true,"gives":true,"giving":true,"glade":true,"glass":true,"gle":true,"global":true,"globo":true,"gmail":true,"gmo":true,"gmx":true,"godaddy":true,"gold":true,"goldpoint":true,"golf":true,"goo":true,"goodhands":true,"goodyear":true,"goog":true,"google":true,"gop":true,"got":true,"gotv":true,"grainger":true,"graphics":true,"gratis":true,"green":true,"gripe":true,"group":true,"guardian":true,"gucci":true,"guge":true,"guide":true,"guitars":true,"guru":true,"hamburg":true,"hangout":true,"haus":true,"hbo":true,"hdfc":true,"hdfcbank":true,"health":true,"healthcare":true,"help":true,"helsinki":true,"here":true,"hermes":true,"hgtv":true,"hiphop":true,"hisamitsu":true,"hitachi":true,"hiv":true,"hkt":true,"hockey":true,"holdings":true,"holiday":true,"homedepot":true,"homegoods":true,"homes":true,"homesense":true,"honda":true,"honeywell":true,"horse":true,"host":true,"hosting":true,"hot":true,"hoteles":true,"hotmail":true,"house":true,"how":true,"hsbc":true,"htc":true,"hughes":true,"hyatt":true,"hyundai":true,"ibm":true,"icbc":true,"ice":true,"icu":true,"ieee":true,"ifm":true,"iinet":true,"ikano":true,"imamat":true,"imdb":true,"immo":true,"immobilien":true,"industries":true,"infiniti":true,"ing":true,"ink":true,"institute":true,"insurance":true,"insure":true,"intel":true,"international":true,"intuit":true,"investments":true,"ipiranga":true,"irish":true,"iselect":true,"ismaili":true,"ist":true,"istanbul":true,"itau":true,"itv":true,"iveco":true,"iwc":true,"jaguar":true,"java":true,"jcb":true,"jcp":true,"jeep":true,"jetzt":true,"jewelry":true,"jio":true,"jlc":true,"jll":true,"jmp":true,"jnj":true,"joburg":true,"jot":true,"joy":true,"jpmorgan":true,"jprs":true,"juegos":true,"juniper":true,"kaufen":true,"kddi":true,"kerryhotels":true,"kerrylogistics":true,"kerryproperties":true,"kfh":true,"kia":true,"kim":true,"kinder":true,"kindle":true,"kitchen":true,"kiwi":true,"koeln":true,"komatsu":true,"kosher":true,"kpmg":true,"kpn":true,"krd":true,"kred":true,"kuokgroup":true,"kyknet":true,"kyoto":true,"lacaixa":true,"ladbrokes":true,"lamborghini":true,"lancaster":true,"lancia":true,"lancome":true,"land":true,"landrover":true,"lanxess":true,"lasalle":true,"lat":true,"latino":true,"latrobe":true,"law":true,"lawyer":true,"lds":true,"lease":true,"leclerc":true,"lefrak":true,"legal":true,"lego":true,"lexus":true,"lgbt":true,"liaison":true,"lidl":true,"life":true,"lifeinsurance":true,"lifestyle":true,"lighting":true,"like":true,"lilly":true,"limited":true,"limo":true,"lincoln":true,"linde":true,"link":true,"lipsy":true,"live":true,"living":true,"lixil":true,"loan":true,"loans":true,"locker":true,"locus":true,"loft":true,"lol":true,"london":true,"lotte":true,"lotto":true,"love":true,"lpl":true,"lplfinancial":true,"ltd":true,"ltda":true,"lundbeck":true,"lupin":true,"luxe":true,"luxury":true,"macys":true,"madrid":true,"maif":true,"maison":true,"makeup":true,"man":true,"management":true,"mango":true,"market":true,"marketing":true,"markets":true,"marriott":true,"marshalls":true,"maserati":true,"mattel":true,"mba":true,"mcd":true,"mcdonalds":true,"mckinsey":true,"med":true,"media":true,"meet":true,"melbourne":true,"meme":true,"memorial":true,"men":true,"menu":true,"meo":true,"metlife":true,"miami":true,"microsoft":true,"mini":true,"mint":true,"mit":true,"mitsubishi":true,"mlb":true,"mls":true,"mma":true,"mnet":true,"mobily":true,"moda":true,"moe":true,"moi":true,"mom":true,"monash":true,"money":true,"monster":true,"montblanc":true,"mopar":true,"mormon":true,"mortgage":true,"moscow":true,"moto":true,"motorcycles":true,"mov":true,"movie":true,"movistar":true,"msd":true,"mtn":true,"mtpc":true,"mtr":true,"multichoice":true,"mutual":true,"mutuelle":true,"mzansimagic":true,"nab":true,"nadex":true,"nagoya":true,"naspers":true,"nationwide":true,"natura":true,"navy":true,"nba":true,"nec":true,"netbank":true,"netflix":true,"network":true,"neustar":true,"new":true,"newholland":true,"news":true,"next":true,"nextdirect":true,"nexus":true,"nfl":true,"ngo":true,"nhk":true,"nico":true,"nike":true,"nikon":true,"ninja":true,"nissan":true,"nokia":true,"northwesternmutual":true,"norton":true,"now":true,"nowruz":true,"nowtv":true,"nra":true,"nrw":true,"ntt":true,"nyc":true,"obi":true,"observer":true,"off":true,"office":true,"okinawa":true,"olayan":true,"olayangroup":true,"oldnavy":true,"ollo":true,"omega":true,"one":true,"ong":true,"onl":true,"online":true,"onyourside":true,"ooo":true,"open":true,"oracle":true,"orange":true,"organic":true,"orientexpress":true,"osaka":true,"otsuka":true,"ott":true,"ovh":true,"page":true,"pamperedchef":true,"panasonic":true,"panerai":true,"paris":true,"pars":true,"partners":true,"parts":true,"party":true,"passagens":true,"pay":true,"payu":true,"pccw":true,"pet":true,"pfizer":true,"pharmacy":true,"philips":true,"photo":true,"photography":true,"photos":true,"physio":true,"piaget":true,"pics":true,"pictet":true,"pictures":true,"pid":true,"pin":true,"ping":true,"pink":true,"pioneer":true,"pizza":true,"place":true,"play":true,"playstation":true,"plumbing":true,"plus":true,"pnc":true,"pohl":true,"poker":true,"politie":true,"porn":true,"pramerica":true,"praxi":true,"press":true,"prime":true,"prod":true,"productions":true,"prof":true,"progressive":true,"promo":true,"properties":true,"property":true,"protection":true,"pru":true,"prudential":true,"pub":true,"qpon":true,"quebec":true,"quest":true,"qvc":true,"racing":true,"raid":true,"read":true,"realestate":true,"realtor":true,"realty":true,"recipes":true,"red":true,"redstone":true,"redumbrella":true,"rehab":true,"reise":true,"reisen":true,"reit":true,"reliance":true,"ren":true,"rent":true,"rentals":true,"repair":true,"report":true,"republican":true,"rest":true,"restaurant":true,"review":true,"reviews":true,"rexroth":true,"rich":true,"richardli":true,"ricoh":true,"rightathome":true,"ril":true,"rio":true,"rip":true,"rocher":true,"rocks":true,"rodeo":true,"rogers":true,"room":true,"rsvp":true,"ruhr":true,"run":true,"rwe":true,"ryukyu":true,"saarland":true,"safe":true,"safety":true,"sakura":true,"sale":true,"salon":true,"samsclub":true,"samsung":true,"sandvik":true,"sandvikcoromant":true,"sanofi":true,"sap":true,"sapo":true,"sarl":true,"sas":true,"save":true,"saxo":true,"sbi":true,"sbs":true,"sca":true,"scb":true,"schaeffler":true,"schmidt":true,"scholarships":true,"school":true,"schule":true,"schwarz":true,"science":true,"scjohnson":true,"scor":true,"scot":true,"seat":true,"secure":true,"security":true,"seek":true,"sener":true,"services":true,"ses":true,"seven":true,"sew":true,"sex":true,"sexy":true,"sfr":true,"shangrila":true,"sharp":true,"shaw":true,"shell":true,"shia":true,"shiksha":true,"shoes":true,"shouji":true,"show":true,"showtime":true,"shriram":true,"silk":true,"sina":true,"singles":true,"site":true,"ski":true,"skin":true,"sky":true,"skype":true,"sling":true,"smart":true,"smile":true,"sncf":true,"soccer":true,"social":true,"softbank":true,"software":true,"sohu":true,"solar":true,"solutions":true,"song":true,"sony":true,"soy":true,"space":true,"spiegel":true,"spot":true,"spreadbetting":true,"srl":true,"srt":true,"stada":true,"staples":true,"star":true,"starhub":true,"statebank":true,"statefarm":true,"statoil":true,"stc":true,"stcgroup":true,"stockholm":true,"storage":true,"store":true,"studio":true,"study":true,"style":true,"sucks":true,"supersport":true,"supplies":true,"supply":true,"support":true,"surf":true,"surgery":true,"suzuki":true,"swatch":true,"swiftcover":true,"swiss":true,"sydney":true,"symantec":true,"systems":true,"tab":true,"taipei":true,"talk":true,"taobao":true,"target":true,"tatamotors":true,"tatar":true,"tattoo":true,"tax":true,"taxi":true,"tci":true,"tdk":true,"team":true,"tech":true,"technology":true,"telecity":true,"telefonica":true,"temasek":true,"tennis":true,"teva":true,"thd":true,"theater":true,"theatre":true,"theguardian":true,"tiaa":true,"tickets":true,"tienda":true,"tiffany":true,"tips":true,"tires":true,"tirol":true,"tjmaxx":true,"tjx":true,"tkmaxx":true,"tmall":true,"today":true,"tokyo":true,"tools":true,"top":true,"toray":true,"toshiba":true,"total":true,"tours":true,"town":true,"toyota":true,"toys":true,"trade":true,"trading":true,"training":true,"travelchannel":true,"travelers":true,"travelersinsurance":true,"trust":true,"trv":true,"tube":true,"tui":true,"tunes":true,"tushu":true,"tvs":true,"ubank":true,"ubs":true,"uconnect":true,"university":true,"uno":true,"uol":true,"ups":true,"vacations":true,"vana":true,"vanguard":true,"vegas":true,"ventures":true,"verisign":true,"versicherung":true,"vet":true,"viajes":true,"video":true,"vig":true,"viking":true,"villas":true,"vin":true,"vip":true,"virgin":true,"visa":true,"vision":true,"vista":true,"vistaprint":true,"viva":true,"vivo":true,"vlaanderen":true,"vodka":true,"volkswagen":true,"vote":true,"voting":true,"voto":true,"voyage":true,"vuelos":true,"wales":true,"walmart":true,"walter":true,"wang":true,"wanggou":true,"warman":true,"watch":true,"watches":true,"weather":true,"weatherchannel":true,"webcam":true,"weber":true,"website":true,"wed":true,"wedding":true,"weibo":true,"weir":true,"whoswho":true,"wien":true,"wiki":true,"williamhill":true,"win":true,"windows":true,"wine":true,"winners":true,"wme":true,"wolterskluwer":true,"woodside":true,"work":true,"works":true,"world":true,"wtc":true,"wtf":true,"xbox":true,"xerox":true,"xfinity":true,"xihuan":true,"xin":true,"xn--11b4c3d":true,"xn--1ck2e1b":true,"xn--1qqw23a":true,"xn--30rr7y":true,"xn--3bst00m":true,"xn--3ds443g":true,"xn--3oq18vl8pn36a":true,"xn--3pxu8k":true,"xn--42c2d9a":true,"xn--45q11c":true,"xn--4gbrim":true,"xn--4gq48lf9j":true,"xn--55qw42g":true,"xn--55qx5d":true,"xn--5su34j936bgsg":true,"xn--5tzm5g":true,"xn--6frz82g":true,"xn--6qq986b3xl":true,"xn--80adxhks":true,"xn--80asehdb":true,"xn--80aswg":true,"xn--8y0a063a":true,"xn--9dbq2a":true,"xn--9et52u":true,"xn--9krt00a":true,"xn--b4w605ferd":true,"xn--bck1b9a5dre4c":true,"xn--c1avg":true,"xn--c2br7g":true,"xn--cck2b3b":true,"xn--cg4bki":true,"xn--czr694b":true,"xn--czrs0t":true,"xn--czru2d":true,"xn--d1acj3b":true,"xn--eckvdtc9d":true,"xn--efvy88h":true,"xn--estv75g":true,"xn--fct429k":true,"xn--fhbei":true,"xn--fiq228c5hs":true,"xn--fiq64b":true,"xn--fjq720a":true,"xn--flw351e":true,"xn--fzys8d69uvgm":true,"xn--g2xx48c":true,"xn--gckr3f0f":true,"xn--hxt814e":true,"xn--i1b6b1a6a2e":true,"xn--imr513n":true,"xn--io0a7i":true,"xn--j1aef":true,"xn--jlq61u9w7b":true,"xn--jvr189m":true,"xn--kcrx77d1x4a":true,"xn--kpu716f":true,"xn--kput3i":true,"xn--mgba3a3ejt":true,"xn--mgba7c0bbn0a":true,"xn--mgbaakc7dvf":true,"xn--mgbab2bd":true,"xn--mgbb9fbpob":true,"xn--mgbca7dzdo":true,"xn--mgbt3dhd":true,"xn--mk1bu44c":true,"xn--mxtq1m":true,"xn--ngbc5azd":true,"xn--ngbe9e0a":true,"xn--nqv7f":true,"xn--nqv7fs00ema":true,"xn--nyqy26a":true,"xn--p1acf":true,"xn--pbt977c":true,"xn--pssy2u":true,"xn--q9jyb4c":true,"xn--qcka1pmc":true,"xn--rhqv96g":true,"xn--rovu88b":true,"xn--ses554g":true,"xn--t60b56a":true,"xn--tckwe":true,"xn--unup4y":true,"xn--vermgensberater-ctb":true,"xn--vermgensberatung-pwb":true,"xn--vhquv":true,"xn--vuq861b":true,"xn--w4r85el8fhu5dnra":true,"xn--w4rs40l":true,"xn--xhq521b":true,"xn--zfr164b":true,"xperia":true,"xyz":true,"yachts":true,"yahoo":true,"yamaxun":true,"yandex":true,"yodobashi":true,"yoga":true,"yokohama":true,"you":true,"youtube":true,"yun":true,"zappos":true,"zara":true,"zero":true,"zip":true,"zippo":true,"zone":true,"zuerich":true,"cloudfront.net":true,"ap-northeast-1.compute.amazonaws.com":true,"ap-southeast-1.compute.amazonaws.com":true,"ap-southeast-2.compute.amazonaws.com":true,"cn-north-1.compute.amazonaws.cn":true,"compute.amazonaws.cn":true,"compute.amazonaws.com":true,"compute-1.amazonaws.com":true,"eu-west-1.compute.amazonaws.com":true,"eu-central-1.compute.amazonaws.com":true,"sa-east-1.compute.amazonaws.com":true,"us-east-1.amazonaws.com":true,"us-gov-west-1.compute.amazonaws.com":true,"us-west-1.compute.amazonaws.com":true,"us-west-2.compute.amazonaws.com":true,"z-1.compute-1.amazonaws.com":true,"z-2.compute-1.amazonaws.com":true,"elasticbeanstalk.com":true,"elb.amazonaws.com":true,"s3.amazonaws.com":true,"s3-ap-northeast-1.amazonaws.com":true,"s3-ap-southeast-1.amazonaws.com":true,"s3-ap-southeast-2.amazonaws.com":true,"s3-external-1.amazonaws.com":true,"s3-external-2.amazonaws.com":true,"s3-fips-us-gov-west-1.amazonaws.com":true,"s3-eu-central-1.amazonaws.com":true,"s3-eu-west-1.amazonaws.com":true,"s3-sa-east-1.amazonaws.com":true,"s3-us-gov-west-1.amazonaws.com":true,"s3-us-west-1.amazonaws.com":true,"s3-us-west-2.amazonaws.com":true,"s3.cn-north-1.amazonaws.com.cn":true,"s3.eu-central-1.amazonaws.com":true,"betainabox.com":true,"ae.org":true,"ar.com":true,"br.com":true,"cn.com":true,"com.de":true,"com.se":true,"de.com":true,"eu.com":true,"gb.com":true,"gb.net":true,"hu.com":true,"hu.net":true,"jp.net":true,"jpn.com":true,"kr.com":true,"mex.com":true,"no.com":true,"qc.com":true,"ru.com":true,"sa.com":true,"se.com":true,"se.net":true,"uk.com":true,"uk.net":true,"us.com":true,"uy.com":true,"za.bz":true,"za.com":true,"africa.com":true,"gr.com":true,"in.net":true,"us.org":true,"co.com":true,"c.la":true,"cloudcontrolled.com":true,"cloudcontrolapp.com":true,"co.ca":true,"c.cdn77.org":true,"cdn77-ssl.net":true,"r.cdn77.net":true,"rsc.cdn77.org":true,"ssl.origin.cdn77-secure.org":true,"co.nl":true,"co.no":true,"*.platform.sh":true,"cupcake.is":true,"dreamhosters.com":true,"duckdns.org":true,"dyndns-at-home.com":true,"dyndns-at-work.com":true,"dyndns-blog.com":true,"dyndns-free.com":true,"dyndns-home.com":true,"dyndns-ip.com":true,"dyndns-mail.com":true,"dyndns-office.com":true,"dyndns-pics.com":true,"dyndns-remote.com":true,"dyndns-server.com":true,"dyndns-web.com":true,"dyndns-wiki.com":true,"dyndns-work.com":true,"dyndns.biz":true,"dyndns.info":true,"dyndns.org":true,"dyndns.tv":true,"at-band-camp.net":true,"ath.cx":true,"barrel-of-knowledge.info":true,"barrell-of-knowledge.info":true,"better-than.tv":true,"blogdns.com":true,"blogdns.net":true,"blogdns.org":true,"blogsite.org":true,"boldlygoingnowhere.org":true,"broke-it.net":true,"buyshouses.net":true,"cechire.com":true,"dnsalias.com":true,"dnsalias.net":true,"dnsalias.org":true,"dnsdojo.com":true,"dnsdojo.net":true,"dnsdojo.org":true,"does-it.net":true,"doesntexist.com":true,"doesntexist.org":true,"dontexist.com":true,"dontexist.net":true,"dontexist.org":true,"doomdns.com":true,"doomdns.org":true,"dvrdns.org":true,"dyn-o-saur.com":true,"dynalias.com":true,"dynalias.net":true,"dynalias.org":true,"dynathome.net":true,"dyndns.ws":true,"endofinternet.net":true,"endofinternet.org":true,"endoftheinternet.org":true,"est-a-la-maison.com":true,"est-a-la-masion.com":true,"est-le-patron.com":true,"est-mon-blogueur.com":true,"for-better.biz":true,"for-more.biz":true,"for-our.info":true,"for-some.biz":true,"for-the.biz":true,"forgot.her.name":true,"forgot.his.name":true,"from-ak.com":true,"from-al.com":true,"from-ar.com":true,"from-az.net":true,"from-ca.com":true,"from-co.net":true,"from-ct.com":true,"from-dc.com":true,"from-de.com":true,"from-fl.com":true,"from-ga.com":true,"from-hi.com":true,"from-ia.com":true,"from-id.com":true,"from-il.com":true,"from-in.com":true,"from-ks.com":true,"from-ky.com":true,"from-la.net":true,"from-ma.com":true,"from-md.com":true,"from-me.org":true,"from-mi.com":true,"from-mn.com":true,"from-mo.com":true,"from-ms.com":true,"from-mt.com":true,"from-nc.com":true,"from-nd.com":true,"from-ne.com":true,"from-nh.com":true,"from-nj.com":true,"from-nm.com":true,"from-nv.com":true,"from-ny.net":true,"from-oh.com":true,"from-ok.com":true,"from-or.com":true,"from-pa.com":true,"from-pr.com":true,"from-ri.com":true,"from-sc.com":true,"from-sd.com":true,"from-tn.com":true,"from-tx.com":true,"from-ut.com":true,"from-va.com":true,"from-vt.com":true,"from-wa.com":true,"from-wi.com":true,"from-wv.com":true,"from-wy.com":true,"ftpaccess.cc":true,"fuettertdasnetz.de":true,"game-host.org":true,"game-server.cc":true,"getmyip.com":true,"gets-it.net":true,"go.dyndns.org":true,"gotdns.com":true,"gotdns.org":true,"groks-the.info":true,"groks-this.info":true,"ham-radio-op.net":true,"here-for-more.info":true,"hobby-site.com":true,"hobby-site.org":true,"home.dyndns.org":true,"homedns.org":true,"homeftp.net":true,"homeftp.org":true,"homeip.net":true,"homelinux.com":true,"homelinux.net":true,"homelinux.org":true,"homeunix.com":true,"homeunix.net":true,"homeunix.org":true,"iamallama.com":true,"in-the-band.net":true,"is-a-anarchist.com":true,"is-a-blogger.com":true,"is-a-bookkeeper.com":true,"is-a-bruinsfan.org":true,"is-a-bulls-fan.com":true,"is-a-candidate.org":true,"is-a-caterer.com":true,"is-a-celticsfan.org":true,"is-a-chef.com":true,"is-a-chef.net":true,"is-a-chef.org":true,"is-a-conservative.com":true,"is-a-cpa.com":true,"is-a-cubicle-slave.com":true,"is-a-democrat.com":true,"is-a-designer.com":true,"is-a-doctor.com":true,"is-a-financialadvisor.com":true,"is-a-geek.com":true,"is-a-geek.net":true,"is-a-geek.org":true,"is-a-green.com":true,"is-a-guru.com":true,"is-a-hard-worker.com":true,"is-a-hunter.com":true,"is-a-knight.org":true,"is-a-landscaper.com":true,"is-a-lawyer.com":true,"is-a-liberal.com":true,"is-a-libertarian.com":true,"is-a-linux-user.org":true,"is-a-llama.com":true,"is-a-musician.com":true,"is-a-nascarfan.com":true,"is-a-nurse.com":true,"is-a-painter.com":true,"is-a-patsfan.org":true,"is-a-personaltrainer.com":true,"is-a-photographer.com":true,"is-a-player.com":true,"is-a-republican.com":true,"is-a-rockstar.com":true,"is-a-socialist.com":true,"is-a-soxfan.org":true,"is-a-student.com":true,"is-a-teacher.com":true,"is-a-techie.com":true,"is-a-therapist.com":true,"is-an-accountant.com":true,"is-an-actor.com":true,"is-an-actress.com":true,"is-an-anarchist.com":true,"is-an-artist.com":true,"is-an-engineer.com":true,"is-an-entertainer.com":true,"is-by.us":true,"is-certified.com":true,"is-found.org":true,"is-gone.com":true,"is-into-anime.com":true,"is-into-cars.com":true,"is-into-cartoons.com":true,"is-into-games.com":true,"is-leet.com":true,"is-lost.org":true,"is-not-certified.com":true,"is-saved.org":true,"is-slick.com":true,"is-uberleet.com":true,"is-very-bad.org":true,"is-very-evil.org":true,"is-very-good.org":true,"is-very-nice.org":true,"is-very-sweet.org":true,"is-with-theband.com":true,"isa-geek.com":true,"isa-geek.net":true,"isa-geek.org":true,"isa-hockeynut.com":true,"issmarterthanyou.com":true,"isteingeek.de":true,"istmein.de":true,"kicks-ass.net":true,"kicks-ass.org":true,"knowsitall.info":true,"land-4-sale.us":true,"lebtimnetz.de":true,"leitungsen.de":true,"likes-pie.com":true,"likescandy.com":true,"merseine.nu":true,"mine.nu":true,"misconfused.org":true,"mypets.ws":true,"myphotos.cc":true,"neat-url.com":true,"office-on-the.net":true,"on-the-web.tv":true,"podzone.net":true,"podzone.org":true,"readmyblog.org":true,"saves-the-whales.com":true,"scrapper-site.net":true,"scrapping.cc":true,"selfip.biz":true,"selfip.com":true,"selfip.info":true,"selfip.net":true,"selfip.org":true,"sells-for-less.com":true,"sells-for-u.com":true,"sells-it.net":true,"sellsyourhome.org":true,"servebbs.com":true,"servebbs.net":true,"servebbs.org":true,"serveftp.net":true,"serveftp.org":true,"servegame.org":true,"shacknet.nu":true,"simple-url.com":true,"space-to-rent.com":true,"stuff-4-sale.org":true,"stuff-4-sale.us":true,"teaches-yoga.com":true,"thruhere.net":true,"traeumtgerade.de":true,"webhop.biz":true,"webhop.info":true,"webhop.net":true,"webhop.org":true,"worse-than.tv":true,"writesthisblog.com":true,"eu.org":true,"al.eu.org":true,"asso.eu.org":true,"at.eu.org":true,"au.eu.org":true,"be.eu.org":true,"bg.eu.org":true,"ca.eu.org":true,"cd.eu.org":true,"ch.eu.org":true,"cn.eu.org":true,"cy.eu.org":true,"cz.eu.org":true,"de.eu.org":true,"dk.eu.org":true,"edu.eu.org":true,"ee.eu.org":true,"es.eu.org":true,"fi.eu.org":true,"fr.eu.org":true,"gr.eu.org":true,"hr.eu.org":true,"hu.eu.org":true,"ie.eu.org":true,"il.eu.org":true,"in.eu.org":true,"int.eu.org":true,"is.eu.org":true,"it.eu.org":true,"jp.eu.org":true,"kr.eu.org":true,"lt.eu.org":true,"lu.eu.org":true,"lv.eu.org":true,"mc.eu.org":true,"me.eu.org":true,"mk.eu.org":true,"mt.eu.org":true,"my.eu.org":true,"net.eu.org":true,"ng.eu.org":true,"nl.eu.org":true,"no.eu.org":true,"nz.eu.org":true,"paris.eu.org":true,"pl.eu.org":true,"pt.eu.org":true,"q-a.eu.org":true,"ro.eu.org":true,"ru.eu.org":true,"se.eu.org":true,"si.eu.org":true,"sk.eu.org":true,"tr.eu.org":true,"uk.eu.org":true,"us.eu.org":true,"a.ssl.fastly.net":true,"b.ssl.fastly.net":true,"global.ssl.fastly.net":true,"a.prod.fastly.net":true,"global.prod.fastly.net":true,"firebaseapp.com":true,"flynnhub.com":true,"service.gov.uk":true,"github.io":true,"githubusercontent.com":true,"ro.com":true,"appspot.com":true,"blogspot.ae":true,"blogspot.al":true,"blogspot.am":true,"blogspot.ba":true,"blogspot.be":true,"blogspot.bg":true,"blogspot.bj":true,"blogspot.ca":true,"blogspot.cf":true,"blogspot.ch":true,"blogspot.cl":true,"blogspot.co.at":true,"blogspot.co.id":true,"blogspot.co.il":true,"blogspot.co.ke":true,"blogspot.co.nz":true,"blogspot.co.uk":true,"blogspot.co.za":true,"blogspot.com":true,"blogspot.com.ar":true,"blogspot.com.au":true,"blogspot.com.br":true,"blogspot.com.by":true,"blogspot.com.co":true,"blogspot.com.cy":true,"blogspot.com.ee":true,"blogspot.com.eg":true,"blogspot.com.es":true,"blogspot.com.mt":true,"blogspot.com.ng":true,"blogspot.com.tr":true,"blogspot.com.uy":true,"blogspot.cv":true,"blogspot.cz":true,"blogspot.de":true,"blogspot.dk":true,"blogspot.fi":true,"blogspot.fr":true,"blogspot.gr":true,"blogspot.hk":true,"blogspot.hr":true,"blogspot.hu":true,"blogspot.ie":true,"blogspot.in":true,"blogspot.is":true,"blogspot.it":true,"blogspot.jp":true,"blogspot.kr":true,"blogspot.li":true,"blogspot.lt":true,"blogspot.lu":true,"blogspot.md":true,"blogspot.mk":true,"blogspot.mr":true,"blogspot.mx":true,"blogspot.my":true,"blogspot.nl":true,"blogspot.no":true,"blogspot.pe":true,"blogspot.pt":true,"blogspot.qa":true,"blogspot.re":true,"blogspot.ro":true,"blogspot.rs":true,"blogspot.ru":true,"blogspot.se":true,"blogspot.sg":true,"blogspot.si":true,"blogspot.sk":true,"blogspot.sn":true,"blogspot.td":true,"blogspot.tw":true,"blogspot.ug":true,"blogspot.vn":true,"codespot.com":true,"googleapis.com":true,"googlecode.com":true,"pagespeedmobilizer.com":true,"withgoogle.com":true,"withyoutube.com":true,"herokuapp.com":true,"herokussl.com":true,"iki.fi":true,"biz.at":true,"info.at":true,"co.pl":true,"azurewebsites.net":true,"azure-mobile.net":true,"cloudapp.net":true,"bmoattachments.org":true,"4u.com":true,"nfshost.com":true,"nyc.mn":true,"nid.io":true,"operaunite.com":true,"outsystemscloud.com":true,"art.pl":true,"gliwice.pl":true,"krakow.pl":true,"poznan.pl":true,"wroc.pl":true,"zakopane.pl":true,"pantheon.io":true,"gotpantheon.com":true,"priv.at":true,"qa2.com":true,"rhcloud.com":true,"sandcats.io":true,"biz.ua":true,"co.ua":true,"pp.ua":true,"sinaapp.com":true,"vipsinaapp.com":true,"1kapp.com":true,"gda.pl":true,"gdansk.pl":true,"gdynia.pl":true,"med.pl":true,"sopot.pl":true,"hk.com":true,"hk.org":true,"ltd.hk":true,"inc.hk":true,"yolasite.com":true,"za.net":true,"za.org":true});
+
+// END of automatically generated file
diff --git a/deps/npm/node_modules/tough-cookie/lib/store.js b/deps/npm/node_modules/request/node_modules/tough-cookie/lib/store.js
similarity index 100%
rename from deps/npm/node_modules/tough-cookie/lib/store.js
rename to deps/npm/node_modules/request/node_modules/tough-cookie/lib/store.js
diff --git a/deps/npm/node_modules/request/node_modules/tough-cookie/package.json b/deps/npm/node_modules/request/node_modules/tough-cookie/package.json
new file mode 100644
index 00000000000000..4a6920dd5aba20
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/tough-cookie/package.json
@@ -0,0 +1,90 @@
+{
+  "author": {
+    "name": "Jeremy Stashewsky",
+    "email": "jstashewsky@salesforce.com"
+  },
+  "contributors": [
+    {
+      "name": "Alexander Savin"
+    },
+    {
+      "name": "Ian Livingstone"
+    },
+    {
+      "name": "Ivan Nikulin"
+    },
+    {
+      "name": "Lalit Kapoor"
+    },
+    {
+      "name": "Sam Thompson"
+    },
+    {
+      "name": "Sebastian Mayr"
+    }
+  ],
+  "license": "BSD-3-Clause",
+  "name": "tough-cookie",
+  "description": "RFC6265 Cookies and Cookie Jar for node.js",
+  "keywords": [
+    "HTTP",
+    "cookie",
+    "cookies",
+    "set-cookie",
+    "cookiejar",
+    "jar",
+    "RFC6265",
+    "RFC2965"
+  ],
+  "version": "2.2.0",
+  "homepage": "https://github.com/SalesforceEng/tough-cookie",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/SalesforceEng/tough-cookie.git"
+  },
+  "bugs": {
+    "url": "https://github.com/SalesforceEng/tough-cookie/issues"
+  },
+  "main": "./lib/cookie",
+  "files": [
+    "lib"
+  ],
+  "scripts": {
+    "suffixup": "curl -o public_suffix_list.dat https://publicsuffix.org/list/public_suffix_list.dat && ./generate-pubsuffix.js",
+    "test": "vows test/*_test.js"
+  },
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "devDependencies": {
+    "async": "^1.4.2",
+    "vows": "^0.8.1"
+  },
+  "gitHead": "fb1456177c9b51445afa34656eb314c70c2adcd2",
+  "_id": "tough-cookie@2.2.0",
+  "_shasum": "d4ce661075e5fddb7f20341d3f9931a6fbbadde0",
+  "_from": "tough-cookie@>=2.2.0 <2.3.0",
+  "_npmVersion": "2.11.2",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "name": "jstash",
+    "email": "jstash@gmail.com"
+  },
+  "dist": {
+    "shasum": "d4ce661075e5fddb7f20341d3f9931a6fbbadde0",
+    "tarball": "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
+  },
+  "maintainers": [
+    {
+      "name": "jstash",
+      "email": "jeremy@goinstant.com"
+    },
+    {
+      "name": "goinstant",
+      "email": "services@goinstant.com"
+    }
+  ],
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz",
+  "readme": "ERROR: No README data found!"
+}
diff --git a/deps/npm/node_modules/tunnel-agent/LICENSE b/deps/npm/node_modules/request/node_modules/tunnel-agent/LICENSE
similarity index 100%
rename from deps/npm/node_modules/tunnel-agent/LICENSE
rename to deps/npm/node_modules/request/node_modules/tunnel-agent/LICENSE
diff --git a/deps/npm/node_modules/tunnel-agent/README.md b/deps/npm/node_modules/request/node_modules/tunnel-agent/README.md
similarity index 100%
rename from deps/npm/node_modules/tunnel-agent/README.md
rename to deps/npm/node_modules/request/node_modules/tunnel-agent/README.md
diff --git a/deps/npm/node_modules/tunnel-agent/index.js b/deps/npm/node_modules/request/node_modules/tunnel-agent/index.js
similarity index 100%
rename from deps/npm/node_modules/tunnel-agent/index.js
rename to deps/npm/node_modules/request/node_modules/tunnel-agent/index.js
diff --git a/deps/npm/node_modules/request/node_modules/tunnel-agent/package.json b/deps/npm/node_modules/request/node_modules/tunnel-agent/package.json
new file mode 100644
index 00000000000000..265089b648b618
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/tunnel-agent/package.json
@@ -0,0 +1,30 @@
+{
+  "author": {
+    "name": "Mikeal Rogers",
+    "email": "mikeal.rogers@gmail.com",
+    "url": "http://www.futurealoof.com"
+  },
+  "name": "tunnel-agent",
+  "description": "HTTP proxy tunneling agent. Formerly part of mikeal/request, now a standalone module.",
+  "version": "0.4.1",
+  "repository": {
+    "url": "git+https://github.com/mikeal/tunnel-agent.git"
+  },
+  "main": "index.js",
+  "dependencies": {},
+  "devDependencies": {},
+  "optionalDependencies": {},
+  "engines": {
+    "node": "*"
+  },
+  "readme": "tunnel-agent\n============\n\nHTTP proxy tunneling agent. Formerly part of mikeal/request, now a standalone module.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/mikeal/tunnel-agent/issues"
+  },
+  "homepage": "https://github.com/mikeal/tunnel-agent#readme",
+  "_id": "tunnel-agent@0.4.1",
+  "_shasum": "bbeecff4d679ce753db9462761a88dfcec3c5ab3",
+  "_resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz",
+  "_from": "tunnel-agent@>=0.4.1 <0.5.0"
+}
diff --git a/deps/npm/node_modules/request/package.json b/deps/npm/node_modules/request/package.json
index 3653b72c6ec3e3..69c6f1ba1c8e7d 100644
--- a/deps/npm/node_modules/request/package.json
+++ b/deps/npm/node_modules/request/package.json
@@ -1,101 +1,89 @@
 {
-  "_args": [
-    [
-      "request@2",
-      "/Users/rebecca/code/npm/node_modules/node-gyp"
-    ]
-  ],
-  "_from": "request@>=2.0.0 <3.0.0",
-  "_id": "request@2.64.0",
-  "_inCache": true,
-  "_location": "/request",
-  "_nodeVersion": "4.1.0",
-  "_npmUser": {
-    "email": "simeonvelichkov@gmail.com",
-    "name": "simov"
-  },
-  "_npmVersion": "2.14.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "request",
-    "raw": "request@2",
-    "rawSpec": "2",
-    "scope": null,
-    "spec": ">=2.0.0 <3.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/node-gyp",
-    "/npm-registry-client"
+  "name": "request",
+  "description": "Simplified HTTP request client.",
+  "tags": [
+    "http",
+    "simple",
+    "util",
+    "utility"
   ],
-  "_resolved": "https://registry.npmjs.org/request/-/request-2.64.0.tgz",
-  "_shasum": "96a582423ce9b4b5c34e9b232e480173f14ba608",
-  "_shrinkwrap": null,
-  "_spec": "request@2",
-  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp",
+  "version": "2.65.0",
   "author": {
-    "email": "mikeal.rogers@gmail.com",
-    "name": "Mikeal Rogers"
+    "name": "Mikeal Rogers",
+    "email": "mikeal.rogers@gmail.com"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/request/request.git"
   },
   "bugs": {
     "url": "http://github.com/request/request/issues"
   },
+  "license": "Apache-2.0",
+  "engines": {
+    "node": ">=0.8.0"
+  },
+  "main": "index.js",
   "dependencies": {
-    "aws-sign2": "~0.5.0",
     "bl": "~1.0.0",
     "caseless": "~0.11.0",
-    "combined-stream": "~1.0.1",
     "extend": "~3.0.0",
-    "forever-agent": "~0.6.0",
-    "form-data": "~1.0.0-rc1",
-    "har-validator": "^1.6.1",
-    "hawk": "~3.1.0",
+    "forever-agent": "~0.6.1",
+    "form-data": "~1.0.0-rc3",
+    "json-stringify-safe": "~5.0.1",
+    "mime-types": "~2.1.7",
+    "node-uuid": "~1.4.3",
+    "qs": "~5.2.0",
+    "tunnel-agent": "~0.4.1",
+    "tough-cookie": "~2.2.0",
     "http-signature": "~0.11.0",
-    "isstream": "~0.1.1",
-    "json-stringify-safe": "~5.0.0",
-    "mime-types": "~2.1.2",
-    "node-uuid": "~1.4.0",
     "oauth-sign": "~0.8.0",
-    "qs": "~5.1.0",
+    "hawk": "~3.1.0",
+    "aws-sign2": "~0.6.0",
     "stringstream": "~0.0.4",
-    "tough-cookie": ">=0.12.0",
-    "tunnel-agent": "~0.4.0"
+    "combined-stream": "~1.0.5",
+    "isstream": "~0.1.2",
+    "har-validator": "~2.0.2"
+  },
+  "scripts": {
+    "test": "npm run lint && npm run test-ci && npm run test-browser",
+    "test-ci": "taper tests/test-*.js",
+    "test-cov": "istanbul cover tape tests/test-*.js",
+    "test-browser": "node tests/browser/start.js",
+    "lint": "eslint lib/ *.js tests/ && echo Lint passed."
   },
-  "description": "Simplified HTTP request client.",
   "devDependencies": {
-    "bluebird": "~2.9.21",
-    "browserify": "~5.9.1",
-    "browserify-istanbul": "~0.1.3",
-    "buffer-equal": "0.0.1",
-    "codecov.io": "~0.1.2",
-    "coveralls": "~2.11.2",
+    "browserify-istanbul": "^0.1.5",
+    "browserify": "^11.2.0",
+    "buffer-equal": "^0.0.1",
+    "codecov.io": "^0.1.6",
+    "coveralls": "^2.11.4",
     "eslint": "0.18.0",
-    "function-bind": "~1.0.0",
-    "istanbul": "~0.3.2",
-    "karma": "~0.12.21",
-    "karma-browserify": "~3.0.1",
-    "karma-cli": "0.0.4",
-    "karma-coverage": "0.2.6",
-    "karma-phantomjs-launcher": "~0.1.4",
-    "karma-tap": "~1.0.1",
-    "rimraf": "~2.2.8",
-    "server-destroy": "~1.0.0",
-    "tape": "~3.0.0",
-    "taper": "~0.4.0"
+    "function-bind": "^1.0.2",
+    "istanbul": "^0.3.21",
+    "karma-browserify": "^4.4.0",
+    "karma": "^0.13.10",
+    "karma-cli": "^0.1.1",
+    "karma-coverage": "^0.2.6",
+    "karma-phantomjs-launcher": "^0.1.4",
+    "karma-tap": "^1.0.3",
+    "rimraf": "^2.2.8",
+    "server-destroy": "^1.0.1",
+    "tape": "^4.2.0",
+    "taper": "^0.4.0",
+    "bluebird": "^2.10.1"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "96a582423ce9b4b5c34e9b232e480173f14ba608",
-    "tarball": "http://registry.npmjs.org/request/-/request-2.64.0.tgz"
-  },
-  "engines": {
-    "node": ">=0.8.0"
-  },
-  "gitHead": "ca364485249f13c4810bb9b3952fb0fb886a93ee",
+  "gitHead": "8a7a37835c600f5006a6679aa23a0db504003ecd",
   "homepage": "https://github.com/request/request#readme",
-  "installable": true,
-  "license": "Apache-2.0",
-  "main": "index.js",
+  "_id": "request@2.65.0",
+  "_shasum": "cc1a3bc72b96254734fc34296da322f9486ddeba",
+  "_from": "request@2.65.0",
+  "_npmVersion": "2.14.3",
+  "_nodeVersion": "4.1.0",
+  "_npmUser": {
+    "name": "simov",
+    "email": "simeonvelichkov@gmail.com"
+  },
   "maintainers": [
     {
       "name": "mikeal",
@@ -114,26 +102,11 @@
       "email": "simeonvelichkov@gmail.com"
     }
   ],
-  "name": "request",
-  "optionalDependencies": {},
-  "readme": "\n# Request - Simplified HTTP client\n\n[![npm package](https://nodei.co/npm/request.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/request/)\n\n[![Build status](https://img.shields.io/travis/request/request.svg?style=flat-square)](https://travis-ci.org/request/request)\n[![Coverage](https://img.shields.io/codecov/c/github/request/request.svg?style=flat-square)](https://codecov.io/github/request/request?branch=master)\n[![Coverage](https://img.shields.io/coveralls/request/request.svg?style=flat-square)](https://coveralls.io/r/request/request)\n[![Dependency Status](https://img.shields.io/david/request/request.svg?style=flat-square)](https://david-dm.org/request/request)\n[![Gitter](https://img.shields.io/badge/gitter-join_chat-blue.svg?style=flat-square)](https://gitter.im/request/request?utm_source=badge)\n\n\n## Super simple to use\n\nRequest is designed to be the simplest way possible to make http calls. It supports HTTPS and follows redirects by default.\n\n```js\nvar request = require('request');\nrequest('http://www.google.com', function (error, response, body) {\n  if (!error && response.statusCode == 200) {\n    console.log(body) // Show the HTML for the Google homepage.\n  }\n})\n```\n\n\n## Table of contents\n\n- [Streaming](#streaming)\n- [Forms](#forms)\n- [HTTP Authentication](#http-authentication)\n- [Custom HTTP Headers](#custom-http-headers)\n- [OAuth Signing](#oauth-signing)\n- [Proxies](#proxies)\n- [Unix Domain Sockets](#unix-domain-sockets)\n- [TLS/SSL Protocol](#tlsssl-protocol)\n- [Support for HAR 1.2](#support-for-har-12)\n- [**All Available Options**](#requestoptions-callback)\n\nRequest also offers [convenience methods](#convenience-methods) like\n`request.defaults` and `request.post`, and there are\nlots of [usage examples](#examples) and several\n[debugging techniques](#debugging).\n\n\n---\n\n\n## Streaming\n\nYou can stream any response to a file stream.\n\n```js\nrequest('http://google.com/doodle.png').pipe(fs.createWriteStream('doodle.png'))\n```\n\nYou can also stream a file to a PUT or POST request. This method will also check the file extension against a mapping of file extensions to content-types (in this case `application/json`) and use the proper `content-type` in the PUT request (if the headers don’t already provide one).\n\n```js\nfs.createReadStream('file.json').pipe(request.put('http://mysite.com/obj.json'))\n```\n\nRequest can also `pipe` to itself. When doing so, `content-type` and `content-length` are preserved in the PUT headers.\n\n```js\nrequest.get('http://google.com/img.png').pipe(request.put('http://mysite.com/img.png'))\n```\n\nRequest emits a \"response\" event when a response is received. The `response` argument will be an instance of [http.IncomingMessage](http://nodejs.org/api/http.html#http_http_incomingmessage).\n\n```js\nrequest\n  .get('http://google.com/img.png')\n  .on('response', function(response) {\n    console.log(response.statusCode) // 200\n    console.log(response.headers['content-type']) // 'image/png'\n  })\n  .pipe(request.put('http://mysite.com/img.png'))\n```\n\nTo easily handle errors when streaming requests, listen to the `error` event before piping:\n\n```js\nrequest\n  .get('http://mysite.com/doodle.png')\n  .on('error', function(err) {\n    console.log(err)\n  })\n  .pipe(fs.createWriteStream('doodle.png'))\n```\n\nNow let’s get fancy.\n\n```js\nhttp.createServer(function (req, resp) {\n  if (req.url === '/doodle.png') {\n    if (req.method === 'PUT') {\n      req.pipe(request.put('http://mysite.com/doodle.png'))\n    } else if (req.method === 'GET' || req.method === 'HEAD') {\n      request.get('http://mysite.com/doodle.png').pipe(resp)\n    }\n  }\n})\n```\n\nYou can also `pipe()` from `http.ServerRequest` instances, as well as to `http.ServerResponse` instances. The HTTP method, headers, and entity-body data will be sent. Which means that, if you don't really care about security, you can do:\n\n```js\nhttp.createServer(function (req, resp) {\n  if (req.url === '/doodle.png') {\n    var x = request('http://mysite.com/doodle.png')\n    req.pipe(x)\n    x.pipe(resp)\n  }\n})\n```\n\nAnd since `pipe()` returns the destination stream in ≥ Node 0.5.x you can do one line proxying. :)\n\n```js\nreq.pipe(request('http://mysite.com/doodle.png')).pipe(resp)\n```\n\nAlso, none of this new functionality conflicts with requests previous features, it just expands them.\n\n```js\nvar r = request.defaults({'proxy':'http://localproxy.com'})\n\nhttp.createServer(function (req, resp) {\n  if (req.url === '/doodle.png') {\n    r.get('http://google.com/doodle.png').pipe(resp)\n  }\n})\n```\n\nYou can still use intermediate proxies, the requests will still follow HTTP forwards, etc.\n\n[back to top](#table-of-contents)\n\n\n---\n\n\n## Forms\n\n`request` supports `application/x-www-form-urlencoded` and `multipart/form-data` form uploads. For `multipart/related` refer to the `multipart` API.\n\n\n#### application/x-www-form-urlencoded (URL-Encoded Forms)\n\nURL-encoded forms are simple.\n\n```js\nrequest.post('http://service.com/upload', {form:{key:'value'}})\n// or\nrequest.post('http://service.com/upload').form({key:'value'})\n// or\nrequest.post({url:'http://service.com/upload', form: {key:'value'}}, function(err,httpResponse,body){ /* ... */ })\n```\n\n\n#### multipart/form-data (Multipart Form Uploads)\n\nFor `multipart/form-data` we use the [form-data](https://github.com/felixge/node-form-data) library by [@felixge](https://github.com/felixge). For the most cases, you can pass your upload form data via the `formData` option.\n\n\n```js\nvar formData = {\n  // Pass a simple key-value pair\n  my_field: 'my_value',\n  // Pass data via Buffers\n  my_buffer: new Buffer([1, 2, 3]),\n  // Pass data via Streams\n  my_file: fs.createReadStream(__dirname + '/unicycle.jpg'),\n  // Pass multiple values /w an Array\n  attachments: [\n    fs.createReadStream(__dirname + '/attachment1.jpg'),\n    fs.createReadStream(__dirname + '/attachment2.jpg')\n  ],\n  // Pass optional meta-data with an 'options' object with style: {value: DATA, options: OPTIONS}\n  // Use case: for some types of streams, you'll need to provide \"file\"-related information manually.\n  // See the `form-data` README for more information about options: https://github.com/felixge/node-form-data\n  custom_file: {\n    value:  fs.createReadStream('/dev/urandom'),\n    options: {\n      filename: 'topsecret.jpg',\n      contentType: 'image/jpg'\n    }\n  }\n};\nrequest.post({url:'http://service.com/upload', formData: formData}, function optionalCallback(err, httpResponse, body) {\n  if (err) {\n    return console.error('upload failed:', err);\n  }\n  console.log('Upload successful!  Server responded with:', body);\n});\n```\n\nFor advanced cases, you can access the form-data object itself via `r.form()`. This can be modified until the request is fired on the next cycle of the event-loop. (Note that this calling `form()` will clear the currently set form data for that request.)\n\n```js\n// NOTE: Advanced use-case, for normal use see 'formData' usage above\nvar r = request.post('http://service.com/upload', function optionalCallback(err, httpResponse, body) {...})\nvar form = r.form();\nform.append('my_field', 'my_value');\nform.append('my_buffer', new Buffer([1, 2, 3]));\nform.append('custom_file', fs.createReadStream(__dirname + '/unicycle.jpg'), {filename: 'unicycle.jpg'});\n```\nSee the [form-data README](https://github.com/felixge/node-form-data) for more information & examples.\n\n\n#### multipart/related\n\nSome variations in different HTTP implementations require a newline/CRLF before, after, or both before and after the boundary of a `multipart/related` request (using the multipart option). This has been observed in the .NET WebAPI version 4.0. You can turn on a boundary preambleCRLF or postamble by passing them as `true` to your request options.\n\n```js\n  request({\n    method: 'PUT',\n    preambleCRLF: true,\n    postambleCRLF: true,\n    uri: 'http://service.com/upload',\n    multipart: [\n      {\n        'content-type': 'application/json',\n        body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, 'content_type': 'text/plain' }}})\n      },\n      { body: 'I am an attachment' },\n      { body: fs.createReadStream('image.png') }\n    ],\n    // alternatively pass an object containing additional options\n    multipart: {\n      chunked: false,\n      data: [\n        {\n          'content-type': 'application/json',\n          body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, 'content_type': 'text/plain' }}})\n        },\n        { body: 'I am an attachment' }\n      ]\n    }\n  },\n  function (error, response, body) {\n    if (error) {\n      return console.error('upload failed:', error);\n    }\n    console.log('Upload successful!  Server responded with:', body);\n  })\n```\n\n[back to top](#table-of-contents)\n\n\n---\n\n\n## HTTP Authentication\n\n```js\nrequest.get('http://some.server.com/').auth('username', 'password', false);\n// or\nrequest.get('http://some.server.com/', {\n  'auth': {\n    'user': 'username',\n    'pass': 'password',\n    'sendImmediately': false\n  }\n});\n// or\nrequest.get('http://some.server.com/').auth(null, null, true, 'bearerToken');\n// or\nrequest.get('http://some.server.com/', {\n  'auth': {\n    'bearer': 'bearerToken'\n  }\n});\n```\n\nIf passed as an option, `auth` should be a hash containing values:\n\n- `user` || `username`\n- `pass` || `password`\n- `sendImmediately` (optional)\n- `bearer` (optional)\n\nThe method form takes parameters\n`auth(username, password, sendImmediately, bearer)`.\n\n`sendImmediately` defaults to `true`, which causes a basic or bearer\nauthentication header to be sent.  If `sendImmediately` is `false`, then\n`request` will retry with a proper authentication header after receiving a\n`401` response from the server (which must contain a `WWW-Authenticate` header\nindicating the required authentication method).\n\nNote that you can also specify basic authentication using the URL itself, as\ndetailed in [RFC 1738](http://www.ietf.org/rfc/rfc1738.txt).  Simply pass the\n`user:password` before the host with an `@` sign:\n\n```js\nvar username = 'username',\n    password = 'password',\n    url = 'http://' + username + ':' + password + '@some.server.com';\n\nrequest({url: url}, function (error, response, body) {\n   // Do more stuff with 'body' here\n});\n```\n\nDigest authentication is supported, but it only works with `sendImmediately`\nset to `false`; otherwise `request` will send basic authentication on the\ninitial request, which will probably cause the request to fail.\n\nBearer authentication is supported, and is activated when the `bearer` value is\navailable. The value may be either a `String` or a `Function` returning a\n`String`. Using a function to supply the bearer token is particularly useful if\nused in conjunction with `defaults` to allow a single function to supply the\nlast known token at the time of sending a request, or to compute one on the fly.\n\n[back to top](#table-of-contents)\n\n\n---\n\n\n## Custom HTTP Headers\n\nHTTP Headers, such as `User-Agent`, can be set in the `options` object.\nIn the example below, we call the github API to find out the number\nof stars and forks for the request repository. This requires a\ncustom `User-Agent` header as well as https.\n\n```js\nvar request = require('request');\n\nvar options = {\n  url: 'https://api.github.com/repos/request/request',\n  headers: {\n    'User-Agent': 'request'\n  }\n};\n\nfunction callback(error, response, body) {\n  if (!error && response.statusCode == 200) {\n    var info = JSON.parse(body);\n    console.log(info.stargazers_count + \" Stars\");\n    console.log(info.forks_count + \" Forks\");\n  }\n}\n\nrequest(options, callback);\n```\n\n[back to top](#table-of-contents)\n\n\n---\n\n\n## OAuth Signing\n\n[OAuth version 1.0](https://tools.ietf.org/html/rfc5849) is supported.  The\ndefault signing algorithm is\n[HMAC-SHA1](https://tools.ietf.org/html/rfc5849#section-3.4.2):\n\n```js\n// OAuth1.0 - 3-legged server side flow (Twitter example)\n// step 1\nvar qs = require('querystring')\n  , oauth =\n    { callback: 'http://mysite.com/callback/'\n    , consumer_key: CONSUMER_KEY\n    , consumer_secret: CONSUMER_SECRET\n    }\n  , url = 'https://api.twitter.com/oauth/request_token'\n  ;\nrequest.post({url:url, oauth:oauth}, function (e, r, body) {\n  // Ideally, you would take the body in the response\n  // and construct a URL that a user clicks on (like a sign in button).\n  // The verifier is only available in the response after a user has\n  // verified with twitter that they are authorizing your app.\n\n  // step 2\n  var req_data = qs.parse(body)\n  var uri = 'https://api.twitter.com/oauth/authenticate'\n    + '?' + qs.stringify({oauth_token: req_data.oauth_token})\n  // redirect the user to the authorize uri\n\n  // step 3\n  // after the user is redirected back to your server\n  var auth_data = qs.parse(body)\n    , oauth =\n      { consumer_key: CONSUMER_KEY\n      , consumer_secret: CONSUMER_SECRET\n      , token: auth_data.oauth_token\n      , token_secret: req_data.oauth_token_secret\n      , verifier: auth_data.oauth_verifier\n      }\n    , url = 'https://api.twitter.com/oauth/access_token'\n    ;\n  request.post({url:url, oauth:oauth}, function (e, r, body) {\n    // ready to make signed requests on behalf of the user\n    var perm_data = qs.parse(body)\n      , oauth =\n        { consumer_key: CONSUMER_KEY\n        , consumer_secret: CONSUMER_SECRET\n        , token: perm_data.oauth_token\n        , token_secret: perm_data.oauth_token_secret\n        }\n      , url = 'https://api.twitter.com/1.1/users/show.json'\n      , qs =\n        { screen_name: perm_data.screen_name\n        , user_id: perm_data.user_id\n        }\n      ;\n    request.get({url:url, oauth:oauth, qs:qs, json:true}, function (e, r, user) {\n      console.log(user)\n    })\n  })\n})\n```\n\nFor [RSA-SHA1 signing](https://tools.ietf.org/html/rfc5849#section-3.4.3), make\nthe following changes to the OAuth options object:\n* Pass `signature_method : 'RSA-SHA1'`\n* Instead of `consumer_secret`, specify a `private_key` string in\n  [PEM format](http://how2ssl.com/articles/working_with_pem_files/)\n\nFor [PLAINTEXT signing](http://oauth.net/core/1.0/#anchor22), make\nthe following changes to the OAuth options object:\n* Pass `signature_method : 'PLAINTEXT'`\n\nTo send OAuth parameters via query params or in a post body as described in The\n[Consumer Request Parameters](http://oauth.net/core/1.0/#consumer_req_param)\nsection of the oauth1 spec:\n* Pass `transport_method : 'query'` or `transport_method : 'body'` in the OAuth\n  options object.\n* `transport_method` defaults to `'header'`\n\nTo use [Request Body Hash](https://oauth.googlecode.com/svn/spec/ext/body_hash/1.0/oauth-bodyhash.html) you can either\n* Manually generate the body hash and pass it as a string `body_hash: '...'`\n* Automatically generate the body hash by passing `body_hash: true`\n\n[back to top](#table-of-contents)\n\n\n---\n\n\n## Proxies\n\nIf you specify a `proxy` option, then the request (and any subsequent\nredirects) will be sent via a connection to the proxy server.\n\nIf your endpoint is an `https` url, and you are using a proxy, then\nrequest will send a `CONNECT` request to the proxy server *first*, and\nthen use the supplied connection to connect to the endpoint.\n\nThat is, first it will make a request like:\n\n```\nHTTP/1.1 CONNECT endpoint-server.com:80\nHost: proxy-server.com\nUser-Agent: whatever user agent you specify\n```\n\nand then the proxy server make a TCP connection to `endpoint-server`\non port `80`, and return a response that looks like:\n\n```\nHTTP/1.1 200 OK\n```\n\nAt this point, the connection is left open, and the client is\ncommunicating directly with the `endpoint-server.com` machine.\n\nSee [the wikipedia page on HTTP Tunneling](http://en.wikipedia.org/wiki/HTTP_tunnel)\nfor more information.\n\nBy default, when proxying `http` traffic, request will simply make a\nstandard proxied `http` request.  This is done by making the `url`\nsection of the initial line of the request a fully qualified url to\nthe endpoint.\n\nFor example, it will make a single request that looks like:\n\n```\nHTTP/1.1 GET http://endpoint-server.com/some-url\nHost: proxy-server.com\nOther-Headers: all go here\n\nrequest body or whatever\n```\n\nBecause a pure \"http over http\" tunnel offers no additional security\nor other features, it is generally simpler to go with a\nstraightforward HTTP proxy in this case.  However, if you would like\nto force a tunneling proxy, you may set the `tunnel` option to `true`.\n\nYou can also make a standard proxied `http` request by explicitly setting\n`tunnel : false`, but **note that this will allow the proxy to see the traffic\nto/from the destination server**.\n\nIf you are using a tunneling proxy, you may set the\n`proxyHeaderWhiteList` to share certain headers with the proxy.\n\nYou can also set the `proxyHeaderExclusiveList` to share certain\nheaders only with the proxy and not with destination host.\n\nBy default, this set is:\n\n```\naccept\naccept-charset\naccept-encoding\naccept-language\naccept-ranges\ncache-control\ncontent-encoding\ncontent-language\ncontent-length\ncontent-location\ncontent-md5\ncontent-range\ncontent-type\nconnection\ndate\nexpect\nmax-forwards\npragma\nproxy-authorization\nreferer\nte\ntransfer-encoding\nuser-agent\nvia\n```\n\nNote that, when using a tunneling proxy, the `proxy-authorization`\nheader and any headers from custom `proxyHeaderExclusiveList` are\n*never* sent to the endpoint server, but only to the proxy server.\n\n\n### Controlling proxy behaviour using environment variables\n\nThe following environment variables are respected by `request`:\n\n * `HTTP_PROXY` / `http_proxy`\n * `HTTPS_PROXY` / `https_proxy`\n * `NO_PROXY` / `no_proxy`\n\nWhen `HTTP_PROXY` / `http_proxy` are set, they will be used to proxy non-SSL requests that do not have an explicit `proxy` configuration option present. Similarly, `HTTPS_PROXY` / `https_proxy` will be respected for SSL requests that do not have an explicit `proxy` configuration option. It is valid to define a proxy in one of the environment variables, but then override it for a specific request, using the `proxy` configuration option. Furthermore, the `proxy` configuration option can be explicitly set to false / null to opt out of proxying altogether for that request.\n\n`request` is also aware of the `NO_PROXY`/`no_proxy` environment variables. These variables provide a granular way to opt out of proxying, on a per-host basis. It should contain a comma separated list of hosts to opt out of proxying. It is also possible to opt of proxying when a particular destination port is used. Finally, the variable may be set to `*` to opt out of the implicit proxy configuration of the other environment variables.\n\nHere's some examples of valid `no_proxy` values:\n\n * `google.com` - don't proxy HTTP/HTTPS requests to Google.\n * `google.com:443` - don't proxy HTTPS requests to Google, but *do* proxy HTTP requests to Google.\n * `google.com:443, yahoo.com:80` - don't proxy HTTPS requests to Google, and don't proxy HTTP requests to Yahoo!\n * `*` - ignore `https_proxy`/`http_proxy` environment variables altogether.\n\n[back to top](#table-of-contents)\n\n\n---\n\n\n## UNIX Domain Sockets\n\n`request` supports making requests to [UNIX Domain Sockets](http://en.wikipedia.org/wiki/Unix_domain_socket). To make one, use the following URL scheme:\n\n```js\n/* Pattern */ 'http://unix:SOCKET:PATH'\n/* Example */ request.get('http://unix:/absolute/path/to/unix.socket:/request/path')\n```\n\nNote: The `SOCKET` path is assumed to be absolute to the root of the host file system.\n\n[back to top](#table-of-contents)\n\n\n---\n\n\n## TLS/SSL Protocol\n\nTLS/SSL Protocol options, such as `cert`, `key` and `passphrase`, can be\nset directly in `options` object, in the `agentOptions` property of the `options` object, or even in `https.globalAgent.options`. Keep in mind that, although `agentOptions` allows for a slightly wider range of configurations, the recommended way is via `options` object directly, as using `agentOptions` or `https.globalAgent.options` would not be applied in the same way in proxied environments (as data travels through a TLS connection instead of an http/https agent).\n\n```js\nvar fs = require('fs')\n    , path = require('path')\n    , certFile = path.resolve(__dirname, 'ssl/client.crt')\n    , keyFile = path.resolve(__dirname, 'ssl/client.key')\n    , caFile = path.resolve(__dirname, 'ssl/ca.cert.pem')\n    , request = require('request');\n\nvar options = {\n    url: 'https://api.some-server.com/',\n    cert: fs.readFileSync(certFile),\n    key: fs.readFileSync(keyFile),\n    passphrase: 'password',\n    ca: fs.readFileSync(caFile)\n    }\n};\n\nrequest.get(options);\n```\n\n### Using `options.agentOptions`\n\nIn the example below, we call an API requires client side SSL certificate\n(in PEM format) with passphrase protected private key (in PEM format) and disable the SSLv3 protocol:\n\n```js\nvar fs = require('fs')\n    , path = require('path')\n    , certFile = path.resolve(__dirname, 'ssl/client.crt')\n    , keyFile = path.resolve(__dirname, 'ssl/client.key')\n    , request = require('request');\n\nvar options = {\n    url: 'https://api.some-server.com/',\n    agentOptions: {\n        cert: fs.readFileSync(certFile),\n        key: fs.readFileSync(keyFile),\n        // Or use `pfx` property replacing `cert` and `key` when using private key, certificate and CA certs in PFX or PKCS12 format:\n        // pfx: fs.readFileSync(pfxFilePath),\n        passphrase: 'password',\n        securityOptions: 'SSL_OP_NO_SSLv3'\n    }\n};\n\nrequest.get(options);\n```\n\nIt is able to force using SSLv3 only by specifying `secureProtocol`:\n\n```js\nrequest.get({\n    url: 'https://api.some-server.com/',\n    agentOptions: {\n        secureProtocol: 'SSLv3_method'\n    }\n});\n```\n\nIt is possible to accept other certificates than those signed by generally allowed Certificate Authorities (CAs).\nThis can be useful, for example,  when using self-signed certificates.\nTo require a different root certificate, you can specify the signing CA by adding the contents of the CA's certificate file to the `agentOptions`.\nThe certificate the domain presents must be signed by the root certificate specified:\n\n```js\nrequest.get({\n    url: 'https://api.some-server.com/',\n    agentOptions: {\n        ca: fs.readFileSync('ca.cert.pem')\n    }\n});\n```\n\n[back to top](#table-of-contents)\n\n\n---\n\n## Support for HAR 1.2\n\nThe `options.har` property will override the values: `url`, `method`, `qs`, `headers`, `form`, `formData`, `body`, `json`, as well as construct multipart data and read files from disk when `request.postData.params[].fileName` is present without a matching `value`.\n\na validation step will check if the HAR Request format matches the latest spec (v1.2) and will skip parsing if not matching.\n\n```js\n  var request = require('request')\n  request({\n    // will be ignored\n    method: 'GET',\n    uri: 'http://www.google.com',\n\n    // HTTP Archive Request Object\n    har: {\n      url: 'http://www.mockbin.com/har',\n      method: 'POST',\n      headers: [\n        {\n          name: 'content-type',\n          value: 'application/x-www-form-urlencoded'\n        }\n      ],\n      postData: {\n        mimeType: 'application/x-www-form-urlencoded',\n        params: [\n          {\n            name: 'foo',\n            value: 'bar'\n          },\n          {\n            name: 'hello',\n            value: 'world'\n          }\n        ]\n      }\n    }\n  })\n\n  // a POST request will be sent to http://www.mockbin.com\n  // with body an application/x-www-form-urlencoded body:\n  // foo=bar&hello=world\n```\n\n[back to top](#table-of-contents)\n\n\n---\n\n## request(options, callback)\n\nThe first argument can be either a `url` or an `options` object. The only required option is `uri`; all others are optional.\n\n- `uri` || `url` - fully qualified uri or a parsed url object from `url.parse()`\n- `baseUrl` - fully qualified uri string used as the base url. Most useful with `request.defaults`, for example when you want to do many requests to the same domain.  If `baseUrl` is `https://example.com/api/`, then requesting `/end/point?test=true` will fetch `https://example.com/api/end/point?test=true`. When `baseUrl` is given, `uri` must also be a string.\n- `method` - http method (default: `\"GET\"`)\n- `headers` - http headers (default: `{}`)\n\n---\n\n- `qs` - object containing querystring values to be appended to the `uri`\n- `qsParseOptions` - object containing options to pass to the [qs.parse](https://github.com/hapijs/qs#parsing-objects) method. Alternatively pass options to the [querystring.parse](https://nodejs.org/docs/v0.12.0/api/querystring.html#querystring_querystring_parse_str_sep_eq_options) method using this format `{sep:';', eq:':', options:{}}`\n- `qsStringifyOptions` - object containing options to pass to the [qs.stringify](https://github.com/hapijs/qs#stringifying) method. Alternatively pass options to the  [querystring.stringify](https://nodejs.org/docs/v0.12.0/api/querystring.html#querystring_querystring_stringify_obj_sep_eq_options) method using this format `{sep:';', eq:':', options:{}}`. For example, to change the way arrays are converted to query strings using the `qs` module pass the `arrayFormat` option with one of `indices|brackets|repeat`\n- `useQuerystring` - If true, use `querystring` to stringify and parse\n  querystrings, otherwise use `qs` (default: `false`).  Set this option to\n  `true` if you need arrays to be serialized as `foo=bar&foo=baz` instead of the\n  default `foo[0]=bar&foo[1]=baz`.\n\n---\n\n- `body` - entity body for PATCH, POST and PUT requests. Must be a `Buffer` or `String`, unless `json` is `true`. If `json` is `true`, then `body` must be a JSON-serializable object.\n- `form` - when passed an object or a querystring, this sets `body` to a querystring representation of value, and adds `Content-type: application/x-www-form-urlencoded` header. When passed no options, a `FormData` instance is returned (and is piped to request). See \"Forms\" section above.\n- `formData` - Data to pass for a `multipart/form-data` request. See\n  [Forms](#forms) section above.\n- `multipart` - array of objects which contain their own headers and `body`\n  attributes. Sends a `multipart/related` request. See [Forms](#forms) section\n  above.\n  - Alternatively you can pass in an object `{chunked: false, data: []}` where\n    `chunked` is used to specify whether the request is sent in\n    [chunked transfer encoding](https://en.wikipedia.org/wiki/Chunked_transfer_encoding)\n    In non-chunked requests, data items with body streams are not allowed.\n- `preambleCRLF` - append a newline/CRLF before the boundary of your `multipart/form-data` request.\n- `postambleCRLF` - append a newline/CRLF at the end of the boundary of your `multipart/form-data` request.\n- `json` - sets `body` but to JSON representation of value and adds `Content-type: application/json` header.  Additionally, parses the response body as JSON.\n- `jsonReviver` - a [reviver function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/parse) that will be passed to `JSON.parse()` when parsing a JSON response body.\n\n---\n\n- `auth` - A hash containing values `user` || `username`, `pass` || `password`, and `sendImmediately` (optional).  See documentation above.\n- `oauth` - Options for OAuth HMAC-SHA1 signing. See documentation above.\n- `hawk` - Options for [Hawk signing](https://github.com/hueniverse/hawk). The `credentials` key must contain the necessary signing info, [see hawk docs for details](https://github.com/hueniverse/hawk#usage-example).\n- `aws` - `object` containing AWS signing information. Should have the properties `key`, `secret`. Also requires the property `bucket`, unless you’re specifying your `bucket` as part of the path, or the request doesn’t use a bucket (i.e. GET Services)\n- `httpSignature` - Options for the [HTTP Signature Scheme](https://github.com/joyent/node-http-signature/blob/master/http_signing.md) using [Joyent's library](https://github.com/joyent/node-http-signature). The `keyId` and `key` properties must be specified. See the docs for other options.\n\n---\n\n- `followRedirect` - follow HTTP 3xx responses as redirects (default: `true`). This property can also be implemented as function which gets `response` object as a single argument and should return `true` if redirects should continue or `false` otherwise.\n- `followAllRedirects` - follow non-GET HTTP 3xx responses as redirects (default: `false`)\n- `maxRedirects` - the maximum number of redirects to follow (default: `10`)\n- `removeRefererHeader` - removes the referer header when a redirect happens (default: `false`).\n\n---\n\n- `encoding` - Encoding to be used on `setEncoding` of response data. If `null`, the `body` is returned as a `Buffer`. Anything else **(including the default value of `undefined`)** will be passed as the [encoding](http://nodejs.org/api/buffer.html#buffer_buffer) parameter to `toString()` (meaning this is effectively `utf8` by default). (**Note:** if you expect binary data, you should set `encoding: null`.)\n- `gzip` - If `true`, add an `Accept-Encoding` header to request compressed content encodings from the server (if not already present) and decode supported content encodings in the response.  **Note:** Automatic decoding of the response content is performed on the body data returned through `request` (both through the `request` stream and passed to the callback function) but is not performed on the `response` stream (available from the `response` event) which is the unmodified `http.IncomingMessage` object which may contain compressed data. See example below.\n- `jar` - If `true`, remember cookies for future use (or define your custom cookie jar; see examples section)\n\n---\n\n- `agent` - `http(s).Agent` instance to use\n- `agentClass` - alternatively specify your agent's class name\n- `agentOptions` - and pass its options. **Note:** for HTTPS see [tls API doc for TLS/SSL options](http://nodejs.org/api/tls.html#tls_tls_connect_options_callback) and the [documentation above](#using-optionsagentoptions).\n- `forever` - set to `true` to use the [forever-agent](https://github.com/request/forever-agent) **Note:** Defaults to `http(s).Agent({keepAlive:true})` in node 0.12+\n- `pool` - An object describing which agents to use for the request. If this option is omitted the request will use the global agent (as long as your options allow for it). Otherwise, request will search the pool for your custom agent. If no custom agent is found, a new agent will be created and added to the pool. **Note:** `pool` is used only when the `agent` option is not specified.\n  - A `maxSockets` property can also be provided on the `pool` object to set the max number of sockets for all agents created (ex: `pool: {maxSockets: Infinity}`).\n  - Note that if you are sending multiple requests in a loop and creating\n    multiple new `pool` objects, `maxSockets` will not work as intended.  To\n    work around this, either use [`request.defaults`](#requestdefaultsoptions)\n    with your pool options or create the pool object with the `maxSockets`\n    property outside of the loop.\n- `timeout` - Integer containing the number of milliseconds to wait for a\nserver to send response headers (and start the response body) before aborting\nthe request. Note that if the underlying TCP connection cannot be established,\nthe OS-wide TCP connection timeout will overrule the `timeout` option ([the\ndefault in Linux can be anywhere from 20-120 seconds][linux-timeout]).\n\n[linux-timeout]: http://www.sekuda.com/overriding_the_default_linux_kernel_20_second_tcp_socket_connect_timeout\n\n---\n\n- `localAddress` - Local interface to bind for network connections.\n- `proxy` - An HTTP proxy to be used. Supports proxy Auth with Basic Auth, identical to support for the `url` parameter (by embedding the auth info in the `uri`)\n- `strictSSL` - If `true`, requires SSL certificates be valid. **Note:** to use your own certificate authority, you need to specify an agent that was created with that CA as an option.\n- `tunnel` - controls the behavior of\n  [HTTP `CONNECT` tunneling](https://en.wikipedia.org/wiki/HTTP_tunnel#HTTP_CONNECT_tunneling)\n  as follows:\n   - `undefined` (default) - `true` if the destination is `https` or a previous\n     request in the redirect chain used a tunneling proxy, `false` otherwise\n   - `true` - always tunnel to the destination by making a `CONNECT` request to\n     the proxy\n   - `false` - request the destination as a `GET` request.\n- `proxyHeaderWhiteList` - A whitelist of headers to send to a\n  tunneling proxy.\n- `proxyHeaderExclusiveList` - A whitelist of headers to send\n  exclusively to a tunneling proxy and not to destination.\n\n---\n\n- `time` - If `true`, the request-response cycle (including all redirects) is timed at millisecond resolution, and the result provided on the response's `elapsedTime` property.\n- `har` - A [HAR 1.2 Request Object](http://www.softwareishard.com/blog/har-12-spec/#request), will be processed from HAR format into options overwriting matching values *(see the [HAR 1.2 section](#support-for-har-1.2) for details)*\n\nThe callback argument gets 3 arguments:\n\n1. An `error` when applicable (usually from [`http.ClientRequest`](http://nodejs.org/api/http.html#http_class_http_clientrequest) object)\n2. An [`http.IncomingMessage`](http://nodejs.org/api/http.html#http_http_incomingmessage) object\n3. The third is the `response` body (`String` or `Buffer`, or JSON object if the `json` option is supplied)\n\n[back to top](#table-of-contents)\n\n\n---\n\n## Convenience methods\n\nThere are also shorthand methods for different HTTP METHODs and some other conveniences.\n\n\n### request.defaults(options)\n\nThis method **returns a wrapper** around the normal request API that defaults\nto whatever options you pass to it.\n\n**Note:** `request.defaults()` **does not** modify the global request API;\ninstead, it **returns a wrapper** that has your default settings applied to it.\n\n**Note:** You can call `.defaults()` on the wrapper that is returned from\n`request.defaults` to add/override defaults that were previously defaulted.\n\nFor example:\n```js\n//requests using baseRequest() will set the 'x-token' header\nvar baseRequest = request.defaults({\n  headers: {x-token: 'my-token'}\n})\n\n//requests using specialRequest() will include the 'x-token' header set in\n//baseRequest and will also include the 'special' header\nvar specialRequest = baseRequest.defaults({\n  headers: {special: 'special value'}\n})\n```\n\n### request.put\n\nSame as `request()`, but defaults to `method: \"PUT\"`.\n\n```js\nrequest.put(url)\n```\n\n### request.patch\n\nSame as `request()`, but defaults to `method: \"PATCH\"`.\n\n```js\nrequest.patch(url)\n```\n\n### request.post\n\nSame as `request()`, but defaults to `method: \"POST\"`.\n\n```js\nrequest.post(url)\n```\n\n### request.head\n\nSame as `request()`, but defaults to `method: \"HEAD\"`.\n\n```js\nrequest.head(url)\n```\n\n### request.del\n\nSame as `request()`, but defaults to `method: \"DELETE\"`.\n\n```js\nrequest.del(url)\n```\n\n### request.get\n\nSame as `request()` (for uniformity).\n\n```js\nrequest.get(url)\n```\n### request.cookie\n\nFunction that creates a new cookie.\n\n```js\nrequest.cookie('key1=value1')\n```\n### request.jar()\n\nFunction that creates a new cookie jar.\n\n```js\nrequest.jar()\n```\n\n[back to top](#table-of-contents)\n\n\n---\n\n\n## Debugging\n\nThere are at least three ways to debug the operation of `request`:\n\n1. Launch the node process like `NODE_DEBUG=request node script.js`\n   (`lib,request,otherlib` works too).\n\n2. Set `require('request').debug = true` at any time (this does the same thing\n   as #1).\n\n3. Use the [request-debug module](https://github.com/nylen/request-debug) to\n   view request and response headers and bodies.\n\n[back to top](#table-of-contents)\n\n\n---\n\n## Timeouts\n\nMost requests to external servers should have a timeout attached, in case the\nserver is not responding in a timely manner. Without a timeout, your code may\nhave a socket open/consume resources for minutes or more.\n\nThere are two main types of timeouts: **connection timeouts** and **read\ntimeouts**. A connect timeout occurs if the timeout is hit while your client is\nattempting to establish a connection to a remote machine (corresponding to the\n[connect() call][connect] on the socket). A read timeout occurs any time the\nserver is too slow to send back a part of the response.\n\nThese two situations have widely different implications for what went wrong\nwith the request, so it's useful to be able to distinguish them. You can detect\ntimeout errors by checking `err.code` for an 'ETIMEDOUT' value. Further, you\ncan detect whether the timeout was a connection timeout by checking if the\n`err.connect` property is set to `true`.\n\n```js\nrequest.get('http://10.255.255.1', {timeout: 1500}, function(err) {\n    console.log(err.code === 'ETIMEDOUT');\n    // Set to `true` if the timeout was a connection timeout, `false` or\n    // `undefined` otherwise.\n    console.log(err.connect === true);\n    process.exit(0);\n});\n```\n\n[connect]: http://linux.die.net/man/2/connect\n\n## Examples:\n\n```js\n  var request = require('request')\n    , rand = Math.floor(Math.random()*100000000).toString()\n    ;\n  request(\n    { method: 'PUT'\n    , uri: 'http://mikeal.iriscouch.com/testjs/' + rand\n    , multipart:\n      [ { 'content-type': 'application/json'\n        ,  body: JSON.stringify({foo: 'bar', _attachments: {'message.txt': {follows: true, length: 18, 'content_type': 'text/plain' }}})\n        }\n      , { body: 'I am an attachment' }\n      ]\n    }\n  , function (error, response, body) {\n      if(response.statusCode == 201){\n        console.log('document saved as: http://mikeal.iriscouch.com/testjs/'+ rand)\n      } else {\n        console.log('error: '+ response.statusCode)\n        console.log(body)\n      }\n    }\n  )\n```\n\nFor backwards-compatibility, response compression is not supported by default.\nTo accept gzip-compressed responses, set the `gzip` option to `true`.  Note\nthat the body data passed through `request` is automatically decompressed\nwhile the response object is unmodified and will contain compressed data if\nthe server sent a compressed response.\n\n```js\n  var request = require('request')\n  request(\n    { method: 'GET'\n    , uri: 'http://www.google.com'\n    , gzip: true\n    }\n  , function (error, response, body) {\n      // body is the decompressed response body\n      console.log('server encoded the data as: ' + (response.headers['content-encoding'] || 'identity'))\n      console.log('the decoded data is: ' + body)\n    }\n  ).on('data', function(data) {\n    // decompressed data as it is received\n    console.log('decoded chunk: ' + data)\n  })\n  .on('response', function(response) {\n    // unmodified http.IncomingMessage object\n    response.on('data', function(data) {\n      // compressed data as it is received\n      console.log('received ' + data.length + ' bytes of compressed data')\n    })\n  })\n```\n\nCookies are disabled by default (else, they would be used in subsequent requests). To enable cookies, set `jar` to `true` (either in `defaults` or `options`).\n\n```js\nvar request = request.defaults({jar: true})\nrequest('http://www.google.com', function () {\n  request('http://images.google.com')\n})\n```\n\nTo use a custom cookie jar (instead of `request`’s global cookie jar), set `jar` to an instance of `request.jar()` (either in `defaults` or `options`)\n\n```js\nvar j = request.jar()\nvar request = request.defaults({jar:j})\nrequest('http://www.google.com', function () {\n  request('http://images.google.com')\n})\n```\n\nOR\n\n```js\nvar j = request.jar();\nvar cookie = request.cookie('key1=value1');\nvar url = 'http://www.google.com';\nj.setCookie(cookie, url);\nrequest({url: url, jar: j}, function () {\n  request('http://images.google.com')\n})\n```\n\nTo use a custom cookie store (such as a\n[`FileCookieStore`](https://github.com/mitsuru/tough-cookie-filestore)\nwhich supports saving to and restoring from JSON files), pass it as a parameter\nto `request.jar()`:\n\n```js\nvar FileCookieStore = require('tough-cookie-filestore');\n// NOTE - currently the 'cookies.json' file must already exist!\nvar j = request.jar(new FileCookieStore('cookies.json'));\nrequest = request.defaults({ jar : j })\nrequest('http://www.google.com', function() {\n  request('http://images.google.com')\n})\n```\n\nThe cookie store must be a\n[`tough-cookie`](https://github.com/goinstant/tough-cookie)\nstore and it must support synchronous operations; see the\n[`CookieStore` API docs](https://github.com/goinstant/tough-cookie/#cookiestore-api)\nfor details.\n\nTo inspect your cookie jar after a request:\n\n```js\nvar j = request.jar()\nrequest({url: 'http://www.google.com', jar: j}, function () {\n  var cookie_string = j.getCookieString(url); // \"key1=value1; key2=value2; ...\"\n  var cookies = j.getCookies(url);\n  // [{key: 'key1', value: 'value1', domain: \"www.google.com\", ...}, ...]\n})\n```\n\n[back to top](#table-of-contents)\n",
-  "readmeFilename": "README.md",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/request/request.git"
-  },
-  "scripts": {
-    "lint": "eslint lib/ *.js tests/ && echo Lint passed.",
-    "test": "npm run lint && npm run test-ci && npm run test-browser",
-    "test-browser": "node tests/browser/start.js",
-    "test-ci": "taper tests/test-*.js",
-    "test-cov": "istanbul cover tape tests/test-*.js"
+  "dist": {
+    "shasum": "cc1a3bc72b96254734fc34296da322f9486ddeba",
+    "tarball": "http://registry.npmjs.org/request/-/request-2.65.0.tgz"
   },
-  "tags": [
-    "http",
-    "simple",
-    "util",
-    "utility"
-  ],
-  "version": "2.64.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/request/request.js b/deps/npm/node_modules/request/request.js
index af91a11d3b64d8..824f9386e8e279 100644
--- a/deps/npm/node_modules/request/request.js
+++ b/deps/npm/node_modules/request/request.js
@@ -1014,54 +1014,7 @@ Request.prototype.onRequestResponse = function (response) {
     responseContent.on('close', function () {self.emit('close')})
 
     if (self.callback) {
-      var buffer = bl()
-        , strings = []
-
-      self.on('data', function (chunk) {
-        if (Buffer.isBuffer(chunk)) {
-          buffer.append(chunk)
-        } else {
-          strings.push(chunk)
-        }
-      })
-      self.on('end', function () {
-        debug('end event', self.uri.href)
-        if (self._aborted) {
-          debug('aborted', self.uri.href)
-          return
-        }
-
-        if (buffer.length) {
-          debug('has body', self.uri.href, buffer.length)
-          if (self.encoding === null) {
-            // response.body = buffer
-            // can't move to this until https://github.com/rvagg/bl/issues/13
-            response.body = buffer.slice()
-          } else {
-            response.body = buffer.toString(self.encoding)
-          }
-        } else if (strings.length) {
-          // The UTF8 BOM [0xEF,0xBB,0xBF] is converted to [0xFE,0xFF] in the JS UTC16/UCS2 representation.
-          // Strip this value out when the encoding is set to 'utf8', as upstream consumers won't expect it and it breaks JSON.parse().
-          if (self.encoding === 'utf8' && strings[0].length > 0 && strings[0][0] === '\uFEFF') {
-            strings[0] = strings[0].substring(1)
-          }
-          response.body = strings.join('')
-        }
-
-        if (self._json) {
-          try {
-            response.body = JSON.parse(response.body, self._jsonReviver)
-          } catch (e) {
-            debug('invalid JSON received', self.uri.href)
-          }
-        }
-        debug('emitting complete', self.uri.href)
-        if (typeof response.body === 'undefined' && !self._json) {
-          response.body = self.encoding === null ? new Buffer(0) : ''
-        }
-        self.emit('complete', response, response.body)
-      })
+      self.readResponseBody(response)
     }
     //if no callback
     else {
@@ -1077,6 +1030,59 @@ Request.prototype.onRequestResponse = function (response) {
   debug('finish init function', self.uri.href)
 }
 
+Request.prototype.readResponseBody = function (response) {
+  var self = this
+  debug('reading response\'s body')
+  var buffer = bl()
+    , strings = []
+
+  self.on('data', function (chunk) {
+    if (Buffer.isBuffer(chunk)) {
+      buffer.append(chunk)
+    } else {
+      strings.push(chunk)
+    }
+  })
+  self.on('end', function () {
+    debug('end event', self.uri.href)
+    if (self._aborted) {
+      debug('aborted', self.uri.href)
+      return
+    }
+
+    if (buffer.length) {
+      debug('has body', self.uri.href, buffer.length)
+      if (self.encoding === null) {
+        // response.body = buffer
+        // can't move to this until https://github.com/rvagg/bl/issues/13
+        response.body = buffer.slice()
+      } else {
+        response.body = buffer.toString(self.encoding)
+      }
+    } else if (strings.length) {
+      // The UTF8 BOM [0xEF,0xBB,0xBF] is converted to [0xFE,0xFF] in the JS UTC16/UCS2 representation.
+      // Strip this value out when the encoding is set to 'utf8', as upstream consumers won't expect it and it breaks JSON.parse().
+      if (self.encoding === 'utf8' && strings[0].length > 0 && strings[0][0] === '\uFEFF') {
+        strings[0] = strings[0].substring(1)
+      }
+      response.body = strings.join('')
+    }
+
+    if (self._json) {
+      try {
+        response.body = JSON.parse(response.body, self._jsonReviver)
+      } catch (e) {
+        debug('invalid JSON received', self.uri.href)
+      }
+    }
+    debug('emitting complete', self.uri.href)
+    if (typeof response.body === 'undefined' && !self._json) {
+      response.body = self.encoding === null ? new Buffer(0) : ''
+    }
+    self.emit('complete', response, response.body)
+  })
+}
+
 Request.prototype.abort = function () {
   var self = this
   self._aborted = true
@@ -1143,12 +1149,12 @@ Request.prototype.qs = function (q, clobber) {
     base[i] = q[i]
   }
 
-  if (self._qs.stringify(base) === '') {
+  var qs = self._qs.stringify(base)
+
+  if (qs === '') {
     return self
   }
 
-  var qs = self._qs.stringify(base)
-
   self.uri = url.parse(self.uri.href.split('?')[0] + '?' + qs)
   self.url = self.uri
   self.path = self.uri.path
diff --git a/deps/npm/node_modules/retry/package.json b/deps/npm/node_modules/retry/package.json
index 4f4664e8439647..68d19a908a68a5 100644
--- a/deps/npm/node_modules/retry/package.json
+++ b/deps/npm/node_modules/retry/package.json
@@ -1,78 +1,53 @@
 {
-  "_args": [
-    [
-      "retry@~0.8.0",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "retry@>=0.8.0 <0.9.0",
-  "_id": "retry@0.8.0",
-  "_inCache": true,
-  "_location": "/retry",
-  "_nodeVersion": "0.10.33",
-  "_npmUser": {
-    "email": "tim@debuggable.com",
-    "name": "tim-kos"
-  },
-  "_npmVersion": "2.1.7",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "retry",
-    "raw": "retry@~0.8.0",
-    "rawSpec": "~0.8.0",
-    "scope": null,
-    "spec": ">=0.8.0 <0.9.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz",
-  "_shasum": "2367628dc0edb247b1eab649dc53ac8628ac2d5f",
-  "_shrinkwrap": null,
-  "_spec": "retry@~0.8.0",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "tim@debuggable.com",
     "name": "Tim Koschützki",
+    "email": "tim@debuggable.com",
     "url": "http://debuggable.com/"
   },
-  "bugs": {
-    "url": "https://github.com/tim-kos/node-retry/issues"
-  },
-  "dependencies": {},
+  "name": "retry",
   "description": "Abstraction for exponential and custom retry strategies for failed operations.",
-  "devDependencies": {
-    "fake": "0.2.0",
-    "far": "0.0.1"
+  "license": "MIT",
+  "version": "0.8.0",
+  "homepage": "https://github.com/tim-kos/node-retry",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/tim-kos/node-retry.git"
   },
   "directories": {
     "lib": "./lib"
   },
-  "dist": {
-    "shasum": "2367628dc0edb247b1eab649dc53ac8628ac2d5f",
-    "tarball": "http://registry.npmjs.org/retry/-/retry-0.8.0.tgz"
-  },
+  "main": "index",
   "engines": {
     "node": "*"
   },
+  "dependencies": {},
+  "devDependencies": {
+    "fake": "0.2.0",
+    "far": "0.0.1"
+  },
   "gitHead": "9446e803d6a41ae08732a4a215ae5bf1ff1ccfdd",
-  "homepage": "https://github.com/tim-kos/node-retry",
-  "installable": true,
-  "license": "MIT",
-  "main": "index",
+  "bugs": {
+    "url": "https://github.com/tim-kos/node-retry/issues"
+  },
+  "_id": "retry@0.8.0",
+  "scripts": {},
+  "_shasum": "2367628dc0edb247b1eab649dc53ac8628ac2d5f",
+  "_from": "retry@>=0.8.0 <0.9.0",
+  "_npmVersion": "2.1.7",
+  "_nodeVersion": "0.10.33",
+  "_npmUser": {
+    "name": "tim-kos",
+    "email": "tim@debuggable.com"
+  },
   "maintainers": [
     {
       "name": "tim-kos",
       "email": "tim@debuggable.com"
     }
   ],
-  "name": "retry",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/tim-kos/node-retry.git"
+  "dist": {
+    "shasum": "2367628dc0edb247b1eab649dc53ac8628ac2d5f",
+    "tarball": "http://registry.npmjs.org/retry/-/retry-0.8.0.tgz"
   },
-  "scripts": {},
-  "version": "0.8.0"
+  "_resolved": "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"
 }
diff --git a/deps/npm/node_modules/rimraf/package.json b/deps/npm/node_modules/rimraf/package.json
index 0f0f454ff36b78..29eb35b6ceeb1f 100644
--- a/deps/npm/node_modules/rimraf/package.json
+++ b/deps/npm/node_modules/rimraf/package.json
@@ -1,92 +1,45 @@
 {
-  "_args": [
-    [
-      "rimraf@2.4.3",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "rimraf@2.4.3",
-  "_id": "rimraf@2.4.3",
-  "_inCache": true,
-  "_location": "/rimraf",
-  "_nodeVersion": "2.2.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "3.2.2",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "rimraf",
-    "raw": "rimraf@2.4.3",
-    "rawSpec": "2.4.3",
-    "scope": null,
-    "spec": "2.4.3",
-    "type": "version"
-  },
-  "_requiredBy": [
-    "/",
-    "/fs-vacuum",
-    "/fstream",
-    "/node-gyp",
-    "/npm-registry-client",
-    "/nyc",
-    "/spawn-wrap"
-  ],
-  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
-  "_shasum": "e5b51c9437a4c582adb955e9f28cf8d945e272af",
-  "_shrinkwrap": null,
-  "_spec": "rimraf@2.4.3",
-  "_where": "/Users/rebecca/code/npm",
+  "name": "rimraf",
+  "version": "2.4.3",
+  "main": "rimraf.js",
+  "description": "A deep deletion module for node (like `rm -rf`)",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
+  "license": "ISC",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/rimraf.git"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
   "bin": {
     "rimraf": "./bin.js"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/rimraf/issues"
-  },
   "dependencies": {
     "glob": "^5.0.14"
   },
-  "description": "A deep deletion module for node (like `rm -rf`)",
-  "devDependencies": {
-    "mkdirp": "^0.5.1",
-    "tap": "^1.3.1"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "e5b51c9437a4c582adb955e9f28cf8d945e272af",
-    "tarball": "http://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz"
-  },
   "files": [
     "LICENSE",
     "README.md",
     "bin.js",
     "rimraf.js"
   ],
-  "gitHead": "ec7050f8ca14c931b847414f18466e601ca7c02e",
-  "homepage": "https://github.com/isaacs/rimraf#readme",
-  "installable": true,
-  "license": "ISC",
-  "main": "rimraf.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "name": "rimraf",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/rimraf.git"
+  "devDependencies": {
+    "mkdirp": "^0.5.1",
+    "tap": "^1.3.1"
   },
-  "scripts": {
-    "test": "tap test/*.js"
+  "readme": "[![Build Status](https://travis-ci.org/isaacs/rimraf.svg?branch=master)](https://travis-ci.org/isaacs/rimraf) [![Dependency Status](https://david-dm.org/isaacs/rimraf.svg)](https://david-dm.org/isaacs/rimraf) [![devDependency Status](https://david-dm.org/isaacs/rimraf/dev-status.svg)](https://david-dm.org/isaacs/rimraf#info=devDependencies)\n\nThe [UNIX command](http://en.wikipedia.org/wiki/Rm_(Unix)) `rm -rf` for node.  \n\nInstall with `npm install rimraf`, or just drop rimraf.js somewhere.\n\n## API\n\n`rimraf(f, callback)`\n\nThe callback will be called with an error if there is one.  Certain\nerrors are handled for you:\n\n* Windows: `EBUSY` and `ENOTEMPTY` - rimraf will back off a maximum of\n  `opts.maxBusyTries` times before giving up, adding 100ms of wait\n  between each attempt.  The default `maxBusyTries` is 3.\n* `ENOENT` - If the file doesn't exist, rimraf will return\n  successfully, since your desired outcome is already the case.\n* `EMFILE` - Since `readdir` requires opening a file descriptor, it's\n  possible to hit `EMFILE` if too many file descriptors are in use.\n  In the sync case, there's nothing to be done for this.  But in the\n  async case, rimraf will gradually back off with timeouts up to\n  `opts.emfileWait` ms, which defaults to 1000.\n\n## rimraf.sync\n\nIt can remove stuff synchronously, too.  But that's not so good.  Use\nthe async API.  It's better.\n\n## CLI\n\nIf installed with `npm install rimraf -g` it can be used as a global\ncommand `rimraf <path> [<path> ...]` which is useful for cross platform support.\n\n## mkdirp\n\nIf you need to create a directory recursively, check out\n[mkdirp](https://github.com/substack/node-mkdirp).\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/isaacs/rimraf/issues"
   },
-  "version": "2.4.3"
+  "homepage": "https://github.com/isaacs/rimraf#readme",
+  "_id": "rimraf@2.4.3",
+  "_shasum": "e5b51c9437a4c582adb955e9f28cf8d945e272af",
+  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz",
+  "_from": "rimraf@>=2.4.3 <2.5.0"
 }
diff --git a/deps/npm/node_modules/semver/package.json b/deps/npm/node_modules/semver/package.json
index d4235760dc1bfa..03b57b01338132 100644
--- a/deps/npm/node_modules/semver/package.json
+++ b/deps/npm/node_modules/semver/package.json
@@ -1,83 +1,30 @@
 {
-  "_args": [
-    [
-      "semver@~5.0.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "semver@>=5.0.1 <5.1.0",
-  "_id": "semver@5.0.3",
-  "_inCache": true,
-  "_location": "/semver",
-  "_nodeVersion": "4.0.0",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "3.3.2",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "semver",
-    "raw": "semver@~5.0.1",
-    "rawSpec": "~5.0.1",
-    "scope": null,
-    "spec": ">=5.0.1 <5.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/init-package-json",
-    "/node-gyp",
-    "/normalize-package-data",
-    "/npm-install-checks",
-    "/npm-package-arg",
-    "/npm-registry-client",
-    "/read-installed"
-  ],
-  "_resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
-  "_shasum": "77466de589cd5d3c95f138aa78bc569a3cb5d27a",
-  "_shrinkwrap": null,
-  "_spec": "semver@~5.0.1",
-  "_where": "/Users/rebecca/code/npm",
-  "bin": {
-    "semver": "./bin/semver"
-  },
-  "bugs": {
-    "url": "https://github.com/npm/node-semver/issues"
-  },
-  "dependencies": {},
+  "name": "semver",
+  "version": "5.0.3",
   "description": "The semantic version parser used by npm.",
+  "main": "semver.js",
+  "scripts": {
+    "test": "tap test/*.js"
+  },
   "devDependencies": {
     "tap": "^1.3.4"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "77466de589cd5d3c95f138aa78bc569a3cb5d27a",
-    "tarball": "http://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
-  },
-  "gitHead": "5f89ecbe78145ad0b501cf6279f602a23c89738d",
-  "homepage": "https://github.com/npm/node-semver#readme",
-  "installable": true,
   "license": "ISC",
-  "main": "semver.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "isaacs@npmjs.com"
-    },
-    {
-      "name": "othiym23",
-      "email": "ogd@aoaioxxysz.net"
-    }
-  ],
-  "name": "semver",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/npm/node-semver.git"
   },
-  "scripts": {
-    "test": "tap test/*.js"
+  "bin": {
+    "semver": "./bin/semver"
   },
-  "version": "5.0.3"
+  "readme": "semver(1) -- The semantic versioner for npm\n===========================================\n\n## Usage\n\n    $ npm install semver\n\n    semver.valid('1.2.3') // '1.2.3'\n    semver.valid('a.b.c') // null\n    semver.clean('  =v1.2.3   ') // '1.2.3'\n    semver.satisfies('1.2.3', '1.x || >=2.5.0 || 5.0.0 - 7.2.3') // true\n    semver.gt('1.2.3', '9.8.7') // false\n    semver.lt('1.2.3', '9.8.7') // true\n\nAs a command-line utility:\n\n    $ semver -h\n\n    Usage: semver <version> [<version> [...]] [-r <range> | -i <inc> | --preid <identifier> | -l | -rv]\n    Test if version(s) satisfy the supplied range(s), and sort them.\n\n    Multiple versions or ranges may be supplied, unless increment\n    option is specified.  In that case, only a single version may\n    be used, and it is incremented by the specified level\n\n    Program exits successfully if any valid version satisfies\n    all supplied ranges, and prints all satisfying versions.\n\n    If no versions are valid, or ranges are not satisfied,\n    then exits failure.\n\n    Versions are printed in ascending order, so supplying\n    multiple versions to the utility will just sort them.\n\n## Versions\n\nA \"version\" is described by the `v2.0.0` specification found at\n<http://semver.org/>.\n\nA leading `\"=\"` or `\"v\"` character is stripped off and ignored.\n\n## Ranges\n\nA `version range` is a set of `comparators` which specify versions\nthat satisfy the range.\n\nA `comparator` is composed of an `operator` and a `version`.  The set\nof primitive `operators` is:\n\n* `<` Less than\n* `<=` Less than or equal to\n* `>` Greater than\n* `>=` Greater than or equal to\n* `=` Equal.  If no operator is specified, then equality is assumed,\n  so this operator is optional, but MAY be included.\n\nFor example, the comparator `>=1.2.7` would match the versions\n`1.2.7`, `1.2.8`, `2.5.3`, and `1.3.9`, but not the versions `1.2.6`\nor `1.1.0`.\n\nComparators can be joined by whitespace to form a `comparator set`,\nwhich is satisfied by the **intersection** of all of the comparators\nit includes.\n\nA range is composed of one or more comparator sets, joined by `||`.  A\nversion matches a range if and only if every comparator in at least\none of the `||`-separated comparator sets is satisfied by the version.\n\nFor example, the range `>=1.2.7 <1.3.0` would match the versions\n`1.2.7`, `1.2.8`, and `1.2.99`, but not the versions `1.2.6`, `1.3.0`,\nor `1.1.0`.\n\nThe range `1.2.7 || >=1.2.9 <2.0.0` would match the versions `1.2.7`,\n`1.2.9`, and `1.4.6`, but not the versions `1.2.8` or `2.0.0`.\n\n### Prerelease Tags\n\nIf a version has a prerelease tag (for example, `1.2.3-alpha.3`) then\nit will only be allowed to satisfy comparator sets if at least one\ncomparator with the same `[major, minor, patch]` tuple also has a\nprerelease tag.\n\nFor example, the range `>1.2.3-alpha.3` would be allowed to match the\nversion `1.2.3-alpha.7`, but it would *not* be satisfied by\n`3.4.5-alpha.9`, even though `3.4.5-alpha.9` is technically \"greater\nthan\" `1.2.3-alpha.3` according to the SemVer sort rules.  The version\nrange only accepts prerelease tags on the `1.2.3` version.  The\nversion `3.4.5` *would* satisfy the range, because it does not have a\nprerelease flag, and `3.4.5` is greater than `1.2.3-alpha.7`.\n\nThe purpose for this behavior is twofold.  First, prerelease versions\nfrequently are updated very quickly, and contain many breaking changes\nthat are (by the author's design) not yet fit for public consumption.\nTherefore, by default, they are excluded from range matching\nsemantics.\n\nSecond, a user who has opted into using a prerelease version has\nclearly indicated the intent to use *that specific* set of\nalpha/beta/rc versions.  By including a prerelease tag in the range,\nthe user is indicating that they are aware of the risk.  However, it\nis still not appropriate to assume that they have opted into taking a\nsimilar risk on the *next* set of prerelease versions.\n\n#### Prerelease Identifiers\n\nThe method `.inc` takes an additional `identifier` string argument that\nwill append the value of the string as a prerelease identifier:\n\n```javascript\n> semver.inc('1.2.3', 'pre', 'beta')\n'1.2.4-beta.0'\n```\n\ncommand-line example:\n\n```shell\n$ semver 1.2.3 -i prerelease --preid beta\n1.2.4-beta.0\n```\n\nWhich then can be used to increment further:\n\n```shell\n$ semver 1.2.4-beta.0 -i prerelease\n1.2.4-beta.1\n```\n\n### Advanced Range Syntax\n\nAdvanced range syntax desugars to primitive comparators in\ndeterministic ways.\n\nAdvanced ranges may be combined in the same way as primitive\ncomparators using white space or `||`.\n\n#### Hyphen Ranges `X.Y.Z - A.B.C`\n\nSpecifies an inclusive set.\n\n* `1.2.3 - 2.3.4` := `>=1.2.3 <=2.3.4`\n\nIf a partial version is provided as the first version in the inclusive\nrange, then the missing pieces are replaced with zeroes.\n\n* `1.2 - 2.3.4` := `>=1.2.0 <=2.3.4`\n\nIf a partial version is provided as the second version in the\ninclusive range, then all versions that start with the supplied parts\nof the tuple are accepted, but nothing that would be greater than the\nprovided tuple parts.\n\n* `1.2.3 - 2.3` := `>=1.2.3 <2.4.0`\n* `1.2.3 - 2` := `>=1.2.3 <3.0.0`\n\n#### X-Ranges `1.2.x` `1.X` `1.2.*` `*`\n\nAny of `X`, `x`, or `*` may be used to \"stand in\" for one of the\nnumeric values in the `[major, minor, patch]` tuple.\n\n* `*` := `>=0.0.0` (Any version satisfies)\n* `1.x` := `>=1.0.0 <2.0.0` (Matching major version)\n* `1.2.x` := `>=1.2.0 <1.3.0` (Matching major and minor versions)\n\nA partial version range is treated as an X-Range, so the special\ncharacter is in fact optional.\n\n* `\"\"` (empty string) := `*` := `>=0.0.0`\n* `1` := `1.x.x` := `>=1.0.0 <2.0.0`\n* `1.2` := `1.2.x` := `>=1.2.0 <1.3.0`\n\n#### Tilde Ranges `~1.2.3` `~1.2` `~1`\n\nAllows patch-level changes if a minor version is specified on the\ncomparator.  Allows minor-level changes if not.\n\n* `~1.2.3` := `>=1.2.3 <1.(2+1).0` := `>=1.2.3 <1.3.0`\n* `~1.2` := `>=1.2.0 <1.(2+1).0` := `>=1.2.0 <1.3.0` (Same as `1.2.x`)\n* `~1` := `>=1.0.0 <(1+1).0.0` := `>=1.0.0 <2.0.0` (Same as `1.x`)\n* `~0.2.3` := `>=0.2.3 <0.(2+1).0` := `>=0.2.3 <0.3.0`\n* `~0.2` := `>=0.2.0 <0.(2+1).0` := `>=0.2.0 <0.3.0` (Same as `0.2.x`)\n* `~0` := `>=0.0.0 <(0+1).0.0` := `>=0.0.0 <1.0.0` (Same as `0.x`)\n* `~1.2.3-beta.2` := `>=1.2.3-beta.2 <1.3.0` Note that prereleases in\n  the `1.2.3` version will be allowed, if they are greater than or\n  equal to `beta.2`.  So, `1.2.3-beta.4` would be allowed, but\n  `1.2.4-beta.2` would not, because it is a prerelease of a\n  different `[major, minor, patch]` tuple.\n\n#### Caret Ranges `^1.2.3` `^0.2.5` `^0.0.4`\n\nAllows changes that do not modify the left-most non-zero digit in the\n`[major, minor, patch]` tuple.  In other words, this allows patch and\nminor updates for versions `1.0.0` and above, patch updates for\nversions `0.X >=0.1.0`, and *no* updates for versions `0.0.X`.\n\nMany authors treat a `0.x` version as if the `x` were the major\n\"breaking-change\" indicator.\n\nCaret ranges are ideal when an author may make breaking changes\nbetween `0.2.4` and `0.3.0` releases, which is a common practice.\nHowever, it presumes that there will *not* be breaking changes between\n`0.2.4` and `0.2.5`.  It allows for changes that are presumed to be\nadditive (but non-breaking), according to commonly observed practices.\n\n* `^1.2.3` := `>=1.2.3 <2.0.0`\n* `^0.2.3` := `>=0.2.3 <0.3.0`\n* `^0.0.3` := `>=0.0.3 <0.0.4`\n* `^1.2.3-beta.2` := `>=1.2.3-beta.2 <2.0.0` Note that prereleases in\n  the `1.2.3` version will be allowed, if they are greater than or\n  equal to `beta.2`.  So, `1.2.3-beta.4` would be allowed, but\n  `1.2.4-beta.2` would not, because it is a prerelease of a\n  different `[major, minor, patch]` tuple.\n* `^0.0.3-beta` := `>=0.0.3-beta <0.0.4`  Note that prereleases in the\n  `0.0.3` version *only* will be allowed, if they are greater than or\n  equal to `beta`.  So, `0.0.3-pr.2` would be allowed.\n\nWhen parsing caret ranges, a missing `patch` value desugars to the\nnumber `0`, but will allow flexibility within that value, even if the\nmajor and minor versions are both `0`.\n\n* `^1.2.x` := `>=1.2.0 <2.0.0`\n* `^0.0.x` := `>=0.0.0 <0.1.0`\n* `^0.0` := `>=0.0.0 <0.1.0`\n\nA missing `minor` and `patch` values will desugar to zero, but also\nallow flexibility within those values, even if the major version is\nzero.\n\n* `^1.x` := `>=1.0.0 <2.0.0`\n* `^0.x` := `>=0.0.0 <1.0.0`\n\n## Functions\n\nAll methods and classes take a final `loose` boolean argument that, if\ntrue, will be more forgiving about not-quite-valid semver strings.\nThe resulting output will always be 100% strict, of course.\n\nStrict-mode Comparators and Ranges will be strict about the SemVer\nstrings that they parse.\n\n* `valid(v)`: Return the parsed version, or null if it's not valid.\n* `inc(v, release)`: Return the version incremented by the release\n  type (`major`,   `premajor`, `minor`, `preminor`, `patch`,\n  `prepatch`, or `prerelease`), or null if it's not valid\n  * `premajor` in one call will bump the version up to the next major\n    version and down to a prerelease of that major version.\n    `preminor`, and `prepatch` work the same way.\n  * If called from a non-prerelease version, the `prerelease` will work the\n    same as `prepatch`. It increments the patch version, then makes a\n    prerelease. If the input version is already a prerelease it simply\n    increments it.\n* `major(v)`: Return the major version number.\n* `minor(v)`: Return the minor version number.\n* `patch(v)`: Return the patch version number.\n\n### Comparison\n\n* `gt(v1, v2)`: `v1 > v2`\n* `gte(v1, v2)`: `v1 >= v2`\n* `lt(v1, v2)`: `v1 < v2`\n* `lte(v1, v2)`: `v1 <= v2`\n* `eq(v1, v2)`: `v1 == v2` This is true if they're logically equivalent,\n  even if they're not the exact same string.  You already know how to\n  compare strings.\n* `neq(v1, v2)`: `v1 != v2` The opposite of `eq`.\n* `cmp(v1, comparator, v2)`: Pass in a comparison string, and it'll call\n  the corresponding function above.  `\"===\"` and `\"!==\"` do simple\n  string comparison, but are included for completeness.  Throws if an\n  invalid comparison string is provided.\n* `compare(v1, v2)`: Return `0` if `v1 == v2`, or `1` if `v1` is greater, or `-1` if\n  `v2` is greater.  Sorts in ascending order if passed to `Array.sort()`.\n* `rcompare(v1, v2)`: The reverse of compare.  Sorts an array of versions\n  in descending order when passed to `Array.sort()`.\n* `diff(v1, v2)`: Returns difference between two versions by the release type\n  (`major`, `premajor`, `minor`, `preminor`, `patch`, `prepatch`, or `prerelease`),\n  or null if the versions are the same.\n\n\n### Ranges\n\n* `validRange(range)`: Return the valid range or null if it's not valid\n* `satisfies(version, range)`: Return true if the version satisfies the\n  range.\n* `maxSatisfying(versions, range)`: Return the highest version in the list\n  that satisfies the range, or `null` if none of them do.\n* `gtr(version, range)`: Return `true` if version is greater than all the\n  versions possible in the range.\n* `ltr(version, range)`: Return `true` if version is less than all the\n  versions possible in the range.\n* `outside(version, range, hilo)`: Return true if the version is outside\n  the bounds of the range in either the high or low direction.  The\n  `hilo` argument must be either the string `'>'` or `'<'`.  (This is\n  the function called by `gtr` and `ltr`.)\n\nNote that, since ranges may be non-contiguous, a version might not be\ngreater than a range, less than a range, *or* satisfy a range!  For\nexample, the range `1.2 <1.2.9 || >2.0.0` would have a hole from `1.2.9`\nuntil `2.0.0`, so the version `1.2.10` would not be greater than the\nrange (because `2.0.1` satisfies, which is higher), nor less than the\nrange (since `1.2.8` satisfies, which is lower), and it also does not\nsatisfy the range.\n\nIf you want to know if a version satisfies or does not satisfy a\nrange, use the `satisfies(version, range)` function.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/npm/node-semver/issues"
+  },
+  "homepage": "https://github.com/npm/node-semver#readme",
+  "_id": "semver@5.0.3",
+  "_shasum": "77466de589cd5d3c95f138aa78bc569a3cb5d27a",
+  "_resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
+  "_from": "semver@>=5.0.3 <5.1.0"
 }
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/README.md b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/README.md
new file mode 100644
index 00000000000000..5a76b4149c5eb5
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/README.md
@@ -0,0 +1,3 @@
+# core-util-is
+
+The `util.is*` functions introduced in Node v0.12.
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/float.patch b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/float.patch
new file mode 100644
index 00000000000000..a06d5c05f75fd5
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/float.patch
@@ -0,0 +1,604 @@
+diff --git a/lib/util.js b/lib/util.js
+index a03e874..9074e8e 100644
+--- a/lib/util.js
++++ b/lib/util.js
+@@ -19,430 +19,6 @@
+ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ // USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-var formatRegExp = /%[sdj%]/g;
+-exports.format = function(f) {
+-  if (!isString(f)) {
+-    var objects = [];
+-    for (var i = 0; i < arguments.length; i++) {
+-      objects.push(inspect(arguments[i]));
+-    }
+-    return objects.join(' ');
+-  }
+-
+-  var i = 1;
+-  var args = arguments;
+-  var len = args.length;
+-  var str = String(f).replace(formatRegExp, function(x) {
+-    if (x === '%%') return '%';
+-    if (i >= len) return x;
+-    switch (x) {
+-      case '%s': return String(args[i++]);
+-      case '%d': return Number(args[i++]);
+-      case '%j':
+-        try {
+-          return JSON.stringify(args[i++]);
+-        } catch (_) {
+-          return '[Circular]';
+-        }
+-      default:
+-        return x;
+-    }
+-  });
+-  for (var x = args[i]; i < len; x = args[++i]) {
+-    if (isNull(x) || !isObject(x)) {
+-      str += ' ' + x;
+-    } else {
+-      str += ' ' + inspect(x);
+-    }
+-  }
+-  return str;
+-};
+-
+-
+-// Mark that a method should not be used.
+-// Returns a modified function which warns once by default.
+-// If --no-deprecation is set, then it is a no-op.
+-exports.deprecate = function(fn, msg) {
+-  // Allow for deprecating things in the process of starting up.
+-  if (isUndefined(global.process)) {
+-    return function() {
+-      return exports.deprecate(fn, msg).apply(this, arguments);
+-    };
+-  }
+-
+-  if (process.noDeprecation === true) {
+-    return fn;
+-  }
+-
+-  var warned = false;
+-  function deprecated() {
+-    if (!warned) {
+-      if (process.throwDeprecation) {
+-        throw new Error(msg);
+-      } else if (process.traceDeprecation) {
+-        console.trace(msg);
+-      } else {
+-        console.error(msg);
+-      }
+-      warned = true;
+-    }
+-    return fn.apply(this, arguments);
+-  }
+-
+-  return deprecated;
+-};
+-
+-
+-var debugs = {};
+-var debugEnviron;
+-exports.debuglog = function(set) {
+-  if (isUndefined(debugEnviron))
+-    debugEnviron = process.env.NODE_DEBUG || '';
+-  set = set.toUpperCase();
+-  if (!debugs[set]) {
+-    if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
+-      var pid = process.pid;
+-      debugs[set] = function() {
+-        var msg = exports.format.apply(exports, arguments);
+-        console.error('%s %d: %s', set, pid, msg);
+-      };
+-    } else {
+-      debugs[set] = function() {};
+-    }
+-  }
+-  return debugs[set];
+-};
+-
+-
+-/**
+- * Echos the value of a value. Trys to print the value out
+- * in the best way possible given the different types.
+- *
+- * @param {Object} obj The object to print out.
+- * @param {Object} opts Optional options object that alters the output.
+- */
+-/* legacy: obj, showHidden, depth, colors*/
+-function inspect(obj, opts) {
+-  // default options
+-  var ctx = {
+-    seen: [],
+-    stylize: stylizeNoColor
+-  };
+-  // legacy...
+-  if (arguments.length >= 3) ctx.depth = arguments[2];
+-  if (arguments.length >= 4) ctx.colors = arguments[3];
+-  if (isBoolean(opts)) {
+-    // legacy...
+-    ctx.showHidden = opts;
+-  } else if (opts) {
+-    // got an "options" object
+-    exports._extend(ctx, opts);
+-  }
+-  // set default options
+-  if (isUndefined(ctx.showHidden)) ctx.showHidden = false;
+-  if (isUndefined(ctx.depth)) ctx.depth = 2;
+-  if (isUndefined(ctx.colors)) ctx.colors = false;
+-  if (isUndefined(ctx.customInspect)) ctx.customInspect = true;
+-  if (ctx.colors) ctx.stylize = stylizeWithColor;
+-  return formatValue(ctx, obj, ctx.depth);
+-}
+-exports.inspect = inspect;
+-
+-
+-// http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
+-inspect.colors = {
+-  'bold' : [1, 22],
+-  'italic' : [3, 23],
+-  'underline' : [4, 24],
+-  'inverse' : [7, 27],
+-  'white' : [37, 39],
+-  'grey' : [90, 39],
+-  'black' : [30, 39],
+-  'blue' : [34, 39],
+-  'cyan' : [36, 39],
+-  'green' : [32, 39],
+-  'magenta' : [35, 39],
+-  'red' : [31, 39],
+-  'yellow' : [33, 39]
+-};
+-
+-// Don't use 'blue' not visible on cmd.exe
+-inspect.styles = {
+-  'special': 'cyan',
+-  'number': 'yellow',
+-  'boolean': 'yellow',
+-  'undefined': 'grey',
+-  'null': 'bold',
+-  'string': 'green',
+-  'date': 'magenta',
+-  // "name": intentionally not styling
+-  'regexp': 'red'
+-};
+-
+-
+-function stylizeWithColor(str, styleType) {
+-  var style = inspect.styles[styleType];
+-
+-  if (style) {
+-    return '\u001b[' + inspect.colors[style][0] + 'm' + str +
+-           '\u001b[' + inspect.colors[style][1] + 'm';
+-  } else {
+-    return str;
+-  }
+-}
+-
+-
+-function stylizeNoColor(str, styleType) {
+-  return str;
+-}
+-
+-
+-function arrayToHash(array) {
+-  var hash = {};
+-
+-  array.forEach(function(val, idx) {
+-    hash[val] = true;
+-  });
+-
+-  return hash;
+-}
+-
+-
+-function formatValue(ctx, value, recurseTimes) {
+-  // Provide a hook for user-specified inspect functions.
+-  // Check that value is an object with an inspect function on it
+-  if (ctx.customInspect &&
+-      value &&
+-      isFunction(value.inspect) &&
+-      // Filter out the util module, it's inspect function is special
+-      value.inspect !== exports.inspect &&
+-      // Also filter out any prototype objects using the circular check.
+-      !(value.constructor && value.constructor.prototype === value)) {
+-    var ret = value.inspect(recurseTimes, ctx);
+-    if (!isString(ret)) {
+-      ret = formatValue(ctx, ret, recurseTimes);
+-    }
+-    return ret;
+-  }
+-
+-  // Primitive types cannot have properties
+-  var primitive = formatPrimitive(ctx, value);
+-  if (primitive) {
+-    return primitive;
+-  }
+-
+-  // Look up the keys of the object.
+-  var keys = Object.keys(value);
+-  var visibleKeys = arrayToHash(keys);
+-
+-  if (ctx.showHidden) {
+-    keys = Object.getOwnPropertyNames(value);
+-  }
+-
+-  // Some type of object without properties can be shortcutted.
+-  if (keys.length === 0) {
+-    if (isFunction(value)) {
+-      var name = value.name ? ': ' + value.name : '';
+-      return ctx.stylize('[Function' + name + ']', 'special');
+-    }
+-    if (isRegExp(value)) {
+-      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+-    }
+-    if (isDate(value)) {
+-      return ctx.stylize(Date.prototype.toString.call(value), 'date');
+-    }
+-    if (isError(value)) {
+-      return formatError(value);
+-    }
+-  }
+-
+-  var base = '', array = false, braces = ['{', '}'];
+-
+-  // Make Array say that they are Array
+-  if (isArray(value)) {
+-    array = true;
+-    braces = ['[', ']'];
+-  }
+-
+-  // Make functions say that they are functions
+-  if (isFunction(value)) {
+-    var n = value.name ? ': ' + value.name : '';
+-    base = ' [Function' + n + ']';
+-  }
+-
+-  // Make RegExps say that they are RegExps
+-  if (isRegExp(value)) {
+-    base = ' ' + RegExp.prototype.toString.call(value);
+-  }
+-
+-  // Make dates with properties first say the date
+-  if (isDate(value)) {
+-    base = ' ' + Date.prototype.toUTCString.call(value);
+-  }
+-
+-  // Make error with message first say the error
+-  if (isError(value)) {
+-    base = ' ' + formatError(value);
+-  }
+-
+-  if (keys.length === 0 && (!array || value.length == 0)) {
+-    return braces[0] + base + braces[1];
+-  }
+-
+-  if (recurseTimes < 0) {
+-    if (isRegExp(value)) {
+-      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+-    } else {
+-      return ctx.stylize('[Object]', 'special');
+-    }
+-  }
+-
+-  ctx.seen.push(value);
+-
+-  var output;
+-  if (array) {
+-    output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
+-  } else {
+-    output = keys.map(function(key) {
+-      return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
+-    });
+-  }
+-
+-  ctx.seen.pop();
+-
+-  return reduceToSingleString(output, base, braces);
+-}
+-
+-
+-function formatPrimitive(ctx, value) {
+-  if (isUndefined(value))
+-    return ctx.stylize('undefined', 'undefined');
+-  if (isString(value)) {
+-    var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
+-                                             .replace(/'/g, "\\'")
+-                                             .replace(/\\"/g, '"') + '\'';
+-    return ctx.stylize(simple, 'string');
+-  }
+-  if (isNumber(value)) {
+-    // Format -0 as '-0'. Strict equality won't distinguish 0 from -0,
+-    // so instead we use the fact that 1 / -0 < 0 whereas 1 / 0 > 0 .
+-    if (value === 0 && 1 / value < 0)
+-      return ctx.stylize('-0', 'number');
+-    return ctx.stylize('' + value, 'number');
+-  }
+-  if (isBoolean(value))
+-    return ctx.stylize('' + value, 'boolean');
+-  // For some reason typeof null is "object", so special case here.
+-  if (isNull(value))
+-    return ctx.stylize('null', 'null');
+-}
+-
+-
+-function formatError(value) {
+-  return '[' + Error.prototype.toString.call(value) + ']';
+-}
+-
+-
+-function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
+-  var output = [];
+-  for (var i = 0, l = value.length; i < l; ++i) {
+-    if (hasOwnProperty(value, String(i))) {
+-      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+-          String(i), true));
+-    } else {
+-      output.push('');
+-    }
+-  }
+-  keys.forEach(function(key) {
+-    if (!key.match(/^\d+$/)) {
+-      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+-          key, true));
+-    }
+-  });
+-  return output;
+-}
+-
+-
+-function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
+-  var name, str, desc;
+-  desc = Object.getOwnPropertyDescriptor(value, key) || { value: value[key] };
+-  if (desc.get) {
+-    if (desc.set) {
+-      str = ctx.stylize('[Getter/Setter]', 'special');
+-    } else {
+-      str = ctx.stylize('[Getter]', 'special');
+-    }
+-  } else {
+-    if (desc.set) {
+-      str = ctx.stylize('[Setter]', 'special');
+-    }
+-  }
+-  if (!hasOwnProperty(visibleKeys, key)) {
+-    name = '[' + key + ']';
+-  }
+-  if (!str) {
+-    if (ctx.seen.indexOf(desc.value) < 0) {
+-      if (isNull(recurseTimes)) {
+-        str = formatValue(ctx, desc.value, null);
+-      } else {
+-        str = formatValue(ctx, desc.value, recurseTimes - 1);
+-      }
+-      if (str.indexOf('\n') > -1) {
+-        if (array) {
+-          str = str.split('\n').map(function(line) {
+-            return '  ' + line;
+-          }).join('\n').substr(2);
+-        } else {
+-          str = '\n' + str.split('\n').map(function(line) {
+-            return '   ' + line;
+-          }).join('\n');
+-        }
+-      }
+-    } else {
+-      str = ctx.stylize('[Circular]', 'special');
+-    }
+-  }
+-  if (isUndefined(name)) {
+-    if (array && key.match(/^\d+$/)) {
+-      return str;
+-    }
+-    name = JSON.stringify('' + key);
+-    if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
+-      name = name.substr(1, name.length - 2);
+-      name = ctx.stylize(name, 'name');
+-    } else {
+-      name = name.replace(/'/g, "\\'")
+-                 .replace(/\\"/g, '"')
+-                 .replace(/(^"|"$)/g, "'");
+-      name = ctx.stylize(name, 'string');
+-    }
+-  }
+-
+-  return name + ': ' + str;
+-}
+-
+-
+-function reduceToSingleString(output, base, braces) {
+-  var numLinesEst = 0;
+-  var length = output.reduce(function(prev, cur) {
+-    numLinesEst++;
+-    if (cur.indexOf('\n') >= 0) numLinesEst++;
+-    return prev + cur.replace(/\u001b\[\d\d?m/g, '').length + 1;
+-  }, 0);
+-
+-  if (length > 60) {
+-    return braces[0] +
+-           (base === '' ? '' : base + '\n ') +
+-           ' ' +
+-           output.join(',\n  ') +
+-           ' ' +
+-           braces[1];
+-  }
+-
+-  return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
+-}
+-
+-
+ // NOTE: These type checking functions intentionally don't use `instanceof`
+ // because it is fragile and can be easily faked with `Object.create()`.
+ function isArray(ar) {
+@@ -522,166 +98,10 @@ function isPrimitive(arg) {
+ exports.isPrimitive = isPrimitive;
+
+ function isBuffer(arg) {
+-  return arg instanceof Buffer;
++  return Buffer.isBuffer(arg);
+ }
+ exports.isBuffer = isBuffer;
+
+ function objectToString(o) {
+   return Object.prototype.toString.call(o);
+-}
+-
+-
+-function pad(n) {
+-  return n < 10 ? '0' + n.toString(10) : n.toString(10);
+-}
+-
+-
+-var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',
+-              'Oct', 'Nov', 'Dec'];
+-
+-// 26 Feb 16:19:34
+-function timestamp() {
+-  var d = new Date();
+-  var time = [pad(d.getHours()),
+-              pad(d.getMinutes()),
+-              pad(d.getSeconds())].join(':');
+-  return [d.getDate(), months[d.getMonth()], time].join(' ');
+-}
+-
+-
+-// log is just a thin wrapper to console.log that prepends a timestamp
+-exports.log = function() {
+-  console.log('%s - %s', timestamp(), exports.format.apply(exports, arguments));
+-};
+-
+-
+-/**
+- * Inherit the prototype methods from one constructor into another.
+- *
+- * The Function.prototype.inherits from lang.js rewritten as a standalone
+- * function (not on Function.prototype). NOTE: If this file is to be loaded
+- * during bootstrapping this function needs to be rewritten using some native
+- * functions as prototype setup using normal JavaScript does not work as
+- * expected during bootstrapping (see mirror.js in r114903).
+- *
+- * @param {function} ctor Constructor function which needs to inherit the
+- *     prototype.
+- * @param {function} superCtor Constructor function to inherit prototype from.
+- */
+-exports.inherits = function(ctor, superCtor) {
+-  ctor.super_ = superCtor;
+-  ctor.prototype = Object.create(superCtor.prototype, {
+-    constructor: {
+-      value: ctor,
+-      enumerable: false,
+-      writable: true,
+-      configurable: true
+-    }
+-  });
+-};
+-
+-exports._extend = function(origin, add) {
+-  // Don't do anything if add isn't an object
+-  if (!add || !isObject(add)) return origin;
+-
+-  var keys = Object.keys(add);
+-  var i = keys.length;
+-  while (i--) {
+-    origin[keys[i]] = add[keys[i]];
+-  }
+-  return origin;
+-};
+-
+-function hasOwnProperty(obj, prop) {
+-  return Object.prototype.hasOwnProperty.call(obj, prop);
+-}
+-
+-
+-// Deprecated old stuff.
+-
+-exports.p = exports.deprecate(function() {
+-  for (var i = 0, len = arguments.length; i < len; ++i) {
+-    console.error(exports.inspect(arguments[i]));
+-  }
+-}, 'util.p: Use console.error() instead');
+-
+-
+-exports.exec = exports.deprecate(function() {
+-  return require('child_process').exec.apply(this, arguments);
+-}, 'util.exec is now called `child_process.exec`.');
+-
+-
+-exports.print = exports.deprecate(function() {
+-  for (var i = 0, len = arguments.length; i < len; ++i) {
+-    process.stdout.write(String(arguments[i]));
+-  }
+-}, 'util.print: Use console.log instead');
+-
+-
+-exports.puts = exports.deprecate(function() {
+-  for (var i = 0, len = arguments.length; i < len; ++i) {
+-    process.stdout.write(arguments[i] + '\n');
+-  }
+-}, 'util.puts: Use console.log instead');
+-
+-
+-exports.debug = exports.deprecate(function(x) {
+-  process.stderr.write('DEBUG: ' + x + '\n');
+-}, 'util.debug: Use console.error instead');
+-
+-
+-exports.error = exports.deprecate(function(x) {
+-  for (var i = 0, len = arguments.length; i < len; ++i) {
+-    process.stderr.write(arguments[i] + '\n');
+-  }
+-}, 'util.error: Use console.error instead');
+-
+-
+-exports.pump = exports.deprecate(function(readStream, writeStream, callback) {
+-  var callbackCalled = false;
+-
+-  function call(a, b, c) {
+-    if (callback && !callbackCalled) {
+-      callback(a, b, c);
+-      callbackCalled = true;
+-    }
+-  }
+-
+-  readStream.addListener('data', function(chunk) {
+-    if (writeStream.write(chunk) === false) readStream.pause();
+-  });
+-
+-  writeStream.addListener('drain', function() {
+-    readStream.resume();
+-  });
+-
+-  readStream.addListener('end', function() {
+-    writeStream.end();
+-  });
+-
+-  readStream.addListener('close', function() {
+-    call();
+-  });
+-
+-  readStream.addListener('error', function(err) {
+-    writeStream.end();
+-    call(err);
+-  });
+-
+-  writeStream.addListener('error', function(err) {
+-    readStream.destroy();
+-    call(err);
+-  });
+-}, 'util.pump(): Use readableStream.pipe() instead');
+-
+-
+-var uv;
+-exports._errnoException = function(err, syscall) {
+-  if (isUndefined(uv)) uv = process.binding('uv');
+-  var errname = uv.errname(err);
+-  var e = new Error(syscall + ' ' + errname);
+-  e.code = errname;
+-  e.errno = errname;
+-  e.syscall = syscall;
+-  return e;
+-};
++}
\ No newline at end of file
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/lib/util.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
new file mode 100644
index 00000000000000..9074e8ebcb61e9
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/lib/util.js
@@ -0,0 +1,107 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// NOTE: These type checking functions intentionally don't use `instanceof`
+// because it is fragile and can be easily faked with `Object.create()`.
+function isArray(ar) {
+  return Array.isArray(ar);
+}
+exports.isArray = isArray;
+
+function isBoolean(arg) {
+  return typeof arg === 'boolean';
+}
+exports.isBoolean = isBoolean;
+
+function isNull(arg) {
+  return arg === null;
+}
+exports.isNull = isNull;
+
+function isNullOrUndefined(arg) {
+  return arg == null;
+}
+exports.isNullOrUndefined = isNullOrUndefined;
+
+function isNumber(arg) {
+  return typeof arg === 'number';
+}
+exports.isNumber = isNumber;
+
+function isString(arg) {
+  return typeof arg === 'string';
+}
+exports.isString = isString;
+
+function isSymbol(arg) {
+  return typeof arg === 'symbol';
+}
+exports.isSymbol = isSymbol;
+
+function isUndefined(arg) {
+  return arg === void 0;
+}
+exports.isUndefined = isUndefined;
+
+function isRegExp(re) {
+  return isObject(re) && objectToString(re) === '[object RegExp]';
+}
+exports.isRegExp = isRegExp;
+
+function isObject(arg) {
+  return typeof arg === 'object' && arg !== null;
+}
+exports.isObject = isObject;
+
+function isDate(d) {
+  return isObject(d) && objectToString(d) === '[object Date]';
+}
+exports.isDate = isDate;
+
+function isError(e) {
+  return isObject(e) &&
+      (objectToString(e) === '[object Error]' || e instanceof Error);
+}
+exports.isError = isError;
+
+function isFunction(arg) {
+  return typeof arg === 'function';
+}
+exports.isFunction = isFunction;
+
+function isPrimitive(arg) {
+  return arg === null ||
+         typeof arg === 'boolean' ||
+         typeof arg === 'number' ||
+         typeof arg === 'string' ||
+         typeof arg === 'symbol' ||  // ES6 symbol
+         typeof arg === 'undefined';
+}
+exports.isPrimitive = isPrimitive;
+
+function isBuffer(arg) {
+  return Buffer.isBuffer(arg);
+}
+exports.isBuffer = isBuffer;
+
+function objectToString(o) {
+  return Object.prototype.toString.call(o);
+}
\ No newline at end of file
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/package.json b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/package.json
new file mode 100644
index 00000000000000..b67333380c265e
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/package.json
@@ -0,0 +1,37 @@
+{
+  "name": "core-util-is",
+  "version": "1.0.1",
+  "description": "The `util.is*` functions introduced in Node v0.12.",
+  "main": "lib/util.js",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/core-util-is.git"
+  },
+  "keywords": [
+    "util",
+    "isBuffer",
+    "isArray",
+    "isNumber",
+    "isString",
+    "isRegExp",
+    "isThis",
+    "isThat",
+    "polyfill"
+  ],
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/isaacs/core-util-is/issues"
+  },
+  "readme": "# core-util-is\n\nThe `util.is*` functions introduced in Node v0.12.\n",
+  "readmeFilename": "README.md",
+  "homepage": "https://github.com/isaacs/core-util-is#readme",
+  "_id": "core-util-is@1.0.1",
+  "_shasum": "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538",
+  "_resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+  "_from": "core-util-is@>=1.0.0 <1.1.0"
+}
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/util.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/util.js
new file mode 100644
index 00000000000000..007fa10575636d
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/core-util-is/util.js
@@ -0,0 +1,106 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// NOTE: These type checking functions intentionally don't use `instanceof`
+// because it is fragile and can be easily faked with `Object.create()`.
+function isArray(ar) {
+  return Array.isArray(ar);
+}
+exports.isArray = isArray;
+
+function isBoolean(arg) {
+  return typeof arg === 'boolean';
+}
+exports.isBoolean = isBoolean;
+
+function isNull(arg) {
+  return arg === null;
+}
+exports.isNull = isNull;
+
+function isNullOrUndefined(arg) {
+  return arg == null;
+}
+exports.isNullOrUndefined = isNullOrUndefined;
+
+function isNumber(arg) {
+  return typeof arg === 'number';
+}
+exports.isNumber = isNumber;
+
+function isString(arg) {
+  return typeof arg === 'string';
+}
+exports.isString = isString;
+
+function isSymbol(arg) {
+  return typeof arg === 'symbol';
+}
+exports.isSymbol = isSymbol;
+
+function isUndefined(arg) {
+  return arg === void 0;
+}
+exports.isUndefined = isUndefined;
+
+function isRegExp(re) {
+  return isObject(re) && objectToString(re) === '[object RegExp]';
+}
+exports.isRegExp = isRegExp;
+
+function isObject(arg) {
+  return typeof arg === 'object' && arg !== null;
+}
+exports.isObject = isObject;
+
+function isDate(d) {
+  return isObject(d) && objectToString(d) === '[object Date]';
+}
+exports.isDate = isDate;
+
+function isError(e) {
+  return isObject(e) && objectToString(e) === '[object Error]';
+}
+exports.isError = isError;
+
+function isFunction(arg) {
+  return typeof arg === 'function';
+}
+exports.isFunction = isFunction;
+
+function isPrimitive(arg) {
+  return arg === null ||
+         typeof arg === 'boolean' ||
+         typeof arg === 'number' ||
+         typeof arg === 'string' ||
+         typeof arg === 'symbol' ||  // ES6 symbol
+         typeof arg === 'undefined';
+}
+exports.isPrimitive = isPrimitive;
+
+function isBuffer(arg) {
+  return arg instanceof Buffer;
+}
+exports.isBuffer = isBuffer;
+
+function objectToString(o) {
+  return Object.prototype.toString.call(o);
+}
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/README.md b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/README.md
new file mode 100644
index 00000000000000..052a62b8d7b7ae
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/README.md
@@ -0,0 +1,54 @@
+
+# isarray
+
+`Array#isArray` for older browsers.
+
+## Usage
+
+```js
+var isArray = require('isarray');
+
+console.log(isArray([])); // => true
+console.log(isArray({})); // => false
+```
+
+## Installation
+
+With [npm](http://npmjs.org) do
+
+```bash
+$ npm install isarray
+```
+
+Then bundle for the browser with
+[browserify](https://github.com/substack/browserify).
+
+With [component](http://component.io) do
+
+```bash
+$ component install juliangruber/isarray
+```
+
+## License
+
+(MIT)
+
+Copyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/build/build.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/build/build.js
new file mode 100644
index 00000000000000..e1856ef0943728
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/build/build.js
@@ -0,0 +1,208 @@
+
+/**
+ * Require the given path.
+ *
+ * @param {String} path
+ * @return {Object} exports
+ * @api public
+ */
+
+function require(path, parent, orig) {
+  var resolved = require.resolve(path);
+
+  // lookup failed
+  if (null == resolved) {
+    orig = orig || path;
+    parent = parent || 'root';
+    var err = new Error('Failed to require "' + orig + '" from "' + parent + '"');
+    err.path = orig;
+    err.parent = parent;
+    err.require = true;
+    throw err;
+  }
+
+  var module = require.modules[resolved];
+
+  // perform real require()
+  // by invoking the module's
+  // registered function
+  if (!module.exports) {
+    module.exports = {};
+    module.client = module.component = true;
+    module.call(this, module.exports, require.relative(resolved), module);
+  }
+
+  return module.exports;
+}
+
+/**
+ * Registered modules.
+ */
+
+require.modules = {};
+
+/**
+ * Registered aliases.
+ */
+
+require.aliases = {};
+
+/**
+ * Resolve `path`.
+ *
+ * Lookup:
+ *
+ *   - PATH/index.js
+ *   - PATH.js
+ *   - PATH
+ *
+ * @param {String} path
+ * @return {String} path or null
+ * @api private
+ */
+
+require.resolve = function(path) {
+  if (path.charAt(0) === '/') path = path.slice(1);
+  var index = path + '/index.js';
+
+  var paths = [
+    path,
+    path + '.js',
+    path + '.json',
+    path + '/index.js',
+    path + '/index.json'
+  ];
+
+  for (var i = 0; i < paths.length; i++) {
+    var path = paths[i];
+    if (require.modules.hasOwnProperty(path)) return path;
+  }
+
+  if (require.aliases.hasOwnProperty(index)) {
+    return require.aliases[index];
+  }
+};
+
+/**
+ * Normalize `path` relative to the current path.
+ *
+ * @param {String} curr
+ * @param {String} path
+ * @return {String}
+ * @api private
+ */
+
+require.normalize = function(curr, path) {
+  var segs = [];
+
+  if ('.' != path.charAt(0)) return path;
+
+  curr = curr.split('/');
+  path = path.split('/');
+
+  for (var i = 0; i < path.length; ++i) {
+    if ('..' == path[i]) {
+      curr.pop();
+    } else if ('.' != path[i] && '' != path[i]) {
+      segs.push(path[i]);
+    }
+  }
+
+  return curr.concat(segs).join('/');
+};
+
+/**
+ * Register module at `path` with callback `definition`.
+ *
+ * @param {String} path
+ * @param {Function} definition
+ * @api private
+ */
+
+require.register = function(path, definition) {
+  require.modules[path] = definition;
+};
+
+/**
+ * Alias a module definition.
+ *
+ * @param {String} from
+ * @param {String} to
+ * @api private
+ */
+
+require.alias = function(from, to) {
+  if (!require.modules.hasOwnProperty(from)) {
+    throw new Error('Failed to alias "' + from + '", it does not exist');
+  }
+  require.aliases[to] = from;
+};
+
+/**
+ * Return a require function relative to the `parent` path.
+ *
+ * @param {String} parent
+ * @return {Function}
+ * @api private
+ */
+
+require.relative = function(parent) {
+  var p = require.normalize(parent, '..');
+
+  /**
+   * lastIndexOf helper.
+   */
+
+  function lastIndexOf(arr, obj) {
+    var i = arr.length;
+    while (i--) {
+      if (arr[i] === obj) return i;
+    }
+    return -1;
+  }
+
+  /**
+   * The relative require() itself.
+   */
+
+  function localRequire(path) {
+    var resolved = localRequire.resolve(path);
+    return require(resolved, parent, path);
+  }
+
+  /**
+   * Resolve relative to the parent.
+   */
+
+  localRequire.resolve = function(path) {
+    var c = path.charAt(0);
+    if ('/' == c) return path.slice(1);
+    if ('.' == c) return require.normalize(p, path);
+
+    // resolve deps by returning
+    // the dep in the nearest "deps"
+    // directory
+    var segs = parent.split('/');
+    var i = lastIndexOf(segs, 'deps') + 1;
+    if (!i) i = 0;
+    path = segs.slice(0, i + 1).join('/') + '/deps/' + path;
+    return path;
+  };
+
+  /**
+   * Check if module is defined at `path`.
+   */
+
+  localRequire.exists = function(path) {
+    return require.modules.hasOwnProperty(localRequire.resolve(path));
+  };
+
+  return localRequire;
+};
+require.register("isarray/index.js", function(exports, require, module){
+module.exports = Array.isArray || function (arr) {
+  return Object.prototype.toString.call(arr) == '[object Array]';
+};
+
+});
+require.alias("isarray/index.js", "isarray/index.js");
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/component.json b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/component.json
new file mode 100644
index 00000000000000..9e31b683889015
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/component.json
@@ -0,0 +1,19 @@
+{
+  "name" : "isarray",
+  "description" : "Array#isArray for older browsers",
+  "version" : "0.0.1",
+  "repository" : "juliangruber/isarray",
+  "homepage": "https://github.com/juliangruber/isarray",
+  "main" : "index.js",
+  "scripts" : [
+    "index.js"
+  ],
+  "dependencies" : {},
+  "keywords": ["browser","isarray","array"],
+  "author": {
+    "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
+    "url": "http://juliangruber.com"
+  },
+  "license": "MIT"
+}
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/index.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/index.js
new file mode 100644
index 00000000000000..5f5ad45d46dda9
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/index.js
@@ -0,0 +1,3 @@
+module.exports = Array.isArray || function (arr) {
+  return Object.prototype.toString.call(arr) == '[object Array]';
+};
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/package.json b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/package.json
new file mode 100644
index 00000000000000..fb1eb3786d8168
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/isarray/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "isarray",
+  "description": "Array#isArray for older browsers",
+  "version": "0.0.1",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/juliangruber/isarray.git"
+  },
+  "homepage": "https://github.com/juliangruber/isarray",
+  "main": "index.js",
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "tap": "*"
+  },
+  "keywords": [
+    "browser",
+    "isarray",
+    "array"
+  ],
+  "author": {
+    "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
+    "url": "http://juliangruber.com"
+  },
+  "license": "MIT",
+  "readme": "\n# isarray\n\n`Array#isArray` for older browsers.\n\n## Usage\n\n```js\nvar isArray = require('isarray');\n\nconsole.log(isArray([])); // => true\nconsole.log(isArray({})); // => false\n```\n\n## Installation\n\nWith [npm](http://npmjs.org) do\n\n```bash\n$ npm install isarray\n```\n\nThen bundle for the browser with\n[browserify](https://github.com/substack/browserify).\n\nWith [component](http://component.io) do\n\n```bash\n$ component install juliangruber/isarray\n```\n\n## License\n\n(MIT)\n\nCopyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the \"Software\"), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\nof the Software, and to permit persons to whom the Software is furnished to do\nso, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/juliangruber/isarray/issues"
+  },
+  "_id": "isarray@0.0.1",
+  "_shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf",
+  "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+  "_from": "isarray@0.0.1"
+}
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml
new file mode 100644
index 00000000000000..5ac98855343cee
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/.travis.yml
@@ -0,0 +1,7 @@
+language: node_js
+node_js:
+  - "0.8"
+  - "0.10"
+  - "0.11"
+  - "0.12"
+  - "iojs"
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/index.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/index.js
new file mode 100644
index 00000000000000..049521cad7ba1b
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/index.js
@@ -0,0 +1,13 @@
+'use strict';
+module.exports = nextTick;
+
+function nextTick(fn) {
+  var args = new Array(arguments.length - 1);
+  var i = 0;
+  while (i < args.length) {
+    args[i++] = arguments[i];
+  }
+  process.nextTick(function afterTick() {
+    fn.apply(null, args);
+  });
+}
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/license.md b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/license.md
new file mode 100644
index 00000000000000..c67e3532b54245
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/license.md
@@ -0,0 +1,19 @@
+# Copyright (c) 2015 Calvin Metcalf
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+**THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.**
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/package.json b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/package.json
new file mode 100644
index 00000000000000..bfaa2785f0b685
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "process-nextick-args",
+  "version": "1.0.3",
+  "description": "process.nextTick but always with args",
+  "main": "index.js",
+  "scripts": {
+    "test": "node test.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/calvinmetcalf/process-nextick-args.git"
+  },
+  "author": "",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/calvinmetcalf/process-nextick-args/issues"
+  },
+  "homepage": "https://github.com/calvinmetcalf/process-nextick-args",
+  "devDependencies": {
+    "tap": "~0.2.6"
+  },
+  "readme": "process-nextick-args\n=====\n\n[![Build Status](https://travis-ci.org/calvinmetcalf/process-nextick-args.svg?branch=master)](https://travis-ci.org/calvinmetcalf/process-nextick-args)\n\n```bash\nnpm install --save process-nextick-args\n```\n\nAlways be able to pass arguments to process.nextTick, no matter the platform\n\n```js\nvar nextTick = require('process-nextick-args');\n\nnextTick(function (a, b, c) {\n  console.log(a, b, c);\n}, 'step', 3,  'profit');\n```\n",
+  "readmeFilename": "readme.md",
+  "_id": "process-nextick-args@1.0.3",
+  "_shasum": "e272eed825d5e9f4ea74d8d73b1fe311c3beb630",
+  "_resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz",
+  "_from": "process-nextick-args@>=1.0.0 <1.1.0"
+}
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/readme.md b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/readme.md
new file mode 100644
index 00000000000000..78e7cfaeb7acde
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/readme.md
@@ -0,0 +1,18 @@
+process-nextick-args
+=====
+
+[![Build Status](https://travis-ci.org/calvinmetcalf/process-nextick-args.svg?branch=master)](https://travis-ci.org/calvinmetcalf/process-nextick-args)
+
+```bash
+npm install --save process-nextick-args
+```
+
+Always be able to pass arguments to process.nextTick, no matter the platform
+
+```js
+var nextTick = require('process-nextick-args');
+
+nextTick(function (a, b, c) {
+  console.log(a, b, c);
+}, 'step', 3,  'profit');
+```
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/test.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/test.js
new file mode 100644
index 00000000000000..ef15721584ac99
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/process-nextick-args/test.js
@@ -0,0 +1,24 @@
+var test = require("tap").test;
+var nextTick = require('./');
+
+test('should work', function (t) {
+  t.plan(5);
+  nextTick(function (a) {
+    t.ok(a);
+    nextTick(function (thing) {
+      t.equals(thing, 7);
+    }, 7);
+  }, true);
+  nextTick(function (a, b, c) {
+    t.equals(a, 'step');
+    t.equals(b, 3);
+    t.equals(c, 'profit');
+  }, 'step', 3,  'profit');
+});
+
+test('correct number of arguments', function (t) {
+  t.plan(1);
+  nextTick(function () {
+    t.equals(2, arguments.length, 'correct number');
+  }, 1, 2);
+});
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/.npmignore b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/.npmignore
new file mode 100644
index 00000000000000..206320cc1d21b9
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/.npmignore
@@ -0,0 +1,2 @@
+build
+test
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/LICENSE b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/LICENSE
new file mode 100644
index 00000000000000..6de584a48f5c89
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/LICENSE
@@ -0,0 +1,20 @@
+Copyright Joyent, Inc. and other Node contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/README.md b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/README.md
new file mode 100644
index 00000000000000..4d2aa001501107
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/README.md
@@ -0,0 +1,7 @@
+**string_decoder.js** (`require('string_decoder')`) from Node.js core
+
+Copyright Joyent, Inc. and other Node contributors. See LICENCE file for details.
+
+Version numbers match the versions found in Node core, e.g. 0.10.24 matches Node 0.10.24, likewise 0.11.10 matches Node 0.11.10. **Prefer the stable version over the unstable.**
+
+The *build/* directory contains a build script that will scrape the source from the [joyent/node](https://github.com/joyent/node) repo given a specific Node version.
\ No newline at end of file
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/index.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/index.js
new file mode 100644
index 00000000000000..b00e54fb790982
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/index.js
@@ -0,0 +1,221 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var Buffer = require('buffer').Buffer;
+
+var isBufferEncoding = Buffer.isEncoding
+  || function(encoding) {
+       switch (encoding && encoding.toLowerCase()) {
+         case 'hex': case 'utf8': case 'utf-8': case 'ascii': case 'binary': case 'base64': case 'ucs2': case 'ucs-2': case 'utf16le': case 'utf-16le': case 'raw': return true;
+         default: return false;
+       }
+     }
+
+
+function assertEncoding(encoding) {
+  if (encoding && !isBufferEncoding(encoding)) {
+    throw new Error('Unknown encoding: ' + encoding);
+  }
+}
+
+// StringDecoder provides an interface for efficiently splitting a series of
+// buffers into a series of JS strings without breaking apart multi-byte
+// characters. CESU-8 is handled as part of the UTF-8 encoding.
+//
+// @TODO Handling all encodings inside a single object makes it very difficult
+// to reason about this code, so it should be split up in the future.
+// @TODO There should be a utf8-strict encoding that rejects invalid UTF-8 code
+// points as used by CESU-8.
+var StringDecoder = exports.StringDecoder = function(encoding) {
+  this.encoding = (encoding || 'utf8').toLowerCase().replace(/[-_]/, '');
+  assertEncoding(encoding);
+  switch (this.encoding) {
+    case 'utf8':
+      // CESU-8 represents each of Surrogate Pair by 3-bytes
+      this.surrogateSize = 3;
+      break;
+    case 'ucs2':
+    case 'utf16le':
+      // UTF-16 represents each of Surrogate Pair by 2-bytes
+      this.surrogateSize = 2;
+      this.detectIncompleteChar = utf16DetectIncompleteChar;
+      break;
+    case 'base64':
+      // Base-64 stores 3 bytes in 4 chars, and pads the remainder.
+      this.surrogateSize = 3;
+      this.detectIncompleteChar = base64DetectIncompleteChar;
+      break;
+    default:
+      this.write = passThroughWrite;
+      return;
+  }
+
+  // Enough space to store all bytes of a single character. UTF-8 needs 4
+  // bytes, but CESU-8 may require up to 6 (3 bytes per surrogate).
+  this.charBuffer = new Buffer(6);
+  // Number of bytes received for the current incomplete multi-byte character.
+  this.charReceived = 0;
+  // Number of bytes expected for the current incomplete multi-byte character.
+  this.charLength = 0;
+};
+
+
+// write decodes the given buffer and returns it as JS string that is
+// guaranteed to not contain any partial multi-byte characters. Any partial
+// character found at the end of the buffer is buffered up, and will be
+// returned when calling write again with the remaining bytes.
+//
+// Note: Converting a Buffer containing an orphan surrogate to a String
+// currently works, but converting a String to a Buffer (via `new Buffer`, or
+// Buffer#write) will replace incomplete surrogates with the unicode
+// replacement character. See https://codereview.chromium.org/121173009/ .
+StringDecoder.prototype.write = function(buffer) {
+  var charStr = '';
+  // if our last write ended with an incomplete multibyte character
+  while (this.charLength) {
+    // determine how many remaining bytes this buffer has to offer for this char
+    var available = (buffer.length >= this.charLength - this.charReceived) ?
+        this.charLength - this.charReceived :
+        buffer.length;
+
+    // add the new bytes to the char buffer
+    buffer.copy(this.charBuffer, this.charReceived, 0, available);
+    this.charReceived += available;
+
+    if (this.charReceived < this.charLength) {
+      // still not enough chars in this buffer? wait for more ...
+      return '';
+    }
+
+    // remove bytes belonging to the current character from the buffer
+    buffer = buffer.slice(available, buffer.length);
+
+    // get the character that was split
+    charStr = this.charBuffer.slice(0, this.charLength).toString(this.encoding);
+
+    // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character
+    var charCode = charStr.charCodeAt(charStr.length - 1);
+    if (charCode >= 0xD800 && charCode <= 0xDBFF) {
+      this.charLength += this.surrogateSize;
+      charStr = '';
+      continue;
+    }
+    this.charReceived = this.charLength = 0;
+
+    // if there are no more bytes in this buffer, just emit our char
+    if (buffer.length === 0) {
+      return charStr;
+    }
+    break;
+  }
+
+  // determine and set charLength / charReceived
+  this.detectIncompleteChar(buffer);
+
+  var end = buffer.length;
+  if (this.charLength) {
+    // buffer the incomplete character bytes we got
+    buffer.copy(this.charBuffer, 0, buffer.length - this.charReceived, end);
+    end -= this.charReceived;
+  }
+
+  charStr += buffer.toString(this.encoding, 0, end);
+
+  var end = charStr.length - 1;
+  var charCode = charStr.charCodeAt(end);
+  // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character
+  if (charCode >= 0xD800 && charCode <= 0xDBFF) {
+    var size = this.surrogateSize;
+    this.charLength += size;
+    this.charReceived += size;
+    this.charBuffer.copy(this.charBuffer, size, 0, size);
+    buffer.copy(this.charBuffer, 0, 0, size);
+    return charStr.substring(0, end);
+  }
+
+  // or just emit the charStr
+  return charStr;
+};
+
+// detectIncompleteChar determines if there is an incomplete UTF-8 character at
+// the end of the given buffer. If so, it sets this.charLength to the byte
+// length that character, and sets this.charReceived to the number of bytes
+// that are available for this character.
+StringDecoder.prototype.detectIncompleteChar = function(buffer) {
+  // determine how many bytes we have to check at the end of this buffer
+  var i = (buffer.length >= 3) ? 3 : buffer.length;
+
+  // Figure out if one of the last i bytes of our buffer announces an
+  // incomplete char.
+  for (; i > 0; i--) {
+    var c = buffer[buffer.length - i];
+
+    // See http://en.wikipedia.org/wiki/UTF-8#Description
+
+    // 110XXXXX
+    if (i == 1 && c >> 5 == 0x06) {
+      this.charLength = 2;
+      break;
+    }
+
+    // 1110XXXX
+    if (i <= 2 && c >> 4 == 0x0E) {
+      this.charLength = 3;
+      break;
+    }
+
+    // 11110XXX
+    if (i <= 3 && c >> 3 == 0x1E) {
+      this.charLength = 4;
+      break;
+    }
+  }
+  this.charReceived = i;
+};
+
+StringDecoder.prototype.end = function(buffer) {
+  var res = '';
+  if (buffer && buffer.length)
+    res = this.write(buffer);
+
+  if (this.charReceived) {
+    var cr = this.charReceived;
+    var buf = this.charBuffer;
+    var enc = this.encoding;
+    res += buf.slice(0, cr).toString(enc);
+  }
+
+  return res;
+};
+
+function passThroughWrite(buffer) {
+  return buffer.toString(this.encoding);
+}
+
+function utf16DetectIncompleteChar(buffer) {
+  this.charReceived = buffer.length % 2;
+  this.charLength = this.charReceived ? 2 : 0;
+}
+
+function base64DetectIncompleteChar(buffer) {
+  this.charReceived = buffer.length % 3;
+  this.charLength = this.charReceived ? 3 : 0;
+}
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/package.json b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/package.json
new file mode 100644
index 00000000000000..ee70702359198d
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/string_decoder/package.json
@@ -0,0 +1,34 @@
+{
+  "name": "string_decoder",
+  "version": "0.10.31",
+  "description": "The string_decoder module from Node core",
+  "main": "index.js",
+  "dependencies": {},
+  "devDependencies": {
+    "tap": "~0.4.8"
+  },
+  "scripts": {
+    "test": "tap test/simple/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/rvagg/string_decoder.git"
+  },
+  "homepage": "https://github.com/rvagg/string_decoder",
+  "keywords": [
+    "string",
+    "decoder",
+    "browser",
+    "browserify"
+  ],
+  "license": "MIT",
+  "readme": "**string_decoder.js** (`require('string_decoder')`) from Node.js core\n\nCopyright Joyent, Inc. and other Node contributors. See LICENCE file for details.\n\nVersion numbers match the versions found in Node core, e.g. 0.10.24 matches Node 0.10.24, likewise 0.11.10 matches Node 0.11.10. **Prefer the stable version over the unstable.**\n\nThe *build/* directory contains a build script that will scrape the source from the [joyent/node](https://github.com/joyent/node) repo given a specific Node version.",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/rvagg/string_decoder/issues"
+  },
+  "_id": "string_decoder@0.10.31",
+  "_shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94",
+  "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+  "_from": "string_decoder@>=0.10.0 <0.11.0"
+}
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/History.md b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/History.md
new file mode 100644
index 00000000000000..acc8675372e980
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/History.md
@@ -0,0 +1,16 @@
+
+1.0.2 / 2015-10-07
+==================
+
+  * use try/catch when checking `localStorage` (#3, @kumavis)
+
+1.0.1 / 2014-11-25
+==================
+
+  * browser: use `console.warn()` for deprecation calls
+  * browser: more jsdocs
+
+1.0.0 / 2014-04-30
+==================
+
+  * initial commit
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/LICENSE b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/LICENSE
new file mode 100644
index 00000000000000..6a60e8c225c9ba
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/LICENSE
@@ -0,0 +1,24 @@
+(The MIT License)
+
+Copyright (c) 2014 Nathan Rajlich <nathan@tootallnate.net>
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/README.md b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/README.md
new file mode 100644
index 00000000000000..75622fa7c250a6
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/README.md
@@ -0,0 +1,53 @@
+util-deprecate
+==============
+### The Node.js `util.deprecate()` function with browser support
+
+In Node.js, this module simply re-exports the `util.deprecate()` function.
+
+In the web browser (i.e. via browserify), a browser-specific implementation
+of the `util.deprecate()` function is used.
+
+
+## API
+
+A `deprecate()` function is the only thing exposed by this module.
+
+``` javascript
+// setup:
+exports.foo = deprecate(foo, 'foo() is deprecated, use bar() instead');
+
+
+// users see:
+foo();
+// foo() is deprecated, use bar() instead
+foo();
+foo();
+```
+
+
+## License
+
+(The MIT License)
+
+Copyright (c) 2014 Nathan Rajlich <nathan@tootallnate.net>
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/browser.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/browser.js
new file mode 100644
index 00000000000000..549ae2f065ea5a
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/browser.js
@@ -0,0 +1,67 @@
+
+/**
+ * Module exports.
+ */
+
+module.exports = deprecate;
+
+/**
+ * Mark that a method should not be used.
+ * Returns a modified function which warns once by default.
+ *
+ * If `localStorage.noDeprecation = true` is set, then it is a no-op.
+ *
+ * If `localStorage.throwDeprecation = true` is set, then deprecated functions
+ * will throw an Error when invoked.
+ *
+ * If `localStorage.traceDeprecation = true` is set, then deprecated functions
+ * will invoke `console.trace()` instead of `console.error()`.
+ *
+ * @param {Function} fn - the function to deprecate
+ * @param {String} msg - the string to print to the console when `fn` is invoked
+ * @returns {Function} a new "deprecated" version of `fn`
+ * @api public
+ */
+
+function deprecate (fn, msg) {
+  if (config('noDeprecation')) {
+    return fn;
+  }
+
+  var warned = false;
+  function deprecated() {
+    if (!warned) {
+      if (config('throwDeprecation')) {
+        throw new Error(msg);
+      } else if (config('traceDeprecation')) {
+        console.trace(msg);
+      } else {
+        console.warn(msg);
+      }
+      warned = true;
+    }
+    return fn.apply(this, arguments);
+  }
+
+  return deprecated;
+}
+
+/**
+ * Checks `localStorage` for boolean values for the given `name`.
+ *
+ * @param {String} name
+ * @returns {Boolean}
+ * @api private
+ */
+
+function config (name) {
+  // accessing global.localStorage can trigger a DOMException in sandboxed iframes
+  try {
+    if (!global.localStorage) return false;
+  } catch (_) {
+    return false;
+  }
+  var val = global.localStorage[name];
+  if (null == val) return false;
+  return String(val).toLowerCase() === 'true';
+}
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/node.js b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/node.js
new file mode 100644
index 00000000000000..5e6fcff5ddd3fb
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/node.js
@@ -0,0 +1,6 @@
+
+/**
+ * For Node.js, simply re-export the core `util.deprecate` function.
+ */
+
+module.exports = require('util').deprecate;
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/package.json b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/package.json
new file mode 100644
index 00000000000000..d608fcccf45f7f
--- /dev/null
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/node_modules/util-deprecate/package.json
@@ -0,0 +1,53 @@
+{
+  "name": "util-deprecate",
+  "version": "1.0.2",
+  "description": "The Node.js `util.deprecate()` function with browser support",
+  "main": "node.js",
+  "browser": "browser.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/TooTallNate/util-deprecate.git"
+  },
+  "keywords": [
+    "util",
+    "deprecate",
+    "browserify",
+    "browser",
+    "node"
+  ],
+  "author": {
+    "name": "Nathan Rajlich",
+    "email": "nathan@tootallnate.net",
+    "url": "http://n8.io/"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/TooTallNate/util-deprecate/issues"
+  },
+  "homepage": "https://github.com/TooTallNate/util-deprecate",
+  "gitHead": "475fb6857cd23fafff20c1be846c1350abf8e6d4",
+  "_id": "util-deprecate@1.0.2",
+  "_shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf",
+  "_from": "util-deprecate@>=1.0.1 <1.1.0",
+  "_npmVersion": "2.14.4",
+  "_nodeVersion": "4.1.2",
+  "_npmUser": {
+    "name": "tootallnate",
+    "email": "nathan@tootallnate.net"
+  },
+  "maintainers": [
+    {
+      "name": "tootallnate",
+      "email": "nathan@tootallnate.net"
+    }
+  ],
+  "dist": {
+    "shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf",
+    "tarball": "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+  },
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+}
diff --git a/deps/npm/node_modules/sha/node_modules/readable-stream/package.json b/deps/npm/node_modules/sha/node_modules/readable-stream/package.json
index edc90f8d7cbae6..680a6ba024acad 100644
--- a/deps/npm/node_modules/sha/node_modules/readable-stream/package.json
+++ b/deps/npm/node_modules/sha/node_modules/readable-stream/package.json
@@ -1,43 +1,8 @@
 {
-  "_args": [
-    [
-      "readable-stream@^2.0.2",
-      "/Users/rebecca/code/npm/node_modules/sha"
-    ]
-  ],
-  "_from": "readable-stream@>=2.0.2 <3.0.0",
-  "_id": "readable-stream@2.0.2",
-  "_inCache": true,
-  "_location": "/sha/readable-stream",
-  "_nodeVersion": "2.3.0",
-  "_npmUser": {
-    "email": "calvin.metcalf@gmail.com",
-    "name": "cwmma"
-  },
-  "_npmVersion": "2.11.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "readable-stream",
-    "raw": "readable-stream@^2.0.2",
-    "rawSpec": "^2.0.2",
-    "scope": null,
-    "spec": ">=2.0.2 <3.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/sha"
-  ],
-  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
-  "_shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
-  "_shrinkwrap": null,
-  "_spec": "readable-stream@^2.0.2",
-  "_where": "/Users/rebecca/code/npm/node_modules/sha",
-  "browser": {
-    "util": false
-  },
-  "bugs": {
-    "url": "https://github.com/nodejs/readable-stream/issues"
-  },
+  "name": "readable-stream",
+  "version": "2.0.2",
+  "description": "Streams3, a user-land copy of the stream library from iojs v2.x",
+  "main": "readable.js",
   "dependencies": {
     "core-util-is": "~1.0.0",
     "inherits": "~2.0.1",
@@ -46,54 +11,36 @@
     "string_decoder": "~0.10.x",
     "util-deprecate": "~1.0.1"
   },
-  "description": "Streams3, a user-land copy of the stream library from iojs v2.x",
   "devDependencies": {
     "tap": "~0.2.6",
     "tape": "~4.0.0",
     "zuul": "~3.0.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
-    "tarball": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz"
+  "scripts": {
+    "test": "tap test/parallel/*.js",
+    "browser": "zuul --browser-name $BROWSER_NAME --browser-version $BROWSER_VERSION -- test/browser.js"
   },
-  "gitHead": "1a70134a71196eeabb5e27bc7580faaa68d30513",
-  "homepage": "https://github.com/nodejs/readable-stream#readme",
-  "installable": true,
-  "keywords": [
-    "pipe",
-    "readable",
-    "stream"
-  ],
-  "license": "MIT",
-  "main": "readable.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "isaacs@npmjs.com"
-    },
-    {
-      "name": "tootallnate",
-      "email": "nathan@tootallnate.net"
-    },
-    {
-      "name": "rvagg",
-      "email": "rod@vagg.org"
-    },
-    {
-      "name": "cwmma",
-      "email": "calvin.metcalf@gmail.com"
-    }
-  ],
-  "name": "readable-stream",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git://github.com/nodejs/readable-stream.git"
   },
-  "scripts": {
-    "browser": "zuul --browser-name $BROWSER_NAME --browser-version $BROWSER_VERSION -- test/browser.js",
-    "test": "tap test/parallel/*.js"
+  "keywords": [
+    "readable",
+    "stream",
+    "pipe"
+  ],
+  "browser": {
+    "util": false
+  },
+  "license": "MIT",
+  "readme": "# readable-stream\n\n***Node-core streams for userland*** [![Build Status](https://travis-ci.org/nodejs/readable-stream.svg?branch=master)](https://travis-ci.org/nodejs/readable-stream)\n\n\n[![NPM](https://nodei.co/npm/readable-stream.png?downloads=true&downloadRank=true)](https://nodei.co/npm/readable-stream/)\n[![NPM](https://nodei.co/npm-dl/readable-stream.png?&months=6&height=3)](https://nodei.co/npm/readable-stream/)\n\n\n[![Sauce Test Status](https://saucelabs.com/browser-matrix/readable-stream.svg)](https://saucelabs.com/u/readable-stream)\n\n```bash\nnpm install --save readable-stream\n```\n\n***Node-core streams for userland***\n\nThis package is a mirror of the Streams2 and Streams3 implementations in\nNode-core, including [documentation](doc/stream.markdown).\n\nIf you want to guarantee a stable streams base, regardless of what version of\nNode you, or the users of your libraries are using, use **readable-stream** *only* and avoid the *\"stream\"* module in Node-core, for background see [this blogpost](http://r.va.gg/2014/06/why-i-dont-use-nodes-core-stream-module.html).\n\nAs of version 2.0.0 **readable-stream** uses semantic versioning.  \n\n# Streams WG Team Members\n\n* **Chris Dickinson** ([@chrisdickinson](https://github.com/chrisdickinson)) &lt;christopher.s.dickinson@gmail.com&gt;\n  - Release GPG key: 9554F04D7259F04124DE6B476D5A82AC7E37093B\n* **Calvin Metcalf** ([@calvinmetcalf](https://github.com/calvinmetcalf)) &lt;calvin.metcalf@gmail.com&gt;\n  - Release GPG key: F3EF5F62A87FC27A22E643F714CE4FF5015AA242\n* **Rod Vagg** ([@rvagg](https://github.com/rvagg)) &lt;rod@vagg.org&gt;\n  - Release GPG key: DD8F2338BAE7501E3DD5AC78C273792F7D83545D\n* **Sam Newman** ([@sonewman](https://github.com/sonewman)) &lt;newmansam@outlook.com&gt;\n* **Mathias Buus** ([@mafintosh](https://github.com/mafintosh)) &lt;mathiasbuus@gmail.com&gt;\n* **Domenic Denicola** ([@domenic](https://github.com/domenic)) &lt;d@domenic.me&gt;\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/nodejs/readable-stream/issues"
   },
-  "version": "2.0.2"
+  "homepage": "https://github.com/nodejs/readable-stream#readme",
+  "_id": "readable-stream@2.0.2",
+  "_shasum": "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b",
+  "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+  "_from": "readable-stream@>=2.0.2 <3.0.0"
 }
diff --git a/deps/npm/node_modules/sha/package.json b/deps/npm/node_modules/sha/package.json
index 0bd2cf7a1dcafb..05903c8b9a8f23 100644
--- a/deps/npm/node_modules/sha/package.json
+++ b/deps/npm/node_modules/sha/package.json
@@ -1,64 +1,36 @@
 {
-  "_args": [
-    [
-      "sha@~2.0.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "sha@>=2.0.1 <2.1.0",
-  "_id": "sha@2.0.1",
-  "_inCache": true,
-  "_location": "/sha",
-  "_nodeVersion": "1.6.2",
-  "_npmUser": {
-    "email": "forbes@lindesay.co.uk",
-    "name": "forbeslindesay"
-  },
-  "_npmVersion": "2.7.1",
-  "_phantomChildren": {
-    "core-util-is": "1.0.1",
-    "inherits": "2.0.1",
-    "isarray": "0.0.1",
-    "process-nextick-args": "1.0.3",
-    "string_decoder": "0.10.31",
-    "util-deprecate": "1.0.1"
-  },
-  "_requested": {
-    "name": "sha",
-    "raw": "sha@~2.0.1",
-    "rawSpec": "~2.0.1",
-    "scope": null,
-    "spec": ">=2.0.1 <2.1.0",
-    "type": "range"
+  "name": "sha",
+  "version": "2.0.1",
+  "description": "Check and get file hashes",
+  "scripts": {
+    "test": "mocha -R spec"
   },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/sha/-/sha-2.0.1.tgz",
-  "_shasum": "6030822fbd2c9823949f8f72ed6411ee5cf25aae",
-  "_shrinkwrap": null,
-  "_spec": "sha@~2.0.1",
-  "_where": "/Users/rebecca/code/npm",
-  "bugs": {
-    "url": "https://github.com/ForbesLindesay/sha/issues"
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ForbesLindesay/sha.git"
   },
+  "license": "(BSD-2-Clause OR MIT)",
   "dependencies": {
     "graceful-fs": "^4.1.2",
     "readable-stream": "^2.0.2"
   },
-  "description": "Check and get file hashes",
   "devDependencies": {
     "mocha": "~1.9.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "6030822fbd2c9823949f8f72ed6411ee5cf25aae",
-    "tarball": "http://registry.npmjs.org/sha/-/sha-2.0.1.tgz"
-  },
   "gitHead": "ce7c72ba753d886fb46c396cbadcbfc8eac25b4f",
+  "bugs": {
+    "url": "https://github.com/ForbesLindesay/sha/issues"
+  },
   "homepage": "https://github.com/ForbesLindesay/sha",
-  "installable": true,
-  "license": "(BSD-2-Clause OR MIT)",
+  "_id": "sha@2.0.1",
+  "_shasum": "6030822fbd2c9823949f8f72ed6411ee5cf25aae",
+  "_from": "sha@>=2.0.1 <2.1.0",
+  "_npmVersion": "2.7.1",
+  "_nodeVersion": "1.6.2",
+  "_npmUser": {
+    "name": "forbeslindesay",
+    "email": "forbes@lindesay.co.uk"
+  },
   "maintainers": [
     {
       "name": "forbeslindesay",
@@ -73,14 +45,10 @@
       "email": "thechargingvolcano@gmail.com"
     }
   ],
-  "name": "sha",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ForbesLindesay/sha.git"
-  },
-  "scripts": {
-    "test": "mocha -R spec"
+  "dist": {
+    "shasum": "6030822fbd2c9823949f8f72ed6411ee5cf25aae",
+    "tarball": "http://registry.npmjs.org/sha/-/sha-2.0.1.tgz"
   },
-  "version": "2.0.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/sha/-/sha-2.0.1.tgz"
 }
diff --git a/deps/npm/node_modules/sigmund/package.json b/deps/npm/node_modules/sigmund/package.json
deleted file mode 100644
index 61af1e0b73a51e..00000000000000
--- a/deps/npm/node_modules/sigmund/package.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "_args": [
-    [
-      "sigmund@~1.0.0",
-      "/Users/rebecca/code/npm/node_modules/node-gyp/node_modules/minimatch"
-    ]
-  ],
-  "_from": "sigmund@>=1.0.0 <1.1.0",
-  "_id": "sigmund@1.0.1",
-  "_inCache": true,
-  "_location": "/sigmund",
-  "_nodeVersion": "2.0.1",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "2.10.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "sigmund",
-    "raw": "sigmund@~1.0.0",
-    "rawSpec": "~1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/node-gyp/minimatch"
-  ],
-  "_resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-  "_shasum": "3ff21f198cad2175f9f3b781853fd94d0d19b590",
-  "_shrinkwrap": null,
-  "_spec": "sigmund@~1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/node-gyp/node_modules/minimatch",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/sigmund/issues"
-  },
-  "dependencies": {},
-  "description": "Quick and dirty signatures for Objects.",
-  "devDependencies": {
-    "tap": "~0.3.0"
-  },
-  "directories": {
-    "test": "test"
-  },
-  "dist": {
-    "shasum": "3ff21f198cad2175f9f3b781853fd94d0d19b590",
-    "tarball": "http://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-  },
-  "gitHead": "527f97aa5bb253d927348698c0cd3bb267d098c6",
-  "homepage": "https://github.com/isaacs/sigmund#readme",
-  "keywords": [
-    "data",
-    "key",
-    "object",
-    "psychoanalysis",
-    "signature"
-  ],
-  "license": "ISC",
-  "main": "sigmund.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "name": "sigmund",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/sigmund.git"
-  },
-  "scripts": {
-    "bench": "node bench.js",
-    "test": "tap test/*.js"
-  },
-  "version": "1.0.1"
-}
diff --git a/deps/npm/node_modules/slide/package.json b/deps/npm/node_modules/slide/package.json
index 6ec642342c2423..8b6aa2b7080129 100644
--- a/deps/npm/node_modules/slide/package.json
+++ b/deps/npm/node_modules/slide/package.json
@@ -1,47 +1,11 @@
 {
-  "_args": [
-    [
-      "slide@~1.1.6",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "slide@>=1.1.6 <1.2.0",
-  "_id": "slide@1.1.6",
-  "_inCache": true,
-  "_location": "/slide",
-  "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
-  },
-  "_npmVersion": "2.0.0-beta.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "slide",
-    "raw": "slide@~1.1.6",
-    "rawSpec": "~1.1.6",
-    "scope": null,
-    "spec": ">=1.1.6 <1.2.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/npm-registry-client",
-    "/read-installed",
-    "/write-file-atomic"
-  ],
-  "_resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
-  "_shasum": "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707",
-  "_shrinkwrap": null,
-  "_spec": "slide@~1.1.6",
-  "_where": "/Users/rebecca/code/npm",
+  "name": "slide",
+  "version": "1.1.6",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/slide-flow-control/issues"
-  },
   "contributors": [
     {
       "name": "S. Sriram",
@@ -49,33 +13,43 @@
       "url": "http://www.565labs.com"
     }
   ],
-  "dependencies": {},
   "description": "A flow control lib small enough to fit on in a slide presentation. Derived live at Oak.JS",
+  "main": "./lib/slide.js",
+  "dependencies": {},
   "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707",
-    "tarball": "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
-  },
   "engines": {
     "node": "*"
   },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/slide-flow-control.git"
+  },
+  "license": "ISC",
   "gitHead": "8345e51ee41e35825abc1a40750ea11462f57028",
+  "bugs": {
+    "url": "https://github.com/isaacs/slide-flow-control/issues"
+  },
   "homepage": "https://github.com/isaacs/slide-flow-control",
-  "license": "ISC",
-  "main": "./lib/slide.js",
+  "_id": "slide@1.1.6",
+  "scripts": {},
+  "_shasum": "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707",
+  "_from": "slide@>=1.1.6 <1.2.0",
+  "_npmVersion": "2.0.0-beta.3",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "i@izs.me"
+  },
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "name": "slide",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/slide-flow-control.git"
+  "dist": {
+    "shasum": "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707",
+    "tarball": "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
   },
-  "scripts": {},
-  "version": "1.1.6"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/sntp/package.json b/deps/npm/node_modules/sntp/package.json
deleted file mode 100644
index 263dc45954d90f..00000000000000
--- a/deps/npm/node_modules/sntp/package.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "_args": [
-    [
-      "sntp@1.x.x",
-      "/Users/rebecca/code/npm/node_modules/hawk"
-    ]
-  ],
-  "_from": "sntp@>=1.0.0 <2.0.0",
-  "_id": "sntp@1.0.9",
-  "_inCache": true,
-  "_location": "/sntp",
-  "_npmUser": {
-    "email": "eran@hueniverse.com",
-    "name": "hueniverse"
-  },
-  "_npmVersion": "1.4.23",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "sntp",
-    "raw": "sntp@1.x.x",
-    "rawSpec": "1.x.x",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/hawk"
-  ],
-  "_resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-  "_shasum": "6541184cc90aeea6c6e7b35e2659082443c66198",
-  "_shrinkwrap": null,
-  "_spec": "sntp@1.x.x",
-  "_where": "/Users/rebecca/code/npm/node_modules/hawk",
-  "author": {
-    "email": "eran@hammer.io",
-    "name": "Eran Hammer",
-    "url": "http://hueniverse.com"
-  },
-  "bugs": {
-    "url": "https://github.com/hueniverse/sntp/issues"
-  },
-  "contributors": [],
-  "dependencies": {
-    "hoek": "2.x.x"
-  },
-  "description": "SNTP Client",
-  "devDependencies": {
-    "lab": "4.x.x"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "6541184cc90aeea6c6e7b35e2659082443c66198",
-    "tarball": "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
-  },
-  "engines": {
-    "node": ">=0.8.0"
-  },
-  "gitHead": "ee2e35284f684609990681734d39010cd356d7da",
-  "homepage": "https://github.com/hueniverse/sntp",
-  "keywords": [
-    "ntp",
-    "sntp",
-    "time"
-  ],
-  "licenses": [
-    {
-      "type": "BSD",
-      "url": "http://github.com/hueniverse/sntp/raw/master/LICENSE"
-    }
-  ],
-  "main": "index",
-  "maintainers": [
-    {
-      "name": "hueniverse",
-      "email": "eran@hueniverse.com"
-    }
-  ],
-  "name": "sntp",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/hueniverse/sntp"
-  },
-  "scripts": {
-    "test": "make test-cov"
-  },
-  "version": "1.0.9"
-}
diff --git a/deps/npm/node_modules/sorted-object/package.json b/deps/npm/node_modules/sorted-object/package.json
index ea1e21dd2dc42e..9b7e338b729653 100644
--- a/deps/npm/node_modules/sorted-object/package.json
+++ b/deps/npm/node_modules/sorted-object/package.json
@@ -1,78 +1,53 @@
 {
-  "_args": [
-    [
-      "sorted-object@~1.0.0",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "sorted-object@>=1.0.0 <1.1.0",
-  "_id": "sorted-object@1.0.0",
-  "_inCache": true,
-  "_location": "/sorted-object",
-  "_npmUser": {
-    "email": "domenic@domenicdenicola.com",
-    "name": "domenic"
-  },
-  "_npmVersion": "1.3.25",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "sorted-object",
-    "raw": "sorted-object@~1.0.0",
-    "rawSpec": "~1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
+  "name": "sorted-object",
+  "description": "Returns a copy of an object with its keys sorted",
+  "keywords": [
+    "sort",
+    "keys",
+    "object"
   ],
-  "_resolved": "https://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz",
-  "_shasum": "5d1f4f9c1fb2cd48965967304e212eb44cfb6d05",
-  "_shrinkwrap": null,
-  "_spec": "sorted-object@~1.0.0",
-  "_where": "/Users/rebecca/code/npm",
+  "version": "1.0.0",
   "author": {
-    "email": "domenic@domenicdenicola.com",
     "name": "Domenic Denicola",
+    "email": "domenic@domenicdenicola.com",
     "url": "http://domenic.me/"
   },
+  "license": "WTFPL",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/domenic/sorted-object.git"
+  },
   "bugs": {
     "url": "http://github.com/domenic/sorted-object/issues"
   },
-  "dependencies": {},
-  "description": "Returns a copy of an object with its keys sorted",
+  "main": "lib/sorted-object.js",
+  "scripts": {
+    "test": "tape test/tests.js",
+    "lint": "jshint lib && jshint test"
+  },
   "devDependencies": {
     "jshint": "~2.4.3",
     "tape": "~2.4.2"
   },
-  "directories": {},
+  "homepage": "https://github.com/domenic/sorted-object",
+  "_id": "sorted-object@1.0.0",
   "dist": {
     "shasum": "5d1f4f9c1fb2cd48965967304e212eb44cfb6d05",
     "tarball": "http://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz"
   },
-  "homepage": "https://github.com/domenic/sorted-object",
-  "keywords": [
-    "keys",
-    "object",
-    "sort"
-  ],
-  "license": "WTFPL",
-  "main": "lib/sorted-object.js",
+  "_from": "sorted-object@>=1.0.0 <1.1.0",
+  "_npmVersion": "1.3.25",
+  "_npmUser": {
+    "name": "domenic",
+    "email": "domenic@domenicdenicola.com"
+  },
   "maintainers": [
     {
       "name": "domenic",
       "email": "domenic@domenicdenicola.com"
     }
   ],
-  "name": "sorted-object",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/domenic/sorted-object.git"
-  },
-  "scripts": {
-    "lint": "jshint lib && jshint test",
-    "test": "tape test/tests.js"
-  },
-  "version": "1.0.0"
+  "directories": {},
+  "_shasum": "5d1f4f9c1fb2cd48965967304e212eb44cfb6d05",
+  "_resolved": "https://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz"
 }
diff --git a/deps/npm/node_modules/spdx-exceptions/.npmignore b/deps/npm/node_modules/spdx-exceptions/.npmignore
deleted file mode 100644
index 5825067776c896..00000000000000
--- a/deps/npm/node_modules/spdx-exceptions/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.npmiginore
-.travis.yml
diff --git a/deps/npm/node_modules/spdx-exceptions/LICENSE.md b/deps/npm/node_modules/spdx-exceptions/LICENSE.md
deleted file mode 100644
index 6c255589566ffe..00000000000000
--- a/deps/npm/node_modules/spdx-exceptions/LICENSE.md
+++ /dev/null
@@ -1,9 +0,0 @@
-The MIT License
-
-Copyright (c) 2015 Kyle E. Mitchell
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/npm/node_modules/spdx-exceptions/README.md b/deps/npm/node_modules/spdx-exceptions/README.md
deleted file mode 100644
index ef377325ee1e74..00000000000000
--- a/deps/npm/node_modules/spdx-exceptions/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-```javascript
-var assert = require('assert')
-var spdxExceptions = require('spdx-exceptions')
-
-assert(Array.isArray(spdxExceptions))
-
-assert(spdxExceptions.length > 0)
-
-function isString(x) {
-  return typeof x === 'string' }
-
-assert(spdxExceptions.every(isString))
-```
diff --git a/deps/npm/node_modules/spdx-exceptions/package.json b/deps/npm/node_modules/spdx-exceptions/package.json
deleted file mode 100644
index 0ed389b575dbcd..00000000000000
--- a/deps/npm/node_modules/spdx-exceptions/package.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "_args": [
-    [
-      "spdx-exceptions@^1.0.0",
-      "/Users/ogd/Documents/projects/npm/npm/node_modules/spdx-expression-parse"
-    ]
-  ],
-  "_from": "spdx-exceptions@>=1.0.0 <2.0.0",
-  "_id": "spdx-exceptions@1.0.2",
-  "_inCache": true,
-  "_location": "/spdx-exceptions",
-  "_nodeVersion": "0.12.7",
-  "_npmUser": {
-    "email": "kyle@kemitchell.com",
-    "name": "kemitchell"
-  },
-  "_npmVersion": "2.13.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "spdx-exceptions",
-    "raw": "spdx-exceptions@^1.0.0",
-    "rawSpec": "^1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/spdx-expression-parse"
-  ],
-  "_resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.2.tgz",
-  "_shasum": "c584a2875a1db1c8743266990af6e0c82e143a5b",
-  "_shrinkwrap": null,
-  "_spec": "spdx-exceptions@^1.0.0",
-  "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/spdx-expression-parse",
-  "author": {
-    "name": "The Linux Foundation"
-  },
-  "bugs": {
-    "url": "https://github.com/kemitchell/spdx-exceptions.js/issues"
-  },
-  "contributors": [
-    {
-      "name": "Kyle E. Mitchell",
-      "email": "kyle@kemitchell.com",
-      "url": "https://kemitchell.com/"
-    }
-  ],
-  "dependencies": {},
-  "description": "list of SPDX standard license exceptions",
-  "devDependencies": {
-    "defence-cli": "^1.0.1"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "c584a2875a1db1c8743266990af6e0c82e143a5b",
-    "tarball": "http://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.2.tgz"
-  },
-  "gitHead": "a1e7b0595efee0e4436e9807dd36280791e44c82",
-  "homepage": "https://github.com/kemitchell/spdx-exceptions.js#readme",
-  "installable": true,
-  "license": "CC-BY-3.0",
-  "maintainers": [
-    {
-      "name": "kemitchell",
-      "email": "kyle@kemitchell.com"
-    }
-  ],
-  "name": "spdx-exceptions",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/kemitchell/spdx-exceptions.js.git"
-  },
-  "scripts": {
-    "test": "defence -i javascript README.md | sed 's!spdx-exceptions!./!' | node"
-  },
-  "version": "1.0.2"
-}
diff --git a/deps/npm/node_modules/string_decoder/package.json b/deps/npm/node_modules/string_decoder/package.json
deleted file mode 100644
index 10772c834f78c2..00000000000000
--- a/deps/npm/node_modules/string_decoder/package.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "_args": [
-    [
-      "string_decoder@~0.10.x",
-      "/Users/rebecca/code/npm/node_modules/readable-stream"
-    ]
-  ],
-  "_from": "string_decoder@>=0.10.0 <0.11.0",
-  "_id": "string_decoder@0.10.31",
-  "_inCache": true,
-  "_location": "/string_decoder",
-  "_npmUser": {
-    "email": "rod@vagg.org",
-    "name": "rvagg"
-  },
-  "_npmVersion": "1.4.23",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "string_decoder",
-    "raw": "string_decoder@~0.10.x",
-    "rawSpec": "~0.10.x",
-    "scope": null,
-    "spec": ">=0.10.0 <0.11.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/bl/readable-stream",
-    "/concat-stream/readable-stream",
-    "/readable-stream"
-  ],
-  "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-  "_shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94",
-  "_shrinkwrap": null,
-  "_spec": "string_decoder@~0.10.x",
-  "_where": "/Users/rebecca/code/npm/node_modules/readable-stream",
-  "bugs": {
-    "url": "https://github.com/rvagg/string_decoder/issues"
-  },
-  "dependencies": {},
-  "description": "The string_decoder module from Node core",
-  "devDependencies": {
-    "tap": "~0.4.8"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94",
-    "tarball": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-  },
-  "gitHead": "d46d4fd87cf1d06e031c23f1ba170ca7d4ade9a0",
-  "homepage": "https://github.com/rvagg/string_decoder",
-  "keywords": [
-    "browser",
-    "browserify",
-    "decoder",
-    "string"
-  ],
-  "license": "MIT",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "substack",
-      "email": "mail@substack.net"
-    },
-    {
-      "name": "rvagg",
-      "email": "rod@vagg.org"
-    }
-  ],
-  "name": "string_decoder",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/rvagg/string_decoder.git"
-  },
-  "scripts": {
-    "test": "tap test/simple/*.js"
-  },
-  "version": "0.10.31"
-}
diff --git a/deps/npm/node_modules/strip-ansi/package.json b/deps/npm/node_modules/strip-ansi/package.json
index 765c6921f4ca74..d62f0eaf03e844 100644
--- a/deps/npm/node_modules/strip-ansi/package.json
+++ b/deps/npm/node_modules/strip-ansi/package.json
@@ -1,111 +1,76 @@
 {
-  "_args": [
-    [
-      "strip-ansi@^3.0.0",
-      "/Users/rebecca/code/npm/node_modules/chalk"
-    ]
-  ],
-  "_from": "strip-ansi@>=3.0.0 <4.0.0",
-  "_id": "strip-ansi@3.0.0",
-  "_inCache": true,
-  "_location": "/strip-ansi",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "sindresorhus@gmail.com",
-    "name": "sindresorhus"
-  },
-  "_npmVersion": "2.11.2",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "strip-ansi",
-    "raw": "strip-ansi@^3.0.0",
-    "rawSpec": "^3.0.0",
-    "scope": null,
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
+  "name": "strip-ansi",
+  "version": "3.0.0",
+  "description": "Strip ANSI escape codes",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sindresorhus/strip-ansi.git"
   },
-  "_requiredBy": [
-    "/chalk",
-    "/columnify"
-  ],
-  "_resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
-  "_shasum": "7510b665567ca914ccb5d7e072763ac968be3724",
-  "_shrinkwrap": null,
-  "_spec": "strip-ansi@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/chalk",
   "author": {
-    "email": "sindresorhus@gmail.com",
     "name": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
     "url": "sindresorhus.com"
   },
-  "bugs": {
-    "url": "https://github.com/sindresorhus/strip-ansi/issues"
-  },
-  "dependencies": {
-    "ansi-regex": "^2.0.0"
-  },
-  "description": "Strip ANSI escape codes",
-  "devDependencies": {
-    "ava": "0.0.4"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "7510b665567ca914ccb5d7e072763ac968be3724",
-    "tarball": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"
-  },
+  "maintainers": [
+    {
+      "name": "Sindre Sorhus",
+      "email": "sindresorhus@gmail.com",
+      "url": "sindresorhus.com"
+    },
+    {
+      "name": "Joshua Appelman",
+      "email": "jappelman@xebia.com",
+      "url": "jbnicolai.com"
+    }
+  ],
   "engines": {
     "node": ">=0.10.0"
   },
+  "scripts": {
+    "test": "node test.js"
+  },
   "files": [
     "index.js"
   ],
-  "gitHead": "3f05b9810e1438f946e2eb84ee854cc00b972e9e",
-  "homepage": "https://github.com/sindresorhus/strip-ansi",
   "keywords": [
-    "256",
+    "strip",
+    "trim",
+    "remove",
     "ansi",
+    "styles",
     "color",
-    "colors",
     "colour",
-    "command-line",
+    "colors",
+    "terminal",
     "console",
+    "string",
+    "tty",
     "escape",
     "formatting",
-    "log",
-    "logging",
-    "remove",
     "rgb",
+    "256",
     "shell",
-    "string",
-    "strip",
-    "styles",
-    "terminal",
-    "text",
-    "trim",
-    "tty",
-    "xterm"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    },
-    {
-      "name": "jbnicolai",
-      "email": "jappelman@xebia.com"
-    }
+    "xterm",
+    "log",
+    "logging",
+    "command-line",
+    "text"
   ],
-  "name": "strip-ansi",
-  "optionalDependencies": {},
+  "dependencies": {
+    "ansi-regex": "^2.0.0"
+  },
+  "devDependencies": {
+    "ava": "0.0.4"
+  },
   "readme": "# strip-ansi [![Build Status](https://travis-ci.org/sindresorhus/strip-ansi.svg?branch=master)](https://travis-ci.org/sindresorhus/strip-ansi)\n\n> Strip [ANSI escape codes](http://en.wikipedia.org/wiki/ANSI_escape_code)\n\n\n## Install\n\n```\n$ npm install --save strip-ansi\n```\n\n\n## Usage\n\n```js\nvar stripAnsi = require('strip-ansi');\n\nstripAnsi('\\u001b[4mcake\\u001b[0m');\n//=> 'cake'\n```\n\n\n## Related\n\n- [strip-ansi-cli](https://github.com/sindresorhus/strip-ansi-cli) - CLI for this module\n- [has-ansi](https://github.com/sindresorhus/has-ansi) - Check if a string has ANSI escape codes\n- [ansi-regex](https://github.com/sindresorhus/ansi-regex) - Regular expression for matching ANSI escape codes\n- [chalk](https://github.com/sindresorhus/chalk) - Terminal string styling done right\n\n\n## License\n\nMIT © [Sindre Sorhus](http://sindresorhus.com)\n",
   "readmeFilename": "readme.md",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/sindresorhus/strip-ansi.git"
-  },
-  "scripts": {
-    "test": "node test.js"
+  "bugs": {
+    "url": "https://github.com/sindresorhus/strip-ansi/issues"
   },
-  "version": "3.0.0"
+  "homepage": "https://github.com/sindresorhus/strip-ansi#readme",
+  "_id": "strip-ansi@3.0.0",
+  "_shasum": "7510b665567ca914ccb5d7e072763ac968be3724",
+  "_resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+  "_from": "strip-ansi@3.0.0"
 }
diff --git a/deps/npm/node_modules/supports-color/package.json b/deps/npm/node_modules/supports-color/package.json
deleted file mode 100644
index 020a57ea52ed18..00000000000000
--- a/deps/npm/node_modules/supports-color/package.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "_args": [
-    [
-      "supports-color@^2.0.0",
-      "/Users/rebecca/code/npm/node_modules/chalk"
-    ]
-  ],
-  "_from": "supports-color@>=2.0.0 <3.0.0",
-  "_id": "supports-color@2.0.0",
-  "_inCache": true,
-  "_location": "/supports-color",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "sindresorhus@gmail.com",
-    "name": "sindresorhus"
-  },
-  "_npmVersion": "2.11.2",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "supports-color",
-    "raw": "supports-color@^2.0.0",
-    "rawSpec": "^2.0.0",
-    "scope": null,
-    "spec": ">=2.0.0 <3.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/chalk"
-  ],
-  "_resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-  "_shasum": "535d045ce6b6363fa40117084629995e9df324c7",
-  "_shrinkwrap": null,
-  "_spec": "supports-color@^2.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/chalk",
-  "author": {
-    "email": "sindresorhus@gmail.com",
-    "name": "Sindre Sorhus",
-    "url": "sindresorhus.com"
-  },
-  "bugs": {
-    "url": "https://github.com/chalk/supports-color/issues"
-  },
-  "dependencies": {},
-  "description": "Detect whether a terminal supports color",
-  "devDependencies": {
-    "mocha": "*",
-    "require-uncached": "^1.0.2"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "535d045ce6b6363fa40117084629995e9df324c7",
-    "tarball": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-  },
-  "engines": {
-    "node": ">=0.8.0"
-  },
-  "files": [
-    "index.js"
-  ],
-  "gitHead": "8400d98ade32b2adffd50902c06d9e725a5c6588",
-  "homepage": "https://github.com/chalk/supports-color",
-  "keywords": [
-    "256",
-    "ansi",
-    "capability",
-    "cli",
-    "color",
-    "colors",
-    "colour",
-    "command-line",
-    "console",
-    "detect",
-    "rgb",
-    "shell",
-    "styles",
-    "support",
-    "supports",
-    "terminal",
-    "tty",
-    "xterm"
-  ],
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    },
-    {
-      "name": "jbnicolai",
-      "email": "jappelman@xebia.com"
-    }
-  ],
-  "name": "supports-color",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/chalk/supports-color"
-  },
-  "scripts": {
-    "test": "mocha"
-  },
-  "version": "2.0.0"
-}
diff --git a/deps/npm/node_modules/tar/node_modules/block-stream/LICENCE b/deps/npm/node_modules/tar/node_modules/block-stream/LICENCE
new file mode 100644
index 00000000000000..74489e2e2658e7
--- /dev/null
+++ b/deps/npm/node_modules/tar/node_modules/block-stream/LICENCE
@@ -0,0 +1,25 @@
+Copyright (c) Isaac Z. Schlueter
+All rights reserved.
+
+The BSD License
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/deps/npm/node_modules/tar/node_modules/block-stream/LICENSE b/deps/npm/node_modules/tar/node_modules/block-stream/LICENSE
new file mode 100644
index 00000000000000..19129e315fe593
--- /dev/null
+++ b/deps/npm/node_modules/tar/node_modules/block-stream/LICENSE
@@ -0,0 +1,15 @@
+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/deps/npm/node_modules/tar/node_modules/block-stream/README.md b/deps/npm/node_modules/tar/node_modules/block-stream/README.md
new file mode 100644
index 00000000000000..c16e9c468891db
--- /dev/null
+++ b/deps/npm/node_modules/tar/node_modules/block-stream/README.md
@@ -0,0 +1,14 @@
+# block-stream
+
+A stream of blocks.
+
+Write data into it, and it'll output data in buffer blocks the size you
+specify, padding with zeroes if necessary.
+
+```javascript
+var block = new BlockStream(512)
+fs.createReadStream("some-file").pipe(block)
+block.pipe(fs.createWriteStream("block-file"))
+```
+
+When `.end()` or `.flush()` is called, it'll pad the block with zeroes.
diff --git a/deps/npm/node_modules/tar/node_modules/block-stream/bench/block-stream-pause.js b/deps/npm/node_modules/tar/node_modules/block-stream/bench/block-stream-pause.js
new file mode 100644
index 00000000000000..9328844aa69059
--- /dev/null
+++ b/deps/npm/node_modules/tar/node_modules/block-stream/bench/block-stream-pause.js
@@ -0,0 +1,70 @@
+var BlockStream = require("../block-stream.js")
+
+var blockSizes = [16, 25, 1024]
+  , writeSizes = [4, 8, 15, 16, 17, 64, 100]
+  , writeCounts = [1, 10, 100]
+  , tap = require("tap")
+
+writeCounts.forEach(function (writeCount) {
+blockSizes.forEach(function (blockSize) {
+writeSizes.forEach(function (writeSize) {
+  tap.test("writeSize=" + writeSize +
+           " blockSize="+blockSize +
+           " writeCount="+writeCount, function (t) {
+    var f = new BlockStream(blockSize, {nopad: true })
+
+    var actualChunks = 0
+    var actualBytes = 0
+    var timeouts = 0
+
+    f.on("data", function (c) {
+      timeouts ++
+
+      actualChunks ++
+      actualBytes += c.length
+
+      // make sure that no data gets corrupted, and basic sanity
+      var before = c.toString()
+      // simulate a slow write operation
+      f.pause()
+      setTimeout(function () {
+        timeouts --
+
+        var after = c.toString()
+        t.equal(after, before, "should not change data")
+
+        // now corrupt it, to find leaks.
+        for (var i = 0; i < c.length; i ++) {
+          c[i] = "x".charCodeAt(0)
+        }
+        f.resume()
+      }, 100)
+    })
+
+    f.on("end", function () {
+      // round up to the nearest block size
+      var expectChunks = Math.ceil(writeSize * writeCount  * 2 / blockSize)
+      var expectBytes = writeSize * writeCount * 2
+      t.equal(actualBytes, expectBytes,
+              "bytes=" + expectBytes + " writeSize=" + writeSize)
+      t.equal(actualChunks, expectChunks,
+              "chunks=" + expectChunks + " writeSize=" + writeSize)
+
+      // wait for all the timeout checks to finish, then end the test
+      setTimeout(function WAIT () {
+        if (timeouts > 0) return setTimeout(WAIT)
+        t.end()
+      }, 100)
+    })
+
+    for (var i = 0; i < writeCount; i ++) {
+      var a = new Buffer(writeSize);
+      for (var j = 0; j < writeSize; j ++) a[j] = "a".charCodeAt(0)
+      var b = new Buffer(writeSize);
+      for (var j = 0; j < writeSize; j ++) b[j] = "b".charCodeAt(0)
+      f.write(a)
+      f.write(b)
+    }
+    f.end()
+  })
+}) }) })
diff --git a/deps/npm/node_modules/tar/node_modules/block-stream/bench/block-stream.js b/deps/npm/node_modules/tar/node_modules/block-stream/bench/block-stream.js
new file mode 100644
index 00000000000000..1141f3a84c2b31
--- /dev/null
+++ b/deps/npm/node_modules/tar/node_modules/block-stream/bench/block-stream.js
@@ -0,0 +1,68 @@
+var BlockStream = require("../block-stream.js")
+
+var blockSizes = [16, 25, 1024]
+  , writeSizes = [4, 8, 15, 16, 17, 64, 100]
+  , writeCounts = [1, 10, 100]
+  , tap = require("tap")
+
+writeCounts.forEach(function (writeCount) {
+blockSizes.forEach(function (blockSize) {
+writeSizes.forEach(function (writeSize) {
+  tap.test("writeSize=" + writeSize +
+           " blockSize="+blockSize +
+           " writeCount="+writeCount, function (t) {
+    var f = new BlockStream(blockSize, {nopad: true })
+
+    var actualChunks = 0
+    var actualBytes = 0
+    var timeouts = 0
+
+    f.on("data", function (c) {
+      timeouts ++
+
+      actualChunks ++
+      actualBytes += c.length
+
+      // make sure that no data gets corrupted, and basic sanity
+      var before = c.toString()
+      // simulate a slow write operation
+      setTimeout(function () {
+        timeouts --
+
+        var after = c.toString()
+        t.equal(after, before, "should not change data")
+
+        // now corrupt it, to find leaks.
+        for (var i = 0; i < c.length; i ++) {
+          c[i] = "x".charCodeAt(0)
+        }
+      }, 100)
+    })
+
+    f.on("end", function () {
+      // round up to the nearest block size
+      var expectChunks = Math.ceil(writeSize * writeCount  * 2 / blockSize)
+      var expectBytes = writeSize * writeCount * 2
+      t.equal(actualBytes, expectBytes,
+              "bytes=" + expectBytes + " writeSize=" + writeSize)
+      t.equal(actualChunks, expectChunks,
+              "chunks=" + expectChunks + " writeSize=" + writeSize)
+
+      // wait for all the timeout checks to finish, then end the test
+      setTimeout(function WAIT () {
+        if (timeouts > 0) return setTimeout(WAIT)
+        t.end()
+      }, 100)
+    })
+
+    for (var i = 0; i < writeCount; i ++) {
+      var a = new Buffer(writeSize);
+      for (var j = 0; j < writeSize; j ++) a[j] = "a".charCodeAt(0)
+      var b = new Buffer(writeSize);
+      for (var j = 0; j < writeSize; j ++) b[j] = "b".charCodeAt(0)
+      f.write(a)
+      f.write(b)
+    }
+    f.end()
+  })
+}) }) })
diff --git a/deps/npm/node_modules/tar/node_modules/block-stream/bench/dropper-pause.js b/deps/npm/node_modules/tar/node_modules/block-stream/bench/dropper-pause.js
new file mode 100644
index 00000000000000..93e4068eea0eda
--- /dev/null
+++ b/deps/npm/node_modules/tar/node_modules/block-stream/bench/dropper-pause.js
@@ -0,0 +1,70 @@
+var BlockStream = require("dropper")
+
+var blockSizes = [16, 25, 1024]
+  , writeSizes = [4, 8, 15, 16, 17, 64, 100]
+  , writeCounts = [1, 10, 100]
+  , tap = require("tap")
+
+writeCounts.forEach(function (writeCount) {
+blockSizes.forEach(function (blockSize) {
+writeSizes.forEach(function (writeSize) {
+  tap.test("writeSize=" + writeSize +
+           " blockSize="+blockSize +
+           " writeCount="+writeCount, function (t) {
+    var f = new BlockStream(blockSize, {nopad: true })
+
+    var actualChunks = 0
+    var actualBytes = 0
+    var timeouts = 0
+
+    f.on("data", function (c) {
+      timeouts ++
+
+      actualChunks ++
+      actualBytes += c.length
+
+      // make sure that no data gets corrupted, and basic sanity
+      var before = c.toString()
+      // simulate a slow write operation
+      f.pause()
+      setTimeout(function () {
+        timeouts --
+
+        var after = c.toString()
+        t.equal(after, before, "should not change data")
+
+        // now corrupt it, to find leaks.
+        for (var i = 0; i < c.length; i ++) {
+          c[i] = "x".charCodeAt(0)
+        }
+        f.resume()
+      }, 100)
+    })
+
+    f.on("end", function () {
+      // round up to the nearest block size
+      var expectChunks = Math.ceil(writeSize * writeCount  * 2 / blockSize)
+      var expectBytes = writeSize * writeCount * 2
+      t.equal(actualBytes, expectBytes,
+              "bytes=" + expectBytes + " writeSize=" + writeSize)
+      t.equal(actualChunks, expectChunks,
+              "chunks=" + expectChunks + " writeSize=" + writeSize)
+
+      // wait for all the timeout checks to finish, then end the test
+      setTimeout(function WAIT () {
+        if (timeouts > 0) return setTimeout(WAIT)
+        t.end()
+      }, 100)
+    })
+
+    for (var i = 0; i < writeCount; i ++) {
+      var a = new Buffer(writeSize);
+      for (var j = 0; j < writeSize; j ++) a[j] = "a".charCodeAt(0)
+      var b = new Buffer(writeSize);
+      for (var j = 0; j < writeSize; j ++) b[j] = "b".charCodeAt(0)
+      f.write(a)
+      f.write(b)
+    }
+    f.end()
+  })
+}) }) })
diff --git a/deps/npm/node_modules/tar/node_modules/block-stream/bench/dropper.js b/deps/npm/node_modules/tar/node_modules/block-stream/bench/dropper.js
new file mode 100644
index 00000000000000..55fa13305456e7
--- /dev/null
+++ b/deps/npm/node_modules/tar/node_modules/block-stream/bench/dropper.js
@@ -0,0 +1,68 @@
+var BlockStream = require("dropper")
+
+var blockSizes = [16, 25, 1024]
+  , writeSizes = [4, 8, 15, 16, 17, 64, 100]
+  , writeCounts = [1, 10, 100]
+  , tap = require("tap")
+
+writeCounts.forEach(function (writeCount) {
+blockSizes.forEach(function (blockSize) {
+writeSizes.forEach(function (writeSize) {
+  tap.test("writeSize=" + writeSize +
+           " blockSize="+blockSize +
+           " writeCount="+writeCount, function (t) {
+    var f = new BlockStream(blockSize, {nopad: true })
+
+    var actualChunks = 0
+    var actualBytes = 0
+    var timeouts = 0
+
+    f.on("data", function (c) {
+      timeouts ++
+
+      actualChunks ++
+      actualBytes += c.length
+
+      // make sure that no data gets corrupted, and basic sanity
+      var before = c.toString()
+      // simulate a slow write operation
+      setTimeout(function () {
+        timeouts --
+
+        var after = c.toString()
+        t.equal(after, before, "should not change data")
+
+        // now corrupt it, to find leaks.
+        for (var i = 0; i < c.length; i ++) {
+          c[i] = "x".charCodeAt(0)
+        }
+      }, 100)
+    })
+
+    f.on("end", function () {
+      // round up to the nearest block size
+      var expectChunks = Math.ceil(writeSize * writeCount  * 2 / blockSize)
+      var expectBytes = writeSize * writeCount * 2
+      t.equal(actualBytes, expectBytes,
+              "bytes=" + expectBytes + " writeSize=" + writeSize)
+      t.equal(actualChunks, expectChunks,
+              "chunks=" + expectChunks + " writeSize=" + writeSize)
+
+      // wait for all the timeout checks to finish, then end the test
+      setTimeout(function WAIT () {
+        if (timeouts > 0) return setTimeout(WAIT)
+        t.end()
+      }, 100)
+    })
+
+    for (var i = 0; i < writeCount; i ++) {
+      var a = new Buffer(writeSize);
+      for (var j = 0; j < writeSize; j ++) a[j] = "a".charCodeAt(0)
+      var b = new Buffer(writeSize);
+      for (var j = 0; j < writeSize; j ++) b[j] = "b".charCodeAt(0)
+      f.write(a)
+      f.write(b)
+    }
+    f.end()
+  })
+}) }) })
diff --git a/deps/npm/node_modules/tar/node_modules/block-stream/block-stream.js b/deps/npm/node_modules/tar/node_modules/block-stream/block-stream.js
new file mode 100644
index 00000000000000..008de035c2edca
--- /dev/null
+++ b/deps/npm/node_modules/tar/node_modules/block-stream/block-stream.js
@@ -0,0 +1,209 @@
+// write data to it, and it'll emit data in 512 byte blocks.
+// if you .end() or .flush(), it'll emit whatever it's got,
+// padded with nulls to 512 bytes.
+
+module.exports = BlockStream
+
+var Stream = require("stream").Stream
+  , inherits = require("inherits")
+  , assert = require("assert").ok
+  , debug = process.env.DEBUG ? console.error : function () {}
+
+function BlockStream (size, opt) {
+  this.writable = this.readable = true
+  this._opt = opt || {}
+  this._chunkSize = size || 512
+  this._offset = 0
+  this._buffer = []
+  this._bufferLength = 0
+  if (this._opt.nopad) this._zeroes = false
+  else {
+    this._zeroes = new Buffer(this._chunkSize)
+    for (var i = 0; i < this._chunkSize; i ++) {
+      this._zeroes[i] = 0
+    }
+  }
+}
+
+inherits(BlockStream, Stream)
+
+BlockStream.prototype.write = function (c) {
+  // debug("   BS write", c)
+  if (this._ended) throw new Error("BlockStream: write after end")
+  if (c && !Buffer.isBuffer(c)) c = new Buffer(c + "")
+  if (c.length) {
+    this._buffer.push(c)
+    this._bufferLength += c.length
+  }
+  // debug("pushed onto buffer", this._bufferLength)
+  if (this._bufferLength >= this._chunkSize) {
+    if (this._paused) {
+      // debug("   BS paused, return false, need drain")
+      this._needDrain = true
+      return false
+    }
+    this._emitChunk()
+  }
+  return true
+}
+
+BlockStream.prototype.pause = function () {
+  // debug("   BS pausing")
+  this._paused = true
+}
+
+BlockStream.prototype.resume = function () {
+  // debug("   BS resume")
+  this._paused = false
+  return this._emitChunk()
+}
+
+BlockStream.prototype.end = function (chunk) {
+  // debug("end", chunk)
+  if (typeof chunk === "function") cb = chunk, chunk = null
+  if (chunk) this.write(chunk)
+  this._ended = true
+  this.flush()
+}
+
+BlockStream.prototype.flush = function () {
+  this._emitChunk(true)
+}
+
+BlockStream.prototype._emitChunk = function (flush) {
+  // debug("emitChunk flush=%j emitting=%j paused=%j", flush, this._emitting, this._paused)
+
+  // emit a <chunkSize> chunk
+  if (flush && this._zeroes) {
+    // debug("    BS push zeroes", this._bufferLength)
+    // push a chunk of zeroes
+    var padBytes = (this._bufferLength % this._chunkSize)
+    if (padBytes !== 0) padBytes = this._chunkSize - padBytes
+    if (padBytes > 0) {
+      // debug("padBytes", padBytes, this._zeroes.slice(0, padBytes))
+      this._buffer.push(this._zeroes.slice(0, padBytes))
+      this._bufferLength += padBytes
+      // debug(this._buffer[this._buffer.length - 1].length, this._bufferLength)
+    }
+  }
+
+  if (this._emitting || this._paused) return
+  this._emitting = true
+
+  // debug("    BS entering loops")
+  var bufferIndex = 0
+  while (this._bufferLength >= this._chunkSize &&
+         (flush || !this._paused)) {
+    // debug("     BS data emission loop", this._bufferLength)
+
+    var out
+      , outOffset = 0
+      , outHas = this._chunkSize
+
+    while (outHas > 0 && (flush || !this._paused) ) {
+      // debug("    BS data inner emit loop", this._bufferLength)
+      var cur = this._buffer[bufferIndex]
+        , curHas = cur.length - this._offset
+      // debug("cur=", cur)
+      // debug("curHas=%j", curHas)
+      // If it's not big enough to fill the whole thing, then we'll need
+      // to copy multiple buffers into one.  However, if it is big enough,
+      // then just slice out the part we want, to save unnecessary copying.
+      // Also, need to copy if we've already done some copying, since buffers
+      // can't be joined like cons strings.
+      if (out || curHas < outHas) {
+        out = out || new Buffer(this._chunkSize)
+        cur.copy(out, outOffset,
+                 this._offset, this._offset + Math.min(curHas, outHas))
+      } else if (cur.length === outHas && this._offset === 0) {
+        // shortcut -- cur is exactly long enough, and no offset.
+        out = cur
+      } else {
+        // slice out the piece of cur that we need.
+        out = cur.slice(this._offset, this._offset + outHas)
+      }
+
+      if (curHas > outHas) {
+        // means that the current buffer couldn't be completely output
+        // update this._offset to reflect how much WAS written
+        this._offset += outHas
+        outHas = 0
+      } else {
+        // output the entire current chunk.
+        // toss it away
+        outHas -= curHas
+        outOffset += curHas
+        bufferIndex ++
+        this._offset = 0
+      }
+    }
+
+    this._bufferLength -= this._chunkSize
+    assert(out.length === this._chunkSize)
+    // debug("emitting data", out)
+    // debug("   BS emitting, paused=%j", this._paused, this._bufferLength)
+    this.emit("data", out)
+    out = null
+  }
+  // debug("    BS out of loops", this._bufferLength)
+
+  // whatever is left, it's not enough to fill up a block, or we're paused
+  this._buffer = this._buffer.slice(bufferIndex)
+  if (this._paused) {
+    // debug("    BS paused, leaving", this._bufferLength)
+    this._needsDrain = true
+    this._emitting = false
+    return
+  }
+
+  // if flushing, and not using null-padding, then need to emit the last
+  // chunk(s) sitting in the queue.  We know that it's not enough to
+  // fill up a whole block, because otherwise it would have been emitted
+  // above, but there may be some offset.
+  var l = this._buffer.length
+  if (flush && !this._zeroes && l) {
+    if (l === 1) {
+      if (this._offset) {
+        this.emit("data", this._buffer[0].slice(this._offset))
+      } else {
+        this.emit("data", this._buffer[0])
+      }
+    } else {
+      var outHas = this._bufferLength
+        , out = new Buffer(outHas)
+        , outOffset = 0
+      for (var i = 0; i < l; i ++) {
+        var cur = this._buffer[i]
+          , curHas = cur.length - this._offset
+        cur.copy(out, outOffset, this._offset)
+        this._offset = 0
+        outOffset += curHas
+        this._bufferLength -= curHas
+      }
+      this.emit("data", out)
+    }
+    // truncate
+    this._buffer.length = 0
+    this._bufferLength = 0
+    this._offset = 0
+  }
+
+  // now either drained or ended
+  // debug("either draining, or ended", this._bufferLength, this._ended)
+  // means that we've flushed out all that we can so far.
+  if (this._needDrain) {
+    // debug("emitting drain", this._bufferLength)
+    this._needDrain = false
+    this.emit("drain")
+  }
+
+  if ((this._bufferLength === 0) && this._ended && !this._endEmitted) {
+    // debug("emitting end", this._bufferLength)
+    this._endEmitted = true
+    this.emit("end")
+  }
+
+  this._emitting = false
+
+  // debug("    BS no longer emitting", flush, this._paused, this._emitting, this._bufferLength, this._chunkSize)
+}
diff --git a/deps/npm/node_modules/tar/node_modules/block-stream/package.json b/deps/npm/node_modules/tar/node_modules/block-stream/package.json
new file mode 100644
index 00000000000000..97d9d42abaf911
--- /dev/null
+++ b/deps/npm/node_modules/tar/node_modules/block-stream/package.json
@@ -0,0 +1,55 @@
+{
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
+  },
+  "name": "block-stream",
+  "description": "a stream of blocks",
+  "version": "0.0.8",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/block-stream.git"
+  },
+  "engines": {
+    "node": "0.4 || >=0.5.8"
+  },
+  "main": "block-stream.js",
+  "dependencies": {
+    "inherits": "~2.0.0"
+  },
+  "devDependencies": {
+    "tap": "0.x"
+  },
+  "scripts": {
+    "test": "tap test/"
+  },
+  "license": "ISC",
+  "gitHead": "b35520314f4763af0788d65a846bb43d9c0a8f02",
+  "bugs": {
+    "url": "https://github.com/isaacs/block-stream/issues"
+  },
+  "homepage": "https://github.com/isaacs/block-stream#readme",
+  "_id": "block-stream@0.0.8",
+  "_shasum": "0688f46da2bbf9cff0c4f68225a0cb95cbe8a46b",
+  "_from": "block-stream@*",
+  "_npmVersion": "2.10.0",
+  "_nodeVersion": "2.0.1",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "isaacs@npmjs.com"
+  },
+  "dist": {
+    "shasum": "0688f46da2bbf9cff0c4f68225a0cb95cbe8a46b",
+    "tarball": "http://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
+  },
+  "maintainers": [
+    {
+      "name": "isaacs",
+      "email": "i@izs.me"
+    }
+  ],
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz",
+  "readme": "ERROR: No README data found!"
+}
diff --git a/deps/npm/node_modules/tar/node_modules/block-stream/test/basic.js b/deps/npm/node_modules/tar/node_modules/block-stream/test/basic.js
new file mode 100644
index 00000000000000..b4b930511e10b2
--- /dev/null
+++ b/deps/npm/node_modules/tar/node_modules/block-stream/test/basic.js
@@ -0,0 +1,27 @@
+var tap = require("tap")
+  , BlockStream = require("../block-stream.js")
+
+tap.test("basic test", function (t) {
+  var b = new BlockStream(16)
+  var fs = require("fs")
+  var fstr = fs.createReadStream(__filename, {encoding: "utf8"})
+  fstr.pipe(b)
+
+  var stat
+  t.doesNotThrow(function () {
+    stat = fs.statSync(__filename)
+  }, "stat should not throw")
+
+  var totalBytes = 0
+  b.on("data", function (c) {
+    t.equal(c.length, 16, "chunks should be 16 bytes long")
+    t.type(c, Buffer, "chunks should be buffer objects")
+    totalBytes += c.length
+  })
+  b.on("end", function () {
+    var expectedBytes = stat.size + (16 - stat.size % 16)
+    t.equal(totalBytes, expectedBytes, "Should be multiple of 16")
+    t.end()
+  })
+
+})
diff --git a/deps/npm/node_modules/tar/node_modules/block-stream/test/nopad-thorough.js b/deps/npm/node_modules/tar/node_modules/block-stream/test/nopad-thorough.js
new file mode 100644
index 00000000000000..7a8de88b5b6dca
--- /dev/null
+++ b/deps/npm/node_modules/tar/node_modules/block-stream/test/nopad-thorough.js
@@ -0,0 +1,68 @@
+var BlockStream = require("../block-stream.js")
+
+var blockSizes = [16]//, 25]//, 1024]
+  , writeSizes = [4, 15, 16, 17, 64 ]//, 64, 100]
+  , writeCounts = [1, 10]//, 100]
+  , tap = require("tap")
+
+writeCounts.forEach(function (writeCount) {
+blockSizes.forEach(function (blockSize) {
+writeSizes.forEach(function (writeSize) {
+  tap.test("writeSize=" + writeSize +
+           " blockSize="+blockSize +
+           " writeCount="+writeCount, function (t) {
+    var f = new BlockStream(blockSize, {nopad: true })
+
+    var actualChunks = 0
+    var actualBytes = 0
+    var timeouts = 0
+
+    f.on("data", function (c) {
+      timeouts ++
+
+      actualChunks ++
+      actualBytes += c.length
+
+      // make sure that no data gets corrupted, and basic sanity
+      var before = c.toString()
+      // simulate a slow write operation
+      setTimeout(function () {
+        timeouts --
+
+        var after = c.toString()
+        t.equal(after, before, "should not change data")
+
+        // now corrupt it, to find leaks.
+        for (var i = 0; i < c.length; i ++) {
+          c[i] = "x".charCodeAt(0)
+        }
+      }, 100)
+    })
+
+    f.on("end", function () {
+      // round up to the nearest block size
+      var expectChunks = Math.ceil(writeSize * writeCount  * 2 / blockSize)
+      var expectBytes = writeSize * writeCount * 2
+      t.equal(actualBytes, expectBytes,
+              "bytes=" + expectBytes + " writeSize=" + writeSize)
+      t.equal(actualChunks, expectChunks,
+              "chunks=" + expectChunks + " writeSize=" + writeSize)
+
+      // wait for all the timeout checks to finish, then end the test
+      setTimeout(function WAIT () {
+        if (timeouts > 0) return setTimeout(WAIT)
+        t.end()
+      }, 100)
+    })
+
+    for (var i = 0; i < writeCount; i ++) {
+      var a = new Buffer(writeSize);
+      for (var j = 0; j < writeSize; j ++) a[j] = "a".charCodeAt(0)
+      var b = new Buffer(writeSize);
+      for (var j = 0; j < writeSize; j ++) b[j] = "b".charCodeAt(0)
+      f.write(a)
+      f.write(b)
+    }
+    f.end()
+  })
+}) }) })
diff --git a/deps/npm/node_modules/tar/node_modules/block-stream/test/nopad.js b/deps/npm/node_modules/tar/node_modules/block-stream/test/nopad.js
new file mode 100644
index 00000000000000..6d38429fbc7c37
--- /dev/null
+++ b/deps/npm/node_modules/tar/node_modules/block-stream/test/nopad.js
@@ -0,0 +1,57 @@
+var BlockStream = require("../")
+var tap = require("tap")
+
+
+tap.test("don't pad, small writes", function (t) {
+  var f = new BlockStream(16, { nopad: true })
+  t.plan(1)
+
+  f.on("data", function (c) {
+    t.equal(c.toString(), "abc", "should get 'abc'")
+  })
+
+  f.on("end", function () { t.end() })
+
+  f.write(new Buffer("a"))
+  f.write(new Buffer("b"))
+  f.write(new Buffer("c"))
+  f.end()
+})
+
+tap.test("don't pad, exact write", function (t) {
+  var f = new BlockStream(16, { nopad: true })
+  t.plan(1)
+
+  var first = true
+  f.on("data", function (c) {
+    if (first) {
+      first = false
+      t.equal(c.toString(), "abcdefghijklmnop", "first chunk")
+    } else {
+      t.fail("should only get one")
+    }
+  })
+
+  f.on("end", function () { t.end() })
+
+  f.end(new Buffer("abcdefghijklmnop"))
+})
+
+tap.test("don't pad, big write", function (t) {
+  var f = new BlockStream(16, { nopad: true })
+  t.plan(2)
+
+  var first = true
+  f.on("data", function (c) {
+    if (first) {
+      first = false
+      t.equal(c.toString(), "abcdefghijklmnop", "first chunk")
+    } else {
+      t.equal(c.toString(), "q")
+    }
+  })
+
+  f.on("end", function () { t.end() })
+
+  f.end(new Buffer("abcdefghijklmnopq"))
+})
diff --git a/deps/npm/node_modules/tar/node_modules/block-stream/test/pause-resume.js b/deps/npm/node_modules/tar/node_modules/block-stream/test/pause-resume.js
new file mode 100644
index 00000000000000..64d0d091daca04
--- /dev/null
+++ b/deps/npm/node_modules/tar/node_modules/block-stream/test/pause-resume.js
@@ -0,0 +1,73 @@
+var BlockStream = require("../block-stream.js")
+
+var blockSizes = [16]
+  , writeSizes = [15, 16, 17]
+  , writeCounts = [1, 10]//, 100]
+  , tap = require("tap")
+
+writeCounts.forEach(function (writeCount) {
+blockSizes.forEach(function (blockSize) {
+writeSizes.forEach(function (writeSize) {
+  tap.test("writeSize=" + writeSize +
+           " blockSize="+blockSize +
+           " writeCount="+writeCount, function (t) {
+    var f = new BlockStream(blockSize)
+
+    var actualChunks = 0
+    var actualBytes = 0
+    var timeouts = 0
+    var paused = false
+
+    f.on("data", function (c) {
+      timeouts ++
+      t.notOk(paused, "should not be paused when emitting data")
+
+      actualChunks ++
+      actualBytes += c.length
+
+      // make sure that no data gets corrupted, and basic sanity
+      var before = c.toString()
+      // simulate a slow write operation
+      paused = true
+      f.pause()
+      process.nextTick(function () {
+        var after = c.toString()
+        t.equal(after, before, "should not change data")
+
+        // now corrupt it, to find leaks.
+        for (var i = 0; i < c.length; i ++) {
+          c[i] = "x".charCodeAt(0)
+        }
+        paused = false
+        f.resume()
+        timeouts --
+      })
+    })
+
+    f.on("end", function () {
+      // round up to the nearest block size
+      var expectChunks = Math.ceil(writeSize * writeCount  * 2 / blockSize)
+      var expectBytes = expectChunks * blockSize
+      t.equal(actualBytes, expectBytes,
+              "bytes=" + expectBytes + " writeSize=" + writeSize)
+      t.equal(actualChunks, expectChunks,
+              "chunks=" + expectChunks + " writeSize=" + writeSize)
+
+      // wait for all the timeout checks to finish, then end the test
+      setTimeout(function WAIT () {
+        if (timeouts > 0) return setTimeout(WAIT)
+        t.end()
+      }, 200)
+    })
+
+    for (var i = 0; i < writeCount; i ++) {
+      var a = new Buffer(writeSize);
+      for (var j = 0; j < writeSize; j ++) a[j] = "a".charCodeAt(0)
+      var b = new Buffer(writeSize);
+      for (var j = 0; j < writeSize; j ++) b[j] = "b".charCodeAt(0)
+      f.write(a)
+      f.write(b)
+    }
+    f.end()
+  })
+}) }) })
diff --git a/deps/npm/node_modules/tar/node_modules/block-stream/test/thorough.js b/deps/npm/node_modules/tar/node_modules/block-stream/test/thorough.js
new file mode 100644
index 00000000000000..1cc9ea08a36770
--- /dev/null
+++ b/deps/npm/node_modules/tar/node_modules/block-stream/test/thorough.js
@@ -0,0 +1,68 @@
+var BlockStream = require("../block-stream.js")
+
+var blockSizes = [16]//, 25]//, 1024]
+  , writeSizes = [4, 15, 16, 17, 64 ]//, 64, 100]
+  , writeCounts = [1, 10]//, 100]
+  , tap = require("tap")
+
+writeCounts.forEach(function (writeCount) {
+blockSizes.forEach(function (blockSize) {
+writeSizes.forEach(function (writeSize) {
+  tap.test("writeSize=" + writeSize +
+           " blockSize="+blockSize +
+           " writeCount="+writeCount, function (t) {
+    var f = new BlockStream(blockSize)
+
+    var actualChunks = 0
+    var actualBytes = 0
+    var timeouts = 0
+
+    f.on("data", function (c) {
+      timeouts ++
+
+      actualChunks ++
+      actualBytes += c.length
+
+      // make sure that no data gets corrupted, and basic sanity
+      var before = c.toString()
+      // simulate a slow write operation
+      setTimeout(function () {
+        timeouts --
+
+        var after = c.toString()
+        t.equal(after, before, "should not change data")
+
+        // now corrupt it, to find leaks.
+        for (var i = 0; i < c.length; i ++) {
+          c[i] = "x".charCodeAt(0)
+        }
+      }, 100)
+    })
+
+    f.on("end", function () {
+      // round up to the nearest block size
+      var expectChunks = Math.ceil(writeSize * writeCount  * 2 / blockSize)
+      var expectBytes = expectChunks * blockSize
+      t.equal(actualBytes, expectBytes,
+              "bytes=" + expectBytes + " writeSize=" + writeSize)
+      t.equal(actualChunks, expectChunks,
+              "chunks=" + expectChunks + " writeSize=" + writeSize)
+
+      // wait for all the timeout checks to finish, then end the test
+      setTimeout(function WAIT () {
+        if (timeouts > 0) return setTimeout(WAIT)
+        t.end()
+      }, 100)
+    })
+
+    for (var i = 0; i < writeCount; i ++) {
+      var a = new Buffer(writeSize);
+      for (var j = 0; j < writeSize; j ++) a[j] = "a".charCodeAt(0)
+      var b = new Buffer(writeSize);
+      for (var j = 0; j < writeSize; j ++) b[j] = "b".charCodeAt(0)
+      f.write(a)
+      f.write(b)
+    }
+    f.end()
+  })
+}) }) })
diff --git a/deps/npm/node_modules/tar/node_modules/block-stream/test/two-stream.js b/deps/npm/node_modules/tar/node_modules/block-stream/test/two-stream.js
new file mode 100644
index 00000000000000..b0f5d82546823e
--- /dev/null
+++ b/deps/npm/node_modules/tar/node_modules/block-stream/test/two-stream.js
@@ -0,0 +1,59 @@
+var log = console.log,
+    assert = require( 'assert' ),
+    BlockStream = require("../block-stream.js"),
+    isize = 0, tsize = 0, fsize = 0, psize = 0, i = 0,
+    filter = null, paper = null, stack = null,
+
+// a source data buffer
+tsize = 1 * 1024; // <- 1K
+stack = new Buffer( tsize );
+for ( ; i < tsize; i++) stack[i] = "x".charCodeAt(0);
+
+isize = 1 * 1024; // <- initial packet size with 4K no bug!
+fsize = 2 * 1024 ; // <- first block-stream size
+psize = Math.ceil( isize / 6 ); // <- second block-stream size
+
+fexpected = Math.ceil( tsize / fsize ); // <- packets expected for first
+pexpected = Math.ceil( tsize / psize ); // <- packets expected for second
+
+
+filter = new BlockStream( fsize, { nopad : true } );
+paper = new BlockStream( psize, { nopad : true } );
+
+
+var fcounter = 0;
+filter.on( 'data', function (c) {
+  // verify that they're not null-padded
+  for (var i = 0; i < c.length; i ++) {
+    assert.strictEqual(c[i], "x".charCodeAt(0))
+  }
+    ++fcounter;
+} );
+
+var pcounter = 0;
+paper.on( 'data', function (c) {
+  // verify that they're not null-padded
+  for (var i = 0; i < c.length; i ++) {
+    assert.strictEqual(c[i], "x".charCodeAt(0))
+  }
+    ++pcounter;
+} );
+
+filter.pipe( paper );
+
+filter.on( 'end', function () {
+  log("fcounter: %s === %s", fcounter, fexpected)
+    assert.strictEqual( fcounter, fexpected );
+} );
+
+paper.on( 'end', function () {
+  log("pcounter: %s === %s", pcounter, pexpected);
+    assert.strictEqual( pcounter, pexpected );
+} );
+
+
+for ( i = 0, j = isize; j <= tsize; j += isize ) {
+    filter.write( stack.slice( j - isize, j ) );
+}
+
+filter.end();
diff --git a/deps/npm/node_modules/tar/package.json b/deps/npm/node_modules/tar/package.json
index de38b246152145..23921a83e5bdca 100644
--- a/deps/npm/node_modules/tar/package.json
+++ b/deps/npm/node_modules/tar/package.json
@@ -1,67 +1,50 @@
 {
-  "_args": [
-    [
-      "tar@~2.2.0",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "tar@>=2.2.0 <2.3.0",
-  "_id": "tar@2.2.1",
-  "_inCache": true,
-  "_location": "/tar",
-  "_nodeVersion": "2.2.2",
-  "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
-  },
-  "_npmVersion": "2.14.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "tar",
-    "raw": "tar@~2.2.0",
-    "rawSpec": "~2.2.0",
-    "scope": null,
-    "spec": ">=2.2.0 <2.3.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-  "_shasum": "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1",
-  "_shrinkwrap": null,
-  "_spec": "tar@~2.2.0",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/node-tar/issues"
+  "name": "tar",
+  "description": "tar for node",
+  "version": "2.2.1",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/node-tar.git"
+  },
+  "main": "tar.js",
+  "scripts": {
+    "test": "tap test/*.js"
   },
   "dependencies": {
     "block-stream": "*",
     "fstream": "^1.0.2",
     "inherits": "2"
   },
-  "description": "tar for node",
   "devDependencies": {
     "graceful-fs": "^4.1.2",
-    "mkdirp": "^0.5.0",
     "rimraf": "1.x",
-    "tap": "0.x"
+    "tap": "0.x",
+    "mkdirp": "^0.5.0"
+  },
+  "license": "ISC",
+  "gitHead": "52237e39d2eb68d22a32d9a98f1d762189fe6a3d",
+  "bugs": {
+    "url": "https://github.com/isaacs/node-tar/issues"
+  },
+  "homepage": "https://github.com/isaacs/node-tar#readme",
+  "_id": "tar@2.2.1",
+  "_shasum": "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1",
+  "_from": "tar@>=2.2.1 <2.3.0",
+  "_npmVersion": "2.14.3",
+  "_nodeVersion": "2.2.2",
+  "_npmUser": {
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
   },
-  "directories": {},
   "dist": {
     "shasum": "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1",
     "tarball": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz"
   },
-  "gitHead": "52237e39d2eb68d22a32d9a98f1d762189fe6a3d",
-  "homepage": "https://github.com/isaacs/node-tar#readme",
-  "installable": true,
-  "license": "ISC",
-  "main": "tar.js",
   "maintainers": [
     {
       "name": "isaacs",
@@ -80,14 +63,7 @@
       "email": "kat@sykosomatic.org"
     }
   ],
-  "name": "tar",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/node-tar.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "2.2.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/text-table/package.json b/deps/npm/node_modules/text-table/package.json
index da8084b42b586f..3fbc997c79f3e6 100644
--- a/deps/npm/node_modules/text-table/package.json
+++ b/deps/npm/node_modules/text-table/package.json
@@ -1,95 +1,54 @@
 {
-  "_args": [
-    [
-      "text-table@~0.2.0",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "text-table@>=0.2.0 <0.3.0",
-  "_id": "text-table@0.2.0",
-  "_inCache": true,
-  "_location": "/text-table",
-  "_npmUser": {
-    "email": "mail@substack.net",
-    "name": "substack"
-  },
-  "_npmVersion": "1.3.7",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "text-table",
-    "raw": "text-table@~0.2.0",
-    "rawSpec": "~0.2.0",
-    "scope": null,
-    "spec": ">=0.2.0 <0.3.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-  "_shasum": "7f5ee823ae805207c00af2df4a84ec3fcfa570b4",
-  "_shrinkwrap": null,
-  "_spec": "text-table@~0.2.0",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "mail@substack.net",
-    "name": "James Halliday",
-    "url": "http://substack.net"
-  },
-  "bugs": {
-    "url": "https://github.com/substack/text-table/issues"
-  },
-  "dependencies": {},
+  "name": "text-table",
+  "version": "0.2.0",
   "description": "borderless text tables with alignment",
+  "main": "index.js",
   "devDependencies": {
-    "cli-color": "~0.2.3",
     "tap": "~0.4.0",
-    "tape": "~1.0.2"
+    "tape": "~1.0.2",
+    "cli-color": "~0.2.3"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "7f5ee823ae805207c00af2df4a84ec3fcfa570b4",
-    "tarball": "http://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
+  "testling": {
+    "files": "test/*.js",
+    "browsers": [
+      "ie/6..latest",
+      "chrome/20..latest",
+      "firefox/10..latest",
+      "safari/latest",
+      "opera/11.0..latest",
+      "iphone/6",
+      "ipad/6"
+    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/substack/text-table.git"
   },
   "homepage": "https://github.com/substack/text-table",
   "keywords": [
+    "text",
+    "table",
     "align",
     "ascii",
     "rows",
-    "table",
-    "tabular",
-    "text"
+    "tabular"
   ],
+  "author": {
+    "name": "James Halliday",
+    "email": "mail@substack.net",
+    "url": "http://substack.net"
+  },
   "license": "MIT",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "substack",
-      "email": "mail@substack.net"
-    }
-  ],
-  "name": "text-table",
-  "optionalDependencies": {},
   "readme": "# text-table\n\ngenerate borderless text table strings suitable for printing to stdout\n\n[![build status](https://secure.travis-ci.org/substack/text-table.png)](http://travis-ci.org/substack/text-table)\n\n[![browser support](https://ci.testling.com/substack/text-table.png)](http://ci.testling.com/substack/text-table)\n\n# example\n\n## default align\n\n``` js\nvar table = require('text-table');\nvar t = table([\n    [ 'master', '0123456789abcdef' ],\n    [ 'staging', 'fedcba9876543210' ]\n]);\nconsole.log(t);\n```\n\n```\nmaster   0123456789abcdef\nstaging  fedcba9876543210\n```\n\n## left-right align\n\n``` js\nvar table = require('text-table');\nvar t = table([\n    [ 'beep', '1024' ],\n    [ 'boop', '33450' ],\n    [ 'foo', '1006' ],\n    [ 'bar', '45' ]\n], { align: [ 'l', 'r' ] });\nconsole.log(t);\n```\n\n```\nbeep   1024\nboop  33450\nfoo    1006\nbar      45\n```\n\n## dotted align\n\n``` js\nvar table = require('text-table');\nvar t = table([\n    [ 'beep', '1024' ],\n    [ 'boop', '334.212' ],\n    [ 'foo', '1006' ],\n    [ 'bar', '45.6' ],\n    [ 'baz', '123.' ]\n], { align: [ 'l', '.' ] });\nconsole.log(t);\n```\n\n```\nbeep  1024\nboop   334.212\nfoo   1006\nbar     45.6\nbaz    123.\n```\n\n## centered\n\n``` js\nvar table = require('text-table');\nvar t = table([\n    [ 'beep', '1024', 'xyz' ],\n    [ 'boop', '3388450', 'tuv' ],\n    [ 'foo', '10106', 'qrstuv' ],\n    [ 'bar', '45', 'lmno' ]\n], { align: [ 'l', 'c', 'l' ] });\nconsole.log(t);\n```\n\n```\nbeep    1024   xyz\nboop  3388450  tuv\nfoo    10106   qrstuv\nbar      45    lmno\n```\n\n# methods\n\n``` js\nvar table = require('text-table')\n```\n\n## var s = table(rows, opts={})\n\nReturn a formatted table string `s` from an array of `rows` and some options\n`opts`.\n\n`rows` should be an array of arrays containing strings, numbers, or other\nprintable values.\n\noptions can be:\n\n* `opts.hsep` - separator to use between columns, default `'  '`\n* `opts.align` - array of alignment types for each column, default `['l','l',...]`\n* `opts.stringLength` - callback function to use when calculating the string length\n\nalignment types are:\n\n* `'l'` - left\n* `'r'` - right\n* `'c'` - center\n* `'.'` - decimal\n\n# install\n\nWith [npm](https://npmjs.org) do:\n\n```\nnpm install text-table\n```\n\n# Use with ANSI-colors\n\nSince the string length of ANSI color schemes does not equal the length\nJavaScript sees internally it is necessary to pass the a custom string length\ncalculator during the main function call.\n\nSee the `test/ansi-colors.js` file for an example.\n\n# license\n\nMIT\n",
   "readmeFilename": "readme.markdown",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/substack/text-table.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "testling": {
-    "browsers": [
-      "chrome/20..latest",
-      "firefox/10..latest",
-      "ie/6..latest",
-      "ipad/6",
-      "iphone/6",
-      "opera/11.0..latest",
-      "safari/latest"
-    ],
-    "files": "test/*.js"
+  "bugs": {
+    "url": "https://github.com/substack/text-table/issues"
   },
-  "version": "0.2.0"
+  "_id": "text-table@0.2.0",
+  "_shasum": "7f5ee823ae805207c00af2df4a84ec3fcfa570b4",
+  "_resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+  "_from": "text-table@>=0.2.0 <0.3.0"
 }
diff --git a/deps/npm/node_modules/tough-cookie/.editorconfig b/deps/npm/node_modules/tough-cookie/.editorconfig
deleted file mode 100644
index e09b844f73b251..00000000000000
--- a/deps/npm/node_modules/tough-cookie/.editorconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file is for unifying the coding style for different editors and IDEs
-# editorconfig.org
-
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-insert_final_newline = true
-trim_trailing_whitespace = true
-indent_style = space
-indent_size = 2
diff --git a/deps/npm/node_modules/tough-cookie/.npmignore b/deps/npm/node_modules/tough-cookie/.npmignore
deleted file mode 100644
index 5a8d2d853e7285..00000000000000
--- a/deps/npm/node_modules/tough-cookie/.npmignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.idea
-node_modules/
-.*.sw[nmop]
-npm-debug.log
diff --git a/deps/npm/node_modules/tough-cookie/.travis.yml b/deps/npm/node_modules/tough-cookie/.travis.yml
deleted file mode 100644
index 02059d0d51fd6a..00000000000000
--- a/deps/npm/node_modules/tough-cookie/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: node_js
-node_js:
-- "0.10"
-- "0.12"
-- iojs
-matrix:
-  fast_finish: true
-  allow_failures:
-    - node_js: 0.11
diff --git a/deps/npm/node_modules/tough-cookie/LICENSE b/deps/npm/node_modules/tough-cookie/LICENSE
deleted file mode 100644
index 84e0cad1706b71..00000000000000
--- a/deps/npm/node_modules/tough-cookie/LICENSE
+++ /dev/null
@@ -1,74 +0,0 @@
-Copyright (c) 2015, Salesforce.com, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of Salesforce.com nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-===
-
-The following exceptions apply:
-
-===
-
-`pubSufTest()` of generate-pubsuffix.js is in the public domain.
-
-  // Any copyright is dedicated to the Public Domain.
-  // http://creativecommons.org/publicdomain/zero/1.0/
-
-===
-
-`public-suffix.txt` was obtained from
-<https://mxr.mozilla.org/mozilla-central/source/netwerk/dns/effective_tld_names.dat?raw=1>
-via <http://publicsuffix.org>.
-
-That file contains the usual Mozilla triple-license, for which this project uses it
-under the terms of the MPL 1.1:
-
-    // ***** BEGIN LICENSE BLOCK *****
-    // Version: MPL 1.1/GPL 2.0/LGPL 2.1
-    //
-    // The contents of this file are subject to the Mozilla Public License Version
-    // 1.1 (the "License"); you may not use this file except in compliance with
-    // the License. You may obtain a copy of the License at
-    // http://www.mozilla.org/MPL/
-    //
-    // Software distributed under the License is distributed on an "AS IS" basis,
-    // WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-    // for the specific language governing rights and limitations under the
-    // License.
-    //
-    // The Original Code is the Public Suffix List.
-    //
-    // The Initial Developer of the Original Code is
-    // Jo Hermans <jo.hermans@gmail.com>.
-    // Portions created by the Initial Developer are Copyright (C) 2007
-    // the Initial Developer. All Rights Reserved.
-    //
-    // Contributor(s):
-    //   Ruben Arakelyan <ruben@rubenarakelyan.com>
-    //   Gervase Markham <gerv@gerv.net>
-    //   Pamela Greene <pamg.bugs@gmail.com>
-    //   David Triendl <david@triendl.name>
-    //   Jothan Frakes <jothan@gmail.com>
-    //   The kind representatives of many TLD registries
-    //
-    // Alternatively, the contents of this file may be used under the terms of
-    // either the GNU General Public License Version 2 or later (the "GPL"), or
-    // the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-    // in which case the provisions of the GPL or the LGPL are applicable instead
-    // of those above. If you wish to allow use of your version of this file only
-    // under the terms of either the GPL or the LGPL, and not to allow others to
-    // use your version of this file under the terms of the MPL, indicate your
-    // decision by deleting the provisions above and replace them with the notice
-    // and other provisions required by the GPL or the LGPL. If you do not delete
-    // the provisions above, a recipient may use your version of this file under
-    // the terms of any one of the MPL, the GPL or the LGPL.
-    //
-    // ***** END LICENSE BLOCK *****
diff --git a/deps/npm/node_modules/tough-cookie/generate-pubsuffix.js b/deps/npm/node_modules/tough-cookie/generate-pubsuffix.js
deleted file mode 100644
index ba054f4cb52c0c..00000000000000
--- a/deps/npm/node_modules/tough-cookie/generate-pubsuffix.js
+++ /dev/null
@@ -1,293 +0,0 @@
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-'use strict';
-var fs = require('fs');
-var assert = require('assert');
-var punycode = require('punycode');
-
-fs.readFile('./public-suffix.txt', 'utf8', function(err,string) {
-  if (err) {
-    throw err;
-  }
-  var lines = string.split("\n");
-  process.nextTick(function() {
-    processList(lines);
-  });
-});
-
-var index = {};
-
-var COMMENT = new RegExp('//.+');
-function processList(lines) {
-  while (lines.length) {
-    var line = lines.shift();
-    line = line.replace(COMMENT,'').trim();
-    if (!line) {
-      continue;
-    }
-    addToIndex(index,line);
-  }
-
-  pubSufTest();
-
-  var w = fs.createWriteStream('./lib/pubsuffix.js',{
-    flags: 'w',
-    encoding: 'utf8',
-    mode: parseInt('644',8)
-  });
-  w.on('end', process.exit);
-  w.write("/****************************************************\n");
-  w.write(" * AUTOMATICALLY GENERATED by generate-pubsuffix.js *\n");
-  w.write(" *                  DO NOT EDIT!                    *\n");
-  w.write(" ****************************************************/\n\n");
-
-  w.write('"use strict";\n\n');
-  w.write("var punycode = require('punycode');\n\n");
-
-  w.write("module.exports.getPublicSuffix = ");
-  w.write(getPublicSuffix.toString());
-  w.write(";\n\n");
-
-  w.write("// The following generated structure is used under the MPL version 1.1\n");
-  w.write("// See public-suffix.txt for more information\n\n");
-  w.write("var index = module.exports.index = Object.freeze(\n");
-  w.write(JSON.stringify(index));
-  w.write(");\n\n");
-  w.write("// END of automatically generated file\n");
-
-  w.end();
-}
-
-function addToIndex(index,line) {
-  var prefix = '';
-  if (line.replace(/^(!|\*\.)/)) {
-    prefix = RegExp.$1;
-    line = line.slice(prefix.length);
-  }
-  line = prefix + punycode.toASCII(line);
-
-  if (line.substr(0,1) == '!') {
-    index[line.substr(1)] = false;
-  } else {
-    index[line] = true;
-  }
-}
-
-// include the licence in the function since it gets written to pubsuffix.js
-function getPublicSuffix(domain) {
-  /*!
-   * Copyright (c) 2015, Salesforce.com, Inc.
-   * All rights reserved.
-   *
-   * Redistribution and use in source and binary forms, with or without
-   * modification, are permitted provided that the following conditions are met:
-   *
-   * 1. Redistributions of source code must retain the above copyright notice,
-   * this list of conditions and the following disclaimer.
-   *
-   * 2. Redistributions in binary form must reproduce the above copyright notice,
-   * this list of conditions and the following disclaimer in the documentation
-   * and/or other materials provided with the distribution.
-   *
-   * 3. Neither the name of Salesforce.com nor the names of its contributors may
-   * be used to endorse or promote products derived from this software without
-   * specific prior written permission.
-   *
-   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-   * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-   * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-   * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-   * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   * POSSIBILITY OF SUCH DAMAGE.
-   */
-  if (!domain) {
-    return null;
-  }
-  if (domain.match(/^\./)) {
-    return null;
-  }
-  var asciiDomain = punycode.toASCII(domain);
-  var converted = false;
-  if (asciiDomain !== domain) {
-    domain = asciiDomain;
-    converted = true;
-  }
-  if (index[domain]) {
-    return null;
-  }
-
-  domain = domain.toLowerCase();
-  var parts = domain.split('.').reverse();
-
-  var suffix = '';
-  var suffixLen = 0;
-  for (var i=0; i<parts.length; i++) {
-    var part = parts[i];
-    var starstr = '*'+suffix;
-    var partstr = part+suffix;
-
-    if (index[starstr]) { // star rule matches
-      suffixLen = i+1;
-      if (index[partstr] === false) { // exception rule matches (NB: false, not undefined)
-        suffixLen--;
-      }
-    } else if (index[partstr]) { // exact match, not exception
-      suffixLen = i+1;
-    }
-
-    suffix = '.'+partstr;
-  }
-
-  if (index['*'+suffix]) { // *.domain exists (e.g. *.kyoto.jp for domain='kyoto.jp');
-    return null;
-  }
-
-  suffixLen = suffixLen || 1;
-  if (parts.length > suffixLen) {
-    var publicSuffix = parts.slice(0,suffixLen+1).reverse().join('.');
-    return converted ? punycode.toUnicode(publicSuffix) : publicSuffix;
-  }
-
-  return null;
-}
-
-function checkPublicSuffix(give,get) {
-  var got = getPublicSuffix(give);
-  assert.equal(got, get, give+' should be '+(get==null?'NULL':get)+' but got '+got);
-}
-
-// pubSufTest() was converted to JavaScript from http://mxr.mozilla.org/mozilla-central/source/netwerk/test/unit/data/test_psl.txt?raw=1
-function pubSufTest() {
-  // For this function-scope and this function-scope ONLY:
-  // Any copyright is dedicated to the Public Domain.
-  // http://creativecommons.org/publicdomain/zero/1.0/
-
-  // NULL input.
-  checkPublicSuffix(null, null);
-  // Mixed case.
-  checkPublicSuffix('COM', null);
-  checkPublicSuffix('example.COM', 'example.com');
-  checkPublicSuffix('WwW.example.COM', 'example.com');
-  // Leading dot.
-  checkPublicSuffix('.com', null);
-  checkPublicSuffix('.example', null);
-  checkPublicSuffix('.example.com', null);
-  checkPublicSuffix('.example.example', null);
-  // Unlisted TLD.
-  checkPublicSuffix('example', null);
-  checkPublicSuffix('example.example', 'example.example');
-  checkPublicSuffix('b.example.example', 'example.example');
-  checkPublicSuffix('a.b.example.example', 'example.example');
-  // Listed, but non-Internet, TLD.
-  //checkPublicSuffix('local', null);
-  //checkPublicSuffix('example.local', null);
-  //checkPublicSuffix('b.example.local', null);
-  //checkPublicSuffix('a.b.example.local', null);
-  // TLD with only 1 rule.
-  checkPublicSuffix('biz', null);
-  checkPublicSuffix('domain.biz', 'domain.biz');
-  checkPublicSuffix('b.domain.biz', 'domain.biz');
-  checkPublicSuffix('a.b.domain.biz', 'domain.biz');
-  // TLD with some 2-level rules.
-  checkPublicSuffix('com', null);
-  checkPublicSuffix('example.com', 'example.com');
-  checkPublicSuffix('b.example.com', 'example.com');
-  checkPublicSuffix('a.b.example.com', 'example.com');
-  checkPublicSuffix('uk.com', null);
-  checkPublicSuffix('example.uk.com', 'example.uk.com');
-  checkPublicSuffix('b.example.uk.com', 'example.uk.com');
-  checkPublicSuffix('a.b.example.uk.com', 'example.uk.com');
-  checkPublicSuffix('test.ac', 'test.ac');
-  // TLD with only 1 (wildcard) rule.
-  checkPublicSuffix('cy', null);
-  checkPublicSuffix('c.cy', null);
-  checkPublicSuffix('b.c.cy', 'b.c.cy');
-  checkPublicSuffix('a.b.c.cy', 'b.c.cy');
-  // More complex TLD.
-  checkPublicSuffix('jp', null);
-  checkPublicSuffix('test.jp', 'test.jp');
-  checkPublicSuffix('www.test.jp', 'test.jp');
-  checkPublicSuffix('ac.jp', null);
-  checkPublicSuffix('test.ac.jp', 'test.ac.jp');
-  checkPublicSuffix('www.test.ac.jp', 'test.ac.jp');
-  checkPublicSuffix('kyoto.jp', null);
-  checkPublicSuffix('test.kyoto.jp', 'test.kyoto.jp');
-  checkPublicSuffix('ide.kyoto.jp', null);
-  checkPublicSuffix('b.ide.kyoto.jp', 'b.ide.kyoto.jp');
-  checkPublicSuffix('a.b.ide.kyoto.jp', 'b.ide.kyoto.jp');
-  checkPublicSuffix('c.kobe.jp', null);
-  checkPublicSuffix('b.c.kobe.jp', 'b.c.kobe.jp');
-  checkPublicSuffix('a.b.c.kobe.jp', 'b.c.kobe.jp');
-  checkPublicSuffix('city.kobe.jp', 'city.kobe.jp');
-  checkPublicSuffix('www.city.kobe.jp', 'city.kobe.jp');
-  // TLD with a wildcard rule and exceptions.
-  checkPublicSuffix('ck', null);
-  checkPublicSuffix('test.ck', null);
-  checkPublicSuffix('b.test.ck', 'b.test.ck');
-  checkPublicSuffix('a.b.test.ck', 'b.test.ck');
-  checkPublicSuffix('www.ck', 'www.ck');
-  checkPublicSuffix('www.www.ck', 'www.ck');
-  // US K12.
-  checkPublicSuffix('us', null);
-  checkPublicSuffix('test.us', 'test.us');
-  checkPublicSuffix('www.test.us', 'test.us');
-  checkPublicSuffix('ak.us', null);
-  checkPublicSuffix('test.ak.us', 'test.ak.us');
-  checkPublicSuffix('www.test.ak.us', 'test.ak.us');
-  checkPublicSuffix('k12.ak.us', null);
-  checkPublicSuffix('test.k12.ak.us', 'test.k12.ak.us');
-  checkPublicSuffix('www.test.k12.ak.us', 'test.k12.ak.us');
-  // IDN labels.
-  checkPublicSuffix('食狮.com.cn', '食狮.com.cn');
-  checkPublicSuffix('食狮.公司.cn', '食狮.公司.cn');
-  checkPublicSuffix('www.食狮.公司.cn', '食狮.公司.cn');
-  checkPublicSuffix('shishi.公司.cn', 'shishi.公司.cn');
-  checkPublicSuffix('公司.cn', null);
-  checkPublicSuffix('食狮.中国', '食狮.中国');
-  checkPublicSuffix('www.食狮.中国', '食狮.中国');
-  checkPublicSuffix('shishi.中国', 'shishi.中国');
-  checkPublicSuffix('中国', null);
-  // Same as above, but punycoded.
-  checkPublicSuffix('xn--85x722f.com.cn', 'xn--85x722f.com.cn');
-  checkPublicSuffix('xn--85x722f.xn--55qx5d.cn', 'xn--85x722f.xn--55qx5d.cn');
-  checkPublicSuffix('www.xn--85x722f.xn--55qx5d.cn', 'xn--85x722f.xn--55qx5d.cn');
-  checkPublicSuffix('shishi.xn--55qx5d.cn', 'shishi.xn--55qx5d.cn');
-  checkPublicSuffix('xn--55qx5d.cn', null);
-  checkPublicSuffix('xn--85x722f.xn--fiqs8s', 'xn--85x722f.xn--fiqs8s');
-  checkPublicSuffix('www.xn--85x722f.xn--fiqs8s', 'xn--85x722f.xn--fiqs8s');
-  checkPublicSuffix('shishi.xn--fiqs8s', 'shishi.xn--fiqs8s');
-  checkPublicSuffix('xn--fiqs8s', null);
-}
diff --git a/deps/npm/node_modules/tough-cookie/lib/pubsuffix.js b/deps/npm/node_modules/tough-cookie/lib/pubsuffix.js
deleted file mode 100644
index f07aa2bf8ef957..00000000000000
--- a/deps/npm/node_modules/tough-cookie/lib/pubsuffix.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/****************************************************
- * AUTOMATICALLY GENERATED by generate-pubsuffix.js *
- *                  DO NOT EDIT!                    *
- ****************************************************/
-
-"use strict";
-
-var punycode = require('punycode');
-
-module.exports.getPublicSuffix = function getPublicSuffix(domain) {
-  /*!
-   * Copyright (c) 2015, Salesforce.com, Inc.
-   * All rights reserved.
-   *
-   * Redistribution and use in source and binary forms, with or without
-   * modification, are permitted provided that the following conditions are met:
-   *
-   * 1. Redistributions of source code must retain the above copyright notice,
-   * this list of conditions and the following disclaimer.
-   *
-   * 2. Redistributions in binary form must reproduce the above copyright notice,
-   * this list of conditions and the following disclaimer in the documentation
-   * and/or other materials provided with the distribution.
-   *
-   * 3. Neither the name of Salesforce.com nor the names of its contributors may
-   * be used to endorse or promote products derived from this software without
-   * specific prior written permission.
-   *
-   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-   * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-   * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-   * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-   * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   * POSSIBILITY OF SUCH DAMAGE.
-   */
-  if (!domain) {
-    return null;
-  }
-  if (domain.match(/^\./)) {
-    return null;
-  }
-  var asciiDomain = punycode.toASCII(domain);
-  var converted = false;
-  if (asciiDomain !== domain) {
-    domain = asciiDomain;
-    converted = true;
-  }
-  if (index[domain]) {
-    return null;
-  }
-
-  domain = domain.toLowerCase();
-  var parts = domain.split('.').reverse();
-
-  var suffix = '';
-  var suffixLen = 0;
-  for (var i=0; i<parts.length; i++) {
-    var part = parts[i];
-    var starstr = '*'+suffix;
-    var partstr = part+suffix;
-
-    if (index[starstr]) { // star rule matches
-      suffixLen = i+1;
-      if (index[partstr] === false) { // exception rule matches (NB: false, not undefined)
-        suffixLen--;
-      }
-    } else if (index[partstr]) { // exact match, not exception
-      suffixLen = i+1;
-    }
-
-    suffix = '.'+partstr;
-  }
-
-  if (index['*'+suffix]) { // *.domain exists (e.g. *.kyoto.jp for domain='kyoto.jp');
-    return null;
-  }
-
-  suffixLen = suffixLen || 1;
-  if (parts.length > suffixLen) {
-    var publicSuffix = parts.slice(0,suffixLen+1).reverse().join('.');
-    return converted ? punycode.toUnicode(publicSuffix) : publicSuffix;
-  }
-
-  return null;
-};
-
-// The following generated structure is used under the MPL version 1.1
-// See public-suffix.txt for more information
-
-var index = module.exports.index = Object.freeze(
-{"ac":true,"com.ac":true,"edu.ac":true,"gov.ac":true,"net.ac":true,"mil.ac":true,"org.ac":true,"ad":true,"nom.ad":true,"ae":true,"co.ae":true,"net.ae":true,"org.ae":true,"sch.ae":true,"ac.ae":true,"gov.ae":true,"mil.ae":true,"aero":true,"accident-investigation.aero":true,"accident-prevention.aero":true,"aerobatic.aero":true,"aeroclub.aero":true,"aerodrome.aero":true,"agents.aero":true,"aircraft.aero":true,"airline.aero":true,"airport.aero":true,"air-surveillance.aero":true,"airtraffic.aero":true,"air-traffic-control.aero":true,"ambulance.aero":true,"amusement.aero":true,"association.aero":true,"author.aero":true,"ballooning.aero":true,"broker.aero":true,"caa.aero":true,"cargo.aero":true,"catering.aero":true,"certification.aero":true,"championship.aero":true,"charter.aero":true,"civilaviation.aero":true,"club.aero":true,"conference.aero":true,"consultant.aero":true,"consulting.aero":true,"control.aero":true,"council.aero":true,"crew.aero":true,"design.aero":true,"dgca.aero":true,"educator.aero":true,"emergency.aero":true,"engine.aero":true,"engineer.aero":true,"entertainment.aero":true,"equipment.aero":true,"exchange.aero":true,"express.aero":true,"federation.aero":true,"flight.aero":true,"freight.aero":true,"fuel.aero":true,"gliding.aero":true,"government.aero":true,"groundhandling.aero":true,"group.aero":true,"hanggliding.aero":true,"homebuilt.aero":true,"insurance.aero":true,"journal.aero":true,"journalist.aero":true,"leasing.aero":true,"logistics.aero":true,"magazine.aero":true,"maintenance.aero":true,"marketplace.aero":true,"media.aero":true,"microlight.aero":true,"modelling.aero":true,"navigation.aero":true,"parachuting.aero":true,"paragliding.aero":true,"passenger-association.aero":true,"pilot.aero":true,"press.aero":true,"production.aero":true,"recreation.aero":true,"repbody.aero":true,"res.aero":true,"research.aero":true,"rotorcraft.aero":true,"safety.aero":true,"scientist.aero":true,"services.aero":true,"show.aero":true,"skydiving.aero":true,"software.aero":true,"student.aero":true,"taxi.aero":true,"trader.aero":true,"trading.aero":true,"trainer.aero":true,"union.aero":true,"workinggroup.aero":true,"works.aero":true,"af":true,"gov.af":true,"com.af":true,"org.af":true,"net.af":true,"edu.af":true,"ag":true,"com.ag":true,"org.ag":true,"net.ag":true,"co.ag":true,"nom.ag":true,"ai":true,"off.ai":true,"com.ai":true,"net.ai":true,"org.ai":true,"al":true,"com.al":true,"edu.al":true,"gov.al":true,"mil.al":true,"net.al":true,"org.al":true,"am":true,"an":true,"com.an":true,"net.an":true,"org.an":true,"edu.an":true,"ao":true,"ed.ao":true,"gv.ao":true,"og.ao":true,"co.ao":true,"pb.ao":true,"it.ao":true,"aq":true,"ar":true,"com.ar":true,"edu.ar":true,"gob.ar":true,"gov.ar":true,"int.ar":true,"mil.ar":true,"net.ar":true,"org.ar":true,"tur.ar":true,"arpa":true,"e164.arpa":true,"in-addr.arpa":true,"ip6.arpa":true,"iris.arpa":true,"uri.arpa":true,"urn.arpa":true,"as":true,"gov.as":true,"asia":true,"at":true,"ac.at":true,"co.at":true,"gv.at":true,"or.at":true,"au":true,"com.au":true,"net.au":true,"org.au":true,"edu.au":true,"gov.au":true,"asn.au":true,"id.au":true,"info.au":true,"conf.au":true,"oz.au":true,"act.au":true,"nsw.au":true,"nt.au":true,"qld.au":true,"sa.au":true,"tas.au":true,"vic.au":true,"wa.au":true,"act.edu.au":true,"nsw.edu.au":true,"nt.edu.au":true,"qld.edu.au":true,"sa.edu.au":true,"tas.edu.au":true,"vic.edu.au":true,"wa.edu.au":true,"qld.gov.au":true,"sa.gov.au":true,"tas.gov.au":true,"vic.gov.au":true,"wa.gov.au":true,"aw":true,"com.aw":true,"ax":true,"az":true,"com.az":true,"net.az":true,"int.az":true,"gov.az":true,"org.az":true,"edu.az":true,"info.az":true,"pp.az":true,"mil.az":true,"name.az":true,"pro.az":true,"biz.az":true,"ba":true,"org.ba":true,"net.ba":true,"edu.ba":true,"gov.ba":true,"mil.ba":true,"unsa.ba":true,"unbi.ba":true,"co.ba":true,"com.ba":true,"rs.ba":true,"bb":true,"biz.bb":true,"co.bb":true,"com.bb":true,"edu.bb":true,"gov.bb":true,"info.bb":true,"net.bb":true,"org.bb":true,"store.bb":true,"tv.bb":true,"*.bd":true,"be":true,"ac.be":true,"bf":true,"gov.bf":true,"bg":true,"a.bg":true,"b.bg":true,"c.bg":true,"d.bg":true,"e.bg":true,"f.bg":true,"g.bg":true,"h.bg":true,"i.bg":true,"j.bg":true,"k.bg":true,"l.bg":true,"m.bg":true,"n.bg":true,"o.bg":true,"p.bg":true,"q.bg":true,"r.bg":true,"s.bg":true,"t.bg":true,"u.bg":true,"v.bg":true,"w.bg":true,"x.bg":true,"y.bg":true,"z.bg":true,"0.bg":true,"1.bg":true,"2.bg":true,"3.bg":true,"4.bg":true,"5.bg":true,"6.bg":true,"7.bg":true,"8.bg":true,"9.bg":true,"bh":true,"com.bh":true,"edu.bh":true,"net.bh":true,"org.bh":true,"gov.bh":true,"bi":true,"co.bi":true,"com.bi":true,"edu.bi":true,"or.bi":true,"org.bi":true,"biz":true,"bj":true,"asso.bj":true,"barreau.bj":true,"gouv.bj":true,"bm":true,"com.bm":true,"edu.bm":true,"gov.bm":true,"net.bm":true,"org.bm":true,"*.bn":true,"bo":true,"com.bo":true,"edu.bo":true,"gov.bo":true,"gob.bo":true,"int.bo":true,"org.bo":true,"net.bo":true,"mil.bo":true,"tv.bo":true,"br":true,"adm.br":true,"adv.br":true,"agr.br":true,"am.br":true,"arq.br":true,"art.br":true,"ato.br":true,"b.br":true,"bio.br":true,"blog.br":true,"bmd.br":true,"cim.br":true,"cng.br":true,"cnt.br":true,"com.br":true,"coop.br":true,"ecn.br":true,"eco.br":true,"edu.br":true,"emp.br":true,"eng.br":true,"esp.br":true,"etc.br":true,"eti.br":true,"far.br":true,"flog.br":true,"fm.br":true,"fnd.br":true,"fot.br":true,"fst.br":true,"g12.br":true,"ggf.br":true,"gov.br":true,"imb.br":true,"ind.br":true,"inf.br":true,"jor.br":true,"jus.br":true,"leg.br":true,"lel.br":true,"mat.br":true,"med.br":true,"mil.br":true,"mp.br":true,"mus.br":true,"net.br":true,"*.nom.br":true,"not.br":true,"ntr.br":true,"odo.br":true,"org.br":true,"ppg.br":true,"pro.br":true,"psc.br":true,"psi.br":true,"qsl.br":true,"radio.br":true,"rec.br":true,"slg.br":true,"srv.br":true,"taxi.br":true,"teo.br":true,"tmp.br":true,"trd.br":true,"tur.br":true,"tv.br":true,"vet.br":true,"vlog.br":true,"wiki.br":true,"zlg.br":true,"bs":true,"com.bs":true,"net.bs":true,"org.bs":true,"edu.bs":true,"gov.bs":true,"bt":true,"com.bt":true,"edu.bt":true,"gov.bt":true,"net.bt":true,"org.bt":true,"bv":true,"bw":true,"co.bw":true,"org.bw":true,"by":true,"gov.by":true,"mil.by":true,"com.by":true,"of.by":true,"bz":true,"com.bz":true,"net.bz":true,"org.bz":true,"edu.bz":true,"gov.bz":true,"ca":true,"ab.ca":true,"bc.ca":true,"mb.ca":true,"nb.ca":true,"nf.ca":true,"nl.ca":true,"ns.ca":true,"nt.ca":true,"nu.ca":true,"on.ca":true,"pe.ca":true,"qc.ca":true,"sk.ca":true,"yk.ca":true,"gc.ca":true,"cat":true,"cc":true,"cd":true,"gov.cd":true,"cf":true,"cg":true,"ch":true,"ci":true,"org.ci":true,"or.ci":true,"com.ci":true,"co.ci":true,"edu.ci":true,"ed.ci":true,"ac.ci":true,"net.ci":true,"go.ci":true,"asso.ci":true,"xn--aroport-bya.ci":true,"int.ci":true,"presse.ci":true,"md.ci":true,"gouv.ci":true,"*.ck":true,"www.ck":false,"cl":true,"gov.cl":true,"gob.cl":true,"co.cl":true,"mil.cl":true,"cm":true,"co.cm":true,"com.cm":true,"gov.cm":true,"net.cm":true,"cn":true,"ac.cn":true,"com.cn":true,"edu.cn":true,"gov.cn":true,"net.cn":true,"org.cn":true,"mil.cn":true,"xn--55qx5d.cn":true,"xn--io0a7i.cn":true,"xn--od0alg.cn":true,"ah.cn":true,"bj.cn":true,"cq.cn":true,"fj.cn":true,"gd.cn":true,"gs.cn":true,"gz.cn":true,"gx.cn":true,"ha.cn":true,"hb.cn":true,"he.cn":true,"hi.cn":true,"hl.cn":true,"hn.cn":true,"jl.cn":true,"js.cn":true,"jx.cn":true,"ln.cn":true,"nm.cn":true,"nx.cn":true,"qh.cn":true,"sc.cn":true,"sd.cn":true,"sh.cn":true,"sn.cn":true,"sx.cn":true,"tj.cn":true,"xj.cn":true,"xz.cn":true,"yn.cn":true,"zj.cn":true,"hk.cn":true,"mo.cn":true,"tw.cn":true,"co":true,"arts.co":true,"com.co":true,"edu.co":true,"firm.co":true,"gov.co":true,"info.co":true,"int.co":true,"mil.co":true,"net.co":true,"nom.co":true,"org.co":true,"rec.co":true,"web.co":true,"com":true,"coop":true,"cr":true,"ac.cr":true,"co.cr":true,"ed.cr":true,"fi.cr":true,"go.cr":true,"or.cr":true,"sa.cr":true,"cu":true,"com.cu":true,"edu.cu":true,"org.cu":true,"net.cu":true,"gov.cu":true,"inf.cu":true,"cv":true,"cw":true,"com.cw":true,"edu.cw":true,"net.cw":true,"org.cw":true,"cx":true,"gov.cx":true,"*.cy":true,"cz":true,"de":true,"dj":true,"dk":true,"dm":true,"com.dm":true,"net.dm":true,"org.dm":true,"edu.dm":true,"gov.dm":true,"do":true,"art.do":true,"com.do":true,"edu.do":true,"gob.do":true,"gov.do":true,"mil.do":true,"net.do":true,"org.do":true,"sld.do":true,"web.do":true,"dz":true,"com.dz":true,"org.dz":true,"net.dz":true,"gov.dz":true,"edu.dz":true,"asso.dz":true,"pol.dz":true,"art.dz":true,"ec":true,"com.ec":true,"info.ec":true,"net.ec":true,"fin.ec":true,"k12.ec":true,"med.ec":true,"pro.ec":true,"org.ec":true,"edu.ec":true,"gov.ec":true,"gob.ec":true,"mil.ec":true,"edu":true,"ee":true,"edu.ee":true,"gov.ee":true,"riik.ee":true,"lib.ee":true,"med.ee":true,"com.ee":true,"pri.ee":true,"aip.ee":true,"org.ee":true,"fie.ee":true,"eg":true,"com.eg":true,"edu.eg":true,"eun.eg":true,"gov.eg":true,"mil.eg":true,"name.eg":true,"net.eg":true,"org.eg":true,"sci.eg":true,"*.er":true,"es":true,"com.es":true,"nom.es":true,"org.es":true,"gob.es":true,"edu.es":true,"et":true,"com.et":true,"gov.et":true,"org.et":true,"edu.et":true,"biz.et":true,"name.et":true,"info.et":true,"eu":true,"fi":true,"aland.fi":true,"*.fj":true,"*.fk":true,"fm":true,"fo":true,"fr":true,"com.fr":true,"asso.fr":true,"nom.fr":true,"prd.fr":true,"presse.fr":true,"tm.fr":true,"aeroport.fr":true,"assedic.fr":true,"avocat.fr":true,"avoues.fr":true,"cci.fr":true,"chambagri.fr":true,"chirurgiens-dentistes.fr":true,"experts-comptables.fr":true,"geometre-expert.fr":true,"gouv.fr":true,"greta.fr":true,"huissier-justice.fr":true,"medecin.fr":true,"notaires.fr":true,"pharmacien.fr":true,"port.fr":true,"veterinaire.fr":true,"ga":true,"gb":true,"gd":true,"ge":true,"com.ge":true,"edu.ge":true,"gov.ge":true,"org.ge":true,"mil.ge":true,"net.ge":true,"pvt.ge":true,"gf":true,"gg":true,"co.gg":true,"net.gg":true,"org.gg":true,"gh":true,"com.gh":true,"edu.gh":true,"gov.gh":true,"org.gh":true,"mil.gh":true,"gi":true,"com.gi":true,"ltd.gi":true,"gov.gi":true,"mod.gi":true,"edu.gi":true,"org.gi":true,"gl":true,"gm":true,"gn":true,"ac.gn":true,"com.gn":true,"edu.gn":true,"gov.gn":true,"org.gn":true,"net.gn":true,"gov":true,"gp":true,"com.gp":true,"net.gp":true,"mobi.gp":true,"edu.gp":true,"org.gp":true,"asso.gp":true,"gq":true,"gr":true,"com.gr":true,"edu.gr":true,"net.gr":true,"org.gr":true,"gov.gr":true,"gs":true,"gt":true,"com.gt":true,"edu.gt":true,"gob.gt":true,"ind.gt":true,"mil.gt":true,"net.gt":true,"org.gt":true,"*.gu":true,"gw":true,"gy":true,"co.gy":true,"com.gy":true,"net.gy":true,"hk":true,"com.hk":true,"edu.hk":true,"gov.hk":true,"idv.hk":true,"net.hk":true,"org.hk":true,"xn--55qx5d.hk":true,"xn--wcvs22d.hk":true,"xn--lcvr32d.hk":true,"xn--mxtq1m.hk":true,"xn--gmqw5a.hk":true,"xn--ciqpn.hk":true,"xn--gmq050i.hk":true,"xn--zf0avx.hk":true,"xn--io0a7i.hk":true,"xn--mk0axi.hk":true,"xn--od0alg.hk":true,"xn--od0aq3b.hk":true,"xn--tn0ag.hk":true,"xn--uc0atv.hk":true,"xn--uc0ay4a.hk":true,"hm":true,"hn":true,"com.hn":true,"edu.hn":true,"org.hn":true,"net.hn":true,"mil.hn":true,"gob.hn":true,"hr":true,"iz.hr":true,"from.hr":true,"name.hr":true,"com.hr":true,"ht":true,"com.ht":true,"shop.ht":true,"firm.ht":true,"info.ht":true,"adult.ht":true,"net.ht":true,"pro.ht":true,"org.ht":true,"med.ht":true,"art.ht":true,"coop.ht":true,"pol.ht":true,"asso.ht":true,"edu.ht":true,"rel.ht":true,"gouv.ht":true,"perso.ht":true,"hu":true,"co.hu":true,"info.hu":true,"org.hu":true,"priv.hu":true,"sport.hu":true,"tm.hu":true,"2000.hu":true,"agrar.hu":true,"bolt.hu":true,"casino.hu":true,"city.hu":true,"erotica.hu":true,"erotika.hu":true,"film.hu":true,"forum.hu":true,"games.hu":true,"hotel.hu":true,"ingatlan.hu":true,"jogasz.hu":true,"konyvelo.hu":true,"lakas.hu":true,"media.hu":true,"news.hu":true,"reklam.hu":true,"sex.hu":true,"shop.hu":true,"suli.hu":true,"szex.hu":true,"tozsde.hu":true,"utazas.hu":true,"video.hu":true,"id":true,"ac.id":true,"biz.id":true,"co.id":true,"desa.id":true,"go.id":true,"mil.id":true,"my.id":true,"net.id":true,"or.id":true,"sch.id":true,"web.id":true,"ie":true,"gov.ie":true,"*.il":true,"im":true,"ac.im":true,"co.im":true,"com.im":true,"ltd.co.im":true,"net.im":true,"org.im":true,"plc.co.im":true,"tt.im":true,"tv.im":true,"in":true,"co.in":true,"firm.in":true,"net.in":true,"org.in":true,"gen.in":true,"ind.in":true,"nic.in":true,"ac.in":true,"edu.in":true,"res.in":true,"gov.in":true,"mil.in":true,"info":true,"int":true,"eu.int":true,"io":true,"com.io":true,"iq":true,"gov.iq":true,"edu.iq":true,"mil.iq":true,"com.iq":true,"org.iq":true,"net.iq":true,"ir":true,"ac.ir":true,"co.ir":true,"gov.ir":true,"id.ir":true,"net.ir":true,"org.ir":true,"sch.ir":true,"xn--mgba3a4f16a.ir":true,"xn--mgba3a4fra.ir":true,"is":true,"net.is":true,"com.is":true,"edu.is":true,"gov.is":true,"org.is":true,"int.is":true,"it":true,"gov.it":true,"edu.it":true,"abr.it":true,"abruzzo.it":true,"aosta-valley.it":true,"aostavalley.it":true,"bas.it":true,"basilicata.it":true,"cal.it":true,"calabria.it":true,"cam.it":true,"campania.it":true,"emilia-romagna.it":true,"emiliaromagna.it":true,"emr.it":true,"friuli-v-giulia.it":true,"friuli-ve-giulia.it":true,"friuli-vegiulia.it":true,"friuli-venezia-giulia.it":true,"friuli-veneziagiulia.it":true,"friuli-vgiulia.it":true,"friuliv-giulia.it":true,"friulive-giulia.it":true,"friulivegiulia.it":true,"friulivenezia-giulia.it":true,"friuliveneziagiulia.it":true,"friulivgiulia.it":true,"fvg.it":true,"laz.it":true,"lazio.it":true,"lig.it":true,"liguria.it":true,"lom.it":true,"lombardia.it":true,"lombardy.it":true,"lucania.it":true,"mar.it":true,"marche.it":true,"mol.it":true,"molise.it":true,"piedmont.it":true,"piemonte.it":true,"pmn.it":true,"pug.it":true,"puglia.it":true,"sar.it":true,"sardegna.it":true,"sardinia.it":true,"sic.it":true,"sicilia.it":true,"sicily.it":true,"taa.it":true,"tos.it":true,"toscana.it":true,"trentino-a-adige.it":true,"trentino-aadige.it":true,"trentino-alto-adige.it":true,"trentino-altoadige.it":true,"trentino-s-tirol.it":true,"trentino-stirol.it":true,"trentino-sud-tirol.it":true,"trentino-sudtirol.it":true,"trentino-sued-tirol.it":true,"trentino-suedtirol.it":true,"trentinoa-adige.it":true,"trentinoaadige.it":true,"trentinoalto-adige.it":true,"trentinoaltoadige.it":true,"trentinos-tirol.it":true,"trentinostirol.it":true,"trentinosud-tirol.it":true,"trentinosudtirol.it":true,"trentinosued-tirol.it":true,"trentinosuedtirol.it":true,"tuscany.it":true,"umb.it":true,"umbria.it":true,"val-d-aosta.it":true,"val-daosta.it":true,"vald-aosta.it":true,"valdaosta.it":true,"valle-aosta.it":true,"valle-d-aosta.it":true,"valle-daosta.it":true,"valleaosta.it":true,"valled-aosta.it":true,"valledaosta.it":true,"vallee-aoste.it":true,"valleeaoste.it":true,"vao.it":true,"vda.it":true,"ven.it":true,"veneto.it":true,"ag.it":true,"agrigento.it":true,"al.it":true,"alessandria.it":true,"alto-adige.it":true,"altoadige.it":true,"an.it":true,"ancona.it":true,"andria-barletta-trani.it":true,"andria-trani-barletta.it":true,"andriabarlettatrani.it":true,"andriatranibarletta.it":true,"ao.it":true,"aosta.it":true,"aoste.it":true,"ap.it":true,"aq.it":true,"aquila.it":true,"ar.it":true,"arezzo.it":true,"ascoli-piceno.it":true,"ascolipiceno.it":true,"asti.it":true,"at.it":true,"av.it":true,"avellino.it":true,"ba.it":true,"balsan.it":true,"bari.it":true,"barletta-trani-andria.it":true,"barlettatraniandria.it":true,"belluno.it":true,"benevento.it":true,"bergamo.it":true,"bg.it":true,"bi.it":true,"biella.it":true,"bl.it":true,"bn.it":true,"bo.it":true,"bologna.it":true,"bolzano.it":true,"bozen.it":true,"br.it":true,"brescia.it":true,"brindisi.it":true,"bs.it":true,"bt.it":true,"bz.it":true,"ca.it":true,"cagliari.it":true,"caltanissetta.it":true,"campidano-medio.it":true,"campidanomedio.it":true,"campobasso.it":true,"carbonia-iglesias.it":true,"carboniaiglesias.it":true,"carrara-massa.it":true,"carraramassa.it":true,"caserta.it":true,"catania.it":true,"catanzaro.it":true,"cb.it":true,"ce.it":true,"cesena-forli.it":true,"cesenaforli.it":true,"ch.it":true,"chieti.it":true,"ci.it":true,"cl.it":true,"cn.it":true,"co.it":true,"como.it":true,"cosenza.it":true,"cr.it":true,"cremona.it":true,"crotone.it":true,"cs.it":true,"ct.it":true,"cuneo.it":true,"cz.it":true,"dell-ogliastra.it":true,"dellogliastra.it":true,"en.it":true,"enna.it":true,"fc.it":true,"fe.it":true,"fermo.it":true,"ferrara.it":true,"fg.it":true,"fi.it":true,"firenze.it":true,"florence.it":true,"fm.it":true,"foggia.it":true,"forli-cesena.it":true,"forlicesena.it":true,"fr.it":true,"frosinone.it":true,"ge.it":true,"genoa.it":true,"genova.it":true,"go.it":true,"gorizia.it":true,"gr.it":true,"grosseto.it":true,"iglesias-carbonia.it":true,"iglesiascarbonia.it":true,"im.it":true,"imperia.it":true,"is.it":true,"isernia.it":true,"kr.it":true,"la-spezia.it":true,"laquila.it":true,"laspezia.it":true,"latina.it":true,"lc.it":true,"le.it":true,"lecce.it":true,"lecco.it":true,"li.it":true,"livorno.it":true,"lo.it":true,"lodi.it":true,"lt.it":true,"lu.it":true,"lucca.it":true,"macerata.it":true,"mantova.it":true,"massa-carrara.it":true,"massacarrara.it":true,"matera.it":true,"mb.it":true,"mc.it":true,"me.it":true,"medio-campidano.it":true,"mediocampidano.it":true,"messina.it":true,"mi.it":true,"milan.it":true,"milano.it":true,"mn.it":true,"mo.it":true,"modena.it":true,"monza-brianza.it":true,"monza-e-della-brianza.it":true,"monza.it":true,"monzabrianza.it":true,"monzaebrianza.it":true,"monzaedellabrianza.it":true,"ms.it":true,"mt.it":true,"na.it":true,"naples.it":true,"napoli.it":true,"no.it":true,"novara.it":true,"nu.it":true,"nuoro.it":true,"og.it":true,"ogliastra.it":true,"olbia-tempio.it":true,"olbiatempio.it":true,"or.it":true,"oristano.it":true,"ot.it":true,"pa.it":true,"padova.it":true,"padua.it":true,"palermo.it":true,"parma.it":true,"pavia.it":true,"pc.it":true,"pd.it":true,"pe.it":true,"perugia.it":true,"pesaro-urbino.it":true,"pesarourbino.it":true,"pescara.it":true,"pg.it":true,"pi.it":true,"piacenza.it":true,"pisa.it":true,"pistoia.it":true,"pn.it":true,"po.it":true,"pordenone.it":true,"potenza.it":true,"pr.it":true,"prato.it":true,"pt.it":true,"pu.it":true,"pv.it":true,"pz.it":true,"ra.it":true,"ragusa.it":true,"ravenna.it":true,"rc.it":true,"re.it":true,"reggio-calabria.it":true,"reggio-emilia.it":true,"reggiocalabria.it":true,"reggioemilia.it":true,"rg.it":true,"ri.it":true,"rieti.it":true,"rimini.it":true,"rm.it":true,"rn.it":true,"ro.it":true,"roma.it":true,"rome.it":true,"rovigo.it":true,"sa.it":true,"salerno.it":true,"sassari.it":true,"savona.it":true,"si.it":true,"siena.it":true,"siracusa.it":true,"so.it":true,"sondrio.it":true,"sp.it":true,"sr.it":true,"ss.it":true,"suedtirol.it":true,"sv.it":true,"ta.it":true,"taranto.it":true,"te.it":true,"tempio-olbia.it":true,"tempioolbia.it":true,"teramo.it":true,"terni.it":true,"tn.it":true,"to.it":true,"torino.it":true,"tp.it":true,"tr.it":true,"trani-andria-barletta.it":true,"trani-barletta-andria.it":true,"traniandriabarletta.it":true,"tranibarlettaandria.it":true,"trapani.it":true,"trentino.it":true,"trento.it":true,"treviso.it":true,"trieste.it":true,"ts.it":true,"turin.it":true,"tv.it":true,"ud.it":true,"udine.it":true,"urbino-pesaro.it":true,"urbinopesaro.it":true,"va.it":true,"varese.it":true,"vb.it":true,"vc.it":true,"ve.it":true,"venezia.it":true,"venice.it":true,"verbania.it":true,"vercelli.it":true,"verona.it":true,"vi.it":true,"vibo-valentia.it":true,"vibovalentia.it":true,"vicenza.it":true,"viterbo.it":true,"vr.it":true,"vs.it":true,"vt.it":true,"vv.it":true,"je":true,"co.je":true,"net.je":true,"org.je":true,"*.jm":true,"jo":true,"com.jo":true,"org.jo":true,"net.jo":true,"edu.jo":true,"sch.jo":true,"gov.jo":true,"mil.jo":true,"name.jo":true,"jobs":true,"jp":true,"ac.jp":true,"ad.jp":true,"co.jp":true,"ed.jp":true,"go.jp":true,"gr.jp":true,"lg.jp":true,"ne.jp":true,"or.jp":true,"aichi.jp":true,"akita.jp":true,"aomori.jp":true,"chiba.jp":true,"ehime.jp":true,"fukui.jp":true,"fukuoka.jp":true,"fukushima.jp":true,"gifu.jp":true,"gunma.jp":true,"hiroshima.jp":true,"hokkaido.jp":true,"hyogo.jp":true,"ibaraki.jp":true,"ishikawa.jp":true,"iwate.jp":true,"kagawa.jp":true,"kagoshima.jp":true,"kanagawa.jp":true,"kochi.jp":true,"kumamoto.jp":true,"kyoto.jp":true,"mie.jp":true,"miyagi.jp":true,"miyazaki.jp":true,"nagano.jp":true,"nagasaki.jp":true,"nara.jp":true,"niigata.jp":true,"oita.jp":true,"okayama.jp":true,"okinawa.jp":true,"osaka.jp":true,"saga.jp":true,"saitama.jp":true,"shiga.jp":true,"shimane.jp":true,"shizuoka.jp":true,"tochigi.jp":true,"tokushima.jp":true,"tokyo.jp":true,"tottori.jp":true,"toyama.jp":true,"wakayama.jp":true,"yamagata.jp":true,"yamaguchi.jp":true,"yamanashi.jp":true,"xn--4pvxs.jp":true,"xn--vgu402c.jp":true,"xn--c3s14m.jp":true,"xn--f6qx53a.jp":true,"xn--8pvr4u.jp":true,"xn--uist22h.jp":true,"xn--djrs72d6uy.jp":true,"xn--mkru45i.jp":true,"xn--0trq7p7nn.jp":true,"xn--8ltr62k.jp":true,"xn--2m4a15e.jp":true,"xn--efvn9s.jp":true,"xn--32vp30h.jp":true,"xn--4it797k.jp":true,"xn--1lqs71d.jp":true,"xn--5rtp49c.jp":true,"xn--5js045d.jp":true,"xn--ehqz56n.jp":true,"xn--1lqs03n.jp":true,"xn--qqqt11m.jp":true,"xn--kbrq7o.jp":true,"xn--pssu33l.jp":true,"xn--ntsq17g.jp":true,"xn--uisz3g.jp":true,"xn--6btw5a.jp":true,"xn--1ctwo.jp":true,"xn--6orx2r.jp":true,"xn--rht61e.jp":true,"xn--rht27z.jp":true,"xn--djty4k.jp":true,"xn--nit225k.jp":true,"xn--rht3d.jp":true,"xn--klty5x.jp":true,"xn--kltx9a.jp":true,"xn--kltp7d.jp":true,"xn--uuwu58a.jp":true,"xn--zbx025d.jp":true,"xn--ntso0iqx3a.jp":true,"xn--elqq16h.jp":true,"xn--4it168d.jp":true,"xn--klt787d.jp":true,"xn--rny31h.jp":true,"xn--7t0a264c.jp":true,"xn--5rtq34k.jp":true,"xn--k7yn95e.jp":true,"xn--tor131o.jp":true,"xn--d5qv7z876c.jp":true,"*.kawasaki.jp":true,"*.kitakyushu.jp":true,"*.kobe.jp":true,"*.nagoya.jp":true,"*.sapporo.jp":true,"*.sendai.jp":true,"*.yokohama.jp":true,"city.kawasaki.jp":false,"city.kitakyushu.jp":false,"city.kobe.jp":false,"city.nagoya.jp":false,"city.sapporo.jp":false,"city.sendai.jp":false,"city.yokohama.jp":false,"aisai.aichi.jp":true,"ama.aichi.jp":true,"anjo.aichi.jp":true,"asuke.aichi.jp":true,"chiryu.aichi.jp":true,"chita.aichi.jp":true,"fuso.aichi.jp":true,"gamagori.aichi.jp":true,"handa.aichi.jp":true,"hazu.aichi.jp":true,"hekinan.aichi.jp":true,"higashiura.aichi.jp":true,"ichinomiya.aichi.jp":true,"inazawa.aichi.jp":true,"inuyama.aichi.jp":true,"isshiki.aichi.jp":true,"iwakura.aichi.jp":true,"kanie.aichi.jp":true,"kariya.aichi.jp":true,"kasugai.aichi.jp":true,"kira.aichi.jp":true,"kiyosu.aichi.jp":true,"komaki.aichi.jp":true,"konan.aichi.jp":true,"kota.aichi.jp":true,"mihama.aichi.jp":true,"miyoshi.aichi.jp":true,"nishio.aichi.jp":true,"nisshin.aichi.jp":true,"obu.aichi.jp":true,"oguchi.aichi.jp":true,"oharu.aichi.jp":true,"okazaki.aichi.jp":true,"owariasahi.aichi.jp":true,"seto.aichi.jp":true,"shikatsu.aichi.jp":true,"shinshiro.aichi.jp":true,"shitara.aichi.jp":true,"tahara.aichi.jp":true,"takahama.aichi.jp":true,"tobishima.aichi.jp":true,"toei.aichi.jp":true,"togo.aichi.jp":true,"tokai.aichi.jp":true,"tokoname.aichi.jp":true,"toyoake.aichi.jp":true,"toyohashi.aichi.jp":true,"toyokawa.aichi.jp":true,"toyone.aichi.jp":true,"toyota.aichi.jp":true,"tsushima.aichi.jp":true,"yatomi.aichi.jp":true,"akita.akita.jp":true,"daisen.akita.jp":true,"fujisato.akita.jp":true,"gojome.akita.jp":true,"hachirogata.akita.jp":true,"happou.akita.jp":true,"higashinaruse.akita.jp":true,"honjo.akita.jp":true,"honjyo.akita.jp":true,"ikawa.akita.jp":true,"kamikoani.akita.jp":true,"kamioka.akita.jp":true,"katagami.akita.jp":true,"kazuno.akita.jp":true,"kitaakita.akita.jp":true,"kosaka.akita.jp":true,"kyowa.akita.jp":true,"misato.akita.jp":true,"mitane.akita.jp":true,"moriyoshi.akita.jp":true,"nikaho.akita.jp":true,"noshiro.akita.jp":true,"odate.akita.jp":true,"oga.akita.jp":true,"ogata.akita.jp":true,"semboku.akita.jp":true,"yokote.akita.jp":true,"yurihonjo.akita.jp":true,"aomori.aomori.jp":true,"gonohe.aomori.jp":true,"hachinohe.aomori.jp":true,"hashikami.aomori.jp":true,"hiranai.aomori.jp":true,"hirosaki.aomori.jp":true,"itayanagi.aomori.jp":true,"kuroishi.aomori.jp":true,"misawa.aomori.jp":true,"mutsu.aomori.jp":true,"nakadomari.aomori.jp":true,"noheji.aomori.jp":true,"oirase.aomori.jp":true,"owani.aomori.jp":true,"rokunohe.aomori.jp":true,"sannohe.aomori.jp":true,"shichinohe.aomori.jp":true,"shingo.aomori.jp":true,"takko.aomori.jp":true,"towada.aomori.jp":true,"tsugaru.aomori.jp":true,"tsuruta.aomori.jp":true,"abiko.chiba.jp":true,"asahi.chiba.jp":true,"chonan.chiba.jp":true,"chosei.chiba.jp":true,"choshi.chiba.jp":true,"chuo.chiba.jp":true,"funabashi.chiba.jp":true,"futtsu.chiba.jp":true,"hanamigawa.chiba.jp":true,"ichihara.chiba.jp":true,"ichikawa.chiba.jp":true,"ichinomiya.chiba.jp":true,"inzai.chiba.jp":true,"isumi.chiba.jp":true,"kamagaya.chiba.jp":true,"kamogawa.chiba.jp":true,"kashiwa.chiba.jp":true,"katori.chiba.jp":true,"katsuura.chiba.jp":true,"kimitsu.chiba.jp":true,"kisarazu.chiba.jp":true,"kozaki.chiba.jp":true,"kujukuri.chiba.jp":true,"kyonan.chiba.jp":true,"matsudo.chiba.jp":true,"midori.chiba.jp":true,"mihama.chiba.jp":true,"minamiboso.chiba.jp":true,"mobara.chiba.jp":true,"mutsuzawa.chiba.jp":true,"nagara.chiba.jp":true,"nagareyama.chiba.jp":true,"narashino.chiba.jp":true,"narita.chiba.jp":true,"noda.chiba.jp":true,"oamishirasato.chiba.jp":true,"omigawa.chiba.jp":true,"onjuku.chiba.jp":true,"otaki.chiba.jp":true,"sakae.chiba.jp":true,"sakura.chiba.jp":true,"shimofusa.chiba.jp":true,"shirako.chiba.jp":true,"shiroi.chiba.jp":true,"shisui.chiba.jp":true,"sodegaura.chiba.jp":true,"sosa.chiba.jp":true,"tako.chiba.jp":true,"tateyama.chiba.jp":true,"togane.chiba.jp":true,"tohnosho.chiba.jp":true,"tomisato.chiba.jp":true,"urayasu.chiba.jp":true,"yachimata.chiba.jp":true,"yachiyo.chiba.jp":true,"yokaichiba.chiba.jp":true,"yokoshibahikari.chiba.jp":true,"yotsukaido.chiba.jp":true,"ainan.ehime.jp":true,"honai.ehime.jp":true,"ikata.ehime.jp":true,"imabari.ehime.jp":true,"iyo.ehime.jp":true,"kamijima.ehime.jp":true,"kihoku.ehime.jp":true,"kumakogen.ehime.jp":true,"masaki.ehime.jp":true,"matsuno.ehime.jp":true,"matsuyama.ehime.jp":true,"namikata.ehime.jp":true,"niihama.ehime.jp":true,"ozu.ehime.jp":true,"saijo.ehime.jp":true,"seiyo.ehime.jp":true,"shikokuchuo.ehime.jp":true,"tobe.ehime.jp":true,"toon.ehime.jp":true,"uchiko.ehime.jp":true,"uwajima.ehime.jp":true,"yawatahama.ehime.jp":true,"echizen.fukui.jp":true,"eiheiji.fukui.jp":true,"fukui.fukui.jp":true,"ikeda.fukui.jp":true,"katsuyama.fukui.jp":true,"mihama.fukui.jp":true,"minamiechizen.fukui.jp":true,"obama.fukui.jp":true,"ohi.fukui.jp":true,"ono.fukui.jp":true,"sabae.fukui.jp":true,"sakai.fukui.jp":true,"takahama.fukui.jp":true,"tsuruga.fukui.jp":true,"wakasa.fukui.jp":true,"ashiya.fukuoka.jp":true,"buzen.fukuoka.jp":true,"chikugo.fukuoka.jp":true,"chikuho.fukuoka.jp":true,"chikujo.fukuoka.jp":true,"chikushino.fukuoka.jp":true,"chikuzen.fukuoka.jp":true,"chuo.fukuoka.jp":true,"dazaifu.fukuoka.jp":true,"fukuchi.fukuoka.jp":true,"hakata.fukuoka.jp":true,"higashi.fukuoka.jp":true,"hirokawa.fukuoka.jp":true,"hisayama.fukuoka.jp":true,"iizuka.fukuoka.jp":true,"inatsuki.fukuoka.jp":true,"kaho.fukuoka.jp":true,"kasuga.fukuoka.jp":true,"kasuya.fukuoka.jp":true,"kawara.fukuoka.jp":true,"keisen.fukuoka.jp":true,"koga.fukuoka.jp":true,"kurate.fukuoka.jp":true,"kurogi.fukuoka.jp":true,"kurume.fukuoka.jp":true,"minami.fukuoka.jp":true,"miyako.fukuoka.jp":true,"miyama.fukuoka.jp":true,"miyawaka.fukuoka.jp":true,"mizumaki.fukuoka.jp":true,"munakata.fukuoka.jp":true,"nakagawa.fukuoka.jp":true,"nakama.fukuoka.jp":true,"nishi.fukuoka.jp":true,"nogata.fukuoka.jp":true,"ogori.fukuoka.jp":true,"okagaki.fukuoka.jp":true,"okawa.fukuoka.jp":true,"oki.fukuoka.jp":true,"omuta.fukuoka.jp":true,"onga.fukuoka.jp":true,"onojo.fukuoka.jp":true,"oto.fukuoka.jp":true,"saigawa.fukuoka.jp":true,"sasaguri.fukuoka.jp":true,"shingu.fukuoka.jp":true,"shinyoshitomi.fukuoka.jp":true,"shonai.fukuoka.jp":true,"soeda.fukuoka.jp":true,"sue.fukuoka.jp":true,"tachiarai.fukuoka.jp":true,"tagawa.fukuoka.jp":true,"takata.fukuoka.jp":true,"toho.fukuoka.jp":true,"toyotsu.fukuoka.jp":true,"tsuiki.fukuoka.jp":true,"ukiha.fukuoka.jp":true,"umi.fukuoka.jp":true,"usui.fukuoka.jp":true,"yamada.fukuoka.jp":true,"yame.fukuoka.jp":true,"yanagawa.fukuoka.jp":true,"yukuhashi.fukuoka.jp":true,"aizubange.fukushima.jp":true,"aizumisato.fukushima.jp":true,"aizuwakamatsu.fukushima.jp":true,"asakawa.fukushima.jp":true,"bandai.fukushima.jp":true,"date.fukushima.jp":true,"fukushima.fukushima.jp":true,"furudono.fukushima.jp":true,"futaba.fukushima.jp":true,"hanawa.fukushima.jp":true,"higashi.fukushima.jp":true,"hirata.fukushima.jp":true,"hirono.fukushima.jp":true,"iitate.fukushima.jp":true,"inawashiro.fukushima.jp":true,"ishikawa.fukushima.jp":true,"iwaki.fukushima.jp":true,"izumizaki.fukushima.jp":true,"kagamiishi.fukushima.jp":true,"kaneyama.fukushima.jp":true,"kawamata.fukushima.jp":true,"kitakata.fukushima.jp":true,"kitashiobara.fukushima.jp":true,"koori.fukushima.jp":true,"koriyama.fukushima.jp":true,"kunimi.fukushima.jp":true,"miharu.fukushima.jp":true,"mishima.fukushima.jp":true,"namie.fukushima.jp":true,"nango.fukushima.jp":true,"nishiaizu.fukushima.jp":true,"nishigo.fukushima.jp":true,"okuma.fukushima.jp":true,"omotego.fukushima.jp":true,"ono.fukushima.jp":true,"otama.fukushima.jp":true,"samegawa.fukushima.jp":true,"shimogo.fukushima.jp":true,"shirakawa.fukushima.jp":true,"showa.fukushima.jp":true,"soma.fukushima.jp":true,"sukagawa.fukushima.jp":true,"taishin.fukushima.jp":true,"tamakawa.fukushima.jp":true,"tanagura.fukushima.jp":true,"tenei.fukushima.jp":true,"yabuki.fukushima.jp":true,"yamato.fukushima.jp":true,"yamatsuri.fukushima.jp":true,"yanaizu.fukushima.jp":true,"yugawa.fukushima.jp":true,"anpachi.gifu.jp":true,"ena.gifu.jp":true,"gifu.gifu.jp":true,"ginan.gifu.jp":true,"godo.gifu.jp":true,"gujo.gifu.jp":true,"hashima.gifu.jp":true,"hichiso.gifu.jp":true,"hida.gifu.jp":true,"higashishirakawa.gifu.jp":true,"ibigawa.gifu.jp":true,"ikeda.gifu.jp":true,"kakamigahara.gifu.jp":true,"kani.gifu.jp":true,"kasahara.gifu.jp":true,"kasamatsu.gifu.jp":true,"kawaue.gifu.jp":true,"kitagata.gifu.jp":true,"mino.gifu.jp":true,"minokamo.gifu.jp":true,"mitake.gifu.jp":true,"mizunami.gifu.jp":true,"motosu.gifu.jp":true,"nakatsugawa.gifu.jp":true,"ogaki.gifu.jp":true,"sakahogi.gifu.jp":true,"seki.gifu.jp":true,"sekigahara.gifu.jp":true,"shirakawa.gifu.jp":true,"tajimi.gifu.jp":true,"takayama.gifu.jp":true,"tarui.gifu.jp":true,"toki.gifu.jp":true,"tomika.gifu.jp":true,"wanouchi.gifu.jp":true,"yamagata.gifu.jp":true,"yaotsu.gifu.jp":true,"yoro.gifu.jp":true,"annaka.gunma.jp":true,"chiyoda.gunma.jp":true,"fujioka.gunma.jp":true,"higashiagatsuma.gunma.jp":true,"isesaki.gunma.jp":true,"itakura.gunma.jp":true,"kanna.gunma.jp":true,"kanra.gunma.jp":true,"katashina.gunma.jp":true,"kawaba.gunma.jp":true,"kiryu.gunma.jp":true,"kusatsu.gunma.jp":true,"maebashi.gunma.jp":true,"meiwa.gunma.jp":true,"midori.gunma.jp":true,"minakami.gunma.jp":true,"naganohara.gunma.jp":true,"nakanojo.gunma.jp":true,"nanmoku.gunma.jp":true,"numata.gunma.jp":true,"oizumi.gunma.jp":true,"ora.gunma.jp":true,"ota.gunma.jp":true,"shibukawa.gunma.jp":true,"shimonita.gunma.jp":true,"shinto.gunma.jp":true,"showa.gunma.jp":true,"takasaki.gunma.jp":true,"takayama.gunma.jp":true,"tamamura.gunma.jp":true,"tatebayashi.gunma.jp":true,"tomioka.gunma.jp":true,"tsukiyono.gunma.jp":true,"tsumagoi.gunma.jp":true,"ueno.gunma.jp":true,"yoshioka.gunma.jp":true,"asaminami.hiroshima.jp":true,"daiwa.hiroshima.jp":true,"etajima.hiroshima.jp":true,"fuchu.hiroshima.jp":true,"fukuyama.hiroshima.jp":true,"hatsukaichi.hiroshima.jp":true,"higashihiroshima.hiroshima.jp":true,"hongo.hiroshima.jp":true,"jinsekikogen.hiroshima.jp":true,"kaita.hiroshima.jp":true,"kui.hiroshima.jp":true,"kumano.hiroshima.jp":true,"kure.hiroshima.jp":true,"mihara.hiroshima.jp":true,"miyoshi.hiroshima.jp":true,"naka.hiroshima.jp":true,"onomichi.hiroshima.jp":true,"osakikamijima.hiroshima.jp":true,"otake.hiroshima.jp":true,"saka.hiroshima.jp":true,"sera.hiroshima.jp":true,"seranishi.hiroshima.jp":true,"shinichi.hiroshima.jp":true,"shobara.hiroshima.jp":true,"takehara.hiroshima.jp":true,"abashiri.hokkaido.jp":true,"abira.hokkaido.jp":true,"aibetsu.hokkaido.jp":true,"akabira.hokkaido.jp":true,"akkeshi.hokkaido.jp":true,"asahikawa.hokkaido.jp":true,"ashibetsu.hokkaido.jp":true,"ashoro.hokkaido.jp":true,"assabu.hokkaido.jp":true,"atsuma.hokkaido.jp":true,"bibai.hokkaido.jp":true,"biei.hokkaido.jp":true,"bifuka.hokkaido.jp":true,"bihoro.hokkaido.jp":true,"biratori.hokkaido.jp":true,"chippubetsu.hokkaido.jp":true,"chitose.hokkaido.jp":true,"date.hokkaido.jp":true,"ebetsu.hokkaido.jp":true,"embetsu.hokkaido.jp":true,"eniwa.hokkaido.jp":true,"erimo.hokkaido.jp":true,"esan.hokkaido.jp":true,"esashi.hokkaido.jp":true,"fukagawa.hokkaido.jp":true,"fukushima.hokkaido.jp":true,"furano.hokkaido.jp":true,"furubira.hokkaido.jp":true,"haboro.hokkaido.jp":true,"hakodate.hokkaido.jp":true,"hamatonbetsu.hokkaido.jp":true,"hidaka.hokkaido.jp":true,"higashikagura.hokkaido.jp":true,"higashikawa.hokkaido.jp":true,"hiroo.hokkaido.jp":true,"hokuryu.hokkaido.jp":true,"hokuto.hokkaido.jp":true,"honbetsu.hokkaido.jp":true,"horokanai.hokkaido.jp":true,"horonobe.hokkaido.jp":true,"ikeda.hokkaido.jp":true,"imakane.hokkaido.jp":true,"ishikari.hokkaido.jp":true,"iwamizawa.hokkaido.jp":true,"iwanai.hokkaido.jp":true,"kamifurano.hokkaido.jp":true,"kamikawa.hokkaido.jp":true,"kamishihoro.hokkaido.jp":true,"kamisunagawa.hokkaido.jp":true,"kamoenai.hokkaido.jp":true,"kayabe.hokkaido.jp":true,"kembuchi.hokkaido.jp":true,"kikonai.hokkaido.jp":true,"kimobetsu.hokkaido.jp":true,"kitahiroshima.hokkaido.jp":true,"kitami.hokkaido.jp":true,"kiyosato.hokkaido.jp":true,"koshimizu.hokkaido.jp":true,"kunneppu.hokkaido.jp":true,"kuriyama.hokkaido.jp":true,"kuromatsunai.hokkaido.jp":true,"kushiro.hokkaido.jp":true,"kutchan.hokkaido.jp":true,"kyowa.hokkaido.jp":true,"mashike.hokkaido.jp":true,"matsumae.hokkaido.jp":true,"mikasa.hokkaido.jp":true,"minamifurano.hokkaido.jp":true,"mombetsu.hokkaido.jp":true,"moseushi.hokkaido.jp":true,"mukawa.hokkaido.jp":true,"muroran.hokkaido.jp":true,"naie.hokkaido.jp":true,"nakagawa.hokkaido.jp":true,"nakasatsunai.hokkaido.jp":true,"nakatombetsu.hokkaido.jp":true,"nanae.hokkaido.jp":true,"nanporo.hokkaido.jp":true,"nayoro.hokkaido.jp":true,"nemuro.hokkaido.jp":true,"niikappu.hokkaido.jp":true,"niki.hokkaido.jp":true,"nishiokoppe.hokkaido.jp":true,"noboribetsu.hokkaido.jp":true,"numata.hokkaido.jp":true,"obihiro.hokkaido.jp":true,"obira.hokkaido.jp":true,"oketo.hokkaido.jp":true,"okoppe.hokkaido.jp":true,"otaru.hokkaido.jp":true,"otobe.hokkaido.jp":true,"otofuke.hokkaido.jp":true,"otoineppu.hokkaido.jp":true,"oumu.hokkaido.jp":true,"ozora.hokkaido.jp":true,"pippu.hokkaido.jp":true,"rankoshi.hokkaido.jp":true,"rebun.hokkaido.jp":true,"rikubetsu.hokkaido.jp":true,"rishiri.hokkaido.jp":true,"rishirifuji.hokkaido.jp":true,"saroma.hokkaido.jp":true,"sarufutsu.hokkaido.jp":true,"shakotan.hokkaido.jp":true,"shari.hokkaido.jp":true,"shibecha.hokkaido.jp":true,"shibetsu.hokkaido.jp":true,"shikabe.hokkaido.jp":true,"shikaoi.hokkaido.jp":true,"shimamaki.hokkaido.jp":true,"shimizu.hokkaido.jp":true,"shimokawa.hokkaido.jp":true,"shinshinotsu.hokkaido.jp":true,"shintoku.hokkaido.jp":true,"shiranuka.hokkaido.jp":true,"shiraoi.hokkaido.jp":true,"shiriuchi.hokkaido.jp":true,"sobetsu.hokkaido.jp":true,"sunagawa.hokkaido.jp":true,"taiki.hokkaido.jp":true,"takasu.hokkaido.jp":true,"takikawa.hokkaido.jp":true,"takinoue.hokkaido.jp":true,"teshikaga.hokkaido.jp":true,"tobetsu.hokkaido.jp":true,"tohma.hokkaido.jp":true,"tomakomai.hokkaido.jp":true,"tomari.hokkaido.jp":true,"toya.hokkaido.jp":true,"toyako.hokkaido.jp":true,"toyotomi.hokkaido.jp":true,"toyoura.hokkaido.jp":true,"tsubetsu.hokkaido.jp":true,"tsukigata.hokkaido.jp":true,"urakawa.hokkaido.jp":true,"urausu.hokkaido.jp":true,"uryu.hokkaido.jp":true,"utashinai.hokkaido.jp":true,"wakkanai.hokkaido.jp":true,"wassamu.hokkaido.jp":true,"yakumo.hokkaido.jp":true,"yoichi.hokkaido.jp":true,"aioi.hyogo.jp":true,"akashi.hyogo.jp":true,"ako.hyogo.jp":true,"amagasaki.hyogo.jp":true,"aogaki.hyogo.jp":true,"asago.hyogo.jp":true,"ashiya.hyogo.jp":true,"awaji.hyogo.jp":true,"fukusaki.hyogo.jp":true,"goshiki.hyogo.jp":true,"harima.hyogo.jp":true,"himeji.hyogo.jp":true,"ichikawa.hyogo.jp":true,"inagawa.hyogo.jp":true,"itami.hyogo.jp":true,"kakogawa.hyogo.jp":true,"kamigori.hyogo.jp":true,"kamikawa.hyogo.jp":true,"kasai.hyogo.jp":true,"kasuga.hyogo.jp":true,"kawanishi.hyogo.jp":true,"miki.hyogo.jp":true,"minamiawaji.hyogo.jp":true,"nishinomiya.hyogo.jp":true,"nishiwaki.hyogo.jp":true,"ono.hyogo.jp":true,"sanda.hyogo.jp":true,"sannan.hyogo.jp":true,"sasayama.hyogo.jp":true,"sayo.hyogo.jp":true,"shingu.hyogo.jp":true,"shinonsen.hyogo.jp":true,"shiso.hyogo.jp":true,"sumoto.hyogo.jp":true,"taishi.hyogo.jp":true,"taka.hyogo.jp":true,"takarazuka.hyogo.jp":true,"takasago.hyogo.jp":true,"takino.hyogo.jp":true,"tamba.hyogo.jp":true,"tatsuno.hyogo.jp":true,"toyooka.hyogo.jp":true,"yabu.hyogo.jp":true,"yashiro.hyogo.jp":true,"yoka.hyogo.jp":true,"yokawa.hyogo.jp":true,"ami.ibaraki.jp":true,"asahi.ibaraki.jp":true,"bando.ibaraki.jp":true,"chikusei.ibaraki.jp":true,"daigo.ibaraki.jp":true,"fujishiro.ibaraki.jp":true,"hitachi.ibaraki.jp":true,"hitachinaka.ibaraki.jp":true,"hitachiomiya.ibaraki.jp":true,"hitachiota.ibaraki.jp":true,"ibaraki.ibaraki.jp":true,"ina.ibaraki.jp":true,"inashiki.ibaraki.jp":true,"itako.ibaraki.jp":true,"iwama.ibaraki.jp":true,"joso.ibaraki.jp":true,"kamisu.ibaraki.jp":true,"kasama.ibaraki.jp":true,"kashima.ibaraki.jp":true,"kasumigaura.ibaraki.jp":true,"koga.ibaraki.jp":true,"miho.ibaraki.jp":true,"mito.ibaraki.jp":true,"moriya.ibaraki.jp":true,"naka.ibaraki.jp":true,"namegata.ibaraki.jp":true,"oarai.ibaraki.jp":true,"ogawa.ibaraki.jp":true,"omitama.ibaraki.jp":true,"ryugasaki.ibaraki.jp":true,"sakai.ibaraki.jp":true,"sakuragawa.ibaraki.jp":true,"shimodate.ibaraki.jp":true,"shimotsuma.ibaraki.jp":true,"shirosato.ibaraki.jp":true,"sowa.ibaraki.jp":true,"suifu.ibaraki.jp":true,"takahagi.ibaraki.jp":true,"tamatsukuri.ibaraki.jp":true,"tokai.ibaraki.jp":true,"tomobe.ibaraki.jp":true,"tone.ibaraki.jp":true,"toride.ibaraki.jp":true,"tsuchiura.ibaraki.jp":true,"tsukuba.ibaraki.jp":true,"uchihara.ibaraki.jp":true,"ushiku.ibaraki.jp":true,"yachiyo.ibaraki.jp":true,"yamagata.ibaraki.jp":true,"yawara.ibaraki.jp":true,"yuki.ibaraki.jp":true,"anamizu.ishikawa.jp":true,"hakui.ishikawa.jp":true,"hakusan.ishikawa.jp":true,"kaga.ishikawa.jp":true,"kahoku.ishikawa.jp":true,"kanazawa.ishikawa.jp":true,"kawakita.ishikawa.jp":true,"komatsu.ishikawa.jp":true,"nakanoto.ishikawa.jp":true,"nanao.ishikawa.jp":true,"nomi.ishikawa.jp":true,"nonoichi.ishikawa.jp":true,"noto.ishikawa.jp":true,"shika.ishikawa.jp":true,"suzu.ishikawa.jp":true,"tsubata.ishikawa.jp":true,"tsurugi.ishikawa.jp":true,"uchinada.ishikawa.jp":true,"wajima.ishikawa.jp":true,"fudai.iwate.jp":true,"fujisawa.iwate.jp":true,"hanamaki.iwate.jp":true,"hiraizumi.iwate.jp":true,"hirono.iwate.jp":true,"ichinohe.iwate.jp":true,"ichinoseki.iwate.jp":true,"iwaizumi.iwate.jp":true,"iwate.iwate.jp":true,"joboji.iwate.jp":true,"kamaishi.iwate.jp":true,"kanegasaki.iwate.jp":true,"karumai.iwate.jp":true,"kawai.iwate.jp":true,"kitakami.iwate.jp":true,"kuji.iwate.jp":true,"kunohe.iwate.jp":true,"kuzumaki.iwate.jp":true,"miyako.iwate.jp":true,"mizusawa.iwate.jp":true,"morioka.iwate.jp":true,"ninohe.iwate.jp":true,"noda.iwate.jp":true,"ofunato.iwate.jp":true,"oshu.iwate.jp":true,"otsuchi.iwate.jp":true,"rikuzentakata.iwate.jp":true,"shiwa.iwate.jp":true,"shizukuishi.iwate.jp":true,"sumita.iwate.jp":true,"tanohata.iwate.jp":true,"tono.iwate.jp":true,"yahaba.iwate.jp":true,"yamada.iwate.jp":true,"ayagawa.kagawa.jp":true,"higashikagawa.kagawa.jp":true,"kanonji.kagawa.jp":true,"kotohira.kagawa.jp":true,"manno.kagawa.jp":true,"marugame.kagawa.jp":true,"mitoyo.kagawa.jp":true,"naoshima.kagawa.jp":true,"sanuki.kagawa.jp":true,"tadotsu.kagawa.jp":true,"takamatsu.kagawa.jp":true,"tonosho.kagawa.jp":true,"uchinomi.kagawa.jp":true,"utazu.kagawa.jp":true,"zentsuji.kagawa.jp":true,"akune.kagoshima.jp":true,"amami.kagoshima.jp":true,"hioki.kagoshima.jp":true,"isa.kagoshima.jp":true,"isen.kagoshima.jp":true,"izumi.kagoshima.jp":true,"kagoshima.kagoshima.jp":true,"kanoya.kagoshima.jp":true,"kawanabe.kagoshima.jp":true,"kinko.kagoshima.jp":true,"kouyama.kagoshima.jp":true,"makurazaki.kagoshima.jp":true,"matsumoto.kagoshima.jp":true,"minamitane.kagoshima.jp":true,"nakatane.kagoshima.jp":true,"nishinoomote.kagoshima.jp":true,"satsumasendai.kagoshima.jp":true,"soo.kagoshima.jp":true,"tarumizu.kagoshima.jp":true,"yusui.kagoshima.jp":true,"aikawa.kanagawa.jp":true,"atsugi.kanagawa.jp":true,"ayase.kanagawa.jp":true,"chigasaki.kanagawa.jp":true,"ebina.kanagawa.jp":true,"fujisawa.kanagawa.jp":true,"hadano.kanagawa.jp":true,"hakone.kanagawa.jp":true,"hiratsuka.kanagawa.jp":true,"isehara.kanagawa.jp":true,"kaisei.kanagawa.jp":true,"kamakura.kanagawa.jp":true,"kiyokawa.kanagawa.jp":true,"matsuda.kanagawa.jp":true,"minamiashigara.kanagawa.jp":true,"miura.kanagawa.jp":true,"nakai.kanagawa.jp":true,"ninomiya.kanagawa.jp":true,"odawara.kanagawa.jp":true,"oi.kanagawa.jp":true,"oiso.kanagawa.jp":true,"sagamihara.kanagawa.jp":true,"samukawa.kanagawa.jp":true,"tsukui.kanagawa.jp":true,"yamakita.kanagawa.jp":true,"yamato.kanagawa.jp":true,"yokosuka.kanagawa.jp":true,"yugawara.kanagawa.jp":true,"zama.kanagawa.jp":true,"zushi.kanagawa.jp":true,"aki.kochi.jp":true,"geisei.kochi.jp":true,"hidaka.kochi.jp":true,"higashitsuno.kochi.jp":true,"ino.kochi.jp":true,"kagami.kochi.jp":true,"kami.kochi.jp":true,"kitagawa.kochi.jp":true,"kochi.kochi.jp":true,"mihara.kochi.jp":true,"motoyama.kochi.jp":true,"muroto.kochi.jp":true,"nahari.kochi.jp":true,"nakamura.kochi.jp":true,"nankoku.kochi.jp":true,"nishitosa.kochi.jp":true,"niyodogawa.kochi.jp":true,"ochi.kochi.jp":true,"okawa.kochi.jp":true,"otoyo.kochi.jp":true,"otsuki.kochi.jp":true,"sakawa.kochi.jp":true,"sukumo.kochi.jp":true,"susaki.kochi.jp":true,"tosa.kochi.jp":true,"tosashimizu.kochi.jp":true,"toyo.kochi.jp":true,"tsuno.kochi.jp":true,"umaji.kochi.jp":true,"yasuda.kochi.jp":true,"yusuhara.kochi.jp":true,"amakusa.kumamoto.jp":true,"arao.kumamoto.jp":true,"aso.kumamoto.jp":true,"choyo.kumamoto.jp":true,"gyokuto.kumamoto.jp":true,"hitoyoshi.kumamoto.jp":true,"kamiamakusa.kumamoto.jp":true,"kashima.kumamoto.jp":true,"kikuchi.kumamoto.jp":true,"kosa.kumamoto.jp":true,"kumamoto.kumamoto.jp":true,"mashiki.kumamoto.jp":true,"mifune.kumamoto.jp":true,"minamata.kumamoto.jp":true,"minamioguni.kumamoto.jp":true,"nagasu.kumamoto.jp":true,"nishihara.kumamoto.jp":true,"oguni.kumamoto.jp":true,"ozu.kumamoto.jp":true,"sumoto.kumamoto.jp":true,"takamori.kumamoto.jp":true,"uki.kumamoto.jp":true,"uto.kumamoto.jp":true,"yamaga.kumamoto.jp":true,"yamato.kumamoto.jp":true,"yatsushiro.kumamoto.jp":true,"ayabe.kyoto.jp":true,"fukuchiyama.kyoto.jp":true,"higashiyama.kyoto.jp":true,"ide.kyoto.jp":true,"ine.kyoto.jp":true,"joyo.kyoto.jp":true,"kameoka.kyoto.jp":true,"kamo.kyoto.jp":true,"kita.kyoto.jp":true,"kizu.kyoto.jp":true,"kumiyama.kyoto.jp":true,"kyotamba.kyoto.jp":true,"kyotanabe.kyoto.jp":true,"kyotango.kyoto.jp":true,"maizuru.kyoto.jp":true,"minami.kyoto.jp":true,"minamiyamashiro.kyoto.jp":true,"miyazu.kyoto.jp":true,"muko.kyoto.jp":true,"nagaokakyo.kyoto.jp":true,"nakagyo.kyoto.jp":true,"nantan.kyoto.jp":true,"oyamazaki.kyoto.jp":true,"sakyo.kyoto.jp":true,"seika.kyoto.jp":true,"tanabe.kyoto.jp":true,"uji.kyoto.jp":true,"ujitawara.kyoto.jp":true,"wazuka.kyoto.jp":true,"yamashina.kyoto.jp":true,"yawata.kyoto.jp":true,"asahi.mie.jp":true,"inabe.mie.jp":true,"ise.mie.jp":true,"kameyama.mie.jp":true,"kawagoe.mie.jp":true,"kiho.mie.jp":true,"kisosaki.mie.jp":true,"kiwa.mie.jp":true,"komono.mie.jp":true,"kumano.mie.jp":true,"kuwana.mie.jp":true,"matsusaka.mie.jp":true,"meiwa.mie.jp":true,"mihama.mie.jp":true,"minamiise.mie.jp":true,"misugi.mie.jp":true,"miyama.mie.jp":true,"nabari.mie.jp":true,"shima.mie.jp":true,"suzuka.mie.jp":true,"tado.mie.jp":true,"taiki.mie.jp":true,"taki.mie.jp":true,"tamaki.mie.jp":true,"toba.mie.jp":true,"tsu.mie.jp":true,"udono.mie.jp":true,"ureshino.mie.jp":true,"watarai.mie.jp":true,"yokkaichi.mie.jp":true,"furukawa.miyagi.jp":true,"higashimatsushima.miyagi.jp":true,"ishinomaki.miyagi.jp":true,"iwanuma.miyagi.jp":true,"kakuda.miyagi.jp":true,"kami.miyagi.jp":true,"kawasaki.miyagi.jp":true,"kesennuma.miyagi.jp":true,"marumori.miyagi.jp":true,"matsushima.miyagi.jp":true,"minamisanriku.miyagi.jp":true,"misato.miyagi.jp":true,"murata.miyagi.jp":true,"natori.miyagi.jp":true,"ogawara.miyagi.jp":true,"ohira.miyagi.jp":true,"onagawa.miyagi.jp":true,"osaki.miyagi.jp":true,"rifu.miyagi.jp":true,"semine.miyagi.jp":true,"shibata.miyagi.jp":true,"shichikashuku.miyagi.jp":true,"shikama.miyagi.jp":true,"shiogama.miyagi.jp":true,"shiroishi.miyagi.jp":true,"tagajo.miyagi.jp":true,"taiwa.miyagi.jp":true,"tome.miyagi.jp":true,"tomiya.miyagi.jp":true,"wakuya.miyagi.jp":true,"watari.miyagi.jp":true,"yamamoto.miyagi.jp":true,"zao.miyagi.jp":true,"aya.miyazaki.jp":true,"ebino.miyazaki.jp":true,"gokase.miyazaki.jp":true,"hyuga.miyazaki.jp":true,"kadogawa.miyazaki.jp":true,"kawaminami.miyazaki.jp":true,"kijo.miyazaki.jp":true,"kitagawa.miyazaki.jp":true,"kitakata.miyazaki.jp":true,"kitaura.miyazaki.jp":true,"kobayashi.miyazaki.jp":true,"kunitomi.miyazaki.jp":true,"kushima.miyazaki.jp":true,"mimata.miyazaki.jp":true,"miyakonojo.miyazaki.jp":true,"miyazaki.miyazaki.jp":true,"morotsuka.miyazaki.jp":true,"nichinan.miyazaki.jp":true,"nishimera.miyazaki.jp":true,"nobeoka.miyazaki.jp":true,"saito.miyazaki.jp":true,"shiiba.miyazaki.jp":true,"shintomi.miyazaki.jp":true,"takaharu.miyazaki.jp":true,"takanabe.miyazaki.jp":true,"takazaki.miyazaki.jp":true,"tsuno.miyazaki.jp":true,"achi.nagano.jp":true,"agematsu.nagano.jp":true,"anan.nagano.jp":true,"aoki.nagano.jp":true,"asahi.nagano.jp":true,"azumino.nagano.jp":true,"chikuhoku.nagano.jp":true,"chikuma.nagano.jp":true,"chino.nagano.jp":true,"fujimi.nagano.jp":true,"hakuba.nagano.jp":true,"hara.nagano.jp":true,"hiraya.nagano.jp":true,"iida.nagano.jp":true,"iijima.nagano.jp":true,"iiyama.nagano.jp":true,"iizuna.nagano.jp":true,"ikeda.nagano.jp":true,"ikusaka.nagano.jp":true,"ina.nagano.jp":true,"karuizawa.nagano.jp":true,"kawakami.nagano.jp":true,"kiso.nagano.jp":true,"kisofukushima.nagano.jp":true,"kitaaiki.nagano.jp":true,"komagane.nagano.jp":true,"komoro.nagano.jp":true,"matsukawa.nagano.jp":true,"matsumoto.nagano.jp":true,"miasa.nagano.jp":true,"minamiaiki.nagano.jp":true,"minamimaki.nagano.jp":true,"minamiminowa.nagano.jp":true,"minowa.nagano.jp":true,"miyada.nagano.jp":true,"miyota.nagano.jp":true,"mochizuki.nagano.jp":true,"nagano.nagano.jp":true,"nagawa.nagano.jp":true,"nagiso.nagano.jp":true,"nakagawa.nagano.jp":true,"nakano.nagano.jp":true,"nozawaonsen.nagano.jp":true,"obuse.nagano.jp":true,"ogawa.nagano.jp":true,"okaya.nagano.jp":true,"omachi.nagano.jp":true,"omi.nagano.jp":true,"ookuwa.nagano.jp":true,"ooshika.nagano.jp":true,"otaki.nagano.jp":true,"otari.nagano.jp":true,"sakae.nagano.jp":true,"sakaki.nagano.jp":true,"saku.nagano.jp":true,"sakuho.nagano.jp":true,"shimosuwa.nagano.jp":true,"shinanomachi.nagano.jp":true,"shiojiri.nagano.jp":true,"suwa.nagano.jp":true,"suzaka.nagano.jp":true,"takagi.nagano.jp":true,"takamori.nagano.jp":true,"takayama.nagano.jp":true,"tateshina.nagano.jp":true,"tatsuno.nagano.jp":true,"togakushi.nagano.jp":true,"togura.nagano.jp":true,"tomi.nagano.jp":true,"ueda.nagano.jp":true,"wada.nagano.jp":true,"yamagata.nagano.jp":true,"yamanouchi.nagano.jp":true,"yasaka.nagano.jp":true,"yasuoka.nagano.jp":true,"chijiwa.nagasaki.jp":true,"futsu.nagasaki.jp":true,"goto.nagasaki.jp":true,"hasami.nagasaki.jp":true,"hirado.nagasaki.jp":true,"iki.nagasaki.jp":true,"isahaya.nagasaki.jp":true,"kawatana.nagasaki.jp":true,"kuchinotsu.nagasaki.jp":true,"matsuura.nagasaki.jp":true,"nagasaki.nagasaki.jp":true,"obama.nagasaki.jp":true,"omura.nagasaki.jp":true,"oseto.nagasaki.jp":true,"saikai.nagasaki.jp":true,"sasebo.nagasaki.jp":true,"seihi.nagasaki.jp":true,"shimabara.nagasaki.jp":true,"shinkamigoto.nagasaki.jp":true,"togitsu.nagasaki.jp":true,"tsushima.nagasaki.jp":true,"unzen.nagasaki.jp":true,"ando.nara.jp":true,"gose.nara.jp":true,"heguri.nara.jp":true,"higashiyoshino.nara.jp":true,"ikaruga.nara.jp":true,"ikoma.nara.jp":true,"kamikitayama.nara.jp":true,"kanmaki.nara.jp":true,"kashiba.nara.jp":true,"kashihara.nara.jp":true,"katsuragi.nara.jp":true,"kawai.nara.jp":true,"kawakami.nara.jp":true,"kawanishi.nara.jp":true,"koryo.nara.jp":true,"kurotaki.nara.jp":true,"mitsue.nara.jp":true,"miyake.nara.jp":true,"nara.nara.jp":true,"nosegawa.nara.jp":true,"oji.nara.jp":true,"ouda.nara.jp":true,"oyodo.nara.jp":true,"sakurai.nara.jp":true,"sango.nara.jp":true,"shimoichi.nara.jp":true,"shimokitayama.nara.jp":true,"shinjo.nara.jp":true,"soni.nara.jp":true,"takatori.nara.jp":true,"tawaramoto.nara.jp":true,"tenkawa.nara.jp":true,"tenri.nara.jp":true,"uda.nara.jp":true,"yamatokoriyama.nara.jp":true,"yamatotakada.nara.jp":true,"yamazoe.nara.jp":true,"yoshino.nara.jp":true,"aga.niigata.jp":true,"agano.niigata.jp":true,"gosen.niigata.jp":true,"itoigawa.niigata.jp":true,"izumozaki.niigata.jp":true,"joetsu.niigata.jp":true,"kamo.niigata.jp":true,"kariwa.niigata.jp":true,"kashiwazaki.niigata.jp":true,"minamiuonuma.niigata.jp":true,"mitsuke.niigata.jp":true,"muika.niigata.jp":true,"murakami.niigata.jp":true,"myoko.niigata.jp":true,"nagaoka.niigata.jp":true,"niigata.niigata.jp":true,"ojiya.niigata.jp":true,"omi.niigata.jp":true,"sado.niigata.jp":true,"sanjo.niigata.jp":true,"seiro.niigata.jp":true,"seirou.niigata.jp":true,"sekikawa.niigata.jp":true,"shibata.niigata.jp":true,"tagami.niigata.jp":true,"tainai.niigata.jp":true,"tochio.niigata.jp":true,"tokamachi.niigata.jp":true,"tsubame.niigata.jp":true,"tsunan.niigata.jp":true,"uonuma.niigata.jp":true,"yahiko.niigata.jp":true,"yoita.niigata.jp":true,"yuzawa.niigata.jp":true,"beppu.oita.jp":true,"bungoono.oita.jp":true,"bungotakada.oita.jp":true,"hasama.oita.jp":true,"hiji.oita.jp":true,"himeshima.oita.jp":true,"hita.oita.jp":true,"kamitsue.oita.jp":true,"kokonoe.oita.jp":true,"kuju.oita.jp":true,"kunisaki.oita.jp":true,"kusu.oita.jp":true,"oita.oita.jp":true,"saiki.oita.jp":true,"taketa.oita.jp":true,"tsukumi.oita.jp":true,"usa.oita.jp":true,"usuki.oita.jp":true,"yufu.oita.jp":true,"akaiwa.okayama.jp":true,"asakuchi.okayama.jp":true,"bizen.okayama.jp":true,"hayashima.okayama.jp":true,"ibara.okayama.jp":true,"kagamino.okayama.jp":true,"kasaoka.okayama.jp":true,"kibichuo.okayama.jp":true,"kumenan.okayama.jp":true,"kurashiki.okayama.jp":true,"maniwa.okayama.jp":true,"misaki.okayama.jp":true,"nagi.okayama.jp":true,"niimi.okayama.jp":true,"nishiawakura.okayama.jp":true,"okayama.okayama.jp":true,"satosho.okayama.jp":true,"setouchi.okayama.jp":true,"shinjo.okayama.jp":true,"shoo.okayama.jp":true,"soja.okayama.jp":true,"takahashi.okayama.jp":true,"tamano.okayama.jp":true,"tsuyama.okayama.jp":true,"wake.okayama.jp":true,"yakage.okayama.jp":true,"aguni.okinawa.jp":true,"ginowan.okinawa.jp":true,"ginoza.okinawa.jp":true,"gushikami.okinawa.jp":true,"haebaru.okinawa.jp":true,"higashi.okinawa.jp":true,"hirara.okinawa.jp":true,"iheya.okinawa.jp":true,"ishigaki.okinawa.jp":true,"ishikawa.okinawa.jp":true,"itoman.okinawa.jp":true,"izena.okinawa.jp":true,"kadena.okinawa.jp":true,"kin.okinawa.jp":true,"kitadaito.okinawa.jp":true,"kitanakagusuku.okinawa.jp":true,"kumejima.okinawa.jp":true,"kunigami.okinawa.jp":true,"minamidaito.okinawa.jp":true,"motobu.okinawa.jp":true,"nago.okinawa.jp":true,"naha.okinawa.jp":true,"nakagusuku.okinawa.jp":true,"nakijin.okinawa.jp":true,"nanjo.okinawa.jp":true,"nishihara.okinawa.jp":true,"ogimi.okinawa.jp":true,"okinawa.okinawa.jp":true,"onna.okinawa.jp":true,"shimoji.okinawa.jp":true,"taketomi.okinawa.jp":true,"tarama.okinawa.jp":true,"tokashiki.okinawa.jp":true,"tomigusuku.okinawa.jp":true,"tonaki.okinawa.jp":true,"urasoe.okinawa.jp":true,"uruma.okinawa.jp":true,"yaese.okinawa.jp":true,"yomitan.okinawa.jp":true,"yonabaru.okinawa.jp":true,"yonaguni.okinawa.jp":true,"zamami.okinawa.jp":true,"abeno.osaka.jp":true,"chihayaakasaka.osaka.jp":true,"chuo.osaka.jp":true,"daito.osaka.jp":true,"fujiidera.osaka.jp":true,"habikino.osaka.jp":true,"hannan.osaka.jp":true,"higashiosaka.osaka.jp":true,"higashisumiyoshi.osaka.jp":true,"higashiyodogawa.osaka.jp":true,"hirakata.osaka.jp":true,"ibaraki.osaka.jp":true,"ikeda.osaka.jp":true,"izumi.osaka.jp":true,"izumiotsu.osaka.jp":true,"izumisano.osaka.jp":true,"kadoma.osaka.jp":true,"kaizuka.osaka.jp":true,"kanan.osaka.jp":true,"kashiwara.osaka.jp":true,"katano.osaka.jp":true,"kawachinagano.osaka.jp":true,"kishiwada.osaka.jp":true,"kita.osaka.jp":true,"kumatori.osaka.jp":true,"matsubara.osaka.jp":true,"minato.osaka.jp":true,"minoh.osaka.jp":true,"misaki.osaka.jp":true,"moriguchi.osaka.jp":true,"neyagawa.osaka.jp":true,"nishi.osaka.jp":true,"nose.osaka.jp":true,"osakasayama.osaka.jp":true,"sakai.osaka.jp":true,"sayama.osaka.jp":true,"sennan.osaka.jp":true,"settsu.osaka.jp":true,"shijonawate.osaka.jp":true,"shimamoto.osaka.jp":true,"suita.osaka.jp":true,"tadaoka.osaka.jp":true,"taishi.osaka.jp":true,"tajiri.osaka.jp":true,"takaishi.osaka.jp":true,"takatsuki.osaka.jp":true,"tondabayashi.osaka.jp":true,"toyonaka.osaka.jp":true,"toyono.osaka.jp":true,"yao.osaka.jp":true,"ariake.saga.jp":true,"arita.saga.jp":true,"fukudomi.saga.jp":true,"genkai.saga.jp":true,"hamatama.saga.jp":true,"hizen.saga.jp":true,"imari.saga.jp":true,"kamimine.saga.jp":true,"kanzaki.saga.jp":true,"karatsu.saga.jp":true,"kashima.saga.jp":true,"kitagata.saga.jp":true,"kitahata.saga.jp":true,"kiyama.saga.jp":true,"kouhoku.saga.jp":true,"kyuragi.saga.jp":true,"nishiarita.saga.jp":true,"ogi.saga.jp":true,"omachi.saga.jp":true,"ouchi.saga.jp":true,"saga.saga.jp":true,"shiroishi.saga.jp":true,"taku.saga.jp":true,"tara.saga.jp":true,"tosu.saga.jp":true,"yoshinogari.saga.jp":true,"arakawa.saitama.jp":true,"asaka.saitama.jp":true,"chichibu.saitama.jp":true,"fujimi.saitama.jp":true,"fujimino.saitama.jp":true,"fukaya.saitama.jp":true,"hanno.saitama.jp":true,"hanyu.saitama.jp":true,"hasuda.saitama.jp":true,"hatogaya.saitama.jp":true,"hatoyama.saitama.jp":true,"hidaka.saitama.jp":true,"higashichichibu.saitama.jp":true,"higashimatsuyama.saitama.jp":true,"honjo.saitama.jp":true,"ina.saitama.jp":true,"iruma.saitama.jp":true,"iwatsuki.saitama.jp":true,"kamiizumi.saitama.jp":true,"kamikawa.saitama.jp":true,"kamisato.saitama.jp":true,"kasukabe.saitama.jp":true,"kawagoe.saitama.jp":true,"kawaguchi.saitama.jp":true,"kawajima.saitama.jp":true,"kazo.saitama.jp":true,"kitamoto.saitama.jp":true,"koshigaya.saitama.jp":true,"kounosu.saitama.jp":true,"kuki.saitama.jp":true,"kumagaya.saitama.jp":true,"matsubushi.saitama.jp":true,"minano.saitama.jp":true,"misato.saitama.jp":true,"miyashiro.saitama.jp":true,"miyoshi.saitama.jp":true,"moroyama.saitama.jp":true,"nagatoro.saitama.jp":true,"namegawa.saitama.jp":true,"niiza.saitama.jp":true,"ogano.saitama.jp":true,"ogawa.saitama.jp":true,"ogose.saitama.jp":true,"okegawa.saitama.jp":true,"omiya.saitama.jp":true,"otaki.saitama.jp":true,"ranzan.saitama.jp":true,"ryokami.saitama.jp":true,"saitama.saitama.jp":true,"sakado.saitama.jp":true,"satte.saitama.jp":true,"sayama.saitama.jp":true,"shiki.saitama.jp":true,"shiraoka.saitama.jp":true,"soka.saitama.jp":true,"sugito.saitama.jp":true,"toda.saitama.jp":true,"tokigawa.saitama.jp":true,"tokorozawa.saitama.jp":true,"tsurugashima.saitama.jp":true,"urawa.saitama.jp":true,"warabi.saitama.jp":true,"yashio.saitama.jp":true,"yokoze.saitama.jp":true,"yono.saitama.jp":true,"yorii.saitama.jp":true,"yoshida.saitama.jp":true,"yoshikawa.saitama.jp":true,"yoshimi.saitama.jp":true,"aisho.shiga.jp":true,"gamo.shiga.jp":true,"higashiomi.shiga.jp":true,"hikone.shiga.jp":true,"koka.shiga.jp":true,"konan.shiga.jp":true,"kosei.shiga.jp":true,"koto.shiga.jp":true,"kusatsu.shiga.jp":true,"maibara.shiga.jp":true,"moriyama.shiga.jp":true,"nagahama.shiga.jp":true,"nishiazai.shiga.jp":true,"notogawa.shiga.jp":true,"omihachiman.shiga.jp":true,"otsu.shiga.jp":true,"ritto.shiga.jp":true,"ryuoh.shiga.jp":true,"takashima.shiga.jp":true,"takatsuki.shiga.jp":true,"torahime.shiga.jp":true,"toyosato.shiga.jp":true,"yasu.shiga.jp":true,"akagi.shimane.jp":true,"ama.shimane.jp":true,"gotsu.shimane.jp":true,"hamada.shimane.jp":true,"higashiizumo.shimane.jp":true,"hikawa.shimane.jp":true,"hikimi.shimane.jp":true,"izumo.shimane.jp":true,"kakinoki.shimane.jp":true,"masuda.shimane.jp":true,"matsue.shimane.jp":true,"misato.shimane.jp":true,"nishinoshima.shimane.jp":true,"ohda.shimane.jp":true,"okinoshima.shimane.jp":true,"okuizumo.shimane.jp":true,"shimane.shimane.jp":true,"tamayu.shimane.jp":true,"tsuwano.shimane.jp":true,"unnan.shimane.jp":true,"yakumo.shimane.jp":true,"yasugi.shimane.jp":true,"yatsuka.shimane.jp":true,"arai.shizuoka.jp":true,"atami.shizuoka.jp":true,"fuji.shizuoka.jp":true,"fujieda.shizuoka.jp":true,"fujikawa.shizuoka.jp":true,"fujinomiya.shizuoka.jp":true,"fukuroi.shizuoka.jp":true,"gotemba.shizuoka.jp":true,"haibara.shizuoka.jp":true,"hamamatsu.shizuoka.jp":true,"higashiizu.shizuoka.jp":true,"ito.shizuoka.jp":true,"iwata.shizuoka.jp":true,"izu.shizuoka.jp":true,"izunokuni.shizuoka.jp":true,"kakegawa.shizuoka.jp":true,"kannami.shizuoka.jp":true,"kawanehon.shizuoka.jp":true,"kawazu.shizuoka.jp":true,"kikugawa.shizuoka.jp":true,"kosai.shizuoka.jp":true,"makinohara.shizuoka.jp":true,"matsuzaki.shizuoka.jp":true,"minamiizu.shizuoka.jp":true,"mishima.shizuoka.jp":true,"morimachi.shizuoka.jp":true,"nishiizu.shizuoka.jp":true,"numazu.shizuoka.jp":true,"omaezaki.shizuoka.jp":true,"shimada.shizuoka.jp":true,"shimizu.shizuoka.jp":true,"shimoda.shizuoka.jp":true,"shizuoka.shizuoka.jp":true,"susono.shizuoka.jp":true,"yaizu.shizuoka.jp":true,"yoshida.shizuoka.jp":true,"ashikaga.tochigi.jp":true,"bato.tochigi.jp":true,"haga.tochigi.jp":true,"ichikai.tochigi.jp":true,"iwafune.tochigi.jp":true,"kaminokawa.tochigi.jp":true,"kanuma.tochigi.jp":true,"karasuyama.tochigi.jp":true,"kuroiso.tochigi.jp":true,"mashiko.tochigi.jp":true,"mibu.tochigi.jp":true,"moka.tochigi.jp":true,"motegi.tochigi.jp":true,"nasu.tochigi.jp":true,"nasushiobara.tochigi.jp":true,"nikko.tochigi.jp":true,"nishikata.tochigi.jp":true,"nogi.tochigi.jp":true,"ohira.tochigi.jp":true,"ohtawara.tochigi.jp":true,"oyama.tochigi.jp":true,"sakura.tochigi.jp":true,"sano.tochigi.jp":true,"shimotsuke.tochigi.jp":true,"shioya.tochigi.jp":true,"takanezawa.tochigi.jp":true,"tochigi.tochigi.jp":true,"tsuga.tochigi.jp":true,"ujiie.tochigi.jp":true,"utsunomiya.tochigi.jp":true,"yaita.tochigi.jp":true,"aizumi.tokushima.jp":true,"anan.tokushima.jp":true,"ichiba.tokushima.jp":true,"itano.tokushima.jp":true,"kainan.tokushima.jp":true,"komatsushima.tokushima.jp":true,"matsushige.tokushima.jp":true,"mima.tokushima.jp":true,"minami.tokushima.jp":true,"miyoshi.tokushima.jp":true,"mugi.tokushima.jp":true,"nakagawa.tokushima.jp":true,"naruto.tokushima.jp":true,"sanagochi.tokushima.jp":true,"shishikui.tokushima.jp":true,"tokushima.tokushima.jp":true,"wajiki.tokushima.jp":true,"adachi.tokyo.jp":true,"akiruno.tokyo.jp":true,"akishima.tokyo.jp":true,"aogashima.tokyo.jp":true,"arakawa.tokyo.jp":true,"bunkyo.tokyo.jp":true,"chiyoda.tokyo.jp":true,"chofu.tokyo.jp":true,"chuo.tokyo.jp":true,"edogawa.tokyo.jp":true,"fuchu.tokyo.jp":true,"fussa.tokyo.jp":true,"hachijo.tokyo.jp":true,"hachioji.tokyo.jp":true,"hamura.tokyo.jp":true,"higashikurume.tokyo.jp":true,"higashimurayama.tokyo.jp":true,"higashiyamato.tokyo.jp":true,"hino.tokyo.jp":true,"hinode.tokyo.jp":true,"hinohara.tokyo.jp":true,"inagi.tokyo.jp":true,"itabashi.tokyo.jp":true,"katsushika.tokyo.jp":true,"kita.tokyo.jp":true,"kiyose.tokyo.jp":true,"kodaira.tokyo.jp":true,"koganei.tokyo.jp":true,"kokubunji.tokyo.jp":true,"komae.tokyo.jp":true,"koto.tokyo.jp":true,"kouzushima.tokyo.jp":true,"kunitachi.tokyo.jp":true,"machida.tokyo.jp":true,"meguro.tokyo.jp":true,"minato.tokyo.jp":true,"mitaka.tokyo.jp":true,"mizuho.tokyo.jp":true,"musashimurayama.tokyo.jp":true,"musashino.tokyo.jp":true,"nakano.tokyo.jp":true,"nerima.tokyo.jp":true,"ogasawara.tokyo.jp":true,"okutama.tokyo.jp":true,"ome.tokyo.jp":true,"oshima.tokyo.jp":true,"ota.tokyo.jp":true,"setagaya.tokyo.jp":true,"shibuya.tokyo.jp":true,"shinagawa.tokyo.jp":true,"shinjuku.tokyo.jp":true,"suginami.tokyo.jp":true,"sumida.tokyo.jp":true,"tachikawa.tokyo.jp":true,"taito.tokyo.jp":true,"tama.tokyo.jp":true,"toshima.tokyo.jp":true,"chizu.tottori.jp":true,"hino.tottori.jp":true,"kawahara.tottori.jp":true,"koge.tottori.jp":true,"kotoura.tottori.jp":true,"misasa.tottori.jp":true,"nanbu.tottori.jp":true,"nichinan.tottori.jp":true,"sakaiminato.tottori.jp":true,"tottori.tottori.jp":true,"wakasa.tottori.jp":true,"yazu.tottori.jp":true,"yonago.tottori.jp":true,"asahi.toyama.jp":true,"fuchu.toyama.jp":true,"fukumitsu.toyama.jp":true,"funahashi.toyama.jp":true,"himi.toyama.jp":true,"imizu.toyama.jp":true,"inami.toyama.jp":true,"johana.toyama.jp":true,"kamiichi.toyama.jp":true,"kurobe.toyama.jp":true,"nakaniikawa.toyama.jp":true,"namerikawa.toyama.jp":true,"nanto.toyama.jp":true,"nyuzen.toyama.jp":true,"oyabe.toyama.jp":true,"taira.toyama.jp":true,"takaoka.toyama.jp":true,"tateyama.toyama.jp":true,"toga.toyama.jp":true,"tonami.toyama.jp":true,"toyama.toyama.jp":true,"unazuki.toyama.jp":true,"uozu.toyama.jp":true,"yamada.toyama.jp":true,"arida.wakayama.jp":true,"aridagawa.wakayama.jp":true,"gobo.wakayama.jp":true,"hashimoto.wakayama.jp":true,"hidaka.wakayama.jp":true,"hirogawa.wakayama.jp":true,"inami.wakayama.jp":true,"iwade.wakayama.jp":true,"kainan.wakayama.jp":true,"kamitonda.wakayama.jp":true,"katsuragi.wakayama.jp":true,"kimino.wakayama.jp":true,"kinokawa.wakayama.jp":true,"kitayama.wakayama.jp":true,"koya.wakayama.jp":true,"koza.wakayama.jp":true,"kozagawa.wakayama.jp":true,"kudoyama.wakayama.jp":true,"kushimoto.wakayama.jp":true,"mihama.wakayama.jp":true,"misato.wakayama.jp":true,"nachikatsuura.wakayama.jp":true,"shingu.wakayama.jp":true,"shirahama.wakayama.jp":true,"taiji.wakayama.jp":true,"tanabe.wakayama.jp":true,"wakayama.wakayama.jp":true,"yuasa.wakayama.jp":true,"yura.wakayama.jp":true,"asahi.yamagata.jp":true,"funagata.yamagata.jp":true,"higashine.yamagata.jp":true,"iide.yamagata.jp":true,"kahoku.yamagata.jp":true,"kaminoyama.yamagata.jp":true,"kaneyama.yamagata.jp":true,"kawanishi.yamagata.jp":true,"mamurogawa.yamagata.jp":true,"mikawa.yamagata.jp":true,"murayama.yamagata.jp":true,"nagai.yamagata.jp":true,"nakayama.yamagata.jp":true,"nanyo.yamagata.jp":true,"nishikawa.yamagata.jp":true,"obanazawa.yamagata.jp":true,"oe.yamagata.jp":true,"oguni.yamagata.jp":true,"ohkura.yamagata.jp":true,"oishida.yamagata.jp":true,"sagae.yamagata.jp":true,"sakata.yamagata.jp":true,"sakegawa.yamagata.jp":true,"shinjo.yamagata.jp":true,"shirataka.yamagata.jp":true,"shonai.yamagata.jp":true,"takahata.yamagata.jp":true,"tendo.yamagata.jp":true,"tozawa.yamagata.jp":true,"tsuruoka.yamagata.jp":true,"yamagata.yamagata.jp":true,"yamanobe.yamagata.jp":true,"yonezawa.yamagata.jp":true,"yuza.yamagata.jp":true,"abu.yamaguchi.jp":true,"hagi.yamaguchi.jp":true,"hikari.yamaguchi.jp":true,"hofu.yamaguchi.jp":true,"iwakuni.yamaguchi.jp":true,"kudamatsu.yamaguchi.jp":true,"mitou.yamaguchi.jp":true,"nagato.yamaguchi.jp":true,"oshima.yamaguchi.jp":true,"shimonoseki.yamaguchi.jp":true,"shunan.yamaguchi.jp":true,"tabuse.yamaguchi.jp":true,"tokuyama.yamaguchi.jp":true,"toyota.yamaguchi.jp":true,"ube.yamaguchi.jp":true,"yuu.yamaguchi.jp":true,"chuo.yamanashi.jp":true,"doshi.yamanashi.jp":true,"fuefuki.yamanashi.jp":true,"fujikawa.yamanashi.jp":true,"fujikawaguchiko.yamanashi.jp":true,"fujiyoshida.yamanashi.jp":true,"hayakawa.yamanashi.jp":true,"hokuto.yamanashi.jp":true,"ichikawamisato.yamanashi.jp":true,"kai.yamanashi.jp":true,"kofu.yamanashi.jp":true,"koshu.yamanashi.jp":true,"kosuge.yamanashi.jp":true,"minami-alps.yamanashi.jp":true,"minobu.yamanashi.jp":true,"nakamichi.yamanashi.jp":true,"nanbu.yamanashi.jp":true,"narusawa.yamanashi.jp":true,"nirasaki.yamanashi.jp":true,"nishikatsura.yamanashi.jp":true,"oshino.yamanashi.jp":true,"otsuki.yamanashi.jp":true,"showa.yamanashi.jp":true,"tabayama.yamanashi.jp":true,"tsuru.yamanashi.jp":true,"uenohara.yamanashi.jp":true,"yamanakako.yamanashi.jp":true,"yamanashi.yamanashi.jp":true,"*.ke":true,"kg":true,"org.kg":true,"net.kg":true,"com.kg":true,"edu.kg":true,"gov.kg":true,"mil.kg":true,"*.kh":true,"ki":true,"edu.ki":true,"biz.ki":true,"net.ki":true,"org.ki":true,"gov.ki":true,"info.ki":true,"com.ki":true,"km":true,"org.km":true,"nom.km":true,"gov.km":true,"prd.km":true,"tm.km":true,"edu.km":true,"mil.km":true,"ass.km":true,"com.km":true,"coop.km":true,"asso.km":true,"presse.km":true,"medecin.km":true,"notaires.km":true,"pharmaciens.km":true,"veterinaire.km":true,"gouv.km":true,"kn":true,"net.kn":true,"org.kn":true,"edu.kn":true,"gov.kn":true,"kp":true,"com.kp":true,"edu.kp":true,"gov.kp":true,"org.kp":true,"rep.kp":true,"tra.kp":true,"kr":true,"ac.kr":true,"co.kr":true,"es.kr":true,"go.kr":true,"hs.kr":true,"kg.kr":true,"mil.kr":true,"ms.kr":true,"ne.kr":true,"or.kr":true,"pe.kr":true,"re.kr":true,"sc.kr":true,"busan.kr":true,"chungbuk.kr":true,"chungnam.kr":true,"daegu.kr":true,"daejeon.kr":true,"gangwon.kr":true,"gwangju.kr":true,"gyeongbuk.kr":true,"gyeonggi.kr":true,"gyeongnam.kr":true,"incheon.kr":true,"jeju.kr":true,"jeonbuk.kr":true,"jeonnam.kr":true,"seoul.kr":true,"ulsan.kr":true,"*.kw":true,"ky":true,"edu.ky":true,"gov.ky":true,"com.ky":true,"org.ky":true,"net.ky":true,"kz":true,"org.kz":true,"edu.kz":true,"net.kz":true,"gov.kz":true,"mil.kz":true,"com.kz":true,"la":true,"int.la":true,"net.la":true,"info.la":true,"edu.la":true,"gov.la":true,"per.la":true,"com.la":true,"org.la":true,"lb":true,"com.lb":true,"edu.lb":true,"gov.lb":true,"net.lb":true,"org.lb":true,"lc":true,"com.lc":true,"net.lc":true,"co.lc":true,"org.lc":true,"edu.lc":true,"gov.lc":true,"li":true,"lk":true,"gov.lk":true,"sch.lk":true,"net.lk":true,"int.lk":true,"com.lk":true,"org.lk":true,"edu.lk":true,"ngo.lk":true,"soc.lk":true,"web.lk":true,"ltd.lk":true,"assn.lk":true,"grp.lk":true,"hotel.lk":true,"lr":true,"com.lr":true,"edu.lr":true,"gov.lr":true,"org.lr":true,"net.lr":true,"ls":true,"co.ls":true,"org.ls":true,"lt":true,"gov.lt":true,"lu":true,"lv":true,"com.lv":true,"edu.lv":true,"gov.lv":true,"org.lv":true,"mil.lv":true,"id.lv":true,"net.lv":true,"asn.lv":true,"conf.lv":true,"ly":true,"com.ly":true,"net.ly":true,"gov.ly":true,"plc.ly":true,"edu.ly":true,"sch.ly":true,"med.ly":true,"org.ly":true,"id.ly":true,"ma":true,"co.ma":true,"net.ma":true,"gov.ma":true,"org.ma":true,"ac.ma":true,"press.ma":true,"mc":true,"tm.mc":true,"asso.mc":true,"md":true,"me":true,"co.me":true,"net.me":true,"org.me":true,"edu.me":true,"ac.me":true,"gov.me":true,"its.me":true,"priv.me":true,"mg":true,"org.mg":true,"nom.mg":true,"gov.mg":true,"prd.mg":true,"tm.mg":true,"edu.mg":true,"mil.mg":true,"com.mg":true,"mh":true,"mil":true,"mk":true,"com.mk":true,"org.mk":true,"net.mk":true,"edu.mk":true,"gov.mk":true,"inf.mk":true,"name.mk":true,"ml":true,"com.ml":true,"edu.ml":true,"gouv.ml":true,"gov.ml":true,"net.ml":true,"org.ml":true,"presse.ml":true,"*.mm":true,"mn":true,"gov.mn":true,"edu.mn":true,"org.mn":true,"mo":true,"com.mo":true,"net.mo":true,"org.mo":true,"edu.mo":true,"gov.mo":true,"mobi":true,"mp":true,"mq":true,"mr":true,"gov.mr":true,"ms":true,"com.ms":true,"edu.ms":true,"gov.ms":true,"net.ms":true,"org.ms":true,"mt":true,"com.mt":true,"edu.mt":true,"net.mt":true,"org.mt":true,"mu":true,"com.mu":true,"net.mu":true,"org.mu":true,"gov.mu":true,"ac.mu":true,"co.mu":true,"or.mu":true,"museum":true,"academy.museum":true,"agriculture.museum":true,"air.museum":true,"airguard.museum":true,"alabama.museum":true,"alaska.museum":true,"amber.museum":true,"ambulance.museum":true,"american.museum":true,"americana.museum":true,"americanantiques.museum":true,"americanart.museum":true,"amsterdam.museum":true,"and.museum":true,"annefrank.museum":true,"anthro.museum":true,"anthropology.museum":true,"antiques.museum":true,"aquarium.museum":true,"arboretum.museum":true,"archaeological.museum":true,"archaeology.museum":true,"architecture.museum":true,"art.museum":true,"artanddesign.museum":true,"artcenter.museum":true,"artdeco.museum":true,"arteducation.museum":true,"artgallery.museum":true,"arts.museum":true,"artsandcrafts.museum":true,"asmatart.museum":true,"assassination.museum":true,"assisi.museum":true,"association.museum":true,"astronomy.museum":true,"atlanta.museum":true,"austin.museum":true,"australia.museum":true,"automotive.museum":true,"aviation.museum":true,"axis.museum":true,"badajoz.museum":true,"baghdad.museum":true,"bahn.museum":true,"bale.museum":true,"baltimore.museum":true,"barcelona.museum":true,"baseball.museum":true,"basel.museum":true,"baths.museum":true,"bauern.museum":true,"beauxarts.museum":true,"beeldengeluid.museum":true,"bellevue.museum":true,"bergbau.museum":true,"berkeley.museum":true,"berlin.museum":true,"bern.museum":true,"bible.museum":true,"bilbao.museum":true,"bill.museum":true,"birdart.museum":true,"birthplace.museum":true,"bonn.museum":true,"boston.museum":true,"botanical.museum":true,"botanicalgarden.museum":true,"botanicgarden.museum":true,"botany.museum":true,"brandywinevalley.museum":true,"brasil.museum":true,"bristol.museum":true,"british.museum":true,"britishcolumbia.museum":true,"broadcast.museum":true,"brunel.museum":true,"brussel.museum":true,"brussels.museum":true,"bruxelles.museum":true,"building.museum":true,"burghof.museum":true,"bus.museum":true,"bushey.museum":true,"cadaques.museum":true,"california.museum":true,"cambridge.museum":true,"can.museum":true,"canada.museum":true,"capebreton.museum":true,"carrier.museum":true,"cartoonart.museum":true,"casadelamoneda.museum":true,"castle.museum":true,"castres.museum":true,"celtic.museum":true,"center.museum":true,"chattanooga.museum":true,"cheltenham.museum":true,"chesapeakebay.museum":true,"chicago.museum":true,"children.museum":true,"childrens.museum":true,"childrensgarden.museum":true,"chiropractic.museum":true,"chocolate.museum":true,"christiansburg.museum":true,"cincinnati.museum":true,"cinema.museum":true,"circus.museum":true,"civilisation.museum":true,"civilization.museum":true,"civilwar.museum":true,"clinton.museum":true,"clock.museum":true,"coal.museum":true,"coastaldefence.museum":true,"cody.museum":true,"coldwar.museum":true,"collection.museum":true,"colonialwilliamsburg.museum":true,"coloradoplateau.museum":true,"columbia.museum":true,"columbus.museum":true,"communication.museum":true,"communications.museum":true,"community.museum":true,"computer.museum":true,"computerhistory.museum":true,"xn--comunicaes-v6a2o.museum":true,"contemporary.museum":true,"contemporaryart.museum":true,"convent.museum":true,"copenhagen.museum":true,"corporation.museum":true,"xn--correios-e-telecomunicaes-ghc29a.museum":true,"corvette.museum":true,"costume.museum":true,"countryestate.museum":true,"county.museum":true,"crafts.museum":true,"cranbrook.museum":true,"creation.museum":true,"cultural.museum":true,"culturalcenter.museum":true,"culture.museum":true,"cyber.museum":true,"cymru.museum":true,"dali.museum":true,"dallas.museum":true,"database.museum":true,"ddr.museum":true,"decorativearts.museum":true,"delaware.museum":true,"delmenhorst.museum":true,"denmark.museum":true,"depot.museum":true,"design.museum":true,"detroit.museum":true,"dinosaur.museum":true,"discovery.museum":true,"dolls.museum":true,"donostia.museum":true,"durham.museum":true,"eastafrica.museum":true,"eastcoast.museum":true,"education.museum":true,"educational.museum":true,"egyptian.museum":true,"eisenbahn.museum":true,"elburg.museum":true,"elvendrell.museum":true,"embroidery.museum":true,"encyclopedic.museum":true,"england.museum":true,"entomology.museum":true,"environment.museum":true,"environmentalconservation.museum":true,"epilepsy.museum":true,"essex.museum":true,"estate.museum":true,"ethnology.museum":true,"exeter.museum":true,"exhibition.museum":true,"family.museum":true,"farm.museum":true,"farmequipment.museum":true,"farmers.museum":true,"farmstead.museum":true,"field.museum":true,"figueres.museum":true,"filatelia.museum":true,"film.museum":true,"fineart.museum":true,"finearts.museum":true,"finland.museum":true,"flanders.museum":true,"florida.museum":true,"force.museum":true,"fortmissoula.museum":true,"fortworth.museum":true,"foundation.museum":true,"francaise.museum":true,"frankfurt.museum":true,"franziskaner.museum":true,"freemasonry.museum":true,"freiburg.museum":true,"fribourg.museum":true,"frog.museum":true,"fundacio.museum":true,"furniture.museum":true,"gallery.museum":true,"garden.museum":true,"gateway.museum":true,"geelvinck.museum":true,"gemological.museum":true,"geology.museum":true,"georgia.museum":true,"giessen.museum":true,"glas.museum":true,"glass.museum":true,"gorge.museum":true,"grandrapids.museum":true,"graz.museum":true,"guernsey.museum":true,"halloffame.museum":true,"hamburg.museum":true,"handson.museum":true,"harvestcelebration.museum":true,"hawaii.museum":true,"health.museum":true,"heimatunduhren.museum":true,"hellas.museum":true,"helsinki.museum":true,"hembygdsforbund.museum":true,"heritage.museum":true,"histoire.museum":true,"historical.museum":true,"historicalsociety.museum":true,"historichouses.museum":true,"historisch.museum":true,"historisches.museum":true,"history.museum":true,"historyofscience.museum":true,"horology.museum":true,"house.museum":true,"humanities.museum":true,"illustration.museum":true,"imageandsound.museum":true,"indian.museum":true,"indiana.museum":true,"indianapolis.museum":true,"indianmarket.museum":true,"intelligence.museum":true,"interactive.museum":true,"iraq.museum":true,"iron.museum":true,"isleofman.museum":true,"jamison.museum":true,"jefferson.museum":true,"jerusalem.museum":true,"jewelry.museum":true,"jewish.museum":true,"jewishart.museum":true,"jfk.museum":true,"journalism.museum":true,"judaica.museum":true,"judygarland.museum":true,"juedisches.museum":true,"juif.museum":true,"karate.museum":true,"karikatur.museum":true,"kids.museum":true,"koebenhavn.museum":true,"koeln.museum":true,"kunst.museum":true,"kunstsammlung.museum":true,"kunstunddesign.museum":true,"labor.museum":true,"labour.museum":true,"lajolla.museum":true,"lancashire.museum":true,"landes.museum":true,"lans.museum":true,"xn--lns-qla.museum":true,"larsson.museum":true,"lewismiller.museum":true,"lincoln.museum":true,"linz.museum":true,"living.museum":true,"livinghistory.museum":true,"localhistory.museum":true,"london.museum":true,"losangeles.museum":true,"louvre.museum":true,"loyalist.museum":true,"lucerne.museum":true,"luxembourg.museum":true,"luzern.museum":true,"mad.museum":true,"madrid.museum":true,"mallorca.museum":true,"manchester.museum":true,"mansion.museum":true,"mansions.museum":true,"manx.museum":true,"marburg.museum":true,"maritime.museum":true,"maritimo.museum":true,"maryland.museum":true,"marylhurst.museum":true,"media.museum":true,"medical.museum":true,"medizinhistorisches.museum":true,"meeres.museum":true,"memorial.museum":true,"mesaverde.museum":true,"michigan.museum":true,"midatlantic.museum":true,"military.museum":true,"mill.museum":true,"miners.museum":true,"mining.museum":true,"minnesota.museum":true,"missile.museum":true,"missoula.museum":true,"modern.museum":true,"moma.museum":true,"money.museum":true,"monmouth.museum":true,"monticello.museum":true,"montreal.museum":true,"moscow.museum":true,"motorcycle.museum":true,"muenchen.museum":true,"muenster.museum":true,"mulhouse.museum":true,"muncie.museum":true,"museet.museum":true,"museumcenter.museum":true,"museumvereniging.museum":true,"music.museum":true,"national.museum":true,"nationalfirearms.museum":true,"nationalheritage.museum":true,"nativeamerican.museum":true,"naturalhistory.museum":true,"naturalhistorymuseum.museum":true,"naturalsciences.museum":true,"nature.museum":true,"naturhistorisches.museum":true,"natuurwetenschappen.museum":true,"naumburg.museum":true,"naval.museum":true,"nebraska.museum":true,"neues.museum":true,"newhampshire.museum":true,"newjersey.museum":true,"newmexico.museum":true,"newport.museum":true,"newspaper.museum":true,"newyork.museum":true,"niepce.museum":true,"norfolk.museum":true,"north.museum":true,"nrw.museum":true,"nuernberg.museum":true,"nuremberg.museum":true,"nyc.museum":true,"nyny.museum":true,"oceanographic.museum":true,"oceanographique.museum":true,"omaha.museum":true,"online.museum":true,"ontario.museum":true,"openair.museum":true,"oregon.museum":true,"oregontrail.museum":true,"otago.museum":true,"oxford.museum":true,"pacific.museum":true,"paderborn.museum":true,"palace.museum":true,"paleo.museum":true,"palmsprings.museum":true,"panama.museum":true,"paris.museum":true,"pasadena.museum":true,"pharmacy.museum":true,"philadelphia.museum":true,"philadelphiaarea.museum":true,"philately.museum":true,"phoenix.museum":true,"photography.museum":true,"pilots.museum":true,"pittsburgh.museum":true,"planetarium.museum":true,"plantation.museum":true,"plants.museum":true,"plaza.museum":true,"portal.museum":true,"portland.museum":true,"portlligat.museum":true,"posts-and-telecommunications.museum":true,"preservation.museum":true,"presidio.museum":true,"press.museum":true,"project.museum":true,"public.museum":true,"pubol.museum":true,"quebec.museum":true,"railroad.museum":true,"railway.museum":true,"research.museum":true,"resistance.museum":true,"riodejaneiro.museum":true,"rochester.museum":true,"rockart.museum":true,"roma.museum":true,"russia.museum":true,"saintlouis.museum":true,"salem.museum":true,"salvadordali.museum":true,"salzburg.museum":true,"sandiego.museum":true,"sanfrancisco.museum":true,"santabarbara.museum":true,"santacruz.museum":true,"santafe.museum":true,"saskatchewan.museum":true,"satx.museum":true,"savannahga.museum":true,"schlesisches.museum":true,"schoenbrunn.museum":true,"schokoladen.museum":true,"school.museum":true,"schweiz.museum":true,"science.museum":true,"scienceandhistory.museum":true,"scienceandindustry.museum":true,"sciencecenter.museum":true,"sciencecenters.museum":true,"science-fiction.museum":true,"sciencehistory.museum":true,"sciences.museum":true,"sciencesnaturelles.museum":true,"scotland.museum":true,"seaport.museum":true,"settlement.museum":true,"settlers.museum":true,"shell.museum":true,"sherbrooke.museum":true,"sibenik.museum":true,"silk.museum":true,"ski.museum":true,"skole.museum":true,"society.museum":true,"sologne.museum":true,"soundandvision.museum":true,"southcarolina.museum":true,"southwest.museum":true,"space.museum":true,"spy.museum":true,"square.museum":true,"stadt.museum":true,"stalbans.museum":true,"starnberg.museum":true,"state.museum":true,"stateofdelaware.museum":true,"station.museum":true,"steam.museum":true,"steiermark.museum":true,"stjohn.museum":true,"stockholm.museum":true,"stpetersburg.museum":true,"stuttgart.museum":true,"suisse.museum":true,"surgeonshall.museum":true,"surrey.museum":true,"svizzera.museum":true,"sweden.museum":true,"sydney.museum":true,"tank.museum":true,"tcm.museum":true,"technology.museum":true,"telekommunikation.museum":true,"television.museum":true,"texas.museum":true,"textile.museum":true,"theater.museum":true,"time.museum":true,"timekeeping.museum":true,"topology.museum":true,"torino.museum":true,"touch.museum":true,"town.museum":true,"transport.museum":true,"tree.museum":true,"trolley.museum":true,"trust.museum":true,"trustee.museum":true,"uhren.museum":true,"ulm.museum":true,"undersea.museum":true,"university.museum":true,"usa.museum":true,"usantiques.museum":true,"usarts.museum":true,"uscountryestate.museum":true,"usculture.museum":true,"usdecorativearts.museum":true,"usgarden.museum":true,"ushistory.museum":true,"ushuaia.museum":true,"uslivinghistory.museum":true,"utah.museum":true,"uvic.museum":true,"valley.museum":true,"vantaa.museum":true,"versailles.museum":true,"viking.museum":true,"village.museum":true,"virginia.museum":true,"virtual.museum":true,"virtuel.museum":true,"vlaanderen.museum":true,"volkenkunde.museum":true,"wales.museum":true,"wallonie.museum":true,"war.museum":true,"washingtondc.museum":true,"watchandclock.museum":true,"watch-and-clock.museum":true,"western.museum":true,"westfalen.museum":true,"whaling.museum":true,"wildlife.museum":true,"williamsburg.museum":true,"windmill.museum":true,"workshop.museum":true,"york.museum":true,"yorkshire.museum":true,"yosemite.museum":true,"youth.museum":true,"zoological.museum":true,"zoology.museum":true,"xn--9dbhblg6di.museum":true,"xn--h1aegh.museum":true,"mv":true,"aero.mv":true,"biz.mv":true,"com.mv":true,"coop.mv":true,"edu.mv":true,"gov.mv":true,"info.mv":true,"int.mv":true,"mil.mv":true,"museum.mv":true,"name.mv":true,"net.mv":true,"org.mv":true,"pro.mv":true,"mw":true,"ac.mw":true,"biz.mw":true,"co.mw":true,"com.mw":true,"coop.mw":true,"edu.mw":true,"gov.mw":true,"int.mw":true,"museum.mw":true,"net.mw":true,"org.mw":true,"mx":true,"com.mx":true,"org.mx":true,"gob.mx":true,"edu.mx":true,"net.mx":true,"my":true,"com.my":true,"net.my":true,"org.my":true,"gov.my":true,"edu.my":true,"mil.my":true,"name.my":true,"*.mz":true,"teledata.mz":false,"na":true,"info.na":true,"pro.na":true,"name.na":true,"school.na":true,"or.na":true,"dr.na":true,"us.na":true,"mx.na":true,"ca.na":true,"in.na":true,"cc.na":true,"tv.na":true,"ws.na":true,"mobi.na":true,"co.na":true,"com.na":true,"org.na":true,"name":true,"nc":true,"asso.nc":true,"ne":true,"net":true,"nf":true,"com.nf":true,"net.nf":true,"per.nf":true,"rec.nf":true,"web.nf":true,"arts.nf":true,"firm.nf":true,"info.nf":true,"other.nf":true,"store.nf":true,"ng":true,"com.ng":true,"edu.ng":true,"name.ng":true,"net.ng":true,"org.ng":true,"sch.ng":true,"gov.ng":true,"mil.ng":true,"mobi.ng":true,"*.ni":true,"nl":true,"bv.nl":true,"no":true,"fhs.no":true,"vgs.no":true,"fylkesbibl.no":true,"folkebibl.no":true,"museum.no":true,"idrett.no":true,"priv.no":true,"mil.no":true,"stat.no":true,"dep.no":true,"kommune.no":true,"herad.no":true,"aa.no":true,"ah.no":true,"bu.no":true,"fm.no":true,"hl.no":true,"hm.no":true,"jan-mayen.no":true,"mr.no":true,"nl.no":true,"nt.no":true,"of.no":true,"ol.no":true,"oslo.no":true,"rl.no":true,"sf.no":true,"st.no":true,"svalbard.no":true,"tm.no":true,"tr.no":true,"va.no":true,"vf.no":true,"gs.aa.no":true,"gs.ah.no":true,"gs.bu.no":true,"gs.fm.no":true,"gs.hl.no":true,"gs.hm.no":true,"gs.jan-mayen.no":true,"gs.mr.no":true,"gs.nl.no":true,"gs.nt.no":true,"gs.of.no":true,"gs.ol.no":true,"gs.oslo.no":true,"gs.rl.no":true,"gs.sf.no":true,"gs.st.no":true,"gs.svalbard.no":true,"gs.tm.no":true,"gs.tr.no":true,"gs.va.no":true,"gs.vf.no":true,"akrehamn.no":true,"xn--krehamn-dxa.no":true,"algard.no":true,"xn--lgrd-poac.no":true,"arna.no":true,"brumunddal.no":true,"bryne.no":true,"bronnoysund.no":true,"xn--brnnysund-m8ac.no":true,"drobak.no":true,"xn--drbak-wua.no":true,"egersund.no":true,"fetsund.no":true,"floro.no":true,"xn--flor-jra.no":true,"fredrikstad.no":true,"hokksund.no":true,"honefoss.no":true,"xn--hnefoss-q1a.no":true,"jessheim.no":true,"jorpeland.no":true,"xn--jrpeland-54a.no":true,"kirkenes.no":true,"kopervik.no":true,"krokstadelva.no":true,"langevag.no":true,"xn--langevg-jxa.no":true,"leirvik.no":true,"mjondalen.no":true,"xn--mjndalen-64a.no":true,"mo-i-rana.no":true,"mosjoen.no":true,"xn--mosjen-eya.no":true,"nesoddtangen.no":true,"orkanger.no":true,"osoyro.no":true,"xn--osyro-wua.no":true,"raholt.no":true,"xn--rholt-mra.no":true,"sandnessjoen.no":true,"xn--sandnessjen-ogb.no":true,"skedsmokorset.no":true,"slattum.no":true,"spjelkavik.no":true,"stathelle.no":true,"stavern.no":true,"stjordalshalsen.no":true,"xn--stjrdalshalsen-sqb.no":true,"tananger.no":true,"tranby.no":true,"vossevangen.no":true,"afjord.no":true,"xn--fjord-lra.no":true,"agdenes.no":true,"al.no":true,"xn--l-1fa.no":true,"alesund.no":true,"xn--lesund-hua.no":true,"alstahaug.no":true,"alta.no":true,"xn--lt-liac.no":true,"alaheadju.no":true,"xn--laheadju-7ya.no":true,"alvdal.no":true,"amli.no":true,"xn--mli-tla.no":true,"amot.no":true,"xn--mot-tla.no":true,"andebu.no":true,"andoy.no":true,"xn--andy-ira.no":true,"andasuolo.no":true,"ardal.no":true,"xn--rdal-poa.no":true,"aremark.no":true,"arendal.no":true,"xn--s-1fa.no":true,"aseral.no":true,"xn--seral-lra.no":true,"asker.no":true,"askim.no":true,"askvoll.no":true,"askoy.no":true,"xn--asky-ira.no":true,"asnes.no":true,"xn--snes-poa.no":true,"audnedaln.no":true,"aukra.no":true,"aure.no":true,"aurland.no":true,"aurskog-holand.no":true,"xn--aurskog-hland-jnb.no":true,"austevoll.no":true,"austrheim.no":true,"averoy.no":true,"xn--avery-yua.no":true,"balestrand.no":true,"ballangen.no":true,"balat.no":true,"xn--blt-elab.no":true,"balsfjord.no":true,"bahccavuotna.no":true,"xn--bhccavuotna-k7a.no":true,"bamble.no":true,"bardu.no":true,"beardu.no":true,"beiarn.no":true,"bajddar.no":true,"xn--bjddar-pta.no":true,"baidar.no":true,"xn--bidr-5nac.no":true,"berg.no":true,"bergen.no":true,"berlevag.no":true,"xn--berlevg-jxa.no":true,"bearalvahki.no":true,"xn--bearalvhki-y4a.no":true,"bindal.no":true,"birkenes.no":true,"bjarkoy.no":true,"xn--bjarky-fya.no":true,"bjerkreim.no":true,"bjugn.no":true,"bodo.no":true,"xn--bod-2na.no":true,"badaddja.no":true,"xn--bdddj-mrabd.no":true,"budejju.no":true,"bokn.no":true,"bremanger.no":true,"bronnoy.no":true,"xn--brnny-wuac.no":true,"bygland.no":true,"bykle.no":true,"barum.no":true,"xn--brum-voa.no":true,"bo.telemark.no":true,"xn--b-5ga.telemark.no":true,"bo.nordland.no":true,"xn--b-5ga.nordland.no":true,"bievat.no":true,"xn--bievt-0qa.no":true,"bomlo.no":true,"xn--bmlo-gra.no":true,"batsfjord.no":true,"xn--btsfjord-9za.no":true,"bahcavuotna.no":true,"xn--bhcavuotna-s4a.no":true,"dovre.no":true,"drammen.no":true,"drangedal.no":true,"dyroy.no":true,"xn--dyry-ira.no":true,"donna.no":true,"xn--dnna-gra.no":true,"eid.no":true,"eidfjord.no":true,"eidsberg.no":true,"eidskog.no":true,"eidsvoll.no":true,"eigersund.no":true,"elverum.no":true,"enebakk.no":true,"engerdal.no":true,"etne.no":true,"etnedal.no":true,"evenes.no":true,"evenassi.no":true,"xn--eveni-0qa01ga.no":true,"evje-og-hornnes.no":true,"farsund.no":true,"fauske.no":true,"fuossko.no":true,"fuoisku.no":true,"fedje.no":true,"fet.no":true,"finnoy.no":true,"xn--finny-yua.no":true,"fitjar.no":true,"fjaler.no":true,"fjell.no":true,"flakstad.no":true,"flatanger.no":true,"flekkefjord.no":true,"flesberg.no":true,"flora.no":true,"fla.no":true,"xn--fl-zia.no":true,"folldal.no":true,"forsand.no":true,"fosnes.no":true,"frei.no":true,"frogn.no":true,"froland.no":true,"frosta.no":true,"frana.no":true,"xn--frna-woa.no":true,"froya.no":true,"xn--frya-hra.no":true,"fusa.no":true,"fyresdal.no":true,"forde.no":true,"xn--frde-gra.no":true,"gamvik.no":true,"gangaviika.no":true,"xn--ggaviika-8ya47h.no":true,"gaular.no":true,"gausdal.no":true,"gildeskal.no":true,"xn--gildeskl-g0a.no":true,"giske.no":true,"gjemnes.no":true,"gjerdrum.no":true,"gjerstad.no":true,"gjesdal.no":true,"gjovik.no":true,"xn--gjvik-wua.no":true,"gloppen.no":true,"gol.no":true,"gran.no":true,"grane.no":true,"granvin.no":true,"gratangen.no":true,"grimstad.no":true,"grong.no":true,"kraanghke.no":true,"xn--kranghke-b0a.no":true,"grue.no":true,"gulen.no":true,"hadsel.no":true,"halden.no":true,"halsa.no":true,"hamar.no":true,"hamaroy.no":true,"habmer.no":true,"xn--hbmer-xqa.no":true,"hapmir.no":true,"xn--hpmir-xqa.no":true,"hammerfest.no":true,"hammarfeasta.no":true,"xn--hmmrfeasta-s4ac.no":true,"haram.no":true,"hareid.no":true,"harstad.no":true,"hasvik.no":true,"aknoluokta.no":true,"xn--koluokta-7ya57h.no":true,"hattfjelldal.no":true,"aarborte.no":true,"haugesund.no":true,"hemne.no":true,"hemnes.no":true,"hemsedal.no":true,"heroy.more-og-romsdal.no":true,"xn--hery-ira.xn--mre-og-romsdal-qqb.no":true,"heroy.nordland.no":true,"xn--hery-ira.nordland.no":true,"hitra.no":true,"hjartdal.no":true,"hjelmeland.no":true,"hobol.no":true,"xn--hobl-ira.no":true,"hof.no":true,"hol.no":true,"hole.no":true,"holmestrand.no":true,"holtalen.no":true,"xn--holtlen-hxa.no":true,"hornindal.no":true,"horten.no":true,"hurdal.no":true,"hurum.no":true,"hvaler.no":true,"hyllestad.no":true,"hagebostad.no":true,"xn--hgebostad-g3a.no":true,"hoyanger.no":true,"xn--hyanger-q1a.no":true,"hoylandet.no":true,"xn--hylandet-54a.no":true,"ha.no":true,"xn--h-2fa.no":true,"ibestad.no":true,"inderoy.no":true,"xn--indery-fya.no":true,"iveland.no":true,"jevnaker.no":true,"jondal.no":true,"jolster.no":true,"xn--jlster-bya.no":true,"karasjok.no":true,"karasjohka.no":true,"xn--krjohka-hwab49j.no":true,"karlsoy.no":true,"galsa.no":true,"xn--gls-elac.no":true,"karmoy.no":true,"xn--karmy-yua.no":true,"kautokeino.no":true,"guovdageaidnu.no":true,"klepp.no":true,"klabu.no":true,"xn--klbu-woa.no":true,"kongsberg.no":true,"kongsvinger.no":true,"kragero.no":true,"xn--krager-gya.no":true,"kristiansand.no":true,"kristiansund.no":true,"krodsherad.no":true,"xn--krdsherad-m8a.no":true,"kvalsund.no":true,"rahkkeravju.no":true,"xn--rhkkervju-01af.no":true,"kvam.no":true,"kvinesdal.no":true,"kvinnherad.no":true,"kviteseid.no":true,"kvitsoy.no":true,"xn--kvitsy-fya.no":true,"kvafjord.no":true,"xn--kvfjord-nxa.no":true,"giehtavuoatna.no":true,"kvanangen.no":true,"xn--kvnangen-k0a.no":true,"navuotna.no":true,"xn--nvuotna-hwa.no":true,"kafjord.no":true,"xn--kfjord-iua.no":true,"gaivuotna.no":true,"xn--givuotna-8ya.no":true,"larvik.no":true,"lavangen.no":true,"lavagis.no":true,"loabat.no":true,"xn--loabt-0qa.no":true,"lebesby.no":true,"davvesiida.no":true,"leikanger.no":true,"leirfjord.no":true,"leka.no":true,"leksvik.no":true,"lenvik.no":true,"leangaviika.no":true,"xn--leagaviika-52b.no":true,"lesja.no":true,"levanger.no":true,"lier.no":true,"lierne.no":true,"lillehammer.no":true,"lillesand.no":true,"lindesnes.no":true,"lindas.no":true,"xn--linds-pra.no":true,"lom.no":true,"loppa.no":true,"lahppi.no":true,"xn--lhppi-xqa.no":true,"lund.no":true,"lunner.no":true,"luroy.no":true,"xn--lury-ira.no":true,"luster.no":true,"lyngdal.no":true,"lyngen.no":true,"ivgu.no":true,"lardal.no":true,"lerdal.no":true,"xn--lrdal-sra.no":true,"lodingen.no":true,"xn--ldingen-q1a.no":true,"lorenskog.no":true,"xn--lrenskog-54a.no":true,"loten.no":true,"xn--lten-gra.no":true,"malvik.no":true,"masoy.no":true,"xn--msy-ula0h.no":true,"muosat.no":true,"xn--muost-0qa.no":true,"mandal.no":true,"marker.no":true,"marnardal.no":true,"masfjorden.no":true,"meland.no":true,"meldal.no":true,"melhus.no":true,"meloy.no":true,"xn--mely-ira.no":true,"meraker.no":true,"xn--merker-kua.no":true,"moareke.no":true,"xn--moreke-jua.no":true,"midsund.no":true,"midtre-gauldal.no":true,"modalen.no":true,"modum.no":true,"molde.no":true,"moskenes.no":true,"moss.no":true,"mosvik.no":true,"malselv.no":true,"xn--mlselv-iua.no":true,"malatvuopmi.no":true,"xn--mlatvuopmi-s4a.no":true,"namdalseid.no":true,"aejrie.no":true,"namsos.no":true,"namsskogan.no":true,"naamesjevuemie.no":true,"xn--nmesjevuemie-tcba.no":true,"laakesvuemie.no":true,"nannestad.no":true,"narvik.no":true,"narviika.no":true,"naustdal.no":true,"nedre-eiker.no":true,"nes.akershus.no":true,"nes.buskerud.no":true,"nesna.no":true,"nesodden.no":true,"nesseby.no":true,"unjarga.no":true,"xn--unjrga-rta.no":true,"nesset.no":true,"nissedal.no":true,"nittedal.no":true,"nord-aurdal.no":true,"nord-fron.no":true,"nord-odal.no":true,"norddal.no":true,"nordkapp.no":true,"davvenjarga.no":true,"xn--davvenjrga-y4a.no":true,"nordre-land.no":true,"nordreisa.no":true,"raisa.no":true,"xn--risa-5na.no":true,"nore-og-uvdal.no":true,"notodden.no":true,"naroy.no":true,"xn--nry-yla5g.no":true,"notteroy.no":true,"xn--nttery-byae.no":true,"odda.no":true,"oksnes.no":true,"xn--ksnes-uua.no":true,"oppdal.no":true,"oppegard.no":true,"xn--oppegrd-ixa.no":true,"orkdal.no":true,"orland.no":true,"xn--rland-uua.no":true,"orskog.no":true,"xn--rskog-uua.no":true,"orsta.no":true,"xn--rsta-fra.no":true,"os.hedmark.no":true,"os.hordaland.no":true,"osen.no":true,"osteroy.no":true,"xn--ostery-fya.no":true,"ostre-toten.no":true,"xn--stre-toten-zcb.no":true,"overhalla.no":true,"ovre-eiker.no":true,"xn--vre-eiker-k8a.no":true,"oyer.no":true,"xn--yer-zna.no":true,"oygarden.no":true,"xn--ygarden-p1a.no":true,"oystre-slidre.no":true,"xn--ystre-slidre-ujb.no":true,"porsanger.no":true,"porsangu.no":true,"xn--porsgu-sta26f.no":true,"porsgrunn.no":true,"radoy.no":true,"xn--rady-ira.no":true,"rakkestad.no":true,"rana.no":true,"ruovat.no":true,"randaberg.no":true,"rauma.no":true,"rendalen.no":true,"rennebu.no":true,"rennesoy.no":true,"xn--rennesy-v1a.no":true,"rindal.no":true,"ringebu.no":true,"ringerike.no":true,"ringsaker.no":true,"rissa.no":true,"risor.no":true,"xn--risr-ira.no":true,"roan.no":true,"rollag.no":true,"rygge.no":true,"ralingen.no":true,"xn--rlingen-mxa.no":true,"rodoy.no":true,"xn--rdy-0nab.no":true,"romskog.no":true,"xn--rmskog-bya.no":true,"roros.no":true,"xn--rros-gra.no":true,"rost.no":true,"xn--rst-0na.no":true,"royken.no":true,"xn--ryken-vua.no":true,"royrvik.no":true,"xn--ryrvik-bya.no":true,"rade.no":true,"xn--rde-ula.no":true,"salangen.no":true,"siellak.no":true,"saltdal.no":true,"salat.no":true,"xn--slt-elab.no":true,"xn--slat-5na.no":true,"samnanger.no":true,"sande.more-og-romsdal.no":true,"sande.xn--mre-og-romsdal-qqb.no":true,"sande.vestfold.no":true,"sandefjord.no":true,"sandnes.no":true,"sandoy.no":true,"xn--sandy-yua.no":true,"sarpsborg.no":true,"sauda.no":true,"sauherad.no":true,"sel.no":true,"selbu.no":true,"selje.no":true,"seljord.no":true,"sigdal.no":true,"siljan.no":true,"sirdal.no":true,"skaun.no":true,"skedsmo.no":true,"ski.no":true,"skien.no":true,"skiptvet.no":true,"skjervoy.no":true,"xn--skjervy-v1a.no":true,"skierva.no":true,"xn--skierv-uta.no":true,"skjak.no":true,"xn--skjk-soa.no":true,"skodje.no":true,"skanland.no":true,"xn--sknland-fxa.no":true,"skanit.no":true,"xn--sknit-yqa.no":true,"smola.no":true,"xn--smla-hra.no":true,"snillfjord.no":true,"snasa.no":true,"xn--snsa-roa.no":true,"snoasa.no":true,"snaase.no":true,"xn--snase-nra.no":true,"sogndal.no":true,"sokndal.no":true,"sola.no":true,"solund.no":true,"songdalen.no":true,"sortland.no":true,"spydeberg.no":true,"stange.no":true,"stavanger.no":true,"steigen.no":true,"steinkjer.no":true,"stjordal.no":true,"xn--stjrdal-s1a.no":true,"stokke.no":true,"stor-elvdal.no":true,"stord.no":true,"stordal.no":true,"storfjord.no":true,"omasvuotna.no":true,"strand.no":true,"stranda.no":true,"stryn.no":true,"sula.no":true,"suldal.no":true,"sund.no":true,"sunndal.no":true,"surnadal.no":true,"sveio.no":true,"svelvik.no":true,"sykkylven.no":true,"sogne.no":true,"xn--sgne-gra.no":true,"somna.no":true,"xn--smna-gra.no":true,"sondre-land.no":true,"xn--sndre-land-0cb.no":true,"sor-aurdal.no":true,"xn--sr-aurdal-l8a.no":true,"sor-fron.no":true,"xn--sr-fron-q1a.no":true,"sor-odal.no":true,"xn--sr-odal-q1a.no":true,"sor-varanger.no":true,"xn--sr-varanger-ggb.no":true,"matta-varjjat.no":true,"xn--mtta-vrjjat-k7af.no":true,"sorfold.no":true,"xn--srfold-bya.no":true,"sorreisa.no":true,"xn--srreisa-q1a.no":true,"sorum.no":true,"xn--srum-gra.no":true,"tana.no":true,"deatnu.no":true,"time.no":true,"tingvoll.no":true,"tinn.no":true,"tjeldsund.no":true,"dielddanuorri.no":true,"tjome.no":true,"xn--tjme-hra.no":true,"tokke.no":true,"tolga.no":true,"torsken.no":true,"tranoy.no":true,"xn--trany-yua.no":true,"tromso.no":true,"xn--troms-zua.no":true,"tromsa.no":true,"romsa.no":true,"trondheim.no":true,"troandin.no":true,"trysil.no":true,"trana.no":true,"xn--trna-woa.no":true,"trogstad.no":true,"xn--trgstad-r1a.no":true,"tvedestrand.no":true,"tydal.no":true,"tynset.no":true,"tysfjord.no":true,"divtasvuodna.no":true,"divttasvuotna.no":true,"tysnes.no":true,"tysvar.no":true,"xn--tysvr-vra.no":true,"tonsberg.no":true,"xn--tnsberg-q1a.no":true,"ullensaker.no":true,"ullensvang.no":true,"ulvik.no":true,"utsira.no":true,"vadso.no":true,"xn--vads-jra.no":true,"cahcesuolo.no":true,"xn--hcesuolo-7ya35b.no":true,"vaksdal.no":true,"valle.no":true,"vang.no":true,"vanylven.no":true,"vardo.no":true,"xn--vard-jra.no":true,"varggat.no":true,"xn--vrggt-xqad.no":true,"vefsn.no":true,"vaapste.no":true,"vega.no":true,"vegarshei.no":true,"xn--vegrshei-c0a.no":true,"vennesla.no":true,"verdal.no":true,"verran.no":true,"vestby.no":true,"vestnes.no":true,"vestre-slidre.no":true,"vestre-toten.no":true,"vestvagoy.no":true,"xn--vestvgy-ixa6o.no":true,"vevelstad.no":true,"vik.no":true,"vikna.no":true,"vindafjord.no":true,"volda.no":true,"voss.no":true,"varoy.no":true,"xn--vry-yla5g.no":true,"vagan.no":true,"xn--vgan-qoa.no":true,"voagat.no":true,"vagsoy.no":true,"xn--vgsy-qoa0j.no":true,"vaga.no":true,"xn--vg-yiab.no":true,"valer.ostfold.no":true,"xn--vler-qoa.xn--stfold-9xa.no":true,"valer.hedmark.no":true,"xn--vler-qoa.hedmark.no":true,"*.np":true,"nr":true,"biz.nr":true,"info.nr":true,"gov.nr":true,"edu.nr":true,"org.nr":true,"net.nr":true,"com.nr":true,"nu":true,"nz":true,"ac.nz":true,"co.nz":true,"cri.nz":true,"geek.nz":true,"gen.nz":true,"govt.nz":true,"health.nz":true,"iwi.nz":true,"kiwi.nz":true,"maori.nz":true,"mil.nz":true,"xn--mori-qsa.nz":true,"net.nz":true,"org.nz":true,"parliament.nz":true,"school.nz":true,"om":true,"co.om":true,"com.om":true,"edu.om":true,"gov.om":true,"med.om":true,"museum.om":true,"net.om":true,"org.om":true,"pro.om":true,"org":true,"pa":true,"ac.pa":true,"gob.pa":true,"com.pa":true,"org.pa":true,"sld.pa":true,"edu.pa":true,"net.pa":true,"ing.pa":true,"abo.pa":true,"med.pa":true,"nom.pa":true,"pe":true,"edu.pe":true,"gob.pe":true,"nom.pe":true,"mil.pe":true,"org.pe":true,"com.pe":true,"net.pe":true,"pf":true,"com.pf":true,"org.pf":true,"edu.pf":true,"*.pg":true,"ph":true,"com.ph":true,"net.ph":true,"org.ph":true,"gov.ph":true,"edu.ph":true,"ngo.ph":true,"mil.ph":true,"i.ph":true,"pk":true,"com.pk":true,"net.pk":true,"edu.pk":true,"org.pk":true,"fam.pk":true,"biz.pk":true,"web.pk":true,"gov.pk":true,"gob.pk":true,"gok.pk":true,"gon.pk":true,"gop.pk":true,"gos.pk":true,"info.pk":true,"pl":true,"com.pl":true,"net.pl":true,"org.pl":true,"info.pl":true,"waw.pl":true,"gov.pl":true,"aid.pl":true,"agro.pl":true,"atm.pl":true,"auto.pl":true,"biz.pl":true,"edu.pl":true,"gmina.pl":true,"gsm.pl":true,"mail.pl":true,"miasta.pl":true,"media.pl":true,"mil.pl":true,"nieruchomosci.pl":true,"nom.pl":true,"pc.pl":true,"powiat.pl":true,"priv.pl":true,"realestate.pl":true,"rel.pl":true,"sex.pl":true,"shop.pl":true,"sklep.pl":true,"sos.pl":true,"szkola.pl":true,"targi.pl":true,"tm.pl":true,"tourism.pl":true,"travel.pl":true,"turystyka.pl":true,"uw.gov.pl":true,"um.gov.pl":true,"ug.gov.pl":true,"upow.gov.pl":true,"starostwo.gov.pl":true,"so.gov.pl":true,"sr.gov.pl":true,"po.gov.pl":true,"pa.gov.pl":true,"augustow.pl":true,"babia-gora.pl":true,"bedzin.pl":true,"beskidy.pl":true,"bialowieza.pl":true,"bialystok.pl":true,"bielawa.pl":true,"bieszczady.pl":true,"boleslawiec.pl":true,"bydgoszcz.pl":true,"bytom.pl":true,"cieszyn.pl":true,"czeladz.pl":true,"czest.pl":true,"dlugoleka.pl":true,"elblag.pl":true,"elk.pl":true,"glogow.pl":true,"gniezno.pl":true,"gorlice.pl":true,"grajewo.pl":true,"ilawa.pl":true,"jaworzno.pl":true,"jelenia-gora.pl":true,"jgora.pl":true,"kalisz.pl":true,"kazimierz-dolny.pl":true,"karpacz.pl":true,"kartuzy.pl":true,"kaszuby.pl":true,"katowice.pl":true,"kepno.pl":true,"ketrzyn.pl":true,"klodzko.pl":true,"kobierzyce.pl":true,"kolobrzeg.pl":true,"konin.pl":true,"konskowola.pl":true,"kutno.pl":true,"lapy.pl":true,"lebork.pl":true,"legnica.pl":true,"lezajsk.pl":true,"limanowa.pl":true,"lomza.pl":true,"lowicz.pl":true,"lubin.pl":true,"lukow.pl":true,"malbork.pl":true,"malopolska.pl":true,"mazowsze.pl":true,"mazury.pl":true,"mielec.pl":true,"mielno.pl":true,"mragowo.pl":true,"naklo.pl":true,"nowaruda.pl":true,"nysa.pl":true,"olawa.pl":true,"olecko.pl":true,"olkusz.pl":true,"olsztyn.pl":true,"opoczno.pl":true,"opole.pl":true,"ostroda.pl":true,"ostroleka.pl":true,"ostrowiec.pl":true,"ostrowwlkp.pl":true,"pila.pl":true,"pisz.pl":true,"podhale.pl":true,"podlasie.pl":true,"polkowice.pl":true,"pomorze.pl":true,"pomorskie.pl":true,"prochowice.pl":true,"pruszkow.pl":true,"przeworsk.pl":true,"pulawy.pl":true,"radom.pl":true,"rawa-maz.pl":true,"rybnik.pl":true,"rzeszow.pl":true,"sanok.pl":true,"sejny.pl":true,"slask.pl":true,"slupsk.pl":true,"sosnowiec.pl":true,"stalowa-wola.pl":true,"skoczow.pl":true,"starachowice.pl":true,"stargard.pl":true,"suwalki.pl":true,"swidnica.pl":true,"swiebodzin.pl":true,"swinoujscie.pl":true,"szczecin.pl":true,"szczytno.pl":true,"tarnobrzeg.pl":true,"tgory.pl":true,"turek.pl":true,"tychy.pl":true,"ustka.pl":true,"walbrzych.pl":true,"warmia.pl":true,"warszawa.pl":true,"wegrow.pl":true,"wielun.pl":true,"wlocl.pl":true,"wloclawek.pl":true,"wodzislaw.pl":true,"wolomin.pl":true,"wroclaw.pl":true,"zachpomor.pl":true,"zagan.pl":true,"zarow.pl":true,"zgora.pl":true,"zgorzelec.pl":true,"pm":true,"pn":true,"gov.pn":true,"co.pn":true,"org.pn":true,"edu.pn":true,"net.pn":true,"post":true,"pr":true,"com.pr":true,"net.pr":true,"org.pr":true,"gov.pr":true,"edu.pr":true,"isla.pr":true,"pro.pr":true,"biz.pr":true,"info.pr":true,"name.pr":true,"est.pr":true,"prof.pr":true,"ac.pr":true,"pro":true,"aca.pro":true,"bar.pro":true,"cpa.pro":true,"jur.pro":true,"law.pro":true,"med.pro":true,"eng.pro":true,"ps":true,"edu.ps":true,"gov.ps":true,"sec.ps":true,"plo.ps":true,"com.ps":true,"org.ps":true,"net.ps":true,"pt":true,"net.pt":true,"gov.pt":true,"org.pt":true,"edu.pt":true,"int.pt":true,"publ.pt":true,"com.pt":true,"nome.pt":true,"pw":true,"co.pw":true,"ne.pw":true,"or.pw":true,"ed.pw":true,"go.pw":true,"belau.pw":true,"py":true,"com.py":true,"coop.py":true,"edu.py":true,"gov.py":true,"mil.py":true,"net.py":true,"org.py":true,"qa":true,"com.qa":true,"edu.qa":true,"gov.qa":true,"mil.qa":true,"name.qa":true,"net.qa":true,"org.qa":true,"sch.qa":true,"re":true,"com.re":true,"asso.re":true,"nom.re":true,"ro":true,"com.ro":true,"org.ro":true,"tm.ro":true,"nt.ro":true,"nom.ro":true,"info.ro":true,"rec.ro":true,"arts.ro":true,"firm.ro":true,"store.ro":true,"www.ro":true,"rs":true,"co.rs":true,"org.rs":true,"edu.rs":true,"ac.rs":true,"gov.rs":true,"in.rs":true,"ru":true,"ac.ru":true,"com.ru":true,"edu.ru":true,"int.ru":true,"net.ru":true,"org.ru":true,"pp.ru":true,"adygeya.ru":true,"altai.ru":true,"amur.ru":true,"arkhangelsk.ru":true,"astrakhan.ru":true,"bashkiria.ru":true,"belgorod.ru":true,"bir.ru":true,"bryansk.ru":true,"buryatia.ru":true,"cbg.ru":true,"chel.ru":true,"chelyabinsk.ru":true,"chita.ru":true,"chukotka.ru":true,"chuvashia.ru":true,"dagestan.ru":true,"dudinka.ru":true,"e-burg.ru":true,"grozny.ru":true,"irkutsk.ru":true,"ivanovo.ru":true,"izhevsk.ru":true,"jar.ru":true,"joshkar-ola.ru":true,"kalmykia.ru":true,"kaluga.ru":true,"kamchatka.ru":true,"karelia.ru":true,"kazan.ru":true,"kchr.ru":true,"kemerovo.ru":true,"khabarovsk.ru":true,"khakassia.ru":true,"khv.ru":true,"kirov.ru":true,"koenig.ru":true,"komi.ru":true,"kostroma.ru":true,"krasnoyarsk.ru":true,"kuban.ru":true,"kurgan.ru":true,"kursk.ru":true,"lipetsk.ru":true,"magadan.ru":true,"mari.ru":true,"mari-el.ru":true,"marine.ru":true,"mordovia.ru":true,"msk.ru":true,"murmansk.ru":true,"nalchik.ru":true,"nnov.ru":true,"nov.ru":true,"novosibirsk.ru":true,"nsk.ru":true,"omsk.ru":true,"orenburg.ru":true,"oryol.ru":true,"palana.ru":true,"penza.ru":true,"perm.ru":true,"ptz.ru":true,"rnd.ru":true,"ryazan.ru":true,"sakhalin.ru":true,"samara.ru":true,"saratov.ru":true,"simbirsk.ru":true,"smolensk.ru":true,"spb.ru":true,"stavropol.ru":true,"stv.ru":true,"surgut.ru":true,"tambov.ru":true,"tatarstan.ru":true,"tom.ru":true,"tomsk.ru":true,"tsaritsyn.ru":true,"tsk.ru":true,"tula.ru":true,"tuva.ru":true,"tver.ru":true,"tyumen.ru":true,"udm.ru":true,"udmurtia.ru":true,"ulan-ude.ru":true,"vladikavkaz.ru":true,"vladimir.ru":true,"vladivostok.ru":true,"volgograd.ru":true,"vologda.ru":true,"voronezh.ru":true,"vrn.ru":true,"vyatka.ru":true,"yakutia.ru":true,"yamal.ru":true,"yaroslavl.ru":true,"yekaterinburg.ru":true,"yuzhno-sakhalinsk.ru":true,"amursk.ru":true,"baikal.ru":true,"cmw.ru":true,"fareast.ru":true,"jamal.ru":true,"kms.ru":true,"k-uralsk.ru":true,"kustanai.ru":true,"kuzbass.ru":true,"magnitka.ru":true,"mytis.ru":true,"nakhodka.ru":true,"nkz.ru":true,"norilsk.ru":true,"oskol.ru":true,"pyatigorsk.ru":true,"rubtsovsk.ru":true,"snz.ru":true,"syzran.ru":true,"vdonsk.ru":true,"zgrad.ru":true,"gov.ru":true,"mil.ru":true,"test.ru":true,"rw":true,"gov.rw":true,"net.rw":true,"edu.rw":true,"ac.rw":true,"com.rw":true,"co.rw":true,"int.rw":true,"mil.rw":true,"gouv.rw":true,"sa":true,"com.sa":true,"net.sa":true,"org.sa":true,"gov.sa":true,"med.sa":true,"pub.sa":true,"edu.sa":true,"sch.sa":true,"sb":true,"com.sb":true,"edu.sb":true,"gov.sb":true,"net.sb":true,"org.sb":true,"sc":true,"com.sc":true,"gov.sc":true,"net.sc":true,"org.sc":true,"edu.sc":true,"sd":true,"com.sd":true,"net.sd":true,"org.sd":true,"edu.sd":true,"med.sd":true,"tv.sd":true,"gov.sd":true,"info.sd":true,"se":true,"a.se":true,"ac.se":true,"b.se":true,"bd.se":true,"brand.se":true,"c.se":true,"d.se":true,"e.se":true,"f.se":true,"fh.se":true,"fhsk.se":true,"fhv.se":true,"g.se":true,"h.se":true,"i.se":true,"k.se":true,"komforb.se":true,"kommunalforbund.se":true,"komvux.se":true,"l.se":true,"lanbib.se":true,"m.se":true,"n.se":true,"naturbruksgymn.se":true,"o.se":true,"org.se":true,"p.se":true,"parti.se":true,"pp.se":true,"press.se":true,"r.se":true,"s.se":true,"t.se":true,"tm.se":true,"u.se":true,"w.se":true,"x.se":true,"y.se":true,"z.se":true,"sg":true,"com.sg":true,"net.sg":true,"org.sg":true,"gov.sg":true,"edu.sg":true,"per.sg":true,"sh":true,"com.sh":true,"net.sh":true,"gov.sh":true,"org.sh":true,"mil.sh":true,"si":true,"sj":true,"sk":true,"sl":true,"com.sl":true,"net.sl":true,"edu.sl":true,"gov.sl":true,"org.sl":true,"sm":true,"sn":true,"art.sn":true,"com.sn":true,"edu.sn":true,"gouv.sn":true,"org.sn":true,"perso.sn":true,"univ.sn":true,"so":true,"com.so":true,"net.so":true,"org.so":true,"sr":true,"st":true,"co.st":true,"com.st":true,"consulado.st":true,"edu.st":true,"embaixada.st":true,"gov.st":true,"mil.st":true,"net.st":true,"org.st":true,"principe.st":true,"saotome.st":true,"store.st":true,"su":true,"adygeya.su":true,"arkhangelsk.su":true,"balashov.su":true,"bashkiria.su":true,"bryansk.su":true,"dagestan.su":true,"grozny.su":true,"ivanovo.su":true,"kalmykia.su":true,"kaluga.su":true,"karelia.su":true,"khakassia.su":true,"krasnodar.su":true,"kurgan.su":true,"lenug.su":true,"mordovia.su":true,"msk.su":true,"murmansk.su":true,"nalchik.su":true,"nov.su":true,"obninsk.su":true,"penza.su":true,"pokrovsk.su":true,"sochi.su":true,"spb.su":true,"togliatti.su":true,"troitsk.su":true,"tula.su":true,"tuva.su":true,"vladikavkaz.su":true,"vladimir.su":true,"vologda.su":true,"sv":true,"com.sv":true,"edu.sv":true,"gob.sv":true,"org.sv":true,"red.sv":true,"sx":true,"gov.sx":true,"sy":true,"edu.sy":true,"gov.sy":true,"net.sy":true,"mil.sy":true,"com.sy":true,"org.sy":true,"sz":true,"co.sz":true,"ac.sz":true,"org.sz":true,"tc":true,"td":true,"tel":true,"tf":true,"tg":true,"th":true,"ac.th":true,"co.th":true,"go.th":true,"in.th":true,"mi.th":true,"net.th":true,"or.th":true,"tj":true,"ac.tj":true,"biz.tj":true,"co.tj":true,"com.tj":true,"edu.tj":true,"go.tj":true,"gov.tj":true,"int.tj":true,"mil.tj":true,"name.tj":true,"net.tj":true,"nic.tj":true,"org.tj":true,"test.tj":true,"web.tj":true,"tk":true,"tl":true,"gov.tl":true,"tm":true,"com.tm":true,"co.tm":true,"org.tm":true,"net.tm":true,"nom.tm":true,"gov.tm":true,"mil.tm":true,"edu.tm":true,"tn":true,"com.tn":true,"ens.tn":true,"fin.tn":true,"gov.tn":true,"ind.tn":true,"intl.tn":true,"nat.tn":true,"net.tn":true,"org.tn":true,"info.tn":true,"perso.tn":true,"tourism.tn":true,"edunet.tn":true,"rnrt.tn":true,"rns.tn":true,"rnu.tn":true,"mincom.tn":true,"agrinet.tn":true,"defense.tn":true,"turen.tn":true,"to":true,"com.to":true,"gov.to":true,"net.to":true,"org.to":true,"edu.to":true,"mil.to":true,"tp":true,"tr":true,"com.tr":true,"info.tr":true,"biz.tr":true,"net.tr":true,"org.tr":true,"web.tr":true,"gen.tr":true,"tv.tr":true,"av.tr":true,"dr.tr":true,"bbs.tr":true,"name.tr":true,"tel.tr":true,"gov.tr":true,"bel.tr":true,"pol.tr":true,"mil.tr":true,"k12.tr":true,"edu.tr":true,"kep.tr":true,"nc.tr":true,"gov.nc.tr":true,"travel":true,"tt":true,"co.tt":true,"com.tt":true,"org.tt":true,"net.tt":true,"biz.tt":true,"info.tt":true,"pro.tt":true,"int.tt":true,"coop.tt":true,"jobs.tt":true,"mobi.tt":true,"travel.tt":true,"museum.tt":true,"aero.tt":true,"name.tt":true,"gov.tt":true,"edu.tt":true,"tv":true,"tw":true,"edu.tw":true,"gov.tw":true,"mil.tw":true,"com.tw":true,"net.tw":true,"org.tw":true,"idv.tw":true,"game.tw":true,"ebiz.tw":true,"club.tw":true,"xn--zf0ao64a.tw":true,"xn--uc0atv.tw":true,"xn--czrw28b.tw":true,"tz":true,"ac.tz":true,"co.tz":true,"go.tz":true,"hotel.tz":true,"info.tz":true,"me.tz":true,"mil.tz":true,"mobi.tz":true,"ne.tz":true,"or.tz":true,"sc.tz":true,"tv.tz":true,"ua":true,"com.ua":true,"edu.ua":true,"gov.ua":true,"in.ua":true,"net.ua":true,"org.ua":true,"cherkassy.ua":true,"cherkasy.ua":true,"chernigov.ua":true,"chernihiv.ua":true,"chernivtsi.ua":true,"chernovtsy.ua":true,"ck.ua":true,"cn.ua":true,"cr.ua":true,"crimea.ua":true,"cv.ua":true,"dn.ua":true,"dnepropetrovsk.ua":true,"dnipropetrovsk.ua":true,"dominic.ua":true,"donetsk.ua":true,"dp.ua":true,"if.ua":true,"ivano-frankivsk.ua":true,"kh.ua":true,"kharkiv.ua":true,"kharkov.ua":true,"kherson.ua":true,"khmelnitskiy.ua":true,"khmelnytskyi.ua":true,"kiev.ua":true,"kirovograd.ua":true,"km.ua":true,"kr.ua":true,"krym.ua":true,"ks.ua":true,"kv.ua":true,"kyiv.ua":true,"lg.ua":true,"lt.ua":true,"lugansk.ua":true,"lutsk.ua":true,"lv.ua":true,"lviv.ua":true,"mk.ua":true,"mykolaiv.ua":true,"nikolaev.ua":true,"od.ua":true,"odesa.ua":true,"odessa.ua":true,"pl.ua":true,"poltava.ua":true,"rivne.ua":true,"rovno.ua":true,"rv.ua":true,"sb.ua":true,"sebastopol.ua":true,"sevastopol.ua":true,"sm.ua":true,"sumy.ua":true,"te.ua":true,"ternopil.ua":true,"uz.ua":true,"uzhgorod.ua":true,"vinnica.ua":true,"vinnytsia.ua":true,"vn.ua":true,"volyn.ua":true,"yalta.ua":true,"zaporizhzhe.ua":true,"zaporizhzhia.ua":true,"zhitomir.ua":true,"zhytomyr.ua":true,"zp.ua":true,"zt.ua":true,"co.ua":true,"pp.ua":true,"ug":true,"co.ug":true,"or.ug":true,"ac.ug":true,"sc.ug":true,"go.ug":true,"ne.ug":true,"com.ug":true,"org.ug":true,"uk":true,"ac.uk":true,"co.uk":true,"gov.uk":true,"ltd.uk":true,"me.uk":true,"net.uk":true,"nhs.uk":true,"org.uk":true,"plc.uk":true,"police.uk":true,"*.sch.uk":true,"us":true,"dni.us":true,"fed.us":true,"isa.us":true,"kids.us":true,"nsn.us":true,"ak.us":true,"al.us":true,"ar.us":true,"as.us":true,"az.us":true,"ca.us":true,"co.us":true,"ct.us":true,"dc.us":true,"de.us":true,"fl.us":true,"ga.us":true,"gu.us":true,"hi.us":true,"ia.us":true,"id.us":true,"il.us":true,"in.us":true,"ks.us":true,"ky.us":true,"la.us":true,"ma.us":true,"md.us":true,"me.us":true,"mi.us":true,"mn.us":true,"mo.us":true,"ms.us":true,"mt.us":true,"nc.us":true,"nd.us":true,"ne.us":true,"nh.us":true,"nj.us":true,"nm.us":true,"nv.us":true,"ny.us":true,"oh.us":true,"ok.us":true,"or.us":true,"pa.us":true,"pr.us":true,"ri.us":true,"sc.us":true,"sd.us":true,"tn.us":true,"tx.us":true,"ut.us":true,"vi.us":true,"vt.us":true,"va.us":true,"wa.us":true,"wi.us":true,"wv.us":true,"wy.us":true,"k12.ak.us":true,"k12.al.us":true,"k12.ar.us":true,"k12.as.us":true,"k12.az.us":true,"k12.ca.us":true,"k12.co.us":true,"k12.ct.us":true,"k12.dc.us":true,"k12.de.us":true,"k12.fl.us":true,"k12.ga.us":true,"k12.gu.us":true,"k12.ia.us":true,"k12.id.us":true,"k12.il.us":true,"k12.in.us":true,"k12.ks.us":true,"k12.ky.us":true,"k12.la.us":true,"k12.ma.us":true,"k12.md.us":true,"k12.me.us":true,"k12.mi.us":true,"k12.mn.us":true,"k12.mo.us":true,"k12.ms.us":true,"k12.mt.us":true,"k12.nc.us":true,"k12.ne.us":true,"k12.nh.us":true,"k12.nj.us":true,"k12.nm.us":true,"k12.nv.us":true,"k12.ny.us":true,"k12.oh.us":true,"k12.ok.us":true,"k12.or.us":true,"k12.pa.us":true,"k12.pr.us":true,"k12.ri.us":true,"k12.sc.us":true,"k12.tn.us":true,"k12.tx.us":true,"k12.ut.us":true,"k12.vi.us":true,"k12.vt.us":true,"k12.va.us":true,"k12.wa.us":true,"k12.wi.us":true,"k12.wy.us":true,"cc.ak.us":true,"cc.al.us":true,"cc.ar.us":true,"cc.as.us":true,"cc.az.us":true,"cc.ca.us":true,"cc.co.us":true,"cc.ct.us":true,"cc.dc.us":true,"cc.de.us":true,"cc.fl.us":true,"cc.ga.us":true,"cc.gu.us":true,"cc.hi.us":true,"cc.ia.us":true,"cc.id.us":true,"cc.il.us":true,"cc.in.us":true,"cc.ks.us":true,"cc.ky.us":true,"cc.la.us":true,"cc.ma.us":true,"cc.md.us":true,"cc.me.us":true,"cc.mi.us":true,"cc.mn.us":true,"cc.mo.us":true,"cc.ms.us":true,"cc.mt.us":true,"cc.nc.us":true,"cc.nd.us":true,"cc.ne.us":true,"cc.nh.us":true,"cc.nj.us":true,"cc.nm.us":true,"cc.nv.us":true,"cc.ny.us":true,"cc.oh.us":true,"cc.ok.us":true,"cc.or.us":true,"cc.pa.us":true,"cc.pr.us":true,"cc.ri.us":true,"cc.sc.us":true,"cc.sd.us":true,"cc.tn.us":true,"cc.tx.us":true,"cc.ut.us":true,"cc.vi.us":true,"cc.vt.us":true,"cc.va.us":true,"cc.wa.us":true,"cc.wi.us":true,"cc.wv.us":true,"cc.wy.us":true,"lib.ak.us":true,"lib.al.us":true,"lib.ar.us":true,"lib.as.us":true,"lib.az.us":true,"lib.ca.us":true,"lib.co.us":true,"lib.ct.us":true,"lib.dc.us":true,"lib.de.us":true,"lib.fl.us":true,"lib.ga.us":true,"lib.gu.us":true,"lib.hi.us":true,"lib.ia.us":true,"lib.id.us":true,"lib.il.us":true,"lib.in.us":true,"lib.ks.us":true,"lib.ky.us":true,"lib.la.us":true,"lib.ma.us":true,"lib.md.us":true,"lib.me.us":true,"lib.mi.us":true,"lib.mn.us":true,"lib.mo.us":true,"lib.ms.us":true,"lib.mt.us":true,"lib.nc.us":true,"lib.nd.us":true,"lib.ne.us":true,"lib.nh.us":true,"lib.nj.us":true,"lib.nm.us":true,"lib.nv.us":true,"lib.ny.us":true,"lib.oh.us":true,"lib.ok.us":true,"lib.or.us":true,"lib.pa.us":true,"lib.pr.us":true,"lib.ri.us":true,"lib.sc.us":true,"lib.sd.us":true,"lib.tn.us":true,"lib.tx.us":true,"lib.ut.us":true,"lib.vi.us":true,"lib.vt.us":true,"lib.va.us":true,"lib.wa.us":true,"lib.wi.us":true,"lib.wy.us":true,"pvt.k12.ma.us":true,"chtr.k12.ma.us":true,"paroch.k12.ma.us":true,"uy":true,"com.uy":true,"edu.uy":true,"gub.uy":true,"mil.uy":true,"net.uy":true,"org.uy":true,"uz":true,"co.uz":true,"com.uz":true,"net.uz":true,"org.uz":true,"va":true,"vc":true,"com.vc":true,"net.vc":true,"org.vc":true,"gov.vc":true,"mil.vc":true,"edu.vc":true,"ve":true,"arts.ve":true,"co.ve":true,"com.ve":true,"e12.ve":true,"edu.ve":true,"firm.ve":true,"gob.ve":true,"gov.ve":true,"info.ve":true,"int.ve":true,"mil.ve":true,"net.ve":true,"org.ve":true,"rec.ve":true,"store.ve":true,"tec.ve":true,"web.ve":true,"vg":true,"vi":true,"co.vi":true,"com.vi":true,"k12.vi":true,"net.vi":true,"org.vi":true,"vn":true,"com.vn":true,"net.vn":true,"org.vn":true,"edu.vn":true,"gov.vn":true,"int.vn":true,"ac.vn":true,"biz.vn":true,"info.vn":true,"name.vn":true,"pro.vn":true,"health.vn":true,"vu":true,"com.vu":true,"edu.vu":true,"net.vu":true,"org.vu":true,"wf":true,"ws":true,"com.ws":true,"net.ws":true,"org.ws":true,"gov.ws":true,"edu.ws":true,"yt":true,"xn--mgbaam7a8h":true,"xn--54b7fta0cc":true,"xn--fiqs8s":true,"xn--fiqz9s":true,"xn--lgbbat1ad8j":true,"xn--wgbh1c":true,"xn--node":true,"xn--j6w193g":true,"xn--h2brj9c":true,"xn--mgbbh1a71e":true,"xn--fpcrj9c3d":true,"xn--gecrj9c":true,"xn--s9brj9c":true,"xn--45brj9c":true,"xn--xkc2dl3a5ee0h":true,"xn--mgba3a4f16a":true,"xn--mgba3a4fra":true,"xn--mgbayh7gpa":true,"xn--3e0b707e":true,"xn--80ao21a":true,"xn--fzc2c9e2c":true,"xn--xkc2al3hye2a":true,"xn--mgbc0a9azcg":true,"xn--l1acc":true,"xn--mgbx4cd0ab":true,"xn--mgb9awbf":true,"xn--ygbi2ammx":true,"xn--90a3ac":true,"xn--o1ac.xn--90a3ac":true,"xn--c1avg.xn--90a3ac":true,"xn--90azh.xn--90a3ac":true,"xn--d1at.xn--90a3ac":true,"xn--o1ach.xn--90a3ac":true,"xn--80au.xn--90a3ac":true,"xn--p1ai":true,"xn--wgbl6a":true,"xn--mgberp4a5d4ar":true,"xn--mgberp4a5d4a87g":true,"xn--mgbqly7c0a67fbc":true,"xn--mgbqly7cvafr":true,"xn--ogbpf8fl":true,"xn--mgbtf8fl":true,"xn--yfro4i67o":true,"xn--clchc0ea0b2g2a9gcd":true,"xn--o3cw4h":true,"xn--pgbs0dh":true,"xn--kpry57d":true,"xn--kprw13d":true,"xn--nnx388a":true,"xn--j1amh":true,"xn--mgb2ddes":true,"xxx":true,"*.ye":true,"*.za":true,"*.zm":true,"*.zw":true,"aaa":true,"abb":true,"abbott":true,"abogado":true,"academy":true,"accenture":true,"accountant":true,"accountants":true,"aco":true,"active":true,"actor":true,"ads":true,"adult":true,"aeg":true,"afl":true,"africa":true,"africamagic":true,"agency":true,"aig":true,"airforce":true,"airtel":true,"alibaba":true,"alipay":true,"allfinanz":true,"alsace":true,"amsterdam":true,"analytics":true,"android":true,"anquan":true,"apartments":true,"aquarelle":true,"aramco":true,"archi":true,"army":true,"arte":true,"associates":true,"attorney":true,"auction":true,"audio":true,"author":true,"auto":true,"autos":true,"avianca":true,"axa":true,"azure":true,"baidu":true,"band":true,"bank":true,"bar":true,"barcelona":true,"barclaycard":true,"barclays":true,"bargains":true,"bauhaus":true,"bayern":true,"bbc":true,"bbva":true,"bcg":true,"bcn":true,"beer":true,"bentley":true,"berlin":true,"best":true,"bharti":true,"bible":true,"bid":true,"bike":true,"bing":true,"bingo":true,"bio":true,"black":true,"blackfriday":true,"bloomberg":true,"blue":true,"bms":true,"bmw":true,"bnl":true,"bnpparibas":true,"boats":true,"bom":true,"bond":true,"boo":true,"boots":true,"bot":true,"boutique":true,"bradesco":true,"bridgestone":true,"broadway":true,"broker":true,"brother":true,"brussels":true,"budapest":true,"build":true,"builders":true,"business":true,"buy":true,"buzz":true,"bzh":true,"cab":true,"cafe":true,"cal":true,"call":true,"camera":true,"camp":true,"cancerresearch":true,"canon":true,"capetown":true,"capital":true,"car":true,"caravan":true,"cards":true,"care":true,"career":true,"careers":true,"cars":true,"cartier":true,"casa":true,"cash":true,"casino":true,"catering":true,"cba":true,"cbn":true,"center":true,"ceo":true,"cern":true,"cfa":true,"cfd":true,"channel":true,"chat":true,"cheap":true,"chloe":true,"christmas":true,"chrome":true,"church":true,"cipriani":true,"circle":true,"cisco":true,"citic":true,"city":true,"cityeats":true,"claims":true,"cleaning":true,"click":true,"clinic":true,"clothing":true,"club":true,"coach":true,"codes":true,"coffee":true,"college":true,"cologne":true,"commbank":true,"community":true,"company":true,"computer":true,"comsec":true,"condos":true,"construction":true,"consulting":true,"contact":true,"contractors":true,"cooking":true,"cool":true,"corsica":true,"country":true,"coupon":true,"coupons":true,"courses":true,"credit":true,"creditcard":true,"creditunion":true,"cricket":true,"crown":true,"crs":true,"cruises":true,"csc":true,"cuisinella":true,"cymru":true,"cyou":true,"dabur":true,"dad":true,"dance":true,"date":true,"dating":true,"datsun":true,"day":true,"dclk":true,"dealer":true,"deals":true,"degree":true,"delivery":true,"dell":true,"delta":true,"democrat":true,"dental":true,"dentist":true,"desi":true,"design":true,"dev":true,"diamonds":true,"diet":true,"digital":true,"direct":true,"directory":true,"discount":true,"dnp":true,"docs":true,"dog":true,"doha":true,"domains":true,"doosan":true,"download":true,"drive":true,"dstv":true,"dubai":true,"durban":true,"dvag":true,"earth":true,"eat":true,"edeka":true,"education":true,"email":true,"emerck":true,"energy":true,"engineer":true,"engineering":true,"enterprises":true,"epson":true,"equipment":true,"erni":true,"esq":true,"estate":true,"eurovision":true,"eus":true,"events":true,"everbank":true,"exchange":true,"expert":true,"exposed":true,"express":true,"fage":true,"fail":true,"fairwinds":true,"faith":true,"family":true,"fan":true,"fans":true,"farm":true,"fashion":true,"fast":true,"feedback":true,"ferrero":true,"film":true,"final":true,"finance":true,"financial":true,"firestone":true,"firmdale":true,"fish":true,"fishing":true,"fit":true,"fitness":true,"flickr":true,"flights":true,"florist":true,"flowers":true,"flsmidth":true,"fly":true,"foo":true,"football":true,"ford":true,"forex":true,"forsale":true,"forum":true,"foundation":true,"frl":true,"frogans":true,"frontier":true,"fund":true,"furniture":true,"futbol":true,"fyi":true,"gal":true,"gallery":true,"gallup":true,"garden":true,"gbiz":true,"gdn":true,"gea":true,"gent":true,"genting":true,"ggee":true,"gift":true,"gifts":true,"gives":true,"giving":true,"glass":true,"gle":true,"global":true,"globo":true,"gmail":true,"gmo":true,"gmx":true,"gold":true,"goldpoint":true,"golf":true,"goo":true,"goog":true,"google":true,"gop":true,"got":true,"gotv":true,"graphics":true,"gratis":true,"green":true,"gripe":true,"group":true,"gucci":true,"guge":true,"guide":true,"guitars":true,"guru":true,"hamburg":true,"hangout":true,"haus":true,"hdfcbank":true,"health":true,"healthcare":true,"help":true,"helsinki":true,"here":true,"hermes":true,"hiphop":true,"hitachi":true,"hiv":true,"hockey":true,"holdings":true,"holiday":true,"homedepot":true,"homes":true,"honda":true,"horse":true,"host":true,"hosting":true,"hoteles":true,"hotmail":true,"house":true,"how":true,"hsbc":true,"htc":true,"ibm":true,"icbc":true,"ice":true,"icu":true,"ifm":true,"iinet":true,"immo":true,"immobilien":true,"industries":true,"infiniti":true,"ing":true,"ink":true,"institute":true,"insurance":true,"insure":true,"international":true,"investments":true,"ipiranga":true,"irish":true,"iselect":true,"ist":true,"istanbul":true,"itau":true,"iwc":true,"jaguar":true,"java":true,"jcb":true,"jetzt":true,"jewelry":true,"jio":true,"jlc":true,"jll":true,"jmp":true,"joburg":true,"jot":true,"joy":true,"jprs":true,"juegos":true,"kaufen":true,"kddi":true,"kfh":true,"kim":true,"kinder":true,"kitchen":true,"kiwi":true,"koeln":true,"komatsu":true,"kpn":true,"krd":true,"kred":true,"kyknet":true,"kyoto":true,"lacaixa":true,"lancaster":true,"land":true,"landrover":true,"lasalle":true,"lat":true,"latrobe":true,"law":true,"lawyer":true,"lds":true,"lease":true,"leclerc":true,"legal":true,"lgbt":true,"liaison":true,"lidl":true,"life":true,"lifeinsurance":true,"lifestyle":true,"lighting":true,"like":true,"limited":true,"limo":true,"lincoln":true,"linde":true,"link":true,"live":true,"lixil":true,"loan":true,"loans":true,"lol":true,"london":true,"lotte":true,"lotto":true,"love":true,"ltd":true,"ltda":true,"lupin":true,"luxe":true,"luxury":true,"madrid":true,"maif":true,"maison":true,"makeup":true,"man":true,"management":true,"mango":true,"market":true,"marketing":true,"markets":true,"marriott":true,"mba":true,"media":true,"meet":true,"melbourne":true,"meme":true,"memorial":true,"men":true,"menu":true,"meo":true,"miami":true,"microsoft":true,"mini":true,"mma":true,"mnet":true,"mobily":true,"moda":true,"moe":true,"moi":true,"monash":true,"money":true,"montblanc":true,"mormon":true,"mortgage":true,"moscow":true,"motorcycles":true,"mov":true,"movie":true,"movistar":true,"mtn":true,"mtpc":true,"mtr":true,"multichoice":true,"mutual":true,"mzansimagic":true,"nadex":true,"nagoya":true,"naspers":true,"natura":true,"navy":true,"nec":true,"netbank":true,"network":true,"neustar":true,"new":true,"news":true,"nexus":true,"ngo":true,"nhk":true,"nico":true,"ninja":true,"nissan":true,"nokia":true,"norton":true,"nowruz":true,"nra":true,"nrw":true,"ntt":true,"nyc":true,"obi":true,"office":true,"okinawa":true,"omega":true,"one":true,"ong":true,"onl":true,"online":true,"ooo":true,"oracle":true,"orange":true,"organic":true,"orientexpress":true,"osaka":true,"otsuka":true,"ovh":true,"page":true,"pamperedchef":true,"panerai":true,"paris":true,"pars":true,"partners":true,"parts":true,"party":true,"passagens":true,"payu":true,"pharmacy":true,"philips":true,"photo":true,"photography":true,"photos":true,"physio":true,"piaget":true,"pics":true,"pictet":true,"pictures":true,"pid":true,"pin":true,"pink":true,"pizza":true,"place":true,"play":true,"plumbing":true,"plus":true,"pohl":true,"poker":true,"porn":true,"praxi":true,"press":true,"prod":true,"productions":true,"prof":true,"promo":true,"properties":true,"property":true,"pub":true,"qpon":true,"quebec":true,"quest":true,"racing":true,"read":true,"realtor":true,"realty":true,"recipes":true,"red":true,"redstone":true,"redumbrella":true,"rehab":true,"reise":true,"reisen":true,"reit":true,"reliance":true,"ren":true,"rent":true,"rentals":true,"repair":true,"report":true,"republican":true,"rest":true,"restaurant":true,"review":true,"reviews":true,"rich":true,"ricoh":true,"ril":true,"rio":true,"rip":true,"rocher":true,"rocks":true,"rodeo":true,"room":true,"rsvp":true,"ruhr":true,"run":true,"rwe":true,"ryukyu":true,"saarland":true,"safe":true,"safety":true,"sakura":true,"sale":true,"salon":true,"samsung":true,"sandvik":true,"sandvikcoromant":true,"sanofi":true,"sap":true,"sapo":true,"sarl":true,"sas":true,"saxo":true,"sbi":true,"sbs":true,"sca":true,"scb":true,"schmidt":true,"scholarships":true,"school":true,"schule":true,"schwarz":true,"science":true,"scor":true,"scot":true,"seat":true,"seek":true,"sener":true,"services":true,"sew":true,"sex":true,"sexy":true,"sharp":true,"shia":true,"shiksha":true,"shoes":true,"shouji":true,"show":true,"shriram":true,"sina":true,"singles":true,"site":true,"skin":true,"sky":true,"skype":true,"smile":true,"sncf":true,"soccer":true,"social":true,"software":true,"sohu":true,"solar":true,"solutions":true,"song":true,"sony":true,"soy":true,"space":true,"spiegel":true,"spot":true,"spreadbetting":true,"stada":true,"star":true,"starhub":true,"statebank":true,"statoil":true,"stc":true,"stcgroup":true,"stockholm":true,"storage":true,"studio":true,"study":true,"style":true,"sucks":true,"supersport":true,"supplies":true,"supply":true,"support":true,"surf":true,"surgery":true,"suzuki":true,"swatch":true,"swiss":true,"sydney":true,"symantec":true,"systems":true,"tab":true,"taipei":true,"taobao":true,"tatamotors":true,"tatar":true,"tattoo":true,"tax":true,"taxi":true,"tci":true,"team":true,"tech":true,"technology":true,"telecity":true,"telefonica":true,"temasek":true,"tennis":true,"thd":true,"theater":true,"tickets":true,"tienda":true,"tiffany":true,"tips":true,"tires":true,"tirol":true,"tmall":true,"today":true,"tokyo":true,"tools":true,"top":true,"toray":true,"toshiba":true,"tours":true,"town":true,"toys":true,"trade":true,"trading":true,"training":true,"travelers":true,"travelersinsurance":true,"trust":true,"trv":true,"tui":true,"tunes":true,"tushu":true,"tvs":true,"ubs":true,"university":true,"uno":true,"uol":true,"vacations":true,"vana":true,"vegas":true,"ventures":true,"versicherung":true,"vet":true,"viajes":true,"video":true,"viking":true,"villas":true,"vip":true,"virgin":true,"vision":true,"vista":true,"vistaprint":true,"viva":true,"vlaanderen":true,"vodka":true,"vote":true,"voting":true,"voto":true,"voyage":true,"vuelos":true,"wales":true,"walter":true,"wang":true,"wanggou":true,"watch":true,"watches":true,"weather":true,"weatherchannel":true,"webcam":true,"website":true,"wed":true,"wedding":true,"weibo":true,"weir":true,"whoswho":true,"wien":true,"wiki":true,"williamhill":true,"win":true,"windows":true,"wme":true,"work":true,"works":true,"world":true,"wtc":true,"wtf":true,"xbox":true,"xerox":true,"xihuan":true,"xin":true,"xn--11b4c3d":true,"xn--1ck2e1b":true,"xn--1qqw23a":true,"xn--30rr7y":true,"xn--3bst00m":true,"xn--3ds443g":true,"xn--3pxu8k":true,"xn--42c2d9a":true,"xn--45q11c":true,"xn--4gbrim":true,"xn--55qw42g":true,"xn--55qx5d":true,"xn--5tzm5g":true,"xn--6frz82g":true,"xn--6qq986b3xl":true,"xn--80adxhks":true,"xn--80asehdb":true,"xn--80aswg":true,"xn--8y0a063a":true,"xn--9dbq2a":true,"xn--9et52u":true,"xn--9krt00a":true,"xn--b4w605ferd":true,"xn--bck1b9a5dre4c":true,"xn--c1avg":true,"xn--c2br7g":true,"xn--cck2b3b":true,"xn--cg4bki":true,"xn--czr694b":true,"xn--czrs0t":true,"xn--czru2d":true,"xn--d1acj3b":true,"xn--eckvdtc9d":true,"xn--efvy88h":true,"xn--estv75g":true,"xn--fhbei":true,"xn--fiq228c5hs":true,"xn--fiq64b":true,"xn--fjq720a":true,"xn--flw351e":true,"xn--g2xx48c":true,"xn--gckr3f0f":true,"xn--hxt814e":true,"xn--i1b6b1a6a2e":true,"xn--imr513n":true,"xn--io0a7i":true,"xn--j1aef":true,"xn--jlq61u9w7b":true,"xn--jvr189m":true,"xn--kcrx77d1x4a":true,"xn--kpu716f":true,"xn--kput3i":true,"xn--mgba3a3ejt":true,"xn--mgbab2bd":true,"xn--mgbb9fbpob":true,"xn--mgbt3dhd":true,"xn--mk1bu44c":true,"xn--mxtq1m":true,"xn--ngbc5azd":true,"xn--ngbe9e0a":true,"xn--nqv7f":true,"xn--nqv7fs00ema":true,"xn--nyqy26a":true,"xn--p1acf":true,"xn--pbt977c":true,"xn--pssy2u":true,"xn--q9jyb4c":true,"xn--qcka1pmc":true,"xn--rhqv96g":true,"xn--rovu88b":true,"xn--ses554g":true,"xn--t60b56a":true,"xn--tckwe":true,"xn--unup4y":true,"xn--vermgensberater-ctb":true,"xn--vermgensberatung-pwb":true,"xn--vhquv":true,"xn--vuq861b":true,"xn--xhq521b":true,"xn--zfr164b":true,"xyz":true,"yachts":true,"yahoo":true,"yamaxun":true,"yandex":true,"yodobashi":true,"yoga":true,"yokohama":true,"youtube":true,"yun":true,"zara":true,"zero":true,"zip":true,"zone":true,"zuerich":true,"cloudfront.net":true,"ap-northeast-1.compute.amazonaws.com":true,"ap-southeast-1.compute.amazonaws.com":true,"ap-southeast-2.compute.amazonaws.com":true,"cn-north-1.compute.amazonaws.cn":true,"compute.amazonaws.cn":true,"compute.amazonaws.com":true,"compute-1.amazonaws.com":true,"eu-west-1.compute.amazonaws.com":true,"eu-central-1.compute.amazonaws.com":true,"sa-east-1.compute.amazonaws.com":true,"us-east-1.amazonaws.com":true,"us-gov-west-1.compute.amazonaws.com":true,"us-west-1.compute.amazonaws.com":true,"us-west-2.compute.amazonaws.com":true,"z-1.compute-1.amazonaws.com":true,"z-2.compute-1.amazonaws.com":true,"elasticbeanstalk.com":true,"elb.amazonaws.com":true,"s3.amazonaws.com":true,"s3-us-west-2.amazonaws.com":true,"s3-us-west-1.amazonaws.com":true,"s3-eu-west-1.amazonaws.com":true,"s3-ap-southeast-1.amazonaws.com":true,"s3-ap-southeast-2.amazonaws.com":true,"s3-ap-northeast-1.amazonaws.com":true,"s3-sa-east-1.amazonaws.com":true,"s3-us-gov-west-1.amazonaws.com":true,"s3-fips-us-gov-west-1.amazonaws.com":true,"s3-website-us-east-1.amazonaws.com":true,"s3-website-us-west-2.amazonaws.com":true,"s3-website-us-west-1.amazonaws.com":true,"s3-website-eu-west-1.amazonaws.com":true,"s3-website-ap-southeast-1.amazonaws.com":true,"s3-website-ap-southeast-2.amazonaws.com":true,"s3-website-ap-northeast-1.amazonaws.com":true,"s3-website-sa-east-1.amazonaws.com":true,"s3-website-us-gov-west-1.amazonaws.com":true,"betainabox.com":true,"ae.org":true,"ar.com":true,"br.com":true,"cn.com":true,"com.de":true,"com.se":true,"de.com":true,"eu.com":true,"gb.com":true,"gb.net":true,"hu.com":true,"hu.net":true,"jp.net":true,"jpn.com":true,"kr.com":true,"mex.com":true,"no.com":true,"qc.com":true,"ru.com":true,"sa.com":true,"se.com":true,"se.net":true,"uk.com":true,"uk.net":true,"us.com":true,"uy.com":true,"za.bz":true,"za.com":true,"africa.com":true,"gr.com":true,"in.net":true,"us.org":true,"co.com":true,"c.la":true,"cloudcontrolled.com":true,"cloudcontrolapp.com":true,"co.ca":true,"co.nl":true,"co.no":true,"*.platform.sh":true,"cupcake.is":true,"dreamhosters.com":true,"dyndns-at-home.com":true,"dyndns-at-work.com":true,"dyndns-blog.com":true,"dyndns-free.com":true,"dyndns-home.com":true,"dyndns-ip.com":true,"dyndns-mail.com":true,"dyndns-office.com":true,"dyndns-pics.com":true,"dyndns-remote.com":true,"dyndns-server.com":true,"dyndns-web.com":true,"dyndns-wiki.com":true,"dyndns-work.com":true,"dyndns.biz":true,"dyndns.info":true,"dyndns.org":true,"dyndns.tv":true,"at-band-camp.net":true,"ath.cx":true,"barrel-of-knowledge.info":true,"barrell-of-knowledge.info":true,"better-than.tv":true,"blogdns.com":true,"blogdns.net":true,"blogdns.org":true,"blogsite.org":true,"boldlygoingnowhere.org":true,"broke-it.net":true,"buyshouses.net":true,"cechire.com":true,"dnsalias.com":true,"dnsalias.net":true,"dnsalias.org":true,"dnsdojo.com":true,"dnsdojo.net":true,"dnsdojo.org":true,"does-it.net":true,"doesntexist.com":true,"doesntexist.org":true,"dontexist.com":true,"dontexist.net":true,"dontexist.org":true,"doomdns.com":true,"doomdns.org":true,"dvrdns.org":true,"dyn-o-saur.com":true,"dynalias.com":true,"dynalias.net":true,"dynalias.org":true,"dynathome.net":true,"dyndns.ws":true,"endofinternet.net":true,"endofinternet.org":true,"endoftheinternet.org":true,"est-a-la-maison.com":true,"est-a-la-masion.com":true,"est-le-patron.com":true,"est-mon-blogueur.com":true,"for-better.biz":true,"for-more.biz":true,"for-our.info":true,"for-some.biz":true,"for-the.biz":true,"forgot.her.name":true,"forgot.his.name":true,"from-ak.com":true,"from-al.com":true,"from-ar.com":true,"from-az.net":true,"from-ca.com":true,"from-co.net":true,"from-ct.com":true,"from-dc.com":true,"from-de.com":true,"from-fl.com":true,"from-ga.com":true,"from-hi.com":true,"from-ia.com":true,"from-id.com":true,"from-il.com":true,"from-in.com":true,"from-ks.com":true,"from-ky.com":true,"from-la.net":true,"from-ma.com":true,"from-md.com":true,"from-me.org":true,"from-mi.com":true,"from-mn.com":true,"from-mo.com":true,"from-ms.com":true,"from-mt.com":true,"from-nc.com":true,"from-nd.com":true,"from-ne.com":true,"from-nh.com":true,"from-nj.com":true,"from-nm.com":true,"from-nv.com":true,"from-ny.net":true,"from-oh.com":true,"from-ok.com":true,"from-or.com":true,"from-pa.com":true,"from-pr.com":true,"from-ri.com":true,"from-sc.com":true,"from-sd.com":true,"from-tn.com":true,"from-tx.com":true,"from-ut.com":true,"from-va.com":true,"from-vt.com":true,"from-wa.com":true,"from-wi.com":true,"from-wv.com":true,"from-wy.com":true,"ftpaccess.cc":true,"fuettertdasnetz.de":true,"game-host.org":true,"game-server.cc":true,"getmyip.com":true,"gets-it.net":true,"go.dyndns.org":true,"gotdns.com":true,"gotdns.org":true,"groks-the.info":true,"groks-this.info":true,"ham-radio-op.net":true,"here-for-more.info":true,"hobby-site.com":true,"hobby-site.org":true,"home.dyndns.org":true,"homedns.org":true,"homeftp.net":true,"homeftp.org":true,"homeip.net":true,"homelinux.com":true,"homelinux.net":true,"homelinux.org":true,"homeunix.com":true,"homeunix.net":true,"homeunix.org":true,"iamallama.com":true,"in-the-band.net":true,"is-a-anarchist.com":true,"is-a-blogger.com":true,"is-a-bookkeeper.com":true,"is-a-bruinsfan.org":true,"is-a-bulls-fan.com":true,"is-a-candidate.org":true,"is-a-caterer.com":true,"is-a-celticsfan.org":true,"is-a-chef.com":true,"is-a-chef.net":true,"is-a-chef.org":true,"is-a-conservative.com":true,"is-a-cpa.com":true,"is-a-cubicle-slave.com":true,"is-a-democrat.com":true,"is-a-designer.com":true,"is-a-doctor.com":true,"is-a-financialadvisor.com":true,"is-a-geek.com":true,"is-a-geek.net":true,"is-a-geek.org":true,"is-a-green.com":true,"is-a-guru.com":true,"is-a-hard-worker.com":true,"is-a-hunter.com":true,"is-a-knight.org":true,"is-a-landscaper.com":true,"is-a-lawyer.com":true,"is-a-liberal.com":true,"is-a-libertarian.com":true,"is-a-linux-user.org":true,"is-a-llama.com":true,"is-a-musician.com":true,"is-a-nascarfan.com":true,"is-a-nurse.com":true,"is-a-painter.com":true,"is-a-patsfan.org":true,"is-a-personaltrainer.com":true,"is-a-photographer.com":true,"is-a-player.com":true,"is-a-republican.com":true,"is-a-rockstar.com":true,"is-a-socialist.com":true,"is-a-soxfan.org":true,"is-a-student.com":true,"is-a-teacher.com":true,"is-a-techie.com":true,"is-a-therapist.com":true,"is-an-accountant.com":true,"is-an-actor.com":true,"is-an-actress.com":true,"is-an-anarchist.com":true,"is-an-artist.com":true,"is-an-engineer.com":true,"is-an-entertainer.com":true,"is-by.us":true,"is-certified.com":true,"is-found.org":true,"is-gone.com":true,"is-into-anime.com":true,"is-into-cars.com":true,"is-into-cartoons.com":true,"is-into-games.com":true,"is-leet.com":true,"is-lost.org":true,"is-not-certified.com":true,"is-saved.org":true,"is-slick.com":true,"is-uberleet.com":true,"is-very-bad.org":true,"is-very-evil.org":true,"is-very-good.org":true,"is-very-nice.org":true,"is-very-sweet.org":true,"is-with-theband.com":true,"isa-geek.com":true,"isa-geek.net":true,"isa-geek.org":true,"isa-hockeynut.com":true,"issmarterthanyou.com":true,"isteingeek.de":true,"istmein.de":true,"kicks-ass.net":true,"kicks-ass.org":true,"knowsitall.info":true,"land-4-sale.us":true,"lebtimnetz.de":true,"leitungsen.de":true,"likes-pie.com":true,"likescandy.com":true,"merseine.nu":true,"mine.nu":true,"misconfused.org":true,"mypets.ws":true,"myphotos.cc":true,"neat-url.com":true,"office-on-the.net":true,"on-the-web.tv":true,"podzone.net":true,"podzone.org":true,"readmyblog.org":true,"saves-the-whales.com":true,"scrapper-site.net":true,"scrapping.cc":true,"selfip.biz":true,"selfip.com":true,"selfip.info":true,"selfip.net":true,"selfip.org":true,"sells-for-less.com":true,"sells-for-u.com":true,"sells-it.net":true,"sellsyourhome.org":true,"servebbs.com":true,"servebbs.net":true,"servebbs.org":true,"serveftp.net":true,"serveftp.org":true,"servegame.org":true,"shacknet.nu":true,"simple-url.com":true,"space-to-rent.com":true,"stuff-4-sale.org":true,"stuff-4-sale.us":true,"teaches-yoga.com":true,"thruhere.net":true,"traeumtgerade.de":true,"webhop.biz":true,"webhop.info":true,"webhop.net":true,"webhop.org":true,"worse-than.tv":true,"writesthisblog.com":true,"a.ssl.fastly.net":true,"b.ssl.fastly.net":true,"global.ssl.fastly.net":true,"a.prod.fastly.net":true,"global.prod.fastly.net":true,"firebaseapp.com":true,"flynnhub.com":true,"service.gov.uk":true,"github.io":true,"githubusercontent.com":true,"ro.com":true,"appspot.com":true,"blogspot.ae":true,"blogspot.be":true,"blogspot.bj":true,"blogspot.ca":true,"blogspot.cf":true,"blogspot.ch":true,"blogspot.co.at":true,"blogspot.co.il":true,"blogspot.co.nz":true,"blogspot.co.uk":true,"blogspot.com":true,"blogspot.com.ar":true,"blogspot.com.au":true,"blogspot.com.br":true,"blogspot.com.es":true,"blogspot.com.tr":true,"blogspot.cv":true,"blogspot.cz":true,"blogspot.de":true,"blogspot.dk":true,"blogspot.fi":true,"blogspot.fr":true,"blogspot.gr":true,"blogspot.hk":true,"blogspot.hu":true,"blogspot.ie":true,"blogspot.in":true,"blogspot.it":true,"blogspot.jp":true,"blogspot.kr":true,"blogspot.mr":true,"blogspot.mx":true,"blogspot.nl":true,"blogspot.no":true,"blogspot.pt":true,"blogspot.re":true,"blogspot.ro":true,"blogspot.ru":true,"blogspot.se":true,"blogspot.sg":true,"blogspot.sk":true,"blogspot.td":true,"blogspot.tw":true,"codespot.com":true,"googleapis.com":true,"googlecode.com":true,"pagespeedmobilizer.com":true,"withgoogle.com":true,"herokuapp.com":true,"herokussl.com":true,"iki.fi":true,"biz.at":true,"info.at":true,"co.pl":true,"azurewebsites.net":true,"azure-mobile.net":true,"cloudapp.net":true,"nfshost.com":true,"nyc.mn":true,"nid.io":true,"operaunite.com":true,"outsystemscloud.com":true,"art.pl":true,"gliwice.pl":true,"krakow.pl":true,"poznan.pl":true,"wroc.pl":true,"zakopane.pl":true,"priv.at":true,"rhcloud.com":true,"sinaapp.com":true,"vipsinaapp.com":true,"1kapp.com":true,"gda.pl":true,"gdansk.pl":true,"gdynia.pl":true,"med.pl":true,"sopot.pl":true,"hk.com":true,"hk.org":true,"ltd.hk":true,"inc.hk":true,"yolasite.com":true,"za.net":true,"za.org":true});
-
-// END of automatically generated file
diff --git a/deps/npm/node_modules/tough-cookie/package.json b/deps/npm/node_modules/tough-cookie/package.json
deleted file mode 100644
index f808bccefe3182..00000000000000
--- a/deps/npm/node_modules/tough-cookie/package.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "_args": [
-    [
-      "tough-cookie@>=0.12.0",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "tough-cookie@>=0.12.0",
-  "_id": "tough-cookie@2.0.0",
-  "_inCache": true,
-  "_location": "/tough-cookie",
-  "_nodeVersion": "0.12.2",
-  "_npmUser": {
-    "email": "jstash@gmail.com",
-    "name": "jstash"
-  },
-  "_npmVersion": "2.7.4",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "tough-cookie",
-    "raw": "tough-cookie@>=0.12.0",
-    "rawSpec": ">=0.12.0",
-    "scope": null,
-    "spec": ">=0.12.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/request"
-  ],
-  "_resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz",
-  "_shasum": "41ce08720b35cf90beb044dd2609fb19e928718f",
-  "_shrinkwrap": null,
-  "_spec": "tough-cookie@>=0.12.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
-  "author": {
-    "email": "jstashewsky@salesforce.com",
-    "name": "Jeremy Stashewsky"
-  },
-  "bugs": {
-    "url": "https://github.com/SalesforceEng/tough-cookie/issues"
-  },
-  "dependencies": {},
-  "description": "RFC6265 Cookies and Cookie Jar for node.js",
-  "devDependencies": {
-    "async": ">=0.1.12",
-    "vows": "0.7.0"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "41ce08720b35cf90beb044dd2609fb19e928718f",
-    "tarball": "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"
-  },
-  "engines": {
-    "node": ">=0.10.0"
-  },
-  "gitHead": "a3af6104da7787c23bb98910109b0e0e8a10153c",
-  "homepage": "https://github.com/SalesforceEng/tough-cookie",
-  "keywords": [
-    "HTTP",
-    "RFC2965",
-    "RFC6265",
-    "cookie",
-    "cookiejar",
-    "cookies",
-    "jar",
-    "set-cookie"
-  ],
-  "license": "BSD-3-Clause",
-  "main": "./lib/cookie",
-  "maintainers": [
-    {
-      "name": "jstash",
-      "email": "jeremy@goinstant.com"
-    },
-    {
-      "name": "goinstant",
-      "email": "services@goinstant.com"
-    }
-  ],
-  "name": "tough-cookie",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/SalesforceEng/tough-cookie.git"
-  },
-  "scripts": {
-    "test": "vows test/*_test.js"
-  },
-  "version": "2.0.0"
-}
diff --git a/deps/npm/node_modules/tough-cookie/public-suffix.txt b/deps/npm/node_modules/tough-cookie/public-suffix.txt
deleted file mode 100644
index d5c9924ed549fa..00000000000000
--- a/deps/npm/node_modules/tough-cookie/public-suffix.txt
+++ /dev/null
@@ -1,10309 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// ===BEGIN ICANN DOMAINS===
-
-// ac : http://en.wikipedia.org/wiki/.ac
-ac
-com.ac
-edu.ac
-gov.ac
-net.ac
-mil.ac
-org.ac
-
-// ad : http://en.wikipedia.org/wiki/.ad
-ad
-nom.ad
-
-// ae : http://en.wikipedia.org/wiki/.ae
-// see also: "Domain Name Eligibility Policy" at http://www.aeda.ae/eng/aepolicy.php
-ae
-co.ae
-net.ae
-org.ae
-sch.ae
-ac.ae
-gov.ae
-mil.ae
-
-// aero : see http://www.information.aero/index.php?id=66
-aero
-accident-investigation.aero
-accident-prevention.aero
-aerobatic.aero
-aeroclub.aero
-aerodrome.aero
-agents.aero
-aircraft.aero
-airline.aero
-airport.aero
-air-surveillance.aero
-airtraffic.aero
-air-traffic-control.aero
-ambulance.aero
-amusement.aero
-association.aero
-author.aero
-ballooning.aero
-broker.aero
-caa.aero
-cargo.aero
-catering.aero
-certification.aero
-championship.aero
-charter.aero
-civilaviation.aero
-club.aero
-conference.aero
-consultant.aero
-consulting.aero
-control.aero
-council.aero
-crew.aero
-design.aero
-dgca.aero
-educator.aero
-emergency.aero
-engine.aero
-engineer.aero
-entertainment.aero
-equipment.aero
-exchange.aero
-express.aero
-federation.aero
-flight.aero
-freight.aero
-fuel.aero
-gliding.aero
-government.aero
-groundhandling.aero
-group.aero
-hanggliding.aero
-homebuilt.aero
-insurance.aero
-journal.aero
-journalist.aero
-leasing.aero
-logistics.aero
-magazine.aero
-maintenance.aero
-marketplace.aero
-media.aero
-microlight.aero
-modelling.aero
-navigation.aero
-parachuting.aero
-paragliding.aero
-passenger-association.aero
-pilot.aero
-press.aero
-production.aero
-recreation.aero
-repbody.aero
-res.aero
-research.aero
-rotorcraft.aero
-safety.aero
-scientist.aero
-services.aero
-show.aero
-skydiving.aero
-software.aero
-student.aero
-taxi.aero
-trader.aero
-trading.aero
-trainer.aero
-union.aero
-workinggroup.aero
-works.aero
-
-// af : http://www.nic.af/help.jsp
-af
-gov.af
-com.af
-org.af
-net.af
-edu.af
-
-// ag : http://www.nic.ag/prices.htm
-ag
-com.ag
-org.ag
-net.ag
-co.ag
-nom.ag
-
-// ai : http://nic.com.ai/
-ai
-off.ai
-com.ai
-net.ai
-org.ai
-
-// al : http://www.ert.gov.al/ert_alb/faq_det.html?Id=31
-al
-com.al
-edu.al
-gov.al
-mil.al
-net.al
-org.al
-
-// am : http://en.wikipedia.org/wiki/.am
-am
-
-// an : http://www.una.an/an_domreg/default.asp
-an
-com.an
-net.an
-org.an
-edu.an
-
-// ao : http://en.wikipedia.org/wiki/.ao
-// http://www.dns.ao/REGISTR.DOC
-ao
-ed.ao
-gv.ao
-og.ao
-co.ao
-pb.ao
-it.ao
-
-// aq : http://en.wikipedia.org/wiki/.aq
-aq
-
-// ar : https://nic.ar/normativa-vigente.xhtml
-ar
-com.ar
-edu.ar
-gob.ar
-gov.ar
-int.ar
-mil.ar
-net.ar
-org.ar
-tur.ar
-
-// arpa : http://en.wikipedia.org/wiki/.arpa
-// Confirmed by registry <iana-questions@icann.org> 2008-06-18
-arpa
-e164.arpa
-in-addr.arpa
-ip6.arpa
-iris.arpa
-uri.arpa
-urn.arpa
-
-// as : http://en.wikipedia.org/wiki/.as
-as
-gov.as
-
-// asia : http://en.wikipedia.org/wiki/.asia
-asia
-
-// at : http://en.wikipedia.org/wiki/.at
-// Confirmed by registry <it@nic.at> 2008-06-17
-at
-ac.at
-co.at
-gv.at
-or.at
-
-// au : http://en.wikipedia.org/wiki/.au
-// http://www.auda.org.au/
-au
-// 2LDs
-com.au
-net.au
-org.au
-edu.au
-gov.au
-asn.au
-id.au
-// Historic 2LDs (closed to new registration, but sites still exist)
-info.au
-conf.au
-oz.au
-// CGDNs - http://www.cgdn.org.au/
-act.au
-nsw.au
-nt.au
-qld.au
-sa.au
-tas.au
-vic.au
-wa.au
-// 3LDs
-act.edu.au
-nsw.edu.au
-nt.edu.au
-qld.edu.au
-sa.edu.au
-tas.edu.au
-vic.edu.au
-wa.edu.au
-// act.gov.au  Bug 984824 - Removed at request of Greg Tankard
-// nsw.gov.au  Bug 547985 - Removed at request of <Shae.Donelan@services.nsw.gov.au>
-// nt.gov.au  Bug 940478 - Removed at request of Greg Connors <Greg.Connors@nt.gov.au>
-qld.gov.au
-sa.gov.au
-tas.gov.au
-vic.gov.au
-wa.gov.au
-
-// aw : http://en.wikipedia.org/wiki/.aw
-aw
-com.aw
-
-// ax : http://en.wikipedia.org/wiki/.ax
-ax
-
-// az : http://en.wikipedia.org/wiki/.az
-az
-com.az
-net.az
-int.az
-gov.az
-org.az
-edu.az
-info.az
-pp.az
-mil.az
-name.az
-pro.az
-biz.az
-
-// ba : http://en.wikipedia.org/wiki/.ba
-ba
-org.ba
-net.ba
-edu.ba
-gov.ba
-mil.ba
-unsa.ba
-unbi.ba
-co.ba
-com.ba
-rs.ba
-
-// bb : http://en.wikipedia.org/wiki/.bb
-bb
-biz.bb
-co.bb
-com.bb
-edu.bb
-gov.bb
-info.bb
-net.bb
-org.bb
-store.bb
-tv.bb
-
-// bd : http://en.wikipedia.org/wiki/.bd
-*.bd
-
-// be : http://en.wikipedia.org/wiki/.be
-// Confirmed by registry <tech@dns.be> 2008-06-08
-be
-ac.be
-
-// bf : http://en.wikipedia.org/wiki/.bf
-bf
-gov.bf
-
-// bg : http://en.wikipedia.org/wiki/.bg
-// https://www.register.bg/user/static/rules/en/index.html
-bg
-a.bg
-b.bg
-c.bg
-d.bg
-e.bg
-f.bg
-g.bg
-h.bg
-i.bg
-j.bg
-k.bg
-l.bg
-m.bg
-n.bg
-o.bg
-p.bg
-q.bg
-r.bg
-s.bg
-t.bg
-u.bg
-v.bg
-w.bg
-x.bg
-y.bg
-z.bg
-0.bg
-1.bg
-2.bg
-3.bg
-4.bg
-5.bg
-6.bg
-7.bg
-8.bg
-9.bg
-
-// bh : http://en.wikipedia.org/wiki/.bh
-bh
-com.bh
-edu.bh
-net.bh
-org.bh
-gov.bh
-
-// bi : http://en.wikipedia.org/wiki/.bi
-// http://whois.nic.bi/
-bi
-co.bi
-com.bi
-edu.bi
-or.bi
-org.bi
-
-// biz : http://en.wikipedia.org/wiki/.biz
-biz
-
-// bj : http://en.wikipedia.org/wiki/.bj
-bj
-asso.bj
-barreau.bj
-gouv.bj
-
-// bm : http://www.bermudanic.bm/dnr-text.txt
-bm
-com.bm
-edu.bm
-gov.bm
-net.bm
-org.bm
-
-// bn : http://en.wikipedia.org/wiki/.bn
-*.bn
-
-// bo : http://www.nic.bo/
-bo
-com.bo
-edu.bo
-gov.bo
-gob.bo
-int.bo
-org.bo
-net.bo
-mil.bo
-tv.bo
-
-// br : http://registro.br/dominio/categoria.html
-// Submitted by registry <fneves@registro.br> 2014-08-11
-br
-adm.br
-adv.br
-agr.br
-am.br
-arq.br
-art.br
-ato.br
-b.br
-bio.br
-blog.br
-bmd.br
-cim.br
-cng.br
-cnt.br
-com.br
-coop.br
-ecn.br
-eco.br
-edu.br
-emp.br
-eng.br
-esp.br
-etc.br
-eti.br
-far.br
-flog.br
-fm.br
-fnd.br
-fot.br
-fst.br
-g12.br
-ggf.br
-gov.br
-imb.br
-ind.br
-inf.br
-jor.br
-jus.br
-leg.br
-lel.br
-mat.br
-med.br
-mil.br
-mp.br
-mus.br
-net.br
-*.nom.br
-not.br
-ntr.br
-odo.br
-org.br
-ppg.br
-pro.br
-psc.br
-psi.br
-qsl.br
-radio.br
-rec.br
-slg.br
-srv.br
-taxi.br
-teo.br
-tmp.br
-trd.br
-tur.br
-tv.br
-vet.br
-vlog.br
-wiki.br
-zlg.br
-
-// bs : http://www.nic.bs/rules.html
-bs
-com.bs
-net.bs
-org.bs
-edu.bs
-gov.bs
-
-// bt : http://en.wikipedia.org/wiki/.bt
-bt
-com.bt
-edu.bt
-gov.bt
-net.bt
-org.bt
-
-// bv : No registrations at this time.
-// Submitted by registry <jarle@uninett.no> 2006-06-16
-bv
-
-// bw : http://en.wikipedia.org/wiki/.bw
-// http://www.gobin.info/domainname/bw.doc
-// list of other 2nd level tlds ?
-bw
-co.bw
-org.bw
-
-// by : http://en.wikipedia.org/wiki/.by
-// http://tld.by/rules_2006_en.html
-// list of other 2nd level tlds ?
-by
-gov.by
-mil.by
-// Official information does not indicate that com.by is a reserved
-// second-level domain, but it's being used as one (see www.google.com.by and
-// www.yahoo.com.by, for example), so we list it here for safety's sake.
-com.by
-
-// http://hoster.by/
-of.by
-
-// bz : http://en.wikipedia.org/wiki/.bz
-// http://www.belizenic.bz/
-bz
-com.bz
-net.bz
-org.bz
-edu.bz
-gov.bz
-
-// ca : http://en.wikipedia.org/wiki/.ca
-ca
-// ca geographical names
-ab.ca
-bc.ca
-mb.ca
-nb.ca
-nf.ca
-nl.ca
-ns.ca
-nt.ca
-nu.ca
-on.ca
-pe.ca
-qc.ca
-sk.ca
-yk.ca
-// gc.ca: http://en.wikipedia.org/wiki/.gc.ca
-// see also: http://registry.gc.ca/en/SubdomainFAQ
-gc.ca
-
-// cat : http://en.wikipedia.org/wiki/.cat
-cat
-
-// cc : http://en.wikipedia.org/wiki/.cc
-cc
-
-// cd : http://en.wikipedia.org/wiki/.cd
-// see also: https://www.nic.cd/domain/insertDomain_2.jsp?act=1
-cd
-gov.cd
-
-// cf : http://en.wikipedia.org/wiki/.cf
-cf
-
-// cg : http://en.wikipedia.org/wiki/.cg
-cg
-
-// ch : http://en.wikipedia.org/wiki/.ch
-ch
-
-// ci : http://en.wikipedia.org/wiki/.ci
-// http://www.nic.ci/index.php?page=charte
-ci
-org.ci
-or.ci
-com.ci
-co.ci
-edu.ci
-ed.ci
-ac.ci
-net.ci
-go.ci
-asso.ci
-aéroport.ci
-int.ci
-presse.ci
-md.ci
-gouv.ci
-
-// ck : http://en.wikipedia.org/wiki/.ck
-*.ck
-!www.ck
-
-// cl : http://en.wikipedia.org/wiki/.cl
-cl
-gov.cl
-gob.cl
-co.cl
-mil.cl
-
-// cm : http://en.wikipedia.org/wiki/.cm plus bug 981927
-cm
-co.cm
-com.cm
-gov.cm
-net.cm
-
-// cn : http://en.wikipedia.org/wiki/.cn
-// Submitted by registry <tanyaling@cnnic.cn> 2008-06-11
-cn
-ac.cn
-com.cn
-edu.cn
-gov.cn
-net.cn
-org.cn
-mil.cn
-公司.cn
-网络.cn
-網絡.cn
-// cn geographic names
-ah.cn
-bj.cn
-cq.cn
-fj.cn
-gd.cn
-gs.cn
-gz.cn
-gx.cn
-ha.cn
-hb.cn
-he.cn
-hi.cn
-hl.cn
-hn.cn
-jl.cn
-js.cn
-jx.cn
-ln.cn
-nm.cn
-nx.cn
-qh.cn
-sc.cn
-sd.cn
-sh.cn
-sn.cn
-sx.cn
-tj.cn
-xj.cn
-xz.cn
-yn.cn
-zj.cn
-hk.cn
-mo.cn
-tw.cn
-
-// co : http://en.wikipedia.org/wiki/.co
-// Submitted by registry <tecnico@uniandes.edu.co> 2008-06-11
-co
-arts.co
-com.co
-edu.co
-firm.co
-gov.co
-info.co
-int.co
-mil.co
-net.co
-nom.co
-org.co
-rec.co
-web.co
-
-// com : http://en.wikipedia.org/wiki/.com
-com
-
-// coop : http://en.wikipedia.org/wiki/.coop
-coop
-
-// cr : http://www.nic.cr/niccr_publico/showRegistroDominiosScreen.do
-cr
-ac.cr
-co.cr
-ed.cr
-fi.cr
-go.cr
-or.cr
-sa.cr
-
-// cu : http://en.wikipedia.org/wiki/.cu
-cu
-com.cu
-edu.cu
-org.cu
-net.cu
-gov.cu
-inf.cu
-
-// cv : http://en.wikipedia.org/wiki/.cv
-cv
-
-// cw : http://www.una.cw/cw_registry/
-// Confirmed by registry <registry@una.net> 2013-03-26
-cw
-com.cw
-edu.cw
-net.cw
-org.cw
-
-// cx : http://en.wikipedia.org/wiki/.cx
-// list of other 2nd level tlds ?
-cx
-gov.cx
-
-// cy : http://en.wikipedia.org/wiki/.cy
-*.cy
-
-// cz : http://en.wikipedia.org/wiki/.cz
-cz
-
-// de : http://en.wikipedia.org/wiki/.de
-// Confirmed by registry <ops@denic.de> (with technical
-// reservations) 2008-07-01
-de
-
-// dj : http://en.wikipedia.org/wiki/.dj
-dj
-
-// dk : http://en.wikipedia.org/wiki/.dk
-// Confirmed by registry <robert@dk-hostmaster.dk> 2008-06-17
-dk
-
-// dm : http://en.wikipedia.org/wiki/.dm
-dm
-com.dm
-net.dm
-org.dm
-edu.dm
-gov.dm
-
-// do : http://en.wikipedia.org/wiki/.do
-do
-art.do
-com.do
-edu.do
-gob.do
-gov.do
-mil.do
-net.do
-org.do
-sld.do
-web.do
-
-// dz : http://en.wikipedia.org/wiki/.dz
-dz
-com.dz
-org.dz
-net.dz
-gov.dz
-edu.dz
-asso.dz
-pol.dz
-art.dz
-
-// ec : http://www.nic.ec/reg/paso1.asp
-// Submitted by registry <vabboud@nic.ec> 2008-07-04
-ec
-com.ec
-info.ec
-net.ec
-fin.ec
-k12.ec
-med.ec
-pro.ec
-org.ec
-edu.ec
-gov.ec
-gob.ec
-mil.ec
-
-// edu : http://en.wikipedia.org/wiki/.edu
-edu
-
-// ee : http://www.eenet.ee/EENet/dom_reeglid.html#lisa_B
-ee
-edu.ee
-gov.ee
-riik.ee
-lib.ee
-med.ee
-com.ee
-pri.ee
-aip.ee
-org.ee
-fie.ee
-
-// eg : http://en.wikipedia.org/wiki/.eg
-eg
-com.eg
-edu.eg
-eun.eg
-gov.eg
-mil.eg
-name.eg
-net.eg
-org.eg
-sci.eg
-
-// er : http://en.wikipedia.org/wiki/.er
-*.er
-
-// es : https://www.nic.es/site_ingles/ingles/dominios/index.html
-es
-com.es
-nom.es
-org.es
-gob.es
-edu.es
-
-// et : http://en.wikipedia.org/wiki/.et
-et
-com.et
-gov.et
-org.et
-edu.et
-biz.et
-name.et
-info.et
-net.et
-
-// eu : http://en.wikipedia.org/wiki/.eu
-eu
-
-// fi : http://en.wikipedia.org/wiki/.fi
-fi
-// aland.fi : http://en.wikipedia.org/wiki/.ax
-// This domain is being phased out in favor of .ax. As there are still many
-// domains under aland.fi, we still keep it on the list until aland.fi is
-// completely removed.
-// TODO: Check for updates (expected to be phased out around Q1/2009)
-aland.fi
-
-// fj : http://en.wikipedia.org/wiki/.fj
-*.fj
-
-// fk : http://en.wikipedia.org/wiki/.fk
-*.fk
-
-// fm : http://en.wikipedia.org/wiki/.fm
-fm
-
-// fo : http://en.wikipedia.org/wiki/.fo
-fo
-
-// fr : http://www.afnic.fr/
-// domaines descriptifs : http://www.afnic.fr/obtenir/chartes/nommage-fr/annexe-descriptifs
-fr
-com.fr
-asso.fr
-nom.fr
-prd.fr
-presse.fr
-tm.fr
-// domaines sectoriels : http://www.afnic.fr/obtenir/chartes/nommage-fr/annexe-sectoriels
-aeroport.fr
-assedic.fr
-avocat.fr
-avoues.fr
-cci.fr
-chambagri.fr
-chirurgiens-dentistes.fr
-experts-comptables.fr
-geometre-expert.fr
-gouv.fr
-greta.fr
-huissier-justice.fr
-medecin.fr
-notaires.fr
-pharmacien.fr
-port.fr
-veterinaire.fr
-
-// ga : http://en.wikipedia.org/wiki/.ga
-ga
-
-// gb : This registry is effectively dormant
-// Submitted by registry <Damien.Shaw@ja.net> 2008-06-12
-gb
-
-// gd : http://en.wikipedia.org/wiki/.gd
-gd
-
-// ge : http://www.nic.net.ge/policy_en.pdf
-ge
-com.ge
-edu.ge
-gov.ge
-org.ge
-mil.ge
-net.ge
-pvt.ge
-
-// gf : http://en.wikipedia.org/wiki/.gf
-gf
-
-// gg : http://www.channelisles.net/register-domains/
-// Confirmed by registry <nigel@channelisles.net> 2013-11-28
-gg
-co.gg
-net.gg
-org.gg
-
-// gh : http://en.wikipedia.org/wiki/.gh
-// see also: http://www.nic.gh/reg_now.php
-// Although domains directly at second level are not possible at the moment,
-// they have been possible for some time and may come back.
-gh
-com.gh
-edu.gh
-gov.gh
-org.gh
-mil.gh
-
-// gi : http://www.nic.gi/rules.html
-gi
-com.gi
-ltd.gi
-gov.gi
-mod.gi
-edu.gi
-org.gi
-
-// gl : http://en.wikipedia.org/wiki/.gl
-// http://nic.gl
-gl
-co.gl
-com.gl
-edu.gl
-net.gl
-org.gl
-
-// gm : http://www.nic.gm/htmlpages%5Cgm-policy.htm
-gm
-
-// gn : http://psg.com/dns/gn/gn.txt
-// Submitted by registry <randy@psg.com> 2008-06-17
-gn
-ac.gn
-com.gn
-edu.gn
-gov.gn
-org.gn
-net.gn
-
-// gov : http://en.wikipedia.org/wiki/.gov
-gov
-
-// gp : http://www.nic.gp/index.php?lang=en
-gp
-com.gp
-net.gp
-mobi.gp
-edu.gp
-org.gp
-asso.gp
-
-// gq : http://en.wikipedia.org/wiki/.gq
-gq
-
-// gr : https://grweb.ics.forth.gr/english/1617-B-2005.html
-// Submitted by registry <segred@ics.forth.gr> 2008-06-09
-gr
-com.gr
-edu.gr
-net.gr
-org.gr
-gov.gr
-
-// gs : http://en.wikipedia.org/wiki/.gs
-gs
-
-// gt : http://www.gt/politicas_de_registro.html
-gt
-com.gt
-edu.gt
-gob.gt
-ind.gt
-mil.gt
-net.gt
-org.gt
-
-// gu : http://gadao.gov.gu/registration.txt
-*.gu
-
-// gw : http://en.wikipedia.org/wiki/.gw
-gw
-
-// gy : http://en.wikipedia.org/wiki/.gy
-// http://registry.gy/
-gy
-co.gy
-com.gy
-net.gy
-
-// hk : https://www.hkdnr.hk
-// Submitted by registry <hk.tech@hkirc.hk> 2008-06-11
-hk
-com.hk
-edu.hk
-gov.hk
-idv.hk
-net.hk
-org.hk
-公司.hk
-教育.hk
-敎育.hk
-政府.hk
-個人.hk
-个人.hk
-箇人.hk
-網络.hk
-网络.hk
-组織.hk
-網絡.hk
-网絡.hk
-组织.hk
-組織.hk
-組织.hk
-
-// hm : http://en.wikipedia.org/wiki/.hm
-hm
-
-// hn : http://www.nic.hn/politicas/ps02,,05.html
-hn
-com.hn
-edu.hn
-org.hn
-net.hn
-mil.hn
-gob.hn
-
-// hr : http://www.dns.hr/documents/pdf/HRTLD-regulations.pdf
-hr
-iz.hr
-from.hr
-name.hr
-com.hr
-
-// ht : http://www.nic.ht/info/charte.cfm
-ht
-com.ht
-shop.ht
-firm.ht
-info.ht
-adult.ht
-net.ht
-pro.ht
-org.ht
-med.ht
-art.ht
-coop.ht
-pol.ht
-asso.ht
-edu.ht
-rel.ht
-gouv.ht
-perso.ht
-
-// hu : http://www.domain.hu/domain/English/sld.html
-// Confirmed by registry <pasztor@iszt.hu> 2008-06-12
-hu
-co.hu
-info.hu
-org.hu
-priv.hu
-sport.hu
-tm.hu
-2000.hu
-agrar.hu
-bolt.hu
-casino.hu
-city.hu
-erotica.hu
-erotika.hu
-film.hu
-forum.hu
-games.hu
-hotel.hu
-ingatlan.hu
-jogasz.hu
-konyvelo.hu
-lakas.hu
-media.hu
-news.hu
-reklam.hu
-sex.hu
-shop.hu
-suli.hu
-szex.hu
-tozsde.hu
-utazas.hu
-video.hu
-
-// id : https://register.pandi.or.id/
-id
-ac.id
-biz.id
-co.id
-desa.id
-go.id
-mil.id
-my.id
-net.id
-or.id
-sch.id
-web.id
-
-// ie : http://en.wikipedia.org/wiki/.ie
-ie
-gov.ie
-
-// il : http://en.wikipedia.org/wiki/.il
-*.il
-
-// im : https://www.nic.im/
-// Submitted by registry <info@nic.im> 2013-11-15
-im
-ac.im
-co.im
-com.im
-ltd.co.im
-net.im
-org.im
-plc.co.im
-tt.im
-tv.im
-
-// in : http://en.wikipedia.org/wiki/.in
-// see also: https://registry.in/Policies
-// Please note, that nic.in is not an offical eTLD, but used by most
-// government institutions.
-in
-co.in
-firm.in
-net.in
-org.in
-gen.in
-ind.in
-nic.in
-ac.in
-edu.in
-res.in
-gov.in
-mil.in
-
-// info : http://en.wikipedia.org/wiki/.info
-info
-
-// int : http://en.wikipedia.org/wiki/.int
-// Confirmed by registry <iana-questions@icann.org> 2008-06-18
-int
-eu.int
-
-// io : http://www.nic.io/rules.html
-// list of other 2nd level tlds ?
-io
-com.io
-
-// iq : http://www.cmc.iq/english/iq/iqregister1.htm
-iq
-gov.iq
-edu.iq
-mil.iq
-com.iq
-org.iq
-net.iq
-
-// ir : http://www.nic.ir/Terms_and_Conditions_ir,_Appendix_1_Domain_Rules
-// Also see http://www.nic.ir/Internationalized_Domain_Names
-// Two <iran>.ir entries added at request of <tech-team@nic.ir>, 2010-04-16
-ir
-ac.ir
-co.ir
-gov.ir
-id.ir
-net.ir
-org.ir
-sch.ir
-// xn--mgba3a4f16a.ir (<iran>.ir, Persian YEH)
-ایران.ir
-// xn--mgba3a4fra.ir (<iran>.ir, Arabic YEH)
-ايران.ir
-
-// is : http://www.isnic.is/domain/rules.php
-// Confirmed by registry <marius@isgate.is> 2008-12-06
-is
-net.is
-com.is
-edu.is
-gov.is
-org.is
-int.is
-
-// it : http://en.wikipedia.org/wiki/.it
-it
-gov.it
-edu.it
-// Reserved geo-names:
-// http://www.nic.it/documenti/regolamenti-e-linee-guida/regolamento-assegnazione-versione-6.0.pdf
-// There is also a list of reserved geo-names corresponding to Italian municipalities
-// http://www.nic.it/documenti/appendice-c.pdf, but it is not included here.
-// Regions
-abr.it
-abruzzo.it
-aosta-valley.it
-aostavalley.it
-bas.it
-basilicata.it
-cal.it
-calabria.it
-cam.it
-campania.it
-emilia-romagna.it
-emiliaromagna.it
-emr.it
-friuli-v-giulia.it
-friuli-ve-giulia.it
-friuli-vegiulia.it
-friuli-venezia-giulia.it
-friuli-veneziagiulia.it
-friuli-vgiulia.it
-friuliv-giulia.it
-friulive-giulia.it
-friulivegiulia.it
-friulivenezia-giulia.it
-friuliveneziagiulia.it
-friulivgiulia.it
-fvg.it
-laz.it
-lazio.it
-lig.it
-liguria.it
-lom.it
-lombardia.it
-lombardy.it
-lucania.it
-mar.it
-marche.it
-mol.it
-molise.it
-piedmont.it
-piemonte.it
-pmn.it
-pug.it
-puglia.it
-sar.it
-sardegna.it
-sardinia.it
-sic.it
-sicilia.it
-sicily.it
-taa.it
-tos.it
-toscana.it
-trentino-a-adige.it
-trentino-aadige.it
-trentino-alto-adige.it
-trentino-altoadige.it
-trentino-s-tirol.it
-trentino-stirol.it
-trentino-sud-tirol.it
-trentino-sudtirol.it
-trentino-sued-tirol.it
-trentino-suedtirol.it
-trentinoa-adige.it
-trentinoaadige.it
-trentinoalto-adige.it
-trentinoaltoadige.it
-trentinos-tirol.it
-trentinostirol.it
-trentinosud-tirol.it
-trentinosudtirol.it
-trentinosued-tirol.it
-trentinosuedtirol.it
-tuscany.it
-umb.it
-umbria.it
-val-d-aosta.it
-val-daosta.it
-vald-aosta.it
-valdaosta.it
-valle-aosta.it
-valle-d-aosta.it
-valle-daosta.it
-valleaosta.it
-valled-aosta.it
-valledaosta.it
-vallee-aoste.it
-valleeaoste.it
-vao.it
-vda.it
-ven.it
-veneto.it
-// Provinces
-ag.it
-agrigento.it
-al.it
-alessandria.it
-alto-adige.it
-altoadige.it
-an.it
-ancona.it
-andria-barletta-trani.it
-andria-trani-barletta.it
-andriabarlettatrani.it
-andriatranibarletta.it
-ao.it
-aosta.it
-aoste.it
-ap.it
-aq.it
-aquila.it
-ar.it
-arezzo.it
-ascoli-piceno.it
-ascolipiceno.it
-asti.it
-at.it
-av.it
-avellino.it
-ba.it
-balsan.it
-bari.it
-barletta-trani-andria.it
-barlettatraniandria.it
-belluno.it
-benevento.it
-bergamo.it
-bg.it
-bi.it
-biella.it
-bl.it
-bn.it
-bo.it
-bologna.it
-bolzano.it
-bozen.it
-br.it
-brescia.it
-brindisi.it
-bs.it
-bt.it
-bz.it
-ca.it
-cagliari.it
-caltanissetta.it
-campidano-medio.it
-campidanomedio.it
-campobasso.it
-carbonia-iglesias.it
-carboniaiglesias.it
-carrara-massa.it
-carraramassa.it
-caserta.it
-catania.it
-catanzaro.it
-cb.it
-ce.it
-cesena-forli.it
-cesenaforli.it
-ch.it
-chieti.it
-ci.it
-cl.it
-cn.it
-co.it
-como.it
-cosenza.it
-cr.it
-cremona.it
-crotone.it
-cs.it
-ct.it
-cuneo.it
-cz.it
-dell-ogliastra.it
-dellogliastra.it
-en.it
-enna.it
-fc.it
-fe.it
-fermo.it
-ferrara.it
-fg.it
-fi.it
-firenze.it
-florence.it
-fm.it
-foggia.it
-forli-cesena.it
-forlicesena.it
-fr.it
-frosinone.it
-ge.it
-genoa.it
-genova.it
-go.it
-gorizia.it
-gr.it
-grosseto.it
-iglesias-carbonia.it
-iglesiascarbonia.it
-im.it
-imperia.it
-is.it
-isernia.it
-kr.it
-la-spezia.it
-laquila.it
-laspezia.it
-latina.it
-lc.it
-le.it
-lecce.it
-lecco.it
-li.it
-livorno.it
-lo.it
-lodi.it
-lt.it
-lu.it
-lucca.it
-macerata.it
-mantova.it
-massa-carrara.it
-massacarrara.it
-matera.it
-mb.it
-mc.it
-me.it
-medio-campidano.it
-mediocampidano.it
-messina.it
-mi.it
-milan.it
-milano.it
-mn.it
-mo.it
-modena.it
-monza-brianza.it
-monza-e-della-brianza.it
-monza.it
-monzabrianza.it
-monzaebrianza.it
-monzaedellabrianza.it
-ms.it
-mt.it
-na.it
-naples.it
-napoli.it
-no.it
-novara.it
-nu.it
-nuoro.it
-og.it
-ogliastra.it
-olbia-tempio.it
-olbiatempio.it
-or.it
-oristano.it
-ot.it
-pa.it
-padova.it
-padua.it
-palermo.it
-parma.it
-pavia.it
-pc.it
-pd.it
-pe.it
-perugia.it
-pesaro-urbino.it
-pesarourbino.it
-pescara.it
-pg.it
-pi.it
-piacenza.it
-pisa.it
-pistoia.it
-pn.it
-po.it
-pordenone.it
-potenza.it
-pr.it
-prato.it
-pt.it
-pu.it
-pv.it
-pz.it
-ra.it
-ragusa.it
-ravenna.it
-rc.it
-re.it
-reggio-calabria.it
-reggio-emilia.it
-reggiocalabria.it
-reggioemilia.it
-rg.it
-ri.it
-rieti.it
-rimini.it
-rm.it
-rn.it
-ro.it
-roma.it
-rome.it
-rovigo.it
-sa.it
-salerno.it
-sassari.it
-savona.it
-si.it
-siena.it
-siracusa.it
-so.it
-sondrio.it
-sp.it
-sr.it
-ss.it
-suedtirol.it
-sv.it
-ta.it
-taranto.it
-te.it
-tempio-olbia.it
-tempioolbia.it
-teramo.it
-terni.it
-tn.it
-to.it
-torino.it
-tp.it
-tr.it
-trani-andria-barletta.it
-trani-barletta-andria.it
-traniandriabarletta.it
-tranibarlettaandria.it
-trapani.it
-trentino.it
-trento.it
-treviso.it
-trieste.it
-ts.it
-turin.it
-tv.it
-ud.it
-udine.it
-urbino-pesaro.it
-urbinopesaro.it
-va.it
-varese.it
-vb.it
-vc.it
-ve.it
-venezia.it
-venice.it
-verbania.it
-vercelli.it
-verona.it
-vi.it
-vibo-valentia.it
-vibovalentia.it
-vicenza.it
-viterbo.it
-vr.it
-vs.it
-vt.it
-vv.it
-
-// je : http://www.channelisles.net/register-domains/
-// Confirmed by registry <nigel@channelisles.net> 2013-11-28
-je
-co.je
-net.je
-org.je
-
-// jm : http://www.com.jm/register.html
-*.jm
-
-// jo : http://www.dns.jo/Registration_policy.aspx
-jo
-com.jo
-org.jo
-net.jo
-edu.jo
-sch.jo
-gov.jo
-mil.jo
-name.jo
-
-// jobs : http://en.wikipedia.org/wiki/.jobs
-jobs
-
-// jp : http://en.wikipedia.org/wiki/.jp
-// http://jprs.co.jp/en/jpdomain.html
-// Submitted by registry <info@jprs.jp> 2014-10-30
-jp
-// jp organizational type names
-ac.jp
-ad.jp
-co.jp
-ed.jp
-go.jp
-gr.jp
-lg.jp
-ne.jp
-or.jp
-// jp prefecture type names
-aichi.jp
-akita.jp
-aomori.jp
-chiba.jp
-ehime.jp
-fukui.jp
-fukuoka.jp
-fukushima.jp
-gifu.jp
-gunma.jp
-hiroshima.jp
-hokkaido.jp
-hyogo.jp
-ibaraki.jp
-ishikawa.jp
-iwate.jp
-kagawa.jp
-kagoshima.jp
-kanagawa.jp
-kochi.jp
-kumamoto.jp
-kyoto.jp
-mie.jp
-miyagi.jp
-miyazaki.jp
-nagano.jp
-nagasaki.jp
-nara.jp
-niigata.jp
-oita.jp
-okayama.jp
-okinawa.jp
-osaka.jp
-saga.jp
-saitama.jp
-shiga.jp
-shimane.jp
-shizuoka.jp
-tochigi.jp
-tokushima.jp
-tokyo.jp
-tottori.jp
-toyama.jp
-wakayama.jp
-yamagata.jp
-yamaguchi.jp
-yamanashi.jp
-栃木.jp
-愛知.jp
-愛媛.jp
-兵庫.jp
-熊本.jp
-茨城.jp
-北海道.jp
-千葉.jp
-和歌山.jp
-長崎.jp
-長野.jp
-新潟.jp
-青森.jp
-静岡.jp
-東京.jp
-石川.jp
-埼玉.jp
-三重.jp
-京都.jp
-佐賀.jp
-大分.jp
-大阪.jp
-奈良.jp
-宮城.jp
-宮崎.jp
-富山.jp
-山口.jp
-山形.jp
-山梨.jp
-岩手.jp
-岐阜.jp
-岡山.jp
-島根.jp
-広島.jp
-徳島.jp
-沖縄.jp
-滋賀.jp
-神奈川.jp
-福井.jp
-福岡.jp
-福島.jp
-秋田.jp
-群馬.jp
-香川.jp
-高知.jp
-鳥取.jp
-鹿児島.jp
-// jp geographic type names
-// http://jprs.jp/doc/rule/saisoku-1.html
-*.kawasaki.jp
-*.kitakyushu.jp
-*.kobe.jp
-*.nagoya.jp
-*.sapporo.jp
-*.sendai.jp
-*.yokohama.jp
-!city.kawasaki.jp
-!city.kitakyushu.jp
-!city.kobe.jp
-!city.nagoya.jp
-!city.sapporo.jp
-!city.sendai.jp
-!city.yokohama.jp
-// 4th level registration
-aisai.aichi.jp
-ama.aichi.jp
-anjo.aichi.jp
-asuke.aichi.jp
-chiryu.aichi.jp
-chita.aichi.jp
-fuso.aichi.jp
-gamagori.aichi.jp
-handa.aichi.jp
-hazu.aichi.jp
-hekinan.aichi.jp
-higashiura.aichi.jp
-ichinomiya.aichi.jp
-inazawa.aichi.jp
-inuyama.aichi.jp
-isshiki.aichi.jp
-iwakura.aichi.jp
-kanie.aichi.jp
-kariya.aichi.jp
-kasugai.aichi.jp
-kira.aichi.jp
-kiyosu.aichi.jp
-komaki.aichi.jp
-konan.aichi.jp
-kota.aichi.jp
-mihama.aichi.jp
-miyoshi.aichi.jp
-nishio.aichi.jp
-nisshin.aichi.jp
-obu.aichi.jp
-oguchi.aichi.jp
-oharu.aichi.jp
-okazaki.aichi.jp
-owariasahi.aichi.jp
-seto.aichi.jp
-shikatsu.aichi.jp
-shinshiro.aichi.jp
-shitara.aichi.jp
-tahara.aichi.jp
-takahama.aichi.jp
-tobishima.aichi.jp
-toei.aichi.jp
-togo.aichi.jp
-tokai.aichi.jp
-tokoname.aichi.jp
-toyoake.aichi.jp
-toyohashi.aichi.jp
-toyokawa.aichi.jp
-toyone.aichi.jp
-toyota.aichi.jp
-tsushima.aichi.jp
-yatomi.aichi.jp
-akita.akita.jp
-daisen.akita.jp
-fujisato.akita.jp
-gojome.akita.jp
-hachirogata.akita.jp
-happou.akita.jp
-higashinaruse.akita.jp
-honjo.akita.jp
-honjyo.akita.jp
-ikawa.akita.jp
-kamikoani.akita.jp
-kamioka.akita.jp
-katagami.akita.jp
-kazuno.akita.jp
-kitaakita.akita.jp
-kosaka.akita.jp
-kyowa.akita.jp
-misato.akita.jp
-mitane.akita.jp
-moriyoshi.akita.jp
-nikaho.akita.jp
-noshiro.akita.jp
-odate.akita.jp
-oga.akita.jp
-ogata.akita.jp
-semboku.akita.jp
-yokote.akita.jp
-yurihonjo.akita.jp
-aomori.aomori.jp
-gonohe.aomori.jp
-hachinohe.aomori.jp
-hashikami.aomori.jp
-hiranai.aomori.jp
-hirosaki.aomori.jp
-itayanagi.aomori.jp
-kuroishi.aomori.jp
-misawa.aomori.jp
-mutsu.aomori.jp
-nakadomari.aomori.jp
-noheji.aomori.jp
-oirase.aomori.jp
-owani.aomori.jp
-rokunohe.aomori.jp
-sannohe.aomori.jp
-shichinohe.aomori.jp
-shingo.aomori.jp
-takko.aomori.jp
-towada.aomori.jp
-tsugaru.aomori.jp
-tsuruta.aomori.jp
-abiko.chiba.jp
-asahi.chiba.jp
-chonan.chiba.jp
-chosei.chiba.jp
-choshi.chiba.jp
-chuo.chiba.jp
-funabashi.chiba.jp
-futtsu.chiba.jp
-hanamigawa.chiba.jp
-ichihara.chiba.jp
-ichikawa.chiba.jp
-ichinomiya.chiba.jp
-inzai.chiba.jp
-isumi.chiba.jp
-kamagaya.chiba.jp
-kamogawa.chiba.jp
-kashiwa.chiba.jp
-katori.chiba.jp
-katsuura.chiba.jp
-kimitsu.chiba.jp
-kisarazu.chiba.jp
-kozaki.chiba.jp
-kujukuri.chiba.jp
-kyonan.chiba.jp
-matsudo.chiba.jp
-midori.chiba.jp
-mihama.chiba.jp
-minamiboso.chiba.jp
-mobara.chiba.jp
-mutsuzawa.chiba.jp
-nagara.chiba.jp
-nagareyama.chiba.jp
-narashino.chiba.jp
-narita.chiba.jp
-noda.chiba.jp
-oamishirasato.chiba.jp
-omigawa.chiba.jp
-onjuku.chiba.jp
-otaki.chiba.jp
-sakae.chiba.jp
-sakura.chiba.jp
-shimofusa.chiba.jp
-shirako.chiba.jp
-shiroi.chiba.jp
-shisui.chiba.jp
-sodegaura.chiba.jp
-sosa.chiba.jp
-tako.chiba.jp
-tateyama.chiba.jp
-togane.chiba.jp
-tohnosho.chiba.jp
-tomisato.chiba.jp
-urayasu.chiba.jp
-yachimata.chiba.jp
-yachiyo.chiba.jp
-yokaichiba.chiba.jp
-yokoshibahikari.chiba.jp
-yotsukaido.chiba.jp
-ainan.ehime.jp
-honai.ehime.jp
-ikata.ehime.jp
-imabari.ehime.jp
-iyo.ehime.jp
-kamijima.ehime.jp
-kihoku.ehime.jp
-kumakogen.ehime.jp
-masaki.ehime.jp
-matsuno.ehime.jp
-matsuyama.ehime.jp
-namikata.ehime.jp
-niihama.ehime.jp
-ozu.ehime.jp
-saijo.ehime.jp
-seiyo.ehime.jp
-shikokuchuo.ehime.jp
-tobe.ehime.jp
-toon.ehime.jp
-uchiko.ehime.jp
-uwajima.ehime.jp
-yawatahama.ehime.jp
-echizen.fukui.jp
-eiheiji.fukui.jp
-fukui.fukui.jp
-ikeda.fukui.jp
-katsuyama.fukui.jp
-mihama.fukui.jp
-minamiechizen.fukui.jp
-obama.fukui.jp
-ohi.fukui.jp
-ono.fukui.jp
-sabae.fukui.jp
-sakai.fukui.jp
-takahama.fukui.jp
-tsuruga.fukui.jp
-wakasa.fukui.jp
-ashiya.fukuoka.jp
-buzen.fukuoka.jp
-chikugo.fukuoka.jp
-chikuho.fukuoka.jp
-chikujo.fukuoka.jp
-chikushino.fukuoka.jp
-chikuzen.fukuoka.jp
-chuo.fukuoka.jp
-dazaifu.fukuoka.jp
-fukuchi.fukuoka.jp
-hakata.fukuoka.jp
-higashi.fukuoka.jp
-hirokawa.fukuoka.jp
-hisayama.fukuoka.jp
-iizuka.fukuoka.jp
-inatsuki.fukuoka.jp
-kaho.fukuoka.jp
-kasuga.fukuoka.jp
-kasuya.fukuoka.jp
-kawara.fukuoka.jp
-keisen.fukuoka.jp
-koga.fukuoka.jp
-kurate.fukuoka.jp
-kurogi.fukuoka.jp
-kurume.fukuoka.jp
-minami.fukuoka.jp
-miyako.fukuoka.jp
-miyama.fukuoka.jp
-miyawaka.fukuoka.jp
-mizumaki.fukuoka.jp
-munakata.fukuoka.jp
-nakagawa.fukuoka.jp
-nakama.fukuoka.jp
-nishi.fukuoka.jp
-nogata.fukuoka.jp
-ogori.fukuoka.jp
-okagaki.fukuoka.jp
-okawa.fukuoka.jp
-oki.fukuoka.jp
-omuta.fukuoka.jp
-onga.fukuoka.jp
-onojo.fukuoka.jp
-oto.fukuoka.jp
-saigawa.fukuoka.jp
-sasaguri.fukuoka.jp
-shingu.fukuoka.jp
-shinyoshitomi.fukuoka.jp
-shonai.fukuoka.jp
-soeda.fukuoka.jp
-sue.fukuoka.jp
-tachiarai.fukuoka.jp
-tagawa.fukuoka.jp
-takata.fukuoka.jp
-toho.fukuoka.jp
-toyotsu.fukuoka.jp
-tsuiki.fukuoka.jp
-ukiha.fukuoka.jp
-umi.fukuoka.jp
-usui.fukuoka.jp
-yamada.fukuoka.jp
-yame.fukuoka.jp
-yanagawa.fukuoka.jp
-yukuhashi.fukuoka.jp
-aizubange.fukushima.jp
-aizumisato.fukushima.jp
-aizuwakamatsu.fukushima.jp
-asakawa.fukushima.jp
-bandai.fukushima.jp
-date.fukushima.jp
-fukushima.fukushima.jp
-furudono.fukushima.jp
-futaba.fukushima.jp
-hanawa.fukushima.jp
-higashi.fukushima.jp
-hirata.fukushima.jp
-hirono.fukushima.jp
-iitate.fukushima.jp
-inawashiro.fukushima.jp
-ishikawa.fukushima.jp
-iwaki.fukushima.jp
-izumizaki.fukushima.jp
-kagamiishi.fukushima.jp
-kaneyama.fukushima.jp
-kawamata.fukushima.jp
-kitakata.fukushima.jp
-kitashiobara.fukushima.jp
-koori.fukushima.jp
-koriyama.fukushima.jp
-kunimi.fukushima.jp
-miharu.fukushima.jp
-mishima.fukushima.jp
-namie.fukushima.jp
-nango.fukushima.jp
-nishiaizu.fukushima.jp
-nishigo.fukushima.jp
-okuma.fukushima.jp
-omotego.fukushima.jp
-ono.fukushima.jp
-otama.fukushima.jp
-samegawa.fukushima.jp
-shimogo.fukushima.jp
-shirakawa.fukushima.jp
-showa.fukushima.jp
-soma.fukushima.jp
-sukagawa.fukushima.jp
-taishin.fukushima.jp
-tamakawa.fukushima.jp
-tanagura.fukushima.jp
-tenei.fukushima.jp
-yabuki.fukushima.jp
-yamato.fukushima.jp
-yamatsuri.fukushima.jp
-yanaizu.fukushima.jp
-yugawa.fukushima.jp
-anpachi.gifu.jp
-ena.gifu.jp
-gifu.gifu.jp
-ginan.gifu.jp
-godo.gifu.jp
-gujo.gifu.jp
-hashima.gifu.jp
-hichiso.gifu.jp
-hida.gifu.jp
-higashishirakawa.gifu.jp
-ibigawa.gifu.jp
-ikeda.gifu.jp
-kakamigahara.gifu.jp
-kani.gifu.jp
-kasahara.gifu.jp
-kasamatsu.gifu.jp
-kawaue.gifu.jp
-kitagata.gifu.jp
-mino.gifu.jp
-minokamo.gifu.jp
-mitake.gifu.jp
-mizunami.gifu.jp
-motosu.gifu.jp
-nakatsugawa.gifu.jp
-ogaki.gifu.jp
-sakahogi.gifu.jp
-seki.gifu.jp
-sekigahara.gifu.jp
-shirakawa.gifu.jp
-tajimi.gifu.jp
-takayama.gifu.jp
-tarui.gifu.jp
-toki.gifu.jp
-tomika.gifu.jp
-wanouchi.gifu.jp
-yamagata.gifu.jp
-yaotsu.gifu.jp
-yoro.gifu.jp
-annaka.gunma.jp
-chiyoda.gunma.jp
-fujioka.gunma.jp
-higashiagatsuma.gunma.jp
-isesaki.gunma.jp
-itakura.gunma.jp
-kanna.gunma.jp
-kanra.gunma.jp
-katashina.gunma.jp
-kawaba.gunma.jp
-kiryu.gunma.jp
-kusatsu.gunma.jp
-maebashi.gunma.jp
-meiwa.gunma.jp
-midori.gunma.jp
-minakami.gunma.jp
-naganohara.gunma.jp
-nakanojo.gunma.jp
-nanmoku.gunma.jp
-numata.gunma.jp
-oizumi.gunma.jp
-ora.gunma.jp
-ota.gunma.jp
-shibukawa.gunma.jp
-shimonita.gunma.jp
-shinto.gunma.jp
-showa.gunma.jp
-takasaki.gunma.jp
-takayama.gunma.jp
-tamamura.gunma.jp
-tatebayashi.gunma.jp
-tomioka.gunma.jp
-tsukiyono.gunma.jp
-tsumagoi.gunma.jp
-ueno.gunma.jp
-yoshioka.gunma.jp
-asaminami.hiroshima.jp
-daiwa.hiroshima.jp
-etajima.hiroshima.jp
-fuchu.hiroshima.jp
-fukuyama.hiroshima.jp
-hatsukaichi.hiroshima.jp
-higashihiroshima.hiroshima.jp
-hongo.hiroshima.jp
-jinsekikogen.hiroshima.jp
-kaita.hiroshima.jp
-kui.hiroshima.jp
-kumano.hiroshima.jp
-kure.hiroshima.jp
-mihara.hiroshima.jp
-miyoshi.hiroshima.jp
-naka.hiroshima.jp
-onomichi.hiroshima.jp
-osakikamijima.hiroshima.jp
-otake.hiroshima.jp
-saka.hiroshima.jp
-sera.hiroshima.jp
-seranishi.hiroshima.jp
-shinichi.hiroshima.jp
-shobara.hiroshima.jp
-takehara.hiroshima.jp
-abashiri.hokkaido.jp
-abira.hokkaido.jp
-aibetsu.hokkaido.jp
-akabira.hokkaido.jp
-akkeshi.hokkaido.jp
-asahikawa.hokkaido.jp
-ashibetsu.hokkaido.jp
-ashoro.hokkaido.jp
-assabu.hokkaido.jp
-atsuma.hokkaido.jp
-bibai.hokkaido.jp
-biei.hokkaido.jp
-bifuka.hokkaido.jp
-bihoro.hokkaido.jp
-biratori.hokkaido.jp
-chippubetsu.hokkaido.jp
-chitose.hokkaido.jp
-date.hokkaido.jp
-ebetsu.hokkaido.jp
-embetsu.hokkaido.jp
-eniwa.hokkaido.jp
-erimo.hokkaido.jp
-esan.hokkaido.jp
-esashi.hokkaido.jp
-fukagawa.hokkaido.jp
-fukushima.hokkaido.jp
-furano.hokkaido.jp
-furubira.hokkaido.jp
-haboro.hokkaido.jp
-hakodate.hokkaido.jp
-hamatonbetsu.hokkaido.jp
-hidaka.hokkaido.jp
-higashikagura.hokkaido.jp
-higashikawa.hokkaido.jp
-hiroo.hokkaido.jp
-hokuryu.hokkaido.jp
-hokuto.hokkaido.jp
-honbetsu.hokkaido.jp
-horokanai.hokkaido.jp
-horonobe.hokkaido.jp
-ikeda.hokkaido.jp
-imakane.hokkaido.jp
-ishikari.hokkaido.jp
-iwamizawa.hokkaido.jp
-iwanai.hokkaido.jp
-kamifurano.hokkaido.jp
-kamikawa.hokkaido.jp
-kamishihoro.hokkaido.jp
-kamisunagawa.hokkaido.jp
-kamoenai.hokkaido.jp
-kayabe.hokkaido.jp
-kembuchi.hokkaido.jp
-kikonai.hokkaido.jp
-kimobetsu.hokkaido.jp
-kitahiroshima.hokkaido.jp
-kitami.hokkaido.jp
-kiyosato.hokkaido.jp
-koshimizu.hokkaido.jp
-kunneppu.hokkaido.jp
-kuriyama.hokkaido.jp
-kuromatsunai.hokkaido.jp
-kushiro.hokkaido.jp
-kutchan.hokkaido.jp
-kyowa.hokkaido.jp
-mashike.hokkaido.jp
-matsumae.hokkaido.jp
-mikasa.hokkaido.jp
-minamifurano.hokkaido.jp
-mombetsu.hokkaido.jp
-moseushi.hokkaido.jp
-mukawa.hokkaido.jp
-muroran.hokkaido.jp
-naie.hokkaido.jp
-nakagawa.hokkaido.jp
-nakasatsunai.hokkaido.jp
-nakatombetsu.hokkaido.jp
-nanae.hokkaido.jp
-nanporo.hokkaido.jp
-nayoro.hokkaido.jp
-nemuro.hokkaido.jp
-niikappu.hokkaido.jp
-niki.hokkaido.jp
-nishiokoppe.hokkaido.jp
-noboribetsu.hokkaido.jp
-numata.hokkaido.jp
-obihiro.hokkaido.jp
-obira.hokkaido.jp
-oketo.hokkaido.jp
-okoppe.hokkaido.jp
-otaru.hokkaido.jp
-otobe.hokkaido.jp
-otofuke.hokkaido.jp
-otoineppu.hokkaido.jp
-oumu.hokkaido.jp
-ozora.hokkaido.jp
-pippu.hokkaido.jp
-rankoshi.hokkaido.jp
-rebun.hokkaido.jp
-rikubetsu.hokkaido.jp
-rishiri.hokkaido.jp
-rishirifuji.hokkaido.jp
-saroma.hokkaido.jp
-sarufutsu.hokkaido.jp
-shakotan.hokkaido.jp
-shari.hokkaido.jp
-shibecha.hokkaido.jp
-shibetsu.hokkaido.jp
-shikabe.hokkaido.jp
-shikaoi.hokkaido.jp
-shimamaki.hokkaido.jp
-shimizu.hokkaido.jp
-shimokawa.hokkaido.jp
-shinshinotsu.hokkaido.jp
-shintoku.hokkaido.jp
-shiranuka.hokkaido.jp
-shiraoi.hokkaido.jp
-shiriuchi.hokkaido.jp
-sobetsu.hokkaido.jp
-sunagawa.hokkaido.jp
-taiki.hokkaido.jp
-takasu.hokkaido.jp
-takikawa.hokkaido.jp
-takinoue.hokkaido.jp
-teshikaga.hokkaido.jp
-tobetsu.hokkaido.jp
-tohma.hokkaido.jp
-tomakomai.hokkaido.jp
-tomari.hokkaido.jp
-toya.hokkaido.jp
-toyako.hokkaido.jp
-toyotomi.hokkaido.jp
-toyoura.hokkaido.jp
-tsubetsu.hokkaido.jp
-tsukigata.hokkaido.jp
-urakawa.hokkaido.jp
-urausu.hokkaido.jp
-uryu.hokkaido.jp
-utashinai.hokkaido.jp
-wakkanai.hokkaido.jp
-wassamu.hokkaido.jp
-yakumo.hokkaido.jp
-yoichi.hokkaido.jp
-aioi.hyogo.jp
-akashi.hyogo.jp
-ako.hyogo.jp
-amagasaki.hyogo.jp
-aogaki.hyogo.jp
-asago.hyogo.jp
-ashiya.hyogo.jp
-awaji.hyogo.jp
-fukusaki.hyogo.jp
-goshiki.hyogo.jp
-harima.hyogo.jp
-himeji.hyogo.jp
-ichikawa.hyogo.jp
-inagawa.hyogo.jp
-itami.hyogo.jp
-kakogawa.hyogo.jp
-kamigori.hyogo.jp
-kamikawa.hyogo.jp
-kasai.hyogo.jp
-kasuga.hyogo.jp
-kawanishi.hyogo.jp
-miki.hyogo.jp
-minamiawaji.hyogo.jp
-nishinomiya.hyogo.jp
-nishiwaki.hyogo.jp
-ono.hyogo.jp
-sanda.hyogo.jp
-sannan.hyogo.jp
-sasayama.hyogo.jp
-sayo.hyogo.jp
-shingu.hyogo.jp
-shinonsen.hyogo.jp
-shiso.hyogo.jp
-sumoto.hyogo.jp
-taishi.hyogo.jp
-taka.hyogo.jp
-takarazuka.hyogo.jp
-takasago.hyogo.jp
-takino.hyogo.jp
-tamba.hyogo.jp
-tatsuno.hyogo.jp
-toyooka.hyogo.jp
-yabu.hyogo.jp
-yashiro.hyogo.jp
-yoka.hyogo.jp
-yokawa.hyogo.jp
-ami.ibaraki.jp
-asahi.ibaraki.jp
-bando.ibaraki.jp
-chikusei.ibaraki.jp
-daigo.ibaraki.jp
-fujishiro.ibaraki.jp
-hitachi.ibaraki.jp
-hitachinaka.ibaraki.jp
-hitachiomiya.ibaraki.jp
-hitachiota.ibaraki.jp
-ibaraki.ibaraki.jp
-ina.ibaraki.jp
-inashiki.ibaraki.jp
-itako.ibaraki.jp
-iwama.ibaraki.jp
-joso.ibaraki.jp
-kamisu.ibaraki.jp
-kasama.ibaraki.jp
-kashima.ibaraki.jp
-kasumigaura.ibaraki.jp
-koga.ibaraki.jp
-miho.ibaraki.jp
-mito.ibaraki.jp
-moriya.ibaraki.jp
-naka.ibaraki.jp
-namegata.ibaraki.jp
-oarai.ibaraki.jp
-ogawa.ibaraki.jp
-omitama.ibaraki.jp
-ryugasaki.ibaraki.jp
-sakai.ibaraki.jp
-sakuragawa.ibaraki.jp
-shimodate.ibaraki.jp
-shimotsuma.ibaraki.jp
-shirosato.ibaraki.jp
-sowa.ibaraki.jp
-suifu.ibaraki.jp
-takahagi.ibaraki.jp
-tamatsukuri.ibaraki.jp
-tokai.ibaraki.jp
-tomobe.ibaraki.jp
-tone.ibaraki.jp
-toride.ibaraki.jp
-tsuchiura.ibaraki.jp
-tsukuba.ibaraki.jp
-uchihara.ibaraki.jp
-ushiku.ibaraki.jp
-yachiyo.ibaraki.jp
-yamagata.ibaraki.jp
-yawara.ibaraki.jp
-yuki.ibaraki.jp
-anamizu.ishikawa.jp
-hakui.ishikawa.jp
-hakusan.ishikawa.jp
-kaga.ishikawa.jp
-kahoku.ishikawa.jp
-kanazawa.ishikawa.jp
-kawakita.ishikawa.jp
-komatsu.ishikawa.jp
-nakanoto.ishikawa.jp
-nanao.ishikawa.jp
-nomi.ishikawa.jp
-nonoichi.ishikawa.jp
-noto.ishikawa.jp
-shika.ishikawa.jp
-suzu.ishikawa.jp
-tsubata.ishikawa.jp
-tsurugi.ishikawa.jp
-uchinada.ishikawa.jp
-wajima.ishikawa.jp
-fudai.iwate.jp
-fujisawa.iwate.jp
-hanamaki.iwate.jp
-hiraizumi.iwate.jp
-hirono.iwate.jp
-ichinohe.iwate.jp
-ichinoseki.iwate.jp
-iwaizumi.iwate.jp
-iwate.iwate.jp
-joboji.iwate.jp
-kamaishi.iwate.jp
-kanegasaki.iwate.jp
-karumai.iwate.jp
-kawai.iwate.jp
-kitakami.iwate.jp
-kuji.iwate.jp
-kunohe.iwate.jp
-kuzumaki.iwate.jp
-miyako.iwate.jp
-mizusawa.iwate.jp
-morioka.iwate.jp
-ninohe.iwate.jp
-noda.iwate.jp
-ofunato.iwate.jp
-oshu.iwate.jp
-otsuchi.iwate.jp
-rikuzentakata.iwate.jp
-shiwa.iwate.jp
-shizukuishi.iwate.jp
-sumita.iwate.jp
-tanohata.iwate.jp
-tono.iwate.jp
-yahaba.iwate.jp
-yamada.iwate.jp
-ayagawa.kagawa.jp
-higashikagawa.kagawa.jp
-kanonji.kagawa.jp
-kotohira.kagawa.jp
-manno.kagawa.jp
-marugame.kagawa.jp
-mitoyo.kagawa.jp
-naoshima.kagawa.jp
-sanuki.kagawa.jp
-tadotsu.kagawa.jp
-takamatsu.kagawa.jp
-tonosho.kagawa.jp
-uchinomi.kagawa.jp
-utazu.kagawa.jp
-zentsuji.kagawa.jp
-akune.kagoshima.jp
-amami.kagoshima.jp
-hioki.kagoshima.jp
-isa.kagoshima.jp
-isen.kagoshima.jp
-izumi.kagoshima.jp
-kagoshima.kagoshima.jp
-kanoya.kagoshima.jp
-kawanabe.kagoshima.jp
-kinko.kagoshima.jp
-kouyama.kagoshima.jp
-makurazaki.kagoshima.jp
-matsumoto.kagoshima.jp
-minamitane.kagoshima.jp
-nakatane.kagoshima.jp
-nishinoomote.kagoshima.jp
-satsumasendai.kagoshima.jp
-soo.kagoshima.jp
-tarumizu.kagoshima.jp
-yusui.kagoshima.jp
-aikawa.kanagawa.jp
-atsugi.kanagawa.jp
-ayase.kanagawa.jp
-chigasaki.kanagawa.jp
-ebina.kanagawa.jp
-fujisawa.kanagawa.jp
-hadano.kanagawa.jp
-hakone.kanagawa.jp
-hiratsuka.kanagawa.jp
-isehara.kanagawa.jp
-kaisei.kanagawa.jp
-kamakura.kanagawa.jp
-kiyokawa.kanagawa.jp
-matsuda.kanagawa.jp
-minamiashigara.kanagawa.jp
-miura.kanagawa.jp
-nakai.kanagawa.jp
-ninomiya.kanagawa.jp
-odawara.kanagawa.jp
-oi.kanagawa.jp
-oiso.kanagawa.jp
-sagamihara.kanagawa.jp
-samukawa.kanagawa.jp
-tsukui.kanagawa.jp
-yamakita.kanagawa.jp
-yamato.kanagawa.jp
-yokosuka.kanagawa.jp
-yugawara.kanagawa.jp
-zama.kanagawa.jp
-zushi.kanagawa.jp
-aki.kochi.jp
-geisei.kochi.jp
-hidaka.kochi.jp
-higashitsuno.kochi.jp
-ino.kochi.jp
-kagami.kochi.jp
-kami.kochi.jp
-kitagawa.kochi.jp
-kochi.kochi.jp
-mihara.kochi.jp
-motoyama.kochi.jp
-muroto.kochi.jp
-nahari.kochi.jp
-nakamura.kochi.jp
-nankoku.kochi.jp
-nishitosa.kochi.jp
-niyodogawa.kochi.jp
-ochi.kochi.jp
-okawa.kochi.jp
-otoyo.kochi.jp
-otsuki.kochi.jp
-sakawa.kochi.jp
-sukumo.kochi.jp
-susaki.kochi.jp
-tosa.kochi.jp
-tosashimizu.kochi.jp
-toyo.kochi.jp
-tsuno.kochi.jp
-umaji.kochi.jp
-yasuda.kochi.jp
-yusuhara.kochi.jp
-amakusa.kumamoto.jp
-arao.kumamoto.jp
-aso.kumamoto.jp
-choyo.kumamoto.jp
-gyokuto.kumamoto.jp
-hitoyoshi.kumamoto.jp
-kamiamakusa.kumamoto.jp
-kashima.kumamoto.jp
-kikuchi.kumamoto.jp
-kosa.kumamoto.jp
-kumamoto.kumamoto.jp
-mashiki.kumamoto.jp
-mifune.kumamoto.jp
-minamata.kumamoto.jp
-minamioguni.kumamoto.jp
-nagasu.kumamoto.jp
-nishihara.kumamoto.jp
-oguni.kumamoto.jp
-ozu.kumamoto.jp
-sumoto.kumamoto.jp
-takamori.kumamoto.jp
-uki.kumamoto.jp
-uto.kumamoto.jp
-yamaga.kumamoto.jp
-yamato.kumamoto.jp
-yatsushiro.kumamoto.jp
-ayabe.kyoto.jp
-fukuchiyama.kyoto.jp
-higashiyama.kyoto.jp
-ide.kyoto.jp
-ine.kyoto.jp
-joyo.kyoto.jp
-kameoka.kyoto.jp
-kamo.kyoto.jp
-kita.kyoto.jp
-kizu.kyoto.jp
-kumiyama.kyoto.jp
-kyotamba.kyoto.jp
-kyotanabe.kyoto.jp
-kyotango.kyoto.jp
-maizuru.kyoto.jp
-minami.kyoto.jp
-minamiyamashiro.kyoto.jp
-miyazu.kyoto.jp
-muko.kyoto.jp
-nagaokakyo.kyoto.jp
-nakagyo.kyoto.jp
-nantan.kyoto.jp
-oyamazaki.kyoto.jp
-sakyo.kyoto.jp
-seika.kyoto.jp
-tanabe.kyoto.jp
-uji.kyoto.jp
-ujitawara.kyoto.jp
-wazuka.kyoto.jp
-yamashina.kyoto.jp
-yawata.kyoto.jp
-asahi.mie.jp
-inabe.mie.jp
-ise.mie.jp
-kameyama.mie.jp
-kawagoe.mie.jp
-kiho.mie.jp
-kisosaki.mie.jp
-kiwa.mie.jp
-komono.mie.jp
-kumano.mie.jp
-kuwana.mie.jp
-matsusaka.mie.jp
-meiwa.mie.jp
-mihama.mie.jp
-minamiise.mie.jp
-misugi.mie.jp
-miyama.mie.jp
-nabari.mie.jp
-shima.mie.jp
-suzuka.mie.jp
-tado.mie.jp
-taiki.mie.jp
-taki.mie.jp
-tamaki.mie.jp
-toba.mie.jp
-tsu.mie.jp
-udono.mie.jp
-ureshino.mie.jp
-watarai.mie.jp
-yokkaichi.mie.jp
-furukawa.miyagi.jp
-higashimatsushima.miyagi.jp
-ishinomaki.miyagi.jp
-iwanuma.miyagi.jp
-kakuda.miyagi.jp
-kami.miyagi.jp
-kawasaki.miyagi.jp
-kesennuma.miyagi.jp
-marumori.miyagi.jp
-matsushima.miyagi.jp
-minamisanriku.miyagi.jp
-misato.miyagi.jp
-murata.miyagi.jp
-natori.miyagi.jp
-ogawara.miyagi.jp
-ohira.miyagi.jp
-onagawa.miyagi.jp
-osaki.miyagi.jp
-rifu.miyagi.jp
-semine.miyagi.jp
-shibata.miyagi.jp
-shichikashuku.miyagi.jp
-shikama.miyagi.jp
-shiogama.miyagi.jp
-shiroishi.miyagi.jp
-tagajo.miyagi.jp
-taiwa.miyagi.jp
-tome.miyagi.jp
-tomiya.miyagi.jp
-wakuya.miyagi.jp
-watari.miyagi.jp
-yamamoto.miyagi.jp
-zao.miyagi.jp
-aya.miyazaki.jp
-ebino.miyazaki.jp
-gokase.miyazaki.jp
-hyuga.miyazaki.jp
-kadogawa.miyazaki.jp
-kawaminami.miyazaki.jp
-kijo.miyazaki.jp
-kitagawa.miyazaki.jp
-kitakata.miyazaki.jp
-kitaura.miyazaki.jp
-kobayashi.miyazaki.jp
-kunitomi.miyazaki.jp
-kushima.miyazaki.jp
-mimata.miyazaki.jp
-miyakonojo.miyazaki.jp
-miyazaki.miyazaki.jp
-morotsuka.miyazaki.jp
-nichinan.miyazaki.jp
-nishimera.miyazaki.jp
-nobeoka.miyazaki.jp
-saito.miyazaki.jp
-shiiba.miyazaki.jp
-shintomi.miyazaki.jp
-takaharu.miyazaki.jp
-takanabe.miyazaki.jp
-takazaki.miyazaki.jp
-tsuno.miyazaki.jp
-achi.nagano.jp
-agematsu.nagano.jp
-anan.nagano.jp
-aoki.nagano.jp
-asahi.nagano.jp
-azumino.nagano.jp
-chikuhoku.nagano.jp
-chikuma.nagano.jp
-chino.nagano.jp
-fujimi.nagano.jp
-hakuba.nagano.jp
-hara.nagano.jp
-hiraya.nagano.jp
-iida.nagano.jp
-iijima.nagano.jp
-iiyama.nagano.jp
-iizuna.nagano.jp
-ikeda.nagano.jp
-ikusaka.nagano.jp
-ina.nagano.jp
-karuizawa.nagano.jp
-kawakami.nagano.jp
-kiso.nagano.jp
-kisofukushima.nagano.jp
-kitaaiki.nagano.jp
-komagane.nagano.jp
-komoro.nagano.jp
-matsukawa.nagano.jp
-matsumoto.nagano.jp
-miasa.nagano.jp
-minamiaiki.nagano.jp
-minamimaki.nagano.jp
-minamiminowa.nagano.jp
-minowa.nagano.jp
-miyada.nagano.jp
-miyota.nagano.jp
-mochizuki.nagano.jp
-nagano.nagano.jp
-nagawa.nagano.jp
-nagiso.nagano.jp
-nakagawa.nagano.jp
-nakano.nagano.jp
-nozawaonsen.nagano.jp
-obuse.nagano.jp
-ogawa.nagano.jp
-okaya.nagano.jp
-omachi.nagano.jp
-omi.nagano.jp
-ookuwa.nagano.jp
-ooshika.nagano.jp
-otaki.nagano.jp
-otari.nagano.jp
-sakae.nagano.jp
-sakaki.nagano.jp
-saku.nagano.jp
-sakuho.nagano.jp
-shimosuwa.nagano.jp
-shinanomachi.nagano.jp
-shiojiri.nagano.jp
-suwa.nagano.jp
-suzaka.nagano.jp
-takagi.nagano.jp
-takamori.nagano.jp
-takayama.nagano.jp
-tateshina.nagano.jp
-tatsuno.nagano.jp
-togakushi.nagano.jp
-togura.nagano.jp
-tomi.nagano.jp
-ueda.nagano.jp
-wada.nagano.jp
-yamagata.nagano.jp
-yamanouchi.nagano.jp
-yasaka.nagano.jp
-yasuoka.nagano.jp
-chijiwa.nagasaki.jp
-futsu.nagasaki.jp
-goto.nagasaki.jp
-hasami.nagasaki.jp
-hirado.nagasaki.jp
-iki.nagasaki.jp
-isahaya.nagasaki.jp
-kawatana.nagasaki.jp
-kuchinotsu.nagasaki.jp
-matsuura.nagasaki.jp
-nagasaki.nagasaki.jp
-obama.nagasaki.jp
-omura.nagasaki.jp
-oseto.nagasaki.jp
-saikai.nagasaki.jp
-sasebo.nagasaki.jp
-seihi.nagasaki.jp
-shimabara.nagasaki.jp
-shinkamigoto.nagasaki.jp
-togitsu.nagasaki.jp
-tsushima.nagasaki.jp
-unzen.nagasaki.jp
-ando.nara.jp
-gose.nara.jp
-heguri.nara.jp
-higashiyoshino.nara.jp
-ikaruga.nara.jp
-ikoma.nara.jp
-kamikitayama.nara.jp
-kanmaki.nara.jp
-kashiba.nara.jp
-kashihara.nara.jp
-katsuragi.nara.jp
-kawai.nara.jp
-kawakami.nara.jp
-kawanishi.nara.jp
-koryo.nara.jp
-kurotaki.nara.jp
-mitsue.nara.jp
-miyake.nara.jp
-nara.nara.jp
-nosegawa.nara.jp
-oji.nara.jp
-ouda.nara.jp
-oyodo.nara.jp
-sakurai.nara.jp
-sango.nara.jp
-shimoichi.nara.jp
-shimokitayama.nara.jp
-shinjo.nara.jp
-soni.nara.jp
-takatori.nara.jp
-tawaramoto.nara.jp
-tenkawa.nara.jp
-tenri.nara.jp
-uda.nara.jp
-yamatokoriyama.nara.jp
-yamatotakada.nara.jp
-yamazoe.nara.jp
-yoshino.nara.jp
-aga.niigata.jp
-agano.niigata.jp
-gosen.niigata.jp
-itoigawa.niigata.jp
-izumozaki.niigata.jp
-joetsu.niigata.jp
-kamo.niigata.jp
-kariwa.niigata.jp
-kashiwazaki.niigata.jp
-minamiuonuma.niigata.jp
-mitsuke.niigata.jp
-muika.niigata.jp
-murakami.niigata.jp
-myoko.niigata.jp
-nagaoka.niigata.jp
-niigata.niigata.jp
-ojiya.niigata.jp
-omi.niigata.jp
-sado.niigata.jp
-sanjo.niigata.jp
-seiro.niigata.jp
-seirou.niigata.jp
-sekikawa.niigata.jp
-shibata.niigata.jp
-tagami.niigata.jp
-tainai.niigata.jp
-tochio.niigata.jp
-tokamachi.niigata.jp
-tsubame.niigata.jp
-tsunan.niigata.jp
-uonuma.niigata.jp
-yahiko.niigata.jp
-yoita.niigata.jp
-yuzawa.niigata.jp
-beppu.oita.jp
-bungoono.oita.jp
-bungotakada.oita.jp
-hasama.oita.jp
-hiji.oita.jp
-himeshima.oita.jp
-hita.oita.jp
-kamitsue.oita.jp
-kokonoe.oita.jp
-kuju.oita.jp
-kunisaki.oita.jp
-kusu.oita.jp
-oita.oita.jp
-saiki.oita.jp
-taketa.oita.jp
-tsukumi.oita.jp
-usa.oita.jp
-usuki.oita.jp
-yufu.oita.jp
-akaiwa.okayama.jp
-asakuchi.okayama.jp
-bizen.okayama.jp
-hayashima.okayama.jp
-ibara.okayama.jp
-kagamino.okayama.jp
-kasaoka.okayama.jp
-kibichuo.okayama.jp
-kumenan.okayama.jp
-kurashiki.okayama.jp
-maniwa.okayama.jp
-misaki.okayama.jp
-nagi.okayama.jp
-niimi.okayama.jp
-nishiawakura.okayama.jp
-okayama.okayama.jp
-satosho.okayama.jp
-setouchi.okayama.jp
-shinjo.okayama.jp
-shoo.okayama.jp
-soja.okayama.jp
-takahashi.okayama.jp
-tamano.okayama.jp
-tsuyama.okayama.jp
-wake.okayama.jp
-yakage.okayama.jp
-aguni.okinawa.jp
-ginowan.okinawa.jp
-ginoza.okinawa.jp
-gushikami.okinawa.jp
-haebaru.okinawa.jp
-higashi.okinawa.jp
-hirara.okinawa.jp
-iheya.okinawa.jp
-ishigaki.okinawa.jp
-ishikawa.okinawa.jp
-itoman.okinawa.jp
-izena.okinawa.jp
-kadena.okinawa.jp
-kin.okinawa.jp
-kitadaito.okinawa.jp
-kitanakagusuku.okinawa.jp
-kumejima.okinawa.jp
-kunigami.okinawa.jp
-minamidaito.okinawa.jp
-motobu.okinawa.jp
-nago.okinawa.jp
-naha.okinawa.jp
-nakagusuku.okinawa.jp
-nakijin.okinawa.jp
-nanjo.okinawa.jp
-nishihara.okinawa.jp
-ogimi.okinawa.jp
-okinawa.okinawa.jp
-onna.okinawa.jp
-shimoji.okinawa.jp
-taketomi.okinawa.jp
-tarama.okinawa.jp
-tokashiki.okinawa.jp
-tomigusuku.okinawa.jp
-tonaki.okinawa.jp
-urasoe.okinawa.jp
-uruma.okinawa.jp
-yaese.okinawa.jp
-yomitan.okinawa.jp
-yonabaru.okinawa.jp
-yonaguni.okinawa.jp
-zamami.okinawa.jp
-abeno.osaka.jp
-chihayaakasaka.osaka.jp
-chuo.osaka.jp
-daito.osaka.jp
-fujiidera.osaka.jp
-habikino.osaka.jp
-hannan.osaka.jp
-higashiosaka.osaka.jp
-higashisumiyoshi.osaka.jp
-higashiyodogawa.osaka.jp
-hirakata.osaka.jp
-ibaraki.osaka.jp
-ikeda.osaka.jp
-izumi.osaka.jp
-izumiotsu.osaka.jp
-izumisano.osaka.jp
-kadoma.osaka.jp
-kaizuka.osaka.jp
-kanan.osaka.jp
-kashiwara.osaka.jp
-katano.osaka.jp
-kawachinagano.osaka.jp
-kishiwada.osaka.jp
-kita.osaka.jp
-kumatori.osaka.jp
-matsubara.osaka.jp
-minato.osaka.jp
-minoh.osaka.jp
-misaki.osaka.jp
-moriguchi.osaka.jp
-neyagawa.osaka.jp
-nishi.osaka.jp
-nose.osaka.jp
-osakasayama.osaka.jp
-sakai.osaka.jp
-sayama.osaka.jp
-sennan.osaka.jp
-settsu.osaka.jp
-shijonawate.osaka.jp
-shimamoto.osaka.jp
-suita.osaka.jp
-tadaoka.osaka.jp
-taishi.osaka.jp
-tajiri.osaka.jp
-takaishi.osaka.jp
-takatsuki.osaka.jp
-tondabayashi.osaka.jp
-toyonaka.osaka.jp
-toyono.osaka.jp
-yao.osaka.jp
-ariake.saga.jp
-arita.saga.jp
-fukudomi.saga.jp
-genkai.saga.jp
-hamatama.saga.jp
-hizen.saga.jp
-imari.saga.jp
-kamimine.saga.jp
-kanzaki.saga.jp
-karatsu.saga.jp
-kashima.saga.jp
-kitagata.saga.jp
-kitahata.saga.jp
-kiyama.saga.jp
-kouhoku.saga.jp
-kyuragi.saga.jp
-nishiarita.saga.jp
-ogi.saga.jp
-omachi.saga.jp
-ouchi.saga.jp
-saga.saga.jp
-shiroishi.saga.jp
-taku.saga.jp
-tara.saga.jp
-tosu.saga.jp
-yoshinogari.saga.jp
-arakawa.saitama.jp
-asaka.saitama.jp
-chichibu.saitama.jp
-fujimi.saitama.jp
-fujimino.saitama.jp
-fukaya.saitama.jp
-hanno.saitama.jp
-hanyu.saitama.jp
-hasuda.saitama.jp
-hatogaya.saitama.jp
-hatoyama.saitama.jp
-hidaka.saitama.jp
-higashichichibu.saitama.jp
-higashimatsuyama.saitama.jp
-honjo.saitama.jp
-ina.saitama.jp
-iruma.saitama.jp
-iwatsuki.saitama.jp
-kamiizumi.saitama.jp
-kamikawa.saitama.jp
-kamisato.saitama.jp
-kasukabe.saitama.jp
-kawagoe.saitama.jp
-kawaguchi.saitama.jp
-kawajima.saitama.jp
-kazo.saitama.jp
-kitamoto.saitama.jp
-koshigaya.saitama.jp
-kounosu.saitama.jp
-kuki.saitama.jp
-kumagaya.saitama.jp
-matsubushi.saitama.jp
-minano.saitama.jp
-misato.saitama.jp
-miyashiro.saitama.jp
-miyoshi.saitama.jp
-moroyama.saitama.jp
-nagatoro.saitama.jp
-namegawa.saitama.jp
-niiza.saitama.jp
-ogano.saitama.jp
-ogawa.saitama.jp
-ogose.saitama.jp
-okegawa.saitama.jp
-omiya.saitama.jp
-otaki.saitama.jp
-ranzan.saitama.jp
-ryokami.saitama.jp
-saitama.saitama.jp
-sakado.saitama.jp
-satte.saitama.jp
-sayama.saitama.jp
-shiki.saitama.jp
-shiraoka.saitama.jp
-soka.saitama.jp
-sugito.saitama.jp
-toda.saitama.jp
-tokigawa.saitama.jp
-tokorozawa.saitama.jp
-tsurugashima.saitama.jp
-urawa.saitama.jp
-warabi.saitama.jp
-yashio.saitama.jp
-yokoze.saitama.jp
-yono.saitama.jp
-yorii.saitama.jp
-yoshida.saitama.jp
-yoshikawa.saitama.jp
-yoshimi.saitama.jp
-aisho.shiga.jp
-gamo.shiga.jp
-higashiomi.shiga.jp
-hikone.shiga.jp
-koka.shiga.jp
-konan.shiga.jp
-kosei.shiga.jp
-koto.shiga.jp
-kusatsu.shiga.jp
-maibara.shiga.jp
-moriyama.shiga.jp
-nagahama.shiga.jp
-nishiazai.shiga.jp
-notogawa.shiga.jp
-omihachiman.shiga.jp
-otsu.shiga.jp
-ritto.shiga.jp
-ryuoh.shiga.jp
-takashima.shiga.jp
-takatsuki.shiga.jp
-torahime.shiga.jp
-toyosato.shiga.jp
-yasu.shiga.jp
-akagi.shimane.jp
-ama.shimane.jp
-gotsu.shimane.jp
-hamada.shimane.jp
-higashiizumo.shimane.jp
-hikawa.shimane.jp
-hikimi.shimane.jp
-izumo.shimane.jp
-kakinoki.shimane.jp
-masuda.shimane.jp
-matsue.shimane.jp
-misato.shimane.jp
-nishinoshima.shimane.jp
-ohda.shimane.jp
-okinoshima.shimane.jp
-okuizumo.shimane.jp
-shimane.shimane.jp
-tamayu.shimane.jp
-tsuwano.shimane.jp
-unnan.shimane.jp
-yakumo.shimane.jp
-yasugi.shimane.jp
-yatsuka.shimane.jp
-arai.shizuoka.jp
-atami.shizuoka.jp
-fuji.shizuoka.jp
-fujieda.shizuoka.jp
-fujikawa.shizuoka.jp
-fujinomiya.shizuoka.jp
-fukuroi.shizuoka.jp
-gotemba.shizuoka.jp
-haibara.shizuoka.jp
-hamamatsu.shizuoka.jp
-higashiizu.shizuoka.jp
-ito.shizuoka.jp
-iwata.shizuoka.jp
-izu.shizuoka.jp
-izunokuni.shizuoka.jp
-kakegawa.shizuoka.jp
-kannami.shizuoka.jp
-kawanehon.shizuoka.jp
-kawazu.shizuoka.jp
-kikugawa.shizuoka.jp
-kosai.shizuoka.jp
-makinohara.shizuoka.jp
-matsuzaki.shizuoka.jp
-minamiizu.shizuoka.jp
-mishima.shizuoka.jp
-morimachi.shizuoka.jp
-nishiizu.shizuoka.jp
-numazu.shizuoka.jp
-omaezaki.shizuoka.jp
-shimada.shizuoka.jp
-shimizu.shizuoka.jp
-shimoda.shizuoka.jp
-shizuoka.shizuoka.jp
-susono.shizuoka.jp
-yaizu.shizuoka.jp
-yoshida.shizuoka.jp
-ashikaga.tochigi.jp
-bato.tochigi.jp
-haga.tochigi.jp
-ichikai.tochigi.jp
-iwafune.tochigi.jp
-kaminokawa.tochigi.jp
-kanuma.tochigi.jp
-karasuyama.tochigi.jp
-kuroiso.tochigi.jp
-mashiko.tochigi.jp
-mibu.tochigi.jp
-moka.tochigi.jp
-motegi.tochigi.jp
-nasu.tochigi.jp
-nasushiobara.tochigi.jp
-nikko.tochigi.jp
-nishikata.tochigi.jp
-nogi.tochigi.jp
-ohira.tochigi.jp
-ohtawara.tochigi.jp
-oyama.tochigi.jp
-sakura.tochigi.jp
-sano.tochigi.jp
-shimotsuke.tochigi.jp
-shioya.tochigi.jp
-takanezawa.tochigi.jp
-tochigi.tochigi.jp
-tsuga.tochigi.jp
-ujiie.tochigi.jp
-utsunomiya.tochigi.jp
-yaita.tochigi.jp
-aizumi.tokushima.jp
-anan.tokushima.jp
-ichiba.tokushima.jp
-itano.tokushima.jp
-kainan.tokushima.jp
-komatsushima.tokushima.jp
-matsushige.tokushima.jp
-mima.tokushima.jp
-minami.tokushima.jp
-miyoshi.tokushima.jp
-mugi.tokushima.jp
-nakagawa.tokushima.jp
-naruto.tokushima.jp
-sanagochi.tokushima.jp
-shishikui.tokushima.jp
-tokushima.tokushima.jp
-wajiki.tokushima.jp
-adachi.tokyo.jp
-akiruno.tokyo.jp
-akishima.tokyo.jp
-aogashima.tokyo.jp
-arakawa.tokyo.jp
-bunkyo.tokyo.jp
-chiyoda.tokyo.jp
-chofu.tokyo.jp
-chuo.tokyo.jp
-edogawa.tokyo.jp
-fuchu.tokyo.jp
-fussa.tokyo.jp
-hachijo.tokyo.jp
-hachioji.tokyo.jp
-hamura.tokyo.jp
-higashikurume.tokyo.jp
-higashimurayama.tokyo.jp
-higashiyamato.tokyo.jp
-hino.tokyo.jp
-hinode.tokyo.jp
-hinohara.tokyo.jp
-inagi.tokyo.jp
-itabashi.tokyo.jp
-katsushika.tokyo.jp
-kita.tokyo.jp
-kiyose.tokyo.jp
-kodaira.tokyo.jp
-koganei.tokyo.jp
-kokubunji.tokyo.jp
-komae.tokyo.jp
-koto.tokyo.jp
-kouzushima.tokyo.jp
-kunitachi.tokyo.jp
-machida.tokyo.jp
-meguro.tokyo.jp
-minato.tokyo.jp
-mitaka.tokyo.jp
-mizuho.tokyo.jp
-musashimurayama.tokyo.jp
-musashino.tokyo.jp
-nakano.tokyo.jp
-nerima.tokyo.jp
-ogasawara.tokyo.jp
-okutama.tokyo.jp
-ome.tokyo.jp
-oshima.tokyo.jp
-ota.tokyo.jp
-setagaya.tokyo.jp
-shibuya.tokyo.jp
-shinagawa.tokyo.jp
-shinjuku.tokyo.jp
-suginami.tokyo.jp
-sumida.tokyo.jp
-tachikawa.tokyo.jp
-taito.tokyo.jp
-tama.tokyo.jp
-toshima.tokyo.jp
-chizu.tottori.jp
-hino.tottori.jp
-kawahara.tottori.jp
-koge.tottori.jp
-kotoura.tottori.jp
-misasa.tottori.jp
-nanbu.tottori.jp
-nichinan.tottori.jp
-sakaiminato.tottori.jp
-tottori.tottori.jp
-wakasa.tottori.jp
-yazu.tottori.jp
-yonago.tottori.jp
-asahi.toyama.jp
-fuchu.toyama.jp
-fukumitsu.toyama.jp
-funahashi.toyama.jp
-himi.toyama.jp
-imizu.toyama.jp
-inami.toyama.jp
-johana.toyama.jp
-kamiichi.toyama.jp
-kurobe.toyama.jp
-nakaniikawa.toyama.jp
-namerikawa.toyama.jp
-nanto.toyama.jp
-nyuzen.toyama.jp
-oyabe.toyama.jp
-taira.toyama.jp
-takaoka.toyama.jp
-tateyama.toyama.jp
-toga.toyama.jp
-tonami.toyama.jp
-toyama.toyama.jp
-unazuki.toyama.jp
-uozu.toyama.jp
-yamada.toyama.jp
-arida.wakayama.jp
-aridagawa.wakayama.jp
-gobo.wakayama.jp
-hashimoto.wakayama.jp
-hidaka.wakayama.jp
-hirogawa.wakayama.jp
-inami.wakayama.jp
-iwade.wakayama.jp
-kainan.wakayama.jp
-kamitonda.wakayama.jp
-katsuragi.wakayama.jp
-kimino.wakayama.jp
-kinokawa.wakayama.jp
-kitayama.wakayama.jp
-koya.wakayama.jp
-koza.wakayama.jp
-kozagawa.wakayama.jp
-kudoyama.wakayama.jp
-kushimoto.wakayama.jp
-mihama.wakayama.jp
-misato.wakayama.jp
-nachikatsuura.wakayama.jp
-shingu.wakayama.jp
-shirahama.wakayama.jp
-taiji.wakayama.jp
-tanabe.wakayama.jp
-wakayama.wakayama.jp
-yuasa.wakayama.jp
-yura.wakayama.jp
-asahi.yamagata.jp
-funagata.yamagata.jp
-higashine.yamagata.jp
-iide.yamagata.jp
-kahoku.yamagata.jp
-kaminoyama.yamagata.jp
-kaneyama.yamagata.jp
-kawanishi.yamagata.jp
-mamurogawa.yamagata.jp
-mikawa.yamagata.jp
-murayama.yamagata.jp
-nagai.yamagata.jp
-nakayama.yamagata.jp
-nanyo.yamagata.jp
-nishikawa.yamagata.jp
-obanazawa.yamagata.jp
-oe.yamagata.jp
-oguni.yamagata.jp
-ohkura.yamagata.jp
-oishida.yamagata.jp
-sagae.yamagata.jp
-sakata.yamagata.jp
-sakegawa.yamagata.jp
-shinjo.yamagata.jp
-shirataka.yamagata.jp
-shonai.yamagata.jp
-takahata.yamagata.jp
-tendo.yamagata.jp
-tozawa.yamagata.jp
-tsuruoka.yamagata.jp
-yamagata.yamagata.jp
-yamanobe.yamagata.jp
-yonezawa.yamagata.jp
-yuza.yamagata.jp
-abu.yamaguchi.jp
-hagi.yamaguchi.jp
-hikari.yamaguchi.jp
-hofu.yamaguchi.jp
-iwakuni.yamaguchi.jp
-kudamatsu.yamaguchi.jp
-mitou.yamaguchi.jp
-nagato.yamaguchi.jp
-oshima.yamaguchi.jp
-shimonoseki.yamaguchi.jp
-shunan.yamaguchi.jp
-tabuse.yamaguchi.jp
-tokuyama.yamaguchi.jp
-toyota.yamaguchi.jp
-ube.yamaguchi.jp
-yuu.yamaguchi.jp
-chuo.yamanashi.jp
-doshi.yamanashi.jp
-fuefuki.yamanashi.jp
-fujikawa.yamanashi.jp
-fujikawaguchiko.yamanashi.jp
-fujiyoshida.yamanashi.jp
-hayakawa.yamanashi.jp
-hokuto.yamanashi.jp
-ichikawamisato.yamanashi.jp
-kai.yamanashi.jp
-kofu.yamanashi.jp
-koshu.yamanashi.jp
-kosuge.yamanashi.jp
-minami-alps.yamanashi.jp
-minobu.yamanashi.jp
-nakamichi.yamanashi.jp
-nanbu.yamanashi.jp
-narusawa.yamanashi.jp
-nirasaki.yamanashi.jp
-nishikatsura.yamanashi.jp
-oshino.yamanashi.jp
-otsuki.yamanashi.jp
-showa.yamanashi.jp
-tabayama.yamanashi.jp
-tsuru.yamanashi.jp
-uenohara.yamanashi.jp
-yamanakako.yamanashi.jp
-yamanashi.yamanashi.jp
-
-// ke : http://www.kenic.or.ke/index.php?option=com_content&task=view&id=117&Itemid=145
-*.ke
-
-// kg : http://www.domain.kg/dmn_n.html
-kg
-org.kg
-net.kg
-com.kg
-edu.kg
-gov.kg
-mil.kg
-
-// kh : http://www.mptc.gov.kh/dns_registration.htm
-*.kh
-
-// ki : http://www.ki/dns/index.html
-ki
-edu.ki
-biz.ki
-net.ki
-org.ki
-gov.ki
-info.ki
-com.ki
-
-// km : http://en.wikipedia.org/wiki/.km
-// http://www.domaine.km/documents/charte.doc
-km
-org.km
-nom.km
-gov.km
-prd.km
-tm.km
-edu.km
-mil.km
-ass.km
-com.km
-// These are only mentioned as proposed suggestions at domaine.km, but
-// http://en.wikipedia.org/wiki/.km says they're available for registration:
-coop.km
-asso.km
-presse.km
-medecin.km
-notaires.km
-pharmaciens.km
-veterinaire.km
-gouv.km
-
-// kn : http://en.wikipedia.org/wiki/.kn
-// http://www.dot.kn/domainRules.html
-kn
-net.kn
-org.kn
-edu.kn
-gov.kn
-
-// kp : http://www.kcce.kp/en_index.php
-kp
-com.kp
-edu.kp
-gov.kp
-org.kp
-rep.kp
-tra.kp
-
-// kr : http://en.wikipedia.org/wiki/.kr
-// see also: http://domain.nida.or.kr/eng/registration.jsp
-kr
-ac.kr
-co.kr
-es.kr
-go.kr
-hs.kr
-kg.kr
-mil.kr
-ms.kr
-ne.kr
-or.kr
-pe.kr
-re.kr
-sc.kr
-// kr geographical names
-busan.kr
-chungbuk.kr
-chungnam.kr
-daegu.kr
-daejeon.kr
-gangwon.kr
-gwangju.kr
-gyeongbuk.kr
-gyeonggi.kr
-gyeongnam.kr
-incheon.kr
-jeju.kr
-jeonbuk.kr
-jeonnam.kr
-seoul.kr
-ulsan.kr
-
-// kw : http://en.wikipedia.org/wiki/.kw
-*.kw
-
-// ky : http://www.icta.ky/da_ky_reg_dom.php
-// Confirmed by registry <kysupport@perimeterusa.com> 2008-06-17
-ky
-edu.ky
-gov.ky
-com.ky
-org.ky
-net.ky
-
-// kz : http://en.wikipedia.org/wiki/.kz
-// see also: http://www.nic.kz/rules/index.jsp
-kz
-org.kz
-edu.kz
-net.kz
-gov.kz
-mil.kz
-com.kz
-
-// la : http://en.wikipedia.org/wiki/.la
-// Submitted by registry <gavin.brown@nic.la> 2008-06-10
-la
-int.la
-net.la
-info.la
-edu.la
-gov.la
-per.la
-com.la
-org.la
-
-// lb : http://en.wikipedia.org/wiki/.lb
-// Submitted by registry <randy@psg.com> 2008-06-17
-lb
-com.lb
-edu.lb
-gov.lb
-net.lb
-org.lb
-
-// lc : http://en.wikipedia.org/wiki/.lc
-// see also: http://www.nic.lc/rules.htm
-lc
-com.lc
-net.lc
-co.lc
-org.lc
-edu.lc
-gov.lc
-
-// li : http://en.wikipedia.org/wiki/.li
-li
-
-// lk : http://www.nic.lk/seclevpr.html
-lk
-gov.lk
-sch.lk
-net.lk
-int.lk
-com.lk
-org.lk
-edu.lk
-ngo.lk
-soc.lk
-web.lk
-ltd.lk
-assn.lk
-grp.lk
-hotel.lk
-ac.lk
-
-// lr : http://psg.com/dns/lr/lr.txt
-// Submitted by registry <randy@psg.com> 2008-06-17
-lr
-com.lr
-edu.lr
-gov.lr
-org.lr
-net.lr
-
-// ls : http://en.wikipedia.org/wiki/.ls
-ls
-co.ls
-org.ls
-
-// lt : http://en.wikipedia.org/wiki/.lt
-lt
-// gov.lt : http://www.gov.lt/index_en.php
-gov.lt
-
-// lu : http://www.dns.lu/en/
-lu
-
-// lv : http://www.nic.lv/DNS/En/generic.php
-lv
-com.lv
-edu.lv
-gov.lv
-org.lv
-mil.lv
-id.lv
-net.lv
-asn.lv
-conf.lv
-
-// ly : http://www.nic.ly/regulations.php
-ly
-com.ly
-net.ly
-gov.ly
-plc.ly
-edu.ly
-sch.ly
-med.ly
-org.ly
-id.ly
-
-// ma : http://en.wikipedia.org/wiki/.ma
-// http://www.anrt.ma/fr/admin/download/upload/file_fr782.pdf
-ma
-co.ma
-net.ma
-gov.ma
-org.ma
-ac.ma
-press.ma
-
-// mc : http://www.nic.mc/
-mc
-tm.mc
-asso.mc
-
-// md : http://en.wikipedia.org/wiki/.md
-md
-
-// me : http://en.wikipedia.org/wiki/.me
-me
-co.me
-net.me
-org.me
-edu.me
-ac.me
-gov.me
-its.me
-priv.me
-
-// mg : http://www.nic.mg/tarif.htm
-mg
-org.mg
-nom.mg
-gov.mg
-prd.mg
-tm.mg
-edu.mg
-mil.mg
-com.mg
-
-// mh : http://en.wikipedia.org/wiki/.mh
-mh
-
-// mil : http://en.wikipedia.org/wiki/.mil
-mil
-
-// mk : http://en.wikipedia.org/wiki/.mk
-// see also: http://dns.marnet.net.mk/postapka.php
-mk
-com.mk
-org.mk
-net.mk
-edu.mk
-gov.mk
-inf.mk
-name.mk
-
-// ml : http://www.gobin.info/domainname/ml-template.doc
-// see also: http://en.wikipedia.org/wiki/.ml
-ml
-com.ml
-edu.ml
-gouv.ml
-gov.ml
-net.ml
-org.ml
-presse.ml
-
-// mm : http://en.wikipedia.org/wiki/.mm
-*.mm
-
-// mn : http://en.wikipedia.org/wiki/.mn
-mn
-gov.mn
-edu.mn
-org.mn
-
-// mo : http://www.monic.net.mo/
-mo
-com.mo
-net.mo
-org.mo
-edu.mo
-gov.mo
-
-// mobi : http://en.wikipedia.org/wiki/.mobi
-mobi
-
-// mp : http://www.dot.mp/
-// Confirmed by registry <dcamacho@saipan.com> 2008-06-17
-mp
-
-// mq : http://en.wikipedia.org/wiki/.mq
-mq
-
-// mr : http://en.wikipedia.org/wiki/.mr
-mr
-gov.mr
-
-// ms : http://www.nic.ms/pdf/MS_Domain_Name_Rules.pdf
-ms
-com.ms
-edu.ms
-gov.ms
-net.ms
-org.ms
-
-// mt : https://www.nic.org.mt/go/policy
-// Submitted by registry <help@nic.org.mt> 2013-11-19
-mt
-com.mt
-edu.mt
-net.mt
-org.mt
-
-// mu : http://en.wikipedia.org/wiki/.mu
-mu
-com.mu
-net.mu
-org.mu
-gov.mu
-ac.mu
-co.mu
-or.mu
-
-// museum : http://about.museum/naming/
-// http://index.museum/
-museum
-academy.museum
-agriculture.museum
-air.museum
-airguard.museum
-alabama.museum
-alaska.museum
-amber.museum
-ambulance.museum
-american.museum
-americana.museum
-americanantiques.museum
-americanart.museum
-amsterdam.museum
-and.museum
-annefrank.museum
-anthro.museum
-anthropology.museum
-antiques.museum
-aquarium.museum
-arboretum.museum
-archaeological.museum
-archaeology.museum
-architecture.museum
-art.museum
-artanddesign.museum
-artcenter.museum
-artdeco.museum
-arteducation.museum
-artgallery.museum
-arts.museum
-artsandcrafts.museum
-asmatart.museum
-assassination.museum
-assisi.museum
-association.museum
-astronomy.museum
-atlanta.museum
-austin.museum
-australia.museum
-automotive.museum
-aviation.museum
-axis.museum
-badajoz.museum
-baghdad.museum
-bahn.museum
-bale.museum
-baltimore.museum
-barcelona.museum
-baseball.museum
-basel.museum
-baths.museum
-bauern.museum
-beauxarts.museum
-beeldengeluid.museum
-bellevue.museum
-bergbau.museum
-berkeley.museum
-berlin.museum
-bern.museum
-bible.museum
-bilbao.museum
-bill.museum
-birdart.museum
-birthplace.museum
-bonn.museum
-boston.museum
-botanical.museum
-botanicalgarden.museum
-botanicgarden.museum
-botany.museum
-brandywinevalley.museum
-brasil.museum
-bristol.museum
-british.museum
-britishcolumbia.museum
-broadcast.museum
-brunel.museum
-brussel.museum
-brussels.museum
-bruxelles.museum
-building.museum
-burghof.museum
-bus.museum
-bushey.museum
-cadaques.museum
-california.museum
-cambridge.museum
-can.museum
-canada.museum
-capebreton.museum
-carrier.museum
-cartoonart.museum
-casadelamoneda.museum
-castle.museum
-castres.museum
-celtic.museum
-center.museum
-chattanooga.museum
-cheltenham.museum
-chesapeakebay.museum
-chicago.museum
-children.museum
-childrens.museum
-childrensgarden.museum
-chiropractic.museum
-chocolate.museum
-christiansburg.museum
-cincinnati.museum
-cinema.museum
-circus.museum
-civilisation.museum
-civilization.museum
-civilwar.museum
-clinton.museum
-clock.museum
-coal.museum
-coastaldefence.museum
-cody.museum
-coldwar.museum
-collection.museum
-colonialwilliamsburg.museum
-coloradoplateau.museum
-columbia.museum
-columbus.museum
-communication.museum
-communications.museum
-community.museum
-computer.museum
-computerhistory.museum
-comunicações.museum
-contemporary.museum
-contemporaryart.museum
-convent.museum
-copenhagen.museum
-corporation.museum
-correios-e-telecomunicações.museum
-corvette.museum
-costume.museum
-countryestate.museum
-county.museum
-crafts.museum
-cranbrook.museum
-creation.museum
-cultural.museum
-culturalcenter.museum
-culture.museum
-cyber.museum
-cymru.museum
-dali.museum
-dallas.museum
-database.museum
-ddr.museum
-decorativearts.museum
-delaware.museum
-delmenhorst.museum
-denmark.museum
-depot.museum
-design.museum
-detroit.museum
-dinosaur.museum
-discovery.museum
-dolls.museum
-donostia.museum
-durham.museum
-eastafrica.museum
-eastcoast.museum
-education.museum
-educational.museum
-egyptian.museum
-eisenbahn.museum
-elburg.museum
-elvendrell.museum
-embroidery.museum
-encyclopedic.museum
-england.museum
-entomology.museum
-environment.museum
-environmentalconservation.museum
-epilepsy.museum
-essex.museum
-estate.museum
-ethnology.museum
-exeter.museum
-exhibition.museum
-family.museum
-farm.museum
-farmequipment.museum
-farmers.museum
-farmstead.museum
-field.museum
-figueres.museum
-filatelia.museum
-film.museum
-fineart.museum
-finearts.museum
-finland.museum
-flanders.museum
-florida.museum
-force.museum
-fortmissoula.museum
-fortworth.museum
-foundation.museum
-francaise.museum
-frankfurt.museum
-franziskaner.museum
-freemasonry.museum
-freiburg.museum
-fribourg.museum
-frog.museum
-fundacio.museum
-furniture.museum
-gallery.museum
-garden.museum
-gateway.museum
-geelvinck.museum
-gemological.museum
-geology.museum
-georgia.museum
-giessen.museum
-glas.museum
-glass.museum
-gorge.museum
-grandrapids.museum
-graz.museum
-guernsey.museum
-halloffame.museum
-hamburg.museum
-handson.museum
-harvestcelebration.museum
-hawaii.museum
-health.museum
-heimatunduhren.museum
-hellas.museum
-helsinki.museum
-hembygdsforbund.museum
-heritage.museum
-histoire.museum
-historical.museum
-historicalsociety.museum
-historichouses.museum
-historisch.museum
-historisches.museum
-history.museum
-historyofscience.museum
-horology.museum
-house.museum
-humanities.museum
-illustration.museum
-imageandsound.museum
-indian.museum
-indiana.museum
-indianapolis.museum
-indianmarket.museum
-intelligence.museum
-interactive.museum
-iraq.museum
-iron.museum
-isleofman.museum
-jamison.museum
-jefferson.museum
-jerusalem.museum
-jewelry.museum
-jewish.museum
-jewishart.museum
-jfk.museum
-journalism.museum
-judaica.museum
-judygarland.museum
-juedisches.museum
-juif.museum
-karate.museum
-karikatur.museum
-kids.museum
-koebenhavn.museum
-koeln.museum
-kunst.museum
-kunstsammlung.museum
-kunstunddesign.museum
-labor.museum
-labour.museum
-lajolla.museum
-lancashire.museum
-landes.museum
-lans.museum
-läns.museum
-larsson.museum
-lewismiller.museum
-lincoln.museum
-linz.museum
-living.museum
-livinghistory.museum
-localhistory.museum
-london.museum
-losangeles.museum
-louvre.museum
-loyalist.museum
-lucerne.museum
-luxembourg.museum
-luzern.museum
-mad.museum
-madrid.museum
-mallorca.museum
-manchester.museum
-mansion.museum
-mansions.museum
-manx.museum
-marburg.museum
-maritime.museum
-maritimo.museum
-maryland.museum
-marylhurst.museum
-media.museum
-medical.museum
-medizinhistorisches.museum
-meeres.museum
-memorial.museum
-mesaverde.museum
-michigan.museum
-midatlantic.museum
-military.museum
-mill.museum
-miners.museum
-mining.museum
-minnesota.museum
-missile.museum
-missoula.museum
-modern.museum
-moma.museum
-money.museum
-monmouth.museum
-monticello.museum
-montreal.museum
-moscow.museum
-motorcycle.museum
-muenchen.museum
-muenster.museum
-mulhouse.museum
-muncie.museum
-museet.museum
-museumcenter.museum
-museumvereniging.museum
-music.museum
-national.museum
-nationalfirearms.museum
-nationalheritage.museum
-nativeamerican.museum
-naturalhistory.museum
-naturalhistorymuseum.museum
-naturalsciences.museum
-nature.museum
-naturhistorisches.museum
-natuurwetenschappen.museum
-naumburg.museum
-naval.museum
-nebraska.museum
-neues.museum
-newhampshire.museum
-newjersey.museum
-newmexico.museum
-newport.museum
-newspaper.museum
-newyork.museum
-niepce.museum
-norfolk.museum
-north.museum
-nrw.museum
-nuernberg.museum
-nuremberg.museum
-nyc.museum
-nyny.museum
-oceanographic.museum
-oceanographique.museum
-omaha.museum
-online.museum
-ontario.museum
-openair.museum
-oregon.museum
-oregontrail.museum
-otago.museum
-oxford.museum
-pacific.museum
-paderborn.museum
-palace.museum
-paleo.museum
-palmsprings.museum
-panama.museum
-paris.museum
-pasadena.museum
-pharmacy.museum
-philadelphia.museum
-philadelphiaarea.museum
-philately.museum
-phoenix.museum
-photography.museum
-pilots.museum
-pittsburgh.museum
-planetarium.museum
-plantation.museum
-plants.museum
-plaza.museum
-portal.museum
-portland.museum
-portlligat.museum
-posts-and-telecommunications.museum
-preservation.museum
-presidio.museum
-press.museum
-project.museum
-public.museum
-pubol.museum
-quebec.museum
-railroad.museum
-railway.museum
-research.museum
-resistance.museum
-riodejaneiro.museum
-rochester.museum
-rockart.museum
-roma.museum
-russia.museum
-saintlouis.museum
-salem.museum
-salvadordali.museum
-salzburg.museum
-sandiego.museum
-sanfrancisco.museum
-santabarbara.museum
-santacruz.museum
-santafe.museum
-saskatchewan.museum
-satx.museum
-savannahga.museum
-schlesisches.museum
-schoenbrunn.museum
-schokoladen.museum
-school.museum
-schweiz.museum
-science.museum
-scienceandhistory.museum
-scienceandindustry.museum
-sciencecenter.museum
-sciencecenters.museum
-science-fiction.museum
-sciencehistory.museum
-sciences.museum
-sciencesnaturelles.museum
-scotland.museum
-seaport.museum
-settlement.museum
-settlers.museum
-shell.museum
-sherbrooke.museum
-sibenik.museum
-silk.museum
-ski.museum
-skole.museum
-society.museum
-sologne.museum
-soundandvision.museum
-southcarolina.museum
-southwest.museum
-space.museum
-spy.museum
-square.museum
-stadt.museum
-stalbans.museum
-starnberg.museum
-state.museum
-stateofdelaware.museum
-station.museum
-steam.museum
-steiermark.museum
-stjohn.museum
-stockholm.museum
-stpetersburg.museum
-stuttgart.museum
-suisse.museum
-surgeonshall.museum
-surrey.museum
-svizzera.museum
-sweden.museum
-sydney.museum
-tank.museum
-tcm.museum
-technology.museum
-telekommunikation.museum
-television.museum
-texas.museum
-textile.museum
-theater.museum
-time.museum
-timekeeping.museum
-topology.museum
-torino.museum
-touch.museum
-town.museum
-transport.museum
-tree.museum
-trolley.museum
-trust.museum
-trustee.museum
-uhren.museum
-ulm.museum
-undersea.museum
-university.museum
-usa.museum
-usantiques.museum
-usarts.museum
-uscountryestate.museum
-usculture.museum
-usdecorativearts.museum
-usgarden.museum
-ushistory.museum
-ushuaia.museum
-uslivinghistory.museum
-utah.museum
-uvic.museum
-valley.museum
-vantaa.museum
-versailles.museum
-viking.museum
-village.museum
-virginia.museum
-virtual.museum
-virtuel.museum
-vlaanderen.museum
-volkenkunde.museum
-wales.museum
-wallonie.museum
-war.museum
-washingtondc.museum
-watchandclock.museum
-watch-and-clock.museum
-western.museum
-westfalen.museum
-whaling.museum
-wildlife.museum
-williamsburg.museum
-windmill.museum
-workshop.museum
-york.museum
-yorkshire.museum
-yosemite.museum
-youth.museum
-zoological.museum
-zoology.museum
-ירושלים.museum
-иком.museum
-
-// mv : http://en.wikipedia.org/wiki/.mv
-// "mv" included because, contra Wikipedia, google.mv exists.
-mv
-aero.mv
-biz.mv
-com.mv
-coop.mv
-edu.mv
-gov.mv
-info.mv
-int.mv
-mil.mv
-museum.mv
-name.mv
-net.mv
-org.mv
-pro.mv
-
-// mw : http://www.registrar.mw/
-mw
-ac.mw
-biz.mw
-co.mw
-com.mw
-coop.mw
-edu.mw
-gov.mw
-int.mw
-museum.mw
-net.mw
-org.mw
-
-// mx : http://www.nic.mx/
-// Submitted by registry <farias@nic.mx> 2008-06-19
-mx
-com.mx
-org.mx
-gob.mx
-edu.mx
-net.mx
-
-// my : http://www.mynic.net.my/
-my
-com.my
-net.my
-org.my
-gov.my
-edu.my
-mil.my
-name.my
-
-// mz : http://www.gobin.info/domainname/mz-template.doc
-*.mz
-!teledata.mz
-
-// na : http://www.na-nic.com.na/
-// http://www.info.na/domain/
-na
-info.na
-pro.na
-name.na
-school.na
-or.na
-dr.na
-us.na
-mx.na
-ca.na
-in.na
-cc.na
-tv.na
-ws.na
-mobi.na
-co.na
-com.na
-org.na
-
-// name : has 2nd-level tlds, but there's no list of them
-name
-
-// nc : http://www.cctld.nc/
-nc
-asso.nc
-
-// ne : http://en.wikipedia.org/wiki/.ne
-ne
-
-// net : http://en.wikipedia.org/wiki/.net
-net
-
-// nf : http://en.wikipedia.org/wiki/.nf
-nf
-com.nf
-net.nf
-per.nf
-rec.nf
-web.nf
-arts.nf
-firm.nf
-info.nf
-other.nf
-store.nf
-
-// ng : http://psg.com/dns/ng/
-ng
-com.ng
-edu.ng
-name.ng
-net.ng
-org.ng
-sch.ng
-gov.ng
-mil.ng
-mobi.ng
-
-// ni : http://www.nic.ni/dominios.htm
-*.ni
-
-// nl : http://en.wikipedia.org/wiki/.nl
-//      https://www.sidn.nl/
-//      ccTLD for the Netherlands
-nl
-
-// BV.nl will be a registry for dutch BV's (besloten vennootschap)
-bv.nl
-
-// no : http://www.norid.no/regelverk/index.en.html
-// The Norwegian registry has declined to notify us of updates. The web pages
-// referenced below are the official source of the data. There is also an
-// announce mailing list:
-// https://postlister.uninett.no/sympa/info/norid-diskusjon
-no
-// Norid generic domains : http://www.norid.no/regelverk/vedlegg-c.en.html
-fhs.no
-vgs.no
-fylkesbibl.no
-folkebibl.no
-museum.no
-idrett.no
-priv.no
-// Non-Norid generic domains : http://www.norid.no/regelverk/vedlegg-d.en.html
-mil.no
-stat.no
-dep.no
-kommune.no
-herad.no
-// no geographical names : http://www.norid.no/regelverk/vedlegg-b.en.html
-// counties
-aa.no
-ah.no
-bu.no
-fm.no
-hl.no
-hm.no
-jan-mayen.no
-mr.no
-nl.no
-nt.no
-of.no
-ol.no
-oslo.no
-rl.no
-sf.no
-st.no
-svalbard.no
-tm.no
-tr.no
-va.no
-vf.no
-// primary and lower secondary schools per county
-gs.aa.no
-gs.ah.no
-gs.bu.no
-gs.fm.no
-gs.hl.no
-gs.hm.no
-gs.jan-mayen.no
-gs.mr.no
-gs.nl.no
-gs.nt.no
-gs.of.no
-gs.ol.no
-gs.oslo.no
-gs.rl.no
-gs.sf.no
-gs.st.no
-gs.svalbard.no
-gs.tm.no
-gs.tr.no
-gs.va.no
-gs.vf.no
-// cities
-akrehamn.no
-åkrehamn.no
-algard.no
-ålgård.no
-arna.no
-brumunddal.no
-bryne.no
-bronnoysund.no
-brønnøysund.no
-drobak.no
-drøbak.no
-egersund.no
-fetsund.no
-floro.no
-florø.no
-fredrikstad.no
-hokksund.no
-honefoss.no
-hønefoss.no
-jessheim.no
-jorpeland.no
-jørpeland.no
-kirkenes.no
-kopervik.no
-krokstadelva.no
-langevag.no
-langevåg.no
-leirvik.no
-mjondalen.no
-mjøndalen.no
-mo-i-rana.no
-mosjoen.no
-mosjøen.no
-nesoddtangen.no
-orkanger.no
-osoyro.no
-osøyro.no
-raholt.no
-råholt.no
-sandnessjoen.no
-sandnessjøen.no
-skedsmokorset.no
-slattum.no
-spjelkavik.no
-stathelle.no
-stavern.no
-stjordalshalsen.no
-stjørdalshalsen.no
-tananger.no
-tranby.no
-vossevangen.no
-// communities
-afjord.no
-åfjord.no
-agdenes.no
-al.no
-ål.no
-alesund.no
-ålesund.no
-alstahaug.no
-alta.no
-áltá.no
-alaheadju.no
-álaheadju.no
-alvdal.no
-amli.no
-åmli.no
-amot.no
-åmot.no
-andebu.no
-andoy.no
-andøy.no
-andasuolo.no
-ardal.no
-årdal.no
-aremark.no
-arendal.no
-ås.no
-aseral.no
-åseral.no
-asker.no
-askim.no
-askvoll.no
-askoy.no
-askøy.no
-asnes.no
-åsnes.no
-audnedaln.no
-aukra.no
-aure.no
-aurland.no
-aurskog-holand.no
-aurskog-høland.no
-austevoll.no
-austrheim.no
-averoy.no
-averøy.no
-balestrand.no
-ballangen.no
-balat.no
-bálát.no
-balsfjord.no
-bahccavuotna.no
-báhccavuotna.no
-bamble.no
-bardu.no
-beardu.no
-beiarn.no
-bajddar.no
-bájddar.no
-baidar.no
-báidár.no
-berg.no
-bergen.no
-berlevag.no
-berlevåg.no
-bearalvahki.no
-bearalváhki.no
-bindal.no
-birkenes.no
-bjarkoy.no
-bjarkøy.no
-bjerkreim.no
-bjugn.no
-bodo.no
-bodø.no
-badaddja.no
-bådåddjå.no
-budejju.no
-bokn.no
-bremanger.no
-bronnoy.no
-brønnøy.no
-bygland.no
-bykle.no
-barum.no
-bærum.no
-bo.telemark.no
-bø.telemark.no
-bo.nordland.no
-bø.nordland.no
-bievat.no
-bievát.no
-bomlo.no
-bømlo.no
-batsfjord.no
-båtsfjord.no
-bahcavuotna.no
-báhcavuotna.no
-dovre.no
-drammen.no
-drangedal.no
-dyroy.no
-dyrøy.no
-donna.no
-dønna.no
-eid.no
-eidfjord.no
-eidsberg.no
-eidskog.no
-eidsvoll.no
-eigersund.no
-elverum.no
-enebakk.no
-engerdal.no
-etne.no
-etnedal.no
-evenes.no
-evenassi.no
-evenášši.no
-evje-og-hornnes.no
-farsund.no
-fauske.no
-fuossko.no
-fuoisku.no
-fedje.no
-fet.no
-finnoy.no
-finnøy.no
-fitjar.no
-fjaler.no
-fjell.no
-flakstad.no
-flatanger.no
-flekkefjord.no
-flesberg.no
-flora.no
-fla.no
-flå.no
-folldal.no
-forsand.no
-fosnes.no
-frei.no
-frogn.no
-froland.no
-frosta.no
-frana.no
-fræna.no
-froya.no
-frøya.no
-fusa.no
-fyresdal.no
-forde.no
-førde.no
-gamvik.no
-gangaviika.no
-gáŋgaviika.no
-gaular.no
-gausdal.no
-gildeskal.no
-gildeskål.no
-giske.no
-gjemnes.no
-gjerdrum.no
-gjerstad.no
-gjesdal.no
-gjovik.no
-gjøvik.no
-gloppen.no
-gol.no
-gran.no
-grane.no
-granvin.no
-gratangen.no
-grimstad.no
-grong.no
-kraanghke.no
-kråanghke.no
-grue.no
-gulen.no
-hadsel.no
-halden.no
-halsa.no
-hamar.no
-hamaroy.no
-habmer.no
-hábmer.no
-hapmir.no
-hápmir.no
-hammerfest.no
-hammarfeasta.no
-hámmárfeasta.no
-haram.no
-hareid.no
-harstad.no
-hasvik.no
-aknoluokta.no
-ákŋoluokta.no
-hattfjelldal.no
-aarborte.no
-haugesund.no
-hemne.no
-hemnes.no
-hemsedal.no
-heroy.more-og-romsdal.no
-herøy.møre-og-romsdal.no
-heroy.nordland.no
-herøy.nordland.no
-hitra.no
-hjartdal.no
-hjelmeland.no
-hobol.no
-hobøl.no
-hof.no
-hol.no
-hole.no
-holmestrand.no
-holtalen.no
-holtålen.no
-hornindal.no
-horten.no
-hurdal.no
-hurum.no
-hvaler.no
-hyllestad.no
-hagebostad.no
-hægebostad.no
-hoyanger.no
-høyanger.no
-hoylandet.no
-høylandet.no
-ha.no
-hå.no
-ibestad.no
-inderoy.no
-inderøy.no
-iveland.no
-jevnaker.no
-jondal.no
-jolster.no
-jølster.no
-karasjok.no
-karasjohka.no
-kárášjohka.no
-karlsoy.no
-galsa.no
-gálsá.no
-karmoy.no
-karmøy.no
-kautokeino.no
-guovdageaidnu.no
-klepp.no
-klabu.no
-klæbu.no
-kongsberg.no
-kongsvinger.no
-kragero.no
-kragerø.no
-kristiansand.no
-kristiansund.no
-krodsherad.no
-krødsherad.no
-kvalsund.no
-rahkkeravju.no
-ráhkkerávju.no
-kvam.no
-kvinesdal.no
-kvinnherad.no
-kviteseid.no
-kvitsoy.no
-kvitsøy.no
-kvafjord.no
-kvæfjord.no
-giehtavuoatna.no
-kvanangen.no
-kvænangen.no
-navuotna.no
-návuotna.no
-kafjord.no
-kåfjord.no
-gaivuotna.no
-gáivuotna.no
-larvik.no
-lavangen.no
-lavagis.no
-loabat.no
-loabát.no
-lebesby.no
-davvesiida.no
-leikanger.no
-leirfjord.no
-leka.no
-leksvik.no
-lenvik.no
-leangaviika.no
-leaŋgaviika.no
-lesja.no
-levanger.no
-lier.no
-lierne.no
-lillehammer.no
-lillesand.no
-lindesnes.no
-lindas.no
-lindås.no
-lom.no
-loppa.no
-lahppi.no
-láhppi.no
-lund.no
-lunner.no
-luroy.no
-lurøy.no
-luster.no
-lyngdal.no
-lyngen.no
-ivgu.no
-lardal.no
-lerdal.no
-lærdal.no
-lodingen.no
-lødingen.no
-lorenskog.no
-lørenskog.no
-loten.no
-løten.no
-malvik.no
-masoy.no
-måsøy.no
-muosat.no
-muosát.no
-mandal.no
-marker.no
-marnardal.no
-masfjorden.no
-meland.no
-meldal.no
-melhus.no
-meloy.no
-meløy.no
-meraker.no
-meråker.no
-moareke.no
-moåreke.no
-midsund.no
-midtre-gauldal.no
-modalen.no
-modum.no
-molde.no
-moskenes.no
-moss.no
-mosvik.no
-malselv.no
-målselv.no
-malatvuopmi.no
-málatvuopmi.no
-namdalseid.no
-aejrie.no
-namsos.no
-namsskogan.no
-naamesjevuemie.no
-nååmesjevuemie.no
-laakesvuemie.no
-nannestad.no
-narvik.no
-narviika.no
-naustdal.no
-nedre-eiker.no
-nes.akershus.no
-nes.buskerud.no
-nesna.no
-nesodden.no
-nesseby.no
-unjarga.no
-unjárga.no
-nesset.no
-nissedal.no
-nittedal.no
-nord-aurdal.no
-nord-fron.no
-nord-odal.no
-norddal.no
-nordkapp.no
-davvenjarga.no
-davvenjárga.no
-nordre-land.no
-nordreisa.no
-raisa.no
-ráisa.no
-nore-og-uvdal.no
-notodden.no
-naroy.no
-nærøy.no
-notteroy.no
-nøtterøy.no
-odda.no
-oksnes.no
-øksnes.no
-oppdal.no
-oppegard.no
-oppegård.no
-orkdal.no
-orland.no
-ørland.no
-orskog.no
-ørskog.no
-orsta.no
-ørsta.no
-os.hedmark.no
-os.hordaland.no
-osen.no
-osteroy.no
-osterøy.no
-ostre-toten.no
-østre-toten.no
-overhalla.no
-ovre-eiker.no
-øvre-eiker.no
-oyer.no
-øyer.no
-oygarden.no
-øygarden.no
-oystre-slidre.no
-øystre-slidre.no
-porsanger.no
-porsangu.no
-porsáŋgu.no
-porsgrunn.no
-radoy.no
-radøy.no
-rakkestad.no
-rana.no
-ruovat.no
-randaberg.no
-rauma.no
-rendalen.no
-rennebu.no
-rennesoy.no
-rennesøy.no
-rindal.no
-ringebu.no
-ringerike.no
-ringsaker.no
-rissa.no
-risor.no
-risør.no
-roan.no
-rollag.no
-rygge.no
-ralingen.no
-rælingen.no
-rodoy.no
-rødøy.no
-romskog.no
-rømskog.no
-roros.no
-røros.no
-rost.no
-røst.no
-royken.no
-røyken.no
-royrvik.no
-røyrvik.no
-rade.no
-råde.no
-salangen.no
-siellak.no
-saltdal.no
-salat.no
-sálát.no
-sálat.no
-samnanger.no
-sande.more-og-romsdal.no
-sande.møre-og-romsdal.no
-sande.vestfold.no
-sandefjord.no
-sandnes.no
-sandoy.no
-sandøy.no
-sarpsborg.no
-sauda.no
-sauherad.no
-sel.no
-selbu.no
-selje.no
-seljord.no
-sigdal.no
-siljan.no
-sirdal.no
-skaun.no
-skedsmo.no
-ski.no
-skien.no
-skiptvet.no
-skjervoy.no
-skjervøy.no
-skierva.no
-skiervá.no
-skjak.no
-skjåk.no
-skodje.no
-skanland.no
-skånland.no
-skanit.no
-skánit.no
-smola.no
-smøla.no
-snillfjord.no
-snasa.no
-snåsa.no
-snoasa.no
-snaase.no
-snåase.no
-sogndal.no
-sokndal.no
-sola.no
-solund.no
-songdalen.no
-sortland.no
-spydeberg.no
-stange.no
-stavanger.no
-steigen.no
-steinkjer.no
-stjordal.no
-stjørdal.no
-stokke.no
-stor-elvdal.no
-stord.no
-stordal.no
-storfjord.no
-omasvuotna.no
-strand.no
-stranda.no
-stryn.no
-sula.no
-suldal.no
-sund.no
-sunndal.no
-surnadal.no
-sveio.no
-svelvik.no
-sykkylven.no
-sogne.no
-søgne.no
-somna.no
-sømna.no
-sondre-land.no
-søndre-land.no
-sor-aurdal.no
-sør-aurdal.no
-sor-fron.no
-sør-fron.no
-sor-odal.no
-sør-odal.no
-sor-varanger.no
-sør-varanger.no
-matta-varjjat.no
-mátta-várjjat.no
-sorfold.no
-sørfold.no
-sorreisa.no
-sørreisa.no
-sorum.no
-sørum.no
-tana.no
-deatnu.no
-time.no
-tingvoll.no
-tinn.no
-tjeldsund.no
-dielddanuorri.no
-tjome.no
-tjøme.no
-tokke.no
-tolga.no
-torsken.no
-tranoy.no
-tranøy.no
-tromso.no
-tromsø.no
-tromsa.no
-romsa.no
-trondheim.no
-troandin.no
-trysil.no
-trana.no
-træna.no
-trogstad.no
-trøgstad.no
-tvedestrand.no
-tydal.no
-tynset.no
-tysfjord.no
-divtasvuodna.no
-divttasvuotna.no
-tysnes.no
-tysvar.no
-tysvær.no
-tonsberg.no
-tønsberg.no
-ullensaker.no
-ullensvang.no
-ulvik.no
-utsira.no
-vadso.no
-vadsø.no
-cahcesuolo.no
-čáhcesuolo.no
-vaksdal.no
-valle.no
-vang.no
-vanylven.no
-vardo.no
-vardø.no
-varggat.no
-várggát.no
-vefsn.no
-vaapste.no
-vega.no
-vegarshei.no
-vegårshei.no
-vennesla.no
-verdal.no
-verran.no
-vestby.no
-vestnes.no
-vestre-slidre.no
-vestre-toten.no
-vestvagoy.no
-vestvågøy.no
-vevelstad.no
-vik.no
-vikna.no
-vindafjord.no
-volda.no
-voss.no
-varoy.no
-værøy.no
-vagan.no
-vågan.no
-voagat.no
-vagsoy.no
-vågsøy.no
-vaga.no
-vågå.no
-valer.ostfold.no
-våler.østfold.no
-valer.hedmark.no
-våler.hedmark.no
-
-// np : http://www.mos.com.np/register.html
-*.np
-
-// nr : http://cenpac.net.nr/dns/index.html
-// Confirmed by registry <technician@cenpac.net.nr> 2008-06-17
-nr
-biz.nr
-info.nr
-gov.nr
-edu.nr
-org.nr
-net.nr
-com.nr
-
-// nu : http://en.wikipedia.org/wiki/.nu
-nu
-
-// nz : http://en.wikipedia.org/wiki/.nz
-// Confirmed by registry <jay@nzrs.net.nz> 2014-05-19
-nz
-ac.nz
-co.nz
-cri.nz
-geek.nz
-gen.nz
-govt.nz
-health.nz
-iwi.nz
-kiwi.nz
-maori.nz
-mil.nz
-māori.nz
-net.nz
-org.nz
-parliament.nz
-school.nz
-
-// om : http://en.wikipedia.org/wiki/.om
-om
-co.om
-com.om
-edu.om
-gov.om
-med.om
-museum.om
-net.om
-org.om
-pro.om
-
-// org : http://en.wikipedia.org/wiki/.org
-org
-
-// pa : http://www.nic.pa/
-// Some additional second level "domains" resolve directly as hostnames, such as
-// pannet.pa, so we add a rule for "pa".
-pa
-ac.pa
-gob.pa
-com.pa
-org.pa
-sld.pa
-edu.pa
-net.pa
-ing.pa
-abo.pa
-med.pa
-nom.pa
-
-// pe : https://www.nic.pe/InformeFinalComision.pdf
-pe
-edu.pe
-gob.pe
-nom.pe
-mil.pe
-org.pe
-com.pe
-net.pe
-
-// pf : http://www.gobin.info/domainname/formulaire-pf.pdf
-pf
-com.pf
-org.pf
-edu.pf
-
-// pg : http://en.wikipedia.org/wiki/.pg
-*.pg
-
-// ph : http://www.domains.ph/FAQ2.asp
-// Submitted by registry <jed@email.com.ph> 2008-06-13
-ph
-com.ph
-net.ph
-org.ph
-gov.ph
-edu.ph
-ngo.ph
-mil.ph
-i.ph
-
-// pk : http://pk5.pknic.net.pk/pk5/msgNamepk.PK
-pk
-com.pk
-net.pk
-edu.pk
-org.pk
-fam.pk
-biz.pk
-web.pk
-gov.pk
-gob.pk
-gok.pk
-gon.pk
-gop.pk
-gos.pk
-info.pk
-
-// pl http://www.dns.pl/english/index.html
-// updated by .PL registry on 2015-04-28
-pl
-com.pl
-net.pl
-org.pl
-// pl functional domains (http://www.dns.pl/english/index.html)
-aid.pl
-agro.pl
-atm.pl
-auto.pl
-biz.pl
-edu.pl
-gmina.pl
-gsm.pl
-info.pl
-mail.pl
-miasta.pl
-media.pl
-mil.pl
-nieruchomosci.pl
-nom.pl
-pc.pl
-powiat.pl
-priv.pl
-realestate.pl
-rel.pl
-sex.pl
-shop.pl
-sklep.pl
-sos.pl
-szkola.pl
-targi.pl
-tm.pl
-tourism.pl
-travel.pl
-turystyka.pl
-// Government domains
-gov.pl
-ap.gov.pl
-ic.gov.pl
-is.gov.pl
-us.gov.pl
-kmpsp.gov.pl
-kppsp.gov.pl
-kwpsp.gov.pl
-psp.gov.pl
-wskr.gov.pl
-kwp.gov.pl
-mw.gov.pl
-ug.gov.pl
-um.gov.pl
-umig.gov.pl
-ugim.gov.pl
-upow.gov.pl
-uw.gov.pl
-starostwo.gov.pl
-pa.gov.pl
-po.gov.pl
-psse.gov.pl
-pup.gov.pl
-rzgw.gov.pl
-sa.gov.pl
-so.gov.pl
-sr.gov.pl
-wsa.gov.pl
-sko.gov.pl
-uzs.gov.pl
-wiih.gov.pl
-winb.gov.pl
-pinb.gov.pl
-wios.gov.pl
-witd.gov.pl
-wzmiuw.gov.pl
-piw.gov.pl
-wiw.gov.pl
-griw.gov.pl
-wif.gov.pl
-oum.gov.pl
-sdn.gov.pl
-zp.gov.pl
-uppo.gov.pl
-mup.gov.pl
-wuoz.gov.pl
-konsulat.gov.pl
-oirm.gov.pl
-// pl regional domains (http://www.dns.pl/english/index.html)
-augustow.pl
-babia-gora.pl
-bedzin.pl
-beskidy.pl
-bialowieza.pl
-bialystok.pl
-bielawa.pl
-bieszczady.pl
-boleslawiec.pl
-bydgoszcz.pl
-bytom.pl
-cieszyn.pl
-czeladz.pl
-czest.pl
-dlugoleka.pl
-elblag.pl
-elk.pl
-glogow.pl
-gniezno.pl
-gorlice.pl
-grajewo.pl
-ilawa.pl
-jaworzno.pl
-jelenia-gora.pl
-jgora.pl
-kalisz.pl
-kazimierz-dolny.pl
-karpacz.pl
-kartuzy.pl
-kaszuby.pl
-katowice.pl
-kepno.pl
-ketrzyn.pl
-klodzko.pl
-kobierzyce.pl
-kolobrzeg.pl
-konin.pl
-konskowola.pl
-kutno.pl
-lapy.pl
-lebork.pl
-legnica.pl
-lezajsk.pl
-limanowa.pl
-lomza.pl
-lowicz.pl
-lubin.pl
-lukow.pl
-malbork.pl
-malopolska.pl
-mazowsze.pl
-mazury.pl
-mielec.pl
-mielno.pl
-mragowo.pl
-naklo.pl
-nowaruda.pl
-nysa.pl
-olawa.pl
-olecko.pl
-olkusz.pl
-olsztyn.pl
-opoczno.pl
-opole.pl
-ostroda.pl
-ostroleka.pl
-ostrowiec.pl
-ostrowwlkp.pl
-pila.pl
-pisz.pl
-podhale.pl
-podlasie.pl
-polkowice.pl
-pomorze.pl
-pomorskie.pl
-prochowice.pl
-pruszkow.pl
-przeworsk.pl
-pulawy.pl
-radom.pl
-rawa-maz.pl
-rybnik.pl
-rzeszow.pl
-sanok.pl
-sejny.pl
-slask.pl
-slupsk.pl
-sosnowiec.pl
-stalowa-wola.pl
-skoczow.pl
-starachowice.pl
-stargard.pl
-suwalki.pl
-swidnica.pl
-swiebodzin.pl
-swinoujscie.pl
-szczecin.pl
-szczytno.pl
-tarnobrzeg.pl
-tgory.pl
-turek.pl
-tychy.pl
-ustka.pl
-walbrzych.pl
-warmia.pl
-warszawa.pl
-waw.pl
-wegrow.pl
-wielun.pl
-wlocl.pl
-wloclawek.pl
-wodzislaw.pl
-wolomin.pl
-wroclaw.pl
-zachpomor.pl
-zagan.pl
-zarow.pl
-zgora.pl
-zgorzelec.pl
-
-// pm : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf
-pm
-
-// pn : http://www.government.pn/PnRegistry/policies.htm
-pn
-gov.pn
-co.pn
-org.pn
-edu.pn
-net.pn
-
-// post : http://en.wikipedia.org/wiki/.post
-post
-
-// pr : http://www.nic.pr/index.asp?f=1
-pr
-com.pr
-net.pr
-org.pr
-gov.pr
-edu.pr
-isla.pr
-pro.pr
-biz.pr
-info.pr
-name.pr
-// these aren't mentioned on nic.pr, but on http://en.wikipedia.org/wiki/.pr
-est.pr
-prof.pr
-ac.pr
-
-// pro : http://www.nic.pro/support_faq.htm
-pro
-aca.pro
-bar.pro
-cpa.pro
-jur.pro
-law.pro
-med.pro
-eng.pro
-
-// ps : http://en.wikipedia.org/wiki/.ps
-// http://www.nic.ps/registration/policy.html#reg
-ps
-edu.ps
-gov.ps
-sec.ps
-plo.ps
-com.ps
-org.ps
-net.ps
-
-// pt : http://online.dns.pt/dns/start_dns
-pt
-net.pt
-gov.pt
-org.pt
-edu.pt
-int.pt
-publ.pt
-com.pt
-nome.pt
-
-// pw : http://en.wikipedia.org/wiki/.pw
-pw
-co.pw
-ne.pw
-or.pw
-ed.pw
-go.pw
-belau.pw
-
-// py : http://www.nic.py/pautas.html#seccion_9
-// Confirmed by registry 2012-10-03
-py
-com.py
-coop.py
-edu.py
-gov.py
-mil.py
-net.py
-org.py
-
-// qa : http://domains.qa/en/
-qa
-com.qa
-edu.qa
-gov.qa
-mil.qa
-name.qa
-net.qa
-org.qa
-sch.qa
-
-// re : http://www.afnic.re/obtenir/chartes/nommage-re/annexe-descriptifs
-re
-com.re
-asso.re
-nom.re
-
-// ro : http://www.rotld.ro/
-ro
-com.ro
-org.ro
-tm.ro
-nt.ro
-nom.ro
-info.ro
-rec.ro
-arts.ro
-firm.ro
-store.ro
-www.ro
-
-// rs : http://en.wikipedia.org/wiki/.rs
-rs
-co.rs
-org.rs
-edu.rs
-ac.rs
-gov.rs
-in.rs
-
-// ru : http://www.cctld.ru/ru/docs/aktiv_8.php
-// Industry domains
-ru
-ac.ru
-com.ru
-edu.ru
-int.ru
-net.ru
-org.ru
-pp.ru
-// Geographical domains
-adygeya.ru
-altai.ru
-amur.ru
-arkhangelsk.ru
-astrakhan.ru
-bashkiria.ru
-belgorod.ru
-bir.ru
-bryansk.ru
-buryatia.ru
-cbg.ru
-chel.ru
-chelyabinsk.ru
-chita.ru
-chukotka.ru
-chuvashia.ru
-dagestan.ru
-dudinka.ru
-e-burg.ru
-grozny.ru
-irkutsk.ru
-ivanovo.ru
-izhevsk.ru
-jar.ru
-joshkar-ola.ru
-kalmykia.ru
-kaluga.ru
-kamchatka.ru
-karelia.ru
-kazan.ru
-kchr.ru
-kemerovo.ru
-khabarovsk.ru
-khakassia.ru
-khv.ru
-kirov.ru
-koenig.ru
-komi.ru
-kostroma.ru
-krasnoyarsk.ru
-kuban.ru
-kurgan.ru
-kursk.ru
-lipetsk.ru
-magadan.ru
-mari.ru
-mari-el.ru
-marine.ru
-mordovia.ru
-// mosreg.ru  Bug 1090800 - removed at request of Aleksey Konstantinov <konstantinovav@mosreg.ru>
-msk.ru
-murmansk.ru
-nalchik.ru
-nnov.ru
-nov.ru
-novosibirsk.ru
-nsk.ru
-omsk.ru
-orenburg.ru
-oryol.ru
-palana.ru
-penza.ru
-perm.ru
-ptz.ru
-rnd.ru
-ryazan.ru
-sakhalin.ru
-samara.ru
-saratov.ru
-simbirsk.ru
-smolensk.ru
-spb.ru
-stavropol.ru
-stv.ru
-surgut.ru
-tambov.ru
-tatarstan.ru
-tom.ru
-tomsk.ru
-tsaritsyn.ru
-tsk.ru
-tula.ru
-tuva.ru
-tver.ru
-tyumen.ru
-udm.ru
-udmurtia.ru
-ulan-ude.ru
-vladikavkaz.ru
-vladimir.ru
-vladivostok.ru
-volgograd.ru
-vologda.ru
-voronezh.ru
-vrn.ru
-vyatka.ru
-yakutia.ru
-yamal.ru
-yaroslavl.ru
-yekaterinburg.ru
-yuzhno-sakhalinsk.ru
-// More geographical domains
-amursk.ru
-baikal.ru
-cmw.ru
-fareast.ru
-jamal.ru
-kms.ru
-k-uralsk.ru
-kustanai.ru
-kuzbass.ru
-magnitka.ru
-mytis.ru
-nakhodka.ru
-nkz.ru
-norilsk.ru
-oskol.ru
-pyatigorsk.ru
-rubtsovsk.ru
-snz.ru
-syzran.ru
-vdonsk.ru
-zgrad.ru
-// State domains
-gov.ru
-mil.ru
-// Technical domains
-test.ru
-
-// rw : http://www.nic.rw/cgi-bin/policy.pl
-rw
-gov.rw
-net.rw
-edu.rw
-ac.rw
-com.rw
-co.rw
-int.rw
-mil.rw
-gouv.rw
-
-// sa : http://www.nic.net.sa/
-sa
-com.sa
-net.sa
-org.sa
-gov.sa
-med.sa
-pub.sa
-edu.sa
-sch.sa
-
-// sb : http://www.sbnic.net.sb/
-// Submitted by registry <lee.humphries@telekom.com.sb> 2008-06-08
-sb
-com.sb
-edu.sb
-gov.sb
-net.sb
-org.sb
-
-// sc : http://www.nic.sc/
-sc
-com.sc
-gov.sc
-net.sc
-org.sc
-edu.sc
-
-// sd : http://www.isoc.sd/sudanic.isoc.sd/billing_pricing.htm
-// Submitted by registry <admin@isoc.sd> 2008-06-17
-sd
-com.sd
-net.sd
-org.sd
-edu.sd
-med.sd
-tv.sd
-gov.sd
-info.sd
-
-// se : http://en.wikipedia.org/wiki/.se
-// Submitted by registry <patrik.wallstrom@iis.se> 2014-03-18
-se
-a.se
-ac.se
-b.se
-bd.se
-brand.se
-c.se
-d.se
-e.se
-f.se
-fh.se
-fhsk.se
-fhv.se
-g.se
-h.se
-i.se
-k.se
-komforb.se
-kommunalforbund.se
-komvux.se
-l.se
-lanbib.se
-m.se
-n.se
-naturbruksgymn.se
-o.se
-org.se
-p.se
-parti.se
-pp.se
-press.se
-r.se
-s.se
-t.se
-tm.se
-u.se
-w.se
-x.se
-y.se
-z.se
-
-// sg : http://www.nic.net.sg/page/registration-policies-procedures-and-guidelines
-sg
-com.sg
-net.sg
-org.sg
-gov.sg
-edu.sg
-per.sg
-
-// sh : http://www.nic.sh/registrar.html
-sh
-com.sh
-net.sh
-gov.sh
-org.sh
-mil.sh
-
-// si : http://en.wikipedia.org/wiki/.si
-si
-
-// sj : No registrations at this time.
-// Submitted by registry <jarle@uninett.no> 2008-06-16
-sj
-
-// sk : http://en.wikipedia.org/wiki/.sk
-// list of 2nd level domains ?
-sk
-
-// sl : http://www.nic.sl
-// Submitted by registry <adam@neoip.com> 2008-06-12
-sl
-com.sl
-net.sl
-edu.sl
-gov.sl
-org.sl
-
-// sm : http://en.wikipedia.org/wiki/.sm
-sm
-
-// sn : http://en.wikipedia.org/wiki/.sn
-sn
-art.sn
-com.sn
-edu.sn
-gouv.sn
-org.sn
-perso.sn
-univ.sn
-
-// so : http://www.soregistry.com/
-so
-com.so
-net.so
-org.so
-
-// sr : http://en.wikipedia.org/wiki/.sr
-sr
-
-// st : http://www.nic.st/html/policyrules/
-st
-co.st
-com.st
-consulado.st
-edu.st
-embaixada.st
-gov.st
-mil.st
-net.st
-org.st
-principe.st
-saotome.st
-store.st
-
-// su : http://en.wikipedia.org/wiki/.su
-su
-adygeya.su
-arkhangelsk.su
-balashov.su
-bashkiria.su
-bryansk.su
-dagestan.su
-grozny.su
-ivanovo.su
-kalmykia.su
-kaluga.su
-karelia.su
-khakassia.su
-krasnodar.su
-kurgan.su
-lenug.su
-mordovia.su
-msk.su
-murmansk.su
-nalchik.su
-nov.su
-obninsk.su
-penza.su
-pokrovsk.su
-sochi.su
-spb.su
-togliatti.su
-troitsk.su
-tula.su
-tuva.su
-vladikavkaz.su
-vladimir.su
-vologda.su
-
-// sv : http://www.svnet.org.sv/niveldos.pdf
-sv
-com.sv
-edu.sv
-gob.sv
-org.sv
-red.sv
-
-// sx : http://en.wikipedia.org/wiki/.sx
-// Confirmed by registry <jcvignes@openregistry.com> 2012-05-31
-sx
-gov.sx
-
-// sy : http://en.wikipedia.org/wiki/.sy
-// see also: http://www.gobin.info/domainname/sy.doc
-sy
-edu.sy
-gov.sy
-net.sy
-mil.sy
-com.sy
-org.sy
-
-// sz : http://en.wikipedia.org/wiki/.sz
-// http://www.sispa.org.sz/
-sz
-co.sz
-ac.sz
-org.sz
-
-// tc : http://en.wikipedia.org/wiki/.tc
-tc
-
-// td : http://en.wikipedia.org/wiki/.td
-td
-
-// tel: http://en.wikipedia.org/wiki/.tel
-// http://www.telnic.org/
-tel
-
-// tf : http://en.wikipedia.org/wiki/.tf
-tf
-
-// tg : http://en.wikipedia.org/wiki/.tg
-// http://www.nic.tg/
-tg
-
-// th : http://en.wikipedia.org/wiki/.th
-// Submitted by registry <krit@thains.co.th> 2008-06-17
-th
-ac.th
-co.th
-go.th
-in.th
-mi.th
-net.th
-or.th
-
-// tj : http://www.nic.tj/policy.html
-tj
-ac.tj
-biz.tj
-co.tj
-com.tj
-edu.tj
-go.tj
-gov.tj
-int.tj
-mil.tj
-name.tj
-net.tj
-nic.tj
-org.tj
-test.tj
-web.tj
-
-// tk : http://en.wikipedia.org/wiki/.tk
-tk
-
-// tl : http://en.wikipedia.org/wiki/.tl
-tl
-gov.tl
-
-// tm : http://www.nic.tm/local.html
-tm
-com.tm
-co.tm
-org.tm
-net.tm
-nom.tm
-gov.tm
-mil.tm
-edu.tm
-
-// tn : http://en.wikipedia.org/wiki/.tn
-// http://whois.ati.tn/
-tn
-com.tn
-ens.tn
-fin.tn
-gov.tn
-ind.tn
-intl.tn
-nat.tn
-net.tn
-org.tn
-info.tn
-perso.tn
-tourism.tn
-edunet.tn
-rnrt.tn
-rns.tn
-rnu.tn
-mincom.tn
-agrinet.tn
-defense.tn
-turen.tn
-
-// to : http://en.wikipedia.org/wiki/.to
-// Submitted by registry <egullich@colo.to> 2008-06-17
-to
-com.to
-gov.to
-net.to
-org.to
-edu.to
-mil.to
-
-// tp : No registrations at this time.
-// Submitted by Ryan Sleevi <ryan.sleevi@gmail.com> 2014-01-03
-tp
-
-// subTLDs: https://www.nic.tr/forms/eng/policies.pdf
-//     and: https://www.nic.tr/forms/politikalar.pdf
-// Submitted by <mehmetgurevin@gmail.com> 2014-07-19
-tr
-com.tr
-info.tr
-biz.tr
-net.tr
-org.tr
-web.tr
-gen.tr
-tv.tr
-av.tr
-dr.tr
-bbs.tr
-name.tr
-tel.tr
-gov.tr
-bel.tr
-pol.tr
-mil.tr
-k12.tr
-edu.tr
-kep.tr
-
-// Used by Northern Cyprus
-nc.tr
-
-// Used by government agencies of Northern Cyprus
-gov.nc.tr
-
-// travel : http://en.wikipedia.org/wiki/.travel
-travel
-
-// tt : http://www.nic.tt/
-tt
-co.tt
-com.tt
-org.tt
-net.tt
-biz.tt
-info.tt
-pro.tt
-int.tt
-coop.tt
-jobs.tt
-mobi.tt
-travel.tt
-museum.tt
-aero.tt
-name.tt
-gov.tt
-edu.tt
-
-// tv : http://en.wikipedia.org/wiki/.tv
-// Not listing any 2LDs as reserved since none seem to exist in practice,
-// Wikipedia notwithstanding.
-tv
-
-// tw : http://en.wikipedia.org/wiki/.tw
-tw
-edu.tw
-gov.tw
-mil.tw
-com.tw
-net.tw
-org.tw
-idv.tw
-game.tw
-ebiz.tw
-club.tw
-網路.tw
-組織.tw
-商業.tw
-
-// tz : http://www.tznic.or.tz/index.php/domains
-// Confirmed by registry <manager@tznic.or.tz> 2013-01-22
-tz
-ac.tz
-co.tz
-go.tz
-hotel.tz
-info.tz
-me.tz
-mil.tz
-mobi.tz
-ne.tz
-or.tz
-sc.tz
-tv.tz
-
-// ua : https://hostmaster.ua/policy/?ua
-// Submitted by registry <dk@cctld.ua> 2012-04-27
-ua
-// ua 2LD
-com.ua
-edu.ua
-gov.ua
-in.ua
-net.ua
-org.ua
-// ua geographic names
-// https://hostmaster.ua/2ld/
-cherkassy.ua
-cherkasy.ua
-chernigov.ua
-chernihiv.ua
-chernivtsi.ua
-chernovtsy.ua
-ck.ua
-cn.ua
-cr.ua
-crimea.ua
-cv.ua
-dn.ua
-dnepropetrovsk.ua
-dnipropetrovsk.ua
-dominic.ua
-donetsk.ua
-dp.ua
-if.ua
-ivano-frankivsk.ua
-kh.ua
-kharkiv.ua
-kharkov.ua
-kherson.ua
-khmelnitskiy.ua
-khmelnytskyi.ua
-kiev.ua
-kirovograd.ua
-km.ua
-kr.ua
-krym.ua
-ks.ua
-kv.ua
-kyiv.ua
-lg.ua
-lt.ua
-lugansk.ua
-lutsk.ua
-lv.ua
-lviv.ua
-mk.ua
-mykolaiv.ua
-nikolaev.ua
-od.ua
-odesa.ua
-odessa.ua
-pl.ua
-poltava.ua
-rivne.ua
-rovno.ua
-rv.ua
-sb.ua
-sebastopol.ua
-sevastopol.ua
-sm.ua
-sumy.ua
-te.ua
-ternopil.ua
-uz.ua
-uzhgorod.ua
-vinnica.ua
-vinnytsia.ua
-vn.ua
-volyn.ua
-yalta.ua
-zaporizhzhe.ua
-zaporizhzhia.ua
-zhitomir.ua
-zhytomyr.ua
-zp.ua
-zt.ua
-
-// Private registries in .ua
-co.ua
-pp.ua
-
-// ug : https://www.registry.co.ug/
-ug
-co.ug
-or.ug
-ac.ug
-sc.ug
-go.ug
-ne.ug
-com.ug
-org.ug
-
-// uk : http://en.wikipedia.org/wiki/.uk
-// Submitted by registry <Michael.Daly@nominet.org.uk>
-uk
-ac.uk
-co.uk
-gov.uk
-ltd.uk
-me.uk
-net.uk
-nhs.uk
-org.uk
-plc.uk
-police.uk
-*.sch.uk
-
-// us : http://en.wikipedia.org/wiki/.us
-us
-dni.us
-fed.us
-isa.us
-kids.us
-nsn.us
-// us geographic names
-ak.us
-al.us
-ar.us
-as.us
-az.us
-ca.us
-co.us
-ct.us
-dc.us
-de.us
-fl.us
-ga.us
-gu.us
-hi.us
-ia.us
-id.us
-il.us
-in.us
-ks.us
-ky.us
-la.us
-ma.us
-md.us
-me.us
-mi.us
-mn.us
-mo.us
-ms.us
-mt.us
-nc.us
-nd.us
-ne.us
-nh.us
-nj.us
-nm.us
-nv.us
-ny.us
-oh.us
-ok.us
-or.us
-pa.us
-pr.us
-ri.us
-sc.us
-sd.us
-tn.us
-tx.us
-ut.us
-vi.us
-vt.us
-va.us
-wa.us
-wi.us
-wv.us
-wy.us
-// The registrar notes several more specific domains available in each state,
-// such as state.*.us, dst.*.us, etc., but resolution of these is somewhat
-// haphazard; in some states these domains resolve as addresses, while in others
-// only subdomains are available, or even nothing at all. We include the
-// most common ones where it's clear that different sites are different
-// entities.
-k12.ak.us
-k12.al.us
-k12.ar.us
-k12.as.us
-k12.az.us
-k12.ca.us
-k12.co.us
-k12.ct.us
-k12.dc.us
-k12.de.us
-k12.fl.us
-k12.ga.us
-k12.gu.us
-// k12.hi.us  Bug 614565 - Hawaii has a state-wide DOE login
-k12.ia.us
-k12.id.us
-k12.il.us
-k12.in.us
-k12.ks.us
-k12.ky.us
-k12.la.us
-k12.ma.us
-k12.md.us
-k12.me.us
-k12.mi.us
-k12.mn.us
-k12.mo.us
-k12.ms.us
-k12.mt.us
-k12.nc.us
-// k12.nd.us  Bug 1028347 - Removed at request of Travis Rosso <trossow@nd.gov>
-k12.ne.us
-k12.nh.us
-k12.nj.us
-k12.nm.us
-k12.nv.us
-k12.ny.us
-k12.oh.us
-k12.ok.us
-k12.or.us
-k12.pa.us
-k12.pr.us
-k12.ri.us
-k12.sc.us
-// k12.sd.us  Bug 934131 - Removed at request of James Booze <James.Booze@k12.sd.us>
-k12.tn.us
-k12.tx.us
-k12.ut.us
-k12.vi.us
-k12.vt.us
-k12.va.us
-k12.wa.us
-k12.wi.us
-// k12.wv.us  Bug 947705 - Removed at request of Verne Britton <verne@wvnet.edu>
-k12.wy.us
-cc.ak.us
-cc.al.us
-cc.ar.us
-cc.as.us
-cc.az.us
-cc.ca.us
-cc.co.us
-cc.ct.us
-cc.dc.us
-cc.de.us
-cc.fl.us
-cc.ga.us
-cc.gu.us
-cc.hi.us
-cc.ia.us
-cc.id.us
-cc.il.us
-cc.in.us
-cc.ks.us
-cc.ky.us
-cc.la.us
-cc.ma.us
-cc.md.us
-cc.me.us
-cc.mi.us
-cc.mn.us
-cc.mo.us
-cc.ms.us
-cc.mt.us
-cc.nc.us
-cc.nd.us
-cc.ne.us
-cc.nh.us
-cc.nj.us
-cc.nm.us
-cc.nv.us
-cc.ny.us
-cc.oh.us
-cc.ok.us
-cc.or.us
-cc.pa.us
-cc.pr.us
-cc.ri.us
-cc.sc.us
-cc.sd.us
-cc.tn.us
-cc.tx.us
-cc.ut.us
-cc.vi.us
-cc.vt.us
-cc.va.us
-cc.wa.us
-cc.wi.us
-cc.wv.us
-cc.wy.us
-lib.ak.us
-lib.al.us
-lib.ar.us
-lib.as.us
-lib.az.us
-lib.ca.us
-lib.co.us
-lib.ct.us
-lib.dc.us
-lib.de.us
-lib.fl.us
-lib.ga.us
-lib.gu.us
-lib.hi.us
-lib.ia.us
-lib.id.us
-lib.il.us
-lib.in.us
-lib.ks.us
-lib.ky.us
-lib.la.us
-lib.ma.us
-lib.md.us
-lib.me.us
-lib.mi.us
-lib.mn.us
-lib.mo.us
-lib.ms.us
-lib.mt.us
-lib.nc.us
-lib.nd.us
-lib.ne.us
-lib.nh.us
-lib.nj.us
-lib.nm.us
-lib.nv.us
-lib.ny.us
-lib.oh.us
-lib.ok.us
-lib.or.us
-lib.pa.us
-lib.pr.us
-lib.ri.us
-lib.sc.us
-lib.sd.us
-lib.tn.us
-lib.tx.us
-lib.ut.us
-lib.vi.us
-lib.vt.us
-lib.va.us
-lib.wa.us
-lib.wi.us
-// lib.wv.us  Bug 941670 - Removed at request of Larry W Arnold <arnold@wvlc.lib.wv.us>
-lib.wy.us
-// k12.ma.us contains school districts in Massachusetts. The 4LDs are
-//  managed indepedently except for private (PVT), charter (CHTR) and
-//  parochial (PAROCH) schools.  Those are delegated dorectly to the
-//  5LD operators.   <k12-ma-hostmaster _ at _ rsuc.gweep.net>
-pvt.k12.ma.us
-chtr.k12.ma.us
-paroch.k12.ma.us
-
-// uy : http://www.nic.org.uy/
-uy
-com.uy
-edu.uy
-gub.uy
-mil.uy
-net.uy
-org.uy
-
-// uz : http://www.reg.uz/
-uz
-co.uz
-com.uz
-net.uz
-org.uz
-
-// va : http://en.wikipedia.org/wiki/.va
-va
-
-// vc : http://en.wikipedia.org/wiki/.vc
-// Submitted by registry <kshah@ca.afilias.info> 2008-06-13
-vc
-com.vc
-net.vc
-org.vc
-gov.vc
-mil.vc
-edu.vc
-
-// ve : https://registro.nic.ve/
-// Confirmed by registry 2012-10-04
-// Updated 2014-05-20 - Bug 940478
-ve
-arts.ve
-co.ve
-com.ve
-e12.ve
-edu.ve
-firm.ve
-gob.ve
-gov.ve
-info.ve
-int.ve
-mil.ve
-net.ve
-org.ve
-rec.ve
-store.ve
-tec.ve
-web.ve
-
-// vg : http://en.wikipedia.org/wiki/.vg
-vg
-
-// vi : http://www.nic.vi/newdomainform.htm
-// http://www.nic.vi/Domain_Rules/body_domain_rules.html indicates some other
-// TLDs are "reserved", such as edu.vi and gov.vi, but doesn't actually say they
-// are available for registration (which they do not seem to be).
-vi
-co.vi
-com.vi
-k12.vi
-net.vi
-org.vi
-
-// vn : https://www.dot.vn/vnnic/vnnic/domainregistration.jsp
-vn
-com.vn
-net.vn
-org.vn
-edu.vn
-gov.vn
-int.vn
-ac.vn
-biz.vn
-info.vn
-name.vn
-pro.vn
-health.vn
-
-// vu : http://en.wikipedia.org/wiki/.vu
-// http://www.vunic.vu/
-vu
-com.vu
-edu.vu
-net.vu
-org.vu
-
-// wf : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf
-wf
-
-// ws : http://en.wikipedia.org/wiki/.ws
-// http://samoanic.ws/index.dhtml
-ws
-com.ws
-net.ws
-org.ws
-gov.ws
-edu.ws
-
-// yt : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf
-yt
-
-// IDN ccTLDs
-// When submitting patches, please maintain a sort by ISO 3166 ccTLD, then
-// U-label, and follow this format:
-// // A-Label ("<Latin renderings>", <language name>[, variant info]) : <ISO 3166 ccTLD>
-// // [sponsoring org]
-// U-Label
-
-// xn--mgbaam7a8h ("Emerat", Arabic) : AE
-// http://nic.ae/english/arabicdomain/rules.jsp
-امارات
-
-// xn--y9a3aq ("hye", Armenian) : AM
-// ISOC AM (operated by .am Registry)
-հայ
-
-// xn--54b7fta0cc ("Bangla", Bangla) : BD
-বাংলা
-
-// xn--90ais ("bel", Belarusian/Russian Cyrillic) : BY
-// Operated by .by registry
-бел
-
-// xn--fiqs8s ("Zhongguo/China", Chinese, Simplified) : CN
-// CNNIC
-// http://cnnic.cn/html/Dir/2005/10/11/3218.htm
-中国
-
-// xn--fiqz9s ("Zhongguo/China", Chinese, Traditional) : CN
-// CNNIC
-// http://cnnic.cn/html/Dir/2005/10/11/3218.htm
-中國
-
-// xn--lgbbat1ad8j ("Algeria/Al Jazair", Arabic) : DZ
-الجزائر
-
-// xn--wgbh1c ("Egypt/Masr", Arabic) : EG
-// http://www.dotmasr.eg/
-مصر
-
-// xn--node ("ge", Georgian Mkhedruli) : GE
-გე
-
-// xn--qxam ("el", Greek) : GR
-// Hellenic Ministry of Infrastructure, Transport, and Networks
-ελ
-
-// xn--j6w193g ("Hong Kong", Chinese) : HK
-// https://www2.hkirc.hk/register/rules.jsp
-香港
-
-// xn--h2brj9c ("Bharat", Devanagari) : IN
-// India
-भारत
-
-// xn--mgbbh1a71e ("Bharat", Arabic) : IN
-// India
-بھارت
-
-// xn--fpcrj9c3d ("Bharat", Telugu) : IN
-// India
-భారత్
-
-// xn--gecrj9c ("Bharat", Gujarati) : IN
-// India
-ભારત
-
-// xn--s9brj9c ("Bharat", Gurmukhi) : IN
-// India
-ਭਾਰਤ
-
-// xn--45brj9c ("Bharat", Bengali) : IN
-// India
-ভারত
-
-// xn--xkc2dl3a5ee0h ("India", Tamil) : IN
-// India
-இந்தியா
-
-// xn--mgba3a4f16a ("Iran", Persian) : IR
-ایران
-
-// xn--mgba3a4fra ("Iran", Arabic) : IR
-ايران
-
-// xn--mgbtx2b ("Iraq", Arabic) : IQ
-// Communications and Media Commission
-عراق
-
-// xn--mgbayh7gpa ("al-Ordon", Arabic) : JO
-// National Information Technology Center (NITC)
-// Royal Scientific Society, Al-Jubeiha
-الاردن
-
-// xn--3e0b707e ("Republic of Korea", Hangul) : KR
-한국
-
-// xn--80ao21a ("Kaz", Kazakh) : KZ
-қаз
-
-// xn--fzc2c9e2c ("Lanka", Sinhalese-Sinhala) : LK
-// http://nic.lk
-ලංකා
-
-// xn--xkc2al3hye2a ("Ilangai", Tamil) : LK
-// http://nic.lk
-இலங்கை
-
-// xn--mgbc0a9azcg ("Morocco/al-Maghrib", Arabic) : MA
-المغرب
-
-// xn--d1alf ("mkd", Macedonian) : MK
-// MARnet
-мкд
-
-// xn--l1acc ("mon", Mongolian) : MN
-мон
-
-// xn--mix891f ("Macao", Chinese, Traditional) : MO
-// MONIC / HNET Asia (Registry Operator for .mo)
-澳門
-
-// xn--mix082f ("Macao", Chinese, Simplified) : MO
-澳门
-
-// xn--mgbx4cd0ab ("Malaysia", Malay) : MY
-مليسيا
-
-// xn--mgb9awbf ("Oman", Arabic) : OM
-عمان
-
-// xn--mgbai9azgqp6j ("Pakistan", Urdu/Arabic) : PK
-پاکستان
-
-// xn--mgbai9a5eva00b ("Pakistan", Urdu/Arabic, variant) : PK
-پاكستان
-
-// xn--ygbi2ammx ("Falasteen", Arabic) : PS
-// The Palestinian National Internet Naming Authority (PNINA)
-// http://www.pnina.ps
-فلسطين
-
-// xn--90a3ac ("srb", Cyrillic) : RS
-// http://www.rnids.rs/en/the-.срб-domain
-срб
-пр.срб
-орг.срб
-обр.срб
-од.срб
-упр.срб
-ак.срб
-
-// xn--p1ai ("rf", Russian-Cyrillic) : RU
-// http://www.cctld.ru/en/docs/rulesrf.php
-рф
-
-// xn--wgbl6a ("Qatar", Arabic) : QA
-// http://www.ict.gov.qa/
-قطر
-
-// xn--mgberp4a5d4ar ("AlSaudiah", Arabic) : SA
-// http://www.nic.net.sa/
-السعودية
-
-// xn--mgberp4a5d4a87g ("AlSaudiah", Arabic, variant)  : SA
-السعودیة
-
-// xn--mgbqly7c0a67fbc ("AlSaudiah", Arabic, variant) : SA
-السعودیۃ
-
-// xn--mgbqly7cvafr ("AlSaudiah", Arabic, variant) : SA
-السعوديه
-
-// xn--mgbpl2fh ("sudan", Arabic) : SD
-// Operated by .sd registry
-سودان
-
-// xn--yfro4i67o Singapore ("Singapore", Chinese) : SG
-新加坡
-
-// xn--clchc0ea0b2g2a9gcd ("Singapore", Tamil) : SG
-சிங்கப்பூர்
-
-// xn--ogbpf8fl ("Syria", Arabic) : SY
-سورية
-
-// xn--mgbtf8fl ("Syria", Arabic, variant) : SY
-سوريا
-
-// xn--o3cw4h ("Thai", Thai) : TH
-// http://www.thnic.co.th
-ไทย
-
-// xn--pgbs0dh ("Tunisia", Arabic) : TN
-// http://nic.tn
-تونس
-
-// xn--kpry57d ("Taiwan", Chinese, Traditional) : TW
-// http://www.twnic.net/english/dn/dn_07a.htm
-台灣
-
-// xn--kprw13d ("Taiwan", Chinese, Simplified) : TW
-// http://www.twnic.net/english/dn/dn_07a.htm
-台湾
-
-// xn--nnx388a ("Taiwan", Chinese, variant) : TW
-臺灣
-
-// xn--j1amh ("ukr", Cyrillic) : UA
-укр
-
-// xn--mgb2ddes ("AlYemen", Arabic) : YE
-اليمن
-
-// xxx : http://icmregistry.com
-xxx
-
-// ye : http://www.y.net.ye/services/domain_name.htm
-*.ye
-
-// za : http://www.zadna.org.za/slds.html
-*.za
-
-// zm : http://en.wikipedia.org/wiki/.zm
-*.zm
-
-// zw : http://en.wikipedia.org/wiki/.zw
-*.zw
-
-
-// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2015-05-06T09:31:08Z
-
-// aaa : 2015-02-26 American Automobile Association, Inc.
-aaa
-
-// abb : 2014-10-24 ABB Ltd
-abb
-
-// abbott : 2014-07-24 Abbott Laboratories, Inc.
-abbott
-
-// abogado : 2014-04-24 Top Level Domain Holdings Limited
-abogado
-
-// academy : 2013-11-07 Half Oaks, LLC
-academy
-
-// accenture : 2014-08-15 Accenture plc
-accenture
-
-// accountant : 2014-11-20 dot Accountant Limited
-accountant
-
-// accountants : 2014-03-20 Knob Town, LLC
-accountants
-
-// aco : 2015-01-08 ACO Severin Ahlmann GmbH & Co. KG
-aco
-
-// active : 2014-05-01 The Active Network, Inc
-active
-
-// actor : 2013-12-12 United TLD Holdco Ltd.
-actor
-
-// ads : 2014-12-04 Charleston Road Registry Inc.
-ads
-
-// adult : 2014-10-16 ICM Registry AD LLC
-adult
-
-// aeg : 2015-03-19 Aktiebolaget Electrolux
-aeg
-
-// afl : 2014-10-02 Australian Football League
-afl
-
-// africa : 2014-03-24 ZA Central Registry NPC trading as Registry.Africa
-africa
-
-// africamagic : 2015-03-05 Electronic Media Network (Pty) Ltd
-africamagic
-
-// agakhan : 2015-04-23 Fondation Aga Khan (Aga Khan Foundation)
-agakhan
-
-// agency : 2013-11-14 Steel Falls, LLC
-agency
-
-// aig : 2014-12-18 American International Group, Inc.
-aig
-
-// airforce : 2014-03-06 United TLD Holdco Ltd.
-airforce
-
-// airtel : 2014-10-24 Bharti Airtel Limited
-airtel
-
-// akdn : 2015-04-23 Fondation Aga Khan (Aga Khan Foundation)
-akdn
-
-// alibaba : 2015-01-15 Alibaba Group Holding Limited
-alibaba
-
-// alipay : 2015-01-15 Alibaba Group Holding Limited
-alipay
-
-// allfinanz : 2014-07-03 Allfinanz Deutsche Vermögensberatung Aktiengesellschaft
-allfinanz
-
-// alsace : 2014-07-02 REGION D ALSACE
-alsace
-
-// amsterdam : 2014-07-24 Gemeente Amsterdam
-amsterdam
-
-// analytics : 2014-12-18 Campus IP LLC
-analytics
-
-// android : 2014-08-07 Charleston Road Registry Inc.
-android
-
-// anquan : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD.
-anquan
-
-// apartments : 2014-12-11 June Maple, LLC
-apartments
-
-// aquarelle : 2014-07-24 Aquarelle.com
-aquarelle
-
-// aramco : 2014-11-20 Aramco Services Company
-aramco
-
-// archi : 2014-02-06 STARTING DOT LIMITED
-archi
-
-// army : 2014-03-06 United TLD Holdco Ltd.
-army
-
-// arte : 2014-12-11 Association Relative à la Télévision Européenne G.E.I.E.
-arte
-
-// associates : 2014-03-06 Baxter Hill, LLC
-associates
-
-// attorney : 2014-03-20
-attorney
-
-// auction : 2014-03-20
-auction
-
-// audio : 2014-03-20 Uniregistry, Corp.
-audio
-
-// author : 2014-12-18 Amazon EU S.à r.l.
-author
-
-// auto : 2014-11-13 Uniregistry, Corp.
-auto
-
-// autos : 2014-01-09 DERAutos, LLC
-autos
-
-// avianca : 2015-01-08 Aerovias del Continente Americano S.A. Avianca
-avianca
-
-// axa : 2013-12-19 AXA SA
-axa
-
-// azure : 2014-12-18 Microsoft Corporation
-azure
-
-// baby : 2015-04-09 Johnson & Johnson Services, Inc.
-baby
-
-// baidu : 2015-01-08 Baidu, Inc.
-baidu
-
-// band : 2014-06-12
-band
-
-// bank : 2014-09-25 fTLD Registry Services LLC
-bank
-
-// bar : 2013-12-12 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable
-bar
-
-// barcelona : 2014-07-24 Municipi de Barcelona
-barcelona
-
-// barclaycard : 2014-11-20 Barclays Bank PLC
-barclaycard
-
-// barclays : 2014-11-20 Barclays Bank PLC
-barclays
-
-// bargains : 2013-11-14 Half Hallow, LLC
-bargains
-
-// bauhaus : 2014-04-17 Werkhaus GmbH
-bauhaus
-
-// bayern : 2014-01-23 Bayern Connect GmbH
-bayern
-
-// bbc : 2014-12-18 British Broadcasting Corporation
-bbc
-
-// bbva : 2014-10-02 BANCO BILBAO VIZCAYA ARGENTARIA, S.A.
-bbva
-
-// bcg : 2015-04-02 The Boston Consulting Group, Inc.
-bcg
-
-// bcn : 2014-07-24 Municipi de Barcelona
-bcn
-
-// beer : 2014-01-09 Top Level Domain Holdings Limited
-beer
-
-// bentley : 2014-12-18 Bentley Motors Limited
-bentley
-
-// berlin : 2013-10-31 dotBERLIN GmbH & Co. KG
-berlin
-
-// best : 2013-12-19 BestTLD Pty Ltd
-best
-
-// bharti : 2014-01-09 Bharti Enterprises (Holding) Private Limited
-bharti
-
-// bible : 2014-06-19 American Bible Society
-bible
-
-// bid : 2013-12-19 dot Bid Limited
-bid
-
-// bike : 2013-08-27 Grand Hollow, LLC
-bike
-
-// bing : 2014-12-18 Microsoft Corporation
-bing
-
-// bingo : 2014-12-04 Sand Cedar, LLC
-bingo
-
-// bio : 2014-03-06 STARTING DOT LIMITED
-bio
-
-// black : 2014-01-16 Afilias Limited
-black
-
-// blackfriday : 2014-01-16 Uniregistry, Corp.
-blackfriday
-
-// bloomberg : 2014-07-17 Bloomberg IP Holdings LLC
-bloomberg
-
-// blue : 2013-11-07 Afilias Limited
-blue
-
-// bms : 2014-10-30 Bristol-Myers Squibb Company
-bms
-
-// bmw : 2014-01-09 Bayerische Motoren Werke Aktiengesellschaft
-bmw
-
-// bnl : 2014-07-24 Banca Nazionale del Lavoro
-bnl
-
-// bnpparibas : 2014-05-29 BNP Paribas
-bnpparibas
-
-// boats : 2014-12-04 DERBoats, LLC
-boats
-
-// bom : 2014-10-16 Núcleo de Informação e Coordenação do Ponto BR - NIC.br
-bom
-
-// bond : 2014-06-05 Bond University Limited
-bond
-
-// boo : 2014-01-30 Charleston Road Registry Inc.
-boo
-
-// boots : 2015-01-08 THE BOOTS COMPANY PLC
-boots
-
-// bot : 2014-12-18 Amazon EU S.à r.l.
-bot
-
-// boutique : 2013-11-14 Over Galley, LLC
-boutique
-
-// bradesco : 2014-12-18 Banco Bradesco S.A.
-bradesco
-
-// bridgestone : 2014-12-18 Bridgestone Corporation
-bridgestone
-
-// broadway : 2014-12-22 Celebrate Broadway, Inc.
-broadway
-
-// broker : 2014-12-11 IG Group Holdings PLC
-broker
-
-// brother : 2015-01-29 Brother Industries, Ltd.
-brother
-
-// brussels : 2014-02-06 DNS.be vzw
-brussels
-
-// budapest : 2013-11-21 Top Level Domain Holdings Limited
-budapest
-
-// build : 2013-11-07 Plan Bee LLC
-build
-
-// builders : 2013-11-07 Atomic Madison, LLC
-builders
-
-// business : 2013-11-07 Spring Cross, LLC
-business
-
-// buy : 2014-12-18 Amazon EU S.à r.l.
-buy
-
-// buzz : 2013-10-02 DOTSTRATEGY CO.
-buzz
-
-// bzh : 2014-02-27 Association www.bzh
-bzh
-
-// cab : 2013-10-24 Half Sunset, LLC
-cab
-
-// cafe : 2015-02-11 Pioneer Canyon, LLC
-cafe
-
-// cal : 2014-07-24 Charleston Road Registry Inc.
-cal
-
-// call : 2014-12-18 Amazon EU S.à r.l.
-call
-
-// camera : 2013-08-27 Atomic Maple, LLC
-camera
-
-// camp : 2013-11-07 Delta Dynamite, LLC
-camp
-
-// cancerresearch : 2014-05-15 Australian Cancer Research Foundation
-cancerresearch
-
-// canon : 2014-09-12 Canon Inc.
-canon
-
-// capetown : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry
-capetown
-
-// capital : 2014-03-06 Delta Mill, LLC
-capital
-
-// car : 2015-01-22 Charleston Road Registry Inc.
-car
-
-// caravan : 2013-12-12 Caravan International, Inc.
-caravan
-
-// cards : 2013-12-05 Foggy Hollow, LLC
-cards
-
-// care : 2014-03-06 Goose Cross
-care
-
-// career : 2013-10-09 dotCareer LLC
-career
-
-// careers : 2013-10-02 Wild Corner, LLC
-careers
-
-// cars : 2014-11-13 Uniregistry, Corp.
-cars
-
-// cartier : 2014-06-23 Richemont DNS Inc.
-cartier
-
-// casa : 2013-11-21 Top Level Domain Holdings Limited
-casa
-
-// cash : 2014-03-06 Delta Lake, LLC
-cash
-
-// casino : 2014-12-18 Binky Sky, LLC
-casino
-
-// catering : 2013-12-05 New Falls. LLC
-catering
-
-// cba : 2014-06-26 COMMONWEALTH BANK OF AUSTRALIA
-cba
-
-// cbn : 2014-08-22 The Christian Broadcasting Network, Inc.
-cbn
-
-// ceb : 2015-04-09 The Corporate Executive Board Company
-ceb
-
-// center : 2013-11-07 Tin Mill, LLC
-center
-
-// ceo : 2013-11-07 CEOTLD Pty Ltd
-ceo
-
-// cern : 2014-06-05 European Organization for Nuclear Research ("CERN")
-cern
-
-// cfa : 2014-08-28 CFA Institute
-cfa
-
-// cfd : 2014-12-11 IG Group Holdings PLC
-cfd
-
-// chanel : 2015-04-09 Chanel International B.V.
-chanel
-
-// channel : 2014-05-08 Charleston Road Registry Inc.
-channel
-
-// chase : 2015-04-30 JPMorgan Chase & Co.
-chase
-
-// chat : 2014-12-04 Sand Fields, LLC
-chat
-
-// cheap : 2013-11-14 Sand Cover, LLC
-cheap
-
-// chloe : 2014-10-16 Richemont DNS Inc.
-chloe
-
-// christmas : 2013-11-21 Uniregistry, Corp.
-christmas
-
-// chrome : 2014-07-24 Charleston Road Registry Inc.
-chrome
-
-// church : 2014-02-06 Holly Fields, LLC
-church
-
-// cipriani : 2015-02-19 Hotel Cipriani Srl
-cipriani
-
-// circle : 2014-12-18 Amazon EU S.à r.l.
-circle
-
-// cisco : 2014-12-22 Cisco Technology, Inc.
-cisco
-
-// citic : 2014-01-09 CITIC Group Corporation
-citic
-
-// city : 2014-05-29 Snow Sky, LLC
-city
-
-// cityeats : 2014-12-11 Lifestyle Domain Holdings, Inc.
-cityeats
-
-// claims : 2014-03-20 Black Corner, LLC
-claims
-
-// cleaning : 2013-12-05 Fox Shadow, LLC
-cleaning
-
-// click : 2014-06-05 Uniregistry, Corp.
-click
-
-// clinic : 2014-03-20 Goose Park, LLC
-clinic
-
-// clothing : 2013-08-27 Steel Lake, LLC
-clothing
-
-// cloud : 2015-04-16 ARUBA S.p.A.
-cloud
-
-// club : 2013-11-08 .CLUB DOMAINS, LLC
-club
-
-// coach : 2014-10-09 Koko Island, LLC
-coach
-
-// codes : 2013-10-31 Puff Willow, LLC
-codes
-
-// coffee : 2013-10-17 Trixy Cover, LLC
-coffee
-
-// college : 2014-01-16 XYZ.COM LLC
-college
-
-// cologne : 2014-02-05 NetCologne Gesellschaft für Telekommunikation mbH
-cologne
-
-// commbank : 2014-06-26 COMMONWEALTH BANK OF AUSTRALIA
-commbank
-
-// community : 2013-12-05 Fox Orchard, LLC
-community
-
-// company : 2013-11-07 Silver Avenue, LLC
-company
-
-// computer : 2013-10-24 Pine Mill, LLC
-computer
-
-// comsec : 2015-01-08 VeriSign, Inc.
-comsec
-
-// condos : 2013-12-05 Pine House, LLC
-condos
-
-// construction : 2013-09-16 Fox Dynamite, LLC
-construction
-
-// consulting : 2013-12-05
-consulting
-
-// contact : 2015-01-08 Top Level Spectrum, Inc.
-contact
-
-// contractors : 2013-09-10 Magic Woods, LLC
-contractors
-
-// cooking : 2013-11-21 Top Level Domain Holdings Limited
-cooking
-
-// cool : 2013-11-14 Koko Lake, LLC
-cool
-
-// corsica : 2014-09-25 Collectivité Territoriale de Corse
-corsica
-
-// country : 2013-12-19 Top Level Domain Holdings Limited
-country
-
-// coupon : 2015-02-26 Amazon EU S.à r.l.
-coupon
-
-// coupons : 2015-03-26 Black Island, LLC
-coupons
-
-// courses : 2014-12-04 OPEN UNIVERSITIES AUSTRALIA PTY LTD
-courses
-
-// credit : 2014-03-20 Snow Shadow, LLC
-credit
-
-// creditcard : 2014-03-20 Binky Frostbite, LLC
-creditcard
-
-// creditunion : 2015-01-22 CUNA Performance Resources, LLC
-creditunion
-
-// cricket : 2014-10-09 dot Cricket Limited
-cricket
-
-// crown : 2014-10-24 Crown Equipment Corporation
-crown
-
-// crs : 2014-04-03 Federated Co-operatives Limited
-crs
-
-// cruises : 2013-12-05 Spring Way, LLC
-cruises
-
-// csc : 2014-09-25 Alliance-One Services, Inc.
-csc
-
-// cuisinella : 2014-04-03 SALM S.A.S.
-cuisinella
-
-// cymru : 2014-05-08 Nominet UK
-cymru
-
-// cyou : 2015-01-22 Beijing Gamease Age Digital Technology Co., Ltd.
-cyou
-
-// dabur : 2014-02-06 Dabur India Limited
-dabur
-
-// dad : 2014-01-23 Charleston Road Registry Inc.
-dad
-
-// dance : 2013-10-24 United TLD Holdco Ltd.
-dance
-
-// date : 2014-11-20 dot Date Limited
-date
-
-// dating : 2013-12-05 Pine Fest, LLC
-dating
-
-// datsun : 2014-03-27 NISSAN MOTOR CO., LTD.
-datsun
-
-// day : 2014-01-30 Charleston Road Registry Inc.
-day
-
-// dclk : 2014-11-20 Charleston Road Registry Inc.
-dclk
-
-// dealer : 2014-12-22 Dealer Dot Com, Inc.
-dealer
-
-// deals : 2014-05-22 Sand Sunset, LLC
-deals
-
-// degree : 2014-03-06
-degree
-
-// delivery : 2014-09-11 Steel Station, LLC
-delivery
-
-// dell : 2014-10-24 Dell Inc.
-dell
-
-// delta : 2015-02-19 Delta Air Lines, Inc.
-delta
-
-// democrat : 2013-10-24 United TLD Holdco Ltd.
-democrat
-
-// dental : 2014-03-20 Tin Birch, LLC
-dental
-
-// dentist : 2014-03-20
-dentist
-
-// desi : 2013-11-14 Desi Networks LLC
-desi
-
-// design : 2014-11-07 Top Level Design, LLC
-design
-
-// dev : 2014-10-16 Charleston Road Registry Inc.
-dev
-
-// diamonds : 2013-09-22 John Edge, LLC
-diamonds
-
-// diet : 2014-06-26 Uniregistry, Corp.
-diet
-
-// digital : 2014-03-06 Dash Park, LLC
-digital
-
-// direct : 2014-04-10 Half Trail, LLC
-direct
-
-// directory : 2013-09-20 Extra Madison, LLC
-directory
-
-// discount : 2014-03-06 Holly Hill, LLC
-discount
-
-// dnp : 2013-12-13 Dai Nippon Printing Co., Ltd.
-dnp
-
-// docs : 2014-10-16 Charleston Road Registry Inc.
-docs
-
-// dog : 2014-12-04 Koko Mill, LLC
-dog
-
-// doha : 2014-09-18 Communications Regulatory Authority (CRA)
-doha
-
-// domains : 2013-10-17 Sugar Cross, LLC
-domains
-
-// doosan : 2014-04-03 Doosan Corporation
-doosan
-
-// download : 2014-11-20 dot Support Limited
-download
-
-// drive : 2015-03-05 Charleston Road Registry Inc.
-drive
-
-// dstv : 2015-03-12 MultiChoice (Proprietary) Limited
-dstv
-
-// dubai : 2015-01-01 Dubai Smart Government Department
-dubai
-
-// durban : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry
-durban
-
-// dvag : 2014-06-23 Deutsche Vermögensberatung Aktiengesellschaft DVAG
-dvag
-
-// earth : 2014-12-04 Interlink Co., Ltd.
-earth
-
-// eat : 2014-01-23 Charleston Road Registry Inc.
-eat
-
-// edeka : 2014-12-18 EDEKA Verband kaufmännischer Genossenschaften e.V.
-edeka
-
-// education : 2013-11-07 Brice Way, LLC
-education
-
-// email : 2013-10-31 Spring Madison, LLC
-email
-
-// emerck : 2014-04-03 Merck KGaA
-emerck
-
-// energy : 2014-09-11 Binky Birch, LLC
-energy
-
-// engineer : 2014-03-06 United TLD Holdco Ltd.
-engineer
-
-// engineering : 2014-03-06 Romeo Canyon
-engineering
-
-// enterprises : 2013-09-20 Snow Oaks, LLC
-enterprises
-
-// epson : 2014-12-04 Seiko Epson Corporation
-epson
-
-// equipment : 2013-08-27 Corn Station, LLC
-equipment
-
-// erni : 2014-04-03 ERNI Group Holding AG
-erni
-
-// esq : 2014-05-08 Charleston Road Registry Inc.
-esq
-
-// estate : 2013-08-27 Trixy Park, LLC
-estate
-
-// eurovision : 2014-04-24 European Broadcasting Union (EBU)
-eurovision
-
-// eus : 2013-12-12 Puntueus Fundazioa
-eus
-
-// events : 2013-12-05 Pioneer Maple, LLC
-events
-
-// everbank : 2014-05-15 EverBank
-everbank
-
-// exchange : 2014-03-06 Spring Falls, LLC
-exchange
-
-// expert : 2013-11-21 Magic Pass, LLC
-expert
-
-// exposed : 2013-12-05 Victor Beach, LLC
-exposed
-
-// express : 2015-02-11 Sea Sunset, LLC
-express
-
-// fage : 2014-12-18 Fage International S.A.
-fage
-
-// fail : 2014-03-06 Atomic Pipe, LLC
-fail
-
-// fairwinds : 2014-11-13 FairWinds Partners, LLC
-fairwinds
-
-// faith : 2014-11-20 dot Faith Limited
-faith
-
-// family : 2015-04-02 Bitter Galley, LLC
-family
-
-// fan : 2014-03-06
-fan
-
-// fans : 2014-11-07 Asiamix Digital Limited
-fans
-
-// farm : 2013-11-07 Just Maple, LLC
-farm
-
-// fashion : 2014-07-03 Top Level Domain Holdings Limited
-fashion
-
-// fast : 2014-12-18 Amazon EU S.à r.l.
-fast
-
-// feedback : 2013-12-19 Top Level Spectrum, Inc.
-feedback
-
-// ferrero : 2014-12-18 Ferrero Trading Lux S.A.
-ferrero
-
-// film : 2015-01-08 Motion Picture Domain Registry Pty Ltd
-film
-
-// final : 2014-10-16 Núcleo de Informação e Coordenação do Ponto BR - NIC.br
-final
-
-// finance : 2014-03-20 Cotton Cypress, LLC
-finance
-
-// financial : 2014-03-06 Just Cover, LLC
-financial
-
-// firestone : 2014-12-18 Bridgestone Corporation
-firestone
-
-// firmdale : 2014-03-27 Firmdale Holdings Limited
-firmdale
-
-// fish : 2013-12-12 Fox Woods, LLC
-fish
-
-// fishing : 2013-11-21 Top Level Domain Holdings Limited
-fishing
-
-// fit : 2014-11-07 Top Level Domain Holdings Limited
-fit
-
-// fitness : 2014-03-06 Brice Orchard, LLC
-fitness
-
-// flickr : 2015-04-02 Yahoo! Domain Services Inc.
-flickr
-
-// flights : 2013-12-05 Fox Station, LLC
-flights
-
-// florist : 2013-11-07 Half Cypress, LLC
-florist
-
-// flowers : 2014-10-09 Uniregistry, Corp.
-flowers
-
-// flsmidth : 2014-07-24 FLSmidth A/S
-flsmidth
-
-// fly : 2014-05-08 Charleston Road Registry Inc.
-fly
-
-// foo : 2014-01-23 Charleston Road Registry Inc.
-foo
-
-// football : 2014-12-18 Foggy Farms, LLC
-football
-
-// ford : 2014-11-13 Ford Motor Company
-ford
-
-// forex : 2014-12-11 IG Group Holdings PLC
-forex
-
-// forsale : 2014-05-22
-forsale
-
-// forum : 2015-04-02 Fegistry, LLC
-forum
-
-// foundation : 2013-12-05 John Dale, LLC
-foundation
-
-// frl : 2014-05-15 FRLregistry B.V.
-frl
-
-// frogans : 2013-12-19 OP3FT
-frogans
-
-// frontier : 2015-02-05 Frontier Communications Corporation
-frontier
-
-// fund : 2014-03-20 John Castle, LLC
-fund
-
-// furniture : 2014-03-20 Lone Fields, LLC
-furniture
-
-// futbol : 2013-09-20
-futbol
-
-// fyi : 2015-04-02 Silver Tigers, LLC
-fyi
-
-// gal : 2013-11-07 Asociación puntoGAL
-gal
-
-// gallery : 2013-09-13 Sugar House, LLC
-gallery
-
-// gallup : 2015-02-19 Gallup, Inc.
-gallup
-
-// garden : 2014-06-26 Top Level Domain Holdings Limited
-garden
-
-// gbiz : 2014-07-17 Charleston Road Registry Inc.
-gbiz
-
-// gdn : 2014-07-31 Joint Stock Company "Navigation-information systems"
-gdn
-
-// gea : 2014-12-04 GEA Group Aktiengesellschaft
-gea
-
-// gent : 2014-01-23 COMBELL GROUP NV/SA
-gent
-
-// genting : 2015-03-12 Resorts World Inc Pte. Ltd.
-genting
-
-// ggee : 2014-01-09 GMO Internet, Inc.
-ggee
-
-// gift : 2013-10-17 Uniregistry, Corp.
-gift
-
-// gifts : 2014-07-03 Goose Sky, LLC
-gifts
-
-// gives : 2014-03-06 United TLD Holdco Ltd.
-gives
-
-// giving : 2014-11-13 Giving Limited
-giving
-
-// glass : 2013-11-07 Black Cover, LLC
-glass
-
-// gle : 2014-07-24 Charleston Road Registry Inc.
-gle
-
-// global : 2014-04-17 Dot GLOBAL AS
-global
-
-// globo : 2013-12-19 Globo Comunicação e Participações S.A
-globo
-
-// gmail : 2014-05-01 Charleston Road Registry Inc.
-gmail
-
-// gmo : 2014-01-09 GMO Internet, Inc.
-gmo
-
-// gmx : 2014-04-24 1&1 Mail & Media GmbH
-gmx
-
-// gold : 2015-01-22 June Edge, LLC
-gold
-
-// goldpoint : 2014-11-20 YODOBASHI CAMERA CO.,LTD.
-goldpoint
-
-// golf : 2014-12-18 Lone falls, LLC
-golf
-
-// goo : 2014-12-18 NTT Resonant Inc.
-goo
-
-// goog : 2014-11-20 Charleston Road Registry Inc.
-goog
-
-// google : 2014-07-24 Charleston Road Registry Inc.
-google
-
-// gop : 2014-01-16 Republican State Leadership Committee, Inc.
-gop
-
-// got : 2014-12-18 Amazon EU S.à r.l.
-got
-
-// gotv : 2015-03-12 MultiChoice (Proprietary) Limited
-gotv
-
-// graphics : 2013-09-13 Over Madison, LLC
-graphics
-
-// gratis : 2014-03-20 Pioneer Tigers, LLC
-gratis
-
-// green : 2014-05-08 Afilias Limited
-green
-
-// gripe : 2014-03-06 Corn Sunset, LLC
-gripe
-
-// group : 2014-08-15 Romeo Town, LLC
-group
-
-// gucci : 2014-11-13 Guccio Gucci S.p.a.
-gucci
-
-// guge : 2014-08-28 Charleston Road Registry Inc.
-guge
-
-// guide : 2013-09-13 Snow Moon, LLC
-guide
-
-// guitars : 2013-11-14 Uniregistry, Corp.
-guitars
-
-// guru : 2013-08-27 Pioneer Cypress, LLC
-guru
-
-// hamburg : 2014-02-20 Hamburg Top-Level-Domain GmbH
-hamburg
-
-// hangout : 2014-11-13 Charleston Road Registry Inc.
-hangout
-
-// haus : 2013-12-05
-haus
-
-// hdfcbank : 2015-02-12 HDFC Bank Limited
-hdfcbank
-
-// health : 2015-02-11 DotHealth, LLC
-health
-
-// healthcare : 2014-06-12 Silver Glen, LLC
-healthcare
-
-// help : 2014-06-26 Uniregistry, Corp.
-help
-
-// helsinki : 2015-02-05 City of Helsinki
-helsinki
-
-// here : 2014-02-06 Charleston Road Registry Inc.
-here
-
-// hermes : 2014-07-10 HERMES INTERNATIONAL
-hermes
-
-// hiphop : 2014-03-06 Uniregistry, Corp.
-hiphop
-
-// hitachi : 2014-10-31 Hitachi, Ltd.
-hitachi
-
-// hiv : 2014-03-13 dotHIV gemeinnuetziger e.V.
-hiv
-
-// hockey : 2015-03-19 Half Willow, LLC
-hockey
-
-// holdings : 2013-08-27 John Madison, LLC
-holdings
-
-// holiday : 2013-11-07 Goose Woods, LLC
-holiday
-
-// homedepot : 2015-04-02 Homer TLC, Inc.
-homedepot
-
-// homes : 2014-01-09 DERHomes, LLC
-homes
-
-// honda : 2014-12-18 Honda Motor Co., Ltd.
-honda
-
-// horse : 2013-11-21 Top Level Domain Holdings Limited
-horse
-
-// host : 2014-04-17 DotHost Inc.
-host
-
-// hosting : 2014-05-29 Uniregistry, Corp.
-hosting
-
-// hoteles : 2015-03-05 Travel Reservations SRL
-hoteles
-
-// hotmail : 2014-12-18 Microsoft Corporation
-hotmail
-
-// house : 2013-11-07 Sugar Park, LLC
-house
-
-// how : 2014-01-23 Charleston Road Registry Inc.
-how
-
-// hsbc : 2014-10-24 HSBC Holdings PLC
-hsbc
-
-// htc : 2015-04-02 HTC corporation
-htc
-
-// ibm : 2014-07-31 International Business Machines Corporation
-ibm
-
-// icbc : 2015-02-19 Industrial and Commercial Bank of China Limited
-icbc
-
-// ice : 2014-10-30 IntercontinentalExchange, Inc.
-ice
-
-// icu : 2015-01-08 One.com A/S
-icu
-
-// ifm : 2014-01-30 ifm electronic gmbh
-ifm
-
-// iinet : 2014-07-03 Connect West Pty. Ltd.
-iinet
-
-// immo : 2014-07-10 Auburn Bloom, LLC
-immo
-
-// immobilien : 2013-11-07 United TLD Holdco Ltd.
-immobilien
-
-// industries : 2013-12-05 Outer House, LLC
-industries
-
-// infiniti : 2014-03-27 NISSAN MOTOR CO., LTD.
-infiniti
-
-// ing : 2014-01-23 Charleston Road Registry Inc.
-ing
-
-// ink : 2013-12-05 Top Level Design, LLC
-ink
-
-// institute : 2013-11-07 Outer Maple, LLC
-institute
-
-// insurance : 2015-02-19 fTLD Registry Services LLC
-insurance
-
-// insure : 2014-03-20 Pioneer Willow, LLC
-insure
-
-// international : 2013-11-07 Wild Way, LLC
-international
-
-// investments : 2014-03-20 Holly Glen, LLC
-investments
-
-// ipiranga : 2014-08-28 Ipiranga Produtos de Petroleo S.A.
-ipiranga
-
-// irish : 2014-08-07 Dot-Irish LLC
-irish
-
-// iselect : 2015-02-11 iSelect Ltd
-iselect
-
-// ist : 2014-08-28 Istanbul Metropolitan Municipality
-ist
-
-// istanbul : 2014-08-28 Istanbul Metropolitan Municipality
-istanbul
-
-// itau : 2014-10-02 Itau Unibanco Holding S.A.
-itau
-
-// iwc : 2014-06-23 Richemont DNS Inc.
-iwc
-
-// jaguar : 2014-11-13 Jaguar Land Rover Ltd
-jaguar
-
-// java : 2014-06-19 Oracle Corporation
-java
-
-// jcb : 2014-11-20 JCB Co., Ltd.
-jcb
-
-// jcp : 2015-04-23 JCP Media, Inc.
-jcp
-
-// jetzt : 2014-01-09 New TLD Company AB
-jetzt
-
-// jewelry : 2015-03-05 Wild Bloom, LLC
-jewelry
-
-// jio : 2015-04-02 Affinity Names, Inc.
-jio
-
-// jlc : 2014-12-04 Richemont DNS Inc.
-jlc
-
-// jll : 2015-04-02 Jones Lang LaSalle Incorporated
-jll
-
-// jmp : 2015-03-26 Matrix IP LLC
-jmp
-
-// joburg : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry
-joburg
-
-// jot : 2014-12-18 Amazon EU S.à r.l.
-jot
-
-// joy : 2014-12-18 Amazon EU S.à r.l.
-joy
-
-// jpmorgan : 2015-04-30 JPMorgan Chase & Co.
-jpmorgan
-
-// jprs : 2014-09-18 Japan Registry Services Co., Ltd.
-jprs
-
-// juegos : 2014-03-20 Uniregistry, Corp.
-juegos
-
-// kaufen : 2013-11-07 United TLD Holdco Ltd.
-kaufen
-
-// kddi : 2014-09-12 KDDI CORPORATION
-kddi
-
-// kerryhotels : 2015-04-30 Kerry Trading Co. Limited
-kerryhotels
-
-// kerrylogistics : 2015-04-09 Kerry Trading Co. Limited
-kerrylogistics
-
-// kerryproperties : 2015-04-09 Kerry Trading Co. Limited
-kerryproperties
-
-// kfh : 2014-12-04 Kuwait Finance House
-kfh
-
-// kim : 2013-09-23 Afilias Limited
-kim
-
-// kinder : 2014-11-07 Ferrero Trading Lux S.A.
-kinder
-
-// kitchen : 2013-09-20 Just Goodbye, LLC
-kitchen
-
-// kiwi : 2013-09-20 DOT KIWI LIMITED
-kiwi
-
-// koeln : 2014-01-09 NetCologne Gesellschaft für Telekommunikation mbH
-koeln
-
-// komatsu : 2015-01-08 Komatsu Ltd.
-komatsu
-
-// kpmg : 2015-04-23 KPMG International Cooperative (KPMG International Genossenschaft)
-kpmg
-
-// kpn : 2015-01-08 Koninklijke KPN N.V.
-kpn
-
-// krd : 2013-12-05 KRG Department of Information Technology
-krd
-
-// kred : 2013-12-19 KredTLD Pty Ltd
-kred
-
-// kuokgroup : 2015-04-09 Kerry Trading Co. Limited
-kuokgroup
-
-// kyknet : 2015-03-05 Electronic Media Network (Pty) Ltd
-kyknet
-
-// kyoto : 2014-11-07 Academic Institution: Kyoto Jyoho Gakuen
-kyoto
-
-// lacaixa : 2014-01-09 CAIXA D'ESTALVIS I PENSIONS DE BARCELONA
-lacaixa
-
-// lancaster : 2015-02-12 LANCASTER
-lancaster
-
-// land : 2013-09-10 Pine Moon, LLC
-land
-
-// landrover : 2014-11-13 Jaguar Land Rover Ltd
-landrover
-
-// lasalle : 2015-04-02 Jones Lang LaSalle Incorporated
-lasalle
-
-// lat : 2014-10-16 ECOM-LAC Federaciòn de Latinoamèrica y el Caribe para Internet y el Comercio Electrònico
-lat
-
-// latrobe : 2014-06-16 La Trobe University
-latrobe
-
-// law : 2015-01-22 Minds + Machines Group Limited
-law
-
-// lawyer : 2014-03-20
-lawyer
-
-// lds : 2014-03-20 IRI Domain Management, LLC ("Applicant")
-lds
-
-// lease : 2014-03-06 Victor Trail, LLC
-lease
-
-// leclerc : 2014-08-07 A.C.D. LEC Association des Centres Distributeurs Edouard Leclerc
-leclerc
-
-// legal : 2014-10-16 Blue Falls, LLC
-legal
-
-// lexus : 2015-04-23 TOYOTA MOTOR CORPORATION
-lexus
-
-// lgbt : 2014-05-08 Afilias Limited
-lgbt
-
-// liaison : 2014-10-02 Liaison Technologies, Incorporated
-liaison
-
-// lidl : 2014-09-18 Schwarz Domains und Services GmbH & Co. KG
-lidl
-
-// life : 2014-02-06 Trixy Oaks, LLC
-life
-
-// lifeinsurance : 2015-01-15 American Council of Life Insurers
-lifeinsurance
-
-// lifestyle : 2014-12-11 Lifestyle Domain Holdings, Inc.
-lifestyle
-
-// lighting : 2013-08-27 John McCook, LLC
-lighting
-
-// like : 2014-12-18 Amazon EU S.à r.l.
-like
-
-// limited : 2014-03-06 Big Fest, LLC
-limited
-
-// limo : 2013-10-17 Hidden Frostbite, LLC
-limo
-
-// lincoln : 2014-11-13 Ford Motor Company
-lincoln
-
-// linde : 2014-12-04 Linde Aktiengesellschaft
-linde
-
-// link : 2013-11-14 Uniregistry, Corp.
-link
-
-// live : 2014-12-04 Half Woods, LLC
-live
-
-// lixil : 2015-03-19 LIXIL Group Corporation
-lixil
-
-// loan : 2014-11-20 dot Loan Limited
-loan
-
-// loans : 2014-03-20 June Woods, LLC
-loans
-
-// lol : 2015-01-30 Uniregistry, Corp.
-lol
-
-// london : 2013-11-14 Dot London Domains Limited
-london
-
-// lotte : 2014-11-07 Lotte Holdings Co., Ltd.
-lotte
-
-// lotto : 2014-04-10 Afilias Limited
-lotto
-
-// love : 2014-12-22 Merchant Law Group LLP
-love
-
-// ltd : 2014-09-25 Over Corner, LLC
-ltd
-
-// ltda : 2014-04-17 DOMAIN ROBOT SERVICOS DE HOSPEDAGEM NA INTERNET LTDA
-ltda
-
-// lupin : 2014-11-07 LUPIN LIMITED
-lupin
-
-// luxe : 2014-01-09 Top Level Domain Holdings Limited
-luxe
-
-// luxury : 2013-10-17 Luxury Partners, LLC
-luxury
-
-// madrid : 2014-05-01 Comunidad de Madrid
-madrid
-
-// maif : 2014-10-02 Mutuelle Assurance Instituteur France (MAIF)
-maif
-
-// maison : 2013-12-05 Victor Frostbite, LLC
-maison
-
-// makeup : 2015-01-15 L'Oréal
-makeup
-
-// man : 2014-12-04 MAN SE
-man
-
-// management : 2013-11-07 John Goodbye, LLC
-management
-
-// mango : 2013-10-24 PUNTO FA S.L.
-mango
-
-// market : 2014-03-06
-market
-
-// marketing : 2013-11-07 Fern Pass, LLC
-marketing
-
-// markets : 2014-12-11 IG Group Holdings PLC
-markets
-
-// marriott : 2014-10-09 Marriott Worldwide Corporation
-marriott
-
-// mba : 2015-04-02 Lone Hollow, LLC
-mba
-
-// media : 2014-03-06 Grand Glen, LLC
-media
-
-// meet : 2014-01-16
-meet
-
-// melbourne : 2014-05-29 The Crown in right of the State of Victoria, represented by its Department of State Development, Business and Innovation
-melbourne
-
-// meme : 2014-01-30 Charleston Road Registry Inc.
-meme
-
-// memorial : 2014-10-16 Dog Beach, LLC
-memorial
-
-// men : 2015-02-26 Exclusive Registry Limited
-men
-
-// menu : 2013-09-11 Wedding TLD2, LLC
-menu
-
-// meo : 2014-11-07 PT Comunicacoes S.A.
-meo
-
-// miami : 2013-12-19 Top Level Domain Holdings Limited
-miami
-
-// microsoft : 2014-12-18 Microsoft Corporation
-microsoft
-
-// mini : 2014-01-09 Bayerische Motoren Werke Aktiengesellschaft
-mini
-
-// mls : 2015-04-23 The Canadian Real Estate Association
-mls
-
-// mma : 2014-11-07 MMA IARD
-mma
-
-// mnet : 2015-03-05 Electronic Media Network (Pty) Ltd
-mnet
-
-// mobily : 2014-12-18 GreenTech Consultancy Company W.L.L.
-mobily
-
-// moda : 2013-11-07 United TLD Holdco Ltd.
-moda
-
-// moe : 2013-11-13 Interlink Co., Ltd.
-moe
-
-// moi : 2014-12-18 Amazon EU S.à r.l.
-moi
-
-// mom : 2015-04-16 Uniregistry, Corp.
-mom
-
-// monash : 2013-09-30 Monash University
-monash
-
-// money : 2014-10-16 Outer McCook, LLC
-money
-
-// montblanc : 2014-06-23 Richemont DNS Inc.
-montblanc
-
-// mormon : 2013-12-05 IRI Domain Management, LLC ("Applicant")
-mormon
-
-// mortgage : 2014-03-20
-mortgage
-
-// moscow : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
-moscow
-
-// motorcycles : 2014-01-09 DERMotorcycles, LLC
-motorcycles
-
-// mov : 2014-01-30 Charleston Road Registry Inc.
-mov
-
-// movie : 2015-02-05 New Frostbite, LLC
-movie
-
-// movistar : 2014-10-16 Telefónica S.A.
-movistar
-
-// mtn : 2014-12-04 MTN Dubai Limited
-mtn
-
-// mtpc : 2014-11-20 Mitsubishi Tanabe Pharma Corporation
-mtpc
-
-// mtr : 2015-03-12 MTR Corporation Limited
-mtr
-
-// multichoice : 2015-03-12 MultiChoice (Proprietary) Limited
-multichoice
-
-// mutual : 2015-04-02 Northwestern Mutual MU TLD Registry, LLC
-mutual
-
-// mzansimagic : 2015-03-05 Electronic Media Network (Pty) Ltd
-mzansimagic
-
-// nadex : 2014-12-11 IG Group Holdings PLC
-nadex
-
-// nagoya : 2013-10-24 GMO Registry, Inc.
-nagoya
-
-// naspers : 2015-02-12 Intelprop (Proprietary) Limited
-naspers
-
-// natura : 2015-03-12 NATURA COSMÉTICOS S.A.
-natura
-
-// navy : 2014-03-06 United TLD Holdco Ltd.
-navy
-
-// nec : 2015-01-08 NEC Corporation
-nec
-
-// netbank : 2014-06-26 COMMONWEALTH BANK OF AUSTRALIA
-netbank
-
-// network : 2013-11-14 Trixy Manor, LLC
-network
-
-// neustar : 2013-12-05 NeuStar, Inc.
-neustar
-
-// new : 2014-01-30 Charleston Road Registry Inc.
-new
-
-// news : 2014-12-18
-news
-
-// nexus : 2014-07-24 Charleston Road Registry Inc.
-nexus
-
-// ngo : 2014-03-06 Public Interest Registry
-ngo
-
-// nhk : 2014-02-13 Japan Broadcasting Corporation (NHK)
-nhk
-
-// nico : 2014-12-04 DWANGO Co., Ltd.
-nico
-
-// ninja : 2013-11-07 United TLD Holdco Ltd.
-ninja
-
-// nissan : 2014-03-27 NISSAN MOTOR CO., LTD.
-nissan
-
-// nokia : 2015-01-08 Nokia Corporation
-nokia
-
-// norton : 2014-12-04 Symantec Corporation
-norton
-
-// nowruz : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
-nowruz
-
-// nra : 2014-05-22 NRA Holdings Company, INC.
-nra
-
-// nrw : 2013-11-21 Minds + Machines GmbH
-nrw
-
-// ntt : 2014-10-31 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
-ntt
-
-// nyc : 2014-01-23 The City of New York by and through the New York City Department of Information Technology & Telecommunications
-nyc
-
-// obi : 2014-09-25 OBI Group Holding SE & Co. KGaA
-obi
-
-// observer : 2015-04-30 Guardian News and Media Limited
-observer
-
-// office : 2015-03-12 Microsoft Corporation
-office
-
-// okinawa : 2013-12-05 BusinessRalliart Inc.
-okinawa
-
-// omega : 2015-01-08 The Swatch Group Ltd
-omega
-
-// one : 2014-11-07 One.com A/S
-one
-
-// ong : 2014-03-06 Public Interest Registry
-ong
-
-// onl : 2013-09-16 I-Registry Ltd.
-onl
-
-// online : 2015-01-15 DotOnline Inc.
-online
-
-// ooo : 2014-01-09 INFIBEAM INCORPORATION LIMITED
-ooo
-
-// oracle : 2014-06-19 Oracle Corporation
-oracle
-
-// orange : 2015-03-12 Orange Brand Services Limited
-orange
-
-// organic : 2014-03-27 Afilias Limited
-organic
-
-// orientexpress : 2015-02-05 Belmond Ltd.
-orientexpress
-
-// osaka : 2014-09-04 Interlink Co., Ltd.
-osaka
-
-// otsuka : 2013-10-11 Otsuka Holdings Co., Ltd.
-otsuka
-
-// ovh : 2014-01-16 OVH SAS
-ovh
-
-// page : 2014-12-04 Charleston Road Registry Inc.
-page
-
-// pamperedchef : 2015-02-05 The Pampered Chef, Ltd.
-pamperedchef
-
-// panerai : 2014-11-07 Richemont DNS Inc.
-panerai
-
-// paris : 2014-01-30 City of Paris
-paris
-
-// pars : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
-pars
-
-// partners : 2013-12-05 Magic Glen, LLC
-partners
-
-// parts : 2013-12-05 Sea Goodbye, LLC
-parts
-
-// party : 2014-09-11 Blue Sky Registry Limited
-party
-
-// passagens : 2015-03-05 Travel Reservations SRL
-passagens
-
-// payu : 2015-02-12 MIH PayU B.V.
-payu
-
-// pharmacy : 2014-06-19 National Association of Boards of Pharmacy
-pharmacy
-
-// philips : 2014-11-07 Koninklijke Philips N.V.
-philips
-
-// photo : 2013-11-14 Uniregistry, Corp.
-photo
-
-// photography : 2013-09-20 Sugar Glen, LLC
-photography
-
-// photos : 2013-10-17 Sea Corner, LLC
-photos
-
-// physio : 2014-05-01 PhysBiz Pty Ltd
-physio
-
-// piaget : 2014-10-16 Richemont DNS Inc.
-piaget
-
-// pics : 2013-11-14 Uniregistry, Corp.
-pics
-
-// pictet : 2014-06-26 Pictet Europe S.A.
-pictet
-
-// pictures : 2014-03-06 Foggy Sky, LLC
-pictures
-
-// pid : 2015-01-08 Top Level Spectrum, Inc.
-pid
-
-// pin : 2014-12-18 Amazon EU S.à r.l.
-pin
-
-// pink : 2013-10-01 Afilias Limited
-pink
-
-// pizza : 2014-06-26 Foggy Moon, LLC
-pizza
-
-// place : 2014-04-24 Snow Galley, LLC
-place
-
-// play : 2015-03-05 Charleston Road Registry Inc.
-play
-
-// plumbing : 2013-09-10 Spring Tigers, LLC
-plumbing
-
-// plus : 2015-02-05 Sugar Mill, LLC
-plus
-
-// pohl : 2014-06-23 Deutsche Vermögensberatung Aktiengesellschaft DVAG
-pohl
-
-// poker : 2014-07-03 Afilias Domains No. 5 Limited
-poker
-
-// porn : 2014-10-16 ICM Registry PN LLC
-porn
-
-// praxi : 2013-12-05 Praxi S.p.A.
-praxi
-
-// press : 2014-04-03 DotPress Inc.
-press
-
-// prod : 2014-01-23 Charleston Road Registry Inc.
-prod
-
-// productions : 2013-12-05 Magic Birch, LLC
-productions
-
-// prof : 2014-07-24 Charleston Road Registry Inc.
-prof
-
-// promo : 2014-12-18 Play.PROMO Oy
-promo
-
-// properties : 2013-12-05 Big Pass, LLC
-properties
-
-// property : 2014-05-22 Uniregistry, Corp.
-property
-
-// protection : 2015-04-23 Symantec Corporation
-protection
-
-// pub : 2013-12-12 United TLD Holdco Ltd.
-pub
-
-// qpon : 2013-11-14 dotCOOL, Inc.
-qpon
-
-// quebec : 2013-12-19 PointQuébec Inc
-quebec
-
-// quest : 2015-03-26 Quest ION Limited
-quest
-
-// racing : 2014-12-04 Premier Registry Limited
-racing
-
-// read : 2014-12-18 Amazon EU S.à r.l.
-read
-
-// realtor : 2014-05-29 Real Estate Domains LLC
-realtor
-
-// realty : 2015-03-19 Fegistry, LLC
-realty
-
-// recipes : 2013-10-17 Grand Island, LLC
-recipes
-
-// red : 2013-11-07 Afilias Limited
-red
-
-// redstone : 2014-10-31 Redstone Haute Couture Co., Ltd.
-redstone
-
-// redumbrella : 2015-03-26 Travelers TLD, LLC
-redumbrella
-
-// rehab : 2014-03-06 United TLD Holdco Ltd.
-rehab
-
-// reise : 2014-03-13 dotreise GmbH
-reise
-
-// reisen : 2014-03-06 New Cypress, LLC
-reisen
-
-// reit : 2014-09-04 National Association of Real Estate Investment Trusts, Inc.
-reit
-
-// reliance : 2015-04-02 Reliance Industries Limited
-reliance
-
-// ren : 2013-12-12 Beijing Qianxiang Wangjing Technology Development Co., Ltd.
-ren
-
-// rent : 2014-12-04 DERRent, LLC
-rent
-
-// rentals : 2013-12-05 Big Hollow,LLC
-rentals
-
-// repair : 2013-11-07 Lone Sunset, LLC
-repair
-
-// report : 2013-12-05 Binky Glen, LLC
-report
-
-// republican : 2014-03-20 United TLD Holdco Ltd.
-republican
-
-// rest : 2013-12-19 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable
-rest
-
-// restaurant : 2014-07-03 Snow Avenue, LLC
-restaurant
-
-// review : 2014-11-20 dot Review Limited
-review
-
-// reviews : 2013-09-13
-reviews
-
-// rich : 2013-11-21 I-Registry Ltd.
-rich
-
-// ricoh : 2014-11-20 Ricoh Company, Ltd.
-ricoh
-
-// ril : 2015-04-02 Reliance Industries Limited
-ril
-
-// rio : 2014-02-27 Empresa Municipal de Informática SA - IPLANRIO
-rio
-
-// rip : 2014-07-10 United TLD Holdco Ltd.
-rip
-
-// rocher : 2014-12-18 Ferrero Trading Lux S.A.
-rocher
-
-// rocks : 2013-11-14
-rocks
-
-// rodeo : 2013-12-19 Top Level Domain Holdings Limited
-rodeo
-
-// room : 2014-12-18 Amazon EU S.à r.l.
-room
-
-// rsvp : 2014-05-08 Charleston Road Registry Inc.
-rsvp
-
-// ruhr : 2013-10-02 regiodot GmbH & Co. KG
-ruhr
-
-// run : 2015-03-19 Snow Park, LLC
-run
-
-// rwe : 2015-04-02 RWE AG
-rwe
-
-// ryukyu : 2014-01-09 BusinessRalliart Inc.
-ryukyu
-
-// saarland : 2013-12-12 dotSaarland GmbH
-saarland
-
-// safe : 2014-12-18 Amazon EU S.à r.l.
-safe
-
-// safety : 2015-01-08 Safety Registry Services, LLC.
-safety
-
-// sakura : 2014-12-18 SAKURA Internet Inc.
-sakura
-
-// sale : 2014-10-16
-sale
-
-// salon : 2014-12-11 Outer Orchard, LLC
-salon
-
-// samsung : 2014-04-03 SAMSUNG SDS CO., LTD
-samsung
-
-// sandvik : 2014-11-13 Sandvik AB
-sandvik
-
-// sandvikcoromant : 2014-11-07 Sandvik AB
-sandvikcoromant
-
-// sanofi : 2014-10-09 Sanofi
-sanofi
-
-// sap : 2014-03-27 SAP AG
-sap
-
-// sapo : 2014-11-07 PT Comunicacoes S.A.
-sapo
-
-// sarl : 2014-07-03 Delta Orchard, LLC
-sarl
-
-// sas : 2015-04-02 Research IP LLC
-sas
-
-// saxo : 2014-10-31 Saxo Bank A/S
-saxo
-
-// sbi : 2015-03-12 STATE BANK OF INDIA
-sbi
-
-// sbs : 2014-11-07 SPECIAL BROADCASTING SERVICE CORPORATION
-sbs
-
-// sca : 2014-03-13 SVENSKA CELLULOSA AKTIEBOLAGET SCA (publ)
-sca
-
-// scb : 2014-02-20 The Siam Commercial Bank Public Company Limited ("SCB")
-scb
-
-// schmidt : 2014-04-03 SALM S.A.S.
-schmidt
-
-// scholarships : 2014-04-24 Scholarships.com, LLC
-scholarships
-
-// school : 2014-12-18 Little Galley, LLC
-school
-
-// schule : 2014-03-06 Outer Moon, LLC
-schule
-
-// schwarz : 2014-09-18 Schwarz Domains und Services GmbH & Co. KG
-schwarz
-
-// science : 2014-09-11 dot Science Limited
-science
-
-// scor : 2014-10-31 SCOR SE
-scor
-
-// scot : 2014-01-23 Dot Scot Registry Limited
-scot
-
-// seat : 2014-05-22 SEAT, S.A. (Sociedad Unipersonal)
-seat
-
-// seek : 2014-12-04 Seek Limited
-seek
-
-// sener : 2014-10-24 Sener Ingeniería y Sistemas, S.A.
-sener
-
-// services : 2014-02-27 Fox Castle, LLC
-services
-
-// sew : 2014-07-17 SEW-EURODRIVE GmbH & Co KG
-sew
-
-// sex : 2014-11-13 ICM Registry SX LLC
-sex
-
-// sexy : 2013-09-11 Uniregistry, Corp.
-sexy
-
-// sharp : 2014-05-01 Sharp Corporation
-sharp
-
-// shaw : 2015-04-23 Shaw Cablesystems G.P.
-shaw
-
-// shia : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
-shia
-
-// shiksha : 2013-11-14 Afilias Limited
-shiksha
-
-// shoes : 2013-10-02 Binky Galley, LLC
-shoes
-
-// shouji : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD.
-shouji
-
-// show : 2015-03-05 Snow Beach, LLC
-show
-
-// shriram : 2014-01-23 Shriram Capital Ltd.
-shriram
-
-// sina : 2015-03-12 Sina Corporation
-sina
-
-// singles : 2013-08-27 Fern Madison, LLC
-singles
-
-// site : 2015-01-15 DotSite Inc.
-site
-
-// ski : 2015-04-09 STARTING DOT LIMITED
-ski
-
-// skin : 2015-01-15 L'Oréal
-skin
-
-// sky : 2014-06-19 Sky IP International Ltd, a company incorporated in England and Wales, operating via its registered Swiss branch
-sky
-
-// skype : 2014-12-18 Microsoft Corporation
-skype
-
-// smile : 2014-12-18 Amazon EU S.à r.l.
-smile
-
-// sncf : 2015-02-19 Société Nationale des Chemins de fer Francais S N C F
-sncf
-
-// soccer : 2015-03-26 Foggy Shadow, LLC
-soccer
-
-// social : 2013-11-07 United TLD Holdco Ltd.
-social
-
-// software : 2014-03-20
-software
-
-// sohu : 2013-12-19 Sohu.com Limited
-sohu
-
-// solar : 2013-11-07 Ruby Town, LLC
-solar
-
-// solutions : 2013-11-07 Silver Cover, LLC
-solutions
-
-// song : 2015-02-26 Amazon EU S.à r.l.
-song
-
-// sony : 2015-01-08 Sony Corporation
-sony
-
-// soy : 2014-01-23 Charleston Road Registry Inc.
-soy
-
-// space : 2014-04-03 DotSpace Inc.
-space
-
-// spiegel : 2014-02-05 SPIEGEL-Verlag Rudolf Augstein GmbH & Co. KG
-spiegel
-
-// spot : 2015-02-26 Amazon EU S.à r.l.
-spot
-
-// spreadbetting : 2014-12-11 IG Group Holdings PLC
-spreadbetting
-
-// stada : 2014-11-13 STADA Arzneimittel AG
-stada
-
-// star : 2015-01-08 Star India Private Limited
-star
-
-// starhub : 2015-02-05 StarHub Limited
-starhub
-
-// statebank : 2015-03-12 STATE BANK OF INDIA
-statebank
-
-// statoil : 2014-12-04 Statoil ASA
-statoil
-
-// stc : 2014-10-09 Saudi Telecom Company
-stc
-
-// stcgroup : 2014-10-09 Saudi Telecom Company
-stcgroup
-
-// stockholm : 2014-12-18 Stockholms kommun
-stockholm
-
-// storage : 2014-12-22 Self Storage Company LLC
-storage
-
-// store : 2015-04-09 DotStore Inc.
-store
-
-// studio : 2015-02-11 Spring Goodbye, LLC
-studio
-
-// study : 2014-12-11 OPEN UNIVERSITIES AUSTRALIA PTY LTD
-study
-
-// style : 2014-12-04 Binky Moon, LLC
-style
-
-// sucks : 2014-12-22 Vox Populi Registry Inc.
-sucks
-
-// supersport : 2015-03-05 SuperSport International Holdings Proprietary Limited
-supersport
-
-// supplies : 2013-12-19 Atomic Fields, LLC
-supplies
-
-// supply : 2013-12-19 Half Falls, LLC
-supply
-
-// support : 2013-10-24 Grand Orchard, LLC
-support
-
-// surf : 2014-01-09 Top Level Domain Holdings Limited
-surf
-
-// surgery : 2014-03-20 Tin Avenue, LLC
-surgery
-
-// suzuki : 2014-02-20 SUZUKI MOTOR CORPORATION
-suzuki
-
-// swatch : 2015-01-08 The Swatch Group Ltd
-swatch
-
-// swiss : 2014-10-16 Swiss Confederation
-swiss
-
-// sydney : 2014-09-18 State of New South Wales, Department of Premier and Cabinet
-sydney
-
-// symantec : 2014-12-04 Symantec Corporation
-symantec
-
-// systems : 2013-11-07 Dash Cypress, LLC
-systems
-
-// tab : 2014-12-04 Tabcorp Holdings Limited
-tab
-
-// taipei : 2014-07-10 Taipei City Government
-taipei
-
-// talk : 2015-04-09 Amazon EU S.à r.l.
-talk
-
-// taobao : 2015-01-15 Alibaba Group Holding Limited
-taobao
-
-// tatamotors : 2015-03-12 Tata Motors Ltd
-tatamotors
-
-// tatar : 2014-04-24 Limited Liability Company "Coordination Center of Regional Domain of Tatarstan Republic"
-tatar
-
-// tattoo : 2013-08-30 Uniregistry, Corp.
-tattoo
-
-// tax : 2014-03-20 Storm Orchard, LLC
-tax
-
-// taxi : 2015-03-19 Pine Falls, LLC
-taxi
-
-// tci : 2014-09-12 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
-tci
-
-// team : 2015-03-05 Atomic Lake, LLC
-team
-
-// tech : 2015-01-30 Dot Tech LLC
-tech
-
-// technology : 2013-09-13 Auburn Falls
-technology
-
-// telecity : 2015-02-19 TelecityGroup International Limited
-telecity
-
-// telefonica : 2014-10-16 Telefónica S.A.
-telefonica
-
-// temasek : 2014-08-07 Temasek Holdings (Private) Limited
-temasek
-
-// tennis : 2014-12-04 Cotton Bloom, LLC
-tennis
-
-// thd : 2015-04-02 Homer TLC, Inc.
-thd
-
-// theater : 2015-03-19 Blue Tigers, LLC
-theater
-
-// theguardian : 2015-04-30 Guardian News and Media Limited
-theguardian
-
-// tickets : 2015-02-05 Accent Media Limited
-tickets
-
-// tienda : 2013-11-14 Victor Manor, LLC
-tienda
-
-// tiffany : 2015-01-30 Tiffany and Company
-tiffany
-
-// tips : 2013-09-20 Corn Willow, LLC
-tips
-
-// tires : 2014-11-07 Dog Edge, LLC
-tires
-
-// tirol : 2014-04-24 punkt Tirol GmbH
-tirol
-
-// tmall : 2015-01-15 Alibaba Group Holding Limited
-tmall
-
-// today : 2013-09-20 Pearl Woods, LLC
-today
-
-// tokyo : 2013-11-13 GMO Registry, Inc.
-tokyo
-
-// tools : 2013-11-21 Pioneer North, LLC
-tools
-
-// top : 2014-03-20 Jiangsu Bangning Science & Technology Co.,Ltd.
-top
-
-// toray : 2014-12-18 Toray Industries, Inc.
-toray
-
-// toshiba : 2014-04-10 TOSHIBA Corporation
-toshiba
-
-// tours : 2015-01-22 Sugar Station, LLC
-tours
-
-// town : 2014-03-06 Koko Moon, LLC
-town
-
-// toyota : 2015-04-23 TOYOTA MOTOR CORPORATION
-toyota
-
-// toys : 2014-03-06 Pioneer Orchard, LLC
-toys
-
-// trade : 2014-01-23 Elite Registry Limited
-trade
-
-// trading : 2014-12-11 IG Group Holdings PLC
-trading
-
-// training : 2013-11-07 Wild Willow, LLC
-training
-
-// travelers : 2015-03-26 Travelers TLD, LLC
-travelers
-
-// travelersinsurance : 2015-03-26 Travelers TLD, LLC
-travelersinsurance
-
-// trust : 2014-10-16
-trust
-
-// trv : 2015-03-26 Travelers TLD, LLC
-trv
-
-// tui : 2014-07-03 TUI AG
-tui
-
-// tunes : 2015-02-26 Amazon EU S.à r.l.
-tunes
-
-// tushu : 2014-12-18 Amazon EU S.à r.l.
-tushu
-
-// tvs : 2015-02-19 T V SUNDRAM IYENGAR  & SONS LIMITED
-tvs
-
-// ubs : 2014-12-11 UBS AG
-ubs
-
-// university : 2014-03-06 Little Station, LLC
-university
-
-// uno : 2013-09-11 Dot Latin LLC
-uno
-
-// uol : 2014-05-01 UBN INTERNET LTDA.
-uol
-
-// vacations : 2013-12-05 Atomic Tigers, LLC
-vacations
-
-// vana : 2014-12-11 Lifestyle Domain Holdings, Inc.
-vana
-
-// vegas : 2014-01-16 Dot Vegas, Inc.
-vegas
-
-// ventures : 2013-08-27 Binky Lake, LLC
-ventures
-
-// versicherung : 2014-03-20 dotversicherung-registry GmbH
-versicherung
-
-// vet : 2014-03-06
-vet
-
-// viajes : 2013-10-17 Black Madison, LLC
-viajes
-
-// video : 2014-10-16
-video
-
-// viking : 2015-04-02 Viking River Cruises (Bermuda) Ltd.
-viking
-
-// villas : 2013-12-05 New Sky, LLC
-villas
-
-// vip : 2015-01-22 Minds + Machines Group Limited
-vip
-
-// virgin : 2014-09-25 Virgin Enterprises Limited
-virgin
-
-// vision : 2013-12-05 Koko Station, LLC
-vision
-
-// vista : 2014-09-18 Vistaprint Limited
-vista
-
-// vistaprint : 2014-09-18 Vistaprint Limited
-vistaprint
-
-// viva : 2014-11-07 Saudi Telecom Company
-viva
-
-// vlaanderen : 2014-02-06 DNS.be vzw
-vlaanderen
-
-// vodka : 2013-12-19 Top Level Domain Holdings Limited
-vodka
-
-// vote : 2013-11-21 Monolith Registry LLC
-vote
-
-// voting : 2013-11-13 Valuetainment Corp.
-voting
-
-// voto : 2013-11-21 Monolith Registry LLC
-voto
-
-// voyage : 2013-08-27 Ruby House, LLC
-voyage
-
-// vuelos : 2015-03-05 Travel Reservations SRL
-vuelos
-
-// wales : 2014-05-08 Nominet UK
-wales
-
-// walter : 2014-11-13 Sandvik AB
-walter
-
-// wang : 2013-10-24 Zodiac Leo Limited
-wang
-
-// wanggou : 2014-12-18 Amazon EU S.à r.l.
-wanggou
-
-// watch : 2013-11-14 Sand Shadow, LLC
-watch
-
-// watches : 2014-12-22 Richemont DNS Inc.
-watches
-
-// weather : 2015-01-08 The Weather Channel, LLC
-weather
-
-// weatherchannel : 2015-03-12 The Weather Channel, LLC
-weatherchannel
-
-// webcam : 2014-01-23 dot Webcam Limited
-webcam
-
-// website : 2014-04-03 DotWebsite Inc.
-website
-
-// wed : 2013-10-01 Atgron, Inc.
-wed
-
-// wedding : 2014-04-24 Top Level Domain Holdings Limited
-wedding
-
-// weibo : 2015-03-05 Sina Corporation
-weibo
-
-// weir : 2015-01-29 Weir Group IP Limited
-weir
-
-// whoswho : 2014-02-20 Who's Who Registry
-whoswho
-
-// wien : 2013-10-28 punkt.wien GmbH
-wien
-
-// wiki : 2013-11-07 Top Level Design, LLC
-wiki
-
-// williamhill : 2014-03-13 William Hill Organization Limited
-williamhill
-
-// win : 2014-11-20 First Registry Limited
-win
-
-// windows : 2014-12-18 Microsoft Corporation
-windows
-
-// wme : 2014-02-13 William Morris Endeavor Entertainment, LLC
-wme
-
-// work : 2013-12-19 Top Level Domain Holdings Limited
-work
-
-// works : 2013-11-14 Little Dynamite, LLC
-works
-
-// world : 2014-06-12 Bitter Fields, LLC
-world
-
-// wtc : 2013-12-19 World Trade Centers Association, Inc.
-wtc
-
-// wtf : 2014-03-06 Hidden Way, LLC
-wtf
-
-// xbox : 2014-12-18 Microsoft Corporation
-xbox
-
-// xerox : 2014-10-24 Xerox DNHC LLC
-xerox
-
-// xihuan : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD.
-xihuan
-
-// xin : 2014-12-11 Elegant Leader Limited
-xin
-
-// xn--11b4c3d : 2015-01-15 VeriSign Sarl
-कॉम
-
-// xn--1ck2e1b : 2015-02-26 Amazon EU S.à r.l.
-セール
-
-// xn--1qqw23a : 2014-01-09 Guangzhou YU Wei Information Technology Co., Ltd.
-佛山
-
-// xn--30rr7y : 2014-06-12 Excellent First Limited
-慈善
-
-// xn--3bst00m : 2013-09-13 Eagle Horizon Limited
-集团
-
-// xn--3ds443g : 2013-09-08 TLD REGISTRY LIMITED
-在线
-
-// xn--3pxu8k : 2015-01-15 VeriSign Sarl
-点看
-
-// xn--42c2d9a : 2015-01-15 VeriSign Sarl
-คอม
-
-// xn--45q11c : 2013-11-21 Zodiac Scorpio Limited
-八卦
-
-// xn--4gbrim : 2013-10-04 Suhub Electronic Establishment
-موقع
-
-// xn--55qw42g : 2013-11-08 China Organizational Name Administration Center
-公益
-
-// xn--55qx5d : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences （China Internet Network Information Center）
-公司
-
-// xn--5tzm5g : 2014-12-22 Global Website TLD Asia Limited
-网站
-
-// xn--6frz82g : 2013-09-23 Afilias Limited
-移动
-
-// xn--6qq986b3xl : 2013-09-13 Tycoon Treasure Limited
-我爱你
-
-// xn--80adxhks : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
-москва
-
-// xn--80asehdb : 2013-07-14 CORE Association
-онлайн
-
-// xn--80aswg : 2013-07-14 CORE Association
-сайт
-
-// xn--8y0a063a : 2015-03-26 China United Network Communications Corporation Limited
-联通
-
-// xn--9dbq2a : 2015-01-15 VeriSign Sarl
-קום
-
-// xn--9et52u : 2014-06-12 RISE VICTORY LIMITED
-时尚
-
-// xn--9krt00a : 2015-03-12 Sina Corporation
-微博
-
-// xn--b4w605ferd : 2014-08-07 Temasek Holdings (Private) Limited
-淡马锡
-
-// xn--bck1b9a5dre4c : 2015-02-26 Amazon EU S.à r.l.
-ファッション
-
-// xn--c1avg : 2013-11-14 Public Interest Registry
-орг
-
-// xn--c2br7g : 2015-01-15 VeriSign Sarl
-नेट
-
-// xn--cck2b3b : 2015-02-26 Amazon EU S.à r.l.
-ストア
-
-// xn--cg4bki : 2013-09-27 SAMSUNG SDS CO., LTD
-삼성
-
-// xn--czr694b : 2014-01-16 HU YI GLOBAL INFORMATION RESOURCES (HOLDING) COMPANY.HONGKONG LIMITED
-商标
-
-// xn--czrs0t : 2013-12-19 Wild Island, LLC
-商店
-
-// xn--czru2d : 2013-11-21 Zodiac Capricorn Limited
-商城
-
-// xn--d1acj3b : 2013-11-20 The Foundation for Network Initiatives “The Smart Internet”
-дети
-
-// xn--eckvdtc9d : 2014-12-18 Amazon EU S.à r.l.
-ポイント
-
-// xn--efvy88h : 2014-08-22 Xinhua News Agency Guangdong Branch 新华通讯社广东分社
-新闻
-
-// xn--estv75g : 2015-02-19 Industrial and Commercial Bank of China Limited
-工行
-
-// xn--fct429k : 2015-04-09 Amazon EU S.à r.l.
-家電
-
-// xn--fhbei : 2015-01-15 VeriSign Sarl
-كوم
-
-// xn--fiq228c5hs : 2013-09-08 TLD REGISTRY LIMITED
-中文网
-
-// xn--fiq64b : 2013-10-14 CITIC Group Corporation
-中信
-
-// xn--fjq720a : 2014-05-22 Will Bloom, LLC
-娱乐
-
-// xn--flw351e : 2014-07-31 Charleston Road Registry Inc.
-谷歌
-
-// xn--g2xx48c : 2015-01-30 Minds + Machines Group Limited
-购物
-
-// xn--gckr3f0f : 2015-02-26 Amazon EU S.à r.l.
-クラウド
-
-// xn--hxt814e : 2014-05-15 Zodiac Libra Limited
-网店
-
-// xn--i1b6b1a6a2e : 2013-11-14 Public Interest Registry
-संगठन
-
-// xn--imr513n : 2014-12-11 HU YI GLOBAL INFORMATION RESOURCES (HOLDING) COMPANY. HONGKONG LIMITED
-餐厅
-
-// xn--io0a7i : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences （China Internet Network Information Center）
-网络
-
-// xn--j1aef : 2015-01-15 VeriSign Sarl
-ком
-
-// xn--jlq61u9w7b : 2015-01-08 Nokia Corporation
-诺基亚
-
-// xn--jvr189m : 2015-02-26 Amazon EU S.à r.l.
-食品
-
-// xn--kcrx77d1x4a : 2014-11-07 Koninklijke Philips N.V.
-飞利浦
-
-// xn--kpu716f : 2014-12-22 Richemont DNS Inc.
-手表
-
-// xn--kput3i : 2014-02-13 Beijing RITT-Net Technology Development Co., Ltd
-手机
-
-// xn--mgba3a3ejt : 2014-11-20 Aramco Services Company
-ارامكو
-
-// xn--mgbab2bd : 2013-10-31 CORE Association
-بازار
-
-// xn--mgbb9fbpob : 2014-12-18 GreenTech Consultancy Company W.L.L.
-موبايلي
-
-// xn--mgbt3dhd : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
-همراه
-
-// xn--mk1bu44c : 2015-01-15 VeriSign Sarl
-닷컴
-
-// xn--mxtq1m : 2014-03-06 Net-Chinese Co., Ltd.
-政府
-
-// xn--ngbc5azd : 2013-07-13 International Domain Registry Pty. Ltd.
-شبكة
-
-// xn--ngbe9e0a : 2014-12-04 Kuwait Finance House
-بيتك
-
-// xn--nqv7f : 2013-11-14 Public Interest Registry
-机构
-
-// xn--nqv7fs00ema : 2013-11-14 Public Interest Registry
-组织机构
-
-// xn--nyqy26a : 2014-11-07 Stable Tone Limited
-健康
-
-// xn--p1acf : 2013-12-12 Rusnames Limited
-рус
-
-// xn--pbt977c : 2014-12-22 Richemont DNS Inc.
-珠宝
-
-// xn--pssy2u : 2015-01-15 VeriSign Sarl
-大拿
-
-// xn--q9jyb4c : 2013-09-17 Charleston Road Registry Inc.
-みんな
-
-// xn--qcka1pmc : 2014-07-31 Charleston Road Registry Inc.
-グーグル
-
-// xn--rhqv96g : 2013-09-11 Stable Tone Limited
-世界
-
-// xn--rovu88b : 2015-02-26 Amazon EU S.à r.l.
-書籍
-
-// xn--ses554g : 2014-01-16
-网址
-
-// xn--t60b56a : 2015-01-15 VeriSign Sarl
-닷넷
-
-// xn--tckwe : 2015-01-15 VeriSign Sarl
-コム
-
-// xn--unup4y : 2013-07-14 Spring Fields, LLC
-游戏
-
-// xn--vermgensberater-ctb : 2014-06-23 Deutsche Vermögensberatung Aktiengesellschaft DVAG
-vermögensberater
-
-// xn--vermgensberatung-pwb : 2014-06-23 Deutsche Vermögensberatung Aktiengesellschaft DVAG
-vermögensberatung
-
-// xn--vhquv : 2013-08-27 Dash McCook, LLC
-企业
-
-// xn--vuq861b : 2014-10-16 Beijing Tele-info Network Technology Co., Ltd.
-信息
-
-// xn--w4r85el8fhu5dnra : 2015-04-30 Kerry Trading Co. Limited
-嘉里大酒店
-
-// xn--xhq521b : 2013-11-14 Guangzhou YU Wei Information Technology Co., Ltd.
-广东
-
-// xn--zfr164b : 2013-11-08 China Organizational Name Administration Center
-政务
-
-// xyz : 2013-12-05 XYZ.COM LLC
-xyz
-
-// yachts : 2014-01-09 DERYachts, LLC
-yachts
-
-// yahoo : 2015-04-02 Yahoo! Domain Services Inc.
-yahoo
-
-// yamaxun : 2014-12-18 Amazon EU S.à r.l.
-yamaxun
-
-// yandex : 2014-04-10 YANDEX, LLC
-yandex
-
-// yodobashi : 2014-11-20 YODOBASHI CAMERA CO.,LTD.
-yodobashi
-
-// yoga : 2014-05-29 Top Level Domain Holdings Limited
-yoga
-
-// yokohama : 2013-12-12 GMO Registry, Inc.
-yokohama
-
-// you : 2015-04-09 Amazon EU S.à r.l.
-you
-
-// youtube : 2014-05-01 Charleston Road Registry Inc.
-youtube
-
-// yun : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD.
-yun
-
-// zara : 2014-11-07 Industria de Diseño Textil, S.A. (INDITEX, S.A.)
-zara
-
-// zero : 2014-12-18 Amazon EU S.à r.l.
-zero
-
-// zip : 2014-05-08 Charleston Road Registry Inc.
-zip
-
-// zone : 2013-11-14 Outer Falls, LLC
-zone
-
-// zuerich : 2014-11-07 Kanton Zürich (Canton of Zurich)
-zuerich
-
-
-// ===END ICANN DOMAINS===
-// ===BEGIN PRIVATE DOMAINS===
-// (Note: these are in alphabetical order by company name)
-
-// Amazon CloudFront : https://aws.amazon.com/cloudfront/
-// Submitted by Donavan Miller <donavanm@amazon.com> 2013-03-22
-cloudfront.net
-
-// Amazon Elastic Compute Cloud: https://aws.amazon.com/ec2/
-// Submitted by Osman Surkatty <osmans@amazon.com> 2014-12-16
-ap-northeast-1.compute.amazonaws.com
-ap-southeast-1.compute.amazonaws.com
-ap-southeast-2.compute.amazonaws.com
-cn-north-1.compute.amazonaws.cn
-compute.amazonaws.cn
-compute.amazonaws.com
-compute-1.amazonaws.com
-eu-west-1.compute.amazonaws.com
-eu-central-1.compute.amazonaws.com
-sa-east-1.compute.amazonaws.com
-us-east-1.amazonaws.com
-us-gov-west-1.compute.amazonaws.com
-us-west-1.compute.amazonaws.com
-us-west-2.compute.amazonaws.com
-z-1.compute-1.amazonaws.com
-z-2.compute-1.amazonaws.com
-
-// Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/
-// Submitted by Adam Stein <astein@amazon.com> 2013-04-02
-elasticbeanstalk.com
-
-// Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/
-// Submitted by Scott Vidmar <svidmar@amazon.com> 2013-03-27
-elb.amazonaws.com
-
-// Amazon S3 : https://aws.amazon.com/s3/
-// Submitted by Courtney Eckhardt <coec@amazon.com> 2013-03-22
-s3.amazonaws.com
-s3-us-west-2.amazonaws.com
-s3-us-west-1.amazonaws.com
-s3-eu-west-1.amazonaws.com
-s3-ap-southeast-1.amazonaws.com
-s3-ap-southeast-2.amazonaws.com
-s3-ap-northeast-1.amazonaws.com
-s3-sa-east-1.amazonaws.com
-s3-us-gov-west-1.amazonaws.com
-s3-fips-us-gov-west-1.amazonaws.com
-s3-website-us-east-1.amazonaws.com
-s3-website-us-west-2.amazonaws.com
-s3-website-us-west-1.amazonaws.com
-s3-website-eu-west-1.amazonaws.com
-s3-website-ap-southeast-1.amazonaws.com
-s3-website-ap-southeast-2.amazonaws.com
-s3-website-ap-northeast-1.amazonaws.com
-s3-website-sa-east-1.amazonaws.com
-s3-website-us-gov-west-1.amazonaws.com
-
-// BetaInABox
-// Submitted by adrian@betainabox.com 2012-09-13
-betainabox.com
-
-// CentralNic : http://www.centralnic.com/names/domains
-// Submitted by registry <gavin.brown@centralnic.com> 2012-09-27
-ae.org
-ar.com
-br.com
-cn.com
-com.de
-com.se
-de.com
-eu.com
-gb.com
-gb.net
-hu.com
-hu.net
-jp.net
-jpn.com
-kr.com
-mex.com
-no.com
-qc.com
-ru.com
-sa.com
-se.com
-se.net
-uk.com
-uk.net
-us.com
-uy.com
-za.bz
-za.com
-
-// Africa.com Web Solutions Ltd : https://registry.africa.com
-// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04
-africa.com
-
-// iDOT Services Limited : http://www.domain.gr.com
-// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04
-gr.com
-
-// Radix FZC : http://domains.in.net
-// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04
-in.net
-
-// US REGISTRY LLC : http://us.org
-// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04
-us.org
-
-// co.com Registry, LLC : https://registry.co.com
-// Submitted by Gavin Brown <gavin.brown@centralnic.com> 2014-02-04
-co.com
-
-// c.la : http://www.c.la/
-c.la
-
-// cloudControl : https://www.cloudcontrol.com/
-// Submitted by Tobias Wilken <tw@cloudcontrol.com> 2013-07-23
-cloudcontrolled.com
-cloudcontrolapp.com
-
-// co.ca : http://registry.co.ca/
-co.ca
-
-// CoDNS B.V.
-co.nl
-co.no
-
-// Commerce Guys, SAS
-// Submitted by Damien Tournoud <damien@commerceguys.com> 2015-01-22
-*.platform.sh
-
-// Cupcake : https://cupcake.io/
-// Submitted by Jonathan Rudenberg <jonathan@cupcake.io> 2013-10-08
-cupcake.is
-
-// DreamHost : http://www.dreamhost.com/
-// Submitted by Andrew Farmer <andrew.farmer@dreamhost.com> 2012-10-02
-dreamhosters.com
-
-// DynDNS.com : http://www.dyndns.com/services/dns/dyndns/
-dyndns-at-home.com
-dyndns-at-work.com
-dyndns-blog.com
-dyndns-free.com
-dyndns-home.com
-dyndns-ip.com
-dyndns-mail.com
-dyndns-office.com
-dyndns-pics.com
-dyndns-remote.com
-dyndns-server.com
-dyndns-web.com
-dyndns-wiki.com
-dyndns-work.com
-dyndns.biz
-dyndns.info
-dyndns.org
-dyndns.tv
-at-band-camp.net
-ath.cx
-barrel-of-knowledge.info
-barrell-of-knowledge.info
-better-than.tv
-blogdns.com
-blogdns.net
-blogdns.org
-blogsite.org
-boldlygoingnowhere.org
-broke-it.net
-buyshouses.net
-cechire.com
-dnsalias.com
-dnsalias.net
-dnsalias.org
-dnsdojo.com
-dnsdojo.net
-dnsdojo.org
-does-it.net
-doesntexist.com
-doesntexist.org
-dontexist.com
-dontexist.net
-dontexist.org
-doomdns.com
-doomdns.org
-dvrdns.org
-dyn-o-saur.com
-dynalias.com
-dynalias.net
-dynalias.org
-dynathome.net
-dyndns.ws
-endofinternet.net
-endofinternet.org
-endoftheinternet.org
-est-a-la-maison.com
-est-a-la-masion.com
-est-le-patron.com
-est-mon-blogueur.com
-for-better.biz
-for-more.biz
-for-our.info
-for-some.biz
-for-the.biz
-forgot.her.name
-forgot.his.name
-from-ak.com
-from-al.com
-from-ar.com
-from-az.net
-from-ca.com
-from-co.net
-from-ct.com
-from-dc.com
-from-de.com
-from-fl.com
-from-ga.com
-from-hi.com
-from-ia.com
-from-id.com
-from-il.com
-from-in.com
-from-ks.com
-from-ky.com
-from-la.net
-from-ma.com
-from-md.com
-from-me.org
-from-mi.com
-from-mn.com
-from-mo.com
-from-ms.com
-from-mt.com
-from-nc.com
-from-nd.com
-from-ne.com
-from-nh.com
-from-nj.com
-from-nm.com
-from-nv.com
-from-ny.net
-from-oh.com
-from-ok.com
-from-or.com
-from-pa.com
-from-pr.com
-from-ri.com
-from-sc.com
-from-sd.com
-from-tn.com
-from-tx.com
-from-ut.com
-from-va.com
-from-vt.com
-from-wa.com
-from-wi.com
-from-wv.com
-from-wy.com
-ftpaccess.cc
-fuettertdasnetz.de
-game-host.org
-game-server.cc
-getmyip.com
-gets-it.net
-go.dyndns.org
-gotdns.com
-gotdns.org
-groks-the.info
-groks-this.info
-ham-radio-op.net
-here-for-more.info
-hobby-site.com
-hobby-site.org
-home.dyndns.org
-homedns.org
-homeftp.net
-homeftp.org
-homeip.net
-homelinux.com
-homelinux.net
-homelinux.org
-homeunix.com
-homeunix.net
-homeunix.org
-iamallama.com
-in-the-band.net
-is-a-anarchist.com
-is-a-blogger.com
-is-a-bookkeeper.com
-is-a-bruinsfan.org
-is-a-bulls-fan.com
-is-a-candidate.org
-is-a-caterer.com
-is-a-celticsfan.org
-is-a-chef.com
-is-a-chef.net
-is-a-chef.org
-is-a-conservative.com
-is-a-cpa.com
-is-a-cubicle-slave.com
-is-a-democrat.com
-is-a-designer.com
-is-a-doctor.com
-is-a-financialadvisor.com
-is-a-geek.com
-is-a-geek.net
-is-a-geek.org
-is-a-green.com
-is-a-guru.com
-is-a-hard-worker.com
-is-a-hunter.com
-is-a-knight.org
-is-a-landscaper.com
-is-a-lawyer.com
-is-a-liberal.com
-is-a-libertarian.com
-is-a-linux-user.org
-is-a-llama.com
-is-a-musician.com
-is-a-nascarfan.com
-is-a-nurse.com
-is-a-painter.com
-is-a-patsfan.org
-is-a-personaltrainer.com
-is-a-photographer.com
-is-a-player.com
-is-a-republican.com
-is-a-rockstar.com
-is-a-socialist.com
-is-a-soxfan.org
-is-a-student.com
-is-a-teacher.com
-is-a-techie.com
-is-a-therapist.com
-is-an-accountant.com
-is-an-actor.com
-is-an-actress.com
-is-an-anarchist.com
-is-an-artist.com
-is-an-engineer.com
-is-an-entertainer.com
-is-by.us
-is-certified.com
-is-found.org
-is-gone.com
-is-into-anime.com
-is-into-cars.com
-is-into-cartoons.com
-is-into-games.com
-is-leet.com
-is-lost.org
-is-not-certified.com
-is-saved.org
-is-slick.com
-is-uberleet.com
-is-very-bad.org
-is-very-evil.org
-is-very-good.org
-is-very-nice.org
-is-very-sweet.org
-is-with-theband.com
-isa-geek.com
-isa-geek.net
-isa-geek.org
-isa-hockeynut.com
-issmarterthanyou.com
-isteingeek.de
-istmein.de
-kicks-ass.net
-kicks-ass.org
-knowsitall.info
-land-4-sale.us
-lebtimnetz.de
-leitungsen.de
-likes-pie.com
-likescandy.com
-merseine.nu
-mine.nu
-misconfused.org
-mypets.ws
-myphotos.cc
-neat-url.com
-office-on-the.net
-on-the-web.tv
-podzone.net
-podzone.org
-readmyblog.org
-saves-the-whales.com
-scrapper-site.net
-scrapping.cc
-selfip.biz
-selfip.com
-selfip.info
-selfip.net
-selfip.org
-sells-for-less.com
-sells-for-u.com
-sells-it.net
-sellsyourhome.org
-servebbs.com
-servebbs.net
-servebbs.org
-serveftp.net
-serveftp.org
-servegame.org
-shacknet.nu
-simple-url.com
-space-to-rent.com
-stuff-4-sale.org
-stuff-4-sale.us
-teaches-yoga.com
-thruhere.net
-traeumtgerade.de
-webhop.biz
-webhop.info
-webhop.net
-webhop.org
-worse-than.tv
-writesthisblog.com
-
-// EU.org https://eu.org/
-// Submitted by Pierre Beyssac <hostmaster@eu.org> 2015-04-17
-
-eu.org
-al.eu.org
-asso.eu.org
-at.eu.org
-au.eu.org
-be.eu.org
-bg.eu.org
-ca.eu.org
-cd.eu.org
-ch.eu.org
-cn.eu.org
-cy.eu.org
-cz.eu.org
-de.eu.org
-dk.eu.org
-edu.eu.org
-ee.eu.org
-es.eu.org
-fi.eu.org
-fr.eu.org
-gr.eu.org
-hr.eu.org
-hu.eu.org
-ie.eu.org
-il.eu.org
-in.eu.org
-int.eu.org
-is.eu.org
-it.eu.org
-jp.eu.org
-kr.eu.org
-lt.eu.org
-lu.eu.org
-lv.eu.org
-mc.eu.org
-me.eu.org
-mk.eu.org
-mt.eu.org
-my.eu.org
-net.eu.org
-ng.eu.org
-nl.eu.org
-no.eu.org
-nz.eu.org
-paris.eu.org
-pl.eu.org
-pt.eu.org
-q-a.eu.org
-ro.eu.org
-ru.eu.org
-se.eu.org
-si.eu.org
-sk.eu.org
-tr.eu.org
-uk.eu.org
-us.eu.org
-
-// Fastly Inc. http://www.fastly.com/
-// Submitted by Vladimir Vuksan <vladimir@fastly.com> 2013-05-31
-a.ssl.fastly.net
-b.ssl.fastly.net
-global.ssl.fastly.net
-a.prod.fastly.net
-global.prod.fastly.net
-
-// Firebase, Inc.
-// Submitted by Chris Raynor <chris@firebase.com> 2014-01-21
-firebaseapp.com
-
-// Flynn : https://flynn.io
-// Submitted by Jonathan Rudenberg <jonathan@flynn.io> 2014-07-12
-flynnhub.com
-
-// GDS : https://www.gov.uk/service-manual/operations/operating-servicegovuk-subdomains
-// Submitted by David Illsley <david.illsley@digital.cabinet-office.gov.uk> 2014-08-28
-service.gov.uk
-
-// GitHub, Inc.
-// Submitted by Ben Toews <btoews@github.com> 2014-02-06
-github.io
-githubusercontent.com
-
-// GlobeHosting, Inc.
-// Submitted by Zoltan Egresi <egresi@globehosting.com> 2013-07-12
-ro.com
-
-// Google, Inc.
-// Submitted by Eduardo Vela <evn@google.com> 2014-12-19
-appspot.com
-blogspot.ae
-blogspot.be
-blogspot.bj
-blogspot.ca
-blogspot.cf
-blogspot.ch
-blogspot.co.at
-blogspot.co.il
-blogspot.co.nz
-blogspot.co.uk
-blogspot.com
-blogspot.com.ar
-blogspot.com.au
-blogspot.com.br
-blogspot.com.es
-blogspot.com.tr
-blogspot.cv
-blogspot.cz
-blogspot.de
-blogspot.dk
-blogspot.fi
-blogspot.fr
-blogspot.gr
-blogspot.hk
-blogspot.hu
-blogspot.ie
-blogspot.in
-blogspot.it
-blogspot.jp
-blogspot.kr
-blogspot.mr
-blogspot.mx
-blogspot.nl
-blogspot.no
-blogspot.pt
-blogspot.re
-blogspot.ro
-blogspot.ru
-blogspot.se
-blogspot.sg
-blogspot.sk
-blogspot.td
-blogspot.tw
-codespot.com
-googleapis.com
-googlecode.com
-pagespeedmobilizer.com
-withgoogle.com
-
-// Heroku : https://www.heroku.com/
-// Submitted by Tom Maher <tmaher@heroku.com> 2013-05-02
-herokuapp.com
-herokussl.com
-
-// iki.fi
-// Submitted by Hannu Aronsson <haa@iki.fi> 2009-11-05
-iki.fi
-
-// info.at : http://www.info.at/
-biz.at
-info.at
-
-// Michau Enterprises Limited : http://www.co.pl/
-co.pl
-
-// Microsoft : http://microsoft.com
-// Submitted by Barry Dorrans <bdorrans@microsoft.com> 2014-01-24
-azurewebsites.net
-azure-mobile.net
-cloudapp.net
-
-// Neustar Inc.
-// Submitted by Trung Tran <Trung.Tran@neustar.biz> 2015-04-23
-4u.com
-
-// NFSN, Inc. : https://www.NearlyFreeSpeech.NET/
-// Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net> 2014-02-02
-nfshost.com
-
-// NYC.mn : http://www.information.nyc.mn
-// Submitted by Matthew Brown <mattbrown@nyc.mn> 2013-03-11
-nyc.mn
-
-// One Fold Media : http://www.onefoldmedia.com/
-// Submitted by Eddie Jones <eddie@onefoldmedia.com> 2014-06-10
-nid.io
-
-// Opera Software, A.S.A.
-// Submitted by Yngve Pettersen <yngve@opera.com> 2009-11-26
-operaunite.com
-
-// OutSystems
-// Submitted by Duarte Santos <domain-admin@outsystemscloud.com> 2014-03-11
-outsystemscloud.com
-
-// .pl domains (grandfathered)
-art.pl
-gliwice.pl
-krakow.pl
-poznan.pl
-wroc.pl
-zakopane.pl
-
-// priv.at : http://www.nic.priv.at/
-// Submitted by registry <lendl@nic.at> 2008-06-09
-priv.at
-
-// Red Hat, Inc. OpenShift : https://openshift.redhat.com/
-// Submitted by Tim Kramer <tkramer@rhcloud.com> 2012-10-24
-rhcloud.com
-
-// SinaAppEngine : http://sae.sina.com.cn/
-// Submitted by SinaAppEngine <saesupport@sinacloud.com> 2015-02-02
-sinaapp.com
-vipsinaapp.com
-1kapp.com
-
-// TASK geographical domains (www.task.gda.pl/uslugi/dns)
-gda.pl
-gdansk.pl
-gdynia.pl
-med.pl
-sopot.pl
-
-// UDR Limited : http://www.udr.hk.com
-// Submitted by registry <hostmaster@udr.hk.com> 2014-11-07
-hk.com
-hk.org
-ltd.hk
-inc.hk
-
-// Yola : https://www.yola.com/
-// Submitted by Stefano Rivera <stefano@yola.com> 2014-07-09
-yolasite.com
-
-// ZaNiC : http://www.za.net/
-// Submitted by registry <hostmaster@nic.za.net> 2009-10-03
-za.net
-za.org
-
-// ===END PRIVATE DOMAINS===
diff --git a/deps/npm/node_modules/tough-cookie/test/api_test.js b/deps/npm/node_modules/tough-cookie/test/api_test.js
deleted file mode 100644
index b21326cdf0efcf..00000000000000
--- a/deps/npm/node_modules/tough-cookie/test/api_test.js
+++ /dev/null
@@ -1,372 +0,0 @@
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-'use strict';
-var vows = require('vows');
-var assert = require('assert');
-var async = require('async');
-var tough = require('../lib/cookie');
-var Cookie = tough.Cookie;
-var CookieJar = tough.CookieJar;
-
-
-var atNow = Date.now();
-
-function at(offset) {
-  return {now: new Date(atNow + offset)};
-}
-
-vows
-  .describe('API')
-  .addBatch({
-    "All defined": function () {
-      assert.ok(Cookie);
-      assert.ok(CookieJar);
-    }
-  })
-  .addBatch({
-    "Constructor": {
-      topic: function () {
-        return new Cookie({
-          key: 'test',
-          value: 'b',
-          maxAge: 60
-        });
-      },
-      'check for key property': function (c) {
-        assert.ok(c);
-        assert.equal(c.key, 'test');
-      },
-      'check for value property': function (c) {
-        assert.equal(c.value, 'b');
-      },
-      'check for maxAge': function (c) {
-        assert.equal(c.maxAge, 60);
-      },
-      'check for default values for unspecified properties': function (c) {
-        assert.equal(c.expires, "Infinity");
-        assert.equal(c.secure, false);
-        assert.equal(c.httpOnly, false);
-      }
-    }
-  })
-  .addBatch({
-    "expiry option": {
-      topic: function () {
-        var cb = this.callback;
-        var cj = new CookieJar();
-        cj.setCookie('near=expiry; Domain=example.com; Path=/; Max-Age=1', 'http://www.example.com', at(-1), function (err, cookie) {
-
-          cb(err, {cj: cj, cookie: cookie});
-        });
-      },
-      "set the cookie": function (t) {
-        assert.ok(t.cookie, "didn't set?!");
-        assert.equal(t.cookie.key, 'near');
-      },
-      "then, retrieving": {
-        topic: function (t) {
-          var cb = this.callback;
-          setTimeout(function () {
-            t.cj.getCookies('http://www.example.com', {http: true, expire: false}, function (err, cookies) {
-              t.cookies = cookies;
-              cb(err, t);
-            });
-          }, 2000);
-        },
-        "got the cookie": function (t) {
-          assert.lengthOf(t.cookies, 1);
-          assert.equal(t.cookies[0].key, 'near');
-        }
-      }
-    }
-  })
-  .addBatch({
-    "allPaths option": {
-      topic: function () {
-        var cj = new CookieJar();
-        var tasks = [];
-        tasks.push(cj.setCookie.bind(cj, 'nopath_dom=qq; Path=/; Domain=example.com', 'http://example.com', {}));
-        tasks.push(cj.setCookie.bind(cj, 'path_dom=qq; Path=/foo; Domain=example.com', 'http://example.com', {}));
-        tasks.push(cj.setCookie.bind(cj, 'nopath_host=qq; Path=/', 'http://www.example.com', {}));
-        tasks.push(cj.setCookie.bind(cj, 'path_host=qq; Path=/foo', 'http://www.example.com', {}));
-        tasks.push(cj.setCookie.bind(cj, 'other=qq; Path=/', 'http://other.example.com/', {}));
-        tasks.push(cj.setCookie.bind(cj, 'other2=qq; Path=/foo', 'http://other.example.com/foo', {}));
-        var cb = this.callback;
-        async.parallel(tasks, function (err, results) {
-          cb(err, {cj: cj, cookies: results});
-        });
-      },
-      "all set": function (t) {
-        assert.equal(t.cookies.length, 6);
-        assert.ok(t.cookies.every(function (c) {
-          return !!c
-        }));
-      },
-      "getting without allPaths": {
-        topic: function (t) {
-          var cb = this.callback;
-          var cj = t.cj;
-          cj.getCookies('http://www.example.com/', {}, function (err, cookies) {
-            cb(err, {cj: cj, cookies: cookies});
-          });
-        },
-        "found just two cookies": function (t) {
-          assert.equal(t.cookies.length, 2);
-        },
-        "all are path=/": function (t) {
-          assert.ok(t.cookies.every(function (c) {
-            return c.path === '/'
-          }));
-        },
-        "no 'other' cookies": function (t) {
-          assert.ok(!t.cookies.some(function (c) {
-            return (/^other/).test(c.name)
-          }));
-        }
-      },
-      "getting without allPaths for /foo": {
-        topic: function (t) {
-          var cb = this.callback;
-          var cj = t.cj;
-          cj.getCookies('http://www.example.com/foo', {}, function (err, cookies) {
-            cb(err, {cj: cj, cookies: cookies});
-          });
-        },
-        "found four cookies": function (t) {
-          assert.equal(t.cookies.length, 4);
-        },
-        "no 'other' cookies": function (t) {
-          assert.ok(!t.cookies.some(function (c) {
-            return (/^other/).test(c.name)
-          }));
-        }
-      },
-      "getting with allPaths:true": {
-        topic: function (t) {
-          var cb = this.callback;
-          var cj = t.cj;
-          cj.getCookies('http://www.example.com/', {allPaths: true}, function (err, cookies) {
-            cb(err, {cj: cj, cookies: cookies});
-          });
-        },
-        "found four cookies": function (t) {
-          assert.equal(t.cookies.length, 4);
-        },
-        "no 'other' cookies": function (t) {
-          assert.ok(!t.cookies.some(function (c) {
-            return (/^other/).test(c.name)
-          }));
-        }
-      }
-    }
-  })
-  .addBatch({
-    "Remove cookies": {
-      topic: function () {
-        var jar = new CookieJar();
-        var cookie = Cookie.parse("a=b; Domain=example.com; Path=/");
-        var cookie2 = Cookie.parse("a=b; Domain=foo.com; Path=/");
-        var cookie3 = Cookie.parse("foo=bar; Domain=foo.com; Path=/");
-        jar.setCookie(cookie, 'http://example.com/index.html', function () {
-        });
-        jar.setCookie(cookie2, 'http://foo.com/index.html', function () {
-        });
-        jar.setCookie(cookie3, 'http://foo.com/index.html', function () {
-        });
-        return jar;
-      },
-      "all from matching domain": function (jar) {
-        jar.store.removeCookies('example.com', null, function (err) {
-          assert(err == null);
-
-          jar.store.findCookies('example.com', null, function (err, cookies) {
-            assert(err == null);
-            assert(cookies != null);
-            assert(cookies.length === 0, 'cookie was not removed');
-          });
-
-          jar.store.findCookies('foo.com', null, function (err, cookies) {
-            assert(err == null);
-            assert(cookies != null);
-            assert(cookies.length === 2, 'cookies should not have been removed');
-          });
-        });
-      },
-      "from cookie store matching domain and key": function (jar) {
-        jar.store.removeCookie('foo.com', '/', 'foo', function (err) {
-          assert(err == null);
-
-          jar.store.findCookies('foo.com', null, function (err, cookies) {
-            assert(err == null);
-            assert(cookies != null);
-            assert(cookies.length === 1, 'cookie was not removed correctly');
-            assert(cookies[0].key === 'a', 'wrong cookie was removed');
-          });
-        });
-      }
-    }
-  })
-  .addBatch({
-    "Synchronous CookieJar": {
-      "setCookieSync": {
-        topic: function () {
-          var jar = new CookieJar();
-          var cookie = Cookie.parse("a=b; Domain=example.com; Path=/");
-          cookie = jar.setCookieSync(cookie, 'http://example.com/index.html');
-          return cookie;
-        },
-        "returns a copy of the cookie": function (cookie) {
-          assert.instanceOf(cookie, Cookie);
-        }
-      },
-      "getCookiesSync": {
-        topic: function () {
-          var jar = new CookieJar();
-          var url = 'http://example.com/index.html';
-          jar.setCookieSync("a=b; Domain=example.com; Path=/", url);
-          jar.setCookieSync("c=d; Domain=example.com; Path=/", url);
-          return jar.getCookiesSync(url);
-        },
-        "returns the cookie array": function (err, cookies) {
-          assert.ok(!err);
-          assert.ok(Array.isArray(cookies));
-          assert.lengthOf(cookies, 2);
-          cookies.forEach(function (cookie) {
-            assert.instanceOf(cookie, Cookie);
-          });
-        }
-      },
-
-      "getCookieStringSync": {
-        topic: function () {
-          var jar = new CookieJar();
-          var url = 'http://example.com/index.html';
-          jar.setCookieSync("a=b; Domain=example.com; Path=/", url);
-          jar.setCookieSync("c=d; Domain=example.com; Path=/", url);
-          return jar.getCookieStringSync(url);
-        },
-        "returns the cookie header string": function (err, str) {
-          assert.ok(!err);
-          assert.typeOf(str, 'string');
-        }
-      },
-
-      "getSetCookieStringsSync": {
-        topic: function () {
-          var jar = new CookieJar();
-          var url = 'http://example.com/index.html';
-          jar.setCookieSync("a=b; Domain=example.com; Path=/", url);
-          jar.setCookieSync("c=d; Domain=example.com; Path=/", url);
-          return jar.getSetCookieStringsSync(url);
-        },
-        "returns the cookie header string": function (err, headers) {
-          assert.ok(!err);
-          assert.ok(Array.isArray(headers));
-          assert.lengthOf(headers, 2);
-          headers.forEach(function (header) {
-            assert.typeOf(header, 'string');
-          });
-        }
-      }
-    }
-  })
-  .addBatch({
-    "Synchronous API on async CookieJar": {
-      topic: function () {
-        return new tough.Store();
-      },
-      "setCookieSync": {
-        topic: function (store) {
-          var jar = new CookieJar(store);
-          try {
-            jar.setCookieSync("a=b", 'http://example.com/index.html');
-            return false;
-          } catch (e) {
-            return e;
-          }
-        },
-        "fails": function (err) {
-          assert.instanceOf(err, Error);
-          assert.equal(err.message,
-            'CookieJar store is not synchronous; use async API instead.');
-        }
-      },
-      "getCookiesSync": {
-        topic: function (store) {
-          var jar = new CookieJar(store);
-          try {
-            jar.getCookiesSync('http://example.com/index.html');
-            return false;
-          } catch (e) {
-            return e;
-          }
-        },
-        "fails": function (err) {
-          assert.instanceOf(err, Error);
-          assert.equal(err.message,
-            'CookieJar store is not synchronous; use async API instead.');
-        }
-      },
-      "getCookieStringSync": {
-        topic: function (store) {
-          var jar = new CookieJar(store);
-          try {
-            jar.getCookieStringSync('http://example.com/index.html');
-            return false;
-          } catch (e) {
-            return e;
-          }
-        },
-        "fails": function (err) {
-          assert.instanceOf(err, Error);
-          assert.equal(err.message,
-            'CookieJar store is not synchronous; use async API instead.');
-        }
-      },
-      "getSetCookieStringsSync": {
-        topic: function (store) {
-          var jar = new CookieJar(store);
-          try {
-            jar.getSetCookieStringsSync('http://example.com/index.html');
-            return false;
-          } catch (e) {
-            return e;
-          }
-        },
-        "fails": function (err) {
-          assert.instanceOf(err, Error);
-          assert.equal(err.message,
-            'CookieJar store is not synchronous; use async API instead.');
-        }
-      }
-    }
-  })
-  .export(module);
diff --git a/deps/npm/node_modules/tough-cookie/test/cookie_jar_test.js b/deps/npm/node_modules/tough-cookie/test/cookie_jar_test.js
deleted file mode 100644
index 689407b0b17e8e..00000000000000
--- a/deps/npm/node_modules/tough-cookie/test/cookie_jar_test.js
+++ /dev/null
@@ -1,468 +0,0 @@
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-'use strict';
-var vows = require('vows');
-var assert = require('assert');
-var async = require('async');
-var tough = require('../lib/cookie');
-var Cookie = tough.Cookie;
-var CookieJar = tough.CookieJar;
-
-var atNow = Date.now();
-
-function at(offset) {
-  return {now: new Date(atNow + offset)};
-}
-
-vows
-  .describe('CookieJar')
-  .addBatch({
-    "Setting a basic cookie": {
-      topic: function () {
-        var cj = new CookieJar();
-        var c = Cookie.parse("a=b; Domain=example.com; Path=/");
-        assert.strictEqual(c.hostOnly, null);
-        assert.instanceOf(c.creation, Date);
-        assert.strictEqual(c.lastAccessed, null);
-        c.creation = new Date(Date.now() - 10000);
-        cj.setCookie(c, 'http://example.com/index.html', this.callback);
-      },
-      "works": function (c) {
-        assert.instanceOf(c, Cookie)
-      }, // C is for Cookie, good enough for me
-      "gets timestamped": function (c) {
-        assert.ok(c.creation);
-        assert.ok(Date.now() - c.creation.getTime() < 5000); // recently stamped
-        assert.ok(c.lastAccessed);
-        assert.equal(c.creation, c.lastAccessed);
-        assert.equal(c.TTL(), Infinity);
-        assert.ok(!c.isPersistent());
-      }
-    },
-    "Setting a no-path cookie": {
-      topic: function () {
-        var cj = new CookieJar();
-        var c = Cookie.parse("a=b; Domain=example.com");
-        assert.strictEqual(c.hostOnly, null);
-        assert.instanceOf(c.creation, Date);
-        assert.strictEqual(c.lastAccessed, null);
-        c.creation = new Date(Date.now() - 10000);
-        cj.setCookie(c, 'http://example.com/index.html', this.callback);
-      },
-      "domain": function (c) {
-        assert.equal(c.domain, 'example.com')
-      },
-      "path is /": function (c) {
-        assert.equal(c.path, '/')
-      },
-      "path was derived": function (c) {
-        assert.strictEqual(c.pathIsDefault, true)
-      }
-    },
-    "Setting a cookie already marked as host-only": {
-      topic: function () {
-        var cj = new CookieJar();
-        var c = Cookie.parse("a=b; Domain=example.com");
-        assert.strictEqual(c.hostOnly, null);
-        assert.instanceOf(c.creation, Date);
-        assert.strictEqual(c.lastAccessed, null);
-        c.creation = new Date(Date.now() - 10000);
-        c.hostOnly = true;
-        cj.setCookie(c, 'http://example.com/index.html', this.callback);
-      },
-      "domain": function (c) {
-        assert.equal(c.domain, 'example.com')
-      },
-      "still hostOnly": function (c) {
-        assert.strictEqual(c.hostOnly, true)
-      }
-    },
-    "Setting a session cookie": {
-      topic: function () {
-        var cj = new CookieJar();
-        var c = Cookie.parse("a=b");
-        assert.strictEqual(c.path, null);
-        cj.setCookie(c, 'http://www.example.com/dir/index.html', this.callback);
-      },
-      "works": function (c) {
-        assert.instanceOf(c, Cookie)
-      },
-      "gets the domain": function (c) {
-        assert.equal(c.domain, 'www.example.com')
-      },
-      "gets the default path": function (c) {
-        assert.equal(c.path, '/dir')
-      },
-      "is 'hostOnly'": function (c) {
-        assert.ok(c.hostOnly)
-      }
-    },
-    "Setting wrong domain cookie": {
-      topic: function () {
-        var cj = new CookieJar();
-        var c = Cookie.parse("a=b; Domain=fooxample.com; Path=/");
-        cj.setCookie(c, 'http://example.com/index.html', this.callback);
-      },
-      "fails": function (err, c) {
-        assert.ok(err.message.match(/domain/i));
-        assert.ok(!c);
-      }
-    },
-    "Setting sub-domain cookie": {
-      topic: function () {
-        var cj = new CookieJar();
-        var c = Cookie.parse("a=b; Domain=www.example.com; Path=/");
-        cj.setCookie(c, 'http://example.com/index.html', this.callback);
-      },
-      "fails": function (err, c) {
-        assert.ok(err.message.match(/domain/i));
-        assert.ok(!c);
-      }
-    },
-    "Setting super-domain cookie": {
-      topic: function () {
-        var cj = new CookieJar();
-        var c = Cookie.parse("a=b; Domain=example.com; Path=/");
-        cj.setCookie(c, 'http://www.app.example.com/index.html', this.callback);
-      },
-      "success": function (err, c) {
-        assert.ok(!err);
-        assert.equal(c.domain, 'example.com');
-      }
-    },
-    "Setting a sub-path cookie on a super-domain": {
-      topic: function () {
-        var cj = new CookieJar();
-        var c = Cookie.parse("a=b; Domain=example.com; Path=/subpath");
-        assert.strictEqual(c.hostOnly, null);
-        assert.instanceOf(c.creation, Date);
-        assert.strictEqual(c.lastAccessed, null);
-        c.creation = new Date(Date.now() - 10000);
-        cj.setCookie(c, 'http://www.example.com/index.html', this.callback);
-      },
-      "domain is super-domain": function (c) {
-        assert.equal(c.domain, 'example.com')
-      },
-      "path is /subpath": function (c) {
-        assert.equal(c.path, '/subpath')
-      },
-      "path was NOT derived": function (c) {
-        assert.strictEqual(c.pathIsDefault, null)
-      }
-    },
-    "Setting HttpOnly cookie over non-HTTP API": {
-      topic: function () {
-        var cj = new CookieJar();
-        var c = Cookie.parse("a=b; Domain=example.com; Path=/; HttpOnly");
-        cj.setCookie(c, 'http://example.com/index.html', {http: false}, this.callback);
-      },
-      "fails": function (err, c) {
-        assert.match(err.message, /HttpOnly/i);
-        assert.ok(!c);
-      }
-    }
-  })
-  .addBatch({
-    "Store eight cookies": {
-      topic: function () {
-        var cj = new CookieJar();
-        var ex = 'http://example.com/index.html';
-        var tasks = [];
-        tasks.push(function (next) {
-          cj.setCookie('a=1; Domain=example.com; Path=/', ex, at(0), next);
-        });
-        tasks.push(function (next) {
-          cj.setCookie('b=2; Domain=example.com; Path=/; HttpOnly', ex, at(1000), next);
-        });
-        tasks.push(function (next) {
-          cj.setCookie('c=3; Domain=example.com; Path=/; Secure', ex, at(2000), next);
-        });
-        tasks.push(function (next) { // path
-          cj.setCookie('d=4; Domain=example.com; Path=/foo', ex, at(3000), next);
-        });
-        tasks.push(function (next) { // host only
-          cj.setCookie('e=5', ex, at(4000), next);
-        });
-        tasks.push(function (next) { // other domain
-          cj.setCookie('f=6; Domain=nodejs.org; Path=/', 'http://nodejs.org', at(5000), next);
-        });
-        tasks.push(function (next) { // expired
-          cj.setCookie('g=7; Domain=example.com; Path=/; Expires=Tue, 18 Oct 2011 00:00:00 GMT', ex, at(6000), next);
-        });
-        tasks.push(function (next) { // expired via Max-Age
-          cj.setCookie('h=8; Domain=example.com; Path=/; Max-Age=1', ex, next);
-        });
-        var cb = this.callback;
-        async.parallel(tasks, function (err, results) {
-          setTimeout(function () {
-            cb(err, cj, results);
-          }, 2000); // so that 'h=8' expires
-        });
-      },
-      "setup ok": function (err, cj, results) {
-        assert.ok(!err);
-        assert.ok(cj);
-        assert.ok(results);
-      },
-      "then retrieving for http://nodejs.org": {
-        topic: function (cj, oldResults) {
-          assert.ok(oldResults);
-          cj.getCookies('http://nodejs.org', this.callback);
-        },
-        "get a nodejs cookie": function (cookies) {
-          assert.lengthOf(cookies, 1);
-          var cookie = cookies[0];
-          assert.equal(cookie.domain, 'nodejs.org');
-        }
-      },
-      "then retrieving for https://example.com": {
-        topic: function (cj, oldResults) {
-          assert.ok(oldResults);
-          cj.getCookies('https://example.com', {secure: true}, this.callback);
-        },
-        "get a secure example cookie with others": function (cookies) {
-          var names = cookies.map(function (c) {
-            return c.key
-          });
-          assert.deepEqual(names, ['a', 'b', 'c', 'e']);
-        }
-      },
-      "then retrieving for https://example.com (missing options)": {
-        topic: function (cj, oldResults) {
-          assert.ok(oldResults);
-          cj.getCookies('https://example.com', this.callback);
-        },
-        "get a secure example cookie with others": function (cookies) {
-          var names = cookies.map(function (c) {
-            return c.key
-          });
-          assert.deepEqual(names, ['a', 'b', 'c', 'e']);
-        }
-      },
-      "then retrieving for http://example.com": {
-        topic: function (cj, oldResults) {
-          assert.ok(oldResults);
-          cj.getCookies('http://example.com', this.callback);
-        },
-        "get a bunch of cookies": function (cookies) {
-          var names = cookies.map(function (c) {
-            return c.key
-          });
-          assert.deepEqual(names, ['a', 'b', 'e']);
-        }
-      },
-      "then retrieving for http://EXAMPlE.com": {
-        topic: function (cj, oldResults) {
-          assert.ok(oldResults);
-          cj.getCookies('http://EXAMPlE.com', this.callback);
-        },
-        "get a bunch of cookies": function (cookies) {
-          var names = cookies.map(function (c) {
-            return c.key
-          });
-          assert.deepEqual(names, ['a', 'b', 'e']);
-        }
-      },
-      "then retrieving for http://example.com, non-HTTP": {
-        topic: function (cj, oldResults) {
-          assert.ok(oldResults);
-          cj.getCookies('http://example.com', {http: false}, this.callback);
-        },
-        "get a bunch of cookies": function (cookies) {
-          var names = cookies.map(function (c) {
-            return c.key
-          });
-          assert.deepEqual(names, ['a', 'e']);
-        }
-      },
-      "then retrieving for http://example.com/foo/bar": {
-        topic: function (cj, oldResults) {
-          assert.ok(oldResults);
-          cj.getCookies('http://example.com/foo/bar', this.callback);
-        },
-        "get a bunch of cookies": function (cookies) {
-          var names = cookies.map(function (c) {
-            return c.key
-          });
-          assert.deepEqual(names, ['d', 'a', 'b', 'e']);
-        }
-      },
-      "then retrieving for http://example.com as a string": {
-        topic: function (cj, oldResults) {
-          assert.ok(oldResults);
-          cj.getCookieString('http://example.com', this.callback);
-        },
-        "get a single string": function (cookieHeader) {
-          assert.equal(cookieHeader, "a=1; b=2; e=5");
-        }
-      },
-      "then retrieving for http://example.com as a set-cookie header": {
-        topic: function (cj, oldResults) {
-          assert.ok(oldResults);
-          cj.getSetCookieStrings('http://example.com', this.callback);
-        },
-        "get a single string": function (cookieHeaders) {
-          assert.lengthOf(cookieHeaders, 3);
-          assert.equal(cookieHeaders[0], "a=1; Domain=example.com; Path=/");
-          assert.equal(cookieHeaders[1], "b=2; Domain=example.com; Path=/; HttpOnly");
-          assert.equal(cookieHeaders[2], "e=5; Path=/");
-        }
-      },
-      "then retrieving for http://www.example.com/": {
-        topic: function (cj, oldResults) {
-          assert.ok(oldResults);
-          cj.getCookies('http://www.example.com/foo/bar', this.callback);
-        },
-        "get a bunch of cookies": function (cookies) {
-          var names = cookies.map(function (c) {
-            return c.key
-          });
-          assert.deepEqual(names, ['d', 'a', 'b']); // note lack of 'e'
-        }
-      }
-    }
-  })
-  .addBatch({
-    "Repeated names": {
-      topic: function () {
-        var cb = this.callback;
-        var cj = new CookieJar();
-        var ex = 'http://www.example.com/';
-        var sc = cj.setCookie;
-        var tasks = [];
-        var now = Date.now();
-        tasks.push(sc.bind(cj, 'aaaa=xxxx', ex, at(0)));
-        tasks.push(sc.bind(cj, 'aaaa=1111; Domain=www.example.com', ex, at(1000)));
-        tasks.push(sc.bind(cj, 'aaaa=2222; Domain=example.com', ex, at(2000)));
-        tasks.push(sc.bind(cj, 'aaaa=3333; Domain=www.example.com; Path=/pathA', ex, at(3000)));
-        async.series(tasks, function (err, results) {
-          results = results.filter(function (e) {
-            return e !== undefined
-          });
-          cb(err, {cj: cj, cookies: results, now: now});
-        });
-      },
-      "all got set": function (err, t) {
-        assert.lengthOf(t.cookies, 4);
-      },
-      "then getting 'em back": {
-        topic: function (t) {
-          var cj = t.cj;
-          cj.getCookies('http://www.example.com/pathA', this.callback);
-        },
-        "there's just three": function (err, cookies) {
-          var vals = cookies.map(function (c) {
-            return c.value
-          });
-          // may break with sorting; sorting should put 3333 first due to longest path:
-          assert.deepEqual(vals, ['3333', '1111', '2222']);
-        }
-      }
-    }
-  })
-  .addBatch({
-    "CookieJar setCookie errors": {
-      "public-suffix domain": {
-        topic: function () {
-          var cj = new CookieJar();
-          cj.setCookie('i=9; Domain=kyoto.jp; Path=/', 'kyoto.jp', this.callback);
-        },
-        "errors": function (err, cookie) {
-          assert.ok(err);
-          assert.ok(!cookie);
-          assert.match(err.message, /public suffix/i);
-        }
-      },
-      "wrong domain": {
-        topic: function () {
-          var cj = new CookieJar();
-          cj.setCookie('j=10; Domain=google.com; Path=/', 'http://google.ca', this.callback);
-        },
-        "errors": function (err, cookie) {
-          assert.ok(err);
-          assert.ok(!cookie);
-          assert.match(err.message, /not in this host's domain/i);
-        }
-      },
-      "old cookie is HttpOnly": {
-        topic: function () {
-          var cb = this.callback;
-          var next = function (err, c) {
-            c = null;
-            return cb(err, cj);
-          };
-          var cj = new CookieJar();
-          cj.setCookie('k=11; Domain=example.ca; Path=/; HttpOnly', 'http://example.ca', {http: true}, next);
-        },
-        "initial cookie is set": function (err, cj) {
-          assert.ok(!err);
-          assert.ok(cj);
-        },
-        "but when trying to overwrite": {
-          topic: function (cj) {
-            var cb = this.callback;
-            var next = function (err, c) {
-              c = null;
-              cb(null, err);
-            };
-            cj.setCookie('k=12; Domain=example.ca; Path=/', 'http://example.ca', {http: false}, next);
-          },
-          "it's an error": function (err) {
-            assert.ok(err);
-          },
-          "then, checking the original": {
-            topic: function (ignored, cj) {
-              assert.ok(cj instanceof CookieJar);
-              cj.getCookies('http://example.ca', {http: true}, this.callback);
-            },
-            "cookie has original value": function (err, cookies) {
-              assert.equal(err, null);
-              assert.lengthOf(cookies, 1);
-              assert.equal(cookies[0].value, 11);
-            }
-          }
-        }
-      },
-      "similar to public suffix": {
-        topic: function () {
-          var cj = new CookieJar();
-          var url = 'http://www.foonet.net';
-          assert.isTrue(cj.rejectPublicSuffixes);
-          cj.setCookie('l=13; Domain=foonet.net; Path=/', url, this.callback);
-        },
-        "doesn't error": function (err, cookie) {
-          assert.ok(!err);
-          assert.ok(cookie);
-        }
-      }
-    }
-  })
-  .export(module);
diff --git a/deps/npm/node_modules/tough-cookie/test/cookie_sorting_test.js b/deps/npm/node_modules/tough-cookie/test/cookie_sorting_test.js
deleted file mode 100644
index 826562a2b26f53..00000000000000
--- a/deps/npm/node_modules/tough-cookie/test/cookie_sorting_test.js
+++ /dev/null
@@ -1,156 +0,0 @@
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-'use strict';
-var vows = require('vows');
-var assert = require('assert');
-var tough = require('../lib/cookie');
-var Cookie = tough.Cookie;
-var CookieJar = tough.CookieJar;
-
-function toKeyArray(cookies) {
-  return cookies.map(function (c) {
-    return c.key
-  });
-}
-
-vows
-  .describe('Cookie sorting')
-  .addBatch({
-    "Assumptions:": {
-      ".creationIndex is set during construction": function() {
-        var now = new Date();
-        var c1 = new Cookie();
-        var c2 = new Cookie();
-        assert.isNumber(c1.creationIndex);
-        assert.isNumber(c2.creationIndex);
-        assert(c1.creationIndex < c2.creationIndex,
-               'creationIndex should increase with each construction');
-      },
-
-      ".creationIndex is set during construction (forced ctime)": function() {
-        var now = new Date();
-        var c1 = new Cookie({creation: now});
-        var c2 = new Cookie({creation: now});
-        assert.strictEqual(c1.creation, c2.creation);
-        assert.isNumber(c1.creationIndex);
-        assert.isNumber(c2.creationIndex);
-        assert(c1.creationIndex < c2.creationIndex,
-               'creationIndex should increase with each construction');
-      },
-
-      ".creationIndex is left alone during new setCookie": function() {
-        var jar = new CookieJar();
-        var c = new Cookie({key:'k', value:'v', domain:'example.com'});
-        var now = new Date();
-        var beforeDate = c.creation;
-        assert.instanceOf(beforeDate, Date);
-        assert.notStrictEqual(now, beforeDate);
-        var beforeIndex = c.creationIndex;
-        assert.isNumber(c.creationIndex);
-
-        jar.setCookieSync(c, 'http://example.com/', {now: now});
-
-        assert.strictEqual(c.creation, now);
-        assert.strictEqual(c.creationIndex, beforeIndex);
-      },
-
-      ".creationIndex is preserved during update setCookie": function() {
-        var jar = new CookieJar();
-
-        var thisMs = Date.now();
-        var t1 = new Date(thisMs);
-        var t2 = new Date(thisMs);
-        assert.notStrictEqual(t1, t2); // Date objects are distinct
-
-        var c = new Cookie({key:'k', value:'v1', domain:'example.com'});
-        jar.setCookieSync(c, 'http://example.com/', {now: t1});
-        var originalIndex = c.creationIndex;
-
-        assert.strictEqual(c.creation, t1);
-        assert.strictEqual(c.lastAccessed, t1);
-
-        c = new Cookie({key:'k', value:'v2', domain:'example.com'});
-        assert.notStrictEqual(c.creation, t1); // new timestamp assigned
-
-        jar.setCookieSync(c, 'http://example.com/', {now: t2});
-
-        assert.strictEqual(c.creation, t1); // retained
-        assert.strictEqual(c.lastAccessed, t2); // updated
-        assert.strictEqual(c.creationIndex, originalIndex); // retained
-      },
-    }
-  })
-  .addBatch({
-    "Cookie Sorting": {
-      topic: function () {
-        var cookies = [];
-        cookies.push(Cookie.parse("a=0; Domain=example.com"));
-        cookies.push(Cookie.parse("b=1; Domain=www.example.com"));
-        cookies.push(Cookie.parse("c=2; Domain=example.com; Path=/pathA"));
-        cookies.push(Cookie.parse("d=3; Domain=www.example.com; Path=/pathA"));
-        cookies.push(Cookie.parse("e=4; Domain=example.com; Path=/pathA/pathB"));
-        cookies.push(Cookie.parse("f=5; Domain=www.example.com; Path=/pathA/pathB"));
-
-        // weak shuffle:
-        cookies = cookies.sort(function () {
-          return Math.random() - 0.5
-        });
-
-        cookies = cookies.sort(tough.cookieCompare);
-        return cookies;
-      },
-      "got": function (cookies) {
-        assert.lengthOf(cookies, 6);
-        assert.deepEqual(toKeyArray(cookies), ['e', 'f', 'c', 'd', 'a', 'b']);
-      }
-    }
-  })
-  .addBatch({
-    "Changing creation date affects sorting": {
-      topic: function () {
-        var cookies = [];
-        var now = Date.now();
-        cookies.push(Cookie.parse("a=0;"));
-        cookies.push(Cookie.parse("b=1;"));
-        cookies.push(Cookie.parse("c=2;"));
-
-        cookies.forEach(function (cookie, idx) {
-          cookie.creation = new Date(now - 100 * idx);
-        });
-
-        return cookies.sort(tough.cookieCompare);
-      },
-      "got": function (cookies) {
-        assert.deepEqual(toKeyArray(cookies), ['c', 'b', 'a']);
-      }
-    }
-  })
-  .export(module);
diff --git a/deps/npm/node_modules/tough-cookie/test/cookie_to_json_test.js b/deps/npm/node_modules/tough-cookie/test/cookie_to_json_test.js
deleted file mode 100644
index 94a23d46eb1fbe..00000000000000
--- a/deps/npm/node_modules/tough-cookie/test/cookie_to_json_test.js
+++ /dev/null
@@ -1,164 +0,0 @@
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-'use strict';
-var vows = require('vows');
-var assert = require('assert');
-var tough = require('../lib/cookie');
-var Cookie = tough.Cookie;
-
-vows
-  .describe('Cookie.toJSON()')
-  .addBatch({
-    "JSON": {
-      "serialization": {
-        topic: function() {
-          var c = Cookie.parse('alpha=beta; Domain=example.com; Path=/foo; Expires=Tue, 19 Jan 2038 03:14:07 GMT; HttpOnly');
-          return JSON.stringify(c);
-        },
-        "gives a string": function(str) {
-          assert.equal(typeof str, "string");
-        },
-        "date is in ISO format": function(str) {
-          assert.match(str, /"expires":"2038-01-19T03:14:07\.000Z"/, 'expires is in ISO format');
-        }
-      },
-      "deserialization": {
-        topic: function() {
-          var json = '{"key":"alpha","value":"beta","domain":"example.com","path":"/foo","expires":"2038-01-19T03:14:07.000Z","httpOnly":true,"lastAccessed":2000000000123}';
-          return Cookie.fromJSON(json);
-        },
-        "works": function(c) {
-          assert.ok(c);
-        },
-        "key": function(c) { assert.equal(c.key, "alpha") },
-        "value": function(c) { assert.equal(c.value, "beta") },
-        "domain": function(c) { assert.equal(c.domain, "example.com") },
-        "path": function(c) { assert.equal(c.path, "/foo") },
-        "httpOnly": function(c) { assert.strictEqual(c.httpOnly, true) },
-        "secure": function(c) { assert.strictEqual(c.secure, false) },
-        "hostOnly": function(c) { assert.strictEqual(c.hostOnly, null) },
-        "expires is a date object": function(c) {
-          assert.equal(c.expires.getTime(), 2147483647000);
-        },
-        "lastAccessed is a date object": function(c) {
-          assert.equal(c.lastAccessed.getTime(), 2000000000123);
-        },
-        "creation defaulted": function(c) {
-          assert.ok(c.creation.getTime());
-        }
-      },
-      "null deserialization": {
-        topic: function() {
-          return Cookie.fromJSON(null);
-        },
-        "is null": function(cookie) {
-          assert.equal(cookie,null);
-        }
-      }
-    },
-    "expiry deserialization": {
-      "Infinity": {
-        topic: Cookie.fromJSON.bind(null, '{"expires":"Infinity"}'),
-        "is infinite": function(c) {
-          assert.strictEqual(c.expires, "Infinity");
-          assert.equal(c.expires, Infinity);
-        }
-      }
-    },
-    "maxAge serialization": {
-      topic: function() {
-        return function(toSet) {
-          var c = new Cookie();
-          c.key = 'foo'; c.value = 'bar';
-          c.setMaxAge(toSet);
-          return JSON.stringify(c);
-        };
-      },
-      "zero": {
-        topic: function(f) { return f(0) },
-        "looks good": function(str) {
-          assert.match(str, /"maxAge":0/);
-        }
-      },
-      "Infinity": {
-        topic: function(f) { return f(Infinity) },
-        "looks good": function(str) {
-          assert.match(str, /"maxAge":"Infinity"/);
-        }
-      },
-      "-Infinity": {
-        topic: function(f) { return f(-Infinity) },
-        "looks good": function(str) {
-          assert.match(str, /"maxAge":"-Infinity"/);
-        }
-      },
-      "null": {
-        topic: function(f) { return f(null) },
-        "absent": function(str) {
-          assert.match(str, /(?!"maxAge":null)/); // NB: negative RegExp
-        }
-      }
-    },
-    "maxAge deserialization": {
-      "number": {
-        topic: Cookie.fromJSON.bind(null,'{"key":"foo","value":"bar","maxAge":123}'),
-        "is the number": function(c) {
-          assert.strictEqual(c.maxAge, 123);
-        }
-      },
-      "null": {
-        topic: Cookie.fromJSON.bind(null,'{"key":"foo","value":"bar","maxAge":null}'),
-        "is null": function(c) {
-          assert.strictEqual(c.maxAge, null);
-        }
-      },
-      "less than zero": {
-        topic: Cookie.fromJSON.bind(null,'{"key":"foo","value":"bar","maxAge":-123}'),
-        "is -123": function(c) {
-          assert.strictEqual(c.maxAge, -123);
-        }
-      },
-      "Infinity": {
-        topic: Cookie.fromJSON.bind(null,'{"key":"foo","value":"bar","maxAge":"Infinity"}'),
-        "is inf-as-string": function(c) {
-          assert.strictEqual(c.maxAge, "Infinity");
-        }
-      },
-      "-Infinity": {
-        topic: Cookie.fromJSON.bind(null,'{"key":"foo","value":"bar","maxAge":"-Infinity"}'),
-        "is inf-as-string": function(c) {
-          assert.strictEqual(c.maxAge, "-Infinity");
-        }
-      }
-    }
-  })
-  .export(module);
diff --git a/deps/npm/node_modules/tough-cookie/test/cookie_to_string_test.js b/deps/npm/node_modules/tough-cookie/test/cookie_to_string_test.js
deleted file mode 100644
index b7ad10da1c37ca..00000000000000
--- a/deps/npm/node_modules/tough-cookie/test/cookie_to_string_test.js
+++ /dev/null
@@ -1,162 +0,0 @@
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-'use strict';
-var vows = require('vows');
-var assert = require('assert');
-var tough = require('../lib/cookie');
-var Cookie = tough.Cookie;
-
-vows
-  .describe('Cookie.toString()')
-  .addBatch({
-    "a simple cookie": {
-      topic: function () {
-        var c = new Cookie();
-        c.key = 'a';
-        c.value = 'b';
-        return c;
-      },
-      "validates": function (c) {
-        assert.ok(c.validate());
-      },
-      "to string": function (c) {
-        assert.equal(c.toString(), 'a=b');
-      }
-    },
-    "a cookie with spaces in the value": {
-      topic: function () {
-        var c = new Cookie();
-        c.key = 'a';
-        c.value = 'beta gamma';
-        return c;
-      },
-      "doesn't validate": function (c) {
-        assert.ok(!c.validate());
-      },
-      "'garbage in, garbage out'": function (c) {
-        assert.equal(c.toString(), 'a=beta gamma');
-      }
-    },
-    "with an empty value and HttpOnly": {
-      topic: function () {
-        var c = new Cookie();
-        c.key = 'a';
-        c.httpOnly = true;
-        return c;
-      },
-      "to string": function (c) {
-        assert.equal(c.toString(), 'a=; HttpOnly');
-      }
-    },
-    "with an expiry": {
-      topic: function () {
-        var c = new Cookie();
-        c.key = 'a';
-        c.value = 'b';
-        c.setExpires("Oct 18 2011 07:05:03 GMT");
-        return c;
-      },
-      "validates": function (c) {
-        assert.ok(c.validate());
-      },
-      "to string": function (c) {
-        assert.equal(c.toString(), 'a=b; Expires=Tue, 18 Oct 2011 07:05:03 GMT');
-      },
-      "to short string": function (c) {
-        assert.equal(c.cookieString(), 'a=b');
-      }
-    },
-    "with a max-age": {
-      topic: function () {
-        var c = new Cookie();
-        c.key = 'a';
-        c.value = 'b';
-        c.setExpires("Oct 18 2011 07:05:03 GMT");
-        c.maxAge = 12345;
-        return c;
-      },
-      "validates": function (c) {
-        assert.ok(c.validate()); // mabe this one *shouldn't*?
-      },
-      "to string": function (c) {
-        assert.equal(c.toString(), 'a=b; Expires=Tue, 18 Oct 2011 07:05:03 GMT; Max-Age=12345');
-      }
-    },
-    "with a bunch of things": function () {
-      var c = new Cookie();
-      c.key = 'a';
-      c.value = 'b';
-      c.setExpires("Oct 18 2011 07:05:03 GMT");
-      c.maxAge = 12345;
-      c.domain = 'example.com';
-      c.path = '/foo';
-      c.secure = true;
-      c.httpOnly = true;
-      c.extensions = ['MyExtension'];
-      assert.equal(c.toString(), 'a=b; Expires=Tue, 18 Oct 2011 07:05:03 GMT; Max-Age=12345; Domain=example.com; Path=/foo; Secure; HttpOnly; MyExtension');
-    },
-    "a host-only cookie": {
-      topic: function () {
-        var c = new Cookie();
-        c.key = 'a';
-        c.value = 'b';
-        c.hostOnly = true;
-        c.domain = 'shouldnt-stringify.example.com';
-        c.path = '/should-stringify';
-        return c;
-      },
-      "validates": function (c) {
-        assert.ok(c.validate());
-      },
-      "to string": function (c) {
-        assert.equal(c.toString(), 'a=b; Path=/should-stringify');
-      }
-    },
-    "minutes are '10'": {
-      topic: function () {
-        var c = new Cookie();
-        c.key = 'a';
-        c.value = 'b';
-        c.expires = new Date(1284113410000);
-        return c;
-      },
-      "validates": function (c) {
-        assert.ok(c.validate());
-      },
-      "to string": function (c) {
-        var str = c.toString();
-        assert.notEqual(str, 'a=b; Expires=Fri, 010 Sep 2010 010:010:010 GMT');
-        assert.equal(str, 'a=b; Expires=Fri, 10 Sep 2010 10:10:10 GMT');
-      }
-    }
-  })
-  .export(module);
diff --git a/deps/npm/node_modules/tough-cookie/test/date_test.js b/deps/npm/node_modules/tough-cookie/test/date_test.js
deleted file mode 100644
index afd989c5478cf5..00000000000000
--- a/deps/npm/node_modules/tough-cookie/test/date_test.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-'use strict';
-var vows = require('vows');
-var assert = require('assert');
-var tough = require('../lib/cookie');
-
-function dateVows(table) {
-  var theVows = {};
-  Object.keys(table).forEach(function (date) {
-    var expect = table[date];
-    theVows[date] = function () {
-      var got = tough.parseDate(date) ? 'valid' : 'invalid';
-      assert.equal(got, expect ? 'valid' : 'invalid');
-    };
-  });
-  return {"date parsing": theVows};
-}
-
-vows
-  .describe('Date')
-  .addBatch(dateVows({
-    "Wed, 09 Jun 2021 10:18:14 GMT": true,
-    "Wed, 09 Jun 2021 22:18:14 GMT": true,
-    "Tue, 18 Oct 2011 07:42:42.123 GMT": true,
-    "18 Oct 2011 07:42:42 GMT": true,
-    "8 Oct 2011 7:42:42 GMT": true,
-    "8 Oct 2011 7:2:42 GMT": true,
-    "Oct 18 2011 07:42:42 GMT": true,
-    "Tue Oct 18 2011 07:05:03 GMT+0000 (GMT)": true,
-    "09 Jun 2021 10:18:14 GMT": true,
-    "99 Jix 3038 48:86:72 ZMT": false,
-    '01 Jan 1970 00:00:00 GMT': true,
-    '01 Jan 1600 00:00:00 GMT': false, // before 1601
-    '01 Jan 1601 00:00:00 GMT': true,
-    '10 Feb 81 13:00:00 GMT': true, // implicit year
-    'Thu, 17-Apr-2014 02:12:29 GMT': true, // dashes
-    'Thu, 17-Apr-2014 02:12:29 UTC': true  // dashes and UTC
-  }))
-  .addBatch({
-    "strict date parse of Thu, 01 Jan 1970 00:00:010 GMT": {
-      topic: function () {
-        return tough.parseDate('Thu, 01 Jan 1970 00:00:010 GMT', true) ? true : false;
-      },
-      "invalid": function (date) {
-        assert.equal(date, false);
-      }
-    }
-  })
-  .export(module);
diff --git a/deps/npm/node_modules/tough-cookie/test/domain_and_path_test.js b/deps/npm/node_modules/tough-cookie/test/domain_and_path_test.js
deleted file mode 100644
index 175fa9f70b2b6c..00000000000000
--- a/deps/npm/node_modules/tough-cookie/test/domain_and_path_test.js
+++ /dev/null
@@ -1,200 +0,0 @@
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-'use strict';
-var vows = require('vows');
-var assert = require('assert');
-var tough = require('../lib/cookie');
-var Cookie = tough.Cookie;
-
-function matchVows(func, table) {
-  var theVows = {};
-  table.forEach(function (item) {
-    var str = item[0];
-    var dom = item[1];
-    var expect = item[2];
-    var label = str + (expect ? " matches " : " doesn't match ") + dom;
-    theVows[label] = function () {
-      assert.equal(func(str, dom), expect);
-    };
-  });
-  return theVows;
-}
-
-function defaultPathVows(table) {
-  var theVows = {};
-  table.forEach(function (item) {
-    var str = item[0];
-    var expect = item[1];
-    var label = str + " gives " + expect;
-    theVows[label] = function () {
-      assert.equal(tough.defaultPath(str), expect);
-    };
-  });
-  return theVows;
-}
-
-vows
-  .describe('Domain and Path')
-  .addBatch({
-    "domain normalization": {
-      "simple": function () {
-        var c = new Cookie();
-        c.domain = "EXAMPLE.com";
-        assert.equal(c.canonicalizedDomain(), "example.com");
-      },
-      "extra dots": function () {
-        var c = new Cookie();
-        c.domain = ".EXAMPLE.com";
-        assert.equal(c.cdomain(), "example.com");
-      },
-      "weird trailing dot": function () {
-        var c = new Cookie();
-        c.domain = "EXAMPLE.ca.";
-        assert.equal(c.canonicalizedDomain(), "example.ca.");
-      },
-      "weird internal dots": function () {
-        var c = new Cookie();
-        c.domain = "EXAMPLE...ca.";
-        assert.equal(c.canonicalizedDomain(), "example...ca.");
-      },
-      "IDN": function () {
-        var c = new Cookie();
-        c.domain = "δοκιμή.δοκιμή"; // "test.test" in greek
-        assert.equal(c.canonicalizedDomain(), "xn--jxalpdlp.xn--jxalpdlp");
-      }
-    }
-  })
-  .addBatch({
-    "Domain Match": matchVows(tough.domainMatch, [
-      // str,          dom,          expect
-      ["example.com", "example.com", true],
-      ["eXaMpLe.cOm", "ExAmPlE.CoM", true],
-      ["no.ca", "yes.ca", false],
-      ["wwwexample.com", "example.com", false],
-      ["www.example.com", "example.com", true],
-      ["example.com", "www.example.com", false],
-      ["www.subdom.example.com", "example.com", true],
-      ["www.subdom.example.com", "subdom.example.com", true],
-      ["example.com", "example.com.", false], // RFC6265 S4.1.2.3
-      ["192.168.0.1", "168.0.1", false], // S5.1.3 "The string is a host name"
-      [null, "example.com", null],
-      ["example.com", null, null],
-      [null, null, null],
-      [undefined, undefined, null],
-    ])
-  })
-
-  .addBatch({
-    "default-path": defaultPathVows([
-      [null, "/"],
-      ["/", "/"],
-      ["/file", "/"],
-      ["/dir/file", "/dir"],
-      ["noslash", "/"],
-    ])
-  })
-  .addBatch({
-    "Path-Match": matchVows(tough.pathMatch, [
-      // request, cookie, match
-      ["/", "/", true],
-      ["/dir", "/", true],
-      ["/", "/dir", false],
-      ["/dir/", "/dir/", true],
-      ["/dir/file", "/dir/", true],
-      ["/dir/file", "/dir", true],
-      ["/directory", "/dir", false],
-    ])
-  })
-  .addBatch({
-    "permuteDomain": {
-      "base case": {
-        topic: tough.permuteDomain.bind(null, 'example.com'),
-        "got the domain": function (list) {
-          assert.deepEqual(list, ['example.com']);
-        }
-      },
-      "two levels": {
-        topic: tough.permuteDomain.bind(null, 'foo.bar.example.com'),
-        "got three things": function (list) {
-          assert.deepEqual(list, ['example.com', 'bar.example.com', 'foo.bar.example.com']);
-        }
-      },
-      "local domain": {
-        topic: tough.permuteDomain.bind(null, 'foo.bar.example.localduhmain'),
-        "got three things": function (list) {
-          assert.deepEqual(list,  ['example.localduhmain', 'bar.example.localduhmain', 'foo.bar.example.localduhmain']);
-        }
-      }
-    },
-    "permutePath": {
-      "base case": {
-        topic: tough.permutePath.bind(null, '/'),
-        "just slash": function (list) {
-          assert.deepEqual(list, ['/']);
-        }
-      },
-      "single case": {
-        topic: tough.permutePath.bind(null, '/foo'),
-        "two things": function (list) {
-          assert.deepEqual(list, ['/foo', '/']);
-        },
-        "path matching": function (list) {
-          list.forEach(function (e) {
-            assert.ok(tough.pathMatch('/foo', e));
-          });
-        }
-      },
-      "double case": {
-        topic: tough.permutePath.bind(null, '/foo/bar'),
-        "four things": function (list) {
-          assert.deepEqual(list, ['/foo/bar', '/foo', '/']);
-        },
-        "path matching": function (list) {
-          list.forEach(function (e) {
-            assert.ok(tough.pathMatch('/foo/bar', e));
-          });
-        }
-      },
-      "trailing slash": {
-        topic: tough.permutePath.bind(null, '/foo/bar/'),
-        "three things": function (list) {
-          assert.deepEqual(list, ['/foo/bar', '/foo', '/']);
-        },
-        "path matching": function (list) {
-          list.forEach(function (e) {
-            assert.ok(tough.pathMatch('/foo/bar/', e));
-          });
-        }
-      }
-    }
-  })
-  .export(module);
diff --git a/deps/npm/node_modules/tough-cookie/test/ietf_data/dates/bsd-examples.json b/deps/npm/node_modules/tough-cookie/test/ietf_data/dates/bsd-examples.json
deleted file mode 100644
index bc43160da15ad2..00000000000000
--- a/deps/npm/node_modules/tough-cookie/test/ietf_data/dates/bsd-examples.json
+++ /dev/null
@@ -1,168 +0,0 @@
-[
-  {
-    "test": "Sat, 15-Apr-17 21:01:22 GMT",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "Thu, 19-Apr-2007 16:00:00 GMT",
-    "expected": "Thu, 19 Apr 2007 16:00:00 GMT"
-  }, {
-    "test": "Wed, 25 Apr 2007 21:02:13 GMT",
-    "expected": "Wed, 25 Apr 2007 21:02:13 GMT"
-  }, {
-    "test": "Thu, 19/Apr\\2007 16:00:00 GMT",
-    "expected": "Thu, 19 Apr 2007 16:00:00 GMT"
-  }, {
-    "test": "Fri, 1 Jan 2010 01:01:50 GMT",
-    "expected": "Fri, 01 Jan 2010 01:01:50 GMT"
-  }, {
-    "test": "Wednesday, 1-Jan-2003 00:00:00 GMT",
-    "expected": "Wed, 01 Jan 2003 00:00:00 GMT"
-  }, {
-    "test": ", 1-Jan-2003 00:00:00 GMT",
-    "expected": "Wed, 01 Jan 2003 00:00:00 GMT"
-  }, {
-    "test": " 1-Jan-2003 00:00:00 GMT",
-    "expected": "Wed, 01 Jan 2003 00:00:00 GMT"
-  }, {
-    "test": "1-Jan-2003 00:00:00 GMT",
-    "expected": "Wed, 01 Jan 2003 00:00:00 GMT"
-  }, {
-    "test": "Wed,18-Apr-07 22:50:12 GMT",
-    "expected": "Wed, 18 Apr 2007 22:50:12 GMT"
-  }, {
-    "test": "WillyWonka  , 18-Apr-07 22:50:12 GMT",
-    "expected": "Wed, 18 Apr 2007 22:50:12 GMT"
-  }, {
-    "test": "WillyWonka  , 18-Apr-07 22:50:12",
-    "expected": "Wed, 18 Apr 2007 22:50:12 GMT"
-  }, {
-    "test": "WillyWonka  ,  18-apr-07   22:50:12",
-    "expected": "Wed, 18 Apr 2007 22:50:12 GMT"
-  }, {
-    "test": "Mon, 18-Apr-1977 22:50:13 GMT",
-    "expected": "Mon, 18 Apr 1977 22:50:13 GMT"
-  }, {
-    "test": "Mon, 18-Apr-77 22:50:13 GMT",
-    "expected": "Mon, 18 Apr 1977 22:50:13 GMT"
-  }, {
-    "test": "\"Sat, 15-Apr-17\\\"21:01:22\\\"GMT\"",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "Partyday, 18- April-07 22:50:12",
-    "expected": "Wed, 18 Apr 2007 22:50:12 GMT"
-  }, {
-    "test": "Partyday, 18 - Apri-07 22:50:12",
-    "expected": "Wed, 18 Apr 2007 22:50:12 GMT"
-  }, {
-    "test": "Wednes, 1-Januar-2003 00:00:00 GMT",
-    "expected": "Wed, 01 Jan 2003 00:00:00 GMT"
-  }, {
-    "test": "Sat, 15-Apr-17 21:01:22",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "Sat, 15-Apr-17 21:01:22 GMT-2",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "Sat, 15-Apr-17 21:01:22 GMT BLAH",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "Sat, 15-Apr-17 21:01:22 GMT-0400",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "Sat, 15-Apr-17 21:01:22 GMT-0400 (EDT)",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "Sat, 15-Apr-17 21:01:22 DST",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "Sat, 15-Apr-17 21:01:22 -0400",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "Sat, 15-Apr-17 21:01:22 (hello there)",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "Sat, 15-Apr-17 21:01:22 11:22:33",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "Sat, 15-Apr-17 ::00 21:01:22",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "Sat, 15-Apr-17 boink:z 21:01:22",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "Sat, 15-Apr-17 91:22:33 21:01:22",
-    "expected": null
-  }, {
-    "test": "Thu Apr 18 22:50:12 2007 GMT",
-    "expected": "Wed, 18 Apr 2007 22:50:12 GMT"
-  }, {
-    "test": "22:50:12 Thu Apr 18 2007 GMT",
-    "expected": "Wed, 18 Apr 2007 22:50:12 GMT"
-  }, {
-    "test": "Thu 22:50:12 Apr 18 2007 GMT",
-    "expected": "Wed, 18 Apr 2007 22:50:12 GMT"
-  }, {
-    "test": "Thu Apr 22:50:12 18 2007 GMT",
-    "expected": "Wed, 18 Apr 2007 22:50:12 GMT"
-  }, {
-    "test": "Thu Apr 18 22:50:12 2007 GMT",
-    "expected": "Wed, 18 Apr 2007 22:50:12 GMT"
-  }, {
-    "test": "Thu Apr 18 2007 22:50:12 GMT",
-    "expected": "Wed, 18 Apr 2007 22:50:12 GMT"
-  }, {
-    "test": "Thu Apr 18 2007 GMT 22:50:12",
-    "expected": "Wed, 18 Apr 2007 22:50:12 GMT"
-  }, {
-    "test": "Sat, 15-Apr-17 21:01:22 GMT",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "15-Sat, Apr-17 21:01:22 GMT",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "15-Sat, Apr 21:01:22 GMT 17",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "15-Sat, Apr 21:01:22 GMT 2017",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "15 Apr 21:01:22 2017",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "15 17 Apr 21:01:22",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "Apr 15 17 21:01:22",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "Apr 15 21:01:22 17",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "2017 April 15 21:01:22",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "15 April 2017 21:01:22",
-    "expected": "Sat, 15 Apr 2017 21:01:22 GMT"
-  }, {
-    "test": "98 April 17 21:01:22",
-    "expected": null
-  }, {
-    "test": "Thu, 012-Aug-2008 20:49:07 GMT",
-    "expected": null
-  }, {
-    "test": "Thu, 12-Aug-31841 20:49:07 GMT",
-    "expected": null
-  }, {
-    "test": "Thu, 12-Aug-9999999999 20:49:07 GMT",
-    "expected": null
-  }, {
-    "test": "Thu, 999999999999-Aug-2007 20:49:07 GMT",
-    "expected": null
-  }, {
-    "test": "Thu, 12-Aug-2007 20:61:99999999999 GMT",
-    "expected": null
-  }, {
-    "test": "IAintNoDateFool",
-    "expected": null
-  }
-]
diff --git a/deps/npm/node_modules/tough-cookie/test/ietf_data/dates/examples.json b/deps/npm/node_modules/tough-cookie/test/ietf_data/dates/examples.json
deleted file mode 100644
index 61e674d4477123..00000000000000
--- a/deps/npm/node_modules/tough-cookie/test/ietf_data/dates/examples.json
+++ /dev/null
@@ -1,48 +0,0 @@
-[
-  {
-    "test": "Mon, 10-Dec-2007 17:02:24 GMT",
-    "expected": "Mon, 10 Dec 2007 17:02:24 GMT"
-  }, {
-    "test": "Wed, 09 Dec 2009 16:27:23 GMT",
-    "expected": "Wed, 09 Dec 2009 16:27:23 GMT"
-  }, {
-    "test": "Thursday, 01-Jan-1970 00:00:00 GMT",
-    "expected": "Thu, 01 Jan 1970 00:00:00 GMT"
-  }, {
-    "test": "Mon Dec 10 16:32:30 2007 GMT",
-    "expected": "Mon, 10 Dec 2007 16:32:30 GMT"
-  }, {
-    "test": "Wednesday, 01-Jan-10 00:00:00 GMT",
-    "expected": "Fri, 01 Jan 2010 00:00:00 GMT"
-  }, {
-    "test": "Mon, 10-Dec-07 20:35:03 GMT",
-    "expected": "Mon, 10 Dec 2007 20:35:03 GMT"
-  }, {
-    "test": "Wed, 1 Jan 2020 00:00:00 GMT",
-    "expected": "Wed, 01 Jan 2020 00:00:00 GMT"
-  }, {
-    "test": "Saturday, 8-Dec-2012 21:24:09 GMT",
-    "expected": "Sat, 08 Dec 2012 21:24:09 GMT"
-  }, {
-    "test": "Thu, 31 Dec 23:55:55 2037 GMT",
-    "expected": "Thu, 31 Dec 2037 23:55:55 GMT"
-  }, {
-    "test": "Sun,  9 Dec 2012 13:42:05 GMT",
-    "expected": "Sun, 09 Dec 2012 13:42:05 GMT"
-  }, {
-    "test": "Wed Dec 12 2007 08:44:07 GMT-0500 (EST)",
-    "expected": "Wed, 12 Dec 2007 08:44:07 GMT"
-  }, {
-    "test": "Mon, 01-Jan-2011 00: 00:00 GMT",
-    "expected": null
-  }, {
-    "test": "Sun, 1-Jan-1995 00:00:00 GMT",
-    "expected": "Sun, 01 Jan 1995 00:00:00 GMT"
-  }, {
-    "test": "Wednesday, 01-Jan-10 0:0:00 GMT",
-    "expected": "Fri, 01 Jan 2010 00:00:00 GMT"
-  }, {
-    "test": "Thu, 10 Dec 2009 13:57:2 GMT",
-    "expected": "Thu, 10 Dec 2009 13:57:02 GMT"
-  }
-]
diff --git a/deps/npm/node_modules/tough-cookie/test/ietf_data/parser.json b/deps/npm/node_modules/tough-cookie/test/ietf_data/parser.json
deleted file mode 100644
index 783f660bfa62f4..00000000000000
--- a/deps/npm/node_modules/tough-cookie/test/ietf_data/parser.json
+++ /dev/null
@@ -1,1959 +0,0 @@
-[
-  {
-    "test": "0001",
-    "received": [
-      "foo=bar"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "0002",
-    "received": [
-      "foo=bar; Expires=Fri, 07 Aug 2019 08:04:19 GMT"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "0003",
-    "received": [
-      "foo=bar; Expires=Fri, 07 Aug 2007 08:04:19 GMT",
-      "foo2=bar2; Expires=Fri, 07 Aug 2017 08:04:19 GMT"
-    ],
-    "sent": [
-      { "name": "foo2", "value": "bar2" }
-    ]
-  },
-  {
-    "test": "0004",
-    "received": [
-      "foo"
-    ],
-    "sent": []
-  },
-  {
-    "test": "0005",
-    "received": [
-      "foo=bar; max-age=10000;"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "0006",
-    "received": [
-      "foo=bar; max-age=0;"
-    ],
-    "sent": []
-  },
-  {
-    "test": "0007",
-    "received": [
-      "foo=bar; version=1;"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "0008",
-    "received": [
-      "foo=bar; version=1000;"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "0009",
-    "received": [
-      "foo=bar; customvalue=1000;"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "0010",
-    "received": [
-      "foo=bar; secure;"
-    ],
-    "sent": []
-  },
-  {
-    "test": "0011",
-    "received": [
-      "foo=bar; customvalue=\"1000 or more\";"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "0012",
-    "received": [
-      "foo=bar; customvalue=\"no trailing semicolon\""
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "0013",
-    "received": [
-      "foo=bar",
-      "foo=qux"
-    ],
-    "sent": [
-      { "name": "foo", "value": "qux" }
-    ]
-  },
-  {
-    "test": "0014",
-    "received": [
-      "foo1=bar",
-      "foo2=qux"
-    ],
-    "sent": [
-      { "name": "foo1", "value": "bar" },
-      { "name": "foo2", "value": "qux" }
-    ]
-  },
-  {
-    "test": "0015",
-    "received": [
-      "a=b",
-      "z=y"
-    ],
-    "sent": [
-      { "name": "a", "value": "b" },
-      { "name": "z", "value": "y" }
-    ]
-  },
-  {
-    "test": "0016",
-    "received": [
-      "z=y",
-      "a=b"
-    ],
-    "sent": [
-      { "name": "z", "value": "y" },
-      { "name": "a", "value": "b" }
-    ]
-  },
-  {
-    "test": "0017",
-    "received": [
-      "z=y, a=b"
-    ],
-    "sent": [
-      { "name": "z", "value": "y, a=b" }
-    ]
-  },
-  {
-    "test": "0018",
-    "received": [
-      "z=y; foo=bar, a=b"
-    ],
-    "sent": [
-      { "name": "z", "value": "y" }
-    ]
-  },
-  {
-    "test": "0019",
-    "received": [
-      "foo=b;max-age=3600, c=d;path=/"
-    ],
-    "sent": [
-      { "name": "foo", "value": "b" }
-    ]
-  },
-  {
-    "test": "0020",
-    "received": [
-      "a=b",
-      "=",
-      "c=d"
-    ],
-    "sent": [
-      { "name": "a", "value": "b" },
-      { "name": "c", "value": "d" }
-    ]
-  },
-  {
-    "test": "0021",
-    "received": [
-      "a=b",
-      "=x",
-      "c=d"
-    ],
-    "sent": [
-      { "name": "a", "value": "b" },
-      { "name": "c", "value": "d" }
-    ]
-  },
-  {
-    "test": "0022",
-    "received": [
-      "a=b",
-      "x=",
-      "c=d"
-    ],
-    "sent": [
-      { "name": "a", "value": "b" },
-      { "name": "x", "value": "" },
-      { "name": "c", "value": "d" }
-    ]
-  },
-  {
-    "test": "0023",
-    "received": [
-      "foo",
-      ""
-    ],
-    "sent": []
-  },
-  {
-    "test": "0024",
-    "received": [
-      "foo",
-      "="
-    ],
-    "sent": []
-  },
-  {
-    "test": "0025",
-    "received": [
-      "foo",
-      "; bar"
-    ],
-    "sent": []
-  },
-  {
-    "test": "0026",
-    "received": [
-      "foo",
-      "   "
-    ],
-    "sent": []
-  },
-  {
-    "test": "0027",
-    "received": [
-      "foo",
-      "bar"
-    ],
-    "sent": []
-  },
-  {
-    "test": "0028",
-    "received": [
-      "foo",
-      "\t"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0001",
-    "received": [
-      "foo=bar; Secure"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0002",
-    "received": [
-      "foo=bar; seCURe"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0003",
-    "received": [
-      "foo=bar; \"Secure\""
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "ATTRIBUTE0004",
-    "received": [
-      "foo=bar; Secure="
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0005",
-    "received": [
-      "foo=bar; Secure=aaaa"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0006",
-    "received": [
-      "foo=bar; Secure qux"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "ATTRIBUTE0007",
-    "received": [
-      "foo=bar; Secure =aaaaa"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0008",
-    "received": [
-      "foo=bar; Secure= aaaaa"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0009",
-    "received": [
-      "foo=bar; Secure; qux"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0010",
-    "received": [
-      "foo=bar; Secure;qux"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0011",
-    "received": [
-      "foo=bar; Secure    ; qux"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0012",
-    "received": [
-      "foo=bar;                Secure"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0013",
-    "received": [
-      "foo=bar;       Secure     ;"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0014",
-    "received": [
-      "foo=bar; Path"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "ATTRIBUTE0015",
-    "received": [
-      "foo=bar; Path="
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "ATTRIBUTE0016",
-    "received": [
-      "foo=bar; Path=/"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "ATTRIBUTE0017",
-    "received": [
-      "foo=bar; Path=/qux"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0018",
-    "received": [
-      "foo=bar; Path    =/qux"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0019",
-    "received": [
-      "foo=bar; Path=    /qux"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0020",
-    "received": [
-      "foo=bar; Path=/qux      ; taz"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0021",
-    "received": [
-      "foo=bar; Path=/qux; Path=/"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "ATTRIBUTE0022",
-    "received": [
-      "foo=bar; Path=/; Path=/qux"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0023",
-    "received": [
-      "foo=bar; Path=/qux; Path=/cookie-parser-result"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "ATTRIBUTE0024",
-    "received": [
-      "foo=bar; Path=/cookie-parser-result; Path=/qux"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0025",
-    "received": [
-      "foo=bar; qux; Secure"
-    ],
-    "sent": []
-  },
-  {
-    "test": "ATTRIBUTE0026",
-    "received": [
-      "foo=bar; qux=\"aaa;bbb\"; Secure"
-    ],
-    "sent": []
-  },
-  {
-    "test": "CHARSET0001",
-    "received": [
-      "foo=\u6625\u8282\u56de\u5bb6\u8def\u00b7\u6625\u8fd0\u5b8c\u5168\u624b\u518c"
-    ],
-    "sent": [
-      { "name": "foo", "value": "\u6625\u8282\u56de\u5bb6\u8def\u00b7\u6625\u8fd0\u5b8c\u5168\u624b\u518c" }
-    ]
-  },
-  {
-    "test": "CHARSET0002",
-    "received": [
-      "\u6625\u8282\u56de=\u5bb6\u8def\u00b7\u6625\u8fd0\u5b8c\u5168\u624b\u518c"
-    ],
-    "sent": [
-      { "name": "\u6625\u8282\u56de", "value": "\u5bb6\u8def\u00b7\u6625\u8fd0\u5b8c\u5168\u624b\u518c" }
-    ]
-  },
-  {
-    "test": "CHARSET0003",
-    "received": [
-      "\u6625\u8282\u56de=\u5bb6\u8def\u00b7\u6625\u8fd0; \u5b8c\u5168\u624b\u518c"
-    ],
-    "sent": [
-      { "name": "\u6625\u8282\u56de", "value": "\u5bb6\u8def\u00b7\u6625\u8fd0" }
-    ]
-  },
-  {
-    "test": "CHARSET0004",
-    "received": [
-      "foo=\"\u6625\u8282\u56de\u5bb6\u8def\u00b7\u6625\u8fd0\u5b8c\u5168\u624b\u518c\""
-    ],
-    "sent": [
-      { "name": "foo", "value": "\"\u6625\u8282\u56de\u5bb6\u8def\u00b7\u6625\u8fd0\u5b8c\u5168\u624b\u518c\"" }
-    ]
-  },
-  {
-    "test": "CHROMIUM0001",
-    "received": [
-      "a=b"
-    ],
-    "sent": [
-      { "name": "a", "value": "b" }
-    ]
-  },
-  {
-    "test": "CHROMIUM0002",
-    "received": [
-      "aBc=\"zzz \"   ;"
-    ],
-    "sent": [
-      { "name": "aBc", "value": "\"zzz \"" }
-    ]
-  },
-  {
-    "test": "CHROMIUM0003",
-    "received": [
-      "aBc=\"zzz \" ;"
-    ],
-    "sent": [
-      { "name": "aBc", "value": "\"zzz \"" }
-    ]
-  },
-  {
-    "test": "CHROMIUM0004",
-    "received": [
-      "aBc=\"zz;pp\" ; ;"
-    ],
-    "sent": [
-      { "name": "aBc", "value": "\"zz" }
-    ]
-  },
-  {
-    "test": "CHROMIUM0005",
-    "received": [
-      "aBc=\"zz ;"
-    ],
-    "sent": [
-      { "name": "aBc", "value": "\"zz" }
-    ]
-  },
-  {
-    "test": "CHROMIUM0006",
-    "received": [
-      "aBc=\"zzz \"   \"ppp\"  ;"
-    ],
-    "sent": [
-      { "name": "aBc", "value": "\"zzz \"   \"ppp\"" }
-    ]
-  },
-  {
-    "test": "CHROMIUM0007",
-    "received": [
-      "aBc=\"zzz \"   \"ppp\" ;"
-    ],
-    "sent": [
-      { "name": "aBc", "value": "\"zzz \"   \"ppp\"" }
-    ]
-  },
-  {
-    "test": "CHROMIUM0008",
-    "received": [
-      "aBc=A\"B ;"
-    ],
-    "sent": [
-      { "name": "aBc", "value": "A\"B" }
-    ]
-  },
-  {
-    "test": "CHROMIUM0009",
-    "received": [
-      "BLAHHH; path=/;"
-    ],
-    "sent": []
-  },
-  {
-    "test": "CHROMIUM0010",
-    "received": [
-      "\"BLA\\\"HHH\"; path=/;"
-    ],
-    "sent": []
-  },
-  {
-    "test": "CHROMIUM0011",
-    "received": [
-      "a=\"B"
-    ],
-    "sent": [
-      { "name": "a", "value": "\"B" }
-    ]
-  },
-  {
-    "test": "CHROMIUM0012",
-    "received": [
-      "=ABC"
-    ],
-    "sent": []
-  },
-  {
-    "test": "CHROMIUM0013",
-    "received": [
-      "ABC=;  path = /"
-    ],
-    "sent": [
-      { "name": "ABC", "value": "" }
-    ]
-  },
-  {
-    "test": "CHROMIUM0014",
-    "received": [
-      "  A  = BC  ;foo;;;   bar"
-    ],
-    "sent": [
-      { "name": "A", "value": "BC" }
-    ]
-  },
-  {
-    "test": "CHROMIUM0015",
-    "received": [
-      "  A=== BC  ;foo;;;   bar"
-    ],
-    "sent": [
-      { "name": "A", "value": "== BC" }
-    ]
-  },
-  {
-    "test": "CHROMIUM0016",
-    "received": [
-      "foo=\"zohNumRKgI0oxyhSsV3Z7D\"  ; expires=Sun, 18-Apr-2027 21:06:29 GMT ; path=/  ;  "
-    ],
-    "sent": [
-      { "name": "foo", "value": "\"zohNumRKgI0oxyhSsV3Z7D\"" }
-    ]
-  },
-  {
-    "test": "CHROMIUM0017",
-    "received": [
-      "foo=zohNumRKgI0oxyhSsV3Z7D  ; expires=Sun, 18-Apr-2027 21:06:29 GMT ; path=/  ;  "
-    ],
-    "sent": [
-      { "name": "foo", "value": "zohNumRKgI0oxyhSsV3Z7D" }
-    ]
-  },
-  {
-    "test": "CHROMIUM0018",
-    "received": [
-      "    "
-    ],
-    "sent": []
-  },
-  {
-    "test": "CHROMIUM0019",
-    "received": [
-      "a=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    ],
-    "sent": [
-      { "name": "a", "value": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" }
-    ]
-  },
-  {
-    "test": "CHROMIUM0021",
-    "received": [
-      ""
-    ],
-    "sent": []
-  },
-  {
-    "test": "COMMA0001",
-    "received": [
-      "foo=bar, baz=qux"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar, baz=qux" }
-    ]
-  },
-  {
-    "test": "COMMA0002",
-    "received": [
-      "foo=\"bar, baz=qux\""
-    ],
-    "sent": [
-      { "name": "foo", "value": "\"bar, baz=qux\"" }
-    ]
-  },
-  {
-    "test": "COMMA0003",
-    "received": [
-      "foo=bar; b,az=qux"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "COMMA0004",
-    "received": [
-      "foo=bar; baz=q,ux"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "COMMA0005",
-    "received": [
-      "foo=bar; Max-Age=50,399"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "COMMA0006",
-    "received": [
-      "foo=bar; Expires=Fri, 07 Aug 2019 08:04:19 GMT"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "COMMA0007",
-    "received": [
-      "foo=bar; Expires=Fri 07 Aug 2019 08:04:19 GMT, baz=qux"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DISABLED_CHROMIUM0020",
-    "received": [
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    ],
-    "sent": []
-  },
-  {
-    "test": "DISABLED_CHROMIUM0022",
-    "received": [
-      "AAA=BB\u0000ZYX"
-    ],
-    "sent": [
-      { "name": "AAA", "value": "BB" }
-    ]
-  },
-  {
-    "test": "DISABLED_CHROMIUM0023",
-    "received": [
-      "AAA=BB\rZYX"
-    ],
-    "sent": [
-      { "name": "AAA", "value": "BB" }
-    ]
-  },
-  {
-    "test": "DISABLED_PATH0029",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/foo/bar"
-    ],
-    "sent-to": "/cookie-parser-result/f%6Fo/bar?disabled-path0029",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0001",
-    "received": [
-      "foo=bar; domain=home.example.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0001",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0002",
-    "received": [
-      "foo=bar; domain=home.example.org"
-    ],
-    "sent-to": "http://sibling.example.org:8888/cookie-parser-result?domain0002",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0003",
-    "received": [
-      "foo=bar; domain=.home.example.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0003",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0004",
-    "received": [
-      "foo=bar; domain=home.example.org"
-    ],
-    "sent-to": "http://subdomain.home.example.org:8888/cookie-parser-result?domain0004",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0005",
-    "received": [
-      "foo=bar; domain=.home.example.org"
-    ],
-    "sent-to": "http://subdomain.home.example.org:8888/cookie-parser-result?domain0005",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0006",
-    "received": [
-      "foo=bar; domain=.home.example.org"
-    ],
-    "sent-to": "http://sibling.example.org:8888/cookie-parser-result?domain0006",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0007",
-    "received": [
-      "foo=bar; domain=sibling.example.org"
-    ],
-    "sent-to": "http://sibling.example.org:8888/cookie-parser-result?domain0007",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0008",
-    "received": [
-      "foo=bar; domain=.example.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0008",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0009",
-    "received": [
-      "foo=bar; domain=example.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0009",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0010",
-    "received": [
-      "foo=bar; domain=..home.example.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0010",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0011",
-    "received": [
-      "foo=bar; domain=home..example.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0011",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0012",
-    "received": [
-      "foo=bar; domain=  .home.example.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0012",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0013",
-    "received": [
-      "foo=bar; domain=  .  home.example.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0013",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0014",
-    "received": [
-      "foo=bar; domain=home.example.org."
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0014",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0015",
-    "received": [
-      "foo=bar; domain=home.example.org.."
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0015",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0016",
-    "received": [
-      "foo=bar; domain=home.example.org ."
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0016",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0017",
-    "received": [
-      "foo=bar; domain=.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0017",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0018",
-    "received": [
-      "foo=bar; domain=.org."
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0018",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0019",
-    "received": [
-      "foo=bar; domain=home.example.org",
-      "foo2=bar2; domain=.home.example.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0019",
-    "sent": [
-      { "name": "foo", "value": "bar" },
-      { "name": "foo2", "value": "bar2" }
-    ]
-  },
-  {
-    "test": "DOMAIN0020",
-    "received": [
-      "foo2=bar2; domain=.home.example.org",
-      "foo=bar; domain=home.example.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0020",
-    "sent": [
-      { "name": "foo2", "value": "bar2" },
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0021",
-    "received": [
-      "foo=bar; domain=\"home.example.org\""
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0021",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0022",
-    "received": [
-      "foo=bar; domain=home.example.org",
-      "foo2=bar2; domain=.example.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0022",
-    "sent": [
-      { "name": "foo", "value": "bar" },
-      { "name": "foo2", "value": "bar2" }
-    ]
-  },
-  {
-    "test": "DOMAIN0023",
-    "received": [
-      "foo2=bar2; domain=.example.org",
-      "foo=bar; domain=home.example.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0023",
-    "sent": [
-      { "name": "foo2", "value": "bar2" },
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0024",
-    "received": [
-      "foo=bar; domain=.example.org; domain=home.example.org"
-    ],
-    "sent-to": "http://sibling.example.org:8888/cookie-parser-result?domain0024",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0025",
-    "received": [
-      "foo=bar; domain=home.example.org; domain=.example.org"
-    ],
-    "sent-to": "http://sibling.example.org:8888/cookie-parser-result?domain0025",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0026",
-    "received": [
-      "foo=bar; domain=home.eXaMpLe.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0026",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0027",
-    "received": [
-      "foo=bar; domain=home.example.org:8888"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0027",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0028",
-    "received": [
-      "foo=bar; domain=subdomain.home.example.org"
-    ],
-    "sent-to": "http://subdomain.home.example.org:8888/cookie-parser-result?domain0028",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0029",
-    "received": [
-      "foo=bar"
-    ],
-    "sent-to": "http://subdomain.home.example.org:8888/cookie-parser-result?domain0029",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0031",
-    "received": [
-      "foo=bar; domain=home.example.org; domain=.example.org"
-    ],
-    "sent-to": "http://sibling.example.org:8888/cookie-parser-result?domain0031",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0033",
-    "received": [
-      "foo=bar; domain=home.example.org"
-    ],
-    "sent-to": "http://hoMe.eXaMplE.org:8888/cookie-parser-result?domain0033",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0034",
-    "received": [
-      "foo=bar; domain=home.example.org; domain=home.example.com"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0034",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0035",
-    "received": [
-      "foo=bar; domain=home.example.com; domain=home.example.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0035",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0036",
-    "received": [
-      "foo=bar; domain=home.example.org; domain=home.example.com; domain=home.example.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0036",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0037",
-    "received": [
-      "foo=bar; domain=home.example.com; domain=home.example.org; domain=home.example.com"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0037",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0038",
-    "received": [
-      "foo=bar; domain=home.example.org; domain=home.example.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0038",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0039",
-    "received": [
-      "foo=bar; domain=home.example.org; domain=example.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0039",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0040",
-    "received": [
-      "foo=bar; domain=example.org; domain=home.example.org"
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?domain0040",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "DOMAIN0041",
-    "received": [
-      "foo=bar; domain=.sibling.example.org"
-    ],
-    "sent-to": "http://sibling.example.org:8888/cookie-parser-result?domain0041",
-    "sent": []
-  },
-  {
-    "test": "DOMAIN0042",
-    "received": [
-      "foo=bar; domain=.sibling.home.example.org"
-    ],
-    "sent-to": "http://sibling.home.example.org:8888/cookie-parser-result?domain0042",
-    "sent": []
-  },
-  {
-    "test": "MOZILLA0001",
-    "received": [
-      "foo=bar; max-age=-1"
-    ],
-    "sent": []
-  },
-  {
-    "test": "MOZILLA0002",
-    "received": [
-      "foo=bar; max-age=0"
-    ],
-    "sent": []
-  },
-  {
-    "test": "MOZILLA0003",
-    "received": [
-      "foo=bar; expires=Thu, 10 Apr 1980 16:33:12 GMT"
-    ],
-    "sent": []
-  },
-  {
-    "test": "MOZILLA0004",
-    "received": [
-      "foo=bar; max-age=60"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "MOZILLA0005",
-    "received": [
-      "foo=bar; max-age=-20"
-    ],
-    "sent": []
-  },
-  {
-    "test": "MOZILLA0006",
-    "received": [
-      "foo=bar; max-age=60"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "MOZILLA0007",
-    "received": [
-      "foo=bar; expires=Thu, 10 Apr 1980 16:33:12 GMT"
-    ],
-    "sent": []
-  },
-  {
-    "test": "MOZILLA0008",
-    "received": [
-      "foo=bar; max-age=60",
-      "foo1=bar; max-age=60"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" },
-      { "name": "foo1", "value": "bar" }
-    ]
-  },
-  {
-    "test": "MOZILLA0009",
-    "received": [
-      "foo=bar; max-age=60",
-      "foo1=bar; max-age=60",
-      "foo=differentvalue; max-age=0"
-    ],
-    "sent": [
-      { "name": "foo1", "value": "bar" }
-    ]
-  },
-  {
-    "test": "MOZILLA0010",
-    "received": [
-      "foo=bar; max-age=60",
-      "foo1=bar; max-age=60",
-      "foo=differentvalue; max-age=0",
-      "foo2=evendifferentvalue; max-age=0"
-    ],
-    "sent": [
-      { "name": "foo1", "value": "bar" }
-    ]
-  },
-  {
-    "test": "MOZILLA0011",
-    "received": [
-      "test=parser; domain=.parser.test; ;; ;=; ,,, ===,abc,=; abracadabra! max-age=20;=;;"
-    ],
-    "sent": []
-  },
-  {
-    "test": "MOZILLA0012",
-    "received": [
-      "test=\"fubar! = foo;bar\\\";\" parser; max-age=6",
-      "five; max-age=2.63,"
-    ],
-    "sent": [
-      { "name": "test", "value": "\"fubar! = foo" }
-    ]
-  },
-  {
-    "test": "MOZILLA0013",
-    "received": [
-      "test=kill; max-age=0",
-      "five; max-age=0"
-    ],
-    "sent": []
-  },
-  {
-    "test": "MOZILLA0014",
-    "received": [
-      "six"
-    ],
-    "sent": []
-  },
-  {
-    "test": "MOZILLA0015",
-    "received": [
-      "six",
-      "seven"
-    ],
-    "sent": []
-  },
-  {
-    "test": "MOZILLA0016",
-    "received": [
-      "six",
-      "seven",
-      " =eight"
-    ],
-    "sent": []
-  },
-  {
-    "test": "MOZILLA0017",
-    "received": [
-      "six",
-      "seven",
-      " =eight",
-      "test=six"
-    ],
-    "sent": [
-      { "name": "test", "value": "six" }
-    ]
-  },
-  {
-    "test": "NAME0001",
-    "received": [
-      "a=bar"
-    ],
-    "sent": [
-      { "name": "a", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0002",
-    "received": [
-      "1=bar"
-    ],
-    "sent": [
-      { "name": "1", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0003",
-    "received": [
-      "$=bar"
-    ],
-    "sent": [
-      { "name": "$", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0004",
-    "received": [
-      "!a=bar"
-    ],
-    "sent": [
-      { "name": "!a", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0005",
-    "received": [
-      "@a=bar"
-    ],
-    "sent": [
-      { "name": "@a", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0006",
-    "received": [
-      "#a=bar"
-    ],
-    "sent": [
-      { "name": "#a", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0007",
-    "received": [
-      "$a=bar"
-    ],
-    "sent": [
-      { "name": "$a", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0008",
-    "received": [
-      "%a=bar"
-    ],
-    "sent": [
-      { "name": "%a", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0009",
-    "received": [
-      "^a=bar"
-    ],
-    "sent": [
-      { "name": "^a", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0010",
-    "received": [
-      "&a=bar"
-    ],
-    "sent": [
-      { "name": "&a", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0011",
-    "received": [
-      "*a=bar"
-    ],
-    "sent": [
-      { "name": "*a", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0012",
-    "received": [
-      "(a=bar"
-    ],
-    "sent": [
-      { "name": "(a", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0013",
-    "received": [
-      ")a=bar"
-    ],
-    "sent": [
-      { "name": ")a", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0014",
-    "received": [
-      "-a=bar"
-    ],
-    "sent": [
-      { "name": "-a", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0015",
-    "received": [
-      "_a=bar"
-    ],
-    "sent": [
-      { "name": "_a", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0016",
-    "received": [
-      "+=bar"
-    ],
-    "sent": [
-      { "name": "+", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0017",
-    "received": [
-      "=a=bar"
-    ],
-    "sent": []
-  },
-  {
-    "test": "NAME0018",
-    "received": [
-      "a =bar"
-    ],
-    "sent": [
-      { "name": "a", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0019",
-    "received": [
-      "\"a=bar"
-    ],
-    "sent": [
-      { "name": "\"a", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0020",
-    "received": [
-      "\"a=b\"=bar"
-    ],
-    "sent": [
-      { "name": "\"a", "value": "b\"=bar" }
-    ]
-  },
-  {
-    "test": "NAME0021",
-    "received": [
-      "\"a=b\"=bar",
-      "\"a=qux"
-    ],
-    "sent": [
-      { "name": "\"a", "value": "qux" }
-    ]
-  },
-  {
-    "test": "NAME0022",
-    "received": [
-      "   foo=bar"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0023",
-    "received": [
-      "foo;bar=baz"
-    ],
-    "sent": []
-  },
-  {
-    "test": "NAME0024",
-    "received": [
-      "$Version=1; foo=bar"
-    ],
-    "sent": [
-      { "name": "$Version", "value": "1" }
-    ]
-  },
-  {
-    "test": "NAME0025",
-    "received": [
-      "===a=bar"
-    ],
-    "sent": []
-  },
-  {
-    "test": "NAME0026",
-    "received": [
-      "foo=bar    "
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0027",
-    "received": [
-      "foo=bar    ;"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "NAME0028",
-    "received": [
-      "=a"
-    ],
-    "sent": []
-  },
-  {
-    "test": "NAME0029",
-    "received": [
-      "="
-    ],
-    "sent": []
-  },
-  {
-    "test": "NAME0030",
-    "received": [
-      "foo bar=baz"
-    ],
-    "sent": [
-      { "name": "foo bar", "value": "baz" }
-    ]
-  },
-  {
-    "test": "NAME0031",
-    "received": [
-      "\"foo;bar\"=baz"
-    ],
-    "sent": []
-  },
-  {
-    "test": "NAME0032",
-    "received": [
-      "\"foo\\\"bar;baz\"=qux"
-    ],
-    "sent": []
-  },
-  {
-    "test": "NAME0033",
-    "received": [
-      "=foo=bar",
-      "aaa"
-    ],
-    "sent": []
-  },
-  {
-    "test": "OPTIONAL_DOMAIN0030",
-    "received": [
-      "foo=bar; domain="
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?optional-domain0030",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "OPTIONAL_DOMAIN0041",
-    "received": [
-      "foo=bar; domain=example.org; domain="
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?optional-domain0041",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "OPTIONAL_DOMAIN0042",
-    "received": [
-      "foo=bar; domain=foo.example.org; domain="
-    ],
-    "sent-to": "http://home.example.org:8888/cookie-parser-result?optional-domain0042",
-    "sent": []
-  },
-  {
-    "test": "OPTIONAL_DOMAIN0043",
-    "received": [
-      "foo=bar; domain=foo.example.org; domain="
-    ],
-    "sent-to": "http://subdomain.home.example.org:8888/cookie-parser-result?optional-domain0043",
-    "sent": []
-  },
-  {
-    "test": "ORDERING0001",
-    "received": [
-      "key=val0;",
-      "key=val1; path=/cookie-parser-result",
-      "key=val2; path=/",
-      "key=val3; path=/bar",
-      "key=val4; domain=.example.org",
-      "key=val5; domain=.example.org; path=/cookie-parser-result/foo"
-    ],
-    "sent-to": "/cookie-parser-result/foo/baz?ordering0001",
-    "sent": [
-      { "name": "key", "value": "val5" },
-      { "name": "key", "value": "val1" },
-      { "name": "key", "value": "val2" },
-      { "name": "key", "value": "val4" }
-    ]
-  },
-  {
-    "test": "PATH0001",
-    "received": [
-      "a=b; path=/",
-      "x=y; path=/cookie-parser-result"
-    ],
-    "sent": [
-      { "name": "x", "value": "y" },
-      { "name": "a", "value": "b" }
-    ]
-  },
-  {
-    "test": "PATH0002",
-    "received": [
-      "a=b; path=/cookie-parser-result",
-      "x=y; path=/"
-    ],
-    "sent": [
-      { "name": "a", "value": "b" },
-      { "name": "x", "value": "y" }
-    ]
-  },
-  {
-    "test": "PATH0003",
-    "received": [
-      "x=y; path=/",
-      "a=b; path=/cookie-parser-result"
-    ],
-    "sent": [
-      { "name": "a", "value": "b" },
-      { "name": "x", "value": "y" }
-    ]
-  },
-  {
-    "test": "PATH0004",
-    "received": [
-      "x=y; path=/cookie-parser-result",
-      "a=b; path=/"
-    ],
-    "sent": [
-      { "name": "x", "value": "y" },
-      { "name": "a", "value": "b" }
-    ]
-  },
-  {
-    "test": "PATH0005",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/foo"
-    ],
-    "sent": []
-  },
-  {
-    "test": "PATH0006",
-    "received": [
-      "foo=bar",
-      "foo=qux; path=/cookie-parser-result/foo"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "PATH0007",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/foo"
-    ],
-    "sent-to": "/cookie-parser-result/foo?path0007",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "PATH0008",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/foo"
-    ],
-    "sent-to": "/cookie-parser-result/bar?path0008",
-    "sent": []
-  },
-  {
-    "test": "PATH0009",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/foo/qux"
-    ],
-    "sent-to": "/cookie-parser-result/foo?path0009",
-    "sent": []
-  },
-  {
-    "test": "PATH0010",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/foo/qux"
-    ],
-    "sent-to": "/cookie-parser-result/foo/qux?path0010",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "PATH0011",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/foo/qux"
-    ],
-    "sent-to": "/cookie-parser-result/bar/qux?path0011",
-    "sent": []
-  },
-  {
-    "test": "PATH0012",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/foo/qux"
-    ],
-    "sent-to": "/cookie-parser-result/foo/baz?path0012",
-    "sent": []
-  },
-  {
-    "test": "PATH0013",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/foo/qux/"
-    ],
-    "sent-to": "/cookie-parser-result/foo/baz?path0013",
-    "sent": []
-  },
-  {
-    "test": "PATH0014",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/foo/qux/"
-    ],
-    "sent-to": "/cookie-parser-result/foo/qux?path0014",
-    "sent": []
-  },
-  {
-    "test": "PATH0015",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/foo/qux/"
-    ],
-    "sent-to": "/cookie-parser-result/foo/qux/?path0015",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "PATH0016",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/foo/"
-    ],
-    "sent-to": "/cookie-parser-result/foo/qux?path0016",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "PATH0017",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/foo/"
-    ],
-    "sent-to": "/cookie-parser-result/foo//qux?path0017",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "PATH0018",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/foo/"
-    ],
-    "sent-to": "/cookie-parser-result/fooqux?path0018",
-    "sent": []
-  },
-  {
-    "test": "PATH0019",
-    "received": [
-      "foo=bar; path"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "PATH0020",
-    "received": [
-      "foo=bar; path="
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "PATH0021",
-    "received": [
-      "foo=bar; path=/"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "PATH0022",
-    "received": [
-      "foo=bar; path= /"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "PATH0023",
-    "received": [
-      "foo=bar; Path=/cookie-PARSER-result"
-    ],
-    "sent": []
-  },
-  {
-    "test": "PATH0024",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/foo/qux?"
-    ],
-    "sent-to": "/cookie-parser-result/foo/qux?path0024",
-    "sent": []
-  },
-  {
-    "test": "PATH0025",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/foo/qux#"
-    ],
-    "sent-to": "/cookie-parser-result/foo/qux?path0025",
-    "sent": []
-  },
-  {
-    "test": "PATH0026",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/foo/qux;"
-    ],
-    "sent-to": "/cookie-parser-result/foo/qux?path0026",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "PATH0027",
-    "received": [
-      "foo=bar; path=\"/cookie-parser-result/foo/qux;\""
-    ],
-    "sent-to": "/cookie-parser-result/foo/qux?path0027",
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "PATH0028",
-    "received": [
-      "foo=bar; path=/cookie-parser-result/f%6Fo/bar"
-    ],
-    "sent-to": "/cookie-parser-result/foo/bar?path0028",
-    "sent": []
-  },
-  {
-    "test": "PATH0029",
-    "received": [
-      "a=b; \tpath\t=\t/cookie-parser-result\t",
-      "x=y; \tpath\t=\t/book\t"
-    ],
-    "sent": [
-      { "name": "a", "value": "b" }
-    ]
-  },
-  {
-    "test": "PATH0030",
-    "received": [
-      "foo=bar; path=/dog; path="
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "PATH0031",
-    "received": [
-      "foo=bar; path=; path=/dog"
-    ],
-    "sent": []
-  },
-  {
-    "test": "PATH0032",
-    "received": [
-      "foo=bar; path=/cookie-parser-result",
-      "foo=qux; path=/cookie-parser-result/"
-    ],
-    "sent-to": "/cookie-parser-result/dog?path0032",
-    "sent": [
-      { "name": "foo", "value": "qux" },
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "VALUE0001",
-    "received": [
-      "foo=  bar"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  },
-  {
-    "test": "VALUE0002",
-    "received": [
-      "foo=\"bar\""
-    ],
-    "sent": [
-      { "name": "foo", "value": "\"bar\"" }
-    ]
-  },
-  {
-    "test": "VALUE0003",
-    "received": [
-      "foo=\"  bar \""
-    ],
-    "sent": [
-      { "name": "foo", "value": "\"  bar \"" }
-    ]
-  },
-  {
-    "test": "VALUE0004",
-    "received": [
-      "foo=\"bar;baz\""
-    ],
-    "sent": [
-      { "name": "foo", "value": "\"bar" }
-    ]
-  },
-  {
-    "test": "VALUE0005",
-    "received": [
-      "foo=\"bar=baz\""
-    ],
-    "sent": [
-      { "name": "foo", "value": "\"bar=baz\"" }
-    ]
-  },
-  {
-    "test": "VALUE0006",
-    "received": [
-      "\tfoo\t=\tbar\t \t;\tttt"
-    ],
-    "sent": [
-      { "name": "foo", "value": "bar" }
-    ]
-  }
-]
diff --git a/deps/npm/node_modules/tough-cookie/test/ietf_test.js b/deps/npm/node_modules/tough-cookie/test/ietf_test.js
deleted file mode 100644
index 8bd41dd6542d8e..00000000000000
--- a/deps/npm/node_modules/tough-cookie/test/ietf_test.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-'use strict';
-var vows = require('vows');
-var assert = require('assert');
-var fs = require('fs');
-var path = require('path');
-var url = require('url');
-var tough = require('../lib/cookie');
-var Cookie = tough.Cookie;
-var CookieJar = tough.CookieJar;
-
-function readJson(filePath) {
-  filePath = path.join(__dirname, filePath);
-  return JSON.parse(fs.readFileSync(filePath).toString());
-}
-
-function setGetCookieVows() {
-  var theVows = {};
-  var data = readJson('./ietf_data/parser.json');
-
-  data.forEach(function (testCase) {
-    theVows[testCase.test] = function () {
-      var jar = new CookieJar();
-      var expected = testCase['sent']
-      var sentFrom = 'http://home.example.org/cookie-parser?' + testCase.test;
-      var sentTo = testCase['sent-to'] ?
-                   url.resolve('http://home.example.org', testCase['sent-to']) :
-                   'http://home.example.org/cookie-parser-result?' + testCase.test;
-
-      testCase['received'].forEach(function (cookieStr) {
-        jar.setCookieSync(cookieStr, sentFrom, {ignoreError: true});
-      });
-
-      var actual = jar.getCookiesSync(sentTo,{sort:true});
-
-      assert.strictEqual(actual.length, expected.length);
-
-      actual.forEach(function (actualCookie, idx) {
-        var expectedCookie = expected[idx];
-        assert.strictEqual(actualCookie.key, expectedCookie.name);
-        assert.strictEqual(actualCookie.value, expectedCookie.value);
-      });
-    };
-  });
-
-  return {'Set/get cookie tests': theVows};
-}
-
-function dateVows() {
-  var theVows = {};
-
-  [
-    './ietf_data/dates/bsd-examples.json',
-    './ietf_data/dates/examples.json'
-  ].forEach(function (filePath) {
-      var data = readJson(filePath);
-      var fileName = path.basename(filePath);
-
-      data.forEach(function (testCase) {
-        theVows[fileName + ' : ' + testCase.test] = function () {
-          var actual = tough.parseDate(testCase.test);
-          actual = actual ? actual.toUTCString() : null;
-          assert.strictEqual(actual, testCase.expected);
-        };
-      });
-    });
-
-  return {'Date': theVows};
-}
-
-vows
-  .describe('IETF http state tests')
-  .addBatch(setGetCookieVows())
-  .addBatch(dateVows())
-  .export(module);
diff --git a/deps/npm/node_modules/tough-cookie/test/jar_serialization_test.js b/deps/npm/node_modules/tough-cookie/test/jar_serialization_test.js
deleted file mode 100644
index 277c90c8f49185..00000000000000
--- a/deps/npm/node_modules/tough-cookie/test/jar_serialization_test.js
+++ /dev/null
@@ -1,348 +0,0 @@
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-'use strict';
-var vows = require('vows');
-var assert = require('assert');
-var tough = require('../lib/cookie');
-var Cookie = tough.Cookie;
-var CookieJar = tough.CookieJar;
-var Store = tough.Store;
-var MemoryCookieStore = tough.MemoryCookieStore;
-var VERSION = require('../package.json').version;
-
-var domains = ['example.com','www.example.com','example.net'];
-var paths = ['/','/foo','/foo/bar'];
-
-var isInteger = Number.isInteger || function(value) {
-  // Node 0.10 (still supported) doesn't have Number.isInteger
-  // from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/isInteger
-  return typeof value === "number" &&
-    isFinite(value) &&
-    Math.floor(value) === value;
-};
-
-function setUp(context) {
-  context.now = new Date();
-  context.nowISO = context.now.toISOString();
-  context.expires = new Date(context.now.getTime() + 86400000);
-
-  var c, domain;
-  context.jar = new CookieJar();
-
-  context.totalCookies = 0;
-
-  // Do paths first since the MemoryCookieStore index is domain at the top
-  // level. This should cause the preservation of creation order in
-  // getAllCookies to be exercised.
-  for (var i = 0; i<paths.length; i++) {
-    var path = paths[i];
-    for (var j = 0; j<domains.length; j++) {
-      domain = domains[j];
-      c = new Cookie({
-        expires: context.expires,
-        domain: domain,
-        path: path,
-        key: 'key',
-        value: 'value'+j+i
-      });
-      context.jar.setCookieSync(c, 'http://'+domain+'/', {now: context.now});
-      context.totalCookies++;
-    }
-  }
-
-  // corner cases
-  domain = 'example.com';
-  var cornerCases = [
-    { expires: 'Infinity', key: 'infExp', value: 'infExp' },
-    { maxAge: 3600, key: 'max', value: 'max' },
-    { expires: context.expires, key: 'flags', value: 'flags',
-      secure: true, httpOnly: true },
-    { expires: context.expires, key: 'honly', value: 'honly',
-      hostOnly: true, domain: 'www.example.org' },
-  ];
-
-  for (var i = 0; i<cornerCases.length; i++) {
-    cornerCases[i].domain = cornerCases[i].domain || 'example.org';
-    cornerCases[i].path = '/';
-    c = new Cookie(cornerCases[i]);
-    context.jar.setCookieSync(c, 'https://www.example.org/', {now: context.now});
-    context.totalCookies++;
-  }
-}
-
-function checkMetadata(serialized) {
-  assert.notEqual(serialized, null);
-  assert.isObject(serialized);
-  assert.equal(serialized.version, 'tough-cookie@'+VERSION);
-  assert.equal(serialized.storeType, 'MemoryCookieStore');
-  assert.typeOf(serialized.rejectPublicSuffixes, 'boolean');
-  assert.isArray(serialized.cookies);
-}
-
-var serializedCookiePropTypes = {
-  'key': 'string',
-  'value': 'string',
-  'expires': 'isoDate', // if "Infinity" it's supposed to be missing
-  'maxAge': 'intOrInf',
-  'domain': 'string',
-  'path': 'string',
-  'secure': 'boolean',
-  'httpOnly': 'boolean',
-  'extensions': 'array', // of strings, technically
-  'hostOnly': 'boolean',
-  'pathIsDefault': 'boolean',
-  'creation': 'isoDate',
-  'lastAccessed': 'isoDate'
-};
-
-function validateSerializedCookie(cookie) {
-  assert.isObject(cookie);
-  assert.isFalse(cookie instanceof Cookie);
-
-  Object.keys(cookie).forEach(function(prop) {
-    var type = serializedCookiePropTypes[prop];
-    switch(type) {
-    case 'string':
-    case 'boolean':
-    case 'array':
-    case 'number':
-      assert.typeOf(cookie[prop], type);
-      break;
-
-    case 'intOrInf':
-      if (cookie[prop] === 'Infinity' || cookie[prop] === '-Infinity') {
-        assert(true);
-      } else {
-        assert(isInteger(cookie[prop]),
-               "serialized property isn't integer: "+prop);
-      }
-      break;
-
-    case 'isoDate':
-      // rather than a regexp, assert it's parsable and equal
-      var parsed = Date.parse(cookie[prop]);
-      assert(parsed, 'could not parse serialized date property');
-      // assert.equals(cookie[prop], parsed.toISOString());
-      break;
-
-    default:
-      assert.fail("unexpected serialized property: "+prop);
-    }
-  });
-
-}
-
-vows
-  .describe('CookieJar serialization')
-  .addBatch({
-    "Assumptions:": {
-      "serializableProperties all accounted for": function() {
-        var actualKeys = Cookie.serializableProperties.concat([]); // copy
-        actualKeys.sort();
-        var expectedKeys = Object.keys(serializedCookiePropTypes);
-        expectedKeys.sort();
-        assert.deepEqual(actualKeys, expectedKeys);
-      }
-    }
-  })
-  .addBatch({
-    "For Stores without getAllCookies": {
-      topic: function() {
-        var store = new Store();
-        store.synchronous = true;
-        var jar = new CookieJar(store);
-        return jar;
-      },
-      "Cannot call toJSON": function(jar) {
-        assert.throws(function() {
-          jar.toJSON();
-        }, 'getAllCookies is not implemented (therefore jar cannot be serialized)');
-      }
-    }
-  })
-  .addBatch({
-    "For async stores": {
-      topic: function() {
-        var store = new MemoryCookieStore();
-        store.synchronous = false; // pretend it's async
-        var jar = new CookieJar(store);
-        return jar;
-      },
-      "Cannot call toJSON": function(jar) {
-        assert.throws(function() {
-          jar.toJSON();
-        }, 'CookieJar store is not synchronous; use async API instead.');
-      }
-    }
-  })
-  .addBatch({
-    "With a small store": {
-      topic: function() {
-        var now = this.now = new Date();
-        this.jar = new CookieJar();
-        // domain cookie with custom extension
-        var cookie = Cookie.parse('sid=one; domain=example.com; path=/; fubar');
-        this.jar.setCookieSync(cookie, 'http://example.com/', {now: this.now});
-
-        cookie = Cookie.parse('sid=two; domain=example.net; path=/; fubar');
-        this.jar.setCookieSync(cookie, 'http://example.net/', {now: this.now});
-
-        return this.jar;
-      },
-
-      "serialize synchronously": {
-        topic: function(jar) {
-          return jar.serializeSync();
-        },
-        "it gives a serialization with the two cookies": function(data) {
-          checkMetadata(data);
-          assert.equal(data.cookies.length, 2);
-          data.cookies.forEach(function(cookie) {
-            validateSerializedCookie(cookie);
-          });
-        },
-        "then deserialize": {
-          topic: function(data) {
-            return CookieJar.deserializeSync(data);
-          },
-          "memstores are identical": function(newJar) {
-            assert.deepEqual(this.jar.store, newJar.store);
-          }
-        }
-      },
-
-      "serialize asynchronously": {
-        topic: function(jar) {
-          jar.serialize(this.callback);
-        },
-        "it gives a serialization with the two cookies": function(data) {
-          checkMetadata(data);
-          assert.equal(data.cookies.length, 2);
-          data.cookies.forEach(function(cookie) {
-            validateSerializedCookie(cookie);
-          });
-        },
-        "then deserialize": {
-          topic: function(data) {
-            CookieJar.deserialize(data, this.callback);
-          },
-          "memstores are identical": function(newJar) {
-            assert.deepEqual(this.jar.store, newJar.store);
-          }
-        }
-      }
-    }
-  })
-  .addBatch({
-    "With a moderately-sized store": {
-      topic: function() {
-        setUp(this);
-        this.jar.serialize(this.callback);
-      },
-      "has expected metadata": function(err,jsonObj) {
-        assert.isNull(err);
-        assert.equal(jsonObj.version, 'tough-cookie@'+VERSION);
-        assert.isTrue(jsonObj.rejectPublicSuffixes);
-        assert.equal(jsonObj.storeType, 'MemoryCookieStore');
-      },
-      "has a bunch of objects as 'raw' cookies": function(jsonObj) {
-        assert.isArray(jsonObj.cookies);
-        assert.equal(jsonObj.cookies.length, this.totalCookies);
-
-        jsonObj.cookies.forEach(function(cookie) {
-          validateSerializedCookie(cookie);
-
-          if (cookie.key === 'key') {
-            assert.match(cookie.value, /^value\d\d/);
-          }
-
-          if (cookie.key === 'infExp' || cookie.key === 'max') {
-            assert.isUndefined(cookie.expires);
-          } else {
-            assert.strictEqual(cookie.expires, this.expires.toISOString())
-          }
-
-          if (cookie.key === 'max') {
-            assert.strictEqual(cookie.maxAge, 3600);
-          } else {
-            assert.isUndefined(cookie.maxAge);
-          }
-
-          assert.equal(cookie.hostOnly, cookie.key === 'honly');
-
-          if (cookie.key === 'flags') {
-            assert.isTrue(cookie.secure);
-            assert.isTrue(cookie.httpOnly);
-          } else {
-            assert.isUndefined(cookie.secure);
-            assert.isUndefined(cookie.httpOnly);
-          }
-
-          assert.strictEqual(cookie.creation, this.nowISO);
-          assert.strictEqual(cookie.lastAccessed, this.nowISO);
-
-        }, this);
-      },
-
-      "then taking it for a round-trip": {
-        topic: function(jsonObj) {
-          CookieJar.deserialize(jsonObj, this.callback);
-        },
-        "memstore index is identical": function(err,newJar) {
-          assert.deepEqual(newJar.store.idx, this.jar.store.idx);
-        },
-        "then spot-check retrieval": {
-          topic: function(newJar) {
-            newJar.getCookies('http://example.org/', this.callback);
-          },
-          "gets expected cookies": function(results) {
-            assert.isArray(results);
-            assert.equal(results.length, 2);
-
-            results.forEach(function(cookie) {
-              assert.instanceOf(cookie, Cookie);
-
-              if (cookie.key === 'infExp') {
-                assert.strictEqual(cookie.expires, "Infinity");
-                assert.strictEqual(cookie.TTL(this.now), Infinity);
-              } else if (cookie.key === 'max') {
-                assert.strictEqual(cookie.TTL(this.now), 3600*1000);
-              } else {
-                assert.fail('Unexpected cookie key: '+cookie.key);
-              }
-            }.bind(this));
-          }
-        }
-      }
-    }
-  })
-  .export(module);
diff --git a/deps/npm/node_modules/tough-cookie/test/lifetime_test.js b/deps/npm/node_modules/tough-cookie/test/lifetime_test.js
deleted file mode 100644
index e66a22b266a9fa..00000000000000
--- a/deps/npm/node_modules/tough-cookie/test/lifetime_test.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-'use strict';
-var vows = require('vows');
-var assert = require('assert');
-var tough = require('../lib/cookie');
-var Cookie = tough.Cookie;
-
-vows
-  .describe('Lifetime')
-  .addBatch({
-    "TTL with max-age": function () {
-      var c = new Cookie();
-      c.maxAge = 123;
-      assert.equal(c.TTL(), 123000);
-      assert.equal(c.expiryTime(new Date(9000000)), 9123000);
-    },
-    "TTL with zero max-age": function () {
-      var c = new Cookie();
-      c.key = 'a';
-      c.value = 'b';
-      c.maxAge = 0; // should be treated as "earliest representable"
-      assert.equal(c.TTL(), 0);
-      assert.equal(c.expiryTime(new Date(9000000)), -Infinity);
-      assert.ok(!c.validate()); // not valid, really: non-zero-digit *DIGIT
-    },
-    "TTL with negative max-age": function () {
-      var c = new Cookie();
-      c.key = 'a';
-      c.value = 'b';
-      c.maxAge = -1; // should be treated as "earliest representable"
-      assert.equal(c.TTL(), 0);
-      assert.equal(c.expiryTime(new Date(9000000)), -Infinity);
-      assert.ok(!c.validate()); // not valid, really: non-zero-digit *DIGIT
-    },
-    "TTL with max-age and expires": function () {
-      var c = new Cookie();
-      c.maxAge = 123;
-      c.expires = new Date(Date.now() + 9000);
-      assert.equal(c.TTL(), 123000);
-      assert.ok(c.isPersistent());
-    },
-    "TTL with expires": function () {
-      var c = new Cookie();
-      var now = Date.now();
-      c.expires = new Date(now + 9000);
-      assert.equal(c.TTL(now), 9000);
-      assert.equal(c.expiryTime(), c.expires.getTime());
-    },
-    "TTL with old expires": function () {
-      var c = new Cookie();
-      c.setExpires('17 Oct 2010 00:00:00 GMT');
-      assert.ok(c.TTL() < 0);
-      assert.ok(c.isPersistent());
-    },
-    "default TTL": {
-      topic: function () {
-        return new Cookie();
-      },
-      "is Infinite-future": function (c) {
-        assert.equal(c.TTL(), Infinity)
-      },
-      "is a 'session' cookie": function (c) {
-        assert.ok(!c.isPersistent())
-      }
-    }
-  })
-  .export(module);
diff --git a/deps/npm/node_modules/tough-cookie/test/parsing_test.js b/deps/npm/node_modules/tough-cookie/test/parsing_test.js
deleted file mode 100644
index cb37c6367ab22e..00000000000000
--- a/deps/npm/node_modules/tough-cookie/test/parsing_test.js
+++ /dev/null
@@ -1,294 +0,0 @@
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-'use strict';
-var vows = require('vows');
-var assert = require('assert');
-var tough = require('../lib/cookie');
-var Cookie = tough.Cookie;
-
-vows
-  .describe('Parsing')
-  .addBatch({
-    "simple": {
-      topic: function() {
-        return Cookie.parse('a=bcd') || null;
-      },
-      "parsed": function(c) { assert.ok(c) },
-      "key": function(c) { assert.equal(c.key, 'a') },
-      "value": function(c) { assert.equal(c.value, 'bcd') },
-      "no path": function(c) { assert.equal(c.path, null) },
-      "no domain": function(c) { assert.equal(c.domain, null) },
-      "no extensions": function(c) { assert.ok(!c.extensions) }
-    },
-    "with expiry": {
-      topic: function() {
-        return Cookie.parse('a=bcd; Expires=Tue, 18 Oct 2011 07:05:03 GMT') || null;
-      },
-      "parsed": function(c) { assert.ok(c) },
-      "key": function(c) { assert.equal(c.key, 'a') },
-      "value": function(c) { assert.equal(c.value, 'bcd') },
-      "has expires": function(c) {
-        assert.ok(c.expires !== Infinity, 'expiry is infinite when it shouldn\'t be');
-        assert.equal(c.expires.getTime(), 1318921503000);
-      }
-    },
-    "with expiry and path": {
-      topic: function() {
-        return Cookie.parse('abc="xyzzy!"; Expires=Tue, 18 Oct 2011 07:05:03 GMT; Path=/aBc') || null;
-      },
-      "parsed": function(c) { assert.ok(c) },
-      "key": function(c) { assert.equal(c.key, 'abc') },
-      "value": function(c) { assert.equal(c.value, '"xyzzy!"') },
-      "has expires": function(c) {
-        assert.ok(c.expires !== Infinity, 'expiry is infinite when it shouldn\'t be');
-        assert.equal(c.expires.getTime(), 1318921503000);
-      },
-      "has path": function(c) { assert.equal(c.path, '/aBc'); },
-      "no httponly or secure": function(c) {
-        assert.ok(!c.httpOnly);
-        assert.ok(!c.secure);
-      }
-    },
-    "with everything": {
-      topic: function() {
-        return Cookie.parse('abc="xyzzy!"; Expires=Tue, 18 Oct 2011 07:05:03 GMT; Path=/aBc; Domain=example.com; Secure; HTTPOnly; Max-Age=1234; Foo=Bar; Baz') || null;
-      },
-      "parsed": function(c) { assert.ok(c) },
-      "key": function(c) { assert.equal(c.key, 'abc') },
-      "value": function(c) { assert.equal(c.value, '"xyzzy!"') },
-      "has expires": function(c) {
-        assert.ok(c.expires !== Infinity, 'expiry is infinite when it shouldn\'t be');
-        assert.equal(c.expires.getTime(), 1318921503000);
-      },
-      "has path": function(c) { assert.equal(c.path, '/aBc'); },
-      "has domain": function(c) { assert.equal(c.domain, 'example.com'); },
-      "has httponly": function(c) { assert.equal(c.httpOnly, true); },
-      "has secure": function(c) { assert.equal(c.secure, true); },
-      "has max-age": function(c) { assert.equal(c.maxAge, 1234); },
-      "has extensions": function(c) {
-        assert.ok(c.extensions);
-        assert.equal(c.extensions[0], 'Foo=Bar');
-        assert.equal(c.extensions[1], 'Baz');
-      }
-    },
-    "invalid expires": function() {
-      var c = Cookie.parse("a=b; Expires=xyzzy");
-      assert.ok(c);
-      assert.equal(c.expires, Infinity);
-    },
-    "zero max-age": function() {
-      var c = Cookie.parse("a=b; Max-Age=0");
-      assert.ok(c);
-      assert.equal(c.maxAge, 0);
-    },
-    "negative max-age": function() {
-      var c = Cookie.parse("a=b; Max-Age=-1");
-      assert.ok(c);
-      assert.equal(c.maxAge, -1);
-    },
-    "empty domain": function() {
-      var c = Cookie.parse("a=b; domain=");
-      assert.ok(c);
-      assert.equal(c.domain, null);
-    },
-    "dot domain": function() {
-      var c = Cookie.parse("a=b; domain=.");
-      assert.ok(c);
-      assert.equal(c.domain, null);
-    },
-    "uppercase domain": function() {
-      var c = Cookie.parse("a=b; domain=EXAMPLE.COM");
-      assert.ok(c);
-      assert.equal(c.domain, 'example.com');
-    },
-    "trailing dot in domain": {
-      topic: function() {
-        return Cookie.parse("a=b; Domain=example.com.", true) || null;
-      },
-      "has the domain": function(c) { assert.equal(c.domain,"example.com.") },
-      "but doesn't validate": function(c) { assert.equal(c.validate(),false) }
-    },
-    "empty path": function() {
-      var c = Cookie.parse("a=b; path=");
-      assert.ok(c);
-      assert.equal(c.path, null);
-    },
-    "no-slash path": function() {
-      var c = Cookie.parse("a=b; path=xyzzy");
-      assert.ok(c);
-      assert.equal(c.path, null);
-    },
-    "trailing semi-colons after path": {
-      topic: function () {
-        return [
-          "a=b; path=/;",
-          "c=d;;;;"
-        ];
-      },
-      "strips semi-colons": function (t) {
-        var c1 = Cookie.parse(t[0]);
-        var c2 = Cookie.parse(t[1]);
-        assert.ok(c1);
-        assert.ok(c2);
-        assert.equal(c1.path, '/');
-      }
-    },
-    "secure-with-value": function() {
-      var c = Cookie.parse("a=b; Secure=xyzzy");
-      assert.ok(c);
-      assert.equal(c.secure, true);
-    },
-    "httponly-with-value": function() {
-      var c = Cookie.parse("a=b; HttpOnly=xyzzy");
-      assert.ok(c);
-      assert.equal(c.httpOnly, true);
-    },
-    "garbage": {
-      topic: function() {
-        return Cookie.parse("\x08", true) || null;
-      },
-      "doesn't parse": function(c) { assert.equal(c,null) }
-    },
-    "public suffix domain": {
-      topic: function() {
-        return Cookie.parse("a=b; domain=kyoto.jp", true) || null;
-      },
-      "parses fine": function(c) {
-        assert.ok(c);
-        assert.equal(c.domain, 'kyoto.jp');
-      },
-      "but fails validation": function(c) {
-        assert.ok(c);
-        assert.ok(!c.validate());
-      }
-    },
-    "public suffix foonet.net": {
-      "top level": {
-        topic: function() {
-          return Cookie.parse("a=b; domain=foonet.net") || null;
-        },
-        "parses and is valid": function(c) {
-          assert.ok(c);
-          assert.equal(c.domain, 'foonet.net');
-          assert.ok(c.validate());
-        }
-      },
-      "www": {
-        topic: function() {
-          return Cookie.parse("a=b; domain=www.foonet.net") || null;
-        },
-        "parses and is valid": function(c) {
-          assert.ok(c);
-          assert.equal(c.domain, 'www.foonet.net');
-          assert.ok(c.validate());
-        }
-      },
-      "with a dot": {
-        topic: function() {
-          return Cookie.parse("a=b; domain=.foonet.net") || null;
-        },
-        "parses and is valid": function(c) {
-          assert.ok(c);
-          assert.equal(c.domain, 'foonet.net');
-          assert.ok(c.validate());
-        }
-      }
-    },
-    "Ironically, Google 'GAPS' cookie has very little whitespace": {
-      topic: function() {
-        return Cookie.parse("GAPS=1:A1aaaaAaAAa1aaAaAaaAAAaaa1a11a:aaaAaAaAa-aaaA1-;Path=/;Expires=Thu, 17-Apr-2014 02:12:29 GMT;Secure;HttpOnly");
-      },
-      "parsed": function(c) { assert.ok(c) },
-      "key": function(c) { assert.equal(c.key, 'GAPS') },
-      "value": function(c) { assert.equal(c.value, '1:A1aaaaAaAAa1aaAaAaaAAAaaa1a11a:aaaAaAaAa-aaaA1-') },
-      "path": function(c) {
-        assert.notEqual(c.path, '/;Expires'); // BUG
-        assert.equal(c.path, '/');
-      },
-      "expires": function(c) {
-        assert.notEqual(c.expires, Infinity);
-        assert.equal(c.expires.getTime(), 1397700749000);
-      },
-      "secure": function(c) { assert.ok(c.secure) },
-      "httponly": function(c) { assert.ok(c.httpOnly) }
-    },
-    "lots of equal signs": {
-      topic: function() {
-        return Cookie.parse("queryPref=b=c&d=e; Path=/f=g; Expires=Thu, 17 Apr 2014 02:12:29 GMT; HttpOnly");
-      },
-      "parsed": function(c) { assert.ok(c) },
-      "key": function(c) { assert.equal(c.key, 'queryPref') },
-      "value": function(c) { assert.equal(c.value, 'b=c&d=e') },
-      "path": function(c) {
-        assert.equal(c.path, '/f=g');
-      },
-      "expires": function(c) {
-        assert.notEqual(c.expires, Infinity);
-        assert.equal(c.expires.getTime(), 1397700749000);
-      },
-      "httponly": function(c) { assert.ok(c.httpOnly) }
-    },
-    "spaces in value": {
-      topic: function() {
-        return Cookie.parse('a=one two three',false) || null;
-      },
-      "parsed": function(c) { assert.ok(c) },
-      "key": function(c) { assert.equal(c.key, 'a') },
-      "value": function(c) { assert.equal(c.value, 'one two three') },
-      "no path": function(c) { assert.equal(c.path, null) },
-      "no domain": function(c) { assert.equal(c.domain, null) },
-      "no extensions": function(c) { assert.ok(!c.extensions) }
-    },
-    "quoted spaces in value": {
-      topic: function() {
-        return Cookie.parse('a="one two three"',false) || null;
-      },
-      "parsed": function(c) { assert.ok(c) },
-      "key": function(c) { assert.equal(c.key, 'a') },
-      "value": function(c) { assert.equal(c.value, '"one two three"') },
-      "no path": function(c) { assert.equal(c.path, null) },
-      "no domain": function(c) { assert.equal(c.domain, null) },
-      "no extensions": function(c) { assert.ok(!c.extensions) }
-    },
-    "non-ASCII in value": {
-      topic: function() {
-        return Cookie.parse('farbe=weiß',false) || null;
-      },
-      "parsed": function(c) { assert.ok(c) },
-      "key": function(c) { assert.equal(c.key, 'farbe') },
-      "value": function(c) { assert.equal(c.value, 'weiß') },
-      "no path": function(c) { assert.equal(c.path, null) },
-      "no domain": function(c) { assert.equal(c.domain, null) },
-      "no extensions": function(c) { assert.ok(!c.extensions) }
-    }
-  })
-  .export(module);
diff --git a/deps/npm/node_modules/tough-cookie/test/regression_test.js b/deps/npm/node_modules/tough-cookie/test/regression_test.js
deleted file mode 100644
index 4edb60972449df..00000000000000
--- a/deps/npm/node_modules/tough-cookie/test/regression_test.js
+++ /dev/null
@@ -1,143 +0,0 @@
-/*!
- * Copyright (c) 2015, Salesforce.com, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Salesforce.com nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-'use strict';
-var vows = require('vows');
-var assert = require('assert');
-var async = require('async');
-var tough = require('../lib/cookie');
-var Cookie = tough.Cookie;
-var CookieJar = tough.CookieJar;
-
-var atNow = Date.now();
-
-function at(offset) {
-  return {now: new Date(atNow + offset)};
-}
-
-vows
-  .describe('Regression tests')
-  .addBatch({
-    "Issue 1": {
-      topic: function () {
-        var cj = new CookieJar();
-        cj.setCookie('hello=world; path=/some/path/', 'http://domain/some/path/file', function (err, cookie) {
-          this.callback(err, {cj: cj, cookie: cookie});
-        }.bind(this));
-      },
-      "stored a cookie": function (t) {
-        assert.ok(t.cookie);
-      },
-      "getting it back": {
-        topic: function (t) {
-          t.cj.getCookies('http://domain/some/path/file', function (err, cookies) {
-            this.callback(err, {cj: t.cj, cookies: cookies || []});
-          }.bind(this));
-        },
-        "got one cookie": function (t) {
-          assert.lengthOf(t.cookies, 1);
-        },
-        "it's the right one": function (t) {
-          var c = t.cookies[0];
-          assert.equal(c.key, 'hello');
-          assert.equal(c.value, 'world');
-        }
-      }
-    }
-  })
-  .addBatch({
-    "trailing semi-colon set into cj": {
-      topic: function () {
-        var cb = this.callback;
-        var cj = new CookieJar();
-        var ex = 'http://www.example.com';
-        var tasks = [];
-        tasks.push(function (next) {
-          cj.setCookie('broken_path=testme; path=/;', ex, at(-1), next);
-        });
-        tasks.push(function (next) {
-          cj.setCookie('b=2; Path=/;;;;', ex, at(-1), next);
-        });
-        async.parallel(tasks, function (err, cookies) {
-          cb(null, {
-            cj: cj,
-            cookies: cookies
-          });
-        });
-      },
-      "check number of cookies": function (t) {
-        assert.lengthOf(t.cookies, 2, "didn't set");
-      },
-      "check *broken_path* was set properly": function (t) {
-        assert.equal(t.cookies[0].key, "broken_path");
-        assert.equal(t.cookies[0].value, "testme");
-        assert.equal(t.cookies[0].path, "/");
-      },
-      "check *b* was set properly": function (t) {
-        assert.equal(t.cookies[1].key, "b");
-        assert.equal(t.cookies[1].value, "2");
-        assert.equal(t.cookies[1].path, "/");
-      },
-      "retrieve the cookie": {
-        topic: function (t) {
-          var cb = this.callback;
-          t.cj.getCookies('http://www.example.com', {}, function (err, cookies) {
-            t.cookies = cookies;
-            cb(err, t);
-          });
-        },
-        "get the cookie": function (t) {
-          assert.lengthOf(t.cookies, 2);
-          assert.equal(t.cookies[0].key, 'broken_path');
-          assert.equal(t.cookies[0].value, 'testme');
-          assert.equal(t.cookies[1].key, "b");
-          assert.equal(t.cookies[1].value, "2");
-          assert.equal(t.cookies[1].path, "/");
-        }
-      }
-    }
-  })
-  .addBatch({
-    "tough-cookie throws exception on malformed URI (GH-32)": {
-      topic: function () {
-        var url = "http://www.example.com/?test=100%";
-        var cj = new CookieJar();
-
-        cj.setCookieSync("Test=Test", url);
-
-        return cj.getCookieStringSync(url);
-      },
-      "cookies are set": function (cookieStr) {
-        assert.strictEqual(cookieStr, "Test=Test");
-      }
-    }
-  })
-  .export(module);
diff --git a/deps/npm/node_modules/tunnel-agent/package.json b/deps/npm/node_modules/tunnel-agent/package.json
deleted file mode 100644
index 67f840442a48a1..00000000000000
--- a/deps/npm/node_modules/tunnel-agent/package.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "_args": [
-    [
-      "tunnel-agent@~0.4.0",
-      "/Users/rebecca/code/npm/node_modules/request"
-    ]
-  ],
-  "_from": "tunnel-agent@>=0.4.0 <0.5.0",
-  "_id": "tunnel-agent@0.4.1",
-  "_inCache": true,
-  "_location": "/tunnel-agent",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "simeonvelichkov@gmail.com",
-    "name": "simov"
-  },
-  "_npmVersion": "2.11.2",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "tunnel-agent",
-    "raw": "tunnel-agent@~0.4.0",
-    "rawSpec": "~0.4.0",
-    "scope": null,
-    "spec": ">=0.4.0 <0.5.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/request"
-  ],
-  "_resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz",
-  "_shasum": "bbeecff4d679ce753db9462761a88dfcec3c5ab3",
-  "_shrinkwrap": null,
-  "_spec": "tunnel-agent@~0.4.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/request",
-  "author": {
-    "email": "mikeal.rogers@gmail.com",
-    "name": "Mikeal Rogers",
-    "url": "http://www.futurealoof.com"
-  },
-  "bugs": {
-    "url": "https://github.com/mikeal/tunnel-agent/issues"
-  },
-  "dependencies": {},
-  "description": "HTTP proxy tunneling agent. Formerly part of mikeal/request, now a standalone module.",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "bbeecff4d679ce753db9462761a88dfcec3c5ab3",
-    "tarball": "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
-  },
-  "engines": {
-    "node": "*"
-  },
-  "gitHead": "912a7a6d00e10ec76baf9c9369de280fa5badef3",
-  "homepage": "https://github.com/mikeal/tunnel-agent#readme",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "mikeal",
-      "email": "mikeal.rogers@gmail.com"
-    },
-    {
-      "name": "nylen",
-      "email": "jnylen@gmail.com"
-    },
-    {
-      "name": "fredkschott",
-      "email": "fkschott@gmail.com"
-    },
-    {
-      "name": "simov",
-      "email": "simeonvelichkov@gmail.com"
-    }
-  ],
-  "name": "tunnel-agent",
-  "optionalDependencies": {},
-  "repository": {
-    "url": "git+https://github.com/mikeal/tunnel-agent.git"
-  },
-  "scripts": {},
-  "version": "0.4.1"
-}
diff --git a/deps/npm/node_modules/typedarray/package.json b/deps/npm/node_modules/typedarray/package.json
deleted file mode 100644
index 3d8667a09ce9df..00000000000000
--- a/deps/npm/node_modules/typedarray/package.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "_args": [
-    [
-      "typedarray@~0.0.5",
-      "/Users/rebecca/code/npm/node_modules/concat-stream"
-    ]
-  ],
-  "_from": "typedarray@>=0.0.5 <0.1.0",
-  "_id": "typedarray@0.0.6",
-  "_inCache": true,
-  "_location": "/typedarray",
-  "_npmUser": {
-    "email": "mail@substack.net",
-    "name": "substack"
-  },
-  "_npmVersion": "1.4.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "typedarray",
-    "raw": "typedarray@~0.0.5",
-    "rawSpec": "~0.0.5",
-    "scope": null,
-    "spec": ">=0.0.5 <0.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/concat-stream"
-  ],
-  "_resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-  "_shasum": "867ac74e3864187b1d3d47d996a78ec5c8830777",
-  "_shrinkwrap": null,
-  "_spec": "typedarray@~0.0.5",
-  "_where": "/Users/rebecca/code/npm/node_modules/concat-stream",
-  "author": {
-    "email": "mail@substack.net",
-    "name": "James Halliday",
-    "url": "http://substack.net"
-  },
-  "bugs": {
-    "url": "https://github.com/substack/typedarray/issues"
-  },
-  "dependencies": {},
-  "description": "TypedArray polyfill for old browsers",
-  "devDependencies": {
-    "tape": "~2.3.2"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "867ac74e3864187b1d3d47d996a78ec5c8830777",
-    "tarball": "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
-  },
-  "homepage": "https://github.com/substack/typedarray",
-  "keywords": [
-    "ArrayBuffer",
-    "DataView",
-    "Float32Array",
-    "Float64Array",
-    "Int16Array",
-    "Int32Array",
-    "Int8Array",
-    "Uint16Array",
-    "Uint32Array",
-    "Uint8Array",
-    "Uint8ClampedArray",
-    "array",
-    "polyfill",
-    "typed"
-  ],
-  "license": "MIT",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "substack",
-      "email": "mail@substack.net"
-    }
-  ],
-  "name": "typedarray",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/substack/typedarray.git"
-  },
-  "scripts": {
-    "test": "tape test/*.js test/server/*.js"
-  },
-  "testling": {
-    "browsers": [
-      "android-browser/4.2..latest",
-      "chrome/22..latest",
-      "chrome/canary",
-      "firefox/16..latest",
-      "firefox/nightly",
-      "ie/6..latest",
-      "ipad/6.0..latest",
-      "iphone/6.0..latest",
-      "opera/12..latest",
-      "opera/next",
-      "safari/5.1..latest"
-    ],
-    "files": "test/*.js"
-  },
-  "version": "0.0.6"
-}
diff --git a/deps/npm/node_modules/uid-number/package.json b/deps/npm/node_modules/uid-number/package.json
index 2d1af9ce8d7508..a83a479f469868 100644
--- a/deps/npm/node_modules/uid-number/package.json
+++ b/deps/npm/node_modules/uid-number/package.json
@@ -1,72 +1,49 @@
 {
-  "_args": [
-    [
-      "uid-number@0.0.6",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "uid-number@0.0.6",
-  "_id": "uid-number@0.0.6",
-  "_inCache": true,
-  "_location": "/uid-number",
-  "_nodeVersion": "0.10.31",
-  "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
-  },
-  "_npmVersion": "2.1.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "uid-number",
-    "raw": "uid-number@0.0.6",
-    "rawSpec": "0.0.6",
-    "scope": null,
-    "spec": "0.0.6",
-    "type": "version"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
-  "_shasum": "0ea10e8035e8eb5b8e4449f06da1c730663baa81",
-  "_shrinkwrap": null,
-  "_spec": "uid-number@0.0.6",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/uid-number/issues"
+  "name": "uid-number",
+  "description": "Convert a username/group name to a uid/gid number",
+  "version": "0.0.6",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/uid-number.git"
   },
+  "main": "uid-number.js",
   "dependencies": {},
-  "description": "Convert a username/group name to a uid/gid number",
   "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "0ea10e8035e8eb5b8e4449f06da1c730663baa81",
-    "tarball": "http://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
-  },
+  "optionalDependencies": {},
   "engines": {
     "node": "*"
   },
+  "license": "ISC",
   "gitHead": "aab48f5d6bda85794946b26d945d2ee452e0e9ab",
+  "bugs": {
+    "url": "https://github.com/isaacs/uid-number/issues"
+  },
   "homepage": "https://github.com/isaacs/uid-number",
-  "license": "ISC",
-  "main": "uid-number.js",
+  "_id": "uid-number@0.0.6",
+  "scripts": {},
+  "_shasum": "0ea10e8035e8eb5b8e4449f06da1c730663baa81",
+  "_from": "uid-number@0.0.6",
+  "_npmVersion": "2.1.3",
+  "_nodeVersion": "0.10.31",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "i@izs.me"
+  },
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "name": "uid-number",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/uid-number.git"
+  "dist": {
+    "shasum": "0ea10e8035e8eb5b8e4449f06da1c730663baa81",
+    "tarball": "http://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
   },
-  "scripts": {},
-  "version": "0.0.6"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
 }
diff --git a/deps/npm/node_modules/umask/package.json b/deps/npm/node_modules/umask/package.json
index c0c6fdc114aafe..ed84e346f110ca 100644
--- a/deps/npm/node_modules/umask/package.json
+++ b/deps/npm/node_modules/umask/package.json
@@ -1,78 +1,53 @@
 {
-  "_args": [
-    [
-      "umask@~1.1.0",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "umask@>=1.1.0 <1.2.0",
-  "_id": "umask@1.1.0",
-  "_inCache": true,
-  "_location": "/umask",
-  "_nodeVersion": "0.10.35",
-  "_npmUser": {
-    "email": "smikes@cubane.com",
-    "name": "smikes"
+  "name": "umask",
+  "version": "1.1.0",
+  "description": "convert umask from string <-> number",
+  "main": "index.js",
+  "scripts": {
+    "test": "lab -ct 100",
+    "lint": "jslint --terse --latest *.js test/*.js"
   },
-  "_npmVersion": "2.2.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "umask",
-    "raw": "umask@~1.1.0",
-    "rawSpec": "~1.1.0",
-    "scope": null,
-    "spec": ">=1.1.0 <1.2.0",
-    "type": "range"
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/smikes/umask.git"
   },
-  "_requiredBy": [
-    "/"
+  "keywords": [
+    "umask"
   ],
-  "_resolved": "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz",
-  "_shasum": "f29cebf01df517912bb58ff9c4e50fde8e33320d",
-  "_shrinkwrap": null,
-  "_spec": "umask@~1.1.0",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "smikes@cubane.com",
-    "name": "Sam Mikes"
+    "name": "Sam Mikes",
+    "email": "smikes@cubane.com"
   },
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/smikes/umask/issues"
   },
-  "dependencies": {},
-  "description": "convert umask from string <-> number",
+  "homepage": "https://github.com/smikes/umask",
   "devDependencies": {
     "code": "^1.2.1",
     "jslint": "^0.7.2",
     "lab": "^5.2.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "f29cebf01df517912bb58ff9c4e50fde8e33320d",
-    "tarball": "http://registry.npmjs.org/umask/-/umask-1.1.0.tgz"
-  },
   "gitHead": "63d821e4d0b06ef9a4b727c5fbe5976e9534d76e",
-  "homepage": "https://github.com/smikes/umask",
-  "keywords": [
-    "umask"
-  ],
-  "license": "MIT",
-  "main": "index.js",
+  "_id": "umask@1.1.0",
+  "_shasum": "f29cebf01df517912bb58ff9c4e50fde8e33320d",
+  "_from": "umask@>=1.1.0 <1.2.0",
+  "_npmVersion": "2.2.0",
+  "_nodeVersion": "0.10.35",
+  "_npmUser": {
+    "name": "smikes",
+    "email": "smikes@cubane.com"
+  },
   "maintainers": [
     {
       "name": "smikes",
       "email": "smikes@cubane.com"
     }
   ],
-  "name": "umask",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/smikes/umask.git"
-  },
-  "scripts": {
-    "lint": "jslint --terse --latest *.js test/*.js",
-    "test": "lab -ct 100"
+  "dist": {
+    "shasum": "f29cebf01df517912bb58ff9c4e50fde8e33320d",
+    "tarball": "http://registry.npmjs.org/umask/-/umask-1.1.0.tgz"
   },
-  "version": "1.1.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz"
 }
diff --git a/deps/npm/node_modules/unique-slug/.npmignore b/deps/npm/node_modules/unique-filename/node_modules/unique-slug/.npmignore
similarity index 100%
rename from deps/npm/node_modules/unique-slug/.npmignore
rename to deps/npm/node_modules/unique-filename/node_modules/unique-slug/.npmignore
diff --git a/deps/npm/node_modules/unique-slug/README.md b/deps/npm/node_modules/unique-filename/node_modules/unique-slug/README.md
similarity index 100%
rename from deps/npm/node_modules/unique-slug/README.md
rename to deps/npm/node_modules/unique-filename/node_modules/unique-slug/README.md
diff --git a/deps/npm/node_modules/unique-slug/index.js b/deps/npm/node_modules/unique-filename/node_modules/unique-slug/index.js
similarity index 100%
rename from deps/npm/node_modules/unique-slug/index.js
rename to deps/npm/node_modules/unique-filename/node_modules/unique-slug/index.js
diff --git a/deps/npm/node_modules/unique-slug/package.json b/deps/npm/node_modules/unique-filename/node_modules/unique-slug/package.json
similarity index 63%
rename from deps/npm/node_modules/unique-slug/package.json
rename to deps/npm/node_modules/unique-filename/node_modules/unique-slug/package.json
index 95923348210591..399b62129e8337 100644
--- a/deps/npm/node_modules/unique-slug/package.json
+++ b/deps/npm/node_modules/unique-filename/node_modules/unique-slug/package.json
@@ -1,74 +1,50 @@
 {
-  "_args": [
-    [
-      "unique-slug@^1.0.0",
-      "/Users/rebecca/code/npm/node_modules/unique-filename"
-    ]
-  ],
-  "_from": "unique-slug@>=1.0.0 <2.0.0",
-  "_id": "unique-slug@1.0.0",
-  "_inCache": true,
-  "_location": "/unique-slug",
-  "_nodeVersion": "1.6.2",
-  "_npmUser": {
-    "email": "me@re-becca.org",
-    "name": "iarna"
-  },
-  "_npmVersion": "2.7.6",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "unique-slug",
-    "raw": "unique-slug@^1.0.0",
-    "rawSpec": "^1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
+  "name": "unique-slug",
+  "version": "1.0.0",
+  "description": "Generate a unique character string suitible for use in files and URLs.",
+  "main": "index.js",
+  "scripts": {
+    "test": "standard && tap test"
   },
-  "_requiredBy": [
-    "/unique-filename"
-  ],
-  "_shasum": "4459d12416f576cc091a3deb19939ec99c735626",
-  "_shrinkwrap": null,
-  "_spec": "unique-slug@^1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/unique-filename",
+  "keywords": [],
   "author": {
-    "email": "me@re-becca.org",
     "name": "Rebecca Turner",
+    "email": "me@re-becca.org",
     "url": "http://re-becca.org"
   },
-  "bugs": {
-    "url": "https://github.com/iarna/unique-slug/issues"
-  },
-  "dependencies": {},
-  "description": "Generate a unique character string suitible for use in files and URLs.",
+  "license": "ISC",
   "devDependencies": {
     "standard": "^3.7.3",
     "tap": "^1.0.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "4459d12416f576cc091a3deb19939ec99c735626",
-    "tarball": "http://registry.npmjs.org/unique-slug/-/unique-slug-1.0.0.tgz"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/iarna/unique-slug.git"
   },
   "gitHead": "024b3bd3c0184550702c93f088822e3f38da5c17",
+  "bugs": {
+    "url": "https://github.com/iarna/unique-slug/issues"
+  },
   "homepage": "https://github.com/iarna/unique-slug",
-  "keywords": [],
-  "license": "ISC",
-  "main": "index.js",
+  "_id": "unique-slug@1.0.0",
+  "_shasum": "4459d12416f576cc091a3deb19939ec99c735626",
+  "_from": "unique-slug@>=1.0.0 <2.0.0",
+  "_npmVersion": "2.7.6",
+  "_nodeVersion": "1.6.2",
+  "_npmUser": {
+    "name": "iarna",
+    "email": "me@re-becca.org"
+  },
   "maintainers": [
     {
       "name": "iarna",
       "email": "me@re-becca.org"
     }
   ],
-  "name": "unique-slug",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/iarna/unique-slug.git"
-  },
-  "scripts": {
-    "test": "standard && tap test"
+  "dist": {
+    "shasum": "4459d12416f576cc091a3deb19939ec99c735626",
+    "tarball": "http://registry.npmjs.org/unique-slug/-/unique-slug-1.0.0.tgz"
   },
-  "version": "1.0.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-1.0.0.tgz"
 }
diff --git a/deps/npm/node_modules/unique-slug/test/index.js b/deps/npm/node_modules/unique-filename/node_modules/unique-slug/test/index.js
similarity index 100%
rename from deps/npm/node_modules/unique-slug/test/index.js
rename to deps/npm/node_modules/unique-filename/node_modules/unique-slug/test/index.js
diff --git a/deps/npm/node_modules/unique-filename/package.json b/deps/npm/node_modules/unique-filename/package.json
index 2b3f9a1b6c7e14..b8918905ef6e2a 100644
--- a/deps/npm/node_modules/unique-filename/package.json
+++ b/deps/npm/node_modules/unique-filename/package.json
@@ -1,76 +1,53 @@
 {
-  "_args": [
-    [
-      "unique-filename@~1.0.0",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "unique-filename@>=1.0.0 <1.1.0",
-  "_id": "unique-filename@1.0.0",
-  "_inCache": true,
-  "_location": "/unique-filename",
-  "_nodeVersion": "1.6.2",
-  "_npmUser": {
-    "email": "me@re-becca.org",
-    "name": "iarna"
+  "name": "unique-filename",
+  "version": "1.0.0",
+  "description": "Generate a unique filename for use in temporary directories or caches.",
+  "main": "index.js",
+  "scripts": {
+    "test": "standard && tap test"
   },
-  "_npmVersion": "2.7.6",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "unique-filename",
-    "raw": "unique-filename@~1.0.0",
-    "rawSpec": "~1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <1.1.0",
-    "type": "range"
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/iarna/unique-filename.git"
   },
-  "_requiredBy": [
-    "/"
-  ],
-  "_shasum": "0bee4219e192e86da3c4ffc0cc6e054d8634eab9",
-  "_shrinkwrap": null,
-  "_spec": "unique-filename@~1.0.0",
-  "_where": "/Users/rebecca/code/npm",
+  "keywords": [],
   "author": {
-    "email": "me@re-becca.org",
     "name": "Rebecca Turner",
+    "email": "me@re-becca.org",
     "url": "http://re-becca.org/"
   },
+  "license": "ISC",
   "bugs": {
     "url": "https://github.com/iarna/unique-filename/issues"
   },
-  "dependencies": {
-    "unique-slug": "^1.0.0"
-  },
-  "description": "Generate a unique filename for use in temporary directories or caches.",
+  "homepage": "https://github.com/iarna/unique-filename",
   "devDependencies": {
     "standard": "^3.7.3",
     "tap": "^1.0.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "0bee4219e192e86da3c4ffc0cc6e054d8634eab9",
-    "tarball": "http://registry.npmjs.org/unique-filename/-/unique-filename-1.0.0.tgz"
+  "dependencies": {
+    "unique-slug": "^1.0.0"
   },
   "gitHead": "935739361f6ecc7b613c5daf66a57b67938796d4",
-  "homepage": "https://github.com/iarna/unique-filename",
-  "keywords": [],
-  "license": "ISC",
-  "main": "index.js",
+  "_id": "unique-filename@1.0.0",
+  "_shasum": "0bee4219e192e86da3c4ffc0cc6e054d8634eab9",
+  "_from": "unique-filename@>=1.0.0 <1.1.0",
+  "_npmVersion": "2.7.6",
+  "_nodeVersion": "1.6.2",
+  "_npmUser": {
+    "name": "iarna",
+    "email": "me@re-becca.org"
+  },
   "maintainers": [
     {
       "name": "iarna",
       "email": "me@re-becca.org"
     }
   ],
-  "name": "unique-filename",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/iarna/unique-filename.git"
-  },
-  "scripts": {
-    "test": "standard && tap test"
+  "dist": {
+    "shasum": "0bee4219e192e86da3c4ffc0cc6e054d8634eab9",
+    "tarball": "http://registry.npmjs.org/unique-filename/-/unique-filename-1.0.0.tgz"
   },
-  "version": "1.0.0"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.0.0.tgz"
 }
diff --git a/deps/npm/node_modules/unpipe/package.json b/deps/npm/node_modules/unpipe/package.json
index 8d270a91e08b66..25fbed73a049f7 100644
--- a/deps/npm/node_modules/unpipe/package.json
+++ b/deps/npm/node_modules/unpipe/package.json
@@ -1,83 +1,43 @@
 {
-  "_args": [
-    [
-      "unpipe@~1.0.0",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "unpipe@>=1.0.0 <1.1.0",
-  "_id": "unpipe@1.0.0",
-  "_inCache": true,
-  "_location": "/unpipe",
-  "_npmUser": {
-    "email": "doug@somethingdoug.com",
-    "name": "dougwilson"
-  },
-  "_npmVersion": "1.4.28",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "unpipe",
-    "raw": "unpipe@~1.0.0",
-    "rawSpec": "~1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-  "_shasum": "b2bf4ee8514aae6165b4817829d21b2ef49904ec",
-  "_shrinkwrap": null,
-  "_spec": "unpipe@~1.0.0",
-  "_where": "/Users/rebecca/code/npm",
+  "name": "unpipe",
+  "description": "Unpipe a stream from all destinations",
+  "version": "1.0.0",
   "author": {
-    "email": "doug@somethingdoug.com",
-    "name": "Douglas Christopher Wilson"
+    "name": "Douglas Christopher Wilson",
+    "email": "doug@somethingdoug.com"
   },
-  "bugs": {
-    "url": "https://github.com/stream-utils/unpipe/issues"
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/stream-utils/unpipe.git"
   },
-  "dependencies": {},
-  "description": "Unpipe a stream from all destinations",
   "devDependencies": {
     "istanbul": "0.3.15",
     "mocha": "2.2.5",
     "readable-stream": "1.1.13"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "b2bf4ee8514aae6165b4817829d21b2ef49904ec",
-    "tarball": "http://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
-  },
-  "engines": {
-    "node": ">= 0.8"
-  },
   "files": [
     "HISTORY.md",
     "LICENSE",
     "README.md",
     "index.js"
   ],
-  "gitHead": "d2df901c06487430e78dca62b6edb8bb2fc5e99d",
-  "homepage": "https://github.com/stream-utils/unpipe",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "dougwilson",
-      "email": "doug@somethingdoug.com"
-    }
-  ],
-  "name": "unpipe",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/stream-utils/unpipe"
+  "engines": {
+    "node": ">= 0.8"
   },
   "scripts": {
     "test": "mocha --reporter spec --bail --check-leaks test/",
     "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/",
     "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/"
   },
-  "version": "1.0.0"
+  "readme": "# unpipe\n\n[![NPM Version][npm-image]][npm-url]\n[![NPM Downloads][downloads-image]][downloads-url]\n[![Node.js Version][node-image]][node-url]\n[![Build Status][travis-image]][travis-url]\n[![Test Coverage][coveralls-image]][coveralls-url]\n\nUnpipe a stream from all destinations.\n\n## Installation\n\n```sh\n$ npm install unpipe\n```\n\n## API\n\n```js\nvar unpipe = require('unpipe')\n```\n\n### unpipe(stream)\n\nUnpipes all destinations from a given stream. With stream 2+, this is\nequivalent to `stream.unpipe()`. When used with streams 1 style streams\n(typically Node.js 0.8 and below), this module attempts to undo the\nactions done in `stream.pipe(dest)`.\n\n## License\n\n[MIT](LICENSE)\n\n[npm-image]: https://img.shields.io/npm/v/unpipe.svg\n[npm-url]: https://npmjs.org/package/unpipe\n[node-image]: https://img.shields.io/node/v/unpipe.svg\n[node-url]: http://nodejs.org/download/\n[travis-image]: https://img.shields.io/travis/stream-utils/unpipe.svg\n[travis-url]: https://travis-ci.org/stream-utils/unpipe\n[coveralls-image]: https://img.shields.io/coveralls/stream-utils/unpipe.svg\n[coveralls-url]: https://coveralls.io/r/stream-utils/unpipe?branch=master\n[downloads-image]: https://img.shields.io/npm/dm/unpipe.svg\n[downloads-url]: https://npmjs.org/package/unpipe\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/stream-utils/unpipe/issues"
+  },
+  "homepage": "https://github.com/stream-utils/unpipe#readme",
+  "_id": "unpipe@1.0.0",
+  "_shasum": "b2bf4ee8514aae6165b4817829d21b2ef49904ec",
+  "_resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+  "_from": "unpipe@>=1.0.0 <1.1.0"
 }
diff --git a/deps/npm/node_modules/util-deprecate/package.json b/deps/npm/node_modules/util-deprecate/package.json
deleted file mode 100644
index aa607316f71808..00000000000000
--- a/deps/npm/node_modules/util-deprecate/package.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "_args": [
-    [
-      "util-deprecate@~1.0.1",
-      "/Users/rebecca/code/npm/node_modules/concat-stream/node_modules/readable-stream"
-    ]
-  ],
-  "_from": "util-deprecate@>=1.0.1 <1.1.0",
-  "_id": "util-deprecate@1.0.1",
-  "_inCache": true,
-  "_location": "/util-deprecate",
-  "_npmUser": {
-    "email": "nathan@tootallnate.net",
-    "name": "tootallnate"
-  },
-  "_npmVersion": "1.4.28",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "util-deprecate",
-    "raw": "util-deprecate@~1.0.1",
-    "rawSpec": "~1.0.1",
-    "scope": null,
-    "spec": ">=1.0.1 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/concat-stream/readable-stream"
-  ],
-  "_resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz",
-  "_shasum": "3556a3d13c4c6aa7983d7e2425478197199b7881",
-  "_shrinkwrap": null,
-  "_spec": "util-deprecate@~1.0.1",
-  "_where": "/Users/rebecca/code/npm/node_modules/concat-stream/node_modules/readable-stream",
-  "author": {
-    "email": "nathan@tootallnate.net",
-    "name": "Nathan Rajlich",
-    "url": "http://n8.io/"
-  },
-  "browser": "browser.js",
-  "bugs": {
-    "url": "https://github.com/TooTallNate/util-deprecate/issues"
-  },
-  "dependencies": {},
-  "description": "The Node.js `util.deprecate()` function with browser support",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "3556a3d13c4c6aa7983d7e2425478197199b7881",
-    "tarball": "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
-  },
-  "gitHead": "6e923f7d98a0afbe5b9c7db9d0f0029c1936746c",
-  "homepage": "https://github.com/TooTallNate/util-deprecate",
-  "keywords": [
-    "browser",
-    "browserify",
-    "deprecate",
-    "node",
-    "util"
-  ],
-  "license": "MIT",
-  "main": "node.js",
-  "maintainers": [
-    {
-      "name": "tootallnate",
-      "email": "nathan@tootallnate.net"
-    }
-  ],
-  "name": "util-deprecate",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/TooTallNate/util-deprecate.git"
-  },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "version": "1.0.1"
-}
diff --git a/deps/npm/node_modules/spdx-correct/README.md b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/README.md
similarity index 100%
rename from deps/npm/node_modules/spdx-correct/README.md
rename to deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/README.md
diff --git a/deps/npm/node_modules/spdx-correct/index.js b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/index.js
similarity index 100%
rename from deps/npm/node_modules/spdx-correct/index.js
rename to deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/index.js
diff --git a/deps/npm/node_modules/spdx-correct/package.json b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/package.json
similarity index 68%
rename from deps/npm/node_modules/spdx-correct/package.json
rename to deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/package.json
index efaea0260352d9..20d58a0b13526b 100644
--- a/deps/npm/node_modules/spdx-correct/package.json
+++ b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-correct/package.json
@@ -1,63 +1,21 @@
 {
-  "_args": [
-    [
-      "spdx-correct@~1.0.0",
-      "/Users/rebecca/code/npm/node_modules/validate-npm-package-license"
-    ]
-  ],
-  "_from": "spdx-correct@>=1.0.0 <1.1.0",
-  "_id": "spdx-correct@1.0.1",
-  "_inCache": true,
-  "_location": "/spdx-correct",
-  "_nodeVersion": "0.12.7",
-  "_npmUser": {
-    "email": "kyle@kemitchell.com",
-    "name": "kemitchell"
-  },
-  "_npmVersion": "2.13.5",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "spdx-correct",
-    "raw": "spdx-correct@~1.0.0",
-    "rawSpec": "~1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/validate-npm-package-license"
-  ],
-  "_resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz",
-  "_shasum": "ac075f5f2f6a06c0bfdd1c847eb3dde3dd8221ea",
-  "_shrinkwrap": null,
-  "_spec": "spdx-correct@~1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/validate-npm-package-license",
+  "name": "spdx-correct",
+  "description": "correct invalid SPDX identifiers",
+  "version": "1.0.1",
   "author": {
-    "email": "kyle@kemitchell.com",
     "name": "Kyle E. Mitchell",
+    "email": "kyle@kemitchell.com",
     "url": "https://kemitchell.com"
   },
-  "bugs": {
-    "url": "https://github.com/kemitchell/spdx-correct.js/issues"
-  },
   "dependencies": {
     "spdx-license-ids": "^1.0.2"
   },
-  "description": "correct invalid SPDX identifiers",
   "devDependencies": {
     "defence-cli": "^1.0.1",
     "replace-require-self": "^1.0.0",
     "spdx-expression-parse": "^1.0.0",
     "tape": "~4.0.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "ac075f5f2f6a06c0bfdd1c847eb3dde3dd8221ea",
-    "tarball": "http://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz"
-  },
-  "gitHead": "f3581dea1529d975851ceab7f86e646d8220608a",
-  "homepage": "https://github.com/kemitchell/spdx-correct.js#readme",
-  "installable": true,
   "keywords": [
     "SPDX",
     "law",
@@ -66,6 +24,31 @@
     "metadata"
   ],
   "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/kemitchell/spdx-correct.js.git"
+  },
+  "scripts": {
+    "test": "defence README.md | replace-require-self | node && tape *.test.js"
+  },
+  "gitHead": "f3581dea1529d975851ceab7f86e646d8220608a",
+  "bugs": {
+    "url": "https://github.com/kemitchell/spdx-correct.js/issues"
+  },
+  "homepage": "https://github.com/kemitchell/spdx-correct.js#readme",
+  "_id": "spdx-correct@1.0.1",
+  "_shasum": "ac075f5f2f6a06c0bfdd1c847eb3dde3dd8221ea",
+  "_from": "spdx-correct@>=1.0.0 <1.1.0",
+  "_npmVersion": "2.13.5",
+  "_nodeVersion": "0.12.7",
+  "_npmUser": {
+    "name": "kemitchell",
+    "email": "kyle@kemitchell.com"
+  },
+  "dist": {
+    "shasum": "ac075f5f2f6a06c0bfdd1c847eb3dde3dd8221ea",
+    "tarball": "http://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz"
+  },
   "maintainers": [
     {
       "name": "kemitchell",
@@ -76,14 +59,7 @@
       "email": "ogd@aoaioxxysz.net"
     }
   ],
-  "name": "spdx-correct",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/kemitchell/spdx-correct.js.git"
-  },
-  "scripts": {
-    "test": "defence README.md | replace-require-self | node && tape *.test.js"
-  },
-  "version": "1.0.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/spdx-expression-parse/LICENSE b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/LICENSE
similarity index 100%
rename from deps/npm/node_modules/spdx-expression-parse/LICENSE
rename to deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/LICENSE
diff --git a/deps/npm/node_modules/spdx-expression-parse/README.md b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/README.md
similarity index 100%
rename from deps/npm/node_modules/spdx-expression-parse/README.md
rename to deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/README.md
diff --git a/deps/npm/node_modules/spdx-expression-parse/index.js b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/index.js
similarity index 100%
rename from deps/npm/node_modules/spdx-expression-parse/index.js
rename to deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/index.js
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/README.md b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/README.md
new file mode 100644
index 00000000000000..43a663723df002
--- /dev/null
+++ b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/README.md
@@ -0,0 +1 @@
+The package exports an array of strings.
diff --git a/deps/npm/node_modules/spdx-exceptions/index.json b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/index.json
similarity index 100%
rename from deps/npm/node_modules/spdx-exceptions/index.json
rename to deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/index.json
diff --git a/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/package.json b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/package.json
new file mode 100644
index 00000000000000..7a19d6b4d69714
--- /dev/null
+++ b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/node_modules/spdx-exceptions/package.json
@@ -0,0 +1,48 @@
+{
+  "name": "spdx-exceptions",
+  "description": "list of SPDX standard license exceptions",
+  "version": "1.0.3",
+  "author": {
+    "name": "The Linux Foundation"
+  },
+  "contributors": [
+    {
+      "name": "Kyle E. Mitchell",
+      "email": "kyle@kemitchell.com",
+      "url": "https://kemitchell.com/"
+    }
+  ],
+  "license": "CC-BY-3.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/kemitchell/spdx-exceptions.json.git"
+  },
+  "gitHead": "fdd2c68ac29d4cd891c31e9b60523177eb9b338e",
+  "bugs": {
+    "url": "https://github.com/kemitchell/spdx-exceptions.json/issues"
+  },
+  "homepage": "https://github.com/kemitchell/spdx-exceptions.json#readme",
+  "_id": "spdx-exceptions@1.0.3",
+  "scripts": {},
+  "_shasum": "39ec5ed2cebddf08d180555d7e99c3aff9b4764a",
+  "_from": "spdx-exceptions@>=1.0.0 <2.0.0",
+  "_npmVersion": "3.3.4",
+  "_nodeVersion": "4.1.1",
+  "_npmUser": {
+    "name": "kemitchell",
+    "email": "kyle@kemitchell.com"
+  },
+  "dist": {
+    "shasum": "39ec5ed2cebddf08d180555d7e99c3aff9b4764a",
+    "tarball": "http://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.3.tgz"
+  },
+  "maintainers": [
+    {
+      "name": "kemitchell",
+      "email": "kyle@kemitchell.com"
+    }
+  ],
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.3.tgz",
+  "readme": "ERROR: No README data found!"
+}
diff --git a/deps/npm/node_modules/spdx-expression-parse/package.json b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/package.json
similarity index 66%
rename from deps/npm/node_modules/spdx-expression-parse/package.json
rename to deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/package.json
index 79ab103509df6e..bc5ac8cd9acf34 100644
--- a/deps/npm/node_modules/spdx-expression-parse/package.json
+++ b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/package.json
@@ -1,62 +1,20 @@
 {
-  "_args": [
-    [
-      "spdx-expression-parse@~1.0.0",
-      "/Users/ogd/Documents/projects/npm/npm/node_modules/init-package-json/node_modules/validate-npm-package-license"
-    ]
-  ],
-  "_from": "spdx-expression-parse@>=1.0.0 <1.1.0",
-  "_id": "spdx-expression-parse@1.0.0",
-  "_inCache": true,
-  "_location": "/spdx-expression-parse",
-  "_nodeVersion": "0.12.7",
-  "_npmUser": {
-    "email": "kyle@kemitchell.com",
-    "name": "kemitchell"
-  },
-  "_npmVersion": "2.13.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "spdx-expression-parse",
-    "raw": "spdx-expression-parse@~1.0.0",
-    "rawSpec": "~1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/init-package-json/validate-npm-package-license"
-  ],
-  "_resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz",
-  "_shasum": "4fbb7e738c9e98fa0b0914dfd961ac6629fbcdef",
-  "_shrinkwrap": null,
-  "_spec": "spdx-expression-parse@~1.0.0",
-  "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/init-package-json/node_modules/validate-npm-package-license",
+  "name": "spdx-expression-parse",
+  "description": "parse SPDX license expressions",
+  "version": "1.0.0",
   "author": {
-    "email": "kyle@kemitchell.com",
     "name": "Kyle E. Mitchell",
+    "email": "kyle@kemitchell.com",
     "url": "http://kemitchell.com"
   },
-  "bugs": {
-    "url": "https://github.com/kemitchell/spdx-expression-parse.js/issues"
-  },
   "dependencies": {
     "spdx-exceptions": "^1.0.0",
     "spdx-license-ids": "^1.0.0"
   },
-  "description": "parse SPDX license expressions",
   "devDependencies": {
     "defence-cli": "^1.0.1",
     "jison": "^0.4.15"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "4fbb7e738c9e98fa0b0914dfd961ac6629fbcdef",
-    "tarball": "http://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz"
-  },
-  "gitHead": "213bc03808f709a4ceaadb8466740a8c96c1e896",
-  "homepage": "https://github.com/kemitchell/spdx-expression-parse.js#readme",
-  "installable": true,
   "keywords": [
     "SPDX",
     "law",
@@ -68,14 +26,6 @@
     "standards"
   ],
   "license": "(MIT AND CC-BY-3.0)",
-  "maintainers": [
-    {
-      "name": "kemitchell",
-      "email": "kyle@kemitchell.com"
-    }
-  ],
-  "name": "spdx-expression-parse",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/kemitchell/spdx-expression-parse.js.git"
@@ -86,5 +36,31 @@
     "pretest": "npm run generate",
     "test": "defence -i javascript README.md | node"
   },
-  "version": "1.0.0"
+  "gitHead": "213bc03808f709a4ceaadb8466740a8c96c1e896",
+  "bugs": {
+    "url": "https://github.com/kemitchell/spdx-expression-parse.js/issues"
+  },
+  "homepage": "https://github.com/kemitchell/spdx-expression-parse.js#readme",
+  "_id": "spdx-expression-parse@1.0.0",
+  "_shasum": "4fbb7e738c9e98fa0b0914dfd961ac6629fbcdef",
+  "_from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+  "_npmVersion": "2.13.3",
+  "_nodeVersion": "0.12.7",
+  "_npmUser": {
+    "name": "kemitchell",
+    "email": "kyle@kemitchell.com"
+  },
+  "dist": {
+    "shasum": "4fbb7e738c9e98fa0b0914dfd961ac6629fbcdef",
+    "tarball": "http://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz"
+  },
+  "maintainers": [
+    {
+      "name": "kemitchell",
+      "email": "kyle@kemitchell.com"
+    }
+  ],
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/spdx-expression-parse/parser.generated.js b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/parser.generated.js
similarity index 100%
rename from deps/npm/node_modules/spdx-expression-parse/parser.generated.js
rename to deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse/parser.generated.js
diff --git a/deps/npm/node_modules/spdx-license-ids/LICENSE b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-license-ids/LICENSE
similarity index 100%
rename from deps/npm/node_modules/spdx-license-ids/LICENSE
rename to deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-license-ids/LICENSE
diff --git a/deps/npm/node_modules/spdx-license-ids/README.md b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-license-ids/README.md
similarity index 100%
rename from deps/npm/node_modules/spdx-license-ids/README.md
rename to deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-license-ids/README.md
diff --git a/deps/npm/node_modules/spdx-license-ids/package.json b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-license-ids/package.json
similarity index 71%
rename from deps/npm/node_modules/spdx-license-ids/package.json
rename to deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-license-ids/package.json
index c2a1dbf2c6a19c..215bb5e6186126 100644
--- a/deps/npm/node_modules/spdx-license-ids/package.json
+++ b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-license-ids/package.json
@@ -1,46 +1,41 @@
 {
-  "_args": [
-    [
-      "spdx-license-ids@^1.0.0",
-      "/Users/rebecca/code/npm/node_modules/spdx"
-    ]
-  ],
-  "_from": "spdx-license-ids@>=1.0.0 <2.0.0",
-  "_id": "spdx-license-ids@1.0.2",
-  "_inCache": true,
-  "_location": "/spdx-license-ids",
-  "_nodeVersion": "2.3.3",
-  "_npmUser": {
-    "email": "snnskwtnb@gmail.com",
-    "name": "shinnn"
-  },
-  "_npmVersion": "2.12.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "spdx-license-ids",
-    "raw": "spdx-license-ids@^1.0.0",
-    "rawSpec": "^1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
+  "name": "spdx-license-ids",
+  "version": "1.0.2",
+  "description": "A list of SPDX license identifiers",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/shinnn/spdx-license-ids.git"
   },
-  "_requiredBy": [
-    "/spdx"
-  ],
-  "_resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz",
-  "_shasum": "0674e9c9a230f980016b5b073a10aa165701677c",
-  "_shrinkwrap": null,
-  "_spec": "spdx-license-ids@^1.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/spdx",
   "author": {
     "name": "Shinnosuke Watanabe",
     "url": "https://github.com/shinnn"
   },
-  "bugs": {
-    "url": "https://github.com/shinnn/spdx-license-ids/issues"
+  "scripts": {
+    "build": "node --harmony_arrow_functions build.js",
+    "lint": "eslint --config node_modules/@shinnn/eslintrc/rc.json --ignore-path .gitignore .",
+    "pretest": "${npm_package_scripts_build} && ${npm_package_scripts_lint}",
+    "test": "node --harmony_arrow_functions test.js",
+    "coverage": "node --harmony_arrow_functions node_modules/.bin/istanbul cover test.js",
+    "coveralls": "${npm_package_scripts_coverage} && istanbul-coveralls"
   },
-  "dependencies": {},
-  "description": "A list of SPDX license identifiers",
+  "license": "Unlicense",
+  "main": "spdx-license-ids.json",
+  "files": [
+    "spdx-license-ids.json"
+  ],
+  "keywords": [
+    "spdx",
+    "license",
+    "licenses",
+    "id",
+    "identifier",
+    "identifiers",
+    "json",
+    "array",
+    "oss",
+    "browser",
+    "client-side"
+  ],
   "devDependencies": {
     "@shinnn/eslintrc": "^1.0.0",
     "each-async": "^1.1.1",
@@ -53,50 +48,31 @@
     "stringify-object": "^2.2.0",
     "tape": "^4.0.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "0674e9c9a230f980016b5b073a10aa165701677c",
-    "tarball": "http://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
-  },
-  "files": [
-    "spdx-license-ids.json"
-  ],
   "gitHead": "df183ecdf1738f77b1e8e41f686ee56206a40693",
+  "bugs": {
+    "url": "https://github.com/shinnn/spdx-license-ids/issues"
+  },
   "homepage": "https://github.com/shinnn/spdx-license-ids#readme",
-  "keywords": [
-    "array",
-    "browser",
-    "client-side",
-    "id",
-    "identifier",
-    "identifiers",
-    "json",
-    "license",
-    "licenses",
-    "oss",
-    "spdx"
-  ],
-  "license": "Unlicense",
-  "main": "spdx-license-ids.json",
+  "_id": "spdx-license-ids@1.0.2",
+  "_shasum": "0674e9c9a230f980016b5b073a10aa165701677c",
+  "_from": "spdx-license-ids@1.0.2",
+  "_npmVersion": "2.12.1",
+  "_nodeVersion": "2.3.3",
+  "_npmUser": {
+    "name": "shinnn",
+    "email": "snnskwtnb@gmail.com"
+  },
   "maintainers": [
     {
       "name": "shinnn",
       "email": "snnskwtnb@gmail.com"
     }
   ],
-  "name": "spdx-license-ids",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/shinnn/spdx-license-ids.git"
-  },
-  "scripts": {
-    "build": "node --harmony_arrow_functions build.js",
-    "coverage": "node --harmony_arrow_functions node_modules/.bin/istanbul cover test.js",
-    "coveralls": "${npm_package_scripts_coverage} && istanbul-coveralls",
-    "lint": "eslint --config node_modules/@shinnn/eslintrc/rc.json --ignore-path .gitignore .",
-    "pretest": "${npm_package_scripts_build} && ${npm_package_scripts_lint}",
-    "test": "node --harmony_arrow_functions test.js"
+  "dist": {
+    "shasum": "0674e9c9a230f980016b5b073a10aa165701677c",
+    "tarball": "http://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz"
   },
-  "version": "1.0.2"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.2.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/spdx-license-ids/spdx-license-ids.json b/deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-license-ids/spdx-license-ids.json
similarity index 100%
rename from deps/npm/node_modules/spdx-license-ids/spdx-license-ids.json
rename to deps/npm/node_modules/validate-npm-package-license/node_modules/spdx-license-ids/spdx-license-ids.json
diff --git a/deps/npm/node_modules/validate-npm-package-license/package.json b/deps/npm/node_modules/validate-npm-package-license/package.json
index 94c1433c77c7f4..cb54e620f0ed9e 100644
--- a/deps/npm/node_modules/validate-npm-package-license/package.json
+++ b/deps/npm/node_modules/validate-npm-package-license/package.json
@@ -1,63 +1,20 @@
 {
-  "_args": [
-    [
-      "validate-npm-package-license@^3.0.1",
-      "/Users/ogd/Documents/projects/npm/npm/node_modules/init-package-json"
-    ]
-  ],
-  "_from": "validate-npm-package-license@>=3.0.1 <4.0.0",
-  "_id": "validate-npm-package-license@3.0.1",
-  "_inCache": true,
-  "_location": "/validate-npm-package-license",
-  "_nodeVersion": "0.12.7",
-  "_npmUser": {
-    "email": "kyle@kemitchell.com",
-    "name": "kemitchell"
-  },
-  "_npmVersion": "2.13.5",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "validate-npm-package-license",
-    "raw": "validate-npm-package-license@^3.0.1",
-    "rawSpec": "^3.0.1",
-    "scope": null,
-    "spec": ">=3.0.1 <4.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/init-package-json",
-    "/normalize-package-data"
-  ],
-  "_resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-  "_shasum": "2804babe712ad3379459acfbe24746ab2c303fbc",
-  "_shrinkwrap": null,
-  "_spec": "validate-npm-package-license@^3.0.1",
-  "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/init-package-json",
+  "name": "validate-npm-package-license",
+  "description": "Give me a string and I'll tell you if it's a valid npm package license string",
+  "version": "3.0.1",
   "author": {
-    "email": "kyle@kemitchell.com",
     "name": "Kyle E. Mitchell",
+    "email": "kyle@kemitchell.com",
     "url": "https://kemitchell.com"
   },
-  "bugs": {
-    "url": "https://github.com/kemitchell/validate-npm-package-license.js/issues"
-  },
   "dependencies": {
     "spdx-correct": "~1.0.0",
     "spdx-expression-parse": "~1.0.0"
   },
-  "description": "Give me a string and I'll tell you if it's a valid npm package license string",
   "devDependencies": {
     "defence-cli": "^1.0.1",
     "replace-require-self": "^1.0.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "2804babe712ad3379459acfbe24746ab2c303fbc",
-    "tarball": "http://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"
-  },
-  "gitHead": "00200d28f9960985f221bc1a8a71e4760daf39bf",
-  "homepage": "https://github.com/kemitchell/validate-npm-package-license.js#readme",
-  "installable": true,
   "keywords": [
     "license",
     "npm",
@@ -65,6 +22,31 @@
     "validation"
   ],
   "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/kemitchell/validate-npm-package-license.js.git"
+  },
+  "scripts": {
+    "test": "defence README.md | replace-require-self | node"
+  },
+  "gitHead": "00200d28f9960985f221bc1a8a71e4760daf39bf",
+  "bugs": {
+    "url": "https://github.com/kemitchell/validate-npm-package-license.js/issues"
+  },
+  "homepage": "https://github.com/kemitchell/validate-npm-package-license.js#readme",
+  "_id": "validate-npm-package-license@3.0.1",
+  "_shasum": "2804babe712ad3379459acfbe24746ab2c303fbc",
+  "_from": "validate-npm-package-license@3.0.1",
+  "_npmVersion": "2.13.5",
+  "_nodeVersion": "0.12.7",
+  "_npmUser": {
+    "name": "kemitchell",
+    "email": "kyle@kemitchell.com"
+  },
+  "dist": {
+    "shasum": "2804babe712ad3379459acfbe24746ab2c303fbc",
+    "tarball": "http://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"
+  },
   "maintainers": [
     {
       "name": "kemitchell",
@@ -75,16 +57,7 @@
       "email": "ogd@aoaioxxysz.net"
     }
   ],
-  "name": "validate-npm-package-license",
-  "optionalDependencies": {},
-  "readme": "validate-npm-package-license\n============================\n\nGive me a string and I'll tell you if it's a valid npm package license string.\n\n```javascript\nvar valid = require('validate-npm-package-license');\n```\n\nSPDX license identifiers are valid license strings:\n\n```javascript\n\nvar assert = require('assert');\nvar validSPDXExpression = {\n  validForNewPackages: true,\n  validForOldPackages: true,\n  spdx: true\n};\n\nassert.deepEqual(valid('MIT'), validSPDXExpression);\nassert.deepEqual(valid('BSD-2-Clause'), validSPDXExpression);\nassert.deepEqual(valid('Apache-2.0'), validSPDXExpression);\nassert.deepEqual(valid('ISC'), validSPDXExpression);\n```\nThe function will return a warning and suggestion for nearly-correct license identifiers:\n\n```javascript\nassert.deepEqual(\n  valid('Apache 2.0'),\n  {\n    validForOldPackages: false,\n    validForNewPackages: false,\n    warnings: [\n      'license should be ' +\n      'a valid SPDX license expression (without \"LicenseRef\"), ' +\n      '\"UNLICENSED\", or ' +\n      '\"SEE LICENSE IN <filename>\"',\n      'license is similar to the valid expression \"Apache-2.0\"'\n    ]\n  }\n);\n```\n\nSPDX expressions are valid, too ...\n\n```javascript\n// Simple SPDX license expression for dual licensing\nassert.deepEqual(\n  valid('(GPL-3.0 OR BSD-2-Clause)'),\n  validSPDXExpression\n);\n```\n\n... except if they contain `LicenseRef`:\n\n```javascript\nvar warningAboutLicenseRef = {\n  validForOldPackages: false,\n  validForNewPackages: false,\n  spdx: true,\n  warnings: [\n    'license should be ' +\n    'a valid SPDX license expression (without \"LicenseRef\"), ' +\n    '\"UNLICENSED\", or ' +\n    '\"SEE LICENSE IN <filename>\"',\n  ]\n};\n\nassert.deepEqual(\n  valid('LicenseRef-Made-Up'),\n  warningAboutLicenseRef\n);\n\nassert.deepEqual(\n  valid('(MIT OR LicenseRef-Made-Up)'),\n  warningAboutLicenseRef\n);\n```\n\nIf you can't describe your licensing terms with standardized SPDX identifiers, put the terms in a file in the package and point users there:\n\n```javascript\nassert.deepEqual(\n  valid('SEE LICENSE IN LICENSE.txt'),\n  {\n    validForNewPackages: true,\n    validForOldPackages: true,\n    inFile: 'LICENSE.txt'\n  }\n);\n\nassert.deepEqual(\n  valid('SEE LICENSE IN license.md'),\n  {\n    validForNewPackages: true,\n    validForOldPackages: true,\n    inFile: 'license.md'\n  }\n);\n```\n\nIf there aren't any licensing terms, use `UNLICENSED`:\n\n```javascript\nvar unlicensed = {\n  validForNewPackages: true,\n  validForOldPackages: true,\n  unlicensed: true\n};\nassert.deepEqual(valid('UNLICENSED'), unlicensed);\nassert.deepEqual(valid('UNLICENCED'), unlicensed);\n```\n",
-  "readmeFilename": "README.md",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/kemitchell/validate-npm-package-license.js.git"
-  },
-  "scripts": {
-    "test": "defence README.md | replace-require-self | node"
-  },
-  "version": "3.0.1"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/.travis.yml b/deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/.travis.yml
new file mode 100644
index 00000000000000..cc4dba29d959a2
--- /dev/null
+++ b/deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/.travis.yml
@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - "0.8"
+  - "0.10"
diff --git a/deps/npm/node_modules/builtins/History.md b/deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/History.md
similarity index 100%
rename from deps/npm/node_modules/builtins/History.md
rename to deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/History.md
diff --git a/deps/npm/node_modules/builtins/Readme.md b/deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/Readme.md
similarity index 100%
rename from deps/npm/node_modules/builtins/Readme.md
rename to deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/Readme.md
diff --git a/deps/npm/node_modules/builtins/builtins.json b/deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/builtins.json
similarity index 100%
rename from deps/npm/node_modules/builtins/builtins.json
rename to deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/builtins.json
diff --git a/deps/npm/node_modules/builtins/package.json b/deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/package.json
similarity index 57%
rename from deps/npm/node_modules/builtins/package.json
rename to deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/package.json
index d3a0e571f28089..c5ec77f136b8a2 100644
--- a/deps/npm/node_modules/builtins/package.json
+++ b/deps/npm/node_modules/validate-npm-package-name/node_modules/builtins/package.json
@@ -1,50 +1,34 @@
 {
-  "_args": [
-    [
-      "builtins@0.0.7",
-      "/Users/rebecca/code/npm/node_modules/validate-npm-package-name"
-    ]
-  ],
-  "_from": "builtins@0.0.7",
-  "_id": "builtins@0.0.7",
-  "_inCache": true,
-  "_location": "/builtins",
-  "_npmUser": {
-    "email": "julian@juliangruber.com",
-    "name": "juliangruber"
+  "name": "builtins",
+  "version": "0.0.7",
+  "description": "List of node.js builtin modules",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/juliangruber/builtins.git"
   },
-  "_npmVersion": "1.3.22",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "builtins",
-    "raw": "builtins@0.0.7",
-    "rawSpec": "0.0.7",
-    "scope": null,
-    "spec": "0.0.7",
-    "type": "version"
+  "license": "MIT",
+  "main": "builtins.json",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  },
+  "scripts": {
+    "test": "node -e \"require('./builtins.json')\""
   },
-  "_requiredBy": [
-    "/validate-npm-package-name"
-  ],
-  "_resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz",
-  "_shasum": "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a",
-  "_shrinkwrap": null,
-  "_spec": "builtins@0.0.7",
-  "_where": "/Users/rebecca/code/npm/node_modules/validate-npm-package-name",
   "bugs": {
     "url": "https://github.com/juliangruber/builtins/issues"
   },
-  "dependencies": {},
-  "description": "List of node.js builtin modules",
-  "devDependencies": {},
-  "directories": {},
+  "homepage": "https://github.com/juliangruber/builtins",
+  "_id": "builtins@0.0.7",
   "dist": {
     "shasum": "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a",
     "tarball": "http://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
   },
-  "homepage": "https://github.com/juliangruber/builtins",
-  "license": "MIT",
-  "main": "builtins.json",
+  "_from": "builtins@0.0.7",
+  "_npmVersion": "1.3.22",
+  "_npmUser": {
+    "name": "juliangruber",
+    "email": "julian@juliangruber.com"
+  },
   "maintainers": [
     {
       "name": "juliangruber",
@@ -55,17 +39,8 @@
       "email": "tj@segment.io"
     }
   ],
-  "name": "builtins",
-  "optionalDependencies": {},
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/juliangruber/builtins"
-  },
-  "scripts": {
-    "test": "node -e \"require('./builtins.json')\""
-  },
-  "version": "0.0.7"
+  "directories": {},
+  "_shasum": "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a",
+  "_resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/validate-npm-package-name/package.json b/deps/npm/node_modules/validate-npm-package-name/package.json
index 63cfacd9419c86..5b706da2d6d077 100644
--- a/deps/npm/node_modules/validate-npm-package-name/package.json
+++ b/deps/npm/node_modules/validate-npm-package-name/package.json
@@ -1,68 +1,52 @@
 {
-  "_args": [
-    [
-      "validate-npm-package-name@~2.2.0",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "validate-npm-package-name@>=2.2.0 <2.3.0",
-  "_id": "validate-npm-package-name@2.2.2",
-  "_inCache": true,
-  "_location": "/validate-npm-package-name",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
-  },
-  "_npmVersion": "3.0.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "validate-npm-package-name",
-    "raw": "validate-npm-package-name@~2.2.0",
-    "rawSpec": "~2.2.0",
-    "scope": null,
-    "spec": ">=2.2.0 <2.3.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/init-package-json"
-  ],
-  "_resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz",
-  "_shasum": "f65695b22f7324442019a3c7fa39a6e7fd299085",
-  "_shrinkwrap": null,
-  "_spec": "validate-npm-package-name@~2.2.0",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "name": "zeke"
-  },
-  "bugs": {
-    "url": "https://github.com/npm/validate-npm-package-name/issues"
+  "name": "validate-npm-package-name",
+  "version": "2.2.2",
+  "description": "Give me a string and I'll tell you if it's a valid npm package name",
+  "main": "index.js",
+  "directories": {
+    "test": "test"
   },
   "dependencies": {
     "builtins": "0.0.7"
   },
-  "description": "Give me a string and I'll tell you if it's a valid npm package name",
   "devDependencies": {
     "tap": "^0.4.13"
   },
-  "directories": {
-    "test": "test"
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "dist": {
-    "shasum": "f65695b22f7324442019a3c7fa39a6e7fd299085",
-    "tarball": "http://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/validate-npm-package-name.git"
   },
-  "gitHead": "3af92c881549f1b96f05ab6bfb5768bba94ad72d",
-  "homepage": "https://github.com/npm/validate-npm-package-name",
   "keywords": [
-    "names",
     "npm",
     "package",
+    "names",
     "validation"
   ],
+  "author": {
+    "name": "zeke"
+  },
   "license": "ISC",
-  "main": "index.js",
+  "bugs": {
+    "url": "https://github.com/npm/validate-npm-package-name/issues"
+  },
+  "homepage": "https://github.com/npm/validate-npm-package-name",
+  "gitHead": "3af92c881549f1b96f05ab6bfb5768bba94ad72d",
+  "_id": "validate-npm-package-name@2.2.2",
+  "_shasum": "f65695b22f7324442019a3c7fa39a6e7fd299085",
+  "_from": "validate-npm-package-name@>=2.2.2 <2.3.0",
+  "_npmVersion": "3.0.0",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
+  },
+  "dist": {
+    "shasum": "f65695b22f7324442019a3c7fa39a6e7fd299085",
+    "tarball": "http://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz"
+  },
   "maintainers": [
     {
       "name": "zeke",
@@ -77,14 +61,6 @@
       "email": "kat@sykosomatic.org"
     }
   ],
-  "name": "validate-npm-package-name",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/validate-npm-package-name.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "2.2.2"
+  "_resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/which/.travis.yml b/deps/npm/node_modules/which/.travis.yml
index 4af02b3d17e64c..7f22ad5a13250d 100644
--- a/deps/npm/node_modules/which/.travis.yml
+++ b/deps/npm/node_modules/which/.travis.yml
@@ -1,8 +1,6 @@
+sudo: false
 language: node_js
 node_js:
-  - '0.8'
   - '0.10'
   - '0.12'
-  - 'iojs'
-before_install:
-  - npm install -g npm@latest
+  - '4'
diff --git a/deps/npm/node_modules/which/README.md b/deps/npm/node_modules/which/README.md
index d5571528af303d..3d6b92026c84a9 100644
--- a/deps/npm/node_modules/which/README.md
+++ b/deps/npm/node_modules/which/README.md
@@ -31,4 +31,10 @@ which('node', { path: someOtherPath }, function (er, resolved) {
 
 ## OPTIONS
 
-If you pass in options, then `path` and `pathExt` are relevant.
+You may pass an options object as the second argument.
+
+- `path`: Use instead of the `PATH` environment variable.
+- `pathExt`: Use instead of the `PATHEXT` environment variable.
+- `all`: Return all matches, instead of just the first one.  Note that
+  this means the function returns an array of strings instead of a
+  single string.
diff --git a/deps/npm/node_modules/which/bin/which b/deps/npm/node_modules/which/bin/which
index 8432ce2f6da509..7cee3729eebdd0 100755
--- a/deps/npm/node_modules/which/bin/which
+++ b/deps/npm/node_modules/which/bin/which
@@ -1,14 +1,52 @@
 #!/usr/bin/env node
 var which = require("../")
-if (process.argv.length < 3) {
-  console.error("Usage: which <thing>")
+if (process.argv.length < 3)
+  usage()
+
+function usage () {
+  console.error('usage: which [-as] program ...')
   process.exit(1)
 }
 
-which(process.argv[2], function (er, thing) {
-  if (er) {
-    console.error(er.message)
-    process.exit(er.errno || 127)
+var all = false
+var silent = false
+var dashdash = false
+var args = process.argv.slice(2).filter(function (arg) {
+  if (dashdash || !/^-/.test(arg))
+    return true
+
+  if (arg === '--') {
+    dashdash = true
+    return false
+  }
+
+  var flags = arg.substr(1).split('')
+  for (var f = 0; f < flags.length; f++) {
+    var flag = flags[f]
+    switch (flag) {
+      case 's':
+        silent = true
+        break
+      case 'a':
+        all = true
+        break
+      default:
+        console.error('which: illegal option -- ' + flag)
+        usage()
+    }
   }
-  console.log(thing)
+  return false
 })
+
+process.exit(args.reduce(function (pv, current) {
+  try {
+    var f = which.sync(current, { all: all })
+    if (all)
+      f = f.join('\n')
+    if (!silent)
+      console.log(f)
+    return pv;
+  } catch (e) {
+    return 1;
+  }
+}, 0))
diff --git a/deps/npm/node_modules/is-absolute/LICENSE b/deps/npm/node_modules/which/node_modules/is-absolute/LICENSE
similarity index 100%
rename from deps/npm/node_modules/is-absolute/LICENSE
rename to deps/npm/node_modules/which/node_modules/is-absolute/LICENSE
diff --git a/deps/npm/node_modules/is-absolute/README.md b/deps/npm/node_modules/which/node_modules/is-absolute/README.md
similarity index 100%
rename from deps/npm/node_modules/is-absolute/README.md
rename to deps/npm/node_modules/which/node_modules/is-absolute/README.md
diff --git a/deps/npm/node_modules/is-absolute/index.js b/deps/npm/node_modules/which/node_modules/is-absolute/index.js
similarity index 100%
rename from deps/npm/node_modules/is-absolute/index.js
rename to deps/npm/node_modules/which/node_modules/is-absolute/index.js
diff --git a/deps/npm/node_modules/is-relative/LICENSE-MIT b/deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/LICENSE-MIT
similarity index 100%
rename from deps/npm/node_modules/is-relative/LICENSE-MIT
rename to deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/LICENSE-MIT
diff --git a/deps/npm/node_modules/is-relative/README.md b/deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/README.md
similarity index 100%
rename from deps/npm/node_modules/is-relative/README.md
rename to deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/README.md
diff --git a/deps/npm/node_modules/is-relative/index.js b/deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/index.js
similarity index 100%
rename from deps/npm/node_modules/is-relative/index.js
rename to deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/index.js
diff --git a/deps/npm/node_modules/is-relative/package.json b/deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/package.json
similarity index 69%
rename from deps/npm/node_modules/is-relative/package.json
rename to deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/package.json
index 70618409329c92..d582081dd157ca 100644
--- a/deps/npm/node_modules/is-relative/package.json
+++ b/deps/npm/node_modules/which/node_modules/is-absolute/node_modules/is-relative/package.json
@@ -1,63 +1,25 @@
 {
-  "_args": [
-    [
-      "is-relative@^0.1.0",
-      "/Users/rebecca/code/npm/node_modules/is-absolute"
-    ]
-  ],
-  "_from": "is-relative@>=0.1.0 <0.2.0",
-  "_id": "is-relative@0.1.3",
-  "_inCache": true,
-  "_location": "/is-relative",
-  "_npmUser": {
-    "email": "github@sellside.com",
-    "name": "jonschlinkert"
-  },
-  "_npmVersion": "1.4.9",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "is-relative",
-    "raw": "is-relative@^0.1.0",
-    "rawSpec": "^0.1.0",
-    "scope": null,
-    "spec": ">=0.1.0 <0.2.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/is-absolute"
-  ],
-  "_resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
-  "_shasum": "905fee8ae86f45b3ec614bc3c15c869df0876e82",
-  "_shrinkwrap": null,
-  "_spec": "is-relative@^0.1.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/is-absolute",
+  "name": "is-relative",
+  "description": "Returns `true` if the path appears to be relative.",
+  "version": "0.1.3",
+  "homepage": "https://github.com/jonschlinkert/is-relative",
   "author": {
     "name": "Jon Schlinkert",
     "url": "https://github.com/jonschlinkert"
   },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/jonschlinkert/is-relative.git"
+  },
   "bugs": {
     "url": "https://github.com/jonschlinkert/is-relative/issues"
   },
-  "dependencies": {},
-  "description": "Returns `true` if the path appears to be relative.",
-  "devDependencies": {
-    "mocha": "*",
-    "verb": ">= 0.2.6",
-    "verb-tag-jscomments": "^0.1.4"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "905fee8ae86f45b3ec614bc3c15c869df0876e82",
-    "tarball": "http://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
-  },
-  "engines": {
-    "node": ">=0.10.0"
-  },
-  "files": [
-    "LICENSE-MIT",
-    "index.js"
+  "licenses": [
+    {
+      "type": "MIT",
+      "url": "https://github.com/jonschlinkert/is-relative/blob/master/LICENSE-MIT"
+    }
   ],
-  "homepage": "https://github.com/jonschlinkert/is-relative",
   "keywords": [
     "absolute",
     "check",
@@ -74,27 +36,41 @@
     "uri",
     "url"
   ],
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "https://github.com/jonschlinkert/is-relative/blob/master/LICENSE-MIT"
-    }
-  ],
   "main": "index.js",
+  "files": [
+    "index.js",
+    "LICENSE-MIT"
+  ],
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "scripts": {
+    "test": "mocha -R spec"
+  },
+  "devDependencies": {
+    "mocha": "*",
+    "verb": ">= 0.2.6",
+    "verb-tag-jscomments": "^0.1.4"
+  },
+  "_id": "is-relative@0.1.3",
+  "_shasum": "905fee8ae86f45b3ec614bc3c15c869df0876e82",
+  "_from": "is-relative@>=0.1.0 <0.2.0",
+  "_npmVersion": "1.4.9",
+  "_npmUser": {
+    "name": "jonschlinkert",
+    "email": "github@sellside.com"
+  },
   "maintainers": [
     {
       "name": "jonschlinkert",
       "email": "github@sellside.com"
     }
   ],
-  "name": "is-relative",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/jonschlinkert/is-relative.git"
-  },
-  "scripts": {
-    "test": "mocha -R spec"
+  "dist": {
+    "shasum": "905fee8ae86f45b3ec614bc3c15c869df0876e82",
+    "tarball": "http://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
   },
-  "version": "0.1.3"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/is-absolute/package.json b/deps/npm/node_modules/which/node_modules/is-absolute/package.json
similarity index 72%
rename from deps/npm/node_modules/is-absolute/package.json
rename to deps/npm/node_modules/which/node_modules/is-absolute/package.json
index 28c21dd109aabc..4f954b855f11d4 100644
--- a/deps/npm/node_modules/is-absolute/package.json
+++ b/deps/npm/node_modules/which/node_modules/is-absolute/package.json
@@ -1,64 +1,39 @@
 {
-  "_args": [
-    [
-      "is-absolute@^0.1.7",
-      "/Users/rebecca/code/npm/node_modules/which"
-    ]
-  ],
-  "_from": "is-absolute@>=0.1.7 <0.2.0",
-  "_id": "is-absolute@0.1.7",
-  "_inCache": true,
-  "_location": "/is-absolute",
-  "_nodeVersion": "0.12.0",
-  "_npmUser": {
-    "email": "github@sellside.com",
-    "name": "jonschlinkert"
-  },
-  "_npmVersion": "2.5.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "is-absolute",
-    "raw": "is-absolute@^0.1.7",
-    "rawSpec": "^0.1.7",
-    "scope": null,
-    "spec": ">=0.1.7 <0.2.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/which"
-  ],
-  "_resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
-  "_shasum": "847491119fccb5fb436217cc737f7faad50f603f",
-  "_shrinkwrap": null,
-  "_spec": "is-absolute@^0.1.7",
-  "_where": "/Users/rebecca/code/npm/node_modules/which",
+  "name": "is-absolute",
+  "description": "Return true if a file path is absolute.",
+  "version": "0.1.7",
+  "homepage": "https://github.com/jonschlinkert/is-absolute",
   "author": {
     "name": "Jon Schlinkert",
     "url": "https://github.com/jonschlinkert"
   },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/jonschlinkert/is-absolute.git"
+  },
   "bugs": {
     "url": "https://github.com/jonschlinkert/is-absolute/issues"
   },
+  "license": {
+    "type": "MIT",
+    "url": "https://github.com/jonschlinkert/is-absolute/blob/master/LICENSE"
+  },
+  "files": [
+    "index.js"
+  ],
+  "main": "index.js",
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "scripts": {
+    "test": "mocha"
+  },
   "dependencies": {
     "is-relative": "^0.1.0"
   },
-  "description": "Return true if a file path is absolute.",
   "devDependencies": {
     "mocha": "*"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "847491119fccb5fb436217cc737f7faad50f603f",
-    "tarball": "http://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz"
-  },
-  "engines": {
-    "node": ">=0.10.0"
-  },
-  "files": [
-    "index.js"
-  ],
-  "gitHead": "90cca7b671620bf28b778a61fddc8a986a2e1095",
-  "homepage": "https://github.com/jonschlinkert/is-absolute",
   "keywords": [
     "absolute",
     "check",
@@ -75,25 +50,27 @@
     "uri",
     "url"
   ],
-  "license": {
-    "type": "MIT",
-    "url": "https://github.com/jonschlinkert/is-absolute/blob/master/LICENSE"
+  "gitHead": "90cca7b671620bf28b778a61fddc8a986a2e1095",
+  "_id": "is-absolute@0.1.7",
+  "_shasum": "847491119fccb5fb436217cc737f7faad50f603f",
+  "_from": "is-absolute@>=0.1.7 <0.2.0",
+  "_npmVersion": "2.5.1",
+  "_nodeVersion": "0.12.0",
+  "_npmUser": {
+    "name": "jonschlinkert",
+    "email": "github@sellside.com"
   },
-  "main": "index.js",
   "maintainers": [
     {
       "name": "jonschlinkert",
       "email": "github@sellside.com"
     }
   ],
-  "name": "is-absolute",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/jonschlinkert/is-absolute.git"
-  },
-  "scripts": {
-    "test": "mocha"
+  "dist": {
+    "shasum": "847491119fccb5fb436217cc737f7faad50f603f",
+    "tarball": "http://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz"
   },
-  "version": "0.1.7"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/which/package.json b/deps/npm/node_modules/which/package.json
index af78bbeb3860c7..fd00e896a344bb 100644
--- a/deps/npm/node_modules/which/package.json
+++ b/deps/npm/node_modules/which/package.json
@@ -1,82 +1,57 @@
 {
-  "_args": [
-    [
-      "which@~1.1.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "which@>=1.1.1 <1.2.0",
-  "_id": "which@1.1.2",
-  "_inCache": true,
-  "_location": "/which",
-  "_nodeVersion": "2.5.0",
-  "_npmUser": {
-    "email": "isaacs@npmjs.com",
-    "name": "isaacs"
-  },
-  "_npmVersion": "3.3.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "which",
-    "raw": "which@~1.1.1",
-    "rawSpec": "~1.1.1",
-    "scope": null,
-    "spec": ">=1.1.1 <1.2.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/node-gyp"
-  ],
-  "_resolved": "https://registry.npmjs.org/which/-/which-1.1.2.tgz",
-  "_shasum": "486c48af6dfecc7a7dcf9c655acf108d2dcbdf3d",
-  "_shrinkwrap": null,
-  "_spec": "which@~1.1.1",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me"
   },
+  "name": "which",
+  "description": "Like which(1) unix command. Find the first instance of an executable in the PATH.",
+  "version": "1.2.0",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/node-which.git"
+  },
+  "main": "which.js",
   "bin": {
     "which": "./bin/which"
   },
-  "bugs": {
-    "url": "https://github.com/isaacs/node-which/issues"
-  },
+  "license": "ISC",
   "dependencies": {
     "is-absolute": "^0.1.7"
   },
-  "description": "Like which(1) unix command. Find the first instance of an executable in the PATH.",
   "devDependencies": {
     "mkdirp": "^0.5.0",
     "rimraf": "^2.3.3",
-    "tap": "^1.0.2"
+    "tap": "^2.0.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "486c48af6dfecc7a7dcf9c655acf108d2dcbdf3d",
-    "tarball": "http://registry.npmjs.org/which/-/which-1.1.2.tgz"
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "gitHead": "98925d6bced9ba820a17fd857e7a53a491958419",
+  "bugs": {
+    "url": "https://github.com/isaacs/node-which/issues"
   },
-  "gitHead": "e576e42f0c377571884f844eec58b3ca4a331681",
   "homepage": "https://github.com/isaacs/node-which#readme",
-  "installable": true,
-  "license": "ISC",
-  "main": "which.js",
+  "_id": "which@1.2.0",
+  "_shasum": "a5c8df5abc792f6ce9652c8d9ca8f3a91b77e59d",
+  "_from": "which@>=1.2.0 <1.3.0",
+  "_npmVersion": "3.3.2",
+  "_nodeVersion": "4.0.0",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "isaacs@npmjs.com"
+  },
+  "dist": {
+    "shasum": "a5c8df5abc792f6ce9652c8d9ca8f3a91b77e59d",
+    "tarball": "http://registry.npmjs.org/which/-/which-1.2.0.tgz"
+  },
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "name": "which",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/node-which.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "1.1.2"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/which/-/which-1.2.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/which/test/bin.js b/deps/npm/node_modules/which/test/bin.js
new file mode 100644
index 00000000000000..ff7eb530c7fcc2
--- /dev/null
+++ b/deps/npm/node_modules/which/test/bin.js
@@ -0,0 +1,119 @@
+var t = require('tap')
+var spawn = require('child_process').spawn
+var node = process.execPath
+var bin = require.resolve('../bin/which')
+
+function which (args, extraPath, cb) {
+  if (typeof extraPath === 'function')
+    cb = extraPath, extraPath = null
+
+  var options = {}
+  if (extraPath) {
+    var sep = process.platform === 'win32' ? ';' : ':'
+    var p = process.env.PATH + sep + extraPath
+    options.env = Object.keys(process.env).reduce(function (env, k) {
+      if (!k.match(/^path$/i))
+        env[k] = process.env[k]
+      return env
+    }, { PATH: p })
+  }
+
+  var out = ''
+  var err = ''
+  var child = spawn(node, [bin].concat(args), options)
+  child.stdout.on('data', function (c) {
+    out += c
+  })
+  child.stderr.on('data', function (c) {
+    err += c
+  })
+  child.on('close', function (code, signal) {
+    cb(code, signal, out.trim(), err.trim())
+  })
+}
+
+t.test('finds node', function (t) {
+  which('node', function (code, signal, out, err) {
+    t.equal(signal, null)
+    t.equal(code, 0)
+    t.equal(err, '')
+    t.match(out, /[\\\/]node(\.exe)?$/)
+    t.end()
+  })
+})
+
+t.test('does not find flergyderp', function (t) {
+  which('flergyderp', function (code, signal, out, err) {
+    t.equal(signal, null)
+    t.equal(code, 1)
+    t.equal(err, '')
+    t.match(out, '')
+    t.end()
+  })
+})
+
+t.test('finds node and tap', function (t) {
+  which(['node', 'tap'], function (code, signal, out, err) {
+    t.equal(signal, null)
+    t.equal(code, 0)
+    t.equal(err, '')
+    t.match(out.split(/\n/), [
+      /[\\\/]node(\.exe)?$/,
+      /[\\\/]tap(\.cmd)?$/
+    ])
+    t.end()
+  })
+})
+
+t.test('finds node and tap, but not flergyderp', function (t) {
+  which(['node', 'flergyderp', 'tap'], function (code, signal, out, err) {
+    t.equal(signal, null)
+    t.equal(code, 1)
+    t.equal(err, '')
+    t.match(out.split(/\n/), [
+      /[\\\/]node(\.exe)?$/,
+      /[\\\/]tap(\.cmd)?$/
+    ])
+    t.end()
+  })
+})
+
+t.test('cli flags', function (t) {
+  var p = require('path').dirname(bin)
+  var cases = [ '-a', '-s', '-as', '-sa' ]
+  t.plan(cases.length)
+  cases.forEach(function (c) {
+    t.test(c, function (t) {
+      which(['which', c], p, function (code, signal, out, err) {
+        t.equal(signal, null)
+        t.equal(code, 0)
+        t.equal(err, '')
+        if (/s/.test(c))
+          t.equal(out, '', 'should be silent')
+        else if (/a/.test(c))
+          t.ok(out.split(/\n/).length > 1, 'should have more than 1 result')
+        t.end()
+      })
+    })
+  })
+})
+
+t.test('shows usage', function (t) {
+  which([], function (code, signal, out, err) {
+    t.equal(signal, null)
+    t.equal(code, 1)
+    t.equal(err, 'usage: which [-as] program ...')
+    t.equal(out, '')
+    t.end()
+  })
+})
+
+t.test('complains about unknown flag', function (t) {
+  which(['node', '-sax'], function (code, signal, out, err) {
+    t.equal(signal, null)
+    t.equal(code, 1)
+    t.equal(out, '')
+    t.equal(err, 'which: illegal option -- x\nusage: which [-as] program ...')
+    t.end()
+  })
+})
diff --git a/deps/npm/node_modules/which/which.js b/deps/npm/node_modules/which/which.js
index 97579de8ac88aa..88bd52ba52994a 100644
--- a/deps/npm/node_modules/which/which.js
+++ b/deps/npm/node_modules/which/which.js
@@ -68,9 +68,15 @@ function which (cmd, opt, cb) {
   var info = getPathInfo(cmd, opt)
   var pathEnv = info.env
   var pathExt = info.ext
+  var found = []
 
   ;(function F (i, l) {
-    if (i === l) return cb(new Error('not found: '+cmd))
+    if (i === l) {
+      if (opt.all && found.length)
+        return cb(null, found)
+      else
+        return cb(new Error('not found: '+cmd))
+    }
     var p = path.resolve(pathEnv[i], cmd)
     ;(function E (ii, ll) {
       if (ii === ll) return F(i + 1, l)
@@ -79,7 +85,10 @@ function which (cmd, opt, cb) {
         if (!er &&
             stat.isFile() &&
             isExe(stat.mode, stat.uid, stat.gid)) {
-          return cb(null, p + ext)
+          if (opt.all)
+            found.push(p + ext)
+          else
+            return cb(null, p + ext)
         }
         return E(ii + 1, ll)
       })
@@ -93,6 +102,7 @@ function whichSync (cmd, opt) {
   var info = getPathInfo(cmd, opt)
   var pathEnv = info.env
   var pathExt = info.ext
+  var found = []
 
   for (var i = 0, l = pathEnv.length; i < l; i ++) {
     var p = path.join(pathEnv[i], cmd)
@@ -101,11 +111,18 @@ function whichSync (cmd, opt) {
       var stat
       try {
         stat = fs.statSync(cur)
-        if (stat.isFile() && isExe(stat.mode, stat.uid, stat.gid))
-          return cur
+        if (stat.isFile() && isExe(stat.mode, stat.uid, stat.gid)) {
+          if (opt.all)
+            found.push(cur)
+          else
+            return cur
+        }
       } catch (ex) {}
     }
   }
 
+  if (opt.all && found.length)
+    return found
+
   throw new Error('not found: '+cmd)
 }
diff --git a/deps/npm/node_modules/wrappy/package.json b/deps/npm/node_modules/wrappy/package.json
index 3c4e03b037d4b9..a617a72bb24187 100644
--- a/deps/npm/node_modules/wrappy/package.json
+++ b/deps/npm/node_modules/wrappy/package.json
@@ -1,78 +1,36 @@
 {
-  "_args": [
-    [
-      "wrappy@~1.0.1",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "wrappy@>=1.0.1 <1.1.0",
-  "_id": "wrappy@1.0.1",
-  "_inCache": true,
-  "_location": "/wrappy",
-  "_nodeVersion": "0.10.31",
-  "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
-  },
-  "_npmVersion": "2.0.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "wrappy",
-    "raw": "wrappy@~1.0.1",
-    "rawSpec": "~1.0.1",
-    "scope": null,
-    "spec": ">=1.0.1 <1.1.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/dezalgo",
-    "/inflight",
-    "/once"
-  ],
-  "_resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
-  "_shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739",
-  "_shrinkwrap": null,
-  "_spec": "wrappy@~1.0.1",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/npm/wrappy/issues"
+  "name": "wrappy",
+  "version": "1.0.1",
+  "description": "Callback wrapping utility",
+  "main": "wrappy.js",
+  "directories": {
+    "test": "test"
   },
   "dependencies": {},
-  "description": "Callback wrapping utility",
   "devDependencies": {
     "tap": "^0.4.12"
   },
-  "directories": {
-    "test": "test"
-  },
-  "dist": {
-    "shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739",
-    "tarball": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "gitHead": "006a8cbac6b99988315834c207896eed71fd069a",
-  "homepage": "https://github.com/npm/wrappy",
-  "license": "ISC",
-  "main": "wrappy.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    }
-  ],
-  "name": "wrappy",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
-    "url": "https://github.com/npm/wrappy"
+    "url": "git+https://github.com/npm/wrappy.git"
   },
-  "scripts": {
-    "test": "tap test/*.js"
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
+  },
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/npm/wrappy/issues"
   },
-  "version": "1.0.1"
+  "homepage": "https://github.com/npm/wrappy",
+  "readme": "# wrappy\n\nCallback wrapping utility\n\n## USAGE\n\n```javascript\nvar wrappy = require(\"wrappy\")\n\n// var wrapper = wrappy(wrapperFunction)\n\n// make sure a cb is called only once\n// See also: http://npm.im/once for this specific use case\nvar once = wrappy(function (cb) {\n  var called = false\n  return function () {\n    if (called) return\n    called = true\n    return cb.apply(this, arguments)\n  }\n})\n\nfunction printBoo () {\n  console.log('boo')\n}\n// has some rando property\nprintBoo.iAmBooPrinter = true\n\nvar onlyPrintOnce = once(printBoo)\n\nonlyPrintOnce() // prints 'boo'\nonlyPrintOnce() // does nothing\n\n// random property is retained!\nassert.equal(onlyPrintOnce.iAmBooPrinter, true)\n```\n",
+  "readmeFilename": "README.md",
+  "_id": "wrappy@1.0.1",
+  "_shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739",
+  "_resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+  "_from": "wrappy@>=1.0.1 <1.1.0"
 }
diff --git a/deps/npm/node_modules/write-file-atomic/package.json b/deps/npm/node_modules/write-file-atomic/package.json
index 1dbe79432ba1f3..250f5c1b5f594f 100644
--- a/deps/npm/node_modules/write-file-atomic/package.json
+++ b/deps/npm/node_modules/write-file-atomic/package.json
@@ -1,81 +1,58 @@
 {
-  "_args": [
-    [
-      "write-file-atomic@~1.1.2",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "write-file-atomic@>=1.1.2 <1.2.0",
-  "_id": "write-file-atomic@1.1.3",
-  "_inCache": true,
-  "_location": "/write-file-atomic",
-  "_nodeVersion": "3.1.0",
-  "_npmUser": {
-    "email": "me@re-becca.org",
-    "name": "iarna"
+  "name": "write-file-atomic",
+  "version": "1.1.3",
+  "description": "Write files in an atomic fashion w/configurable ownership",
+  "main": "index.js",
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "_npmVersion": "3.3.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "write-file-atomic",
-    "raw": "write-file-atomic@~1.1.2",
-    "rawSpec": "~1.1.2",
-    "scope": null,
-    "spec": ">=1.1.2 <1.2.0",
-    "type": "range"
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/iarna/write-file-atomic.git"
   },
-  "_requiredBy": [
-    "/"
+  "keywords": [
+    "writeFile",
+    "atomic"
   ],
-  "_shasum": "60eaca258a0b559b37aca82b21d64a293b4b90d0",
-  "_shrinkwrap": null,
-  "_spec": "write-file-atomic@~1.1.2",
-  "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "me@re-becca.org",
     "name": "Rebecca Turner",
+    "email": "me@re-becca.org",
     "url": "http://re-becca.org"
   },
+  "license": "ISC",
   "bugs": {
     "url": "https://github.com/iarna/write-file-atomic/issues"
   },
+  "homepage": "https://github.com/iarna/write-file-atomic",
   "dependencies": {
     "graceful-fs": "^4.1.2",
     "slide": "^1.1.5"
   },
-  "description": "Write files in an atomic fashion w/configurable ownership",
   "devDependencies": {
     "require-inject": "^1.1.0",
     "tap": "^0.4.12"
   },
-  "directories": {},
+  "gitHead": "65a1e2e156c0d0bfb7acac2e039b943d6ec9876d",
+  "_id": "write-file-atomic@1.1.3",
+  "_shasum": "60eaca258a0b559b37aca82b21d64a293b4b90d0",
+  "_from": "write-file-atomic@>=1.1.3 <1.2.0",
+  "_npmVersion": "3.3.0",
+  "_nodeVersion": "3.1.0",
+  "_npmUser": {
+    "name": "iarna",
+    "email": "me@re-becca.org"
+  },
   "dist": {
     "shasum": "60eaca258a0b559b37aca82b21d64a293b4b90d0",
     "tarball": "http://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.3.tgz"
   },
-  "gitHead": "65a1e2e156c0d0bfb7acac2e039b943d6ec9876d",
-  "homepage": "https://github.com/iarna/write-file-atomic",
-  "installable": true,
-  "keywords": [
-    "atomic",
-    "writeFile"
-  ],
-  "license": "ISC",
-  "main": "index.js",
   "maintainers": [
     {
       "name": "iarna",
       "email": "me@re-becca.org"
     }
   ],
-  "name": "write-file-atomic",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/iarna/write-file-atomic.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "1.1.3"
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.3.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/deps/npm/node_modules/xtend/package.json b/deps/npm/node_modules/xtend/package.json
deleted file mode 100644
index 116a2797fc286b..00000000000000
--- a/deps/npm/node_modules/xtend/package.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "_args": [
-    [
-      "xtend@^4.0.0",
-      "/Users/rebecca/code/npm/node_modules/is-my-json-valid"
-    ]
-  ],
-  "_from": "xtend@>=4.0.0 <5.0.0",
-  "_id": "xtend@4.0.0",
-  "_inCache": true,
-  "_location": "/xtend",
-  "_npmUser": {
-    "email": "raynos2@gmail.com",
-    "name": "raynos"
-  },
-  "_npmVersion": "1.4.15",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "xtend",
-    "raw": "xtend@^4.0.0",
-    "rawSpec": "^4.0.0",
-    "scope": null,
-    "spec": ">=4.0.0 <5.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/is-my-json-valid"
-  ],
-  "_resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz",
-  "_shasum": "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f",
-  "_shrinkwrap": null,
-  "_spec": "xtend@^4.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/is-my-json-valid",
-  "author": {
-    "email": "raynos2@gmail.com",
-    "name": "Raynos"
-  },
-  "bugs": {
-    "email": "raynos2@gmail.com",
-    "url": "https://github.com/Raynos/xtend/issues"
-  },
-  "contributors": [
-    {
-      "name": "Jake Verbaten"
-    },
-    {
-      "name": "Matt Esch"
-    }
-  ],
-  "dependencies": {},
-  "description": "extend like a boss",
-  "devDependencies": {
-    "tape": "~1.1.0"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f",
-    "tarball": "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
-  },
-  "engines": {
-    "node": ">=0.4"
-  },
-  "gitHead": "94a95d76154103290533b2c55ffa0fe4be16bfef",
-  "homepage": "https://github.com/Raynos/xtend",
-  "keywords": [
-    "array",
-    "extend",
-    "merge",
-    "object",
-    "options",
-    "opts"
-  ],
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "http://github.com/raynos/xtend/raw/master/LICENSE"
-    }
-  ],
-  "main": "immutable",
-  "maintainers": [
-    {
-      "name": "raynos",
-      "email": "raynos2@gmail.com"
-    }
-  ],
-  "name": "xtend",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/Raynos/xtend.git"
-  },
-  "scripts": {
-    "test": "node test"
-  },
-  "testling": {
-    "browsers": [
-      "chrome/22..latest",
-      "chrome/canary",
-      "firefox/16..latest",
-      "firefox/nightly",
-      "ie/7..latest",
-      "ipad/6.0..latest",
-      "iphone/6.0..latest",
-      "opera/12..latest",
-      "opera/next",
-      "safari/5.1..latest"
-    ],
-    "files": "test.js"
-  },
-  "version": "4.0.0"
-}
diff --git a/deps/npm/package.json b/deps/npm/package.json
index 274a9f0cb8fb34..41374571cd7889 100644
--- a/deps/npm/package.json
+++ b/deps/npm/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.3.6",
+  "version": "3.3.10",
   "name": "npm",
   "description": "a package manager for JavaScript",
   "keywords": [
@@ -48,7 +48,7 @@
     "fstream-npm": "~1.0.5",
     "glob": "~5.0.15",
     "graceful-fs": "~4.1.2",
-    "has-unicode": "~1.0.0",
+    "has-unicode": "~1.0.1",
     "hosted-git-info": "~2.1.4",
     "iferr": "~0.1.5",
     "inflight": "~1.0.4",
@@ -94,12 +94,13 @@
     "unique-filename": "~1.0.0",
     "unpipe": "~1.0.0",
     "validate-npm-package-name": "~2.2.2",
-    "which": "~1.1.2",
+    "which": "~1.2.0",
     "wrappy": "~1.0.1",
     "write-file-atomic": "~1.1.3"
   },
   "bundleDependencies": [
     "abbrev",
+    "ansi-regex",
     "ansicolors",
     "ansistyles",
     "aproba",
@@ -109,6 +110,7 @@
     "cmd-shim",
     "columnify",
     "config-chain",
+    "debuglog",
     "dezalgo",
     "editor",
     "fs-vacuum",
@@ -125,7 +127,17 @@
     "ini",
     "init-package-json",
     "lockfile",
+    "lodash._baseindexof",
+    "lodash._baseuniq",
+    "lodash._bindcallback",
+    "lodash._cacheindexof",
+    "lodash._createcache",
+    "lodash._getnative",
     "lodash.clonedeep",
+    "lodash.isarguments",
+    "lodash.isarray",
+    "lodash.keys",
+    "lodash.restparam",
     "lodash.union",
     "lodash.uniq",
     "lodash.without",
@@ -149,19 +161,23 @@
     "read-installed",
     "read-package-json",
     "read-package-tree",
+    "readdir-scoped-modules",
     "realize-package-specifier",
+    "request",
     "retry",
     "rimraf",
     "semver",
     "sha",
     "slide",
     "sorted-object",
+    "strip-ansi",
     "tar",
     "text-table",
     "uid-number",
     "umask",
     "unique-filename",
     "unpipe",
+    "validate-npm-package-license",
     "validate-npm-package-name",
     "which",
     "wrappy",
@@ -169,25 +185,27 @@
   ],
   "devDependencies": {
     "deep-equal": "~1.0.1",
-    "estraverse": "~4.1.0",
     "marked": "~0.3.5",
     "marked-man": "~0.1.5",
-    "nock": "~2.13.0",
+    "nock": "~2.15.0",
     "npm-registry-couchapp": "~2.6.11",
     "npm-registry-mock": "~1.0.1",
+    "readable-stream": "~2.0.2",
     "require-inject": "~1.2.1",
-    "standard": "~4.5.4",
-    "tap": "~2.0.0"
+    "sprintf-js": "~1.0.3",
+    "standard": "~5.3.1",
+    "tap": "~2.1.1"
   },
   "scripts": {
     "dumpconf": "env | grep npm | sort | uniq",
-    "prepublish": "bash scripts/installable.sh && node bin/npm-cli.js prune --prefix=. --no-global && rimraf test/*/*/node_modules && make -j4 doc",
+    "prepublish": "node bin/npm-cli.js prune --prefix=. --no-global && rimraf test/*/*/node_modules && make -j4 doc",
     "preversion": "bash scripts/update-authors.sh && git add AUTHORS && git commit -m \"update AUTHORS\" || true",
     "tap": "tap --timeout 240",
     "test": "standard && npm run test-tap",
     "test-all": "standard && npm run test-legacy && npm run test-tap",
     "test-legacy": "node ./test/run.js",
-    "test-tap": "npm run tap -- \"test/tap/*.js\""
+    "test-tap": "npm run tap -- \"test/tap/*.js\"",
+    "test-node": "\"$NODE\" ./test/run.js && \"$NODE\" \"node_modules/.bin/tap\" --timeout 240 \"test/tap/*.js\""
   },
   "license": "Artistic-2.0"
 }
diff --git a/deps/npm/scripts/index-build.js b/deps/npm/scripts/index-build.js
index 8fbbf8595d5fd7..058bc74019fe9b 100755
--- a/deps/npm/scripts/index-build.js
+++ b/deps/npm/scripts/index-build.js
@@ -17,11 +17,11 @@ glob(root + '/{README.md,doc/*/*.md}', function (er, files) {
   }).filter(function (f) {
     return f
   }).sort(function (a, b) {
-    return (a[0] === b[0]) ?
-              (path.basename(a[1]) === 'npm.md' ? -1 :
-               path.basename(b[1]) === 'npm.md' ? 1 :
-               a[1] > b[1] ? 1 : -1) :
-              a[0] - b[0]
+    return (a[0] === b[0])
+            ? (path.basename(a[1]) === 'npm.md' ? -1
+            : path.basename(b[1]) === 'npm.md' ? 1
+            : a[1] > b[1] ? 1 : -1)
+            : a[0] - b[0]
   }))
 })
 
diff --git a/deps/npm/scripts/installable.sh b/deps/npm/scripts/installable.sh
deleted file mode 100644
index 1d5a90c290bcc8..00000000000000
--- a/deps/npm/scripts/installable.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-npmver=$(perl -E "say q{$npm_config_user_agent} =~ m{/(\S+)}")
-
-if semver -r ^3.0.0-0 $npmver > /dev/null; then
-	echo "Packaging with $npmver"
-else
-	echo "Packaging or installing npm@$npm_package_version with npm@$npmver is impossible." 1>&2
-	echo "Please install npm@^3.0.0-0 from the registry and use that or run your command with" 1>&2
-	echo "this version of npm with:" 1>&2
-	npmargs=$(node -e "a=$npm_config_argv; console.log(a.original.join(' '))")
-	echo "    $npm_node_execpath $PWD $npmargs" 1>&2
-	exit 1
-fi
diff --git a/deps/npm/test/common-tap.js b/deps/npm/test/common-tap.js
index 3537df68761aa6..915910a9cfb238 100644
--- a/deps/npm/test/common-tap.js
+++ b/deps/npm/test/common-tap.js
@@ -68,7 +68,7 @@ exports.makeGitRepo = function (params, cb) {
   var added = params.added || ['package.json']
   var message = params.message || 'stub repo'
 
-  var opts = { cwd: root, env: { PATH: process.env.PATH }}
+  var opts = { cwd: root, env: { PATH: process.env.PATH } }
   var commands = [
     git.chainableExec(['init'], opts),
     git.chainableExec(['config', 'user.name', user], opts),
diff --git a/deps/npm/test/fixtures/config/userconfig-with-gc b/deps/npm/test/fixtures/config/userconfig-with-gc
deleted file mode 100644
index ad4dd54c1ed00c..00000000000000
--- a/deps/npm/test/fixtures/config/userconfig-with-gc
+++ /dev/null
@@ -1,24 +0,0 @@
-globalconfig = /Users/rebecca/code/release/npm-3/test/fixtures/config/globalconfig
-email = i@izs.me
-env-thing = ${random_env_var}
-init.author.name = Isaac Z. Schlueter
-init.author.email = i@izs.me
-init.author.url = http://blog.izs.me/
-init.version = 1.2.3
-proprietary-attribs = false
-npm:publishtest = true
-_npmjs.org:couch = https://admin:password@localhost:5984/registry
-npm-www:nocache = 1
-nodedir = /Users/isaacs/dev/js/node-v0.8
-sign-git-tag = true
-message = v%s
-strict-ssl = false
-tmp = ~/.tmp
-_auth = dXNlcm5hbWU6cGFzc3dvcmQ=
-
-[_token]
-AuthSession = yabba-dabba-doodle
-version = 1
-expires = 1345001053415
-path = /
-httponly = true
diff --git a/deps/npm/test/packages/npm-test-array-bin/test.js b/deps/npm/test/packages/npm-test-array-bin/test.js
index 984bedb47f4306..f7922dbc7d6e5f 100644
--- a/deps/npm/test/packages/npm-test-array-bin/test.js
+++ b/deps/npm/test/packages/npm-test-array-bin/test.js
@@ -1,4 +1,5 @@
 require('child_process').exec('array-bin', { env: process.env },
-    function (err) {
-  if (err && err.code) throw new Error('exited badly with code = ' + err.code)
-})
+  function (err) {
+    if (err && err.code) throw new Error('exited badly with code = ' + err.code)
+  }
+)
diff --git a/deps/npm/test/packages/npm-test-dir-bin/test.js b/deps/npm/test/packages/npm-test-dir-bin/test.js
index c59ec92da702ee..1a397061f515b6 100644
--- a/deps/npm/test/packages/npm-test-dir-bin/test.js
+++ b/deps/npm/test/packages/npm-test-dir-bin/test.js
@@ -1,4 +1,5 @@
-require('child_process').exec('dir-bin', { stdio: 'pipe',
-    env: process.env }, function (err) {
-  if (err && err.code) throw new Error('exited badly with code = ' + err.code)
-})
+require('child_process').exec('dir-bin', { stdio: 'pipe', env: process.env },
+  function (err) {
+    if (err && err.code) throw new Error('exited badly with code = ' + err.code)
+  }
+)
diff --git a/deps/npm/test/packages/npm-test-shrinkwrap/test.js b/deps/npm/test/packages/npm-test-shrinkwrap/test.js
index 34638c2ce5148b..e40ae9b65cdfc7 100644
--- a/deps/npm/test/packages/npm-test-shrinkwrap/test.js
+++ b/deps/npm/test/packages/npm-test-shrinkwrap/test.js
@@ -6,22 +6,23 @@ delete process.env.npm_config_depth
 
 var npm = process.env.npm_execpath
 
-require('child_process').execFile(process.execPath, [npm, 'ls', '--json'], {
-    stdio: 'pipe', env: process.env, cwd: process.cwd() },
-    function (err, stdout, stderr) {
-  if (err) throw err
+require('child_process').execFile(process.execPath, [npm, 'ls', '--json'],
+  { stdio: 'pipe', env: process.env, cwd: process.cwd() },
+  function (err, stdout, stderr) {
+    if (err) throw err
 
-  var actual = JSON.parse(stdout)
-  var expected = require('./npm-shrinkwrap.json')
-  rmFrom(actual)
-  actual = actual.dependencies
-  rmFrom(expected)
-  expected = expected.dependencies
-  console.error(JSON.stringify(actual, null, 2))
-  console.error(JSON.stringify(expected, null, 2))
+    var actual = JSON.parse(stdout)
+    var expected = require('./npm-shrinkwrap.json')
+    rmFrom(actual)
+    actual = actual.dependencies
+    rmFrom(expected)
+    expected = expected.dependencies
+    console.error(JSON.stringify(actual, null, 2))
+    console.error(JSON.stringify(expected, null, 2))
 
-  assert.deepEqual(actual, expected)
-})
+    assert.deepEqual(actual, expected)
+  }
+)
 
 function rmFrom (obj) {
   for (var i in obj) {
diff --git a/deps/npm/test/run.js b/deps/npm/test/run.js
index c9eb9756906a09..24c7a31dabc992 100644
--- a/deps/npm/test/run.js
+++ b/deps/npm/test/run.js
@@ -12,9 +12,9 @@ var npmcli = path.resolve(npmpkg, 'bin', 'npm-cli.js')
 var temp = process.env.TMPDIR ||
            process.env.TMP ||
            process.env.TEMP ||
-           (process.platform === 'win32' ?
-              'c:\\windows\\temp' :
-              '/tmp')
+           (process.platform === 'win32'
+              ? 'c:\\windows\\temp'
+              : '/tmp')
 
 temp = path.resolve(temp, 'npm-test-' + process.pid)
 
@@ -49,6 +49,7 @@ env.npm_config_npat = 'false'
 env.PATH = pathEnv.join(pathEnvSplit)
 env.NODE_PATH = path.join(root, 'node_modules')
 env.npm_config_cache = cache
+env.npm_config_user_agent = ''
 
 function cleanup (cb) {
   if (failures !== 0) return
@@ -169,15 +170,15 @@ function main (cb) {
 
   function installAndTestEach (cb) {
     var thingsToChain = [
-        setup,
-        [execChain, flatten(packages.map(function (p) {
-          return [
-            ['npm install packages/' + p, testdir],
-            ['npm test', path.resolve(base, p)],
-            ['npm rm ' + p, root]
-          ]
-        }))]
-      ]
+      setup,
+      [execChain, flatten(packages.map(function (p) {
+        return [
+          ['npm install packages/' + p, testdir],
+          ['npm test', path.resolve(base, p)],
+          ['npm rm ' + p, root]
+        ]
+      }))]
+    ]
     if (process.platform !== 'win32') {
       // Windows can't handle npm rm npm due to file-in-use issues.
       thingsToChain.push([exec, 'npm rm npm', testdir])
diff --git a/deps/npm/test/tap/access.js b/deps/npm/test/tap/access.js
index 5e13a23cd5ab44..5feb892329aa60 100644
--- a/deps/npm/test/tap/access.js
+++ b/deps/npm/test/tap/access.js
@@ -41,20 +41,22 @@ test('npm access public on current package', function (t) {
   })).reply(200, {
     accessChanged: true
   })
-  common.npm([
-    'access',
-    'public',
-    '--registry', common.registry,
-    '--loglevel', 'silent'
-  ], {
-    cwd: pkg
-  },
-  function (er, code, stdout, stderr) {
-    t.ifError(er, 'npm access')
-    t.equal(code, 0, 'exited OK')
-    t.equal(stderr, '', 'no error output')
-    t.end()
-  })
+  common.npm(
+    [
+      'access',
+      'public',
+      '--registry', common.registry,
+      '--loglevel', 'silent'
+    ], {
+      cwd: pkg
+    },
+    function (er, code, stdout, stderr) {
+      t.ifError(er, 'npm access')
+      t.equal(code, 0, 'exited OK')
+      t.equal(stderr, '', 'no error output')
+      t.end()
+    }
+  )
 })
 
 test('npm access restricted on current package', function (t) {
@@ -63,20 +65,22 @@ test('npm access restricted on current package', function (t) {
   })).reply(200, {
     accessChanged: true
   })
-  common.npm([
-    'access',
-    'restricted',
-    '--registry', common.registry,
-    '--loglevel', 'silent'
-  ], {
-    cwd: pkg
-  },
-  function (er, code, stdout, stderr) {
-    t.ifError(er, 'npm access')
-    t.equal(code, 0, 'exited OK')
-    t.equal(stderr, '', 'no error output')
-    t.end()
-  })
+  common.npm(
+    [
+      'access',
+      'restricted',
+      '--registry', common.registry,
+      '--loglevel', 'silent'
+    ], {
+      cwd: pkg
+    },
+    function (er, code, stdout, stderr) {
+      t.ifError(er, 'npm access')
+      t.equal(code, 0, 'exited OK')
+      t.equal(stderr, '', 'no error output')
+      t.end()
+    }
+  )
 })
 
 test('npm access on named package', function (t) {
diff --git a/deps/npm/test/tap/add-named-update-protocol-port.js b/deps/npm/test/tap/add-named-update-protocol-port.js
index 52832db0c257a1..5993b07c9a43a7 100644
--- a/deps/npm/test/tap/add-named-update-protocol-port.js
+++ b/deps/npm/test/tap/add-named-update-protocol-port.js
@@ -55,7 +55,6 @@ test('tarball paths should update port if updating protocol', function (t) {
       t.end()
     })
   })
-
 })
 
 test('tarball paths should NOT update if different hostname', function (t) {
@@ -77,5 +76,4 @@ test('tarball paths should NOT update if different hostname', function (t) {
       t.end()
     })
   })
-
 })
diff --git a/deps/npm/test/tap/add-remote-git-get-resolved.js b/deps/npm/test/tap/add-remote-git-get-resolved.js
index 3f31467285a50c..dab51d16ef287c 100644
--- a/deps/npm/test/tap/add-remote-git-get-resolved.js
+++ b/deps/npm/test/tap/add-remote-git-get-resolved.js
@@ -83,7 +83,6 @@ test('add-remote-git#get-resolved HTTPS', function (t) {
 })
 
 test('add-remote-git#get-resolved edge cases', function (t) {
-
   t.equal(
     tryGetResolved('git+ssh://user@bananaboat.com:galbi/blah.git', 'decadacefadabade'),
     'git+ssh://user@bananaboat.com:galbi/blah.git#decadacefadabade',
diff --git a/deps/npm/test/tap/add-remote-git-shrinkwrap.js b/deps/npm/test/tap/add-remote-git-shrinkwrap.js
index f2982355e14b12..d734c11cfece26 100644
--- a/deps/npm/test/tap/add-remote-git-shrinkwrap.js
+++ b/deps/npm/test/tap/add-remote-git-shrinkwrap.js
@@ -61,9 +61,9 @@ test('shrinkwrap gets correct _from and _resolved (#7121)', function (t) {
     { cwd: pkg },
     function (er, code, stdout, stderr) {
       t.ifError(er, 'npm shrinkwrapped without errors')
-      t.notOk(code, '`npm shrinkwrap` exited with 0')
+      t.is(code, 0, '`npm shrinkwrap` exited ok')
       t.equal(stdout.trim(), 'wrote npm-shrinkwrap.json')
-      t.notOk(stderr, 'no error output on successful shrinkwrap')
+      t.equal(stderr.trim(), '', 'no error output on successful shrinkwrap')
 
       var shrinkwrap = require(resolve(pkg, 'npm-shrinkwrap.json'))
       t.equal(
diff --git a/deps/npm/test/tap/adduser-always-auth.js b/deps/npm/test/tap/adduser-always-auth.js
index 3ec8190006b369..cca560b1f097df 100644
--- a/deps/npm/test/tap/adduser-always-auth.js
+++ b/deps/npm/test/tap/adduser-always-auth.js
@@ -27,12 +27,12 @@ function mocks (server) {
 test('npm login', function (t) {
   mr({ port: common.port, plugin: mocks }, function (er, s) {
     var runner = common.npm(
-    [
-      'login',
-      '--registry', common.registry,
-      '--loglevel', 'silent',
-      '--userconfig', outfile
-    ],
+      [
+        'login',
+        '--registry', common.registry,
+        '--loglevel', 'silent',
+        '--userconfig', outfile
+      ],
     opts,
     function (err, code) {
       t.notOk(code, 'exited OK')
@@ -65,13 +65,13 @@ test('npm login', function (t) {
 test('npm login --always-auth', function (t) {
   mr({ port: common.port, plugin: mocks }, function (er, s) {
     var runner = common.npm(
-    [
-      'login',
-      '--registry', common.registry,
-      '--loglevel', 'silent',
-      '--userconfig', outfile,
-      '--always-auth'
-    ],
+      [
+        'login',
+        '--registry', common.registry,
+        '--loglevel', 'silent',
+        '--userconfig', outfile,
+        '--always-auth'
+      ],
     opts,
     function (err, code) {
       t.notOk(code, 'exited OK')
@@ -104,13 +104,13 @@ test('npm login --always-auth', function (t) {
 test('npm login --no-always-auth', function (t) {
   mr({ port: common.port, plugin: mocks }, function (er, s) {
     var runner = common.npm(
-    [
-      'login',
-      '--registry', common.registry,
-      '--loglevel', 'silent',
-      '--userconfig', outfile,
-      '--no-always-auth'
-    ],
+      [
+        'login',
+        '--registry', common.registry,
+        '--loglevel', 'silent',
+        '--userconfig', outfile,
+        '--no-always-auth'
+      ],
     opts,
     function (err, code) {
       t.notOk(code, 'exited OK')
diff --git a/deps/npm/test/tap/adduser-legacy-auth.js b/deps/npm/test/tap/adduser-legacy-auth.js
index 885a685b9db87b..3fa03e7d39810a 100644
--- a/deps/npm/test/tap/adduser-legacy-auth.js
+++ b/deps/npm/test/tap/adduser-legacy-auth.js
@@ -53,25 +53,26 @@ test('setup', function (t) {
 test('npm login', function (t) {
   mr({ port: common.port, plugin: mocks }, function (er, s) {
     var runner = common.npm(
-    [
-      'login',
-      '--registry', common.registry,
-      '--loglevel', 'silent',
-      '--userconfig', outfile
-    ],
-    opts,
-    function (err, code, stdout, stderr) {
-      t.ifError(err, 'npm ran without issue')
-      t.notOk(code, 'exited OK')
-      t.notOk(stderr, 'no error output')
-      var config = fs.readFileSync(outfile, 'utf8')
-      t.like(config, /:always-auth=false/, 'always-auth is scoped and false (by default)')
-      s.close()
-      rimraf(outfile, function (err) {
-        t.ifError(err, 'removed config file OK')
-        t.end()
-      })
-    })
+      [
+        'login',
+        '--registry', common.registry,
+        '--loglevel', 'silent',
+        '--userconfig', outfile
+      ],
+      opts,
+      function (err, code, stdout, stderr) {
+        t.ifError(err, 'npm ran without issue')
+        t.notOk(code, 'exited OK')
+        t.notOk(stderr, 'no error output')
+        var config = fs.readFileSync(outfile, 'utf8')
+        t.like(config, /:always-auth=false/, 'always-auth is scoped and false (by default)')
+        s.close()
+        rimraf(outfile, function (err) {
+          t.ifError(err, 'removed config file OK')
+          t.end()
+        })
+      }
+    )
 
     var o = ''
     var e = ''
diff --git a/deps/npm/test/tap/bugs.js b/deps/npm/test/tap/bugs.js
index a0a3be1b8dfec5..dd2c87e2c6b1cb 100644
--- a/deps/npm/test/tap/bugs.js
+++ b/deps/npm/test/tap/bugs.js
@@ -26,121 +26,145 @@ test('setup', function (t) {
 
 test('npm bugs underscore', function (t) {
   mr({ port: common.port }, function (er, s) {
-    common.npm([
-      'bugs', 'underscore',
-      '--registry=' + common.registry,
-      '--loglevel=silent',
-      '--browser=' + join(__dirname, '/_script.sh')
-    ], opts, function (err, code, stdout, stderr) {
-      t.ifError(err, 'bugs ran without issue')
-      t.notOk(stderr, 'should have no stderr')
-      t.equal(code, 0, 'exit ok')
-      var res = fs.readFileSync(outFile, 'ascii')
-      s.close()
-      t.equal(res, 'https://github.com/jashkenas/underscore/issues\n')
-      rimraf.sync(outFile)
-      t.end()
-    })
+    common.npm(
+      [
+        'bugs', 'underscore',
+        '--registry=' + common.registry,
+        '--loglevel=silent',
+        '--browser=' + join(__dirname, '/_script.sh')
+      ],
+      opts,
+      function (err, code, stdout, stderr) {
+        t.ifError(err, 'bugs ran without issue')
+        t.notOk(stderr, 'should have no stderr')
+        t.equal(code, 0, 'exit ok')
+        var res = fs.readFileSync(outFile, 'ascii')
+        s.close()
+        t.equal(res, 'https://github.com/jashkenas/underscore/issues\n')
+        rimraf.sync(outFile)
+        t.end()
+      }
+    )
   })
 })
 
 test('npm bugs optimist - github (https://)', function (t) {
   mr({ port: common.port }, function (er, s) {
-    common.npm([
-      'bugs', 'optimist',
-      '--registry=' + common.registry,
-      '--loglevel=silent',
-      '--browser=' + join(__dirname, '/_script.sh')
-    ], opts, function (err, code, stdout, stderr) {
-      t.ifError(err, 'bugs ran without issue')
-      t.notOk(stderr, 'should have no stderr')
-      t.equal(code, 0, 'exit ok')
-      var res = fs.readFileSync(outFile, 'ascii')
-      s.close()
-      t.equal(res, 'https://github.com/substack/node-optimist/issues\n')
-      rimraf.sync(outFile)
-      t.end()
-    })
+    common.npm(
+      [
+        'bugs', 'optimist',
+        '--registry=' + common.registry,
+        '--loglevel=silent',
+        '--browser=' + join(__dirname, '/_script.sh')
+      ],
+      opts,
+      function (err, code, stdout, stderr) {
+        t.ifError(err, 'bugs ran without issue')
+        t.notOk(stderr, 'should have no stderr')
+        t.equal(code, 0, 'exit ok')
+        var res = fs.readFileSync(outFile, 'ascii')
+        s.close()
+        t.equal(res, 'https://github.com/substack/node-optimist/issues\n')
+        rimraf.sync(outFile)
+        t.end()
+      }
+    )
   })
 })
 
 test('npm bugs npm-test-peer-deps - no repo', function (t) {
   mr({ port: common.port }, function (er, s) {
-    common.npm([
-      'bugs', 'npm-test-peer-deps',
-      '--registry=' + common.registry,
-      '--loglevel=silent',
-      '--browser=' + join(__dirname, '/_script.sh')
-    ], opts, function (err, code, stdout, stderr) {
-      t.ifError(err, 'bugs ran without issue')
-      t.notOk(stderr, 'should have no stderr')
-      t.equal(code, 0, 'exit ok')
-      var res = fs.readFileSync(outFile, 'ascii')
-      s.close()
-      t.equal(res, 'https://www.npmjs.org/package/npm-test-peer-deps\n')
-      rimraf.sync(outFile)
-      t.end()
-    })
+    common.npm(
+      [
+        'bugs', 'npm-test-peer-deps',
+        '--registry=' + common.registry,
+        '--loglevel=silent',
+        '--browser=' + join(__dirname, '/_script.sh')
+      ],
+      opts,
+      function (err, code, stdout, stderr) {
+        t.ifError(err, 'bugs ran without issue')
+        t.notOk(stderr, 'should have no stderr')
+        t.equal(code, 0, 'exit ok')
+        var res = fs.readFileSync(outFile, 'ascii')
+        s.close()
+        t.equal(res, 'https://www.npmjs.org/package/npm-test-peer-deps\n')
+        rimraf.sync(outFile)
+        t.end()
+      }
+    )
   })
 })
 
 test('npm bugs test-repo-url-http - non-github (http://)', function (t) {
   mr({ port: common.port }, function (er, s) {
-    common.npm([
-      'bugs', 'test-repo-url-http',
-      '--registry=' + common.registry,
-      '--loglevel=silent',
-      '--browser=' + join(__dirname, '/_script.sh')
-    ], opts, function (err, code, stdout, stderr) {
-      t.ifError(err, 'bugs ran without issue')
-      t.notOk(stderr, 'should have no stderr')
-      t.equal(code, 0, 'exit ok')
-      var res = fs.readFileSync(outFile, 'ascii')
-      s.close()
-      t.equal(res, 'https://www.npmjs.org/package/test-repo-url-http\n')
-      rimraf.sync(outFile)
-      t.end()
-    })
+    common.npm(
+      [
+        'bugs', 'test-repo-url-http',
+        '--registry=' + common.registry,
+        '--loglevel=silent',
+        '--browser=' + join(__dirname, '/_script.sh')
+      ],
+      opts,
+      function (err, code, stdout, stderr) {
+        t.ifError(err, 'bugs ran without issue')
+        t.notOk(stderr, 'should have no stderr')
+        t.equal(code, 0, 'exit ok')
+        var res = fs.readFileSync(outFile, 'ascii')
+        s.close()
+        t.equal(res, 'https://www.npmjs.org/package/test-repo-url-http\n')
+        rimraf.sync(outFile)
+        t.end()
+      }
+    )
   })
 })
 
 test('npm bugs test-repo-url-https - non-github (https://)', function (t) {
   mr({ port: common.port }, function (er, s) {
-    common.npm([
-      'bugs', 'test-repo-url-https',
-      '--registry=' + common.registry,
-      '--loglevel=silent',
-      '--browser=' + join(__dirname, '/_script.sh')
-    ], opts, function (err, code, stdout, stderr) {
-      t.ifError(err, 'bugs ran without issue')
-      t.notOk(stderr, 'should have no stderr')
-      t.equal(code, 0, 'exit ok')
-      var res = fs.readFileSync(outFile, 'ascii')
-      s.close()
-      t.equal(res, 'https://www.npmjs.org/package/test-repo-url-https\n')
-      rimraf.sync(outFile)
-      t.end()
-    })
+    common.npm(
+      [
+        'bugs', 'test-repo-url-https',
+        '--registry=' + common.registry,
+        '--loglevel=silent',
+        '--browser=' + join(__dirname, '/_script.sh')
+      ],
+      opts,
+      function (err, code, stdout, stderr) {
+        t.ifError(err, 'bugs ran without issue')
+        t.notOk(stderr, 'should have no stderr')
+        t.equal(code, 0, 'exit ok')
+        var res = fs.readFileSync(outFile, 'ascii')
+        s.close()
+        t.equal(res, 'https://www.npmjs.org/package/test-repo-url-https\n')
+        rimraf.sync(outFile)
+        t.end()
+      }
+    )
   })
 })
 
 test('npm bugs test-repo-url-ssh - non-github (ssh://)', function (t) {
   mr({ port: common.port }, function (er, s) {
-    common.npm([
-      'bugs', 'test-repo-url-ssh',
-      '--registry=' + common.registry,
-      '--loglevel=silent',
-      '--browser=' + join(__dirname, '/_script.sh')
-    ], opts, function (err, code, stdout, stderr) {
-      t.ifError(err, 'bugs ran without issue')
-      t.notOk(stderr, 'should have no stderr')
-      t.equal(code, 0, 'exit ok')
-      var res = fs.readFileSync(outFile, 'ascii')
-      s.close()
-      t.equal(res, 'https://www.npmjs.org/package/test-repo-url-ssh\n')
-      rimraf.sync(outFile)
-      t.end()
-    })
+    common.npm(
+      [
+        'bugs', 'test-repo-url-ssh',
+        '--registry=' + common.registry,
+        '--loglevel=silent',
+        '--browser=' + join(__dirname, '/_script.sh')
+      ],
+      opts,
+      function (err, code, stdout, stderr) {
+        t.ifError(err, 'bugs ran without issue')
+        t.notOk(stderr, 'should have no stderr')
+        t.equal(code, 0, 'exit ok')
+        var res = fs.readFileSync(outFile, 'ascii')
+        s.close()
+        t.equal(res, 'https://www.npmjs.org/package/test-repo-url-ssh\n')
+        rimraf.sync(outFile)
+        t.end()
+      }
+    )
   })
 })
 
diff --git a/deps/npm/test/tap/build-already-built.js b/deps/npm/test/tap/build-already-built.js
index 45aa1ba1c97d42..8a66f66e69f933 100644
--- a/deps/npm/test/tap/build-already-built.js
+++ b/deps/npm/test/tap/build-already-built.js
@@ -36,7 +36,6 @@ test("issue #6735 build 'already built' message", function (t) {
     })
 
     t.test('pin previous behavior', function (t) {
-
       build([fakePkg], global, false, false, function (err) {
         t.ok(err, 'build failed as expected')
         t.similar(err.message, /package.json/, 'missing package.json as expected')
@@ -47,7 +46,6 @@ test("issue #6735 build 'already built' message", function (t) {
     })
 
     t.test('simulate rebuild of bundledDependency', function (t) {
-
       log = ''
 
       build._didBuild[folder] = true
diff --git a/deps/npm/test/tap/builtin-config.js b/deps/npm/test/tap/builtin-config.js
index 333282e685509a..bb08767c563ff6 100644
--- a/deps/npm/test/tap/builtin-config.js
+++ b/deps/npm/test/tap/builtin-config.js
@@ -54,10 +54,10 @@ test('write npmrc file', function (t) {
              ],
              {'stdio': 'inherit'},
              function (er, code) {
-    if (er) throw er
-    t.equal(code, 0)
-    t.end()
-  })
+               if (er) throw er
+               t.equal(code, 0)
+               t.end()
+             })
 })
 
 test('use first npm to install second npm', function (t) {
@@ -104,26 +104,28 @@ test('verify that the builtin config matches', function (t) {
                '--prefix=' + folder + '/first',
                '--cache=' + folder + '/cache',
                '--tmp=' + folder + '/tmp'
-             ], {}, function (er, code, so) {
-    if (er) throw er
-    t.equal(code, 0)
-    var firstRoot = so.trim()
-    common.npm([ 'root', '-g',
-                 '--prefix=' + folder + '/second',
-                 '--cache=' + folder + '/cache',
-                 '--tmp=' + folder + '/tmp'
-               ], {}, function (er, code, so) {
-      if (er) throw er
-      t.equal(code, 0)
-      var secondRoot = so.trim()
-      var firstRc = path.resolve(firstRoot, 'npm', 'npmrc')
-      var secondRc = path.resolve(secondRoot, 'npm', 'npmrc')
-      var firstData = fs.readFileSync(firstRc, 'utf8')
-      var secondData = fs.readFileSync(secondRc, 'utf8')
-      t.equal(firstData, secondData)
-      t.end()
-    })
-  })
+             ], {},
+             function (er, code, so) {
+               if (er) throw er
+               t.equal(code, 0)
+               var firstRoot = so.trim()
+               common.npm([ 'root', '-g',
+                            '--prefix=' + folder + '/second',
+                            '--cache=' + folder + '/cache',
+                            '--tmp=' + folder + '/tmp'
+                          ], {},
+                          function (er, code, so) {
+                            if (er) throw er
+                            t.equal(code, 0)
+                            var secondRoot = so.trim()
+                            var firstRc = path.resolve(firstRoot, 'npm', 'npmrc')
+                            var secondRc = path.resolve(secondRoot, 'npm', 'npmrc')
+                            var firstData = fs.readFileSync(firstRc, 'utf8')
+                            var secondData = fs.readFileSync(secondRc, 'utf8')
+                            t.equal(firstData, secondData)
+                            t.end()
+                          })
+             })
 })
 
 test('clean', function (t) {
diff --git a/deps/npm/test/tap/cache-add-localdir-fallback.js b/deps/npm/test/tap/cache-add-localdir-fallback.js
index ca8696d2231c93..2845d11ec06c43 100644
--- a/deps/npm/test/tap/cache-add-localdir-fallback.js
+++ b/deps/npm/test/tap/cache-add-localdir-fallback.js
@@ -8,35 +8,35 @@ var realizePackageSpecifier = requireInject('realize-package-specifier', {
     stat: function (file, cb) {
       process.nextTick(function () {
         switch (file) {
-        case path.resolve('named'):
-          cb(new Error('ENOENT'))
-          break
-        case path.resolve('file.tgz'):
-          cb(null, { isDirectory: function () { return false } })
-          break
-        case path.resolve('dir-no-package'):
-          cb(null, { isDirectory: function () { return true } })
-          break
-        case path.resolve('dir-no-package/package.json'):
-          cb(new Error('ENOENT'))
-          break
-        case path.resolve('dir-with-package'):
-          cb(null, { isDirectory: function () { return true } })
-          break
-        case path.resolve('dir-with-package/package.json'):
-          cb(null, {})
-          break
-        case path.resolve(__dirname, 'dir-with-package'):
-          cb(null, { isDirectory: function () { return true } })
-          break
-        case path.join(__dirname, 'dir-with-package', 'package.json'):
-          cb(null, {})
-          break
-        case path.resolve(__dirname, 'file.tgz'):
-          cb(null, { isDirectory: function () { return false } })
-          break
-        default:
-          throw new Error('Unknown test file passed to stat: ' + file)
+          case path.resolve('named'):
+            cb(new Error('ENOENT'))
+            break
+          case path.resolve('file.tgz'):
+            cb(null, { isDirectory: function () { return false } })
+            break
+          case path.resolve('dir-no-package'):
+            cb(null, { isDirectory: function () { return true } })
+            break
+          case path.resolve('dir-no-package/package.json'):
+            cb(new Error('ENOENT'))
+            break
+          case path.resolve('dir-with-package'):
+            cb(null, { isDirectory: function () { return true } })
+            break
+          case path.resolve('dir-with-package/package.json'):
+            cb(null, {})
+            break
+          case path.resolve(__dirname, 'dir-with-package'):
+            cb(null, { isDirectory: function () { return true } })
+            break
+          case path.join(__dirname, 'dir-with-package', 'package.json'):
+            cb(null, {})
+            break
+          case path.resolve(__dirname, 'file.tgz'):
+            cb(null, { isDirectory: function () { return false } })
+            break
+          default:
+            throw new Error('Unknown test file passed to stat: ' + file)
         }
       })
     }
diff --git a/deps/npm/test/tap/cache-add-unpublished.js b/deps/npm/test/tap/cache-add-unpublished.js
index fe6807f19f987c..0d39ad815a2bb5 100644
--- a/deps/npm/test/tap/cache-add-unpublished.js
+++ b/deps/npm/test/tap/cache-add-unpublished.js
@@ -6,19 +6,23 @@ test('cache add', function (t) {
     if (er) {
       throw er
     }
-    common.npm([
-      'cache',
-      'add',
-      'superfoo',
-      '--registry=http://localhost:1337/'
-    ], {}, function (er, c, so, se) {
-      if (er) throw er
-      t.ok(c, 'got non-zero exit code')
-      t.equal(so, '', 'nothing printed to stdout')
-      t.similar(se, /404 Not Found: superfoo/, 'got expected error')
-      s.close()
-      t.end()
-    })
+    common.npm(
+      [
+        'cache',
+        'add',
+        'superfoo',
+        '--registry=http://localhost:1337/'
+      ],
+      {},
+      function (er, c, so, se) {
+        if (er) throw er
+        t.ok(c, 'got non-zero exit code')
+        t.equal(so, '', 'nothing printed to stdout')
+        t.similar(se, /404 Not Found: superfoo/, 'got expected error')
+        s.close()
+        t.end()
+      }
+    )
   })
 })
 
diff --git a/deps/npm/test/tap/config-private.js b/deps/npm/test/tap/config-private.js
index 97c6a73f14e27c..91582921e6dffa 100644
--- a/deps/npm/test/tap/config-private.js
+++ b/deps/npm/test/tap/config-private.js
@@ -15,7 +15,8 @@ test('setup', function (t) {
 })
 
 test('config get private var (old auth)', function (t) {
-  common.npm([
+  common.npm(
+    [
       'config',
       'get',
       '_auth'
@@ -32,7 +33,8 @@ test('config get private var (old auth)', function (t) {
 })
 
 test('config get private var (new auth)', function (t) {
-  common.npm([
+  common.npm(
+    [
       'config',
       'get',
       '//registry.npmjs.org/:_password'
diff --git a/deps/npm/test/tap/dedupe.js b/deps/npm/test/tap/dedupe.js
index 4c342481891b67..bdda3474ac5cd0 100644
--- a/deps/npm/test/tap/dedupe.js
+++ b/deps/npm/test/tap/dedupe.js
@@ -58,8 +58,7 @@ test('setup', function (t) {
 })
 
 test('dedupe finds the common module and moves it up one level', function (t) {
-  common.npm(
-  [
+  common.npm([
     '--registry', common.registry,
     'install', '.'
   ],
diff --git a/deps/npm/test/tap/gently-rm-cmdshims.js b/deps/npm/test/tap/gently-rm-cmdshims.js
index ebe0b7d7a71a7f..ea1f47a0dd0f27 100644
--- a/deps/npm/test/tap/gently-rm-cmdshims.js
+++ b/deps/npm/test/tap/gently-rm-cmdshims.js
@@ -127,28 +127,30 @@ test('remove-cmd-shims', function (t) {
 
   var gentlyRm = require('../../lib/utils/gently-rm.js')
   runAll([ [gentlyRm, doremove_example_cmd, true, doremove_module],
-           [gentlyRm, doremove_example_cygwin, true, doremove_module] ], function () {
-    fs.stat(doremove_example_cmd, function (er) {
-      t.is(er && er.code, 'ENOENT', 'cmd-shim was removed')
-    })
-    fs.stat(doremove_example_cygwin, function (er) {
-      t.is(er && er.code, 'ENOENT', 'cmd-shim cygwin script was removed')
-    })
-  })
+           [gentlyRm, doremove_example_cygwin, true, doremove_module] ],
+           function () {
+             fs.stat(doremove_example_cmd, function (er) {
+               t.is(er && er.code, 'ENOENT', 'cmd-shim was removed')
+             })
+             fs.stat(doremove_example_cygwin, function (er) {
+               t.is(er && er.code, 'ENOENT', 'cmd-shim cygwin script was removed')
+             })
+           })
 })
 
 test('dont-remove-cmd-shims', function (t) {
   t.plan(2)
   var gentlyRm = require('../../lib/utils/gently-rm.js')
   runAll([ [gentlyRm, dontremove_example_cmd, true, dontremove_module],
-           [gentlyRm, dontremove_example_cygwin, true, dontremove_module] ], function () {
-    fs.stat(dontremove_example_cmd, function (er) {
-      t.is(er, null, 'cmd-shim was not removed')
-    })
-    fs.stat(dontremove_example_cygwin, function (er) {
-      t.is(er, null, 'cmd-shim cygwin script was not removed')
-    })
-  })
+           [gentlyRm, dontremove_example_cygwin, true, dontremove_module] ],
+           function () {
+             fs.stat(dontremove_example_cmd, function (er) {
+               t.is(er, null, 'cmd-shim was not removed')
+             })
+             fs.stat(dontremove_example_cygwin, function (er) {
+               t.is(er, null, 'cmd-shim cygwin script was not removed')
+             })
+           })
 })
 
 test('cleanup', function (t) {
diff --git a/deps/npm/test/tap/git-cache-no-hooks.js b/deps/npm/test/tap/git-cache-no-hooks.js
index e5d862919a8071..cfc2d1dc62f011 100644
--- a/deps/npm/test/tap/git-cache-no-hooks.js
+++ b/deps/npm/test/tap/git-cache-no-hooks.js
@@ -20,7 +20,6 @@ test('setup', function (t) {
 })
 
 test('git-cache-no-hooks: install a git dependency', function (t) {
-
   // disable git integration tests on Travis.
   if (process.env.TRAVIS) return t.end()
 
diff --git a/deps/npm/test/tap/git-dependency-install-link.js b/deps/npm/test/tap/git-dependency-install-link.js
index 1eba7ff85573ce..15f43e7bb772d0 100644
--- a/deps/npm/test/tap/git-dependency-install-link.js
+++ b/deps/npm/test/tap/git-dependency-install-link.js
@@ -123,47 +123,47 @@ function setup (cb) {
     prefix: pkg,
     loglevel: 'silent'
   }, function () {
-      git = require('../../lib/utils/git.js')
-
-      function startDaemon (cb) {
-        // start git server
-        var d = git.spawn(
-          [
-            'daemon',
-            '--verbose',
-            '--listen=localhost',
-            '--export-all',
-            '--base-path=.',
-            '--port=1234'
-          ],
-          {
-            cwd: pkg,
-            env: process.env,
-            stdio: ['pipe', 'pipe', 'pipe']
-          }
-        )
-        d.stderr.on('data', childFinder)
-
-        function childFinder (c) {
-          var cpid = c.toString().match(/^\[(\d+)\]/)
-          if (cpid[1]) {
-            this.removeListener('data', childFinder)
-            cb(null, [d, cpid[1]])
-          }
+    git = require('../../lib/utils/git.js')
+
+    function startDaemon (cb) {
+      // start git server
+      var d = git.spawn(
+        [
+          'daemon',
+          '--verbose',
+          '--listen=localhost',
+          '--export-all',
+          '--base-path=.',
+          '--port=1234'
+        ],
+        {
+          cwd: pkg,
+          env: process.env,
+          stdio: ['pipe', 'pipe', 'pipe']
+        }
+      )
+      d.stderr.on('data', childFinder)
+
+      function childFinder (c) {
+        var cpid = c.toString().match(/^\[(\d+)\]/)
+        if (cpid[1]) {
+          this.removeListener('data', childFinder)
+          cb(null, [d, cpid[1]])
         }
       }
+    }
 
-      common.makeGitRepo({
-        path: repo,
-        commands: [
-          git.chainableExec(
-            ['clone', '--bare', repo, 'child.git'],
-            { cwd: pkg, env: process.env }
-          ),
-          startDaemon
-        ]
-      }, cb)
-    })
+    common.makeGitRepo({
+      path: repo,
+      commands: [
+        git.chainableExec(
+          ['clone', '--bare', repo, 'child.git'],
+          { cwd: pkg, env: process.env }
+        ),
+        startDaemon
+      ]
+    }, cb)
+  })
 }
 
 function cleanup () {
diff --git a/deps/npm/test/tap/init-interrupt.js b/deps/npm/test/tap/init-interrupt.js
index 2e85a5d1b98a68..799ff07164675c 100644
--- a/deps/npm/test/tap/init-interrupt.js
+++ b/deps/npm/test/tap/init-interrupt.js
@@ -18,7 +18,6 @@ test('setup', function (t) {
 })
 
 test('issue #6684 remove confusing message', function (t) {
-
   var initJsonMock = function (dir, input, config, cb) {
     process.nextTick(function () {
       cb({ message: 'canceled' })
diff --git a/deps/npm/test/tap/install-cli-only-development.js b/deps/npm/test/tap/install-cli-only-development.js
index 21c30378e4ce47..ff9d05f547f26a 100644
--- a/deps/npm/test/tap/install-cli-only-development.js
+++ b/deps/npm/test/tap/install-cli-only-development.js
@@ -38,25 +38,8 @@ var devDependency = {
 }
 
 test('setup', function (t) {
-  mkdirp.sync(path.join(pkg, 'dependency'))
-  fs.writeFileSync(
-    path.join(pkg, 'dependency', 'package.json'),
-    JSON.stringify(dependency, null, 2)
-  )
-
-  mkdirp.sync(path.join(pkg, 'dev-dependency'))
-  fs.writeFileSync(
-    path.join(pkg, 'dev-dependency', 'package.json'),
-    JSON.stringify(devDependency, null, 2)
-  )
-
-  mkdirp.sync(path.join(pkg, 'node_modules'))
-  fs.writeFileSync(
-    path.join(pkg, 'package.json'),
-    JSON.stringify(json, null, 2)
-  )
-
-  process.chdir(pkg)
+  setup()
+  t.pass('setup ran')
   t.end()
 })
 
@@ -78,8 +61,55 @@ test('\'npm install --only=development\' should only install devDependencies', f
   })
 })
 
+test('\'npm install --only=development\' should only install devDependencies regardless of npm.config.get(\'production\')', function (t) {
+  cleanup()
+  setup()
+
+  common.npm(['install', '--only=development', '--production'], EXEC_OPTS, function (err, code) {
+    t.ifError(err, 'install development successful')
+    t.equal(code, 0, 'npm install did not raise error code')
+    t.ok(
+      JSON.parse(fs.readFileSync(
+        path.resolve(pkg, 'node_modules/dev-dependency/package.json'), 'utf8')
+      ),
+      'devDependency was installed'
+    )
+    t.notOk(
+      existsSync(path.resolve(pkg, 'node_modules/dependency/package.json')),
+      'dependency was NOT installed'
+    )
+    t.end()
+  })
+})
+
 test('cleanup', function (t) {
-  process.chdir(osenv.tmpdir())
-  rimraf.sync(pkg)
+  cleanup()
+  t.pass('cleaned up')
   t.end()
 })
+
+function setup () {
+  mkdirp.sync(path.join(pkg, 'dependency'))
+  fs.writeFileSync(
+    path.join(pkg, 'dependency', 'package.json'),
+    JSON.stringify(dependency, null, 2)
+  )
+
+  mkdirp.sync(path.join(pkg, 'dev-dependency'))
+  fs.writeFileSync(
+    path.join(pkg, 'dev-dependency', 'package.json'),
+    JSON.stringify(devDependency, null, 2)
+  )
+
+  mkdirp.sync(path.join(pkg, 'node_modules'))
+  fs.writeFileSync(
+    path.join(pkg, 'package.json'),
+    JSON.stringify(json, null, 2)
+  )
+  process.chdir(pkg)
+}
+
+function cleanup () {
+  process.chdir(osenv.tmpdir())
+  rimraf.sync(pkg)
+}
diff --git a/deps/npm/test/tap/logout.js b/deps/npm/test/tap/logout.js
index 3a62cc2737b2c1..ebe0f51ba1b852 100644
--- a/deps/npm/test/tap/logout.js
+++ b/deps/npm/test/tap/logout.js
@@ -33,22 +33,23 @@ test('npm logout', function (t) {
     if (err) throw err
 
     common.npm(
-    [
-      'logout',
-      '--registry', common.registry,
-      '--loglevel', 'silent',
-      '--userconfig', outfile
-    ],
-    opts,
-    function (err, code) {
-      t.ifError(err, 'no error output')
-      t.notOk(code, 'exited OK')
+      [
+        'logout',
+        '--registry', common.registry,
+        '--loglevel', 'silent',
+        '--userconfig', outfile
+      ],
+      opts,
+      function (err, code) {
+        t.ifError(err, 'no error output')
+        t.notOk(code, 'exited OK')
 
-      var config = fs.readFileSync(outfile, 'utf8')
-      t.equal(config, 'foo=boo\n', 'creds gone')
-      s.close()
-      t.end()
-    })
+        var config = fs.readFileSync(outfile, 'utf8')
+        t.equal(config, 'foo=boo\n', 'creds gone')
+        s.close()
+        t.end()
+      }
+    )
   })
 })
 
diff --git a/deps/npm/test/tap/outdated-color.js b/deps/npm/test/tap/outdated-color.js
index b35070c4503421..a0da3370261fbb 100644
--- a/deps/npm/test/tap/outdated-color.js
+++ b/deps/npm/test/tap/outdated-color.js
@@ -50,10 +50,10 @@ test('does not use ansi styling', function (t) {
   t.plan(4)
   mr({ port: common.port }, function (er, s) { // create mock registry.
     common.npm(
-    [
-      '--registry', common.registry,
-      'outdated', 'underscore'
-    ],
+      [
+        '--registry', common.registry,
+        'outdated', 'underscore'
+      ],
     EXEC_OPTS,
     function (err, code, stdout) {
       t.ifError(err)
diff --git a/deps/npm/test/tap/outdated-depth-deep.js b/deps/npm/test/tap/outdated-depth-deep.js
index c39e029aaec2f6..27c5f3e9fcaa2a 100644
--- a/deps/npm/test/tap/outdated-depth-deep.js
+++ b/deps/npm/test/tap/outdated-depth-deep.js
@@ -59,7 +59,9 @@ test('outdated depth deep (9999)', function (t) {
     function () {
       npm.install('.', function (er) {
         if (er) throw new Error(er)
-        npm.explore('npm-test-peer-deps', 'npm', 'install', 'underscore', function (er) {
+        var nodepath = process.env.npm_node_execpath || process.env.NODE || process.execPath
+        var clibin = path.resolve(__dirname, '../../bin/npm-cli.js')
+        npm.explore('npm-test-peer-deps', nodepath, clibin, 'install', 'underscore', function (er) {
           if (er) throw new Error(er)
           npm.outdated(function (err, d) {
             if (err) throw new Error(err)
diff --git a/deps/npm/test/tap/outdated-depth-integer.js b/deps/npm/test/tap/outdated-depth-integer.js
index ddd2dd7c35f7bb..a1fc2b99d290f4 100644
--- a/deps/npm/test/tap/outdated-depth-integer.js
+++ b/deps/npm/test/tap/outdated-depth-integer.js
@@ -58,17 +58,16 @@ test('outdated depth integer', function (t) {
       depth: 5
     }
     , function () {
-        npm.install('request@0.9.0', function (er) {
-          if (er) throw new Error(er)
-          npm.outdated(function (err, d) {
-            if (err) throw new Error(err)
-            t.deepEqual(d, expected)
-            s.close()
-            t.end()
-          })
+      npm.install('request@0.9.0', function (er) {
+        if (er) throw new Error(er)
+        npm.outdated(function (err, d) {
+          if (err) throw new Error(err)
+          t.deepEqual(d, expected)
+          s.close()
+          t.end()
         })
-      }
-    )
+      })
+    })
   })
 })
 
diff --git a/deps/npm/test/tap/outdated-notarget.js b/deps/npm/test/tap/outdated-notarget.js
index 5fd2b0634d2d21..14388a80bc2922 100644
--- a/deps/npm/test/tap/outdated-notarget.js
+++ b/deps/npm/test/tap/outdated-notarget.js
@@ -15,7 +15,7 @@ test('outdated-target: if no viable version is found, show error', function (t)
   t.plan(1)
   setup()
   mr({ port: common.port }, function (er, s) {
-    npm.load({ cache: cache, registry: common.registry}, function () {
+    npm.load({ cache: cache, registry: common.registry }, function () {
       npm.commands.update(function (er) {
         t.equal(er.code, 'ETARGET')
         s.close()
diff --git a/deps/npm/test/tap/peer-deps-toplevel.js b/deps/npm/test/tap/peer-deps-toplevel.js
index 61c3ecb0d747b3..1c95867301a19f 100644
--- a/deps/npm/test/tap/peer-deps-toplevel.js
+++ b/deps/npm/test/tap/peer-deps-toplevel.js
@@ -105,7 +105,7 @@ function setup (cb) {
   )
   process.chdir(pkg)
 
-  var opts = { cache: path.resolve(pkg, 'cache'), registry: common.registry}
+  var opts = { cache: path.resolve(pkg, 'cache'), registry: common.registry }
   npm.load(opts, cb)
 }
 
diff --git a/deps/npm/test/tap/peer-deps.js b/deps/npm/test/tap/peer-deps.js
index 7116e428b49b78..c319c32e480605 100644
--- a/deps/npm/test/tap/peer-deps.js
+++ b/deps/npm/test/tap/peer-deps.js
@@ -57,7 +57,7 @@ function setup (cb) {
   )
   process.chdir(pkg)
 
-  var opts = { cache: path.resolve(pkg, 'cache'), registry: common.registry}
+  var opts = { cache: path.resolve(pkg, 'cache'), registry: common.registry }
   npm.load(opts, cb)
 }
 
diff --git a/deps/npm/test/tap/prepublish.js b/deps/npm/test/tap/prepublish.js
index f065a656a9c167..556d01ebb0dfce 100644
--- a/deps/npm/test/tap/prepublish.js
+++ b/deps/npm/test/tap/prepublish.js
@@ -53,9 +53,9 @@ test('test', function (t) {
   }
 
   common.npm([
-      'pack',
-      '--loglevel', 'warn'
-    ], { cwd: pkg, env: env }, function (err, code, stdout, stderr) {
+    'pack',
+    '--loglevel', 'warn'
+  ], { cwd: pkg, env: env }, function (err, code, stdout, stderr) {
     t.equal(code, 0, 'pack finished successfully')
     t.ifErr(err, 'pack finished successfully')
 
diff --git a/deps/npm/test/tap/publish-invalid-semver-tag.js b/deps/npm/test/tap/publish-invalid-semver-tag.js
index 1a741d348db6e8..21543869a5ca66 100644
--- a/deps/npm/test/tap/publish-invalid-semver-tag.js
+++ b/deps/npm/test/tap/publish-invalid-semver-tag.js
@@ -39,11 +39,11 @@ test('setup', function (t) {
       registry: common.registry,
       cwd: PKG_DIR
     }, function (err) {
-        t.ifError(err, 'started server')
-        mockServer = server
+      t.ifError(err, 'started server')
+      mockServer = server
 
-        t.end()
-      })
+      t.end()
+    })
   })
 })
 
diff --git a/deps/npm/test/tap/registry.js b/deps/npm/test/tap/registry.js
index 7ff4075bf23bf0..61ed0d0aaef7ff 100644
--- a/deps/npm/test/tap/registry.js
+++ b/deps/npm/test/tap/registry.js
@@ -42,7 +42,6 @@ function runTests () {
         t.fail('install failed with: ' + code)
         t.end()
       })
-
     } else {
       opts = {
         cwd: ca,
diff --git a/deps/npm/test/tap/scripts-whitespace-windows.js b/deps/npm/test/tap/scripts-whitespace-windows.js
index f23f0625716fbb..5aa7d00840b665 100644
--- a/deps/npm/test/tap/scripts-whitespace-windows.js
+++ b/deps/npm/test/tap/scripts-whitespace-windows.js
@@ -99,4 +99,3 @@ function cleanup () {
   process.chdir(osenv.tmpdir())
   rimraf.sync(pkg)
 }
-
diff --git a/deps/npm/test/tap/search.js b/deps/npm/test/tap/search.js
index 0412e1755d62e2..08cc7a6fe67dd5 100644
--- a/deps/npm/test/tap/search.js
+++ b/deps/npm/test/tap/search.js
@@ -180,97 +180,97 @@ function stringifyUpdated (time) {
 var allMock = {
   '_updated': timeMock.all,
   'generator-frontcow': {
-      'name': 'generator-frontcow',
-      'description': 'f36b6a6123da50959741e2ce4d634f96ec668c56 This is a fake description to ensure we do not accidentally search the real npm registry or use some kind of cache',
-      'dist-tags': {
-          'latest': '0.1.19'
-      },
-      'maintainers': [
-          {
-              'name': 'bcabanes',
-              'email': 'contact@benjamincabanes.com'
-          }
-      ],
-      'homepage': 'https://github.com/bcabanes/generator-frontcow',
-      'keywords': [
-          'sass',
-          'frontend',
-          'yeoman-generator',
-          'atomic',
-          'design',
-          'sass',
-          'foundation',
-          'foundation5',
-          'atomic design',
-          'bourbon',
-          'polyfill',
-          'font awesome'
-      ],
-      'repository': {
-          'type': 'git',
-          'url': 'https://github.com/bcabanes/generator-frontcow'
-      },
-      'author': {
-          'name': 'ben',
-          'email': 'contact@benjamincabanes.com',
-          'url': 'https://github.com/bcabanes'
-      },
-      'bugs': {
-          'url': 'https://github.com/bcabanes/generator-frontcow/issues'
-      },
-      'license': 'MIT',
-      'readmeFilename': 'README.md',
-      'time': {
-          'modified': '2014-10-03T02:26:18.406Z'
-      },
-      'versions': {
-          '0.1.19': 'latest'
+    'name': 'generator-frontcow',
+    'description': 'f36b6a6123da50959741e2ce4d634f96ec668c56 This is a fake description to ensure we do not accidentally search the real npm registry or use some kind of cache',
+    'dist-tags': {
+      'latest': '0.1.19'
+    },
+    'maintainers': [
+      {
+        'name': 'bcabanes',
+        'email': 'contact@benjamincabanes.com'
       }
+    ],
+    'homepage': 'https://github.com/bcabanes/generator-frontcow',
+    'keywords': [
+      'sass',
+      'frontend',
+      'yeoman-generator',
+      'atomic',
+      'design',
+      'sass',
+      'foundation',
+      'foundation5',
+      'atomic design',
+      'bourbon',
+      'polyfill',
+      'font awesome'
+    ],
+    'repository': {
+      'type': 'git',
+      'url': 'https://github.com/bcabanes/generator-frontcow'
+    },
+    'author': {
+      'name': 'ben',
+      'email': 'contact@benjamincabanes.com',
+      'url': 'https://github.com/bcabanes'
+    },
+    'bugs': {
+      'url': 'https://github.com/bcabanes/generator-frontcow/issues'
+    },
+    'license': 'MIT',
+    'readmeFilename': 'README.md',
+    'time': {
+      'modified': '2014-10-03T02:26:18.406Z'
+    },
+    'versions': {
+      '0.1.19': 'latest'
+    }
   },
   'marko': {
-      'name': 'marko',
-      'description': 'Marko is an extensible, streaming, asynchronous, high performance, HTML-based templating language that can be used in Node.js or in the browser.',
-      'dist-tags': {
-          'latest': '1.2.16'
+    'name': 'marko',
+    'description': 'Marko is an extensible, streaming, asynchronous, high performance, HTML-based templating language that can be used in Node.js or in the browser.',
+    'dist-tags': {
+      'latest': '1.2.16'
+    },
+    'maintainers': [
+      {
+        'name': 'pnidem',
+        'email': 'pnidem@gmail.com'
       },
-      'maintainers': [
-          {
-              'name': 'pnidem',
-              'email': 'pnidem@gmail.com'
-          },
-          {
-              'name': 'philidem',
-              'email': 'phillip.idem@gmail.com'
-          }
-      ],
-      'homepage': 'https://github.com/raptorjs/marko',
-      'keywords': [
-          'templating',
-          'template',
-          'async',
-          'streaming'
-      ],
-      'repository': {
-          'type': 'git',
-          'url': 'https://github.com/raptorjs/marko.git'
-      },
-      'author': {
-          'name': 'Patrick Steele-Idem',
-          'email': 'pnidem@gmail.com'
-      },
-      'bugs': {
-          'url': 'https://github.com/raptorjs/marko/issues'
-      },
-      'license': 'Apache License v2.0',
-      'readmeFilename': 'README.md',
-      'users': {
-          'pnidem': true
-      },
-      'time': {
-          'modified': '2014-10-03T02:27:31.775Z'
-      },
-      'versions': {
-          '1.2.16': 'latest'
+      {
+        'name': 'philidem',
+        'email': 'phillip.idem@gmail.com'
       }
+    ],
+    'homepage': 'https://github.com/raptorjs/marko',
+    'keywords': [
+      'templating',
+      'template',
+      'async',
+      'streaming'
+    ],
+    'repository': {
+      'type': 'git',
+      'url': 'https://github.com/raptorjs/marko.git'
+    },
+    'author': {
+      'name': 'Patrick Steele-Idem',
+      'email': 'pnidem@gmail.com'
+    },
+    'bugs': {
+      'url': 'https://github.com/raptorjs/marko/issues'
+    },
+    'license': 'Apache License v2.0',
+    'readmeFilename': 'README.md',
+    'users': {
+      'pnidem': true
+    },
+    'time': {
+      'modified': '2014-10-03T02:27:31.775Z'
+    },
+    'versions': {
+      '1.2.16': 'latest'
+    }
   }
 }
diff --git a/deps/npm/test/tap/shrinkwrap-optional-dependency.js b/deps/npm/test/tap/shrinkwrap-optional-dependency.js
new file mode 100644
index 00000000000000..ee44b9a7b05d69
--- /dev/null
+++ b/deps/npm/test/tap/shrinkwrap-optional-dependency.js
@@ -0,0 +1,101 @@
+var fs = require('fs')
+var path = require('path')
+
+var mkdirp = require('mkdirp')
+var mr = require('npm-registry-mock')
+var osenv = require('osenv')
+var rimraf = require('rimraf')
+var test = require('tap').test
+
+var common = require('../common-tap.js')
+var npm = npm = require('../../')
+
+var pkg = path.resolve(__dirname, 'shrinkwrap-optional-dependency')
+
+test('shrinkwrap does not fail on missing optional dependency', function (t) {
+  t.plan(1)
+
+  var mocks = {
+    get: {
+      '/random-package': [404, {}]
+    }
+  }
+
+  mr({port: common.port, mocks: mocks}, function (er, s) {
+    function fail (err) {
+      s.close() // Close on failure to allow node to exit
+      t.fail(err)
+    }
+
+    setup(function (err) {
+      if (err) return fail(err)
+
+      // Install without the optional dependency
+      npm.install('.', function (err) {
+        if (err) return fail(err)
+
+        // Pretend the optional dependency was specified, but somehow failed to load:
+        json.optionalDependencies = {
+          'random-package': '0.0.0'
+        }
+        writePackage()
+
+        npm.commands.shrinkwrap([], true, function (err, results) {
+          if (err) return fail(err)
+
+          t.deepEqual(results, desired)
+          s.close()
+          t.end()
+        })
+      })
+    })
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
+
+var desired = {
+  name: 'npm-test-shrinkwrap-optional-dependency',
+  version: '0.0.0',
+  dependencies: {
+    'test-package': {
+      version: '0.0.0',
+      from: 'test-package@0.0.0',
+      resolved: common.registry + '/test-package/-/test-package-0.0.0.tgz'
+    }
+  }
+}
+
+var json = {
+  author: 'Maximilian Antoni',
+  name: 'npm-test-shrinkwrap-optional-dependency',
+  version: '0.0.0',
+  dependencies: {
+    'test-package': '0.0.0'
+  }
+}
+
+function writePackage () {
+  fs.writeFileSync(path.join(pkg, 'package.json'), JSON.stringify(json, null, 2))
+}
+
+function setup (cb) {
+  cleanup()
+  mkdirp.sync(pkg)
+  writePackage()
+  process.chdir(pkg)
+
+  var opts = {
+    cache: path.resolve(pkg, 'cache'),
+    registry: common.registry
+  }
+  npm.load(opts, cb)
+}
+
+function cleanup () {
+  process.chdir(osenv.tmpdir())
+  rimraf.sync(pkg)
+}
diff --git a/deps/npm/test/tap/shrinkwrap-save-with-existing-dev-deps.js b/deps/npm/test/tap/shrinkwrap-save-with-existing-dev-deps.js
new file mode 100644
index 00000000000000..fa8895577a4cc9
--- /dev/null
+++ b/deps/npm/test/tap/shrinkwrap-save-with-existing-dev-deps.js
@@ -0,0 +1,87 @@
+var fs = require('fs')
+var path = require('path')
+
+var mkdirp = require('mkdirp')
+var osenv = require('osenv')
+var rimraf = require('rimraf')
+var test = require('tap').test
+
+var common = require('../common-tap.js')
+
+var base = path.resolve(__dirname, path.basename(__filename, '.js'))
+var installme = path.join(base, 'installme')
+var installme_pkg = path.join(installme, 'package.json')
+var example = path.join(base, 'example')
+var example_shrinkwrap = path.join(example, 'npm-shrinkwrap.json')
+var example_pkg = path.join(example, 'package.json')
+var installed = path.join(example, 'node_modules', 'installed')
+var installed_pkg = path.join(installed, 'package.json')
+
+var EXEC_OPTS = { cwd: example }
+
+var installme_pkg_json = {
+  name: 'installme',
+  version: '1.0.0',
+  dependencies: {}
+}
+
+var example_pkg_json = {
+  name: 'example',
+  version: '1.0.0',
+  dependencies: {},
+  devDependencies: {
+    'installed': '1.0'
+  }
+}
+
+var example_shrinkwrap_json = {
+  name: 'example',
+  version: '1.0.0',
+  dependencies: {
+    installed: {
+      version: '1.0.0'
+    }
+  }
+}
+
+var installed_pkg_json = {
+  _id: 'installed@1.0.0',
+  name: 'installed',
+  version: '1.0.0'
+}
+
+function writeJson (filename, obj) {
+  mkdirp.sync(path.dirname(filename))
+  fs.writeFileSync(filename, JSON.stringify(obj, null, 2))
+}
+
+test('setup', function (t) {
+  cleanup()
+  writeJson(installme_pkg, installme_pkg_json)
+  writeJson(example_pkg, example_pkg_json)
+  writeJson(example_shrinkwrap, example_shrinkwrap_json)
+  writeJson(installed_pkg, installed_pkg_json)
+  t.end()
+})
+
+test('install --save leaves dev deps alone', function (t) {
+  common.npm(['install', '--save', 'file://' + installme], EXEC_OPTS, function (er, code, stdout, stderr) {
+    t.ifError(er, "spawn didn't catch fire")
+    t.is(code, 0, 'install completed ok')
+    t.is(stderr, '', 'install completed without error output')
+    var shrinkwrap = JSON.parse(fs.readFileSync(example_shrinkwrap))
+    t.ok(shrinkwrap.dependencies.installed, "save new install didn't remove dev dep")
+    t.ok(shrinkwrap.dependencies.installme, 'save new install DID add new dep')
+    t.end()
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
+
+function cleanup () {
+  process.chdir(osenv.tmpdir())
+  rimraf.sync(base)
+}
diff --git a/deps/npm/test/tap/tag-version-prefix.js b/deps/npm/test/tap/tag-version-prefix.js
index f4ba32b1255618..9035e9fbdd5a0b 100644
--- a/deps/npm/test/tap/tag-version-prefix.js
+++ b/deps/npm/test/tap/tag-version-prefix.js
@@ -25,49 +25,48 @@ test('npm version <semver> with message config', function (t) {
     var git = require('../../lib/utils/git.js')
 
     common.makeGitRepo({ path: pkg }, function (er) {
-        t.ifErr(er, 'git bootstrap ran without error')
-
-        common.npm(
-          [
-            '--userconfig', npmrc,
-            'config',
-            'set',
-            'tag-version-prefix',
-            'q'
-          ],
-          { cwd: pkg, env: { PATH: process.env.PATH } },
-          function (err, code, stdout, stderr) {
-            t.ifError(err, 'npm config ran without issue')
-            t.notOk(code, 'exited with a non-error code')
-            t.notOk(stderr, 'no error output')
-
-            common.npm(
-              [
-                'version',
-                'patch',
-                '--loglevel', 'silent'
-                // package config is picked up from env
-              ],
-              { cwd: pkg, env: { PATH: process.env.PATH } },
-              function (err, code, stdout, stderr) {
-                t.ifError(err, 'npm version ran without issue')
-                t.notOk(code, 'exited with a non-error code')
-                t.notOk(stderr, 'no error output')
-
-                git.whichAndExec(
-                  ['tag'],
-                  { cwd: pkg, env: process.env },
-                  function (er, tags, stderr) {
-                    t.ok(tags.match(/q0\.1\.3/g), 'tag was created by version' + tags)
-                    t.end()
-                  }
-                )
-              }
-            )
-          }
-        )
-      }
-    )
+      t.ifErr(er, 'git bootstrap ran without error')
+
+      common.npm(
+        [
+          '--userconfig', npmrc,
+          'config',
+          'set',
+          'tag-version-prefix',
+          'q'
+        ],
+        { cwd: pkg, env: { PATH: process.env.PATH } },
+        function (err, code, stdout, stderr) {
+          t.ifError(err, 'npm config ran without issue')
+          t.notOk(code, 'exited with a non-error code')
+          t.notOk(stderr, 'no error output')
+
+          common.npm(
+            [
+              'version',
+              'patch',
+              '--loglevel', 'silent'
+              // package config is picked up from env
+            ],
+            { cwd: pkg, env: { PATH: process.env.PATH } },
+            function (err, code, stdout, stderr) {
+              t.ifError(err, 'npm version ran without issue')
+              t.notOk(code, 'exited with a non-error code')
+              t.notOk(stderr, 'no error output')
+
+              git.whichAndExec(
+                ['tag'],
+                { cwd: pkg, env: process.env },
+                function (er, tags, stderr) {
+                  t.ok(tags.match(/q0\.1\.3/g), 'tag was created by version' + tags)
+                  t.end()
+                }
+              )
+            }
+          )
+        }
+      )
+    })
   })
 })
 
diff --git a/deps/npm/test/tap/unit-child-path.js b/deps/npm/test/tap/unit-child-path.js
new file mode 100644
index 00000000000000..5e9b452a381a89
--- /dev/null
+++ b/deps/npm/test/tap/unit-child-path.js
@@ -0,0 +1,9 @@
+'use strict'
+var test = require('tap').test
+var childPath = require('../../lib/utils/child-path.js')
+
+test('childPath', function (t) {
+  t.is(childPath('/path/to', {name: 'abc'}), '/path/to/node_modules/abc', 'basic use')
+  t.is(childPath('/path/to', {package: {name: '@zed/abc'}}), '/path/to/node_modules/@zed/abc', 'scoped use')
+  t.end()
+})
diff --git a/deps/npm/test/tap/unit-deps-replaceModule.js b/deps/npm/test/tap/unit-deps-replaceModule.js
new file mode 100644
index 00000000000000..aa7c2f51d948c1
--- /dev/null
+++ b/deps/npm/test/tap/unit-deps-replaceModule.js
@@ -0,0 +1,50 @@
+'use strict'
+var test = require('tap').test
+var npm = require('../../lib/npm')
+
+test('setup', function (t) {
+  npm.load({}, t.done)
+})
+
+test('replaceModule', function (t) {
+  var replaceModule = require('../../lib/install/deps').test.replaceModule
+  var mods = []
+  for (var ii = 0; ii < 10; ++ii) {
+    mods.push({package: {name: ii}})
+  }
+
+  var test = {}
+  test.A = mods.slice(0, 4)
+  replaceModule(test, 'A', mods[2])
+  t.isDeeply(test.A, mods.slice(0, 4), 'replacing an existing module leaves the order alone')
+  replaceModule(test, 'A', mods[7])
+  t.isDeeply(test.A, mods.slice(0, 4).concat(mods[7]), 'replacing a new module appends')
+
+  test.B = mods.slice(0, 4)
+  var replacement = {package: {name: 1}, isReplacement: true}
+  replaceModule(test, 'B', replacement)
+  t.isDeeply(test.B, [mods[0], replacement, mods[2], mods[3]], 'replacing existing module swaps out for the new version')
+
+  replaceModule(test, 'C', mods[7])
+  t.isDeeply(test.C, [mods[7]], 'replacing when the key does not exist yet, causes its creation')
+  t.end()
+})
+
+test('replaceModuleName', function (t) {
+  var replaceModuleName = require('../../lib/install/deps').test.replaceModuleName
+  var mods = []
+  for (var ii = 0; ii < 10; ++ii) {
+    mods.push('pkg' + ii)
+  }
+
+  var test = {}
+  test.A = mods.slice(0, 4)
+  replaceModuleName(test, 'A', mods[2])
+  t.isDeeply(test.A, mods.slice(0, 4), 'replacing an existing module leaves the order alone')
+  replaceModuleName(test, 'A', mods[7])
+  t.isDeeply(test.A, mods.slice(0, 4).concat(mods[7]), 'replacing a new module appends')
+
+  replaceModuleName(test, 'C', mods[7])
+  t.isDeeply(test.C, [mods[7]], 'replacing when the key does not exist yet, causes its creation')
+  t.end()
+})
diff --git a/deps/npm/test/tap/unit-module-name.js b/deps/npm/test/tap/unit-module-name.js
new file mode 100644
index 00000000000000..59d4b44f0b36c7
--- /dev/null
+++ b/deps/npm/test/tap/unit-module-name.js
@@ -0,0 +1,40 @@
+'use strict'
+var test = require('tap').test
+var moduleName = require('../../lib/utils/module-name.js')
+
+test('pathToPackageName', function (t) {
+  var pathToPackageName = moduleName.test.pathToPackageName
+  t.is(pathToPackageName('/foo/bar/baz/bark'), 'bark', 'simple module name')
+  t.is(pathToPackageName('/foo/bar/@baz/bark'), '@baz/bark', 'scoped module name')
+  t.is(pathToPackageName('/foo'), 'foo', 'module at top')
+  t.is(pathToPackageName('/@foo'), '@foo', 'invalid module at top')
+  t.is(pathToPackageName('/'), '', 'root, empty result')
+  t.is(pathToPackageName(''), '', 'empty, empty')
+  t.is(pathToPackageName(undefined), '', 'undefined is empty')
+  t.is(pathToPackageName(null), '', 'null is empty')
+  t.done()
+})
+
+test('isNotEmpty', function (t) {
+  var isNotEmpty = moduleName.test.isNotEmpty
+  t.is(isNotEmpty('abc'), true, 'string is not empty')
+  t.is(isNotEmpty(''), false, 'empty string is empty')
+  t.is(isNotEmpty(null), false, 'null is empty')
+  t.is(isNotEmpty(undefined), false, 'undefined is empty')
+  t.is(isNotEmpty(0), true, 'zero is not empty')
+  t.is(isNotEmpty(true), true, 'true is not empty')
+  t.is(isNotEmpty([]), true, 'empty array is not empty')
+  t.is(isNotEmpty({}), true, 'object is not empty')
+  t.done()
+})
+
+test('moduleName', function (t) {
+  t.is(moduleName({package: {name: 'foo'}}), 'foo', 'package named')
+  t.is(moduleName({name: 'foo'}), 'foo', 'package named, no tree')
+  t.is(moduleName({path: '/foo/bar'}), 'bar', 'path named')
+  t.is(moduleName({}), '!invalid#1', 'no named')
+  t.is(moduleName({path: '/'}), '!invalid#2', 'invalid named')
+  var obj = {}
+  t.is(moduleName(obj), moduleName(obj), 'once computed, an invalid module name will not change')
+  t.done()
+})
diff --git a/deps/npm/test/tap/unit-package-id.js b/deps/npm/test/tap/unit-package-id.js
new file mode 100644
index 00000000000000..19590d82efee7f
--- /dev/null
+++ b/deps/npm/test/tap/unit-package-id.js
@@ -0,0 +1,17 @@
+'use strict'
+var test = require('tap').test
+var packageId = require('../../lib/utils/package-id.js')
+
+test('packageId', function (t) {
+  t.is(packageId({package: {_id: 'abc@123'}}), 'abc@123', 'basic')
+  t.is(packageId({_id: 'abc@123'}), 'abc@123', 'basic no tree')
+  t.is(packageId({package: {name: 'abc', version: '123'}}), 'abc@123', 'computed')
+  t.is(packageId({package: {_id: '@', name: 'abc', version: '123'}}), 'abc@123', 'computed, ignore invalid id')
+  t.is(packageId({package: {name: 'abc'}}), 'abc', 'no version')
+  t.is(packageId({package: {version: '123'}}), '!invalid#1@123', 'version, no name')
+  t.is(packageId({package: {version: '123'}, path: '/path/to/abc'}), 'abc@123', 'version path-name')
+  t.is(packageId({package: {version: '123'}, path: '/path/@to/abc'}), '@to/abc@123', 'version scoped-path-name')
+  t.is(packageId({path: '/path/to/abc'}), 'abc', 'path name, no version')
+  t.is(packageId({}), '!invalid#2', 'nothing')
+  t.done()
+})
diff --git a/deps/npm/test/tap/update-examples.js b/deps/npm/test/tap/update-examples.js
index ae67e4a911a72b..54844789556a51 100644
--- a/deps/npm/test/tap/update-examples.js
+++ b/deps/npm/test/tap/update-examples.js
@@ -150,19 +150,19 @@ test('setup', function (t) {
     npm.load({ cache: CACHE_DIR,
       registry: common.registry,
     cwd: PKG_DIR }, function (err) {
-        t.ifError(err, 'started server')
-        mockServer = server
+      t.ifError(err, 'started server')
+      mockServer = server
 
-        t.pass('npm.load complete')
+      t.pass('npm.load complete')
 
-        mockCommand(npm, 'install', function mockInstall (where, what, cb) {
-          installAskedFor = what
-          cb(null)
-        })
-
-        t.pass('mocks configured')
-        t.end()
+      mockCommand(npm, 'install', function mockInstall (where, what, cb) {
+        installAskedFor = what
+        cb(null)
       })
+
+      t.pass('mocks configured')
+      t.end()
+    })
   })
 })
 
diff --git a/deps/npm/test/tap/update-index.js b/deps/npm/test/tap/update-index.js
index fe4244c308b650..91b2f787810bd6 100644
--- a/deps/npm/test/tap/update-index.js
+++ b/deps/npm/test/tap/update-index.js
@@ -31,98 +31,98 @@ var mocks = {
 var allMock = {
   '_updated': 1411727900 + 25,
   'generator-frontcow': {
-      'name': 'generator-frontcow',
-      'description': 'f36b6a6123da50959741e2ce4d634f96ec668c56 This is a fake description to ensure we do not accidentally search the real npm registry or use some kind of cache',
-      'dist-tags': {
-          'latest': '0.1.19'
-      },
-      'maintainers': [
-          {
-              'name': 'bcabanes',
-              'email': 'contact@benjamincabanes.com'
-          }
-      ],
-      'homepage': 'https://github.com/bcabanes/generator-frontcow',
-      'keywords': [
-          'sass',
-          'frontend',
-          'yeoman-generator',
-          'atomic',
-          'design',
-          'sass',
-          'foundation',
-          'foundation5',
-          'atomic design',
-          'bourbon',
-          'polyfill',
-          'font awesome'
-      ],
-      'repository': {
-          'type': 'git',
-          'url': 'https://github.com/bcabanes/generator-frontcow'
-      },
-      'author': {
-          'name': 'ben',
-          'email': 'contact@benjamincabanes.com',
-          'url': 'https://github.com/bcabanes'
-      },
-      'bugs': {
-          'url': 'https://github.com/bcabanes/generator-frontcow/issues'
-      },
-      'license': 'MIT',
-      'readmeFilename': 'README.md',
-      'time': {
-          'modified': '2014-10-03T02:26:18.406Z'
-      },
-      'versions': {
-          '0.1.19': 'latest'
+    'name': 'generator-frontcow',
+    'description': 'f36b6a6123da50959741e2ce4d634f96ec668c56 This is a fake description to ensure we do not accidentally search the real npm registry or use some kind of cache',
+    'dist-tags': {
+      'latest': '0.1.19'
+    },
+    'maintainers': [
+      {
+        'name': 'bcabanes',
+        'email': 'contact@benjamincabanes.com'
       }
+    ],
+    'homepage': 'https://github.com/bcabanes/generator-frontcow',
+    'keywords': [
+      'sass',
+      'frontend',
+      'yeoman-generator',
+      'atomic',
+      'design',
+      'sass',
+      'foundation',
+      'foundation5',
+      'atomic design',
+      'bourbon',
+      'polyfill',
+      'font awesome'
+    ],
+    'repository': {
+      'type': 'git',
+      'url': 'https://github.com/bcabanes/generator-frontcow'
+    },
+    'author': {
+      'name': 'ben',
+      'email': 'contact@benjamincabanes.com',
+      'url': 'https://github.com/bcabanes'
+    },
+    'bugs': {
+      'url': 'https://github.com/bcabanes/generator-frontcow/issues'
+    },
+    'license': 'MIT',
+    'readmeFilename': 'README.md',
+    'time': {
+      'modified': '2014-10-03T02:26:18.406Z'
+    },
+    'versions': {
+      '0.1.19': 'latest'
+    }
   },
   'marko': {
-      'name': 'marko',
-      'description': 'Marko is an extensible, streaming, asynchronous, high performance, HTML-based templating language that can be used in Node.js or in the browser.',
-      'dist-tags': {
-          'latest': '1.2.16'
-      },
-      'maintainers': [
-          {
-              'name': 'pnidem',
-              'email': 'pnidem@gmail.com'
-          },
-          {
-              'name': 'philidem',
-              'email': 'phillip.idem@gmail.com'
-          }
-      ],
-      'homepage': 'https://github.com/raptorjs/marko',
-      'keywords': [
-          'templating',
-          'template',
-          'async',
-          'streaming'
-      ],
-      'repository': {
-          'type': 'git',
-          'url': 'https://github.com/raptorjs/marko.git'
-      },
-      'author': {
-          'name': 'Patrick Steele-Idem',
-          'email': 'pnidem@gmail.com'
-      },
-      'bugs': {
-          'url': 'https://github.com/raptorjs/marko/issues'
-      },
-      'license': 'Apache License v2.0',
-      'readmeFilename': 'README.md',
-      'users': {
-          'pnidem': true
-      },
-      'time': {
-          'modified': '2014-10-03T02:27:31.775Z'
+    'name': 'marko',
+    'description': 'Marko is an extensible, streaming, asynchronous, high performance, HTML-based templating language that can be used in Node.js or in the browser.',
+    'dist-tags': {
+      'latest': '1.2.16'
+    },
+    'maintainers': [
+      {
+        'name': 'pnidem',
+        'email': 'pnidem@gmail.com'
       },
-      'versions': {
-          '1.2.16': 'latest'
+      {
+        'name': 'philidem',
+        'email': 'phillip.idem@gmail.com'
       }
+    ],
+    'homepage': 'https://github.com/raptorjs/marko',
+    'keywords': [
+      'templating',
+      'template',
+      'async',
+      'streaming'
+    ],
+    'repository': {
+      'type': 'git',
+      'url': 'https://github.com/raptorjs/marko.git'
+    },
+    'author': {
+      'name': 'Patrick Steele-Idem',
+      'email': 'pnidem@gmail.com'
+    },
+    'bugs': {
+      'url': 'https://github.com/raptorjs/marko/issues'
+    },
+    'license': 'Apache License v2.0',
+    'readmeFilename': 'README.md',
+    'users': {
+      'pnidem': true
+    },
+    'time': {
+      'modified': '2014-10-03T02:27:31.775Z'
+    },
+    'versions': {
+      '1.2.16': 'latest'
+    }
   }
 }
 
diff --git a/deps/npm/test/tap/version-no-tags.js b/deps/npm/test/tap/version-no-tags.js
index ed2bed32c29dee..755e640c0b31ea 100644
--- a/deps/npm/test/tap/version-no-tags.js
+++ b/deps/npm/test/tap/version-no-tags.js
@@ -14,7 +14,7 @@ var cache = path.resolve(pkg, 'cache')
 
 test('npm version <semver> without git tag', function (t) {
   setup()
-  npm.load({ cache: cache, registry: common.registry}, function () {
+  npm.load({ cache: cache, registry: common.registry }, function () {
     which('git', function (err, git) {
       t.ifError(err, 'git found on system')
       function tagExists (tag, _cb) {
diff --git a/deps/npm/test/tap/version-update-shrinkwrap.js b/deps/npm/test/tap/version-update-shrinkwrap.js
index acf6cca8e5679d..c51ab2cb0d2c99 100644
--- a/deps/npm/test/tap/version-update-shrinkwrap.js
+++ b/deps/npm/test/tap/version-update-shrinkwrap.js
@@ -48,7 +48,7 @@ test('npm version <semver> updates git works with no shrinkwrap', function (t) {
     var shrinkwrap = require(path.resolve(pkg, 'npm-shrinkwrap.json'))
     t.equal(shrinkwrap.version, '0.0.1', 'got expected version')
 
-    var opts = { cwd: pkg, env: { PATH: process.env.PATH }}
+    var opts = { cwd: pkg, env: { PATH: process.env.PATH } }
     var git = require('../../lib/utils/git.js')
     git.whichAndExec(
       ['show', 'HEAD', '--name-only'],
@@ -91,7 +91,7 @@ test('npm version <semver> updates shrinkwrap and updates git', function (t) {
     t.equal(shrinkwrap.version, '0.0.1', 'got expected version')
 
     var git = require('../../lib/utils/git.js')
-    var opts = { cwd: pkg, env: { PATH: process.env.PATH }}
+    var opts = { cwd: pkg, env: { PATH: process.env.PATH } }
     git.whichAndExec(
       ['show', 'HEAD', '--name-only'],
       opts,
diff --git a/deps/npm/test/tap/view.js b/deps/npm/test/tap/view.js
index 84a0a69d30c428..f54fe93a18aa4a 100644
--- a/deps/npm/test/tap/view.js
+++ b/deps/npm/test/tap/view.js
@@ -84,7 +84,7 @@ test('npm view . with no package.json', function (t) {
 
 test('npm view . with no published package', function (t) {
   process.chdir(t3dir)
-  mr({ port: common.port, plugin: plugin}, function (er, s) {
+  mr({ port: common.port, plugin: plugin }, function (er, s) {
     common.npm([
       'view',
       '.',
@@ -280,9 +280,9 @@ test('npm view with invalid package name', function (t) {
 
 test('npm view with valid but non existent package name', function (t) {
   mr({ port: common.port, mocks: {
-      'get': {
-          '/valid-but-non-existent-package': [404, {'error': 'not found'}]
-      }
+    'get': {
+      '/valid-but-non-existent-package': [404, {'error': 'not found'}]
+    }
   }}, function (er, s) {
     common.npm([
       'view',

From 5977963bcee0b90f3ea2c133be0ae7b23e948cff Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 31 Oct 2015 18:53:21 -0700
Subject: [PATCH 093/323] test: remove flaky designation from ls-no-sslv3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This test was marked flaky after failing in CI on arm7-wheezy two months
ago. It has not failed there since. This commit removes the flaky
designation.

Fixes: https://github.com/nodejs/node/issues/2554
PR-URL: https://github.com/nodejs/node/pull/3620
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 test/parallel/parallel.status | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index 42c32d03665113..69a154730658d2 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -12,7 +12,6 @@ test-tls-ticket-cluster           : PASS,FLAKY
 [$system==linux]
 test-cluster-worker-forced-exit   : PASS,FLAKY
 test-http-client-timeout-event    : PASS,FLAKY
-test-tls-no-sslv3                 : PASS,FLAKY
 test-child-process-buffering      : PASS,FLAKY
 test-child-process-exit-code      : PASS,FLAKY
 

From 7fd8f1371e75c99a88e354b60c76806cc81dc6cd Mon Sep 17 00:00:00 2001
From: Guilherme Souza <sitegui@sitegui.com.br>
Date: Sat, 24 Oct 2015 23:56:49 -0200
Subject: [PATCH 094/323] doc: add note about timeout delay > TIMEOUT_MAX

When setTimeout() and setInterval() are called with `delay` greater than
TIMEOUT_MAX (2147483647), the supplied value is ignored and 1 is used
instead. Add a note about this in the timers docs.

PR-URL: https://github.com/nodejs/node/pull/3512
Reviewed-By: Trevor Norris <trev.norris@gmai.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
---
 doc/api/timers.markdown | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/api/timers.markdown b/doc/api/timers.markdown
index ed7da5076a791f..1dc456aaad925f 100644
--- a/doc/api/timers.markdown
+++ b/doc/api/timers.markdown
@@ -16,6 +16,10 @@ It is important to note that your callback will probably not be called in exactl
 the callback will fire, nor of the ordering things will fire in. The callback will
 be called as close as possible to the time specified.
 
+To follow browser behavior, when using delays larger than 2147483647
+milliseconds (approximately 25 days) or less than 1, the timeout is executed
+immediately, as if the `delay` was set to 1.
+
 ## clearTimeout(timeoutObject)
 
 Prevents a timeout from triggering.
@@ -26,6 +30,10 @@ To schedule the repeated execution of `callback` every `delay` milliseconds.
 Returns a `intervalObject` for possible use with `clearInterval()`. Optionally
 you can also pass arguments to the callback.
 
+To follow browser behavior, when using delays larger than 2147483647
+milliseconds (approximately 25 days) or less than 1, Node.js will use 1 as the
+`delay`.
+
 ## clearInterval(intervalObject)
 
 Stops an interval from triggering.

From e302c33bb0d00c1e7409227cf751db043651878b Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 31 Oct 2015 13:31:36 -0700
Subject: [PATCH 095/323] test: mark http-pipeline-flood flaky
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

test-http-pipeline-flood has been flaky on Windows for some time.
Hopefully, https://github.com/nodejs/node/pull/2862 fixes it and
lands soon, but until then, let's mark it as flaky.

PR-URL: https://github.com/nodejs/node/pull/3616
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
---
 test/sequential/sequential.status | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/sequential/sequential.status b/test/sequential/sequential.status
index 7d5e6f1c1e624f..06057555d7d98d 100644
--- a/test/sequential/sequential.status
+++ b/test/sequential/sequential.status
@@ -7,6 +7,7 @@ prefix sequential
 [true] # This section applies to all platforms
 
 [$system==win32]
+test-http-pipeline-flood                        : PASS,FLAKY
 
 [$system==linux]
 test-vm-syntax-error-stderr                     : PASS,FLAKY

From 935b97769eaec84e34047f71f54d7ec9ad89d25a Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Mon, 2 Nov 2015 13:06:26 +0100
Subject: [PATCH 096/323] test: add regression test for 512 bits DH key

Check that trying to use a < 1024 bits DH key throws an exception.

parallel/test-tls-dhe tests this as well but it feels incongruous not to
do it here when both tests have similar logic for 1024/2048 bits keys.

PR-URL: https://github.com/nodejs/node/pull/3629
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
---
 test/parallel/test-tls-client-mindhsize.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/parallel/test-tls-client-mindhsize.js b/test/parallel/test-tls-client-mindhsize.js
index fde3de512cdc26..a497fdd9f2de62 100644
--- a/test/parallel/test-tls-client-mindhsize.js
+++ b/test/parallel/test-tls-client-mindhsize.js
@@ -75,6 +75,9 @@ function testDHE2048() {
 
 testDHE1024();
 
+assert.throws(() => test(512, true, assert.fail),
+              /DH parameter is less than 1024 bits/);
+
 process.on('exit', function() {
   assert.equal(nsuccess, 1);
   assert.equal(nerror, 1);

From 81522480f18bbe2eb12566ff529aaa75eaf6cf6f Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Mon, 2 Nov 2015 13:14:14 +0100
Subject: [PATCH 097/323] test: more regression tests for minDHSize option

Check that tls.connect() fails in the expected way when passing in
invalid minDHSize options.

PR-URL: https://github.com/nodejs/node/pull/3629
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
---
 lib/_tls_wrap.js                           | 2 +-
 test/parallel/test-tls-client-mindhsize.js | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
index d918656a360c7a..887db012e78402 100644
--- a/lib/_tls_wrap.js
+++ b/lib/_tls_wrap.js
@@ -974,7 +974,7 @@ exports.connect = function(/* [port, host], options, cb */) {
   assert(typeof options.minDHSize === 'number',
          'options.minDHSize is not a number: ' + options.minDHSize);
   assert(options.minDHSize > 0,
-         'options.minDHSize is not a posivie number: ' +
+         'options.minDHSize is not a positive number: ' +
          options.minDHSize);
 
   var hostname = options.servername ||
diff --git a/test/parallel/test-tls-client-mindhsize.js b/test/parallel/test-tls-client-mindhsize.js
index a497fdd9f2de62..a67a3cd67d983b 100644
--- a/test/parallel/test-tls-client-mindhsize.js
+++ b/test/parallel/test-tls-client-mindhsize.js
@@ -78,6 +78,15 @@ testDHE1024();
 assert.throws(() => test(512, true, assert.fail),
               /DH parameter is less than 1024 bits/);
 
+[0, -1, -Infinity, NaN].forEach(minDHSize => {
+  assert.throws(() => tls.connect({ minDHSize }),
+                /minDHSize is not a positive number/);
+});
+
+[true, false, null, undefined, {}, [], '', '1'].forEach(minDHSize => {
+  assert.throws(() => tls.connect({ minDHSize }), /minDHSize is not a number/);
+});
+
 process.on('exit', function() {
   assert.equal(nsuccess, 1);
   assert.equal(nerror, 1);

From 5073da0481690f18d28541a1b12b479c067b9da8 Mon Sep 17 00:00:00 2001
From: Evan Lucas <evanlucas@me.com>
Date: Mon, 2 Nov 2015 09:43:02 -0600
Subject: [PATCH 098/323] repl: don't crash if cannot open history file

Previously, if we are unable to open the history file, an error would
be thrown. Now, print an error message that we could not open
the history file, but don't fail.

Fixes: https://github.com/nodejs/node/issues/3610
PR-URL: https://github.com/nodejs/node/pull/3630
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 lib/internal/repl.js                            | 11 ++++++++++-
 test/sequential/test-repl-persistent-history.js |  9 +++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/internal/repl.js b/lib/internal/repl.js
index 0318a36098e31a..1a62414a49e95d 100644
--- a/lib/internal/repl.js
+++ b/lib/internal/repl.js
@@ -92,7 +92,16 @@ function setupHistory(repl, historyPath, oldHistoryPath, ready) {
 
   function oninit(err, hnd) {
     if (err) {
-      return ready(err);
+      // Cannot open history file.
+      // Don't crash, just don't persist history.
+      repl._writeToOutput('\nError: Could not open history file.\n' +
+                          'REPL session history will not be persisted.\n');
+      repl._refreshLine();
+      debug(err.stack);
+
+      repl._historyPrev = _replHistoryMessage;
+      repl.resume();
+      return ready(null, repl);
     }
     fs.close(hnd, onclose);
   }
diff --git a/test/sequential/test-repl-persistent-history.js b/test/sequential/test-repl-persistent-history.js
index 7fd68d7d764a4f..10e0dedf53ec3e 100644
--- a/test/sequential/test-repl-persistent-history.js
+++ b/test/sequential/test-repl-persistent-history.js
@@ -64,10 +64,13 @@ const convertMsg = '\nConverting old JSON repl history to line-separated ' +
                    path.join(common.tmpDir, '.node_repl_history') + '.\n';
 const homedirErr = '\nError: Could not get the home directory.\n' +
                    'REPL session history will not be persisted.\n';
+const replFailedRead = '\nError: Could not open history file.\n' +
+                       'REPL session history will not be persisted.\n';
 // File paths
 const fixtures = path.join(common.testDir, 'fixtures');
 const historyFixturePath = path.join(fixtures, '.node_repl_history');
 const historyPath = path.join(common.tmpDir, '.fixture_copy_repl_history');
+const historyPathFail = path.join(common.tmpDir, '.node_repl\u0000_history');
 const oldHistoryPath = path.join(fixtures, 'old-repl-history-file.json');
 const enoentHistoryPath = path.join(fixtures, 'enoent-repl-history-file.json');
 const defaultHistoryPath = path.join(common.tmpDir, '.node_repl_history');
@@ -147,6 +150,12 @@ const tests = [{
   test: [UP, UP, UP, CLEAR],
   expected: [prompt, convertMsg, prompt, prompt + '\'=^.^=\'', prompt]
 },
+{
+  env: { NODE_REPL_HISTORY: historyPathFail,
+         NODE_REPL_HISTORY_SIZE: 1 },
+  test: [UP],
+  expected: [prompt, replFailedRead, prompt, replDisabled, prompt]
+},
 { // Make sure this is always the last test, since we change os.homedir()
   before: function mockHomedirFailure() {
     // Mock os.homedir() failure

From 6ef043ab340b9e62612cdf2a3ddc9d2e4d7c7921 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Thu, 29 Oct 2015 08:58:41 -0700
Subject: [PATCH 099/323] 2015-11-03, Version 4.2.2 "Argon" (LTS) Release

---
 CHANGELOG.md | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1dca484c32997..4ce1cc6ef3cd59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,99 @@
 # Node.js ChangeLog
 
+## 2015-10-29, Version 4.2.2 'Argon' (LTS), @jasnell
+
+### Notable changes
+
+This is an LTS maintenance release that addresses a number of issues:
+
+* [[`1d0f2cbf87`](https://github.com/nodejs/node/commit/1d0f2cbf87)] - **buffer**: fix value check for writeUInt{B,L}E (Trevor Norris) [#3500](https://github.com/nodejs/node/pull/3500)
+* [[`2a45b72b4a`](https://github.com/nodejs/node/commit/2a45b72b4a)] - **buffer**: don't CHECK on zero-sized realloc (Ben Noordhuis) [#3499](https://github.com/nodejs/node/pull/3499)
+* [[`a6469e901a`](https://github.com/nodejs/node/commit/a6469e901a)] - **deps**: backport 010897c from V8 upstream (Ali Ijaz Sheikh) [#3520](https://github.com/nodejs/node/pull/3520)
+* [[`cadee67c25`](https://github.com/nodejs/node/commit/cadee67c25)] - **deps**: backport 8d6a228 from the v8's upstream (Fedor Indutny) [#3549](https://github.com/nodejs/node/pull/3549)
+* [[`46c8c94055`](https://github.com/nodejs/node/commit/46c8c94055)] - **fs**: reduced duplicate code in fs.write() (ronkorving) [#2947](https://github.com/nodejs/node/pull/2947)
+* [[`0427cdf094`](https://github.com/nodejs/node/commit/0427cdf094)] - **http**: fix stalled pipeline bug (Fedor Indutny) [#3342](https://github.com/nodejs/node/pull/3342)
+* [[`2109708186`](https://github.com/nodejs/node/commit/2109708186)] - **lib**: fix cluster handle leak (Rich Trott) [#3510](https://github.com/nodejs/node/pull/3510)
+* [[`f49c7c6955`](https://github.com/nodejs/node/commit/f49c7c6955)] - **lib**: avoid REPL exit on completion error (Rich Trott) [#3358](https://github.com/nodejs/node/pull/3358)
+* [[`8a2c4aeeaa`](https://github.com/nodejs/node/commit/8a2c4aeeaa)] - **repl**: handle comments properly (Sakthipriyan Vairamani) [#3515](https://github.com/nodejs/node/pull/3515)
+* [[`a04408acce`](https://github.com/nodejs/node/commit/a04408acce)] - **repl**: limit persistent history correctly on load (Jeremiah Senkpiel) [#2356](https://github.com/nodejs/node/pull/2356)
+* [[`3bafe1a59b`](https://github.com/nodejs/node/commit/3bafe1a59b)] - **src**: fix race condition in debug signal on exit (Ben Noordhuis) [#3528](https://github.com/nodejs/node/pull/3528)
+* [[`fe01d0df7a`](https://github.com/nodejs/node/commit/fe01d0df7a)] - **src**: fix exception message encoding on Windows (Brian White) [#3288](https://github.com/nodejs/node/pull/3288)
+* [[`4bac5d9ddf`](https://github.com/nodejs/node/commit/4bac5d9ddf)] - **stream**: avoid unnecessary concat of a single buffer. (Calvin Metcalf) [#3300](https://github.com/nodejs/node/pull/3300)
+* [[`8d78d687d5`](https://github.com/nodejs/node/commit/8d78d687d5)] - **timers**: reuse timer in `setTimeout().unref()` (Fedor Indutny) [#3407](https://github.com/nodejs/node/pull/3407)
+* [[`e69c869399`](https://github.com/nodejs/node/commit/e69c869399)] - **tls**: TLSSocket options default isServer false (Yuval Brik) [#2614](https://github.com/nodejs/node/pull/2614)
+
+### Known issues
+
+* Some problems with unreferenced timers running during `beforeExit` are still to be resolved. See [#1264](https://github.com/nodejs/node/issues/1264).
+* Surrogate pair in REPL can freeze terminal. [#690](https://github.com/nodejs/node/issues/690)
+* Calling `dns.setServers()` while a DNS query is in progress can cause the process to crash on a failed assertion. [#894](https://github.com/nodejs/node/issues/894)
+* `url.resolve` may transfer the auth portion of the url when resolving between two full hosts, see [#1435](https://github.com/nodejs/node/issues/1435).
+
+### Commits
+
+* [[`1d0f2cbf87`](https://github.com/nodejs/node/commit/1d0f2cbf87)] - **buffer**: fix value check for writeUInt{B,L}E (Trevor Norris) [#3500](https://github.com/nodejs/node/pull/3500)
+* [[`2a45b72b4a`](https://github.com/nodejs/node/commit/2a45b72b4a)] - **buffer**: don't CHECK on zero-sized realloc (Ben Noordhuis) [#3499](https://github.com/nodejs/node/pull/3499)
+* [[`dc655e1dd2`](https://github.com/nodejs/node/commit/dc655e1dd2)] - **build**: rectify --link-module help text (P.S.V.R) [#3379](https://github.com/nodejs/node/pull/3379)
+* [[`a6469e901a`](https://github.com/nodejs/node/commit/a6469e901a)] - **deps**: backport 010897c from V8 upstream (Ali Ijaz Sheikh) [#3520](https://github.com/nodejs/node/pull/3520)
+* [[`cadee67c25`](https://github.com/nodejs/node/commit/cadee67c25)] - **deps**: backport 8d6a228 from the v8's upstream (Fedor Indutny) [#3549](https://github.com/nodejs/node/pull/3549)
+* [[`1ebd35550b`](https://github.com/nodejs/node/commit/1ebd35550b)] - **doc**: fix typos in changelog (reggi) [#3291](https://github.com/nodejs/node/pull/3291)
+* [[`fbd93d4c1c`](https://github.com/nodejs/node/commit/fbd93d4c1c)] - **doc**: more use-cases for promise events (Domenic Denicola) [#3438](https://github.com/nodejs/node/pull/3438)
+* [[`6ceb9af407`](https://github.com/nodejs/node/commit/6ceb9af407)] - **doc**: remove old note, 'cluster' is marked stable (Balázs Galambosi) [#3314](https://github.com/nodejs/node/pull/3314)
+* [[`a5f0d64ddc`](https://github.com/nodejs/node/commit/a5f0d64ddc)] - **doc**: createServer's key option can be an array (Sakthipriyan Vairamani) [#3123](https://github.com/nodejs/node/pull/3123)
+* [[`317e0ec6b3`](https://github.com/nodejs/node/commit/317e0ec6b3)] - **doc**: binary encoding is not deprecated (Trevor Norris) [#3441](https://github.com/nodejs/node/pull/3441)
+* [[`b422f6ee1a`](https://github.com/nodejs/node/commit/b422f6ee1a)] - **doc**: mention the behaviour if URL is invalid (Sakthipriyan Vairamani) [#2966](https://github.com/nodejs/node/pull/2966)
+* [[`bc29aad22b`](https://github.com/nodejs/node/commit/bc29aad22b)] - **doc**: fix indent in tls resumption example (Roman Reiss) [#3372](https://github.com/nodejs/node/pull/3372)
+* [[`313877bd8f`](https://github.com/nodejs/node/commit/313877bd8f)] - **doc**: fix typo in changelog (Timothy Gu) [#3353](https://github.com/nodejs/node/pull/3353)
+* [[`4be432862a`](https://github.com/nodejs/node/commit/4be432862a)] - **doc**: show keylen in pbkdf2 as a byte length (calebboyd) [#3334](https://github.com/nodejs/node/pull/3334)
+* [[`23a1140ddb`](https://github.com/nodejs/node/commit/23a1140ddb)] - **doc**: add information about Assert behavior and maintenance (Rich Trott) [#3330](https://github.com/nodejs/node/pull/3330)
+* [[`e04cb1e1fc`](https://github.com/nodejs/node/commit/e04cb1e1fc)] - **doc**: clarify API buffer.concat (Martii) [#3255](https://github.com/nodejs/node/pull/3255)
+* [[`eae714c370`](https://github.com/nodejs/node/commit/eae714c370)] - **doc**: clarify the use of `option.detached` (Kyle Smith) [#3250](https://github.com/nodejs/node/pull/3250)
+* [[`b884899e67`](https://github.com/nodejs/node/commit/b884899e67)] - **doc**: label v4.2.1 as LTS in changelog heading (Phillip Johnsen) [#3360](https://github.com/nodejs/node/pull/3360)
+* [[`9120a04981`](https://github.com/nodejs/node/commit/9120a04981)] - **docs**: add missing shell option to execSync (fansworld-claudio) [#3440](https://github.com/nodejs/node/pull/3440)
+* [[`46c8c94055`](https://github.com/nodejs/node/commit/46c8c94055)] - **fs**: reduced duplicate code in fs.write() (ronkorving) [#2947](https://github.com/nodejs/node/pull/2947)
+* [[`0427cdf094`](https://github.com/nodejs/node/commit/0427cdf094)] - **http**: fix stalled pipeline bug (Fedor Indutny) [#3342](https://github.com/nodejs/node/pull/3342)
+* [[`2109708186`](https://github.com/nodejs/node/commit/2109708186)] - **lib**: fix cluster handle leak (Rich Trott) [#3510](https://github.com/nodejs/node/pull/3510)
+* [[`f49c7c6955`](https://github.com/nodejs/node/commit/f49c7c6955)] - **lib**: avoid REPL exit on completion error (Rich Trott) [#3358](https://github.com/nodejs/node/pull/3358)
+* [[`8a2c4aeeaa`](https://github.com/nodejs/node/commit/8a2c4aeeaa)] - **repl**: handle comments properly (Sakthipriyan Vairamani) [#3515](https://github.com/nodejs/node/pull/3515)
+* [[`a04408acce`](https://github.com/nodejs/node/commit/a04408acce)] - **repl**: limit persistent history correctly on load (Jeremiah Senkpiel) [#2356](https://github.com/nodejs/node/pull/2356)
+* [[`5d1f1c5fa8`](https://github.com/nodejs/node/commit/5d1f1c5fa8)] - **src**: wrap source before doing syntax check (Evan Lucas) [#3587](https://github.com/nodejs/node/pull/3587)
+* [[`3bafe1a59b`](https://github.com/nodejs/node/commit/3bafe1a59b)] - **src**: fix race condition in debug signal on exit (Ben Noordhuis) [#3528](https://github.com/nodejs/node/pull/3528)
+* [[`fe01d0df7a`](https://github.com/nodejs/node/commit/fe01d0df7a)] - **src**: fix exception message encoding on Windows (Brian White) [#3288](https://github.com/nodejs/node/pull/3288)
+* [[`4bac5d9ddf`](https://github.com/nodejs/node/commit/4bac5d9ddf)] - **stream**: avoid unnecessary concat of a single buffer. (Calvin Metcalf) [#3300](https://github.com/nodejs/node/pull/3300)
+* [[`117fb47a16`](https://github.com/nodejs/node/commit/117fb47a16)] - **stream**: fix signature of _write() in a comment (Fábio Santos) [#3248](https://github.com/nodejs/node/pull/3248)
+* [[`c563a34427`](https://github.com/nodejs/node/commit/c563a34427)] - **test**: split independent tests into separate files (Rich Trott) [#3548](https://github.com/nodejs/node/pull/3548)
+* [[`3f62952d42`](https://github.com/nodejs/node/commit/3f62952d42)] - **test**: add node::MakeCallback() test coverage (Ben Noordhuis) [#3478](https://github.com/nodejs/node/pull/3478)
+* [[`6b75f10d8a`](https://github.com/nodejs/node/commit/6b75f10d8a)] - **test**: use port number from env in tls socket test (Stefan Budeanu) [#3557](https://github.com/nodejs/node/pull/3557)
+* [[`39ff44e94f`](https://github.com/nodejs/node/commit/39ff44e94f)] - **test**: fix heap-profiler link error LNK1194 on win (Junliang Yan) [#3572](https://github.com/nodejs/node/pull/3572)
+* [[`a2786dd408`](https://github.com/nodejs/node/commit/a2786dd408)] - **test**: fix missing unistd.h on windows (Junliang Yan) [#3532](https://github.com/nodejs/node/pull/3532)
+* [[`5e6f7c9a23`](https://github.com/nodejs/node/commit/5e6f7c9a23)] - **test**: add regression test for --debug-brk -e 0 (Ben Noordhuis) [#3585](https://github.com/nodejs/node/pull/3585)
+* [[`7cad182cb6`](https://github.com/nodejs/node/commit/7cad182cb6)] - **test**: port domains regression test from v0.10 (Jonas Dohse) [#3356](https://github.com/nodejs/node/pull/3356)
+* [[`78d854c6ce`](https://github.com/nodejs/node/commit/78d854c6ce)] - **test**: remove util from common (Rich Trott) [#3324](https://github.com/nodejs/node/pull/3324)
+* [[`c566c8b8c0`](https://github.com/nodejs/node/commit/c566c8b8c0)] - **test**: remove util properties from common (Rich Trott) [#3304](https://github.com/nodejs/node/pull/3304)
+* [[`eb7c3fb2f4`](https://github.com/nodejs/node/commit/eb7c3fb2f4)] - **test**: split up buffer tests for reliability (Rich Trott) [#3323](https://github.com/nodejs/node/pull/3323)
+* [[`b398a85e19`](https://github.com/nodejs/node/commit/b398a85e19)] - **test**: parallelize long-running test (Rich Trott) [#3287](https://github.com/nodejs/node/pull/3287)
+* [[`b5f3b4956b`](https://github.com/nodejs/node/commit/b5f3b4956b)] - **test**: change call to deprecated util.isError() (Rich Trott) [#3084](https://github.com/nodejs/node/pull/3084)
+* [[`32149cacb5`](https://github.com/nodejs/node/commit/32149cacb5)] - **test**: improve tests for util.inherits (Michaël Zasso) [#3507](https://github.com/nodejs/node/pull/3507)
+* [[`5be686fab8`](https://github.com/nodejs/node/commit/5be686fab8)] - **test**: print helpful err msg on test-dns-ipv6.js (Junliang Yan) [#3501](https://github.com/nodejs/node/pull/3501)
+* [[`0429131e32`](https://github.com/nodejs/node/commit/0429131e32)] - **test**: fix domain with abort-on-uncaught on PPC (Julien Gilli) [#3354](https://github.com/nodejs/node/pull/3354)
+* [[`788106eee9`](https://github.com/nodejs/node/commit/788106eee9)] - **test**: cleanup, improve repl-persistent-history (Jeremiah Senkpiel) [#2356](https://github.com/nodejs/node/pull/2356)
+* [[`ea58fa0bac`](https://github.com/nodejs/node/commit/ea58fa0bac)] - **test**: add Symbol test for assert.deepEqual() (Rich Trott) [#3327](https://github.com/nodejs/node/pull/3327)
+* [[`d409ac473b`](https://github.com/nodejs/node/commit/d409ac473b)] - **test**: disable test-tick-processor - aix and be ppc (Michael Dawson) [#3491](https://github.com/nodejs/node/pull/3491)
+* [[`c1623039dd`](https://github.com/nodejs/node/commit/c1623039dd)] - **test**: harden test-child-process-fork-regr-gh-2847 (Michael Dawson) [#3459](https://github.com/nodejs/node/pull/3459)
+* [[`3bb4437abb`](https://github.com/nodejs/node/commit/3bb4437abb)] - **test**: fix test-net-keepalive for AIX (Imran Iqbal) [#3458](https://github.com/nodejs/node/pull/3458)
+* [[`af55641a69`](https://github.com/nodejs/node/commit/af55641a69)] - **test**: wrap assert.fail when passed to callback (Myles Borins) [#3453](https://github.com/nodejs/node/pull/3453)
+* [[`7c7ef01e65`](https://github.com/nodejs/node/commit/7c7ef01e65)] - **test**: skip test-dns-ipv6.js if ipv6 is unavailable (Junliang Yan) [#3444](https://github.com/nodejs/node/pull/3444)
+* [[`a4d1510ba4`](https://github.com/nodejs/node/commit/a4d1510ba4)] - **test**: repl-persistent-history is no longer flaky (Jeremiah Senkpiel) [#3437](https://github.com/nodejs/node/pull/3437)
+* [[`a5d968b8a2`](https://github.com/nodejs/node/commit/a5d968b8a2)] - **test**: fix flaky test-child-process-emfile (Rich Trott) [#3430](https://github.com/nodejs/node/pull/3430)
+* [[`eac2acca76`](https://github.com/nodejs/node/commit/eac2acca76)] - **test**: remove flaky status from eval_messages test (Rich Trott) [#3420](https://github.com/nodejs/node/pull/3420)
+* [[`155c778584`](https://github.com/nodejs/node/commit/155c778584)] - **test**: fix flaky test for symlinks (Rich Trott) [#3418](https://github.com/nodejs/node/pull/3418)
+* [[`74eb632483`](https://github.com/nodejs/node/commit/74eb632483)] - **test**: apply correct assert.fail() arguments (Rich Trott) [#3378](https://github.com/nodejs/node/pull/3378)
+* [[`0a4323dd82`](https://github.com/nodejs/node/commit/0a4323dd82)] - **test**: replace util with backtick strings (Myles Borins) [#3359](https://github.com/nodejs/node/pull/3359)
+* [[`93847694ec`](https://github.com/nodejs/node/commit/93847694ec)] - **test**: add test-child-process-emfile fail message (Rich Trott) [#3335](https://github.com/nodejs/node/pull/3335)
+* [[`8d78d687d5`](https://github.com/nodejs/node/commit/8d78d687d5)] - **timers**: reuse timer in `setTimeout().unref()` (Fedor Indutny) [#3407](https://github.com/nodejs/node/pull/3407)
+* [[`e69c869399`](https://github.com/nodejs/node/commit/e69c869399)] - **tls**: TLSSocket options default isServer false (Yuval Brik) [#2614](https://github.com/nodejs/node/pull/2614)
+* [[`0b32bbbf69`](https://github.com/nodejs/node/commit/0b32bbbf69)] - **v8**: pull fix for builtin code size on PPC (Michael Dawson) [#3474](https://github.com/nodejs/node/pull/3474)
+
 ## 2015-10-29, Version 5.0.0 (Stable), @rvagg
 
 ### Notable Changes

From 045e04e53176762db1859fa214705989ad8f84ea Mon Sep 17 00:00:00 2001
From: Sam P Gallagher-Bishop <SPGB@users.noreply.github.com>
Date: Tue, 3 Nov 2015 15:11:00 -0500
Subject: [PATCH 100/323] doc: typo fix in readme.md

Minor typo fix in the list of keys

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/3649
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7e7b17470f4513..1c98e10b3f86e3 100644
--- a/README.md
+++ b/README.md
@@ -387,7 +387,7 @@ maintaining the Node.js project.
 
 Releases of Node.js and io.js will be signed with one of the following GPG keys:
 
-* **Chris Dickinson** &lt;christopher.s.dickinson@gmail.com&gt;: `9554F04D7259F04124DE6B476D5A82AC7E37093B`
+* **Chris Dickinson** &lt;christopher.s.dickinson@gmail.com&gt; `9554F04D7259F04124DE6B476D5A82AC7E37093B`
 * **Colin Ihrig** &lt;cjihrig@gmail.com&gt; `94AE36675C464D64BAFA68DD7434390BDBE9B9C5`
 * **Sam Roberts** &lt;octetcloud@keybase.io&gt; `0034A06D9D9B0064CE8ADF6BF1747F4AD2306D93`
 * **Jeremiah Senkpiel** &lt;fishrock@keybase.io&gt; `FD3A5288F042B6850C66B31F09FE44734EB7990E`

From 7caeb14e116db6fcfbde039fd0653d947d1e7414 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Wed, 28 Oct 2015 11:01:02 -0700
Subject: [PATCH 101/323] deps: update http-parser to 2.6.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

significant updates:

* [[`777ba4eded`](https://github.com/nodejs/node/commit/777ba4eded)] - **src**: introduce `http_parser_url_init` (Fedor Indutny) [nodejs/http-parser#225](https://github.com/nodejs/http-parser/pull/225)
* [[`e557b62744`](https://github.com/nodejs/node/commit/e557b62744)] - **src**: support LINK/UNLINK (RFC 2068, draft-snell-link-method) (Olivier Mengué) [nodejs/http-parser#267](https://github.com/nodejs/http-parser/pull/267)
* [[`eb5e9928b4`](https://github.com/nodejs/node/commit/eb5e9928b4)] - **src**: support ACL (WebDAV, RFC3744, Section 8.1). (Ivan Enderlin) [joyent/http-parser#260](https://github.com/joyent/http-parser/pull/260)
* [[`8b1d652322`](https://github.com/nodejs/node/commit/8b1d652322)] - **src**: support BIND/REBIND/UNBIND (WebDAV, RFC5842) (Ivan Enderlin) [joyent/http-parser#242](https://github.com/joyent/http-parser/pull/242)
* [[`7d75dd7325`](https://github.com/nodejs/node/commit/7d75dd7325)] - **src**: support IPv6 Zone ID as per RFC 6874 (Tatsuhiro Tsujikawa) [joyent/http-parser#253](https://github.com/joyent/http-parser/pull/253)

PR-URL: https://github.com/nodejs/node/pull/3569
Reviewed-By: Brian White <mscdex@mscdex.net>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
---
 deps/http_parser/AUTHORS              |   1 +
 deps/http_parser/Makefile             |  31 +++++--
 deps/http_parser/README.md            |  69 +++++++++++++++-
 deps/http_parser/contrib/url_parser.c |   3 +-
 deps/http_parser/http_parser.c        |  99 +++++++++++++++++-----
 deps/http_parser/http_parser.h        |  41 +++++----
 deps/http_parser/test.c               | 114 ++++++++++++++++++++++++++
 7 files changed, 309 insertions(+), 49 deletions(-)

diff --git a/deps/http_parser/AUTHORS b/deps/http_parser/AUTHORS
index 8e2df1d06e6f69..5323b685caefb9 100644
--- a/deps/http_parser/AUTHORS
+++ b/deps/http_parser/AUTHORS
@@ -65,3 +65,4 @@ Romain Giraud <giraud.romain@gmail.com>
 Jay Satiro <raysatiro@yahoo.com>
 Arne Steen <Arne.Steen@gmx.de>
 Kjell Schubert <kjell.schubert@gmail.com>
+Olivier Mengué <dolmen@cpan.org>
diff --git a/deps/http_parser/Makefile b/deps/http_parser/Makefile
index 373709c6672e31..33c8ba0239d741 100644
--- a/deps/http_parser/Makefile
+++ b/deps/http_parser/Makefile
@@ -19,7 +19,19 @@
 # IN THE SOFTWARE.
 
 PLATFORM ?= $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"')
-SONAME ?= libhttp_parser.so.2.5.0
+HELPER ?=
+BINEXT ?=
+ifeq (darwin,$(PLATFORM))
+SONAME ?= libhttp_parser.2.6.0.dylib
+SOEXT ?= dylib
+else ifeq (wine,$(PLATFORM))
+CC = winegcc
+BINEXT = .exe.so
+HELPER = wine
+else
+SONAME ?= libhttp_parser.so.2.6.0
+SOEXT ?= so
+endif
 
 CC?=gcc
 AR?=ar
@@ -53,8 +65,8 @@ LDFLAGS_LIB += -Wl,-soname=$(SONAME)
 endif
 
 test: test_g test_fast
-	./test_g
-	./test_fast
+	$(HELPER) ./test_g$(BINEXT)
+	$(HELPER) ./test_fast$(BINEXT)
 
 test_g: http_parser_g.o test_g.o
 	$(CC) $(CFLAGS_DEBUG) $(LDFLAGS) http_parser_g.o test_g.o -o $@
@@ -81,7 +93,7 @@ http_parser.o: http_parser.c http_parser.h Makefile
 	$(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) -c http_parser.c
 
 test-run-timed: test_fast
-	while(true) do time ./test_fast > /dev/null; done
+	while(true) do time $(HELPER) ./test_fast$(BINEXT) > /dev/null; done
 
 test-valgrind: test_g
 	valgrind ./test_g
@@ -102,10 +114,10 @@ url_parser_g: http_parser_g.o contrib/url_parser.c
 	$(CC) $(CPPFLAGS_DEBUG) $(CFLAGS_DEBUG) $^ -o $@
 
 parsertrace: http_parser.o contrib/parsertrace.c
-	$(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) $^ -o parsertrace
+	$(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) $^ -o parsertrace$(BINEXT)
 
 parsertrace_g: http_parser_g.o contrib/parsertrace.c
-	$(CC) $(CPPFLAGS_DEBUG) $(CFLAGS_DEBUG) $^ -o parsertrace_g
+	$(CC) $(CPPFLAGS_DEBUG) $(CFLAGS_DEBUG) $^ -o parsertrace_g$(BINEXT)
 
 tags: http_parser.c http_parser.h test.c
 	ctags $^
@@ -113,12 +125,12 @@ tags: http_parser.c http_parser.h test.c
 install: library
 	$(INSTALL) -D  http_parser.h $(INCLUDEDIR)/http_parser.h
 	$(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME)
-	ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so
+	ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT)
 
 install-strip: library
 	$(INSTALL) -D  http_parser.h $(INCLUDEDIR)/http_parser.h
 	$(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME)
-	ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so
+	ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT)
 
 uninstall:
 	rm $(INCLUDEDIR)/http_parser.h
@@ -128,7 +140,8 @@ uninstall:
 clean:
 	rm -f *.o *.a tags test test_fast test_g \
 		http_parser.tar libhttp_parser.so.* \
-		url_parser url_parser_g parsertrace parsertrace_g
+		url_parser url_parser_g parsertrace parsertrace_g \
+		*.exe *.exe.so
 
 contrib/url_parser.c:	http_parser.h
 contrib/parsertrace.c:	http_parser.h
diff --git a/deps/http_parser/README.md b/deps/http_parser/README.md
index 7c54dd42d087c3..abee9469338424 100644
--- a/deps/http_parser/README.md
+++ b/deps/http_parser/README.md
@@ -94,7 +94,7 @@ The Special Problem of Upgrade
 ------------------------------
 
 HTTP supports upgrading the connection to a different protocol. An
-increasingly common example of this is the Web Socket protocol which sends
+increasingly common example of this is the WebSocket protocol which sends
 a request like
 
         GET /demo HTTP/1.1
@@ -106,8 +106,8 @@ a request like
 
 followed by non-HTTP data.
 
-(See http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-75 for more
-information the Web Socket protocol.)
+(See [RFC6455](https://tools.ietf.org/html/rfc6455) for more information the
+WebSocket protocol.)
 
 To support this, the parser will treat this as a normal HTTP message without a
 body, issuing both on_headers_complete and on_message_complete callbacks. However
@@ -137,6 +137,69 @@ There are two types of callbacks:
 Callbacks must return 0 on success. Returning a non-zero value indicates
 error to the parser, making it exit immediately.
 
+For cases where it is necessary to pass local information to/from a callback,
+the `http_parser` object's `data` field can be used.
+An example of such a case is when using threads to handle a socket connection,
+parse a request, and then give a response over that socket. By instantiation
+of a thread-local struct containing relevant data (e.g. accepted socket,
+allocated memory for callbacks to write into, etc), a parser's callbacks are
+able to communicate data between the scope of the thread and the scope of the
+callback in a threadsafe manner. This allows http-parser to be used in
+multi-threaded contexts.
+
+Example:
+```
+ typedef struct {
+  socket_t sock;
+  void* buffer;
+  int buf_len;
+ } custom_data_t;
+
+
+int my_url_callback(http_parser* parser, const char *at, size_t length) {
+  /* access to thread local custom_data_t struct.
+  Use this access save parsed data for later use into thread local
+  buffer, or communicate over socket
+  */
+  parser->data;
+  ...
+  return 0;
+}
+
+...
+
+void http_parser_thread(socket_t sock) {
+ int nparsed = 0;
+ /* allocate memory for user data */
+ custom_data_t *my_data = malloc(sizeof(custom_data_t));
+
+ /* some information for use by callbacks.
+ * achieves thread -> callback information flow */
+ my_data->sock = sock;
+
+ /* instantiate a thread-local parser */
+ http_parser *parser = malloc(sizeof(http_parser));
+ http_parser_init(parser, HTTP_REQUEST); /* initialise parser */
+ /* this custom data reference is accessible through the reference to the
+ parser supplied to callback functions */
+ parser->data = my_data;
+
+ http_parser_settings settings; / * set up callbacks */
+ settings.on_url = my_url_callback;
+
+ /* execute parser */
+ nparsed = http_parser_execute(parser, &settings, buf, recved);
+
+ ...
+ /* parsed information copied from callback.
+ can now perform action on data copied into thread-local memory from callbacks.
+ achieves callback -> thread information flow */
+ my_data->buffer;
+ ...
+}
+
+```
+
 In case you parse HTTP message in chunks (i.e. `read()` request line
 from socket, parse, read half headers, parse, etc) your data callbacks
 may be called more than once. Http-parser guarantees that data pointer is only
diff --git a/deps/http_parser/contrib/url_parser.c b/deps/http_parser/contrib/url_parser.c
index 6650b414af9065..f235bed9e483dc 100644
--- a/deps/http_parser/contrib/url_parser.c
+++ b/deps/http_parser/contrib/url_parser.c
@@ -35,6 +35,7 @@ int main(int argc, char ** argv) {
   connect = strcmp("connect", argv[1]) == 0 ? 1 : 0;
   printf("Parsing %s, connect %d\n", argv[2], connect);
 
+  http_parser_url_init(&u);
   result = http_parser_parse_url(argv[2], len, connect, &u);
   if (result != 0) {
     printf("Parse error : %d\n", result);
@@ -43,4 +44,4 @@ int main(int argc, char ** argv) {
   printf("Parse ok, result : \n");
   dump_url(argv[2], &u);
   return 0;
-}
\ No newline at end of file
+}
diff --git a/deps/http_parser/http_parser.c b/deps/http_parser/http_parser.c
index 0fa1c362729c4f..b3037d7e3d61e8 100644
--- a/deps/http_parser/http_parser.c
+++ b/deps/http_parser/http_parser.c
@@ -400,6 +400,8 @@ enum http_host_state
   , s_http_host
   , s_http_host_v6
   , s_http_host_v6_end
+  , s_http_host_v6_zone_start
+  , s_http_host_v6_zone
   , s_http_host_port_start
   , s_http_host_port
 };
@@ -957,21 +959,23 @@ size_t http_parser_execute (http_parser *parser,
         parser->method = (enum http_method) 0;
         parser->index = 1;
         switch (ch) {
+          case 'A': parser->method = HTTP_ACL; break;
+          case 'B': parser->method = HTTP_BIND; break;
           case 'C': parser->method = HTTP_CONNECT; /* or COPY, CHECKOUT */ break;
           case 'D': parser->method = HTTP_DELETE; break;
           case 'G': parser->method = HTTP_GET; break;
           case 'H': parser->method = HTTP_HEAD; break;
-          case 'L': parser->method = HTTP_LOCK; break;
+          case 'L': parser->method = HTTP_LOCK; /* or LINK */ break;
           case 'M': parser->method = HTTP_MKCOL; /* or MOVE, MKACTIVITY, MERGE, M-SEARCH, MKCALENDAR */ break;
           case 'N': parser->method = HTTP_NOTIFY; break;
           case 'O': parser->method = HTTP_OPTIONS; break;
           case 'P': parser->method = HTTP_POST;
             /* or PROPFIND|PROPPATCH|PUT|PATCH|PURGE */
             break;
-          case 'R': parser->method = HTTP_REPORT; break;
+          case 'R': parser->method = HTTP_REPORT; /* or REBIND */ break;
           case 'S': parser->method = HTTP_SUBSCRIBE; /* or SEARCH */ break;
           case 'T': parser->method = HTTP_TRACE; break;
-          case 'U': parser->method = HTTP_UNLOCK; /* or UNSUBSCRIBE */ break;
+          case 'U': parser->method = HTTP_UNLOCK; /* or UNSUBSCRIBE, UNBIND, UNLINK */ break;
           default:
             SET_ERRNO(HPE_INVALID_METHOD);
             goto error;
@@ -1027,16 +1031,32 @@ size_t http_parser_execute (http_parser *parser,
             SET_ERRNO(HPE_INVALID_METHOD);
             goto error;
           }
-        } else if (parser->index == 1 && parser->method == HTTP_POST) {
-          if (ch == 'R') {
-            parser->method = HTTP_PROPFIND; /* or HTTP_PROPPATCH */
-          } else if (ch == 'U') {
-            parser->method = HTTP_PUT; /* or HTTP_PURGE */
-          } else if (ch == 'A') {
-            parser->method = HTTP_PATCH;
-          } else {
-            SET_ERRNO(HPE_INVALID_METHOD);
-            goto error;
+        } else if (parser->method == HTTP_REPORT) {
+            if (parser->index == 2 && ch == 'B') {
+              parser->method = HTTP_REBIND;
+            } else {
+              SET_ERRNO(HPE_INVALID_METHOD);
+              goto error;
+            }
+        } else if (parser->index == 1) {
+          if (parser->method == HTTP_POST) {
+            if (ch == 'R') {
+              parser->method = HTTP_PROPFIND; /* or HTTP_PROPPATCH */
+            } else if (ch == 'U') {
+              parser->method = HTTP_PUT; /* or HTTP_PURGE */
+            } else if (ch == 'A') {
+              parser->method = HTTP_PATCH;
+            } else {
+              SET_ERRNO(HPE_INVALID_METHOD);
+              goto error;
+            }
+          } else if (parser->method == HTTP_LOCK) {
+            if (ch == 'I') {
+              parser->method = HTTP_LINK;
+            } else {
+              SET_ERRNO(HPE_INVALID_METHOD);
+              goto error;
+            }
           }
         } else if (parser->index == 2) {
           if (parser->method == HTTP_PUT) {
@@ -1049,6 +1069,8 @@ size_t http_parser_execute (http_parser *parser,
           } else if (parser->method == HTTP_UNLOCK) {
             if (ch == 'S') {
               parser->method = HTTP_UNSUBSCRIBE;
+            } else if(ch == 'B') {
+              parser->method = HTTP_UNBIND;
             } else {
               SET_ERRNO(HPE_INVALID_METHOD);
               goto error;
@@ -1059,6 +1081,8 @@ size_t http_parser_execute (http_parser *parser,
           }
         } else if (parser->index == 4 && parser->method == HTTP_PROPFIND && ch == 'P') {
           parser->method = HTTP_PROPPATCH;
+        } else if (parser->index == 3 && parser->method == HTTP_UNLOCK && ch == 'I') {
+          parser->method = HTTP_UNLINK;
         } else {
           SET_ERRNO(HPE_INVALID_METHOD);
           goto error;
@@ -1828,11 +1852,12 @@ size_t http_parser_execute (http_parser *parser,
 
       case s_headers_done:
       {
+        int hasBody;
         STRICT_CHECK(ch != LF);
 
         parser->nread = 0;
 
-        int hasBody = parser->flags & F_CHUNKED ||
+        hasBody = parser->flags & F_CHUNKED ||
           (parser->content_length > 0 && parser->content_length != ULLONG_MAX);
         if (parser->upgrade && (parser->method == HTTP_CONNECT ||
                                 (parser->flags & F_SKIPBODY) || !hasBody)) {
@@ -1857,8 +1882,7 @@ size_t http_parser_execute (http_parser *parser,
             /* Content-Length header given and non-zero */
             UPDATE_STATE(s_body_identity);
           } else {
-            if (parser->type == HTTP_REQUEST ||
-                !http_message_needs_eof(parser)) {
+            if (!http_message_needs_eof(parser)) {
               /* Assume content-length 0 - read the next */
               UPDATE_STATE(NEW_MESSAGE());
               CALLBACK_NOTIFY(message_complete);
@@ -2153,15 +2177,13 @@ http_parser_settings_init(http_parser_settings *settings)
 
 const char *
 http_errno_name(enum http_errno err) {
-  assert(((size_t) err) <
-      (sizeof(http_strerror_tab) / sizeof(http_strerror_tab[0])));
+  assert(((size_t) err) < ARRAY_SIZE(http_strerror_tab));
   return http_strerror_tab[err].name;
 }
 
 const char *
 http_errno_description(enum http_errno err) {
-  assert(((size_t) err) <
-      (sizeof(http_strerror_tab) / sizeof(http_strerror_tab[0])));
+  assert(((size_t) err) < ARRAY_SIZE(http_strerror_tab));
   return http_strerror_tab[err].description;
 }
 
@@ -2214,6 +2236,23 @@ http_parse_host_char(enum http_host_state s, const char ch) {
         return s_http_host_v6;
       }
 
+      if (s == s_http_host_v6 && ch == '%') {
+        return s_http_host_v6_zone_start;
+      }
+      break;
+
+    case s_http_host_v6_zone:
+      if (ch == ']') {
+        return s_http_host_v6_end;
+      }
+
+    /* FALLTHROUGH */
+    case s_http_host_v6_zone_start:
+      /* RFC 6874 Zone ID consists of 1*( unreserved / pct-encoded) */
+      if (IS_ALPHANUM(ch) || ch == '%' || ch == '.' || ch == '-' || ch == '_' ||
+          ch == '~') {
+        return s_http_host_v6_zone;
+      }
       break;
 
     case s_http_host_port:
@@ -2232,6 +2271,7 @@ http_parse_host_char(enum http_host_state s, const char ch) {
 
 static int
 http_parse_host(const char * buf, struct http_parser_url *u, int found_at) {
+  assert(u->field_set & (1 << UF_HOST));
   enum http_host_state s;
 
   const char *p;
@@ -2263,6 +2303,11 @@ http_parse_host(const char * buf, struct http_parser_url *u, int found_at) {
         u->field_data[UF_HOST].len++;
         break;
 
+      case s_http_host_v6_zone_start:
+      case s_http_host_v6_zone:
+        u->field_data[UF_HOST].len++;
+        break;
+
       case s_http_host_port:
         if (s != s_http_host_port) {
           u->field_data[UF_PORT].off = p - buf;
@@ -2292,6 +2337,8 @@ http_parse_host(const char * buf, struct http_parser_url *u, int found_at) {
     case s_http_host_start:
     case s_http_host_v6_start:
     case s_http_host_v6:
+    case s_http_host_v6_zone_start:
+    case s_http_host_v6_zone:
     case s_http_host_port_start:
     case s_http_userinfo:
     case s_http_userinfo_start:
@@ -2303,6 +2350,11 @@ http_parse_host(const char * buf, struct http_parser_url *u, int found_at) {
   return 0;
 }
 
+void
+http_parser_url_init(struct http_parser_url *u) {
+  memset(u, 0, sizeof(*u));
+}
+
 int
 http_parser_parse_url(const char *buf, size_t buflen, int is_connect,
                       struct http_parser_url *u)
@@ -2376,7 +2428,12 @@ http_parser_parse_url(const char *buf, size_t buflen, int is_connect,
 
   /* host must be present if there is a schema */
   /* parsing http:///toto will fail */
-  if ((u->field_set & ((1 << UF_SCHEMA) | (1 << UF_HOST))) != 0) {
+  if ((u->field_set & (1 << UF_SCHEMA)) &&
+      (u->field_set & (1 << UF_HOST)) == 0) {
+    return 1;
+  }
+
+  if (u->field_set & (1 << UF_HOST)) {
     if (http_parse_host(buf, u, found_at) != 0) {
       return 1;
     }
diff --git a/deps/http_parser/http_parser.h b/deps/http_parser/http_parser.h
index eb71bf99219315..34bebf3d36a176 100644
--- a/deps/http_parser/http_parser.h
+++ b/deps/http_parser/http_parser.h
@@ -26,11 +26,12 @@ extern "C" {
 
 /* Also update SONAME in the Makefile whenever you change these. */
 #define HTTP_PARSER_VERSION_MAJOR 2
-#define HTTP_PARSER_VERSION_MINOR 5
+#define HTTP_PARSER_VERSION_MINOR 6
 #define HTTP_PARSER_VERSION_PATCH 0
 
 #include <sys/types.h>
-#if defined(_WIN32) && !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER<1600)
+#if defined(_WIN32) && !defined(__MINGW32__) && \
+  (!defined(_MSC_VER) || _MSC_VER<1600) && !defined(__WINE__)
 #include <BaseTsd.h>
 #include <stddef.h>
 typedef __int8 int8_t;
@@ -95,7 +96,7 @@ typedef int (*http_cb) (http_parser*);
   XX(5,  CONNECT,     CONNECT)      \
   XX(6,  OPTIONS,     OPTIONS)      \
   XX(7,  TRACE,       TRACE)        \
-  /* webdav */                      \
+  /* WebDAV */                      \
   XX(8,  COPY,        COPY)         \
   XX(9,  LOCK,        LOCK)         \
   XX(10, MKCOL,       MKCOL)        \
@@ -104,21 +105,28 @@ typedef int (*http_cb) (http_parser*);
   XX(13, PROPPATCH,   PROPPATCH)    \
   XX(14, SEARCH,      SEARCH)       \
   XX(15, UNLOCK,      UNLOCK)       \
+  XX(16, BIND,        BIND)         \
+  XX(17, REBIND,      REBIND)       \
+  XX(18, UNBIND,      UNBIND)       \
+  XX(19, ACL,         ACL)          \
   /* subversion */                  \
-  XX(16, REPORT,      REPORT)       \
-  XX(17, MKACTIVITY,  MKACTIVITY)   \
-  XX(18, CHECKOUT,    CHECKOUT)     \
-  XX(19, MERGE,       MERGE)        \
+  XX(20, REPORT,      REPORT)       \
+  XX(21, MKACTIVITY,  MKACTIVITY)   \
+  XX(22, CHECKOUT,    CHECKOUT)     \
+  XX(23, MERGE,       MERGE)        \
   /* upnp */                        \
-  XX(20, MSEARCH,     M-SEARCH)     \
-  XX(21, NOTIFY,      NOTIFY)       \
-  XX(22, SUBSCRIBE,   SUBSCRIBE)    \
-  XX(23, UNSUBSCRIBE, UNSUBSCRIBE)  \
+  XX(24, MSEARCH,     M-SEARCH)     \
+  XX(25, NOTIFY,      NOTIFY)       \
+  XX(26, SUBSCRIBE,   SUBSCRIBE)    \
+  XX(27, UNSUBSCRIBE, UNSUBSCRIBE)  \
   /* RFC-5789 */                    \
-  XX(24, PATCH,       PATCH)        \
-  XX(25, PURGE,       PURGE)        \
+  XX(28, PATCH,       PATCH)        \
+  XX(29, PURGE,       PURGE)        \
   /* CalDAV */                      \
-  XX(26, MKCALENDAR,  MKCALENDAR)   \
+  XX(30, MKCALENDAR,  MKCALENDAR)   \
+  /* RFC-2068, section 19.6.1.2 */  \
+  XX(31, LINK,        LINK)         \
+  XX(32, UNLINK,      UNLINK)       \
 
 enum http_method
   {
@@ -144,7 +152,7 @@ enum flags
 
 
 /* Map for errno-related constants
- * 
+ *
  * The provided argument should be a macro that takes 2 arguments.
  */
 #define HTTP_ERRNO_MAP(XX)                                           \
@@ -325,6 +333,9 @@ const char *http_errno_name(enum http_errno err);
 /* Return a string description of the given error */
 const char *http_errno_description(enum http_errno err);
 
+/* Initialize all http_parser_url members to 0 */
+void http_parser_url_init(struct http_parser_url *u);
+
 /* Parse a URL; return nonzero on failure */
 int http_parser_parse_url(const char *buf, size_t buflen,
                           int is_connect,
diff --git a/deps/http_parser/test.c b/deps/http_parser/test.c
index 4c00571eba60bc..c63b8f0b0b1cd7 100644
--- a/deps/http_parser/test.c
+++ b/deps/http_parser/test.c
@@ -1101,6 +1101,58 @@ const struct message requests[] =
   ,.body= ""
   }
 
+/* Examples from the Internet draft for LINK/UNLINK methods:
+ * https://tools.ietf.org/id/draft-snell-link-method-01.html#rfc.section.5
+ */
+
+#define LINK_REQUEST 40
+, {.name = "link request"
+  ,.type= HTTP_REQUEST
+  ,.raw= "LINK /images/my_dog.jpg HTTP/1.1\r\n"
+         "Host: example.com\r\n"
+         "Link: <http://example.com/profiles/joe>; rel=\"tag\"\r\n"
+         "Link: <http://example.com/profiles/sally>; rel=\"tag\"\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_LINK
+  ,.request_path= "/images/my_dog.jpg"
+  ,.request_url= "/images/my_dog.jpg"
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.num_headers= 3
+  ,.headers= { { "Host", "example.com" }
+             , { "Link", "<http://example.com/profiles/joe>; rel=\"tag\"" }
+	     , { "Link", "<http://example.com/profiles/sally>; rel=\"tag\"" }
+             }
+  ,.body= ""
+  }
+
+#define UNLINK_REQUEST 41
+, {.name = "link request"
+  ,.type= HTTP_REQUEST
+  ,.raw= "UNLINK /images/my_dog.jpg HTTP/1.1\r\n"
+         "Host: example.com\r\n"
+         "Link: <http://example.com/profiles/sally>; rel=\"tag\"\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_UNLINK
+  ,.request_path= "/images/my_dog.jpg"
+  ,.request_url= "/images/my_dog.jpg"
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.num_headers= 2
+  ,.headers= { { "Host", "example.com" }
+	     , { "Link", "<http://example.com/profiles/sally>; rel=\"tag\"" }
+             }
+  ,.body= ""
+  }
+
 , {.name= NULL } /* sentinel */
 };
 
@@ -2918,6 +2970,59 @@ const struct url_test url_tests[] =
   ,.rv=1 /* s_dead */
   }
 
+, {.name="ipv6 address with Zone ID"
+  ,.url="http://[fe80::a%25eth0]/"
+  ,.is_connect=0
+  ,.u=
+    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH)
+    ,.port=0
+    ,.field_data=
+      {{  0,  4 } /* UF_SCHEMA */
+      ,{  8, 14 } /* UF_HOST */
+      ,{  0,  0 } /* UF_PORT */
+      ,{ 23,  1 } /* UF_PATH */
+      ,{  0,  0 } /* UF_QUERY */
+      ,{  0,  0 } /* UF_FRAGMENT */
+      ,{  0,  0 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="ipv6 address with Zone ID, but '%' is not percent-encoded"
+  ,.url="http://[fe80::a%eth0]/"
+  ,.is_connect=0
+  ,.u=
+    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH)
+    ,.port=0
+    ,.field_data=
+      {{  0,  4 } /* UF_SCHEMA */
+      ,{  8, 12 } /* UF_HOST */
+      ,{  0,  0 } /* UF_PORT */
+      ,{ 21,  1 } /* UF_PATH */
+      ,{  0,  0 } /* UF_QUERY */
+      ,{  0,  0 } /* UF_FRAGMENT */
+      ,{  0,  0 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="ipv6 address ending with '%'"
+  ,.url="http://[fe80::a%]/"
+  ,.rv=1 /* s_dead */
+  }
+
+, {.name="ipv6 address with Zone ID including bad character"
+  ,.url="http://[fe80::a%$HOME]/"
+  ,.rv=1 /* s_dead */
+  }
+
+, {.name="just ipv6 Zone ID"
+  ,.url="http://[%eth0]/"
+  ,.rv=1 /* s_dead */
+  }
+
 #if HTTP_PARSER_STRICT
 
 , {.name="tab in URL"
@@ -3690,7 +3795,12 @@ main (void)
     "MOVE",
     "PROPFIND",
     "PROPPATCH",
+    "SEARCH",
     "UNLOCK",
+    "BIND",
+    "REBIND",
+    "UNBIND",
+    "ACL",
     "REPORT",
     "MKACTIVITY",
     "CHECKOUT",
@@ -3700,6 +3810,10 @@ main (void)
     "SUBSCRIBE",
     "UNSUBSCRIBE",
     "PATCH",
+    "PURGE",
+    "MKCALENDAR",
+    "LINK",
+    "UNLINK",
     0 };
   const char **this_method;
   for (this_method = all_methods; *this_method; this_method++) {

From 325c4c7af5e7542f23a17982116e4e10c55306d9 Mon Sep 17 00:00:00 2001
From: David Woods <david@birnamdesigns.com>
Date: Mon, 26 Oct 2015 13:51:30 -0400
Subject: [PATCH 102/323] doc:fix function param order in assert doc

PR-URL: https://github.com/nodejs/node/pull/3533
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
---
 doc/api/assert.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/assert.markdown b/doc/api/assert.markdown
index 7bf6ebb40fd30a..b81037287b499b 100644
--- a/doc/api/assert.markdown
+++ b/doc/api/assert.markdown
@@ -14,7 +14,7 @@ separated by the provided operator.
 ## assert(value[, message]), assert.ok(value[, message])
 
 Tests if value is truthy. It is equivalent to
-`assert.equal(true, !!value, message)`.
+`assert.equal(!!value, true, message)`.
 
 ## assert.equal(actual, expected[, message])
 

From f3594e77b26f5a63fcd9bdb244b849a29e686a28 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <imrani@ca.ibm.com>
Date: Tue, 3 Nov 2015 11:10:16 -0500
Subject: [PATCH 103/323] test: fix test-net-persistent-keepalive for AIX

Fixed an intermittent issue on AIX where the 600ms timeout was reached
before the 'connection' event was fired. This resulted in a failure as
serverConnection would be undefined and the assert.equal would throw an
error. Changed the flow of the test so that the timeout is only set
after a connection has been made.

PR-URL: https://github.com/nodejs/node/pull/3646
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 .../parallel/test-net-persistent-keepalive.js | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/parallel/test-net-persistent-keepalive.js b/test/parallel/test-net-persistent-keepalive.js
index a54833a8f56371..fccfb69c4b19f3 100644
--- a/test/parallel/test-net-persistent-keepalive.js
+++ b/test/parallel/test-net-persistent-keepalive.js
@@ -4,8 +4,17 @@ var assert = require('assert');
 var net = require('net');
 
 var serverConnection;
+var clientConnection;
 var echoServer = net.createServer(function(connection) {
   serverConnection = connection;
+  setTimeout(function() {
+    // make sure both connections are still open
+    assert.equal(serverConnection.readyState, 'open');
+    assert.equal(clientConnection.readyState, 'open');
+    serverConnection.end();
+    clientConnection.end();
+    echoServer.close();
+  }, 600);
   connection.setTimeout(0);
   assert.equal(typeof connection.setKeepAlive, 'function');
   connection.on('end', function() {
@@ -15,20 +24,11 @@ var echoServer = net.createServer(function(connection) {
 echoServer.listen(common.PORT);
 
 echoServer.on('listening', function() {
-  var clientConnection = new net.Socket();
+  clientConnection = new net.Socket();
   // send a keepalive packet after 1000 ms
   // and make sure it persists
   var s = clientConnection.setKeepAlive(true, 400);
   assert.ok(s instanceof net.Socket);
   clientConnection.connect(common.PORT);
   clientConnection.setTimeout(0);
-
-  setTimeout(function() {
-    // make sure both connections are still open
-    assert.equal(serverConnection.readyState, 'open');
-    assert.equal(clientConnection.readyState, 'open');
-    serverConnection.end();
-    clientConnection.end();
-    echoServer.close();
-  }, 600);
 });

From 801866280edbd54252d7b7421db1f1786cf65ec4 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Tue, 3 Nov 2015 12:33:21 -0800
Subject: [PATCH 104/323] doc: fix wrong date and known issue in changelog.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* A known issue was resolved but not removed from the list
* The wrong date was documented in the changelog for v4.2.2

PR-URL: https://github.com/nodejs/node/pull/3650
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ce1cc6ef3cd59..be628de737e216 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Node.js ChangeLog
 
-## 2015-10-29, Version 4.2.2 'Argon' (LTS), @jasnell
+## 2015-11-03, Version 4.2.2 'Argon' (LTS), @jasnell
 
 ### Notable changes
 
@@ -24,7 +24,6 @@ This is an LTS maintenance release that addresses a number of issues:
 
 ### Known issues
 
-* Some problems with unreferenced timers running during `beforeExit` are still to be resolved. See [#1264](https://github.com/nodejs/node/issues/1264).
 * Surrogate pair in REPL can freeze terminal. [#690](https://github.com/nodejs/node/issues/690)
 * Calling `dns.setServers()` while a DNS query is in progress can cause the process to crash on a failed assertion. [#894](https://github.com/nodejs/node/issues/894)
 * `url.resolve` may transfer the auth portion of the url when resolving between two full hosts, see [#1435](https://github.com/nodejs/node/issues/1435).

From 409f29972e49ffc59092ad83a50b4c902a460b09 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl@icu-project.org>
Date: Mon, 2 Nov 2015 15:21:24 -0800
Subject: [PATCH 105/323] doc: rename iojs-* groups to nodejs-*

As per #2525 a bunch of WGs are renamed from iojs-* to nodejs-*.
Update the WORKING_GROUPS.md to match.

Note specifically iojs-cn and iojs-tw were renamed to nodejs-zh-CN and
nodejs-zh-TW respectively.

Fixes: https://github.com/nodejs/node/issues/3247
PR-URL: https://github.com/nodejs/node/pull/3634
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 WORKING_GROUPS.md | 68 +++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/WORKING_GROUPS.md b/WORKING_GROUPS.md
index 60e7d6437d3795..e3e1f3c37f7dbe 100644
--- a/WORKING_GROUPS.md
+++ b/WORKING_GROUPS.md
@@ -110,40 +110,40 @@ Note that the i18n working groups are distinct from the [Intl](#Intl) working gr
 
 Each language community maintains its own membership.
 
-* [iojs-ar - Arabic (اللغة العربية)](https://github.com/nodejs/iojs-ar)
-* [iojs-bg - Bulgarian (български език)](https://github.com/nodejs/iojs-bg)
-* [iojs-bn - Bengali (বাংলা)](https://github.com/nodejs/iojs-bn)
-* [iojs-cn - Chinese (中文)](https://github.com/nodejs/iojs-cn)
-* [iojs-cs - Czech (Český Jazyk)](https://github.com/nodejs/iojs-cs)
-* [iojs-da - Danish (Dansk)](https://github.com/nodejs/iojs-da)
-* [iojs-de - German (Deutsch)](https://github.com/nodejs/iojs-de)
-* [iojs-el - Greek (Ελληνικά)](https://github.com/nodejs/iojs-el)
-* [iojs-es - Spanish (Español)](https://github.com/nodejs/iojs-es)
-* [iojs-fa - Persian (فارسی)](https://github.com/nodejs/iojs-fa)
-* [iojs-fi - Finnish (Suomi)](https://github.com/nodejs/iojs-fi)
-* [iojs-fr - French (Français)](https://github.com/nodejs/iojs-fr)
-* [iojs-he - Hebrew (עברית)](https://github.com/nodejs/iojs-he)
-* [iojs-hi - Hindi (फिजी बात)](https://github.com/nodejs/iojs-hi)
-* [iojs-hu - Hungarian (Magyar)](https://github.com/nodejs/iojs-hu)
-* [iojs-id - Indonesian (Bahasa Indonesia)](https://github.com/nodejs/iojs-id)
-* [iojs-it - Italian (Italiano)](https://github.com/nodejs/iojs-it)
-* [iojs-ja - Japanese (日本語)](https://github.com/nodejs/iojs-ja)
-* [iojs-ka - Georgian (ქართული)](https://github.com/nodejs/iojs-ka)
-* [iojs-ko - Korean (조선말)](https://github.com/nodejs/iojs-ko)
-* [iojs-mk - Macedonian (Mакедонски)](https://github.com/nodejs/iojs-mk)
-* [iojs-ms - Malay (بهاس ملايو)](https://github.com/nodejs/iojs-ms)
-* [iojs-nl - Dutch (Nederlands)](https://github.com/nodejs/iojs-nl)
-* [iojs-no - Norwegian (Norsk)](https://github.com/nodejs/iojs-no)
-* [iojs-pl - Polish (Język Polski)](https://github.com/nodejs/iojs-pl)
-* [iojs-pt - Portuguese (Português)](https://github.com/nodejs/iojs-pt)
-* [iojs-ro - Romanian (Română)](https://github.com/nodejs/iojs-ro)
-* [iojs-ru - Russian (Русский)](https://github.com/nodejs/iojs-ru)
-* [iojs-sv - Swedish (Svenska)](https://github.com/nodejs/iojs-sv)
-* [iojs-ta - Tamil (தமிழ்)](https://github.com/nodejs/iojs-ta)
-* [iojs-tr - Turkish (Türkçe)](https://github.com/nodejs/iojs-tr)
-* [iojs-tw - Taiwanese (Hō-ló)](https://github.com/nodejs/iojs-tw)
-* [iojs-uk - Ukrainian (Українська)](https://github.com/nodejs/iojs-uk)
-* [iojs-vi - Vietnamese (Tiếng Việtnam)](https://github.com/nodejs/iojs-vi)
+* [nodejs-ar - Arabic (اللغة العربية)](https://github.com/nodejs/nodejs-ar)
+* [nodejs-bg - Bulgarian (български език)](https://github.com/nodejs/nodejs-bg)
+* [nodejs-bn - Bengali (বাংলা)](https://github.com/nodejs/nodejs-bn)
+* [nodejs-zh-CN - Chinese (中文)](https://github.com/nodejs/nodejs-zh-CN)
+* [nodejs-cs - Czech (Český Jazyk)](https://github.com/nodejs/nodejs-cs)
+* [nodejs-da - Danish (Dansk)](https://github.com/nodejs/nodejs-da)
+* [nodejs-de - German (Deutsch)](https://github.com/nodejs/nodejs-de)
+* [nodejs-el - Greek (Ελληνικά)](https://github.com/nodejs/nodejs-el)
+* [nodejs-es - Spanish (Español)](https://github.com/nodejs/nodejs-es)
+* [nodejs-fa - Persian (فارسی)](https://github.com/nodejs/nodejs-fa)
+* [nodejs-fi - Finnish (Suomi)](https://github.com/nodejs/nodejs-fi)
+* [nodejs-fr - French (Français)](https://github.com/nodejs/nodejs-fr)
+* [nodejs-he - Hebrew (עברית)](https://github.com/nodejs/nodejs-he)
+* [nodejs-hi - Hindi (फिजी बात)](https://github.com/nodejs/nodejs-hi)
+* [nodejs-hu - Hungarian (Magyar)](https://github.com/nodejs/nodejs-hu)
+* [nodejs-id - Indonesian (Bahasa Indonesia)](https://github.com/nodejs/nodejs-id)
+* [nodejs-it - Italian (Italiano)](https://github.com/nodejs/nodejs-it)
+* [nodejs-ja - Japanese (日本語)](https://github.com/nodejs/nodejs-ja)
+* [nodejs-ka - Georgian (ქართული)](https://github.com/nodejs/nodejs-ka)
+* [nodejs-ko - Korean (조선말)](https://github.com/nodejs/nodejs-ko)
+* [nodejs-mk - Macedonian (Mакедонски)](https://github.com/nodejs/nodejs-mk)
+* [nodejs-ms - Malay (بهاس ملايو)](https://github.com/nodejs/nodejs-ms)
+* [nodejs-nl - Dutch (Nederlands)](https://github.com/nodejs/nodejs-nl)
+* [nodejs-no - Norwegian (Norsk)](https://github.com/nodejs/nodejs-no)
+* [nodejs-pl - Polish (Język Polski)](https://github.com/nodejs/nodejs-pl)
+* [nodejs-pt - Portuguese (Português)](https://github.com/nodejs/nodejs-pt)
+* [nodejs-ro - Romanian (Română)](https://github.com/nodejs/nodejs-ro)
+* [nodejs-ru - Russian (Русский)](https://github.com/nodejs/nodejs-ru)
+* [nodejs-sv - Swedish (Svenska)](https://github.com/nodejs/nodejs-sv)
+* [nodejs-ta - Tamil (தமிழ்)](https://github.com/nodejs/nodejs-ta)
+* [nodejs-tr - Turkish (Türkçe)](https://github.com/nodejs/nodejs-tr)
+* [nodejs-zh-TW - Taiwanese (Hō-ló)](https://github.com/nodejs/nodejs-zh-TW)
+* [nodejs-uk - Ukrainian (Українська)](https://github.com/nodejs/nodejs-uk)
+* [nodejs-vi - Vietnamese (Tiếng Việtnam)](https://github.com/nodejs/nodejs-vi)
 
 ### [Intl](https://github.com/nodejs/Intl)
 

From a0db5fb35565ac57caec5f6b383ba7c6cb57b73c Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Sun, 4 Oct 2015 00:15:08 +0200
Subject: [PATCH 106/323] doc: stdout/stderr can block when directed to file

Update the documentation for `process.stdout` and `process.stdout` to
clarify that writes can block when stdio is redirected to a file.  In
all other cases, it's non-blocking.

PR-URL: https://github.com/nodejs/node/pull/3170
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/process.markdown | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/doc/api/process.markdown b/doc/api/process.markdown
index eecf494c48bf27..0c32799a66b6c6 100644
--- a/doc/api/process.markdown
+++ b/doc/api/process.markdown
@@ -282,7 +282,9 @@ For example, a `console.log` equivalent could look like this:
 
 `process.stderr` and `process.stdout` are unlike other streams in Node.js in
 that they cannot be closed (`end()` will throw), they never emit the `finish`
-event and that writes are always blocking.
+event and that writes can block when output is redirected to a file (although
+disks are fast and operating systems normally employ write-back caching so it
+should be a very rare occurrence indeed.)
 
 To check if Node.js is being run in a TTY context, read the `isTTY` property
 on `process.stderr`, `process.stdout`, or `process.stdin`:
@@ -305,14 +307,9 @@ A writable stream to stderr (on fd `2`).
 
 `process.stderr` and `process.stdout` are unlike other streams in Node.js in
 that they cannot be closed (`end()` will throw), they never emit the `finish`
-event and that writes are usually blocking.
-
-- They are blocking in the case that they refer to regular files or TTY file
-  descriptors.
-- In the case they refer to pipes:
-  - They are blocking in Linux/Unix.
-  - They are non-blocking like other streams in Windows.
-
+event and that writes can block when output is redirected to a file (although
+disks are fast and operating systems normally employ write-back caching so it
+should be a very rare occurrence indeed.)
 
 ## process.stdin
 

From a7f28a098ef43fef93f150018acdada564b6da21 Mon Sep 17 00:00:00 2001
From: Ashok Suthar <coderatlabs@gmail.com>
Date: Thu, 5 Nov 2015 20:03:18 +0530
Subject: [PATCH 107/323] http: remove unneeded cb check from setTimeout()

- This check is already covered in EventEmitter#addListener()

Refs: https://github.com/nodejs/node/pull/3618
PR-URL: https://github.com/nodejs/node/pull/3631
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 lib/_http_outgoing.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js
index e28609f8869a11..e3a258b1cddd12 100644
--- a/lib/_http_outgoing.js
+++ b/lib/_http_outgoing.js
@@ -91,8 +91,6 @@ exports.OutgoingMessage = OutgoingMessage;
 OutgoingMessage.prototype.setTimeout = function(msecs, callback) {
 
   if (callback) {
-    if (typeof callback !== 'function')
-      throw new TypeError('callback must be a function');
     this.on('timeout', callback);
   }
 

From 7a84fa6c608a861b4223f1b88480e0b22d89caeb Mon Sep 17 00:00:00 2001
From: fansworld-claudio <cr@fansworld.tv>
Date: Thu, 10 Sep 2015 09:31:27 -0300
Subject: [PATCH 108/323] docs: fs - remove encoding list and link to buffer

---
 doc/api/fs.markdown | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/api/fs.markdown b/doc/api/fs.markdown
index b46c94984fbca8..bb8060e355a81b 100644
--- a/doc/api/fs.markdown
+++ b/doc/api/fs.markdown
@@ -828,7 +828,7 @@ default value of 64 kb for the same parameter.
 
 `options` can include `start` and `end` values to read a range of bytes from
 the file instead of the entire file.  Both `start` and `end` are inclusive and
-start at 0. The `encoding` can be `'utf8'`, `'ascii'`, or `'base64'`.
+start at 0. The `encoding` can be any one of those accepted by [Buffer](buffer.html).
 
 If `fd` is specified, `ReadStream` will ignore the `path` argument and will use
 the specified file descriptor. This means that no `open` event will be emitted.
@@ -873,8 +873,7 @@ Returns a new WriteStream object (See `Writable Stream`).
 `options` may also include a `start` option to allow writing data at
 some position past the beginning of the file.  Modifying a file rather
 than replacing it may require a `flags` mode of `r+` rather than the
-default mode `w`. The `defaultEncoding` can be `'utf8'`, `'ascii'`, `binary`,
-or `'base64'`.
+default mode `w`. The `defaultEncoding` can be any one of those accepted by [Buffer](buffer.html).
 
 Like `ReadStream` above, if `fd` is specified, `WriteStream` will ignore the
 `path` argument and will use the specified file descriptor. This means that no

From 73e40f0327f16a975ec9e905eec93fc6a74ba395 Mon Sep 17 00:00:00 2001
From: fansworld-claudio <cr@fansworld.tv>
Date: Tue, 13 Oct 2015 16:15:06 -0300
Subject: [PATCH 109/323] docs: fs - change links to buffer encoding to Buffer
 class anchor

PR-URL: https://github.com/nodejs/node/pull/2796
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/fs.markdown | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/api/fs.markdown b/doc/api/fs.markdown
index bb8060e355a81b..801f3bbe0ea320 100644
--- a/doc/api/fs.markdown
+++ b/doc/api/fs.markdown
@@ -828,7 +828,7 @@ default value of 64 kb for the same parameter.
 
 `options` can include `start` and `end` values to read a range of bytes from
 the file instead of the entire file.  Both `start` and `end` are inclusive and
-start at 0. The `encoding` can be any one of those accepted by [Buffer](buffer.html).
+start at 0. The `encoding` can be any one of those accepted by [Buffer][].
 
 If `fd` is specified, `ReadStream` will ignore the `path` argument and will use
 the specified file descriptor. This means that no `open` event will be emitted.
@@ -873,7 +873,7 @@ Returns a new WriteStream object (See `Writable Stream`).
 `options` may also include a `start` option to allow writing data at
 some position past the beginning of the file.  Modifying a file rather
 than replacing it may require a `flags` mode of `r+` rather than the
-default mode `w`. The `defaultEncoding` can be any one of those accepted by [Buffer](buffer.html).
+default mode `w`. The `defaultEncoding` can be any one of those accepted by [Buffer][].
 
 Like `ReadStream` above, if `fd` is specified, `WriteStream` will ignore the
 `path` argument and will use the specified file descriptor. This means that no
@@ -923,3 +923,4 @@ Emitted when an error occurs.
 [fs.access]: #fs_fs_access_path_mode_callback
 [fs.statSync]: #fs_fs_statsync_path
 [fs.accessSync]: #fs_fs_accesssync_path_mode
+[Buffer]: buffer.html#buffer_buffer
\ No newline at end of file

From 8f5a2550a72af3dd76f144ddd133e119b9fbb4ff Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Thu, 5 Nov 2015 18:16:18 +0100
Subject: [PATCH 110/323] build: omit -gline-tables-only for --enable-asan

`-gline-tables-only` is a clang-only flag.  Drop it, it's not needed for
address sanitizer-enabled builds and it makes it impossible to build
with gcc.

Fixes: https://github.com/nodejs/node/issues/3656
PR-URL: https://github.com/nodejs/node/pull/3680
Reviewed-By: Fedor Indutny <fedor@indutny.com>
---
 common.gypi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common.gypi b/common.gypi
index dc7f9b67577d03..5b8b2c09d6b4a9 100644
--- a/common.gypi
+++ b/common.gypi
@@ -183,7 +183,6 @@
           '-fsanitize=address',
           '-DLEAK_SANITIZER'
         ],
-        'cflags_cc+': [ '-gline-tables-only' ],
         'cflags!': [ '-fomit-frame-pointer' ],
         'ldflags': [ '-fsanitize=address' ],
       }],

From 89285db1284ecf2e2be9d5c7da9f8488aecbd4b7 Mon Sep 17 00:00:00 2001
From: Andres Suarez <zertosh@gmail.com>
Date: Wed, 28 Oct 2015 17:12:35 -0700
Subject: [PATCH 111/323] module: remove unnecessary JSON.stringify

`debuglog` uses `%j` as a placeholder for replacement with
`JSON.stringify`. So that `JSON.stringify` is only called when the
appropriate debug flag is on. The other `%s` changes are for style
consistency.

PR-URL: https://github.com/nodejs/node/pull/3578
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 lib/module.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/module.js b/lib/module.js
index ef0fad209ff9c8..0da2398ba6872d 100644
--- a/lib/module.js
+++ b/lib/module.js
@@ -254,8 +254,8 @@ Module._resolveLookupPaths = function(request, parent) {
     id = './' + id;
   }
 
-  debug('RELATIVE: requested:' + request +
-        ' set ID to: ' + id + ' from ' + parent.id);
+  debug('RELATIVE: requested: %s set ID to: %s from %s', request, id,
+        parent.id);
 
   return [id, [path.dirname(parent.filename)]];
 };
@@ -270,7 +270,7 @@ Module._resolveLookupPaths = function(request, parent) {
 //    object.
 Module._load = function(request, parent, isMain) {
   if (parent) {
-    debug('Module._load REQUEST  ' + (request) + ' parent: ' + parent.id);
+    debug('Module._load REQUEST %s parent: %s', request, parent.id);
   }
 
   // REPL is a special case, because it needs the real require.
@@ -292,7 +292,7 @@ Module._load = function(request, parent, isMain) {
   }
 
   if (NativeModule.nonInternalExists(filename)) {
-    debug('load native module ' + request);
+    debug('load native module %s', request);
     return NativeModule.require(filename);
   }
 
@@ -329,8 +329,7 @@ Module._resolveFilename = function(request, parent) {
   var paths = resolvedModule[1];
 
   // look up the filename first, since that's the cache key.
-  debug('looking for ' + JSON.stringify(id) +
-        ' in ' + JSON.stringify(paths));
+  debug('looking for %j in %j', id, paths);
 
   var filename = Module._findPath(request, paths);
   if (!filename) {
@@ -344,8 +343,7 @@ Module._resolveFilename = function(request, parent) {
 
 // Given a file name, pass it to the proper extension handler.
 Module.prototype.load = function(filename) {
-  debug('load ' + JSON.stringify(filename) +
-        ' for module ' + JSON.stringify(this.id));
+  debug('load %j for module %j', filename, this.id);
 
   assert(!this.loaded);
   this.filename = filename;

From 59cd28114dbb8fee78adb2a6dd35e1f08b327a1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omerusta@gmail.com>
Date: Wed, 28 Oct 2015 15:49:51 +0300
Subject: [PATCH 112/323] Add missing va_end before return

PR-URL: https://github.com/nodejs/node/pull/3565
Reviewed-By: Brian White <mscdex@mscdex.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 src/node.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/node.cc b/src/node.cc
index 892a76b63ed2e3..7dfa708b7b1ad1 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -176,6 +176,7 @@ static void PrintErrorString(const char* format, ...) {
       stderr_handle == nullptr ||
       uv_guess_handle(_fileno(stderr)) != UV_TTY) {
     vfprintf(stderr, format, ap);
+    va_end(ap);
     return;
   }
 

From 44f779b112e3c6ce69d31d464674382829cfaecc Mon Sep 17 00:00:00 2001
From: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Date: Mon, 27 Jul 2015 16:10:57 +0900
Subject: [PATCH 113/323] doc: add caveats of algs and key size in crypto

Add description of user responsibility in the choice of cypto
algorithms and its key length. Some of recommendations for the safer
use are also described.

PR-URL: https://github.com/nodejs/node/pull/3479
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/crypto.markdown | 51 +++++++++++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/doc/api/crypto.markdown b/doc/api/crypto.markdown
index 6511cfadc9b7c0..b1da67818cb7af 100644
--- a/doc/api/crypto.markdown
+++ b/doc/api/crypto.markdown
@@ -97,18 +97,18 @@ Creates and returns a hash object, a cryptographic hash with the given
 algorithm which can be used to generate hash digests.
 
 `algorithm` is dependent on the available algorithms supported by the
-version of OpenSSL on the platform. Examples are `'sha1'`, `'md5'`,
-`'sha256'`, `'sha512'`, etc.  On recent releases, `openssl
+version of OpenSSL on the platform. Examples are `'sha256'`,
+`'sha512'`, etc.  On recent releases, `openssl
 list-message-digest-algorithms` will display the available digest
 algorithms.
 
-Example: this program that takes the sha1 sum of a file
+Example: this program that takes the sha256 sum of a file
 
     var filename = process.argv[2];
     var crypto = require('crypto');
     var fs = require('fs');
 
-    var shasum = crypto.createHash('sha1');
+    var shasum = crypto.createHash('sha256');
 
     var s = fs.ReadStream(filename);
     s.on('data', function(d) {
@@ -511,21 +511,21 @@ expected.
 ## crypto.getDiffieHellman(group_name)
 
 Creates a predefined Diffie-Hellman key exchange object.  The
-supported groups are: `'modp1'`, `'modp2'`, `'modp5'` (defined in [RFC
-2412][]) and `'modp14'`, `'modp15'`, `'modp16'`, `'modp17'`,
-`'modp18'` (defined in [RFC 3526][]).  The returned object mimics the
-interface of objects created by [crypto.createDiffieHellman()][]
-above, but will not allow to change the keys (with
-[diffieHellman.setPublicKey()][] for example).  The advantage of using
-this routine is that the parties don't have to generate nor exchange
-group modulus beforehand, saving both processor and communication
-time.
+supported groups are: `'modp1'`, `'modp2'`, `'modp5'` (defined in
+[RFC 2412][], but see [Caveats](#crypto_caveats)) and `'modp14'`,
+`'modp15'`, `'modp16'`, `'modp17'`, `'modp18'` (defined in
+[RFC 3526][]).  The returned object mimics the interface of objects
+created by [crypto.createDiffieHellman()][] above, but will not allow
+changing the keys (with [diffieHellman.setPublicKey()][] for example).
+The advantage of using this routine is that the parties do not have to
+generate nor exchange group modulus beforehand, saving both processor
+and communication time.
 
 Example (obtaining a shared secret):
 
     var crypto = require('crypto');
-    var alice = crypto.getDiffieHellman('modp5');
-    var bob = crypto.getDiffieHellman('modp5');
+    var alice = crypto.getDiffieHellman('modp14');
+    var bob = crypto.getDiffieHellman('modp14');
 
     alice.generateKeys();
     bob.generateKeys();
@@ -768,6 +768,26 @@ default, set the `crypto.DEFAULT_ENCODING` field to 'binary'.  Note
 that new programs will probably expect buffers, so only use this as a
 temporary measure.
 
+## Caveats
+
+The crypto module still supports some algorithms which are already
+compromised. And the API also allows the use of ciphers and hashes
+with a small key size that are considered to be too weak for safe use.
+
+Users should take full responsibility for selecting the crypto
+algorithm and key size according to their security requirements.
+
+Based on the recommendations of [NIST SP 800-131A]:
+
+- MD5 and SHA-1 are no longer acceptable where collision resistance is
+  required such as digital signatures.
+- The key used with RSA, DSA and DH algorithms is recommended to have
+  at least 2048 bits and that of the curve of ECDSA and ECDH at least
+  224 bits, to be safe to use for several years.
+- The DH groups of `modp1`, `modp2` and `modp5` have a key size
+  smaller than 2048 bits and are not recommended.
+
+See the reference for other recommendations and details.
 
 [createCipher()]: #crypto_crypto_createcipher_algorithm_password
 [createCipheriv()]: #crypto_crypto_createcipheriv_algorithm_key_iv
@@ -779,3 +799,4 @@ temporary measure.
 [RFC 3526]: http://www.rfc-editor.org/rfc/rfc3526.txt
 [crypto.pbkdf2]: #crypto_crypto_pbkdf2_password_salt_iterations_keylen_digest_callback
 [EVP_BytesToKey]: https://www.openssl.org/docs/crypto/EVP_BytesToKey.html
+[NIST SP 800-131A]: http://csrc.nist.gov/publications/nistpubs/800-131A/sp800-131A.pdf

From b14d9c5f16e9c17e9fcc9379a5650704a4e0bb04 Mon Sep 17 00:00:00 2001
From: Alejandro Oviedo <alejandro.oviedo.g@gmail.com>
Date: Fri, 6 Nov 2015 11:00:16 -0300
Subject: [PATCH 114/323] doc: add method links in events.markdown
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added referenced method links.

PR-URL: https://github.com/nodejs/node/pull/3187
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
---
 doc/api/events.markdown | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/doc/api/events.markdown b/doc/api/events.markdown
index 543d263dc3d799..9dc384a850543f 100644
--- a/doc/api/events.markdown
+++ b/doc/api/events.markdown
@@ -4,8 +4,10 @@
 
 <!--type=module-->
 
-Many objects in Node.js emit events: a `net.Server` emits an event each time
-a peer connects to it, a `fs.readStream` emits an event when the file is
+Many objects in Node.js emit events: a
+[`net.Server`](net.html#net_class_net_server) emits an event each time a peer
+connects to it, a [`fs.ReadStream`](fs.html#fs_class_fs_readstream) emits an
+event when the file is
 opened. All objects which emit events are instances of `events.EventEmitter`.
 You can access this module by doing: `require("events");`
 
@@ -99,7 +101,8 @@ Returns emitter, so calls can be chained.
 ### emitter.getMaxListeners()
 
 Returns the current max listener value for the emitter which is either set by
-`emitter.setMaxListeners(n)` or defaults to `EventEmitter.defaultMaxListeners`.
+[`emitter.setMaxListeners(n)`](#events_emitter_setmaxlisteners_n) or defaults to
+[`EventEmitter.defaultMaxListeners`](#events_eventemitter_defaultmaxlisteners).
 
 This can be useful to increment/decrement max listeners to avoid the warning
 while not being irresponsible and setting a too big number.
@@ -112,12 +115,13 @@ while not being irresponsible and setting a too big number.
 
 ### EventEmitter.defaultMaxListeners
 
-`emitter.setMaxListeners(n)` sets the maximum on a per-instance basis.
+[`emitter.setMaxListeners(n)`](#events_emitter_setmaxlisteners_n) sets the
+maximum on a per-instance basis.
 This class property lets you set it for *all* `EventEmitter` instances,
 current and future, effective immediately. Use with care.
 
-Note that `emitter.setMaxListeners(n)` still has precedence over
-`EventEmitter.defaultMaxListeners`.
+Note that [`emitter.setMaxListeners(n)`](#events_emitter_setmaxlisteners_n)
+still has precedence over `EventEmitter.defaultMaxListeners`.
 
 
 ### emitter.listeners(event)

From 9a45c21e6c942f14dde54de7f415f1b2ab82e1f6 Mon Sep 17 00:00:00 2001
From: qinjia <qinjia@outlook.com>
Date: Fri, 6 Nov 2015 17:32:33 +0800
Subject: [PATCH 115/323] util: use regexp instead of str.replace().join()

PR-URL: https://github.com/nodejs/node/pull/3689
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/util.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/util.js b/lib/util.js
index 3335faf3d8c51e..9a68ea0068cbf3 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -575,13 +575,9 @@ function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
       }
       if (str.indexOf('\n') > -1) {
         if (array) {
-          str = str.split('\n').map(function(line) {
-            return '  ' + line;
-          }).join('\n').substr(2);
+          str = str.replace(/\n/g, '\n  ');
         } else {
-          str = '\n' + str.split('\n').map(function(line) {
-            return '   ' + line;
-          }).join('\n');
+          str = str.replace(/(^|\n)/g, '\n   ');
         }
       }
     } else {

From b48dbf9fce36337a051c99c34865dcb5d0761ba9 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <me@re-becca.org>
Date: Mon, 2 Nov 2015 17:16:25 -0800
Subject: [PATCH 116/323] deps: upgrade npm to 3.3.12

PR-URL: https://github.com/nodejs/node/pull/3685
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 deps/npm/CHANGELOG.md                         | 102 +++++++++++
 deps/npm/html/doc/README.html                 |   4 +-
 deps/npm/html/doc/cli/npm-access.html         |   2 +-
 deps/npm/html/doc/cli/npm-adduser.html        |   2 +-
 deps/npm/html/doc/cli/npm-bin.html            |   2 +-
 deps/npm/html/doc/cli/npm-bugs.html           |   2 +-
 deps/npm/html/doc/cli/npm-build.html          |   2 +-
 deps/npm/html/doc/cli/npm-bundle.html         |   2 +-
 deps/npm/html/doc/cli/npm-cache.html          |   2 +-
 deps/npm/html/doc/cli/npm-completion.html     |   2 +-
 deps/npm/html/doc/cli/npm-config.html         |   2 +-
 deps/npm/html/doc/cli/npm-dedupe.html         |   2 +-
 deps/npm/html/doc/cli/npm-deprecate.html      |   2 +-
 deps/npm/html/doc/cli/npm-dist-tag.html       |   2 +-
 deps/npm/html/doc/cli/npm-docs.html           |   2 +-
 deps/npm/html/doc/cli/npm-edit.html           |   2 +-
 deps/npm/html/doc/cli/npm-explore.html        |   2 +-
 deps/npm/html/doc/cli/npm-help-search.html    |   2 +-
 deps/npm/html/doc/cli/npm-help.html           |   2 +-
 deps/npm/html/doc/cli/npm-init.html           |   2 +-
 deps/npm/html/doc/cli/npm-install.html        |   2 +-
 deps/npm/html/doc/cli/npm-link.html           |   2 +-
 deps/npm/html/doc/cli/npm-logout.html         |   2 +-
 deps/npm/html/doc/cli/npm-ls.html             |   4 +-
 deps/npm/html/doc/cli/npm-outdated.html       |   2 +-
 deps/npm/html/doc/cli/npm-owner.html          |   2 +-
 deps/npm/html/doc/cli/npm-pack.html           |   2 +-
 deps/npm/html/doc/cli/npm-ping.html           |   2 +-
 deps/npm/html/doc/cli/npm-prefix.html         |   2 +-
 deps/npm/html/doc/cli/npm-prune.html          |   2 +-
 deps/npm/html/doc/cli/npm-publish.html        |   2 +-
 deps/npm/html/doc/cli/npm-rebuild.html        |   2 +-
 deps/npm/html/doc/cli/npm-repo.html           |   2 +-
 deps/npm/html/doc/cli/npm-restart.html        |   2 +-
 deps/npm/html/doc/cli/npm-root.html           |   2 +-
 deps/npm/html/doc/cli/npm-run-script.html     |   2 +-
 deps/npm/html/doc/cli/npm-search.html         |   2 +-
 deps/npm/html/doc/cli/npm-shrinkwrap.html     |   2 +-
 deps/npm/html/doc/cli/npm-star.html           |   2 +-
 deps/npm/html/doc/cli/npm-stars.html          |   2 +-
 deps/npm/html/doc/cli/npm-start.html          |   2 +-
 deps/npm/html/doc/cli/npm-stop.html           |   2 +-
 deps/npm/html/doc/cli/npm-tag.html            |   2 +-
 deps/npm/html/doc/cli/npm-team.html           |   2 +-
 deps/npm/html/doc/cli/npm-test.html           |   2 +-
 deps/npm/html/doc/cli/npm-uninstall.html      |   2 +-
 deps/npm/html/doc/cli/npm-unpublish.html      |   2 +-
 deps/npm/html/doc/cli/npm-update.html         |   2 +-
 deps/npm/html/doc/cli/npm-version.html        |   2 +-
 deps/npm/html/doc/cli/npm-view.html           |   2 +-
 deps/npm/html/doc/cli/npm-whoami.html         |   2 +-
 deps/npm/html/doc/cli/npm.html                |  10 +-
 deps/npm/html/doc/files/npm-folders.html      |   2 +-
 deps/npm/html/doc/files/npm-global.html       |   2 +-
 deps/npm/html/doc/files/npm-json.html         |   2 +-
 deps/npm/html/doc/files/npmrc.html            |   2 +-
 deps/npm/html/doc/files/package.json.html     |   2 +-
 deps/npm/html/doc/index.html                  |   2 +-
 deps/npm/html/doc/misc/npm-coding-style.html  |   2 +-
 deps/npm/html/doc/misc/npm-config.html        |   2 +-
 deps/npm/html/doc/misc/npm-developers.html    |   2 +-
 deps/npm/html/doc/misc/npm-disputes.html      |   8 +-
 deps/npm/html/doc/misc/npm-faq.html           |   4 +-
 deps/npm/html/doc/misc/npm-index.html         | 165 ++++++++++++++++++
 deps/npm/html/doc/misc/npm-orgs.html          |   2 +-
 deps/npm/html/doc/misc/npm-registry.html      |   2 +-
 deps/npm/html/doc/misc/npm-scope.html         |   2 +-
 deps/npm/html/doc/misc/npm-scripts.html       |   2 +-
 deps/npm/html/doc/misc/removing-npm.html      |   2 +-
 deps/npm/html/doc/misc/semver.html            |   2 +-
 deps/npm/lib/fetch-package-metadata.js        |  10 ++
 deps/npm/lib/install/action/finalize.js       |  37 +++-
 deps/npm/lib/install/deps.js                  |  24 +--
 deps/npm/lib/install/diff-trees.js            |   1 +
 deps/npm/man/man1/npm-README.1                |   2 +-
 deps/npm/man/man1/npm-access.1                |   2 +-
 deps/npm/man/man1/npm-adduser.1               |   2 +-
 deps/npm/man/man1/npm-bin.1                   |   2 +-
 deps/npm/man/man1/npm-bugs.1                  |   2 +-
 deps/npm/man/man1/npm-build.1                 |   2 +-
 deps/npm/man/man1/npm-bundle.1                |   2 +-
 deps/npm/man/man1/npm-cache.1                 |   2 +-
 deps/npm/man/man1/npm-completion.1            |   2 +-
 deps/npm/man/man1/npm-config.1                |   2 +-
 deps/npm/man/man1/npm-dedupe.1                |   2 +-
 deps/npm/man/man1/npm-deprecate.1             |   2 +-
 deps/npm/man/man1/npm-dist-tag.1              |   2 +-
 deps/npm/man/man1/npm-docs.1                  |   2 +-
 deps/npm/man/man1/npm-edit.1                  |   2 +-
 deps/npm/man/man1/npm-explore.1               |   2 +-
 deps/npm/man/man1/npm-help-search.1           |   2 +-
 deps/npm/man/man1/npm-help.1                  |   2 +-
 deps/npm/man/man1/npm-init.1                  |   2 +-
 deps/npm/man/man1/npm-install-test.1          |  32 ++++
 deps/npm/man/man1/npm-install.1               |   2 +-
 deps/npm/man/man1/npm-link.1                  |   2 +-
 deps/npm/man/man1/npm-logout.1                |   2 +-
 deps/npm/man/man1/npm-ls.1                    |   4 +-
 deps/npm/man/man1/npm-outdated.1              |   2 +-
 deps/npm/man/man1/npm-owner.1                 |   2 +-
 deps/npm/man/man1/npm-pack.1                  |   2 +-
 deps/npm/man/man1/npm-ping.1                  |   2 +-
 deps/npm/man/man1/npm-prefix.1                |   2 +-
 deps/npm/man/man1/npm-prune.1                 |   2 +-
 deps/npm/man/man1/npm-publish.1               |   2 +-
 deps/npm/man/man1/npm-rebuild.1               |   2 +-
 deps/npm/man/man1/npm-repo.1                  |   2 +-
 deps/npm/man/man1/npm-restart.1               |   2 +-
 deps/npm/man/man1/npm-rm.1                    |  33 ++++
 deps/npm/man/man1/npm-root.1                  |   2 +-
 deps/npm/man/man1/npm-run-script.1            |   2 +-
 deps/npm/man/man1/npm-search.1                |   2 +-
 deps/npm/man/man1/npm-shrinkwrap.1            |   2 +-
 deps/npm/man/man1/npm-star.1                  |   2 +-
 deps/npm/man/man1/npm-stars.1                 |   2 +-
 deps/npm/man/man1/npm-start.1                 |   2 +-
 deps/npm/man/man1/npm-stop.1                  |   2 +-
 deps/npm/man/man1/npm-tag.1                   |   2 +-
 deps/npm/man/man1/npm-team.1                  |   2 +-
 deps/npm/man/man1/npm-test.1                  |   2 +-
 deps/npm/man/man1/npm-uninstall.1             |   2 +-
 deps/npm/man/man1/npm-unpublish.1             |   2 +-
 deps/npm/man/man1/npm-update.1                |   2 +-
 deps/npm/man/man1/npm-version.1               |   2 +-
 deps/npm/man/man1/npm-view.1                  |   2 +-
 deps/npm/man/man1/npm-whoami.1                |   2 +-
 deps/npm/man/man1/npm.1                       |   4 +-
 deps/npm/man/man5/npm-folders.5               |   2 +-
 deps/npm/man/man5/npm-global.5                |   2 +-
 deps/npm/man/man5/npm-json.5                  |   2 +-
 deps/npm/man/man5/npmrc.5                     |   2 +-
 deps/npm/man/man5/package.json.5              |   2 +-
 deps/npm/man/man7/npm-coding-style.7          |   2 +-
 deps/npm/man/man7/npm-config.7                |   2 +-
 deps/npm/man/man7/npm-developers.7            |   2 +-
 deps/npm/man/man7/npm-disputes.7              |   2 +-
 deps/npm/man/man7/npm-faq.7                   |   2 +-
 deps/npm/man/man7/npm-index.7                 |   2 +-
 deps/npm/man/man7/npm-orgs.7                  |   2 +-
 deps/npm/man/man7/npm-registry.7              |   2 +-
 deps/npm/man/man7/npm-scope.7                 |   2 +-
 deps/npm/man/man7/npm-scripts.7               |   2 +-
 deps/npm/man/man7/removing-npm.7              |   2 +-
 deps/npm/man/man7/semver.7                    |   2 +-
 deps/npm/package.json                         |   6 +-
 deps/npm/test/tap/bugs.js                     |   8 +-
 deps/npm/test/tap/override-bundled.js         | 106 +++++++++++
 deps/npm/test/tap/shrinkwrap-version-match.js | 120 +++++++++++++
 deps/npm/test/tap/version-no-package.js       |   3 +-
 149 files changed, 770 insertions(+), 173 deletions(-)
 create mode 100644 deps/npm/html/doc/misc/npm-index.html
 create mode 100644 deps/npm/man/man1/npm-install-test.1
 create mode 100644 deps/npm/man/man1/npm-rm.1
 create mode 100644 deps/npm/test/tap/override-bundled.js
 create mode 100644 deps/npm/test/tap/shrinkwrap-version-match.js

diff --git a/deps/npm/CHANGELOG.md b/deps/npm/CHANGELOG.md
index a37a68bd7c965e..c12eb8fbc2c630 100644
--- a/deps/npm/CHANGELOG.md
+++ b/deps/npm/CHANGELOG.md
@@ -1,3 +1,105 @@
+### v3.3.12 (2015-11-02):
+
+Hi, a little hot-fix release for a bug introduced in 3.3.11.  The ENOENT fix
+last week ([`f0e2088`](https://github.com/npm/npm/commit/f0e2088)) broke
+upgrades of modules that have bundled dependencies (like `npm`, augh!)
+
+* [`aedf7cf`](https://github.com/npm/npm/commit/aedf7cf)
+  [#10192](//github.com/npm/npm/pull/10192)
+  If a bundled module is going to be replacing a module that's currently on
+  disk (for instance, when you upgrade a module that includes bundled
+  dependencies) we want to select the version from the bundle in preference
+  over the one that was there previously.
+  ([@iarna](https://github.com/iarna))
+
+### v3.3.11 (2015-10-29):
+
+This is a dependency update week, so that means no PRs from our lovely
+users. Look for those next week.  As it happens, the dependencies updated
+were just devdeps, so nothing for you all to worry about.
+
+But the bug fixes, oh geez, I tracked down some really long standing stuff
+this week!!  The headliner is those intermittent `ENOENT` errors that no one
+could reproduce consistently?  I think they're nailed! But also pretty
+important, the bug where `hapi` would install w/ a dep missing? Squashed!
+
+#### EEEEEEENOENT
+
+* [`f0e2088`](https://github.com/npm/npm/commit/f0e2088)
+  [#10026](https://github.com/npm/npm/issues/10026)
+  Eliminate some, if not many, of the EONENT errors `npm@3` has seen over
+  the past few months.  This was happening when npm would, in its own mind,
+  correct a bundled dependency, due to a `package.json` specifying an
+  incompatible version.  Then, when npm extracted the bundled version, what
+  was on disk didn't match its mind and… well, when it tried to act on what
+  was in its mind, we got an `ENOENT` because it didn't actually exist on
+  disk.
+  ([@iarna](https://github.com/iarna))
+
+#### PARTIAL SHRINKWRAPS, NO LONGER A BAD DAY
+
+* [`712fd9c`](https://github.com/npm/npm/commit/712fd9c)
+  [#10153](https://github.com/npm/npm/pull/10153)
+  Imagine that you have a module, let's call it `fun-time`, and it depends
+  on two dependencies, `need-fun@1` and `need-time`.  Further, `need-time`
+  requires `need-fun@2`.  So after install the logical tree will look like
+  this:
+
+  ```
+  fun-time
+  ├── need-fun@1
+  └── need-time
+      └── need-fun@2
+  ```
+
+  Now, the `fun-time` author also distributes a shrinkwrap, but it only includes
+  the `need-fun@1` in it.
+
+  Resolving dependencies would look something like this:
+
+  1. Require `need-fun@1`: Use version from shrinkwrap (ignoring version)
+  2. Require `need-time`: User version in package.json
+    1. Require `need-fun@2`: Use version from shrinkwrap, which oh hey, is
+       already installed at the top level, so no further action is needed.
+
+  Which results in this tree:
+
+  ```
+  fun-time
+  ├── need-fun@1
+  └── need-time
+  ```
+
+  We're ignoring the version check on things specified in the shrinkwrap
+  so that you can override the version that will be installed. This is
+  because you may want to  use a different version than is specified
+  by your dependencies' dependencies' `package.json` files.
+
+  To fix this, we now only allow overrides of a dependency version when
+  that dependency is a child (in the tree) of the thing that requires it.
+  This means that when we're looking for `need-fun@2` we'll see `need-fun@1`
+  and reject it because, although it's from a shrinkwrap, it's parent is
+  `fun-time` and the package doing the requiring is `need-time`.
+
+  ([@iarna](https://github.com/iarna))
+
+#### STRING `package.bin` AND NON-NPMJS REGISTRIES
+
+* [`3de1463`](https://github.com/npm/npm/commit/3de1463)
+  [#9187](https://github.com/npm/npm/issues/9187)
+  If you were using a module with the `bin` field in your `package.json` set
+  to a string on a non-npmjs registry then npm would crash, due to the our
+  expectation that the `bin` field would be an object.  We now pass all
+  `package.json` data through a routine that normalizes the format,
+  including the `bin` field.  (This is the same routine that your
+  `package.json` is passed through when read off of disk or sent to the
+  registry for publication.) Doing this also ensures that older modules on
+  npm's own registry will be treated exactly the same as new ones.  (In the
+  past we weren't always super careful about scrubbing `package.json` data
+  on publish.  And even when we were, those rules have subtly changed over
+  time.)
+  ([@iarna](https://github.com/iarna))
+
 ### v3.3.10 (2015-10-22):
 
 Hey you all!  Welcome to a busy bug fix and PR week.  We've got changes
diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html
index e5c8288d6bb268..7d191393d4cc49 100644
--- a/deps/npm/html/doc/README.html
+++ b/deps/npm/html/doc/README.html
@@ -140,7 +140,7 @@ <h2 id="legal-stuff">Legal Stuff</h2>
 <p>If you have a complaint about a package in the public npm registry,
 and cannot <a href="https://docs.npmjs.com/misc/disputes">resolve it with the package
 owner</a>, please email
-<a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#111;&#x3a;&#x73;&#117;&#x70;&#112;&#x6f;&#114;&#116;&#64;&#110;&#x70;&#109;&#106;&#115;&#46;&#x63;&#x6f;&#109;">&#x73;&#117;&#x70;&#112;&#x6f;&#114;&#116;&#64;&#110;&#x70;&#109;&#106;&#115;&#46;&#x63;&#x6f;&#109;</a> and explain the situation.</p>
+<a href="&#109;&#x61;&#x69;&#x6c;&#116;&#x6f;&#x3a;&#115;&#117;&#x70;&#112;&#x6f;&#114;&#116;&#x40;&#110;&#x70;&#x6d;&#x6a;&#115;&#46;&#x63;&#x6f;&#x6d;">&#115;&#117;&#x70;&#112;&#x6f;&#114;&#116;&#x40;&#110;&#x70;&#x6d;&#x6a;&#115;&#46;&#x63;&#x6f;&#x6d;</a> and explain the situation.</p>
 <p>Any data published to The npm Registry (including user account
 information) may be removed or modified at the sole discretion of the
 npm server administrators.</p>
@@ -183,5 +183,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@3.3.10</p>
+<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-access.html b/deps/npm/html/doc/cli/npm-access.html
index 4dc5109437d1f3..001fe175cddc65 100644
--- a/deps/npm/html/doc/cli/npm-access.html
+++ b/deps/npm/html/doc/cli/npm-access.html
@@ -84,5 +84,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-access &mdash; npm@3.3.10</p>
+<p id="footer">npm-access &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-adduser.html b/deps/npm/html/doc/cli/npm-adduser.html
index 6a2cfe30b2df55..d3d9c2e61844df 100644
--- a/deps/npm/html/doc/cli/npm-adduser.html
+++ b/deps/npm/html/doc/cli/npm-adduser.html
@@ -68,5 +68,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-adduser &mdash; npm@3.3.10</p>
+<p id="footer">npm-adduser &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-bin.html b/deps/npm/html/doc/cli/npm-bin.html
index 66deeef77ad1ed..c7c39e06c215ff 100644
--- a/deps/npm/html/doc/cli/npm-bin.html
+++ b/deps/npm/html/doc/cli/npm-bin.html
@@ -35,5 +35,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bin &mdash; npm@3.3.10</p>
+<p id="footer">npm-bin &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-bugs.html b/deps/npm/html/doc/cli/npm-bugs.html
index 3012d3bc3bef9f..862cd8ee642b42 100644
--- a/deps/npm/html/doc/cli/npm-bugs.html
+++ b/deps/npm/html/doc/cli/npm-bugs.html
@@ -53,5 +53,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bugs &mdash; npm@3.3.10</p>
+<p id="footer">npm-bugs &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-build.html b/deps/npm/html/doc/cli/npm-build.html
index 20c93e65da201c..b6303676288409 100644
--- a/deps/npm/html/doc/cli/npm-build.html
+++ b/deps/npm/html/doc/cli/npm-build.html
@@ -40,5 +40,5 @@ <h2 id="description">DESCRIPTION</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-build &mdash; npm@3.3.10</p>
+<p id="footer">npm-build &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-bundle.html b/deps/npm/html/doc/cli/npm-bundle.html
index e5451025f4f43e..8d2e9e4b39b30c 100644
--- a/deps/npm/html/doc/cli/npm-bundle.html
+++ b/deps/npm/html/doc/cli/npm-bundle.html
@@ -31,5 +31,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bundle &mdash; npm@3.3.10</p>
+<p id="footer">npm-bundle &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-cache.html b/deps/npm/html/doc/cli/npm-cache.html
index f21cd7129ae3b3..989c06bdced5f2 100644
--- a/deps/npm/html/doc/cli/npm-cache.html
+++ b/deps/npm/html/doc/cli/npm-cache.html
@@ -81,5 +81,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-cache &mdash; npm@3.3.10</p>
+<p id="footer">npm-cache &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-completion.html b/deps/npm/html/doc/cli/npm-completion.html
index 97231f7bcb2099..150957ba65b0cc 100644
--- a/deps/npm/html/doc/cli/npm-completion.html
+++ b/deps/npm/html/doc/cli/npm-completion.html
@@ -44,5 +44,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-completion &mdash; npm@3.3.10</p>
+<p id="footer">npm-completion &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-config.html b/deps/npm/html/doc/cli/npm-config.html
index bae456681fd22e..b38e1dd29af891 100644
--- a/deps/npm/html/doc/cli/npm-config.html
+++ b/deps/npm/html/doc/cli/npm-config.html
@@ -65,5 +65,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-config &mdash; npm@3.3.10</p>
+<p id="footer">npm-config &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-dedupe.html b/deps/npm/html/doc/cli/npm-dedupe.html
index 29a829d8b80fab..1e161006951bd2 100644
--- a/deps/npm/html/doc/cli/npm-dedupe.html
+++ b/deps/npm/html/doc/cli/npm-dedupe.html
@@ -59,5 +59,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-dedupe &mdash; npm@3.3.10</p>
+<p id="footer">npm-dedupe &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-deprecate.html b/deps/npm/html/doc/cli/npm-deprecate.html
index 3d979c7f6ace64..22492af06e6aae 100644
--- a/deps/npm/html/doc/cli/npm-deprecate.html
+++ b/deps/npm/html/doc/cli/npm-deprecate.html
@@ -38,5 +38,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-deprecate &mdash; npm@3.3.10</p>
+<p id="footer">npm-deprecate &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-dist-tag.html b/deps/npm/html/doc/cli/npm-dist-tag.html
index 971b4da97f9206..49d06f74a3a727 100644
--- a/deps/npm/html/doc/cli/npm-dist-tag.html
+++ b/deps/npm/html/doc/cli/npm-dist-tag.html
@@ -77,5 +77,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-dist-tag &mdash; npm@3.3.10</p>
+<p id="footer">npm-dist-tag &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-docs.html b/deps/npm/html/doc/cli/npm-docs.html
index e8567ed8140e5e..763d17fef4c850 100644
--- a/deps/npm/html/doc/cli/npm-docs.html
+++ b/deps/npm/html/doc/cli/npm-docs.html
@@ -56,5 +56,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-docs &mdash; npm@3.3.10</p>
+<p id="footer">npm-docs &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-edit.html b/deps/npm/html/doc/cli/npm-edit.html
index 5e1c5bab5d9b17..47581a3260dc7a 100644
--- a/deps/npm/html/doc/cli/npm-edit.html
+++ b/deps/npm/html/doc/cli/npm-edit.html
@@ -49,5 +49,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-edit &mdash; npm@3.3.10</p>
+<p id="footer">npm-edit &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-explore.html b/deps/npm/html/doc/cli/npm-explore.html
index ed8115d17f0027..d585315aa0fb00 100644
--- a/deps/npm/html/doc/cli/npm-explore.html
+++ b/deps/npm/html/doc/cli/npm-explore.html
@@ -49,5 +49,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-explore &mdash; npm@3.3.10</p>
+<p id="footer">npm-explore &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-help-search.html b/deps/npm/html/doc/cli/npm-help-search.html
index 945211aa0ebb38..3d1205c0c3c9fa 100644
--- a/deps/npm/html/doc/cli/npm-help-search.html
+++ b/deps/npm/html/doc/cli/npm-help-search.html
@@ -46,5 +46,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-help-search &mdash; npm@3.3.10</p>
+<p id="footer">npm-help-search &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-help.html b/deps/npm/html/doc/cli/npm-help.html
index 4c8a49404dfec6..f7cbfd7c22f217 100644
--- a/deps/npm/html/doc/cli/npm-help.html
+++ b/deps/npm/html/doc/cli/npm-help.html
@@ -51,5 +51,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-help &mdash; npm@3.3.10</p>
+<p id="footer">npm-help &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-init.html b/deps/npm/html/doc/cli/npm-init.html
index 8d659da98bf80b..b23c3b9e5b51cd 100644
--- a/deps/npm/html/doc/cli/npm-init.html
+++ b/deps/npm/html/doc/cli/npm-init.html
@@ -48,5 +48,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-init &mdash; npm@3.3.10</p>
+<p id="footer">npm-init &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-install.html b/deps/npm/html/doc/cli/npm-install.html
index f9b2466670fab0..52ffa24fb4f9bc 100644
--- a/deps/npm/html/doc/cli/npm-install.html
+++ b/deps/npm/html/doc/cli/npm-install.html
@@ -295,5 +295,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-install &mdash; npm@3.3.10</p>
+<p id="footer">npm-install &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-link.html b/deps/npm/html/doc/cli/npm-link.html
index bd635316f6a2b2..16505c433148a7 100644
--- a/deps/npm/html/doc/cli/npm-link.html
+++ b/deps/npm/html/doc/cli/npm-link.html
@@ -73,5 +73,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-link &mdash; npm@3.3.10</p>
+<p id="footer">npm-link &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-logout.html b/deps/npm/html/doc/cli/npm-logout.html
index c4c06c5f6ca35b..27f70f529e7295 100644
--- a/deps/npm/html/doc/cli/npm-logout.html
+++ b/deps/npm/html/doc/cli/npm-logout.html
@@ -55,5 +55,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-logout &mdash; npm@3.3.10</p>
+<p id="footer">npm-logout &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-ls.html b/deps/npm/html/doc/cli/npm-ls.html
index 37efcccbda80ab..2fec3f055aa48e 100644
--- a/deps/npm/html/doc/cli/npm-ls.html
+++ b/deps/npm/html/doc/cli/npm-ls.html
@@ -21,7 +21,7 @@ <h2 id="synopsis">SYNOPSIS</h2>
 limit the results to only the paths to the packages named.  Note that
 nested packages will <em>also</em> show the paths to the specified packages.
 For example, running <code>npm ls promzard</code> in npm&#39;s source tree will show:</p>
-<pre><code>npm@3.3.10 /path/to/npm
+<pre><code>npm@3.3.12 /path/to/npm
 └─┬ init-package-json@0.0.4
   └── promzard@0.1.5
 </code></pre><p>It will print out extraneous, missing, and invalid packages.</p>
@@ -104,5 +104,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-ls &mdash; npm@3.3.10</p>
+<p id="footer">npm-ls &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-outdated.html b/deps/npm/html/doc/cli/npm-outdated.html
index 3f2962a73389e8..69513a8d7bc156 100644
--- a/deps/npm/html/doc/cli/npm-outdated.html
+++ b/deps/npm/html/doc/cli/npm-outdated.html
@@ -67,5 +67,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-outdated &mdash; npm@3.3.10</p>
+<p id="footer">npm-outdated &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-owner.html b/deps/npm/html/doc/cli/npm-owner.html
index 896c36ef3fdcfa..99c485c7d9ee41 100644
--- a/deps/npm/html/doc/cli/npm-owner.html
+++ b/deps/npm/html/doc/cli/npm-owner.html
@@ -49,5 +49,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-owner &mdash; npm@3.3.10</p>
+<p id="footer">npm-owner &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-pack.html b/deps/npm/html/doc/cli/npm-pack.html
index 33866136f16bbf..b35b2c40f885f9 100644
--- a/deps/npm/html/doc/cli/npm-pack.html
+++ b/deps/npm/html/doc/cli/npm-pack.html
@@ -41,5 +41,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-pack &mdash; npm@3.3.10</p>
+<p id="footer">npm-pack &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-ping.html b/deps/npm/html/doc/cli/npm-ping.html
index 1bdcbae6600002..c5a8fb663be649 100644
--- a/deps/npm/html/doc/cli/npm-ping.html
+++ b/deps/npm/html/doc/cli/npm-ping.html
@@ -32,4 +32,4 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-ping &mdash; npm@3.3.10</p>
+<p id="footer">npm-ping &mdash; npm@3.3.12</p>
diff --git a/deps/npm/html/doc/cli/npm-prefix.html b/deps/npm/html/doc/cli/npm-prefix.html
index f011cd8cdede1d..9111d20c76f9d6 100644
--- a/deps/npm/html/doc/cli/npm-prefix.html
+++ b/deps/npm/html/doc/cli/npm-prefix.html
@@ -38,5 +38,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-prefix &mdash; npm@3.3.10</p>
+<p id="footer">npm-prefix &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-prune.html b/deps/npm/html/doc/cli/npm-prune.html
index bea2e1dcb828df..43010bc3c2435f 100644
--- a/deps/npm/html/doc/cli/npm-prune.html
+++ b/deps/npm/html/doc/cli/npm-prune.html
@@ -40,5 +40,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-prune &mdash; npm@3.3.10</p>
+<p id="footer">npm-prune &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-publish.html b/deps/npm/html/doc/cli/npm-publish.html
index 6111db07add5dc..c2d8b0815aa0f0 100644
--- a/deps/npm/html/doc/cli/npm-publish.html
+++ b/deps/npm/html/doc/cli/npm-publish.html
@@ -68,5 +68,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-publish &mdash; npm@3.3.10</p>
+<p id="footer">npm-publish &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-rebuild.html b/deps/npm/html/doc/cli/npm-rebuild.html
index c27b9386ab5c45..9fdabf57478891 100644
--- a/deps/npm/html/doc/cli/npm-rebuild.html
+++ b/deps/npm/html/doc/cli/npm-rebuild.html
@@ -35,5 +35,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-rebuild &mdash; npm@3.3.10</p>
+<p id="footer">npm-rebuild &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-repo.html b/deps/npm/html/doc/cli/npm-repo.html
index b2b723baf08bb9..bf94fde6a53b61 100644
--- a/deps/npm/html/doc/cli/npm-repo.html
+++ b/deps/npm/html/doc/cli/npm-repo.html
@@ -41,5 +41,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-repo &mdash; npm@3.3.10</p>
+<p id="footer">npm-repo &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-restart.html b/deps/npm/html/doc/cli/npm-restart.html
index 05763c00ede120..eb7bf47c5af736 100644
--- a/deps/npm/html/doc/cli/npm-restart.html
+++ b/deps/npm/html/doc/cli/npm-restart.html
@@ -53,5 +53,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-restart &mdash; npm@3.3.10</p>
+<p id="footer">npm-restart &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-root.html b/deps/npm/html/doc/cli/npm-root.html
index 293f363ff1c3ea..eaf93c0ac61c01 100644
--- a/deps/npm/html/doc/cli/npm-root.html
+++ b/deps/npm/html/doc/cli/npm-root.html
@@ -35,5 +35,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-root &mdash; npm@3.3.10</p>
+<p id="footer">npm-root &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-run-script.html b/deps/npm/html/doc/cli/npm-run-script.html
index 9aaf6d9282a26f..487c086adc7258 100644
--- a/deps/npm/html/doc/cli/npm-run-script.html
+++ b/deps/npm/html/doc/cli/npm-run-script.html
@@ -58,5 +58,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-run-script &mdash; npm@3.3.10</p>
+<p id="footer">npm-run-script &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-search.html b/deps/npm/html/doc/cli/npm-search.html
index 3aaabac7efefb8..6c31f1b60c19f1 100644
--- a/deps/npm/html/doc/cli/npm-search.html
+++ b/deps/npm/html/doc/cli/npm-search.html
@@ -49,5 +49,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-search &mdash; npm@3.3.10</p>
+<p id="footer">npm-search &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-shrinkwrap.html b/deps/npm/html/doc/cli/npm-shrinkwrap.html
index 80d619900cc7be..ab72eb0d71a5bb 100644
--- a/deps/npm/html/doc/cli/npm-shrinkwrap.html
+++ b/deps/npm/html/doc/cli/npm-shrinkwrap.html
@@ -169,5 +169,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-shrinkwrap &mdash; npm@3.3.10</p>
+<p id="footer">npm-shrinkwrap &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-star.html b/deps/npm/html/doc/cli/npm-star.html
index 912b5c9c9219d9..be7f542964a700 100644
--- a/deps/npm/html/doc/cli/npm-star.html
+++ b/deps/npm/html/doc/cli/npm-star.html
@@ -36,5 +36,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-star &mdash; npm@3.3.10</p>
+<p id="footer">npm-star &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-stars.html b/deps/npm/html/doc/cli/npm-stars.html
index d10998a7bbdde8..eac253ff8ecdc6 100644
--- a/deps/npm/html/doc/cli/npm-stars.html
+++ b/deps/npm/html/doc/cli/npm-stars.html
@@ -36,5 +36,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-stars &mdash; npm@3.3.10</p>
+<p id="footer">npm-stars &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-start.html b/deps/npm/html/doc/cli/npm-start.html
index 67541cf105abc4..410364f5fa14f3 100644
--- a/deps/npm/html/doc/cli/npm-start.html
+++ b/deps/npm/html/doc/cli/npm-start.html
@@ -34,5 +34,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-start &mdash; npm@3.3.10</p>
+<p id="footer">npm-start &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-stop.html b/deps/npm/html/doc/cli/npm-stop.html
index 272b1671ae91cf..2c99d6646559f0 100644
--- a/deps/npm/html/doc/cli/npm-stop.html
+++ b/deps/npm/html/doc/cli/npm-stop.html
@@ -34,5 +34,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-stop &mdash; npm@3.3.10</p>
+<p id="footer">npm-stop &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-tag.html b/deps/npm/html/doc/cli/npm-tag.html
index a1a8fae758f1ef..1bbecd6c694bd9 100644
--- a/deps/npm/html/doc/cli/npm-tag.html
+++ b/deps/npm/html/doc/cli/npm-tag.html
@@ -63,5 +63,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-tag &mdash; npm@3.3.10</p>
+<p id="footer">npm-tag &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-team.html b/deps/npm/html/doc/cli/npm-team.html
index be30e097d4761f..dab0a0e1d129bb 100644
--- a/deps/npm/html/doc/cli/npm-team.html
+++ b/deps/npm/html/doc/cli/npm-team.html
@@ -67,4 +67,4 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-team &mdash; npm@3.3.10</p>
+<p id="footer">npm-team &mdash; npm@3.3.12</p>
diff --git a/deps/npm/html/doc/cli/npm-test.html b/deps/npm/html/doc/cli/npm-test.html
index 6b14474fe31f91..206de736c581dd 100644
--- a/deps/npm/html/doc/cli/npm-test.html
+++ b/deps/npm/html/doc/cli/npm-test.html
@@ -37,5 +37,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-test &mdash; npm@3.3.10</p>
+<p id="footer">npm-test &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-uninstall.html b/deps/npm/html/doc/cli/npm-uninstall.html
index 3d27d4c34446df..93fe4810f2a821 100644
--- a/deps/npm/html/doc/cli/npm-uninstall.html
+++ b/deps/npm/html/doc/cli/npm-uninstall.html
@@ -60,5 +60,5 @@ <h2 id="synopsis">SYNOPSIS</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-uninstall &mdash; npm@3.3.10</p>
+<p id="footer">npm-uninstall &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-unpublish.html b/deps/npm/html/doc/cli/npm-unpublish.html
index cdc95a6d8857e4..da50613ed6c6be 100644
--- a/deps/npm/html/doc/cli/npm-unpublish.html
+++ b/deps/npm/html/doc/cli/npm-unpublish.html
@@ -47,5 +47,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-unpublish &mdash; npm@3.3.10</p>
+<p id="footer">npm-unpublish &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-update.html b/deps/npm/html/doc/cli/npm-update.html
index 9b943b8a944072..fe4e3c178f2184 100644
--- a/deps/npm/html/doc/cli/npm-update.html
+++ b/deps/npm/html/doc/cli/npm-update.html
@@ -120,5 +120,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-update &mdash; npm@3.3.10</p>
+<p id="footer">npm-update &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-version.html b/deps/npm/html/doc/cli/npm-version.html
index df22f0ac08b126..bc3cf3b5d64297 100644
--- a/deps/npm/html/doc/cli/npm-version.html
+++ b/deps/npm/html/doc/cli/npm-version.html
@@ -99,5 +99,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-version &mdash; npm@3.3.10</p>
+<p id="footer">npm-version &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-view.html b/deps/npm/html/doc/cli/npm-view.html
index a39eb98aa0f788..965b3504e26229 100644
--- a/deps/npm/html/doc/cli/npm-view.html
+++ b/deps/npm/html/doc/cli/npm-view.html
@@ -83,5 +83,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-view &mdash; npm@3.3.10</p>
+<p id="footer">npm-view &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm-whoami.html b/deps/npm/html/doc/cli/npm-whoami.html
index 4461b9e5f97cc8..1b954c864b7b19 100644
--- a/deps/npm/html/doc/cli/npm-whoami.html
+++ b/deps/npm/html/doc/cli/npm-whoami.html
@@ -33,5 +33,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-whoami &mdash; npm@3.3.10</p>
+<p id="footer">npm-whoami &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/cli/npm.html b/deps/npm/html/doc/cli/npm.html
index 56647fa029119d..b43ccda47f7d7b 100644
--- a/deps/npm/html/doc/cli/npm.html
+++ b/deps/npm/html/doc/cli/npm.html
@@ -13,7 +13,7 @@ <h1><a href="../cli/npm.html">npm</a></h1> <p>javascript package manager</p>
 <h2 id="synopsis">SYNOPSIS</h2>
 <pre><code>npm &lt;command&gt; [args]
 </code></pre><h2 id="version">VERSION</h2>
-<p>3.3.10</p>
+<p>3.3.12</p>
 <h2 id="description">DESCRIPTION</h2>
 <p>npm is the package manager for the Node JavaScript platform.  It puts
 modules in place so that node can find them, and manages dependency
@@ -110,7 +110,7 @@ <h2 id="contributions">CONTRIBUTIONS</h2>
 the issues list or ask on the mailing list.</p>
 <ul>
 <li><a href="http://github.com/npm/npm/issues">http://github.com/npm/npm/issues</a></li>
-<li><a href="&#x6d;&#x61;&#x69;&#108;&#116;&#111;&#58;&#110;&#112;&#109;&#x2d;&#x40;&#x67;&#x6f;&#111;&#103;&#108;&#101;&#x67;&#114;&#111;&#117;&#112;&#115;&#x2e;&#x63;&#111;&#109;">&#110;&#112;&#109;&#x2d;&#x40;&#x67;&#x6f;&#111;&#103;&#108;&#101;&#x67;&#114;&#111;&#117;&#112;&#115;&#x2e;&#x63;&#111;&#109;</a></li>
+<li><a href="&#x6d;&#x61;&#105;&#x6c;&#116;&#111;&#58;&#110;&#112;&#x6d;&#45;&#64;&#103;&#x6f;&#111;&#x67;&#108;&#101;&#103;&#x72;&#x6f;&#117;&#112;&#x73;&#x2e;&#x63;&#111;&#109;">&#110;&#112;&#x6d;&#45;&#64;&#103;&#x6f;&#111;&#x67;&#108;&#101;&#103;&#x72;&#x6f;&#117;&#112;&#x73;&#x2e;&#x63;&#111;&#109;</a></li>
 </ul>
 <h2 id="bugs">BUGS</h2>
 <p>When you find issues, please report them:</p>
@@ -118,7 +118,7 @@ <h2 id="bugs">BUGS</h2>
 <li>web:
 <a href="http://github.com/npm/npm/issues">http://github.com/npm/npm/issues</a></li>
 <li>email:
-<a href="&#109;&#97;&#x69;&#x6c;&#116;&#111;&#58;&#x6e;&#x70;&#x6d;&#x2d;&#x40;&#x67;&#x6f;&#x6f;&#x67;&#x6c;&#x65;&#x67;&#x72;&#x6f;&#x75;&#112;&#x73;&#46;&#99;&#111;&#x6d;">&#x6e;&#x70;&#x6d;&#x2d;&#x40;&#x67;&#x6f;&#x6f;&#x67;&#x6c;&#x65;&#x67;&#x72;&#x6f;&#x75;&#112;&#x73;&#46;&#99;&#111;&#x6d;</a></li>
+<a href="&#x6d;&#x61;&#x69;&#108;&#116;&#111;&#58;&#110;&#x70;&#109;&#x2d;&#64;&#x67;&#x6f;&#x6f;&#x67;&#108;&#x65;&#103;&#x72;&#111;&#x75;&#112;&#x73;&#46;&#99;&#111;&#109;">&#110;&#x70;&#109;&#x2d;&#64;&#x67;&#x6f;&#x6f;&#x67;&#108;&#x65;&#103;&#x72;&#111;&#x75;&#112;&#x73;&#46;&#99;&#111;&#109;</a></li>
 </ul>
 <p>Be sure to include <em>all</em> of the output from the npm command that didn&#39;t work
 as expected.  The <code>npm-debug.log</code> file is also helpful to provide.</p>
@@ -128,7 +128,7 @@ <h2 id="author">AUTHOR</h2>
 <p><a href="http://blog.izs.me/">Isaac Z. Schlueter</a> ::
 <a href="https://github.com/isaacs/">isaacs</a> ::
 <a href="http://twitter.com/izs">@izs</a> ::
-<a href="&#109;&#97;&#105;&#108;&#x74;&#x6f;&#58;&#x69;&#64;&#x69;&#122;&#115;&#46;&#x6d;&#x65;">&#x69;&#64;&#x69;&#122;&#115;&#46;&#x6d;&#x65;</a></p>
+<a href="&#109;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#x69;&#64;&#105;&#x7a;&#115;&#x2e;&#109;&#x65;">&#x69;&#64;&#105;&#x7a;&#115;&#x2e;&#109;&#x65;</a></p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
 <li><a href="../cli/npm-help.html">npm-help(1)</a></li>
@@ -154,5 +154,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm &mdash; npm@3.3.10</p>
+<p id="footer">npm &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/files/npm-folders.html b/deps/npm/html/doc/files/npm-folders.html
index b6573644add374..a4e67332769d4a 100644
--- a/deps/npm/html/doc/files/npm-folders.html
+++ b/deps/npm/html/doc/files/npm-folders.html
@@ -184,5 +184,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-folders &mdash; npm@3.3.10</p>
+<p id="footer">npm-folders &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/files/npm-global.html b/deps/npm/html/doc/files/npm-global.html
index b6573644add374..a4e67332769d4a 100644
--- a/deps/npm/html/doc/files/npm-global.html
+++ b/deps/npm/html/doc/files/npm-global.html
@@ -184,5 +184,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-folders &mdash; npm@3.3.10</p>
+<p id="footer">npm-folders &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/files/npm-json.html b/deps/npm/html/doc/files/npm-json.html
index b901f73b494d06..92d14ba6c56be1 100644
--- a/deps/npm/html/doc/files/npm-json.html
+++ b/deps/npm/html/doc/files/npm-json.html
@@ -559,5 +559,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">package.json &mdash; npm@3.3.10</p>
+<p id="footer">package.json &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/files/npmrc.html b/deps/npm/html/doc/files/npmrc.html
index 998d5fd7dd1b31..dc50a18c8174d7 100644
--- a/deps/npm/html/doc/files/npmrc.html
+++ b/deps/npm/html/doc/files/npmrc.html
@@ -83,5 +83,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npmrc &mdash; npm@3.3.10</p>
+<p id="footer">npmrc &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/files/package.json.html b/deps/npm/html/doc/files/package.json.html
index b901f73b494d06..92d14ba6c56be1 100644
--- a/deps/npm/html/doc/files/package.json.html
+++ b/deps/npm/html/doc/files/package.json.html
@@ -559,5 +559,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">package.json &mdash; npm@3.3.10</p>
+<p id="footer">package.json &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/index.html b/deps/npm/html/doc/index.html
index 9c48c201830f27..36fcbe74c35f98 100644
--- a/deps/npm/html/doc/index.html
+++ b/deps/npm/html/doc/index.html
@@ -162,5 +162,5 @@ <h3 id="semver-7-"><a href="misc/semver.html">semver(7)</a></h3>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-index &mdash; npm@3.3.10</p>
+<p id="footer">npm-index &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/misc/npm-coding-style.html b/deps/npm/html/doc/misc/npm-coding-style.html
index 5c0b11b268b8b4..757272863d748e 100644
--- a/deps/npm/html/doc/misc/npm-coding-style.html
+++ b/deps/npm/html/doc/misc/npm-coding-style.html
@@ -154,5 +154,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-coding-style &mdash; npm@3.3.10</p>
+<p id="footer">npm-coding-style &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/misc/npm-config.html b/deps/npm/html/doc/misc/npm-config.html
index c9be4343205bb8..74b3c7bfc65c59 100644
--- a/deps/npm/html/doc/misc/npm-config.html
+++ b/deps/npm/html/doc/misc/npm-config.html
@@ -829,5 +829,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-config &mdash; npm@3.3.10</p>
+<p id="footer">npm-config &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/misc/npm-developers.html b/deps/npm/html/doc/misc/npm-developers.html
index 93766569250818..3da7d9162186b1 100644
--- a/deps/npm/html/doc/misc/npm-developers.html
+++ b/deps/npm/html/doc/misc/npm-developers.html
@@ -195,5 +195,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-developers &mdash; npm@3.3.10</p>
+<p id="footer">npm-developers &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/misc/npm-disputes.html b/deps/npm/html/doc/misc/npm-disputes.html
index 16683231e1f677..0962b39b5a998c 100644
--- a/deps/npm/html/doc/misc/npm-disputes.html
+++ b/deps/npm/html/doc/misc/npm-disputes.html
@@ -13,7 +13,7 @@ <h1><a href="../misc/npm-disputes.html">npm-disputes</a></h1> <p>Handling Module
 <h2 id="synopsis">SYNOPSIS</h2>
 <ol>
 <li>Get the author email with <code>npm owner ls &lt;pkgname&gt;</code></li>
-<li>Email the author, CC <a href="&#x6d;&#97;&#105;&#108;&#116;&#111;&#58;&#x73;&#x75;&#x70;&#x70;&#111;&#114;&#116;&#x40;&#110;&#x70;&#109;&#106;&#x73;&#x2e;&#x63;&#111;&#x6d;">&#x73;&#x75;&#x70;&#x70;&#111;&#114;&#116;&#x40;&#110;&#x70;&#109;&#106;&#x73;&#x2e;&#x63;&#111;&#x6d;</a></li>
+<li>Email the author, CC <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#111;&#x3a;&#115;&#x75;&#112;&#x70;&#x6f;&#114;&#x74;&#x40;&#x6e;&#x70;&#109;&#106;&#115;&#46;&#99;&#x6f;&#109;">&#115;&#x75;&#112;&#x70;&#x6f;&#114;&#x74;&#x40;&#x6e;&#x70;&#109;&#106;&#115;&#46;&#99;&#x6f;&#109;</a></li>
 <li>After a few weeks, if there&#39;s no resolution, we&#39;ll sort it out.</li>
 </ol>
 <p>Don&#39;t squat on package names.  Publish code or move out of the way.</p>
@@ -51,12 +51,12 @@ <h2 id="description">DESCRIPTION</h2>
 owner (Bob).</li>
 <li>Joe emails Bob, explaining the situation <strong>as respectfully as
 possible</strong>, and what he would like to do with the module name.  He
-adds the npm support staff <a href="&#x6d;&#97;&#x69;&#108;&#x74;&#111;&#58;&#115;&#x75;&#112;&#112;&#111;&#114;&#x74;&#64;&#x6e;&#112;&#109;&#x6a;&#x73;&#46;&#x63;&#111;&#x6d;">&#115;&#x75;&#112;&#112;&#111;&#114;&#x74;&#64;&#x6e;&#112;&#109;&#x6a;&#x73;&#46;&#x63;&#111;&#x6d;</a> to the CC list of
+adds the npm support staff <a href="&#x6d;&#97;&#105;&#108;&#116;&#x6f;&#x3a;&#x73;&#x75;&#x70;&#112;&#x6f;&#x72;&#116;&#x40;&#110;&#112;&#109;&#106;&#115;&#x2e;&#x63;&#111;&#x6d;">&#x73;&#x75;&#x70;&#112;&#x6f;&#x72;&#116;&#x40;&#110;&#112;&#109;&#106;&#115;&#x2e;&#x63;&#111;&#x6d;</a> to the CC list of
 the email.  Mention in the email that Bob can run <code>npm owner add
 joe foo</code> to add Joe as an owner of the <code>foo</code> package.</li>
 <li>After a reasonable amount of time, if Bob has not responded, or if
 Bob and Joe can&#39;t come to any sort of resolution, email support
-<a href="&#109;&#x61;&#105;&#108;&#x74;&#x6f;&#x3a;&#115;&#x75;&#x70;&#x70;&#111;&#x72;&#116;&#64;&#x6e;&#112;&#109;&#x6a;&#x73;&#46;&#99;&#x6f;&#109;">&#115;&#x75;&#x70;&#x70;&#111;&#x72;&#116;&#64;&#x6e;&#112;&#109;&#x6a;&#x73;&#46;&#99;&#x6f;&#109;</a> and we&#39;ll sort it out.  (&quot;Reasonable&quot; is
+<a href="&#109;&#x61;&#105;&#108;&#116;&#x6f;&#58;&#115;&#117;&#112;&#112;&#111;&#114;&#x74;&#64;&#x6e;&#112;&#109;&#x6a;&#x73;&#46;&#99;&#x6f;&#x6d;">&#115;&#117;&#112;&#112;&#111;&#114;&#x74;&#64;&#x6e;&#112;&#109;&#x6a;&#x73;&#46;&#99;&#x6f;&#x6d;</a> and we&#39;ll sort it out.  (&quot;Reasonable&quot; is
 usually at least 4 weeks, but extra time is allowed around common
 holidays.)</li>
 </ol>
@@ -112,5 +112,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-disputes &mdash; npm@3.3.10</p>
+<p id="footer">npm-disputes &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/misc/npm-faq.html b/deps/npm/html/doc/misc/npm-faq.html
index fa5ec1cfc8ffe3..fa0cc22eff9ce8 100644
--- a/deps/npm/html/doc/misc/npm-faq.html
+++ b/deps/npm/html/doc/misc/npm-faq.html
@@ -237,7 +237,7 @@ <h2 id="i-get-econnrefused-a-lot-what-s-up-">I get ECONNREFUSED a lot.  What&#39
 <p>To check if the registry is down, open up
 <a href="https://registry.npmjs.org/">https://registry.npmjs.org/</a> in a web browser.  This will also tell
 you if you are just unable to access the internet for some reason.</p>
-<p>If the registry IS down, let us know by emailing <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#x73;&#x75;&#x70;&#112;&#x6f;&#114;&#116;&#x40;&#x6e;&#112;&#x6d;&#x6a;&#115;&#x2e;&#x63;&#x6f;&#109;">&#x73;&#x75;&#x70;&#112;&#x6f;&#114;&#116;&#x40;&#x6e;&#112;&#x6d;&#x6a;&#115;&#x2e;&#x63;&#x6f;&#109;</a>
+<p>If the registry IS down, let us know by emailing <a href="&#109;&#x61;&#x69;&#108;&#x74;&#111;&#x3a;&#115;&#x75;&#112;&#112;&#x6f;&#x72;&#x74;&#x40;&#110;&#x70;&#109;&#106;&#x73;&#46;&#x63;&#111;&#109;">&#115;&#x75;&#112;&#112;&#x6f;&#x72;&#x74;&#x40;&#110;&#x70;&#109;&#106;&#x73;&#46;&#x63;&#111;&#109;</a>
 or posting an issue at <a href="https://github.com/npm/npm/issues">https://github.com/npm/npm/issues</a>.  If it&#39;s
 down for the world (and not just on your local network) then we&#39;re
 probably already being pinged about it.</p>
@@ -308,5 +308,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-faq &mdash; npm@3.3.10</p>
+<p id="footer">npm-faq &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/misc/npm-index.html b/deps/npm/html/doc/misc/npm-index.html
new file mode 100644
index 00000000000000..ae0950efd7ebcf
--- /dev/null
+++ b/deps/npm/html/doc/misc/npm-index.html
@@ -0,0 +1,165 @@
+<!doctype html>
+<html>
+  <title>npm-index</title>
+  <meta http-equiv="content-type" value="text/html;utf-8">
+  <link rel="stylesheet" type="text/css" href="../../static/style.css">
+  <link rel="canonical" href="https://www.npmjs.org/doc/misc/npm-index.html">
+  <script async=true src="../../static/toc.js"></script>
+
+  <body>
+    <div id="wrapper">
+
+<h1><a href="../misc/npm-index.html">npm-index</a></h1> <p>Index of all npm documentation</p>
+<h3 id="readme-1-"><a href="../../doc/README.html">README</a></h3>
+<p>a JavaScript package manager</p>
+<h2 id="command-line-documentation">Command Line Documentation</h2>
+<p>Using npm on the command line</p>
+<h3 id="npm-1-"><a href="../cli/npm.html">npm(1)</a></h3>
+<p>javascript package manager</p>
+<h3 id="npm-access-1-"><a href="../cli/npm-access.html">npm-access(1)</a></h3>
+<p>Set access level on published packages</p>
+<h3 id="npm-adduser-1-"><a href="../cli/npm-adduser.html">npm-adduser(1)</a></h3>
+<p>Add a registry user account</p>
+<h3 id="npm-bin-1-"><a href="../cli/npm-bin.html">npm-bin(1)</a></h3>
+<p>Display npm bin folder</p>
+<h3 id="npm-bugs-1-"><a href="../cli/npm-bugs.html">npm-bugs(1)</a></h3>
+<p>Bugs for a package in a web browser maybe</p>
+<h3 id="npm-build-1-"><a href="../cli/npm-build.html">npm-build(1)</a></h3>
+<p>Build a package</p>
+<h3 id="npm-bundle-1-"><a href="../cli/npm-bundle.html">npm-bundle(1)</a></h3>
+<p>REMOVED</p>
+<h3 id="npm-cache-1-"><a href="../cli/npm-cache.html">npm-cache(1)</a></h3>
+<p>Manipulates packages cache</p>
+<h3 id="npm-completion-1-"><a href="../cli/npm-completion.html">npm-completion(1)</a></h3>
+<p>Tab Completion for npm</p>
+<h3 id="npm-config-1-"><a href="../cli/npm-config.html">npm-config(1)</a></h3>
+<p>Manage the npm configuration files</p>
+<h3 id="npm-dedupe-1-"><a href="../cli/npm-dedupe.html">npm-dedupe(1)</a></h3>
+<p>Reduce duplication</p>
+<h3 id="npm-deprecate-1-"><a href="../cli/npm-deprecate.html">npm-deprecate(1)</a></h3>
+<p>Deprecate a version of a package</p>
+<h3 id="npm-dist-tag-1-"><a href="../cli/npm-dist-tag.html">npm-dist-tag(1)</a></h3>
+<p>Modify package distribution tags</p>
+<h3 id="npm-docs-1-"><a href="../cli/npm-docs.html">npm-docs(1)</a></h3>
+<p>Docs for a package in a web browser maybe</p>
+<h3 id="npm-edit-1-"><a href="../cli/npm-edit.html">npm-edit(1)</a></h3>
+<p>Edit an installed package</p>
+<h3 id="npm-explore-1-"><a href="../cli/npm-explore.html">npm-explore(1)</a></h3>
+<p>Browse an installed package</p>
+<h3 id="npm-help-search-1-"><a href="../cli/npm-help-search.html">npm-help-search(1)</a></h3>
+<p>Search npm help documentation</p>
+<h3 id="npm-help-1-"><a href="../cli/npm-help.html">npm-help(1)</a></h3>
+<p>Get help on npm</p>
+<h3 id="npm-init-1-"><a href="../cli/npm-init.html">npm-init(1)</a></h3>
+<p>Interactively create a package.json file</p>
+<h3 id="npm-install-1-"><a href="../cli/npm-install.html">npm-install(1)</a></h3>
+<p>Install a package</p>
+<h3 id="npm-link-1-"><a href="../cli/npm-link.html">npm-link(1)</a></h3>
+<p>Symlink a package folder</p>
+<h3 id="npm-logout-1-"><a href="../cli/npm-logout.html">npm-logout(1)</a></h3>
+<p>Log out of the registry</p>
+<h3 id="npm-ls-1-"><a href="../cli/npm-ls.html">npm-ls(1)</a></h3>
+<p>List installed packages</p>
+<h3 id="npm-outdated-1-"><a href="../cli/npm-outdated.html">npm-outdated(1)</a></h3>
+<p>Check for outdated packages</p>
+<h3 id="npm-owner-1-"><a href="../cli/npm-owner.html">npm-owner(1)</a></h3>
+<p>Manage package owners</p>
+<h3 id="npm-pack-1-"><a href="../cli/npm-pack.html">npm-pack(1)</a></h3>
+<p>Create a tarball from a package</p>
+<h3 id="npm-ping-1-"><a href="../cli/npm-ping.html">npm-ping(1)</a></h3>
+<p>Ping npm registry</p>
+<h3 id="npm-prefix-1-"><a href="../cli/npm-prefix.html">npm-prefix(1)</a></h3>
+<p>Display prefix</p>
+<h3 id="npm-prune-1-"><a href="../cli/npm-prune.html">npm-prune(1)</a></h3>
+<p>Remove extraneous packages</p>
+<h3 id="npm-publish-1-"><a href="../cli/npm-publish.html">npm-publish(1)</a></h3>
+<p>Publish a package</p>
+<h3 id="npm-rebuild-1-"><a href="../cli/npm-rebuild.html">npm-rebuild(1)</a></h3>
+<p>Rebuild a package</p>
+<h3 id="npm-repo-1-"><a href="../cli/npm-repo.html">npm-repo(1)</a></h3>
+<p>Open package repository page in the browser</p>
+<h3 id="npm-restart-1-"><a href="../cli/npm-restart.html">npm-restart(1)</a></h3>
+<p>Restart a package</p>
+<h3 id="npm-root-1-"><a href="../cli/npm-root.html">npm-root(1)</a></h3>
+<p>Display npm root</p>
+<h3 id="npm-run-script-1-"><a href="../cli/npm-run-script.html">npm-run-script(1)</a></h3>
+<p>Run arbitrary package scripts</p>
+<h3 id="npm-search-1-"><a href="../cli/npm-search.html">npm-search(1)</a></h3>
+<p>Search for packages</p>
+<h3 id="npm-shrinkwrap-1-"><a href="../cli/npm-shrinkwrap.html">npm-shrinkwrap(1)</a></h3>
+<p>Lock down dependency versions</p>
+<h3 id="npm-star-1-"><a href="../cli/npm-star.html">npm-star(1)</a></h3>
+<p>Mark your favorite packages</p>
+<h3 id="npm-stars-1-"><a href="../cli/npm-stars.html">npm-stars(1)</a></h3>
+<p>View packages marked as favorites</p>
+<h3 id="npm-start-1-"><a href="../cli/npm-start.html">npm-start(1)</a></h3>
+<p>Start a package</p>
+<h3 id="npm-stop-1-"><a href="../cli/npm-stop.html">npm-stop(1)</a></h3>
+<p>Stop a package</p>
+<h3 id="npm-tag-1-"><a href="../cli/npm-tag.html">npm-tag(1)</a></h3>
+<p>Tag a published version</p>
+<h3 id="npm-team-1-"><a href="../cli/npm-team.html">npm-team(1)</a></h3>
+<p>Manage organization teams and team memberships</p>
+<h3 id="npm-test-1-"><a href="../cli/npm-test.html">npm-test(1)</a></h3>
+<p>Test a package</p>
+<h3 id="npm-uninstall-1-"><a href="../cli/npm-uninstall.html">npm-uninstall(1)</a></h3>
+<p>Remove a package</p>
+<h3 id="npm-unpublish-1-"><a href="../cli/npm-unpublish.html">npm-unpublish(1)</a></h3>
+<p>Remove a package from the registry</p>
+<h3 id="npm-update-1-"><a href="../cli/npm-update.html">npm-update(1)</a></h3>
+<p>Update a package</p>
+<h3 id="npm-version-1-"><a href="../cli/npm-version.html">npm-version(1)</a></h3>
+<p>Bump a package version</p>
+<h3 id="npm-view-1-"><a href="../cli/npm-view.html">npm-view(1)</a></h3>
+<p>View registry info</p>
+<h3 id="npm-whoami-1-"><a href="../cli/npm-whoami.html">npm-whoami(1)</a></h3>
+<p>Display npm username</p>
+<h2 id="api-documentation">API Documentation</h2>
+<p>Using npm in your Node programs</p>
+<h2 id="files">Files</h2>
+<p>File system structures npm uses</p>
+<h3 id="npm-folders-5-"><a href="../files/npm-folders.html">npm-folders(5)</a></h3>
+<p>Folder Structures Used by npm</p>
+<h3 id="npmrc-5-"><a href="../files/npmrc.html">npmrc(5)</a></h3>
+<p>The npm config files</p>
+<h3 id="package-json-5-"><a href="../files/package.json.html">package.json(5)</a></h3>
+<p>Specifics of npm&#39;s package.json handling</p>
+<h2 id="misc">Misc</h2>
+<p>Various other bits and bobs</p>
+<h3 id="npm-coding-style-7-"><a href="../misc/npm-coding-style.html">npm-coding-style(7)</a></h3>
+<p>npm&#39;s &quot;funny&quot; coding style</p>
+<h3 id="npm-config-7-"><a href="../misc/npm-config.html">npm-config(7)</a></h3>
+<p>More than you probably want to know about npm configuration</p>
+<h3 id="npm-developers-7-"><a href="../misc/npm-developers.html">npm-developers(7)</a></h3>
+<p>Developer Guide</p>
+<h3 id="npm-disputes-7-"><a href="../misc/npm-disputes.html">npm-disputes(7)</a></h3>
+<p>Handling Module Name Disputes</p>
+<h3 id="npm-faq-7-"><a href="../misc/npm-faq.html">npm-faq(7)</a></h3>
+<p>Frequently Asked Questions</p>
+<h3 id="npm-index-7-"><a href="../misc/npm-index.html">npm-index(7)</a></h3>
+<p>Index of all npm documentation</p>
+<h3 id="npm-orgs-7-"><a href="../misc/npm-orgs.html">npm-orgs(7)</a></h3>
+<p>Working with Teams &amp; Orgs</p>
+<h3 id="npm-registry-7-"><a href="../misc/npm-registry.html">npm-registry(7)</a></h3>
+<p>The JavaScript Package Registry</p>
+<h3 id="npm-scope-7-"><a href="../misc/npm-scope.html">npm-scope(7)</a></h3>
+<p>Scoped packages</p>
+<h3 id="npm-scripts-7-"><a href="../misc/npm-scripts.html">npm-scripts(7)</a></h3>
+<p>How npm handles the &quot;scripts&quot; field</p>
+<h3 id="removing-npm-7-"><a href="../misc/removing-npm.html">removing-npm(7)</a></h3>
+<p>Cleaning the Slate</p>
+<h3 id="semver-7-"><a href="../misc/semver.html">semver(7)</a></h3>
+<p>The semantic versioner for npm</p>
+
+</div>
+
+<table border=0 cellspacing=0 cellpadding=0 id=npmlogo>
+<tr><td style="width:180px;height:10px;background:rgb(237,127,127)" colspan=18>&nbsp;</td></tr>
+<tr><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td><td style="width:40px;height:10px;background:#fff" colspan=4>&nbsp;</td><td rowspan=4 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td><td colspan=6 style="width:60px;height:10px;background:#fff">&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=4>&nbsp;</td></tr>
+<tr><td colspan=2 style="width:20px;height:30px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=4 colspan=2>&nbsp;</td><td style="width:10px;height:20px;background:rgb(237,127,127)" rowspan=2>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:20px;height:10px;background:#fff" rowspan=3 colspan=2>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:#fff" rowspan=3>&nbsp;</td><td style="width:10px;height:10px;background:rgb(237,127,127)" rowspan=3>&nbsp;</td></tr>
+<tr><td style="width:10px;height:10px;background:#fff" rowspan=2>&nbsp;</td></tr>
+<tr><td style="width:10px;height:10px;background:#fff">&nbsp;</td></tr>
+<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
+<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
+</table>
+<p id="footer">npm-index &mdash; npm@3.3.12</p>
diff --git a/deps/npm/html/doc/misc/npm-orgs.html b/deps/npm/html/doc/misc/npm-orgs.html
index 286435bafe92d8..a42a4863f8141a 100644
--- a/deps/npm/html/doc/misc/npm-orgs.html
+++ b/deps/npm/html/doc/misc/npm-orgs.html
@@ -86,4 +86,4 @@ <h2 id="team-admins-create-teams">Team Admins create teams</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-orgs &mdash; npm@3.3.10</p>
+<p id="footer">npm-orgs &mdash; npm@3.3.12</p>
diff --git a/deps/npm/html/doc/misc/npm-registry.html b/deps/npm/html/doc/misc/npm-registry.html
index 3c14be6e209fe7..9068310aef2015 100644
--- a/deps/npm/html/doc/misc/npm-registry.html
+++ b/deps/npm/html/doc/misc/npm-registry.html
@@ -70,5 +70,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-registry &mdash; npm@3.3.10</p>
+<p id="footer">npm-registry &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/misc/npm-scope.html b/deps/npm/html/doc/misc/npm-scope.html
index d5bab8230926f8..2aac1b177dd8cc 100644
--- a/deps/npm/html/doc/misc/npm-scope.html
+++ b/deps/npm/html/doc/misc/npm-scope.html
@@ -91,5 +91,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-scope &mdash; npm@3.3.10</p>
+<p id="footer">npm-scope &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/misc/npm-scripts.html b/deps/npm/html/doc/misc/npm-scripts.html
index 2fd860cf6352e8..ed50c1caf8a9d7 100644
--- a/deps/npm/html/doc/misc/npm-scripts.html
+++ b/deps/npm/html/doc/misc/npm-scripts.html
@@ -207,5 +207,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-scripts &mdash; npm@3.3.10</p>
+<p id="footer">npm-scripts &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/misc/removing-npm.html b/deps/npm/html/doc/misc/removing-npm.html
index a1c7885b816234..90e345a4a2990f 100644
--- a/deps/npm/html/doc/misc/removing-npm.html
+++ b/deps/npm/html/doc/misc/removing-npm.html
@@ -57,5 +57,5 @@ <h2 id="see-also">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">removing-npm &mdash; npm@3.3.10</p>
+<p id="footer">removing-npm &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/html/doc/misc/semver.html b/deps/npm/html/doc/misc/semver.html
index f87b8e0a0e0051..c73b0534f6816d 100644
--- a/deps/npm/html/doc/misc/semver.html
+++ b/deps/npm/html/doc/misc/semver.html
@@ -282,5 +282,5 @@ <h3 id="ranges">Ranges</h3>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">semver &mdash; npm@3.3.10</p>
+<p id="footer">semver &mdash; npm@3.3.12</p>
 
diff --git a/deps/npm/lib/fetch-package-metadata.js b/deps/npm/lib/fetch-package-metadata.js
index 103ed2fc6af29c..9e62cacd914166 100644
--- a/deps/npm/lib/fetch-package-metadata.js
+++ b/deps/npm/lib/fetch-package-metadata.js
@@ -15,6 +15,7 @@ var rimraf = require('rimraf')
 var clone = require('lodash.clonedeep')
 var validate = require('aproba')
 var unpipe = require('unpipe')
+var normalizePackageData = require('normalize-package-data')
 
 var npm = require('./npm.js')
 var mapToRegistry = require('./utils/map-to-registry.js')
@@ -68,6 +69,15 @@ module.exports = function fetchPackageMetadata (spec, where, tracker, done) {
       pkg._where = where
       if (!pkg._args) pkg._args = []
       pkg._args.push([pkg._spec, pkg._where])
+      // non-npm registries can and will return unnormalized data, plus
+      // even the npm registry may have package data normalized with older
+      // normalization rules. This ensures we get package data in a consistent,
+      // stable format.
+      try {
+        normalizePackageData(pkg)
+      } catch (ex) {
+        // don't care
+      }
     }
     logAndFinish(er, pkg)
   }
diff --git a/deps/npm/lib/install/action/finalize.js b/deps/npm/lib/install/action/finalize.js
index 62e21cc47db89c..08e9c149c46349 100644
--- a/deps/npm/lib/install/action/finalize.js
+++ b/deps/npm/lib/install/action/finalize.js
@@ -4,7 +4,23 @@ var rimraf = require('rimraf')
 var fs = require('graceful-fs')
 var mkdirp = require('mkdirp')
 var asyncMap = require('slide').asyncMap
-var andIgnoreErrors = require('../and-ignore-errors.js')
+var iferr = require('iferr')
+
+function getTree (pkg) {
+  while (pkg.parent) pkg = pkg.parent
+  return pkg
+}
+
+function warn (pkg, code, msg) {
+  var tree = getTree(pkg)
+  var err = new Error(msg)
+  err.code = code
+  tree.warnings.push(err)
+}
+
+function pathToShortname (modpath) {
+  return modpath.replace(/node_modules[/]/g, '').replace(/[/]/g, ' > ')
+}
 
 module.exports = function (top, buildpath, pkg, log, next) {
   log.silly('finalize', pkg.path)
@@ -59,15 +75,26 @@ module.exports = function (top, buildpath, pkg, log, next) {
   function moveModules (mkdirEr, files) {
     if (mkdirEr) return next(mkdirEr)
     asyncMap(files, function (file, done) {
+      // `from` wins over `to`, because if `from` was there it's because the
+      // module installer wanted it to be there.  By contrast, `to` is just
+      // whatever was bundled in this module.  And the intentions of npm's
+      // installer should always beat out random module contents.
       var from = path.join(delpath, 'node_modules', file)
       var to = path.join(pkg.path, 'node_modules', file)
-      // we ignore errors here, because they can legitimately happen, for instance,
-      // bundled modules will be in both node_modules folders
-      fs.rename(from, to, andIgnoreErrors(done))
+      fs.stat(to, function (er, info) {
+        if (er) return fs.rename(from, to, done)
+
+        var shortname = pathToShortname(path.relative(getTree(pkg).path, to))
+        warn(pkg, 'EBUNDLEOVERRIDE', 'Replacing bundled ' + shortname + ' with new installed version')
+        rimraf(to, iferr(done, function () {
+          fs.rename(from, to, done)
+        }))
+      })
     }, cleanup)
   }
 
-  function cleanup () {
+  function cleanup (moveEr) {
+    if (moveEr) return next(moveEr)
     rimraf(delpath, afterCleanup)
   }
 
diff --git a/deps/npm/lib/install/deps.js b/deps/npm/lib/install/deps.js
index d2486419fc146d..3afe8af012f7f1 100644
--- a/deps/npm/lib/install/deps.js
+++ b/deps/npm/lib/install/deps.js
@@ -38,11 +38,11 @@ function isDep (tree, child) {
   var name = moduleName(child)
   var requested = isProdDep(tree, name)
   var matches
-  if (requested) matches = doesChildVersionMatch(child, requested)
+  if (requested) matches = doesChildVersionMatch(child, requested, tree)
   if (matches) return matches
   requested = isDevDep(tree, name)
   if (!requested) return
-  return doesChildVersionMatch(child, requested)
+  return doesChildVersionMatch(child, requested, tree)
 }
 
 function isDevDep (tree, name) {
@@ -61,10 +61,10 @@ function isProdDep (tree, name) {
 
 var registryTypes = { range: true, version: true }
 
-function doesChildVersionMatch (child, requested) {
+function doesChildVersionMatch (child, requested, requestor) {
   // we always consider deps provided by a shrinkwrap as "correct" or else
   // we'll subvert them if they're intentionally "invalid"
-  if (child.fromShrinkwrap) return true
+  if (child.parent === requestor && child.fromShrinkwrap) return true
   // ranges of * ALWAYS count as a match, because when downloading we allow
   // prereleases to match * if there are ONLY prereleases
   if (requested.spec === '*') return true
@@ -515,13 +515,14 @@ function validateAllPeerDeps (tree, onInvalid, seen) {
 
 // Determine if a module requirement is already met by the tree at or above
 // our current location in the tree.
-var findRequirement = exports.findRequirement = function (tree, name, requested) {
-  validate('OSO', arguments)
+var findRequirement = exports.findRequirement = function (tree, name, requested, requestor) {
+  validate('OSO', [tree, name, requested])
+  if (!requestor) requestor = tree
   var nameMatch = function (child) {
     return moduleName(child) === name && child.parent && !child.removed
   }
   var versionMatch = function (child) {
-    return doesChildVersionMatch(child, requested)
+    return doesChildVersionMatch(child, requested, requestor)
   }
   if (nameMatch(tree)) {
     // this *is* the module, but it doesn't match the version, so a
@@ -538,7 +539,7 @@ var findRequirement = exports.findRequirement = function (tree, name, requested)
     return null
   }
   if (!tree.parent) return null
-  return findRequirement(tree.parent, name, requested)
+  return findRequirement(tree.parent, name, requested, requestor)
 }
 
 // Find the highest level in the tree that we can install this module in.
@@ -554,10 +555,11 @@ var earliestInstallable = exports.earliestInstallable = function (requiredBy, tr
 
   // If any of the children of this tree have conflicting
   // binaries then we need to decline to install this package here.
-  var binaryMatches = tree.children.some(function (child) {
+  var binaryMatches = typeof pkg.bin === 'object' && tree.children.some(function (child) {
     if (child.removed) return false
-    return Object.keys(child.package.bin || {}).some(function (bin) {
-      return pkg.bin && pkg.bin[bin]
+    if (typeof child.package.bin !== 'object') return false
+    return Object.keys(child.package.bin).some(function (bin) {
+      return pkg.bin[bin]
     })
   })
   if (binaryMatches) return null
diff --git a/deps/npm/lib/install/diff-trees.js b/deps/npm/lib/install/diff-trees.js
index 9e9d6c44860090..59567bf3193be1 100644
--- a/deps/npm/lib/install/diff-trees.js
+++ b/deps/npm/lib/install/diff-trees.js
@@ -132,6 +132,7 @@ function diffTrees (oldTree, newTree) {
                    requiredByAllLinked(pkg)
     if (pkg.fromBundle) {
       if (npm.config.get('rebuild-bundle')) differences.push(['rebuild', pkg])
+      if (pkg.oldPkg) differences.push(['remove', pkg])
     } else if (pkg.oldPkg) {
       if (!pkg.directlyRequested && pkgAreEquiv(pkg.oldPkg.package, pkg.package)) return
       if (!pkg.isInLink && (isLink(pkg.oldPkg) || isLink(pkg))) {
diff --git a/deps/npm/man/man1/npm-README.1 b/deps/npm/man/man1/npm-README.1
index d3a7274bd8cdbe..ea9e7b1c078d05 100644
--- a/deps/npm/man/man1/npm-README.1
+++ b/deps/npm/man/man1/npm-README.1
@@ -1,4 +1,4 @@
-.TH "NPM" "1" "October 2015" "" ""
+.TH "NPM" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm\fR \- a JavaScript package manager
 .P
diff --git a/deps/npm/man/man1/npm-access.1 b/deps/npm/man/man1/npm-access.1
index 925f3a13998520..f1b8bc0e316dd0 100644
--- a/deps/npm/man/man1/npm-access.1
+++ b/deps/npm/man/man1/npm-access.1
@@ -1,4 +1,4 @@
-.TH "NPM\-ACCESS" "1" "October 2015" "" ""
+.TH "NPM\-ACCESS" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-access\fR \- Set access level on published packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-adduser.1 b/deps/npm/man/man1/npm-adduser.1
index bea5f3722cffa9..f96eae96bce363 100644
--- a/deps/npm/man/man1/npm-adduser.1
+++ b/deps/npm/man/man1/npm-adduser.1
@@ -1,4 +1,4 @@
-.TH "NPM\-ADDUSER" "1" "October 2015" "" ""
+.TH "NPM\-ADDUSER" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-adduser\fR \- Add a registry user account
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-bin.1 b/deps/npm/man/man1/npm-bin.1
index c629415eb883c3..42b2b17d140fa1 100644
--- a/deps/npm/man/man1/npm-bin.1
+++ b/deps/npm/man/man1/npm-bin.1
@@ -1,4 +1,4 @@
-.TH "NPM\-BIN" "1" "October 2015" "" ""
+.TH "NPM\-BIN" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-bin\fR \- Display npm bin folder
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-bugs.1 b/deps/npm/man/man1/npm-bugs.1
index 9f4626a411cf6d..0d0bf21688ab33 100644
--- a/deps/npm/man/man1/npm-bugs.1
+++ b/deps/npm/man/man1/npm-bugs.1
@@ -1,4 +1,4 @@
-.TH "NPM\-BUGS" "1" "October 2015" "" ""
+.TH "NPM\-BUGS" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-bugs\fR \- Bugs for a package in a web browser maybe
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-build.1 b/deps/npm/man/man1/npm-build.1
index 7528f1a21cfe58..1bac97e926e4e3 100644
--- a/deps/npm/man/man1/npm-build.1
+++ b/deps/npm/man/man1/npm-build.1
@@ -1,4 +1,4 @@
-.TH "NPM\-BUILD" "1" "October 2015" "" ""
+.TH "NPM\-BUILD" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-build\fR \- Build a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-bundle.1 b/deps/npm/man/man1/npm-bundle.1
index 0e6d0817bfda95..fa54e083415a82 100644
--- a/deps/npm/man/man1/npm-bundle.1
+++ b/deps/npm/man/man1/npm-bundle.1
@@ -1,4 +1,4 @@
-.TH "NPM\-BUNDLE" "1" "October 2015" "" ""
+.TH "NPM\-BUNDLE" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-bundle\fR \- REMOVED
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-cache.1 b/deps/npm/man/man1/npm-cache.1
index ff3e7c8058b95d..c4bca767c4496a 100644
--- a/deps/npm/man/man1/npm-cache.1
+++ b/deps/npm/man/man1/npm-cache.1
@@ -1,4 +1,4 @@
-.TH "NPM\-CACHE" "1" "October 2015" "" ""
+.TH "NPM\-CACHE" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-cache\fR \- Manipulates packages cache
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-completion.1 b/deps/npm/man/man1/npm-completion.1
index 0f3b1abf2e7638..ba8d7dd802fefc 100644
--- a/deps/npm/man/man1/npm-completion.1
+++ b/deps/npm/man/man1/npm-completion.1
@@ -1,4 +1,4 @@
-.TH "NPM\-COMPLETION" "1" "October 2015" "" ""
+.TH "NPM\-COMPLETION" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-completion\fR \- Tab Completion for npm
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-config.1 b/deps/npm/man/man1/npm-config.1
index d6369755a11316..f3030154303c90 100644
--- a/deps/npm/man/man1/npm-config.1
+++ b/deps/npm/man/man1/npm-config.1
@@ -1,4 +1,4 @@
-.TH "NPM\-CONFIG" "1" "October 2015" "" ""
+.TH "NPM\-CONFIG" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-config\fR \- Manage the npm configuration files
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-dedupe.1 b/deps/npm/man/man1/npm-dedupe.1
index 0c965e957a9b10..145e27dd49108d 100644
--- a/deps/npm/man/man1/npm-dedupe.1
+++ b/deps/npm/man/man1/npm-dedupe.1
@@ -1,4 +1,4 @@
-.TH "NPM\-DEDUPE" "1" "October 2015" "" ""
+.TH "NPM\-DEDUPE" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-dedupe\fR \- Reduce duplication
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-deprecate.1 b/deps/npm/man/man1/npm-deprecate.1
index df8c342953c80b..a3992ac1bb6459 100644
--- a/deps/npm/man/man1/npm-deprecate.1
+++ b/deps/npm/man/man1/npm-deprecate.1
@@ -1,4 +1,4 @@
-.TH "NPM\-DEPRECATE" "1" "October 2015" "" ""
+.TH "NPM\-DEPRECATE" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-deprecate\fR \- Deprecate a version of a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-dist-tag.1 b/deps/npm/man/man1/npm-dist-tag.1
index 9d7742d8108432..8b30e986a4f78b 100644
--- a/deps/npm/man/man1/npm-dist-tag.1
+++ b/deps/npm/man/man1/npm-dist-tag.1
@@ -1,4 +1,4 @@
-.TH "NPM\-DIST\-TAG" "1" "October 2015" "" ""
+.TH "NPM\-DIST\-TAG" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-dist-tag\fR \- Modify package distribution tags
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-docs.1 b/deps/npm/man/man1/npm-docs.1
index 74b258d7373b29..d6690800c465d0 100644
--- a/deps/npm/man/man1/npm-docs.1
+++ b/deps/npm/man/man1/npm-docs.1
@@ -1,4 +1,4 @@
-.TH "NPM\-DOCS" "1" "October 2015" "" ""
+.TH "NPM\-DOCS" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-docs\fR \- Docs for a package in a web browser maybe
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-edit.1 b/deps/npm/man/man1/npm-edit.1
index 8cb4ea635e8091..dd757fe87817ca 100644
--- a/deps/npm/man/man1/npm-edit.1
+++ b/deps/npm/man/man1/npm-edit.1
@@ -1,4 +1,4 @@
-.TH "NPM\-EDIT" "1" "October 2015" "" ""
+.TH "NPM\-EDIT" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-edit\fR \- Edit an installed package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-explore.1 b/deps/npm/man/man1/npm-explore.1
index 4b1471748110ac..797c84d737bd7d 100644
--- a/deps/npm/man/man1/npm-explore.1
+++ b/deps/npm/man/man1/npm-explore.1
@@ -1,4 +1,4 @@
-.TH "NPM\-EXPLORE" "1" "October 2015" "" ""
+.TH "NPM\-EXPLORE" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-explore\fR \- Browse an installed package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-help-search.1 b/deps/npm/man/man1/npm-help-search.1
index 8d6f8e42e66b19..88654a1da3ad92 100644
--- a/deps/npm/man/man1/npm-help-search.1
+++ b/deps/npm/man/man1/npm-help-search.1
@@ -1,4 +1,4 @@
-.TH "NPM\-HELP\-SEARCH" "1" "October 2015" "" ""
+.TH "NPM\-HELP\-SEARCH" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-help-search\fR \- Search npm help documentation
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-help.1 b/deps/npm/man/man1/npm-help.1
index 2f6d09c665531c..8022867ef46a22 100644
--- a/deps/npm/man/man1/npm-help.1
+++ b/deps/npm/man/man1/npm-help.1
@@ -1,4 +1,4 @@
-.TH "NPM\-HELP" "1" "October 2015" "" ""
+.TH "NPM\-HELP" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-help\fR \- Get help on npm
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-init.1 b/deps/npm/man/man1/npm-init.1
index 56da738cb8d521..8c6bf0397482eb 100644
--- a/deps/npm/man/man1/npm-init.1
+++ b/deps/npm/man/man1/npm-init.1
@@ -1,4 +1,4 @@
-.TH "NPM\-INIT" "1" "October 2015" "" ""
+.TH "NPM\-INIT" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-init\fR \- Interactively create a package\.json file
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-install-test.1 b/deps/npm/man/man1/npm-install-test.1
new file mode 100644
index 00000000000000..e2edecfc03a3bc
--- /dev/null
+++ b/deps/npm/man/man1/npm-install-test.1
@@ -0,0 +1,32 @@
+.TH "NPM" "" "November 2015" "" ""
+.SH "NAME"
+\fBnpm\fR
+.SH SYNOPSIS
+.P
+.RS 2
+.nf
+npm install\-test (with no args, in package dir)
+npm install\-test [<@scope>/]<name>
+npm install\-test [<@scope>/]<name>@<tag>
+npm install\-test [<@scope>/]<name>@<version>
+npm install\-test [<@scope>/]<name>@<version range>
+npm install\-test <tarball file>
+npm install\-test <tarball url>
+npm install\-test <folder>
+
+alias: npm it
+common options: [\-\-save|\-\-save\-dev|\-\-save\-optional] [\-\-save\-exact] [\-\-dry\-run]
+.fi
+.RE
+.SH DESCRIPTION
+.P
+This command runs an \fBnpm install\fP followed immediately by an \fBnpm test\fP\|\. It
+takes exactly the same arguments as \fBnpm install\fP\|\.
+.SH SEE ALSO
+.RS 0
+.IP \(bu 2
+npm help install
+.IP \(bu 2
+npm help test
+
+.RE
diff --git a/deps/npm/man/man1/npm-install.1 b/deps/npm/man/man1/npm-install.1
index 536b9f3c66b47e..9219b7a024ce9a 100644
--- a/deps/npm/man/man1/npm-install.1
+++ b/deps/npm/man/man1/npm-install.1
@@ -1,4 +1,4 @@
-.TH "NPM\-INSTALL" "1" "October 2015" "" ""
+.TH "NPM\-INSTALL" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-install\fR \- Install a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-link.1 b/deps/npm/man/man1/npm-link.1
index 78c3b75a8e9c56..9d0ea8f47c5ff7 100644
--- a/deps/npm/man/man1/npm-link.1
+++ b/deps/npm/man/man1/npm-link.1
@@ -1,4 +1,4 @@
-.TH "NPM\-LINK" "1" "October 2015" "" ""
+.TH "NPM\-LINK" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-link\fR \- Symlink a package folder
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-logout.1 b/deps/npm/man/man1/npm-logout.1
index d7a840c5dd36b5..c194188ad64b89 100644
--- a/deps/npm/man/man1/npm-logout.1
+++ b/deps/npm/man/man1/npm-logout.1
@@ -1,4 +1,4 @@
-.TH "NPM\-LOGOUT" "1" "October 2015" "" ""
+.TH "NPM\-LOGOUT" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-logout\fR \- Log out of the registry
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-ls.1 b/deps/npm/man/man1/npm-ls.1
index 20bf3f57597bad..10dea443864242 100644
--- a/deps/npm/man/man1/npm-ls.1
+++ b/deps/npm/man/man1/npm-ls.1
@@ -1,4 +1,4 @@
-.TH "NPM\-LS" "1" "October 2015" "" ""
+.TH "NPM\-LS" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-ls\fR \- List installed packages
 .SH SYNOPSIS
@@ -22,7 +22,7 @@ For example, running \fBnpm ls promzard\fP in npm's source tree will show:
 .P
 .RS 2
 .nf
-npm@3.3.10 /path/to/npm
+npm@3.3.12 /path/to/npm
 └─┬ init\-package\-json@0\.0\.4
   └── promzard@0\.1\.5
 .fi
diff --git a/deps/npm/man/man1/npm-outdated.1 b/deps/npm/man/man1/npm-outdated.1
index 493e7a9f21402b..b7ba130cb5e4b1 100644
--- a/deps/npm/man/man1/npm-outdated.1
+++ b/deps/npm/man/man1/npm-outdated.1
@@ -1,4 +1,4 @@
-.TH "NPM\-OUTDATED" "1" "October 2015" "" ""
+.TH "NPM\-OUTDATED" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-outdated\fR \- Check for outdated packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-owner.1 b/deps/npm/man/man1/npm-owner.1
index 009121d4eb59b2..1ce148d3fade74 100644
--- a/deps/npm/man/man1/npm-owner.1
+++ b/deps/npm/man/man1/npm-owner.1
@@ -1,4 +1,4 @@
-.TH "NPM\-OWNER" "1" "October 2015" "" ""
+.TH "NPM\-OWNER" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-owner\fR \- Manage package owners
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-pack.1 b/deps/npm/man/man1/npm-pack.1
index 0ece00cf1f28fa..9bb591cdfe82f2 100644
--- a/deps/npm/man/man1/npm-pack.1
+++ b/deps/npm/man/man1/npm-pack.1
@@ -1,4 +1,4 @@
-.TH "NPM\-PACK" "1" "October 2015" "" ""
+.TH "NPM\-PACK" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-pack\fR \- Create a tarball from a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-ping.1 b/deps/npm/man/man1/npm-ping.1
index af69ba3a784219..4d2b9a78bf0fcb 100644
--- a/deps/npm/man/man1/npm-ping.1
+++ b/deps/npm/man/man1/npm-ping.1
@@ -1,4 +1,4 @@
-.TH "NPM\-PING" "1" "October 2015" "" ""
+.TH "NPM\-PING" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-ping\fR \- Ping npm registry
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-prefix.1 b/deps/npm/man/man1/npm-prefix.1
index 9ce37848d97d52..c6ea5f6fdfa75e 100644
--- a/deps/npm/man/man1/npm-prefix.1
+++ b/deps/npm/man/man1/npm-prefix.1
@@ -1,4 +1,4 @@
-.TH "NPM\-PREFIX" "1" "October 2015" "" ""
+.TH "NPM\-PREFIX" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-prefix\fR \- Display prefix
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-prune.1 b/deps/npm/man/man1/npm-prune.1
index 051acaab50a1d5..22c831d338dc1f 100644
--- a/deps/npm/man/man1/npm-prune.1
+++ b/deps/npm/man/man1/npm-prune.1
@@ -1,4 +1,4 @@
-.TH "NPM\-PRUNE" "1" "October 2015" "" ""
+.TH "NPM\-PRUNE" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-prune\fR \- Remove extraneous packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-publish.1 b/deps/npm/man/man1/npm-publish.1
index 4421c8f45dbce0..cd249e4fe9263e 100644
--- a/deps/npm/man/man1/npm-publish.1
+++ b/deps/npm/man/man1/npm-publish.1
@@ -1,4 +1,4 @@
-.TH "NPM\-PUBLISH" "1" "October 2015" "" ""
+.TH "NPM\-PUBLISH" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-publish\fR \- Publish a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-rebuild.1 b/deps/npm/man/man1/npm-rebuild.1
index 03d16889aa5482..e850fa647fcf1a 100644
--- a/deps/npm/man/man1/npm-rebuild.1
+++ b/deps/npm/man/man1/npm-rebuild.1
@@ -1,4 +1,4 @@
-.TH "NPM\-REBUILD" "1" "October 2015" "" ""
+.TH "NPM\-REBUILD" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-rebuild\fR \- Rebuild a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-repo.1 b/deps/npm/man/man1/npm-repo.1
index fe4418e7e5db84..7ee7d95f8f7831 100644
--- a/deps/npm/man/man1/npm-repo.1
+++ b/deps/npm/man/man1/npm-repo.1
@@ -1,4 +1,4 @@
-.TH "NPM\-REPO" "1" "October 2015" "" ""
+.TH "NPM\-REPO" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-repo\fR \- Open package repository page in the browser
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-restart.1 b/deps/npm/man/man1/npm-restart.1
index 31e61af29de800..0bc7541ccf80c6 100644
--- a/deps/npm/man/man1/npm-restart.1
+++ b/deps/npm/man/man1/npm-restart.1
@@ -1,4 +1,4 @@
-.TH "NPM\-RESTART" "1" "October 2015" "" ""
+.TH "NPM\-RESTART" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-restart\fR \- Restart a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-rm.1 b/deps/npm/man/man1/npm-rm.1
new file mode 100644
index 00000000000000..ec0271980a4bee
--- /dev/null
+++ b/deps/npm/man/man1/npm-rm.1
@@ -0,0 +1,33 @@
+.TH "NPM\-RM" "1" "October 2015" "" ""
+.SH "NAME"
+\fBnpm-rm\fR \- Remove a package
+.SH SYNOPSIS
+.P
+.RS 2
+.nf
+npm rm <name>
+npm r <name>
+npm uninstall <name>
+npm un <name>
+.fi
+.RE
+.SH DESCRIPTION
+.P
+This uninstalls a package, completely removing everything npm installed
+on its behalf\.
+.SH SEE ALSO
+.RS 0
+.IP \(bu 2
+npm help prune
+.IP \(bu 2
+npm help install
+.IP \(bu 2
+npm help 5 folders
+.IP \(bu 2
+npm help config
+.IP \(bu 2
+npm help 7 config
+.IP \(bu 2
+npm help 5 npmrc
+
+.RE
diff --git a/deps/npm/man/man1/npm-root.1 b/deps/npm/man/man1/npm-root.1
index 6c42d89965e47f..bacb6ffb7de987 100644
--- a/deps/npm/man/man1/npm-root.1
+++ b/deps/npm/man/man1/npm-root.1
@@ -1,4 +1,4 @@
-.TH "NPM\-ROOT" "1" "October 2015" "" ""
+.TH "NPM\-ROOT" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-root\fR \- Display npm root
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-run-script.1 b/deps/npm/man/man1/npm-run-script.1
index 08a675a31117c8..ded6145a1f3480 100644
--- a/deps/npm/man/man1/npm-run-script.1
+++ b/deps/npm/man/man1/npm-run-script.1
@@ -1,4 +1,4 @@
-.TH "NPM\-RUN\-SCRIPT" "1" "October 2015" "" ""
+.TH "NPM\-RUN\-SCRIPT" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-run-script\fR \- Run arbitrary package scripts
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-search.1 b/deps/npm/man/man1/npm-search.1
index 87ad71ad5fd0c8..6307a345aa3a6e 100644
--- a/deps/npm/man/man1/npm-search.1
+++ b/deps/npm/man/man1/npm-search.1
@@ -1,4 +1,4 @@
-.TH "NPM\-SEARCH" "1" "October 2015" "" ""
+.TH "NPM\-SEARCH" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-search\fR \- Search for packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-shrinkwrap.1 b/deps/npm/man/man1/npm-shrinkwrap.1
index d8a6049dbd4e20..39784dfe6f6359 100644
--- a/deps/npm/man/man1/npm-shrinkwrap.1
+++ b/deps/npm/man/man1/npm-shrinkwrap.1
@@ -1,4 +1,4 @@
-.TH "NPM\-SHRINKWRAP" "1" "October 2015" "" ""
+.TH "NPM\-SHRINKWRAP" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-shrinkwrap\fR \- Lock down dependency versions
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-star.1 b/deps/npm/man/man1/npm-star.1
index fabbfba56e29da..e12124fd5d3dab 100644
--- a/deps/npm/man/man1/npm-star.1
+++ b/deps/npm/man/man1/npm-star.1
@@ -1,4 +1,4 @@
-.TH "NPM\-STAR" "1" "October 2015" "" ""
+.TH "NPM\-STAR" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-star\fR \- Mark your favorite packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-stars.1 b/deps/npm/man/man1/npm-stars.1
index f8c7b21410f5f2..c80a0f8a3ea586 100644
--- a/deps/npm/man/man1/npm-stars.1
+++ b/deps/npm/man/man1/npm-stars.1
@@ -1,4 +1,4 @@
-.TH "NPM\-STARS" "1" "October 2015" "" ""
+.TH "NPM\-STARS" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-stars\fR \- View packages marked as favorites
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-start.1 b/deps/npm/man/man1/npm-start.1
index eb5f7b8aeac55c..9f027a9ffb9adf 100644
--- a/deps/npm/man/man1/npm-start.1
+++ b/deps/npm/man/man1/npm-start.1
@@ -1,4 +1,4 @@
-.TH "NPM\-START" "1" "October 2015" "" ""
+.TH "NPM\-START" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-start\fR \- Start a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-stop.1 b/deps/npm/man/man1/npm-stop.1
index 8e2510625533ac..044bbc066ac905 100644
--- a/deps/npm/man/man1/npm-stop.1
+++ b/deps/npm/man/man1/npm-stop.1
@@ -1,4 +1,4 @@
-.TH "NPM\-STOP" "1" "October 2015" "" ""
+.TH "NPM\-STOP" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-stop\fR \- Stop a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-tag.1 b/deps/npm/man/man1/npm-tag.1
index 4d63d7168da677..e70976e800779f 100644
--- a/deps/npm/man/man1/npm-tag.1
+++ b/deps/npm/man/man1/npm-tag.1
@@ -1,4 +1,4 @@
-.TH "NPM\-TAG" "1" "October 2015" "" ""
+.TH "NPM\-TAG" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-tag\fR \- Tag a published version
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-team.1 b/deps/npm/man/man1/npm-team.1
index 0e6efae707d7a1..69f03d6df160bf 100644
--- a/deps/npm/man/man1/npm-team.1
+++ b/deps/npm/man/man1/npm-team.1
@@ -1,4 +1,4 @@
-.TH "NPM\-TEAM" "1" "October 2015" "" ""
+.TH "NPM\-TEAM" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-team\fR \- Manage organization teams and team memberships
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-test.1 b/deps/npm/man/man1/npm-test.1
index 08720089a6200f..c36e7f42adeeb9 100644
--- a/deps/npm/man/man1/npm-test.1
+++ b/deps/npm/man/man1/npm-test.1
@@ -1,4 +1,4 @@
-.TH "NPM\-TEST" "1" "October 2015" "" ""
+.TH "NPM\-TEST" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-test\fR \- Test a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-uninstall.1 b/deps/npm/man/man1/npm-uninstall.1
index 0a6e0640fb4e4b..6bac5b55d0bb5a 100644
--- a/deps/npm/man/man1/npm-uninstall.1
+++ b/deps/npm/man/man1/npm-uninstall.1
@@ -1,4 +1,4 @@
-.TH "NPM\-RM" "1" "October 2015" "" ""
+.TH "NPM\-RM" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-rm\fR \- Remove a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-unpublish.1 b/deps/npm/man/man1/npm-unpublish.1
index 9d3236baa2998d..daa61e3a293e3f 100644
--- a/deps/npm/man/man1/npm-unpublish.1
+++ b/deps/npm/man/man1/npm-unpublish.1
@@ -1,4 +1,4 @@
-.TH "NPM\-UNPUBLISH" "1" "October 2015" "" ""
+.TH "NPM\-UNPUBLISH" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-unpublish\fR \- Remove a package from the registry
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-update.1 b/deps/npm/man/man1/npm-update.1
index b700378245c1c8..62b3adc4afcdc0 100644
--- a/deps/npm/man/man1/npm-update.1
+++ b/deps/npm/man/man1/npm-update.1
@@ -1,4 +1,4 @@
-.TH "NPM\-UPDATE" "1" "October 2015" "" ""
+.TH "NPM\-UPDATE" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-update\fR \- Update a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-version.1 b/deps/npm/man/man1/npm-version.1
index abd22a5e5fd70d..f799cd9111584d 100644
--- a/deps/npm/man/man1/npm-version.1
+++ b/deps/npm/man/man1/npm-version.1
@@ -1,4 +1,4 @@
-.TH "NPM\-VERSION" "1" "October 2015" "" ""
+.TH "NPM\-VERSION" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-version\fR \- Bump a package version
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-view.1 b/deps/npm/man/man1/npm-view.1
index 75caecf28e25b2..9e3e44ff538a94 100644
--- a/deps/npm/man/man1/npm-view.1
+++ b/deps/npm/man/man1/npm-view.1
@@ -1,4 +1,4 @@
-.TH "NPM\-VIEW" "1" "October 2015" "" ""
+.TH "NPM\-VIEW" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-view\fR \- View registry info
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-whoami.1 b/deps/npm/man/man1/npm-whoami.1
index 1bb605e285cf75..d356fe402373ec 100644
--- a/deps/npm/man/man1/npm-whoami.1
+++ b/deps/npm/man/man1/npm-whoami.1
@@ -1,4 +1,4 @@
-.TH "NPM\-WHOAMI" "1" "October 2015" "" ""
+.TH "NPM\-WHOAMI" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-whoami\fR \- Display npm username
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1
index c2df4eb71981bc..16c974e0edf9ff 100644
--- a/deps/npm/man/man1/npm.1
+++ b/deps/npm/man/man1/npm.1
@@ -1,4 +1,4 @@
-.TH "NPM" "1" "October 2015" "" ""
+.TH "NPM" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm\fR \- javascript package manager
 .SH SYNOPSIS
@@ -10,7 +10,7 @@ npm <command> [args]
 .RE
 .SH VERSION
 .P
-3.3.10
+3.3.12
 .SH DESCRIPTION
 .P
 npm is the package manager for the Node JavaScript platform\.  It puts
diff --git a/deps/npm/man/man5/npm-folders.5 b/deps/npm/man/man5/npm-folders.5
index bdc08bb2db50f9..e52857ec548c45 100644
--- a/deps/npm/man/man5/npm-folders.5
+++ b/deps/npm/man/man5/npm-folders.5
@@ -1,4 +1,4 @@
-.TH "NPM\-FOLDERS" "5" "October 2015" "" ""
+.TH "NPM\-FOLDERS" "5" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-folders\fR \- Folder Structures Used by npm
 .SH DESCRIPTION
diff --git a/deps/npm/man/man5/npm-global.5 b/deps/npm/man/man5/npm-global.5
index bdc08bb2db50f9..e52857ec548c45 100644
--- a/deps/npm/man/man5/npm-global.5
+++ b/deps/npm/man/man5/npm-global.5
@@ -1,4 +1,4 @@
-.TH "NPM\-FOLDERS" "5" "October 2015" "" ""
+.TH "NPM\-FOLDERS" "5" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-folders\fR \- Folder Structures Used by npm
 .SH DESCRIPTION
diff --git a/deps/npm/man/man5/npm-json.5 b/deps/npm/man/man5/npm-json.5
index e110187fce73d4..ed8bd82a9fdba8 100644
--- a/deps/npm/man/man5/npm-json.5
+++ b/deps/npm/man/man5/npm-json.5
@@ -1,4 +1,4 @@
-.TH "PACKAGE\.JSON" "5" "October 2015" "" ""
+.TH "PACKAGE\.JSON" "5" "November 2015" "" ""
 .SH "NAME"
 \fBpackage.json\fR \- Specifics of npm's package\.json handling
 .SH DESCRIPTION
diff --git a/deps/npm/man/man5/npmrc.5 b/deps/npm/man/man5/npmrc.5
index 3c00980f3ac3a8..ed6ee372d33622 100644
--- a/deps/npm/man/man5/npmrc.5
+++ b/deps/npm/man/man5/npmrc.5
@@ -1,4 +1,4 @@
-.TH "NPMRC" "5" "October 2015" "" ""
+.TH "NPMRC" "5" "November 2015" "" ""
 .SH "NAME"
 \fBnpmrc\fR \- The npm config files
 .SH DESCRIPTION
diff --git a/deps/npm/man/man5/package.json.5 b/deps/npm/man/man5/package.json.5
index e110187fce73d4..ed8bd82a9fdba8 100644
--- a/deps/npm/man/man5/package.json.5
+++ b/deps/npm/man/man5/package.json.5
@@ -1,4 +1,4 @@
-.TH "PACKAGE\.JSON" "5" "October 2015" "" ""
+.TH "PACKAGE\.JSON" "5" "November 2015" "" ""
 .SH "NAME"
 \fBpackage.json\fR \- Specifics of npm's package\.json handling
 .SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-coding-style.7 b/deps/npm/man/man7/npm-coding-style.7
index b9bf4dbcfb5846..839806a670a4e8 100644
--- a/deps/npm/man/man7/npm-coding-style.7
+++ b/deps/npm/man/man7/npm-coding-style.7
@@ -1,4 +1,4 @@
-.TH "NPM\-CODING\-STYLE" "7" "October 2015" "" ""
+.TH "NPM\-CODING\-STYLE" "7" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-coding-style\fR \- npm's "funny" coding style
 .SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-config.7 b/deps/npm/man/man7/npm-config.7
index bff35612e7d180..c0d3b2c1373b61 100644
--- a/deps/npm/man/man7/npm-config.7
+++ b/deps/npm/man/man7/npm-config.7
@@ -1,4 +1,4 @@
-.TH "NPM\-CONFIG" "7" "October 2015" "" ""
+.TH "NPM\-CONFIG" "7" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-config\fR \- More than you probably want to know about npm configuration
 .SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-developers.7 b/deps/npm/man/man7/npm-developers.7
index 80c6e6e8aba370..703fac404cad66 100644
--- a/deps/npm/man/man7/npm-developers.7
+++ b/deps/npm/man/man7/npm-developers.7
@@ -1,4 +1,4 @@
-.TH "NPM\-DEVELOPERS" "7" "October 2015" "" ""
+.TH "NPM\-DEVELOPERS" "7" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-developers\fR \- Developer Guide
 .SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-disputes.7 b/deps/npm/man/man7/npm-disputes.7
index 6deead895a42de..ae17206bcc6d12 100644
--- a/deps/npm/man/man7/npm-disputes.7
+++ b/deps/npm/man/man7/npm-disputes.7
@@ -1,4 +1,4 @@
-.TH "NPM\-DISPUTES" "7" "October 2015" "" ""
+.TH "NPM\-DISPUTES" "7" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-disputes\fR \- Handling Module Name Disputes
 .SH SYNOPSIS
diff --git a/deps/npm/man/man7/npm-faq.7 b/deps/npm/man/man7/npm-faq.7
index f41fdf621d4696..98f7f0ac04517b 100644
--- a/deps/npm/man/man7/npm-faq.7
+++ b/deps/npm/man/man7/npm-faq.7
@@ -1,4 +1,4 @@
-.TH "NPM\-FAQ" "7" "October 2015" "" ""
+.TH "NPM\-FAQ" "7" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-faq\fR \- Frequently Asked Questions
 .SH Where can I find these docs in HTML?
diff --git a/deps/npm/man/man7/npm-index.7 b/deps/npm/man/man7/npm-index.7
index b9e193195f8c2c..c147e713235609 100644
--- a/deps/npm/man/man7/npm-index.7
+++ b/deps/npm/man/man7/npm-index.7
@@ -1,4 +1,4 @@
-.TH "NPM\-INDEX" "7" "October 2015" "" ""
+.TH "NPM\-INDEX" "7" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-index\fR \- Index of all npm documentation
 .SS npm help README
diff --git a/deps/npm/man/man7/npm-orgs.7 b/deps/npm/man/man7/npm-orgs.7
index 1167bcdbed97d3..503a6f35b00753 100644
--- a/deps/npm/man/man7/npm-orgs.7
+++ b/deps/npm/man/man7/npm-orgs.7
@@ -1,4 +1,4 @@
-.TH "NPM\-ORGS" "7" "October 2015" "" ""
+.TH "NPM\-ORGS" "7" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-orgs\fR \- Working with Teams & Orgs
 .SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-registry.7 b/deps/npm/man/man7/npm-registry.7
index 5cfd79c4a7b6de..3013d956234c77 100644
--- a/deps/npm/man/man7/npm-registry.7
+++ b/deps/npm/man/man7/npm-registry.7
@@ -1,4 +1,4 @@
-.TH "NPM\-REGISTRY" "7" "October 2015" "" ""
+.TH "NPM\-REGISTRY" "7" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-registry\fR \- The JavaScript Package Registry
 .SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-scope.7 b/deps/npm/man/man7/npm-scope.7
index 2a166acdbacf49..deadca7ba3a212 100644
--- a/deps/npm/man/man7/npm-scope.7
+++ b/deps/npm/man/man7/npm-scope.7
@@ -1,4 +1,4 @@
-.TH "NPM\-SCOPE" "7" "October 2015" "" ""
+.TH "NPM\-SCOPE" "7" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-scope\fR \- Scoped packages
 .SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-scripts.7 b/deps/npm/man/man7/npm-scripts.7
index 3cb4e75cd1a84a..a2fe4b952d08d0 100644
--- a/deps/npm/man/man7/npm-scripts.7
+++ b/deps/npm/man/man7/npm-scripts.7
@@ -1,4 +1,4 @@
-.TH "NPM\-SCRIPTS" "7" "October 2015" "" ""
+.TH "NPM\-SCRIPTS" "7" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-scripts\fR \- How npm handles the "scripts" field
 .SH DESCRIPTION
diff --git a/deps/npm/man/man7/removing-npm.7 b/deps/npm/man/man7/removing-npm.7
index f0324607cf2f84..e26cab123819cd 100644
--- a/deps/npm/man/man7/removing-npm.7
+++ b/deps/npm/man/man7/removing-npm.7
@@ -1,4 +1,4 @@
-.TH "NPM\-REMOVAL" "1" "October 2015" "" ""
+.TH "NPM\-REMOVAL" "1" "November 2015" "" ""
 .SH "NAME"
 \fBnpm-removal\fR \- Cleaning the Slate
 .SH SYNOPSIS
diff --git a/deps/npm/man/man7/semver.7 b/deps/npm/man/man7/semver.7
index db93d201df8c07..be2e6f0779c60e 100644
--- a/deps/npm/man/man7/semver.7
+++ b/deps/npm/man/man7/semver.7
@@ -1,4 +1,4 @@
-.TH "SEMVER" "7" "October 2015" "" ""
+.TH "SEMVER" "7" "November 2015" "" ""
 .SH "NAME"
 \fBsemver\fR \- The semantic versioner for npm
 .SH Usage
diff --git a/deps/npm/package.json b/deps/npm/package.json
index 41374571cd7889..c797942c25f956 100644
--- a/deps/npm/package.json
+++ b/deps/npm/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.3.10",
+  "version": "3.3.12",
   "name": "npm",
   "description": "a package manager for JavaScript",
   "keywords": [
@@ -187,14 +187,14 @@
     "deep-equal": "~1.0.1",
     "marked": "~0.3.5",
     "marked-man": "~0.1.5",
-    "nock": "~2.15.0",
+    "nock": "~2.17.0",
     "npm-registry-couchapp": "~2.6.11",
     "npm-registry-mock": "~1.0.1",
     "readable-stream": "~2.0.2",
     "require-inject": "~1.2.1",
     "sprintf-js": "~1.0.3",
     "standard": "~5.3.1",
-    "tap": "~2.1.1"
+    "tap": "~2.2.0"
   },
   "scripts": {
     "dumpconf": "env | grep npm | sort | uniq",
diff --git a/deps/npm/test/tap/bugs.js b/deps/npm/test/tap/bugs.js
index dd2c87e2c6b1cb..090c2b9cb21add 100644
--- a/deps/npm/test/tap/bugs.js
+++ b/deps/npm/test/tap/bugs.js
@@ -120,7 +120,7 @@ test('npm bugs test-repo-url-http - non-github (http://)', function (t) {
   })
 })
 
-test('npm bugs test-repo-url-https - non-github (https://)', function (t) {
+test('npm bugs test-repo-url-https - gitlab (https://)', function (t) {
   mr({ port: common.port }, function (er, s) {
     common.npm(
       [
@@ -136,7 +136,7 @@ test('npm bugs test-repo-url-https - non-github (https://)', function (t) {
         t.equal(code, 0, 'exit ok')
         var res = fs.readFileSync(outFile, 'ascii')
         s.close()
-        t.equal(res, 'https://www.npmjs.org/package/test-repo-url-https\n')
+        t.equal(res, 'https://gitlab.com/evanlucas/test-repo-url-https/issues\n')
         rimraf.sync(outFile)
         t.end()
       }
@@ -144,7 +144,7 @@ test('npm bugs test-repo-url-https - non-github (https://)', function (t) {
   })
 })
 
-test('npm bugs test-repo-url-ssh - non-github (ssh://)', function (t) {
+test('npm bugs test-repo-url-ssh - gitlab (ssh://)', function (t) {
   mr({ port: common.port }, function (er, s) {
     common.npm(
       [
@@ -160,7 +160,7 @@ test('npm bugs test-repo-url-ssh - non-github (ssh://)', function (t) {
         t.equal(code, 0, 'exit ok')
         var res = fs.readFileSync(outFile, 'ascii')
         s.close()
-        t.equal(res, 'https://www.npmjs.org/package/test-repo-url-ssh\n')
+        t.equal(res, 'https://gitlab.com/evanlucas/test-repo-url-ssh/issues\n')
         rimraf.sync(outFile)
         t.end()
       }
diff --git a/deps/npm/test/tap/override-bundled.js b/deps/npm/test/tap/override-bundled.js
new file mode 100644
index 00000000000000..deed57771e1974
--- /dev/null
+++ b/deps/npm/test/tap/override-bundled.js
@@ -0,0 +1,106 @@
+'use strict'
+var test = require('tap').test
+var fs = require('fs')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var path = require('path')
+var common = require('../common-tap.js')
+
+var testdir = path.resolve(__dirname, path.basename(__filename, '.js'))
+var testjson = {
+  dependencies: {'top-test': 'file:top-test/'}
+}
+
+var testmod = path.resolve(testdir, 'top-test')
+var testmodjson = {
+  name: 'top-test',
+  version: '1.0.0',
+  dependencies: {
+    'bundle-update': 'file:bundle-update/',
+    'bundle-keep': 'file:bundle-keep/'
+  },
+  bundledDependencies: ['bundle-update', 'bundle-keep']
+}
+
+var bundleupdatesrc = path.resolve(testmod, 'bundle-update')
+var bundleupdateNEW = path.resolve(bundleupdatesrc, 'NEW')
+var bundleupdateNEWpostinstall = path.resolve(testdir, 'node_modules', 'top-test', 'node_modules', 'bundle-update', 'NEW')
+var bundleupdatebad = path.resolve(testmod, 'node_modules', 'bundle-update')
+var bundlekeepsrc = path.resolve(testmod, 'bundle-keep')
+var bundlekeep = path.resolve(testmod, 'node_modules', 'bundle-keep')
+var bundlekeepOLD = path.resolve(bundlekeep, 'OLD')
+var bundlekeepOLDpostinstall = path.resolve(testdir, 'node_modules', 'top-test', 'node_modules', 'bundle-keep', 'OLD')
+var bundlejson = {
+  name: 'bundle-update',
+  version: '1.0.0'
+}
+var bundlekeepjson = {
+  name: 'bundle-keep',
+  _requested: {
+    rawSpec: 'file:bundle-keep/'
+  }
+}
+
+function writepjs (dir, content) {
+  fs.writeFileSync(path.join(dir, 'package.json'), JSON.stringify(content, null, 2))
+}
+
+function setup () {
+  mkdirp.sync(testdir)
+  writepjs(testdir, testjson)
+  mkdirp.sync(testmod)
+  writepjs(testmod, testmodjson)
+  mkdirp.sync(bundleupdatesrc)
+  writepjs(bundleupdatesrc, bundlejson)
+  fs.writeFileSync(bundleupdateNEW, '')
+  mkdirp.sync(bundleupdatebad)
+  writepjs(bundleupdatebad, bundlejson)
+  mkdirp.sync(bundlekeepsrc)
+  writepjs(bundlekeepsrc, bundlekeepjson)
+  mkdirp.sync(bundlekeep)
+  writepjs(bundlekeep, bundlekeepjson)
+  fs.writeFileSync(bundlekeepOLD, '')
+}
+
+function cleanup () {
+  rimraf.sync(testdir)
+}
+
+test('setup', function (t) {
+  cleanup()
+  setup()
+  t.end()
+})
+
+test('bundled', function (t) {
+  common.npm(['install', '--loglevel=warn'], {cwd: testdir}, function (err, code, stdout, stderr) {
+    if (err) throw err
+    t.plan(5)
+    t.is(code, 0, 'npm itself completed ok')
+
+    // This tests that after the install we have a freshly installed version
+    // of `bundle-update` (in alignment with the package.json), instead of the
+    // version that was bundled with `top-test`.
+    // If npm doesn't do this, and selects the bundled version, things go very
+    // wrong because npm thinks it has a different module (with different
+    // metadata) installed in that location and will go off and try to do
+    // _things_ to it.  Things like chmod in particular, which in turn results
+    // in the dreaded ENOENT errors.
+    t.like(stderr, /EPACKAGEJSON override-bundled/, "didn't stomp on other warnings")
+    t.like(stderr, /EBUNDLEOVERRIDE/, 'included warning about bundled dep')
+    fs.stat(bundleupdateNEWpostinstall, function (missing) {
+      t.ok(!missing, 'package.json overrode bundle')
+    })
+
+    // Relatedly, when upgrading, if a bundled module is replacing an existing
+    // module we want to choose the bundled version, not the version we're replacing.
+    fs.stat(bundlekeepOLDpostinstall, function (missing) {
+      t.ok(!missing, 'package.json overrode bundle')
+    })
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
diff --git a/deps/npm/test/tap/shrinkwrap-version-match.js b/deps/npm/test/tap/shrinkwrap-version-match.js
new file mode 100644
index 00000000000000..cb4e9255049080
--- /dev/null
+++ b/deps/npm/test/tap/shrinkwrap-version-match.js
@@ -0,0 +1,120 @@
+'use strict'
+var test = require('tap').test
+var fs = require('fs')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var path = require('path')
+var common = require('../common-tap.js')
+
+var testdir = path.resolve(__dirname, path.basename(__filename, '.js'))
+var modAdir = path.resolve(testdir, 'modA')
+var modB1dir = path.resolve(testdir, 'modB@1')
+var modB2dir = path.resolve(testdir, 'modB@2')
+var modCdir = path.resolve(testdir, 'modC')
+var testjson = {
+  dependencies: {
+    modA: 'file://' + modAdir,
+    modC: 'file://' + modCdir
+  }
+}
+var testshrinkwrap = {
+  dependencies: {
+    modA: {
+      version: '1.0.0',
+      from: 'modA',
+      resolved: 'file://' + modAdir
+    },
+    modB: {
+      version: '1.0.0',
+      from: 'modB@1',
+      resolved: 'file://' + modB1dir
+    }
+  }
+}
+var modAjson = {
+  name: 'modA',
+  version: '1.0.0',
+  dependencies: {
+    'modB': 'file://' + modB1dir
+  }
+}
+var modCjson = {
+  name: 'modC',
+  version: '1.0.0',
+  dependencies: {
+    'modB': 'file://' + modB2dir
+  }
+}
+var modB1json = {
+  name: 'modB',
+  version: '1.0.0'
+}
+var modB2json = {
+  name: 'modB',
+  version: '2.0.0'
+}
+
+function writepjson (dir, content) {
+  writejson(dir, 'package.json', content)
+}
+function writejson (dir, file, content) {
+  writefile(dir, file, JSON.stringify(content, null, 2))
+}
+function writefile (dir, file, content) {
+  fs.writeFileSync(path.join(dir, file), content)
+}
+
+function setup () {
+  mkdirp.sync(testdir)
+  writepjson(testdir, testjson)
+  writejson(testdir, 'npm-shrinkwrap.json', testshrinkwrap)
+  mkdirp.sync(modAdir)
+  writepjson(modAdir, modAjson)
+  mkdirp.sync(modB1dir)
+  writepjson(modB1dir, modB1json)
+  writefile(modB1dir, 'B1', '')
+  mkdirp.sync(modB2dir)
+  writepjson(modB2dir, modB2json)
+  writefile(modB2dir, 'B2', '')
+  mkdirp.sync(modCdir)
+  writepjson(modCdir, modCjson)
+}
+
+function cleanup () {
+  rimraf.sync(testdir)
+}
+
+test('setup', function (t) {
+  cleanup()
+  setup()
+  t.end()
+})
+
+// Shrinkwraps need to let you override dependency versions specified in
+// package.json files.  Indeed, this was already supported, but it was a bit
+// to keen on this.  Previously, if you had a dep in your shrinkwrap then
+// anything that required that dependency would count as a match, regardless
+// of version.
+
+// This test ensures that the broad matching is not done when the matched
+// module is not a direct child of the module doing the requiring.
+
+test('bundled', function (t) {
+  common.npm(['install'], {cwd: testdir}, function (err, code, out, stderr) {
+    t.is(err, null, 'No fatal errors running npm')
+    t.is(code, 0, 'npm itself completed ok')
+    // Specifically, if B2 exists (or the modB directory under modC at all)
+    // that means modC was given its own copy of modB.  Without the patch
+    // that went with this test, it wouldn't have been installed because npm
+    // would have consider modB@1 to have fulfilled modC's requirement.
+    fs.stat(path.join(testdir, 'node_modules', 'modC', 'node_modules', 'modB', 'B2'), function (missing) {
+      t.ok(!missing, 'modC got the right version of modB')
+      t.end()
+    })
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
diff --git a/deps/npm/test/tap/version-no-package.js b/deps/npm/test/tap/version-no-package.js
index 755f99317e6e09..e4eeda0eebda0f 100644
--- a/deps/npm/test/tap/version-no-package.js
+++ b/deps/npm/test/tap/version-no-package.js
@@ -25,9 +25,8 @@ test('npm version in a prefix with no package.json', function (t) {
       t.doesNotThrow(function () {
         var metadata = JSON.parse(stdout)
         t.equal(metadata.node, process.versions.node, 'node versions match')
-
-        t.end()
       }, 'able to reconstitute version object from stdout')
+      t.end()
     }
   )
 })

From d64a56cba585ac41e7d4c541a003f81a66e5066e Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Tue, 3 Nov 2015 19:06:50 +0100
Subject: [PATCH 117/323] cluster: remove handles when disconnecting worker

Due to the race window between the master's "disconnect" message and the
worker's "handle received" message, connections sometimes got stuck in
the pending handles queue when calling `worker.disconnect()` in the
master process.

The observable effect from the client's perspective was a TCP or HTTP
connection that simply stalled.  This commit fixes that by closing open
handles in the master when the "disconnect" message is sent.

Fixes: https://github.com/nodejs/node/issues/3551
PR-URL: https://github.com/nodejs/node/pull/3677
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/cluster.js                                | 49 +++++++-------
 lib/internal/cluster.js                       |  4 ++
 node.gyp                                      |  1 +
 .../test-cluster-disconnect-handles.js        | 65 +++++++++++++++++++
 4 files changed, 96 insertions(+), 23 deletions(-)
 create mode 100644 lib/internal/cluster.js
 create mode 100644 test/parallel/test-cluster-disconnect-handles.js

diff --git a/lib/cluster.js b/lib/cluster.js
index fbad0b08212384..550a17bed9fc8d 100644
--- a/lib/cluster.js
+++ b/lib/cluster.js
@@ -217,7 +217,7 @@ function masterInit() {
   // Keyed on address:port:etc. When a worker dies, we walk over the handles
   // and remove() the worker from each one. remove() may do a linear scan
   // itself so we might end up with an O(n*m) operation. Ergo, FIXME.
-  var handles = {};
+  const handles = require('internal/cluster').handles;
 
   var initialized = false;
   cluster.setupMaster = function(options) {
@@ -308,6 +308,26 @@ function masterInit() {
 
   var ids = 0;
 
+  function removeWorker(worker) {
+    assert(worker);
+
+    delete cluster.workers[worker.id];
+
+    if (Object.keys(cluster.workers).length === 0) {
+      assert(Object.keys(handles).length === 0, 'Resource leak detected.');
+      intercom.emit('disconnect');
+    }
+  }
+
+  function removeHandlesForWorker(worker) {
+    assert(worker);
+
+    for (var key in handles) {
+      var handle = handles[key];
+      if (handle.remove(worker)) delete handles[key];
+    }
+  }
+
   cluster.fork = function(env) {
     cluster.setupMaster();
     const id = ++ids;
@@ -319,26 +339,6 @@ function masterInit() {
 
     worker.on('message', this.emit.bind(this, 'message'));
 
-    function removeWorker(worker) {
-      assert(worker);
-
-      delete cluster.workers[worker.id];
-
-      if (Object.keys(cluster.workers).length === 0) {
-        assert(Object.keys(handles).length === 0, 'Resource leak detected.');
-        intercom.emit('disconnect');
-      }
-    }
-
-    function removeHandlesForWorker(worker) {
-      assert(worker);
-
-      for (var key in handles) {
-        var handle = handles[key];
-        if (handle.remove(worker)) delete handles[key];
-      }
-    }
-
     worker.process.once('exit', function(exitCode, signalCode) {
       /*
        * Remove the worker from the workers list only
@@ -404,6 +404,8 @@ function masterInit() {
   Worker.prototype.disconnect = function() {
     this.suicide = true;
     send(this, { act: 'disconnect' });
+    removeHandlesForWorker(this);
+    removeWorker(this);
   };
 
   Worker.prototype.destroy = function(signo) {
@@ -490,11 +492,12 @@ function masterInit() {
     cluster.emit('listening', worker, info);
   }
 
-  // Server in worker is closing, remove from list.
+  // Server in worker is closing, remove from list.  The handle may have been
+  // removed by a prior call to removeHandlesForWorker() so guard against that.
   function close(worker, message) {
     var key = message.key;
     var handle = handles[key];
-    if (handle.remove(worker)) delete handles[key];
+    if (handle && handle.remove(worker)) delete handles[key];
   }
 
   function send(worker, message, handle, cb) {
diff --git a/lib/internal/cluster.js b/lib/internal/cluster.js
new file mode 100644
index 00000000000000..8380ea7482c670
--- /dev/null
+++ b/lib/internal/cluster.js
@@ -0,0 +1,4 @@
+'use strict';
+
+// Used in tests.
+exports.handles = {};
diff --git a/node.gyp b/node.gyp
index e63e750414ee60..0e8fd576f0735a 100644
--- a/node.gyp
+++ b/node.gyp
@@ -70,6 +70,7 @@
       'lib/vm.js',
       'lib/zlib.js',
       'lib/internal/child_process.js',
+      'lib/internal/cluster.js',
       'lib/internal/freelist.js',
       'lib/internal/linkedlist.js',
       'lib/internal/module.js',
diff --git a/test/parallel/test-cluster-disconnect-handles.js b/test/parallel/test-cluster-disconnect-handles.js
new file mode 100644
index 00000000000000..5fa98844537eb8
--- /dev/null
+++ b/test/parallel/test-cluster-disconnect-handles.js
@@ -0,0 +1,65 @@
+/* eslint-disable no-debugger */
+// Flags: --expose_internals
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const cluster = require('cluster');
+const net = require('net');
+
+const Protocol = require('_debugger').Protocol;
+
+if (common.isWindows) {
+  console.log('1..0 # Skipped: SCHED_RR not reliable on Windows');
+  return;
+}
+
+cluster.schedulingPolicy = cluster.SCHED_RR;
+
+// Worker sends back a "I'm here" message, then immediately suspends
+// inside the debugger.  The master connects to the debug agent first,
+// connects to the TCP server second, then disconnects the worker and
+// unsuspends it again.  The ultimate goal of this tortured exercise
+// is to make sure the connection is still sitting in the master's
+// pending handle queue.
+if (cluster.isMaster) {
+  const handles = require('internal/cluster').handles;
+  // FIXME(bnoordhuis) lib/cluster.js scans the execArgv arguments for
+  // debugger flags and renumbers any port numbers it sees starting
+  // from the default port 5858.  Add a '.' that circumvents the
+  // scanner but is ignored by atoi(3).  Heinous hack.
+  cluster.setupMaster({ execArgv: [`--debug=${common.PORT}.`] });
+  const worker = cluster.fork();
+  worker.on('message', common.mustCall(message => {
+    assert.strictEqual(Array.isArray(message), true);
+    assert.strictEqual(message[0], 'listening');
+    const address = message[1];
+    const host = address.address;
+    const debugClient = net.connect({ host, port: common.PORT });
+    const protocol = new Protocol();
+    debugClient.setEncoding('utf8');
+    debugClient.on('data', data => protocol.execute(data));
+    debugClient.once('connect', common.mustCall(() => {
+      protocol.onResponse = common.mustCall(res => {
+        protocol.onResponse = () => {};
+        const conn = net.connect({ host, port: address.port });
+        conn.once('connect', common.mustCall(() => {
+          conn.destroy();
+          assert.notDeepStrictEqual(handles, {});
+          worker.disconnect();
+          assert.deepStrictEqual(handles, {});
+          const req = protocol.serialize({ command: 'continue' });
+          debugClient.write(req);
+        }));
+      });
+    }));
+  }));
+  process.on('exit', () => assert.deepStrictEqual(handles, {}));
+} else {
+  const server = net.createServer(socket => socket.pipe(socket));
+  server.listen(() => {
+    process.send(['listening', server.address()]);
+    debugger;
+  });
+  process.on('disconnect', process.exit);
+}

From 5d34c81a5ce88d9c8eb180aeb490d7b8ea61bae4 Mon Sep 17 00:00:00 2001
From: Trevor Norris <trev.norris@gmail.com>
Date: Tue, 20 Oct 2015 12:18:15 -0600
Subject: [PATCH 118/323] async_wrap: allow some hooks to be optional

Only enforce that the init callback is passed to setupHooks(). The
remaining hooks can be optionally passed.

Throw if async_wrap.enable() runs before setting the init callback or if
setupHooks() is called while async wrap is enabled.

Add test to verify calls throw appropriately.

PR-URL: https://github.com/nodejs/node/pull/3461
Reviewed-By: Fedor Indutny <fedor@indutny.com>
---
 src/async-wrap.cc                             | 18 ++++++++++-----
 .../parallel/test-async-wrap-throw-no-init.js | 22 +++++++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 test/parallel/test-async-wrap-throw-no-init.js

diff --git a/src/async-wrap.cc b/src/async-wrap.cc
index 4f27e5116dca8d..767e76831c3d04 100644
--- a/src/async-wrap.cc
+++ b/src/async-wrap.cc
@@ -103,6 +103,9 @@ RetainedObjectInfo* WrapperInfo(uint16_t class_id, Local<Value> wrapper) {
 
 static void EnableHooksJS(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
+  Local<Function> init_fn = env->async_hooks_init_function();
+  if (init_fn.IsEmpty() || !init_fn->IsFunction())
+    return env->ThrowTypeError("init callback is not assigned to a function");
   env->async_hooks()->set_enable_callbacks(1);
 }
 
@@ -116,13 +119,18 @@ static void DisableHooksJS(const FunctionCallbackInfo<Value>& args) {
 static void SetupHooks(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
 
-  CHECK(args[0]->IsFunction());
-  CHECK(args[1]->IsFunction());
-  CHECK(args[2]->IsFunction());
+  if (env->async_hooks()->callbacks_enabled())
+    return env->ThrowError("hooks should not be set while also enabled");
+
+  if (!args[0]->IsFunction())
+    return env->ThrowTypeError("init callback must be a function");
 
   env->set_async_hooks_init_function(args[0].As<Function>());
-  env->set_async_hooks_pre_function(args[1].As<Function>());
-  env->set_async_hooks_post_function(args[2].As<Function>());
+
+  if (args[1]->IsFunction())
+    env->set_async_hooks_pre_function(args[1].As<Function>());
+  if (args[2]->IsFunction())
+    env->set_async_hooks_post_function(args[2].As<Function>());
 }
 
 
diff --git a/test/parallel/test-async-wrap-throw-no-init.js b/test/parallel/test-async-wrap-throw-no-init.js
new file mode 100644
index 00000000000000..b2f60f3215e850
--- /dev/null
+++ b/test/parallel/test-async-wrap-throw-no-init.js
@@ -0,0 +1,22 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const async_wrap = process.binding('async_wrap');
+
+
+assert.throws(function() {
+  async_wrap.setupHooks(null);
+}, /init callback must be a function/);
+
+assert.throws(function() {
+  async_wrap.enable();
+}, /init callback is not assigned to a function/);
+
+// Should not throw
+async_wrap.setupHooks(() => {});
+async_wrap.enable();
+
+assert.throws(function() {
+  async_wrap.setupHooks(() => {});
+}, /hooks should not be set while also enabled/);

From eccbec99eab6162a2ea85f7688fd786667cb6f8a Mon Sep 17 00:00:00 2001
From: Trevor Norris <trev.norris@gmail.com>
Date: Mon, 19 Oct 2015 17:14:05 -0600
Subject: [PATCH 119/323] async_wrap: new instances get uid

New instances of AsyncWrap are automatically assigned a unique id. The
value will be used in future commits to communicate additional
information via the async hooks.

While the largest value we can reliably communicate to JS is 2^53, even
if a new AsyncWrap is created every 100ns the uid won't reach its end
for 28.5 years.

PR-URL: https://github.com/nodejs/node/pull/3461
Reviewed-By: Fedor Indutny <fedor@indutny.com>
---
 src/async-wrap-inl.h | 8 +++++++-
 src/async-wrap.h     | 3 +++
 src/env-inl.h        | 5 +++++
 src/env.h            | 3 +++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/async-wrap-inl.h b/src/async-wrap-inl.h
index cac8175889dfbf..9aaf67d3a8c518 100644
--- a/src/async-wrap-inl.h
+++ b/src/async-wrap-inl.h
@@ -17,7 +17,8 @@ inline AsyncWrap::AsyncWrap(Environment* env,
                             v8::Local<v8::Object> object,
                             ProviderType provider,
                             AsyncWrap* parent)
-    : BaseObject(env, object), bits_(static_cast<uint32_t>(provider) << 1) {
+    : BaseObject(env, object), bits_(static_cast<uint32_t>(provider) << 1),
+      uid_(env->get_async_wrap_uid()) {
   CHECK_NE(provider, PROVIDER_NONE);
   CHECK_GE(object->InternalFieldCount(), 1);
 
@@ -66,6 +67,11 @@ inline AsyncWrap::ProviderType AsyncWrap::provider_type() const {
 }
 
 
+inline int64_t AsyncWrap::get_uid() const {
+  return uid_;
+}
+
+
 inline v8::Local<v8::Value> AsyncWrap::MakeCallback(
     const v8::Local<v8::String> symbol,
     int argc,
diff --git a/src/async-wrap.h b/src/async-wrap.h
index 330f3454f42d2c..5fbd2309383d87 100644
--- a/src/async-wrap.h
+++ b/src/async-wrap.h
@@ -55,6 +55,8 @@ class AsyncWrap : public BaseObject {
 
   inline ProviderType provider_type() const;
 
+  inline int64_t get_uid() const;
+
   // Only call these within a valid HandleScope.
   v8::Local<v8::Value> MakeCallback(const v8::Local<v8::Function> cb,
                                      int argc,
@@ -76,6 +78,7 @@ class AsyncWrap : public BaseObject {
   // expected the context object will receive a _asyncQueue object property
   // that will be used to call pre/post in MakeCallback.
   uint32_t bits_;
+  const int64_t uid_;
 };
 
 void LoadAsyncWrapperInfo(Environment* env);
diff --git a/src/env-inl.h b/src/env-inl.h
index 2d965f9a519232..f73e9c6ba2000a 100644
--- a/src/env-inl.h
+++ b/src/env-inl.h
@@ -210,6 +210,7 @@ inline Environment::Environment(v8::Local<v8::Context> context,
       using_domains_(false),
       printed_error_(false),
       trace_sync_io_(false),
+      async_wrap_uid_(0),
       debugger_agent_(this),
       http_parser_buffer_(nullptr),
       context_(context->GetIsolate(), context) {
@@ -359,6 +360,10 @@ inline void Environment::set_trace_sync_io(bool value) {
   trace_sync_io_ = value;
 }
 
+inline int64_t Environment::get_async_wrap_uid() {
+  return ++async_wrap_uid_;
+}
+
 inline uint32_t* Environment::heap_statistics_buffer() const {
   CHECK_NE(heap_statistics_buffer_, nullptr);
   return heap_statistics_buffer_;
diff --git a/src/env.h b/src/env.h
index c558764c671a21..cdfd19c9740e31 100644
--- a/src/env.h
+++ b/src/env.h
@@ -446,6 +446,8 @@ class Environment {
   void PrintSyncTrace() const;
   inline void set_trace_sync_io(bool value);
 
+  inline int64_t get_async_wrap_uid();
+
   bool KickNextTick();
 
   inline uint32_t* heap_statistics_buffer() const;
@@ -541,6 +543,7 @@ class Environment {
   bool using_domains_;
   bool printed_error_;
   bool trace_sync_io_;
+  int64_t async_wrap_uid_;
   debugger::Agent debugger_agent_;
 
   HandleWrapQueue handle_wrap_queue_;

From b663d2bbb533b7f689b33a681dfaa85fef4339dc Mon Sep 17 00:00:00 2001
From: Trevor Norris <trev.norris@gmail.com>
Date: Tue, 20 Oct 2015 12:20:10 -0600
Subject: [PATCH 120/323] async_wrap: call callback in destructor

Call a user's callback to notify that the handle has been destroyed.
Only pass the id of the AsyncWrap instance since the object no longer
exists.

The object that's being destructed should never be inspected within the
callback or any time afterward.

This commit make a breaking change. The init callback will now be passed
arguments in the order of provider, id, parent.

PR-URL: https://github.com/nodejs/node/pull/3461
Reviewed-By: Fedor Indutny <fedor@indutny.com>
---
 src/async-wrap-inl.h                          | 19 ++++++++++++++++++-
 src/async-wrap.cc                             |  3 +++
 src/async-wrap.h                              |  2 +-
 src/env.h                                     |  1 +
 ...st-async-wrap-disabled-propagate-parent.js |  2 +-
 .../test-async-wrap-propagate-parent.js       |  2 +-
 6 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/async-wrap-inl.h b/src/async-wrap-inl.h
index 9aaf67d3a8c518..1d9ebe27e45bef 100644
--- a/src/async-wrap-inl.h
+++ b/src/async-wrap-inl.h
@@ -41,11 +41,12 @@ inline AsyncWrap::AsyncWrap(Environment* env,
 
   v8::Local<v8::Value> argv[] = {
     v8::Int32::New(env->isolate(), provider),
+    v8::Integer::New(env->isolate(), get_uid()),
     Null(env->isolate())
   };
 
   if (parent != nullptr)
-    argv[1] = parent->object();
+    argv[2] = parent->object();
 
   v8::MaybeLocal<v8::Value> ret =
       init_fn->Call(env->context(), object, ARRAY_SIZE(argv), argv);
@@ -57,6 +58,22 @@ inline AsyncWrap::AsyncWrap(Environment* env,
 }
 
 
+inline AsyncWrap::~AsyncWrap() {
+  if (!ran_init_callback())
+    return;
+
+  v8::Local<v8::Function> fn = env()->async_hooks_destroy_function();
+  if (!fn.IsEmpty()) {
+    v8::HandleScope scope(env()->isolate());
+    v8::Local<v8::Value> uid = v8::Integer::New(env()->isolate(), get_uid());
+    v8::MaybeLocal<v8::Value> ret =
+        fn->Call(env()->context(), v8::Null(env()->isolate()), 1, &uid);
+    if (ret.IsEmpty())
+      FatalError("node::AsyncWrap::~AsyncWrap", "destroy hook threw");
+  }
+}
+
+
 inline bool AsyncWrap::ran_init_callback() const {
   return static_cast<bool>(bits_ & 1);
 }
diff --git a/src/async-wrap.cc b/src/async-wrap.cc
index 767e76831c3d04..c9f5caad1e4ea8 100644
--- a/src/async-wrap.cc
+++ b/src/async-wrap.cc
@@ -131,6 +131,8 @@ static void SetupHooks(const FunctionCallbackInfo<Value>& args) {
     env->set_async_hooks_pre_function(args[1].As<Function>());
   if (args[2]->IsFunction())
     env->set_async_hooks_post_function(args[2].As<Function>());
+  if (args[3]->IsFunction())
+    env->set_async_hooks_destroy_function(args[3].As<Function>());
 }
 
 
@@ -156,6 +158,7 @@ static void Initialize(Local<Object> target,
   env->set_async_hooks_init_function(Local<Function>());
   env->set_async_hooks_pre_function(Local<Function>());
   env->set_async_hooks_post_function(Local<Function>());
+  env->set_async_hooks_destroy_function(Local<Function>());
 }
 
 
diff --git a/src/async-wrap.h b/src/async-wrap.h
index 5fbd2309383d87..5db29600bcd180 100644
--- a/src/async-wrap.h
+++ b/src/async-wrap.h
@@ -51,7 +51,7 @@ class AsyncWrap : public BaseObject {
                    ProviderType provider,
                    AsyncWrap* parent = nullptr);
 
-  inline virtual ~AsyncWrap() override = default;
+  inline virtual ~AsyncWrap();
 
   inline ProviderType provider_type() const;
 
diff --git a/src/env.h b/src/env.h
index cdfd19c9740e31..93f7c47c9919a3 100644
--- a/src/env.h
+++ b/src/env.h
@@ -236,6 +236,7 @@ namespace node {
   V(async_hooks_init_function, v8::Function)                                  \
   V(async_hooks_pre_function, v8::Function)                                   \
   V(async_hooks_post_function, v8::Function)                                  \
+  V(async_hooks_destroy_function, v8::Function)                               \
   V(binding_cache_object, v8::Object)                                         \
   V(buffer_constructor_function, v8::Function)                                \
   V(buffer_prototype_object, v8::Object)                                      \
diff --git a/test/parallel/test-async-wrap-disabled-propagate-parent.js b/test/parallel/test-async-wrap-disabled-propagate-parent.js
index de36071524c4fe..70d82befe72a63 100644
--- a/test/parallel/test-async-wrap-disabled-propagate-parent.js
+++ b/test/parallel/test-async-wrap-disabled-propagate-parent.js
@@ -10,7 +10,7 @@ let cntr = 0;
 let server;
 let client;
 
-function init(type, parent) {
+function init(type, id, parent) {
   if (parent) {
     cntr++;
     // Cannot assert in init callback or will abort.
diff --git a/test/parallel/test-async-wrap-propagate-parent.js b/test/parallel/test-async-wrap-propagate-parent.js
index 8074b0062e0db2..beeb27ba7866a9 100644
--- a/test/parallel/test-async-wrap-propagate-parent.js
+++ b/test/parallel/test-async-wrap-propagate-parent.js
@@ -9,7 +9,7 @@ let cntr = 0;
 let server;
 let client;
 
-function init(type, parent) {
+function init(type, id, parent) {
   if (parent) {
     cntr++;
     // Cannot assert in init callback or will abort.

From 2498e2934495a58794bd0aa498b6297b234655f3 Mon Sep 17 00:00:00 2001
From: Roman Reiss <me@silverwind.io>
Date: Mon, 26 Oct 2015 13:30:54 +0100
Subject: [PATCH 121/323] src: Revert "nix stdin _readableState.reading"

This reverts 8cee8f5 which was causing stdin to behave strangely on
Windows 8 and 10. The suspected explanation for the issue is that there
might be a race condition occuring when stdin._readableState.reading is
set indirectly through `push('')`.

PR-URL: https://github.com/nodejs/node/pull/3490
Fixes: https://github.com/nodejs/node/issues/2996
Fixes: https://github.com/nodejs/node/issues/2504
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
---
 src/node.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/node.js b/src/node.js
index ed74480289a9da..57a803cfc44312 100644
--- a/src/node.js
+++ b/src/node.js
@@ -726,7 +726,7 @@
       // not-reading state.
       if (stdin._handle && stdin._handle.readStop) {
         stdin._handle.reading = false;
-        stdin.push('');
+        stdin._readableState.reading = false;
         stdin._handle.readStop();
       }
 
@@ -735,7 +735,7 @@
       stdin.on('pause', function() {
         if (!stdin._handle)
           return;
-        stdin.push('');
+        stdin._readableState.reading = false;
         stdin._handle.reading = false;
         stdin._handle.readStop();
       });

From 9cdceac782e0327951702cd3cd68771cf88c132e Mon Sep 17 00:00:00 2001
From: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Date: Sun, 8 Nov 2015 16:31:51 +0530
Subject: [PATCH 122/323] test: use really invalid hostname

On my slow Ubuntu 14.04 machine, this fails to resolve the host name
used (`no.way.you.will.resolve.this`) and it times out in local testing.
This patch uses an invalid name (`...`) and does stricter validation of
the error returned.

PR-URL: https://github.com/nodejs/node/pull/3711
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 .../test-net-connect-immediate-finish.js      | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/test/parallel/test-net-connect-immediate-finish.js b/test/parallel/test-net-connect-immediate-finish.js
index 086cf910422372..a5403732ec1d0d 100644
--- a/test/parallel/test-net-connect-immediate-finish.js
+++ b/test/parallel/test-net-connect-immediate-finish.js
@@ -1,21 +1,17 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
-var net = require('net');
+const common = require('../common');
+const assert = require('assert');
+const net = require('net');
 
-var gotError = false;
+const client = net.connect({host: '...', port: common.PORT});
 
-var client = net.connect({
-  host: 'no.way.you.will.resolve.this',
-  port: common.PORT
-});
-
-client.once('error', function(err) {
-  gotError = true;
-});
+client.once('error', common.mustCall(function(err) {
+  assert(err);
+  assert.strictEqual(err.code, err.errno);
+  assert.strictEqual(err.code, 'ENOTFOUND');
+  assert.strictEqual(err.host, err.hostname);
+  assert.strictEqual(err.host, '...');
+  assert.strictEqual(err.syscall, 'getaddrinfo');
+}));
 
 client.end();
-
-process.on('exit', function() {
-  assert(gotError);
-});

From 75dbafc3f8c68c6c0d8d2947b9728313cc39d5dd Mon Sep 17 00:00:00 2001
From: "Hemanth.HM" <hemanth.hm@gmail.com>
Date: Sat, 7 Nov 2015 13:48:40 +0530
Subject: [PATCH 123/323] repl: To exit, press ^C again or type .exit.

When the user hits `^C` in the REPL show more info about `.exit`.

The idea was to give more info to the user when they hit ^C.
Current version just displays `(^C again to quit)` and most
of the users are not aware of the `.exit` command that would
Exit the repl.

PR-URL: https://github.com/nodejs/node/pull/3368
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/repl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/repl.js b/lib/repl.js
index f17a9260772ebf..2da336eae8cf93 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -355,7 +355,7 @@ function REPLServer(prompt,
         sawSIGINT = false;
         return;
       }
-      self.output.write('(^C again to quit)\n');
+      self.output.write('(To exit, press ^C again or type .exit)\n');
       sawSIGINT = true;
     } else {
       sawSIGINT = false;

From a05a0b47e3790f2c4dd032b635e7bcd2cf1983bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@gmail.com>
Date: Mon, 9 Nov 2015 23:49:55 +0100
Subject: [PATCH 124/323] doc: add saghul as a collaborator

PR_URL: https://github.com/nodejs/node/pull/3724
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Myles Borins <mborins@us.ibm.com>
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 1c98e10b3f86e3..7bc38d0e73d756 100644
--- a/README.md
+++ b/README.md
@@ -367,6 +367,7 @@ information about the governance of the Node.js project, see
 * [qard](https://github.com/qard) - **Stephen Belanger** &lt;admin@stephenbelanger.com&gt;
 * [rlidwka](https://github.com/rlidwka) - **Alex Kocharin** &lt;alex@kocharin.ru&gt;
 * [robertkowalski](https://github.com/robertkowalski) - **Robert Kowalski** &lt;rok@kowalski.gd&gt;
+* [saghul](https://github.com/saghul) - **Saúl Ibarra Corretgé** &lt;saghul@gmail.com&gt;
 * [sam-github](https://github.com/sam-github) - **Sam Roberts** &lt;vieuxtech@gmail.com&gt;
 * [seishun](https://github.com/seishun) - **Nikolai Vavilov** &lt;vvnicholas@gmail.com&gt;
 * [silverwind](https://github.com/silverwind) - **Roman Reiss** &lt;me@silverwind.io&gt;

From e5b9109d12242f8652bc795ae8189d8b7f3c8fce Mon Sep 17 00:00:00 2001
From: Myles Borins <mborins@us.ibm.com>
Date: Mon, 9 Nov 2015 14:43:45 -0800
Subject: [PATCH 125/323] doc: add thealphanerd to collaborators
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/3723
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com>
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 7bc38d0e73d756..ffa7bd2aacadea 100644
--- a/README.md
+++ b/README.md
@@ -374,6 +374,7 @@ information about the governance of the Node.js project, see
 * [srl295](https://github.com/srl295) - **Steven R Loomis** &lt;srloomis@us.ibm.com&gt;
 * [targos](https://github.com/targos) - **Michaël Zasso** &lt;mic.besace@gmail.com&gt;
 * [tellnes](https://github.com/tellnes) - **Christian Tellnes** &lt;christian@tellnes.no&gt;
+* [thealphanerd](http://github.com/thealphanerd) - **Myles Borins** &lt;myles.borins@gmail.com&gt;
 * [thefourtheye](https://github.com/thefourtheye) - **Sakthipriyan Vairamani** &lt;thechargingvolcano@gmail.com&gt;
 * [thlorenz](https://github.com/thlorenz) - **Thorsten Lorenz** &lt;thlorenz@gmx.de&gt;
 * [Trott](https://github.com/Trott) - **Rich Trott** &lt;rtrott@gmail.com&gt;

From 81997840f22cae23f30b1e180216378be2eff9cd Mon Sep 17 00:00:00 2001
From: Hugues Malphettes <hmalphettes@gmail.com>
Date: Tue, 10 Nov 2015 09:50:31 +0800
Subject: [PATCH 126/323] test: fix test-module-loading-error for musl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When a compiled library file does not have the proper format,
musl returns the error message ENOEXEC as 'Exec format error' but
glibc returns 'file too short' if the file is under a certain size.

Reference:
http://git.musl-libc.org/cgit/musl/tree/src/errno/__strerror.h#n46

This patch consists of tolerating musl's error.

PR-URL: https://github.com/nodejs/node/pull/3657
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
---
 test/parallel/test-module-loading-error.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/parallel/test-module-loading-error.js b/test/parallel/test-module-loading-error.js
index 3756953a40dc3c..f2581a4df5bb9f 100644
--- a/test/parallel/test-module-loading-error.js
+++ b/test/parallel/test-module-loading-error.js
@@ -9,6 +9,7 @@ var error_desc = {
   linux: 'file too short',
   sunos: 'unknown file type'
 };
+var musl_errno_enoexec = 'Exec format error';
 
 var dlerror_msg = error_desc[process.platform];
 
@@ -20,6 +21,10 @@ if (!dlerror_msg) {
 try {
   require('../fixtures/module-loading-error.node');
 } catch (e) {
+  if (process.platform === 'linux' &&
+      e.toString().indexOf(musl_errno_enoexec) !== -1) {
+    dlerror_msg = musl_errno_enoexec;
+  }
   assert.notEqual(e.toString().indexOf(dlerror_msg), -1);
 }
 

From 5ed30da5a0b2edf8930817b8eb8f4cc5660bfc40 Mon Sep 17 00:00:00 2001
From: Roman Reiss <me@silverwind.io>
Date: Thu, 29 Oct 2015 20:22:12 +0100
Subject: [PATCH 127/323] console: use 'label' argument for time and timeEnd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Turns out the argument is actually called label in the console spec,
while being wrongly named on MDN. This reverts commit
8c043c12456d9b5a500f9cefcca27a61a1a381cf.

MDN has been updated in:

https://developer.mozilla.org/en-US/docs/Web/API/Console/timeEnd$compare?locale=en-US&to=947893&from=918571
https://developer.mozilla.org/en-US/docs/Web/API/Console/time$compare?locale=en-US&to=947891&from=896987

PR-URL: https://github.com/nodejs/node/pull/3590
Reviewed-By: targos - Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/console.markdown |  8 ++++----
 lib/console.js           | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/api/console.markdown b/doc/api/console.markdown
index 6e2de6071e64a2..f3a69ce95104e2 100644
--- a/doc/api/console.markdown
+++ b/doc/api/console.markdown
@@ -72,18 +72,18 @@ object. This is useful for inspecting large complicated objects. Defaults to
 - `colors` - if `true`, then the output will be styled with ANSI color codes.
 Defaults to `false`. Colors are customizable, see below.
 
-### console.time(timerName)
+### console.time(label)
 
 Starts a timer that can be used to compute the duration of an operation. Timers
 are identified by a unique name. Use the same name when you call
-[`console.timeEnd()`](#console_console_timeend_timername) to stop the timer and
+[`console.timeEnd()`](#console_console_timeend_label) to stop the timer and
 output the elapsed time in milliseconds. Timer durations are accurate to the
 sub-millisecond.
 
-### console.timeEnd(timerName)
+### console.timeEnd(label)
 
 Stops a timer that was previously started by calling
-[`console.time()`](#console_console_time_timername) and prints the result to the
+[`console.time()`](#console_console_time_label) and prints the result to the
 console.
 
 Example:
diff --git a/lib/console.js b/lib/console.js
index d2b4f3fc5b59be..531a383876ce2b 100644
--- a/lib/console.js
+++ b/lib/console.js
@@ -55,19 +55,19 @@ Console.prototype.dir = function(object, options) {
 };
 
 
-Console.prototype.time = function(timerName) {
-  this._times.set(timerName, process.hrtime());
+Console.prototype.time = function(label) {
+  this._times.set(label, process.hrtime());
 };
 
 
-Console.prototype.timeEnd = function(timerName) {
-  var time = this._times.get(timerName);
+Console.prototype.timeEnd = function(label) {
+  var time = this._times.get(label);
   if (!time) {
-    throw new Error('No such timer name: ' + timerName);
+    throw new Error('No such label: ' + label);
   }
   const duration = process.hrtime(time);
   const ms = duration[0] * 1000 + duration[1] / 1e6;
-  this.log('%s: %sms', timerName, ms.toFixed(3));
+  this.log('%s: %sms', label, ms.toFixed(3));
 };
 
 

From 1c8a7c63517c15ca2262325830a93852b36bdbac Mon Sep 17 00:00:00 2001
From: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Date: Fri, 28 Aug 2015 20:08:39 +0530
Subject: [PATCH 128/323] test: enhance fs-watch-recursive test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch

  - issues a TAP plugin parsable message on non darwin/windows boxes
  - uses `const` wherever applicable
  - moves the test to parallel

PR-URL: https://github.com/nodejs/node/pull/2599
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/parallel/test-fs-watch-recursive.js   | 43 ++++++++++++++++++
 test/sequential/test-fs-watch-recursive.js | 51 ----------------------
 2 files changed, 43 insertions(+), 51 deletions(-)
 create mode 100644 test/parallel/test-fs-watch-recursive.js
 delete mode 100644 test/sequential/test-fs-watch-recursive.js

diff --git a/test/parallel/test-fs-watch-recursive.js b/test/parallel/test-fs-watch-recursive.js
new file mode 100644
index 00000000000000..9c68b5e3557242
--- /dev/null
+++ b/test/parallel/test-fs-watch-recursive.js
@@ -0,0 +1,43 @@
+'use strict';
+
+const common = require('../common');
+
+if (!(process.platform === 'darwin' || common.isWindows)) {
+  console.log('1..0 # Skipped: recursive option is darwin/windows specific');
+  return;
+}
+
+const assert = require('assert');
+const path = require('path');
+const fs = require('fs');
+
+const testDir = common.tmpDir;
+const filenameOne = 'watch.txt';
+const testsubdirName = 'testsubdir';
+const testsubdir = path.join(testDir, testsubdirName);
+const relativePathOne = path.join('testsubdir', filenameOne);
+const filepathOne = path.join(testsubdir, filenameOne);
+
+common.refreshTmpDir();
+
+fs.mkdirSync(testsubdir, 0o700);
+
+const watcher = fs.watch(testDir, {recursive: true});
+
+var watcherClosed = false;
+watcher.on('change', function(event, filename) {
+  assert.ok('change' === event || 'rename' === event);
+
+  // Ignore stale events generated by mkdir and other tests
+  if (filename !== relativePathOne)
+    return;
+
+  watcher.close();
+  watcherClosed = true;
+});
+
+fs.writeFileSync(filepathOne, 'world');
+
+process.on('exit', function() {
+  assert(watcherClosed, 'watcher Object was not closed');
+});
diff --git a/test/sequential/test-fs-watch-recursive.js b/test/sequential/test-fs-watch-recursive.js
deleted file mode 100644
index 3e6e4b44f4ed24..00000000000000
--- a/test/sequential/test-fs-watch-recursive.js
+++ /dev/null
@@ -1,51 +0,0 @@
-'use strict';
-var common = require('../common');
-var assert = require('assert');
-var path = require('path');
-var fs = require('fs');
-
-if (process.platform === 'darwin' || common.isWindows) {
-  var watchSeenOne = 0;
-
-  var testDir = common.tmpDir;
-
-  var filenameOne = 'watch.txt';
-  var testsubdirName = 'testsubdir';
-  var testsubdir = path.join(testDir, testsubdirName);
-  var relativePathOne = path.join('testsubdir', filenameOne);
-  var filepathOne = path.join(testsubdir, filenameOne);
-
-  common.refreshTmpDir();
-
-  process.on('exit', function() {
-    assert.ok(watchSeenOne > 0);
-  });
-
-  function cleanup() {
-    try { fs.unlinkSync(filepathOne); } catch (e) { }
-    try { fs.rmdirSync(testsubdir); } catch (e) { }
-  };
-
-  try { fs.mkdirSync(testsubdir, 0o700); } catch (e) {}
-
-  assert.doesNotThrow(function() {
-    var watcher = fs.watch(testDir, {recursive: true});
-    watcher.on('change', function(event, filename) {
-      assert.ok('change' === event || 'rename' === event);
-
-      // Ignore stale events generated by mkdir and other tests
-      if (filename !== relativePathOne)
-        return;
-
-      watcher.close();
-      cleanup();
-      ++watchSeenOne;
-    });
-  });
-
-  setTimeout(function() {
-    fs.writeFileSync(filepathOne, 'world');
-  }, 10);
-} else {
-  console.log('1..0 # Skipped: recursive option is darwin/windows specific');
-}

From ac9e4ffe8e4861be742c567deed7669e99bd8966 Mon Sep 17 00:00:00 2001
From: Junliang Yan <jyan@ca.ibm.com>
Date: Fri, 6 Nov 2015 13:46:16 -0500
Subject: [PATCH 129/323] dns: prevent undefined values in results

When getaddrinfo linked-list results contain entries other than AF_INET
and AF_INET6, the resulting v8::Array will contain undefined values.
That's because initialization of v8::Array pre-allocates entries for all
linked-list nodes, but not all of them will be in the final results.
This commit ensures that the array only contains valid results.

PR-URL: https://github.com/nodejs/node/pull/3696
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 src/cares_wrap.cc | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index b004e67c4e8479..8f57dfe477cda4 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -922,19 +922,12 @@ void AfterGetAddrInfo(uv_getaddrinfo_t* req, int status, struct addrinfo* res) {
     struct addrinfo *address;
     int n = 0;
 
-    // Count the number of responses.
-    for (address = res; address; address = address->ai_next) {
-      n++;
-    }
-
     // Create the response array.
-    Local<Array> results = Array::New(env->isolate(), n);
+    Local<Array> results = Array::New(env->isolate());
 
     char ip[INET6_ADDRSTRLEN];
     const char *addr;
 
-    n = 0;
-
     // Iterate over the IPv4 responses again this time creating javascript
     // strings for each IP and filling the results array.
     address = res;

From a32d9e31dc9fcf5e29a371054748a2bc48ddb095 Mon Sep 17 00:00:00 2001
From: Roman Klauke <romaaan.git@gmail.com>
Date: Mon, 9 Nov 2015 23:52:54 +0100
Subject: [PATCH 130/323] doc: add romankl to collaborators
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/3725
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com>
Reviewed-By: Myles Borins <mborins@us.ibm.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index ffa7bd2aacadea..5870524ba0503c 100644
--- a/README.md
+++ b/README.md
@@ -367,6 +367,7 @@ information about the governance of the Node.js project, see
 * [qard](https://github.com/qard) - **Stephen Belanger** &lt;admin@stephenbelanger.com&gt;
 * [rlidwka](https://github.com/rlidwka) - **Alex Kocharin** &lt;alex@kocharin.ru&gt;
 * [robertkowalski](https://github.com/robertkowalski) - **Robert Kowalski** &lt;rok@kowalski.gd&gt;
+* [romankl](https://github.com/romankl) - **Roman Klauke** &lt;romaaan.git@gmail.com&gt;
 * [saghul](https://github.com/saghul) - **Saúl Ibarra Corretgé** &lt;saghul@gmail.com&gt;
 * [sam-github](https://github.com/sam-github) - **Sam Roberts** &lt;vieuxtech@gmail.com&gt;
 * [seishun](https://github.com/seishun) - **Nikolai Vavilov** &lt;vvnicholas@gmail.com&gt;

From 597f8751d179e79612502bda5da793ba4de1d337 Mon Sep 17 00:00:00 2001
From: Tyler Henkel <tylerhenkel@hotmail.com>
Date: Tue, 10 Nov 2015 12:33:36 -0700
Subject: [PATCH 131/323] doc: add note on tls connection meta data methods

PR-URL: https://github.com/nodejs/node/pull/3746
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 doc/api/tls.markdown | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/api/tls.markdown b/doc/api/tls.markdown
index 8e64bc98a098a2..f105614962e041 100644
--- a/doc/api/tls.markdown
+++ b/doc/api/tls.markdown
@@ -764,6 +764,10 @@ of written data and all required TLS negotiation.
 This instance implements a duplex [Stream][] interfaces.  It has all the
 common stream methods and events.
 
+Methods that return TLS connection meta data (e.g.
+[getPeerCertificate](#tlssocketgetpeercertificate-detailed-))
+will only return data while the connection is open.
+
 ### Event: 'secureConnect'
 
 This event is emitted after a new connection has been successfully handshaked.

From 02e012e984f35b10bc4d2a73831d456d9ee316c0 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 6 Nov 2015 14:15:18 -0800
Subject: [PATCH 132/323] src: force line buffering for stderr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SmartOS does not line buffer stderr by default, or at least that is the
behavior on the Node project Jenkins server. Force line buffering. This
resolves the flakiness observed on SmartOS for
test-debug-signal-cluster.

PR-URL: https://github.com/nodejs/node/pull/3701
Fixes: https://github.com/nodejs/node/issues/2476
Refs: https://github.com/nodejs/node/pull/3615
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 src/node_main.cc              | 1 +
 test/parallel/parallel.status | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node_main.cc b/src/node_main.cc
index 13a70b2d0d33d7..58e747e52c49ef 100644
--- a/src/node_main.cc
+++ b/src/node_main.cc
@@ -41,6 +41,7 @@ int wmain(int argc, wchar_t *wargv[]) {
 #else
 // UNIX
 int main(int argc, char *argv[]) {
+  setvbuf(stderr, NULL, _IOLBF, 1024);
   return node::Start(argc, argv);
 }
 #endif
diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index 69a154730658d2..9334614d5626d8 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -18,7 +18,6 @@ test-child-process-exit-code      : PASS,FLAKY
 [$system==macos]
 
 [$system==solaris] # Also applies to SmartOS
-test-debug-signal-cluster         : PASS,FLAKY
 
 [$system==freebsd]
 test-net-socket-local-address     : PASS,FLAKY

From 38bb0d864ea73faedf33baee36e9446e3f55a395 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sun, 8 Nov 2015 09:51:29 -0800
Subject: [PATCH 133/323] tools: Use `throw new Error()` consistently

In preparation for a lint rule that will enforce `throw new Error()`
over `throw Error()`, fix the handful of instances in the code that
use `throw Error()`.

PR-URL: https://github.com/nodejs/node/pull/3714
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/addons/make-callback/test.js          | 4 ++--
 test/parallel/test-assert.js               | 2 +-
 test/parallel/test-http-mutable-headers.js | 2 +-
 test/pummel/test-regress-GH-814.js         | 2 +-
 test/pummel/test-regress-GH-814_2.js       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/addons/make-callback/test.js b/test/addons/make-callback/test.js
index 80ea0db796ab30..f3c98770ef335a 100644
--- a/test/addons/make-callback/test.js
+++ b/test/addons/make-callback/test.js
@@ -40,7 +40,7 @@ assert.strictEqual(42, makeCallback(recv, 'two', 1337));
 const target = vm.runInNewContext(`
     (function($Object) {
       if (Object === $Object)
-        throw Error('bad');
+        throw new Error('bad');
       return Object;
     })
 `);
@@ -55,7 +55,7 @@ const forward = vm.runInNewContext(`
 // Runs in outer context.
 const endpoint = function($Object) {
   if (Object === $Object)
-    throw Error('bad');
+    throw new Error('bad');
   return Object;
 };
 assert.strictEqual(Object, makeCallback(process, forward, endpoint));
diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js
index db36abc184b024..7e40ecb78b80c4 100644
--- a/test/parallel/test-assert.js
+++ b/test/parallel/test-assert.js
@@ -465,6 +465,6 @@ testBlockTypeError(assert.doesNotThrow, undefined);
 
 // https://github.com/nodejs/node/issues/3275
 assert.throws(() => { throw 'error'; }, err => err === 'error');
-assert.throws(() => { throw Error(); }, err => err instanceof Error);
+assert.throws(() => { throw new Error(); }, err => err instanceof Error);
 
 console.log('All OK');
diff --git a/test/parallel/test-http-mutable-headers.js b/test/parallel/test-http-mutable-headers.js
index 2a60117328c580..af8fd6d7e8f938 100644
--- a/test/parallel/test-http-mutable-headers.js
+++ b/test/parallel/test-http-mutable-headers.js
@@ -110,7 +110,7 @@ function nextTest() {
         break;
 
       default:
-        throw Error('?');
+        throw new Error('?');
     }
 
     response.setEncoding('utf8');
diff --git a/test/pummel/test-regress-GH-814.js b/test/pummel/test-regress-GH-814.js
index 4ed4b31ae28143..820903d68873e7 100644
--- a/test/pummel/test-regress-GH-814.js
+++ b/test/pummel/test-regress-GH-814.js
@@ -46,7 +46,7 @@ var timeToQuit = Date.now() + 8e3; //Test during no more than this seconds.
     }
   }
   else {
-    throw Error("Buffer GC'ed test -> FAIL");
+    throw new Error("Buffer GC'ed test -> FAIL");
   }
 
   if (Date.now() < timeToQuit) {
diff --git a/test/pummel/test-regress-GH-814_2.js b/test/pummel/test-regress-GH-814_2.js
index 9de1a2c3f3b86b..d7c6d947919d59 100644
--- a/test/pummel/test-regress-GH-814_2.js
+++ b/test/pummel/test-regress-GH-814_2.js
@@ -21,7 +21,7 @@ function tailCB(data) {
     console.error('[FAIL]\n DATA -> ');
     console.error(data);
     console.error('\n');
-    throw Error('Buffers GC test -> FAIL');
+    throw new Error('Buffers GC test -> FAIL');
   }
 }
 

From d036b3534963dc6f3b5d688df33ea21d049e0543 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sun, 8 Nov 2015 09:53:50 -0800
Subject: [PATCH 134/323] tools: enforce `throw new Error()` with lint rule

Add linting rule requiring `throw new Error()` over `throw Error()`.

PR-URL: https://github.com/nodejs/node/pull/3714
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 .eslintrc                            |  2 ++
 tools/eslint-rules/new-with-error.js | 36 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 tools/eslint-rules/new-with-error.js

diff --git a/.eslintrc b/.eslintrc
index 1d14b72abb2bf3..bf3fc3378f2d92 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -87,6 +87,8 @@ rules:
 
   # Custom rules in tools/eslint-rules
   require-buffer: 2
+  new-with-error: [2, "Error", "RangeError", "TypeError", "SyntaxError", "ReferenceError"]
+
 
 # Global scoped method and vars
 globals:
diff --git a/tools/eslint-rules/new-with-error.js b/tools/eslint-rules/new-with-error.js
new file mode 100644
index 00000000000000..b0f550db2ffa2c
--- /dev/null
+++ b/tools/eslint-rules/new-with-error.js
@@ -0,0 +1,36 @@
+/**
+ * @fileoverview Require `throw new Error()` rather than `throw Error()`
+ * @author Rich Trott
+ */
+'use strict';
+
+//------------------------------------------------------------------------------
+// Rule Definition
+//------------------------------------------------------------------------------
+
+module.exports = function(context) {
+
+  var errorList = context.options.length !== 0 ? context.options : ['Error'];
+
+  return {
+    'ThrowStatement': function(node) {
+      if (node.argument.type === 'CallExpression' &&
+          errorList.indexOf(node.argument.callee.name) !== -1) {
+        context.report(node, 'Use new keyword when throwing.');
+      }
+    }
+  };
+};
+
+module.exports.schema = {
+  'type': 'array',
+  'items': [
+    {
+      'enum': [0, 1, 2]
+    }
+  ],
+  'additionalItems': {
+    'type': 'string'
+  },
+  'uniqueItems': true
+};

From 9ef81ff5d3cf86ced06e1300143afa57362db4c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <mic.besace@gmail.com>
Date: Fri, 6 Nov 2015 21:12:49 +0100
Subject: [PATCH 135/323] deps: update V8 to 4.6.85.31

This update contains the patch floated in
https://github.com/nodejs/node/issues/3390 and a fix for
Intl.NumberFormat.

Diff: https://chromium.googlesource.com/v8/v8.git/+/4.6.85.28..4.6.85.31

PR-URL: https://github.com/nodejs/node/pull/3698
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
---
 deps/v8/include/v8-version.h                  |  2 +-
 deps/v8/src/arm64/lithium-codegen-arm64.cc    |  2 +
 deps/v8/src/i18n.js                           |  7 +--
 .../check-minimum-fraction-digits.js          | 52 ++++++++++++++++++-
 .../regress/regress-arm64-spillslots.js       | 34 ++++++++++++
 5 files changed, 91 insertions(+), 6 deletions(-)
 create mode 100644 deps/v8/test/mjsunit/regress/regress-arm64-spillslots.js

diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h
index 3cbc65c53aaa55..7744c089f68ce0 100644
--- a/deps/v8/include/v8-version.h
+++ b/deps/v8/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 4
 #define V8_MINOR_VERSION 6
 #define V8_BUILD_NUMBER 85
-#define V8_PATCH_LEVEL 28
+#define V8_PATCH_LEVEL 31
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
diff --git a/deps/v8/src/arm64/lithium-codegen-arm64.cc b/deps/v8/src/arm64/lithium-codegen-arm64.cc
index 3dff64cbe84ce9..32650e7ab0fc79 100644
--- a/deps/v8/src/arm64/lithium-codegen-arm64.cc
+++ b/deps/v8/src/arm64/lithium-codegen-arm64.cc
@@ -2819,6 +2819,8 @@ void LCodeGen::DoDoubleToIntOrSmi(LDoubleToIntOrSmi* instr) {
 
 void LCodeGen::DoDrop(LDrop* instr) {
   __ Drop(instr->count());
+
+  RecordPushedArgumentsDelta(instr->hydrogen_value()->argument_delta());
 }
 
 
diff --git a/deps/v8/src/i18n.js b/deps/v8/src/i18n.js
index 5fd32c8b407fd7..b825ece6bcde80 100644
--- a/deps/v8/src/i18n.js
+++ b/deps/v8/src/i18n.js
@@ -1103,14 +1103,15 @@ function initializeNumberFormat(numberFormat, locales, options) {
 
   var mnfd = options['minimumFractionDigits'];
   var mxfd = options['maximumFractionDigits'];
-  if (!IS_UNDEFINED(mnfd) || !internalOptions.style === 'currency') {
+  if (!IS_UNDEFINED(mnfd) || internalOptions.style !== 'currency') {
     mnfd = getNumberOption(options, 'minimumFractionDigits', 0, 20, 0);
     defineWEProperty(internalOptions, 'minimumFractionDigits', mnfd);
   }
 
-  if (!IS_UNDEFINED(mxfd) || !internalOptions.style === 'currency') {
+  if (!IS_UNDEFINED(mxfd) || internalOptions.style !== 'currency') {
+    var min_mxfd = internalOptions.style === 'percent' ? 0 : 3;
     mnfd = IS_UNDEFINED(mnfd) ? 0 : mnfd;
-    fallback_limit = (mnfd > 3) ? mnfd : 3;
+    fallback_limit = (mnfd > min_mxfd) ? mnfd : min_mxfd;
     mxfd = getNumberOption(options, 'maximumFractionDigits', mnfd, 20, fallback_limit);
     defineWEProperty(internalOptions, 'maximumFractionDigits', mxfd);
   }
diff --git a/deps/v8/test/intl/number-format/check-minimum-fraction-digits.js b/deps/v8/test/intl/number-format/check-minimum-fraction-digits.js
index 57e65be55e2252..b7d41dfca1a030 100755
--- a/deps/v8/test/intl/number-format/check-minimum-fraction-digits.js
+++ b/deps/v8/test/intl/number-format/check-minimum-fraction-digits.js
@@ -2,8 +2,56 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Make sure minimumFractionDigits is honored
+// Make sure minimumFractionDigits and maximumFractionDigits are honored
 
-var nf = new Intl.NumberFormat("en-us",{ useGrouping: false, minimumFractionDigits: 4});
+var nf = new Intl.NumberFormat("en-us", { useGrouping: false, minimumFractionDigits: 4, maximumFractionDigits: 8});
 
 assertEquals("12345.6789", nf.format(12345.6789));
+assertEquals("12345.678912", nf.format(12345.678912));
+assertEquals("12345.6700", nf.format(12345.67));
+assertEquals("12345.67891234", nf.format(12345.6789123421));
+
+nf = new Intl.NumberFormat("en-us", { useGrouping: false, minimumFractionDigits: 4, maximumFractionDigits: 8, style: 'percent'});
+
+assertEquals("12345.6789%", nf.format(123.456789));
+assertEquals("12345.678912%", nf.format(123.45678912));
+assertEquals("12345.6700%", nf.format(123.4567));
+assertEquals("12345.67891234%", nf.format(123.456789123421));
+
+nf = new Intl.NumberFormat('en', {minimumFractionDigits: 4, maximumFractionDigits: 8, style: 'currency', currency: 'USD'});
+
+assertEquals("$54,306.404797", nf.format(54306.4047970));
+assertEquals("$54,306.4000", nf.format(54306.4));
+assertEquals("$54,306.40000001", nf.format(54306.400000011));
+
+// Ensure that appropriate defaults exist when minimum and maximum are not specified
+
+nf = new Intl.NumberFormat("en-us", { useGrouping: false });
+
+assertEquals("12345.679", nf.format(12345.6789));
+assertEquals("12345.679", nf.format(12345.678912));
+assertEquals("12345.67", nf.format(12345.6700));
+assertEquals("12345", nf.format(12345));
+assertEquals("12345.679", nf.format(12345.6789123421));
+
+nf = new Intl.NumberFormat("en-us", { useGrouping: false, style: 'percent'});
+
+assertEquals("12346%", nf.format(123.456789));
+assertEquals("12346%", nf.format(123.45678912));
+assertEquals("12346%", nf.format(123.456700));
+assertEquals("12346%", nf.format(123.456789123421));
+assertEquals("12345%", nf.format(123.45));
+
+// For currency, the minimum or the maximum can be overwritten individually
+
+nf = new Intl.NumberFormat('en', {minimumFractionDigits: 0, style: 'currency', currency: 'USD'});
+
+assertEquals("$54,306.4", nf.format(54306.4047970));
+assertEquals("$54,306.4", nf.format(54306.4));
+assertEquals("$54,306", nf.format(54306));
+
+nf = new Intl.NumberFormat('en', {maximumFractionDigits: 3, style: 'currency', currency: 'USD'});
+
+assertEquals("$54,306.405", nf.format(54306.4047970));
+assertEquals("$54,306.40", nf.format(54306.4));
+assertEquals("$54,306.00", nf.format(54306));
diff --git a/deps/v8/test/mjsunit/regress/regress-arm64-spillslots.js b/deps/v8/test/mjsunit/regress/regress-arm64-spillslots.js
new file mode 100644
index 00000000000000..1791b248431186
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-arm64-spillslots.js
@@ -0,0 +1,34 @@
+// Copyright 2015 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --allow-natives-syntax
+
+"use strict";
+
+function Message(message) {
+  this.message = message;
+}
+
+function Inlined(input) {
+  var dummy = arguments[1] === undefined;
+  if (input instanceof Message) {
+    return input;
+  }
+  print("unreachable, but we must create register allocation complexity");
+  return [];
+}
+
+function Process(input) {
+  var ret = [];
+  ret.push(Inlined(input[0], 1, 2));
+  return ret;
+}
+
+var input = [new Message("TEST PASS")];
+
+Process(input);
+Process(input);
+%OptimizeFunctionOnNextCall(Process);
+var result = Process(input);
+assertEquals("TEST PASS", result[0].message);

From 47f3735e8889c01fe02a9737da6c9b28c0637d0a Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Mon, 9 Nov 2015 15:08:50 -0500
Subject: [PATCH 136/323] cluster: send suicide message on disconnect

This commit causes Worker.prototype.disconnect() to send a
suicide message to the cluster master. The function is also
restructured to eliminate redundant code.

Fixes: https://github.com/nodejs/node/issues/3238
PR-URL: https://github.com/nodejs/node/pull/3720
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/cluster.js                        | 22 ++++++++++------------
 test/parallel/test-regress-GH-3238.js | 21 +++++++++++++++++++++
 2 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 test/parallel/test-regress-GH-3238.js

diff --git a/lib/cluster.js b/lib/cluster.js
index 550a17bed9fc8d..f202f25cdd522a 100644
--- a/lib/cluster.js
+++ b/lib/cluster.js
@@ -654,26 +654,24 @@ function workerInit() {
 
   Worker.prototype.disconnect = function() {
     this.suicide = true;
-    var waitingHandles = 0;
+    let waitingCount = 1;
 
-    function checkRemainingHandles() {
-      waitingHandles--;
-      if (waitingHandles === 0) {
+    function checkWaitingCount() {
+      waitingCount--;
+      if (waitingCount === 0) {
+        send({ act: 'suicide' });
         process.disconnect();
       }
     }
 
-    for (var key in handles) {
-      var handle = handles[key];
+    for (const key in handles) {
+      const handle = handles[key];
       delete handles[key];
-      waitingHandles++;
-      handle.owner.close(checkRemainingHandles);
-    }
-
-    if (waitingHandles === 0) {
-      process.disconnect();
+      waitingCount++;
+      handle.owner.close(checkWaitingCount);
     }
 
+    checkWaitingCount();
   };
 
   Worker.prototype.destroy = function() {
diff --git a/test/parallel/test-regress-GH-3238.js b/test/parallel/test-regress-GH-3238.js
new file mode 100644
index 00000000000000..a92a09db5fe4b1
--- /dev/null
+++ b/test/parallel/test-regress-GH-3238.js
@@ -0,0 +1,21 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const cluster = require('cluster');
+
+if (cluster.isMaster) {
+  const worker = cluster.fork();
+  let disconnected = false;
+
+  worker.on('disconnect', common.mustCall(function() {
+    assert.strictEqual(worker.suicide, true);
+    disconnected = true;
+  }));
+
+  worker.on('exit', common.mustCall(function() {
+    assert.strictEqual(worker.suicide, true);
+    assert.strictEqual(disconnected, true);
+  }));
+} else {
+  cluster.worker.disconnect();
+}

From 2aa6a6d998ed2f13e7a1bc79421f9d4356f5190e Mon Sep 17 00:00:00 2001
From: Zheng Chaoping <zbinlin@gmail.com>
Date: Wed, 11 Nov 2015 00:57:11 +0800
Subject: [PATCH 137/323] fs: return null error on readFile() success

This commit ensures that readFile() callsback with a null
error consistently on success.

PR-URL: https://github.com/nodejs/node/pull/3740
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
---
 lib/fs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fs.js b/lib/fs.js
index 22e00c703020d3..8a0de7ccf14fcd 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -405,7 +405,7 @@ function readFileAfterClose(err) {
 }
 
 function tryToString(buf, encoding, callback) {
-  var e;
+  var e = null;
   try {
     buf = buf.toString(encoding);
   } catch (err) {

From da911f158b56a775756f10f3d957f1e8d08ef9b9 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Wed, 4 Nov 2015 16:59:59 -0800
Subject: [PATCH 138/323] doc: update lts description in the collaborator guide

PR-URL: https://github.com/nodejs/node/pull/3668
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
---
 COLLABORATOR_GUIDE.md | 84 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 68 insertions(+), 16 deletions(-)

diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md
index 6b718b887b7f42..4475a910ff85d5 100644
--- a/COLLABORATOR_GUIDE.md
+++ b/COLLABORATOR_GUIDE.md
@@ -240,14 +240,48 @@ You can find more information [in the full LTS plan](https://github.com/nodejs/l
 
 #### How does LTS work?
 
-Once a stable branch enters LTS, no new features may be added to that release. Changes are
-limited to bug fixes, security updates, possible npm updates, documentation updates, and certain
-performance improvements that can be demonstrated to not break existing applications.
-Semver-minor changes are only permitted if required for bug fixes. Semver-major changes are only
-permitted if required for critical security and bug fixes.
-
-Once a stable branch moves into Maintenance mode, only **critical** bugs, **critical** security fixes,
-and documentation updates will be permitted.
+Once a stable branch enters LTS, changes in that branch are limited to bug
+fixes, security updates, possible npm updates, documentation updates, and
+certain performance improvements that can be demonstrated to not break existing
+applications. Semver-minor changes are only permitted if required for bug fixes
+and then only on a case-by-case basis with LTS WG and possibly Core Technical
+Committee (CTC) review. Semver-major changes are permitted only if required for
+security related fixes.
+
+Once a stable branch moves into Maintenance mode, only **critical** bugs,
+**critical** security fixes, and documentation updates will be permitted.
+
+#### Landing semver-minor commits in LTS
+
+The default policy is to not land semver-minor or higher commits in any LTS
+branch. However, the LTS WG or CTC can evaluate any individual semver-minor
+commit and decide whether a special exception ought to be made. It is
+expected that such exceptions would be evaluated, in part, on the scope
+and impact of the changes on the code, the risk to ecosystem stability
+incurred by accepting the change, and the expected benefit that landing the
+commit will have for the ecosystem.
+
+Any collaborator who feels a semver-minor commit should be landed in an LTS
+branch should attach the `lts-agenda` label to the pull request. The LTS WG
+will discuss the issue and, if necessary, will escalate the issue up to the
+CTC for further discussion.
+
+#### How are LTS Branches Managed?
+
+There are currently three LTS branches: `v4.x`, `v0.10`, and `v0.12`. Each
+of these is paired with a "staging" branch: `v4.x-staging`, `v0.10-staging`,
+and `v0.12-staging`.
+
+As commits land in `master`, they are cherry-picked back to each staging
+branch as appropriate. If the commit applies only to the LTS branch, the
+PR must be opened against the *staging* branch. Commits are selectively
+pulled from the staging branch into the LTS branch only when a release is
+being prepared and may be pulled into the LTS branch in a different order
+than they were landed in staging.
+
+Any collaborator may land commits into a staging branch, but only the release
+team should land commits into the LTS branch while preparing a new
+LTS release.
 
 #### How can I help?
 
@@ -255,14 +289,32 @@ When you send your pull request, consider including information about
 whether your change is breaking. If you think your patch can be backported,
 please feel free to include that information in the PR thread.
 
-#### Who is doing the backporting?
-
-The current plan is for commits to cherry pick into a staging branch (e.g. v4.x-staging),
-which can be done by anyone. The preference would be for the individual landing the commit
-on master to backport to staging branches if it is appropriate.
+Several LTS related issue and PR labels have been provided:
+
+* `lts-watch-v4.x` - tells the LTS WG that the issue/PR needs to be considered
+  for landing in the `v4.x-staging` branch.
+* `lts-watch-v0.10` - tells the LTS WG that the issue/PR needs to be considered
+  for landing in the `v0.10-staging` branch.
+* `lts-watch-v0.12` - tells the LTS WG that the issue/PR needs to be considered
+  for landing in the `v0.12-staging` branch.
+* `land-on-v4.x` - tells the release team that the commit should be landed
+  in a future v4.x release
+* `land-on-v0.10` - tells the release team that the commit should be landed
+  in a future v0.10 release
+* `land-on-v0.12` - tells the release team that the commit should be landed
+  in a future v0.12 release
+
+Any collaborator can attach these labels to any PR/issue. As commits are
+landed into the staging branches, the `lts-watch-` label will be removed.
+Likewise, as commits are landed in a LTS release, the `land-on-` label will
+be removed.
+
+Collaborators are encouraged to help the LTS WG by attaching the appropriate
+`lts-watch-` label to any PR that may impact an LTS release.
 
 #### How is an LTS release cut?
 
-When the LTS working group determines that a new LTS release is required, selected commits
-will be picked from the staging branch to be included in the release. This process of making
-a release will be a collaboration between the LTS working group and the Release team.
+When the LTS working group determines that a new LTS release is required,
+selected commits will be picked from the staging branch to be included in the
+release. This process of making a release will be a collaboration between the
+LTS working group and the Release team.

From bea35424a2e63843c2a55fd86f8958f442ef246c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Bergstr=C3=B6m?= <bugs@bergstroem.nu>
Date: Tue, 20 Oct 2015 21:24:53 +1100
Subject: [PATCH 139/323] tools: add tap output to cpplint

Implement a crude TAP13 writer for cpplint. Does its job and
not much else. Only supports writing TAP output to file,
not vs7 or emacs formats.

PR-URL: https://github.com/nodejs/node/pull/3448
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
---
 tools/cpplint.py | 59 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 48 insertions(+), 11 deletions(-)

diff --git a/tools/cpplint.py b/tools/cpplint.py
index 4c4f577b34c9d7..3019395d62df84 100644
--- a/tools/cpplint.py
+++ b/tools/cpplint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/env python
 #
 # Copyright (c) 2009 Google Inc. All rights reserved.
 #
@@ -88,7 +88,8 @@
 import string
 import sys
 import unicodedata
-
+import logging
+logger = logging.getLogger('testrunner')
 
 _USAGE = """
 Syntax: cpplint.py [--verbose=#] [--output=vs7] [--filter=-x,+y,...]
@@ -139,6 +140,9 @@
       the top-level categories like 'build' and 'whitespace' will
       also be printed. If 'detailed' is provided, then a count
       is provided for each category like 'build/class'.
+
+    logfile=filename
+      Write TAP output to a logfile.
 """
 
 # We categorize each error message we print.  Here are the categories.
@@ -541,6 +545,11 @@ def SetFilters(self, filters):
         raise ValueError('Every filter in --filters must start with + or -'
                          ' (%s does not)' % filt)
 
+  def setOutputFile(self, filename):
+    """attempts to create a file which we write output to."""
+    fh = logging.FileHandler(filename, mode='wb')
+    logger.addHandler(fh)
+
   def ResetErrorCounts(self):
     """Sets the module's error statistic back to zero."""
     self.error_count = 0
@@ -558,10 +567,11 @@ def IncrementErrorCount(self, category):
 
   def PrintErrorCounts(self):
     """Print a summary of errors by category, and the total."""
-    for category, count in self.errors_by_category.iteritems():
-      sys.stderr.write('Category \'%s\' errors found: %d\n' %
-                       (category, count))
-    sys.stderr.write('Total errors found: %d\n' % self.error_count)
+    if not _cpplint_state.output_format == 'tap':
+      for category, count in self.errors_by_category.iteritems():
+        sys.stderr.write('Category \'%s\' errors found: %d\n' %
+                         (category, count))
+      sys.stderr.write('Total errors found: %d\n' % self.error_count)
 
 _cpplint_state = _CppLintState()
 
@@ -608,6 +618,9 @@ def _SetFilters(filters):
   """
   _cpplint_state.SetFilters(filters)
 
+def _setOutputFile(filename):
+  _cpplint_state.setOutputFile(filename)
+
 
 class _FunctionState(object):
   """Tracks current function name and the number of lines in its body."""
@@ -786,6 +799,15 @@ def Error(filename, linenum, category, confidence, message):
     if _cpplint_state.output_format == 'vs7':
       sys.stderr.write('%s(%s):  %s  [%s] [%d]\n' % (
           filename, linenum, message, category, confidence))
+    elif _cpplint_state.output_format == 'tap':
+      template = ('not ok %s\n'
+        '  ---\n'
+        '  message: %s\n'
+        '  data:\n'
+        '    line: %d\n'
+        '    ruleId: %s\n'
+        '  ...')
+      logger.info(template % (filename, message, linenum, category))
     else:
       sys.stderr.write('%s:%s:  %s  [%s] [%d]\n' % (
           filename, linenum, message, category, confidence))
@@ -2069,7 +2091,7 @@ def CheckStyle(filename, clean_lines, linenum, file_extension, error):
     initial_spaces += 1
   if line and line[-1].isspace():
     error(filename, linenum, 'whitespace/end_of_line', 4,
-          'Line ends in whitespace.  Consider deleting these extra spaces.')
+          'Line ends in whitespace. Consider deleting these extra spaces.')
   # There are certain situations we allow one space, notably for labels
   elif ((initial_spaces == 1 or initial_spaces == 3) and
         not Match(r'\s*\w+\s*:\s*$', cleansed_line)):
@@ -3002,7 +3024,8 @@ def ProcessFile(filename, vlevel):
             'One or more unexpected \\r (^M) found;'
             'better to use only a \\n')
 
-  sys.stderr.write('Done processing %s\n' % filename)
+  if not _cpplint_state.output_format == 'tap':
+    sys.stderr.write('Done processing %s\n' % filename)
 
 
 def PrintUsage(message):
@@ -3041,7 +3064,8 @@ def ParseArguments(args):
   try:
     (opts, filenames) = getopt.getopt(args, '', ['help', 'output=', 'verbose=',
                                                  'counting=',
-                                                 'filter='])
+                                                 'filter=',
+                                                 'logfile='])
   except getopt.GetoptError:
     PrintUsage('Invalid arguments.')
 
@@ -3049,13 +3073,14 @@ def ParseArguments(args):
   output_format = _OutputFormat()
   filters = ''
   counting_style = ''
+  output_filename = ''
 
   for (opt, val) in opts:
     if opt == '--help':
       PrintUsage(None)
     elif opt == '--output':
-      if not val in ('emacs', 'vs7'):
-        PrintUsage('The only allowed output formats are emacs and vs7.')
+      if not val in ('emacs', 'vs7', 'tap'):
+        PrintUsage('The only allowed output formats are emacs, vs7 and tap.')
       output_format = val
     elif opt == '--verbose':
       verbosity = int(val)
@@ -3067,6 +3092,8 @@ def ParseArguments(args):
       if val not in ('total', 'toplevel', 'detailed'):
         PrintUsage('Valid counting options are total, toplevel, and detailed')
       counting_style = val
+    elif opt == '--logfile':
+      output_filename = val
 
   if not filenames:
     PrintUsage('No files were specified.')
@@ -3075,6 +3102,8 @@ def ParseArguments(args):
   _SetVerboseLevel(verbosity)
   _SetFilters(filters)
   _SetCountingStyle(counting_style)
+  if output_filename:
+    _setOutputFile(output_filename)
 
   return filenames
 
@@ -3089,6 +3118,14 @@ def main():
                                          codecs.getwriter('utf8'),
                                          'replace')
 
+
+  ch = logging.StreamHandler(sys.stdout)
+  logger.addHandler(ch)
+  logger.setLevel(logging.INFO)
+
+  if _cpplint_state.output_format == 'tap':
+    logger.info('TAP version 13')
+
   _cpplint_state.ResetErrorCounts()
   for filename in filenames:
     ProcessFile(filename, _cpplint_state.verbose_level)

From 59077acc3de08203097b9e216180015943de4c8a Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Wed, 11 Nov 2015 14:32:06 -0500
Subject: [PATCH 140/323] deps: cherry-pick 68e89fb from v8's upstream

Original commit message:

    This commit adds some postmortem data that is otherwise unavailable.

    I have discovered need in those values when writing:

    https://github.com/indutny/llnode

    BUG=

    Review URL: https://codereview.chromium.org/1436473002

    Cr-Commit-Position: refs/heads/master@{#31947}

This postmortem information is useful for both object inspection, and
function's context variables inspection.

PR-URL: https://github.com/nodejs/node/pull/3779
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 deps/v8/tools/gen-postmortem-metadata.py | 47 ++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/deps/v8/tools/gen-postmortem-metadata.py b/deps/v8/tools/gen-postmortem-metadata.py
index 75694cf5357052..5c0350e34e0314 100644
--- a/deps/v8/tools/gen-postmortem-metadata.py
+++ b/deps/v8/tools/gen-postmortem-metadata.py
@@ -98,6 +98,30 @@
         'value': 'PropertyDetails::FieldIndexField::kMask' },
     { 'name': 'prop_index_shift',
         'value': 'PropertyDetails::FieldIndexField::kShift' },
+    { 'name': 'prop_representation_mask',
+        'value': 'PropertyDetails::RepresentationField::kMask' },
+    { 'name': 'prop_representation_shift',
+        'value': 'PropertyDetails::RepresentationField::kShift' },
+    { 'name': 'prop_representation_integer8',
+        'value': 'Representation::Kind::kInteger8' },
+    { 'name': 'prop_representation_uinteger8',
+        'value': 'Representation::Kind::kUInteger8' },
+    { 'name': 'prop_representation_integer16',
+        'value': 'Representation::Kind::kInteger16' },
+    { 'name': 'prop_representation_uinteger16',
+        'value': 'Representation::Kind::kUInteger16' },
+    { 'name': 'prop_representation_smi',
+        'value': 'Representation::Kind::kSmi' },
+    { 'name': 'prop_representation_integer32',
+        'value': 'Representation::Kind::kInteger32' },
+    { 'name': 'prop_representation_double',
+        'value': 'Representation::Kind::kDouble' },
+    { 'name': 'prop_representation_heapobject',
+        'value': 'Representation::Kind::kHeapObject' },
+    { 'name': 'prop_representation_tagged',
+        'value': 'Representation::Kind::kTagged' },
+    { 'name': 'prop_representation_external',
+        'value': 'Representation::Kind::kExternal' },
 
     { 'name': 'prop_desc_key',
         'value': 'DescriptorArray::kDescriptorKey' },
@@ -121,6 +145,10 @@
         'value': 'Map::ElementsKindBits::kShift' },
     { 'name': 'bit_field3_dictionary_map_shift',
         'value': 'Map::DictionaryMap::kShift' },
+    { 'name': 'bit_field3_number_of_own_descriptors_mask',
+        'value': 'Map::NumberOfOwnDescriptorsBits::kMask' },
+    { 'name': 'bit_field3_number_of_own_descriptors_shift',
+        'value': 'Map::NumberOfOwnDescriptorsBits::kShift' },
 
     { 'name': 'off_fp_context',
         'value': 'StandardFrameConstants::kContextOffset' },
@@ -139,14 +167,31 @@
         'value': 'ScopeInfo::kStackLocalCount' },
     { 'name': 'scopeinfo_idx_ncontextlocals',
         'value': 'ScopeInfo::kContextLocalCount' },
+    { 'name': 'scopeinfo_idx_ncontextglobals',
+        'value': 'ScopeInfo::kContextGlobalCount' },
     { 'name': 'scopeinfo_idx_first_vars',
         'value': 'ScopeInfo::kVariablePartIndex' },
+
+    { 'name': 'sharedfunctioninfo_start_position_mask',
+        'value': 'SharedFunctionInfo::kStartPositionMask' },
+    { 'name': 'sharedfunctioninfo_start_position_shift',
+        'value': 'SharedFunctionInfo::kStartPositionShift' },
+
+    { 'name': 'jsarray_buffer_was_neutered_mask',
+        'value': 'JSArrayBuffer::WasNeutered::kMask' },
+    { 'name': 'jsarray_buffer_was_neutered_shift',
+        'value': 'JSArrayBuffer::WasNeutered::kShift' },
 ];
 
 #
 # The following useful fields are missing accessors, so we define fake ones.
 #
 extras_accessors = [
+    'JSFunction, context, Context, kContextOffset',
+    'Context, closure_index, int, CLOSURE_INDEX',
+    'Context, global_object_index, int, GLOBAL_OBJECT_INDEX',
+    'Context, previous_index, int, PREVIOUS_INDEX',
+    'Context, min_context_slots, int, MIN_CONTEXT_SLOTS',
     'HeapObject, map, Map, kMapOffset',
     'JSObject, elements, Object, kElementsOffset',
     'FixedArray, data, uintptr_t, kHeaderSize',
@@ -162,6 +207,7 @@
     'Map, prototype, Object, kPrototypeOffset',
     'NameDictionaryShape, prefix_size, int, kPrefixSize',
     'NameDictionaryShape, entry_size, int, kEntrySize',
+    'NameDictionary, prefix_start_index, int, kPrefixStartIndex',
     'SeededNumberDictionaryShape, prefix_size, int, kPrefixSize',
     'UnseededNumberDictionaryShape, prefix_size, int, kPrefixSize',
     'NumberDictionaryShape, entry_size, int, kEntrySize',
@@ -173,6 +219,7 @@
     'SeqOneByteString, chars, char, kHeaderSize',
     'SeqTwoByteString, chars, char, kHeaderSize',
     'SharedFunctionInfo, code, Code, kCodeOffset',
+    'SharedFunctionInfo, scope_info, ScopeInfo, kScopeInfoOffset',
     'SlicedString, parent, String, kParentOffset',
     'Code, instruction_start, uintptr_t, kHeaderSize',
     'Code, instruction_size, int, kInstructionSizeOffset',

From 35fb9f91eb4ba310b1944f75f07c09d3f7c4bed4 Mon Sep 17 00:00:00 2001
From: Stefan Budeanu <stefan@budeanu.com>
Date: Fri, 6 Nov 2015 14:50:57 -0500
Subject: [PATCH 141/323] doc: Describe FIPSDIR environment variable

As per the OpenSSL User Guide, it is possible to use the FIPSDIR
environment variable to specify a custom install path for the
validated cryptographic module.

PR-URL: https://github.com/nodejs/node/pull/3752
Reviewed-By: Michael Dawsson <michael_dawson@ca.ibm.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Reviewed-By: Fedor Indutny <fedor@indutny.com>
---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5870524ba0503c..45062d459b3f5a 100644
--- a/README.md
+++ b/README.md
@@ -295,7 +295,9 @@ Instructions:
    Appendix A in the [security policy]
    (http://csrc.nist.gov/groups/STM/cmvp/documents/140-1/140sp/140sp1747.pdf).
    The only exception is that `./config no-asm` can be
-   used in place of `./config` )
+   used in place of `./config`, and the FIPSDIR environment variable
+   may be used to specify a non-standard install folder for the
+   validated module, as per User Guide sections 4.2.1, 4.2.2, and 4.2.3.
 6. Get into Node.js checkout folder
 7. `./configure --openssl-fips=/path/to/openssl-fips/installdir`
    For example on ubuntu 12 the installation directory was

From f2c2e533219a1563100cf53bd065aa83c2e784b9 Mon Sep 17 00:00:00 2001
From: Evan Lucas <evanlucas@me.com>
Date: Thu, 12 Nov 2015 06:29:27 -0600
Subject: [PATCH 142/323] doc: add note to util.isBuffer

Since util.isBuffer is deprecated, we should be explicit that
Buffer.isBuffer should be used instead.

PR-URL: https://github.com/nodejs/node/pull/3790
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/util.markdown | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/api/util.markdown b/doc/api/util.markdown
index 9914deb48050db..8ac0e0ef8467d9 100644
--- a/doc/api/util.markdown
+++ b/doc/api/util.markdown
@@ -404,6 +404,8 @@ Returns `true` if the given "object" is a primitive type. `false` otherwise.
 
     Stability: 0 - Deprecated
 
+Use `Buffer.isBuffer()` instead.
+
 Returns `true` if the given "object" is a `Buffer`. `false` otherwise.
 
     var util = require('util');

From 530bb9144f3108c4a353ac425b62a3e5d69bd46d Mon Sep 17 00:00:00 2001
From: Ashley Williams <ashley666ashley@gmail.com>
Date: Wed, 11 Nov 2015 10:33:43 -0500
Subject: [PATCH 143/323] docs: improve discoverability of Code of Conduct

- move CoC from CONTRIBUTING to top-level, separate COC file
- add note/link in CONTRIBUTING
- add note/link in README (both at top, and newcomer resources)
- move CoC section in CONTRIBUTING to top of file

PR-URL: https://github.com/nodejs/node/pull/3774
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 CODE_OF_CONDUCT.md | 36 ++++++++++++++++++++++++++++++++++++
 CONTRIBUTING.md    | 44 ++++++--------------------------------------
 README.md          |  3 +++
 3 files changed, 45 insertions(+), 38 deletions(-)
 create mode 100644 CODE_OF_CONDUCT.md

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000000000..b08bf7faa33db0
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,36 @@
+## Code of Conduct
+
+This Code of Conduct is adapted from [Rust's wonderful
+CoC](http://www.rust-lang.org/conduct.html).
+
+* We are committed to providing a friendly, safe and welcoming
+  environment for all, regardless of gender, sexual orientation,
+  disability, ethnicity, religion, or similar personal characteristic.
+* Please avoid using overtly sexual nicknames or other nicknames that
+  might detract from a friendly, safe and welcoming environment for
+  all.
+* Please be kind and courteous. There's no need to be mean or rude.
+* Respect that people have differences of opinion and that every
+  design or implementation choice carries a trade-off and numerous
+  costs. There is seldom a right answer.
+* Please keep unstructured critique to a minimum. If you have solid
+  ideas you want to experiment with, make a fork and see how it works.
+* We will exclude you from interaction if you insult, demean or harass
+  anyone. That is not welcome behavior. We interpret the term
+  "harassment" as including the definition in the [Citizen Code of
+  Conduct](http://citizencodeofconduct.org/); if you have any lack of
+  clarity about what might be included in that concept, please read
+  their definition. In particular, we don't tolerate behavior that
+  excludes people in socially marginalized groups.
+* Private harassment is also unacceptable. No matter who you are, if
+  you feel you have been or are being harassed or made uncomfortable
+  by a community member, please contact one of the channel ops or any
+  of the TSC members immediately with a capture (log, photo, email) of
+  the harassment if possible. Whether you're a regular contributor or
+  a newcomer, we care about making this community a safe place for you
+  and we've got your back.
+* Likewise any spamming, trolling, flaming, baiting or other
+  attention-stealing behavior is not welcome.
+* Avoid the use of personal pronouns in code comments or
+  documentation. There is no need to address persons when explaining
+  code (e.g. "When the developer").
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8da5d14f8ad63d..e78100bc810c77 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,11 @@
 # Contributing to Node.js
 
+## Code of Conduct
+
+The Code of Conduct explains the *bare minimum* behavior
+expectations the Node Foundation requires of its contributors.
+[Please read it before participating.](./CODE_OF_CONDUCT.md)
+
 ## Issue Contributions
 
 When opening new issues or commenting on existing issues on this repository
@@ -181,41 +187,3 @@ By making a contribution to this project, I certify that:
   different license), as indicated in the file; or
 * (c) The contribution was provided directly to me by some other
   person who certified (a), (b) or (c) and I have not modified it.
-
-
-## Code of Conduct
-
-This Code of Conduct is adapted from [Rust's wonderful
-CoC](http://www.rust-lang.org/conduct.html).
-
-* We are committed to providing a friendly, safe and welcoming
-  environment for all, regardless of gender, sexual orientation,
-  disability, ethnicity, religion, or similar personal characteristic.
-* Please avoid using overtly sexual nicknames or other nicknames that
-  might detract from a friendly, safe and welcoming environment for
-  all.
-* Please be kind and courteous. There's no need to be mean or rude.
-* Respect that people have differences of opinion and that every
-  design or implementation choice carries a trade-off and numerous
-  costs. There is seldom a right answer.
-* Please keep unstructured critique to a minimum. If you have solid
-  ideas you want to experiment with, make a fork and see how it works.
-* We will exclude you from interaction if you insult, demean or harass
-  anyone. That is not welcome behavior. We interpret the term
-  "harassment" as including the definition in the [Citizen Code of
-  Conduct](http://citizencodeofconduct.org/); if you have any lack of
-  clarity about what might be included in that concept, please read
-  their definition. In particular, we don't tolerate behavior that
-  excludes people in socially marginalized groups.
-* Private harassment is also unacceptable. No matter who you are, if
-  you feel you have been or are being harassed or made uncomfortable
-  by a community member, please contact one of the channel ops or any
-  of the TC members immediately with a capture (log, photo, email) of
-  the harassment if possible. Whether you're a regular contributor or
-  a newcomer, we care about making this community a safe place for you
-  and we've got your back.
-* Likewise any spamming, trolling, flaming, baiting or other
-  attention-stealing behavior is not welcome.
-* Avoid the use of personal pronouns in code comments or
-  documentation. There is no need to address persons when explaining
-  code (e.g. "When the developer").
diff --git a/README.md b/README.md
index 45062d459b3f5a..3c14da04398185 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,8 @@ We intend to land, with increasing regularity, releases which are
 compatible with the npm ecosystem that has been built to date for
 Node.js.
 
+We also have a Code of Conduct. [Please read it.](./CODE_OF_CONDUCT.md)
+
 ## Download
 
 Binaries, installers, and source tarballs are available at
@@ -307,6 +309,7 @@ Instructions:
 
 ## Resources for Newcomers
 
+* [CODE_OF_CONDUCT.md](./CODE_OF_CONDUCT.md)
 * [CONTRIBUTING.md](./CONTRIBUTING.md)
 * [GOVERNANCE.md](./GOVERNANCE.md)
 * IRC:

From 2c9fb147beaacf0b7346ea16f0310d884e2e41a8 Mon Sep 17 00:00:00 2001
From: Stefan Budeanu <stefan@budeanu.com>
Date: Sun, 8 Nov 2015 19:18:55 -0500
Subject: [PATCH 144/323] crypto: Improve error checking and reporting

Added checks where necessary to prevent hard crashes and gave
precedence to returning the OpenSSL error strings instead of generic
error strings.

PR-URL: https://github.com/nodejs/node/pull/3753
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
---
 src/node_crypto.cc | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 2bbfa0552b2f3f..f20c9e2c1dfa33 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -3394,10 +3394,14 @@ void Hmac::HmacInit(const char* hash_type, const char* key, int key_len) {
     return env()->ThrowError("Unknown message digest");
   }
   HMAC_CTX_init(&ctx_);
+  int result = 0;
   if (key_len == 0) {
-    HMAC_Init(&ctx_, "", 0, md_);
+    result = HMAC_Init(&ctx_, "", 0, md_);
   } else {
-    HMAC_Init(&ctx_, key, key_len, md_);
+    result = HMAC_Init(&ctx_, key, key_len, md_);
+  }
+  if (!result) {
+    return ThrowCryptoError(env(), ERR_get_error());
   }
   initialised_ = true;
 }
@@ -3518,7 +3522,8 @@ void Hash::New(const FunctionCallbackInfo<Value>& args) {
 
   Hash* hash = new Hash(env, args.This());
   if (!hash->HashInit(*hash_type)) {
-    return env->ThrowError("Digest method not supported");
+    return ThrowCryptoError(env, ERR_get_error(),
+                            "Digest method not supported");
   }
 }
 
@@ -3530,6 +3535,9 @@ bool Hash::HashInit(const char* hash_type) {
     return false;
   EVP_MD_CTX_init(&mdctx_);
   EVP_DigestInit_ex(&mdctx_, md_, nullptr);
+  if (0 != ERR_peek_error()) {
+    return false;
+  }
   initialised_ = true;
   return true;
 }
@@ -4211,7 +4219,8 @@ void DiffieHellman::Initialize(Environment* env, Local<Object> target) {
 
 bool DiffieHellman::Init(int primeLength, int g) {
   dh = DH_new();
-  DH_generate_parameters_ex(dh, primeLength, g, 0);
+  if (!DH_generate_parameters_ex(dh, primeLength, g, 0))
+    return false;
   bool result = VerifyContext();
   if (!result)
     return false;
@@ -4304,7 +4313,7 @@ void DiffieHellman::New(const FunctionCallbackInfo<Value>& args) {
   }
 
   if (!initialized) {
-    return env->ThrowError("Initialization failed");
+    return ThrowCryptoError(env, ERR_get_error(), "Initialization failed");
   }
 }
 
@@ -4315,11 +4324,11 @@ void DiffieHellman::GenerateKeys(const FunctionCallbackInfo<Value>& args) {
   DiffieHellman* diffieHellman = Unwrap<DiffieHellman>(args.Holder());
 
   if (!diffieHellman->initialised_) {
-    return env->ThrowError("Not initialized");
+    return ThrowCryptoError(env, ERR_get_error(), "Not initialized");
   }
 
   if (!DH_generate_key(diffieHellman->dh)) {
-    return env->ThrowError("Key generation failed");
+    return ThrowCryptoError(env, ERR_get_error(), "Key generation failed");
   }
 
   int dataSize = BN_num_bytes(diffieHellman->dh->pub_key);
@@ -4338,7 +4347,7 @@ void DiffieHellman::GetPrime(const FunctionCallbackInfo<Value>& args) {
   DiffieHellman* diffieHellman = Unwrap<DiffieHellman>(args.Holder());
 
   if (!diffieHellman->initialised_) {
-    return env->ThrowError("Not initialized");
+    return ThrowCryptoError(env, ERR_get_error(), "Not initialized");
   }
 
   int dataSize = BN_num_bytes(diffieHellman->dh->p);
@@ -4356,7 +4365,7 @@ void DiffieHellman::GetGenerator(const FunctionCallbackInfo<Value>& args) {
   DiffieHellman* diffieHellman = Unwrap<DiffieHellman>(args.Holder());
 
   if (!diffieHellman->initialised_) {
-    return env->ThrowError("Not initialized");
+    return ThrowCryptoError(env, ERR_get_error(), "Not initialized");
   }
 
   int dataSize = BN_num_bytes(diffieHellman->dh->g);
@@ -4374,7 +4383,7 @@ void DiffieHellman::GetPublicKey(const FunctionCallbackInfo<Value>& args) {
   DiffieHellman* diffieHellman = Unwrap<DiffieHellman>(args.Holder());
 
   if (!diffieHellman->initialised_) {
-    return env->ThrowError("Not initialized");
+    return ThrowCryptoError(env, ERR_get_error(), "Not initialized");
   }
 
   if (diffieHellman->dh->pub_key == nullptr) {
@@ -4397,7 +4406,7 @@ void DiffieHellman::GetPrivateKey(const FunctionCallbackInfo<Value>& args) {
   DiffieHellman* diffieHellman = Unwrap<DiffieHellman>(args.Holder());
 
   if (!diffieHellman->initialised_) {
-    return env->ThrowError("Not initialized");
+    return ThrowCryptoError(env, ERR_get_error(), "Not initialized");
   }
 
   if (diffieHellman->dh->priv_key == nullptr) {
@@ -4420,7 +4429,7 @@ void DiffieHellman::ComputeSecret(const FunctionCallbackInfo<Value>& args) {
   DiffieHellman* diffieHellman = Unwrap<DiffieHellman>(args.Holder());
 
   if (!diffieHellman->initialised_) {
-    return env->ThrowError("Not initialized");
+    return ThrowCryptoError(env, ERR_get_error(), "Not initialized");
   }
 
   ClearErrorOnReturn clear_error_on_return;
@@ -4453,7 +4462,7 @@ void DiffieHellman::ComputeSecret(const FunctionCallbackInfo<Value>& args) {
     delete[] data;
 
     if (!checked) {
-      return env->ThrowError("Invalid key");
+      return ThrowCryptoError(env, ERR_get_error(), "Invalid Key");
     } else if (checkResult) {
       if (checkResult & DH_CHECK_PUBKEY_TOO_SMALL) {
         return env->ThrowError("Supplied key is too small");
@@ -4490,7 +4499,7 @@ void DiffieHellman::SetPublicKey(const FunctionCallbackInfo<Value>& args) {
   Environment* env = diffieHellman->env();
 
   if (!diffieHellman->initialised_) {
-    return env->ThrowError("Not initialized");
+    return ThrowCryptoError(env, ERR_get_error(), "Not initialized");
   }
 
   if (args.Length() == 0) {
@@ -4509,7 +4518,7 @@ void DiffieHellman::SetPrivateKey(const FunctionCallbackInfo<Value>& args) {
   Environment* env = diffieHellman->env();
 
   if (!diffieHellman->initialised_) {
-    return env->ThrowError("Not initialized");
+    return ThrowCryptoError(env, ERR_get_error(), "Not initialized");
   }
 
   if (args.Length() == 0) {
@@ -4531,7 +4540,8 @@ void DiffieHellman::VerifyErrorGetter(Local<String> property,
   DiffieHellman* diffieHellman = Unwrap<DiffieHellman>(args.Holder());
 
   if (!diffieHellman->initialised_)
-    return diffieHellman->env()->ThrowError("Not initialized");
+    return ThrowCryptoError(diffieHellman->env(), ERR_get_error(),
+                            "Not initialized");
 
   args.GetReturnValue().Set(diffieHellman->verifyError_);
 }

From c7c05d8f020ba7d070619785ba9160740815ccbe Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 10:48:45 -0500
Subject: [PATCH 145/323] doc: sort assert alphabetically

Reorders, with no contextual changes, the assert documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/assert.markdown | 108 ++++++++++++++++++++--------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/doc/api/assert.markdown b/doc/api/assert.markdown
index b81037287b499b..a607b92ead197f 100644
--- a/doc/api/assert.markdown
+++ b/doc/api/assert.markdown
@@ -6,25 +6,11 @@ This module is used so that Node.js can test itself. It can be accessed with
 `require('assert')`. However, it is recommended that a userland assertion
 library be used instead.
 
-## assert.fail(actual, expected, message, operator)
-
-Throws an exception that displays the values for `actual` and `expected`
-separated by the provided operator.
-
 ## assert(value[, message]), assert.ok(value[, message])
 
 Tests if value is truthy. It is equivalent to
 `assert.equal(!!value, true, message)`.
 
-## assert.equal(actual, expected[, message])
-
-Tests shallow, coercive equality with the equal comparison operator ( `==` ).
-
-## assert.notEqual(actual, expected[, message])
-
-Tests shallow, coercive inequality with the not equal comparison operator
-( `!=` ).
-
 ## assert.deepEqual(actual, expected[, message])
 
 Tests for deep equality. Primitive values are compared with the equal
@@ -39,27 +25,72 @@ non-enumerable:
     // WARNING: This does not throw an AssertionError!
     assert.deepEqual(Error('a'), Error('b'));
 
+## assert.deepStrictEqual(actual, expected[, message])
+
+Tests for deep equality. Primitive values are compared with the strict equality
+operator ( `===` ).
+
+## assert.doesNotThrow(block[, error][, message])
+
+Expects `block` not to throw an error. See [assert.throws()](#assert_assert_throws_block_error_message) for more details.
+
+If `block` throws an error and if it is of a different type from `error`, the
+thrown error will get propagated back to the caller. The following call will
+throw the `TypeError`, since we're not matching the error types in the
+assertion.
+
+    assert.doesNotThrow(
+      function() {
+        throw new TypeError("Wrong value");
+      },
+      SyntaxError
+    );
+
+In case `error` matches with the error thrown by `block`, an `AssertionError`
+is thrown instead.
+
+    assert.doesNotThrow(
+      function() {
+        throw new TypeError("Wrong value");
+      },
+      TypeError
+    );
+
+## assert.equal(actual, expected[, message])
+
+Tests shallow, coercive equality with the equal comparison operator ( `==` ).
+
+## assert.fail(actual, expected, message, operator)
+
+Throws an exception that displays the values for `actual` and `expected`
+separated by the provided operator.
+
+## assert.ifError(value)
+
+Throws `value` if `value` is truthy. This is useful when testing the `error`
+argument in callbacks.
+
 ## assert.notDeepEqual(actual, expected[, message])
 
 Tests for any deep inequality. Opposite of `assert.deepEqual`.
 
-## assert.strictEqual(actual, expected[, message])
+## assert.notDeepStrictEqual(actual, expected[, message])
 
-Tests strict equality as determined by the strict equality operator ( `===` ).
+Tests for deep inequality. Opposite of `assert.deepStrictEqual`.
+
+## assert.notEqual(actual, expected[, message])
+
+Tests shallow, coercive inequality with the not equal comparison operator
+( `!=` ).
 
 ## assert.notStrictEqual(actual, expected[, message])
 
 Tests strict inequality as determined by the strict not equal operator
 ( `!==` ).
 
-## assert.deepStrictEqual(actual, expected[, message])
-
-Tests for deep equality. Primitive values are compared with the strict equality
-operator ( `===` ).
-
-## assert.notDeepStrictEqual(actual, expected[, message])
+## assert.strictEqual(actual, expected[, message])
 
-Tests for deep inequality. Opposite of `assert.deepStrictEqual`.
+Tests strict equality as determined by the strict equality operator ( `===` ).
 
 ## assert.throws(block[, error][, message])
 
@@ -97,34 +128,3 @@ Custom error validation:
       },
       "unexpected error"
     );
-
-## assert.doesNotThrow(block[, error][, message])
-
-Expects `block` not to throw an error. See [assert.throws()](#assert_assert_throws_block_error_message) for more details.
-
-If `block` throws an error and if it is of a different type from `error`, the
-thrown error will get propagated back to the caller. The following call will
-throw the `TypeError`, since we're not matching the error types in the
-assertion.
-
-    assert.doesNotThrow(
-      function() {
-        throw new TypeError("Wrong value");
-      },
-      SyntaxError
-    );
-
-In case `error` matches with the error thrown by `block`, an `AssertionError`
-is thrown instead.
-
-    assert.doesNotThrow(
-      function() {
-        throw new TypeError("Wrong value");
-      },
-      TypeError
-    );
-
-## assert.ifError(value)
-
-Throws `value` if `value` is truthy. This is useful when testing the `error`
-argument in callbacks.

From fb6a09cd0e31d65c66a1eee50ffcd5e1f70f832c Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 10:49:28 -0500
Subject: [PATCH 146/323] doc: sort buffer alphabetically

Reorders, with minimal contextual duplication, the buffer documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/buffer.markdown | 703 +++++++++++++++++++++-------------------
 1 file changed, 366 insertions(+), 337 deletions(-)

diff --git a/doc/api/buffer.markdown b/doc/api/buffer.markdown
index c678c4a2da8b13..a401d5a7d46b0e 100644
--- a/doc/api/buffer.markdown
+++ b/doc/api/buffer.markdown
@@ -57,6 +57,18 @@ arrays specification.  `ArrayBuffer#slice()` makes a copy of the slice while
 The Buffer class is a global type for dealing with binary data directly.
 It can be constructed in a variety of ways.
 
+### new Buffer(array)
+
+* `array` Array
+
+Allocates a new buffer using an `array` of octets.
+
+### new Buffer(buffer)
+
+* `buffer` {Buffer}
+
+Copies the passed `buffer` data onto a new `Buffer` instance.
+
 ### new Buffer(size)
 
 * `size` Number
@@ -70,18 +82,6 @@ Unlike `ArrayBuffers`, the underlying memory for buffers is not initialized. So
 the contents of a newly created `Buffer` are unknown and could contain
 sensitive data. Use `buf.fill(0)` to initialize a buffer to zeroes.
 
-### new Buffer(array)
-
-* `array` Array
-
-Allocates a new buffer using an `array` of octets.
-
-### new Buffer(buffer)
-
-* `buffer` {Buffer}
-
-Copies the passed `buffer` data onto a new `Buffer` instance.
-
 ### new Buffer(str[, encoding])
 
 * `str` String - string to encode.
@@ -90,20 +90,6 @@ Copies the passed `buffer` data onto a new `Buffer` instance.
 Allocates a new buffer containing the given `str`.
 `encoding` defaults to `'utf8'`.
 
-### Class Method: Buffer.isEncoding(encoding)
-
-* `encoding` {String} The encoding string to test
-
-Returns true if the `encoding` is a valid encoding argument, or false
-otherwise.
-
-### Class Method: Buffer.isBuffer(obj)
-
-* `obj` Object
-* Return: Boolean
-
-Tests if `obj` is a `Buffer`.
-
 ### Class Method: Buffer.byteLength(string[, encoding])
 
 * `string` String
@@ -123,6 +109,17 @@ Example:
 
     // ½ + ¼ = ¾: 9 characters, 12 bytes
 
+### Class Method: Buffer.compare(buf1, buf2)
+
+* `buf1` {Buffer}
+* `buf2` {Buffer}
+
+The same as [`buf1.compare(buf2)`](#buffer_buf_compare_otherbuffer). Useful
+for sorting an Array of Buffers:
+
+    var arr = [Buffer('1234'), Buffer('0123')];
+    arr.sort(Buffer.compare);
+
 ### Class Method: Buffer.concat(list[, totalLength])
 
 * `list` {Array} List of Buffer objects to concat
@@ -164,151 +161,32 @@ Example: build a single buffer from a list of three buffers:
     // <Buffer 00 00 00 00 ...>
     // 42
 
-### Class Method: Buffer.compare(buf1, buf2)
-
-* `buf1` {Buffer}
-* `buf2` {Buffer}
-
-The same as [`buf1.compare(buf2)`](#buffer_buf_compare_otherbuffer). Useful
-for sorting an Array of Buffers:
-
-    var arr = [Buffer('1234'), Buffer('0123')];
-    arr.sort(Buffer.compare);
-
-
-### buf.length
-
-* Number
-
-The size of the buffer in bytes.  Note that this is not necessarily the size
-of the contents. `length` refers to the amount of memory allocated for the
-buffer object.  It does not change when the contents of the buffer are changed.
-
-    buf = new Buffer(1234);
-
-    console.log(buf.length);
-    buf.write("some string", 0, "ascii");
-    console.log(buf.length);
-
-    // 1234
-    // 1234
-
-While the `length` property is not immutable, changing the value of `length`
-can result in undefined and inconsistent behavior. Applications that wish to
-modify the length of a buffer should therefore treat `length` as read-only and
-use `buf.slice` to create a new buffer.
-
-    buf = new Buffer(10);
-    buf.write("abcdefghj", 0, "ascii");
-    console.log(buf.length); // 10
-    buf = buf.slice(0,5);
-    console.log(buf.length); // 5
-
-### buf.write(string[, offset][, length][, encoding])
-
-* `string` String - data to be written to buffer
-* `offset` Number, Optional, Default: 0
-* `length` Number, Optional, Default: `buffer.length - offset`
-* `encoding` String, Optional, Default: 'utf8'
-
-Writes `string` to the buffer at `offset` using the given encoding.
-`offset` defaults to `0`, `encoding` defaults to `'utf8'`. `length` is
-the number of bytes to write. Returns number of octets written. If `buffer` did
-not contain enough space to fit the entire string, it will write a partial
-amount of the string. `length` defaults to `buffer.length - offset`.
-The method will not write partial characters.
-
-    buf = new Buffer(256);
-    len = buf.write('\u00bd + \u00bc = \u00be', 0);
-    console.log(len + " bytes: " + buf.toString('utf8', 0, len));
-
-### buf.writeUIntLE(value, offset, byteLength[, noAssert])
-### buf.writeUIntBE(value, offset, byteLength[, noAssert])
-### buf.writeIntLE(value, offset, byteLength[, noAssert])
-### buf.writeIntBE(value, offset, byteLength[, noAssert])
-
-* `value` {Number} Bytes to be written to buffer
-* `offset` {Number} `0 <= offset <= buf.length`
-* `byteLength` {Number} `0 < byteLength <= 6`
-* `noAssert` {Boolean} Default: false
-* Return: {Number}
-
-Writes `value` to the buffer at the specified `offset` and `byteLength`.
-Supports up to 48 bits of accuracy. For example:
-
-    var b = new Buffer(6);
-    b.writeUIntBE(0x1234567890ab, 0, 6);
-    // <Buffer 12 34 56 78 90 ab>
-
-Set `noAssert` to `true` to skip validation of `value` and `offset`. Defaults
-to `false`.
-
-### buf.readUIntLE(offset, byteLength[, noAssert])
-### buf.readUIntBE(offset, byteLength[, noAssert])
-### buf.readIntLE(offset, byteLength[, noAssert])
-### buf.readIntBE(offset, byteLength[, noAssert])
-
-* `offset` {Number} `0 <= offset <= buf.length`
-* `byteLength` {Number} `0 < byteLength <= 6`
-* `noAssert` {Boolean} Default: false
-* Return: {Number}
-
-A generalized version of all numeric read methods. Supports up to 48 bits of
-accuracy. For example:
-
-    var b = new Buffer(6);
-    b.writeUInt16LE(0x90ab, 0);
-    b.writeUInt32LE(0x12345678, 2);
-    b.readUIntLE(0, 6).toString(16);  // Specify 6 bytes (48 bits)
-    // output: '1234567890ab'
-
-Set `noAssert` to true to skip validation of `offset`. This means that `offset`
-may be beyond the end of the buffer. Defaults to `false`.
-
-### buf.toString([encoding][, start][, end])
-
-* `encoding` String, Optional, Default: 'utf8'
-* `start` Number, Optional, Default: 0
-* `end` Number, Optional, Default: `buffer.length`
+### Class Method: Buffer.isBuffer(obj)
 
-Decodes and returns a string from buffer data encoded using the specified
-character set encoding. If `encoding` is `undefined` or `null`, then `encoding`
-defaults to `'utf8'`. The `start` and `end` parameters default to `0` and
-`buffer.length` when `undefined`.
+* `obj` Object
+* Return: Boolean
 
-    buf = new Buffer(26);
-    for (var i = 0 ; i < 26 ; i++) {
-      buf[i] = i + 97; // 97 is ASCII a
-    }
-    buf.toString('ascii'); // outputs: abcdefghijklmnopqrstuvwxyz
-    buf.toString('ascii',0,5); // outputs: abcde
-    buf.toString('utf8',0,5); // outputs: abcde
-    buf.toString(undefined,0,5); // encoding defaults to 'utf8', outputs abcde
+Tests if `obj` is a `Buffer`.
 
-See `buffer.write()` example, above.
+### Class Method: Buffer.isEncoding(encoding)
 
+* `encoding` {String} The encoding string to test
 
-### buf.toJSON()
+Returns true if the `encoding` is a valid encoding argument, or false
+otherwise.
 
-Returns a JSON-representation of the Buffer instance.  `JSON.stringify`
-implicitly calls this function when stringifying a Buffer instance.
+### buffer.entries()
 
-Example:
+Creates iterator for `[index, byte]` arrays.
 
-    var buf = new Buffer('test');
-    var json = JSON.stringify(buf);
+### buffer.keys()
 
-    console.log(json);
-    // '{"type":"Buffer","data":[116,101,115,116]}'
+Creates iterator for buffer keys (indices).
 
-    var copy = JSON.parse(json, function(key, value) {
-        return value && value.type === 'Buffer'
-          ? new Buffer(value.data)
-          : value;
-      });
+### buffer.values()
 
-    console.log(copy);
-    // <Buffer 74 65 73 74>
+Creates iterator for buffer values (bytes). This function is called automatically
+when `buffer` is used in a `for..of` statement.
 
 ### buf[index]
 
@@ -331,10 +209,6 @@ Example: copy an ASCII string into a buffer, one byte at a time:
 
     // Node.js
 
-### buf.equals(otherBuffer)
-
-* `otherBuffer` {Buffer}
-
 Returns a boolean of whether `this` and `otherBuffer` have the same
 bytes.
 
@@ -388,35 +262,22 @@ region in the same buffer
 
     // efghijghijklmnopqrstuvwxyz
 
+### buf.equals(otherBuffer)
 
-### buf.slice([start[, end]])
-
-* `start` Number, Optional, Default: 0
-* `end` Number, Optional, Default: `buffer.length`
-
-Returns a new buffer which references the same memory as the old, but offset
-and cropped by the `start` (defaults to `0`) and `end` (defaults to
-`buffer.length`) indexes.  Negative indexes start from the end of the buffer.
-
-**Modifying the new buffer slice will modify memory in the original buffer!**
-
-Example: build a Buffer with the ASCII alphabet, take a slice, then modify one
-byte from the original Buffer.
-
-    var buf1 = new Buffer(26);
+* `otherBuffer` {Buffer}
 
-    for (var i = 0 ; i < 26 ; i++) {
-      buf1[i] = i + 97; // 97 is ASCII a
-    }
+### buf.fill(value[, offset][, end])
 
-    var buf2 = buf1.slice(0, 3);
-    console.log(buf2.toString('ascii', 0, buf2.length));
-    buf1[0] = 33;
-    console.log(buf2.toString('ascii', 0, buf2.length));
+* `value`
+* `offset` Number, Optional
+* `end` Number, Optional
 
-    // abc
-    // !bc
+Fills the buffer with the specified value. If the `offset` (defaults to `0`)
+and `end` (defaults to `buffer.length`) are not given it will fill the entire
+buffer.
 
+    var b = new Buffer(50);
+    b.fill("h");
 
 ### buf.indexOf(value[, byteOffset])
 
@@ -430,80 +291,73 @@ Accepts a String, Buffer or Number. Strings are interpreted as UTF8. Buffers
 will use the entire buffer. So in order to compare a partial Buffer use
 `Buffer#slice()`. Numbers can range from 0 to 255.
 
-### buf.readUInt8(offset[, noAssert])
-
-* `offset` Number
-* `noAssert` Boolean, Optional, Default: false
-* Return: Number
+### buf.length
 
-Reads an unsigned 8 bit integer from the buffer at the specified offset.
+* Number
 
-Set `noAssert` to true to skip validation of `offset`. This means that `offset`
-may be beyond the end of the buffer. Defaults to `false`.
+The size of the buffer in bytes.  Note that this is not necessarily the size
+of the contents. `length` refers to the amount of memory allocated for the
+buffer object.  It does not change when the contents of the buffer are changed.
 
-Example:
+    buf = new Buffer(1234);
 
-    var buf = new Buffer(4);
+    console.log(buf.length);
+    buf.write("some string", 0, "ascii");
+    console.log(buf.length);
 
-    buf[0] = 0x3;
-    buf[1] = 0x4;
-    buf[2] = 0x23;
-    buf[3] = 0x42;
+    // 1234
+    // 1234
 
-    for (ii = 0; ii < buf.length; ii++) {
-      console.log(buf.readUInt8(ii));
-    }
+While the `length` property is not immutable, changing the value of `length`
+can result in undefined and inconsistent behavior. Applications that wish to
+modify the length of a buffer should therefore treat `length` as read-only and
+use `buf.slice` to create a new buffer.
 
-    // 0x3
-    // 0x4
-    // 0x23
-    // 0x42
+    buf = new Buffer(10);
+    buf.write("abcdefghj", 0, "ascii");
+    console.log(buf.length); // 10
+    buf = buf.slice(0,5);
+    console.log(buf.length); // 5
 
-### buf.readUInt16LE(offset[, noAssert])
-### buf.readUInt16BE(offset[, noAssert])
+### buf.readDoubleBE(offset[, noAssert])
+### buf.readDoubleLE(offset[, noAssert])
 
 * `offset` Number
 * `noAssert` Boolean, Optional, Default: false
 * Return: Number
 
-Reads an unsigned 16 bit integer from the buffer at the specified offset with
-specified endian format.
+Reads a 64 bit double from the buffer at the specified offset with specified
+endian format.
 
 Set `noAssert` to true to skip validation of `offset`. This means that `offset`
 may be beyond the end of the buffer. Defaults to `false`.
 
 Example:
 
-    var buf = new Buffer(4);
+    var buf = new Buffer(8);
 
-    buf[0] = 0x3;
-    buf[1] = 0x4;
-    buf[2] = 0x23;
-    buf[3] = 0x42;
+    buf[0] = 0x55;
+    buf[1] = 0x55;
+    buf[2] = 0x55;
+    buf[3] = 0x55;
+    buf[4] = 0x55;
+    buf[5] = 0x55;
+    buf[6] = 0xd5;
+    buf[7] = 0x3f;
 
-    console.log(buf.readUInt16BE(0));
-    console.log(buf.readUInt16LE(0));
-    console.log(buf.readUInt16BE(1));
-    console.log(buf.readUInt16LE(1));
-    console.log(buf.readUInt16BE(2));
-    console.log(buf.readUInt16LE(2));
+    console.log(buf.readDoubleLE(0));
 
-    // 0x0304
-    // 0x0403
-    // 0x0423
-    // 0x2304
-    // 0x2342
-    // 0x4223
+    // 0.3333333333333333
 
-### buf.readUInt32LE(offset[, noAssert])
-### buf.readUInt32BE(offset[, noAssert])
+### buf.readFloatBE(offset[, noAssert])
+### buf.readFloatLE(offset[, noAssert])
 
 * `offset` Number
 * `noAssert` Boolean, Optional, Default: false
 * Return: Number
 
-Reads an unsigned 32 bit integer from the buffer at the specified offset with
-specified endian format.
+Reads a 32 bit float from the buffer at the specified offset with specified
+endian format.
 
 Set `noAssert` to true to skip validation of `offset`. This means that `offset`
 may be beyond the end of the buffer. Defaults to `false`.
@@ -512,16 +366,14 @@ Example:
 
     var buf = new Buffer(4);
 
-    buf[0] = 0x3;
-    buf[1] = 0x4;
-    buf[2] = 0x23;
-    buf[3] = 0x42;
+    buf[0] = 0x00;
+    buf[1] = 0x00;
+    buf[2] = 0x80;
+    buf[3] = 0x3f;
 
-    console.log(buf.readUInt32BE(0));
-    console.log(buf.readUInt32LE(0));
+    console.log(buf.readFloatLE(0));
 
-    // 0x03042342
-    // 0x42230403
+    // 0x01
 
 ### buf.readInt8(offset[, noAssert])
 
@@ -537,8 +389,8 @@ may be beyond the end of the buffer. Defaults to `false`.
 Works as `buffer.readUInt8`, except buffer contents are treated as two's
 complement signed values.
 
-### buf.readInt16LE(offset[, noAssert])
 ### buf.readInt16BE(offset[, noAssert])
+### buf.readInt16LE(offset[, noAssert])
 
 * `offset` Number
 * `noAssert` Boolean, Optional, Default: false
@@ -553,8 +405,8 @@ may be beyond the end of the buffer. Defaults to `false`.
 Works as `buffer.readUInt16*`, except buffer contents are treated as two's
 complement signed values.
 
-### buf.readInt32LE(offset[, noAssert])
 ### buf.readInt32BE(offset[, noAssert])
+### buf.readInt32LE(offset[, noAssert])
 
 * `offset` Number
 * `noAssert` Boolean, Optional, Default: false
@@ -569,15 +421,33 @@ may be beyond the end of the buffer. Defaults to `false`.
 Works as `buffer.readUInt32*`, except buffer contents are treated as two's
 complement signed values.
 
-### buf.readFloatLE(offset[, noAssert])
-### buf.readFloatBE(offset[, noAssert])
+### buf.readIntBE(offset, byteLength[, noAssert])
+### buf.readIntLE(offset, byteLength[, noAssert])
+
+* `offset` {Number} `0 <= offset <= buf.length`
+* `byteLength` {Number} `0 < byteLength <= 6`
+* `noAssert` {Boolean} Default: false
+* Return: {Number}
+
+A generalized version of all numeric read methods. Supports up to 48 bits of
+accuracy. For example:
+
+    var b = new Buffer(6);
+    b.writeUInt16LE(0x90ab, 0);
+    b.writeUInt32LE(0x12345678, 2);
+    b.readUIntLE(0, 6).toString(16);  // Specify 6 bytes (48 bits)
+    // output: '1234567890ab'
+
+Set `noAssert` to true to skip validation of `offset`. This means that `offset`
+may be beyond the end of the buffer. Defaults to `false`.
+
+### buf.readUInt8(offset[, noAssert])
 
 * `offset` Number
 * `noAssert` Boolean, Optional, Default: false
 * Return: Number
 
-Reads a 32 bit float from the buffer at the specified offset with specified
-endian format.
+Reads an unsigned 8 bit integer from the buffer at the specified offset.
 
 Set `noAssert` to true to skip validation of `offset`. This means that `offset`
 may be beyond the end of the buffer. Defaults to `false`.
@@ -586,80 +456,201 @@ Example:
 
     var buf = new Buffer(4);
 
-    buf[0] = 0x00;
-    buf[1] = 0x00;
-    buf[2] = 0x80;
-    buf[3] = 0x3f;
+    buf[0] = 0x3;
+    buf[1] = 0x4;
+    buf[2] = 0x23;
+    buf[3] = 0x42;
 
-    console.log(buf.readFloatLE(0));
+    for (ii = 0; ii < buf.length; ii++) {
+      console.log(buf.readUInt8(ii));
+    }
 
-    // 0x01
+    // 0x3
+    // 0x4
+    // 0x23
+    // 0x42
 
-### buf.readDoubleLE(offset[, noAssert])
-### buf.readDoubleBE(offset[, noAssert])
+### buf.readUInt16BE(offset[, noAssert])
+### buf.readUInt16LE(offset[, noAssert])
 
 * `offset` Number
 * `noAssert` Boolean, Optional, Default: false
 * Return: Number
 
-Reads a 64 bit double from the buffer at the specified offset with specified
-endian format.
+Reads an unsigned 16 bit integer from the buffer at the specified offset with
+specified endian format.
 
 Set `noAssert` to true to skip validation of `offset`. This means that `offset`
 may be beyond the end of the buffer. Defaults to `false`.
 
 Example:
 
-    var buf = new Buffer(8);
+    var buf = new Buffer(4);
 
-    buf[0] = 0x55;
-    buf[1] = 0x55;
-    buf[2] = 0x55;
-    buf[3] = 0x55;
-    buf[4] = 0x55;
-    buf[5] = 0x55;
-    buf[6] = 0xd5;
-    buf[7] = 0x3f;
+    buf[0] = 0x3;
+    buf[1] = 0x4;
+    buf[2] = 0x23;
+    buf[3] = 0x42;
 
-    console.log(buf.readDoubleLE(0));
+    console.log(buf.readUInt16BE(0));
+    console.log(buf.readUInt16LE(0));
+    console.log(buf.readUInt16BE(1));
+    console.log(buf.readUInt16LE(1));
+    console.log(buf.readUInt16BE(2));
+    console.log(buf.readUInt16LE(2));
 
-    // 0.3333333333333333
+    // 0x0304
+    // 0x0403
+    // 0x0423
+    // 0x2304
+    // 0x2342
+    // 0x4223
 
-### buf.writeUInt8(value, offset[, noAssert])
+### buf.readUInt32BE(offset[, noAssert])
+### buf.readUInt32LE(offset[, noAssert])
 
-* `value` Number
 * `offset` Number
 * `noAssert` Boolean, Optional, Default: false
+* Return: Number
 
-Writes `value` to the buffer at the specified offset. Note, `value` must be a
-valid unsigned 8 bit integer.
+Reads an unsigned 32 bit integer from the buffer at the specified offset with
+specified endian format.
 
-Set `noAssert` to true to skip validation of `value` and `offset`. This means
-that `value` may be too large for the specific function and `offset` may be
-beyond the end of the buffer leading to the values being silently dropped. This
-should not be used unless you are certain of correctness. Defaults to `false`.
+Set `noAssert` to true to skip validation of `offset`. This means that `offset`
+may be beyond the end of the buffer. Defaults to `false`.
 
 Example:
 
     var buf = new Buffer(4);
-    buf.writeUInt8(0x3, 0);
-    buf.writeUInt8(0x4, 1);
-    buf.writeUInt8(0x23, 2);
-    buf.writeUInt8(0x42, 3);
 
-    console.log(buf);
+    buf[0] = 0x3;
+    buf[1] = 0x4;
+    buf[2] = 0x23;
+    buf[3] = 0x42;
 
-    // <Buffer 03 04 23 42>
+    console.log(buf.readUInt32BE(0));
+    console.log(buf.readUInt32LE(0));
 
-### buf.writeUInt16LE(value, offset[, noAssert])
-### buf.writeUInt16BE(value, offset[, noAssert])
+    // 0x03042342
+    // 0x42230403
+
+### buf.readUIntBE(offset, byteLength[, noAssert])
+### buf.readUIntLE(offset, byteLength[, noAssert])
+
+* `offset` {Number} `0 <= offset <= buf.length`
+* `byteLength` {Number} `0 < byteLength <= 6`
+* `noAssert` {Boolean} Default: false
+* Return: {Number}
+
+A generalized version of all numeric read methods. Supports up to 48 bits of
+accuracy. For example:
+
+    var b = new Buffer(6);
+    b.writeUInt16LE(0x90ab, 0);
+    b.writeUInt32LE(0x12345678, 2);
+    b.readUIntLE(0, 6).toString(16);  // Specify 6 bytes (48 bits)
+    // output: '1234567890ab'
+
+### buf.slice([start[, end]])
+
+* `start` Number, Optional, Default: 0
+* `end` Number, Optional, Default: `buffer.length`
+
+Returns a new buffer which references the same memory as the old, but offset
+and cropped by the `start` (defaults to `0`) and `end` (defaults to
+`buffer.length`) indexes.  Negative indexes start from the end of the buffer.
+
+**Modifying the new buffer slice will modify memory in the original buffer!**
+
+Example: build a Buffer with the ASCII alphabet, take a slice, then modify one
+byte from the original Buffer.
+
+    var buf1 = new Buffer(26);
+
+    for (var i = 0 ; i < 26 ; i++) {
+      buf1[i] = i + 97; // 97 is ASCII a
+    }
+
+    var buf2 = buf1.slice(0, 3);
+    console.log(buf2.toString('ascii', 0, buf2.length));
+    buf1[0] = 33;
+    console.log(buf2.toString('ascii', 0, buf2.length));
+
+    // abc
+    // !bc
+
+### buf.toString([encoding][, start][, end])
+
+* `encoding` String, Optional, Default: 'utf8'
+* `start` Number, Optional, Default: 0
+* `end` Number, Optional, Default: `buffer.length`
+
+Decodes and returns a string from buffer data encoded using the specified
+character set encoding. If `encoding` is `undefined` or `null`, then `encoding`
+defaults to `'utf8'`. The `start` and `end` parameters default to `0` and
+`buffer.length` when `undefined`.
+
+    buf = new Buffer(26);
+    for (var i = 0 ; i < 26 ; i++) {
+      buf[i] = i + 97; // 97 is ASCII a
+    }
+    buf.toString('ascii'); // outputs: abcdefghijklmnopqrstuvwxyz
+    buf.toString('ascii',0,5); // outputs: abcde
+    buf.toString('utf8',0,5); // outputs: abcde
+    buf.toString(undefined,0,5); // encoding defaults to 'utf8', outputs abcde
+
+See `buffer.write()` example, above.
+
+
+### buf.toJSON()
+
+Returns a JSON-representation of the Buffer instance.  `JSON.stringify`
+implicitly calls this function when stringifying a Buffer instance.
+
+Example:
+
+    var buf = new Buffer('test');
+    var json = JSON.stringify(buf);
+
+    console.log(json);
+    // '{"type":"Buffer","data":[116,101,115,116]}'
+
+    var copy = JSON.parse(json, function(key, value) {
+        return value && value.type === 'Buffer'
+          ? new Buffer(value.data)
+          : value;
+      });
+
+    console.log(copy);
+    // <Buffer 74 65 73 74>
+
+### buf.write(string[, offset][, length][, encoding])
+
+* `string` String - data to be written to buffer
+* `offset` Number, Optional, Default: 0
+* `length` Number, Optional, Default: `buffer.length - offset`
+* `encoding` String, Optional, Default: 'utf8'
+
+Writes `string` to the buffer at `offset` using the given encoding.
+`offset` defaults to `0`, `encoding` defaults to `'utf8'`. `length` is
+the number of bytes to write. Returns number of octets written. If `buffer` did
+not contain enough space to fit the entire string, it will write a partial
+amount of the string. `length` defaults to `buffer.length - offset`.
+The method will not write partial characters.
+
+    buf = new Buffer(256);
+    len = buf.write('\u00bd + \u00bc = \u00be', 0);
+    console.log(len + " bytes: " + buf.toString('utf8', 0, len));
+
+### buf.writeDoubleBE(value, offset[, noAssert])
+### buf.writeDoubleLE(value, offset[, noAssert])
 
 * `value` Number
 * `offset` Number
 * `noAssert` Boolean, Optional, Default: false
 
 Writes `value` to the buffer at the specified offset with specified endian
-format. Note, `value` must be a valid unsigned 16 bit integer.
+format. Note, `value` must be a valid 64 bit double.
 
 Set `noAssert` to true to skip validation of `value` and `offset`. This means
 that `value` may be too large for the specific function and `offset` may be
@@ -668,29 +659,27 @@ should not be used unless you are certain of correctness. Defaults to `false`.
 
 Example:
 
-    var buf = new Buffer(4);
-    buf.writeUInt16BE(0xdead, 0);
-    buf.writeUInt16BE(0xbeef, 2);
+    var buf = new Buffer(8);
+    buf.writeDoubleBE(0xdeadbeefcafebabe, 0);
 
     console.log(buf);
 
-    buf.writeUInt16LE(0xdead, 0);
-    buf.writeUInt16LE(0xbeef, 2);
+    buf.writeDoubleLE(0xdeadbeefcafebabe, 0);
 
     console.log(buf);
 
-    // <Buffer de ad be ef>
-    // <Buffer ad de ef be>
+    // <Buffer 43 eb d5 b7 dd f9 5f d7>
+    // <Buffer d7 5f f9 dd b7 d5 eb 43>
 
-### buf.writeUInt32LE(value, offset[, noAssert])
-### buf.writeUInt32BE(value, offset[, noAssert])
+### buf.writeFloatBE(value, offset[, noAssert])
+### buf.writeFloatLE(value, offset[, noAssert])
 
 * `value` Number
 * `offset` Number
 * `noAssert` Boolean, Optional, Default: false
 
 Writes `value` to the buffer at the specified offset with specified endian
-format. Note, `value` must be a valid unsigned 32 bit integer.
+format. Note, behavior is unspecified if `value` is not a 32 bit float.
 
 Set `noAssert` to true to skip validation of `value` and `offset`. This means
 that `value` may be too large for the specific function and `offset` may be
@@ -700,16 +689,16 @@ should not be used unless you are certain of correctness. Defaults to `false`.
 Example:
 
     var buf = new Buffer(4);
-    buf.writeUInt32BE(0xfeedface, 0);
+    buf.writeFloatBE(0xcafebabe, 0);
 
     console.log(buf);
 
-    buf.writeUInt32LE(0xfeedface, 0);
+    buf.writeFloatLE(0xcafebabe, 0);
 
     console.log(buf);
 
-    // <Buffer fe ed fa ce>
-    // <Buffer ce fa ed fe>
+    // <Buffer 4f 4a fe bb>
+    // <Buffer bb fe 4a 4f>
 
 ### buf.writeInt8(value, offset[, noAssert])
 
@@ -728,8 +717,8 @@ should not be used unless you are certain of correctness. Defaults to `false`.
 Works as `buffer.writeUInt8`, except value is written out as a two's complement
 signed integer into `buffer`.
 
-### buf.writeInt16LE(value, offset[, noAssert])
 ### buf.writeInt16BE(value, offset[, noAssert])
+### buf.writeInt16LE(value, offset[, noAssert])
 
 * `value` Number
 * `offset` Number
@@ -746,8 +735,8 @@ should not be used unless you are certain of correctness. Defaults to `false`.
 Works as `buffer.writeUInt16*`, except value is written out as a two's
 complement signed integer into `buffer`.
 
-### buf.writeInt32LE(value, offset[, noAssert])
 ### buf.writeInt32BE(value, offset[, noAssert])
+### buf.writeInt32LE(value, offset[, noAssert])
 
 * `value` Number
 * `offset` Number
@@ -764,15 +753,33 @@ should not be used unless you are certain of correctness. Defaults to `false`.
 Works as `buffer.writeUInt32*`, except value is written out as a two's
 complement signed integer into `buffer`.
 
-### buf.writeFloatLE(value, offset[, noAssert])
-### buf.writeFloatBE(value, offset[, noAssert])
+### buf.writeIntBE(value, offset, byteLength[, noAssert])
+### buf.writeIntLE(value, offset, byteLength[, noAssert])
+
+* `value` {Number} Bytes to be written to buffer
+* `offset` {Number} `0 <= offset <= buf.length`
+* `byteLength` {Number} `0 < byteLength <= 6`
+* `noAssert` {Boolean} Default: false
+* Return: {Number}
+
+Writes `value` to the buffer at the specified `offset` and `byteLength`.
+Supports up to 48 bits of accuracy. For example:
+
+    var b = new Buffer(6);
+    b.writeUIntBE(0x1234567890ab, 0, 6);
+    // <Buffer 12 34 56 78 90 ab>
+
+Set `noAssert` to `true` to skip validation of `value` and `offset`. Defaults
+to `false`.
+
+### buf.writeUInt8(value, offset[, noAssert])
 
 * `value` Number
 * `offset` Number
 * `noAssert` Boolean, Optional, Default: false
 
-Writes `value` to the buffer at the specified offset with specified endian
-format. Note, behavior is unspecified if `value` is not a 32 bit float.
+Writes `value` to the buffer at the specified offset. Note, `value` must be a
+valid unsigned 8 bit integer.
 
 Set `noAssert` to true to skip validation of `value` and `offset`. This means
 that `value` may be too large for the specific function and `offset` may be
@@ -782,26 +789,24 @@ should not be used unless you are certain of correctness. Defaults to `false`.
 Example:
 
     var buf = new Buffer(4);
-    buf.writeFloatBE(0xcafebabe, 0);
-
-    console.log(buf);
-
-    buf.writeFloatLE(0xcafebabe, 0);
+    buf.writeUInt8(0x3, 0);
+    buf.writeUInt8(0x4, 1);
+    buf.writeUInt8(0x23, 2);
+    buf.writeUInt8(0x42, 3);
 
     console.log(buf);
 
-    // <Buffer 4f 4a fe bb>
-    // <Buffer bb fe 4a 4f>
+    // <Buffer 03 04 23 42>
 
-### buf.writeDoubleLE(value, offset[, noAssert])
-### buf.writeDoubleBE(value, offset[, noAssert])
+### buf.writeUInt16BE(value, offset[, noAssert])
+### buf.writeUInt16LE(value, offset[, noAssert])
 
 * `value` Number
 * `offset` Number
 * `noAssert` Boolean, Optional, Default: false
 
 Writes `value` to the buffer at the specified offset with specified endian
-format. Note, `value` must be a valid 64 bit double.
+format. Note, `value` must be a valid unsigned 16 bit integer.
 
 Set `noAssert` to true to skip validation of `value` and `offset`. This means
 that `value` may be too large for the specific function and `offset` may be
@@ -810,43 +815,67 @@ should not be used unless you are certain of correctness. Defaults to `false`.
 
 Example:
 
-    var buf = new Buffer(8);
-    buf.writeDoubleBE(0xdeadbeefcafebabe, 0);
+    var buf = new Buffer(4);
+    buf.writeUInt16BE(0xdead, 0);
+    buf.writeUInt16BE(0xbeef, 2);
 
     console.log(buf);
 
-    buf.writeDoubleLE(0xdeadbeefcafebabe, 0);
+    buf.writeUInt16LE(0xdead, 0);
+    buf.writeUInt16LE(0xbeef, 2);
 
     console.log(buf);
 
-    // <Buffer 43 eb d5 b7 dd f9 5f d7>
-    // <Buffer d7 5f f9 dd b7 d5 eb 43>
+    // <Buffer de ad be ef>
+    // <Buffer ad de ef be>
 
-### buf.fill(value[, offset][, end])
+### buf.writeUInt32BE(value, offset[, noAssert])
+### buf.writeUInt32LE(value, offset[, noAssert])
 
-* `value`
-* `offset` Number, Optional
-* `end` Number, Optional
+* `value` Number
+* `offset` Number
+* `noAssert` Boolean, Optional, Default: false
 
-Fills the buffer with the specified value. If the `offset` (defaults to `0`)
-and `end` (defaults to `buffer.length`) are not given it will fill the entire
-buffer.
+Writes `value` to the buffer at the specified offset with specified endian
+format. Note, `value` must be a valid unsigned 32 bit integer.
 
-    var b = new Buffer(50);
-    b.fill("h");
+Set `noAssert` to true to skip validation of `value` and `offset`. This means
+that `value` may be too large for the specific function and `offset` may be
+beyond the end of the buffer leading to the values being silently dropped. This
+should not be used unless you are certain of correctness. Defaults to `false`.
 
-### buffer.values()
+Example:
 
-Creates iterator for buffer values (bytes). This function is called automatically
-when `buffer` is used in a `for..of` statement.
+    var buf = new Buffer(4);
+    buf.writeUInt32BE(0xfeedface, 0);
 
-### buffer.keys()
+    console.log(buf);
 
-Creates iterator for buffer keys (indices).
+    buf.writeUInt32LE(0xfeedface, 0);
 
-### buffer.entries()
+    console.log(buf);
 
-Creates iterator for `[index, byte]` arrays.
+    // <Buffer fe ed fa ce>
+    // <Buffer ce fa ed fe>
+
+### buf.writeUIntBE(value, offset, byteLength[, noAssert])
+### buf.writeUIntLE(value, offset, byteLength[, noAssert])
+
+* `value` {Number} Bytes to be written to buffer
+* `offset` {Number} `0 <= offset <= buf.length`
+* `byteLength` {Number} `0 < byteLength <= 6`
+* `noAssert` {Boolean} Default: false
+* Return: {Number}
+
+Writes `value` to the buffer at the specified `offset` and `byteLength`.
+Supports up to 48 bits of accuracy. For example:
+
+    var b = new Buffer(6);
+    b.writeUIntBE(0x1234567890ab, 0, 6);
+    // <Buffer 12 34 56 78 90 ab>
+
+Set `noAssert` to `true` to skip validation of `value` and `offset`. Defaults
+to `false`.
 
 ## buffer.INSPECT_MAX_BYTES
 

From 5c30e5dadaa9782300a0c5e2f1f1668c9e8b1cfc Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 10:50:18 -0500
Subject: [PATCH 147/323] doc: sort child_process alphabetically

Reorders, with no contextual changes, the child_process documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/child_process.markdown | 598 ++++++++++++++++-----------------
 1 file changed, 299 insertions(+), 299 deletions(-)

diff --git a/doc/api/child_process.markdown b/doc/api/child_process.markdown
index 954354cc32a810..ad7ceeb9612dca 100644
--- a/doc/api/child_process.markdown
+++ b/doc/api/child_process.markdown
@@ -31,6 +31,22 @@ The ChildProcess class is not intended to be used directly.  Use the
 `spawn()`, `exec()`, `execFile()`, or `fork()` methods to create a Child
 Process instance.
 
+### Event: 'close'
+
+* `code` {Number} the exit code, if it exited normally.
+* `signal` {String} the signal passed to kill the child process, if it
+  was killed by the parent.
+
+This event is emitted when the stdio streams of a child process have all
+terminated.  This is distinct from 'exit', since multiple processes
+might share the same stdio streams.
+
+### Event: 'disconnect'
+
+This event is emitted after calling the `.disconnect()` method in the parent
+or in the child. After disconnecting it is no longer possible to send messages,
+and the `.connected` property is false.
+
 ### Event:  'error'
 
 * `err` {Error Object} the error.
@@ -67,22 +83,6 @@ it will exit.
 
 See `waitpid(2)`.
 
-### Event: 'close'
-
-* `code` {Number} the exit code, if it exited normally.
-* `signal` {String} the signal passed to kill the child process, if it
-  was killed by the parent.
-
-This event is emitted when the stdio streams of a child process have all
-terminated.  This is distinct from 'exit', since multiple processes
-might share the same stdio streams.
-
-### Event: 'disconnect'
-
-This event is emitted after calling the `.disconnect()` method in the parent
-or in the child. After disconnecting it is no longer possible to send messages,
-and the `.connected` property is false.
-
 ### Event: 'message'
 
 * `message` {Object} a parsed JSON object or primitive value.
@@ -92,99 +92,24 @@ and the `.connected` property is false.
 Messages sent by `.send(message, [sendHandle])` are obtained using the
 `message` event.
 
-### child.stdin
-
-* {Stream object}
-
-A `Writable Stream` that represents the child process's `stdin`.
-If the child is waiting to read all its input, it will not continue until this
-stream has been closed via `end()`.
-
-If the child was not spawned with `stdio[0]` set to `'pipe'`, then this will
-not be set.
-
-`child.stdin` is shorthand for `child.stdio[0]`. Both properties will refer
-to the same object, or null.
-
-### child.stdout
-
-* {Stream object}
-
-A `Readable Stream` that represents the child process's `stdout`.
-
-If the child was not spawned with `stdio[1]` set to `'pipe'`, then this will
-not be set.
-
-`child.stdout` is shorthand for `child.stdio[1]`. Both properties will refer
-to the same object, or null.
-
-### child.stderr
-
-* {Stream object}
-
-A `Readable Stream` that represents the child process's `stderr`.
-
-If the child was not spawned with `stdio[2]` set to `'pipe'`, then this will
-not be set.
-
-`child.stderr` is shorthand for `child.stdio[2]`. Both properties will refer
-to the same object, or null.
-
-### child.stdio
-
-* {Array}
-
-A sparse array of pipes to the child process, corresponding with positions in
-the [stdio](#child_process_options_stdio) option to
-[spawn](#child_process_child_process_spawn_command_args_options) that have been
-set to `'pipe'`.
-Note that streams 0-2 are also available as ChildProcess.stdin,
-ChildProcess.stdout, and ChildProcess.stderr, respectively.
-
-In the following example, only the child's fd `1` is setup as a pipe, so only
-the parent's `child.stdio[1]` is a stream, all other values in the array are
-`null`.
-
-    var assert = require('assert');
-    var fs = require('fs');
-    var child_process = require('child_process');
-
-    child = child_process.spawn('ls', {
-        stdio: [
-          0, // use parents stdin for child
-          'pipe', // pipe child's stdout to parent
-          fs.openSync('err.out', 'w') // direct child's stderr to a file
-        ]
-    });
-
-    assert.equal(child.stdio[0], null);
-    assert.equal(child.stdio[0], child.stdin);
-
-    assert(child.stdout);
-    assert.equal(child.stdio[1], child.stdout);
-
-    assert.equal(child.stdio[2], null);
-    assert.equal(child.stdio[2], child.stderr);
-
-### child.pid
-
-* {Integer}
-
-The PID of the child process.
+### child.connected
 
-Example:
+* {Boolean} Set to false after `.disconnect` is called
 
-    var spawn = require('child_process').spawn,
-        grep  = spawn('grep', ['ssh']);
+If `.connected` is false, it is no longer possible to send messages.
 
-    console.log('Spawned child pid: ' + grep.pid);
-    grep.stdin.end();
+### child.disconnect()
 
-### child.connected
+Close the IPC channel between parent and child, allowing the child to exit
+gracefully once there are no other connections keeping it alive. After calling
+this method the `.connected` flag will be set to `false` in both the parent and
+child, and it is no longer possible to send messages.
 
-* {Boolean} Set to false after `.disconnect` is called
+The 'disconnect' event will be emitted when there are no messages in the process
+of being received, most likely immediately.
 
-If `.connected` is false, it is no longer possible to send messages.
+Note that you can also call `process.disconnect()` in the child process when the
+child process has any open IPC channels with the parent (i.e `fork()`).
 
 ### child.kill([signal])
 
@@ -215,6 +140,20 @@ to a process.
 
 See `kill(2)`
 
+### child.pid
+
+* {Integer}
+
+The PID of the child process.
+
+Example:
+
+    var spawn = require('child_process').spawn,
+        grep  = spawn('grep', ['ssh']);
+
+    console.log('Spawned child pid: ' + grep.pid);
+    grep.stdin.end();
+
 ### child.send(message[, sendHandle][, callback])
 
 * `message` {Object}
@@ -340,23 +279,206 @@ longer keep track of when the socket is destroyed. To indicate this condition
 the `.connections` property becomes `null`.
 It is also recommended not to use `.maxConnections` in this condition.
 
-### child.disconnect()
+### child.stderr
 
-Close the IPC channel between parent and child, allowing the child to exit
-gracefully once there are no other connections keeping it alive. After calling
-this method the `.connected` flag will be set to `false` in both the parent and
-child, and it is no longer possible to send messages.
+* {Stream object}
 
-The 'disconnect' event will be emitted when there are no messages in the process
-of being received, most likely immediately.
+A `Readable Stream` that represents the child process's `stderr`.
 
-Note that you can also call `process.disconnect()` in the child process when the
-child process has any open IPC channels with the parent (i.e `fork()`).
+If the child was not spawned with `stdio[2]` set to `'pipe'`, then this will
+not be set.
+
+`child.stderr` is shorthand for `child.stdio[2]`. Both properties will refer
+to the same object, or null.
+
+### child.stdin
+
+* {Stream object}
+
+A `Writable Stream` that represents the child process's `stdin`.
+If the child is waiting to read all its input, it will not continue until this
+stream has been closed via `end()`.
+
+If the child was not spawned with `stdio[0]` set to `'pipe'`, then this will
+not be set.
+
+`child.stdin` is shorthand for `child.stdio[0]`. Both properties will refer
+to the same object, or null.
+
+### child.stdio
+
+* {Array}
+
+A sparse array of pipes to the child process, corresponding with positions in
+the [stdio](#child_process_options_stdio) option to
+[spawn](#child_process_child_process_spawn_command_args_options) that have been
+set to `'pipe'`.
+Note that streams 0-2 are also available as ChildProcess.stdin,
+ChildProcess.stdout, and ChildProcess.stderr, respectively.
+
+In the following example, only the child's fd `1` is setup as a pipe, so only
+the parent's `child.stdio[1]` is a stream, all other values in the array are
+`null`.
+
+    var assert = require('assert');
+    var fs = require('fs');
+    var child_process = require('child_process');
+
+    child = child_process.spawn('ls', {
+        stdio: [
+          0, // use parents stdin for child
+          'pipe', // pipe child's stdout to parent
+          fs.openSync('err.out', 'w') // direct child's stderr to a file
+        ]
+    });
+
+    assert.equal(child.stdio[0], null);
+    assert.equal(child.stdio[0], child.stdin);
+
+    assert(child.stdout);
+    assert.equal(child.stdio[1], child.stdout);
+
+    assert.equal(child.stdio[2], null);
+    assert.equal(child.stdio[2], child.stderr);
+
+### child.stdout
+
+* {Stream object}
+
+A `Readable Stream` that represents the child process's `stdout`.
+
+If the child was not spawned with `stdio[1]` set to `'pipe'`, then this will
+not be set.
+
+`child.stdout` is shorthand for `child.stdio[1]`. Both properties will refer
+to the same object, or null.
 
 ## Asynchronous Process Creation
 
-These methods follow the common async programming patterns (accepting a
-callback or returning an EventEmitter).
+These methods follow the common async programming patterns (accepting a
+callback or returning an EventEmitter).
+
+### child_process.exec(command[, options], callback)
+
+* `command` {String} The command to run, with space-separated arguments
+* `options` {Object}
+  * `cwd` {String} Current working directory of the child process
+  * `env` {Object} Environment key-value pairs
+  * `encoding` {String} (Default: 'utf8')
+  * `shell` {String} Shell to execute the command with
+    (Default: '/bin/sh' on UNIX, 'cmd.exe' on Windows,  The shell should
+     understand the `-c` switch on UNIX or `/s /c` on Windows. On Windows,
+     command line parsing should be compatible with `cmd.exe`.)
+  * `timeout` {Number} (Default: 0)
+  * `maxBuffer` {Number} largest amount of data (in bytes) allowed on stdout or
+    stderr - if exceeded child process is killed (Default: `200*1024`)
+  * `killSignal` {String} (Default: 'SIGTERM')
+  * `uid` {Number} Sets the user identity of the process. (See setuid(2).)
+  * `gid` {Number} Sets the group identity of the process. (See setgid(2).)
+* `callback` {Function} called with the output when process terminates
+  * `error` {Error}
+  * `stdout` {Buffer}
+  * `stderr` {Buffer}
+* Return: ChildProcess object
+
+Runs a command in a shell and buffers the output.
+
+    var exec = require('child_process').exec,
+        child;
+
+    child = exec('cat *.js bad_file | wc -l',
+      function (error, stdout, stderr) {
+        console.log('stdout: ' + stdout);
+        console.log('stderr: ' + stderr);
+        if (error !== null) {
+          console.log('exec error: ' + error);
+        }
+    });
+
+The callback gets the arguments `(error, stdout, stderr)`. On success, `error`
+will be `null`.  On error, `error` will be an instance of `Error` and `error.code`
+will be the exit code of the child process, and `error.signal` will be set to the
+signal that terminated the process.
+
+There is a second optional argument to specify several options. The
+default options are
+
+    { encoding: 'utf8',
+      timeout: 0,
+      maxBuffer: 200*1024,
+      killSignal: 'SIGTERM',
+      cwd: null,
+      env: null }
+
+If `timeout` is greater than 0, then it will kill the child process
+if it runs longer than `timeout` milliseconds. The child process is killed with
+`killSignal` (default: `'SIGTERM'`). `maxBuffer` specifies the largest
+amount of data (in bytes) allowed on stdout or stderr - if this value is
+exceeded then the child process is killed.
+
+*Note: Unlike the `exec()` POSIX system call, `child_process.exec()` does not replace
+the existing process and uses a shell to execute the command.*
+
+### child_process.execFile(file[, args][, options][, callback])
+
+* `file` {String} The filename of the program to run
+* `args` {Array} List of string arguments
+* `options` {Object}
+  * `cwd` {String} Current working directory of the child process
+  * `env` {Object} Environment key-value pairs
+  * `encoding` {String} (Default: 'utf8')
+  * `timeout` {Number} (Default: 0)
+  * `maxBuffer` {Number} largest amount of data (in bytes) allowed on stdout or
+    stderr - if exceeded child process is killed (Default: 200\*1024)
+  * `killSignal` {String} (Default: 'SIGTERM')
+  * `uid` {Number} Sets the user identity of the process. (See setuid(2).)
+  * `gid` {Number} Sets the group identity of the process. (See setgid(2).)
+* `callback` {Function} called with the output when process terminates
+  * `error` {Error}
+  * `stdout` {Buffer}
+  * `stderr` {Buffer}
+* Return: ChildProcess object
+
+This is similar to [`child_process.exec()`](#child_process_child_process_exec_command_options_callback) except it does not execute a
+subshell but rather the specified file directly. This makes it slightly
+leaner than [`child_process.exec()`](#child_process_child_process_exec_command_options_callback). It has the same options.
+
+
+### child_process.fork(modulePath[, args][, options])
+
+* `modulePath` {String} The module to run in the child
+* `args` {Array} List of string arguments
+* `options` {Object}
+  * `cwd` {String} Current working directory of the child process
+  * `env` {Object} Environment key-value pairs
+  * `execPath` {String} Executable used to create the child process
+  * `execArgv` {Array} List of string arguments passed to the executable
+    (Default: `process.execArgv`)
+  * `silent` {Boolean} If true, stdin, stdout, and stderr of the child will be
+    piped to the parent, otherwise they will be inherited from the parent, see
+    the "pipe" and "inherit" options for `spawn()`'s `stdio` for more details
+    (default is false)
+  * `uid` {Number} Sets the user identity of the process. (See setuid(2).)
+  * `gid` {Number} Sets the group identity of the process. (See setgid(2).)
+* Return: ChildProcess object
+
+This is a special case of the [`child_process.spawn()`](#child_process_child_process_spawn_command_args_options) functionality for spawning Node.js
+processes. In addition to having all the methods in a normal ChildProcess
+instance, the returned object has a communication channel built-in. See
+[`child.send(message, [sendHandle])`](#child_process_child_send_message_sendhandle_callback) for details.
+
+These child Node.js processes are still whole new instances of V8. Assume at
+least 30ms startup and 10mb memory for each new Node.js. That is, you cannot
+create many thousands of them.
+
+The `execPath` property in the `options` object allows for a process to be
+created for the child rather than the current `node` executable. This should be
+done with care and by default will talk over the fd represented an
+environmental variable `NODE_CHANNEL_FD` on the child process. The input and
+output on this fd is expected to be line delimited JSON objects.
+
+*Note: Unlike the `fork()` POSIX system call, `child_process.fork()` does not clone the
+current process.*
 
 ### child_process.spawn(command[, args][, options])
 
@@ -452,6 +574,42 @@ Example of checking for failed exec:
       console.log('Failed to start child process.');
     });
 
+#### options.detached
+
+On Windows, this makes it possible for the child to continue running after the
+parent exits. The child will have a new console window (this cannot be
+disabled).
+
+On non-Windows, if the `detached` option is set, the child process will be made
+the leader of a new process group and session. Note that child processes may
+continue running after the parent exits whether they are detached or not.  See
+`setsid(2)` for more information.
+
+By default, the parent will wait for the detached child to exit.  To prevent
+the parent from waiting for a given `child`, use the `child.unref()` method,
+and the parent's event loop will not include the child in its reference count.
+
+Example of detaching a long-running process and redirecting its output to a
+file:
+
+     var fs = require('fs'),
+         spawn = require('child_process').spawn,
+         out = fs.openSync('./out.log', 'a'),
+         err = fs.openSync('./out.log', 'a');
+
+     var child = spawn('prg', [], {
+       detached: true,
+       stdio: [ 'ignore', out, err ]
+     });
+
+     child.unref();
+
+When using the `detached` option to start a long-running process, the process
+will not stay running in the background after the parent exits unless it is
+provided with a `stdio` configuration that is not connected to the parent.
+If the parent's `stdio` is inherited, the child will remain attached to the
+controlling terminal.
+
 #### options.stdio
 
 As a shorthand, the `stdio` argument may be one of the following strings:
@@ -505,166 +663,8 @@ Example:
     // startd-style interface.
     spawn('prg', [], { stdio: ['pipe', null, null, null, 'pipe'] });
 
-#### options.detached
-
-On Windows, this makes it possible for the child to continue running after the
-parent exits. The child will have a new console window (this cannot be
-disabled).
-
-On non-Windows, if the `detached` option is set, the child process will be made
-the leader of a new process group and session. Note that child processes may
-continue running after the parent exits whether they are detached or not.  See
-`setsid(2)` for more information.
-
-By default, the parent will wait for the detached child to exit.  To prevent
-the parent from waiting for a given `child`, use the `child.unref()` method,
-and the parent's event loop will not include the child in its reference count.
-
-Example of detaching a long-running process and redirecting its output to a
-file:
-
-     var fs = require('fs'),
-         spawn = require('child_process').spawn,
-         out = fs.openSync('./out.log', 'a'),
-         err = fs.openSync('./out.log', 'a');
-
-     var child = spawn('prg', [], {
-       detached: true,
-       stdio: [ 'ignore', out, err ]
-     });
-
-     child.unref();
-
-When using the `detached` option to start a long-running process, the process
-will not stay running in the background after the parent exits unless it is
-provided with a `stdio` configuration that is not connected to the parent.
-If the parent's `stdio` is inherited, the child will remain attached to the
-controlling terminal.
-
 See also: [`child_process.exec()`](#child_process_child_process_exec_command_options_callback) and [`child_process.fork()`](#child_process_child_process_fork_modulepath_args_options)
 
-### child_process.exec(command[, options], callback)
-
-* `command` {String} The command to run, with space-separated arguments
-* `options` {Object}
-  * `cwd` {String} Current working directory of the child process
-  * `env` {Object} Environment key-value pairs
-  * `encoding` {String} (Default: 'utf8')
-  * `shell` {String} Shell to execute the command with
-    (Default: '/bin/sh' on UNIX, 'cmd.exe' on Windows,  The shell should
-     understand the `-c` switch on UNIX or `/s /c` on Windows. On Windows,
-     command line parsing should be compatible with `cmd.exe`.)
-  * `timeout` {Number} (Default: 0)
-  * `maxBuffer` {Number} largest amount of data (in bytes) allowed on stdout or
-    stderr - if exceeded child process is killed (Default: `200*1024`)
-  * `killSignal` {String} (Default: 'SIGTERM')
-  * `uid` {Number} Sets the user identity of the process. (See setuid(2).)
-  * `gid` {Number} Sets the group identity of the process. (See setgid(2).)
-* `callback` {Function} called with the output when process terminates
-  * `error` {Error}
-  * `stdout` {Buffer}
-  * `stderr` {Buffer}
-* Return: ChildProcess object
-
-Runs a command in a shell and buffers the output.
-
-    var exec = require('child_process').exec,
-        child;
-
-    child = exec('cat *.js bad_file | wc -l',
-      function (error, stdout, stderr) {
-        console.log('stdout: ' + stdout);
-        console.log('stderr: ' + stderr);
-        if (error !== null) {
-          console.log('exec error: ' + error);
-        }
-    });
-
-The callback gets the arguments `(error, stdout, stderr)`. On success, `error`
-will be `null`.  On error, `error` will be an instance of `Error` and `error.code`
-will be the exit code of the child process, and `error.signal` will be set to the
-signal that terminated the process.
-
-There is a second optional argument to specify several options. The
-default options are
-
-    { encoding: 'utf8',
-      timeout: 0,
-      maxBuffer: 200*1024,
-      killSignal: 'SIGTERM',
-      cwd: null,
-      env: null }
-
-If `timeout` is greater than 0, then it will kill the child process
-if it runs longer than `timeout` milliseconds. The child process is killed with
-`killSignal` (default: `'SIGTERM'`). `maxBuffer` specifies the largest
-amount of data (in bytes) allowed on stdout or stderr - if this value is
-exceeded then the child process is killed.
-
-*Note: Unlike the `exec()` POSIX system call, `child_process.exec()` does not replace
-the existing process and uses a shell to execute the command.*
-
-### child_process.execFile(file[, args][, options][, callback])
-
-* `file` {String} The filename of the program to run
-* `args` {Array} List of string arguments
-* `options` {Object}
-  * `cwd` {String} Current working directory of the child process
-  * `env` {Object} Environment key-value pairs
-  * `encoding` {String} (Default: 'utf8')
-  * `timeout` {Number} (Default: 0)
-  * `maxBuffer` {Number} largest amount of data (in bytes) allowed on stdout or
-    stderr - if exceeded child process is killed (Default: 200\*1024)
-  * `killSignal` {String} (Default: 'SIGTERM')
-  * `uid` {Number} Sets the user identity of the process. (See setuid(2).)
-  * `gid` {Number} Sets the group identity of the process. (See setgid(2).)
-* `callback` {Function} called with the output when process terminates
-  * `error` {Error}
-  * `stdout` {Buffer}
-  * `stderr` {Buffer}
-* Return: ChildProcess object
-
-This is similar to [`child_process.exec()`](#child_process_child_process_exec_command_options_callback) except it does not execute a
-subshell but rather the specified file directly. This makes it slightly
-leaner than [`child_process.exec()`](#child_process_child_process_exec_command_options_callback). It has the same options.
-
-
-### child_process.fork(modulePath[, args][, options])
-
-* `modulePath` {String} The module to run in the child
-* `args` {Array} List of string arguments
-* `options` {Object}
-  * `cwd` {String} Current working directory of the child process
-  * `env` {Object} Environment key-value pairs
-  * `execPath` {String} Executable used to create the child process
-  * `execArgv` {Array} List of string arguments passed to the executable
-    (Default: `process.execArgv`)
-  * `silent` {Boolean} If true, stdin, stdout, and stderr of the child will be
-    piped to the parent, otherwise they will be inherited from the parent, see
-    the "pipe" and "inherit" options for `spawn()`'s `stdio` for more details
-    (default is false)
-  * `uid` {Number} Sets the user identity of the process. (See setuid(2).)
-  * `gid` {Number} Sets the group identity of the process. (See setgid(2).)
-* Return: ChildProcess object
-
-This is a special case of the [`child_process.spawn()`](#child_process_child_process_spawn_command_args_options) functionality for spawning Node.js
-processes. In addition to having all the methods in a normal ChildProcess
-instance, the returned object has a communication channel built-in. See
-[`child.send(message, [sendHandle])`](#child_process_child_send_message_sendhandle_callback) for details.
-
-These child Node.js processes are still whole new instances of V8. Assume at
-least 30ms startup and 10mb memory for each new Node.js. That is, you cannot
-create many thousands of them.
-
-The `execPath` property in the `options` object allows for a process to be
-created for the child rather than the current `node` executable. This should be
-done with care and by default will talk over the fd represented an
-environmental variable `NODE_CHANNEL_FD` on the child process. The input and
-output on this fd is expected to be line delimited JSON objects.
-
-*Note: Unlike the `fork()` POSIX system call, `child_process.fork()` does not clone the
-current process.*
-
 ## Synchronous Process Creation
 
 These methods are **synchronous**, meaning they **WILL** block the event loop,
@@ -674,15 +674,17 @@ Blocking calls like these are mostly useful for simplifying general purpose
 scripting tasks and for simplifying the loading/processing of application
 configuration at startup.
 
-### child_process.spawnSync(command[, args][, options])
+### child_process.execFileSync(file[, args][, options])
 
-* `command` {String} The command to run
+* `file` {String} The filename of the program to run
 * `args` {Array} List of string arguments
 * `options` {Object}
   * `cwd` {String} Current working directory of the child process
   * `input` {String|Buffer} The value which will be passed as stdin to the spawned process
     - supplying this value will override `stdio[0]`
-  * `stdio` {Array} Child's stdio configuration.
+  * `stdio` {Array} Child's stdio configuration. (Default: 'pipe')
+    - `stderr` by default will be output to the parent process' stderr unless
+      `stdio` is specified
   * `env` {Object} Environment key-value pairs
   * `uid` {Number} Sets the user identity of the process. (See setuid(2).)
   * `gid` {Number} Sets the group identity of the process. (See setgid(2).)
@@ -691,21 +693,22 @@ configuration at startup.
   * `maxBuffer` {Number} largest amount of data (in bytes) allowed on stdout or
     stderr - if exceeded child process is killed
   * `encoding` {String} The encoding used for all stdio inputs and outputs. (Default: 'buffer')
-* return: {Object}
-  * `pid` {Number} Pid of the child process
-  * `output` {Array} Array of results from stdio output
-  * `stdout` {Buffer|String} The contents of `output[1]`
-  * `stderr` {Buffer|String} The contents of `output[2]`
-  * `status` {Number} The exit code of the child process
-  * `signal` {String} The signal used to kill the child process
-  * `error` {Error} The error object if the child process failed or timed out
+* return: {Buffer|String} The stdout from the command
 
-`spawnSync` will not return until the child process has fully closed. When a
+`execFileSync` will not return until the child process has fully closed. When a
 timeout has been encountered and `killSignal` is sent, the method won't return
 until the process has completely exited. That is to say, if the process handles
 the `SIGTERM` signal and doesn't exit, your process will wait until the child
 process has exited.
 
+If the process times out, or has a non-zero exit code, this method ***will***
+throw.  The `Error` object will contain the entire result from
+[`child_process.spawnSync()`](#child_process_child_process_spawnsync_command_args_options)
+
+[EventEmitter]: events.html#events_class_events_eventemitter
+[net.Server]: net.html#net_class_net_server
+[net.Socket]: net.html#net_class_net_socket
+
 ### child_process.execSync(command[, options])
 
 * `command` {String} The command to run
@@ -740,17 +743,15 @@ If the process times out, or has a non-zero exit code, this method ***will***
 throw.  The `Error` object will contain the entire result from
 [`child_process.spawnSync()`](#child_process_child_process_spawnsync_command_args_options)
 
-### child_process.execFileSync(file[, args][, options])
+### child_process.spawnSync(command[, args][, options])
 
-* `file` {String} The filename of the program to run
+* `command` {String} The command to run
 * `args` {Array} List of string arguments
 * `options` {Object}
   * `cwd` {String} Current working directory of the child process
   * `input` {String|Buffer} The value which will be passed as stdin to the spawned process
     - supplying this value will override `stdio[0]`
-  * `stdio` {Array} Child's stdio configuration. (Default: 'pipe')
-    - `stderr` by default will be output to the parent process' stderr unless
-      `stdio` is specified
+  * `stdio` {Array} Child's stdio configuration.
   * `env` {Object} Environment key-value pairs
   * `uid` {Number} Sets the user identity of the process. (See setuid(2).)
   * `gid` {Number} Sets the group identity of the process. (See setgid(2).)
@@ -759,18 +760,17 @@ throw.  The `Error` object will contain the entire result from
   * `maxBuffer` {Number} largest amount of data (in bytes) allowed on stdout or
     stderr - if exceeded child process is killed
   * `encoding` {String} The encoding used for all stdio inputs and outputs. (Default: 'buffer')
-* return: {Buffer|String} The stdout from the command
+* return: {Object}
+  * `pid` {Number} Pid of the child process
+  * `output` {Array} Array of results from stdio output
+  * `stdout` {Buffer|String} The contents of `output[1]`
+  * `stderr` {Buffer|String} The contents of `output[2]`
+  * `status` {Number} The exit code of the child process
+  * `signal` {String} The signal used to kill the child process
+  * `error` {Error} The error object if the child process failed or timed out
 
-`execFileSync` will not return until the child process has fully closed. When a
+`spawnSync` will not return until the child process has fully closed. When a
 timeout has been encountered and `killSignal` is sent, the method won't return
 until the process has completely exited. That is to say, if the process handles
 the `SIGTERM` signal and doesn't exit, your process will wait until the child
 process has exited.
-
-If the process times out, or has a non-zero exit code, this method ***will***
-throw.  The `Error` object will contain the entire result from
-[`child_process.spawnSync()`](#child_process_child_process_spawnsync_command_args_options)
-
-[EventEmitter]: events.html#events_class_events_eventemitter
-[net.Server]: net.html#net_class_net_server
-[net.Socket]: net.html#net_class_net_socket

From 05f1af7124380c11637508ca0b968416cfcc9966 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 10:51:00 -0500
Subject: [PATCH 148/323] doc: sort cluster alphabetically

Reorders, with no contextual changes, the cluster documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/cluster.markdown | 748 ++++++++++++++++++++-------------------
 1 file changed, 375 insertions(+), 373 deletions(-)

diff --git a/doc/api/cluster.markdown b/doc/api/cluster.markdown
index a1d30ef6001b8b..594dea0832908d 100644
--- a/doc/api/cluster.markdown
+++ b/doc/api/cluster.markdown
@@ -101,294 +101,219 @@ will be dropped and new connections will be refused.  Node.js does not
 automatically manage the number of workers for you, however.  It is your
 responsibility to manage the worker pool for your application's needs.
 
-## cluster.schedulingPolicy
-
-The scheduling policy, either `cluster.SCHED_RR` for round-robin or
-`cluster.SCHED_NONE` to leave it to the operating system. This is a
-global setting and effectively frozen once you spawn the first worker
-or call `cluster.setupMaster()`, whatever comes first.
-
-`SCHED_RR` is the default on all operating systems except Windows.
-Windows will change to `SCHED_RR` once libuv is able to effectively
-distribute IOCP handles without incurring a large performance hit.
-
-`cluster.schedulingPolicy` can also be set through the
-`NODE_CLUSTER_SCHED_POLICY` environment variable. Valid
-values are `"rr"` and `"none"`.
-
-## cluster.settings
-
-* {Object}
-  * `execArgv` {Array} list of string arguments passed to the Node.js
-    executable. (Default=`process.execArgv`)
-  * `exec` {String} file path to worker file.  (Default=`process.argv[1]`)
-  * `args` {Array} string arguments passed to worker.
-    (Default=`process.argv.slice(2)`)
-  * `silent` {Boolean} whether or not to send output to parent's stdio.
-    (Default=`false`)
-  * `uid` {Number} Sets the user identity of the process. (See setuid(2).)
-  * `gid` {Number} Sets the group identity of the process. (See setgid(2).)
-
-After calling `.setupMaster()` (or `.fork()`) this settings object will contain
-the settings, including the default values.
-
-It is effectively frozen after being set, because `.setupMaster()` can
-only be called once.
-
-This object is not supposed to be changed or set manually, by you.
-
-## cluster.isMaster
-
-* {Boolean}
 
-True if the process is a master. This is determined
-by the `process.env.NODE_UNIQUE_ID`. If `process.env.NODE_UNIQUE_ID` is
-undefined, then `isMaster` is `true`.
-
-## cluster.isWorker
-
-* {Boolean}
 
-True if the process is not a master (it is the negation of `cluster.isMaster`).
-
-## Event: 'fork'
+## Class: Worker
 
-* `worker` {Worker object}
+A Worker object contains all public information and method about a worker.
+In the master it can be obtained using `cluster.workers`. In a worker
+it can be obtained using `cluster.worker`.
 
-When a new worker is forked the cluster module will emit a 'fork' event.
-This can be used to log worker activity, and create your own timeout.
+### Event: 'disconnect'
 
-    var timeouts = [];
-    function errorMsg() {
-      console.error("Something must be wrong with the connection ...");
-    }
+Similar to the `cluster.on('disconnect')` event, but specific to this worker.
 
-    cluster.on('fork', function(worker) {
-      timeouts[worker.id] = setTimeout(errorMsg, 2000);
-    });
-    cluster.on('listening', function(worker, address) {
-      clearTimeout(timeouts[worker.id]);
-    });
-    cluster.on('exit', function(worker, code, signal) {
-      clearTimeout(timeouts[worker.id]);
-      errorMsg();
+    cluster.fork().on('disconnect', function() {
+      // Worker has disconnected
     });
 
-## Event: 'online'
-
-* `worker` {Worker object}
+### Event: 'error'
 
-After forking a new worker, the worker should respond with an online message.
-When the master receives an online message it will emit this event.
-The difference between 'fork' and 'online' is that fork is emitted when the
-master forks a worker, and 'online' is emitted when the worker is running.
+This event is the same as the one provided by `child_process.fork()`.
 
-    cluster.on('online', function(worker) {
-      console.log("Yay, the worker responded after it was forked");
-    });
+In a worker you can also use `process.on('error')`.
 
-## Event: 'listening'
+[ChildProcess.send()]: child_process.html#child_process_child_send_message_sendhandle_callback
 
-* `worker` {Worker object}
-* `address` {Object}
+### Event: 'exit'
 
-After calling `listen()` from a worker, when the 'listening' event is emitted on
-the server, a listening event will also be emitted on `cluster` in the master.
+* `code` {Number} the exit code, if it exited normally.
+* `signal` {String} the name of the signal (eg. `'SIGHUP'`) that caused
+  the process to be killed.
 
-The event handler is executed with two arguments, the `worker` contains the worker
-object and the `address` object contains the following connection properties:
-`address`, `port` and `addressType`. This is very useful if the worker is listening
-on more than one address.
+Similar to the `cluster.on('exit')` event, but specific to this worker.
 
-    cluster.on('listening', function(worker, address) {
-      console.log("A worker is now connected to " + address.address + ":" + address.port);
+    var worker = cluster.fork();
+    worker.on('exit', function(code, signal) {
+      if( signal ) {
+        console.log("worker was killed by signal: "+signal);
+      } else if( code !== 0 ) {
+        console.log("worker exited with error code: "+code);
+      } else {
+        console.log("worker success!");
+      }
     });
 
-The `addressType` is one of:
-
-* `4` (TCPv4)
-* `6` (TCPv6)
-* `-1` (unix domain socket)
-* `"udp4"` or `"udp6"` (UDP v4 or v6)
-
-## Event: 'disconnect'
-
-* `worker` {Worker object}
+### Event: 'listening'
 
-Emitted after the worker IPC channel has disconnected. This can occur when a
-worker exits gracefully, is killed, or is disconnected manually (such as with
-worker.disconnect()).
+* `address` {Object}
 
-There may be a delay between the `disconnect` and `exit` events.  These events
-can be used to detect if the process is stuck in a cleanup or if there are
-long-living connections.
+Similar to the `cluster.on('listening')` event, but specific to this worker.
 
-    cluster.on('disconnect', function(worker) {
-      console.log('The worker #' + worker.id + ' has disconnected');
+    cluster.fork().on('listening', function(address) {
+      // Worker is listening
     });
 
-## Event: 'exit'
-
-* `worker` {Worker object}
-* `code` {Number} the exit code, if it exited normally.
-* `signal` {String} the name of the signal (eg. `'SIGHUP'`) that caused
-  the process to be killed.
-
-When any of the workers die the cluster module will emit the 'exit' event.
-
-This can be used to restart the worker by calling `.fork()` again.
+It is not emitted in the worker.
 
-    cluster.on('exit', function(worker, code, signal) {
-      console.log('worker %d died (%s). restarting...',
-        worker.process.pid, signal || code);
-      cluster.fork();
-    });
+### Event: 'message'
 
-See [child_process event: 'exit'](child_process.html#child_process_event_exit).
+* `message` {Object}
 
-## Event: 'message'
+Similar to the `cluster.on('message')` event, but specific to this worker.
 
-* `worker` {Worker object}
-* `message` {Object}
+This event is the same as the one provided by `child_process.fork()`.
 
-Emitted when any worker receives a message.
+In a worker you can also use `process.on('message')`.
 
-See
-[child_process event: 'message'](child_process.html#child_process_event_message).
+As an example, here is a cluster that keeps count of the number of requests
+in the master process using the message system:
 
-## Event: 'setup'
+    var cluster = require('cluster');
+    var http = require('http');
 
-* `settings` {Object}
+    if (cluster.isMaster) {
 
-Emitted every time `.setupMaster()` is called.
+      // Keep track of http requests
+      var numReqs = 0;
+      setInterval(function() {
+        console.log("numReqs =", numReqs);
+      }, 1000);
 
-The `settings` object is the `cluster.settings` object at the time
-`.setupMaster()` was called and is advisory only, since multiple calls to
-`.setupMaster()` can be made in a single tick.
+      // Count requests
+      function messageHandler(msg) {
+        if (msg.cmd && msg.cmd == 'notifyRequest') {
+          numReqs += 1;
+        }
+      }
 
-If accuracy is important, use `cluster.settings`.
+      // Start workers and listen for messages containing notifyRequest
+      var numCPUs = require('os').cpus().length;
+      for (var i = 0; i < numCPUs; i++) {
+        cluster.fork();
+      }
 
-## cluster.setupMaster([settings])
+      Object.keys(cluster.workers).forEach(function(id) {
+        cluster.workers[id].on('message', messageHandler);
+      });
 
-* `settings` {Object}
-  * `exec` {String} file path to worker file.  (Default=`process.argv[1]`)
-  * `args` {Array} string arguments passed to worker.
-    (Default=`process.argv.slice(2)`)
-  * `silent` {Boolean} whether or not to send output to parent's stdio.
-    (Default=`false`)
+    } else {
 
-`setupMaster` is used to change the default 'fork' behavior. Once called,
-the settings will be present in `cluster.settings`.
+      // Worker processes have a http server.
+      http.Server(function(req, res) {
+        res.writeHead(200);
+        res.end("hello world\n");
 
-Note that:
+        // notify master about the request
+        process.send({ cmd: 'notifyRequest' });
+      }).listen(8000);
+    }
 
-* any settings changes only affect future calls to `.fork()` and have no
-  effect on workers that are already running
-* The *only* attribute of a worker that cannot be set via `.setupMaster()` is
-  the `env` passed to `.fork()`
-* the defaults above apply to the first call only, the defaults for later
-  calls is the current value at the time of `cluster.setupMaster()` is called
+### Event: 'online'
 
-Example:
+Similar to the `cluster.on('online')` event, but specific to this worker.
 
-    var cluster = require('cluster');
-    cluster.setupMaster({
-      exec: 'worker.js',
-      args: ['--use', 'https'],
-      silent: true
-    });
-    cluster.fork(); // https worker
-    cluster.setupMaster({
-      args: ['--use', 'http']
+    cluster.fork().on('online', function() {
+      // Worker is online
     });
-    cluster.fork(); // http worker
-
-This can only be called from the master process.
 
-## cluster.fork([env])
+It is not emitted in the worker.
 
-* `env` {Object} Key/value pairs to add to worker process environment.
-* return {Worker object}
+### worker.disconnect()
 
-Spawn a new worker process.
+In a worker, this function will close all servers, wait for the 'close' event on
+those servers, and then disconnect the IPC channel.
 
-This can only be called from the master process.
+In the master, an internal message is sent to the worker causing it to call
+`.disconnect()` on itself.
 
-## cluster.disconnect([callback])
+Causes `.suicide` to be set.
 
-* `callback` {Function} called when all workers are disconnected and handles are
-  closed
+Note that after a server is closed, it will no longer accept new connections,
+but connections may be accepted by any other listening worker. Existing
+connections will be allowed to close as usual. When no more connections exist,
+see [server.close()](net.html#net_event_close), the IPC channel to the worker
+will close allowing it to die gracefully.
 
-Calls `.disconnect()` on each worker in `cluster.workers`.
+The above applies *only* to server connections, client connections are not
+automatically closed by workers, and disconnect does not wait for them to close
+before exiting.
 
-When they are disconnected all internal handles will be closed, allowing the
-master process to die gracefully if no other event is waiting.
+Note that in a worker, `process.disconnect` exists, but it is not this function,
+it is [disconnect](child_process.html#child_process_child_disconnect).
 
-The method takes an optional callback argument which will be called when finished.
+Because long living server connections may block workers from disconnecting, it
+may be useful to send a message, so application specific actions may be taken to
+close them. It also may be useful to implement a timeout, killing a worker if
+the `disconnect` event has not been emitted after some time.
 
-This can only be called from the master process.
+    if (cluster.isMaster) {
+      var worker = cluster.fork();
+      var timeout;
 
-## cluster.worker
+      worker.on('listening', function(address) {
+        worker.send('shutdown');
+        worker.disconnect();
+        timeout = setTimeout(function() {
+          worker.kill();
+        }, 2000);
+      });
 
-* {Object}
+      worker.on('disconnect', function() {
+        clearTimeout(timeout);
+      });
 
-A reference to the current worker object. Not available in the master process.
+    } else if (cluster.isWorker) {
+      var net = require('net');
+      var server = net.createServer(function(socket) {
+        // connections never end
+      });
 
-    var cluster = require('cluster');
+      server.listen(8000);
 
-    if (cluster.isMaster) {
-      console.log('I am master');
-      cluster.fork();
-      cluster.fork();
-    } else if (cluster.isWorker) {
-      console.log('I am worker #' + cluster.worker.id);
+      process.on('message', function(msg) {
+        if(msg === 'shutdown') {
+          // initiate graceful close of any connections to server
+        }
+      });
     }
 
-## cluster.workers
+### worker.id
 
-* {Object}
+* {Number}
 
-A hash that stores the active worker objects, keyed by `id` field. Makes it
-easy to loop through all the workers. It is only available in the master
-process.
+Each new worker is given its own unique id, this id is stored in the
+`id`.
 
-A worker is removed from cluster.workers after the worker has disconnected _and_
-exited. The order between these two events cannot be determined in advance.
-However, it is guaranteed that the removal from the cluster.workers list happens
-before last `'disconnect'` or `'exit'` event is emitted.
+While a worker is alive, this is the key that indexes it in
+cluster.workers
 
-    // Go through all workers
-    function eachWorker(callback) {
-      for (var id in cluster.workers) {
-        callback(cluster.workers[id]);
-      }
-    }
-    eachWorker(function(worker) {
-      worker.send('big announcement to all workers');
-    });
+### worker.isConnected()
 
-Should you wish to reference a worker over a communication channel, using
-the worker's unique id is the easiest way to find the worker.
+This function returns `true` if the worker is connected to its master via its IPC
+channel, `false` otherwise. A worker is connected to its master after it's been
+created. It is disconnected after the `disconnect` event is emitted.
 
-    socket.on('data', function(id) {
-      var worker = cluster.workers[id];
-    });
+### worker.isDead()
 
-## Class: Worker
+This function returns `true` if the worker's process has terminated (either
+because of exiting or being signaled). Otherwise, it returns `false`.
 
-A Worker object contains all public information and method about a worker.
-In the master it can be obtained using `cluster.workers`. In a worker
-it can be obtained using `cluster.worker`.
+### worker.kill([signal='SIGTERM'])
 
-### worker.id
+* `signal` {String} Name of the kill signal to send to the worker
+  process.
 
-* {Number}
+This function will kill the worker. In the master, it does this by disconnecting
+the `worker.process`, and once disconnected, killing with `signal`. In the
+worker, it does it by disconnecting the channel, and then exiting with code `0`.
 
-Each new worker is given its own unique id, this id is stored in the
-`id`.
+Causes `.suicide` to be set.
 
-While a worker is alive, this is the key that indexes it in
-cluster.workers
+This method is aliased as `worker.destroy()` for backwards compatibility.
+
+Note that in a worker, `process.kill()` exists, but it is not this function,
+it is [kill](process.html#process_process_kill_pid_signal).
 
 ### worker.process
 
@@ -405,24 +330,6 @@ Note that workers will call `process.exit(0)` if the `'disconnect'` event occurs
 on `process` and `.suicide` is not `true`. This protects against accidental
 disconnection.
 
-### worker.suicide
-
-* {Boolean}
-
-Set by calling `.kill()` or `.disconnect()`, until then it is `undefined`.
-
-The boolean `worker.suicide` lets you distinguish between voluntary and accidental
-exit, the master may choose not to respawn a worker based on this value.
-
-    cluster.on('exit', function(worker, code, signal) {
-      if (worker.suicide === true) {
-        console.log('Oh, it was just suicide\' – no need to worry').
-      }
-    });
-
-    // kill worker
-    worker.kill();
-
 ### worker.send(message[, sendHandle][, callback])
 
 * `message` {Object}
@@ -450,198 +357,293 @@ This example will echo back all messages from the master:
       });
     }
 
-### worker.kill([signal='SIGTERM'])
+### worker.suicide
 
-* `signal` {String} Name of the kill signal to send to the worker
-  process.
+* {Boolean}
 
-This function will kill the worker. In the master, it does this by disconnecting
-the `worker.process`, and once disconnected, killing with `signal`. In the
-worker, it does it by disconnecting the channel, and then exiting with code `0`.
+Set by calling `.kill()` or `.disconnect()`, until then it is `undefined`.
+
+The boolean `worker.suicide` lets you distinguish between voluntary and accidental
+exit, the master may choose not to respawn a worker based on this value.
+
+    cluster.on('exit', function(worker, code, signal) {
+      if (worker.suicide === true) {
+        console.log('Oh, it was just suicide\' – no need to worry').
+      }
+    });
+
+    // kill worker
+    worker.kill();
+
+## Event: 'disconnect'
+
+* `worker` {Worker object}
+
+Emitted after the worker IPC channel has disconnected. This can occur when a
+worker exits gracefully, is killed, or is disconnected manually (such as with
+worker.disconnect()).
+
+There may be a delay between the `disconnect` and `exit` events.  These events
+can be used to detect if the process is stuck in a cleanup or if there are
+long-living connections.
+
+    cluster.on('disconnect', function(worker) {
+      console.log('The worker #' + worker.id + ' has disconnected');
+    });
+
+## Event: 'exit'
+
+* `worker` {Worker object}
+* `code` {Number} the exit code, if it exited normally.
+* `signal` {String} the name of the signal (eg. `'SIGHUP'`) that caused
+  the process to be killed.
+
+When any of the workers die the cluster module will emit the 'exit' event.
+
+This can be used to restart the worker by calling `.fork()` again.
+
+    cluster.on('exit', function(worker, code, signal) {
+      console.log('worker %d died (%s). restarting...',
+        worker.process.pid, signal || code);
+      cluster.fork();
+    });
+
+See [child_process event: 'exit'](child_process.html#child_process_event_exit).
+
+## Event: 'fork'
+
+* `worker` {Worker object}
+
+When a new worker is forked the cluster module will emit a 'fork' event.
+This can be used to log worker activity, and create your own timeout.
+
+    var timeouts = [];
+    function errorMsg() {
+      console.error("Something must be wrong with the connection ...");
+    }
+
+    cluster.on('fork', function(worker) {
+      timeouts[worker.id] = setTimeout(errorMsg, 2000);
+    });
+    cluster.on('listening', function(worker, address) {
+      clearTimeout(timeouts[worker.id]);
+    });
+    cluster.on('exit', function(worker, code, signal) {
+      clearTimeout(timeouts[worker.id]);
+      errorMsg();
+    });
+
+## Event: 'listening'
+
+* `worker` {Worker object}
+* `address` {Object}
+
+After calling `listen()` from a worker, when the 'listening' event is emitted on
+the server, a listening event will also be emitted on `cluster` in the master.
+
+The event handler is executed with two arguments, the `worker` contains the worker
+object and the `address` object contains the following connection properties:
+`address`, `port` and `addressType`. This is very useful if the worker is listening
+on more than one address.
+
+    cluster.on('listening', function(worker, address) {
+      console.log("A worker is now connected to " + address.address + ":" + address.port);
+    });
+
+The `addressType` is one of:
+
+* `4` (TCPv4)
+* `6` (TCPv6)
+* `-1` (unix domain socket)
+* `"udp4"` or `"udp6"` (UDP v4 or v6)
+
+## Event: 'message'
+
+* `worker` {Worker object}
+* `message` {Object}
+
+Emitted when any worker receives a message.
+
+See
+[child_process event: 'message'](child_process.html#child_process_event_message).
 
-Causes `.suicide` to be set.
+## Event: 'online'
 
-This method is aliased as `worker.destroy()` for backwards compatibility.
+* `worker` {Worker object}
 
-Note that in a worker, `process.kill()` exists, but it is not this function,
-it is [kill](process.html#process_process_kill_pid_signal).
+After forking a new worker, the worker should respond with an online message.
+When the master receives an online message it will emit this event.
+The difference between 'fork' and 'online' is that fork is emitted when the
+master forks a worker, and 'online' is emitted when the worker is running.
 
-### worker.disconnect()
+    cluster.on('online', function(worker) {
+      console.log("Yay, the worker responded after it was forked");
+    });
 
-In a worker, this function will close all servers, wait for the 'close' event on
-those servers, and then disconnect the IPC channel.
+## Event: 'setup'
 
-In the master, an internal message is sent to the worker causing it to call
-`.disconnect()` on itself.
+* `settings` {Object}
 
-Causes `.suicide` to be set.
+Emitted every time `.setupMaster()` is called.
 
-Note that after a server is closed, it will no longer accept new connections,
-but connections may be accepted by any other listening worker. Existing
-connections will be allowed to close as usual. When no more connections exist,
-see [server.close()](net.html#net_event_close), the IPC channel to the worker
-will close allowing it to die gracefully.
+The `settings` object is the `cluster.settings` object at the time
+`.setupMaster()` was called and is advisory only, since multiple calls to
+`.setupMaster()` can be made in a single tick.
 
-The above applies *only* to server connections, client connections are not
-automatically closed by workers, and disconnect does not wait for them to close
-before exiting.
+If accuracy is important, use `cluster.settings`.
 
-Note that in a worker, `process.disconnect` exists, but it is not this function,
-it is [disconnect](child_process.html#child_process_child_disconnect).
+## cluster.disconnect([callback])
 
-Because long living server connections may block workers from disconnecting, it
-may be useful to send a message, so application specific actions may be taken to
-close them. It also may be useful to implement a timeout, killing a worker if
-the `disconnect` event has not been emitted after some time.
+* `callback` {Function} called when all workers are disconnected and handles are
+  closed
 
-    if (cluster.isMaster) {
-      var worker = cluster.fork();
-      var timeout;
+Calls `.disconnect()` on each worker in `cluster.workers`.
 
-      worker.on('listening', function(address) {
-        worker.send('shutdown');
-        worker.disconnect();
-        timeout = setTimeout(function() {
-          worker.kill();
-        }, 2000);
-      });
+When they are disconnected all internal handles will be closed, allowing the
+master process to die gracefully if no other event is waiting.
 
-      worker.on('disconnect', function() {
-        clearTimeout(timeout);
-      });
+The method takes an optional callback argument which will be called when finished.
 
-    } else if (cluster.isWorker) {
-      var net = require('net');
-      var server = net.createServer(function(socket) {
-        // connections never end
-      });
+This can only be called from the master process.
 
-      server.listen(8000);
+## cluster.fork([env])
 
-      process.on('message', function(msg) {
-        if(msg === 'shutdown') {
-          // initiate graceful close of any connections to server
-        }
-      });
-    }
+* `env` {Object} Key/value pairs to add to worker process environment.
+* return {Worker object}
 
-### worker.isDead()
+Spawn a new worker process.
 
-This function returns `true` if the worker's process has terminated (either
-because of exiting or being signaled). Otherwise, it returns `false`.
+This can only be called from the master process.
 
-### worker.isConnected()
+## cluster.isMaster
 
-This function returns `true` if the worker is connected to its master via its IPC
-channel, `false` otherwise. A worker is connected to its master after it's been
-created. It is disconnected after the `disconnect` event is emitted.
+* {Boolean}
 
-### Event: 'message'
+True if the process is a master. This is determined
+by the `process.env.NODE_UNIQUE_ID`. If `process.env.NODE_UNIQUE_ID` is
+undefined, then `isMaster` is `true`.
 
-* `message` {Object}
+## cluster.isWorker
 
-Similar to the `cluster.on('message')` event, but specific to this worker.
+* {Boolean}
 
-This event is the same as the one provided by `child_process.fork()`.
+True if the process is not a master (it is the negation of `cluster.isMaster`).
 
-In a worker you can also use `process.on('message')`.
+## cluster.schedulingPolicy
 
-As an example, here is a cluster that keeps count of the number of requests
-in the master process using the message system:
+The scheduling policy, either `cluster.SCHED_RR` for round-robin or
+`cluster.SCHED_NONE` to leave it to the operating system. This is a
+global setting and effectively frozen once you spawn the first worker
+or call `cluster.setupMaster()`, whatever comes first.
 
-    var cluster = require('cluster');
-    var http = require('http');
+`SCHED_RR` is the default on all operating systems except Windows.
+Windows will change to `SCHED_RR` once libuv is able to effectively
+distribute IOCP handles without incurring a large performance hit.
 
-    if (cluster.isMaster) {
+`cluster.schedulingPolicy` can also be set through the
+`NODE_CLUSTER_SCHED_POLICY` environment variable. Valid
+values are `"rr"` and `"none"`.
 
-      // Keep track of http requests
-      var numReqs = 0;
-      setInterval(function() {
-        console.log("numReqs =", numReqs);
-      }, 1000);
+## cluster.settings
 
-      // Count requests
-      function messageHandler(msg) {
-        if (msg.cmd && msg.cmd == 'notifyRequest') {
-          numReqs += 1;
-        }
-      }
+* {Object}
+  * `execArgv` {Array} list of string arguments passed to the Node.js
+    executable. (Default=`process.execArgv`)
+  * `exec` {String} file path to worker file.  (Default=`process.argv[1]`)
+  * `args` {Array} string arguments passed to worker.
+    (Default=`process.argv.slice(2)`)
+  * `silent` {Boolean} whether or not to send output to parent's stdio.
+    (Default=`false`)
+  * `uid` {Number} Sets the user identity of the process. (See setuid(2).)
+  * `gid` {Number} Sets the group identity of the process. (See setgid(2).)
 
-      // Start workers and listen for messages containing notifyRequest
-      var numCPUs = require('os').cpus().length;
-      for (var i = 0; i < numCPUs; i++) {
-        cluster.fork();
-      }
+After calling `.setupMaster()` (or `.fork()`) this settings object will contain
+the settings, including the default values.
 
-      Object.keys(cluster.workers).forEach(function(id) {
-        cluster.workers[id].on('message', messageHandler);
-      });
+It is effectively frozen after being set, because `.setupMaster()` can
+only be called once.
 
-    } else {
+This object is not supposed to be changed or set manually, by you.
 
-      // Worker processes have a http server.
-      http.Server(function(req, res) {
-        res.writeHead(200);
-        res.end("hello world\n");
+## cluster.setupMaster([settings])
 
-        // notify master about the request
-        process.send({ cmd: 'notifyRequest' });
-      }).listen(8000);
-    }
+* `settings` {Object}
+  * `exec` {String} file path to worker file.  (Default=`process.argv[1]`)
+  * `args` {Array} string arguments passed to worker.
+    (Default=`process.argv.slice(2)`)
+  * `silent` {Boolean} whether or not to send output to parent's stdio.
+    (Default=`false`)
 
-### Event: 'online'
+`setupMaster` is used to change the default 'fork' behavior. Once called,
+the settings will be present in `cluster.settings`.
 
-Similar to the `cluster.on('online')` event, but specific to this worker.
+Note that:
 
-    cluster.fork().on('online', function() {
-      // Worker is online
-    });
+* any settings changes only affect future calls to `.fork()` and have no
+  effect on workers that are already running
+* The *only* attribute of a worker that cannot be set via `.setupMaster()` is
+  the `env` passed to `.fork()`
+* the defaults above apply to the first call only, the defaults for later
+  calls is the current value at the time of `cluster.setupMaster()` is called
 
-It is not emitted in the worker.
+Example:
 
-### Event: 'listening'
+    var cluster = require('cluster');
+    cluster.setupMaster({
+      exec: 'worker.js',
+      args: ['--use', 'https'],
+      silent: true
+    });
+    cluster.fork(); // https worker
+    cluster.setupMaster({
+      args: ['--use', 'http']
+    });
+    cluster.fork(); // http worker
 
-* `address` {Object}
+This can only be called from the master process.
 
-Similar to the `cluster.on('listening')` event, but specific to this worker.
+## cluster.worker
 
-    cluster.fork().on('listening', function(address) {
-      // Worker is listening
-    });
+* {Object}
 
-It is not emitted in the worker.
+A reference to the current worker object. Not available in the master process.
 
-### Event: 'disconnect'
+    var cluster = require('cluster');
 
-Similar to the `cluster.on('disconnect')` event, but specific to this worker.
+    if (cluster.isMaster) {
+      console.log('I am master');
+      cluster.fork();
+      cluster.fork();
+    } else if (cluster.isWorker) {
+      console.log('I am worker #' + cluster.worker.id);
+    }
 
-    cluster.fork().on('disconnect', function() {
-      // Worker has disconnected
-    });
+## cluster.workers
 
-### Event: 'exit'
+* {Object}
 
-* `code` {Number} the exit code, if it exited normally.
-* `signal` {String} the name of the signal (eg. `'SIGHUP'`) that caused
-  the process to be killed.
+A hash that stores the active worker objects, keyed by `id` field. Makes it
+easy to loop through all the workers. It is only available in the master
+process.
 
-Similar to the `cluster.on('exit')` event, but specific to this worker.
+A worker is removed from cluster.workers after the worker has disconnected _and_
+exited. The order between these two events cannot be determined in advance.
+However, it is guaranteed that the removal from the cluster.workers list happens
+before last `'disconnect'` or `'exit'` event is emitted.
 
-    var worker = cluster.fork();
-    worker.on('exit', function(code, signal) {
-      if( signal ) {
-        console.log("worker was killed by signal: "+signal);
-      } else if( code !== 0 ) {
-        console.log("worker exited with error code: "+code);
-      } else {
-        console.log("worker success!");
+    // Go through all workers
+    function eachWorker(callback) {
+      for (var id in cluster.workers) {
+        callback(cluster.workers[id]);
       }
+    }
+    eachWorker(function(worker) {
+      worker.send('big announcement to all workers');
     });
 
-### Event: 'error'
-
-This event is the same as the one provided by `child_process.fork()`.
-
-In a worker you can also use `process.on('error')`.
+Should you wish to reference a worker over a communication channel, using
+the worker's unique id is the easiest way to find the worker.
 
-[ChildProcess.send()]: child_process.html#child_process_child_send_message_sendhandle_callback
+    socket.on('data', function(id) {
+      var worker = cluster.workers[id];
+    });

From 3e046acc509876d7692d937ca5d23f4053882dbe Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 10:51:43 -0500
Subject: [PATCH 149/323] doc: sort console alphabetically

Reorders, with no contextual changes, the console documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/console.markdown | 123 +++++++++++++++++++--------------------
 1 file changed, 61 insertions(+), 62 deletions(-)

diff --git a/doc/api/console.markdown b/doc/api/console.markdown
index f3a69ce95104e2..6fe5a400f6f159 100644
--- a/doc/api/console.markdown
+++ b/doc/api/console.markdown
@@ -10,6 +10,42 @@ sent to stdout or stderr.
 For ease of use, `console` is defined as a global object and can be used
 directly without `require`.
 
+## Class: Console
+
+<!--type=class-->
+
+Use `require('console').Console` or `console.Console` to access this class.
+
+    var Console = require('console').Console;
+    var Console = console.Console;
+
+You can use `Console` class to custom simple logger like `console`, but with
+different output streams.
+
+### new Console(stdout[, stderr])
+
+Create a new `Console` by passing one or two writable stream instances.
+`stdout` is a writable stream to print log or info output. `stderr`
+is used for warning or error output. If `stderr` isn't passed, the warning
+and error output will be sent to the `stdout`.
+
+    var output = fs.createWriteStream('./stdout.log');
+    var errorOutput = fs.createWriteStream('./stderr.log');
+    // custom simple logger
+    var logger = new Console(output, errorOutput);
+    // use it like console
+    var count = 5;
+    logger.log('count: %d', count);
+    // in stdout.log: count 5
+
+The global `console` is a special `Console` whose output is sent to
+`process.stdout` and `process.stderr`:
+
+    new Console(process.stdout, process.stderr);
+
+[assert.ok()]: assert.html#assert_assert_value_message_assert_ok_value_message
+[util.format()]: util.html#util_util_format_format
+
 ## console
 
 * {Object}
@@ -31,30 +67,10 @@ is blocking:
 In daily use, the blocking/non-blocking dichotomy is not something you
 should worry about unless you log huge amounts of data.
 
+### console.assert(value[, message][, ...])
 
-### console.log([data][, ...])
-
-Prints to stdout with newline. This function can take multiple arguments in a
-`printf()`-like way. Example:
-
-    var count = 5;
-    console.log('count: %d', count);
-    // prints 'count: 5'
-
-If formatting elements are not found in the first string then `util.inspect`
-is used on each argument.  See [util.format()][] for more information.
-
-### console.info([data][, ...])
-
-Same as `console.log`.
-
-### console.error([data][, ...])
-
-Same as `console.log` but prints to stderr.
-
-### console.warn([data][, ...])
-
-Same as `console.error`.
+Similar to [assert.ok()][], but the error message is formatted as
+`util.format(message...)`.
 
 ### console.dir(obj[, options])
 
@@ -72,6 +88,26 @@ object. This is useful for inspecting large complicated objects. Defaults to
 - `colors` - if `true`, then the output will be styled with ANSI color codes.
 Defaults to `false`. Colors are customizable, see below.
 
+### console.error([data][, ...])
+
+Same as `console.log` but prints to stderr.
+
+### console.info([data][, ...])
+
+Same as `console.log`.
+
+### console.log([data][, ...])
+
+Prints to stdout with newline. This function can take multiple arguments in a
+`printf()`-like way. Example:
+
+    var count = 5;
+    console.log('count: %d', count);
+    // prints 'count: 5'
+
+If formatting elements are not found in the first string then `util.inspect`
+is used on each argument.  See [util.format()][] for more information.
+
 ### console.time(label)
 
 Starts a timer that can be used to compute the duration of an operation. Timers
@@ -100,43 +136,6 @@ Example:
 Print to stderr `'Trace :'`, followed by the formatted message and stack trace
 to the current position.
 
-### console.assert(value[, message][, ...])
-
-Similar to [assert.ok()][], but the error message is formatted as
-`util.format(message...)`.
-
-## Class: Console
-
-<!--type=class-->
-
-Use `require('console').Console` or `console.Console` to access this class.
-
-    var Console = require('console').Console;
-    var Console = console.Console;
-
-You can use `Console` class to custom simple logger like `console`, but with
-different output streams.
-
-### new Console(stdout[, stderr])
-
-Create a new `Console` by passing one or two writable stream instances.
-`stdout` is a writable stream to print log or info output. `stderr`
-is used for warning or error output. If `stderr` isn't passed, the warning
-and error output will be sent to the `stdout`.
-
-    var output = fs.createWriteStream('./stdout.log');
-    var errorOutput = fs.createWriteStream('./stderr.log');
-    // custom simple logger
-    var logger = new Console(output, errorOutput);
-    // use it like console
-    var count = 5;
-    logger.log('count: %d', count);
-    // in stdout.log: count 5
-
-The global `console` is a special `Console` whose output is sent to
-`process.stdout` and `process.stderr`:
-
-    new Console(process.stdout, process.stderr);
+### console.warn([data][, ...])
 
-[assert.ok()]: assert.html#assert_assert_value_message_assert_ok_value_message
-[util.format()]: util.html#util_util_format_format
+Same as `console.error`.

From 4118fd579499c18906ab75e9b0cea76044458a37 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 10:52:13 -0500
Subject: [PATCH 150/323] doc: sort dns alphabetically

Reorders, with no contextual changes, the dns documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/dns.markdown | 53 ++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/doc/api/dns.markdown b/doc/api/dns.markdown
index a945a7d90882d2..f905e8681a3702 100644
--- a/doc/api/dns.markdown
+++ b/doc/api/dns.markdown
@@ -54,6 +54,11 @@ There are subtle consequences in choosing one or another, please consult the
 [Implementation considerations section](#dns_implementation_considerations)
 for more information.
 
+## dns.getServers()
+
+Returns an array of IP addresses as strings that are currently being used for
+resolution
+
 ## dns.lookup(hostname[, options], callback)
 
 Resolves a hostname (e.g. `'google.com'`) into the first found A (IPv4) or
@@ -152,6 +157,11 @@ The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but on
 
 The same as [`dns.resolve4()`](#dns_dns_resolve4_hostname_callback) except for IPv6 queries (an `AAAA` query).
 
+## dns.resolveCname(hostname, callback)
+
+The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but only for canonical name records (`CNAME`
+records). `addresses` is an array of the canonical name records available for
+`hostname` (e.g., `['bar.example.com']`).
 
 ## dns.resolveMx(hostname, callback)
 
@@ -160,20 +170,11 @@ The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but on
 `addresses` is an array of MX records, each with a priority and an exchange
 attribute (e.g. `[{'priority': 10, 'exchange': 'mx.example.com'},...]`).
 
-## dns.resolveTxt(hostname, callback)
-
-The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but only for text queries (`TXT` records).
-`addresses` is a 2-d array of the text records available for `hostname` (e.g.,
-`[ ['v=spf1 ip4:0.0.0.0 ', '~all' ] ]`). Each sub-array contains TXT chunks of
-one record. Depending on the use case, the could be either joined together or
-treated separately.
-
-## dns.resolveSrv(hostname, callback)
+## dns.resolveNs(hostname, callback)
 
-The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but only for service records (`SRV` records).
-`addresses` is an array of the SRV records available for `hostname`. Properties
-of SRV records are priority, weight, port, and name (e.g.,
-`[{'priority': 10, 'weight': 5, 'port': 21223, 'name': 'service.example.com'}, ...]`).
+The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but only for name server records (`NS` records).
+`addresses` is an array of the name server records available for `hostname`
+(e.g., `['ns1.example.com', 'ns2.example.com']`).
 
 ## dns.resolveSoa(hostname, callback)
 
@@ -194,17 +195,20 @@ The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but on
 }
 ```
 
-## dns.resolveNs(hostname, callback)
+## dns.resolveSrv(hostname, callback)
 
-The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but only for name server records (`NS` records).
-`addresses` is an array of the name server records available for `hostname`
-(e.g., `['ns1.example.com', 'ns2.example.com']`).
+The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but only for service records (`SRV` records).
+`addresses` is an array of the SRV records available for `hostname`. Properties
+of SRV records are priority, weight, port, and name (e.g.,
+`[{'priority': 10, 'weight': 5, 'port': 21223, 'name': 'service.example.com'}, ...]`).
 
-## dns.resolveCname(hostname, callback)
+## dns.resolveTxt(hostname, callback)
 
-The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but only for canonical name records (`CNAME`
-records). `addresses` is an array of the canonical name records available for
-`hostname` (e.g., `['bar.example.com']`).
+The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but only for text queries (`TXT` records).
+`addresses` is a 2-d array of the text records available for `hostname` (e.g.,
+`[ ['v=spf1 ip4:0.0.0.0 ', '~all' ] ]`). Each sub-array contains TXT chunks of
+one record. Depending on the use case, the could be either joined together or
+treated separately.
 
 ## dns.reverse(ip, callback)
 
@@ -215,11 +219,6 @@ The callback has arguments `(err, hostnames)`.
 On error, `err` is an `Error` object, where `err.code` is
 one of the error codes listed below.
 
-## dns.getServers()
-
-Returns an array of IP addresses as strings that are currently being used for
-resolution
-
 ## dns.setServers(servers)
 
 Given an array of IP addresses as strings, set them as the servers to use for
@@ -314,4 +313,4 @@ They do not use the same set of configuration files than what `dns.lookup()`
 uses. For instance, _they do not use the configuration from `/etc/hosts`_.
 
 
-[dns.lookup]: #dns_dns_lookup_hostname_options_callback
\ No newline at end of file
+[dns.lookup]: #dns_dns_lookup_hostname_options_callback

From e1c357e881c803ffe18c04f63f0f130c4b673a9d Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 11:23:03 -0500
Subject: [PATCH 151/323] doc: sort crypto alphabetically

Reorders, with no contextual changes, the crypto documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/crypto.markdown | 846 ++++++++++++++++++++--------------------
 1 file changed, 418 insertions(+), 428 deletions(-)

diff --git a/doc/api/crypto.markdown b/doc/api/crypto.markdown
index b1da67818cb7af..113593a113f02f 100644
--- a/doc/api/crypto.markdown
+++ b/doc/api/crypto.markdown
@@ -10,343 +10,328 @@ used as part of a secure HTTPS net or http connection.
 It also offers a set of wrappers for OpenSSL's hash, hmac, cipher,
 decipher, sign and verify methods.
 
+## Class: Certificate
 
-## crypto.setEngine(engine[, flags])
-
-Load and set engine for some/all OpenSSL functions (selected by flags).
-
-`engine` could be either an id or a path to the engine's shared library.
-
-`flags` is optional and has `ENGINE_METHOD_ALL` value by default. It could take
-one of or mix of following flags (defined in `constants` module):
-
-* `ENGINE_METHOD_RSA`
-* `ENGINE_METHOD_DSA`
-* `ENGINE_METHOD_DH`
-* `ENGINE_METHOD_RAND`
-* `ENGINE_METHOD_ECDH`
-* `ENGINE_METHOD_ECDSA`
-* `ENGINE_METHOD_CIPHERS`
-* `ENGINE_METHOD_DIGESTS`
-* `ENGINE_METHOD_STORE`
-* `ENGINE_METHOD_PKEY_METH`
-* `ENGINE_METHOD_PKEY_ASN1_METH`
-* `ENGINE_METHOD_ALL`
-* `ENGINE_METHOD_NONE`
-
-
-## crypto.getCiphers()
+The class used for working with signed public key & challenges. The most
+common usage for this series of functions is when dealing with the `<keygen>`
+element. http://www.openssl.org/docs/apps/spkac.html
 
-Returns an array with the names of the supported ciphers.
+Returned by `crypto.Certificate`.
 
-Example:
+### Certificate.exportChallenge(spkac)
 
-    var ciphers = crypto.getCiphers();
-    console.log(ciphers); // ['aes-128-cbc', 'aes-128-ccm', ...]
+Exports the encoded challenge associated with the SPKAC.
 
+### Certificate.exportPublicKey(spkac)
 
-## crypto.getHashes()
+Exports the encoded public key from the supplied SPKAC.
 
-Returns an array with the names of the supported hash algorithms.
+### Certificate.verifySpkac(spkac)
 
-Example:
+Returns true of false based on the validity of the SPKAC.
 
-    var hashes = crypto.getHashes();
-    console.log(hashes); // ['sha', 'sha1', 'sha1WithRSAEncryption', ...]
+## Class: Cipher
 
+Class for encrypting data.
 
-## crypto.getCurves()
+Returned by `crypto.createCipher` and `crypto.createCipheriv`.
 
-Returns an array with the names of the supported elliptic curves.
+Cipher objects are [streams](stream.html) that are both readable and
+writable.  The written plain text data is used to produce the
+encrypted data on the readable side.  The legacy `update` and `final`
+methods are also supported.
 
-Example:
+### cipher.final([output_encoding])
 
-    var curves = crypto.getCurves();
-    console.log(curves); // ['secp256k1', 'secp384r1', ...]
+Returns any remaining enciphered contents, with `output_encoding`
+being one of: `'binary'`, `'base64'` or `'hex'`.  If no encoding is
+provided, then a buffer is returned.
 
+Note: `cipher` object can not be used after `final()` method has been
+called.
 
-## crypto.createCredentials(details)
+### cipher.getAuthTag()
 
-    Stability: 0 - Deprecated: Use [tls.createSecureContext][] instead.
+For authenticated encryption modes (currently supported: GCM), this
+method returns a `Buffer` that represents the _authentication tag_ that
+has been computed from the given data. Should be called after
+encryption has been completed using the `final` method!
 
-Creates a credentials object, with the optional details being a
-dictionary with keys:
+### cipher.setAAD(buffer)
 
-* `pfx` : A string or buffer holding the PFX or PKCS12 encoded private
-  key, certificate and CA certificates
-* `key` : A string holding the PEM encoded private key
-* `passphrase` : A string of passphrase for the private key or pfx
-* `cert` : A string holding the PEM encoded certificate
-* `ca` : Either a string or list of strings of PEM encoded CA
-  certificates to trust.
-* `crl` : Either a string or list of strings of PEM encoded CRLs
-  (Certificate Revocation List)
-* `ciphers`: A string describing the ciphers to use or exclude.
-  Consult
-  <http://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT>
-  for details on the format.
+For authenticated encryption modes (currently supported: GCM), this
+method sets the value used for the additional authenticated data (AAD) input
+parameter.
 
-If no 'ca' details are given, then Node.js will use the default
-publicly trusted list of CAs as given in
-<http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt>.
+### cipher.setAutoPadding(auto_padding=true)
 
+You can disable automatic padding of the input data to block size. If
+`auto_padding` is false, the length of the entire input data must be a
+multiple of the cipher's block size or `final` will fail.  Useful for
+non-standard padding, e.g. using `0x0` instead of PKCS padding. You
+must call this before `cipher.final`.
 
-## crypto.createHash(algorithm)
+### cipher.update(data[, input_encoding][, output_encoding])
 
-Creates and returns a hash object, a cryptographic hash with the given
-algorithm which can be used to generate hash digests.
+Updates the cipher with `data`, the encoding of which is given in
+`input_encoding` and can be `'utf8'`, `'ascii'` or `'binary'`.  If no
+encoding is provided, then a buffer is expected.
+If `data` is a `Buffer` then `input_encoding` is ignored.
 
-`algorithm` is dependent on the available algorithms supported by the
-version of OpenSSL on the platform. Examples are `'sha256'`,
-`'sha512'`, etc.  On recent releases, `openssl
-list-message-digest-algorithms` will display the available digest
-algorithms.
+The `output_encoding` specifies the output format of the enciphered
+data, and can be `'binary'`, `'base64'` or `'hex'`.  If no encoding is
+provided, then a buffer is returned.
 
-Example: this program that takes the sha256 sum of a file
+Returns the enciphered contents, and can be called many times with new
+data as it is streamed.
 
-    var filename = process.argv[2];
-    var crypto = require('crypto');
-    var fs = require('fs');
+## Class: Decipher
 
-    var shasum = crypto.createHash('sha256');
+Class for decrypting data.
 
-    var s = fs.ReadStream(filename);
-    s.on('data', function(d) {
-      shasum.update(d);
-    });
+Returned by `crypto.createDecipher` and `crypto.createDecipheriv`.
 
-    s.on('end', function() {
-      var d = shasum.digest('hex');
-      console.log(d + '  ' + filename);
-    });
+Decipher objects are [streams](stream.html) that are both readable and
+writable.  The written enciphered data is used to produce the
+plain-text data on the the readable side.  The legacy `update` and
+`final` methods are also supported.
 
-## Class: Hash
+### decipher.final([output_encoding])
 
-The class for creating hash digests of data.
+Returns any remaining plaintext which is deciphered, with
+`output_encoding` being one of: `'binary'`, `'ascii'` or `'utf8'`.  If
+no encoding is provided, then a buffer is returned.
 
-It is a [stream](stream.html) that is both readable and writable.  The
-written data is used to compute the hash.  Once the writable side of
-the stream is ended, use the `read()` method to get the computed hash
-digest.  The legacy `update` and `digest` methods are also supported.
+Note: `decipher` object can not be used after `final()` method has been
+called.
 
-Returned by `crypto.createHash`.
+### decipher.setAAD(buffer)
 
-### hash.update(data[, input_encoding])
+For authenticated encryption modes (currently supported: GCM), this
+method sets the value used for the additional authenticated data (AAD) input
+parameter.
 
-Updates the hash content with the given `data`, the encoding of which
-is given in `input_encoding` and can be `'utf8'`, `'ascii'` or
-`'binary'`.  If no encoding is provided, and the input is a string, an
-encoding of `'binary'` is enforced. If `data` is a `Buffer` then
-`input_encoding` is ignored.
+### decipher.setAuthTag(buffer)
 
-This can be called many times with new data as it is streamed.
+For authenticated encryption modes (currently supported: GCM), this
+method must be used to pass in the received _authentication tag_.
+If no tag is provided or if the ciphertext has been tampered with,
+`final` will throw, thus indicating that the ciphertext should
+be discarded due to failed authentication.
 
-### hash.digest([encoding])
+### decipher.setAutoPadding(auto_padding=true)
 
-Calculates the digest of all of the passed data to be hashed.  The
-`encoding` can be `'hex'`, `'binary'` or `'base64'`.  If no encoding
-is provided, then a buffer is returned.
+You can disable auto padding if the data has been encrypted without
+standard block padding to prevent `decipher.final` from checking and
+removing it. This will only work if the input data's length is a multiple of
+the ciphers block size. You must call this before streaming data to
+`decipher.update`.
 
-Note: `hash` object can not be used after `digest()` method has been
-called.
+### decipher.update(data[, input_encoding][, output_encoding])
 
+Updates the decipher with `data`, which is encoded in `'binary'`,
+`'base64'` or `'hex'`.  If no encoding is provided, then a buffer is
+expected.
+If `data` is a `Buffer` then `input_encoding` is ignored.
 
-## crypto.createHmac(algorithm, key)
+The `output_decoding` specifies in what format to return the
+deciphered plaintext: `'binary'`, `'ascii'` or `'utf8'`.  If no
+encoding is provided, then a buffer is returned.
 
-Creates and returns a hmac object, a cryptographic hmac with the given
-algorithm and key.
+## Class: DiffieHellman
 
-It is a [stream](stream.html) that is both readable and writable.  The
-written data is used to compute the hmac.  Once the writable side of
-the stream is ended, use the `read()` method to get the computed
-digest.  The legacy `update` and `digest` methods are also supported.
+The class for creating Diffie-Hellman key exchanges.
 
-`algorithm` is dependent on the available algorithms supported by
-OpenSSL - see createHash above.  `key` is the hmac key to be used.
+Returned by `crypto.createDiffieHellman`.
 
-## Class: Hmac
+### diffieHellman.computeSecret(other_public_key[, input_encoding][, output_encoding])
 
-Class for creating cryptographic hmac content.
+Computes the shared secret using `other_public_key` as the other
+party's public key and returns the computed shared secret. Supplied
+key is interpreted using specified `input_encoding`, and secret is
+encoded using specified `output_encoding`. Encodings can be
+`'binary'`, `'hex'`, or `'base64'`. If the input encoding is not
+provided, then a buffer is expected.
 
-Returned by `crypto.createHmac`.
+If no output encoding is given, then a buffer is returned.
 
-### hmac.update(data)
+### diffieHellman.generateKeys([encoding])
 
-Update the hmac content with the given `data`.  This can be called
-many times with new data as it is streamed.
+Generates private and public Diffie-Hellman key values, and returns
+the public key in the specified encoding. This key should be
+transferred to the other party. Encoding can be `'binary'`, `'hex'`,
+or `'base64'`.  If no encoding is provided, then a buffer is returned.
 
-### hmac.digest([encoding])
+### diffieHellman.getGenerator([encoding])
 
-Calculates the digest of all of the passed data to the hmac.  The
-`encoding` can be `'hex'`, `'binary'` or `'base64'`.  If no encoding
-is provided, then a buffer is returned.
+Returns the Diffie-Hellman generator in the specified encoding, which can
+be `'binary'`, `'hex'`, or `'base64'`. If no encoding is provided,
+then a buffer is returned.
 
-Note: `hmac` object can not be used after `digest()` method has been
-called.
+### diffieHellman.getPrime([encoding])
 
+Returns the Diffie-Hellman prime in the specified encoding, which can
+be `'binary'`, `'hex'`, or `'base64'`. If no encoding is provided,
+then a buffer is returned.
 
-## crypto.createCipher(algorithm, password)
+### diffieHellman.getPrivateKey([encoding])
 
-Creates and returns a cipher object, with the given algorithm and
-password.
+Returns the Diffie-Hellman private key in the specified encoding,
+which can be `'binary'`, `'hex'`, or `'base64'`. If no encoding is
+provided, then a buffer is returned.
 
-`algorithm` is dependent on OpenSSL, examples are `'aes192'`, etc.  On
-recent releases, `openssl list-cipher-algorithms` will display the
-available cipher algorithms.  `password` is used to derive key and IV,
-which must be a `'binary'` encoded string or a [buffer](buffer.html).
+### diffieHellman.getPublicKey([encoding])
 
-It is a [stream](stream.html) that is both readable and writable.  The
-written data is used to compute the hash.  Once the writable side of
-the stream is ended, use the `read()` method to get the enciphered
-contents.  The legacy `update` and `final` methods are also supported.
+Returns the Diffie-Hellman public key in the specified encoding, which
+can be `'binary'`, `'hex'`, or `'base64'`. If no encoding is provided,
+then a buffer is returned.
 
-Note: `createCipher` derives keys with the OpenSSL function [EVP_BytesToKey][]
-with the digest algorithm set to MD5, one iteration, and no salt. The lack of
-salt allows dictionary attacks as the same password always creates the same key.
-The low iteration count and non-cryptographically secure hash algorithm allow
-passwords to be tested very rapidly.
+### diffieHellman.setPrivateKey(private_key[, encoding])
 
-In line with OpenSSL's recommendation to use pbkdf2 instead of EVP_BytesToKey it
-is recommended you derive a key and iv yourself with [crypto.pbkdf2][] and to
-then use [createCipheriv()][] to create the cipher stream.
+Sets the Diffie-Hellman private key. Key encoding can be `'binary'`,
+`'hex'` or `'base64'`. If no encoding is provided, then a buffer is
+expected.
 
-## crypto.createCipheriv(algorithm, key, iv)
+### diffieHellman.setPublicKey(public_key[, encoding])
 
-Creates and returns a cipher object, with the given algorithm, key and
-iv.
+Sets the Diffie-Hellman public key. Key encoding can be `'binary'`,
+`'hex'` or `'base64'`. If no encoding is provided, then a buffer is
+expected.
 
-`algorithm` is the same as the argument to `createCipher()`.  `key` is
-the raw key used by the algorithm.  `iv` is an [initialization
-vector](http://en.wikipedia.org/wiki/Initialization_vector).
+### diffieHellman.verifyError
 
-`key` and `iv` must be `'binary'` encoded strings or
-[buffers](buffer.html).
+A bit field containing any warnings and/or errors as a result of a check performed
+during initialization. The following values are valid for this property
+(defined in `constants` module):
 
-## Class: Cipher
+* `DH_CHECK_P_NOT_SAFE_PRIME`
+* `DH_CHECK_P_NOT_PRIME`
+* `DH_UNABLE_TO_CHECK_GENERATOR`
+* `DH_NOT_SUITABLE_GENERATOR`
 
-Class for encrypting data.
+## Class: ECDH
 
-Returned by `crypto.createCipher` and `crypto.createCipheriv`.
+The class for creating EC Diffie-Hellman key exchanges.
 
-Cipher objects are [streams](stream.html) that are both readable and
-writable.  The written plain text data is used to produce the
-encrypted data on the readable side.  The legacy `update` and `final`
-methods are also supported.
+Returned by `crypto.createECDH`.
 
-### cipher.update(data[, input_encoding][, output_encoding])
+### ECDH.computeSecret(other_public_key[, input_encoding][, output_encoding])
 
-Updates the cipher with `data`, the encoding of which is given in
-`input_encoding` and can be `'utf8'`, `'ascii'` or `'binary'`.  If no
-encoding is provided, then a buffer is expected.
-If `data` is a `Buffer` then `input_encoding` is ignored.
+Computes the shared secret using `other_public_key` as the other
+party's public key and returns the computed shared secret. Supplied
+key is interpreted using specified `input_encoding`, and secret is
+encoded using specified `output_encoding`. Encodings can be
+`'binary'`, `'hex'`, or `'base64'`. If the input encoding is not
+provided, then a buffer is expected.
 
-The `output_encoding` specifies the output format of the enciphered
-data, and can be `'binary'`, `'base64'` or `'hex'`.  If no encoding is
-provided, then a buffer is returned.
+If no output encoding is given, then a buffer is returned.
 
-Returns the enciphered contents, and can be called many times with new
-data as it is streamed.
+### ECDH.generateKeys([encoding[, format]])
 
-### cipher.final([output_encoding])
+Generates private and public EC Diffie-Hellman key values, and returns
+the public key in the specified format and encoding. This key should be
+transferred to the other party.
 
-Returns any remaining enciphered contents, with `output_encoding`
-being one of: `'binary'`, `'base64'` or `'hex'`.  If no encoding is
-provided, then a buffer is returned.
+Format specifies point encoding and can be `'compressed'`, `'uncompressed'`, or
+`'hybrid'`. If no format is provided - the point will be returned in
+`'uncompressed'` format.
 
-Note: `cipher` object can not be used after `final()` method has been
-called.
+Encoding can be `'binary'`, `'hex'`, or `'base64'`. If no encoding is provided,
+then a buffer is returned.
 
-### cipher.setAutoPadding(auto_padding=true)
+### ECDH.getPrivateKey([encoding])
 
-You can disable automatic padding of the input data to block size. If
-`auto_padding` is false, the length of the entire input data must be a
-multiple of the cipher's block size or `final` will fail.  Useful for
-non-standard padding, e.g. using `0x0` instead of PKCS padding. You
-must call this before `cipher.final`.
+Returns the EC Diffie-Hellman private key in the specified encoding,
+which can be `'binary'`, `'hex'`, or `'base64'`. If no encoding is
+provided, then a buffer is returned.
 
-### cipher.getAuthTag()
+### ECDH.getPublicKey([encoding[, format]])
 
-For authenticated encryption modes (currently supported: GCM), this
-method returns a `Buffer` that represents the _authentication tag_ that
-has been computed from the given data. Should be called after
-encryption has been completed using the `final` method!
+Returns the EC Diffie-Hellman public key in the specified encoding and format.
 
-### cipher.setAAD(buffer)
+Format specifies point encoding and can be `'compressed'`, `'uncompressed'`, or
+`'hybrid'`. If no format is provided - the point will be returned in
+`'uncompressed'` format.
 
-For authenticated encryption modes (currently supported: GCM), this
-method sets the value used for the additional authenticated data (AAD) input
-parameter.
+Encoding can be `'binary'`, `'hex'`, or `'base64'`. If no encoding is provided,
+then a buffer is returned.
 
+### ECDH.setPrivateKey(private_key[, encoding])
 
-## crypto.createDecipher(algorithm, password)
+Sets the EC Diffie-Hellman private key. Key encoding can be `'binary'`,
+`'hex'` or `'base64'`. If no encoding is provided, then a buffer is
+expected.
 
-Creates and returns a decipher object, with the given algorithm and
-key.  This is the mirror of the [createCipher()][] above.
+Example (obtaining a shared secret):
 
-## crypto.createDecipheriv(algorithm, key, iv)
+    var crypto = require('crypto');
+    var alice = crypto.createECDH('secp256k1');
+    var bob = crypto.createECDH('secp256k1');
 
-Creates and returns a decipher object, with the given algorithm, key
-and iv.  This is the mirror of the [createCipheriv()][] above.
+    alice.generateKeys();
+    bob.generateKeys();
 
-## Class: Decipher
+    var alice_secret = alice.computeSecret(bob.getPublicKey(), null, 'hex');
+    var bob_secret = bob.computeSecret(alice.getPublicKey(), null, 'hex');
 
-Class for decrypting data.
+    /* alice_secret and bob_secret should be the same */
+    console.log(alice_secret == bob_secret);
 
-Returned by `crypto.createDecipher` and `crypto.createDecipheriv`.
+### ECDH.setPublicKey(public_key[, encoding])
 
-Decipher objects are [streams](stream.html) that are both readable and
-writable.  The written enciphered data is used to produce the
-plain-text data on the the readable side.  The legacy `update` and
-`final` methods are also supported.
+Sets the EC Diffie-Hellman public key. Key encoding can be `'binary'`,
+`'hex'` or `'base64'`. If no encoding is provided, then a buffer is
+expected.
 
-### decipher.update(data[, input_encoding][, output_encoding])
+## Class: Hash
 
-Updates the decipher with `data`, which is encoded in `'binary'`,
-`'base64'` or `'hex'`.  If no encoding is provided, then a buffer is
-expected.
-If `data` is a `Buffer` then `input_encoding` is ignored.
+The class for creating hash digests of data.
 
-The `output_decoding` specifies in what format to return the
-deciphered plaintext: `'binary'`, `'ascii'` or `'utf8'`.  If no
-encoding is provided, then a buffer is returned.
+It is a [stream](stream.html) that is both readable and writable.  The
+written data is used to compute the hash.  Once the writable side of
+the stream is ended, use the `read()` method to get the computed hash
+digest.  The legacy `update` and `digest` methods are also supported.
 
-### decipher.final([output_encoding])
+Returned by `crypto.createHash`.
 
-Returns any remaining plaintext which is deciphered, with
-`output_encoding` being one of: `'binary'`, `'ascii'` or `'utf8'`.  If
-no encoding is provided, then a buffer is returned.
+### hash.digest([encoding])
 
-Note: `decipher` object can not be used after `final()` method has been
+Calculates the digest of all of the passed data to be hashed.  The
+`encoding` can be `'hex'`, `'binary'` or `'base64'`.  If no encoding
+is provided, then a buffer is returned.
+
+Note: `hash` object can not be used after `digest()` method has been
 called.
 
-### decipher.setAutoPadding(auto_padding=true)
+### hash.update(data[, input_encoding])
 
-You can disable auto padding if the data has been encrypted without
-standard block padding to prevent `decipher.final` from checking and
-removing it. This will only work if the input data's length is a multiple of
-the ciphers block size. You must call this before streaming data to
-`decipher.update`.
+Updates the hash content with the given `data`, the encoding of which
+is given in `input_encoding` and can be `'utf8'`, `'ascii'` or
+`'binary'`.  If no encoding is provided, and the input is a string, an
+encoding of `'binary'` is enforced. If `data` is a `Buffer` then
+`input_encoding` is ignored.
 
-### decipher.setAuthTag(buffer)
+This can be called many times with new data as it is streamed.
 
-For authenticated encryption modes (currently supported: GCM), this
-method must be used to pass in the received _authentication tag_.
-If no tag is provided or if the ciphertext has been tampered with,
-`final` will throw, thus indicating that the ciphertext should
-be discarded due to failed authentication.
+## Class: Hmac
 
-### decipher.setAAD(buffer)
+Class for creating cryptographic hmac content.
 
-For authenticated encryption modes (currently supported: GCM), this
-method sets the value used for the additional authenticated data (AAD) input
-parameter.
+Returned by `crypto.createHmac`.
 
+### hmac.digest([encoding])
 
-## crypto.createSign(algorithm)
+Calculates the digest of all of the passed data to the hmac.  The
+`encoding` can be `'hex'`, `'binary'` or `'base64'`.  If no encoding
+is provided, then a buffer is returned.
 
-Creates and returns a signing object, with the given algorithm.  On
-recent OpenSSL releases, `openssl list-public-key-algorithms` will
-display the available signing algorithms. Examples are `'RSA-SHA256'`.
+Note: `hmac` object can not be used after `digest()` method has been
+called.
+
+### hmac.update(data)
+
+Update the hmac content with the given `data`.  This can be called
+many times with new data as it is streamed.
 
 ## Class: Sign
 
@@ -359,11 +344,6 @@ used to generate the signature.  Once all of the data has been
 written, the `sign` method will return the signature.  The legacy
 `update` method is also supported.
 
-### sign.update(data)
-
-Updates the sign object with data.  This can be called many times
-with new data as it is streamed.
-
 ### sign.sign(private_key[, output_format])
 
 Calculates the signature on all the updated data passed through the
@@ -384,10 +364,10 @@ returned.
 Note: `sign` object can not be used after `sign()` method has been
 called.
 
-## crypto.createVerify(algorithm)
+### sign.update(data)
 
-Creates and returns a verification object, with the given algorithm.
-This is the mirror of the signing object above.
+Updates the sign object with data.  This can be called many times
+with new data as it is streamed.
 
 ## Class: Verify
 
@@ -421,11 +401,88 @@ the data and public key.
 Note: `verifier` object can not be used after `verify()` method has been
 called.
 
-## crypto.createDiffieHellman(prime_length[, generator])
+## crypto.DEFAULT_ENCODING
 
-Creates a Diffie-Hellman key exchange object and generates a prime of
-`prime_length` bits and using an optional specific numeric `generator`.
-If no `generator` is specified, then `2` is used.
+The default encoding to use for functions that can take either strings
+or buffers.  The default value is `'buffer'`, which makes it default
+to using Buffer objects.  This is here to make the crypto module more
+easily compatible with legacy programs that expected `'binary'` to be
+the default encoding.
+
+Note that new programs will probably expect buffers, so only use this
+as a temporary measure.
+
+## crypto.createCipher(algorithm, password)
+
+Creates and returns a cipher object, with the given algorithm and
+password.
+
+`algorithm` is dependent on OpenSSL, examples are `'aes192'`, etc.  On
+recent releases, `openssl list-cipher-algorithms` will display the
+available cipher algorithms.  `password` is used to derive key and IV,
+which must be a `'binary'` encoded string or a [buffer](buffer.html).
+
+It is a [stream](stream.html) that is both readable and writable.  The
+written data is used to compute the hash.  Once the writable side of
+the stream is ended, use the `read()` method to get the enciphered
+contents.  The legacy `update` and `final` methods are also supported.
+
+Note: `createCipher` derives keys with the OpenSSL function [EVP_BytesToKey][]
+with the digest algorithm set to MD5, one iteration, and no salt. The lack of
+salt allows dictionary attacks as the same password always creates the same key.
+The low iteration count and non-cryptographically secure hash algorithm allow
+passwords to be tested very rapidly.
+
+In line with OpenSSL's recommendation to use pbkdf2 instead of EVP_BytesToKey it
+is recommended you derive a key and iv yourself with [crypto.pbkdf2][] and to
+then use [createCipheriv()][] to create the cipher stream.
+
+## crypto.createCipheriv(algorithm, key, iv)
+
+Creates and returns a cipher object, with the given algorithm, key and
+iv.
+
+`algorithm` is the same as the argument to `createCipher()`.  `key` is
+the raw key used by the algorithm.  `iv` is an [initialization
+vector](http://en.wikipedia.org/wiki/Initialization_vector).
+
+`key` and `iv` must be `'binary'` encoded strings or
+[buffers](buffer.html).
+
+## crypto.createCredentials(details)
+
+    Stability: 0 - Deprecated: Use [tls.createSecureContext][] instead.
+
+Creates a credentials object, with the optional details being a
+dictionary with keys:
+
+* `pfx` : A string or buffer holding the PFX or PKCS12 encoded private
+  key, certificate and CA certificates
+* `key` : A string holding the PEM encoded private key
+* `passphrase` : A string of passphrase for the private key or pfx
+* `cert` : A string holding the PEM encoded certificate
+* `ca` : Either a string or list of strings of PEM encoded CA
+  certificates to trust.
+* `crl` : Either a string or list of strings of PEM encoded CRLs
+  (Certificate Revocation List)
+* `ciphers`: A string describing the ciphers to use or exclude.
+  Consult
+  <http://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT>
+  for details on the format.
+
+If no 'ca' details are given, then Node.js will use the default
+publicly trusted list of CAs as given in
+<http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt>.
+
+## crypto.createDecipher(algorithm, password)
+
+Creates and returns a decipher object, with the given algorithm and
+key.  This is the mirror of the [createCipher()][] above.
+
+## crypto.createDecipheriv(algorithm, key, iv)
+
+Creates and returns a decipher object, with the given algorithm, key
+and iv.  This is the mirror of the [createCipheriv()][] above.
 
 ## crypto.createDiffieHellman(prime[, prime_encoding][, generator][, generator_encoding])
 
@@ -437,76 +494,90 @@ If no `generator` is specified, then `2` is used.
 If no `prime_encoding` is specified, then a Buffer is expected for `prime`.
 If no `generator_encoding` is specified, then a Buffer is expected for `generator`.
 
-## Class: DiffieHellman
+## crypto.createDiffieHellman(prime_length[, generator])
 
-The class for creating Diffie-Hellman key exchanges.
+Creates a Diffie-Hellman key exchange object and generates a prime of
+`prime_length` bits and using an optional specific numeric `generator`.
+If no `generator` is specified, then `2` is used.
 
-Returned by `crypto.createDiffieHellman`.
+## crypto.createECDH(curve_name)
 
-### diffieHellman.verifyError
+Creates an Elliptic Curve (EC) Diffie-Hellman key exchange object using a
+predefined curve specified by the `curve_name` string. Use [getCurves()][] to
+obtain a list of available curve names. On recent releases,
+`openssl ecparam -list_curves` will also display the name and description of
+each available elliptic curve.
 
-A bit field containing any warnings and/or errors as a result of a check performed
-during initialization. The following values are valid for this property
-(defined in `constants` module):
+## crypto.createHash(algorithm)
 
-* `DH_CHECK_P_NOT_SAFE_PRIME`
-* `DH_CHECK_P_NOT_PRIME`
-* `DH_UNABLE_TO_CHECK_GENERATOR`
-* `DH_NOT_SUITABLE_GENERATOR`
+Creates and returns a hash object, a cryptographic hash with the given
+algorithm which can be used to generate hash digests.
 
-### diffieHellman.generateKeys([encoding])
+`algorithm` is dependent on the available algorithms supported by the
+version of OpenSSL on the platform. Examples are `'sha256'`,
+`'sha512'`, etc.  On recent releases, `openssl
+list-message-digest-algorithms` will display the available digest
+algorithms.
+
+Example: this program that takes the sha256 sum of a file
+
+    var filename = process.argv[2];
+    var crypto = require('crypto');
+    var fs = require('fs');
+
+    var shasum = crypto.createHash('sha256');
+
+    var s = fs.ReadStream(filename);
+    s.on('data', function(d) {
+      shasum.update(d);
+    });
+
+    s.on('end', function() {
+      var d = shasum.digest('hex');
+      console.log(d + '  ' + filename);
+    });
 
-Generates private and public Diffie-Hellman key values, and returns
-the public key in the specified encoding. This key should be
-transferred to the other party. Encoding can be `'binary'`, `'hex'`,
-or `'base64'`.  If no encoding is provided, then a buffer is returned.
+## crypto.createHmac(algorithm, key)
 
-### diffieHellman.computeSecret(other_public_key[, input_encoding][, output_encoding])
+Creates and returns a hmac object, a cryptographic hmac with the given
+algorithm and key.
 
-Computes the shared secret using `other_public_key` as the other
-party's public key and returns the computed shared secret. Supplied
-key is interpreted using specified `input_encoding`, and secret is
-encoded using specified `output_encoding`. Encodings can be
-`'binary'`, `'hex'`, or `'base64'`. If the input encoding is not
-provided, then a buffer is expected.
+It is a [stream](stream.html) that is both readable and writable.  The
+written data is used to compute the hmac.  Once the writable side of
+the stream is ended, use the `read()` method to get the computed
+digest.  The legacy `update` and `digest` methods are also supported.
 
-If no output encoding is given, then a buffer is returned.
+`algorithm` is dependent on the available algorithms supported by
+OpenSSL - see createHash above.  `key` is the hmac key to be used.
 
-### diffieHellman.getPrime([encoding])
+## crypto.createSign(algorithm)
 
-Returns the Diffie-Hellman prime in the specified encoding, which can
-be `'binary'`, `'hex'`, or `'base64'`. If no encoding is provided,
-then a buffer is returned.
+Creates and returns a signing object, with the given algorithm.  On
+recent OpenSSL releases, `openssl list-public-key-algorithms` will
+display the available signing algorithms. Examples are `'RSA-SHA256'`.
 
-### diffieHellman.getGenerator([encoding])
+## crypto.createVerify(algorithm)
 
-Returns the Diffie-Hellman generator in the specified encoding, which can
-be `'binary'`, `'hex'`, or `'base64'`. If no encoding is provided,
-then a buffer is returned.
+Creates and returns a verification object, with the given algorithm.
+This is the mirror of the signing object above.
 
-### diffieHellman.getPublicKey([encoding])
+## crypto.getCiphers()
 
-Returns the Diffie-Hellman public key in the specified encoding, which
-can be `'binary'`, `'hex'`, or `'base64'`. If no encoding is provided,
-then a buffer is returned.
+Returns an array with the names of the supported ciphers.
 
-### diffieHellman.getPrivateKey([encoding])
+Example:
 
-Returns the Diffie-Hellman private key in the specified encoding,
-which can be `'binary'`, `'hex'`, or `'base64'`. If no encoding is
-provided, then a buffer is returned.
+    var ciphers = crypto.getCiphers();
+    console.log(ciphers); // ['aes-128-cbc', 'aes-128-ccm', ...]
 
-### diffieHellman.setPublicKey(public_key[, encoding])
+## crypto.getCurves()
 
-Sets the Diffie-Hellman public key. Key encoding can be `'binary'`,
-`'hex'` or `'base64'`. If no encoding is provided, then a buffer is
-expected.
+Returns an array with the names of the supported elliptic curves.
 
-### diffieHellman.setPrivateKey(private_key[, encoding])
+Example:
 
-Sets the Diffie-Hellman private key. Key encoding can be `'binary'`,
-`'hex'` or `'base64'`. If no encoding is provided, then a buffer is
-expected.
+    var curves = crypto.getCurves();
+    console.log(curves); // ['secp256k1', 'secp384r1', ...]
 
 ## crypto.getDiffieHellman(group_name)
 
@@ -536,87 +607,14 @@ Example (obtaining a shared secret):
     /* alice_secret and bob_secret should be the same */
     console.log(alice_secret == bob_secret);
 
-## crypto.createECDH(curve_name)
-
-Creates an Elliptic Curve (EC) Diffie-Hellman key exchange object using a
-predefined curve specified by the `curve_name` string. Use [getCurves()][] to
-obtain a list of available curve names. On recent releases,
-`openssl ecparam -list_curves` will also display the name and description of
-each available elliptic curve.
-
-## Class: ECDH
-
-The class for creating EC Diffie-Hellman key exchanges.
-
-Returned by `crypto.createECDH`.
-
-### ECDH.generateKeys([encoding[, format]])
-
-Generates private and public EC Diffie-Hellman key values, and returns
-the public key in the specified format and encoding. This key should be
-transferred to the other party.
-
-Format specifies point encoding and can be `'compressed'`, `'uncompressed'`, or
-`'hybrid'`. If no format is provided - the point will be returned in
-`'uncompressed'` format.
-
-Encoding can be `'binary'`, `'hex'`, or `'base64'`. If no encoding is provided,
-then a buffer is returned.
-
-### ECDH.computeSecret(other_public_key[, input_encoding][, output_encoding])
-
-Computes the shared secret using `other_public_key` as the other
-party's public key and returns the computed shared secret. Supplied
-key is interpreted using specified `input_encoding`, and secret is
-encoded using specified `output_encoding`. Encodings can be
-`'binary'`, `'hex'`, or `'base64'`. If the input encoding is not
-provided, then a buffer is expected.
-
-If no output encoding is given, then a buffer is returned.
-
-### ECDH.getPublicKey([encoding[, format]])
-
-Returns the EC Diffie-Hellman public key in the specified encoding and format.
-
-Format specifies point encoding and can be `'compressed'`, `'uncompressed'`, or
-`'hybrid'`. If no format is provided - the point will be returned in
-`'uncompressed'` format.
-
-Encoding can be `'binary'`, `'hex'`, or `'base64'`. If no encoding is provided,
-then a buffer is returned.
-
-### ECDH.getPrivateKey([encoding])
-
-Returns the EC Diffie-Hellman private key in the specified encoding,
-which can be `'binary'`, `'hex'`, or `'base64'`. If no encoding is
-provided, then a buffer is returned.
-
-### ECDH.setPublicKey(public_key[, encoding])
-
-Sets the EC Diffie-Hellman public key. Key encoding can be `'binary'`,
-`'hex'` or `'base64'`. If no encoding is provided, then a buffer is
-expected.
-
-### ECDH.setPrivateKey(private_key[, encoding])
-
-Sets the EC Diffie-Hellman private key. Key encoding can be `'binary'`,
-`'hex'` or `'base64'`. If no encoding is provided, then a buffer is
-expected.
-
-Example (obtaining a shared secret):
-
-    var crypto = require('crypto');
-    var alice = crypto.createECDH('secp256k1');
-    var bob = crypto.createECDH('secp256k1');
+## crypto.getHashes()
 
-    alice.generateKeys();
-    bob.generateKeys();
+Returns an array with the names of the supported hash algorithms.
 
-    var alice_secret = alice.computeSecret(bob.getPublicKey(), null, 'hex');
-    var bob_secret = bob.computeSecret(alice.getPublicKey(), null, 'hex');
+Example:
 
-    /* alice_secret and bob_secret should be the same */
-    console.log(alice_secret == bob_secret);
+    var hashes = crypto.getHashes();
+    console.log(hashes); // ['sha', 'sha1', 'sha1WithRSAEncryption', ...]
 
 ## crypto.pbkdf2(password, salt, iterations, keylen[, digest], callback)
 
@@ -640,44 +638,33 @@ You can get a list of supported digest functions with
 
 Synchronous PBKDF2 function.  Returns derivedKey or throws error.
 
-## crypto.randomBytes(size[, callback])
-
-Generates cryptographically strong pseudo-random data. Usage:
-
-    // async
-    crypto.randomBytes(256, function(ex, buf) {
-      if (ex) throw ex;
-      console.log('Have %d bytes of random data: %s', buf.length, buf);
-    });
-
-    // sync
-    const buf = crypto.randomBytes(256);
-    console.log('Have %d bytes of random data: %s', buf.length, buf);
-
-NOTE: This will block if there is insufficient entropy, although it should
-normally never take longer than a few milliseconds. The only time when this
-may conceivably block is right after boot, when the whole system is still
-low on entropy.
+## crypto.privateDecrypt(private_key, buffer)
 
-## Class: Certificate
+Decrypts `buffer` with `private_key`.
 
-The class used for working with signed public key & challenges. The most
-common usage for this series of functions is when dealing with the `<keygen>`
-element. http://www.openssl.org/docs/apps/spkac.html
+`private_key` can be an object or a string. If `private_key` is a string, it is
+treated as the key with no passphrase and will use `RSA_PKCS1_OAEP_PADDING`.
 
-Returned by `crypto.Certificate`.
+`private_key`:
 
-### Certificate.verifySpkac(spkac)
+* `key` : A string holding the PEM encoded private key
+* `passphrase` : An optional string of passphrase for the private key
+* `padding` : An optional padding value, one of the following:
+  * `constants.RSA_NO_PADDING`
+  * `constants.RSA_PKCS1_PADDING`
+  * `constants.RSA_PKCS1_OAEP_PADDING`
 
-Returns true of false based on the validity of the SPKAC.
+NOTE: All paddings are defined in `constants` module.
 
-### Certificate.exportChallenge(spkac)
+## crypto.privateEncrypt(private_key, buffer)
 
-Exports the encoded challenge associated with the SPKAC.
+See above for details. Has the same API as `crypto.privateDecrypt`.
+Default padding is `RSA_PKCS1_PADDING`.
 
-### Certificate.exportPublicKey(spkac)
+## crypto.publicDecrypt(public_key, buffer)
 
-Exports the encoded public key from the supplied SPKAC.
+See above for details. Has the same API as `crypto.publicEncrypt`. Default
+padding is `RSA_PKCS1_PADDING`.
 
 ## crypto.publicEncrypt(public_key, buffer)
 
@@ -699,44 +686,47 @@ key to this method.
 
 NOTE: All paddings are defined in `constants` module.
 
-## crypto.publicDecrypt(public_key, buffer)
-
-See above for details. Has the same API as `crypto.publicEncrypt`. Default
-padding is `RSA_PKCS1_PADDING`.
-
-## crypto.privateDecrypt(private_key, buffer)
-
-Decrypts `buffer` with `private_key`.
+## crypto.randomBytes(size[, callback])
 
-`private_key` can be an object or a string. If `private_key` is a string, it is
-treated as the key with no passphrase and will use `RSA_PKCS1_OAEP_PADDING`.
+Generates cryptographically strong pseudo-random data. Usage:
 
-`private_key`:
+    // async
+    crypto.randomBytes(256, function(ex, buf) {
+      if (ex) throw ex;
+      console.log('Have %d bytes of random data: %s', buf.length, buf);
+    });
 
-* `key` : A string holding the PEM encoded private key
-* `passphrase` : An optional string of passphrase for the private key
-* `padding` : An optional padding value, one of the following:
-  * `constants.RSA_NO_PADDING`
-  * `constants.RSA_PKCS1_PADDING`
-  * `constants.RSA_PKCS1_OAEP_PADDING`
+    // sync
+    const buf = crypto.randomBytes(256);
+    console.log('Have %d bytes of random data: %s', buf.length, buf);
 
-NOTE: All paddings are defined in `constants` module.
+NOTE: This will block if there is insufficient entropy, although it should
+normally never take longer than a few milliseconds. The only time when this
+may conceivably block is right after boot, when the whole system is still
+low on entropy.
 
-## crypto.privateEncrypt(private_key, buffer)
+## crypto.setEngine(engine[, flags])
 
-See above for details. Has the same API as `crypto.privateDecrypt`.
-Default padding is `RSA_PKCS1_PADDING`.
+Load and set engine for some/all OpenSSL functions (selected by flags).
 
-## crypto.DEFAULT_ENCODING
+`engine` could be either an id or a path to the engine's shared library.
 
-The default encoding to use for functions that can take either strings
-or buffers.  The default value is `'buffer'`, which makes it default
-to using Buffer objects.  This is here to make the crypto module more
-easily compatible with legacy programs that expected `'binary'` to be
-the default encoding.
+`flags` is optional and has `ENGINE_METHOD_ALL` value by default. It could take
+one of or mix of following flags (defined in `constants` module):
 
-Note that new programs will probably expect buffers, so only use this
-as a temporary measure.
+* `ENGINE_METHOD_RSA`
+* `ENGINE_METHOD_DSA`
+* `ENGINE_METHOD_DH`
+* `ENGINE_METHOD_RAND`
+* `ENGINE_METHOD_ECDH`
+* `ENGINE_METHOD_ECDSA`
+* `ENGINE_METHOD_CIPHERS`
+* `ENGINE_METHOD_DIGESTS`
+* `ENGINE_METHOD_STORE`
+* `ENGINE_METHOD_PKEY_METH`
+* `ENGINE_METHOD_PKEY_ASN1_METH`
+* `ENGINE_METHOD_ALL`
+* `ENGINE_METHOD_NONE`
 
 ## Recent API Changes
 

From 488326da8d25b653fcc4fe6f81a740fd3a8fda63 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 11:30:26 -0500
Subject: [PATCH 152/323] doc: sort dgram alphabetically

Reorders, with no contextual changes, the dgram documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/dgram.markdown | 301 ++++++++++++++++++++---------------------
 1 file changed, 149 insertions(+), 152 deletions(-)

diff --git a/doc/api/dgram.markdown b/doc/api/dgram.markdown
index 72ea2130581d6b..fce88d0fdc2d2f 100644
--- a/doc/api/dgram.markdown
+++ b/doc/api/dgram.markdown
@@ -20,66 +20,11 @@ You have to change it to this:
       s.addMembership('224.0.0.114');
     });
 
-
-## dgram.createSocket(type[, callback])
-
-* `type` String. Either 'udp4' or 'udp6'
-* `callback` Function. Attached as a listener to `message` events.
-  Optional
-* Returns: Socket object
-
-Creates a datagram Socket of the specified types.  Valid types are `udp4`
-and `udp6`.
-
-Takes an optional callback which is added as a listener for `message` events.
-
-Call `socket.bind()` if you want to receive datagrams. `socket.bind()` will
-bind to the "all interfaces" address on a random port (it does the right thing
-for both `udp4` and `udp6` sockets). You can then retrieve the address and port
-with `socket.address().address` and `socket.address().port`.
-
-## dgram.createSocket(options[, callback])
-* `options` Object
-* `callback` Function. Attached as a listener to `message` events.
-* Returns: Socket object
-
-The `options` object should contain a `type` field of either `udp4` or `udp6`
-and an optional boolean `reuseAddr` field.
-
-When `reuseAddr` is `true` `socket.bind()` will reuse the address, even if
-another process has already bound a socket on it. `reuseAddr` defaults to
-`false`.
-
-Takes an optional callback which is added as a listener for `message` events.
-
-Call `socket.bind()` if you want to receive datagrams. `socket.bind()` will
-bind to the "all interfaces" address on a random port (it does the right thing
-for both `udp4` and `udp6` sockets). You can then retrieve the address and port
-with `socket.address().address` and `socket.address().port`.
-
 ## Class: dgram.Socket
 
 The dgram Socket class encapsulates the datagram functionality.  It
 should be created via `dgram.createSocket(...)`
 
-### Event: 'message'
-
-* `msg` Buffer object. The message
-* `rinfo` Object. Remote address information
-
-Emitted when a new datagram is available on a socket.  `msg` is a `Buffer` and
-`rinfo` is an object with the sender's address information:
-
-    socket.on('message', function(msg, rinfo) {
-      console.log('Received %d bytes from %s:%d\n',
-                  msg.length, rinfo.address, rinfo.port);
-    });
-
-### Event: 'listening'
-
-Emitted when a socket starts listening for datagrams.  This happens as soon as UDP sockets
-are created.
-
 ### Event: 'close'
 
 Emitted after a socket is closed with `close()`.  No new `message` events will be emitted
@@ -91,72 +36,38 @@ on this socket.
 
 Emitted when an error occurs.
 
-### socket.send(buf, offset, length, port, address[, callback])
-
-* `buf` Buffer object or string.  Message to be sent
-* `offset` Integer. Offset in the buffer where the message starts.
-* `length` Integer. Number of bytes in the message.
-* `port` Integer. Destination port.
-* `address` String. Destination hostname or IP address.
-* `callback` Function. Called when the message has been sent. Optional.
-
-For UDP sockets, the destination port and address must be specified.  A string
-may be supplied for the `address` parameter, and it will be resolved with DNS.
-
-If the address is omitted or is an empty string, `'0.0.0.0'` or `'::0'` is used
-instead.  Depending on the network configuration, those defaults may or may not
-work; it's best to be explicit about the destination address.
+### Event: 'listening'
 
-If the socket has not been previously bound with a call to `bind`, it gets
-assigned a random port number and is bound to the "all interfaces" address
-(`'0.0.0.0'` for `udp4` sockets, `'::0'` for `udp6` sockets.)
+Emitted when a socket starts listening for datagrams.  This happens as soon as UDP sockets
+are created.
 
-An optional callback may be specified to detect DNS errors or for determining
-when it's safe to reuse the `buf` object.  Note that DNS lookups delay the time
-to send for at least one tick.  The only way to know for sure that the datagram
-has been sent is by using a callback. If an error occurs and a callback is
-given, the error will be the first argument to the callback. If a callback is
-not given, the error is emitted as an `'error'` event on the `socket` object.
+### Event: 'message'
 
-With consideration for multi-byte characters, `offset` and `length` will
-be calculated with respect to
-[byte length](buffer.html#buffer_class_method_buffer_bytelength_string_encoding)
-and not the character position.
+* `msg` Buffer object. The message
+* `rinfo` Object. Remote address information
 
-Example of sending a UDP packet to a random port on `localhost`;
+Emitted when a new datagram is available on a socket.  `msg` is a `Buffer` and
+`rinfo` is an object with the sender's address information:
 
-    var dgram = require('dgram');
-    var message = new Buffer("Some bytes");
-    var client = dgram.createSocket("udp4");
-    client.send(message, 0, message.length, 41234, "localhost", function(err) {
-      client.close();
+    socket.on('message', function(msg, rinfo) {
+      console.log('Received %d bytes from %s:%d\n',
+                  msg.length, rinfo.address, rinfo.port);
     });
 
-**A Note about UDP datagram size**
+### socket.addMembership(multicastAddress[, multicastInterface])
 
-The maximum size of an `IPv4/v6` datagram depends on the `MTU` (_Maximum Transmission Unit_)
-and on the `Payload Length` field size.
+* `multicastAddress` String
+* `multicastInterface` String, Optional
 
-- The `Payload Length` field is `16 bits` wide, which means that a normal payload
-  cannot be larger than 64K octets including internet header and data
-  (65,507 bytes = 65,535 − 8 bytes UDP header − 20 bytes IP header);
-  this is generally true for loopback interfaces, but such long datagrams
-  are impractical for most hosts and networks.
+Tells the kernel to join a multicast group with `IP_ADD_MEMBERSHIP` socket option.
 
-- The `MTU` is the largest size a given link layer technology can support for datagrams.
-  For any link, `IPv4` mandates a minimum `MTU` of `68` octets, while the recommended `MTU`
-  for IPv4 is `576` (typically recommended as the `MTU` for dial-up type applications),
-  whether they arrive whole or in fragments.
+If `multicastInterface` is not specified, the OS will try to add membership to all valid
+interfaces.
 
-  For `IPv6`, the minimum `MTU` is `1280` octets, however, the mandatory minimum
-  fragment reassembly buffer size is `1500` octets.
-  The value of `68` octets is very small, since most current link layer technologies have
-  a minimum `MTU` of `1500` (like Ethernet).
+### socket.address()
 
-Note that it's impossible to know in advance the MTU of each link through which
-a packet might travel, and that generally sending a datagram greater than
-the (receiver) `MTU` won't work (the packet gets silently dropped, without
-informing the source that the data did not reach its intended recipient).
+Returns an object containing the address information for a socket.  For UDP sockets,
+this object will contain `address` , `family` and `port`.
 
 ### socket.bind([port][, address][, callback])
 
@@ -204,7 +115,6 @@ Example of a UDP server listening on port 41234:
     server.bind(41234);
     // server listening 0.0.0.0:41234
 
-
 ### socket.bind(options[, callback])
 
 * `options` {Object} - Required. Supports the following properties:
@@ -230,16 +140,90 @@ shown below.
       exclusive: true
     });
 
-
 ### socket.close([callback])
 
 Close the underlying socket and stop listening for data on it. If a callback is
 provided, it is added as a listener for the ['close'](#dgram_event_close) event.
 
-### socket.address()
+### socket.dropMembership(multicastAddress[, multicastInterface])
 
-Returns an object containing the address information for a socket.  For UDP sockets,
-this object will contain `address` , `family` and `port`.
+* `multicastAddress` String
+* `multicastInterface` String, Optional
+
+Opposite of `addMembership` - tells the kernel to leave a multicast group with
+`IP_DROP_MEMBERSHIP` socket option. This is automatically called by the kernel
+when the socket is closed or process terminates, so most apps will never need to call
+this.
+
+If `multicastInterface` is not specified, the OS will try to drop membership to all valid
+interfaces.
+
+### socket.send(buf, offset, length, port, address[, callback])
+
+* `buf` Buffer object or string.  Message to be sent
+* `offset` Integer. Offset in the buffer where the message starts.
+* `length` Integer. Number of bytes in the message.
+* `port` Integer. Destination port.
+* `address` String. Destination hostname or IP address.
+* `callback` Function. Called when the message has been sent. Optional.
+
+For UDP sockets, the destination port and address must be specified.  A string
+may be supplied for the `address` parameter, and it will be resolved with DNS.
+
+If the address is omitted or is an empty string, `'0.0.0.0'` or `'::0'` is used
+instead.  Depending on the network configuration, those defaults may or may not
+work; it's best to be explicit about the destination address.
+
+If the socket has not been previously bound with a call to `bind`, it gets
+assigned a random port number and is bound to the "all interfaces" address
+(`'0.0.0.0'` for `udp4` sockets, `'::0'` for `udp6` sockets.)
+
+An optional callback may be specified to detect DNS errors or for determining
+when it's safe to reuse the `buf` object.  Note that DNS lookups delay the time
+to send for at least one tick.  The only way to know for sure that the datagram
+has been sent is by using a callback. If an error occurs and a callback is
+given, the error will be the first argument to the callback. If a callback is
+not given, the error is emitted as an `'error'` event on the `socket` object.
+
+With consideration for multi-byte characters, `offset` and `length` will
+be calculated with respect to
+[byte length](buffer.html#buffer_class_method_buffer_bytelength_string_encoding)
+and not the character position.
+
+Example of sending a UDP packet to a random port on `localhost`;
+
+    var dgram = require('dgram');
+    var message = new Buffer("Some bytes");
+    var client = dgram.createSocket("udp4");
+    client.send(message, 0, message.length, 41234, "localhost", function(err) {
+      client.close();
+    });
+
+**A Note about UDP datagram size**
+
+The maximum size of an `IPv4/v6` datagram depends on the `MTU` (_Maximum Transmission Unit_)
+and on the `Payload Length` field size.
+
+- The `Payload Length` field is `16 bits` wide, which means that a normal payload
+  cannot be larger than 64K octets including internet header and data
+  (65,507 bytes = 65,535 − 8 bytes UDP header − 20 bytes IP header);
+  this is generally true for loopback interfaces, but such long datagrams
+  are impractical for most hosts and networks.
+
+- The `MTU` is the largest size a given link layer technology can support for datagrams.
+  For any link, `IPv4` mandates a minimum `MTU` of `68` octets, while the recommended `MTU`
+  for IPv4 is `576` (typically recommended as the `MTU` for dial-up type applications),
+  whether they arrive whole or in fragments.
+
+  For `IPv6`, the minimum `MTU` is `1280` octets, however, the mandatory minimum
+  fragment reassembly buffer size is `1500` octets.
+  The value of `68` octets is very small, since most current link layer technologies have
+  a minimum `MTU` of `1500` (like Ethernet).
+
+Note that it's impossible to know in advance the MTU of each link through which
+a packet might travel, and that generally sending a datagram greater than
+the (receiver) `MTU` won't work (the packet gets silently dropped, without
+informing the source that the data did not reach its intended recipient).
 
 ### socket.setBroadcast(flag)
 
@@ -248,18 +232,12 @@ this object will contain `address` , `family` and `port`.
 Sets or clears the `SO_BROADCAST` socket option.  When this option is set, UDP packets
 may be sent to a local interface's broadcast address.
 
-### socket.setTTL(ttl)
-
-* `ttl` Integer
+### socket.setMulticastLoopback(flag)
 
-Sets the `IP_TTL` socket option.  TTL stands for "Time to Live," but in this context it
-specifies the number of IP hops that a packet is allowed to go through.  Each router or
-gateway that forwards a packet decrements the TTL.  If the TTL is decremented to 0 by a
-router, it will not be forwarded.  Changing TTL values is typically done for network
-probes or when multicasting.
+* `flag` Boolean
 
-The argument to `setTTL()` is a number of hops between 1 and 255.  The default on most
-systems is 64.
+Sets or clears the `IP_MULTICAST_LOOP` socket option.  When this option is set, multicast
+packets will also be received on the local interface.
 
 ### socket.setMulticastTTL(ttl)
 
@@ -273,35 +251,26 @@ decrements the TTL. If the TTL is decremented to 0 by a router, it will not be f
 The argument to `setMulticastTTL()` is a number of hops between 0 and 255.  The default on most
 systems is 1.
 
-### socket.setMulticastLoopback(flag)
-
-* `flag` Boolean
-
-Sets or clears the `IP_MULTICAST_LOOP` socket option.  When this option is set, multicast
-packets will also be received on the local interface.
-
-### socket.addMembership(multicastAddress[, multicastInterface])
-
-* `multicastAddress` String
-* `multicastInterface` String, Optional
+### socket.setTTL(ttl)
 
-Tells the kernel to join a multicast group with `IP_ADD_MEMBERSHIP` socket option.
+* `ttl` Integer
 
-If `multicastInterface` is not specified, the OS will try to add membership to all valid
-interfaces.
+Sets the `IP_TTL` socket option.  TTL stands for "Time to Live," but in this context it
+specifies the number of IP hops that a packet is allowed to go through.  Each router or
+gateway that forwards a packet decrements the TTL.  If the TTL is decremented to 0 by a
+router, it will not be forwarded.  Changing TTL values is typically done for network
+probes or when multicasting.
 
-### socket.dropMembership(multicastAddress[, multicastInterface])
+The argument to `setTTL()` is a number of hops between 1 and 255.  The default on most
+systems is 64.
 
-* `multicastAddress` String
-* `multicastInterface` String, Optional
+### socket.ref()
 
-Opposite of `addMembership` - tells the kernel to leave a multicast group with
-`IP_DROP_MEMBERSHIP` socket option. This is automatically called by the kernel
-when the socket is closed or process terminates, so most apps will never need to call
-this.
+Opposite of `unref`, calling `ref` on a previously `unref`d socket will *not*
+let the program exit if it's the only socket left (the default behavior). If
+the socket is `ref`d calling `ref` again will have no effect.
 
-If `multicastInterface` is not specified, the OS will try to drop membership to all valid
-interfaces.
+Returns `socket`.
 
 ### socket.unref()
 
@@ -311,10 +280,38 @@ active socket in the event system. If the socket is already `unref`d calling
 
 Returns `socket`.
 
-### socket.ref()
+## dgram.createSocket(options[, callback])
+* `options` Object
+* `callback` Function. Attached as a listener to `message` events.
+* Returns: Socket object
 
-Opposite of `unref`, calling `ref` on a previously `unref`d socket will *not*
-let the program exit if it's the only socket left (the default behavior). If
-the socket is `ref`d calling `ref` again will have no effect.
+The `options` object should contain a `type` field of either `udp4` or `udp6`
+and an optional boolean `reuseAddr` field.
 
-Returns `socket`.
+When `reuseAddr` is `true` `socket.bind()` will reuse the address, even if
+another process has already bound a socket on it. `reuseAddr` defaults to
+`false`.
+
+Takes an optional callback which is added as a listener for `message` events.
+
+Call `socket.bind()` if you want to receive datagrams. `socket.bind()` will
+bind to the "all interfaces" address on a random port (it does the right thing
+for both `udp4` and `udp6` sockets). You can then retrieve the address and port
+with `socket.address().address` and `socket.address().port`.
+
+## dgram.createSocket(type[, callback])
+
+* `type` String. Either 'udp4' or 'udp6'
+* `callback` Function. Attached as a listener to `message` events.
+  Optional
+* Returns: Socket object
+
+Creates a datagram Socket of the specified types.  Valid types are `udp4`
+and `udp6`.
+
+Takes an optional callback which is added as a listener for `message` events.
+
+Call `socket.bind()` if you want to receive datagrams. `socket.bind()` will
+bind to the "all interfaces" address on a random port (it does the right thing
+for both `udp4` and `udp6` sockets). You can then retrieve the address and port
+with `socket.address().address` and `socket.address().port`.

From 63a78749b8223660c8665c5bcbebe0b53f3f76ba Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 11:37:27 -0500
Subject: [PATCH 153/323] doc: sort errors alphabetically

Reorders, with no contextual changes, the errors documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/errors.markdown | 432 ++++++++++++++++++++--------------------
 1 file changed, 216 insertions(+), 216 deletions(-)

diff --git a/doc/api/errors.markdown b/doc/api/errors.markdown
index 505241fc89a487..5e5f9acb99fc57 100644
--- a/doc/api/errors.markdown
+++ b/doc/api/errors.markdown
@@ -18,6 +18,123 @@ The style of API called determines how generated errors are handed back, or
 the error. Exceptions can be intercepted using the `try / catch` construct;
 other propagation strategies are covered [below](#errors_error_propagation_and_interception).
 
+## Error Propagation and Interception
+
+<!--type=misc-->
+
+All Node.js APIs will treat invalid arguments as exceptional -- that is, if passed
+invalid arguments, they will *immediately* generate and throw the error as an
+exception, even if they are an otherwise asynchronous API.
+
+Synchronous APIs (like
+[fs.readFileSync](fs.html#fs_fs_readfilesync_filename_options)) will throw the
+error. The act of *throwing* a value (in this case, the error) turns the value
+into an **exception**.  Exceptions may be caught using the `try { } catch(err)
+{ }` construct.
+
+Asynchronous APIs have **two** mechanisms for error propagation; one mechanism
+for APIs that represent a single operation, and one for APIs that represent
+multiple operations over time.
+
+### Error events
+
+<!--type=misc-->
+
+The other mechanism for providing errors is the "error" event. This is
+typically used by [stream-based](stream.html) and [event emitter-based](events.html#events_class_events_eventemitter) APIs, which
+themselves represent a series of asynchronous operations over time (versus a
+single operation that may pass or fail). If no "error" event handler is
+attached to the source of the error, the error will be thrown. At this point,
+it will crash the process as an unhandled exception unless [domains](domain.html) are
+employed appropriately or [process.on('uncaughtException')](process.html#process_event_uncaughtexception) has a handler.
+
+```javascript
+var net = require('net');
+
+var connection = net.connect('localhost');
+
+// adding an "error" event handler to a stream:
+connection.on('error', function(err) {
+  // if the connection is reset by the server, or if it can't
+  // connect at all, or on any sort of error encountered by
+  // the connection, the error will be sent here.
+  console.error(err);
+});
+
+connection.pipe(process.stdout);
+```
+
+The "throw when no error handlers are attached behavior" is not limited to APIs
+provided by Node.js -- even user created event emitters and streams will throw
+errors when no error handlers are attached. An example:
+
+```javascript
+var EventEmitter = require('events');
+
+var ee = new EventEmitter();
+
+setImmediate(function() {
+  // this will crash the process because no "error" event
+  // handler has been added.
+  ee.emit('error', new Error('This will crash'));
+});
+```
+
+As with node style callbacks, errors generated this way *cannot* be intercepted
+by `try { } catch(err) { }` -- they happen *after* the calling code has already
+exited.
+
+### Node style callbacks
+
+<!--type=misc-->
+
+Single operation APIs take "node style callbacks" -- a
+function provided to the API as an argument. The node style callback takes
+at least **one** argument -- `error` -- that will either be `null` (if no error
+was encountered) or an `Error` instance.  For instance:
+
+```javascript
+var fs = require('fs');
+
+fs.readFile('/some/file/that/does-not-exist', function nodeStyleCallback(err, data) {
+  console.log(err)  // Error: ENOENT
+  console.log(data) // undefined / null
+});
+
+fs.readFile('/some/file/that/does-exist', function(err, data) {
+  console.log(err)  // null
+  console.log(data) // <Buffer: ba dd ca fe>
+})
+```
+
+Note that `try { } catch(err) { }` **cannot** intercept errors generated by
+asynchronous APIs. A common mistake for beginners is to try to use `throw`
+inside their node style callback:
+
+```javascript
+// THIS WILL NOT WORK:
+var fs = require('fs');
+
+try {
+  fs.readFile('/some/file/that/does-not-exist', function(err, data) {
+    // mistaken assumption: throwing here...
+    if (err) {
+      throw err;
+    }
+  });
+} catch(err) {
+  // ... will be caught here -- this is incorrect!
+  console.log(err); // Error: ENOENT
+}
+```
+
+This will not work! By the time the node style callback has been called, the
+surrounding code (including the `try { } catch(err) { }` will have already
+exited. Throwing an error inside a node style callback **will crash the process** in most cases.
+If [domains](domain.html) are enabled, they may intercept the thrown error; similarly, if a
+handler has been added to `process.on('uncaughtException')`, it will intercept
+the error.
+
 ## JavaScript Errors
 
 <!--type=misc-->
@@ -45,6 +162,54 @@ was called. Stack traces are subject to [V8's stack trace API](https://code.goog
 Stack traces only extend to the beginning of synchronous code execution, *or* a number of frames given by
 `Error.stackTraceLimit`, whichever is smaller.
 
+#### Error.captureStackTrace(targetObject[, constructorOpt])
+
+Creates a `.stack` property on `targetObject`, which when accessed returns
+a string representing the location in the program at which `Error.captureStackTrace`
+was called.
+
+```javascript
+var myObject = {};
+
+Error.captureStackTrace(myObject);
+
+myObject.stack  // similar to `new Error().stack`
+```
+
+The first line of the trace, instead of being prefixed with `ErrorType:
+message`, will be the result of `targetObject.toString()`.
+
+`constructorOpt` optionally accepts a function. If given, all frames above
+`constructorOpt`, including `constructorOpt`, will be omitted from the generated
+stack trace.
+
+This is useful for hiding implementation details of error generation from the
+end user. A common way of using this parameter is to pass the current Error
+constructor to it:
+
+```javascript
+
+function MyError() {
+  Error.captureStackTrace(this, MyError);
+}
+
+// without passing MyError to captureStackTrace, the MyError
+// frame would should up in the .stack property. by passing
+// the constructor, we omit that frame and all frames above it.
+new MyError().stack
+
+```
+
+#### Error.stackTraceLimit
+
+Property that determines the number of stack frames collected by a stack trace
+(whether generated by `new Error().stack` or `Error.captureStackTrace(obj)`).
+
+The initial value is `10`. It may be set to any valid JavaScript number, which
+will affect any stack trace captured *after* the value has been changed. If set
+to a non-number value, stack traces will not capture any frames and will report
+`undefined` on access.
+
 #### error.message
 
 A string of the value passed to `Error()` upon instantiation. The message will
@@ -119,54 +284,6 @@ loop tick.
 System-level errors are generated as augmented Error instances, which are detailed
 [below](#errors_system_errors).
 
-#### Error.captureStackTrace(targetObject[, constructorOpt])
-
-Creates a `.stack` property on `targetObject`, which when accessed returns
-a string representing the location in the program at which `Error.captureStackTrace`
-was called.
-
-```javascript
-var myObject = {};
-
-Error.captureStackTrace(myObject);
-
-myObject.stack  // similar to `new Error().stack`
-```
-
-The first line of the trace, instead of being prefixed with `ErrorType:
-message`, will be the result of `targetObject.toString()`.
-
-`constructorOpt` optionally accepts a function. If given, all frames above
-`constructorOpt`, including `constructorOpt`, will be omitted from the generated
-stack trace.
-
-This is useful for hiding implementation details of error generation from the
-end user. A common way of using this parameter is to pass the current Error
-constructor to it:
-
-```javascript
-
-function MyError() {
-  Error.captureStackTrace(this, MyError);
-}
-
-// without passing MyError to captureStackTrace, the MyError
-// frame would should up in the .stack property. by passing
-// the constructor, we omit that frame and all frames above it.
-new MyError().stack
-
-```
-
-#### Error.stackTraceLimit
-
-Property that determines the number of stack frames collected by a stack trace
-(whether generated by `new Error().stack` or `Error.captureStackTrace(obj)`).
-
-The initial value is `10`. It may be set to any valid JavaScript number, which
-will affect any stack trace captured *after* the value has been changed. If set
-to a non-number value, stack traces will not capture any frames and will report
-`undefined` on access.
-
 ### Class: RangeError
 
 A subclass of Error that indicates that a provided argument was not within the
@@ -180,19 +297,6 @@ require('net').connect(-1);  // throws RangeError, port should be > 0 && < 65536
 Node.js will generate and throw RangeError instances *immediately* -- they are a form
 of argument validation.
 
-### Class: TypeError
-
-A subclass of Error that indicates that a provided argument is not an allowable
-type. For example, passing a function to a parameter which expects a string would
-be considered a TypeError.
-
-```javascript
-require('url').parse(function() { }); // throws TypeError, since it expected a string
-```
-
-Node.js will generate and throw TypeError instances *immediately* -- they are a form
-of argument validation.
-
 ### Class: ReferenceError
 
 A subclass of Error that indicates that an attempt is being made to access a variable
@@ -238,6 +342,19 @@ try {
 SyntaxErrors are unrecoverable from the context that created them – they may only be caught
 by other contexts.
 
+### Class: TypeError
+
+A subclass of Error that indicates that a provided argument is not an allowable
+type. For example, passing a function to a parameter which expects a string would
+be considered a TypeError.
+
+```javascript
+require('url').parse(function() { }); // throws TypeError, since it expected a string
+```
+
+Node.js will generate and throw TypeError instances *immediately* -- they are a form
+of argument validation.
+
 ### Exceptions vs. Errors
 
 <!--type=misc-->
@@ -262,46 +379,49 @@ subclasses, but instead an error instance with added members.
 
 ### Class: System Error
 
-#### error.syscall
-
-A string representing the [syscall](http://man7.org/linux/man-pages/man2/syscall.2.html) that failed.
-
-#### error.errno
 #### error.code
+#### error.errno
 
 A string representing the error code, which is always `E` followed by capital
 letters, and may be referenced in `man 2 intro`.
 
+#### error.syscall
+
+A string representing the [syscall](http://man7.org/linux/man-pages/man2/syscall.2.html) that failed.
+
 ### Common System Errors
 
 This list is **not exhaustive**, but enumerates many of the common system errors when
 writing a Node.js program. An exhaustive list may be found [here](http://man7.org/linux/man-pages/man3/errno.3.html).
 
-#### EPERM: Operation not permitted
+#### EACCES: Permission denied
 
-An attempt was made to perform an operation that requires appropriate
-privileges.
+An attempt was made to access a file in a way forbidden by its file access
+permissions.
 
-#### ENOENT: No such file or directory
+#### EADDRINUSE: Address already in use
 
-Commonly raised by [fs](fs.html) operations; a component of the specified pathname
-does not exist -- no entity (file or directory) could be found by the given path.
+An attempt to bind a server ([net](net.html), [http](http.html), or [https](https.html)) to a local
+address failed due to another server on the local system already occupying
+that address.
 
-#### EACCES: Permission denied
+#### ECONNREFUSED: Connection refused
 
-An attempt was made to access a file in a way forbidden by its file access
-permissions.
+No connection could be made because the target machine actively refused
+it. This usually results from trying to connect to a service that is inactive
+on the foreign host.
+
+#### ECONNRESET: Connection reset by peer
+
+A connection was forcibly closed by a peer. This normally results
+from a loss of the connection on the remote socket due to a timeout
+or reboot. Commonly encountered via the [http](http.html) and [net](net.html) modules.
 
 #### EEXIST: File exists
 
 An existing file was the target of an operation that required that the target
 not exist.
 
-#### ENOTDIR: Not a directory
-
-A component of the given pathname existed, but was not a directory as expected.
-Commonly raised by [fs.readdir](fs.html#fs_fs_readdir_path_callback).
-
 #### EISDIR: Is a directory
 
 An operation expected a file, but the given pathname was a directory.
@@ -317,154 +437,34 @@ on systems (in particular, OS X) where there is a low file descriptor limit
 for processes. To remedy a low limit, run `ulimit -n 2048` in the same shell
 that will run the Node.js process.
 
-#### EPIPE: Broken pipe
+#### ENOENT: No such file or directory
 
-A write on a pipe, socket, or FIFO for which there is no process to read the
-data. Commonly encountered at the [net](net.html) and [http](http.html) layers, indicative that
-the remote side of the stream being written to has been closed.
+Commonly raised by [fs](fs.html) operations; a component of the specified pathname
+does not exist -- no entity (file or directory) could be found by the given path.
 
-#### EADDRINUSE: Address already in use
+#### ENOTDIR: Not a directory
 
-An attempt to bind a server ([net](net.html), [http](http.html), or [https](https.html)) to a local
-address failed due to another server on the local system already occupying
-that address.
+A component of the given pathname existed, but was not a directory as expected.
+Commonly raised by [fs.readdir](fs.html#fs_fs_readdir_path_callback).
 
-#### ECONNRESET: Connection reset by peer
+#### ENOTEMPTY: Directory not empty
 
-A connection was forcibly closed by a peer. This normally results
-from a loss of the connection on the remote socket due to a timeout
-or reboot. Commonly encountered via the [http](http.html) and [net](net.html) modules.
+A directory with entries was the target of an operation that requires
+an empty directory -- usually [fs.unlink](fs.html#fs_fs_unlink_path_callback).
 
-#### ECONNREFUSED: Connection refused
+#### EPERM: Operation not permitted
 
-No connection could be made because the target machine actively refused
-it. This usually results from trying to connect to a service that is inactive
-on the foreign host.
+An attempt was made to perform an operation that requires appropriate
+privileges.
 
-#### ENOTEMPTY: Directory not empty
+#### EPIPE: Broken pipe
 
-A directory with entries was the target of an operation that requires
-an empty directory -- usually [fs.unlink](fs.html#fs_fs_unlink_path_callback).
+A write on a pipe, socket, or FIFO for which there is no process to read the
+data. Commonly encountered at the [net](net.html) and [http](http.html) layers, indicative that
+the remote side of the stream being written to has been closed.
 
 #### ETIMEDOUT: Operation timed out
 
 A connect or send request failed because the connected party did not properly
 respond after a period of time. Usually encountered by [http](http.html) or [net](net.html) --
 often a sign that a connected socket was not `.end()`'d appropriately.
-
-## Error Propagation and Interception
-
-<!--type=misc-->
-
-All Node.js APIs will treat invalid arguments as exceptional -- that is, if passed
-invalid arguments, they will *immediately* generate and throw the error as an
-exception, even if they are an otherwise asynchronous API.
-
-Synchronous APIs (like
-[fs.readFileSync](fs.html#fs_fs_readfilesync_filename_options)) will throw the
-error. The act of *throwing* a value (in this case, the error) turns the value
-into an **exception**.  Exceptions may be caught using the `try { } catch(err)
-{ }` construct.
-
-Asynchronous APIs have **two** mechanisms for error propagation; one mechanism
-for APIs that represent a single operation, and one for APIs that represent
-multiple operations over time.
-
-### Node style callbacks
-
-<!--type=misc-->
-
-Single operation APIs take "node style callbacks" -- a
-function provided to the API as an argument. The node style callback takes
-at least **one** argument -- `error` -- that will either be `null` (if no error
-was encountered) or an `Error` instance.  For instance:
-
-```javascript
-var fs = require('fs');
-
-fs.readFile('/some/file/that/does-not-exist', function nodeStyleCallback(err, data) {
-  console.log(err)  // Error: ENOENT
-  console.log(data) // undefined / null
-});
-
-fs.readFile('/some/file/that/does-exist', function(err, data) {
-  console.log(err)  // null
-  console.log(data) // <Buffer: ba dd ca fe>
-})
-```
-
-Note that `try { } catch(err) { }` **cannot** intercept errors generated by
-asynchronous APIs. A common mistake for beginners is to try to use `throw`
-inside their node style callback:
-
-```javascript
-// THIS WILL NOT WORK:
-var fs = require('fs');
-
-try {
-  fs.readFile('/some/file/that/does-not-exist', function(err, data) {
-    // mistaken assumption: throwing here...
-    if (err) {
-      throw err;
-    }
-  });
-} catch(err) {
-  // ... will be caught here -- this is incorrect!
-  console.log(err); // Error: ENOENT
-}
-```
-
-This will not work! By the time the node style callback has been called, the
-surrounding code (including the `try { } catch(err) { }` will have already
-exited. Throwing an error inside a node style callback **will crash the process** in most cases.
-If [domains](domain.html) are enabled, they may intercept the thrown error; similarly, if a
-handler has been added to `process.on('uncaughtException')`, it will intercept
-the error.
-
-### Error events
-
-<!--type=misc-->
-
-The other mechanism for providing errors is the "error" event. This is
-typically used by [stream-based](stream.html) and [event emitter-based](events.html#events_class_events_eventemitter) APIs, which
-themselves represent a series of asynchronous operations over time (versus a
-single operation that may pass or fail). If no "error" event handler is
-attached to the source of the error, the error will be thrown. At this point,
-it will crash the process as an unhandled exception unless [domains](domain.html) are
-employed appropriately or [process.on('uncaughtException')](process.html#process_event_uncaughtexception) has a handler.
-
-```javascript
-var net = require('net');
-
-var connection = net.connect('localhost');
-
-// adding an "error" event handler to a stream:
-connection.on('error', function(err) {
-  // if the connection is reset by the server, or if it can't
-  // connect at all, or on any sort of error encountered by
-  // the connection, the error will be sent here.
-  console.error(err);
-});
-
-connection.pipe(process.stdout);
-```
-
-The "throw when no error handlers are attached behavior" is not limited to APIs
-provided by Node.js -- even user created event emitters and streams will throw
-errors when no error handlers are attached. An example:
-
-```javascript
-var EventEmitter = require('events');
-
-var ee = new EventEmitter();
-
-setImmediate(function() {
-  // this will crash the process because no "error" event
-  // handler has been added.
-  ee.emit('error', new Error('This will crash'));
-});
-```
-
-As with node style callbacks, errors generated this way *cannot* be intercepted
-by `try { } catch(err) { }` -- they happen *after* the calling code has already
-exited.

From ce3ac8dd1e23f6395b63fe580e3fb2280586e29e Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 11:45:27 -0500
Subject: [PATCH 154/323] doc: sort events alphabetically

Reorders, with minimal contextual duplication, the events documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/events.markdown | 180 ++++++++++++++++++++--------------------
 1 file changed, 89 insertions(+), 91 deletions(-)

diff --git a/doc/api/events.markdown b/doc/api/events.markdown
index 9dc384a850543f..c14994e5bf4a59 100644
--- a/doc/api/events.markdown
+++ b/doc/api/events.markdown
@@ -36,67 +36,68 @@ a stack trace and exit the program.
 All EventEmitters emit the event `'newListener'` when new listeners are
 added and `'removeListener'` when a listener is removed.
 
-### emitter.addListener(event, listener)
-### emitter.on(event, listener)
+### Inheriting from 'EventEmitter'
 
-Adds a listener to the end of the listeners array for the specified `event`.
-No checks are made to see if the `listener` has already been added. Multiple
-calls passing the same combination of `event` and `listener` will result in the
-`listener` being added multiple times.
+Inheriting from `EventEmitter` is no different from inheriting from any other
+constructor function. For example:
 
-    server.on('connection', function (stream) {
-      console.log('someone connected!');
-    });
+    'use strict';
+    const util = require('util');
+    const EventEmitter = require('events');
 
-Returns emitter, so calls can be chained.
+    function MyEventEmitter() {
+      // Initialize necessary properties from `EventEmitter` in this instance
+      EventEmitter.call(this);
+    }
 
-### emitter.once(event, listener)
+    // Inherit functions from `EventEmitter`'s prototype
+    util.inherits(MyEventEmitter, EventEmitter);
 
-Adds a **one time** listener for the event. This listener is
-invoked only the next time the event is fired, after which
-it is removed.
+### Class Method: EventEmitter.listenerCount(emitter, event)
 
-    server.once('connection', function (stream) {
-      console.log('Ah, we have our first user!');
-    });
+    Stability: 0 - Deprecated: Use [emitter.listenerCount][] instead.
 
-Returns emitter, so calls can be chained.
+Returns the number of listeners for a given event.
 
-### emitter.removeListener(event, listener)
+### Event: 'newListener'
 
-Removes a listener from the listener array for the specified event.
-**Caution**: changes array indices in the listener array behind the listener.
+* `event` {String} The event name
+* `listener` {Function} The event handler function
 
-    var callback = function(stream) {
-      console.log('someone connected!');
-    };
-    server.on('connection', callback);
-    // ...
-    server.removeListener('connection', callback);
+This event is emitted *before* a listener is added. When this event is
+triggered, the listener has not been added to the array of listeners for the
+`event`. Any listeners added to the event `name` in the newListener event
+callback will be added *before* the listener that is in the process of being
+added.
 
-`removeListener` will remove, at most, one instance of a listener from the
-listener array. If any single listener has been added multiple times to the
-listener array for the specified `event`, then `removeListener` must be called
-multiple times to remove each instance.
+### Event: 'removeListener'
 
-Returns emitter, so calls can be chained.
+* `event` {String} The event name
+* `listener` {Function} The event handler function
 
-### emitter.removeAllListeners([event])
+This event is emitted *after* a listener is removed.  When this event is
+triggered, the listener has been removed from the array of listeners for the
+`event`.
 
-Removes all listeners, or those of the specified event. It's not a good idea to
-remove listeners that were added elsewhere in the code, especially when it's on
-an emitter that you didn't create (e.g. sockets or file streams).
+### EventEmitter.defaultMaxListeners
 
-Returns emitter, so calls can be chained.
+[`emitter.setMaxListeners(n)`](#events_emitter_setmaxlisteners_n) sets the
+maximum on a per-instance basis.
+This class property lets you set it for *all* `EventEmitter` instances,
+current and future, effective immediately. Use with care.
 
-### emitter.setMaxListeners(n)
+Note that [`emitter.setMaxListeners(n)`](#events_emitter_setmaxlisteners_n)
+still has precedence over `EventEmitter.defaultMaxListeners`.
 
-By default EventEmitters will print a warning if more than 10 listeners are
-added for a particular event. This is a useful default which helps finding
-memory leaks. Obviously not all Emitters should be limited to 10. This function
-allows that to be increased. Set to `Infinity` (or `0`) for unlimited.
+### emitter.addListener(event, listener)
 
-Returns emitter, so calls can be chained.
+Alias for `emitter.on(event, listener)`.
+
+### emitter.emit(event[, arg1][, arg2][, ...])
+
+Calls each of the listeners in order with the supplied arguments.
+
+Returns `true` if event had listeners, `false` otherwise.
 
 ### emitter.getMaxListeners()
 
@@ -113,16 +114,11 @@ while not being irresponsible and setting a too big number.
       emitter.setMaxListeners(Math.max(emitter.getMaxListeners() - 1, 0));
     });
 
-### EventEmitter.defaultMaxListeners
-
-[`emitter.setMaxListeners(n)`](#events_emitter_setmaxlisteners_n) sets the
-maximum on a per-instance basis.
-This class property lets you set it for *all* `EventEmitter` instances,
-current and future, effective immediately. Use with care.
+### emitter.listenerCount(type)
 
-Note that [`emitter.setMaxListeners(n)`](#events_emitter_setmaxlisteners_n)
-still has precedence over `EventEmitter.defaultMaxListeners`.
+* `type` {Value} The type of event
 
+Returns the number of listeners listening to the `type` of event.
 
 ### emitter.listeners(event)
 
@@ -133,63 +129,65 @@ Returns a copy of the array of listeners for the specified event.
     });
     console.log(util.inspect(server.listeners('connection'))); // [ [Function] ]
 
+### emitter.on(event, listener)
 
-### emitter.emit(event[, arg1][, arg2][, ...])
-
-Calls each of the listeners in order with the supplied arguments.
-
-Returns `true` if event had listeners, `false` otherwise.
-
-
-### emitter.listenerCount(type)
-
-* `type` {Value} The type of event
+Adds a listener to the end of the listeners array for the specified `event`.
+No checks are made to see if the `listener` has already been added. Multiple
+calls passing the same combination of `event` and `listener` will result in the
+`listener` being added multiple times.
 
-Returns the number of listeners listening to the `type` of event.
+    server.on('connection', function (stream) {
+      console.log('someone connected!');
+    });
 
-### Class Method: EventEmitter.listenerCount(emitter, event)
+Returns emitter, so calls can be chained.
 
-    Stability: 0 - Deprecated: Use [emitter.listenerCount][] instead.
+### emitter.once(event, listener)
 
-Returns the number of listeners for a given event.
+Adds a **one time** listener for the event. This listener is
+invoked only the next time the event is fired, after which
+it is removed.
 
-### Event: 'newListener'
+    server.once('connection', function (stream) {
+      console.log('Ah, we have our first user!');
+    });
 
-* `event` {String} The event name
-* `listener` {Function} The event handler function
+Returns emitter, so calls can be chained.
 
-This event is emitted *before* a listener is added. When this event is
-triggered, the listener has not been added to the array of listeners for the
-`event`. Any listeners added to the event `name` in the newListener event
-callback will be added *before* the listener that is in the process of being
-added.
+### emitter.removeAllListeners([event])
 
+Removes all listeners, or those of the specified event. It's not a good idea to
+remove listeners that were added elsewhere in the code, especially when it's on
+an emitter that you didn't create (e.g. sockets or file streams).
 
-### Event: 'removeListener'
+Returns emitter, so calls can be chained.
 
-* `event` {String} The event name
-* `listener` {Function} The event handler function
+### emitter.removeListener(event, listener)
 
-This event is emitted *after* a listener is removed.  When this event is
-triggered, the listener has been removed from the array of listeners for the
-`event`.
+Removes a listener from the listener array for the specified event.
+**Caution**: changes array indices in the listener array behind the listener.
 
-### Inheriting from 'EventEmitter'
+    var callback = function(stream) {
+      console.log('someone connected!');
+    };
+    server.on('connection', callback);
+    // ...
+    server.removeListener('connection', callback);
 
-Inheriting from `EventEmitter` is no different from inheriting from any other
-constructor function. For example:
+`removeListener` will remove, at most, one instance of a listener from the
+listener array. If any single listener has been added multiple times to the
+listener array for the specified `event`, then `removeListener` must be called
+multiple times to remove each instance.
 
-    'use strict';
-    const util = require('util');
-    const EventEmitter = require('events');
+Returns emitter, so calls can be chained.
 
-    function MyEventEmitter() {
-      // Initialize necessary properties from `EventEmitter` in this instance
-      EventEmitter.call(this);
-    }
+### emitter.setMaxListeners(n)
 
-    // Inherit functions from `EventEmitter`'s prototype
-    util.inherits(MyEventEmitter, EventEmitter);
+By default EventEmitters will print a warning if more than 10 listeners are
+added for a particular event. This is a useful default which helps finding
+memory leaks. Obviously not all Emitters should be limited to 10. This function
+allows that to be increased. Set to `Infinity` (or `0`) for unlimited.
 
+Returns emitter, so calls can be chained.
 
 [emitter.listenerCount]: #events_emitter_listenercount_type

From c3f5ea704ff5c23a724671fa672d17a7a813fecc Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 12:07:07 -0500
Subject: [PATCH 155/323] doc: sort fs alphabetically

Reorders, with no contextual changes, the fs documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/fs.markdown | 1000 +++++++++++++++++++++----------------------
 1 file changed, 498 insertions(+), 502 deletions(-)

diff --git a/doc/api/fs.markdown b/doc/api/fs.markdown
index 801f3bbe0ea320..0692d697e258a6 100644
--- a/doc/api/fs.markdown
+++ b/doc/api/fs.markdown
@@ -84,218 +84,397 @@ site, set the NODE_DEBUG environment variable:
         at Object.<anonymous> (/path/to/script.js:5:1)
         <etc.>
 
+## Class: fs.FSWatcher
 
-## fs.rename(oldPath, newPath, callback)
+Objects returned from `fs.watch()` are of this type.
 
-Asynchronous rename(2). No arguments other than a possible exception are given
-to the completion callback.
+### Event: 'change'
 
-## fs.renameSync(oldPath, newPath)
+* `event` {String} The type of fs change
+* `filename` {String} The filename that changed (if relevant/available)
 
-Synchronous rename(2). Returns `undefined`.
+Emitted when something changes in a watched directory or file.
+See more details in [fs.watch](#fs_fs_watch_filename_options_listener).
 
-## fs.ftruncate(fd, len, callback)
+### Event: 'error'
 
-Asynchronous ftruncate(2). No arguments other than a possible exception are
-given to the completion callback.
+* `error` {Error object}
 
-## fs.ftruncateSync(fd, len)
+Emitted when an error occurs.
 
-Synchronous ftruncate(2). Returns `undefined`.
+### watcher.close()
 
-## fs.truncate(path, len, callback)
+Stop watching for changes on the given `fs.FSWatcher`.
 
-Asynchronous truncate(2). No arguments other than a possible exception are
-given to the completion callback. A file descriptor can also be passed as the
-first argument. In this case, `fs.ftruncate()` is called.
+## Class: fs.ReadStream
 
-## fs.truncateSync(path, len)
+`ReadStream` is a [Readable Stream](stream.html#stream_class_stream_readable).
 
-Synchronous truncate(2). Returns `undefined`.
+### Event: 'open'
 
-## fs.chown(path, uid, gid, callback)
+* `fd` {Integer} file descriptor used by the ReadStream.
 
-Asynchronous chown(2). No arguments other than a possible exception are given
-to the completion callback.
+Emitted when the ReadStream's file is opened.
 
-## fs.chownSync(path, uid, gid)
+## Class: fs.Stats
 
-Synchronous chown(2). Returns `undefined`.
+Objects returned from `fs.stat()`, `fs.lstat()` and `fs.fstat()` and their
+synchronous counterparts are of this type.
 
-## fs.fchown(fd, uid, gid, callback)
+ - `stats.isFile()`
+ - `stats.isDirectory()`
+ - `stats.isBlockDevice()`
+ - `stats.isCharacterDevice()`
+ - `stats.isSymbolicLink()` (only valid with  `fs.lstat()`)
+ - `stats.isFIFO()`
+ - `stats.isSocket()`
 
-Asynchronous fchown(2). No arguments other than a possible exception are given
-to the completion callback.
+For a regular file `util.inspect(stats)` would return a string very
+similar to this:
 
-## fs.fchownSync(fd, uid, gid)
+    { dev: 2114,
+      ino: 48064969,
+      mode: 33188,
+      nlink: 1,
+      uid: 85,
+      gid: 100,
+      rdev: 0,
+      size: 527,
+      blksize: 4096,
+      blocks: 8,
+      atime: Mon, 10 Oct 2011 23:24:11 GMT,
+      mtime: Mon, 10 Oct 2011 23:24:11 GMT,
+      ctime: Mon, 10 Oct 2011 23:24:11 GMT,
+      birthtime: Mon, 10 Oct 2011 23:24:11 GMT }
 
-Synchronous fchown(2). Returns `undefined`.
+Please note that `atime`, `mtime`, `birthtime`, and `ctime` are
+instances of [Date][MDN-Date] object and to compare the values of
+these objects you should use appropriate methods. For most general
+uses [getTime()][MDN-Date-getTime] will return the number of
+milliseconds elapsed since _1 January 1970 00:00:00 UTC_ and this
+integer should be sufficient for any comparison, however there are
+additional methods which can be used for displaying fuzzy information.
+More details can be found in the [MDN JavaScript Reference][MDN-Date]
+page.
 
-## fs.lchown(path, uid, gid, callback)
+[MDN-Date]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date
+[MDN-Date-getTime]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date/getTime
 
-Asynchronous lchown(2). No arguments other than a possible exception are given
-to the completion callback.
+### Stat Time Values
 
-## fs.lchownSync(path, uid, gid)
+The times in the stat object have the following semantics:
 
-Synchronous lchown(2). Returns `undefined`.
+* `atime` "Access Time" - Time when file data last accessed.  Changed
+  by the `mknod(2)`, `utimes(2)`, and `read(2)` system calls.
+* `mtime` "Modified Time" - Time when file data last modified.
+  Changed by the `mknod(2)`, `utimes(2)`, and `write(2)` system calls.
+* `ctime` "Change Time" - Time when file status was last changed
+  (inode data modification).  Changed by the `chmod(2)`, `chown(2)`,
+  `link(2)`, `mknod(2)`, `rename(2)`, `unlink(2)`, `utimes(2)`,
+  `read(2)`, and `write(2)` system calls.
+* `birthtime` "Birth Time" -  Time of file creation. Set once when the
+  file is created.  On filesystems where birthtime is not available,
+  this field may instead hold either the `ctime` or
+  `1970-01-01T00:00Z` (ie, unix epoch timestamp `0`).  On Darwin and
+  other FreeBSD variants, also set if the `atime` is explicitly set to
+  an earlier value than the current `birthtime` using the `utimes(2)`
+  system call.
 
-## fs.chmod(path, mode, callback)
+Prior to Node v0.12, the `ctime` held the `birthtime` on Windows
+systems.  Note that as of v0.12, `ctime` is not "creation time", and
+on Unix systems, it never was.
 
-Asynchronous chmod(2). No arguments other than a possible exception are given
-to the completion callback.
+## Class: fs.WriteStream
 
-## fs.chmodSync(path, mode)
+`WriteStream` is a [Writable Stream](stream.html#stream_class_stream_writable).
 
-Synchronous chmod(2). Returns `undefined`.
+### Event: 'open'
 
-## fs.fchmod(fd, mode, callback)
+* `fd` {Integer} file descriptor used by the WriteStream.
 
-Asynchronous fchmod(2). No arguments other than a possible exception
-are given to the completion callback.
+Emitted when the WriteStream's file is opened.
 
-## fs.fchmodSync(fd, mode)
+### writeStream.bytesWritten
 
-Synchronous fchmod(2). Returns `undefined`.
+The number of bytes written so far. Does not include data that is still queued
+for writing.
 
-## fs.lchmod(path, mode, callback)
+## fs.access(path[, mode], callback)
 
-Asynchronous lchmod(2). No arguments other than a possible exception
-are given to the completion callback.
+Tests a user's permissions for the file specified by `path`. `mode` is an
+optional integer that specifies the accessibility checks to be performed. The
+following constants define the possible values of `mode`. It is possible to
+create a mask consisting of the bitwise OR of two or more values.
 
-Only available on Mac OS X.
+- `fs.F_OK` - File is visible to the calling process. This is useful for
+determining if a file exists, but says nothing about `rwx` permissions.
+Default if no `mode` is specified.
+- `fs.R_OK` - File can be read by the calling process.
+- `fs.W_OK` - File can be written by the calling process.
+- `fs.X_OK` - File can be executed by the calling process. This has no effect
+on Windows (will behave like `fs.F_OK`).
 
-## fs.lchmodSync(path, mode)
+The final argument, `callback`, is a callback function that is invoked with
+a possible error argument. If any of the accessibility checks fail, the error
+argument will be populated. The following example checks if the file
+`/etc/passwd` can be read and written by the current process.
 
-Synchronous lchmod(2). Returns `undefined`.
+    fs.access('/etc/passwd', fs.R_OK | fs.W_OK, function (err) {
+      console.log(err ? 'no access!' : 'can read/write');
+    });
 
-## fs.stat(path, callback)
+## fs.accessSync(path[, mode])
 
-Asynchronous stat(2). The callback gets two arguments `(err, stats)` where
-`stats` is a [fs.Stats](#fs_class_fs_stats) object.  See the [fs.Stats](#fs_class_fs_stats)
-section below for more information.
+Synchronous version of `fs.access`. This throws if any accessibility checks
+fail, and does nothing otherwise.
 
-## fs.lstat(path, callback)
+## fs.appendFile(file, data[, options], callback)
 
-Asynchronous lstat(2). The callback gets two arguments `(err, stats)` where
-`stats` is a `fs.Stats` object. `lstat()` is identical to `stat()`, except that if
-`path` is a symbolic link, then the link itself is stat-ed, not the file that it
-refers to.
+* `file` {String | Integer} filename or file descriptor
+* `data` {String | Buffer}
+* `options` {Object | String}
+  * `encoding` {String | Null} default = `'utf8'`
+  * `mode` {Number} default = `0o666`
+  * `flag` {String} default = `'a'`
+* `callback` {Function}
 
-## fs.fstat(fd, callback)
+Asynchronously append data to a file, creating the file if it does not yet exist.
+`data` can be a string or a buffer.
 
-Asynchronous fstat(2). The callback gets two arguments `(err, stats)` where
-`stats` is a `fs.Stats` object. `fstat()` is identical to `stat()`, except that
-the file to be stat-ed is specified by the file descriptor `fd`.
+Example:
 
-## fs.statSync(path)
+    fs.appendFile('message.txt', 'data to append', function (err) {
+      if (err) throw err;
+      console.log('The "data to append" was appended to file!');
+    });
 
-Synchronous stat(2). Returns an instance of `fs.Stats`.
+If `options` is a string, then it specifies the encoding. Example:
 
-## fs.lstatSync(path)
+    fs.appendFile('message.txt', 'data to append', 'utf8', callback);
 
-Synchronous lstat(2). Returns an instance of `fs.Stats`.
+Any specified file descriptor has to have been opened for appending.
 
-## fs.fstatSync(fd)
+_Note: Specified file descriptors will not be closed automatically._
 
-Synchronous fstat(2). Returns an instance of `fs.Stats`.
+## fs.appendFileSync(file, data[, options])
 
-## fs.link(srcpath, dstpath, callback)
+The synchronous version of `fs.appendFile`. Returns `undefined`.
 
-Asynchronous link(2). No arguments other than a possible exception are given to
-the completion callback.
+## fs.chmod(path, mode, callback)
 
-## fs.linkSync(srcpath, dstpath)
+Asynchronous chmod(2). No arguments other than a possible exception are given
+to the completion callback.
 
-Synchronous link(2). Returns `undefined`.
+## fs.chmodSync(path, mode)
 
-## fs.symlink(destination, path[, type], callback)
+Synchronous chmod(2). Returns `undefined`.
 
-Asynchronous symlink(2). No arguments other than a possible exception are given
+## fs.chown(path, uid, gid, callback)
+
+Asynchronous chown(2). No arguments other than a possible exception are given
 to the completion callback.
-The `type` argument can be set to `'dir'`, `'file'`, or `'junction'` (default
-is `'file'`) and is only available on Windows (ignored on other platforms).
-Note that Windows junction points require the destination path to be absolute.  When using
-`'junction'`, the `destination` argument will automatically be normalized to absolute path.
 
-## fs.symlinkSync(destination, path[, type])
+## fs.chownSync(path, uid, gid)
 
-Synchronous symlink(2). Returns `undefined`.
+Synchronous chown(2). Returns `undefined`.
 
-## fs.readlink(path, callback)
+## fs.close(fd, callback)
 
-Asynchronous readlink(2). The callback gets two arguments `(err,
-linkString)`.
+Asynchronous close(2).  No arguments other than a possible exception are given
+to the completion callback.
 
-## fs.readlinkSync(path)
+## fs.closeSync(fd)
 
-Synchronous readlink(2). Returns the symbolic link's string value.
+Synchronous close(2). Returns `undefined`.
 
-## fs.realpath(path[, cache], callback)
+## fs.createReadStream(path[, options])
 
-Asynchronous realpath(2). The `callback` gets two arguments `(err,
-resolvedPath)`. May use `process.cwd` to resolve relative paths. `cache` is an
-object literal of mapped paths that can be used to force a specific path
-resolution or avoid additional `fs.stat` calls for known real paths.
+Returns a new ReadStream object (See `Readable Stream`).
 
-Example:
+Be aware that, unlike the default value set for `highWaterMark` on a
+readable stream (16 kb), the stream returned by this method has a
+default value of 64 kb for the same parameter.
 
-    var cache = {'/etc':'/private/etc'};
-    fs.realpath('/etc/passwd', cache, function (err, resolvedPath) {
-      if (err) throw err;
-      console.log(resolvedPath);
-    });
+`options` is an object or string with the following defaults:
 
-## fs.realpathSync(path[, cache])
+    { flags: 'r',
+      encoding: null,
+      fd: null,
+      mode: 0o666,
+      autoClose: true
+    }
 
-Synchronous realpath(2). Returns the resolved path.
+`options` can include `start` and `end` values to read a range of bytes from
+the file instead of the entire file.  Both `start` and `end` are inclusive and
+start at 0. The `encoding` can be any one of those accepted by [Buffer][].
 
-## fs.unlink(path, callback)
+If `fd` is specified, `ReadStream` will ignore the `path` argument and will use
+the specified file descriptor. This means that no `open` event will be emitted.
 
-Asynchronous unlink(2). No arguments other than a possible exception are given
-to the completion callback.
+If `autoClose` is false, then the file descriptor won't be closed, even if
+there's an error.  It is your responsibility to close it and make sure
+there's no file descriptor leak.  If `autoClose` is set to true (default
+behavior), on `error` or `end` the file descriptor will be closed
+automatically.
 
-## fs.unlinkSync(path)
+`mode` sets the file mode (permission and sticky bits), but only if the
+file was created.
 
-Synchronous unlink(2). Returns `undefined`.
+An example to read the last 10 bytes of a file which is 100 bytes long:
 
-## fs.rmdir(path, callback)
+    fs.createReadStream('sample.txt', {start: 90, end: 99});
 
-Asynchronous rmdir(2). No arguments other than a possible exception are given
+If `options` is a string, then it specifies the encoding.
+
+## fs.createWriteStream(path[, options])
+
+Returns a new WriteStream object (See `Writable Stream`).
+
+`options` is an object or string with the following defaults:
+
+    { flags: 'w',
+      defaultEncoding: 'utf8',
+      fd: null,
+      mode: 0o666 }
+
+`options` may also include a `start` option to allow writing data at
+some position past the beginning of the file.  Modifying a file rather
+than replacing it may require a `flags` mode of `r+` rather than the
+default mode `w`. The `defaultEncoding` can be any one of those accepted by [Buffer][].
+
+Like `ReadStream` above, if `fd` is specified, `WriteStream` will ignore the
+`path` argument and will use the specified file descriptor. This means that no
+`open` event will be emitted.
+
+If `options` is a string, then it specifies the encoding.
+
+## fs.exists(path, callback)
+
+    Stability: 0 - Deprecated: Use [fs.stat][] or [fs.access][] instead.
+
+Test whether or not the given path exists by checking with the file system.
+Then call the `callback` argument with either true or false.  Example:
+
+    fs.exists('/etc/passwd', function (exists) {
+      console.log(exists ? "it's there" : 'no passwd!');
+    });
+
+`fs.exists()` should not be used to check if a file exists before calling
+`fs.open()`. Doing so introduces a race condition since other processes may
+change the file's state between the two calls. Instead, user code should
+call `fs.open()` directly and handle the error raised if the file is
+non-existent.
+
+## fs.existsSync(path)
+
+Synchronous version of [`fs.exists`](fs.html#fs_fs_exists_path_callback).
+Returns `true` if the file exists, `false` otherwise.
+
+    Stability: 0 - Deprecated: Use [fs.statSync][] or [fs.accessSync][] instead.
+
+## fs.fchmod(fd, mode, callback)
+
+Asynchronous fchmod(2). No arguments other than a possible exception
+are given to the completion callback.
+
+## fs.fchmodSync(fd, mode)
+
+Synchronous fchmod(2). Returns `undefined`.
+
+## fs.fchown(fd, uid, gid, callback)
+
+Asynchronous fchown(2). No arguments other than a possible exception are given
 to the completion callback.
 
-## fs.rmdirSync(path)
+## fs.fchownSync(fd, uid, gid)
 
-Synchronous rmdir(2). Returns `undefined`.
+Synchronous fchown(2). Returns `undefined`.
 
-## fs.mkdir(path[, mode], callback)
+## fs.fstat(fd, callback)
 
-Asynchronous mkdir(2). No arguments other than a possible exception are given
-to the completion callback. `mode` defaults to `0o777`.
+Asynchronous fstat(2). The callback gets two arguments `(err, stats)` where
+`stats` is a `fs.Stats` object. `fstat()` is identical to `stat()`, except that
+the file to be stat-ed is specified by the file descriptor `fd`.
 
-## fs.mkdirSync(path[, mode])
+## fs.fstatSync(fd)
 
-Synchronous mkdir(2). Returns `undefined`.
+Synchronous fstat(2). Returns an instance of `fs.Stats`.
 
-## fs.readdir(path, callback)
+## fs.fsync(fd, callback)
 
-Asynchronous readdir(3).  Reads the contents of a directory.
-The callback gets two arguments `(err, files)` where `files` is an array of
-the names of the files in the directory excluding `'.'` and `'..'`.
+Asynchronous fsync(2). No arguments other than a possible exception are given
+to the completion callback.
 
-## fs.readdirSync(path)
+## fs.fsyncSync(fd)
 
-Synchronous readdir(3). Returns an array of filenames excluding `'.'` and
-`'..'`.
+Synchronous fsync(2). Returns `undefined`.
 
-## fs.close(fd, callback)
+## fs.ftruncate(fd, len, callback)
 
-Asynchronous close(2).  No arguments other than a possible exception are given
+Asynchronous ftruncate(2). No arguments other than a possible exception are
+given to the completion callback.
+
+## fs.ftruncateSync(fd, len)
+
+Synchronous ftruncate(2). Returns `undefined`.
+
+## fs.futimes(fd, atime, mtime, callback)
+
+Change the file timestamps of a file referenced by the supplied file
+descriptor.
+
+## fs.futimesSync(fd, atime, mtime)
+
+Synchronous version of `fs.futimes()`. Returns `undefined`.
+
+## fs.lchmod(path, mode, callback)
+
+Asynchronous lchmod(2). No arguments other than a possible exception
+are given to the completion callback.
+
+Only available on Mac OS X.
+
+## fs.lchmodSync(path, mode)
+
+Synchronous lchmod(2). Returns `undefined`.
+
+## fs.lchown(path, uid, gid, callback)
+
+Asynchronous lchown(2). No arguments other than a possible exception are given
 to the completion callback.
 
-## fs.closeSync(fd)
+## fs.lchownSync(path, uid, gid)
 
-Synchronous close(2). Returns `undefined`.
+Synchronous lchown(2). Returns `undefined`.
+
+## fs.link(srcpath, dstpath, callback)
+
+Asynchronous link(2). No arguments other than a possible exception are given to
+the completion callback.
+
+## fs.linkSync(srcpath, dstpath)
+
+Synchronous link(2). Returns `undefined`.
+
+## fs.lstat(path, callback)
+
+Asynchronous lstat(2). The callback gets two arguments `(err, stats)` where
+`stats` is a `fs.Stats` object. `lstat()` is identical to `stat()`, except that if
+`path` is a symbolic link, then the link itself is stat-ed, not the file that it
+refers to.
+
+## fs.lstatSync(path)
+
+Synchronous lstat(2). Returns an instance of `fs.Stats`.
+
+## fs.mkdir(path[, mode], callback)
+
+Asynchronous mkdir(2). No arguments other than a possible exception are given
+to the completion callback. `mode` defaults to `0o777`.
+
+## fs.mkdirSync(path[, mode])
+
+Synchronous mkdir(2). Returns `undefined`.
 
 ## fs.open(path, flags[, mode], callback)
 
@@ -359,255 +538,158 @@ the end of the file.
 Synchronous version of `fs.open()`. Returns an integer representing the file
 descriptor.
 
-## fs.utimes(path, atime, mtime, callback)
+## fs.read(fd, buffer, offset, length, position, callback)
 
-Change file timestamps of the file referenced by the supplied path.
+Read data from the file specified by `fd`.
 
-Note: the arguments `atime` and `mtime` of the following related functions does
-follow the below rules:
+`buffer` is the buffer that the data will be written to.
 
-- If the value is a numberable string like "123456789", the value would get
-  converted to corresponding number.
-- If the value is `NaN` or `Infinity`, the value would get converted to
-  `Date.now()`.
+`offset` is the offset in the buffer to start writing at.
 
-## fs.utimesSync(path, atime, mtime)
+`length` is an integer specifying the number of bytes to read.
 
-Synchronous version of `fs.utimes()`. Returns `undefined`.
+`position` is an integer specifying where to begin reading from in the file.
+If `position` is `null`, data will be read from the current file position.
 
+The callback is given the three arguments, `(err, bytesRead, buffer)`.
 
-## fs.futimes(fd, atime, mtime, callback)
+## fs.readdir(path, callback)
 
-Change the file timestamps of a file referenced by the supplied file
-descriptor.
+Asynchronous readdir(3).  Reads the contents of a directory.
+The callback gets two arguments `(err, files)` where `files` is an array of
+the names of the files in the directory excluding `'.'` and `'..'`.
 
-## fs.futimesSync(fd, atime, mtime)
+## fs.readdirSync(path)
 
-Synchronous version of `fs.futimes()`. Returns `undefined`.
+Synchronous readdir(3). Returns an array of filenames excluding `'.'` and
+`'..'`.
 
-## fs.fsync(fd, callback)
+## fs.readFile(file[, options], callback)
 
-Asynchronous fsync(2). No arguments other than a possible exception are given
-to the completion callback.
+* `file` {String | Integer} filename or file descriptor
+* `options` {Object | String}
+  * `encoding` {String | Null} default = `null`
+  * `flag` {String} default = `'r'`
+* `callback` {Function}
 
-## fs.fsyncSync(fd)
+Asynchronously reads the entire contents of a file. Example:
 
-Synchronous fsync(2). Returns `undefined`.
+    fs.readFile('/etc/passwd', function (err, data) {
+      if (err) throw err;
+      console.log(data);
+    });
 
-## fs.write(fd, buffer, offset, length[, position], callback)
+The callback is passed two arguments `(err, data)`, where `data` is the
+contents of the file.
 
-Write `buffer` to the file specified by `fd`.
+If no encoding is specified, then the raw buffer is returned.
 
-`offset` and `length` determine the part of the buffer to be written.
+If `options` is a string, then it specifies the encoding. Example:
 
-`position` refers to the offset from the beginning of the file where this data
-should be written. If `typeof position !== 'number'`, the data will be written
-at the current position. See pwrite(2).
+    fs.readFile('/etc/passwd', 'utf8', callback);
 
-The callback will be given three arguments `(err, written, buffer)` where
-`written` specifies how many _bytes_ were written from `buffer`.
+Any specified file descriptor has to support reading.
 
-Note that it is unsafe to use `fs.write` multiple times on the same file
-without waiting for the callback. For this scenario,
-`fs.createWriteStream` is strongly recommended.
+_Note: Specified file descriptors will not be closed automatically._
 
-On Linux, positional writes don't work when the file is opened in append mode.
-The kernel ignores the position argument and always appends the data to
-the end of the file.
+## fs.readFileSync(file[, options])
 
-## fs.write(fd, data[, position[, encoding]], callback)
+Synchronous version of `fs.readFile`. Returns the contents of the `file`.
 
-Write `data` to the file specified by `fd`.  If `data` is not a Buffer instance
-then the value will be coerced to a string.
+If the `encoding` option is specified then this function returns a
+string. Otherwise it returns a buffer.
 
-`position` refers to the offset from the beginning of the file where this data
-should be written. If `typeof position !== 'number'` the data will be written at
-the current position. See pwrite(2).
+## fs.readlink(path, callback)
 
-`encoding` is the expected string encoding.
+Asynchronous readlink(2). The callback gets two arguments `(err,
+linkString)`.
 
-The callback will receive the arguments `(err, written, string)` where `written`
-specifies how many _bytes_ the passed string required to be written. Note that
-bytes written is not the same as string characters. See
-[Buffer.byteLength](buffer.html#buffer_class_method_buffer_bytelength_string_encoding).
+## fs.readlinkSync(path)
 
-Unlike when writing `buffer`, the entire string must be written. No substring
-may be specified. This is because the byte offset of the resulting data may not
-be the same as the string offset.
+Synchronous readlink(2). Returns the symbolic link's string value.
 
-Note that it is unsafe to use `fs.write` multiple times on the same file
-without waiting for the callback. For this scenario,
-`fs.createWriteStream` is strongly recommended.
-
-On Linux, positional writes don't work when the file is opened in append mode.
-The kernel ignores the position argument and always appends the data to
-the end of the file.
-
-## fs.writeSync(fd, buffer, offset, length[, position])
-
-## fs.writeSync(fd, data[, position[, encoding]])
-
-Synchronous versions of `fs.write()`. Returns the number of bytes written.
-
-## fs.read(fd, buffer, offset, length, position, callback)
-
-Read data from the file specified by `fd`.
-
-`buffer` is the buffer that the data will be written to.
-
-`offset` is the offset in the buffer to start writing at.
-
-`length` is an integer specifying the number of bytes to read.
-
-`position` is an integer specifying where to begin reading from in the file.
-If `position` is `null`, data will be read from the current file position.
-
-The callback is given the three arguments, `(err, bytesRead, buffer)`.
-
-## fs.readSync(fd, buffer, offset, length, position)
-
-Synchronous version of `fs.read`. Returns the number of `bytesRead`.
-
-## fs.readFile(file[, options], callback)
-
-* `file` {String | Integer} filename or file descriptor
-* `options` {Object | String}
-  * `encoding` {String | Null} default = `null`
-  * `flag` {String} default = `'r'`
-* `callback` {Function}
-
-Asynchronously reads the entire contents of a file. Example:
-
-    fs.readFile('/etc/passwd', function (err, data) {
-      if (err) throw err;
-      console.log(data);
-    });
-
-The callback is passed two arguments `(err, data)`, where `data` is the
-contents of the file.
-
-If no encoding is specified, then the raw buffer is returned.
-
-If `options` is a string, then it specifies the encoding. Example:
-
-    fs.readFile('/etc/passwd', 'utf8', callback);
-
-Any specified file descriptor has to support reading.
-
-_Note: Specified file descriptors will not be closed automatically._
-
-## fs.readFileSync(file[, options])
-
-Synchronous version of `fs.readFile`. Returns the contents of the `file`.
-
-If the `encoding` option is specified then this function returns a
-string. Otherwise it returns a buffer.
-
-## fs.writeFile(file, data[, options], callback)
-
-* `file` {String | Integer} filename or file descriptor
-* `data` {String | Buffer}
-* `options` {Object | String}
-  * `encoding` {String | Null} default = `'utf8'`
-  * `mode` {Number} default = `0o666`
-  * `flag` {String} default = `'w'`
-* `callback` {Function}
-
-Asynchronously writes data to a file, replacing the file if it already exists.
-`data` can be a string or a buffer.
+## fs.realpath(path[, cache], callback)
 
-The `encoding` option is ignored if `data` is a buffer. It defaults
-to `'utf8'`.
+Asynchronous realpath(2). The `callback` gets two arguments `(err,
+resolvedPath)`. May use `process.cwd` to resolve relative paths. `cache` is an
+object literal of mapped paths that can be used to force a specific path
+resolution or avoid additional `fs.stat` calls for known real paths.
 
 Example:
 
-    fs.writeFile('message.txt', 'Hello Node.js', function (err) {
+    var cache = {'/etc':'/private/etc'};
+    fs.realpath('/etc/passwd', cache, function (err, resolvedPath) {
       if (err) throw err;
-      console.log('It\'s saved!');
+      console.log(resolvedPath);
     });
 
-If `options` is a string, then it specifies the encoding. Example:
+## fs.readSync(fd, buffer, offset, length, position)
 
-    fs.writeFile('message.txt', 'Hello Node.js', 'utf8', callback);
+Synchronous version of `fs.read`. Returns the number of `bytesRead`.
 
-Any specified file descriptor has to support writing.
+## fs.realpathSync(path[, cache])
 
-Note that it is unsafe to use `fs.writeFile` multiple times on the same file
-without waiting for the callback. For this scenario,
-`fs.createWriteStream` is strongly recommended.
+Synchronous realpath(2). Returns the resolved path.
 
-_Note: Specified file descriptors will not be closed automatically._
+## fs.rename(oldPath, newPath, callback)
 
-## fs.writeFileSync(file, data[, options])
+Asynchronous rename(2). No arguments other than a possible exception are given
+to the completion callback.
 
-The synchronous version of `fs.writeFile`. Returns `undefined`.
+## fs.renameSync(oldPath, newPath)
 
-## fs.appendFile(file, data[, options], callback)
+Synchronous rename(2). Returns `undefined`.
 
-* `file` {String | Integer} filename or file descriptor
-* `data` {String | Buffer}
-* `options` {Object | String}
-  * `encoding` {String | Null} default = `'utf8'`
-  * `mode` {Number} default = `0o666`
-  * `flag` {String} default = `'a'`
-* `callback` {Function}
+## fs.rmdir(path, callback)
 
-Asynchronously append data to a file, creating the file if it does not yet exist.
-`data` can be a string or a buffer.
+Asynchronous rmdir(2). No arguments other than a possible exception are given
+to the completion callback.
 
-Example:
+## fs.rmdirSync(path)
 
-    fs.appendFile('message.txt', 'data to append', function (err) {
-      if (err) throw err;
-      console.log('The "data to append" was appended to file!');
-    });
+Synchronous rmdir(2). Returns `undefined`.
 
-If `options` is a string, then it specifies the encoding. Example:
+## fs.stat(path, callback)
 
-    fs.appendFile('message.txt', 'data to append', 'utf8', callback);
+Asynchronous stat(2). The callback gets two arguments `(err, stats)` where
+`stats` is a [fs.Stats](#fs_class_fs_stats) object.  See the [fs.Stats](#fs_class_fs_stats)
+section below for more information.
 
-Any specified file descriptor has to have been opened for appending.
+## fs.statSync(path)
 
-_Note: Specified file descriptors will not be closed automatically._
+Synchronous stat(2). Returns an instance of `fs.Stats`.
 
-## fs.appendFileSync(file, data[, options])
+## fs.symlink(destination, path[, type], callback)
 
-The synchronous version of `fs.appendFile`. Returns `undefined`.
+Asynchronous symlink(2). No arguments other than a possible exception are given
+to the completion callback.
+The `type` argument can be set to `'dir'`, `'file'`, or `'junction'` (default
+is `'file'`) and is only available on Windows (ignored on other platforms).
+Note that Windows junction points require the destination path to be absolute.  When using
+`'junction'`, the `destination` argument will automatically be normalized to absolute path.
 
-## fs.watchFile(filename[, options], listener)
+## fs.symlinkSync(destination, path[, type])
 
-Watch for changes on `filename`. The callback `listener` will be called each
-time the file is accessed.
+Synchronous symlink(2). Returns `undefined`.
 
-The `options` argument may be omitted. If provided, it should be an object. The
-`options` object may contain a boolean named `persistent` that indicates
-whether the process should continue to run as long as files are being watched.
-The `options` object may specify an `interval` property indicating how often the
-target should be polled in milliseconds. The default is
-`{ persistent: true, interval: 5007 }`.
+## fs.truncate(path, len, callback)
 
-The `listener` gets two arguments the current stat object and the previous
-stat object:
+Asynchronous truncate(2). No arguments other than a possible exception are
+given to the completion callback. A file descriptor can also be passed as the
+first argument. In this case, `fs.ftruncate()` is called.
 
-    fs.watchFile('message.text', function (curr, prev) {
-      console.log('the current mtime is: ' + curr.mtime);
-      console.log('the previous mtime was: ' + prev.mtime);
-    });
+## fs.truncateSync(path, len)
 
-These stat objects are instances of `fs.Stat`.
+Synchronous truncate(2). Returns `undefined`.
 
-If you want to be notified when the file was modified, not just accessed,
-you need to compare `curr.mtime` and `prev.mtime`.
+## fs.unlink(path, callback)
 
-_Note: when an `fs.watchFile` operation results in an `ENOENT` error, it will
- invoke the listener once, with all the fields zeroed (or, for dates, the Unix
- Epoch). In Windows, `blksize` and `blocks` fields will be `undefined`, instead
- of zero. If the file is created later on, the listener will be called again,
- with the latest stat objects. This is a change in functionality since v0.10._
+Asynchronous unlink(2). No arguments other than a possible exception are given
+to the completion callback.
 
-_Note: `fs.watch` is more efficient than `fs.watchFile` and `fs.unwatchFile`.
-`fs.watch` should be used instead of `fs.watchFile` and `fs.unwatchFile`
-when possible._
+## fs.unlinkSync(path)
+
+Synchronous unlink(2). Returns `undefined`.
 
 ## fs.unwatchFile(filename[, listener])
 
@@ -622,6 +704,22 @@ _Note: `fs.watch` is more efficient than `fs.watchFile` and `fs.unwatchFile`.
 `fs.watch` should be used instead of `fs.watchFile` and `fs.unwatchFile`
 when possible._
 
+## fs.utimes(path, atime, mtime, callback)
+
+Change file timestamps of the file referenced by the supplied path.
+
+Note: the arguments `atime` and `mtime` of the following related functions does
+follow the below rules:
+
+- If the value is a numberable string like "123456789", the value would get
+  converted to corresponding number.
+- If the value is `NaN` or `Infinity`, the value would get converted to
+  `Date.now()`.
+
+## fs.utimesSync(path, atime, mtime)
+
+Synchronous version of `fs.utimes()`. Returns `undefined`.
+
 ## fs.watch(filename[, options][, listener])
 
 Watch for changes on `filename`, where `filename` is either a file or a
@@ -674,7 +772,7 @@ less reliable.
 
 <!--type=misc-->
 
-Providing `filename` argument in the callback is only supported on Linux and 
+Providing `filename` argument in the callback is only supported on Linux and
 Windows.  Even on supported platforms, `filename` is not always guaranteed to
 be provided. Therefore, don't assume that `filename` argument is always
 provided in the callback, and have some fallback logic if it is null.
@@ -688,239 +786,137 @@ provided in the callback, and have some fallback logic if it is null.
       }
     });
 
-## fs.exists(path, callback)
-
-    Stability: 0 - Deprecated: Use [fs.stat][] or [fs.access][] instead.
-
-Test whether or not the given path exists by checking with the file system.
-Then call the `callback` argument with either true or false.  Example:
-
-    fs.exists('/etc/passwd', function (exists) {
-      console.log(exists ? "it's there" : 'no passwd!');
-    });
-
-`fs.exists()` should not be used to check if a file exists before calling
-`fs.open()`. Doing so introduces a race condition since other processes may
-change the file's state between the two calls. Instead, user code should
-call `fs.open()` directly and handle the error raised if the file is
-non-existent.
-
-## fs.existsSync(path)
-
-Synchronous version of [`fs.exists`](fs.html#fs_fs_exists_path_callback).
-Returns `true` if the file exists, `false` otherwise.
-
-    Stability: 0 - Deprecated: Use [fs.statSync][] or [fs.accessSync][] instead.
-
-## fs.access(path[, mode], callback)
+## fs.watchFile(filename[, options], listener)
 
-Tests a user's permissions for the file specified by `path`. `mode` is an
-optional integer that specifies the accessibility checks to be performed. The
-following constants define the possible values of `mode`. It is possible to
-create a mask consisting of the bitwise OR of two or more values.
+Watch for changes on `filename`. The callback `listener` will be called each
+time the file is accessed.
 
-- `fs.F_OK` - File is visible to the calling process. This is useful for
-determining if a file exists, but says nothing about `rwx` permissions.
-Default if no `mode` is specified.
-- `fs.R_OK` - File can be read by the calling process.
-- `fs.W_OK` - File can be written by the calling process.
-- `fs.X_OK` - File can be executed by the calling process. This has no effect
-on Windows (will behave like `fs.F_OK`).
+The `options` argument may be omitted. If provided, it should be an object. The
+`options` object may contain a boolean named `persistent` that indicates
+whether the process should continue to run as long as files are being watched.
+The `options` object may specify an `interval` property indicating how often the
+target should be polled in milliseconds. The default is
+`{ persistent: true, interval: 5007 }`.
 
-The final argument, `callback`, is a callback function that is invoked with
-a possible error argument. If any of the accessibility checks fail, the error
-argument will be populated. The following example checks if the file
-`/etc/passwd` can be read and written by the current process.
+The `listener` gets two arguments the current stat object and the previous
+stat object:
 
-    fs.access('/etc/passwd', fs.R_OK | fs.W_OK, function (err) {
-      console.log(err ? 'no access!' : 'can read/write');
+    fs.watchFile('message.text', function (curr, prev) {
+      console.log('the current mtime is: ' + curr.mtime);
+      console.log('the previous mtime was: ' + prev.mtime);
     });
 
-## fs.accessSync(path[, mode])
-
-Synchronous version of `fs.access`. This throws if any accessibility checks
-fail, and does nothing otherwise.
-
-## Class: fs.Stats
-
-Objects returned from `fs.stat()`, `fs.lstat()` and `fs.fstat()` and their
-synchronous counterparts are of this type.
-
- - `stats.isFile()`
- - `stats.isDirectory()`
- - `stats.isBlockDevice()`
- - `stats.isCharacterDevice()`
- - `stats.isSymbolicLink()` (only valid with  `fs.lstat()`)
- - `stats.isFIFO()`
- - `stats.isSocket()`
-
-For a regular file `util.inspect(stats)` would return a string very
-similar to this:
-
-    { dev: 2114,
-      ino: 48064969,
-      mode: 33188,
-      nlink: 1,
-      uid: 85,
-      gid: 100,
-      rdev: 0,
-      size: 527,
-      blksize: 4096,
-      blocks: 8,
-      atime: Mon, 10 Oct 2011 23:24:11 GMT,
-      mtime: Mon, 10 Oct 2011 23:24:11 GMT,
-      ctime: Mon, 10 Oct 2011 23:24:11 GMT,
-      birthtime: Mon, 10 Oct 2011 23:24:11 GMT }
-
-Please note that `atime`, `mtime`, `birthtime`, and `ctime` are
-instances of [Date][MDN-Date] object and to compare the values of
-these objects you should use appropriate methods. For most general
-uses [getTime()][MDN-Date-getTime] will return the number of
-milliseconds elapsed since _1 January 1970 00:00:00 UTC_ and this
-integer should be sufficient for any comparison, however there are
-additional methods which can be used for displaying fuzzy information.
-More details can be found in the [MDN JavaScript Reference][MDN-Date]
-page.
-
-[MDN-Date]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date
-[MDN-Date-getTime]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date/getTime
-
-### Stat Time Values
-
-The times in the stat object have the following semantics:
-
-* `atime` "Access Time" - Time when file data last accessed.  Changed
-  by the `mknod(2)`, `utimes(2)`, and `read(2)` system calls.
-* `mtime` "Modified Time" - Time when file data last modified.
-  Changed by the `mknod(2)`, `utimes(2)`, and `write(2)` system calls.
-* `ctime` "Change Time" - Time when file status was last changed
-  (inode data modification).  Changed by the `chmod(2)`, `chown(2)`,
-  `link(2)`, `mknod(2)`, `rename(2)`, `unlink(2)`, `utimes(2)`,
-  `read(2)`, and `write(2)` system calls.
-* `birthtime` "Birth Time" -  Time of file creation. Set once when the
-  file is created.  On filesystems where birthtime is not available,
-  this field may instead hold either the `ctime` or
-  `1970-01-01T00:00Z` (ie, unix epoch timestamp `0`).  On Darwin and
-  other FreeBSD variants, also set if the `atime` is explicitly set to
-  an earlier value than the current `birthtime` using the `utimes(2)`
-  system call.
-
-Prior to Node v0.12, the `ctime` held the `birthtime` on Windows
-systems.  Note that as of v0.12, `ctime` is not "creation time", and
-on Unix systems, it never was.
-
-## fs.createReadStream(path[, options])
-
-Returns a new ReadStream object (See `Readable Stream`).
-
-Be aware that, unlike the default value set for `highWaterMark` on a
-readable stream (16 kb), the stream returned by this method has a
-default value of 64 kb for the same parameter.
-
-`options` is an object or string with the following defaults:
-
-    { flags: 'r',
-      encoding: null,
-      fd: null,
-      mode: 0o666,
-      autoClose: true
-    }
-
-`options` can include `start` and `end` values to read a range of bytes from
-the file instead of the entire file.  Both `start` and `end` are inclusive and
-start at 0. The `encoding` can be any one of those accepted by [Buffer][].
-
-If `fd` is specified, `ReadStream` will ignore the `path` argument and will use
-the specified file descriptor. This means that no `open` event will be emitted.
-
-If `autoClose` is false, then the file descriptor won't be closed, even if
-there's an error.  It is your responsibility to close it and make sure
-there's no file descriptor leak.  If `autoClose` is set to true (default
-behavior), on `error` or `end` the file descriptor will be closed
-automatically.
-
-`mode` sets the file mode (permission and sticky bits), but only if the
-file was created.
+These stat objects are instances of `fs.Stat`.
 
-An example to read the last 10 bytes of a file which is 100 bytes long:
+If you want to be notified when the file was modified, not just accessed,
+you need to compare `curr.mtime` and `prev.mtime`.
 
-    fs.createReadStream('sample.txt', {start: 90, end: 99});
+_Note: when an `fs.watchFile` operation results in an `ENOENT` error, it will
+ invoke the listener once, with all the fields zeroed (or, for dates, the Unix
+ Epoch). In Windows, `blksize` and `blocks` fields will be `undefined`, instead
+ of zero. If the file is created later on, the listener will be called again,
+ with the latest stat objects. This is a change in functionality since v0.10._
 
-If `options` is a string, then it specifies the encoding.
+_Note: `fs.watch` is more efficient than `fs.watchFile` and `fs.unwatchFile`.
+`fs.watch` should be used instead of `fs.watchFile` and `fs.unwatchFile`
+when possible._
 
-## Class: fs.ReadStream
+## fs.write(fd, buffer, offset, length[, position], callback)
 
-`ReadStream` is a [Readable Stream](stream.html#stream_class_stream_readable).
+Write `buffer` to the file specified by `fd`.
 
-### Event: 'open'
+`offset` and `length` determine the part of the buffer to be written.
 
-* `fd` {Integer} file descriptor used by the ReadStream.
+`position` refers to the offset from the beginning of the file where this data
+should be written. If `typeof position !== 'number'`, the data will be written
+at the current position. See pwrite(2).
 
-Emitted when the ReadStream's file is opened.
+The callback will be given three arguments `(err, written, buffer)` where
+`written` specifies how many _bytes_ were written from `buffer`.
 
+Note that it is unsafe to use `fs.write` multiple times on the same file
+without waiting for the callback. For this scenario,
+`fs.createWriteStream` is strongly recommended.
 
-## fs.createWriteStream(path[, options])
+On Linux, positional writes don't work when the file is opened in append mode.
+The kernel ignores the position argument and always appends the data to
+the end of the file.
 
-Returns a new WriteStream object (See `Writable Stream`).
+## fs.write(fd, data[, position[, encoding]], callback)
 
-`options` is an object or string with the following defaults:
+Write `data` to the file specified by `fd`.  If `data` is not a Buffer instance
+then the value will be coerced to a string.
 
-    { flags: 'w',
-      defaultEncoding: 'utf8',
-      fd: null,
-      mode: 0o666 }
+`position` refers to the offset from the beginning of the file where this data
+should be written. If `typeof position !== 'number'` the data will be written at
+the current position. See pwrite(2).
 
-`options` may also include a `start` option to allow writing data at
-some position past the beginning of the file.  Modifying a file rather
-than replacing it may require a `flags` mode of `r+` rather than the
-default mode `w`. The `defaultEncoding` can be any one of those accepted by [Buffer][].
+`encoding` is the expected string encoding.
 
-Like `ReadStream` above, if `fd` is specified, `WriteStream` will ignore the
-`path` argument and will use the specified file descriptor. This means that no
-`open` event will be emitted.
+The callback will receive the arguments `(err, written, string)` where `written`
+specifies how many _bytes_ the passed string required to be written. Note that
+bytes written is not the same as string characters. See
+[Buffer.byteLength](buffer.html#buffer_class_method_buffer_bytelength_string_encoding).
 
-If `options` is a string, then it specifies the encoding.
+Unlike when writing `buffer`, the entire string must be written. No substring
+may be specified. This is because the byte offset of the resulting data may not
+be the same as the string offset.
 
-## Class: fs.WriteStream
+Note that it is unsafe to use `fs.write` multiple times on the same file
+without waiting for the callback. For this scenario,
+`fs.createWriteStream` is strongly recommended.
 
-`WriteStream` is a [Writable Stream](stream.html#stream_class_stream_writable).
+On Linux, positional writes don't work when the file is opened in append mode.
+The kernel ignores the position argument and always appends the data to
+the end of the file.
 
-### Event: 'open'
+## fs.writeFile(file, data[, options], callback)
 
-* `fd` {Integer} file descriptor used by the WriteStream.
+* `file` {String | Integer} filename or file descriptor
+* `data` {String | Buffer}
+* `options` {Object | String}
+  * `encoding` {String | Null} default = `'utf8'`
+  * `mode` {Number} default = `0o666`
+  * `flag` {String} default = `'w'`
+* `callback` {Function}
 
-Emitted when the WriteStream's file is opened.
+Asynchronously writes data to a file, replacing the file if it already exists.
+`data` can be a string or a buffer.
 
-### file.bytesWritten
+The `encoding` option is ignored if `data` is a buffer. It defaults
+to `'utf8'`.
 
-The number of bytes written so far. Does not include data that is still queued
-for writing.
+Example:
 
-## Class: fs.FSWatcher
+    fs.writeFile('message.txt', 'Hello Node.js', function (err) {
+      if (err) throw err;
+      console.log('It\'s saved!');
+    });
 
-Objects returned from `fs.watch()` are of this type.
+If `options` is a string, then it specifies the encoding. Example:
 
-### watcher.close()
+    fs.writeFile('message.txt', 'Hello Node.js', 'utf8', callback);
 
-Stop watching for changes on the given `fs.FSWatcher`.
+Any specified file descriptor has to support writing.
 
-### Event: 'change'
+Note that it is unsafe to use `fs.writeFile` multiple times on the same file
+without waiting for the callback. For this scenario,
+`fs.createWriteStream` is strongly recommended.
 
-* `event` {String} The type of fs change
-* `filename` {String} The filename that changed (if relevant/available)
+_Note: Specified file descriptors will not be closed automatically._
 
-Emitted when something changes in a watched directory or file.
-See more details in [fs.watch](#fs_fs_watch_filename_options_listener).
+## fs.writeFileSync(file, data[, options])
 
-### Event: 'error'
+The synchronous version of `fs.writeFile`. Returns `undefined`.
 
-* `error` {Error object}
+## fs.writeSync(fd, buffer, offset, length[, position])
 
-Emitted when an error occurs.
+## fs.writeSync(fd, data[, position[, encoding]])
 
+Synchronous versions of `fs.write()`. Returns the number of bytes written.
 
 [fs.stat]: #fs_fs_stat_path_callback
 [fs.access]: #fs_fs_access_path_mode_callback
 [fs.statSync]: #fs_fs_statsync_path
 [fs.accessSync]: #fs_fs_accesssync_path_mode
-[Buffer]: buffer.html#buffer_buffer
\ No newline at end of file
+[Buffer]: buffer.html#buffer_buffer

From 4ba18489d3579bb7de499548128e1f0dff0a03f3 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 12:12:06 -0500
Subject: [PATCH 156/323] doc: sort globals alphabetically

Reorders, with no contextual changes, the globals documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/globals.markdown | 193 +++++++++++++++++++--------------------
 1 file changed, 96 insertions(+), 97 deletions(-)

diff --git a/doc/api/globals.markdown b/doc/api/globals.markdown
index 2a2140fe532452..b9ab51ad8da066 100644
--- a/doc/api/globals.markdown
+++ b/doc/api/globals.markdown
@@ -5,33 +5,6 @@
 These objects are available in all modules. Some of these objects aren't
 actually in the global scope but in the module scope - this will be noted.
 
-## global
-
-<!-- type=global -->
-
-* {Object} The global namespace object.
-
-In browsers, the top-level scope is the global scope. That means that in
-browsers if you're in the global scope `var something` will define a global
-variable. In Node.js this is different. The top-level scope is not the global
-scope; `var something` inside an Node.js module will be local to that module.
-
-## process
-
-<!-- type=global -->
-
-* {Object}
-
-The process object. See the [process object][] section.
-
-## console
-
-<!-- type=global -->
-
-* {Object}
-
-Used to print to stdout and stderr. See the [console][] section.
-
 ## Class: Buffer
 
 <!-- type=global -->
@@ -40,48 +13,20 @@ Used to print to stdout and stderr. See the [console][] section.
 
 Used to handle binary data. See the [buffer section][]
 
-## require()
+## __dirname
 
 <!-- type=var -->
 
-* {Function}
-
-To require modules. See the [Modules][] section.  `require` isn't actually a
-global but rather local to each module.
-
-### require.resolve()
-
-Use the internal `require()` machinery to look up the location of a module,
-but rather than loading the module, just return the resolved filename.
-
-### require.cache
-
-* {Object}
-
-Modules are cached in this object when they are required. By deleting a key
-value from this object, the next `require` will reload the module.
-
-### require.extensions
-
-    Stability: 0 - Deprecated
-
-* {Object}
-
-Instruct `require` on how to handle certain file extensions.
+* {String}
 
-Process files with the extension `.sjs` as `.js`:
+The name of the directory that the currently executing script resides in.
 
-    require.extensions['.sjs'] = require.extensions['.js'];
+Example: running `node example.js` from `/Users/mjr`
 
-**Deprecated**  In the past, this list has been used to load
-non-JavaScript modules into Node.js by compiling them on-demand.
-However, in practice, there are much better ways to do this, such as
-loading modules via some other Node.js program, or compiling them to
-JavaScript ahead of time.
+    console.log(__dirname);
+    // /Users/mjr
 
-Since the Module system is locked, this feature will probably never go
-away.  However, it may have subtle bugs and complexities that are best
-left untouched.
+`__dirname` isn't actually a global but rather local to each module.
 
 ## __filename
 
@@ -101,21 +46,57 @@ Example: running `node example.js` from `/Users/mjr`
 
 `__filename` isn't actually a global but rather local to each module.
 
-## __dirname
+## clearInterval(t)
+
+Stop a timer that was previously created with `setInterval()`. The callback
+will not execute.
+
+<!--type=global-->
+
+The timer functions are global variables. See the [timers][] section.
+
+[buffer section]: buffer.html
+[module system documentation]: modules.html
+[Modules]: modules.html#modules_modules
+[process object]: process.html#process_process
+[console]: console.html
+[timers]: timers.html
+
+## clearTimeout(t)
+
+Stop a timer that was previously created with `setTimeout()`. The callback will
+not execute.
+
+## console
+
+<!-- type=global -->
+
+* {Object}
+
+Used to print to stdout and stderr. See the [console][] section.
+
+## exports
 
 <!-- type=var -->
 
-* {String}
+A reference to the `module.exports` that is shorter to type.
+See [module system documentation][] for details on when to use `exports` and
+when to use `module.exports`.
 
-The name of the directory that the currently executing script resides in.
+`exports` isn't actually a global but rather local to each module.
 
-Example: running `node example.js` from `/Users/mjr`
+See the [module system documentation][] for more information.
 
-    console.log(__dirname);
-    // /Users/mjr
+## global
 
-`__dirname` isn't actually a global but rather local to each module.
+<!-- type=global -->
+
+* {Object} The global namespace object.
 
+In browsers, the top-level scope is the global scope. That means that in
+browsers if you're in the global scope `var something` will define a global
+variable. In Node.js this is different. The top-level scope is not the global
+scope; `var something` inside an Node.js module will be local to that module.
 
 ## module
 
@@ -131,33 +112,56 @@ available through `require()`.
 
 See the [module system documentation][] for more information.
 
-## exports
+## process
+
+<!-- type=global -->
+
+* {Object}
+
+The process object. See the [process object][] section.
+
+## require()
 
 <!-- type=var -->
 
-A reference to the `module.exports` that is shorter to type.
-See [module system documentation][] for details on when to use `exports` and
-when to use `module.exports`.
+* {Function}
 
-`exports` isn't actually a global but rather local to each module.
+To require modules. See the [Modules][] section.  `require` isn't actually a
+global but rather local to each module.
 
-See the [module system documentation][] for more information.
+### require.cache
 
-## setTimeout(cb, ms)
+* {Object}
 
-Run callback `cb` after *at least* `ms` milliseconds. The actual delay depends
-on external factors like OS timer granularity and system load.
+Modules are cached in this object when they are required. By deleting a key
+value from this object, the next `require` will reload the module.
 
-The timeout must be in the range of 1-2,147,483,647 inclusive. If the value is
-outside that range, it's changed to 1 millisecond. Broadly speaking, a timer
-cannot span more than 24.8 days.
+### require.extensions
 
-Returns an opaque value that represents the timer.
+    Stability: 0 - Deprecated
 
-## clearTimeout(t)
+* {Object}
 
-Stop a timer that was previously created with `setTimeout()`. The callback will
-not execute.
+Instruct `require` on how to handle certain file extensions.
+
+Process files with the extension `.sjs` as `.js`:
+
+    require.extensions['.sjs'] = require.extensions['.js'];
+
+**Deprecated**  In the past, this list has been used to load
+non-JavaScript modules into Node.js by compiling them on-demand.
+However, in practice, there are much better ways to do this, such as
+loading modules via some other Node.js program, or compiling them to
+JavaScript ahead of time.
+
+Since the Module system is locked, this feature will probably never go
+away.  However, it may have subtle bugs and complexities that are best
+left untouched.
+
+### require.resolve()
+
+Use the internal `require()` machinery to look up the location of a module,
+but rather than loading the module, just return the resolved filename.
 
 ## setInterval(cb, ms)
 
@@ -171,18 +175,13 @@ cannot span more than 24.8 days.
 
 Returns an opaque value that represents the timer.
 
-## clearInterval(t)
-
-Stop a timer that was previously created with `setInterval()`. The callback
-will not execute.
+## setTimeout(cb, ms)
 
-<!--type=global-->
+Run callback `cb` after *at least* `ms` milliseconds. The actual delay depends
+on external factors like OS timer granularity and system load.
 
-The timer functions are global variables. See the [timers][] section.
+The timeout must be in the range of 1-2,147,483,647 inclusive. If the value is
+outside that range, it's changed to 1 millisecond. Broadly speaking, a timer
+cannot span more than 24.8 days.
 
-[buffer section]: buffer.html
-[module system documentation]: modules.html
-[Modules]: modules.html#modules_modules
-[process object]: process.html#process_process
-[console]: console.html
-[timers]: timers.html
+Returns an opaque value that represents the timer.

From 22961e011cdc496423d80ccc8837f9a84b6c4cf0 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 12:19:49 -0500
Subject: [PATCH 157/323] doc: sort os alphabetically

Reorders, with no contextual changes, the os documentation alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/os.markdown | 114 ++++++++++++++++++++++----------------------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/doc/api/os.markdown b/doc/api/os.markdown
index 4a7bf6633ec297..bef2c34f6a4915 100644
--- a/doc/api/os.markdown
+++ b/doc/api/os.markdown
@@ -6,67 +6,16 @@ Provides a few basic operating-system related utility functions.
 
 Use `require('os')` to access this module.
 
-## os.tmpdir()
-
-Returns the operating system's default directory for temporary files.
-
-## os.homedir()
-
-Returns the home directory of the current user.
-
-## os.endianness()
-
-Returns the endianness of the CPU. Possible values are `'BE'` for big endian
-or `'LE'` for little endian.
-
-## os.hostname()
-
-Returns the hostname of the operating system.
-
-## os.type()
-
-Returns the operating system name. For example `'Linux'` on Linux, `'Darwin'`
-on OS X and `'Windows_NT'` on Windows.
-
-## os.platform()
+## os.EOL
 
-Returns the operating system platform. Possible values are `'darwin'`,
-`'freebsd'`, `'linux'`, `'sunos'` or `'win32'`. Returns the value of
-`process.platform`.
+A constant defining the appropriate End-of-line marker for the operating
+system.
 
 ## os.arch()
 
 Returns the operating system CPU architecture. Possible values are `'x64'`,
 `'arm'` and `'ia32'`. Returns the value of `process.arch`.
 
-## os.release()
-
-Returns the operating system release.
-
-## os.uptime()
-
-Returns the system uptime in seconds.
-
-## os.loadavg()
-
-Returns an array containing the 1, 5, and 15 minute load averages.
-
-The load average is a measure of system activity, calculated by the operating
-system and expressed as a fractional number.  As a rule of thumb, the load
-average should ideally be less than the number of logical CPUs in the system.
-
-The load average is a very UNIX-y concept; there is no real equivalent on
-Windows platforms.  That is why this function always returns `[0, 0, 0]` on
-Windows.
-
-## os.totalmem()
-
-Returns the total amount of system memory in bytes.
-
-## os.freemem()
-
-Returns the amount of free system memory in bytes.
-
 ## os.cpus()
 
 Returns an array of objects containing information about each CPU/core
@@ -143,6 +92,35 @@ Example inspection of os.cpus:
 Note that since `nice` values are UNIX centric in Windows the `nice` values of
 all processors are always 0.
 
+## os.endianness()
+
+Returns the endianness of the CPU. Possible values are `'BE'` for big endian
+or `'LE'` for little endian.
+
+## os.freemem()
+
+Returns the amount of free system memory in bytes.
+
+## os.homedir()
+
+Returns the home directory of the current user.
+
+## os.hostname()
+
+Returns the hostname of the operating system.
+
+## os.loadavg()
+
+Returns an array containing the 1, 5, and 15 minute load averages.
+
+The load average is a measure of system activity, calculated by the operating
+system and expressed as a fractional number.  As a rule of thumb, the load
+average should ideally be less than the number of logical CPUs in the system.
+
+The load average is a very UNIX-y concept; there is no real equivalent on
+Windows platforms.  That is why this function always returns `[0, 0, 0]` on
+Windows.
+
 ## os.networkInterfaces()
 
 Get a list of network interfaces:
@@ -173,7 +151,29 @@ Get a list of network interfaces:
 Note that due to the underlying implementation this will only return network
 interfaces that have been assigned an address.
 
-## os.EOL
+## os.platform()
 
-A constant defining the appropriate End-of-line marker for the operating
-system.
+Returns the operating system platform. Possible values are `'darwin'`,
+`'freebsd'`, `'linux'`, `'sunos'` or `'win32'`. Returns the value of
+`process.platform`.
+
+## os.release()
+
+Returns the operating system release.
+
+## os.tmpdir()
+
+Returns the operating system's default directory for temporary files.
+
+## os.totalmem()
+
+Returns the total amount of system memory in bytes.
+
+## os.type()
+
+Returns the operating system name. For example `'Linux'` on Linux, `'Darwin'`
+on OS X and `'Windows_NT'` on Windows.
+
+## os.uptime()
+
+Returns the system uptime in seconds.

From bc636674563c20eedf280166393c890e50712f7f Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 12:23:52 -0500
Subject: [PATCH 158/323] doc: sort path alphabetically

Reorders, with no contextual changes, the path documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/path.markdown | 310 +++++++++++++++++++++---------------------
 1 file changed, 155 insertions(+), 155 deletions(-)

diff --git a/doc/api/path.markdown b/doc/api/path.markdown
index 7a06ec68f2df1d..454c79353f7b3c 100644
--- a/doc/api/path.markdown
+++ b/doc/api/path.markdown
@@ -8,86 +8,92 @@ The file system is not consulted to check whether paths are valid.
 
 Use `require('path')` to use this module.  The following methods are provided:
 
-## path.normalize(p)
-
-Normalize a string path, taking care of `'..'` and `'.'` parts.
+## path.basename(p[, ext])
 
-When multiple slashes are found, they're replaced by a single one;
-when the path contains a trailing slash, it is preserved.
-On Windows backslashes are used.
+Return the last portion of a path.  Similar to the Unix `basename` command.
 
 Example:
 
-    path.normalize('/foo/bar//baz/asdf/quux/..')
+    path.basename('/foo/bar/baz/asdf/quux.html')
     // returns
-    '/foo/bar/baz/asdf'
+    'quux.html'
 
-*Note:* If the path string passed as argument is a zero-length string then `'.'`
-        will be returned, which represents the current working directory.
+    path.basename('/foo/bar/baz/asdf/quux.html', '.html')
+    // returns
+    'quux'
 
-## path.join([path1][, path2][, ...])
+## path.delimiter
 
-Join all arguments together and normalize the resulting path.
+The platform-specific path delimiter, `;` or `':'`.
 
-Arguments must be strings.  In v0.8, non-string arguments were
-silently ignored.  In v0.10 and up, an exception is thrown.
+An example on *nix:
 
-Example:
+    console.log(process.env.PATH)
+    // '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin'
 
-    path.join('/foo', 'bar', 'baz/asdf', 'quux', '..')
+    process.env.PATH.split(path.delimiter)
     // returns
-    '/foo/bar/baz/asdf'
+    ['/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/bin']
 
-    path.join('foo', {}, 'bar')
-    // throws exception
-    TypeError: Arguments to path.join must be strings
+An example on Windows:
 
-*Note:* If the arguments to `join` have zero-length strings, unlike other path
-        module functions, they will be ignored. If the joined path string is a
-        zero-length string then `'.'` will be returned, which represents the
-        current working directory.
+    console.log(process.env.PATH)
+    // 'C:\Windows\system32;C:\Windows;C:\Program Files\node\'
 
-## path.resolve([from ...], to)
+    process.env.PATH.split(path.delimiter)
+    // returns
+    ['C:\\Windows\\system32', 'C:\\Windows', 'C:\\Program Files\\node\\']
 
-Resolves `to` to an absolute path.
+## path.dirname(p)
 
-If `to` isn't already absolute `from` arguments are prepended in right to left
-order, until an absolute path is found. If after using all `from` paths still
-no absolute path is found, the current working directory is used as well. The
-resulting path is normalized, and trailing slashes are removed unless the path
-gets resolved to the root directory. Non-string `from` arguments are ignored.
+Return the directory name of a path.  Similar to the Unix `dirname` command.
 
-Another way to think of it is as a sequence of `cd` commands in a shell.
+Example:
 
-    path.resolve('foo/bar', '/tmp/file/', '..', 'a/../subfile')
+    path.dirname('/foo/bar/baz/asdf/quux')
+    // returns
+    '/foo/bar/baz/asdf'
 
-Is similar to:
+## path.extname(p)
 
-    cd foo/bar
-    cd /tmp/file/
-    cd ..
-    cd a/../subfile
-    pwd
+Return the extension of the path, from the last '.' to end of string
+in the last portion of the path.  If there is no '.' in the last portion
+of the path or the first character of it is '.', then it returns
+an empty string.  Examples:
 
-The difference is that the different paths don't need to exist and may also be
-files.
+    path.extname('index.html')
+    // returns
+    '.html'
 
-Examples:
+    path.extname('index.coffee.md')
+    // returns
+    '.md'
 
-    path.resolve('/foo/bar', './baz')
+    path.extname('index.')
     // returns
-    '/foo/bar/baz'
+    '.'
 
-    path.resolve('/foo/bar', '/tmp/file/')
+    path.extname('index')
     // returns
-    '/tmp/file'
+    ''
 
-    path.resolve('wwwroot', 'static_files/png/', '../gif/image.gif')
-    // if currently in /home/myself/node, it returns
-    '/home/myself/node/wwwroot/static_files/gif/image.gif'
+    path.extname('.index')
+    // returns
+    ''
 
-*Note:* If the arguments to `resolve` have zero-length strings then the current
-        working directory will be used instead of them.
+## path.format(pathObject)
+
+Returns a path string from an object, the opposite of `path.parse` above.
+
+    path.format({
+        root : "/",
+        dir : "/home/user/dir",
+        base : "file.txt",
+        ext : ".txt",
+        name : "file"
+    })
+    // returns
+    '/home/user/dir/file.txt'
 
 ## path.isAbsolute(path)
 
@@ -112,165 +118,159 @@ Windows examples:
         other path module functions, it will be used as-is and `false` will be
         returned.
 
-## path.relative(from, to)
-
-Solve the relative path from `from` to `to`.
+## path.join([path1][, path2][, ...])
 
-At times we have two absolute paths, and we need to derive the relative
-path from one to the other.  This is actually the reverse transform of
-`path.resolve`, which means we see that:
+Join all arguments together and normalize the resulting path.
 
-    path.resolve(from, path.relative(from, to)) == path.resolve(to)
+Arguments must be strings.  In v0.8, non-string arguments were
+silently ignored.  In v0.10 and up, an exception is thrown.
 
-Examples:
+Example:
 
-    path.relative('C:\\orandea\\test\\aaa', 'C:\\orandea\\impl\\bbb')
+    path.join('/foo', 'bar', 'baz/asdf', 'quux', '..')
     // returns
-    '..\\..\\impl\\bbb'
+    '/foo/bar/baz/asdf'
 
-    path.relative('/data/orandea/test/aaa', '/data/orandea/impl/bbb')
-    // returns
-    '../../impl/bbb'
+    path.join('foo', {}, 'bar')
+    // throws exception
+    TypeError: Arguments to path.join must be strings
 
-*Note:* If the arguments to `relative` have zero-length strings then the current
-        working directory will be used instead of the zero-length strings. If
-        both the paths are the same then a zero-length string will be returned.
+*Note:* If the arguments to `join` have zero-length strings, unlike other path
+        module functions, they will be ignored. If the joined path string is a
+        zero-length string then `'.'` will be returned, which represents the
+        current working directory.
 
-## path.dirname(p)
+## path.normalize(p)
 
-Return the directory name of a path.  Similar to the Unix `dirname` command.
+Normalize a string path, taking care of `'..'` and `'.'` parts.
+
+When multiple slashes are found, they're replaced by a single one;
+when the path contains a trailing slash, it is preserved.
+On Windows backslashes are used.
 
 Example:
 
-    path.dirname('/foo/bar/baz/asdf/quux')
+    path.normalize('/foo/bar//baz/asdf/quux/..')
     // returns
     '/foo/bar/baz/asdf'
 
-## path.basename(p[, ext])
+*Note:* If the path string passed as argument is a zero-length string then `'.'`
+        will be returned, which represents the current working directory.
 
-Return the last portion of a path.  Similar to the Unix `basename` command.
+## path.parse(pathString)
 
-Example:
+Returns an object from a path string.
 
-    path.basename('/foo/bar/baz/asdf/quux.html')
-    // returns
-    'quux.html'
+An example on *nix:
 
-    path.basename('/foo/bar/baz/asdf/quux.html', '.html')
+    path.parse('/home/user/dir/file.txt')
     // returns
-    'quux'
-
-## path.extname(p)
+    {
+        root : "/",
+        dir : "/home/user/dir",
+        base : "file.txt",
+        ext : ".txt",
+        name : "file"
+    }
 
-Return the extension of the path, from the last '.' to end of string
-in the last portion of the path.  If there is no '.' in the last portion
-of the path or the first character of it is '.', then it returns
-an empty string.  Examples:
+An example on Windows:
 
-    path.extname('index.html')
+    path.parse('C:\\path\\dir\\index.html')
     // returns
-    '.html'
+    {
+        root : "C:\\",
+        dir : "C:\\path\\dir",
+        base : "index.html",
+        ext : ".html",
+        name : "index"
+    }
 
-    path.extname('index.coffee.md')
-    // returns
-    '.md'
+## path.posix
 
-    path.extname('index.')
-    // returns
-    '.'
+Provide access to aforementioned `path` methods but always interact in a posix
+compatible way.
 
-    path.extname('index')
-    // returns
-    ''
+## path.relative(from, to)
 
-    path.extname('.index')
-    // returns
-    ''
+Solve the relative path from `from` to `to`.
 
-## path.sep
+At times we have two absolute paths, and we need to derive the relative
+path from one to the other.  This is actually the reverse transform of
+`path.resolve`, which means we see that:
 
-The platform-specific file separator. `'\\'` or `'/'`.
+    path.resolve(from, path.relative(from, to)) == path.resolve(to)
 
-An example on *nix:
+Examples:
 
-    'foo/bar/baz'.split(path.sep)
+    path.relative('C:\\orandea\\test\\aaa', 'C:\\orandea\\impl\\bbb')
     // returns
-    ['foo', 'bar', 'baz']
-
-An example on Windows:
+    '..\\..\\impl\\bbb'
 
-    'foo\\bar\\baz'.split(path.sep)
+    path.relative('/data/orandea/test/aaa', '/data/orandea/impl/bbb')
     // returns
-    ['foo', 'bar', 'baz']
+    '../../impl/bbb'
 
-## path.delimiter
+*Note:* If the arguments to `relative` have zero-length strings then the current
+        working directory will be used instead of the zero-length strings. If
+        both the paths are the same then a zero-length string will be returned.
 
-The platform-specific path delimiter, `;` or `':'`.
+## path.resolve([from ...], to)
 
-An example on *nix:
+Resolves `to` to an absolute path.
 
-    console.log(process.env.PATH)
-    // '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin'
+If `to` isn't already absolute `from` arguments are prepended in right to left
+order, until an absolute path is found. If after using all `from` paths still
+no absolute path is found, the current working directory is used as well. The
+resulting path is normalized, and trailing slashes are removed unless the path
+gets resolved to the root directory. Non-string `from` arguments are ignored.
 
-    process.env.PATH.split(path.delimiter)
-    // returns
-    ['/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/bin']
+Another way to think of it is as a sequence of `cd` commands in a shell.
 
-An example on Windows:
+    path.resolve('foo/bar', '/tmp/file/', '..', 'a/../subfile')
 
-    console.log(process.env.PATH)
-    // 'C:\Windows\system32;C:\Windows;C:\Program Files\node\'
+Is similar to:
 
-    process.env.PATH.split(path.delimiter)
-    // returns
-    ['C:\\Windows\\system32', 'C:\\Windows', 'C:\\Program Files\\node\\']
+    cd foo/bar
+    cd /tmp/file/
+    cd ..
+    cd a/../subfile
+    pwd
 
-## path.parse(pathString)
+The difference is that the different paths don't need to exist and may also be
+files.
 
-Returns an object from a path string.
+Examples:
 
-An example on *nix:
+    path.resolve('/foo/bar', './baz')
+    // returns
+    '/foo/bar/baz'
 
-    path.parse('/home/user/dir/file.txt')
+    path.resolve('/foo/bar', '/tmp/file/')
     // returns
-    {
-        root : "/",
-        dir : "/home/user/dir",
-        base : "file.txt",
-        ext : ".txt",
-        name : "file"
-    }
+    '/tmp/file'
 
-An example on Windows:
+    path.resolve('wwwroot', 'static_files/png/', '../gif/image.gif')
+    // if currently in /home/myself/node, it returns
+    '/home/myself/node/wwwroot/static_files/gif/image.gif'
 
-    path.parse('C:\\path\\dir\\index.html')
-    // returns
-    {
-        root : "C:\\",
-        dir : "C:\\path\\dir",
-        base : "index.html",
-        ext : ".html",
-        name : "index"
-    }
+*Note:* If the arguments to `resolve` have zero-length strings then the current
+        working directory will be used instead of them.
 
-## path.format(pathObject)
+## path.sep
 
-Returns a path string from an object, the opposite of `path.parse` above.
+The platform-specific file separator. `'\\'` or `'/'`.
 
-    path.format({
-        root : "/",
-        dir : "/home/user/dir",
-        base : "file.txt",
-        ext : ".txt",
-        name : "file"
-    })
+An example on *nix:
+
+    'foo/bar/baz'.split(path.sep)
     // returns
-    '/home/user/dir/file.txt'
+    ['foo', 'bar', 'baz']
 
-## path.posix
+An example on Windows:
 
-Provide access to aforementioned `path` methods but always interact in a posix
-compatible way.
+    'foo\\bar\\baz'.split(path.sep)
+    // returns
+    ['foo', 'bar', 'baz']
 
 ## path.win32
 

From 1f56abaa988f66dd13a616df1c8095e92bd8e760 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 12:25:20 -0500
Subject: [PATCH 159/323] doc: sort punycode alphabetically

Reorders, with no contextual changes, the punycode documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/punycode.markdown | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/api/punycode.markdown b/doc/api/punycode.markdown
index fe29bdd4b06d11..f86b32ba50db66 100644
--- a/doc/api/punycode.markdown
+++ b/doc/api/punycode.markdown
@@ -22,16 +22,6 @@ Converts a string of Unicode symbols to a Punycode string of ASCII-only symbols.
     punycode.encode('mañana'); // 'maana-pta'
     punycode.encode('☃-⌘'); // '--dqo34k'
 
-## punycode.toUnicode(domain)
-
-Converts a Punycode string representing a domain name to Unicode. Only the
-Punycoded parts of the domain name will be converted, i.e. it doesn't matter if
-you call it on a string that has already been converted to Unicode.
-
-    // decode domain names
-    punycode.toUnicode('xn--maana-pta.com'); // 'mañana.com'
-    punycode.toUnicode('xn----dqo34k.com'); // '☃-⌘.com'
-
 ## punycode.toASCII(domain)
 
 Converts a Unicode string representing a domain name to Punycode. Only the
@@ -42,6 +32,16 @@ you call it with a domain that's already in ASCII.
     punycode.toASCII('mañana.com'); // 'xn--maana-pta.com'
     punycode.toASCII('☃-⌘.com'); // 'xn----dqo34k.com'
 
+## punycode.toUnicode(domain)
+
+Converts a Punycode string representing a domain name to Unicode. Only the
+Punycoded parts of the domain name will be converted, i.e. it doesn't matter if
+you call it on a string that has already been converted to Unicode.
+
+    // decode domain names
+    punycode.toUnicode('xn--maana-pta.com'); // 'mañana.com'
+    punycode.toUnicode('xn----dqo34k.com'); // '☃-⌘.com'
+
 ## punycode.ucs2
 
 ### punycode.ucs2.decode(string)

From d357b3090ef2f60021b95316141615bfe5db3a86 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 12:26:30 -0500
Subject: [PATCH 160/323] doc: sort querystring alphabetically

Reorders, with no contextual changes, the querystring documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/querystring.markdown | 54 ++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/doc/api/querystring.markdown b/doc/api/querystring.markdown
index 37144974c548e5..8b16fb725aeef0 100644
--- a/doc/api/querystring.markdown
+++ b/doc/api/querystring.markdown
@@ -7,31 +7,10 @@
 This module provides utilities for dealing with query strings.
 It provides the following methods:
 
-## querystring.stringify(obj[, sep][, eq][, options])
-
-Serialize an object to a query string.
-Optionally override the default separator (`'&'`) and assignment (`'='`)
-characters.
-
-Options object may contain `encodeURIComponent` property (`querystring.escape` by default),
-it can be used to encode string with `non-utf8` encoding if necessary.
-
-Example:
-
-    querystring.stringify({ foo: 'bar', baz: ['qux', 'quux'], corge: '' })
-    // returns
-    'foo=bar&baz=qux&baz=quux&corge='
-
-    querystring.stringify({foo: 'bar', baz: 'qux'}, ';', ':')
-    // returns
-    'foo:bar;baz:qux'
+## querystring.escape
 
-    // Suppose gbkEncodeURIComponent function already exists,
-    // it can encode string with `gbk` encoding
-    querystring.stringify({ w: '中文', foo: 'bar' }, null, null,
-      { encodeURIComponent: gbkEncodeURIComponent })
-    // returns
-    'w=%D6%D0%CE%C4&foo=bar'
+The escape function used by `querystring.stringify`,
+provided so that it could be overridden if necessary.
 
 ## querystring.parse(str[, sep][, eq][, options])
 
@@ -58,10 +37,31 @@ Example:
     // returns
     { w: '中文', foo: 'bar' }
 
-## querystring.escape
+## querystring.stringify(obj[, sep][, eq][, options])
 
-The escape function used by `querystring.stringify`,
-provided so that it could be overridden if necessary.
+Serialize an object to a query string.
+Optionally override the default separator (`'&'`) and assignment (`'='`)
+characters.
+
+Options object may contain `encodeURIComponent` property (`querystring.escape` by default),
+it can be used to encode string with `non-utf8` encoding if necessary.
+
+Example:
+
+    querystring.stringify({ foo: 'bar', baz: ['qux', 'quux'], corge: '' })
+    // returns
+    'foo=bar&baz=qux&baz=quux&corge='
+
+    querystring.stringify({foo: 'bar', baz: 'qux'}, ';', ':')
+    // returns
+    'foo:bar;baz:qux'
+
+    // Suppose gbkEncodeURIComponent function already exists,
+    // it can encode string with `gbk` encoding
+    querystring.stringify({ w: '中文', foo: 'bar' }, null, null,
+      { encodeURIComponent: gbkEncodeURIComponent })
+    // returns
+    'w=%D6%D0%CE%C4&foo=bar'
 
 ## querystring.unescape
 

From 39b8259bd56b1612035da8690633237ad29daf3a Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 12:30:11 -0500
Subject: [PATCH 161/323] doc: sort vm alphabetically

Reorders, with no contextual changes, the vm documentation alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/vm.markdown | 296 +++++++++++++++++++++-----------------------
 1 file changed, 143 insertions(+), 153 deletions(-)

diff --git a/doc/api/vm.markdown b/doc/api/vm.markdown
index dd2593ecb7a7b2..20bca8770286ab 100644
--- a/doc/api/vm.markdown
+++ b/doc/api/vm.markdown
@@ -11,45 +11,125 @@ You can access this module with:
 JavaScript code can be compiled and run immediately or compiled, saved, and run
 later.
 
-## vm.runInThisContext(code[, options])
+## Class: Script
 
-`vm.runInThisContext()` compiles `code`, runs it and returns the result. Running
-code does not have access to local scope, but does have access to the current
-`global` object.
+A class for holding precompiled scripts, and running them in specific sandboxes.
 
-Example of using `vm.runInThisContext` and `eval` to run the same code:
+### new vm.Script(code, options)
 
+Creating a new `Script` compiles `code` but does not run it. Instead, the
+created `vm.Script` object represents this compiled code. This script can be run
+later many times using methods below. The returned script is not bound to any
+global object. It is bound before each run, just for that run.
+
+The options when creating a script are:
+
+- `filename`: allows you to control the filename that shows up in any stack
+  traces produced from this script.
+- `displayErrors`: whether or not to print any errors to stderr, with the
+  line of code that caused them highlighted, before throwing an exception.
+  Applies only to syntax errors compiling the code; errors while running the
+  code are controlled by the options to the script's methods.
+
+### script.runInContext(contextifiedSandbox[, options])
+
+Similar to `vm.runInContext` but a method of a precompiled `Script` object.
+`script.runInContext` runs `script`'s compiled code in `contextifiedSandbox`
+and returns the result. Running code does not have access to local scope.
+
+`script.runInContext` takes the same options as `script.runInThisContext`.
+
+Example: compile code that increments a global variable and sets one, then
+execute the code multiple times. These globals are contained in the sandbox.
+
+    var util = require('util');
     var vm = require('vm');
-    var localVar = 'initial value';
 
-    var vmResult = vm.runInThisContext('localVar = "vm";');
-    console.log('vmResult: ', vmResult);
-    console.log('localVar: ', localVar);
+    var sandbox = {
+      animal: 'cat',
+      count: 2
+    };
 
-    var evalResult = eval('localVar = "eval";');
-    console.log('evalResult: ', evalResult);
-    console.log('localVar: ', localVar);
+    var context = new vm.createContext(sandbox);
+    var script = new vm.Script('count += 1; name = "kitty"');
 
-    // vmResult: 'vm', localVar: 'initial value'
-    // evalResult: 'eval', localVar: 'eval'
+    for (var i = 0; i < 10; ++i) {
+      script.runInContext(context);
+    }
 
-`vm.runInThisContext` does not have access to the local scope, so `localVar` is
-unchanged. `eval` does have access to the local scope, so `localVar` is changed.
+    console.log(util.inspect(sandbox));
 
-In this way `vm.runInThisContext` is much like an [indirect `eval` call][1],
-e.g. `(0,eval)('code')`. However, it also has the following additional options:
+    // { animal: 'cat', count: 12, name: 'kitty' }
 
-- `filename`: allows you to control the filename that shows up in any stack
-  traces produced.
-- `displayErrors`: whether or not to print any errors to stderr, with the
-  line of code that caused them highlighted, before throwing an exception.
-  Will capture both syntax errors from compiling `code` and runtime errors
-  thrown by executing the compiled code. Defaults to `true`.
-- `timeout`: a number of milliseconds to execute `code` before terminating
-  execution. If execution is terminated, an `Error` will be thrown.
+Note that running untrusted code is a tricky business requiring great care.
+`script.runInContext` is quite useful, but safely running untrusted code
+requires a separate process.
 
-[1]: http://es5.github.io/#x10.4.2
+### script.runInNewContext([sandbox][, options])
+
+Similar to `vm.runInNewContext` but a method of a precompiled `Script` object.
+`script.runInNewContext` contextifies `sandbox` if passed or creates a new
+contextified sandbox if it's omitted, and then runs `script`'s compiled code
+with the sandbox as the global object and returns the result. Running code does
+not have access to local scope.
+
+`script.runInNewContext` takes the same options as `script.runInThisContext`.
+
+Example: compile code that sets a global variable, then execute the code
+multiple times in different contexts. These globals are set on and contained in
+the sandboxes.
+
+    var util = require('util');
+    var vm = require('vm');
+
+    var sandboxes = [{}, {}, {}];
+
+    var script = new vm.Script('globalVar = "set"');
+
+    sandboxes.forEach(function (sandbox) {
+      script.runInNewContext(sandbox);
+    });
+
+    console.log(util.inspect(sandboxes));
+
+    // [{ globalVar: 'set' }, { globalVar: 'set' }, { globalVar: 'set' }]
+
+Note that running untrusted code is a tricky business requiring great care.
+`script.runInNewContext` is quite useful, but safely running untrusted code
+requires a separate process.
+
+### script.runInThisContext([options])
+
+Similar to `vm.runInThisContext` but a method of a precompiled `Script` object.
+`script.runInThisContext` runs `script`'s compiled code and returns the result.
+Running code does not have access to local scope, but does have access to the
+current `global` object.
+
+Example of using `script.runInThisContext` to compile code once and run it
+multiple times:
+
+    var vm = require('vm');
+
+    global.globalVar = 0;
 
+    var script = new vm.Script('globalVar += 1', { filename: 'myfile.vm' });
+
+    for (var i = 0; i < 1000; ++i) {
+      script.runInThisContext();
+    }
+
+    console.log(globalVar);
+
+    // 1000
+
+The options for running a script are:
+
+- `displayErrors`: whether or not to print any runtime errors to stderr, with
+  the line of code that caused them highlighted, before throwing an exception.
+  Applies only to runtime errors executing the code; it is impossible to create
+  a `Script` instance with syntax errors, as the constructor will throw.
+- `timeout`: a number of milliseconds to execute the script before terminating
+  execution. If execution is terminated, an `Error` will be thrown.
 
 ## vm.createContext([sandbox])
 
@@ -70,13 +150,11 @@ tags together inside that sandbox.
 
 [2]: http://es5.github.io/#x15.1
 
-
 ## vm.isContext(sandbox)
 
 Returns whether or not a sandbox object has been contextified by calling
 `vm.createContext` on it.
 
-
 ## vm.runInContext(code, contextifiedSandbox[, options])
 
 `vm.runInContext` compiles `code`, then runs it in `contextifiedSandbox` and
@@ -105,6 +183,18 @@ Note that running untrusted code is a tricky business requiring great care.
 `vm.runInContext` is quite useful, but safely running untrusted code requires a
 separate process.
 
+## vm.runInDebugContext(code)
+
+`vm.runInDebugContext` compiles and executes `code` inside the V8 debug context.
+The primary use case is to get access to the V8 debug object:
+
+    var Debug = vm.runInDebugContext('Debug');
+    Debug.scripts().forEach(function(script) { console.log(script.name); });
+
+Note that the debug context and object are intrinsically tied to V8's debugger
+implementation and may change (or even get removed) without prior warning.
+
+The debug object can also be exposed with the `--expose_debug_as=` switch.
 
 ## vm.runInNewContext(code[, sandbox][, options])
 
@@ -134,141 +224,41 @@ Note that running untrusted code is a tricky business requiring great care.
 `vm.runInNewContext` is quite useful, but safely running untrusted code requires
 a separate process.
 
+## vm.runInThisContext(code[, options])
 
-## vm.runInDebugContext(code)
-
-`vm.runInDebugContext` compiles and executes `code` inside the V8 debug context.
-The primary use case is to get access to the V8 debug object:
-
-    var Debug = vm.runInDebugContext('Debug');
-    Debug.scripts().forEach(function(script) { console.log(script.name); });
-
-Note that the debug context and object are intrinsically tied to V8's debugger
-implementation and may change (or even get removed) without prior warning.
-
-The debug object can also be exposed with the `--expose_debug_as=` switch.
+`vm.runInThisContext()` compiles `code`, runs it and returns the result. Running
+code does not have access to local scope, but does have access to the current
+`global` object.
 
+Example of using `vm.runInThisContext` and `eval` to run the same code:
 
-## Class: Script
+    var vm = require('vm');
+    var localVar = 'initial value';
 
-A class for holding precompiled scripts, and running them in specific sandboxes.
+    var vmResult = vm.runInThisContext('localVar = "vm";');
+    console.log('vmResult: ', vmResult);
+    console.log('localVar: ', localVar);
 
+    var evalResult = eval('localVar = "eval";');
+    console.log('evalResult: ', evalResult);
+    console.log('localVar: ', localVar);
 
-### new vm.Script(code, options)
+    // vmResult: 'vm', localVar: 'initial value'
+    // evalResult: 'eval', localVar: 'eval'
 
-Creating a new `Script` compiles `code` but does not run it. Instead, the
-created `vm.Script` object represents this compiled code. This script can be run
-later many times using methods below. The returned script is not bound to any
-global object. It is bound before each run, just for that run.
+`vm.runInThisContext` does not have access to the local scope, so `localVar` is
+unchanged. `eval` does have access to the local scope, so `localVar` is changed.
 
-The options when creating a script are:
+In this way `vm.runInThisContext` is much like an [indirect `eval` call][1],
+e.g. `(0,eval)('code')`. However, it also has the following additional options:
 
 - `filename`: allows you to control the filename that shows up in any stack
-  traces produced from this script.
+  traces produced.
 - `displayErrors`: whether or not to print any errors to stderr, with the
   line of code that caused them highlighted, before throwing an exception.
-  Applies only to syntax errors compiling the code; errors while running the
-  code are controlled by the options to the script's methods.
-
-
-### script.runInThisContext([options])
-
-Similar to `vm.runInThisContext` but a method of a precompiled `Script` object.
-`script.runInThisContext` runs `script`'s compiled code and returns the result.
-Running code does not have access to local scope, but does have access to the
-current `global` object.
-
-Example of using `script.runInThisContext` to compile code once and run it
-multiple times:
-
-    var vm = require('vm');
-
-    global.globalVar = 0;
-
-    var script = new vm.Script('globalVar += 1', { filename: 'myfile.vm' });
-
-    for (var i = 0; i < 1000; ++i) {
-      script.runInThisContext();
-    }
-
-    console.log(globalVar);
-
-    // 1000
-
-The options for running a script are:
-
-- `displayErrors`: whether or not to print any runtime errors to stderr, with
-  the line of code that caused them highlighted, before throwing an exception.
-  Applies only to runtime errors executing the code; it is impossible to create
-  a `Script` instance with syntax errors, as the constructor will throw.
-- `timeout`: a number of milliseconds to execute the script before terminating
+  Will capture both syntax errors from compiling `code` and runtime errors
+  thrown by executing the compiled code. Defaults to `true`.
+- `timeout`: a number of milliseconds to execute `code` before terminating
   execution. If execution is terminated, an `Error` will be thrown.
 
-
-### script.runInContext(contextifiedSandbox[, options])
-
-Similar to `vm.runInContext` but a method of a precompiled `Script` object.
-`script.runInContext` runs `script`'s compiled code in `contextifiedSandbox`
-and returns the result. Running code does not have access to local scope.
-
-`script.runInContext` takes the same options as `script.runInThisContext`.
-
-Example: compile code that increments a global variable and sets one, then
-execute the code multiple times. These globals are contained in the sandbox.
-
-    var util = require('util');
-    var vm = require('vm');
-
-    var sandbox = {
-      animal: 'cat',
-      count: 2
-    };
-
-    var context = new vm.createContext(sandbox);
-    var script = new vm.Script('count += 1; name = "kitty"');
-
-    for (var i = 0; i < 10; ++i) {
-      script.runInContext(context);
-    }
-
-    console.log(util.inspect(sandbox));
-
-    // { animal: 'cat', count: 12, name: 'kitty' }
-
-Note that running untrusted code is a tricky business requiring great care.
-`script.runInContext` is quite useful, but safely running untrusted code
-requires a separate process.
-
-
-### script.runInNewContext([sandbox][, options])
-
-Similar to `vm.runInNewContext` but a method of a precompiled `Script` object.
-`script.runInNewContext` contextifies `sandbox` if passed or creates a new
-contextified sandbox if it's omitted, and then runs `script`'s compiled code
-with the sandbox as the global object and returns the result. Running code does
-not have access to local scope.
-
-`script.runInNewContext` takes the same options as `script.runInThisContext`.
-
-Example: compile code that sets a global variable, then execute the code
-multiple times in different contexts. These globals are set on and contained in
-the sandboxes.
-
-    var util = require('util');
-    var vm = require('vm');
-
-    var sandboxes = [{}, {}, {}];
-
-    var script = new vm.Script('globalVar = "set"');
-
-    sandboxes.forEach(function (sandbox) {
-      script.runInNewContext(sandbox);
-    });
-
-    console.log(util.inspect(sandboxes));
-
-    // [{ globalVar: 'set' }, { globalVar: 'set' }, { globalVar: 'set' }]
-
-Note that running untrusted code is a tricky business requiring great care.
-`script.runInNewContext` is quite useful, but safely running untrusted code
-requires a separate process.
+[1]: http://es5.github.io/#x10.4.2

From d4dda77e4a9e3fb150861e4cbe90d3945734c599 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 12:31:41 -0500
Subject: [PATCH 162/323] doc: sort url alphabetically

Reorders, with no contextual changes, the url documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/url.markdown | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/doc/api/url.markdown b/doc/api/url.markdown
index cd4797777f07ec..8c8cd5bf1b85bf 100644
--- a/doc/api/url.markdown
+++ b/doc/api/url.markdown
@@ -77,20 +77,6 @@ properties of URL objects:
 
 The following methods are provided by the URL module:
 
-## url.parse(urlStr[, parseQueryString][, slashesDenoteHost])
-
-Take a URL string, and return an object.
-
-Pass `true` as the second argument to also parse the query string using the
-`querystring` module. If `true` then the `query` property will always be
-assigned an object, and the `search` property will always be a (possibly
-empty) string. If `false` then the `query` property will not be parsed or
-decoded. Defaults to `false`.
-
-Pass `true` as the third argument to treat `//foo/bar` as
-`{ host: 'foo', pathname: '/bar' }` rather than
-`{ pathname: '//foo/bar' }`. Defaults to `false`.
-
 ## url.format(urlObj)
 
 Take a parsed URL object, and return a formatted URL string.
@@ -117,6 +103,20 @@ Here's how the formatting process works:
   * It is treated the same with or without the leading `?` (question mark).
 * `hash` is treated the same with or without the leading `#` (pound sign, anchor).
 
+## url.parse(urlStr[, parseQueryString][, slashesDenoteHost])
+
+Take a URL string, and return an object.
+
+Pass `true` as the second argument to also parse the query string using the
+`querystring` module. If `true` then the `query` property will always be
+assigned an object, and the `search` property will always be a (possibly
+empty) string. If `false` then the `query` property will not be parsed or
+decoded. Defaults to `false`.
+
+Pass `true` as the third argument to treat `//foo/bar` as
+`{ host: 'foo', pathname: '/bar' }` rather than
+`{ pathname: '//foo/bar' }`. Defaults to `false`.
+
 ## url.resolve(from, to)
 
 Take a base URL, and a href URL, and resolve them as a browser would for

From 14b5a95d03613d240e1a2bfa445434bd30d41d86 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 12:33:35 -0500
Subject: [PATCH 163/323] doc: sort tty alphabetically

Reorders, with no contextual changes, the tty documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/tty.markdown | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/doc/api/tty.markdown b/doc/api/tty.markdown
index 1a99041e60f486..acb3bb480bb774 100644
--- a/doc/api/tty.markdown
+++ b/doc/api/tty.markdown
@@ -15,18 +15,6 @@ in a TTY context is to check `process.stdout.isTTY`:
     $ node -p -e "Boolean(process.stdout.isTTY)" | cat
     false
 
-
-## tty.isatty(fd)
-
-Returns `true` or `false` depending on if the `fd` is associated with a
-terminal.
-
-
-## tty.setRawMode(mode)
-
-    Stability: 0 - Deprecated: Use [tty.ReadStream#setRawMode][] (i.e. process.stdin.setRawMode) instead.
-
-
 ## Class: ReadStream
 
 A `net.Socket` subclass that represents the readable portion of a tty. In normal
@@ -44,6 +32,7 @@ of the `tty.ReadStream` instance.
 `tty.ReadStream` to act either as a raw device or default. `isRaw` will be set
 to the resulting mode.
 
+[tty.ReadStream#setRawMode]: #tty_rs_setrawmode_mode
 
 ## Class: WriteStream
 
@@ -51,16 +40,6 @@ A `net.Socket` subclass that represents the writable portion of a tty. In normal
 circumstances, `process.stdout` will be the only `tty.WriteStream` instance
 ever created (and only when `isatty(1)` is true).
 
-### ws.columns
-
-A `Number` that gives the number of columns the TTY currently has. This property
-gets updated on "resize" events.
-
-### ws.rows
-
-A `Number` that gives the number of rows the TTY currently has. This property
-gets updated on "resize" events.
-
 ### Event: 'resize'
 
 `function () {}`
@@ -73,5 +52,21 @@ has changed.
       console.log(process.stdout.columns + 'x' + process.stdout.rows);
     });
 
+### ws.columns
 
-[tty.ReadStream#setRawMode]: #tty_rs_setrawmode_mode
+A `Number` that gives the number of columns the TTY currently has. This property
+gets updated on "resize" events.
+
+### ws.rows
+
+A `Number` that gives the number of rows the TTY currently has. This property
+gets updated on "resize" events.
+
+## tty.isatty(fd)
+
+Returns `true` or `false` depending on if the `fd` is associated with a
+terminal.
+
+## tty.setRawMode(mode)
+
+    Stability: 0 - Deprecated: Use [tty.ReadStream#setRawMode][] (i.e. process.stdin.setRawMode) instead.

From 0d2262887c0f6aeb19b2e4d73484e6f56807093b Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 12:35:20 -0500
Subject: [PATCH 164/323] doc: sort timers alphabetically

Reorders, with no contextual changes, the timers documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/timers.markdown | 74 ++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/doc/api/timers.markdown b/doc/api/timers.markdown
index 1dc456aaad925f..3a087be76a5cf2 100644
--- a/doc/api/timers.markdown
+++ b/doc/api/timers.markdown
@@ -5,25 +5,38 @@
 All of the timer functions are globals.  You do not need to `require()`
 this module in order to use them.
 
-## setTimeout(callback, delay[, arg][, ...])
+## clearImmediate(immediateObject)
 
-To schedule execution of a one-time `callback` after `delay` milliseconds. Returns a
-`timeoutObject` for possible use with `clearTimeout()`. Optionally you can
-also pass arguments to the callback.
+Stops an immediate from triggering.
 
-It is important to note that your callback will probably not be called in exactly
-`delay` milliseconds - Node.js makes no guarantees about the exact timing of when
-the callback will fire, nor of the ordering things will fire in. The callback will
-be called as close as possible to the time specified.
+## clearInterval(intervalObject)
 
-To follow browser behavior, when using delays larger than 2147483647
-milliseconds (approximately 25 days) or less than 1, the timeout is executed
-immediately, as if the `delay` was set to 1.
+Stops an interval from triggering.
 
 ## clearTimeout(timeoutObject)
 
 Prevents a timeout from triggering.
 
+## ref()
+
+If you had previously `unref()`d a timer you can call `ref()` to explicitly
+request the timer hold the program open. If the timer is already `ref`d calling
+`ref` again will have no effect.
+
+Returns the timer.
+
+## setImmediate(callback[, arg][, ...])
+
+To schedule the "immediate" execution of `callback` after I/O events
+callbacks and before `setTimeout` and `setInterval` . Returns an
+`immediateObject` for possible use with `clearImmediate()`. Optionally you
+can also pass arguments to the callback.
+
+Callbacks for immediates are queued in the order in which they were created.
+The entire callback queue is processed every event loop iteration. If you queue
+an immediate from inside an executing callback, that immediate won't fire
+until the next event loop iteration.
+
 ## setInterval(callback, delay[, arg][, ...])
 
 To schedule the repeated execution of `callback` every `delay` milliseconds.
@@ -34,9 +47,20 @@ To follow browser behavior, when using delays larger than 2147483647
 milliseconds (approximately 25 days) or less than 1, Node.js will use 1 as the
 `delay`.
 
-## clearInterval(intervalObject)
+## setTimeout(callback, delay[, arg][, ...])
 
-Stops an interval from triggering.
+To schedule execution of a one-time `callback` after `delay` milliseconds. Returns a
+`timeoutObject` for possible use with `clearTimeout()`. Optionally you can
+also pass arguments to the callback.
+
+It is important to note that your callback will probably not be called in exactly
+`delay` milliseconds - Node.js makes no guarantees about the exact timing of when
+the callback will fire, nor of the ordering things will fire in. The callback will
+be called as close as possible to the time specified.
+
+To follow browser behavior, when using delays larger than 2147483647
+milliseconds (approximately 25 days) or less than 1, the timeout is executed
+immediately, as if the `delay` was set to 1.
 
 ## unref()
 
@@ -50,27 +74,3 @@ will wakeup the event loop, creating too many of these may adversely effect
 event loop performance -- use wisely.
 
 Returns the timer.
-
-## ref()
-
-If you had previously `unref()`d a timer you can call `ref()` to explicitly
-request the timer hold the program open. If the timer is already `ref`d calling
-`ref` again will have no effect.
-
-Returns the timer.
-
-## setImmediate(callback[, arg][, ...])
-
-To schedule the "immediate" execution of `callback` after I/O events
-callbacks and before `setTimeout` and `setInterval` . Returns an
-`immediateObject` for possible use with `clearImmediate()`. Optionally you
-can also pass arguments to the callback.
-
-Callbacks for immediates are queued in the order in which they were created.
-The entire callback queue is processed every event loop iteration. If you queue
-an immediate from inside an executing callback, that immediate won't fire
-until the next event loop iteration.
-
-## clearImmediate(immediateObject)
-
-Stops an immediate from triggering.

From d383d624de009b819f99dcf7e9458da3d41ce228 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 12:36:11 -0500
Subject: [PATCH 165/323] doc: sort string_decoder alphabetically

Reorders, with no contextual changes, the string_decode documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/string_decoder.markdown | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/api/string_decoder.markdown b/doc/api/string_decoder.markdown
index 4189923b9733c4..885af7745a23a0 100644
--- a/doc/api/string_decoder.markdown
+++ b/doc/api/string_decoder.markdown
@@ -19,10 +19,10 @@ additional support for utf8.
 
 Accepts a single argument, `encoding` which defaults to `utf8`.
 
-### decoder.write(buffer)
-
-Returns a decoded string.
-
 ### decoder.end()
 
 Returns any trailing bytes that were left in the buffer.
+
+### decoder.write(buffer)
+
+Returns a decoded string.

From 389ead37efcd74b52fa41a8b78436bcc8cf80060 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 12:38:09 -0500
Subject: [PATCH 166/323] doc: sort repl alphabetically

Reorders, with no contextual changes, the repl documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/repl.markdown | 187 +++++++++++++++++++++---------------------
 1 file changed, 93 insertions(+), 94 deletions(-)

diff --git a/doc/api/repl.markdown b/doc/api/repl.markdown
index 487749250b04d9..f298266ccb5d73 100644
--- a/doc/api/repl.markdown
+++ b/doc/api/repl.markdown
@@ -29,6 +29,21 @@ For example, you could add this to your bashrc file:
 
     alias node="env NODE_NO_READLINE=1 rlwrap node"
 
+## Environment Variable Options
+
+The built-in repl (invoked by running `node` or `node -i`) may be controlled
+via the following environment variables:
+
+ - `NODE_REPL_HISTORY` - When a valid path is given, persistent REPL history
+   will be saved to the specified file rather than `.node_repl_history` in the
+   user's home directory. Setting this value to `""` will disable persistent
+   REPL history.
+ - `NODE_REPL_HISTORY_SIZE` - defaults to `1000`. Controls how many lines of
+   history will be persisted if history is available. Must be a positive number.
+ - `NODE_REPL_MODE` - may be any of `sloppy`, `strict`, or `magic`. Defaults
+   to `magic`, which will automatically run "strict mode only" statements in
+   strict mode.
+
 ## Persistent History
 
 By default, the REPL will persist history between `node` REPL sessions by saving
@@ -46,20 +61,86 @@ automatically be converted to using plain text. The new file will be saved to
 either your home directory, or a directory defined by the `NODE_REPL_HISTORY`
 variable, as documented below.
 
-## Environment Variable Options
+## REPL Features
 
-The built-in repl (invoked by running `node` or `node -i`) may be controlled
-via the following environment variables:
+<!-- type=misc -->
 
- - `NODE_REPL_HISTORY` - When a valid path is given, persistent REPL history
-   will be saved to the specified file rather than `.node_repl_history` in the
-   user's home directory. Setting this value to `""` will disable persistent
-   REPL history.
- - `NODE_REPL_HISTORY_SIZE` - defaults to `1000`. Controls how many lines of
-   history will be persisted if history is available. Must be a positive number.
- - `NODE_REPL_MODE` - may be any of `sloppy`, `strict`, or `magic`. Defaults
-   to `magic`, which will automatically run "strict mode only" statements in
-   strict mode.
+Inside the REPL, Control+D will exit.  Multi-line expressions can be input.
+Tab completion is supported for both global and local variables.
+
+Core modules will be loaded on-demand into the environment. For example,
+accessing `fs` will `require()` the `fs` module as `global.fs`.
+
+The special variable `_` (underscore) contains the result of the last expression.
+
+    > [ 'a', 'b', 'c' ]
+    [ 'a', 'b', 'c' ]
+    > _.length
+    3
+    > _ += 1
+    4
+
+The REPL provides access to any variables in the global scope. You can expose
+a variable to the REPL explicitly by assigning it to the `context` object
+associated with each `REPLServer`.  For example:
+
+    // repl_test.js
+    var repl = require('repl'),
+        msg = 'message';
+
+    repl.start('> ').context.m = msg;
+
+Things in the `context` object appear as local within the REPL:
+
+    mjr:~$ node repl_test.js
+    > m
+    'message'
+
+There are a few special REPL commands:
+
+  - `.break` - While inputting a multi-line expression, sometimes you get lost
+    or just don't care about completing it. `.break` will start over.
+  - `.clear` - Resets the `context` object to an empty object and clears any
+    multi-line expression.
+  - `.exit` - Close the I/O stream, which will cause the REPL to exit.
+  - `.help` - Show this list of special commands.
+  - `.save` - Save the current REPL session to a file
+    >.save ./file/to/save.js
+  - `.load` - Load a file into the current REPL session.
+    >.load ./file/to/load.js
+
+The following key combinations in the REPL have these special effects:
+
+  - `<ctrl>C` - Similar to the `.break` keyword.  Terminates the current
+    command.  Press twice on a blank line to forcibly exit.
+  - `<ctrl>D` - Similar to the `.exit` keyword.
+  - `<tab>` - Show both global and local(scope) variables
+
+
+### Customizing Object displays in the REPL
+
+The REPL module internally uses
+[util.inspect()][], when printing values. However, `util.inspect` delegates the
+ call to the object's `inspect()` function, if it has one. You can read more
+ about this delegation [here][].
+
+For example, if you have defined an `inspect()` function on an object, like this:
+
+    > var obj = { foo: 'this will not show up in the inspect() output' };
+    undefined
+    > obj.inspect = function() {
+    ...   return { bar: 'baz' };
+    ... };
+    [Function]
+
+and try to print `obj` in REPL, it will invoke the custom `inspect()` function:
+
+    > obj
+    { bar: 'baz' }
+
+[Readline Interface]: readline.html#readline_class_interface
+[util.inspect()]: util.html#util_util_inspect_object_options
+[here]: util.html#util_custom_inspect_function_on_objects
 
 ## repl.start(options)
 
@@ -198,85 +279,3 @@ Example of listening for `reset`:
       console.log('repl has a new context');
       someExtension.extend(context);
     });
-
-
-## REPL Features
-
-<!-- type=misc -->
-
-Inside the REPL, Control+D will exit.  Multi-line expressions can be input.
-Tab completion is supported for both global and local variables.
-
-Core modules will be loaded on-demand into the environment. For example,
-accessing `fs` will `require()` the `fs` module as `global.fs`.
-
-The special variable `_` (underscore) contains the result of the last expression.
-
-    > [ 'a', 'b', 'c' ]
-    [ 'a', 'b', 'c' ]
-    > _.length
-    3
-    > _ += 1
-    4
-
-The REPL provides access to any variables in the global scope. You can expose
-a variable to the REPL explicitly by assigning it to the `context` object
-associated with each `REPLServer`.  For example:
-
-    // repl_test.js
-    var repl = require('repl'),
-        msg = 'message';
-
-    repl.start('> ').context.m = msg;
-
-Things in the `context` object appear as local within the REPL:
-
-    mjr:~$ node repl_test.js
-    > m
-    'message'
-
-There are a few special REPL commands:
-
-  - `.break` - While inputting a multi-line expression, sometimes you get lost
-    or just don't care about completing it. `.break` will start over.
-  - `.clear` - Resets the `context` object to an empty object and clears any
-    multi-line expression.
-  - `.exit` - Close the I/O stream, which will cause the REPL to exit.
-  - `.help` - Show this list of special commands.
-  - `.save` - Save the current REPL session to a file
-    >.save ./file/to/save.js
-  - `.load` - Load a file into the current REPL session.
-    >.load ./file/to/load.js
-
-The following key combinations in the REPL have these special effects:
-
-  - `<ctrl>C` - Similar to the `.break` keyword.  Terminates the current
-    command.  Press twice on a blank line to forcibly exit.
-  - `<ctrl>D` - Similar to the `.exit` keyword.
-  - `<tab>` - Show both global and local(scope) variables
-
-
-### Customizing Object displays in the REPL
-
-The REPL module internally uses
-[util.inspect()][], when printing values. However, `util.inspect` delegates the
- call to the object's `inspect()` function, if it has one. You can read more
- about this delegation [here][].
-
-For example, if you have defined an `inspect()` function on an object, like this:
-
-    > var obj = { foo: 'this will not show up in the inspect() output' };
-    undefined
-    > obj.inspect = function() {
-    ...   return { bar: 'baz' };
-    ... };
-    [Function]
-
-and try to print `obj` in REPL, it will invoke the custom `inspect()` function:
-
-    > obj
-    { bar: 'baz' }
-
-[Readline Interface]: readline.html#readline_class_interface
-[util.inspect()]: util.html#util_util_inspect_object_options
-[here]: util.html#util_custom_inspect_function_on_objects

From 29054ffc0c4280df988fd2157a41dceb490d09b6 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 12:43:06 -0500
Subject: [PATCH 167/323] doc: sort readline alphabetically

Reorders, with no contextual changes, the readline documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/readline.markdown | 211 +++++++++++++++++++-------------------
 1 file changed, 105 insertions(+), 106 deletions(-)

diff --git a/doc/api/readline.markdown b/doc/api/readline.markdown
index 50ddaf660a87ac..ac5c61fa1cc9cf 100644
--- a/doc/api/readline.markdown
+++ b/doc/api/readline.markdown
@@ -23,75 +23,21 @@ program to gracefully exit:
       rl.close();
     });
 
-## readline.createInterface(options)
-
-Creates a readline `Interface` instance. Accepts an "options" Object that takes
-the following values:
-
- - `input` - the readable stream to listen to (Required).
-
- - `output` - the writable stream to write readline data to (Optional).
-
- - `completer` - an optional function that is used for Tab autocompletion. See
-   below for an example of using this.
-
- - `terminal` - pass `true` if the `input` and `output` streams should be
-   treated like a TTY, and have ANSI/VT100 escape codes written to it.
-   Defaults to checking `isTTY` on the `output` stream upon instantiation.
-
- - `historySize` - maximum number of history lines retained. Defaults to `30`.
-
-The `completer` function is given the current line entered by the user, and
-is supposed to return an Array with 2 entries:
-
- 1. An Array with matching entries for the completion.
-
- 2. The substring that was used for the matching.
-
-Which ends up looking something like:
-`[[substr1, substr2, ...], originalsubstring]`.
-
-Example:
-
-    function completer(line) {
-      var completions = '.help .error .exit .quit .q'.split(' ')
-      var hits = completions.filter(function(c) { return c.indexOf(line) == 0 })
-      // show all completions if none found
-      return [hits.length ? hits : completions, line]
-    }
-
-Also `completer` can be run in async mode if it accepts two arguments:
-
-    function completer(linePartial, callback) {
-      callback(null, [['123'], linePartial]);
-    }
-
-`createInterface` is commonly used with `process.stdin` and
-`process.stdout` in order to accept user input:
-
-    var readline = require('readline');
-    var rl = readline.createInterface({
-      input: process.stdin,
-      output: process.stdout
-    });
-
-Once you have a readline instance, you most commonly listen for the
-`"line"` event.
-
-If `terminal` is `true` for this instance then the `output` stream will get
-the best compatibility if it defines an `output.columns` property, and fires
-a `"resize"` event on the `output` if/when the columns ever change
-(`process.stdout` does this automatically when it is a TTY).
-
 ## Class: Interface
 
 The class that represents a readline interface with an input and output
 stream.
 
-### rl.setPrompt(prompt)
+### rl.close()
 
-Sets the prompt, for example when you run `node` on the command line, you see
-`> `, which is node.js's prompt.
+Closes the `Interface` instance, relinquishing control on the `input` and
+`output` streams. The "close" event will also be emitted.
+
+### rl.pause()
+
+Pauses the readline `input` stream, allowing it to be resumed later if needed.
+
+Note that this doesn't immediately pause the stream of events. Several events may be emitted after calling `pause`, including `line`.
 
 ### rl.prompt([preserveCursor])
 
@@ -123,20 +69,14 @@ Example usage:
       console.log('Oh, so your favorite food is ' + answer);
     });
 
-### rl.pause()
-
-Pauses the readline `input` stream, allowing it to be resumed later if needed.
-
-Note that this doesn't immediately pause the stream of events. Several events may be emitted after calling `pause`, including `line`.
-
 ### rl.resume()
 
 Resumes the readline `input` stream.
 
-### rl.close()
+### rl.setPrompt(prompt)
 
-Closes the `Interface` instance, relinquishing control on the `input` and
-`output` streams. The "close" event will also be emitted.
+Sets the prompt, for example when you run `node` on the command line, you see
+`> `, which is node.js's prompt.
 
 ### rl.write(data[, key])
 
@@ -154,6 +94,19 @@ Example:
 
 ## Events
 
+### Event: 'close'
+
+`function () {}`
+
+Emitted when `close()` is called.
+
+Also emitted when the `input` stream receives its "end" event. The `Interface`
+instance should be considered "finished" once this is emitted. For example, when
+the `input` stream receives `^D`, respectively known as `EOT`.
+
+This event is also called if there is no `SIGINT` event listener present when
+the `input` stream receives a `^C`, respectively known as `SIGINT`.
+
 ### Event: 'line'
 
 `function (line) {}`
@@ -194,18 +147,23 @@ Example of listening for `resume`:
       console.log('Readline resumed.');
     });
 
-### Event: 'close'
+### Event: 'SIGCONT'
 
 `function () {}`
 
-Emitted when `close()` is called.
+**This does not work on Windows.**
 
-Also emitted when the `input` stream receives its "end" event. The `Interface`
-instance should be considered "finished" once this is emitted. For example, when
-the `input` stream receives `^D`, respectively known as `EOT`.
+Emitted whenever the `input` stream is sent to the background with `^Z`,
+respectively known as `SIGTSTP`, and then continued with `fg(1)`. This event
+only emits if the stream was not paused before sending the program to the
+background.
 
-This event is also called if there is no `SIGINT` event listener present when
-the `input` stream receives a `^C`, respectively known as `SIGINT`.
+Example of listening for `SIGCONT`:
+
+    rl.on('SIGCONT', function() {
+      // `prompt` will automatically resume the stream
+      rl.prompt();
+    });
 
 ### Event: 'SIGINT'
 
@@ -247,25 +205,6 @@ Example of listening for `SIGTSTP`:
       console.log('Caught SIGTSTP.');
     });
 
-### Event: 'SIGCONT'
-
-`function () {}`
-
-**This does not work on Windows.**
-
-Emitted whenever the `input` stream is sent to the background with `^Z`,
-respectively known as `SIGTSTP`, and then continued with `fg(1)`. This event
-only emits if the stream was not paused before sending the program to the
-background.
-
-Example of listening for `SIGCONT`:
-
-    rl.on('SIGCONT', function() {
-      // `prompt` will automatically resume the stream
-      rl.prompt();
-    });
-
-
 ## Example: Tiny CLI
 
 Here's an example of how to use all these together to craft a tiny command
@@ -292,14 +231,6 @@ line interface:
       process.exit(0);
     });
 
-## readline.cursorTo(stream, x, y)
-
-Move cursor to the specified position in a given TTY stream.
-
-## readline.moveCursor(stream, dx, dy)
-
-Move cursor relative to it's current position in a given TTY stream.
-
 ## readline.clearLine(stream, dir)
 
 Clears current line of given TTY stream in a specified direction.
@@ -312,3 +243,71 @@ Clears current line of given TTY stream in a specified direction.
 ## readline.clearScreenDown(stream)
 
 Clears the screen from the current position of the cursor down.
+
+## readline.createInterface(options)
+
+Creates a readline `Interface` instance. Accepts an "options" Object that takes
+the following values:
+
+ - `input` - the readable stream to listen to (Required).
+
+ - `output` - the writable stream to write readline data to (Optional).
+
+ - `completer` - an optional function that is used for Tab autocompletion. See
+   below for an example of using this.
+
+ - `terminal` - pass `true` if the `input` and `output` streams should be
+   treated like a TTY, and have ANSI/VT100 escape codes written to it.
+   Defaults to checking `isTTY` on the `output` stream upon instantiation.
+
+ - `historySize` - maximum number of history lines retained. Defaults to `30`.
+
+The `completer` function is given the current line entered by the user, and
+is supposed to return an Array with 2 entries:
+
+ 1. An Array with matching entries for the completion.
+
+ 2. The substring that was used for the matching.
+
+Which ends up looking something like:
+`[[substr1, substr2, ...], originalsubstring]`.
+
+Example:
+
+    function completer(line) {
+      var completions = '.help .error .exit .quit .q'.split(' ')
+      var hits = completions.filter(function(c) { return c.indexOf(line) == 0 })
+      // show all completions if none found
+      return [hits.length ? hits : completions, line]
+    }
+
+Also `completer` can be run in async mode if it accepts two arguments:
+
+    function completer(linePartial, callback) {
+      callback(null, [['123'], linePartial]);
+    }
+
+`createInterface` is commonly used with `process.stdin` and
+`process.stdout` in order to accept user input:
+
+    var readline = require('readline');
+    var rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+
+Once you have a readline instance, you most commonly listen for the
+`"line"` event.
+
+If `terminal` is `true` for this instance then the `output` stream will get
+the best compatibility if it defines an `output.columns` property, and fires
+a `"resize"` event on the `output` if/when the columns ever change
+(`process.stdout` does this automatically when it is a TTY).
+
+## readline.cursorTo(stream, x, y)
+
+Move cursor to the specified position in a given TTY stream.
+
+## readline.moveCursor(stream, dx, dy)
+
+Move cursor relative to it's current position in a given TTY stream.

From 18da02fa0f5e6729dc21c2e806b5819a14d03a1a Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 12:50:07 -0500
Subject: [PATCH 168/323] doc: sort modules alphabetically

Reorders, with no contextual changes, the modules documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/modules.markdown | 478 +++++++++++++++++++--------------------
 1 file changed, 236 insertions(+), 242 deletions(-)

diff --git a/doc/api/modules.markdown b/doc/api/modules.markdown
index 57cd78b36b6738..8212bd07c67627 100644
--- a/doc/api/modules.markdown
+++ b/doc/api/modules.markdown
@@ -57,6 +57,169 @@ The `square` module is defined in `square.js`:
 
 The module system is implemented in the `require("module")` module.
 
+## Accessing the main module
+
+<!-- type=misc -->
+
+When a file is run directly from Node.js, `require.main` is set to its
+`module`. That means that you can determine whether a file has been run
+directly by testing
+
+    require.main === module
+
+For a file `foo.js`, this will be `true` if run via `node foo.js`, but
+`false` if run by `require('./foo')`.
+
+Because `module` provides a `filename` property (normally equivalent to
+`__filename`), the entry point of the current application can be obtained
+by checking `require.main.filename`.
+
+## Addenda: Package Manager Tips
+
+<!-- type=misc -->
+
+The semantics of Node.js's `require()` function were designed to be general
+enough to support a number of sane directory structures. Package manager
+programs such as `dpkg`, `rpm`, and `npm` will hopefully find it possible to
+build native packages from Node.js modules without modification.
+
+Below we give a suggested directory structure that could work:
+
+Let's say that we wanted to have the folder at
+`/usr/lib/node/<some-package>/<some-version>` hold the contents of a
+specific version of a package.
+
+Packages can depend on one another. In order to install package `foo`, you
+may have to install a specific version of package `bar`.  The `bar` package
+may itself have dependencies, and in some cases, these dependencies may even
+collide or form cycles.
+
+Since Node.js looks up the `realpath` of any modules it loads (that is,
+resolves symlinks), and then looks for their dependencies in the
+`node_modules` folders as described above, this situation is very simple to
+resolve with the following architecture:
+
+* `/usr/lib/node/foo/1.2.3/` - Contents of the `foo` package, version 1.2.3.
+* `/usr/lib/node/bar/4.3.2/` - Contents of the `bar` package that `foo`
+  depends on.
+* `/usr/lib/node/foo/1.2.3/node_modules/bar` - Symbolic link to
+  `/usr/lib/node/bar/4.3.2/`.
+* `/usr/lib/node/bar/4.3.2/node_modules/*` - Symbolic links to the packages
+  that `bar` depends on.
+
+Thus, even if a cycle is encountered, or if there are dependency
+conflicts, every module will be able to get a version of its dependency
+that it can use.
+
+When the code in the `foo` package does `require('bar')`, it will get the
+version that is symlinked into `/usr/lib/node/foo/1.2.3/node_modules/bar`.
+Then, when the code in the `bar` package calls `require('quux')`, it'll get
+the version that is symlinked into
+`/usr/lib/node/bar/4.3.2/node_modules/quux`.
+
+Furthermore, to make the module lookup process even more optimal, rather
+than putting packages directly in `/usr/lib/node`, we could put them in
+`/usr/lib/node_modules/<name>/<version>`.  Then Node.js will not bother
+looking for missing dependencies in `/usr/node_modules` or `/node_modules`.
+
+In order to make modules available to the Node.js REPL, it might be useful to
+also add the `/usr/lib/node_modules` folder to the `$NODE_PATH` environment
+variable.  Since the module lookups using `node_modules` folders are all
+relative, and based on the real path of the files making the calls to
+`require()`, the packages themselves can be anywhere.
+
+## All Together...
+
+<!-- type=misc -->
+
+To get the exact filename that will be loaded when `require()` is called, use
+the `require.resolve()` function.
+
+Putting together all of the above, here is the high-level algorithm
+in pseudocode of what require.resolve does:
+
+    require(X) from module at path Y
+    1. If X is a core module,
+       a. return the core module
+       b. STOP
+    2. If X begins with './' or '/' or '../'
+       a. LOAD_AS_FILE(Y + X)
+       b. LOAD_AS_DIRECTORY(Y + X)
+    3. LOAD_NODE_MODULES(X, dirname(Y))
+    4. THROW "not found"
+
+    LOAD_AS_FILE(X)
+    1. If X is a file, load X as JavaScript text.  STOP
+    2. If X.js is a file, load X.js as JavaScript text.  STOP
+    3. If X.json is a file, parse X.json to a JavaScript Object.  STOP
+    4. If X.node is a file, load X.node as binary addon.  STOP
+
+    LOAD_AS_DIRECTORY(X)
+    1. If X/package.json is a file,
+       a. Parse X/package.json, and look for "main" field.
+       b. let M = X + (json main field)
+       c. LOAD_AS_FILE(M)
+    2. If X/index.js is a file, load X/index.js as JavaScript text.  STOP
+    3. If X/index.json is a file, parse X/index.json to a JavaScript object. STOP
+    4. If X/index.node is a file, load X/index.node as binary addon.  STOP
+
+    LOAD_NODE_MODULES(X, START)
+    1. let DIRS=NODE_MODULES_PATHS(START)
+    2. for each DIR in DIRS:
+       a. LOAD_AS_FILE(DIR/X)
+       b. LOAD_AS_DIRECTORY(DIR/X)
+
+    NODE_MODULES_PATHS(START)
+    1. let PARTS = path split(START)
+    2. let I = count of PARTS - 1
+    3. let DIRS = []
+    4. while I >= 0,
+       a. if PARTS[I] = "node_modules" CONTINUE
+       c. DIR = path join(PARTS[0 .. I] + "node_modules")
+       b. DIRS = DIRS + DIR
+       c. let I = I - 1
+    5. return DIRS
+
+## Caching
+
+<!--type=misc-->
+
+Modules are cached after the first time they are loaded.  This means
+(among other things) that every call to `require('foo')` will get
+exactly the same object returned, if it would resolve to the same file.
+
+Multiple calls to `require('foo')` may not cause the module code to be
+executed multiple times.  This is an important feature.  With it,
+"partially done" objects can be returned, thus allowing transitive
+dependencies to be loaded even when they would cause cycles.
+
+If you want to have a module execute code multiple times, then export a
+function, and call that function.
+
+### Module Caching Caveats
+
+<!--type=misc-->
+
+Modules are cached based on their resolved filename.  Since modules may
+resolve to a different filename based on the location of the calling
+module (loading from `node_modules` folders), it is not a *guarantee*
+that `require('foo')` will always return the exact same object, if it
+would resolve to different files.
+
+## Core Modules
+
+<!--type=misc-->
+
+Node.js has several modules compiled into the binary.  These modules are
+described in greater detail elsewhere in this documentation.
+
+The core modules are defined within Node.js's source and are located in the
+`lib/` folder.
+
+Core modules are always preferentially loaded if their identifier is
+passed to `require()`.  For instance, `require('http')` will always
+return the built in HTTP module, even if there is a file by that name.
+
 ## Cycles
 
 <!--type=misc-->
@@ -113,20 +276,6 @@ The output of this program would thus be:
 If you have cyclic module dependencies in your program, make sure to
 plan accordingly.
 
-## Core Modules
-
-<!--type=misc-->
-
-Node.js has several modules compiled into the binary.  These modules are
-described in greater detail elsewhere in this documentation.
-
-The core modules are defined within Node.js's source and are located in the
-`lib/` folder.
-
-Core modules are always preferentially loaded if their identifier is
-passed to `require()`.  For instance, `require('http')` will always
-return the built in HTTP module, even if there is a file by that name.
-
 ## File Modules
 
 <!--type=misc-->
@@ -153,36 +302,6 @@ either be a core module or is loaded from a `node_modules` folder.
 If the given path does not exist, `require()` will throw an Error with its
 `code` property set to `'MODULE_NOT_FOUND'`.
 
-## Loading from `node_modules` Folders
-
-<!--type=misc-->
-
-If the module identifier passed to `require()` is not a native module,
-and does not begin with `'/'`, `'../'`, or `'./'`, then Node.js starts at the
-parent directory of the current module, and adds `/node_modules`, and
-attempts to load the module from that location.
-
-If it is not found there, then it moves to the parent directory, and so
-on, until the root of the file system is reached.
-
-For example, if the file at `'/home/ry/projects/foo.js'` called
-`require('bar.js')`, then Node.js would look in the following locations, in
-this order:
-
-* `/home/ry/projects/node_modules/bar.js`
-* `/home/ry/node_modules/bar.js`
-* `/home/node_modules/bar.js`
-* `/node_modules/bar.js`
-
-This allows programs to localize their dependencies, so that they do not
-clash.
-
-You can require specific files or sub modules distributed with a module by
-including a path suffix after the module name. For instance
-`require('example-module/path/to/file')` would resolve `path/to/file`
-relative to where `example-module` is located. The suffixed path follows the
-same module resolution semantics.
-
 ## Folders as Modules
 
 <!--type=misc-->
@@ -213,31 +332,69 @@ example, then `require('./some-library')` would attempt to load:
 * `./some-library/index.js`
 * `./some-library/index.node`
 
-## Caching
+## Loading from `node_modules` Folders
 
 <!--type=misc-->
 
-Modules are cached after the first time they are loaded.  This means
-(among other things) that every call to `require('foo')` will get
-exactly the same object returned, if it would resolve to the same file.
+If the module identifier passed to `require()` is not a native module,
+and does not begin with `'/'`, `'../'`, or `'./'`, then Node.js starts at the
+parent directory of the current module, and adds `/node_modules`, and
+attempts to load the module from that location.
 
-Multiple calls to `require('foo')` may not cause the module code to be
-executed multiple times.  This is an important feature.  With it,
-"partially done" objects can be returned, thus allowing transitive
-dependencies to be loaded even when they would cause cycles.
+If it is not found there, then it moves to the parent directory, and so
+on, until the root of the file system is reached.
 
-If you want to have a module execute code multiple times, then export a
-function, and call that function.
+For example, if the file at `'/home/ry/projects/foo.js'` called
+`require('bar.js')`, then Node.js would look in the following locations, in
+this order:
 
-### Module Caching Caveats
+* `/home/ry/projects/node_modules/bar.js`
+* `/home/ry/node_modules/bar.js`
+* `/home/node_modules/bar.js`
+* `/node_modules/bar.js`
 
-<!--type=misc-->
+This allows programs to localize their dependencies, so that they do not
+clash.
 
-Modules are cached based on their resolved filename.  Since modules may
-resolve to a different filename based on the location of the calling
-module (loading from `node_modules` folders), it is not a *guarantee*
-that `require('foo')` will always return the exact same object, if it
-would resolve to different files.
+You can require specific files or sub modules distributed with a module by
+including a path suffix after the module name. For instance
+`require('example-module/path/to/file')` would resolve `path/to/file`
+relative to where `example-module` is located. The suffixed path follows the
+same module resolution semantics.
+
+## Loading from the global folders
+
+<!-- type=misc -->
+
+If the `NODE_PATH` environment variable is set to a colon-delimited list
+of absolute paths, then Node.js will search those paths for modules if they
+are not found elsewhere.  (Note: On Windows, `NODE_PATH` is delimited by
+semicolons instead of colons.)
+
+`NODE_PATH` was originally created to support loading modules from
+varying paths before the current
+[module resolution](https://nodejs.org/api/modules.html#modules_all_together)
+algorithm was frozen.
+
+`NODE_PATH` is still supported, but is less necessary now that the Node.js
+ecosystem has settled on a convention for locating dependent modules.
+Sometimes deployments that rely on `NODE_PATH` show surprising behavior
+when people are unaware that `NODE_PATH` must be set.  Sometimes a
+module's dependencies change, causing a different version (or even a
+different module) to be loaded as the `NODE_PATH` is searched.
+
+Additionally, Node.js will search in the following locations:
+
+* 1: `$HOME/.node_modules`
+* 2: `$HOME/.node_libraries`
+* 3: `$PREFIX/lib/node`
+
+Where `$HOME` is the user's home directory, and `$PREFIX` is Node.js's
+configured `node_prefix`.
+
+These are mostly for historic reasons.  **You are highly encouraged
+to place your dependencies locally in `node_modules` folders.**  They
+will be loaded faster, and more reliably.
 
 ## The `module` Object
 
@@ -251,6 +408,12 @@ representing the current module.  For convenience, `module.exports` is
 also accessible via the `exports` module-global. `module` isn't actually
 a global but rather local to each module.
 
+### module.children
+
+* {Array}
+
+The module objects required by this one.
+
 ### module.exports
 
 * {Object}
@@ -318,19 +481,11 @@ To illustrate the behavior, imagine this hypothetical implementation of
 As a guideline, if the relationship between `exports` and `module.exports`
 seems like magic to you, ignore `exports` and only use `module.exports`.
 
-### module.require(id)
-
-* `id` {String}
-* Return: {Object} `module.exports` from the resolved module
-
-The `module.require` method provides a way to load a module as if
-`require()` was called from the original module.
+### module.filename
 
-Note that in order to do this, you must get a reference to the `module`
-object.  Since `require()` returns the `module.exports`, and the `module` is
-typically *only* available within a specific module's code, it must be
-explicitly exported in order to be used.
+* {String}
 
+The fully resolved filename to the module.
 
 ### module.id
 
@@ -339,14 +494,6 @@ explicitly exported in order to be used.
 The identifier for the module.  Typically this is the fully resolved
 filename.
 
-
-### module.filename
-
-* {String}
-
-The fully resolved filename to the module.
-
-
 ### module.loaded
 
 * {Boolean}
@@ -354,174 +501,21 @@ The fully resolved filename to the module.
 Whether or not the module is done loading, or is in the process of
 loading.
 
-
 ### module.parent
 
 * {Module Object}
 
 The module that first required this one.
 
-### module.children
-
-* {Array}
-
-The module objects required by this one.
-
-
-
-## All Together...
-
-<!-- type=misc -->
-
-To get the exact filename that will be loaded when `require()` is called, use
-the `require.resolve()` function.
-
-Putting together all of the above, here is the high-level algorithm
-in pseudocode of what require.resolve does:
-
-    require(X) from module at path Y
-    1. If X is a core module,
-       a. return the core module
-       b. STOP
-    2. If X begins with './' or '/' or '../'
-       a. LOAD_AS_FILE(Y + X)
-       b. LOAD_AS_DIRECTORY(Y + X)
-    3. LOAD_NODE_MODULES(X, dirname(Y))
-    4. THROW "not found"
-
-    LOAD_AS_FILE(X)
-    1. If X is a file, load X as JavaScript text.  STOP
-    2. If X.js is a file, load X.js as JavaScript text.  STOP
-    3. If X.json is a file, parse X.json to a JavaScript Object.  STOP
-    4. If X.node is a file, load X.node as binary addon.  STOP
-
-    LOAD_AS_DIRECTORY(X)
-    1. If X/package.json is a file,
-       a. Parse X/package.json, and look for "main" field.
-       b. let M = X + (json main field)
-       c. LOAD_AS_FILE(M)
-    2. If X/index.js is a file, load X/index.js as JavaScript text.  STOP
-    3. If X/index.json is a file, parse X/index.json to a JavaScript object. STOP
-    4. If X/index.node is a file, load X/index.node as binary addon.  STOP
-
-    LOAD_NODE_MODULES(X, START)
-    1. let DIRS=NODE_MODULES_PATHS(START)
-    2. for each DIR in DIRS:
-       a. LOAD_AS_FILE(DIR/X)
-       b. LOAD_AS_DIRECTORY(DIR/X)
-
-    NODE_MODULES_PATHS(START)
-    1. let PARTS = path split(START)
-    2. let I = count of PARTS - 1
-    3. let DIRS = []
-    4. while I >= 0,
-       a. if PARTS[I] = "node_modules" CONTINUE
-       c. DIR = path join(PARTS[0 .. I] + "node_modules")
-       b. DIRS = DIRS + DIR
-       c. let I = I - 1
-    5. return DIRS
-
-## Loading from the global folders
-
-<!-- type=misc -->
-
-If the `NODE_PATH` environment variable is set to a colon-delimited list
-of absolute paths, then Node.js will search those paths for modules if they
-are not found elsewhere.  (Note: On Windows, `NODE_PATH` is delimited by
-semicolons instead of colons.)
-
-`NODE_PATH` was originally created to support loading modules from
-varying paths before the current
-[module resolution](https://nodejs.org/api/modules.html#modules_all_together)
-algorithm was frozen.
-
-`NODE_PATH` is still supported, but is less necessary now that the Node.js
-ecosystem has settled on a convention for locating dependent modules.
-Sometimes deployments that rely on `NODE_PATH` show surprising behavior
-when people are unaware that `NODE_PATH` must be set.  Sometimes a
-module's dependencies change, causing a different version (or even a
-different module) to be loaded as the `NODE_PATH` is searched.
-
-Additionally, Node.js will search in the following locations:
-
-* 1: `$HOME/.node_modules`
-* 2: `$HOME/.node_libraries`
-* 3: `$PREFIX/lib/node`
-
-Where `$HOME` is the user's home directory, and `$PREFIX` is Node.js's
-configured `node_prefix`.
-
-These are mostly for historic reasons.  **You are highly encouraged
-to place your dependencies locally in `node_modules` folders.**  They
-will be loaded faster, and more reliably.
-
-## Accessing the main module
-
-<!-- type=misc -->
-
-When a file is run directly from Node.js, `require.main` is set to its
-`module`. That means that you can determine whether a file has been run
-directly by testing
-
-    require.main === module
-
-For a file `foo.js`, this will be `true` if run via `node foo.js`, but
-`false` if run by `require('./foo')`.
-
-Because `module` provides a `filename` property (normally equivalent to
-`__filename`), the entry point of the current application can be obtained
-by checking `require.main.filename`.
-
-## Addenda: Package Manager Tips
-
-<!-- type=misc -->
-
-The semantics of Node.js's `require()` function were designed to be general
-enough to support a number of sane directory structures. Package manager
-programs such as `dpkg`, `rpm`, and `npm` will hopefully find it possible to
-build native packages from Node.js modules without modification.
-
-Below we give a suggested directory structure that could work:
-
-Let's say that we wanted to have the folder at
-`/usr/lib/node/<some-package>/<some-version>` hold the contents of a
-specific version of a package.
-
-Packages can depend on one another. In order to install package `foo`, you
-may have to install a specific version of package `bar`.  The `bar` package
-may itself have dependencies, and in some cases, these dependencies may even
-collide or form cycles.
-
-Since Node.js looks up the `realpath` of any modules it loads (that is,
-resolves symlinks), and then looks for their dependencies in the
-`node_modules` folders as described above, this situation is very simple to
-resolve with the following architecture:
-
-* `/usr/lib/node/foo/1.2.3/` - Contents of the `foo` package, version 1.2.3.
-* `/usr/lib/node/bar/4.3.2/` - Contents of the `bar` package that `foo`
-  depends on.
-* `/usr/lib/node/foo/1.2.3/node_modules/bar` - Symbolic link to
-  `/usr/lib/node/bar/4.3.2/`.
-* `/usr/lib/node/bar/4.3.2/node_modules/*` - Symbolic links to the packages
-  that `bar` depends on.
-
-Thus, even if a cycle is encountered, or if there are dependency
-conflicts, every module will be able to get a version of its dependency
-that it can use.
+### module.require(id)
 
-When the code in the `foo` package does `require('bar')`, it will get the
-version that is symlinked into `/usr/lib/node/foo/1.2.3/node_modules/bar`.
-Then, when the code in the `bar` package calls `require('quux')`, it'll get
-the version that is symlinked into
-`/usr/lib/node/bar/4.3.2/node_modules/quux`.
+* `id` {String}
+* Return: {Object} `module.exports` from the resolved module
 
-Furthermore, to make the module lookup process even more optimal, rather
-than putting packages directly in `/usr/lib/node`, we could put them in
-`/usr/lib/node_modules/<name>/<version>`.  Then Node.js will not bother
-looking for missing dependencies in `/usr/node_modules` or `/node_modules`.
+The `module.require` method provides a way to load a module as if
+`require()` was called from the original module.
 
-In order to make modules available to the Node.js REPL, it might be useful to
-also add the `/usr/lib/node_modules` folder to the `$NODE_PATH` environment
-variable.  Since the module lookups using `node_modules` folders are all
-relative, and based on the real path of the files making the calls to
-`require()`, the packages themselves can be anywhere.
+Note that in order to do this, you must get a reference to the `module`
+object.  Since `require()` returns the `module.exports`, and the `module` is
+typically *only* available within a specific module's code, it must be
+explicitly exported in order to be used.

From 6e9d01c7d88f2e57c539ede714322e3185afa8bf Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 17:56:03 -0500
Subject: [PATCH 169/323] doc: sort http alphabetically

Reorders, with no contextual changes, the http documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/http.markdown | 1394 ++++++++++++++++++++---------------------
 1 file changed, 692 insertions(+), 702 deletions(-)

diff --git a/doc/api/http.markdown b/doc/api/http.markdown
index 8ac89b1f388a59..2e4775398c68dc 100644
--- a/doc/api/http.markdown
+++ b/doc/api/http.markdown
@@ -43,906 +43,747 @@ list like the following:
       'Host', 'mysite.com',
       'accepT', '*/*' ]
 
-## http.METHODS
-
-* {Array}
-
-A list of the HTTP methods that are supported by the parser.
-
-## http.STATUS_CODES
-
-* {Object}
-
-A collection of all the standard HTTP response status codes, and the
-short description of each.  For example, `http.STATUS_CODES[404] === 'Not
-Found'`.
-
-## http.createServer([requestListener])
-
-Returns a new instance of [http.Server](#http_class_http_server).
-
-The `requestListener` is a function which is automatically
-added to the `'request'` event.
-
-## http.createClient([port][, host])
-
-    Stability: 0 - Deprecated: Use [http.request][] instead.
-
-Constructs a new HTTP client. `port` and `host` refer to the server to be
-connected to.
-
-## Class: http.Server
-
-This is an [EventEmitter][] with the following events:
-
-### Event: 'request'
-
-`function (request, response) { }`
-
-Emitted each time there is a request. Note that there may be multiple requests
-per connection (in the case of keep-alive connections).
- `request` is an instance of [http.IncomingMessage][] and `response` is
-an instance of [http.ServerResponse][].
-
-### Event: 'connection'
-
-`function (socket) { }`
-
-When a new TCP stream is established. `socket` is an object of type
-`net.Socket`. Usually users will not want to access this event. In
-particular, the socket will not emit `readable` events because of how
-the protocol parser attaches to the socket. The `socket` can also be
-accessed at `request.connection`.
-
-### Event: 'close'
-
-`function () { }`
-
-Emitted when the server closes.
-
-### Event: 'checkContinue'
-
-`function (request, response) { }`
-
-Emitted each time a request with an http Expect: 100-continue is received.
-If this event isn't listened for, the server will automatically respond
-with a 100 Continue as appropriate.
-
-Handling this event involves calling [response.writeContinue()][] if the client
-should continue to send the request body, or generating an appropriate HTTP
-response (e.g., 400 Bad Request) if the client should not continue to send the
-request body.
-
-Note that when this event is emitted and handled, the `request` event will
-not be emitted.
-
-### Event: 'connect'
-
-`function (request, socket, head) { }`
-
-Emitted each time a client requests a http CONNECT method. If this event isn't
-listened for, then clients requesting a CONNECT method will have their
-connections closed.
-
-* `request` is the arguments for the http request, as it is in the request
-  event.
-* `socket` is the network socket between the server and client.
-* `head` is an instance of Buffer, the first packet of the tunneling stream,
-  this may be empty.
-
-After this event is emitted, the request's socket will not have a `data`
-event listener, meaning you will need to bind to it in order to handle data
-sent to the server on that socket.
-
-### Event: 'upgrade'
-
-`function (request, socket, head) { }`
-
-Emitted each time a client requests a http upgrade. If this event isn't
-listened for, then clients requesting an upgrade will have their connections
-closed.
-
-* `request` is the arguments for the http request, as it is in the request
-  event.
-* `socket` is the network socket between the server and client.
-* `head` is an instance of Buffer, the first packet of the upgraded stream,
-  this may be empty.
-
-After this event is emitted, the request's socket will not have a `data`
-event listener, meaning you will need to bind to it in order to handle data
-sent to the server on that socket.
-
-### Event: 'clientError'
-
-`function (exception, socket) { }`
-
-If a client connection emits an 'error' event, it will be forwarded here.
-
-`socket` is the `net.Socket` object that the error originated from.
-
-
-### server.listen(port[, hostname][, backlog][, callback])
+## Class: http.Agent
 
-Begin accepting connections on the specified `port` and `hostname`. If the
-`hostname` is omitted, the server will accept connections on any IPv6 address
-(`::`) when IPv6 is available, or any IPv4 address (`0.0.0.0`) otherwise. A
-port value of zero will assign a random port.
+The HTTP Agent is used for pooling sockets used in HTTP client
+requests.
 
-To listen to a unix socket, supply a filename instead of port and hostname.
+The HTTP Agent also defaults client requests to using
+Connection:keep-alive. If no pending HTTP requests are waiting on a
+socket to become free the socket is closed. This means that Node.js's
+pool has the benefit of keep-alive when under load but still does not
+require developers to manually close the HTTP clients using
+KeepAlive.
 
-Backlog is the maximum length of the queue of pending connections.
-The actual length will be determined by your OS through sysctl settings such as
-`tcp_max_syn_backlog` and `somaxconn` on linux. The default value of this
-parameter is 511 (not 512).
+If you opt into using HTTP KeepAlive, you can create an Agent object
+with that flag set to `true`.  (See the [constructor
+options](#http_new_agent_options) below.)  Then, the Agent will keep
+unused sockets in a pool for later use.  They will be explicitly
+marked so as to not keep the Node.js process running.  However, it is
+still a good idea to explicitly [`destroy()`](#http_agent_destroy)
+KeepAlive agents when they are no longer in use, so that the Sockets
+will be shut down.
 
-This function is asynchronous. The last parameter `callback` will be added as
-a listener for the ['listening'][] event.  See also [net.Server.listen(port)][].
+Sockets are removed from the agent's pool when the socket emits either
+a "close" event or a special "agentRemove" event. This means that if
+you intend to keep one HTTP request open for a long time and don't
+want it to stay in the pool you can do something along the lines of:
 
+    http.get(options, function(res) {
+      // Do stuff
+    }).on("socket", function (socket) {
+      socket.emit("agentRemove");
+    });
 
-### server.listen(path[, callback])
+Alternatively, you could just opt out of pooling entirely using
+`agent:false`:
 
-Start a UNIX socket server listening for connections on the given `path`.
+    http.get({
+      hostname: 'localhost',
+      port: 80,
+      path: '/',
+      agent: false  // create a new agent just for this one request
+    }, function (res) {
+      // Do stuff with response
+    })
 
-This function is asynchronous. The last parameter `callback` will be added as
-a listener for the ['listening'][] event.  See also [net.Server.listen(path)][].
+### new Agent([options])
 
+* `options` {Object} Set of configurable options to set on the agent.
+  Can have the following fields:
+  * `keepAlive` {Boolean} Keep sockets around in a pool to be used by
+    other requests in the future. Default = `false`
+  * `keepAliveMsecs` {Integer} When using HTTP KeepAlive, how often
+    to send TCP KeepAlive packets over sockets being kept alive.
+    Default = `1000`.  Only relevant if `keepAlive` is set to `true`.
+  * `maxSockets` {Number} Maximum number of sockets to allow per
+    host.  Default = `Infinity`.
+  * `maxFreeSockets` {Number} Maximum number of sockets to leave open
+    in a free state.  Only relevant if `keepAlive` is set to `true`.
+    Default = `256`.
 
-### server.listen(handle[, callback])
+The default `http.globalAgent` that is used by `http.request` has all
+of these values set to their respective defaults.
 
-* `handle` {Object}
-* `callback` {Function}
+To configure any of them, you must create your own `Agent` object.
 
-The `handle` object can be set to either a server or socket (anything
-with an underlying `_handle` member), or a `{fd: <n>}` object.
+```javascript
+var http = require('http');
+var keepAliveAgent = new http.Agent({ keepAlive: true });
+options.agent = keepAliveAgent;
+http.request(options, onResponseCallback);
+```
 
-This will cause the server to accept connections on the specified
-handle, but it is presumed that the file descriptor or handle has
-already been bound to a port or domain socket.
+### agent.destroy()
 
-Listening on a file descriptor is not supported on Windows.
+Destroy any sockets that are currently in use by the agent.
 
-This function is asynchronous. The last parameter `callback` will be added as
-a listener for the ['listening'](net.html#net_event_listening) event.
-See also [net.Server.listen()](net.html#net_server_listen_handle_callback).
+It is usually not necessary to do this.  However, if you are using an
+agent with KeepAlive enabled, then it is best to explicitly shut down
+the agent when you know that it will no longer be used.  Otherwise,
+sockets may hang open for quite a long time before the server
+terminates them.
 
-### server.close([callback])
+### agent.freeSockets
 
-Stops the server from accepting new connections.  See [net.Server.close()][].
+An object which contains arrays of sockets currently awaiting use by
+the Agent when HTTP KeepAlive is used.  Do not modify.
 
+### agent.getName(options)
 
-### server.maxHeadersCount
+Get a unique name for a set of request options, to determine whether a
+connection can be reused.  In the http agent, this returns
+`host:port:localAddress`.  In the https agent, the name includes the
+CA, cert, ciphers, and other HTTPS/TLS-specific options that determine
+socket reusability.
 
-Limits maximum incoming headers count, equal to 1000 by default. If set to 0 -
-no limit will be applied.
+### agent.maxFreeSockets
 
-### server.setTimeout(msecs, callback)
+By default set to 256.  For Agents supporting HTTP KeepAlive, this
+sets the maximum number of sockets that will be left open in the free
+state.
 
-* `msecs` {Number}
-* `callback` {Function}
+### agent.maxSockets
 
-Sets the timeout value for sockets, and emits a `'timeout'` event on
-the Server object, passing the socket as an argument, if a timeout
-occurs.
+By default set to Infinity. Determines how many concurrent sockets the agent
+can have open per origin. Origin is either a 'host:port' or
+'host:port:localAddress' combination.
 
-If there is a `'timeout'` event listener on the Server object, then it
-will be called with the timed-out socket as an argument.
+### agent.requests
 
-By default, the Server's timeout value is 2 minutes, and sockets are
-destroyed automatically if they time out.  However, if you assign a
-callback to the Server's `'timeout'` event, then you are responsible
-for handling socket timeouts.
+An object which contains queues of requests that have not yet been assigned to
+sockets. Do not modify.
 
-Returns `server`.
+### agent.sockets
 
-### server.timeout
+An object which contains arrays of sockets currently in use by the
+Agent.  Do not modify.
 
-* {Number} Default = 120000 (2 minutes)
+## Class: http.ClientRequest
 
-The number of milliseconds of inactivity before a socket is presumed
-to have timed out.
+This object is created internally and returned from `http.request()`.  It
+represents an _in-progress_ request whose header has already been queued.  The
+header is still mutable using the `setHeader(name, value)`, `getHeader(name)`,
+`removeHeader(name)` API.  The actual header will be sent along with the first
+data chunk or when closing the connection.
 
-Note that the socket timeout logic is set up on connection, so
-changing this value only affects *new* connections to the server, not
-any existing connections.
+To get the response, add a listener for `'response'` to the request object.
+`'response'` will be emitted from the request object when the response
+headers have been received.  The `'response'` event is executed with one
+argument which is an instance of [http.IncomingMessage][].
 
-Set to 0 to disable any kind of automatic timeout behavior on incoming
-connections.
+During the `'response'` event, one can add listeners to the
+response object; particularly to listen for the `'data'` event.
 
-## Class: http.ServerResponse
+If no `'response'` handler is added, then the response will be
+entirely discarded.  However, if you add a `'response'` event handler,
+then you **must** consume the data from the response object, either by
+calling `response.read()` whenever there is a `'readable'` event, or
+by adding a `'data'` handler, or by calling the `.resume()` method.
+Until the data is consumed, the `'end'` event will not fire.  Also, until
+the data is read it will consume memory that can eventually lead to a
+'process out of memory' error.
 
-This object is created internally by a HTTP server--not by the user. It is
-passed as the second parameter to the `'request'` event.
+Note: Node.js does not check whether Content-Length and the length of the body
+which has been transmitted are equal or not.
 
-The response implements the [Writable Stream][] interface. This is an
+The request implements the [Writable Stream][] interface. This is an
 [EventEmitter][] with the following events:
 
-### Event: 'close'
-
-`function () { }`
-
-Indicates that the underlying connection was terminated before
-[response.end()][] was called or able to flush.
-
-### Event: 'finish'
+### Event: 'abort'
 
 `function () { }`
 
-Emitted when the response has been sent. More specifically, this event is
-emitted when the last segment of the response headers and body have been
-handed off to the operating system for transmission over the network. It
-does not imply that the client has received anything yet.
-
-After this event, no more events will be emitted on the response object.
-
-### response.writeContinue()
+Emitted when the request has been aborted by the client. This event is only
+emitted on the first call to `abort()`.
 
-Sends a HTTP/1.1 100 Continue message to the client, indicating that
-the request body should be sent. See the ['checkContinue'][] event on `Server`.
+### Event: 'connect'
 
-### response.writeHead(statusCode[, statusMessage][, headers])
+`function (response, socket, head) { }`
 
-Sends a response header to the request. The status code is a 3-digit HTTP
-status code, like `404`. The last argument, `headers`, are the response headers.
-Optionally one can give a human-readable `statusMessage` as the second
-argument.
+Emitted each time a server responds to a request with a CONNECT method. If this
+event isn't being listened for, clients receiving a CONNECT method will have
+their connections closed.
 
-Example:
+A client server pair that show you how to listen for the `connect` event.
 
-    var body = 'hello world';
-    response.writeHead(200, {
-      'Content-Length': body.length,
-      'Content-Type': 'text/plain' });
+    var http = require('http');
+    var net = require('net');
+    var url = require('url');
 
-This method must only be called once on a message and it must
-be called before [response.end()][] is called.
+    // Create an HTTP tunneling proxy
+    var proxy = http.createServer(function (req, res) {
+      res.writeHead(200, {'Content-Type': 'text/plain'});
+      res.end('okay');
+    });
+    proxy.on('connect', function(req, cltSocket, head) {
+      // connect to an origin server
+      var srvUrl = url.parse('http://' + req.url);
+      var srvSocket = net.connect(srvUrl.port, srvUrl.hostname, function() {
+        cltSocket.write('HTTP/1.1 200 Connection Established\r\n' +
+                        'Proxy-agent: Node.js-Proxy\r\n' +
+                        '\r\n');
+        srvSocket.write(head);
+        srvSocket.pipe(cltSocket);
+        cltSocket.pipe(srvSocket);
+      });
+    });
 
-If you call [response.write()][] or [response.end()][] before calling this, the
-implicit/mutable headers will be calculated and call this function for you.
+    // now that proxy is running
+    proxy.listen(1337, '127.0.0.1', function() {
 
-Note that Content-Length is given in bytes not characters. The above example
-works because the string `'hello world'` contains only single byte characters.
-If the body contains higher coded characters then `Buffer.byteLength()`
-should be used to determine the number of bytes in a given encoding.
-And Node.js does not check whether Content-Length and the length of the body
-which has been transmitted are equal or not.
+      // make a request to a tunneling proxy
+      var options = {
+        port: 1337,
+        hostname: '127.0.0.1',
+        method: 'CONNECT',
+        path: 'www.google.com:80'
+      };
 
-### response.setTimeout(msecs, callback)
+      var req = http.request(options);
+      req.end();
 
-* `msecs` {Number}
-* `callback` {Function}
+      req.on('connect', function(res, socket, head) {
+        console.log('got connected!');
 
-Sets the Socket's timeout value to `msecs`.  If a callback is
-provided, then it is added as a listener on the `'timeout'` event on
-the response object.
+        // make a request over an HTTP tunnel
+        socket.write('GET / HTTP/1.1\r\n' +
+                     'Host: www.google.com:80\r\n' +
+                     'Connection: close\r\n' +
+                     '\r\n');
+        socket.on('data', function(chunk) {
+          console.log(chunk.toString());
+        });
+        socket.on('end', function() {
+          proxy.close();
+        });
+      });
+    });
 
-If no `'timeout'` listener is added to the request, the response, or
-the server, then sockets are destroyed when they time out.  If you
-assign a handler on the request, the response, or the server's
-`'timeout'` events, then it is your responsibility to handle timed out
-sockets.
+### Event: 'continue'
 
-Returns `response`.
+`function () { }`
 
-### response.statusCode
+Emitted when the server sends a '100 Continue' HTTP response, usually because
+the request contained 'Expect: 100-continue'. This is an instruction that
+the client should send the request body.
 
-When using implicit headers (not calling [response.writeHead()][] explicitly),
-this property controls the status code that will be sent to the client when
-the headers get flushed.
+### Event: 'response'
 
-Example:
+`function (response) { }`
 
-    response.statusCode = 404;
+Emitted when a response is received to this request. This event is emitted only
+once. The `response` argument will be an instance of [http.IncomingMessage][].
 
-After response header was sent to the client, this property indicates the
-status code which was sent out.
+Options:
 
-### response.statusMessage
+- `host`: A domain name or IP address of the server to issue the request to.
+- `port`: Port of remote server.
+- `socketPath`: Unix Domain Socket (use one of host:port or socketPath)
 
-When using implicit headers (not calling `response.writeHead()` explicitly), this property
-controls the status message that will be sent to the client when the headers get
-flushed. If this is left as `undefined` then the standard message for the status
-code will be used.
+### Event: 'socket'
 
-Example:
+`function (socket) { }`
 
-    response.statusMessage = 'Not found';
+Emitted after a socket is assigned to this request.
 
-After response header was sent to the client, this property indicates the
-status message which was sent out.
+### Event: 'upgrade'
 
-### response.setHeader(name, value)
+`function (response, socket, head) { }`
 
-Sets a single header value for implicit headers.  If this header already exists
-in the to-be-sent headers, its value will be replaced.  Use an array of strings
-here if you need to send multiple headers with the same name.
+Emitted each time a server responds to a request with an upgrade. If this
+event isn't being listened for, clients receiving an upgrade header will have
+their connections closed.
 
-Example:
+A client server pair that show you how to listen for the `upgrade` event.
 
-    response.setHeader("Content-Type", "text/html");
+    var http = require('http');
 
-or
+    // Create an HTTP server
+    var srv = http.createServer(function (req, res) {
+      res.writeHead(200, {'Content-Type': 'text/plain'});
+      res.end('okay');
+    });
+    srv.on('upgrade', function(req, socket, head) {
+      socket.write('HTTP/1.1 101 Web Socket Protocol Handshake\r\n' +
+                   'Upgrade: WebSocket\r\n' +
+                   'Connection: Upgrade\r\n' +
+                   '\r\n');
 
-    response.setHeader("Set-Cookie", ["type=ninja", "language=javascript"]);
+      socket.pipe(socket); // echo back
+    });
 
-Attempting to set a header field name that contains invalid characters will
-result in a `TypeError` being thrown.
+    // now that server is running
+    srv.listen(1337, '127.0.0.1', function() {
 
-### response.headersSent
+      // make a request
+      var options = {
+        port: 1337,
+        hostname: '127.0.0.1',
+        headers: {
+          'Connection': 'Upgrade',
+          'Upgrade': 'websocket'
+        }
+      };
 
-Boolean (read-only). True if headers were sent, false otherwise.
+      var req = http.request(options);
+      req.end();
 
-### response.sendDate
+      req.on('upgrade', function(res, socket, upgradeHead) {
+        console.log('got upgraded!');
+        socket.end();
+        process.exit(0);
+      });
+    });
 
-When true, the Date header will be automatically generated and sent in
-the response if it is not already present in the headers. Defaults to true.
+### request.abort()
 
-This should only be disabled for testing; HTTP requires the Date header
-in responses.
+Marks the request as aborting. Calling this will cause remaining data
+in the response to be dropped and the socket to be destroyed.
 
-### response.getHeader(name)
+### request.end([data][, encoding][, callback])
 
-Reads out a header that's already been queued but not sent to the client.  Note
-that the name is case insensitive.  This can only be called before headers get
-implicitly flushed.
+Finishes sending the request. If any parts of the body are
+unsent, it will flush them to the stream. If the request is
+chunked, this will send the terminating `'0\r\n\r\n'`.
 
-Example:
+If `data` is specified, it is equivalent to calling
+`request.write(data, encoding)` followed by `request.end(callback)`.
 
-    var contentType = response.getHeader('content-type');
+If `callback` is specified, it will be called when the request stream
+is finished.
 
-### response.removeHeader(name)
+### request.flushHeaders()
 
-Removes a header that's queued for implicit sending.
+Flush the request headers.
 
-Example:
+For efficiency reasons, Node.js normally buffers the request headers until you
+call `request.end()` or write the first chunk of request data.  It then tries
+hard to pack the request headers and data into a single TCP packet.
 
-    response.removeHeader("Content-Encoding");
+That's usually what you want (it saves a TCP round-trip) but not when the first
+data isn't sent until possibly much later.  `request.flushHeaders()` lets you bypass
+the optimization and kickstart the request.
 
+### request.setNoDelay([noDelay])
 
-### response.write(chunk[, encoding][, callback])
+Once a socket is assigned to this request and is connected
+[socket.setNoDelay()][] will be called.
 
-If this method is called and [response.writeHead()][] has not been called,
-it will switch to implicit header mode and flush the implicit headers.
+### request.setSocketKeepAlive([enable][, initialDelay])
 
-This sends a chunk of the response body. This method may
-be called multiple times to provide successive parts of the body.
+Once a socket is assigned to this request and is connected
+[socket.setKeepAlive()][] will be called.
 
-`chunk` can be a string or a buffer. If `chunk` is a string,
-the second parameter specifies how to encode it into a byte stream.
-By default the `encoding` is `'utf8'`. The last parameter `callback`
-will be called when this chunk of data is flushed.
+### request.setTimeout(timeout[, callback])
 
-**Note**: This is the raw HTTP body and has nothing to do with
-higher-level multi-part body encodings that may be used.
+Once a socket is assigned to this request and is connected
+[socket.setTimeout()][] will be called.
 
-The first time `response.write()` is called, it will send the buffered
-header information and the first body to the client. The second time
-`response.write()` is called, Node.js assumes you're going to be streaming
-data, and sends that separately. That is, the response is buffered up to the
-first chunk of body.
+### request.write(chunk[, encoding][, callback])
 
-Returns `true` if the entire data was flushed successfully to the kernel
-buffer. Returns `false` if all or part of the data was queued in user memory.
-`'drain'` will be emitted when the buffer is free again.
+Sends a chunk of the body.  By calling this method
+many times, the user can stream a request body to a
+server--in that case it is suggested to use the
+`['Transfer-Encoding', 'chunked']` header line when
+creating the request.
 
-### response.addTrailers(headers)
+The `chunk` argument should be a [Buffer][] or a string.
 
-This method adds HTTP trailing headers (a header but at the end of the
-message) to the response.
+The `encoding` argument is optional and only applies when `chunk` is a string.
+Defaults to `'utf8'`.
 
-Trailers will **only** be emitted if chunked encoding is used for the
-response; if it is not (e.g., if the request was HTTP/1.0), they will
-be silently discarded.
+The `callback` argument is optional and will be called when this chunk of data
+is flushed.
 
-Note that HTTP requires the `Trailer` header to be sent if you intend to
-emit trailers, with a list of the header fields in its value. E.g.,
+Returns `request`.
 
-    response.writeHead(200, { 'Content-Type': 'text/plain',
-                              'Trailer': 'Content-MD5' });
-    response.write(fileData);
-    response.addTrailers({'Content-MD5': "7895bf4b8828b55ceaf47747b4bca667"});
-    response.end();
+## Class: http.Server
 
-Attempting to set a trailer field name that contains invalid characters will
-result in a `TypeError` being thrown.
+This is an [EventEmitter][] with the following events:
 
-### response.end([data][, encoding][, callback])
+### Event: 'checkContinue'
 
-This method signals to the server that all of the response headers and body
-have been sent; that server should consider this message complete.
-The method, `response.end()`, MUST be called on each
-response.
+`function (request, response) { }`
 
-If `data` is specified, it is equivalent to calling
-`response.write(data, encoding)` followed by `response.end(callback)`.
+Emitted each time a request with an http Expect: 100-continue is received.
+If this event isn't listened for, the server will automatically respond
+with a 100 Continue as appropriate.
 
-If `callback` is specified, it will be called when the response stream
-is finished.
+Handling this event involves calling [response.writeContinue()][] if the client
+should continue to send the request body, or generating an appropriate HTTP
+response (e.g., 400 Bad Request) if the client should not continue to send the
+request body.
 
-### response.finished
+Note that when this event is emitted and handled, the `request` event will
+not be emitted.
 
-Boolean value that indicates whether the response has completed. Starts
-as `false`. After `response.end()` executes, the value will be `true`.
+### Event: 'clientError'
 
-## http.request(options[, callback])
+`function (exception, socket) { }`
 
-Node.js maintains several connections per server to make HTTP requests.
-This function allows one to transparently issue requests.
+If a client connection emits an 'error' event, it will be forwarded here.
 
-`options` can be an object or a string. If `options` is a string, it is
-automatically parsed with [url.parse()][].
+`socket` is the `net.Socket` object that the error originated from.
 
-Options:
+### Event: 'close'
 
-- `protocol`: Protocol to use. Defaults to `'http'`.
-- `host`: A domain name or IP address of the server to issue the request to.
-  Defaults to `'localhost'`.
-- `hostname`: Alias for `host`. To support `url.parse()` `hostname` is
-  preferred over `host`.
-- `family`: IP address family to use when resolving `host` and `hostname`.
-  Valid values are `4` or `6`. When unspecified, both IP v4 and v6 will be
-  used.
-- `port`: Port of remote server. Defaults to 80.
-- `localAddress`: Local interface to bind for network connections.
-- `socketPath`: Unix Domain Socket (use one of host:port or socketPath).
-- `method`: A string specifying the HTTP request method. Defaults to `'GET'`.
-- `path`: Request path. Defaults to `'/'`. Should include query string if any.
-  E.G. `'/index.html?page=12'`. An exception is thrown when the request path
-  contains illegal characters. Currently, only spaces are rejected but that
-  may change in the future.
-- `headers`: An object containing request headers.
-- `auth`: Basic authentication i.e. `'user:password'` to compute an
-  Authorization header.
-- `agent`: Controls [Agent][] behavior. When an Agent is used request will
-  default to `Connection: keep-alive`. Possible values:
- - `undefined` (default): use [globalAgent][] for this host and port.
- - `Agent` object: explicitly use the passed in `Agent`.
- - `false`: opts out of connection pooling with an Agent, defaults request to
-   `Connection: close`.
+`function () { }`
 
-The optional `callback` parameter will be added as a one time listener for
-the ['response'][] event.
+Emitted when the server closes.
 
-`http.request()` returns an instance of the [http.ClientRequest][]
-class. The `ClientRequest` instance is a writable stream. If one needs to
-upload a file with a POST request, then write to the `ClientRequest` object.
+### Event: 'connect'
 
-Example:
+`function (request, socket, head) { }`
 
-    var postData = querystring.stringify({
-      'msg' : 'Hello World!'
-    });
+Emitted each time a client requests a http CONNECT method. If this event isn't
+listened for, then clients requesting a CONNECT method will have their
+connections closed.
 
-    var options = {
-      hostname: 'www.google.com',
-      port: 80,
-      path: '/upload',
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        'Content-Length': postData.length
-      }
-    };
+* `request` is the arguments for the http request, as it is in the request
+  event.
+* `socket` is the network socket between the server and client.
+* `head` is an instance of Buffer, the first packet of the tunneling stream,
+  this may be empty.
 
-    var req = http.request(options, function(res) {
-      console.log('STATUS: ' + res.statusCode);
-      console.log('HEADERS: ' + JSON.stringify(res.headers));
-      res.setEncoding('utf8');
-      res.on('data', function (chunk) {
-        console.log('BODY: ' + chunk);
-      });
-      res.on('end', function() {
-        console.log('No more data in response.')
-      })
-    });
+After this event is emitted, the request's socket will not have a `data`
+event listener, meaning you will need to bind to it in order to handle data
+sent to the server on that socket.
 
-    req.on('error', function(e) {
-      console.log('problem with request: ' + e.message);
-    });
+### Event: 'connection'
 
-    // write data to request body
-    req.write(postData);
-    req.end();
+`function (socket) { }`
 
-Note that in the example `req.end()` was called. With `http.request()` one
-must always call `req.end()` to signify that you're done with the request -
-even if there is no data being written to the request body.
+When a new TCP stream is established. `socket` is an object of type
+`net.Socket`. Usually users will not want to access this event. In
+particular, the socket will not emit `readable` events because of how
+the protocol parser attaches to the socket. The `socket` can also be
+accessed at `request.connection`.
 
-If any error is encountered during the request (be that with DNS resolution,
-TCP level errors, or actual HTTP parse errors) an `'error'` event is emitted
-on the returned request object.
+### Event: 'request'
 
-There are a few special headers that should be noted.
+`function (request, response) { }`
 
-* Sending a 'Connection: keep-alive' will notify Node.js that the connection to
-  the server should be persisted until the next request.
+Emitted each time there is a request. Note that there may be multiple requests
+per connection (in the case of keep-alive connections).
+ `request` is an instance of [http.IncomingMessage][] and `response` is
+an instance of [http.ServerResponse][].
 
-* Sending a 'Content-length' header will disable the default chunked encoding.
+### Event: 'upgrade'
 
-* Sending an 'Expect' header will immediately send the request headers.
-  Usually, when sending 'Expect: 100-continue', you should both set a timeout
-  and listen for the `continue` event. See RFC2616 Section 8.2.3 for more
-  information.
+`function (request, socket, head) { }`
 
-* Sending an Authorization header will override using the `auth` option
-  to compute basic authentication.
+Emitted each time a client requests a http upgrade. If this event isn't
+listened for, then clients requesting an upgrade will have their connections
+closed.
 
-## http.get(options[, callback])
+* `request` is the arguments for the http request, as it is in the request
+  event.
+* `socket` is the network socket between the server and client.
+* `head` is an instance of Buffer, the first packet of the upgraded stream,
+  this may be empty.
 
-Since most requests are GET requests without bodies, Node.js provides this
-convenience method. The only difference between this method and `http.request()`
-is that it sets the method to GET and calls `req.end()` automatically.
+After this event is emitted, the request's socket will not have a `data`
+event listener, meaning you will need to bind to it in order to handle data
+sent to the server on that socket.
 
-Example:
+### server.close([callback])
 
-    http.get("http://www.google.com/index.html", function(res) {
-      console.log("Got response: " + res.statusCode);
-    }).on('error', function(e) {
-      console.log("Got error: " + e.message);
-    });
+Stops the server from accepting new connections.  See [net.Server.close()][].
 
+### server.listen(handle[, callback])
 
-## Class: http.Agent
+* `handle` {Object}
+* `callback` {Function}
 
-The HTTP Agent is used for pooling sockets used in HTTP client
-requests.
+The `handle` object can be set to either a server or socket (anything
+with an underlying `_handle` member), or a `{fd: <n>}` object.
 
-The HTTP Agent also defaults client requests to using
-Connection:keep-alive. If no pending HTTP requests are waiting on a
-socket to become free the socket is closed. This means that Node.js's
-pool has the benefit of keep-alive when under load but still does not
-require developers to manually close the HTTP clients using
-KeepAlive.
+This will cause the server to accept connections on the specified
+handle, but it is presumed that the file descriptor or handle has
+already been bound to a port or domain socket.
 
-If you opt into using HTTP KeepAlive, you can create an Agent object
-with that flag set to `true`.  (See the [constructor
-options](#http_new_agent_options) below.)  Then, the Agent will keep
-unused sockets in a pool for later use.  They will be explicitly
-marked so as to not keep the Node.js process running.  However, it is
-still a good idea to explicitly [`destroy()`](#http_agent_destroy)
-KeepAlive agents when they are no longer in use, so that the Sockets
-will be shut down.
+Listening on a file descriptor is not supported on Windows.
 
-Sockets are removed from the agent's pool when the socket emits either
-a "close" event or a special "agentRemove" event. This means that if
-you intend to keep one HTTP request open for a long time and don't
-want it to stay in the pool you can do something along the lines of:
+This function is asynchronous. The last parameter `callback` will be added as
+a listener for the ['listening'](net.html#net_event_listening) event.
+See also [net.Server.listen()](net.html#net_server_listen_handle_callback).
 
-    http.get(options, function(res) {
-      // Do stuff
-    }).on("socket", function (socket) {
-      socket.emit("agentRemove");
-    });
+### server.listen(path[, callback])
 
-Alternatively, you could just opt out of pooling entirely using
-`agent:false`:
+Start a UNIX socket server listening for connections on the given `path`.
 
-    http.get({
-      hostname: 'localhost',
-      port: 80,
-      path: '/',
-      agent: false  // create a new agent just for this one request
-    }, function (res) {
-      // Do stuff with response
-    })
+This function is asynchronous. The last parameter `callback` will be added as
+a listener for the ['listening'][] event.  See also [net.Server.listen(path)][].
 
-### new Agent([options])
+### server.listen(port[, hostname][, backlog][, callback])
 
-* `options` {Object} Set of configurable options to set on the agent.
-  Can have the following fields:
-  * `keepAlive` {Boolean} Keep sockets around in a pool to be used by
-    other requests in the future. Default = `false`
-  * `keepAliveMsecs` {Integer} When using HTTP KeepAlive, how often
-    to send TCP KeepAlive packets over sockets being kept alive.
-    Default = `1000`.  Only relevant if `keepAlive` is set to `true`.
-  * `maxSockets` {Number} Maximum number of sockets to allow per
-    host.  Default = `Infinity`.
-  * `maxFreeSockets` {Number} Maximum number of sockets to leave open
-    in a free state.  Only relevant if `keepAlive` is set to `true`.
-    Default = `256`.
+Begin accepting connections on the specified `port` and `hostname`. If the
+`hostname` is omitted, the server will accept connections on any IPv6 address
+(`::`) when IPv6 is available, or any IPv4 address (`0.0.0.0`) otherwise. A
+port value of zero will assign a random port.
 
-The default `http.globalAgent` that is used by `http.request` has all
-of these values set to their respective defaults.
+To listen to a unix socket, supply a filename instead of port and hostname.
 
-To configure any of them, you must create your own `Agent` object.
+Backlog is the maximum length of the queue of pending connections.
+The actual length will be determined by your OS through sysctl settings such as
+`tcp_max_syn_backlog` and `somaxconn` on linux. The default value of this
+parameter is 511 (not 512).
 
-```javascript
-var http = require('http');
-var keepAliveAgent = new http.Agent({ keepAlive: true });
-options.agent = keepAliveAgent;
-http.request(options, onResponseCallback);
-```
+This function is asynchronous. The last parameter `callback` will be added as
+a listener for the ['listening'][] event.  See also [net.Server.listen(port)][].
 
-### agent.maxSockets
+### server.maxHeadersCount
 
-By default set to Infinity. Determines how many concurrent sockets the agent
-can have open per origin. Origin is either a 'host:port' or
-'host:port:localAddress' combination.
+Limits maximum incoming headers count, equal to 1000 by default. If set to 0 -
+no limit will be applied.
 
-### agent.maxFreeSockets
+### server.setTimeout(msecs, callback)
 
-By default set to 256.  For Agents supporting HTTP KeepAlive, this
-sets the maximum number of sockets that will be left open in the free
-state.
+* `msecs` {Number}
+* `callback` {Function}
 
-### agent.sockets
+Sets the timeout value for sockets, and emits a `'timeout'` event on
+the Server object, passing the socket as an argument, if a timeout
+occurs.
 
-An object which contains arrays of sockets currently in use by the
-Agent.  Do not modify.
+If there is a `'timeout'` event listener on the Server object, then it
+will be called with the timed-out socket as an argument.
 
-### agent.freeSockets
+By default, the Server's timeout value is 2 minutes, and sockets are
+destroyed automatically if they time out.  However, if you assign a
+callback to the Server's `'timeout'` event, then you are responsible
+for handling socket timeouts.
 
-An object which contains arrays of sockets currently awaiting use by
-the Agent when HTTP KeepAlive is used.  Do not modify.
+Returns `server`.
 
-### agent.requests
+### server.timeout
 
-An object which contains queues of requests that have not yet been assigned to
-sockets. Do not modify.
+* {Number} Default = 120000 (2 minutes)
 
-### agent.destroy()
+The number of milliseconds of inactivity before a socket is presumed
+to have timed out.
 
-Destroy any sockets that are currently in use by the agent.
+Note that the socket timeout logic is set up on connection, so
+changing this value only affects *new* connections to the server, not
+any existing connections.
 
-It is usually not necessary to do this.  However, if you are using an
-agent with KeepAlive enabled, then it is best to explicitly shut down
-the agent when you know that it will no longer be used.  Otherwise,
-sockets may hang open for quite a long time before the server
-terminates them.
+Set to 0 to disable any kind of automatic timeout behavior on incoming
+connections.
 
-### agent.getName(options)
+## Class: http.ServerResponse
 
-Get a unique name for a set of request options, to determine whether a
-connection can be reused.  In the http agent, this returns
-`host:port:localAddress`.  In the https agent, the name includes the
-CA, cert, ciphers, and other HTTPS/TLS-specific options that determine
-socket reusability.
+This object is created internally by a HTTP server--not by the user. It is
+passed as the second parameter to the `'request'` event.
 
+The response implements the [Writable Stream][] interface. This is an
+[EventEmitter][] with the following events:
 
-## http.globalAgent
+### Event: 'close'
 
-Global instance of Agent which is used as the default for all http client
-requests.
+`function () { }`
 
+Indicates that the underlying connection was terminated before
+[response.end()][] was called or able to flush.
 
-## Class: http.ClientRequest
+### Event: 'finish'
 
-This object is created internally and returned from `http.request()`.  It
-represents an _in-progress_ request whose header has already been queued.  The
-header is still mutable using the `setHeader(name, value)`, `getHeader(name)`,
-`removeHeader(name)` API.  The actual header will be sent along with the first
-data chunk or when closing the connection.
+`function () { }`
 
-To get the response, add a listener for `'response'` to the request object.
-`'response'` will be emitted from the request object when the response
-headers have been received.  The `'response'` event is executed with one
-argument which is an instance of [http.IncomingMessage][].
+Emitted when the response has been sent. More specifically, this event is
+emitted when the last segment of the response headers and body have been
+handed off to the operating system for transmission over the network. It
+does not imply that the client has received anything yet.
 
-During the `'response'` event, one can add listeners to the
-response object; particularly to listen for the `'data'` event.
+After this event, no more events will be emitted on the response object.
 
-If no `'response'` handler is added, then the response will be
-entirely discarded.  However, if you add a `'response'` event handler,
-then you **must** consume the data from the response object, either by
-calling `response.read()` whenever there is a `'readable'` event, or
-by adding a `'data'` handler, or by calling the `.resume()` method.
-Until the data is consumed, the `'end'` event will not fire.  Also, until
-the data is read it will consume memory that can eventually lead to a
-'process out of memory' error.
+### response.addTrailers(headers)
 
-Note: Node.js does not check whether Content-Length and the length of the body
-which has been transmitted are equal or not.
+This method adds HTTP trailing headers (a header but at the end of the
+message) to the response.
 
-The request implements the [Writable Stream][] interface. This is an
-[EventEmitter][] with the following events:
+Trailers will **only** be emitted if chunked encoding is used for the
+response; if it is not (e.g., if the request was HTTP/1.0), they will
+be silently discarded.
 
-### Event: 'response'
+Note that HTTP requires the `Trailer` header to be sent if you intend to
+emit trailers, with a list of the header fields in its value. E.g.,
 
-`function (response) { }`
+    response.writeHead(200, { 'Content-Type': 'text/plain',
+                              'Trailer': 'Content-MD5' });
+    response.write(fileData);
+    response.addTrailers({'Content-MD5': "7895bf4b8828b55ceaf47747b4bca667"});
+    response.end();
 
-Emitted when a response is received to this request. This event is emitted only
-once. The `response` argument will be an instance of [http.IncomingMessage][].
+Attempting to set a trailer field name that contains invalid characters will
+result in a `TypeError` being thrown.
 
-Options:
+### response.end([data][, encoding][, callback])
 
-- `host`: A domain name or IP address of the server to issue the request to.
-- `port`: Port of remote server.
-- `socketPath`: Unix Domain Socket (use one of host:port or socketPath)
+This method signals to the server that all of the response headers and body
+have been sent; that server should consider this message complete.
+The method, `response.end()`, MUST be called on each
+response.
 
-### Event: 'socket'
+If `data` is specified, it is equivalent to calling
+`response.write(data, encoding)` followed by `response.end(callback)`.
 
-`function (socket) { }`
+If `callback` is specified, it will be called when the response stream
+is finished.
 
-Emitted after a socket is assigned to this request.
+### response.finished
 
-### Event: 'connect'
+Boolean value that indicates whether the response has completed. Starts
+as `false`. After `response.end()` executes, the value will be `true`.
 
-`function (response, socket, head) { }`
+### response.getHeader(name)
 
-Emitted each time a server responds to a request with a CONNECT method. If this
-event isn't being listened for, clients receiving a CONNECT method will have
-their connections closed.
+Reads out a header that's already been queued but not sent to the client.  Note
+that the name is case insensitive.  This can only be called before headers get
+implicitly flushed.
 
-A client server pair that show you how to listen for the `connect` event.
+Example:
 
-    var http = require('http');
-    var net = require('net');
-    var url = require('url');
+    var contentType = response.getHeader('content-type');
 
-    // Create an HTTP tunneling proxy
-    var proxy = http.createServer(function (req, res) {
-      res.writeHead(200, {'Content-Type': 'text/plain'});
-      res.end('okay');
-    });
-    proxy.on('connect', function(req, cltSocket, head) {
-      // connect to an origin server
-      var srvUrl = url.parse('http://' + req.url);
-      var srvSocket = net.connect(srvUrl.port, srvUrl.hostname, function() {
-        cltSocket.write('HTTP/1.1 200 Connection Established\r\n' +
-                        'Proxy-agent: Node.js-Proxy\r\n' +
-                        '\r\n');
-        srvSocket.write(head);
-        srvSocket.pipe(cltSocket);
-        cltSocket.pipe(srvSocket);
-      });
-    });
+### response.headersSent
 
-    // now that proxy is running
-    proxy.listen(1337, '127.0.0.1', function() {
+Boolean (read-only). True if headers were sent, false otherwise.
 
-      // make a request to a tunneling proxy
-      var options = {
-        port: 1337,
-        hostname: '127.0.0.1',
-        method: 'CONNECT',
-        path: 'www.google.com:80'
-      };
+### response.removeHeader(name)
 
-      var req = http.request(options);
-      req.end();
+Removes a header that's queued for implicit sending.
 
-      req.on('connect', function(res, socket, head) {
-        console.log('got connected!');
+Example:
 
-        // make a request over an HTTP tunnel
-        socket.write('GET / HTTP/1.1\r\n' +
-                     'Host: www.google.com:80\r\n' +
-                     'Connection: close\r\n' +
-                     '\r\n');
-        socket.on('data', function(chunk) {
-          console.log(chunk.toString());
-        });
-        socket.on('end', function() {
-          proxy.close();
-        });
-      });
-    });
+    response.removeHeader("Content-Encoding");
 
-### Event: 'upgrade'
+### response.sendDate
 
-`function (response, socket, head) { }`
+When true, the Date header will be automatically generated and sent in
+the response if it is not already present in the headers. Defaults to true.
 
-Emitted each time a server responds to a request with an upgrade. If this
-event isn't being listened for, clients receiving an upgrade header will have
-their connections closed.
+This should only be disabled for testing; HTTP requires the Date header
+in responses.
 
-A client server pair that show you how to listen for the `upgrade` event.
+### response.setHeader(name, value)
 
-    var http = require('http');
+Sets a single header value for implicit headers.  If this header already exists
+in the to-be-sent headers, its value will be replaced.  Use an array of strings
+here if you need to send multiple headers with the same name.
 
-    // Create an HTTP server
-    var srv = http.createServer(function (req, res) {
-      res.writeHead(200, {'Content-Type': 'text/plain'});
-      res.end('okay');
-    });
-    srv.on('upgrade', function(req, socket, head) {
-      socket.write('HTTP/1.1 101 Web Socket Protocol Handshake\r\n' +
-                   'Upgrade: WebSocket\r\n' +
-                   'Connection: Upgrade\r\n' +
-                   '\r\n');
+Example:
 
-      socket.pipe(socket); // echo back
-    });
+    response.setHeader("Content-Type", "text/html");
 
-    // now that server is running
-    srv.listen(1337, '127.0.0.1', function() {
+or
 
-      // make a request
-      var options = {
-        port: 1337,
-        hostname: '127.0.0.1',
-        headers: {
-          'Connection': 'Upgrade',
-          'Upgrade': 'websocket'
-        }
-      };
+    response.setHeader("Set-Cookie", ["type=ninja", "language=javascript"]);
 
-      var req = http.request(options);
-      req.end();
+Attempting to set a header field name that contains invalid characters will
+result in a `TypeError` being thrown.
 
-      req.on('upgrade', function(res, socket, upgradeHead) {
-        console.log('got upgraded!');
-        socket.end();
-        process.exit(0);
-      });
-    });
+### response.setTimeout(msecs, callback)
 
-### Event: 'continue'
+* `msecs` {Number}
+* `callback` {Function}
 
-`function () { }`
+Sets the Socket's timeout value to `msecs`.  If a callback is
+provided, then it is added as a listener on the `'timeout'` event on
+the response object.
 
-Emitted when the server sends a '100 Continue' HTTP response, usually because
-the request contained 'Expect: 100-continue'. This is an instruction that
-the client should send the request body.
+If no `'timeout'` listener is added to the request, the response, or
+the server, then sockets are destroyed when they time out.  If you
+assign a handler on the request, the response, or the server's
+`'timeout'` events, then it is your responsibility to handle timed out
+sockets.
 
-### Event: 'abort'
+Returns `response`.
 
-`function () { }`
+### response.statusCode
 
-Emitted when the request has been aborted by the client. This event is only
-emitted on the first call to `abort()`.
+When using implicit headers (not calling [response.writeHead()][] explicitly),
+this property controls the status code that will be sent to the client when
+the headers get flushed.
 
-### request.flushHeaders()
+Example:
 
-Flush the request headers.
+    response.statusCode = 404;
 
-For efficiency reasons, Node.js normally buffers the request headers until you
-call `request.end()` or write the first chunk of request data.  It then tries
-hard to pack the request headers and data into a single TCP packet.
+After response header was sent to the client, this property indicates the
+status code which was sent out.
 
-That's usually what you want (it saves a TCP round-trip) but not when the first
-data isn't sent until possibly much later.  `request.flushHeaders()` lets you bypass
-the optimization and kickstart the request.
+### response.statusMessage
 
-### request.write(chunk[, encoding][, callback])
+When using implicit headers (not calling `response.writeHead()` explicitly), this property
+controls the status message that will be sent to the client when the headers get
+flushed. If this is left as `undefined` then the standard message for the status
+code will be used.
 
-Sends a chunk of the body.  By calling this method
-many times, the user can stream a request body to a
-server--in that case it is suggested to use the
-`['Transfer-Encoding', 'chunked']` header line when
-creating the request.
+Example:
 
-The `chunk` argument should be a [Buffer][] or a string.
+    response.statusMessage = 'Not found';
 
-The `encoding` argument is optional and only applies when `chunk` is a string.
-Defaults to `'utf8'`.
+After response header was sent to the client, this property indicates the
+status message which was sent out.
 
-The `callback` argument is optional and will be called when this chunk of data
-is flushed.
+### response.write(chunk[, encoding][, callback])
 
-### request.end([data][, encoding][, callback])
+If this method is called and [response.writeHead()][] has not been called,
+it will switch to implicit header mode and flush the implicit headers.
 
-Finishes sending the request. If any parts of the body are
-unsent, it will flush them to the stream. If the request is
-chunked, this will send the terminating `'0\r\n\r\n'`.
+This sends a chunk of the response body. This method may
+be called multiple times to provide successive parts of the body.
+
+`chunk` can be a string or a buffer. If `chunk` is a string,
+the second parameter specifies how to encode it into a byte stream.
+By default the `encoding` is `'utf8'`. The last parameter `callback`
+will be called when this chunk of data is flushed.
 
-If `data` is specified, it is equivalent to calling
-`request.write(data, encoding)` followed by `request.end(callback)`.
+**Note**: This is the raw HTTP body and has nothing to do with
+higher-level multi-part body encodings that may be used.
 
-If `callback` is specified, it will be called when the request stream
-is finished.
+The first time `response.write()` is called, it will send the buffered
+header information and the first body to the client. The second time
+`response.write()` is called, Node.js assumes you're going to be streaming
+data, and sends that separately. That is, the response is buffered up to the
+first chunk of body.
 
-### request.abort()
+Returns `true` if the entire data was flushed successfully to the kernel
+buffer. Returns `false` if all or part of the data was queued in user memory.
+`'drain'` will be emitted when the buffer is free again.
 
-Marks the request as aborting. Calling this will cause remaining data
-in the response to be dropped and the socket to be destroyed.
+### response.writeContinue()
 
-### request.setTimeout(timeout[, callback])
+Sends a HTTP/1.1 100 Continue message to the client, indicating that
+the request body should be sent. See the ['checkContinue'][] event on `Server`.
 
-Once a socket is assigned to this request and is connected
-[socket.setTimeout()][] will be called.
+### response.writeHead(statusCode[, statusMessage][, headers])
 
-Returns `request`.
+Sends a response header to the request. The status code is a 3-digit HTTP
+status code, like `404`. The last argument, `headers`, are the response headers.
+Optionally one can give a human-readable `statusMessage` as the second
+argument.
 
-### request.setNoDelay([noDelay])
+Example:
 
-Once a socket is assigned to this request and is connected
-[socket.setNoDelay()][] will be called.
+    var body = 'hello world';
+    response.writeHead(200, {
+      'Content-Length': body.length,
+      'Content-Type': 'text/plain' });
 
-### request.setSocketKeepAlive([enable][, initialDelay])
+This method must only be called once on a message and it must
+be called before [response.end()][] is called.
 
-Once a socket is assigned to this request and is connected
-[socket.setKeepAlive()][] will be called.
+If you call [response.write()][] or [response.end()][] before calling this, the
+implicit/mutable headers will be calculated and call this function for you.
 
+Note that Content-Length is given in bytes not characters. The above example
+works because the string `'hello world'` contains only single byte characters.
+If the body contains higher coded characters then `Buffer.byteLength()`
+should be used to determine the number of bytes in a given encoding.
+And Node.js does not check whether Content-Length and the length of the body
+which has been transmitted are equal or not.
 
 ## http.IncomingMessage
 
@@ -961,15 +802,6 @@ following additional events, methods, and properties.
 Indicates that the underlying connection was closed.
 Just like `'end'`, this event occurs only once per response.
 
-### message.httpVersion
-
-In case of server request, the HTTP version sent by the client. In the case of
-client response, the HTTP version of the connected-to server.
-Probably either `'1.1'` or `'1.0'`.
-
-Also `response.httpVersionMajor` is the first integer and
-`response.httpVersionMinor` is the second.
-
 ### message.headers
 
 The request/response headers object.
@@ -984,6 +816,22 @@ Example:
     //   accept: '*/*' }
     console.log(request.headers);
 
+### message.httpVersion
+
+In case of server request, the HTTP version sent by the client. In the case of
+client response, the HTTP version of the connected-to server.
+Probably either `'1.1'` or `'1.0'`.
+
+Also `response.httpVersionMajor` is the first integer and
+`response.httpVersionMinor` is the second.
+
+### message.method
+
+**Only valid for request obtained from [http.Server][].**
+
+The request method as a string. Read only. Example:
+`'GET'`, `'DELETE'`.
+
 ### message.rawHeaders
 
 The raw request/response headers list exactly as they were received.
@@ -1006,10 +854,6 @@ Header names are not lowercased, and duplicates are not merged.
     //   '*/*' ]
     console.log(request.rawHeaders);
 
-### message.trailers
-
-The request/response trailers object. Only populated at the 'end' event.
-
 ### message.rawTrailers
 
 The raw request/response trailer keys and values exactly as they were
@@ -1024,12 +868,28 @@ Calls `message.connection.setTimeout(msecs, callback)`.
 
 Returns `message`.
 
-### message.method
+### message.statusCode
 
-**Only valid for request obtained from [http.Server][].**
+**Only valid for response obtained from `http.ClientRequest`.**
 
-The request method as a string. Read only. Example:
-`'GET'`, `'DELETE'`.
+The 3-digit HTTP response status code. E.G. `404`.
+
+### message.statusMessage
+
+**Only valid for response obtained from `http.ClientRequest`.**
+
+### message.socket
+
+The `net.Socket` object associated with the connection.
+
+With HTTPS support, use [request.socket.getPeerCertificate()][] to obtain the
+client's authentication details.
+
+The HTTP response status message (reason phrase). E.G. `OK` or `Internal Server Error`.
+
+### message.trailers
+
+The request/response trailers object. Only populated at the 'end' event.
 
 ### message.url
 
@@ -1065,25 +925,155 @@ you can use the `require('querystring').parse` function, or pass
       query: { name: 'ryan' },
       pathname: '/status' }
 
-### message.statusCode
+## http.METHODS
 
-**Only valid for response obtained from `http.ClientRequest`.**
+* {Array}
 
-The 3-digit HTTP response status code. E.G. `404`.
+A list of the HTTP methods that are supported by the parser.
 
-### message.statusMessage
+## http.STATUS_CODES
 
-**Only valid for response obtained from `http.ClientRequest`.**
+* {Object}
 
-The HTTP response status message (reason phrase). E.G. `OK` or `Internal Server Error`.
+A collection of all the standard HTTP response status codes, and the
+short description of each.  For example, `http.STATUS_CODES[404] === 'Not
+Found'`.
 
-### message.socket
+## http.createClient([port][, host])
 
-The `net.Socket` object associated with the connection.
+    Stability: 0 - Deprecated: Use [http.request][] instead.
 
-With HTTPS support, use [request.socket.getPeerCertificate()][] to obtain the
-client's authentication details.
+Constructs a new HTTP client. `port` and `host` refer to the server to be
+connected to.
 
+## http.createServer([requestListener])
+
+Returns a new instance of [http.Server](#http_class_http_server).
+
+The `requestListener` is a function which is automatically
+added to the `'request'` event.
+
+## http.get(options[, callback])
+
+Since most requests are GET requests without bodies, Node.js provides this
+convenience method. The only difference between this method and `http.request()`
+is that it sets the method to GET and calls `req.end()` automatically.
+
+Example:
+
+    http.get("http://www.google.com/index.html", function(res) {
+      console.log("Got response: " + res.statusCode);
+    }).on('error', function(e) {
+      console.log("Got error: " + e.message);
+    });
+
+## http.globalAgent
+
+Global instance of Agent which is used as the default for all http client
+requests.
+
+## http.request(options[, callback])
+
+Node.js maintains several connections per server to make HTTP requests.
+This function allows one to transparently issue requests.
+
+`options` can be an object or a string. If `options` is a string, it is
+automatically parsed with [url.parse()][].
+
+Options:
+
+- `protocol`: Protocol to use. Defaults to `'http'`.
+- `host`: A domain name or IP address of the server to issue the request to.
+  Defaults to `'localhost'`.
+- `hostname`: Alias for `host`. To support `url.parse()` `hostname` is
+  preferred over `host`.
+- `family`: IP address family to use when resolving `host` and `hostname`.
+  Valid values are `4` or `6`. When unspecified, both IP v4 and v6 will be
+  used.
+- `port`: Port of remote server. Defaults to 80.
+- `localAddress`: Local interface to bind for network connections.
+- `socketPath`: Unix Domain Socket (use one of host:port or socketPath).
+- `method`: A string specifying the HTTP request method. Defaults to `'GET'`.
+- `path`: Request path. Defaults to `'/'`. Should include query string if any.
+  E.G. `'/index.html?page=12'`. An exception is thrown when the request path
+  contains illegal characters. Currently, only spaces are rejected but that
+  may change in the future.
+- `headers`: An object containing request headers.
+- `auth`: Basic authentication i.e. `'user:password'` to compute an
+  Authorization header.
+- `agent`: Controls [Agent][] behavior. When an Agent is used request will
+  default to `Connection: keep-alive`. Possible values:
+ - `undefined` (default): use [globalAgent][] for this host and port.
+ - `Agent` object: explicitly use the passed in `Agent`.
+ - `false`: opts out of connection pooling with an Agent, defaults request to
+   `Connection: close`.
+
+The optional `callback` parameter will be added as a one time listener for
+the ['response'][] event.
+
+`http.request()` returns an instance of the [http.ClientRequest][]
+class. The `ClientRequest` instance is a writable stream. If one needs to
+upload a file with a POST request, then write to the `ClientRequest` object.
+
+Example:
+
+    var postData = querystring.stringify({
+      'msg' : 'Hello World!'
+    });
+
+    var options = {
+      hostname: 'www.google.com',
+      port: 80,
+      path: '/upload',
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+        'Content-Length': postData.length
+      }
+    };
+
+    var req = http.request(options, function(res) {
+      console.log('STATUS: ' + res.statusCode);
+      console.log('HEADERS: ' + JSON.stringify(res.headers));
+      res.setEncoding('utf8');
+      res.on('data', function (chunk) {
+        console.log('BODY: ' + chunk);
+      });
+      res.on('end', function() {
+        console.log('No more data in response.')
+      })
+    });
+
+    req.on('error', function(e) {
+      console.log('problem with request: ' + e.message);
+    });
+
+    // write data to request body
+    req.write(postData);
+    req.end();
+
+Note that in the example `req.end()` was called. With `http.request()` one
+must always call `req.end()` to signify that you're done with the request -
+even if there is no data being written to the request body.
+
+If any error is encountered during the request (be that with DNS resolution,
+TCP level errors, or actual HTTP parse errors) an `'error'` event is emitted
+on the returned request object.
+
+There are a few special headers that should be noted.
+
+* Sending a 'Connection: keep-alive' will notify Node.js that the connection to
+  the server should be persisted until the next request.
+
+* Sending a 'Content-length' header will disable the default chunked encoding.
+
+* Sending an 'Expect' header will immediately send the request headers.
+  Usually, when sending 'Expect: 100-continue', you should both set a timeout
+  and listen for the `continue` event. See RFC2616 Section 8.2.3 for more
+  information.
+
+* Sending an Authorization header will override using the `auth` option
+  to compute basic authentication.
 
 ['checkContinue']: #http_event_checkcontinue
 ['listening']: net.html#net_event_listening

From df07072b667521add15680e6095d6d6993779465 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Wed, 4 Nov 2015 17:59:28 -0500
Subject: [PATCH 170/323] doc: sort https alphabetically

Reorders, with no contextual changes, the https documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/https.markdown | 101 ++++++++++++++++++++---------------------
 1 file changed, 49 insertions(+), 52 deletions(-)

diff --git a/doc/api/https.markdown b/doc/api/https.markdown
index 05617e0429adcf..1c3af5557b0072 100644
--- a/doc/api/https.markdown
+++ b/doc/api/https.markdown
@@ -5,6 +5,11 @@
 HTTPS is the HTTP protocol over TLS/SSL. In Node.js this is implemented as a
 separate module.
 
+## Class: https.Agent
+
+An Agent object for HTTPS similar to [http.Agent][].  See [https.request()][]
+for more information.
+
 ## Class: https.Server
 
 This class is a subclass of `tls.Server` and emits events same as
@@ -54,16 +59,56 @@ Or
       res.end("hello world\n");
     }).listen(8000);
 
+### server.close([callback])
+
+See [http.close()][] for details.
 
-### server.listen(port[, host][, backlog][, callback])
-### server.listen(path[, callback])
 ### server.listen(handle[, callback])
+### server.listen(path[, callback])
+### server.listen(port[, host][, backlog][, callback])
 
 See [http.listen()][] for details.
 
-### server.close([callback])
+## https.get(options, callback)
 
-See [http.close()][] for details.
+Like `http.get()` but for HTTPS.
+
+`options` can be an object or a string. If `options` is a string, it is
+automatically parsed with [url.parse()](url.html#url_url_parse_urlstr_parsequerystring_slashesdenotehost).
+
+Example:
+
+    var https = require('https');
+
+    https.get('https://encrypted.google.com/', function(res) {
+      console.log("statusCode: ", res.statusCode);
+      console.log("headers: ", res.headers);
+
+      res.on('data', function(d) {
+        process.stdout.write(d);
+      });
+
+    }).on('error', function(e) {
+      console.error(e);
+    });
+
+## https.globalAgent
+
+Global instance of [https.Agent][] for all HTTPS client requests.
+
+[http.Server#setTimeout()]: http.html#http_server_settimeout_msecs_callback
+[http.Server#timeout]: http.html#http_server_timeout
+[Agent]: #https_class_https_agent
+[globalAgent]: #https_https_globalagent
+[http.listen()]: http.html#http_server_listen_port_hostname_backlog_callback
+[http.close()]: http.html#http_server_close_callback
+[http.Agent]: http.html#http_class_http_agent
+[http.request()]: http.html#http_http_request_options_callback
+[https.Agent]: #https_class_https_agent
+[https.request()]: #https_https_request_options_callback
+[tls.connect()]: tls.html#tls_tls_connect_options_callback
+[tls.createServer()]: tls.html#tls_tls_createserver_options_secureconnectionlistener
+[SSL_METHODS]: http://www.openssl.org/docs/ssl/ssl.html#DEALING_WITH_PROTOCOL_METHODS
 
 ## https.request(options, callback)
 
@@ -181,51 +226,3 @@ Example:
     var req = https.request(options, function(res) {
       ...
     }
-
-## https.get(options, callback)
-
-Like `http.get()` but for HTTPS.
-
-`options` can be an object or a string. If `options` is a string, it is
-automatically parsed with [url.parse()](url.html#url_url_parse_urlstr_parsequerystring_slashesdenotehost).
-
-Example:
-
-    var https = require('https');
-
-    https.get('https://encrypted.google.com/', function(res) {
-      console.log("statusCode: ", res.statusCode);
-      console.log("headers: ", res.headers);
-
-      res.on('data', function(d) {
-        process.stdout.write(d);
-      });
-
-    }).on('error', function(e) {
-      console.error(e);
-    });
-
-
-## Class: https.Agent
-
-An Agent object for HTTPS similar to [http.Agent][].  See [https.request()][]
-for more information.
-
-
-## https.globalAgent
-
-Global instance of [https.Agent][] for all HTTPS client requests.
-
-[http.Server#setTimeout()]: http.html#http_server_settimeout_msecs_callback
-[http.Server#timeout]: http.html#http_server_timeout
-[Agent]: #https_class_https_agent
-[globalAgent]: #https_https_globalagent
-[http.listen()]: http.html#http_server_listen_port_hostname_backlog_callback
-[http.close()]: http.html#http_server_close_callback
-[http.Agent]: http.html#http_class_http_agent
-[http.request()]: http.html#http_http_request_options_callback
-[https.Agent]: #https_class_https_agent
-[https.request()]: #https_https_request_options_callback
-[tls.connect()]: tls.html#tls_tls_connect_options_callback
-[tls.createServer()]: tls.html#tls_tls_createserver_options_secureconnectionlistener
-[SSL_METHODS]: http://www.openssl.org/docs/ssl/ssl.html#DEALING_WITH_PROTOCOL_METHODS

From 0996b972403c66116829c1b502f311312883821d Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Thu, 5 Nov 2015 10:28:34 -0500
Subject: [PATCH 171/323] doc: sort util alphabetically

Reorders, with no contextual changes, the util documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/util.markdown | 302 +++++++++++++++++++++---------------------
 1 file changed, 149 insertions(+), 153 deletions(-)

diff --git a/doc/api/util.markdown b/doc/api/util.markdown
index 8ac0e0ef8467d9..56f38e12362b7b 100644
--- a/doc/api/util.markdown
+++ b/doc/api/util.markdown
@@ -12,6 +12,12 @@ purposes, however, you are encouraged to write your own utilities.  We
 are not interested in any future additions to the `util` module that
 are unnecessary for node.js's internal functionality.
 
+## util.debug(string)
+
+    Stability: 0 - Deprecated: use console.error() instead.
+
+Deprecated predecessor of `console.error`.
+
 ## util.debuglog(section)
 
 * `section` {String} The section of the program to be debugged
@@ -43,6 +49,40 @@ environment variable set, then it will not print anything.
 You may separate multiple `NODE_DEBUG` environment variables with a
 comma.  For example, `NODE_DEBUG=fs,net,tls`.
 
+## util.deprecate(function, string)
+
+Marks that a method should not be used any more.
+
+    var util = require('util');
+
+    exports.puts = util.deprecate(function() {
+      for (var i = 0, len = arguments.length; i < len; ++i) {
+        process.stdout.write(arguments[i] + '\n');
+      }
+    }, 'util.puts: Use console.log instead');
+
+It returns a modified function which warns once by default.
+
+If `--no-deprecation` is set then this function is a NO-OP.  Configurable
+at run-time through the `process.noDeprecation` boolean (only effective
+when set before a module is loaded.)
+
+If `--trace-deprecation` is set, a warning and a stack trace are logged
+to the console the first time the deprecated API is used.  Configurable
+at run-time through the `process.traceDeprecation` boolean.
+
+If `--throw-deprecation` is set then the application throws an exception
+when the deprecated API is used.  Configurable at run-time through the
+`process.throwDeprecation` boolean.
+
+`process.throwDeprecation` takes precedence over `process.traceDeprecation`.
+
+## util.error([...])
+
+    Stability: 0 - Deprecated: Use console.error() instead.
+
+Deprecated predecessor of `console.error`.
+
 ## util.format(format[, ...])
 
 Returns a formatted string using the first argument as a `printf`-like format.
@@ -74,12 +114,38 @@ Each argument is converted to a string with `util.inspect()`.
 
     util.format(1, 2, 3); // '1 2 3'
 
+## util.inherits(constructor, superConstructor)
 
-## util.log(string)
+Inherit the prototype methods from one
+[constructor](https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Object/constructor)
+into another.  The prototype of `constructor` will be set to a new
+object created from `superConstructor`.
 
-Output with timestamp on `stdout`.
+As an additional convenience, `superConstructor` will be accessible
+through the `constructor.super_` property.
 
-    require('util').log('Timestamped message.');
+    var util = require("util");
+    var EventEmitter = require("events");
+
+    function MyStream() {
+        EventEmitter.call(this);
+    }
+
+    util.inherits(MyStream, EventEmitter);
+
+    MyStream.prototype.write = function(data) {
+        this.emit("data", data);
+    }
+
+    var stream = new MyStream();
+
+    console.log(stream instanceof EventEmitter); // true
+    console.log(MyStream.super_ === EventEmitter); // true
+
+    stream.on("data", function(data) {
+        console.log('Received data: "' + data + '"');
+    })
+    stream.write("It works!"); // Received data: "It works!"
 
 ## util.inspect(object[, options])
 
@@ -164,7 +230,6 @@ formatted according to the returned Object. This is similar to how
     util.inspect(obj);
       // "{ bar: 'baz' }"
 
-
 ## util.isArray(object)
 
     Stability: 0 - Deprecated
@@ -182,20 +247,37 @@ Returns `true` if the given "object" is an `Array`. `false` otherwise.
     util.isArray({})
       // false
 
-## util.isRegExp(object)
+## util.isBoolean(object)
 
     Stability: 0 - Deprecated
 
-Returns `true` if the given "object" is a `RegExp`. `false` otherwise.
+Returns `true` if the given "object" is a `Boolean`. `false` otherwise.
 
     var util = require('util');
 
-    util.isRegExp(/some regexp/)
-      // true
-    util.isRegExp(new RegExp('another regexp'))
+    util.isBoolean(1)
+      // false
+    util.isBoolean(0)
+      // false
+    util.isBoolean(false)
       // true
-    util.isRegExp({})
+      
+## util.isBuffer(object)
+
+    Stability: 0 - Deprecated
+
+Use `Buffer.isBuffer()` instead.
+
+Returns `true` if the given "object" is a `Buffer`. `false` otherwise.
+
+    var util = require('util');
+
+    util.isBuffer({ length: 0 })
       // false
+    util.isBuffer([])
+      // false
+    util.isBuffer(new Buffer('hello world'))
+      // true
 
 ## util.isDate(object)
 
@@ -227,19 +309,22 @@ Returns `true` if the given "object" is an `Error`. `false` otherwise.
     util.isError({ name: 'Error', message: 'an error occurred' })
       // false
 
-## util.isBoolean(object)
+## util.isFunction(object)
 
     Stability: 0 - Deprecated
 
-Returns `true` if the given "object" is a `Boolean`. `false` otherwise.
+Returns `true` if the given "object" is a `Function`. `false` otherwise.
 
     var util = require('util');
 
-    util.isBoolean(1)
-      // false
-    util.isBoolean(0)
+    function Foo() {}
+    var Bar = function() {};
+
+    util.isFunction({})
       // false
-    util.isBoolean(false)
+    util.isFunction(Foo)
+      // true
+    util.isFunction(Bar)
       // true
 
 ## util.isNull(object)
@@ -289,54 +374,6 @@ Returns `true` if the given "object" is a `Number`. `false` otherwise.
     util.isNumber(NaN)
       // true
 
-## util.isString(object)
-
-    Stability: 0 - Deprecated
-
-Returns `true` if the given "object" is a `String`. `false` otherwise.
-
-    var util = require('util');
-
-    util.isString('')
-      // true
-    util.isString('foo')
-      // true
-    util.isString(String('foo'))
-      // true
-    util.isString(5)
-      // false
-
-## util.isSymbol(object)
-
-    Stability: 0 - Deprecated
-
-Returns `true` if the given "object" is a `Symbol`. `false` otherwise.
-
-    var util = require('util');
-
-    util.isSymbol(5)
-      // false
-    util.isSymbol('foo')
-      // false
-    util.isSymbol(Symbol('foo'))
-      // true
-
-## util.isUndefined(object)
-
-    Stability: 0 - Deprecated
-
-Returns `true` if the given "object" is `undefined`. `false` otherwise.
-
-    var util = require('util');
-
-    var foo;
-    util.isUndefined(5)
-      // false
-    util.isUndefined(foo)
-      // true
-    util.isUndefined(null)
-      // false
-
 ## util.isObject(object)
 
     Stability: 0 - Deprecated
@@ -355,24 +392,6 @@ Returns `true` if the given "object" is strictly an `Object` __and__ not a
     util.isObject(function(){})
       // false
 
-## util.isFunction(object)
-
-    Stability: 0 - Deprecated
-
-Returns `true` if the given "object" is a `Function`. `false` otherwise.
-
-    var util = require('util');
-
-    function Foo() {}
-    var Bar = function() {};
-
-    util.isFunction({})
-      // false
-    util.isFunction(Foo)
-      // true
-    util.isFunction(Bar)
-      // true
-
 ## util.isPrimitive(object)
 
     Stability: 0 - Deprecated
@@ -400,102 +419,74 @@ Returns `true` if the given "object" is a primitive type. `false` otherwise.
     util.isPrimitive(new Date())
       // false
 
-## util.isBuffer(object)
+## util.isRegExp(object)
 
     Stability: 0 - Deprecated
 
-Use `Buffer.isBuffer()` instead.
-
-Returns `true` if the given "object" is a `Buffer`. `false` otherwise.
+Returns `true` if the given "object" is a `RegExp`. `false` otherwise.
 
     var util = require('util');
 
-    util.isBuffer({ length: 0 })
-      // false
-    util.isBuffer([])
-      // false
-    util.isBuffer(new Buffer('hello world'))
+    util.isRegExp(/some regexp/)
       // true
+    util.isRegExp(new RegExp('another regexp'))
+      // true
+    util.isRegExp({})
+      // false
 
-## util.inherits(constructor, superConstructor)
-
-Inherit the prototype methods from one
-[constructor](https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Object/constructor)
-into another.  The prototype of `constructor` will be set to a new
-object created from `superConstructor`.
-
-As an additional convenience, `superConstructor` will be accessible
-through the `constructor.super_` property.
-
-    var util = require("util");
-    var EventEmitter = require("events");
-
-    function MyStream() {
-        EventEmitter.call(this);
-    }
-
-    util.inherits(MyStream, EventEmitter);
-
-    MyStream.prototype.write = function(data) {
-        this.emit("data", data);
-    }
-
-    var stream = new MyStream();
-
-    console.log(stream instanceof EventEmitter); // true
-    console.log(MyStream.super_ === EventEmitter); // true
-
-    stream.on("data", function(data) {
-        console.log('Received data: "' + data + '"');
-    })
-    stream.write("It works!"); // Received data: "It works!"
-
+## util.isString(object)
 
-## util.deprecate(function, string)
+    Stability: 0 - Deprecated
 
-Marks that a method should not be used any more.
+Returns `true` if the given "object" is a `String`. `false` otherwise.
 
     var util = require('util');
 
-    exports.puts = util.deprecate(function() {
-      for (var i = 0, len = arguments.length; i < len; ++i) {
-        process.stdout.write(arguments[i] + '\n');
-      }
-    }, 'util.puts: Use console.log instead');
-
-It returns a modified function which warns once by default.
+    util.isString('')
+      // true
+    util.isString('foo')
+      // true
+    util.isString(String('foo'))
+      // true
+    util.isString(5)
+      // false
 
-If `--no-deprecation` is set then this function is a NO-OP.  Configurable
-at run-time through the `process.noDeprecation` boolean (only effective
-when set before a module is loaded.)
+## util.isSymbol(object)
 
-If `--trace-deprecation` is set, a warning and a stack trace are logged
-to the console the first time the deprecated API is used.  Configurable
-at run-time through the `process.traceDeprecation` boolean.
+    Stability: 0 - Deprecated
 
-If `--throw-deprecation` is set then the application throws an exception
-when the deprecated API is used.  Configurable at run-time through the
-`process.throwDeprecation` boolean.
+Returns `true` if the given "object" is a `Symbol`. `false` otherwise.
 
-`process.throwDeprecation` takes precedence over `process.traceDeprecation`.
+    var util = require('util');
 
-## util.debug(string)
+    util.isSymbol(5)
+      // false
+    util.isSymbol('foo')
+      // false
+    util.isSymbol(Symbol('foo'))
+      // true
 
-    Stability: 0 - Deprecated: use console.error() instead.
+## util.isUndefined(object)
 
-Deprecated predecessor of `console.error`.
+    Stability: 0 - Deprecated
 
-## util.error([...])
+Returns `true` if the given "object" is `undefined`. `false` otherwise.
 
-    Stability: 0 - Deprecated: Use console.error() instead.
+    var util = require('util');
 
-Deprecated predecessor of `console.error`.
+    var foo;
+    util.isUndefined(5)
+      // false
+    util.isUndefined(foo)
+      // true
+    util.isUndefined(null)
+      // false
 
-## util.puts([...])
+## util.log(string)
 
-    Stability: 0 - Deprecated: Use console.log() instead.
+Output with timestamp on `stdout`.
 
-Deprecated predecessor of `console.log`.
+    require('util').log('Timestamped message.');
 
 ## util.print([...])
 
@@ -503,9 +494,14 @@ Deprecated predecessor of `console.log`.
 
 Deprecated predecessor of `console.log`.
 
-
 ## util.pump(readableStream, writableStream[, callback])
 
     Stability: 0 - Deprecated: Use readableStream.pipe(writableStream)
 
 Deprecated predecessor of `stream.pipe()`.
+
+## util.puts([...])
+
+    Stability: 0 - Deprecated: Use console.log() instead.
+
+Deprecated predecessor of `console.log`.

From e1a512607a6ceb6562dd9637f370e48723f2e4e0 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Thu, 5 Nov 2015 10:40:47 -0500
Subject: [PATCH 172/323] doc: sort zlib alphabetically

Reorders, with some contextual changes, the zlib documentation
alphabetically.

- Put Convenience Methods children under the Convenience Methods header
- Renamed Options to Class Options and put above the Class definitions

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/zlib.markdown | 311 +++++++++++++++++++++---------------------
 1 file changed, 158 insertions(+), 153 deletions(-)

diff --git a/doc/api/zlib.markdown b/doc/api/zlib.markdown
index 8ca7fbad2253e3..08f8fbdf7719e1 100644
--- a/doc/api/zlib.markdown
+++ b/doc/api/zlib.markdown
@@ -103,159 +103,6 @@ tradeoffs involved in zlib usage.
       }
     }).listen(1337);
 
-## zlib.createGzip([options])
-
-Returns a new [Gzip](#zlib_class_zlib_gzip) object with an
-[options](#zlib_options).
-
-## zlib.createGunzip([options])
-
-Returns a new [Gunzip](#zlib_class_zlib_gunzip) object with an
-[options](#zlib_options).
-
-## zlib.createDeflate([options])
-
-Returns a new [Deflate](#zlib_class_zlib_deflate) object with an
-[options](#zlib_options).
-
-## zlib.createInflate([options])
-
-Returns a new [Inflate](#zlib_class_zlib_inflate) object with an
-[options](#zlib_options).
-
-## zlib.createDeflateRaw([options])
-
-Returns a new [DeflateRaw](#zlib_class_zlib_deflateraw) object with an
-[options](#zlib_options).
-
-## zlib.createInflateRaw([options])
-
-Returns a new [InflateRaw](#zlib_class_zlib_inflateraw) object with an
-[options](#zlib_options).
-
-## zlib.createUnzip([options])
-
-Returns a new [Unzip](#zlib_class_zlib_unzip) object with an
-[options](#zlib_options).
-
-
-## Class: zlib.Zlib
-
-Not exported by the `zlib` module. It is documented here because it is the base
-class of the compressor/decompressor classes.
-
-### zlib.flush([kind], callback)
-
-`kind` defaults to `zlib.Z_FULL_FLUSH`.
-
-Flush pending data. Don't call this frivolously, premature flushes negatively
-impact the effectiveness of the compression algorithm.
-
-### zlib.params(level, strategy, callback)
-
-Dynamically update the compression level and compression strategy.
-Only applicable to deflate algorithm.
-
-### zlib.reset()
-
-Reset the compressor/decompressor to factory defaults. Only applicable to
-the inflate and deflate algorithms.
-
-## Class: zlib.Gzip
-
-Compress data using gzip.
-
-## Class: zlib.Gunzip
-
-Decompress a gzip stream.
-
-## Class: zlib.Deflate
-
-Compress data using deflate.
-
-## Class: zlib.Inflate
-
-Decompress a deflate stream.
-
-## Class: zlib.DeflateRaw
-
-Compress data using deflate, and do not append a zlib header.
-
-## Class: zlib.InflateRaw
-
-Decompress a raw deflate stream.
-
-## Class: zlib.Unzip
-
-Decompress either a Gzip- or Deflate-compressed stream by auto-detecting
-the header.
-
-## Convenience Methods
-
-<!--type=misc-->
-
-All of these take a string or buffer as the first argument, an optional second
-argument to supply options to the zlib classes and will call the supplied
-callback with `callback(error, result)`.
-
-Every method has a `*Sync` counterpart, which accept the same arguments, but
-without a callback.
-
-## zlib.deflate(buf[, options], callback)
-## zlib.deflateSync(buf[, options])
-
-Compress a string with Deflate.
-
-## zlib.deflateRaw(buf[, options], callback)
-## zlib.deflateRawSync(buf[, options])
-
-Compress a string with DeflateRaw.
-
-## zlib.gzip(buf[, options], callback)
-## zlib.gzipSync(buf[, options])
-
-Compress a string with Gzip.
-
-## zlib.gunzip(buf[, options], callback)
-## zlib.gunzipSync(buf[, options])
-
-Decompress a raw Buffer with Gunzip.
-
-## zlib.inflate(buf[, options], callback)
-## zlib.inflateSync(buf[, options])
-
-Decompress a raw Buffer with Inflate.
-
-## zlib.inflateRaw(buf[, options], callback)
-## zlib.inflateRawSync(buf[, options])
-
-Decompress a raw Buffer with InflateRaw.
-
-## zlib.unzip(buf[, options], callback)
-## zlib.unzipSync(buf[, options])
-
-Decompress a raw Buffer with Unzip.
-
-## Options
-
-<!--type=misc-->
-
-Each class takes an options object.  All options are optional.
-
-Note that some options are only relevant when compressing, and are
-ignored by the decompression classes.
-
-* flush (default: `zlib.Z_NO_FLUSH`)
-* chunkSize (default: 16*1024)
-* windowBits
-* level (compression only)
-* memLevel (compression only)
-* strategy (compression only)
-* dictionary (deflate/inflate only, empty dictionary by default)
-
-See the description of `deflateInit2` and `inflateInit2` at
-<http://zlib.net/manual.html#Advanced> for more information on these.
-
 ## Memory Usage Tuning
 
 <!--type=misc-->
@@ -361,3 +208,161 @@ The deflate compression method (the only one supported in this version).
 For initializing zalloc, zfree, opaque.
 
 * `zlib.Z_NULL`
+
+## Class Options
+
+<!--type=misc-->
+
+Each class takes an options object.  All options are optional.
+
+Note that some options are only relevant when compressing, and are
+ignored by the decompression classes.
+
+* flush (default: `zlib.Z_NO_FLUSH`)
+* chunkSize (default: 16*1024)
+* windowBits
+* level (compression only)
+* memLevel (compression only)
+* strategy (compression only)
+* dictionary (deflate/inflate only, empty dictionary by default)
+
+See the description of `deflateInit2` and `inflateInit2` at
+<http://zlib.net/manual.html#Advanced> for more information on these.
+
+## Class: zlib.Deflate
+
+Compress data using deflate.
+
+## Class: zlib.DeflateRaw
+
+Compress data using deflate, and do not append a zlib header.
+
+## Class: zlib.Gunzip
+
+Decompress a gzip stream.
+
+## Class: zlib.Gzip
+
+Compress data using gzip.
+
+## Class: zlib.Inflate
+
+Decompress a deflate stream.
+
+## Class: zlib.InflateRaw
+
+Decompress a raw deflate stream.
+
+## Class: zlib.Unzip
+
+Decompress either a Gzip- or Deflate-compressed stream by auto-detecting
+the header.
+
+## Class: zlib.Zlib
+
+Not exported by the `zlib` module. It is documented here because it is the base
+class of the compressor/decompressor classes.
+
+### zlib.flush([kind], callback)
+
+`kind` defaults to `zlib.Z_FULL_FLUSH`.
+
+Flush pending data. Don't call this frivolously, premature flushes negatively
+impact the effectiveness of the compression algorithm.
+
+### zlib.params(level, strategy, callback)
+
+Dynamically update the compression level and compression strategy.
+Only applicable to deflate algorithm.
+
+### zlib.reset()
+
+Reset the compressor/decompressor to factory defaults. Only applicable to
+the inflate and deflate algorithms.
+
+## zlib.createDeflate([options])
+
+Returns a new [Deflate](#zlib_class_zlib_deflate) object with an
+[options](#zlib_options).
+
+## zlib.createDeflateRaw([options])
+
+Returns a new [DeflateRaw](#zlib_class_zlib_deflateraw) object with an
+[options](#zlib_options).
+
+## zlib.createGunzip([options])
+
+Returns a new [Gunzip](#zlib_class_zlib_gunzip) object with an
+[options](#zlib_options).
+
+## zlib.createGzip([options])
+
+Returns a new [Gzip](#zlib_class_zlib_gzip) object with an
+[options](#zlib_options).
+
+## zlib.createInflate([options])
+
+Returns a new [Inflate](#zlib_class_zlib_inflate) object with an
+[options](#zlib_options).
+
+## zlib.createInflateRaw([options])
+
+Returns a new [InflateRaw](#zlib_class_zlib_inflateraw) object with an
+[options](#zlib_options).
+
+## zlib.createUnzip([options])
+
+Returns a new [Unzip](#zlib_class_zlib_unzip) object with an
+[options](#zlib_options).
+
+## Convenience Methods
+
+<!--type=misc-->
+
+All of these take a string or buffer as the first argument, an optional second
+argument to supply options to the zlib classes and will call the supplied
+callback with `callback(error, result)`.
+
+Every method has a `*Sync` counterpart, which accept the same arguments, but
+without a callback.
+
+### zlib.deflate(buf[, options], callback)
+
+Compress a string with Deflate.
+
+### zlib.deflateRaw(buf[, options], callback)
+### zlib.deflateRawSync(buf[, options])
+
+Compress a string with DeflateRaw.
+
+### zlib.deflateSync(buf[, options])
+
+Compress a string with Deflate.
+
+### zlib.gunzip(buf[, options], callback)
+### zlib.gunzipSync(buf[, options])
+
+Decompress a raw Buffer with Gunzip.
+
+### zlib.gzip(buf[, options], callback)
+### zlib.gzipSync(buf[, options])
+
+Compress a string with Gzip.
+
+### zlib.inflate(buf[, options], callback)
+
+Decompress a raw Buffer with Inflate.
+
+### zlib.inflateRaw(buf[, options], callback)
+### zlib.inflateRawSync(buf[, options])
+
+Decompress a raw Buffer with InflateRaw.
+
+### zlib.inflateSync(buf[, options])
+
+Decompress a raw Buffer with Inflate.
+
+### zlib.unzip(buf[, options], callback)
+### zlib.unzipSync(buf[, options])
+
+Decompress a raw Buffer with Unzip.

From cfa8198af89918db5c4b01c532030d79d6516177 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Thu, 5 Nov 2015 11:00:46 -0500
Subject: [PATCH 173/323] doc: sort process alphabetically

Reorders, with no contextual changes, the process documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/process.markdown | 928 +++++++++++++++++++--------------------
 1 file changed, 451 insertions(+), 477 deletions(-)

diff --git a/doc/api/process.markdown b/doc/api/process.markdown
index 0c32799a66b6c6..55226da71c724a 100644
--- a/doc/api/process.markdown
+++ b/doc/api/process.markdown
@@ -5,50 +5,15 @@
 The `process` object is a global object and can be accessed from anywhere.
 It is an instance of [EventEmitter][].
 
-## Exit Codes
+## Event: 'beforeExit'
 
-Node.js will normally exit with a `0` status code when no more async
-operations are pending.  The following status codes are used in other
-cases:
+This event is emitted when Node.js empties its event loop and has nothing else to
+schedule. Normally, Node.js exits when there is no work scheduled, but a listener
+for 'beforeExit' can make asynchronous calls, and cause Node.js to continue.
 
-* `1` **Uncaught Fatal Exception** - There was an uncaught exception,
-  and it was not handled by a domain or an `uncaughtException` event
-  handler.
-* `2` - Unused (reserved by Bash for builtin misuse)
-* `3` **Internal JavaScript Parse Error** - The JavaScript source code
-  internal in Node.js's bootstrapping process caused a parse error.  This
-  is extremely rare, and generally can only happen during development
-  of Node.js itself.
-* `4` **Internal JavaScript Evaluation Failure** - The JavaScript
-  source code internal in Node.js's bootstrapping process failed to
-  return a function value when evaluated.  This is extremely rare, and
-  generally can only happen during development of Node.js itself.
-* `5` **Fatal Error** - There was a fatal unrecoverable error in V8.
-  Typically a message will be printed to stderr with the prefix `FATAL
-  ERROR`.
-* `6` **Non-function Internal Exception Handler** - There was an
-  uncaught exception, but the internal fatal exception handler
-  function was somehow set to a non-function, and could not be called.
-* `7` **Internal Exception Handler Run-Time Failure** - There was an
-  uncaught exception, and the internal fatal exception handler
-  function itself threw an error while attempting to handle it.  This
-  can happen, for example, if a `process.on('uncaughtException')` or
-  `domain.on('error')` handler throws an error.
-* `8` - Unused.  In previous versions of Node.js, exit code 8 sometimes
-  indicated an uncaught exception.
-* `9` - **Invalid Argument** - Either an unknown option was specified,
-  or an option requiring a value was provided without a value.
-* `10` **Internal JavaScript Run-Time Failure** - The JavaScript
-  source code internal in Node.js's bootstrapping process threw an error
-  when the bootstrapping function was called.  This is extremely rare,
-  and generally can only happen during development of Node.js itself.
-* `12` **Invalid Debug Argument** - The `--debug` and/or `--debug-brk`
-  options were set, but an invalid port number was chosen.
-* `>128` **Signal Exits** - If Node.js receives a fatal signal such as
-  `SIGKILL` or `SIGHUP`, then its exit code will be `128` plus the
-  value of the signal code.  This is a standard Unix practice, since
-  exit codes are defined to be 7-bit integers, and signal exits set
-  the high-order bit, and then contain the value of the signal code.
+'beforeExit' is not emitted for conditions causing explicit termination, such as
+`process.exit()` or uncaught exceptions, and should not be used as an
+alternative to the 'exit' event unless the intention is to schedule more work.
 
 ## Event: 'exit'
 
@@ -72,7 +37,6 @@ Example of listening for `exit`:
       console.log('About to exit with code:', code);
     });
 
-
 ## Event: 'message'
 
 * `message` {Object} a parsed JSON object or primitive value
@@ -82,17 +46,44 @@ Example of listening for `exit`:
 Messages sent by [ChildProcess.send()][] are obtained using the `'message'`
 event on the child's process object.
 
+## Event: 'rejectionHandled'
 
-## Event: 'beforeExit'
+Emitted whenever a Promise was rejected and an error handler was attached to it
+(for example with `.catch()`) later than after an event loop turn. This event
+is emitted with the following arguments:
 
-This event is emitted when Node.js empties its event loop and has nothing else to
-schedule. Normally, Node.js exits when there is no work scheduled, but a listener
-for 'beforeExit' can make asynchronous calls, and cause Node.js to continue.
+ - `p` the promise that was previously emitted in an `'unhandledRejection'`
+ event, but which has now gained a rejection handler.
 
-'beforeExit' is not emitted for conditions causing explicit termination, such as
-`process.exit()` or uncaught exceptions, and should not be used as an
-alternative to the 'exit' event unless the intention is to schedule more work.
+There is no notion of a top level for a promise chain at which rejections can
+always be handled. Being inherently asynchronous in nature, a promise rejection
+can be be handled at a future point in time — possibly much later than the
+event loop turn it takes for the `'unhandledRejection'` event to be emitted.
+
+Another way of stating this is that, unlike in synchronous code where there is
+an ever-growing list of unhandled exceptions, with promises there is a
+growing-and-shrinking list of unhandled rejections. In synchronous code, the
+'uncaughtException' event tells you when the list of unhandled exceptions
+grows. And in asynchronous code, the `'unhandledRejection'` event tells you
+when the list of unhandled rejections grows, while the 'rejectionHandled'
+event tells you when the list of unhandled rejections shrinks.
+
+For example using the rejection detection hooks in order to keep a map of all
+the rejected promise reasons at a given time:
+
+    var unhandledRejections = new Map();
+    process.on('unhandledRejection', function(reason, p) {
+      unhandledRejections.set(p, reason);
+    });
+    process.on('rejectionHandled', function(p) {
+      unhandledRejections.delete(p);
+    });
 
+This map will grow and shrink over time, reflecting rejections that start
+unhandled and then become handled. You could record the errors in some error
+log, either periodically (probably best for long-running programs, allowing
+you to clear the map, which in the case of a very buggy program could grow
+indefinitely) or upon process exit (more convenient for scripts).
 
 ## Event: 'uncaughtException'
 
@@ -177,44 +168,50 @@ this, you can either attach a dummy `.catch(function() { })` handler to
 emitted, or you can use the `'rejectionHandled'` event. Below is an
 explanation of how to do that.
 
-## Event: 'rejectionHandled'
-
-Emitted whenever a Promise was rejected and an error handler was attached to it
-(for example with `.catch()`) later than after an event loop turn. This event
-is emitted with the following arguments:
-
- - `p` the promise that was previously emitted in an `'unhandledRejection'`
- event, but which has now gained a rejection handler.
-
-There is no notion of a top level for a promise chain at which rejections can
-always be handled. Being inherently asynchronous in nature, a promise rejection
-can be be handled at a future point in time — possibly much later than the
-event loop turn it takes for the `'unhandledRejection'` event to be emitted.
-
-Another way of stating this is that, unlike in synchronous code where there is
-an ever-growing list of unhandled exceptions, with promises there is a
-growing-and-shrinking list of unhandled rejections. In synchronous code, the
-'uncaughtException' event tells you when the list of unhandled exceptions
-grows. And in asynchronous code, the `'unhandledRejection'` event tells you
-when the list of unhandled rejections grows, while the 'rejectionHandled'
-event tells you when the list of unhandled rejections shrinks.
-
-For example using the rejection detection hooks in order to keep a map of all
-the rejected promise reasons at a given time:
+## Exit Codes
 
-    var unhandledRejections = new Map();
-    process.on('unhandledRejection', function(reason, p) {
-      unhandledRejections.set(p, reason);
-    });
-    process.on('rejectionHandled', function(p) {
-      unhandledRejections.delete(p);
-    });
+Node.js will normally exit with a `0` status code when no more async
+operations are pending.  The following status codes are used in other
+cases:
 
-This map will grow and shrink over time, reflecting rejections that start
-unhandled and then become handled. You could record the errors in some error
-log, either periodically (probably best for long-running programs, allowing
-you to clear the map, which in the case of a very buggy program could grow
-indefinitely) or upon process exit (more convenient for scripts).
+* `1` **Uncaught Fatal Exception** - There was an uncaught exception,
+  and it was not handled by a domain or an `uncaughtException` event
+  handler.
+* `2` - Unused (reserved by Bash for builtin misuse)
+* `3` **Internal JavaScript Parse Error** - The JavaScript source code
+  internal in Node.js's bootstrapping process caused a parse error.  This
+  is extremely rare, and generally can only happen during development
+  of Node.js itself.
+* `4` **Internal JavaScript Evaluation Failure** - The JavaScript
+  source code internal in Node.js's bootstrapping process failed to
+  return a function value when evaluated.  This is extremely rare, and
+  generally can only happen during development of Node.js itself.
+* `5` **Fatal Error** - There was a fatal unrecoverable error in V8.
+  Typically a message will be printed to stderr with the prefix `FATAL
+  ERROR`.
+* `6` **Non-function Internal Exception Handler** - There was an
+  uncaught exception, but the internal fatal exception handler
+  function was somehow set to a non-function, and could not be called.
+* `7` **Internal Exception Handler Run-Time Failure** - There was an
+  uncaught exception, and the internal fatal exception handler
+  function itself threw an error while attempting to handle it.  This
+  can happen, for example, if a `process.on('uncaughtException')` or
+  `domain.on('error')` handler throws an error.
+* `8` - Unused.  In previous versions of Node.js, exit code 8 sometimes
+  indicated an uncaught exception.
+* `9` - **Invalid Argument** - Either an unknown option was specified,
+  or an option requiring a value was provided without a value.
+* `10` **Internal JavaScript Run-Time Failure** - The JavaScript
+  source code internal in Node.js's bootstrapping process threw an error
+  when the bootstrapping function was called.  This is extremely rare,
+  and generally can only happen during development of Node.js itself.
+* `12` **Invalid Debug Argument** - The `--debug` and/or `--debug-brk`
+  options were set, but an invalid port number was chosen.
+* `>128` **Signal Exits** - If Node.js receives a fatal signal such as
+  `SIGKILL` or `SIGHUP`, then its exit code will be `128` plus the
+  value of the signal code.  This is a standard Unix practice, since
+  exit codes are defined to be 7-bit integers, and signal exits set
+  the high-order bit, and then contain the value of the signal code.
 
 ## Signal Events
 
@@ -270,77 +267,16 @@ can be used to test for the existence of a process. Sending `SIGINT`,
 `SIGTERM`, and `SIGKILL` cause the unconditional termination of the target
 process.
 
-## process.stdout
-
-A `Writable Stream` to `stdout` (on fd `1`).
-
-For example, a `console.log` equivalent could look like this:
-
-    console.log = function(msg) {
-      process.stdout.write(msg + '\n');
-    };
-
-`process.stderr` and `process.stdout` are unlike other streams in Node.js in
-that they cannot be closed (`end()` will throw), they never emit the `finish`
-event and that writes can block when output is redirected to a file (although
-disks are fast and operating systems normally employ write-back caching so it
-should be a very rare occurrence indeed.)
-
-To check if Node.js is being run in a TTY context, read the `isTTY` property
-on `process.stderr`, `process.stdout`, or `process.stdin`:
-
-    $ node -p "Boolean(process.stdin.isTTY)"
-    true
-    $ echo "foo" | node -p "Boolean(process.stdin.isTTY)"
-    false
-
-    $ node -p "Boolean(process.stdout.isTTY)"
-    true
-    $ node -p "Boolean(process.stdout.isTTY)" | cat
-    false
-
-See [the tty docs](tty.html#tty_tty) for more information.
-
-## process.stderr
-
-A writable stream to stderr (on fd `2`).
-
-`process.stderr` and `process.stdout` are unlike other streams in Node.js in
-that they cannot be closed (`end()` will throw), they never emit the `finish`
-event and that writes can block when output is redirected to a file (although
-disks are fast and operating systems normally employ write-back caching so it
-should be a very rare occurrence indeed.)
-
-## process.stdin
-
-A `Readable Stream` for stdin (on fd `0`).
-
-Example of opening standard input and listening for both events:
-
-    process.stdin.setEncoding('utf8');
-
-    process.stdin.on('readable', function() {
-      var chunk = process.stdin.read();
-      if (chunk !== null) {
-        process.stdout.write('data: ' + chunk);
-      }
-    });
+## process.abort()
 
-    process.stdin.on('end', function() {
-      process.stdout.write('end');
-    });
+This causes Node.js to emit an abort. This will cause Node.js to exit and
+generate a core file.
 
-As a Stream, `process.stdin` can also be used in "old" mode that is compatible
-with scripts written for node.js prior to v0.10.
-For more information see
-[Stream compatibility](stream.html#stream_compatibility_with_older_node_js_versions).
+## process.arch
 
-In "old" Streams mode the stdin stream is paused by default, so one
-must call `process.stdin.resume()` to read from it. Note also that calling
-`process.stdin.resume()` itself would switch stream to "old" mode.
+What processor architecture you're running on: `'arm'`, `'ia32'`, or `'x64'`.
 
-If you are starting a new project you should prefer a more recent "new" Streams
-mode over "old" one.
+    console.log('This processor architecture is ' + process.arch);
 
 ## process.argv
 
@@ -362,64 +298,70 @@ This will generate:
     3: two=three
     4: four
 
+## process.chdir(directory)
 
-## process.execPath
+Changes the current working directory of the process or throws an exception if that fails.
 
-This is the absolute pathname of the executable that started the process.
+    console.log('Starting directory: ' + process.cwd());
+    try {
+      process.chdir('/tmp');
+      console.log('New directory: ' + process.cwd());
+    }
+    catch (err) {
+      console.log('chdir: ' + err);
+    }
 
-Example:
+## process.config
 
-    /usr/local/bin/node
-
-
-## process.execArgv
-
-This is the set of Node.js-specific command line options from the
-executable that started the process.  These options do not show up in
-`process.argv`, and do not include the Node.js executable, the name of
-the script, or any options following the script name. These options
-are useful in order to spawn child processes with the same execution
-environment as the parent.
-
-Example:
-
-    $ node --harmony script.js --version
-
-results in process.execArgv:
-
-    ['--harmony']
-
-and process.argv:
-
-    ['/usr/local/bin/node', 'script.js', '--version']
+An Object containing the JavaScript representation of the configure options
+that were used to compile the current Node.js executable. This is the same as
+the "config.gypi" file that was produced when running the `./configure` script.
 
+An example of the possible output looks like:
 
-## process.abort()
+    { target_defaults:
+       { cflags: [],
+         default_configuration: 'Release',
+         defines: [],
+         include_dirs: [],
+         libraries: [] },
+      variables:
+       { host_arch: 'x64',
+         node_install_npm: 'true',
+         node_prefix: '',
+         node_shared_cares: 'false',
+         node_shared_http_parser: 'false',
+         node_shared_libuv: 'false',
+         node_shared_zlib: 'false',
+         node_use_dtrace: 'false',
+         node_use_openssl: 'true',
+         node_shared_openssl: 'false',
+         strict_aliasing: 'true',
+         target_arch: 'x64',
+         v8_use_snapshot: 'true' } }
 
-This causes Node.js to emit an abort. This will cause Node.js to exit and
-generate a core file.
+### process.connected
 
-## process.chdir(directory)
+* {Boolean} Set to false after `process.disconnect()` is called
 
-Changes the current working directory of the process or throws an exception if that fails.
+If `process.connected` is false, it is no longer possible to send messages.
 
-    console.log('Starting directory: ' + process.cwd());
-    try {
-      process.chdir('/tmp');
-      console.log('New directory: ' + process.cwd());
-    }
-    catch (err) {
-      console.log('chdir: ' + err);
-    }
+## process.cwd()
 
+Returns the current working directory of the process.
 
+   console.log('Current directory: ' + process.cwd());
 
-## process.cwd()
+## process.disconnect()
 
-Returns the current working directory of the process.
+Close the IPC channel to the parent process, allowing this child to exit
+gracefully once there are no other connections keeping it alive.
 
-    console.log('Current directory: ' + process.cwd());
+Identical to the parent process's
+[ChildProcess.disconnect()](child_process.html#child_process_child_disconnect).
 
+If Node.js was not spawned with an IPC channel, `process.disconnect()` will be
+undefined.
 
 ## process.env
 
@@ -448,6 +390,35 @@ But this will:
     process.env.foo = 'bar';
     console.log(process.env.foo);
 
+## process.execArgv
+
+This is the set of Node.js-specific command line options from the
+executable that started the process.  These options do not show up in
+`process.argv`, and do not include the Node.js executable, the name of
+the script, or any options following the script name. These options
+are useful in order to spawn child processes with the same execution
+environment as the parent.
+
+Example:
+
+    $ node --harmony script.js --version
+
+results in process.execArgv:
+
+    ['--harmony']
+
+and process.argv:
+
+    ['/usr/local/bin/node', 'script.js', '--version']
+
+## process.execPath
+
+This is the absolute pathname of the executable that started the process.
+
+Example:
+
+    /usr/local/bin/node
+
 
 ## process.exit([code])
 
@@ -471,19 +442,6 @@ Specifying a code to `process.exit(code)` will override any previous
 setting of `process.exitCode`.
 
 
-## process.getgid()
-
-Note: this function is only available on POSIX platforms (i.e. not Windows,
-Android)
-
-Gets the group identity of the process. (See getgid(2).)
-This is the numerical group id, not the group name.
-
-    if (process.getgid) {
-      console.log('Current gid: ' + process.getgid());
-    }
-
-
 ## process.getegid()
 
 Note: this function is only available on POSIX platforms (i.e. not Windows,
@@ -497,61 +455,6 @@ This is the numerical group id, not the group name.
     }
 
 
-## process.setgid(id)
-
-Note: this function is only available on POSIX platforms (i.e. not Windows,
-Android)
-
-Sets the group identity of the process. (See setgid(2).)  This accepts either
-a numerical ID or a groupname string. If a groupname is specified, this method
-blocks while resolving it to a numerical ID.
-
-    if (process.getgid && process.setgid) {
-      console.log('Current gid: ' + process.getgid());
-      try {
-        process.setgid(501);
-        console.log('New gid: ' + process.getgid());
-      }
-      catch (err) {
-        console.log('Failed to set gid: ' + err);
-      }
-    }
-
-
-## process.setegid(id)
-
-Note: this function is only available on POSIX platforms (i.e. not Windows,
-Android)
-
-Sets the effective group identity of the process. (See setegid(2).)
-This accepts either a numerical ID or a groupname string. If a groupname
-is specified, this method blocks while resolving it to a numerical ID.
-
-    if (process.getegid && process.setegid) {
-      console.log('Current gid: ' + process.getegid());
-      try {
-        process.setegid(501);
-        console.log('New gid: ' + process.getegid());
-      }
-      catch (err) {
-        console.log('Failed to set gid: ' + err);
-      }
-    }
-
-
-## process.getuid()
-
-Note: this function is only available on POSIX platforms (i.e. not Windows,
-Android)
-
-Gets the user identity of the process. (See getuid(2).)
-This is the numerical userid, not the username.
-
-    if (process.getuid) {
-      console.log('Current uid: ' + process.getuid());
-    }
-
-
 ## process.geteuid()
 
 Note: this function is only available on POSIX platforms (i.e. not Windows,
@@ -564,67 +467,58 @@ This is the numerical userid, not the username.
       console.log('Current uid: ' + process.geteuid());
     }
 
-
-## process.setuid(id)
+## process.getgid()
 
 Note: this function is only available on POSIX platforms (i.e. not Windows,
 Android)
 
-Sets the user identity of the process. (See setuid(2).)  This accepts either
-a numerical ID or a username string.  If a username is specified, this method
-blocks while resolving it to a numerical ID.
+Gets the group identity of the process. (See getgid(2).)
+This is the numerical group id, not the group name.
 
-    if (process.getuid && process.setuid) {
-      console.log('Current uid: ' + process.getuid());
-      try {
-        process.setuid(501);
-        console.log('New uid: ' + process.getuid());
-      }
-      catch (err) {
-        console.log('Failed to set uid: ' + err);
-      }
+    if (process.getgid) {
+      console.log('Current gid: ' + process.getgid());
     }
 
-
-## process.seteuid(id)
+## process.getgroups()
 
 Note: this function is only available on POSIX platforms (i.e. not Windows,
 Android)
 
-Sets the effective user identity of the process. (See seteuid(2).)
-This accepts either a numerical ID or a username string.  If a username
-is specified, this method blocks while resolving it to a numerical ID.
-
-    if (process.geteuid && process.seteuid) {
-      console.log('Current uid: ' + process.geteuid());
-      try {
-        process.seteuid(501);
-        console.log('New uid: ' + process.geteuid());
-      }
-      catch (err) {
-        console.log('Failed to set uid: ' + err);
-      }
-    }
-
+Returns an array with the supplementary group IDs. POSIX leaves it unspecified
+if the effective group ID is included but Node.js ensures it always is.
 
-## process.getgroups()
+## process.getuid()
 
 Note: this function is only available on POSIX platforms (i.e. not Windows,
 Android)
 
-Returns an array with the supplementary group IDs. POSIX leaves it unspecified
-if the effective group ID is included but Node.js ensures it always is.
+Gets the user identity of the process. (See getuid(2).)
+This is the numerical userid, not the username.
 
+    if (process.getuid) {
+      console.log('Current uid: ' + process.getuid());
+    }
 
-## process.setgroups(groups)
+## process.hrtime()
 
-Note: this function is only available on POSIX platforms (i.e. not Windows,
-Android)
+Returns the current high-resolution real time in a `[seconds, nanoseconds]`
+tuple Array. It is relative to an arbitrary time in the past. It is not
+related to the time of day and therefore not subject to clock drift. The
+primary use is for measuring performance between intervals.
 
-Sets the supplementary group IDs. This is a privileged operation, meaning you
-need to be root or have the CAP_SETGID capability.
+You may pass in the result of a previous call to `process.hrtime()` to get
+a diff reading, useful for benchmarks and measuring intervals:
 
-The list can contain group IDs, group names or both.
+    var time = process.hrtime();
+    // [ 1800216, 25 ]
+
+    setTimeout(function() {
+      var diff = process.hrtime(time);
+      // [ 1, 552 ]
+
+      console.log('benchmark took %d nanoseconds', diff[0] * 1e9 + diff[1]);
+      // benchmark took 1000000527 nanoseconds
+    }, 1000);
 
 
 ## process.initgroups(user, extra_group)
@@ -646,104 +540,19 @@ Some care needs to be taken when dropping privileges. Example:
     process.setgid(1000);                     // drop root gid
     console.log(process.getgroups());         // [ 27, 30, 46, 1000 ]
 
+## process.kill(pid[, signal])
 
-## process.version
+Send a signal to a process. `pid` is the process id and `signal` is the
+string describing the signal to send.  Signal names are strings like
+'SIGINT' or 'SIGHUP'.  If omitted, the signal will be 'SIGTERM'.
+See [Signal Events](#process_signal_events) and kill(2) for more information.
 
-A compiled-in property that exposes `NODE_VERSION`.
+Will throw an error if target does not exist, and as a special case, a signal
+of `0` can be used to test for the existence of a process.
 
-    console.log('Version: ' + process.version);
-
-## process.versions
-
-A property exposing version strings of Node.js and its dependencies.
-
-    console.log(process.versions);
-
-Will print something like:
-
-    { http_parser: '2.3.0',
-      node: '1.1.1',
-      v8: '4.1.0.14',
-      uv: '1.3.0',
-      zlib: '1.2.8',
-      ares: '1.10.0-DEV',
-      modules: '43',
-      icu: '55.1',
-      openssl: '1.0.1k' }
-
-## process.config
-
-An Object containing the JavaScript representation of the configure options
-that were used to compile the current Node.js executable. This is the same as
-the "config.gypi" file that was produced when running the `./configure` script.
-
-An example of the possible output looks like:
-
-    { target_defaults:
-       { cflags: [],
-         default_configuration: 'Release',
-         defines: [],
-         include_dirs: [],
-         libraries: [] },
-      variables:
-       { host_arch: 'x64',
-         node_install_npm: 'true',
-         node_prefix: '',
-         node_shared_cares: 'false',
-         node_shared_http_parser: 'false',
-         node_shared_libuv: 'false',
-         node_shared_zlib: 'false',
-         node_use_dtrace: 'false',
-         node_use_openssl: 'true',
-         node_shared_openssl: 'false',
-         strict_aliasing: 'true',
-         target_arch: 'x64',
-         v8_use_snapshot: 'true' } }
-
-## process.release
-
-An Object containing metadata related to the current release, including URLs
-for the source tarball and headers-only tarball.
-
-`process.release` contains the following properties:
-
-* `name`: a string with a value that will always be `"node"` for Node.js. For
-  legacy io.js releases, this will be `"io.js"`.
-* `sourceUrl`: a complete URL pointing to a _.tar.gz_ file containing the
-  source of the current release.
-* `headersUrl`: a complete URL pointing to a _.tar.gz_ file containing only
-  the header files for the current release. This file is significantly smaller
-  than the full source file and can be used for compiling add-ons against
-  Node.js.
-* `libUrl`: a complete URL pointing to an _node.lib_ file matching the
-  architecture and version of the current release. This file is used for
-  compiling add-ons against Node.js. _This property is only present on Windows
-  builds of Node.js and will be missing on all other platforms._
-
-e.g.
-
-    { name: 'node',
-      sourceUrl: 'https://nodejs.org/download/release/v4.0.0/node-v4.0.0.tar.gz',
-      headersUrl: 'https://nodejs.org/download/release/v4.0.0/node-v4.0.0-headers.tar.gz',
-      libUrl: 'https://nodejs.org/download/release/v4.0.0/win-x64/node.lib' }
-
-In custom builds from non-release versions of the source tree, only the
-`name` property may be present. The additional properties should not be
-relied upon to exist.
-
-## process.kill(pid[, signal])
-
-Send a signal to a process. `pid` is the process id and `signal` is the
-string describing the signal to send.  Signal names are strings like
-'SIGINT' or 'SIGHUP'.  If omitted, the signal will be 'SIGTERM'.
-See [Signal Events](#process_signal_events) and kill(2) for more information.
-
-Will throw an error if target does not exist, and as a special case, a signal
-of `0` can be used to test for the existence of a process.
-
-Note that even though the name of this function is `process.kill`, it is really
-just a signal sender, like the `kill` system call.  The signal sent may do
-something other than kill the target process.
+Note that even though the name of this function is `process.kill`, it is really
+just a signal sender, like the `kill` system call.  The signal sent may do
+something other than kill the target process.
 
 Example of sending a signal to yourself:
 
@@ -761,42 +570,16 @@ Example of sending a signal to yourself:
 Note: When SIGUSR1 is received by Node.js it starts the debugger, see
 [Signal Events](#process_signal_events).
 
-## process.pid
-
-The PID of the process.
-
-    console.log('This process is pid ' + process.pid);
-
-
-## process.title
-
-Getter/setter to set what is displayed in 'ps'.
-
-When used as a setter, the maximum length is platform-specific and probably
-short.
-
-On Linux and OS X, it's limited to the size of the binary name plus the
-length of the command line arguments because it overwrites the argv memory.
-
-v0.8 allowed for longer process title strings by also overwriting the environ
-memory but that was potentially insecure/confusing in some (rather obscure)
-cases.
-
-
-## process.arch
-
-What processor architecture you're running on: `'arm'`, `'ia32'`, or `'x64'`.
-
-    console.log('This processor architecture is ' + process.arch);
-
-
-## process.platform
-
-What platform you're running on:
-`'darwin'`, `'freebsd'`, `'linux'`, `'sunos'` or `'win32'`
+## process.mainModule
 
-    console.log('This platform is ' + process.platform);
+Alternate way to retrieve
+[`require.main`](modules.html#modules_accessing_the_main_module).
+The difference is that if the main module changes at runtime, `require.main`
+might still refer to the original main module in modules that were required
+before the change occurred. Generally it's safe to assume that the two refer
+to the same module.
 
+As with `require.main`, it will be `undefined` if there was no entry script.
 
 ## process.memoryUsage()
 
@@ -892,45 +675,49 @@ event loop **before** additional I/O is processed.  As a result,
 recursively setting nextTick callbacks will block any I/O from
 happening, just like a `while(true);` loop.
 
-## process.umask([mask])
-
-Sets or reads the process's file mode creation mask. Child processes inherit
-the mask from the parent process. Returns the old mask if `mask` argument is
-given, otherwise returns the current mask.
-
-    var oldmask, newmask = 0022;
+## process.pid
 
-    oldmask = process.umask(newmask);
-    console.log('Changed umask from: ' + oldmask.toString(8) +
-                ' to ' + newmask.toString(8));
+The PID of the process.
 
+    console.log('This process is pid ' + process.pid);
 
-## process.uptime()
+## process.platform
 
-Number of seconds Node.js has been running.
+What platform you're running on:
+`'darwin'`, `'freebsd'`, `'linux'`, `'sunos'` or `'win32'`
 
+    console.log('This platform is ' + process.platform);
 
-## process.hrtime()
+## process.release
 
-Returns the current high-resolution real time in a `[seconds, nanoseconds]`
-tuple Array. It is relative to an arbitrary time in the past. It is not
-related to the time of day and therefore not subject to clock drift. The
-primary use is for measuring performance between intervals.
+An Object containing metadata related to the current release, including URLs
+for the source tarball and headers-only tarball.
 
-You may pass in the result of a previous call to `process.hrtime()` to get
-a diff reading, useful for benchmarks and measuring intervals:
+`process.release` contains the following properties:
 
-    var time = process.hrtime();
-    // [ 1800216, 25 ]
+* `name`: a string with a value that will always be `"node"` for Node.js. For
+  legacy io.js releases, this will be `"io.js"`.
+* `sourceUrl`: a complete URL pointing to a _.tar.gz_ file containing the
+  source of the current release.
+* `headersUrl`: a complete URL pointing to a _.tar.gz_ file containing only
+  the header files for the current release. This file is significantly smaller
+  than the full source file and can be used for compiling add-ons against
+  Node.js.
+* `libUrl`: a complete URL pointing to an _node.lib_ file matching the
+  architecture and version of the current release. This file is used for
+  compiling add-ons against Node.js. _This property is only present on Windows
+  builds of Node.js and will be missing on all other platforms._
 
-    setTimeout(function() {
-      var diff = process.hrtime(time);
-      // [ 1, 552 ]
+e.g.
 
-      console.log('benchmark took %d nanoseconds', diff[0] * 1e9 + diff[1]);
-      // benchmark took 1000000527 nanoseconds
-    }, 1000);
+    { name: 'node',
+      sourceUrl: 'https://nodejs.org/download/release/v4.0.0/node-v4.0.0.tar.gz',
+      headersUrl: 'https://nodejs.org/download/release/v4.0.0/node-v4.0.0-headers.tar.gz',
+      libUrl: 'https://nodejs.org/download/release/v4.0.0/win-x64/node.lib' }
 
+In custom builds from non-release versions of the source tree, only the
+`name` property may be present. The additional properties should not be
+relied upon to exist.
 
 ## process.send(message[, sendHandle][, callback])
 
@@ -944,36 +731,223 @@ event on the parent's `ChildProcess` object.
 
 If Node.js was not spawned with an IPC channel, `process.send()` will be undefined.
 
+## process.setegid(id)
 
-## process.disconnect()
+Note: this function is only available on POSIX platforms (i.e. not Windows,
+Android)
 
-Close the IPC channel to the parent process, allowing this child to exit
-gracefully once there are no other connections keeping it alive.
+Sets the effective group identity of the process. (See setegid(2).)
+This accepts either a numerical ID or a groupname string. If a groupname
+is specified, this method blocks while resolving it to a numerical ID.
 
-Identical to the parent process's
-[ChildProcess.disconnect()](child_process.html#child_process_child_disconnect).
+    if (process.getegid && process.setegid) {
+      console.log('Current gid: ' + process.getegid());
+      try {
+        process.setegid(501);
+        console.log('New gid: ' + process.getegid());
+      }
+      catch (err) {
+        console.log('Failed to set gid: ' + err);
+      }
+    }
 
-If Node.js was not spawned with an IPC channel, `process.disconnect()` will be
-undefined.
+## process.seteuid(id)
 
+Note: this function is only available on POSIX platforms (i.e. not Windows,
+Android)
 
-### process.connected
+Sets the effective user identity of the process. (See seteuid(2).)
+This accepts either a numerical ID or a username string.  If a username
+is specified, this method blocks while resolving it to a numerical ID.
 
-* {Boolean} Set to false after `process.disconnect()` is called
+    if (process.geteuid && process.seteuid) {
+      console.log('Current uid: ' + process.geteuid());
+      try {
+        process.seteuid(501);
+        console.log('New uid: ' + process.geteuid());
+      }
+      catch (err) {
+        console.log('Failed to set uid: ' + err);
+      }
+    }
 
-If `process.connected` is false, it is no longer possible to send messages.
+## process.setgid(id)
 
+Note: this function is only available on POSIX platforms (i.e. not Windows,
+Android)
 
-## process.mainModule
+Sets the group identity of the process. (See setgid(2).)  This accepts either
+a numerical ID or a groupname string. If a groupname is specified, this method
+blocks while resolving it to a numerical ID.
 
-Alternate way to retrieve
-[`require.main`](modules.html#modules_accessing_the_main_module).
-The difference is that if the main module changes at runtime, `require.main`
-might still refer to the original main module in modules that were required
-before the change occurred. Generally it's safe to assume that the two refer
-to the same module.
+    if (process.getgid && process.setgid) {
+      console.log('Current gid: ' + process.getgid());
+      try {
+        process.setgid(501);
+        console.log('New gid: ' + process.getgid());
+      }
+      catch (err) {
+        console.log('Failed to set gid: ' + err);
+      }
+    }
+
+## process.setgroups(groups)
+
+Note: this function is only available on POSIX platforms (i.e. not Windows,
+Android)
+
+Sets the supplementary group IDs. This is a privileged operation, meaning you
+need to be root or have the CAP_SETGID capability.
+
+The list can contain group IDs, group names or both.
+
+## process.setuid(id)
+
+Note: this function is only available on POSIX platforms (i.e. not Windows,
+Android)
+
+Sets the user identity of the process. (See setuid(2).)  This accepts either
+a numerical ID or a username string.  If a username is specified, this method
+blocks while resolving it to a numerical ID.
+
+    if (process.getuid && process.setuid) {
+      console.log('Current uid: ' + process.getuid());
+      try {
+        process.setuid(501);
+        console.log('New uid: ' + process.getuid());
+      }
+      catch (err) {
+        console.log('Failed to set uid: ' + err);
+      }
+    }
+
+## process.stderr
+
+A writable stream to stderr (on fd `2`).
+
+`process.stderr` and `process.stdout` are unlike other streams in Node.js in
+that they cannot be closed (`end()` will throw), they never emit the `finish`
+event and that writes can block when output is redirected to a file (although
+disks are fast and operating systems normally employ write-back caching so it
+should be a very rare occurrence indeed.)
+
+## process.stdin
+
+A `Readable Stream` for stdin (on fd `0`).
+
+Example of opening standard input and listening for both events:
+
+    process.stdin.setEncoding('utf8');
+
+    process.stdin.on('readable', function() {
+      var chunk = process.stdin.read();
+      if (chunk !== null) {
+        process.stdout.write('data: ' + chunk);
+      }
+    });
+
+    process.stdin.on('end', function() {
+      process.stdout.write('end');
+    });
+
+As a Stream, `process.stdin` can also be used in "old" mode that is compatible
+with scripts written for node.js prior to v0.10.
+For more information see
+[Stream compatibility](stream.html#stream_compatibility_with_older_node_js_versions).
+
+In "old" Streams mode the stdin stream is paused by default, so one
+must call `process.stdin.resume()` to read from it. Note also that calling
+`process.stdin.resume()` itself would switch stream to "old" mode.
+
+If you are starting a new project you should prefer a more recent "new" Streams
+mode over "old" one.
+
+## process.stdout
+
+A `Writable Stream` to `stdout` (on fd `1`).
+
+For example, a `console.log` equivalent could look like this:
+
+    console.log = function(msg) {
+      process.stdout.write(msg + '\n');
+    };
+
+`process.stderr` and `process.stdout` are unlike other streams in Node.js in
+that they cannot be closed (`end()` will throw), they never emit the `finish`
+event and that writes can block when output is redirected to a file (although
+disks are fast and operating systems normally employ write-back caching so it
+should be a very rare occurrence indeed.)
+
+To check if Node.js is being run in a TTY context, read the `isTTY` property
+on `process.stderr`, `process.stdout`, or `process.stdin`:
+
+    $ node -p "Boolean(process.stdin.isTTY)"
+    true
+    $ echo "foo" | node -p "Boolean(process.stdin.isTTY)"
+    false
+
+    $ node -p "Boolean(process.stdout.isTTY)"
+    true
+    $ node -p "Boolean(process.stdout.isTTY)" | cat
+    false
+
+See [the tty docs](tty.html#tty_tty) for more information.
+
+## process.title
+
+Getter/setter to set what is displayed in 'ps'.
+
+When used as a setter, the maximum length is platform-specific and probably
+short.
+
+On Linux and OS X, it's limited to the size of the binary name plus the
+length of the command line arguments because it overwrites the argv memory.
+
+v0.8 allowed for longer process title strings by also overwriting the environ
+memory but that was potentially insecure/confusing in some (rather obscure)
+cases.
+
+## process.umask([mask])
+
+Sets or reads the process's file mode creation mask. Child processes inherit
+the mask from the parent process. Returns the old mask if `mask` argument is
+given, otherwise returns the current mask.
+
+    var oldmask, newmask = 0022;
+
+    oldmask = process.umask(newmask);
+    console.log('Changed umask from: ' + oldmask.toString(8) +
+                ' to ' + newmask.toString(8));
+
+
+## process.uptime()
+
+Number of seconds Node.js has been running.
+
+## process.version
+
+A compiled-in property that exposes `NODE_VERSION`.
+
+    console.log('Version: ' + process.version);
+
+## process.versions
+
+A property exposing version strings of Node.js and its dependencies.
+
+    console.log(process.versions);
+
+Will print something like:
+
+    { http_parser: '2.3.0',
+      node: '1.1.1',
+      v8: '4.1.0.14',
+      uv: '1.3.0',
+      zlib: '1.2.8',
+      ares: '1.10.0-DEV',
+      modules: '43',
+      icu: '55.1',
+      openssl: '1.0.1k' }
 
-As with `require.main`, it will be `undefined` if there was no entry script.
 
 [ChildProcess.send()]: child_process.html#child_process_child_send_message_sendhandle_callback
 [EventEmitter]: events.html#events_class_events_eventemitter

From cd931a8a139119f722632958dbe733a0ddb69ac4 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Thu, 5 Nov 2015 14:15:39 -0500
Subject: [PATCH 174/323] doc: sort net alphabetically

Reorders, with minimal contextual duplication, the net documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/net.markdown | 713 +++++++++++++++++++++++--------------------
 1 file changed, 379 insertions(+), 334 deletions(-)

diff --git a/doc/api/net.markdown b/doc/api/net.markdown
index 7b328adeab1ed6..c2d8fb3e7c3669 100644
--- a/doc/api/net.markdown
+++ b/doc/api/net.markdown
@@ -6,176 +6,82 @@ The `net` module provides you with an asynchronous network wrapper. It contains
 functions for creating both servers and clients (called streams). You can include
 this module with `require('net');`.
 
-## net.createServer([options][, connectionListener])
-
-Creates a new server. The `connectionListener` argument is
-automatically set as a listener for the ['connection'][] event.
-
-`options` is an object with the following defaults:
-
-    {
-      allowHalfOpen: false,
-      pauseOnConnect: false
-    }
+## Class: net.Server
 
-If `allowHalfOpen` is `true`, then the socket won't automatically send a FIN
-packet when the other end of the socket sends a FIN packet. The socket becomes
-non-readable, but still writable. You should call the `end()` method explicitly.
-See ['end'][] event for more information.
+This class is used to create a TCP or local server.
 
-If `pauseOnConnect` is `true`, then the socket associated with each incoming
-connection will be paused, and no data will be read from its handle. This allows
-connections to be passed between processes without any data being read by the
-original process. To begin reading data from a paused socket, call `resume()`.
+`net.Server` is an [EventEmitter][] with the following events:
 
-Here is an example of an echo server which listens for connections
-on port 8124:
+### Event: 'close'
 
-    var net = require('net');
-    var server = net.createServer(function(c) { //'connection' listener
-      console.log('client connected');
-      c.on('end', function() {
-        console.log('client disconnected');
-      });
-      c.write('hello\r\n');
-      c.pipe(c);
-    });
-    server.listen(8124, function() { //'listening' listener
-      console.log('server bound');
-    });
+Emitted when the server closes. Note that if connections exist, this
+event is not emitted until all connections are ended.
 
-Test this by using `telnet`:
+### Event: 'connection'
 
-    telnet localhost 8124
+* {Socket object} The connection object
 
-To listen on the socket `/tmp/echo.sock` the third line from the last would
-just be changed to
+Emitted when a new connection is made. `socket` is an instance of
+`net.Socket`.
 
-    server.listen('/tmp/echo.sock', function() { //'listening' listener
+### Event: 'error'
 
-Use `nc` to connect to a UNIX domain socket server:
+* {Error Object}
 
-    nc -U /tmp/echo.sock
+Emitted when an error occurs.  The ['close'][] event will be called directly
+following this event.  See example in discussion of `server.listen`.
 
-## net.connect(options[, connectListener])
-## net.createConnection(options[, connectListener])
+### Event: 'listening'
 
-A factory function, which returns a new ['net.Socket'](#net_class_net_socket)
-and automatically connects with the supplied `options`.
+Emitted when the server has been bound after calling `server.listen`.
 
-The options are passed to both the ['net.Socket'](#net_class_net_socket)
-constructor and the ['socket.connect'](#net_socket_connect_options_connectlistener)
-method.
+### server.address()
 
-The `connectListener` parameter will be added as a listener for the
-['connect'][] event once.
+Returns the bound address, the address family name and port of the server
+as reported by the operating system.
+Useful to find which port was assigned when giving getting an OS-assigned address.
+Returns an object with three properties, e.g.
+`{ port: 12346, family: 'IPv4', address: '127.0.0.1' }`
 
-Here is an example of a client of the previously described echo server:
+Example:
 
-    var net = require('net');
-    var client = net.connect({port: 8124},
-        function() { //'connect' listener
-      console.log('connected to server!');
-      client.write('world!\r\n');
-    });
-    client.on('data', function(data) {
-      console.log(data.toString());
-      client.end();
-    });
-    client.on('end', function() {
-      console.log('disconnected from server');
+    var server = net.createServer(function (socket) {
+      socket.end("goodbye\n");
     });
 
-To connect on the socket `/tmp/echo.sock` the second line would just be
-changed to
-
-    var client = net.connect({path: '/tmp/echo.sock'});
-
-## net.connect(port[, host][, connectListener])
-## net.createConnection(port[, host][, connectListener])
-
-A factory function, which returns a new
-['net.Socket'](#net_class_net_socket) and automatically connects to the
-supplied `port` and `host`.
-
-If `host` is omitted, `'localhost'` will be assumed.
-
-The `connectListener` parameter will be added as a listener for the
-['connect'][] event once.
-
-## net.connect(path[, connectListener])
-## net.createConnection(path[, connectListener])
-
-A factory function, which returns a new unix
-['net.Socket'](#net_class_net_socket) and automatically connects to the
-supplied `path`.
-
-The `connectListener` parameter will be added as a listener for the
-['connect'][] event once.
-
-## Class: net.Server
-
-This class is used to create a TCP or local server.
-
-### server.listen(port[, hostname][, backlog][, callback])
-
-Begin accepting connections on the specified `port` and `hostname`. If the
-`hostname` is omitted, the server will accept connections on any IPv6 address
-(`::`) when IPv6 is available, or any IPv4 address (`0.0.0.0`) otherwise. A
-port value of zero will assign a random port.
-
-Backlog is the maximum length of the queue of pending connections.
-The actual length will be determined by your OS through sysctl settings such as
-`tcp_max_syn_backlog` and `somaxconn` on linux. The default value of this
-parameter is 511 (not 512).
-
-This function is asynchronous.  When the server has been bound,
-['listening'][] event will be emitted.  The last parameter `callback`
-will be added as a listener for the ['listening'][] event.
-
-One issue some users run into is getting `EADDRINUSE` errors. This means that
-another server is already running on the requested port. One way of handling this
-would be to wait a second and then try again. This can be done with
-
-    server.on('error', function (e) {
-      if (e.code == 'EADDRINUSE') {
-        console.log('Address in use, retrying...');
-        setTimeout(function () {
-          server.close();
-          server.listen(PORT, HOST);
-        }, 1000);
-      }
+    // grab a random port.
+    server.listen(function() {
+      address = server.address();
+      console.log("opened server on %j", address);
     });
 
-(Note: All sockets in Node.js set `SO_REUSEADDR` already)
+Don't call `server.address()` until the `'listening'` event has been emitted.
 
+### server.close([callback])
 
-### server.listen(path[, callback])
+Stops the server from accepting new connections and keeps existing
+connections. This function is asynchronous, the server is finally
+closed when all connections are ended and the server emits a ['close'][] event.
+The optional `callback` will be called once the `'close'` event occurs. Unlike
+that event, it will be called with an Error as its only argument if the server
+was not open when it was closed.
 
-* `path` {String}
-* `callback` {Function}
+### server.connections
 
-Start a local socket server listening for connections on the given `path`.
+    Stability: 0 - Deprecated: Use [server.getConnections][] instead.
 
-This function is asynchronous.  When the server has been bound,
-['listening'][] event will be emitted.  The last parameter `callback`
-will be added as a listener for the ['listening'][] event.
+The number of concurrent connections on the server.
 
-On UNIX, the local domain is usually known as the UNIX domain. The path is a
-filesystem path name. It is subject to the same naming conventions and
-permissions checks as would be done on file creation, will be visible in the
-filesystem, and will *persist until unlinked*.
+This becomes `null` when sending a socket to a child with
+`child_process.fork()`. To poll forks and get current number of active
+connections use asynchronous `server.getConnections` instead.
 
-On Windows, the local domain is implemented using a named pipe. The path *must*
-refer to an entry in `\\?\pipe\` or `\\.\pipe\`. Any characters are permitted,
-but the latter may do some processing of pipe names, such as resolving `..`
-sequences. Despite appearances, the pipe name space is flat.  Pipes will *not
-persist*, they are removed when the last reference to them is closed. Do not
-forget JavaScript string escaping requires paths to be specified with
-double-backslashes, such as:
+### server.getConnections(callback)
 
-    net.createServer().listen(
-        path.join('\\\\?\\pipe', process.cwd(), 'myctl'))
+Asynchronously get the number of concurrent connections on the server. Works
+when sockets were sent to forks.
+
+Callback should take two arguments `err` and `count`.
 
 ### server.listen(handle[, callback])
 
@@ -224,52 +130,64 @@ shown below.
       exclusive: true
     });
 
-### server.close([callback])
+### server.listen(path[, callback])
 
-Stops the server from accepting new connections and keeps existing
-connections. This function is asynchronous, the server is finally
-closed when all connections are ended and the server emits a ['close'][] event.
-The optional `callback` will be called once the `'close'` event occurs. Unlike
-that event, it will be called with an Error as its only argument if the server
-was not open when it was closed.
+* `path` {String}
+* `callback` {Function}
 
-### server.address()
+Start a local socket server listening for connections on the given `path`.
 
-Returns the bound address, the address family name and port of the server
-as reported by the operating system.
-Useful to find which port was assigned when giving getting an OS-assigned address.
-Returns an object with three properties, e.g.
-`{ port: 12346, family: 'IPv4', address: '127.0.0.1' }`
+This function is asynchronous.  When the server has been bound,
+['listening'][] event will be emitted.  The last parameter `callback`
+will be added as a listener for the ['listening'][] event.
 
-Example:
+On UNIX, the local domain is usually known as the UNIX domain. The path is a
+filesystem path name. It is subject to the same naming conventions and
+permissions checks as would be done on file creation, will be visible in the
+filesystem, and will *persist until unlinked*.
 
-    var server = net.createServer(function (socket) {
-      socket.end("goodbye\n");
-    });
+On Windows, the local domain is implemented using a named pipe. The path *must*
+refer to an entry in `\\?\pipe\` or `\\.\pipe\`. Any characters are permitted,
+but the latter may do some processing of pipe names, such as resolving `..`
+sequences. Despite appearances, the pipe name space is flat.  Pipes will *not
+persist*, they are removed when the last reference to them is closed. Do not
+forget JavaScript string escaping requires paths to be specified with
+double-backslashes, such as:
 
-    // grab a random port.
-    server.listen(function() {
-      address = server.address();
-      console.log("opened server on %j", address);
-    });
+    net.createServer().listen(
+        path.join('\\\\?\\pipe', process.cwd(), 'myctl'))
 
-Don't call `server.address()` until the `'listening'` event has been emitted.
+### server.listen(port[, hostname][, backlog][, callback])
 
-### server.unref()
+Begin accepting connections on the specified `port` and `hostname`. If the
+`hostname` is omitted, the server will accept connections on any IPv6 address
+(`::`) when IPv6 is available, or any IPv4 address (`0.0.0.0`) otherwise. A
+port value of zero will assign a random port.
 
-Calling `unref` on a server will allow the program to exit if this is the only
-active server in the event system. If the server is already `unref`d calling
-`unref` again will have no effect.
+Backlog is the maximum length of the queue of pending connections.
+The actual length will be determined by your OS through sysctl settings such as
+`tcp_max_syn_backlog` and `somaxconn` on linux. The default value of this
+parameter is 511 (not 512).
 
-Returns `server`.
+This function is asynchronous.  When the server has been bound,
+['listening'][] event will be emitted.  The last parameter `callback`
+will be added as a listener for the ['listening'][] event.
 
-### server.ref()
+One issue some users run into is getting `EADDRINUSE` errors. This means that
+another server is already running on the requested port. One way of handling this
+would be to wait a second and then try again. This can be done with
 
-Opposite of `unref`, calling `ref` on a previously `unref`d server will *not*
-let the program exit if it's the only server left (the default behavior). If
-the server is `ref`d calling `ref` again will have no effect.
+    server.on('error', function (e) {
+      if (e.code == 'EADDRINUSE') {
+        console.log('Address in use, retrying...');
+        setTimeout(function () {
+          server.close();
+          server.listen(PORT, HOST);
+        }, 1000);
+      }
+    });
 
-Returns `server`.
+(Note: All sockets in Node.js set `SO_REUSEADDR` already)
 
 ### server.maxConnections
 
@@ -279,47 +197,21 @@ high.
 It is not recommended to use this option once a socket has been sent to a child
 with `child_process.fork()`.
 
-### server.connections
-
-    Stability: 0 - Deprecated: Use [server.getConnections][] instead.
-
-The number of concurrent connections on the server.
-
-This becomes `null` when sending a socket to a child with
-`child_process.fork()`. To poll forks and get current number of active
-connections use asynchronous `server.getConnections` instead.
-
-### server.getConnections(callback)
-
-Asynchronously get the number of concurrent connections on the server. Works
-when sockets were sent to forks.
-
-Callback should take two arguments `err` and `count`.
-
-`net.Server` is an [EventEmitter][] with the following events:
-
-### Event: 'listening'
-
-Emitted when the server has been bound after calling `server.listen`.
-
-### Event: 'connection'
-
-* {Socket object} The connection object
-
-Emitted when a new connection is made. `socket` is an instance of
-`net.Socket`.
+### server.ref()
 
-### Event: 'close'
+Opposite of `unref`, calling `ref` on a previously `unref`d server will *not*
+let the program exit if it's the only server left (the default behavior). If
+the server is `ref`d calling `ref` again will have no effect.
 
-Emitted when the server closes. Note that if connections exist, this
-event is not emitted until all connections are ended.
+Returns `server`.
 
-### Event: 'error'
+### server.unref()
 
-* {Error Object}
+Calling `unref` on a server will allow the program to exit if this is the only
+active server in the event system. If the server is already `unref`d calling
+`unref` again will have no effect.
 
-Emitted when an error occurs.  The ['close'][] event will be called directly
-following this event.  See example in discussion of `server.listen`.
+Returns `server`.
 
 ## Class: net.Socket
 
@@ -345,44 +237,76 @@ Set `readable` and/or `writable` to `true` to allow reads and/or writes on this
 socket (NOTE: Works only when `fd` is passed).
 About `allowHalfOpen`, refer to `createServer()` and `'end'` event.
 
-### socket.connect(options[, connectListener])
+`net.Socket` instances are [EventEmitter][] with the following events:
 
-Opens the connection for a given socket.
+### Event: 'close'
 
-For TCP sockets, `options` argument should be an object which specifies:
+* `had_error` {Boolean} `true` if the socket had a transmission error.
 
-  - `port`: Port the client should connect to (Required).
+Emitted once the socket is fully closed. The argument `had_error` is a boolean
+which says if the socket was closed due to a transmission error.
 
-  - `host`: Host the client should connect to. Defaults to `'localhost'`.
+### Event: 'connect'
 
-  - `localAddress`: Local interface to bind to for network connections.
+Emitted when a socket connection is successfully established.
+See `connect()`.
 
-  - `localPort`: Local port to bind to for network connections.
+### Event: 'data'
 
-  - `family` : Version of IP stack. Defaults to `4`.
+* {Buffer object}
 
-  - `lookup` : Custom lookup function. Defaults to `dns.lookup`.
+Emitted when data is received.  The argument `data` will be a `Buffer` or
+`String`.  Encoding of data is set by `socket.setEncoding()`.
+(See the [Readable Stream][] section for more information.)
 
-For local domain sockets, `options` argument should be an object which
-specifies:
+Note that the __data will be lost__ if there is no listener when a `Socket`
+emits a `'data'` event.
 
-  - `path`: Path the client should connect to (Required).
+### Event: 'drain'
 
-Normally this method is not needed, as `net.createConnection` opens the
-socket. Use this only if you are implementing a custom Socket.
+Emitted when the write buffer becomes empty. Can be used to throttle uploads.
 
-This function is asynchronous. When the ['connect'][] event is emitted the
-socket is established. If there is a problem connecting, the `'connect'` event
-will not be emitted, the `'error'` event will be emitted with the exception.
+See also: the return values of `socket.write()`
 
-The `connectListener` parameter will be added as a listener for the
-['connect'][] event.
+### Event: 'end'
 
-### socket.connect(port[, host][, connectListener])
-### socket.connect(path[, connectListener])
+Emitted when the other end of the socket sends a FIN packet.
 
-As [socket.connect(options[, connectListener])](#net_socket_connect_options_connectlistener),
-with options either as either `{port: port, host: host}` or `{path: path}`.
+By default (`allowHalfOpen == false`) the socket will destroy its file
+descriptor  once it has written out its pending write queue.  However, by
+setting `allowHalfOpen == true` the socket will not automatically `end()`
+its side allowing the user to write arbitrary amounts of data, with the
+caveat that the user is required to `end()` their side now.
+
+### Event: 'error'
+
+* {Error object}
+
+Emitted when an error occurs.  The `'close'` event will be called directly
+following this event.
+
+### Event: 'lookup'
+
+Emitted after resolving the hostname but before connecting.
+Not applicable to UNIX sockets.
+
+* `err` {Error | Null} The error object.  See [dns.lookup()][].
+* `address` {String} The IP address.
+* `family` {String | Null} The address type.  See [dns.lookup()][].
+
+### Event: 'timeout'
+
+Emitted if the socket times out from inactivity. This is only to notify that
+the socket has been idle. The user must manually close the connection.
+
+See also: `socket.setTimeout()`
+
+### socket.address()
+
+Returns the bound address, the address family name and port of the
+socket as reported by the operating system. Returns an object with
+three properties, e.g.
+`{ port: 12346, family: 'IPv4', address: '127.0.0.1' }`
 
 ### socket.bufferSize
 
@@ -402,23 +326,57 @@ encoded, so the exact number of bytes is not known.)
 Users who experience large or growing `bufferSize` should attempt to
 "throttle" the data flows in their program with `pause()` and `resume()`.
 
+### socket.bytesRead
 
-### socket.setEncoding([encoding])
+The amount of received bytes.
 
-Set the encoding for the socket as a Readable Stream. See
-[stream.setEncoding()][] for more information.
+### socket.bytesWritten
 
-### socket.write(data[, encoding][, callback])
+The amount of bytes sent.
 
-Sends data on the socket. The second parameter specifies the encoding in the
-case of a string--it defaults to UTF8 encoding.
+### socket.connect(options[, connectListener])
 
-Returns `true` if the entire data was flushed successfully to the kernel
-buffer. Returns `false` if all or part of the data was queued in user memory.
-`'drain'` will be emitted when the buffer is again free.
+Opens the connection for a given socket.
 
-The optional `callback` parameter will be executed when the data is finally
-written out - this may not be immediately.
+For TCP sockets, `options` argument should be an object which specifies:
+
+  - `port`: Port the client should connect to (Required).
+
+  - `host`: Host the client should connect to. Defaults to `'localhost'`.
+
+  - `localAddress`: Local interface to bind to for network connections.
+
+  - `localPort`: Local port to bind to for network connections.
+
+  - `family` : Version of IP stack. Defaults to `4`.
+
+  - `lookup` : Custom lookup function. Defaults to `dns.lookup`.
+
+For local domain sockets, `options` argument should be an object which
+specifies:
+
+  - `path`: Path the client should connect to (Required).
+
+Normally this method is not needed, as `net.createConnection` opens the
+socket. Use this only if you are implementing a custom Socket.
+
+This function is asynchronous. When the ['connect'][] event is emitted the
+socket is established. If there is a problem connecting, the `'connect'` event
+will not be emitted, the `'error'` event will be emitted with the exception.
+
+The `connectListener` parameter will be added as a listener for the
+['connect'][] event.
+
+### socket.connect(path[, connectListener])
+### socket.connect(port[, host][, connectListener])
+
+As [socket.connect(options[, connectListener])](#net_socket_connect_options_connectlistener),
+with options either as either `{port: port, host: host}` or `{path: path}`.
+
+### socket.destroy()
+
+Ensures that no more I/O activity happens on this socket. Only necessary in
+case of errors (parse error or so).
 
 ### socket.end([data][, encoding])
 
@@ -428,44 +386,52 @@ server will still send some data.
 If `data` is specified, it is equivalent to calling
 `socket.write(data, encoding)` followed by `socket.end()`.
 
-### socket.destroy()
+### socket.localAddress
 
-Ensures that no more I/O activity happens on this socket. Only necessary in
-case of errors (parse error or so).
+The string representation of the local IP address the remote client is
+connecting on. For example, if you are listening on `'0.0.0.0'` and the
+client connects on `'192.168.1.1'`, the value would be `'192.168.1.1'`.
+
+### socket.localPort
+
+The numeric representation of the local port. For example,
+`80` or `21`.
 
 ### socket.pause()
 
 Pauses the reading of data. That is, `'data'` events will not be emitted.
 Useful to throttle back an upload.
 
-### socket.resume()
+### socket.ref()
 
-Resumes reading after a call to `pause()`.
+Opposite of `unref`, calling `ref` on a previously `unref`d socket will *not*
+let the program exit if it's the only socket left (the default behavior). If
+the socket is `ref`d calling `ref` again will have no effect.
 
-### socket.setTimeout(timeout[, callback])
+Returns `socket`.
 
-Sets the socket to timeout after `timeout` milliseconds of inactivity on
-the socket. By default `net.Socket` do not have a timeout.
+### socket.remoteAddress
 
-When an idle timeout is triggered the socket will receive a `'timeout'`
-event but the connection will not be severed. The user must manually `end()`
-or `destroy()` the socket.
+The string representation of the remote IP address. For example,
+`'74.125.127.100'` or `'2001:4860:a005::68'`.
 
-If `timeout` is 0, then the existing idle timeout is disabled.
+### socket.remoteFamily
 
-The optional `callback` parameter will be added as a one time listener for the
-`'timeout'` event.
+The string representation of the remote IP family. `'IPv4'` or `'IPv6'`.
 
-Returns `socket`.
+### socket.remotePort
 
-### socket.setNoDelay([noDelay])
+The numeric representation of the remote port. For example,
+`80` or `21`.
 
-Disables the Nagle algorithm. By default TCP connections use the Nagle
-algorithm, they buffer data before sending it off. Setting `true` for
-`noDelay` will immediately fire off data each time `socket.write()` is called.
-`noDelay` defaults to `true`.
+### socket.resume()
 
-Returns `socket`.
+Resumes reading after a call to `pause()`.
+
+### socket.setEncoding([encoding])
+
+Set the encoding for the socket as a Readable Stream. See
+[stream.setEncoding()][] for more information.
 
 ### socket.setKeepAlive([enable][, initialDelay])
 
@@ -480,12 +446,30 @@ initialDelay will leave the value unchanged from the default
 
 Returns `socket`.
 
-### socket.address()
+### socket.setNoDelay([noDelay])
 
-Returns the bound address, the address family name and port of the
-socket as reported by the operating system. Returns an object with
-three properties, e.g.
-`{ port: 12346, family: 'IPv4', address: '127.0.0.1' }`
+Disables the Nagle algorithm. By default TCP connections use the Nagle
+algorithm, they buffer data before sending it off. Setting `true` for
+`noDelay` will immediately fire off data each time `socket.write()` is called.
+`noDelay` defaults to `true`.
+
+Returns `socket`.
+
+### socket.setTimeout(timeout[, callback])
+
+Sets the socket to timeout after `timeout` milliseconds of inactivity on
+the socket. By default `net.Socket` do not have a timeout.
+
+When an idle timeout is triggered the socket will receive a `'timeout'`
+event but the connection will not be severed. The user must manually `end()`
+or `destroy()` the socket.
+
+If `timeout` is 0, then the existing idle timeout is disabled.
+
+The optional `callback` parameter will be added as a one time listener for the
+`'timeout'` event.
+
+Returns `socket`.
 
 ### socket.unref()
 
@@ -495,113 +479,174 @@ active socket in the event system. If the socket is already `unref`d calling
 
 Returns `socket`.
 
-### socket.ref()
+### socket.write(data[, encoding][, callback])
 
-Opposite of `unref`, calling `ref` on a previously `unref`d socket will *not*
-let the program exit if it's the only socket left (the default behavior). If
-the socket is `ref`d calling `ref` again will have no effect.
+Sends data on the socket. The second parameter specifies the encoding in the
+case of a string--it defaults to UTF8 encoding.
 
-Returns `socket`.
+Returns `true` if the entire data was flushed successfully to the kernel
+buffer. Returns `false` if all or part of the data was queued in user memory.
+`'drain'` will be emitted when the buffer is again free.
 
-### socket.remoteAddress
+The optional `callback` parameter will be executed when the data is finally
+written out - this may not be immediately.
 
-The string representation of the remote IP address. For example,
-`'74.125.127.100'` or `'2001:4860:a005::68'`.
+## net.connect(options[, connectListener])
 
-### socket.remoteFamily
+A factory function, which returns a new ['net.Socket'](#net_class_net_socket)
+and automatically connects with the supplied `options`.
 
-The string representation of the remote IP family. `'IPv4'` or `'IPv6'`.
+The options are passed to both the ['net.Socket'](#net_class_net_socket)
+constructor and the ['socket.connect'](#net_socket_connect_options_connectlistener)
+method.
 
-### socket.remotePort
+The `connectListener` parameter will be added as a listener for the
+['connect'][] event once.
 
-The numeric representation of the remote port. For example,
-`80` or `21`.
+Here is an example of a client of the previously described echo server:
 
-### socket.localAddress
+    var net = require('net');
+    var client = net.connect({port: 8124},
+        function() { //'connect' listener
+      console.log('connected to server!');
+      client.write('world!\r\n');
+    });
+    client.on('data', function(data) {
+      console.log(data.toString());
+      client.end();
+    });
+    client.on('end', function() {
+      console.log('disconnected from server');
+    });
 
-The string representation of the local IP address the remote client is
-connecting on. For example, if you are listening on `'0.0.0.0'` and the
-client connects on `'192.168.1.1'`, the value would be `'192.168.1.1'`.
+To connect on the socket `/tmp/echo.sock` the second line would just be
+changed to
 
-### socket.localPort
+    var client = net.connect({path: '/tmp/echo.sock'});
 
-The numeric representation of the local port. For example,
-`80` or `21`.
+## net.connect(path[, connectListener])
 
-### socket.bytesRead
+A factory function, which returns a new unix
+['net.Socket'](#net_class_net_socket) and automatically connects to the
+supplied `path`.
 
-The amount of received bytes.
+The `connectListener` parameter will be added as a listener for the
+['connect'][] event once.
 
-### socket.bytesWritten
+## net.connect(port[, host][, connectListener])
 
-The amount of bytes sent.
+A factory function, which returns a new
+['net.Socket'](#net_class_net_socket) and automatically connects to the
+supplied `port` and `host`.
 
+If `host` is omitted, `'localhost'` will be assumed.
 
-`net.Socket` instances are [EventEmitter][] with the following events:
+The `connectListener` parameter will be added as a listener for the
+['connect'][] event once.
 
-### Event: 'lookup'
+## net.createConnection(options[, connectListener])
 
-Emitted after resolving the hostname but before connecting.
-Not applicable to UNIX sockets.
+A factory function, which returns a new ['net.Socket'](#net_class_net_socket)
+and automatically connects with the supplied `options`.
 
-* `err` {Error | Null} The error object.  See [dns.lookup()][].
-* `address` {String} The IP address.
-* `family` {String | Null} The address type.  See [dns.lookup()][].
+The options are passed to both the ['net.Socket'](#net_class_net_socket)
+constructor and the ['socket.connect'](#net_socket_connect_options_connectlistener)
+method.
 
-### Event: 'connect'
+The `connectListener` parameter will be added as a listener for the
+['connect'][] event once.
 
-Emitted when a socket connection is successfully established.
-See `connect()`.
+Here is an example of a client of the previously described echo server:
 
-### Event: 'data'
+    var net = require('net');
+    var client = net.connect({port: 8124},
+        function() { //'connect' listener
+      console.log('connected to server!');
+      client.write('world!\r\n');
+    });
+    client.on('data', function(data) {
+      console.log(data.toString());
+      client.end();
+    });
+    client.on('end', function() {
+      console.log('disconnected from server');
+    });
 
-* {Buffer object}
+To connect on the socket `/tmp/echo.sock` the second line would just be
+changed to
 
-Emitted when data is received.  The argument `data` will be a `Buffer` or
-`String`.  Encoding of data is set by `socket.setEncoding()`.
-(See the [Readable Stream][] section for more information.)
+    var client = net.connect({path: '/tmp/echo.sock'});
 
-Note that the __data will be lost__ if there is no listener when a `Socket`
-emits a `'data'` event.
+## net.createConnection(path[, connectListener])
 
-### Event: 'end'
+A factory function, which returns a new unix
+['net.Socket'](#net_class_net_socket) and automatically connects to the
+supplied `path`.
 
-Emitted when the other end of the socket sends a FIN packet.
+The `connectListener` parameter will be added as a listener for the
+['connect'][] event once.
 
-By default (`allowHalfOpen == false`) the socket will destroy its file
-descriptor  once it has written out its pending write queue.  However, by
-setting `allowHalfOpen == true` the socket will not automatically `end()`
-its side allowing the user to write arbitrary amounts of data, with the
-caveat that the user is required to `end()` their side now.
+## net.createConnection(port[, host][, connectListener])
 
+A factory function, which returns a new
+['net.Socket'](#net_class_net_socket) and automatically connects to the
+supplied `port` and `host`.
 
-### Event: 'timeout'
+If `host` is omitted, `'localhost'` will be assumed.
 
-Emitted if the socket times out from inactivity. This is only to notify that
-the socket has been idle. The user must manually close the connection.
+The `connectListener` parameter will be added as a listener for the
+['connect'][] event once.
 
-See also: `socket.setTimeout()`
+## net.createServer([options][, connectionListener])
 
+Creates a new server. The `connectionListener` argument is
+automatically set as a listener for the ['connection'][] event.
 
-### Event: 'drain'
+`options` is an object with the following defaults:
 
-Emitted when the write buffer becomes empty. Can be used to throttle uploads.
+    {
+      allowHalfOpen: false,
+      pauseOnConnect: false
+    }
 
-See also: the return values of `socket.write()`
+If `allowHalfOpen` is `true`, then the socket won't automatically send a FIN
+packet when the other end of the socket sends a FIN packet. The socket becomes
+non-readable, but still writable. You should call the `end()` method explicitly.
+See ['end'][] event for more information.
 
-### Event: 'error'
+If `pauseOnConnect` is `true`, then the socket associated with each incoming
+connection will be paused, and no data will be read from its handle. This allows
+connections to be passed between processes without any data being read by the
+original process. To begin reading data from a paused socket, call `resume()`.
 
-* {Error object}
+Here is an example of an echo server which listens for connections
+on port 8124:
 
-Emitted when an error occurs.  The `'close'` event will be called directly
-following this event.
+    var net = require('net');
+    var server = net.createServer(function(c) { //'connection' listener
+      console.log('client connected');
+      c.on('end', function() {
+        console.log('client disconnected');
+      });
+      c.write('hello\r\n');
+      c.pipe(c);
+    });
+    server.listen(8124, function() { //'listening' listener
+      console.log('server bound');
+    });
 
-### Event: 'close'
+Test this by using `telnet`:
 
-* `had_error` {Boolean} `true` if the socket had a transmission error.
+    telnet localhost 8124
 
-Emitted once the socket is fully closed. The argument `had_error` is a boolean
-which says if the socket was closed due to a transmission error.
+To listen on the socket `/tmp/echo.sock` the third line from the last would
+just be changed to
+
+    server.listen('/tmp/echo.sock', function() { //'listening' listener
+
+Use `nc` to connect to a UNIX domain socket server:
+
+    nc -U /tmp/echo.sock
 
 ## net.isIP(input)
 

From 7e60b81c81337c8906e72a216dce6ecf8ec5a8f8 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Thu, 5 Nov 2015 14:54:10 -0500
Subject: [PATCH 175/323] doc: sort stream alphabetically

Reorders, with no contextual changes, the stream documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/stream.markdown | 1110 +++++++++++++++++++--------------------
 1 file changed, 551 insertions(+), 559 deletions(-)

diff --git a/doc/api/stream.markdown b/doc/api/stream.markdown
index 4dfc36e09e6648..c4d3f79ce1d88d 100644
--- a/doc/api/stream.markdown
+++ b/doc/api/stream.markdown
@@ -93,6 +93,17 @@ server.listen(1337);
 // error: Unexpected token o
 ```
 
+### Class: stream.Duplex
+
+Duplex streams are streams that implement both the [Readable][] and
+[Writable][] interfaces.  See above for usage.
+
+Examples of Duplex streams include:
+
+* [tcp sockets][]
+* [zlib streams][]
+* [crypto streams][]
+
 ### Class: stream.Readable
 
 <!--type=class-->
@@ -145,52 +156,13 @@ Examples of readable streams include:
 * [child process stdout and stderr][]
 * [process.stdin][]
 
-#### Event: 'readable'
-
-When a chunk of data can be read from the stream, it will emit a
-`'readable'` event.
-
-In some cases, listening for a `'readable'` event will cause some data
-to be read into the internal buffer from the underlying system, if it
-hadn't already.
-
-```javascript
-var readable = getReadableStreamSomehow();
-readable.on('readable', function() {
-  // there is some data to read now
-});
-```
-
-Once the internal buffer is drained, a `readable` event will fire
-again when more data is available.
-
-The `readable` event is not emitted in the "flowing" mode with the
-sole exception of the last one, on end-of-stream.
-
-The 'readable' event indicates that the stream has new information:
-either new data is available or the end of the stream has been reached.
-In the former case, `.read()` will return that data. In the latter case,
-`.read()` will return null. For instance, in the following example, `foo.txt`
-is an empty file:
-
-```javascript
-var fs = require('fs');
-var rr = fs.createReadStream('foo.txt');
-rr.on('readable', function() {
-  console.log('readable:', rr.read());
-});
-rr.on('end', function() {
-  console.log('end');
-});
-```
+#### Event: 'close'
 
-The output of running this script is:
+Emitted when the stream and any of its underlying resources (a file
+descriptor, for example) have been closed. The event indicates that
+no more events will be emitted, and no further computation will occur.
 
-```
-bash-3.2$ node test.js
-readable: null
-end
-```
+Not all streams will emit the 'close' event.
 
 #### Event: 'data'
 
@@ -228,101 +200,75 @@ readable.on('end', function() {
 });
 ```
 
-#### Event: 'close'
-
-Emitted when the stream and any of its underlying resources (a file
-descriptor, for example) have been closed. The event indicates that
-no more events will be emitted, and no further computation will occur.
-
-Not all streams will emit the 'close' event.
-
 #### Event: 'error'
 
 * {Error Object}
 
 Emitted if there was an error receiving data.
 
-#### readable.read([size])
-
-* `size` {Number} Optional argument to specify how much data to read.
-* Return {String | Buffer | null}
-
-The `read()` method pulls some data out of the internal buffer and
-returns it.  If there is no data available, then it will return
-`null`.
-
-If you pass in a `size` argument, then it will return that many
-bytes.  If `size` bytes are not available, then it will return `null`,
-unless we've ended, in which case it will return the data remaining
-in the buffer.
+#### Event: 'readable'
 
-If you do not specify a `size` argument, then it will return all the
-data in the internal buffer.
+When a chunk of data can be read from the stream, it will emit a
+`'readable'` event.
 
-This method should only be called in paused mode.  In flowing mode,
-this method is called automatically until the internal buffer is
-drained.
+In some cases, listening for a `'readable'` event will cause some data
+to be read into the internal buffer from the underlying system, if it
+hadn't already.
 
 ```javascript
 var readable = getReadableStreamSomehow();
 readable.on('readable', function() {
-  var chunk;
-  while (null !== (chunk = readable.read())) {
-    console.log('got %d bytes of data', chunk.length);
-  }
+  // there is some data to read now
 });
 ```
 
-If this method returns a data chunk, then it will also trigger the
-emission of a [`'data'` event][].
-
-Note that calling `readable.read([size])` after the `end` event has been
-triggered will return `null`. No runtime error will be raised.
-
-#### readable.setEncoding(encoding)
-
-* `encoding` {String} The encoding to use.
-* Return: `this`
+Once the internal buffer is drained, a `readable` event will fire
+again when more data is available.
 
-Call this function to cause the stream to return strings of the
-specified encoding instead of Buffer objects.  For example, if you do
-`readable.setEncoding('utf8')`, then the output data will be
-interpreted as UTF-8 data, and returned as strings.  If you do
-`readable.setEncoding('hex')`, then the data will be encoded in
-hexadecimal string format.
+The `readable` event is not emitted in the "flowing" mode with the
+sole exception of the last one, on end-of-stream.
 
-This properly handles multi-byte characters that would otherwise be
-potentially mangled if you simply pulled the Buffers directly and
-called `buf.toString(encoding)` on them.  If you want to read the data
-as strings, always use this method.
+The 'readable' event indicates that the stream has new information:
+either new data is available or the end of the stream has been reached.
+In the former case, `.read()` will return that data. In the latter case,
+`.read()` will return null. For instance, in the following example, `foo.txt`
+is an empty file:
 
 ```javascript
-var readable = getReadableStreamSomehow();
-readable.setEncoding('utf8');
-readable.on('data', function(chunk) {
-  assert.equal(typeof chunk, 'string');
-  console.log('got %d characters of string data', chunk.length);
+var fs = require('fs');
+var rr = fs.createReadStream('foo.txt');
+rr.on('readable', function() {
+  console.log('readable:', rr.read());
+});
+rr.on('end', function() {
+  console.log('end');
 });
 ```
 
-#### readable.resume()
+The output of running this script is:
 
-* Return: `this`
+```
+bash-3.2$ node test.js
+readable: null
+end
+```
 
-This method will cause the readable stream to resume emitting `data`
-events.
+#### readable.isPaused()
 
-This method will switch the stream into flowing mode.  If you do *not*
-want to consume the data from a stream, but you *do* want to get to
-its `end` event, you can call [`readable.resume()`][] to open the flow of
-data.
+* Return: `Boolean`
+
+This method returns whether or not the `readable` has been **explicitly**
+paused by client code (using `readable.pause()` without a corresponding
+`readable.resume()`).
 
 ```javascript
-var readable = getReadableStreamSomehow();
-readable.resume();
-readable.on('end', function() {
-  console.log('got to the end, but did not read anything');
-});
+var readable = new stream.Readable
+
+readable.isPaused() // === false
+readable.pause()
+readable.isPaused() // === true
+readable.resume()
+readable.isPaused() // === false
 ```
 
 #### readable.pause()
@@ -346,24 +292,6 @@ readable.on('data', function(chunk) {
 });
 ```
 
-#### readable.isPaused()
-
-* Return: `Boolean`
-
-This method returns whether or not the `readable` has been **explicitly**
-paused by client code (using `readable.pause()` without a corresponding
-`readable.resume()`).
-
-```javascript
-var readable = new stream.Readable
-
-readable.isPaused() // === false
-readable.pause()
-readable.isPaused() // === true
-readable.resume()
-readable.isPaused() // === false
-```
-
 #### readable.pipe(destination[, options])
 
 * `destination` {[Writable][] Stream} The destination for writing data
@@ -416,54 +344,137 @@ reader.on('end', function() {
 Note that `process.stderr` and `process.stdout` are never closed until
 the process exits, regardless of the specified options.
 
-#### readable.unpipe([destination])
+#### readable.read([size])
 
-* `destination` {[Writable][] Stream} Optional specific stream to unpipe
+* `size` {Number} Optional argument to specify how much data to read.
+* Return {String | Buffer | null}
 
-This method will remove the hooks set up for a previous `pipe()` call.
+The `read()` method pulls some data out of the internal buffer and
+returns it.  If there is no data available, then it will return
+`null`.
 
-If the destination is not specified, then all pipes are removed.
+If you pass in a `size` argument, then it will return that many
+bytes.  If `size` bytes are not available, then it will return `null`,
+unless we've ended, in which case it will return the data remaining
+in the buffer.
 
-If the destination is specified, but no pipe is set up for it, then
-this is a no-op.
+If you do not specify a `size` argument, then it will return all the
+data in the internal buffer.
+
+This method should only be called in paused mode.  In flowing mode,
+this method is called automatically until the internal buffer is
+drained.
 
 ```javascript
 var readable = getReadableStreamSomehow();
-var writable = fs.createWriteStream('file.txt');
-// All the data from readable goes into 'file.txt',
-// but only for the first second
-readable.pipe(writable);
-setTimeout(function() {
-  console.log('stop writing to file.txt');
-  readable.unpipe(writable);
-  console.log('manually close the file stream');
-  writable.end();
-}, 1000);
+readable.on('readable', function() {
+  var chunk;
+  while (null !== (chunk = readable.read())) {
+    console.log('got %d bytes of data', chunk.length);
+  }
+});
 ```
 
-#### readable.unshift(chunk)
+If this method returns a data chunk, then it will also trigger the
+emission of a [`'data'` event][].
 
-* `chunk` {Buffer | String} Chunk of data to unshift onto the read queue
+Note that calling `readable.read([size])` after the `end` event has been
+triggered will return `null`. No runtime error will be raised.
 
-This is useful in certain cases where a stream is being consumed by a
-parser, which needs to "un-consume" some data that it has
-optimistically pulled out of the source, so that the stream can be
-passed on to some other party.
+#### readable.resume()
 
-Note that `stream.unshift(chunk)` cannot be called after the `end` event
-has been triggered; a runtime error will be raised.
+* Return: `this`
 
-If you find that you must often call `stream.unshift(chunk)` in your
-programs, consider implementing a [Transform][] stream instead.  (See API
-for Stream Implementors, below.)
+This method will cause the readable stream to resume emitting `data`
+events.
+
+This method will switch the stream into flowing mode.  If you do *not*
+want to consume the data from a stream, but you *do* want to get to
+its `end` event, you can call [`readable.resume()`][] to open the flow of
+data.
 
 ```javascript
-// Pull off a header delimited by \n\n
-// use unshift() if we get too much
-// Call the callback with (error, header, stream)
-var StringDecoder = require('string_decoder').StringDecoder;
-function parseHeader(stream, callback) {
-  stream.on('error', callback);
+var readable = getReadableStreamSomehow();
+readable.resume();
+readable.on('end', function() {
+  console.log('got to the end, but did not read anything');
+});
+```
+
+#### readable.setEncoding(encoding)
+
+* `encoding` {String} The encoding to use.
+* Return: `this`
+
+Call this function to cause the stream to return strings of the
+specified encoding instead of Buffer objects.  For example, if you do
+`readable.setEncoding('utf8')`, then the output data will be
+interpreted as UTF-8 data, and returned as strings.  If you do
+`readable.setEncoding('hex')`, then the data will be encoded in
+hexadecimal string format.
+
+This properly handles multi-byte characters that would otherwise be
+potentially mangled if you simply pulled the Buffers directly and
+called `buf.toString(encoding)` on them.  If you want to read the data
+as strings, always use this method.
+
+```javascript
+var readable = getReadableStreamSomehow();
+readable.setEncoding('utf8');
+readable.on('data', function(chunk) {
+  assert.equal(typeof chunk, 'string');
+  console.log('got %d characters of string data', chunk.length);
+});
+```
+
+#### readable.unpipe([destination])
+
+* `destination` {[Writable][] Stream} Optional specific stream to unpipe
+
+This method will remove the hooks set up for a previous `pipe()` call.
+
+If the destination is not specified, then all pipes are removed.
+
+If the destination is specified, but no pipe is set up for it, then
+this is a no-op.
+
+```javascript
+var readable = getReadableStreamSomehow();
+var writable = fs.createWriteStream('file.txt');
+// All the data from readable goes into 'file.txt',
+// but only for the first second
+readable.pipe(writable);
+setTimeout(function() {
+  console.log('stop writing to file.txt');
+  readable.unpipe(writable);
+  console.log('manually close the file stream');
+  writable.end();
+}, 1000);
+```
+
+#### readable.unshift(chunk)
+
+* `chunk` {Buffer | String} Chunk of data to unshift onto the read queue
+
+This is useful in certain cases where a stream is being consumed by a
+parser, which needs to "un-consume" some data that it has
+optimistically pulled out of the source, so that the stream can be
+passed on to some other party.
+
+Note that `stream.unshift(chunk)` cannot be called after the `end` event
+has been triggered; a runtime error will be raised.
+
+If you find that you must often call `stream.unshift(chunk)` in your
+programs, consider implementing a [Transform][] stream instead.  (See API
+for Stream Implementors, below.)
+
+```javascript
+// Pull off a header delimited by \n\n
+// use unshift() if we get too much
+// Call the callback with (error, header, stream)
+var StringDecoder = require('string_decoder').StringDecoder;
+function parseHeader(stream, callback) {
+  stream.on('error', callback);
   stream.on('readable', onReadable);
   var decoder = new StringDecoder('utf8');
   var header = '';
@@ -528,6 +539,16 @@ myReader.on('readable', function() {
 });
 ```
 
+### Class: stream.Transform
+
+Transform streams are [Duplex][] streams where the output is in some way
+computed from the input.  They implement both the [Readable][] and
+[Writable][] interfaces.  See above for usage.
+
+Examples of Transform streams include:
+
+* [zlib streams][]
+* [crypto streams][]
 
 ### Class: stream.Writable
 
@@ -547,25 +568,6 @@ Examples of writable streams include:
 * [child process stdin](child_process.html#child_process_child_stdin)
 * [process.stdout][], [process.stderr][]
 
-#### writable.write(chunk[, encoding][, callback])
-
-* `chunk` {String | Buffer} The data to write
-* `encoding` {String} The encoding, if `chunk` is a String
-* `callback` {Function} Callback for when this chunk of data is flushed
-* Returns: {Boolean} True if the data was handled completely.
-
-This method writes some data to the underlying system, and calls the
-supplied callback once the data has been fully handled.
-
-The return value indicates if you should continue writing right now.
-If the data had to be buffered internally, then it will return
-`false`.  Otherwise, it will return `true`.
-
-This return value is strictly advisory.  You MAY continue to write,
-even if it returns `false`.  However, writes will be buffered in
-memory, so it is best not to do this excessively.  Instead, wait for
-the `drain` event before writing more data.
-
 #### Event: 'drain'
 
 If a [`writable.write(chunk)`][] call returns false, then the `drain`
@@ -600,40 +602,11 @@ function writeOneMillionTimes(writer, data, encoding, callback) {
 }
 ```
 
-#### writable.cork()
-
-Forces buffering of all writes.
-
-Buffered data will be flushed either at `.uncork()` or at `.end()` call.
-
-#### writable.uncork()
-
-Flush all data, buffered since `.cork()` call.
-
-#### writable.setDefaultEncoding(encoding)
-
-* `encoding` {String} The new default encoding
-
-Sets the default encoding for a writable stream.
-
-#### writable.end([chunk][, encoding][, callback])
-
-* `chunk` {String | Buffer} Optional data to write
-* `encoding` {String} The encoding, if `chunk` is a String
-* `callback` {Function} Optional callback for when the stream is finished
-
-Call this method when no more data will be written to the stream.  If
-supplied, the callback is attached as a listener on the `finish` event.
+#### Event: 'error'
 
-Calling [`write()`][] after calling [`end()`][] will raise an error.
+* {Error object}
 
-```javascript
-// write 'hello, ' and then end with 'world!'
-var file = fs.createWriteStream('example.txt');
-file.write('hello, ');
-file.end('world!');
-// writing more now is not allowed!
-```
+Emitted if there was an error when writing or piping data.
 
 #### Event: 'finish'
 
@@ -686,34 +659,59 @@ reader.pipe(writer);
 reader.unpipe(writer);
 ```
 
-#### Event: 'error'
+#### writable.cork()
 
-* {Error object}
+Forces buffering of all writes.
 
-Emitted if there was an error when writing or piping data.
+Buffered data will be flushed either at `.uncork()` or at `.end()` call.
 
-### Class: stream.Duplex
+#### writable.end([chunk][, encoding][, callback])
 
-Duplex streams are streams that implement both the [Readable][] and
-[Writable][] interfaces.  See above for usage.
+* `chunk` {String | Buffer} Optional data to write
+* `encoding` {String} The encoding, if `chunk` is a String
+* `callback` {Function} Optional callback for when the stream is finished
 
-Examples of Duplex streams include:
+Call this method when no more data will be written to the stream.  If
+supplied, the callback is attached as a listener on the `finish` event.
 
-* [tcp sockets][]
-* [zlib streams][]
-* [crypto streams][]
+Calling [`write()`][] after calling [`end()`][] will raise an error.
 
+```javascript
+// write 'hello, ' and then end with 'world!'
+var file = fs.createWriteStream('example.txt');
+file.write('hello, ');
+file.end('world!');
+// writing more now is not allowed!
+```
 
-### Class: stream.Transform
+#### writable.setDefaultEncoding(encoding)
 
-Transform streams are [Duplex][] streams where the output is in some way
-computed from the input.  They implement both the [Readable][] and
-[Writable][] interfaces.  See above for usage.
+* `encoding` {String} The new default encoding
 
-Examples of Transform streams include:
+Sets the default encoding for a writable stream.
 
-* [zlib streams][]
-* [crypto streams][]
+#### writable.uncork()
+
+Flush all data, buffered since `.cork()` call.
+
+#### writable.write(chunk[, encoding][, callback])
+
+* `chunk` {String | Buffer} The data to write
+* `encoding` {String} The encoding, if `chunk` is a String
+* `callback` {Function} Callback for when this chunk of data is flushed
+* Returns: {Boolean} True if the data was handled completely.
+
+This method writes some data to the underlying system, and calls the
+supplied callback once the data has been fully handled.
+
+The return value indicates if you should continue writing right now.
+If the data had to be buffered internally, then it will return
+`false`.  Otherwise, it will return `true`.
+
+This return value is strictly advisory.  You MAY continue to write,
+even if it returns `false`.  However, writes will be buffered in
+memory, so it is best not to do this excessively.  Instead, wait for
+the `drain` event before writing more data.
 
 
 ## API for Stream Implementors
@@ -796,6 +794,49 @@ methods described in [API for Stream Consumers][] above.  Otherwise, you
 can potentially cause adverse side effects in programs that consume
 your streaming interfaces.
 
+### Class: stream.Duplex
+
+<!--type=class-->
+
+A "duplex" stream is one that is both Readable and Writable, such as a
+TCP socket connection.
+
+Note that `stream.Duplex` is an abstract class designed to be extended
+with an underlying implementation of the `_read(size)` and
+[`_write(chunk, encoding, callback)`][] methods as you would with a
+Readable or Writable stream class.
+
+Since JavaScript doesn't have multiple prototypal inheritance, this
+class prototypally inherits from Readable, and then parasitically from
+Writable.  It is thus up to the user to implement both the lowlevel
+`_read(n)` method as well as the lowlevel
+[`_write(chunk, encoding, callback)`][] method on extension duplex classes.
+
+#### new stream.Duplex(options)
+
+* `options` {Object} Passed to both Writable and Readable
+  constructors. Also has the following fields:
+  * `allowHalfOpen` {Boolean} Default=true.  If set to `false`, then
+    the stream will automatically end the readable side when the
+    writable side ends and vice versa.
+  * `readableObjectMode` {Boolean} Default=false. Sets `objectMode`
+    for readable side of the stream. Has no effect if `objectMode`
+    is `true`.
+  * `writableObjectMode` {Boolean} Default=false. Sets `objectMode`
+    for writable side of the stream. Has no effect if `objectMode`
+    is `true`.
+
+In classes that extend the Duplex class, make sure to call the
+constructor so that the buffering settings can be properly
+initialized.
+
+### Class: stream.PassThrough
+
+This is a trivial implementation of a [Transform][] stream that simply
+passes the input bytes across to the output.  Its purpose is mainly
+for examples and testing, but there are occasionally use cases where
+it can come in handy as a building block for novel sorts of streams.
+
 ### Class: stream.Readable
 
 <!--type=class-->
@@ -807,15 +848,115 @@ Please see above under [API for Stream Consumers][] for how to consume
 streams in your programs.  What follows is an explanation of how to
 implement Readable streams in your programs.
 
-#### Example: A Counting Stream
-
-<!--type=example-->
-
-This is a basic example of a Readable stream.  It emits the numerals
-from 1 to 1,000,000 in ascending order, and then ends.
+#### new stream.Readable([options])
 
-```javascript
-var Readable = require('stream').Readable;
+* `options` {Object}
+  * `highWaterMark` {Number} The maximum number of bytes to store in
+    the internal buffer before ceasing to read from the underlying
+    resource.  Default=16kb, or 16 for `objectMode` streams
+  * `encoding` {String} If specified, then buffers will be decoded to
+    strings using the specified encoding.  Default=null
+  * `objectMode` {Boolean} Whether this stream should behave
+    as a stream of objects. Meaning that stream.read(n) returns
+    a single value instead of a Buffer of size n.  Default=false
+
+In classes that extend the Readable class, make sure to call the
+Readable constructor so that the buffering settings can be properly
+initialized.
+
+#### readable.\_read(size)
+
+* `size` {Number} Number of bytes to read asynchronously
+
+Note: **Implement this method, but do NOT call it directly.**
+
+This method is prefixed with an underscore because it is internal to the
+class that defines it and should only be called by the internal Readable
+class methods. All Readable stream implementations must provide a _read
+method to fetch data from the underlying resource.
+
+When _read is called, if data is available from the resource, `_read` should
+start pushing that data into the read queue by calling `this.push(dataChunk)`.
+`_read` should continue reading from the resource and pushing data until push
+returns false, at which point it should stop reading from the resource. Only
+when _read is called again after it has stopped should it start reading
+more data from the resource and pushing that data onto the queue.
+
+Note: once the `_read()` method is called, it will not be called again until
+the `push` method is called.
+
+The `size` argument is advisory.  Implementations where a "read" is a
+single call that returns data can use this to know how much data to
+fetch.  Implementations where that is not relevant, such as TCP or
+TLS, may ignore this argument, and simply provide data whenever it
+becomes available.  There is no need, for example to "wait" until
+`size` bytes are available before calling [`stream.push(chunk)`][].
+
+#### readable.push(chunk[, encoding])
+
+* `chunk` {Buffer | null | String} Chunk of data to push into the read queue
+* `encoding` {String} Encoding of String chunks.  Must be a valid
+  Buffer encoding, such as `'utf8'` or `'ascii'`
+* return {Boolean} Whether or not more pushes should be performed
+
+Note: **This method should be called by Readable implementors, NOT
+by consumers of Readable streams.**
+
+If a value other than null is passed, The `push()` method adds a chunk of data
+into the queue for subsequent stream processors to consume. If `null` is
+passed, it signals the end of the stream (EOF), after which no more data
+can be written.
+
+The data added with `push` can be pulled out by calling the `read()` method
+when the `'readable'`event fires.
+
+This API is designed to be as flexible as possible.  For example,
+you may be wrapping a lower-level source which has some sort of
+pause/resume mechanism, and a data callback.  In those cases, you
+could wrap the low-level source object by doing something like this:
+
+```javascript
+// source is an object with readStop() and readStart() methods,
+// and an `ondata` member that gets called when it has data, and
+// an `onend` member that gets called when the data is over.
+
+util.inherits(SourceWrapper, Readable);
+
+function SourceWrapper(options) {
+  Readable.call(this, options);
+
+  this._source = getLowlevelSourceObject();
+  var self = this;
+
+  // Every time there's data, we push it into the internal buffer.
+  this._source.ondata = function(chunk) {
+    // if push() returns false, then we need to stop reading from source
+    if (!self.push(chunk))
+      self._source.readStop();
+  };
+
+  // When the source ends, we push the EOF-signaling `null` chunk
+  this._source.onend = function() {
+    self.push(null);
+  };
+}
+
+// _read will be called when the stream wants to pull more data in
+// the advisory size argument is ignored in this case.
+SourceWrapper.prototype._read = function(size) {
+  this._source.readStart();
+};
+```
+
+#### Example: A Counting Stream
+
+<!--type=example-->
+
+This is a basic example of a Readable stream.  It emits the numerals
+from 1 to 1,000,000 in ascending order, and then ends.
+
+```javascript
+var Readable = require('stream').Readable;
 var util = require('util');
 util.inherits(Counter, Readable);
 
@@ -951,220 +1092,6 @@ SimpleProtocol.prototype._read = function(n) {
 // with the parsed header data.
 ```
 
-
-#### new stream.Readable([options])
-
-* `options` {Object}
-  * `highWaterMark` {Number} The maximum number of bytes to store in
-    the internal buffer before ceasing to read from the underlying
-    resource.  Default=16kb, or 16 for `objectMode` streams
-  * `encoding` {String} If specified, then buffers will be decoded to
-    strings using the specified encoding.  Default=null
-  * `objectMode` {Boolean} Whether this stream should behave
-    as a stream of objects. Meaning that stream.read(n) returns
-    a single value instead of a Buffer of size n.  Default=false
-
-In classes that extend the Readable class, make sure to call the
-Readable constructor so that the buffering settings can be properly
-initialized.
-
-#### readable.\_read(size)
-
-* `size` {Number} Number of bytes to read asynchronously
-
-Note: **Implement this method, but do NOT call it directly.**
-
-This method is prefixed with an underscore because it is internal to the
-class that defines it and should only be called by the internal Readable
-class methods. All Readable stream implementations must provide a _read
-method to fetch data from the underlying resource.
-
-When _read is called, if data is available from the resource, `_read` should
-start pushing that data into the read queue by calling `this.push(dataChunk)`.
-`_read` should continue reading from the resource and pushing data until push
-returns false, at which point it should stop reading from the resource. Only
-when _read is called again after it has stopped should it start reading
-more data from the resource and pushing that data onto the queue.
-
-Note: once the `_read()` method is called, it will not be called again until
-the `push` method is called.
-
-The `size` argument is advisory.  Implementations where a "read" is a
-single call that returns data can use this to know how much data to
-fetch.  Implementations where that is not relevant, such as TCP or
-TLS, may ignore this argument, and simply provide data whenever it
-becomes available.  There is no need, for example to "wait" until
-`size` bytes are available before calling [`stream.push(chunk)`][].
-
-#### readable.push(chunk[, encoding])
-
-* `chunk` {Buffer | null | String} Chunk of data to push into the read queue
-* `encoding` {String} Encoding of String chunks.  Must be a valid
-  Buffer encoding, such as `'utf8'` or `'ascii'`
-* return {Boolean} Whether or not more pushes should be performed
-
-Note: **This method should be called by Readable implementors, NOT
-by consumers of Readable streams.**
-
-If a value other than null is passed, The `push()` method adds a chunk of data
-into the queue for subsequent stream processors to consume. If `null` is
-passed, it signals the end of the stream (EOF), after which no more data
-can be written.
-
-The data added with `push` can be pulled out by calling the `read()` method
-when the `'readable'`event fires.
-
-This API is designed to be as flexible as possible.  For example,
-you may be wrapping a lower-level source which has some sort of
-pause/resume mechanism, and a data callback.  In those cases, you
-could wrap the low-level source object by doing something like this:
-
-```javascript
-// source is an object with readStop() and readStart() methods,
-// and an `ondata` member that gets called when it has data, and
-// an `onend` member that gets called when the data is over.
-
-util.inherits(SourceWrapper, Readable);
-
-function SourceWrapper(options) {
-  Readable.call(this, options);
-
-  this._source = getLowlevelSourceObject();
-  var self = this;
-
-  // Every time there's data, we push it into the internal buffer.
-  this._source.ondata = function(chunk) {
-    // if push() returns false, then we need to stop reading from source
-    if (!self.push(chunk))
-      self._source.readStop();
-  };
-
-  // When the source ends, we push the EOF-signaling `null` chunk
-  this._source.onend = function() {
-    self.push(null);
-  };
-}
-
-// _read will be called when the stream wants to pull more data in
-// the advisory size argument is ignored in this case.
-SourceWrapper.prototype._read = function(size) {
-  this._source.readStart();
-};
-```
-
-
-### Class: stream.Writable
-
-<!--type=class-->
-
-`stream.Writable` is an abstract class designed to be extended with an
-underlying implementation of the [`_write(chunk, encoding, callback)`][] method.
-
-Please see above under [API for Stream Consumers][] for how to consume
-writable streams in your programs.  What follows is an explanation of
-how to implement Writable streams in your programs.
-
-#### new stream.Writable([options])
-
-* `options` {Object}
-  * `highWaterMark` {Number} Buffer level when [`write()`][] starts
-    returning false. Default=16kb, or 16 for `objectMode` streams
-  * `decodeStrings` {Boolean} Whether or not to decode strings into
-    Buffers before passing them to [`_write()`][].  Default=true
-  * `objectMode` {Boolean} Whether or not the `write(anyObj)` is
-    a valid operation. If set you can write arbitrary data instead
-    of only `Buffer` / `String` data.  Default=false
-
-In classes that extend the Writable class, make sure to call the
-constructor so that the buffering settings can be properly
-initialized.
-
-#### writable.\_write(chunk, encoding, callback)
-
-* `chunk` {Buffer | String} The chunk to be written. Will **always**
-  be a buffer unless the `decodeStrings` option was set to `false`.
-* `encoding` {String} If the chunk is a string, then this is the
-  encoding type. If chunk is a buffer, then this is the special
-  value - 'buffer', ignore it in this case.
-* `callback` {Function} Call this function (optionally with an error
-  argument) when you are done processing the supplied chunk.
-
-All Writable stream implementations must provide a [`_write()`][]
-method to send data to the underlying resource.
-
-Note: **This function MUST NOT be called directly.**  It should be
-implemented by child classes, and called by the internal Writable
-class methods only.
-
-Call the callback using the standard `callback(error)` pattern to
-signal that the write completed successfully or with an error.
-
-If the `decodeStrings` flag is set in the constructor options, then
-`chunk` may be a string rather than a Buffer, and `encoding` will
-indicate the sort of string that it is.  This is to support
-implementations that have an optimized handling for certain string
-data encodings.  If you do not explicitly set the `decodeStrings`
-option to `false`, then you can safely ignore the `encoding` argument,
-and assume that `chunk` will always be a Buffer.
-
-This method is prefixed with an underscore because it is internal to
-the class that defines it, and should not be called directly by user
-programs.  However, you **are** expected to override this method in
-your own extension classes.
-
-#### writable.\_writev(chunks, callback)
-
-* `chunks` {Array} The chunks to be written.  Each chunk has following
-  format: `{ chunk: ..., encoding: ... }`.
-* `callback` {Function} Call this function (optionally with an error
-  argument) when you are done processing the supplied chunks.
-
-Note: **This function MUST NOT be called directly.**  It may be
-implemented by child classes, and called by the internal Writable
-class methods only.
-
-This function is completely optional to implement. In most cases it is
-unnecessary.  If implemented, it will be called with all the chunks
-that are buffered in the write queue.
-
-
-### Class: stream.Duplex
-
-<!--type=class-->
-
-A "duplex" stream is one that is both Readable and Writable, such as a
-TCP socket connection.
-
-Note that `stream.Duplex` is an abstract class designed to be extended
-with an underlying implementation of the `_read(size)` and
-[`_write(chunk, encoding, callback)`][] methods as you would with a
-Readable or Writable stream class.
-
-Since JavaScript doesn't have multiple prototypal inheritance, this
-class prototypally inherits from Readable, and then parasitically from
-Writable.  It is thus up to the user to implement both the lowlevel
-`_read(n)` method as well as the lowlevel
-[`_write(chunk, encoding, callback)`][] method on extension duplex classes.
-
-#### new stream.Duplex(options)
-
-* `options` {Object} Passed to both Writable and Readable
-  constructors. Also has the following fields:
-  * `allowHalfOpen` {Boolean} Default=true.  If set to `false`, then
-    the stream will automatically end the readable side when the
-    writable side ends and vice versa.
-  * `readableObjectMode` {Boolean} Default=false. Sets `objectMode`
-    for readable side of the stream. Has no effect if `objectMode`
-    is `true`.
-  * `writableObjectMode` {Boolean} Default=false. Sets `objectMode`
-    for writable side of the stream. Has no effect if `objectMode`
-    is `true`.
-
-In classes that extend the Duplex class, make sure to call the
-constructor so that the buffering settings can be properly
-initialized.
-
-
 ### Class: stream.Transform
 
 A "transform" stream is a duplex stream where the output is causally
@@ -1181,14 +1108,49 @@ Rather than implement the [`_read()`][] and [`_write()`][] methods, Transform
 classes must implement the `_transform()` method, and may optionally
 also implement the `_flush()` method.  (See below.)
 
-#### new stream.Transform([options])
+#### new stream.Transform([options])
+
+* `options` {Object} Passed to both Writable and Readable
+  constructors.
+
+In classes that extend the Transform class, make sure to call the
+constructor so that the buffering settings can be properly
+initialized.
+
+#### Events: 'finish' and 'end'
+
+The [`finish`][] and [`end`][] events are from the parent Writable
+and Readable classes respectively. The `finish` event is fired after
+`.end()` is called and all chunks have been processed by `_transform`,
+`end` is fired after all data has been output which is after the callback
+in `_flush` has been called.
+
+#### transform.\_flush(callback)
+
+* `callback` {Function} Call this function (optionally with an error
+  argument) when you are done flushing any remaining data.
+
+Note: **This function MUST NOT be called directly.**  It MAY be implemented
+by child classes, and if so, will be called by the internal Transform
+class methods only.
 
-* `options` {Object} Passed to both Writable and Readable
-  constructors.
+In some cases, your transform operation may need to emit a bit more
+data at the end of the stream.  For example, a `Zlib` compression
+stream will store up some internal state so that it can optimally
+compress the output.  At the end, however, it needs to do the best it
+can with what is left, so that the data will be complete.
 
-In classes that extend the Transform class, make sure to call the
-constructor so that the buffering settings can be properly
-initialized.
+In those cases, you can implement a `_flush` method, which will be
+called at the very end, after all the written data is consumed, but
+before emitting `end` to signal the end of the readable side.  Just
+like with `_transform`, call `transform.push(chunk)` zero or more
+times, as appropriate, and call `callback` when the flush operation is
+complete.
+
+This method is prefixed with an underscore because it is internal to
+the class that defines it, and should not be called directly by user
+programs.  However, you **are** expected to override this method in
+your own extension classes.
 
 #### transform.\_transform(chunk, encoding, callback)
 
@@ -1238,41 +1200,6 @@ the class that defines it, and should not be called directly by user
 programs.  However, you **are** expected to override this method in
 your own extension classes.
 
-#### transform.\_flush(callback)
-
-* `callback` {Function} Call this function (optionally with an error
-  argument) when you are done flushing any remaining data.
-
-Note: **This function MUST NOT be called directly.**  It MAY be implemented
-by child classes, and if so, will be called by the internal Transform
-class methods only.
-
-In some cases, your transform operation may need to emit a bit more
-data at the end of the stream.  For example, a `Zlib` compression
-stream will store up some internal state so that it can optimally
-compress the output.  At the end, however, it needs to do the best it
-can with what is left, so that the data will be complete.
-
-In those cases, you can implement a `_flush` method, which will be
-called at the very end, after all the written data is consumed, but
-before emitting `end` to signal the end of the readable side.  Just
-like with `_transform`, call `transform.push(chunk)` zero or more
-times, as appropriate, and call `callback` when the flush operation is
-complete.
-
-This method is prefixed with an underscore because it is internal to
-the class that defines it, and should not be called directly by user
-programs.  However, you **are** expected to override this method in
-your own extension classes.
-
-#### Events: 'finish' and 'end'
-
-The [`finish`][] and [`end`][] events are from the parent Writable
-and Readable classes respectively. The `finish` event is fired after
-`.end()` is called and all chunks have been processed by `_transform`,
-`end` is fired after all data has been output which is after the callback
-in `_flush` has been called.
-
 #### Example: `SimpleProtocol` parser v2
 
 The example above of a simple protocol parser can be implemented
@@ -1351,13 +1278,79 @@ SimpleProtocol.prototype._transform = function(chunk, encoding, done) {
 // with the parsed header data.
 ```
 
+### Class: stream.Writable
 
-### Class: stream.PassThrough
+<!--type=class-->
 
-This is a trivial implementation of a [Transform][] stream that simply
-passes the input bytes across to the output.  Its purpose is mainly
-for examples and testing, but there are occasionally use cases where
-it can come in handy as a building block for novel sorts of streams.
+`stream.Writable` is an abstract class designed to be extended with an
+underlying implementation of the [`_write(chunk, encoding, callback)`][] method.
+
+Please see above under [API for Stream Consumers][] for how to consume
+writable streams in your programs.  What follows is an explanation of
+how to implement Writable streams in your programs.
+
+#### new stream.Writable([options])
+
+* `options` {Object}
+  * `highWaterMark` {Number} Buffer level when [`write()`][] starts
+    returning false. Default=16kb, or 16 for `objectMode` streams
+  * `decodeStrings` {Boolean} Whether or not to decode strings into
+    Buffers before passing them to [`_write()`][].  Default=true
+  * `objectMode` {Boolean} Whether or not the `write(anyObj)` is
+    a valid operation. If set you can write arbitrary data instead
+    of only `Buffer` / `String` data.  Default=false
+
+In classes that extend the Writable class, make sure to call the
+constructor so that the buffering settings can be properly
+initialized.
+
+#### writable.\_write(chunk, encoding, callback)
+
+* `chunk` {Buffer | String} The chunk to be written. Will **always**
+  be a buffer unless the `decodeStrings` option was set to `false`.
+* `encoding` {String} If the chunk is a string, then this is the
+  encoding type. If chunk is a buffer, then this is the special
+  value - 'buffer', ignore it in this case.
+* `callback` {Function} Call this function (optionally with an error
+  argument) when you are done processing the supplied chunk.
+
+All Writable stream implementations must provide a [`_write()`][]
+method to send data to the underlying resource.
+
+Note: **This function MUST NOT be called directly.**  It should be
+implemented by child classes, and called by the internal Writable
+class methods only.
+
+Call the callback using the standard `callback(error)` pattern to
+signal that the write completed successfully or with an error.
+
+If the `decodeStrings` flag is set in the constructor options, then
+`chunk` may be a string rather than a Buffer, and `encoding` will
+indicate the sort of string that it is.  This is to support
+implementations that have an optimized handling for certain string
+data encodings.  If you do not explicitly set the `decodeStrings`
+option to `false`, then you can safely ignore the `encoding` argument,
+and assume that `chunk` will always be a Buffer.
+
+This method is prefixed with an underscore because it is internal to
+the class that defines it, and should not be called directly by user
+programs.  However, you **are** expected to override this method in
+your own extension classes.
+
+#### writable.\_writev(chunks, callback)
+
+* `chunks` {Array} The chunks to be written.  Each chunk has following
+  format: `{ chunk: ..., encoding: ... }`.
+* `callback` {Function} Call this function (optionally with an error
+  argument) when you are done processing the supplied chunks.
+
+Note: **This function MUST NOT be called directly.**  It may be
+implemented by child classes, and called by the internal Writable
+class methods only.
+
+This function is completely optional to implement. In most cases it is
+unnecessary.  If implemented, it will be called with all the chunks
+that are buffered in the write queue.
 
 
 ## Simplified Constructor API
@@ -1370,32 +1363,6 @@ This can be done by passing the appropriate methods as constructor options:
 
 Examples:
 
-### Readable
-```javascript
-var readable = new stream.Readable({
-  read: function(n) {
-    // sets this._read under the hood
-  }
-});
-```
-
-### Writable
-```javascript
-var writable = new stream.Writable({
-  write: function(chunk, encoding, next) {
-    // sets this._write under the hood
-  }
-});
-
-// or
-
-var writable = new stream.Writable({
-  writev: function(chunks, next) {
-    // sets this._writev under the hood
-  }
-});
-```
-
 ### Duplex
 ```javascript
 var duplex = new stream.Duplex({
@@ -1419,6 +1386,15 @@ var duplex = new stream.Duplex({
 });
 ```
 
+### Readable
+```javascript
+var readable = new stream.Readable({
+  read: function(n) {
+    // sets this._read under the hood
+  }
+});
+```
+
 ### Transform
 ```javascript
 var transform = new stream.Transform({
@@ -1431,6 +1407,23 @@ var transform = new stream.Transform({
 });
 ```
 
+### Writable
+```javascript
+var writable = new stream.Writable({
+  write: function(chunk, encoding, next) {
+    // sets this._write under the hood
+  }
+});
+
+// or
+
+var writable = new stream.Writable({
+  writev: function(chunks, next) {
+    // sets this._writev under the hood
+  }
+});
+```
+
 ## Streams: Under the Hood
 
 <!--type=misc-->
@@ -1458,40 +1451,6 @@ The purpose of streams, especially with the `pipe()` method, is to
 limit the buffering of data to acceptable levels, so that sources and
 destinations of varying speed will not overwhelm the available memory.
 
-### `stream.read(0)`
-
-There are some cases where you want to trigger a refresh of the
-underlying readable stream mechanisms, without actually consuming any
-data.  In that case, you can call `stream.read(0)`, which will always
-return null.
-
-If the internal read buffer is below the `highWaterMark`, and the
-stream is not currently reading, then calling `read(0)` will trigger
-a low-level `_read` call.
-
-There is almost never a need to do this. However, you will see some
-cases in Node.js's internals where this is done, particularly in the
-Readable stream class internals.
-
-### `stream.push('')`
-
-Pushing a zero-byte string or Buffer (when not in [Object mode][]) has an
-interesting side effect.  Because it *is* a call to
-[`stream.push()`][], it will end the `reading` process.  However, it
-does *not* add any data to the readable buffer, so there's nothing for
-a user to consume.
-
-Very rarely, there are cases where you have no data to provide now,
-but the consumer of your stream (or, perhaps, another bit of your own
-code) will know when to check again, by calling `stream.read(0)`.  In
-those cases, you *may* call `stream.push('')`.
-
-So far, the only use case for this functionality is in the
-[tls.CryptoStream][] class, which is deprecated in Node.js/io.js v1.0.  If you
-find that you have to use `stream.push('')`, please consider another
-approach, because it almost certainly indicates that something is
-horribly wrong.
-
 ### Compatibility with Older Node.js Versions
 
 <!--type=misc-->
@@ -1649,6 +1608,39 @@ JSONParseStream.prototype._flush = function(cb) {
 };
 ```
 
+### `stream.read(0)`
+
+There are some cases where you want to trigger a refresh of the
+underlying readable stream mechanisms, without actually consuming any
+data.  In that case, you can call `stream.read(0)`, which will always
+return null.
+
+If the internal read buffer is below the `highWaterMark`, and the
+stream is not currently reading, then calling `read(0)` will trigger
+a low-level `_read` call.
+
+There is almost never a need to do this. However, you will see some
+cases in Node.js's internals where this is done, particularly in the
+Readable stream class internals.
+
+### `stream.push('')`
+
+Pushing a zero-byte string or Buffer (when not in [Object mode][]) has an
+interesting side effect.  Because it *is* a call to
+[`stream.push()`][], it will end the `reading` process.  However, it
+does *not* add any data to the readable buffer, so there's nothing for
+a user to consume.
+
+Very rarely, there are cases where you have no data to provide now,
+but the consumer of your stream (or, perhaps, another bit of your own
+code) will know when to check again, by calling `stream.read(0)`.  In
+those cases, you *may* call `stream.push('')`.
+
+So far, the only use case for this functionality is in the
+[tls.CryptoStream][] class, which is deprecated in Node.js/io.js v1.0.  If you
+find that you have to use `stream.push('')`, please consider another
+approach, because it almost certainly indicates that something is
+horribly wrong.
 
 [EventEmitter]: events.html#events_class_events_eventemitter
 [Object mode]: #stream_object_mode

From 09e524d013065909995bdf2b492f2cbadaa653da Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Thu, 5 Nov 2015 15:04:26 -0500
Subject: [PATCH 176/323] doc: sort tls alphabetically

Reorders, with no contextual changes, the tls documentation
alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3662
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api/tls.markdown | 1115 +++++++++++++++++++++---------------------
 1 file changed, 551 insertions(+), 564 deletions(-)

diff --git a/doc/api/tls.markdown b/doc/api/tls.markdown
index f105614962e041..7f21276c5409e0 100644
--- a/doc/api/tls.markdown
+++ b/doc/api/tls.markdown
@@ -40,6 +40,17 @@ To create .pfx or .p12, do this:
   - `certfile`: all CA certs concatenated in one file like
     `cat ca1-cert.pem ca2-cert.pem > ca-cert.pem`
 
+## ALPN, NPN and SNI
+
+<!-- type=misc -->
+
+ALPN (Application-Layer Protocol Negotiation Extension), NPN (Next
+Protocol Negotiation) and SNI (Server Name Indication) are TLS
+handshake extensions allowing you:
+
+  * ALPN/NPN - to use one TLS server for multiple protocols (HTTP, SPDY, HTTP/2)
+  * SNI - to use one TLS server for multiple hostnames with different SSL
+    certificates.
 
 ## Client-initiated renegotiation attack mitigation
 
@@ -65,19 +76,6 @@ To test your server, connect to it with `openssl s_client -connect address:port`
 and tap `R<CR>` (that's the letter `R` followed by a carriage return) a few
 times.
 
-
-## ALPN, NPN and SNI
-
-<!-- type=misc -->
-
-ALPN (Application-Layer Protocol Negotiation Extension), NPN (Next
-Protocol Negotiation) and SNI (Server Name Indication) are TLS
-handshake extensions allowing you:
-
-  * ALPN/NPN - to use one TLS server for multiple protocols (HTTP, SPDY, HTTP/2)
-  * SNI - to use one TLS server for multiple hostnames with different SSL
-    certificates.
-
 ## Modifying the Default TLS Cipher suite
 
 Node.js is built with a default suite of enabled and disabled TLS ciphers.
@@ -141,336 +139,211 @@ the character "E" appended to the traditional abbreviations):
 Ephemeral methods may have some performance drawbacks, because key generation
 is expensive.
 
+## Class: CryptoStream
 
-## tls.getCiphers()
-
-Returns an array with the names of the supported SSL ciphers.
-
-Example:
-
-    var ciphers = tls.getCiphers();
-    console.log(ciphers); // ['AES128-SHA', 'AES256-SHA', ...]
-
-
-## tls.createServer(options[, secureConnectionListener])
+    Stability: 0 - Deprecated: Use [tls.TLSSocket][] instead.
 
-Creates a new [tls.Server][].  The `connectionListener` argument is
-automatically set as a listener for the [secureConnection][] event.  The
-`options` object has these possibilities:
+This is an encrypted stream.
 
-  - `pfx`: A string or `Buffer` containing the private key, certificate and
-    CA certs of the server in PFX or PKCS12 format. (Mutually exclusive with
-    the `key`, `cert` and `ca` options.)
+### cryptoStream.bytesWritten
 
-  - `key`: A string or `Buffer` containing the private key of the server in
-    PEM format. To support multiple keys using different algorithms, an array
-    can be provided. It can either be a plain array of keys, or an array of
-    objects in the format `{pem: key, passphrase: passphrase}`. (Required)
+A proxy to the underlying socket's bytesWritten accessor, this will return
+the total bytes written to the socket, *including the TLS overhead*.
 
-  - `passphrase`: A string of passphrase for the private key or pfx.
+## Class: SecurePair
 
-  - `cert`: A string or `Buffer` containing the certificate key of the server in
-    PEM format. (Could be an array of certs). (Required)
+Returned by tls.createSecurePair.
 
-  - `ca`: An array of strings or `Buffer`s of trusted certificates in PEM
-    format. If this is omitted several well known "root" CAs will be used,
-    like VeriSign. These are used to authorize connections.
+### Event: 'secure'
 
-  - `crl` : Either a string or list of strings of PEM encoded CRLs (Certificate
-    Revocation List)
+The event is emitted from the SecurePair once the pair has successfully
+established a secure connection.
 
-  - `ciphers`: A string describing the ciphers to use or exclude, separated by
-    `:`. The default cipher suite is:
+Similarly to the checking for the server 'secureConnection' event,
+pair.cleartext.authorized should be checked to confirm whether the certificate
+used properly authorized.
 
-        ECDHE-RSA-AES128-GCM-SHA256:
-        ECDHE-ECDSA-AES128-GCM-SHA256:
-        ECDHE-RSA-AES256-GCM-SHA384:
-        ECDHE-ECDSA-AES256-GCM-SHA384:
-        DHE-RSA-AES128-GCM-SHA256:
-        ECDHE-RSA-AES128-SHA256:
-        DHE-RSA-AES128-SHA256:
-        ECDHE-RSA-AES256-SHA384:
-        DHE-RSA-AES256-SHA384:
-        ECDHE-RSA-AES256-SHA256:
-        DHE-RSA-AES256-SHA256:
-        HIGH:
-        !aNULL:
-        !eNULL:
-        !EXPORT:
-        !DES:
-        !RC4:
-        !MD5:
-        !PSK:
-        !SRP:
-        !CAMELLIA
+## Class: tls.Server
 
-    The default cipher suite prefers GCM ciphers for [Chrome's 'modern
-    cryptography' setting] and also prefers ECDHE and DHE ciphers for Perfect
-    Forward secrecy, while offering *some* backward compatibiltity.
+This class is a subclass of `net.Server` and has the same methods on it.
+Instead of accepting just raw TCP connections, this accepts encrypted
+connections using TLS or SSL.
 
-    128 bit AES is preferred over 192 and 256 bit AES in light of [specific
-    attacks affecting larger AES key sizes].
+### Event: 'clientError'
 
-    Old clients that rely on insecure and deprecated RC4 or DES-based ciphers
-    (like Internet Explorer 6) aren't able to complete the handshake with the default
-    configuration. If you absolutely must support these clients, the
-    [TLS recommendations] may offer a compatible cipher suite. For more details
-    on the format, see the [OpenSSL cipher list format documentation].
+`function (exception, tlsSocket) { }`
 
-  - `ecdhCurve`: A string describing a named curve to use for ECDH key agreement
-    or false to disable ECDH.
+When a client connection emits an 'error' event before secure connection is
+established - it will be forwarded here.
 
-    Defaults to `prime256v1` (NIST P-256). Use [crypto.getCurves()][] to obtain
-    a list of available curve names. On recent releases,
-    `openssl ecparam -list_curves` will also display the name and description of
-    each available elliptic curve.
+`tlsSocket` is the [tls.TLSSocket][] that the error originated from.
 
-  - `dhparam`: A string or `Buffer` containing Diffie Hellman parameters,
-    required for Perfect Forward Secrecy. Use `openssl dhparam` to create it.
-    Its key length should be greater than or equal to 1024 bits, otherwise
-    it throws an error. It is strongly recommended to use 2048 bits or
-    more for stronger security. If omitted or invalid, it is silently
-    discarded and DHE ciphers won't be available.
+### Event: 'newSession'
 
-  - `handshakeTimeout`: Abort the connection if the SSL/TLS handshake does not
-    finish in this many milliseconds. The default is 120 seconds.
+`function (sessionId, sessionData, callback) { }`
 
-    A `'clientError'` is emitted on the `tls.Server` object whenever a handshake
-    times out.
+Emitted on creation of TLS session. May be used to store sessions in external
+storage. `callback` must be invoked eventually, otherwise no data will be
+sent or received from secure connection.
 
-  - `honorCipherOrder` : When choosing a cipher, use the server's preferences
-    instead of the client preferences. Default: `true`.
+NOTE: adding this event listener will have an effect only on connections
+established after addition of event listener.
 
-  - `requestCert`: If `true` the server will request a certificate from
-    clients that connect and attempt to verify that certificate. Default:
-    `false`.
+### Event: 'OCSPRequest'
 
-  - `rejectUnauthorized`: If `true` the server will reject any connection
-    which is not authorized with the list of supplied CAs. This option only
-    has an effect if `requestCert` is `true`. Default: `false`.
+`function (certificate, issuer, callback) { }`
 
-  - `NPNProtocols`: An array or `Buffer` of possible NPN protocols. (Protocols
-    should be ordered by their priority).
+Emitted when the client sends a certificate status request. You could parse
+server's current certificate to obtain OCSP url and certificate id, and after
+obtaining OCSP response invoke `callback(null, resp)`, where `resp` is a
+`Buffer` instance. Both `certificate` and `issuer` are a `Buffer`
+DER-representations of the primary and issuer's certificates. They could be used
+to obtain OCSP certificate id and OCSP endpoint url.
 
-  - `ALPNProtocols`: An array or `Buffer` of possible ALPN
-    protocols. (Protocols should be ordered by their priority). When
-    the server receives both NPN and ALPN extensions from the client,
-    ALPN takes precedence over NPN and the server does not send an NPN
-    extension to the client.
+Alternatively, `callback(null, null)` could be called, meaning that there is no
+OCSP response.
 
-  - `SNICallback(servername, cb)`: A function that will be called if client
-    supports SNI TLS extension. Two argument will be passed to it: `servername`,
-    and `cb`. `SNICallback` should invoke `cb(null, ctx)`, where `ctx` is a
-    SecureContext instance.
-    (You can use `tls.createSecureContext(...)` to get proper
-    SecureContext). If `SNICallback` wasn't provided - default callback with
-    high-level API will be used (see below).
+Calling `callback(err)` will result in a `socket.destroy(err)` call.
 
-  - `sessionTimeout`: An integer specifying the seconds after which TLS
-    session identifiers and TLS session tickets created by the server are
-    timed out. See [SSL_CTX_set_timeout] for more details.
+Typical flow:
 
-  - `ticketKeys`: A 48-byte `Buffer` instance consisting of 16-byte prefix,
-    16-byte hmac key, 16-byte AES key. You could use it to accept tls session
-    tickets on multiple instances of tls server.
+1. Client connects to server and sends `OCSPRequest` to it (via status info
+   extension in ClientHello.)
+2. Server receives request and invokes `OCSPRequest` event listener if present
+3. Server grabs OCSP url from either `certificate` or `issuer` and performs an
+   [OCSP request] to the CA
+4. Server receives `OCSPResponse` from CA and sends it back to client via
+   `callback` argument
+5. Client validates the response and either destroys socket or performs a
+   handshake.
 
-    NOTE: Automatically shared between `cluster` module workers.
+NOTE: `issuer` could be null, if the certificate is self-signed or if the issuer
+is not in the root certificates list. (You could provide an issuer via `ca`
+option.)
 
-  - `sessionIdContext`: A string containing an opaque identifier for session
-    resumption. If `requestCert` is `true`, the default is MD5 hash value
-    generated from command-line. Otherwise, the default is not provided.
+NOTE: adding this event listener will have an effect only on connections
+established after addition of event listener.
 
-  - `secureProtocol`: The SSL method to use, e.g. `SSLv3_method` to force
-    SSL version 3. The possible values depend on your installation of
-    OpenSSL and are defined in the constant [SSL_METHODS][].
+NOTE: you may want to use some npm module like [asn1.js] to parse the
+certificates.
 
-Here is a simple example echo server:
+### Event: 'resumeSession'
 
-    var tls = require('tls');
-    var fs = require('fs');
+`function (sessionId, callback) { }`
 
-    var options = {
-      key: fs.readFileSync('server-key.pem'),
-      cert: fs.readFileSync('server-cert.pem'),
+Emitted when client wants to resume previous TLS session. Event listener may
+perform lookup in external storage using given `sessionId`, and invoke
+`callback(null, sessionData)` once finished. If session can't be resumed
+(i.e. doesn't exist in storage) one may call `callback(null, null)`. Calling
+`callback(err)` will terminate incoming connection and destroy socket.
 
-      // This is necessary only if using the client certificate authentication.
-      requestCert: true,
+NOTE: adding this event listener will have an effect only on connections
+established after addition of event listener.
 
-      // This is necessary only if the client uses the self-signed certificate.
-      ca: [ fs.readFileSync('client-cert.pem') ]
-    };
+Here's an example for using TLS session resumption:
 
-    var server = tls.createServer(options, function(socket) {
-      console.log('server connected',
-                  socket.authorized ? 'authorized' : 'unauthorized');
-      socket.write("welcome!\n");
-      socket.setEncoding('utf8');
-      socket.pipe(socket);
+    var tlsSessionStore = {};
+    server.on('newSession', function(id, data, cb) {
+      tlsSessionStore[id.toString('hex')] = data;
+      cb();
     });
-    server.listen(8000, function() {
-      console.log('server bound');
+    server.on('resumeSession', function(id, cb) {
+      cb(null, tlsSessionStore[id.toString('hex')] || null);
     });
 
-Or
+### Event: 'secureConnection'
 
-    var tls = require('tls');
-    var fs = require('fs');
+`function (tlsSocket) {}`
 
-    var options = {
-      pfx: fs.readFileSync('server.pfx'),
+This event is emitted after a new connection has been successfully
+handshaked. The argument is an instance of [tls.TLSSocket][]. It has all the
+common stream methods and events.
 
-      // This is necessary only if using the client certificate authentication.
-      requestCert: true,
+`socket.authorized` is a boolean value which indicates if the
+client has verified by one of the supplied certificate authorities for the
+server. If `socket.authorized` is false, then
+`socket.authorizationError` is set to describe how authorization
+failed. Implied but worth mentioning: depending on the settings of the TLS
+server, you unauthorized connections may be accepted.
 
-    };
+`socket.npnProtocol` is a string containing the selected NPN protocol
+and `socket.alpnProtocol` is a string containing the selected ALPN
+protocol, When both NPN and ALPN extensions are received, ALPN takes
+precedence over NPN and the next protocol is selected by ALPN. When
+ALPN has no selected protocol, this returns false.
 
-    var server = tls.createServer(options, function(socket) {
-      console.log('server connected',
-                  socket.authorized ? 'authorized' : 'unauthorized');
-      socket.write("welcome!\n");
-      socket.setEncoding('utf8');
-      socket.pipe(socket);
-    });
-    server.listen(8000, function() {
-      console.log('server bound');
-    });
-You can test this server by connecting to it with `openssl s_client`:
-
-
-    openssl s_client -connect 127.0.0.1:8000
-
-
-## tls.connect(options[, callback])
-## tls.connect(port[, host][, options][, callback])
-
-Creates a new client connection to the given `port` and `host` (old API) or
-`options.port` and `options.host`. (If `host` is omitted, it defaults to
-`localhost`.) `options` should be an object which specifies:
-
-  - `host`: Host the client should connect to
-
-  - `port`: Port the client should connect to
-
-  - `socket`: Establish secure connection on a given socket rather than
-    creating a new socket. If this option is specified, `host` and `port`
-    are ignored.
-
-  - `path`: Creates unix socket connection to path. If this option is
-    specified, `host` and `port` are ignored.
-
-  - `pfx`: A string or `Buffer` containing the private key, certificate and
-    CA certs of the client in PFX or PKCS12 format.
-
-  - `key`: A string or `Buffer` containing the private key of the client in
-    PEM format. (Could be an array of keys).
+`socket.servername` is a string containing servername requested with
+SNI.
 
-  - `passphrase`: A string of passphrase for the private key or pfx.
+### server.addContext(hostname, context)
 
-  - `cert`: A string or `Buffer` containing the certificate key of the client in
-    PEM format. (Could be an array of certs).
+Add secure context that will be used if client request's SNI hostname is
+matching passed `hostname` (wildcards can be used). `context` can contain
+`key`, `cert`, `ca` and/or any other properties from `tls.createSecureContext`
+`options` argument.
 
-  - `ca`: An array of strings or `Buffer`s of trusted certificates in PEM
-    format. If this is omitted several well known "root" CAs will be used,
-    like VeriSign. These are used to authorize connections.
+### server.address()
 
-  - `ciphers`: A string describing the ciphers to use or exclude, separated by
-   `:`. Uses the same default cipher suite as `tls.createServer`.
+Returns the bound address, the address family name and port of the
+server as reported by the operating system.  See [net.Server.address()][] for
+more information.
 
-  - `rejectUnauthorized`: If `true`, the server certificate is verified against
-    the list of supplied CAs. An `'error'` event is emitted if verification
-    fails; `err.code` contains the OpenSSL error code. Default: `true`.
+### server.close([callback])
 
-  - `NPNProtocols`: An array of strings or `Buffer`s containing supported NPN
-    protocols. `Buffer`s should have the following format:
-    `0x05hello0x05world`, where first byte is next protocol name's
-    length. (Passing array should usually be much simpler:
-    `['hello', 'world']`.)
+Stops the server from accepting new connections. This function is
+asynchronous, the server is finally closed when the server emits a `'close'`
+event.  Optionally, you can pass a callback to listen for the `'close'` event.
 
-  - `ALPNProtocols`: An array of strings or `Buffer`s containing
-    supported ALPN protocols. `Buffer`s should have following format:
-    `0x05hello0x05world`, where the first byte is the next protocol
-    name's length. (Passing array should usually be much simpler:
-    `['hello', 'world']`.)
+### server.connections
 
-  - `servername`: Servername for SNI (Server Name Indication) TLS extension.
+The number of concurrent connections on the server.
 
-  - `checkServerIdentity(servername, cert)`: Provide an override for checking
-    server's hostname against the certificate. Should return an error if verification
-    fails. Return `undefined` if passing.
+### server.getTicketKeys()
 
-  - `secureProtocol`: The SSL method to use, e.g. `SSLv3_method` to force
-    SSL version 3. The possible values depend on your installation of
-    OpenSSL and are defined in the constant [SSL_METHODS][].
+Returns `Buffer` instance holding the keys currently used for
+encryption/decryption of the [TLS Session Tickets][]
 
-  - `session`: A `Buffer` instance, containing TLS session.
+### server.listen(port[, hostname][, callback])
 
-  - `minDHSize`: Minimum size of DH parameter in bits to accept a TLS
-    connection. When a server offers DH parameter with a size less
-    than this, the TLS connection is destroyed and throws an
-    error. Default: 1024.
+Begin accepting connections on the specified `port` and `hostname`. If the
+`hostname` is omitted, the server will accept connections on any IPv6 address
+(`::`) when IPv6 is available, or any IPv4 address (`0.0.0.0`) otherwise. A
+port value of zero will assign a random port.
 
-The `callback` parameter will be added as a listener for the
-['secureConnect'][] event.
+This function is asynchronous. The last parameter `callback` will be called
+when the server has been bound.
 
-`tls.connect()` returns a [tls.TLSSocket][] object.
+See `net.Server` for more information.
 
-Here is an example of a client of echo server as described previously:
+### server.setTicketKeys(keys)
 
-    var tls = require('tls');
-    var fs = require('fs');
+Updates the keys for encryption/decryption of the [TLS Session Tickets][].
 
-    var options = {
-      // These are necessary only if using the client certificate authentication
-      key: fs.readFileSync('client-key.pem'),
-      cert: fs.readFileSync('client-cert.pem'),
+NOTE: the buffer should be 48 bytes long. See server `ticketKeys` option for
+more information oh how it is going to be used.
 
-      // This is necessary only if the server uses the self-signed certificate
-      ca: [ fs.readFileSync('server-cert.pem') ]
-    };
+NOTE: the change is effective only for the future server connections. Existing
+or currently pending server connections will use previous keys.
 
-    var socket = tls.connect(8000, options, function() {
-      console.log('client connected',
-                  socket.authorized ? 'authorized' : 'unauthorized');
-      process.stdin.pipe(socket);
-      process.stdin.resume();
-    });
-    socket.setEncoding('utf8');
-    socket.on('data', function(data) {
-      console.log(data);
-    });
-    socket.on('end', function() {
-      server.close();
-    });
+### server.maxConnections
 
-Or
+Set this property to reject connections when the server's connection count
+gets high.
 
-    var tls = require('tls');
-    var fs = require('fs');
 
-    var options = {
-      pfx: fs.readFileSync('client.pfx')
-    };
+## Class: tls.TLSSocket
 
-    var socket = tls.connect(8000, options, function() {
-      console.log('client connected',
-                  socket.authorized ? 'authorized' : 'unauthorized');
-      process.stdin.pipe(socket);
-      process.stdin.resume();
-    });
-    socket.setEncoding('utf8');
-    socket.on('data', function(data) {
-      console.log(data);
-    });
-    socket.on('end', function() {
-      server.close();
-    });
+This is a wrapped version of [net.Socket][] that does transparent encryption
+of written data and all required TLS negotiation.
 
-## Class: tls.TLSSocket
+This instance implements a duplex [Stream][] interfaces.  It has all the
+common stream methods and events.
 
-Wrapper for instance of [net.Socket][], replaces internal socket read/write
-routines to perform transparent encryption/decryption of incoming/outgoing data.
+Methods that return TLS connection meta data (e.g.
+[getPeerCertificate](#tlssocketgetpeercertificate-detailed-))
+will only return data while the connection is open.
 
-## new tls.TLSSocket(socket[, options])
+### new tls.TLSSocket(socket[, options])
 
 Construct a new TLSSocket object from existing TCP socket.
 
@@ -502,430 +375,544 @@ Construct a new TLSSocket object from existing TCP socket.
     be added to client hello, and `OCSPResponse` event will be emitted on socket
     before establishing secure communication
 
+### Event: 'OCSPResponse'
 
-## tls.createSecureContext(details)
+`function (response) { }`
 
-Creates a credentials object, with the optional details being a
-dictionary with keys:
+This event will be emitted if `requestOCSP` option was set. `response` is a
+buffer object, containing server's OCSP response.
 
-* `pfx` : A string or buffer holding the PFX or PKCS12 encoded private
-  key, certificate and CA certificates
-* `key`: A string or `Buffer` containing the private key of the server in
-  PEM format. To support multiple keys using different algorithms, an array
-  can be provided. It can either be a plain array of keys, or an array of
-  objects in the format `{pem: key, passphrase: passphrase}`. (Required)
-* `passphrase` : A string of passphrase for the private key or pfx
-* `cert` : A string holding the PEM encoded certificate
-* `ca` : Either a string or list of strings of PEM encoded CA
-  certificates to trust.
-* `crl` : Either a string or list of strings of PEM encoded CRLs
-  (Certificate Revocation List)
-* `ciphers`: A string describing the ciphers to use or exclude.
-  Consult
-  <http://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT>
-  for details on the format.
-* `honorCipherOrder` : When choosing a cipher, use the server's preferences
-  instead of the client preferences. For further details see `tls` module
-  documentation.
+Traditionally, the `response` is a signed object from the server's CA that
+contains information about server's certificate revocation status.
 
-If no 'ca' details are given, then Node.js will use the default
-publicly trusted list of CAs as given in
-<http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt>.
+### Event: 'secureConnect'
 
+This event is emitted after a new connection has been successfully handshaked.
+The listener will be called no matter if the server's certificate was
+authorized or not. It is up to the user to test `tlsSocket.authorized`
+to see if the server certificate was signed by one of the specified CAs.
+If `tlsSocket.authorized === false` then the error can be found in
+`tlsSocket.authorizationError`. Also if ALPN or NPN was used - you can
+check `tlsSocket.alpnProtocol` or `tlsSocket.npnProtocol` for the
+negotiated protocol.
 
-## tls.createSecurePair([context][, isServer][, requestCert][, rejectUnauthorized][, options])
+### tlsSocket.address()
 
-Creates a new secure pair object with two streams, one of which reads/writes
-encrypted data, and one reads/writes cleartext data.
-Generally the encrypted one is piped to/from an incoming encrypted data stream,
-and the cleartext one is used as a replacement for the initial encrypted stream.
+Returns the bound address, the address family name and port of the
+underlying socket as reported by the operating system. Returns an
+object with three properties, e.g.
+`{ port: 12346, family: 'IPv4', address: '127.0.0.1' }`
 
- - `credentials`: A secure context object from tls.createSecureContext( ... )
+### tlsSocket.authorized
 
- - `isServer`: A boolean indicating whether this tls connection should be
-   opened as a server or a client.
+A boolean that is `true` if the peer certificate was signed by one of the
+specified CAs, otherwise `false`
 
- - `requestCert`: A boolean indicating whether a server should request a
-   certificate from a connecting client. Only applies to server connections.
+### tlsSocket.authorizationError
 
- - `rejectUnauthorized`: A boolean indicating whether a server should
-   automatically reject clients with invalid certificates. Only applies to
-   servers with `requestCert` enabled.
+The reason why the peer's certificate has not been verified. This property
+becomes available only when `tlsSocket.authorized === false`.
 
- - `options`: An object with common SSL options. See [tls.TLSSocket][].
+### tlsSocket.encrypted
 
-`tls.createSecurePair()` returns a SecurePair object with `cleartext` and
-`encrypted` stream properties.
+Static boolean value, always `true`. May be used to distinguish TLS sockets
+from regular ones.
 
-NOTE: `cleartext` has the same APIs as [tls.TLSSocket][]
+### tlsSocket.getCipher()
+Returns an object representing the cipher name and the SSL/TLS
+protocol version of the current connection.
 
-## Class: SecurePair
+Example:
+{ name: 'AES256-SHA', version: 'TLSv1/SSLv3' }
 
-Returned by tls.createSecurePair.
+See SSL_CIPHER_get_name() and SSL_CIPHER_get_version() in
+http://www.openssl.org/docs/ssl/ssl.html#DEALING_WITH_CIPHERS for more
+information.
 
-### Event: 'secure'
+### tlsSocket.getEphemeralKeyInfo()
 
-The event is emitted from the SecurePair once the pair has successfully
-established a secure connection.
+Returns an object representing a type, name and size of parameter of
+an ephemeral key exchange in [Perfect forward Secrecy][] on a client
+connection. It returns an empty object when the key exchange is not
+ephemeral. As it is only supported on a client socket, it returns null
+if this is called on a server socket. The supported types are 'DH' and
+'ECDH'. The `name` property is only available in 'ECDH'.
 
-Similarly to the checking for the server 'secureConnection' event,
-pair.cleartext.authorized should be checked to confirm whether the certificate
-used properly authorized.
+Example:
 
-## Class: tls.Server
+    { type: 'ECDH', name: 'prime256v1', size: 256 }
 
-This class is a subclass of `net.Server` and has the same methods on it.
-Instead of accepting just raw TCP connections, this accepts encrypted
-connections using TLS or SSL.
+### tlsSocket.getPeerCertificate([ detailed ])
 
-### Event: 'secureConnection'
+Returns an object representing the peer's certificate. The returned object has
+some properties corresponding to the field of the certificate. If `detailed`
+argument is `true` - the full chain with `issuer` property will be returned,
+if `false` - only the top certificate without `issuer` property.
 
-`function (tlsSocket) {}`
+Example:
 
-This event is emitted after a new connection has been successfully
-handshaked. The argument is an instance of [tls.TLSSocket][]. It has all the
-common stream methods and events.
+    { subject:
+       { C: 'UK',
+         ST: 'Acknack Ltd',
+         L: 'Rhys Jones',
+         O: 'node.js',
+         OU: 'Test TLS Certificate',
+         CN: 'localhost' },
+      issuerInfo:
+       { C: 'UK',
+         ST: 'Acknack Ltd',
+         L: 'Rhys Jones',
+         O: 'node.js',
+         OU: 'Test TLS Certificate',
+         CN: 'localhost' },
+      issuer:
+       { ... another certificate ... },
+      raw: < RAW DER buffer >,
+      valid_from: 'Nov 11 09:52:22 2009 GMT',
+      valid_to: 'Nov  6 09:52:22 2029 GMT',
+      fingerprint: '2A:7A:C2:DD:E5:F9:CC:53:72:35:99:7A:02:5A:71:38:52:EC:8A:DF',
+      serialNumber: 'B9B0D332A1AA5635' }
 
-`socket.authorized` is a boolean value which indicates if the
-client has verified by one of the supplied certificate authorities for the
-server. If `socket.authorized` is false, then
-`socket.authorizationError` is set to describe how authorization
-failed. Implied but worth mentioning: depending on the settings of the TLS
-server, you unauthorized connections may be accepted.
+If the peer does not provide a certificate, it returns `null` or an empty
+object.
 
-`socket.npnProtocol` is a string containing the selected NPN protocol
-and `socket.alpnProtocol` is a string containing the selected ALPN
-protocol, When both NPN and ALPN extensions are received, ALPN takes
-precedence over NPN and the next protocol is selected by ALPN. When
-ALPN has no selected protocol, this returns false.
 
-`socket.servername` is a string containing servername requested with
-SNI.
+### tlsSocket.getSession()
 
+Return ASN.1 encoded TLS session or `undefined` if none was negotiated. Could
+be used to speed up handshake establishment when reconnecting to the server.
 
-### Event: 'clientError'
+### tlsSocket.getTLSTicket()
 
-`function (exception, tlsSocket) { }`
+NOTE: Works only with client TLS sockets. Useful only for debugging, for
+session reuse provide `session` option to `tls.connect`.
 
-When a client connection emits an 'error' event before secure connection is
-established - it will be forwarded here.
+Return TLS session ticket or `undefined` if none was negotiated.
 
-`tlsSocket` is the [tls.TLSSocket][] that the error originated from.
+### tlsSocket.localAddress
 
+The string representation of the local IP address.
 
-### Event: 'newSession'
+### tlsSocket.localPort
 
-`function (sessionId, sessionData, callback) { }`
+The numeric representation of the local port.
 
-Emitted on creation of TLS session. May be used to store sessions in external
-storage. `callback` must be invoked eventually, otherwise no data will be
-sent or received from secure connection.
+### tlsSocket.remoteAddress
 
-NOTE: adding this event listener will have an effect only on connections
-established after addition of event listener.
+The string representation of the remote IP address. For example,
+`'74.125.127.100'` or `'2001:4860:a005::68'`.
 
+### tlsSocket.remoteFamily
 
-### Event: 'resumeSession'
+The string representation of the remote IP family. `'IPv4'` or `'IPv6'`.
 
-`function (sessionId, callback) { }`
+### tlsSocket.remotePort
 
-Emitted when client wants to resume previous TLS session. Event listener may
-perform lookup in external storage using given `sessionId`, and invoke
-`callback(null, sessionData)` once finished. If session can't be resumed
-(i.e. doesn't exist in storage) one may call `callback(null, null)`. Calling
-`callback(err)` will terminate incoming connection and destroy socket.
+The numeric representation of the remote port. For example, `443`.
 
-NOTE: adding this event listener will have an effect only on connections
-established after addition of event listener.
+### tlsSocket.renegotiate(options, callback)
 
-Here's an example for using TLS session resumption:
+Initiate TLS renegotiation process. The `options` may contain the following
+fields: `rejectUnauthorized`, `requestCert` (See [tls.createServer][]
+for details). `callback(err)` will be executed with `null` as `err`,
+once the renegotiation is successfully completed.
 
-    var tlsSessionStore = {};
-    server.on('newSession', function(id, data, cb) {
-      tlsSessionStore[id.toString('hex')] = data;
-      cb();
-    });
-    server.on('resumeSession', function(id, cb) {
-      cb(null, tlsSessionStore[id.toString('hex')] || null);
-    });
+NOTE: Can be used to request peer's certificate after the secure connection
+has been established.
 
-### Event: 'OCSPRequest'
+ANOTHER NOTE: When running as the server, socket will be destroyed
+with an error after `handshakeTimeout` timeout.
 
-`function (certificate, issuer, callback) { }`
+### tlsSocket.setMaxSendFragment(size)
 
-Emitted when the client sends a certificate status request. You could parse
-server's current certificate to obtain OCSP url and certificate id, and after
-obtaining OCSP response invoke `callback(null, resp)`, where `resp` is a
-`Buffer` instance. Both `certificate` and `issuer` are a `Buffer`
-DER-representations of the primary and issuer's certificates. They could be used
-to obtain OCSP certificate id and OCSP endpoint url.
+Set maximum TLS fragment size (default and maximum value is: `16384`, minimum
+is: `512`). Returns `true` on success, `false` otherwise.
 
-Alternatively, `callback(null, null)` could be called, meaning that there is no
-OCSP response.
+Smaller fragment size decreases buffering latency on the client: large
+fragments are buffered by the TLS layer until the entire fragment is received
+and its integrity is verified; large fragments can span multiple roundtrips,
+and their processing can be delayed due to packet loss or reordering. However,
+smaller fragments add extra TLS framing bytes and CPU overhead, which may
+decrease overall server throughput.
 
-Calling `callback(err)` will result in a `socket.destroy(err)` call.
 
-Typical flow:
+## tls.connect(options[, callback])
+## tls.connect(port[, host][, options][, callback])
 
-1. Client connects to server and sends `OCSPRequest` to it (via status info
-   extension in ClientHello.)
-2. Server receives request and invokes `OCSPRequest` event listener if present
-3. Server grabs OCSP url from either `certificate` or `issuer` and performs an
-   [OCSP request] to the CA
-4. Server receives `OCSPResponse` from CA and sends it back to client via
-   `callback` argument
-5. Client validates the response and either destroys socket or performs a
-   handshake.
+Creates a new client connection to the given `port` and `host` (old API) or
+`options.port` and `options.host`. (If `host` is omitted, it defaults to
+`localhost`.) `options` should be an object which specifies:
 
-NOTE: `issuer` could be null, if the certificate is self-signed or if the issuer
-is not in the root certificates list. (You could provide an issuer via `ca`
-option.)
+  - `host`: Host the client should connect to
 
-NOTE: adding this event listener will have an effect only on connections
-established after addition of event listener.
+  - `port`: Port the client should connect to
 
-NOTE: you may want to use some npm module like [asn1.js] to parse the
-certificates.
+  - `socket`: Establish secure connection on a given socket rather than
+    creating a new socket. If this option is specified, `host` and `port`
+    are ignored.
 
+  - `path`: Creates unix socket connection to path. If this option is
+    specified, `host` and `port` are ignored.
 
-### server.listen(port[, hostname][, callback])
+  - `pfx`: A string or `Buffer` containing the private key, certificate and
+    CA certs of the client in PFX or PKCS12 format.
 
-Begin accepting connections on the specified `port` and `hostname`. If the
-`hostname` is omitted, the server will accept connections on any IPv6 address
-(`::`) when IPv6 is available, or any IPv4 address (`0.0.0.0`) otherwise. A
-port value of zero will assign a random port.
+  - `key`: A string or `Buffer` containing the private key of the client in
+    PEM format. (Could be an array of keys).
 
-This function is asynchronous. The last parameter `callback` will be called
-when the server has been bound.
+  - `passphrase`: A string of passphrase for the private key or pfx.
 
-See `net.Server` for more information.
+  - `cert`: A string or `Buffer` containing the certificate key of the client in
+    PEM format. (Could be an array of certs).
 
+  - `ca`: An array of strings or `Buffer`s of trusted certificates in PEM
+    format. If this is omitted several well known "root" CAs will be used,
+    like VeriSign. These are used to authorize connections.
 
-### server.close([callback])
+  - `ciphers`: A string describing the ciphers to use or exclude, separated by
+   `:`. Uses the same default cipher suite as `tls.createServer`.
 
-Stops the server from accepting new connections. This function is
-asynchronous, the server is finally closed when the server emits a `'close'`
-event.  Optionally, you can pass a callback to listen for the `'close'` event.
+  - `rejectUnauthorized`: If `true`, the server certificate is verified against
+    the list of supplied CAs. An `'error'` event is emitted if verification
+    fails; `err.code` contains the OpenSSL error code. Default: `true`.
 
-### server.address()
+  - `NPNProtocols`: An array of strings or `Buffer`s containing supported NPN
+    protocols. `Buffer`s should have the following format:
+    `0x05hello0x05world`, where first byte is next protocol name's
+    length. (Passing array should usually be much simpler:
+    `['hello', 'world']`.)
 
-Returns the bound address, the address family name and port of the
-server as reported by the operating system.  See [net.Server.address()][] for
-more information.
+  - `ALPNProtocols`: An array of strings or `Buffer`s containing
+    supported ALPN protocols. `Buffer`s should have following format:
+    `0x05hello0x05world`, where the first byte is the next protocol
+    name's length. (Passing array should usually be much simpler:
+    `['hello', 'world']`.)
 
-### server.getTicketKeys()
+  - `servername`: Servername for SNI (Server Name Indication) TLS extension.
 
-Returns `Buffer` instance holding the keys currently used for
-encryption/decryption of the [TLS Session Tickets][]
+  - `checkServerIdentity(servername, cert)`: Provide an override for checking
+    server's hostname against the certificate. Should return an error if verification
+    fails. Return `undefined` if passing.
 
-### server.setTicketKeys(keys)
+  - `secureProtocol`: The SSL method to use, e.g. `SSLv3_method` to force
+    SSL version 3. The possible values depend on your installation of
+    OpenSSL and are defined in the constant [SSL_METHODS][].
 
-Updates the keys for encryption/decryption of the [TLS Session Tickets][].
+  - `session`: A `Buffer` instance, containing TLS session.
 
-NOTE: the buffer should be 48 bytes long. See server `ticketKeys` option for
-more information oh how it is going to be used.
+  - `minDHSize`: Minimum size of DH parameter in bits to accept a TLS
+    connection. When a server offers DH parameter with a size less
+    than this, the TLS connection is destroyed and throws an
+    error. Default: 1024.
 
-NOTE: the change is effective only for the future server connections. Existing
-or currently pending server connections will use previous keys.
+The `callback` parameter will be added as a listener for the
+['secureConnect'][] event.
 
-### server.addContext(hostname, context)
+`tls.connect()` returns a [tls.TLSSocket][] object.
 
-Add secure context that will be used if client request's SNI hostname is
-matching passed `hostname` (wildcards can be used). `context` can contain
-`key`, `cert`, `ca` and/or any other properties from `tls.createSecureContext`
-`options` argument.
+Here is an example of a client of echo server as described previously:
 
-### server.maxConnections
+    var tls = require('tls');
+    var fs = require('fs');
 
-Set this property to reject connections when the server's connection count
-gets high.
+    var options = {
+      // These are necessary only if using the client certificate authentication
+      key: fs.readFileSync('client-key.pem'),
+      cert: fs.readFileSync('client-cert.pem'),
 
-### server.connections
+      // This is necessary only if the server uses the self-signed certificate
+      ca: [ fs.readFileSync('server-cert.pem') ]
+    };
 
-The number of concurrent connections on the server.
+    var socket = tls.connect(8000, options, function() {
+      console.log('client connected',
+                  socket.authorized ? 'authorized' : 'unauthorized');
+      process.stdin.pipe(socket);
+      process.stdin.resume();
+    });
+    socket.setEncoding('utf8');
+    socket.on('data', function(data) {
+      console.log(data);
+    });
+    socket.on('end', function() {
+      server.close();
+    });
 
+Or
 
-## Class: CryptoStream
+    var tls = require('tls');
+    var fs = require('fs');
 
-    Stability: 0 - Deprecated: Use [tls.TLSSocket][] instead.
+    var options = {
+      pfx: fs.readFileSync('client.pfx')
+    };
 
-This is an encrypted stream.
+    var socket = tls.connect(8000, options, function() {
+      console.log('client connected',
+                  socket.authorized ? 'authorized' : 'unauthorized');
+      process.stdin.pipe(socket);
+      process.stdin.resume();
+    });
+    socket.setEncoding('utf8');
+    socket.on('data', function(data) {
+      console.log(data);
+    });
+    socket.on('end', function() {
+      server.close();
+    });
 
-### cryptoStream.bytesWritten
 
-A proxy to the underlying socket's bytesWritten accessor, this will return
-the total bytes written to the socket, *including the TLS overhead*.
+## tls.createSecureContext(details)
 
-## Class: tls.TLSSocket
+Creates a credentials object, with the optional details being a
+dictionary with keys:
 
-This is a wrapped version of [net.Socket][] that does transparent encryption
-of written data and all required TLS negotiation.
+* `pfx` : A string or buffer holding the PFX or PKCS12 encoded private
+  key, certificate and CA certificates
+* `key`: A string or `Buffer` containing the private key of the server in
+  PEM format. To support multiple keys using different algorithms, an array
+  can be provided. It can either be a plain array of keys, or an array of
+  objects in the format `{pem: key, passphrase: passphrase}`. (Required)
+* `passphrase` : A string of passphrase for the private key or pfx
+* `cert` : A string holding the PEM encoded certificate
+* `ca` : Either a string or list of strings of PEM encoded CA
+  certificates to trust.
+* `crl` : Either a string or list of strings of PEM encoded CRLs
+  (Certificate Revocation List)
+* `ciphers`: A string describing the ciphers to use or exclude.
+  Consult
+  <http://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT>
+  for details on the format.
+* `honorCipherOrder` : When choosing a cipher, use the server's preferences
+  instead of the client preferences. For further details see `tls` module
+  documentation.
 
-This instance implements a duplex [Stream][] interfaces.  It has all the
-common stream methods and events.
+If no 'ca' details are given, then Node.js will use the default
+publicly trusted list of CAs as given in
+<http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt>.
 
-Methods that return TLS connection meta data (e.g.
-[getPeerCertificate](#tlssocketgetpeercertificate-detailed-))
-will only return data while the connection is open.
+## tls.createSecurePair([context][, isServer][, requestCert][, rejectUnauthorized][, options])
 
-### Event: 'secureConnect'
+Creates a new secure pair object with two streams, one of which reads/writes
+encrypted data, and one reads/writes cleartext data.
+Generally the encrypted one is piped to/from an incoming encrypted data stream,
+and the cleartext one is used as a replacement for the initial encrypted stream.
 
-This event is emitted after a new connection has been successfully handshaked.
-The listener will be called no matter if the server's certificate was
-authorized or not. It is up to the user to test `tlsSocket.authorized`
-to see if the server certificate was signed by one of the specified CAs.
-If `tlsSocket.authorized === false` then the error can be found in
-`tlsSocket.authorizationError`. Also if ALPN or NPN was used - you can
-check `tlsSocket.alpnProtocol` or `tlsSocket.npnProtocol` for the
-negotiated protocol.
+ - `credentials`: A secure context object from tls.createSecureContext( ... )
 
-### Event: 'OCSPResponse'
+ - `isServer`: A boolean indicating whether this tls connection should be
+   opened as a server or a client.
 
-`function (response) { }`
+ - `requestCert`: A boolean indicating whether a server should request a
+   certificate from a connecting client. Only applies to server connections.
 
-This event will be emitted if `requestOCSP` option was set. `response` is a
-buffer object, containing server's OCSP response.
+ - `rejectUnauthorized`: A boolean indicating whether a server should
+   automatically reject clients with invalid certificates. Only applies to
+   servers with `requestCert` enabled.
 
-Traditionally, the `response` is a signed object from the server's CA that
-contains information about server's certificate revocation status.
+ - `options`: An object with common SSL options. See [tls.TLSSocket][].
 
-### tlsSocket.encrypted
+`tls.createSecurePair()` returns a SecurePair object with `cleartext` and
+`encrypted` stream properties.
 
-Static boolean value, always `true`. May be used to distinguish TLS sockets
-from regular ones.
+NOTE: `cleartext` has the same APIs as [tls.TLSSocket][]
 
-### tlsSocket.authorized
+## tls.createServer(options[, secureConnectionListener])
 
-A boolean that is `true` if the peer certificate was signed by one of the
-specified CAs, otherwise `false`
+Creates a new [tls.Server][].  The `connectionListener` argument is
+automatically set as a listener for the [secureConnection][] event.  The
+`options` object has these possibilities:
 
-### tlsSocket.authorizationError
+  - `pfx`: A string or `Buffer` containing the private key, certificate and
+    CA certs of the server in PFX or PKCS12 format. (Mutually exclusive with
+    the `key`, `cert` and `ca` options.)
 
-The reason why the peer's certificate has not been verified. This property
-becomes available only when `tlsSocket.authorized === false`.
+  - `key`: A string or `Buffer` containing the private key of the server in
+    PEM format. To support multiple keys using different algorithms, an array
+    can be provided. It can either be a plain array of keys, or an array of
+    objects in the format `{pem: key, passphrase: passphrase}`. (Required)
 
-### tlsSocket.getPeerCertificate([ detailed ])
+  - `passphrase`: A string of passphrase for the private key or pfx.
 
-Returns an object representing the peer's certificate. The returned object has
-some properties corresponding to the field of the certificate. If `detailed`
-argument is `true` - the full chain with `issuer` property will be returned,
-if `false` - only the top certificate without `issuer` property.
+  - `cert`: A string or `Buffer` containing the certificate key of the server in
+    PEM format. (Could be an array of certs). (Required)
 
-Example:
+  - `ca`: An array of strings or `Buffer`s of trusted certificates in PEM
+    format. If this is omitted several well known "root" CAs will be used,
+    like VeriSign. These are used to authorize connections.
 
-    { subject:
-       { C: 'UK',
-         ST: 'Acknack Ltd',
-         L: 'Rhys Jones',
-         O: 'node.js',
-         OU: 'Test TLS Certificate',
-         CN: 'localhost' },
-      issuerInfo:
-       { C: 'UK',
-         ST: 'Acknack Ltd',
-         L: 'Rhys Jones',
-         O: 'node.js',
-         OU: 'Test TLS Certificate',
-         CN: 'localhost' },
-      issuer:
-       { ... another certificate ... },
-      raw: < RAW DER buffer >,
-      valid_from: 'Nov 11 09:52:22 2009 GMT',
-      valid_to: 'Nov  6 09:52:22 2029 GMT',
-      fingerprint: '2A:7A:C2:DD:E5:F9:CC:53:72:35:99:7A:02:5A:71:38:52:EC:8A:DF',
-      serialNumber: 'B9B0D332A1AA5635' }
+  - `crl` : Either a string or list of strings of PEM encoded CRLs (Certificate
+    Revocation List)
 
-If the peer does not provide a certificate, it returns `null` or an empty
-object.
+  - `ciphers`: A string describing the ciphers to use or exclude, separated by
+    `:`. The default cipher suite is:
 
-### tlsSocket.getCipher()
-Returns an object representing the cipher name and the SSL/TLS
-protocol version of the current connection.
+        ECDHE-RSA-AES128-GCM-SHA256:
+        ECDHE-ECDSA-AES128-GCM-SHA256:
+        ECDHE-RSA-AES256-GCM-SHA384:
+        ECDHE-ECDSA-AES256-GCM-SHA384:
+        DHE-RSA-AES128-GCM-SHA256:
+        ECDHE-RSA-AES128-SHA256:
+        DHE-RSA-AES128-SHA256:
+        ECDHE-RSA-AES256-SHA384:
+        DHE-RSA-AES256-SHA384:
+        ECDHE-RSA-AES256-SHA256:
+        DHE-RSA-AES256-SHA256:
+        HIGH:
+        !aNULL:
+        !eNULL:
+        !EXPORT:
+        !DES:
+        !RC4:
+        !MD5:
+        !PSK:
+        !SRP:
+        !CAMELLIA
 
-Example:
-{ name: 'AES256-SHA', version: 'TLSv1/SSLv3' }
+    The default cipher suite prefers GCM ciphers for [Chrome's 'modern
+    cryptography' setting] and also prefers ECDHE and DHE ciphers for Perfect
+    Forward secrecy, while offering *some* backward compatibiltity.
 
-See SSL_CIPHER_get_name() and SSL_CIPHER_get_version() in
-http://www.openssl.org/docs/ssl/ssl.html#DEALING_WITH_CIPHERS for more
-information.
+    128 bit AES is preferred over 192 and 256 bit AES in light of [specific
+    attacks affecting larger AES key sizes].
 
-### tlsSocket.getEphemeralKeyInfo()
+    Old clients that rely on insecure and deprecated RC4 or DES-based ciphers
+    (like Internet Explorer 6) aren't able to complete the handshake with the default
+    configuration. If you absolutely must support these clients, the
+    [TLS recommendations] may offer a compatible cipher suite. For more details
+    on the format, see the [OpenSSL cipher list format documentation].
 
-Returns an object representing a type, name and size of parameter of
-an ephemeral key exchange in [Perfect forward Secrecy][] on a client
-connection. It returns an empty object when the key exchange is not
-ephemeral. As it is only supported on a client socket, it returns null
-if this is called on a server socket. The supported types are 'DH' and
-'ECDH'. The `name` property is only available in 'ECDH'.
+  - `ecdhCurve`: A string describing a named curve to use for ECDH key agreement
+    or false to disable ECDH.
 
-Example:
+    Defaults to `prime256v1` (NIST P-256). Use [crypto.getCurves()][] to obtain
+    a list of available curve names. On recent releases,
+    `openssl ecparam -list_curves` will also display the name and description of
+    each available elliptic curve.
 
-    { type: 'ECDH', name: 'prime256v1', size: 256 }
+  - `dhparam`: A string or `Buffer` containing Diffie Hellman parameters,
+    required for Perfect Forward Secrecy. Use `openssl dhparam` to create it.
+    Its key length should be greater than or equal to 1024 bits, otherwise
+    it throws an error. It is strongly recommended to use 2048 bits or
+    more for stronger security. If omitted or invalid, it is silently
+    discarded and DHE ciphers won't be available.
 
-### tlsSocket.renegotiate(options, callback)
+  - `handshakeTimeout`: Abort the connection if the SSL/TLS handshake does not
+    finish in this many milliseconds. The default is 120 seconds.
 
-Initiate TLS renegotiation process. The `options` may contain the following
-fields: `rejectUnauthorized`, `requestCert` (See [tls.createServer][]
-for details). `callback(err)` will be executed with `null` as `err`,
-once the renegotiation is successfully completed.
+    A `'clientError'` is emitted on the `tls.Server` object whenever a handshake
+    times out.
 
-NOTE: Can be used to request peer's certificate after the secure connection
-has been established.
+  - `honorCipherOrder` : When choosing a cipher, use the server's preferences
+    instead of the client preferences. Default: `true`.
 
-ANOTHER NOTE: When running as the server, socket will be destroyed
-with an error after `handshakeTimeout` timeout.
+  - `requestCert`: If `true` the server will request a certificate from
+    clients that connect and attempt to verify that certificate. Default:
+    `false`.
 
-### tlsSocket.setMaxSendFragment(size)
+  - `rejectUnauthorized`: If `true` the server will reject any connection
+    which is not authorized with the list of supplied CAs. This option only
+    has an effect if `requestCert` is `true`. Default: `false`.
 
-Set maximum TLS fragment size (default and maximum value is: `16384`, minimum
-is: `512`). Returns `true` on success, `false` otherwise.
+  - `NPNProtocols`: An array or `Buffer` of possible NPN protocols. (Protocols
+    should be ordered by their priority).
 
-Smaller fragment size decreases buffering latency on the client: large
-fragments are buffered by the TLS layer until the entire fragment is received
-and its integrity is verified; large fragments can span multiple roundtrips,
-and their processing can be delayed due to packet loss or reordering. However,
-smaller fragments add extra TLS framing bytes and CPU overhead, which may
-decrease overall server throughput.
+  - `ALPNProtocols`: An array or `Buffer` of possible ALPN
+    protocols. (Protocols should be ordered by their priority). When
+    the server receives both NPN and ALPN extensions from the client,
+    ALPN takes precedence over NPN and the server does not send an NPN
+    extension to the client.
 
-### tlsSocket.getSession()
+  - `SNICallback(servername, cb)`: A function that will be called if client
+    supports SNI TLS extension. Two argument will be passed to it: `servername`,
+    and `cb`. `SNICallback` should invoke `cb(null, ctx)`, where `ctx` is a
+    SecureContext instance.
+    (You can use `tls.createSecureContext(...)` to get proper
+    SecureContext). If `SNICallback` wasn't provided - default callback with
+    high-level API will be used (see below).
 
-Return ASN.1 encoded TLS session or `undefined` if none was negotiated. Could
-be used to speed up handshake establishment when reconnecting to the server.
+  - `sessionTimeout`: An integer specifying the seconds after which TLS
+    session identifiers and TLS session tickets created by the server are
+    timed out. See [SSL_CTX_set_timeout] for more details.
 
-### tlsSocket.getTLSTicket()
+  - `ticketKeys`: A 48-byte `Buffer` instance consisting of 16-byte prefix,
+    16-byte hmac key, 16-byte AES key. You could use it to accept tls session
+    tickets on multiple instances of tls server.
 
-NOTE: Works only with client TLS sockets. Useful only for debugging, for
-session reuse provide `session` option to `tls.connect`.
+    NOTE: Automatically shared between `cluster` module workers.
 
-Return TLS session ticket or `undefined` if none was negotiated.
+  - `sessionIdContext`: A string containing an opaque identifier for session
+    resumption. If `requestCert` is `true`, the default is MD5 hash value
+    generated from command-line. Otherwise, the default is not provided.
 
-### tlsSocket.address()
+  - `secureProtocol`: The SSL method to use, e.g. `SSLv3_method` to force
+    SSL version 3. The possible values depend on your installation of
+    OpenSSL and are defined in the constant [SSL_METHODS][].
 
-Returns the bound address, the address family name and port of the
-underlying socket as reported by the operating system. Returns an
-object with three properties, e.g.
-`{ port: 12346, family: 'IPv4', address: '127.0.0.1' }`
+Here is a simple example echo server:
 
-### tlsSocket.remoteAddress
+    var tls = require('tls');
+    var fs = require('fs');
 
-The string representation of the remote IP address. For example,
-`'74.125.127.100'` or `'2001:4860:a005::68'`.
+    var options = {
+      key: fs.readFileSync('server-key.pem'),
+      cert: fs.readFileSync('server-cert.pem'),
 
-### tlsSocket.remoteFamily
+      // This is necessary only if using the client certificate authentication.
+      requestCert: true,
 
-The string representation of the remote IP family. `'IPv4'` or `'IPv6'`.
+      // This is necessary only if the client uses the self-signed certificate.
+      ca: [ fs.readFileSync('client-cert.pem') ]
+    };
 
-### tlsSocket.remotePort
+    var server = tls.createServer(options, function(socket) {
+      console.log('server connected',
+                  socket.authorized ? 'authorized' : 'unauthorized');
+      socket.write("welcome!\n");
+      socket.setEncoding('utf8');
+      socket.pipe(socket);
+    });
+    server.listen(8000, function() {
+      console.log('server bound');
+    });
 
-The numeric representation of the remote port. For example, `443`.
+Or
 
-### tlsSocket.localAddress
+    var tls = require('tls');
+    var fs = require('fs');
 
-The string representation of the local IP address.
+    var options = {
+      pfx: fs.readFileSync('server.pfx'),
 
-### tlsSocket.localPort
+      // This is necessary only if using the client certificate authentication.
+      requestCert: true,
+
+    };
+
+    var server = tls.createServer(options, function(socket) {
+      console.log('server connected',
+                  socket.authorized ? 'authorized' : 'unauthorized');
+      socket.write("welcome!\n");
+      socket.setEncoding('utf8');
+      socket.pipe(socket);
+    });
+    server.listen(8000, function() {
+      console.log('server bound');
+    });
+You can test this server by connecting to it with `openssl s_client`:
+
+
+    openssl s_client -connect 127.0.0.1:8000
+  
+## tls.getCiphers()
+
+Returns an array with the names of the supported SSL ciphers.
+
+Example:
+
+    var ciphers = tls.getCiphers();
+    console.log(ciphers); // ['AES128-SHA', 'AES256-SHA', ...]
 
-The numeric representation of the local port.
 
 [OpenSSL cipher list format documentation]: http://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT
 [Chrome's 'modern cryptography' setting]: http://www.chromium.org/Home/chromium-security/education/tls#TOC-Deprecation-of-TLS-Features-Algorithms-in-Chrome

From 84bb74547d8eb8e42ef6d6ad02e20a552cd3d11d Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Thu, 12 Nov 2015 14:30:20 -0500
Subject: [PATCH 177/323] child_process: add safety checks on stdio access

When a child process is spawned, there is no guarantee that stdout
and stderr will be created successfully. This commit adds checks
before attempting to access the streams.

PR-URL: https://github.com/nodejs/node/pull/3799
Reviewed-By: Brian White <mscdex@mscdex.net>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/child_process.js | 81 +++++++++++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 34 deletions(-)

diff --git a/lib/child_process.js b/lib/child_process.js
index 151fb51fc8b0f4..ddbb0448d90c20 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -222,14 +222,22 @@ exports.execFile = function(file /*, args, options, callback*/) {
 
   function errorhandler(e) {
     ex = e;
-    child.stdout.destroy();
-    child.stderr.destroy();
+
+    if (child.stdout)
+      child.stdout.destroy();
+
+    if (child.stderr)
+      child.stderr.destroy();
+
     exithandler();
   }
 
   function kill() {
-    child.stdout.destroy();
-    child.stderr.destroy();
+    if (child.stdout)
+      child.stdout.destroy();
+
+    if (child.stderr)
+      child.stderr.destroy();
 
     killed = true;
     try {
@@ -247,37 +255,42 @@ exports.execFile = function(file /*, args, options, callback*/) {
     }, options.timeout);
   }
 
-  child.stdout.addListener('data', function(chunk) {
-    stdoutLen += chunk.length;
-
-    if (stdoutLen > options.maxBuffer) {
-      ex = new Error('stdout maxBuffer exceeded.');
-      kill();
-    } else {
-      if (!encoding)
-        _stdout.push(chunk);
-      else
-        _stdout += chunk;
-    }
-  });
-
-  child.stderr.addListener('data', function(chunk) {
-    stderrLen += chunk.length;
-
-    if (stderrLen > options.maxBuffer) {
-      ex = new Error('stderr maxBuffer exceeded.');
-      kill();
-    } else {
-      if (!encoding)
-        _stderr.push(chunk);
-      else
-        _stderr += chunk;
-    }
-  });
+  if (child.stdout) {
+    if (encoding)
+      child.stdout.setEncoding(encoding);
+
+    child.stdout.addListener('data', function(chunk) {
+      stdoutLen += chunk.length;
+
+      if (stdoutLen > options.maxBuffer) {
+        ex = new Error('stdout maxBuffer exceeded');
+        kill();
+      } else {
+        if (!encoding)
+          _stdout.push(chunk);
+        else
+          _stdout += chunk;
+      }
+    });
+  }
 
-  if (encoding) {
-    child.stderr.setEncoding(encoding);
-    child.stdout.setEncoding(encoding);
+  if (child.stderr) {
+    if (encoding)
+      child.stderr.setEncoding(encoding);
+
+    child.stderr.addListener('data', function(chunk) {
+      stderrLen += chunk.length;
+
+      if (stderrLen > options.maxBuffer) {
+        ex = new Error('stderr maxBuffer exceeded');
+        kill();
+      } else {
+        if (!encoding)
+          _stderr.push(chunk);
+        else
+          _stderr += chunk;
+      }
+    });
   }
 
   child.addListener('close', exithandler);

From ae2d1ee3026bb17e1d075ee985093f4517861b3f Mon Sep 17 00:00:00 2001
From: Bryan English <bryan@bryanenglish.com>
Date: Tue, 10 Nov 2015 22:33:28 -0800
Subject: [PATCH 178/323] doc: repl: add defineComand and displayPrompt

Also some minor edits so the additions make sense.

PR-URL: https://github.com/nodejs/node/pull/3765
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
---
 doc/api/repl.markdown | 62 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 55 insertions(+), 7 deletions(-)

diff --git a/doc/api/repl.markdown b/doc/api/repl.markdown
index f298266ccb5d73..55a77416ab09f4 100644
--- a/doc/api/repl.markdown
+++ b/doc/api/repl.markdown
@@ -138,10 +138,6 @@ and try to print `obj` in REPL, it will invoke the custom `inspect()` function:
     > obj
     { bar: 'baz' }
 
-[Readline Interface]: readline.html#readline_class_interface
-[util.inspect()]: util.html#util_util_inspect_object_options
-[here]: util.html#util_custom_inspect_function_on_objects
-
 ## repl.start(options)
 
 Returns and starts a `REPLServer` instance, that inherits from
@@ -244,6 +240,10 @@ a `net.Server` and `net.Socket` instance, see: https://gist.github.com/2209310
 For an example of running a REPL instance over `curl(1)`,
 see: https://gist.github.com/2053342
 
+## Class: REPLServer
+
+This inherits from [Readline Interface][] with the following events:
+
 ### Event: 'exit'
 
 `function () {}`
@@ -254,7 +254,7 @@ to signal "end" on the `input` stream.
 
 Example of listening for `exit`:
 
-    r.on('exit', function () {
+    replServer.on('exit', function () {
       console.log('Got "exit" event from repl!');
       process.exit();
     });
@@ -271,11 +271,59 @@ be emitted.
 Example of listening for `reset`:
 
     // Extend the initial repl context.
-    var r = repl.start({ options ... });
+    var replServer = repl.start({ options ... });
     someExtension.extend(r.context);
 
     // When a new context is created extend it as well.
-    r.on('reset', function (context) {
+    replServer.on('reset', function (context) {
       console.log('repl has a new context');
       someExtension.extend(context);
     });
+
+### replServer.defineCommand(keyword, cmd)
+
+* `keyword` {String}
+* `cmd` {Object|Function}
+
+Makes a command available in the REPL. The command is invoked by typing a `.`
+followed by the keyword. The `cmd` is an object with the following values:
+
+ - `help` - help text to be displayed when `.help` is entered (Optional).
+ - `action` - a function to execute, potentially taking in a string argument,
+   when the command is invoked, bound to the REPLServer instance (Required).
+
+If a function is provided instead of an object for `cmd`, it is treated as the
+`action`.
+
+Example of defining a command:
+
+    // repl_test.js
+    var repl = require('repl');
+
+    var replServer = repl.start();
+    replServer.defineCommand('sayhello', {
+      help: 'Say hello',
+      action: function(name) {
+        this.write('Hello, ' + name + '!\n');
+        this.displayPrompt();
+      }
+    });
+
+Example of invoking that command from the REPL:
+
+    > .sayhello Node.js User
+    Hello, Node.js User!
+
+### replServer.displayPrompt([preserveCursor])
+
+* `preserveCursor` {Boolean}
+
+Like [readline.prompt][] except also adding indents with ellipses when inside
+blocks. The `preserveCursor` argument is passed to [readline.prompt][]. This is
+used primarily with `defineCommand`. It's also used internally to render each
+prompt line.
+
+[Readline Interface]: readline.html#readline_class_interface
+[readline.prompt]: readline.html#readline_rl_prompt_preservecursor
+[util.inspect()]: util.html#util_util_inspect_object_options
+[here]: util.html#util_custom_inspect_function_on_objects

From 1ab59ab9b3a7143536c5253e19592daaffded68c Mon Sep 17 00:00:00 2001
From: Devin Nakamura <devinn@ca.ibm.com>
Date: Mon, 14 Sep 2015 14:29:49 -0400
Subject: [PATCH 179/323] test: fix flaky test test-http-pipeline-flood

PR-URL: https://github.com/nodejs/node/pull/3636
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 test/sequential/test-http-pipeline-flood.js | 39 ++++++++++++++-------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/test/sequential/test-http-pipeline-flood.js b/test/sequential/test-http-pipeline-flood.js
index cb9fc97a865b70..f8de38c7a84a3a 100644
--- a/test/sequential/test-http-pipeline-flood.js
+++ b/test/sequential/test-http-pipeline-flood.js
@@ -2,6 +2,16 @@
 var common = require('../common');
 var assert = require('assert');
 
+// Here we are testing the HTTP server module's flood prevention mechanism.
+// When writeable.write returns false (ie the underlying send() indicated the
+// native buffer is full), the HTTP server cork()s the readable part of the
+// stream. This means that new requests will not be read (however request which
+// have already been read, but are awaiting processing will still be
+// processed).
+
+// Normally when the writable stream emits a 'drain' event, the server then
+// uncorks the readable stream, although we arent testing that part here.
+
 switch (process.argv[2]) {
   case undefined:
     return parent();
@@ -18,22 +28,31 @@ function parent() {
   var childClosed = false;
   var requests = 0;
   var connections = 0;
+  var backloggedReqs = 0;
 
   var server = http.createServer(function(req, res) {
     requests++;
     res.setHeader('content-length', bigResponse.length);
-    res.end(bigResponse);
+    if (!res.write(bigResponse)) {
+      if (backloggedReqs == 0) {
+        // Once the native buffer fills (ie write() returns false), the flood
+        // prevention should kick in.
+        // This means the stream should emit no more 'data' events. However we
+        // may still be asked to process more requests if they were read before
+        // mechanism activated.
+        req.socket.on('data', function() { assert(false); });
+      }
+      backloggedReqs++;
+    }
+    res.end();
   });
 
   server.on('connection', function(conn) {
     connections++;
   });
 
-  // kill the connection after a bit, verifying that the
-  // flood of requests was eventually halted.
   server.setTimeout(200, function(conn) {
     gotTimeout = true;
-    conn.destroy();
   });
 
   server.listen(common.PORT, function() {
@@ -53,9 +72,9 @@ function parent() {
     assert.equal(connections, 1);
     // The number of requests we end up processing before the outgoing
     // connection backs up and requires a drain is implementation-dependent.
-    // We can safely assume is more than 250.
     console.log('server got %d requests', requests);
-    assert(requests >= 250);
+    console.log('server sent %d backlogged requests', backloggedReqs);
+
     console.log('ok');
   });
 }
@@ -63,7 +82,6 @@ function parent() {
 function child() {
   var net = require('net');
 
-  var gotEpipe = false;
   var conn = net.connect({ port: common.PORT });
 
   var req = 'GET / HTTP/1.1\r\nHost: localhost:' +
@@ -72,17 +90,14 @@ function child() {
   req = new Array(10241).join(req);
 
   conn.on('connect', function() {
+    //kill child after 1s of flooding
+    setTimeout(function() { conn.destroy(); }, 1000);
     write();
   });
 
   conn.on('drain', write);
 
-  conn.on('error', function(er) {
-    gotEpipe = true;
-  });
-
   process.on('exit', function() {
-    assert(gotEpipe);
     console.log('ok - child');
   });
 

From 2e67db310480a4d333c42fb0cbb787f71846cec6 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Mon, 2 Nov 2015 15:39:21 -0800
Subject: [PATCH 180/323] test: refactor test-http-pipeline-flood

This extends fixes for test-https-pipeline-flood to hopefully fully
eliminate its flakiness on Windows in our continuous integration
process.

PR-URL: https://github.com/nodejs/node/pull/3636
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 test/sequential/sequential.status           |  1 -
 test/sequential/test-http-pipeline-flood.js | 56 +++++++++------------
 2 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/test/sequential/sequential.status b/test/sequential/sequential.status
index 06057555d7d98d..7d5e6f1c1e624f 100644
--- a/test/sequential/sequential.status
+++ b/test/sequential/sequential.status
@@ -7,7 +7,6 @@ prefix sequential
 [true] # This section applies to all platforms
 
 [$system==win32]
-test-http-pipeline-flood                        : PASS,FLAKY
 
 [$system==linux]
 test-vm-syntax-error-stderr                     : PASS,FLAKY
diff --git a/test/sequential/test-http-pipeline-flood.js b/test/sequential/test-http-pipeline-flood.js
index f8de38c7a84a3a..571636ffed2e5f 100644
--- a/test/sequential/test-http-pipeline-flood.js
+++ b/test/sequential/test-http-pipeline-flood.js
@@ -1,6 +1,6 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
+const common = require('../common');
+const assert = require('assert');
 
 // Here we are testing the HTTP server module's flood prevention mechanism.
 // When writeable.write returns false (ie the underlying send() indicated the
@@ -18,29 +18,31 @@ switch (process.argv[2]) {
   case 'child':
     return child();
   default:
-    throw new Error('wtf');
+    throw new Error(`Unexpected value: ${process.argv[2]}`);
 }
 
 function parent() {
-  var http = require('http');
-  var bigResponse = new Buffer(10240).fill('x');
+  const http = require('http');
+  const bigResponse = new Buffer(10240).fill('x');
   var gotTimeout = false;
   var childClosed = false;
   var requests = 0;
   var connections = 0;
   var backloggedReqs = 0;
 
-  var server = http.createServer(function(req, res) {
+  const server = http.createServer(function(req, res) {
     requests++;
     res.setHeader('content-length', bigResponse.length);
     if (!res.write(bigResponse)) {
-      if (backloggedReqs == 0) {
+      if (backloggedReqs === 0) {
         // Once the native buffer fills (ie write() returns false), the flood
         // prevention should kick in.
         // This means the stream should emit no more 'data' events. However we
         // may still be asked to process more requests if they were read before
-        // mechanism activated.
-        req.socket.on('data', function() { assert(false); });
+        // the flood-prevention mechanism activated.
+        setImmediate(() => {
+          req.socket.on('data', () => common.fail('Unexpected data received'));
+        });
       }
       backloggedReqs++;
     }
@@ -51,38 +53,32 @@ function parent() {
     connections++;
   });
 
-  server.setTimeout(200, function(conn) {
-    gotTimeout = true;
-  });
-
   server.listen(common.PORT, function() {
-    var spawn = require('child_process').spawn;
-    var args = [__filename, 'child'];
-    var child = spawn(process.execPath, args, { stdio: 'inherit' });
-    child.on('close', function(code) {
-      assert(!code);
+    const spawn = require('child_process').spawn;
+    const args = [__filename, 'child'];
+    const child = spawn(process.execPath, args, { stdio: 'inherit' });
+    child.on('close', function() {
       childClosed = true;
       server.close();
     });
+
+    server.setTimeout(common.platformTimeout(200), function(conn) {
+      gotTimeout = true;
+      child.kill();
+    });
   });
 
   process.on('exit', function() {
     assert(gotTimeout);
     assert(childClosed);
     assert.equal(connections, 1);
-    // The number of requests we end up processing before the outgoing
-    // connection backs up and requires a drain is implementation-dependent.
-    console.log('server got %d requests', requests);
-    console.log('server sent %d backlogged requests', backloggedReqs);
-
-    console.log('ok');
   });
 }
 
 function child() {
-  var net = require('net');
+  const net = require('net');
 
-  var conn = net.connect({ port: common.PORT });
+  const conn = net.connect({ port: common.PORT });
 
   var req = 'GET / HTTP/1.1\r\nHost: localhost:' +
             common.PORT + '\r\nAccept: */*\r\n\r\n';
@@ -90,17 +86,13 @@ function child() {
   req = new Array(10241).join(req);
 
   conn.on('connect', function() {
-    //kill child after 1s of flooding
-    setTimeout(function() { conn.destroy(); }, 1000);
+    // Terminate child after flooding.
+    setTimeout(function() { conn.destroy(); }, common.platformTimeout(1000));
     write();
   });
 
   conn.on('drain', write);
 
-  process.on('exit', function() {
-    console.log('ok - child');
-  });
-
   function write() {
     while (false !== conn.write(req, 'ascii'));
   }

From 05f0549b50c83753b43f02f1a02fc4a79ec7fd03 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Mon, 26 Oct 2015 12:06:28 -0400
Subject: [PATCH 181/323] tls: copy client CAs and cert store on CertCb

Copy client CA certs and cert store when asynchronously selecting
`SecureContext` during `SNICallback`. We already copy private key,
certificate, and certificate chain, but the client CA certs were
missing.

Fix: #2772
PR-URL: https://github.com/nodejs/node/pull/3537
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 src/node_crypto.cc                   | 31 ++++++++++++++++++++++++++--
 src/node_crypto.h                    |  2 ++
 src/tls_wrap.cc                      |  3 +--
 test/parallel/test-tls-sni-option.js | 31 +++++++++++++++++++++-------
 4 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index f20c9e2c1dfa33..f0569eb354ac5e 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -137,6 +137,8 @@ template class SSLWrap<TLSWrap>;
 template void SSLWrap<TLSWrap>::AddMethods(Environment* env,
                                            Local<FunctionTemplate> t);
 template void SSLWrap<TLSWrap>::InitNPN(SecureContext* sc);
+template void SSLWrap<TLSWrap>::SetSNIContext(SecureContext* sc);
+template int SSLWrap<TLSWrap>::SetCACerts(SecureContext* sc);
 template SSL_SESSION* SSLWrap<TLSWrap>::GetSessionCallback(
     SSL* s,
     unsigned char* key,
@@ -2264,6 +2266,8 @@ void SSLWrap<Base>::CertCbDone(const FunctionCallbackInfo<Value>& args) {
       rv = SSL_use_PrivateKey(w->ssl_, pkey);
     if (rv && chain != nullptr)
       rv = SSL_set1_chain(w->ssl_, chain);
+    if (rv)
+      rv = w->SetCACerts(sc);
     if (!rv) {
       unsigned long err = ERR_get_error();
       if (!err)
@@ -2314,6 +2318,30 @@ void SSLWrap<Base>::DestroySSL() {
 }
 
 
+template <class Base>
+void SSLWrap<Base>::SetSNIContext(SecureContext* sc) {
+  InitNPN(sc);
+  CHECK_EQ(SSL_set_SSL_CTX(ssl_, sc->ctx_), sc->ctx_);
+
+  SetCACerts(sc);
+}
+
+
+template <class Base>
+int SSLWrap<Base>::SetCACerts(SecureContext* sc) {
+  int err = SSL_set1_verify_cert_store(ssl_, SSL_CTX_get_cert_store(sc->ctx_));
+  if (err != 1)
+    return err;
+
+  STACK_OF(X509_NAME)* list = SSL_dup_CA_list(
+      SSL_CTX_get_client_CA_list(sc->ctx_));
+
+  // NOTE: `SSL_set_client_CA_list` takes the ownership of `list`
+  SSL_set_client_CA_list(ssl_, list);
+  return 1;
+}
+
+
 void Connection::OnClientHelloParseEnd(void* arg) {
   Connection* conn = static_cast<Connection*>(arg);
 
@@ -2627,8 +2655,7 @@ int Connection::SelectSNIContextCallback_(SSL *s, int *ad, void* arg) {
       if (secure_context_constructor_template->HasInstance(ret)) {
         conn->sni_context_.Reset(env->isolate(), ret);
         SecureContext* sc = Unwrap<SecureContext>(ret.As<Object>());
-        InitNPN(sc);
-        SSL_set_SSL_CTX(s, sc->ctx_);
+        conn->SetSNIContext(sc);
       } else {
         return SSL_TLSEXT_ERR_NOACK;
       }
diff --git a/src/node_crypto.h b/src/node_crypto.h
index 06e2ad40fba201..beeb2fb4458267 100644
--- a/src/node_crypto.h
+++ b/src/node_crypto.h
@@ -271,6 +271,8 @@ class SSLWrap {
 
   void DestroySSL();
   void WaitForCertCb(CertCb cb, void* arg);
+  void SetSNIContext(SecureContext* sc);
+  int SetCACerts(SecureContext* sc);
 
   inline Environment* ssl_env() const {
     return env_;
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc
index fc00893b77f84f..fe91f177132b7c 100644
--- a/src/tls_wrap.cc
+++ b/src/tls_wrap.cc
@@ -857,8 +857,7 @@ int TLSWrap::SelectSNIContextCallback(SSL* s, int* ad, void* arg) {
   p->sni_context_.Reset(env->isolate(), ctx);
 
   SecureContext* sc = Unwrap<SecureContext>(ctx.As<Object>());
-  InitNPN(sc);
-  SSL_set_SSL_CTX(s, sc->ctx_);
+  p->SetSNIContext(sc);
   return SSL_TLSEXT_ERR_OK;
 }
 #endif  // SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
diff --git a/test/parallel/test-tls-sni-option.js b/test/parallel/test-tls-sni-option.js
index 8ebc0c3af44705..84b2f506156818 100644
--- a/test/parallel/test-tls-sni-option.js
+++ b/test/parallel/test-tls-sni-option.js
@@ -26,6 +26,8 @@ function loadPEM(n) {
 var serverOptions = {
   key: loadPEM('agent2-key'),
   cert: loadPEM('agent2-cert'),
+  requestCert: true,
+  rejectUnauthorized: false,
   SNICallback: function(servername, callback) {
     var context = SNIContexts[servername];
 
@@ -46,7 +48,8 @@ var serverOptions = {
 var SNIContexts = {
   'a.example.com': {
     key: loadPEM('agent1-key'),
-    cert: loadPEM('agent1-cert')
+    cert: loadPEM('agent1-cert'),
+    ca: [ loadPEM('ca2-cert') ]
   },
   'b.example.com': {
     key: loadPEM('agent3-key'),
@@ -66,6 +69,13 @@ var clientsOptions = [{
   ca: [loadPEM('ca1-cert')],
   servername: 'a.example.com',
   rejectUnauthorized: false
+}, {
+  port: serverPort,
+  key: loadPEM('agent4-key'),
+  cert: loadPEM('agent4-cert'),
+  ca: [loadPEM('ca1-cert')],
+  servername: 'a.example.com',
+  rejectUnauthorized: false
 }, {
   port: serverPort,
   key: loadPEM('agent2-key'),
@@ -97,7 +107,7 @@ var serverResults = [],
     clientError;
 
 var server = tls.createServer(serverOptions, function(c) {
-  serverResults.push(c.servername);
+  serverResults.push({ sni: c.servername, authorized: c.authorized });
 });
 
 server.on('clientError', function(err) {
@@ -144,9 +154,16 @@ function startTest() {
 }
 
 process.on('exit', function() {
-  assert.deepEqual(serverResults, ['a.example.com', 'b.example.com',
-                                   'c.wrong.com', null]);
-  assert.deepEqual(clientResults, [true, true, false, false]);
-  assert.deepEqual(clientErrors, [null, null, null, 'socket hang up']);
-  assert.deepEqual(serverErrors, [null, null, null, 'Invalid SNI context']);
+  assert.deepEqual(serverResults, [
+    { sni: 'a.example.com', authorized: false },
+    { sni: 'a.example.com', authorized: true },
+    { sni: 'b.example.com', authorized: false },
+    { sni: 'c.wrong.com', authorized: false },
+    null
+  ]);
+  assert.deepEqual(clientResults, [true, true, true, false, false]);
+  assert.deepEqual(clientErrors, [null, null, null, null, 'socket hang up']);
+  assert.deepEqual(serverErrors, [
+    null, null, null, null, 'Invalid SNI context'
+  ]);
 });

From fd3f0d8e6e7bd7325d9149d0ebe1f254f5aa2473 Mon Sep 17 00:00:00 2001
From: Yosuke Furukawa <yosuke.furukawa@gmail.com>
Date: Fri, 13 Nov 2015 02:43:48 +0900
Subject: [PATCH 182/323] querystring: Parse multiple separator characters

Fix querystring.parse to handle multiple separator characters

PR-URL: https://github.com/nodejs/node/pull/3807
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Brian White <mscdex@mscdex.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/querystring.js                            |  3 ++-
 .../test-querystring-multichar-separator.js   | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 test/parallel/test-querystring-multichar-separator.js

diff --git a/lib/querystring.js b/lib/querystring.js
index 8735d2814bc307..40677ffb0f0859 100644
--- a/lib/querystring.js
+++ b/lib/querystring.js
@@ -202,6 +202,7 @@ QueryString.stringify = QueryString.encode = function(obj, sep, eq, options) {
 QueryString.parse = QueryString.decode = function(qs, sep, eq, options) {
   sep = sep || '&';
   eq = eq || '=';
+  const eqLen = eq.length;
   var obj = {};
 
   if (typeof qs !== 'string' || qs.length === 0) {
@@ -235,7 +236,7 @@ QueryString.parse = QueryString.decode = function(qs, sep, eq, options) {
 
     if (idx >= 0) {
       k = decodeStr(x.substring(0, idx), decode);
-      v = decodeStr(x.substring(idx + 1), decode);
+      v = decodeStr(x.substring(idx + eqLen), decode);
     } else {
       k = decodeStr(x, decode);
       v = '';
diff --git a/test/parallel/test-querystring-multichar-separator.js b/test/parallel/test-querystring-multichar-separator.js
new file mode 100644
index 00000000000000..257492659bdfde
--- /dev/null
+++ b/test/parallel/test-querystring-multichar-separator.js
@@ -0,0 +1,24 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const qs = require('querystring');
+
+assert.deepEqual(
+  qs.parse('foo=>bar&&bar=>baz', '&&', '=>'),
+  {foo: 'bar', bar: 'baz'}
+);
+
+assert.strictEqual(
+  qs.stringify({foo: 'bar', bar: 'baz'}, '&&', '=>'),
+  'foo=>bar&&bar=>baz'
+);
+
+assert.deepEqual(
+  qs.parse('foo==>bar, bar==>baz', ', ', '==>'),
+  {foo: 'bar', bar: 'baz'}
+);
+
+assert.strictEqual(
+  qs.stringify({foo: 'bar', bar: 'baz'}, ', ', '==>'),
+  'foo==>bar, bar==>baz'
+);

From 583f58e5d65c149048bc5b35dbd4e06b1b9d353e Mon Sep 17 00:00:00 2001
From: Stefan Budeanu <stefan@budeanu.com>
Date: Tue, 10 Nov 2015 16:56:18 -0500
Subject: [PATCH 183/323] test: stronger crypto in test fixtures

Several test fixtures use use weak crypto (e.g. RC4 or MD5).
Rgenerated the test fixtures to be compatible with FIPS mode.

PR-URL: https://github.com/nodejs/node/pull/3759
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
---
 test/fixtures/keys/agent3-cert.pem           |  12 +++---
 test/fixtures/keys/agent4-cert.pem           |  14 +++----
 test/fixtures/keys/agent5-cert.pem           |  14 +++----
 test/fixtures/keys/ca2-cert.pem              |  16 ++++----
 test/fixtures/keys/ca2-cert.srl              |   2 +-
 test/fixtures/keys/ca2-crl.pem               |  12 +++---
 test/fixtures/keys/ca2-database.txt          |   3 +-
 test/fixtures/keys/ca2-key.pem               |  30 +++++++-------
 test/fixtures/keys/ca2.cnf                   |   2 +-
 test/fixtures/pass-key.pem                   |  35 ++++++++---------
 test/fixtures/test_cert.pfx                  | Bin 1970 -> 1885 bytes
 test/fixtures/test_dsa_privkey.pem           |  36 ++++++++---------
 test/fixtures/test_dsa_privkey_encrypted.pem |  39 ++++++++-----------
 test/fixtures/test_dsa_pubkey.pem            |  36 ++++++++---------
 test/fixtures/test_rsa_privkey_encrypted.pem |  35 ++++++++---------
 15 files changed, 139 insertions(+), 147 deletions(-)

diff --git a/test/fixtures/keys/agent3-cert.pem b/test/fixtures/keys/agent3-cert.pem
index 38eef778e0e782..fededd80769c4e 100644
--- a/test/fixtures/keys/agent3-cert.pem
+++ b/test/fixtures/keys/agent3-cert.pem
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICbjCCAdcCCQDuvizlIRoS9jANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJV
+MIICbjCCAdcCCQDuvizlIRoS+TANBgkqhkiG9w0BAQsFADB6MQswCQYDVQQGEwJV
 UzELMAkGA1UECBMCQ0ExCzAJBgNVBAcTAlNGMQ8wDQYDVQQKEwZKb3llbnQxEDAO
 BgNVBAsTB05vZGUuanMxDDAKBgNVBAMTA2NhMjEgMB4GCSqGSIb3DQEJARYRcnlA
-dGlueWNsb3Vkcy5vcmcwHhcNMTMwODAxMTExOTAwWhcNNDAxMjE2MTExOTAwWjB9
+dGlueWNsb3Vkcy5vcmcwHhcNMTUxMTEyMjEzMTQ3WhcNNDMwMzI5MjEzMTQ3WjB9
 MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExCzAJBgNVBAcTAlNGMQ8wDQYDVQQK
 EwZKb3llbnQxEDAOBgNVBAsTB05vZGUuanMxDzANBgNVBAMTBmFnZW50MzEgMB4G
 CSqGSIb3DQEJARYRcnlAdGlueWNsb3Vkcy5vcmcwgZ8wDQYJKoZIhvcNAQEBBQAD
 gY0AMIGJAoGBAM8KaJS9K/7LKuV1c8Jsliy9o3ubBGHGguBLmtHLgsAhsvbB/lE7
 cuxbBXPHLgegopcOrbsp4EuHURcN2WAkGcXpBIE5msYOxmImy2FifuUi0Vj4b2Ey
 cpmkADXZrAOygwPw3WH16wNlR/vsL1GFubQ6EIdK4gv9fhBBdMFKm7LRAgMBAAEw
-DQYJKoZIhvcNAQEFBQADgYEAQJHyY0ghxICN5uu8GC9YRygzhiW/6xwKiHTQf9gH
-pET7LrJZhWmAFh19z9CEgvyWe7RQ8SfjHJX3fFZPNIO3OPYWuY+kr6wudBXrcnAj
-XLOj050lMSv3KVWI/TerEDPX1nR+rA2xzp73iJ/SC77Q02JZcVysoBB056nuHp38
-WNI=
+DQYJKoZIhvcNAQELBQADgYEAlTYjnZKIOEbKg7nxBikobIOOHiPB/ExouO4MscAU
+tOvMq7iE56ASff5tr5RAzYzojJaOq0ReWx9imunVh7P0nBBN96dDvxkyKH08KHKO
+MuZp75GDhaDnMPqu1QClU0u31ATI7gUOF+pN+IaGWT1K3g2/Rxy+tXAxyO2smEZe
+sko=
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/agent4-cert.pem b/test/fixtures/keys/agent4-cert.pem
index 6dc92badc87153..adbedbf30d1710 100644
--- a/test/fixtures/keys/agent4-cert.pem
+++ b/test/fixtures/keys/agent4-cert.pem
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICjDCCAfWgAwIBAgIJAO6+LOUhGhL3MA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV
+MIICjDCCAfWgAwIBAgIJAO6+LOUhGhL6MA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJDQTELMAkGA1UEBxMCU0YxDzANBgNVBAoTBkpveWVu
 dDEQMA4GA1UECxMHTm9kZS5qczEMMAoGA1UEAxMDY2EyMSAwHgYJKoZIhvcNAQkB
-FhFyeUB0aW55Y2xvdWRzLm9yZzAeFw0xMzA4MDExMTE5MDFaFw00MDEyMTYxMTE5
-MDFaMH0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTELMAkGA1UEBxMCU0YxDzAN
+FhFyeUB0aW55Y2xvdWRzLm9yZzAeFw0xNTExMTIyMTMxNDdaFw00MzAzMjkyMTMx
+NDdaMH0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTELMAkGA1UEBxMCU0YxDzAN
 BgNVBAoTBkpveWVudDEQMA4GA1UECxMHTm9kZS5qczEPMA0GA1UEAxMGYWdlbnQ0
 MSAwHgYJKoZIhvcNAQkBFhFyeUB0aW55Y2xvdWRzLm9yZzCBnzANBgkqhkiG9w0B
 AQEFAAOBjQAwgYkCgYEAmRNV3/oxV+YEXxo0wXHbA45gm4SyPhxlxi0ZXd4Xasmu
 D2u4G57LV3uuEQ7fT34OhiOm1zr/Mv5IE8d3d0upRjpFUru45zxKg4nbqO1e07jM
 2Yq5awwfk8BZpo7BEYVZ6SOiJO+tq/RFCPoTtjagwsDgUqHw9W7oVxXWeU0NmmMC
-AwEAAaMXMBUwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQEFBQADgYEA
-Ll7QpD8qb6+BshGdca+SBV6lGhQBDYV6BIwU7V6LIsMkyoSLXVO59sdahtLMI9zv
-pIE3IIVztY5/kBLYQxIfR+a1lL4/jraHrZp3mRTyh0nzgT567k+EeD2Q4UG+eDkM
-hcEXm5jGqOm/sMC1Jx/JUIeI3RF2TuV5OhR5Y94tMjM=
+AwEAAaMXMBUwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADgYEA
+c7q2wkyEDotnZeBDWZG+6kqXBMSF38SH3PJdM9Kb/0q8W47aMa4E1hAUfn02Ucnl
+QpnaSJToDISnvgEfTL9VAKMIzOJIhqWaR/WwiiAZpWC7M4PRhi6j45eDYESHRdOa
+uyk3Mlfs16mbPSG/IZvVW1YnRLJFAD5k2obbW1Sc2cI=
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/agent5-cert.pem b/test/fixtures/keys/agent5-cert.pem
index 636aed017f8e16..9264e61912b396 100644
--- a/test/fixtures/keys/agent5-cert.pem
+++ b/test/fixtures/keys/agent5-cert.pem
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICgzCCAeygAwIBAgIJAO6+LOUhGhL4MA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV
+MIICgzCCAeygAwIBAgIJAO6+LOUhGhL7MA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJDQTELMAkGA1UEBxMCU0YxDzANBgNVBAoTBkpveWVu
 dDEQMA4GA1UECxMHTm9kZS5qczEMMAoGA1UEAxMDY2EyMSAwHgYJKoZIhvcNAQkB
-FhFyeUB0aW55Y2xvdWRzLm9yZzAeFw0xNDA5MTMyMjM0MThaFw00MjAxMjgyMjM0
-MThaMHQxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDERMA8GA1UECgwI
+FhFyeUB0aW55Y2xvdWRzLm9yZzAeFw0xNTExMTIyMTMxNDdaFw00MzAzMjkyMTMx
+NDdaMHQxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDERMA8GA1UECgwI
 VHJlc29yaXQxFjAUBgNVBAMMDcOBZMOhbSBMaXBwYWkxJzAlBgkqhkiG9w0BCQEW
 GGFkYW0ubGlwcGFpQHRyZXNvcml0LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
 gYkCgYEAtrYJnvw24liDRWrfRDp/aBRwAK3xoaJ99YBCj7U8955GJvsoN21q6ZiD
 gT+/7K+HA5gxLXTngrSCTzbk8qfGTD+Gco5WoOK7ubm5R4ePlGrT+yCMaUQBKzX7
 3s3f0rxuAI5F2qCtIJAS/K6Nk3v6C60DyK/rudnY/+d8dFQf2gECAwEAAaMXMBUw
-EwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQEFBQADgYEAC+QBFRXhCWq3
-BLogUKBPl9TWeu13aPkhMFo29ZZB4G2KCoKWUgHZyJ3Q/Dx40QA+PCrqmKxNHyUx
-oEzol97MwB8Q4puv4BC3m8Zkgu/7z7CFH5LMh/shIjDT+kveGFUscqPzjHykeBhP
-2/4042bED6KYhNw+f3DlN+Y1mBYKEuk=
+EwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADgYEAIKKOEGadVtoi
+OYOX1jXbmJzOQjRM04igJaBSuV/2n0IMXpSrxRKCU8SrwgK4BRC+w/cmLezUeUXL
+zCuHBypIXQBC6PgveZvLZX/mwetup9Jml7nM8t7cxIaqUzwTsMpXrBPQiZplVS0b
+Kqhsp/QNOSr1oqVd3bQ5iZ8N7R+6VEg=
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/ca2-cert.pem b/test/fixtures/keys/ca2-cert.pem
index 2117d0ebf0562d..34bfa410b68302 100644
--- a/test/fixtures/keys/ca2-cert.pem
+++ b/test/fixtures/keys/ca2-cert.pem
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICazCCAdQCCQDSApRM2wt5kDANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJV
+MIICazCCAdQCCQC6w+RgcQYePDANBgkqhkiG9w0BAQsFADB6MQswCQYDVQQGEwJV
 UzELMAkGA1UECBMCQ0ExCzAJBgNVBAcTAlNGMQ8wDQYDVQQKEwZKb3llbnQxEDAO
 BgNVBAsTB05vZGUuanMxDDAKBgNVBAMTA2NhMjEgMB4GCSqGSIb3DQEJARYRcnlA
-dGlueWNsb3Vkcy5vcmcwHhcNMTMwODAxMTExOTAwWhcNNDAxMjE2MTExOTAwWjB6
+dGlueWNsb3Vkcy5vcmcwHhcNMTUxMTEyMjEzMTQ3WhcNNDMwMzI5MjEzMTQ3WjB6
 MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExCzAJBgNVBAcTAlNGMQ8wDQYDVQQK
 EwZKb3llbnQxEDAOBgNVBAsTB05vZGUuanMxDDAKBgNVBAMTA2NhMjEgMB4GCSqG
 SIb3DQEJARYRcnlAdGlueWNsb3Vkcy5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0A
-MIGJAoGBALmu6bos5wqBAFKo+xjCvepdN+wpveHocCMBbMTAbJztT9i1dayQdun6
-iPq7zjn6MfFhtvy3yN1HtHjI5PiheZmEx9iZ19qTabA9EDXCRVIeryapmj87PMiD
-UAo4NApT3r7DBNzwfH6xTJA81ZzkrgAcMSy5/FPhhWQw5Ovx9xcZAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADgYEAt6EyYlKqjoPgr/R0hmDciYRebV5K72XNlKDIFPGRhcwh
-ICQDg7OYjE8kAluLV6QorjX5JA2/wx3DcZ7gevJIwBzlM/nrojOeF3ufhjogL9Fk
-DqZhkZ/EodPzd1amO9wbGkEz4eyqChmxmQg9gbb2iEEqPOAflTM2qiq2muaU8tE=
+MIGJAoGBAMreMdPZsvC/FZUQWKrJ009zmeW7qgepfIpgX3IlJkptXZYiIQMJF0UF
+V8COK9+0vDxd/K4ehK2bZKAP0dvyRY3UHiAYfGSAWa92s2JhGGu9SESSfahVYniI
+M6bbFQb06eq0RU4KTYbsSlePY6tiGWCGzOwy6xGlUxZfySgWAdiTAgMBAAEwDQYJ
+KoZIhvcNAQELBQADgYEAtiq4TqAXCGqmAkicZ4kFSuF3jq9AE9xhhIfW9FWPSRNp
+V+TP7GVbSGwiW6UDy1bdemvBVKBP7LEhBpauYhDFY3Nw/FSGy6bqhSCH/OPTtM/f
+fXkBkKN3mSbNohXGhevAUlWWurOddrWWWYtDydcGemqvivlamKAvkCQj+lMmi3o=
 -----END CERTIFICATE-----
diff --git a/test/fixtures/keys/ca2-cert.srl b/test/fixtures/keys/ca2-cert.srl
index 82ebc5da16f049..18b47ea80f4cf6 100644
--- a/test/fixtures/keys/ca2-cert.srl
+++ b/test/fixtures/keys/ca2-cert.srl
@@ -1 +1 @@
-EEBE2CE5211A12F8
+EEBE2CE5211A12FB
diff --git a/test/fixtures/keys/ca2-crl.pem b/test/fixtures/keys/ca2-crl.pem
index 31ece2346ddbce..22467ee507a4fa 100644
--- a/test/fixtures/keys/ca2-crl.pem
+++ b/test/fixtures/keys/ca2-crl.pem
@@ -1,10 +1,10 @@
 -----BEGIN X509 CRL-----
-MIIBXTCBxzANBgkqhkiG9w0BAQQFADB6MQswCQYDVQQGEwJVUzELMAkGA1UECBMC
+MIIBeTCB4zANBgkqhkiG9w0BAQ0FADB6MQswCQYDVQQGEwJVUzELMAkGA1UECBMC
 Q0ExCzAJBgNVBAcTAlNGMQ8wDQYDVQQKEwZKb3llbnQxEDAOBgNVBAsTB05vZGUu
 anMxDDAKBgNVBAMTA2NhMjEgMB4GCSqGSIb3DQEJARYRcnlAdGlueWNsb3Vkcy5v
-cmcXDTEzMDgwMTExMTkwMVoXDTE2MDQyNjExMTkwMVowHDAaAgkA7r4s5SEaEvcX
-DTEzMDgwMTExMTkwMVowDQYJKoZIhvcNAQEEBQADgYEAlaBfn4ZNvhcfTL2Ayt0B
-diipUlM12tU3L4EGfYb1FSFIz1tbL0wZwCElagBO/b+H6w3hY6C1xskTfoJedsZE
-EKPCeY/CbZA8x2gccJH86b9IXpmEctOSlbMICsgToJGwY1SnML27fn/n3szHCPI0
-BZok7a8EmBOBx0dyCKNZT70=
+cmcXDTE1MTExMjIxMzE0N1oXDTE4MDgwNzIxMzE0N1owODAaAgkA7r4s5SEaEvcX
+DTE1MTAwOTIzNDIwNlowGgIJAO6+LOUhGhL6Fw0xNTExMTIyMTMxNDdaMA0GCSqG
+SIb3DQEBDQUAA4GBALigobvv8r1RjPDc7DGiGdOYIKlSZR0FBWBj4U3/gmFQs3/c
+q+iBlLEYjzdnW4qZ+YJ34C0LfwUjVIyFYYKA+5dRGZ5NhidMPUF9yUZyLlLN8Cqt
+RD+L/PhoFFAXCETiYQzf+1XhCvqYr8pTIp+ie1Ho1GQWN0OUNih2uC3pWYPV
 -----END X509 CRL-----
diff --git a/test/fixtures/keys/ca2-database.txt b/test/fixtures/keys/ca2-database.txt
index 0e563acefc6867..9e6cb45e40c2e6 100644
--- a/test/fixtures/keys/ca2-database.txt
+++ b/test/fixtures/keys/ca2-database.txt
@@ -1 +1,2 @@
-R	401216111901Z	130801111901Z	EEBE2CE5211A12F7	unknown	/C=US/ST=CA/L=SF/O=Joyent/OU=Node.js/CN=agent4/emailAddress=ry@tinyclouds.org
+R	401216111901Z	151009234206Z	EEBE2CE5211A12F7	unknown	/C=US/ST=CA/L=SF/O=Joyent/OU=Node.js/CN=agent4/emailAddress=ry@tinyclouds.org
+R	430329213147Z	151112213147Z	EEBE2CE5211A12FA	unknown	/C=US/ST=CA/L=SF/O=Joyent/OU=Node.js/CN=agent4/emailAddress=ry@tinyclouds.org
diff --git a/test/fixtures/keys/ca2-key.pem b/test/fixtures/keys/ca2-key.pem
index 2259c9ed6fb68a..87c617a6c44d5a 100644
--- a/test/fixtures/keys/ca2-key.pem
+++ b/test/fixtures/keys/ca2-key.pem
@@ -1,17 +1,17 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI8bZHR2S/7CECAggA
-MBQGCCqGSIb3DQMHBAj7VxqGH8gLKwSCAoCV4n2KmHtVe/Rs+mfz9qdElGc5YBz3
-k5WmqsfyXFUqf/AU710aorwHH/RGvBTGBtP6zYdcN+ZNCk80LBgSskLewfPUQm2c
-/0y1ZHrvPm8LNXVHPiQnWXIh8k/QU/UHywYcZCpuJZjPk7iKVLDNUkmvr3h9pQfH
-1H+Q8qfV85o4ZReyXkj0meaDMckc8JfHZ9hhSB9sm/Jbyyo5WQISiqGWXNA67yUf
-qU3bmbTWWaUC8vH8ZBXJUUsZMQlhF+DVg+SIOallJ4iTxecwp1xSZQjTvriEb9Ov
-r3Azs6E4UedChQLvC3HC6SSmQJEKRcYdT8t1TKkwy1mGAjqE288XqdP51zYh0ViL
-5z33K1UHkkEizNxsfFFD2VA8sOqAyRssGFA2l6wI/NwHnZ+jAZJlbHC2m6cCJ9f+
-mvDkznPgO2OzPBEbdNjWzMgMFT99PfDeZIQmXLXBU81QXGWje9fdb8zp0vi9sUo3
-W0UNN0eupPTCIbBQywqDqcP+kzOLzii913UFIY1NO9xx5DgekfbnT+Zko9uU8v6F
-yKLGdnYD0Dqsk6adddzIAuVNU7bwhsDV9LN4IuONU+9sL6GZvR6lz1w8uUnp/I6H
-v3RMLr1FhQw3BRT+H8muoaSZw6pzF1drdBN06jCP5r/etSxEXFzPY7RDmnNMx61s
-hzsI4Nu/GGJ1nxuBjke5BUGH9vTVXkm2GYYwUbE4lckwULHOdkzUMT4XR9226Tdh
-FzTYgPd7v6oFdzyXGxq1Li4hxvdDMhdMIGTNHD8xrRQBVMeZeQfi01aSVFoOvo61
-MO7r+K2zOZvHRXNjCZzkFi+oH62BacqMyx2/VLD8gh5y/LxQmuhdEBSL
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI+D0kZN/uPY0CAggA
+MBQGCCqGSIb3DQMHBAj+U7U2/bM95wSCAoCTn+utBgersCUv06fNriyEJgzlwZec
+tP5xqiXdZmUzaawdkzBeEJOWZYsawxFk/d0vxTXJMosUfoJOwEu+uv07DQVefVku
+RFWaF7QHk5GQRreoAHBdP+IWhf19U7r5F5YFkt9OGfCtVhlSQPHIm3GYQOXBIAAz
+Hzfv5dEBrl5G6mkUCtOYhZiy7eETP8EYmFT3cyPkW+4qMVOMkTUZUTg6z+b06Zsy
+LW5wTGtc4I+9liHzQZ6tReaQZMOsiXL1/6ef3ZL3TxtUm678x6LOmEsRaH24vzoO
+5hZMqj5u53hJElM/sUUXiKCjnITsgq7bjSj7gcoB5DAEPuzgw47RAzoz7iUR1IFD
+p3tL7XuXD0mMgu1acrafQprNv9G3pBO2Ifcss1+etnD+bBrhoya1D46BgFIF/7Lz
+xwj2D1GnrgnctAcal8f9mIP77TXM9qzG3okUVebmOqL/CuuQuVgT9a8cjwDiEmHW
+oA/66ovQ1g6LFZdwcnAyl3+k2Z5ggJT9HCBbJUAHpb5+qpJwO8nKRsf5Y6wnBYPe
+pRp2yl8TW7vVlUi5LeiZ4q/c4JfzcizBguzIInwBZMdRvA9ID97r4bdptKh+zazg
+0cZo4VolYu8gDuxs0pUnaBi8MJxUynRFQNvAiLQtD0cG9PrCFg6WS0/vEmUtIdgF
+Ah9tMb9HgEuJeRaggcaO3eVNL8EWO/pkJMtxy9xoqUxwWEbxwiYrozBRHP4cKur/
+bW+cBy0gICOc5QoISvBSack0t+U2HB3ojz0DzvAWAVpmcqRKmHitRvma4o+x/uro
+bVhvAhLa7NPxOUJBI92yFBqn8zz8KIqLPVGcYGhucZcNqECPDaf6t85e
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/fixtures/keys/ca2.cnf b/test/fixtures/keys/ca2.cnf
index 7af9f8c97aa4b4..8d216c57237d59 100644
--- a/test/fixtures/keys/ca2.cnf
+++ b/test/fixtures/keys/ca2.cnf
@@ -8,7 +8,7 @@ database = ca2-database.txt
 name_opt = CA_default
 cert_opt = CA_default
 default_crl_days = 999
-default_md = md5
+default_md = sha512
 
 
 [ req ]
diff --git a/test/fixtures/pass-key.pem b/test/fixtures/pass-key.pem
index 9a0c5f158d9603..968d5175d31593 100644
--- a/test/fixtures/pass-key.pem
+++ b/test/fixtures/pass-key.pem
@@ -1,18 +1,17 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,CE30CF10CDD3C074
-
-A9Vjoxw1Z6pfyxMHXxDi88JVcLN0uWJAjo97nsdzV1cYmEk4bQUe6XVu8UGCzbYX
-1RVeglOwyKfp631l5j5KHNfzA4lEU46uqAkRZbkzaHg6sVK7nuSBamiDqkO+BSEU
-kDCDqImcx+wUXjlFsYc2UO3DJen8QVEVYQthpxqS7UGh6SCGKyb8FzHu+nzOtRrZ
-y2Y9r8vyllH5+qxyGymkJJgPGYd9a/q3uTjxjBsb252SC6JEMt/njXdtlt3zUCQl
-8aEok8xXIyDFsrhkQ1chXYt/neWdgVh+R9HulVvSLKkACSfX19F2ooIIWhoml4C1
-VE9iX7wytbD7LxLK4kWQL0sRi0MQPwBEag6m9K6skcsN8qIRJwJZeevc3xw+08uI
-IqUL4Ouy+eNMYQIxxgKBcgVWV51X1HWCcwjBkDp9x/qU+URKBmGcpTKEiOrKGG/I
-8JN3IreJU5EhtGqE15J4ep/hS4CwJ9+CFysRs0vFCw24GS+O2CXWT9rgza4VX1we
-dUVnGGodJcXgAf0sNECm8zYk2fjy1SICm+fknsN466d2pmCO43/WpBhZyjbLEHsJ
-a5pUVQroZdU2W70eGh2yIGVrMmgVbYPitTBafruW8w03oarG4XWA4caEmJMEVC68
-WZxuQ1Wg1J+fNl+Klq3b+4yImmoFrelh2gBANwYKnE9Z+JLtfv01et9DNOXR2DQM
-6pPzrL0JUHetqko4mJTVNvW8h/Jv+0UVwmxmwm6mR4IBcKwQyY5V5VqeFfnXlvM1
-xpg33AEKNquAPC8G4pIHwG4aBo9fLp+I3cxPuY6dnR6i2tyQ5ONvvw==
------END RSA PRIVATE KEY-----
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIICojAcBgoqhkiG9w0BDAEDMA4ECMeM7uTE/aoCAgIIAASCAoDIIO3VAz+gb7td
+FSOwV/zshzjr7n54r6Jg6fFyeIRrE3tgobr0loPfZUadtd1uxGMFlf4WKqXdk9u/
+Le2BCw34rTVCIlwritFHmcQ56xDKB5WTx+yuzxr97tmnFq00kTeHUcsPOb+eYU5B
+2M0xWpYeEUP4iwQafUz6A6EOjSADYYpdgHHAzIY9VwECPkCqOJJti644OMNPUw8q
+nvoESqwjAO1t2lymNUFk6zHg6FewiyCfjY6ucUCadbN74vUqKAJI45u7HQL8rxSf
+95ncmjpHc+t7GUrQyzD68JaIGFN1Q8d09/ve3EOfoUoDGW+rE3hJ7oISeJfY3k7I
+bBw6i0MO/ZfMs9wbmbMNDKzXQMolXfenK+KdD5Scp6eCeE14KqbQXuDoy+yA9CcZ
+F87v4AyiY2o+A+cS56oY2R9Gc7uX51N8ZQGCuE/IEXeZbemV81br/EytJiZsXbPj
+Kks1QkcsWnfsCUEeyF6IvIRXB70A4fuJ3+V9YoPoIawY18OoRPbMBBWkfMwEJIdB
+2bW3joco0unImwRT6aXFghCnHOdXyQOMNtf1aCSDd/7o+Vac50Lwtuwpp7NsnUID
+V9reIaEugHuM3PHbv3ygm8o3wb2VVRHgWV/wOReEtqLPhERyM1xfVs0y6xCGiE84
+N4uEzAwSGDFgEYACoj7LrqrVVEeVbrD0Gul2/fq9HnKOk6E/tygrwusasyL5vtSX
+ZH/DeKK2XKq70bSu+1eGA/A+SqySckBe4QgEO7Qyb9xWqZhbqDyLg/xCUfDscMyP
+WWW6nN56LcWI7UOEfWJVLTFCBil5T4e2qA4BiJTNc8zwwOM0BIyqvnhlENGbwQBI
+KuSCzKIh
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/fixtures/test_cert.pfx b/test/fixtures/test_cert.pfx
index fd28781a051e19d99ac266bf9d98ef3fd7694971..d6c2023a2d071587aab959c9d26148f9a50cb96e 100644
GIT binary patch
delta 1819
zcmV+$2juv&58VzxFoFkJ0s#Xsf(IW42`Yw2hW8Bt2LYgh2M`2;2MjQR2M92N1P2BQ
zDuzgg_YDCD2B3li_%MP4^a23@FoFZ^kw6%K127H*2pA%UCPfPJ{{jLC0Dyu6!0O6c
z{^e&hP8gY>c@3>p|7C;PcjZ05jXwm(jT)dxahM<!`=fxzNo&>H!lE1ll!BDc$7e_e
z9eLo=Vu%X4eigV+mjJXcCyY0kmISDzFT<-77=tT#5gEu+ZE|8=(6OP5&{ymWD=D;p
zre&tBuQw|^r&a${oG8lS)>!u?uH7+BI^<+p<#NYEhJRgx?oa4P)=EJ5E1HEh-&0Di
zwh=KQ*$G-=EgjH9$3GUk&}<daBK}Lm=SVYV8*%0=%dJ1xW7`Mg7Uau17oNfoEiO-}
zrDkhnPja0#2-0$v33aVuT1!Tv4Y28d-Pg;H4Lt(J$=w*UVdLD>wF_Y26LX`Sc41`A
zY>sW#DM$VSro)A@SWYS^3lnfiiNoA)d7=f8-VCaYFS)Y-p&Nbms@B5NjqE;uq*t4t
zx7~^SGK3m6x3E*E@yX?)J&rdK{&-0;w?k4pk6QtaNyaBk9w2!r?>Xp$S-Vw#3KsLM
z_=albWmWK_mO3x|8FM1`a^t=AF2+4<uM`i>zCTkxMrji^aTwZ4(cAF46J%L#B(C>9
zg)&rZI$Xu^)0^E3-iwDPFqZRPFw#MCwXws!ArFlo-R^k2D;rfBLCPHlc0E8FzNs<v
z0M0dBuI?-J=?jg-I~}3uUQ<MWpUHms@x6hgM)kUdLUJFOf@WU7kIzpqA=9>&-zu><
zN6w6N#bsEU3zIM2ps$cY+Y>chKekAEP*E`o-@<SJq5jZF6a#Q(R;L}{eaDLUP3%we
z+6er-=G+M7wK>U0(L#J5Ztgy`*g+7<VN_)hsm|UEza6B7i!bSJck1wek!FGzdTiE`
zKH1un>`@fuU8bd06gQUx+RwtScDgoC>Hs;Z`PmZJDv#QUnJf8q=t}|*@Mea(tE2}=
zqRouY=8At&mNKfEZ)8x$&N4*$NM!sNn$xWiJzHaTMmjN6(>Sri!{%35pQ7*_07E0B
z4nw(HC*EmRN?Z;-S{-(O7wffEzsXRD0yTsh(cU071N)cxk9oWOsXLVY1x%ud^28#g
zNMQA`BwSEPTsal3Lmn~q%x2OAh=nkt7guT_L{_4^;cDXfa-%ZsPHZh367%zOtL2Pp
zWwy*KVpYYY)@ob&B{&j8$_|QA;}~xs*OxPAN6B^s$8>m*8t)l@!T9FBhy51XuJ}MH
zG23s`@oD`50R^<K-=3G)Kb+B@4I{q4;B1+BC$Md;+LVDXMETmz_vx3~uKFOO$9CZ+
zVi-^}?lkZaSXWVCW2_N*a?fc3H9PE-31Xq(FoFX41_>&LNQU<f0S5t~f&%IUf&%6+
zf&$_&f&$(K3o3?_cmyMVKP=7J*6Il~0s;sC1cCy9T1b;dWQT2~a>~|W{E|LS_n1%i
zp~_VYtCvr3WuL@eE$KvIBGG~|4q0I9O{7U3r+>m<Uf3pEBW#;wRFVsK@5Y%kO<eoa
z0>?FV{gK-U9&8EWy8T2I)2+s*#fuj-SR+X8+pO)uSeA(ezViux!L4jO>a8RMR8SO+
z#h{wan0s`U0(RLFjnr`}OGbS8niMv-|Bv`xwgb*5$U$0ntqj`}#P1%x(t=gMIe}d3
z+$3bsu-H;k)k9D`r$(NS=gln$8ES#5by%MAgeN8c9sBx`kg!m#R;qgTd=?`oDm9WB
z`=G`Y3xA&xt&f_2-~KdC`#zjOwXKv+xfoy*;^$S!mU<3&M1Ri9dFd~0W>|#XYa}8V
zJYRSot~<Q0&8hwl9fFhy#l}T0k+39IQlh^3piUmx**oXi%MCRCbIviZSgiyeKP=0)
z@Xkm=rKW*tSzrgDVnkAVC73hMSwvaes0i-Rn#ayrLY_i@0OBA;;kFwM``58D5eq9F
zPEp5C3IB-MV8$If3ENbSR{G}DYV$S019(?S=h-WKmSYDJ>phy)#Xaw#GQ9QmIKGuB
z>Q(ZYZMho;1YP7qIg3^kT6C@y=#ZgP-lElh@SSI87|&oW;(Yun6txhV_XTQcz1F~2
zbT`y&vdWZyo$2u(duh*)50EUWcGJPk)_tApW0msc@JhRj@&GN5B(o%}*%tQ3Hg6jJ
z1{PALOk`YK_Az#xDhIGd$KBb1R(hgB#gX6mAT{HIUcisaFhVAHT1snY){*@il7D;|
zAz#NLen3YnANKlJdiys!4uOK9R#ttODp%<jcF&?0dSDZLR@k`d{1fa}9*=lenOi^i
zPcbEvEe9qtF)$%82?hl#4g&%j1povTBWNg`mJ{QtNgUBiGFmF2AXT?F1PDy%av#s~
JPn7}!2msdRRc-(P

delta 1901
zcmV-z2a@>R4zdqGFoFlJ0s#Xsf(LX42`Yw2hW8Bt2LYgh2W13;2VpRR2VF3N1TO{&
zDuzgg_YDCD2B3ljATWXi90CCVFoFaXkw6%K1~3i;2w+%8B3K4vRssSD0Dyu6=z>$n
zT`#ZhH!FIvNYyhtT5xRaTn-6O>`P&GKr&IAqE94wu;nP6c;&igp|4BE7m7)Jhy0zE
z`+BE7)8A(~&J1SMc1_<50^6!+Q`3hTV3DV21uhEP7W~oS6s0PZ_Q|`VtzU=l3nyxS
zglR6&-qO1NZ%1){BSt_B6X1Crx%q60?;jzPBW;M(_tq+jb2Bs}Y&+k?5A|Hqgso-M
zcS`DD-)+a?&3$8DphR}}0cOZEdtRH*;f{uV|Gh!$-p!*_4`Dh8FoU~jg|maaSxL>k
zY~z)1S57+<@7KMP=>-7fw>AW0c{l}s+GZ76K*l>{s-n~C*vL$<whZTy#1z2E5E=@_
zn<FqA4f}$Djq?VI{@f517c~jBe%}*-MrxTA`>+^{AA-|%OCE)rP>bUoel6UCD<l2-
z!*Td(doD4dZ3a34(i@!)G3zbJ4Lj*6vKr@}guX|vk+DAcS;_3nG&edzh4X%Yn`YX)
z-c>9^^+wRfa=f%iLD1SF^cUJfrgLsaN}ox3)@T}B(ldUff-(zQsvI<6-g#x~^C}f8
zkF4ng$HMH!6x(McwyiGiKRe#bimu+d@a$FHIo)i<MTp=|Z}iEsWLkv4uSVbDahik7
zk@>6=Y5ahS?pD_Lf}sNV136%SQyi^Np0}b-du-2CDE;|9cjHllG62pq=+d}=9!6YR
zVy|PyTMfsi)~Kba_@Nxx7WcnDz&6XSHAnlqg8l<C(nbjeR~KXGCz(X;fPDBh0dgji
z=jxD=13B{%u@e#jOv1WGZ|bQSZZNw>LJc~sn)Xi&w_CDE8|ysJ?$Ew}vED*9r(N0g
zh6?hU<MkpATcPAf5FQs@ss{ehbE?53Vn3b1(RR8H+m0f1#?#(;)hA{IFMj;IG^5hh
z0vsW}M;$V=vjS4)e7K4C(ve-hun6?4)yDv4c?n%}`@p#`w${*+U=`Se+4fw{2DZtE
zr7J0mG(5G*4t3r<sP>(I)S<2!qN7yrlm1vRakcPM1s-A9)i@V`*`gask@not7n2Os
z3KpNw?f~_siL?vDqwD>8za3~v02u!z3Qnj<$3zo6%Mi}1&eR?`jRIVG0pS8Kh%fvX
z%`W;eO3@=)Z_X2j7uy$fNxgvn&~hy^p>@}NB=xnUQTIRP6!P?c_Pn!OWO`w?oAD15
zlxDkzae3Rnef0sUvcal4!n;<6)M5-=Bx&W&Pmz&5s3983Vc!_hIAS@T^77O2l@w=*
zug6M#2JH@dshRPOr?+nkI!41O7Vi^S1lF(W*lC{3!@w~Yfgkp=IM-3mk??n<M*dEb
zQj*Qnw{pVfmyY-(&d~r6rZ9p7CI$&AhDe6@4FLxMpn?Mz1cCz-FoFXQFoFXMlS~9B
zf6RU;H0*O+!~y~c00e>pfHh6O@)-%Hmh(G+g|0_Vj(NQMvS1RG|CC+|M+XiQjq(<v
zg&M5or_(We%w9}Zw1@FQyfnpkkW+A%*uS@^DyAL$1}YjhG>hA0X(7e@o28TWe!z8+
zlVzm-*YAm`5eqHS-lR%7CL8w@tAj%Qf73VNyJX&l@N*c~6w*GE(vbiIXBLyfwoG|Z
zj>*<M(--<h*nob6*_t1C>h6>-za=O5eUu49-M|>k3Y*%7azDFjM(ZN;Gu8B3Mmy`6
zmpcK4@^Ml9T8x$BicqULcQt?UW+rFEnj#+ZVCPcf*Lg;N=Z~+Y4|nmf&&Bjue|_R8
z+ZzR@EDlR9G|-cDA37ACHDz-2DQ7qMx^F5LT?*09<}eH4&4)arBcctHdk%#s!nI$-
zQqx6J<opl^P+nU%yb^SW@PTVUZ3ISpcDIy<Ou(-wsj6fUC_BMouCWA%jh_1lrmm+T
z^vg5}uBsC_ZK<oF@2HiRe@SV1e;$&@Bay|MbwA~$5umxKJG6jZ32V)yu%s~EpzzPW
z;=VQqektw06!w{L)vsJgwzim#0LLVZ6{&YaI)bLvw(+BK{gJ~cnzvWNNy!x>I!$G2
zWqSv12|@^H)}k>f)==zceg`+v4<9&-fvi-Qc~%r#JlEv=Eg8qBj+k0`e`c>3l%D4`
zM0><F(y7czR7*(bX`$w;Z?d%-&Rb>?RE60#@xzcebx@Dbj2ohLn(aiYliIxB3*9#M
zjLD?Up+or;BTAp&v0qyls6nc78n9%?=rDw1aWBIMNZl2b8f_ApL}Agv7I~UdN{S`$
z?q-_Q=%vs=$W7foG|YNp7jjR^k^bsqj+gB)(WN@>Pn;rf;V3aulLZGRUn>R)Duzgg
z_YDCF6fqti8~{xKSpXmaLjYv}asYGyX#i#bX#isYVE}XhWiT-?AutIB1uG5%0vZJX
n1Qh>krX!bsk<LDMma0tK$+4@@0M7&n=t6;jXk&!|0s;sC3M7F3

diff --git a/test/fixtures/test_dsa_privkey.pem b/test/fixtures/test_dsa_privkey.pem
index 6f06041567c528..2056740af99718 100644
--- a/test/fixtures/test_dsa_privkey.pem
+++ b/test/fixtures/test_dsa_privkey.pem
@@ -1,20 +1,20 @@
 -----BEGIN DSA PRIVATE KEY-----
-MIIDPwIBAAKCAQEAiJCR40HCtA6pk864XhKceke8N4chlrpwcphAXpHwSQGHlv1J
-JFyjaPqugWtzwZH55g7qpIiT3fmg6V6PfzNfx4sQGlSjckZaN02WRUAacn0va6Ub
-wyYV7LZzuHlHzayHLl/btGeTF+zL+9eMLKfll+r+5bJXDMWh3xUD1Nldf+fsIsbV
-ZI9QNzf3L1/07XVTLedQYaE77OqVuu+cfoBtb+K5MsQdHMMN20BGjKIvGkJICuC4
-48GkDx1wpxz2vSJEi6FqXruM6c9yrPvhJKSfbVFYK2n82MMXMNNu9Dwqwsv6Ig6d
-IVywdKDrSw1Nz9j9TWA5BolNta3yMPHrEjCuIQIVAKq0ZZ0/36sZE1cqt6j0hZTi
-sWUVAoIBAFbI9MKn9DBJ7lo7+LRblgNKg9lk4D/6NBBRgOeCN4WnOxHQrqpSTUBG
-+VcABDKEfoHfEPI9KZKpEgpzGTpr7mGxDPLHfGL+vvf1EYbmcTDrUWlf9B/3+L3u
-wIddv3NYLepyEZ8L8g6eRGSQ4Svg1oSR/GAUTeGJczPg6qW0b/LTpf4eeDNWYGF6
-aogJUphnPcZ0Xqw+yvq/i1uzAVirUxp9Crb7km0dfA0G/HBiSdcEt6l8LdQd6qmc
-L0nxcm9x6L+tSol5hXNynV0wcxdCQz4Xj5na+NoRGb9jPYxgLkoq07hwAkqkQDyF
-61txfWgGc7zmh/x6JMGe/Xhg1TvgxLsCggEBAIXcOokkhVjC+i/I/grM9qTh6fCV
-jzSbOsIVi9Hfj7GCTRYA/QFnNbiWbOWzP7t2cEQFLfZoJmTK71+htZql9/GRMzV+
-dnyhwuRh9YWkuCOlFHD7hDFBC+e1VqhV7ltaokqkZU18BsmgZG/fxeqOAfElEKLE
-796rOAXmtx8F14Mn+IQteEAmifF1140C0bFzH67RSZU13pRCB7TKbruTevnhdQct
-LOzhgpMuoEWAjSWni5+WklOg/LxrMZ7MFz+Kqph1PxSX7kg/S8yCjNFtaviY7HrJ
-E7wUqi3Z/VPV4HKGeHzX1k1Z9RE/oJTsR2yT2rtJvSGO9lDk6Fj5tIv1fC8CFQCd
-3V7C07NVeTiUU1WTP2nFNgMqEQ==
+MIIDVQIBAAKCAQEAuQmFtb2R28f2LZvv5vqLHh263pDneNFTksm6qOlLNjcrBavu
+OqzZZ0dvC5KJYOJ7/lyumE5Qd12xMG4m2GtbsArgBIqP2bNq3zqRjcKd9RYN6W/G
+YRa545oa0IWX0U+m118N4b8l4rY4EJMCLES+TlGJUAhCG3/i7KIIpEHs9vsWmGJK
+lKkmHW+PCJFbQ0zMHlrJaQylJiHx9XMtKLKjAvexkfBF174Su7IoNoYR7Y/jRRgO
+5mo3xBZk3dJmn2QZRBaHar5MFdau00zKw1oJDtpXHNgxDI2faJ/cVbM0YTQhiMLh
+SS4VgSnzWefV+y1MRH5HpaXHtCq+XhZscDeJ9wIhAKSu6bu06h6oiKBg5gMlJu9Y
+Md1eU95jWoofGP/Ye3TLAoIBACTbXwui6qVPOFDM/p7MUnIf8pQ8dZcod6zhmfVp
+/trSIWoSPoag8Jj3h78pswx4dkI7l4M3mZqNe+dwgQrWHVNBp7pkhBFFAokwW0rF
++mctFSOMP0Mt1leSKF15BfWLG5AvCYT6vYxy2uULeefUxft+OzhbKOWnvl5JGfAt
+ddlMip2M754qpW49Am+BOxWnQs0oIAvXNna2BNdjMUBBG3XQFTbcucKY4d0HdsvJ
+Cjw0p+Dgq0iFwC/Fg1yZOdO0S+ZqKip8IrP94j1F4lO7PEJiT+AfDJ+LwzNTtKzk
+Qps/Sl89H+TNJcN/Y3QPwBtHzTc/OighUz3V8/yM9U4aYU0CggEAS8U79P4cax28
+Emh8kQqiLEyoo89LIsD+DiBuEpeSGb7ty29dP2eRIBce4AVHQ7D/Pwkm8bxnh5+Y
+iDqD13344lZY32a5zMXmMnN1e/lPs21p/z7XO/5ggDzw+h7EQHPIAF87KvPFiO14
+Vi1m9IzG/Nmu4Flks+4IBXlsXxgLDbYjtuQuOhmU+VtIxiQbrbe+wVMhzzaDNMt/
+wXr5twAwWbPqJynPlodndElETz6dNLL0gW61uHN/CFsaMTLManftSifh5DJpglaL
+yQ/2+uGje419/kOWOexZ8ysREKIBrhWhePolw8SAiygwbCUhgSbruWpJPpQOOtI5
+YTh2lIK0vAIgIY7133yqdVd5zIlFFLGM0tjLJ9eGwRYgcEnTYIrUcBA=
 -----END DSA PRIVATE KEY-----
diff --git a/test/fixtures/test_dsa_privkey_encrypted.pem b/test/fixtures/test_dsa_privkey_encrypted.pem
index 0eb65bb451f5e8..11bc8fbdeee1c8 100644
--- a/test/fixtures/test_dsa_privkey_encrypted.pem
+++ b/test/fixtures/test_dsa_privkey_encrypted.pem
@@ -1,23 +1,16 @@
------BEGIN DSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,2E8DE7F5BD338C4118488E8D640FC695
-
-7jnL7kBITpnfjHc4DiRF+9d0M9QKdQmiL9N7Bj52XC+L0jZTwfNld3xi6fQ1GNle
-RKrrgSgEYXxf+RJ9Nz/BOttYWnIyAWSswFIjm1vGjpoYTH6H/wFg1QSoZUfINO2I
-3p4Y+cYVWOgSAYegzT5sdWTKDJrRUUfYFThmdQk0uO3s8B7urQuVlEtHr02OuPAj
-hRiWaBtxkttBWA+x8dgpgAbjHlZIWv1fj0EAKaaVehaNzEyK+nyS1a816ssDV3t8
-YMOZdCdKgzbBr5T3Zf83hdzpmhagBNZve1P0kJEgGdydiRWSyTxotOt5AGsRSvza
-A9PVk8V/U6U1B18hACxGV4wiKCMQDAsHfo+BrVoZBvVBlpW4dfcsIEtQqwu18x2b
-wIW5Qc2zXFFL6P+eqfdZ0ZRdfsClX6/GYOO5Z4oy8iAQSuD1UdaG6Psy84U7LU8g
-++OcbEcw8UnKjKVJU+zBC4QmhxUSUiOQwcgeFQuMIEMtprUKztgm/oPClAMTY/pm
-FGxLZS59owVWkrN9Oc4ccw+6Zt6mDxH9cnHv+nkGlcK9pcD+gU1MVXUfuby+DNbI
-4iYqUoYZdb9gpWQ/VrXMX63NydXzE+vMB9BxOlgfw3b6BrFCUAuyH1FiIAlGeAjP
-LZa06WiOayeu6Lm8rzeu/Cjbe1pYzK9cyX3JxSGJxipPeO4URZ5+hyqBMyCCCUq8
-EVFcfwgkdQaeVeBUdxJyRXfuBQmlgJF0Ixlkw29StpI2dAbNrtcSAIwbsxDInK4b
-6ItdadW+0nCRAxdVbGt6oQIPqpjbmtVkqj+m1yAic1xYc7Kd2xngGdtOMefKefcw
-+7d7E82ljPycHDG2SNENsFV9TNENdNlaP1A1HQy+f/1YkLZHfNLQrUf1+BRR7oHI
-N0ACLF6jgZ9MFelB64774veUTLvcrmYKIX7TnV25kw28ZIQ8StmIt9YJ+Mq+x6DC
-32JbRBbwbHm598fCrfr471xw/SM1/OnPefVhJSQ6223IfjuSWG0Snvjo7mHbaduz
-xWW6ApT7/iilanZs8uKBuPaEtwu3CmJcdgj0tTUuXb5ivY3M0dD/ZLSQliqb49iU
-64LX0/kRvkUZ6nJqPA4nlKPfGebo6H0V4oX7XF/gm74=
------END DSA PRIVATE KEY-----
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIICkjAcBgoqhkiG9w0BDAEDMA4ECLCAnNHA9e3tAgIIAASCAnC9H9ncbLh/TpT9
+jVecNZZ+udUB0qmaqIQ+qW03NJfrJdGhAd8tbhGb2hqIi4tLfOpUAQS93BfMXguM
+hyVQWJLGreIm7ehIqXwwFJFts9WJWsS9UleHOTtKNQvft3Lkp29lR/DZtXsJfJbT
+0gjjHFpGhaNnIEK8eRAoyXZTPLv6ZPvFp4szj7GjslP5dvkcBeXbgTlBAT4EVB9e
+43tfF1J2wOnuIkQXvnZ5eVseYIbKpCjAU/ZkoZU6ySVvFkc3+NIB9qHqKsE4LKdp
+wqhCuuh0b95TpiUoI+IIsLUbcGW7EZGwkVV2NxYZGpNehx5/kwGnH32KyDOqNVkm
+y5sC96oRSXz9eAo69zC0LgFL4ZyHWa9gebgPXRSbegiLNt+wxE4arSPlwUaKWzlH
+qEL2zzeVBIvuDwQ6SDMNiNv1GK68kaZ9AuR0jPn3COO2TgdWaigqrGPpNv8c/F2m
+Hv1ex6FAJr88aglxU7K6gS7ayFtWZqdg4K7KIGrP8Ii/UCkzQxSnFRTFbjUJCK8A
+5mM7/jpmUd/U6Ygl/QrtMjPBHN02CjTc3LZK92uUf0g1u838zX91FxvItzyockpg
+rkZ5UWggZ2q0Hg7duYffjOR28d6u44JPIPJ9WIN2upsZoP1ABdUdazBRhpq9Da68
+7+lpZC5BGwhpiP93bB66T+QwjqLCDFygIaCii+vQq/814pk/i/7VBEVGm2iDjOx/
+Ng99ltKl+JDJ/lQwE27pp+JP+9Oe8uU94kelPA7w8xrj/YuukQbVY03+WYFag/Dn
+uMJyKYOqm7LmHOQy8rggM9RjY6XQY0KV8BKX3wG+4zjARTLKRbo=
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/fixtures/test_dsa_pubkey.pem b/test/fixtures/test_dsa_pubkey.pem
index 1f1dad668b38ab..54d01bef7ae72c 100644
--- a/test/fixtures/test_dsa_pubkey.pem
+++ b/test/fixtures/test_dsa_pubkey.pem
@@ -1,20 +1,20 @@
 -----BEGIN PUBLIC KEY-----
-MIIDOzCCAi0GByqGSM44BAEwggIgAoIBAQCIkJHjQcK0DqmTzrheEpx6R7w3hyGW
-unBymEBekfBJAYeW/UkkXKNo+q6Ba3PBkfnmDuqkiJPd+aDpXo9/M1/HixAaVKNy
-Rlo3TZZFQBpyfS9rpRvDJhXstnO4eUfNrIcuX9u0Z5MX7Mv714wsp+WX6v7lslcM
-xaHfFQPU2V1/5+wixtVkj1A3N/cvX/TtdVMt51BhoTvs6pW675x+gG1v4rkyxB0c
-ww3bQEaMoi8aQkgK4LjjwaQPHXCnHPa9IkSLoWpeu4zpz3Ks++EkpJ9tUVgrafzY
-wxcw0270PCrCy/oiDp0hXLB0oOtLDU3P2P1NYDkGiU21rfIw8esSMK4hAhUAqrRl
-nT/fqxkTVyq3qPSFlOKxZRUCggEAVsj0wqf0MEnuWjv4tFuWA0qD2WTgP/o0EFGA
-54I3hac7EdCuqlJNQEb5VwAEMoR+gd8Q8j0pkqkSCnMZOmvuYbEM8sd8Yv6+9/UR
-huZxMOtRaV/0H/f4ve7Ah12/c1gt6nIRnwvyDp5EZJDhK+DWhJH8YBRN4YlzM+Dq
-pbRv8tOl/h54M1ZgYXpqiAlSmGc9xnRerD7K+r+LW7MBWKtTGn0KtvuSbR18DQb8
-cGJJ1wS3qXwt1B3qqZwvSfFyb3Hov61KiXmFc3KdXTBzF0JDPhePmdr42hEZv2M9
-jGAuSirTuHACSqRAPIXrW3F9aAZzvOaH/HokwZ79eGDVO+DEuwOCAQYAAoIBAQCF
-3DqJJIVYwvovyP4KzPak4enwlY80mzrCFYvR34+xgk0WAP0BZzW4lmzlsz+7dnBE
-BS32aCZkyu9fobWapffxkTM1fnZ8ocLkYfWFpLgjpRRw+4QxQQvntVaoVe5bWqJK
-pGVNfAbJoGRv38XqjgHxJRCixO/eqzgF5rcfBdeDJ/iELXhAJonxddeNAtGxcx+u
-0UmVNd6UQge0ym67k3r54XUHLSzs4YKTLqBFgI0lp4uflpJToPy8azGezBc/iqqY
-dT8Ul+5IP0vMgozRbWr4mOx6yRO8FKot2f1T1eByhnh819ZNWfURP6CU7Edsk9q7
-Sb0hjvZQ5OhY+bSL9Xwv
+MIIDRjCCAjkGByqGSM44BAEwggIsAoIBAQC5CYW1vZHbx/Ytm+/m+oseHbrekOd4
+0VOSybqo6Us2NysFq+46rNlnR28Lkolg4nv+XK6YTlB3XbEwbibYa1uwCuAEio/Z
+s2rfOpGNwp31Fg3pb8ZhFrnjmhrQhZfRT6bXXw3hvyXitjgQkwIsRL5OUYlQCEIb
+f+LsogikQez2+xaYYkqUqSYdb48IkVtDTMweWslpDKUmIfH1cy0osqMC97GR8EXX
+vhK7sig2hhHtj+NFGA7majfEFmTd0mafZBlEFodqvkwV1q7TTMrDWgkO2lcc2DEM
+jZ9on9xVszRhNCGIwuFJLhWBKfNZ59X7LUxEfkelpce0Kr5eFmxwN4n3AiEApK7p
+u7TqHqiIoGDmAyUm71gx3V5T3mNaih8Y/9h7dMsCggEAJNtfC6LqpU84UMz+nsxS
+ch/ylDx1lyh3rOGZ9Wn+2tIhahI+hqDwmPeHvymzDHh2QjuXgzeZmo1753CBCtYd
+U0GnumSEEUUCiTBbSsX6Zy0VI4w/Qy3WV5IoXXkF9YsbkC8JhPq9jHLa5Qt559TF
++347OFso5ae+XkkZ8C112UyKnYzvniqlbj0Cb4E7FadCzSggC9c2drYE12MxQEEb
+ddAVNty5wpjh3Qd2y8kKPDSn4OCrSIXAL8WDXJk507RL5moqKnwis/3iPUXiU7s8
+QmJP4B8Mn4vDM1O0rORCmz9KXz0f5M0lw39jdA/AG0fNNz86KCFTPdXz/Iz1Thph
+TQOCAQUAAoIBAEvFO/T+HGsdvBJofJEKoixMqKPPSyLA/g4gbhKXkhm+7ctvXT9n
+kSAXHuAFR0Ow/z8JJvG8Z4efmIg6g9d9+OJWWN9muczF5jJzdXv5T7Ntaf8+1zv+
+YIA88PoexEBzyABfOyrzxYjteFYtZvSMxvzZruBZZLPuCAV5bF8YCw22I7bkLjoZ
+lPlbSMYkG623vsFTIc82gzTLf8F6+bcAMFmz6icpz5aHZ3RJRE8+nTSy9IFutbhz
+fwhbGjEyzGp37Uon4eQyaYJWi8kP9vrho3uNff5DljnsWfMrERCiAa4VoXj6JcPE
+gIsoMGwlIYEm67lqST6UDjrSOWE4dpSCtLw=
 -----END PUBLIC KEY-----
diff --git a/test/fixtures/test_rsa_privkey_encrypted.pem b/test/fixtures/test_rsa_privkey_encrypted.pem
index 08e76171942381..fce1573d573337 100644
--- a/test/fixtures/test_rsa_privkey_encrypted.pem
+++ b/test/fixtures/test_rsa_privkey_encrypted.pem
@@ -1,18 +1,17 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,9D916E00476DFF9E70FA4BA9E3A6CB0E
-
-oj0VC35ShSEqlfJ0rLGgkqJCyIK+mXSsa/X/xAur+lI/RVOVTWd7oQQGTdI/0rLX
-PdQR02Na3X9Rptezh6J04PfMGeFysxdT6RpC+rkHRPVbN0F4TqxSNNXzkwK70+EF
-dSuDMyVKv9YN4wWDf0g6VKe4ShAH/sqICQBrVyzWyYLvH/hwZmZZ1QEab6ylIKtb
-EJunwu9BxVVA04bbuATKkKjJOqDn0fG8hb4bYbyD02dJwgLePzzn36F31kcBCEHI
-tESlD3RsS+EtfpfgPkplXNOhqYzkD9auDb7Zy+ZwL20fjnJb75OSGu8gOg3KTljt
-mApZOg0nJ5Jk9ATAdyzyVSFOM1Hhcw12ws06Dq9KRnXgO6bbuadLTFRDdvSYDFvD
-ijUb+97UolQfYIXQMqXli3EIvHr7CTWe/3mpoDgK1mtr0+923Bm97XgE7KSr0L46
-n5QpNjCZf1vbXldNmW+TRifiJMgtVdS7x0N4vqDPNEe+FelVv3U4Pz3HIOtFuWLr
-ZCxlgVxJY4IsyYlV0ItQjIv8fJiAyemZdO2lA9K6h0eEF+9Apr3i79JGWUi74p5D
-Ooak4le0Va9O34f6FxCGn/a54A6bhKu24Ub/0gr/e4WRa7693euEdgIAZXhtMu2Z
-taU5SKjjXPzjmRCM2kINHTCENlaU4oFzTmj3TYY/jdKyNP1bHa07NhlomladkIHK
-GD6HaYkcbuwvh8hOPsopSwuS+NqjnGPq9Vv4ecBC+9veDEmpIE1iR6FK9Hjrre88
-kLoMQNmA+vuc8jG4/FIHM3SauQiR1ZJ6+zkz97kcmOf+X7LRaS4j6lfFR6qHiJ6y
------END RSA PRIVATE KEY-----
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIICojAcBgoqhkiG9w0BDAEDMA4ECEMCOq/cAz8QAgIIAASCAoDT/S5XcBm7u/2i
+Ar4vLx5L+heu9f4iRRStWO/yaOvxZRmrqNJXI15F74mtfrXga+LKyd8YAYD8XR4e
+na6SbOZmBFHBZOWBDmDiupMoq+mOgTe84iOgo8LHYf040PzZnL/ouvepQy5LU1A5
+bv9T1d1BVpQ2IfQ9QNu8rUZFxlD1VzFCB9mvwUgcAfaTSfxyamr7KPlKaIhwPK11
+c1w0xoC+N1mp3KrfK/jwWk3JYFVq35W/7PUsC25qyLWUgJLs9h/eGSzo/5kZ4fLK
+bzBox9DzhaoBiKnfPNVKlwP+jL19vVb+0USLh9vTQQ1o4oral1fA+04bJjeOkFTf
+VkxVpa7GUZzgjOPIWEeqHDFZ7QZDYKb2e4kWpx9CPWnUlRLcNE88GPx00LnsCkQH
+yHBAtA3VCRqE2Yn2ROJmfgjjKQorglxIS6dxc+J9gZb0/M4Ad4Hn7N/23UB3CjYD
+qeILsbOOTudQgIOoXOVMgRbhRD3HsU27OSuhvSd+CjpRG9BFuUcBmjZ06TOAZt8q
+IZlVwIEaJBeBAYtyfEsaEN76B0DhzvF5fGWSXtlhR3uvftsWQ0J192VvDDJ+DIvX
+SON62RfCzKD7FidmUbMVTgCwK2WJ0XiEHSgl7pLeSbAiEd3GAKrdH99FOOqcmqjr
+0dLnbCCs3GuXTfoCZGDoNfvoqJ0HdF6zmIOU0mmUn4ia6R/LbbOYDM6DS+rkQRTA
+Dqh/ilbp2WU9+OChQIQUOQPLcA7prt/Tnkm3X5TFVVbx7WQRfJhu5l7qElrF8W81
+iiBQrvtiJrBEDst1GmoKBMkOknj+QXK/NzhDFhcHWG5Kg0HQd3I6c1wdg64xBO3U
+lyI/PHdl
+-----END ENCRYPTED PRIVATE KEY-----

From 25c3807051287032b5dde26adcc754f087c42cc3 Mon Sep 17 00:00:00 2001
From: Bryan English <bryan@bryanenglish.com>
Date: Thu, 12 Nov 2015 23:21:22 -0800
Subject: [PATCH 184/323] doc: clarify duplicate header handling

This commit documents how duplicate HTTP headers are handled.

PR-URL: https://github.com/nodejs/node/pull/3810
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
---
 doc/api/http.markdown | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/api/http.markdown b/doc/api/http.markdown
index 2e4775398c68dc..0714ebd461f101 100644
--- a/doc/api/http.markdown
+++ b/doc/api/http.markdown
@@ -816,6 +816,16 @@ Example:
     //   accept: '*/*' }
     console.log(request.headers);
 
+Duplicates in raw headers are handled in the following ways, depending on the
+header name:
+
+* Duplicates of `age`, `authorization`, `content-length`, `content-type`,
+`etag`, `expires`, `from`, `host`, `if-modified-since`, `if-unmodified-since`,
+`last-modified`, `location`, `max-forwards`, `proxy-authorization`, `referer`,
+`retry-after`, or `user-agent` are discarded.
+* `set-cookie` is always an array. Duplicates are added to the array.
+* For all other headers, the values are joined together with ', '.
+
 ### message.httpVersion
 
 In case of server request, the HTTP version sent by the client. In the case of

From 5d1faa28cb2aee95a8557f25aa33fa1c90a4c265 Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Fri, 13 Nov 2015 10:01:34 -0500
Subject: [PATCH 185/323] doc: reword message.headers to indicate they are not
 read-only

message.headers states that the headers are read-only, when in fact they
are not. This change rewords the docs to a more appropriate description,
while not promoting this kind of behavior.

Fixes: #3146
PR-URL: https://github.com/nodejs/node/pull/3814
Reviewed-By: Roman Klauke <romaaan.git@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/http.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/http.markdown b/doc/api/http.markdown
index 0714ebd461f101..f36fcf77146174 100644
--- a/doc/api/http.markdown
+++ b/doc/api/http.markdown
@@ -806,7 +806,7 @@ Just like `'end'`, this event occurs only once per response.
 
 The request/response headers object.
 
-Read only map of header names and values. Header names are lower-cased.
+Key-value pairs of header names and values. Header names are lower-cased.
 Example:
 
     // Prints something like:

From 45ff31cf945fca35e5b63a181ed251f3989da9d9 Mon Sep 17 00:00:00 2001
From: Manuel B <baslr@users.noreply.github.com>
Date: Wed, 28 Oct 2015 01:39:23 +0100
Subject: [PATCH 186/323] doc: added what buf.copy returns

as of https://github.com/nodejs/node/blob/v5.x/src/node_buffer.cc#L555

buf.copy returns the number of bytes copied.

PR-URL: https://github.com/nodejs/node/pull/3555
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/buffer.markdown | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/api/buffer.markdown b/doc/api/buffer.markdown
index a401d5a7d46b0e..f18da5c192f01f 100644
--- a/doc/api/buffer.markdown
+++ b/doc/api/buffer.markdown
@@ -232,6 +232,8 @@ if the target memory region overlaps with the source. If `undefined` the
 `targetStart` and `sourceStart` parameters default to `0` while `sourceEnd`
 defaults to `buffer.length`.
 
+Returns the number of bytes copied.
+
 Example: build two Buffers, then copy `buf1` from byte 16 through byte 19
 into `buf2`, starting at the 8th byte in `buf2`.
 

From d137f0fd28b4bf8fdd919929331aec108278a252 Mon Sep 17 00:00:00 2001
From: Roman Klauke <romaaan.git@gmail.com>
Date: Thu, 5 Nov 2015 20:08:34 +0100
Subject: [PATCH 187/323] doc: add warning about Windows process groups

This commit adds a warning for Windows platforms. `process.kill` wont
kill a process group on Windows and instead it throws an error.

Refs: https://github.com/nodejs/node/issues/3617
PR-URL: https://github.com/nodejs/node/pull/3681
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/process.markdown | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/api/process.markdown b/doc/api/process.markdown
index 55226da71c724a..24493f88803ade 100644
--- a/doc/api/process.markdown
+++ b/doc/api/process.markdown
@@ -548,7 +548,8 @@ string describing the signal to send.  Signal names are strings like
 See [Signal Events](#process_signal_events) and kill(2) for more information.
 
 Will throw an error if target does not exist, and as a special case, a signal
-of `0` can be used to test for the existence of a process.
+of `0` can be used to test for the existence of a process. Windows platforms
+will throw an error if the `pid` is used to kill a process group.
 
 Note that even though the name of this function is `process.kill`, it is really
 just a signal sender, like the `kill` system call.  The signal sent may do

From 132297d3f6a036b1d524bc4d735e955882521f0c Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Fri, 30 Oct 2015 06:59:21 -0400
Subject: [PATCH 188/323] doc: Updated streams simplified constructor API

The examples for implementing the simplified constructor API
was missing some details on its correct usages.

PR-URL: https://github.com/nodejs/node/pull/3602
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Chris Dickinson <chris@neversaw.us>
---
 doc/api/stream.markdown | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/doc/api/stream.markdown b/doc/api/stream.markdown
index c4d3f79ce1d88d..90289b7cf7400c 100644
--- a/doc/api/stream.markdown
+++ b/doc/api/stream.markdown
@@ -1368,9 +1368,16 @@ Examples:
 var duplex = new stream.Duplex({
   read: function(n) {
     // sets this._read under the hood
+
+    // push data onto the read queue, passing null
+    // will signal the end of the stream (EOF)
+    this.push(chunk);
   },
   write: function(chunk, encoding, next) {
     // sets this._write under the hood
+
+    // An optional error can be passed as the first argument
+    next()
   }
 });
 
@@ -1379,9 +1386,16 @@ var duplex = new stream.Duplex({
 var duplex = new stream.Duplex({
   read: function(n) {
     // sets this._read under the hood
+
+    // push data onto the read queue, passing null
+    // will signal the end of the stream (EOF)
+    this.push(chunk);
   },
   writev: function(chunks, next) {
     // sets this._writev under the hood
+
+    // An optional error can be passed as the first argument
+    next()
   }
 });
 ```
@@ -1391,6 +1405,10 @@ var duplex = new stream.Duplex({
 var readable = new stream.Readable({
   read: function(n) {
     // sets this._read under the hood
+
+    // push data onto the read queue, passing null
+    // will signal the end of the stream (EOF)
+    this.push(chunk);
   }
 });
 ```
@@ -1400,9 +1418,20 @@ var readable = new stream.Readable({
 var transform = new stream.Transform({
   transform: function(chunk, encoding, next) {
     // sets this._transform under the hood
+
+    // generate output as many times as needed
+    // this.push(chunk);
+
+    // call when the current chunk is consumed
+    next();
   },
   flush: function(done) {
     // sets this._flush under the hood
+
+    // generate output as many times as needed
+    // this.push(chunk);
+
+    done();
   }
 });
 ```
@@ -1412,6 +1441,9 @@ var transform = new stream.Transform({
 var writable = new stream.Writable({
   write: function(chunk, encoding, next) {
     // sets this._write under the hood
+
+    // An optional error can be passed as the first argument
+    next()
   }
 });
 
@@ -1420,6 +1452,9 @@ var writable = new stream.Writable({
 var writable = new stream.Writable({
   writev: function(chunks, next) {
     // sets this._writev under the hood
+
+    // An optional error can be passed as the first argument
+    next()
   }
 });
 ```

From 96f53c6b0286dca5363d2b0a45cf26131152c407 Mon Sep 17 00:00:00 2001
From: Jesse McCarthy <git_commits@jessemccarthy.net>
Date: Tue, 10 Nov 2015 15:27:48 -0500
Subject: [PATCH 189/323] doc: add link to [customizing util.inspect colors].
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/3749
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/console.markdown | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/api/console.markdown b/doc/api/console.markdown
index 6fe5a400f6f159..25d02953605ebc 100644
--- a/doc/api/console.markdown
+++ b/doc/api/console.markdown
@@ -45,6 +45,7 @@ The global `console` is a special `Console` whose output is sent to
 
 [assert.ok()]: assert.html#assert_assert_value_message_assert_ok_value_message
 [util.format()]: util.html#util_util_format_format
+[customizing util.inspect colors]: util.html#util_customizing_util_inspect_colors
 
 ## console
 
@@ -86,7 +87,7 @@ object. This is useful for inspecting large complicated objects. Defaults to
 `2`. To make it recurse indefinitely pass `null`.
 
 - `colors` - if `true`, then the output will be styled with ANSI color codes.
-Defaults to `false`. Colors are customizable, see below.
+Defaults to `false`. Colors are customizable, see [customizing util.inspect colors][].
 
 ### console.error([data][, ...])
 

From 91248b109407cd82f593fd9a187308a1d8d5db12 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 13 Nov 2015 05:34:57 -0800
Subject: [PATCH 190/323] test: run pipeline flood test in parallel

PR-URL: https://github.com/nodejs/node/pull/3811
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/{sequential => parallel}/test-http-pipeline-flood.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/{sequential => parallel}/test-http-pipeline-flood.js (100%)

diff --git a/test/sequential/test-http-pipeline-flood.js b/test/parallel/test-http-pipeline-flood.js
similarity index 100%
rename from test/sequential/test-http-pipeline-flood.js
rename to test/parallel/test-http-pipeline-flood.js

From 252e8100591c46b68fd9b845ce8caa0b6c96deda Mon Sep 17 00:00:00 2001
From: Imran Iqbal <imrani@ca.ibm.com>
Date: Wed, 4 Nov 2015 17:08:07 -0500
Subject: [PATCH 191/323] test: Fix test-cluster-worker-exit.js for AIX

test fails intermittently due to the assertion that the 'disconnect'
event should come before the 'exit' event. This is caused be the
non-deteministic behaviour of pollset_poll[1] on AIX
(see deps/uv/src/unix/aix.c). This API makes no garauntee for the order
in which file descriptors are returned. On linux epoll_wait[2] is used,
which also does not make a garauntee on order of file descriptors
returned. In the failing case we recieve our file descriptor with a
callback of uv__signal_event (which causes JavaScript to receive the
exit event) before our file descriptor with uv__stream_io as its
callback (which in turn causes JavaScript receive the disconnect event).
This change simply removes the assertion that the disconnect event
happens before exit event and processes the test regardless of which
event comes first.

[1] https://www-01.ibm.com/support/knowledgecenter/ssw_aix_71/com.ibm.ai
x.basetrf1/pollset.htm
[2] http://linux.die.net/man/2/epoll_pwait

PR-URL: https://github.com/nodejs/node/pull/3666
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/parallel/test-cluster-worker-exit.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/parallel/test-cluster-worker-exit.js b/test/parallel/test-cluster-worker-exit.js
index 3607a992a33dff..eb941e194b33cd 100644
--- a/test/parallel/test-cluster-worker-exit.js
+++ b/test/parallel/test-cluster-worker-exit.js
@@ -60,8 +60,6 @@ if (cluster.isWorker) {
     results.cluster_exitCode = worker.process.exitCode;
     results.cluster_signalCode = worker.process.signalCode;
     results.cluster_emitExit += 1;
-    assert.ok(results.cluster_emitDisconnect,
-        "cluster: 'exit' event before 'disconnect' event");
   });
 
   // Check worker events and properties
@@ -69,6 +67,9 @@ if (cluster.isWorker) {
     results.worker_emitDisconnect += 1;
     results.worker_suicideMode = worker.suicide;
     results.worker_state = worker.state;
+    if (results.worker_emitExit > 0) {
+      process.nextTick(function() { finish_test(); });
+    }
   });
 
   // Check that the worker died
@@ -77,10 +78,9 @@ if (cluster.isWorker) {
     results.worker_signalCode = signalCode;
     results.worker_emitExit += 1;
     results.worker_died = !alive(worker.process.pid);
-    assert.ok(results.worker_emitDisconnect,
-        "worker: 'exit' event before 'disconnect' event");
-
-    process.nextTick(function() { finish_test(); });
+    if (results.worker_emitDisconnect > 0) {
+      process.nextTick(function() { finish_test(); });
+    }
   });
 
   var finish_test = function() {

From fd0253be4d019e3b288f015ee11d2c74b71e59b4 Mon Sep 17 00:00:00 2001
From: "evan.lucas" <evan.lucas@help.com>
Date: Thu, 12 Nov 2015 06:47:38 -0800
Subject: [PATCH 192/323] deps: backport bc2e393 from v8 upstream

Original commit message:

  [tools] Make gen-postmortem-metadata.py more reliable

  Instead of basing matches off of whitespace, walk the
  inheritance chain and include any classes that inherit
  from Object.

  R=machenbach@chromium.org,jkummerow@chromium.org
  NOTRY=true

  Review URL: https://codereview.chromium.org/1435643002

  Cr-Commit-Position: refs/heads/master@{#31964}

This adds some missing classes to postmortem info like
JSMap and JSSet.

PR-URL: https://github.com/nodejs/node/pull/3792
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 deps/v8/tools/gen-postmortem-metadata.py | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/deps/v8/tools/gen-postmortem-metadata.py b/deps/v8/tools/gen-postmortem-metadata.py
index 5c0350e34e0314..e3c9dbe07667c5 100644
--- a/deps/v8/tools/gen-postmortem-metadata.py
+++ b/deps/v8/tools/gen-postmortem-metadata.py
@@ -273,6 +273,20 @@
 }
 '''
 
+#
+# Get the base class
+#
+def get_base_class(klass):
+        if (klass == 'Object'):
+                return klass;
+
+        if (not (klass in klasses)):
+                return None;
+
+        k = klasses[klass];
+
+        return get_base_class(k['parent']);
+
 #
 # Loads class hierarchy and type information from "objects.h".
 #
@@ -311,12 +325,14 @@ def load_objects():
                         typestr += line;
                         continue;
 
-                match = re.match('class (\w[^\s:]*)(: public (\w[^\s{]*))?\s*{',
+                match = re.match('class (\w[^:]*)(: public (\w[^{]*))?\s*{\s*',
                     line);
 
                 if (match):
-                        klass = match.group(1);
+                        klass = match.group(1).rstrip().lstrip();
                         pklass = match.group(3);
+                        if (pklass):
+                                pklass = pklass.rstrip().lstrip();
                         klasses[klass] = { 'parent': pklass };
 
         #
@@ -567,6 +583,9 @@ def emit_config():
         keys.sort();
         for klassname in keys:
                 pklass = klasses[klassname]['parent'];
+                bklass = get_base_class(klassname);
+                if (bklass != 'Object'):
+                        continue;
                 if (pklass == None):
                         continue;
 

From 7a290abea6c78d16d0b2f1b3756aa527898d4de8 Mon Sep 17 00:00:00 2001
From: Stefan Budeanu <stefan@budeanu.com>
Date: Tue, 10 Nov 2015 11:50:32 -0500
Subject: [PATCH 193/323] crypto: DSA parameter validation in FIPS mode

FIPS 180-4 requires specific (L,N) values. OpenSSL will crash if an
invalid combination is used, so we must check the input sanity first.

PR-URL: https://github.com/nodejs/node/pull/3756
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 src/node_crypto.cc | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index f0569eb354ac5e..f699ef8222ec8d 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -3781,6 +3781,29 @@ SignBase::Error Sign::SignFinal(const char* key_pem,
   if (pkey == nullptr || 0 != ERR_peek_error())
     goto exit;
 
+#ifdef NODE_FIPS_MODE
+  /* Validate DSA2 parameters from FIPS 186-4 */
+  if (EVP_PKEY_DSA == pkey->type) {
+    size_t L = BN_num_bits(pkey->pkey.dsa->p);
+    size_t N = BN_num_bits(pkey->pkey.dsa->q);
+    bool result = false;
+
+    if (L == 1024 && N == 160)
+      result = true;
+    else if (L == 2048 && N == 224)
+      result = true;
+    else if (L == 2048 && N == 256)
+      result = true;
+    else if (L == 3072 && N == 256)
+      result = true;
+
+    if (!result) {
+      fatal = true;
+      goto exit;
+    }
+  }
+#endif  // NODE_FIPS_MODE
+
   if (EVP_SignFinal(&mdctx_, *sig, sig_len, pkey))
     fatal = false;
 

From 828b786e4834fd2cea80135e5bc8c0b50aacd5ab Mon Sep 17 00:00:00 2001
From: Stefan Budeanu <stefan@budeanu.com>
Date: Thu, 12 Nov 2015 20:49:21 -0500
Subject: [PATCH 194/323] test: add test for invalid DSA key size

Check that invalid DSA key sizes are rejected in FIPS mode.

PR-URL: https://github.com/nodejs/node/pull/3756
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/fixtures/keys/Makefile                | 11 +++++++++-
 test/fixtures/keys/dsa1025.pem             |  9 ++++++++
 test/fixtures/keys/dsa_private_1025.pem    | 12 +++++++++++
 test/fixtures/keys/dsa_public_1025.pem     | 12 +++++++++++
 test/parallel/test-dsa-fips-invalid-key.js | 24 ++++++++++++++++++++++
 5 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/keys/dsa1025.pem
 create mode 100644 test/fixtures/keys/dsa_private_1025.pem
 create mode 100644 test/fixtures/keys/dsa_public_1025.pem
 create mode 100644 test/parallel/test-dsa-fips-invalid-key.js

diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile
index 5cd3480434425a..143986274a6b93 100644
--- a/test/fixtures/keys/Makefile
+++ b/test/fixtures/keys/Makefile
@@ -1,4 +1,4 @@
-all: agent1-cert.pem agent2-cert.pem agent3-cert.pem agent4-cert.pem agent5-cert.pem ca2-crl.pem ec-cert.pem dh512.pem dh1024.pem dh2048.pem rsa_private_1024.pem rsa_private_2048.pem rsa_private_4096.pem rsa_public_1024.pem rsa_public_2048.pem rsa_public_4096.pem
+all: agent1-cert.pem agent2-cert.pem agent3-cert.pem agent4-cert.pem agent5-cert.pem ca2-crl.pem ec-cert.pem dh512.pem dh1024.pem dh2048.pem dsa1025.pem dsa_private_1025.pem dsa_public_1025.pem rsa_private_1024.pem rsa_private_2048.pem rsa_private_4096.pem rsa_public_1024.pem rsa_public_2048.pem rsa_public_4096.pem
 
 
 #
@@ -267,6 +267,15 @@ dh1024.pem:
 dh2048.pem:
 	openssl dhparam -out dh2048.pem 2048
 
+dsa1025.pem:
+	openssl dsaparam -out dsa1025.pem 1025
+
+dsa_private_1025.pem:
+	openssl gendsa -out dsa_private_1025.pem dsa1025.pem
+
+dsa_public_1025.pem:
+	openssl dsa -in dsa_private_1025.pem -pubout -out dsa_public_1025.pem
+
 rsa_private_1024.pem:
 	openssl genrsa -out rsa_private_1024.pem 1024
 
diff --git a/test/fixtures/keys/dsa1025.pem b/test/fixtures/keys/dsa1025.pem
new file mode 100644
index 00000000000000..1b59f5e351db15
--- /dev/null
+++ b/test/fixtures/keys/dsa1025.pem
@@ -0,0 +1,9 @@
+-----BEGIN DSA PARAMETERS-----
+MIIBLgKBiQCtjGXOH3Rq+lM09nwe6nbShOduCyfjgZhgMZ2WfY6PYLW3gNnhNYT7
+88rZbECcyKlyzRApFgs9KMfiqWfWIhQn+FmolmeUNdRXpmkGyJAqY63GobI8S1Jn
+xYbwdH7PsV1IwM56ylrnpdUDhSH7+Y95rgEIUXX9OHS503gzFFEHCmQl1/RS7Qxp
+AhUApmbNUvRisdjnyjhDK6RO3pafN90CgYhQLHJ+qq+nxLX/lqQL/tCFY3P6DlYc
+3ezT3Ic+3GhEMMXMBMJ+WRmRkCW5vh1grQyLVa/MLWvYgNkoUAO8eGElcloUero8
+m5Tp3bFArEqb8rJXWYM1sAlnl/Y0uFpw1AyHLuZC26z+SSeDbV9REtz14EknkFXk
+su4QN55ZQKoiBv2cFDMsIf9b
+-----END DSA PARAMETERS-----
diff --git a/test/fixtures/keys/dsa_private_1025.pem b/test/fixtures/keys/dsa_private_1025.pem
new file mode 100644
index 00000000000000..11f5e807ca8e17
--- /dev/null
+++ b/test/fixtures/keys/dsa_private_1025.pem
@@ -0,0 +1,12 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIB0QIBAAKBiQCtjGXOH3Rq+lM09nwe6nbShOduCyfjgZhgMZ2WfY6PYLW3gNnh
+NYT788rZbECcyKlyzRApFgs9KMfiqWfWIhQn+FmolmeUNdRXpmkGyJAqY63GobI8
+S1JnxYbwdH7PsV1IwM56ylrnpdUDhSH7+Y95rgEIUXX9OHS503gzFFEHCmQl1/RS
+7QxpAhUApmbNUvRisdjnyjhDK6RO3pafN90CgYhQLHJ+qq+nxLX/lqQL/tCFY3P6
+DlYc3ezT3Ic+3GhEMMXMBMJ+WRmRkCW5vh1grQyLVa/MLWvYgNkoUAO8eGElcloU
+ero8m5Tp3bFArEqb8rJXWYM1sAlnl/Y0uFpw1AyHLuZC26z+SSeDbV9REtz14Ekn
+kFXksu4QN55ZQKoiBv2cFDMsIf9bAoGHFPpl8uRj7sNjsnIPPI9CuqlIoZXFNXeM
+X9Yu7T3s5mn5Q2ATcgnryDXwqpqle630wy1LZjjmtyE84oVJd4W6YTlzHNwIv2ql
+ymMzWBE5+BrRXtqIndvkaWJRSUwtZ7XPPeeCzqR5uXRAsy54azoFDoisuOO5dVOm
+VZERfp4Up+Duvws5+Gq2AhQlmsEI+CInYqsDR2ha+UcwXmGJSg==
+-----END DSA PRIVATE KEY-----
diff --git a/test/fixtures/keys/dsa_public_1025.pem b/test/fixtures/keys/dsa_public_1025.pem
new file mode 100644
index 00000000000000..e55e3d8871b211
--- /dev/null
+++ b/test/fixtures/keys/dsa_public_1025.pem
@@ -0,0 +1,12 @@
+-----BEGIN PUBLIC KEY-----
+MIIBzTCCATsGByqGSM44BAEwggEuAoGJAK2MZc4fdGr6UzT2fB7qdtKE524LJ+OB
+mGAxnZZ9jo9gtbeA2eE1hPvzytlsQJzIqXLNECkWCz0ox+KpZ9YiFCf4WaiWZ5Q1
+1FemaQbIkCpjrcahsjxLUmfFhvB0fs+xXUjAznrKWuel1QOFIfv5j3muAQhRdf04
+dLnTeDMUUQcKZCXX9FLtDGkCFQCmZs1S9GKx2OfKOEMrpE7elp833QKBiFAscn6q
+r6fEtf+WpAv+0IVjc/oOVhzd7NPchz7caEQwxcwEwn5ZGZGQJbm+HWCtDItVr8wt
+a9iA2ShQA7x4YSVyWhR6ujyblOndsUCsSpvysldZgzWwCWeX9jS4WnDUDIcu5kLb
+rP5JJ4NtX1ES3PXgSSeQVeSy7hA3nllAqiIG/ZwUMywh/1sDgYsAAoGHFPpl8uRj
+7sNjsnIPPI9CuqlIoZXFNXeMX9Yu7T3s5mn5Q2ATcgnryDXwqpqle630wy1LZjjm
+tyE84oVJd4W6YTlzHNwIv2qlymMzWBE5+BrRXtqIndvkaWJRSUwtZ7XPPeeCzqR5
+uXRAsy54azoFDoisuOO5dVOmVZERfp4Up+Duvws5+Gq2
+-----END PUBLIC KEY-----
diff --git a/test/parallel/test-dsa-fips-invalid-key.js b/test/parallel/test-dsa-fips-invalid-key.js
new file mode 100644
index 00000000000000..0b5773411ee592
--- /dev/null
+++ b/test/parallel/test-dsa-fips-invalid-key.js
@@ -0,0 +1,24 @@
+'use strict';
+var common = require('../common');
+var assert = require('assert');
+
+if (!common.hasFipsCrypto) {
+  console.log('1..0 # Skipped: node compiled without FIPS OpenSSL.');
+  return;
+}
+
+var crypto = require('crypto');
+var fs = require('fs');
+
+var input = 'hello';
+
+var dsapub = fs.readFileSync(common.fixturesDir +
+                             '/keys/dsa_public_1025.pem');
+var dsapri = fs.readFileSync(common.fixturesDir +
+                             '/keys/dsa_private_1025.pem');
+var sign = crypto.createSign('DSS1');
+sign.update(input);
+
+assert.throws(function() {
+  sign.sign(dsapri);
+}, /PEM_read_bio_PrivateKey failed/);

From de707f08765265926a63ca2acc71eb7c27724f8c Mon Sep 17 00:00:00 2001
From: Stefan Budeanu <stefan@budeanu.com>
Date: Thu, 12 Nov 2015 17:28:04 -0500
Subject: [PATCH 195/323] test: add hasFipsCrypto to test/common.js

Utility function for tests to check if OpenSSL is using
a FIPS verified cryptographic provider.

PR-URL: https://github.com/nodejs/node/pull/3756
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/common.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/common.js b/test/common.js
index eb802cc8856377..a017275a6a627f 100644
--- a/test/common.js
+++ b/test/common.js
@@ -137,9 +137,17 @@ Object.defineProperty(exports, 'opensslCli', {get: function() {
   return opensslCli;
 }, enumerable: true });
 
-Object.defineProperty(exports, 'hasCrypto', {get: function() {
-  return process.versions.openssl ? true : false;
-}});
+Object.defineProperty(exports, 'hasCrypto', {
+  get: function() {
+    return process.versions.openssl ? true : false;
+  }
+});
+
+Object.defineProperty(exports, 'hasFipsCrypto', {
+  get: function() {
+    return process.config.variables.openssl_fips ? true : false;
+  }
+});
 
 if (exports.isWindows) {
   exports.PIPE = '\\\\.\\pipe\\libuv-test';

From d70deabf90cf221083e275ec9647e3c8eeb661b6 Mon Sep 17 00:00:00 2001
From: Myles Borins <mborins@us.ibm.com>
Date: Mon, 26 Oct 2015 14:39:05 -0700
Subject: [PATCH 196/323] zlib: pass kind to recursive calls to flush

Bug spotted by @bnoordhuis while doing code review on #3534

Refs: https://github.com/nodejs/node/pull/3534#discussion_r43047477
PR-URL: https://github.com/nodejs/node/pull/3534
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/zlib.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/zlib.js b/lib/zlib.js
index a10d9118d6194e..1151b2cb88c07b 100644
--- a/lib/zlib.js
+++ b/lib/zlib.js
@@ -446,7 +446,7 @@ Zlib.prototype.flush = function(kind, callback) {
   } else if (ws.needDrain) {
     var self = this;
     this.once('drain', function() {
-      self.flush(callback);
+      self.flush(kind, callback);
     });
   } else {
     this._flushFlag = kind;

From 33ffc62670d1b33bdf2f66b7d95f8fb8711cafca Mon Sep 17 00:00:00 2001
From: Craig Cavalier <craigcav@gmail.com>
Date: Mon, 26 Oct 2015 14:40:56 -0700
Subject: [PATCH 197/323] zlib: only apply drain listener if given callback

When stream.flush() is called without a callback, an empty listener is
being added. Since flush may be called multiple times to push SSE's
down to the client, multiple noop listeners are being added. This in
turn causes the memory leak detected message.

PR-URL: https://github.com/nodejs/node/pull/3534
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/zlib.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/zlib.js b/lib/zlib.js
index 1151b2cb88c07b..82b08018e7403e 100644
--- a/lib/zlib.js
+++ b/lib/zlib.js
@@ -444,10 +444,9 @@ Zlib.prototype.flush = function(kind, callback) {
     if (callback)
       this.once('end', callback);
   } else if (ws.needDrain) {
-    var self = this;
-    this.once('drain', function() {
-      self.flush(kind, callback);
-    });
+    if (callback) {
+      this.once('drain', () => this.flush(kind, callback));
+    }
   } else {
     this._flushFlag = kind;
     this.write(new Buffer(0), '', callback);

From 2ec5e17d1688539c280dd0ef21afcab664f40900 Mon Sep 17 00:00:00 2001
From: Myles Borins <mborins@us.ibm.com>
Date: Wed, 11 Nov 2015 14:49:35 -0800
Subject: [PATCH 198/323] test: add test-zlib-flush-drain

This test assures that if flush is called while the zlib object needs
to be drained that it will defer the callback until after the drain.

PR-URL: https://github.com/nodejs/node/pull/3534
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/parallel/test-zlib-flush-drain.js | 49 ++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 test/parallel/test-zlib-flush-drain.js

diff --git a/test/parallel/test-zlib-flush-drain.js b/test/parallel/test-zlib-flush-drain.js
new file mode 100644
index 00000000000000..93966cd85d269a
--- /dev/null
+++ b/test/parallel/test-zlib-flush-drain.js
@@ -0,0 +1,49 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const zlib = require('zlib');
+const path = require('path');
+
+const bigData = new Buffer(10240).fill('x');
+
+const opts = {
+  level: 0,
+  highWaterMark: 16
+};
+
+const deflater = zlib.createDeflate(opts);
+
+// shim deflater.flush so we can count times executed
+var flushCount = 0;
+var drainCount = 0;
+
+const flush = deflater.flush;
+deflater.flush = function(kind, callback) {
+  flushCount++;
+  flush.call(this, kind, callback);
+};
+
+deflater.write(bigData);
+
+const ws = deflater._writableState;
+const beforeFlush = ws.needDrain;
+var afterFlush = ws.needDrain;
+
+deflater.flush(function(err) {
+  afterFlush = ws.needDrain;
+});
+
+deflater.on('drain', function() {
+  drainCount++;;
+});
+
+process.once('exit', function() {
+  assert.equal(beforeFlush, true,
+    'before calling flush the writable stream should need to drain');
+  assert.equal(afterFlush, false,
+    'after calling flush the writable stream should not need to drain');
+  assert.equal(drainCount, 1,
+    'the deflater should have emitted a single drain event');
+  assert.equal(flushCount, 2,
+    'flush should be called twice');
+});

From 413ca53107204e73c34928427820ab8da732092c Mon Sep 17 00:00:00 2001
From: Stefan Budeanu <stefan@budeanu.com>
Date: Tue, 10 Nov 2015 16:33:25 -0500
Subject: [PATCH 199/323] test: increase crypto strength for FIPS standard

Use stronger crypto (larger keys, etc.) for arbitrary tests so
they will pass in both FIPS and non-FIPS mode without altering
the original intent of the test cases.

PR-URL: https://github.com/nodejs/node/pull/3758
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/parallel/test-crypto-binary-default.js |  2 +-
 test/parallel/test-crypto-dh-odd-key.js     | 19 +++--
 test/parallel/test-crypto-dh.js             | 69 ++++++++++--------
 test/parallel/test-crypto-ecb.js            |  4 +
 test/parallel/test-crypto.js                |  2 +-
 test/parallel/test-dh-padding.js            | 81 +++++++++++++++++++--
 test/pummel/test-dh-regr.js                 |  2 +-
 7 files changed, 131 insertions(+), 48 deletions(-)

diff --git a/test/parallel/test-crypto-binary-default.js b/test/parallel/test-crypto-binary-default.js
index bebc91dc8ed0b1..8695632727fa80 100644
--- a/test/parallel/test-crypto-binary-default.js
+++ b/test/parallel/test-crypto-binary-default.js
@@ -513,7 +513,7 @@ assert.throws(function() {
 
 // Test Diffie-Hellman with two parties sharing a secret,
 // using various encodings as we go along
-var dh1 = crypto.createDiffieHellman(256);
+var dh1 = crypto.createDiffieHellman(1024);
 var p1 = dh1.getPrime('buffer');
 var dh2 = crypto.createDiffieHellman(p1, 'base64');
 var key1 = dh1.generateKeys();
diff --git a/test/parallel/test-crypto-dh-odd-key.js b/test/parallel/test-crypto-dh-odd-key.js
index abb4860b238a78..503ba2fe089e3e 100644
--- a/test/parallel/test-crypto-dh-odd-key.js
+++ b/test/parallel/test-crypto-dh-odd-key.js
@@ -8,9 +8,18 @@ if (!common.hasCrypto) {
 }
 var crypto = require('crypto');
 
-var odd = new Buffer(39);
-odd.fill('A');
+function test() {
+  var odd = new Buffer(39);
+  odd.fill('A');
 
-var c = crypto.createDiffieHellman(32);
-c.setPrivateKey(odd);
-c.generateKeys();
+  var c = crypto.createDiffieHellman(32);
+  c.setPrivateKey(odd);
+  c.generateKeys();
+}
+
+// FIPS requires a length of at least 1024
+if (!common.hasFipsCrypto) {
+  assert.doesNotThrow(function() { test(); });
+} else {
+  assert.throws(function() { test(); }, /key size too small/);
+}
diff --git a/test/parallel/test-crypto-dh.js b/test/parallel/test-crypto-dh.js
index dfb912c0a4c9f1..d93c53e3997dae 100644
--- a/test/parallel/test-crypto-dh.js
+++ b/test/parallel/test-crypto-dh.js
@@ -11,7 +11,7 @@ var crypto = require('crypto');
 
 // Test Diffie-Hellman with two parties sharing a secret,
 // using various encodings as we go along
-var dh1 = crypto.createDiffieHellman(256);
+var dh1 = crypto.createDiffieHellman(1024);
 var p1 = dh1.getPrime('buffer');
 var dh2 = crypto.createDiffieHellman(p1, 'buffer');
 var key1 = dh1.generateKeys();
@@ -82,9 +82,11 @@ assert.equal(aSecret, bSecret);
 assert.equal(alice.verifyError, constants.DH_NOT_SUITABLE_GENERATOR);
 assert.equal(bob.verifyError, constants.DH_NOT_SUITABLE_GENERATOR);
 
-// Ensure specific generator (buffer) works as expected.
-var modp1 = crypto.createDiffieHellmanGroup('modp1');
-var modp1buf = new Buffer([
+/* Ensure specific generator (buffer) works as expected.
+ * The values below (modp2/modp2buf) are for a 1024 bits long prime from
+ * RFC 2412 E.2, see https://tools.ietf.org/html/rfc2412. */
+var modp2 = crypto.createDiffieHellmanGroup('modp2');
+var modp2buf = new Buffer([
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc9, 0x0f,
   0xda, 0xa2, 0x21, 0x68, 0xc2, 0x34, 0xc4, 0xc6, 0x62, 0x8b,
   0x80, 0xdc, 0x1c, 0xd1, 0x29, 0x02, 0x4e, 0x08, 0x8a, 0x67,
@@ -93,47 +95,50 @@ var modp1buf = new Buffer([
   0x19, 0xb3, 0xcd, 0x3a, 0x43, 0x1b, 0x30, 0x2b, 0x0a, 0x6d,
   0xf2, 0x5f, 0x14, 0x37, 0x4f, 0xe1, 0x35, 0x6d, 0x6d, 0x51,
   0xc2, 0x45, 0xe4, 0x85, 0xb5, 0x76, 0x62, 0x5e, 0x7e, 0xc6,
-  0xf4, 0x4c, 0x42, 0xe9, 0xa6, 0x3a, 0x36, 0x20, 0xff, 0xff,
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+  0xf4, 0x4c, 0x42, 0xe9, 0xa6, 0x37, 0xed, 0x6b, 0x0b, 0xff,
+  0x5c, 0xb6, 0xf4, 0x06, 0xb7, 0xed, 0xee, 0x38, 0x6b, 0xfb,
+  0x5a, 0x89, 0x9f, 0xa5, 0xae, 0x9f, 0x24, 0x11, 0x7c, 0x4b,
+  0x1f, 0xe6, 0x49, 0x28, 0x66, 0x51, 0xec, 0xe6, 0x53, 0x81,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
 ]);
-var exmodp1 = crypto.createDiffieHellman(modp1buf, new Buffer([2]));
-modp1.generateKeys();
-exmodp1.generateKeys();
-var modp1Secret = modp1.computeSecret(exmodp1.getPublicKey()).toString('hex');
-var exmodp1Secret = exmodp1.computeSecret(modp1.getPublicKey()).toString('hex');
-assert.equal(modp1Secret, exmodp1Secret);
-assert.equal(modp1.verifyError, constants.DH_NOT_SUITABLE_GENERATOR);
-assert.equal(exmodp1.verifyError, constants.DH_NOT_SUITABLE_GENERATOR);
+var exmodp2 = crypto.createDiffieHellman(modp2buf, new Buffer([2]));
+modp2.generateKeys();
+exmodp2.generateKeys();
+var modp2Secret = modp2.computeSecret(exmodp2.getPublicKey()).toString('hex');
+var exmodp2Secret = exmodp2.computeSecret(modp2.getPublicKey()).toString('hex');
+assert.equal(modp2Secret, exmodp2Secret);
+assert.equal(modp2.verifyError, constants.DH_NOT_SUITABLE_GENERATOR);
+assert.equal(exmodp2.verifyError, constants.DH_NOT_SUITABLE_GENERATOR);
 
 
 // Ensure specific generator (string with encoding) works as expected.
-var exmodp1_2 = crypto.createDiffieHellman(modp1buf, '02', 'hex');
-exmodp1_2.generateKeys();
-modp1Secret = modp1.computeSecret(exmodp1_2.getPublicKey()).toString('hex');
-var exmodp1_2Secret = exmodp1_2.computeSecret(modp1.getPublicKey())
+var exmodp2_2 = crypto.createDiffieHellman(modp2buf, '02', 'hex');
+exmodp2_2.generateKeys();
+modp2Secret = modp2.computeSecret(exmodp2_2.getPublicKey()).toString('hex');
+var exmodp2_2Secret = exmodp2_2.computeSecret(modp2.getPublicKey())
                                .toString('hex');
-assert.equal(modp1Secret, exmodp1_2Secret);
-assert.equal(exmodp1_2.verifyError, constants.DH_NOT_SUITABLE_GENERATOR);
+assert.equal(modp2Secret, exmodp2_2Secret);
+assert.equal(exmodp2_2.verifyError, constants.DH_NOT_SUITABLE_GENERATOR);
 
 
 // Ensure specific generator (string without encoding) works as expected.
-var exmodp1_3 = crypto.createDiffieHellman(modp1buf, '\x02');
-exmodp1_3.generateKeys();
-modp1Secret = modp1.computeSecret(exmodp1_3.getPublicKey()).toString('hex');
-var exmodp1_3Secret = exmodp1_3.computeSecret(modp1.getPublicKey())
+var exmodp2_3 = crypto.createDiffieHellman(modp2buf, '\x02');
+exmodp2_3.generateKeys();
+modp2Secret = modp2.computeSecret(exmodp2_3.getPublicKey()).toString('hex');
+var exmodp2_3Secret = exmodp2_3.computeSecret(modp2.getPublicKey())
                                .toString('hex');
-assert.equal(modp1Secret, exmodp1_3Secret);
-assert.equal(exmodp1_3.verifyError, constants.DH_NOT_SUITABLE_GENERATOR);
+assert.equal(modp2Secret, exmodp2_3Secret);
+assert.equal(exmodp2_3.verifyError, constants.DH_NOT_SUITABLE_GENERATOR);
 
 
 // Ensure specific generator (numeric) works as expected.
-var exmodp1_4 = crypto.createDiffieHellman(modp1buf, 2);
-exmodp1_4.generateKeys();
-modp1Secret = modp1.computeSecret(exmodp1_4.getPublicKey()).toString('hex');
-var exmodp1_4Secret = exmodp1_4.computeSecret(modp1.getPublicKey())
+var exmodp2_4 = crypto.createDiffieHellman(modp2buf, 2);
+exmodp2_4.generateKeys();
+modp2Secret = modp2.computeSecret(exmodp2_4.getPublicKey()).toString('hex');
+var exmodp2_4Secret = exmodp2_4.computeSecret(modp2.getPublicKey())
                                .toString('hex');
-assert.equal(modp1Secret, exmodp1_4Secret);
-assert.equal(exmodp1_4.verifyError, constants.DH_NOT_SUITABLE_GENERATOR);
+assert.equal(modp2Secret, exmodp2_4Secret);
+assert.equal(exmodp2_4.verifyError, constants.DH_NOT_SUITABLE_GENERATOR);
 
 
 var p = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' +
diff --git a/test/parallel/test-crypto-ecb.js b/test/parallel/test-crypto-ecb.js
index 920b18a47f8ff1..d47ec8a8091f38 100644
--- a/test/parallel/test-crypto-ecb.js
+++ b/test/parallel/test-crypto-ecb.js
@@ -6,6 +6,10 @@ if (!common.hasCrypto) {
   console.log('1..0 # Skipped: missing crypto');
   return;
 }
+if (common.hasFipsCrypto) {
+  console.log('1..0 # Skipped: BF-ECB is not FIPS 140-2 compatible');
+  return;
+}
 var crypto = require('crypto');
 
 crypto.DEFAULT_ENCODING = 'buffer';
diff --git a/test/parallel/test-crypto.js b/test/parallel/test-crypto.js
index 57191b24ae351a..e5fe8db58c132e 100644
--- a/test/parallel/test-crypto.js
+++ b/test/parallel/test-crypto.js
@@ -122,7 +122,7 @@ assert.throws(function() {
     ''
   ].join('\n');
   crypto.createSign('RSA-SHA256').update('test').sign(priv);
-}, /RSA_sign:digest too big for rsa key/);
+}, /digest too big for rsa key/);
 
 assert.throws(function() {
   // The correct header inside `test_bad_rsa_privkey.pem` should have been
diff --git a/test/parallel/test-dh-padding.js b/test/parallel/test-dh-padding.js
index ef6ea0fd4d7cfd..cdb1fc75f94215 100644
--- a/test/parallel/test-dh-padding.js
+++ b/test/parallel/test-dh-padding.js
@@ -9,18 +9,83 @@ try {
   return;
 }
 
-var prime = 'c51f7bf8f0e1cf899243cdf408b1bc7c09c010e33ef7f3fbe5bd5feaf906113b';
-var apub = '6fe9f37037d8d017f908378c1ee04fe60e1cd3668bfc5075fac55c2f7153dd84';
-var bpub = '31d83e167fdf956c9dae6b980140577a9f8868acbfcbdc19113e58bfb9223abc';
-var apriv = '4fbfd4661f9181bbf574537b1a78adf473e8e771eef13c605e963c0f3094b697';
-var secret = '25616eed33f1af7975bbd0a8071d98a014f538b243bef90d76c08e81a0b3c500';
+/* This test verifies padding with leading zeroes for shared
+ * secrets that are strictly smaller than the modulus (prime).
+ * See:
+ *  RFC 4346: https://www.ietf.org/rfc/rfc4346.txt
+ *  https://github.com/nodejs/node-v0.x-archive/issues/7906
+ *  https://github.com/nodejs/node-v0.x-archive/issues/5239
+ *
+ * In FIPS mode OPENSSL_DH_FIPS_MIN_MODULUS_BITS = 1024, meaning we need
+ * a FIPS-friendly >= 1024 bit prime, we can use MODP 14 from RFC 3526:
+ * https://www.ietf.org/rfc/rfc3526.txt
+ *
+ * We can generate appropriate values with this code:
+ *
+ * crypto = require('crypto');
+ *
+ * for (;;) {
+ *   var a = crypto.getDiffieHellman('modp14'),
+ *   var b = crypto.getDiffieHellman('modp14');
+ *
+ *   a.generateKeys();
+ *   b.generateKeys();
+ *
+ *   var aSecret = a.computeSecret(b.getPublicKey()).toString('hex');
+ *   console.log("A public: " + a.getPublicKey().toString('hex'));
+ *   console.log("A private: " + a.getPrivateKey().toString('hex'));
+ *   console.log("B public: " + b.getPublicKey().toString('hex'));
+ *   console.log("B private: " + b.getPrivateKey().toString('hex'));
+ *   console.log("A secret: " + aSecret);
+ *   console.log('-------------------------------------------------');
+ *   if(aSecret.substring(0,2) === "00") {
+ *     console.log("found short key!");
+ *     return;
+ *   }
+ * }
+ */
 
-var p = crypto.createDiffieHellman(prime, 'hex');
+var apub =
+'5484455905d3eff34c70980e871f27f05448e66f5a6efbb97cbcba4e927196c2bd9ea272cded91\
+10a4977afa8d9b16c9139a444ed2d954a794650e5d7cb525204f385e1af81530518563822ecd0f9\
+524a958d02b3c269e79d6d69850f0968ad567a4404fbb0b19efc8bc73e267b6136b88cafb33299f\
+f7c7cace3ffab1a88c2c9ee841f88b4c3679b4efc465f5c93cca11d487be57373e4c5926f634c4e\
+efee6721d01db91cd66321615b2522f96368dbc818875d422140d0edf30bdb97d9721feddcb9ff6\
+453741a4f687ee46fc54bf1198801f1210ac789879a5ee123f79e2d2ce1209df2445d32166bc9e4\
+8f89e944ec9c3b2e16c8066cd8eebd4e33eb941';
+var bpub =
+'3fca64510e36bc7da8a3a901c7b74c2eabfa25deaf7cbe1d0c50235866136ad677317279e1fb0\
+06e9c0a07f63e14a3363c8e016fbbde2b2c7e79fed1cc3e08e95f7459f547a8cd0523ee9dc744d\
+e5a956d92b937db4448917e1f6829437f05e408ee7aea70c0362b37370c7c75d14449d8b2d2133\
+04ac972302d349975e2265ca7103cfebd019d9e91234d638611abd049014f7abf706c1c5da6c88\
+788a1fdc6cdf17f5fffaf024ce8711a2ebde0b52e9f1cb56224483826d6e5ac6ecfaae07b75d20\
+6e8ac97f5be1a5b68f20382f2a7dac189cf169325c4cf845b26a0cd616c31fec905c5d9035e5f7\
+8e9880c812374ac0f3ca3d365f06e4be526b5affd4b79';
+var apriv =
+'62411e34704637d99c6c958a7db32ac22fcafafbe1c33d2cfdb76e12ded41f38fc16b792b9041\
+2e4c82755a3815ba52f780f0ee296ad46e348fc4d1dcd6b64f4eea1b231b2b7d95c5b1c2e26d34\
+83520558b9860a6eb668f01422a54e6604aa7702b4e67511397ef3ecb912bff1a83899c5a5bfb2\
+0ee29249a91b8a698e62486f7009a0e9eaebda69d77ecfa2ca6ba2db6c8aa81759c8c90c675979\
+08c3b3e6fc60668f7be81cce6784482af228dd7f489005253a165e292802cfd0399924f6c56827\
+7012f68255207722355634290acc7fddeefbba75650a85ece95b6a12de67eac016ba78960108dd\
+5dbadfaa43cc9fed515a1f307b7d90ae0623bc7b8cefb';
+var secret =
+'00c37b1e06a436d6717816a40e6d72907a6f255638b93032267dcb9a5f0b4a9aa0236f3dce63b\
+1c418c60978a00acd1617dfeecf1661d8a3fafb4d0d8824386750f4853313400e7e4afd22847e4\
+fa56bc9713872021265111906673b38db83d10cbfa1dea3b6b4c97c8655f4ae82125281af7f234\
+8916a15c6f95649367d169d587697480df4d10b381479e86d5518b520d9d8fb764084eab518224\
+dc8fe984ddaf532fc1531ce43155fa0ab32532bf1ece5356b8a3447b5267798a904f16f3f4e635\
+597adc0179d011132dcffc0bbcb0dd2c8700872f8663ec7ddd897c659cc2efebccc73f38f0ec96\
+8612314311231f905f91c63a1aea52e0b60cead8b57df';
+
+/* FIPS-friendly 2048 bit prime */
+var p = crypto.createDiffieHellman(
+  crypto.getDiffieHellman('modp14').getPrime());
 
 p.setPublicKey(apub, 'hex');
 p.setPrivateKey(apriv, 'hex');
 
 assert.equal(
-  p.computeSecret(bpub, 'hex', 'hex'),
-  '0025616eed33f1af7975bbd0a8071d98a014f538b243bef90d76c08e81a0b3c5'
+  p.computeSecret(bpub, 'hex', 'hex').toString('hex'),
+  secret
 );
diff --git a/test/pummel/test-dh-regr.js b/test/pummel/test-dh-regr.js
index 1b4f0090e3847e..6fdd416b183669 100644
--- a/test/pummel/test-dh-regr.js
+++ b/test/pummel/test-dh-regr.js
@@ -8,7 +8,7 @@ if (!common.hasCrypto) {
 }
 var crypto = require('crypto');
 
-var p = crypto.createDiffieHellman(256).getPrime();
+var p = crypto.createDiffieHellman(1024).getPrime();
 
 for (var i = 0; i < 2000; i++) {
   var a = crypto.createDiffieHellman(p),

From 2a69b6820f79b45779a0f4cb823a594e1fc7eae7 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl@icu-project.org>
Date: Thu, 12 Nov 2015 18:10:26 -0800
Subject: [PATCH 200/323] build: fix --with-intl=system-icu for x-compile

* add toolset stuff to icu-system.gyp
* update docs

Fixes: https://github.com/nodejs/node/issues/3801
PR-URL: https://github.com/nodejs/node/pull/3808
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 README.md                | 3 +++
 tools/icu/icu-system.gyp | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 3c14da04398185..e7db6624f56277 100644
--- a/README.md
+++ b/README.md
@@ -228,6 +228,9 @@ Windows:
 $ pkg-config --modversion icu-i18n && ./configure --with-intl=system-icu
 ```
 
+If you are cross compiling, your `pkg-config` must be able to supply a path
+that works for both your host and target environments.
+
 #### Build with a specific ICU:
 
 You can find other ICU releases at
diff --git a/tools/icu/icu-system.gyp b/tools/icu/icu-system.gyp
index 44d4f5feff4cab..b3ca0e39b6c9eb 100644
--- a/tools/icu/icu-system.gyp
+++ b/tools/icu/icu-system.gyp
@@ -9,10 +9,12 @@
     {
       'target_name': 'icuuc',
       'type': 'none',
+      'toolsets': [ 'host', 'target' ],
     },
     {
       'target_name': 'icui18n',
       'type': 'none',
+      'toolsets': [ 'host', 'target' ],
     },
   ],
 }

From 1c1e70864bb6e0704f18805ed5cc462f0ba54d73 Mon Sep 17 00:00:00 2001
From: Michael Cornacchia <cornacch@ca.ibm.com>
Date: Fri, 30 Oct 2015 12:08:49 -0400
Subject: [PATCH 201/323] test: fix path to module for repl test on Windows

Use path join to construct the path instead of concatenating strings.
Replace backslash with double backslash so that they are escaped
correctly in the string passed to REPL.

PR-URL: https://github.com/nodejs/node/pull/3608
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/addons/repl-domain-abort/test.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/addons/repl-domain-abort/test.js b/test/addons/repl-domain-abort/test.js
index 1268b61f362eed..bbd0c737eeba49 100644
--- a/test/addons/repl-domain-abort/test.js
+++ b/test/addons/repl-domain-abort/test.js
@@ -1,10 +1,14 @@
 'use strict';
-require('../../common');
+var common = require('../../common');
 var assert = require('assert');
 var repl = require('repl');
 var stream = require('stream');
+var path = require('path');
 var buildType = process.config.target_defaults.default_configuration;
-var buildPath = __dirname + '/build/' + buildType + '/binding';
+var buildPath = path.join(__dirname, 'build', buildType, 'binding');
+// On Windows, escape backslashes in the path before passing it to REPL.
+if (common.isWindows)
+  buildPath = buildPath.replace(/\\/g, '/');
 var cb_ran = false;
 
 process.on('exit', function() {

From d61cb90ee3faeba5c0045f0061fb2349888c8080 Mon Sep 17 00:00:00 2001
From: Minwoo Jung <jmwsoft@gmail.com>
Date: Sun, 15 Nov 2015 13:56:05 +0900
Subject: [PATCH 202/323] util: use Object.create(null) for dictionary object

Fixes https://github.com/nodejs/node/issues/3788
`arrayToHash()` needs to use `Object.create(null)` for its dictionary object.

Refs: https://github.com/nodejs/node/pull/3791
PR-URL: https://github.com/nodejs/node/pull/3831
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 lib/util.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util.js b/lib/util.js
index 9a68ea0068cbf3..928e148e28c80b 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -159,9 +159,9 @@ function stylizeNoColor(str, styleType) {
 
 
 function arrayToHash(array) {
-  var hash = {};
+  var hash = Object.create(null);
 
-  array.forEach(function(val, idx) {
+  array.forEach(function(val) {
     hash[val] = true;
   });
 

From 2d0ca0293a47a239cc6a6739ed48f03d37892d92 Mon Sep 17 00:00:00 2001
From: Markus Tzoe <chou.marcus@gmail.com>
Date: Thu, 1 Oct 2015 02:27:17 +0800
Subject: [PATCH 203/323] build: fix configuring with prebuilt libraries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix configure_library() to produce correct LDFLAGS when configuring with
prebuilt 3rd-party libraries (libuv, openssl, etc) using `pkg-config' or
`--shared-{LIBRARY}-includes=xxx --shared-{LIBRARY}-libpath=xxx'.

PR-URL: https://github.com/nodejs/node/pull/3135
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
---
 configure | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 2e4cc087c14aee..381ddd471b7b2b 100755
--- a/configure
+++ b/configure
@@ -753,11 +753,15 @@ def configure_library(lib, output):
     if pkg_cflags:
       output['include_dirs'] += (
           filter(None, map(str.strip, pkg_cflags.split('-I'))))
+    elif options.__dict__[shared_lib + '_includes']:
+      output['include_dirs'] += [options.__dict__[shared_lib + '_includes']]
 
     # libpath needs to be provided ahead libraries
     if pkg_libpath:
-      output['libraries'] += (
-          filter(None, map(str.strip, pkg_cflags.split('-L'))))
+      output['libraries'] += [pkg_libpath]
+    elif options.__dict__[shared_lib + '_libpath']:
+      output['libraries'] += [
+          '-L%s' % options.__dict__[shared_lib + '_libpath']]
 
     default_libs = getattr(options, shared_lib + '_libname')
     default_libs = map('-l{0}'.format, default_libs.split(','))

From 4bb27baf8db18ba05092b76989659b0e2510825e Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sun, 15 Nov 2015 14:41:19 -0800
Subject: [PATCH 204/323] test: skip test if FreeBSD jail will break it
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`test/internet/test-dgram-broadcast-multi-process.js` fails if it is in
a FreeBSD jail. This issue is with the way FreeBSD jails work and not
with Node. Skip the test if in a FreeBSD jail.

PR-URL: https://github.com/nodejs/node/pull/3839
Fixes: https://github.com/nodejs/node/issues/2472
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Ben Noordhuis <ben@strongloop.com>
---
 test/internet/test-dgram-broadcast-multi-process.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/internet/test-dgram-broadcast-multi-process.js b/test/internet/test-dgram-broadcast-multi-process.js
index 9df217710eaf9b..a24aabcf1b4d0f 100644
--- a/test/internet/test-dgram-broadcast-multi-process.js
+++ b/test/internet/test-dgram-broadcast-multi-process.js
@@ -15,6 +15,11 @@ var common = require('../common'),
       new Buffer('Fourth message to send')
     ];
 
+if (common.inFreeBSDJail) {
+  console.log('1..0 # Skipped: in a FreeBSD jail');
+  return;
+}
+
 // take the first non-internal interface as the address for binding
 get_bindAddress: for (var name in networkInterfaces) {
   var interfaces = networkInterfaces[name];

From c2393d1f2a945281ed937714d28c148bc13dbc30 Mon Sep 17 00:00:00 2001
From: Bryan English <bryan@bryanenglish.com>
Date: Fri, 13 Nov 2015 19:21:49 -0800
Subject: [PATCH 205/323] doc: consistent reference-style links

Moved all the URLs in API docs to the bottom of the files as
reference-style links.

PR-URL: https://github.com/nodejs/node/pull/3845
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/addons.markdown        | 33 +++++++------
 doc/api/assert.markdown        |  4 +-
 doc/api/buffer.markdown        | 15 +++---
 doc/api/child_process.markdown | 51 +++++++++++---------
 doc/api/cluster.markdown       | 26 +++++-----
 doc/api/console.markdown       | 17 +++----
 doc/api/crypto.markdown        | 87 ++++++++++++++++++----------------
 doc/api/debugger.markdown      |  7 +--
 doc/api/dgram.markdown         | 13 ++---
 doc/api/dns.markdown           | 41 ++++++++--------
 doc/api/errors.markdown        | 65 +++++++++++++++----------
 doc/api/events.markdown        | 23 ++++-----
 doc/api/fs.markdown            | 29 +++++++-----
 doc/api/globals.markdown       | 14 +++---
 doc/api/http.markdown          | 22 +++++----
 doc/api/https.markdown         | 33 ++++++-------
 doc/api/modules.markdown       |  6 +--
 doc/api/net.markdown           | 40 +++++++---------
 doc/api/process.markdown       | 32 ++++++-------
 doc/api/punycode.markdown      | 12 +++--
 doc/api/stream.markdown        | 25 ++++++----
 doc/api/synopsis.markdown      |  4 +-
 doc/api/tls.markdown           |  6 +--
 doc/api/tty.markdown           |  4 +-
 doc/api/util.markdown          |  9 ++--
 doc/api/v8.markdown            |  4 +-
 doc/api/vm.markdown            |  9 ++--
 doc/api/zlib.markdown          | 52 ++++++++++----------
 28 files changed, 372 insertions(+), 311 deletions(-)

diff --git a/doc/api/addons.markdown b/doc/api/addons.markdown
index f1f042f0d5bd9e..28a5457cca7c72 100644
--- a/doc/api/addons.markdown
+++ b/doc/api/addons.markdown
@@ -7,14 +7,12 @@ knowledge of several libraries:
  - V8 JavaScript, a C++ library. Used for interfacing with JavaScript:
    creating objects, calling functions, etc.  Documented mostly in the
    `v8.h` header file (`deps/v8/include/v8.h` in the Node.js source
-   tree), which is also available
-   [online](https://v8docs.nodesource.com/).
+   tree), which is also available [online][].
 
- - [libuv](https://github.com/libuv/libuv), C event loop library.
-   Anytime one needs to wait for a file descriptor to become readable,
-   wait for a timer, or wait for a signal to be received one will need
-   to interface with libuv. That is, if you perform any I/O, libuv will
-   need to be used.
+ - [libuv][], C event loop library. Anytime one needs to wait for a file
+   descriptor to become readable, wait for a timer, or wait for a signal
+   to be received one will need to interface with libuv. That is, if you
+   perform any I/O, libuv will need to be used.
 
  - Internal Node.js libraries. Most importantly is the `node::ObjectWrap`
    class which you will likely want to derive from.
@@ -25,9 +23,8 @@ Node.js statically compiles all its dependencies into the executable.
 When compiling your module, you don't need to worry about linking to
 any of these libraries.
 
-All of the following examples are available for
-[download](https://github.com/rvagg/node-addon-examples) and may be
-used as a starting-point for your own Addon.
+All of the following examples are available for [download][] and may
+be used as a starting-point for your own Addon.
 
 ## Hello world
 
@@ -77,7 +74,7 @@ The `module_name` needs to match the filename of the final binary (minus the
 The source code needs to be built into `addon.node`, the binary Addon. To
 do this we create a file called `binding.gyp` which describes the configuration
 to build your module in a JSON-like format. This file gets compiled by
-[node-gyp](https://github.com/nodejs/node-gyp).
+[node-gyp][].
 
     {
       "targets": [
@@ -113,10 +110,9 @@ Please see patterns below for further information or
 ## Addon patterns
 
 Below are some addon patterns to help you get started. Consult the online
-[v8 reference](http://izs.me/v8-docs/main.html) for help with the various v8
-calls, and v8's [Embedder's Guide](http://code.google.com/apis/v8/embed.html)
-for an explanation of several concepts used such as handles, scopes,
-function templates, etc.
+[v8 reference][] for help with the various v8 calls, and v8's
+[Embedder's Guide][] for an explanation of several concepts used such as
+handles, scopes, function templates, etc.
 
 In order to use these examples you need to compile them using `node-gyp`.
 Create the following `binding.gyp` file:
@@ -869,3 +865,10 @@ Test in JavaScript by running:
 
     // test.js
     var addon = require('./build/Release/addon');
+
+[online]: https://v8docs.nodesource.com/
+[libuv]: https://github.com/libuv/libuv
+[download]: https://github.com/rvagg/node-addon-examples
+[node-gyp]: https://github.com/nodejs/node-gyp
+[v8 reference]: http://izs.me/v8-docs/main.html
+[Embedder's Guide]: http://code.google.com/apis/v8/embed.html
diff --git a/doc/api/assert.markdown b/doc/api/assert.markdown
index a607b92ead197f..6ea4071b79cc14 100644
--- a/doc/api/assert.markdown
+++ b/doc/api/assert.markdown
@@ -32,7 +32,7 @@ operator ( `===` ).
 
 ## assert.doesNotThrow(block[, error][, message])
 
-Expects `block` not to throw an error. See [assert.throws()](#assert_assert_throws_block_error_message) for more details.
+Expects `block` not to throw an error. See [assert.throws()][] for more details.
 
 If `block` throws an error and if it is of a different type from `error`, the
 thrown error will get propagated back to the caller. The following call will
@@ -128,3 +128,5 @@ Custom error validation:
       },
       "unexpected error"
     );
+
+[assert.throws()]: #assert_assert_throws_block_error_message
diff --git a/doc/api/buffer.markdown b/doc/api/buffer.markdown
index f18da5c192f01f..96a4d3c483efba 100644
--- a/doc/api/buffer.markdown
+++ b/doc/api/buffer.markdown
@@ -114,8 +114,7 @@ Example:
 * `buf1` {Buffer}
 * `buf2` {Buffer}
 
-The same as [`buf1.compare(buf2)`](#buffer_buf_compare_otherbuffer). Useful
-for sorting an Array of Buffers:
+The same as [`buf1.compare(buf2)`][]. Useful for sorting an Array of Buffers:
 
     var arr = [Buffer('1234'), Buffer('0123')];
     arr.sort(Buffer.compare);
@@ -287,11 +286,10 @@ buffer.
 * `byteOffset` Number, Optional, Default: 0
 * Return: Number
 
-Operates similar to
-[Array#indexOf()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf).
-Accepts a String, Buffer or Number. Strings are interpreted as UTF8. Buffers
-will use the entire buffer. So in order to compare a partial Buffer use
-`Buffer#slice()`. Numbers can range from 0 to 255.
+Operates similar to [Array#indexOf()][]. Accepts a String, Buffer or Number.
+Strings are interpreted as UTF8. Buffers will use the entire buffer. So in order
+to compare a partial Buffer use `Buffer#slice()`. Numbers can range from 0 to
+255.
 
 ### buf.length
 
@@ -932,3 +930,6 @@ un-pooled Buffer instance using SlowBuffer and copy out the relevant bits.
 
 Though this should be used sparingly and only be a last resort *after* a developer
 has actively observed undue memory retention in their applications.
+
+[`buf1.compare(buf2)`]: #buffer_buf_compare_otherbuffer
+[Array#indexOf()]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf
diff --git a/doc/api/child_process.markdown b/doc/api/child_process.markdown
index ad7ceeb9612dca..5f1aea770dce76 100644
--- a/doc/api/child_process.markdown
+++ b/doc/api/child_process.markdown
@@ -12,10 +12,9 @@ data you send to the child process may not be immediately consumed.)
 
 To create a child process use `require('child_process').spawn()` or
 `require('child_process').fork()`.  The semantics of each are slightly
-different, and explained [below](#child_process_asynchronous_process_creation).
+different, and explained [below][].
 
-For scripting purposes you may find the
-[synchronous counterparts](#child_process_synchronous_process_creation) more
+For scripting purposes you may find the [synchronous counterparts][] more
 convenient.
 
 ## Class: ChildProcess
@@ -61,8 +60,7 @@ Note that the `exit`-event may or may not fire after an error has occurred. If
 you are listening on both events to fire a function, remember to guard against
 calling your function twice.
 
-See also [`ChildProcess#kill()`](#child_process_child_kill_signal) and
-[`ChildProcess#send()`](#child_process_child_send_message_sendhandle_callback).
+See also [`ChildProcess#kill()`][] and [`ChildProcess#send()`][].
 
 ### Event:  'exit'
 
@@ -161,7 +159,7 @@ Example:
 * `callback` {Function}
 * Return: Boolean
 
-When using [`child_process.fork()`](#child_process_child_process_fork_modulepath_args_options) you can write to the child using
+When using [`child_process.fork()`][] you can write to the child using
 `child.send(message[, sendHandle][, callback])` and messages are received by
 a `'message'` event on the child.
 
@@ -310,9 +308,7 @@ to the same object, or null.
 * {Array}
 
 A sparse array of pipes to the child process, corresponding with positions in
-the [stdio](#child_process_options_stdio) option to
-[spawn](#child_process_child_process_spawn_command_args_options) that have been
-set to `'pipe'`.
+the [stdio][] option to [spawn][] that have been set to `'pipe'`.
 Note that streams 0-2 are also available as ChildProcess.stdin,
 ChildProcess.stdout, and ChildProcess.stderr, respectively.
 
@@ -439,9 +435,9 @@ the existing process and uses a shell to execute the command.*
   * `stderr` {Buffer}
 * Return: ChildProcess object
 
-This is similar to [`child_process.exec()`](#child_process_child_process_exec_command_options_callback) except it does not execute a
+This is similar to [`child_process.exec()`][] except it does not execute a
 subshell but rather the specified file directly. This makes it slightly
-leaner than [`child_process.exec()`](#child_process_child_process_exec_command_options_callback). It has the same options.
+leaner than [`child_process.exec()`][]. It has the same options.
 
 
 ### child_process.fork(modulePath[, args][, options])
@@ -462,10 +458,10 @@ leaner than [`child_process.exec()`](#child_process_child_process_exec_command_o
   * `gid` {Number} Sets the group identity of the process. (See setgid(2).)
 * Return: ChildProcess object
 
-This is a special case of the [`child_process.spawn()`](#child_process_child_process_spawn_command_args_options) functionality for spawning Node.js
-processes. In addition to having all the methods in a normal ChildProcess
-instance, the returned object has a communication channel built-in. See
-[`child.send(message, [sendHandle])`](#child_process_child_send_message_sendhandle_callback) for details.
+This is a special case of the [`child_process.spawn()`][] functionality for
+spawning Node.js processes. In addition to having all the methods in a normal
+ChildProcess instance, the returned object has a communication channel built-in.
+See [`child.send(message, [sendHandle])`][] for details.
 
 These child Node.js processes are still whole new instances of V8. Assume at
 least 30ms startup and 10mb memory for each new Node.js. That is, you cannot
@@ -663,7 +659,7 @@ Example:
     // startd-style interface.
     spawn('prg', [], { stdio: ['pipe', null, null, null, 'pipe'] });
 
-See also: [`child_process.exec()`](#child_process_child_process_exec_command_options_callback) and [`child_process.fork()`](#child_process_child_process_fork_modulepath_args_options)
+See also: [`child_process.exec()`][] and [`child_process.fork()`][]
 
 ## Synchronous Process Creation
 
@@ -703,11 +699,7 @@ process has exited.
 
 If the process times out, or has a non-zero exit code, this method ***will***
 throw.  The `Error` object will contain the entire result from
-[`child_process.spawnSync()`](#child_process_child_process_spawnsync_command_args_options)
-
-[EventEmitter]: events.html#events_class_events_eventemitter
-[net.Server]: net.html#net_class_net_server
-[net.Socket]: net.html#net_class_net_socket
+[`child_process.spawnSync()`][]
 
 ### child_process.execSync(command[, options])
 
@@ -741,7 +733,7 @@ process has exited.
 
 If the process times out, or has a non-zero exit code, this method ***will***
 throw.  The `Error` object will contain the entire result from
-[`child_process.spawnSync()`](#child_process_child_process_spawnsync_command_args_options)
+[`child_process.spawnSync()`][]
 
 ### child_process.spawnSync(command[, args][, options])
 
@@ -774,3 +766,18 @@ timeout has been encountered and `killSignal` is sent, the method won't return
 until the process has completely exited. That is to say, if the process handles
 the `SIGTERM` signal and doesn't exit, your process will wait until the child
 process has exited.
+
+[below]: #child_process_asynchronous_process_creation
+[synchronous counterparts]: #child_process_synchronous_process_creation
+[EventEmitter]: events.html#events_class_events_eventemitter
+[`ChildProcess#kill()`]: #child_process_child_kill_signal
+[`ChildProcess#send()`]: #child_process_child_send_message_sendhandle_callback
+[net.Server]: net.html#net_class_net_server
+[net.Socket]: net.html#net_class_net_socket
+[`child_process.fork()`]: #child_process_child_process_fork_modulepath_args_options
+[stdio]: #child_process_options_stdio
+[spawn]: #child_process_child_process_spawn_command_args_options
+[`child_process.exec()`]: #child_process_child_process_exec_command_options_callback
+[`child_process.spawn()`]: #child_process_child_process_spawn_command_args_options
+[`child.send(message, [sendHandle])`]: #child_process_child_send_message_sendhandle_callback
+[`child_process.spawnSync()`]: #child_process_child_process_spawnsync_command_args_options
diff --git a/doc/api/cluster.markdown b/doc/api/cluster.markdown
index 594dea0832908d..7b9887b7d9a250 100644
--- a/doc/api/cluster.markdown
+++ b/doc/api/cluster.markdown
@@ -123,8 +123,6 @@ This event is the same as the one provided by `child_process.fork()`.
 
 In a worker you can also use `process.on('error')`.
 
-[ChildProcess.send()]: child_process.html#child_process_child_send_message_sendhandle_callback
-
 ### Event: 'exit'
 
 * `code` {Number} the exit code, if it exited normally.
@@ -232,15 +230,15 @@ Causes `.suicide` to be set.
 Note that after a server is closed, it will no longer accept new connections,
 but connections may be accepted by any other listening worker. Existing
 connections will be allowed to close as usual. When no more connections exist,
-see [server.close()](net.html#net_event_close), the IPC channel to the worker
-will close allowing it to die gracefully.
+see [server.close()][], the IPC channel to the worker will close allowing it to
+die gracefully.
 
 The above applies *only* to server connections, client connections are not
 automatically closed by workers, and disconnect does not wait for them to close
 before exiting.
 
 Note that in a worker, `process.disconnect` exists, but it is not this function,
-it is [disconnect](child_process.html#child_process_child_disconnect).
+it is [disconnect][].
 
 Because long living server connections may block workers from disconnecting, it
 may be useful to send a message, so application specific actions may be taken to
@@ -313,7 +311,7 @@ Causes `.suicide` to be set.
 This method is aliased as `worker.destroy()` for backwards compatibility.
 
 Note that in a worker, `process.kill()` exists, but it is not this function,
-it is [kill](process.html#process_process_kill_pid_signal).
+it is [kill][].
 
 ### worker.process
 
@@ -323,8 +321,7 @@ All workers are created using `child_process.fork()`, the returned object
 from this function is stored as `.process`. In a worker, the global `process`
 is stored.
 
-See: [Child Process module](
-child_process.html#child_process_child_process_fork_modulepath_args_options)
+See: [Child Process module][]
 
 Note that workers will call `process.exit(0)` if the `'disconnect'` event occurs
 on `process` and `.suicide` is not `true`. This protects against accidental
@@ -408,7 +405,7 @@ This can be used to restart the worker by calling `.fork()` again.
       cluster.fork();
     });
 
-See [child_process event: 'exit'](child_process.html#child_process_event_exit).
+See [child_process event: 'exit'][].
 
 ## Event: 'fork'
 
@@ -464,8 +461,7 @@ The `addressType` is one of:
 
 Emitted when any worker receives a message.
 
-See
-[child_process event: 'message'](child_process.html#child_process_event_message).
+See [child_process event: 'message'][].
 
 ## Event: 'online'
 
@@ -647,3 +643,11 @@ the worker's unique id is the easiest way to find the worker.
     socket.on('data', function(id) {
       var worker = cluster.workers[id];
     });
+
+[server.close()]: net.html#net_event_close
+[disconnect]: child_process.html#child_process_child_disconnect
+[kill]: process.html#process_process_kill_pid_signal
+[Child Process module]: child_process.html#child_process_child_process_fork_modulepath_args_options
+[ChildProcess.send()]: child_process.html#child_process_child_send_message_sendhandle_callback
+[child_process event: 'exit']: child_process.html#child_process_event_exit
+[child_process event: 'message']: child_process.html#child_process_event_message.
diff --git a/doc/api/console.markdown b/doc/api/console.markdown
index 25d02953605ebc..b481a7d17c98e1 100644
--- a/doc/api/console.markdown
+++ b/doc/api/console.markdown
@@ -43,10 +43,6 @@ The global `console` is a special `Console` whose output is sent to
 
     new Console(process.stdout, process.stderr);
 
-[assert.ok()]: assert.html#assert_assert_value_message_assert_ok_value_message
-[util.format()]: util.html#util_util_format_format
-[customizing util.inspect colors]: util.html#util_customizing_util_inspect_colors
-
 ## console
 
 * {Object}
@@ -113,14 +109,13 @@ is used on each argument.  See [util.format()][] for more information.
 
 Starts a timer that can be used to compute the duration of an operation. Timers
 are identified by a unique name. Use the same name when you call
-[`console.timeEnd()`](#console_console_timeend_label) to stop the timer and
-output the elapsed time in milliseconds. Timer durations are accurate to the
-sub-millisecond.
+[`console.timeEnd()`][] to stop the timer and output the elapsed time in
+milliseconds. Timer durations are accurate to the sub-millisecond.
 
 ### console.timeEnd(label)
 
 Stops a timer that was previously started by calling
-[`console.time()`](#console_console_time_label) and prints the result to the
+[`console.time()`][] and prints the result to the
 console.
 
 Example:
@@ -140,3 +135,9 @@ to the current position.
 ### console.warn([data][, ...])
 
 Same as `console.error`.
+
+[assert.ok()]: assert.html#assert_assert_value_message_assert_ok_value_message
+[customizing util.inspect colors]: util.html#util_customizing_util_inspect_colors
+[util.format()]: util.html#util_util_format_format
+[`console.timeEnd()`]: #console_console_timeend_label
+[`console.time()`]: #console_console_time_label
diff --git a/doc/api/crypto.markdown b/doc/api/crypto.markdown
index 113593a113f02f..048bc077785c92 100644
--- a/doc/api/crypto.markdown
+++ b/doc/api/crypto.markdown
@@ -36,10 +36,10 @@ Class for encrypting data.
 
 Returned by `crypto.createCipher` and `crypto.createCipheriv`.
 
-Cipher objects are [streams](stream.html) that are both readable and
-writable.  The written plain text data is used to produce the
-encrypted data on the readable side.  The legacy `update` and `final`
-methods are also supported.
+Cipher objects are [streams][] that are both readable and writable.
+The written plain text data is used to produce the encrypted data on
+the readable side. The legacy `update` and `final` methods are also
+supported.
 
 ### cipher.final([output_encoding])
 
@@ -91,10 +91,10 @@ Class for decrypting data.
 
 Returned by `crypto.createDecipher` and `crypto.createDecipheriv`.
 
-Decipher objects are [streams](stream.html) that are both readable and
-writable.  The written enciphered data is used to produce the
-plain-text data on the the readable side.  The legacy `update` and
-`final` methods are also supported.
+Decipher objects are [streams][] that are both readable and writable.
+The written enciphered data is used to produce the plain-text data on
+the the readable side. The legacy `update` and `final` methods are also
+supported.
 
 ### decipher.final([output_encoding])
 
@@ -287,10 +287,10 @@ expected.
 
 The class for creating hash digests of data.
 
-It is a [stream](stream.html) that is both readable and writable.  The
-written data is used to compute the hash.  Once the writable side of
-the stream is ended, use the `read()` method to get the computed hash
-digest.  The legacy `update` and `digest` methods are also supported.
+It is a [stream][] that is both readable and writable.  The written data
+is used to compute the hash.  Once the writable side of the stream is ended,
+use the `read()` method to get the computed hash digest.  The legacy `update`
+and `digest` methods are also supported.
 
 Returned by `crypto.createHash`.
 
@@ -339,10 +339,10 @@ Class for generating signatures.
 
 Returned by `crypto.createSign`.
 
-Sign objects are writable [streams](stream.html).  The written data is
-used to generate the signature.  Once all of the data has been
-written, the `sign` method will return the signature.  The legacy
-`update` method is also supported.
+Sign objects are writable [streams][].  The written data is used to
+generate the signature.  Once all of the data has been written, the
+`sign` method will return the signature.  The legacy `update` method
+is also supported.
 
 ### sign.sign(private_key[, output_format])
 
@@ -375,11 +375,10 @@ Class for verifying signatures.
 
 Returned by `crypto.createVerify`.
 
-Verify objects are writable [streams](stream.html).  The written data
-is used to validate against the supplied signature.  Once all of the
-data has been written, the `verify` method will return true if the
-supplied signature is valid.  The legacy `update` method is also
-supported.
+Verify objects are writable [streams][].  The written data is used to
+validate against the supplied signature.  Once all of the data has been
+written, the `verify` method will return true if the supplied signature
+is valid.  The legacy `update` method is also supported.
 
 ### verifier.update(data)
 
@@ -420,12 +419,12 @@ password.
 `algorithm` is dependent on OpenSSL, examples are `'aes192'`, etc.  On
 recent releases, `openssl list-cipher-algorithms` will display the
 available cipher algorithms.  `password` is used to derive key and IV,
-which must be a `'binary'` encoded string or a [buffer](buffer.html).
+which must be a `'binary'` encoded string or a [buffer][].
 
-It is a [stream](stream.html) that is both readable and writable.  The
-written data is used to compute the hash.  Once the writable side of
-the stream is ended, use the `read()` method to get the enciphered
-contents.  The legacy `update` and `final` methods are also supported.
+It is a [stream][] that is both readable and writable.  The written data
+is used to compute the hash.  Once the writable side of the stream is ended,
+use the `read()` method to get the enciphered contents.  The legacy `update`
+and `final` methods are also supported.
 
 Note: `createCipher` derives keys with the OpenSSL function [EVP_BytesToKey][]
 with the digest algorithm set to MD5, one iteration, and no salt. The lack of
@@ -443,11 +442,9 @@ Creates and returns a cipher object, with the given algorithm, key and
 iv.
 
 `algorithm` is the same as the argument to `createCipher()`.  `key` is
-the raw key used by the algorithm.  `iv` is an [initialization
-vector](http://en.wikipedia.org/wiki/Initialization_vector).
+the raw key used by the algorithm.  `iv` is an [initialization vector][].
 
-`key` and `iv` must be `'binary'` encoded strings or
-[buffers](buffer.html).
+`key` and `iv` must be `'binary'` encoded strings or [buffers][].
 
 ## crypto.createCredentials(details)
 
@@ -542,10 +539,10 @@ Example: this program that takes the sha256 sum of a file
 Creates and returns a hmac object, a cryptographic hmac with the given
 algorithm and key.
 
-It is a [stream](stream.html) that is both readable and writable.  The
-written data is used to compute the hmac.  Once the writable side of
-the stream is ended, use the `read()` method to get the computed
-digest.  The legacy `update` and `digest` methods are also supported.
+It is a [stream][] that is both readable and writable.  The written
+data is used to compute the hmac.  Once the writable side of the
+stream is ended, use the `read()` method to get the computed digest.
+The legacy `update` and `digest` methods are also supported.
 
 `algorithm` is dependent on the available algorithms supported by
 OpenSSL - see createHash above.  `key` is the hmac key to be used.
@@ -583,12 +580,12 @@ Example:
 
 Creates a predefined Diffie-Hellman key exchange object.  The
 supported groups are: `'modp1'`, `'modp2'`, `'modp5'` (defined in
-[RFC 2412][], but see [Caveats](#crypto_caveats)) and `'modp14'`,
-`'modp15'`, `'modp16'`, `'modp17'`, `'modp18'` (defined in
-[RFC 3526][]).  The returned object mimics the interface of objects
-created by [crypto.createDiffieHellman()][] above, but will not allow
-changing the keys (with [diffieHellman.setPublicKey()][] for example).
-The advantage of using this routine is that the parties do not have to
+[RFC 2412][], but see [Caveats][]) and `'modp14'`, `'modp15'`,
+`'modp16'`, `'modp17'`, `'modp18'` (defined in [RFC 3526][]).  The
+returned object mimics the interface of objects created by
+[crypto.createDiffieHellman()][] above, but will not allow changing
+the keys (with [diffieHellman.setPublicKey()][] for example). The
+advantage of using this routine is that the parties do not have to
 generate nor exchange group modulus beforehand, saving both processor
 and communication time.
 
@@ -631,8 +628,7 @@ Example:
       console.log(key.toString('hex'));  // 'c5e478d...1469e50'
     });
 
-You can get a list of supported digest functions with
-[crypto.getHashes()](#crypto_crypto_gethashes).
+You can get a list of supported digest functions with [crypto.getHashes()][].
 
 ## crypto.pbkdf2Sync(password, salt, iterations, keylen[, digest])
 
@@ -779,6 +775,10 @@ Based on the recommendations of [NIST SP 800-131A]:
 
 See the reference for other recommendations and details.
 
+[stream]: stream.html
+[streams]: stream.html
+[buffer]: buffer.html
+[buffers]: buffer.html
 [createCipher()]: #crypto_crypto_createcipher_algorithm_password
 [createCipheriv()]: #crypto_crypto_createcipheriv_algorithm_key_iv
 [getCurves()]: #crypto_crypto_getcurves
@@ -790,3 +790,6 @@ See the reference for other recommendations and details.
 [crypto.pbkdf2]: #crypto_crypto_pbkdf2_password_salt_iterations_keylen_digest_callback
 [EVP_BytesToKey]: https://www.openssl.org/docs/crypto/EVP_BytesToKey.html
 [NIST SP 800-131A]: http://csrc.nist.gov/publications/nistpubs/800-131A/sp800-131A.pdf
+[initialization vector]: http://en.wikipedia.org/wiki/Initialization_vector
+[Caveats]: #crypto_caveats
+[crypto.getHashes()]: #crypto_crypto_gethashes
diff --git a/doc/api/debugger.markdown b/doc/api/debugger.markdown
index 3f9672bcb0f616..224f53eb45e2ba 100644
--- a/doc/api/debugger.markdown
+++ b/doc/api/debugger.markdown
@@ -5,9 +5,8 @@
 <!-- type=misc -->
 
 V8 comes with an extensive debugger which is accessible out-of-process via a
-simple [TCP protocol](http://code.google.com/p/v8/wiki/DebuggerProtocol).
-Node.js has a built-in client for this debugger. To use this, start Node.js with
-the `debug` argument; a prompt will appear:
+simple [TCP protocol][]. Node.js has a built-in client for this debugger. To
+use this, start Node.js with the `debug` argument; a prompt will appear:
 
     % node debug myscript.js
     < debugger listening on port 5858
@@ -168,3 +167,5 @@ debugger. The syntax is:
 
 * `node debug -p <pid>` - Connects to the process via the `pid`
 * `node debug <URI>` - Connects to the process via the URI such as localhost:5858
+
+[TCP protocol]: http://code.google.com/p/v8/wiki/DebuggerProtocol
diff --git a/doc/api/dgram.markdown b/doc/api/dgram.markdown
index fce88d0fdc2d2f..3db13305281f5a 100644
--- a/doc/api/dgram.markdown
+++ b/doc/api/dgram.markdown
@@ -143,7 +143,7 @@ shown below.
 ### socket.close([callback])
 
 Close the underlying socket and stop listening for data on it. If a callback is
-provided, it is added as a listener for the ['close'](#dgram_event_close) event.
+provided, it is added as a listener for the ['close'][] event.
 
 ### socket.dropMembership(multicastAddress[, multicastInterface])
 
@@ -186,9 +186,7 @@ given, the error will be the first argument to the callback. If a callback is
 not given, the error is emitted as an `'error'` event on the `socket` object.
 
 With consideration for multi-byte characters, `offset` and `length` will
-be calculated with respect to
-[byte length](buffer.html#buffer_class_method_buffer_bytelength_string_encoding)
-and not the character position.
+be calculated with respect to [byte length][] and not the character position.
 
 Example of sending a UDP packet to a random port on `localhost`;
 
@@ -261,8 +259,8 @@ gateway that forwards a packet decrements the TTL.  If the TTL is decremented to
 router, it will not be forwarded.  Changing TTL values is typically done for network
 probes or when multicasting.
 
-The argument to `setTTL()` is a number of hops between 1 and 255.  The default on most
-systems is 64.
+The argument to `setTTL()` is a number of hops between 1 and 255.  The default
+on most systems is 64.
 
 ### socket.ref()
 
@@ -315,3 +313,6 @@ Call `socket.bind()` if you want to receive datagrams. `socket.bind()` will
 bind to the "all interfaces" address on a random port (it does the right thing
 for both `udp4` and `udp6` sockets). You can then retrieve the address and port
 with `socket.address().address` and `socket.address().port`.
+
+['close']: #dgram_event_close
+[byte length]: buffer.html#buffer_class_method_buffer_bytelength_string_encoding
diff --git a/doc/api/dns.markdown b/doc/api/dns.markdown
index f905e8681a3702..e7b9fbb7987b93 100644
--- a/doc/api/dns.markdown
+++ b/doc/api/dns.markdown
@@ -10,7 +10,7 @@ This module contains functions that belong to two different categories:
 name resolution, and that do not necessarily do any network communication.
 This category contains only one function: `dns.lookup()`. __Developers looking
 to perform name resolution in the same way that other applications on the same
-operating system behave should use [`dns.lookup()`][dns.lookup].__
+operating system behave should use [`dns.lookup()`][].__
 
 Here is an example that does a lookup of `www.google.com`.
 
@@ -22,8 +22,8 @@ Here is an example that does a lookup of `www.google.com`.
 
 2) Functions that connect to an actual DNS server to perform name resolution,
 and that _always_ use the network to perform DNS queries. This category
-contains all functions in the `dns` module but [`dns.lookup()`][dns.lookup]. These functions
-do not use the same set of configuration files than what [`dns.lookup()`][dns.lookup] uses.
+contains all functions in the `dns` module but [`dns.lookup()`][]. These functions
+do not use the same set of configuration files than what [`dns.lookup()`][] uses.
 For instance, _they do not use the configuration from `/etc/hosts`_. These
 functions should be used by developers who do not want to use the underlying
 operating system's facilities for name resolution, and instead want to
@@ -51,8 +51,7 @@ resolves the IP addresses which are returned.
     });
 
 There are subtle consequences in choosing one or another, please consult the
-[Implementation considerations section](#dns_implementation_considerations)
-for more information.
+[Implementation considerations section][] for more information.
 
 ## dns.getServers()
 
@@ -74,8 +73,8 @@ Alternatively, `options` can be an object containing these properties:
   `getaddrinfo` flags. If `hints` is not provided, then no flags are passed to
   `getaddrinfo`. Multiple flags can be passed through `hints` by logically
   `OR`ing their values.
-  See [supported `getaddrinfo` flags](#dns_supported_getaddrinfo_flags) below
-  for more information on supported flags.
+  See [supported `getaddrinfo` flags][] below for more information on supported
+  flags.
 * `all`: {Boolean} - When `true`, the callback returns all resolved addresses
   in an array, otherwise returns a single address. Defaults to `false`.
 
@@ -109,7 +108,7 @@ and vice versa.
 
 Its implementation can have subtle but important consequences on the behavior
 of any Node.js program. Please take some time to consult the [Implementation
-considerations section](#dns_implementation_considerations) before using it.
+considerations section][] before using it.
 
 ## dns.lookupService(address, port, callback)
 
@@ -149,36 +148,36 @@ one of the error codes listed below.
 
 ## dns.resolve4(hostname, callback)
 
-The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but only for IPv4 queries (`A` records).
+The same as [`dns.resolve()`][], but only for IPv4 queries (`A` records).
 `addresses` is an array of IPv4 addresses (e.g.
 `['74.125.79.104', '74.125.79.105', '74.125.79.106']`).
 
 ## dns.resolve6(hostname, callback)
 
-The same as [`dns.resolve4()`](#dns_dns_resolve4_hostname_callback) except for IPv6 queries (an `AAAA` query).
+The same as [`dns.resolve4()`][] except for IPv6 queries (an `AAAA` query).
 
 ## dns.resolveCname(hostname, callback)
 
-The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but only for canonical name records (`CNAME`
+The same as [`dns.resolve()`][], but only for canonical name records (`CNAME`
 records). `addresses` is an array of the canonical name records available for
 `hostname` (e.g., `['bar.example.com']`).
 
 ## dns.resolveMx(hostname, callback)
 
-The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but only for mail exchange queries (`MX` records).
+The same as [`dns.resolve()`][], but only for mail exchange queries (`MX` records).
 
 `addresses` is an array of MX records, each with a priority and an exchange
 attribute (e.g. `[{'priority': 10, 'exchange': 'mx.example.com'},...]`).
 
 ## dns.resolveNs(hostname, callback)
 
-The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but only for name server records (`NS` records).
+The same as [`dns.resolve()`][], but only for name server records (`NS` records).
 `addresses` is an array of the name server records available for `hostname`
 (e.g., `['ns1.example.com', 'ns2.example.com']`).
 
 ## dns.resolveSoa(hostname, callback)
 
-The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but only for start of authority record queries
+The same as [`dns.resolve()`][], but only for start of authority record queries
 (`SOA` record).
 
 `addresses` is an object with the following structure:
@@ -197,14 +196,14 @@ The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but on
 
 ## dns.resolveSrv(hostname, callback)
 
-The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but only for service records (`SRV` records).
+The same as [`dns.resolve()`][], but only for service records (`SRV` records).
 `addresses` is an array of the SRV records available for `hostname`. Properties
 of SRV records are priority, weight, port, and name (e.g.,
 `[{'priority': 10, 'weight': 5, 'port': 21223, 'name': 'service.example.com'}, ...]`).
 
 ## dns.resolveTxt(hostname, callback)
 
-The same as [`dns.resolve()`](#dns_dns_resolve_hostname_rrtype_callback), but only for text queries (`TXT` records).
+The same as [`dns.resolve()`][], but only for text queries (`TXT` records).
 `addresses` is a 2-d array of the text records available for `hostname` (e.g.,
 `[ ['v=spf1 ip4:0.0.0.0 ', '~all' ] ]`). Each sub-array contains TXT chunks of
 one record. Depending on the use case, the could be either joined together or
@@ -296,8 +295,7 @@ operations) will experience degraded performance. In order to mitigate this
 issue, one potential solution is to increase the size of libuv's threadpool by
 setting the 'UV_THREADPOOL_SIZE' environment variable to a value greater than
 4 (its current default value). For more information on libuv's threadpool, see
-[the official libuv
-documentation](http://docs.libuv.org/en/latest/threadpool.html).
+[the official libuv documentation][].
 
 ### dns.resolve, functions starting with dns.resolve and dns.reverse
 
@@ -312,5 +310,10 @@ processing that happens on libuv's threadpool that `dns.lookup()` can have.
 They do not use the same set of configuration files than what `dns.lookup()`
 uses. For instance, _they do not use the configuration from `/etc/hosts`_.
 
+[Implementation considerations section]: #dns_implementation_considerations
+[supported `getaddrinfo` flags]: #dns_supported_getaddrinfo_flags
+[`dns.resolve()`]: #dns_dns_resolve_hostname_rrtype_callback
+[`dns.resolve4()`]: #dns_dns_resolve4_hostname_callback
+[the official libuv documentation]: http://docs.libuv.org/en/latest/threadpool.html
+[`dns.lookup()`]: #dns_dns_lookup_hostname_options_callback
 
-[dns.lookup]: #dns_dns_lookup_hostname_options_callback
diff --git a/doc/api/errors.markdown b/doc/api/errors.markdown
index 5e5f9acb99fc57..10f04e1ddbbd1a 100644
--- a/doc/api/errors.markdown
+++ b/doc/api/errors.markdown
@@ -3,7 +3,7 @@
 <!--type=misc-->
 
 Errors generated by Node.js fall into two categories: JavaScript errors and system
-errors. All errors inherit from or are instances of JavaScript's [Error](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error)
+errors. All errors inherit from or are instances of JavaScript's [Error][]
 class and are guaranteed to provide *at least* the attributes available on that
 class.
 
@@ -16,7 +16,7 @@ opportunity to **intercept** this error based on how the API **propagates** it.
 The style of API called determines how generated errors are handed back, or
 **propagated**, to client code, which in turn informs how the client may **intercept**
 the error. Exceptions can be intercepted using the `try / catch` construct;
-other propagation strategies are covered [below](#errors_error_propagation_and_interception).
+other propagation strategies are covered [below][].
 
 ## Error Propagation and Interception
 
@@ -26,11 +26,9 @@ All Node.js APIs will treat invalid arguments as exceptional -- that is, if pass
 invalid arguments, they will *immediately* generate and throw the error as an
 exception, even if they are an otherwise asynchronous API.
 
-Synchronous APIs (like
-[fs.readFileSync](fs.html#fs_fs_readfilesync_filename_options)) will throw the
-error. The act of *throwing* a value (in this case, the error) turns the value
-into an **exception**.  Exceptions may be caught using the `try { } catch(err)
-{ }` construct.
+Synchronous APIs (like [fs.readFileSync][]) will throw the error. The act of
+*throwing* a value (in this case, the error) turns the value into an **exception**.
+Exceptions may be caught using the `try { } catch(err) { }` construct.
 
 Asynchronous APIs have **two** mechanisms for error propagation; one mechanism
 for APIs that represent a single operation, and one for APIs that represent
@@ -41,12 +39,12 @@ multiple operations over time.
 <!--type=misc-->
 
 The other mechanism for providing errors is the "error" event. This is
-typically used by [stream-based](stream.html) and [event emitter-based](events.html#events_class_events_eventemitter) APIs, which
+typically used by [stream-based][] and [event emitter-based][] APIs, which
 themselves represent a series of asynchronous operations over time (versus a
 single operation that may pass or fail). If no "error" event handler is
 attached to the source of the error, the error will be thrown. At this point,
-it will crash the process as an unhandled exception unless [domains](domain.html) are
-employed appropriately or [process.on('uncaughtException')](process.html#process_event_uncaughtexception) has a handler.
+it will crash the process as an unhandled exception unless [domains][] are
+employed appropriately or [process.on('uncaughtException')][] has a handler.
 
 ```javascript
 var net = require('net');
@@ -131,7 +129,7 @@ try {
 This will not work! By the time the node style callback has been called, the
 surrounding code (including the `try { } catch(err) { }` will have already
 exited. Throwing an error inside a node style callback **will crash the process** in most cases.
-If [domains](domain.html) are enabled, they may intercept the thrown error; similarly, if a
+If [domains][] are enabled, they may intercept the thrown error; similarly, if a
 handler has been added to `process.on('uncaughtException')`, it will intercept
 the error.
 
@@ -158,7 +156,7 @@ errors as well as plain JavaScript errors.
 
 Instantiates a new Error object and sets its `.message` property to the provided
 message. Its `.stack` will represent the point in the program at which `new Error`
-was called. Stack traces are subject to [V8's stack trace API](https://code.google.com/p/v8-wiki/wiki/JavaScriptStackTraceApi).
+was called. Stack traces are subject to [V8's stack trace API][].
 Stack traces only extend to the beginning of synchronous code execution, *or* a number of frames given by
 `Error.stackTraceLimit`, whichever is smaller.
 
@@ -328,7 +326,7 @@ dependencies.
 A subclass of Error that indicates that a program is not valid JavaScript.
 These errors may only be generated and propagated as a result of code
 evaluation. Code evaluation may happen as a result of `eval`, `Function`,
-`require`, or [vm](vm.html). These errors are almost always indicative of a broken
+`require`, or [vm][]. These errors are almost always indicative of a broken
 program.
 
 ```javascript
@@ -372,7 +370,7 @@ System errors are generated in response to a program's runtime environment.
 Ideally, they represent operational errors that the program needs to be able to
 react to. They are generated at the syscall level: an exhaustive list of error
 codes and their meanings is available by running `man 2 intro` or `man 3 errno`
-on most Unices; or [online](http://man7.org/linux/man-pages/man3/errno.3.html).
+on most Unices; or [online][].
 
 In Node.js, system errors are represented as augmented Error objects -- not full
 subclasses, but instead an error instance with added members.
@@ -387,12 +385,12 @@ letters, and may be referenced in `man 2 intro`.
 
 #### error.syscall
 
-A string representing the [syscall](http://man7.org/linux/man-pages/man2/syscall.2.html) that failed.
+A string representing the [syscall][] that failed.
 
 ### Common System Errors
 
 This list is **not exhaustive**, but enumerates many of the common system errors when
-writing a Node.js program. An exhaustive list may be found [here](http://man7.org/linux/man-pages/man3/errno.3.html).
+writing a Node.js program. An exhaustive list may be found [here][online].
 
 #### EACCES: Permission denied
 
@@ -401,7 +399,7 @@ permissions.
 
 #### EADDRINUSE: Address already in use
 
-An attempt to bind a server ([net](net.html), [http](http.html), or [https](https.html)) to a local
+An attempt to bind a server ([net][], [http][], or [https][]) to a local
 address failed due to another server on the local system already occupying
 that address.
 
@@ -415,7 +413,7 @@ on the foreign host.
 
 A connection was forcibly closed by a peer. This normally results
 from a loss of the connection on the remote socket due to a timeout
-or reboot. Commonly encountered via the [http](http.html) and [net](net.html) modules.
+or reboot. Commonly encountered via the [http][] and [net][] modules.
 
 #### EEXIST: File exists
 
@@ -428,7 +426,7 @@ An operation expected a file, but the given pathname was a directory.
 
 #### EMFILE: Too many open files in system
 
-Maximum number of [file descriptors](http://en.wikipedia.org/wiki/File_descriptor) allowable on the system has
+Maximum number of [file descriptors][] allowable on the system has
 been reached, and requests for another descriptor cannot be fulfilled until
 at least one has been closed.
 
@@ -439,18 +437,18 @@ that will run the Node.js process.
 
 #### ENOENT: No such file or directory
 
-Commonly raised by [fs](fs.html) operations; a component of the specified pathname
+Commonly raised by [fs][] operations; a component of the specified pathname
 does not exist -- no entity (file or directory) could be found by the given path.
 
 #### ENOTDIR: Not a directory
 
 A component of the given pathname existed, but was not a directory as expected.
-Commonly raised by [fs.readdir](fs.html#fs_fs_readdir_path_callback).
+Commonly raised by [fs.readdir][].
 
 #### ENOTEMPTY: Directory not empty
 
 A directory with entries was the target of an operation that requires
-an empty directory -- usually [fs.unlink](fs.html#fs_fs_unlink_path_callback).
+an empty directory -- usually [fs.unlink][].
 
 #### EPERM: Operation not permitted
 
@@ -460,11 +458,30 @@ privileges.
 #### EPIPE: Broken pipe
 
 A write on a pipe, socket, or FIFO for which there is no process to read the
-data. Commonly encountered at the [net](net.html) and [http](http.html) layers, indicative that
+data. Commonly encountered at the [net][] and [http][] layers, indicative that
 the remote side of the stream being written to has been closed.
 
 #### ETIMEDOUT: Operation timed out
 
 A connect or send request failed because the connected party did not properly
-respond after a period of time. Usually encountered by [http](http.html) or [net](net.html) --
+respond after a period of time. Usually encountered by [http][] or [net][] --
 often a sign that a connected socket was not `.end()`'d appropriately.
+
+[Error]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error
+[below]: #errors_error_propagation_and_interception
+[fs.readFileSync]: fs.html#fs_fs_readfilesync_filename_options
+[stream-based]: stream.html
+[event emitter-based]: events.html#events_class_events_eventemitter
+[domains]: domain.html
+[process.on('uncaughtException')]: process.html#process_event_uncaughtexception
+[V8's stack trace API]: https://code.google.com/p/v8-wiki/wiki/JavaScriptStackTraceApi
+[vm]: vm.html
+[online]: http://man7.org/linux/man-pages/man3/errno.3.html
+[syscall]: http://man7.org/linux/man-pages/man2/syscall.2.html
+[net]: net.html
+[http]: http.html
+[https]: https.html
+[file descriptors]: http://en.wikipedia.org/wiki/File_descriptor
+[fs]: fs.html
+[fs.readdir]: fs.html#fs_fs_readdir_path_callback
+[fs.unlink]: fs.html#fs_fs_unlink_path_callback
diff --git a/doc/api/events.markdown b/doc/api/events.markdown
index c14994e5bf4a59..2d17ca2f83b6b8 100644
--- a/doc/api/events.markdown
+++ b/doc/api/events.markdown
@@ -4,11 +4,9 @@
 
 <!--type=module-->
 
-Many objects in Node.js emit events: a
-[`net.Server`](net.html#net_class_net_server) emits an event each time a peer
-connects to it, a [`fs.ReadStream`](fs.html#fs_class_fs_readstream) emits an
-event when the file is
-opened. All objects which emit events are instances of `events.EventEmitter`.
+Many objects in Node.js emit events: a [`net.Server`][] emits an event each
+time a peer connects to it, a [`fs.ReadStream`][] emits an event when the file
+is opened. All objects which emit events are instances of `events.EventEmitter`.
 You can access this module by doing: `require("events");`
 
 Typically, event names are represented by a camel-cased string, however,
@@ -81,13 +79,12 @@ triggered, the listener has been removed from the array of listeners for the
 
 ### EventEmitter.defaultMaxListeners
 
-[`emitter.setMaxListeners(n)`](#events_emitter_setmaxlisteners_n) sets the
-maximum on a per-instance basis.
+[`emitter.setMaxListeners(n)`][] sets the maximum on a per-instance basis.
 This class property lets you set it for *all* `EventEmitter` instances,
 current and future, effective immediately. Use with care.
 
-Note that [`emitter.setMaxListeners(n)`](#events_emitter_setmaxlisteners_n)
-still has precedence over `EventEmitter.defaultMaxListeners`.
+Note that [`emitter.setMaxListeners(n)`][] still has precedence over
+`EventEmitter.defaultMaxListeners`.
 
 ### emitter.addListener(event, listener)
 
@@ -102,8 +99,8 @@ Returns `true` if event had listeners, `false` otherwise.
 ### emitter.getMaxListeners()
 
 Returns the current max listener value for the emitter which is either set by
-[`emitter.setMaxListeners(n)`](#events_emitter_setmaxlisteners_n) or defaults to
-[`EventEmitter.defaultMaxListeners`](#events_eventemitter_defaultmaxlisteners).
+[`emitter.setMaxListeners(n)`][] or defaults to
+[`EventEmitter.defaultMaxListeners`][].
 
 This can be useful to increment/decrement max listeners to avoid the warning
 while not being irresponsible and setting a too big number.
@@ -190,4 +187,8 @@ allows that to be increased. Set to `Infinity` (or `0`) for unlimited.
 
 Returns emitter, so calls can be chained.
 
+[`net.Server`]: net.html#net_class_net_server
+[`fs.ReadStream`]: fs.html#fs_class_fs_readstream
+[`emitter.setMaxListeners(n)`]: #events_emitter_setmaxlisteners_n
+[`EventEmitter.defaultMaxListeners`]: #events_eventemitter_defaultmaxlisteners
 [emitter.listenerCount]: #events_emitter_listenercount_type
diff --git a/doc/api/fs.markdown b/doc/api/fs.markdown
index 0692d697e258a6..582a222a6e69c6 100644
--- a/doc/api/fs.markdown
+++ b/doc/api/fs.markdown
@@ -94,7 +94,7 @@ Objects returned from `fs.watch()` are of this type.
 * `filename` {String} The filename that changed (if relevant/available)
 
 Emitted when something changes in a watched directory or file.
-See more details in [fs.watch](#fs_fs_watch_filename_options_listener).
+See more details in [fs.watch][].
 
 ### Event: 'error'
 
@@ -108,7 +108,7 @@ Stop watching for changes on the given `fs.FSWatcher`.
 
 ## Class: fs.ReadStream
 
-`ReadStream` is a [Readable Stream](stream.html#stream_class_stream_readable).
+`ReadStream` is a [Readable Stream][].
 
 ### Event: 'open'
 
@@ -157,9 +157,6 @@ additional methods which can be used for displaying fuzzy information.
 More details can be found in the [MDN JavaScript Reference][MDN-Date]
 page.
 
-[MDN-Date]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date
-[MDN-Date-getTime]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date/getTime
-
 ### Stat Time Values
 
 The times in the stat object have the following semantics:
@@ -186,7 +183,7 @@ on Unix systems, it never was.
 
 ## Class: fs.WriteStream
 
-`WriteStream` is a [Writable Stream](stream.html#stream_class_stream_writable).
+`WriteStream` is a [Writable Stream][].
 
 ### Event: 'open'
 
@@ -367,7 +364,7 @@ non-existent.
 
 ## fs.existsSync(path)
 
-Synchronous version of [`fs.exists`](fs.html#fs_fs_exists_path_callback).
+Synchronous version of [`fs.exists`][].
 Returns `true` if the file exists, `false` otherwise.
 
     Stability: 0 - Deprecated: Use [fs.statSync][] or [fs.accessSync][] instead.
@@ -652,8 +649,8 @@ Synchronous rmdir(2). Returns `undefined`.
 ## fs.stat(path, callback)
 
 Asynchronous stat(2). The callback gets two arguments `(err, stats)` where
-`stats` is a [fs.Stats](#fs_class_fs_stats) object.  See the [fs.Stats](#fs_class_fs_stats)
-section below for more information.
+`stats` is a [fs.Stats][] object.  See the [fs.Stats][] section below for more
+information.
 
 ## fs.statSync(path)
 
@@ -723,7 +720,7 @@ Synchronous version of `fs.utimes()`. Returns `undefined`.
 ## fs.watch(filename[, options][, listener])
 
 Watch for changes on `filename`, where `filename` is either a file or a
-directory.  The returned object is a [fs.FSWatcher](#fs_class_fs_fswatcher).
+directory.  The returned object is a [fs.FSWatcher][].
 
 The second argument is optional. The `options` if provided should be an object.
 The supported boolean members are `persistent` and `recursive`. `persistent`
@@ -855,8 +852,7 @@ the current position. See pwrite(2).
 
 The callback will receive the arguments `(err, written, string)` where `written`
 specifies how many _bytes_ the passed string required to be written. Note that
-bytes written is not the same as string characters. See
-[Buffer.byteLength](buffer.html#buffer_class_method_buffer_bytelength_string_encoding).
+bytes written is not the same as string characters. See [Buffer.byteLength][].
 
 Unlike when writing `buffer`, the entire string must be written. No substring
 may be specified. This is because the byte offset of the resulting data may not
@@ -915,8 +911,17 @@ The synchronous version of `fs.writeFile`. Returns `undefined`.
 
 Synchronous versions of `fs.write()`. Returns the number of bytes written.
 
+[fs.watch]: #fs_fs_watch_filename_options_listener
+[Readable Stream]: stream.html#stream_class_stream_readable
+[MDN-Date]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date
+[MDN-Date-getTime]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date/getTime
+[Writable Stream]: stream.html#stream_class_stream_writable
 [fs.stat]: #fs_fs_stat_path_callback
+[`fs.exists`]: fs.html#fs_fs_exists_path_callback
 [fs.access]: #fs_fs_access_path_mode_callback
 [fs.statSync]: #fs_fs_statsync_path
 [fs.accessSync]: #fs_fs_accesssync_path_mode
+[fs.Stats]: #fs_class_fs_stats
 [Buffer]: buffer.html#buffer_buffer
+[fs.FSWatcher]: #fs_class_fs_fswatcher
+[Buffer.byteLength]: buffer.html#buffer_class_method_buffer_bytelength_string_encoding
diff --git a/doc/api/globals.markdown b/doc/api/globals.markdown
index b9ab51ad8da066..dd675c90664c49 100644
--- a/doc/api/globals.markdown
+++ b/doc/api/globals.markdown
@@ -55,13 +55,6 @@ will not execute.
 
 The timer functions are global variables. See the [timers][] section.
 
-[buffer section]: buffer.html
-[module system documentation]: modules.html
-[Modules]: modules.html#modules_modules
-[process object]: process.html#process_process
-[console]: console.html
-[timers]: timers.html
-
 ## clearTimeout(t)
 
 Stop a timer that was previously created with `setTimeout()`. The callback will
@@ -185,3 +178,10 @@ outside that range, it's changed to 1 millisecond. Broadly speaking, a timer
 cannot span more than 24.8 days.
 
 Returns an opaque value that represents the timer.
+
+[buffer section]: buffer.html
+[module system documentation]: modules.html
+[Modules]: modules.html#modules_modules
+[process object]: process.html#process_process
+[console]: console.html
+[timers]: timers.html
diff --git a/doc/api/http.markdown b/doc/api/http.markdown
index f36fcf77146174..51b2b57a3bae8d 100644
--- a/doc/api/http.markdown
+++ b/doc/api/http.markdown
@@ -56,13 +56,12 @@ require developers to manually close the HTTP clients using
 KeepAlive.
 
 If you opt into using HTTP KeepAlive, you can create an Agent object
-with that flag set to `true`.  (See the [constructor
-options](#http_new_agent_options) below.)  Then, the Agent will keep
-unused sockets in a pool for later use.  They will be explicitly
-marked so as to not keep the Node.js process running.  However, it is
-still a good idea to explicitly [`destroy()`](#http_agent_destroy)
-KeepAlive agents when they are no longer in use, so that the Sockets
-will be shut down.
+with that flag set to `true`.  (See the [constructor options][] below.)
+Then, the Agent will keep unused sockets in a pool for later use.  They
+will be explicitly marked so as to not keep the Node.js process running.
+However, it is still a good idea to explicitly [`destroy()`][] KeepAlive
+agents when they are no longer in use, so that the Sockets will be shut
+down.
 
 Sockets are removed from the agent's pool when the socket emits either
 a "close" event or a special "agentRemove" event. This means that if
@@ -506,8 +505,7 @@ already been bound to a port or domain socket.
 Listening on a file descriptor is not supported on Windows.
 
 This function is asynchronous. The last parameter `callback` will be added as
-a listener for the ['listening'](net.html#net_event_listening) event.
-See also [net.Server.listen()](net.html#net_server_listen_handle_callback).
+a listener for the ['listening'][] event. See also [net.Server.listen()][].
 
 ### server.listen(path[, callback])
 
@@ -958,7 +956,7 @@ connected to.
 
 ## http.createServer([requestListener])
 
-Returns a new instance of [http.Server](#http_class_http_server).
+Returns a new instance of [http.Server][].
 
 The `requestListener` is a function which is automatically
 added to the `'request'` event.
@@ -1085,6 +1083,8 @@ There are a few special headers that should be noted.
 * Sending an Authorization header will override using the `auth` option
   to compute basic authentication.
 
+[constructor options]: #http_new_agent_options
+[`destroy()`]: #http_agent_destroy
 ['checkContinue']: #http_event_checkcontinue
 ['listening']: net.html#net_event_listening
 ['response']: #http_event_response
@@ -1100,8 +1100,10 @@ There are a few special headers that should be noted.
 [http.Server]: #http_class_http_server
 [http.request]: #http_http_request_options_callback
 [net.Server.close()]: net.html#net_server_close_callback
+['listening']: net.html#net_event_listening
 [net.Server.listen(path)]: net.html#net_server_listen_path_callback
 [net.Server.listen(port)]: net.html#net_server_listen_port_hostname_backlog_callback
+[net.Server.listen()]: net.html#net_server_listen_handle_callback
 [response.end()]: #http_response_end_data_encoding_callback
 [response.write()]: #http_response_write_chunk_encoding_callback
 [response.writeContinue()]: #http_response_writecontinue
diff --git a/doc/api/https.markdown b/doc/api/https.markdown
index 1c3af5557b0072..b2e917b72a8709 100644
--- a/doc/api/https.markdown
+++ b/doc/api/https.markdown
@@ -74,7 +74,7 @@ See [http.listen()][] for details.
 Like `http.get()` but for HTTPS.
 
 `options` can be an object or a string. If `options` is a string, it is
-automatically parsed with [url.parse()](url.html#url_url_parse_urlstr_parsequerystring_slashesdenotehost).
+automatically parsed with [url.parse()][].
 
 Example:
 
@@ -96,26 +96,12 @@ Example:
 
 Global instance of [https.Agent][] for all HTTPS client requests.
 
-[http.Server#setTimeout()]: http.html#http_server_settimeout_msecs_callback
-[http.Server#timeout]: http.html#http_server_timeout
-[Agent]: #https_class_https_agent
-[globalAgent]: #https_https_globalagent
-[http.listen()]: http.html#http_server_listen_port_hostname_backlog_callback
-[http.close()]: http.html#http_server_close_callback
-[http.Agent]: http.html#http_class_http_agent
-[http.request()]: http.html#http_http_request_options_callback
-[https.Agent]: #https_class_https_agent
-[https.request()]: #https_https_request_options_callback
-[tls.connect()]: tls.html#tls_tls_connect_options_callback
-[tls.createServer()]: tls.html#tls_tls_createserver_options_secureconnectionlistener
-[SSL_METHODS]: http://www.openssl.org/docs/ssl/ssl.html#DEALING_WITH_PROTOCOL_METHODS
-
 ## https.request(options, callback)
 
 Makes a request to a secure web server.
 
 `options` can be an object or a string. If `options` is a string, it is
-automatically parsed with [url.parse()](url.html#url_url_parse_urlstr_parsequerystring_slashesdenotehost).
+automatically parsed with [url.parse()][].
 
 All options from [http.request()][] are valid.
 
@@ -226,3 +212,18 @@ Example:
     var req = https.request(options, function(res) {
       ...
     }
+
+[http.Server#setTimeout()]: http.html#http_server_settimeout_msecs_callback
+[http.Server#timeout]: http.html#http_server_timeout
+[Agent]: #https_class_https_agent
+[globalAgent]: #https_https_globalagent
+[http.listen()]: http.html#http_server_listen_port_hostname_backlog_callback
+[url.parse()]: url.html#url_url_parse_urlstr_parsequerystring_slashesdenotehost
+[http.close()]: http.html#http_server_close_callback
+[http.Agent]: http.html#http_class_http_agent
+[http.request()]: http.html#http_http_request_options_callback
+[https.Agent]: #https_class_https_agent
+[https.request()]: #https_https_request_options_callback
+[tls.connect()]: tls.html#tls_tls_connect_options_callback
+[tls.createServer()]: tls.html#tls_tls_createserver_options_secureconnectionlistener
+[SSL_METHODS]: http://www.openssl.org/docs/ssl/ssl.html#DEALING_WITH_PROTOCOL_METHODS
diff --git a/doc/api/modules.markdown b/doc/api/modules.markdown
index 8212bd07c67627..e9db1e4b225cbc 100644
--- a/doc/api/modules.markdown
+++ b/doc/api/modules.markdown
@@ -372,9 +372,7 @@ are not found elsewhere.  (Note: On Windows, `NODE_PATH` is delimited by
 semicolons instead of colons.)
 
 `NODE_PATH` was originally created to support loading modules from
-varying paths before the current
-[module resolution](https://nodejs.org/api/modules.html#modules_all_together)
-algorithm was frozen.
+varying paths before the current [module resolution][] algorithm was frozen.
 
 `NODE_PATH` is still supported, but is less necessary now that the Node.js
 ecosystem has settled on a convention for locating dependent modules.
@@ -519,3 +517,5 @@ Note that in order to do this, you must get a reference to the `module`
 object.  Since `require()` returns the `module.exports`, and the `module` is
 typically *only* available within a specific module's code, it must be
 explicitly exported in order to be used.
+
+[module resolution]: https://nodejs.org/api/modules.html#modules_all_together
diff --git a/doc/api/net.markdown b/doc/api/net.markdown
index c2d8fb3e7c3669..0a44c6535b3dec 100644
--- a/doc/api/net.markdown
+++ b/doc/api/net.markdown
@@ -493,12 +493,11 @@ written out - this may not be immediately.
 
 ## net.connect(options[, connectListener])
 
-A factory function, which returns a new ['net.Socket'](#net_class_net_socket)
-and automatically connects with the supplied `options`.
+A factory function, which returns a new ['net.Socket'][] and automatically
+connects with the supplied `options`.
 
-The options are passed to both the ['net.Socket'](#net_class_net_socket)
-constructor and the ['socket.connect'](#net_socket_connect_options_connectlistener)
-method.
+The options are passed to both the ['net.Socket'][] constructor and the
+['socket.connect'][] method.
 
 The `connectListener` parameter will be added as a listener for the
 ['connect'][] event once.
@@ -526,18 +525,16 @@ changed to
 
 ## net.connect(path[, connectListener])
 
-A factory function, which returns a new unix
-['net.Socket'](#net_class_net_socket) and automatically connects to the
-supplied `path`.
+A factory function, which returns a new unix ['net.Socket'][] and automatically
+connects to the supplied `path`.
 
 The `connectListener` parameter will be added as a listener for the
 ['connect'][] event once.
 
 ## net.connect(port[, host][, connectListener])
 
-A factory function, which returns a new
-['net.Socket'](#net_class_net_socket) and automatically connects to the
-supplied `port` and `host`.
+A factory function, which returns a new ['net.Socket'][] and automatically
+connects to the supplied `port` and `host`.
 
 If `host` is omitted, `'localhost'` will be assumed.
 
@@ -546,12 +543,11 @@ The `connectListener` parameter will be added as a listener for the
 
 ## net.createConnection(options[, connectListener])
 
-A factory function, which returns a new ['net.Socket'](#net_class_net_socket)
-and automatically connects with the supplied `options`.
+A factory function, which returns a new ['net.Socket'][] and automatically
+connects with the supplied `options`.
 
-The options are passed to both the ['net.Socket'](#net_class_net_socket)
-constructor and the ['socket.connect'](#net_socket_connect_options_connectlistener)
-method.
+The options are passed to both the ['net.Socket'][] constructor and the
+['socket.connect'][] method.
 
 The `connectListener` parameter will be added as a listener for the
 ['connect'][] event once.
@@ -579,18 +575,16 @@ changed to
 
 ## net.createConnection(path[, connectListener])
 
-A factory function, which returns a new unix
-['net.Socket'](#net_class_net_socket) and automatically connects to the
-supplied `path`.
+A factory function, which returns a new unix ['net.Socket'][] and automatically
+connects to the supplied `path`.
 
 The `connectListener` parameter will be added as a listener for the
 ['connect'][] event once.
 
 ## net.createConnection(port[, host][, connectListener])
 
-A factory function, which returns a new
-['net.Socket'](#net_class_net_socket) and automatically connects to the
-supplied `port` and `host`.
+A factory function, which returns a new ['net.Socket'][] and automatically
+connects to the supplied `port` and `host`.
 
 If `host` is omitted, `'localhost'` will be assumed.
 
@@ -672,4 +666,6 @@ Returns true if input is a version 6 IP address, otherwise returns false.
 [server.getConnections]: #net_server_getconnections_callback
 [Readable Stream]: stream.html#stream_class_stream_readable
 [stream.setEncoding()]: stream.html#stream_readable_setencoding_encoding
+['net.Socket']: #net_class_net_socket
 [dns.lookup()]: dns.html#dns_dns_lookup_hostname_options_callback
+['socket.connect']: #net_socket_connect_options_connectlistener
diff --git a/doc/api/process.markdown b/doc/api/process.markdown
index 24493f88803ade..327b16c82b4223 100644
--- a/doc/api/process.markdown
+++ b/doc/api/process.markdown
@@ -357,8 +357,7 @@ Returns the current working directory of the process.
 Close the IPC channel to the parent process, allowing this child to exit
 gracefully once there are no other connections keeping it alive.
 
-Identical to the parent process's
-[ChildProcess.disconnect()](child_process.html#child_process_child_disconnect).
+Identical to the parent process's [ChildProcess.disconnect()][].
 
 If Node.js was not spawned with an IPC channel, `process.disconnect()` will be
 undefined.
@@ -545,7 +544,7 @@ Some care needs to be taken when dropping privileges. Example:
 Send a signal to a process. `pid` is the process id and `signal` is the
 string describing the signal to send.  Signal names are strings like
 'SIGINT' or 'SIGHUP'.  If omitted, the signal will be 'SIGTERM'.
-See [Signal Events](#process_signal_events) and kill(2) for more information.
+See [Signal Events][] and kill(2) for more information.
 
 Will throw an error if target does not exist, and as a special case, a signal
 of `0` can be used to test for the existence of a process. Windows platforms
@@ -569,16 +568,14 @@ Example of sending a signal to yourself:
     process.kill(process.pid, 'SIGHUP');
 
 Note: When SIGUSR1 is received by Node.js it starts the debugger, see
-[Signal Events](#process_signal_events).
+[Signal Events][].
 
 ## process.mainModule
 
-Alternate way to retrieve
-[`require.main`](modules.html#modules_accessing_the_main_module).
-The difference is that if the main module changes at runtime, `require.main`
-might still refer to the original main module in modules that were required
-before the change occurred. Generally it's safe to assume that the two refer
-to the same module.
+Alternate way to retrieve [`require.main`][]. The difference is that if the main
+module changes at runtime, `require.main` might still refer to the original main
+module in modules that were required before the change occurred. Generally it's
+safe to assume that the two refer to the same module.
 
 As with `require.main`, it will be `undefined` if there was no entry script.
 
@@ -727,8 +724,7 @@ relied upon to exist.
 
 When Node.js is spawned with an IPC channel attached, it can send messages to its
 parent process using `process.send()`. Each will be received as a
-['message'](child_process.html#child_process_event_message)
-event on the parent's `ChildProcess` object.
+['message'][] event on the parent's `ChildProcess` object.
 
 If Node.js was not spawned with an IPC channel, `process.send()` will be undefined.
 
@@ -853,8 +849,7 @@ Example of opening standard input and listening for both events:
 
 As a Stream, `process.stdin` can also be used in "old" mode that is compatible
 with scripts written for node.js prior to v0.10.
-For more information see
-[Stream compatibility](stream.html#stream_compatibility_with_older_node_js_versions).
+For more information see [Stream compatibility][].
 
 In "old" Streams mode the stdin stream is paused by default, so one
 must call `process.stdin.resume()` to read from it. Note also that calling
@@ -892,7 +887,7 @@ on `process.stderr`, `process.stdout`, or `process.stdin`:
     $ node -p "Boolean(process.stdout.isTTY)" | cat
     false
 
-See [the tty docs](tty.html#tty_tty) for more information.
+See [the tty docs][] for more information.
 
 ## process.title
 
@@ -949,8 +944,13 @@ Will print something like:
       icu: '55.1',
       openssl: '1.0.1k' }
 
-
+[ChildProcess.disconnect()]: child_process.html#child_process_child_disconnect
 [ChildProcess.send()]: child_process.html#child_process_child_send_message_sendhandle_callback
+[Signal Events]: #process_signal_events
 [EventEmitter]: events.html#events_class_events_eventemitter
 [net.Server]: net.html#net_class_net_server
 [net.Socket]: net.html#net_class_net_socket
+[`require.main`]: modules.html#modules_accessing_the_main_module
+['message']: child_process.html#child_process_event_message
+[Stream compatibility]: stream.html#stream_compatibility_with_older_node_js_versions
+[the tty docs]: tty.html#tty_tty
diff --git a/doc/api/punycode.markdown b/doc/api/punycode.markdown
index f86b32ba50db66..c54a981fedb45b 100644
--- a/doc/api/punycode.markdown
+++ b/doc/api/punycode.markdown
@@ -2,9 +2,9 @@
 
     Stability: 2 - Stable
 
-[Punycode.js](https://mths.be/punycode) is bundled with Node.js v0.6.2+. Use
-`require('punycode')` to access it. (To use it with other Node.js versions, use
-npm to install the `punycode` module first.)
+[Punycode.js][] is bundled with Node.js v0.6.2+. Use `require('punycode')` to
+access it. (To use it with other Node.js versions, use npm to install the
+`punycode` module first.)
 
 ## punycode.decode(string)
 
@@ -47,8 +47,7 @@ you call it on a string that has already been converted to Unicode.
 ### punycode.ucs2.decode(string)
 
 Creates an array containing the numeric code point values of each Unicode
-symbol in the string. While [JavaScript uses UCS-2
-internally](http://mathiasbynens.be/notes/javascript-encoding), this function
+symbol in the string. While [JavaScript uses UCS-2 internally][], this function
 will convert a pair of surrogate halves (each of which UCS-2 exposes as
 separate characters) into a single code point, matching UTF-16.
 
@@ -66,3 +65,6 @@ Creates a string based on an array of numeric code point values.
 ## punycode.version
 
 A string representing the current Punycode.js version number.
+
+[Punycode.js]: https://mths.be/punycode
+[JavaScript uses UCS-2 internally]: http://mathiasbynens.be/notes/javascript-encoding
diff --git a/doc/api/stream.markdown b/doc/api/stream.markdown
index 90289b7cf7400c..caf9daeaf21362 100644
--- a/doc/api/stream.markdown
+++ b/doc/api/stream.markdown
@@ -3,8 +3,7 @@
     Stability: 2 - Stable
 
 A stream is an abstract interface implemented by various objects in
-Node.js.  For example a [request to an HTTP
-server](http.html#http_http_incomingmessage) is a stream, as is
+Node.js.  For example a [request to an HTTP server][] is a stream, as is
 [stdout][]. Streams are readable, writable, or both. All streams are
 instances of [EventEmitter][]
 
@@ -147,9 +146,9 @@ destinations drain and ask for more data.
 
 Examples of readable streams include:
 
-* [http responses, on the client](http.html#http_http_incomingmessage)
-* [http requests, on the server](http.html#http_http_incomingmessage)
-* [fs read streams](fs.html#fs_class_fs_readstream)
+* [http responses, on the client][]
+* [http requests, on the server][]
+* [fs read streams][]
 * [zlib streams][]
 * [crypto streams][]
 * [tcp sockets][]
@@ -559,13 +558,13 @@ that you are writing data *to*.
 
 Examples of writable streams include:
 
-* [http requests, on the client](http.html#http_class_http_clientrequest)
-* [http responses, on the server](http.html#http_class_http_serverresponse)
-* [fs write streams](fs.html#fs_class_fs_writestream)
+* [http requests, on the client][]
+* [http responses, on the server][]
+* [fs write streams][]
 * [zlib streams][]
 * [crypto streams][]
 * [tcp sockets][]
-* [child process stdin](child_process.html#child_process_child_stdin)
+* [child process stdin][]
 * [process.stdout][], [process.stderr][]
 
 #### Event: 'drain'
@@ -1677,6 +1676,7 @@ find that you have to use `stream.push('')`, please consider another
 approach, because it almost certainly indicates that something is
 horribly wrong.
 
+[request to an HTTP server]: http.html#http_http_incomingmessage
 [EventEmitter]: events.html#events_class_events_eventemitter
 [Object mode]: #stream_object_mode
 [`stream.push(chunk)`]: #stream_readable_push_chunk_encoding
@@ -1685,6 +1685,12 @@ horribly wrong.
 [`unpipe()`]: #stream_readable_unpipe_destination
 [unpiped]: #stream_readable_unpipe_destination
 [tcp sockets]: net.html#net_class_net_socket
+[http responses, on the client]: http.html#http_http_incomingmessage
+[http requests, on the server]: http.html#http_http_incomingmessage
+[http requests, on the client]: http.html#http_class_http_clientrequest
+[http responses, on the server]: http.html#http_class_http_serverresponse
+[fs read streams]: fs.html#fs_class_fs_readstream
+[fs write streams]: fs.html#fs_class_fs_writestream
 [zlib streams]: zlib.html
 [zlib]: zlib.html
 [crypto streams]: crypto.html
@@ -1695,6 +1701,7 @@ horribly wrong.
 [process.stdout]: process.html#process_process_stdout
 [process.stderr]: process.html#process_process_stderr
 [child process stdout and stderr]: child_process.html#child_process_child_stdout
+[child process stdin]: child_process.html#child_process_child_stdin
 [API for Stream Consumers]: #stream_api_for_stream_consumers
 [API for Stream Implementors]: #stream_api_for_stream_implementors
 [Readable]: #stream_class_stream_readable
diff --git a/doc/api/synopsis.markdown b/doc/api/synopsis.markdown
index a69273f78de8ac..f9e8b19ed6fcfe 100644
--- a/doc/api/synopsis.markdown
+++ b/doc/api/synopsis.markdown
@@ -2,7 +2,7 @@
 
 <!--type=misc-->
 
-An example of a [web server](http.html) written with Node.js which responds with
+An example of a [web server][] written with Node.js which responds with
 'Hello World':
 
     var http = require('http');
@@ -21,3 +21,5 @@ it with the node program
     Server running at http://127.0.0.1:8124/
 
 All of the examples in the documentation can be run similarly.
+
+[web server]: http.html
diff --git a/doc/api/tls.markdown b/doc/api/tls.markdown
index 7f21276c5409e0..60ad316ff5556f 100644
--- a/doc/api/tls.markdown
+++ b/doc/api/tls.markdown
@@ -339,9 +339,8 @@ of written data and all required TLS negotiation.
 This instance implements a duplex [Stream][] interfaces.  It has all the
 common stream methods and events.
 
-Methods that return TLS connection meta data (e.g.
-[getPeerCertificate](#tlssocketgetpeercertificate-detailed-))
-will only return data while the connection is open.
+Methods that return TLS connection meta data (e.g. [getPeerCertificate][] will
+only return data while the connection is open.
 
 ### new tls.TLSSocket(socket[, options])
 
@@ -940,3 +939,4 @@ Example:
 [OCSP request]: http://en.wikipedia.org/wiki/OCSP_stapling
 [TLS recommendations]: https://wiki.mozilla.org/Security/Server_Side_TLS
 [TLS Session Tickets]: https://www.ietf.org/rfc/rfc5077.txt
+[getPeerCertificate]: #tls_tlssocket_getpeercertificate_detailed
diff --git a/doc/api/tty.markdown b/doc/api/tty.markdown
index acb3bb480bb774..279a1dd0b9440e 100644
--- a/doc/api/tty.markdown
+++ b/doc/api/tty.markdown
@@ -32,8 +32,6 @@ of the `tty.ReadStream` instance.
 `tty.ReadStream` to act either as a raw device or default. `isRaw` will be set
 to the resulting mode.
 
-[tty.ReadStream#setRawMode]: #tty_rs_setrawmode_mode
-
 ## Class: WriteStream
 
 A `net.Socket` subclass that represents the writable portion of a tty. In normal
@@ -70,3 +68,5 @@ terminal.
 ## tty.setRawMode(mode)
 
     Stability: 0 - Deprecated: Use [tty.ReadStream#setRawMode][] (i.e. process.stdin.setRawMode) instead.
+
+[tty.ReadStream#setRawMode]: #tty_rs_setrawmode_mode
diff --git a/doc/api/util.markdown b/doc/api/util.markdown
index 56f38e12362b7b..b1ab10a81e094f 100644
--- a/doc/api/util.markdown
+++ b/doc/api/util.markdown
@@ -116,10 +116,9 @@ Each argument is converted to a string with `util.inspect()`.
 
 ## util.inherits(constructor, superConstructor)
 
-Inherit the prototype methods from one
-[constructor](https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Object/constructor)
-into another.  The prototype of `constructor` will be set to a new
-object created from `superConstructor`.
+Inherit the prototype methods from one [constructor][] into another.  The
+prototype of `constructor` will be set to a new object created from
+`superConstructor`.
 
 As an additional convenience, `superConstructor` will be accessible
 through the `constructor.super_` property.
@@ -505,3 +504,5 @@ Deprecated predecessor of `stream.pipe()`.
     Stability: 0 - Deprecated: Use console.log() instead.
 
 Deprecated predecessor of `console.log`.
+
+[constructor]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Object/constructor
diff --git a/doc/api/v8.markdown b/doc/api/v8.markdown
index 1ed2179d8155ea..ea0d04d25b7efd 100644
--- a/doc/api/v8.markdown
+++ b/doc/api/v8.markdown
@@ -29,8 +29,7 @@ crashes and data loss.  Or it may simply do nothing.
 
 The V8 options available for a version of node.js may be determined by running
 `node --v8-options`.  An unofficial, community-maintained list of options
-and their effects is available
-[here](https://github.com/thlorenz/v8-flags/blob/master/flags-0.11.md).
+and their effects is available [here][].
 
 Usage:
 
@@ -42,3 +41,4 @@ setTimeout(function() { v8.setFlagsFromString('--notrace_gc'); }, 60e3);
 ```
 
 [V8]: https://code.google.com/p/v8/
+[here]: https://github.com/thlorenz/v8-flags/blob/master/flags-0.11.md
diff --git a/doc/api/vm.markdown b/doc/api/vm.markdown
index 20bca8770286ab..870a9551215abf 100644
--- a/doc/api/vm.markdown
+++ b/doc/api/vm.markdown
@@ -137,7 +137,7 @@ If given a `sandbox` object, will "contextify" that sandbox so that it can be
 used in calls to `vm.runInContext` or `script.runInContext`. Inside scripts run
 as such, `sandbox` will be the global object, retaining all its existing
 properties but also having the built-in objects and functions any standard
-[global object][2] has. Outside of scripts run by the vm module, `sandbox` will
+[global object][] has. Outside of scripts run by the vm module, `sandbox` will
 be unchanged.
 
 If not given a sandbox object, returns a new, empty contextified sandbox object
@@ -148,8 +148,6 @@ scripts, e.g. if you were emulating a web browser it could be used to create a
 single sandbox representing a window's global object, then run all `<script>`
 tags together inside that sandbox.
 
-[2]: http://es5.github.io/#x15.1
-
 ## vm.isContext(sandbox)
 
 Returns whether or not a sandbox object has been contextified by calling
@@ -249,7 +247,7 @@ Example of using `vm.runInThisContext` and `eval` to run the same code:
 `vm.runInThisContext` does not have access to the local scope, so `localVar` is
 unchanged. `eval` does have access to the local scope, so `localVar` is changed.
 
-In this way `vm.runInThisContext` is much like an [indirect `eval` call][1],
+In this way `vm.runInThisContext` is much like an [indirect `eval` call][],
 e.g. `(0,eval)('code')`. However, it also has the following additional options:
 
 - `filename`: allows you to control the filename that shows up in any stack
@@ -261,4 +259,5 @@ e.g. `(0,eval)('code')`. However, it also has the following additional options:
 - `timeout`: a number of milliseconds to execute `code` before terminating
   execution. If execution is terminated, an `Error` will be thrown.
 
-[1]: http://es5.github.io/#x10.4.2
+[indirect `eval` call]: http://es5.github.io/#x10.4.2
+[global object]: http://es5.github.io/#x15.1
diff --git a/doc/api/zlib.markdown b/doc/api/zlib.markdown
index 08f8fbdf7719e1..8c3254dc3780f8 100644
--- a/doc/api/zlib.markdown
+++ b/doc/api/zlib.markdown
@@ -39,17 +39,13 @@ the convenience methods.
       }
     });
 
-To use this module in an HTTP client or server, use the
-[accept-encoding](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.3)
-on requests, and the
-[content-encoding](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11)
-header on responses.
+To use this module in an HTTP client or server, use the [accept-encoding][]
+on requests, and the [content-encoding][] header on responses.
 
 **Note: these examples are drastically simplified to show
 the basic concept.**  Zlib encoding can be expensive, and the results
-ought to be cached.  See [Memory Usage Tuning](#zlib_memory_usage_tuning)
-below for more information on the speed/memory/compression
-tradeoffs involved in zlib usage.
+ought to be cached.  See [Memory Usage Tuning][] below for more information
+on the speed/memory/compression tradeoffs involved in zlib usage.
 
     // client request example
     var zlib = require('zlib');
@@ -151,9 +147,9 @@ All of the constants defined in zlib.h are also defined on
 `require('zlib')`.
 In the normal course of operations, you will not need to ever set any of
 these.  They are documented here so that their presence is not
-surprising.  This section is taken almost directly from the [zlib
-documentation](http://zlib.net/manual.html#Constants).  See
-<http://zlib.net/manual.html#Constants> for more details.
+surprising.  This section is taken almost directly from the
+[zlib documentation][].  See <http://zlib.net/manual.html#Constants> for more
+details.
 
 Allowed flush values.
 
@@ -282,38 +278,31 @@ the inflate and deflate algorithms.
 
 ## zlib.createDeflate([options])
 
-Returns a new [Deflate](#zlib_class_zlib_deflate) object with an
-[options](#zlib_options).
+Returns a new [Deflate][] object with an [options][].
 
 ## zlib.createDeflateRaw([options])
 
-Returns a new [DeflateRaw](#zlib_class_zlib_deflateraw) object with an
-[options](#zlib_options).
+Returns a new [DeflateRaw][] object with an [options][].
 
 ## zlib.createGunzip([options])
 
-Returns a new [Gunzip](#zlib_class_zlib_gunzip) object with an
-[options](#zlib_options).
+Returns a new [Gunzip][] object with an [options][].
 
 ## zlib.createGzip([options])
 
-Returns a new [Gzip](#zlib_class_zlib_gzip) object with an
-[options](#zlib_options).
+Returns a new [Gzip][] object with an [options][].
 
 ## zlib.createInflate([options])
 
-Returns a new [Inflate](#zlib_class_zlib_inflate) object with an
-[options](#zlib_options).
+Returns a new [Inflate][] object with an [options][].
 
 ## zlib.createInflateRaw([options])
 
-Returns a new [InflateRaw](#zlib_class_zlib_inflateraw) object with an
-[options](#zlib_options).
+Returns a new [InflateRaw][] object with an [options][].
 
 ## zlib.createUnzip([options])
 
-Returns a new [Unzip](#zlib_class_zlib_unzip) object with an
-[options](#zlib_options).
+Returns a new [Unzip][] object with an [options][].
 
 ## Convenience Methods
 
@@ -366,3 +355,16 @@ Decompress a raw Buffer with Inflate.
 ### zlib.unzipSync(buf[, options])
 
 Decompress a raw Buffer with Unzip.
+
+[accept-encoding]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.3
+[content-encoding]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11
+[Memory Usage Tuning]: #zlib_memory_usage_tuning
+[zlib documentation]: http://zlib.net/manual.html#Constants
+[options]: #zlib_options
+[Deflate]: #zlib_class_zlib_deflate
+[DeflateRaw]: #zlib_class_zlib_deflateraw
+[Gunzip]: #zlib_class_zlib_gunzip
+[Gzip]: #zlib_class_zlib_gzip
+[Inflate]: #zlib_class_zlib_inflate
+[InflateRaw]: #zlib_class_zlib_inflateraw
+[Unzip]: #zlib_class_zlib_unzip

From 66dccaf0cd9f749d6985e0db6cb41c4d40d4b73a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20B=C3=B6hm?= <me@feedic.com>
Date: Thu, 13 Aug 2015 20:21:30 +0200
Subject: [PATCH 206/323] debugger: also exit when the repl emits 'exit'

Exit the debug repl when repl emits 'exit'

Refs: https://github.com/nodejs/node-v0.x-archive/issues/5637
Fixes: https://github.com/nodejs/node-v0.x-archive/issues/5631
PR-URL: https://github.com/nodejs/node/pull/2369
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/_debugger.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/_debugger.js b/lib/_debugger.js
index 9f8fa26f2189c3..cbf7f7a5ed5397 100644
--- a/lib/_debugger.js
+++ b/lib/_debugger.js
@@ -1546,8 +1546,7 @@ Interface.prototype.repl = function() {
   var listeners = this.repl.rli.listeners('SIGINT').slice(0);
   this.repl.rli.removeAllListeners('SIGINT');
 
-  // Exit debug repl on Ctrl + C
-  this.repl.rli.once('SIGINT', function() {
+  function exitDebugRepl() {
     // Restore all listeners
     process.nextTick(function() {
       listeners.forEach(function(listener) {
@@ -1557,7 +1556,16 @@ Interface.prototype.repl = function() {
 
     // Exit debug repl
     self.exitRepl();
-  });
+
+    self.repl.rli.removeListener('SIGINT', exitDebugRepl);
+    self.repl.removeListener('exit', exitDebugRepl);
+  }
+
+  // Exit debug repl on SIGINT
+  this.repl.rli.on('SIGINT', exitDebugRepl);
+
+  // Exit debug repl on repl exit
+  this.repl.on('exit', exitDebugRepl);
 
   // Set new
   this.repl.eval = this.debugEval.bind(this);

From 7ecd5422c8e3174f21b29be93f1b4a65e436baf0 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Sat, 14 Nov 2015 15:53:05 -0800
Subject: [PATCH 207/323] doc: address use of profanity in code of conduct

PR-URL: https://github.com/nodejs/node/pull/3827
Reviewed-By: Brian White <mscdex@mscdex.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
---
 CODE_OF_CONDUCT.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index b08bf7faa33db0..015c2b9d692f9c 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -10,6 +10,8 @@ CoC](http://www.rust-lang.org/conduct.html).
   might detract from a friendly, safe and welcoming environment for
   all.
 * Please be kind and courteous. There's no need to be mean or rude.
+* Respect that some individuals and cultures consider the casual use of
+  profanity offensive and off-putting.
 * Respect that people have differences of opinion and that every
   design or implementation choice carries a trade-off and numerous
   costs. There is seldom a right answer.

From 19a36ff35575590b35ab85de25edf8bb5a43dafc Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 14 Nov 2015 20:43:27 -0800
Subject: [PATCH 208/323] test: fix flaky SmartOS test

SmartOS has an issue where it will trigger ECONNREFUSED when it should
not. See https://smartos.org/bugview/OS-2767.

This change adds logic to test-net-server-max-connections.js to work
around the issue.

Fixes: https://github.com/nodejs/node/issues/2663
PR-URL: https://github.com/nodejs/node/pull/3830
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 .../test-net-server-max-connections.js        | 63 ++++++++++---------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/test/parallel/test-net-server-max-connections.js b/test/parallel/test-net-server-max-connections.js
index 8de27d13eb4f6b..2b418e1c3c7bf4 100644
--- a/test/parallel/test-net-server-max-connections.js
+++ b/test/parallel/test-net-server-max-connections.js
@@ -36,6 +36,35 @@ function makeConnection(index) {
     if (index + 1 < N) {
       makeConnection(index + 1);
     }
+
+    c.on('close', function() {
+      console.error('closed %d', index);
+      closes++;
+
+      if (closes < N / 2) {
+        assert.ok(server.maxConnections <= index,
+                  index +
+                  ' was one of the first closed connections ' +
+                  'but shouldnt have been');
+      }
+
+      if (closes === N / 2) {
+        var cb;
+        console.error('calling wait callback.');
+        while (cb = waits.shift()) {
+          cb();
+        }
+        server.close();
+      }
+
+      if (index < server.maxConnections) {
+        assert.equal(true, gotData,
+                     index + ' didn\'t get data, but should have');
+      } else {
+        assert.equal(false, gotData,
+                     index + ' got data, but shouldn\'t have');
+      }
+    });
   });
 
   c.on('end', function() { c.end(); });
@@ -46,36 +75,12 @@ function makeConnection(index) {
   });
 
   c.on('error', function(e) {
-    console.error('error %d: %s', index, e);
-  });
-
-  c.on('close', function() {
-    console.error('closed %d', index);
-    closes++;
-
-    if (closes < N / 2) {
-      assert.ok(server.maxConnections <= index,
-                index +
-                ' was one of the first closed connections ' +
-                'but shouldnt have been');
-    }
-
-    if (closes === N / 2) {
-      var cb;
-      console.error('calling wait callback.');
-      while (cb = waits.shift()) {
-        cb();
-      }
-      server.close();
-    }
-
-    if (index < server.maxConnections) {
-      assert.equal(true, gotData,
-                   index + ' didn\'t get data, but should have');
-    } else {
-      assert.equal(false, gotData,
-                   index + ' got data, but shouldn\'t have');
+    // Retry if SmartOS and ECONNREFUSED. See
+    // https://github.com/nodejs/node/issues/2663.
+    if (common.isSunOS && (e.code === 'ECONNREFUSED')) {
+      c.connect(common.PORT);
     }
+    console.error('error %d: %s', index, e);
   });
 }
 

From 7bff0138e2356aa1f7d6d30058329bfe11440369 Mon Sep 17 00:00:00 2001
From: "P.S.V.R" <pmq2001@gmail.com>
Date: Mon, 16 Nov 2015 10:59:07 +0800
Subject: [PATCH 209/323] buffer: let WriteFloatGeneric silently drop values

Documentation currently states that setting noAssert and passing a value
larger than can fit in the Buffer will cause data to be silently
dropped. Change implementation to match documented behavior.

Fixes: https://github.com/nodejs/node/issues/3766
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 src/node_buffer.cc                       | 8 +++++---
 test/parallel/test-buffer-arraybuffer.js | 7 +++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/node_buffer.cc b/src/node_buffer.cc
index e4af4909ffbe59..b508c48c4742e4 100644
--- a/src/node_buffer.cc
+++ b/src/node_buffer.cc
@@ -735,7 +735,9 @@ uint32_t WriteFloatGeneric(const FunctionCallbackInfo<Value>& args) {
 
   T val = args[1]->NumberValue();
   uint32_t offset = args[2]->Uint32Value();
-  CHECK_LE(offset + sizeof(T), ts_obj_length);
+  size_t memcpy_num = sizeof(T);
+  if (offset + sizeof(T) > ts_obj_length)
+    memcpy_num = ts_obj_length - offset;
 
   union NoAlias {
     T val;
@@ -746,8 +748,8 @@ uint32_t WriteFloatGeneric(const FunctionCallbackInfo<Value>& args) {
   char* ptr = static_cast<char*>(ts_obj_data) + offset;
   if (endianness != GetEndianness())
     Swizzle(na.bytes, sizeof(na.bytes));
-  memcpy(ptr, na.bytes, sizeof(na.bytes));
-  return offset + sizeof(na.bytes);
+  memcpy(ptr, na.bytes, memcpy_num);
+  return offset + memcpy_num;
 }
 
 
diff --git a/test/parallel/test-buffer-arraybuffer.js b/test/parallel/test-buffer-arraybuffer.js
index c13d0ba4118aad..c25de262ea9779 100644
--- a/test/parallel/test-buffer-arraybuffer.js
+++ b/test/parallel/test-buffer-arraybuffer.js
@@ -44,3 +44,10 @@ assert.throws(function() {
   AB.prototype.__proto__ = ArrayBuffer.prototype;
   new Buffer(new AB());
 }, TypeError);
+
+// write{Double,Float}{LE,BE} with noAssert should not crash, cf. #3766
+var b = new Buffer(1);
+b.writeFloatLE(11.11, 0, true);
+b.writeFloatBE(11.11, 0, true);
+b.writeDoubleLE(11.11, 0, true);
+b.writeDoubleBE(11.11, 0, true);

From 047abbd6ebdce81bcf8ce74387e5819d6ddf9006 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Mon, 16 Nov 2015 21:17:16 -0800
Subject: [PATCH 210/323] test: move test-specific function out of common
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

common.checkSpawnSyncRet is only used in one test. Move it out of
common.js and into that test (test-child-process-spawnsync-input.js).

PR-URL: https://github.com/nodejs/node/pull/3871
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/common.js                                |  5 --
 .../test-child-process-spawnsync-input.js     | 47 ++++++++++---------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/test/common.js b/test/common.js
index a017275a6a627f..572a1dcf982e46 100644
--- a/test/common.js
+++ b/test/common.js
@@ -380,11 +380,6 @@ exports.mustCall = function(fn, expected) {
   };
 };
 
-exports.checkSpawnSyncRet = function(ret) {
-  assert.strictEqual(ret.status, 0);
-  assert.strictEqual(ret.error, undefined);
-};
-
 var etcServicesFileName = path.join('/etc', 'services');
 if (exports.isWindows) {
   etcServicesFileName = path.join(process.env.SystemRoot, 'System32', 'drivers',
diff --git a/test/parallel/test-child-process-spawnsync-input.js b/test/parallel/test-child-process-spawnsync-input.js
index f043d0c5e355f1..d978bd80bc81cd 100644
--- a/test/parallel/test-child-process-spawnsync-input.js
+++ b/test/parallel/test-child-process-spawnsync-input.js
@@ -1,18 +1,18 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
-var os = require('os');
+require('../common');
 
-var spawnSync = require('child_process').spawnSync;
+const assert = require('assert');
 
-var msgOut = 'this is stdout';
-var msgErr = 'this is stderr';
+const spawnSync = require('child_process').spawnSync;
+
+const msgOut = 'this is stdout';
+const msgErr = 'this is stderr';
 
 // this is actually not os.EOL?
-var msgOutBuf = new Buffer(msgOut + '\n');
-var msgErrBuf = new Buffer(msgErr + '\n');
+const msgOutBuf = new Buffer(msgOut + '\n');
+const msgErrBuf = new Buffer(msgErr + '\n');
 
-var args = [
+const args = [
   '-e',
   `console.log("${msgOut}"); console.error("${msgErr}");`
 ];
@@ -20,31 +20,34 @@ var args = [
 var ret;
 
 
+function checkSpawnSyncRet(ret) {
+  assert.strictEqual(ret.status, 0);
+  assert.strictEqual(ret.error, undefined);
+};
+
+function verifyBufOutput(ret) {
+  checkSpawnSyncRet(ret);
+  assert.deepEqual(ret.stdout, msgOutBuf);
+  assert.deepEqual(ret.stderr, msgErrBuf);
+}
+
 if (process.argv.indexOf('spawnchild') !== -1) {
   switch (process.argv[3]) {
     case '1':
       ret = spawnSync(process.execPath, args, { stdio: 'inherit' });
-      common.checkSpawnSyncRet(ret);
+      checkSpawnSyncRet(ret);
       break;
     case '2':
       ret = spawnSync(process.execPath, args, {
         stdio: ['inherit', 'inherit', 'inherit']
       });
-      common.checkSpawnSyncRet(ret);
+      checkSpawnSyncRet(ret);
       break;
   }
   process.exit(0);
   return;
 }
 
-
-function verifyBufOutput(ret) {
-  common.checkSpawnSyncRet(ret);
-  assert.deepEqual(ret.stdout, msgOutBuf);
-  assert.deepEqual(ret.stderr, msgErrBuf);
-}
-
-
 verifyBufOutput(spawnSync(process.execPath, [__filename, 'spawnchild', 1]));
 verifyBufOutput(spawnSync(process.execPath, [__filename, 'spawnchild', 2]));
 
@@ -63,7 +66,7 @@ options = {
 
 ret = spawnSync('cat', [], options);
 
-common.checkSpawnSyncRet(ret);
+checkSpawnSyncRet(ret);
 assert.strictEqual(ret.stdout.toString('utf8'), options.input);
 assert.strictEqual(ret.stderr.toString('utf8'), '');
 
@@ -73,7 +76,7 @@ options = {
 
 ret = spawnSync('cat', [], options);
 
-common.checkSpawnSyncRet(ret);
+checkSpawnSyncRet(ret);
 assert.deepEqual(ret.stdout, options.input);
 assert.deepEqual(ret.stderr, new Buffer(''));
 
@@ -81,7 +84,7 @@ verifyBufOutput(spawnSync(process.execPath, args));
 
 ret = spawnSync(process.execPath, args, { encoding: 'utf8' });
 
-common.checkSpawnSyncRet(ret);
+checkSpawnSyncRet(ret);
 assert.strictEqual(ret.stdout, msgOut + '\n');
 assert.strictEqual(ret.stderr, msgErr + '\n');
 

From df1fdba2ae6fa97cbdd44a4ef11256a799910e7b Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Mon, 16 Nov 2015 12:11:50 -0500
Subject: [PATCH 211/323] doc: sort repl alphabetically

Reorders, with no contextual changes, the repl documentation with class
definitions at the top and alphabetically.

PR-URL: https://github.com/nodejs/node/pull/3859
Reviewed-By: Roman Klauke <romaaan.git@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/repl.markdown | 166 +++++++++++++++++++++---------------------
 1 file changed, 83 insertions(+), 83 deletions(-)

diff --git a/doc/api/repl.markdown b/doc/api/repl.markdown
index 55a77416ab09f4..8961bb3fb54215 100644
--- a/doc/api/repl.markdown
+++ b/doc/api/repl.markdown
@@ -138,6 +138,89 @@ and try to print `obj` in REPL, it will invoke the custom `inspect()` function:
     > obj
     { bar: 'baz' }
 
+## Class: REPLServer
+
+This inherits from [Readline Interface][] with the following events:
+
+### Event: 'exit'
+
+`function () {}`
+
+Emitted when the user exits the REPL in any of the defined ways. Namely, typing
+`.exit` at the repl, pressing Ctrl+C twice to signal SIGINT, or pressing Ctrl+D
+to signal "end" on the `input` stream.
+
+Example of listening for `exit`:
+
+    replServer.on('exit', function () {
+      console.log('Got "exit" event from repl!');
+      process.exit();
+    });
+
+
+### Event: 'reset'
+
+`function (context) {}`
+
+Emitted when the REPL's context is reset. This happens when you type `.clear`.
+If you start the repl with `{ useGlobal: true }` then this event will never
+be emitted.
+
+Example of listening for `reset`:
+
+    // Extend the initial repl context.
+    var replServer = repl.start({ options ... });
+    someExtension.extend(r.context);
+
+    // When a new context is created extend it as well.
+    replServer.on('reset', function (context) {
+      console.log('repl has a new context');
+      someExtension.extend(context);
+    });
+
+### replServer.defineCommand(keyword, cmd)
+
+* `keyword` {String}
+* `cmd` {Object|Function}
+
+Makes a command available in the REPL. The command is invoked by typing a `.`
+followed by the keyword. The `cmd` is an object with the following values:
+
+ - `help` - help text to be displayed when `.help` is entered (Optional).
+ - `action` - a function to execute, potentially taking in a string argument,
+   when the command is invoked, bound to the REPLServer instance (Required).
+
+If a function is provided instead of an object for `cmd`, it is treated as the
+`action`.
+
+Example of defining a command:
+
+    // repl_test.js
+    var repl = require('repl');
+
+    var replServer = repl.start();
+    replServer.defineCommand('sayhello', {
+      help: 'Say hello',
+      action: function(name) {
+        this.write('Hello, ' + name + '!\n');
+        this.displayPrompt();
+      }
+    });
+
+Example of invoking that command from the REPL:
+
+    > .sayhello Node.js User
+    Hello, Node.js User!
+
+### replServer.displayPrompt([preserveCursor])
+
+* `preserveCursor` {Boolean}
+
+Like [readline.prompt][] except also adding indents with ellipses when inside
+blocks. The `preserveCursor` argument is passed to [readline.prompt][]. This is
+used primarily with `defineCommand`. It's also used internally to render each
+prompt line.
+
 ## repl.start(options)
 
 Returns and starts a `REPLServer` instance, that inherits from
@@ -240,89 +323,6 @@ a `net.Server` and `net.Socket` instance, see: https://gist.github.com/2209310
 For an example of running a REPL instance over `curl(1)`,
 see: https://gist.github.com/2053342
 
-## Class: REPLServer
-
-This inherits from [Readline Interface][] with the following events:
-
-### Event: 'exit'
-
-`function () {}`
-
-Emitted when the user exits the REPL in any of the defined ways. Namely, typing
-`.exit` at the repl, pressing Ctrl+C twice to signal SIGINT, or pressing Ctrl+D
-to signal "end" on the `input` stream.
-
-Example of listening for `exit`:
-
-    replServer.on('exit', function () {
-      console.log('Got "exit" event from repl!');
-      process.exit();
-    });
-
-
-### Event: 'reset'
-
-`function (context) {}`
-
-Emitted when the REPL's context is reset. This happens when you type `.clear`.
-If you start the repl with `{ useGlobal: true }` then this event will never
-be emitted.
-
-Example of listening for `reset`:
-
-    // Extend the initial repl context.
-    var replServer = repl.start({ options ... });
-    someExtension.extend(r.context);
-
-    // When a new context is created extend it as well.
-    replServer.on('reset', function (context) {
-      console.log('repl has a new context');
-      someExtension.extend(context);
-    });
-
-### replServer.defineCommand(keyword, cmd)
-
-* `keyword` {String}
-* `cmd` {Object|Function}
-
-Makes a command available in the REPL. The command is invoked by typing a `.`
-followed by the keyword. The `cmd` is an object with the following values:
-
- - `help` - help text to be displayed when `.help` is entered (Optional).
- - `action` - a function to execute, potentially taking in a string argument,
-   when the command is invoked, bound to the REPLServer instance (Required).
-
-If a function is provided instead of an object for `cmd`, it is treated as the
-`action`.
-
-Example of defining a command:
-
-    // repl_test.js
-    var repl = require('repl');
-
-    var replServer = repl.start();
-    replServer.defineCommand('sayhello', {
-      help: 'Say hello',
-      action: function(name) {
-        this.write('Hello, ' + name + '!\n');
-        this.displayPrompt();
-      }
-    });
-
-Example of invoking that command from the REPL:
-
-    > .sayhello Node.js User
-    Hello, Node.js User!
-
-### replServer.displayPrompt([preserveCursor])
-
-* `preserveCursor` {Boolean}
-
-Like [readline.prompt][] except also adding indents with ellipses when inside
-blocks. The `preserveCursor` argument is passed to [readline.prompt][]. This is
-used primarily with `defineCommand`. It's also used internally to render each
-prompt line.
-
 [Readline Interface]: readline.html#readline_class_interface
 [readline.prompt]: readline.html#readline_rl_prompt_preservecursor
 [util.inspect()]: util.html#util_util_inspect_object_options

From 5c54fa0095759cb414f89a1971f28fe03b78e3be Mon Sep 17 00:00:00 2001
From: Evan Lucas <evanlucas@me.com>
Date: Mon, 16 Nov 2015 18:50:14 -0600
Subject: [PATCH 212/323] module: cache regular expressions

None of these regular expressions will change, so there is no need to
generate them every time in hot code paths.

Provides a small performance improvement in module loading. (5-10%)

PR-URL: https://github.com/nodejs/node/pull/3869
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/module.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/module.js b/lib/module.js
index 0da2398ba6872d..507ca83c1bca17 100644
--- a/lib/module.js
+++ b/lib/module.js
@@ -11,6 +11,9 @@ const path = require('path');
 const internalModuleReadFile = process.binding('fs').internalModuleReadFile;
 const internalModuleStat = process.binding('fs').internalModuleStat;
 
+const splitRe = process.platform === 'win32' ? /[\/\\]/ : /\//;
+const isIndexRe = /^index\.\w+?$/;
+const shebangRe = /^\#\!.*/;
 
 // If obj.hasOwnProperty has been overridden, then calling
 // obj.hasOwnProperty(prop) will break.
@@ -191,7 +194,6 @@ Module._nodeModulePaths = function(from) {
   // note: this approach *only* works when the path is guaranteed
   // to be absolute.  Doing a fully-edge-case-correct path.split
   // that works on both Windows and Posix is non-trivial.
-  var splitRe = process.platform === 'win32' ? /[\/\\]/ : /\//;
   var paths = [];
   var parts = from.split(splitRe);
 
@@ -244,7 +246,7 @@ Module._resolveLookupPaths = function(request, parent) {
   // Is the parent an index module?
   // We can assume the parent has a valid extension,
   // as it already has been accepted as a module.
-  var isIndex = /^index\.\w+?$/.test(path.basename(parent.filename));
+  var isIndex = isIndexRe.test(path.basename(parent.filename));
   var parentIdPath = isIndex ? parent.id : path.dirname(parent.id);
   var id = path.resolve(parentIdPath, request);
 
@@ -377,7 +379,7 @@ var resolvedArgv;
 Module.prototype._compile = function(content, filename) {
   var self = this;
   // remove shebang
-  content = content.replace(/^\#\!.*/, '');
+  content = content.replace(shebangRe, '');
 
   function require(path) {
     return self.require(path);

From 60d3daa65ccb8af4b793af2543f7270b838c4ada Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Thu, 22 Oct 2015 00:09:33 -0400
Subject: [PATCH 213/323] doc: replace head of readme with updated text

PR-URL: https://github.com/nodejs/node/pull/3482
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
---
 README.md | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index e7db6624f56277..dac689bdba18e6 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,16 @@
-
 Node.js
-=====
+=======
 
 [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/nodejs/node?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-This repository began as a GitHub fork of
-[joyent/node](https://github.com/joyent/node).
-
-Node.js contributions, releases, and contributorship are under an
-[open governance model](./GOVERNANCE.md).
-We intend to land, with increasing regularity, releases which are
-compatible with the npm ecosystem that has been built to date for
-Node.js.
+The Node.js project is supported by the
+[Node.js Foundation](https://nodejs.org/en/foundation/). Contributions,
+policies and releases are managed under an
+[open governance model](./GOVERNANCE.md). We are also bound by a
+[Code of Conduct](./CODE_OF_CONDUCT.md).
 
-We also have a Code of Conduct. [Please read it.](./CODE_OF_CONDUCT.md)
+If you need help using or installing Node.js, please use the
+[nodejs/help](https://github.com/nodejs/help) issue tracker.
 
 ## Download
 

From ea67d870f4a5789e71875d6f2f75a97253e942b8 Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Thu, 22 Oct 2015 00:47:36 -0400
Subject: [PATCH 214/323] doc: document release types in readme

PR-URL: https://github.com/nodejs/node/pull/3482
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
---
 README.md | 48 ++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index dac689bdba18e6..bf8787241769d9 100644
--- a/README.md
+++ b/README.md
@@ -12,14 +12,45 @@ policies and releases are managed under an
 If you need help using or installing Node.js, please use the
 [nodejs/help](https://github.com/nodejs/help) issue tracker.
 
+## Release Types
+
+The Node.js project maintains multiple types of releases:
+
+* **Stable**: Released from active development branches of this repository,
+  versioned by [SemVer](http://semver.org/) and signed by a member of the
+  [Release Team](#release-team).
+  Code for Stable releases is organized in this repository by major version
+  number, For example: [v4.x](https://github.com/nodejs/node/tree/v4.x).
+  The major version number of Stable releases will increment every 6 months
+  allowing for breaking changes to be introduced. This happens in April and
+  October every year. Stable release lines beginning in October each year have
+  a maximum support life of 8 months. Stable release lines beginning in April
+  each year will convert to LTS (see below) after 6 months and receive further
+  support for 30 months.
+* **LTS**: Releases that receive Long-term Support, with a focus on stability
+  and security. Every second Stable release line (major version) will become an
+  LTS line and receive 18 months of _Active LTS_ support and a further 12
+  months of _Maintenance_. LTS release lines are given alphabetically
+  ordered codenames, begining with v4 Argon. LTS releases are less frequent
+  and will attempt to maintain consistent major and minor version numbers,
+  only incrementing patch version numbers. There are no breaking changes or
+  feature additions, except in some special circumstances. More information
+  can be found in the [LTS README](https://github.com/nodejs/LTS/).
+* **Nightly**: Versions of code in this repository on the current Stable
+  branch, automatically built every 24-hours where changes exist. Use with
+  caution.
+
 ## Download
 
 Binaries, installers, and source tarballs are available at
 <https://nodejs.org>.
 
-**Releases** are available at <https://nodejs.org/dist/>, listed under
-their version string. The <https://nodejs.org/dist/latest/> symlink
-will point to the latest release directory.
+**Stable** and **LTS** releases are available at
+<https://nodejs.org/download/release/>, listed under their version strings.
+The [latest](https://nodejs.org/download/release/latest/) directory is an
+alias for the latest Stable release. The latest LTS release from an LTS
+line is available in the form: latest-lts-_codename_. For example:
+<https://nodejs.org/download/release/latest-lts-argon>
 
 **Nightly** builds are available at
 <https://nodejs.org/download/nightly/>, listed under their version
@@ -27,11 +58,12 @@ string which includes their date (in UTC time) and the commit SHA at
 the HEAD of the release.
 
 **API documentation** is available in each release and nightly
-directory under _docs_. <https://nodejs.org/api/> points to the latest version.
+directory under _docs_. <https://nodejs.org/api/> points to the API
+documentation of the latest stable version.
 
 ### Verifying Binaries
 
-Release and nightly download directories all contain a *SHASUM256.txt*
+Stable, LTS and Nightly download directories all contain a *SHASUM256.txt*
 file that lists the SHA checksums for each file available for
 download. To check that a downloaded file matches the checksum, run
 it through `sha256sum` with a command such as:
@@ -43,9 +75,9 @@ $ grep node-vx.y.z.tar.gz SHASUMS256.txt | sha256sum -c -
 _(Where "node-vx.y.z.tar.gz" is the name of the file you have
 downloaded)_
 
-Additionally, releases (not nightlies) have GPG signed copies of
-SHASUM256.txt files available as SHASUM256.txt.asc. You can use `gpg`
-to verify that the file has not been tampered with.
+Additionally, Stable and LTS releases (not Nightlies) have GPG signed
+copies of SHASUM256.txt files available as SHASUM256.txt.asc. You can use
+`gpg` to verify that the file has not been tampered with.
 
 To verify a SHASUM256.txt.asc, you will first need to import all of
 the GPG keys of individuals authorized to create releases. They are

From 2f16be2b7023ade158bff21fdcb3c3b3ce6fd939 Mon Sep 17 00:00:00 2001
From: Stefan Budeanu <stefan@budeanu.com>
Date: Mon, 9 Nov 2015 18:19:11 -0500
Subject: [PATCH 215/323] tls: Use SHA1 for sessionIdContext in FIPS mode

FIPS 140-2 disallows use of MD5, which is used to derive the
default sessionIdContext for tls.createServer().

PR-URL: https://github.com/nodejs/node/pull/3755
Reviewed-By: Fedor Indutny <fedor@indutny.com>
---
 doc/api/tls.markdown |  3 ++-
 lib/_tls_wrap.js     | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/doc/api/tls.markdown b/doc/api/tls.markdown
index 60ad316ff5556f..f9d6faedf80ebf 100644
--- a/doc/api/tls.markdown
+++ b/doc/api/tls.markdown
@@ -842,7 +842,8 @@ automatically set as a listener for the [secureConnection][] event.  The
 
   - `sessionIdContext`: A string containing an opaque identifier for session
     resumption. If `requestCert` is `true`, the default is MD5 hash value
-    generated from command-line. Otherwise, the default is not provided.
+    generated from command-line. (In FIPS mode a truncated SHA1 hash is
+    used instead.) Otherwise, the default is not provided.
 
   - `secureProtocol`: The SSL method to use, e.g. `SSLv3_method` to force
     SSL version 3. The possible values depend on your installation of
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
index 887db012e78402..150755e48d0865 100644
--- a/lib/_tls_wrap.js
+++ b/lib/_tls_wrap.js
@@ -14,6 +14,21 @@ const Timer = process.binding('timer_wrap').Timer;
 const tls_wrap = process.binding('tls_wrap');
 const TCP = process.binding('tcp_wrap').TCP;
 const Pipe = process.binding('pipe_wrap').Pipe;
+const defaultSessionIdContext = getDefaultSessionIdContext();
+
+function getDefaultSessionIdContext() {
+  var defaultText = process.argv.join(' ');
+  /* SSL_MAX_SID_CTX_LENGTH is 128 bits */
+  if (process.config.variables.openssl_fips) {
+    return crypto.createHash('sha1')
+      .update(defaultText)
+      .digest('hex').slice(0, 32);
+  } else {
+    return crypto.createHash('md5')
+      .update(defaultText)
+      .digest('hex');
+  }
+}
 
 function onhandshakestart() {
   debug('onhandshakestart');
@@ -893,9 +908,7 @@ Server.prototype.setOptions = function(options) {
   if (options.sessionIdContext) {
     this.sessionIdContext = options.sessionIdContext;
   } else {
-    this.sessionIdContext = crypto.createHash('md5')
-                                  .update(process.argv.join(' '))
-                                  .digest('hex');
+    this.sessionIdContext = defaultSessionIdContext;
   }
 };
 

From 02fd81a89f490002f032d06a48b30f4caa957afe Mon Sep 17 00:00:00 2001
From: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Date: Tue, 10 Nov 2015 11:19:27 -0500
Subject: [PATCH 216/323] 2015-11-17, Version 5.1.0 (Stable)

Notable changes:

* buffer: The `noAssert` option for many buffer functions will now silently drop invalid write values rather than crashing (P.S.V.R) https://github.com/nodejs/node/pull/3767.
  - This makes the behavior match what the docs suggest.
* child_process: `child.send()` now properly returns a boolean like
the docs suggest (Rich Trott) https://github.com/nodejs/node/pull/3577.
* doc: All of the API docs have been re-ordered so as to read in alphabetical order (Tristian Flanagan) https://github.com/nodejs/node/pull/3662.
* http_parser: update http-parser to 2.6.0 from 2.5.0 (James M
Snell) https://github.com/nodejs/node/pull/3569.
  - Now supports the following HTTP methods: `LINK`, `UNLINK`, `BIND`,
`REBIND`, `UNBIND`.
  - Also added ACL and IPv6 Zone ID support.
* npm: upgrade npm to 3.3.12 from v3.3.6 (Rebecca Turner)
https://github.com/nodejs/node/pull/3685.
  - See the release notes for
    https://github.com/npm/npm/releases/tag/v3.3.7,
    https://github.com/npm/npm/releases/tag/v3.3.8,
    https://github.com/npm/npm/releases/tag/v3.3.9,
    https://github.com/npm/npm/releases/tag/v3.3.10,
    https://github.com/npm/npm/releases/tag/v3.3.11, and
    https://github.com/npm/npm/releases/tag/v3.3.12 for more details.
* repl: The REPL no longer crashes if the persistent history file
cannot be opened (Evan Lucas) https://github.com/nodejs/node/pull/3630.
* tls: The default `sessionIdContext` now uses SHA1 in FIPS mode rather than MD5 (Stefan Budeanu) https://github.com/nodejs/node/pull/3755.
* v8: Added some more useful post-mortem data (Fedor Indutny) https://github.com/nodejs/node/pull/3779.

PR-URL: https://github.com/nodejs/node/pull/3736
---
 CHANGELOG.md       | 163 +++++++++++++++++++++++++++++++++++++++++++++
 src/node_version.h |   6 +-
 2 files changed, 166 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be628de737e216..e64990646631f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,168 @@
 # Node.js ChangeLog
 
+## 2015-11-17, Version 5.1.0 (Stable), @Fishrock123
+
+### Notable changes
+
+* **buffer**: The `noAssert` option for many buffer functions will now silently drop invalid write values rather than crashing (P.S.V.R) [#3767](https://github.com/nodejs/node/pull/3767).
+  - This makes the behavior match what the docs suggest.
+* **child_process**: `child.send()` now properly returns a boolean like the docs suggest (Rich Trott) [#3577](https://github.com/nodejs/node/pull/3577).
+* **doc**: All of the API docs have been re-ordered so as to read in alphabetical order (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662).
+* **http_parser**: update http-parser to 2.6.0 from 2.5.0 (James M Snell) [#3569](https://github.com/nodejs/node/pull/3569).
+  - Now supports the following HTTP methods: `LINK`, `UNLINK`, `BIND`, `REBIND`, `UNBIND`.
+  - Also added ACL and IPv6 Zone ID support.
+* **npm**: upgrade npm to 3.3.12 from v3.3.6 (Rebecca Turner) [#3685](https://github.com/nodejs/node/pull/3685).
+  - See the release notes for [v3.3.7](https://github.com/npm/npm/releases/tag/v3.3.7), [v3.3.8](https://github.com/npm/npm/releases/tag/v3.3.8), [v3.3.9](https://github.com/npm/npm/releases/tag/v3.3.9), [v3.3.10](https://github.com/npm/npm/releases/tag/v3.3.10), [v3.3.11](https://github.com/npm/npm/releases/tag/v3.3.11), and [v3.3.12](https://github.com/npm/npm/releases/tag/v3.3.12) for more details.
+* **repl**: The REPL no longer crashes if the [persistent history](https://nodejs.org/api/repl.html#repl_persistent_history) file cannot be opened (Evan Lucas) [#3630](https://github.com/nodejs/node/pull/3630).
+* **tls**: The default `sessionIdContext` now uses SHA1 in FIPS mode rather than MD5 (Stefan Budeanu) [#3755](https://github.com/nodejs/node/pull/3755).
+* **v8**: Added some more useful post-mortem data (Fedor Indutny) [#3779](https://github.com/nodejs/node/pull/3779).
+
+### Known issues
+
+* Surrogate pair in REPL can freeze terminal. [#690](https://github.com/nodejs/node/issues/690)
+* Calling `dns.setServers()` while a DNS query is in progress can cause the process to crash on a failed assertion. [#894](https://github.com/nodejs/node/issues/894)
+* `url.resolve` may transfer the auth portion of the url when resolving between two full hosts, see [#1435](https://github.com/nodejs/node/issues/1435).
+* Unicode characters in filesystem paths are not handled consistently across platforms or Node.js APIs. See [#2088](https://github.com/nodejs/node/issues/2088), [#3401](https://github.com/nodejs/node/issues/3401) and [#3519](https://github.com/nodejs/node/issues/3519).
+
+### Commits
+
+* [[`b663d2bbb5`](https://github.com/nodejs/node/commit/b663d2bbb5)] - **async_wrap**: call callback in destructor (Trevor Norris) [#3461](https://github.com/nodejs/node/pull/3461)
+* [[`eccbec99ea`](https://github.com/nodejs/node/commit/eccbec99ea)] - **async_wrap**: new instances get uid (Trevor Norris) [#3461](https://github.com/nodejs/node/pull/3461)
+* [[`5d34c81a5c`](https://github.com/nodejs/node/commit/5d34c81a5c)] - **async_wrap**: allow some hooks to be optional (Trevor Norris) [#3461](https://github.com/nodejs/node/pull/3461)
+* [[`7bff0138e2`](https://github.com/nodejs/node/commit/7bff0138e2)] - **buffer**: let WriteFloatGeneric silently drop values (P.S.V.R) [#3767](https://github.com/nodejs/node/pull/3767)
+* [[`56673693cd`](https://github.com/nodejs/node/commit/56673693cd)] - **buffer**: neuter external `nullptr` buffers (Fedor Indutny) [#3624](https://github.com/nodejs/node/pull/3624)
+* [[`2d0ca0293a`](https://github.com/nodejs/node/commit/2d0ca0293a)] - **build**: fix configuring with prebuilt libraries (Markus Tzoe) [#3135](https://github.com/nodejs/node/pull/3135)
+* [[`2a69b6820f`](https://github.com/nodejs/node/commit/2a69b6820f)] - **build**: fix --with-intl=system-icu for x-compile (Steven R. Loomis) [#3808](https://github.com/nodejs/node/pull/3808)
+* [[`8f5a2550a7`](https://github.com/nodejs/node/commit/8f5a2550a7)] - **build**: omit -gline-tables-only for --enable-asan (Ben Noordhuis) [#3680](https://github.com/nodejs/node/pull/3680)
+* [[`84bb74547d`](https://github.com/nodejs/node/commit/84bb74547d)] - **child_process**: add safety checks on stdio access (cjihrig) [#3799](https://github.com/nodejs/node/pull/3799)
+* [[`e888471a11`](https://github.com/nodejs/node/commit/e888471a11)] - **child_process**: don't fork bomb ourselves from -e (Ben Noordhuis) [#3575](https://github.com/nodejs/node/pull/3575)
+* [[`47f3735e88`](https://github.com/nodejs/node/commit/47f3735e88)] - **cluster**: send suicide message on disconnect (cjihrig) [#3720](https://github.com/nodejs/node/pull/3720)
+* [[`d64a56cba5`](https://github.com/nodejs/node/commit/d64a56cba5)] - **cluster**: remove handles when disconnecting worker (Ben Noordhuis) [#3677](https://github.com/nodejs/node/pull/3677)
+* [[`5ed30da5a0`](https://github.com/nodejs/node/commit/5ed30da5a0)] - **console**: use 'label' argument for time and timeEnd (Roman Reiss) [#3590](https://github.com/nodejs/node/pull/3590)
+* [[`7a290abea6`](https://github.com/nodejs/node/commit/7a290abea6)] - **crypto**: DSA parameter validation in FIPS mode (Stefan Budeanu) [#3756](https://github.com/nodejs/node/pull/3756)
+* [[`2c9fb147be`](https://github.com/nodejs/node/commit/2c9fb147be)] - **crypto**: Improve error checking and reporting (Stefan Budeanu) [#3753](https://github.com/nodejs/node/pull/3753)
+* [[`66dccaf0cd`](https://github.com/nodejs/node/commit/66dccaf0cd)] - **debugger**: also exit when the repl emits 'exit' (Felix Böhm) [#2369](https://github.com/nodejs/node/pull/2369)
+* [[`fd0253be4d`](https://github.com/nodejs/node/commit/fd0253be4d)] - **deps**: backport bc2e393 from v8 upstream (evan.lucas) [#3792](https://github.com/nodejs/node/pull/3792)
+* [[`59077acc3d`](https://github.com/nodejs/node/commit/59077acc3d)] - **deps**: cherry-pick 68e89fb from v8's upstream (Fedor Indutny) [#3779](https://github.com/nodejs/node/pull/3779)
+* [[`9ef81ff5d3`](https://github.com/nodejs/node/commit/9ef81ff5d3)] - **deps**: update V8 to 4.6.85.31 (Michaël Zasso) [#3698](https://github.com/nodejs/node/pull/3698)
+* [[`b48dbf9fce`](https://github.com/nodejs/node/commit/b48dbf9fce)] - **deps**: upgrade npm to 3.3.12 (Rebecca Turner) [#3685](https://github.com/nodejs/node/pull/3685)
+* [[`7caeb14e11`](https://github.com/nodejs/node/commit/7caeb14e11)] - **(SEMVER-MINOR)** **deps**: update http-parser to 2.6.0 (James M Snell) [#3569](https://github.com/nodejs/node/pull/3569)
+* [[`08e0de59fa`](https://github.com/nodejs/node/commit/08e0de59fa)] - **deps**: upgrade npm to 3.3.10 (Rebecca Turner) [#3599](https://github.com/nodejs/node/pull/3599)
+* [[`ac9e4ffe8e`](https://github.com/nodejs/node/commit/ac9e4ffe8e)] - **dns**: prevent undefined values in results (Junliang Yan) [#3696](https://github.com/nodejs/node/pull/3696)
+* [[`ea67d870f4`](https://github.com/nodejs/node/commit/ea67d870f4)] - **doc**: document release types in readme (Rod Vagg) [#3482](https://github.com/nodejs/node/pull/3482)
+* [[`60d3daa65c`](https://github.com/nodejs/node/commit/60d3daa65c)] - **doc**: replace head of readme with updated text (Rod Vagg) [#3482](https://github.com/nodejs/node/pull/3482)
+* [[`df1fdba2ae`](https://github.com/nodejs/node/commit/df1fdba2ae)] - **doc**: sort repl alphabetically (Tristian Flanagan) [#3859](https://github.com/nodejs/node/pull/3859)
+* [[`7ecd5422c8`](https://github.com/nodejs/node/commit/7ecd5422c8)] - **doc**: address use of profanity in code of conduct (James M Snell) [#3827](https://github.com/nodejs/node/pull/3827)
+* [[`c2393d1f2a`](https://github.com/nodejs/node/commit/c2393d1f2a)] - **doc**: consistent reference-style links (Bryan English) [#3845](https://github.com/nodejs/node/pull/3845)
+* [[`96f53c6b02`](https://github.com/nodejs/node/commit/96f53c6b02)] - **doc**: add link to \[customizing util.inspect colors\]. (Jesse McCarthy) [#3749](https://github.com/nodejs/node/pull/3749)
+* [[`132297d3f6`](https://github.com/nodejs/node/commit/132297d3f6)] - **doc**: Updated streams simplified constructor API (Tom Gallacher) [#3602](https://github.com/nodejs/node/pull/3602)
+* [[`d137f0fd28`](https://github.com/nodejs/node/commit/d137f0fd28)] - **doc**: add warning about Windows process groups (Roman Klauke) [#3681](https://github.com/nodejs/node/pull/3681)
+* [[`45ff31cf94`](https://github.com/nodejs/node/commit/45ff31cf94)] - **doc**: added what buf.copy returns (Manuel B) [#3555](https://github.com/nodejs/node/pull/3555)
+* [[`5d1faa28cb`](https://github.com/nodejs/node/commit/5d1faa28cb)] - **doc**: reword message.headers to indicate they are not read-only (Tristian Flanagan) [#3814](https://github.com/nodejs/node/pull/3814)
+* [[`25c3807051`](https://github.com/nodejs/node/commit/25c3807051)] - **doc**: clarify duplicate header handling (Bryan English) [#3810](https://github.com/nodejs/node/pull/3810)
+* [[`ae2d1ee302`](https://github.com/nodejs/node/commit/ae2d1ee302)] - **doc**: repl: add defineComand and displayPrompt (Bryan English) [#3765](https://github.com/nodejs/node/pull/3765)
+* [[`09e524d013`](https://github.com/nodejs/node/commit/09e524d013)] - **doc**: sort tls alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`7e60b81c81`](https://github.com/nodejs/node/commit/7e60b81c81)] - **doc**: sort stream alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`cd931a8a13`](https://github.com/nodejs/node/commit/cd931a8a13)] - **doc**: sort net alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`cfa8198af8`](https://github.com/nodejs/node/commit/cfa8198af8)] - **doc**: sort process alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`e1a512607a`](https://github.com/nodejs/node/commit/e1a512607a)] - **doc**: sort zlib alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`0996b97240`](https://github.com/nodejs/node/commit/0996b97240)] - **doc**: sort util alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`df07072b66`](https://github.com/nodejs/node/commit/df07072b66)] - **doc**: sort https alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`6e9d01c7d8`](https://github.com/nodejs/node/commit/6e9d01c7d8)] - **doc**: sort http alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`18da02fa0f`](https://github.com/nodejs/node/commit/18da02fa0f)] - **doc**: sort modules alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`29054ffc0c`](https://github.com/nodejs/node/commit/29054ffc0c)] - **doc**: sort readline alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`389ead37ef`](https://github.com/nodejs/node/commit/389ead37ef)] - **doc**: sort repl alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`d383d624de`](https://github.com/nodejs/node/commit/d383d624de)] - **doc**: sort string_decoder alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`0d2262887c`](https://github.com/nodejs/node/commit/0d2262887c)] - **doc**: sort timers alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`14b5a95d03`](https://github.com/nodejs/node/commit/14b5a95d03)] - **doc**: sort tty alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`d4dda77e4a`](https://github.com/nodejs/node/commit/d4dda77e4a)] - **doc**: sort url alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`39b8259bd5`](https://github.com/nodejs/node/commit/39b8259bd5)] - **doc**: sort vm alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`d357b3090e`](https://github.com/nodejs/node/commit/d357b3090e)] - **doc**: sort querystring alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`1f56abaa98`](https://github.com/nodejs/node/commit/1f56abaa98)] - **doc**: sort punycode alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`bc63667456`](https://github.com/nodejs/node/commit/bc63667456)] - **doc**: sort path alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`22961e011c`](https://github.com/nodejs/node/commit/22961e011c)] - **doc**: sort os alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`4ba18489d3`](https://github.com/nodejs/node/commit/4ba18489d3)] - **doc**: sort globals alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`c3f5ea704f`](https://github.com/nodejs/node/commit/c3f5ea704f)] - **doc**: sort fs alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`ce3ac8dd1e`](https://github.com/nodejs/node/commit/ce3ac8dd1e)] - **doc**: sort events alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`63a78749b8`](https://github.com/nodejs/node/commit/63a78749b8)] - **doc**: sort errors alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`488326da8d`](https://github.com/nodejs/node/commit/488326da8d)] - **doc**: sort dgram alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`e1c357e881`](https://github.com/nodejs/node/commit/e1c357e881)] - **doc**: sort crypto alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`4118fd5794`](https://github.com/nodejs/node/commit/4118fd5794)] - **doc**: sort dns alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`3e046acc50`](https://github.com/nodejs/node/commit/3e046acc50)] - **doc**: sort console alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`05f1af7124`](https://github.com/nodejs/node/commit/05f1af7124)] - **doc**: sort cluster alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`5c30e5dada`](https://github.com/nodejs/node/commit/5c30e5dada)] - **doc**: sort child_process alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`fb6a09cd0e`](https://github.com/nodejs/node/commit/fb6a09cd0e)] - **doc**: sort buffer alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`c7c05d8f02`](https://github.com/nodejs/node/commit/c7c05d8f02)] - **doc**: sort assert alphabetically (Tristian Flanagan) [#3662](https://github.com/nodejs/node/pull/3662)
+* [[`f2c2e53321`](https://github.com/nodejs/node/commit/f2c2e53321)] - **doc**: add note to util.isBuffer (Evan Lucas) [#3790](https://github.com/nodejs/node/pull/3790)
+* [[`35fb9f91eb`](https://github.com/nodejs/node/commit/35fb9f91eb)] - **doc**: Describe FIPSDIR environment variable (Stefan Budeanu) [#3752](https://github.com/nodejs/node/pull/3752)
+* [[`da911f158b`](https://github.com/nodejs/node/commit/da911f158b)] - **doc**: update lts description in the collaborator guide (James M Snell) [#3668](https://github.com/nodejs/node/pull/3668)
+* [[`597f8751d1`](https://github.com/nodejs/node/commit/597f8751d1)] - **doc**: add note on tls connection meta data methods (Tyler Henkel) [#3746](https://github.com/nodejs/node/pull/3746)
+* [[`a32d9e31dc`](https://github.com/nodejs/node/commit/a32d9e31dc)] - **doc**: add romankl to collaborators (Roman Klauke) [#3725](https://github.com/nodejs/node/pull/3725)
+* [[`e5b9109d12`](https://github.com/nodejs/node/commit/e5b9109d12)] - **doc**: add thealphanerd to collaborators (Myles Borins) [#3723](https://github.com/nodejs/node/pull/3723)
+* [[`a05a0b47e3`](https://github.com/nodejs/node/commit/a05a0b47e3)] - **doc**: add saghul as a collaborator (Saúl Ibarra Corretgé) [#3724](https://github.com/nodejs/node/pull/3724)
+* [[`b14d9c5f16`](https://github.com/nodejs/node/commit/b14d9c5f16)] - **doc**: add method links in events.markdown (Alejandro Oviedo) [#3187](https://github.com/nodejs/node/pull/3187)
+* [[`44f779b112`](https://github.com/nodejs/node/commit/44f779b112)] - **doc**: add caveats of algs and key size in crypto (Shigeki Ohtsu) [#3479](https://github.com/nodejs/node/pull/3479)
+* [[`a0db5fb355`](https://github.com/nodejs/node/commit/a0db5fb355)] - **doc**: stdout/stderr can block when directed to file (Ben Noordhuis) [#3170](https://github.com/nodejs/node/pull/3170)
+* [[`409f29972e`](https://github.com/nodejs/node/commit/409f29972e)] - **doc**: rename iojs-* groups to nodejs-* (Steven R. Loomis) [#3634](https://github.com/nodejs/node/pull/3634)
+* [[`801866280e`](https://github.com/nodejs/node/commit/801866280e)] - **doc**: fix wrong date and known issue in changelog.md (James M Snell) [#3650](https://github.com/nodejs/node/pull/3650)
+* [[`325c4c7af5`](https://github.com/nodejs/node/commit/325c4c7af5)] - **doc**: fix function param order in assert doc (David Woods) [#3533](https://github.com/nodejs/node/pull/3533)
+* [[`045e04e531`](https://github.com/nodejs/node/commit/045e04e531)] - **doc**: typo fix in readme.md (Sam P Gallagher-Bishop) [#3649](https://github.com/nodejs/node/pull/3649)
+* [[`7fd8f1371e`](https://github.com/nodejs/node/commit/7fd8f1371e)] - **doc**: add note about timeout delay > TIMEOUT_MAX (Guilherme Souza) [#3512](https://github.com/nodejs/node/pull/3512)
+* [[`7d0b589644`](https://github.com/nodejs/node/commit/7d0b589644)] - **doc**: fix crypto spkac function descriptions (Jason Gerfen) [#3614](https://github.com/nodejs/node/pull/3614)
+* [[`efa19bdcb5`](https://github.com/nodejs/node/commit/efa19bdcb5)] - **doc**: add final full stop in CONTRIBUTING.md (Emily Aviva Kapor-Mater) [#3576](https://github.com/nodejs/node/pull/3576)
+* [[`90723afe32`](https://github.com/nodejs/node/commit/90723afe32)] - **doc**: made code spans more visible in the API docs (phijohns) [#3573](https://github.com/nodejs/node/pull/3573)
+* [[`530bb9144f`](https://github.com/nodejs/node/commit/530bb9144f)] - **docs**: improve discoverability of Code of Conduct (Ashley Williams) [#3774](https://github.com/nodejs/node/pull/3774)
+* [[`73e40f0327`](https://github.com/nodejs/node/commit/73e40f0327)] - **docs**: fs - change links to buffer encoding to Buffer class anchor (fansworld-claudio) [#2796](https://github.com/nodejs/node/pull/2796)
+* [[`7a84fa6c60`](https://github.com/nodejs/node/commit/7a84fa6c60)] - **docs**: fs - remove encoding list and link to buffer (fansworld-claudio) [#2796](https://github.com/nodejs/node/pull/2796)
+* [[`2aa6a6d998`](https://github.com/nodejs/node/commit/2aa6a6d998)] - **fs**: return null error on readFile() success (Zheng Chaoping) [#3740](https://github.com/nodejs/node/pull/3740)
+* [[`c96400c572`](https://github.com/nodejs/node/commit/c96400c572)] - **gitignore**: don't ignore 'debug' in deps/npm (Rebecca Turner) [#3599](https://github.com/nodejs/node/pull/3599)
+* [[`a7f28a098e`](https://github.com/nodejs/node/commit/a7f28a098e)] - **http**: remove unneeded cb check from setTimeout() (Ashok Suthar) [#3631](https://github.com/nodejs/node/pull/3631)
+* [[`d2b5dcb2de`](https://github.com/nodejs/node/commit/d2b5dcb2de)] - **lib**: return boolean from child.send() (Rich Trott) [#3577](https://github.com/nodejs/node/pull/3577)
+* [[`5c54fa0095`](https://github.com/nodejs/node/commit/5c54fa0095)] - **module**: cache regular expressions (Evan Lucas) [#3869](https://github.com/nodejs/node/pull/3869)
+* [[`89285db128`](https://github.com/nodejs/node/commit/89285db128)] - **module**: remove unnecessary JSON.stringify (Andres Suarez) [#3578](https://github.com/nodejs/node/pull/3578)
+* [[`fd3f0d8e6e`](https://github.com/nodejs/node/commit/fd3f0d8e6e)] - **querystring**: Parse multiple separator characters (Yosuke Furukawa) [#3807](https://github.com/nodejs/node/pull/3807)
+* [[`75dbafc3f8`](https://github.com/nodejs/node/commit/75dbafc3f8)] - **repl**: To exit, press ^C again or type .exit. (Hemanth.HM) [#3368](https://github.com/nodejs/node/pull/3368)
+* [[`5073da0481`](https://github.com/nodejs/node/commit/5073da0481)] - **repl**: don't crash if cannot open history file (Evan Lucas) [#3630](https://github.com/nodejs/node/pull/3630)
+* [[`59cd28114d`](https://github.com/nodejs/node/commit/59cd28114d)] - **src**: Add missing va_end before return (Ömer Fadıl Usta) [#3565](https://github.com/nodejs/node/pull/3565)
+* [[`02e012e984`](https://github.com/nodejs/node/commit/02e012e984)] - **src**: force line buffering for stderr (Rich Trott) [#3701](https://github.com/nodejs/node/pull/3701)
+* [[`2498e29344`](https://github.com/nodejs/node/commit/2498e29344)] - **src**: Revert "nix stdin _readableState.reading" (Roman Reiss) [#3490](https://github.com/nodejs/node/pull/3490)
+* [[`65cd03cda6`](https://github.com/nodejs/node/commit/65cd03cda6)] - **src**: wrap source before doing syntax check (Evan Lucas) [#3587](https://github.com/nodejs/node/pull/3587)
+* [[`d72bb1e96a`](https://github.com/nodejs/node/commit/d72bb1e96a)] - ***Revert*** "**src**: fix stuck debugger process" (Ben Noordhuis) [#3585](https://github.com/nodejs/node/pull/3585)
+* [[`047abbd6eb`](https://github.com/nodejs/node/commit/047abbd6eb)] - **test**: move test-specific function out of common (Rich Trott) [#3871](https://github.com/nodejs/node/pull/3871)
+* [[`19a36ff355`](https://github.com/nodejs/node/commit/19a36ff355)] - **test**: fix flaky SmartOS test (Rich Trott) [#3830](https://github.com/nodejs/node/pull/3830)
+* [[`4bb27baf8d`](https://github.com/nodejs/node/commit/4bb27baf8d)] - **test**: skip test if FreeBSD jail will break it (Rich Trott) [#3839](https://github.com/nodejs/node/pull/3839)
+* [[`1c1e70864b`](https://github.com/nodejs/node/commit/1c1e70864b)] - **test**: fix path to module for repl test on Windows (Michael Cornacchia) [#3608](https://github.com/nodejs/node/pull/3608)
+* [[`413ca53107`](https://github.com/nodejs/node/commit/413ca53107)] - **test**: increase crypto strength for FIPS standard (Stefan Budeanu) [#3758](https://github.com/nodejs/node/pull/3758)
+* [[`2ec5e17d16`](https://github.com/nodejs/node/commit/2ec5e17d16)] - **test**: add test-zlib-flush-drain (Myles Borins) [#3534](https://github.com/nodejs/node/pull/3534)
+* [[`de707f0876`](https://github.com/nodejs/node/commit/de707f0876)] - **test**: add hasFipsCrypto to test/common.js (Stefan Budeanu) [#3756](https://github.com/nodejs/node/pull/3756)
+* [[`828b786e48`](https://github.com/nodejs/node/commit/828b786e48)] - **test**: add test for invalid DSA key size (Stefan Budeanu) [#3756](https://github.com/nodejs/node/pull/3756)
+* [[`252e810059`](https://github.com/nodejs/node/commit/252e810059)] - **test**: Fix test-cluster-worker-exit.js for AIX (Imran Iqbal) [#3666](https://github.com/nodejs/node/pull/3666)
+* [[`91248b1094`](https://github.com/nodejs/node/commit/91248b1094)] - **test**: run pipeline flood test in parallel (Rich Trott) [#3811](https://github.com/nodejs/node/pull/3811)
+* [[`583f58e5d6`](https://github.com/nodejs/node/commit/583f58e5d6)] - **test**: stronger crypto in test fixtures (Stefan Budeanu) [#3759](https://github.com/nodejs/node/pull/3759)
+* [[`2e67db3104`](https://github.com/nodejs/node/commit/2e67db3104)] - **test**: refactor test-http-pipeline-flood (Rich Trott) [#3636](https://github.com/nodejs/node/pull/3636)
+* [[`1ab59ab9b3`](https://github.com/nodejs/node/commit/1ab59ab9b3)] - **test**: fix flaky test test-http-pipeline-flood (Devin Nakamura) [#3636](https://github.com/nodejs/node/pull/3636)
+* [[`1c8a7c6351`](https://github.com/nodejs/node/commit/1c8a7c6351)] - **test**: enhance fs-watch-recursive test (Sakthipriyan Vairamani) [#2599](https://github.com/nodejs/node/pull/2599)
+* [[`81997840f2`](https://github.com/nodejs/node/commit/81997840f2)] - **test**: fix test-module-loading-error for musl (Hugues Malphettes) [#3657](https://github.com/nodejs/node/pull/3657)
+* [[`9cdceac782`](https://github.com/nodejs/node/commit/9cdceac782)] - **test**: use really invalid hostname (Sakthipriyan Vairamani) [#3711](https://github.com/nodejs/node/pull/3711)
+* [[`f3594e77b2`](https://github.com/nodejs/node/commit/f3594e77b2)] - **test**: fix test-net-persistent-keepalive for AIX (Imran Iqbal) [#3646](https://github.com/nodejs/node/pull/3646)
+* [[`81522480f1`](https://github.com/nodejs/node/commit/81522480f1)] - **test**: more regression tests for minDHSize option (Ben Noordhuis) [#3629](https://github.com/nodejs/node/pull/3629)
+* [[`935b97769e`](https://github.com/nodejs/node/commit/935b97769e)] - **test**: add regression test for 512 bits DH key (Ben Noordhuis) [#3629](https://github.com/nodejs/node/pull/3629)
+* [[`e302c33bb0`](https://github.com/nodejs/node/commit/e302c33bb0)] - **test**: mark http-pipeline-flood flaky (Rich Trott) [#3616](https://github.com/nodejs/node/pull/3616)
+* [[`5977963bce`](https://github.com/nodejs/node/commit/5977963bce)] - **test**: remove flaky designation from ls-no-sslv3 (Rich Trott) [#3620](https://github.com/nodejs/node/pull/3620)
+* [[`1e98d90db8`](https://github.com/nodejs/node/commit/1e98d90db8)] - **test**: add regression test for --debug-brk -e 0 (Ben Noordhuis) [#3585](https://github.com/nodejs/node/pull/3585)
+* [[`2f16be2b70`](https://github.com/nodejs/node/commit/2f16be2b70)] - **tls**: Use SHA1 for sessionIdContext in FIPS mode (Stefan Budeanu) [#3755](https://github.com/nodejs/node/pull/3755)
+* [[`05f0549b50`](https://github.com/nodejs/node/commit/05f0549b50)] - **tls**: copy client CAs and cert store on CertCb (Fedor Indutny) [#3537](https://github.com/nodejs/node/pull/3537)
+* [[`bea35424a2`](https://github.com/nodejs/node/commit/bea35424a2)] - **tools**: add tap output to cpplint (Johan Bergström) [#3448](https://github.com/nodejs/node/pull/3448)
+* [[`d036b35349`](https://github.com/nodejs/node/commit/d036b35349)] - **tools**: enforce `throw new Error()` with lint rule (Rich Trott) [#3714](https://github.com/nodejs/node/pull/3714)
+* [[`38bb0d864e`](https://github.com/nodejs/node/commit/38bb0d864e)] - **tools**: Use `throw new Error()` consistently (Rich Trott) [#3714](https://github.com/nodejs/node/pull/3714)
+* [[`e40d28283a`](https://github.com/nodejs/node/commit/e40d28283a)] - **tools**: update npm test tooling for 3.3.10+ (Rebecca Turner) [#3599](https://github.com/nodejs/node/pull/3599)
+* [[`cbd358ce33`](https://github.com/nodejs/node/commit/cbd358ce33)] - **tools**: fix gyp to work on MacOSX without XCode (Shigeki Ohtsu) [iojs/io.js#1325](https://github.com/iojs/io.js/pull/1325)
+* [[`3137e46cb8`](https://github.com/nodejs/node/commit/3137e46cb8)] - **tools**: update gyp to b3cef02 (Imran Iqbal) [#3487](https://github.com/nodejs/node/pull/3487)
+* [[`d61cb90ee3`](https://github.com/nodejs/node/commit/d61cb90ee3)] - **util**: use Object.create(null) for dictionary object (Minwoo Jung) [#3831](https://github.com/nodejs/node/pull/3831)
+* [[`9a45c21e6c`](https://github.com/nodejs/node/commit/9a45c21e6c)] - **util**: use regexp instead of str.replace().join() (qinjia) [#3689](https://github.com/nodejs/node/pull/3689)
+* [[`33ffc62670`](https://github.com/nodejs/node/commit/33ffc62670)] - **zlib**: only apply drain listener if given callback (Craig Cavalier) [#3534](https://github.com/nodejs/node/pull/3534)
+* [[`d70deabf90`](https://github.com/nodejs/node/commit/d70deabf90)] - **zlib**: pass kind to recursive calls to flush (Myles Borins) [#3534](https://github.com/nodejs/node/pull/3534)
+
 ## 2015-11-03, Version 4.2.2 'Argon' (LTS), @jasnell
 
 ### Notable changes
diff --git a/src/node_version.h b/src/node_version.h
index 79502bb74ee44b..141f13c165acc6 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -2,10 +2,10 @@
 #define SRC_NODE_VERSION_H_
 
 #define NODE_MAJOR_VERSION 5
-#define NODE_MINOR_VERSION 0
-#define NODE_PATCH_VERSION 1
+#define NODE_MINOR_VERSION 1
+#define NODE_PATCH_VERSION 0
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)

From 3b69060727fcaa20aab443d7183c5e0d9debaef6 Mon Sep 17 00:00:00 2001
From: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Date: Tue, 10 Nov 2015 11:21:25 -0500
Subject: [PATCH 217/323] Working on v5.1.1

PR-URL: https://github.com/nodejs/node/pull/3736
---
 src/node_version.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/node_version.h b/src/node_version.h
index 141f13c165acc6..4ab5cbcb90aad2 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -3,9 +3,9 @@
 
 #define NODE_MAJOR_VERSION 5
 #define NODE_MINOR_VERSION 1
-#define NODE_PATCH_VERSION 0
+#define NODE_PATCH_VERSION 1
 
-#define NODE_VERSION_IS_RELEASE 1
+#define NODE_VERSION_IS_RELEASE 0
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)

From 533881f8897988705f3b9fff992557028ff750cd Mon Sep 17 00:00:00 2001
From: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Date: Fri, 4 Dec 2015 00:41:27 +0900
Subject: [PATCH 218/323] deps: upgrade openssl sources to 1.0.2e

This just replaces all sources of openssl-1.0.2e.tar.gz into
deps/openssl/openssl

deps: copy all openssl header files to include dir

All symlink files in `deps/openssl/openssl/include/openssl/`
are removed and replaced with real header files to avoid
issues on Windows. Two files of opensslconf.h in crypto and
include dir are replaced to refer config/opensslconf.h.

deps: fix openssl assembly error on ia32 win32

`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and
perhaps others) are requiring .686 .

deps: fix asm build error of openssl in x86_win32

See
https://mta.openssl.org/pipermail/openssl-dev/2015-February/000651.html

node needs to stop using masm and move to nasm or yasm on Win32.

openssl: fix keypress requirement in apps on win32

Reapply b910613792dac946b295855963869933a9089044 .

deps: add -no_rand_screen to openssl s_client

In openssl s_client on Windows, RAND_screen() is invoked to initialize
random state but it takes several seconds in each connection.
This added -no_rand_screen to openssl s_client on Windows to skip
RAND_screen() and gets a better performance in the unit test of
test-tls-server-verify.
Do not enable this except to use in the unit test.

deps: update openssl config files

Regenrate config files for supported platforms with Makefile.

deps: update openssl asm and asm_obsolete files

Regenerate asm files with Makefile and CC=gcc and ASM=gcc where
gcc-4.8.4. Also asm files in asm_obsolete dir to support old compiler
and assmebler are regenerated without CC and ASM envs.

PR-URL: https://github.com/nodejs/node/pull/4134
Reviewed-By: Fedor Indutny <fedor@indutny.com>
---
 deps/openssl/asm/arm-void-gas/bn/armv4-gf2m.S |    6 +-
 .../asm/arm-void-gas/modes/ghash-armv4.S      |    5 +
 .../asm/arm-void-gas/modes/ghashv8-armx.S     |   22 +-
 .../arm64-linux64-gas/modes/ghashv8-armx.S    |   22 +-
 .../asm/x64-elf-gas/aes/aesni-sha256-x86_64.s |    7 +-
 .../openssl/asm/x64-elf-gas/bn/x86_64-mont5.s |   22 +-
 .../x64-macosx-gas/aes/aesni-sha256-x86_64.s  |    7 +-
 .../asm/x64-macosx-gas/bn/x86_64-mont5.s      |   22 +-
 .../aes/aesni-sha256-x86_64.asm               |    7 +-
 .../asm/x64-win32-masm/bn/x86_64-mont5.asm    |   22 +-
 .../asm_obsolete/arm-void-gas/bn/armv4-gf2m.S |    6 +-
 .../arm-void-gas/modes/ghash-armv4.S          |    5 +
 .../arm-void-gas/modes/ghashv8-armx.S         |   22 +-
 .../arm64-linux64-gas/modes/ghashv8-armx.S    |   22 +-
 .../x64-elf-gas/bn/x86_64-mont5.s             |    9 +
 .../x64-macosx-gas/bn/x86_64-mont5.s          |    9 +
 .../x64-win32-masm/bn/x86_64-mont5.asm        |    9 +
 .../config/archs/BSD-x86/opensslconf.h        |    2 +-
 .../config/archs/BSD-x86_64/opensslconf.h     |    2 +-
 .../config/archs/VC-WIN32/opensslconf.h       |    2 +-
 .../config/archs/VC-WIN64A/opensslconf.h      |    2 +-
 .../config/archs/aix-gcc/opensslconf.h        |    2 +-
 .../config/archs/aix64-gcc/opensslconf.h      |    2 +-
 .../config/archs/darwin-i386-cc/opensslconf.h |    2 +-
 .../archs/darwin64-x86_64-cc/opensslconf.h    |    2 +-
 .../config/archs/linux-aarch64/opensslconf.h  |    2 +-
 .../config/archs/linux-armv4/opensslconf.h    |    2 +-
 .../config/archs/linux-elf/opensslconf.h      |    2 +-
 .../config/archs/linux-ppc/opensslconf.h      |    4 +-
 .../config/archs/linux-ppc64/opensslconf.h    |    4 +-
 .../config/archs/linux-x32/opensslconf.h      |    2 +-
 .../config/archs/linux-x86_64/opensslconf.h   |    2 +-
 .../archs/solaris-x86-gcc/opensslconf.h       |    2 +-
 .../archs/solaris64-x86_64-gcc/opensslconf.h  |    2 +-
 deps/openssl/openssl/CHANGES                  |  242 ++--
 deps/openssl/openssl/CONTRIBUTING             |   38 +
 deps/openssl/openssl/Configure                |   11 +-
 deps/openssl/openssl/FAQ                      | 1055 +----------------
 deps/openssl/openssl/Makefile                 |   37 +-
 deps/openssl/openssl/Makefile.bak             |   37 +-
 deps/openssl/openssl/Makefile.org             |   35 +-
 deps/openssl/openssl/NEWS                     |   10 +
 deps/openssl/openssl/README                   |  178 +--
 deps/openssl/openssl/apps/Makefile            |    2 +-
 deps/openssl/openssl/apps/app_rand.c          |    3 -
 deps/openssl/openssl/apps/apps.c              |    9 +-
 deps/openssl/openssl/apps/asn1pars.c          |    4 +-
 deps/openssl/openssl/apps/ca.c                |   14 +-
 deps/openssl/openssl/apps/ecparam.c           |    7 +-
 deps/openssl/openssl/apps/engine.c            |    5 -
 deps/openssl/openssl/apps/md4.c               |    2 +-
 deps/openssl/openssl/apps/ocsp.c              |    4 +-
 deps/openssl/openssl/apps/pkcs12.c            |   14 +-
 deps/openssl/openssl/apps/s_cb.c              |    5 +
 deps/openssl/openssl/apps/s_client.c          |   11 +
 deps/openssl/openssl/apps/s_server.c          |   51 +
 deps/openssl/openssl/appveyor.yml             |   60 +
 .../openssl/openssl/crypto/aes/asm/aes-586.pl |    6 +-
 .../openssl/crypto/aes/asm/aesni-mb-x86_64.pl |    2 +-
 .../crypto/aes/asm/aesni-sha1-x86_64.pl       |    2 +-
 .../crypto/aes/asm/aesni-sha256-x86_64.pl     |    9 +-
 .../openssl/crypto/aes/asm/aesni-x86.pl       |    2 +-
 .../openssl/crypto/aes/asm/vpaes-ppc.pl       |  198 +++-
 deps/openssl/openssl/crypto/asn1/asn1_par.c   |   10 +
 deps/openssl/openssl/crypto/asn1/d2i_pr.c     |   15 +-
 deps/openssl/openssl/crypto/asn1/tasn_dec.c   |   11 +-
 deps/openssl/openssl/crypto/asn1/x_bignum.c   |    5 +-
 deps/openssl/openssl/crypto/asn1/x_pubkey.c   |    5 +-
 deps/openssl/openssl/crypto/asn1/x_x509.c     |    9 +-
 deps/openssl/openssl/crypto/asn1/x_x509a.c    |    7 +-
 deps/openssl/openssl/crypto/bio/b_dump.c      |    1 -
 deps/openssl/openssl/crypto/bio/bss_file.c    |   13 +-
 .../openssl/crypto/bn/asm/armv4-gf2m.pl       |   10 +-
 deps/openssl/openssl/crypto/bn/asm/ia64.S     |    4 +-
 .../openssl/crypto/bn/asm/ppc64-mont.pl       |  174 +--
 .../openssl/crypto/bn/asm/rsaz-x86_64.pl      |    2 +-
 .../openssl/crypto/bn/asm/s390x-gf2m.pl       |    6 +-
 deps/openssl/openssl/crypto/bn/asm/s390x.S    |  109 +-
 .../openssl/openssl/crypto/bn/asm/x86-gf2m.pl |   16 +-
 .../openssl/crypto/bn/asm/x86_64-gcc.c        |    2 +-
 .../openssl/crypto/bn/asm/x86_64-gf2m.pl      |   16 +-
 .../openssl/crypto/bn/asm/x86_64-mont.pl      |    5 +
 .../openssl/crypto/bn/asm/x86_64-mont5.pl     |   27 +-
 deps/openssl/openssl/crypto/bn/bn_exp.c       |    7 +-
 deps/openssl/openssl/crypto/bn/bn_gcd.c       |    2 +
 deps/openssl/openssl/crypto/bn/bn_gf2m.c      |   11 +-
 deps/openssl/openssl/crypto/bn/bn_mont.c      |    9 +-
 deps/openssl/openssl/crypto/bn/bn_recp.c      |    4 +-
 deps/openssl/openssl/crypto/bn/bn_x931p.c     |    7 +-
 deps/openssl/openssl/crypto/bn/bntest.c       |   74 +-
 deps/openssl/openssl/crypto/bn/rsaz_exp.h     |   68 +-
 deps/openssl/openssl/crypto/buffer/buf_str.c  |   21 +-
 deps/openssl/openssl/crypto/buffer/buffer.h   |    6 +
 deps/openssl/openssl/crypto/cms/cms_enc.c     |    2 +-
 deps/openssl/openssl/crypto/cms/cms_pwri.c    |    3 +
 deps/openssl/openssl/crypto/cms/cms_sd.c      |    2 +
 deps/openssl/openssl/crypto/cms/cms_smime.c   |    2 +-
 deps/openssl/openssl/crypto/comp/c_zlib.c     |    3 +-
 deps/openssl/openssl/crypto/conf/conf_def.c   |    3 +-
 deps/openssl/openssl/crypto/conf/conf_sap.c   |    1 +
 deps/openssl/openssl/crypto/cryptlib.c        |   26 +-
 deps/openssl/openssl/crypto/des/t/test        |   27 -
 deps/openssl/openssl/crypto/dh/dh.h           |    2 +-
 deps/openssl/openssl/crypto/dh/dhtest.c       |    4 +-
 deps/openssl/openssl/crypto/dsa/dsa_ameth.c   |    1 +
 deps/openssl/openssl/crypto/dsa/dsa_gen.c     |   19 +-
 deps/openssl/openssl/crypto/ec/Makefile       |    2 +-
 .../crypto/ec/asm/ecp_nistz256-x86_64.pl      |    2 +-
 deps/openssl/openssl/crypto/ec/ec.h           |    2 +-
 deps/openssl/openssl/crypto/ec/ec_asn1.c      |    8 +-
 deps/openssl/openssl/crypto/ec/ec_key.c       |   12 +-
 deps/openssl/openssl/crypto/ecdsa/ecdsa.h     |    2 +-
 deps/openssl/openssl/crypto/ecdsa/ecs_lib.c   |    2 +-
 .../openssl/crypto/engine/eng_cryptodev.c     |    7 +-
 deps/openssl/openssl/crypto/engine/eng_list.c |    1 +
 .../crypto/evp/e_aes_cbc_hmac_sha256.c        |   13 +-
 deps/openssl/openssl/crypto/evp/e_des3.c      |    2 +-
 deps/openssl/openssl/crypto/evp/encode.c      |  198 ++--
 deps/openssl/openssl/crypto/evp/evp_key.c     |    6 +-
 deps/openssl/openssl/crypto/evp/evp_lib.c     |   36 +-
 deps/openssl/openssl/crypto/evp/evp_pbe.c     |   16 +-
 deps/openssl/openssl/crypto/evp/p_lib.c       |    2 +-
 deps/openssl/openssl/crypto/evp/pmeth_gn.c    |    9 +-
 deps/openssl/openssl/crypto/hmac/hm_ameth.c   |    9 +-
 deps/openssl/openssl/crypto/jpake/jpake.c     |    4 +
 deps/openssl/openssl/crypto/mem_clr.c         |    4 +
 .../crypto/modes/asm/aesni-gcm-x86_64.pl      |    2 +-
 .../openssl/crypto/modes/asm/ghash-armv4.pl   |   13 +-
 .../openssl/crypto/modes/asm/ghash-sparcv9.pl |   18 +-
 .../openssl/crypto/modes/asm/ghash-x86.pl     |    2 +-
 .../openssl/crypto/modes/asm/ghash-x86_64.pl  |   10 +-
 .../openssl/crypto/modes/asm/ghashp8-ppc.pl   |   12 +-
 .../openssl/crypto/modes/asm/ghashv8-armx.pl  |   22 +-
 deps/openssl/openssl/crypto/modes/wrap128.c   |    4 +-
 deps/openssl/openssl/crypto/ocsp/ocsp_lib.c   |    6 -
 deps/openssl/openssl/crypto/ocsp/ocsp_prn.c   |    3 +-
 deps/openssl/openssl/crypto/opensslconf.h.in  |    2 +-
 deps/openssl/openssl/crypto/opensslv.h        |    6 +-
 deps/openssl/openssl/crypto/pem/pem_info.c    |    6 +
 deps/openssl/openssl/crypto/pem/pvkfmt.c      |   10 +-
 .../openssl/crypto/perlasm/ppc-xlate.pl       |   20 +
 deps/openssl/openssl/crypto/pkcs12/p12_add.c  |   27 +-
 deps/openssl/openssl/crypto/pkcs12/p12_crpt.c |    3 +
 deps/openssl/openssl/crypto/pkcs12/p12_mutl.c |    4 +-
 deps/openssl/openssl/crypto/pkcs7/pk7_doit.c  |    3 +-
 deps/openssl/openssl/crypto/pkcs7/pk7_smime.c |   25 +-
 deps/openssl/openssl/crypto/ppccap.c          |    2 +-
 .../openssl/crypto/rc4/asm/rc4-x86_64.pl      |    2 +-
 deps/openssl/openssl/crypto/rsa/rsa_ameth.c   |    2 +-
 deps/openssl/openssl/crypto/rsa/rsa_gen.c     |    4 +-
 deps/openssl/openssl/crypto/rsa/rsa_sign.c    |   11 +-
 deps/openssl/openssl/crypto/rsa/rsa_test.c    |   32 +-
 .../openssl/crypto/sha/asm/sha1-586.pl        |    4 +-
 .../openssl/crypto/sha/asm/sha1-mb-x86_64.pl  |    2 +-
 .../openssl/crypto/sha/asm/sha1-x86_64.pl     |    2 +-
 .../openssl/crypto/sha/asm/sha256-586.pl      |    2 +-
 .../crypto/sha/asm/sha256-mb-x86_64.pl        |    2 +-
 .../openssl/crypto/sha/asm/sha512-586.pl      |    2 +-
 .../openssl/crypto/sha/asm/sha512-parisc.pl   |    2 +-
 .../openssl/crypto/sha/asm/sha512-x86_64.pl   |    2 +-
 deps/openssl/openssl/crypto/sparccpuid.S      |    2 +-
 deps/openssl/openssl/crypto/sparcv9cap.c      |   47 +
 deps/openssl/openssl/crypto/srp/srp_vfy.c     |   34 +-
 .../openssl/openssl/crypto/ts/ts_rsp_verify.c |    2 +-
 .../openssl/crypto/whrlpool/asm/wp-mmx.pl     |    2 +-
 deps/openssl/openssl/crypto/x509/x509_lu.c    |    2 -
 deps/openssl/openssl/crypto/x509/x509_vfy.c   |   11 +-
 deps/openssl/openssl/crypto/x509/x509_vpm.c   |   15 +-
 deps/openssl/openssl/crypto/x509v3/v3_cpols.c |    4 +
 deps/openssl/openssl/crypto/x509v3/v3_ncons.c |    2 +
 deps/openssl/openssl/crypto/x509v3/v3_pci.c   |    2 +-
 deps/openssl/openssl/crypto/x509v3/v3_pcia.c  |    2 +-
 deps/openssl/openssl/crypto/x509v3/v3_purp.c  |   19 +-
 deps/openssl/openssl/crypto/x509v3/v3_scts.c  |    4 +-
 deps/openssl/openssl/crypto/x509v3/v3_utl.c   |   10 +-
 deps/openssl/openssl/demos/easy_tls/README    |    2 +-
 .../openssl/demos/engines/zencod/hw_zencod.c  |    2 +-
 deps/openssl/openssl/doc/HOWTO/keys.txt       |    5 +-
 deps/openssl/openssl/doc/README               |   27 +-
 deps/openssl/openssl/doc/apps/dgst.pod        |    5 -
 deps/openssl/openssl/doc/apps/genrsa.pod      |    6 -
 deps/openssl/openssl/doc/apps/pkcs12.pod      |    2 +-
 deps/openssl/openssl/doc/apps/req.pod         |   13 +-
 deps/openssl/openssl/doc/apps/x509.pod        |    3 +-
 deps/openssl/openssl/doc/crypto/BIO_read.pod  |    6 +-
 deps/openssl/openssl/doc/crypto/BN_rand.pod   |    4 +-
 .../doc/crypto/DSA_generate_parameters.pod    |    2 +-
 .../openssl/doc/crypto/EC_GROUP_copy.pod      |    2 +-
 .../openssl/openssl/doc/crypto/EC_KEY_new.pod |    4 +-
 .../doc/crypto/EVP_DigestVerifyInit.pod       |    9 +-
 .../openssl/doc/crypto/EVP_EncryptInit.pod    |    2 +-
 .../openssl/doc/crypto/EVP_SealInit.pod       |    2 +-
 .../openssl/doc/crypto/EVP_SignInit.pod       |    3 +-
 .../openssl/doc/crypto/X509_check_host.pod    |    2 +-
 deps/openssl/openssl/doc/crypto/buffer.pod    |   49 +-
 .../openssl/doc/crypto/d2i_X509_NAME.pod      |    2 +-
 deps/openssl/openssl/doc/crypto/engine.pod    |   10 +-
 .../openssl/openssl/doc/dir-locals.example.el |   15 +
 deps/openssl/openssl/doc/openssl-c-indent.el  |   62 +
 deps/openssl/openssl/doc/openssl_button.gif   |  Bin 2063 -> 0 bytes
 deps/openssl/openssl/doc/openssl_button.html  |    7 -
 .../doc/ssl/SSL_CTX_add_extra_chain_cert.pod  |   35 +-
 .../openssl/doc/ssl/SSL_CTX_get0_param.pod    |    2 +-
 .../openssl/doc/ssl/SSL_check_chain.pod       |   85 ++
 deps/openssl/openssl/e_os.h                   |    4 +-
 deps/openssl/openssl/engines/e_chil.c         |    4 +
 deps/openssl/openssl/include/openssl/buffer.h |    6 +
 deps/openssl/openssl/include/openssl/dh.h     |    2 +-
 deps/openssl/openssl/include/openssl/ec.h     |    2 +-
 deps/openssl/openssl/include/openssl/ecdsa.h  |    2 +-
 .../openssl/include/openssl/opensslv.h        |    6 +-
 deps/openssl/openssl/include/openssl/ssl.h    |    4 +
 deps/openssl/openssl/include/openssl/tls1.h   |   17 +-
 deps/openssl/openssl/openssl.spec             |    2 +-
 deps/openssl/openssl/ssl/Makefile             |    2 +-
 deps/openssl/openssl/ssl/bio_ssl.c            |    4 +
 deps/openssl/openssl/ssl/clienthellotest.c    |  219 ++++
 deps/openssl/openssl/ssl/d1_both.c            |    7 +-
 deps/openssl/openssl/ssl/d1_clnt.c            |   37 +-
 deps/openssl/openssl/ssl/d1_meth.c            |   14 +-
 deps/openssl/openssl/ssl/d1_srvr.c            |   45 +-
 deps/openssl/openssl/ssl/s23_clnt.c           |   21 +-
 deps/openssl/openssl/ssl/s3_both.c            |    4 +-
 deps/openssl/openssl/ssl/s3_cbc.c             |   47 +-
 deps/openssl/openssl/ssl/s3_clnt.c            |  124 +-
 deps/openssl/openssl/ssl/s3_enc.c             |  110 +-
 deps/openssl/openssl/ssl/s3_lib.c             |    2 +-
 deps/openssl/openssl/ssl/s3_pkt.c             |    2 +-
 deps/openssl/openssl/ssl/s3_srvr.c            |   78 +-
 deps/openssl/openssl/ssl/ssl.h                |    4 +
 deps/openssl/openssl/ssl/ssl_asn1.c           |    5 +-
 deps/openssl/openssl/ssl/ssl_cert.c           |    2 +-
 deps/openssl/openssl/ssl/ssl_ciph.c           |   22 +-
 deps/openssl/openssl/ssl/ssl_err.c            |    5 +
 deps/openssl/openssl/ssl/ssl_lib.c            |   11 +-
 deps/openssl/openssl/ssl/ssl_locl.h           |   20 +-
 deps/openssl/openssl/ssl/ssl_rsa.c            |   41 +-
 deps/openssl/openssl/ssl/ssl_sess.c           |    4 +-
 deps/openssl/openssl/ssl/ssltest.c            |    1 +
 deps/openssl/openssl/ssl/t1_enc.c             |   48 +-
 deps/openssl/openssl/ssl/t1_lib.c             |   65 +-
 deps/openssl/openssl/ssl/tls1.h               |   17 +-
 deps/openssl/openssl/test/Makefile            |   41 +-
 deps/openssl/openssl/test/bctest              |  111 --
 deps/openssl/openssl/test/bftest.c            |    2 +-
 deps/openssl/openssl/test/bntest.c            |    2 +-
 deps/openssl/openssl/test/casttest.c          |    2 +-
 deps/openssl/openssl/test/certs/pss1.pem      |   21 +
 deps/openssl/openssl/test/clienthellotest.c   |    1 +
 .../openssl/openssl/test/constant_time_test.c |    2 +-
 deps/openssl/openssl/test/destest.c           |    2 +-
 deps/openssl/openssl/test/dhtest.c            |    2 +-
 deps/openssl/openssl/test/dsatest.c           |    2 +-
 deps/openssl/openssl/test/ecdhtest.c          |    2 +-
 deps/openssl/openssl/test/ecdsatest.c         |    2 +-
 deps/openssl/openssl/test/ectest.c            |    2 +-
 deps/openssl/openssl/test/enginetest.c        |    2 +-
 deps/openssl/openssl/test/evp_extra_test.c    |    2 +-
 deps/openssl/openssl/test/evp_test.c          |    2 +-
 deps/openssl/openssl/test/exptest.c           |    2 +-
 deps/openssl/openssl/test/heartbeat_test.c    |    2 +-
 deps/openssl/openssl/test/hmactest.c          |    2 +-
 deps/openssl/openssl/test/ideatest.c          |    2 +-
 deps/openssl/openssl/test/jpaketest.c         |    2 +-
 deps/openssl/openssl/test/md2test.c           |    2 +-
 deps/openssl/openssl/test/md4test.c           |    2 +-
 deps/openssl/openssl/test/md5test.c           |    2 +-
 deps/openssl/openssl/test/mdc2test.c          |    2 +-
 deps/openssl/openssl/test/randtest.c          |    2 +-
 deps/openssl/openssl/test/rc2test.c           |    2 +-
 deps/openssl/openssl/test/rc4test.c           |    2 +-
 deps/openssl/openssl/test/rc5test.c           |    2 +-
 deps/openssl/openssl/test/rmdtest.c           |    2 +-
 deps/openssl/openssl/test/rsa_test.c          |    2 +-
 deps/openssl/openssl/test/sha1test.c          |    2 +-
 deps/openssl/openssl/test/sha256t.c           |    2 +-
 deps/openssl/openssl/test/sha512t.c           |    2 +-
 deps/openssl/openssl/test/shatest.c           |    2 +-
 deps/openssl/openssl/test/srptest.c           |    2 +-
 deps/openssl/openssl/test/ssltest.c           |    2 +-
 deps/openssl/openssl/test/tx509               |    7 +
 deps/openssl/openssl/test/v3nametest.c        |    2 +-
 deps/openssl/openssl/test/verify_extra_test.c |    2 +-
 deps/openssl/openssl/test/wp_test.c           |    2 +-
 deps/openssl/openssl/times/090/586-100.nt     |   32 -
 deps/openssl/openssl/times/091/486-50.nt      |   30 -
 deps/openssl/openssl/times/091/586-100.lnx    |   32 -
 deps/openssl/openssl/times/091/68000.bsd      |   32 -
 deps/openssl/openssl/times/091/686-200.lnx    |   32 -
 deps/openssl/openssl/times/091/alpha064.osf   |   32 -
 deps/openssl/openssl/times/091/alpha164.lnx   |   32 -
 deps/openssl/openssl/times/091/alpha164.osf   |   31 -
 deps/openssl/openssl/times/091/mips-rel.pl    |   21 -
 deps/openssl/openssl/times/091/r10000.irx     |   37 -
 deps/openssl/openssl/times/091/r3000.ult      |   32 -
 deps/openssl/openssl/times/091/r4400.irx      |   32 -
 deps/openssl/openssl/times/100.lnx            |   32 -
 deps/openssl/openssl/times/100.nt             |   29 -
 deps/openssl/openssl/times/200.lnx            |   30 -
 deps/openssl/openssl/times/486-66.dos         |   22 -
 deps/openssl/openssl/times/486-66.nt          |   22 -
 deps/openssl/openssl/times/486-66.w31         |   23 -
 deps/openssl/openssl/times/5.lnx              |   29 -
 deps/openssl/openssl/times/586-085i.nt        |   29 -
 deps/openssl/openssl/times/586-100.LN3        |   26 -
 deps/openssl/openssl/times/586-100.NT2        |   26 -
 deps/openssl/openssl/times/586-100.dos        |   24 -
 deps/openssl/openssl/times/586-100.ln4        |   26 -
 deps/openssl/openssl/times/586-100.lnx        |   23 -
 deps/openssl/openssl/times/586-100.nt         |   23 -
 deps/openssl/openssl/times/586-100.ntx        |   30 -
 deps/openssl/openssl/times/586-100.w31        |   27 -
 deps/openssl/openssl/times/586-1002.lnx       |   26 -
 deps/openssl/openssl/times/586p-100.lnx       |   26 -
 deps/openssl/openssl/times/686-200.bsd        |   25 -
 deps/openssl/openssl/times/686-200.lnx        |   26 -
 deps/openssl/openssl/times/686-200.nt         |   24 -
 deps/openssl/openssl/times/L1                 |   27 -
 deps/openssl/openssl/times/R10000.t           |   24 -
 deps/openssl/openssl/times/R4400.t            |   26 -
 deps/openssl/openssl/times/aix.t              |   34 -
 deps/openssl/openssl/times/aixold.t           |   23 -
 deps/openssl/openssl/times/alpha.t            |   81 --
 deps/openssl/openssl/times/alpha400.t         |   25 -
 deps/openssl/openssl/times/cyrix100.lnx       |   22 -
 deps/openssl/openssl/times/dgux-x86.t         |   23 -
 deps/openssl/openssl/times/dgux.t             |   17 -
 deps/openssl/openssl/times/hpux-acc.t         |   25 -
 deps/openssl/openssl/times/hpux-kr.t          |   23 -
 deps/openssl/openssl/times/hpux.t             |   86 --
 deps/openssl/openssl/times/p2.w95             |   22 -
 deps/openssl/openssl/times/pent2.t            |   24 -
 deps/openssl/openssl/times/readme             |   11 -
 deps/openssl/openssl/times/s586-100.lnx       |   25 -
 deps/openssl/openssl/times/s586-100.nt        |   23 -
 deps/openssl/openssl/times/sgi.t              |   29 -
 deps/openssl/openssl/times/sparc.t            |   26 -
 deps/openssl/openssl/times/sparc2             |   21 -
 deps/openssl/openssl/times/sparcLX.t          |   22 -
 deps/openssl/openssl/times/usparc.t           |   25 -
 deps/openssl/openssl/times/x86/bfs.cpp        |   67 --
 deps/openssl/openssl/times/x86/casts.cpp      |   67 --
 deps/openssl/openssl/times/x86/des3s.cpp      |   67 --
 deps/openssl/openssl/times/x86/dess.cpp       |   67 --
 deps/openssl/openssl/times/x86/md4s.cpp       |   78 --
 deps/openssl/openssl/times/x86/md5s.cpp       |   78 --
 deps/openssl/openssl/times/x86/rc4s.cpp       |   73 --
 deps/openssl/openssl/times/x86/sha1s.cpp      |   79 --
 deps/openssl/openssl/util/domd                |    3 +-
 deps/openssl/openssl/util/indent.pro          |   16 +
 deps/openssl/openssl/util/mk1mf.pl            |    2 +-
 deps/openssl/openssl/util/mkrc.pl             |    2 +-
 deps/openssl/openssl/util/mkstack.pl          |    2 +-
 deps/openssl/openssl/util/pl/VC-32.pl         |    7 +-
 deps/openssl/openssl/util/pod2mantest         |   58 -
 deps/openssl/openssl/util/selftest.pl         |    1 +
 deps/openssl/openssl/util/toutf8.sh           |   17 +
 357 files changed, 2887 insertions(+), 4847 deletions(-)
 create mode 100644 deps/openssl/openssl/CONTRIBUTING
 create mode 100644 deps/openssl/openssl/appveyor.yml
 delete mode 100644 deps/openssl/openssl/crypto/des/t/test
 create mode 100644 deps/openssl/openssl/doc/dir-locals.example.el
 create mode 100644 deps/openssl/openssl/doc/openssl-c-indent.el
 delete mode 100644 deps/openssl/openssl/doc/openssl_button.gif
 delete mode 100644 deps/openssl/openssl/doc/openssl_button.html
 create mode 100644 deps/openssl/openssl/doc/ssl/SSL_check_chain.pod
 create mode 100644 deps/openssl/openssl/ssl/clienthellotest.c
 delete mode 100755 deps/openssl/openssl/test/bctest
 create mode 100644 deps/openssl/openssl/test/certs/pss1.pem
 create mode 120000 deps/openssl/openssl/test/clienthellotest.c
 delete mode 100644 deps/openssl/openssl/times/090/586-100.nt
 delete mode 100644 deps/openssl/openssl/times/091/486-50.nt
 delete mode 100644 deps/openssl/openssl/times/091/586-100.lnx
 delete mode 100644 deps/openssl/openssl/times/091/68000.bsd
 delete mode 100644 deps/openssl/openssl/times/091/686-200.lnx
 delete mode 100644 deps/openssl/openssl/times/091/alpha064.osf
 delete mode 100644 deps/openssl/openssl/times/091/alpha164.lnx
 delete mode 100644 deps/openssl/openssl/times/091/alpha164.osf
 delete mode 100644 deps/openssl/openssl/times/091/mips-rel.pl
 delete mode 100644 deps/openssl/openssl/times/091/r10000.irx
 delete mode 100644 deps/openssl/openssl/times/091/r3000.ult
 delete mode 100644 deps/openssl/openssl/times/091/r4400.irx
 delete mode 100644 deps/openssl/openssl/times/100.lnx
 delete mode 100644 deps/openssl/openssl/times/100.nt
 delete mode 100644 deps/openssl/openssl/times/200.lnx
 delete mode 100644 deps/openssl/openssl/times/486-66.dos
 delete mode 100644 deps/openssl/openssl/times/486-66.nt
 delete mode 100644 deps/openssl/openssl/times/486-66.w31
 delete mode 100644 deps/openssl/openssl/times/5.lnx
 delete mode 100644 deps/openssl/openssl/times/586-085i.nt
 delete mode 100644 deps/openssl/openssl/times/586-100.LN3
 delete mode 100644 deps/openssl/openssl/times/586-100.NT2
 delete mode 100644 deps/openssl/openssl/times/586-100.dos
 delete mode 100644 deps/openssl/openssl/times/586-100.ln4
 delete mode 100644 deps/openssl/openssl/times/586-100.lnx
 delete mode 100644 deps/openssl/openssl/times/586-100.nt
 delete mode 100644 deps/openssl/openssl/times/586-100.ntx
 delete mode 100644 deps/openssl/openssl/times/586-100.w31
 delete mode 100644 deps/openssl/openssl/times/586-1002.lnx
 delete mode 100644 deps/openssl/openssl/times/586p-100.lnx
 delete mode 100644 deps/openssl/openssl/times/686-200.bsd
 delete mode 100644 deps/openssl/openssl/times/686-200.lnx
 delete mode 100644 deps/openssl/openssl/times/686-200.nt
 delete mode 100644 deps/openssl/openssl/times/L1
 delete mode 100644 deps/openssl/openssl/times/R10000.t
 delete mode 100644 deps/openssl/openssl/times/R4400.t
 delete mode 100644 deps/openssl/openssl/times/aix.t
 delete mode 100644 deps/openssl/openssl/times/aixold.t
 delete mode 100644 deps/openssl/openssl/times/alpha.t
 delete mode 100644 deps/openssl/openssl/times/alpha400.t
 delete mode 100644 deps/openssl/openssl/times/cyrix100.lnx
 delete mode 100644 deps/openssl/openssl/times/dgux-x86.t
 delete mode 100644 deps/openssl/openssl/times/dgux.t
 delete mode 100644 deps/openssl/openssl/times/hpux-acc.t
 delete mode 100644 deps/openssl/openssl/times/hpux-kr.t
 delete mode 100644 deps/openssl/openssl/times/hpux.t
 delete mode 100644 deps/openssl/openssl/times/p2.w95
 delete mode 100644 deps/openssl/openssl/times/pent2.t
 delete mode 100644 deps/openssl/openssl/times/readme
 delete mode 100644 deps/openssl/openssl/times/s586-100.lnx
 delete mode 100644 deps/openssl/openssl/times/s586-100.nt
 delete mode 100644 deps/openssl/openssl/times/sgi.t
 delete mode 100644 deps/openssl/openssl/times/sparc.t
 delete mode 100644 deps/openssl/openssl/times/sparc2
 delete mode 100644 deps/openssl/openssl/times/sparcLX.t
 delete mode 100644 deps/openssl/openssl/times/usparc.t
 delete mode 100644 deps/openssl/openssl/times/x86/bfs.cpp
 delete mode 100644 deps/openssl/openssl/times/x86/casts.cpp
 delete mode 100644 deps/openssl/openssl/times/x86/des3s.cpp
 delete mode 100644 deps/openssl/openssl/times/x86/dess.cpp
 delete mode 100644 deps/openssl/openssl/times/x86/md4s.cpp
 delete mode 100644 deps/openssl/openssl/times/x86/md5s.cpp
 delete mode 100644 deps/openssl/openssl/times/x86/rc4s.cpp
 delete mode 100644 deps/openssl/openssl/times/x86/sha1s.cpp
 delete mode 100755 deps/openssl/openssl/util/pod2mantest
 create mode 100644 deps/openssl/openssl/util/toutf8.sh

diff --git a/deps/openssl/asm/arm-void-gas/bn/armv4-gf2m.S b/deps/openssl/asm/arm-void-gas/bn/armv4-gf2m.S
index 32610558ac5853..ad71aa0b667d94 100644
--- a/deps/openssl/asm/arm-void-gas/bn/armv4-gf2m.S
+++ b/deps/openssl/asm/arm-void-gas/bn/armv4-gf2m.S
@@ -98,7 +98,7 @@ bn_GF2m_mul_2x2:
 	mov	r12,#7<<2
 	sub	sp,sp,#32		@ allocate tab[8]
 
-	bl	mul_1x1_ialu		@ a1�b1
+	bl	mul_1x1_ialu		@ a1·b1
 	str	r5,[r10,#8]
 	str	r4,[r10,#12]
 
@@ -108,13 +108,13 @@ bn_GF2m_mul_2x2:
 	 eor	r2,r2,r1
 	eor	r0,r0,r3
 	 eor	r1,r1,r2
-	bl	mul_1x1_ialu		@ a0�b0
+	bl	mul_1x1_ialu		@ a0·b0
 	str	r5,[r10]
 	str	r4,[r10,#4]
 
 	eor	r1,r1,r2
 	eor	r0,r0,r3
-	bl	mul_1x1_ialu		@ (a1+a0)�(b1+b0)
+	bl	mul_1x1_ialu		@ (a1+a0)·(b1+b0)
 	ldmia	r10,{r6-r9}
 	eor	r5,r5,r4
 	eor	r4,r4,r7
diff --git a/deps/openssl/asm/arm-void-gas/modes/ghash-armv4.S b/deps/openssl/asm/arm-void-gas/modes/ghash-armv4.S
index c54f5149974c6f..6f699dbd870818 100644
--- a/deps/openssl/asm/arm-void-gas/modes/ghash-armv4.S
+++ b/deps/openssl/asm/arm-void-gas/modes/ghash-armv4.S
@@ -3,6 +3,11 @@
 .text
 .code	32
 
+#ifdef __clang__
+#define ldrplb	ldrbpl
+#define ldrneb	ldrbne
+#endif
+
 .type	rem_4bit,%object
 .align	5
 rem_4bit:
diff --git a/deps/openssl/asm/arm-void-gas/modes/ghashv8-armx.S b/deps/openssl/asm/arm-void-gas/modes/ghashv8-armx.S
index 269574945fa6a2..9aaea13f9197db 100644
--- a/deps/openssl/asm/arm-void-gas/modes/ghashv8-armx.S
+++ b/deps/openssl/asm/arm-void-gas/modes/ghashv8-armx.S
@@ -66,10 +66,10 @@ gcm_gmult_v8:
 #endif
 	vext.8		q3,q9,q9,#8
 
-	.byte	0x86,0x0e,0xa8,0xf2	@ pmull q0,q12,q3		@ H.lo�Xi.lo
+	.byte	0x86,0x0e,0xa8,0xf2	@ pmull q0,q12,q3		@ H.lo·Xi.lo
 	veor		q9,q9,q3		@ Karatsuba pre-processing
-	.byte	0x87,0x4e,0xa9,0xf2	@ pmull2 q2,q12,q3		@ H.hi�Xi.hi
-	.byte	0xa2,0x2e,0xaa,0xf2	@ pmull q1,q13,q9		@ (H.lo+H.hi)�(Xi.lo+Xi.hi)
+	.byte	0x87,0x4e,0xa9,0xf2	@ pmull2 q2,q12,q3		@ H.hi·Xi.hi
+	.byte	0xa2,0x2e,0xaa,0xf2	@ pmull q1,q13,q9		@ (H.lo+H.hi)·(Xi.lo+Xi.hi)
 
 	vext.8		q9,q0,q2,#8		@ Karatsuba post-processing
 	veor		q10,q0,q2
@@ -134,7 +134,7 @@ gcm_ghash_v8:
 #endif
 	vext.8		q7,q9,q9,#8
 	veor		q3,q3,q0		@ I[i]^=Xi
-	.byte	0x8e,0x8e,0xa8,0xf2	@ pmull q4,q12,q7		@ H�Ii+1
+	.byte	0x8e,0x8e,0xa8,0xf2	@ pmull q4,q12,q7		@ H·Ii+1
 	veor		q9,q9,q7		@ Karatsuba pre-processing
 	.byte	0x8f,0xce,0xa9,0xf2	@ pmull2 q6,q12,q7
 	b		.Loop_mod2x_v8
@@ -143,14 +143,14 @@ gcm_ghash_v8:
 .Loop_mod2x_v8:
 	vext.8		q10,q3,q3,#8
 	subs		r3,r3,#32		@ is there more data?
-	.byte	0x86,0x0e,0xac,0xf2	@ pmull q0,q14,q3		@ H^2.lo�Xi.lo
+	.byte	0x86,0x0e,0xac,0xf2	@ pmull q0,q14,q3		@ H^2.lo·Xi.lo
 	movlo	r12,#0			@ is it time to zero r12?
 
 	 .byte	0xa2,0xae,0xaa,0xf2	@ pmull q5,q13,q9
 	veor		q10,q10,q3		@ Karatsuba pre-processing
-	.byte	0x87,0x4e,0xad,0xf2	@ pmull2 q2,q14,q3		@ H^2.hi�Xi.hi
+	.byte	0x87,0x4e,0xad,0xf2	@ pmull2 q2,q14,q3		@ H^2.hi·Xi.hi
 	veor		q0,q0,q4		@ accumulate
-	.byte	0xa5,0x2e,0xab,0xf2	@ pmull2 q1,q13,q10		@ (H^2.lo+H^2.hi)�(Xi.lo+Xi.hi)
+	.byte	0xa5,0x2e,0xab,0xf2	@ pmull2 q1,q13,q10		@ (H^2.lo+H^2.hi)·(Xi.lo+Xi.hi)
 	 vld1.64	{q8},[r2],r12	@ load [rotated] I[i+2]
 
 	veor		q2,q2,q6
@@ -175,7 +175,7 @@ gcm_ghash_v8:
 	 vext.8		q7,q9,q9,#8
 	 vext.8		q3,q8,q8,#8
 	veor		q0,q1,q10
-	 .byte	0x8e,0x8e,0xa8,0xf2	@ pmull q4,q12,q7		@ H�Ii+1
+	 .byte	0x8e,0x8e,0xa8,0xf2	@ pmull q4,q12,q7		@ H·Ii+1
 	veor		q3,q3,q2		@ accumulate q3 early
 
 	vext.8		q10,q0,q0,#8		@ 2nd phase of reduction
@@ -196,10 +196,10 @@ gcm_ghash_v8:
 	veor		q3,q3,q0		@ inp^=Xi
 	veor		q9,q8,q10		@ q9 is rotated inp^Xi
 
-	.byte	0x86,0x0e,0xa8,0xf2	@ pmull q0,q12,q3		@ H.lo�Xi.lo
+	.byte	0x86,0x0e,0xa8,0xf2	@ pmull q0,q12,q3		@ H.lo·Xi.lo
 	veor		q9,q9,q3		@ Karatsuba pre-processing
-	.byte	0x87,0x4e,0xa9,0xf2	@ pmull2 q2,q12,q3		@ H.hi�Xi.hi
-	.byte	0xa2,0x2e,0xaa,0xf2	@ pmull q1,q13,q9		@ (H.lo+H.hi)�(Xi.lo+Xi.hi)
+	.byte	0x87,0x4e,0xa9,0xf2	@ pmull2 q2,q12,q3		@ H.hi·Xi.hi
+	.byte	0xa2,0x2e,0xaa,0xf2	@ pmull q1,q13,q9		@ (H.lo+H.hi)·(Xi.lo+Xi.hi)
 
 	vext.8		q9,q0,q2,#8		@ Karatsuba post-processing
 	veor		q10,q0,q2
diff --git a/deps/openssl/asm/arm64-linux64-gas/modes/ghashv8-armx.S b/deps/openssl/asm/arm64-linux64-gas/modes/ghashv8-armx.S
index 479007dc54dfab..fc3dadd08a17a9 100644
--- a/deps/openssl/asm/arm64-linux64-gas/modes/ghashv8-armx.S
+++ b/deps/openssl/asm/arm64-linux64-gas/modes/ghashv8-armx.S
@@ -65,10 +65,10 @@ gcm_gmult_v8:
 #endif
 	ext		v3.16b,v17.16b,v17.16b,#8
 
-	pmull	v0.1q,v20.1d,v3.1d		//H.lo�Xi.lo
+	pmull	v0.1q,v20.1d,v3.1d		//H.lo·Xi.lo
 	eor		v17.16b,v17.16b,v3.16b		//Karatsuba pre-processing
-	pmull2	v2.1q,v20.2d,v3.2d		//H.hi�Xi.hi
-	pmull	v1.1q,v21.1d,v17.1d		//(H.lo+H.hi)�(Xi.lo+Xi.hi)
+	pmull2	v2.1q,v20.2d,v3.2d		//H.hi·Xi.hi
+	pmull	v1.1q,v21.1d,v17.1d		//(H.lo+H.hi)·(Xi.lo+Xi.hi)
 
 	ext		v17.16b,v0.16b,v2.16b,#8		//Karatsuba post-processing
 	eor		v18.16b,v0.16b,v2.16b
@@ -132,7 +132,7 @@ gcm_ghash_v8:
 #endif
 	ext		v7.16b,v17.16b,v17.16b,#8
 	eor		v3.16b,v3.16b,v0.16b		//I[i]^=Xi
-	pmull	v4.1q,v20.1d,v7.1d		//H�Ii+1
+	pmull	v4.1q,v20.1d,v7.1d		//H·Ii+1
 	eor		v17.16b,v17.16b,v7.16b		//Karatsuba pre-processing
 	pmull2	v6.1q,v20.2d,v7.2d
 	b		.Loop_mod2x_v8
@@ -141,14 +141,14 @@ gcm_ghash_v8:
 .Loop_mod2x_v8:
 	ext		v18.16b,v3.16b,v3.16b,#8
 	subs		x3,x3,#32		//is there more data?
-	pmull	v0.1q,v22.1d,v3.1d		//H^2.lo�Xi.lo
+	pmull	v0.1q,v22.1d,v3.1d		//H^2.lo·Xi.lo
 	csel	x12,xzr,x12,lo			//is it time to zero x12?
 
 	 pmull	v5.1q,v21.1d,v17.1d
 	eor		v18.16b,v18.16b,v3.16b		//Karatsuba pre-processing
-	pmull2	v2.1q,v22.2d,v3.2d		//H^2.hi�Xi.hi
+	pmull2	v2.1q,v22.2d,v3.2d		//H^2.hi·Xi.hi
 	eor		v0.16b,v0.16b,v4.16b		//accumulate
-	pmull2	v1.1q,v21.2d,v18.2d		//(H^2.lo+H^2.hi)�(Xi.lo+Xi.hi)
+	pmull2	v1.1q,v21.2d,v18.2d		//(H^2.lo+H^2.hi)·(Xi.lo+Xi.hi)
 	 ld1	{v16.2d},[x2],x12	//load [rotated] I[i+2]
 
 	eor		v2.16b,v2.16b,v6.16b
@@ -173,7 +173,7 @@ gcm_ghash_v8:
 	 ext		v7.16b,v17.16b,v17.16b,#8
 	 ext		v3.16b,v16.16b,v16.16b,#8
 	eor		v0.16b,v1.16b,v18.16b
-	 pmull	v4.1q,v20.1d,v7.1d		//H�Ii+1
+	 pmull	v4.1q,v20.1d,v7.1d		//H·Ii+1
 	eor		v3.16b,v3.16b,v2.16b		//accumulate v3.16b early
 
 	ext		v18.16b,v0.16b,v0.16b,#8		//2nd phase of reduction
@@ -194,10 +194,10 @@ gcm_ghash_v8:
 	eor		v3.16b,v3.16b,v0.16b		//inp^=Xi
 	eor		v17.16b,v16.16b,v18.16b		//v17.16b is rotated inp^Xi
 
-	pmull	v0.1q,v20.1d,v3.1d		//H.lo�Xi.lo
+	pmull	v0.1q,v20.1d,v3.1d		//H.lo·Xi.lo
 	eor		v17.16b,v17.16b,v3.16b		//Karatsuba pre-processing
-	pmull2	v2.1q,v20.2d,v3.2d		//H.hi�Xi.hi
-	pmull	v1.1q,v21.1d,v17.1d		//(H.lo+H.hi)�(Xi.lo+Xi.hi)
+	pmull2	v2.1q,v20.2d,v3.2d		//H.hi·Xi.hi
+	pmull	v1.1q,v21.1d,v17.1d		//(H.lo+H.hi)·(Xi.lo+Xi.hi)
 
 	ext		v17.16b,v0.16b,v2.16b,#8		//Karatsuba post-processing
 	eor		v18.16b,v0.16b,v2.16b
diff --git a/deps/openssl/asm/x64-elf-gas/aes/aesni-sha256-x86_64.s b/deps/openssl/asm/x64-elf-gas/aes/aesni-sha256-x86_64.s
index 14c1f7a7e2660c..3df7f1bf5222a2 100644
--- a/deps/openssl/asm/x64-elf-gas/aes/aesni-sha256-x86_64.s
+++ b/deps/openssl/asm/x64-elf-gas/aes/aesni-sha256-x86_64.s
@@ -21,11 +21,8 @@ aesni_cbc_sha256_enc:
 	andl	$296,%r11d
 	cmpl	$296,%r11d
 	je	aesni_cbc_sha256_enc_avx2
-	andl	$1073741824,%eax
-	andl	$268435968,%r10d
-	orl	%eax,%r10d
-	cmpl	$1342177792,%r10d
-	je	aesni_cbc_sha256_enc_avx
+	andl	$268435456,%r10d
+	jnz	aesni_cbc_sha256_enc_avx
 	ud2
 	xorl	%eax,%eax
 	cmpq	$0,%rdi
diff --git a/deps/openssl/asm/x64-elf-gas/bn/x86_64-mont5.s b/deps/openssl/asm/x64-elf-gas/bn/x86_64-mont5.s
index db3fe399abd495..41e96c8e90e262 100644
--- a/deps/openssl/asm/x64-elf-gas/bn/x86_64-mont5.s
+++ b/deps/openssl/asm/x64-elf-gas/bn/x86_64-mont5.s
@@ -1565,6 +1565,15 @@ sqr8x_reduction:
 .align	32
 .L8x_tail_done:
 	addq	(%rdx),%r8
+	adcq	$0,%r9
+	adcq	$0,%r10
+	adcq	$0,%r11
+	adcq	$0,%r12
+	adcq	$0,%r13
+	adcq	$0,%r14
+	adcq	$0,%r15
+
+
 	xorq	%rax,%rax
 
 	negq	%rsi
@@ -2806,6 +2815,15 @@ sqrx8x_reduction:
 .align	32
 .Lsqrx8x_tail_done:
 	addq	24+8(%rsp),%r8
+	adcq	$0,%r9
+	adcq	$0,%r10
+	adcq	$0,%r11
+	adcq	$0,%r12
+	adcq	$0,%r13
+	adcq	$0,%r14
+	adcq	$0,%r15
+
+
 	movq	%rsi,%rax
 
 	subq	16+8(%rsp),%rsi
@@ -2839,13 +2857,11 @@ sqrx8x_reduction:
 	leaq	64(%rdi,%rcx,1),%rdi
 	cmpq	8+8(%rsp),%r8
 	jb	.Lsqrx8x_reduction_loop
-	xorq	%rbx,%rbx
+	xorl	%ebx,%ebx
 	subq	%r15,%rsi
 	adcq	%rbx,%rbx
 	movq	%rcx,%r10
-.byte	0x67
 	orq	%rbx,%rax
-.byte	0x67
 	movq	%rcx,%r9
 	xorq	$1,%rax
 	sarq	$3+2,%rcx
diff --git a/deps/openssl/asm/x64-macosx-gas/aes/aesni-sha256-x86_64.s b/deps/openssl/asm/x64-macosx-gas/aes/aesni-sha256-x86_64.s
index 6c6685fba4f79e..7d8bdff63499df 100644
--- a/deps/openssl/asm/x64-macosx-gas/aes/aesni-sha256-x86_64.s
+++ b/deps/openssl/asm/x64-macosx-gas/aes/aesni-sha256-x86_64.s
@@ -21,11 +21,8 @@ _aesni_cbc_sha256_enc:
 	andl	$296,%r11d
 	cmpl	$296,%r11d
 	je	aesni_cbc_sha256_enc_avx2
-	andl	$1073741824,%eax
-	andl	$268435968,%r10d
-	orl	%eax,%r10d
-	cmpl	$1342177792,%r10d
-	je	aesni_cbc_sha256_enc_avx
+	andl	$268435456,%r10d
+	jnz	aesni_cbc_sha256_enc_avx
 	ud2
 	xorl	%eax,%eax
 	cmpq	$0,%rdi
diff --git a/deps/openssl/asm/x64-macosx-gas/bn/x86_64-mont5.s b/deps/openssl/asm/x64-macosx-gas/bn/x86_64-mont5.s
index 5470fb0336182a..99a16f85032d1e 100644
--- a/deps/openssl/asm/x64-macosx-gas/bn/x86_64-mont5.s
+++ b/deps/openssl/asm/x64-macosx-gas/bn/x86_64-mont5.s
@@ -1565,6 +1565,15 @@ L$8x_tail:
 .p2align	5
 L$8x_tail_done:
 	addq	(%rdx),%r8
+	adcq	$0,%r9
+	adcq	$0,%r10
+	adcq	$0,%r11
+	adcq	$0,%r12
+	adcq	$0,%r13
+	adcq	$0,%r14
+	adcq	$0,%r15
+
+
 	xorq	%rax,%rax
 
 	negq	%rsi
@@ -2806,6 +2815,15 @@ L$sqrx8x_tail:
 .p2align	5
 L$sqrx8x_tail_done:
 	addq	24+8(%rsp),%r8
+	adcq	$0,%r9
+	adcq	$0,%r10
+	adcq	$0,%r11
+	adcq	$0,%r12
+	adcq	$0,%r13
+	adcq	$0,%r14
+	adcq	$0,%r15
+
+
 	movq	%rsi,%rax
 
 	subq	16+8(%rsp),%rsi
@@ -2839,13 +2857,11 @@ L$sqrx8x_no_tail:
 	leaq	64(%rdi,%rcx,1),%rdi
 	cmpq	8+8(%rsp),%r8
 	jb	L$sqrx8x_reduction_loop
-	xorq	%rbx,%rbx
+	xorl	%ebx,%ebx
 	subq	%r15,%rsi
 	adcq	%rbx,%rbx
 	movq	%rcx,%r10
-.byte	0x67
 	orq	%rbx,%rax
-.byte	0x67
 	movq	%rcx,%r9
 	xorq	$1,%rax
 	sarq	$3+2,%rcx
diff --git a/deps/openssl/asm/x64-win32-masm/aes/aesni-sha256-x86_64.asm b/deps/openssl/asm/x64-win32-masm/aes/aesni-sha256-x86_64.asm
index 700d7f58f5c731..602ee5b2655442 100644
--- a/deps/openssl/asm/x64-win32-masm/aes/aesni-sha256-x86_64.asm
+++ b/deps/openssl/asm/x64-win32-masm/aes/aesni-sha256-x86_64.asm
@@ -22,11 +22,8 @@ aesni_cbc_sha256_enc	PROC PUBLIC
 	and	r11d,296
 	cmp	r11d,296
 	je	aesni_cbc_sha256_enc_avx2
-	and	eax,1073741824
-	and	r10d,268435968
-	or	r10d,eax
-	cmp	r10d,1342177792
-	je	aesni_cbc_sha256_enc_avx
+	and	r10d,268435456
+	jnz	aesni_cbc_sha256_enc_avx
 	ud2
 	xor	eax,eax
 	cmp	rcx,0
diff --git a/deps/openssl/asm/x64-win32-masm/bn/x86_64-mont5.asm b/deps/openssl/asm/x64-win32-masm/bn/x86_64-mont5.asm
index 9fdd91d0165574..eae2339ef1378d 100644
--- a/deps/openssl/asm/x64-win32-masm/bn/x86_64-mont5.asm
+++ b/deps/openssl/asm/x64-win32-masm/bn/x86_64-mont5.asm
@@ -1624,6 +1624,15 @@ $L$8x_tail::
 ALIGN	32
 $L$8x_tail_done::
 	add	r8,QWORD PTR[rdx]
+	adc	r9,0
+	adc	r10,0
+	adc	r11,0
+	adc	r12,0
+	adc	r13,0
+	adc	r14,0
+	adc	r15,0
+
+
 	xor	rax,rax
 
 	neg	rsi
@@ -2923,6 +2932,15 @@ DB	0c4h,062h,0fbh,0f6h,0a5h,040h,000h,000h,000h
 ALIGN	32
 $L$sqrx8x_tail_done::
 	add	r8,QWORD PTR[((24+8))+rsp]
+	adc	r9,0
+	adc	r10,0
+	adc	r11,0
+	adc	r12,0
+	adc	r13,0
+	adc	r14,0
+	adc	r15,0
+
+
 	mov	rax,rsi
 
 	sub	rsi,QWORD PTR[((16+8))+rsp]
@@ -2956,13 +2974,11 @@ DB	102,72,15,126,213
 	lea	rdi,QWORD PTR[64+rcx*1+rdi]
 	cmp	r8,QWORD PTR[((8+8))+rsp]
 	jb	$L$sqrx8x_reduction_loop
-	xor	rbx,rbx
+	xor	ebx,ebx
 	sub	rsi,r15
 	adc	rbx,rbx
 	mov	r10,rcx
-DB	067h
 	or	rax,rbx
-DB	067h
 	mov	r9,rcx
 	xor	rax,1
 	sar	rcx,3+2
diff --git a/deps/openssl/asm_obsolete/arm-void-gas/bn/armv4-gf2m.S b/deps/openssl/asm_obsolete/arm-void-gas/bn/armv4-gf2m.S
index 32610558ac5853..ad71aa0b667d94 100644
--- a/deps/openssl/asm_obsolete/arm-void-gas/bn/armv4-gf2m.S
+++ b/deps/openssl/asm_obsolete/arm-void-gas/bn/armv4-gf2m.S
@@ -98,7 +98,7 @@ bn_GF2m_mul_2x2:
 	mov	r12,#7<<2
 	sub	sp,sp,#32		@ allocate tab[8]
 
-	bl	mul_1x1_ialu		@ a1�b1
+	bl	mul_1x1_ialu		@ a1·b1
 	str	r5,[r10,#8]
 	str	r4,[r10,#12]
 
@@ -108,13 +108,13 @@ bn_GF2m_mul_2x2:
 	 eor	r2,r2,r1
 	eor	r0,r0,r3
 	 eor	r1,r1,r2
-	bl	mul_1x1_ialu		@ a0�b0
+	bl	mul_1x1_ialu		@ a0·b0
 	str	r5,[r10]
 	str	r4,[r10,#4]
 
 	eor	r1,r1,r2
 	eor	r0,r0,r3
-	bl	mul_1x1_ialu		@ (a1+a0)�(b1+b0)
+	bl	mul_1x1_ialu		@ (a1+a0)·(b1+b0)
 	ldmia	r10,{r6-r9}
 	eor	r5,r5,r4
 	eor	r4,r4,r7
diff --git a/deps/openssl/asm_obsolete/arm-void-gas/modes/ghash-armv4.S b/deps/openssl/asm_obsolete/arm-void-gas/modes/ghash-armv4.S
index c54f5149974c6f..6f699dbd870818 100644
--- a/deps/openssl/asm_obsolete/arm-void-gas/modes/ghash-armv4.S
+++ b/deps/openssl/asm_obsolete/arm-void-gas/modes/ghash-armv4.S
@@ -3,6 +3,11 @@
 .text
 .code	32
 
+#ifdef __clang__
+#define ldrplb	ldrbpl
+#define ldrneb	ldrbne
+#endif
+
 .type	rem_4bit,%object
 .align	5
 rem_4bit:
diff --git a/deps/openssl/asm_obsolete/arm-void-gas/modes/ghashv8-armx.S b/deps/openssl/asm_obsolete/arm-void-gas/modes/ghashv8-armx.S
index 269574945fa6a2..9aaea13f9197db 100644
--- a/deps/openssl/asm_obsolete/arm-void-gas/modes/ghashv8-armx.S
+++ b/deps/openssl/asm_obsolete/arm-void-gas/modes/ghashv8-armx.S
@@ -66,10 +66,10 @@ gcm_gmult_v8:
 #endif
 	vext.8		q3,q9,q9,#8
 
-	.byte	0x86,0x0e,0xa8,0xf2	@ pmull q0,q12,q3		@ H.lo�Xi.lo
+	.byte	0x86,0x0e,0xa8,0xf2	@ pmull q0,q12,q3		@ H.lo·Xi.lo
 	veor		q9,q9,q3		@ Karatsuba pre-processing
-	.byte	0x87,0x4e,0xa9,0xf2	@ pmull2 q2,q12,q3		@ H.hi�Xi.hi
-	.byte	0xa2,0x2e,0xaa,0xf2	@ pmull q1,q13,q9		@ (H.lo+H.hi)�(Xi.lo+Xi.hi)
+	.byte	0x87,0x4e,0xa9,0xf2	@ pmull2 q2,q12,q3		@ H.hi·Xi.hi
+	.byte	0xa2,0x2e,0xaa,0xf2	@ pmull q1,q13,q9		@ (H.lo+H.hi)·(Xi.lo+Xi.hi)
 
 	vext.8		q9,q0,q2,#8		@ Karatsuba post-processing
 	veor		q10,q0,q2
@@ -134,7 +134,7 @@ gcm_ghash_v8:
 #endif
 	vext.8		q7,q9,q9,#8
 	veor		q3,q3,q0		@ I[i]^=Xi
-	.byte	0x8e,0x8e,0xa8,0xf2	@ pmull q4,q12,q7		@ H�Ii+1
+	.byte	0x8e,0x8e,0xa8,0xf2	@ pmull q4,q12,q7		@ H·Ii+1
 	veor		q9,q9,q7		@ Karatsuba pre-processing
 	.byte	0x8f,0xce,0xa9,0xf2	@ pmull2 q6,q12,q7
 	b		.Loop_mod2x_v8
@@ -143,14 +143,14 @@ gcm_ghash_v8:
 .Loop_mod2x_v8:
 	vext.8		q10,q3,q3,#8
 	subs		r3,r3,#32		@ is there more data?
-	.byte	0x86,0x0e,0xac,0xf2	@ pmull q0,q14,q3		@ H^2.lo�Xi.lo
+	.byte	0x86,0x0e,0xac,0xf2	@ pmull q0,q14,q3		@ H^2.lo·Xi.lo
 	movlo	r12,#0			@ is it time to zero r12?
 
 	 .byte	0xa2,0xae,0xaa,0xf2	@ pmull q5,q13,q9
 	veor		q10,q10,q3		@ Karatsuba pre-processing
-	.byte	0x87,0x4e,0xad,0xf2	@ pmull2 q2,q14,q3		@ H^2.hi�Xi.hi
+	.byte	0x87,0x4e,0xad,0xf2	@ pmull2 q2,q14,q3		@ H^2.hi·Xi.hi
 	veor		q0,q0,q4		@ accumulate
-	.byte	0xa5,0x2e,0xab,0xf2	@ pmull2 q1,q13,q10		@ (H^2.lo+H^2.hi)�(Xi.lo+Xi.hi)
+	.byte	0xa5,0x2e,0xab,0xf2	@ pmull2 q1,q13,q10		@ (H^2.lo+H^2.hi)·(Xi.lo+Xi.hi)
 	 vld1.64	{q8},[r2],r12	@ load [rotated] I[i+2]
 
 	veor		q2,q2,q6
@@ -175,7 +175,7 @@ gcm_ghash_v8:
 	 vext.8		q7,q9,q9,#8
 	 vext.8		q3,q8,q8,#8
 	veor		q0,q1,q10
-	 .byte	0x8e,0x8e,0xa8,0xf2	@ pmull q4,q12,q7		@ H�Ii+1
+	 .byte	0x8e,0x8e,0xa8,0xf2	@ pmull q4,q12,q7		@ H·Ii+1
 	veor		q3,q3,q2		@ accumulate q3 early
 
 	vext.8		q10,q0,q0,#8		@ 2nd phase of reduction
@@ -196,10 +196,10 @@ gcm_ghash_v8:
 	veor		q3,q3,q0		@ inp^=Xi
 	veor		q9,q8,q10		@ q9 is rotated inp^Xi
 
-	.byte	0x86,0x0e,0xa8,0xf2	@ pmull q0,q12,q3		@ H.lo�Xi.lo
+	.byte	0x86,0x0e,0xa8,0xf2	@ pmull q0,q12,q3		@ H.lo·Xi.lo
 	veor		q9,q9,q3		@ Karatsuba pre-processing
-	.byte	0x87,0x4e,0xa9,0xf2	@ pmull2 q2,q12,q3		@ H.hi�Xi.hi
-	.byte	0xa2,0x2e,0xaa,0xf2	@ pmull q1,q13,q9		@ (H.lo+H.hi)�(Xi.lo+Xi.hi)
+	.byte	0x87,0x4e,0xa9,0xf2	@ pmull2 q2,q12,q3		@ H.hi·Xi.hi
+	.byte	0xa2,0x2e,0xaa,0xf2	@ pmull q1,q13,q9		@ (H.lo+H.hi)·(Xi.lo+Xi.hi)
 
 	vext.8		q9,q0,q2,#8		@ Karatsuba post-processing
 	veor		q10,q0,q2
diff --git a/deps/openssl/asm_obsolete/arm64-linux64-gas/modes/ghashv8-armx.S b/deps/openssl/asm_obsolete/arm64-linux64-gas/modes/ghashv8-armx.S
index 479007dc54dfab..fc3dadd08a17a9 100644
--- a/deps/openssl/asm_obsolete/arm64-linux64-gas/modes/ghashv8-armx.S
+++ b/deps/openssl/asm_obsolete/arm64-linux64-gas/modes/ghashv8-armx.S
@@ -65,10 +65,10 @@ gcm_gmult_v8:
 #endif
 	ext		v3.16b,v17.16b,v17.16b,#8
 
-	pmull	v0.1q,v20.1d,v3.1d		//H.lo�Xi.lo
+	pmull	v0.1q,v20.1d,v3.1d		//H.lo·Xi.lo
 	eor		v17.16b,v17.16b,v3.16b		//Karatsuba pre-processing
-	pmull2	v2.1q,v20.2d,v3.2d		//H.hi�Xi.hi
-	pmull	v1.1q,v21.1d,v17.1d		//(H.lo+H.hi)�(Xi.lo+Xi.hi)
+	pmull2	v2.1q,v20.2d,v3.2d		//H.hi·Xi.hi
+	pmull	v1.1q,v21.1d,v17.1d		//(H.lo+H.hi)·(Xi.lo+Xi.hi)
 
 	ext		v17.16b,v0.16b,v2.16b,#8		//Karatsuba post-processing
 	eor		v18.16b,v0.16b,v2.16b
@@ -132,7 +132,7 @@ gcm_ghash_v8:
 #endif
 	ext		v7.16b,v17.16b,v17.16b,#8
 	eor		v3.16b,v3.16b,v0.16b		//I[i]^=Xi
-	pmull	v4.1q,v20.1d,v7.1d		//H�Ii+1
+	pmull	v4.1q,v20.1d,v7.1d		//H·Ii+1
 	eor		v17.16b,v17.16b,v7.16b		//Karatsuba pre-processing
 	pmull2	v6.1q,v20.2d,v7.2d
 	b		.Loop_mod2x_v8
@@ -141,14 +141,14 @@ gcm_ghash_v8:
 .Loop_mod2x_v8:
 	ext		v18.16b,v3.16b,v3.16b,#8
 	subs		x3,x3,#32		//is there more data?
-	pmull	v0.1q,v22.1d,v3.1d		//H^2.lo�Xi.lo
+	pmull	v0.1q,v22.1d,v3.1d		//H^2.lo·Xi.lo
 	csel	x12,xzr,x12,lo			//is it time to zero x12?
 
 	 pmull	v5.1q,v21.1d,v17.1d
 	eor		v18.16b,v18.16b,v3.16b		//Karatsuba pre-processing
-	pmull2	v2.1q,v22.2d,v3.2d		//H^2.hi�Xi.hi
+	pmull2	v2.1q,v22.2d,v3.2d		//H^2.hi·Xi.hi
 	eor		v0.16b,v0.16b,v4.16b		//accumulate
-	pmull2	v1.1q,v21.2d,v18.2d		//(H^2.lo+H^2.hi)�(Xi.lo+Xi.hi)
+	pmull2	v1.1q,v21.2d,v18.2d		//(H^2.lo+H^2.hi)·(Xi.lo+Xi.hi)
 	 ld1	{v16.2d},[x2],x12	//load [rotated] I[i+2]
 
 	eor		v2.16b,v2.16b,v6.16b
@@ -173,7 +173,7 @@ gcm_ghash_v8:
 	 ext		v7.16b,v17.16b,v17.16b,#8
 	 ext		v3.16b,v16.16b,v16.16b,#8
 	eor		v0.16b,v1.16b,v18.16b
-	 pmull	v4.1q,v20.1d,v7.1d		//H�Ii+1
+	 pmull	v4.1q,v20.1d,v7.1d		//H·Ii+1
 	eor		v3.16b,v3.16b,v2.16b		//accumulate v3.16b early
 
 	ext		v18.16b,v0.16b,v0.16b,#8		//2nd phase of reduction
@@ -194,10 +194,10 @@ gcm_ghash_v8:
 	eor		v3.16b,v3.16b,v0.16b		//inp^=Xi
 	eor		v17.16b,v16.16b,v18.16b		//v17.16b is rotated inp^Xi
 
-	pmull	v0.1q,v20.1d,v3.1d		//H.lo�Xi.lo
+	pmull	v0.1q,v20.1d,v3.1d		//H.lo·Xi.lo
 	eor		v17.16b,v17.16b,v3.16b		//Karatsuba pre-processing
-	pmull2	v2.1q,v20.2d,v3.2d		//H.hi�Xi.hi
-	pmull	v1.1q,v21.1d,v17.1d		//(H.lo+H.hi)�(Xi.lo+Xi.hi)
+	pmull2	v2.1q,v20.2d,v3.2d		//H.hi·Xi.hi
+	pmull	v1.1q,v21.1d,v17.1d		//(H.lo+H.hi)·(Xi.lo+Xi.hi)
 
 	ext		v17.16b,v0.16b,v2.16b,#8		//Karatsuba post-processing
 	eor		v18.16b,v0.16b,v2.16b
diff --git a/deps/openssl/asm_obsolete/x64-elf-gas/bn/x86_64-mont5.s b/deps/openssl/asm_obsolete/x64-elf-gas/bn/x86_64-mont5.s
index 5f98ff2237b711..d2d1fbf4e7d635 100644
--- a/deps/openssl/asm_obsolete/x64-elf-gas/bn/x86_64-mont5.s
+++ b/deps/openssl/asm_obsolete/x64-elf-gas/bn/x86_64-mont5.s
@@ -1557,6 +1557,15 @@ sqr8x_reduction:
 .align	32
 .L8x_tail_done:
 	addq	(%rdx),%r8
+	adcq	$0,%r9
+	adcq	$0,%r10
+	adcq	$0,%r11
+	adcq	$0,%r12
+	adcq	$0,%r13
+	adcq	$0,%r14
+	adcq	$0,%r15
+
+
 	xorq	%rax,%rax
 
 	negq	%rsi
diff --git a/deps/openssl/asm_obsolete/x64-macosx-gas/bn/x86_64-mont5.s b/deps/openssl/asm_obsolete/x64-macosx-gas/bn/x86_64-mont5.s
index 049bf06473ae02..bcd5140eba332f 100644
--- a/deps/openssl/asm_obsolete/x64-macosx-gas/bn/x86_64-mont5.s
+++ b/deps/openssl/asm_obsolete/x64-macosx-gas/bn/x86_64-mont5.s
@@ -1557,6 +1557,15 @@ L$8x_tail:
 .p2align	5
 L$8x_tail_done:
 	addq	(%rdx),%r8
+	adcq	$0,%r9
+	adcq	$0,%r10
+	adcq	$0,%r11
+	adcq	$0,%r12
+	adcq	$0,%r13
+	adcq	$0,%r14
+	adcq	$0,%r15
+
+
 	xorq	%rax,%rax
 
 	negq	%rsi
diff --git a/deps/openssl/asm_obsolete/x64-win32-masm/bn/x86_64-mont5.asm b/deps/openssl/asm_obsolete/x64-win32-masm/bn/x86_64-mont5.asm
index f690ba58d37f19..86acef32eacdb9 100644
--- a/deps/openssl/asm_obsolete/x64-win32-masm/bn/x86_64-mont5.asm
+++ b/deps/openssl/asm_obsolete/x64-win32-masm/bn/x86_64-mont5.asm
@@ -1616,6 +1616,15 @@ $L$8x_tail::
 ALIGN	32
 $L$8x_tail_done::
 	add	r8,QWORD PTR[rdx]
+	adc	r9,0
+	adc	r10,0
+	adc	r11,0
+	adc	r12,0
+	adc	r13,0
+	adc	r14,0
+	adc	r15,0
+
+
 	xor	rax,rax
 
 	neg	rsi
diff --git a/deps/openssl/config/archs/BSD-x86/opensslconf.h b/deps/openssl/config/archs/BSD-x86/opensslconf.h
index d93c0bfbb5a0aa..31e9f5416eaa29 100644
--- a/deps/openssl/config/archs/BSD-x86/opensslconf.h
+++ b/deps/openssl/config/archs/BSD-x86/opensslconf.h
@@ -221,7 +221,7 @@ extern "C" {
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/config/archs/BSD-x86_64/opensslconf.h b/deps/openssl/config/archs/BSD-x86_64/opensslconf.h
index ee73a6de4e7747..865473bac93752 100644
--- a/deps/openssl/config/archs/BSD-x86_64/opensslconf.h
+++ b/deps/openssl/config/archs/BSD-x86_64/opensslconf.h
@@ -221,7 +221,7 @@ extern "C" {
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/config/archs/VC-WIN32/opensslconf.h b/deps/openssl/config/archs/VC-WIN32/opensslconf.h
index 515a5157412e57..d49ebfa3defa3a 100644
--- a/deps/openssl/config/archs/VC-WIN32/opensslconf.h
+++ b/deps/openssl/config/archs/VC-WIN32/opensslconf.h
@@ -222,7 +222,7 @@ extern "C" {
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/config/archs/VC-WIN64A/opensslconf.h b/deps/openssl/config/archs/VC-WIN64A/opensslconf.h
index 902fa56aca02ed..b248dac0208d69 100644
--- a/deps/openssl/config/archs/VC-WIN64A/opensslconf.h
+++ b/deps/openssl/config/archs/VC-WIN64A/opensslconf.h
@@ -222,7 +222,7 @@ extern "C" {
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/config/archs/aix-gcc/opensslconf.h b/deps/openssl/config/archs/aix-gcc/opensslconf.h
index d419fb02db8289..7c71fad1c469d8 100644
--- a/deps/openssl/config/archs/aix-gcc/opensslconf.h
+++ b/deps/openssl/config/archs/aix-gcc/opensslconf.h
@@ -224,7 +224,7 @@ extern "C" {
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
 
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/config/archs/aix64-gcc/opensslconf.h b/deps/openssl/config/archs/aix64-gcc/opensslconf.h
index 3c17cfc5d047df..37490dfb5bbd65 100644
--- a/deps/openssl/config/archs/aix64-gcc/opensslconf.h
+++ b/deps/openssl/config/archs/aix64-gcc/opensslconf.h
@@ -224,7 +224,7 @@ extern "C" {
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
 
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/config/archs/darwin-i386-cc/opensslconf.h b/deps/openssl/config/archs/darwin-i386-cc/opensslconf.h
index 4dedfacceea277..02328a5333b06b 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/opensslconf.h
+++ b/deps/openssl/config/archs/darwin-i386-cc/opensslconf.h
@@ -224,7 +224,7 @@ extern "C" {
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/opensslconf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/opensslconf.h
index 1667b0a9d7aa6b..d7be6bbc4b77e1 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/opensslconf.h
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/opensslconf.h
@@ -224,7 +224,7 @@ extern "C" {
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/config/archs/linux-aarch64/opensslconf.h b/deps/openssl/config/archs/linux-aarch64/opensslconf.h
index 4bf4588b62457c..92d6937741a2dd 100644
--- a/deps/openssl/config/archs/linux-aarch64/opensslconf.h
+++ b/deps/openssl/config/archs/linux-aarch64/opensslconf.h
@@ -221,7 +221,7 @@ extern "C" {
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/config/archs/linux-armv4/opensslconf.h b/deps/openssl/config/archs/linux-armv4/opensslconf.h
index 731af2f8eca134..24d98356f6e978 100644
--- a/deps/openssl/config/archs/linux-armv4/opensslconf.h
+++ b/deps/openssl/config/archs/linux-armv4/opensslconf.h
@@ -221,7 +221,7 @@ extern "C" {
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/config/archs/linux-elf/opensslconf.h b/deps/openssl/config/archs/linux-elf/opensslconf.h
index d93c0bfbb5a0aa..31e9f5416eaa29 100644
--- a/deps/openssl/config/archs/linux-elf/opensslconf.h
+++ b/deps/openssl/config/archs/linux-elf/opensslconf.h
@@ -221,7 +221,7 @@ extern "C" {
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/config/archs/linux-ppc/opensslconf.h b/deps/openssl/config/archs/linux-ppc/opensslconf.h
index bd5d3befeda038..f5a03b47e54185 100644
--- a/deps/openssl/config/archs/linux-ppc/opensslconf.h
+++ b/deps/openssl/config/archs/linux-ppc/opensslconf.h
@@ -202,7 +202,7 @@ extern "C" {
 #endif
 
 #if defined(DES_RISC1) && defined(DES_RISC2)
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
+#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
 #endif
 
 /* Unroll the inner loop, this sometimes helps, sometimes hinders.
@@ -221,7 +221,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
 
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/config/archs/linux-ppc64/opensslconf.h b/deps/openssl/config/archs/linux-ppc64/opensslconf.h
index dc671aad0d66bd..900aa7017509f2 100644
--- a/deps/openssl/config/archs/linux-ppc64/opensslconf.h
+++ b/deps/openssl/config/archs/linux-ppc64/opensslconf.h
@@ -202,7 +202,7 @@ extern "C" {
 #endif
 
 #if defined(DES_RISC1) && defined(DES_RISC2)
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
+#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
 #endif
 
 /* Unroll the inner loop, this sometimes helps, sometimes hinders.
@@ -221,7 +221,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
 
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/config/archs/linux-x32/opensslconf.h b/deps/openssl/config/archs/linux-x32/opensslconf.h
index ad4d1e9dfa340d..79706e45b2c998 100644
--- a/deps/openssl/config/archs/linux-x32/opensslconf.h
+++ b/deps/openssl/config/archs/linux-x32/opensslconf.h
@@ -221,7 +221,7 @@ extern "C" {
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/config/archs/linux-x86_64/opensslconf.h b/deps/openssl/config/archs/linux-x86_64/opensslconf.h
index ee73a6de4e7747..865473bac93752 100644
--- a/deps/openssl/config/archs/linux-x86_64/opensslconf.h
+++ b/deps/openssl/config/archs/linux-x86_64/opensslconf.h
@@ -221,7 +221,7 @@ extern "C" {
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/opensslconf.h b/deps/openssl/config/archs/solaris-x86-gcc/opensslconf.h
index d93c0bfbb5a0aa..31e9f5416eaa29 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/opensslconf.h
+++ b/deps/openssl/config/archs/solaris-x86-gcc/opensslconf.h
@@ -221,7 +221,7 @@ extern "C" {
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/opensslconf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/opensslconf.h
index ee73a6de4e7747..865473bac93752 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/opensslconf.h
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/opensslconf.h
@@ -221,7 +221,7 @@ extern "C" {
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/openssl/CHANGES b/deps/openssl/openssl/CHANGES
index 5d4c234363f6a4..584f0dbd45d73f 100644
--- a/deps/openssl/openssl/CHANGES
+++ b/deps/openssl/openssl/CHANGES
@@ -2,6 +2,64 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 1.0.2d and 1.0.2e [3 Dec 2015]
+
+  *) BN_mod_exp may produce incorrect results on x86_64
+
+     There is a carry propagating bug in the x86_64 Montgomery squaring
+     procedure. No EC algorithms are affected. Analysis suggests that attacks
+     against RSA and DSA as a result of this defect would be very difficult to
+     perform and are not believed likely. Attacks against DH are considered just
+     feasible (although very difficult) because most of the work necessary to
+     deduce information about a private key may be performed offline. The amount
+     of resources required for such an attack would be very significant and
+     likely only accessible to a limited number of attackers. An attacker would
+     additionally need online access to an unpatched system using the target
+     private key in a scenario with persistent DH parameters and a private
+     key that is shared between multiple clients. For example this can occur by
+     default in OpenSSL DHE based SSL/TLS ciphersuites.
+
+     This issue was reported to OpenSSL by Hanno Böck.
+     (CVE-2015-3193)
+     [Andy Polyakov]
+
+  *) Certificate verify crash with missing PSS parameter
+
+     The signature verification routines will crash with a NULL pointer
+     dereference if presented with an ASN.1 signature using the RSA PSS
+     algorithm and absent mask generation function parameter. Since these
+     routines are used to verify certificate signature algorithms this can be
+     used to crash any certificate verification operation and exploited in a
+     DoS attack. Any application which performs certificate verification is
+     vulnerable including OpenSSL clients and servers which enable client
+     authentication.
+
+     This issue was reported to OpenSSL by Loïc Jonas Etienne (Qnective AG).
+     (CVE-2015-3194)
+     [Stephen Henson]
+
+  *) X509_ATTRIBUTE memory leak
+
+     When presented with a malformed X509_ATTRIBUTE structure OpenSSL will leak
+     memory. This structure is used by the PKCS#7 and CMS routines so any
+     application which reads PKCS#7 or CMS data from untrusted sources is
+     affected. SSL/TLS is not affected.
+
+     This issue was reported to OpenSSL by Adam Langley (Google/BoringSSL) using
+     libFuzzer.
+     (CVE-2015-3195)
+     [Stephen Henson]
+
+  *) Rewrite EVP_DecodeUpdate (base64 decoding) to fix several bugs.
+     This changes the decoding behaviour for some invalid messages,
+     though the change is mostly in the more lenient direction, and
+     legacy behaviour is preserved as much as possible.
+     [Emilia Käsper]
+
+  *) In DSA_generate_parameters_ex, if the provided seed is too short,
+     return an error
+     [Rich Salz and Ismo Puustinen <ismo.puustinen@intel.com>]
+
  Changes between 1.0.2c and 1.0.2d [9 Jul 2015]
 
   *) Alternate chains certificate forgery
@@ -15,8 +73,18 @@
 
      This issue was reported to OpenSSL by Adam Langley/David Benjamin
      (Google/BoringSSL).
+     (CVE-2015-1793)
      [Matt Caswell]
 
+  *) Race condition handling PSK identify hint
+
+     If PSK identity hints are received by a multi-threaded client then
+     the values are wrongly updated in the parent SSL_CTX structure. This can
+     result in a race condition potentially leading to a double free of the
+     identify hint data.
+     (CVE-2015-3196)
+     [Stephen Henson]
+
  Changes between 1.0.2b and 1.0.2c [12 Jun 2015]
 
   *) Fix HMAC ABI incompatibility. The previous version introduced an ABI
@@ -55,9 +123,9 @@
      callbacks.
 
      This issue was reported to OpenSSL by Robert Swiecki (Google), and
-     independently by Hanno B�ck.
+     independently by Hanno Böck.
      (CVE-2015-1789)
-     [Emilia K�sper]
+     [Emilia Käsper]
 
   *) PKCS7 crash with missing EnvelopedContent
 
@@ -71,7 +139,7 @@
 
      This issue was reported to OpenSSL by Michal Zalewski (Google).
      (CVE-2015-1790)
-     [Emilia K�sper]
+     [Emilia Käsper]
 
   *) CMS verify infinite loop with unknown hash function
 
@@ -201,7 +269,7 @@
 
      This issue was reported to OpenSSL by Michal Zalewski (Google).
      (CVE-2015-0289)
-     [Emilia K�sper]
+     [Emilia Käsper]
 
   *) DoS via reachable assert in SSLv2 servers fix
 
@@ -209,10 +277,10 @@
      servers that both support SSLv2 and enable export cipher suites by sending
      a specially crafted SSLv2 CLIENT-MASTER-KEY message.
 
-     This issue was discovered by Sean Burford (Google) and Emilia K�sper
+     This issue was discovered by Sean Burford (Google) and Emilia Käsper
      (OpenSSL development team).
      (CVE-2015-0293)
-     [Emilia K�sper]
+     [Emilia Käsper]
 
   *) Empty CKE with client auth and DHE fix
 
@@ -272,6 +340,10 @@
 
  Changes between 1.0.1l and 1.0.2 [22 Jan 2015]
 
+  *) Change RSA and DH/DSA key generation apps to generate 2048-bit
+     keys by default.
+     [Kurt Roeckx]
+
   *) Facilitate "universal" ARM builds targeting range of ARM ISAs, e.g.
      ARMv5 through ARMv8, as opposite to "locking" it to single one.
      So far those who have to target multiple plaforms would compromise
@@ -717,12 +789,12 @@
       version does not match the session's version. Resuming with a different
       version, while not strictly forbidden by the RFC, is of questionable
       sanity and breaks all known clients.
-      [David Benjamin, Emilia K�sper]
+      [David Benjamin, Emilia Käsper]
 
    *) Tighten handling of the ChangeCipherSpec (CCS) message: reject
       early CCS messages during renegotiation. (Note that because
       renegotiation is encrypted, this early CCS was not exploitable.)
-      [Emilia K�sper]
+      [Emilia Käsper]
 
    *) Tighten client-side session ticket handling during renegotiation:
       ensure that the client only accepts a session ticket if the server sends
@@ -733,7 +805,7 @@
       Similarly, ensure that the client requires a session ticket if one
       was advertised in the ServerHello. Previously, a TLS client would
       ignore a missing NewSessionTicket message.
-      [Emilia K�sper]
+      [Emilia Käsper]
 
  Changes between 1.0.1i and 1.0.1j [15 Oct 2014]
 
@@ -813,10 +885,10 @@
      with a null pointer dereference (read) by specifying an anonymous (EC)DH
      ciphersuite and sending carefully crafted handshake messages.
 
-     Thanks to Felix Gr�bert (Google) for discovering and researching this
+     Thanks to Felix Gröbert (Google) for discovering and researching this
      issue.
      (CVE-2014-3510)
-     [Emilia K�sper]
+     [Emilia Käsper]
 
   *) By sending carefully crafted DTLS packets an attacker could cause openssl
      to leak memory. This can be exploited through a Denial of Service attack.
@@ -853,7 +925,7 @@
      properly negotiated with the client. This can be exploited through a
      Denial of Service attack.
 
-     Thanks to Joonas Kuorilehto and Riku Hietam�ki (Codenomicon) for
+     Thanks to Joonas Kuorilehto and Riku Hietamäki (Codenomicon) for
      discovering and researching this issue.
      (CVE-2014-5139)
      [Steve Henson]
@@ -865,7 +937,7 @@
 
      Thanks to Ivan Fratric (Google) for discovering this issue.
      (CVE-2014-3508)
-     [Emilia K�sper, and Steve Henson]
+     [Emilia Käsper, and Steve Henson]
 
   *) Fix ec_GFp_simple_points_make_affine (thus, EC_POINTs_mul etc.)
      for corner cases. (Certain input points at infinity could lead to
@@ -895,22 +967,22 @@
      client or server. This is potentially exploitable to run arbitrary
      code on a vulnerable client or server.
 
-     Thanks to J�ri Aedla for reporting this issue. (CVE-2014-0195)
-     [J�ri Aedla, Steve Henson]
+     Thanks to Jüri Aedla for reporting this issue. (CVE-2014-0195)
+     [Jüri Aedla, Steve Henson]
 
   *) Fix bug in TLS code where clients enable anonymous ECDH ciphersuites
      are subject to a denial of service attack.
 
-     Thanks to Felix Gr�bert and Ivan Fratric at Google for discovering
+     Thanks to Felix Gröbert and Ivan Fratric at Google for discovering
      this issue. (CVE-2014-3470)
-     [Felix Gr�bert, Ivan Fratric, Steve Henson]
+     [Felix Gröbert, Ivan Fratric, Steve Henson]
 
   *) Harmonize version and its documentation. -f flag is used to display
      compilation flags.
      [mancha <mancha1@zoho.com>]
 
   *) Fix eckey_priv_encode so it immediately returns an error upon a failure
-     in i2d_ECPrivateKey.
+     in i2d_ECPrivateKey.  Thanks to Ted Unangst for feedback on this issue.
      [mancha <mancha1@zoho.com>]
 
   *) Fix some double frees. These are not thought to be exploitable.
@@ -982,9 +1054,9 @@
      Thanks go to Nadhem Alfardan and Kenny Paterson of the Information
      Security Group at Royal Holloway, University of London
      (www.isg.rhul.ac.uk) for discovering this flaw and Adam Langley and
-     Emilia K�sper for the initial patch.
+     Emilia Käsper for the initial patch.
      (CVE-2013-0169)
-     [Emilia K�sper, Adam Langley, Ben Laurie, Andy Polyakov, Steve Henson]
+     [Emilia Käsper, Adam Langley, Ben Laurie, Andy Polyakov, Steve Henson]
 
   *) Fix flaw in AESNI handling of TLS 1.2 and 1.1 records for CBC mode
      ciphersuites which can be exploited in a denial of service attack.
@@ -1159,7 +1231,7 @@
      EC_GROUP_new_by_curve_name() will automatically use these (while
      EC_GROUP_new_curve_GFp() currently prefers the more flexible
      implementations).
-     [Emilia K�sper, Adam Langley, Bodo Moeller (Google)]
+     [Emilia Käsper, Adam Langley, Bodo Moeller (Google)]
 
   *) Use type ossl_ssize_t instad of ssize_t which isn't available on
      all platforms. Move ssize_t definition from e_os.h to the public
@@ -1435,7 +1507,7 @@
      [Adam Langley (Google)]
 
   *) Fix spurious failures in ecdsatest.c.
-     [Emilia K�sper (Google)]
+     [Emilia Käsper (Google)]
 
   *) Fix the BIO_f_buffer() implementation (which was mixing different
      interpretations of the '..._len' fields).
@@ -1449,7 +1521,7 @@
      lock to call BN_BLINDING_invert_ex, and avoids one use of
      BN_BLINDING_update for each BN_BLINDING structure (previously,
      the last update always remained unused).
-     [Emilia K�sper (Google)]
+     [Emilia Käsper (Google)]
 
   *) In ssl3_clear, preserve s3->init_extra along with s3->rbuf.
      [Bob Buckholz (Google)]
@@ -2258,7 +2330,7 @@
 
   *) Add RFC 3161 compliant time stamp request creation, response generation
      and response verification functionality.
-     [Zolt�n Gl�zik <zglozik@opentsa.org>, The OpenTSA Project]
+     [Zoltán Glózik <zglozik@opentsa.org>, The OpenTSA Project]
 
   *) Add initial support for TLS extensions, specifically for the server_name
      extension so far.  The SSL_SESSION, SSL_CTX, and SSL data structures now
@@ -3426,7 +3498,7 @@
 
   *) BN_CTX_get() should return zero-valued bignums, providing the same
      initialised value as BN_new().
-     [Geoff Thorpe, suggested by Ulf M�ller]
+     [Geoff Thorpe, suggested by Ulf Möller]
 
   *) Support for inhibitAnyPolicy certificate extension.
      [Steve Henson]
@@ -3445,7 +3517,7 @@
      some point, these tighter rules will become openssl's default to improve
      maintainability, though the assert()s and other overheads will remain only
      in debugging configurations. See bn.h for more details.
-     [Geoff Thorpe, Nils Larsch, Ulf M�ller]
+     [Geoff Thorpe, Nils Larsch, Ulf Möller]
 
   *) BN_CTX_init() has been deprecated, as BN_CTX is an opaque structure
      that can only be obtained through BN_CTX_new() (which implicitly
@@ -3512,7 +3584,7 @@
      [Douglas Stebila (Sun Microsystems Laboratories)]
 
   *) Add the possibility to load symbols globally with DSO.
-     [G�tz Babin-Ebell <babin-ebell@trustcenter.de> via Richard Levitte]
+     [Götz Babin-Ebell <babin-ebell@trustcenter.de> via Richard Levitte]
 
   *) Add the functions ERR_set_mark() and ERR_pop_to_mark() for better
      control of the error stack.
@@ -4227,7 +4299,7 @@
      [Steve Henson]
 
   *) Undo Cygwin change.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Added support for proxy certificates according to RFC 3820.
      Because they may be a security thread to unaware applications,
@@ -4260,11 +4332,11 @@
      [Stephen Henson, reported by UK NISCC]
 
   *) Use Windows randomness collection on Cygwin.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Fix hang in EGD/PRNGD query when communication socket is closed
      prematurely by EGD/PRNGD.
-     [Darren Tucker <dtucker@zip.com.au> via Lutz J�nicke, resolves #1014]
+     [Darren Tucker <dtucker@zip.com.au> via Lutz Jänicke, resolves #1014]
 
   *) Prompt for pass phrases when appropriate for PKCS12 input format.
      [Steve Henson]
@@ -4726,7 +4798,7 @@
      pointers passed to them whenever necessary. Otherwise it is possible
      the caller may have overwritten (or deallocated) the original string
      data when a later ENGINE operation tries to use the stored values.
-     [G�tz Babin-Ebell <babinebell@trustcenter.de>]
+     [Götz Babin-Ebell <babinebell@trustcenter.de>]
 
   *) Improve diagnostics in file reading and command-line digests.
      [Ben Laurie aided and abetted by Solar Designer <solar@openwall.com>]
@@ -6831,7 +6903,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Bodo Moeller]
 
   *) BN_sqr() bug fix.
-     [Ulf M�ller, reported by Jim Ellis <jim.ellis@cavium.com>]
+     [Ulf Möller, reported by Jim Ellis <jim.ellis@cavium.com>]
 
   *) Rabin-Miller test analyses assume uniformly distributed witnesses,
      so use BN_pseudo_rand_range() instead of using BN_pseudo_rand()
@@ -6991,7 +7063,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Bodo Moeller]
 
   *) Fix OAEP check.
-     [Ulf M�ller, Bodo M�ller]
+     [Ulf Möller, Bodo Möller]
 
   *) The countermeasure against Bleichbacher's attack on PKCS #1 v1.5
      RSA encryption was accidentally removed in s3_srvr.c in OpenSSL 0.9.5
@@ -7253,10 +7325,10 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Bodo Moeller]
 
   *) Use better test patterns in bntest.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) rand_win.c fix for Borland C.
-     [Ulf M�ller]
+     [Ulf Möller]
  
   *) BN_rshift bugfix for n == 0.
      [Bodo Moeller]
@@ -7401,14 +7473,14 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
 
   *) New BIO_shutdown_wr macro, which invokes the BIO_C_SHUTDOWN_WR
      BIO_ctrl (for BIO pairs).
-     [Bodo M�ller]
+     [Bodo Möller]
 
   *) Add DSO method for VMS.
      [Richard Levitte]
 
   *) Bug fix: Montgomery multiplication could produce results with the
      wrong sign.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Add RPM specification openssl.spec and modify it to build three
      packages.  The default package contains applications, application
@@ -7426,7 +7498,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
 
   *) Don't set the two most significant bits to one when generating a
      random number < q in the DSA library.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) New SSL API mode 'SSL_MODE_AUTO_RETRY'.  This disables the default
      behaviour that SSL_read may result in SSL_ERROR_WANT_READ (even if
@@ -7692,7 +7764,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
   *) Randomness polling function for Win9x, as described in:
      Peter Gutmann, Software Generation of Practically Strong
      Random Numbers.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Fix so PRNG is seeded in req if using an already existing
      DSA key.
@@ -7912,7 +7984,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Steve Henson]
 
   *) Eliminate non-ANSI declarations in crypto.h and stack.h.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Fix for SSL server purpose checking. Server checking was
      rejecting certificates which had extended key usage present
@@ -7944,7 +8016,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Bodo Moeller]
 
   *) Bugfix for linux-elf makefile.one.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) RSA_get_default_method() will now cause a default
      RSA_METHOD to be chosen if one doesn't exist already.
@@ -8033,7 +8105,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Steve Henson]
 
   *) des_quad_cksum() byte order bug fix.
-     [Ulf M�ller, using the problem description in krb4-0.9.7, where
+     [Ulf Möller, using the problem description in krb4-0.9.7, where
       the solution is attributed to Derrick J Brashear <shadow@DEMENTIA.ORG>]
 
   *) Fix so V_ASN1_APP_CHOOSE works again: however its use is strongly
@@ -8134,7 +8206,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Rolf Haberrecker <rolf@suse.de>]
 
   *) Assembler module support for Mingw32.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Shared library support for HPUX (in shlib/).
      [Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> and Anonymous]
@@ -8153,7 +8225,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
 
   *) BN_mul bugfix: In bn_mul_part_recursion() only the a>a[n] && b>b[n]
      case was implemented. This caused BN_div_recp() to fail occasionally.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Add an optional second argument to the set_label() in the perl
      assembly language builder. If this argument exists and is set
@@ -8183,14 +8255,14 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Steve Henson]
 
   *) Fix potential buffer overrun problem in BIO_printf().
-     [Ulf M�ller, using public domain code by Patrick Powell; problem
+     [Ulf Möller, using public domain code by Patrick Powell; problem
       pointed out by David Sacerdote <das33@cornell.edu>]
 
   *) Support EGD <http://www.lothar.com/tech/crypto/>.  New functions
      RAND_egd() and RAND_status().  In the command line application,
      the EGD socket can be specified like a seed file using RANDFILE
      or -rand.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Allow the string CERTIFICATE to be tolerated in PKCS#7 structures.
      Some CAs (e.g. Verisign) distribute certificates in this form.
@@ -8223,7 +8295,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
         #define OPENSSL_ALGORITHM_DEFINES
         #include <openssl/opensslconf.h>
      defines all pertinent NO_<algo> symbols, such as NO_IDEA, NO_RSA, etc.
-     [Richard Levitte, Ulf and Bodo M�ller]
+     [Richard Levitte, Ulf and Bodo Möller]
 
   *) Bugfix: Tolerate fragmentation and interleaving in the SSL 3/TLS
      record layer.
@@ -8274,17 +8346,17 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
 
   *) Bug fix for BN_div_recp() for numerators with an even number of
      bits.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) More tests in bntest.c, and changed test_bn output.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) ./config recognizes MacOS X now.
      [Andy Polyakov]
 
   *) Bug fix for BN_div() when the first words of num and divsor are
      equal (it gave wrong results if (rem=(n1-q*d0)&BN_MASK2) < d0).
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Add support for various broken PKCS#8 formats, and command line
      options to produce them.
@@ -8292,11 +8364,11 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
 
   *) New functions BN_CTX_start(), BN_CTX_get() and BT_CTX_end() to
      get temporary BIGNUMs from a BN_CTX.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Correct return values in BN_mod_exp_mont() and BN_mod_exp2_mont()
      for p == 0.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Change the SSLeay_add_all_*() functions to OpenSSL_add_all_*() and
      include a #define from the old name to the new. The original intent
@@ -8320,7 +8392,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
 
   *) Source code cleanups: use const where appropriate, eliminate casts,
      use void * instead of char * in lhash.
-     [Ulf M�ller] 
+     [Ulf Möller]
 
   *) Bugfix: ssl3_send_server_key_exchange was not restartable
      (the state was not changed to SSL3_ST_SW_KEY_EXCH_B, and because of
@@ -8365,13 +8437,13 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Steve Henson]
 
   *) New function BN_pseudo_rand().
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Clean up BN_mod_mul_montgomery(): replace the broken (and unreadable)
      bignum version of BN_from_montgomery() with the working code from
      SSLeay 0.9.0 (the word based version is faster anyway), and clean up
      the comments.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Avoid a race condition in s2_clnt.c (function get_server_hello) that
      made it impossible to use the same SSL_SESSION data structure in
@@ -8381,25 +8453,25 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
   *) The return value of RAND_load_file() no longer counts bytes obtained
      by stat().  RAND_load_file(..., -1) is new and uses the complete file
      to seed the PRNG (previously an explicit byte count was required).
-     [Ulf M�ller, Bodo M�ller]
+     [Ulf Möller, Bodo Möller]
 
   *) Clean up CRYPTO_EX_DATA functions, some of these didn't have prototypes
      used (char *) instead of (void *) and had casts all over the place.
      [Steve Henson]
 
   *) Make BN_generate_prime() return NULL on error if ret!=NULL.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Retain source code compatibility for BN_prime_checks macro:
      BN_is_prime(..., BN_prime_checks, ...) now uses
      BN_prime_checks_for_size to determine the appropriate number of
      Rabin-Miller iterations.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Diffie-Hellman uses "safe" primes: DH_check() return code renamed to
      DH_CHECK_P_NOT_SAFE_PRIME.
      (Check if this is true? OpenPGP calls them "strong".)
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Merge the functionality of "dh" and "gendh" programs into a new program
      "dhparam". The old programs are retained for now but will handle DH keys
@@ -8455,7 +8527,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
   *) Add missing #ifndefs that caused missing symbols when building libssl
      as a shared library without RSA.  Use #ifndef NO_SSL2 instead of
      NO_RSA in ssl/s2*.c. 
-     [Kris Kennaway <kris@hub.freebsd.org>, modified by Ulf M�ller]
+     [Kris Kennaway <kris@hub.freebsd.org>, modified by Ulf Möller]
 
   *) Precautions against using the PRNG uninitialized: RAND_bytes() now
      has a return value which indicates the quality of the random data
@@ -8464,7 +8536,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      guaranteed to be unique but not unpredictable. RAND_add is like
      RAND_seed, but takes an extra argument for an entropy estimate
      (RAND_seed always assumes full entropy).
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Do more iterations of Rabin-Miller probable prime test (specifically,
      3 for 1024-bit primes, 6 for 512-bit primes, 12 for 256-bit primes
@@ -8494,7 +8566,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Steve Henson]
 
   *) Honor the no-xxx Configure options when creating .DEF files.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Add PKCS#10 attributes to field table: challengePassword, 
      unstructuredName and unstructuredAddress. These are taken from
@@ -9328,7 +9400,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
 
   *) More DES library cleanups: remove references to srand/rand and
      delete an unused file.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Add support for the the free Netwide assembler (NASM) under Win32,
      since not many people have MASM (ml) and it can be hard to obtain.
@@ -9417,7 +9489,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      worked.
 
   *) Fix problems with no-hmac etc.
-     [Ulf M�ller, pointed out by Brian Wellington <bwelling@tislabs.com>]
+     [Ulf Möller, pointed out by Brian Wellington <bwelling@tislabs.com>]
 
   *) New functions RSA_get_default_method(), RSA_set_method() and
      RSA_get_method(). These allows replacement of RSA_METHODs without having
@@ -9534,7 +9606,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Ben Laurie]
 
   *) DES library cleanups.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Add support for PKCS#5 v2.0 PBE algorithms. This will permit PKCS#8 to be
      used with any cipher unlike PKCS#5 v1.5 which can at most handle 64 bit
@@ -9577,7 +9649,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Christian Forster <fo@hawo.stw.uni-erlangen.de>]
 
   *) config now generates no-xxx options for missing ciphers.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Support the EBCDIC character set (work in progress).
      File ebcdic.c not yet included because it has a different license.
@@ -9690,7 +9762,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Bodo Moeller]
 
   *) Move openssl.cnf out of lib/.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Fix various things to let OpenSSL even pass ``egcc -pipe -O2 -Wall
      -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes
@@ -9747,10 +9819,10 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Ben Laurie]
 
   *) Support Borland C++ builder.
-     [Janez Jere <jj@void.si>, modified by Ulf M�ller]
+     [Janez Jere <jj@void.si>, modified by Ulf Möller]
 
   *) Support Mingw32.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) SHA-1 cleanups and performance enhancements.
      [Andy Polyakov <appro@fy.chalmers.se>]
@@ -9759,7 +9831,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Andy Polyakov <appro@fy.chalmers.se>]
 
   *) Accept any -xxx and +xxx compiler options in Configure.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Update HPUX configuration.
      [Anonymous]
@@ -9792,7 +9864,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Bodo Moeller]
 
   *) OAEP decoding bug fix.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Support INSTALL_PREFIX for package builders, as proposed by
      David Harris.
@@ -9815,21 +9887,21 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Niels Poppe <niels@netbox.org>]
 
   *) New Configure option no-<cipher> (rsa, idea, rc5, ...).
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Add the PKCS#12 API documentation to openssl.txt. Preliminary support for
      extension adding in x509 utility.
      [Steve Henson]
 
   *) Remove NOPROTO sections and error code comments.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Partial rewrite of the DEF file generator to now parse the ANSI
      prototypes.
      [Steve Henson]
 
   *) New Configure options --prefix=DIR and --openssldir=DIR.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Complete rewrite of the error code script(s). It is all now handled
      by one script at the top level which handles error code gathering,
@@ -9858,7 +9930,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Steve Henson]
 
   *) Move the autogenerated header file parts to crypto/opensslconf.h.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Fix new 56-bit DES export ciphersuites: they were using 7 bytes instead of
      8 of keying material. Merlin has also confirmed interop with this fix
@@ -9876,13 +9948,13 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Andy Polyakov <appro@fy.chalmers.se>]
 
   *) Change functions to ANSI C.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Fix typos in error codes.
-     [Martin Kraemer <Martin.Kraemer@MchP.Siemens.De>, Ulf M�ller]
+     [Martin Kraemer <Martin.Kraemer@MchP.Siemens.De>, Ulf Möller]
 
   *) Remove defunct assembler files from Configure.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) SPARC v8 assembler BIGNUM implementation.
      [Andy Polyakov <appro@fy.chalmers.se>]
@@ -9919,7 +9991,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Steve Henson]
 
   *) New Configure option "rsaref".
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Don't auto-generate pem.h.
      [Bodo Moeller]
@@ -9967,7 +10039,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
 
   *) New functions DSA_do_sign and DSA_do_verify to provide access to
      the raw DSA values prior to ASN.1 encoding.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) Tweaks to Configure
      [Niels Poppe <niels@netbox.org>]
@@ -9977,11 +10049,11 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Steve Henson]
 
   *) New variables $(RANLIB) and $(PERL) in the Makefiles.
-     [Ulf M�ller]
+     [Ulf Möller]
 
   *) New config option to avoid instructions that are illegal on the 80386.
      The default code is faster, but requires at least a 486.
-     [Ulf M�ller]
+     [Ulf Möller]
   
   *) Got rid of old SSL2_CLIENT_VERSION (inconsistently used) and
      SSL2_SERVER_VERSION (not used at all) macros, which are now the
@@ -10520,7 +10592,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
       Hagino <itojun@kame.net>]
 
   *) File was opened incorrectly in randfile.c.
-     [Ulf M�ller <ulf@fitug.de>]
+     [Ulf Möller <ulf@fitug.de>]
 
   *) Beginning of support for GeneralizedTime. d2i, i2d, check and print
      functions. Also ASN1_TIME suite which is a CHOICE of UTCTime or
@@ -10530,7 +10602,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
      [Steve Henson]
 
   *) Correct Linux 1 recognition in config.
-     [Ulf M�ller <ulf@fitug.de>]
+     [Ulf Möller <ulf@fitug.de>]
 
   *) Remove pointless MD5 hash when using DSA keys in ca.
      [Anonymous <nobody@replay.com>]
@@ -10677,7 +10749,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
 
   *) Fix the RSA header declarations that hid a bug I fixed in 0.9.0b but
      was already fixed by Eric for 0.9.1 it seems.
-     [Ben Laurie - pointed out by Ulf M�ller <ulf@fitug.de>]
+     [Ben Laurie - pointed out by Ulf Möller <ulf@fitug.de>]
 
   *) Autodetect FreeBSD3.
      [Ben Laurie]
diff --git a/deps/openssl/openssl/CONTRIBUTING b/deps/openssl/openssl/CONTRIBUTING
new file mode 100644
index 00000000000000..9d63d8abb67252
--- /dev/null
+++ b/deps/openssl/openssl/CONTRIBUTING
@@ -0,0 +1,38 @@
+HOW TO CONTRIBUTE TO OpenSSL
+----------------------------
+
+Development is coordinated on the openssl-dev mailing list (see
+http://www.openssl.org for information on subscribing). If you
+would like to submit a patch, send it to rt@openssl.org with
+the string "[PATCH]" in the subject. Please be sure to include a
+textual explanation of what your patch does.
+
+You can also make GitHub pull requests. If you do this, please also send
+mail to rt@openssl.org with a brief description and a link to the PR so
+that we can more easily keep track of it.
+
+If you are unsure as to whether a feature will be useful for the general
+OpenSSL community please discuss it on the openssl-dev mailing list first.
+Someone may be already working on the same thing or there may be a good
+reason as to why that feature isn't implemented.
+
+Patches should be as up to date as possible, preferably relative to the
+current Git or the last snapshot. They should follow our coding style
+(see https://www.openssl.org/policies/codingstyle.html) and compile without
+warnings using the --strict-warnings flag.  OpenSSL compiles on many varied
+platforms: try to ensure you only use portable features.
+
+Our preferred format for patch files is "git format-patch" output. For example
+to provide a patch file containing the last commit in your local git repository
+use the following command:
+
+# git format-patch --stdout HEAD^ >mydiffs.patch
+
+Another method of creating an acceptable patch file without using git is as
+follows:
+
+# cd openssl-work
+# [your changes]
+# ./Configure dist; make clean
+# cd ..
+# diff -ur openssl-orig openssl-work > mydiffs.patch
diff --git a/deps/openssl/openssl/Configure b/deps/openssl/openssl/Configure
index d99eed7f9303c7..ac86cd6cf6a259 100755
--- a/deps/openssl/openssl/Configure
+++ b/deps/openssl/openssl/Configure
@@ -416,6 +416,7 @@ my %table=(
 "linux-ia64-icc","icc:-DL_ENDIAN -O2 -Wall::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-x86_64",	"gcc:-m64 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
 "linux-x86_64-clang",	"clang: -m64 -DL_ENDIAN -O3 -Wall -Wextra $clang_disabled_warnings -Qunused-arguments::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+"debug-linux-x86_64-clang",	"clang: -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -g -Wall -Wextra $clang_disabled_warnings -Qunused-arguments::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
 "linux-x86_64-icc", "icc:-DL_ENDIAN -O2::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
 "linux-x32",	"gcc:-mx32 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32",
 "linux64-s390x",	"gcc:-m64 -DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
@@ -1646,21 +1647,22 @@ if ($shlib_version_number =~ /(^[0-9]*)\.([0-9\.]*)/)
 	$shlib_minor=$2;
 	}
 
+my $ecc = $cc;
+$ecc = "clang" if `$cc --version 2>&1` =~ /clang/;
+
 if ($strict_warnings)
 	{
-	my $ecc = $cc;
-	$ecc = "clang" if `$cc --version 2>&1` =~ /clang/;
 	my $wopt;
 	die "ERROR --strict-warnings requires gcc or clang" unless ($ecc =~ /gcc$/ or $ecc =~ /clang$/);
 	foreach $wopt (split /\s+/, $gcc_devteam_warn)
 		{
-		$cflags .= " $wopt" unless ($cflags =~ /$wopt/)
+		$cflags .= " $wopt" unless ($cflags =~ /(^|\s)$wopt(\s|$)/)
 		}
 	if ($ecc eq "clang")
 		{
 		foreach $wopt (split /\s+/, $clang_devteam_warn)
 			{
-			$cflags .= " $wopt" unless ($cflags =~ /$wopt/)
+			$cflags .= " $wopt" unless ($cflags =~ /(^|\s)$wopt(\s|$)/)
 			}
 		}
 	}
@@ -1713,6 +1715,7 @@ while (<IN>)
 		s/^AR=\s*ar/AR= $ar/;
 		s/^RANLIB=.*/RANLIB= $ranlib/;
 		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
+		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $ecc eq "gcc" || $ecc eq "clang";
 		}
 	s/^CFLAG=.*$/CFLAG= $cflags/;
 	s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
diff --git a/deps/openssl/openssl/FAQ b/deps/openssl/openssl/FAQ
index 3be831056da7c3..22c5cf7dc2f36c 100644
--- a/deps/openssl/openssl/FAQ
+++ b/deps/openssl/openssl/FAQ
@@ -1,1053 +1,2 @@
-OpenSSL  -  Frequently Asked Questions
---------------------------------------
-
-[MISC] Miscellaneous questions
-
-* Which is the current version of OpenSSL?
-* Where is the documentation?
-* How can I contact the OpenSSL developers?
-* Where can I get a compiled version of OpenSSL?
-* Why aren't tools like 'autoconf' and 'libtool' used?
-* What is an 'engine' version?
-* How do I check the authenticity of the OpenSSL distribution?
-* How does the versioning scheme work?
-
-[LEGAL] Legal questions
-
-* Do I need patent licenses to use OpenSSL?
-* Can I use OpenSSL with GPL software? 
-
-[USER] Questions on using the OpenSSL applications
-
-* Why do I get a "PRNG not seeded" error message?
-* Why do I get an "unable to write 'random state'" error message?
-* How do I create certificates or certificate requests?
-* Why can't I create certificate requests?
-* Why does <SSL program> fail with a certificate verify error?
-* Why can I only use weak ciphers when I connect to a server using OpenSSL?
-* How can I create DSA certificates?
-* Why can't I make an SSL connection using a DSA certificate?
-* How can I remove the passphrase on a private key?
-* Why can't I use OpenSSL certificates with SSL client authentication?
-* Why does my browser give a warning about a mismatched hostname?
-* How do I install a CA certificate into a browser?
-* Why is OpenSSL x509 DN output not conformant to RFC2253?
-* What is a "128 bit certificate"? Can I create one with OpenSSL?
-* Why does OpenSSL set the authority key identifier extension incorrectly?
-* How can I set up a bundle of commercial root CA certificates?
-
-[BUILD] Questions about building and testing OpenSSL
-
-* Why does the linker complain about undefined symbols?
-* Why does the OpenSSL test fail with "bc: command not found"?
-* Why does the OpenSSL test fail with "bc: 1 no implemented"?
-* Why does the OpenSSL test fail with "bc: stack empty"?
-* Why does the OpenSSL compilation fail on Alpha Tru64 Unix?
-* Why does the OpenSSL compilation fail with "ar: command not found"?
-* Why does the OpenSSL compilation fail on Win32 with VC++?
-* What is special about OpenSSL on Redhat?
-* Why does the OpenSSL compilation fail on MacOS X?
-* Why does the OpenSSL test suite fail on MacOS X?
-* Why does the OpenSSL test suite fail in BN_sqr test [on a 64-bit platform]?
-* Why does OpenBSD-i386 build fail on des-586.s with "Unimplemented segment type"?
-* Why does the OpenSSL test suite fail in sha512t on x86 CPU?
-* Why does compiler fail to compile sha512.c?
-* Test suite still fails, what to do?
-* I think I've found a bug, what should I do?
-* I'm SURE I've found a bug, how do I report it?
-* I've found a security issue, how do I report it?
-
-[PROG] Questions about programming with OpenSSL
-
-* Is OpenSSL thread-safe?
-* I've compiled a program under Windows and it crashes: why?
-* How do I read or write a DER encoded buffer using the ASN1 functions?
-* OpenSSL uses DER but I need BER format: does OpenSSL support BER?
-* I've tried using <M_some_evil_pkcs12_macro> and I get errors why?
-* I've called <some function> and it fails, why?
-* I just get a load of numbers for the error output, what do they mean?
-* Why do I get errors about unknown algorithms?
-* Why can't the OpenSSH configure script detect OpenSSL?
-* Can I use OpenSSL's SSL library with non-blocking I/O?
-* Why doesn't my server application receive a client certificate?
-* Why does compilation fail due to an undefined symbol NID_uniqueIdentifier?
-* I think I've detected a memory leak, is this a bug?
-* Why does Valgrind complain about the use of uninitialized data?
-* Why doesn't a memory BIO work when a file does?
-* Where are the declarations and implementations of d2i_X509() etc?
-
-===============================================================================
-
-[MISC] ========================================================================
-
-* Which is the current version of OpenSSL?
-
-The current version is available from <URL: http://www.openssl.org>.
-OpenSSL 1.0.1a was released on Apr 19th, 2012.
-
-In addition to the current stable release, you can also access daily
-snapshots of the OpenSSL development version at <URL:
-ftp://ftp.openssl.org/snapshot/>, or get it by anonymous Git access.
-
-
-* Where is the documentation?
-
-OpenSSL is a library that provides cryptographic functionality to
-applications such as secure web servers.  Be sure to read the
-documentation of the application you want to use.  The INSTALL file
-explains how to install this library.
-
-OpenSSL includes a command line utility that can be used to perform a
-variety of cryptographic functions.  It is described in the openssl(1)
-manpage.  Documentation for developers is currently being written. Many
-manual pages are available; overviews over libcrypto and
-libssl are given in the crypto(3) and ssl(3) manpages.
-
-The OpenSSL manpages are installed in /usr/local/ssl/man/ (or a
-different directory if you specified one as described in INSTALL).
-In addition, you can read the most current versions at
-<URL: http://www.openssl.org/docs/>. Note that the online documents refer
-to the very latest development versions of OpenSSL and may include features
-not present in released versions. If in doubt refer to the documentation
-that came with the version of OpenSSL you are using. The pod format
-documentation is included in each OpenSSL distribution under the docs
-directory.
-
-There is some documentation about certificate extensions and PKCS#12
-in doc/openssl.txt
-
-The original SSLeay documentation is included in OpenSSL as
-doc/ssleay.txt.  It may be useful when none of the other resources
-help, but please note that it reflects the obsolete version SSLeay
-0.6.6.
-
-
-* How can I contact the OpenSSL developers?
-
-The README file describes how to submit bug reports and patches to
-OpenSSL.  Information on the OpenSSL mailing lists is available from
-<URL: http://www.openssl.org>.
-
-
-* Where can I get a compiled version of OpenSSL?
-
-You can finder pointers to binary distributions in
-<URL: http://www.openssl.org/related/binaries.html> .
-
-Some applications that use OpenSSL are distributed in binary form.
-When using such an application, you don't need to install OpenSSL
-yourself; the application will include the required parts (e.g. DLLs).
-
-If you want to build OpenSSL on a Windows system and you don't have
-a C compiler, read the "Mingw32" section of INSTALL.W32 for information
-on how to obtain and install the free GNU C compiler.
-
-A number of Linux and *BSD distributions include OpenSSL.
-
-
-* Why aren't tools like 'autoconf' and 'libtool' used?
-
-autoconf will probably be used in future OpenSSL versions. If it was
-less Unix-centric, it might have been used much earlier.
-
-* What is an 'engine' version?
-
-With version 0.9.6 OpenSSL was extended to interface to external crypto
-hardware. This was realized in a special release '0.9.6-engine'. With
-version 0.9.7 the changes were merged into the main development line,
-so that the special release is no longer necessary.
-
-* How do I check the authenticity of the OpenSSL distribution?
-
-We provide MD5 digests and ASC signatures of each tarball.
-Use MD5 to check that a tarball from a mirror site is identical:
-
-   md5sum TARBALL | awk '{print $1;}' | cmp - TARBALL.md5
-
-You can check authenticity using pgp or gpg. You need the OpenSSL team
-member public key used to sign it (download it from a key server, see a
-list of keys at <URL: http://www.openssl.org/about/>). Then
-just do:
-
-   pgp TARBALL.asc
-
-* How does the versioning scheme work?
-
-After the release of OpenSSL 1.0.0 the versioning scheme changed. Letter 
-releases (e.g. 1.0.1a) can only contain bug and security fixes and no
-new features. Minor releases change the last number (e.g. 1.0.2) and 
-can contain new features that retain binary compatibility. Changes to
-the middle number are considered major releases and neither source nor
-binary compatibility is guaranteed.
-
-Therefore the answer to the common question "when will feature X be
-backported to OpenSSL 1.0.0/0.9.8?" is "never" but it could appear
-in the next minor release.
-
-* What happens when the letter release reaches z?
-
-It was decided after the release of OpenSSL 0.9.8y the next version should
-be 0.9.8za then 0.9.8zb and so on.
-
-
-[LEGAL] =======================================================================
-
-* Do I need patent licenses to use OpenSSL?
-
-For information on intellectual property rights, please consult a lawyer.
-The OpenSSL team does not offer legal advice.
-
-You can configure OpenSSL so as not to use IDEA, MDC2 and RC5 by using
- ./config no-idea no-mdc2 no-rc5
-
-
-* Can I use OpenSSL with GPL software?
-
-On many systems including the major Linux and BSD distributions, yes (the
-GPL does not place restrictions on using libraries that are part of the
-normal operating system distribution).
-
-On other systems, the situation is less clear. Some GPL software copyright
-holders claim that you infringe on their rights if you use OpenSSL with
-their software on operating systems that don't normally include OpenSSL.
-
-If you develop open source software that uses OpenSSL, you may find it
-useful to choose an other license than the GPL, or state explicitly that
-"This program is released under the GPL with the additional exemption that
-compiling, linking, and/or using OpenSSL is allowed."  If you are using
-GPL software developed by others, you may want to ask the copyright holder
-for permission to use their software with OpenSSL.
-
-
-[USER] ========================================================================
-
-* Why do I get a "PRNG not seeded" error message?
-
-Cryptographic software needs a source of unpredictable data to work
-correctly.  Many open source operating systems provide a "randomness
-device" (/dev/urandom or /dev/random) that serves this purpose.
-All OpenSSL versions try to use /dev/urandom by default; starting with
-version 0.9.7, OpenSSL also tries /dev/random if /dev/urandom is not
-available.
-
-On other systems, applications have to call the RAND_add() or
-RAND_seed() function with appropriate data before generating keys or
-performing public key encryption. (These functions initialize the
-pseudo-random number generator, PRNG.)  Some broken applications do
-not do this.  As of version 0.9.5, the OpenSSL functions that need
-randomness report an error if the random number generator has not been
-seeded with at least 128 bits of randomness.  If this error occurs and
-is not discussed in the documentation of the application you are
-using, please contact the author of that application; it is likely
-that it never worked correctly.  OpenSSL 0.9.5 and later make the
-error visible by refusing to perform potentially insecure encryption.
-
-If you are using Solaris 8, you can add /dev/urandom and /dev/random
-devices by installing patch 112438 (Sparc) or 112439 (x86), which are
-available via the Patchfinder at <URL: http://sunsolve.sun.com>
-(Solaris 9 includes these devices by default). For /dev/random support
-for earlier Solaris versions, see Sun's statement at
-<URL: http://sunsolve.sun.com/pub-cgi/retrieve.pl?doc=fsrdb/27606&zone_32=SUNWski>
-(the SUNWski package is available in patch 105710).
-
-On systems without /dev/urandom and /dev/random, it is a good idea to
-use the Entropy Gathering Demon (EGD); see the RAND_egd() manpage for
-details.  Starting with version 0.9.7, OpenSSL will automatically look
-for an EGD socket at /var/run/egd-pool, /dev/egd-pool, /etc/egd-pool and
-/etc/entropy.
-
-Most components of the openssl command line utility automatically try
-to seed the random number generator from a file.  The name of the
-default seeding file is determined as follows: If environment variable
-RANDFILE is set, then it names the seeding file.  Otherwise if
-environment variable HOME is set, then the seeding file is $HOME/.rnd.
-If neither RANDFILE nor HOME is set, versions up to OpenSSL 0.9.6 will
-use file .rnd in the current directory while OpenSSL 0.9.6a uses no
-default seeding file at all.  OpenSSL 0.9.6b and later will behave
-similarly to 0.9.6a, but will use a default of "C:\" for HOME on
-Windows systems if the environment variable has not been set.
-
-If the default seeding file does not exist or is too short, the "PRNG
-not seeded" error message may occur.
-
-The openssl command line utility will write back a new state to the
-default seeding file (and create this file if necessary) unless
-there was no sufficient seeding.
-
-Pointing $RANDFILE to an Entropy Gathering Daemon socket does not work.
-Use the "-rand" option of the OpenSSL command line tools instead.
-The $RANDFILE environment variable and $HOME/.rnd are only used by the
-OpenSSL command line tools. Applications using the OpenSSL library
-provide their own configuration options to specify the entropy source,
-please check out the documentation coming the with application.
-
-
-* Why do I get an "unable to write 'random state'" error message?
-
-
-Sometimes the openssl command line utility does not abort with
-a "PRNG not seeded" error message, but complains that it is
-"unable to write 'random state'".  This message refers to the
-default seeding file (see previous answer).  A possible reason
-is that no default filename is known because neither RANDFILE
-nor HOME is set.  (Versions up to 0.9.6 used file ".rnd" in the
-current directory in this case, but this has changed with 0.9.6a.)
-
-
-* How do I create certificates or certificate requests?
-
-Check out the CA.pl(1) manual page. This provides a simple wrapper round
-the 'req', 'verify', 'ca' and 'pkcs12' utilities. For finer control check
-out the manual pages for the individual utilities and the certificate
-extensions documentation (in ca(1), req(1), x509v3_config(5) )
-
-
-* Why can't I create certificate requests?
-
-You typically get the error:
-
-	unable to find 'distinguished_name' in config
-	problems making Certificate Request
-
-This is because it can't find the configuration file. Check out the
-DIAGNOSTICS section of req(1) for more information.
-
-
-* Why does <SSL program> fail with a certificate verify error?
-
-This problem is usually indicated by log messages saying something like
-"unable to get local issuer certificate" or "self signed certificate".
-When a certificate is verified its root CA must be "trusted" by OpenSSL
-this typically means that the CA certificate must be placed in a directory
-or file and the relevant program configured to read it. The OpenSSL program
-'verify' behaves in a similar way and issues similar error messages: check
-the verify(1) program manual page for more information.
-
-
-* Why can I only use weak ciphers when I connect to a server using OpenSSL?
-
-This is almost certainly because you are using an old "export grade" browser
-which only supports weak encryption. Upgrade your browser to support 128 bit
-ciphers.
-
-
-* How can I create DSA certificates?
-
-Check the CA.pl(1) manual page for a DSA certificate example.
-
-
-* Why can't I make an SSL connection to a server using a DSA certificate?
-
-Typically you'll see a message saying there are no shared ciphers when
-the same setup works fine with an RSA certificate. There are two possible
-causes. The client may not support connections to DSA servers most web
-browsers (including Netscape and MSIE) only support connections to servers
-supporting RSA cipher suites. The other cause is that a set of DH parameters
-has not been supplied to the server. DH parameters can be created with the
-dhparam(1) command and loaded using the SSL_CTX_set_tmp_dh() for example:
-check the source to s_server in apps/s_server.c for an example.
-
-
-* How can I remove the passphrase on a private key?
-
-Firstly you should be really *really* sure you want to do this. Leaving
-a private key unencrypted is a major security risk. If you decide that
-you do have to do this check the EXAMPLES sections of the rsa(1) and
-dsa(1) manual pages.
-
-
-* Why can't I use OpenSSL certificates with SSL client authentication?
-
-What will typically happen is that when a server requests authentication
-it will either not include your certificate or tell you that you have
-no client certificates (Netscape) or present you with an empty list box
-(MSIE). The reason for this is that when a server requests a client
-certificate it includes a list of CAs names which it will accept. Browsers
-will only let you select certificates from the list on the grounds that
-there is little point presenting a certificate which the server will
-reject.
-
-The solution is to add the relevant CA certificate to your servers "trusted
-CA list". How you do this depends on the server software in uses. You can
-print out the servers list of acceptable CAs using the OpenSSL s_client tool:
-
-openssl s_client -connect www.some.host:443 -prexit
-
-If your server only requests certificates on certain URLs then you may need
-to manually issue an HTTP GET command to get the list when s_client connects:
-
-GET /some/page/needing/a/certificate.html
-
-If your CA does not appear in the list then this confirms the problem.
-
-
-* Why does my browser give a warning about a mismatched hostname?
-
-Browsers expect the server's hostname to match the value in the commonName
-(CN) field of the certificate. If it does not then you get a warning.
-
-
-* How do I install a CA certificate into a browser?
-
-The usual way is to send the DER encoded certificate to the browser as
-MIME type application/x-x509-ca-cert, for example by clicking on an appropriate
-link. On MSIE certain extensions such as .der or .cacert may also work, or you
-can import the certificate using the certificate import wizard.
-
-You can convert a certificate to DER form using the command:
-
-openssl x509 -in ca.pem -outform DER -out ca.der
-
-Occasionally someone suggests using a command such as:
-
-openssl pkcs12 -export -out cacert.p12 -in cacert.pem -inkey cakey.pem
-
-DO NOT DO THIS! This command will give away your CAs private key and
-reduces its security to zero: allowing anyone to forge certificates in
-whatever name they choose.
-
-* Why is OpenSSL x509 DN output not conformant to RFC2253?
-
-The ways to print out the oneline format of the DN (Distinguished Name) have
-been extended in version 0.9.7 of OpenSSL. Using the new X509_NAME_print_ex()
-interface, the "-nameopt" option could be introduded. See the manual
-page of the "openssl x509" commandline tool for details. The old behaviour
-has however been left as default for the sake of compatibility.
-
-* What is a "128 bit certificate"? Can I create one with OpenSSL?
-
-The term "128 bit certificate" is a highly misleading marketing term. It does
-*not* refer to the size of the public key in the certificate! A certificate
-containing a 128 bit RSA key would have negligible security.
-
-There were various other names such as "magic certificates", "SGC
-certificates", "step up certificates" etc.
-
-You can't generally create such a certificate using OpenSSL but there is no
-need to any more. Nowadays web browsers using unrestricted strong encryption
-are generally available.
-
-When there were tight restrictions on the export of strong encryption
-software from the US only weak encryption algorithms could be freely exported
-(initially 40 bit and then 56 bit). It was widely recognised that this was
-inadequate. A relaxation of the rules allowed the use of strong encryption but
-only to an authorised server.
-
-Two slighly different techniques were developed to support this, one used by
-Netscape was called "step up", the other used by MSIE was called "Server Gated
-Cryptography" (SGC). When a browser initially connected to a server it would
-check to see if the certificate contained certain extensions and was issued by
-an authorised authority. If these test succeeded it would reconnect using
-strong encryption.
-
-Only certain (initially one) certificate authorities could issue the
-certificates and they generally cost more than ordinary certificates.
-
-Although OpenSSL can create certificates containing the appropriate extensions
-the certificate would not come from a permitted authority and so would not
-be recognized.
-
-The export laws were later changed to allow almost unrestricted use of strong
-encryption so these certificates are now obsolete.
-
-
-* Why does OpenSSL set the authority key identifier (AKID) extension incorrectly?
-
-It doesn't: this extension is often the cause of confusion.
-
-Consider a certificate chain A->B->C so that A signs B and B signs C. Suppose
-certificate C contains AKID.
-
-The purpose of this extension is to identify the authority certificate B. This
-can be done either by including the subject key identifier of B or its issuer
-name and serial number.
-
-In this latter case because it is identifying certifcate B it must contain the
-issuer name and serial number of B.
-
-It is often wrongly assumed that it should contain the subject name of B. If it
-did this would be redundant information because it would duplicate the issuer
-name of C.
-
-
-* How can I set up a bundle of commercial root CA certificates?
-
-The OpenSSL software is shipped without any root CA certificate as the
-OpenSSL project does not have any policy on including or excluding
-any specific CA and does not intend to set up such a policy. Deciding
-about which CAs to support is up to application developers or
-administrators.
-
-Other projects do have other policies so you can for example extract the CA
-bundle used by Mozilla and/or modssl as described in this article:
-
-  <URL: http://www.mail-archive.com/modssl-users@modssl.org/msg16980.html>
-
-
-[BUILD] =======================================================================
-
-* Why does the linker complain about undefined symbols?
-
-Maybe the compilation was interrupted, and make doesn't notice that
-something is missing.  Run "make clean; make".
-
-If you used ./Configure instead of ./config, make sure that you
-selected the right target.  File formats may differ slightly between
-OS versions (for example sparcv8/sparcv9, or a.out/elf).
-
-In case you get errors about the following symbols, use the config
-option "no-asm", as described in INSTALL:
-
- BF_cbc_encrypt, BF_decrypt, BF_encrypt, CAST_cbc_encrypt,
- CAST_decrypt, CAST_encrypt, RC4, RC5_32_cbc_encrypt, RC5_32_decrypt,
- RC5_32_encrypt, bn_add_words, bn_div_words, bn_mul_add_words,
- bn_mul_comba4, bn_mul_comba8, bn_mul_words, bn_sqr_comba4,
- bn_sqr_comba8, bn_sqr_words, bn_sub_words, des_decrypt3,
- des_ede3_cbc_encrypt, des_encrypt, des_encrypt2, des_encrypt3,
- des_ncbc_encrypt, md5_block_asm_host_order, sha1_block_asm_data_order
-
-If none of these helps, you may want to try using the current snapshot.
-If the problem persists, please submit a bug report.
-
-
-* Why does the OpenSSL test fail with "bc: command not found"?
-
-You didn't install "bc", the Unix calculator.  If you want to run the
-tests, get GNU bc from ftp://ftp.gnu.org or from your OS distributor.
-
-
-* Why does the OpenSSL test fail with "bc: 1 no implemented"?
-
-On some SCO installations or versions, bc has a bug that gets triggered
-when you run the test suite (using "make test").  The message returned is
-"bc: 1 not implemented".
-
-The best way to deal with this is to find another implementation of bc
-and compile/install it.  GNU bc (see <URL: http://www.gnu.org/software/software.html>
-for download instructions) can be safely used, for example.
-
-
-* Why does the OpenSSL test fail with "bc: stack empty"?
-
-On some DG/ux versions, bc seems to have a too small stack for calculations
-that the OpenSSL bntest throws at it.  This gets triggered when you run the
-test suite (using "make test").  The message returned is "bc: stack empty".
-
-The best way to deal with this is to find another implementation of bc
-and compile/install it.  GNU bc (see <URL: http://www.gnu.org/software/software.html>
-for download instructions) can be safely used, for example.
-
-
-* Why does the OpenSSL compilation fail on Alpha Tru64 Unix?
-
-On some Alpha installations running Tru64 Unix and Compaq C, the compilation
-of crypto/sha/sha_dgst.c fails with the message 'Fatal:  Insufficient virtual
-memory to continue compilation.'  As far as the tests have shown, this may be
-a compiler bug.  What happens is that it eats up a lot of resident memory
-to build something, probably a table.  The problem is clearly in the
-optimization code, because if one eliminates optimization completely (-O0),
-the compilation goes through (and the compiler consumes about 2MB of resident
-memory instead of 240MB or whatever one's limit is currently).
-
-There are three options to solve this problem:
-
-1. set your current data segment size soft limit higher.  Experience shows
-that about 241000 kbytes seems to be enough on an AlphaServer DS10.  You do
-this with the command 'ulimit -Sd nnnnnn', where 'nnnnnn' is the number of
-kbytes to set the limit to.
-
-2. If you have a hard limit that is lower than what you need and you can't
-get it changed, you can compile all of OpenSSL with -O0 as optimization
-level.  This is however not a very nice thing to do for those who expect to
-get the best result from OpenSSL.  A bit more complicated solution is the
-following:
-
------ snip:start -----
-  make DIRS=crypto SDIRS=sha "`grep '^CFLAG=' Makefile.ssl | \
-       sed -e 's/ -O[0-9] / -O0 /'`"
-  rm `ls crypto/*.o crypto/sha/*.o | grep -v 'sha_dgst\.o'`
-  make
------ snip:end -----
-
-This will only compile sha_dgst.c with -O0, the rest with the optimization
-level chosen by the configuration process.  When the above is done, do the
-test and installation and you're set.
-
-3. Reconfigure the toolkit with no-sha0 option to leave out SHA0. It 
-should not be used and is not used in SSL/TLS nor any other recognized
-protocol in either case.
-
-
-* Why does the OpenSSL compilation fail with "ar: command not found"?
-
-Getting this message is quite usual on Solaris 2, because Sun has hidden
-away 'ar' and other development commands in directories that aren't in
-$PATH by default.  One of those directories is '/usr/ccs/bin'.  The
-quickest way to fix this is to do the following (it assumes you use sh
-or any sh-compatible shell):
-
------ snip:start -----
-  PATH=${PATH}:/usr/ccs/bin; export PATH
------ snip:end -----
-
-and then redo the compilation.  What you should really do is make sure
-'/usr/ccs/bin' is permanently in your $PATH, for example through your
-'.profile' (again, assuming you use a sh-compatible shell).
-
-
-* Why does the OpenSSL compilation fail on Win32 with VC++?
-
-Sometimes, you may get reports from VC++ command line (cl) that it
-can't find standard include files like stdio.h and other weirdnesses.
-One possible cause is that the environment isn't correctly set up.
-To solve that problem for VC++ versions up to 6, one should run
-VCVARS32.BAT which is found in the 'bin' subdirectory of the VC++
-installation directory (somewhere under 'Program Files').  For VC++
-version 7 (and up?), which is also called VS.NET, the file is called
-VSVARS32.BAT instead.
-This needs to be done prior to running NMAKE, and the changes are only
-valid for the current DOS session.
-
-
-* What is special about OpenSSL on Redhat?
-
-Red Hat Linux (release 7.0 and later) include a preinstalled limited
-version of OpenSSL. Red Hat has chosen to disable support for IDEA, RC5 and
-MDC2 in this version. The same may apply to other Linux distributions.
-Users may therefore wish to install more or all of the features left out.
-
-To do this you MUST ensure that you do not overwrite the openssl that is in
-/usr/bin on your Red Hat machine. Several packages depend on this file,
-including sendmail and ssh. /usr/local/bin is a good alternative choice. The
-libraries that come with Red Hat 7.0 onwards have different names and so are
-not affected. (eg For Red Hat 7.2 they are /lib/libssl.so.0.9.6b and
-/lib/libcrypto.so.0.9.6b with symlinks /lib/libssl.so.2 and
-/lib/libcrypto.so.2 respectively).
-
-Please note that we have been advised by Red Hat attempting to recompile the
-openssl rpm with all the cryptography enabled will not work. All other
-packages depend on the original Red Hat supplied openssl package. It is also
-worth noting that due to the way Red Hat supplies its packages, updates to
-openssl on each distribution never change the package version, only the
-build number. For example, on Red Hat 7.1, the latest openssl package has
-version number 0.9.6 and build number 9 even though it contains all the
-relevant updates in packages up to and including 0.9.6b.
-
-A possible way around this is to persuade Red Hat to produce a non-US
-version of Red Hat Linux.
-
-
-* Why does the OpenSSL compilation fail on MacOS X?
-
-If the failure happens when trying to build the "openssl" binary, with
-a large number of undefined symbols, it's very probable that you have
-OpenSSL 0.9.6b delivered with the operating system (you can find out by
-running '/usr/bin/openssl version') and that you were trying to build
-OpenSSL 0.9.7 or newer.  The problem is that the loader ('ld') in
-MacOS X has a misfeature that's quite difficult to go around.
-Look in the file PROBLEMS for a more detailed explanation and for possible
-solutions.
-
-
-* Why does the OpenSSL test suite fail on MacOS X?
-
-If the failure happens when running 'make test' and the RC4 test fails,
-it's very probable that you have OpenSSL 0.9.6b delivered with the
-operating system (you can find out by running '/usr/bin/openssl version')
-and that you were trying to build OpenSSL 0.9.6d.  The problem is that
-the loader ('ld') in MacOS X has a misfeature that's quite difficult to
-go around and has linked the programs "openssl" and the test programs
-with /usr/lib/libcrypto.dylib and /usr/lib/libssl.dylib instead of the
-libraries you just built.
-Look in the file PROBLEMS for a more detailed explanation and for possible
-solutions.
-
-* Why does the OpenSSL test suite fail in BN_sqr test [on a 64-bit platform]?
-
-Failure in BN_sqr test is most likely caused by a failure to configure the
-toolkit for current platform or lack of support for the platform in question.
-Run './config -t' and './apps/openssl version -p'. Do these platform
-identifiers match? If they don't, then you most likely failed to run
-./config and you're hereby advised to do so before filing a bug report.
-If ./config itself fails to run, then it's most likely problem with your
-local environment and you should turn to your system administrator (or
-similar). If identifiers match (and/or no alternative identifier is
-suggested by ./config script), then the platform is unsupported. There might
-or might not be a workaround. Most notably on SPARC64 platforms with GNU
-C compiler you should be able to produce a working build by running
-'./config -m32'. I understand that -m32 might not be what you want/need,
-but the build should be operational. For further details turn to
-<openssl-dev@openssl.org>.
-
-* Why does OpenBSD-i386 build fail on des-586.s with "Unimplemented segment type"?
-
-As of 0.9.7 assembler routines were overhauled for position independence
-of the machine code, which is essential for shared library support. For
-some reason OpenBSD is equipped with an out-of-date GNU assembler which
-finds the new code offensive. To work around the problem, configure with
-no-asm (and sacrifice a great deal of performance) or patch your assembler
-according to <URL: http://www.openssl.org/~appro/gas-1.92.3.OpenBSD.patch>.
-For your convenience a pre-compiled replacement binary is provided at
-<URL: http://www.openssl.org/~appro/gas-1.92.3.static.aout.bin>.
-Reportedly elder *BSD a.out platforms also suffer from this problem and
-remedy should be same. Provided binary is statically linked and should be
-working across wider range of *BSD branches, not just OpenBSD.
-
-* Why does the OpenSSL test suite fail in sha512t on x86 CPU?
-
-If the test program in question fails withs SIGILL, Illegal Instruction
-exception, then you more than likely to run SSE2-capable CPU, such as
-Intel P4, under control of kernel which does not support SSE2
-instruction extentions. See accompanying INSTALL file and
-OPENSSL_ia32cap(3) documentation page for further information.
-
-* Why does compiler fail to compile sha512.c?
-
-OpenSSL SHA-512 implementation depends on compiler support for 64-bit
-integer type. Few elder compilers [ULTRIX cc, SCO compiler to mention a
-couple] lack support for this and therefore are incapable of compiling
-the module in question. The recommendation is to disable SHA-512 by
-adding no-sha512 to ./config [or ./Configure] command line. Another
-possible alternative might be to switch to GCC.
-
-* Test suite still fails, what to do?
-
-Another common reason for failure to complete some particular test is
-simply bad code generated by a buggy component in toolchain or deficiency
-in run-time environment. There are few cases documented in PROBLEMS file,
-consult it for possible workaround before you beat the drum. Even if you
-don't find solution or even mention there, do reserve for possibility of
-a compiler bug. Compiler bugs might appear in rather bizarre ways, they
-never make sense, and tend to emerge when you least expect them. In order
-to identify one, drop optimization level, e.g. by editing CFLAG line in
-top-level Makefile, recompile and re-run the test.
-
-* I think I've found a bug, what should I do?
-
-If you are a new user then it is quite likely you haven't found a bug and
-something is happening you aren't familiar with. Check this FAQ, the associated
-documentation and the mailing lists for similar queries. If you are still
-unsure whether it is a bug or not submit a query to the openssl-users mailing
-list.
-
-
-* I'm SURE I've found a bug, how do I report it?
-
-Bug reports with no security implications should be sent to the request
-tracker. This can be done by mailing the report to <rt@openssl.org> (or its
-alias <openssl-bugs@openssl.org>), please note that messages sent to the
-request tracker also appear in the public openssl-dev mailing list.
-
-The report should be in plain text. Any patches should be sent as
-plain text attachments because some mailers corrupt patches sent inline.
-If your issue affects multiple versions of OpenSSL check any patches apply
-cleanly and, if possible include patches to each affected version.
-
-The report should be given a meaningful subject line briefly summarising the
-issue. Just "bug in OpenSSL" or "bug in OpenSSL 0.9.8n" is not very helpful.
-
-By sending reports to the request tracker the bug can then be given a priority
-and assigned to the appropriate maintainer. The history of discussions can be
-accessed and if the issue has been addressed or a reason why not. If patches
-are only sent to openssl-dev they can be mislaid if a team member has to
-wade through months of old messages to review the discussion.
-
-See also <URL: http://www.openssl.org/support/rt.html>
-
-
-* I've found a security issue, how do I report it?
-
-If you think your bug has security implications then please send it to
-openssl-security@openssl.org if you don't get a prompt reply at least 
-acknowledging receipt then resend or mail it directly to one of the
-more active team members (e.g. Steve).
-
-Note that bugs only present in the openssl utility are not in general
-considered to be security issues. 
-
-[PROG] ========================================================================
-
-* Is OpenSSL thread-safe?
-
-Yes (with limitations: an SSL connection may not concurrently be used
-by multiple threads).  On Windows and many Unix systems, OpenSSL
-automatically uses the multi-threaded versions of the standard
-libraries.  If your platform is not one of these, consult the INSTALL
-file.
-
-Multi-threaded applications must provide two callback functions to
-OpenSSL by calling CRYPTO_set_locking_callback() and
-CRYPTO_set_id_callback(), for all versions of OpenSSL up to and
-including 0.9.8[abc...]. As of version 1.0.0, CRYPTO_set_id_callback()
-and associated APIs are deprecated by CRYPTO_THREADID_set_callback()
-and friends. This is described in the threads(3) manpage.
-
-* I've compiled a program under Windows and it crashes: why?
-
-This is usually because you've missed the comment in INSTALL.W32.
-Your application must link against the same version of the Win32
-C-Runtime against which your openssl libraries were linked.  The
-default version for OpenSSL is /MD - "Multithreaded DLL".
-
-If you are using Microsoft Visual C++'s IDE (Visual Studio), in
-many cases, your new project most likely defaulted to "Debug
-Singlethreaded" - /ML.  This is NOT interchangeable with /MD and your
-program will crash, typically on the first BIO related read or write
-operation.
-
-For each of the six possible link stage configurations within Win32,
-your application must link  against the same by which OpenSSL was
-built.  If you are using MS Visual C++ (Studio) this can be changed
-by:
-
- 1. Select Settings... from the Project Menu.
- 2. Select the C/C++ Tab.
- 3. Select "Code Generation from the "Category" drop down list box
- 4. Select the Appropriate library (see table below) from the "Use
-    run-time library" drop down list box.  Perform this step for both
-    your debug and release versions of your application (look at the
-    top left of the settings panel to change between the two)
-
-    Single Threaded           /ML        -  MS VC++ often defaults to
-                                            this for the release
-                                            version of a new project.
-    Debug Single Threaded     /MLd       -  MS VC++ often defaults to
-                                            this for the debug version
-                                            of a new project.
-    Multithreaded             /MT
-    Debug Multithreaded       /MTd
-    Multithreaded DLL         /MD        -  OpenSSL defaults to this.
-    Debug Multithreaded DLL   /MDd
-
-Note that debug and release libraries are NOT interchangeable.  If you
-built OpenSSL with /MD your application must use /MD and cannot use /MDd.
-
-As per 0.9.8 the above limitation is eliminated for .DLLs. OpenSSL
-.DLLs compiled with some specific run-time option [we insist on the
-default /MD] can be deployed with application compiled with different
-option or even different compiler. But there is a catch! Instead of
-re-compiling OpenSSL toolkit, as you would have to with prior versions,
-you have to compile small C snippet with compiler and/or options of
-your choice. The snippet gets installed as
-<install-root>/include/openssl/applink.c and should be either added to
-your application project or simply #include-d in one [and only one]
-of your application source files. Failure to link this shim module
-into your application manifests itself as fatal "no OPENSSL_Applink"
-run-time error. An explicit reminder is due that in this situation
-[mixing compiler options] it is as important to add CRYPTO_malloc_init
-prior first call to OpenSSL.
-
-* How do I read or write a DER encoded buffer using the ASN1 functions?
-
-You have two options. You can either use a memory BIO in conjunction
-with the i2d_*_bio() or d2i_*_bio() functions or you can use the
-i2d_*(), d2i_*() functions directly. Since these are often the
-cause of grief here are some code fragments using PKCS7 as an example:
-
- unsigned char *buf, *p;
- int len;
-
- len = i2d_PKCS7(p7, NULL);
- buf = OPENSSL_malloc(len); /* or Malloc, error checking omitted */
- p = buf;
- i2d_PKCS7(p7, &p);
-
-At this point buf contains the len bytes of the DER encoding of
-p7.
-
-The opposite assumes we already have len bytes in buf:
-
- unsigned char *p;
- p = buf;
- p7 = d2i_PKCS7(NULL, &p, len);
-
-At this point p7 contains a valid PKCS7 structure or NULL if an error
-occurred. If an error occurred ERR_print_errors(bio) should give more
-information.
-
-The reason for the temporary variable 'p' is that the ASN1 functions
-increment the passed pointer so it is ready to read or write the next
-structure. This is often a cause of problems: without the temporary
-variable the buffer pointer is changed to point just after the data
-that has been read or written. This may well be uninitialized data
-and attempts to free the buffer will have unpredictable results
-because it no longer points to the same address.
-
-Memory allocation and encoding can also be combined in a single
-operation by the ASN1 routines:
-
- unsigned char *buf = NULL;	/* mandatory */
- int len;
- len = i2d_PKCS7(p7, &buf);
- if (len < 0)
-	/* Error */
- /* Do some things with 'buf' */
- /* Finished with buf: free it */
- OPENSSL_free(buf);
-
-In this special case the "buf" parameter is *not* incremented, it points
-to the start of the encoding.
-
-
-* OpenSSL uses DER but I need BER format: does OpenSSL support BER?
-
-The short answer is yes, because DER is a special case of BER and OpenSSL
-ASN1 decoders can process BER.
-
-The longer answer is that ASN1 structures can be encoded in a number of
-different ways. One set of ways is the Basic Encoding Rules (BER) with various
-permissible encodings. A restriction of BER is the Distinguished Encoding
-Rules (DER): these uniquely specify how a given structure is encoded.
-
-Therefore, because DER is a special case of BER, DER is an acceptable encoding
-for BER.
-
-
-* I've tried using <M_some_evil_pkcs12_macro> and I get errors why?
-
-This usually happens when you try compiling something using the PKCS#12
-macros with a C++ compiler. There is hardly ever any need to use the
-PKCS#12 macros in a program, it is much easier to parse and create
-PKCS#12 files using the PKCS12_parse() and PKCS12_create() functions
-documented in doc/openssl.txt and with examples in demos/pkcs12. The
-'pkcs12' application has to use the macros because it prints out 
-debugging information.
-
-
-* I've called <some function> and it fails, why?
-
-Before submitting a report or asking in one of the mailing lists, you
-should try to determine the cause. In particular, you should call
-ERR_print_errors() or ERR_print_errors_fp() after the failed call
-and see if the message helps. Note that the problem may occur earlier
-than you think -- you should check for errors after every call where
-it is possible, otherwise the actual problem may be hidden because
-some OpenSSL functions clear the error state.
-
-
-* I just get a load of numbers for the error output, what do they mean?
-
-The actual format is described in the ERR_print_errors() manual page.
-You should call the function ERR_load_crypto_strings() before hand and
-the message will be output in text form. If you can't do this (for example
-it is a pre-compiled binary) you can use the errstr utility on the error
-code itself (the hex digits after the second colon).
-
-
-* Why do I get errors about unknown algorithms?
-
-The cause is forgetting to load OpenSSL's table of algorithms with
-OpenSSL_add_all_algorithms(). See the manual page for more information. This
-can cause several problems such as being unable to read in an encrypted
-PEM file, unable to decrypt a PKCS#12 file or signature failure when
-verifying certificates.
-
-* Why can't the OpenSSH configure script detect OpenSSL?
-
-Several reasons for problems with the automatic detection exist.
-OpenSSH requires at least version 0.9.5a of the OpenSSL libraries.
-Sometimes the distribution has installed an older version in the system
-locations that is detected instead of a new one installed. The OpenSSL
-library might have been compiled for another CPU or another mode (32/64 bits).
-Permissions might be wrong.
-
-The general answer is to check the config.log file generated when running
-the OpenSSH configure script. It should contain the detailed information
-on why the OpenSSL library was not detected or considered incompatible.
-
-
-* Can I use OpenSSL's SSL library with non-blocking I/O?
-
-Yes; make sure to read the SSL_get_error(3) manual page!
-
-A pitfall to avoid: Don't assume that SSL_read() will just read from
-the underlying transport or that SSL_write() will just write to it --
-it is also possible that SSL_write() cannot do any useful work until
-there is data to read, or that SSL_read() cannot do anything until it
-is possible to send data.  One reason for this is that the peer may
-request a new TLS/SSL handshake at any time during the protocol,
-requiring a bi-directional message exchange; both SSL_read() and
-SSL_write() will try to continue any pending handshake.
-
-
-* Why doesn't my server application receive a client certificate?
-
-Due to the TLS protocol definition, a client will only send a certificate,
-if explicitly asked by the server. Use the SSL_VERIFY_PEER flag of the
-SSL_CTX_set_verify() function to enable the use of client certificates.
-
-
-* Why does compilation fail due to an undefined symbol NID_uniqueIdentifier?
-
-For OpenSSL 0.9.7 the OID table was extended and corrected. In earlier
-versions, uniqueIdentifier was incorrectly used for X.509 certificates.
-The correct name according to RFC2256 (LDAP) is x500UniqueIdentifier.
-Change your code to use the new name when compiling against OpenSSL 0.9.7.
-
-
-* I think I've detected a memory leak, is this a bug?
-
-In most cases the cause of an apparent memory leak is an OpenSSL internal table
-that is allocated when an application starts up. Since such tables do not grow
-in size over time they are harmless.
-
-These internal tables can be freed up when an application closes using various
-functions.  Currently these include following:
-
-Thread-local cleanup functions:
-
-  ERR_remove_state()
-
-Application-global cleanup functions that are aware of usage (and therefore
-thread-safe):
-
-  ENGINE_cleanup() and CONF_modules_unload()
-
-"Brutal" (thread-unsafe) Application-global cleanup functions:
-
-  ERR_free_strings(), EVP_cleanup() and CRYPTO_cleanup_all_ex_data().
-
-
-* Why does Valgrind complain about the use of uninitialized data?
-
-When OpenSSL's PRNG routines are called to generate random numbers the supplied
-buffer contents are mixed into the entropy pool: so it technically does not
-matter whether the buffer is initialized at this point or not.  Valgrind (and
-other test tools) will complain about this. When using Valgrind, make sure the
-OpenSSL library has been compiled with the PURIFY macro defined (-DPURIFY)
-to get rid of these warnings.
-
-
-* Why doesn't a memory BIO work when a file does?
-
-This can occur in several cases for example reading an S/MIME email message.
-The reason is that a memory BIO can do one of two things when all the data
-has been read from it.
-
-The default behaviour is to indicate that no more data is available and that
-the call should be retried, this is to allow the application to fill up the BIO
-again if necessary.
-
-Alternatively it can indicate that no more data is available and that EOF has
-been reached.
-
-If a memory BIO is to behave in the same way as a file this second behaviour
-is needed. This must be done by calling:
-
-   BIO_set_mem_eof_return(bio, 0);
-
-See the manual pages for more details.
-
-
-* Where are the declarations and implementations of d2i_X509() etc?
-
-These are defined and implemented by macros of the form:
-
-
- DECLARE_ASN1_FUNCTIONS(X509) and IMPLEMENT_ASN1_FUNCTIONS(X509)
-
-The implementation passes an ASN1 "template" defining the structure into an
-ASN1 interpreter using generalised functions such as ASN1_item_d2i().
-
-
-===============================================================================
+The FAQ is now maintained on the web:
+        https://www.openssl.org/docs/faq.html
diff --git a/deps/openssl/openssl/Makefile b/deps/openssl/openssl/Makefile
index f36147287f5dfa..e2bbb475c7dfa2 100644
--- a/deps/openssl/openssl/Makefile
+++ b/deps/openssl/openssl/Makefile
@@ -4,7 +4,7 @@
 ## Makefile for OpenSSL
 ##
 
-VERSION=1.0.2d
+VERSION=1.0.2e
 MAJOR=1
 MINOR=0.2
 SHLIB_VERSION_NUMBER=1.0.0
@@ -205,7 +205,9 @@ CLEARENV=	TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}	\
 		$${SHAREDCMD+SHAREDCMD} $${SHAREDFLAGS+SHAREDFLAGS}	\
 		$${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS}
 
-BUILDENV=	PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
+# LC_ALL=C ensures that error [and other] messages are delivered in
+# same language for uniform treatment.
+BUILDENV=	LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\
 		CC='$(CC)' CFLAG='$(CFLAG)' 			\
 		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\
 		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\
@@ -499,25 +501,28 @@ TABLE: Configure
 # would occur. Therefore the list of files is temporarily stored into a file
 # and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
 # tar does not support the --files-from option.
-tar:
+TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list \
+	                       --owner openssl:0 --group openssl:0 \
+			       --transform 's|^|openssl-$(VERSION)/|' \
+			       -cvf -
+
+../$(TARFILE).list:
+	find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \
+	       \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \
+	       \! -name '*test' \! -name '.#*' \! -name '*~' \
+	    | sort > ../$(TARFILE).list
+
+tar: ../$(TARFILE).list
 	find . -type d -print | xargs chmod 755
 	find . -type f -print | xargs chmod a+r
 	find . -type f -perm -0100 -print | xargs chmod a+x
-	find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \
-	$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \
-	tardy --user_number=0  --user_name=openssl \
-	      --group_number=0 --group_name=openssl \
-	      --prefix=openssl-$(VERSION) - |\
-	gzip --best >../$(TARFILE).gz; \
-	rm -f ../$(TARFILE).list; \
+	$(TAR_COMMAND) | gzip --best >../$(TARFILE).gz
+	rm -f ../$(TARFILE).list
 	ls -l ../$(TARFILE).gz
 
-tar-snap:
-	@$(TAR) $(TARFLAGS) -cvf - \
-		`find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \! -name '*test' \! -name '.#*' \! -name '*~' | sort` |\
-	tardy --user_number=0  --user_name=openssl \
-	      --group_number=0 --group_name=openssl \
-	      --prefix=openssl-$(VERSION) - > ../$(TARFILE);\
+tar-snap: ../$(TARFILE).list
+	$(TAR_COMMAND) > ../$(TARFILE)
+	rm -f ../$(TARFILE).list
 	ls -l ../$(TARFILE)
 
 dist:   
diff --git a/deps/openssl/openssl/Makefile.bak b/deps/openssl/openssl/Makefile.bak
index 9a3e50df6011bb..27eb08cf315d6f 100644
--- a/deps/openssl/openssl/Makefile.bak
+++ b/deps/openssl/openssl/Makefile.bak
@@ -4,7 +4,7 @@
 ## Makefile for OpenSSL
 ##
 
-VERSION=1.0.2d-dev
+VERSION=1.0.2e-dev
 MAJOR=1
 MINOR=0.2
 SHLIB_VERSION_NUMBER=1.0.0
@@ -205,7 +205,9 @@ CLEARENV=	TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}	\
 		$${SHAREDCMD+SHAREDCMD} $${SHAREDFLAGS+SHAREDFLAGS}	\
 		$${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS}
 
-BUILDENV=	PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
+# LC_ALL=C ensures that error [and other] messages are delivered in
+# same language for uniform treatment.
+BUILDENV=	LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\
 		CC='$(CC)' CFLAG='$(CFLAG)' 			\
 		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\
 		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\
@@ -499,25 +501,28 @@ TABLE: Configure
 # would occur. Therefore the list of files is temporarily stored into a file
 # and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
 # tar does not support the --files-from option.
-tar:
+TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list \
+	                       --owner openssl:0 --group openssl:0 \
+			       --transform 's|^|openssl-$(VERSION)/|' \
+			       -cvf -
+
+../$(TARFILE).list:
+	find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \
+	       \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \
+	       \! -name '*test' \! -name '.#*' \! -name '*~' \
+	    | sort > ../$(TARFILE).list
+
+tar: ../$(TARFILE).list
 	find . -type d -print | xargs chmod 755
 	find . -type f -print | xargs chmod a+r
 	find . -type f -perm -0100 -print | xargs chmod a+x
-	find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \
-	$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \
-	tardy --user_number=0  --user_name=openssl \
-	      --group_number=0 --group_name=openssl \
-	      --prefix=openssl-$(VERSION) - |\
-	gzip --best >../$(TARFILE).gz; \
-	rm -f ../$(TARFILE).list; \
+	$(TAR_COMMAND) | gzip --best >../$(TARFILE).gz
+	rm -f ../$(TARFILE).list
 	ls -l ../$(TARFILE).gz
 
-tar-snap:
-	@$(TAR) $(TARFLAGS) -cvf - \
-		`find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \! -name '*test' \! -name '.#*' \! -name '*~' | sort` |\
-	tardy --user_number=0  --user_name=openssl \
-	      --group_number=0 --group_name=openssl \
-	      --prefix=openssl-$(VERSION) - > ../$(TARFILE);\
+tar-snap: ../$(TARFILE).list
+	$(TAR_COMMAND) > ../$(TARFILE)
+	rm -f ../$(TARFILE).list
 	ls -l ../$(TARFILE)
 
 dist:   
diff --git a/deps/openssl/openssl/Makefile.org b/deps/openssl/openssl/Makefile.org
index d77e26495887c9..0333644415a2aa 100644
--- a/deps/openssl/openssl/Makefile.org
+++ b/deps/openssl/openssl/Makefile.org
@@ -203,7 +203,9 @@ CLEARENV=	TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}	\
 		$${SHAREDCMD+SHAREDCMD} $${SHAREDFLAGS+SHAREDFLAGS}	\
 		$${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS}
 
-BUILDENV=	PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
+# LC_ALL=C ensures that error [and other] messages are delivered in
+# same language for uniform treatment.
+BUILDENV=	LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\
 		CC='$(CC)' CFLAG='$(CFLAG)' 			\
 		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\
 		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\
@@ -497,25 +499,28 @@ TABLE: Configure
 # would occur. Therefore the list of files is temporarily stored into a file
 # and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
 # tar does not support the --files-from option.
-tar:
+TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list \
+	                       --owner openssl:0 --group openssl:0 \
+			       --transform 's|^|openssl-$(VERSION)/|' \
+			       -cvf -
+
+../$(TARFILE).list:
+	find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \
+	       \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \
+	       \! -name '*test' \! -name '.#*' \! -name '*~' \
+	    | sort > ../$(TARFILE).list
+
+tar: ../$(TARFILE).list
 	find . -type d -print | xargs chmod 755
 	find . -type f -print | xargs chmod a+r
 	find . -type f -perm -0100 -print | xargs chmod a+x
-	find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \
-	$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \
-	tardy --user_number=0  --user_name=openssl \
-	      --group_number=0 --group_name=openssl \
-	      --prefix=openssl-$(VERSION) - |\
-	gzip --best >../$(TARFILE).gz; \
-	rm -f ../$(TARFILE).list; \
+	$(TAR_COMMAND) | gzip --best >../$(TARFILE).gz
+	rm -f ../$(TARFILE).list
 	ls -l ../$(TARFILE).gz
 
-tar-snap:
-	@$(TAR) $(TARFLAGS) -cvf - \
-		`find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \! -name '*test' \! -name '.#*' \! -name '*~' | sort` |\
-	tardy --user_number=0  --user_name=openssl \
-	      --group_number=0 --group_name=openssl \
-	      --prefix=openssl-$(VERSION) - > ../$(TARFILE);\
+tar-snap: ../$(TARFILE).list
+	$(TAR_COMMAND) > ../$(TARFILE)
+	rm -f ../$(TARFILE).list
 	ls -l ../$(TARFILE)
 
 dist:   
diff --git a/deps/openssl/openssl/NEWS b/deps/openssl/openssl/NEWS
index 29e48053efe7f4..e1c78f834f0818 100644
--- a/deps/openssl/openssl/NEWS
+++ b/deps/openssl/openssl/NEWS
@@ -5,9 +5,19 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
+  Major changes between OpenSSL 1.0.2d and OpenSSL 1.0.2e [3 Dec 2015]
+
+      o BN_mod_exp may produce incorrect results on x86_64 (CVE-2015-3193)
+      o Certificate verify crash with missing PSS parameter (CVE-2015-3194)
+      o X509_ATTRIBUTE memory leak (CVE-2015-3195)
+      o Rewrite EVP_DecodeUpdate (base64 decoding) to fix several bugs
+      o In DSA_generate_parameters_ex, if the provided seed is too short,
+        return an error
+
   Major changes between OpenSSL 1.0.2c and OpenSSL 1.0.2d [9 Jul 2015]
 
       o Alternate chains certificate forgery (CVE-2015-1793)
+      o Race condition handling PSK identify hint (CVE-2015-3196)
 
   Major changes between OpenSSL 1.0.2b and OpenSSL 1.0.2c [12 Jun 2015]
 
diff --git a/deps/openssl/openssl/README b/deps/openssl/openssl/README
index 493141b69ca03d..49c4c9f147c3bc 100644
--- a/deps/openssl/openssl/README
+++ b/deps/openssl/openssl/README
@@ -1,7 +1,7 @@
 
- OpenSSL 1.0.2d 9 Jul 2015
+ OpenSSL 1.0.2e 3 Dec 2015
 
- Copyright (c) 1998-2011 The OpenSSL Project
+ Copyright (c) 1998-2015 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
  All rights reserved.
 
@@ -10,17 +10,17 @@
 
  The OpenSSL Project is a collaborative effort to develop a robust,
  commercial-grade, fully featured, and Open Source toolkit implementing the
- Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
- protocols as well as a full-strength general purpose cryptography library.
- The project is managed by a worldwide community of volunteers that use the
- Internet to communicate, plan, and develop the OpenSSL toolkit and its
- related documentation.
+ Secure Sockets Layer (SSLv3) and Transport Layer Security (TLS) protocols as
+ well as a full-strength general purpose cryptograpic library. The project is
+ managed by a worldwide community of volunteers that use the Internet to
+ communicate, plan, and develop the OpenSSL toolkit and its related
+ documentation.
 
- OpenSSL is based on the excellent SSLeay library developed from Eric A. Young
+ OpenSSL is descended from the SSLeay library developed by Eric A. Young
  and Tim J. Hudson.  The OpenSSL toolkit is licensed under a dual-license (the
- OpenSSL license plus the SSLeay license) situation, which basically means
- that you are free to get and use it for commercial and non-commercial
- purposes as long as you fulfill the conditions of both licenses.
+ OpenSSL license plus the SSLeay license), which means that you are free to
+ get and use it for commercial and non-commercial purposes as long as you
+ fulfill the conditions of both licenses.
 
  OVERVIEW
  --------
@@ -28,90 +28,39 @@
  The OpenSSL toolkit includes:
 
  libssl.a:
-     Implementation of SSLv2, SSLv3, TLSv1 and the required code to support
-     both SSLv2, SSLv3 and TLSv1 in the one server and client.
+     Provides the client and server-side implementations for SSLv3 and TLS.
 
  libcrypto.a:
-     General encryption and X.509 v1/v3 stuff needed by SSL/TLS but not
-     actually logically part of it. It includes routines for the following:
-
-     Ciphers
-        libdes - EAY's libdes DES encryption package which was floating
-                 around the net for a few years, and was then relicensed by
-                 him as part of SSLeay.  It includes 15 'modes/variations'
-                 of DES (1, 2 and 3 key versions of ecb, cbc, cfb and ofb;
-                 pcbc and a more general form of cfb and ofb) including desx
-                 in cbc mode, a fast crypt(3), and routines to read
-                 passwords from the keyboard.
-        RC4 encryption,
-        RC2 encryption      - 4 different modes, ecb, cbc, cfb and ofb.
-        Blowfish encryption - 4 different modes, ecb, cbc, cfb and ofb.
-        IDEA encryption     - 4 different modes, ecb, cbc, cfb and ofb.
-
-     Digests
-        MD5 and MD2 message digest algorithms, fast implementations,
-        SHA (SHA-0) and SHA-1 message digest algorithms,
-        MDC2 message digest. A DES based hash that is popular on smart cards.
-
-     Public Key
-        RSA encryption/decryption/generation.
-            There is no limit on the number of bits.
-        DSA encryption/decryption/generation.
-            There is no limit on the number of bits.
-        Diffie-Hellman key-exchange/key generation.
-            There is no limit on the number of bits.
-
-     X.509v3 certificates
-        X509 encoding/decoding into/from binary ASN1 and a PEM
-             based ASCII-binary encoding which supports encryption with a
-             private key.  Program to generate RSA and DSA certificate
-             requests and to generate RSA and DSA certificates.
-
-     Systems
-        The normal digital envelope routines and base64 encoding.  Higher
-        level access to ciphers and digests by name.  New ciphers can be
-        loaded at run time.  The BIO io system which is a simple non-blocking
-        IO abstraction.  Current methods supported are file descriptors,
-        sockets, socket accept, socket connect, memory buffer, buffering, SSL
-        client/server, file pointer, encryption, digest, non-blocking testing
-        and null.
-
-     Data structures
-        A dynamically growing hashing system
-        A simple stack.
-        A Configuration loader that uses a format similar to MS .ini files.
+     Provides general cryptographic and X.509 support needed by SSL/TLS but
+     not logically part of it.
 
  openssl:
      A command line tool that can be used for:
-        Creation of RSA, DH and DSA key parameters
+        Creation of key parameters
         Creation of X.509 certificates, CSRs and CRLs
-        Calculation of Message Digests
-        Encryption and Decryption with Ciphers
-        SSL/TLS Client and Server Tests
+        Calculation of message digests
+        Encryption and decryption
+        SSL/TLS client and server tests
         Handling of S/MIME signed or encrypted mail
+        And more...
 
  INSTALLATION
  ------------
 
- To install this package under a Unix derivative, read the INSTALL file.  For
- a Win32 platform, read the INSTALL.W32 file.  For OpenVMS systems, read
- INSTALL.VMS.
-
- Read the documentation in the doc/ directory.  It is quite rough, but it
- lists the functions; you will probably have to look at the code to work out
- how to use them. Look at the example programs.
-
- PROBLEMS
- --------
-
- For some platforms, there are some known problems that may affect the user
- or application author.  We try to collect those in doc/PROBLEMS, with current
- thoughts on how they should be solved in a future of OpenSSL.
+ See the appropriate file:
+        INSTALL         Linux, Unix, etc.
+        INSTALL.DJGPP   DOS platform with DJGPP
+        INSTALL.NW      Netware
+        INSTALL.OS2     OS/2
+        INSTALL.VMS     VMS
+        INSTALL.W32     Windows (32bit)
+        INSTALL.W64     Windows (64bit)
+        INSTALL.WCE     Windows CE
 
  SUPPORT
  -------
 
- See the OpenSSL website www.openssl.org for details of how to obtain
+ See the OpenSSL website www.openssl.org for details on how to obtain
  commercial technical support.
 
  If you have any problems with OpenSSL then please take the following steps
@@ -137,56 +86,33 @@
 
  Email the report to:
 
-    openssl-bugs@openssl.org
+    rt@openssl.org
+
+ In order to avoid spam, this is a moderated mailing list, and it might
+ take a day for the ticket to show up.  (We also scan posts to make sure
+ that security disclosures aren't publically posted by mistake.) Mail to
+ this address is recorded in the public RT (request tracker) database (see
+ https://www.openssl.org/support/rt.html for details) and also forwarded
+ the public openssl-dev mailing list.  Confidential mail may be sent to
+ openssl-security@openssl.org (PGP key available from the key servers).
 
- Note that the request tracker should NOT be used for general assistance
- or support queries. Just because something doesn't work the way you expect
- does not mean it is necessarily a bug in OpenSSL.
+ Please do NOT use this for general assistance or support queries.
+ Just because something doesn't work the way you expect does not mean it
+ is necessarily a bug in OpenSSL.
 
- Note that mail to openssl-bugs@openssl.org is recorded in the public
- request tracker database (see https://www.openssl.org/support/rt.html
- for details) and also forwarded to a public mailing list. Confidential
- mail may be sent to openssl-security@openssl.org (PGP key available from
- the key servers).
+ You can also make GitHub pull requests. If you do this, please also send
+ mail to rt@openssl.org with a link to the PR so that we can more easily
+ keep track of it.
 
  HOW TO CONTRIBUTE TO OpenSSL
  ----------------------------
 
- Development is coordinated on the openssl-dev mailing list (see
- http://www.openssl.org for information on subscribing). If you
- would like to submit a patch, send it to openssl-bugs@openssl.org with
- the string "[PATCH]" in the subject. Please be sure to include a
- textual explanation of what your patch does.
-
- If you are unsure as to whether a feature will be useful for the general
- OpenSSL community please discuss it on the openssl-dev mailing list first.
- Someone may be already working on the same thing or there may be a good
- reason as to why that feature isn't implemented.
-
- Patches should be as up to date as possible, preferably relative to the
- current Git or the last snapshot. They should follow the coding style of
- OpenSSL and compile without warnings. Some of the core team developer targets
- can be used for testing purposes, (debug-steve64, debug-geoff etc). OpenSSL
- compiles on many varied platforms: try to ensure you only use portable
- features.
-
- Note: For legal reasons, contributions from the US can be accepted only
- if a TSU notification and a copy of the patch are sent to crypt@bis.doc.gov
- (formerly BXA) with a copy to the ENC Encryption Request Coordinator;
- please take some time to look at
-    http://www.bis.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html [sic]
- and
-    http://w3.access.gpo.gov/bis/ear/pdf/740.pdf (EAR Section 740.13(e))
- for the details. If "your encryption source code is too large to serve as
- an email attachment", they are glad to receive it by fax instead; hope you
- have a cheap long-distance plan.
-
- Our preferred format for changes is "diff -u" output. You might
- generate it like this:
-
- # cd openssl-work
- # [your changes]
- # ./Configure dist; make clean
- # cd ..
- # diff -ur openssl-orig openssl-work > mydiffs.patch
+ See CONTRIBUTING
+
+ LEGALITIES
+ ----------
 
+ A number of nations, in particular the U.S., restrict the use or export
+ of cryptography. If you are potentially subject to such restrictions
+ you should seek competent professional legal advice before attempting to
+ develop or distribute cryptographic code.
diff --git a/deps/openssl/openssl/apps/Makefile b/deps/openssl/openssl/apps/Makefile
index cafe55458ddc14..8c3297ea672473 100644
--- a/deps/openssl/openssl/apps/Makefile
+++ b/deps/openssl/openssl/apps/Makefile
@@ -135,7 +135,7 @@ update: openssl-vms.cnf local_depend
 depend: local_depend
 	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
 local_depend:
-	@[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC); \
+	@[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC)
 
 dclean:
 	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
diff --git a/deps/openssl/openssl/apps/app_rand.c b/deps/openssl/openssl/apps/app_rand.c
index b6fe294a682711..ef0dd2ba8cabdd 100644
--- a/deps/openssl/openssl/apps/app_rand.c
+++ b/deps/openssl/openssl/apps/app_rand.c
@@ -129,10 +129,7 @@ int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
      * -no_rand_screen option in s_client
      */
     if (dont_warn != 2) {
-      BIO_printf(bio_e, "Loading 'screen' into random state -");
-      BIO_flush(bio_e);
       RAND_screen();
-      BIO_printf(bio_e, " done\n");
     }
 #endif
 
diff --git a/deps/openssl/openssl/apps/apps.c b/deps/openssl/openssl/apps/apps.c
index 7478fc379a55da..2e778054ca8fce 100644
--- a/deps/openssl/openssl/apps/apps.c
+++ b/deps/openssl/openssl/apps/apps.c
@@ -119,9 +119,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if !defined(OPENSSL_SYSNAME_WIN32) && !defined(OPENSSL_SYSNAME_WINCE) && !defined(NETWARE_CLIB)
-# include <strings.h>
-#endif
 #include <sys/types.h>
 #include <ctype.h>
 #include <errno.h>
@@ -1352,7 +1349,11 @@ int set_name_ex(unsigned long *flags, const char *arg)
         {"ca_default", XN_FLAG_MULTILINE, 0xffffffffL},
         {NULL, 0, 0}
     };
-    return set_multi_opts(flags, arg, ex_tbl);
+    if (set_multi_opts(flags, arg, ex_tbl) == 0)
+        return 0;
+    if ((*flags & XN_FLAG_SEP_MASK) == 0)
+        *flags |= XN_FLAG_SEP_CPLUS_SPC;
+    return 1;
 }
 
 int set_ext_copy(int *copy_type, const char *arg)
diff --git a/deps/openssl/openssl/apps/asn1pars.c b/deps/openssl/openssl/apps/asn1pars.c
index 11b07875943be8..0a6b990b503d85 100644
--- a/deps/openssl/openssl/apps/asn1pars.c
+++ b/deps/openssl/openssl/apps/asn1pars.c
@@ -313,9 +313,9 @@ int MAIN(int argc, char **argv)
             }
             typ = ASN1_TYPE_get(at);
             if ((typ == V_ASN1_OBJECT)
+                || (typ == V_ASN1_BOOLEAN)
                 || (typ == V_ASN1_NULL)) {
-                BIO_printf(bio_err, "Can't parse %s type\n",
-                           typ == V_ASN1_NULL ? "NULL" : "OBJECT");
+                BIO_printf(bio_err, "Can't parse %s type\n", ASN1_tag2str(typ));
                 ERR_print_errors(bio_err);
                 goto end;
             }
diff --git a/deps/openssl/openssl/apps/ca.c b/deps/openssl/openssl/apps/ca.c
index 3b7336c0466e5d..0b66095b83b6f1 100644
--- a/deps/openssl/openssl/apps/ca.c
+++ b/deps/openssl/openssl/apps/ca.c
@@ -99,25 +99,19 @@
 #undef PROG
 #define PROG ca_main
 
-#define BASE_SECTION    "ca"
-#define CONFIG_FILE "openssl.cnf"
+#define BASE_SECTION            "ca"
+#define CONFIG_FILE             "openssl.cnf"
 
 #define ENV_DEFAULT_CA          "default_ca"
 
-#define STRING_MASK     "string_mask"
+#define STRING_MASK             "string_mask"
 #define UTF8_IN                 "utf8"
 
-#define ENV_DIR                 "dir"
-#define ENV_CERTS               "certs"
-#define ENV_CRL_DIR             "crl_dir"
-#define ENV_CA_DB               "CA_DB"
 #define ENV_NEW_CERTS_DIR       "new_certs_dir"
 #define ENV_CERTIFICATE         "certificate"
 #define ENV_SERIAL              "serial"
 #define ENV_CRLNUMBER           "crlnumber"
-#define ENV_CRL                 "crl"
 #define ENV_PRIVATE_KEY         "private_key"
-#define ENV_RANDFILE            "RANDFILE"
 #define ENV_DEFAULT_DAYS        "default_days"
 #define ENV_DEFAULT_STARTDATE   "default_startdate"
 #define ENV_DEFAULT_ENDDATE     "default_enddate"
@@ -2538,6 +2532,8 @@ static int do_updatedb(CA_DB *db)
     char **rrow, *a_tm_s;
 
     a_tm = ASN1_UTCTIME_new();
+    if (a_tm == NULL)
+        return -1;
 
     /* get actual time and make a string */
     a_tm = X509_gmtime_adj(a_tm, 0);
diff --git a/deps/openssl/openssl/apps/ecparam.c b/deps/openssl/openssl/apps/ecparam.c
index 06ac77b838a380..71b67f435cfd56 100644
--- a/deps/openssl/openssl/apps/ecparam.c
+++ b/deps/openssl/openssl/apps/ecparam.c
@@ -416,14 +416,13 @@ int MAIN(int argc, char **argv)
     }
 
     if (check) {
-        if (group == NULL)
-            BIO_printf(bio_err, "no elliptic curve parameters\n");
         BIO_printf(bio_err, "checking elliptic curve parameters: ");
         if (!EC_GROUP_check(group, NULL)) {
             BIO_printf(bio_err, "failed\n");
             ERR_print_errors(bio_err);
-        } else
-            BIO_printf(bio_err, "ok\n");
+            goto end;
+        }
+        BIO_printf(bio_err, "ok\n");
 
     }
 
diff --git a/deps/openssl/openssl/apps/engine.c b/deps/openssl/openssl/apps/engine.c
index 3d70cac416d6a5..460ec60cb14c89 100644
--- a/deps/openssl/openssl/apps/engine.c
+++ b/deps/openssl/openssl/apps/engine.c
@@ -99,8 +99,6 @@ static void identity(char *ptr)
 
 static int append_buf(char **buf, const char *s, int *size, int step)
 {
-    int l = strlen(s);
-
     if (*buf == NULL) {
         *size = step;
         *buf = OPENSSL_malloc(*size);
@@ -109,9 +107,6 @@ static int append_buf(char **buf, const char *s, int *size, int step)
         **buf = '\0';
     }
 
-    if (**buf != '\0')
-        l += 2;                 /* ", " */
-
     if (strlen(*buf) + strlen(s) >= (unsigned int)*size) {
         *size += step;
         *buf = OPENSSL_realloc(*buf, *size);
diff --git a/deps/openssl/openssl/apps/md4.c b/deps/openssl/openssl/apps/md4.c
index 7f457b2ab1e120..03269af9bc5dd8 120000
--- a/deps/openssl/openssl/apps/md4.c
+++ b/deps/openssl/openssl/apps/md4.c
@@ -1 +1 @@
-../crypto/md4/md4.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/md4/md4.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/apps/ocsp.c b/deps/openssl/openssl/apps/ocsp.c
index 926083dd1b5cc1..6ed255d4b5635c 100644
--- a/deps/openssl/openssl/apps/ocsp.c
+++ b/deps/openssl/openssl/apps/ocsp.c
@@ -1261,8 +1261,8 @@ static OCSP_RESPONSE *query_responder(BIO *err, BIO *cbio, const char *path,
         return NULL;
     }
 
-    if (BIO_get_fd(cbio, &fd) <= 0) {
-        BIO_puts(err, "Can't get connection fd\n");
+    if (BIO_get_fd(cbio, &fd) < 0) {
+        BIO_puts(bio_err, "Can't get connection fd\n");
         goto err;
     }
 
diff --git a/deps/openssl/openssl/apps/pkcs12.c b/deps/openssl/openssl/apps/pkcs12.c
index 4ff64495a956cc..e41b445a50b052 100644
--- a/deps/openssl/openssl/apps/pkcs12.c
+++ b/deps/openssl/openssl/apps/pkcs12.c
@@ -134,13 +134,6 @@ int MAIN(int argc, char **argv)
 
     apps_startup();
 
-# ifdef OPENSSL_FIPS
-    if (FIPS_mode())
-        cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
-    else
-# endif
-        cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC;
-
     enc = EVP_des_ede3_cbc();
     if (bio_err == NULL)
         bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
@@ -148,6 +141,13 @@ int MAIN(int argc, char **argv)
     if (!load_config(bio_err, NULL))
         goto end;
 
+# ifdef OPENSSL_FIPS
+    if (FIPS_mode())
+        cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
+    else
+# endif
+        cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC;
+
     args = argv + 1;
 
     while (*args) {
diff --git a/deps/openssl/openssl/apps/s_cb.c b/deps/openssl/openssl/apps/s_cb.c
index dd3aa74e02afd4..5b5e711bf2eb9c 100644
--- a/deps/openssl/openssl/apps/s_cb.c
+++ b/deps/openssl/openssl/apps/s_cb.c
@@ -981,6 +981,11 @@ void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
         extname = "next protocol";
         break;
 #endif
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+    case TLSEXT_TYPE_application_layer_protocol_negotiation:
+        extname = "application layer protocol negotiation";
+        break;
+#endif
 
     case TLSEXT_TYPE_padding:
         extname = "TLS padding";
diff --git a/deps/openssl/openssl/apps/s_client.c b/deps/openssl/openssl/apps/s_client.c
index d89f2c51066574..95fe6d48c7ba36 100644
--- a/deps/openssl/openssl/apps/s_client.c
+++ b/deps/openssl/openssl/apps/s_client.c
@@ -432,6 +432,14 @@ static void sc_usage(void)
                " -no_ticket        - disable use of RFC4507bis session tickets\n");
     BIO_printf(bio_err,
                " -serverinfo types - send empty ClientHello extensions (comma-separated numbers)\n");
+    BIO_printf(bio_err,
+               " -curves arg       - Elliptic curves to advertise (colon-separated list)\n");
+    BIO_printf(bio_err,
+               " -sigalgs arg      - Signature algorithms to support (colon-separated list)\n");
+    BIO_printf(bio_err,
+               " -client_sigalgs arg - Signature algorithms to support for client\n");
+    BIO_printf(bio_err,
+               "                       certificate authentication (colon-separated list)\n");
 #endif
 #ifndef OPENSSL_NO_NEXTPROTONEG
     BIO_printf(bio_err,
@@ -2080,6 +2088,9 @@ int MAIN(int argc, char **argv)
         sk_X509_pop_free(chain, X509_free);
     if (pass)
         OPENSSL_free(pass);
+#ifndef OPENSSL_NO_SRP
+    OPENSSL_free(srp_arg.srppassin);
+#endif
     if (vpm)
         X509_VERIFY_PARAM_free(vpm);
     ssl_excert_free(exc);
diff --git a/deps/openssl/openssl/apps/s_server.c b/deps/openssl/openssl/apps/s_server.c
index acef382c2c4bb0..f19532b75fabd1 100644
--- a/deps/openssl/openssl/apps/s_server.c
+++ b/deps/openssl/openssl/apps/s_server.c
@@ -652,6 +652,12 @@ static void sv_usage(void)
                " -no_ticket    - disable use of RFC4507bis session tickets\n");
     BIO_printf(bio_err,
                " -legacy_renegotiation - enable use of legacy renegotiation (dangerous)\n");
+    BIO_printf(bio_err,
+               " -sigalgs arg      - Signature algorithms to support (colon-separated list)\n");
+    BIO_printf(bio_err,
+               " -client_sigalgs arg  - Signature algorithms to support for client \n");
+    BIO_printf(bio_err,
+               "                        certificate authentication (colon-separated list)\n");
 # ifndef OPENSSL_NO_NEXTPROTONEG
     BIO_printf(bio_err,
                " -nextprotoneg arg - set the advertised protocols for the NPN extension (comma-separated list)\n");
@@ -2881,6 +2887,21 @@ static int www_body(char *hostname, int s, int stype, unsigned char *context)
                 goto err;
             } else {
                 BIO_printf(bio_s_out, "read R BLOCK\n");
+#ifndef OPENSSL_NO_SRP
+                if (BIO_should_io_special(io)
+                    && BIO_get_retry_reason(io) == BIO_RR_SSL_X509_LOOKUP) {
+                    BIO_printf(bio_s_out, "LOOKUP renego during read\n");
+                    srp_callback_parm.user =
+                        SRP_VBASE_get_by_user(srp_callback_parm.vb,
+                                              srp_callback_parm.login);
+                    if (srp_callback_parm.user)
+                        BIO_printf(bio_s_out, "LOOKUP done %s\n",
+                                   srp_callback_parm.user->info);
+                    else
+                        BIO_printf(bio_s_out, "LOOKUP not successful\n");
+                    continue;
+                }
+#endif
 #if defined(OPENSSL_SYS_NETWARE)
                 delay(1000);
 #elif !defined(OPENSSL_SYS_MSDOS) && !defined(__DJGPP__)
@@ -3211,6 +3232,21 @@ static int rev_body(char *hostname, int s, int stype, unsigned char *context)
             ERR_print_errors(bio_err);
             goto end;
         }
+#ifndef OPENSSL_NO_SRP
+        if (BIO_should_io_special(io)
+            && BIO_get_retry_reason(io) == BIO_RR_SSL_X509_LOOKUP) {
+            BIO_printf(bio_s_out, "LOOKUP renego during accept\n");
+            srp_callback_parm.user =
+                SRP_VBASE_get_by_user(srp_callback_parm.vb,
+                                      srp_callback_parm.login);
+            if (srp_callback_parm.user)
+                BIO_printf(bio_s_out, "LOOKUP done %s\n",
+                           srp_callback_parm.user->info);
+            else
+                BIO_printf(bio_s_out, "LOOKUP not successful\n");
+            continue;
+        }
+#endif
     }
     BIO_printf(bio_err, "CONNECTION ESTABLISHED\n");
     print_ssl_summary(bio_err, con);
@@ -3224,6 +3260,21 @@ static int rev_body(char *hostname, int s, int stype, unsigned char *context)
                 goto err;
             } else {
                 BIO_printf(bio_s_out, "read R BLOCK\n");
+#ifndef OPENSSL_NO_SRP
+                if (BIO_should_io_special(io)
+                    && BIO_get_retry_reason(io) == BIO_RR_SSL_X509_LOOKUP) {
+                    BIO_printf(bio_s_out, "LOOKUP renego during read\n");
+                    srp_callback_parm.user =
+                        SRP_VBASE_get_by_user(srp_callback_parm.vb,
+                                              srp_callback_parm.login);
+                    if (srp_callback_parm.user)
+                        BIO_printf(bio_s_out, "LOOKUP done %s\n",
+                                   srp_callback_parm.user->info);
+                    else
+                        BIO_printf(bio_s_out, "LOOKUP not successful\n");
+                    continue;
+                }
+#endif
 #if defined(OPENSSL_SYS_NETWARE)
                 delay(1000);
 #elif !defined(OPENSSL_SYS_MSDOS) && !defined(__DJGPP__)
diff --git a/deps/openssl/openssl/appveyor.yml b/deps/openssl/openssl/appveyor.yml
new file mode 100644
index 00000000000000..8695359488d8dd
--- /dev/null
+++ b/deps/openssl/openssl/appveyor.yml
@@ -0,0 +1,60 @@
+platform:
+    - x86
+    - x64
+
+environment:
+    matrix:
+        - VSVER: 9
+        - VSVER: 10
+        - VSVER: 11
+        - VSVER: 12
+        - VSVER: 14
+
+configuration:
+    - plain
+    - shared
+
+matrix:
+    allow_failures:
+        - platform: x64
+          VSVER: 9
+        - platform: x64
+          VSVER: 10
+        - platform: x64
+          VSVER: 11
+
+before_build:
+    - ps: >-
+        If ($env:Platform -Match "x86") {
+            $env:VCVARS_PLATFORM="x86"
+            $env:TARGET="VC-WIN32"
+            $env:DO="do_ms"
+        } Else {
+            $env:VCVARS_PLATFORM="amd64"
+            $env:TARGET="VC-WIN64A"
+            $env:DO="do_win64a"
+        }
+    - ps: >-
+        If ($env:Configuration -Like "*shared*") {
+            $env:MAK="ntdll.mak"
+        } Else {
+            $env:MAK="nt.mak"
+        }
+    - ps: $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:VSVER" + "0COMNTOOLS"))
+    - call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM%
+    - perl Configure %TARGET% no-asm
+    - call ms\%DO%
+
+build_script:
+    - nmake /f ms\%MAK%
+
+test_script:
+    - nmake /f ms\%MAK% test
+
+notifications:
+    - provider: Email
+      to:
+          - openssl-commits@openssl.org
+      on_build_success: false
+      on_build_failure: true
+      on_build_status_changed: true
diff --git a/deps/openssl/openssl/crypto/aes/asm/aes-586.pl b/deps/openssl/openssl/crypto/aes/asm/aes-586.pl
index 451d0e0ed1e214..60286ecb9645db 100755
--- a/deps/openssl/openssl/crypto/aes/asm/aes-586.pl
+++ b/deps/openssl/openssl/crypto/aes/asm/aes-586.pl
@@ -45,7 +45,7 @@
 # the undertaken effort was that it appeared that in tight IA-32
 # register window little-endian flavor could achieve slightly higher
 # Instruction Level Parallelism, and it indeed resulted in up to 15%
-# better performance on most recent �-archs...
+# better performance on most recent µ-archs...
 #
 # Third version adds AES_cbc_encrypt implementation, which resulted in
 # up to 40% performance imrovement of CBC benchmark results. 40% was
@@ -224,7 +224,7 @@
 $speed_limit=512;	# chunks smaller than $speed_limit are
 			# processed with compact routine in CBC mode
 $small_footprint=1;	# $small_footprint=1 code is ~5% slower [on
-			# recent �-archs], but ~5 times smaller!
+			# recent µ-archs], but ~5 times smaller!
 			# I favor compact code to minimize cache
 			# contention and in hope to "collect" 5% back
 			# in real-life applications...
@@ -565,7 +565,7 @@ ()
 # Performance is not actually extraordinary in comparison to pure
 # x86 code. In particular encrypt performance is virtually the same.
 # Decrypt performance on the other hand is 15-20% better on newer
-# �-archs [but we're thankful for *any* improvement here], and ~50%
+# µ-archs [but we're thankful for *any* improvement here], and ~50%
 # better on PIII:-) And additionally on the pros side this code
 # eliminates redundant references to stack and thus relieves/
 # minimizes the pressure on the memory bus.
diff --git a/deps/openssl/openssl/crypto/aes/asm/aesni-mb-x86_64.pl b/deps/openssl/openssl/crypto/aes/asm/aesni-mb-x86_64.pl
index 33b1aed3c0b4c3..5a100fa8983b57 100644
--- a/deps/openssl/openssl/crypto/aes/asm/aesni-mb-x86_64.pl
+++ b/deps/openssl/openssl/crypto/aes/asm/aesni-mb-x86_64.pl
@@ -63,7 +63,7 @@
 	$avx = ($1>=10) + ($1>=11);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 
diff --git a/deps/openssl/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl b/deps/openssl/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
index 97992adca7c348..c803cdebc112a4 100644
--- a/deps/openssl/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
+++ b/deps/openssl/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
@@ -94,7 +94,7 @@
 $avx=1 if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&
 	   `ml64 2>&1` =~ /Version ([0-9]+)\./ &&
 	   $1>=10);
-$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0);
+$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0);
 
 $shaext=1;	### set to zero if compiling for 1.0.1
 
diff --git a/deps/openssl/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl b/deps/openssl/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl
index 19b0433b3b1bdb..bfe29268c78147 100644
--- a/deps/openssl/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl
+++ b/deps/openssl/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl
@@ -59,7 +59,7 @@
 	$avx = ($1>=10) + ($1>=12);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 
@@ -139,11 +139,8 @@
 	je	${func}_avx2
 ___
 $code.=<<___;
-	and	\$`1<<30`,%eax			# mask "Intel CPU" bit
-	and	\$`1<<28|1<<9`,%r10d		# mask AVX+SSSE3 bits
-	or	%eax,%r10d
-	cmp	\$`1<<28|1<<9|1<<30`,%r10d
-	je	${func}_avx
+	and	\$`1<<28`,%r10d			# check for AVX
+	jnz	${func}_avx
 	ud2
 ___
 						}
diff --git a/deps/openssl/openssl/crypto/aes/asm/aesni-x86.pl b/deps/openssl/openssl/crypto/aes/asm/aesni-x86.pl
index f67df8cf13da3e..9b2e37aafb1a05 100644
--- a/deps/openssl/openssl/crypto/aes/asm/aesni-x86.pl
+++ b/deps/openssl/openssl/crypto/aes/asm/aesni-x86.pl
@@ -88,7 +88,7 @@
 $inout4="xmm6";	$in0="xmm6";
 $inout5="xmm7";	$ivec="xmm7";
 
-# AESNI extenstion
+# AESNI extension
 sub aeskeygenassist
 { my($dst,$src,$imm)=@_;
     if ("$dst:$src" =~ /xmm([0-7]):xmm([0-7])/)
diff --git a/deps/openssl/openssl/crypto/aes/asm/vpaes-ppc.pl b/deps/openssl/openssl/crypto/aes/asm/vpaes-ppc.pl
index 7fda60ed9e4d59..1759ae9dcff272 100644
--- a/deps/openssl/openssl/crypto/aes/asm/vpaes-ppc.pl
+++ b/deps/openssl/openssl/crypto/aes/asm/vpaes-ppc.pl
@@ -337,24 +337,27 @@
 	addi	$inp, $inp, 15		# 15 is not a typo
 	 ?lvsr	$outperm, 0, $out
 	?lvsl	$keyperm, 0, $key	# prepare for unaligned access
-	 vnor	$outmask, v7, v7	# 0xff..ff
 	lvx	$inptail, 0, $inp	# redundant in aligned case
-	 ?vperm	$outmask, v7, $outmask, $outperm
-	 lvx	$outhead, 0, $out
 	?vperm	v0, v0, $inptail, $inpperm
 
 	bl	_vpaes_encrypt_core
 
+	andi.	r8, $out, 15
+	li	r9, 16
+	beq	Lenc_out_aligned
+
 	vperm	v0, v0, v0, $outperm	# rotate right/left
-	vsel	v1, $outhead, v0, $outmask
-	vmr	$outhead, v0
-	stvx	v1, 0, $out
-	addi	$out, $out, 15		# 15 is not a typo
-	########
+	mtctr	r9
+Lenc_out_unaligned:
+	stvebx	v0, 0, $out
+	addi	$out, $out, 1
+	bdnz	Lenc_out_unaligned
+	b	Lenc_done
 
-	lvx	v1, 0, $out		# redundant in aligned case
-	vsel	v1, $outhead, v1, $outmask
-	stvx	v1, 0, $out
+.align	4
+Lenc_out_aligned:
+	stvx	v0, 0, $out
+Lenc_done:
 
 	li	r10,`15+6*$SIZE_T`
 	li	r11,`31+6*$SIZE_T`
@@ -566,24 +569,27 @@
 	addi	$inp, $inp, 15		# 15 is not a typo
 	 ?lvsr	$outperm, 0, $out
 	?lvsl	$keyperm, 0, $key
-	 vnor	$outmask, v7, v7	# 0xff..ff
 	lvx	$inptail, 0, $inp	# redundant in aligned case
-	 ?vperm	$outmask, v7, $outmask, $outperm
-	 lvx	$outhead, 0, $out
 	?vperm	v0, v0, $inptail, $inpperm
 
 	bl	_vpaes_decrypt_core
 
+	andi.	r8, $out, 15
+	li	r9, 16
+	beq	Ldec_out_aligned
+
 	vperm	v0, v0, v0, $outperm	# rotate right/left
-	vsel	v1, $outhead, v0, $outmask
-	vmr	$outhead, v0
-	stvx	v1, 0, $out
-	addi	$out, $out, 15		# 15 is not a typo
-	########
+	mtctr	r9
+Ldec_out_unaligned:
+	stvebx	v0, 0, $out
+	addi	$out, $out, 1
+	bdnz	Ldec_out_unaligned
+	b	Ldec_done
 
-	lvx	v1, 0, $out		# redundant in aligned case
-	vsel	v1, $outhead, v1, $outmask
-	stvx	v1, 0, $out
+.align	4
+Ldec_out_aligned:
+	stvx	v0, 0, $out
+Ldec_done:
 
 	li	r10,`15+6*$SIZE_T`
 	li	r11,`31+6*$SIZE_T`
@@ -658,11 +664,11 @@
 	$PUSH	r0, `$FRAME+$SIZE_T*2+$LRSAVE`($sp)
 
 	and	r30, r5, r9		# copy length&-16
+	andi.	r9, $out, 15		# is $out aligned?
 	mr	r5, r6			# copy pointer to key
 	mr	r31, r7			# copy pointer to iv
-	blt	Lcbc_abort
-	cmpwi	r8, 0			# test direction
 	li	r6, -1
+	mcrf	cr1, cr0		# put aside $out alignment flag
 	mr	r7, r12			# copy vrsave
 	mtspr	256, r6			# preserve all AltiVec registers
 
@@ -672,6 +678,7 @@
 	lvx	v25, r9, r31
 	?vperm	v24, v24, v25, $inpperm
 
+	cmpwi	r8, 0			# test direction
 	neg	r8, $inp		# prepare for unaligned access
 	 vxor	v7, v7, v7
 	?lvsl	$keyperm, 0, $key
@@ -681,13 +688,37 @@
 	lvx	$inptail, 0, $inp
 	 ?vperm	$outmask, v7, $outmask, $outperm
 	addi	$inp, $inp, 15		# 15 is not a typo
-	 lvx	$outhead, 0, $out
 
 	beq	Lcbc_decrypt
 
 	bl	_vpaes_encrypt_preheat
 	li	r0, 16
 
+	beq	cr1, Lcbc_enc_loop	# $out is aligned
+
+	vmr	v0, $inptail
+	lvx	$inptail, 0, $inp
+	addi	$inp, $inp, 16
+	?vperm	v0, v0, $inptail, $inpperm
+	vxor	v0, v0, v24		# ^= iv
+
+	bl	_vpaes_encrypt_core
+
+	andi.	r8, $out, 15
+	vmr	v24, v0			# put aside iv
+	sub	r9, $out, r8
+	vperm	$outhead, v0, v0, $outperm	# rotate right/left
+
+Lcbc_enc_head:
+	stvebx	$outhead, r8, r9
+	cmpwi	r8, 15
+	addi	r8, r8, 1
+	bne	Lcbc_enc_head
+
+	sub.	r30, r30, r0		# len -= 16
+	addi	$out, $out, 16
+	beq	Lcbc_unaligned_done
+
 Lcbc_enc_loop:
 	vmr	v0, $inptail
 	lvx	$inptail, 0, $inp
@@ -713,6 +744,32 @@
 	bl	_vpaes_decrypt_preheat
 	li	r0, 16
 
+	beq	cr1, Lcbc_dec_loop	# $out is aligned
+
+	vmr	v0, $inptail
+	lvx	$inptail, 0, $inp
+	addi	$inp, $inp, 16
+	?vperm	v0, v0, $inptail, $inpperm
+	vmr	v25, v0			# put aside input
+
+	bl	_vpaes_decrypt_core
+
+	andi.	r8, $out, 15
+	vxor	v0, v0, v24		# ^= iv
+	vmr	v24, v25
+	sub	r9, $out, r8
+	vperm	$outhead, v0, v0, $outperm	# rotate right/left
+
+Lcbc_dec_head:
+	stvebx	$outhead, r8, r9
+	cmpwi	r8, 15
+	addi	r8, r8, 1
+	bne	Lcbc_dec_head
+
+	sub.	r30, r30, r0		# len -= 16
+	addi	$out, $out, 16
+	beq	Lcbc_unaligned_done
+
 Lcbc_dec_loop:
 	vmr	v0, $inptail
 	lvx	$inptail, 0, $inp
@@ -733,23 +790,29 @@
 	bne	Lcbc_dec_loop
 
 Lcbc_done:
-	addi	$out, $out, -1
-	lvx	v1, 0, $out		# redundant in aligned case
-	vsel	v1, $outhead, v1, $outmask
-	stvx	v1, 0, $out
-
+	beq	cr1, Lcbc_write_iv	# $out is aligned
+
+Lcbc_unaligned_done:
+	andi.	r8, $out, 15
+	sub	$out, $out, r8
+	li	r9, 0
+Lcbc_tail:
+	stvebx	$outhead, r9, $out
+	addi	r9, r9, 1
+	cmpw	r9, r8
+	bne	Lcbc_tail
+
+Lcbc_write_iv:
 	neg	r8, r31			# write [potentially unaligned] iv
+	li	r10, 4
 	?lvsl	$outperm, 0, r8
-	li	r6, 15
-	vnor	$outmask, v7, v7	# 0xff..ff
-	?vperm	$outmask, v7, $outmask, $outperm
-	lvx	$outhead, 0, r31
+	li	r11, 8
+	li	r12, 12
 	vperm	v24, v24, v24, $outperm	# rotate right/left
-	vsel	v0, $outhead, v24, $outmask
-	lvx	v1, r6, r31
-	stvx	v0, 0, r31
-	vsel	v1, v24, v1, $outmask
-	stvx	v1, r6, r31
+	stvewx	v24, 0, r31		# ivp is at least 32-bit aligned
+	stvewx	v24, r10, r31
+	stvewx	v24, r11, r31
+	stvewx	v24, r12, r31
 
 	mtspr	256, r7			# restore vrsave
 	li	r10,`15+6*$SIZE_T`
@@ -872,18 +935,21 @@
 
 	# encrypting, output zeroth round key after transform
 	li	r8, 0x30		# mov	\$0x30,%r8d
-	addi	r10, r12, 0x80		# lea	.Lk_sr(%rip),%r10
+	li	r9, 4
+	li	r10, 8
+	li	r11, 12
 
 	?lvsr	$outperm, 0, $out	# prepare for unaligned access
 	vnor	$outmask, v9, v9	# 0xff..ff
-	lvx	$outhead, 0, $out
 	?vperm	$outmask, v9, $outmask, $outperm
 
 	#stvx	v0, 0, $out		# vmovdqu	%xmm0,	(%rdx)
-	vperm	v1, v0, v0, $outperm	# rotate right/left
-	vsel	v2, $outhead, v1, $outmask
-	vmr	$outhead, v1
-	stvx	v2, 0, $out
+	vperm	$outhead, v0, v0, $outperm	# rotate right/left
+	stvewx	$outhead, 0, $out	# some are superfluous
+	stvewx	$outhead, r9, $out
+	stvewx	$outhead, r10, $out
+	addi	r10, r12, 0x80		# lea	.Lk_sr(%rip),%r10
+	stvewx	$outhead, r11, $out
 	b	Lschedule_go
 
 Lschedule_am_decrypting:
@@ -893,20 +959,24 @@
 	addi	r10, r12, 0x80		# lea	.Lk_sr(%rip),%r10
 	# decrypting, output zeroth round key after shiftrows
 	lvx	v1, r8, r10		# vmovdqa	(%r8,%r10),	%xmm1
+	li	r9, 4
+	li	r10, 8
+	li	r11, 12
 	vperm	v4, v3, v3, v1		# vpshufb	%xmm1,	%xmm3,	%xmm3
 
 	neg	r0, $out		# prepare for unaligned access
 	?lvsl	$outperm, 0, r0
-	addi	$out, $out, 15		# 15 is not typo
 	vnor	$outmask, v9, v9	# 0xff..ff
-	lvx	$outhead, 0, $out
 	?vperm	$outmask, $outmask, v9, $outperm
 
 	#stvx	v4, 0, $out		# vmovdqu	%xmm3,	(%rdx)
-	vperm	v4, v4, v4, $outperm	# rotate right/left
-	vsel	v2, $outhead, v4, $outmask
-	vmr	$outhead, v4
-	stvx	v2, 0, $out
+	vperm	$outhead, v4, v4, $outperm	# rotate right/left
+	stvewx	$outhead, 0, $out	# some are superfluous
+	stvewx	$outhead, r9, $out
+	stvewx	$outhead, r10, $out
+	addi	r10, r12, 0x80		# lea	.Lk_sr(%rip),%r10
+	stvewx	$outhead, r11, $out
+	addi	$out, $out, 15		# 15 is not typo
 	xori	r8, r8, 0x30		# xor	\$0x30, %r8
 
 Lschedule_go:
@@ -1038,14 +1108,15 @@
 
 	#stvx	v0, r0, $out		# vmovdqu	%xmm0,	(%rdx)		# save last key
 	vperm	v0, v0, v0, $outperm	# rotate right/left
+	li	r10, 4
 	vsel	v2, $outhead, v0, $outmask
-	vmr	$outhead, v0
+	li	r11, 8
 	stvx	v2, 0, $out
-
-	addi	$out, $out, 15		# 15 is not typo
-	lvx	v1, 0, $out		# redundant in aligned case
-	vsel	v1, $outhead, v1, $outmask
-	stvx	v1, 0, $out
+	li	r12, 12
+	stvewx	v0, 0, $out		# some (or all) are redundant
+	stvewx	v0, r10, $out
+	stvewx	v0, r11, $out
+	stvewx	v0, r12, $out
 	b	Lschedule_mangle_done
 
 .align	4
@@ -1057,15 +1128,18 @@
 	bl	_vpaes_schedule_transform	# output transform
 
 	#stvx	v0, r0, $out		# vmovdqu	%xmm0,	(%rdx)		# save last key
+	addi	r9, $out, -15		# -15 is not typo
 	vperm	v0, v0, v0, $outperm	# rotate right/left
+	li	r10, 4
 	vsel	v2, $outhead, v0, $outmask
-	vmr	$outhead, v0
+	li	r11, 8
 	stvx	v2, 0, $out
+	li	r12, 12
+	stvewx	v0, 0, r9		# some (or all) are redundant
+	stvewx	v0, r10, r9
+	stvewx	v0, r11, r9
+	stvewx	v0, r12, r9
 
-	addi	$out, $out, -15		# -15 is not typo
-	lvx	v1, 0, $out		# redundant in aligned case
-	vsel	v1, $outhead, v1, $outmask
-	stvx	v1, 0, $out
 
 Lschedule_mangle_done:
 	mtlr	r7
diff --git a/deps/openssl/openssl/crypto/asn1/asn1_par.c b/deps/openssl/openssl/crypto/asn1/asn1_par.c
index a5d2da10bb72df..0ca985a2be1e70 100644
--- a/deps/openssl/openssl/crypto/asn1/asn1_par.c
+++ b/deps/openssl/openssl/crypto/asn1/asn1_par.c
@@ -62,6 +62,10 @@
 #include <openssl/objects.h>
 #include <openssl/asn1.h>
 
+#ifndef ASN1_PARSE_MAXDEPTH
+#define ASN1_PARSE_MAXDEPTH 128
+#endif
+
 static int asn1_print_info(BIO *bp, int tag, int xclass, int constructed,
                            int indent);
 static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
@@ -128,6 +132,12 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
 #else
     dump_indent = 6;            /* Because we know BIO_dump_indent() */
 #endif
+
+    if (depth > ASN1_PARSE_MAXDEPTH) {
+            BIO_puts(bp, "BAD RECURSION DEPTH\n");
+            return 0;
+    }
+
     p = *pp;
     tot = p + length;
     op = p - 1;
diff --git a/deps/openssl/openssl/crypto/asn1/d2i_pr.c b/deps/openssl/openssl/crypto/asn1/d2i_pr.c
index c96da091d39c44..d21829af192f0c 100644
--- a/deps/openssl/openssl/crypto/asn1/d2i_pr.c
+++ b/deps/openssl/openssl/crypto/asn1/d2i_pr.c
@@ -72,6 +72,7 @@ EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
                          long length)
 {
     EVP_PKEY *ret;
+    const unsigned char *p = *pp;
 
     if ((a == NULL) || (*a == NULL)) {
         if ((ret = EVP_PKEY_new()) == NULL) {
@@ -94,21 +95,23 @@ EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
     }
 
     if (!ret->ameth->old_priv_decode ||
-        !ret->ameth->old_priv_decode(ret, pp, length)) {
+        !ret->ameth->old_priv_decode(ret, &p, length)) {
         if (ret->ameth->priv_decode) {
             PKCS8_PRIV_KEY_INFO *p8 = NULL;
-            p8 = d2i_PKCS8_PRIV_KEY_INFO(NULL, pp, length);
+            p8 = d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, length);
             if (!p8)
                 goto err;
             EVP_PKEY_free(ret);
             ret = EVP_PKCS82PKEY(p8);
             PKCS8_PRIV_KEY_INFO_free(p8);
-
+            if (ret == NULL)
+                goto err;
         } else {
             ASN1err(ASN1_F_D2I_PRIVATEKEY, ERR_R_ASN1_LIB);
             goto err;
         }
     }
+    *pp = p;
     if (a != NULL)
         (*a) = ret;
     return (ret);
@@ -136,6 +139,7 @@ EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp,
      * input is surrounded by an ASN1 SEQUENCE.
      */
     inkey = d2i_ASN1_SEQUENCE_ANY(NULL, &p, length);
+    p = *pp;
     /*
      * Since we only need to discern "traditional format" RSA and DSA keys we
      * can just count the elements.
@@ -146,7 +150,7 @@ EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp,
         keytype = EVP_PKEY_EC;
     else if (sk_ASN1_TYPE_num(inkey) == 3) { /* This seems to be PKCS8, not
                                               * traditional format */
-        PKCS8_PRIV_KEY_INFO *p8 = d2i_PKCS8_PRIV_KEY_INFO(NULL, pp, length);
+        PKCS8_PRIV_KEY_INFO *p8 = d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, length);
         EVP_PKEY *ret;
 
         sk_ASN1_TYPE_pop_free(inkey, ASN1_TYPE_free);
@@ -157,6 +161,9 @@ EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp,
         }
         ret = EVP_PKCS82PKEY(p8);
         PKCS8_PRIV_KEY_INFO_free(p8);
+        if (ret == NULL)
+            return NULL;
+        *pp = p;
         if (a) {
             *a = ret;
         }
diff --git a/deps/openssl/openssl/crypto/asn1/tasn_dec.c b/deps/openssl/openssl/crypto/asn1/tasn_dec.c
index 7fd336a402268b..9256049d158814 100644
--- a/deps/openssl/openssl/crypto/asn1/tasn_dec.c
+++ b/deps/openssl/openssl/crypto/asn1/tasn_dec.c
@@ -180,6 +180,8 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
     int otag;
     int ret = 0;
     ASN1_VALUE **pchptr, *ptmpval;
+    int combine = aclass & ASN1_TFLG_COMBINE;
+    aclass &= ~ASN1_TFLG_COMBINE;
     if (!pval)
         return 0;
     if (aux && aux->asn1_cb)
@@ -350,9 +352,9 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
         }
 
         asn1_set_choice_selector(pval, i, it);
-        *in = p;
         if (asn1_cb && !asn1_cb(ASN1_OP_D2I_POST, pval, it, NULL))
             goto auxerr;
+        *in = p;
         return 1;
 
     case ASN1_ITYPE_NDEF_SEQUENCE:
@@ -489,9 +491,9 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
         /* Save encoding */
         if (!asn1_enc_save(pval, *in, p - *in, it))
             goto auxerr;
-        *in = p;
         if (asn1_cb && !asn1_cb(ASN1_OP_D2I_POST, pval, it, NULL))
             goto auxerr;
+        *in = p;
         return 1;
 
     default:
@@ -500,7 +502,8 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
  auxerr:
     ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ASN1_R_AUX_ERROR);
  err:
-    ASN1_item_ex_free(pval, it);
+    if (combine == 0)
+        ASN1_item_ex_free(pval, it);
     if (errtt)
         ERR_add_error_data(4, "Field=", errtt->field_name,
                            ", Type=", it->sname);
@@ -689,7 +692,7 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val,
     } else {
         /* Nothing special */
         ret = ASN1_item_ex_d2i(val, &p, len, ASN1_ITEM_ptr(tt->item),
-                               -1, 0, opt, ctx);
+                               -1, tt->flags & ASN1_TFLG_COMBINE, opt, ctx);
         if (!ret) {
             ASN1err(ASN1_F_ASN1_TEMPLATE_NOEXP_D2I, ERR_R_NESTED_ASN1_ERROR);
             goto err;
diff --git a/deps/openssl/openssl/crypto/asn1/x_bignum.c b/deps/openssl/openssl/crypto/asn1/x_bignum.c
index a5a403c26e10ee..eaf046639d6a20 100644
--- a/deps/openssl/openssl/crypto/asn1/x_bignum.c
+++ b/deps/openssl/openssl/crypto/asn1/x_bignum.c
@@ -141,8 +141,9 @@ static int bn_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
                   int utype, char *free_cont, const ASN1_ITEM *it)
 {
     BIGNUM *bn;
-    if (!*pval)
-        bn_new(pval, it);
+
+    if (*pval == NULL && !bn_new(pval, it))
+        return 0;
     bn = (BIGNUM *)*pval;
     if (!BN_bin2bn(cont, len, bn)) {
         bn_free(pval, it);
diff --git a/deps/openssl/openssl/crypto/asn1/x_pubkey.c b/deps/openssl/openssl/crypto/asn1/x_pubkey.c
index 4b682018c2de40..6c57a7971c9da2 100644
--- a/deps/openssl/openssl/crypto/asn1/x_pubkey.c
+++ b/deps/openssl/openssl/crypto/asn1/x_pubkey.c
@@ -188,13 +188,16 @@ EVP_PKEY *d2i_PUBKEY(EVP_PKEY **a, const unsigned char **pp, long length)
 {
     X509_PUBKEY *xpk;
     EVP_PKEY *pktmp;
-    xpk = d2i_X509_PUBKEY(NULL, pp, length);
+    const unsigned char *q;
+    q = *pp;
+    xpk = d2i_X509_PUBKEY(NULL, &q, length);
     if (!xpk)
         return NULL;
     pktmp = X509_PUBKEY_get(xpk);
     X509_PUBKEY_free(xpk);
     if (!pktmp)
         return NULL;
+    *pp = q;
     if (a) {
         EVP_PKEY_free(*a);
         *a = pktmp;
diff --git a/deps/openssl/openssl/crypto/asn1/x_x509.c b/deps/openssl/openssl/crypto/asn1/x_x509.c
index 5f266a26b4c28e..e2cac836943d72 100644
--- a/deps/openssl/openssl/crypto/asn1/x_x509.c
+++ b/deps/openssl/openssl/crypto/asn1/x_x509.c
@@ -180,16 +180,15 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
     if (!a || *a == NULL) {
         freeret = 1;
     }
-    ret = d2i_X509(a, pp, length);
+    ret = d2i_X509(a, &q, length);
     /* If certificate unreadable then forget it */
     if (!ret)
         return NULL;
     /* update length */
-    length -= *pp - q;
-    if (!length)
-        return ret;
-    if (!d2i_X509_CERT_AUX(&ret->aux, pp, length))
+    length -= q - *pp;
+    if (length > 0 && !d2i_X509_CERT_AUX(&ret->aux, &q, length))
         goto err;
+    *pp = q;
     return ret;
  err:
     if (freeret) {
diff --git a/deps/openssl/openssl/crypto/asn1/x_x509a.c b/deps/openssl/openssl/crypto/asn1/x_x509a.c
index 76bbc1370ff7fb..ad93592a714a2a 100644
--- a/deps/openssl/openssl/crypto/asn1/x_x509a.c
+++ b/deps/openssl/openssl/crypto/asn1/x_x509a.c
@@ -163,10 +163,13 @@ int X509_add1_reject_object(X509 *x, ASN1_OBJECT *obj)
     if (!(objtmp = OBJ_dup(obj)))
         return 0;
     if (!(aux = aux_get(x)))
-        return 0;
+        goto err;
     if (!aux->reject && !(aux->reject = sk_ASN1_OBJECT_new_null()))
-        return 0;
+        goto err;
     return sk_ASN1_OBJECT_push(aux->reject, objtmp);
+ err:
+    ASN1_OBJECT_free(objtmp);
+    return 0;
 }
 
 void X509_trust_clear(X509 *x)
diff --git a/deps/openssl/openssl/crypto/bio/b_dump.c b/deps/openssl/openssl/crypto/bio/b_dump.c
index ed8e521449a445..ccf0e287c4e828 100644
--- a/deps/openssl/openssl/crypto/bio/b_dump.c
+++ b/deps/openssl/openssl/crypto/bio/b_dump.c
@@ -104,7 +104,6 @@ int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
     if ((rows * dump_width) < len)
         rows++;
     for (i = 0; i < rows; i++) {
-        buf[0] = '\0';          /* start with empty string */
         BUF_strlcpy(buf, str, sizeof buf);
         BIO_snprintf(tmp, sizeof tmp, "%04x - ", i * dump_width);
         BUF_strlcat(buf, tmp, sizeof buf);
diff --git a/deps/openssl/openssl/crypto/bio/bss_file.c b/deps/openssl/openssl/crypto/bio/bss_file.c
index d7f15b0699c91d..bfba93e62bbd08 100644
--- a/deps/openssl/openssl/crypto/bio/bss_file.c
+++ b/deps/openssl/openssl/crypto/bio/bss_file.c
@@ -115,9 +115,8 @@ static BIO_METHOD methods_filep = {
     NULL,
 };
 
-BIO *BIO_new_file(const char *filename, const char *mode)
+static FILE *file_fopen(const char *filename, const char *mode)
 {
-    BIO *ret;
     FILE *file = NULL;
 
 #  if defined(_WIN32) && defined(CP_UTF8)
@@ -164,6 +163,14 @@ BIO *BIO_new_file(const char *filename, const char *mode)
 #  else
     file = fopen(filename, mode);
 #  endif
+    return (file);
+}
+
+BIO *BIO_new_file(const char *filename, const char *mode)
+{
+    BIO  *ret;
+    FILE *file = file_fopen(filename, mode);
+
     if (file == NULL) {
         SYSerr(SYS_F_FOPEN, get_last_sys_error());
         ERR_add_error_data(5, "fopen('", filename, "','", mode, "')");
@@ -386,7 +393,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
         else
             strcat(p, "t");
 #  endif
-        fp = fopen(ptr, p);
+        fp = file_fopen(ptr, p);
         if (fp == NULL) {
             SYSerr(SYS_F_FOPEN, get_last_sys_error());
             ERR_add_error_data(5, "fopen('", ptr, "','", p, "')");
diff --git a/deps/openssl/openssl/crypto/bn/asm/armv4-gf2m.pl b/deps/openssl/openssl/crypto/bn/asm/armv4-gf2m.pl
index 8f529c95cf0509..72381a77240ca9 100644
--- a/deps/openssl/openssl/crypto/bn/asm/armv4-gf2m.pl
+++ b/deps/openssl/openssl/crypto/bn/asm/armv4-gf2m.pl
@@ -27,7 +27,7 @@
 # referred below, which improves ECDH and ECDSA verify benchmarks
 # by 18-40%.
 #
-# C�mara, D.; Gouv�a, C. P. L.; L�pez, J. & Dahab, R.: Fast Software
+# Câmara, D.; Gouvêa, C. P. L.; López, J. & Dahab, R.: Fast Software
 # Polynomial Multiplication on ARM Processors using the NEON Engine.
 # 
 # http://conradoplg.cryptoland.net/files/2010/12/mocrysen13.pdf
@@ -136,7 +136,7 @@
 ################
 # void	bn_GF2m_mul_2x2(BN_ULONG *r,
 #	BN_ULONG a1,BN_ULONG a0,
-#	BN_ULONG b1,BN_ULONG b0);	# r[3..0]=a1a0�b1b0
+#	BN_ULONG b1,BN_ULONG b0);	# r[3..0]=a1a0·b1b0
 {
 $code.=<<___;
 .global	bn_GF2m_mul_2x2
@@ -159,7 +159,7 @@
 	mov	$mask,#7<<2
 	sub	sp,sp,#32		@ allocate tab[8]
 
-	bl	mul_1x1_ialu		@ a1�b1
+	bl	mul_1x1_ialu		@ a1·b1
 	str	$lo,[$ret,#8]
 	str	$hi,[$ret,#12]
 
@@ -169,13 +169,13 @@
 	 eor	r2,r2,$a
 	eor	$b,$b,r3
 	 eor	$a,$a,r2
-	bl	mul_1x1_ialu		@ a0�b0
+	bl	mul_1x1_ialu		@ a0·b0
 	str	$lo,[$ret]
 	str	$hi,[$ret,#4]
 
 	eor	$a,$a,r2
 	eor	$b,$b,r3
-	bl	mul_1x1_ialu		@ (a1+a0)�(b1+b0)
+	bl	mul_1x1_ialu		@ (a1+a0)·(b1+b0)
 ___
 @r=map("r$_",(6..9));
 $code.=<<___;
diff --git a/deps/openssl/openssl/crypto/bn/asm/ia64.S b/deps/openssl/openssl/crypto/bn/asm/ia64.S
index 951abc53ea5bba..a9a42abfc302d6 100644
--- a/deps/openssl/openssl/crypto/bn/asm/ia64.S
+++ b/deps/openssl/openssl/crypto/bn/asm/ia64.S
@@ -422,7 +422,7 @@ bn_mul_add_words:
 
 // This loop spins in 3*(n+10) ticks on Itanium and in 2*(n+10) on
 // Itanium 2. Yes, unlike previous versions it scales:-) Previous
-// version was peforming *all* additions in IALU and was starving
+// version was performing *all* additions in IALU and was starving
 // for those even on Itanium 2. In this version one addition is
 // moved to FPU and is folded with multiplication. This is at cost
 // of propogating the result from previous call to this subroutine
@@ -568,7 +568,7 @@ bn_sqr_comba8:
 // I've estimated this routine to run in ~120 ticks, but in reality
 // (i.e. according to ar.itc) it takes ~160 ticks. Are those extra
 // cycles consumed for instructions fetch? Or did I misinterpret some
-// clause in Itanium �-architecture manual? Comments are welcomed and
+// clause in Itanium µ-architecture manual? Comments are welcomed and
 // highly appreciated.
 //
 // On Itanium 2 it takes ~190 ticks. This is because of stalls on
diff --git a/deps/openssl/openssl/crypto/bn/asm/ppc64-mont.pl b/deps/openssl/openssl/crypto/bn/asm/ppc64-mont.pl
index 68e3733e3f79cd..9e3c12d788e5fd 100644
--- a/deps/openssl/openssl/crypto/bn/asm/ppc64-mont.pl
+++ b/deps/openssl/openssl/crypto/bn/asm/ppc64-mont.pl
@@ -94,6 +94,8 @@
 	$POP=	"ld";
 } else { die "nonsense $flavour"; }
 
+$LITTLE_ENDIAN = ($flavour=~/le$/) ? 4 : 0;
+
 $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
 ( $xlate="${dir}ppc-xlate.pl" and -f $xlate ) or
 ( $xlate="${dir}../../perlasm/ppc-xlate.pl" and -f $xlate) or
@@ -294,12 +296,12 @@
 
 	extrdi	$t0,$a0,32,32		; lwz	$t0,4($ap)
 	extrdi	$t1,$a0,32,0		; lwz	$t1,0($ap)
-	lwz	$t2,12($ap)		; load a[1] as 32-bit word pair
-	lwz	$t3,8($ap)
-	lwz	$t4,4($np)		; load n[0] as 32-bit word pair
-	lwz	$t5,0($np)
-	lwz	$t6,12($np)		; load n[1] as 32-bit word pair
-	lwz	$t7,8($np)
+	lwz	$t2,`12^$LITTLE_ENDIAN`($ap)	; load a[1] as 32-bit word pair
+	lwz	$t3,`8^$LITTLE_ENDIAN`($ap)
+	lwz	$t4,`4^$LITTLE_ENDIAN`($np)	; load n[0] as 32-bit word pair
+	lwz	$t5,`0^$LITTLE_ENDIAN`($np)
+	lwz	$t6,`12^$LITTLE_ENDIAN`($np)	; load n[1] as 32-bit word pair
+	lwz	$t7,`8^$LITTLE_ENDIAN`($np)
 ___
 $code.=<<___ if ($SIZE_T==4);
 	lwz	$a0,0($ap)		; pull ap[0,1] value
@@ -463,14 +465,14 @@
 L1st:
 ___
 $code.=<<___ if ($SIZE_T==8);
-	lwz	$t0,4($ap)		; load a[j] as 32-bit word pair
-	lwz	$t1,0($ap)
-	lwz	$t2,12($ap)		; load a[j+1] as 32-bit word pair
-	lwz	$t3,8($ap)
-	lwz	$t4,4($np)		; load n[j] as 32-bit word pair
-	lwz	$t5,0($np)
-	lwz	$t6,12($np)		; load n[j+1] as 32-bit word pair
-	lwz	$t7,8($np)
+	lwz	$t0,`4^$LITTLE_ENDIAN`($ap)	; load a[j] as 32-bit word pair
+	lwz	$t1,`0^$LITTLE_ENDIAN`($ap)
+	lwz	$t2,`12^$LITTLE_ENDIAN`($ap)	; load a[j+1] as 32-bit word pair
+	lwz	$t3,`8^$LITTLE_ENDIAN`($ap)
+	lwz	$t4,`4^$LITTLE_ENDIAN`($np)	; load n[j] as 32-bit word pair
+	lwz	$t5,`0^$LITTLE_ENDIAN`($np)
+	lwz	$t6,`12^$LITTLE_ENDIAN`($np)	; load n[j+1] as 32-bit word pair
+	lwz	$t7,`8^$LITTLE_ENDIAN`($np)
 ___
 $code.=<<___ if ($SIZE_T==4);
 	lwz	$t0,0($ap)		; load a[j..j+3] as 32-bit word pairs
@@ -505,14 +507,14 @@
 ___
 } else {
 $code.=<<___;
-	lwz	$t1,`$FRAME+0`($sp)
-	lwz	$t0,`$FRAME+4`($sp)
-	lwz	$t3,`$FRAME+8`($sp)
-	lwz	$t2,`$FRAME+12`($sp)
-	lwz	$t5,`$FRAME+16`($sp)
-	lwz	$t4,`$FRAME+20`($sp)
-	lwz	$t7,`$FRAME+24`($sp)
-	lwz	$t6,`$FRAME+28`($sp)
+	lwz	$t1,`$FRAME+0^$LITTLE_ENDIAN`($sp)
+	lwz	$t0,`$FRAME+4^$LITTLE_ENDIAN`($sp)
+	lwz	$t3,`$FRAME+8^$LITTLE_ENDIAN`($sp)
+	lwz	$t2,`$FRAME+12^$LITTLE_ENDIAN`($sp)
+	lwz	$t5,`$FRAME+16^$LITTLE_ENDIAN`($sp)
+	lwz	$t4,`$FRAME+20^$LITTLE_ENDIAN`($sp)
+	lwz	$t7,`$FRAME+24^$LITTLE_ENDIAN`($sp)
+	lwz	$t6,`$FRAME+28^$LITTLE_ENDIAN`($sp)
 ___
 }
 $code.=<<___;
@@ -651,8 +653,8 @@
 
 	fmadd	$T1a,$N1,$na,$T1a
 	fmadd	$T1b,$N1,$nb,$T1b
-	 lwz	$t3,`$FRAME+32`($sp)	; permuted $t1
-	 lwz	$t2,`$FRAME+36`($sp)	; permuted $t0
+	 lwz	$t3,`$FRAME+32^$LITTLE_ENDIAN`($sp)	; permuted $t1
+	 lwz	$t2,`$FRAME+36^$LITTLE_ENDIAN`($sp)	; permuted $t0
 	 addc	$t4,$t4,$carry
 	 adde	$t5,$t5,$c1
 	 srwi	$carry,$t4,16
@@ -673,8 +675,8 @@
 
 	fmadd	$T1a,$N0,$nc,$T1a
 	fmadd	$T1b,$N0,$nd,$T1b
-	 lwz	$t7,`$FRAME+40`($sp)	; permuted $t3
-	 lwz	$t6,`$FRAME+44`($sp)	; permuted $t2
+	 lwz	$t7,`$FRAME+40^$LITTLE_ENDIAN`($sp)	; permuted $t3
+	 lwz	$t6,`$FRAME+44^$LITTLE_ENDIAN`($sp)	; permuted $t2
 	 addc	$t2,$t2,$carry
 	 adde	$t3,$t3,$c1
 	 srwi	$carry,$t2,16
@@ -686,8 +688,8 @@
 	 insrwi	$carry,$t3,16,0
 	fmadd	$T3a,$N2,$nc,$T3a
 	fmadd	$T3b,$N2,$nd,$T3b
-	 lwz	$t1,`$FRAME+48`($sp)	; permuted $t5
-	 lwz	$t0,`$FRAME+52`($sp)	; permuted $t4
+	 lwz	$t1,`$FRAME+48^$LITTLE_ENDIAN`($sp)	; permuted $t5
+	 lwz	$t0,`$FRAME+52^$LITTLE_ENDIAN`($sp)	; permuted $t4
 	 addc	$t6,$t6,$carry
 	 adde	$t7,$t7,$c1
 	 srwi	$carry,$t6,16
@@ -699,8 +701,8 @@
 
 	fctid	$T0a,$T0a
 	fctid	$T0b,$T0b
-	 lwz	$t5,`$FRAME+56`($sp)	; permuted $t7
-	 lwz	$t4,`$FRAME+60`($sp)	; permuted $t6
+	 lwz	$t5,`$FRAME+56^$LITTLE_ENDIAN`($sp)	; permuted $t7
+	 lwz	$t4,`$FRAME+60^$LITTLE_ENDIAN`($sp)	; permuted $t6
 	 addc	$t0,$t0,$carry
 	 adde	$t1,$t1,$c1
 	 srwi	$carry,$t0,16
@@ -787,14 +789,14 @@
 ___
 } else {
 $code.=<<___;
-	lwz	$t1,`$FRAME+0`($sp)
-	lwz	$t0,`$FRAME+4`($sp)
-	lwz	$t3,`$FRAME+8`($sp)
-	lwz	$t2,`$FRAME+12`($sp)
-	lwz	$t5,`$FRAME+16`($sp)
-	lwz	$t4,`$FRAME+20`($sp)
-	lwz	$t7,`$FRAME+24`($sp)
-	lwz	$t6,`$FRAME+28`($sp)
+	lwz	$t1,`$FRAME+0^$LITTLE_ENDIAN`($sp)
+	lwz	$t0,`$FRAME+4^$LITTLE_ENDIAN`($sp)
+	lwz	$t3,`$FRAME+8^$LITTLE_ENDIAN`($sp)
+	lwz	$t2,`$FRAME+12^$LITTLE_ENDIAN`($sp)
+	lwz	$t5,`$FRAME+16^$LITTLE_ENDIAN`($sp)
+	lwz	$t4,`$FRAME+20^$LITTLE_ENDIAN`($sp)
+	lwz	$t7,`$FRAME+24^$LITTLE_ENDIAN`($sp)
+	lwz	$t6,`$FRAME+28^$LITTLE_ENDIAN`($sp)
 	stfd	$dota,`$FRAME+64`($sp)
 	stfd	$dotb,`$FRAME+72`($sp)
 
@@ -823,14 +825,14 @@
 	 stw	$t0,12($tp)		; tp[j-1]
 	 stw	$t4,8($tp)
 
-	lwz	$t3,`$FRAME+32`($sp)	; permuted $t1
-	lwz	$t2,`$FRAME+36`($sp)	; permuted $t0
-	lwz	$t7,`$FRAME+40`($sp)	; permuted $t3
-	lwz	$t6,`$FRAME+44`($sp)	; permuted $t2
-	lwz	$t1,`$FRAME+48`($sp)	; permuted $t5
-	lwz	$t0,`$FRAME+52`($sp)	; permuted $t4
-	lwz	$t5,`$FRAME+56`($sp)	; permuted $t7
-	lwz	$t4,`$FRAME+60`($sp)	; permuted $t6
+	lwz	$t3,`$FRAME+32^$LITTLE_ENDIAN`($sp)	; permuted $t1
+	lwz	$t2,`$FRAME+36^$LITTLE_ENDIAN`($sp)	; permuted $t0
+	lwz	$t7,`$FRAME+40^$LITTLE_ENDIAN`($sp)	; permuted $t3
+	lwz	$t6,`$FRAME+44^$LITTLE_ENDIAN`($sp)	; permuted $t2
+	lwz	$t1,`$FRAME+48^$LITTLE_ENDIAN`($sp)	; permuted $t5
+	lwz	$t0,`$FRAME+52^$LITTLE_ENDIAN`($sp)	; permuted $t4
+	lwz	$t5,`$FRAME+56^$LITTLE_ENDIAN`($sp)	; permuted $t7
+	lwz	$t4,`$FRAME+60^$LITTLE_ENDIAN`($sp)	; permuted $t6
 
 	addc	$t2,$t2,$carry
 	adde	$t3,$t3,$c1
@@ -857,10 +859,10 @@
 	 stw	$t2,20($tp)		; tp[j]
 	 stwu	$t0,16($tp)
 
-	lwz	$t7,`$FRAME+64`($sp)
-	lwz	$t6,`$FRAME+68`($sp)
-	lwz	$t5,`$FRAME+72`($sp)
-	lwz	$t4,`$FRAME+76`($sp)
+	lwz	$t7,`$FRAME+64^$LITTLE_ENDIAN`($sp)
+	lwz	$t6,`$FRAME+68^$LITTLE_ENDIAN`($sp)
+	lwz	$t5,`$FRAME+72^$LITTLE_ENDIAN`($sp)
+	lwz	$t4,`$FRAME+76^$LITTLE_ENDIAN`($sp)
 
 	addc	$t6,$t6,$carry
 	adde	$t7,$t7,$c1
@@ -1165,23 +1167,23 @@
 $code.=<<___;
 	fmadd	$T1a,$N1,$na,$T1a
 	fmadd	$T1b,$N1,$nb,$T1b
-	 lwz	$t1,`$FRAME+0`($sp)
-	 lwz	$t0,`$FRAME+4`($sp)
+	 lwz	$t1,`$FRAME+0^$LITTLE_ENDIAN`($sp)
+	 lwz	$t0,`$FRAME+4^$LITTLE_ENDIAN`($sp)
 	fmadd	$T2a,$N2,$na,$T2a
 	fmadd	$T2b,$N2,$nb,$T2b
-	 lwz	$t3,`$FRAME+8`($sp)
-	 lwz	$t2,`$FRAME+12`($sp)
+	 lwz	$t3,`$FRAME+8^$LITTLE_ENDIAN`($sp)
+	 lwz	$t2,`$FRAME+12^$LITTLE_ENDIAN`($sp)
 	fmadd	$T3a,$N3,$na,$T3a
 	fmadd	$T3b,$N3,$nb,$T3b
-	 lwz	$t5,`$FRAME+16`($sp)
-	 lwz	$t4,`$FRAME+20`($sp)
+	 lwz	$t5,`$FRAME+16^$LITTLE_ENDIAN`($sp)
+	 lwz	$t4,`$FRAME+20^$LITTLE_ENDIAN`($sp)
 	 addc	$t0,$t0,$carry
 	 adde	$t1,$t1,$c1
 	 srwi	$carry,$t0,16
 	fmadd	$T0a,$N0,$na,$T0a
 	fmadd	$T0b,$N0,$nb,$T0b
-	 lwz	$t7,`$FRAME+24`($sp)
-	 lwz	$t6,`$FRAME+28`($sp)
+	 lwz	$t7,`$FRAME+24^$LITTLE_ENDIAN`($sp)
+	 lwz	$t6,`$FRAME+28^$LITTLE_ENDIAN`($sp)
 	 srwi	$c1,$t1,16
 	 insrwi	$carry,$t1,16,0
 
@@ -1218,8 +1220,8 @@
 	fctid	$T1a,$T1a
 	 addc	$t0,$t0,$t2
 	 adde	$t4,$t4,$t3
-	 lwz	$t3,`$FRAME+32`($sp)	; permuted $t1
-	 lwz	$t2,`$FRAME+36`($sp)	; permuted $t0
+	 lwz	$t3,`$FRAME+32^$LITTLE_ENDIAN`($sp)	; permuted $t1
+	 lwz	$t2,`$FRAME+36^$LITTLE_ENDIAN`($sp)	; permuted $t0
 	fctid	$T1b,$T1b
 	 addze	$carry,$carry
 	 addze	$c1,$c1
@@ -1229,19 +1231,19 @@
 	 addc	$t2,$t2,$carry
 	 adde	$t3,$t3,$c1
 	 srwi	$carry,$t2,16
-	 lwz	$t7,`$FRAME+40`($sp)	; permuted $t3
-	 lwz	$t6,`$FRAME+44`($sp)	; permuted $t2
+	 lwz	$t7,`$FRAME+40^$LITTLE_ENDIAN`($sp)	; permuted $t3
+	 lwz	$t6,`$FRAME+44^$LITTLE_ENDIAN`($sp)	; permuted $t2
 	fctid	$T2b,$T2b
 	 srwi	$c1,$t3,16
 	 insrwi	$carry,$t3,16,0
-	 lwz	$t1,`$FRAME+48`($sp)	; permuted $t5
-	 lwz	$t0,`$FRAME+52`($sp)	; permuted $t4
+	 lwz	$t1,`$FRAME+48^$LITTLE_ENDIAN`($sp)	; permuted $t5
+	 lwz	$t0,`$FRAME+52^$LITTLE_ENDIAN`($sp)	; permuted $t4
 	fctid	$T3a,$T3a
 	 addc	$t6,$t6,$carry
 	 adde	$t7,$t7,$c1
 	 srwi	$carry,$t6,16
-	 lwz	$t5,`$FRAME+56`($sp)	; permuted $t7
-	 lwz	$t4,`$FRAME+60`($sp)	; permuted $t6
+	 lwz	$t5,`$FRAME+56^$LITTLE_ENDIAN`($sp)	; permuted $t7
+	 lwz	$t4,`$FRAME+60^$LITTLE_ENDIAN`($sp)	; permuted $t6
 	fctid	$T3b,$T3b
 
 	 insrwi	$t2,$t6,16,0		; 64..95 bits
@@ -1354,14 +1356,14 @@
 ___
 } else {
 $code.=<<___;
-	lwz	$t1,`$FRAME+0`($sp)
-	lwz	$t0,`$FRAME+4`($sp)
-	lwz	$t3,`$FRAME+8`($sp)
-	lwz	$t2,`$FRAME+12`($sp)
-	lwz	$t5,`$FRAME+16`($sp)
-	lwz	$t4,`$FRAME+20`($sp)
-	lwz	$t7,`$FRAME+24`($sp)
-	lwz	$t6,`$FRAME+28`($sp)
+	lwz	$t1,`$FRAME+0^$LITTLE_ENDIAN`($sp)
+	lwz	$t0,`$FRAME+4^$LITTLE_ENDIAN`($sp)
+	lwz	$t3,`$FRAME+8^$LITTLE_ENDIAN`($sp)
+	lwz	$t2,`$FRAME+12^$LITTLE_ENDIAN`($sp)
+	lwz	$t5,`$FRAME+16^$LITTLE_ENDIAN`($sp)
+	lwz	$t4,`$FRAME+20^$LITTLE_ENDIAN`($sp)
+	lwz	$t7,`$FRAME+24^$LITTLE_ENDIAN`($sp)
+	lwz	$t6,`$FRAME+28^$LITTLE_ENDIAN`($sp)
 	stfd	$dota,`$FRAME+64`($sp)
 	stfd	$dotb,`$FRAME+72`($sp)
 
@@ -1397,14 +1399,14 @@
 	 stw	$t0,4($tp)		; tp[j-1]
 	 stw	$t4,0($tp)
 
-	lwz	$t3,`$FRAME+32`($sp)	; permuted $t1
-	lwz	$t2,`$FRAME+36`($sp)	; permuted $t0
-	lwz	$t7,`$FRAME+40`($sp)	; permuted $t3
-	lwz	$t6,`$FRAME+44`($sp)	; permuted $t2
-	lwz	$t1,`$FRAME+48`($sp)	; permuted $t5
-	lwz	$t0,`$FRAME+52`($sp)	; permuted $t4
-	lwz	$t5,`$FRAME+56`($sp)	; permuted $t7
-	lwz	$t4,`$FRAME+60`($sp)	; permuted $t6
+	lwz	$t3,`$FRAME+32^$LITTLE_ENDIAN`($sp)	; permuted $t1
+	lwz	$t2,`$FRAME+36^$LITTLE_ENDIAN`($sp)	; permuted $t0
+	lwz	$t7,`$FRAME+40^$LITTLE_ENDIAN`($sp)	; permuted $t3
+	lwz	$t6,`$FRAME+44^$LITTLE_ENDIAN`($sp)	; permuted $t2
+	lwz	$t1,`$FRAME+48^$LITTLE_ENDIAN`($sp)	; permuted $t5
+	lwz	$t0,`$FRAME+52^$LITTLE_ENDIAN`($sp)	; permuted $t4
+	lwz	$t5,`$FRAME+56^$LITTLE_ENDIAN`($sp)	; permuted $t7
+	lwz	$t4,`$FRAME+60^$LITTLE_ENDIAN`($sp)	; permuted $t6
 
 	addc	$t2,$t2,$carry
 	adde	$t3,$t3,$c1
@@ -1433,12 +1435,12 @@
 
 	addc	$t2,$t2,$t6
 	adde	$t0,$t0,$t7
-	 lwz	$t7,`$FRAME+64`($sp)
-	 lwz	$t6,`$FRAME+68`($sp)
+	 lwz	$t7,`$FRAME+64^$LITTLE_ENDIAN`($sp)
+	 lwz	$t6,`$FRAME+68^$LITTLE_ENDIAN`($sp)
 	addze	$carry,$carry
 	addze	$c1,$c1
-	 lwz	$t5,`$FRAME+72`($sp)
-	 lwz	$t4,`$FRAME+76`($sp)
+	 lwz	$t5,`$FRAME+72^$LITTLE_ENDIAN`($sp)
+	 lwz	$t4,`$FRAME+76^$LITTLE_ENDIAN`($sp)
 
 	addc	$t6,$t6,$carry
 	adde	$t7,$t7,$c1
diff --git a/deps/openssl/openssl/crypto/bn/asm/rsaz-x86_64.pl b/deps/openssl/openssl/crypto/bn/asm/rsaz-x86_64.pl
index 3bd45dbac01d5b..12b571c282dc52 100755
--- a/deps/openssl/openssl/crypto/bn/asm/rsaz-x86_64.pl
+++ b/deps/openssl/openssl/crypto/bn/asm/rsaz-x86_64.pl
@@ -113,7 +113,7 @@
 	$addx = ($1>=12);
 }
 
-if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) {
+if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9])\.([0-9]+)/) {
 	my $ver = $2 + $3/100.0;	# 3.1->3.01, 3.10->3.10
 	$addx = ($ver>=3.03);
 }
diff --git a/deps/openssl/openssl/crypto/bn/asm/s390x-gf2m.pl b/deps/openssl/openssl/crypto/bn/asm/s390x-gf2m.pl
index cd9f13eca29265..9d18d40e778467 100644
--- a/deps/openssl/openssl/crypto/bn/asm/s390x-gf2m.pl
+++ b/deps/openssl/openssl/crypto/bn/asm/s390x-gf2m.pl
@@ -172,19 +172,19 @@
 if ($SIZE_T==8) {
 my @r=map("%r$_",(6..9));
 $code.=<<___;
-	bras	$ra,_mul_1x1			# a1�b1
+	bras	$ra,_mul_1x1			# a1·b1
 	stmg	$lo,$hi,16($rp)
 
 	lg	$a,`$stdframe+128+4*$SIZE_T`($sp)
 	lg	$b,`$stdframe+128+6*$SIZE_T`($sp)
-	bras	$ra,_mul_1x1			# a0�b0
+	bras	$ra,_mul_1x1			# a0·b0
 	stmg	$lo,$hi,0($rp)
 
 	lg	$a,`$stdframe+128+3*$SIZE_T`($sp)
 	lg	$b,`$stdframe+128+5*$SIZE_T`($sp)
 	xg	$a,`$stdframe+128+4*$SIZE_T`($sp)
 	xg	$b,`$stdframe+128+6*$SIZE_T`($sp)
-	bras	$ra,_mul_1x1			# (a0+a1)�(b0+b1)
+	bras	$ra,_mul_1x1			# (a0+a1)·(b0+b1)
 	lmg	@r[0],@r[3],0($rp)
 
 	xgr	$lo,$hi
diff --git a/deps/openssl/openssl/crypto/bn/asm/s390x.S b/deps/openssl/openssl/crypto/bn/asm/s390x.S
index 43fcb79bc0119f..f5eebe413a28c3 100755
--- a/deps/openssl/openssl/crypto/bn/asm/s390x.S
+++ b/deps/openssl/openssl/crypto/bn/asm/s390x.S
@@ -18,71 +18,106 @@
 .align	4
 bn_mul_add_words:
 	lghi	zero,0		// zero = 0
-	la	%r1,0(%r2)	// put rp aside
-	lghi	%r2,0		// i=0;
+	la	%r1,0(%r2)	// put rp aside [to give way to]
+	lghi	%r2,0		// return value
 	ltgfr	%r4,%r4
 	bler	%r14		// if (len<=0) return 0;
 
-	stmg	%r6,%r10,48(%r15)
-	lghi	%r10,3
-	lghi	%r8,0		// carry = 0
-	nr	%r10,%r4	// len%4
+	stmg	%r6,%r13,48(%r15)
+	lghi	%r2,3
+	lghi	%r12,0		// carry = 0
+	slgr	%r1,%r3		// rp-=ap
+	nr	%r2,%r4		// len%4
 	sra	%r4,2		// cnt=len/4
 	jz	.Loop1_madd	// carry is incidentally cleared if branch taken
 	algr	zero,zero	// clear carry
 
-.Loop4_madd:
-	lg	%r7,0(%r2,%r3)	// ap[i]
+	lg	%r7,0(%r3)	// ap[0]
+	lg	%r9,8(%r3)	// ap[1]
 	mlgr	%r6,%r5		// *=w
-	alcgr	%r7,%r8		// +=carry
-	alcgr	%r6,zero
-	alg	%r7,0(%r2,%r1)	// +=rp[i]
-	stg	%r7,0(%r2,%r1)	// rp[i]=
+	brct	%r4,.Loop4_madd
+	j	.Loop4_madd_tail
 
-	lg	%r9,8(%r2,%r3)
+.Loop4_madd:
 	mlgr	%r8,%r5
+	lg	%r11,16(%r3)	// ap[i+2]
+	alcgr	%r7,%r12	// +=carry
+	alcgr	%r6,zero
+	alg	%r7,0(%r3,%r1)	// +=rp[i]
+	stg	%r7,0(%r3,%r1)	// rp[i]=
+
+	mlgr	%r10,%r5
+	lg	%r13,24(%r3)
 	alcgr	%r9,%r6
 	alcgr	%r8,zero
-	alg	%r9,8(%r2,%r1)
-	stg	%r9,8(%r2,%r1)
+	alg	%r9,8(%r3,%r1)
+	stg	%r9,8(%r3,%r1)
+
+	mlgr	%r12,%r5
+	lg	%r7,32(%r3)
+	alcgr	%r11,%r8
+	alcgr	%r10,zero
+	alg	%r11,16(%r3,%r1)
+	stg	%r11,16(%r3,%r1)
 
-	lg	%r7,16(%r2,%r3)
 	mlgr	%r6,%r5
-	alcgr	%r7,%r8
-	alcgr	%r6,zero
-	alg	%r7,16(%r2,%r1)
-	stg	%r7,16(%r2,%r1)
+	lg	%r9,40(%r3)
+	alcgr	%r13,%r10
+	alcgr	%r12,zero
+	alg	%r13,24(%r3,%r1)
+	stg	%r13,24(%r3,%r1)
 
-	lg	%r9,24(%r2,%r3)
+	la	%r3,32(%r3)	// i+=4
+	brct	%r4,.Loop4_madd
+
+.Loop4_madd_tail:
 	mlgr	%r8,%r5
+	lg	%r11,16(%r3)
+	alcgr	%r7,%r12	// +=carry
+	alcgr	%r6,zero
+	alg	%r7,0(%r3,%r1)	// +=rp[i]
+	stg	%r7,0(%r3,%r1)	// rp[i]=
+
+	mlgr	%r10,%r5
+	lg	%r13,24(%r3)
 	alcgr	%r9,%r6
 	alcgr	%r8,zero
-	alg	%r9,24(%r2,%r1)
-	stg	%r9,24(%r2,%r1)
+	alg	%r9,8(%r3,%r1)
+	stg	%r9,8(%r3,%r1)
 
-	la	%r2,32(%r2)	// i+=4
-	brct	%r4,.Loop4_madd
+	mlgr	%r12,%r5
+	alcgr	%r11,%r8
+	alcgr	%r10,zero
+	alg	%r11,16(%r3,%r1)
+	stg	%r11,16(%r3,%r1)
 
-	la	%r10,1(%r10)		// see if len%4 is zero ...
-	brct	%r10,.Loop1_madd	// without touching condition code:-)
+	alcgr	%r13,%r10
+	alcgr	%r12,zero
+	alg	%r13,24(%r3,%r1)
+	stg	%r13,24(%r3,%r1)
+
+	la	%r3,32(%r3)	// i+=4
+
+	la	%r2,1(%r2)	// see if len%4 is zero ...
+	brct	%r2,.Loop1_madd	// without touching condition code:-)
 
 .Lend_madd:
-	alcgr	%r8,zero	// collect carry bit
-	lgr	%r2,%r8
-	lmg	%r6,%r10,48(%r15)
+	lgr	%r2,zero	// return value
+	alcgr	%r2,%r12	// collect even carry bit
+	lmg	%r6,%r13,48(%r15)
 	br	%r14
 
 .Loop1_madd:
-	lg	%r7,0(%r2,%r3)	// ap[i]
+	lg	%r7,0(%r3)	// ap[i]
 	mlgr	%r6,%r5		// *=w
-	alcgr	%r7,%r8		// +=carry
+	alcgr	%r7,%r12	// +=carry
 	alcgr	%r6,zero
-	alg	%r7,0(%r2,%r1)	// +=rp[i]
-	stg	%r7,0(%r2,%r1)	// rp[i]=
+	alg	%r7,0(%r3,%r1)	// +=rp[i]
+	stg	%r7,0(%r3,%r1)	// rp[i]=
 
-	lgr	%r8,%r6
-	la	%r2,8(%r2)	// i++
-	brct	%r10,.Loop1_madd
+	lgr	%r12,%r6
+	la	%r3,8(%r3)	// i++
+	brct	%r2,.Loop1_madd
 
 	j	.Lend_madd
 .size	bn_mul_add_words,.-bn_mul_add_words
diff --git a/deps/openssl/openssl/crypto/bn/asm/x86-gf2m.pl b/deps/openssl/openssl/crypto/bn/asm/x86-gf2m.pl
index 808a1e59691de3..b57953027298f3 100644
--- a/deps/openssl/openssl/crypto/bn/asm/x86-gf2m.pl
+++ b/deps/openssl/openssl/crypto/bn/asm/x86-gf2m.pl
@@ -14,7 +14,7 @@
 # the time being... Except that it has three code paths: pure integer
 # code suitable for any x86 CPU, MMX code suitable for PIII and later
 # and PCLMULQDQ suitable for Westmere and later. Improvement varies
-# from one benchmark and �-arch to another. Below are interval values
+# from one benchmark and µ-arch to another. Below are interval values
 # for 163- and 571-bit ECDH benchmarks relative to compiler-generated
 # code:
 #
@@ -226,22 +226,22 @@
 	&push	("edi");
 	&mov	($a,&wparam(1));
 	&mov	($b,&wparam(3));
-	&call	("_mul_1x1_mmx");	# a1�b1
+	&call	("_mul_1x1_mmx");	# a1·b1
 	&movq	("mm7",$R);
 
 	&mov	($a,&wparam(2));
 	&mov	($b,&wparam(4));
-	&call	("_mul_1x1_mmx");	# a0�b0
+	&call	("_mul_1x1_mmx");	# a0·b0
 	&movq	("mm6",$R);
 
 	&mov	($a,&wparam(1));
 	&mov	($b,&wparam(3));
 	&xor	($a,&wparam(2));
 	&xor	($b,&wparam(4));
-	&call	("_mul_1x1_mmx");	# (a0+a1)�(b0+b1)
+	&call	("_mul_1x1_mmx");	# (a0+a1)·(b0+b1)
 	&pxor	($R,"mm7");
 	&mov	($a,&wparam(0));
-	&pxor	($R,"mm6");		# (a0+a1)�(b0+b1)-a1�b1-a0�b0
+	&pxor	($R,"mm6");		# (a0+a1)·(b0+b1)-a1·b1-a0·b0
 
 	&movq	($A,$R);
 	&psllq	($R,32);
@@ -266,13 +266,13 @@
 
 	&mov	($a,&wparam(1));
 	&mov	($b,&wparam(3));
-	&call	("_mul_1x1_ialu");	# a1�b1
+	&call	("_mul_1x1_ialu");	# a1·b1
 	&mov	(&DWP(8,"esp"),$lo);
 	&mov	(&DWP(12,"esp"),$hi);
 
 	&mov	($a,&wparam(2));
 	&mov	($b,&wparam(4));
-	&call	("_mul_1x1_ialu");	# a0�b0
+	&call	("_mul_1x1_ialu");	# a0·b0
 	&mov	(&DWP(0,"esp"),$lo);
 	&mov	(&DWP(4,"esp"),$hi);
 
@@ -280,7 +280,7 @@
 	&mov	($b,&wparam(3));
 	&xor	($a,&wparam(2));
 	&xor	($b,&wparam(4));
-	&call	("_mul_1x1_ialu");	# (a0+a1)�(b0+b1)
+	&call	("_mul_1x1_ialu");	# (a0+a1)·(b0+b1)
 
 	&mov	("ebp",&wparam(0));
 		 @r=("ebx","ecx","edi","esi");
diff --git a/deps/openssl/openssl/crypto/bn/asm/x86_64-gcc.c b/deps/openssl/openssl/crypto/bn/asm/x86_64-gcc.c
index d5488866e0cfd4..d77dc433d40555 100644
--- a/deps/openssl/openssl/crypto/bn/asm/x86_64-gcc.c
+++ b/deps/openssl/openssl/crypto/bn/asm/x86_64-gcc.c
@@ -65,7 +65,7 @@
 # undef mul_add
 
 /*-
- * "m"(a), "+m"(r)      is the way to favor DirectPath �-code;
+ * "m"(a), "+m"(r)      is the way to favor DirectPath µ-code;
  * "g"(0)               let the compiler to decide where does it
  *                      want to keep the value of zero;
  */
diff --git a/deps/openssl/openssl/crypto/bn/asm/x86_64-gf2m.pl b/deps/openssl/openssl/crypto/bn/asm/x86_64-gf2m.pl
index 226c66c35e3557..42bbec2fb7ef72 100644
--- a/deps/openssl/openssl/crypto/bn/asm/x86_64-gf2m.pl
+++ b/deps/openssl/openssl/crypto/bn/asm/x86_64-gf2m.pl
@@ -13,7 +13,7 @@
 # in bn_gf2m.c. It's kind of low-hanging mechanical port from C for
 # the time being... Except that it has two code paths: code suitable
 # for any x86_64 CPU and PCLMULQDQ one suitable for Westmere and
-# later. Improvement varies from one benchmark and �-arch to another.
+# later. Improvement varies from one benchmark and µ-arch to another.
 # Vanilla code path is at most 20% faster than compiler-generated code
 # [not very impressive], while PCLMULQDQ - whole 85%-160% better on
 # 163- and 571-bit ECDH benchmarks on Intel CPUs. Keep in mind that
@@ -184,13 +184,13 @@
 $code.=<<___;
 	movdqa		%xmm0,%xmm4
 	movdqa		%xmm1,%xmm5
-	pclmulqdq	\$0,%xmm1,%xmm0	# a1�b1
+	pclmulqdq	\$0,%xmm1,%xmm0	# a1·b1
 	pxor		%xmm2,%xmm4
 	pxor		%xmm3,%xmm5
-	pclmulqdq	\$0,%xmm3,%xmm2	# a0�b0
-	pclmulqdq	\$0,%xmm5,%xmm4	# (a0+a1)�(b0+b1)
+	pclmulqdq	\$0,%xmm3,%xmm2	# a0·b0
+	pclmulqdq	\$0,%xmm5,%xmm4	# (a0+a1)·(b0+b1)
 	xorps		%xmm0,%xmm4
-	xorps		%xmm2,%xmm4	# (a0+a1)�(b0+b1)-a0�b0-a1�b1
+	xorps		%xmm2,%xmm4	# (a0+a1)·(b0+b1)-a0·b0-a1·b1
 	movdqa		%xmm4,%xmm5
 	pslldq		\$8,%xmm4
 	psrldq		\$8,%xmm5
@@ -225,13 +225,13 @@
 	mov	\$0xf,$mask
 	mov	$a1,$a
 	mov	$b1,$b
-	call	_mul_1x1		# a1�b1
+	call	_mul_1x1		# a1·b1
 	mov	$lo,16(%rsp)
 	mov	$hi,24(%rsp)
 
 	mov	48(%rsp),$a
 	mov	64(%rsp),$b
-	call	_mul_1x1		# a0�b0
+	call	_mul_1x1		# a0·b0
 	mov	$lo,0(%rsp)
 	mov	$hi,8(%rsp)
 
@@ -239,7 +239,7 @@
 	mov	56(%rsp),$b
 	xor	48(%rsp),$a
 	xor	64(%rsp),$b
-	call	_mul_1x1		# (a0+a1)�(b0+b1)
+	call	_mul_1x1		# (a0+a1)·(b0+b1)
 ___
 	@r=("%rbx","%rcx","%rdi","%rsi");
 $code.=<<___;
diff --git a/deps/openssl/openssl/crypto/bn/asm/x86_64-mont.pl b/deps/openssl/openssl/crypto/bn/asm/x86_64-mont.pl
index 2989b58f256eaa..725833d022e261 100755
--- a/deps/openssl/openssl/crypto/bn/asm/x86_64-mont.pl
+++ b/deps/openssl/openssl/crypto/bn/asm/x86_64-mont.pl
@@ -68,6 +68,11 @@
 	$addx = ($1>=12);
 }
 
+if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9])\.([0-9]+)/) {
+	my $ver = $2 + $3/100.0;	# 3.1->3.01, 3.10->3.10
+	$addx = ($ver>=3.03);
+}
+
 # int bn_mul_mont(
 $rp="%rdi";	# BN_ULONG *rp,
 $ap="%rsi";	# const BN_ULONG *ap,
diff --git a/deps/openssl/openssl/crypto/bn/asm/x86_64-mont5.pl b/deps/openssl/openssl/crypto/bn/asm/x86_64-mont5.pl
index 820de3d6f6270b..64e668f140c24e 100755
--- a/deps/openssl/openssl/crypto/bn/asm/x86_64-mont5.pl
+++ b/deps/openssl/openssl/crypto/bn/asm/x86_64-mont5.pl
@@ -53,6 +53,11 @@
 	$addx = ($1>=12);
 }
 
+if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9])\.([0-9]+)/) {
+	my $ver = $2 + $3/100.0;	# 3.1->3.01, 3.10->3.10
+	$addx = ($ver>=3.03);
+}
+
 # int bn_mul_mont_gather5(
 $rp="%rdi";	# BN_ULONG *rp,
 $ap="%rsi";	# const BN_ULONG *ap,
@@ -1779,6 +1784,15 @@
 .align	32
 .L8x_tail_done:
 	add	(%rdx),%r8		# can this overflow?
+	adc	\$0,%r9
+	adc	\$0,%r10
+	adc	\$0,%r11
+	adc	\$0,%r12
+	adc	\$0,%r13
+	adc	\$0,%r14
+	adc	\$0,%r15		# can't overflow, because we
+					# started with "overhung" part
+					# of multiplication
 	xor	%rax,%rax
 
 	neg	$carry
@@ -3125,6 +3139,15 @@
 .align	32
 .Lsqrx8x_tail_done:
 	add	24+8(%rsp),%r8		# can this overflow?
+	adc	\$0,%r9
+	adc	\$0,%r10
+	adc	\$0,%r11
+	adc	\$0,%r12
+	adc	\$0,%r13
+	adc	\$0,%r14
+	adc	\$0,%r15		# can't overflow, because we
+					# started with "overhung" part
+					# of multiplication
 	mov	$carry,%rax		# xor	%rax,%rax
 
 	sub	16+8(%rsp),$carry	# mov 16(%rsp),%cf
@@ -3168,13 +3191,11 @@
 my @ri=map("%r$_",(10..13));
 my @ni=map("%r$_",(14..15));
 $code.=<<___;
-	xor	%rbx,%rbx
+	xor	%ebx,%ebx
 	sub	%r15,%rsi		# compare top-most words
 	adc	%rbx,%rbx
 	mov	%rcx,%r10		# -$num
-	.byte	0x67
 	or	%rbx,%rax
-	.byte	0x67
 	mov	%rcx,%r9		# -$num
 	xor	\$1,%rax
 	sar	\$3+2,%rcx		# cf=0
diff --git a/deps/openssl/openssl/crypto/bn/bn_exp.c b/deps/openssl/openssl/crypto/bn/bn_exp.c
index 24afdd60a227a9..50cf3231b07b71 100644
--- a/deps/openssl/openssl/crypto/bn/bn_exp.c
+++ b/deps/openssl/openssl/crypto/bn/bn_exp.c
@@ -662,12 +662,13 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
     bn_check_top(p);
     bn_check_top(m);
 
-    top = m->top;
-
-    if (!(m->d[0] & 1)) {
+    if (!BN_is_odd(m)) {
         BNerr(BN_F_BN_MOD_EXP_MONT_CONSTTIME, BN_R_CALLED_WITH_EVEN_MODULUS);
         return (0);
     }
+
+    top = m->top;
+
     bits = BN_num_bits(p);
     if (bits == 0) {
         ret = BN_one(rr);
diff --git a/deps/openssl/openssl/crypto/bn/bn_gcd.c b/deps/openssl/openssl/crypto/bn/bn_gcd.c
index 97c55ab7209815..ce59fe701f9db1 100644
--- a/deps/openssl/openssl/crypto/bn/bn_gcd.c
+++ b/deps/openssl/openssl/crypto/bn/bn_gcd.c
@@ -583,6 +583,7 @@ static BIGNUM *BN_mod_inverse_no_branch(BIGNUM *in,
          * BN_div_no_branch will be called eventually.
          */
         pB = &local_B;
+        local_B.flags = 0;
         BN_with_flags(pB, B, BN_FLG_CONSTTIME);
         if (!BN_nnmod(B, pB, A, ctx))
             goto err;
@@ -610,6 +611,7 @@ static BIGNUM *BN_mod_inverse_no_branch(BIGNUM *in,
          * BN_div_no_branch will be called eventually.
          */
         pA = &local_A;
+        local_A.flags = 0;
         BN_with_flags(pA, A, BN_FLG_CONSTTIME);
 
         /* (D, M) := (A/B, A%B) ... */
diff --git a/deps/openssl/openssl/crypto/bn/bn_gf2m.c b/deps/openssl/openssl/crypto/bn/bn_gf2m.c
index cfa1c7ce14990a..2c61da11093f33 100644
--- a/deps/openssl/openssl/crypto/bn/bn_gf2m.c
+++ b/deps/openssl/openssl/crypto/bn/bn_gf2m.c
@@ -575,7 +575,7 @@ int BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const int p[],
     bn_check_top(a);
     BN_CTX_start(ctx);
     if ((s = BN_CTX_get(ctx)) == NULL)
-        return 0;
+        goto err;
     if (!bn_wexpand(s, 2 * a->top))
         goto err;
 
@@ -699,18 +699,21 @@ int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
         int top = p->top;
         BN_ULONG *udp, *bdp, *vdp, *cdp;
 
-        bn_wexpand(u, top);
+        if (!bn_wexpand(u, top))
+            goto err;
         udp = u->d;
         for (i = u->top; i < top; i++)
             udp[i] = 0;
         u->top = top;
-        bn_wexpand(b, top);
+        if (!bn_wexpand(b, top))
+          goto err;
         bdp = b->d;
         bdp[0] = 1;
         for (i = 1; i < top; i++)
             bdp[i] = 0;
         b->top = top;
-        bn_wexpand(c, top);
+        if (!bn_wexpand(c, top))
+          goto err;
         cdp = c->d;
         for (i = 0; i < top; i++)
             cdp[i] = 0;
diff --git a/deps/openssl/openssl/crypto/bn/bn_mont.c b/deps/openssl/openssl/crypto/bn/bn_mont.c
index aadd5db1d8dbde..be95bd55d02064 100644
--- a/deps/openssl/openssl/crypto/bn/bn_mont.c
+++ b/deps/openssl/openssl/crypto/bn/bn_mont.c
@@ -361,9 +361,9 @@ void BN_MONT_CTX_free(BN_MONT_CTX *mont)
     if (mont == NULL)
         return;
 
-    BN_free(&(mont->RR));
-    BN_free(&(mont->N));
-    BN_free(&(mont->Ni));
+    BN_clear_free(&(mont->RR));
+    BN_clear_free(&(mont->N));
+    BN_clear_free(&(mont->Ni));
     if (mont->flags & BN_FLG_MALLOCED)
         OPENSSL_free(mont);
 }
@@ -373,6 +373,9 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
     int ret = 0;
     BIGNUM *Ri, *R;
 
+    if (BN_is_zero(mod))
+        return 0;
+
     BN_CTX_start(ctx);
     if ((Ri = BN_CTX_get(ctx)) == NULL)
         goto err;
diff --git a/deps/openssl/openssl/crypto/bn/bn_recp.c b/deps/openssl/openssl/crypto/bn/bn_recp.c
index 6826f93b3882f5..7497ac624d94e5 100644
--- a/deps/openssl/openssl/crypto/bn/bn_recp.c
+++ b/deps/openssl/openssl/crypto/bn/bn_recp.c
@@ -152,8 +152,10 @@ int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
 
     if (BN_ucmp(m, &(recp->N)) < 0) {
         BN_zero(d);
-        if (!BN_copy(r, m))
+        if (!BN_copy(r, m)) {
+            BN_CTX_end(ctx);
             return 0;
+        }
         BN_CTX_end(ctx);
         return (1);
     }
diff --git a/deps/openssl/openssl/crypto/bn/bn_x931p.c b/deps/openssl/openssl/crypto/bn/bn_x931p.c
index 6d76b1284e107d..efa48bdf87724a 100644
--- a/deps/openssl/openssl/crypto/bn/bn_x931p.c
+++ b/deps/openssl/openssl/crypto/bn/bn_x931p.c
@@ -213,14 +213,14 @@ int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx)
      * exceeded.
      */
     if (!BN_rand(Xp, nbits, 1, 0))
-        return 0;
+        goto err;
 
     BN_CTX_start(ctx);
     t = BN_CTX_get(ctx);
 
     for (i = 0; i < 1000; i++) {
         if (!BN_rand(Xq, nbits, 1, 0))
-            return 0;
+            goto err;
         /* Check that |Xp - Xq| > 2^(nbits - 100) */
         BN_sub(t, Xp, Xq);
         if (BN_num_bits(t) > (nbits - 100))
@@ -234,6 +234,9 @@ int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx)
 
     return 0;
 
+ err:
+    BN_CTX_end(ctx);
+    return 0;
 }
 
 /*
diff --git a/deps/openssl/openssl/crypto/bn/bntest.c b/deps/openssl/openssl/crypto/bn/bntest.c
index 470d5dabf1ec9b..1e35988022bbcb 100644
--- a/deps/openssl/openssl/crypto/bn/bntest.c
+++ b/deps/openssl/openssl/crypto/bn/bntest.c
@@ -441,6 +441,14 @@ int test_div(BIO *bp, BN_CTX *ctx)
     BN_init(&d);
     BN_init(&e);
 
+    BN_one(&a);
+    BN_zero(&b);
+
+    if (BN_div(&d, &c, &a, &b, ctx)) {
+        fprintf(stderr, "Division by zero succeeded!\n");
+        return 0;
+    }
+
     for (i = 0; i < num0 + num1; i++) {
         if (i < num1) {
             BN_bntest_rand(&a, 400, 0, 0);
@@ -516,9 +524,9 @@ int test_div_word(BIO *bp)
         do {
             BN_bntest_rand(&a, 512, -1, 0);
             BN_bntest_rand(&b, BN_BITS2, -1, 0);
-            s = b.d[0];
-        } while (!s);
+        } while (BN_is_zero(&b));
 
+        s = b.d[0];
         BN_copy(&b, &a);
         r = BN_div_word(&b, s);
 
@@ -781,6 +789,18 @@ int test_mont(BIO *bp, BN_CTX *ctx)
     if (mont == NULL)
         return 0;
 
+    BN_zero(&n);
+    if (BN_MONT_CTX_set(mont, &n, ctx)) {
+        fprintf(stderr, "BN_MONT_CTX_set succeeded for zero modulus!\n");
+        return 0;
+    }
+
+    BN_set_word(&n, 16);
+    if (BN_MONT_CTX_set(mont, &n, ctx)) {
+        fprintf(stderr, "BN_MONT_CTX_set succeeded for even modulus!\n");
+        return 0;
+    }
+
     BN_bntest_rand(&a, 100, 0, 0);
     BN_bntest_rand(&b, 100, 0, 0);
     for (i = 0; i < num2; i++) {
@@ -887,6 +907,14 @@ int test_mod_mul(BIO *bp, BN_CTX *ctx)
     d = BN_new();
     e = BN_new();
 
+    BN_one(a);
+    BN_one(b);
+    BN_zero(c);
+    if (BN_mod_mul(e, a, b, c, ctx)) {
+        fprintf(stderr, "BN_mod_mul with zero modulus succeeded!\n");
+        return 0;
+    }
+
     for (j = 0; j < 3; j++) {
         BN_bntest_rand(c, 1024, 0, 0);
         for (i = 0; i < num0; i++) {
@@ -952,6 +980,14 @@ int test_mod_exp(BIO *bp, BN_CTX *ctx)
     d = BN_new();
     e = BN_new();
 
+    BN_one(a);
+    BN_one(b);
+    BN_zero(c);
+    if (BN_mod_exp(d, a, b, c, ctx)) {
+        fprintf(stderr, "BN_mod_exp with zero modulus succeeded!\n");
+        return 0;
+    }
+
     BN_bntest_rand(c, 30, 0, 1); /* must be odd for montgomery */
     for (i = 0; i < num2; i++) {
         BN_bntest_rand(a, 20 + i * 5, 0, 0);
@@ -980,6 +1016,24 @@ int test_mod_exp(BIO *bp, BN_CTX *ctx)
             return 0;
         }
     }
+
+    /* Regression test for carry propagation bug in sqr8x_reduction */
+    BN_hex2bn(&a, "050505050505");
+    BN_hex2bn(&b, "02");
+    BN_hex2bn(&c,
+        "4141414141414141414141274141414141414141414141414141414141414141"
+        "4141414141414141414141414141414141414141414141414141414141414141"
+        "4141414141414141414141800000000000000000000000000000000000000000"
+        "0000000000000000000000000000000000000000000000000000000000000000"
+        "0000000000000000000000000000000000000000000000000000000000000000"
+        "0000000000000000000000000000000000000000000000000000000001");
+    BN_mod_exp(d, a, b, c, ctx);
+    BN_mul(e, a, a, ctx);
+    if (BN_cmp(d, e)) {
+        fprintf(stderr, "BN_mod_exp and BN_mul produce different results!\n");
+        return 0;
+    }
+
     BN_free(a);
     BN_free(b);
     BN_free(c);
@@ -999,6 +1053,22 @@ int test_mod_exp_mont_consttime(BIO *bp, BN_CTX *ctx)
     d = BN_new();
     e = BN_new();
 
+    BN_one(a);
+    BN_one(b);
+    BN_zero(c);
+    if (BN_mod_exp_mont_consttime(d, a, b, c, ctx, NULL)) {
+        fprintf(stderr, "BN_mod_exp_mont_consttime with zero modulus "
+                "succeeded\n");
+        return 0;
+    }
+
+    BN_set_word(c, 16);
+    if (BN_mod_exp_mont_consttime(d, a, b, c, ctx, NULL)) {
+        fprintf(stderr, "BN_mod_exp_mont_consttime with even modulus "
+                "succeeded\n");
+        return 0;
+    }
+
     BN_bntest_rand(c, 30, 0, 1); /* must be odd for montgomery */
     for (i = 0; i < num2; i++) {
         BN_bntest_rand(a, 20 + i * 5, 0, 0);
diff --git a/deps/openssl/openssl/crypto/bn/rsaz_exp.h b/deps/openssl/openssl/crypto/bn/rsaz_exp.h
index 33361de99572f2..229e181f67b53d 100644
--- a/deps/openssl/openssl/crypto/bn/rsaz_exp.h
+++ b/deps/openssl/openssl/crypto/bn/rsaz_exp.h
@@ -1,32 +1,44 @@
-/******************************************************************************
-* Copyright(c) 2012, Intel Corp.
-* Developers and authors:
-* Shay Gueron (1, 2), and Vlad Krasnov (1)
-* (1) Intel Corporation, Israel Development Center, Haifa, Israel
-* (2) University of Haifa, Israel
+/*****************************************************************************
+*                                                                            *
+*  Copyright (c) 2012, Intel Corporation                                     *
+*                                                                            *
+*  All rights reserved.                                                      *
+*                                                                            *
+*  Redistribution and use in source and binary forms, with or without        *
+*  modification, are permitted provided that the following conditions are    *
+*  met:                                                                      *
+*                                                                            *
+*  *  Redistributions of source code must retain the above copyright         *
+*     notice, this list of conditions and the following disclaimer.          *
+*                                                                            *
+*  *  Redistributions in binary form must reproduce the above copyright      *
+*     notice, this list of conditions and the following disclaimer in the    *
+*     documentation and/or other materials provided with the                 *
+*     distribution.                                                          *
+*                                                                            *
+*  *  Neither the name of the Intel Corporation nor the names of its         *
+*     contributors may be used to endorse or promote products derived from   *
+*     this software without specific prior written permission.               *
+*                                                                            *
+*                                                                            *
+*  THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION ""AS IS"" AND ANY          *
+*  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE         *
+*  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR        *
+*  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION OR            *
+*  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,     *
+*  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,       *
+*  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR        *
+*  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF    *
+*  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING      *
+*  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS        *
+*  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              *
+*                                                                            *
 ******************************************************************************
-* LICENSE:
-* This submission to OpenSSL is to be made available under the OpenSSL
-* license, and only to the OpenSSL project, in order to allow integration
-* into the publicly distributed code.
-* The use of this code, or portions of this code, or concepts embedded in
-* this code, or modification of this code and/or algorithm(s) in it, or the
-* use of this code for any other purpose than stated above, requires special
-* licensing.
-******************************************************************************
-* DISCLAIMER:
-* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS AND THE COPYRIGHT OWNERS
-* ``AS IS''. ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS OR THE COPYRIGHT
-* OWNERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-******************************************************************************/
+* Developers and authors:                                                    *
+* Shay Gueron (1, 2), and Vlad Krasnov (1)                                   *
+* (1) Intel Corporation, Israel Development Center, Haifa, Israel            *
+* (2) University of Haifa, Israel                                            *
+*****************************************************************************/
 
 #ifndef RSAZ_EXP_H
 # define RSAZ_EXP_H
diff --git a/deps/openssl/openssl/crypto/buffer/buf_str.c b/deps/openssl/openssl/crypto/buffer/buf_str.c
index ebc5ab4646cef2..fa0d608e76bbb2 100644
--- a/deps/openssl/openssl/crypto/buffer/buf_str.c
+++ b/deps/openssl/openssl/crypto/buffer/buf_str.c
@@ -58,6 +58,7 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
+#include <limits.h>
 #include <openssl/buffer.h>
 
 size_t BUF_strnlen(const char *str, size_t maxlen)
@@ -72,7 +73,7 @@ size_t BUF_strnlen(const char *str, size_t maxlen)
 char *BUF_strdup(const char *str)
 {
     if (str == NULL)
-        return (NULL);
+        return NULL;
     return BUF_strndup(str, strlen(str));
 }
 
@@ -81,16 +82,22 @@ char *BUF_strndup(const char *str, size_t siz)
     char *ret;
 
     if (str == NULL)
-        return (NULL);
+        return NULL;
 
     siz = BUF_strnlen(str, siz);
 
+    if (siz >= INT_MAX)
+        return NULL;
+
     ret = OPENSSL_malloc(siz + 1);
     if (ret == NULL) {
         BUFerr(BUF_F_BUF_STRNDUP, ERR_R_MALLOC_FAILURE);
-        return (NULL);
+        return NULL;
     }
-    BUF_strlcpy(ret, str, siz + 1);
+
+    memcpy(ret, str, siz);
+    ret[siz] = '\0';
+
     return (ret);
 }
 
@@ -98,13 +105,13 @@ void *BUF_memdup(const void *data, size_t siz)
 {
     void *ret;
 
-    if (data == NULL)
-        return (NULL);
+    if (data == NULL || siz >= INT_MAX)
+        return NULL;
 
     ret = OPENSSL_malloc(siz);
     if (ret == NULL) {
         BUFerr(BUF_F_BUF_MEMDUP, ERR_R_MALLOC_FAILURE);
-        return (NULL);
+        return NULL;
     }
     return memcpy(ret, data, siz);
 }
diff --git a/deps/openssl/openssl/crypto/buffer/buffer.h b/deps/openssl/openssl/crypto/buffer/buffer.h
index c343dd772f1efb..efd240a5f91e25 100644
--- a/deps/openssl/openssl/crypto/buffer/buffer.h
+++ b/deps/openssl/openssl/crypto/buffer/buffer.h
@@ -86,7 +86,13 @@ int BUF_MEM_grow(BUF_MEM *str, size_t len);
 int BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
 size_t BUF_strnlen(const char *str, size_t maxlen);
 char *BUF_strdup(const char *str);
+
+/*
+ * Like strndup, but in addition, explicitly guarantees to never read past the
+ * first |siz| bytes of |str|.
+ */
 char *BUF_strndup(const char *str, size_t siz);
+
 void *BUF_memdup(const void *data, size_t siz);
 void BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz);
 
diff --git a/deps/openssl/openssl/crypto/cms/cms_enc.c b/deps/openssl/openssl/crypto/cms/cms_enc.c
index 85ae928a496ff0..b14b4b68b5c950 100644
--- a/deps/openssl/openssl/crypto/cms/cms_enc.c
+++ b/deps/openssl/openssl/crypto/cms/cms_enc.c
@@ -195,7 +195,7 @@ BIO *cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec)
     ok = 1;
 
  err:
-    if (ec->key && !keep_key) {
+    if (ec->key && (!keep_key || !ok)) {
         OPENSSL_cleanse(ec->key, ec->keylen);
         OPENSSL_free(ec->key);
         ec->key = NULL;
diff --git a/deps/openssl/openssl/crypto/cms/cms_pwri.c b/deps/openssl/openssl/crypto/cms/cms_pwri.c
index a8322dcdf1a62c..b91c01691fec21 100644
--- a/deps/openssl/openssl/crypto/cms/cms_pwri.c
+++ b/deps/openssl/openssl/crypto/cms/cms_pwri.c
@@ -121,6 +121,9 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
 
     /* Setup algorithm identifier for cipher */
     encalg = X509_ALGOR_new();
+    if (encalg == NULL) {
+        goto merr;
+    }
     EVP_CIPHER_CTX_init(&ctx);
 
     if (EVP_EncryptInit_ex(&ctx, kekciph, NULL, NULL, NULL) <= 0) {
diff --git a/deps/openssl/openssl/crypto/cms/cms_sd.c b/deps/openssl/openssl/crypto/cms/cms_sd.c
index 721ffd5afb8535..a41aca8e1277c1 100644
--- a/deps/openssl/openssl/crypto/cms/cms_sd.c
+++ b/deps/openssl/openssl/crypto/cms/cms_sd.c
@@ -857,6 +857,8 @@ int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)
     } else {
         const EVP_MD *md = EVP_MD_CTX_md(&mctx);
         pkctx = EVP_PKEY_CTX_new(si->pkey, NULL);
+        if (pkctx == NULL)
+            goto err;
         if (EVP_PKEY_verify_init(pkctx) <= 0)
             goto err;
         if (EVP_PKEY_CTX_set_signature_md(pkctx, md) <= 0)
diff --git a/deps/openssl/openssl/crypto/cms/cms_smime.c b/deps/openssl/openssl/crypto/cms/cms_smime.c
index 5522a376acb6ec..07e3472e1079a7 100644
--- a/deps/openssl/openssl/crypto/cms/cms_smime.c
+++ b/deps/openssl/openssl/crypto/cms/cms_smime.c
@@ -754,7 +754,7 @@ int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont, unsigned int flags)
     BIO *cmsbio;
     int ret = 0;
     if (!(cmsbio = CMS_dataInit(cms, dcont))) {
-        CMSerr(CMS_F_CMS_FINAL, ERR_R_MALLOC_FAILURE);
+        CMSerr(CMS_F_CMS_FINAL, CMS_R_CMS_LIB);
         return 0;
     }
 
diff --git a/deps/openssl/openssl/crypto/comp/c_zlib.c b/deps/openssl/openssl/crypto/comp/c_zlib.c
index 6731af8b0d7b29..9c32614d3c7027 100644
--- a/deps/openssl/openssl/crypto/comp/c_zlib.c
+++ b/deps/openssl/openssl/crypto/comp/c_zlib.c
@@ -404,8 +404,9 @@ COMP_METHOD *COMP_zlib(void)
 void COMP_zlib_cleanup(void)
 {
 #ifdef ZLIB_SHARED
-    if (zlib_dso)
+    if (zlib_dso != NULL)
         DSO_free(zlib_dso);
+    zlib_dso = NULL;
 #endif
 }
 
diff --git a/deps/openssl/openssl/crypto/conf/conf_def.c b/deps/openssl/openssl/crypto/conf/conf_def.c
index faca9aeb571b9d..68c77cec7d8b46 100644
--- a/deps/openssl/openssl/crypto/conf/conf_def.c
+++ b/deps/openssl/openssl/crypto/conf/conf_def.c
@@ -225,12 +225,11 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
         goto err;
     }
 
-    section = (char *)OPENSSL_malloc(10);
+    section = BUF_strdup("default");
     if (section == NULL) {
         CONFerr(CONF_F_DEF_LOAD_BIO, ERR_R_MALLOC_FAILURE);
         goto err;
     }
-    BUF_strlcpy(section, "default", 10);
 
     if (_CONF_new_data(conf) == 0) {
         CONFerr(CONF_F_DEF_LOAD_BIO, ERR_R_MALLOC_FAILURE);
diff --git a/deps/openssl/openssl/crypto/conf/conf_sap.c b/deps/openssl/openssl/crypto/conf/conf_sap.c
index 544fe9738719c4..c042cf222dc7e4 100644
--- a/deps/openssl/openssl/crypto/conf/conf_sap.c
+++ b/deps/openssl/openssl/crypto/conf/conf_sap.c
@@ -90,6 +90,7 @@ void OPENSSL_config(const char *config_name)
     CONF_modules_load_file(NULL, config_name,
                                CONF_MFLAGS_DEFAULT_SECTION |
                                CONF_MFLAGS_IGNORE_MISSING_FILE);
+    openssl_configured = 1;
 }
 
 void OPENSSL_no_config()
diff --git a/deps/openssl/openssl/crypto/cryptlib.c b/deps/openssl/openssl/crypto/cryptlib.c
index ca0e3ccc0c7aa0..c9f674ba8e6249 100644
--- a/deps/openssl/openssl/crypto/cryptlib.c
+++ b/deps/openssl/openssl/crypto/cryptlib.c
@@ -953,13 +953,29 @@ void OPENSSL_showfatal(const char *fmta, ...)
 # if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333
     /* this -------------v--- guards NT-specific calls */
     if (check_winnt() && OPENSSL_isservice() > 0) {
-        HANDLE h = RegisterEventSource(0, _T("OPENSSL"));
-        const TCHAR *pmsg = buf;
-        ReportEvent(h, EVENTLOG_ERROR_TYPE, 0, 0, 0, 1, 0, &pmsg, 0);
-        DeregisterEventSource(h);
+        HANDLE hEventLog = RegisterEventSource(NULL, _T("OpenSSL"));
+
+        if (hEventLog != NULL) {
+            const TCHAR *pmsg = buf;
+
+            if (!ReportEvent(hEventLog, EVENTLOG_ERROR_TYPE, 0, 0, NULL,
+                             1, 0, &pmsg, NULL)) {
+#if defined(DEBUG)
+                /*
+                 * We are in a situation where we tried to report a critical
+                 * error and this failed for some reason. As a last resort,
+                 * in debug builds, send output to the debugger or any other
+                 * tool like DebugView which can monitor the output.
+                 */
+                OutputDebugString(pmsg);
+#endif
+            }
+
+            (void)DeregisterEventSource(hEventLog);
+        }
     } else
 # endif
-        MessageBox(NULL, buf, _T("OpenSSL: FATAL"), MB_OK | MB_ICONSTOP);
+        MessageBox(NULL, buf, _T("OpenSSL: FATAL"), MB_OK | MB_ICONERROR);
 }
 #else
 void OPENSSL_showfatal(const char *fmta, ...)
diff --git a/deps/openssl/openssl/crypto/des/t/test b/deps/openssl/openssl/crypto/des/t/test
deleted file mode 100644
index 97acd0552e4303..00000000000000
--- a/deps/openssl/openssl/crypto/des/t/test
+++ /dev/null
@@ -1,27 +0,0 @@
-#!./perl
-
-BEGIN { push(@INC, qw(../../../lib ../../lib ../lib lib)); }
-
-use DES;
-
-$key='00000000';
-$ks=DES::set_key($key);
-@a=split(//,$ks);
-foreach (@a) { printf "%02x-",ord($_); }
-print "\n";
-
-
-$key=DES::random_key();
-print "($_)\n";
-@a=split(//,$key);
-foreach (@a) { printf "%02x-",ord($_); }
-print "\n";
-$str="this is and again into the breach";
-($k1,$k2)=DES::string_to_2keys($str);
-@a=split(//,$k1);
-foreach (@a) { printf "%02x-",ord($_); }
-print "\n";
-@a=split(//,$k2);
-foreach (@a) { printf "%02x-",ord($_); }
-print "\n";
-
diff --git a/deps/openssl/openssl/crypto/dh/dh.h b/deps/openssl/openssl/crypto/dh/dh.h
index 0502f1a9cc14dc..b17767328183e0 100644
--- a/deps/openssl/openssl/crypto/dh/dh.h
+++ b/deps/openssl/openssl/crypto/dh/dh.h
@@ -142,7 +142,7 @@ struct dh_st {
     BIGNUM *p;
     BIGNUM *g;
     long length;                /* optional */
-    BIGNUM *pub_key;            /* g^x */
+    BIGNUM *pub_key;            /* g^x % p */
     BIGNUM *priv_key;           /* x */
     int flags;
     BN_MONT_CTX *method_mont_p;
diff --git a/deps/openssl/openssl/crypto/dh/dhtest.c b/deps/openssl/openssl/crypto/dh/dhtest.c
index c9dd76bc75e175..6fe8ff4c0c4966 100644
--- a/deps/openssl/openssl/crypto/dh/dhtest.c
+++ b/deps/openssl/openssl/crypto/dh/dhtest.c
@@ -533,9 +533,9 @@ static int run_rfc5114_tests(void)
          * Work out shared secrets using both sides and compare with expected
          * values.
          */
-        if (!DH_compute_key(Z1, dhB->pub_key, dhA))
+        if (DH_compute_key(Z1, dhB->pub_key, dhA) == -1)
             goto bad_err;
-        if (!DH_compute_key(Z2, dhA->pub_key, dhB))
+        if (DH_compute_key(Z2, dhA->pub_key, dhB) == -1)
             goto bad_err;
 
         if (memcmp(Z1, td->Z, td->Z_len))
diff --git a/deps/openssl/openssl/crypto/dsa/dsa_ameth.c b/deps/openssl/openssl/crypto/dsa/dsa_ameth.c
index 2a5cd71371a761..c40e1777ade1bf 100644
--- a/deps/openssl/openssl/crypto/dsa/dsa_ameth.c
+++ b/deps/openssl/openssl/crypto/dsa/dsa_ameth.c
@@ -318,6 +318,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     dplen = i2d_ASN1_INTEGER(prkey, &dp);
 
     ASN1_STRING_clear_free(prkey);
+    prkey = NULL;
 
     if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_dsa), 0,
                          V_ASN1_SEQUENCE, params, dp, dplen))
diff --git a/deps/openssl/openssl/crypto/dsa/dsa_gen.c b/deps/openssl/openssl/crypto/dsa/dsa_gen.c
index 5a328aaab5b408..15f3bb4f3f3951 100644
--- a/deps/openssl/openssl/crypto/dsa/dsa_gen.c
+++ b/deps/openssl/openssl/crypto/dsa/dsa_gen.c
@@ -114,16 +114,8 @@ int DSA_generate_parameters_ex(DSA *ret, int bits,
     }
 # endif
     else {
-        const EVP_MD *evpmd;
-        size_t qbits = bits >= 2048 ? 256 : 160;
-
-        if (bits >= 2048) {
-            qbits = 256;
-            evpmd = EVP_sha256();
-        } else {
-            qbits = 160;
-            evpmd = EVP_sha1();
-        }
+        const EVP_MD *evpmd = bits >= 2048 ? EVP_sha256() : EVP_sha1();
+        size_t qbits = EVP_MD_size(evpmd) * 8;
 
         return dsa_builtin_paramgen(ret, bits, qbits, evpmd,
                                     seed_in, seed_len, NULL, counter_ret,
@@ -176,13 +168,14 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
     if (seed_in != NULL)
         memcpy(seed, seed_in, seed_len);
 
-    if ((ctx = BN_CTX_new()) == NULL)
+    if ((mont = BN_MONT_CTX_new()) == NULL)
         goto err;
 
-    if ((mont = BN_MONT_CTX_new()) == NULL)
+    if ((ctx = BN_CTX_new()) == NULL)
         goto err;
 
     BN_CTX_start(ctx);
+
     r0 = BN_CTX_get(ctx);
     g = BN_CTX_get(ctx);
     W = BN_CTX_get(ctx);
@@ -203,7 +196,7 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
             if (!BN_GENCB_call(cb, 0, m++))
                 goto err;
 
-            if (!seed_len) {
+            if (!seed_len || !seed_in) {
                 if (RAND_pseudo_bytes(seed, qsize) < 0)
                     goto err;
                 seed_is_random = 1;
diff --git a/deps/openssl/openssl/crypto/ec/Makefile b/deps/openssl/openssl/crypto/ec/Makefile
index 359ef4e40fd4b5..89491454a4412d 100644
--- a/deps/openssl/openssl/crypto/ec/Makefile
+++ b/deps/openssl/openssl/crypto/ec/Makefile
@@ -89,7 +89,7 @@ dclean:
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
-	rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+	rm -f *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
diff --git a/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl b/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl
index 84379fce1cb95e..648c969be6215f 100755
--- a/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl
+++ b/deps/openssl/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl
@@ -81,7 +81,7 @@
 	$addx = ($1>=12);
 }
 
-if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) {
+if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9])\.([0-9]+)/) {
 	my $ver = $2 + $3/100.0;	# 3.1->3.01, 3.10->3.10
 	$avx = ($ver>=3.0) + ($ver>=3.01);
 	$addx = ($ver>=3.03);
diff --git a/deps/openssl/openssl/crypto/ec/ec.h b/deps/openssl/openssl/crypto/ec/ec.h
index 6d3178f609f493..81e6faf6c5c502 100644
--- a/deps/openssl/openssl/crypto/ec/ec.h
+++ b/deps/openssl/openssl/crypto/ec/ec.h
@@ -106,7 +106,7 @@ typedef enum {
         /** the point is encoded as z||x, where the octet z specifies
          *  which solution of the quadratic equation y is  */
     POINT_CONVERSION_COMPRESSED = 2,
-        /** the point is encoded as z||x||y, where z is the octet 0x02  */
+        /** the point is encoded as z||x||y, where z is the octet 0x04  */
     POINT_CONVERSION_UNCOMPRESSED = 4,
         /** the point is encoded as z||x||y, where the octet z specifies
          *  which solution of the quadratic equation y is  */
diff --git a/deps/openssl/openssl/crypto/ec/ec_asn1.c b/deps/openssl/openssl/crypto/ec/ec_asn1.c
index 4ad8494981bfc4..33abf61f44417c 100644
--- a/deps/openssl/openssl/crypto/ec/ec_asn1.c
+++ b/deps/openssl/openssl/crypto/ec/ec_asn1.c
@@ -970,8 +970,9 @@ EC_GROUP *d2i_ECPKParameters(EC_GROUP **a, const unsigned char **in, long len)
 {
     EC_GROUP *group = NULL;
     ECPKPARAMETERS *params = NULL;
+    const unsigned char *p = *in;
 
-    if ((params = d2i_ECPKPARAMETERS(NULL, in, len)) == NULL) {
+    if ((params = d2i_ECPKPARAMETERS(NULL, &p, len)) == NULL) {
         ECerr(EC_F_D2I_ECPKPARAMETERS, EC_R_D2I_ECPKPARAMETERS_FAILURE);
         ECPKPARAMETERS_free(params);
         return NULL;
@@ -989,6 +990,7 @@ EC_GROUP *d2i_ECPKParameters(EC_GROUP **a, const unsigned char **in, long len)
         *a = group;
 
     ECPKPARAMETERS_free(params);
+    *in = p;
     return (group);
 }
 
@@ -1016,8 +1018,9 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
     int ok = 0;
     EC_KEY *ret = NULL;
     EC_PRIVATEKEY *priv_key = NULL;
+    const unsigned char *p = *in;
 
-    if ((priv_key = d2i_EC_PRIVATEKEY(NULL, in, len)) == NULL) {
+    if ((priv_key = d2i_EC_PRIVATEKEY(NULL, &p, len)) == NULL) {
         ECerr(EC_F_D2I_ECPRIVATEKEY, ERR_R_EC_LIB);
         return NULL;
     }
@@ -1096,6 +1099,7 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
 
     if (a)
         *a = ret;
+    *in = p;
     ok = 1;
  err:
     if (!ok) {
diff --git a/deps/openssl/openssl/crypto/ec/ec_key.c b/deps/openssl/openssl/crypto/ec/ec_key.c
index 55ce3fe9beb2fd..c784b6fd30a3c8 100644
--- a/deps/openssl/openssl/crypto/ec/ec_key.c
+++ b/deps/openssl/openssl/crypto/ec/ec_key.c
@@ -366,7 +366,10 @@ int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x,
     BN_CTX *ctx = NULL;
     BIGNUM *tx, *ty;
     EC_POINT *point = NULL;
-    int ok = 0, tmp_nid, is_char_two = 0;
+    int ok = 0;
+#ifndef OPENSSL_NO_EC2M
+    int tmp_nid, is_char_two = 0;
+#endif
 
     if (!key || !key->group || !x || !y) {
         ECerr(EC_F_EC_KEY_SET_PUBLIC_KEY_AFFINE_COORDINATES,
@@ -382,14 +385,15 @@ int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x,
     if (!point)
         goto err;
 
+    tx = BN_CTX_get(ctx);
+    ty = BN_CTX_get(ctx);
+
+#ifndef OPENSSL_NO_EC2M
     tmp_nid = EC_METHOD_get_field_type(EC_GROUP_method_of(key->group));
 
     if (tmp_nid == NID_X9_62_characteristic_two_field)
         is_char_two = 1;
 
-    tx = BN_CTX_get(ctx);
-    ty = BN_CTX_get(ctx);
-#ifndef OPENSSL_NO_EC2M
     if (is_char_two) {
         if (!EC_POINT_set_affine_coordinates_GF2m(key->group, point,
                                                   x, y, ctx))
diff --git a/deps/openssl/openssl/crypto/ecdsa/ecdsa.h b/deps/openssl/openssl/crypto/ecdsa/ecdsa.h
index c4016ac3e19b3f..a6f0930f829ccc 100644
--- a/deps/openssl/openssl/crypto/ecdsa/ecdsa.h
+++ b/deps/openssl/openssl/crypto/ecdsa/ecdsa.h
@@ -233,7 +233,7 @@ void *ECDSA_get_ex_data(EC_KEY *d, int idx);
  *  \return pointer to a ECDSA_METHOD structure or NULL if an error occurred
  */
 
-ECDSA_METHOD *ECDSA_METHOD_new(ECDSA_METHOD *ecdsa_method);
+ECDSA_METHOD *ECDSA_METHOD_new(const ECDSA_METHOD *ecdsa_method);
 
 /** frees a ECDSA_METHOD structure
  *  \param  ecdsa_method  pointer to the ECDSA_METHOD structure
diff --git a/deps/openssl/openssl/crypto/ecdsa/ecs_lib.c b/deps/openssl/openssl/crypto/ecdsa/ecs_lib.c
index 1c02310318500b..8dc1dda462598a 100644
--- a/deps/openssl/openssl/crypto/ecdsa/ecs_lib.c
+++ b/deps/openssl/openssl/crypto/ecdsa/ecs_lib.c
@@ -276,7 +276,7 @@ void *ECDSA_get_ex_data(EC_KEY *d, int idx)
     return (CRYPTO_get_ex_data(&ecdsa->ex_data, idx));
 }
 
-ECDSA_METHOD *ECDSA_METHOD_new(ECDSA_METHOD *ecdsa_meth)
+ECDSA_METHOD *ECDSA_METHOD_new(const ECDSA_METHOD *ecdsa_meth)
 {
     ECDSA_METHOD *ret;
 
diff --git a/deps/openssl/openssl/crypto/engine/eng_cryptodev.c b/deps/openssl/openssl/crypto/engine/eng_cryptodev.c
index 926d95c0d7fc5d..8fb9c3373dd67a 100644
--- a/deps/openssl/openssl/crypto/engine/eng_cryptodev.c
+++ b/deps/openssl/openssl/crypto/engine/eng_cryptodev.c
@@ -1292,15 +1292,18 @@ static DSA_SIG *cryptodev_dsa_do_sign(const unsigned char *dgst, int dlen,
     if (cryptodev_asym(&kop, BN_num_bytes(dsa->q), r,
                        BN_num_bytes(dsa->q), s) == 0) {
         dsaret = DSA_SIG_new();
+        if (dsaret == NULL)
+            goto err;
         dsaret->r = r;
         dsaret->s = s;
+        r = s = NULL;
     } else {
         const DSA_METHOD *meth = DSA_OpenSSL();
-        BN_free(r);
-        BN_free(s);
         dsaret = (meth->dsa_do_sign) (dgst, dlen, dsa);
     }
  err:
+    BN_free(r);
+    BN_free(s);
     kop.crk_param[0].crp_p = NULL;
     zapparams(&kop);
     return (dsaret);
diff --git a/deps/openssl/openssl/crypto/engine/eng_list.c b/deps/openssl/openssl/crypto/engine/eng_list.c
index 3384e318289336..83c95d56f4660f 100644
--- a/deps/openssl/openssl/crypto/engine/eng_list.c
+++ b/deps/openssl/openssl/crypto/engine/eng_list.c
@@ -260,6 +260,7 @@ int ENGINE_add(ENGINE *e)
     }
     if ((e->id == NULL) || (e->name == NULL)) {
         ENGINEerr(ENGINE_F_ENGINE_ADD, ENGINE_R_ID_OR_NAME_MISSING);
+        return 0;
     }
     CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
     if (!engine_list_add(e)) {
diff --git a/deps/openssl/openssl/crypto/evp/e_aes_cbc_hmac_sha256.c b/deps/openssl/openssl/crypto/evp/e_aes_cbc_hmac_sha256.c
index b1c586e6fd96b8..37800213c764eb 100644
--- a/deps/openssl/openssl/crypto/evp/e_aes_cbc_hmac_sha256.c
+++ b/deps/openssl/openssl/crypto/evp/e_aes_cbc_hmac_sha256.c
@@ -498,7 +498,18 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
             iv = AES_BLOCK_SIZE;
 
 #  if defined(STITCHED_CALL)
+        /*
+         * Assembly stitch handles AVX-capable processors, but its
+         * performance is not optimal on AMD Jaguar, ~40% worse, for
+         * unknown reasons. Incidentally processor in question supports
+         * AVX, but not AMD-specific XOP extension, which can be used
+         * to identify it and avoid stitch invocation. So that after we
+         * establish that current CPU supports AVX, we even see if it's
+         * either even XOP-capable Bulldozer-based or GenuineIntel one.
+         */
         if (OPENSSL_ia32cap_P[1] & (1 << (60 - 32)) && /* AVX? */
+            ((OPENSSL_ia32cap_P[1] & (1 << (43 - 32))) /* XOP? */
+             | (OPENSSL_ia32cap_P[0] & (1<<30))) &&    /* "Intel CPU"? */
             plen > (sha_off + iv) &&
             (blocks = (plen - (sha_off + iv)) / SHA256_CBLOCK)) {
             SHA256_Update(&key->md, in + iv, sha_off);
@@ -816,8 +827,6 @@ static int aesni_cbc_hmac_sha256_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
             if (arg != EVP_AEAD_TLS1_AAD_LEN)
                 return -1;
 
-            len = p[arg - 2] << 8 | p[arg - 1];
-
             if (ctx->encrypt) {
                 key->payload_length = len;
                 if ((key->aux.tls_ver =
diff --git a/deps/openssl/openssl/crypto/evp/e_des3.c b/deps/openssl/openssl/crypto/evp/e_des3.c
index 96f272eb8046f6..bf6c1d2d3d39a4 100644
--- a/deps/openssl/openssl/crypto/evp/e_des3.c
+++ b/deps/openssl/openssl/crypto/evp/e_des3.c
@@ -289,7 +289,7 @@ static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 # endif
 # ifdef EVP_CHECK_DES_KEY
     if (DES_set_key_checked(&deskey[0], &dat->ks1)
-        ! !DES_set_key_checked(&deskey[1], &dat->ks2))
+        || DES_set_key_checked(&deskey[1], &dat->ks2))
         return 0;
 # else
     DES_set_key_unchecked(&deskey[0], &dat->ks1);
diff --git a/deps/openssl/openssl/crypto/evp/encode.c b/deps/openssl/openssl/crypto/evp/encode.c
index c361d1f0126994..c6abc4ae8e47b0 100644
--- a/deps/openssl/openssl/crypto/evp/encode.c
+++ b/deps/openssl/openssl/crypto/evp/encode.c
@@ -60,9 +60,9 @@
 #include "cryptlib.h"
 #include <openssl/evp.h>
 
+static unsigned char conv_ascii2bin(unsigned char a);
 #ifndef CHARSET_EBCDIC
 # define conv_bin2ascii(a)       (data_bin2ascii[(a)&0x3f])
-# define conv_ascii2bin(a)       (data_ascii2bin[(a)&0x7f])
 #else
 /*
  * We assume that PEM encoded files are EBCDIC files (i.e., printable text
@@ -71,7 +71,6 @@
  * as the underlying textstring data_bin2ascii[] is already EBCDIC)
  */
 # define conv_bin2ascii(a)       (data_bin2ascii[(a)&0x3f])
-# define conv_ascii2bin(a)       (data_ascii2bin[os_toascii[a]&0x7f])
 #endif
 
 /*-
@@ -103,6 +102,7 @@ abcdefghijklmnopqrstuvwxyz0123456789+/";
 #define B64_WS                  0xE0
 #define B64_ERROR               0xFF
 #define B64_NOT_BASE64(a)       (((a)|0x13) == 0xF3)
+#define B64_BASE64(a)           !B64_NOT_BASE64(a)
 
 static const unsigned char data_ascii2bin[128] = {
     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -123,6 +123,23 @@ static const unsigned char data_ascii2bin[128] = {
     0x31, 0x32, 0x33, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 };
 
+#ifndef CHARSET_EBCDIC
+static unsigned char conv_ascii2bin(unsigned char a)
+{
+    if (a & 0x80)
+        return B64_ERROR;
+    return data_ascii2bin[a];
+}
+#else
+static unsigned char conv_ascii2bin(unsigned char a)
+{
+    a = os_toascii[a];
+    if (a & 0x80)
+        return B64_ERROR;
+    return data_ascii2bin[a];
+}
+#endif
+
 void EVP_EncodeInit(EVP_ENCODE_CTX *ctx)
 {
     ctx->length = 48;
@@ -218,8 +235,9 @@ int EVP_EncodeBlock(unsigned char *t, const unsigned char *f, int dlen)
 
 void EVP_DecodeInit(EVP_ENCODE_CTX *ctx)
 {
-    ctx->length = 30;
+    /* Only ctx->num is used during decoding. */
     ctx->num = 0;
+    ctx->length = 0;
     ctx->line_num = 0;
     ctx->expect_nl = 0;
 }
@@ -228,139 +246,123 @@ void EVP_DecodeInit(EVP_ENCODE_CTX *ctx)
  * -1 for error
  *  0 for last line
  *  1 for full line
+ *
+ * Note: even though EVP_DecodeUpdate attempts to detect and report end of
+ * content, the context doesn't currently remember it and will accept more data
+ * in the next call. Therefore, the caller is responsible for checking and
+ * rejecting a 0 return value in the middle of content.
+ *
+ * Note: even though EVP_DecodeUpdate has historically tried to detect end of
+ * content based on line length, this has never worked properly. Therefore,
+ * we now return 0 when one of the following is true:
+ *   - Padding or B64_EOF was detected and the last block is complete.
+ *   - Input has zero-length.
+ * -1 is returned if:
+ *   - Invalid characters are detected.
+ *   - There is extra trailing padding, or data after padding.
+ *   - B64_EOF is detected after an incomplete base64 block.
  */
 int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
                      const unsigned char *in, int inl)
 {
-    int seof = -1, eof = 0, rv = -1, ret = 0, i, v, tmp, n, ln, exp_nl;
+    int seof = 0, eof = 0, rv = -1, ret = 0, i, v, tmp, n, decoded_len;
     unsigned char *d;
 
     n = ctx->num;
     d = ctx->enc_data;
-    ln = ctx->line_num;
-    exp_nl = ctx->expect_nl;
 
-    /* last line of input. */
-    if ((inl == 0) || ((n == 0) && (conv_ascii2bin(in[0]) == B64_EOF))) {
+    if (n > 0 && d[n - 1] == '=') {
+        eof++;
+        if (n > 1 && d[n - 2] == '=')
+            eof++;
+    }
+
+     /* Legacy behaviour: an empty input chunk signals end of input. */
+    if (inl == 0) {
         rv = 0;
         goto end;
     }
 
-    /* We parse the input data */
     for (i = 0; i < inl; i++) {
-        /* If the current line is > 80 characters, scream a lot */
-        if (ln >= 80) {
-            rv = -1;
-            goto end;
-        }
-
-        /* Get char and put it into the buffer */
         tmp = *(in++);
         v = conv_ascii2bin(tmp);
-        /* only save the good data :-) */
-        if (!B64_NOT_BASE64(v)) {
-            OPENSSL_assert(n < (int)sizeof(ctx->enc_data));
-            d[n++] = tmp;
-            ln++;
-        } else if (v == B64_ERROR) {
+        if (v == B64_ERROR) {
             rv = -1;
             goto end;
         }
 
-        /*
-         * have we seen a '=' which is 'definitly' the last input line.  seof
-         * will point to the character that holds it. and eof will hold how
-         * many characters to chop off.
-         */
         if (tmp == '=') {
-            if (seof == -1)
-                seof = n;
             eof++;
+        } else if (eof > 0 && B64_BASE64(v)) {
+            /* More data after padding. */
+            rv = -1;
+            goto end;
         }
 
-        if (v == B64_CR) {
-            ln = 0;
-            if (exp_nl)
-                continue;
+        if (eof > 2) {
+            rv = -1;
+            goto end;
         }
 
-        /* eoln */
-        if (v == B64_EOLN) {
-            ln = 0;
-            if (exp_nl) {
-                exp_nl = 0;
-                continue;
-            }
-        }
-        exp_nl = 0;
-
-        /*
-         * If we are at the end of input and it looks like a line, process
-         * it.
-         */
-        if (((i + 1) == inl) && (((n & 3) == 0) || eof)) {
-            v = B64_EOF;
-            /*
-             * In case things were given us in really small records (so two
-             * '=' were given in separate updates), eof may contain the
-             * incorrect number of ending bytes to skip, so let's redo the
-             * count
-             */
-            eof = 0;
-            if (d[n - 1] == '=')
-                eof++;
-            if (d[n - 2] == '=')
-                eof++;
-            /* There will never be more than two '=' */
+        if (v == B64_EOF) {
+            seof = 1;
+            goto tail;
         }
 
-        if ((v == B64_EOF && (n & 3) == 0) || (n >= 64)) {
-            /*
-             * This is needed to work correctly on 64 byte input lines.  We
-             * process the line and then need to accept the '\n'
-             */
-            if ((v != B64_EOF) && (n >= 64))
-                exp_nl = 1;
-            if (n > 0) {
-                v = EVP_DecodeBlock(out, d, n);
-                n = 0;
-                if (v < 0) {
-                    rv = 0;
-                    goto end;
-                }
-                if (eof > v) {
-                    rv = -1;
-                    goto end;
-                }
-                ret += (v - eof);
-            } else {
-                eof = 1;
-                v = 0;
+        /* Only save valid base64 characters. */
+        if (B64_BASE64(v)) {
+            if (n >= 64) {
+                /*
+                 * We increment n once per loop, and empty the buffer as soon as
+                 * we reach 64 characters, so this can only happen if someone's
+                 * manually messed with the ctx. Refuse to write any more data.
+                 */
+                rv = -1;
+                goto end;
             }
+            OPENSSL_assert(n < (int)sizeof(ctx->enc_data));
+            d[n++] = tmp;
+        }
 
-            /*
-             * This is the case where we have had a short but valid input
-             * line
-             */
-            if ((v < ctx->length) && eof) {
-                rv = 0;
+        if (n == 64) {
+            decoded_len = EVP_DecodeBlock(out, d, n);
+            n = 0;
+            if (decoded_len < 0 || eof > decoded_len) {
+                rv = -1;
                 goto end;
-            } else
-                ctx->length = v;
+            }
+            ret += decoded_len - eof;
+            out += decoded_len - eof;
+        }
+    }
 
-            if (seof >= 0) {
-                rv = 0;
+    /*
+     * Legacy behaviour: if the current line is a full base64-block (i.e., has
+     * 0 mod 4 base64 characters), it is processed immediately. We keep this
+     * behaviour as applications may not be calling EVP_DecodeFinal properly.
+     */
+tail:
+    if (n > 0) {
+        if ((n & 3) == 0) {
+            decoded_len = EVP_DecodeBlock(out, d, n);
+            n = 0;
+            if (decoded_len < 0 || eof > decoded_len) {
+                rv = -1;
                 goto end;
             }
-            out += v;
+            ret += (decoded_len - eof);
+        } else if (seof) {
+            /* EOF in the middle of a base64 block. */
+            rv = -1;
+            goto end;
         }
     }
-    rv = 1;
- end:
+
+    rv = seof || (n == 0 && eof) ? 0 : 1;
+end:
+    /* Legacy behaviour. This should probably rather be zeroed on error. */
     *outl = ret;
     ctx->num = n;
-    ctx->line_num = ln;
-    ctx->expect_nl = exp_nl;
     return (rv);
 }
 
diff --git a/deps/openssl/openssl/crypto/evp/evp_key.c b/deps/openssl/openssl/crypto/evp/evp_key.c
index 71fa627b20d3ed..5be9e336f9e717 100644
--- a/deps/openssl/openssl/crypto/evp/evp_key.c
+++ b/deps/openssl/openssl/crypto/evp/evp_key.c
@@ -104,6 +104,8 @@ int EVP_read_pw_string_min(char *buf, int min, int len, const char *prompt,
     if ((prompt == NULL) && (prompt_string[0] != '\0'))
         prompt = prompt_string;
     ui = UI_new();
+    if (ui == NULL)
+        return -1;
     UI_add_input_string(ui, prompt, 0, buf, min,
                         (len >= BUFSIZ) ? BUFSIZ - 1 : len);
     if (verify)
@@ -137,7 +139,7 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
     EVP_MD_CTX_init(&c);
     for (;;) {
         if (!EVP_DigestInit_ex(&c, md, NULL))
-            return 0;
+            goto err;
         if (addmd++)
             if (!EVP_DigestUpdate(&c, &(md_buf[0]), mds))
                 goto err;
@@ -188,6 +190,6 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
     rv = type->key_len;
  err:
     EVP_MD_CTX_cleanup(&c);
-    OPENSSL_cleanse(&(md_buf[0]), EVP_MAX_MD_SIZE);
+    OPENSSL_cleanse(md_buf, sizeof(md_buf));
     return rv;
 }
diff --git a/deps/openssl/openssl/crypto/evp/evp_lib.c b/deps/openssl/openssl/crypto/evp/evp_lib.c
index a53a27ca0c92e2..7e0bab90d49aca 100644
--- a/deps/openssl/openssl/crypto/evp/evp_lib.c
+++ b/deps/openssl/openssl/crypto/evp/evp_lib.c
@@ -72,11 +72,22 @@ int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
     if (c->cipher->set_asn1_parameters != NULL)
         ret = c->cipher->set_asn1_parameters(c, type);
     else if (c->cipher->flags & EVP_CIPH_FLAG_DEFAULT_ASN1) {
-        if (EVP_CIPHER_CTX_mode(c) == EVP_CIPH_WRAP_MODE) {
-            ASN1_TYPE_set(type, V_ASN1_NULL, NULL);
+        switch (EVP_CIPHER_CTX_mode(c)) {
+        case EVP_CIPH_WRAP_MODE:
+            if (EVP_CIPHER_CTX_nid(c) == NID_id_smime_alg_CMS3DESwrap)
+                ASN1_TYPE_set(type, V_ASN1_NULL, NULL);
             ret = 1;
-        } else
+            break;
+
+        case EVP_CIPH_GCM_MODE:
+        case EVP_CIPH_CCM_MODE:
+        case EVP_CIPH_XTS_MODE:
+            ret = -1;
+            break;
+
+        default:
             ret = EVP_CIPHER_set_asn1_iv(c, type);
+        }
     } else
         ret = -1;
     return (ret);
@@ -89,9 +100,22 @@ int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
     if (c->cipher->get_asn1_parameters != NULL)
         ret = c->cipher->get_asn1_parameters(c, type);
     else if (c->cipher->flags & EVP_CIPH_FLAG_DEFAULT_ASN1) {
-        if (EVP_CIPHER_CTX_mode(c) == EVP_CIPH_WRAP_MODE)
-            return 1;
-        ret = EVP_CIPHER_get_asn1_iv(c, type);
+        switch (EVP_CIPHER_CTX_mode(c)) {
+
+        case EVP_CIPH_WRAP_MODE:
+            ret = 1;
+            break;
+
+        case EVP_CIPH_GCM_MODE:
+        case EVP_CIPH_CCM_MODE:
+        case EVP_CIPH_XTS_MODE:
+            ret = -1;
+            break;
+
+        default:
+            ret = EVP_CIPHER_get_asn1_iv(c, type);
+            break;
+        }
     } else
         ret = -1;
     return (ret);
diff --git a/deps/openssl/openssl/crypto/evp/evp_pbe.c b/deps/openssl/openssl/crypto/evp/evp_pbe.c
index e3fa95db928988..7934c95fad0c50 100644
--- a/deps/openssl/openssl/crypto/evp/evp_pbe.c
+++ b/deps/openssl/openssl/crypto/evp/evp_pbe.c
@@ -228,12 +228,16 @@ int EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid,
                          int md_nid, EVP_PBE_KEYGEN *keygen)
 {
     EVP_PBE_CTL *pbe_tmp;
-    if (!pbe_algs)
+
+    if (pbe_algs == NULL) {
         pbe_algs = sk_EVP_PBE_CTL_new(pbe_cmp);
-    if (!(pbe_tmp = (EVP_PBE_CTL *)OPENSSL_malloc(sizeof(EVP_PBE_CTL)))) {
-        EVPerr(EVP_F_EVP_PBE_ALG_ADD_TYPE, ERR_R_MALLOC_FAILURE);
-        return 0;
+        if (pbe_algs == NULL)
+            goto err;
     }
+
+    if ((pbe_tmp = OPENSSL_malloc(sizeof(*pbe_tmp))) == NULL)
+        goto err;
+
     pbe_tmp->pbe_type = pbe_type;
     pbe_tmp->pbe_nid = pbe_nid;
     pbe_tmp->cipher_nid = cipher_nid;
@@ -242,6 +246,10 @@ int EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid,
 
     sk_EVP_PBE_CTL_push(pbe_algs, pbe_tmp);
     return 1;
+
+ err:
+    EVPerr(EVP_F_EVP_PBE_ALG_ADD_TYPE, ERR_R_MALLOC_FAILURE);
+    return 0;
 }
 
 int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
diff --git a/deps/openssl/openssl/crypto/evp/p_lib.c b/deps/openssl/openssl/crypto/evp/p_lib.c
index 1171d3086d0b2d..c0171244d5d010 100644
--- a/deps/openssl/openssl/crypto/evp/p_lib.c
+++ b/deps/openssl/openssl/crypto/evp/p_lib.c
@@ -253,7 +253,7 @@ int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len)
 
 int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key)
 {
-    if (!EVP_PKEY_set_type(pkey, type))
+    if (pkey == NULL || !EVP_PKEY_set_type(pkey, type))
         return 0;
     pkey->pkey.ptr = key;
     return (key != NULL);
diff --git a/deps/openssl/openssl/crypto/evp/pmeth_gn.c b/deps/openssl/openssl/crypto/evp/pmeth_gn.c
index 59f81342e94d0b..6435f1b632cfe8 100644
--- a/deps/openssl/openssl/crypto/evp/pmeth_gn.c
+++ b/deps/openssl/openssl/crypto/evp/pmeth_gn.c
@@ -96,12 +96,17 @@ int EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
         return -1;
     }
 
-    if (!ppkey)
+    if (ppkey == NULL)
         return -1;
 
-    if (!*ppkey)
+    if (*ppkey == NULL)
         *ppkey = EVP_PKEY_new();
 
+    if (*ppkey == NULL) {
+        EVPerr(EVP_F_EVP_PKEY_PARAMGEN, ERR_R_MALLOC_FAILURE);
+        return -1;
+    }
+
     ret = ctx->pmeth->paramgen(ctx, *ppkey);
     if (ret <= 0) {
         EVP_PKEY_free(*ppkey);
diff --git a/deps/openssl/openssl/crypto/hmac/hm_ameth.c b/deps/openssl/openssl/crypto/hmac/hm_ameth.c
index 29b2b5dffcf7e4..944c6c857b177f 100644
--- a/deps/openssl/openssl/crypto/hmac/hm_ameth.c
+++ b/deps/openssl/openssl/crypto/hmac/hm_ameth.c
@@ -108,9 +108,14 @@ static int old_hmac_decode(EVP_PKEY *pkey,
     ASN1_OCTET_STRING *os;
     os = ASN1_OCTET_STRING_new();
     if (!os || !ASN1_OCTET_STRING_set(os, *pder, derlen))
-        return 0;
-    EVP_PKEY_assign(pkey, EVP_PKEY_HMAC, os);
+        goto err;
+    if (!EVP_PKEY_assign(pkey, EVP_PKEY_HMAC, os))
+        goto err;
     return 1;
+
+ err:
+    ASN1_OCTET_STRING_free(os);
+    return 0;
 }
 
 static int old_hmac_encode(const EVP_PKEY *pkey, unsigned char **pder)
diff --git a/deps/openssl/openssl/crypto/jpake/jpake.c b/deps/openssl/openssl/crypto/jpake/jpake.c
index 8c38727e20fd31..ebc09755756d31 100644
--- a/deps/openssl/openssl/crypto/jpake/jpake.c
+++ b/deps/openssl/openssl/crypto/jpake/jpake.c
@@ -219,6 +219,9 @@ static int verify_zkp(const JPAKE_STEP_PART *p, const BIGNUM *zkpg,
     BIGNUM *t3 = BN_new();
     int ret = 0;
 
+    if (h == NULL || t1 == NULL || t2 == NULL || t3 == NULL)
+        goto end;
+
     zkp_hash(h, zkpg, p, ctx->p.peer_name);
 
     /* t1 = g^b */
@@ -234,6 +237,7 @@ static int verify_zkp(const JPAKE_STEP_PART *p, const BIGNUM *zkpg,
     else
         JPAKEerr(JPAKE_F_VERIFY_ZKP, JPAKE_R_ZKP_VERIFY_FAILED);
 
+end:
     /* cleanup */
     BN_free(t3);
     BN_free(t2);
diff --git a/deps/openssl/openssl/crypto/mem_clr.c b/deps/openssl/openssl/crypto/mem_clr.c
index 3df1f3928d0688..1a06636d0ce8da 100644
--- a/deps/openssl/openssl/crypto/mem_clr.c
+++ b/deps/openssl/openssl/crypto/mem_clr.c
@@ -66,6 +66,10 @@ void OPENSSL_cleanse(void *ptr, size_t len)
 {
     unsigned char *p = ptr;
     size_t loop = len, ctr = cleanse_ctr;
+
+    if (ptr == NULL)
+        return;
+
     while (loop--) {
         *(p++) = (unsigned char)ctr;
         ctr += (17 + ((size_t)p & 0xF));
diff --git a/deps/openssl/openssl/crypto/modes/asm/aesni-gcm-x86_64.pl b/deps/openssl/openssl/crypto/modes/asm/aesni-gcm-x86_64.pl
index 7e4e04ea25300d..4be25571ea28ca 100644
--- a/deps/openssl/openssl/crypto/modes/asm/aesni-gcm-x86_64.pl
+++ b/deps/openssl/openssl/crypto/modes/asm/aesni-gcm-x86_64.pl
@@ -56,7 +56,7 @@
 	$avx = ($1>=10) + ($1>=11);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 
diff --git a/deps/openssl/openssl/crypto/modes/asm/ghash-armv4.pl b/deps/openssl/openssl/crypto/modes/asm/ghash-armv4.pl
index 77fbf34465db48..8ccc963ef29729 100644
--- a/deps/openssl/openssl/crypto/modes/asm/ghash-armv4.pl
+++ b/deps/openssl/openssl/crypto/modes/asm/ghash-armv4.pl
@@ -45,7 +45,7 @@
 # processes one byte in 8.45 cycles, A9 - in 10.2, Snapdragon S4 -
 # in 9.33.
 #
-# C�mara, D.; Gouv�a, C. P. L.; L�pez, J. & Dahab, R.: Fast Software
+# Câmara, D.; Gouvêa, C. P. L.; López, J. & Dahab, R.: Fast Software
 # Polynomial Multiplication on ARM Processors using the NEON Engine.
 # 
 # http://conradoplg.cryptoland.net/files/2010/12/mocrysen13.pdf
@@ -126,6 +126,11 @@ ()
 .text
 .code	32
 
+#ifdef __clang__
+#define ldrplb	ldrbpl
+#define ldrneb	ldrbne
+#endif
+
 .type	rem_4bit,%object
 .align	5
 rem_4bit:
@@ -432,12 +437,12 @@ sub clmul64x64 {
 	veor		$IN,$Xl			@ inp^=Xi
 .Lgmult_neon:
 ___
-	&clmul64x64	($Xl,$Hlo,"$IN#lo");	# H.lo�Xi.lo
+	&clmul64x64	($Xl,$Hlo,"$IN#lo");	# H.lo·Xi.lo
 $code.=<<___;
 	veor		$IN#lo,$IN#lo,$IN#hi	@ Karatsuba pre-processing
 ___
-	&clmul64x64	($Xm,$Hhl,"$IN#lo");	# (H.lo+H.hi)�(Xi.lo+Xi.hi)
-	&clmul64x64	($Xh,$Hhi,"$IN#hi");	# H.hi�Xi.hi
+	&clmul64x64	($Xm,$Hhl,"$IN#lo");	# (H.lo+H.hi)·(Xi.lo+Xi.hi)
+	&clmul64x64	($Xh,$Hhi,"$IN#hi");	# H.hi·Xi.hi
 $code.=<<___;
 	veor		$Xm,$Xm,$Xl		@ Karatsuba post-processing
 	veor		$Xm,$Xm,$Xh
diff --git a/deps/openssl/openssl/crypto/modes/asm/ghash-sparcv9.pl b/deps/openssl/openssl/crypto/modes/asm/ghash-sparcv9.pl
index 0365e0f1ff429e..5bc28702019a17 100644
--- a/deps/openssl/openssl/crypto/modes/asm/ghash-sparcv9.pl
+++ b/deps/openssl/openssl/crypto/modes/asm/ghash-sparcv9.pl
@@ -379,7 +379,7 @@
 	or	$V,%lo(0xA0406080),$V
 	or	%l0,%lo(0x20C0E000),%l0
 	sllx	$V,32,$V
-	or	%l0,$V,$V		! (0xE0�i)&0xff=0xA040608020C0E000
+	or	%l0,$V,$V		! (0xE0·i)&0xff=0xA040608020C0E000
 	stx	$V,[%i0+16]
 
 	ret
@@ -399,7 +399,7 @@
 
 	mov	0xE1,%l7
 	sllx	%l7,57,$xE1		! 57 is not a typo
-	ldx	[$Htable+16],$V		! (0xE0�i)&0xff=0xA040608020C0E000
+	ldx	[$Htable+16],$V		! (0xE0·i)&0xff=0xA040608020C0E000
 
 	xor	$Hhi,$Hlo,$Hhl		! Karatsuba pre-processing
 	xmulx	$Xlo,$Hlo,$C0
@@ -411,9 +411,9 @@
 	xmulx	$Xhi,$Hhi,$Xhi
 
 	sll	$C0,3,$sqr
-	srlx	$V,$sqr,$sqr		! �0xE0 [implicit &(7<<3)]
+	srlx	$V,$sqr,$sqr		! ·0xE0 [implicit &(7<<3)]
 	xor	$C0,$sqr,$sqr
-	sllx	$sqr,57,$sqr		! ($C0�0xE1)<<1<<56 [implicit &0x7f]
+	sllx	$sqr,57,$sqr		! ($C0·0xE1)<<1<<56 [implicit &0x7f]
 
 	xor	$C0,$C1,$C1		! Karatsuba post-processing
 	xor	$Xlo,$C2,$C2
@@ -423,7 +423,7 @@
 	xor	$Xhi,$C2,$C2
 	xor	$Xhi,$C1,$C1
 
-	xmulxhi	$C0,$xE1,$Xlo		! �0xE1<<1<<56
+	xmulxhi	$C0,$xE1,$Xlo		! ·0xE1<<1<<56
 	 xor	$C0,$C2,$C2
 	xmulx	$C1,$xE1,$C0
 	 xor	$C1,$C3,$C3
@@ -453,7 +453,7 @@
 
 	mov	0xE1,%l7
 	sllx	%l7,57,$xE1		! 57 is not a typo
-	ldx	[$Htable+16],$V		! (0xE0�i)&0xff=0xA040608020C0E000
+	ldx	[$Htable+16],$V		! (0xE0·i)&0xff=0xA040608020C0E000
 
 	and	$inp,7,$shl
 	andn	$inp,7,$inp
@@ -490,9 +490,9 @@
 	xmulx	$Xhi,$Hhi,$Xhi
 
 	sll	$C0,3,$sqr
-	srlx	$V,$sqr,$sqr		! �0xE0 [implicit &(7<<3)]
+	srlx	$V,$sqr,$sqr		! ·0xE0 [implicit &(7<<3)]
 	xor	$C0,$sqr,$sqr
-	sllx	$sqr,57,$sqr		! ($C0�0xE1)<<1<<56 [implicit &0x7f]
+	sllx	$sqr,57,$sqr		! ($C0·0xE1)<<1<<56 [implicit &0x7f]
 
 	xor	$C0,$C1,$C1		! Karatsuba post-processing
 	xor	$Xlo,$C2,$C2
@@ -502,7 +502,7 @@
 	xor	$Xhi,$C2,$C2
 	xor	$Xhi,$C1,$C1
 
-	xmulxhi	$C0,$xE1,$Xlo		! �0xE1<<1<<56
+	xmulxhi	$C0,$xE1,$Xlo		! ·0xE1<<1<<56
 	 xor	$C0,$C2,$C2
 	xmulx	$C1,$xE1,$C0
 	 xor	$C1,$C3,$C3
diff --git a/deps/openssl/openssl/crypto/modes/asm/ghash-x86.pl b/deps/openssl/openssl/crypto/modes/asm/ghash-x86.pl
index 23a5527b30af3b..0269169fa743b5 100644
--- a/deps/openssl/openssl/crypto/modes/asm/ghash-x86.pl
+++ b/deps/openssl/openssl/crypto/modes/asm/ghash-x86.pl
@@ -358,7 +358,7 @@ sub deposit_rem_4bit {
 # effective address calculation and finally merge of value to Z.hi.
 # Reference to rem_4bit is scheduled so late that I had to >>4
 # rem_4bit elements. This resulted in 20-45% procent improvement
-# on contemporary �-archs.
+# on contemporary µ-archs.
 {
     my $cnt;
     my $rem_4bit = "eax";
diff --git a/deps/openssl/openssl/crypto/modes/asm/ghash-x86_64.pl b/deps/openssl/openssl/crypto/modes/asm/ghash-x86_64.pl
index 6e656ca13b8029..0bcb6d4e028be8 100644
--- a/deps/openssl/openssl/crypto/modes/asm/ghash-x86_64.pl
+++ b/deps/openssl/openssl/crypto/modes/asm/ghash-x86_64.pl
@@ -105,7 +105,7 @@
 	$avx = ($1>=10) + ($1>=11);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 
@@ -576,15 +576,15 @@ sub reduction_alg9 {	# 17/11 times faster than Intel version
 	# experimental alternative. special thing about is that there
 	# no dependency between the two multiplications... 
 	mov		\$`0xE1<<1`,%eax
-	mov		\$0xA040608020C0E000,%r10	# ((7..0)�0xE0)&0xff
+	mov		\$0xA040608020C0E000,%r10	# ((7..0)·0xE0)&0xff
 	mov		\$0x07,%r11d
 	movq		%rax,$T1
 	movq		%r10,$T2
 	movq		%r11,$T3		# borrow $T3
 	pand		$Xi,$T3
-	pshufb		$T3,$T2			# ($Xi&7)�0xE0
+	pshufb		$T3,$T2			# ($Xi&7)·0xE0
 	movq		%rax,$T3
-	pclmulqdq	\$0x00,$Xi,$T1		# �(0xE1<<1)
+	pclmulqdq	\$0x00,$Xi,$T1		# ·(0xE1<<1)
 	pxor		$Xi,$T2
 	pslldq		\$15,$T2
 	paddd		$T2,$T2			# <<(64+56+1)
@@ -657,7 +657,7 @@ sub reduction_alg9 {	# 17/11 times faster than Intel version
 	je		.Lskip4x
 
 	sub		\$0x30,$len
-	mov		\$0xA040608020C0E000,%rax	# ((7..0)�0xE0)&0xff
+	mov		\$0xA040608020C0E000,%rax	# ((7..0)·0xE0)&0xff
 	movdqu		0x30($Htbl),$Hkey3
 	movdqu		0x40($Htbl),$Hkey4
 
diff --git a/deps/openssl/openssl/crypto/modes/asm/ghashp8-ppc.pl b/deps/openssl/openssl/crypto/modes/asm/ghashp8-ppc.pl
index e76a58c343c1c7..71457cf4fc59b1 100755
--- a/deps/openssl/openssl/crypto/modes/asm/ghashp8-ppc.pl
+++ b/deps/openssl/openssl/crypto/modes/asm/ghashp8-ppc.pl
@@ -118,9 +118,9 @@
 	 le?vperm	$IN,$IN,$IN,$lemask
 	vxor		$zero,$zero,$zero
 
-	vpmsumd		$Xl,$IN,$Hl		# H.lo�Xi.lo
-	vpmsumd		$Xm,$IN,$H		# H.hi�Xi.lo+H.lo�Xi.hi
-	vpmsumd		$Xh,$IN,$Hh		# H.hi�Xi.hi
+	vpmsumd		$Xl,$IN,$Hl		# H.lo·Xi.lo
+	vpmsumd		$Xm,$IN,$H		# H.hi·Xi.lo+H.lo·Xi.hi
+	vpmsumd		$Xh,$IN,$Hh		# H.hi·Xi.hi
 
 	vpmsumd		$t2,$Xl,$xC2		# 1st phase
 
@@ -178,11 +178,11 @@
 .align	5
 Loop:
 	 subic		$len,$len,16
-	vpmsumd		$Xl,$IN,$Hl		# H.lo�Xi.lo
+	vpmsumd		$Xl,$IN,$Hl		# H.lo·Xi.lo
 	 subfe.		r0,r0,r0		# borrow?-1:0
-	vpmsumd		$Xm,$IN,$H		# H.hi�Xi.lo+H.lo�Xi.hi
+	vpmsumd		$Xm,$IN,$H		# H.hi·Xi.lo+H.lo·Xi.hi
 	 and		r0,r0,$len
-	vpmsumd		$Xh,$IN,$Hh		# H.hi�Xi.hi
+	vpmsumd		$Xh,$IN,$Hh		# H.hi·Xi.hi
 	 add		$inp,$inp,r0
 
 	vpmsumd		$t2,$Xl,$xC2		# 1st phase
diff --git a/deps/openssl/openssl/crypto/modes/asm/ghashv8-armx.pl b/deps/openssl/openssl/crypto/modes/asm/ghashv8-armx.pl
index 0b9cd7359fbaa3..0886d21807029a 100644
--- a/deps/openssl/openssl/crypto/modes/asm/ghashv8-armx.pl
+++ b/deps/openssl/openssl/crypto/modes/asm/ghashv8-armx.pl
@@ -135,10 +135,10 @@
 #endif
 	vext.8		$IN,$t1,$t1,#8
 
-	vpmull.p64	$Xl,$H,$IN		@ H.lo�Xi.lo
+	vpmull.p64	$Xl,$H,$IN		@ H.lo·Xi.lo
 	veor		$t1,$t1,$IN		@ Karatsuba pre-processing
-	vpmull2.p64	$Xh,$H,$IN		@ H.hi�Xi.hi
-	vpmull.p64	$Xm,$Hhl,$t1		@ (H.lo+H.hi)�(Xi.lo+Xi.hi)
+	vpmull2.p64	$Xh,$H,$IN		@ H.hi·Xi.hi
+	vpmull.p64	$Xm,$Hhl,$t1		@ (H.lo+H.hi)·(Xi.lo+Xi.hi)
 
 	vext.8		$t1,$Xl,$Xh,#8		@ Karatsuba post-processing
 	veor		$t2,$Xl,$Xh
@@ -226,7 +226,7 @@
 #endif
 	vext.8		$In,$t1,$t1,#8
 	veor		$IN,$IN,$Xl		@ I[i]^=Xi
-	vpmull.p64	$Xln,$H,$In		@ H�Ii+1
+	vpmull.p64	$Xln,$H,$In		@ H·Ii+1
 	veor		$t1,$t1,$In		@ Karatsuba pre-processing
 	vpmull2.p64	$Xhn,$H,$In
 	b		.Loop_mod2x_v8
@@ -235,14 +235,14 @@
 .Loop_mod2x_v8:
 	vext.8		$t2,$IN,$IN,#8
 	subs		$len,$len,#32		@ is there more data?
-	vpmull.p64	$Xl,$H2,$IN		@ H^2.lo�Xi.lo
+	vpmull.p64	$Xl,$H2,$IN		@ H^2.lo·Xi.lo
 	cclr		$inc,lo			@ is it time to zero $inc?
 
 	 vpmull.p64	$Xmn,$Hhl,$t1
 	veor		$t2,$t2,$IN		@ Karatsuba pre-processing
-	vpmull2.p64	$Xh,$H2,$IN		@ H^2.hi�Xi.hi
+	vpmull2.p64	$Xh,$H2,$IN		@ H^2.hi·Xi.hi
 	veor		$Xl,$Xl,$Xln		@ accumulate
-	vpmull2.p64	$Xm,$Hhl,$t2		@ (H^2.lo+H^2.hi)�(Xi.lo+Xi.hi)
+	vpmull2.p64	$Xm,$Hhl,$t2		@ (H^2.lo+H^2.hi)·(Xi.lo+Xi.hi)
 	 vld1.64	{$t0},[$inp],$inc	@ load [rotated] I[i+2]
 
 	veor		$Xh,$Xh,$Xhn
@@ -267,7 +267,7 @@
 	 vext.8		$In,$t1,$t1,#8
 	 vext.8		$IN,$t0,$t0,#8
 	veor		$Xl,$Xm,$t2
-	 vpmull.p64	$Xln,$H,$In		@ H�Ii+1
+	 vpmull.p64	$Xln,$H,$In		@ H·Ii+1
 	veor		$IN,$IN,$Xh		@ accumulate $IN early
 
 	vext.8		$t2,$Xl,$Xl,#8		@ 2nd phase of reduction
@@ -291,10 +291,10 @@
 	veor		$IN,$IN,$Xl		@ inp^=Xi
 	veor		$t1,$t0,$t2		@ $t1 is rotated inp^Xi
 
-	vpmull.p64	$Xl,$H,$IN		@ H.lo�Xi.lo
+	vpmull.p64	$Xl,$H,$IN		@ H.lo·Xi.lo
 	veor		$t1,$t1,$IN		@ Karatsuba pre-processing
-	vpmull2.p64	$Xh,$H,$IN		@ H.hi�Xi.hi
-	vpmull.p64	$Xm,$Hhl,$t1		@ (H.lo+H.hi)�(Xi.lo+Xi.hi)
+	vpmull2.p64	$Xh,$H,$IN		@ H.hi·Xi.hi
+	vpmull.p64	$Xm,$Hhl,$t1		@ (H.lo+H.hi)·(Xi.lo+Xi.hi)
 
 	vext.8		$t1,$Xl,$Xh,#8		@ Karatsuba post-processing
 	veor		$t2,$Xl,$Xh
diff --git a/deps/openssl/openssl/crypto/modes/wrap128.c b/deps/openssl/openssl/crypto/modes/wrap128.c
index 4dcaf0326fa8da..384978371af2a0 100644
--- a/deps/openssl/openssl/crypto/modes/wrap128.c
+++ b/deps/openssl/openssl/crypto/modes/wrap128.c
@@ -76,7 +76,7 @@ size_t CRYPTO_128_wrap(void *key, const unsigned char *iv,
         return 0;
     A = B;
     t = 1;
-    memcpy(out + 8, in, inlen);
+    memmove(out + 8, in, inlen);
     if (!iv)
         iv = default_iv;
 
@@ -113,7 +113,7 @@ size_t CRYPTO_128_unwrap(void *key, const unsigned char *iv,
     A = B;
     t = 6 * (inlen >> 3);
     memcpy(A, in, 8);
-    memcpy(out, in + 8, inlen);
+    memmove(out, in + 8, inlen);
     for (j = 0; j < 6; j++) {
         R = out + inlen - 8;
         for (i = 0; i < inlen; i += 8, t--, R -= 8) {
diff --git a/deps/openssl/openssl/crypto/ocsp/ocsp_lib.c b/deps/openssl/openssl/crypto/ocsp/ocsp_lib.c
index 442a5b63d4ba2d..cabf53933a4422 100644
--- a/deps/openssl/openssl/crypto/ocsp/ocsp_lib.c
+++ b/deps/openssl/openssl/crypto/ocsp/ocsp_lib.c
@@ -246,12 +246,6 @@ int OCSP_parse_url(const char *url, char **phost, char **pport, char **ppath,
     if ((p = strchr(p, ':'))) {
         *p = 0;
         port = p + 1;
-    } else {
-        /* Not found: set default port */
-        if (*pssl)
-            port = "443";
-        else
-            port = "80";
     }
 
     *pport = BUF_strdup(port);
diff --git a/deps/openssl/openssl/crypto/ocsp/ocsp_prn.c b/deps/openssl/openssl/crypto/ocsp/ocsp_prn.c
index 1834256af271f3..47d5f83ef9b09a 100644
--- a/deps/openssl/openssl/crypto/ocsp/ocsp_prn.c
+++ b/deps/openssl/openssl/crypto/ocsp/ocsp_prn.c
@@ -212,8 +212,7 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE *o, unsigned long flags)
         return 1;
     }
 
-    i = ASN1_STRING_length(rb->response);
-    if (!(br = OCSP_response_get1_basic(o)))
+    if ((br = OCSP_response_get1_basic(o)) == NULL)
         goto err;
     rd = br->tbsResponseData;
     l = ASN1_INTEGER_get(rd->version);
diff --git a/deps/openssl/openssl/crypto/opensslconf.h.in b/deps/openssl/openssl/crypto/opensslconf.h.in
index 814309becb6c6c..7a1c85d6ec9da0 100644
--- a/deps/openssl/openssl/crypto/opensslconf.h.in
+++ b/deps/openssl/openssl/crypto/opensslconf.h.in
@@ -120,7 +120,7 @@
    optimization options.  Older Sparc's work better with only UNROLL, but
    there's no way to tell at compile time what it is you're running on */
  
-#if defined( sun )		/* Newer Sparc's */
+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */
 #  define DES_PTR
 #  define DES_RISC1
 #  define DES_UNROLL
diff --git a/deps/openssl/openssl/crypto/opensslv.h b/deps/openssl/openssl/crypto/opensslv.h
index c06b13ac6b0f92..abcef15b17d943 100644
--- a/deps/openssl/openssl/crypto/opensslv.h
+++ b/deps/openssl/openssl/crypto/opensslv.h
@@ -30,11 +30,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x1000204fL
+# define OPENSSL_VERSION_NUMBER  0x1000205fL
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2d-fips 9 Jul 2015"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2e-fips 3 Dec 2015"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2d 9 Jul 2015"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2e 3 Dec 2015"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
diff --git a/deps/openssl/openssl/crypto/pem/pem_info.c b/deps/openssl/openssl/crypto/pem/pem_info.c
index 68747d162586a8..4d736a1d07e585 100644
--- a/deps/openssl/openssl/crypto/pem/pem_info.c
+++ b/deps/openssl/openssl/crypto/pem/pem_info.c
@@ -172,6 +172,8 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk,
             xi->enc_len = 0;
 
             xi->x_pkey = X509_PKEY_new();
+            if (xi->x_pkey == NULL)
+                goto err;
             ptype = EVP_PKEY_RSA;
             pp = &xi->x_pkey->dec_pkey;
             if ((int)strlen(header) > 10) /* assume encrypted */
@@ -193,6 +195,8 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk,
             xi->enc_len = 0;
 
             xi->x_pkey = X509_PKEY_new();
+            if (xi->x_pkey == NULL)
+                goto err;
             ptype = EVP_PKEY_DSA;
             pp = &xi->x_pkey->dec_pkey;
             if ((int)strlen(header) > 10) /* assume encrypted */
@@ -214,6 +218,8 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk,
             xi->enc_len = 0;
 
             xi->x_pkey = X509_PKEY_new();
+            if (xi->x_pkey == NULL)
+                goto err;
             ptype = EVP_PKEY_EC;
             pp = &xi->x_pkey->dec_pkey;
             if ((int)strlen(header) > 10) /* assume encrypted */
diff --git a/deps/openssl/openssl/crypto/pem/pvkfmt.c b/deps/openssl/openssl/crypto/pem/pvkfmt.c
index ee4b6a8241cc2c..82d45273ed16e8 100644
--- a/deps/openssl/openssl/crypto/pem/pvkfmt.c
+++ b/deps/openssl/openssl/crypto/pem/pvkfmt.c
@@ -624,13 +624,11 @@ static int do_PVK_header(const unsigned char **in, unsigned int length,
             PEMerr(PEM_F_DO_PVK_HEADER, PEM_R_PVK_TOO_SHORT);
             return 0;
         }
-        length -= 20;
     } else {
         if (length < 24) {
             PEMerr(PEM_F_DO_PVK_HEADER, PEM_R_PVK_TOO_SHORT);
             return 0;
         }
-        length -= 24;
         pvk_magic = read_ledword(&p);
         if (pvk_magic != MS_PVKMAGIC) {
             PEMerr(PEM_F_DO_PVK_HEADER, PEM_R_BAD_MAGIC_NUMBER);
@@ -692,23 +690,23 @@ static EVP_PKEY *do_PVK_body(const unsigned char **in,
             inlen = PEM_def_callback(psbuf, PEM_BUFSIZE, 0, u);
         if (inlen <= 0) {
             PEMerr(PEM_F_DO_PVK_BODY, PEM_R_BAD_PASSWORD_READ);
-            return NULL;
+            goto err;
         }
         enctmp = OPENSSL_malloc(keylen + 8);
         if (!enctmp) {
             PEMerr(PEM_F_DO_PVK_BODY, ERR_R_MALLOC_FAILURE);
-            return NULL;
+            goto err;
         }
         if (!derive_pvk_key(keybuf, p, saltlen,
                             (unsigned char *)psbuf, inlen))
-            return NULL;
+            goto err;
         p += saltlen;
         /* Copy BLOBHEADER across, decrypt rest */
         memcpy(enctmp, p, 8);
         p += 8;
         if (keylen < 8) {
             PEMerr(PEM_F_DO_PVK_BODY, PEM_R_PVK_TOO_SHORT);
-            return NULL;
+            goto err;
         }
         inlen = keylen - 8;
         q = enctmp + 8;
diff --git a/deps/openssl/openssl/crypto/perlasm/ppc-xlate.pl b/deps/openssl/openssl/crypto/perlasm/ppc-xlate.pl
index f89e8142993166..0f46cf06bcb859 100755
--- a/deps/openssl/openssl/crypto/perlasm/ppc-xlate.pl
+++ b/deps/openssl/openssl/crypto/perlasm/ppc-xlate.pl
@@ -151,6 +151,26 @@
     "	vor	$vx,$vy,$vy";
 };
 
+# Some ABIs specify vrsave, special-purpose register #256, as reserved
+# for system use.
+my $no_vrsave = ($flavour =~ /aix|linux64le/);
+my $mtspr = sub {
+    my ($f,$idx,$ra) = @_;
+    if ($idx == 256 && $no_vrsave) {
+	"	or	$ra,$ra,$ra";
+    } else {
+	"	mtspr	$idx,$ra";
+    }
+};
+my $mfspr = sub {
+    my ($f,$rd,$idx) = @_;
+    if ($idx == 256 && $no_vrsave) {
+	"	li	$rd,-1";
+    } else {
+	"	mfspr	$rd,$idx";
+    }
+};
+
 # PowerISA 2.06 stuff
 sub vsxmem_op {
     my ($f, $vrt, $ra, $rb, $op) = @_;
diff --git a/deps/openssl/openssl/crypto/pkcs12/p12_add.c b/deps/openssl/openssl/crypto/pkcs12/p12_add.c
index 982805d988de28..d9f03a39fd1532 100644
--- a/deps/openssl/openssl/crypto/pkcs12/p12_add.c
+++ b/deps/openssl/openssl/crypto/pkcs12/p12_add.c
@@ -75,15 +75,19 @@ PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it,
     bag->type = OBJ_nid2obj(nid1);
     if (!ASN1_item_pack(obj, it, &bag->value.octet)) {
         PKCS12err(PKCS12_F_PKCS12_ITEM_PACK_SAFEBAG, ERR_R_MALLOC_FAILURE);
-        return NULL;
+        goto err;
     }
     if (!(safebag = PKCS12_SAFEBAG_new())) {
         PKCS12err(PKCS12_F_PKCS12_ITEM_PACK_SAFEBAG, ERR_R_MALLOC_FAILURE);
-        return NULL;
+        goto err;
     }
     safebag->value.bag = bag;
     safebag->type = OBJ_nid2obj(nid2);
     return safebag;
+
+ err:
+    PKCS12_BAGS_free(bag);
+    return NULL;
 }
 
 /* Turn PKCS8 object into a keybag */
@@ -127,6 +131,7 @@ PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG(int pbe_nid, const char *pass,
           PKCS8_encrypt(pbe_nid, pbe_ciph, pass, passlen, salt, saltlen, iter,
                         p8))) {
         PKCS12err(PKCS12_F_PKCS12_MAKE_SHKEYBAG, ERR_R_MALLOC_FAILURE);
+        PKCS12_SAFEBAG_free(bag);
         return NULL;
     }
 
@@ -144,14 +149,18 @@ PKCS7 *PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk)
     p7->type = OBJ_nid2obj(NID_pkcs7_data);
     if (!(p7->d.data = M_ASN1_OCTET_STRING_new())) {
         PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, ERR_R_MALLOC_FAILURE);
-        return NULL;
+        goto err;
     }
 
     if (!ASN1_item_pack(sk, ASN1_ITEM_rptr(PKCS12_SAFEBAGS), &p7->d.data)) {
         PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, PKCS12_R_CANT_PACK_STRUCTURE);
-        return NULL;
+        goto err;
     }
     return p7;
+
+ err:
+    PKCS7_free(p7);
+    return NULL;
 }
 
 /* Unpack SAFEBAGS from PKCS#7 data ContentInfo */
@@ -181,7 +190,7 @@ PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
     if (!PKCS7_set_type(p7, NID_pkcs7_encrypted)) {
         PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA,
                   PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE);
-        return NULL;
+        goto err;
     }
 
     pbe_ciph = EVP_get_cipherbynid(pbe_nid);
@@ -193,7 +202,7 @@ PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
 
     if (!pbe) {
         PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, ERR_R_MALLOC_FAILURE);
-        return NULL;
+        goto err;
     }
     X509_ALGOR_free(p7->d.encrypted->enc_data->algorithm);
     p7->d.encrypted->enc_data->algorithm = pbe;
@@ -202,10 +211,14 @@ PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
           PKCS12_item_i2d_encrypt(pbe, ASN1_ITEM_rptr(PKCS12_SAFEBAGS), pass,
                                   passlen, bags, 1))) {
         PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, PKCS12_R_ENCRYPT_ERROR);
-        return NULL;
+        goto err;
     }
 
     return p7;
+
+ err:
+    PKCS7_free(p7);
+    return NULL;
 }
 
 STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass,
diff --git a/deps/openssl/openssl/crypto/pkcs12/p12_crpt.c b/deps/openssl/openssl/crypto/pkcs12/p12_crpt.c
index 3a166e61300365..9c2dcab0246329 100644
--- a/deps/openssl/openssl/crypto/pkcs12/p12_crpt.c
+++ b/deps/openssl/openssl/crypto/pkcs12/p12_crpt.c
@@ -77,6 +77,9 @@ int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
     const unsigned char *pbuf;
     unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH];
 
+    if (cipher == NULL)
+        return 0;
+
     /* Extract useful info from parameter */
     if (param == NULL || param->type != V_ASN1_SEQUENCE ||
         param->value.sequence == NULL) {
diff --git a/deps/openssl/openssl/crypto/pkcs12/p12_mutl.c b/deps/openssl/openssl/crypto/pkcs12/p12_mutl.c
index 5ab4bf290e142e..a9277827ff2df5 100644
--- a/deps/openssl/openssl/crypto/pkcs12/p12_mutl.c
+++ b/deps/openssl/openssl/crypto/pkcs12/p12_mutl.c
@@ -173,11 +173,11 @@ int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
     }
     if (!saltlen)
         saltlen = PKCS12_SALT_LEN;
-    p12->mac->salt->length = saltlen;
-    if (!(p12->mac->salt->data = OPENSSL_malloc(saltlen))) {
+    if ((p12->mac->salt->data = OPENSSL_malloc(saltlen)) == NULL) {
         PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE);
         return 0;
     }
+    p12->mac->salt->length = saltlen;
     if (!salt) {
         if (RAND_pseudo_bytes(p12->mac->salt->data, saltlen) < 0)
             return 0;
diff --git a/deps/openssl/openssl/crypto/pkcs7/pk7_doit.c b/deps/openssl/openssl/crypto/pkcs7/pk7_doit.c
index c8d7db01bd730c..946aaa65435b33 100644
--- a/deps/openssl/openssl/crypto/pkcs7/pk7_doit.c
+++ b/deps/openssl/openssl/crypto/pkcs7/pk7_doit.c
@@ -656,6 +656,8 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
             bio = BIO_new_mem_buf(data_body->data, data_body->length);
         else {
             bio = BIO_new(BIO_s_mem());
+            if (bio == NULL)
+                goto err;
             BIO_set_mem_eof_return(bio, 0);
         }
         if (bio == NULL)
@@ -1156,7 +1158,6 @@ PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx)
     rsk = p7->d.signed_and_enveloped->recipientinfo;
     if (rsk == NULL)
         return NULL;
-    ri = sk_PKCS7_RECIP_INFO_value(rsk, 0);
     if (sk_PKCS7_RECIP_INFO_num(rsk) <= idx)
         return (NULL);
     ri = sk_PKCS7_RECIP_INFO_value(rsk, idx);
diff --git a/deps/openssl/openssl/crypto/pkcs7/pk7_smime.c b/deps/openssl/openssl/crypto/pkcs7/pk7_smime.c
index dbd4100c8d028b..c4d3724d2a48b0 100644
--- a/deps/openssl/openssl/crypto/pkcs7/pk7_smime.c
+++ b/deps/openssl/openssl/crypto/pkcs7/pk7_smime.c
@@ -256,8 +256,8 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
     X509_STORE_CTX cert_ctx;
     char buf[4096];
     int i, j = 0, k, ret = 0;
-    BIO *p7bio;
-    BIO *tmpin, *tmpout;
+    BIO *p7bio = NULL;
+    BIO *tmpin = NULL, *tmpout = NULL;
 
     if (!p7) {
         PKCS7err(PKCS7_F_PKCS7_VERIFY, PKCS7_R_INVALID_NULL_POINTER);
@@ -274,18 +274,12 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
         PKCS7err(PKCS7_F_PKCS7_VERIFY, PKCS7_R_NO_CONTENT);
         return 0;
     }
-#if 0
-    /*
-     * NB: this test commented out because some versions of Netscape
-     * illegally include zero length content when signing data.
-     */
 
     /* Check for data and content: two sets of data */
     if (!PKCS7_get_detached(p7) && indata) {
         PKCS7err(PKCS7_F_PKCS7_VERIFY, PKCS7_R_CONTENT_AND_DATA_PRESENT);
         return 0;
     }
-#endif
 
     sinfos = PKCS7_get_signer_info(p7);
 
@@ -295,7 +289,6 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
     }
 
     signers = PKCS7_get0_signers(p7, certs, flags);
-
     if (!signers)
         return 0;
 
@@ -308,14 +301,12 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
                 if (!X509_STORE_CTX_init(&cert_ctx, store, signer,
                                          p7->d.sign->cert)) {
                     PKCS7err(PKCS7_F_PKCS7_VERIFY, ERR_R_X509_LIB);
-                    sk_X509_free(signers);
-                    return 0;
+                    goto err;
                 }
                 X509_STORE_CTX_set_default(&cert_ctx, "smime_sign");
             } else if (!X509_STORE_CTX_init(&cert_ctx, store, signer, NULL)) {
                 PKCS7err(PKCS7_F_PKCS7_VERIFY, ERR_R_X509_LIB);
-                sk_X509_free(signers);
-                return 0;
+                goto err;
             }
             if (!(flags & PKCS7_NOCRL))
                 X509_STORE_CTX_set0_crls(&cert_ctx, p7->d.sign->crl);
@@ -328,8 +319,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
                          PKCS7_R_CERTIFICATE_VERIFY_ERROR);
                 ERR_add_error_data(2, "Verify error:",
                                    X509_verify_cert_error_string(j));
-                sk_X509_free(signers);
-                return 0;
+                goto err;
             }
             /* Check for revocation status here */
         }
@@ -348,7 +338,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
         tmpin = BIO_new_mem_buf(ptr, len);
         if (tmpin == NULL) {
             PKCS7err(PKCS7_F_PKCS7_VERIFY, ERR_R_MALLOC_FAILURE);
-            return 0;
+            goto err;
         }
     } else
         tmpin = indata;
@@ -398,15 +388,12 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
     ret = 1;
 
  err:
-
     if (tmpin == indata) {
         if (indata)
             BIO_pop(p7bio);
     }
     BIO_free_all(p7bio);
-
     sk_X509_free(signers);
-
     return ret;
 }
 
diff --git a/deps/openssl/openssl/crypto/ppccap.c b/deps/openssl/openssl/crypto/ppccap.c
index 2b7f704cd82af2..74af4732b5fa8d 100644
--- a/deps/openssl/openssl/crypto/ppccap.c
+++ b/deps/openssl/openssl/crypto/ppccap.c
@@ -7,7 +7,7 @@
 #if defined(__linux) || defined(_AIX)
 # include <sys/utsname.h>
 #endif
-#include <crypto.h>
+#include <openssl/crypto.h>
 #include <openssl/bn.h>
 
 #include "ppc_arch.h"
diff --git a/deps/openssl/openssl/crypto/rc4/asm/rc4-x86_64.pl b/deps/openssl/openssl/crypto/rc4/asm/rc4-x86_64.pl
index 75750dbf334dda..20722d3e724615 100755
--- a/deps/openssl/openssl/crypto/rc4/asm/rc4-x86_64.pl
+++ b/deps/openssl/openssl/crypto/rc4/asm/rc4-x86_64.pl
@@ -56,7 +56,7 @@
 # achieves respectful 432MBps on 2.8GHz processor now. For reference.
 # If executed on Xeon, current RC4_CHAR code-path is 2.7x faster than
 # RC4_INT code-path. While if executed on Opteron, it's only 25%
-# slower than the RC4_INT one [meaning that if CPU �-arch detection
+# slower than the RC4_INT one [meaning that if CPU µ-arch detection
 # is not implemented, then this final RC4_CHAR code-path should be
 # preferred, as it provides better *all-round* performance].
 
diff --git a/deps/openssl/openssl/crypto/rsa/rsa_ameth.c b/deps/openssl/openssl/crypto/rsa/rsa_ameth.c
index ca3922e6c29831..4e0621827cf3ed 100644
--- a/deps/openssl/openssl/crypto/rsa/rsa_ameth.c
+++ b/deps/openssl/openssl/crypto/rsa/rsa_ameth.c
@@ -268,7 +268,7 @@ static X509_ALGOR *rsa_mgf1_decode(X509_ALGOR *alg)
 {
     const unsigned char *p;
     int plen;
-    if (alg == NULL)
+    if (alg == NULL || alg->parameter == NULL)
         return NULL;
     if (OBJ_obj2nid(alg->algorithm) != NID_mgf1)
         return NULL;
diff --git a/deps/openssl/openssl/crypto/rsa/rsa_gen.c b/deps/openssl/openssl/crypto/rsa/rsa_gen.c
index 2465fbdebf190b..7f7dca39fd089b 100644
--- a/deps/openssl/openssl/crypto/rsa/rsa_gen.c
+++ b/deps/openssl/openssl/crypto/rsa/rsa_gen.c
@@ -69,6 +69,8 @@
 #include <openssl/rsa.h>
 #ifdef OPENSSL_FIPS
 # include <openssl/fips.h>
+extern int FIPS_rsa_x931_generate_key_ex(RSA *rsa, int bits, BIGNUM *e,
+                                         BN_GENCB *cb);
 #endif
 
 static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value,
@@ -94,7 +96,7 @@ int RSA_generate_key_ex(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb)
         return rsa->meth->rsa_keygen(rsa, bits, e_value, cb);
 #ifdef OPENSSL_FIPS
     if (FIPS_mode())
-        return FIPS_rsa_generate_key_ex(rsa, bits, e_value, cb);
+        return FIPS_rsa_x931_generate_key_ex(rsa, bits, e_value, cb);
 #endif
     return rsa_builtin_keygen(rsa, bits, e_value, cb);
 }
diff --git a/deps/openssl/openssl/crypto/rsa/rsa_sign.c b/deps/openssl/openssl/crypto/rsa/rsa_sign.c
index 19461c6364d43e..82ca8324dfbc11 100644
--- a/deps/openssl/openssl/crypto/rsa/rsa_sign.c
+++ b/deps/openssl/openssl/crypto/rsa/rsa_sign.c
@@ -218,14 +218,13 @@ int int_rsa_verify(int dtype, const unsigned char *m,
             memcpy(rm, s + 2, 16);
             *prm_len = 16;
             ret = 1;
-        } else if (memcmp(m, s + 2, 16))
+        } else if (memcmp(m, s + 2, 16)) {
             RSAerr(RSA_F_INT_RSA_VERIFY, RSA_R_BAD_SIGNATURE);
-        else
+        } else {
             ret = 1;
-    }
-
-    /* Special case: SSL signature */
-    if (dtype == NID_md5_sha1) {
+        }
+    } else if (dtype == NID_md5_sha1) {
+        /* Special case: SSL signature */
         if ((i != SSL_SIG_LENGTH) || memcmp(s, m, SSL_SIG_LENGTH))
             RSAerr(RSA_F_INT_RSA_VERIFY, RSA_R_BAD_SIGNATURE);
         else
diff --git a/deps/openssl/openssl/crypto/rsa/rsa_test.c b/deps/openssl/openssl/crypto/rsa/rsa_test.c
index e9712953e99393..85c7440b8c6805 100644
--- a/deps/openssl/openssl/crypto/rsa/rsa_test.c
+++ b/deps/openssl/openssl/crypto/rsa/rsa_test.c
@@ -297,22 +297,30 @@ int main(int argc, char *argv[])
         } else
             printf("OAEP encryption/decryption ok\n");
 
-        /* Try decrypting corrupted ciphertexts */
+        /* Try decrypting corrupted ciphertexts. */
         for (n = 0; n < clen; ++n) {
-            int b;
-            unsigned char saved = ctext[n];
-            for (b = 0; b < 256; ++b) {
-                if (b == saved)
-                    continue;
-                ctext[n] = b;
-                num = RSA_private_decrypt(num, ctext, ptext, key,
+            ctext[n] ^= 1;
+            num = RSA_private_decrypt(clen, ctext, ptext, key,
                                           RSA_PKCS1_OAEP_PADDING);
-                if (num > 0) {
-                    printf("Corrupt data decrypted!\n");
-                    err = 1;
-                }
+            if (num > 0) {
+                printf("Corrupt data decrypted!\n");
+                err = 1;
+                break;
             }
+            ctext[n] ^= 1;
         }
+
+        /* Test truncated ciphertexts, as well as negative length. */
+        for (n = -1; n < clen; ++n) {
+            num = RSA_private_decrypt(n, ctext, ptext, key,
+                                      RSA_PKCS1_OAEP_PADDING);
+            if (num > 0) {
+                printf("Truncated data decrypted!\n");
+                err = 1;
+                break;
+            }
+        }
+
  next:
         RSA_free(key);
     }
diff --git a/deps/openssl/openssl/crypto/sha/asm/sha1-586.pl b/deps/openssl/openssl/crypto/sha/asm/sha1-586.pl
index 4895eb3ddf8579..e0b5d83b62018a 100644
--- a/deps/openssl/openssl/crypto/sha/asm/sha1-586.pl
+++ b/deps/openssl/openssl/crypto/sha/asm/sha1-586.pl
@@ -66,9 +66,9 @@
 # switch to AVX alone improves performance by as little as 4% in
 # comparison to SSSE3 code path. But below result doesn't look like
 # 4% improvement... Trouble is that Sandy Bridge decodes 'ro[rl]' as
-# pair of �-ops, and it's the additional �-ops, two per round, that
+# pair of µ-ops, and it's the additional µ-ops, two per round, that
 # make it run slower than Core2 and Westmere. But 'sh[rl]d' is decoded
-# as single �-op by Sandy Bridge and it's replacing 'ro[rl]' with
+# as single µ-op by Sandy Bridge and it's replacing 'ro[rl]' with
 # equivalent 'sh[rl]d' that is responsible for the impressive 5.1
 # cycles per processed byte. But 'sh[rl]d' is not something that used
 # to be fast, nor does it appear to be fast in upcoming Bulldozer
diff --git a/deps/openssl/openssl/crypto/sha/asm/sha1-mb-x86_64.pl b/deps/openssl/openssl/crypto/sha/asm/sha1-mb-x86_64.pl
index a8ee075eaaa0a0..f856bb888b0e7b 100644
--- a/deps/openssl/openssl/crypto/sha/asm/sha1-mb-x86_64.pl
+++ b/deps/openssl/openssl/crypto/sha/asm/sha1-mb-x86_64.pl
@@ -58,7 +58,7 @@
 	$avx = ($1>=10) + ($1>=11);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 
diff --git a/deps/openssl/openssl/crypto/sha/asm/sha1-x86_64.pl b/deps/openssl/openssl/crypto/sha/asm/sha1-x86_64.pl
index 9bb6b498190fdf..9a6acc347d3317 100755
--- a/deps/openssl/openssl/crypto/sha/asm/sha1-x86_64.pl
+++ b/deps/openssl/openssl/crypto/sha/asm/sha1-x86_64.pl
@@ -107,7 +107,7 @@
 	$avx = ($1>=10) + ($1>=11);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([2-9]\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([2-9]\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 
diff --git a/deps/openssl/openssl/crypto/sha/asm/sha256-586.pl b/deps/openssl/openssl/crypto/sha/asm/sha256-586.pl
index 6462e45ba75bee..e9077143817cdb 100644
--- a/deps/openssl/openssl/crypto/sha/asm/sha256-586.pl
+++ b/deps/openssl/openssl/crypto/sha/asm/sha256-586.pl
@@ -10,7 +10,7 @@
 # SHA256 block transform for x86. September 2007.
 #
 # Performance improvement over compiler generated code varies from
-# 10% to 40% [see below]. Not very impressive on some �-archs, but
+# 10% to 40% [see below]. Not very impressive on some µ-archs, but
 # it's 5 times smaller and optimizies amount of writes.
 #
 # May 2012.
diff --git a/deps/openssl/openssl/crypto/sha/asm/sha256-mb-x86_64.pl b/deps/openssl/openssl/crypto/sha/asm/sha256-mb-x86_64.pl
index adf2ddccd18b0c..3d37ae31ad3e7f 100644
--- a/deps/openssl/openssl/crypto/sha/asm/sha256-mb-x86_64.pl
+++ b/deps/openssl/openssl/crypto/sha/asm/sha256-mb-x86_64.pl
@@ -59,7 +59,7 @@
 	$avx = ($1>=10) + ($1>=11);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 
diff --git a/deps/openssl/openssl/crypto/sha/asm/sha512-586.pl b/deps/openssl/openssl/crypto/sha/asm/sha512-586.pl
index e96ec00314a486..2f6a202c37658c 100644
--- a/deps/openssl/openssl/crypto/sha/asm/sha512-586.pl
+++ b/deps/openssl/openssl/crypto/sha/asm/sha512-586.pl
@@ -37,7 +37,7 @@
 #
 # IALU code-path is optimized for elder Pentiums. On vanilla Pentium
 # performance improvement over compiler generated code reaches ~60%,
-# while on PIII - ~35%. On newer �-archs improvement varies from 15%
+# while on PIII - ~35%. On newer µ-archs improvement varies from 15%
 # to 50%, but it's less important as they are expected to execute SSE2
 # code-path, which is commonly ~2-3x faster [than compiler generated
 # code]. SSE2 code-path is as fast as original sha512-sse2.pl, even
diff --git a/deps/openssl/openssl/crypto/sha/asm/sha512-parisc.pl b/deps/openssl/openssl/crypto/sha/asm/sha512-parisc.pl
index fc0e15b3c0593a..6cad72e255730f 100755
--- a/deps/openssl/openssl/crypto/sha/asm/sha512-parisc.pl
+++ b/deps/openssl/openssl/crypto/sha/asm/sha512-parisc.pl
@@ -19,7 +19,7 @@
 # SHA512 performance is >2.9x better than gcc 3.2 generated code on
 # PA-7100LC, PA-RISC 1.1 processor. Then implementation detects if the
 # code is executed on PA-RISC 2.0 processor and switches to 64-bit
-# code path delivering adequate peformance even in "blended" 32-bit
+# code path delivering adequate performance even in "blended" 32-bit
 # build. Though 64-bit code is not any faster than code generated by
 # vendor compiler on PA-8600...
 #
diff --git a/deps/openssl/openssl/crypto/sha/asm/sha512-x86_64.pl b/deps/openssl/openssl/crypto/sha/asm/sha512-x86_64.pl
index b7b44b4411362d..58665667f14934 100755
--- a/deps/openssl/openssl/crypto/sha/asm/sha512-x86_64.pl
+++ b/deps/openssl/openssl/crypto/sha/asm/sha512-x86_64.pl
@@ -124,7 +124,7 @@
 	$avx = ($1>=10) + ($1>=11);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 
diff --git a/deps/openssl/openssl/crypto/sparccpuid.S b/deps/openssl/openssl/crypto/sparccpuid.S
index eea2006fba18f6..7b12ec29315436 100644
--- a/deps/openssl/openssl/crypto/sparccpuid.S
+++ b/deps/openssl/openssl/crypto/sparccpuid.S
@@ -123,7 +123,7 @@ OPENSSL_wipe_cpu:
 			fmovs	%f1,%f3
 			fmovs	%f0,%f2
 
-	add	%fp,BIAS,%i0	! return pointer to caller�s top of stack
+	add	%fp,BIAS,%i0	! return pointer to caller´s top of stack
 
 	ret
 	restore
diff --git a/deps/openssl/openssl/crypto/sparcv9cap.c b/deps/openssl/openssl/crypto/sparcv9cap.c
index 8bf2846929b177..a36e461792941d 100644
--- a/deps/openssl/openssl/crypto/sparcv9cap.c
+++ b/deps/openssl/openssl/crypto/sparcv9cap.c
@@ -237,6 +237,17 @@ static void common_handler(int sig)
     siglongjmp(common_jmp, sig);
 }
 
+#if defined(__sun) && defined(__SVR4)
+# if defined(__GNUC__) && __GNUC__>=2
+extern unsigned int getisax(unsigned int vec[], unsigned int sz) __attribute__ ((weak));
+# elif defined(__SUNPRO_C)
+#pragma weak getisax
+extern unsigned int getisax(unsigned int vec[], unsigned int sz);
+# else
+static unsigned int (*getisax) (unsigned int vec[], unsigned int sz) = NULL;
+# endif
+#endif
+
 void OPENSSL_cpuid_setup(void)
 {
     char *e;
@@ -255,6 +266,42 @@ void OPENSSL_cpuid_setup(void)
         return;
     }
 
+#if defined(__sun) && defined(__SVR4)
+    if (getisax != NULL) {
+        unsigned int vec[1];
+
+        if (getisax (vec,1)) {
+            if (vec[0]&0x0020) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS1;
+            if (vec[0]&0x0040) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS2;
+            if (vec[0]&0x0080) OPENSSL_sparcv9cap_P[0] |= SPARCV9_BLK;
+            if (vec[0]&0x0100) OPENSSL_sparcv9cap_P[0] |= SPARCV9_FMADD;
+            if (vec[0]&0x0400) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS3;
+
+            /* reconstruct %cfr copy */
+            OPENSSL_sparcv9cap_P[1] = (vec[0]>>17)&0x3ff;
+            OPENSSL_sparcv9cap_P[1] |= (OPENSSL_sparcv9cap_P[1]&CFR_MONTMUL)<<1;
+            if (vec[0]&0x20000000) OPENSSL_sparcv9cap_P[1] |= CFR_CRC32C;
+
+            /* Some heuristics */
+            /* all known VIS2-capable CPUs have unprivileged tick counter */
+            if (OPENSSL_sparcv9cap_P[0]&SPARCV9_VIS2)
+                OPENSSL_sparcv9cap_P[0] &= ~SPARCV9_TICK_PRIVILEGED;
+
+            OPENSSL_sparcv9cap_P[0] |= SPARCV9_PREFER_FPU;
+
+            /* detect UltraSPARC-Tx, see sparccpud.S for details... */
+            if ((OPENSSL_sparcv9cap_P[0]&SPARCV9_VIS1) &&
+                _sparcv9_vis1_instrument() >= 12)
+                OPENSSL_sparcv9cap_P[0] &= ~(SPARCV9_VIS1 | SPARCV9_PREFER_FPU);
+        }
+
+        if (sizeof(size_t) == 8)
+            OPENSSL_sparcv9cap_P[0] |= SPARCV9_64BIT_STACK;
+
+        return;
+    }
+#endif
+
     /* Initial value, fits UltraSPARC-I&II... */
     OPENSSL_sparcv9cap_P[0] = SPARCV9_PREFER_FPU | SPARCV9_TICK_PRIVILEGED;
 
diff --git a/deps/openssl/openssl/crypto/srp/srp_vfy.c b/deps/openssl/openssl/crypto/srp/srp_vfy.c
index 50f75d7e4c9f16..a3f1a8a0a4d5bd 100644
--- a/deps/openssl/openssl/crypto/srp/srp_vfy.c
+++ b/deps/openssl/openssl/crypto/srp/srp_vfy.c
@@ -521,12 +521,12 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt,
                           char **verifier, const char *N, const char *g)
 {
     int len;
-    char *result = NULL;
-    char *vf;
+    char *result = NULL, *vf = NULL;
     BIGNUM *N_bn = NULL, *g_bn = NULL, *s = NULL, *v = NULL;
     unsigned char tmp[MAX_LEN];
     unsigned char tmp2[MAX_LEN];
     char *defgNid = NULL;
+    int vfsize = 0;
 
     if ((user == NULL) ||
         (pass == NULL) || (salt == NULL) || (verifier == NULL))
@@ -564,22 +564,23 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt,
         goto err;
 
     BN_bn2bin(v, tmp);
-    if (((vf = OPENSSL_malloc(BN_num_bytes(v) * 2)) == NULL))
+    vfsize = BN_num_bytes(v) * 2;
+    if (((vf = OPENSSL_malloc(vfsize)) == NULL))
         goto err;
     t_tob64(vf, tmp, BN_num_bytes(v));
 
-    *verifier = vf;
     if (*salt == NULL) {
         char *tmp_salt;
 
         if ((tmp_salt = OPENSSL_malloc(SRP_RANDOM_SALT_LEN * 2)) == NULL) {
-            OPENSSL_free(vf);
             goto err;
         }
         t_tob64(tmp_salt, tmp2, SRP_RANDOM_SALT_LEN);
         *salt = tmp_salt;
     }
 
+    *verifier = vf;
+    vf = NULL;
     result = defgNid;
 
  err:
@@ -587,11 +588,21 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt,
         BN_free(N_bn);
         BN_free(g_bn);
     }
+    OPENSSL_cleanse(vf, vfsize);
+    OPENSSL_free(vf);
+    BN_clear_free(s);
+    BN_clear_free(v);
     return result;
 }
 
 /*
- * create a verifier (*salt,*verifier,g and N are BIGNUMs)
+ * create a verifier (*salt,*verifier,g and N are BIGNUMs). If *salt != NULL
+ * then the provided salt will be used. On successful exit *verifier will point
+ * to a newly allocated BIGNUM containing the verifier and (if a salt was not
+ * provided) *salt will be populated with a newly allocated BIGNUM containing a
+ * random salt.
+ * The caller is responsible for freeing the allocated *salt and *verifier
+ * BIGNUMS.
  */
 int SRP_create_verifier_BN(const char *user, const char *pass, BIGNUM **salt,
                            BIGNUM **verifier, BIGNUM *N, BIGNUM *g)
@@ -600,6 +611,7 @@ int SRP_create_verifier_BN(const char *user, const char *pass, BIGNUM **salt,
     BIGNUM *x = NULL;
     BN_CTX *bn_ctx = BN_CTX_new();
     unsigned char tmp2[MAX_LEN];
+    BIGNUM *salttmp = NULL;
 
     if ((user == NULL) ||
         (pass == NULL) ||
@@ -614,10 +626,12 @@ int SRP_create_verifier_BN(const char *user, const char *pass, BIGNUM **salt,
         if (RAND_pseudo_bytes(tmp2, SRP_RANDOM_SALT_LEN) < 0)
             goto err;
 
-        *salt = BN_bin2bn(tmp2, SRP_RANDOM_SALT_LEN, NULL);
+        salttmp = BN_bin2bn(tmp2, SRP_RANDOM_SALT_LEN, NULL);
+    } else {
+        salttmp = *salt;
     }
 
-    x = SRP_Calc_x(*salt, user, pass);
+    x = SRP_Calc_x(salttmp, user, pass);
 
     *verifier = BN_new();
     if (*verifier == NULL)
@@ -631,9 +645,11 @@ int SRP_create_verifier_BN(const char *user, const char *pass, BIGNUM **salt,
     srp_bn_print(*verifier);
 
     result = 1;
+    *salt = salttmp;
 
  err:
-
+    if (*salt != salttmp)
+        BN_clear_free(salttmp);
     BN_clear_free(x);
     BN_CTX_free(bn_ctx);
     return result;
diff --git a/deps/openssl/openssl/crypto/ts/ts_rsp_verify.c b/deps/openssl/openssl/crypto/ts/ts_rsp_verify.c
index 3ce765dfa1b6a1..da8991173ced5c 100644
--- a/deps/openssl/openssl/crypto/ts/ts_rsp_verify.c
+++ b/deps/openssl/openssl/crypto/ts/ts_rsp_verify.c
@@ -522,7 +522,7 @@ static int TS_check_status_info(TS_RESP *response)
             if (ASN1_BIT_STRING_get_bit(info->failure_info,
                                         TS_failure_info[i].code)) {
                 if (!first)
-                    strcpy(failure_text, ",");
+                    strcat(failure_text, ",");
                 else
                     first = 0;
                 strcat(failure_text, TS_failure_info[i].text);
diff --git a/deps/openssl/openssl/crypto/whrlpool/asm/wp-mmx.pl b/deps/openssl/openssl/crypto/whrlpool/asm/wp-mmx.pl
index c584e5b92b251a..7725951d6b711c 100644
--- a/deps/openssl/openssl/crypto/whrlpool/asm/wp-mmx.pl
+++ b/deps/openssl/openssl/crypto/whrlpool/asm/wp-mmx.pl
@@ -16,7 +16,7 @@
 # table]. I stick to value of 2 for two reasons: 1. smaller table
 # minimizes cache trashing and thus mitigates the hazard of side-
 # channel leakage similar to AES cache-timing one; 2. performance
-# gap among different �-archs is smaller.
+# gap among different µ-archs is smaller.
 #
 # Performance table lists rounded amounts of CPU cycles spent by
 # whirlpool_block_mmx routine on single 64 byte input block, i.e.
diff --git a/deps/openssl/openssl/crypto/x509/x509_lu.c b/deps/openssl/openssl/crypto/x509/x509_lu.c
index b0d653903ff566..50120a4d70c645 100644
--- a/deps/openssl/openssl/crypto/x509/x509_lu.c
+++ b/deps/openssl/openssl/crypto/x509/x509_lu.c
@@ -536,8 +536,6 @@ STACK_OF(X509_CRL) *X509_STORE_get1_crls(X509_STORE_CTX *ctx, X509_NAME *nm)
     X509_OBJECT *obj, xobj;
     sk = sk_X509_CRL_new_null();
     CRYPTO_w_lock(CRYPTO_LOCK_X509_STORE);
-    /* Check cache first */
-    idx = x509_object_idx_cnt(ctx->ctx->objs, X509_LU_CRL, nm, &cnt);
 
     /*
      * Always do lookup to possibly add new CRLs to cache
diff --git a/deps/openssl/openssl/crypto/x509/x509_vfy.c b/deps/openssl/openssl/crypto/x509/x509_vfy.c
index a2f1dbefe3520a..ab94948f0135f2 100644
--- a/deps/openssl/openssl/crypto/x509/x509_vfy.c
+++ b/deps/openssl/openssl/crypto/x509/x509_vfy.c
@@ -249,7 +249,7 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
         if (ctx->param->flags & X509_V_FLAG_TRUSTED_FIRST) {
             ok = ctx->get_issuer(&xtmp, ctx, x);
             if (ok < 0)
-                return ok;
+                goto end;
             /*
              * If successful for now free up cert so it will be picked up
              * again later.
@@ -347,14 +347,15 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
             ok = ctx->get_issuer(&xtmp, ctx, x);
 
             if (ok < 0)
-                return ok;
+                goto end;
             if (ok == 0)
                 break;
             x = xtmp;
             if (!sk_X509_push(ctx->chain, x)) {
                 X509_free(xtmp);
                 X509err(X509_F_X509_VERIFY_CERT, ERR_R_MALLOC_FAILURE);
-                return 0;
+                ok = 0;
+                goto end;
             }
             num++;
         }
@@ -752,6 +753,10 @@ static int check_hosts(X509 *x, X509_VERIFY_PARAM_ID *id)
     int n = sk_OPENSSL_STRING_num(id->hosts);
     char *name;
 
+    if (id->peername != NULL) {
+        OPENSSL_free(id->peername);
+        id->peername = NULL;
+    }
     for (i = 0; i < n; ++i) {
         name = sk_OPENSSL_STRING_value(id->hosts, i);
         if (X509_check_host(x, name, 0, id->hostflags, &id->peername) > 0)
diff --git a/deps/openssl/openssl/crypto/x509/x509_vpm.c b/deps/openssl/openssl/crypto/x509/x509_vpm.c
index 1ea0c69f5743d1..592a8a5f6a5c94 100644
--- a/deps/openssl/openssl/crypto/x509/x509_vpm.c
+++ b/deps/openssl/openssl/crypto/x509/x509_vpm.c
@@ -155,6 +155,7 @@ static void x509_verify_param_zero(X509_VERIFY_PARAM *param)
     }
     if (paramid->peername)
         OPENSSL_free(paramid->peername);
+    paramid->peername = NULL;
     if (paramid->email) {
         OPENSSL_free(paramid->email);
         paramid->email = NULL;
@@ -165,7 +166,6 @@ static void x509_verify_param_zero(X509_VERIFY_PARAM *param)
         paramid->ip = NULL;
         paramid->iplen = 0;
     }
-
 }
 
 X509_VERIFY_PARAM *X509_VERIFY_PARAM_new(void)
@@ -176,13 +176,20 @@ X509_VERIFY_PARAM *X509_VERIFY_PARAM_new(void)
     param = OPENSSL_malloc(sizeof *param);
     if (!param)
         return NULL;
-    paramid = OPENSSL_malloc(sizeof *paramid);
+    memset(param, 0, sizeof(*param));
+
+    paramid = OPENSSL_malloc(sizeof(*paramid));
     if (!paramid) {
         OPENSSL_free(param);
         return NULL;
     }
-    memset(param, 0, sizeof *param);
-    memset(paramid, 0, sizeof *paramid);
+    memset(paramid, 0, sizeof(*paramid));
+    /* Exotic platforms may have non-zero bit representation of NULL */
+    paramid->hosts = NULL;
+    paramid->peername = NULL;
+    paramid->email = NULL;
+    paramid->ip = NULL;
+
     param->id = paramid;
     x509_verify_param_zero(param);
     return param;
diff --git a/deps/openssl/openssl/crypto/x509v3/v3_cpols.c b/deps/openssl/openssl/crypto/x509v3/v3_cpols.c
index 0febc1b3edc1cf..d97f6226b9ee01 100644
--- a/deps/openssl/openssl/crypto/x509v3/v3_cpols.c
+++ b/deps/openssl/openssl/crypto/x509v3/v3_cpols.c
@@ -186,6 +186,10 @@ static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method,
                 goto err;
             }
             pol = POLICYINFO_new();
+            if (pol == NULL) {
+                X509V3err(X509V3_F_R2I_CERTPOL, ERR_R_MALLOC_FAILURE);
+                goto err;
+            }
             pol->policyid = pobj;
         }
         if (!sk_POLICYINFO_push(pols, pol)) {
diff --git a/deps/openssl/openssl/crypto/x509v3/v3_ncons.c b/deps/openssl/openssl/crypto/x509v3/v3_ncons.c
index b97ed271e3e293..2855269668bee8 100644
--- a/deps/openssl/openssl/crypto/x509v3/v3_ncons.c
+++ b/deps/openssl/openssl/crypto/x509v3/v3_ncons.c
@@ -132,6 +132,8 @@ static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method,
         }
         tval.value = val->value;
         sub = GENERAL_SUBTREE_new();
+        if (sub == NULL)
+            goto memerr;
         if (!v2i_GENERAL_NAME_ex(sub->base, method, ctx, &tval, 1))
             goto err;
         if (!*ptree)
diff --git a/deps/openssl/openssl/crypto/x509v3/v3_pci.c b/deps/openssl/openssl/crypto/x509v3/v3_pci.c
index fe0d8063d1f108..48ac0959cb10a3 100644
--- a/deps/openssl/openssl/crypto/x509v3/v3_pci.c
+++ b/deps/openssl/openssl/crypto/x509v3/v3_pci.c
@@ -3,7 +3,7 @@
  * Contributed to the OpenSSL Project 2004 by Richard Levitte
  * (richard@levitte.org)
  */
-/* Copyright (c) 2004 Kungliga Tekniska H�gskolan
+/* Copyright (c) 2004 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/deps/openssl/openssl/crypto/x509v3/v3_pcia.c b/deps/openssl/openssl/crypto/x509v3/v3_pcia.c
index 350b39889fcc3e..43fd362aeda04e 100644
--- a/deps/openssl/openssl/crypto/x509v3/v3_pcia.c
+++ b/deps/openssl/openssl/crypto/x509v3/v3_pcia.c
@@ -3,7 +3,7 @@
  * Contributed to the OpenSSL Project 2004 by Richard Levitte
  * (richard@levitte.org)
  */
-/* Copyright (c) 2004 Kungliga Tekniska H�gskolan
+/* Copyright (c) 2004 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/deps/openssl/openssl/crypto/x509v3/v3_purp.c b/deps/openssl/openssl/crypto/x509v3/v3_purp.c
index 36b0d87a0d8bb5..845be673b79998 100644
--- a/deps/openssl/openssl/crypto/x509v3/v3_purp.c
+++ b/deps/openssl/openssl/crypto/x509v3/v3_purp.c
@@ -380,6 +380,14 @@ static void setup_crldp(X509 *x)
         setup_dp(x, sk_DIST_POINT_value(x->crldp, i));
 }
 
+#define V1_ROOT (EXFLAG_V1|EXFLAG_SS)
+#define ku_reject(x, usage) \
+        (((x)->ex_flags & EXFLAG_KUSAGE) && !((x)->ex_kusage & (usage)))
+#define xku_reject(x, usage) \
+        (((x)->ex_flags & EXFLAG_XKUSAGE) && !((x)->ex_xkusage & (usage)))
+#define ns_reject(x, usage) \
+        (((x)->ex_flags & EXFLAG_NSCERT) && !((x)->ex_nscert & (usage)))
+
 static void x509v3_cache_extensions(X509 *x)
 {
     BASIC_CONSTRAINTS *bs;
@@ -499,7 +507,8 @@ static void x509v3_cache_extensions(X509 *x)
     if (!X509_NAME_cmp(X509_get_subject_name(x), X509_get_issuer_name(x))) {
         x->ex_flags |= EXFLAG_SI;
         /* If SKID matches AKID also indicate self signed */
-        if (X509_check_akid(x, x->akid) == X509_V_OK)
+        if (X509_check_akid(x, x->akid) == X509_V_OK &&
+            !ku_reject(x, KU_KEY_CERT_SIGN))
             x->ex_flags |= EXFLAG_SS;
     }
     x->altname = X509_get_ext_d2i(x, NID_subject_alt_name, NULL, NULL);
@@ -538,14 +547,6 @@ static void x509v3_cache_extensions(X509 *x)
  * 4 basicConstraints absent but keyUsage present and keyCertSign asserted.
  */
 
-#define V1_ROOT (EXFLAG_V1|EXFLAG_SS)
-#define ku_reject(x, usage) \
-        (((x)->ex_flags & EXFLAG_KUSAGE) && !((x)->ex_kusage & (usage)))
-#define xku_reject(x, usage) \
-        (((x)->ex_flags & EXFLAG_XKUSAGE) && !((x)->ex_xkusage & (usage)))
-#define ns_reject(x, usage) \
-        (((x)->ex_flags & EXFLAG_NSCERT) && !((x)->ex_nscert & (usage)))
-
 static int check_ca(const X509 *x)
 {
     /* keyUsage if present should allow cert signing */
diff --git a/deps/openssl/openssl/crypto/x509v3/v3_scts.c b/deps/openssl/openssl/crypto/x509v3/v3_scts.c
index 6e0b8d6844c8ce..0b7c68180e7883 100644
--- a/deps/openssl/openssl/crypto/x509v3/v3_scts.c
+++ b/deps/openssl/openssl/crypto/x509v3/v3_scts.c
@@ -190,8 +190,9 @@ static STACK_OF(SCT) *d2i_SCT_LIST(STACK_OF(SCT) **a,
     SCT *sct;
     unsigned char *p, *p2;
     unsigned short listlen, sctlen = 0, fieldlen;
+    const unsigned char *q = *pp;
 
-    if (d2i_ASN1_OCTET_STRING(&oct, pp, length) == NULL)
+    if (d2i_ASN1_OCTET_STRING(&oct, &q, length) == NULL)
         return NULL;
     if (oct->length < 2)
         goto done;
@@ -279,6 +280,7 @@ static STACK_OF(SCT) *d2i_SCT_LIST(STACK_OF(SCT) **a,
 
  done:
     ASN1_OCTET_STRING_free(oct);
+    *pp = q;
     return sk;
 
  err:
diff --git a/deps/openssl/openssl/crypto/x509v3/v3_utl.c b/deps/openssl/openssl/crypto/x509v3/v3_utl.c
index bdd7b95f4570b4..4d1ecc58bf9450 100644
--- a/deps/openssl/openssl/crypto/x509v3/v3_utl.c
+++ b/deps/openssl/openssl/crypto/x509v3/v3_utl.c
@@ -926,7 +926,7 @@ static int do_x509_check(X509 *x, const char *chk, size_t chklen,
     GENERAL_NAMES *gens = NULL;
     X509_NAME *name = NULL;
     int i;
-    int cnid;
+    int cnid = NID_undef;
     int alt_type;
     int san_present = 0;
     int rv = 0;
@@ -949,7 +949,6 @@ static int do_x509_check(X509 *x, const char *chk, size_t chklen,
         else
             equal = equal_wildcard;
     } else {
-        cnid = 0;
         alt_type = V_ASN1_OCTET_STRING;
         equal = equal_case;
     }
@@ -980,11 +979,16 @@ static int do_x509_check(X509 *x, const char *chk, size_t chklen,
         GENERAL_NAMES_free(gens);
         if (rv != 0)
             return rv;
-        if (!cnid
+        if (cnid == NID_undef
             || (san_present
                 && !(flags & X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT)))
             return 0;
     }
+
+    /* We're done if CN-ID is not pertinent */
+    if (cnid == NID_undef)
+        return 0;
+
     i = -1;
     name = X509_get_subject_name(x);
     while ((i = X509_NAME_get_index_by_NID(name, cnid, i)) >= 0) {
diff --git a/deps/openssl/openssl/demos/easy_tls/README b/deps/openssl/openssl/demos/easy_tls/README
index 816a58009c86df..ee89dfb9423307 100644
--- a/deps/openssl/openssl/demos/easy_tls/README
+++ b/deps/openssl/openssl/demos/easy_tls/README
@@ -62,4 +62,4 @@ As noted above, easy_tls.c will be changed to become a library one
 day, which means that future revisions will not be fully compatible to
 the current version.
 
-Bodo M�ller <bodo@openssl.org>
+Bodo Möller <bodo@openssl.org>
diff --git a/deps/openssl/openssl/demos/engines/zencod/hw_zencod.c b/deps/openssl/openssl/demos/engines/zencod/hw_zencod.c
index 0c0f524d4c060d..daf0aef1efe236 100644
--- a/deps/openssl/openssl/demos/engines/zencod/hw_zencod.c
+++ b/deps/openssl/openssl/demos/engines/zencod/hw_zencod.c
@@ -610,7 +610,7 @@ static int zencod_init(ENGINE *e)
     ptr_zencod_rc4_cipher = ptr_rc4_1;
 
     /*
-     * We should peform a test to see if there is actually any unit runnig on
+     * We should perform a test to see if there is actually any unit runnig on
      * the system ... Even if the cryptozen library is loaded the module coul
      * not be loaded on the system ... For now we may just open and close the
      * device !!
diff --git a/deps/openssl/openssl/doc/HOWTO/keys.txt b/deps/openssl/openssl/doc/HOWTO/keys.txt
index 7ae2a3a11833a3..ba0314fafce046 100644
--- a/deps/openssl/openssl/doc/HOWTO/keys.txt
+++ b/deps/openssl/openssl/doc/HOWTO/keys.txt
@@ -40,9 +40,8 @@ consider insecure or to be insecure pretty soon.
 
 3. To generate a DSA key
 
-A DSA key can be used for signing only.  This is important to keep
-in mind to know what kind of purposes a certificate request with a
-DSA key can really be used for.
+A DSA key can be used for signing only.  It is important to
+know what a certificate request with a DSA key can really be used for.
 
 Generating a key for the DSA algorithm is a two-step process.  First,
 you have to generate parameters from which to generate the key:
diff --git a/deps/openssl/openssl/doc/README b/deps/openssl/openssl/doc/README
index 6ecc14d9945773..cc760402ae9b5e 100644
--- a/deps/openssl/openssl/doc/README
+++ b/deps/openssl/openssl/doc/README
@@ -1,12 +1,21 @@
 
- apps/openssl.pod .... Documentation of OpenSSL `openssl' command
- crypto/crypto.pod ... Documentation of OpenSSL crypto.h+libcrypto.a
- ssl/ssl.pod ......... Documentation of OpenSSL ssl.h+libssl.a
- openssl.txt ......... Assembled documentation files for OpenSSL [not final]
- ssleay.txt .......... Assembled documentation of ancestor SSLeay [obsolete]
- standards.txt ....... Assembled pointers to standards, RFCs or internet drafts
-                       that are related to OpenSSL.
+README  This file
 
- An archive of HTML documents for the SSLeay library is available from
- http://www.columbia.edu/~ariel/ssleay/
+fingerprints.txt
+        PGP fingerprints of authoried release signers
 
+standards.txt
+        Pointers to standards, RFC's and IETF Drafts that are
+        related to OpenSSL.  Incomplete.
+
+HOWTO/
+        A few how-to documents; not necessarily up-to-date
+apps/
+        The openssl command-line tools; start with openssl.pod
+ssl/
+        The SSL library; start with ssl.pod
+crypto/
+        The cryptographic library; start with crypto.pod
+
+Formatted versions of the manpages (apps,ssl,crypto) can be found at
+        https://www.openssl.org/docs/manpages.html
diff --git a/deps/openssl/openssl/doc/apps/dgst.pod b/deps/openssl/openssl/doc/apps/dgst.pod
index 9e15798d8279d1..b27bb946b1b2e3 100644
--- a/deps/openssl/openssl/doc/apps/dgst.pod
+++ b/deps/openssl/openssl/doc/apps/dgst.pod
@@ -13,7 +13,6 @@ B<openssl> B<dgst>
 [B<-hex>]
 [B<-binary>]
 [B<-r>]
-[B<-hmac arg>]
 [B<-non-fips-allow>]
 [B<-out filename>]
 [B<-sign filename>]
@@ -64,10 +63,6 @@ output the digest or signature in binary form.
 
 output the digest in the "coreutils" format used by programs like B<sha1sum>.
 
-=item B<-hmac arg>
-
-set the HMAC key to "arg".
-
 =item B<-non-fips-allow>
 
 Allow use of non FIPS digest when in FIPS mode.  This has no effect when not in
diff --git a/deps/openssl/openssl/doc/apps/genrsa.pod b/deps/openssl/openssl/doc/apps/genrsa.pod
index cb03d09b95eb64..3dc9870f34b96a 100644
--- a/deps/openssl/openssl/doc/apps/genrsa.pod
+++ b/deps/openssl/openssl/doc/apps/genrsa.pod
@@ -10,12 +10,6 @@ B<openssl> B<genrsa>
 [B<-out filename>]
 [B<-passout arg>]
 [B<-aes128>]
-[B<-aes128>]
-[B<-aes192>]
-[B<-aes256>]
-[B<-camellia128>]
-[B<-camellia192>]
-[B<-camellia256>]
 [B<-aes192>]
 [B<-aes256>]
 [B<-camellia128>]
diff --git a/deps/openssl/openssl/doc/apps/pkcs12.pod b/deps/openssl/openssl/doc/apps/pkcs12.pod
index 8e0d91798ac437..744984838dc7c2 100644
--- a/deps/openssl/openssl/doc/apps/pkcs12.pod
+++ b/deps/openssl/openssl/doc/apps/pkcs12.pod
@@ -216,7 +216,7 @@ key is encrypted using triple DES and the certificate using 40 bit RC2.
 
 these options allow the algorithm used to encrypt the private key and
 certificates to be selected. Any PKCS#5 v1.5 or PKCS#12 PBE algorithm name
-can be used (see B<NOTES> section for more information). If a a cipher name
+can be used (see B<NOTES> section for more information). If a cipher name
 (as output by the B<list-cipher-algorithms> command is specified then it
 is used with PKCS#5 v2.0. For interoperability reasons it is advisable to only
 use PKCS#12 algorithms.
diff --git a/deps/openssl/openssl/doc/apps/req.pod b/deps/openssl/openssl/doc/apps/req.pod
index df68cb0921fda3..54a4d394d282f0 100644
--- a/deps/openssl/openssl/doc/apps/req.pod
+++ b/deps/openssl/openssl/doc/apps/req.pod
@@ -30,7 +30,6 @@ B<openssl> B<req>
 [B<-keygen_engine id>]
 [B<-[digest]>]
 [B<-config filename>]
-[B<-subj arg>]
 [B<-multivalue-rdn>]
 [B<-x509>]
 [B<-days n>]
@@ -490,7 +489,7 @@ be input by calling it "1.organizationName".
 The actual permitted field names are any object identifier short or
 long names. These are compiled into OpenSSL and include the usual
 values such as commonName, countryName, localityName, organizationName,
-organizationUnitName, stateOrProvinceName. Additionally emailAddress
+organizationalUnitName, stateOrProvinceName. Additionally emailAddress
 is include as well as name, surname, givenName initials and dnQualifier.
 
 Additional object identifiers can be defined with the B<oid_file> or
@@ -506,16 +505,16 @@ Examine and verify certificate request:
 
 Create a private key and then generate a certificate request from it:
 
- openssl genrsa -out key.pem 1024
+ openssl genrsa -out key.pem 2048
  openssl req -new -key key.pem -out req.pem
 
 The same but just using req:
 
- openssl req -newkey rsa:1024 -keyout key.pem -out req.pem
+ openssl req -newkey rsa:2048 -keyout key.pem -out req.pem
 
 Generate a self signed root certificate:
 
- openssl req -x509 -newkey rsa:1024 -keyout key.pem -out req.pem
+ openssl req -x509 -newkey rsa:2048 -keyout key.pem -out req.pem
 
 Example of a file pointed to by the B<oid_file> option:
 
@@ -531,7 +530,7 @@ expansion:
 Sample configuration file prompting for field values:
 
  [ req ]
- default_bits		= 1024
+ default_bits		= 2048
  default_keyfile 	= privkey.pem
  distinguished_name	= req_distinguished_name
  attributes		= req_attributes
@@ -572,7 +571,7 @@ Sample configuration containing all field values:
  RANDFILE		= $ENV::HOME/.rnd
 
  [ req ]
- default_bits		= 1024
+ default_bits		= 2048
  default_keyfile 	= keyfile.pem
  distinguished_name	= req_distinguished_name
  attributes		= req_attributes
diff --git a/deps/openssl/openssl/doc/apps/x509.pod b/deps/openssl/openssl/doc/apps/x509.pod
index a1326edeefb6f3..26f71c88329500 100644
--- a/deps/openssl/openssl/doc/apps/x509.pod
+++ b/deps/openssl/openssl/doc/apps/x509.pod
@@ -539,7 +539,8 @@ very rare and their use is discouraged). The options ending in
 "space" additionally place a space after the separator to make it
 more readable. The B<sep_multiline> uses a linefeed character for
 the RDN separator and a spaced B<+> for the AVA separator. It also
-indents the fields by four characters.
+indents the fields by four characters. If no field separator is specified
+then B<sep_comma_plus_space> is used by default.
 
 =item B<dn_rev>
 
diff --git a/deps/openssl/openssl/doc/crypto/BIO_read.pod b/deps/openssl/openssl/doc/crypto/BIO_read.pod
index b34528104ddf24..2c177f0b6d86d5 100644
--- a/deps/openssl/openssl/doc/crypto/BIO_read.pod
+++ b/deps/openssl/openssl/doc/crypto/BIO_read.pod
@@ -9,9 +9,9 @@ BIO_read, BIO_write, BIO_gets, BIO_puts - BIO I/O functions
  #include <openssl/bio.h>
 
  int	BIO_read(BIO *b, void *buf, int len);
- int	BIO_gets(BIO *b,char *buf, int size);
+ int	BIO_gets(BIO *b, char *buf, int size);
  int	BIO_write(BIO *b, const void *buf, int len);
- int	BIO_puts(BIO *b,const char *buf);
+ int	BIO_puts(BIO *b, const char *buf);
 
 =head1 DESCRIPTION
 
@@ -26,7 +26,7 @@ return the digest and other BIOs may not support BIO_gets() at all.
 
 BIO_write() attempts to write B<len> bytes from B<buf> to BIO B<b>.
 
-BIO_puts() attempts to write a null terminated string B<buf> to BIO B<b>
+BIO_puts() attempts to write a null terminated string B<buf> to BIO B<b>.
 
 =head1 RETURN VALUES
 
diff --git a/deps/openssl/openssl/doc/crypto/BN_rand.pod b/deps/openssl/openssl/doc/crypto/BN_rand.pod
index bd6bc8632394ed..e8cbf658b47d81 100644
--- a/deps/openssl/openssl/doc/crypto/BN_rand.pod
+++ b/deps/openssl/openssl/doc/crypto/BN_rand.pod
@@ -19,7 +19,7 @@ BN_rand, BN_pseudo_rand, BN_rand_range, BN_pseudo_rand_range - generate pseudo-r
 =head1 DESCRIPTION
 
 BN_rand() generates a cryptographically strong pseudo-random number of
-B<bits> bits in length and stores it in B<rnd>. If B<top> is -1, the
+B<bits> in length and stores it in B<rnd>. If B<top> is -1, the
 most significant bit of the random number can be zero. If B<top> is 0,
 it is set to 1, and if B<top> is 1, the two most significant bits of
 the number will be set to 1, so that the product of two such random
@@ -33,7 +33,7 @@ non-cryptographic purposes and for certain purposes in cryptographic
 protocols, but usually not for key generation etc.
 
 BN_rand_range() generates a cryptographically strong pseudo-random
-number B<rnd> in the range 0 <lt>= B<rnd> E<lt> B<range>.
+number B<rnd> in the range 0 E<lt>= B<rnd> E<lt> B<range>.
 BN_pseudo_rand_range() does the same, but is based on BN_pseudo_rand(),
 and hence numbers generated by it are not necessarily unpredictable.
 
diff --git a/deps/openssl/openssl/doc/crypto/DSA_generate_parameters.pod b/deps/openssl/openssl/doc/crypto/DSA_generate_parameters.pod
index 16a67f22b0c423..b1a4d201b75cd1 100644
--- a/deps/openssl/openssl/doc/crypto/DSA_generate_parameters.pod
+++ b/deps/openssl/openssl/doc/crypto/DSA_generate_parameters.pod
@@ -29,7 +29,7 @@ maximum of 1024 bits.
 If B<seed> is B<NULL> or B<seed_len> E<lt> 20, the primes will be
 generated at random. Otherwise, the seed is used to generate
 them. If the given seed does not yield a prime q, a new random
-seed is chosen and placed at B<seed>.
+seed is chosen.
 
 DSA_generate_parameters_ex() places the iteration count in
 *B<counter_ret> and a counter used for finding a generator in
diff --git a/deps/openssl/openssl/doc/crypto/EC_GROUP_copy.pod b/deps/openssl/openssl/doc/crypto/EC_GROUP_copy.pod
index 954af469d5aa8c..49dc01ced14788 100644
--- a/deps/openssl/openssl/doc/crypto/EC_GROUP_copy.pod
+++ b/deps/openssl/openssl/doc/crypto/EC_GROUP_copy.pod
@@ -158,7 +158,7 @@ EC_GROUP_get0_seed returns a pointer to the seed that was used to generate the p
 specified. EC_GROUP_get_seed_len returns the length of the seed or 0 if the seed is not specified.
 
 EC_GROUP_set_seed returns the length of the seed that has been set. If the supplied seed is NULL, or the supplied seed length is
-0, the the return value will be 1. On error 0 is returned.
+0, the return value will be 1. On error 0 is returned.
 
 EC_GROUP_cmp returns 0 if the curves are equal, 1 if they are not equal, or -1 on error.
 
diff --git a/deps/openssl/openssl/doc/crypto/EC_KEY_new.pod b/deps/openssl/openssl/doc/crypto/EC_KEY_new.pod
index e859689bcb5079..0fa2de1721b727 100644
--- a/deps/openssl/openssl/doc/crypto/EC_KEY_new.pod
+++ b/deps/openssl/openssl/doc/crypto/EC_KEY_new.pod
@@ -70,8 +70,8 @@ The functions EC_KEY_get0_group, EC_KEY_set_group, EC_KEY_get0_private_key, EC_K
 The functions EC_KEY_get_conv_form and EC_KEY_set_conv_form get and set the point_conversion_form for the B<key>. For a description
 of point_conversion_forms please refer to L<EC_POINT_new(3)|EC_POINT_new(3)>.
 
-EC_KEY_insert_key_method_data and EC_KEY_get_key_method_data enable the caller to associate arbitary additional data specific to the
-elliptic curve scheme being used with the EC_KEY object. This data is treated as a "black box" by the ec library. The data to be stored by EC_KEY_insert_key_method_data is provided in the B<data> parameter, which must have have associated functions for duplicating, freeing and "clear_freeing" the data item. If a subsequent EC_KEY_get_key_method_data call is issued, the functions for duplicating, freeing and "clear_freeing" the data item must be provided again, and they must be the same as they were when the data item was inserted.
+EC_KEY_insert_key_method_data and EC_KEY_get_key_method_data enable the caller to associate arbitrary additional data specific to the
+elliptic curve scheme being used with the EC_KEY object. This data is treated as a "black box" by the ec library. The data to be stored by EC_KEY_insert_key_method_data is provided in the B<data> parameter, which must have associated functions for duplicating, freeing and "clear_freeing" the data item. If a subsequent EC_KEY_get_key_method_data call is issued, the functions for duplicating, freeing and "clear_freeing" the data item must be provided again, and they must be the same as they were when the data item was inserted.
 
 EC_KEY_set_flags sets the flags in the B<flags> parameter on the EC_KEY object. Any flags that are already set are left set. The currently defined standard flags are EC_FLAG_NON_FIPS_ALLOW and EC_FLAG_FIPS_CHECKED. In addition there is the flag EC_FLAG_COFACTOR_ECDH which is specific to ECDH and is defined in ecdh.h. EC_KEY_get_flags returns the current flags that are set for this EC_KEY. EC_KEY_clear_flags clears the flags indicated by the B<flags> parameter. All other flags are left in their existing state.
 
diff --git a/deps/openssl/openssl/doc/crypto/EVP_DigestVerifyInit.pod b/deps/openssl/openssl/doc/crypto/EVP_DigestVerifyInit.pod
index e0217e40cba8d2..0ead2d2f8aa185 100644
--- a/deps/openssl/openssl/doc/crypto/EVP_DigestVerifyInit.pod
+++ b/deps/openssl/openssl/doc/crypto/EVP_DigestVerifyInit.pod
@@ -37,10 +37,11 @@ EVP_DigestVerifyInit() and EVP_DigestVerifyUpdate() return 1 for success and 0
 or a negative value for failure. In particular a return value of -2 indicates
 the operation is not supported by the public key algorithm.
 
-Unlike other functions the return value 0 from EVP_DigestVerifyFinal() only
-indicates that the signature did not verify successfully (that is tbs did
-not match the original data or the signature was of invalid form) it is not an
-indication of a more serious error.
+EVP_DigestVerifyFinal() returns 1 for success; any other value indicates
+failure.  A return value of zero indicates that the signature did not verify
+successfully (that is, tbs did not match the original data or the signature had
+an invalid form), while other values indicate a more serious error (and
+sometimes also indicate an invalid signature form).
 
 The error codes can be obtained from L<ERR_get_error(3)|ERR_get_error(3)>.
 
diff --git a/deps/openssl/openssl/doc/crypto/EVP_EncryptInit.pod b/deps/openssl/openssl/doc/crypto/EVP_EncryptInit.pod
index fb6036f959ba0c..c69e6a6d700e4e 100644
--- a/deps/openssl/openssl/doc/crypto/EVP_EncryptInit.pod
+++ b/deps/openssl/openssl/doc/crypto/EVP_EncryptInit.pod
@@ -111,7 +111,7 @@ EVP_CIPHER_CTX_init() initializes cipher contex B<ctx>.
 EVP_EncryptInit_ex() sets up cipher context B<ctx> for encryption
 with cipher B<type> from ENGINE B<impl>. B<ctx> must be initialized
 before calling this function. B<type> is normally supplied
-by a function such as EVP_des_cbc(). If B<impl> is NULL then the
+by a function such as EVP_aes_256_cbc(). If B<impl> is NULL then the
 default implementation is used. B<key> is the symmetric key to use
 and B<iv> is the IV to use (if necessary), the actual number of bytes
 used for the key and IV depends on the cipher. It is possible to set
diff --git a/deps/openssl/openssl/doc/crypto/EVP_SealInit.pod b/deps/openssl/openssl/doc/crypto/EVP_SealInit.pod
index 7d793e19ef7a13..19112a542d8925 100644
--- a/deps/openssl/openssl/doc/crypto/EVP_SealInit.pod
+++ b/deps/openssl/openssl/doc/crypto/EVP_SealInit.pod
@@ -25,7 +25,7 @@ encrypted using this key.
 
 EVP_SealInit() initializes a cipher context B<ctx> for encryption
 with cipher B<type> using a random secret key and IV. B<type> is normally
-supplied by a function such as EVP_des_cbc(). The secret key is encrypted
+supplied by a function such as EVP_aes_256_cbc(). The secret key is encrypted
 using one or more public keys, this allows the same encrypted data to be
 decrypted using any of the corresponding private keys. B<ek> is an array of
 buffers where the public key encrypted secret key will be written, each buffer
diff --git a/deps/openssl/openssl/doc/crypto/EVP_SignInit.pod b/deps/openssl/openssl/doc/crypto/EVP_SignInit.pod
index 14ecc775af6a7e..c63d6b339318cb 100644
--- a/deps/openssl/openssl/doc/crypto/EVP_SignInit.pod
+++ b/deps/openssl/openssl/doc/crypto/EVP_SignInit.pod
@@ -2,7 +2,8 @@
 
 =head1 NAME
 
-EVP_SignInit, EVP_SignUpdate, EVP_SignFinal - EVP signing functions
+EVP_SignInit, EVP_SignInit_ex, EVP_SignUpdate, EVP_SignFinal - EVP signing
+functions
 
 =head1 SYNOPSIS
 
diff --git a/deps/openssl/openssl/doc/crypto/X509_check_host.pod b/deps/openssl/openssl/doc/crypto/X509_check_host.pod
index 0def17aac1c54a..521b9f535c7b2e 100644
--- a/deps/openssl/openssl/doc/crypto/X509_check_host.pod
+++ b/deps/openssl/openssl/doc/crypto/X509_check_host.pod
@@ -135,6 +135,6 @@ L<X509_VERIFY_PARAM_set1_ipasc(3)|X509_VERIFY_PARAM_set1_ipasc(3)>
 
 =head1 HISTORY
 
-These functions were added in OpenSSL 1.1.0.
+These functions were added in OpenSSL 1.0.2.
 
 =cut
diff --git a/deps/openssl/openssl/doc/crypto/buffer.pod b/deps/openssl/openssl/doc/crypto/buffer.pod
index 781f5b11ee546e..52c5c841eb036b 100644
--- a/deps/openssl/openssl/doc/crypto/buffer.pod
+++ b/deps/openssl/openssl/doc/crypto/buffer.pod
@@ -2,8 +2,11 @@
 
 =head1 NAME
 
-BUF_MEM_new, BUF_MEM_free, BUF_MEM_grow, BUF_strdup - simple
-character arrays structure
+BUF_MEM_new, BUF_MEM_new_ex, BUF_MEM_free, BUF_MEM_grow - simple
+character array structure
+
+BUF_strdup, BUF_strndup, BUF_memdup, BUF_strlcpy, BUF_strlcat -
+standard C library equivalents
 
 =head1 SYNOPSIS
 
@@ -15,25 +18,22 @@ character arrays structure
 
  int	BUF_MEM_grow(BUF_MEM *str, int len);
 
- char *	BUF_strdup(const char *str);
+ char *BUF_strdup(const char *str);
 
-=head1 DESCRIPTION
+ char *BUF_strndup(const char *str, size_t siz);
 
-The buffer library handles simple character arrays. Buffers are used for
-various purposes in the library, most notably memory BIOs.
+ void *BUF_memdup(const void *data, size_t siz);
+
+ size_t BUF_strlcpy(char *dst, const char *src, size_t size);
 
-The library uses the BUF_MEM structure defined in buffer.h:
+ size_t BUF_strlcat(char *dst, const char *src, size_t size);
 
- typedef struct buf_mem_st
- {
-        int length;     /* current number of bytes */
-        char *data;
-        int max;        /* size of buffer */
- } BUF_MEM;
+ size_t BUF_strnlen(const char *str, size_t maxlen);
 
-B<length> is the current size of the buffer in bytes, B<max> is the amount of
-memory allocated to the buffer. There are three functions which handle these
-and one "miscellaneous" function.
+=head1 DESCRIPTION
+
+The buffer library handles simple character arrays. Buffers are used for
+various purposes in the library, most notably memory BIOs.
 
 BUF_MEM_new() allocates a new buffer of zero size.
 
@@ -44,14 +44,17 @@ BUF_MEM_grow() changes the size of an already existing buffer to
 B<len>. Any data already in the buffer is preserved if it increases in
 size.
 
-BUF_strdup() copies a null terminated string into a block of allocated
-memory and returns a pointer to the allocated block.
-Unlike the standard C library strdup() this function uses OPENSSL_malloc() and so
-should be used in preference to the standard library strdup() because it can
-be used for memory leak checking or replacing the malloc() function.
+BUF_strdup(), BUF_strndup(), BUF_memdup(), BUF_strlcpy(),
+BUF_strlcat() and BUF_strnlen are equivalents of the standard C
+library functions. The dup() functions use OPENSSL_malloc() underneath
+and so should be used in preference to the standard library for memory
+leak checking or replacing the malloc() function.
+
+Memory allocated from these functions should be freed up using the
+OPENSSL_free() function.
 
-The memory allocated from BUF_strdup() should be freed up using the OPENSSL_free()
-function.
+BUF_strndup makes the explicit guarantee that it will never read past
+the first B<siz> bytes of B<str>.
 
 =head1 RETURN VALUES
 
diff --git a/deps/openssl/openssl/doc/crypto/d2i_X509_NAME.pod b/deps/openssl/openssl/doc/crypto/d2i_X509_NAME.pod
index 343ffe1519148b..b025de7b2ff630 100644
--- a/deps/openssl/openssl/doc/crypto/d2i_X509_NAME.pod
+++ b/deps/openssl/openssl/doc/crypto/d2i_X509_NAME.pod
@@ -14,7 +14,7 @@ d2i_X509_NAME, i2d_X509_NAME - X509_NAME encoding functions
 =head1 DESCRIPTION
 
 These functions decode and encode an B<X509_NAME> structure which is the
-the same as the B<Name> type defined in RFC2459 (and elsewhere) and used
+same as the B<Name> type defined in RFC2459 (and elsewhere) and used
 for example in certificate subject and issuer names.
 
 Othewise the functions behave in a similar way to d2i_X509() and i2d_X509()
diff --git a/deps/openssl/openssl/doc/crypto/engine.pod b/deps/openssl/openssl/doc/crypto/engine.pod
index f5ab1c3e50fd73..48741ee3062979 100644
--- a/deps/openssl/openssl/doc/crypto/engine.pod
+++ b/deps/openssl/openssl/doc/crypto/engine.pod
@@ -192,7 +192,7 @@ to use the pointer value at all, as this kind of reference is a guarantee
 that the structure can not be deallocated until the reference is released.
 
 However, a structural reference provides no guarantee that the ENGINE is
-initiliased and able to use any of its cryptographic
+initialised and able to use any of its cryptographic
 implementations. Indeed it's quite possible that most ENGINEs will not
 initialise at all in typical environments, as ENGINEs are typically used to
 support specialised hardware. To use an ENGINE's functionality, you need a
@@ -201,8 +201,8 @@ specialised form of structural reference, because each functional reference
 implicitly contains a structural reference as well - however to avoid
 difficult-to-find programming bugs, it is recommended to treat the two
 kinds of reference independently. If you have a functional reference to an
-ENGINE, you have a guarantee that the ENGINE has been initialised ready to
-perform cryptographic operations and will remain uninitialised
+ENGINE, you have a guarantee that the ENGINE has been initialised and
+is ready to perform cryptographic operations, and will remain initialised
 until after you have released your reference.
 
 I<Structural references>
@@ -370,7 +370,7 @@ I<Using a specific ENGINE implementation>
 Here we'll assume an application has been configured by its user or admin
 to want to use the "ACME" ENGINE if it is available in the version of
 OpenSSL the application was compiled with. If it is available, it should be
-used by default for all RSA, DSA, and symmetric cipher operation, otherwise
+used by default for all RSA, DSA, and symmetric cipher operations, otherwise
 OpenSSL should use its builtin software as per usual. The following code
 illustrates how to approach this;
 
@@ -401,7 +401,7 @@ I<Automatically using builtin ENGINE implementations>
 
 Here we'll assume we want to load and register all ENGINE implementations
 bundled with OpenSSL, such that for any cryptographic algorithm required by
-OpenSSL - if there is an ENGINE that implements it and can be initialise,
+OpenSSL - if there is an ENGINE that implements it and can be initialised,
 it should be used. The following code illustrates how this can work;
 
  /* Load all bundled ENGINEs into memory and make them visible */
diff --git a/deps/openssl/openssl/doc/dir-locals.example.el b/deps/openssl/openssl/doc/dir-locals.example.el
new file mode 100644
index 00000000000000..79d0b01108d421
--- /dev/null
+++ b/deps/openssl/openssl/doc/dir-locals.example.el
@@ -0,0 +1,15 @@
+;;; This is an example of what a .dir-locals.el suitable for OpenSSL
+;;; development could look like.
+;;;
+;;; Apart from setting the CC mode style to "OpenSSL-II", it also
+;;; makes sure that tabs are never used for indentation in any file,
+;;; and that the fill column is 78.
+;;;
+;;; For more information see (info "(emacs) Directory Variables")
+
+((nil
+  (indent-tabs-mode . nil)
+  (fill-column . 78)
+  )
+ (c-mode
+  (c-file-style . "OpenSSL-II")))
diff --git a/deps/openssl/openssl/doc/openssl-c-indent.el b/deps/openssl/openssl/doc/openssl-c-indent.el
new file mode 100644
index 00000000000000..144a915675ed1f
--- /dev/null
+++ b/deps/openssl/openssl/doc/openssl-c-indent.el
@@ -0,0 +1,62 @@
+;;; This Emacs Lisp file defines a C indentation style for OpenSSL.
+;;;
+;;; This definition is for the "CC mode" package, which is the default
+;;; mode for editing C source files in Emacs 20, not for the older
+;;; c-mode.el (which was the default in less recent releaes of Emacs 19).
+;;;
+;;; Recommended use is to add this line in your .emacs:
+;;;
+;;;   (load (expand-file-name "~/PATH/TO/openssl-c-indent.el"))
+;;;
+;;; To activate this indentation style, visit a C file, type
+;;; M-x c-set-style <RET> (or C-c . for short), and enter "eay".
+;;; To toggle the auto-newline feature of CC mode, type C-c C-a.
+;;;
+;;; If you're a OpenSSL developer, you might find it more comfortable
+;;; to have this style be permanent in your OpenSSL development
+;;; directory.  To have that, please perform this:
+;;;
+;;;    M-x add-dir-local-variable <RET> c-mode <RET> c-file-style <RET>
+;;;    "OpenSSL-II" <RET>
+;;;
+;;; A new buffer with .dir-locals.el will appear.  Save it (C-x C-s).
+;;;
+;;; Alternatively, have a look at dir-locals.example.el
+
+;;; For suggesting improvements, please send e-mail to levitte@openssl.org.
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Note, it could be easy to inherit from the "gnu" style...  however,
+;; one never knows if that style will change somewhere in the future,
+;; so I've chosen to copy the "gnu" style values explicitely instead
+;; and mark them with a comment.                // RLevitte 2015-08-31
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(c-add-style "OpenSSL-II"
+             '((c-basic-offset . 4)
+               (indent-tabs-mode . nil)
+               (fill-column . 78)
+               (comment-column . 33)
+               (c-comment-only-line-offset 0 . 0)            ; From "gnu" style
+               (c-hanging-braces-alist                       ; From "gnu" style
+                (substatement-open before after)             ; From "gnu" style
+                (arglist-cont-nonempty))                     ; From "gnu" style
+               (c-offsets-alist
+                (statement-block-intro . +)                  ; From "gnu" style
+                (knr-argdecl-intro . 0)
+                (knr-argdecl . 0)
+                (substatement-open . +)                      ; From "gnu" style
+                (substatement-label . 0)                     ; From "gnu" style
+                (label . 1)
+                (statement-case-open . +)                    ; From "gnu" style
+                (statement-cont . +)                         ; From "gnu" style
+                (arglist-intro . c-lineup-arglist-intro-after-paren) ; From "gnu" style
+                (arglist-close . c-lineup-arglist)           ; From "gnu" style
+                (inline-open . 0)                            ; From "gnu" style
+                (brace-list-open . +)                        ; From "gnu" style
+                (topmost-intro-cont first c-lineup-topmost-intro-cont
+                                    c-lineup-gnu-DEFUN-intro-cont) ; From "gnu" style
+                )
+               (c-special-indent-hook . c-gnu-impose-minimum) ; From "gnu" style
+               (c-block-comment-prefix . "* ")
+               ))
diff --git a/deps/openssl/openssl/doc/openssl_button.gif b/deps/openssl/openssl/doc/openssl_button.gif
deleted file mode 100644
index 3d3c90c9f849929d0b26bed710e00f3f6f4f88cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2063
zcmY*Udt8!f7XH2uL_kzTR8nXVZ>X3kqnV{53OK2G!7*&LBo(!+RmTb&a{zDPWyCZQ
ztx+d$>r94IyS6)4sCjFxG1D$?`9r#xW6jps#osg|`!WCR`QG!L=bYy`=e#ffGhWaR
zkr?m=766kOjYf?|Gcz-z5yMfe5yOWCCo`rZOu@tq%ot%Th5?+-z>+_si7;g*gJrP9
zXoP!A4u2ZcT(~HPD=;={;0Y!)1F!%w0Epo~yvfwdG6i@aO9KEfHkk%?z~o{UJOobR
zO)vvD{hv8++Vel-Q3Xdtg+&6<@vK5>a#o?=Ha`)-FzHOMWTQ6O()=ifWBpWD;dEYb
z`)ps)ZwwNWJZANIJ`Uxy`;dA!4u|?~U;b4B77CZ?z8-R_94g&LLMt3VD-isO<BtWo
z2vCXekASRfBM}ymwWS5Yf^*6<AQgvlFwe<FcxI%T(LGBY%n*Kb1~kC%>(5|-=9v}k
zJI$L54j`<sWNc|o^9)vL<p`-Ff)QuhEJ=h%9L!(yk_%4eb-h4bxcJN=?|Fe*4Xqcn
zyx(|>LnxJX2;5T)Rhtf8&$$B$_pzmo;n8?Y`$wOatMHs^V%iNfaGqP^#FD=h+H_4c
zI7S>zT5WKhZgh()e5pu~^6Mw^mR!5OSlPVwO=vOJa$io)Y$*HGL@tJ12MSO}JN`*s
zXlmUd#86cN8JWDjaIx<Ji@A0`v;y~ihjYY4q9yJ{=exV#UcjCB-Tt@1Ug{qAO1!Rn
zw~PZ+^d{r_@XZ{y9AfQvBR#2>xBHqOsx1!C7gTS#Hr2tLeR!HM?6|QIRj8JY$`^yC
ze?jVRqQJK6@ysXY<5npU>H9T*_Lwhr2E9FbiV^;Tcu}xGD;k}aTkOe1cAP_gBpyQ(
zrdB!K!^Ix%zWpas1~X&S^oL^yjHTTr@0kK|(oe*dg!4PML?k632rct*IhHMra?DL+
z$5%+NXI1hq6NJ=6hsB5{DQk1b8R0=i=kl4LBU1@{M~|=9d5+#aQ+#EStCkHFj2~0h
z`p>yMfxyQRQg?*iJV0qf10cx9iYh)&kEa5VnSwupGPpI<s)geXXUN_J<~=fV^o^PA
zqH{(a0jKM(14xh7rKiRCiP0nRod?-;M&B1^q2eY4pNxya?@f7gL&OU~NIZ}(lP}lf
zSP{t4TDRO_yeu@54v;8k(ISl(y{LzCu8+(Xg5c%EG7z2*VFSn=I#M%Nb<+xk%+D76
zJ0>vZz<`~uysMr$nARhmwigP{Ef=?ej2JG6$iTat_0HA@@E}ZH1N%_3D_(}U&UQ%k
zG7kQF-Wymfw!ynpA5UVqwE8oT1~wSHBg4?1vr>;Q<<2@#YZ!HMa==M}E!S(`n}K_o
z8U0@7Ee$*{*;O|)Zg*HOb>>guM~+*-*R+w9j8F(mA=A&uUUc_MfWzfJ-RRjf@1ATe
z!e#!n3;Ki1N4&**s@b-7SJ?<_?X)}P2+v2FCx}jew?H`C`|e(<Qv)G(RrYwPgeJS%
zUgkWK6#0O*I{69zqsHg>{i6G^T$yC$!iS}j4@VMX!($~>XSwxeM`Be(j>Hi5s_7rg
zfj-?yPiuUwB;|^Xt@@>q?pGgHI;wsdI=!_=baHiXT1jxTK_|1TdD=8(PTmYzX{@i~
zuWVDNB4a6C$lZ5c%0YC?Ry#-YC^y4+n$5+Nl))d#r?&dJ3}?L(qvuAb*kkr@LpPbf
z#)TKL8`bl%cg4d=`9iTqBJ!ypT=TJ?wWDN@4DcEIM=ymBMrko@{ld9nDGnIVu|17*
zrm++<oaZc;uITjW-KC6lpTl-)X|nrwYAq#-GDPjHJprXZ5UH)P3DWw<W*PVz(ta>7
zUP^gM1t}7oS0A_XHc=1tvd5ISX;$CVxmi-0q#);oRN{GqhXvWxVK%Z2d4me-_Uum%
zl%jR2+)7nNzd}}-!}SJ<`CRN~Z(ByZ&VOhN+KjxZZOeGOOq$f!Nr+Siji`72<Mmi*
zwch@9oi#!>$7{%RA&t)K>jXR4o>AwkMWl3=dY(I?3J3l3*dWq-Y#=dTO44?m{(+t{
z47K1+4fX_KW+zmx+Dp8HhoQKHTGy;ji`4G^s=^0VUI$eZL^@DXIA_O{p9e>$ZpJIG
z?7`Fn4!kry<ni6N-ag^c`a5&BP90oqlt7vjzJ{G!j<I~$PzC;O0M;0~qd#v{L_4k%
zF7;PHne%Ah8;Bb7%StHJvtIrwt>Qn!<<J&`GH&E1E?H3l1jcWBL&vo^Fw49lCMXPP
zw6cj3xTnx-5s?XP<$uW<-bXcF;}A!v(kneNkC&D7XDWZQ2YisM1j1B}xUmPhw_E>i
zmiRLbwAHQp(KBq#GuP2bJw~%ppmUK-9^0$G1u!xu|E5A^H!dDB);6erC<UF>JJ76`
z0hYq4%huS9mR)3<sv#`3)$C2#F1qw`sKk)vjim*bMq$H%M&f_zI#o&X&fuVX*&oss
znRUtdldi7_*231z6GKWGMVXtthPpS<<Jz7!QdX=mJ7^bJDSC^MJb#h$s`WXm@``5^
zGDR=Go1Jp9%lZ;ezBnKF?qOwmdUjVp+Y(+ed7HksXtrYDaZmJPx2IKMzA5#KhMu&K
zsoQ@%VBvdQsZHDXr0K)q%rWaz|7uHn-4h%7EQIsuN_2bu@QG^+w=R|{0bu9<0F!lI
ARR910

diff --git a/deps/openssl/openssl/doc/openssl_button.html b/deps/openssl/openssl/doc/openssl_button.html
deleted file mode 100644
index 44c91bd3d0683e..00000000000000
--- a/deps/openssl/openssl/doc/openssl_button.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<!-- the `Includes OpenSSL Cryptogaphy Software' button      -->
-<!-- freely usable by any application linked against OpenSSL -->
-<a   href="http://www.openssl.org/">
-<img src="openssl_button.gif" 
-     width=102 height=47 border=0></a>
-
diff --git a/deps/openssl/openssl/doc/ssl/SSL_CTX_add_extra_chain_cert.pod b/deps/openssl/openssl/doc/ssl/SSL_CTX_add_extra_chain_cert.pod
index 8e832a57eaace8..04300fbe6f3ff0 100644
--- a/deps/openssl/openssl/doc/ssl/SSL_CTX_add_extra_chain_cert.pod
+++ b/deps/openssl/openssl/doc/ssl/SSL_CTX_add_extra_chain_cert.pod
@@ -2,29 +2,39 @@
 
 =head1 NAME
 
-SSL_CTX_add_extra_chain_cert - add certificate to chain
+SSL_CTX_add_extra_chain_cert, SSL_CTX_clear_extra_chain_certs - add or clear
+extra chain certificates
 
 =head1 SYNOPSIS
 
  #include <openssl/ssl.h>
 
- long SSL_CTX_add_extra_chain_cert(SSL_CTX ctx, X509 *x509)
+ long SSL_CTX_add_extra_chain_cert(SSL_CTX *ctx, X509 *x509);
+ long SSL_CTX_clear_extra_chain_certs(SSL_CTX *ctx);
 
 =head1 DESCRIPTION
 
-SSL_CTX_add_extra_chain_cert() adds the certificate B<x509> to the certificate
-chain presented together with the certificate. Several certificates
-can be added one after the other.
+SSL_CTX_add_extra_chain_cert() adds the certificate B<x509> to the extra chain
+certificates associated with B<ctx>. Several certificates can be added one
+after another.
+
+SSL_CTX_clear_extra_chain_certs() clears all extra chain certificates
+associated with B<ctx>.
+
+These functions are implemented as macros.
 
 =head1 NOTES
 
-When constructing the certificate chain, the chain will be formed from
-these certificates explicitly specified. If no chain is specified,
-the library will try to complete the chain from the available CA
-certificates in the trusted CA storage, see
+When sending a certificate chain, extra chain certificates are sent in order
+following the end entity certificate.
+
+If no chain is specified, the library will try to complete the chain from the
+available CA certificates in the trusted CA storage, see
 L<SSL_CTX_load_verify_locations(3)|SSL_CTX_load_verify_locations(3)>.
 
-The B<x509> certificate provided to SSL_CTX_add_extra_chain_cert() will be freed by the library when the B<SSL_CTX> is destroyed. An application B<should not> free the B<x509> object.
+The B<x509> certificate provided to SSL_CTX_add_extra_chain_cert() will be
+freed by the library when the B<SSL_CTX> is destroyed. An application
+B<should not> free the B<x509> object.
 
 =head1 RESTRICTIONS
 
@@ -37,8 +47,9 @@ be used instead.
 
 =head1 RETURN VALUES
 
-SSL_CTX_add_extra_chain_cert() returns 1 on success. Check out the
-error stack to find out the reason for failure otherwise.
+SSL_CTX_add_extra_chain_cert() and SSL_CTX_clear_extra_chain_certs() return
+1 on success and 0 for failure. Check out the error stack to find out the
+reason for failure.
 
 =head1 SEE ALSO
 
diff --git a/deps/openssl/openssl/doc/ssl/SSL_CTX_get0_param.pod b/deps/openssl/openssl/doc/ssl/SSL_CTX_get0_param.pod
index 332f181187a8f4..ba16b50f087994 100644
--- a/deps/openssl/openssl/doc/ssl/SSL_CTX_get0_param.pod
+++ b/deps/openssl/openssl/doc/ssl/SSL_CTX_get0_param.pod
@@ -34,7 +34,7 @@ them to suit its needs: for example to add a hostname check.
 Check hostname matches "www.foo.com" in peer certificate:
 
  X509_VERIFY_PARAM *vpm = SSL_get0_param(ssl);
- X509_VERIFY_PARAM_set1_host(vpm, "www.foo.com");
+ X509_VERIFY_PARAM_set1_host(vpm, "www.foo.com", 0);
 
 =head1 RETURN VALUES
 
diff --git a/deps/openssl/openssl/doc/ssl/SSL_check_chain.pod b/deps/openssl/openssl/doc/ssl/SSL_check_chain.pod
new file mode 100644
index 00000000000000..d3b7601909e40d
--- /dev/null
+++ b/deps/openssl/openssl/doc/ssl/SSL_check_chain.pod
@@ -0,0 +1,85 @@
+=pod
+
+=head1 NAME
+
+SSL_check_chain - check certificate chain suitability
+
+=head1 SYNOPSIS
+
+ #include <openssl/ssl.h>
+
+ int SSL_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain);
+
+=head1 DESCRIPTION
+
+SSL_check_chain() checks whether certificate B<x>, private key B<pk> and
+certificate chain B<chain> is suitable for use with the current session
+B<s>.
+
+=head1 RETURN VALUES
+
+SSL_check_chain() returns a bitmap of flags indicating the validity of the
+chain.
+
+B<CERT_PKEY_VALID>: the chain can be used with the current session.
+If this flag is B<not> set then the certificate will never be used even
+if the application tries to set it because it is inconsistent with the
+peer preferences.
+
+B<CERT_PKEY_SIGN>: the EE key can be used for signing.
+
+B<CERT_PKEY_EE_SIGNATURE>: the signature algorithm of the EE certificate is
+acceptable.
+
+B<CERT_PKEY_CA_SIGNATURE>: the signature algorithms of all CA certificates
+are acceptable.
+
+B<CERT_PKEY_EE_PARAM>: the parameters of the end entity certificate are
+acceptable (e.g. it is a supported curve).
+
+B<CERT_PKEY_CA_PARAM>: the parameters of all CA certificates are acceptable.
+
+B<CERT_PKEY_EXPLICIT_SIGN>: the end entity certificate algorithm
+can be used explicitly for signing (i.e. it is mentioned in the signature
+algorithms extension).
+
+B<CERT_PKEY_ISSUER_NAME>: the issuer name is acceptable. This is only
+meaningful for client authentication.
+
+B<CERT_PKEY_CERT_TYPE>: the certificate type is acceptable. Only meaningful
+for client authentication.
+
+B<CERT_PKEY_SUITEB>: chain is suitable for Suite B use.
+
+=head1 NOTES
+
+SSL_check_chain() must be called in servers after a client hello message or in
+clients after a certificate request message. It will typically be called
+in the certificate callback.
+
+An application wishing to support multiple certificate chains may call this
+function on each chain in turn: starting with the one it considers the
+most secure. It could then use the chain of the first set which returns
+suitable flags.
+
+As a minimum the flag B<CERT_PKEY_VALID> must be set for a chain to be
+usable. An application supporting multiple chains with different CA signature
+algorithms may also wish to check B<CERT_PKEY_CA_SIGNATURE> too. If no
+chain is suitable a server should fall back to the most secure chain which
+sets B<CERT_PKEY_VALID>.
+
+The validity of a chain is determined by checking if it matches a supported
+signature algorithm, supported curves and in the case of client authentication
+certificate types and issuer names.
+
+Since the supported signature algorithms extension is only used in TLS 1.2
+and DTLS 1.2 the results for earlier versions of TLS and DTLS may not be
+very useful. Applications may wish to specify a different "legacy" chain
+for earlier versions of TLS or DTLS.
+
+=head1 SEE ALSO
+
+L<SSL_CTX_set_cert_cb(3)|SSL_CTX_set_cert_cb(3)>,
+L<ssl(3)|ssl(3)>
+
+=cut
diff --git a/deps/openssl/openssl/e_os.h b/deps/openssl/openssl/e_os.h
index 45fef691a09411..1fa36c17198082 100644
--- a/deps/openssl/openssl/e_os.h
+++ b/deps/openssl/openssl/e_os.h
@@ -619,7 +619,7 @@ struct servent *PASCAL getservbyname(const char *, const char *);
 #    include <sys/select.h>
 #   endif
 
-#   if defined(sun)
+#   if defined(__sun) || defined(sun)
 #    include <sys/filio.h>
 #   else
 #    ifndef VMS
@@ -661,7 +661,7 @@ struct servent *PASCAL getservbyname(const char *, const char *);
 
 # endif
 
-# if defined(sun) && !defined(__svr4__) && !defined(__SVR4)
+# if (defined(__sun) || defined(sun)) && !defined(__svr4__) && !defined(__SVR4)
   /* include headers first, so our defines don't break it */
 #  include <stdlib.h>
 #  include <string.h>
diff --git a/deps/openssl/openssl/engines/e_chil.c b/deps/openssl/openssl/engines/e_chil.c
index 69d49d7d3a88bd..72d14fe383a4eb 100644
--- a/deps/openssl/openssl/engines/e_chil.c
+++ b/deps/openssl/openssl/engines/e_chil.c
@@ -839,6 +839,10 @@ static EVP_PKEY *hwcrhk_load_privkey(ENGINE *eng, const char *key_id,
     bn_fix_top(rtmp->n);
 
     res = EVP_PKEY_new();
+    if (res == NULL) {
+        HWCRHKerr(HWCRHK_F_HWCRHK_LOAD_PRIVKEY, HWCRHK_R_CHIL_ERROR);
+        goto err;
+    }
     EVP_PKEY_assign_RSA(res, rtmp);
 #  endif
 
diff --git a/deps/openssl/openssl/include/openssl/buffer.h b/deps/openssl/openssl/include/openssl/buffer.h
index c343dd772f1efb..efd240a5f91e25 100644
--- a/deps/openssl/openssl/include/openssl/buffer.h
+++ b/deps/openssl/openssl/include/openssl/buffer.h
@@ -86,7 +86,13 @@ int BUF_MEM_grow(BUF_MEM *str, size_t len);
 int BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
 size_t BUF_strnlen(const char *str, size_t maxlen);
 char *BUF_strdup(const char *str);
+
+/*
+ * Like strndup, but in addition, explicitly guarantees to never read past the
+ * first |siz| bytes of |str|.
+ */
 char *BUF_strndup(const char *str, size_t siz);
+
 void *BUF_memdup(const void *data, size_t siz);
 void BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz);
 
diff --git a/deps/openssl/openssl/include/openssl/dh.h b/deps/openssl/openssl/include/openssl/dh.h
index 0502f1a9cc14dc..b17767328183e0 100644
--- a/deps/openssl/openssl/include/openssl/dh.h
+++ b/deps/openssl/openssl/include/openssl/dh.h
@@ -142,7 +142,7 @@ struct dh_st {
     BIGNUM *p;
     BIGNUM *g;
     long length;                /* optional */
-    BIGNUM *pub_key;            /* g^x */
+    BIGNUM *pub_key;            /* g^x % p */
     BIGNUM *priv_key;           /* x */
     int flags;
     BN_MONT_CTX *method_mont_p;
diff --git a/deps/openssl/openssl/include/openssl/ec.h b/deps/openssl/openssl/include/openssl/ec.h
index 6d3178f609f493..81e6faf6c5c502 100644
--- a/deps/openssl/openssl/include/openssl/ec.h
+++ b/deps/openssl/openssl/include/openssl/ec.h
@@ -106,7 +106,7 @@ typedef enum {
         /** the point is encoded as z||x, where the octet z specifies
          *  which solution of the quadratic equation y is  */
     POINT_CONVERSION_COMPRESSED = 2,
-        /** the point is encoded as z||x||y, where z is the octet 0x02  */
+        /** the point is encoded as z||x||y, where z is the octet 0x04  */
     POINT_CONVERSION_UNCOMPRESSED = 4,
         /** the point is encoded as z||x||y, where the octet z specifies
          *  which solution of the quadratic equation y is  */
diff --git a/deps/openssl/openssl/include/openssl/ecdsa.h b/deps/openssl/openssl/include/openssl/ecdsa.h
index c4016ac3e19b3f..a6f0930f829ccc 100644
--- a/deps/openssl/openssl/include/openssl/ecdsa.h
+++ b/deps/openssl/openssl/include/openssl/ecdsa.h
@@ -233,7 +233,7 @@ void *ECDSA_get_ex_data(EC_KEY *d, int idx);
  *  \return pointer to a ECDSA_METHOD structure or NULL if an error occurred
  */
 
-ECDSA_METHOD *ECDSA_METHOD_new(ECDSA_METHOD *ecdsa_method);
+ECDSA_METHOD *ECDSA_METHOD_new(const ECDSA_METHOD *ecdsa_method);
 
 /** frees a ECDSA_METHOD structure
  *  \param  ecdsa_method  pointer to the ECDSA_METHOD structure
diff --git a/deps/openssl/openssl/include/openssl/opensslv.h b/deps/openssl/openssl/include/openssl/opensslv.h
index c06b13ac6b0f92..abcef15b17d943 100644
--- a/deps/openssl/openssl/include/openssl/opensslv.h
+++ b/deps/openssl/openssl/include/openssl/opensslv.h
@@ -30,11 +30,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x1000204fL
+# define OPENSSL_VERSION_NUMBER  0x1000205fL
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2d-fips 9 Jul 2015"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2e-fips 3 Dec 2015"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2d 9 Jul 2015"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2e 3 Dec 2015"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
diff --git a/deps/openssl/openssl/include/openssl/ssl.h b/deps/openssl/openssl/include/openssl/ssl.h
index 6fe1a2474d43a8..afec1f5bf29f69 100644
--- a/deps/openssl/openssl/include/openssl/ssl.h
+++ b/deps/openssl/openssl/include/openssl/ssl.h
@@ -2681,6 +2681,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC                 292
 # define SSL_F_SSL3_ENC                                   134
 # define SSL_F_SSL3_GENERATE_KEY_BLOCK                    238
+# define SSL_F_SSL3_GENERATE_MASTER_SECRET                388
 # define SSL_F_SSL3_GET_CERTIFICATE_REQUEST               135
 # define SSL_F_SSL3_GET_CERT_STATUS                       289
 # define SSL_F_SSL3_GET_CERT_VERIFY                       136
@@ -2846,8 +2847,11 @@ void ERR_load_SSL_strings(void);
 # define SSL_R_BAD_DATA_RETURNED_BY_CALLBACK              106
 # define SSL_R_BAD_DECOMPRESSION                          107
 # define SSL_R_BAD_DH_G_LENGTH                            108
+# define SSL_R_BAD_DH_G_VALUE                             375
 # define SSL_R_BAD_DH_PUB_KEY_LENGTH                      109
+# define SSL_R_BAD_DH_PUB_KEY_VALUE                       393
 # define SSL_R_BAD_DH_P_LENGTH                            110
+# define SSL_R_BAD_DH_P_VALUE                             395
 # define SSL_R_BAD_DIGEST_LENGTH                          111
 # define SSL_R_BAD_DSA_SIGNATURE                          112
 # define SSL_R_BAD_ECC_CERT                               304
diff --git a/deps/openssl/openssl/include/openssl/tls1.h b/deps/openssl/openssl/include/openssl/tls1.h
index 5929607ff8b6ef..7e237d0631a3c4 100644
--- a/deps/openssl/openssl/include/openssl/tls1.h
+++ b/deps/openssl/openssl/include/openssl/tls1.h
@@ -231,13 +231,12 @@ extern "C" {
 /* ExtensionType value from RFC5620 */
 # define TLSEXT_TYPE_heartbeat   15
 
-/* ExtensionType value from draft-ietf-tls-applayerprotoneg-00 */
+/* ExtensionType value from RFC7301 */
 # define TLSEXT_TYPE_application_layer_protocol_negotiation 16
 
 /*
  * ExtensionType value for TLS padding extension.
- * http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml
- * http://tools.ietf.org/html/draft-agl-tls-padding-03
+ * http://tools.ietf.org/html/draft-agl-tls-padding
  */
 # define TLSEXT_TYPE_padding     21
 
@@ -262,20 +261,19 @@ extern "C" {
 #  define TLSEXT_TYPE_next_proto_neg              13172
 # endif
 
-/* NameType value from RFC 3546 */
+/* NameType value from RFC3546 */
 # define TLSEXT_NAMETYPE_host_name 0
-/* status request value from RFC 3546 */
+/* status request value from RFC3546 */
 # define TLSEXT_STATUSTYPE_ocsp 1
 
-/* ECPointFormat values from draft-ietf-tls-ecc-12 */
+/* ECPointFormat values from RFC4492 */
 # define TLSEXT_ECPOINTFORMAT_first                      0
 # define TLSEXT_ECPOINTFORMAT_uncompressed               0
 # define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime  1
 # define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2  2
 # define TLSEXT_ECPOINTFORMAT_last                       2
 
-/* Signature and hash algorithms from RFC 5246 */
-
+/* Signature and hash algorithms from RFC5246 */
 # define TLSEXT_signature_anonymous                      0
 # define TLSEXT_signature_rsa                            1
 # define TLSEXT_signature_dsa                            2
@@ -430,7 +428,6 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
 # define TLS1_CK_DHE_DSS_WITH_RC4_128_SHA                0x03000066
 
 /* AES ciphersuites from RFC3268 */
-
 # define TLS1_CK_RSA_WITH_AES_128_SHA                    0x0300002F
 # define TLS1_CK_DH_DSS_WITH_AES_128_SHA                 0x03000030
 # define TLS1_CK_DH_RSA_WITH_AES_128_SHA                 0x03000031
@@ -595,7 +592,7 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
 # define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA               "DHE-RSA-AES256-SHA"
 # define TLS1_TXT_ADH_WITH_AES_256_SHA                   "ADH-AES256-SHA"
 
-/* ECC ciphersuites from draft-ietf-tls-ecc-01.txt (Mar 15, 2001) */
+/* ECC ciphersuites from RFC4492 */
 # define TLS1_TXT_ECDH_ECDSA_WITH_NULL_SHA               "ECDH-ECDSA-NULL-SHA"
 # define TLS1_TXT_ECDH_ECDSA_WITH_RC4_128_SHA            "ECDH-ECDSA-RC4-SHA"
 # define TLS1_TXT_ECDH_ECDSA_WITH_DES_192_CBC3_SHA       "ECDH-ECDSA-DES-CBC3-SHA"
diff --git a/deps/openssl/openssl/openssl.spec b/deps/openssl/openssl/openssl.spec
index b721d657297a60..45e737ad151531 100644
--- a/deps/openssl/openssl/openssl.spec
+++ b/deps/openssl/openssl/openssl.spec
@@ -6,7 +6,7 @@ Release: 1
 
 Summary: Secure Sockets Layer and cryptography libraries and tools
 Name: openssl
-Version: 1.0.2d
+Version: 1.0.2e
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries
diff --git a/deps/openssl/openssl/ssl/Makefile b/deps/openssl/openssl/ssl/Makefile
index 42f1af5c8e932e..7b90fb037550af 100644
--- a/deps/openssl/openssl/ssl/Makefile
+++ b/deps/openssl/openssl/ssl/Makefile
@@ -15,7 +15,7 @@ KRB5_INCLUDES=
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile README ssl-lib.com install.com
-TEST=ssltest.c heartbeat_test.c
+TEST=ssltest.c heartbeat_test.c clienthellotest.c
 APPS=
 
 LIB=$(TOP)/libssl.a
diff --git a/deps/openssl/openssl/ssl/bio_ssl.c b/deps/openssl/openssl/ssl/bio_ssl.c
index a0c583e34215b8..d2d4d2ea2d2dbb 100644
--- a/deps/openssl/openssl/ssl/bio_ssl.c
+++ b/deps/openssl/openssl/ssl/bio_ssl.c
@@ -419,6 +419,10 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
             BIO_set_flags(b, BIO_FLAGS_IO_SPECIAL | BIO_FLAGS_SHOULD_RETRY);
             b->retry_reason = b->next_bio->retry_reason;
             break;
+        case SSL_ERROR_WANT_X509_LOOKUP:
+            BIO_set_retry_special(b);
+            b->retry_reason = BIO_RR_SSL_X509_LOOKUP;
+            break;
         default:
             break;
         }
diff --git a/deps/openssl/openssl/ssl/clienthellotest.c b/deps/openssl/openssl/ssl/clienthellotest.c
new file mode 100644
index 00000000000000..77517c61b1f347
--- /dev/null
+++ b/deps/openssl/openssl/ssl/clienthellotest.c
@@ -0,0 +1,219 @@
+/* Written by Matt Caswell for the OpenSSL Project */
+/* ====================================================================
+ * Copyright (c) 1998-2015 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <string.h>
+
+#include <openssl/bio.h>
+#include <openssl/crypto.h>
+#include <openssl/evp.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+
+
+#define CLIENT_VERSION_LEN      2
+#define SESSION_ID_LEN_LEN      1
+#define CIPHERS_LEN_LEN         2
+#define COMPRESSION_LEN_LEN     1
+#define EXTENSIONS_LEN_LEN      2
+#define EXTENSION_TYPE_LEN      2
+#define EXTENSION_SIZE_LEN      2
+
+
+#define TOTAL_NUM_TESTS                         2
+
+/*
+ * Test that explicitly setting ticket data results in it appearing in the
+ * ClientHello for TLS1.2
+ */
+#define TEST_SET_SESSION_TICK_DATA_TLS_1_2      0
+
+/*
+ * Test that explicitly setting ticket data results in it appearing in the
+ * ClientHello for a negotiated SSL/TLS version
+ */
+#define TEST_SET_SESSION_TICK_DATA_VER_NEG      1
+
+int main(int argc, char *argv[])
+{
+    SSL_CTX *ctx;
+    SSL *con;
+    BIO *rbio;
+    BIO *wbio;
+    BIO *err;
+    long len;
+    unsigned char *data;
+    unsigned char *dataend;
+    char *dummytick = "Hello World!";
+    unsigned int tmplen;
+    unsigned int type;
+    unsigned int size;
+    int testresult = 0;
+    int currtest = 0;
+
+    SSL_library_init();
+    SSL_load_error_strings();
+
+    err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+
+    CRYPTO_malloc_debug_init();
+    CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
+    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+
+    /*
+     * For each test set up an SSL_CTX and SSL and see what ClientHello gets
+     * produced when we try to connect
+     */
+    for (; currtest < TOTAL_NUM_TESTS; currtest++) {
+        testresult = 0;
+        if (currtest == TEST_SET_SESSION_TICK_DATA_TLS_1_2) {
+            ctx = SSL_CTX_new(TLSv1_2_method());
+        } else {
+            ctx = SSL_CTX_new(SSLv23_method());
+        }
+        con = SSL_new(ctx);
+
+        rbio = BIO_new(BIO_s_mem());
+        wbio = BIO_new(BIO_s_mem());
+        SSL_set_bio(con, rbio, wbio);
+        SSL_set_connect_state(con);
+
+        if (currtest == TEST_SET_SESSION_TICK_DATA_TLS_1_2
+                || currtest == TEST_SET_SESSION_TICK_DATA_VER_NEG) {
+            if (!SSL_set_session_ticket_ext(con, dummytick, strlen(dummytick)))
+                goto end;
+        }
+
+        if (SSL_connect(con) > 0) {
+            /* This shouldn't succeed because we don't have a server! */
+            goto end;
+        }
+
+        len = BIO_get_mem_data(wbio, (char **)&data);
+        dataend = data + len;
+
+        /* Skip the record header */
+        data += SSL3_RT_HEADER_LENGTH;
+        /* Skip the handshake message header */
+        data += SSL3_HM_HEADER_LENGTH;
+        /* Skip client version and random */
+        data += CLIENT_VERSION_LEN + SSL3_RANDOM_SIZE;
+        if (data + SESSION_ID_LEN_LEN > dataend)
+            goto end;
+        /* Skip session id */
+        tmplen = *data;
+        data += SESSION_ID_LEN_LEN + tmplen;
+        if (data + CIPHERS_LEN_LEN > dataend)
+            goto end;
+        /* Skip ciphers */
+        tmplen = ((*data) << 8) | *(data + 1);
+        data += CIPHERS_LEN_LEN + tmplen;
+        if (data + COMPRESSION_LEN_LEN > dataend)
+            goto end;
+        /* Skip compression */
+        tmplen = *data;
+        data += COMPRESSION_LEN_LEN + tmplen;
+        if (data + EXTENSIONS_LEN_LEN > dataend)
+            goto end;
+        /* Extensions len */
+        tmplen = ((*data) << 8) | *(data + 1);
+        data += EXTENSIONS_LEN_LEN;
+        if (data + tmplen > dataend)
+            goto end;
+
+        /* Loop through all extensions */
+        while (tmplen > EXTENSION_TYPE_LEN + EXTENSION_SIZE_LEN) {
+            type = ((*data) << 8) | *(data + 1);
+            data += EXTENSION_TYPE_LEN;
+            size = ((*data) << 8) | *(data + 1);
+            data += EXTENSION_SIZE_LEN;
+            if (data + size > dataend)
+                goto end;
+
+            if (type == TLSEXT_TYPE_session_ticket) {
+                if (currtest == TEST_SET_SESSION_TICK_DATA_TLS_1_2
+                        || currtest == TEST_SET_SESSION_TICK_DATA_VER_NEG) {
+                    if (size == strlen(dummytick)
+                            && memcmp(data, dummytick, size) == 0) {
+                        /* Ticket data is as we expected */
+                        testresult = 1;
+                    } else {
+                        printf("Received session ticket is not as expected\n");
+                    }
+                    break;
+                }
+            }
+
+            tmplen -= EXTENSION_TYPE_LEN + EXTENSION_SIZE_LEN + size;
+            data += size;
+        }
+
+ end:
+        SSL_free(con);
+        SSL_CTX_free(ctx);
+        if (!testresult) {
+            printf("ClientHello test: FAILED (Test %d)\n", currtest);
+            break;
+        }
+    }
+
+    ERR_free_strings();
+    ERR_remove_thread_state(NULL);
+    EVP_cleanup();
+    CRYPTO_cleanup_all_ex_data();
+    CRYPTO_mem_leaks(err);
+    BIO_free(err);
+
+    return testresult?0:1;
+}
diff --git a/deps/openssl/openssl/ssl/d1_both.c b/deps/openssl/openssl/ssl/d1_both.c
index b4ee7abe27dcb7..c2c8d57e9d9c14 100644
--- a/deps/openssl/openssl/ssl/d1_both.c
+++ b/deps/openssl/openssl/ssl/d1_both.c
@@ -1370,9 +1370,12 @@ int dtls1_shutdown(SSL *s)
 {
     int ret;
 #ifndef OPENSSL_NO_SCTP
-    if (BIO_dgram_is_sctp(SSL_get_wbio(s)) &&
+    BIO *wbio;
+
+    wbio = SSL_get_wbio(s);
+    if (wbio != NULL && BIO_dgram_is_sctp(wbio) &&
         !(s->shutdown & SSL_SENT_SHUTDOWN)) {
-        ret = BIO_dgram_sctp_wait_for_dry(SSL_get_wbio(s));
+        ret = BIO_dgram_sctp_wait_for_dry(wbio);
         if (ret < 0)
             return -1;
 
diff --git a/deps/openssl/openssl/ssl/d1_clnt.c b/deps/openssl/openssl/ssl/d1_clnt.c
index 4c2ccbf5ae085f..3ddfa7bca4b79e 100644
--- a/deps/openssl/openssl/ssl/d1_clnt.c
+++ b/deps/openssl/openssl/ssl/d1_clnt.c
@@ -133,12 +133,14 @@ static int dtls1_get_hello_verify(SSL *s);
 
 static const SSL_METHOD *dtls1_get_client_method(int ver)
 {
-    if (ver == DTLS1_VERSION || ver == DTLS1_BAD_VER)
-        return (DTLSv1_client_method());
+    if (ver == DTLS_ANY_VERSION)
+        return DTLS_client_method();
+    else if (ver == DTLS1_VERSION || ver == DTLS1_BAD_VER)
+        return DTLSv1_client_method();
     else if (ver == DTLS1_2_VERSION)
-        return (DTLSv1_2_client_method());
+        return DTLSv1_2_client_method();
     else
-        return (NULL);
+        return NULL;
 }
 
 IMPLEMENT_dtls1_meth_func(DTLS1_VERSION,
@@ -147,13 +149,13 @@ IMPLEMENT_dtls1_meth_func(DTLS1_VERSION,
                           dtls1_connect,
                           dtls1_get_client_method, DTLSv1_enc_data)
 
-    IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION,
+IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION,
                           DTLSv1_2_client_method,
                           ssl_undefined_function,
                           dtls1_connect,
                           dtls1_get_client_method, DTLSv1_2_enc_data)
 
-    IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION,
+IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION,
                           DTLS_client_method,
                           ssl_undefined_function,
                           dtls1_connect,
@@ -315,13 +317,12 @@ int dtls1_connect(SSL *s)
 #endif
 
         case SSL3_ST_CW_CLNT_HELLO_A:
-        case SSL3_ST_CW_CLNT_HELLO_B:
-
             s->shutdown = 0;
 
             /* every DTLS ClientHello resets Finished MAC */
             ssl3_init_finished_mac(s);
 
+        case SSL3_ST_CW_CLNT_HELLO_B:
             dtls1_start_timer(s);
             ret = ssl3_client_hello(s);
             if (ret <= 0)
@@ -366,11 +367,15 @@ int dtls1_connect(SSL *s)
                              sizeof(DTLS1_SCTP_AUTH_LABEL),
                              DTLS1_SCTP_AUTH_LABEL);
 
-                    SSL_export_keying_material(s, sctpauthkey,
+                    if (SSL_export_keying_material(s, sctpauthkey,
                                                sizeof(sctpauthkey),
                                                labelbuffer,
                                                sizeof(labelbuffer), NULL, 0,
-                                               0);
+                                               0) <= 0) {
+                        ret = -1;
+                        s->state = SSL_ST_ERR;
+                        goto end;
+                    }
 
                     BIO_ctrl(SSL_get_wbio(s),
                              BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY,
@@ -378,6 +383,10 @@ int dtls1_connect(SSL *s)
 #endif
 
                     s->state = SSL3_ST_CR_FINISHED_A;
+                    if (s->tlsext_ticket_expected) {
+                        /* receive renewed session ticket */
+                        s->state = SSL3_ST_CR_SESSION_TICKET_A;
+                    }
                 } else
                     s->state = DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A;
             }
@@ -500,9 +509,13 @@ int dtls1_connect(SSL *s)
             snprintf((char *)labelbuffer, sizeof(DTLS1_SCTP_AUTH_LABEL),
                      DTLS1_SCTP_AUTH_LABEL);
 
-            SSL_export_keying_material(s, sctpauthkey,
+            if (SSL_export_keying_material(s, sctpauthkey,
                                        sizeof(sctpauthkey), labelbuffer,
-                                       sizeof(labelbuffer), NULL, 0, 0);
+                                       sizeof(labelbuffer), NULL, 0, 0) <= 0) {
+                ret = -1;
+                s->state = SSL_ST_ERR;
+                goto end;
+            }
 
             BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY,
                      sizeof(sctpauthkey), sctpauthkey);
diff --git a/deps/openssl/openssl/ssl/d1_meth.c b/deps/openssl/openssl/ssl/d1_meth.c
index 734077493f843b..899010e9851ce3 100644
--- a/deps/openssl/openssl/ssl/d1_meth.c
+++ b/deps/openssl/openssl/ssl/d1_meth.c
@@ -64,12 +64,14 @@
 static const SSL_METHOD *dtls1_get_method(int ver);
 static const SSL_METHOD *dtls1_get_method(int ver)
 {
-    if (ver == DTLS1_VERSION)
-        return (DTLSv1_method());
+    if (ver == DTLS_ANY_VERSION)
+        return DTLS_method();
+    else if (ver == DTLS1_VERSION)
+        return DTLSv1_method();
     else if (ver == DTLS1_2_VERSION)
-        return (DTLSv1_2_method());
+        return DTLSv1_2_method();
     else
-        return (NULL);
+        return NULL;
 }
 
 IMPLEMENT_dtls1_meth_func(DTLS1_VERSION,
@@ -77,12 +79,12 @@ IMPLEMENT_dtls1_meth_func(DTLS1_VERSION,
                           dtls1_accept,
                           dtls1_connect, dtls1_get_method, DTLSv1_enc_data)
 
-    IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION,
+IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION,
                           DTLSv1_2_method,
                           dtls1_accept,
                           dtls1_connect, dtls1_get_method, DTLSv1_2_enc_data)
 
-    IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION,
+IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION,
                           DTLS_method,
                           dtls1_accept,
                           dtls1_connect, dtls1_get_method, DTLSv1_2_enc_data)
diff --git a/deps/openssl/openssl/ssl/d1_srvr.c b/deps/openssl/openssl/ssl/d1_srvr.c
index 655333a25210d7..e677d880f0ac92 100644
--- a/deps/openssl/openssl/ssl/d1_srvr.c
+++ b/deps/openssl/openssl/ssl/d1_srvr.c
@@ -131,12 +131,14 @@ static int dtls1_send_hello_verify_request(SSL *s);
 
 static const SSL_METHOD *dtls1_get_server_method(int ver)
 {
-    if (ver == DTLS1_VERSION)
-        return (DTLSv1_server_method());
+    if (ver == DTLS_ANY_VERSION)
+        return DTLS_server_method();
+    else if (ver == DTLS1_VERSION)
+        return DTLSv1_server_method();
     else if (ver == DTLS1_2_VERSION)
-        return (DTLSv1_2_server_method());
+        return DTLSv1_2_server_method();
     else
-        return (NULL);
+        return NULL;
 }
 
 IMPLEMENT_dtls1_meth_func(DTLS1_VERSION,
@@ -145,13 +147,13 @@ IMPLEMENT_dtls1_meth_func(DTLS1_VERSION,
                           ssl_undefined_function,
                           dtls1_get_server_method, DTLSv1_enc_data)
 
-    IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION,
+IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION,
                           DTLSv1_2_server_method,
                           dtls1_accept,
                           ssl_undefined_function,
                           dtls1_get_server_method, DTLSv1_2_enc_data)
 
-    IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION,
+IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION,
                           DTLS_server_method,
                           dtls1_accept,
                           ssl_undefined_function,
@@ -283,6 +285,19 @@ int dtls1_accept(SSL *s)
                 ssl3_init_finished_mac(s);
                 s->state = SSL3_ST_SR_CLNT_HELLO_A;
                 s->ctx->stats.sess_accept++;
+            } else if (!s->s3->send_connection_binding &&
+                       !(s->options &
+                         SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)) {
+                /*
+                 * Server attempting to renegotiate with client that doesn't
+                 * support secure renegotiation.
+                 */
+                SSLerr(SSL_F_DTLS1_ACCEPT,
+                       SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
+                ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
+                ret = -1;
+                s->state = SSL_ST_ERR;
+                goto end;
             } else {
                 /*
                  * s->state == SSL_ST_RENEGOTIATE, we will just send a
@@ -421,9 +436,13 @@ int dtls1_accept(SSL *s)
                 snprintf((char *)labelbuffer, sizeof(DTLS1_SCTP_AUTH_LABEL),
                          DTLS1_SCTP_AUTH_LABEL);
 
-                SSL_export_keying_material(s, sctpauthkey,
-                                           sizeof(sctpauthkey), labelbuffer,
-                                           sizeof(labelbuffer), NULL, 0, 0);
+                if (SSL_export_keying_material(s, sctpauthkey,
+                        sizeof(sctpauthkey), labelbuffer,
+                        sizeof(labelbuffer), NULL, 0, 0) <= 0) {
+                    ret = -1;
+                    s->state = SSL_ST_ERR;
+                    goto end;
+                }
 
                 BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY,
                          sizeof(sctpauthkey), sctpauthkey);
@@ -635,9 +654,13 @@ int dtls1_accept(SSL *s)
             snprintf((char *)labelbuffer, sizeof(DTLS1_SCTP_AUTH_LABEL),
                      DTLS1_SCTP_AUTH_LABEL);
 
-            SSL_export_keying_material(s, sctpauthkey,
+            if (SSL_export_keying_material(s, sctpauthkey,
                                        sizeof(sctpauthkey), labelbuffer,
-                                       sizeof(labelbuffer), NULL, 0, 0);
+                                       sizeof(labelbuffer), NULL, 0, 0) <= 0) {
+                ret = -1;
+                s->state = SSL_ST_ERR;
+                goto end;
+            }
 
             BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY,
                      sizeof(sctpauthkey), sctpauthkey);
diff --git a/deps/openssl/openssl/ssl/s23_clnt.c b/deps/openssl/openssl/ssl/s23_clnt.c
index e4e707cf687e7b..f782010c4782c8 100644
--- a/deps/openssl/openssl/ssl/s23_clnt.c
+++ b/deps/openssl/openssl/ssl/s23_clnt.c
@@ -375,12 +375,13 @@ static int ssl23_client_hello(SSL *s)
 
     buf = (unsigned char *)s->init_buf->data;
     if (s->state == SSL23_ST_CW_CLNT_HELLO_A) {
-#if 0
-        /* don't reuse session-id's */
+        /*
+         * Since we're sending s23 client hello, we're not reusing a session, as
+         * we'd be using the method from the saved session instead
+         */
         if (!ssl_get_new_session(s, 0)) {
-            return (-1);
+            return -1;
         }
-#endif
 
         p = s->s3->client_random;
         if (ssl_fill_hello_random(s, 0, p, SSL3_RANDOM_SIZE) <= 0)
@@ -445,9 +446,6 @@ static int ssl23_client_hello(SSL *s)
             /*
              * put in the session-id length (zero since there is no reuse)
              */
-#if 0
-            s->session->session_id_length = 0;
-#endif
             s2n(0, d);
 
             if (s->options & SSL_OP_NETSCAPE_CHALLENGE_BUG)
@@ -738,6 +736,8 @@ static int ssl23_get_server_hello(SSL *s)
             goto err;
         }
 
+        s->session->ssl_version = s->version;
+
         /* ensure that TLS_MAX_VERSION is up-to-date */
         OPENSSL_assert(s->version <= TLS_MAX_VERSION);
 
@@ -796,13 +796,6 @@ static int ssl23_get_server_hello(SSL *s)
     }
     s->init_num = 0;
 
-    /*
-     * Since, if we are sending a ssl23 client hello, we are not reusing a
-     * session-id
-     */
-    if (!ssl_get_new_session(s, 0))
-        goto err;
-
     return (SSL_connect(s));
  err:
     return (-1);
diff --git a/deps/openssl/openssl/ssl/s3_both.c b/deps/openssl/openssl/ssl/s3_both.c
index 019e21cd02741c..09d0661e81f64e 100644
--- a/deps/openssl/openssl/ssl/s3_both.c
+++ b/deps/openssl/openssl/ssl/s3_both.c
@@ -648,7 +648,7 @@ int ssl3_setup_read_buffer(SSL *s)
     unsigned char *p;
     size_t len, align = 0, headerlen;
 
-    if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
+    if (SSL_IS_DTLS(s))
         headerlen = DTLS1_RT_HEADER_LENGTH;
     else
         headerlen = SSL3_RT_HEADER_LENGTH;
@@ -687,7 +687,7 @@ int ssl3_setup_write_buffer(SSL *s)
     unsigned char *p;
     size_t len, align = 0, headerlen;
 
-    if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
+    if (SSL_IS_DTLS(s))
         headerlen = DTLS1_RT_HEADER_LENGTH + 1;
     else
         headerlen = SSL3_RT_HEADER_LENGTH;
diff --git a/deps/openssl/openssl/ssl/s3_cbc.c b/deps/openssl/openssl/ssl/s3_cbc.c
index a0edcef90ada1b..557622f51365d2 100644
--- a/deps/openssl/openssl/ssl/s3_cbc.c
+++ b/deps/openssl/openssl/ssl/s3_cbc.c
@@ -411,8 +411,9 @@ char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx)
  * functions, above, we know that data_plus_mac_size is large enough to contain
  * a padding byte and MAC. (If the padding was invalid, it might contain the
  * padding too. )
+ * Returns 1 on success or 0 on error
  */
-void ssl3_cbc_digest_record(const EVP_MD_CTX *ctx,
+int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx,
                             unsigned char *md_out,
                             size_t *md_out_size,
                             const unsigned char header[13],
@@ -455,7 +456,8 @@ void ssl3_cbc_digest_record(const EVP_MD_CTX *ctx,
 
     switch (EVP_MD_CTX_type(ctx)) {
     case NID_md5:
-        MD5_Init((MD5_CTX *)md_state.c);
+        if (MD5_Init((MD5_CTX *)md_state.c) <= 0)
+            return 0;
         md_final_raw = tls1_md5_final_raw;
         md_transform =
             (void (*)(void *ctx, const unsigned char *block))MD5_Transform;
@@ -464,7 +466,8 @@ void ssl3_cbc_digest_record(const EVP_MD_CTX *ctx,
         length_is_big_endian = 0;
         break;
     case NID_sha1:
-        SHA1_Init((SHA_CTX *)md_state.c);
+        if (SHA1_Init((SHA_CTX *)md_state.c) <= 0)
+            return 0;
         md_final_raw = tls1_sha1_final_raw;
         md_transform =
             (void (*)(void *ctx, const unsigned char *block))SHA1_Transform;
@@ -472,14 +475,16 @@ void ssl3_cbc_digest_record(const EVP_MD_CTX *ctx,
         break;
 #ifndef OPENSSL_NO_SHA256
     case NID_sha224:
-        SHA224_Init((SHA256_CTX *)md_state.c);
+        if (SHA224_Init((SHA256_CTX *)md_state.c) <= 0)
+            return 0;
         md_final_raw = tls1_sha256_final_raw;
         md_transform =
             (void (*)(void *ctx, const unsigned char *block))SHA256_Transform;
         md_size = 224 / 8;
         break;
     case NID_sha256:
-        SHA256_Init((SHA256_CTX *)md_state.c);
+        if (SHA256_Init((SHA256_CTX *)md_state.c) <= 0)
+            return 0;
         md_final_raw = tls1_sha256_final_raw;
         md_transform =
             (void (*)(void *ctx, const unsigned char *block))SHA256_Transform;
@@ -488,7 +493,8 @@ void ssl3_cbc_digest_record(const EVP_MD_CTX *ctx,
 #endif
 #ifndef OPENSSL_NO_SHA512
     case NID_sha384:
-        SHA384_Init((SHA512_CTX *)md_state.c);
+        if (SHA384_Init((SHA512_CTX *)md_state.c) <= 0)
+            return 0;
         md_final_raw = tls1_sha512_final_raw;
         md_transform =
             (void (*)(void *ctx, const unsigned char *block))SHA512_Transform;
@@ -497,7 +503,8 @@ void ssl3_cbc_digest_record(const EVP_MD_CTX *ctx,
         md_length_size = 16;
         break;
     case NID_sha512:
-        SHA512_Init((SHA512_CTX *)md_state.c);
+        if (SHA512_Init((SHA512_CTX *)md_state.c) <= 0)
+            return 0;
         md_final_raw = tls1_sha512_final_raw;
         md_transform =
             (void (*)(void *ctx, const unsigned char *block))SHA512_Transform;
@@ -513,8 +520,8 @@ void ssl3_cbc_digest_record(const EVP_MD_CTX *ctx,
          */
         OPENSSL_assert(0);
         if (md_out_size)
-            *md_out_size = -1;
-        return;
+            *md_out_size = 0;
+        return 0;
     }
 
     OPENSSL_assert(md_length_size <= MAX_HASH_BIT_COUNT_BYTES);
@@ -652,7 +659,7 @@ void ssl3_cbc_digest_record(const EVP_MD_CTX *ctx,
              */
             if (header_length <= md_block_size) {
                 /* Should never happen */
-                return;
+                return 0;
             }
             overhang = header_length - md_block_size;
             md_transform(md_state.c, header);
@@ -733,26 +740,34 @@ void ssl3_cbc_digest_record(const EVP_MD_CTX *ctx,
     }
 
     EVP_MD_CTX_init(&md_ctx);
-    EVP_DigestInit_ex(&md_ctx, ctx->digest, NULL /* engine */ );
+    if (EVP_DigestInit_ex(&md_ctx, ctx->digest, NULL /* engine */ ) <= 0)
+        goto err;
     if (is_sslv3) {
         /* We repurpose |hmac_pad| to contain the SSLv3 pad2 block. */
         memset(hmac_pad, 0x5c, sslv3_pad_length);
 
-        EVP_DigestUpdate(&md_ctx, mac_secret, mac_secret_length);
-        EVP_DigestUpdate(&md_ctx, hmac_pad, sslv3_pad_length);
-        EVP_DigestUpdate(&md_ctx, mac_out, md_size);
+        if (EVP_DigestUpdate(&md_ctx, mac_secret, mac_secret_length) <= 0
+                || EVP_DigestUpdate(&md_ctx, hmac_pad, sslv3_pad_length) <= 0
+                || EVP_DigestUpdate(&md_ctx, mac_out, md_size) <= 0)
+            goto err;
     } else {
         /* Complete the HMAC in the standard manner. */
         for (i = 0; i < md_block_size; i++)
             hmac_pad[i] ^= 0x6a;
 
-        EVP_DigestUpdate(&md_ctx, hmac_pad, md_block_size);
-        EVP_DigestUpdate(&md_ctx, mac_out, md_size);
+        if (EVP_DigestUpdate(&md_ctx, hmac_pad, md_block_size) <= 0
+                || EVP_DigestUpdate(&md_ctx, mac_out, md_size) <= 0)
+            goto err;
     }
     EVP_DigestFinal(&md_ctx, md_out, &md_out_size_u);
     if (md_out_size)
         *md_out_size = md_out_size_u;
     EVP_MD_CTX_cleanup(&md_ctx);
+
+    return 1;
+err:
+    EVP_MD_CTX_cleanup(&md_ctx);
+    return 0;
 }
 
 #ifdef OPENSSL_FIPS
diff --git a/deps/openssl/openssl/ssl/s3_clnt.c b/deps/openssl/openssl/ssl/s3_clnt.c
index 6af145a8b744da..bc5254c8116028 100644
--- a/deps/openssl/openssl/ssl/s3_clnt.c
+++ b/deps/openssl/openssl/ssl/s3_clnt.c
@@ -1050,6 +1050,11 @@ int ssl3_get_server_hello(SSL *s)
         SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_UNKNOWN_CIPHER_RETURNED);
         goto f_err;
     }
+    /* Set version disabled mask now we know version */
+    if (!SSL_USE_TLS1_2_CIPHERS(s))
+        ct->mask_ssl = SSL_TLSV1_2;
+    else
+        ct->mask_ssl = 0;
     /*
      * If it is a disabled cipher we didn't send it in client hello, so
      * return an error.
@@ -1699,6 +1704,12 @@ int ssl3_get_key_exchange(SSL *s)
         }
         p += i;
 
+        if (BN_is_zero(dh->p)) {
+            SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_DH_P_VALUE);
+            goto f_err;
+        }
+
+
         if (2 > n - param_len) {
             SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_LENGTH_TOO_SHORT);
             goto f_err;
@@ -1719,6 +1730,11 @@ int ssl3_get_key_exchange(SSL *s)
         }
         p += i;
 
+        if (BN_is_zero(dh->g)) {
+            SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_DH_G_VALUE);
+            goto f_err;
+        }
+
         if (2 > n - param_len) {
             SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_LENGTH_TOO_SHORT);
             goto f_err;
@@ -1740,6 +1756,11 @@ int ssl3_get_key_exchange(SSL *s)
         p += i;
         n -= param_len;
 
+        if (BN_is_zero(dh->pub_key)) {
+            SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_DH_PUB_KEY_VALUE);
+            goto f_err;
+        }
+
 # ifndef OPENSSL_NO_RSA
         if (alg_a & SSL_aRSA)
             pkey =
@@ -1935,14 +1956,20 @@ int ssl3_get_key_exchange(SSL *s)
             q = md_buf;
             for (num = 2; num > 0; num--) {
                 EVP_MD_CTX_set_flags(&md_ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
-                EVP_DigestInit_ex(&md_ctx, (num == 2)
-                                  ? s->ctx->md5 : s->ctx->sha1, NULL);
-                EVP_DigestUpdate(&md_ctx, &(s->s3->client_random[0]),
-                                 SSL3_RANDOM_SIZE);
-                EVP_DigestUpdate(&md_ctx, &(s->s3->server_random[0]),
-                                 SSL3_RANDOM_SIZE);
-                EVP_DigestUpdate(&md_ctx, param, param_len);
-                EVP_DigestFinal_ex(&md_ctx, q, &size);
+                if (EVP_DigestInit_ex(&md_ctx,
+                                      (num == 2) ? s->ctx->md5 : s->ctx->sha1,
+                                      NULL) <= 0
+                        || EVP_DigestUpdate(&md_ctx, &(s->s3->client_random[0]),
+                                            SSL3_RANDOM_SIZE) <= 0
+                        || EVP_DigestUpdate(&md_ctx, &(s->s3->server_random[0]),
+                                            SSL3_RANDOM_SIZE) <= 0
+                        || EVP_DigestUpdate(&md_ctx, param, param_len) <= 0
+                        || EVP_DigestFinal_ex(&md_ctx, q, &size) <= 0) {
+                    SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,
+                           ERR_R_INTERNAL_ERROR);
+                    al = SSL_AD_INTERNAL_ERROR;
+                    goto f_err;
+                }
                 q += size;
                 j += size;
             }
@@ -1961,12 +1988,16 @@ int ssl3_get_key_exchange(SSL *s)
         } else
 #endif
         {
-            EVP_VerifyInit_ex(&md_ctx, md, NULL);
-            EVP_VerifyUpdate(&md_ctx, &(s->s3->client_random[0]),
-                             SSL3_RANDOM_SIZE);
-            EVP_VerifyUpdate(&md_ctx, &(s->s3->server_random[0]),
-                             SSL3_RANDOM_SIZE);
-            EVP_VerifyUpdate(&md_ctx, param, param_len);
+            if (EVP_VerifyInit_ex(&md_ctx, md, NULL) <= 0
+                    || EVP_VerifyUpdate(&md_ctx, &(s->s3->client_random[0]),
+                                        SSL3_RANDOM_SIZE) <= 0
+                    || EVP_VerifyUpdate(&md_ctx, &(s->s3->server_random[0]),
+                                        SSL3_RANDOM_SIZE) <= 0
+                    || EVP_VerifyUpdate(&md_ctx, param, param_len) <= 0) {
+                al = SSL_AD_INTERNAL_ERROR;
+                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_EVP_LIB);
+                goto f_err;
+            }
             if (EVP_VerifyFinal(&md_ctx, p, (int)n, pkey) <= 0) {
                 /* bad signature */
                 al = SSL_AD_DECRYPT_ERROR;
@@ -2208,6 +2239,7 @@ int ssl3_get_new_session_ticket(SSL *s)
     long n;
     const unsigned char *p;
     unsigned char *d;
+    unsigned long ticket_lifetime_hint;
 
     n = s->method->ssl_get_message(s,
                                    SSL3_ST_CR_SESSION_TICKET_A,
@@ -2226,6 +2258,19 @@ int ssl3_get_new_session_ticket(SSL *s)
 
     p = d = (unsigned char *)s->init_msg;
 
+    n2l(p, ticket_lifetime_hint);
+    n2s(p, ticklen);
+    /* ticket_lifetime_hint + ticket_length + ticket */
+    if (ticklen + 6 != n) {
+        al = SSL_AD_DECODE_ERROR;
+        SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET, SSL_R_LENGTH_MISMATCH);
+        goto f_err;
+    }
+
+    /* Server is allowed to change its mind and send an empty ticket. */
+    if (ticklen == 0)
+        return 1;
+
     if (s->session->session_id_length > 0) {
         int i = s->session_ctx->session_cache_mode;
         SSL_SESSION *new_sess;
@@ -2257,14 +2302,6 @@ int ssl3_get_new_session_ticket(SSL *s)
         s->session = new_sess;
     }
 
-    n2l(p, s->session->tlsext_tick_lifetime_hint);
-    n2s(p, ticklen);
-    /* ticket_lifetime_hint + ticket_length + ticket */
-    if (ticklen + 6 != n) {
-        al = SSL_AD_DECODE_ERROR;
-        SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET, SSL_R_LENGTH_MISMATCH);
-        goto f_err;
-    }
     if (s->session->tlsext_tick) {
         OPENSSL_free(s->session->tlsext_tick);
         s->session->tlsext_ticklen = 0;
@@ -2275,6 +2312,7 @@ int ssl3_get_new_session_ticket(SSL *s)
         goto err;
     }
     memcpy(s->session->tlsext_tick, p, ticklen);
+    s->session->tlsext_tick_lifetime_hint = ticket_lifetime_hint;
     s->session->tlsext_ticklen = ticklen;
     /*
      * There are two ways to detect a resumed ticket session. One is to set
@@ -2462,6 +2500,7 @@ int ssl3_send_client_key_exchange(SSL *s)
                     || (pkey->pkey.rsa == NULL)) {
                     SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
                            ERR_R_INTERNAL_ERROR);
+                    EVP_PKEY_free(pkey);
                     goto err;
                 }
                 rsa = pkey->pkey.rsa;
@@ -2927,6 +2966,11 @@ int ssl3_send_client_key_exchange(SSL *s)
 
             pkey_ctx = EVP_PKEY_CTX_new(pub_key =
                                         X509_get_pubkey(peer_cert), NULL);
+            if (pkey_ctx == NULL) {
+                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
+                       ERR_R_MALLOC_FAILURE);
+                goto err;
+            }
             /*
              * If we have send a certificate, and certificate key
              *
@@ -2936,10 +2980,13 @@ int ssl3_send_client_key_exchange(SSL *s)
 
             /* Otherwise, generate ephemeral key pair */
 
-            EVP_PKEY_encrypt_init(pkey_ctx);
-            /* Generate session key */
-            if (RAND_bytes(premaster_secret, 32) <= 0) {
+            if (pkey_ctx == NULL
+                    || EVP_PKEY_encrypt_init(pkey_ctx) <= 0
+                    /* Generate session key */
+                    || RAND_bytes(premaster_secret, 32) <= 0) {
                 EVP_PKEY_CTX_free(pkey_ctx);
+                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
+                       ERR_R_INTERNAL_ERROR);
                 goto err;
             }
             /*
@@ -2960,13 +3007,18 @@ int ssl3_send_client_key_exchange(SSL *s)
              * data
              */
             ukm_hash = EVP_MD_CTX_create();
-            EVP_DigestInit(ukm_hash,
-                           EVP_get_digestbynid(NID_id_GostR3411_94));
-            EVP_DigestUpdate(ukm_hash, s->s3->client_random,
-                             SSL3_RANDOM_SIZE);
-            EVP_DigestUpdate(ukm_hash, s->s3->server_random,
-                             SSL3_RANDOM_SIZE);
-            EVP_DigestFinal_ex(ukm_hash, shared_ukm, &md_len);
+            if (EVP_DigestInit(ukm_hash,
+                               EVP_get_digestbynid(NID_id_GostR3411_94)) <= 0
+                    || EVP_DigestUpdate(ukm_hash, s->s3->client_random,
+                                        SSL3_RANDOM_SIZE) <= 0
+                    || EVP_DigestUpdate(ukm_hash, s->s3->server_random,
+                                        SSL3_RANDOM_SIZE) <= 0
+                    || EVP_DigestFinal_ex(ukm_hash, shared_ukm, &md_len) <= 0) {
+                EVP_MD_CTX_destroy(ukm_hash);
+                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
+                       ERR_R_INTERNAL_ERROR);
+                goto err;
+            }
             EVP_MD_CTX_destroy(ukm_hash);
             if (EVP_PKEY_CTX_ctrl
                 (pkey_ctx, -1, EVP_PKEY_OP_ENCRYPT, EVP_PKEY_CTRL_SET_IV, 8,
@@ -2982,7 +3034,7 @@ int ssl3_send_client_key_exchange(SSL *s)
             *(p++) = V_ASN1_SEQUENCE | V_ASN1_CONSTRUCTED;
             msglen = 255;
             if (EVP_PKEY_encrypt(pkey_ctx, tmp, &msglen, premaster_secret, 32)
-                < 0) {
+                <= 0) {
                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
                        SSL_R_LIBRARY_BUG);
                 goto err;
@@ -3177,7 +3229,10 @@ int ssl3_send_client_verify(SSL *s)
         pkey = s->cert->key->privatekey;
 /* Create context from key and test if sha1 is allowed as digest */
         pctx = EVP_PKEY_CTX_new(pkey, NULL);
-        EVP_PKEY_sign_init(pctx);
+        if (pctx == NULL || EVP_PKEY_sign_init(pctx) <= 0) {
+            SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY, ERR_R_INTERNAL_ERROR);
+            goto err;
+        }
         if (EVP_PKEY_CTX_set_signature_md(pctx, EVP_sha1()) > 0) {
             if (!SSL_USE_SIGALGS(s))
                 s->method->ssl3_enc->cert_verify_mac(s,
@@ -3365,7 +3420,6 @@ int ssl3_send_client_certificate(SSL *s)
          * If we get an error, we need to ssl->rwstate=SSL_X509_LOOKUP;
          * return(-1); We then get retied later
          */
-        i = 0;
         i = ssl_do_client_cert_cb(s, &x509, &pkey);
         if (i < 0) {
             s->rwstate = SSL_X509_LOOKUP;
diff --git a/deps/openssl/openssl/ssl/s3_enc.c b/deps/openssl/openssl/ssl/s3_enc.c
index cda2d8c77603c7..47a0ec9fe04b18 100644
--- a/deps/openssl/openssl/ssl/s3_enc.c
+++ b/deps/openssl/openssl/ssl/s3_enc.c
@@ -253,7 +253,10 @@ int ssl3_change_cipher_state(SSL *s, int which)
             EVP_CIPHER_CTX_init(s->enc_read_ctx);
         dd = s->enc_read_ctx;
 
-        ssl_replace_hash(&s->read_hash, m);
+        if (ssl_replace_hash(&s->read_hash, m) == NULL) {
+                SSLerr(SSL_F_SSL3_CHANGE_CIPHER_STATE, ERR_R_INTERNAL_ERROR);
+                goto err2;
+        }
 #ifndef OPENSSL_NO_COMP
         /* COMPRESS */
         if (s->expand != NULL) {
@@ -288,7 +291,10 @@ int ssl3_change_cipher_state(SSL *s, int which)
              */
             EVP_CIPHER_CTX_init(s->enc_write_ctx);
         dd = s->enc_write_ctx;
-        ssl_replace_hash(&s->write_hash, m);
+        if (ssl_replace_hash(&s->write_hash, m) == NULL) {
+                SSLerr(SSL_F_SSL3_CHANGE_CIPHER_STATE, ERR_R_INTERNAL_ERROR);
+                goto err2;
+        }
 #ifndef OPENSSL_NO_COMP
         /* COMPRESS */
         if (s->compress != NULL) {
@@ -691,19 +697,21 @@ static int ssl3_handshake_mac(SSL *s, int md_nid,
         return 0;
 
     npad = (48 / n) * n;
-    if (sender != NULL)
-        EVP_DigestUpdate(&ctx, sender, len);
-    EVP_DigestUpdate(&ctx, s->session->master_key,
-                     s->session->master_key_length);
-    EVP_DigestUpdate(&ctx, ssl3_pad_1, npad);
-    EVP_DigestFinal_ex(&ctx, md_buf, &i);
-
-    EVP_DigestInit_ex(&ctx, EVP_MD_CTX_md(&ctx), NULL);
-    EVP_DigestUpdate(&ctx, s->session->master_key,
-                     s->session->master_key_length);
-    EVP_DigestUpdate(&ctx, ssl3_pad_2, npad);
-    EVP_DigestUpdate(&ctx, md_buf, i);
-    EVP_DigestFinal_ex(&ctx, p, &ret);
+    if ((sender != NULL && EVP_DigestUpdate(&ctx, sender, len) <= 0)
+            || EVP_DigestUpdate(&ctx, s->session->master_key,
+                                s->session->master_key_length) <= 0
+            || EVP_DigestUpdate(&ctx, ssl3_pad_1, npad) <= 0
+            || EVP_DigestFinal_ex(&ctx, md_buf, &i) <= 0
+
+            || EVP_DigestInit_ex(&ctx, EVP_MD_CTX_md(&ctx), NULL) <= 0
+            || EVP_DigestUpdate(&ctx, s->session->master_key,
+                                s->session->master_key_length) <= 0
+            || EVP_DigestUpdate(&ctx, ssl3_pad_2, npad) <= 0
+            || EVP_DigestUpdate(&ctx, md_buf, i) <= 0
+            || EVP_DigestFinal_ex(&ctx, p, &ret) <= 0) {
+        SSLerr(SSL_F_SSL3_HANDSHAKE_MAC, ERR_R_INTERNAL_ERROR);
+        ret = 0;
+    }
 
     EVP_MD_CTX_cleanup(&ctx);
 
@@ -775,33 +783,36 @@ int n_ssl3_mac(SSL *ssl, unsigned char *md, int send)
         header[j++] = rec->length & 0xff;
 
         /* Final param == is SSLv3 */
-        ssl3_cbc_digest_record(hash,
-                               md, &md_size,
-                               header, rec->input,
-                               rec->length + md_size, orig_len,
-                               mac_sec, md_size, 1);
+        if (ssl3_cbc_digest_record(hash,
+                                   md, &md_size,
+                                   header, rec->input,
+                                   rec->length + md_size, orig_len,
+                                   mac_sec, md_size, 1) <= 0)
+            return -1;
     } else {
         unsigned int md_size_u;
         /* Chop the digest off the end :-) */
         EVP_MD_CTX_init(&md_ctx);
 
-        EVP_MD_CTX_copy_ex(&md_ctx, hash);
-        EVP_DigestUpdate(&md_ctx, mac_sec, md_size);
-        EVP_DigestUpdate(&md_ctx, ssl3_pad_1, npad);
-        EVP_DigestUpdate(&md_ctx, seq, 8);
         rec_char = rec->type;
-        EVP_DigestUpdate(&md_ctx, &rec_char, 1);
         p = md;
         s2n(rec->length, p);
-        EVP_DigestUpdate(&md_ctx, md, 2);
-        EVP_DigestUpdate(&md_ctx, rec->input, rec->length);
-        EVP_DigestFinal_ex(&md_ctx, md, NULL);
-
-        EVP_MD_CTX_copy_ex(&md_ctx, hash);
-        EVP_DigestUpdate(&md_ctx, mac_sec, md_size);
-        EVP_DigestUpdate(&md_ctx, ssl3_pad_2, npad);
-        EVP_DigestUpdate(&md_ctx, md, md_size);
-        EVP_DigestFinal_ex(&md_ctx, md, &md_size_u);
+        if (EVP_MD_CTX_copy_ex(&md_ctx, hash) <= 0
+                || EVP_DigestUpdate(&md_ctx, mac_sec, md_size) <= 0
+                || EVP_DigestUpdate(&md_ctx, ssl3_pad_1, npad) <= 0
+                || EVP_DigestUpdate(&md_ctx, seq, 8) <= 0
+                || EVP_DigestUpdate(&md_ctx, &rec_char, 1) <= 0
+                || EVP_DigestUpdate(&md_ctx, md, 2) <= 0
+                || EVP_DigestUpdate(&md_ctx, rec->input, rec->length) <= 0
+                || EVP_DigestFinal_ex(&md_ctx, md, NULL) <= 0
+                || EVP_MD_CTX_copy_ex(&md_ctx, hash) <= 0
+                || EVP_DigestUpdate(&md_ctx, mac_sec, md_size) <= 0
+                || EVP_DigestUpdate(&md_ctx, ssl3_pad_2, npad) <= 0
+                || EVP_DigestUpdate(&md_ctx, md, md_size) <= 0
+                || EVP_DigestFinal_ex(&md_ctx, md, &md_size_u) <= 0) {
+            EVP_MD_CTX_cleanup(&md_ctx);
+            return -1;
+        }
         md_size = md_size_u;
 
         EVP_MD_CTX_cleanup(&md_ctx);
@@ -846,24 +857,31 @@ int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
 
     EVP_MD_CTX_init(&ctx);
     for (i = 0; i < 3; i++) {
-        EVP_DigestInit_ex(&ctx, s->ctx->sha1, NULL);
-        EVP_DigestUpdate(&ctx, salt[i], strlen((const char *)salt[i]));
-        EVP_DigestUpdate(&ctx, p, len);
-        EVP_DigestUpdate(&ctx, &(s->s3->client_random[0]), SSL3_RANDOM_SIZE);
-        EVP_DigestUpdate(&ctx, &(s->s3->server_random[0]), SSL3_RANDOM_SIZE);
-        EVP_DigestFinal_ex(&ctx, buf, &n);
-
-        EVP_DigestInit_ex(&ctx, s->ctx->md5, NULL);
-        EVP_DigestUpdate(&ctx, p, len);
-        EVP_DigestUpdate(&ctx, buf, n);
-        EVP_DigestFinal_ex(&ctx, out, &n);
+        if (EVP_DigestInit_ex(&ctx, s->ctx->sha1, NULL) <= 0
+                || EVP_DigestUpdate(&ctx, salt[i],
+                                    strlen((const char *)salt[i])) <= 0
+                || EVP_DigestUpdate(&ctx, p, len) <= 0
+                || EVP_DigestUpdate(&ctx, &(s->s3->client_random[0]),
+                                    SSL3_RANDOM_SIZE) <= 0
+                || EVP_DigestUpdate(&ctx, &(s->s3->server_random[0]),
+                                    SSL3_RANDOM_SIZE) <= 0
+                || EVP_DigestFinal_ex(&ctx, buf, &n) <= 0
+
+                || EVP_DigestInit_ex(&ctx, s->ctx->md5, NULL) <= 0
+                || EVP_DigestUpdate(&ctx, p, len) <= 0
+                || EVP_DigestUpdate(&ctx, buf, n) <= 0
+                || EVP_DigestFinal_ex(&ctx, out, &n) <= 0) {
+            SSLerr(SSL_F_SSL3_GENERATE_MASTER_SECRET, ERR_R_INTERNAL_ERROR);
+            ret = 0;
+            break;
+        }
         out += n;
         ret += n;
     }
     EVP_MD_CTX_cleanup(&ctx);
 
 #ifdef OPENSSL_SSL_TRACE_CRYPTO
-    if (s->msg_callback) {
+    if (ret > 0 && s->msg_callback) {
         s->msg_callback(2, s->version, TLS1_RT_CRYPTO_PREMASTER,
                         p, len, s, s->msg_callback_arg);
         s->msg_callback(2, s->version, TLS1_RT_CRYPTO_CLIENT_RANDOM,
diff --git a/deps/openssl/openssl/ssl/s3_lib.c b/deps/openssl/openssl/ssl/s3_lib.c
index ad9eeb6fd45345..64793d6af34f84 100644
--- a/deps/openssl/openssl/ssl/s3_lib.c
+++ b/deps/openssl/openssl/ssl/s3_lib.c
@@ -2983,7 +2983,7 @@ int ssl3_new(SSL *s)
 
 void ssl3_free(SSL *s)
 {
-    if (s == NULL)
+    if (s == NULL || s->s3 == NULL)
         return;
 
 #ifdef TLSEXT_TYPE_opaque_prf_input
diff --git a/deps/openssl/openssl/ssl/s3_pkt.c b/deps/openssl/openssl/ssl/s3_pkt.c
index 603c285ac49940..379890237e8663 100644
--- a/deps/openssl/openssl/ssl/s3_pkt.c
+++ b/deps/openssl/openssl/ssl/s3_pkt.c
@@ -1115,7 +1115,7 @@ int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
             s->rwstate = SSL_NOTHING;
             return (s->s3->wpend_ret);
         } else if (i <= 0) {
-            if (s->version == DTLS1_VERSION || s->version == DTLS1_BAD_VER) {
+            if (SSL_IS_DTLS(s)) {
                 /*
                  * For DTLS, just drop it. That's kind of the whole point in
                  * using a datagram service
diff --git a/deps/openssl/openssl/ssl/s3_srvr.c b/deps/openssl/openssl/ssl/s3_srvr.c
index acd3b9e964a239..ee83105b75bffa 100644
--- a/deps/openssl/openssl/ssl/s3_srvr.c
+++ b/deps/openssl/openssl/ssl/s3_srvr.c
@@ -383,7 +383,6 @@ int ssl3_accept(SSL *s)
                      */
                     if (al != TLS1_AD_UNKNOWN_PSK_IDENTITY)
                         SSLerr(SSL_F_SSL3_ACCEPT, SSL_R_CLIENTHELLO_TLSEXT);
-                    ret = SSL_TLSEXT_ERR_ALERT_FATAL;
                     ret = -1;
                     s->state = SSL_ST_ERR;
                     goto end;
@@ -902,7 +901,7 @@ int ssl3_send_hello_request(SSL *s)
 
 int ssl3_get_client_hello(SSL *s)
 {
-    int i, j, ok, al = SSL_AD_INTERNAL_ERROR, ret = -1;
+    int i, j, ok, al = SSL_AD_INTERNAL_ERROR, ret = -1, cookie_valid = 0;
     unsigned int cookie_len;
     long n;
     unsigned long id;
@@ -1095,8 +1094,7 @@ int ssl3_get_client_hello(SSL *s)
                 SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_COOKIE_MISMATCH);
                 goto f_err;
             }
-            /* Set to -2 so if successful we return 2 */
-            ret = -2;
+            cookie_valid = 1;
         }
 
         p += cookie_len;
@@ -1231,7 +1229,7 @@ int ssl3_get_client_hello(SSL *s)
 #ifndef OPENSSL_NO_TLSEXT
     /* TLS extensions */
     if (s->version >= SSL3_VERSION) {
-        if (!ssl_parse_clienthello_tlsext(s, &p, d, n)) {
+        if (!ssl_parse_clienthello_tlsext(s, &p, d + n)) {
             SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_PARSE_TLSEXT);
             goto err;
         }
@@ -1466,8 +1464,7 @@ int ssl3_get_client_hello(SSL *s)
         }
     }
 
-    if (ret < 0)
-        ret = -ret;
+    ret = cookie_valid ? 2 : 1;
     if (0) {
  f_err:
         ssl3_send_alert(s, SSL3_AL_FATAL, al);
@@ -1477,7 +1474,7 @@ int ssl3_get_client_hello(SSL *s)
 
     if (ciphers != NULL)
         sk_SSL_CIPHER_free(ciphers);
-    return ret < 0 ? -1 : ret;
+    return ret;
 }
 
 int ssl3_send_server_hello(SSL *s)
@@ -1950,14 +1947,22 @@ int ssl3_send_server_key_exchange(SSL *s)
                 for (num = 2; num > 0; num--) {
                     EVP_MD_CTX_set_flags(&md_ctx,
                                          EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
-                    EVP_DigestInit_ex(&md_ctx, (num == 2)
-                                      ? s->ctx->md5 : s->ctx->sha1, NULL);
-                    EVP_DigestUpdate(&md_ctx, &(s->s3->client_random[0]),
-                                     SSL3_RANDOM_SIZE);
-                    EVP_DigestUpdate(&md_ctx, &(s->s3->server_random[0]),
-                                     SSL3_RANDOM_SIZE);
-                    EVP_DigestUpdate(&md_ctx, d, n);
-                    EVP_DigestFinal_ex(&md_ctx, q, (unsigned int *)&i);
+                    if (EVP_DigestInit_ex(&md_ctx,
+                                          (num == 2) ? s->ctx->md5
+                                                     : s->ctx->sha1,
+                                          NULL) <= 0
+                        || EVP_DigestUpdate(&md_ctx, &(s->s3->client_random[0]),
+                                            SSL3_RANDOM_SIZE) <= 0
+                        || EVP_DigestUpdate(&md_ctx, &(s->s3->server_random[0]),
+                                            SSL3_RANDOM_SIZE) <= 0
+                        || EVP_DigestUpdate(&md_ctx, d, n) <= 0
+                        || EVP_DigestFinal_ex(&md_ctx, q,
+                                              (unsigned int *)&i) <= 0) {
+                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
+                               ERR_LIB_EVP);
+                        al = SSL_AD_INTERNAL_ERROR;
+                        goto f_err;
+                    }
                     q += i;
                     j += i;
                 }
@@ -1985,16 +1990,17 @@ int ssl3_send_server_key_exchange(SSL *s)
 #ifdef SSL_DEBUG
                 fprintf(stderr, "Using hash %s\n", EVP_MD_name(md));
 #endif
-                EVP_SignInit_ex(&md_ctx, md, NULL);
-                EVP_SignUpdate(&md_ctx, &(s->s3->client_random[0]),
-                               SSL3_RANDOM_SIZE);
-                EVP_SignUpdate(&md_ctx, &(s->s3->server_random[0]),
-                               SSL3_RANDOM_SIZE);
-                EVP_SignUpdate(&md_ctx, d, n);
-                if (!EVP_SignFinal(&md_ctx, &(p[2]),
-                                   (unsigned int *)&i, pkey)) {
+                if (EVP_SignInit_ex(&md_ctx, md, NULL) <= 0
+                        || EVP_SignUpdate(&md_ctx, &(s->s3->client_random[0]),
+                                          SSL3_RANDOM_SIZE) <= 0
+                        || EVP_SignUpdate(&md_ctx, &(s->s3->server_random[0]),
+                                          SSL3_RANDOM_SIZE) <= 0
+                        || EVP_SignUpdate(&md_ctx, d, n) <= 0
+                        || EVP_SignFinal(&md_ctx, &(p[2]),
+                                         (unsigned int *)&i, pkey) <= 0) {
                     SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_LIB_EVP);
-                    goto err;
+                    al = SSL_AD_INTERNAL_ERROR;
+                    goto f_err;
                 }
                 s2n(i, p);
                 n += i + 2;
@@ -2867,7 +2873,15 @@ int ssl3_get_client_key_exchange(SSL *s)
             pk = s->cert->pkeys[SSL_PKEY_GOST01].privatekey;
 
         pkey_ctx = EVP_PKEY_CTX_new(pk, NULL);
-        EVP_PKEY_decrypt_init(pkey_ctx);
+        if (pkey_ctx == NULL) {
+            al = SSL_AD_INTERNAL_ERROR;
+            SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
+            goto f_err;
+        }
+        if (EVP_PKEY_decrypt_init(pkey_ctx) <= 0) {
+            SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+            goto gerr;
+        }
         /*
          * If client certificate is present and is of the same type, maybe
          * use it for key exchange.  Don't mind errors from
@@ -3099,7 +3113,17 @@ int ssl3_get_cert_verify(SSL *s)
         unsigned char signature[64];
         int idx;
         EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new(pkey, NULL);
-        EVP_PKEY_verify_init(pctx);
+        if (pctx == NULL) {
+            al = SSL_AD_INTERNAL_ERROR;
+            SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, ERR_R_MALLOC_FAILURE);
+            goto f_err;
+        }
+        if (EVP_PKEY_verify_init(pctx) <= 0) {
+            EVP_PKEY_CTX_free(pctx);
+            al = SSL_AD_INTERNAL_ERROR;
+            SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, ERR_R_INTERNAL_ERROR);
+            goto f_err;
+        }
         if (i != 64) {
             fprintf(stderr, "GOST signature length is %d", i);
         }
diff --git a/deps/openssl/openssl/ssl/ssl.h b/deps/openssl/openssl/ssl/ssl.h
index 6fe1a2474d43a8..afec1f5bf29f69 100644
--- a/deps/openssl/openssl/ssl/ssl.h
+++ b/deps/openssl/openssl/ssl/ssl.h
@@ -2681,6 +2681,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC                 292
 # define SSL_F_SSL3_ENC                                   134
 # define SSL_F_SSL3_GENERATE_KEY_BLOCK                    238
+# define SSL_F_SSL3_GENERATE_MASTER_SECRET                388
 # define SSL_F_SSL3_GET_CERTIFICATE_REQUEST               135
 # define SSL_F_SSL3_GET_CERT_STATUS                       289
 # define SSL_F_SSL3_GET_CERT_VERIFY                       136
@@ -2846,8 +2847,11 @@ void ERR_load_SSL_strings(void);
 # define SSL_R_BAD_DATA_RETURNED_BY_CALLBACK              106
 # define SSL_R_BAD_DECOMPRESSION                          107
 # define SSL_R_BAD_DH_G_LENGTH                            108
+# define SSL_R_BAD_DH_G_VALUE                             375
 # define SSL_R_BAD_DH_PUB_KEY_LENGTH                      109
+# define SSL_R_BAD_DH_PUB_KEY_VALUE                       393
 # define SSL_R_BAD_DH_P_LENGTH                            110
+# define SSL_R_BAD_DH_P_VALUE                             395
 # define SSL_R_BAD_DIGEST_LENGTH                          111
 # define SSL_R_BAD_DSA_SIGNATURE                          112
 # define SSL_R_BAD_ECC_CERT                               304
diff --git a/deps/openssl/openssl/ssl/ssl_asn1.c b/deps/openssl/openssl/ssl/ssl_asn1.c
index 39d48eabf03b95..35cc27c5e9855e 100644
--- a/deps/openssl/openssl/ssl/ssl_asn1.c
+++ b/deps/openssl/openssl/ssl/ssl_asn1.c
@@ -121,13 +121,16 @@ typedef struct ssl_session_asn1_st {
 int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
 {
 #define LSIZE2 (sizeof(long)*2)
-    int v1 = 0, v2 = 0, v3 = 0, v4 = 0, v5 = 0, v7 = 0, v8 = 0;
+    int v1 = 0, v2 = 0, v3 = 0, v4 = 0, v5 = 0;
     unsigned char buf[4], ibuf1[LSIZE2], ibuf2[LSIZE2];
     unsigned char ibuf3[LSIZE2], ibuf4[LSIZE2], ibuf5[LSIZE2];
 #ifndef OPENSSL_NO_TLSEXT
     int v6 = 0, v9 = 0, v10 = 0;
     unsigned char ibuf6[LSIZE2];
 #endif
+#ifndef OPENSSL_NO_PSK
+    int v7 = 0, v8 = 0;
+#endif
 #ifndef OPENSSL_NO_COMP
     unsigned char cbuf;
     int v11 = 0;
diff --git a/deps/openssl/openssl/ssl/ssl_cert.c b/deps/openssl/openssl/ssl/ssl_cert.c
index 93a1eb941ab942..a73f866cb9a7fb 100644
--- a/deps/openssl/openssl/ssl/ssl_cert.c
+++ b/deps/openssl/openssl/ssl/ssl_cert.c
@@ -227,6 +227,7 @@ CERT *ssl_cert_dup(CERT *cert)
 
     memset(ret, 0, sizeof(CERT));
 
+    ret->references = 1;
     ret->key = &ret->pkeys[cert->key - &cert->pkeys[0]];
     /*
      * or ret->key = ret->pkeys + (cert->key - cert->pkeys), if you find that
@@ -325,7 +326,6 @@ CERT *ssl_cert_dup(CERT *cert)
 #endif
     }
 
-    ret->references = 1;
     /*
      * Set digests to defaults. NB: we don't copy existing values as they
      * will be set during handshake.
diff --git a/deps/openssl/openssl/ssl/ssl_ciph.c b/deps/openssl/openssl/ssl/ssl_ciph.c
index 2cc9a4a21f75a6..6957bda7850987 100644
--- a/deps/openssl/openssl/ssl/ssl_ciph.c
+++ b/deps/openssl/openssl/ssl/ssl_ciph.c
@@ -376,10 +376,11 @@ static int get_optional_pkey_id(const char *pkey_name)
     const EVP_PKEY_ASN1_METHOD *ameth;
     int pkey_id = 0;
     ameth = EVP_PKEY_asn1_find_str(NULL, pkey_name, -1);
-    if (ameth) {
-        EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL, ameth);
+    if (ameth && EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL,
+                                         ameth) > 0) {
+        return pkey_id;
     }
-    return pkey_id;
+    return 0;
 }
 
 #else
@@ -391,7 +392,9 @@ static int get_optional_pkey_id(const char *pkey_name)
     int pkey_id = 0;
     ameth = EVP_PKEY_asn1_find_str(&tmpeng, pkey_name, -1);
     if (ameth) {
-        EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL, ameth);
+        if (EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL,
+                                    ameth) <= 0)
+            pkey_id = 0;
     }
     if (tmpeng)
         ENGINE_finish(tmpeng);
@@ -1404,15 +1407,16 @@ static int check_suiteb_cipher_list(const SSL_METHOD *meth, CERT *c,
                                     const char **prule_str)
 {
     unsigned int suiteb_flags = 0, suiteb_comb2 = 0;
-    if (!strcmp(*prule_str, "SUITEB128"))
-        suiteb_flags = SSL_CERT_FLAG_SUITEB_128_LOS;
-    else if (!strcmp(*prule_str, "SUITEB128ONLY"))
+    if (strncmp(*prule_str, "SUITEB128ONLY", 13) == 0) {
         suiteb_flags = SSL_CERT_FLAG_SUITEB_128_LOS_ONLY;
-    else if (!strcmp(*prule_str, "SUITEB128C2")) {
+    } else if (strncmp(*prule_str, "SUITEB128C2", 11) == 0) {
         suiteb_comb2 = 1;
         suiteb_flags = SSL_CERT_FLAG_SUITEB_128_LOS;
-    } else if (!strcmp(*prule_str, "SUITEB192"))
+    } else if (strncmp(*prule_str, "SUITEB128", 9) == 0) {
+        suiteb_flags = SSL_CERT_FLAG_SUITEB_128_LOS;
+    } else if (strncmp(*prule_str, "SUITEB192", 9) == 0) {
         suiteb_flags = SSL_CERT_FLAG_SUITEB_192_LOS;
+    }
 
     if (suiteb_flags) {
         c->cert_flags &= ~SSL_CERT_FLAG_SUITEB_128_LOS;
diff --git a/deps/openssl/openssl/ssl/ssl_err.c b/deps/openssl/openssl/ssl/ssl_err.c
index 1a6030e6238dee..6d1366f2a59d48 100644
--- a/deps/openssl/openssl/ssl/ssl_err.c
+++ b/deps/openssl/openssl/ssl/ssl_err.c
@@ -163,6 +163,8 @@ static ERR_STRING_DATA SSL_str_functs[] = {
      "ssl3_do_change_cipher_spec"},
     {ERR_FUNC(SSL_F_SSL3_ENC), "ssl3_enc"},
     {ERR_FUNC(SSL_F_SSL3_GENERATE_KEY_BLOCK), "SSL3_GENERATE_KEY_BLOCK"},
+    {ERR_FUNC(SSL_F_SSL3_GENERATE_MASTER_SECRET),
+     "ssl3_generate_master_secret"},
     {ERR_FUNC(SSL_F_SSL3_GET_CERTIFICATE_REQUEST),
      "ssl3_get_certificate_request"},
     {ERR_FUNC(SSL_F_SSL3_GET_CERT_STATUS), "ssl3_get_cert_status"},
@@ -386,8 +388,11 @@ static ERR_STRING_DATA SSL_str_reasons[] = {
      "bad data returned by callback"},
     {ERR_REASON(SSL_R_BAD_DECOMPRESSION), "bad decompression"},
     {ERR_REASON(SSL_R_BAD_DH_G_LENGTH), "bad dh g length"},
+    {ERR_REASON(SSL_R_BAD_DH_G_VALUE), "bad dh g value"},
     {ERR_REASON(SSL_R_BAD_DH_PUB_KEY_LENGTH), "bad dh pub key length"},
+    {ERR_REASON(SSL_R_BAD_DH_PUB_KEY_VALUE), "bad dh pub key value"},
     {ERR_REASON(SSL_R_BAD_DH_P_LENGTH), "bad dh p length"},
+    {ERR_REASON(SSL_R_BAD_DH_P_VALUE), "bad dh p value"},
     {ERR_REASON(SSL_R_BAD_DIGEST_LENGTH), "bad digest length"},
     {ERR_REASON(SSL_R_BAD_DSA_SIGNATURE), "bad dsa signature"},
     {ERR_REASON(SSL_R_BAD_ECC_CERT), "bad ecc cert"},
diff --git a/deps/openssl/openssl/ssl/ssl_lib.c b/deps/openssl/openssl/ssl/ssl_lib.c
index c0931e787728ed..f2071db93702c7 100644
--- a/deps/openssl/openssl/ssl/ssl_lib.c
+++ b/deps/openssl/openssl/ssl/ssl_lib.c
@@ -307,6 +307,7 @@ SSL *SSL_new(SSL_CTX *ctx)
     s->options = ctx->options;
     s->mode = ctx->mode;
     s->max_cert_list = ctx->max_cert_list;
+    s->references = 1;
 
     if (ctx->cert != NULL) {
         /*
@@ -405,7 +406,6 @@ SSL *SSL_new(SSL_CTX *ctx)
     if (!s->method->ssl_new(s))
         goto err;
 
-    s->references = 1;
     s->server = (ctx->method->ssl_accept == ssl_undefined_function) ? 0 : 1;
 
     SSL_clear(s);
@@ -1980,7 +1980,7 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth)
 
     ret->extra_certs = NULL;
     /* No compression for DTLS */
-    if (meth->version != DTLS1_VERSION)
+    if (!(meth->ssl3_enc->enc_flags & SSL_ENC_FLAG_DTLS))
         ret->comp_methods = SSL_COMP_get_compression_methods();
 
     ret->max_send_fragment = SSL3_RT_MAX_PLAIN_LENGTH;
@@ -3507,8 +3507,11 @@ EVP_MD_CTX *ssl_replace_hash(EVP_MD_CTX **hash, const EVP_MD *md)
 {
     ssl_clear_hash_ctx(hash);
     *hash = EVP_MD_CTX_create();
-    if (md)
-        EVP_DigestInit_ex(*hash, md, NULL);
+    if (*hash == NULL || (md && EVP_DigestInit_ex(*hash, md, NULL) <= 0)) {
+        EVP_MD_CTX_destroy(*hash);
+        *hash = NULL;
+        return NULL;
+    }
     return *hash;
 }
 
diff --git a/deps/openssl/openssl/ssl/ssl_locl.h b/deps/openssl/openssl/ssl/ssl_locl.h
index 6c2c551e5e341e..a8e4efceba5f05 100644
--- a/deps/openssl/openssl/ssl/ssl_locl.h
+++ b/deps/openssl/openssl/ssl/ssl_locl.h
@@ -1366,7 +1366,7 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf,
 unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
                                           unsigned char *limit, int *al);
 int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **data,
-                                 unsigned char *d, int n);
+                                 unsigned char *limit);
 int tls1_set_server_sigalgs(SSL *s);
 int ssl_check_clienthello_tlsext_late(SSL *s);
 int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **data,
@@ -1439,15 +1439,15 @@ int tls1_cbc_remove_padding(const SSL *s,
                             SSL3_RECORD *rec,
                             unsigned block_size, unsigned mac_size);
 char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx);
-void ssl3_cbc_digest_record(const EVP_MD_CTX *ctx,
-                            unsigned char *md_out,
-                            size_t *md_out_size,
-                            const unsigned char header[13],
-                            const unsigned char *data,
-                            size_t data_plus_mac_size,
-                            size_t data_plus_mac_plus_padding_size,
-                            const unsigned char *mac_secret,
-                            unsigned mac_secret_length, char is_sslv3);
+int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx,
+                           unsigned char *md_out,
+                           size_t *md_out_size,
+                           const unsigned char header[13],
+                           const unsigned char *data,
+                           size_t data_plus_mac_size,
+                           size_t data_plus_mac_plus_padding_size,
+                           const unsigned char *mac_secret,
+                           unsigned mac_secret_length, char is_sslv3);
 
 void tls_fips_digest_extra(const EVP_CIPHER_CTX *cipher_ctx,
                            EVP_MD_CTX *mac_ctx, const unsigned char *data,
diff --git a/deps/openssl/openssl/ssl/ssl_rsa.c b/deps/openssl/openssl/ssl/ssl_rsa.c
index b1b2318350a52a..b0f75c913f9154 100644
--- a/deps/openssl/openssl/ssl/ssl_rsa.c
+++ b/deps/openssl/openssl/ssl/ssl_rsa.c
@@ -160,7 +160,10 @@ int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa)
     }
 
     RSA_up_ref(rsa);
-    EVP_PKEY_assign_RSA(pkey, rsa);
+    if (EVP_PKEY_assign_RSA(pkey, rsa) <= 0) {
+        RSA_free(rsa);
+        return 0;
+    }
 
     ret = ssl_set_pkey(ssl->cert, pkey);
     EVP_PKEY_free(pkey);
@@ -195,6 +198,15 @@ static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey)
     if (c->pkeys[i].x509 != NULL) {
         EVP_PKEY *pktmp;
         pktmp = X509_get_pubkey(c->pkeys[i].x509);
+        if (pktmp == NULL) {
+            SSLerr(SSL_F_SSL_SET_PKEY, ERR_R_MALLOC_FAILURE);
+            EVP_PKEY_free(pktmp);
+            return 0;
+        }
+        /*
+         * The return code from EVP_PKEY_copy_parameters is deliberately
+         * ignored. Some EVP_PKEY types cannot do this.
+         */
         EVP_PKEY_copy_parameters(pktmp, pkey);
         EVP_PKEY_free(pktmp);
         ERR_clear_error();
@@ -396,6 +408,10 @@ static int ssl_set_cert(CERT *c, X509 *x)
     }
 
     if (c->pkeys[i].privatekey != NULL) {
+        /*
+         * The return code from EVP_PKEY_copy_parameters is deliberately
+         * ignored. Some EVP_PKEY types cannot do this.
+         */
         EVP_PKEY_copy_parameters(pkey, c->pkeys[i].privatekey);
         ERR_clear_error();
 
@@ -516,7 +532,10 @@ int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa)
     }
 
     RSA_up_ref(rsa);
-    EVP_PKEY_assign_RSA(pkey, rsa);
+    if (EVP_PKEY_assign_RSA(pkey, rsa) <= 0) {
+        RSA_free(rsa);
+        return 0;
+    }
 
     ret = ssl_set_pkey(ctx->cert, pkey);
     EVP_PKEY_free(pkey);
@@ -750,31 +769,31 @@ static int serverinfo_find_extension(const unsigned char *serverinfo,
     *extension_data = NULL;
     *extension_length = 0;
     if (serverinfo == NULL || serverinfo_length == 0)
-        return 0;
+        return -1;
     for (;;) {
         unsigned int type = 0;
         size_t len = 0;
 
         /* end of serverinfo */
         if (serverinfo_length == 0)
-            return -1;          /* Extension not found */
+            return 0;           /* Extension not found */
 
         /* read 2-byte type field */
         if (serverinfo_length < 2)
-            return 0;           /* Error */
+            return -1;          /* Error */
         type = (serverinfo[0] << 8) + serverinfo[1];
         serverinfo += 2;
         serverinfo_length -= 2;
 
         /* read 2-byte len field */
         if (serverinfo_length < 2)
-            return 0;           /* Error */
+            return -1;          /* Error */
         len = (serverinfo[0] << 8) + serverinfo[1];
         serverinfo += 2;
         serverinfo_length -= 2;
 
         if (len > serverinfo_length)
-            return 0;           /* Error */
+            return -1;          /* Error */
 
         if (type == extension_type) {
             *extension_data = serverinfo;
@@ -814,10 +833,12 @@ static int serverinfo_srv_add_cb(SSL *s, unsigned int ext_type,
         /* Find the relevant extension from the serverinfo */
         int retval = serverinfo_find_extension(serverinfo, serverinfo_length,
                                                ext_type, out, outlen);
+        if (retval == -1) {
+            *al = SSL_AD_DECODE_ERROR;
+            return -1;          /* Error */
+        }
         if (retval == 0)
-            return 0;           /* Error */
-        if (retval == -1)
-            return -1;          /* No extension found, don't send extension */
+            return 0;           /* No extension found, don't send extension */
         return 1;               /* Send extension */
     }
     return -1;                  /* No serverinfo data found, don't send
diff --git a/deps/openssl/openssl/ssl/ssl_sess.c b/deps/openssl/openssl/ssl/ssl_sess.c
index 07e7379abfd104..68390d31080993 100644
--- a/deps/openssl/openssl/ssl/ssl_sess.c
+++ b/deps/openssl/openssl/ssl/ssl_sess.c
@@ -256,8 +256,8 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket)
     dest->tlsext_ecpointformatlist = NULL;
     dest->tlsext_ellipticcurvelist = NULL;
 # endif
-#endif
     dest->tlsext_tick = NULL;
+#endif
 #ifndef OPENSSL_NO_SRP
     dest->srp_username = NULL;
 #endif
@@ -324,7 +324,6 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket)
             goto err;
     }
 # endif
-#endif
 
     if (ticket != 0) {
         dest->tlsext_tick = BUF_memdup(src->tlsext_tick, src->tlsext_ticklen);
@@ -334,6 +333,7 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket)
         dest->tlsext_tick_lifetime_hint = 0;
         dest->tlsext_ticklen = 0;
     }
+#endif
 
 #ifndef OPENSSL_NO_SRP
     if (src->srp_username) {
diff --git a/deps/openssl/openssl/ssl/ssltest.c b/deps/openssl/openssl/ssl/ssltest.c
index 6737adf239c0b2..aaf6c6bd896df9 100644
--- a/deps/openssl/openssl/ssl/ssltest.c
+++ b/deps/openssl/openssl/ssl/ssltest.c
@@ -142,6 +142,7 @@
 
 /* Or gethostname won't be declared properly on Linux and GNU platforms. */
 #define _BSD_SOURCE 1
+#define _DEFAULT_SOURCE 1
 
 #include <assert.h>
 #include <errno.h>
diff --git a/deps/openssl/openssl/ssl/t1_enc.c b/deps/openssl/openssl/ssl/t1_enc.c
index e2a8f86919789e..f46544b4d71332 100644
--- a/deps/openssl/openssl/ssl/t1_enc.c
+++ b/deps/openssl/openssl/ssl/t1_enc.c
@@ -384,6 +384,8 @@ int tls1_change_cipher_state(SSL *s, int which)
             EVP_CIPHER_CTX_init(s->enc_read_ctx);
         dd = s->enc_read_ctx;
         mac_ctx = ssl_replace_hash(&s->read_hash, NULL);
+        if (mac_ctx == NULL)
+            goto err;
 #ifndef OPENSSL_NO_COMP
         if (s->expand != NULL) {
             COMP_CTX_free(s->expand);
@@ -422,11 +424,14 @@ int tls1_change_cipher_state(SSL *s, int which)
         dd = s->enc_write_ctx;
         if (SSL_IS_DTLS(s)) {
             mac_ctx = EVP_MD_CTX_create();
-            if (!mac_ctx)
+            if (mac_ctx == NULL)
                 goto err;
             s->write_hash = mac_ctx;
-        } else
+        } else {
             mac_ctx = ssl_replace_hash(&s->write_hash, NULL);
+            if (mac_ctx == NULL)
+                goto err;
+        }
 #ifndef OPENSSL_NO_COMP
         if (s->compress != NULL) {
             COMP_CTX_free(s->compress);
@@ -499,7 +504,12 @@ int tls1_change_cipher_state(SSL *s, int which)
     if (!(EVP_CIPHER_flags(c) & EVP_CIPH_FLAG_AEAD_CIPHER)) {
         mac_key = EVP_PKEY_new_mac_key(mac_type, NULL,
                                        mac_secret, *mac_secret_size);
-        EVP_DigestSignInit(mac_ctx, NULL, m, NULL, mac_key);
+        if (mac_key == NULL
+                || EVP_DigestSignInit(mac_ctx, NULL, m, NULL, mac_key) <= 0) {
+            EVP_PKEY_free(mac_key);
+            SSLerr(SSL_F_TLS1_CHANGE_CIPHER_STATE, ERR_R_INTERNAL_ERROR);
+            goto err2;
+        }
         EVP_PKEY_free(mac_key);
     }
 #ifdef TLS_DEBUG
@@ -931,8 +941,9 @@ int tls1_cert_verify_mac(SSL *s, int md_nid, unsigned char *out)
     }
 
     EVP_MD_CTX_init(&ctx);
-    EVP_MD_CTX_copy_ex(&ctx, d);
-    EVP_DigestFinal_ex(&ctx, out, &ret);
+    if (EVP_MD_CTX_copy_ex(&ctx, d) <=0
+            || EVP_DigestFinal_ex(&ctx, out, &ret) <= 0)
+        ret = 0;
     EVP_MD_CTX_cleanup(&ctx);
     return ((int)ret);
 }
@@ -1059,17 +1070,24 @@ int tls1_mac(SSL *ssl, unsigned char *md, int send)
          * are hashing because that gives an attacker a timing-oracle.
          */
         /* Final param == not SSLv3 */
-        ssl3_cbc_digest_record(mac_ctx,
-                               md, &md_size,
-                               header, rec->input,
-                               rec->length + md_size, orig_len,
-                               ssl->s3->read_mac_secret,
-                               ssl->s3->read_mac_secret_size, 0);
+        if (ssl3_cbc_digest_record(mac_ctx,
+                                   md, &md_size,
+                                   header, rec->input,
+                                   rec->length + md_size, orig_len,
+                                   ssl->s3->read_mac_secret,
+                                   ssl->s3->read_mac_secret_size, 0) <= 0) {
+            if (!stream_mac)
+                EVP_MD_CTX_cleanup(&hmac);
+            return -1;
+        }
     } else {
-        EVP_DigestSignUpdate(mac_ctx, header, sizeof(header));
-        EVP_DigestSignUpdate(mac_ctx, rec->input, rec->length);
-        t = EVP_DigestSignFinal(mac_ctx, md, &md_size);
-        OPENSSL_assert(t > 0);
+        if (EVP_DigestSignUpdate(mac_ctx, header, sizeof(header)) <= 0
+                || EVP_DigestSignUpdate(mac_ctx, rec->input, rec->length) <= 0
+                || EVP_DigestSignFinal(mac_ctx, md, &md_size) <= 0) {
+            if (!stream_mac)
+                EVP_MD_CTX_cleanup(&hmac);
+            return -1;
+        }
 #ifdef OPENSSL_FIPS
         if (!send && FIPS_mode())
             tls_fips_digest_extra(ssl->enc_read_ctx,
diff --git a/deps/openssl/openssl/ssl/t1_lib.c b/deps/openssl/openssl/ssl/t1_lib.c
index 210a5e87430f26..3176d1e3babaeb 100644
--- a/deps/openssl/openssl/ssl/t1_lib.c
+++ b/deps/openssl/openssl/ssl/t1_lib.c
@@ -497,7 +497,7 @@ static int tls1_get_curvelist(SSL *s, int sess,
             } else
 # endif
             {
-                if (!s->server || (s->cert && s->cert->ecdh_tmp_auto)) {
+                if (!s->server || s->cert->ecdh_tmp_auto) {
                     *pcurves = eccurves_auto;
                     pcurveslen = sizeof(eccurves_auto);
                 } else {
@@ -1837,7 +1837,7 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf,
  * 10.8..10.8.3 (which don't work).
  */
 static void ssl_check_for_safari(SSL *s, const unsigned char *data,
-                                 const unsigned char *d, int n)
+                                 const unsigned char *limit)
 {
     unsigned short type, size;
     static const unsigned char kSafariExtensionsBlock[] = {
@@ -1866,11 +1866,11 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data,
         0x02, 0x03,             /* SHA-1/ECDSA */
     };
 
-    if (data >= (d + n - 2))
+    if (data >= (limit - 2))
         return;
     data += 2;
 
-    if (data > (d + n - 4))
+    if (data > (limit - 4))
         return;
     n2s(data, type);
     n2s(data, size);
@@ -1878,7 +1878,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data,
     if (type != TLSEXT_TYPE_server_name)
         return;
 
-    if (data + size > d + n)
+    if (data + size > limit)
         return;
     data += size;
 
@@ -1886,7 +1886,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data,
         const size_t len1 = sizeof(kSafariExtensionsBlock);
         const size_t len2 = sizeof(kSafariTLS12ExtensionsBlock);
 
-        if (data + len1 + len2 != d + n)
+        if (data + len1 + len2 != limit)
             return;
         if (memcmp(data, kSafariExtensionsBlock, len1) != 0)
             return;
@@ -1895,7 +1895,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data,
     } else {
         const size_t len = sizeof(kSafariExtensionsBlock);
 
-        if (data + len != d + n)
+        if (data + len != limit)
             return;
         if (memcmp(data, kSafariExtensionsBlock, len) != 0)
             return;
@@ -1974,7 +1974,7 @@ static int tls1_alpn_handle_client_hello(SSL *s, const unsigned char *data,
 }
 
 static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p,
-                                       unsigned char *d, int n, int *al)
+                                       unsigned char *limit, int *al)
 {
     unsigned short type;
     unsigned short size;
@@ -1999,7 +1999,7 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p,
 
 # ifndef OPENSSL_NO_EC
     if (s->options & SSL_OP_SAFARI_ECDHE_ECDSA_BUG)
-        ssl_check_for_safari(s, data, d, n);
+        ssl_check_for_safari(s, data, limit);
 # endif                         /* !OPENSSL_NO_EC */
 
     /* Clear any signature algorithms extension received */
@@ -2016,22 +2016,22 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p,
 
     s->srtp_profile = NULL;
 
-    if (data == d + n)
+    if (data == limit)
         goto ri_check;
 
-    if (data > (d + n - 2))
+    if (data > (limit - 2))
         goto err;
 
     n2s(data, len);
 
-    if (data > (d + n - len))
+    if (data + len != limit)
         goto err;
 
-    while (data <= (d + n - 4)) {
+    while (data <= (limit - 4)) {
         n2s(data, type);
         n2s(data, size);
 
-        if (data + size > (d + n))
+        if (data + size > (limit))
             goto err;
 # if 0
         fprintf(stderr, "Received extension type %d size %d\n", type, size);
@@ -2405,7 +2405,7 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p,
     }
 
     /* Spurious data on the end */
-    if (data != d + n)
+    if (data != limit)
         goto err;
 
     *p = data;
@@ -2465,8 +2465,8 @@ static int ssl_scan_clienthello_custom_tlsext(SSL *s,
     return 1;
 }
 
-int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d,
-                                 int n)
+int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p,
+                                 unsigned char *limit)
 {
     int al = -1;
     unsigned char *ptmp = *p;
@@ -2476,7 +2476,7 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d,
      * switch the parent context using SSL_set_SSL_CTX and custom extensions
      * need to be handled by the new SSL_CTX structure.
      */
-    if (ssl_scan_clienthello_tlsext(s, p, d, n, &al) <= 0) {
+    if (ssl_scan_clienthello_tlsext(s, p, limit, &al) <= 0) {
         ssl3_send_alert(s, SSL3_AL_FATAL, al);
         return 0;
     }
@@ -2487,7 +2487,7 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d,
     }
 
     custom_ext_init(&s->cert->srv_ext);
-    if (ssl_scan_clienthello_custom_tlsext(s, ptmp, d + n, &al) <= 0) {
+    if (ssl_scan_clienthello_custom_tlsext(s, ptmp, limit, &al) <= 0) {
         ssl3_send_alert(s, SSL3_AL_FATAL, al);
         return 0;
     }
@@ -3385,10 +3385,13 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick,
         /* Check key name matches */
         if (memcmp(etick, tctx->tlsext_tick_key_name, 16))
             return 2;
-        HMAC_Init_ex(&hctx, tctx->tlsext_tick_hmac_key, 16,
-                     tlsext_tick_md(), NULL);
-        EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL,
-                           tctx->tlsext_tick_aes_key, etick + 16);
+        if (HMAC_Init_ex(&hctx, tctx->tlsext_tick_hmac_key, 16,
+                         tlsext_tick_md(), NULL) <= 0
+                || EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL,
+                                      tctx->tlsext_tick_aes_key,
+                                      etick + 16) <= 0) {
+            goto err;
+       }
     }
     /*
      * Attempt to process session ticket, first conduct sanity and integrity
@@ -3396,13 +3399,14 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick,
      */
     mlen = HMAC_size(&hctx);
     if (mlen < 0) {
-        EVP_CIPHER_CTX_cleanup(&ctx);
-        return -1;
+        goto err;
     }
     eticklen -= mlen;
     /* Check HMAC of encrypted ticket */
-    HMAC_Update(&hctx, etick, eticklen);
-    HMAC_Final(&hctx, tick_hmac, NULL);
+    if (HMAC_Update(&hctx, etick, eticklen) <= 0
+            || HMAC_Final(&hctx, tick_hmac, NULL) <= 0) {
+        goto err;
+    }
     HMAC_CTX_cleanup(&hctx);
     if (CRYPTO_memcmp(tick_hmac, etick + eticklen, mlen)) {
         EVP_CIPHER_CTX_cleanup(&ctx);
@@ -3413,11 +3417,10 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick,
     p = etick + 16 + EVP_CIPHER_CTX_iv_length(&ctx);
     eticklen -= 16 + EVP_CIPHER_CTX_iv_length(&ctx);
     sdec = OPENSSL_malloc(eticklen);
-    if (!sdec) {
+    if (!sdec || EVP_DecryptUpdate(&ctx, sdec, &slen, p, eticklen) <= 0) {
         EVP_CIPHER_CTX_cleanup(&ctx);
         return -1;
     }
-    EVP_DecryptUpdate(&ctx, sdec, &slen, p, eticklen);
     if (EVP_DecryptFinal(&ctx, sdec + slen, &mlen) <= 0) {
         EVP_CIPHER_CTX_cleanup(&ctx);
         OPENSSL_free(sdec);
@@ -3450,6 +3453,10 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick,
      * For session parse failure, indicate that we need to send a new ticket.
      */
     return 2;
+err:
+    EVP_CIPHER_CTX_cleanup(&ctx);
+    HMAC_CTX_cleanup(&hctx);
+    return -1;
 }
 
 /* Tables to translate from NIDs to TLS v1.2 ids */
diff --git a/deps/openssl/openssl/ssl/tls1.h b/deps/openssl/openssl/ssl/tls1.h
index 5929607ff8b6ef..7e237d0631a3c4 100644
--- a/deps/openssl/openssl/ssl/tls1.h
+++ b/deps/openssl/openssl/ssl/tls1.h
@@ -231,13 +231,12 @@ extern "C" {
 /* ExtensionType value from RFC5620 */
 # define TLSEXT_TYPE_heartbeat   15
 
-/* ExtensionType value from draft-ietf-tls-applayerprotoneg-00 */
+/* ExtensionType value from RFC7301 */
 # define TLSEXT_TYPE_application_layer_protocol_negotiation 16
 
 /*
  * ExtensionType value for TLS padding extension.
- * http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml
- * http://tools.ietf.org/html/draft-agl-tls-padding-03
+ * http://tools.ietf.org/html/draft-agl-tls-padding
  */
 # define TLSEXT_TYPE_padding     21
 
@@ -262,20 +261,19 @@ extern "C" {
 #  define TLSEXT_TYPE_next_proto_neg              13172
 # endif
 
-/* NameType value from RFC 3546 */
+/* NameType value from RFC3546 */
 # define TLSEXT_NAMETYPE_host_name 0
-/* status request value from RFC 3546 */
+/* status request value from RFC3546 */
 # define TLSEXT_STATUSTYPE_ocsp 1
 
-/* ECPointFormat values from draft-ietf-tls-ecc-12 */
+/* ECPointFormat values from RFC4492 */
 # define TLSEXT_ECPOINTFORMAT_first                      0
 # define TLSEXT_ECPOINTFORMAT_uncompressed               0
 # define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime  1
 # define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2  2
 # define TLSEXT_ECPOINTFORMAT_last                       2
 
-/* Signature and hash algorithms from RFC 5246 */
-
+/* Signature and hash algorithms from RFC5246 */
 # define TLSEXT_signature_anonymous                      0
 # define TLSEXT_signature_rsa                            1
 # define TLSEXT_signature_dsa                            2
@@ -430,7 +428,6 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
 # define TLS1_CK_DHE_DSS_WITH_RC4_128_SHA                0x03000066
 
 /* AES ciphersuites from RFC3268 */
-
 # define TLS1_CK_RSA_WITH_AES_128_SHA                    0x0300002F
 # define TLS1_CK_DH_DSS_WITH_AES_128_SHA                 0x03000030
 # define TLS1_CK_DH_RSA_WITH_AES_128_SHA                 0x03000031
@@ -595,7 +592,7 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
 # define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA               "DHE-RSA-AES256-SHA"
 # define TLS1_TXT_ADH_WITH_AES_256_SHA                   "ADH-AES256-SHA"
 
-/* ECC ciphersuites from draft-ietf-tls-ecc-01.txt (Mar 15, 2001) */
+/* ECC ciphersuites from RFC4492 */
 # define TLS1_TXT_ECDH_ECDSA_WITH_NULL_SHA               "ECDH-ECDSA-NULL-SHA"
 # define TLS1_TXT_ECDH_ECDSA_WITH_RC4_128_SHA            "ECDH-ECDSA-RC4-SHA"
 # define TLS1_TXT_ECDH_ECDSA_WITH_DES_192_CBC3_SHA       "ECDH-ECDSA-DES-CBC3-SHA"
diff --git a/deps/openssl/openssl/test/Makefile b/deps/openssl/openssl/test/Makefile
index e695073fd3f54a..b180971b28e729 100644
--- a/deps/openssl/openssl/test/Makefile
+++ b/deps/openssl/openssl/test/Makefile
@@ -69,6 +69,7 @@ ASN1TEST=	asn1test
 HEARTBEATTEST=  heartbeat_test
 CONSTTIMETEST=  constant_time_test
 VERIFYEXTRATEST=	verify_extra_test
+CLIENTHELLOTEST=	clienthellotest
 
 TESTS=		alltests
 
@@ -81,7 +82,8 @@ EXE=	$(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT)  $(ECDSATEST)$(EXE_EXT) $(ECDHTEST)
 	$(BFTEST)$(EXE_EXT) $(CASTTEST)$(EXE_EXT) $(SSLTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) $(DSATEST)$(EXE_EXT) $(RSATEST)$(EXE_EXT) \
 	$(EVPTEST)$(EXE_EXT) $(EVPEXTRATEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) $(JPAKETEST)$(EXE_EXT) $(SRPTEST)$(EXE_EXT) \
 	$(ASN1TEST)$(EXE_EXT) $(V3NAMETEST)$(EXE_EXT) $(HEARTBEATTEST)$(EXE_EXT) \
-	$(CONSTTIMETEST)$(EXE_EXT) $(VERIFYEXTRATEST)$(EXE_EXT)
+	$(CONSTTIMETEST)$(EXE_EXT) $(VERIFYEXTRATEST)$(EXE_EXT) \
+	$(CLIENTHELLOTEST)$(EXE_EXT)
 
 # $(METHTEST)$(EXE_EXT)
 
@@ -94,7 +96,8 @@ OBJ=	$(BNTEST).o $(ECTEST).o  $(ECDSATEST).o $(ECDHTEST).o $(IDEATEST).o \
 	$(RANDTEST).o $(DHTEST).o $(ENGINETEST).o $(CASTTEST).o \
 	$(BFTEST).o  $(SSLTEST).o  $(DSATEST).o  $(EXPTEST).o $(RSATEST).o \
 	$(EVPTEST).o $(EVPEXTRATEST).o $(IGETEST).o $(JPAKETEST).o $(ASN1TEST).o $(V3NAMETEST).o \
-	$(HEARTBEATTEST).o $(CONSTTIMETEST).o $(VERIFYEXTRATEST).o
+	$(HEARTBEATTEST).o $(CONSTTIMETEST).o $(VERIFYEXTRATEST).o \
+	$(CLIENTHELLOTEST).o
 
 SRC=	$(BNTEST).c $(ECTEST).c  $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
 	$(MD2TEST).c  $(MD4TEST).c $(MD5TEST).c \
@@ -104,7 +107,8 @@ SRC=	$(BNTEST).c $(ECTEST).c  $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
 	$(RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \
 	$(BFTEST).c  $(SSLTEST).c $(DSATEST).c   $(EXPTEST).c $(RSATEST).c \
 	$(EVPTEST).c $(EVPEXTRATEST).c $(IGETEST).c $(JPAKETEST).c $(SRPTEST).c $(ASN1TEST).c \
-	$(V3NAMETEST).c $(HEARTBEATTEST).c $(CONSTTIMETEST).c $(VERIFYEXTRATEST).c
+	$(V3NAMETEST).c $(HEARTBEATTEST).c $(CONSTTIMETEST).c $(VERIFYEXTRATEST).c \
+	$(CLIENTHELLOTEST).c
 
 EXHEADER= 
 HEADER=	testutil.h $(EXHEADER)
@@ -148,7 +152,7 @@ alltests: \
 	test_gen test_req test_pkcs7 test_verify test_dh test_dsa \
 	test_ss test_ca test_engine test_evp test_evp_extra test_ssl test_tsa test_ige \
 	test_jpake test_srp test_cms test_ocsp test_v3name test_heartbeat \
-	test_constant_time test_verify_extra
+	test_constant_time test_verify_extra test_clienthello
 
 test_evp: $(EVPTEST)$(EXE_EXT) evptests.txt
 	../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt
@@ -241,7 +245,7 @@ test_bn: $(BNTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) bctest
 	@../util/shlib_wrap.sh ./$(BNTEST) >tmp.bntest
 	@echo quit >>tmp.bntest
 	@echo "running bc"
-	@<tmp.bntest sh -c "`sh ./bctest ignore`" | $(PERL) -e '$$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $$1";} elsif (!/^0$$/) {die "\nFailed! bc: $$_";} else {print STDERR "."; $$i++;}} print STDERR "\n$$i tests passed\n"'
+	@<tmp.bntest sh -c "`sh ./bctest ignore`" | $(PERL) -e '$$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $$1";} elsif (!/^0\r?$$/) {die "\nFailed! bc: $$_";} else {print STDERR "."; $$i++;}} print STDERR "\n$$i tests passed\n"'
 	@echo 'test a^b%c implementations'
 	../util/shlib_wrap.sh ./$(EXPTEST)
 
@@ -353,6 +357,10 @@ test_verify_extra: $(VERIFYEXTRATEST)$(EXE_EXT)
 	@echo $(START) $@
 	../util/shlib_wrap.sh ./$(VERIFYEXTRATEST)
 
+test_clienthello: $(CLIENTHELLOTEST)$(EXE_EXT)
+	@echo $(START) $@
+	../util/shlib_wrap.sh ./$(CLIENTHELLOTEST)
+
 lint:
 	lint -DLINT $(INCLUDES) $(SRC)>fluff
 
@@ -527,6 +535,9 @@ $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
 $(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEXTRATEST).o
 	@target=$(VERIFYEXTRATEST) $(BUILD_CMD)
 
+$(CLIENTHELLOTEST)$(EXE_EXT): $(CLIENTHELLOTEST).o
+	@target=$(CLIENTHELLOTEST) $(BUILD_CMD)
+
 #$(AESTEST).o: $(AESTEST).c
 #	$(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
 
@@ -572,6 +583,26 @@ bntest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 bntest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h bntest.c
 casttest.o: ../e_os.h ../include/openssl/cast.h ../include/openssl/e_os2.h
 casttest.o: ../include/openssl/opensslconf.h casttest.c
+clienthellotest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+clienthellotest.o: ../include/openssl/buffer.h ../include/openssl/comp.h
+clienthellotest.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
+clienthellotest.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+clienthellotest.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+clienthellotest.o: ../include/openssl/err.h ../include/openssl/evp.h
+clienthellotest.o: ../include/openssl/hmac.h ../include/openssl/kssl.h
+clienthellotest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
+clienthellotest.o: ../include/openssl/objects.h
+clienthellotest.o: ../include/openssl/opensslconf.h
+clienthellotest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+clienthellotest.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+clienthellotest.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
+clienthellotest.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+clienthellotest.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+clienthellotest.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+clienthellotest.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+clienthellotest.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+clienthellotest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+clienthellotest.o: clienthellotest.c
 constant_time_test.o: ../crypto/constant_time_locl.h ../e_os.h
 constant_time_test.o: ../include/openssl/e_os2.h
 constant_time_test.o: ../include/openssl/opensslconf.h constant_time_test.c
diff --git a/deps/openssl/openssl/test/bctest b/deps/openssl/openssl/test/bctest
deleted file mode 100755
index bdb3218f7acaa2..00000000000000
--- a/deps/openssl/openssl/test/bctest
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-# This script is used by test/Makefile.ssl to check whether a sane 'bc'
-# is installed.
-# ('make test_bn' should not try to run 'bc' if it does not exist or if
-# it is a broken 'bc' version that is known to cause trouble.)
-#
-# If 'bc' works, we also test if it knows the 'print' command.
-#
-# In any case, output an appropriate command line for running (or not
-# running) bc.
-
-
-IFS=:
-try_without_dir=true
-# First we try "bc", then "$dir/bc" for each item in $PATH.
-for dir in dummy:$PATH; do
-    if [ "$try_without_dir" = true ]; then
-      # first iteration
-      bc=bc
-      try_without_dir=false
-    else
-      # second and later iterations
-      bc="$dir/bc"
-      if [ ! -f "$bc" ]; then  # '-x' is not available on Ultrix
-        bc=''
-      fi
-    fi
-
-    if [ ! "$bc" = '' ]; then
-        failure=none
-
-
-        # Test for SunOS 5.[78] bc bug
-        "$bc" >tmp.bctest <<\EOF
-obase=16
-ibase=16
-a=AD88C418F31B3FC712D0425001D522B3AE9134FF3A98C13C1FCC1682211195406C1A6C66C6A\
-CEEC1A0EC16950233F77F1C2F2363D56DD71A36C57E0B2511FC4BA8F22D261FE2E9356D99AF57\
-10F3817C0E05BF79C423C3F66FDF321BE8D3F18F625D91B670931C1EF25F28E489BDA1C5422D1\
-C3F6F7A1AD21585746ECC4F10A14A778AF56F08898E965E9909E965E0CB6F85B514150C644759\
-3BE731877B16EA07B552088FF2EA728AC5E0FF3A23EB939304519AB8B60F2C33D6BA0945B66F0\
-4FC3CADF855448B24A9D7640BCF473E
-b=DCE91E7D120B983EA9A104B5A96D634DD644C37657B1C7860B45E6838999B3DCE5A555583C6\
-9209E41F413422954175A06E67FFEF6746DD652F0F48AEFECC3D8CAC13523BDAAD3F5AF4212BD\
-8B3CD64126E1A82E190228020C05B91C8B141F1110086FC2A4C6ED631EBA129D04BB9A19FC53D\
-3ED0E2017D60A68775B75481449
-(a/b)*b + (a%b) - a
-EOF
-        if [ 0 != "`cat tmp.bctest`" ]; then
-            failure=SunOStest
-        fi
-
-
-        if [ "$failure" = none ]; then
-            # Test for SCO bc bug.
-            "$bc" >tmp.bctest <<\EOF
-obase=16
-ibase=16
--FFDD63BA1A4648F0D804F8A1C66C53F0D2110590E8A3907EC73B4AEC6F15AC177F176F2274D2\
-9DC8022EA0D7DD3ABE9746D2D46DD3EA5B5F6F69DF12877E0AC5E7F5ADFACEE54573F5D256A06\
-11B5D2BC24947724E22AE4EC3FB0C39D9B4694A01AFE5E43B4D99FB9812A0E4A5773D8B254117\
-1239157EC6E3D8D50199 * -FFDD63BA1A4648F0D804F8A1C66C53F0D2110590E8A3907EC73B4\
-AEC6F15AC177F176F2274D29DC8022EA0D7DD3ABE9746D2D46DD3EA5B5F6F69DF12877E0AC5E7\
-F5ADFACEE54573F5D256A0611B5D2BC24947724E22AE4EC3FB0C39D9B4694A01AFE5E43B4D99F\
-B9812A0E4A5773D8B2541171239157EC6E3D8D50199 - FFBACC221682DA464B6D7F123482522\
-02EDAEDCA38C3B69E9B7BBCD6165A9CD8716C4903417F23C09A85B851961F92C217258CEEB866\
-85EFCC5DD131853A02C07A873B8E2AF2E40C6D5ED598CD0E8F35AD49F3C3A17FDB7653E4E2DC4\
-A8D23CC34686EE4AD01F7407A7CD74429AC6D36DBF0CB6A3E302D0E5BDFCD048A3B90C1BE5AA8\
-E16C3D5884F9136B43FF7BB443764153D4AEC176C681B078F4CC53D6EB6AB76285537DDEE7C18\
-8C72441B52EDBDDBC77E02D34E513F2AABF92F44109CAFE8242BD0ECBAC5604A94B02EA44D43C\
-04E9476E6FBC48043916BFA1485C6093603600273C9C33F13114D78064AE42F3DC466C7DA543D\
-89C8D71
-AD534AFBED2FA39EE9F40E20FCF9E2C861024DB98DDCBA1CD118C49CA55EEBC20D6BA51B2271C\
-928B693D6A73F67FEB1B4571448588B46194617D25D910C6A9A130CC963155CF34079CB218A44\
-8A1F57E276D92A33386DDCA3D241DB78C8974ABD71DD05B0FA555709C9910D745185E6FE108E3\
-37F1907D0C56F8BFBF52B9704 % -E557905B56B13441574CAFCE2BD257A750B1A8B2C88D0E36\
-E18EF7C38DAC80D3948E17ED63AFF3B3467866E3B89D09A81B3D16B52F6A3C7134D3C6F5123E9\
-F617E3145BBFBE9AFD0D6E437EA4FF6F04BC67C4F1458B4F0F47B64 - 1C2BBBB19B74E86FD32\
-9E8DB6A8C3B1B9986D57ED5419C2E855F7D5469E35E76334BB42F4C43E3F3A31B9697C171DAC4\
-D97935A7E1A14AD209D6CF811F55C6DB83AA9E6DFECFCD6669DED7171EE22A40C6181615CAF3F\
-5296964
-EOF
-            if [ "0
-0" != "`cat tmp.bctest`" ]; then
-                failure=SCOtest
-            fi
-        fi
-
-
-        if [ "$failure" = none ]; then
-            # bc works; now check if it knows the 'print' command.
-            if [ "OK" = "`echo 'print \"OK\"' | $bc 2>/dev/null`" ]
-            then
-                echo "$bc"
-            else
-                echo "sed 's/print.*//' | $bc"
-            fi
-            exit 0
-        fi
-
-        echo "$bc does not work properly ('$failure' failed).  Looking for another bc ..." >&2
-    fi
-done
-
-echo "No working bc found.  Consider installing GNU bc." >&2
-if [ "$1" = ignore ]; then
-  echo "cat >/dev/null"
-  exit 0
-fi
-exit 1
diff --git a/deps/openssl/openssl/test/bftest.c b/deps/openssl/openssl/test/bftest.c
index 78b1749a4d1ad2..eb8c15de7ecf13 120000
--- a/deps/openssl/openssl/test/bftest.c
+++ b/deps/openssl/openssl/test/bftest.c
@@ -1 +1 @@
-../crypto/bf/bftest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/bf/bftest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/bntest.c b/deps/openssl/openssl/test/bntest.c
index 03f54a238ef1d3..1f781768a9a449 120000
--- a/deps/openssl/openssl/test/bntest.c
+++ b/deps/openssl/openssl/test/bntest.c
@@ -1 +1 @@
-../crypto/bn/bntest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/bn/bntest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/casttest.c b/deps/openssl/openssl/test/casttest.c
index ac7ede8d795c61..823c4bb36cde1b 120000
--- a/deps/openssl/openssl/test/casttest.c
+++ b/deps/openssl/openssl/test/casttest.c
@@ -1 +1 @@
-../crypto/cast/casttest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/cast/casttest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/certs/pss1.pem b/deps/openssl/openssl/test/certs/pss1.pem
new file mode 100644
index 00000000000000..29da71dae8ae4d
--- /dev/null
+++ b/deps/openssl/openssl/test/certs/pss1.pem
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDdjCCAjqgAwIBAgIJANcwZLyfEv7DMD4GCSqGSIb3DQEBCjAxoA0wCwYJYIZI
+AWUDBAIBoRowGAYJKoZIhvcNAQEIMAsGCWCGSAFlAwQCAaIEAgIA3jAnMSUwIwYD
+VQQDDBxUZXN0IEludmFsaWQgUFNTIGNlcnRpZmljYXRlMB4XDTE1MTEwNDE2MDIz
+NVoXDTE1MTIwNDE2MDIzNVowJzElMCMGA1UEAwwcVGVzdCBJbnZhbGlkIFBTUyBj
+ZXJ0aWZpY2F0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMTaM7WH
+qVCAGAIA+zL1KWvvASTrhlq+1ePdO7wsrWX2KiYoTYrJYTnxhLnn0wrHqApt79nL
+IBG7cfShyZqFHOY/IzlYPMVt+gPo293gw96Fds5JBsjhjkyGnOyr9OUntFqvxDbT
+IIFU7o9IdxD4edaqjRv+fegVE+B79pDk4s0ujsk6dULtCg9Rst0ucGFo19mr+b7k
+dbfn8pZ72ZNDJPueVdrUAWw9oll61UcYfk75XdrLk6JlL41GrYHc8KlfXf43gGQq
+QfrpHkg4Ih2cI6Wt2nhFGAzrlcorzLliQIUJRIhM8h4IgDfpBpaPdVQLqS2pFbXa
+5eQjqiyJwak2vJ8CAwEAAaNQME4wHQYDVR0OBBYEFCt180N4oGUt5LbzBwQ4Ia+2
+4V97MB8GA1UdIwQYMBaAFCt180N4oGUt5LbzBwQ4Ia+24V97MAwGA1UdEwQFMAMB
+Af8wMQYJKoZIhvcNAQEKMCSgDTALBglghkgBZQMEAgGhDTALBgkqhkiG9w0BAQii
+BAICAN4DggEBAAjBtm90lGxgddjc4Xu/nbXXFHVs2zVcHv/mqOZoQkGB9r/BVgLb
+xhHrFZ2pHGElbUYPfifdS9ztB73e1d4J+P29o0yBqfd4/wGAc/JA8qgn6AAEO/Xn
+plhFeTRJQtLZVl75CkHXgUGUd3h+ADvKtcBuW9dSUncaUrgNKR8u/h/2sMG38RWY
+DzBddC/66YTa3r7KkVUfW7yqRQfELiGKdcm+bjlTEMsvS+EhHup9CzbpoCx2Fx9p
+NPtFY3yEObQhmL1JyoCRWqBE75GzFPbRaiux5UpEkns+i3trkGssZzsOuVqHNTNZ
+lC9+9hPHIoc9UMmAQNo1vGIW3NWVoeGbaJ8=
+-----END CERTIFICATE-----
diff --git a/deps/openssl/openssl/test/clienthellotest.c b/deps/openssl/openssl/test/clienthellotest.c
new file mode 120000
index 00000000000000..ae25f16c43fe3f
--- /dev/null
+++ b/deps/openssl/openssl/test/clienthellotest.c
@@ -0,0 +1 @@
+openssl-1.0.2e/../ssl/clienthellotest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/constant_time_test.c b/deps/openssl/openssl/test/constant_time_test.c
index 519f2f35114d8c..4f9a6aa6e5a6ff 120000
--- a/deps/openssl/openssl/test/constant_time_test.c
+++ b/deps/openssl/openssl/test/constant_time_test.c
@@ -1 +1 @@
-../crypto/constant_time_test.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/constant_time_test.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/destest.c b/deps/openssl/openssl/test/destest.c
index 5988c7303a3789..fd77cd5ca86d94 120000
--- a/deps/openssl/openssl/test/destest.c
+++ b/deps/openssl/openssl/test/destest.c
@@ -1 +1 @@
-../crypto/des/destest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/des/destest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/dhtest.c b/deps/openssl/openssl/test/dhtest.c
index 9a67f9162884dc..7c3e64db0d89bf 120000
--- a/deps/openssl/openssl/test/dhtest.c
+++ b/deps/openssl/openssl/test/dhtest.c
@@ -1 +1 @@
-../crypto/dh/dhtest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/dh/dhtest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/dsatest.c b/deps/openssl/openssl/test/dsatest.c
index 16a1b5a349f314..1a181759a183f8 120000
--- a/deps/openssl/openssl/test/dsatest.c
+++ b/deps/openssl/openssl/test/dsatest.c
@@ -1 +1 @@
-../crypto/dsa/dsatest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/dsa/dsatest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/ecdhtest.c b/deps/openssl/openssl/test/ecdhtest.c
index 206d98686d7dd3..5e24a98a670cb2 120000
--- a/deps/openssl/openssl/test/ecdhtest.c
+++ b/deps/openssl/openssl/test/ecdhtest.c
@@ -1 +1 @@
-../crypto/ecdh/ecdhtest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/ecdh/ecdhtest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/ecdsatest.c b/deps/openssl/openssl/test/ecdsatest.c
index 441082ba24381a..c2bbe4f91b3ac3 120000
--- a/deps/openssl/openssl/test/ecdsatest.c
+++ b/deps/openssl/openssl/test/ecdsatest.c
@@ -1 +1 @@
-../crypto/ecdsa/ecdsatest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/ecdsa/ecdsatest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/ectest.c b/deps/openssl/openssl/test/ectest.c
index df1831f812c540..e25805f3e0274d 120000
--- a/deps/openssl/openssl/test/ectest.c
+++ b/deps/openssl/openssl/test/ectest.c
@@ -1 +1 @@
-../crypto/ec/ectest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/ec/ectest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/enginetest.c b/deps/openssl/openssl/test/enginetest.c
index 5c74a6f418995f..7eb1831ea39848 120000
--- a/deps/openssl/openssl/test/enginetest.c
+++ b/deps/openssl/openssl/test/enginetest.c
@@ -1 +1 @@
-../crypto/engine/enginetest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/engine/enginetest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/evp_extra_test.c b/deps/openssl/openssl/test/evp_extra_test.c
index 2f2a8f7b08aaad..7be69e4f57972e 120000
--- a/deps/openssl/openssl/test/evp_extra_test.c
+++ b/deps/openssl/openssl/test/evp_extra_test.c
@@ -1 +1 @@
-../crypto/evp/evp_extra_test.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/evp/evp_extra_test.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/evp_test.c b/deps/openssl/openssl/test/evp_test.c
index 074162812a3856..969b2dfaca9a28 120000
--- a/deps/openssl/openssl/test/evp_test.c
+++ b/deps/openssl/openssl/test/evp_test.c
@@ -1 +1 @@
-../crypto/evp/evp_test.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/evp/evp_test.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/exptest.c b/deps/openssl/openssl/test/exptest.c
index 50ccf71cbb71e2..cea2f17017cdd5 120000
--- a/deps/openssl/openssl/test/exptest.c
+++ b/deps/openssl/openssl/test/exptest.c
@@ -1 +1 @@
-../crypto/bn/exptest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/bn/exptest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/heartbeat_test.c b/deps/openssl/openssl/test/heartbeat_test.c
index 79576fd5aaf874..836fb8a6d71de4 120000
--- a/deps/openssl/openssl/test/heartbeat_test.c
+++ b/deps/openssl/openssl/test/heartbeat_test.c
@@ -1 +1 @@
-../ssl/heartbeat_test.c
\ No newline at end of file
+openssl-1.0.2e/../ssl/heartbeat_test.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/hmactest.c b/deps/openssl/openssl/test/hmactest.c
index 353ee2c7f984ce..a646bcdd43548f 120000
--- a/deps/openssl/openssl/test/hmactest.c
+++ b/deps/openssl/openssl/test/hmactest.c
@@ -1 +1 @@
-../crypto/hmac/hmactest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/hmac/hmactest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/ideatest.c b/deps/openssl/openssl/test/ideatest.c
index a9bfb3d480410d..ba9935815cddd1 120000
--- a/deps/openssl/openssl/test/ideatest.c
+++ b/deps/openssl/openssl/test/ideatest.c
@@ -1 +1 @@
-../crypto/idea/ideatest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/idea/ideatest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/jpaketest.c b/deps/openssl/openssl/test/jpaketest.c
index 49f44f8b69e54d..1b5e260fabc70e 120000
--- a/deps/openssl/openssl/test/jpaketest.c
+++ b/deps/openssl/openssl/test/jpaketest.c
@@ -1 +1 @@
-dummytest.c
\ No newline at end of file
+openssl-1.0.2e/dummytest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/md2test.c b/deps/openssl/openssl/test/md2test.c
index 49f44f8b69e54d..1b5e260fabc70e 120000
--- a/deps/openssl/openssl/test/md2test.c
+++ b/deps/openssl/openssl/test/md2test.c
@@ -1 +1 @@
-dummytest.c
\ No newline at end of file
+openssl-1.0.2e/dummytest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/md4test.c b/deps/openssl/openssl/test/md4test.c
index 1509be911dad49..88e2eb82c7497e 120000
--- a/deps/openssl/openssl/test/md4test.c
+++ b/deps/openssl/openssl/test/md4test.c
@@ -1 +1 @@
-../crypto/md4/md4test.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/md4/md4test.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/md5test.c b/deps/openssl/openssl/test/md5test.c
index 20f4aaf0a4ec8d..62779aedff6c78 120000
--- a/deps/openssl/openssl/test/md5test.c
+++ b/deps/openssl/openssl/test/md5test.c
@@ -1 +1 @@
-../crypto/md5/md5test.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/md5/md5test.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/mdc2test.c b/deps/openssl/openssl/test/mdc2test.c
index c4ffe4835e9fb3..89c5faf92ecd01 120000
--- a/deps/openssl/openssl/test/mdc2test.c
+++ b/deps/openssl/openssl/test/mdc2test.c
@@ -1 +1 @@
-../crypto/mdc2/mdc2test.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/mdc2/mdc2test.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/randtest.c b/deps/openssl/openssl/test/randtest.c
index a2b107a2b0e9ce..7094f41bd03fce 120000
--- a/deps/openssl/openssl/test/randtest.c
+++ b/deps/openssl/openssl/test/randtest.c
@@ -1 +1 @@
-../crypto/rand/randtest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/rand/randtest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/rc2test.c b/deps/openssl/openssl/test/rc2test.c
index 5c53ad984a4cbc..4101b4f4e815da 120000
--- a/deps/openssl/openssl/test/rc2test.c
+++ b/deps/openssl/openssl/test/rc2test.c
@@ -1 +1 @@
-../crypto/rc2/rc2test.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/rc2/rc2test.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/rc4test.c b/deps/openssl/openssl/test/rc4test.c
index 061ac37734469a..d3c90794b3071a 120000
--- a/deps/openssl/openssl/test/rc4test.c
+++ b/deps/openssl/openssl/test/rc4test.c
@@ -1 +1 @@
-../crypto/rc4/rc4test.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/rc4/rc4test.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/rc5test.c b/deps/openssl/openssl/test/rc5test.c
index 49f44f8b69e54d..1b5e260fabc70e 120000
--- a/deps/openssl/openssl/test/rc5test.c
+++ b/deps/openssl/openssl/test/rc5test.c
@@ -1 +1 @@
-dummytest.c
\ No newline at end of file
+openssl-1.0.2e/dummytest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/rmdtest.c b/deps/openssl/openssl/test/rmdtest.c
index ce66460654dcbb..1744939e0fcde9 120000
--- a/deps/openssl/openssl/test/rmdtest.c
+++ b/deps/openssl/openssl/test/rmdtest.c
@@ -1 +1 @@
-../crypto/ripemd/rmdtest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/ripemd/rmdtest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/rsa_test.c b/deps/openssl/openssl/test/rsa_test.c
index aaea20d98ba744..4bc7c768096927 120000
--- a/deps/openssl/openssl/test/rsa_test.c
+++ b/deps/openssl/openssl/test/rsa_test.c
@@ -1 +1 @@
-../crypto/rsa/rsa_test.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/rsa/rsa_test.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/sha1test.c b/deps/openssl/openssl/test/sha1test.c
index 8d66e9ee4c2f0e..172c67cc8db9ba 120000
--- a/deps/openssl/openssl/test/sha1test.c
+++ b/deps/openssl/openssl/test/sha1test.c
@@ -1 +1 @@
-../crypto/sha/sha1test.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/sha/sha1test.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/sha256t.c b/deps/openssl/openssl/test/sha256t.c
index 952a5086766530..2f356c921b6358 120000
--- a/deps/openssl/openssl/test/sha256t.c
+++ b/deps/openssl/openssl/test/sha256t.c
@@ -1 +1 @@
-../crypto/sha/sha256t.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/sha/sha256t.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/sha512t.c b/deps/openssl/openssl/test/sha512t.c
index c80d152f1ba546..fbab5ab848c6a6 120000
--- a/deps/openssl/openssl/test/sha512t.c
+++ b/deps/openssl/openssl/test/sha512t.c
@@ -1 +1 @@
-../crypto/sha/sha512t.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/sha/sha512t.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/shatest.c b/deps/openssl/openssl/test/shatest.c
index 43cfda78fbfdea..b0bffa74fd288a 120000
--- a/deps/openssl/openssl/test/shatest.c
+++ b/deps/openssl/openssl/test/shatest.c
@@ -1 +1 @@
-../crypto/sha/shatest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/sha/shatest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/srptest.c b/deps/openssl/openssl/test/srptest.c
index 95348682676ae6..4f8b8f850c7ec1 120000
--- a/deps/openssl/openssl/test/srptest.c
+++ b/deps/openssl/openssl/test/srptest.c
@@ -1 +1 @@
-../crypto/srp/srptest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/srp/srptest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/ssltest.c b/deps/openssl/openssl/test/ssltest.c
index 40191f0da24210..9ee1c02f163ca9 120000
--- a/deps/openssl/openssl/test/ssltest.c
+++ b/deps/openssl/openssl/test/ssltest.c
@@ -1 +1 @@
-../ssl/ssltest.c
\ No newline at end of file
+openssl-1.0.2e/../ssl/ssltest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/tx509 b/deps/openssl/openssl/test/tx509
index 0ce3b5223c5bcf..77f5cacfcac971 100644
--- a/deps/openssl/openssl/test/tx509
+++ b/deps/openssl/openssl/test/tx509
@@ -74,5 +74,12 @@ if [ $? != 0 ]; then exit 1; fi
 cmp x509-f.p x509-ff.p3
 if [ $? != 0 ]; then exit 1; fi
 
+echo "Parsing test certificates"
+
+$cmd -in certs/pss1.pem -text -noout >/dev/null
+if [ $? != 0 ]; then exit 1; fi
+
+echo OK
+
 /bin/rm -f x509-f.* x509-ff.* x509-fff.*
 exit 0
diff --git a/deps/openssl/openssl/test/v3nametest.c b/deps/openssl/openssl/test/v3nametest.c
index 1d209eb96323d0..05ac9411585abe 120000
--- a/deps/openssl/openssl/test/v3nametest.c
+++ b/deps/openssl/openssl/test/v3nametest.c
@@ -1 +1 @@
-../crypto/x509v3/v3nametest.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/x509v3/v3nametest.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/verify_extra_test.c b/deps/openssl/openssl/test/verify_extra_test.c
index 11d837c6fae49a..0d94843bbfd7b7 120000
--- a/deps/openssl/openssl/test/verify_extra_test.c
+++ b/deps/openssl/openssl/test/verify_extra_test.c
@@ -1 +1 @@
-../crypto/x509/verify_extra_test.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/x509/verify_extra_test.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/test/wp_test.c b/deps/openssl/openssl/test/wp_test.c
index 81b2021f39a222..a0a05266b1f471 120000
--- a/deps/openssl/openssl/test/wp_test.c
+++ b/deps/openssl/openssl/test/wp_test.c
@@ -1 +1 @@
-../crypto/whrlpool/wp_test.c
\ No newline at end of file
+openssl-1.0.2e/../crypto/whrlpool/wp_test.c
\ No newline at end of file
diff --git a/deps/openssl/openssl/times/090/586-100.nt b/deps/openssl/openssl/times/090/586-100.nt
deleted file mode 100644
index 297ec3e7f08882..00000000000000
--- a/deps/openssl/openssl/times/090/586-100.nt
+++ /dev/null
@@ -1,32 +0,0 @@
-SSLeay 0.9.0 08-Apr-1998
-built on Wed Apr  8 12:47:17 EST 1998
-options:bn(64,32) md2(int) rc4(idx,int) des(idx,cisc,4,long) idea(int) blowfish(
-ptr2)
-C flags:cl /MD /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DWIN32 -DL_ENDIAN
--DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                 92.25k      256.80k      347.01k      380.40k      390.31k
-mdc2               240.72k      251.10k      252.00k      250.80k      251.40k
-md5               1013.61k     5651.94k    11831.61k    16294.89k    17901.43k
-hmac(md5)          419.50k     2828.07k     7770.11k    13824.34k    17091.70k
-sha1               524.31k     2721.45k     5216.15k     6766.10k     7308.42k
-rmd160             462.09k     2288.59k     4260.77k     5446.44k     5841.65k
-rc4               7895.90k    10326.73k    10555.43k    10728.22k    10429.44k
-des cbc           2036.86k     2208.92k     2237.68k     2237.20k     2181.35k
-des ede3           649.92k      739.42k      749.07k      748.86k      738.27k
-idea cbc           823.19k      885.10k      894.92k      896.45k      891.87k
-rc2 cbc            792.63k      859.00k      867.45k      868.96k      865.30k
-rc5-32/12 cbc     3502.26k     4026.79k     4107.23k     4121.76k     4073.72k
-blowfish cbc      3752.96k     4026.79k     4075.31k     3965.87k     3892.26k
-cast cbc          2566.27k     2807.43k     2821.79k     2792.48k     2719.34k
-                  sign    verify    sign/s verify/s
-rsa  512 bits   0.0179s   0.0020s     56.0    501.7
-rsa 1024 bits   0.0950s   0.0060s     10.5    166.6
-rsa 2048 bits   0.6299s   0.0209s      1.6     47.8
-rsa 4096 bits   4.5870s   0.0787s      0.2     12.7
-                  sign    verify    sign/s verify/s
-dsa  512 bits   0.0180s   0.0339s     55.6     29.5
-dsa 1024 bits   0.0555s   0.1076s     18.0      9.3
-dsa 2048 bits   0.1971s   0.3918s      5.1      2.6
-
diff --git a/deps/openssl/openssl/times/091/486-50.nt b/deps/openssl/openssl/times/091/486-50.nt
deleted file mode 100644
index 84820d9c650987..00000000000000
--- a/deps/openssl/openssl/times/091/486-50.nt
+++ /dev/null
@@ -1,30 +0,0 @@
-486-50 NT 4.0
-
-SSLeay 0.9.1a 06-Jul-1998
-built on Sat Jul 18 18:03:20 EST 1998
-options:bn(64,32) md2(int) rc4(idx,int) des(idx,cisc,4,long) idea(int) blowfish(ptr2)
-C flags:cl /MD /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DWIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM /Fdout32
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                 28.77k       80.30k      108.50k      118.98k      122.47k
-mdc2                51.52k       54.06k       54.54k       54.65k       54.62k
-md5                304.39k     1565.04k     3061.54k     3996.10k     4240.10k
-hmac(md5)          119.53k      793.23k     2061.29k     3454.95k     4121.76k
-sha1               127.51k      596.93k     1055.54k     1313.84k     1413.18k
-rmd160             128.50k      572.49k     1001.03k     1248.01k     1323.63k
-rc4               1224.40k     1545.11k     1590.29k     1600.20k     1576.90k
-des cbc            448.19k      503.45k      512.30k      513.30k      508.23k
-des ede3           148.66k      162.48k      163.68k      163.94k      164.24k
-idea cbc           194.18k      211.10k      212.99k      213.18k      212.64k
-rc2 cbc            245.78k      271.01k      274.12k      274.38k      273.52k
-rc5-32/12 cbc     1252.48k     1625.20k     1700.03k     1711.12k     1677.18k
-blowfish cbc       725.16k      828.26k      850.01k      846.99k      833.79k
-cast cbc           643.30k      717.22k      739.48k      741.57k      735.33k
-                  sign    verify    sign/s verify/s
-rsa  512 bits   0.0904s   0.0104s     11.1     96.2
-rsa 1024 bits   0.5968s   0.0352s      1.7     28.4
-rsa 2048 bits   3.8860s   0.1017s      0.3      9.8
-                  sign    verify    sign/s verify/s
-dsa  512 bits   0.1006s   0.1249s      9.9      8.0
-dsa 1024 bits   0.3306s   0.4093s      3.0      2.4
-dsa 2048 bits   0.9454s   1.1707s      1.1      0.9
diff --git a/deps/openssl/openssl/times/091/586-100.lnx b/deps/openssl/openssl/times/091/586-100.lnx
deleted file mode 100644
index 92892a672db775..00000000000000
--- a/deps/openssl/openssl/times/091/586-100.lnx
+++ /dev/null
@@ -1,32 +0,0 @@
-Pentium 100mhz, linux
-
-SSLeay 0.9.0a 14-Apr-1998
-built on Fri Apr 17 08:47:07 EST 1998
-options:bn(64,32) md2(int) rc4(idx,int) des(ptr,risc1,16,long) idea(int) blowfish(ptr2)
-C flags:gcc -DL_ENDIAN -DTERMIO -DBN_ASM -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                 56.65k      153.88k      208.47k      229.03k      237.57k
-mdc2               189.59k      204.95k      206.93k      208.90k      209.56k
-md5               1019.48k     5882.41k    12085.42k    16376.49k    18295.47k
-hmac(md5)          415.86k     2887.85k     7891.29k    13894.66k    17446.23k
-sha1               540.68k     2791.96k     5289.30k     6813.01k     7432.87k
-rmd160             298.37k     1846.87k     3869.10k     5273.94k     5892.78k
-rc4               7870.87k    10438.10k    10857.13k    10729.47k    10788.86k
-des cbc           1960.60k     2226.37k     2241.88k     2054.83k     2181.80k
-des ede3           734.44k      739.69k      779.43k      750.25k      772.78k
-idea cbc           654.07k      711.00k      716.89k      718.51k      720.90k
-rc2 cbc            648.83k      701.91k      708.61k      708.95k      709.97k
-rc5-32/12 cbc     3504.71k     4054.76k     4131.41k     4105.56k     4134.23k
-blowfish cbc      3762.25k     4313.79k     4460.54k     4356.78k     4317.18k
-cast cbc          2755.01k     3038.91k     3076.44k     3027.63k     2998.27k
-                  sign    verify    sign/s verify/s
-rsa  512 bits   0.0195s   0.0019s     51.4    519.9
-rsa 1024 bits   0.1000s   0.0059s     10.0    168.2
-rsa 2048 bits   0.6406s   0.0209s      1.6     47.8
-rsa 4096 bits   4.6100s   0.0787s      0.2     12.7
-                  sign    verify    sign/s verify/s
-dsa  512 bits   0.0188s   0.0360s     53.1     27.8
-dsa 1024 bits   0.0570s   0.1126s     17.5      8.9
-dsa 2048 bits   0.1990s   0.3954s      5.0      2.5
-
diff --git a/deps/openssl/openssl/times/091/68000.bsd b/deps/openssl/openssl/times/091/68000.bsd
deleted file mode 100644
index a3a14e80873e8d..00000000000000
--- a/deps/openssl/openssl/times/091/68000.bsd
+++ /dev/null
@@ -1,32 +0,0 @@
-Motorolla 68020 20mhz, NetBSD
-
-SSLeay 0.9.0t 29-May-1998
-built on Fri Jun  5 12:42:23 EST 1998
-options:bn(64,32) md2(char) rc4(idx,int) des(idx,cisc,16,long) idea(int) blowfish(idx) 
-C flags:gcc -DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2               2176.00      5994.67      8079.73      8845.18      9077.01 
-mdc2              5730.67      6122.67      6167.66      6176.51      6174.87 
-md5                 29.10k      127.31k      209.66k      250.50k      263.99k
-hmac(md5)           12.33k       73.02k      160.17k      228.04k      261.15k
-sha1                11.27k       49.37k       84.31k      102.40k      109.23k
-rmd160              11.69k       48.62k       78.76k       93.15k       98.41k
-rc4                117.96k      148.94k      152.57k      153.09k      152.92k
-des cbc             27.13k       30.06k       30.38k       30.38k       30.53k
-des ede3            10.51k       10.94k       11.01k       11.01k       11.01k
-idea cbc            26.74k       29.23k       29.45k       29.60k       29.74k
-rc2 cbc             34.27k       39.39k       40.03k       40.07k       40.16k
-rc5-32/12 cbc       64.31k       83.18k       85.70k       86.70k       87.09k
-blowfish cbc        48.86k       59.18k       60.07k       60.42k       60.78k
-cast cbc            42.67k       50.01k       50.86k       51.20k       51.37k
-                  sign    verify    sign/s verify/s
-rsa  512 bits   0.7738s   0.0774s      1.3     12.9
-rsa 1024 bits   4.3967s   0.2615s      0.2      3.8
-rsa 2048 bits  29.5200s   0.9664s      0.0      1.0
-                  sign    verify    sign/s verify/s
-dsa  512 bits   0.7862s   0.9709s      1.3      1.0
-dsa 1024 bits   2.5375s   3.1625s      0.4      0.3
-dsa 2048 bits   9.2150s  11.8200s      0.1      0.1
-
-
diff --git a/deps/openssl/openssl/times/091/686-200.lnx b/deps/openssl/openssl/times/091/686-200.lnx
deleted file mode 100644
index bb857d48d0e3bb..00000000000000
--- a/deps/openssl/openssl/times/091/686-200.lnx
+++ /dev/null
@@ -1,32 +0,0 @@
-Pentium Pro 200mhz, linux
-
-SSLeay 0.9.0d 26-Apr-1998
-built on Sun Apr 26 10:25:33 EST 1998
-options:bn(64,32) md2(int) rc4(idx,int) des(ptr,risc1,16,long) idea(int) blowfish(ptr2) 
-C flags:gcc -DL_ENDIAN -DTERMIO -DBN_ASM -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                130.58k      364.54k      499.24k      545.79k      561.66k
-mdc2               526.68k      579.72k      588.37k      588.80k      589.82k
-md5               1917.71k    11434.69k    22512.21k    29495.30k    32677.89k
-hmac(md5)          749.18k     5264.83k    14227.20k    25018.71k    31760.38k
-sha1              1343.83k     6436.29k    11702.78k    14664.70k    15829.67k
-rmd160            1038.05k     5138.77k     8985.51k    10985.13k    11799.21k
-rc4              14891.04k    21334.06k    22376.79k    22579.54k    22574.42k
-des cbc           4131.97k     4568.31k     4645.29k     4631.21k     4572.73k
-des ede3          1567.17k     1631.13k     1657.32k     1653.08k     1643.86k
-idea cbc          2427.23k     2671.21k     2716.67k     2723.84k     2733.40k
-rc2 cbc           1629.90k     1767.38k     1788.50k     1797.12k     1799.51k
-rc5-32/12 cbc    10290.55k    13161.60k    13744.55k    14011.73k    14123.01k
-blowfish cbc      5896.42k     6920.77k     7122.01k     7151.62k     7146.15k
-cast cbc          6037.71k     6935.19k     7101.35k     7145.81k     7116.12k
-                  sign    verify    sign/s verify/s
-rsa  512 bits   0.0070s   0.0007s    142.6   1502.9
-rsa 1024 bits   0.0340s   0.0019s     29.4    513.3
-rsa 2048 bits   0.2087s   0.0066s      4.8    151.3
-rsa 4096 bits   1.4700s   0.0242s      0.7     41.2
-                  sign    verify    sign/s verify/s
-dsa  512 bits   0.0064s   0.0121s    156.1     82.9
-dsa 1024 bits   0.0184s   0.0363s     54.4     27.5
-dsa 2048 bits   0.0629s   0.1250s     15.9      8.0
-
diff --git a/deps/openssl/openssl/times/091/alpha064.osf b/deps/openssl/openssl/times/091/alpha064.osf
deleted file mode 100644
index a8e7fdfd610e09..00000000000000
--- a/deps/openssl/openssl/times/091/alpha064.osf
+++ /dev/null
@@ -1,32 +0,0 @@
-Alpha EV4.5 (21064) 275mhz, OSF1 V4.0
-SSLeay 0.9.0g 01-May-1998
-built on Mon May  4 17:26:09 CST 1998
-options:bn(64,64) md2(int) rc4(ptr,int) des(idx,cisc,4,long) idea(int) blowfish(idx) 
-C flags:cc -tune host -O4 -readonly_strings
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                119.58k      327.48k      443.28k      480.09k      495.16k
-mdc2               436.67k      456.35k      465.42k      466.57k      469.01k
-md5               1459.34k     6566.46k    11111.91k    13375.30k    14072.60k
-hmac(md5)          597.90k     3595.45k     8180.88k    12099.49k    13884.46k
-sha1               707.01k     3253.09k     6131.73k     7798.23k     8439.67k
-rmd160             618.57k     2729.07k     4711.33k     5825.16k     6119.23k
-rc4               8796.43k     9393.62k     9548.88k     9378.77k     9472.57k
-des cbc           2165.97k     2514.90k     2586.27k     2572.93k     2639.08k
-des ede3           945.44k     1004.03k     1005.96k     1017.33k     1020.85k
-idea cbc          1498.81k     1629.11k     1637.28k     1625.50k     1641.11k
-rc2 cbc           1866.00k     2044.92k     2067.12k     2064.00k     2068.96k
-rc5-32/12 cbc     4366.97k     5521.32k     5687.50k     5729.16k     5736.96k
-blowfish cbc      3997.31k     4790.60k     4937.84k     4954.56k     5024.85k
-cast cbc          2900.19k     3673.30k     3803.73k     3823.93k     3890.25k
-                  sign    verify    sign/s verify/s
-rsa  512 bits   0.0069s   0.0006s    144.2   1545.8
-rsa 1024 bits   0.0304s   0.0018s     32.9    552.6
-rsa 2048 bits   0.1887s   0.0062s      5.3    161.4
-rsa 4096 bits   1.3667s   0.0233s      0.7     42.9
-                  sign    verify    sign/s verify/s
-dsa  512 bits   0.0067s   0.0123s    149.6     81.1
-dsa 1024 bits   0.0177s   0.0332s     56.6     30.1
-dsa 2048 bits   0.0590s   0.1162s     16.9      8.6
-
-
diff --git a/deps/openssl/openssl/times/091/alpha164.lnx b/deps/openssl/openssl/times/091/alpha164.lnx
deleted file mode 100644
index c994662698ce49..00000000000000
--- a/deps/openssl/openssl/times/091/alpha164.lnx
+++ /dev/null
@@ -1,32 +0,0 @@
-Alpha EV5.6 (21164A) 533mhz, Linux 2.0.32
-
-SSLeay 0.9.0p 22-May-1998
-built on Sun May 27 14:23:38 GMT 2018
-options:bn(64,64) md2(int) rc4(ptr,int) des(idx,risc1,16,long) idea(int) blowfish(idx) 
-C flags:gcc -O3
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                295.78k      825.34k     1116.42k     1225.10k     1262.65k
-mdc2               918.16k     1017.55k     1032.18k     1034.24k     1035.60k
-md5               3574.93k    15517.05k    25482.67k    30434.31k    32210.51k
-hmac(md5)         1261.54k     7757.15k    18025.46k    27081.21k    31653.27k
-sha1              2251.89k    10056.84k    16990.19k    20651.04k    21973.29k
-rmd160            1615.49k     7017.13k    11601.11k    13875.62k    14690.31k
-rc4              22435.16k    24476.40k    24349.95k    23042.36k    24581.53k
-des cbc           5198.38k     6559.04k     6775.43k     6827.87k     6875.82k
-des ede3          2257.73k     2602.18k     2645.60k     2657.12k     2670.59k
-idea cbc          3694.42k     4125.61k     4180.74k     4193.28k     4192.94k
-rc2 cbc           4642.47k     5323.85k     5415.42k     5435.86k     5434.03k
-rc5-32/12 cbc     9705.26k    13277.79k    13843.46k    13989.66k    13987.57k
-blowfish cbc      7861.28k    10852.34k    11447.98k    11616.97k    11667.54k
-cast cbc          6718.13k     8599.98k     8967.17k     9070.81k     9099.28k
-                  sign    verify    sign/s verify/s
-rsa  512 bits   0.0018s   0.0002s    555.9   6299.5
-rsa 1024 bits   0.0081s   0.0005s    123.3   2208.7
-rsa 2048 bits   0.0489s   0.0015s     20.4    648.5
-rsa 4096 bits   0.3402s   0.0057s      2.9    174.7
-                  sign    verify    sign/s verify/s
-dsa  512 bits   0.0019s   0.0032s    529.0    310.2
-dsa 1024 bits   0.0047s   0.0086s    214.1    115.7
-dsa 2048 bits   0.0150s   0.0289s     66.7     34.6
-
diff --git a/deps/openssl/openssl/times/091/alpha164.osf b/deps/openssl/openssl/times/091/alpha164.osf
deleted file mode 100644
index df712c689ff24f..00000000000000
--- a/deps/openssl/openssl/times/091/alpha164.osf
+++ /dev/null
@@ -1,31 +0,0 @@
-Alpha EV5.6 (21164A) 400mhz, OSF1 V4.0
-
-SSLeay 0.9.0 10-Apr-1998
-built on Sun Apr 19 07:54:37 EST 1998
-options:bn(64,64) md2(int) rc4(ptr,int) des(ptr,risc2,4,int) idea(int) blowfish(idx) 
-C flags:cc -O4 -tune host -fast
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                276.30k      762.07k     1034.35k     1134.07k     1160.53k
-mdc2               814.99k      845.83k      849.09k      850.33k      849.24k
-md5               2468.43k    10945.27k    17963.48k    21430.89k    22544.38k
-hmac(md5)         1002.48k     6023.98k    13430.99k    19344.17k    22351.80k
-sha1              1984.93k     8882.47k    14856.47k    17878.70k    18955.10k
-rmd160            1286.96k     5595.52k     9167.00k    10957.74k    11582.30k
-rc4              15948.15k    16710.29k    16793.20k    17929.50k    18474.56k
-des cbc           3416.04k     4149.37k     4296.25k     4328.89k     4327.57k
-des ede3          1540.14k     1683.36k     1691.14k     1705.90k     1705.22k
-idea cbc          2795.87k     3192.93k     3238.13k     3238.17k     3256.66k
-rc2 cbc           3529.00k     4069.93k     4135.79k     4135.25k     4160.07k
-rc5-32/12 cbc     7212.35k     9849.71k    10260.91k    10423.38k    10439.99k
-blowfish cbc      6061.75k     8363.50k     8706.80k     8779.40k     8784.55k
-cast cbc          5401.75k     6433.31k     6638.18k     6662.40k     6702.80k
-                  sign    verify    sign/s verify/s
-rsa  512 bits   0.0022s   0.0002s    449.6   4916.2
-rsa 1024 bits   0.0105s   0.0006s     95.3   1661.2
-rsa 2048 bits   0.0637s   0.0020s     15.7    495.6
-rsa 4096 bits   0.4457s   0.0075s      2.2    132.7
-                  sign    verify    sign/s verify/s
-dsa  512 bits   0.0028s   0.0048s    362.2    210.4
-dsa 1024 bits   0.0064s   0.0123s    155.2     81.6
-dsa 2048 bits   0.0201s   0.0394s     49.7     25.4
diff --git a/deps/openssl/openssl/times/091/mips-rel.pl b/deps/openssl/openssl/times/091/mips-rel.pl
deleted file mode 100644
index 4b2509315a4172..00000000000000
--- a/deps/openssl/openssl/times/091/mips-rel.pl
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/local/bin/perl
-
-&doit(100,"Pentium   100 32",0.0195,0.1000,0.6406,4.6100);	# pentium-100
-&doit(200,"PPro      200 32",0.0070,0.0340,0.2087,1.4700);	# pentium-100
-&doit( 25,"R3000      25 32",0.0860,0.4825,3.2417,23.8833);	# R3000-25
-&doit(200,"R4400     200 32",0.0137,0.0717,0.4730,3.4367);	# R4400 32bit
-&doit(180,"R10000    180 32",0.0061,0.0311,0.1955,1.3871);	# R10000 32bit
-&doit(180,"R10000    180 64",0.0034,0.0149,0.0880,0.5933);	# R10000 64bit
-&doit(400,"DEC 21164 400 64",0.0022,0.0105,0.0637,0.4457);	# R10000 64bit
-
-sub doit
-	{
-	local($mhz,$label,@data)=@_;
-
-	for ($i=0; $i <= $#data; $i++)
-		{
-		$data[$i]=1/$data[$i]*200/$mhz;
-		}
-	printf("%s %6.1f %6.1f %6.1f %6.1f\n",$label,@data);
-	}
-
diff --git a/deps/openssl/openssl/times/091/r10000.irx b/deps/openssl/openssl/times/091/r10000.irx
deleted file mode 100644
index 237ee5d1929123..00000000000000
--- a/deps/openssl/openssl/times/091/r10000.irx
+++ /dev/null
@@ -1,37 +0,0 @@
-MIPS R10000 32kI+32kD 180mhz, IRIX 6.4
-
-Using crypto/bn/mips3.s
-
-This is built for n32, which is faster for all benchmarks than the n64
-compilation model
-
-SSLeay 0.9.0b 19-Apr-1998
-built on Sat Apr 25 12:43:14 EST 1998
-options:bn(64,64) md2(int) rc4(ptr,int) des(ptr,risc2,16,long) idea(int) blowfish(ptr) 
-C flags:cc -use_readonly_const -O2 -DTERMIOS -DB_ENDIAN
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                126.38k      349.38k      472.67k      517.01k      529.81k
-mdc2               501.64k      545.87k      551.80k      553.64k      554.41k
-md5               1825.77k     7623.64k    12630.47k    15111.74k    16012.09k
-hmac(md5)          780.81k     4472.86k     9667.22k    13802.67k    15777.89k
-sha1              1375.52k     6213.91k    11037.30k    13682.01k    14714.09k
-rmd160             856.72k     3454.40k     5598.33k     6689.94k     7073.48k
-rc4              11260.93k    13311.50k    13360.05k    13322.17k    13364.39k
-des cbc           2770.78k     3055.42k     3095.18k     3092.48k     3103.03k
-des ede3          1023.22k     1060.58k     1063.81k     1070.37k     1064.54k
-idea cbc          3029.09k     3334.30k     3375.29k     3375.65k     3380.64k
-rc2 cbc           2307.45k     2470.72k     2501.25k     2500.68k     2500.55k
-rc5-32/12 cbc     6770.91k     8629.89k     8909.58k     9009.64k     9044.95k
-blowfish cbc      4796.53k     5598.20k     5717.14k     5755.11k     5749.86k
-cast cbc          3986.20k     4426.17k     4465.04k     4476.84k     4475.08k
-                  sign    verify    sign/s verify/s
-rsa  512 bits   0.0034s   0.0003s    296.1   3225.4
-rsa 1024 bits   0.0139s   0.0008s     71.8   1221.8
-rsa 2048 bits   0.0815s   0.0026s     12.3    380.3
-rsa 4096 bits   0.5656s   0.0096s      1.8    103.7
-                  sign    verify    sign/s verify/s
-dsa  512 bits   0.0034s   0.0061s    290.8    164.9
-dsa 1024 bits   0.0084s   0.0161s    119.1     62.3
-dsa 2048 bits   0.0260s   0.0515s     38.5     19.4
-
diff --git a/deps/openssl/openssl/times/091/r3000.ult b/deps/openssl/openssl/times/091/r3000.ult
deleted file mode 100644
index ecd33908bbd6e1..00000000000000
--- a/deps/openssl/openssl/times/091/r3000.ult
+++ /dev/null
@@ -1,32 +0,0 @@
-MIPS R3000 64kI+64kD 25mhz, ultrix 4.3
-
-SSLeay 0.9.0b 19-Apr-1998
-built on Thu Apr 23 07:22:31 EST 1998
-options:bn(32,32) md2(int) rc4(ptr,int) des(ptr,risc2,16,long) idea(int) blowfish(idx) 
-C flags:cc -O2 -DL_ENDIAN -DNOPROTO -DNOCONST
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                 14.63k       40.65k       54.70k       60.07k       61.78k
-mdc2                29.43k       37.27k       38.23k       38.57k       38.60k
-md5                140.04k      676.59k     1283.84k     1654.10k     1802.24k
-hmac(md5)           60.51k      378.90k      937.82k     1470.46k     1766.74k
-sha1                60.77k      296.79k      525.40k      649.90k      699.05k
-rmd160              48.82k      227.16k      417.19k      530.31k      572.05k
-rc4                904.76k      996.20k     1007.53k     1015.65k     1010.35k
-des cbc            178.87k      209.39k      213.42k      215.55k      214.53k
-des ede3            74.25k       79.30k       80.40k       80.21k       80.14k
-idea cbc           181.02k      209.37k      214.44k      214.36k      213.83k
-rc2 cbc            161.52k      184.98k      187.99k      188.76k      189.05k
-rc5-32/12 cbc      398.99k      582.91k      614.66k      626.07k      621.87k
-blowfish cbc       296.38k      387.69k      405.50k      412.57k      410.05k
-cast cbc           214.76k      260.63k      266.92k      268.63k      258.26k
-                  sign    verify    sign/s verify/s
-rsa  512 bits   0.0870s   0.0089s     11.5    112.4
-rsa 1024 bits   0.4881s   0.0295s      2.0     33.9
-rsa 2048 bits   3.2750s   0.1072s      0.3      9.3
-rsa 4096 bits  23.9833s   0.4093s      0.0      2.4
-                  sign    verify    sign/s verify/s
-dsa  512 bits   0.0898s   0.1706s     11.1      5.9
-dsa 1024 bits   0.2847s   0.5565s      3.5      1.8
-dsa 2048 bits   1.0267s   2.0433s      1.0      0.5
-
diff --git a/deps/openssl/openssl/times/091/r4400.irx b/deps/openssl/openssl/times/091/r4400.irx
deleted file mode 100644
index 9b96ca110a9c52..00000000000000
--- a/deps/openssl/openssl/times/091/r4400.irx
+++ /dev/null
@@ -1,32 +0,0 @@
-R4400 16kI+16kD 200mhz, Irix 5.3
-
-SSLeay 0.9.0e 27-Apr-1998
-built on Sun Apr 26 07:26:05 PDT 1998
-options:bn(64,32) md2(int) rc4(ptr,int) des(ptr,risc2,16,long) idea(int) blowfish(ptr) 
-C flags:cc -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                 79.80k      220.59k      298.01k      327.06k      338.60k
-mdc2               262.74k      285.30k      289.16k      288.36k      288.49k
-md5                930.35k     4167.13k     7167.91k     8678.23k     9235.86k
-hmac(md5)          399.44k     2367.57k     5370.74k     7884.28k     9076.98k
-sha1               550.96k     2488.17k     4342.76k     5362.50k     5745.40k
-rmd160             424.58k     1752.83k     2909.67k     3486.08k     3702.89k
-rc4               6687.79k     7834.63k     7962.61k     8035.65k     7915.28k
-des cbc           1544.20k     1725.94k     1748.35k     1758.17k     1745.61k
-des ede3           587.29k      637.75k      645.93k      643.17k      646.01k
-idea cbc          1575.52k     1719.75k     1732.41k     1736.69k     1740.11k
-rc2 cbc           1496.21k     1629.90k     1643.19k     1652.14k     1646.62k
-rc5-32/12 cbc     3452.48k     4276.47k     4390.74k     4405.25k     4400.12k
-blowfish cbc      2354.58k     3242.36k     3401.11k     3433.65k     3383.65k
-cast cbc          1942.22k     2152.28k     2187.51k     2185.67k     2177.20k
-                  sign    verify    sign/s verify/s
-rsa  512 bits   0.0130s   0.0014s     76.9    729.8
-rsa 1024 bits   0.0697s   0.0043s     14.4    233.9
-rsa 2048 bits   0.4664s   0.0156s      2.1     64.0
-rsa 4096 bits   3.4067s   0.0586s      0.3     17.1
-                  sign    verify    sign/s verify/s
-dsa  512 bits   0.0140s   0.0261s     71.4     38.4
-dsa 1024 bits   0.0417s   0.0794s     24.0     12.6
-dsa 2048 bits   0.1478s   0.2929s      6.8      3.4
-
diff --git a/deps/openssl/openssl/times/100.lnx b/deps/openssl/openssl/times/100.lnx
deleted file mode 100644
index d0f45371d664f7..00000000000000
--- a/deps/openssl/openssl/times/100.lnx
+++ /dev/null
@@ -1,32 +0,0 @@
-SSLeay 0.8.4c 03-Aug-1999
-built on Tue Nov  4 02:52:29 EST 1997
-options:bn(64,32) md2(int) rc4(ptr,int) des(ptr,risc1,16,long) idea(int) blowfish(ptr2) 
-C flags:gcc -DL_ENDIAN -DTERMIO -DBN_ASM -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DMD5_ASM -DSHA1_ASM
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                53.27k      155.95k      201.30k      216.41k      236.78k
-mdc2              192.98k      207.98k      206.76k      206.17k      208.87k
-md5               993.15k     5748.27k    11944.70k    16477.53k    18287.27k
-hmac(md5)         404.97k     2787.58k     7690.07k    13744.43k    17601.88k
-sha1              563.24k     2851.67k     5363.71k     6879.23k     7441.07k
-rc4              7876.70k    10400.85k    10825.90k    10943.49k    10745.17k
-des cbc          2047.39k     2188.25k     2188.29k     2239.49k     2233.69k
-des ede3          660.55k      764.01k      773.55k      779.21k      780.97k
-idea cbc          653.93k      708.48k      715.43k      719.87k      720.90k
-rc2 cbc           648.08k      702.23k      708.78k      711.00k      709.97k
-blowfish cbc     3764.39k     4288.66k     4375.04k     4497.07k     4423.68k
-cast cbc         2757.14k     2993.75k     3035.31k     3078.90k     3055.62k
-
-blowfish cbc     3258.81k     3673.47k     3767.30k     3774.12k     3719.17k
-cast cbc         2677.05k     3164.78k     3273.05k     3287.38k     3244.03k
-
-
-                  sign    verify
-rsa  512 bits   0.0213s   0.0020s
-rsa 1024 bits   0.1073s   0.0063s
-rsa 2048 bits   0.6873s   0.0224s
-rsa 4096 bits   4.9333s   0.0845s
-                  sign    verify
-dsa  512 bits   0.0201s   0.0385s
-dsa 1024 bits   0.0604s   0.1190s
-dsa 2048 bits   0.2121s   0.4229s
diff --git a/deps/openssl/openssl/times/100.nt b/deps/openssl/openssl/times/100.nt
deleted file mode 100644
index 0dd7cfc478e118..00000000000000
--- a/deps/openssl/openssl/times/100.nt
+++ /dev/null
@@ -1,29 +0,0 @@
-SSLeay 0.8.4c 03-Aug-1999
-built on Tue Aug  3 09:49:58 EST 1999
-options:bn(64,32) md2(int) rc4(ptr,int) des(idx,cisc,4,long) idea(int) blowfish(
-ptr2)
-C flags:cl /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DWIN32 -DL_ENDIAN -DBN
-_ASM -DMD5_ASM -DSHA1_ASM
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                93.07k      258.38k      349.03k      382.83k      392.87k
-mdc2              245.80k      259.02k      259.34k      259.16k      260.14k
-md5              1103.42k     6017.65k    12210.49k    16552.11k    18291.77k
-hmac(md5)         520.15k     3394.00k     8761.86k    14593.96k    17742.40k
-sha1              538.06k     2726.76k     5242.22k     6821.12k     7426.18k
-rc4              8283.90k    10513.09k    10886.38k    10929.50k    10816.75k
-des cbc          2073.10k     2232.91k     2251.61k     2256.46k     2232.44k
-des ede3          758.85k      782.46k      786.14k      786.08k      781.24k
-idea cbc          831.02k      892.63k      901.07k      903.48k      901.85k
-rc2 cbc           799.89k      866.09k      873.96k      876.22k      874.03k
-blowfish cbc     3835.32k     4418.78k     4511.94k     4494.54k     4416.92k
-cast cbc         2974.68k     3272.71k     3313.04k     3335.17k     3261.51k
-                  sign    verify
-rsa  512 bits   0.0202s   0.0019s
-rsa 1024 bits   0.1029s   0.0062s
-rsa 2048 bits   0.6770s   0.0220s
-rsa 4096 bits   4.8770s   0.0838s
-                  sign    verify
-dsa  512 bits   0.0191s   0.0364s
-dsa 1024 bits   0.0590s   0.1141s
-dsa 2048 bits   0.2088s   0.4171s
diff --git a/deps/openssl/openssl/times/200.lnx b/deps/openssl/openssl/times/200.lnx
deleted file mode 100644
index fd7e7f4e92b329..00000000000000
--- a/deps/openssl/openssl/times/200.lnx
+++ /dev/null
@@ -1,30 +0,0 @@
-This machine was slightly loaded :-(
-
-SSLeay 0.8.4c 03-Aug-1999
-built on Tue Nov  4 02:52:29 EST 1997
-options:bn(64,32) md2(int) rc4(ptr,int) des(ptr,risc1,16,long) idea(int) blowfish(ptr2) 
-C flags:gcc -DL_ENDIAN -DTERMIO -DBN_ASM -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DMD5_ASM -DSHA1_ASM
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2               130.86k      365.31k      499.60k      547.75k      561.41k
-mdc2              526.03k      581.38k      587.12k      586.31k      589.60k
-md5              1919.49k    11173.23k    22387.60k    29553.47k    32587.21k
-hmac(md5)         747.09k     5248.35k    14275.44k    24713.26k    31737.13k
-sha1             1336.63k     6400.50k    11668.67k    14648.83k    15700.85k
-rc4             15002.32k    21327.21k    22301.63k    22503.78k    22549.26k
-des cbc          4115.16k     4521.08k     4632.37k     4607.28k     4570.57k
-des ede3         1540.29k     1609.76k     1623.64k     1620.76k     1624.18k
-idea cbc         2405.08k     2664.78k     2704.22k     2713.95k     2716.29k
-rc2 cbc          1634.07k     1764.30k     1780.23k     1790.27k     1788.12k
-blowfish cbc     5993.98k     6927.27k     7083.61k     7088.40k     7123.72k
-cast cbc         5981.52k     6900.44k     7079.70k     7110.40k     7057.72k
-                  sign    verify
-rsa  512 bits   0.0085s   0.0007s
-rsa 1024 bits   0.0377s   0.0020s
-rsa 2048 bits   0.2176s   0.0067s
-rsa 4096 bits   1.4800s   0.0242s
-sign    verify
-dsa  512 bits   0.0071s   0.0132s
-dsa 1024 bits   0.0192s   0.0376s
-dsa 2048 bits   0.0638s   0.1280s
-
diff --git a/deps/openssl/openssl/times/486-66.dos b/deps/openssl/openssl/times/486-66.dos
deleted file mode 100644
index 1644bf8022a379..00000000000000
--- a/deps/openssl/openssl/times/486-66.dos
+++ /dev/null
@@ -1,22 +0,0 @@
-MS-dos static libs, 16bit C build, 16bit assember
-
-SSLeay 0.6.1
-options:bn(32,16) md2(char) rc4(idx,int) des(ptr,long) idea(short)
-C flags:cl /ALw /Gx- /Gf /f- /Ocgnotb2 /G2 /W3 /WX -DL_ENDIAN /nologo -DMSDOS -D
-NO_SOCK
-The 'numbers' are in 1000s of bytes per second processed.
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2             18.62k       55.54k       76.88k       85.39k       86.52k
-md5             94.03k      442.06k      794.38k      974.51k     1061.31k
-sha             38.37k      166.23k      272.78k      331.41k      353.77k
-sha1            34.38k      147.77k      244.77k      292.57k      312.08k
-rc4            641.25k      795.34k      817.16k      829.57k      817.16k
-des cfb        111.46k      118.08k      120.69k      119.16k      119.37k
-des cbc        122.96k      135.69k      137.10k      135.69k      135.40k
-des ede3        48.01k       50.92k       50.32k       50.96k       50.96k
-idea cfb        97.09k      100.21k      100.36k      101.14k      100.98k
-idea cbc       102.08k      109.41k      111.46k      111.65k      110.52k
-rc2 cfb        120.47k      125.55k      125.79k      125.55k      125.55k
-rc2 cbc        129.77k      140.33k      143.72k      142.16k      141.85k
-rsa  512 bits   0.264s
-rsa 1024 bits   1.494s
diff --git a/deps/openssl/openssl/times/486-66.nt b/deps/openssl/openssl/times/486-66.nt
deleted file mode 100644
index b26a9005d63e64..00000000000000
--- a/deps/openssl/openssl/times/486-66.nt
+++ /dev/null
@@ -1,22 +0,0 @@
-SSLeay 0.6.1 02-Jul-1996
-built on Fri Jul 10 09:53:15 EST 1996
-options:bn(64,32) md2(int) rc4(idx,int) des(idx,long) idea(int)
-C flags:cl /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /nologo -DWIN32 -DL_ENDIAN /MD
-The 'numbers' are in 1000s of bytes per second processed.
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2             38.27k      107.28k      145.43k      159.60k      164.15k
-md5            399.00k     1946.13k     3610.80k     4511.94k     4477.27k
-sha            182.04k      851.26k     1470.65k     1799.20k     1876.48k
-sha1           151.83k      756.55k     1289.76k     1567.38k     1625.70k
-rc4           1853.92k     2196.25k     2232.91k     2241.31k     2152.96k
-des cfb        360.58k      382.69k      384.94k      386.07k      377.19k
-des cbc        376.10k      431.87k      436.32k      437.78k      430.45k
-des ede3       152.55k      160.38k      161.51k      161.33k      159.98k
-idea cfb       245.59k      255.60k      256.65k      257.16k      254.61k
-idea cbc       257.16k      276.12k      279.05k      279.11k      276.70k
-rc2 cfb        280.25k      293.49k      294.74k      294.15k      291.47k
-rc2 cbc        295.47k      321.57k      324.76k      324.76k      320.00k
-rsa  512 bits   0.084s
-rsa 1024 bits   0.495s
-rsa 2048 bits   3.435s
-
diff --git a/deps/openssl/openssl/times/486-66.w31 b/deps/openssl/openssl/times/486-66.w31
deleted file mode 100644
index 381f149b328626..00000000000000
--- a/deps/openssl/openssl/times/486-66.w31
+++ /dev/null
@@ -1,23 +0,0 @@
-Windows 3.1 DLL's, 16 bit C with 32bit assember
-
-SSLeay 0.6.1 02-Jul-1996
-built on Wed Jul 10 09:53:15 EST 1996
-options:bn(32,32) md2(char) rc4(idx,int) des(ptr,long) idea(short)
-C flags:cl /ALw /Gx- /Gf /G2 /f- /Ocgnotb2 /W3 /WX -DL_ENDIAN /nologo -DWIN16
-The 'numbers' are in 1000s of bytes per second processed.
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2             18.94k       54.27k       73.43k       80.91k       83.75k
-md5             78.96k      391.26k      734.30k      919.80k      992.97k
-sha             39.01k      168.04k      280.67k      336.08k      359.10k
-sha1            35.20k      150.14k      247.31k      294.54k      313.94k
-rc4            509.61k      655.36k      678.43k      677.02k      670.10k
-des cfb         97.09k      104.69k      106.56k      105.70k      106.56k
-des cbc        116.82k      129.77k      131.07k      131.07k      131.07k
-des ede3        44.22k       47.90k       48.53k       48.47k       47.86k
-idea cfb        83.49k       87.03k       87.03k       87.15k       87.73k
-idea cbc        89.04k       96.23k       96.95k       97.81k       97.09k
-rc2 cfb        108.32k      113.58k      113.78k      114.57k      114.77k
-rc2 cbc        118.08k      131.07k      134.02k      134.02k      132.66k
-rsa  512 bits   0.181s
-rsa 1024 bits   0.846s
-
diff --git a/deps/openssl/openssl/times/5.lnx b/deps/openssl/openssl/times/5.lnx
deleted file mode 100644
index 1c1e392a29566b..00000000000000
--- a/deps/openssl/openssl/times/5.lnx
+++ /dev/null
@@ -1,29 +0,0 @@
-SSLeay 0.8.5g 24-Jan-1998
-built on Tue Jan 27 08:11:42 EST 1998
-options:bn(64,32) md2(int) rc4(idx,int) des(ptr,risc1,16,long) idea(int) blowfish(ptr2) 
-C flags:gcc -DL_ENDIAN -DTERMIO -DBN_ASM -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                 56.55k      156.69k      211.63k      231.77k      238.71k
-mdc2               192.26k      208.09k      210.09k      209.58k      210.26k
-md5                991.04k     5745.51k    11932.67k    16465.24k    18306.39k
-hmac(md5)          333.99k     2383.89k     6890.67k    13133.82k    17397.08k
-sha1               571.68k     2883.88k     5379.07k     6880.26k     7443.80k
-rmd160             409.41k     2212.91k     4225.45k     5456.55k     5928.28k
-rc4               6847.57k     8596.22k     8901.80k     8912.90k     8850.09k
-des cbc           2046.29k     2229.78k     2254.76k     2259.97k     2233.69k
-des ede3           751.11k      779.95k      783.96k      784.38k      780.97k
-idea cbc           653.40k      708.29k      718.42k      720.21k      720.90k
-rc2 cbc            647.19k      702.46k      709.21k      710.66k      709.97k
-rc5-32/12 cbc     3498.18k     4054.12k     4133.46k     4151.64k     4139.69k
-blowfish cbc      3763.95k     4437.74k     4532.74k     4515.50k     4448.26k
-cast cbc          2754.22k     3020.67k     3079.08k     3069.95k     3036.50k
-                  sign    verify    sign/s verify/s
-rsa  512 bits   0.0207s   0.0020s     48.3    511.3
-rsa 1024 bits   0.1018s   0.0059s      9.8    169.6
-rsa 2048 bits   0.6438s   0.0208s      1.6     48.0
-rsa 4096 bits   4.6033s   0.0793s      0.2     12.6
-                  sign    verify    sign/s verify/s
-dsa  512 bits   0.0190s   0.0359s     52.6     27.8
-dsa 1024 bits   0.0566s   0.1109s     17.7      9.0
-dsa 2048 bits   0.1988s   0.3915s      5.0      2.6
diff --git a/deps/openssl/openssl/times/586-085i.nt b/deps/openssl/openssl/times/586-085i.nt
deleted file mode 100644
index 8a5797526f2e7b..00000000000000
--- a/deps/openssl/openssl/times/586-085i.nt
+++ /dev/null
@@ -1,29 +0,0 @@
-SSLeay 0.8.5i 28-Jan-1998
-built on Wed Jan 28 18:00:07 EST 1998
-options:bn(64,32) md2(int) rc4(idx,int) des(idx,cisc,4,long) idea(int) blowfish(ptr2)
-C flags:cl /MT /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DWIN32 -DL_ENDIAN -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                 92.74k      257.59k      348.16k      381.79k      392.14k
-mdc2               227.65k      247.82k      249.90k      250.65k      250.20k
-md5               1089.54k     5966.29k    12104.77k    16493.53k    18204.44k
-hmac(md5)          513.53k     3361.36k     8725.41k    14543.36k    17593.56k
-sha1               580.74k     2880.51k     5376.62k     6865.78k     7413.05k
-rmd160             508.06k     2427.96k     4385.51k     5510.84k     5915.80k
-rc4               8004.40k    10408.74k    10794.48k    10884.12k    10728.22k
-des cbc           2057.24k     2222.97k     2246.79k     2209.39k     2223.44k
-des ede3           739.42k      761.99k      765.48k      760.26k      760.97k
-idea cbc           827.08k      889.60k      898.83k      901.15k      897.98k
-rc2 cbc            795.64k      861.04k      871.13k      872.58k      871.13k
-rc5-32/12 cbc     3597.17k     4139.66k     4204.39k     4223.02k     4204.39k
-blowfish cbc      3807.47k     3996.10k     4156.07k     4204.39k     4105.62k
-cast cbc          2777.68k     2814.21k     2892.62k     2916.76k     2868.88k
-                  sign    verify    sign/s verify/s
-rsa  512 bits   0.0178s   0.0018s     56.3    541.6
-rsa 1024 bits   0.0945s   0.0059s     10.6    168.3
-rsa 2048 bits   0.6269s   0.0208s      1.6     48.0
-rsa 4096 bits   4.5560s   0.0784s      0.2     12.8
-                  sign    verify    sign/s verify/s
-dsa  512 bits   0.0178s   0.0340s     56.2     29.4
-dsa 1024 bits   0.0552s   0.1077s     18.1      9.3
-dsa 2048 bits   0.1963s   0.3811s      5.1      2.6
diff --git a/deps/openssl/openssl/times/586-100.LN3 b/deps/openssl/openssl/times/586-100.LN3
deleted file mode 100644
index a6fa818f4bec7b..00000000000000
--- a/deps/openssl/openssl/times/586-100.LN3
+++ /dev/null
@@ -1,26 +0,0 @@
-SSLeay 0.8.3v 15-Oct-1997
-built on Wed Oct 15 10:05:00 EST 1997
-options:bn(64,32) md2(int) rc4(idx,int) des(ptr,risc1,16,long) idea(int) blowfish(ptr2) 
-C flags:gcc -DL_ENDIAN -DTERMIO -DX86_ASM -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                56.27k      156.76k      211.46k      231.77k      238.71k
-mdc2              188.74k      206.12k      207.70k      207.87k      208.18k
-md5               991.56k     5718.31k    11748.61k    16090.79k    17850.37k
-hmac(md5)         387.56k     2636.01k     7327.83k    13340.33k    17091.24k
-sha1              463.55k     2274.18k     4071.17k     5072.90k     5447.68k
-rc4              3673.94k     4314.52k     4402.26k     4427.09k     4407.30k
-des cbc          2023.79k     2209.77k     2233.34k     2220.71k     2222.76k
-des ede3          747.17k      778.54k      781.57k      778.24k      778.24k
-idea cbc          614.64k      678.04k      683.52k      685.06k      685.40k
-rc2 cbc           536.83k      574.10k      578.05k      579.24k      578.90k
-blowfish cbc     3673.39k     4354.58k     4450.22k     4429.48k     4377.26k
-                  sign    verify
-rsa  512 bits   0.0217s   0.0021s
-rsa 1024 bits   0.1083s   0.0064s
-rsa 2048 bits   0.6867s   0.0223s
-rsa 4096 bits   4.9400s   0.0846s
-                  sign    verify
-dsa  512 bits   0.0203s   0.0387s
-dsa 1024 bits   0.0599s   0.1170s
-dsa 2048 bits   0.2115s   0.4242s
diff --git a/deps/openssl/openssl/times/586-100.NT2 b/deps/openssl/openssl/times/586-100.NT2
deleted file mode 100644
index 7f8c167b469206..00000000000000
--- a/deps/openssl/openssl/times/586-100.NT2
+++ /dev/null
@@ -1,26 +0,0 @@
-SSLeay 0.8.3e 30-Sep-1997
-built on Tue Sep 30 14:52:58 EST 1997
-options:bn(64,32) md2(int) rc4(idx,int) des(idx,cisc,4,long) idea(int) blowfish(ptr2)
-C flags:cl /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DWIN32 -DL_ENDIAN -DX86_ASM
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                92.99k      257.59k      348.16k      381.47k      392.14k
-mdc2              223.77k      235.30k      237.15k      236.77k      237.29k
-md5               862.53k     4222.17k     7842.75k     9925.00k    10392.23k
-sha               491.34k     2338.61k     4062.28k     4986.10k     5307.90k
-sha1              494.38k     2234.94k     3838.83k     4679.58k     4980.18k
-rc4              6338.10k     7489.83k     7676.25k     7698.80k     7631.56k
-des cbc          1654.17k     1917.66k     1961.05k     1968.05k     1960.69k
-des ede3          691.17k      739.42k      744.13k      745.82k      741.40k
-idea cbc          788.46k      870.33k      879.16k      881.38k      879.90k
-rc2 cbc           794.44k      859.63k      868.24k      869.68k      867.45k
-blowfish cbc     2379.88k     3017.48k     3116.12k     3134.76k     3070.50k
-                  sign    verify
-rsa  512 bits   0.0204s   0.0027s
-rsa 1024 bits   0.1074s   0.0032s
-rsa 2048 bits   0.6890s   0.0246s
-rsa 4096 bits   5.0180s   0.0911s
-                  sign    verify
-dsa  512 bits   0.0201s   0.0376s
-dsa 1024 bits   0.0608s   0.1193s
-dsa 2048 bits   0.2133s   0.4294s
diff --git a/deps/openssl/openssl/times/586-100.dos b/deps/openssl/openssl/times/586-100.dos
deleted file mode 100644
index 3085c256b119fa..00000000000000
--- a/deps/openssl/openssl/times/586-100.dos
+++ /dev/null
@@ -1,24 +0,0 @@
-ms-dos static libs, 16 bit C and 16 bit assmber 
-
-SSLeay 0.6.1 02-Jul-1996
-built on Tue Jul  9 22:52:54 EST 1996
-options:bn(32,16) md2(char) rc4(idx,int) des(ptr,long) idea(short)
-C flags:cl /ALw /Gx- /Gf /G2 /f- /Ocgnotb2 /W3 /WX -DL_ENDIAN /nologo -DMSDOS -DNO_SOCK
-The 'numbers' are in 1000s of bytes per second processed.
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2             45.99k      130.75k      176.53k      199.35k      203.21k
-md5            236.17k     1072.16k     1839.61k     2221.56k     2383.13k
-sha            107.97k      459.10k      757.64k      908.64k      954.99k
-sha1            96.95k      409.92k      672.16k      788.40k      844.26k
-rc4           1659.14k     1956.30k     2022.72k     2022.72k     2022.72k
-des cfb        313.57k      326.86k      326.86k      331.83k      326.86k
-des cbc        345.84k      378.82k      378.82k      384.38k      378.82k
-des ede3       139.59k      144.66k      144.61k      144.45k      143.29k
-idea cfb       262.67k      274.21k      274.21k      274.21k      274.21k
-idea cbc       284.32k      318.14k      318.14k      318.14k      318.14k
-rc2 cfb        265.33k      274.21k      277.69k      277.11k      277.69k
-rc2 cbc        283.71k      310.60k      309.86k      313.57k      314.32k
-rsa  512 bits   0.104s
-rsa 1024 bits   0.566s
-rsa 2048 bits   3.680s
-rsa 4096 bits  26.740s
diff --git a/deps/openssl/openssl/times/586-100.ln4 b/deps/openssl/openssl/times/586-100.ln4
deleted file mode 100644
index 14a9db912be378..00000000000000
--- a/deps/openssl/openssl/times/586-100.ln4
+++ /dev/null
@@ -1,26 +0,0 @@
-SSLeay 0.8.3aa 24-Oct-1997
-built on Mon Oct 27 10:16:25 EST 1997
-options:bn(64,32) md2(int) rc4(idx,int) des(ptr,risc1,16,long) idea(int) blowfish(ptr2) 
-C flags:gcc -DL_ENDIAN -DTERMIO -DBN_ASM -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DMD5_ASM -DSHA1_ASM
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                56.78k      156.71k      211.46k      231.77k      238.71k
-mdc2              187.45k      200.49k      201.64k      202.75k      202.77k
-md5              1002.51k     5798.66k    11967.15k    16449.19k    18251.78k
-hmac(md5)         468.71k     3173.46k     8386.99k    14305.56k    17607.34k
-sha1              586.98k     2934.87k     5393.58k     6863.19k     7408.30k
-rc4              3675.10k     4314.15k     4402.77k     4427.78k     4404.57k
-des cbc          1902.96k     2202.01k     2242.30k     2252.46k     2236.42k
-des ede3          700.15k      774.23k      783.70k      781.62k      783.70k
-idea cbc          618.46k      677.93k      683.61k      685.40k      685.40k
-rc2 cbc           536.97k      573.87k      577.96k      579.24k      578.90k
-blowfish cbc     3672.66k     4271.89k     4428.80k     4469.76k     4374.53k
-                  sign    verify
-rsa  512 bits   0.0213s   0.0021s
-rsa 1024 bits   0.1075s   0.0063s
-rsa 2048 bits   0.6853s   0.0224s
-rsa 4096 bits   4.9400s   0.0845s
-                  sign    verify
-dsa  512 bits   0.0203s   0.0380s
-dsa 1024 bits   0.0600s   0.1189s
-dsa 2048 bits   0.2110s   0.4250s
diff --git a/deps/openssl/openssl/times/586-100.lnx b/deps/openssl/openssl/times/586-100.lnx
deleted file mode 100644
index 0c051738c641df..00000000000000
--- a/deps/openssl/openssl/times/586-100.lnx
+++ /dev/null
@@ -1,23 +0,0 @@
-SSLeay 0.7.3 30-Apr-1997
-built on Mon May 12 04:13:55 EST 1997
-options:bn(64,32) md2(char) rc4(idx,int) des(ptr,risc1,16,long) idea(int) blowfish(ptr2)
-C flags:gcc -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                72.95k      202.77k      274.01k      300.37k      309.23k
-md5               770.57k     4094.02k     7409.41k     9302.36k     9986.05k
-sha               363.05k     1571.07k     2613.85k     3134.81k     3320.49k
-sha1              340.94k     1462.85k     2419.20k     2892.12k     3042.35k
-rc4              3676.91k     4314.94k     4407.47k     4430.51k     4412.76k
-des cbc          1489.95k     1799.08k     1841.66k     1851.73k     1848.66k
-des ede3          621.93k      711.19k      726.10k      729.77k      729.09k
-idea cbc          618.16k      676.99k      683.09k      684.37k      683.59k
-rc2 cbc           537.59k      573.93k      578.56k      579.58k      579.70k
-blowfish cbc     2077.57k     2682.20k     2827.18k     2840.92k     2842.62k
-rsa  512 bits   0.024s   0.003
-rsa 1024 bits   0.120s   0.003
-rsa 2048 bits   0.751s   0.026
-rsa 4096 bits   5.320s   0.096
-dsa  512 bits   0.022s   0.042
-dsa 1024 bits   0.065s   0.126
-dsa 2048 bits   0.227s   0.449
diff --git a/deps/openssl/openssl/times/586-100.nt b/deps/openssl/openssl/times/586-100.nt
deleted file mode 100644
index 9adcac31050ac5..00000000000000
--- a/deps/openssl/openssl/times/586-100.nt
+++ /dev/null
@@ -1,23 +0,0 @@
-SSLeay 0.7.3 30-Apr-1997
-built on Mon May 19 10:47:38 EST 1997
-options:bn(64,32) md2(char) rc4(idx,int) des(idx,cisc,4,long) idea(int) blowfish(ptr2)
-C flags not available
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                89.57k      245.94k      331.59k      362.95k      373.29k
-md5               858.93k     4175.51k     7700.21k     9715.78k    10369.11k
-sha               466.18k     2103.67k     3607.69k     4399.31k     4669.16k
-sha1              449.59k     2041.02k     3496.13k     4256.45k     4512.92k
-rc4              5862.55k     7447.27k     7698.80k     7768.38k     7653.84k
-des cbc          1562.71k     1879.84k     1928.24k     1938.93k     1911.02k
-des ede3          680.27k      707.97k      728.62k      733.15k      725.98k
-idea cbc          797.46k      885.85k      895.68k      898.06k      896.45k
-rc2 cbc           609.46k      648.75k      654.01k      654.42k      653.60k
-blowfish cbc     2357.94k     3000.22k     3106.89k     3134.76k     3080.42k
-rsa  512 bits   0.022s   0.003
-rsa 1024 bits   0.112s   0.003
-rsa 2048 bits   0.726s   0.026
-rsa 4096 bits   5.268s   0.095
-dsa  512 bits   0.021s   0.039
-dsa 1024 bits   0.063s   0.127
-dsa 2048 bits   0.224s   0.451
diff --git a/deps/openssl/openssl/times/586-100.ntx b/deps/openssl/openssl/times/586-100.ntx
deleted file mode 100644
index 35166a5e9785ec..00000000000000
--- a/deps/openssl/openssl/times/586-100.ntx
+++ /dev/null
@@ -1,30 +0,0 @@
-SSLeay 0.8.5f 22-Jan-1998
-built on Wed Jan 21 17:11:53 EST 1998
-options:bn(64,32) md2(int) rc4(idx,int) des(idx,cisc,4,long) idea(int) blowfish(
-ptr2)
-C flags:cl /MT /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DWIN32 -DL_ENDIAN
--DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                92.99k      257.43k      347.84k      381.82k      392.14k
-mdc2              232.19k      253.68k      257.57k      258.70k      258.70k
-md5              1094.09k     5974.79k    12139.81k    16487.04k    18291.77k
-hmac(md5)         375.70k     2590.04k     7309.70k    13469.18k    17447.19k
-sha1              613.78k     2982.93k     5446.44k     6889.46k     7424.86k
-rmd160            501.23k     2405.68k     4367.25k     5503.61k     5915.80k
-rc4              8167.75k    10429.44k    10839.12k    10929.50k    10772.30k
-des cbc          2057.24k     2218.27k     2237.20k     2227.69k     2213.59k
-des ede3          719.63k      727.11k      728.77k      719.56k      722.97k
-idea cbc          827.67k      888.85k      898.06k      900.30k      898.75k
-rc2 cbc           797.46k      862.53k      870.33k      872.58k      870.40k
-blowfish cbc     3835.32k     4435.60k     4513.89k     4513.89k     4416.92k
-cast cbc         2785.06k     3052.62k     3088.59k     3034.95k     3034.95k
-                  sign    verify    sign/s verify/s
-rsa  512 bits   0.0202s   0.0020s     49.4    500.2
-rsa 1024 bits   0.1030s   0.0063s      9.7    159.4
-rsa 2048 bits   0.6740s   0.0223s      1.5     44.9
-rsa 4096 bits   4.8970s   0.0844s      0.2     11.8
-                  sign    verify    sign/s verify/s
-dsa  512 bits   0.0191s   0.0361s     52.4     27.7
-dsa 1024 bits   0.0587s   0.1167s     17.0      8.6
-dsa 2048 bits   0.2091s   0.4123s      4.8      2.4
diff --git a/deps/openssl/openssl/times/586-100.w31 b/deps/openssl/openssl/times/586-100.w31
deleted file mode 100644
index d5b1c102435ee9..00000000000000
--- a/deps/openssl/openssl/times/586-100.w31
+++ /dev/null
@@ -1,27 +0,0 @@
-Pentium 100, Windows 3.1 DLL's, 16 bit C, 32bit assember.
-
-Running under Windows NT 4.0 Beta 2
-
-SSLeay 0.6.4 20-Aug-1996
-built on Thu Aug 22 08:44:21 EST 1996
-options:bn(32,32) md2(char) rc4(idx,int) des(ptr,long) idea(short)
-C flags:cl /ALw /Gx- /Gf /G2 /f- /Ocgnotb2 /W3 /WX -DL_ENDIAN /nologo -DWIN16
-The 'numbers' are in 1000s of bytes per second processed.
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2             45.83k      128.82k      180.17k      194.90k      198.59k
-md5            224.82k     1038.19k     1801.68k     2175.47k     2330.17k
-sha            105.11k      448.11k      739.48k      884.13k      944.66k
-sha1            94.71k      402.99k      667.88k      795.58k      844.26k
-rc4           1614.19k     1956.30k     2022.72k     2022.72k     2022.72k
-des cfb        291.27k      318.14k      318.14k      318.14k      322.84k
-des cbc        326.86k      356.17k      362.08k      362.08k      367.15k
-des ede3       132.40k      139.57k      139.53k      139.37k      140.97k
-idea cfb       265.33k      280.67k      280.67k      277.69k      281.27k
-idea cbc       274.21k      302.01k      306.24k      306.24k      305.53k
-rc2 cfb        264.79k      274.21k      274.78k      274.21k      274.21k
-rc2 cbc        281.27k      306.24k      309.86k      305.53k      309.86k
-rsa  512 bits   0.058s
-rsa 1024 bits   0.280s
-rsa 2048 bits   1.430s
-rsa 4096 bits  10.600s
-
diff --git a/deps/openssl/openssl/times/586-1002.lnx b/deps/openssl/openssl/times/586-1002.lnx
deleted file mode 100644
index d830bcea422731..00000000000000
--- a/deps/openssl/openssl/times/586-1002.lnx
+++ /dev/null
@@ -1,26 +0,0 @@
-SSLeay 0.8.3e 30-Sep-1997
-built on Wed Oct  1 03:01:44 EST 1997
-options:bn(64,32) md2(int) rc4(idx,int) des(ptr,risc1,16,long) idea(int) blowfish(ptr2) 
-C flags:gcc -DL_ENDIAN -DTERMIO -DX86_ASM -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                56.21k      156.57k      211.29k      231.77k      237.92k
-mdc2              170.99k      191.70k      193.90k      195.58k      195.95k
-md5               770.50k     3961.96k     7291.22k     9250.82k     9942.36k
-sha               344.93k     1520.77k     2569.81k     3108.52k     3295.91k
-sha1              326.20k     1423.74k     2385.15k     2870.95k     3041.96k
-rc4              3672.88k     4309.65k     4374.41k     4408.66k     4355.41k
-des cbc          1349.73k     1689.05k     1735.34k     1748.99k     1739.43k
-des ede3          638.70k      704.00k      711.85k      714.41k      712.70k
-idea cbc          619.55k      677.33k      683.26k      685.06k      685.40k
-rc2 cbc           521.18k      571.20k      573.46k      578.90k      578.90k
-blowfish cbc     2079.67k     2592.49k     2702.34k     2730.33k     2695.17k
-                  sign    verify
-rsa  512 bits   0.0213s   0.0026s
-rsa 1024 bits   0.1099s   0.0031s
-rsa 2048 bits   0.7007s   0.0248s
-rsa 4096 bits   5.0500s   0.0921s
-                  sign    verify
-dsa  512 bits   0.0203s   0.0389s
-dsa 1024 bits   0.0614s   0.1222s
-dsa 2048 bits   0.2149s   0.4283s
diff --git a/deps/openssl/openssl/times/586p-100.lnx b/deps/openssl/openssl/times/586p-100.lnx
deleted file mode 100644
index 561eb3114fe21d..00000000000000
--- a/deps/openssl/openssl/times/586p-100.lnx
+++ /dev/null
@@ -1,26 +0,0 @@
-Pentium 100 - Linux 1.2.13 - gcc 2.7.2p
-This is the pentium specific version of gcc
-
-SSLeay 0.6.4 20-Aug-1996
-built on Thu Aug 22 08:27:58 EST 1996
-options:bn(64,32) md2(char) rc4(idx,int) des(idx,long) idea(int)
-C flags:gcc -DL_ENDIAN -DTERMIO -O6 -fomit-frame-pointer -mpentium -Wall
-The 'numbers' are in 1000s of bytes per second processed.
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2             74.90k      208.43k      282.11k      309.59k      318.43k
-md5            807.08k     4205.67k     7801.51k     9958.06k    10810.71k
-sha            405.98k     1821.55k     3119.10k     3799.04k     4052.31k
-sha1           389.13k     1699.50k     2852.78k     3437.57k     3656.36k
-rc4           3621.15k     4130.07k     4212.74k     4228.44k     4213.42k
-des cfb        794.39k      828.37k      831.74k      832.51k      832.85k
-des cbc        817.68k      886.17k      894.72k      896.00k      892.93k
-des ede3       308.83k      323.29k      324.61k      324.95k      324.95k
-idea cfb       690.41k      715.39k      718.51k      719.19k      718.17k
-idea cbc       696.80k      760.60k      767.32k      768.68k      770.05k
-rc2 cfb        619.91k      639.74k      642.30k      642.73k      641.71k
-rc2 cbc        631.99k      671.42k      676.35k      676.18k      677.21k
-rsa  512 bits   0.025s
-rsa 1024 bits   0.123s
-rsa 2048 bits   0.756s
-rsa 4096 bits   5.365s
-
diff --git a/deps/openssl/openssl/times/686-200.bsd b/deps/openssl/openssl/times/686-200.bsd
deleted file mode 100644
index f23c580e09f596..00000000000000
--- a/deps/openssl/openssl/times/686-200.bsd
+++ /dev/null
@@ -1,25 +0,0 @@
-Pentium Pro 200mhz
-FreeBSD 2.1.5
-gcc 2.7.2.2
-
-SSLeay 0.7.0 30-Jan-1997
-built on Tue Apr 22 12:14:36 EST 1997
-options:bn(64,32) md2(int) rc4(idx,int) des(ptr,risc1,16,long) idea(int) blowfish(ptr2)
-C flags:gcc -DTERMIOS -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2               130.99k      367.68k      499.09k      547.04k      566.50k
-md5              1924.98k     8293.50k    13464.41k    16010.39k    16820.68k
-sha              1250.75k     5330.43k     8636.88k    10227.36k    10779.14k
-sha1             1071.55k     4572.50k     7459.98k     8791.96k     9341.61k
-rc4             10724.22k    14546.25k    15240.18k    15259.50k    15265.63k
-des cbc          3309.11k     3883.01k     3968.25k     3971.86k     3979.14k
-des ede3         1442.98k     1548.33k     1562.48k     1562.00k     1563.33k
-idea cbc         2195.69k     2506.39k     2529.59k     2545.66k     2546.54k
-rc2 cbc           806.00k      833.52k      837.58k      838.52k      836.69k
-blowfish cbc     4687.34k     5949.97k     6182.43k     6248.11k     6226.09k
-rsa  512 bits   0.010s
-rsa 1024 bits   0.045s
-rsa 2048 bits   0.260s
-rsa 4096 bits   1.690s
-
diff --git a/deps/openssl/openssl/times/686-200.lnx b/deps/openssl/openssl/times/686-200.lnx
deleted file mode 100644
index a10cc2fd012f90..00000000000000
--- a/deps/openssl/openssl/times/686-200.lnx
+++ /dev/null
@@ -1,26 +0,0 @@
-SSLeay 0.8.2a 04-Sep-1997
-built on Fri Sep  5 17:37:05 EST 1997
-options:bn(64,32) md2(int) rc4(idx,int) des(ptr,risc1,16,long) idea(int) blowfish(ptr2) C flags:gcc -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2               131.02k      368.41k      500.57k      549.21k      566.09k
-mdc2              535.60k      589.10k      595.88k      595.97k      594.54k
-md5              1801.53k     9674.77k    17484.03k    21849.43k    23592.96k
-sha              1261.63k     5533.25k     9285.63k    11187.88k    11913.90k
-sha1             1103.13k     4782.53k     7933.78k     9472.34k    10070.70k
-rc4             10722.53k    14443.93k    15215.79k    15299.24k    15219.59k
-des cbc          3286.57k     3827.73k     3913.39k     3931.82k     3926.70k
-des ede3         1443.50k     1549.08k     1561.17k     1566.38k     1564.67k
-idea cbc         2203.64k     2508.16k     2538.33k     2543.62k     2547.71k
-rc2 cbc          1430.94k     1511.59k     1524.82k     1527.13k     1523.33k
-blowfish cbc     4716.07k     5965.82k     6190.17k     6243.67k     6234.11k
-                  sign    verify
-rsa  512 bits   0.0100s   0.0011s
-rsa 1024 bits   0.0451s   0.0012s
-rsa 2048 bits   0.2605s   0.0086s
-rsa 4096 bits   1.6883s   0.0302s
-                  sign    verify
-dsa  512 bits   0.0083s   0.0156s
-dsa 1024 bits   0.0228s   0.0454s
-dsa 2048 bits   0.0719s   0.1446s
-
diff --git a/deps/openssl/openssl/times/686-200.nt b/deps/openssl/openssl/times/686-200.nt
deleted file mode 100644
index c8cbaa04e39daf..00000000000000
--- a/deps/openssl/openssl/times/686-200.nt
+++ /dev/null
@@ -1,24 +0,0 @@
-built on Tue May 13 08:24:51 EST 1997
-options:bn(64,32) md2(char) rc4(idx,int) des(ptr,risc1,16,long) idea(int) blowfi
-sh(ptr2)
-C flags not available
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2               156.39k      427.99k      576.14k      628.36k      647.27k
-md5              2120.48k    10255.02k    18396.07k    22795.13k    24244.53k
-sha              1468.59k     6388.89k    10686.12k    12826.62k    13640.01k
-sha1             1393.46k     6013.34k     9974.56k    11932.59k    12633.45k
-rc4             13833.46k    19275.29k    20321.24k    20281.93k    20520.08k
-des cbc          3382.50k     4104.02k     4152.78k     4194.30k     4194.30k
-des ede3         1465.51k     1533.00k     1549.96k     1553.29k     1570.29k
-idea cbc         2579.52k     3079.52k     3130.08k     3153.61k     3106.89k
-rc2 cbc          1204.57k     1276.42k     1285.81k     1289.76k     1285.81k
-blowfish cbc     5229.81k     6374.32k     6574.14k     6574.14k     6594.82k
-rsa  512 bits   0.008s   0.001
-rsa 1024 bits   0.038s   0.001
-rsa 2048 bits   0.231s   0.008
-rsa 4096 bits   1.540s   0.027
-dsa  512 bits   0.007s   0.013
-dsa 1024 bits   0.021s   0.040
-dsa 2048 bits   0.066s   0.130
-
diff --git a/deps/openssl/openssl/times/L1 b/deps/openssl/openssl/times/L1
deleted file mode 100644
index 09253d72795609..00000000000000
--- a/deps/openssl/openssl/times/L1
+++ /dev/null
@@ -1,27 +0,0 @@
-SSLeay 0.8.3ad 27-Oct-1997
-built on Wed Oct 29 00:36:17 EST 1997
-options:bn(64,32) md2(int) rc4(idx,int) des(ptr,risc1,16,long) idea(int) blowfish(ptr2) 
-C flags:gcc -DL_ENDIAN -DTERMIO -DBN_ASM -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DMD5_ASM -DSHA1_ASM
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                56.16k      156.50k      211.46k      231.77k      238.71k
-mdc2              183.37k      205.21k      205.57k      209.92k      207.53k
-md5              1003.65k     5605.56k    11628.54k    15887.70k    17522.69k
-hmac(md5)         411.24k     2803.46k     7616.94k    13475.84k    16864.60k
-sha1              542.66k     2843.50k     5320.53k     6833.49k     7389.18k
-rc4              3677.15k     4313.73k     4407.89k     4429.82k     4404.57k
-des cbc          1787.94k     2174.51k     2236.76k     2249.73k     2230.95k
-des ede3          719.46k      777.26k      784.81k      780.29k      783.70k
-idea cbc          619.56k      677.89k      684.12k      685.40k      685.40k
-rc2 cbc           537.51k      573.93k      578.47k      579.24k      578.90k
-blowfish cbc     3226.76k     4221.65k     4424.19k     4468.39k     4377.26k
-cast cbc         2866.13k     3165.35k     3263.15k     3287.04k     3233.11k
-                  sign    verify
-rsa  512 bits   0.0212s   0.0021s
-rsa 1024 bits   0.1072s   0.0064s
-rsa 2048 bits   0.6853s   0.0222s
-rsa 4096 bits   4.9300s   0.0848s
-                  sign    verify
-dsa  512 bits   0.0200s   0.0380s
-dsa 1024 bits   0.0600s   0.1180s
-dsa 2048 bits   0.2110s   0.4221s
diff --git a/deps/openssl/openssl/times/R10000.t b/deps/openssl/openssl/times/R10000.t
deleted file mode 100644
index 6b3874c8665d7e..00000000000000
--- a/deps/openssl/openssl/times/R10000.t
+++ /dev/null
@@ -1,24 +0,0 @@
-IRIX 6.2 - R10000 195mhz
-SLeay 0.6.5a 06-Dec-1996
-built on Tue Dec 24 03:51:45 EST 1996
-options:bn(32,32) md2(int) rc4(ptr,int) des(ptr,risc2,16,long) idea(int)
-C flags:cc -O2 -DTERMIOS -DB_ENDIAN
-The 'numbers' are in 1000s of bytes per second processed.
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2            156.34k      424.03k      571.88k      628.88k      646.01k
-md5           1885.02k     8181.72k    13440.53k    16020.60k    16947.54k
-sha           1587.12k     7022.05k    11951.24k    14440.12k    15462.74k
-sha1          1413.13k     6215.86k    10571.16k    12736.22k    13628.51k
-rc4          10556.28k    11974.08k    12077.10k    12111.38k    12103.20k
-des cfb       2977.71k     3252.27k     3284.36k     3302.66k     3290.54k
-des cbc       3298.31k     3704.96k     3771.30k     3730.73k     3778.80k
-des ede3      1278.28k     1328.82k     1342.66k     1339.82k     1343.27k
-idea cfb      2843.34k     3138.04k     3180.95k     3176.46k     3188.54k
-idea cbc      3115.21k     3558.03k     3590.61k     3591.24k     3601.18k
-rc2 cfb       2006.66k     2133.33k     2149.03k     2159.36k     2149.71k
-rc2 cbc       2167.07k     2315.30k     2338.05k     2329.34k     2333.90k
-rsa  512 bits   0.008s
-rsa 1024 bits   0.043s
-rsa 2048 bits   0.280s
-rsa 4096 bits   2.064s
-
diff --git a/deps/openssl/openssl/times/R4400.t b/deps/openssl/openssl/times/R4400.t
deleted file mode 100644
index af8848ffe369f0..00000000000000
--- a/deps/openssl/openssl/times/R4400.t
+++ /dev/null
@@ -1,26 +0,0 @@
-IRIX 5.3
-R4400 200mhz
-cc -O2
-SSLeay 0.6.5a 06-Dec-1996
-built on Mon Dec 23 11:51:11 EST 1996
-options:bn(32,32) md2(int) rc4(ptr,int) des(ptr,risc2,16,long) idea(int)
-C flags:cc -O2 -DTERMIOS -DB_ENDIAN
-The 'numbers' are in 1000s of bytes per second processed.
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2            100.62k      280.25k      380.15k      416.02k      428.82k
-md5            828.62k     3525.05k     6311.98k     7742.51k     8328.04k
-sha            580.04k     2513.74k     4251.73k     5101.04k     5394.80k
-sha1           520.23k     2382.94k     4107.82k     5024.62k     5362.56k
-rc4           5871.53k     6323.08k     6357.49k     6392.04k     6305.45k
-des cfb       1016.76k     1156.72k     1176.59k     1180.55k     1181.65k
-des cbc       1016.38k     1303.81k     1349.10k     1359.41k     1356.62k
-des ede3       607.39k      650.74k      655.11k      657.52k      654.18k
-idea cfb      1296.10k     1348.66k     1353.80k     1358.75k     1355.40k
-idea cbc      1453.90k     1554.68k     1567.84k     1569.89k     1573.57k
-rc2 cfb       1199.86k     1251.69k     1253.57k     1259.56k     1251.31k
-rc2 cbc       1334.60k     1428.55k     1441.89k     1445.42k     1441.45k
-rsa  512 bits   0.024s
-rsa 1024 bits   0.125s
-rsa 2048 bits   0.806s
-rsa 4096 bits   5.800s
-
diff --git a/deps/openssl/openssl/times/aix.t b/deps/openssl/openssl/times/aix.t
deleted file mode 100644
index 4f24e3980e5563..00000000000000
--- a/deps/openssl/openssl/times/aix.t
+++ /dev/null
@@ -1,34 +0,0 @@
-from Paco Garcia <pgarcia@ctv.es>
-This machine is a Bull Estrella  Minitower Model MT604-100
-Processor        : PPC604 
-P.Speed          : 100Mhz 
-Data/Instr Cache :    16 K
-L2 Cache         :   256 K
-PCI BUS Speed    :    33 Mhz
-TransfRate PCI   :   132 MB/s
-Memory           :    96 MB
-
-AIX 4.1.4
-
-SSLeay 0.6.6 14-Jan-1997
-built on Mon Jan 13 21:36:03 CUT 1997
-options:bn(64,32) md2(int) rc4(ptr,char) des(idx,cisc,4,long) idea(int) blowfish
-(idx)
-C flags:cc -O -DAIX -DB_ENDIAN
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                53.83k      147.46k      197.63k      215.72k     221.70k
-md5              1278.13k     5354.77k     8679.60k    10195.09k   10780.56k
-sha              1055.34k     4600.37k     7721.30k     9298.94k    9868.63k
-sha1              276.90k     1270.25k     2187.95k     2666.84k    2850.82k
-rc4              4660.57k     5268.93k     5332.48k     5362.47k    5346.65k
-des cbc          1774.16k     1981.10k     1979.56k     2032.71k    1972.25k
-des ede3          748.81k      781.42k      785.66k      785.75k     780.84k
-idea cbc         2066.19k     2329.58k     2378.91k     2379.86k    2380.89k
-rc2 cbc          1278.53k     1379.69k     1389.99k     1393.66k    1389.91k
-blowfish cbc     2812.91k     3307.90k     3364.91k     3386.37k    3374.32k
-rsa  512 bits   0.019s
-rsa 1024 bits   0.096s
-rsa 2048 bits   0.614s
-rsa 4096 bits   4.433s
-
diff --git a/deps/openssl/openssl/times/aixold.t b/deps/openssl/openssl/times/aixold.t
deleted file mode 100644
index 0b51412cf9f04b..00000000000000
--- a/deps/openssl/openssl/times/aixold.t
+++ /dev/null
@@ -1,23 +0,0 @@
-SSLeay 0.7.3r 20-May-1997
-built on Mon Jun  2 04:06:32 EST 1997
-options:bn(64,32) md2(int) rc4(ptr,char) des(idx,cisc,4,long) idea(int) blowfish(idx)
-C flags:cc -O -DAIX -DB_ENDIAN
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                19.09k       52.47k       71.23k       77.49k       78.93k
-md5               214.56k      941.21k     1585.43k     1883.12k     1988.70k
-sha               118.35k      521.65k      860.28k     1042.27k     1100.46k
-sha1              109.52k      478.98k      825.90k      995.48k     1049.69k
-rc4              1263.63k     1494.24k     1545.70k     1521.66k     1518.99k
-des cbc           259.62k      286.55k      287.15k      288.15k      289.45k
-des ede3          104.92k      107.88k      109.27k      109.25k      109.96k
-idea cbc          291.63k      320.07k      319.40k      320.51k      318.27k
-rc2 cbc           220.04k      237.76k      241.44k      245.90k      244.08k
-blowfish cbc      407.95k      474.83k      480.99k      485.71k      481.07k
-rsa  512 bits   0.157s   0.019
-rsa 1024 bits   0.908s   0.023
-rsa 2048 bits   6.225s   0.218
-rsa 4096 bits  46.500s   0.830
-dsa  512 bits   0.159s   0.312
-dsa 1024 bits   0.536s   1.057
-dsa 2048 bits   1.970s   3.977
diff --git a/deps/openssl/openssl/times/alpha.t b/deps/openssl/openssl/times/alpha.t
deleted file mode 100644
index 3a7c6c4983622f..00000000000000
--- a/deps/openssl/openssl/times/alpha.t
+++ /dev/null
@@ -1,81 +0,0 @@
-SSLeay-051 Alpha gcc -O3 64Bit (assember bn_mul)
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2             44.40k      121.56k      162.73k      179.20k      185.01k
-md5            780.85k     3278.53k     5281.52k     6327.98k     6684.67k
-sha            501.40k     2249.19k     3855.27k     4801.19k     5160.96k
-sha-1          384.99k     1759.72k     3113.64k     3946.92k     4229.80k
-rc4           3505.05k     3724.54k     3723.78k     3555.33k     3694.68k
-des cfb        946.96k     1015.27k     1021.87k     1033.56k     1037.65k
-des cbc       1001.24k     1220.20k     1243.31k     1272.73k     1265.87k
-des ede3       445.34k      491.65k      500.53k      502.10k      502.44k
-idea cfb       643.53k      667.49k      663.81k      666.28k      664.51k
-idea cbc       650.42k      735.41k      733.27k      742.74k      745.47k
-rsa  512 bits   0.031s
-rsa 1024 bits   0.141s
-rsa 2048 bits   0.844s
-rsa 4096 bits   6.033s
-
-SSLeay-051 Alpha cc -O2 64bit (assember bn_mul)
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2             45.37k      122.86k      165.97k      182.95k      188.42k
-md5            842.42k     3629.93k     5916.76k     7039.17k     7364.61k
-sha            498.93k     2197.23k     3895.60k     4756.48k     5132.13k
-sha-1          382.02k     1757.21k     3112.53k     3865.23k     4128.77k
-rc4           2975.25k     3049.33k     3180.97k     3214.68k     3424.26k
-des cfb        901.55k      990.83k     1006.08k     1011.19k     1004.89k
-des cbc        947.84k     1127.84k     1163.67k     1162.24k     1157.80k
-des ede3       435.62k      485.57k      493.67k      491.52k      491.52k
-idea cfb       629.31k      648.66k      647.77k      648.53k      649.90k
-idea cbc       565.15k      608.00k      613.46k      613.38k      617.13k
-rsa  512 bits   0.030s
-rsa 1024 bits   0.141s
-rsa 2048 bits   0.854s
-rsa 4096 bits   6.067s
-
-des cfb        718.28k      822.64k      833.11k      836.27k      841.05k
-des cbc        806.10k      951.42k      975.83k      983.73k      991.23k
-des ede3       329.50k      379.11k      387.95k      387.41k      388.33k
-
-des cfb        871.62k      948.65k      951.81k      953.00k      955.58k
-des cbc        953.60k     1174.27k     1206.70k     1216.10k     1216.44k
-des ede3       349.34k      418.05k      427.26k      429.74k      431.45k
-
-
-
-
-SSLeay-045c Alpha gcc -O3 64Bit
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2             44.95k      122.22k      164.27k      180.62k      184.66k
-md5            808.71k     3371.95k     5415.68k     6385.66k     6684.67k
-sha            493.68k     2162.05k     3725.82k     4552.02k     4838.74k
-rc4           3317.32k     3649.09k     3728.30k     3744.09k     3691.86k
-cfb des        996.45k     1050.77k     1058.30k     1059.16k     1064.96k
-cbc des       1096.52k     1255.49k     1282.13k     1289.90k     1299.80k
-ede3 des       482.14k      513.51k      518.66k      520.19k      521.39k
-cfb idea       519.90k      533.40k      535.21k      535.55k      535.21k
-cbc idea       619.34k      682.21k      688.04k      689.15k      690.86k
-rsa  512 bits   0.050s
-rsa 1024 bits   0.279s
-rsa 2048 bits   1.908s
-rsa 4096 bits  14.750s
-
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2             37.31k      102.77k      137.64k      151.55k      155.78k
-md5            516.65k     2535.21k     4655.72k     5859.66k     6343.34k
-rc4           3519.61k     3707.01k     3746.86k     3755.39k     3675.48k
-cfb des        780.27k      894.68k      913.10k      921.26k      922.97k
-cbc des        867.54k     1040.13k     1074.17k     1075.54k     1084.07k
-ede3 des       357.19k      397.36k      398.08k      402.28k      401.41k
-cbc idea       646.53k      686.44k      694.03k      691.20k      693.59k
-rsa  512 bits   0.046s
-rsa 1024 bits   0.270s
-rsa 2048 bits   1.858s
-rsa 4096 bits  14.350s
-
-md2      C      37.83k      103.17k      137.90k      150.87k      155.37k
-md2      L      37.30k      102.04k      139.01k      152.74k      155.78k
-rc4       I   3532.24k     3718.08k     3750.83k     3768.78k     3694.59k
-rc4      CI   2662.97k     2873.26k     2907.22k     2920.63k     2886.31k
-rc4      LI   3514.63k     3738.72k     3747.41k     3752.96k     3708.49k
-cbc idea S     619.01k      658.68k      661.50k      662.53k      663.55k
-cbc idea  L    645.69k      684.22k      694.55k      692.57k      690.86k
diff --git a/deps/openssl/openssl/times/alpha400.t b/deps/openssl/openssl/times/alpha400.t
deleted file mode 100644
index 079e0d187ce3b4..00000000000000
--- a/deps/openssl/openssl/times/alpha400.t
+++ /dev/null
@@ -1,25 +0,0 @@
-Alpha EV5.6 (21164A) 400mhz
-
-SSLeay 0.7.3r 20-May-1997
-built on Mon Jun  2 03:39:58 EST 1997
-options:bn(64,64) md2(int) rc4(ptr,int) des(idx,cisc,4,long) idea(int) blowfish(idx)
-C flags:cc -arch host -tune host -fast -std -O4 -inline speed
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2               274.98k      760.96k     1034.27k     1124.69k     1148.69k
-md5              2524.46k    11602.60k    19838.81k    24075.26k    25745.10k
-sha              1848.46k     8335.66k    14232.49k    17247.91k    18530.30k
-sha1             1639.67k     7336.53k    12371.80k    14807.72k    15870.63k
-rc4             17950.93k    19390.66k    19652.44k    19700.39k    19412.31k
-des cbc          4018.59k     4872.06k     4988.76k     5003.26k     4995.73k
-des ede3         1809.11k     1965.67k     1984.26k     1986.90k     1982.46k
-idea cbc         2848.82k     3204.33k     3250.26k     3257.34k     3260.42k
-rc2 cbc          3766.08k     4349.50k     4432.21k     4448.94k     4448.26k
-blowfish cbc     6694.88k     9042.35k     9486.93k     9598.98k     9624.91k
-rsa  512 bits   0.003s   0.000
-rsa 1024 bits   0.013s   0.000
-rsa 2048 bits   0.081s   0.003
-rsa 4096 bits   0.577s   0.011
-dsa  512 bits   0.003s   0.005
-dsa 1024 bits   0.007s   0.014
-dsa 2048 bits   0.025s   0.050
diff --git a/deps/openssl/openssl/times/cyrix100.lnx b/deps/openssl/openssl/times/cyrix100.lnx
deleted file mode 100644
index 010a2216b1e864..00000000000000
--- a/deps/openssl/openssl/times/cyrix100.lnx
+++ /dev/null
@@ -1,22 +0,0 @@
-SSLeay 0.6.6 06-Dec-1996
-built on Fri Dec  6 10:05:20 GMT 1996
-options:bn(64,32) md2(char) rc4(idx,int) des(idx,risc,16,long) idea(int)
-C flags:gcc -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized
-The 'numbers' are in 1000s of bytes per second processed.
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2             36.77k      102.48k      138.00k      151.57k      155.78k
-md5            513.59k     2577.22k     4623.51k     5768.99k     6214.53k
-sha            259.89k     1105.45k     1814.97k     2156.16k     2292.13k
-sha1           242.43k     1040.95k     1719.44k     2049.74k     2164.64k
-rc4           1984.48k     2303.41k     2109.37k     2071.47k     1985.61k
-des cfb        712.08k      758.29k      753.17k      752.06k      748.67k
-des cbc        787.37k      937.64k      956.77k      961.61k      957.54k
-des ede3       353.97k      377.28k      379.99k      379.34k      379.11k
-idea cfb       403.80k      418.50k      416.60k      415.78k      415.03k
-idea cbc       426.54k      466.40k      471.31k      472.67k      473.14k
-rc2 cfb        405.15k      420.05k      418.16k      416.72k      416.36k
-rc2 cbc        428.21k      468.43k      473.09k      472.59k      474.70k
-rsa  512 bits   0.040s
-rsa 1024 bits   0.195s
-rsa 2048 bits   1.201s
-rsa 4096 bits   8.700s
diff --git a/deps/openssl/openssl/times/dgux-x86.t b/deps/openssl/openssl/times/dgux-x86.t
deleted file mode 100644
index 70635c536b45db..00000000000000
--- a/deps/openssl/openssl/times/dgux-x86.t
+++ /dev/null
@@ -1,23 +0,0 @@
-version:SSLeay 0.5.2c 15-May-1996
-built Fri Jun 14 19:47:04 EST 1996
-options:bn(LLONG,thirty_two) md2(CHAR) rc4(IDX,int) des(ary,long) idea(int)
-C flags:gcc -O3 -fomit-frame-pointer -DL_ENDIAN
-
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2            113.86k      316.48k      428.36k      467.63k      481.56k
-md5           1001.99k     5037.99k     9545.94k    12036.95k    11800.38k
-sha            628.77k     2743.48k     5113.42k     6206.99k     6165.42k
-sha1           583.83k     2638.66k     4538.85k     5532.09k     5917.04k
-rc4           5493.27k     6369.39k     6511.30k     6577.83k     6486.73k
-des cfb       1219.01k     1286.06k     1299.33k     1288.87k     1381.72k
-des cbc       1360.58k     1469.04k     1456.96k     1454.08k     1513.57k
-des ede3       544.45k      567.84k      568.99k      570.37k      566.09k
-idea cfb      1012.39k     1056.30k     1063.52k      989.17k      863.24k
-idea cbc       985.36k     1090.44k     1105.92k     1108.65k     1090.17k
-rc2 cfb        963.86k      979.06k      995.30k      937.35k      827.39k
-rc2 cbc        951.72k     1042.11k     1049.60k     1047.21k     1059.11k
-rsa  512 bits   0.032s
-rsa 1024 bits   0.159s
-rsa 2048 bits   1.025s
-rsa 4096 bits   7.270s
-
diff --git a/deps/openssl/openssl/times/dgux.t b/deps/openssl/openssl/times/dgux.t
deleted file mode 100644
index c7f7564e8dab69..00000000000000
--- a/deps/openssl/openssl/times/dgux.t
+++ /dev/null
@@ -1,17 +0,0 @@
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2             38.54k      106.28k      144.00k      157.46k      161.72k
-md5            323.23k     1471.62k     2546.11k     3100.20k     3309.57k
-rc4        I  1902.74k     2055.20k     2080.42k     2077.88k     2065.46k
-cfb des        456.23k      475.22k      481.79k      488.42k      487.17k
-cbc des        484.30k      537.50k      553.09k      558.08k      558.67k
-ede3 des       199.97k      209.05k      211.03k      211.85k      212.78k
-cbc idea       478.50k      519.33k      523.42k      525.09k      526.44k
-rsa  512 bits   0.159s !RSA_LLONG
-rsa 1024 bits   1.053s
-rsa 2048 bits   7.600s
-rsa 4096 bits  59.760s
-
-md2       C     30.53k       83.58k      112.84k      123.22k      126.24k
-rc4           1844.56k     1975.50k     1997.73k     1994.95k     1984.88k
-rc4       C   1800.09k     1968.85k     1995.20k     1992.36k     1996.80k
-rc4       CI  1830.81k     2035.75k     2067.28k     2070.23k     2062.77k
diff --git a/deps/openssl/openssl/times/hpux-acc.t b/deps/openssl/openssl/times/hpux-acc.t
deleted file mode 100644
index 0c0e936d193254..00000000000000
--- a/deps/openssl/openssl/times/hpux-acc.t
+++ /dev/null
@@ -1,25 +0,0 @@
-HPUX 887
-
-SSLeay 0.7.3r 20-May-1997
-built on Mon Jun  2 02:59:45 EST 1997
-options:bn(32,32) md2(int) rc4(ptr,int) des(ptr,risc1,16,long) idea(int) blowfish(idx)
-C flags:cc -DB_ENDIAN -D_HPUX_SOURCE -Aa -Ae +ESlit +O4 -Wl,-a,archive
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                58.99k      166.85k      225.07k      247.21k      253.76k
-md5               639.22k     2726.98k     4477.25k     5312.69k     5605.20k
-sha               381.08k     1661.49k     2793.84k     3368.86k     3581.23k
-sha1              349.54k     1514.56k     2536.63k     3042.59k     3224.39k
-rc4              2891.10k     4238.01k     4464.11k     4532.49k     4545.87k
-des cbc           717.05k      808.76k      820.14k      821.97k      821.96k
-des ede3          288.21k      303.50k      303.69k      305.82k      305.14k
-idea cbc          325.83k      334.36k      335.89k      336.61k      333.43k
-rc2 cbc           793.00k      915.81k      926.69k      933.28k      929.53k
-blowfish cbc     1561.91k     2051.97k     2122.65k     2139.40k     2145.92k
-rsa  512 bits   0.031s   0.004
-rsa 1024 bits   0.164s   0.004
-rsa 2048 bits   1.055s   0.037
-rsa 4096 bits   7.600s   0.137
-dsa  512 bits   0.029s   0.057
-dsa 1024 bits   0.092s   0.177
-dsa 2048 bits   0.325s   0.646
diff --git a/deps/openssl/openssl/times/hpux-kr.t b/deps/openssl/openssl/times/hpux-kr.t
deleted file mode 100644
index ad4a0adc1876d5..00000000000000
--- a/deps/openssl/openssl/times/hpux-kr.t
+++ /dev/null
@@ -1,23 +0,0 @@
-SSLeay 0.7.3r 20-May-1997
-built on Mon Jun  2 02:17:35 EST 1997
-options:bn(32,32) md2(int) rc4(ptr,int) des(ptr,cisc,16,long) idea(int) blowfish(idx)
-C flags:cc -DB_ENDIAN -DNOCONST -DNOPROTO -D_HPUX_SOURCE
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                35.30k       98.36k      133.41k      146.34k      150.69k
-md5               391.20k     1737.31k     2796.65k     3313.75k     3503.74k
-sha               189.55k      848.14k     1436.72k     1735.87k     1848.03k
-sha1              175.30k      781.14k     1310.32k     1575.61k     1675.81k
-rc4              2070.55k     2501.47k     2556.65k     2578.34k     2584.91k
-des cbc           465.13k      536.85k      545.87k      547.86k      548.89k
-des ede3          190.05k      200.99k      202.31k      202.22k      202.75k
-idea cbc          263.44k      277.77k      282.13k      281.51k      283.15k
-rc2 cbc           448.37k      511.39k      519.54k      522.00k      521.31k
-blowfish cbc      839.98k     1097.70k     1131.16k     1145.64k     1144.67k
-rsa  512 bits   0.048s   0.005
-rsa 1024 bits   0.222s   0.006
-rsa 2048 bits   1.272s   0.042
-rsa 4096 bits   8.445s   0.149
-dsa  512 bits   0.041s   0.077
-dsa 1024 bits   0.111s   0.220
-dsa 2048 bits   0.363s   0.726
diff --git a/deps/openssl/openssl/times/hpux.t b/deps/openssl/openssl/times/hpux.t
deleted file mode 100644
index dcf7615edf363e..00000000000000
--- a/deps/openssl/openssl/times/hpux.t
+++ /dev/null
@@ -1,86 +0,0 @@
-HP-UX A.09.05 9000/712
-
-SSLeay 0.6.6 14-Jan-1997
-built on Tue Jan 14 16:36:31 WET 1997
-options:bn(32,32) md2(int) rc4(ptr,int) des(ptr,risc1,16,long) idea(int) 
-blowfish(idx)
-C flags:cc -DB_ENDIAN -D_HPUX_SOURCE -Aa +ESlit +O2 -Wl,-a,archive
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                66.56k      184.92k      251.82k      259.86k      282.62k
-md5               615.54k     2805.92k     4764.30k     5724.21k     6084.39k
-sha               358.23k     1616.46k     2781.50k     3325.72k     3640.89k
-sha1              327.50k     1497.98k     2619.44k     3220.26k     3460.85k
-rc4              3500.47k     3890.99k     3943.81k     3883.74k     3900.02k
-des cbc           742.65k      871.66k      887.15k      891.21k      895.40k
-des ede3          302.42k      322.50k      324.46k      326.66k      326.05k
-idea cbc          664.41k      755.87k      765.61k      772.70k      773.69k
-rc2 cbc           798.78k      931.04k      947.69k      950.31k      952.04k
-blowfish cbc     1353.32k     1932.29k     2021.93k     2047.02k     2053.66k
-rsa  512 bits   0.059s
-rsa 1024 bits   0.372s
-rsa 2048 bits   2.697s
-rsa 4096 bits  20.790s
-
-SSLeay 0.6.6 14-Jan-1997
-built on Tue Jan 14 15:37:30 WET 1997
-options:bn(64,32) md2(int) rc4(ptr,int) des(ptr,risc1,16,long) idea(int) 
-blowfish(idx)
-C flags:gcc -DB_ENDIAN -O3
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                44.91k      122.57k      167.71k      183.89k      190.24k
-md5               532.50k     2316.27k     3965.72k     4740.11k     5055.06k
-sha               363.76k     1684.09k     2978.53k     3730.86k     3972.72k
-sha1              385.76k     1743.53k     2997.69k     3650.74k     3899.08k
-rc4              3178.84k     3621.31k     3672.71k     3684.01k     3571.54k
-des cbc           733.00k      844.70k      863.28k      863.72k      868.73k
-des ede3          289.99k      308.94k      310.11k      309.64k      312.08k
-idea cbc          624.07k      713.91k      724.76k      723.35k      725.13k
-rc2 cbc           704.34k      793.39k      804.25k      805.99k      782.63k
-blowfish cbc     1371.24k     1823.66k     1890.05k     1915.51k     1920.12k
-rsa  512 bits   0.030s
-rsa 1024 bits   0.156s
-rsa 2048 bits   1.113s
-rsa 4096 bits   7.480s
-
-
-HPUX B.10.01 V 9000/887 - HP92453-01 A.10.11 HP C Compiler
-SSLeay 0.5.2 - -Aa +ESlit +Oall +O4 -Wl,-a,archive
-
-HPUX A.09.04 B 9000/887
-
-ssleay 0.5.1 gcc v 2.7.0 -O3 -mpa-risc-1-1
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2             53.00k      166.81k      205.66k      241.95k      242.20k
-md5            743.22k     3128.44k     6031.85k     6142.07k     7025.26k
-sha            481.30k     2008.24k     3361.31k     3985.07k     4180.74k
-sha-1          463.60k     1916.15k     3139.24k     3786.27k     3997.70k
-rc4           3708.61k     4125.16k     4547.53k     4206.21k     4390.07k
-des cfb        665.91k      705.97k      698.48k      694.25k      666.08k
-des cbc        679.80k      741.90k      769.85k      747.62k      719.47k
-des ede3       264.31k      270.22k      265.63k      273.07k      273.07k
-idea cfb       635.91k      673.40k      605.60k      699.53k      672.36k
-idea cbc       705.85k      774.63k      750.60k      715.83k      721.50k
-rsa  512 bits   0.066s
-rsa 1024 bits   0.372s
-rsa 2048 bits   2.177s
-rsa 4096 bits  16.230s
-
-HP92453-01 A.09.61 HP C Compiler
-ssleay 0.5.1 cc -Ae +ESlit +Oall -Wl,-a,archive
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2             58.69k      163.30k      213.57k      230.40k      254.23k
-md5            608.60k     2596.82k     3871.43k     4684.10k     4763.88k
-sha            343.26k     1482.43k     2316.80k     2766.27k     2860.26k
-sha-1          319.15k     1324.13k     2106.03k     2527.82k     2747.95k
-rc4           2467.47k     3374.41k     3265.49k     3354.39k     3368.55k
-des cfb        812.05k      814.90k      851.20k      819.20k      854.56k
-des cbc        836.35k      994.06k      916.02k     1020.01k      988.14k
-des ede3       369.78k      389.15k      401.01k      382.94k      408.03k
-idea cfb       290.40k      298.06k      286.11k      296.92k      299.46k
-idea cbc       301.30k      297.72k      304.34k      300.10k      309.70k
-rsa  512 bits   0.350s
-rsa 1024 bits   2.635s
-rsa 2048 bits  19.930s
-
diff --git a/deps/openssl/openssl/times/p2.w95 b/deps/openssl/openssl/times/p2.w95
deleted file mode 100644
index 82d1e5515d59ac..00000000000000
--- a/deps/openssl/openssl/times/p2.w95
+++ /dev/null
@@ -1,22 +0,0 @@
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2               235.90k      652.30k      893.36k      985.74k      985.74k
-mdc2              779.61k      816.81k      825.65k      816.01k      825.65k
-md5              2788.77k    13508.23k    24672.38k    30504.03k    33156.55k
-sha              1938.22k     8397.01k    14122.24k    16980.99k    18196.55k
-sha1             1817.29k     7832.50k    13168.93k    15738.48k    16810.84k
-rc4             15887.52k    21709.65k    22745.68k    22995.09k    22995.09k
-des cbc          4599.02k     5377.31k     5377.31k     5533.38k     5533.38k
-des ede3         1899.59k     2086.71k     2086.67k     2086.51k     2085.90k
-idea cbc         3350.08k     3934.62k     3979.42k     4017.53k     4017.53k
-rc2 cbc          1534.13k     1630.76k     1625.70k     1644.83k     1653.91k
-blowfish cbc     6678.83k     8490.49k     8701.88k     8848.74k     8886.24k
-                  sign    verify
-rsa  512 bits   0.0062s   0.0008s
-rsa 1024 bits   0.0287s   0.0009s
-rsa 2048 bits   0.1785s   0.0059s
-rsa 4096 bits   1.1300s   0.0205s
-                  sign    verify
-dsa  512 bits   0.0055s   0.0100s
-dsa 1024 bits   0.0154s   0.0299s
-dsa 2048 bits   0.0502s   0.0996s
diff --git a/deps/openssl/openssl/times/pent2.t b/deps/openssl/openssl/times/pent2.t
deleted file mode 100644
index b6dc269155ac0c..00000000000000
--- a/deps/openssl/openssl/times/pent2.t
+++ /dev/null
@@ -1,24 +0,0 @@
-pentium 2, 266mhz, Visual C++ 5.0, Windows 95
-
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2               235.90k      652.30k      893.36k      985.74k      985.74k
-mdc2              779.61k      816.81k      825.65k      816.01k      825.65k
-md5              2788.77k    13508.23k    24672.38k    30504.03k    33156.55k
-sha              1938.22k     8397.01k    14122.24k    16980.99k    18196.55k
-sha1             1817.29k     7832.50k    13168.93k    15738.48k    16810.84k
-rc4             15887.52k    21709.65k    22745.68k    22995.09k    22995.09k
-des cbc          4599.02k     5377.31k     5377.31k     5533.38k     5533.38k
-des ede3         1899.59k     2086.71k     2086.67k     2086.51k     2085.90k
-idea cbc         3350.08k     3934.62k     3979.42k     4017.53k     4017.53k
-rc2 cbc          1534.13k     1630.76k     1625.70k     1644.83k     1653.91k
-blowfish cbc     6678.83k     8490.49k     8701.88k     8848.74k     8886.24k
-                  sign    verify
-rsa  512 bits   0.0062s   0.0008s
-rsa 1024 bits   0.0287s   0.0009s
-rsa 2048 bits   0.1785s   0.0059s
-rsa 4096 bits   1.1300s   0.0205s
-                  sign    verify
-dsa  512 bits   0.0055s   0.0100s
-dsa 1024 bits   0.0154s   0.0299s
-dsa 2048 bits   0.0502s   0.0996s
diff --git a/deps/openssl/openssl/times/readme b/deps/openssl/openssl/times/readme
deleted file mode 100644
index 7074f5815b9d38..00000000000000
--- a/deps/openssl/openssl/times/readme
+++ /dev/null
@@ -1,11 +0,0 @@
-The 'times' in this directory are not all for the most recent version of
-the library and it should be noted that on some CPUs (specifically sparc
-and Alpha), the locations of files in the application after linking can
-make upto a %10 speed difference when running benchmarks on things like
-cbc mode DES.  To put it mildly this can be very anoying.
-
-About the only way to get around this would be to compile the library as one
-object file, or to 'include' the source files in a specific order.
-
-The best way to get an idea of the 'raw' DES speed is to build the 
-'speed' program in crypto/des.
diff --git a/deps/openssl/openssl/times/s586-100.lnx b/deps/openssl/openssl/times/s586-100.lnx
deleted file mode 100644
index cbc3e3c4fb91db..00000000000000
--- a/deps/openssl/openssl/times/s586-100.lnx
+++ /dev/null
@@ -1,25 +0,0 @@
-Shared library build
-
-SSLeay 0.7.3 30-Apr-1997
-built on Tue May 13 03:43:56 EST 1997
-options:bn(64,32) md2(char) rc4(idx,int) des(ptr,risc1,16,long) idea(int) blowfish(ptr2)
-C flags:-DTERMIO -O3 -DL_ENDIAN -fomit-frame-pointer -m486 -Wall
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                68.95k      191.40k      258.22k      283.31k      291.21k
-md5               627.37k     3064.75k     5370.15k     6765.91k     7255.38k
-sha               323.35k     1431.32k     2417.07k     2916.69k     3102.04k
-sha1              298.08k     1318.34k     2228.82k     2694.83k     2864.47k
-rc4              3404.13k     4026.33k     4107.43k     4136.28k     4117.85k
-des cbc          1414.60k     1782.53k     1824.24k     1847.64k     1840.47k
-des ede3          588.36k      688.19k      700.33k      702.46k      704.51k
-idea cbc          582.96k      636.71k      641.54k      642.39k      642.30k
-rc2 cbc           569.34k      612.37k      617.64k      617.47k      619.86k
-blowfish cbc     2015.77k     2534.49k     2609.65k     2607.10k     2615.98k
-rsa  512 bits   0.027s   0.003
-rsa 1024 bits   0.128s   0.003
-rsa 2048 bits   0.779s   0.027
-rsa 4096 bits   5.450s   0.098
-dsa  512 bits   0.024s   0.045
-dsa 1024 bits   0.068s   0.132
-dsa 2048 bits   0.231s   0.469
diff --git a/deps/openssl/openssl/times/s586-100.nt b/deps/openssl/openssl/times/s586-100.nt
deleted file mode 100644
index 8e3baf6d5e622b..00000000000000
--- a/deps/openssl/openssl/times/s586-100.nt
+++ /dev/null
@@ -1,23 +0,0 @@
-SSLeay 0.7.3 30-Apr-1997
-built on Mon May 19 10:47:38 EST 1997
-options:bn(64,32) md2(char) rc4(idx,int) des(idx,cisc,4,long) idea(int) blowfish(ptr2)
-C flags not available
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                90.26k      248.57k      335.06k      366.09k      376.64k
-md5               863.95k     4205.24k     7628.78k     9582.60k    10290.25k
-sha               463.93k     2102.51k     3623.28k     4417.85k     4695.29k
-sha1              458.23k     2005.88k     3385.78k     4094.00k     4340.13k
-rc4              5843.60k     7543.71k     7790.31k     7836.89k     7791.47k
-des cbc          1583.95k     1910.67k     1960.69k     1972.12k     1946.13k
-des ede3          654.79k      722.60k      740.97k      745.82k      738.27k
-idea cbc          792.04k      876.96k      887.35k      892.63k      890.36k
-rc2 cbc           603.50k      652.38k      661.85k      662.69k      661.44k
-blowfish cbc     2379.88k     3043.76k     3153.61k     3153.61k     3134.76k
-rsa  512 bits   0.022s   0.003
-rsa 1024 bits   0.111s   0.003
-rsa 2048 bits   0.716s   0.025
-rsa 4096 bits   5.188s   0.094
-dsa  512 bits   0.020s   0.039
-dsa 1024 bits   0.062s   0.124
-dsa 2048 bits   0.221s   0.441
diff --git a/deps/openssl/openssl/times/sgi.t b/deps/openssl/openssl/times/sgi.t
deleted file mode 100644
index 7963610150b7ee..00000000000000
--- a/deps/openssl/openssl/times/sgi.t
+++ /dev/null
@@ -1,29 +0,0 @@
-SGI Challenge R4400 200mhz IRIX 5.3 - gcc (2.6.3)
-SSLeay 0.6.1 02-Jul-1996
-built on Tue Jul  2 16:25:30 EST 1996
-options:bn(64,32) md2(char) rc4(idx,char) des(idx,long) idea(int)
-C flags:gcc -O2 -mips2 -DTERMIOS -DB_ENDIAN
-The 'numbers' are in 1000s of bytes per second processed.
-type           8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2             96.53k      266.70k      360.09k      393.70k      405.07k
-md5            971.15k     4382.56k     7406.90k     8979.99k     9559.18k
-sha            596.86k     2832.26k     4997.30k     6277.75k     6712.89k
-sha1           578.34k     2630.16k     4632.05k     5684.34k     6083.37k
-rc4           5641.12k     6821.76k     6996.13k     7052.61k     6913.32k
-des cfb       1354.86k     1422.11k     1434.58k     1433.24k     1432.89k
-des cbc       1467.13k     1618.92k     1630.08k     1637.00k     1629.62k
-des ede3       566.13k      591.91k      596.86k      596.18k      592.54k
-idea cfb      1190.60k     1264.49k     1270.38k     1267.84k     1272.37k
-idea cbc      1271.45k     1410.37k     1422.49k     1426.46k     1421.73k
-rc2 cfb       1285.73k     1371.40k     1380.92k     1383.13k     1379.23k
-rc2 cbc       1386.61k     1542.10k     1562.49k     1572.45k     1567.93k
-rsa  512 bits   0.018s
-rsa 1024 bits   0.106s
-rsa 2048 bits   0.738s
-rsa 4096 bits   5.535s
-
-version:SSLeay 0.5.2c 15-May-1996
-rsa  512 bits   0.035s
-rsa 1024 bits   0.204s
-rsa 2048 bits   1.423s
-rsa 4096 bits  10.800s
diff --git a/deps/openssl/openssl/times/sparc.t b/deps/openssl/openssl/times/sparc.t
deleted file mode 100644
index 1611f76570a4d3..00000000000000
--- a/deps/openssl/openssl/times/sparc.t
+++ /dev/null
@@ -1,26 +0,0 @@
-gcc 2.7.2
-Sparc 10 - Solaris 2.3 - 50mhz
-SSLeay 0.7.3r 20-May-1997
-built on Mon Jun  2 00:55:51 EST 1997
-options:bn(64,32) md2(int) rc4(ptr,char) des(idx,cisc,16,long) idea(int) blowfish(ptr)
-C flags:gcc -O3 -fomit-frame-pointer -mv8 -Wall
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                54.88k      154.52k      210.35k      231.08k      237.21k
-md5               550.75k     2460.49k     4116.01k     4988.74k     5159.86k
-sha               340.28k     1461.76k     2430.10k     2879.87k     2999.15k
-sha1              307.27k     1298.41k     2136.26k     2540.07k     2658.28k
-rc4              2652.21k     2805.24k     3301.63k     4003.98k     4071.18k
-des cbc           811.78k      903.93k      914.19k      921.60k      932.29k
-des ede3          328.21k      344.93k      349.64k      351.48k      345.07k
-idea cbc          685.06k      727.42k      734.41k      730.11k      739.21k
-rc2 cbc           718.59k      777.02k      781.96k      784.38k      782.60k
-blowfish cbc     1268.85k     1520.64k     1568.88k     1587.54k     1591.98k
-rsa  512 bits   0.037s   0.005
-rsa 1024 bits   0.213s   0.006
-rsa 2048 bits   1.471s   0.053
-rsa 4096 bits  11.100s   0.202
-dsa  512 bits   0.038s   0.074
-dsa 1024 bits   0.128s   0.248
-dsa 2048 bits   0.473s   0.959
-
diff --git a/deps/openssl/openssl/times/sparc2 b/deps/openssl/openssl/times/sparc2
deleted file mode 100644
index 4b0dd805efc0be..00000000000000
--- a/deps/openssl/openssl/times/sparc2
+++ /dev/null
@@ -1,21 +0,0 @@
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                14.56k       40.25k       54.95k       60.13k       62.18k
-mdc2               53.59k       57.45k       58.11k       58.21k       58.51k
-md5               176.95k      764.75k     1270.36k     1520.14k     1608.36k
-hmac(md5)          55.88k      369.70k      881.15k     1337.05k     1567.40k
-sha1               92.69k      419.75k      723.63k      878.82k      939.35k
-rc4              1247.28k     1414.09k     1434.30k     1434.34k     1441.13k
-des cbc           284.41k      318.58k      323.07k      324.09k      323.87k
-des ede3          109.99k      119.99k      121.60k      121.87k      121.66k
-idea cbc           43.06k       43.68k       43.84k       43.64k       44.07k
-rc2 cbc           278.85k      311.44k      316.50k      316.57k      317.37k
-blowfish cbc      468.89k      569.35k      581.61k      568.34k      559.54k
-cast cbc          285.84k      338.79k      345.71k      346.19k      341.09k
-                  sign    verify
-rsa  512 bits   0.4175s   0.0519s
-rsa 1024 bits   2.9325s   0.1948s
-rsa 2048 bits  22.3600s   0.7669s
-		  sign    verify
-dsa  512 bits   0.5178s   1.0300s
-dsa 1024 bits   1.8780s   3.7167s
-dsa 2048 bits   7.3500s  14.4800s
diff --git a/deps/openssl/openssl/times/sparcLX.t b/deps/openssl/openssl/times/sparcLX.t
deleted file mode 100644
index 2fdaed7cc5000c..00000000000000
--- a/deps/openssl/openssl/times/sparcLX.t
+++ /dev/null
@@ -1,22 +0,0 @@
-Sparc Station LX
-SSLeay 0.7.3 30-Apr-1997
-built on Thu May  1 10:44:02 EST 1997
-options:bn(64,32) md2(int) rc4(ptr,char) des(idx,cisc,16,long) idea(int) blowfish(ptr)
-C flags:gcc -O3 -fomit-frame-pointer -mv8 -Wall
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2                17.60k       48.72k       66.47k       72.70k       74.72k
-md5               226.24k     1082.21k     1982.72k     2594.02k     2717.01k
-sha                71.38k      320.71k      551.08k      677.76k      720.90k
-sha1               63.08k      280.79k      473.86k      576.94k      608.94k
-rc4              1138.30k     1257.67k     1304.49k     1377.78k     1364.42k
-des cbc           265.34k      308.85k      314.28k      315.39k      317.20k
-des ede3           83.23k       93.13k       94.04k       94.50k       94.63k
-idea cbc          254.48k      274.26k      275.88k      274.68k      275.80k
-rc2 cbc           328.27k      375.39k      381.43k      381.61k      380.83k
-blowfish cbc      487.00k      498.02k      510.12k      515.41k      516.10k
-rsa  512 bits   0.093s
-rsa 1024 bits   0.537s
-rsa 2048 bits   3.823s
-rsa 4096 bits  28.650s
-
diff --git a/deps/openssl/openssl/times/usparc.t b/deps/openssl/openssl/times/usparc.t
deleted file mode 100644
index 2215624f9f2e7b..00000000000000
--- a/deps/openssl/openssl/times/usparc.t
+++ /dev/null
@@ -1,25 +0,0 @@
-Sparc 2000? - Solaris 2.5.1 - 167mhz Ultra sparc
-
-SSLeay 0.7.3r 20-May-1997
-built on Mon Jun  2 02:25:48 EST 1997
-options:bn(64,32) md2(int) rc4(ptr,char) des(ptr,risc1,16,long) idea(int) blowfish(ptr)
-C flags:cc cc -xtarget=ultra -xarch=v8plus -Xa -xO5 -Xa -DB_ENDIAN
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2               135.23k      389.87k      536.66k      591.87k      603.48k
-md5              1534.38k     6160.41k     9842.69k    11446.95k    11993.09k
-sha              1178.30k     5020.74k     8532.22k    10275.50k    11010.05k
-sha1             1114.22k     4703.94k     7703.81k     9236.14k     9756.67k
-rc4             10818.03k    13327.57k    13711.10k    13810.69k    13836.29k
-des cbc          3052.44k     3320.02k     3356.25k     3369.98k     3295.91k
-des ede3         1310.32k     1359.98k     1367.47k     1362.94k     1362.60k
-idea cbc         1749.52k     1833.13k     1844.74k     1848.32k     1848.66k
-rc2 cbc          1950.25k     2053.23k     2064.21k     2072.58k     2072.58k
-blowfish cbc     4927.16k     5659.75k     5762.73k     5797.55k     5805.40k
-rsa  512 bits   0.021s   0.003
-rsa 1024 bits   0.126s   0.003
-rsa 2048 bits   0.888s   0.032
-rsa 4096 bits   6.770s   0.122
-dsa  512 bits   0.022s   0.043
-dsa 1024 bits   0.076s   0.151
-dsa 2048 bits   0.286s   0.574
diff --git a/deps/openssl/openssl/times/x86/bfs.cpp b/deps/openssl/openssl/times/x86/bfs.cpp
deleted file mode 100644
index d74c45776078b4..00000000000000
--- a/deps/openssl/openssl/times/x86/bfs.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// gettsc.inl
-//
-// gives access to the Pentium's (secret) cycle counter
-//
-// This software was written by Leonard Janke (janke@unixg.ubc.ca)
-// in 1996-7 and is entered, by him, into the public domain.
-
-#if defined(__WATCOMC__)
-void GetTSC(unsigned long&);
-#pragma aux GetTSC = 0x0f 0x31 "mov [edi], eax" parm [edi] modify [edx eax];
-#elif defined(__GNUC__)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  asm volatile(".byte 15, 49\n\t"
-	       : "=eax" (tsc)
-	       :
-	       : "%edx", "%eax");
-}
-#elif defined(_MSC_VER)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  unsigned long a;
-  __asm _emit 0fh
-  __asm _emit 31h
-  __asm mov a, eax;
-  tsc=a;
-}
-#endif      
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/blowfish.h>
-
-void main(int argc,char *argv[])
-	{
-	BF_KEY key;
-	unsigned long s1,s2,e1,e2;
-	unsigned long data[2];
-	int i,j;
-
-	for (j=0; j<6; j++)
-		{
-		for (i=0; i<1000; i++) /**/
-			{
-			BF_encrypt(&data[0],&key);
-			GetTSC(s1);
-			BF_encrypt(&data[0],&key);
-			BF_encrypt(&data[0],&key);
-			BF_encrypt(&data[0],&key);
-			GetTSC(e1);
-			GetTSC(s2);
-			BF_encrypt(&data[0],&key);
-			BF_encrypt(&data[0],&key);
-			BF_encrypt(&data[0],&key);
-			BF_encrypt(&data[0],&key);
-			GetTSC(e2);
-			BF_encrypt(&data[0],&key);
-			}
-
-		printf("blowfish %d %d (%d)\n",
-			e1-s1,e2-s2,((e2-s2)-(e1-s1)));
-		}
-	}
-
diff --git a/deps/openssl/openssl/times/x86/casts.cpp b/deps/openssl/openssl/times/x86/casts.cpp
deleted file mode 100644
index 7661191acf5ce0..00000000000000
--- a/deps/openssl/openssl/times/x86/casts.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// gettsc.inl
-//
-// gives access to the Pentium's (secret) cycle counter
-//
-// This software was written by Leonard Janke (janke@unixg.ubc.ca)
-// in 1996-7 and is entered, by him, into the public domain.
-
-#if defined(__WATCOMC__)
-void GetTSC(unsigned long&);
-#pragma aux GetTSC = 0x0f 0x31 "mov [edi], eax" parm [edi] modify [edx eax];
-#elif defined(__GNUC__)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  asm volatile(".byte 15, 49\n\t"
-	       : "=eax" (tsc)
-	       :
-	       : "%edx", "%eax");
-}
-#elif defined(_MSC_VER)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  unsigned long a;
-  __asm _emit 0fh
-  __asm _emit 31h
-  __asm mov a, eax;
-  tsc=a;
-}
-#endif      
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/cast.h>
-
-void main(int argc,char *argv[])
-	{
-	CAST_KEY key;
-	unsigned long s1,s2,e1,e2;
-	unsigned long data[2];
-	int i,j;
-
-	for (j=0; j<6; j++)
-		{
-		for (i=0; i<1000; i++) /**/
-			{
-			CAST_encrypt(&data[0],&key);
-			GetTSC(s1);
-			CAST_encrypt(&data[0],&key);
-			CAST_encrypt(&data[0],&key);
-			CAST_encrypt(&data[0],&key);
-			GetTSC(e1);
-			GetTSC(s2);
-			CAST_encrypt(&data[0],&key);
-			CAST_encrypt(&data[0],&key);
-			CAST_encrypt(&data[0],&key);
-			CAST_encrypt(&data[0],&key);
-			GetTSC(e2);
-			CAST_encrypt(&data[0],&key);
-			}
-
-		printf("cast %d %d (%d)\n",
-			e1-s1,e2-s2,((e2-s2)-(e1-s1)));
-		}
-	}
-
diff --git a/deps/openssl/openssl/times/x86/des3s.cpp b/deps/openssl/openssl/times/x86/des3s.cpp
deleted file mode 100644
index cd2b1126f19fbb..00000000000000
--- a/deps/openssl/openssl/times/x86/des3s.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// gettsc.inl
-//
-// gives access to the Pentium's (secret) cycle counter
-//
-// This software was written by Leonard Janke (janke@unixg.ubc.ca)
-// in 1996-7 and is entered, by him, into the public domain.
-
-#if defined(__WATCOMC__)
-void GetTSC(unsigned long&);
-#pragma aux GetTSC = 0x0f 0x31 "mov [edi], eax" parm [edi] modify [edx eax];
-#elif defined(__GNUC__)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  asm volatile(".byte 15, 49\n\t"
-	       : "=eax" (tsc)
-	       :
-	       : "%edx", "%eax");
-}
-#elif defined(_MSC_VER)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  unsigned long a;
-  __asm _emit 0fh
-  __asm _emit 31h
-  __asm mov a, eax;
-  tsc=a;
-}
-#endif      
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/des.h>
-
-void main(int argc,char *argv[])
-	{
-	des_key_schedule key1,key2,key3;
-	unsigned long s1,s2,e1,e2;
-	unsigned long data[2];
-	int i,j;
-
-	for (j=0; j<6; j++)
-		{
-		for (i=0; i<1000; i++) /**/
-			{
-			des_encrypt3(&data[0],key1,key2,key3);
-			GetTSC(s1);
-			des_encrypt3(&data[0],key1,key2,key3);
-			des_encrypt3(&data[0],key1,key2,key3);
-			des_encrypt3(&data[0],key1,key2,key3);
-			GetTSC(e1);
-			GetTSC(s2);
-			des_encrypt3(&data[0],key1,key2,key3);
-			des_encrypt3(&data[0],key1,key2,key3);
-			des_encrypt3(&data[0],key1,key2,key3);
-			des_encrypt3(&data[0],key1,key2,key3);
-			GetTSC(e2);
-			des_encrypt3(&data[0],key1,key2,key3);
-			}
-
-		printf("des3 %d %d (%d)\n",
-			e1-s1,e2-s2,((e2-s2)-(e1-s1)));
-		}
-	}
-
diff --git a/deps/openssl/openssl/times/x86/dess.cpp b/deps/openssl/openssl/times/x86/dess.cpp
deleted file mode 100644
index 753e67ad9be280..00000000000000
--- a/deps/openssl/openssl/times/x86/dess.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// gettsc.inl
-//
-// gives access to the Pentium's (secret) cycle counter
-//
-// This software was written by Leonard Janke (janke@unixg.ubc.ca)
-// in 1996-7 and is entered, by him, into the public domain.
-
-#if defined(__WATCOMC__)
-void GetTSC(unsigned long&);
-#pragma aux GetTSC = 0x0f 0x31 "mov [edi], eax" parm [edi] modify [edx eax];
-#elif defined(__GNUC__)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  asm volatile(".byte 15, 49\n\t"
-	       : "=eax" (tsc)
-	       :
-	       : "%edx", "%eax");
-}
-#elif defined(_MSC_VER)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  unsigned long a;
-  __asm _emit 0fh
-  __asm _emit 31h
-  __asm mov a, eax;
-  tsc=a;
-}
-#endif      
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/des.h>
-
-void main(int argc,char *argv[])
-	{
-	des_key_schedule key;
-	unsigned long s1,s2,e1,e2;
-	unsigned long data[2];
-	int i,j;
-
-	for (j=0; j<6; j++)
-		{
-		for (i=0; i<1000; i++) /**/
-			{
-			des_encrypt(&data[0],key,1);
-			GetTSC(s1);
-			des_encrypt(&data[0],key,1);
-			des_encrypt(&data[0],key,1);
-			des_encrypt(&data[0],key,1);
-			GetTSC(e1);
-			GetTSC(s2);
-			des_encrypt(&data[0],key,1);
-			des_encrypt(&data[0],key,1);
-			des_encrypt(&data[0],key,1);
-			des_encrypt(&data[0],key,1);
-			GetTSC(e2);
-			des_encrypt(&data[0],key,1);
-			}
-
-		printf("des %d %d (%d)\n",
-			e1-s1,e2-s2,((e2-s2)-(e1-s1)));
-		}
-	}
-
diff --git a/deps/openssl/openssl/times/x86/md4s.cpp b/deps/openssl/openssl/times/x86/md4s.cpp
deleted file mode 100644
index c0ec97fc9f9b95..00000000000000
--- a/deps/openssl/openssl/times/x86/md4s.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// gettsc.inl
-//
-// gives access to the Pentium's (secret) cycle counter
-//
-// This software was written by Leonard Janke (janke@unixg.ubc.ca)
-// in 1996-7 and is entered, by him, into the public domain.
-
-#if defined(__WATCOMC__)
-void GetTSC(unsigned long&);
-#pragma aux GetTSC = 0x0f 0x31 "mov [edi], eax" parm [edi] modify [edx eax];
-#elif defined(__GNUC__)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  asm volatile(".byte 15, 49\n\t"
-	       : "=eax" (tsc)
-	       :
-	       : "%edx", "%eax");
-}
-#elif defined(_MSC_VER)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  unsigned long a;
-  __asm _emit 0fh
-  __asm _emit 31h
-  __asm mov a, eax;
-  tsc=a;
-}
-#endif      
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/md4.h>
-
-extern "C" {
-void md4_block_x86(MD4_CTX *ctx, unsigned char *buffer,int num);
-}
-
-void main(int argc,char *argv[])
-	{
-	unsigned char buffer[64*256];
-	MD4_CTX ctx;
-	unsigned long s1,s2,e1,e2;
-	unsigned char k[16];
-	unsigned long data[2];
-	unsigned char iv[8];
-	int i,num=0,numm;
-	int j=0;
-
-	if (argc >= 2)
-		num=atoi(argv[1]);
-
-	if (num == 0) num=16;
-	if (num > 250) num=16;
-	numm=num+2;
-	num*=64;
-	numm*=64;
-
-	for (j=0; j<6; j++)
-		{
-		for (i=0; i<10; i++) /**/
-			{
-			md4_block_x86(&ctx,buffer,numm);
-			GetTSC(s1);
-			md4_block_x86(&ctx,buffer,numm);
-			GetTSC(e1);
-			GetTSC(s2);
-			md4_block_x86(&ctx,buffer,num);
-			GetTSC(e2);
-			md4_block_x86(&ctx,buffer,num);
-			}
-		printf("md4 (%d bytes) %d %d (%.2f)\n",num,
-			e1-s1,e2-s2,(double)((e1-s1)-(e2-s2))/2);
-		}
-	}
-
diff --git a/deps/openssl/openssl/times/x86/md5s.cpp b/deps/openssl/openssl/times/x86/md5s.cpp
deleted file mode 100644
index dd343fd4e6edfd..00000000000000
--- a/deps/openssl/openssl/times/x86/md5s.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// gettsc.inl
-//
-// gives access to the Pentium's (secret) cycle counter
-//
-// This software was written by Leonard Janke (janke@unixg.ubc.ca)
-// in 1996-7 and is entered, by him, into the public domain.
-
-#if defined(__WATCOMC__)
-void GetTSC(unsigned long&);
-#pragma aux GetTSC = 0x0f 0x31 "mov [edi], eax" parm [edi] modify [edx eax];
-#elif defined(__GNUC__)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  asm volatile(".byte 15, 49\n\t"
-	       : "=eax" (tsc)
-	       :
-	       : "%edx", "%eax");
-}
-#elif defined(_MSC_VER)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  unsigned long a;
-  __asm _emit 0fh
-  __asm _emit 31h
-  __asm mov a, eax;
-  tsc=a;
-}
-#endif      
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/md5.h>
-
-extern "C" {
-void md5_block_x86(MD5_CTX *ctx, unsigned char *buffer,int num);
-}
-
-void main(int argc,char *argv[])
-	{
-	unsigned char buffer[64*256];
-	MD5_CTX ctx;
-	unsigned long s1,s2,e1,e2;
-	unsigned char k[16];
-	unsigned long data[2];
-	unsigned char iv[8];
-	int i,num=0,numm;
-	int j=0;
-
-	if (argc >= 2)
-		num=atoi(argv[1]);
-
-	if (num == 0) num=16;
-	if (num > 250) num=16;
-	numm=num+2;
-	num*=64;
-	numm*=64;
-
-	for (j=0; j<6; j++)
-		{
-		for (i=0; i<10; i++) /**/
-			{
-			md5_block_x86(&ctx,buffer,numm);
-			GetTSC(s1);
-			md5_block_x86(&ctx,buffer,numm);
-			GetTSC(e1);
-			GetTSC(s2);
-			md5_block_x86(&ctx,buffer,num);
-			GetTSC(e2);
-			md5_block_x86(&ctx,buffer,num);
-			}
-		printf("md5 (%d bytes) %d %d (%.2f)\n",num,
-			e1-s1,e2-s2,(double)((e1-s1)-(e2-s2))/2);
-		}
-	}
-
diff --git a/deps/openssl/openssl/times/x86/rc4s.cpp b/deps/openssl/openssl/times/x86/rc4s.cpp
deleted file mode 100644
index 3814fde9972fcb..00000000000000
--- a/deps/openssl/openssl/times/x86/rc4s.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// gettsc.inl
-//
-// gives access to the Pentium's (secret) cycle counter
-//
-// This software was written by Leonard Janke (janke@unixg.ubc.ca)
-// in 1996-7 and is entered, by him, into the public domain.
-
-#if defined(__WATCOMC__)
-void GetTSC(unsigned long&);
-#pragma aux GetTSC = 0x0f 0x31 "mov [edi], eax" parm [edi] modify [edx eax];
-#elif defined(__GNUC__)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  asm volatile(".byte 15, 49\n\t"
-	       : "=eax" (tsc)
-	       :
-	       : "%edx", "%eax");
-}
-#elif defined(_MSC_VER)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  unsigned long a;
-  __asm _emit 0fh
-  __asm _emit 31h
-  __asm mov a, eax;
-  tsc=a;
-}
-#endif      
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/rc4.h>
-
-void main(int argc,char *argv[])
-	{
-	unsigned char buffer[1024];
-	RC4_KEY ctx;
-	unsigned long s1,s2,e1,e2;
-	unsigned char k[16];
-	unsigned long data[2];
-	unsigned char iv[8];
-	int i,num=64,numm;
-	int j=0;
-
-	if (argc >= 2)
-		num=atoi(argv[1]);
-
-	if (num == 0) num=256;
-	if (num > 1024-16) num=1024-16;
-	numm=num+8;
-
-	for (j=0; j<6; j++)
-		{
-		for (i=0; i<10; i++) /**/
-			{
-			RC4(&ctx,numm,buffer,buffer);
-			GetTSC(s1);
-			RC4(&ctx,numm,buffer,buffer);
-			GetTSC(e1);
-			GetTSC(s2);
-			RC4(&ctx,num,buffer,buffer);
-			GetTSC(e2);
-			RC4(&ctx,num,buffer,buffer);
-			}
-
-		printf("RC4 (%d bytes) %d %d (%d) - 8 bytes\n",num,
-			e1-s1,e2-s2,(e1-s1)-(e2-s2));
-		}
-	}
-
diff --git a/deps/openssl/openssl/times/x86/sha1s.cpp b/deps/openssl/openssl/times/x86/sha1s.cpp
deleted file mode 100644
index 3103e1871bbed9..00000000000000
--- a/deps/openssl/openssl/times/x86/sha1s.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// gettsc.inl
-//
-// gives access to the Pentium's (secret) cycle counter
-//
-// This software was written by Leonard Janke (janke@unixg.ubc.ca)
-// in 1996-7 and is entered, by him, into the public domain.
-
-#if defined(__WATCOMC__)
-void GetTSC(unsigned long&);
-#pragma aux GetTSC = 0x0f 0x31 "mov [edi], eax" parm [edi] modify [edx eax];
-#elif defined(__GNUC__)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  asm volatile(".byte 15, 49\n\t"
-	       : "=eax" (tsc)
-	       :
-	       : "%edx", "%eax");
-}
-#elif defined(_MSC_VER)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  unsigned long a;
-  __asm _emit 0fh
-  __asm _emit 31h
-  __asm mov a, eax;
-  tsc=a;
-}
-#endif      
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/sha.h>
-
-extern "C" {
-void sha1_block_x86(SHA_CTX *ctx, unsigned char *buffer,int num);
-}
-
-void main(int argc,char *argv[])
-	{
-	unsigned char buffer[64*256];
-	SHA_CTX ctx;
-	unsigned long s1,s2,e1,e2;
-	unsigned char k[16];
-	unsigned long data[2];
-	unsigned char iv[8];
-	int i,num=0,numm;
-	int j=0;
-
-	if (argc >= 2)
-		num=atoi(argv[1]);
-
-	if (num == 0) num=16;
-	if (num > 250) num=16;
-	numm=num+2;
-	num*=64;
-	numm*=64;
-
-	for (j=0; j<6; j++)
-		{
-		for (i=0; i<10; i++) /**/
-			{
-			sha1_block_x86(&ctx,buffer,numm);
-			GetTSC(s1);
-			sha1_block_x86(&ctx,buffer,numm);
-			GetTSC(e1);
-			GetTSC(s2);
-			sha1_block_x86(&ctx,buffer,num);
-			GetTSC(e2);
-			sha1_block_x86(&ctx,buffer,num);
-			}
-
-		printf("sha1 (%d bytes) %d %d (%.2f)\n",num,
-			e1-s1,e2-s2,(double)((e1-s1)-(e2-s2))/2);
-		}
-	}
-
diff --git a/deps/openssl/openssl/util/domd b/deps/openssl/openssl/util/domd
index bab48cb7a27e14..6a628c7f96c22b 100755
--- a/deps/openssl/openssl/util/domd
+++ b/deps/openssl/openssl/util/domd
@@ -14,7 +14,8 @@ if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi
 cp Makefile Makefile.save
 # fake the presence of Kerberos
 touch $TOP/krb5.h
-if expr "$MAKEDEPEND" : '.*gcc$' > /dev/null; then
+if ${MAKEDEPEND} --version 2>&1 | grep -q "clang" ||
+   echo $MAKEDEPEND | grep -q "gcc"; then
     args=""
     while [ $# -gt 0 ]; do
 	if [ "$1" != "--" ]; then args="$args $1"; fi
diff --git a/deps/openssl/openssl/util/indent.pro b/deps/openssl/openssl/util/indent.pro
index e8714310cc4d1a..4dcda5df78cab5 100644
--- a/deps/openssl/openssl/util/indent.pro
+++ b/deps/openssl/openssl/util/indent.pro
@@ -749,3 +749,19 @@
 -T ssl_trace_tbl
 -T _stdcall
 -T tls12_lookup
+-T OPTIONS
+-T OPT_PAIR
+-T uint64_t
+-T int64_t
+-T uint32_t
+-T int32_t
+-T uint16_t
+-T int16_t
+-T uint8_t
+-T int8_t
+-T STRINT_PAIR
+-T felem
+-T felem_bytearray
+-T SH_LIST
+-T PACKET
+-T RECORD_LAYER
diff --git a/deps/openssl/openssl/util/mk1mf.pl b/deps/openssl/openssl/util/mk1mf.pl
index 9b8abc0cf115fe..99652aff918c89 100755
--- a/deps/openssl/openssl/util/mk1mf.pl
+++ b/deps/openssl/openssl/util/mk1mf.pl
@@ -447,7 +447,7 @@
 # N.B. You MUST use -j on FreeBSD.
 # This makefile has been automatically generated from the OpenSSL distribution.
 # This single makefile will build the complete OpenSSL distribution and
-# by default leave the 'intertesting' output files in .${o}out and the stuff
+# by default leave the 'interesting' output files in .${o}out and the stuff
 # that needs deleting in .${o}tmp.
 # The file was generated by running 'make makefile.one', which
 # does a 'make files', which writes all the environment variables from all
diff --git a/deps/openssl/openssl/util/mkrc.pl b/deps/openssl/openssl/util/mkrc.pl
index 0ceadcf8d143f4..83ee6a4167fc37 100755
--- a/deps/openssl/openssl/util/mkrc.pl
+++ b/deps/openssl/openssl/util/mkrc.pl
@@ -57,7 +57,7 @@ BEGIN
             VALUE "ProductVersion", "$version\\0"
             // Optional:
             //VALUE "Comments", "\\0"
-            VALUE "LegalCopyright", "Copyright � 1998-2006 The OpenSSL Project. Copyright � 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0"
+            VALUE "LegalCopyright", "Copyright © 1998-2006 The OpenSSL Project. Copyright © 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0"
             //VALUE "LegalTrademarks", "\\0"
             //VALUE "PrivateBuild", "\\0"
             //VALUE "SpecialBuild", "\\0"
diff --git a/deps/openssl/openssl/util/mkstack.pl b/deps/openssl/openssl/util/mkstack.pl
index 2bd96cd0c1ea81..f4520d4dd32818 100755
--- a/deps/openssl/openssl/util/mkstack.pl
+++ b/deps/openssl/openssl/util/mkstack.pl
@@ -98,7 +98,7 @@
 EOF
 	}
 
-	foreach $type_thing (sort @sstacklst) {
+    foreach $type_thing (sort { $a->[0] cmp $b->[0]} @sstacklst) {
 	    my $t1 = $type_thing->[0];
 	    my $t2 = $type_thing->[1];
 	    $new_stackfile .= <<EOF;
diff --git a/deps/openssl/openssl/util/pl/VC-32.pl b/deps/openssl/openssl/util/pl/VC-32.pl
index da05e9dff810eb..284fe0381ed918 100644
--- a/deps/openssl/openssl/util/pl/VC-32.pl
+++ b/deps/openssl/openssl/util/pl/VC-32.pl
@@ -358,15 +358,17 @@ sub do_link_rule
 	local($ret,$_);
 	$file =~ s/\//$o/g if $o ne '/';
 	$n=&bname($target);
-	$ret.="$target: $files $dep_libs\n";
+	$ret.="$target: $files $dep_libs";
 	if ($standalone == 1)
 		{
+		$ret.=" \$(OBJ_D)${o}applink.obj\n";
 		$ret.="  \$(LINK) \$(LFLAGS) $efile$target @<<\n\t";
-		$ret.= "\$(EX_LIBS) " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild);
+		$ret.= "\$(EX_LIBS) \$(OBJ_D)${o}applink.obj " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild);
 		$ret.="$files $libs\n<<\n";
 		}
 	elsif ($standalone == 2)
 		{
+		$ret.="\n";
 		$ret.="\tSET FIPS_LINK=\$(LINK)\n";
 		$ret.="\tSET FIPS_CC=\$(CC)\n";
 		$ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n";
@@ -379,6 +381,7 @@ sub do_link_rule
 		}
 	else
 		{
+		$ret.="\n";
 		$ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n";
 		$ret.="\t\$(APP_EX_OBJ) $files $libs\n<<\n";
 		}
diff --git a/deps/openssl/openssl/util/pod2mantest b/deps/openssl/openssl/util/pod2mantest
deleted file mode 100755
index 384e683df4cc76..00000000000000
--- a/deps/openssl/openssl/util/pod2mantest
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# This script is used by test/Makefile to check whether a sane 'pod2man'
-# is installed.
-# ('make install' should not try to run 'pod2man' if it does not exist or if
-# it is a broken 'pod2man' version that is known to cause trouble. if we find
-# the system 'pod2man' to be broken, we use our own copy instead)
-#
-# In any case, output an appropriate command line for running (or not
-# running) pod2man.
-
-
-IFS=:
-if test "$OSTYPE" = "msdosdjgpp"; then IFS=";"; fi
-
-try_without_dir=true
-# First we try "pod2man", then "$dir/pod2man" for each item in $PATH.
-for dir in dummy${IFS}$PATH; do
-    if [ "$try_without_dir" = true ]; then
-      # first iteration
-      pod2man=pod2man
-      try_without_dir=false
-    else
-      # second and later iterations
-      pod2man="$dir/pod2man"
-      if [ ! -f "$pod2man" ]; then  # '-x' is not available on Ultrix
-        pod2man=''
-      fi
-    fi
-
-    if [ ! "$pod2man" = '' ]; then
-        failure=none
-
-	if "$pod2man" --section=1 --center=OpenSSL --release=dev pod2mantest.pod | fgrep OpenSSL >/dev/null; then
-	    :
-	else
-	    failure=BasicTest
-	fi
-
-	if [ "$failure" = none ]; then
-	    if "$pod2man" --section=1 --center=OpenSSL --release=dev pod2mantest.pod | grep '^MARKER - ' >/dev/null; then
-	        failure=MultilineTest
-	    fi
-	fi
-
-
-        if [ "$failure" = none ]; then
-            echo "$pod2man"
-            exit 0
-        fi
-
-        echo "$pod2man does not work properly ('$failure' failed).  Looking for another pod2man ..." >&2
-    fi
-done
-
-echo "No working pod2man found.  Consider installing a new version." >&2
-echo "As a workaround, we'll use a bundled old copy of pod2man.pl." >&2
-echo "$1 ../../util/pod2man.pl"
diff --git a/deps/openssl/openssl/util/selftest.pl b/deps/openssl/openssl/util/selftest.pl
index 7b32e9f4ff2a1c..59842efae8f041 100644
--- a/deps/openssl/openssl/util/selftest.pl
+++ b/deps/openssl/openssl/util/selftest.pl
@@ -199,3 +199,4 @@
 }
 print "\nTest report in file $report\n";
 
+die if $ok != 2;
diff --git a/deps/openssl/openssl/util/toutf8.sh b/deps/openssl/openssl/util/toutf8.sh
new file mode 100644
index 00000000000000..8a4254b3df3d61
--- /dev/null
+++ b/deps/openssl/openssl/util/toutf8.sh
@@ -0,0 +1,17 @@
+#! /bin/sh
+#
+# Very simple script to detect and convert files that we want to re-encode to UTF8
+
+git ls-tree -r --name-only HEAD | \
+    while read F; do
+	charset=`file -bi "$F" | sed -e 's|.*charset=||'`
+	if [ "$charset" != "utf-8" -a "$charset" != "binary" -a "$charset" != "us-ascii" ]; then
+	    iconv -f ISO-8859-1 -t UTF8 < "$F" > "$F.utf8" && \
+		( cmp -s "$F" "$F.utf8" || \
+			( echo "$F"
+			  mv "$F" "$F.iso-8859-1"
+			  mv "$F.utf8" "$F"
+			)
+		)
+	fi
+    done

From 12e70fafd32cd3a5ec8c8c1ef24d9a54227487e9 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Thu, 29 Oct 2015 14:17:37 -0400
Subject: [PATCH 219/323] http: fix pipeline regression

Always check that socket still has the parser. It may be destroyed
interim, and we may end up with an uncaught exception.

Fix: https://github.com/nodejs/node/issues/3508
PR-URL: https://github.com/nodejs/node-private/pull/5
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/_http_server.js                           |  5 +-
 test/parallel/test-http-pipeline-regr-3508.js | 57 +++++++++++++++++++
 2 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 test/parallel/test-http-pipeline-regr-3508.js

diff --git a/lib/_http_server.js b/lib/_http_server.js
index dc7276d0ae729d..e2221b759bd0c4 100644
--- a/lib/_http_server.js
+++ b/lib/_http_server.js
@@ -404,7 +404,7 @@ function connectionListener(socket) {
       }
     }
 
-    if (socket._paused) {
+    if (socket._paused && socket.parser) {
       // onIncoming paused the socket, we should pause the parser as well
       debug('pause parser');
       socket.parser.pause();
@@ -445,7 +445,8 @@ function connectionListener(socket) {
     // If we previously paused, then start reading again.
     if (socket._paused && !needPause) {
       socket._paused = false;
-      socket.parser.resume();
+      if (socket.parser)
+        socket.parser.resume();
       socket.resume();
     }
   }
diff --git a/test/parallel/test-http-pipeline-regr-3508.js b/test/parallel/test-http-pipeline-regr-3508.js
new file mode 100644
index 00000000000000..05639a2a42c5a7
--- /dev/null
+++ b/test/parallel/test-http-pipeline-regr-3508.js
@@ -0,0 +1,57 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const http = require('http');
+const net = require('net');
+
+var once = false;
+var first = null;
+var second = null;
+
+const chunk = new Buffer(1024);
+chunk.fill('X');
+
+var size = 0;
+
+var more;
+var done;
+
+var server = http.createServer(function(req, res) {
+  if (!once)
+    server.close();
+  once = true;
+
+  if (first === null) {
+    first = res;
+    return;
+  }
+  if (second === null) {
+    second = res;
+    res.write(chunk);
+  } else {
+    res.end(chunk);
+  }
+  size += res.outputSize;
+  if (size <= req.socket._writableState.highWaterMark) {
+    more();
+    return;
+  }
+  done();
+}).on('upgrade', function(req, socket) {
+  second.end(chunk, function() {
+    socket.end();
+  });
+  first.end('hello');
+}).listen(common.PORT, function() {
+  var s = net.connect(common.PORT);
+  more = function() {
+    s.write('GET / HTTP/1.1\r\n\r\n');
+  };
+  done = function() {
+    s.write('GET / HTTP/1.1\r\n\r\n' +
+            'GET / HTTP/1.1\r\nConnection: upgrade\r\nUpgrade: ws\r\n\r\naaa');
+  };
+  more();
+  more();
+  s.resume();
+});

From 76a552c938e43eebbd0795e974f71250529f8cf5 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Fri, 13 Nov 2015 21:23:33 +0100
Subject: [PATCH 220/323] deps: backport 6df9a1d from upstream v8

PR-URL: https://github.com/nodejs/node-private/pull/6
Reviewed-By: Fedor Indutny <fedor@indutny.com>
---
 deps/v8/src/json-stringifier.h                | 50 +------------------
 .../mjsunit/regress/regress-crbug-554946.js   | 12 +++++
 2 files changed, 14 insertions(+), 48 deletions(-)
 create mode 100644 deps/v8/test/mjsunit/regress/regress-crbug-554946.js

diff --git a/deps/v8/src/json-stringifier.h b/deps/v8/src/json-stringifier.h
index fb6b80dde4ec4c..0a4101b7dffc08 100644
--- a/deps/v8/src/json-stringifier.h
+++ b/deps/v8/src/json-stringifier.h
@@ -434,54 +434,8 @@ BasicJsonStringifier::Result BasicJsonStringifier::SerializeJSArray(
   uint32_t length = 0;
   CHECK(object->length()->ToArrayLength(&length));
   builder_.AppendCharacter('[');
-  switch (object->GetElementsKind()) {
-    case FAST_SMI_ELEMENTS: {
-      Handle<FixedArray> elements(
-          FixedArray::cast(object->elements()), isolate_);
-      for (uint32_t i = 0; i < length; i++) {
-        if (i > 0) builder_.AppendCharacter(',');
-        SerializeSmi(Smi::cast(elements->get(i)));
-      }
-      break;
-    }
-    case FAST_DOUBLE_ELEMENTS: {
-      // Empty array is FixedArray but not FixedDoubleArray.
-      if (length == 0) break;
-      Handle<FixedDoubleArray> elements(
-          FixedDoubleArray::cast(object->elements()), isolate_);
-      for (uint32_t i = 0; i < length; i++) {
-        if (i > 0) builder_.AppendCharacter(',');
-        SerializeDouble(elements->get_scalar(i));
-      }
-      break;
-    }
-    case FAST_ELEMENTS: {
-      Handle<FixedArray> elements(
-          FixedArray::cast(object->elements()), isolate_);
-      for (uint32_t i = 0; i < length; i++) {
-        if (i > 0) builder_.AppendCharacter(',');
-        Result result =
-            SerializeElement(isolate_,
-                             Handle<Object>(elements->get(i), isolate_),
-                             i);
-        if (result == SUCCESS) continue;
-        if (result == UNCHANGED) {
-          builder_.AppendCString("null");
-        } else {
-          return result;
-        }
-      }
-      break;
-    }
-    // TODO(yangguo):  The FAST_HOLEY_* cases could be handled in a faster way.
-    // They resemble the non-holey cases except that a prototype chain lookup
-    // is necessary for holes.
-    default: {
-      Result result = SerializeJSArraySlow(object, length);
-      if (result != SUCCESS) return result;
-      break;
-    }
-  }
+  Result result = SerializeJSArraySlow(object, length);
+  if (result != SUCCESS) return result;
   builder_.AppendCharacter(']');
   StackPop();
   return SUCCESS;
diff --git a/deps/v8/test/mjsunit/regress/regress-crbug-554946.js b/deps/v8/test/mjsunit/regress/regress-crbug-554946.js
new file mode 100644
index 00000000000000..ab2e327295818e
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-crbug-554946.js
@@ -0,0 +1,12 @@
+// Copyright 2015 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+var array = [];
+var funky = {
+  toJSON: function() { array.length = 1; return "funky"; }
+};
+for (var i = 0; i < 10; i++) array[i] = i;
+array[0] = funky;
+assertEquals('["funky",null,null,null,null,null,null,null,null,null]',
+             JSON.stringify(array));

From 678398f2503fbc5faac3f925bb459823e0295141 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Wed, 18 Nov 2015 18:08:24 +0100
Subject: [PATCH 221/323] deps: backport a7e50a5 from upstream v8

PR-URL: https://github.com/nodejs/node-private/pull/6
Reviewed-By: Fedor Indutny <fedor@indutny.com>
---
 deps/v8/src/json-stringifier.h                | 62 +++++++++++++++++--
 .../mjsunit/regress/regress-crbug-554946.js   | 49 +++++++++++++++
 2 files changed, 106 insertions(+), 5 deletions(-)

diff --git a/deps/v8/src/json-stringifier.h b/deps/v8/src/json-stringifier.h
index 0a4101b7dffc08..3bbfb63a658ffe 100644
--- a/deps/v8/src/json-stringifier.h
+++ b/deps/v8/src/json-stringifier.h
@@ -82,7 +82,8 @@ class BasicJsonStringifier BASE_EMBEDDED {
   INLINE(Result SerializeJSArray(Handle<JSArray> object));
   INLINE(Result SerializeJSObject(Handle<JSObject> object));
 
-  Result SerializeJSArraySlow(Handle<JSArray> object, uint32_t length);
+  Result SerializeJSArraySlow(Handle<JSArray> object, uint32_t start,
+                              uint32_t length);
 
   void SerializeString(Handle<String> object);
 
@@ -434,8 +435,59 @@ BasicJsonStringifier::Result BasicJsonStringifier::SerializeJSArray(
   uint32_t length = 0;
   CHECK(object->length()->ToArrayLength(&length));
   builder_.AppendCharacter('[');
-  Result result = SerializeJSArraySlow(object, length);
-  if (result != SUCCESS) return result;
+  switch (object->GetElementsKind()) {
+    case FAST_SMI_ELEMENTS: {
+      Handle<FixedArray> elements(FixedArray::cast(object->elements()),
+                                  isolate_);
+      for (uint32_t i = 0; i < length; i++) {
+        if (i > 0) builder_.AppendCharacter(',');
+        SerializeSmi(Smi::cast(elements->get(i)));
+      }
+      break;
+    }
+    case FAST_DOUBLE_ELEMENTS: {
+      // Empty array is FixedArray but not FixedDoubleArray.
+      if (length == 0) break;
+      Handle<FixedDoubleArray> elements(
+          FixedDoubleArray::cast(object->elements()), isolate_);
+      for (uint32_t i = 0; i < length; i++) {
+        if (i > 0) builder_.AppendCharacter(',');
+        SerializeDouble(elements->get_scalar(i));
+      }
+      break;
+    }
+    case FAST_ELEMENTS: {
+      Handle<Object> old_length(object->length(), isolate_);
+      for (uint32_t i = 0; i < length; i++) {
+        if (object->length() != *old_length ||
+            object->GetElementsKind() != FAST_ELEMENTS) {
+          Result result = SerializeJSArraySlow(object, i, length);
+          if (result != SUCCESS) return result;
+          break;
+        }
+        if (i > 0) builder_.AppendCharacter(',');
+        Result result = SerializeElement(
+            isolate_,
+            Handle<Object>(FixedArray::cast(object->elements())->get(i),
+                           isolate_),
+            i);
+        if (result == SUCCESS) continue;
+        if (result == UNCHANGED) {
+          builder_.AppendCString("null");
+        } else {
+          return result;
+        }
+      }
+      break;
+    }
+    // The FAST_HOLEY_* cases could be handled in a faster way. They resemble
+    // the non-holey cases except that a lookup is necessary for holes.
+    default: {
+      Result result = SerializeJSArraySlow(object, 0, length);
+      if (result != SUCCESS) return result;
+      break;
+    }
+  }
   builder_.AppendCharacter(']');
   StackPop();
   return SUCCESS;
@@ -443,8 +495,8 @@ BasicJsonStringifier::Result BasicJsonStringifier::SerializeJSArray(
 
 
 BasicJsonStringifier::Result BasicJsonStringifier::SerializeJSArraySlow(
-    Handle<JSArray> object, uint32_t length) {
-  for (uint32_t i = 0; i < length; i++) {
+    Handle<JSArray> object, uint32_t start, uint32_t length) {
+  for (uint32_t i = start; i < length; i++) {
     if (i > 0) builder_.AppendCharacter(',');
     Handle<Object> element;
     ASSIGN_RETURN_ON_EXCEPTION_VALUE(
diff --git a/deps/v8/test/mjsunit/regress/regress-crbug-554946.js b/deps/v8/test/mjsunit/regress/regress-crbug-554946.js
index ab2e327295818e..fbb79f61b0bac4 100644
--- a/deps/v8/test/mjsunit/regress/regress-crbug-554946.js
+++ b/deps/v8/test/mjsunit/regress/regress-crbug-554946.js
@@ -10,3 +10,52 @@ for (var i = 0; i < 10; i++) array[i] = i;
 array[0] = funky;
 assertEquals('["funky",null,null,null,null,null,null,null,null,null]',
              JSON.stringify(array));
+
+array = [];
+funky = {
+  get value() { array.length = 1; return "funky"; }
+};
+for (var i = 0; i < 10; i++) array[i] = i;
+array[3] = funky;
+assertEquals('[0,1,2,{"value":"funky"},null,null,null,null,null,null]',
+             JSON.stringify(array));
+
+array = [];
+funky = {
+  get value() { array.pop(); return "funky"; }
+};
+for (var i = 0; i < 10; i++) array[i] = i;
+array[3] = funky;
+assertEquals('[0,1,2,{"value":"funky"},4,5,6,7,8,null]', JSON.stringify(array));
+
+array = [];
+funky = {
+  get value() { delete array[9]; return "funky"; }
+};
+for (var i = 0; i < 10; i++) array[i] = i;
+array[3] = funky;
+assertEquals('[0,1,2,{"value":"funky"},4,5,6,7,8,null]', JSON.stringify(array));
+
+array = [];
+funky = {
+  get value() { delete array[6]; return "funky"; }
+};
+for (var i = 0; i < 10; i++) array[i] = i;
+array[3] = funky;
+assertEquals('[0,1,2,{"value":"funky"},4,5,null,7,8,9]', JSON.stringify(array));
+
+array = [];
+funky = {
+  get value() { array[12] = 12; return "funky"; }
+};
+for (var i = 0; i < 10; i++) array[i] = i;
+array[3] = funky;
+assertEquals('[0,1,2,{"value":"funky"},4,5,6,7,8,9]', JSON.stringify(array));
+
+array = [];
+funky = {
+  get value() { array[10000000] = 12; return "funky"; }
+};
+for (var i = 0; i < 10; i++) array[i] = i;
+array[3] = funky;
+assertEquals('[0,1,2,{"value":"funky"},4,5,6,7,8,9]', JSON.stringify(array));

From 11433127c717b02859c9aef063217b5a0797e6b3 Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Tue, 1 Dec 2015 00:06:35 +1100
Subject: [PATCH 222/323] 2015-12-04, Version 5.1.1 (Stable)

Security Update

Notable items:

* **http**: Fix a bug where an HTTP socket may no longer have a socket
  but a pipelined request triggers a pause or resume, a potential
  denial-of-service vector. (Fedor Indutny)
* **openssl**: Upgrade to 1.0.2e, containing fixes for:
  - CVE-2015-3193 "BN_mod_exp may produce incorrect results on x86_64",
    an attack is considered feasible against DH, an attack against RSA
    and DSA is considered possible but unlikely, EC algorithms are not
    affected. Details are available at
    <http://openssl.org/news/secadv/20151203.txt>.
  - CVE-2015-3194 "Certificate verify crash with missing PSS parameter",
    a potential denial-of-service vector for Node.js TLS servers; TLS
    clients are also impacted. Details are available at
    <http://openssl.org/news/secadv/20151203.txt>.
  (Shigeki Ohtsu) #4134
* v8: Backport fixes for a bug in `JSON.stringify()` that can result
  in out-of-bounds reads for arrays. (Ben Noordhuis)

PR-URL: https://github.com/nodejs/node-private/pull/11
---
 CHANGELOG.md       | 25 +++++++++++++++++++++++++
 src/node_version.h |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e64990646631f5..02a8d3a334c120 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Node.js ChangeLog
 
+## 2015-12-04, Version 5.1.1 (Stable), @rvagg
+
+### Notable changes
+
+* **http**: Fix a bug where an HTTP socket may no longer have a socket but a pipelined request triggers a pause or resume, a potential denial-of-service vector. (Fedor Indutny)
+* **openssl**: Upgrade to 1.0.2e, containing fixes for:
+  - CVE-2015-3193 "BN_mod_exp may produce incorrect results on x86_64", an attack is considered feasible against DH, an attack against RSA and DSA is considered possible but unlikely, EC algorithms are not affected. Details are available at <http://openssl.org/news/secadv/20151203.txt>.
+  - CVE-2015-3194 "Certificate verify crash with missing PSS parameter", a potential denial-of-service vector for Node.js TLS servers; TLS clients are also impacted. Details are available at <http://openssl.org/news/secadv/20151203.txt>.
+  (Shigeki Ohtsu) [#4134](https://github.com/nodejs/node/pull/4134)
+* **v8**: Backport fixes for a bug in `JSON.stringify()` that can result in out-of-bounds reads for arrays. (Ben Noordhuis)
+
+### Known issues
+
+* Surrogate pair in REPL can freeze terminal. [#690](https://github.com/nodejs/node/issues/690)
+* Calling `dns.setServers()` while a DNS query is in progress can cause the process to crash on a failed assertion. [#894](https://github.com/nodejs/node/issues/894)
+* `url.resolve` may transfer the auth portion of the url when resolving between two full hosts, see [#1435](https://github.com/nodejs/node/issues/1435).
+* Unicode characters in filesystem paths are not handled consistently across platforms or Node.js APIs. See [#2088](https://github.com/nodejs/node/issues/2088), [#3401](https://github.com/nodejs/node/issues/3401) and [#3519](https://github.com/nodejs/node/issues/3519).
+
+### Commits
+
+* [[`678398f250`](https://github.com/nodejs/node/commit/678398f250)] - **deps**: backport a7e50a5 from upstream v8 (Ben Noordhuis)
+* [[`76a552c938`](https://github.com/nodejs/node/commit/76a552c938)] - **deps**: backport 6df9a1d from upstream v8 (Ben Noordhuis)
+* [[`533881f889`](https://github.com/nodejs/node/commit/533881f889)] - **deps**: upgrade openssl sources to 1.0.2e (Shigeki Ohtsu) [#4134](https://github.com/nodejs/node/pull/4134)
+* [[`12e70fafd3`](https://github.com/nodejs/node/commit/12e70fafd3)] - **http**: fix pipeline regression (Fedor Indutny)
+
 ## 2015-11-17, Version 5.1.0 (Stable), @Fishrock123
 
 ### Notable changes
diff --git a/src/node_version.h b/src/node_version.h
index 4ab5cbcb90aad2..66cffa1e1a48b7 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -5,7 +5,7 @@
 #define NODE_MINOR_VERSION 1
 #define NODE_PATCH_VERSION 1
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)

From 51a52279e21e6ff39732c8ed309065d182ccc484 Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Fri, 4 Dec 2015 14:40:19 +1100
Subject: [PATCH 223/323] Working on v5.1.2

---
 src/node_version.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/node_version.h b/src/node_version.h
index 66cffa1e1a48b7..d60b7e0aa00188 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -3,9 +3,9 @@
 
 #define NODE_MAJOR_VERSION 5
 #define NODE_MINOR_VERSION 1
-#define NODE_PATCH_VERSION 1
+#define NODE_PATCH_VERSION 2
 
-#define NODE_VERSION_IS_RELEASE 1
+#define NODE_VERSION_IS_RELEASE 0
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)

From 6c16c40283073437ee21cd150ca623290b316e30 Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Fri, 4 Dec 2015 22:17:55 +1100
Subject: [PATCH 224/323] doc: clarify v5.1.1 notable items

* Include reference to CVE-2015-8027
* Fix "socket may no longer have a socket" reference
* Expand on non-existent parser causing the error
* Soften language for CVE-2015-3193 as impact may not be as great as
  expected, also trim to match v4.2.3 language
* Clarify that CVE-2015-3194 affects TLS servers using _client
  certificate authentication_
* Include reference to CVE-2015-6764

PR-URL: https://github.com/nodejs/node/pull/4156
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 CHANGELOG.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02a8d3a334c120..2ed7cf28bdac01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,12 +4,12 @@
 
 ### Notable changes
 
-* **http**: Fix a bug where an HTTP socket may no longer have a socket but a pipelined request triggers a pause or resume, a potential denial-of-service vector. (Fedor Indutny)
+* **http**: Fix CVE-2015-8027, a bug whereby an HTTP socket may no longer have a parser associated with it but a pipelined request attempts to trigger a pause or resume on the non-existent parser, a potential denial-of-service vulnerability. (Fedor Indutny)
 * **openssl**: Upgrade to 1.0.2e, containing fixes for:
-  - CVE-2015-3193 "BN_mod_exp may produce incorrect results on x86_64", an attack is considered feasible against DH, an attack against RSA and DSA is considered possible but unlikely, EC algorithms are not affected. Details are available at <http://openssl.org/news/secadv/20151203.txt>.
-  - CVE-2015-3194 "Certificate verify crash with missing PSS parameter", a potential denial-of-service vector for Node.js TLS servers; TLS clients are also impacted. Details are available at <http://openssl.org/news/secadv/20151203.txt>.
+  - CVE-2015-3193 "BN_mod_exp may produce incorrect results on x86_64", an attack may be possible against a Node.js TLS server using DHE key exchange. Details are available at <http://openssl.org/news/secadv/20151203.txt>.
+  - CVE-2015-3194 "Certificate verify crash with missing PSS parameter", a potential denial-of-service vector for Node.js TLS servers using client certificate authentication; TLS clients are also impacted. Details are available at <http://openssl.org/news/secadv/20151203.txt>.
   (Shigeki Ohtsu) [#4134](https://github.com/nodejs/node/pull/4134)
-* **v8**: Backport fixes for a bug in `JSON.stringify()` that can result in out-of-bounds reads for arrays. (Ben Noordhuis)
+* **v8**: Backport fix for CVE-2015-6764, a bug in `JSON.stringify()` that can result in out-of-bounds reads for arrays. (Ben Noordhuis)
 
 ### Known issues
 

From ce423f362445d932c5adcc07a59d256c2f5ab72a Mon Sep 17 00:00:00 2001
From: Jackson Tian <puling.tyq@alibaba-inc.com>
Date: Wed, 22 Apr 2015 00:34:52 +0800
Subject: [PATCH 225/323] debugger: introduce exec method for debugger

In debugger, the usage of `repl` very ugly. I'd like there is a `p`
like gdb. So the `exec` is coming.

Usage:

```
$ ./iojs debug ~/git/node_research/server.js
< Debugger listening on port 5858
connecting to 127.0.0.1:5858 ... ok
break in /Users/jacksontian/git/node_research/server.js:1
> 1 var http = require('http');
  2
  3 http.createServer(function (req, res) {
debug> exec process.title
/Users/jacksontian/git/io.js/out/Release/iojs
debug>
```

And the `repl`:

```
debug> repl
Press Ctrl + C to leave debug repl
> process.title
'/Users/jacksontian/git/io.js/out/Release/iojs'
debug>
(^C again to quit)
```

The enter and leave debug repl is superfluous.

R-URL: https://github.com/nodejs/node/pull/1491
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 doc/api/debugger.markdown           |  1 +
 lib/_debugger.js                    | 26 +++++++++++++++++++++++---
 test/debugger/test-debugger-repl.js | 12 +++++++++++-
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/doc/api/debugger.markdown b/doc/api/debugger.markdown
index 224f53eb45e2ba..0c5e41d65709af 100644
--- a/doc/api/debugger.markdown
+++ b/doc/api/debugger.markdown
@@ -143,6 +143,7 @@ after)
 * `watchers` - List all watchers and their values (automatically listed on each
 breakpoint)
 * `repl` - Open debugger's repl for evaluation in debugging script's context
+* `exec expr` - Execute an expression in debugging script's context
 
 ### Execution control
 
diff --git a/lib/_debugger.js b/lib/_debugger.js
index cbf7f7a5ed5397..ba8ee0f30dcad2 100644
--- a/lib/_debugger.js
+++ b/lib/_debugger.js
@@ -142,7 +142,7 @@ Protocol.prototype.serialize = function(req) {
 const NO_FRAME = -1;
 
 function Client() {
-  net.Stream.call(this);
+  net.Socket.call(this);
   var protocol = this.protocol = new Protocol(this);
   this._reqCallbacks = [];
   var socket = this;
@@ -161,7 +161,7 @@ function Client() {
 
   protocol.onResponse = this._onResponse.bind(this);
 }
-inherits(Client, net.Stream);
+inherits(Client, net.Socket);
 exports.Client = Client;
 
 
@@ -657,6 +657,7 @@ const commands = [
     'unwatch',
     'watchers',
     'repl',
+    'exec',
     'restart',
     'kill',
     'list',
@@ -949,6 +950,12 @@ Interface.prototype.controlEval = function(code, context, filename, callback) {
       }
     }
 
+    // exec process.title => exec("process.title");
+    var match = code.match(/^\s*exec\s+([^\n]*)/);
+    if (match) {
+      code = 'exec(' + JSON.stringify(match[1]) + ')';
+    }
+
     var result = vm.runInContext(code, context, filename);
 
     // Repl should not ask for next command
@@ -1527,6 +1534,18 @@ Interface.prototype.pause_ = function() {
 };
 
 
+// execute expression
+Interface.prototype.exec = function(code) {
+  this.debugEval(code, null, null, (err, result) => {
+    if (err) {
+      this.error(err);
+    } else {
+      this.print(util.inspect(result, {colors: true}));
+    }
+  });
+};
+
+
 // Kill child process
 Interface.prototype.kill = function() {
   if (!this.child) return;
@@ -1730,11 +1749,12 @@ Interface.prototype.trySpawn = function(cb) {
     client.connect(port, host);
   }
 
-  self.print('connecting to ' + host + ':' + port + ' ..', true);
   if (isRemote) {
+    self.print('connecting to ' + host + ':' + port + ' ..', true);
     attemptConnect();
   } else {
     this.child.stderr.once('data', function() {
+      self.print('connecting to ' + host + ':' + port + ' ..', true);
       setImmediate(attemptConnect);
     });
   }
diff --git a/test/debugger/test-debugger-repl.js b/test/debugger/test-debugger-repl.js
index f93570c50156ce..4919955273607a 100644
--- a/test/debugger/test-debugger-repl.js
+++ b/test/debugger/test-debugger-repl.js
@@ -51,10 +51,20 @@ addTest('sb("setInterval()", "!(setInterval.flag++)")', [
 
 // Continue
 addTest('c', [
-  /break in node.js:\d+/,
+  /break in timers.js:\d+/,
   /\d/, /\d/, /\d/, /\d/, /\d/
 ]);
 
+// Execute
+addTest('exec process.title', [
+  /node/
+]);
+
+// Execute
+addTest('exec exec process.title', [
+  /SyntaxError: Unexpected identifier/
+]);
+
 // REPL and process.env regression
 addTest('repl', [
   /Ctrl/

From f99c6363dea907c920565f9a3bdc90a170189ad7 Mon Sep 17 00:00:00 2001
From: fansworld-claudio <cr@fansworld.tv>
Date: Mon, 16 Nov 2015 10:59:39 -0300
Subject: [PATCH 226/323] test: module loading error fix solaris #3798

- refactor test to accept multiple error messages per platform
- add new message to be found in Solaris 11.3 as per #3798

PR-URL: https://github.com/nodejs/node/pull/3855
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
---
 test/parallel/test-module-loading-error.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/test/parallel/test-module-loading-error.js b/test/parallel/test-module-loading-error.js
index f2581a4df5bb9f..5f9195d7736549 100644
--- a/test/parallel/test-module-loading-error.js
+++ b/test/parallel/test-module-loading-error.js
@@ -5,12 +5,10 @@ var assert = require('assert');
 console.error('load test-module-loading-error.js');
 
 var error_desc = {
-  win32: '%1 is not a valid Win32 application',
-  linux: 'file too short',
-  sunos: 'unknown file type'
+  win32: ['%1 is not a valid Win32 application'],
+  linux: ['file too short', 'Exec format error'],
+  sunos: ['unknown file type', 'not an ELF file']
 };
-var musl_errno_enoexec = 'Exec format error';
-
 var dlerror_msg = error_desc[process.platform];
 
 if (!dlerror_msg) {
@@ -21,11 +19,9 @@ if (!dlerror_msg) {
 try {
   require('../fixtures/module-loading-error.node');
 } catch (e) {
-  if (process.platform === 'linux' &&
-      e.toString().indexOf(musl_errno_enoexec) !== -1) {
-    dlerror_msg = musl_errno_enoexec;
-  }
-  assert.notEqual(e.toString().indexOf(dlerror_msg), -1);
+  assert.strictEqual(dlerror_msg.some((errMsgCase) => {
+    return e.toString().indexOf(errMsgCase) !== -1;
+  }), true);
 }
 
 try {

From 781f8c0d1ec00aab3ae73fa3a56623e866b1b48b Mon Sep 17 00:00:00 2001
From: Evan Lucas <evanlucas@me.com>
Date: Wed, 18 Nov 2015 08:07:15 -0600
Subject: [PATCH 227/323] test: add OS X to module loading error test

Previously, this test was not supported on OS X. This change makes sure
that it is no longer skipped.

PR-URL: https://github.com/nodejs/node/pull/3901
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 test/parallel/test-module-loading-error.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/parallel/test-module-loading-error.js b/test/parallel/test-module-loading-error.js
index 5f9195d7736549..e67c53fc3b076a 100644
--- a/test/parallel/test-module-loading-error.js
+++ b/test/parallel/test-module-loading-error.js
@@ -7,7 +7,8 @@ console.error('load test-module-loading-error.js');
 var error_desc = {
   win32: ['%1 is not a valid Win32 application'],
   linux: ['file too short', 'Exec format error'],
-  sunos: ['unknown file type', 'not an ELF file']
+  sunos: ['unknown file type', 'not an ELF file'],
+  darwin: ['file too short']
 };
 var dlerror_msg = error_desc[process.platform];
 

From 272732e76b5ba05c15c09273140c859346bbd754 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Mon, 16 Nov 2015 21:42:47 -0800
Subject: [PATCH 228/323] test: fix flaky test-child-process-spawnsync-input

Move portion of `test-child-process-spawnsync-input.js` (that has been
flaky on CentOS in CI) to its own file. This allows us to more easily
eliminate the cause of the flakiness without affecting other unrelated
portions of the test.

Fixes: https://github.com/nodejs/node/issues/3863
PR-URL: https://github.com/nodejs/node/pull/3889
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 .../test-child-process-spawnsync-input.js     | 12 ---------
 .../test-child-process-spawnsync-maxbuf.js    | 27 +++++++++++++++++++
 2 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 test/parallel/test-child-process-spawnsync-maxbuf.js

diff --git a/test/parallel/test-child-process-spawnsync-input.js b/test/parallel/test-child-process-spawnsync-input.js
index d978bd80bc81cd..338b4277fb1982 100644
--- a/test/parallel/test-child-process-spawnsync-input.js
+++ b/test/parallel/test-child-process-spawnsync-input.js
@@ -87,15 +87,3 @@ ret = spawnSync(process.execPath, args, { encoding: 'utf8' });
 checkSpawnSyncRet(ret);
 assert.strictEqual(ret.stdout, msgOut + '\n');
 assert.strictEqual(ret.stderr, msgErr + '\n');
-
-options = {
-  maxBuffer: 1
-};
-
-ret = spawnSync(process.execPath, args, options);
-
-assert.ok(ret.error, 'maxBuffer should error');
-assert.strictEqual(ret.error.errno, 'ENOBUFS');
-// we can have buffers larger than maxBuffer because underneath we alloc 64k
-// that matches our read sizes
-assert.deepEqual(ret.stdout, msgOutBuf);
diff --git a/test/parallel/test-child-process-spawnsync-maxbuf.js b/test/parallel/test-child-process-spawnsync-maxbuf.js
new file mode 100644
index 00000000000000..d8f286d7e01626
--- /dev/null
+++ b/test/parallel/test-child-process-spawnsync-maxbuf.js
@@ -0,0 +1,27 @@
+'use strict';
+require('../common');
+const assert = require('assert');
+
+const spawnSync = require('child_process').spawnSync;
+
+const msgOut = 'this is stdout';
+
+// This is actually not os.EOL?
+const msgOutBuf = new Buffer(msgOut + '\n');
+
+const args = [
+  '-e',
+  `console.log("${msgOut}");`
+];
+
+const options = {
+  maxBuffer: 1
+};
+
+const ret = spawnSync(process.execPath, args, options);
+
+assert.ok(ret.error, 'maxBuffer should error');
+assert.strictEqual(ret.error.errno, 'ENOBUFS');
+// We can have buffers larger than maxBuffer because underneath we alloc 64k
+// that matches our read sizes
+assert.deepEqual(ret.stdout, msgOutBuf);

From bc27379453e113265edd785683077dc41ca2d7ee Mon Sep 17 00:00:00 2001
From: Stefan Budeanu <stefan@budeanu.com>
Date: Wed, 18 Nov 2015 11:40:32 -0500
Subject: [PATCH 229/323] test: avoid test timeouts on rpi

Generating 1024-bit primes on rpi test machines sometimes
causes timeouts. Avoid this situation by using 256-bit
primes when not running in FIPS mode.

Fixes: https://github.com/nodejs/node/issues/3881
PR-URL: https://github.com/nodejs/node/pull/3902
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Brian White <mscdex@mscdex.net>
Reviewed-By: Ben Noordhuis <ben@strongloop.com>
---
 test/parallel/test-crypto-binary-default.js | 2 +-
 test/parallel/test-crypto-dh.js             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/parallel/test-crypto-binary-default.js b/test/parallel/test-crypto-binary-default.js
index 8695632727fa80..9cc6bdb3e4faa5 100644
--- a/test/parallel/test-crypto-binary-default.js
+++ b/test/parallel/test-crypto-binary-default.js
@@ -513,7 +513,7 @@ assert.throws(function() {
 
 // Test Diffie-Hellman with two parties sharing a secret,
 // using various encodings as we go along
-var dh1 = crypto.createDiffieHellman(1024);
+var dh1 = crypto.createDiffieHellman(common.hasFipsCrypto ? 1024 : 256);
 var p1 = dh1.getPrime('buffer');
 var dh2 = crypto.createDiffieHellman(p1, 'base64');
 var key1 = dh1.generateKeys();
diff --git a/test/parallel/test-crypto-dh.js b/test/parallel/test-crypto-dh.js
index d93c53e3997dae..322b5d1c70a073 100644
--- a/test/parallel/test-crypto-dh.js
+++ b/test/parallel/test-crypto-dh.js
@@ -11,7 +11,7 @@ var crypto = require('crypto');
 
 // Test Diffie-Hellman with two parties sharing a secret,
 // using various encodings as we go along
-var dh1 = crypto.createDiffieHellman(1024);
+var dh1 = crypto.createDiffieHellman(common.hasFipsCrypto ? 1024 : 256);
 var p1 = dh1.getPrime('buffer');
 var dh2 = crypto.createDiffieHellman(p1, 'buffer');
 var key1 = dh1.generateKeys();

From 0997178037411723ea6c9623427075e6b66c791a Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Thu, 19 Nov 2015 12:16:29 -0500
Subject: [PATCH 230/323] doc: add reference for buffer.inspect()

This commit refers readers to util.inspect() for an explanation
of buffer.inspect().

Fixes: https://github.com/nodejs/node/issues/3918
PR-URL: https://github.com/nodejs/node/pull/3921
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Brian White <mscdex@mscdex.net>
---
 doc/api/buffer.markdown | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/api/buffer.markdown b/doc/api/buffer.markdown
index 96a4d3c483efba..52c57010e5ba71 100644
--- a/doc/api/buffer.markdown
+++ b/doc/api/buffer.markdown
@@ -882,7 +882,8 @@ to `false`.
 * Number, Default: 50
 
 How many bytes will be returned when `buffer.inspect()` is called. This can
-be overridden by user modules.
+be overridden by user modules. See [util.inspect()][] for more details on
+`buffer.inspect()` behavior.
 
 Note that this is a property on the buffer module returned by
 `require('buffer')`, not on the Buffer global, or a buffer instance.
@@ -933,3 +934,4 @@ has actively observed undue memory retention in their applications.
 
 [`buf1.compare(buf2)`]: #buffer_buf_compare_otherbuffer
 [Array#indexOf()]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf
+[util.inspect()]: util.html#util_util_inspect_object_options

From bbcb2a2e6537faa982aaedc79588230d0e3b1c33 Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Thu, 19 Nov 2015 12:05:47 -0500
Subject: [PATCH 231/323] doc: clarify module loading behavior
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The module loading system will not append node_modules to a
path already ending in node_modules. This used to be documented,
but it was lost.

Fixes: https://github.com/nodejs/node/issues/3873
PR-URL: https://github.com/nodejs/node/pull/3920
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
---
 doc/api/modules.markdown | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/api/modules.markdown b/doc/api/modules.markdown
index e9db1e4b225cbc..5c1d7671e4f701 100644
--- a/doc/api/modules.markdown
+++ b/doc/api/modules.markdown
@@ -339,7 +339,8 @@ example, then `require('./some-library')` would attempt to load:
 If the module identifier passed to `require()` is not a native module,
 and does not begin with `'/'`, `'../'`, or `'./'`, then Node.js starts at the
 parent directory of the current module, and adds `/node_modules`, and
-attempts to load the module from that location.
+attempts to load the module from that location. Node will not append
+`node_modules` to a path already ending in `node_modules`.
 
 If it is not found there, then it moves to the parent directory, and so
 on, until the root of the file system is reached.

From e129d839969ee74a6c2904f34f4a821e499523db Mon Sep 17 00:00:00 2001
From: Stefan Budeanu <stefan@budeanu.com>
Date: Tue, 10 Nov 2015 14:56:52 -0500
Subject: [PATCH 232/323] test: skip/replace weak crypto tests in FIPS mode

FIPS 140-2 does not permit the use of MD5 and RC4, skip or tests
that use them, or substitute with stronger crypto where applicable.

PR-URL: https://github.com/nodejs/node/pull/3757
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: James Snell <jasnell@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
---
 test/parallel/test-crypto-binary-default.js  | 26 ++++++-----
 test/parallel/test-crypto-hash.js            | 12 +++---
 test/parallel/test-crypto-hmac.js            | 17 +++++---
 test/parallel/test-crypto-stream.js          | 28 ++++++------
 test/parallel/test-tls-ecdh.js               |  2 +-
 test/parallel/test-tls-getcipher.js          |  2 +-
 test/parallel/test-tls-set-ciphers.js        |  2 +-
 test/pummel/test-crypto-dh.js                | 21 +++++----
 test/sequential/test-tls-honorcipherorder.js | 45 +++++++++++---------
 9 files changed, 89 insertions(+), 66 deletions(-)

diff --git a/test/parallel/test-crypto-binary-default.js b/test/parallel/test-crypto-binary-default.js
index 9cc6bdb3e4faa5..6299c869087a6e 100644
--- a/test/parallel/test-crypto-binary-default.js
+++ b/test/parallel/test-crypto-binary-default.js
@@ -324,11 +324,13 @@ var rfc2202_sha1 = [
 ];
 
 for (var i = 0, l = rfc2202_md5.length; i < l; i++) {
-  assert.equal(rfc2202_md5[i]['hmac'],
-               crypto.createHmac('md5', rfc2202_md5[i]['key'])
-                   .update(rfc2202_md5[i]['data'])
-                   .digest('hex'),
-               'Test HMAC-MD5 : Test case ' + (i + 1) + ' rfc 2202');
+  if (!common.hasFipsCrypto) {
+    assert.equal(rfc2202_md5[i]['hmac'],
+                 crypto.createHmac('md5', rfc2202_md5[i]['key'])
+                     .update(rfc2202_md5[i]['data'])
+                     .digest('hex'),
+                 'Test HMAC-MD5 : Test case ' + (i + 1) + ' rfc 2202');
+  }
 }
 for (var i = 0, l = rfc2202_sha1.length; i < l; i++) {
   assert.equal(rfc2202_sha1[i]['hmac'],
@@ -339,15 +341,19 @@ for (var i = 0, l = rfc2202_sha1.length; i < l; i++) {
 }
 
 // Test hashing
-var a0 = crypto.createHash('sha1').update('Test123').digest('hex');
-var a1 = crypto.createHash('md5').update('Test123').digest('binary');
+var a1 = crypto.createHash('sha1').update('Test123').digest('hex');
 var a2 = crypto.createHash('sha256').update('Test123').digest('base64');
 var a3 = crypto.createHash('sha512').update('Test123').digest(); // binary
 var a4 = crypto.createHash('sha1').update('Test123').digest('buffer');
 
-assert.equal(a0, '8308651804facb7b9af8ffc53a33a22d6a1c8ac2', 'Test SHA1');
-assert.equal(a1, 'h\u00ea\u00cb\u0097\u00d8o\fF!\u00fa+\u000e\u0017\u00ca' +
-             '\u00bd\u008c', 'Test MD5 as binary');
+if (!common.hasFipsCrypto) {
+  var a0 = crypto.createHash('md5').update('Test123').digest('binary');
+  assert.equal(a0, 'h\u00ea\u00cb\u0097\u00d8o\fF!\u00fa+\u000e\u0017\u00ca' +
+               '\u00bd\u008c', 'Test MD5 as binary');
+}
+
+assert.equal(a1, '8308651804facb7b9af8ffc53a33a22d6a1c8ac2', 'Test SHA1');
+
 assert.equal(a2, '2bX1jws4GYKTlxhloUB09Z66PoJZW+y+hq5R8dnx9l4=',
              'Test SHA256 as base64');
 
diff --git a/test/parallel/test-crypto-hash.js b/test/parallel/test-crypto-hash.js
index 95bb1bc7d8643d..90ff1fd727d104 100644
--- a/test/parallel/test-crypto-hash.js
+++ b/test/parallel/test-crypto-hash.js
@@ -11,8 +11,7 @@ if (!common.hasCrypto) {
 var crypto = require('crypto');
 
 // Test hashing
-var a0 = crypto.createHash('sha1').update('Test123').digest('hex');
-var a1 = crypto.createHash('md5').update('Test123').digest('binary');
+var a1 = crypto.createHash('sha1').update('Test123').digest('hex');
 var a2 = crypto.createHash('sha256').update('Test123').digest('base64');
 var a3 = crypto.createHash('sha512').update('Test123').digest(); // binary
 var a4 = crypto.createHash('sha1').update('Test123').digest('buffer');
@@ -38,9 +37,12 @@ a8.write('');
 a8.end();
 a8 = a8.read();
 
-assert.equal(a0, '8308651804facb7b9af8ffc53a33a22d6a1c8ac2', 'Test SHA1');
-assert.equal(a1, 'h\u00ea\u00cb\u0097\u00d8o\fF!\u00fa+\u000e\u0017\u00ca' +
-             '\u00bd\u008c', 'Test MD5 as binary');
+if (!common.hasFipsCrypto) {
+  var a0 = crypto.createHash('md5').update('Test123').digest('binary');
+  assert.equal(a0, 'h\u00ea\u00cb\u0097\u00d8o\fF!\u00fa+\u000e\u0017\u00ca' +
+               '\u00bd\u008c', 'Test MD5 as binary');
+}
+assert.equal(a1, '8308651804facb7b9af8ffc53a33a22d6a1c8ac2', 'Test SHA1');
 assert.equal(a2, '2bX1jws4GYKTlxhloUB09Z66PoJZW+y+hq5R8dnx9l4=',
              'Test SHA256 as base64');
 assert.deepEqual(
diff --git a/test/parallel/test-crypto-hmac.js b/test/parallel/test-crypto-hmac.js
index 692954caabd4a3..c244c9e0dd12c2 100644
--- a/test/parallel/test-crypto-hmac.js
+++ b/test/parallel/test-crypto-hmac.js
@@ -61,6 +61,9 @@ var wikipedia = [
 
 for (var i = 0, l = wikipedia.length; i < l; i++) {
   for (var hash in wikipedia[i]['hmac']) {
+    // FIPS does not support MD5.
+    if (common.hasFipsCrypto && hash == 'md5' )
+      continue;
     var result = crypto.createHmac(hash, wikipedia[i]['key'])
                      .update(wikipedia[i]['data'])
                      .digest('hex');
@@ -346,12 +349,14 @@ var rfc2202_sha1 = [
   }
 ];
 
-for (var i = 0, l = rfc2202_md5.length; i < l; i++) {
-  assert.equal(rfc2202_md5[i]['hmac'],
-               crypto.createHmac('md5', rfc2202_md5[i]['key'])
-                   .update(rfc2202_md5[i]['data'])
-                   .digest('hex'),
-               'Test HMAC-MD5 : Test case ' + (i + 1) + ' rfc 2202');
+if (!common.hasFipsCrypto) {
+  for (var i = 0, l = rfc2202_md5.length; i < l; i++) {
+    assert.equal(rfc2202_md5[i]['hmac'],
+                 crypto.createHmac('md5', rfc2202_md5[i]['key'])
+                     .update(rfc2202_md5[i]['data'])
+                     .digest('hex'),
+                 'Test HMAC-MD5 : Test case ' + (i + 1) + ' rfc 2202');
+  }
 }
 for (var i = 0, l = rfc2202_sha1.length; i < l; i++) {
   assert.equal(rfc2202_sha1[i]['hmac'],
diff --git a/test/parallel/test-crypto-stream.js b/test/parallel/test-crypto-stream.js
index 727e6a16a70e46..f276e161721eb5 100644
--- a/test/parallel/test-crypto-stream.js
+++ b/test/parallel/test-crypto-stream.js
@@ -26,19 +26,21 @@ Stream2buffer.prototype._write = function(data, encodeing, done) {
   return done(null);
 };
 
-// Create an md5 hash of "Hallo world"
-var hasher1 = crypto.createHash('md5');
-hasher1.pipe(new Stream2buffer(common.mustCall(function end(err, hash) {
-  assert.equal(err, null);
-  assert.equal(hash.toString('hex'), '06460dadb35d3d503047ce750ceb2d07');
-})));
-hasher1.end('Hallo world');
-
-// Simpler check for unpipe, setEncoding, pause and resume
-crypto.createHash('md5').unpipe({});
-crypto.createHash('md5').setEncoding('utf8');
-crypto.createHash('md5').pause();
-crypto.createHash('md5').resume();
+if (!common.hasFipsCrypto) {
+  // Create an md5 hash of "Hallo world"
+  var hasher1 = crypto.createHash('md5');
+  hasher1.pipe(new Stream2buffer(common.mustCall(function end(err, hash) {
+    assert.equal(err, null);
+    assert.equal(hash.toString('hex'), '06460dadb35d3d503047ce750ceb2d07');
+  })));
+  hasher1.end('Hallo world');
+
+  // Simpler check for unpipe, setEncoding, pause and resume
+  crypto.createHash('md5').unpipe({});
+  crypto.createHash('md5').setEncoding('utf8');
+  crypto.createHash('md5').pause();
+  crypto.createHash('md5').resume();
+}
 
 // Decipher._flush() should emit an error event, not an exception.
 var key = new Buffer('48fb56eb10ffeb13fc0ef551bbca3b1b', 'hex'),
diff --git a/test/parallel/test-tls-ecdh.js b/test/parallel/test-tls-ecdh.js
index ce9af395c563ec..a6e16114b955ae 100644
--- a/test/parallel/test-tls-ecdh.js
+++ b/test/parallel/test-tls-ecdh.js
@@ -14,7 +14,7 @@ var fs = require('fs');
 var options = {
   key: fs.readFileSync(common.fixturesDir + '/keys/agent2-key.pem'),
   cert: fs.readFileSync(common.fixturesDir + '/keys/agent2-cert.pem'),
-  ciphers: '-ALL:ECDHE-RSA-RC4-SHA',
+  ciphers: '-ALL:ECDHE-RSA-AES128-SHA256',
   ecdhCurve: 'prime256v1'
 };
 
diff --git a/test/parallel/test-tls-getcipher.js b/test/parallel/test-tls-getcipher.js
index 62209c771cb48c..646d396eca9a86 100644
--- a/test/parallel/test-tls-getcipher.js
+++ b/test/parallel/test-tls-getcipher.js
@@ -9,7 +9,7 @@ if (!common.hasCrypto) {
 var tls = require('tls');
 
 var fs = require('fs');
-var cipher_list = ['RC4-SHA', 'AES256-SHA'];
+var cipher_list = ['AES128-SHA256', 'AES256-SHA256'];
 var cipher_version_pattern = /TLS|SSL/;
 var options = {
   key: fs.readFileSync(common.fixturesDir + '/keys/agent2-key.pem'),
diff --git a/test/parallel/test-tls-set-ciphers.js b/test/parallel/test-tls-set-ciphers.js
index a303f6fb277d74..696644cdc43a5b 100644
--- a/test/parallel/test-tls-set-ciphers.js
+++ b/test/parallel/test-tls-set-ciphers.js
@@ -19,7 +19,7 @@ var fs = require('fs');
 var options = {
   key: fs.readFileSync(common.fixturesDir + '/keys/agent2-key.pem'),
   cert: fs.readFileSync(common.fixturesDir + '/keys/agent2-cert.pem'),
-  ciphers: 'RC4-MD5'
+  ciphers: 'DES-CBC3-SHA'
 };
 
 var reply = 'I AM THE WALRUS'; // something recognizable
diff --git a/test/pummel/test-crypto-dh.js b/test/pummel/test-crypto-dh.js
index a223e45c866bcd..1a2020cd5579b1 100644
--- a/test/pummel/test-crypto-dh.js
+++ b/test/pummel/test-crypto-dh.js
@@ -20,27 +20,30 @@ assert.throws(function() {
 });
 
 var hashes = {
-  modp1 : 'b4b330a6ffeacfbd861e7fe2135b4431',
-  modp2 : '7c3c5cad8b9f378d88f1dd64a4b6413a',
-  modp5 : 'b1d2acc22c542e08669a5c5ae812694d',
-  modp14 : '8d041538cecc1a7d915ba4b718f8ad20',
-  modp15 : 'dc3b93def24e078c4fbf92d5e14ba69b',
-  modp16 : 'a273487f46f699461f613b3878d9dfd9',
-  modp17 : 'dc76e09935310348c492de9bd82014d0',
-  modp18 : 'db08973bfd2371758a69db180871c993'
+  modp1 : '630e9acd2cc63f7e80d8507624ba60ac0757201a',
+  modp2 : '18f7aa964484137f57bca64b21917a385b6a0b60',
+  modp5 : 'c0a8eec0c2c8a5ec2f9c26f9661eb339a010ec61',
+  modp14 : 'af5455606fe74cec49782bb374e4c63c9b1d132c',
+  modp15 : '7bdd39e5cdbb9748113933e5c2623b559c534e74',
+  modp16 : 'daea5277a7ad0116e734a8e0d2f297ef759d1161',
+  modp17 : '3b62aaf0142c2720f0bf26a9589b0432c00eadc1',
+  modp18 : 'a870b491bbbec9b131ae9878d07449d32e54f160'
 };
 
 for (var name in hashes) {
   var group = crypto.getDiffieHellman(name);
   var private_key = group.getPrime('hex');
   var hash1 = hashes[name];
-  var hash2 = crypto.createHash('md5')
+  var hash2 = crypto.createHash('sha1')
                     .update(private_key.toUpperCase()).digest('hex');
   assert.equal(hash1, hash2);
   assert.equal(group.getGenerator('hex'), '02');
 }
 
 for (var name in hashes) {
+  // modp1 is 768 bits, FIPS requires >= 1024
+  if (name == 'modp1' && common.hasFipsCrypto)
+    continue;
   var group1 = crypto.getDiffieHellman(name);
   var group2 = crypto.getDiffieHellman(name);
   group1.generateKeys();
diff --git a/test/sequential/test-tls-honorcipherorder.js b/test/sequential/test-tls-honorcipherorder.js
index cac697c5b02d91..28c930b07edc28 100644
--- a/test/sequential/test-tls-honorcipherorder.js
+++ b/test/sequential/test-tls-honorcipherorder.js
@@ -10,9 +10,10 @@ var tls = require('tls');
 
 var fs = require('fs');
 var nconns = 0;
-// test only in TLSv1 to use DES which is no longer supported TLSv1.2
-// to be safe when the default method is updated in the future
-var SSL_Method = 'TLSv1_method';
+
+// We explicitly set TLS version to 1.2 so as to be safe when the
+// default method is updated in the future
+var SSL_Method = 'TLSv1_2_method';
 var localhost = '127.0.0.1';
 
 process.on('exit', function() {
@@ -24,7 +25,8 @@ function test(honorCipherOrder, clientCipher, expectedCipher, cb) {
     secureProtocol: SSL_Method,
     key: fs.readFileSync(common.fixturesDir + '/keys/agent2-key.pem'),
     cert: fs.readFileSync(common.fixturesDir + '/keys/agent2-cert.pem'),
-    ciphers: 'DES-CBC-SHA:AES256-SHA:RC4-SHA:ECDHE-RSA-AES256-SHA',
+    ciphers: 'AES256-SHA256:AES128-GCM-SHA256:AES128-SHA256:' +
+             'ECDHE-RSA-AES128-GCM-SHA256',
     honorCipherOrder: !!honorCipherOrder
   };
 
@@ -57,37 +59,40 @@ test1();
 
 function test1() {
   // Client has the preference of cipher suites by default
-  test(false, 'AES256-SHA:DES-CBC-SHA:RC4-SHA', 'AES256-SHA', test2);
+  test(false, 'AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256',
+       'AES128-GCM-SHA256', test2);
 }
 
 function test2() {
-  // Server has the preference of cipher suites where DES-CBC-SHA is in
-  // the first.
-  test(true, 'AES256-SHA:DES-CBC-SHA:RC4-SHA', 'DES-CBC-SHA', test3);
+  // Server has the preference of cipher suites, and AES256-SHA256 is
+  // the server's top choice.
+  test(true, 'AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256',
+       'AES256-SHA256', test3);
 }
 
 function test3() {
-  // Server has the preference of cipher suites. RC4-SHA is given
-  // higher priority over DES-CBC-SHA among client cipher suites.
-  test(true, 'RC4-SHA:AES256-SHA', 'AES256-SHA', test4);
+  // Server has the preference of cipher suites. AES128-GCM-SHA256 is given
+  // higher priority over AES128-SHA256 among client cipher suites.
+  test(true, 'AES128-SHA256:AES128-GCM-SHA256', 'AES128-GCM-SHA256', test4);
+
 }
 
 function test4() {
-  // As client has only one cipher, server has no choice in regardless
+  // As client has only one cipher, server has no choice, irrespective
   // of honorCipherOrder.
-  test(true, 'RC4-SHA', 'RC4-SHA', test5);
+  test(true, 'AES128-SHA256', 'AES128-SHA256', test5);
 }
 
 function test5() {
-  // Client did not explicitly set ciphers. Ensure that client defaults to
-  // sane ciphers. Even though server gives top priority to DES-CBC-SHA
-  // it should not be negotiated because it's not in default client ciphers.
-  test(true, null, 'AES256-SHA', test6);
+  // Client did not explicitly set ciphers and client offers
+  // tls.DEFAULT_CIPHERS. All ciphers of the server are included in the
+  // default list so the negotiated cipher is selected according to the
+  // server's top preference of AES256-SHA256.
+  test(true, null, 'AES256-SHA256', test6);
 }
 
 function test6() {
   // Ensure that `tls.DEFAULT_CIPHERS` is used
-  SSL_Method = 'TLSv1_2_method';
-  tls.DEFAULT_CIPHERS = 'ECDHE-RSA-AES256-SHA';
-  test(true, null, 'ECDHE-RSA-AES256-SHA');
+  tls.DEFAULT_CIPHERS = 'ECDHE-RSA-AES128-GCM-SHA256';
+  test(true, null, 'ECDHE-RSA-AES128-GCM-SHA256');
 }

From 788541b40c0c9d21d8ea89817ab85b4fcf83bfbc Mon Sep 17 00:00:00 2001
From: Michael Cornacchia <cornacch@ca.ibm.com>
Date: Tue, 27 Oct 2015 12:55:09 -0400
Subject: [PATCH 233/323] test: fix race condition in unrefd interval test

Rely more on timers implementation rather than arbitrary timeouts.

Refs: https://github.com/nodejs/node/issues/1781
PR-URL: https://github.com/nodejs/node/pull/3550

Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 ...test-timers-unrefd-interval-still-fires.js | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/test/parallel/test-timers-unrefd-interval-still-fires.js b/test/parallel/test-timers-unrefd-interval-still-fires.js
index 98bd278b451613..a716c6ed645cbd 100644
--- a/test/parallel/test-timers-unrefd-interval-still-fires.js
+++ b/test/parallel/test-timers-unrefd-interval-still-fires.js
@@ -2,19 +2,27 @@
 /*
  * This test is a regression test for joyent/node#8900.
  */
-require('../common');
-var assert = require('assert');
+const common = require('../common');
+const assert = require('assert');
 
-var N = 5;
+const TEST_DURATION = common.platformTimeout(100);
+const N = 5;
 var nbIntervalFired = 0;
-var timer = setInterval(function() {
+
+const keepOpen = setTimeout(() => {
+  console.error('[FAIL] Interval fired %d/%d times.', nbIntervalFired, N);
+  throw new Error('Test timed out. keepOpen was not canceled.');
+}, TEST_DURATION);
+
+const timer = setInterval(() => {
   ++nbIntervalFired;
-  if (nbIntervalFired === N)
+  if (nbIntervalFired === N) {
     clearInterval(timer);
+    timer._onTimeout = () => {
+      throw new Error('Unrefd interval fired after being cleared.');
+    };
+    setImmediate(() => clearTimeout(keepOpen));
+  }
 }, 1);
 
 timer.unref();
-
-setTimeout(function onTimeout() {
-  assert.strictEqual(nbIntervalFired, N);
-}, 100);

From def681a07ee78fda84056e403e20aef21b5d0161 Mon Sep 17 00:00:00 2001
From: Stefan Budeanu <stefan@budeanu.com>
Date: Mon, 9 Nov 2015 00:00:56 -0500
Subject: [PATCH 234/323] crypto: disable crypto.createCipher in FIPS mode

FIPS 140-2 disallows use of MD5, which is used to derive the
initialization vector and key for createCipher(). Modify
all tests to expect exceptions in FIPS mode when disallowed
API is used, or to avoid testing such API in FIPS Mode.

PR-URL: https://github.com/nodejs/node/pull/3754
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 src/node_crypto.cc                            |  5 ++
 test/parallel/test-crypto-authenticated.js    | 52 +++++++++------
 test/parallel/test-crypto-binary-default.js   | 11 ++--
 test/parallel/test-crypto-cipher-decipher.js  | 63 ++----------------
 .../test-crypto-cipheriv-decipheriv.js        | 65 +++++++++++++++++++
 test/parallel/test-crypto-dh.js               |  4 +-
 test/parallel/test-crypto.js                  |  4 +-
 7 files changed, 116 insertions(+), 88 deletions(-)
 create mode 100644 test/parallel/test-crypto-cipheriv-decipheriv.js

diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index f699ef8222ec8d..bd7314c9db902c 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -3054,6 +3054,11 @@ void CipherBase::Init(const char* cipher_type,
                       int key_buf_len) {
   HandleScope scope(env()->isolate());
 
+#ifdef NODE_FIPS_MODE
+  return env()->ThrowError(
+    "crypto.createCipher() is not supported in FIPS mode.");
+#endif  // NODE_FIPS_MODE
+
   CHECK_EQ(cipher_, nullptr);
   cipher_ = EVP_get_cipherbyname(cipher_type);
   if (cipher_ == nullptr) {
diff --git a/test/parallel/test-crypto-authenticated.js b/test/parallel/test-crypto-authenticated.js
index 2cc36278332c9b..fa9a78c26e5b59 100644
--- a/test/parallel/test-crypto-authenticated.js
+++ b/test/parallel/test-crypto-authenticated.js
@@ -93,32 +93,44 @@ for (var i in TEST_CASES) {
 
   (function() {
     if (!test.password) return;
-    var encrypt = crypto.createCipher(test.algo, test.password);
-    if (test.aad)
-      encrypt.setAAD(new Buffer(test.aad, 'hex'));
-    var hex = encrypt.update(test.plain, 'ascii', 'hex');
-    hex += encrypt.final('hex');
-    var auth_tag = encrypt.getAuthTag();
-    // only test basic encryption run if output is marked as tampered.
-    if (!test.tampered) {
-      assert.equal(hex.toUpperCase(), test.ct);
-      assert.equal(auth_tag.toString('hex').toUpperCase(), test.tag);
+    if (common.hasFipsCrypto) {
+      assert.throws(function()
+                    { crypto.createCipher(test.algo, test.password); },
+                    /not supported in FIPS mode/);
+    } else {
+      var encrypt = crypto.createCipher(test.algo, test.password);
+      if (test.aad)
+        encrypt.setAAD(new Buffer(test.aad, 'hex'));
+      var hex = encrypt.update(test.plain, 'ascii', 'hex');
+      hex += encrypt.final('hex');
+      var auth_tag = encrypt.getAuthTag();
+      // only test basic encryption run if output is marked as tampered.
+      if (!test.tampered) {
+        assert.equal(hex.toUpperCase(), test.ct);
+        assert.equal(auth_tag.toString('hex').toUpperCase(), test.tag);
+      }
     }
   })();
 
   (function() {
     if (!test.password) return;
-    var decrypt = crypto.createDecipher(test.algo, test.password);
-    decrypt.setAuthTag(new Buffer(test.tag, 'hex'));
-    if (test.aad)
-      decrypt.setAAD(new Buffer(test.aad, 'hex'));
-    var msg = decrypt.update(test.ct, 'hex', 'ascii');
-    if (!test.tampered) {
-      msg += decrypt.final('ascii');
-      assert.equal(msg, test.plain);
+    if (common.hasFipsCrypto) {
+      assert.throws(function()
+                    { crypto.createDecipher(test.algo, test.password); },
+                    /not supported in FIPS mode/);
     } else {
-      // assert that final throws if input data could not be verified!
-      assert.throws(function() { decrypt.final('ascii'); }, / auth/);
+      var decrypt = crypto.createDecipher(test.algo, test.password);
+      decrypt.setAuthTag(new Buffer(test.tag, 'hex'));
+      if (test.aad)
+        decrypt.setAAD(new Buffer(test.aad, 'hex'));
+      var msg = decrypt.update(test.ct, 'hex', 'ascii');
+      if (!test.tampered) {
+        msg += decrypt.final('ascii');
+        assert.equal(msg, test.plain);
+      } else {
+        // assert that final throws if input data could not be verified!
+        assert.throws(function() { decrypt.final('ascii'); }, / auth/);
+      }
     }
   })();
 
diff --git a/test/parallel/test-crypto-binary-default.js b/test/parallel/test-crypto-binary-default.js
index 6299c869087a6e..806f5de18bbb1f 100644
--- a/test/parallel/test-crypto-binary-default.js
+++ b/test/parallel/test-crypto-binary-default.js
@@ -496,12 +496,13 @@ function testCipher4(key, iv) {
   assert.equal(txt, plaintext, 'encryption and decryption with key and iv');
 }
 
+if (!common.hasFipsCrypto) {
+  testCipher1('MySecretKey123');
+  testCipher1(new Buffer('MySecretKey123'));
 
-testCipher1('MySecretKey123');
-testCipher1(new Buffer('MySecretKey123'));
-
-testCipher2('0123456789abcdef');
-testCipher2(new Buffer('0123456789abcdef'));
+  testCipher2('0123456789abcdef');
+  testCipher2(new Buffer('0123456789abcdef'));
+}
 
 testCipher3('0123456789abcd0123456789', '12345678');
 testCipher3('0123456789abcd0123456789', new Buffer('12345678'));
diff --git a/test/parallel/test-crypto-cipher-decipher.js b/test/parallel/test-crypto-cipher-decipher.js
index f33ea5482c8c3a..5f867739abe7ed 100644
--- a/test/parallel/test-crypto-cipher-decipher.js
+++ b/test/parallel/test-crypto-cipher-decipher.js
@@ -6,6 +6,10 @@ if (!common.hasCrypto) {
   console.log('1..0 # Skipped: missing crypto');
   return;
 }
+if (common.hasFipsCrypto) {
+  console.log('1..0 # Skipped: not supported in FIPS mode');
+  return;
+}
 var crypto = require('crypto');
 
 function testCipher1(key) {
@@ -62,71 +66,12 @@ function testCipher2(key) {
   assert.equal(txt, plaintext, 'encryption and decryption with Base64');
 }
 
-
-function testCipher3(key, iv) {
-  // Test encyrption and decryption with explicit key and iv
-  var plaintext =
-      '32|RmVZZkFUVmpRRkp0TmJaUm56ZU9qcnJkaXNNWVNpTTU*|iXmckfRWZBGWWELw' +
-      'eCBsThSsfUHLeRe0KCsK8ooHgxie0zOINpXxfZi/oNG7uq9JWFVCk70gfzQH8ZUJ' +
-      'jAfaFg**';
-  var cipher = crypto.createCipheriv('des-ede3-cbc', key, iv);
-  var ciph = cipher.update(plaintext, 'utf8', 'hex');
-  ciph += cipher.final('hex');
-
-  var decipher = crypto.createDecipheriv('des-ede3-cbc', key, iv);
-  var txt = decipher.update(ciph, 'hex', 'utf8');
-  txt += decipher.final('utf8');
-
-  assert.equal(txt, plaintext, 'encryption and decryption with key and iv');
-
-  // streaming cipher interface
-  // NB: In real life, it's not guaranteed that you can get all of it
-  // in a single read() like this.  But in this case, we know it's
-  // quite small, so there's no harm.
-  var cStream = crypto.createCipheriv('des-ede3-cbc', key, iv);
-  cStream.end(plaintext);
-  ciph = cStream.read();
-
-  var dStream = crypto.createDecipheriv('des-ede3-cbc', key, iv);
-  dStream.end(ciph);
-  txt = dStream.read().toString('utf8');
-
-  assert.equal(txt, plaintext, 'streaming cipher iv');
-}
-
-
-function testCipher4(key, iv) {
-  // Test encyrption and decryption with explicit key and iv
-  var plaintext =
-      '32|RmVZZkFUVmpRRkp0TmJaUm56ZU9qcnJkaXNNWVNpTTU*|iXmckfRWZBGWWELw' +
-      'eCBsThSsfUHLeRe0KCsK8ooHgxie0zOINpXxfZi/oNG7uq9JWFVCk70gfzQH8ZUJ' +
-      'jAfaFg**';
-  var cipher = crypto.createCipheriv('des-ede3-cbc', key, iv);
-  var ciph = cipher.update(plaintext, 'utf8', 'buffer');
-  ciph = Buffer.concat([ciph, cipher.final('buffer')]);
-
-  var decipher = crypto.createDecipheriv('des-ede3-cbc', key, iv);
-  var txt = decipher.update(ciph, 'buffer', 'utf8');
-  txt += decipher.final('utf8');
-
-  assert.equal(txt, plaintext, 'encryption and decryption with key and iv');
-}
-
-
 testCipher1('MySecretKey123');
 testCipher1(new Buffer('MySecretKey123'));
 
 testCipher2('0123456789abcdef');
 testCipher2(new Buffer('0123456789abcdef'));
 
-testCipher3('0123456789abcd0123456789', '12345678');
-testCipher3('0123456789abcd0123456789', new Buffer('12345678'));
-testCipher3(new Buffer('0123456789abcd0123456789'), '12345678');
-testCipher3(new Buffer('0123456789abcd0123456789'), new Buffer('12345678'));
-
-testCipher4(new Buffer('0123456789abcd0123456789'), new Buffer('12345678'));
-
-
 // Base64 padding regression test, see #4837.
 (function() {
   var c = crypto.createCipher('aes-256-cbc', 'secret');
diff --git a/test/parallel/test-crypto-cipheriv-decipheriv.js b/test/parallel/test-crypto-cipheriv-decipheriv.js
new file mode 100644
index 00000000000000..d325c0facf7e54
--- /dev/null
+++ b/test/parallel/test-crypto-cipheriv-decipheriv.js
@@ -0,0 +1,65 @@
+'use strict';
+var common = require('../common');
+var assert = require('assert');
+
+if (!common.hasCrypto) {
+  console.log('1..0 # Skipped: missing crypto');
+  return;
+}
+var crypto = require('crypto');
+
+function testCipher1(key, iv) {
+  // Test encyrption and decryption with explicit key and iv
+  var plaintext =
+      '32|RmVZZkFUVmpRRkp0TmJaUm56ZU9qcnJkaXNNWVNpTTU*|iXmckfRWZBGWWELw' +
+      'eCBsThSsfUHLeRe0KCsK8ooHgxie0zOINpXxfZi/oNG7uq9JWFVCk70gfzQH8ZUJ' +
+      'jAfaFg**';
+  var cipher = crypto.createCipheriv('des-ede3-cbc', key, iv);
+  var ciph = cipher.update(plaintext, 'utf8', 'hex');
+  ciph += cipher.final('hex');
+
+  var decipher = crypto.createDecipheriv('des-ede3-cbc', key, iv);
+  var txt = decipher.update(ciph, 'hex', 'utf8');
+  txt += decipher.final('utf8');
+
+  assert.equal(txt, plaintext, 'encryption and decryption with key and iv');
+
+  // streaming cipher interface
+  // NB: In real life, it's not guaranteed that you can get all of it
+  // in a single read() like this.  But in this case, we know it's
+  // quite small, so there's no harm.
+  var cStream = crypto.createCipheriv('des-ede3-cbc', key, iv);
+  cStream.end(plaintext);
+  ciph = cStream.read();
+
+  var dStream = crypto.createDecipheriv('des-ede3-cbc', key, iv);
+  dStream.end(ciph);
+  txt = dStream.read().toString('utf8');
+
+  assert.equal(txt, plaintext, 'streaming cipher iv');
+}
+
+
+function testCipher2(key, iv) {
+  // Test encyrption and decryption with explicit key and iv
+  var plaintext =
+      '32|RmVZZkFUVmpRRkp0TmJaUm56ZU9qcnJkaXNNWVNpTTU*|iXmckfRWZBGWWELw' +
+      'eCBsThSsfUHLeRe0KCsK8ooHgxie0zOINpXxfZi/oNG7uq9JWFVCk70gfzQH8ZUJ' +
+      'jAfaFg**';
+  var cipher = crypto.createCipheriv('des-ede3-cbc', key, iv);
+  var ciph = cipher.update(plaintext, 'utf8', 'buffer');
+  ciph = Buffer.concat([ciph, cipher.final('buffer')]);
+
+  var decipher = crypto.createDecipheriv('des-ede3-cbc', key, iv);
+  var txt = decipher.update(ciph, 'buffer', 'utf8');
+  txt += decipher.final('utf8');
+
+  assert.equal(txt, plaintext, 'encryption and decryption with key and iv');
+}
+
+testCipher1('0123456789abcd0123456789', '12345678');
+testCipher1('0123456789abcd0123456789', new Buffer('12345678'));
+testCipher1(new Buffer('0123456789abcd0123456789'), '12345678');
+testCipher1(new Buffer('0123456789abcd0123456789'), new Buffer('12345678'));
+
+testCipher2(new Buffer('0123456789abcd0123456789'), new Buffer('12345678'));
diff --git a/test/parallel/test-crypto-dh.js b/test/parallel/test-crypto-dh.js
index 322b5d1c70a073..f3e54c46a8e16b 100644
--- a/test/parallel/test-crypto-dh.js
+++ b/test/parallel/test-crypto-dh.js
@@ -58,7 +58,7 @@ assert.equal(secret1, secret3);
 
 // Run this one twice to make sure that the dh3 clears its error properly
 (function() {
-  var c = crypto.createDecipher('aes-128-ecb', '');
+  var c = crypto.createDecipheriv('aes-128-ecb', crypto.randomBytes(16), '');
   assert.throws(function() { c.final('utf8'); }, /wrong final block length/);
 })();
 
@@ -67,7 +67,7 @@ assert.throws(function() {
 }, /key is too small/i);
 
 (function() {
-  var c = crypto.createDecipher('aes-128-ecb', '');
+  var c = crypto.createDecipheriv('aes-128-ecb', crypto.randomBytes(16), '');
   assert.throws(function() { c.final('utf8'); }, /wrong final block length/);
 })();
 
diff --git a/test/parallel/test-crypto.js b/test/parallel/test-crypto.js
index e5fe8db58c132e..df59fd9bded726 100644
--- a/test/parallel/test-crypto.js
+++ b/test/parallel/test-crypto.js
@@ -93,11 +93,11 @@ assertSorted(crypto.getCurves());
 // throw, not assert in C++ land.
 assert.throws(function() {
   crypto.createCipher('aes192', 'test').update('0', 'hex');
-}, /Bad input string/);
+}, common.hasFipsCrypto ? /not supported in FIPS mode/ : /Bad input string/);
 
 assert.throws(function() {
   crypto.createDecipher('aes192', 'test').update('0', 'hex');
-}, /Bad input string/);
+}, common.hasFipsCrypto ? /not supported in FIPS mode/ : /Bad input string/);
 
 assert.throws(function() {
   crypto.createHash('sha1').update('0', 'hex');

From 54aafa17af8eee9287384d0591c81fb3081b2479 Mon Sep 17 00:00:00 2001
From: Bryan English <bryan@bryanenglish.com>
Date: Thu, 19 Nov 2015 16:28:45 -0800
Subject: [PATCH 235/323] test: http complete list of non-concat headers

The original test was only testing some of the headers that shouldn't be
concatenated as per lib/_http_incoming.js, so now the full list is
there.

'content-length` gives a parse error if you set it to a string, so the
test for that header uses numbers.

PR-URL: https://github.com/nodejs/node/pull/3930
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 .../test-http-response-multiheaders.js         | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/test/parallel/test-http-response-multiheaders.js b/test/parallel/test-http-response-multiheaders.js
index 572ce2e128bf29..6f477d6638105d 100644
--- a/test/parallel/test-http-response-multiheaders.js
+++ b/test/parallel/test-http-response-multiheaders.js
@@ -4,8 +4,21 @@ const common = require('../common');
 const http = require('http');
 const assert = require('assert');
 
-// Test that certain response header fields do not repeat
+// Test that certain response header fields do not repeat.
+// 'content-length' should also be in this list, but it needs
+// a numeric value, so it's tested slightly differently.
 const norepeat = [
+  'content-type',
+  'user-agent',
+  'referer',
+  'host',
+  'authorization',
+  'proxy-authorization',
+  'if-modified-since',
+  'if-unmodified-since',
+  'from',
+  'location',
+  'max-forwards',
   'retry-after',
   'etag',
   'last-modified',
@@ -17,12 +30,14 @@ const norepeat = [
 const server = http.createServer(function(req, res) {
   var num = req.headers['x-num'];
   if (num == 1) {
+    res.setHeader('content-length', [1, 2]);
     for (const name of norepeat) {
       res.setHeader(name, ['A', 'B']);
     }
     res.setHeader('X-A', ['A', 'B']);
   } else if (num == 2) {
     const headers = {};
+    headers['content-length'] = [1, 2];
     for (const name of norepeat) {
       headers[name] = ['A', 'B'];
     }
@@ -44,6 +59,7 @@ server.listen(common.PORT, common.mustCall(function() {
       {port:common.PORT, headers:{'x-num': n}},
       common.mustCall(function(res) {
         if (n == 2) server.close();
+        assert.equal(res.headers['content-length'], 1);
         for (const name of norepeat) {
           assert.equal(res.headers[name], 'A');
         }

From f90227b0e8f418592d8f9c58f4ea5eed92010a79 Mon Sep 17 00:00:00 2001
From: Martin Forsberg <git@martinforsberg.se>
Date: Fri, 20 Nov 2015 18:36:59 +0100
Subject: [PATCH 236/323] doc: move fs.existsSync() deprecation message

This commit moves the deprecation message for fs.existsSync()
above the function description, making message placement
uniform across the documentation.

PR-URL: https://github.com/nodejs/node/pull/3942
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 doc/api/fs.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/api/fs.markdown b/doc/api/fs.markdown
index 582a222a6e69c6..86e77539b922fa 100644
--- a/doc/api/fs.markdown
+++ b/doc/api/fs.markdown
@@ -364,11 +364,11 @@ non-existent.
 
 ## fs.existsSync(path)
 
+    Stability: 0 - Deprecated: Use [fs.statSync][] or [fs.accessSync][] instead.
+
 Synchronous version of [`fs.exists`][].
 Returns `true` if the file exists, `false` otherwise.
 
-    Stability: 0 - Deprecated: Use [fs.statSync][] or [fs.accessSync][] instead.
-
 ## fs.fchmod(fd, mode, callback)
 
 Asynchronous fchmod(2). No arguments other than a possible exception

From fcf0e8ebdf5aac09f0588f7d460da24b09f33734 Mon Sep 17 00:00:00 2001
From: Matt Loring <mattloring@google.com>
Date: Tue, 10 Nov 2015 18:25:01 -0800
Subject: [PATCH 237/323] buffer: move checkFloat from lib into src

The type and range checks performed by this function can be done more
efficiently in native code.

PR-URL: https://github.com/nodejs/node/pull/3763
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/buffer.js      | 28 ++++++++++++----------------
 src/node_buffer.cc | 43 ++++++++++++++++++++++++++++++-------------
 2 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/lib/buffer.js b/lib/buffer.js
index 53553253209923..210fdf4f058ff2 100644
--- a/lib/buffer.js
+++ b/lib/buffer.js
@@ -1028,20 +1028,13 @@ Buffer.prototype.writeInt32BE = function(value, offset, noAssert) {
 };
 
 
-function checkFloat(buffer, value, offset, ext) {
-  if (!(buffer instanceof Buffer))
-    throw new TypeError('buffer must be a Buffer instance');
-  if (offset + ext > buffer.length)
-    throw new RangeError('index out of range');
-}
-
-
 Buffer.prototype.writeFloatLE = function writeFloatLE(val, offset, noAssert) {
   val = +val;
   offset = offset >>> 0;
   if (!noAssert)
-    checkFloat(this, val, offset, 4);
-  binding.writeFloatLE(this, val, offset);
+    binding.writeFloatLE(this, val, offset);
+  else
+    binding.writeFloatLE(this, val, offset, true);
   return offset + 4;
 };
 
@@ -1050,8 +1043,9 @@ Buffer.prototype.writeFloatBE = function writeFloatBE(val, offset, noAssert) {
   val = +val;
   offset = offset >>> 0;
   if (!noAssert)
-    checkFloat(this, val, offset, 4);
-  binding.writeFloatBE(this, val, offset);
+    binding.writeFloatBE(this, val, offset);
+  else
+    binding.writeFloatBE(this, val, offset, true);
   return offset + 4;
 };
 
@@ -1060,8 +1054,9 @@ Buffer.prototype.writeDoubleLE = function writeDoubleLE(val, offset, noAssert) {
   val = +val;
   offset = offset >>> 0;
   if (!noAssert)
-    checkFloat(this, val, offset, 8);
-  binding.writeDoubleLE(this, val, offset);
+    binding.writeDoubleLE(this, val, offset);
+  else
+    binding.writeDoubleLE(this, val, offset, true);
   return offset + 8;
 };
 
@@ -1070,7 +1065,8 @@ Buffer.prototype.writeDoubleBE = function writeDoubleBE(val, offset, noAssert) {
   val = +val;
   offset = offset >>> 0;
   if (!noAssert)
-    checkFloat(this, val, offset, 8);
-  binding.writeDoubleBE(this, val, offset);
+    binding.writeDoubleBE(this, val, offset);
+  else
+    binding.writeDoubleBE(this, val, offset, true);
   return offset + 8;
 };
diff --git a/src/node_buffer.cc b/src/node_buffer.cc
index b508c48c4742e4..8b850700792a5b 100644
--- a/src/node_buffer.cc
+++ b/src/node_buffer.cc
@@ -730,15 +730,37 @@ void ReadDoubleBE(const FunctionCallbackInfo<Value>& args) {
 
 
 template <typename T, enum Endianness endianness>
-uint32_t WriteFloatGeneric(const FunctionCallbackInfo<Value>& args) {
-  SPREAD_ARG(args[0], ts_obj);
+void WriteFloatGeneric(const FunctionCallbackInfo<Value>& args) {
+  Environment* env = Environment::GetCurrent(args);
+
+  bool should_assert = args.Length() < 4;
+
+  if (should_assert) {
+    THROW_AND_RETURN_UNLESS_BUFFER(env, args[0]);
+  }
+
+  Local<Uint8Array> ts_obj = args[0].As<Uint8Array>();
+  ArrayBuffer::Contents ts_obj_c = ts_obj->Buffer()->GetContents();
+  const size_t ts_obj_offset = ts_obj->ByteOffset();
+  const size_t ts_obj_length = ts_obj->ByteLength();
+  char* const ts_obj_data =
+      static_cast<char*>(ts_obj_c.Data()) + ts_obj_offset;
+  if (ts_obj_length > 0)
+    CHECK_NE(ts_obj_data, nullptr);
+
+  T val = args[1]->NumberValue(env->context()).FromMaybe(0);
+  size_t offset = args[2]->IntegerValue(env->context()).FromMaybe(0);
 
-  T val = args[1]->NumberValue();
-  uint32_t offset = args[2]->Uint32Value();
   size_t memcpy_num = sizeof(T);
   if (offset + sizeof(T) > ts_obj_length)
     memcpy_num = ts_obj_length - offset;
 
+  if (should_assert) {
+    CHECK_NOT_OOB(offset + memcpy_num >= memcpy_num);
+    CHECK_NOT_OOB(offset + memcpy_num <= ts_obj_length);
+  }
+  CHECK_LE(offset + memcpy_num, ts_obj_length);
+
   union NoAlias {
     T val;
     char bytes[sizeof(T)];
@@ -749,31 +771,26 @@ uint32_t WriteFloatGeneric(const FunctionCallbackInfo<Value>& args) {
   if (endianness != GetEndianness())
     Swizzle(na.bytes, sizeof(na.bytes));
   memcpy(ptr, na.bytes, memcpy_num);
-  return offset + memcpy_num;
 }
 
 
 void WriteFloatLE(const FunctionCallbackInfo<Value>& args) {
-  THROW_AND_RETURN_UNLESS_BUFFER(Environment::GetCurrent(args), args[0]);
-  args.GetReturnValue().Set(WriteFloatGeneric<float, kLittleEndian>(args));
+  WriteFloatGeneric<float, kLittleEndian>(args);
 }
 
 
 void WriteFloatBE(const FunctionCallbackInfo<Value>& args) {
-  THROW_AND_RETURN_UNLESS_BUFFER(Environment::GetCurrent(args), args[0]);
-  args.GetReturnValue().Set(WriteFloatGeneric<float, kBigEndian>(args));
+  WriteFloatGeneric<float, kBigEndian>(args);
 }
 
 
 void WriteDoubleLE(const FunctionCallbackInfo<Value>& args) {
-  THROW_AND_RETURN_UNLESS_BUFFER(Environment::GetCurrent(args), args[0]);
-  args.GetReturnValue().Set(WriteFloatGeneric<double, kLittleEndian>(args));
+  WriteFloatGeneric<double, kLittleEndian>(args);
 }
 
 
 void WriteDoubleBE(const FunctionCallbackInfo<Value>& args) {
-  THROW_AND_RETURN_UNLESS_BUFFER(Environment::GetCurrent(args), args[0]);
-  args.GetReturnValue().Set(WriteFloatGeneric<double, kBigEndian>(args));
+  WriteFloatGeneric<double, kBigEndian>(args);
 }
 
 

From 26eeae801662a521f68e9dcad65060a9080d064b Mon Sep 17 00:00:00 2001
From: Alexander Gromnitsky <alexander.gromnitsky@gmail.com>
Date: Fri, 20 Nov 2015 21:28:11 +0200
Subject: [PATCH 238/323] doc: fix broken references
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/3944
Reviewed-By: targos - Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: Myles Borins <mborins@us.ibm.com>
---
 doc/api/cluster.markdown | 2 +-
 doc/api/errors.markdown  | 2 +-
 doc/api/tls.markdown     | 2 +-
 doc/api/zlib.markdown    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/api/cluster.markdown b/doc/api/cluster.markdown
index 7b9887b7d9a250..702ef4ede79b3a 100644
--- a/doc/api/cluster.markdown
+++ b/doc/api/cluster.markdown
@@ -650,4 +650,4 @@ the worker's unique id is the easiest way to find the worker.
 [Child Process module]: child_process.html#child_process_child_process_fork_modulepath_args_options
 [ChildProcess.send()]: child_process.html#child_process_child_send_message_sendhandle_callback
 [child_process event: 'exit']: child_process.html#child_process_event_exit
-[child_process event: 'message']: child_process.html#child_process_event_message.
+[child_process event: 'message']: child_process.html#child_process_event_message
diff --git a/doc/api/errors.markdown b/doc/api/errors.markdown
index 10f04e1ddbbd1a..ccadbc484053d3 100644
--- a/doc/api/errors.markdown
+++ b/doc/api/errors.markdown
@@ -469,7 +469,7 @@ often a sign that a connected socket was not `.end()`'d appropriately.
 
 [Error]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error
 [below]: #errors_error_propagation_and_interception
-[fs.readFileSync]: fs.html#fs_fs_readfilesync_filename_options
+[fs.readFileSync]: fs.html#fs_fs_readfilesync_file_options
 [stream-based]: stream.html
 [event emitter-based]: events.html#events_class_events_eventemitter
 [domains]: domain.html
diff --git a/doc/api/tls.markdown b/doc/api/tls.markdown
index f9d6faedf80ebf..e6c115112d5e4e 100644
--- a/doc/api/tls.markdown
+++ b/doc/api/tls.markdown
@@ -920,7 +920,7 @@ Example:
 [BEAST attacks]: http://blog.ivanristic.com/2011/10/mitigating-the-beast-attack-on-tls.html
 [crypto.getCurves()]: crypto.html#crypto_crypto_getcurves
 [tls.createServer]: #tls_tls_createserver_options_secureconnectionlistener
-[tls.createSecurePair]: #tls_tls_createsecurepair_context_isserver_requestcert_rejectunauthorized
+[tls.createSecurePair]: #tls_tls_createsecurepair_context_isserver_requestcert_rejectunauthorized_options
 [tls.TLSSocket]: #tls_class_tls_tlssocket
 [net.Server]: net.html#net_class_net_server
 [net.Socket]: net.html#net_class_net_socket
diff --git a/doc/api/zlib.markdown b/doc/api/zlib.markdown
index 8c3254dc3780f8..8d4d7e87e3918f 100644
--- a/doc/api/zlib.markdown
+++ b/doc/api/zlib.markdown
@@ -360,7 +360,7 @@ Decompress a raw Buffer with Unzip.
 [content-encoding]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11
 [Memory Usage Tuning]: #zlib_memory_usage_tuning
 [zlib documentation]: http://zlib.net/manual.html#Constants
-[options]: #zlib_options
+[options]: #zlib_class_options
 [Deflate]: #zlib_class_zlib_deflate
 [DeflateRaw]: #zlib_class_zlib_deflateraw
 [Gunzip]: #zlib_class_zlib_gunzip

From 13834caa28a2e41e5831282e71b12f4711305fbf Mon Sep 17 00:00:00 2001
From: Tristian Flanagan <tflanagan@datacollaborative.com>
Date: Mon, 14 Sep 2015 18:26:59 -0400
Subject: [PATCH 239/323] module: fix column offsets in errors

Because Node modules are wrapped, errors on the first line
of a file leak the wrapper to the user and report the wrong
column number. This commit adds a line break to the module
wrapper so that the first line is treated the same as all
other lines. To compensate for the additional line, a line
offset of -1 is also applied to errors.

Fixes: https://github.com/nodejs/node/issues/2860
PR-URL: https://github.com/nodejs/node/pull/2867
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 doc/api/vm.markdown                           | 20 +++++++++-
 lib/module.js                                 |  4 +-
 src/node.js                                   |  2 +-
 src/node_contextify.cc                        | 37 ++++++++++++++++++-
 test/fixtures/test-error-first-line-offset.js |  1 +
 test/parallel/test-vm-context.js              | 12 ++++++
 test/sequential/test-module-loading.js        |  8 ++++
 7 files changed, 78 insertions(+), 6 deletions(-)
 create mode 100644 test/fixtures/test-error-first-line-offset.js

diff --git a/doc/api/vm.markdown b/doc/api/vm.markdown
index 870a9551215abf..10c8cbc4ce4fd2 100644
--- a/doc/api/vm.markdown
+++ b/doc/api/vm.markdown
@@ -26,10 +26,16 @@ The options when creating a script are:
 
 - `filename`: allows you to control the filename that shows up in any stack
   traces produced from this script.
+- `lineOffset`: allows you to add an offset to the line number that is
+  displayed in stack traces
+- `columnOffset`: allows you to add an offset to the column number that is
+  displayed in stack traces
 - `displayErrors`: whether or not to print any errors to stderr, with the
   line of code that caused them highlighted, before throwing an exception.
   Applies only to syntax errors compiling the code; errors while running the
   code are controlled by the options to the script's methods.
+- `timeout`: a number of milliseconds to execute `code` before terminating
+  execution. If execution is terminated, an `Error` will be thrown.
 
 ### script.runInContext(contextifiedSandbox[, options])
 
@@ -124,8 +130,14 @@ multiple times:
 
 The options for running a script are:
 
-- `displayErrors`: whether or not to print any runtime errors to stderr, with
-  the line of code that caused them highlighted, before throwing an exception.
+- `filename`: allows you to control the filename that shows up in any stack
+  traces produced.
+- `lineOffset`: allows you to add an offset to the line number that is
+  displayed in stack traces
+- `columnOffset`: allows you to add an offset to the column number that is
+  displayed in stack traces
+- `displayErrors`: whether or not to print any errors to stderr, with the
+  line of code that caused them highlighted, before throwing an exception.
   Applies only to runtime errors executing the code; it is impossible to create
   a `Script` instance with syntax errors, as the constructor will throw.
 - `timeout`: a number of milliseconds to execute the script before terminating
@@ -252,6 +264,10 @@ e.g. `(0,eval)('code')`. However, it also has the following additional options:
 
 - `filename`: allows you to control the filename that shows up in any stack
   traces produced.
+- `lineOffset`: allows you to add an offset to the line number that is
+  displayed in stack traces
+- `columnOffset`: allows you to add an offset to the column number that is
+  displayed in stack traces
 - `displayErrors`: whether or not to print any errors to stderr, with the
   line of code that caused them highlighted, before throwing an exception.
   Will capture both syntax errors from compiling `code` and runtime errors
diff --git a/lib/module.js b/lib/module.js
index 507ca83c1bca17..8b9b59551ece76 100644
--- a/lib/module.js
+++ b/lib/module.js
@@ -47,7 +47,6 @@ Module.wrapper = NativeModule.wrapper;
 Module.wrap = NativeModule.wrap;
 Module._debug = util.debuglog('module');
 
-
 // We use this alias for the preprocessor that filters it out
 const debug = Module._debug;
 
@@ -401,7 +400,8 @@ Module.prototype._compile = function(content, filename) {
   // create wrapper function
   var wrapper = Module.wrap(content);
 
-  var compiledWrapper = runInThisContext(wrapper, { filename: filename });
+  var compiledWrapper = runInThisContext(wrapper,
+                                      { filename: filename, lineOffset: -1 });
   if (global.v8debug) {
     if (!resolvedArgv) {
       // we enter the repl if we're not given a filename argument.
diff --git a/src/node.js b/src/node.js
index 57a803cfc44312..ca1312bb4b7c8d 100644
--- a/src/node.js
+++ b/src/node.js
@@ -953,7 +953,7 @@
   };
 
   NativeModule.wrapper = [
-    '(function (exports, require, module, __filename, __dirname) { ',
+    '(function (exports, require, module, __filename, __dirname) {\n',
     '\n});'
   ];
 
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
index df328f265ebf6e..6675e2d8a08f70 100644
--- a/src/node_contextify.cc
+++ b/src/node_contextify.cc
@@ -504,13 +504,15 @@ class ContextifyScript : public BaseObject {
     TryCatch try_catch;
     Local<String> code = args[0]->ToString(env->isolate());
     Local<String> filename = GetFilenameArg(args, 1);
+    Local<Integer> lineOffset = GetLineOffsetArg(args, 1);
+    Local<Integer> columnOffset = GetColumnOffsetArg(args, 1);
     bool display_errors = GetDisplayErrorsArg(args, 1);
     if (try_catch.HasCaught()) {
       try_catch.ReThrow();
       return;
     }
 
-    ScriptOrigin origin(filename);
+    ScriptOrigin origin(filename, lineOffset, columnOffset);
     ScriptCompiler::Source source(code, origin);
     Local<UnboundScript> v8_script =
         ScriptCompiler::CompileUnbound(env->isolate(), &source);
@@ -675,6 +677,39 @@ class ContextifyScript : public BaseObject {
   }
 
 
+  static Local<Integer> GetLineOffsetArg(
+                                      const FunctionCallbackInfo<Value>& args,
+                                      const int i) {
+    Local<Integer> defaultLineOffset = Integer::New(args.GetIsolate(), 0);
+
+    if (!args[i]->IsObject()) {
+      return defaultLineOffset;
+    }
+
+    Local<String> key = FIXED_ONE_BYTE_STRING(args.GetIsolate(), "lineOffset");
+    Local<Value> value = args[i].As<Object>()->Get(key);
+
+    return value->IsUndefined() ? defaultLineOffset : value->ToInteger();
+  }
+
+
+  static Local<Integer> GetColumnOffsetArg(
+                                      const FunctionCallbackInfo<Value>& args,
+                                      const int i) {
+    Local<Integer> defaultColumnOffset = Integer::New(args.GetIsolate(), 0);
+
+    if (!args[i]->IsObject()) {
+      return defaultColumnOffset;
+    }
+
+    Local<String> key = FIXED_ONE_BYTE_STRING(args.GetIsolate(),
+                                              "columnOffset");
+    Local<Value> value = args[i].As<Object>()->Get(key);
+
+    return value->IsUndefined() ? defaultColumnOffset : value->ToInteger();
+  }
+
+
   static bool EvalMachine(Environment* env,
                           const int64_t timeout,
                           const bool display_errors,
diff --git a/test/fixtures/test-error-first-line-offset.js b/test/fixtures/test-error-first-line-offset.js
new file mode 100644
index 00000000000000..9aeeab047d22c3
--- /dev/null
+++ b/test/fixtures/test-error-first-line-offset.js
@@ -0,0 +1 @@
+error
diff --git a/test/parallel/test-vm-context.js b/test/parallel/test-vm-context.js
index 45e19e6638892e..e1cd2ef01e5176 100644
--- a/test/parallel/test-vm-context.js
+++ b/test/parallel/test-vm-context.js
@@ -60,3 +60,15 @@ var ctx = {};
 Object.defineProperty(ctx, 'b', { configurable: false });
 ctx = vm.createContext(ctx);
 assert.equal(script.runInContext(ctx), false);
+
+// Error on the first line of a module should
+// have the correct line and column number
+assert.throws(function() {
+  vm.runInContext('throw new Error()', context, {
+    filename: 'expected-filename.js',
+    lineOffset: 32,
+    columnOffset: 123
+  });
+}, function(err) {
+  return /expected-filename.js:33:130/.test(err.stack);
+}, 'Expected appearance of proper offset in Error stack');
diff --git a/test/sequential/test-module-loading.js b/test/sequential/test-module-loading.js
index d53de512f2510a..a8696f84cd2ce9 100644
--- a/test/sequential/test-module-loading.js
+++ b/test/sequential/test-module-loading.js
@@ -279,3 +279,11 @@ process.on('exit', function() {
 // #1440 Loading files with a byte order marker.
 assert.equal(42, require('../fixtures/utf8-bom.js'));
 assert.equal(42, require('../fixtures/utf8-bom.json'));
+
+// Error on the first line of a module should
+// have the correct line and column number
+assert.throws(function() {
+  require('../fixtures/test-error-first-line-offset.js');
+}, function(err) {
+  return /test-error-first-line-offset.js:1:1/.test(err.stack);
+}, 'Expected appearance of proper offset in Error stack');

From 12754c5dc366843566768a93ff78c0f8e42cc514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Sch=C3=A4r?= <jscissr@gmail.com>
Date: Fri, 20 Nov 2015 20:23:25 +0100
Subject: [PATCH 240/323] net: small code cleanup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`options` is already a param of the function.

PR-URL: https://github.com/nodejs/node/pull/3943
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 lib/net.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/net.js b/lib/net.js
index a7a8eb1fcc21a7..d7f3eae03914fc 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -1077,7 +1077,6 @@ function Server(options, connectionListener) {
   EventEmitter.call(this);
 
   var self = this;
-  var options;
 
   if (typeof options === 'function') {
     connectionListener = options;

From d7a7d3e6f75c26aeb287cfeb0d3c1193e583b616 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Sat, 21 Nov 2015 12:43:57 +0100
Subject: [PATCH 241/323] tools: update certdata.txt

This is the latest certdata.txt from [0], last updated on 2015-11-13.

[0] https://hg.mozilla.org/mozilla-central/raw-file/64df3815df9c/security/nss/lib/ckfw/builtins/certdata.txt

PR-URL: https://github.com/nodejs/node/pull/3951
Reviewed-By: Fedor Indutny <fedor@indutny.com>
---
 tools/certdata.txt | 3133 +++++++++++++-------------------------------
 1 file changed, 947 insertions(+), 2186 deletions(-)

diff --git a/tools/certdata.txt b/tools/certdata.txt
index d3209db50f0a2d..d6d4b4fbb7ec8f 100644
--- a/tools/certdata.txt
+++ b/tools/certdata.txt
@@ -187,9 +187,9 @@ END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
 \002\004\065\336\364\317
 END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 # Distrust "Distrust a pb.com certificate that does not comply with the baseline requirements."
@@ -220,252 +220,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "Digital Signature Trust Co. Global CA 1"
-#
-# Issuer: OU=DSTCA E1,O=Digital Signature Trust Co.,C=US
-# Serial Number: 913315222 (0x36701596)
-# Subject: OU=DSTCA E1,O=Digital Signature Trust Co.,C=US
-# Not Valid Before: Thu Dec 10 18:10:23 1998
-# Not Valid After : Mon Dec 10 18:40:23 2018
-# Fingerprint (MD5): 25:7A:BA:83:2E:B6:A2:0B:DA:FE:F5:02:0F:08:D7:AD
-# Fingerprint (SHA1): 81:96:8B:3A:EF:1C:DC:70:F5:FA:32:69:C2:92:A3:63:5B:D1:23:D3
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Digital Signature Trust Co. Global CA 1"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\106\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\044\060\042\006\003\125\004\012\023\033\104\151\147\151\164\141
-\154\040\123\151\147\156\141\164\165\162\145\040\124\162\165\163
-\164\040\103\157\056\061\021\060\017\006\003\125\004\013\023\010
-\104\123\124\103\101\040\105\061
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\106\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\044\060\042\006\003\125\004\012\023\033\104\151\147\151\164\141
-\154\040\123\151\147\156\141\164\165\162\145\040\124\162\165\163
-\164\040\103\157\056\061\021\060\017\006\003\125\004\013\023\010
-\104\123\124\103\101\040\105\061
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\004\066\160\025\226
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\051\060\202\002\222\240\003\002\001\002\002\004\066
-\160\025\226\060\015\006\011\052\206\110\206\367\015\001\001\005
-\005\000\060\106\061\013\060\011\006\003\125\004\006\023\002\125
-\123\061\044\060\042\006\003\125\004\012\023\033\104\151\147\151
-\164\141\154\040\123\151\147\156\141\164\165\162\145\040\124\162
-\165\163\164\040\103\157\056\061\021\060\017\006\003\125\004\013
-\023\010\104\123\124\103\101\040\105\061\060\036\027\015\071\070
-\061\062\061\060\061\070\061\060\062\063\132\027\015\061\070\061
-\062\061\060\061\070\064\060\062\063\132\060\106\061\013\060\011
-\006\003\125\004\006\023\002\125\123\061\044\060\042\006\003\125
-\004\012\023\033\104\151\147\151\164\141\154\040\123\151\147\156
-\141\164\165\162\145\040\124\162\165\163\164\040\103\157\056\061
-\021\060\017\006\003\125\004\013\023\010\104\123\124\103\101\040
-\105\061\060\201\235\060\015\006\011\052\206\110\206\367\015\001
-\001\001\005\000\003\201\213\000\060\201\207\002\201\201\000\240
-\154\201\251\317\064\036\044\335\376\206\050\314\336\203\057\371
-\136\324\102\322\350\164\140\146\023\230\006\034\251\121\022\151
-\157\061\125\271\111\162\000\010\176\323\245\142\104\067\044\231
-\217\331\203\110\217\231\155\225\023\273\103\073\056\111\116\210
-\067\301\273\130\177\376\341\275\370\273\141\315\363\107\300\231
-\246\361\363\221\350\170\174\000\313\141\311\104\047\161\151\125
-\112\176\111\115\355\242\243\276\002\114\000\312\002\250\356\001
-\002\061\144\017\122\055\023\164\166\066\265\172\264\055\161\002
-\001\003\243\202\001\044\060\202\001\040\060\021\006\011\140\206
-\110\001\206\370\102\001\001\004\004\003\002\000\007\060\150\006
-\003\125\035\037\004\141\060\137\060\135\240\133\240\131\244\127
-\060\125\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\044\060\042\006\003\125\004\012\023\033\104\151\147\151\164\141
-\154\040\123\151\147\156\141\164\165\162\145\040\124\162\165\163
-\164\040\103\157\056\061\021\060\017\006\003\125\004\013\023\010
-\104\123\124\103\101\040\105\061\061\015\060\013\006\003\125\004
-\003\023\004\103\122\114\061\060\053\006\003\125\035\020\004\044
-\060\042\200\017\061\071\071\070\061\062\061\060\061\070\061\060
-\062\063\132\201\017\062\060\061\070\061\062\061\060\061\070\061
-\060\062\063\132\060\013\006\003\125\035\017\004\004\003\002\001
-\006\060\037\006\003\125\035\043\004\030\060\026\200\024\152\171
-\176\221\151\106\030\023\012\002\167\245\131\133\140\230\045\016
-\242\370\060\035\006\003\125\035\016\004\026\004\024\152\171\176
-\221\151\106\030\023\012\002\167\245\131\133\140\230\045\016\242
-\370\060\014\006\003\125\035\023\004\005\060\003\001\001\377\060
-\031\006\011\052\206\110\206\366\175\007\101\000\004\014\060\012
-\033\004\126\064\056\060\003\002\004\220\060\015\006\011\052\206
-\110\206\367\015\001\001\005\005\000\003\201\201\000\042\022\330
-\172\035\334\201\006\266\011\145\262\207\310\037\136\264\057\351
-\304\036\362\074\301\273\004\220\021\112\203\116\176\223\271\115
-\102\307\222\046\240\134\064\232\070\162\370\375\153\026\076\040
-\356\202\213\061\052\223\066\205\043\210\212\074\003\150\323\311
-\011\017\115\374\154\244\332\050\162\223\016\211\200\260\175\376
-\200\157\145\155\030\063\227\213\302\153\211\356\140\075\310\233
-\357\177\053\062\142\163\223\313\074\343\173\342\166\170\105\274
-\241\223\004\273\206\237\072\133\103\172\303\212\145
-END
-
-# Trust for Certificate "Digital Signature Trust Co. Global CA 1"
-# Issuer: OU=DSTCA E1,O=Digital Signature Trust Co.,C=US
-# Serial Number: 913315222 (0x36701596)
-# Subject: OU=DSTCA E1,O=Digital Signature Trust Co.,C=US
-# Not Valid Before: Thu Dec 10 18:10:23 1998
-# Not Valid After : Mon Dec 10 18:40:23 2018
-# Fingerprint (MD5): 25:7A:BA:83:2E:B6:A2:0B:DA:FE:F5:02:0F:08:D7:AD
-# Fingerprint (SHA1): 81:96:8B:3A:EF:1C:DC:70:F5:FA:32:69:C2:92:A3:63:5B:D1:23:D3
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Digital Signature Trust Co. Global CA 1"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\201\226\213\072\357\034\334\160\365\372\062\151\302\222\243\143
-\133\321\043\323
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\045\172\272\203\056\266\242\013\332\376\365\002\017\010\327\255
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\106\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\044\060\042\006\003\125\004\012\023\033\104\151\147\151\164\141
-\154\040\123\151\147\156\141\164\165\162\145\040\124\162\165\163
-\164\040\103\157\056\061\021\060\017\006\003\125\004\013\023\010
-\104\123\124\103\101\040\105\061
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\004\066\160\025\226
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Digital Signature Trust Co. Global CA 3"
-#
-# Issuer: OU=DSTCA E2,O=Digital Signature Trust Co.,C=US
-# Serial Number: 913232846 (0x366ed3ce)
-# Subject: OU=DSTCA E2,O=Digital Signature Trust Co.,C=US
-# Not Valid Before: Wed Dec 09 19:17:26 1998
-# Not Valid After : Sun Dec 09 19:47:26 2018
-# Fingerprint (MD5): 93:C2:8E:11:7B:D4:F3:03:19:BD:28:75:13:4A:45:4A
-# Fingerprint (SHA1): AB:48:F3:33:DB:04:AB:B9:C0:72:DA:5B:0C:C1:D0:57:F0:36:9B:46
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Digital Signature Trust Co. Global CA 3"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\106\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\044\060\042\006\003\125\004\012\023\033\104\151\147\151\164\141
-\154\040\123\151\147\156\141\164\165\162\145\040\124\162\165\163
-\164\040\103\157\056\061\021\060\017\006\003\125\004\013\023\010
-\104\123\124\103\101\040\105\062
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\106\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\044\060\042\006\003\125\004\012\023\033\104\151\147\151\164\141
-\154\040\123\151\147\156\141\164\165\162\145\040\124\162\165\163
-\164\040\103\157\056\061\021\060\017\006\003\125\004\013\023\010
-\104\123\124\103\101\040\105\062
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\004\066\156\323\316
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\051\060\202\002\222\240\003\002\001\002\002\004\066
-\156\323\316\060\015\006\011\052\206\110\206\367\015\001\001\005
-\005\000\060\106\061\013\060\011\006\003\125\004\006\023\002\125
-\123\061\044\060\042\006\003\125\004\012\023\033\104\151\147\151
-\164\141\154\040\123\151\147\156\141\164\165\162\145\040\124\162
-\165\163\164\040\103\157\056\061\021\060\017\006\003\125\004\013
-\023\010\104\123\124\103\101\040\105\062\060\036\027\015\071\070
-\061\062\060\071\061\071\061\067\062\066\132\027\015\061\070\061
-\062\060\071\061\071\064\067\062\066\132\060\106\061\013\060\011
-\006\003\125\004\006\023\002\125\123\061\044\060\042\006\003\125
-\004\012\023\033\104\151\147\151\164\141\154\040\123\151\147\156
-\141\164\165\162\145\040\124\162\165\163\164\040\103\157\056\061
-\021\060\017\006\003\125\004\013\023\010\104\123\124\103\101\040
-\105\062\060\201\235\060\015\006\011\052\206\110\206\367\015\001
-\001\001\005\000\003\201\213\000\060\201\207\002\201\201\000\277
-\223\217\027\222\357\063\023\030\353\020\177\116\026\277\377\006
-\217\052\205\274\136\371\044\246\044\210\266\003\267\301\303\137
-\003\133\321\157\256\176\102\352\146\043\270\143\203\126\373\050
-\055\341\070\213\264\356\250\001\341\316\034\266\210\052\042\106
-\205\373\237\247\160\251\107\024\077\316\336\145\360\250\161\367
-\117\046\154\214\274\306\265\357\336\111\047\377\110\052\175\350
-\115\003\314\307\262\122\306\027\061\023\073\265\115\333\310\304
-\366\303\017\044\052\332\014\235\347\221\133\200\315\224\235\002
-\001\003\243\202\001\044\060\202\001\040\060\021\006\011\140\206
-\110\001\206\370\102\001\001\004\004\003\002\000\007\060\150\006
-\003\125\035\037\004\141\060\137\060\135\240\133\240\131\244\127
-\060\125\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\044\060\042\006\003\125\004\012\023\033\104\151\147\151\164\141
-\154\040\123\151\147\156\141\164\165\162\145\040\124\162\165\163
-\164\040\103\157\056\061\021\060\017\006\003\125\004\013\023\010
-\104\123\124\103\101\040\105\062\061\015\060\013\006\003\125\004
-\003\023\004\103\122\114\061\060\053\006\003\125\035\020\004\044
-\060\042\200\017\061\071\071\070\061\062\060\071\061\071\061\067
-\062\066\132\201\017\062\060\061\070\061\062\060\071\061\071\061
-\067\062\066\132\060\013\006\003\125\035\017\004\004\003\002\001
-\006\060\037\006\003\125\035\043\004\030\060\026\200\024\036\202
-\115\050\145\200\074\311\101\156\254\065\056\132\313\336\356\370
-\071\133\060\035\006\003\125\035\016\004\026\004\024\036\202\115
-\050\145\200\074\311\101\156\254\065\056\132\313\336\356\370\071
-\133\060\014\006\003\125\035\023\004\005\060\003\001\001\377\060
-\031\006\011\052\206\110\206\366\175\007\101\000\004\014\060\012
-\033\004\126\064\056\060\003\002\004\220\060\015\006\011\052\206
-\110\206\367\015\001\001\005\005\000\003\201\201\000\107\215\203
-\255\142\362\333\260\236\105\042\005\271\242\326\003\016\070\162
-\347\236\374\173\346\223\266\232\245\242\224\310\064\035\221\321
-\305\327\364\012\045\017\075\170\201\236\017\261\147\304\220\114
-\143\335\136\247\342\272\237\365\367\115\245\061\173\234\051\055
-\114\376\144\076\354\266\123\376\352\233\355\202\333\164\165\113
-\007\171\156\036\330\031\203\163\336\365\076\320\265\336\347\113
-\150\175\103\056\052\040\341\176\240\170\104\236\010\365\230\371
-\307\177\033\033\326\006\040\002\130\241\303\242\003
-END
-
-# Trust for Certificate "Digital Signature Trust Co. Global CA 3"
-# Issuer: OU=DSTCA E2,O=Digital Signature Trust Co.,C=US
-# Serial Number: 913232846 (0x366ed3ce)
-# Subject: OU=DSTCA E2,O=Digital Signature Trust Co.,C=US
-# Not Valid Before: Wed Dec 09 19:17:26 1998
-# Not Valid After : Sun Dec 09 19:47:26 2018
-# Fingerprint (MD5): 93:C2:8E:11:7B:D4:F3:03:19:BD:28:75:13:4A:45:4A
-# Fingerprint (SHA1): AB:48:F3:33:DB:04:AB:B9:C0:72:DA:5B:0C:C1:D0:57:F0:36:9B:46
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Digital Signature Trust Co. Global CA 3"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\253\110\363\063\333\004\253\271\300\162\332\133\014\301\320\127
-\360\066\233\106
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\223\302\216\021\173\324\363\003\031\275\050\165\023\112\105\112
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\106\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\044\060\042\006\003\125\004\012\023\033\104\151\147\151\164\141
-\154\040\123\151\147\156\141\164\165\162\145\040\124\162\165\163
-\164\040\103\157\056\061\021\060\017\006\003\125\004\013\023\010
-\104\123\124\103\101\040\105\062
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\004\066\156\323\316
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "Verisign Class 3 Public Primary Certification Authority"
 #
@@ -1890,170 +1644,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "Verisign Class 4 Public Primary Certification Authority - G3"
-#
-# Issuer: CN=VeriSign Class 4 Public Primary Certification Authority - G3,OU="(c) 1999 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US
-# Serial Number:00:ec:a0:a7:8b:6e:75:6a:01:cf:c4:7c:cc:2f:94:5e:d7
-# Subject: CN=VeriSign Class 4 Public Primary Certification Authority - G3,OU="(c) 1999 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US
-# Not Valid Before: Fri Oct 01 00:00:00 1999
-# Not Valid After : Wed Jul 16 23:59:59 2036
-# Fingerprint (MD5): DB:C8:F2:27:2E:B1:EA:6A:29:23:5D:FE:56:3E:33:DF
-# Fingerprint (SHA1): C8:EC:8C:87:92:69:CB:4B:AB:39:E9:8D:7E:57:67:F3:14:95:73:9D
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Verisign Class 4 Public Primary Certification Authority - G3"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123
-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125
-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165
-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003
-\125\004\013\023\061\050\143\051\040\061\071\071\071\040\126\145
-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106
-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163
-\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023
-\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040
-\064\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\040\055\040\107\063
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123
-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125
-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165
-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003
-\125\004\013\023\061\050\143\051\040\061\071\071\071\040\126\145
-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106
-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163
-\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023
-\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040
-\064\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\040\055\040\107\063
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\021\000\354\240\247\213\156\165\152\001\317\304\174\314\057
-\224\136\327
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\004\032\060\202\003\002\002\021\000\354\240\247\213\156
-\165\152\001\317\304\174\314\057\224\136\327\060\015\006\011\052
-\206\110\206\367\015\001\001\005\005\000\060\201\312\061\013\060
-\011\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003
-\125\004\012\023\016\126\145\162\151\123\151\147\156\054\040\111
-\156\143\056\061\037\060\035\006\003\125\004\013\023\026\126\145
-\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145\164
-\167\157\162\153\061\072\060\070\006\003\125\004\013\023\061\050
-\143\051\040\061\071\071\071\040\126\145\162\151\123\151\147\156
-\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165\164
-\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154\171
-\061\105\060\103\006\003\125\004\003\023\074\126\145\162\151\123
-\151\147\156\040\103\154\141\163\163\040\064\040\120\165\142\154
-\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151
-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
-\164\171\040\055\040\107\063\060\036\027\015\071\071\061\060\060
-\061\060\060\060\060\060\060\132\027\015\063\066\060\067\061\066
-\062\063\065\071\065\071\132\060\201\312\061\013\060\011\006\003
-\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004\012
-\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143\056
-\061\037\060\035\006\003\125\004\013\023\026\126\145\162\151\123
-\151\147\156\040\124\162\165\163\164\040\116\145\164\167\157\162
-\153\061\072\060\070\006\003\125\004\013\023\061\050\143\051\040
-\061\071\071\071\040\126\145\162\151\123\151\147\156\054\040\111
-\156\143\056\040\055\040\106\157\162\040\141\165\164\150\157\162
-\151\172\145\144\040\165\163\145\040\157\156\154\171\061\105\060
-\103\006\003\125\004\003\023\074\126\145\162\151\123\151\147\156
-\040\103\154\141\163\163\040\064\040\120\165\142\154\151\143\040
-\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151\143
-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040
-\055\040\107\063\060\202\001\042\060\015\006\011\052\206\110\206
-\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012
-\002\202\001\001\000\255\313\245\021\151\306\131\253\361\217\265
-\031\017\126\316\314\265\037\040\344\236\046\045\113\340\163\145
-\211\131\336\320\203\344\365\017\265\273\255\361\174\350\041\374
-\344\350\014\356\174\105\042\031\166\222\264\023\267\040\133\011
-\372\141\256\250\362\245\215\205\302\052\326\336\146\066\322\233
-\002\364\250\222\140\174\234\151\264\217\044\036\320\206\122\366
-\062\234\101\130\036\042\275\315\105\142\225\010\156\320\146\335
-\123\242\314\360\020\334\124\163\213\004\241\106\063\063\134\027
-\100\271\236\115\323\363\276\125\203\350\261\211\216\132\174\232
-\226\042\220\073\210\045\362\322\123\210\002\014\013\170\362\346
-\067\027\113\060\106\007\344\200\155\246\330\226\056\350\054\370
-\021\263\070\015\146\246\233\352\311\043\133\333\216\342\363\023
-\216\032\131\055\252\002\360\354\244\207\146\334\301\077\365\330
-\271\364\354\202\306\322\075\225\035\345\300\117\204\311\331\243
-\104\050\006\152\327\105\254\360\153\152\357\116\137\370\021\202
-\036\070\143\064\146\120\324\076\223\163\372\060\303\146\255\377
-\223\055\227\357\003\002\003\001\000\001\060\015\006\011\052\206
-\110\206\367\015\001\001\005\005\000\003\202\001\001\000\217\372
-\045\153\117\133\344\244\116\047\125\253\042\025\131\074\312\265
-\012\324\112\333\253\335\241\137\123\305\240\127\071\302\316\107
-\053\276\072\310\126\277\302\331\047\020\072\261\005\074\300\167
-\061\273\072\323\005\173\155\232\034\060\214\200\313\223\223\052
-\203\253\005\121\202\002\000\021\147\153\363\210\141\107\137\003
-\223\325\133\015\340\361\324\241\062\065\205\262\072\333\260\202
-\253\321\313\012\274\117\214\133\305\113\000\073\037\052\202\246
-\176\066\205\334\176\074\147\000\265\344\073\122\340\250\353\135
-\025\371\306\155\360\255\035\016\205\267\251\232\163\024\132\133
-\217\101\050\300\325\350\055\115\244\136\315\252\331\355\316\334
-\330\325\074\102\035\027\301\022\135\105\070\303\070\363\374\205
-\056\203\106\110\262\327\040\137\222\066\217\347\171\017\230\136
-\231\350\360\320\244\273\365\123\275\052\316\131\260\257\156\177
-\154\273\322\036\000\260\041\355\370\101\142\202\271\330\262\304
-\273\106\120\363\061\305\217\001\250\164\353\365\170\047\332\347
-\367\146\103\363\236\203\076\040\252\303\065\140\221\316
-END
-
-# Trust for Certificate "Verisign Class 4 Public Primary Certification Authority - G3"
-# Issuer: CN=VeriSign Class 4 Public Primary Certification Authority - G3,OU="(c) 1999 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US
-# Serial Number:00:ec:a0:a7:8b:6e:75:6a:01:cf:c4:7c:cc:2f:94:5e:d7
-# Subject: CN=VeriSign Class 4 Public Primary Certification Authority - G3,OU="(c) 1999 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US
-# Not Valid Before: Fri Oct 01 00:00:00 1999
-# Not Valid After : Wed Jul 16 23:59:59 2036
-# Fingerprint (MD5): DB:C8:F2:27:2E:B1:EA:6A:29:23:5D:FE:56:3E:33:DF
-# Fingerprint (SHA1): C8:EC:8C:87:92:69:CB:4B:AB:39:E9:8D:7E:57:67:F3:14:95:73:9D
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Verisign Class 4 Public Primary Certification Authority - G3"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\310\354\214\207\222\151\313\113\253\071\351\215\176\127\147\363
-\024\225\163\235
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\333\310\362\047\056\261\352\152\051\043\135\376\126\076\063\337
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123
-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125
-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165
-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003
-\125\004\013\023\061\050\143\051\040\061\071\071\071\040\126\145
-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106
-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163
-\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023
-\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040
-\064\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\040\055\040\107\063
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\021\000\354\240\247\213\156\165\152\001\317\304\174\314\057
-\224\136\327
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "Entrust.net Premium 2048 Secure Server CA"
 #
@@ -4024,169 +3614,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "UTN-USER First-Network Applications"
-#
-# Issuer: CN=UTN-USERFirst-Network Applications,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US
-# Serial Number:44:be:0c:8b:50:00:24:b4:11:d3:36:30:4b:c0:33:77
-# Subject: CN=UTN-USERFirst-Network Applications,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US
-# Not Valid Before: Fri Jul 09 18:48:39 1999
-# Not Valid After : Tue Jul 09 18:57:49 2019
-# Fingerprint (MD5): BF:60:59:A3:5B:BA:F6:A7:76:42:DA:6F:1A:7B:50:CF
-# Fingerprint (SHA1): 5D:98:9C:DB:15:96:11:36:51:65:64:1B:56:0F:DB:EA:2A:C2:3E:F1
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "UTN-USER First-Network Applications"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\243\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\053\060\051\006\003\125
-\004\003\023\042\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\116\145\164\167\157\162\153\040\101\160\160\154\151\143
-\141\164\151\157\156\163
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\243\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\053\060\051\006\003\125
-\004\003\023\042\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\116\145\164\167\157\162\153\040\101\160\160\154\151\143
-\141\164\151\157\156\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\104\276\014\213\120\000\044\264\021\323\066\060\113\300
-\063\167
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\004\144\060\202\003\114\240\003\002\001\002\002\020\104
-\276\014\213\120\000\044\264\021\323\066\060\113\300\063\167\060
-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
-\243\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013
-\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006
-\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040
-\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124
-\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164
-\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150
-\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162
-\165\163\164\056\143\157\155\061\053\060\051\006\003\125\004\003
-\023\042\125\124\116\055\125\123\105\122\106\151\162\163\164\055
-\116\145\164\167\157\162\153\040\101\160\160\154\151\143\141\164
-\151\157\156\163\060\036\027\015\071\071\060\067\060\071\061\070
-\064\070\063\071\132\027\015\061\071\060\067\060\071\061\070\065
-\067\064\071\132\060\201\243\061\013\060\011\006\003\125\004\006
-\023\002\125\123\061\013\060\011\006\003\125\004\010\023\002\125
-\124\061\027\060\025\006\003\125\004\007\023\016\123\141\154\164
-\040\114\141\153\145\040\103\151\164\171\061\036\060\034\006\003
-\125\004\012\023\025\124\150\145\040\125\123\105\122\124\122\125
-\123\124\040\116\145\164\167\157\162\153\061\041\060\037\006\003
-\125\004\013\023\030\150\164\164\160\072\057\057\167\167\167\056
-\165\163\145\162\164\162\165\163\164\056\143\157\155\061\053\060
-\051\006\003\125\004\003\023\042\125\124\116\055\125\123\105\122
-\106\151\162\163\164\055\116\145\164\167\157\162\153\040\101\160
-\160\154\151\143\141\164\151\157\156\163\060\202\001\042\060\015
-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
-\017\000\060\202\001\012\002\202\001\001\000\263\373\221\241\344
-\066\125\205\254\006\064\133\240\232\130\262\370\265\017\005\167
-\203\256\062\261\166\222\150\354\043\112\311\166\077\343\234\266
-\067\171\003\271\253\151\215\007\045\266\031\147\344\260\033\030
-\163\141\112\350\176\315\323\057\144\343\246\174\014\372\027\200
-\243\015\107\211\117\121\161\057\356\374\077\371\270\026\200\207
-\211\223\045\040\232\103\202\151\044\166\050\131\065\241\035\300
-\177\203\006\144\026\040\054\323\111\244\205\264\300\141\177\121
-\010\370\150\025\221\200\313\245\325\356\073\072\364\204\004\136
-\140\131\247\214\064\162\356\270\170\305\321\073\022\112\157\176
-\145\047\271\244\125\305\271\157\103\244\305\035\054\231\300\122
-\244\170\114\025\263\100\230\010\153\103\306\001\260\172\173\365
-\153\034\042\077\313\357\377\250\320\072\113\166\025\236\322\321
-\306\056\343\333\127\033\062\242\270\157\350\206\246\077\160\253
-\345\160\222\253\104\036\100\120\373\234\243\142\344\154\156\240
-\310\336\342\200\102\372\351\057\350\316\062\004\217\174\215\267
-\034\243\065\074\025\335\236\303\256\227\245\002\003\001\000\001
-\243\201\221\060\201\216\060\013\006\003\125\035\017\004\004\003
-\002\001\306\060\017\006\003\125\035\023\001\001\377\004\005\060
-\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\372
-\206\311\333\340\272\351\170\365\113\250\326\025\337\360\323\341
-\152\024\074\060\117\006\003\125\035\037\004\110\060\106\060\104
-\240\102\240\100\206\076\150\164\164\160\072\057\057\143\162\154
-\056\165\163\145\162\164\162\165\163\164\056\143\157\155\057\125
-\124\116\055\125\123\105\122\106\151\162\163\164\055\116\145\164
-\167\157\162\153\101\160\160\154\151\143\141\164\151\157\156\163
-\056\143\162\154\060\015\006\011\052\206\110\206\367\015\001\001
-\005\005\000\003\202\001\001\000\244\363\045\314\321\324\221\203
-\042\320\314\062\253\233\226\116\064\221\124\040\045\064\141\137
-\052\002\025\341\213\252\377\175\144\121\317\012\377\274\175\330
-\041\152\170\313\057\121\157\370\102\035\063\275\353\265\173\224
-\303\303\251\240\055\337\321\051\037\035\376\217\077\273\250\105
-\052\177\321\156\125\044\342\273\002\373\061\077\276\350\274\354
-\100\053\370\001\324\126\070\344\312\104\202\265\141\040\041\147
-\145\366\360\013\347\064\370\245\302\234\243\134\100\037\205\223
-\225\006\336\117\324\047\251\266\245\374\026\315\163\061\077\270
-\145\047\317\324\123\032\360\254\156\237\117\005\014\003\201\247
-\204\051\304\132\275\144\127\162\255\073\317\067\030\246\230\306
-\255\006\264\334\010\243\004\325\051\244\226\232\022\147\112\214
-\140\105\235\361\043\232\260\000\234\150\265\230\120\323\357\216
-\056\222\145\261\110\076\041\276\025\060\052\015\265\014\243\153
-\077\256\177\127\365\037\226\174\337\157\335\202\060\054\145\033
-\100\112\315\150\271\162\354\161\166\354\124\216\037\205\014\001
-\152\372\246\070\254\037\304\204
-END
-
-# Trust for Certificate "UTN-USER First-Network Applications"
-# Issuer: CN=UTN-USERFirst-Network Applications,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US
-# Serial Number:44:be:0c:8b:50:00:24:b4:11:d3:36:30:4b:c0:33:77
-# Subject: CN=UTN-USERFirst-Network Applications,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US
-# Not Valid Before: Fri Jul 09 18:48:39 1999
-# Not Valid After : Tue Jul 09 18:57:49 2019
-# Fingerprint (MD5): BF:60:59:A3:5B:BA:F6:A7:76:42:DA:6F:1A:7B:50:CF
-# Fingerprint (SHA1): 5D:98:9C:DB:15:96:11:36:51:65:64:1B:56:0F:DB:EA:2A:C2:3E:F1
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "UTN-USER First-Network Applications"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\135\230\234\333\025\226\021\066\121\145\144\033\126\017\333\352
-\052\302\076\361
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\277\140\131\243\133\272\366\247\166\102\332\157\032\173\120\317
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\243\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\053\060\051\006\003\125
-\004\003\023\042\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\116\145\164\167\157\162\153\040\101\160\160\154\151\143
-\141\164\151\157\156\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\104\276\014\213\120\000\044\264\021\323\066\060\113\300
-\063\167
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "Visa eCommerce Root"
 #
@@ -5922,198 +5349,38 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "UTN DATACorp SGC Root CA"
+# Certificate "UTN USERFirst Email Root CA"
 #
-# Issuer: CN=UTN - DATACorp SGC,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US
-# Serial Number:44:be:0c:8b:50:00:21:b4:11:d3:2a:68:06:a9:ad:69
-# Subject: CN=UTN - DATACorp SGC,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US
-# Not Valid Before: Thu Jun 24 18:57:21 1999
-# Not Valid After : Mon Jun 24 19:06:30 2019
-# Fingerprint (MD5): B3:A5:3E:77:21:6D:AC:4A:C0:C9:FB:D5:41:3D:CA:06
-# Fingerprint (SHA1): 58:11:9F:0E:12:82:87:EA:50:FD:D9:87:45:6F:4F:78:DC:FA:D6:D4
+# Issuer: CN=UTN-USERFirst-Client Authentication and Email,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US
+# Serial Number:44:be:0c:8b:50:00:24:b4:11:d3:36:25:25:67:c9:89
+# Subject: CN=UTN-USERFirst-Client Authentication and Email,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US
+# Not Valid Before: Fri Jul 09 17:28:50 1999
+# Not Valid After : Tue Jul 09 17:36:58 2019
+# Fingerprint (MD5): D7:34:3D:EF:1D:27:09:28:E1:31:02:5B:13:2B:DD:F7
+# Fingerprint (SHA1): B1:72:B1:A5:6D:95:F9:1F:E5:02:87:E1:4D:37:EA:6A:44:63:76:8A
 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "UTN DATACorp SGC Root CA"
+CKA_LABEL UTF8 "UTN USERFirst Email Root CA"
 CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
 CKA_SUBJECT MULTILINE_OCTAL
-\060\201\223\061\013\060\011\006\003\125\004\006\023\002\125\123
+\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123
 \061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
 \025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
 \145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
 \025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
 \145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
 \030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\033\060\031\006\003\125
-\004\003\023\022\125\124\116\040\055\040\104\101\124\101\103\157
-\162\160\040\123\107\103
+\164\162\165\163\164\056\143\157\155\061\066\060\064\006\003\125
+\004\003\023\055\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\103\154\151\145\156\164\040\101\165\164\150\145\156\164
+\151\143\141\164\151\157\156\040\141\156\144\040\105\155\141\151
+\154
 END
 CKA_ID UTF8 "0"
 CKA_ISSUER MULTILINE_OCTAL
-\060\201\223\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\033\060\031\006\003\125
-\004\003\023\022\125\124\116\040\055\040\104\101\124\101\103\157
-\162\160\040\123\107\103
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\104\276\014\213\120\000\041\264\021\323\052\150\006\251
-\255\151
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\004\136\060\202\003\106\240\003\002\001\002\002\020\104
-\276\014\213\120\000\041\264\021\323\052\150\006\251\255\151\060
-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
-\223\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013
-\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006
-\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040
-\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124
-\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164
-\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150
-\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162
-\165\163\164\056\143\157\155\061\033\060\031\006\003\125\004\003
-\023\022\125\124\116\040\055\040\104\101\124\101\103\157\162\160
-\040\123\107\103\060\036\027\015\071\071\060\066\062\064\061\070
-\065\067\062\061\132\027\015\061\071\060\066\062\064\061\071\060
-\066\063\060\132\060\201\223\061\013\060\011\006\003\125\004\006
-\023\002\125\123\061\013\060\011\006\003\125\004\010\023\002\125
-\124\061\027\060\025\006\003\125\004\007\023\016\123\141\154\164
-\040\114\141\153\145\040\103\151\164\171\061\036\060\034\006\003
-\125\004\012\023\025\124\150\145\040\125\123\105\122\124\122\125
-\123\124\040\116\145\164\167\157\162\153\061\041\060\037\006\003
-\125\004\013\023\030\150\164\164\160\072\057\057\167\167\167\056
-\165\163\145\162\164\162\165\163\164\056\143\157\155\061\033\060
-\031\006\003\125\004\003\023\022\125\124\116\040\055\040\104\101
-\124\101\103\157\162\160\040\123\107\103\060\202\001\042\060\015
-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
-\017\000\060\202\001\012\002\202\001\001\000\337\356\130\020\242
-\053\156\125\304\216\277\056\106\011\347\340\010\017\056\053\172
-\023\224\033\275\366\266\200\216\145\005\223\000\036\274\257\342
-\017\216\031\015\022\107\354\254\255\243\372\056\160\370\336\156
-\373\126\102\025\236\056\134\357\043\336\041\271\005\166\047\031
-\017\117\326\303\234\264\276\224\031\143\362\246\021\012\353\123
-\110\234\276\362\051\073\026\350\032\240\114\246\311\364\030\131
-\150\300\160\362\123\000\300\136\120\202\245\126\157\066\371\112
-\340\104\206\240\115\116\326\107\156\111\112\313\147\327\246\304
-\005\271\216\036\364\374\377\315\347\066\340\234\005\154\262\063
-\042\025\320\264\340\314\027\300\262\300\364\376\062\077\051\052
-\225\173\330\362\247\116\017\124\174\241\015\200\263\011\003\301
-\377\134\335\136\232\076\274\256\274\107\212\152\256\161\312\037
-\261\052\270\137\102\005\013\354\106\060\321\162\013\312\351\126
-\155\365\357\337\170\276\141\272\262\245\256\004\114\274\250\254
-\151\025\227\275\357\353\264\214\277\065\370\324\303\321\050\016
-\134\072\237\160\030\063\040\167\304\242\257\002\003\001\000\001
-\243\201\253\060\201\250\060\013\006\003\125\035\017\004\004\003
-\002\001\306\060\017\006\003\125\035\023\001\001\377\004\005\060
-\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\123
-\062\321\263\317\177\372\340\361\240\135\205\116\222\322\236\105
-\035\264\117\060\075\006\003\125\035\037\004\066\060\064\060\062
-\240\060\240\056\206\054\150\164\164\160\072\057\057\143\162\154
-\056\165\163\145\162\164\162\165\163\164\056\143\157\155\057\125
-\124\116\055\104\101\124\101\103\157\162\160\123\107\103\056\143
-\162\154\060\052\006\003\125\035\045\004\043\060\041\006\010\053
-\006\001\005\005\007\003\001\006\012\053\006\001\004\001\202\067
-\012\003\003\006\011\140\206\110\001\206\370\102\004\001\060\015
-\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001
-\001\000\047\065\227\000\212\213\050\275\306\063\060\036\051\374
-\342\367\325\230\324\100\273\140\312\277\253\027\054\011\066\177
-\120\372\101\334\256\226\072\012\043\076\211\131\311\243\007\355
-\033\067\255\374\174\276\121\111\132\336\072\012\124\010\026\105
-\302\231\261\207\315\214\150\340\151\003\351\304\116\230\262\073
-\214\026\263\016\240\014\230\120\233\223\251\160\011\310\054\243
-\217\337\002\344\340\161\072\361\264\043\162\240\252\001\337\337
-\230\076\024\120\240\061\046\275\050\351\132\060\046\165\371\173
-\140\034\215\363\315\120\046\155\004\047\232\337\325\015\105\107
-\051\153\054\346\166\331\251\051\175\062\335\311\066\074\275\256
-\065\361\021\236\035\273\220\077\022\107\116\216\327\176\017\142
-\163\035\122\046\070\034\030\111\375\060\164\232\304\345\042\057
-\330\300\215\355\221\172\114\000\217\162\177\135\332\335\033\213
-\105\153\347\335\151\227\250\305\126\114\017\014\366\237\172\221
-\067\366\227\202\340\335\161\151\377\166\077\140\115\074\317\367
-\231\371\306\127\364\311\125\071\170\272\054\171\311\246\210\053
-\364\010
-END
-
-# Trust for Certificate "UTN DATACorp SGC Root CA"
-# Issuer: CN=UTN - DATACorp SGC,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US
-# Serial Number:44:be:0c:8b:50:00:21:b4:11:d3:2a:68:06:a9:ad:69
-# Subject: CN=UTN - DATACorp SGC,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US
-# Not Valid Before: Thu Jun 24 18:57:21 1999
-# Not Valid After : Mon Jun 24 19:06:30 2019
-# Fingerprint (MD5): B3:A5:3E:77:21:6D:AC:4A:C0:C9:FB:D5:41:3D:CA:06
-# Fingerprint (SHA1): 58:11:9F:0E:12:82:87:EA:50:FD:D9:87:45:6F:4F:78:DC:FA:D6:D4
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "UTN DATACorp SGC Root CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\130\021\237\016\022\202\207\352\120\375\331\207\105\157\117\170
-\334\372\326\324
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\263\245\076\167\041\155\254\112\300\311\373\325\101\075\312\006
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\223\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\033\060\031\006\003\125
-\004\003\023\022\125\124\116\040\055\040\104\101\124\101\103\157
-\162\160\040\123\107\103
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\104\276\014\213\120\000\041\264\021\323\052\150\006\251
-\255\151
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "UTN USERFirst Email Root CA"
-#
-# Issuer: CN=UTN-USERFirst-Client Authentication and Email,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US
-# Serial Number:44:be:0c:8b:50:00:24:b4:11:d3:36:25:25:67:c9:89
-# Subject: CN=UTN-USERFirst-Client Authentication and Email,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US
-# Not Valid Before: Fri Jul 09 17:28:50 1999
-# Not Valid After : Tue Jul 09 17:36:58 2019
-# Fingerprint (MD5): D7:34:3D:EF:1D:27:09:28:E1:31:02:5B:13:2B:DD:F7
-# Fingerprint (SHA1): B1:72:B1:A5:6D:95:F9:1F:E5:02:87:E1:4D:37:EA:6A:44:63:76:8A
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "UTN USERFirst Email Root CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\066\060\064\006\003\125
-\004\003\023\055\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\103\154\151\145\156\164\040\101\165\164\150\145\156\164
-\151\143\141\164\151\157\156\040\141\156\144\040\105\155\141\151
-\154
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123
+\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123
 \061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
 \025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
 \145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
@@ -9442,327 +8709,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "TURKTRUST Certificate Services Provider Root 1"
-#
-# Issuer: O=(c) 2005 T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hiz...,L=ANKARA,C=TR,CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s..
-# Serial Number: 1 (0x1)
-# Subject: O=(c) 2005 T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hiz...,L=ANKARA,C=TR,CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s..
-# Not Valid Before: Fri May 13 10:27:17 2005
-# Not Valid After : Sun Mar 22 10:27:17 2015
-# Fingerprint (MD5): F1:6A:22:18:C9:CD:DF:CE:82:1D:1D:B7:78:5C:A9:A5
-# Fingerprint (SHA1): 79:98:A3:08:E1:4D:65:85:E6:C2:1E:15:3A:71:9F:BA:5A:D3:4A:D9
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "TURKTRUST Certificate Services Provider Root 1"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\267\061\077\060\075\006\003\125\004\003\014\066\124\303
-\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157
-\156\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151
-\172\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304
-\261\163\304\261\061\013\060\011\006\003\125\004\006\014\002\124
-\122\061\017\060\015\006\003\125\004\007\014\006\101\116\113\101
-\122\101\061\126\060\124\006\003\125\004\012\014\115\050\143\051
-\040\062\060\060\065\040\124\303\234\122\113\124\122\125\123\124
-\040\102\151\154\147\151\040\304\260\154\145\164\151\305\237\151
-\155\040\166\145\040\102\151\154\151\305\237\151\155\040\107\303
-\274\166\145\156\154\151\304\237\151\040\110\151\172\155\145\164
-\154\145\162\151\040\101\056\305\236\056
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\267\061\077\060\075\006\003\125\004\003\014\066\124\303
-\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157
-\156\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151
-\172\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304
-\261\163\304\261\061\013\060\011\006\003\125\004\006\014\002\124
-\122\061\017\060\015\006\003\125\004\007\014\006\101\116\113\101
-\122\101\061\126\060\124\006\003\125\004\012\014\115\050\143\051
-\040\062\060\060\065\040\124\303\234\122\113\124\122\125\123\124
-\040\102\151\154\147\151\040\304\260\154\145\164\151\305\237\151
-\155\040\166\145\040\102\151\154\151\305\237\151\155\040\107\303
-\274\166\145\156\154\151\304\237\151\040\110\151\172\155\145\164
-\154\145\162\151\040\101\056\305\236\056
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\373\060\202\002\343\240\003\002\001\002\002\001\001
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\201\267\061\077\060\075\006\003\125\004\003\014\066\124\303\234
-\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157\156
-\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172
-\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261
-\163\304\261\061\013\060\011\006\003\125\004\006\014\002\124\122
-\061\017\060\015\006\003\125\004\007\014\006\101\116\113\101\122
-\101\061\126\060\124\006\003\125\004\012\014\115\050\143\051\040
-\062\060\060\065\040\124\303\234\122\113\124\122\125\123\124\040
-\102\151\154\147\151\040\304\260\154\145\164\151\305\237\151\155
-\040\166\145\040\102\151\154\151\305\237\151\155\040\107\303\274
-\166\145\156\154\151\304\237\151\040\110\151\172\155\145\164\154
-\145\162\151\040\101\056\305\236\056\060\036\027\015\060\065\060
-\065\061\063\061\060\062\067\061\067\132\027\015\061\065\060\063
-\062\062\061\060\062\067\061\067\132\060\201\267\061\077\060\075
-\006\003\125\004\003\014\066\124\303\234\122\113\124\122\125\123
-\124\040\105\154\145\153\164\162\157\156\151\153\040\123\145\162
-\164\151\146\151\153\141\040\110\151\172\155\145\164\040\123\141
-\304\237\154\141\171\304\261\143\304\261\163\304\261\061\013\060
-\011\006\003\125\004\006\014\002\124\122\061\017\060\015\006\003
-\125\004\007\014\006\101\116\113\101\122\101\061\126\060\124\006
-\003\125\004\012\014\115\050\143\051\040\062\060\060\065\040\124
-\303\234\122\113\124\122\125\123\124\040\102\151\154\147\151\040
-\304\260\154\145\164\151\305\237\151\155\040\166\145\040\102\151
-\154\151\305\237\151\155\040\107\303\274\166\145\156\154\151\304
-\237\151\040\110\151\172\155\145\164\154\145\162\151\040\101\056
-\305\236\056\060\202\001\042\060\015\006\011\052\206\110\206\367
-\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002
-\202\001\001\000\312\122\005\326\143\003\330\034\137\335\322\173
-\135\362\014\140\141\133\153\073\164\053\170\015\175\105\275\042
-\164\350\214\003\301\306\021\052\075\225\274\251\224\260\273\221
-\227\310\151\174\204\305\264\221\154\154\023\152\244\125\255\244
-\205\350\225\176\263\000\257\000\302\005\030\365\160\235\066\213
-\256\313\344\033\201\177\223\210\373\152\125\273\175\205\222\316
-\272\130\237\333\062\305\275\135\357\042\112\057\101\007\176\111
-\141\263\206\354\116\246\101\156\204\274\003\354\365\073\034\310
-\037\302\356\250\356\352\022\112\215\024\317\363\012\340\120\071
-\371\010\065\370\021\131\255\347\042\352\113\312\024\006\336\102
-\272\262\231\363\055\124\210\020\006\352\341\032\076\075\147\037
-\373\316\373\174\202\350\021\135\112\301\271\024\352\124\331\146
-\233\174\211\175\004\232\142\311\351\122\074\236\234\357\322\365
-\046\344\346\345\030\174\213\156\337\154\314\170\133\117\162\262
-\313\134\077\214\005\215\321\114\214\255\222\307\341\170\177\145
-\154\111\006\120\054\236\062\302\327\112\306\165\212\131\116\165
-\157\107\136\301\002\003\001\000\001\243\020\060\016\060\014\006
-\003\125\035\023\004\005\060\003\001\001\377\060\015\006\011\052
-\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000\025
-\365\125\377\067\226\200\131\041\244\374\241\025\114\040\366\324
-\137\332\003\044\374\317\220\032\364\041\012\232\356\072\261\152
-\357\357\370\140\321\114\066\146\105\035\363\146\002\164\004\173
-\222\060\250\336\012\166\017\357\225\156\275\311\067\346\032\015
-\254\211\110\133\314\203\066\302\365\106\134\131\202\126\264\325
-\376\043\264\330\124\034\104\253\304\247\345\024\316\074\101\141
-\174\103\346\315\304\201\011\213\044\373\124\045\326\026\250\226
-\014\147\007\157\263\120\107\343\034\044\050\335\052\230\244\141
-\376\333\352\022\067\274\001\032\064\205\275\156\117\347\221\162
-\007\104\205\036\130\312\124\104\335\367\254\271\313\211\041\162
-\333\217\300\151\051\227\052\243\256\030\043\227\034\101\052\213
-\174\052\301\174\220\350\251\050\300\323\221\306\255\050\207\100
-\150\265\377\354\247\322\323\070\030\234\323\175\151\135\360\306
-\245\036\044\033\243\107\374\151\007\150\347\344\232\264\355\017
-\241\207\207\002\316\207\322\110\116\341\274\377\313\361\162\222
-\104\144\003\045\352\336\133\156\237\311\362\116\254\335\307
-END
-
-# Trust for Certificate "TURKTRUST Certificate Services Provider Root 1"
-# Issuer: O=(c) 2005 T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hiz...,L=ANKARA,C=TR,CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s..
-# Serial Number: 1 (0x1)
-# Subject: O=(c) 2005 T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hiz...,L=ANKARA,C=TR,CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s..
-# Not Valid Before: Fri May 13 10:27:17 2005
-# Not Valid After : Sun Mar 22 10:27:17 2015
-# Fingerprint (MD5): F1:6A:22:18:C9:CD:DF:CE:82:1D:1D:B7:78:5C:A9:A5
-# Fingerprint (SHA1): 79:98:A3:08:E1:4D:65:85:E6:C2:1E:15:3A:71:9F:BA:5A:D3:4A:D9
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "TURKTRUST Certificate Services Provider Root 1"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\171\230\243\010\341\115\145\205\346\302\036\025\072\161\237\272
-\132\323\112\331
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\361\152\042\030\311\315\337\316\202\035\035\267\170\134\251\245
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\267\061\077\060\075\006\003\125\004\003\014\066\124\303
-\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157
-\156\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151
-\172\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304
-\261\163\304\261\061\013\060\011\006\003\125\004\006\014\002\124
-\122\061\017\060\015\006\003\125\004\007\014\006\101\116\113\101
-\122\101\061\126\060\124\006\003\125\004\012\014\115\050\143\051
-\040\062\060\060\065\040\124\303\234\122\113\124\122\125\123\124
-\040\102\151\154\147\151\040\304\260\154\145\164\151\305\237\151
-\155\040\166\145\040\102\151\154\151\305\237\151\155\040\107\303
-\274\166\145\156\154\151\304\237\151\040\110\151\172\155\145\164
-\154\145\162\151\040\101\056\305\236\056
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "TURKTRUST Certificate Services Provider Root 2"
-#
-# Issuer: O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A...,L=Ankara,C=TR,CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s..
-# Serial Number: 1 (0x1)
-# Subject: O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A...,L=Ankara,C=TR,CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s..
-# Not Valid Before: Mon Nov 07 10:07:57 2005
-# Not Valid After : Wed Sep 16 10:07:57 2015
-# Fingerprint (MD5): 37:A5:6E:D4:B1:25:84:97:B7:FD:56:15:7A:F9:A2:00
-# Fingerprint (SHA1): B4:35:D4:E1:11:9D:1C:66:90:A7:49:EB:B3:94:BD:63:7B:A7:82:B7
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "TURKTRUST Certificate Services Provider Root 2"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\276\061\077\060\075\006\003\125\004\003\014\066\124\303
-\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157
-\156\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151
-\172\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304
-\261\163\304\261\061\013\060\011\006\003\125\004\006\023\002\124
-\122\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141
-\162\141\061\135\060\133\006\003\125\004\012\014\124\124\303\234
-\122\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260
-\154\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151
-\305\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151
-\040\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236
-\056\040\050\143\051\040\113\141\163\304\261\155\040\062\060\060
-\065
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\276\061\077\060\075\006\003\125\004\003\014\066\124\303
-\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157
-\156\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151
-\172\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304
-\261\163\304\261\061\013\060\011\006\003\125\004\006\023\002\124
-\122\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141
-\162\141\061\135\060\133\006\003\125\004\012\014\124\124\303\234
-\122\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260
-\154\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151
-\305\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151
-\040\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236
-\056\040\050\143\051\040\113\141\163\304\261\155\040\062\060\060
-\065
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\004\074\060\202\003\044\240\003\002\001\002\002\001\001
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\201\276\061\077\060\075\006\003\125\004\003\014\066\124\303\234
-\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157\156
-\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151\172
-\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304\261
-\163\304\261\061\013\060\011\006\003\125\004\006\023\002\124\122
-\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141\162
-\141\061\135\060\133\006\003\125\004\012\014\124\124\303\234\122
-\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260\154
-\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151\305
-\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151\040
-\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236\056
-\040\050\143\051\040\113\141\163\304\261\155\040\062\060\060\065
-\060\036\027\015\060\065\061\061\060\067\061\060\060\067\065\067
-\132\027\015\061\065\060\071\061\066\061\060\060\067\065\067\132
-\060\201\276\061\077\060\075\006\003\125\004\003\014\066\124\303
-\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157
-\156\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151
-\172\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304
-\261\163\304\261\061\013\060\011\006\003\125\004\006\023\002\124
-\122\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141
-\162\141\061\135\060\133\006\003\125\004\012\014\124\124\303\234
-\122\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260
-\154\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151
-\305\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151
-\040\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236
-\056\040\050\143\051\040\113\141\163\304\261\155\040\062\060\060
-\065\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001
-\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001
-\001\000\251\066\176\303\221\103\114\303\031\230\010\310\307\130
-\173\117\026\214\245\316\111\001\037\163\016\254\165\023\246\372
-\236\054\040\336\330\220\016\012\321\151\322\047\373\252\167\237
-\047\122\045\342\313\135\330\330\203\120\027\175\212\265\202\077
-\004\216\264\325\360\111\247\144\267\036\056\137\040\234\120\165
-\117\257\341\265\101\024\364\230\222\210\307\345\345\144\107\141
-\107\171\375\300\121\361\301\231\347\334\316\152\373\257\265\001
-\060\334\106\034\357\212\354\225\357\334\377\257\020\034\353\235
-\330\260\252\152\205\030\015\027\311\076\277\361\233\320\011\211
-\102\375\240\102\264\235\211\121\125\051\317\033\160\274\204\124
-\255\301\023\037\230\364\056\166\140\213\135\077\232\255\312\014
-\277\247\126\133\217\167\270\325\236\171\111\222\077\340\361\227
-\044\172\154\233\027\017\155\357\123\230\221\053\344\017\276\131
-\171\007\170\273\227\225\364\237\151\324\130\207\012\251\343\314
-\266\130\031\237\046\041\261\304\131\215\262\101\165\300\255\151
-\316\234\000\010\362\066\377\076\360\241\017\032\254\024\375\246
-\140\017\002\003\001\000\001\243\103\060\101\060\035\006\003\125
-\035\016\004\026\004\024\331\067\263\116\005\375\331\317\237\022
-\026\256\266\211\057\353\045\072\210\034\060\017\006\003\125\035
-\017\001\001\377\004\005\003\003\007\006\000\060\017\006\003\125
-\035\023\001\001\377\004\005\060\003\001\001\377\060\015\006\011
-\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000
-\162\140\226\267\311\334\330\051\136\043\205\137\262\263\055\166
-\373\210\327\027\376\173\155\105\270\366\205\154\237\042\374\052
-\020\042\354\252\271\060\366\253\130\326\071\020\061\231\051\000
-\275\211\146\101\373\164\336\221\301\030\013\237\265\141\313\235
-\072\276\365\250\224\243\042\125\156\027\111\377\322\051\361\070
-\046\135\357\245\252\072\371\161\173\346\332\130\035\323\164\302
-\001\372\076\151\130\137\255\313\150\276\024\056\233\154\300\266
-\334\240\046\372\167\032\342\044\332\032\067\340\147\255\321\163
-\203\015\245\032\035\156\022\222\176\204\142\000\027\275\274\045
-\030\127\362\327\251\157\131\210\274\064\267\056\205\170\235\226
-\334\024\303\054\212\122\233\226\214\122\146\075\206\026\213\107
-\270\121\011\214\352\175\315\210\162\263\140\063\261\360\012\104
-\357\017\365\011\067\210\044\016\054\153\040\072\242\372\021\362
-\100\065\234\104\150\143\073\254\063\157\143\274\054\273\362\322
-\313\166\175\175\210\330\035\310\005\035\156\274\224\251\146\214
-\167\161\307\372\221\372\057\121\236\351\071\122\266\347\004\102
-END
-
-# Trust for Certificate "TURKTRUST Certificate Services Provider Root 2"
-# Issuer: O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A...,L=Ankara,C=TR,CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s..
-# Serial Number: 1 (0x1)
-# Subject: O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A...,L=Ankara,C=TR,CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s..
-# Not Valid Before: Mon Nov 07 10:07:57 2005
-# Not Valid After : Wed Sep 16 10:07:57 2015
-# Fingerprint (MD5): 37:A5:6E:D4:B1:25:84:97:B7:FD:56:15:7A:F9:A2:00
-# Fingerprint (SHA1): B4:35:D4:E1:11:9D:1C:66:90:A7:49:EB:B3:94:BD:63:7B:A7:82:B7
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "TURKTRUST Certificate Services Provider Root 2"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\264\065\324\341\021\235\034\146\220\247\111\353\263\224\275\143
-\173\247\202\267
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\067\245\156\324\261\045\204\227\267\375\126\025\172\371\242\000
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\276\061\077\060\075\006\003\125\004\003\014\066\124\303
-\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162\157
-\156\151\153\040\123\145\162\164\151\146\151\153\141\040\110\151
-\172\155\145\164\040\123\141\304\237\154\141\171\304\261\143\304
-\261\163\304\261\061\013\060\011\006\003\125\004\006\023\002\124
-\122\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141
-\162\141\061\135\060\133\006\003\125\004\012\014\124\124\303\234
-\122\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260
-\154\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151
-\305\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151
-\040\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236
-\056\040\050\143\051\040\113\141\163\304\261\155\040\062\060\060
-\065
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "SwissSign Platinum CA - G2"
 #
@@ -12868,30 +11814,30 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "TC TrustCenter Class 2 CA II"
+# Certificate "TC TrustCenter Class 3 CA II"
 #
-# Issuer: CN=TC TrustCenter Class 2 CA II,OU=TC TrustCenter Class 2 CA,O=TC TrustCenter GmbH,C=DE
-# Serial Number:2e:6a:00:01:00:02:1f:d7:52:21:2c:11:5c:3b
-# Subject: CN=TC TrustCenter Class 2 CA II,OU=TC TrustCenter Class 2 CA,O=TC TrustCenter GmbH,C=DE
-# Not Valid Before: Thu Jan 12 14:38:43 2006
+# Issuer: CN=TC TrustCenter Class 3 CA II,OU=TC TrustCenter Class 3 CA,O=TC TrustCenter GmbH,C=DE
+# Serial Number:4a:47:00:01:00:02:e5:a0:5d:d6:3f:00:51:bf
+# Subject: CN=TC TrustCenter Class 3 CA II,OU=TC TrustCenter Class 3 CA,O=TC TrustCenter GmbH,C=DE
+# Not Valid Before: Thu Jan 12 14:41:57 2006
 # Not Valid After : Wed Dec 31 22:59:59 2025
-# Fingerprint (MD5): CE:78:33:5C:59:78:01:6E:18:EA:B9:36:A0:B9:2E:23
-# Fingerprint (SHA1): AE:50:83:ED:7C:F4:5C:BC:8F:61:C6:21:FE:68:5D:79:42:21:15:6E
+# Fingerprint (MD5): 56:5F:AA:80:61:12:17:F6:67:21:E6:2B:6D:61:56:8E
+# Fingerprint (SHA1): 80:25:EF:F4:6E:70:C8:D4:72:24:65:84:FE:40:3B:8A:8D:6A:DB:F5
 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "TC TrustCenter Class 2 CA II"
+CKA_LABEL UTF8 "TC TrustCenter Class 3 CA II"
 CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
 CKA_SUBJECT MULTILINE_OCTAL
 \060\166\061\013\060\011\006\003\125\004\006\023\002\104\105\061
 \034\060\032\006\003\125\004\012\023\023\124\103\040\124\162\165
 \163\164\103\145\156\164\145\162\040\107\155\142\110\061\042\060
 \040\006\003\125\004\013\023\031\124\103\040\124\162\165\163\164
-\103\145\156\164\145\162\040\103\154\141\163\163\040\062\040\103
+\103\145\156\164\145\162\040\103\154\141\163\163\040\063\040\103
 \101\061\045\060\043\006\003\125\004\003\023\034\124\103\040\124
 \162\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163
-\040\062\040\103\101\040\111\111
+\040\063\040\103\101\040\111\111
 END
 CKA_ID UTF8 "0"
 CKA_ISSUER MULTILINE_OCTAL
@@ -12899,223 +11845,67 @@ CKA_ISSUER MULTILINE_OCTAL
 \034\060\032\006\003\125\004\012\023\023\124\103\040\124\162\165
 \163\164\103\145\156\164\145\162\040\107\155\142\110\061\042\060
 \040\006\003\125\004\013\023\031\124\103\040\124\162\165\163\164
-\103\145\156\164\145\162\040\103\154\141\163\163\040\062\040\103
+\103\145\156\164\145\162\040\103\154\141\163\163\040\063\040\103
 \101\061\045\060\043\006\003\125\004\003\023\034\124\103\040\124
 \162\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163
-\040\062\040\103\101\040\111\111
+\040\063\040\103\101\040\111\111
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\016\056\152\000\001\000\002\037\327\122\041\054\021\134\073
+\002\016\112\107\000\001\000\002\345\240\135\326\077\000\121\277
 END
 CKA_VALUE MULTILINE_OCTAL
-\060\202\004\252\060\202\003\222\240\003\002\001\002\002\016\056
-\152\000\001\000\002\037\327\122\041\054\021\134\073\060\015\006
+\060\202\004\252\060\202\003\222\240\003\002\001\002\002\016\112
+\107\000\001\000\002\345\240\135\326\077\000\121\277\060\015\006
 \011\052\206\110\206\367\015\001\001\005\005\000\060\166\061\013
 \060\011\006\003\125\004\006\023\002\104\105\061\034\060\032\006
 \003\125\004\012\023\023\124\103\040\124\162\165\163\164\103\145
 \156\164\145\162\040\107\155\142\110\061\042\060\040\006\003\125
 \004\013\023\031\124\103\040\124\162\165\163\164\103\145\156\164
-\145\162\040\103\154\141\163\163\040\062\040\103\101\061\045\060
+\145\162\040\103\154\141\163\163\040\063\040\103\101\061\045\060
 \043\006\003\125\004\003\023\034\124\103\040\124\162\165\163\164
-\103\145\156\164\145\162\040\103\154\141\163\163\040\062\040\103
+\103\145\156\164\145\162\040\103\154\141\163\163\040\063\040\103
 \101\040\111\111\060\036\027\015\060\066\060\061\061\062\061\064
-\063\070\064\063\132\027\015\062\065\061\062\063\061\062\062\065
+\064\061\065\067\132\027\015\062\065\061\062\063\061\062\062\065
 \071\065\071\132\060\166\061\013\060\011\006\003\125\004\006\023
 \002\104\105\061\034\060\032\006\003\125\004\012\023\023\124\103
 \040\124\162\165\163\164\103\145\156\164\145\162\040\107\155\142
 \110\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124
 \162\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163
-\040\062\040\103\101\061\045\060\043\006\003\125\004\003\023\034
+\040\063\040\103\101\061\045\060\043\006\003\125\004\003\023\034
 \124\103\040\124\162\165\163\164\103\145\156\164\145\162\040\103
-\154\141\163\163\040\062\040\103\101\040\111\111\060\202\001\042
+\154\141\163\163\040\063\040\103\101\040\111\111\060\202\001\042
 \060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003
-\202\001\017\000\060\202\001\012\002\202\001\001\000\253\200\207
-\233\216\360\303\174\207\327\350\044\202\021\263\074\335\103\142
-\356\370\303\105\332\350\341\240\137\321\052\262\352\223\150\337
-\264\310\326\103\351\304\165\131\177\374\341\035\370\061\160\043
-\033\210\236\047\271\173\375\072\322\311\251\351\024\057\220\276
-\003\122\301\111\315\366\375\344\010\146\013\127\212\242\102\240
-\270\325\177\151\134\220\062\262\227\015\312\112\334\106\076\002
-\125\211\123\343\032\132\313\066\306\007\126\367\214\317\021\364
-\114\273\060\160\004\225\245\366\071\214\375\163\201\010\175\211
-\136\062\036\042\251\042\105\113\260\146\056\060\314\237\145\375
-\374\313\201\251\361\340\073\257\243\206\321\211\352\304\105\171
-\120\135\256\351\041\164\222\115\213\131\202\217\224\343\351\112
-\361\347\111\260\024\343\365\142\313\325\162\275\037\271\322\237
-\240\315\250\372\001\310\331\015\337\332\374\107\235\263\310\124
-\337\111\112\361\041\251\376\030\116\356\110\324\031\273\357\175
-\344\342\235\313\133\266\156\377\343\315\132\347\164\202\005\272
-\200\045\070\313\344\151\236\257\101\252\032\204\365\002\003\001
+\202\001\017\000\060\202\001\012\002\202\001\001\000\264\340\273
+\121\273\071\134\213\004\305\114\171\034\043\206\061\020\143\103
+\125\047\077\306\105\307\244\075\354\011\015\032\036\040\302\126
+\036\336\033\067\007\060\042\057\157\361\006\361\253\255\326\310
+\253\141\243\057\103\304\260\262\055\374\303\226\151\173\176\212
+\344\314\300\071\022\220\102\140\311\314\065\150\356\332\137\220
+\126\137\315\034\115\133\130\111\353\016\001\117\144\372\054\074
+\211\130\330\057\056\342\260\150\351\042\073\165\211\326\104\032
+\145\362\033\227\046\035\050\155\254\350\275\131\035\053\044\366
+\326\204\003\146\210\044\000\170\140\361\370\253\376\002\262\153
+\373\042\373\065\346\026\321\255\366\056\022\344\372\065\152\345
+\031\271\135\333\073\036\032\373\323\377\025\024\010\330\011\152
+\272\105\235\024\171\140\175\257\100\212\007\163\263\223\226\323
+\164\064\215\072\067\051\336\134\354\365\356\056\061\302\040\334
+\276\361\117\177\043\122\331\133\342\144\331\234\252\007\010\265
+\105\275\321\320\061\301\253\124\237\251\322\303\142\140\003\361
+\273\071\112\222\112\075\012\271\235\305\240\376\067\002\003\001
 \000\001\243\202\001\064\060\202\001\060\060\017\006\003\125\035
 \023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125
 \035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125
-\035\016\004\026\004\024\343\253\124\114\200\241\333\126\103\267
-\221\112\313\363\202\172\023\134\010\253\060\201\355\006\003\125
+\035\016\004\026\004\024\324\242\374\237\263\303\330\003\323\127
+\134\007\244\320\044\247\300\362\000\324\060\201\355\006\003\125
 \035\037\004\201\345\060\201\342\060\201\337\240\201\334\240\201
 \331\206\065\150\164\164\160\072\057\057\167\167\167\056\164\162
 \165\163\164\143\145\156\164\145\162\056\144\145\057\143\162\154
-\057\166\062\057\164\143\137\143\154\141\163\163\137\062\137\143
+\057\166\062\057\164\143\137\143\154\141\163\163\137\063\137\143
 \141\137\111\111\056\143\162\154\206\201\237\154\144\141\160\072
 \057\057\167\167\167\056\164\162\165\163\164\143\145\156\164\145
 \162\056\144\145\057\103\116\075\124\103\045\062\060\124\162\165
 \163\164\103\145\156\164\145\162\045\062\060\103\154\141\163\163
-\045\062\060\062\045\062\060\103\101\045\062\060\111\111\054\117
-\075\124\103\045\062\060\124\162\165\163\164\103\145\156\164\145
-\162\045\062\060\107\155\142\110\054\117\125\075\162\157\157\164
-\143\145\162\164\163\054\104\103\075\164\162\165\163\164\143\145
-\156\164\145\162\054\104\103\075\144\145\077\143\145\162\164\151
-\146\151\143\141\164\145\122\145\166\157\143\141\164\151\157\156
-\114\151\163\164\077\142\141\163\145\077\060\015\006\011\052\206
-\110\206\367\015\001\001\005\005\000\003\202\001\001\000\214\327
-\337\176\356\033\200\020\263\203\365\333\021\352\153\113\250\222
-\030\331\367\007\071\365\054\276\006\165\172\150\123\025\034\352
-\112\355\136\374\043\262\023\240\323\011\377\366\366\056\153\101
-\161\171\315\342\155\375\256\131\153\205\035\270\116\042\232\355
-\146\071\156\113\224\346\125\374\013\033\213\167\301\123\023\146
-\211\331\050\326\213\363\105\112\143\267\375\173\013\141\135\270
-\155\276\303\334\133\171\322\355\206\345\242\115\276\136\164\174
-\152\355\026\070\037\177\130\201\132\032\353\062\210\055\262\363
-\071\167\200\257\136\266\141\165\051\333\043\115\210\312\120\050
-\313\205\322\323\020\242\131\156\323\223\124\000\172\242\106\225
-\206\005\234\251\031\230\345\061\162\014\000\342\147\331\100\340
-\044\063\173\157\054\271\134\253\145\235\054\254\166\352\065\231
-\365\227\271\017\044\354\307\166\041\050\145\256\127\350\007\210
-\165\112\126\240\322\005\072\244\346\215\222\210\054\363\362\341
-\301\306\141\333\101\305\307\233\367\016\032\121\105\302\141\153
-\334\144\047\027\214\132\267\332\164\050\315\227\344\275
-END
-
-# Trust for Certificate "TC TrustCenter Class 2 CA II"
-# Issuer: CN=TC TrustCenter Class 2 CA II,OU=TC TrustCenter Class 2 CA,O=TC TrustCenter GmbH,C=DE
-# Serial Number:2e:6a:00:01:00:02:1f:d7:52:21:2c:11:5c:3b
-# Subject: CN=TC TrustCenter Class 2 CA II,OU=TC TrustCenter Class 2 CA,O=TC TrustCenter GmbH,C=DE
-# Not Valid Before: Thu Jan 12 14:38:43 2006
-# Not Valid After : Wed Dec 31 22:59:59 2025
-# Fingerprint (MD5): CE:78:33:5C:59:78:01:6E:18:EA:B9:36:A0:B9:2E:23
-# Fingerprint (SHA1): AE:50:83:ED:7C:F4:5C:BC:8F:61:C6:21:FE:68:5D:79:42:21:15:6E
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "TC TrustCenter Class 2 CA II"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\256\120\203\355\174\364\134\274\217\141\306\041\376\150\135\171
-\102\041\025\156
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\316\170\063\134\131\170\001\156\030\352\271\066\240\271\056\043
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\166\061\013\060\011\006\003\125\004\006\023\002\104\105\061
-\034\060\032\006\003\125\004\012\023\023\124\103\040\124\162\165
-\163\164\103\145\156\164\145\162\040\107\155\142\110\061\042\060
-\040\006\003\125\004\013\023\031\124\103\040\124\162\165\163\164
-\103\145\156\164\145\162\040\103\154\141\163\163\040\062\040\103
-\101\061\045\060\043\006\003\125\004\003\023\034\124\103\040\124
-\162\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163
-\040\062\040\103\101\040\111\111
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\016\056\152\000\001\000\002\037\327\122\041\054\021\134\073
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "TC TrustCenter Class 3 CA II"
-#
-# Issuer: CN=TC TrustCenter Class 3 CA II,OU=TC TrustCenter Class 3 CA,O=TC TrustCenter GmbH,C=DE
-# Serial Number:4a:47:00:01:00:02:e5:a0:5d:d6:3f:00:51:bf
-# Subject: CN=TC TrustCenter Class 3 CA II,OU=TC TrustCenter Class 3 CA,O=TC TrustCenter GmbH,C=DE
-# Not Valid Before: Thu Jan 12 14:41:57 2006
-# Not Valid After : Wed Dec 31 22:59:59 2025
-# Fingerprint (MD5): 56:5F:AA:80:61:12:17:F6:67:21:E6:2B:6D:61:56:8E
-# Fingerprint (SHA1): 80:25:EF:F4:6E:70:C8:D4:72:24:65:84:FE:40:3B:8A:8D:6A:DB:F5
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "TC TrustCenter Class 3 CA II"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\166\061\013\060\011\006\003\125\004\006\023\002\104\105\061
-\034\060\032\006\003\125\004\012\023\023\124\103\040\124\162\165
-\163\164\103\145\156\164\145\162\040\107\155\142\110\061\042\060
-\040\006\003\125\004\013\023\031\124\103\040\124\162\165\163\164
-\103\145\156\164\145\162\040\103\154\141\163\163\040\063\040\103
-\101\061\045\060\043\006\003\125\004\003\023\034\124\103\040\124
-\162\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163
-\040\063\040\103\101\040\111\111
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\166\061\013\060\011\006\003\125\004\006\023\002\104\105\061
-\034\060\032\006\003\125\004\012\023\023\124\103\040\124\162\165
-\163\164\103\145\156\164\145\162\040\107\155\142\110\061\042\060
-\040\006\003\125\004\013\023\031\124\103\040\124\162\165\163\164
-\103\145\156\164\145\162\040\103\154\141\163\163\040\063\040\103
-\101\061\045\060\043\006\003\125\004\003\023\034\124\103\040\124
-\162\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163
-\040\063\040\103\101\040\111\111
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\016\112\107\000\001\000\002\345\240\135\326\077\000\121\277
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\004\252\060\202\003\222\240\003\002\001\002\002\016\112
-\107\000\001\000\002\345\240\135\326\077\000\121\277\060\015\006
-\011\052\206\110\206\367\015\001\001\005\005\000\060\166\061\013
-\060\011\006\003\125\004\006\023\002\104\105\061\034\060\032\006
-\003\125\004\012\023\023\124\103\040\124\162\165\163\164\103\145
-\156\164\145\162\040\107\155\142\110\061\042\060\040\006\003\125
-\004\013\023\031\124\103\040\124\162\165\163\164\103\145\156\164
-\145\162\040\103\154\141\163\163\040\063\040\103\101\061\045\060
-\043\006\003\125\004\003\023\034\124\103\040\124\162\165\163\164
-\103\145\156\164\145\162\040\103\154\141\163\163\040\063\040\103
-\101\040\111\111\060\036\027\015\060\066\060\061\061\062\061\064
-\064\061\065\067\132\027\015\062\065\061\062\063\061\062\062\065
-\071\065\071\132\060\166\061\013\060\011\006\003\125\004\006\023
-\002\104\105\061\034\060\032\006\003\125\004\012\023\023\124\103
-\040\124\162\165\163\164\103\145\156\164\145\162\040\107\155\142
-\110\061\042\060\040\006\003\125\004\013\023\031\124\103\040\124
-\162\165\163\164\103\145\156\164\145\162\040\103\154\141\163\163
-\040\063\040\103\101\061\045\060\043\006\003\125\004\003\023\034
-\124\103\040\124\162\165\163\164\103\145\156\164\145\162\040\103
-\154\141\163\163\040\063\040\103\101\040\111\111\060\202\001\042
-\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003
-\202\001\017\000\060\202\001\012\002\202\001\001\000\264\340\273
-\121\273\071\134\213\004\305\114\171\034\043\206\061\020\143\103
-\125\047\077\306\105\307\244\075\354\011\015\032\036\040\302\126
-\036\336\033\067\007\060\042\057\157\361\006\361\253\255\326\310
-\253\141\243\057\103\304\260\262\055\374\303\226\151\173\176\212
-\344\314\300\071\022\220\102\140\311\314\065\150\356\332\137\220
-\126\137\315\034\115\133\130\111\353\016\001\117\144\372\054\074
-\211\130\330\057\056\342\260\150\351\042\073\165\211\326\104\032
-\145\362\033\227\046\035\050\155\254\350\275\131\035\053\044\366
-\326\204\003\146\210\044\000\170\140\361\370\253\376\002\262\153
-\373\042\373\065\346\026\321\255\366\056\022\344\372\065\152\345
-\031\271\135\333\073\036\032\373\323\377\025\024\010\330\011\152
-\272\105\235\024\171\140\175\257\100\212\007\163\263\223\226\323
-\164\064\215\072\067\051\336\134\354\365\356\056\061\302\040\334
-\276\361\117\177\043\122\331\133\342\144\331\234\252\007\010\265
-\105\275\321\320\061\301\253\124\237\251\322\303\142\140\003\361
-\273\071\112\222\112\075\012\271\235\305\240\376\067\002\003\001
-\000\001\243\202\001\064\060\202\001\060\060\017\006\003\125\035
-\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125
-\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125
-\035\016\004\026\004\024\324\242\374\237\263\303\330\003\323\127
-\134\007\244\320\044\247\300\362\000\324\060\201\355\006\003\125
-\035\037\004\201\345\060\201\342\060\201\337\240\201\334\240\201
-\331\206\065\150\164\164\160\072\057\057\167\167\167\056\164\162
-\165\163\164\143\145\156\164\145\162\056\144\145\057\143\162\154
-\057\166\062\057\164\143\137\143\154\141\163\163\137\063\137\143
-\141\137\111\111\056\143\162\154\206\201\237\154\144\141\160\072
-\057\057\167\167\167\056\164\162\165\163\164\143\145\156\164\145
-\162\056\144\145\057\103\116\075\124\103\045\062\060\124\162\165
-\163\164\103\145\156\164\145\162\045\062\060\103\154\141\163\163
-\045\062\060\063\045\062\060\103\101\045\062\060\111\111\054\117
+\045\062\060\063\045\062\060\103\101\045\062\060\111\111\054\117
 \075\124\103\045\062\060\124\162\165\163\164\103\145\156\164\145
 \162\045\062\060\107\155\142\110\054\117\125\075\162\157\157\164
 \143\145\162\164\163\054\104\103\075\164\162\165\163\164\143\145
@@ -13179,150 +11969,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "TC TrustCenter Universal CA I"
-#
-# Issuer: CN=TC TrustCenter Universal CA I,OU=TC TrustCenter Universal CA,O=TC TrustCenter GmbH,C=DE
-# Serial Number:1d:a2:00:01:00:02:ec:b7:60:80:78:8d:b6:06
-# Subject: CN=TC TrustCenter Universal CA I,OU=TC TrustCenter Universal CA,O=TC TrustCenter GmbH,C=DE
-# Not Valid Before: Wed Mar 22 15:54:28 2006
-# Not Valid After : Wed Dec 31 22:59:59 2025
-# Fingerprint (MD5): 45:E1:A5:72:C5:A9:36:64:40:9E:F5:E4:58:84:67:8C
-# Fingerprint (SHA1): 6B:2F:34:AD:89:58:BE:62:FD:B0:6B:5C:CE:BB:9D:D9:4F:4E:39:F3
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "TC TrustCenter Universal CA I"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\171\061\013\060\011\006\003\125\004\006\023\002\104\105\061
-\034\060\032\006\003\125\004\012\023\023\124\103\040\124\162\165
-\163\164\103\145\156\164\145\162\040\107\155\142\110\061\044\060
-\042\006\003\125\004\013\023\033\124\103\040\124\162\165\163\164
-\103\145\156\164\145\162\040\125\156\151\166\145\162\163\141\154
-\040\103\101\061\046\060\044\006\003\125\004\003\023\035\124\103
-\040\124\162\165\163\164\103\145\156\164\145\162\040\125\156\151
-\166\145\162\163\141\154\040\103\101\040\111
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\171\061\013\060\011\006\003\125\004\006\023\002\104\105\061
-\034\060\032\006\003\125\004\012\023\023\124\103\040\124\162\165
-\163\164\103\145\156\164\145\162\040\107\155\142\110\061\044\060
-\042\006\003\125\004\013\023\033\124\103\040\124\162\165\163\164
-\103\145\156\164\145\162\040\125\156\151\166\145\162\163\141\154
-\040\103\101\061\046\060\044\006\003\125\004\003\023\035\124\103
-\040\124\162\165\163\164\103\145\156\164\145\162\040\125\156\151
-\166\145\162\163\141\154\040\103\101\040\111
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\016\035\242\000\001\000\002\354\267\140\200\170\215\266\006
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\335\060\202\002\305\240\003\002\001\002\002\016\035
-\242\000\001\000\002\354\267\140\200\170\215\266\006\060\015\006
-\011\052\206\110\206\367\015\001\001\005\005\000\060\171\061\013
-\060\011\006\003\125\004\006\023\002\104\105\061\034\060\032\006
-\003\125\004\012\023\023\124\103\040\124\162\165\163\164\103\145
-\156\164\145\162\040\107\155\142\110\061\044\060\042\006\003\125
-\004\013\023\033\124\103\040\124\162\165\163\164\103\145\156\164
-\145\162\040\125\156\151\166\145\162\163\141\154\040\103\101\061
-\046\060\044\006\003\125\004\003\023\035\124\103\040\124\162\165
-\163\164\103\145\156\164\145\162\040\125\156\151\166\145\162\163
-\141\154\040\103\101\040\111\060\036\027\015\060\066\060\063\062
-\062\061\065\065\064\062\070\132\027\015\062\065\061\062\063\061
-\062\062\065\071\065\071\132\060\171\061\013\060\011\006\003\125
-\004\006\023\002\104\105\061\034\060\032\006\003\125\004\012\023
-\023\124\103\040\124\162\165\163\164\103\145\156\164\145\162\040
-\107\155\142\110\061\044\060\042\006\003\125\004\013\023\033\124
-\103\040\124\162\165\163\164\103\145\156\164\145\162\040\125\156
-\151\166\145\162\163\141\154\040\103\101\061\046\060\044\006\003
-\125\004\003\023\035\124\103\040\124\162\165\163\164\103\145\156
-\164\145\162\040\125\156\151\166\145\162\163\141\154\040\103\101
-\040\111\060\202\001\042\060\015\006\011\052\206\110\206\367\015
-\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202
-\001\001\000\244\167\043\226\104\257\220\364\061\247\020\364\046
-\207\234\363\070\331\017\136\336\317\101\350\061\255\306\164\221
-\044\226\170\036\011\240\233\232\225\112\112\365\142\174\002\250
-\312\254\373\132\004\166\071\336\137\361\371\263\277\363\003\130
-\125\322\252\267\343\004\042\321\370\224\332\042\010\000\215\323
-\174\046\135\314\167\171\347\054\170\071\250\046\163\016\242\135
-\045\151\205\117\125\016\232\357\306\271\104\341\127\075\337\037
-\124\042\345\157\145\252\063\204\072\363\316\172\276\125\227\256
-\215\022\017\024\063\342\120\160\303\111\207\023\274\121\336\327
-\230\022\132\357\072\203\063\222\006\165\213\222\174\022\150\173
-\160\152\017\265\233\266\167\133\110\131\235\344\357\132\255\363
-\301\236\324\327\105\116\312\126\064\041\274\076\027\133\157\167
-\014\110\001\103\051\260\335\077\226\156\346\225\252\014\300\040
-\266\375\076\066\047\234\343\134\317\116\201\334\031\273\221\220
-\175\354\346\227\004\036\223\314\042\111\327\227\206\266\023\012
-\074\103\043\167\176\360\334\346\315\044\037\073\203\233\064\072
-\203\064\343\002\003\001\000\001\243\143\060\141\060\037\006\003
-\125\035\043\004\030\060\026\200\024\222\244\165\054\244\236\276
-\201\104\353\171\374\212\305\225\245\353\020\165\163\060\017\006
-\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016
-\006\003\125\035\017\001\001\377\004\004\003\002\001\206\060\035
-\006\003\125\035\016\004\026\004\024\222\244\165\054\244\236\276
-\201\104\353\171\374\212\305\225\245\353\020\165\163\060\015\006
-\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001
-\000\050\322\340\206\325\346\370\173\360\227\334\042\153\073\225
-\024\126\017\021\060\245\232\117\072\260\072\340\006\313\145\365
-\355\306\227\047\376\045\362\127\346\136\225\214\076\144\140\025
-\132\177\057\015\001\305\261\140\375\105\065\317\360\262\277\006
-\331\357\132\276\263\142\041\264\327\253\065\174\123\076\246\047
-\361\241\055\332\032\043\235\314\335\354\074\055\236\047\064\135
-\017\302\066\171\274\311\112\142\055\355\153\331\175\101\103\174
-\266\252\312\355\141\261\067\202\025\011\032\212\026\060\330\354
-\311\326\107\162\170\113\020\106\024\216\137\016\257\354\307\057
-\253\020\327\266\361\156\354\206\262\302\350\015\222\163\334\242
-\364\017\072\277\141\043\020\211\234\110\100\156\160\000\263\323
-\272\067\104\130\021\172\002\152\210\360\067\064\360\031\351\254
-\324\145\163\366\151\214\144\224\072\171\205\051\260\026\053\014
-\202\077\006\234\307\375\020\053\236\017\054\266\236\343\025\277
-\331\066\034\272\045\032\122\075\032\354\042\014\034\340\244\242
-\075\360\350\071\317\201\300\173\355\135\037\157\305\320\013\327
-\230
-END
-
-# Trust for Certificate "TC TrustCenter Universal CA I"
-# Issuer: CN=TC TrustCenter Universal CA I,OU=TC TrustCenter Universal CA,O=TC TrustCenter GmbH,C=DE
-# Serial Number:1d:a2:00:01:00:02:ec:b7:60:80:78:8d:b6:06
-# Subject: CN=TC TrustCenter Universal CA I,OU=TC TrustCenter Universal CA,O=TC TrustCenter GmbH,C=DE
-# Not Valid Before: Wed Mar 22 15:54:28 2006
-# Not Valid After : Wed Dec 31 22:59:59 2025
-# Fingerprint (MD5): 45:E1:A5:72:C5:A9:36:64:40:9E:F5:E4:58:84:67:8C
-# Fingerprint (SHA1): 6B:2F:34:AD:89:58:BE:62:FD:B0:6B:5C:CE:BB:9D:D9:4F:4E:39:F3
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "TC TrustCenter Universal CA I"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\153\057\064\255\211\130\276\142\375\260\153\134\316\273\235\331
-\117\116\071\363
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\105\341\245\162\305\251\066\144\100\236\365\344\130\204\147\214
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\171\061\013\060\011\006\003\125\004\006\023\002\104\105\061
-\034\060\032\006\003\125\004\012\023\023\124\103\040\124\162\165
-\163\164\103\145\156\164\145\162\040\107\155\142\110\061\044\060
-\042\006\003\125\004\013\023\033\124\103\040\124\162\165\163\164
-\103\145\156\164\145\162\040\125\156\151\166\145\162\163\141\154
-\040\103\101\061\046\060\044\006\003\125\004\003\023\035\124\103
-\040\124\162\165\163\164\103\145\156\164\145\162\040\125\156\151
-\166\145\162\163\141\154\040\103\101\040\111
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\016\035\242\000\001\000\002\354\267\140\200\170\215\266\006
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "Deutsche Telekom Root CA 2"
 #
@@ -13717,7 +12363,7 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL
 \002\021\000\307\050\107\011\263\270\154\105\214\035\372\044\365
 \066\116\351
 END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
@@ -14341,132 +12987,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "Buypass Class 3 CA 1"
-#
-# Issuer: CN=Buypass Class 3 CA 1,O=Buypass AS-983163327,C=NO
-# Serial Number: 2 (0x2)
-# Subject: CN=Buypass Class 3 CA 1,O=Buypass AS-983163327,C=NO
-# Not Valid Before: Mon May 09 14:13:03 2005
-# Not Valid After : Sat May 09 14:13:03 2015
-# Fingerprint (MD5): DF:3C:73:59:81:E7:39:50:81:04:4C:34:A2:CB:B3:7B
-# Fingerprint (SHA1): 61:57:3A:11:DF:0E:D8:7E:D5:92:65:22:EA:D0:56:D7:44:B3:23:71
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Buypass Class 3 CA 1"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061
-\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163
-\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035
-\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163
-\040\103\154\141\163\163\040\063\040\103\101\040\061
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061
-\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163
-\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035
-\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163
-\040\103\154\141\163\163\040\063\040\103\101\040\061
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\002
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\123\060\202\002\073\240\003\002\001\002\002\001\002
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061\035
-\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163\163
-\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035\060
-\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163\040
-\103\154\141\163\163\040\063\040\103\101\040\061\060\036\027\015
-\060\065\060\065\060\071\061\064\061\063\060\063\132\027\015\061
-\065\060\065\060\071\061\064\061\063\060\063\132\060\113\061\013
-\060\011\006\003\125\004\006\023\002\116\117\061\035\060\033\006
-\003\125\004\012\014\024\102\165\171\160\141\163\163\040\101\123
-\055\071\070\063\061\066\063\063\062\067\061\035\060\033\006\003
-\125\004\003\014\024\102\165\171\160\141\163\163\040\103\154\141
-\163\163\040\063\040\103\101\040\061\060\202\001\042\060\015\006
-\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017
-\000\060\202\001\012\002\202\001\001\000\244\216\327\164\331\051
-\144\336\137\037\207\200\221\352\116\071\346\031\306\104\013\200
-\325\013\257\123\007\213\022\275\346\147\360\002\261\211\366\140
-\212\304\133\260\102\321\300\041\250\313\341\233\357\144\121\266
-\247\317\025\365\164\200\150\004\220\240\130\242\346\164\246\123
-\123\125\110\143\077\222\126\335\044\116\216\370\272\053\377\363
-\064\212\236\050\327\064\237\254\057\326\017\361\244\057\275\122
-\262\111\205\155\071\065\360\104\060\223\106\044\363\266\347\123
-\373\274\141\257\251\243\024\373\302\027\027\204\154\340\174\210
-\370\311\034\127\054\360\075\176\224\274\045\223\204\350\232\000
-\232\105\005\102\127\200\364\116\316\331\256\071\366\310\123\020
-\014\145\072\107\173\140\302\326\372\221\311\306\161\154\275\221
-\207\074\221\206\111\253\363\017\240\154\046\166\136\034\254\233
-\161\345\215\274\233\041\036\234\326\070\176\044\200\025\061\202
-\226\261\111\323\142\067\133\210\014\012\142\064\376\247\110\176
-\231\261\060\213\220\067\225\034\250\037\245\054\215\364\125\310
-\333\335\131\012\302\255\170\240\364\213\002\003\001\000\001\243
-\102\060\100\060\017\006\003\125\035\023\001\001\377\004\005\060
-\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\070
-\024\346\310\360\251\244\003\364\116\076\042\243\133\362\326\340
-\255\100\164\060\016\006\003\125\035\017\001\001\377\004\004\003
-\002\001\006\060\015\006\011\052\206\110\206\367\015\001\001\005
-\005\000\003\202\001\001\000\001\147\243\214\311\045\075\023\143
-\135\026\157\354\241\076\011\134\221\025\052\052\331\200\041\117
-\005\334\273\245\211\253\023\063\052\236\070\267\214\157\002\162
-\143\307\163\167\036\011\006\272\073\050\173\244\107\311\141\153
-\010\010\040\374\212\005\212\037\274\272\306\302\376\317\156\354
-\023\063\161\147\056\151\372\251\054\077\146\300\022\131\115\013
-\124\002\222\204\273\333\022\357\203\160\160\170\310\123\372\337
-\306\306\377\334\210\057\007\300\111\235\062\127\140\323\362\366
-\231\051\137\347\252\001\314\254\063\250\034\012\273\221\304\003
-\240\157\266\064\371\206\323\263\166\124\230\364\112\201\263\123
-\235\115\100\354\345\167\023\105\257\133\252\037\330\057\114\202
-\173\376\052\304\130\273\117\374\236\375\003\145\032\052\016\303
-\245\040\026\224\153\171\246\242\022\264\273\032\244\043\172\137
-\360\256\204\044\344\363\053\373\212\044\243\047\230\145\332\060
-\165\166\374\031\221\350\333\353\233\077\062\277\100\227\007\046
-\272\314\363\224\205\112\172\047\223\317\220\102\324\270\133\026
-\246\347\313\100\003\335\171
-END
-
-# Trust for Certificate "Buypass Class 3 CA 1"
-# Issuer: CN=Buypass Class 3 CA 1,O=Buypass AS-983163327,C=NO
-# Serial Number: 2 (0x2)
-# Subject: CN=Buypass Class 3 CA 1,O=Buypass AS-983163327,C=NO
-# Not Valid Before: Mon May 09 14:13:03 2005
-# Not Valid After : Sat May 09 14:13:03 2015
-# Fingerprint (MD5): DF:3C:73:59:81:E7:39:50:81:04:4C:34:A2:CB:B3:7B
-# Fingerprint (SHA1): 61:57:3A:11:DF:0E:D8:7E:D5:92:65:22:EA:D0:56:D7:44:B3:23:71
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Buypass Class 3 CA 1"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\141\127\072\021\337\016\330\176\325\222\145\042\352\320\126\327
-\104\263\043\161
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\337\074\163\131\201\347\071\120\201\004\114\064\242\313\263\173
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\113\061\013\060\011\006\003\125\004\006\023\002\116\117\061
-\035\060\033\006\003\125\004\012\014\024\102\165\171\160\141\163
-\163\040\101\123\055\071\070\063\061\066\063\063\062\067\061\035
-\060\033\006\003\125\004\003\014\024\102\165\171\160\141\163\163
-\040\103\154\141\163\163\040\063\040\103\101\040\061
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\002
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "EBG Elektronik Sertifika Hizmet Saglayicisi"
 #
@@ -17468,184 +15988,40 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "TC TrustCenter Universal CA III"
+# Certificate "Autoridad de Certificacion Firmaprofesional CIF A62634068"
 #
-# Issuer: CN=TC TrustCenter Universal CA III,OU=TC TrustCenter Universal CA,O=TC TrustCenter GmbH,C=DE
-# Serial Number:63:25:00:01:00:02:14:8d:33:15:02:e4:6c:f4
-# Subject: CN=TC TrustCenter Universal CA III,OU=TC TrustCenter Universal CA,O=TC TrustCenter GmbH,C=DE
-# Not Valid Before: Wed Sep 09 08:15:27 2009
-# Not Valid After : Mon Dec 31 23:59:59 2029
-# Fingerprint (MD5): 9F:DD:DB:AB:FF:8E:FF:45:21:5F:F0:6C:9D:8F:FE:2B
-# Fingerprint (SHA1): 96:56:CD:7B:57:96:98:95:D0:E1:41:46:68:06:FB:B8:C6:11:06:87
+# Issuer: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068,C=ES
+# Serial Number:53:ec:3b:ee:fb:b2:48:5f
+# Subject: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068,C=ES
+# Not Valid Before: Wed May 20 08:38:15 2009
+# Not Valid After : Tue Dec 31 08:38:15 2030
+# Fingerprint (MD5): 73:3A:74:7A:EC:BB:A3:96:A6:C2:E4:E2:C8:9B:C0:C3
+# Fingerprint (SHA1): AE:C5:FB:3F:C8:E1:BF:C4:E5:4F:03:07:5A:9A:E8:00:B7:F7:B6:FA
 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "TC TrustCenter Universal CA III"
+CKA_LABEL UTF8 "Autoridad de Certificacion Firmaprofesional CIF A62634068"
 CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
 CKA_SUBJECT MULTILINE_OCTAL
-\060\173\061\013\060\011\006\003\125\004\006\023\002\104\105\061
-\034\060\032\006\003\125\004\012\023\023\124\103\040\124\162\165
-\163\164\103\145\156\164\145\162\040\107\155\142\110\061\044\060
-\042\006\003\125\004\013\023\033\124\103\040\124\162\165\163\164
-\103\145\156\164\145\162\040\125\156\151\166\145\162\163\141\154
-\040\103\101\061\050\060\046\006\003\125\004\003\023\037\124\103
-\040\124\162\165\163\164\103\145\156\164\145\162\040\125\156\151
-\166\145\162\163\141\154\040\103\101\040\111\111\111
+\060\121\061\013\060\011\006\003\125\004\006\023\002\105\123\061
+\102\060\100\006\003\125\004\003\014\071\101\165\164\157\162\151
+\144\141\144\040\144\145\040\103\145\162\164\151\146\151\143\141
+\143\151\157\156\040\106\151\162\155\141\160\162\157\146\145\163
+\151\157\156\141\154\040\103\111\106\040\101\066\062\066\063\064
+\060\066\070
 END
 CKA_ID UTF8 "0"
 CKA_ISSUER MULTILINE_OCTAL
-\060\173\061\013\060\011\006\003\125\004\006\023\002\104\105\061
-\034\060\032\006\003\125\004\012\023\023\124\103\040\124\162\165
-\163\164\103\145\156\164\145\162\040\107\155\142\110\061\044\060
-\042\006\003\125\004\013\023\033\124\103\040\124\162\165\163\164
-\103\145\156\164\145\162\040\125\156\151\166\145\162\163\141\154
-\040\103\101\061\050\060\046\006\003\125\004\003\023\037\124\103
-\040\124\162\165\163\164\103\145\156\164\145\162\040\125\156\151
-\166\145\162\163\141\154\040\103\101\040\111\111\111
+\060\121\061\013\060\011\006\003\125\004\006\023\002\105\123\061
+\102\060\100\006\003\125\004\003\014\071\101\165\164\157\162\151
+\144\141\144\040\144\145\040\103\145\162\164\151\146\151\143\141
+\143\151\157\156\040\106\151\162\155\141\160\162\157\146\145\163
+\151\157\156\141\154\040\103\111\106\040\101\066\062\066\063\064
+\060\066\070
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\016\143\045\000\001\000\002\024\215\063\025\002\344\154\364
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\341\060\202\002\311\240\003\002\001\002\002\016\143
-\045\000\001\000\002\024\215\063\025\002\344\154\364\060\015\006
-\011\052\206\110\206\367\015\001\001\005\005\000\060\173\061\013
-\060\011\006\003\125\004\006\023\002\104\105\061\034\060\032\006
-\003\125\004\012\023\023\124\103\040\124\162\165\163\164\103\145
-\156\164\145\162\040\107\155\142\110\061\044\060\042\006\003\125
-\004\013\023\033\124\103\040\124\162\165\163\164\103\145\156\164
-\145\162\040\125\156\151\166\145\162\163\141\154\040\103\101\061
-\050\060\046\006\003\125\004\003\023\037\124\103\040\124\162\165
-\163\164\103\145\156\164\145\162\040\125\156\151\166\145\162\163
-\141\154\040\103\101\040\111\111\111\060\036\027\015\060\071\060
-\071\060\071\060\070\061\065\062\067\132\027\015\062\071\061\062
-\063\061\062\063\065\071\065\071\132\060\173\061\013\060\011\006
-\003\125\004\006\023\002\104\105\061\034\060\032\006\003\125\004
-\012\023\023\124\103\040\124\162\165\163\164\103\145\156\164\145
-\162\040\107\155\142\110\061\044\060\042\006\003\125\004\013\023
-\033\124\103\040\124\162\165\163\164\103\145\156\164\145\162\040
-\125\156\151\166\145\162\163\141\154\040\103\101\061\050\060\046
-\006\003\125\004\003\023\037\124\103\040\124\162\165\163\164\103
-\145\156\164\145\162\040\125\156\151\166\145\162\163\141\154\040
-\103\101\040\111\111\111\060\202\001\042\060\015\006\011\052\206
-\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202
-\001\012\002\202\001\001\000\302\332\234\142\260\271\161\022\260
-\013\310\032\127\262\256\203\024\231\263\064\113\233\220\242\305
-\347\347\057\002\240\115\055\244\372\205\332\233\045\205\055\100
-\050\040\155\352\340\275\261\110\203\042\051\104\237\116\203\356
-\065\121\023\163\164\325\274\362\060\146\224\123\300\100\066\057
-\014\204\145\316\017\156\302\130\223\350\054\013\072\351\301\216
-\373\362\153\312\074\342\234\116\216\344\371\175\323\047\237\033
-\325\147\170\207\055\177\013\107\263\307\350\311\110\174\257\057
-\314\012\331\101\357\237\376\232\341\262\256\371\123\265\345\351
-\106\237\140\343\337\215\323\177\373\226\176\263\265\162\370\113
-\255\010\171\315\151\211\100\047\365\052\301\255\103\354\244\123
-\310\141\266\367\322\171\052\147\030\166\110\155\133\045\001\321
-\046\305\267\127\151\043\025\133\141\212\255\360\033\055\331\257
-\134\361\046\220\151\251\325\014\100\365\063\200\103\217\234\243
-\166\052\105\264\257\277\177\076\207\077\166\305\315\052\336\040
-\305\026\130\313\371\033\365\017\313\015\021\122\144\270\322\166
-\142\167\203\361\130\237\377\002\003\001\000\001\243\143\060\141
-\060\037\006\003\125\035\043\004\030\060\026\200\024\126\347\341
-\133\045\103\200\340\366\214\341\161\274\216\345\200\057\304\110
-\342\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001
-\001\377\060\016\006\003\125\035\017\001\001\377\004\004\003\002
-\001\006\060\035\006\003\125\035\016\004\026\004\024\126\347\341
-\133\045\103\200\340\366\214\341\161\274\216\345\200\057\304\110
-\342\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000
-\003\202\001\001\000\203\307\257\352\177\115\012\074\071\261\150
-\276\173\155\211\056\351\263\011\347\030\127\215\205\232\027\363
-\166\102\120\023\017\307\220\157\063\255\305\111\140\053\154\111
-\130\031\324\342\276\267\277\253\111\274\224\310\253\276\050\154
-\026\150\340\310\227\106\040\240\150\147\140\210\071\040\121\330
-\150\001\021\316\247\366\021\007\366\354\354\254\032\037\262\146
-\156\126\147\140\172\164\136\300\155\227\066\256\265\015\135\146
-\163\300\045\062\105\330\112\006\007\217\304\267\007\261\115\006
-\015\341\245\353\364\165\312\272\234\320\275\263\323\062\044\114
-\356\176\342\166\004\113\111\123\330\362\351\124\063\374\345\161
-\037\075\024\134\226\113\361\072\362\000\273\154\264\372\226\125
-\010\210\011\301\314\221\031\051\260\040\055\377\313\070\244\100
-\341\027\276\171\141\200\377\007\003\206\114\116\173\006\237\021
-\206\215\211\356\047\304\333\342\274\031\216\013\303\303\023\307
-\055\003\143\073\323\350\344\242\052\302\202\010\224\026\124\360
-\357\037\047\220\045\270\015\016\050\033\107\167\107\275\034\250
-\045\361\224\264\146
-END
-
-# Trust for Certificate "TC TrustCenter Universal CA III"
-# Issuer: CN=TC TrustCenter Universal CA III,OU=TC TrustCenter Universal CA,O=TC TrustCenter GmbH,C=DE
-# Serial Number:63:25:00:01:00:02:14:8d:33:15:02:e4:6c:f4
-# Subject: CN=TC TrustCenter Universal CA III,OU=TC TrustCenter Universal CA,O=TC TrustCenter GmbH,C=DE
-# Not Valid Before: Wed Sep 09 08:15:27 2009
-# Not Valid After : Mon Dec 31 23:59:59 2029
-# Fingerprint (MD5): 9F:DD:DB:AB:FF:8E:FF:45:21:5F:F0:6C:9D:8F:FE:2B
-# Fingerprint (SHA1): 96:56:CD:7B:57:96:98:95:D0:E1:41:46:68:06:FB:B8:C6:11:06:87
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "TC TrustCenter Universal CA III"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\226\126\315\173\127\226\230\225\320\341\101\106\150\006\373\270
-\306\021\006\207
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\237\335\333\253\377\216\377\105\041\137\360\154\235\217\376\053
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\173\061\013\060\011\006\003\125\004\006\023\002\104\105\061
-\034\060\032\006\003\125\004\012\023\023\124\103\040\124\162\165
-\163\164\103\145\156\164\145\162\040\107\155\142\110\061\044\060
-\042\006\003\125\004\013\023\033\124\103\040\124\162\165\163\164
-\103\145\156\164\145\162\040\125\156\151\166\145\162\163\141\154
-\040\103\101\061\050\060\046\006\003\125\004\003\023\037\124\103
-\040\124\162\165\163\164\103\145\156\164\145\162\040\125\156\151
-\166\145\162\163\141\154\040\103\101\040\111\111\111
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\016\143\045\000\001\000\002\024\215\063\025\002\344\154\364
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Autoridad de Certificacion Firmaprofesional CIF A62634068"
-#
-# Issuer: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068,C=ES
-# Serial Number:53:ec:3b:ee:fb:b2:48:5f
-# Subject: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068,C=ES
-# Not Valid Before: Wed May 20 08:38:15 2009
-# Not Valid After : Tue Dec 31 08:38:15 2030
-# Fingerprint (MD5): 73:3A:74:7A:EC:BB:A3:96:A6:C2:E4:E2:C8:9B:C0:C3
-# Fingerprint (SHA1): AE:C5:FB:3F:C8:E1:BF:C4:E5:4F:03:07:5A:9A:E8:00:B7:F7:B6:FA
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Autoridad de Certificacion Firmaprofesional CIF A62634068"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\121\061\013\060\011\006\003\125\004\006\023\002\105\123\061
-\102\060\100\006\003\125\004\003\014\071\101\165\164\157\162\151
-\144\141\144\040\144\145\040\103\145\162\164\151\146\151\143\141
-\143\151\157\156\040\106\151\162\155\141\160\162\157\146\145\163
-\151\157\156\141\154\040\103\111\106\040\101\066\062\066\063\064
-\060\066\070
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\121\061\013\060\011\006\003\125\004\006\023\002\105\123\061
-\102\060\100\006\003\125\004\003\014\071\101\165\164\157\162\151
-\144\141\144\040\144\145\040\103\145\162\164\151\146\151\143\141
-\143\151\157\156\040\106\151\162\155\141\160\162\157\146\145\163
-\151\157\156\141\154\040\103\111\106\040\101\066\062\066\063\064
-\060\066\070
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\010\123\354\073\356\373\262\110\137
+\002\010\123\354\073\356\373\262\110\137
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\006\024\060\202\003\374\240\003\002\001\002\002\010\123
@@ -21538,152 +19914,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "A-Trust-nQual-03"
-#
-# Issuer: CN=A-Trust-nQual-03,OU=A-Trust-nQual-03,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT
-# Serial Number: 93214 (0x16c1e)
-# Subject: CN=A-Trust-nQual-03,OU=A-Trust-nQual-03,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT
-# Not Valid Before: Wed Aug 17 22:00:00 2005
-# Not Valid After : Mon Aug 17 22:00:00 2015
-# Fingerprint (MD5): 49:63:AE:27:F4:D5:95:3D:D8:DB:24:86:B8:9C:07:53
-# Fingerprint (SHA1): D3:C0:63:F2:19:ED:07:3E:34:AD:5D:75:0B:32:76:29:FF:D5:9A:F2
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "A-Trust-nQual-03"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\215\061\013\060\011\006\003\125\004\006\023\002\101\124
-\061\110\060\106\006\003\125\004\012\014\077\101\055\124\162\165
-\163\164\040\107\145\163\056\040\146\056\040\123\151\143\150\145
-\162\150\145\151\164\163\163\171\163\164\145\155\145\040\151\155
-\040\145\154\145\153\164\162\056\040\104\141\164\145\156\166\145
-\162\153\145\150\162\040\107\155\142\110\061\031\060\027\006\003
-\125\004\013\014\020\101\055\124\162\165\163\164\055\156\121\165
-\141\154\055\060\063\061\031\060\027\006\003\125\004\003\014\020
-\101\055\124\162\165\163\164\055\156\121\165\141\154\055\060\063
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\215\061\013\060\011\006\003\125\004\006\023\002\101\124
-\061\110\060\106\006\003\125\004\012\014\077\101\055\124\162\165
-\163\164\040\107\145\163\056\040\146\056\040\123\151\143\150\145
-\162\150\145\151\164\163\163\171\163\164\145\155\145\040\151\155
-\040\145\154\145\153\164\162\056\040\104\141\164\145\156\166\145
-\162\153\145\150\162\040\107\155\142\110\061\031\060\027\006\003
-\125\004\013\014\020\101\055\124\162\165\163\164\055\156\121\165
-\141\154\055\060\063\061\031\060\027\006\003\125\004\003\014\020
-\101\055\124\162\165\163\164\055\156\121\165\141\154\055\060\063
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\003\001\154\036
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\317\060\202\002\267\240\003\002\001\002\002\003\001
-\154\036\060\015\006\011\052\206\110\206\367\015\001\001\005\005
-\000\060\201\215\061\013\060\011\006\003\125\004\006\023\002\101
-\124\061\110\060\106\006\003\125\004\012\014\077\101\055\124\162
-\165\163\164\040\107\145\163\056\040\146\056\040\123\151\143\150
-\145\162\150\145\151\164\163\163\171\163\164\145\155\145\040\151
-\155\040\145\154\145\153\164\162\056\040\104\141\164\145\156\166
-\145\162\153\145\150\162\040\107\155\142\110\061\031\060\027\006
-\003\125\004\013\014\020\101\055\124\162\165\163\164\055\156\121
-\165\141\154\055\060\063\061\031\060\027\006\003\125\004\003\014
-\020\101\055\124\162\165\163\164\055\156\121\165\141\154\055\060
-\063\060\036\027\015\060\065\060\070\061\067\062\062\060\060\060
-\060\132\027\015\061\065\060\070\061\067\062\062\060\060\060\060
-\132\060\201\215\061\013\060\011\006\003\125\004\006\023\002\101
-\124\061\110\060\106\006\003\125\004\012\014\077\101\055\124\162
-\165\163\164\040\107\145\163\056\040\146\056\040\123\151\143\150
-\145\162\150\145\151\164\163\163\171\163\164\145\155\145\040\151
-\155\040\145\154\145\153\164\162\056\040\104\141\164\145\156\166
-\145\162\153\145\150\162\040\107\155\142\110\061\031\060\027\006
-\003\125\004\013\014\020\101\055\124\162\165\163\164\055\156\121
-\165\141\154\055\060\063\061\031\060\027\006\003\125\004\003\014
-\020\101\055\124\162\165\163\164\055\156\121\165\141\154\055\060
-\063\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001
-\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001
-\001\000\255\075\141\156\003\363\220\073\300\101\013\204\200\315
-\354\052\243\235\153\273\156\302\102\204\367\121\024\341\240\250
-\055\121\243\121\362\336\043\360\064\104\377\224\353\314\005\043
-\225\100\271\007\170\245\045\366\012\275\105\206\350\331\275\300
-\004\216\205\104\141\357\177\247\311\372\301\045\314\205\054\143
-\077\005\140\163\111\005\340\140\170\225\020\113\334\371\021\131
-\316\161\177\100\233\212\252\044\337\013\102\342\333\126\274\112
-\322\245\014\233\267\103\076\335\203\323\046\020\002\317\352\043
-\304\111\116\345\323\351\264\210\253\014\256\142\222\324\145\207
-\331\152\327\364\205\237\344\063\042\045\245\345\310\063\272\303
-\307\101\334\137\306\152\314\000\016\155\062\250\266\207\066\000
-\142\167\233\036\037\064\313\220\074\170\210\164\005\353\171\365
-\223\161\145\312\235\307\153\030\055\075\134\116\347\325\370\077
-\061\175\217\207\354\012\042\057\043\351\376\273\175\311\340\364
-\354\353\174\304\260\303\055\142\265\232\161\326\261\152\350\354
-\331\355\325\162\354\276\127\001\316\005\125\237\336\321\140\210
-\020\263\002\003\001\000\001\243\066\060\064\060\017\006\003\125
-\035\023\001\001\377\004\005\060\003\001\001\377\060\021\006\003
-\125\035\016\004\012\004\010\104\152\225\147\125\171\021\117\060
-\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060
-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202
-\001\001\000\125\324\124\321\131\110\134\263\223\205\252\277\143
-\057\344\200\316\064\243\064\142\076\366\330\356\147\210\061\004
-\003\157\013\324\007\373\116\165\017\323\056\323\300\027\307\306
-\050\354\006\015\021\044\016\016\245\135\277\214\262\023\226\161
-\334\324\316\016\015\012\150\062\154\271\101\061\031\253\261\007
-\173\115\230\323\134\260\321\360\247\102\240\265\304\216\257\376
-\361\077\364\357\117\106\000\166\353\002\373\371\235\322\100\226
-\307\210\072\270\237\021\171\363\200\145\250\275\037\323\170\201
-\240\121\114\067\264\246\135\045\160\321\146\311\150\371\056\021
-\024\150\361\124\230\010\254\046\222\017\336\211\236\324\372\263
-\171\053\322\243\171\324\354\213\254\207\123\150\102\114\121\121
-\164\036\033\047\056\343\365\037\051\164\115\355\257\367\341\222
-\231\201\350\276\072\307\027\120\366\267\306\374\233\260\212\153
-\326\210\003\221\217\006\167\072\205\002\335\230\325\103\170\077
-\306\060\025\254\233\153\313\127\267\211\121\213\072\350\311\204
-\014\333\261\120\040\012\032\112\272\152\032\275\354\033\310\305
-\204\232\315
-END
-
-# Trust for Certificate "A-Trust-nQual-03"
-# Issuer: CN=A-Trust-nQual-03,OU=A-Trust-nQual-03,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT
-# Serial Number: 93214 (0x16c1e)
-# Subject: CN=A-Trust-nQual-03,OU=A-Trust-nQual-03,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT
-# Not Valid Before: Wed Aug 17 22:00:00 2005
-# Not Valid After : Mon Aug 17 22:00:00 2015
-# Fingerprint (MD5): 49:63:AE:27:F4:D5:95:3D:D8:DB:24:86:B8:9C:07:53
-# Fingerprint (SHA1): D3:C0:63:F2:19:ED:07:3E:34:AD:5D:75:0B:32:76:29:FF:D5:9A:F2
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "A-Trust-nQual-03"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\323\300\143\362\031\355\007\076\064\255\135\165\013\062\166\051
-\377\325\232\362
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\111\143\256\047\364\325\225\075\330\333\044\206\270\234\007\123
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\215\061\013\060\011\006\003\125\004\006\023\002\101\124
-\061\110\060\106\006\003\125\004\012\014\077\101\055\124\162\165
-\163\164\040\107\145\163\056\040\146\056\040\123\151\143\150\145
-\162\150\145\151\164\163\163\171\163\164\145\155\145\040\151\155
-\040\145\154\145\153\164\162\056\040\104\141\164\145\156\166\145
-\162\153\145\150\162\040\107\155\142\110\061\031\060\027\006\003
-\125\004\013\014\020\101\055\124\162\165\163\164\055\156\121\165
-\141\154\055\060\063\061\031\060\027\006\003\125\004\003\014\020
-\101\055\124\162\165\163\164\055\156\121\165\141\154\055\060\063
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\003\001\154\036
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "TWCA Root Certification Authority"
 #
@@ -26489,182 +24719,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "SG TRUST SERVICES RACINE"
-#
-# Issuer: C=FR,O=SG TRUST SERVICES,OU=0002 43525289500022,CN=SG TRUST SERVICES RACINE
-# Serial Number:3e:d5:51:19:e6:4d:ce:7e
-# Subject: C=FR,O=SG TRUST SERVICES,OU=0002 43525289500022,CN=SG TRUST SERVICES RACINE
-# Not Valid Before: Mon Sep 06 12:53:42 2010
-# Not Valid After : Thu Sep 05 12:53:42 2030
-# Fingerprint (MD5): 25:EF:CF:48:4A:84:B7:30:9F:60:D3:1D:56:91:2F:E1
-# Fingerprint (SHA1): 0C:62:8F:5C:55:70:B1:C9:57:FA:FD:38:3F:B0:3D:7B:7D:D7:B9:C6
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "SG TRUST SERVICES RACINE"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\152\061\041\060\037\006\003\125\004\003\023\030\123\107\040
-\124\122\125\123\124\040\123\105\122\126\111\103\105\123\040\122
-\101\103\111\116\105\061\034\060\032\006\003\125\004\013\023\023
-\060\060\060\062\040\064\063\065\062\065\062\070\071\065\060\060
-\060\062\062\061\032\060\030\006\003\125\004\012\023\021\123\107
-\040\124\122\125\123\124\040\123\105\122\126\111\103\105\123\061
-\013\060\011\006\003\125\004\006\023\002\106\122
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\152\061\041\060\037\006\003\125\004\003\023\030\123\107\040
-\124\122\125\123\124\040\123\105\122\126\111\103\105\123\040\122
-\101\103\111\116\105\061\034\060\032\006\003\125\004\013\023\023
-\060\060\060\062\040\064\063\065\062\065\062\070\071\065\060\060
-\060\062\062\061\032\060\030\006\003\125\004\012\023\021\123\107
-\040\124\122\125\123\124\040\123\105\122\126\111\103\105\123\061
-\013\060\011\006\003\125\004\006\023\002\106\122
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\010\076\325\121\031\346\115\316\176
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\006\031\060\202\004\001\240\003\002\001\002\002\010\076
-\325\121\031\346\115\316\176\060\015\006\011\052\206\110\206\367
-\015\001\001\013\005\000\060\152\061\041\060\037\006\003\125\004
-\003\023\030\123\107\040\124\122\125\123\124\040\123\105\122\126
-\111\103\105\123\040\122\101\103\111\116\105\061\034\060\032\006
-\003\125\004\013\023\023\060\060\060\062\040\064\063\065\062\065
-\062\070\071\065\060\060\060\062\062\061\032\060\030\006\003\125
-\004\012\023\021\123\107\040\124\122\125\123\124\040\123\105\122
-\126\111\103\105\123\061\013\060\011\006\003\125\004\006\023\002
-\106\122\060\036\027\015\061\060\060\071\060\066\061\062\065\063
-\064\062\132\027\015\063\060\060\071\060\065\061\062\065\063\064
-\062\132\060\152\061\041\060\037\006\003\125\004\003\023\030\123
-\107\040\124\122\125\123\124\040\123\105\122\126\111\103\105\123
-\040\122\101\103\111\116\105\061\034\060\032\006\003\125\004\013
-\023\023\060\060\060\062\040\064\063\065\062\065\062\070\071\065
-\060\060\060\062\062\061\032\060\030\006\003\125\004\012\023\021
-\123\107\040\124\122\125\123\124\040\123\105\122\126\111\103\105
-\123\061\013\060\011\006\003\125\004\006\023\002\106\122\060\202
-\002\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005
-\000\003\202\002\017\000\060\202\002\012\002\202\002\001\000\332
-\250\126\002\354\174\225\360\116\351\012\322\267\007\243\042\213
-\120\263\271\056\031\075\127\333\031\252\322\053\344\316\102\342
-\154\241\344\135\045\036\063\035\266\105\321\264\372\131\212\126
-\160\311\155\010\166\151\160\232\346\307\234\010\060\023\376\346
-\321\222\150\141\076\114\021\362\156\362\261\173\127\126\113\011
-\275\334\017\331\161\014\350\232\067\336\042\020\034\231\136\326
-\261\027\007\323\244\071\055\302\032\163\375\312\113\051\007\302
-\171\051\310\310\046\256\054\304\374\043\310\113\342\206\126\017
-\050\375\266\207\033\150\137\071\144\105\375\150\203\154\165\044
-\036\074\165\231\141\372\322\024\370\251\113\261\330\175\247\170
-\322\023\142\145\265\326\276\176\152\003\274\265\262\374\144\060
-\303\320\302\231\075\231\244\323\315\321\261\304\123\207\173\114
-\023\023\146\177\277\325\145\123\150\371\134\036\345\264\377\066
-\231\105\243\237\142\300\177\021\202\001\124\336\017\145\245\071
-\256\235\110\114\211\243\020\073\340\346\203\365\260\332\054\036
-\172\034\134\037\000\254\314\253\247\140\144\263\306\305\173\307
-\125\106\164\074\220\201\016\112\216\131\235\124\260\110\261\122
-\114\073\230\356\253\332\064\267\123\315\111\332\057\353\225\276
-\014\127\021\366\226\114\004\171\134\231\325\345\344\276\157\352
-\107\356\121\113\357\042\046\256\265\330\021\252\103\273\170\277
-\013\176\264\335\317\164\035\045\251\211\143\261\342\064\201\304
-\210\065\070\342\002\015\017\023\311\325\052\202\025\360\212\304
-\103\062\126\344\123\035\035\254\266\317\175\233\226\135\036\144
-\351\164\163\304\126\344\026\112\122\155\222\071\323\341\115\016
-\077\142\271\336\255\265\035\145\271\135\122\376\135\011\251\234
-\264\244\014\331\057\105\166\245\317\216\152\232\236\252\260\021
-\241\353\141\306\353\077\036\374\146\264\022\235\106\177\062\026
-\211\276\161\105\257\221\041\331\375\223\277\264\002\221\102\377
-\111\037\355\213\025\150\335\037\216\254\233\335\202\005\234\104
-\151\026\144\027\126\137\101\017\112\117\004\017\145\120\206\223
-\227\354\105\277\135\302\034\334\317\304\330\072\346\170\005\320
-\305\125\125\251\136\376\253\072\041\273\345\162\024\367\013\002
-\003\001\000\001\243\201\302\060\201\277\060\035\006\003\125\035
-\016\004\026\004\024\051\040\313\361\303\017\332\006\216\023\223
-\207\376\137\140\032\051\273\363\266\060\017\006\003\125\035\023
-\001\001\377\004\005\060\003\001\001\377\060\037\006\003\125\035
-\043\004\030\060\026\200\024\051\040\313\361\303\017\332\006\216
-\023\223\207\376\137\140\032\051\273\363\266\060\021\006\003\125
-\035\040\004\012\060\010\060\006\006\004\125\035\040\000\060\111
-\006\003\125\035\037\004\102\060\100\060\076\240\074\240\072\206
-\070\150\164\164\160\072\057\057\143\162\154\056\163\147\164\162
-\165\163\164\163\145\162\166\151\143\145\163\056\143\157\155\057
-\162\141\143\151\156\145\055\107\162\157\165\160\145\123\107\057
-\114\141\164\145\163\164\103\122\114\060\016\006\003\125\035\017
-\001\001\377\004\004\003\002\001\006\060\015\006\011\052\206\110
-\206\367\015\001\001\013\005\000\003\202\002\001\000\114\106\147
-\340\104\120\365\305\266\272\262\121\012\045\023\035\267\307\210
-\056\037\271\053\144\240\313\223\210\122\131\252\140\365\314\051
-\122\027\377\004\347\067\264\061\021\106\176\053\036\154\247\213
-\074\107\232\136\364\252\135\220\073\105\075\237\112\311\212\173
-\216\300\356\076\171\213\222\243\310\224\112\270\050\021\153\246
-\045\137\135\275\307\310\373\203\117\125\061\346\134\360\023\174
-\343\275\177\052\054\067\067\224\111\257\204\037\024\047\242\130
-\020\217\012\071\067\032\022\040\101\217\031\366\251\037\031\355
-\262\064\262\255\175\063\104\213\137\012\007\103\362\166\105\105
-\055\255\344\215\016\000\375\004\010\252\347\153\373\027\275\260
-\010\126\016\065\052\162\360\263\347\115\072\117\015\334\363\140
-\022\263\070\144\214\333\371\341\046\215\057\357\116\350\044\107
-\076\066\064\212\151\017\050\153\213\207\306\275\205\046\371\323
-\353\151\041\126\140\221\326\367\340\142\302\250\161\256\056\336
-\146\043\265\122\106\246\244\110\067\054\177\001\026\127\021\367
-\047\015\016\345\017\326\220\105\341\036\077\041\334\322\374\026
-\030\023\076\115\152\262\046\152\100\136\045\170\375\070\364\254
-\130\172\067\033\230\100\004\307\216\311\324\304\147\141\261\230
-\256\360\315\016\334\271\257\145\203\173\012\004\212\077\141\252
-\367\135\101\206\346\306\114\302\117\072\134\126\352\050\073\247
-\104\317\310\112\144\365\162\140\055\343\103\270\112\340\165\074
-\062\344\252\026\327\021\271\301\105\331\233\146\143\146\345\042
-\267\064\356\272\325\164\057\045\144\363\201\124\313\167\336\127
-\324\223\343\254\007\061\072\076\134\003\203\127\123\307\360\376
-\150\330\045\120\115\022\310\346\341\225\215\147\253\074\223\077
-\027\002\272\070\327\236\367\060\245\075\075\104\001\063\032\232
-\237\216\320\237\361\356\060\210\163\357\256\044\031\272\227\163
-\025\301\354\161\014\204\144\265\173\354\274\151\076\244\155\011
-\026\066\312\112\071\212\313\247\173\306\035\176\347\063\210\311
-\276\060\155\234\205\225\041\351\107\073\006\176\201\342\352\106
-\346\160\130\200\346\250\362\235\013\151\321\063\211\131\060\363
-\144\323\013\366\316\053\011\373\175\020\166\056\020
-END
-
-# Trust for "SG TRUST SERVICES RACINE"
-# Issuer: C=FR,O=SG TRUST SERVICES,OU=0002 43525289500022,CN=SG TRUST SERVICES RACINE
-# Serial Number:3e:d5:51:19:e6:4d:ce:7e
-# Subject: C=FR,O=SG TRUST SERVICES,OU=0002 43525289500022,CN=SG TRUST SERVICES RACINE
-# Not Valid Before: Mon Sep 06 12:53:42 2010
-# Not Valid After : Thu Sep 05 12:53:42 2030
-# Fingerprint (MD5): 25:EF:CF:48:4A:84:B7:30:9F:60:D3:1D:56:91:2F:E1
-# Fingerprint (SHA1): 0C:62:8F:5C:55:70:B1:C9:57:FA:FD:38:3F:B0:3D:7B:7D:D7:B9:C6
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "SG TRUST SERVICES RACINE"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\014\142\217\134\125\160\261\311\127\372\375\070\077\260\075\173
-\175\327\271\306
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\045\357\317\110\112\204\267\060\237\140\323\035\126\221\057\341
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\152\061\041\060\037\006\003\125\004\003\023\030\123\107\040
-\124\122\125\123\124\040\123\105\122\126\111\103\105\123\040\122
-\101\103\111\116\105\061\034\060\032\006\003\125\004\013\023\023
-\060\060\060\062\040\064\063\065\062\065\062\070\071\065\060\060
-\060\062\062\061\032\060\030\006\003\125\004\012\023\021\123\107
-\040\124\122\125\123\124\040\123\105\122\126\111\103\105\123\061
-\013\060\011\006\003\125\004\006\023\002\106\122
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\010\076\325\121\031\346\115\316\176
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "ACCVRAIZ1"
 #
@@ -29839,164 +27893,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "USERTrust-temporary-intermediate-after-1024bit-removal"
-#
-# Issuer: CN=AddTrust External CA Root,OU=AddTrust External TTP Network,O=AddTrust AB,C=SE
-# Serial Number:5d:20:61:8e:8c:0e:b9:34:40:93:b9:b1:d8:63:95:b6
-# Subject: CN=USERTrust Legacy Secure Server CA,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US
-# Not Valid Before: Tue Aug 05 00:00:00 2014
-# Not Valid After : Sun Nov 01 23:59:59 2015
-# Fingerprint (SHA-256): 92:96:6E:83:44:D2:FB:3A:28:0E:B8:60:4D:81:40:77:4C:E1:A0:57:C5:82:BE:BC:83:4D:03:02:E8:59:BC:43
-# Fingerprint (SHA1): 7C:2F:91:E2:BB:96:68:A9:C6:F6:BD:10:19:2C:6B:52:5A:1B:BA:48
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "USERTrust-temporary-intermediate-after-1024bit-removal"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\177\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
-\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
-\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
-\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
-\164\167\157\162\153\061\052\060\050\006\003\125\004\003\023\041
-\125\123\105\122\124\162\165\163\164\040\114\145\147\141\143\171
-\040\123\145\143\165\162\145\040\123\145\162\166\145\162\040\103
-\101
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\157\061\013\060\011\006\003\125\004\006\023\002\123\105\061
-\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165
-\163\164\040\101\102\061\046\060\044\006\003\125\004\013\023\035
-\101\144\144\124\162\165\163\164\040\105\170\164\145\162\156\141
-\154\040\124\124\120\040\116\145\164\167\157\162\153\061\042\060
-\040\006\003\125\004\003\023\031\101\144\144\124\162\165\163\164
-\040\105\170\164\145\162\156\141\154\040\103\101\040\122\157\157
-\164
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\135\040\141\216\214\016\271\064\100\223\271\261\330\143
-\225\266
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\004\231\060\202\003\201\240\003\002\001\002\002\020\135
-\040\141\216\214\016\271\064\100\223\271\261\330\143\225\266\060
-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\157
-\061\013\060\011\006\003\125\004\006\023\002\123\105\061\024\060
-\022\006\003\125\004\012\023\013\101\144\144\124\162\165\163\164
-\040\101\102\061\046\060\044\006\003\125\004\013\023\035\101\144
-\144\124\162\165\163\164\040\105\170\164\145\162\156\141\154\040
-\124\124\120\040\116\145\164\167\157\162\153\061\042\060\040\006
-\003\125\004\003\023\031\101\144\144\124\162\165\163\164\040\105
-\170\164\145\162\156\141\154\040\103\101\040\122\157\157\164\060
-\036\027\015\061\064\060\070\060\065\060\060\060\060\060\060\132
-\027\015\061\065\061\061\060\061\062\063\065\071\065\071\132\060
-\177\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013
-\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006
-\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040
-\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124
-\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164
-\167\157\162\153\061\052\060\050\006\003\125\004\003\023\041\125
-\123\105\122\124\162\165\163\164\040\114\145\147\141\143\171\040
-\123\145\143\165\162\145\040\123\145\162\166\145\162\040\103\101
-\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001\001
-\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001\001
-\000\331\115\040\072\346\051\060\206\362\351\206\211\166\064\116
-\150\037\226\104\367\321\371\326\202\116\246\070\236\356\313\133
-\341\216\056\275\362\127\200\375\311\077\374\220\163\104\274\217
-\273\127\133\345\055\037\024\060\165\066\365\177\274\317\126\364
-\177\201\377\256\221\315\330\322\152\313\227\371\367\315\220\152
-\105\055\304\273\244\205\023\150\127\137\357\051\272\052\312\352
-\365\314\244\004\233\143\315\000\353\375\355\215\335\043\306\173
-\036\127\035\066\177\037\010\232\015\141\333\132\154\161\002\123
-\050\302\372\215\375\253\273\263\361\215\164\113\337\275\275\314
-\006\223\143\011\225\302\020\172\235\045\220\062\235\001\302\071
-\123\260\340\025\153\307\327\164\345\244\042\233\344\224\377\204
-\221\373\055\263\031\103\055\223\017\234\022\011\344\147\271\047
-\172\062\255\172\052\314\101\130\300\156\131\137\356\070\053\027
-\042\234\211\372\156\347\345\127\065\364\132\355\222\225\223\055
-\371\314\044\077\245\034\075\047\275\042\003\163\314\365\312\363
-\251\364\334\376\317\351\320\134\320\017\253\207\374\203\375\310
-\251\002\003\001\000\001\243\202\001\037\060\202\001\033\060\037
-\006\003\125\035\043\004\030\060\026\200\024\255\275\230\172\064
-\264\046\367\372\304\046\124\357\003\275\340\044\313\124\032\060
-\035\006\003\125\035\016\004\026\004\024\257\244\100\257\237\026
-\376\253\061\375\373\325\227\213\365\221\243\044\206\026\060\016
-\006\003\125\035\017\001\001\377\004\004\003\002\001\206\060\022
-\006\003\125\035\023\001\001\377\004\010\060\006\001\001\377\002
-\001\000\060\035\006\003\125\035\045\004\026\060\024\006\010\053
-\006\001\005\005\007\003\001\006\010\053\006\001\005\005\007\003
-\002\060\031\006\003\125\035\040\004\022\060\020\060\016\006\014
-\053\006\001\004\001\262\061\001\002\001\003\004\060\104\006\003
-\125\035\037\004\075\060\073\060\071\240\067\240\065\206\063\150
-\164\164\160\072\057\057\143\162\154\056\165\163\145\162\164\162
-\165\163\164\056\143\157\155\057\101\144\144\124\162\165\163\164
-\105\170\164\145\162\156\141\154\103\101\122\157\157\164\056\143
-\162\154\060\065\006\010\053\006\001\005\005\007\001\001\004\051
-\060\047\060\045\006\010\053\006\001\005\005\007\060\001\206\031
-\150\164\164\160\072\057\057\157\143\163\160\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\060\015\006\011\052\206\110
-\206\367\015\001\001\005\005\000\003\202\001\001\000\204\256\055
-\150\070\021\154\203\121\142\300\221\302\230\274\306\073\372\245
-\305\275\073\011\346\156\140\157\060\003\206\042\032\262\213\363
-\306\316\036\273\033\171\340\026\024\115\322\232\005\113\377\217
-\354\360\050\051\352\052\004\035\075\257\021\022\325\111\230\120
-\102\237\141\146\072\266\100\231\004\014\153\020\062\351\367\317
-\206\130\117\055\315\323\254\176\350\133\152\203\174\015\240\234
-\134\120\066\165\015\155\176\102\267\337\246\334\220\134\157\043
-\116\227\035\363\042\165\277\003\065\346\135\177\307\371\233\054
-\207\366\216\326\045\226\131\235\317\352\020\036\357\156\352\132
-\233\167\030\064\314\201\167\257\232\207\302\012\345\345\236\023
-\225\123\275\275\111\032\245\166\022\366\334\362\221\267\351\032
-\341\274\115\075\225\161\175\370\215\174\076\003\117\123\355\376
-\122\375\312\137\223\341\032\001\033\002\267\163\116\272\146\351
-\170\213\120\376\021\313\321\147\320\042\117\167\352\315\024\025
-\100\256\146\135\350\056\177\036\210\157\125\171\326\271\176\343
-\265\375\221\240\300\362\046\207\113\057\235\365\240
-END
-
-# Trust for "USERTrust-temporary-intermediate-after-1024bit-removal"
-# Issuer: CN=AddTrust External CA Root,OU=AddTrust External TTP Network,O=AddTrust AB,C=SE
-# Serial Number:5d:20:61:8e:8c:0e:b9:34:40:93:b9:b1:d8:63:95:b6
-# Subject: CN=USERTrust Legacy Secure Server CA,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US
-# Not Valid Before: Tue Aug 05 00:00:00 2014
-# Not Valid After : Sun Nov 01 23:59:59 2015
-# Fingerprint (SHA-256): 92:96:6E:83:44:D2:FB:3A:28:0E:B8:60:4D:81:40:77:4C:E1:A0:57:C5:82:BE:BC:83:4D:03:02:E8:59:BC:43
-# Fingerprint (SHA1): 7C:2F:91:E2:BB:96:68:A9:C6:F6:BD:10:19:2C:6B:52:5A:1B:BA:48
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "USERTrust-temporary-intermediate-after-1024bit-removal"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\174\057\221\342\273\226\150\251\306\366\275\020\031\054\153\122
-\132\033\272\110
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\131\153\146\214\004\251\341\013\017\356\105\245\220\044\037\016
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\157\061\013\060\011\006\003\125\004\006\023\002\123\105\061
-\024\060\022\006\003\125\004\012\023\013\101\144\144\124\162\165
-\163\164\040\101\102\061\046\060\044\006\003\125\004\013\023\035
-\101\144\144\124\162\165\163\164\040\105\170\164\145\162\156\141
-\154\040\124\124\120\040\116\145\164\167\157\162\153\061\042\060
-\040\006\003\125\004\003\023\031\101\144\144\124\162\165\163\164
-\040\105\170\164\145\162\156\141\154\040\103\101\040\122\157\157
-\164
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\135\040\141\216\214\016\271\064\100\223\271\261\330\143
-\225\266
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "VeriSign-C3SSA-G2-temporary-intermediate-after-1024bit-removal"
 #
@@ -31590,3 +29486,868 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_NOT_TRUSTED
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H5"
+#
+# Issuer: CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s.. H5,O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A....,L=Ankara,C=TR
+# Serial Number:00:8e:17:fe:24:20:81
+# Subject: CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s.. H5,O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A....,L=Ankara,C=TR
+# Not Valid Before: Tue Apr 30 08:07:01 2013
+# Not Valid After : Fri Apr 28 08:07:01 2023
+# Fingerprint (SHA-256): 49:35:1B:90:34:44:C1:85:CC:DC:5C:69:3D:24:D8:55:5C:B2:08:D6:A8:14:13:07:69:9F:4A:F0:63:19:9D:78
+# Fingerprint (SHA1): C4:18:F6:4D:46:D1:DF:00:3D:27:30:13:72:43:A9:12:11:C6:75:FB
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H5"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\261\061\013\060\011\006\003\125\004\006\023\002\124\122
+\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141\162
+\141\061\115\060\113\006\003\125\004\012\014\104\124\303\234\122
+\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260\154
+\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151\305
+\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151\040
+\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236\056
+\061\102\060\100\006\003\125\004\003\014\071\124\303\234\122\113
+\124\122\125\123\124\040\105\154\145\153\164\162\157\156\151\153
+\040\123\145\162\164\151\146\151\153\141\040\110\151\172\155\145
+\164\040\123\141\304\237\154\141\171\304\261\143\304\261\163\304
+\261\040\110\065
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\261\061\013\060\011\006\003\125\004\006\023\002\124\122
+\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141\162
+\141\061\115\060\113\006\003\125\004\012\014\104\124\303\234\122
+\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260\154
+\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151\305
+\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151\040
+\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236\056
+\061\102\060\100\006\003\125\004\003\014\071\124\303\234\122\113
+\124\122\125\123\124\040\105\154\145\153\164\162\157\156\151\153
+\040\123\145\162\164\151\146\151\153\141\040\110\151\172\155\145
+\164\040\123\141\304\237\154\141\171\304\261\143\304\261\163\304
+\261\040\110\065
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\007\000\216\027\376\044\040\201
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\004\047\060\202\003\017\240\003\002\001\002\002\007\000
+\216\027\376\044\040\201\060\015\006\011\052\206\110\206\367\015
+\001\001\013\005\000\060\201\261\061\013\060\011\006\003\125\004
+\006\023\002\124\122\061\017\060\015\006\003\125\004\007\014\006
+\101\156\153\141\162\141\061\115\060\113\006\003\125\004\012\014
+\104\124\303\234\122\113\124\122\125\123\124\040\102\151\154\147
+\151\040\304\260\154\145\164\151\305\237\151\155\040\166\145\040
+\102\151\154\151\305\237\151\155\040\107\303\274\166\145\156\154
+\151\304\237\151\040\110\151\172\155\145\164\154\145\162\151\040
+\101\056\305\236\056\061\102\060\100\006\003\125\004\003\014\071
+\124\303\234\122\113\124\122\125\123\124\040\105\154\145\153\164
+\162\157\156\151\153\040\123\145\162\164\151\146\151\153\141\040
+\110\151\172\155\145\164\040\123\141\304\237\154\141\171\304\261
+\143\304\261\163\304\261\040\110\065\060\036\027\015\061\063\060
+\064\063\060\060\070\060\067\060\061\132\027\015\062\063\060\064
+\062\070\060\070\060\067\060\061\132\060\201\261\061\013\060\011
+\006\003\125\004\006\023\002\124\122\061\017\060\015\006\003\125
+\004\007\014\006\101\156\153\141\162\141\061\115\060\113\006\003
+\125\004\012\014\104\124\303\234\122\113\124\122\125\123\124\040
+\102\151\154\147\151\040\304\260\154\145\164\151\305\237\151\155
+\040\166\145\040\102\151\154\151\305\237\151\155\040\107\303\274
+\166\145\156\154\151\304\237\151\040\110\151\172\155\145\164\154
+\145\162\151\040\101\056\305\236\056\061\102\060\100\006\003\125
+\004\003\014\071\124\303\234\122\113\124\122\125\123\124\040\105
+\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151\146
+\151\153\141\040\110\151\172\155\145\164\040\123\141\304\237\154
+\141\171\304\261\143\304\261\163\304\261\040\110\065\060\202\001
+\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000
+\003\202\001\017\000\060\202\001\012\002\202\001\001\000\244\045
+\031\341\145\236\353\110\041\120\112\010\345\021\360\132\272\046
+\377\203\131\316\104\052\057\376\341\316\140\003\374\215\003\245
+\355\377\153\250\272\314\064\006\237\131\065\366\354\054\273\235
+\373\215\122\151\343\234\047\020\123\363\244\002\305\247\371\021
+\032\151\165\156\303\035\213\321\230\215\223\207\247\161\227\015
+\041\307\231\371\122\323\054\143\135\125\274\350\037\001\110\271
+\140\376\102\112\366\310\200\256\315\146\172\236\105\212\150\167
+\342\110\150\237\242\332\361\341\301\020\237\353\074\051\201\247
+\341\062\010\324\240\005\261\214\373\215\226\000\016\076\045\337
+\123\206\042\073\374\364\275\363\011\176\167\354\206\353\017\063
+\345\103\117\364\124\165\155\051\231\056\146\132\103\337\313\134
+\312\310\345\070\361\176\073\065\235\017\364\305\132\241\314\363
+\040\200\044\323\127\354\025\272\165\045\233\350\144\113\263\064
+\204\357\004\270\366\311\154\252\002\076\266\125\342\062\067\137
+\374\146\227\137\315\326\236\307\040\277\115\306\254\077\165\137
+\034\355\062\234\174\151\000\151\221\343\043\030\123\351\002\003
+\001\000\001\243\102\060\100\060\035\006\003\125\035\016\004\026
+\004\024\126\231\007\036\323\254\014\151\144\264\014\120\107\336
+\103\054\276\040\300\373\060\016\006\003\125\035\017\001\001\377
+\004\004\003\002\001\006\060\017\006\003\125\035\023\001\001\377
+\004\005\060\003\001\001\377\060\015\006\011\052\206\110\206\367
+\015\001\001\013\005\000\003\202\001\001\000\236\105\166\173\027
+\110\062\362\070\213\051\275\356\226\112\116\201\030\261\121\107
+\040\315\320\144\261\016\311\331\001\331\011\316\310\231\334\150
+\045\023\324\134\362\243\350\004\376\162\011\307\013\252\035\045
+\125\176\226\232\127\267\272\305\021\172\031\346\247\176\075\205
+\016\365\371\056\051\057\347\371\154\130\026\127\120\045\366\076
+\056\076\252\355\167\161\252\252\231\226\106\012\256\216\354\052
+\121\026\260\136\315\352\147\004\034\130\060\365\140\212\275\246
+\275\115\345\226\264\374\102\211\001\153\366\160\310\120\071\014
+\055\325\146\331\310\322\263\062\267\033\031\155\313\063\371\337
+\245\346\025\204\067\360\302\362\145\226\222\220\167\360\255\364
+\220\351\021\170\327\223\211\300\075\013\272\051\364\350\231\235
+\162\216\355\235\057\356\222\175\241\361\377\135\272\063\140\205
+\142\376\007\002\241\204\126\106\276\226\012\232\023\327\041\114
+\267\174\007\237\116\116\077\221\164\373\047\235\021\314\335\346
+\261\312\161\115\023\027\071\046\305\051\041\053\223\051\152\226
+\372\253\101\341\113\266\065\013\300\233\025
+END
+
+# Trust for "TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H5"
+# Issuer: CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s.. H5,O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A....,L=Ankara,C=TR
+# Serial Number:00:8e:17:fe:24:20:81
+# Subject: CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s.. H5,O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A....,L=Ankara,C=TR
+# Not Valid Before: Tue Apr 30 08:07:01 2013
+# Not Valid After : Fri Apr 28 08:07:01 2023
+# Fingerprint (SHA-256): 49:35:1B:90:34:44:C1:85:CC:DC:5C:69:3D:24:D8:55:5C:B2:08:D6:A8:14:13:07:69:9F:4A:F0:63:19:9D:78
+# Fingerprint (SHA1): C4:18:F6:4D:46:D1:DF:00:3D:27:30:13:72:43:A9:12:11:C6:75:FB
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H5"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\304\030\366\115\106\321\337\000\075\047\060\023\162\103\251\022
+\021\306\165\373
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\332\160\216\360\042\337\223\046\366\137\237\323\025\006\122\116
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\261\061\013\060\011\006\003\125\004\006\023\002\124\122
+\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141\162
+\141\061\115\060\113\006\003\125\004\012\014\104\124\303\234\122
+\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260\154
+\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151\305
+\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151\040
+\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236\056
+\061\102\060\100\006\003\125\004\003\014\071\124\303\234\122\113
+\124\122\125\123\124\040\105\154\145\153\164\162\157\156\151\153
+\040\123\145\162\164\151\146\151\153\141\040\110\151\172\155\145
+\164\040\123\141\304\237\154\141\171\304\261\143\304\261\163\304
+\261\040\110\065
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\007\000\216\027\376\044\040\201
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H6"
+#
+# Issuer: CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s.. H6,O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A....,L=Ankara,C=TR
+# Serial Number:7d:a1:f2:65:ec:8a
+# Subject: CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s.. H6,O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A....,L=Ankara,C=TR
+# Not Valid Before: Wed Dec 18 09:04:10 2013
+# Not Valid After : Sat Dec 16 09:04:10 2023
+# Fingerprint (SHA-256): 8D:E7:86:55:E1:BE:7F:78:47:80:0B:93:F6:94:D2:1D:36:8C:C0:6E:03:3E:7F:AB:04:BB:5E:B9:9D:A6:B7:00
+# Fingerprint (SHA1): 8A:5C:8C:EE:A5:03:E6:05:56:BA:D8:1B:D4:F6:C9:B0:ED:E5:2F:E0
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H6"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\261\061\013\060\011\006\003\125\004\006\023\002\124\122
+\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141\162
+\141\061\115\060\113\006\003\125\004\012\014\104\124\303\234\122
+\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260\154
+\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151\305
+\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151\040
+\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236\056
+\061\102\060\100\006\003\125\004\003\014\071\124\303\234\122\113
+\124\122\125\123\124\040\105\154\145\153\164\162\157\156\151\153
+\040\123\145\162\164\151\146\151\153\141\040\110\151\172\155\145
+\164\040\123\141\304\237\154\141\171\304\261\143\304\261\163\304
+\261\040\110\066
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\261\061\013\060\011\006\003\125\004\006\023\002\124\122
+\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141\162
+\141\061\115\060\113\006\003\125\004\012\014\104\124\303\234\122
+\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260\154
+\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151\305
+\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151\040
+\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236\056
+\061\102\060\100\006\003\125\004\003\014\071\124\303\234\122\113
+\124\122\125\123\124\040\105\154\145\153\164\162\157\156\151\153
+\040\123\145\162\164\151\146\151\153\141\040\110\151\172\155\145
+\164\040\123\141\304\237\154\141\171\304\261\143\304\261\163\304
+\261\040\110\066
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\006\175\241\362\145\354\212
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\004\046\060\202\003\016\240\003\002\001\002\002\006\175
+\241\362\145\354\212\060\015\006\011\052\206\110\206\367\015\001
+\001\013\005\000\060\201\261\061\013\060\011\006\003\125\004\006
+\023\002\124\122\061\017\060\015\006\003\125\004\007\014\006\101
+\156\153\141\162\141\061\115\060\113\006\003\125\004\012\014\104
+\124\303\234\122\113\124\122\125\123\124\040\102\151\154\147\151
+\040\304\260\154\145\164\151\305\237\151\155\040\166\145\040\102
+\151\154\151\305\237\151\155\040\107\303\274\166\145\156\154\151
+\304\237\151\040\110\151\172\155\145\164\154\145\162\151\040\101
+\056\305\236\056\061\102\060\100\006\003\125\004\003\014\071\124
+\303\234\122\113\124\122\125\123\124\040\105\154\145\153\164\162
+\157\156\151\153\040\123\145\162\164\151\146\151\153\141\040\110
+\151\172\155\145\164\040\123\141\304\237\154\141\171\304\261\143
+\304\261\163\304\261\040\110\066\060\036\027\015\061\063\061\062
+\061\070\060\071\060\064\061\060\132\027\015\062\063\061\062\061
+\066\060\071\060\064\061\060\132\060\201\261\061\013\060\011\006
+\003\125\004\006\023\002\124\122\061\017\060\015\006\003\125\004
+\007\014\006\101\156\153\141\162\141\061\115\060\113\006\003\125
+\004\012\014\104\124\303\234\122\113\124\122\125\123\124\040\102
+\151\154\147\151\040\304\260\154\145\164\151\305\237\151\155\040
+\166\145\040\102\151\154\151\305\237\151\155\040\107\303\274\166
+\145\156\154\151\304\237\151\040\110\151\172\155\145\164\154\145
+\162\151\040\101\056\305\236\056\061\102\060\100\006\003\125\004
+\003\014\071\124\303\234\122\113\124\122\125\123\124\040\105\154
+\145\153\164\162\157\156\151\153\040\123\145\162\164\151\146\151
+\153\141\040\110\151\172\155\145\164\040\123\141\304\237\154\141
+\171\304\261\143\304\261\163\304\261\040\110\066\060\202\001\042
+\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003
+\202\001\017\000\060\202\001\012\002\202\001\001\000\235\260\150
+\326\350\275\024\226\243\000\012\232\361\364\307\314\221\115\161
+\170\167\271\367\041\046\025\163\121\026\224\011\107\005\342\063
+\365\150\232\065\377\334\113\057\062\307\260\355\342\202\345\157
+\332\332\352\254\306\006\317\045\015\101\201\366\301\070\042\275
+\371\261\245\246\263\001\274\077\120\027\053\366\351\146\125\324
+\063\263\134\370\103\040\170\223\125\026\160\031\062\346\211\327
+\144\353\275\110\120\375\366\320\101\003\302\164\267\375\366\200
+\317\133\305\253\244\326\225\022\233\347\227\023\062\003\351\324
+\253\103\133\026\355\063\042\144\051\266\322\223\255\057\154\330
+\075\266\366\035\016\064\356\322\175\251\125\017\040\364\375\051
+\273\221\133\034\175\306\102\070\155\102\050\155\324\001\373\315
+\210\227\111\176\270\363\203\370\265\230\057\263\047\013\110\136
+\126\347\116\243\063\263\104\326\245\362\030\224\355\034\036\251
+\225\134\142\112\370\015\147\121\251\257\041\325\370\062\235\171
+\272\032\137\345\004\125\115\023\106\377\362\317\164\307\032\143
+\155\303\037\027\022\303\036\020\076\140\010\263\061\002\003\001
+\000\001\243\102\060\100\060\035\006\003\125\035\016\004\026\004
+\024\335\125\027\023\366\254\350\110\041\312\357\265\257\321\000
+\062\355\236\214\265\060\016\006\003\125\035\017\001\001\377\004
+\004\003\002\001\006\060\017\006\003\125\035\023\001\001\377\004
+\005\060\003\001\001\377\060\015\006\011\052\206\110\206\367\015
+\001\001\013\005\000\003\202\001\001\000\157\130\015\227\103\252
+\026\124\076\277\251\337\222\105\077\205\013\273\126\323\014\122
+\314\310\277\166\147\136\346\252\263\247\357\271\254\264\020\024
+\015\164\176\075\155\255\321\175\320\232\251\245\312\030\073\002
+\100\056\052\234\120\024\213\376\127\176\127\134\021\011\113\066
+\105\122\367\075\254\024\375\104\337\213\227\043\324\303\301\356
+\324\123\225\376\054\112\376\015\160\252\273\213\057\055\313\062
+\243\202\362\124\337\330\362\335\327\110\162\356\112\243\051\226
+\303\104\316\156\265\222\207\166\244\273\364\222\154\316\054\024
+\011\146\216\215\255\026\265\307\033\011\141\073\343\040\242\003
+\200\216\255\176\121\000\116\307\226\206\373\103\230\167\175\050
+\307\217\330\052\156\347\204\157\227\101\051\000\026\136\115\342
+\023\352\131\300\143\147\072\104\373\230\374\004\323\060\162\246
+\366\207\011\127\255\166\246\035\143\232\375\327\145\310\170\203
+\053\165\073\245\133\270\015\135\177\276\043\256\126\125\224\130
+\357\037\201\214\052\262\315\346\233\143\236\030\274\345\153\006
+\264\013\230\113\050\136\257\210\130\313
+END
+
+# Trust for "TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H6"
+# Issuer: CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s.. H6,O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A....,L=Ankara,C=TR
+# Serial Number:7d:a1:f2:65:ec:8a
+# Subject: CN=T..RKTRUST Elektronik Sertifika Hizmet Sa..lay..c..s.. H6,O=T..RKTRUST Bilgi ..leti..im ve Bili..im G..venli..i Hizmetleri A....,L=Ankara,C=TR
+# Not Valid Before: Wed Dec 18 09:04:10 2013
+# Not Valid After : Sat Dec 16 09:04:10 2023
+# Fingerprint (SHA-256): 8D:E7:86:55:E1:BE:7F:78:47:80:0B:93:F6:94:D2:1D:36:8C:C0:6E:03:3E:7F:AB:04:BB:5E:B9:9D:A6:B7:00
+# Fingerprint (SHA1): 8A:5C:8C:EE:A5:03:E6:05:56:BA:D8:1B:D4:F6:C9:B0:ED:E5:2F:E0
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H6"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\212\134\214\356\245\003\346\005\126\272\330\033\324\366\311\260
+\355\345\057\340
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\370\305\356\052\153\276\225\215\010\367\045\112\352\161\076\106
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\261\061\013\060\011\006\003\125\004\006\023\002\124\122
+\061\017\060\015\006\003\125\004\007\014\006\101\156\153\141\162
+\141\061\115\060\113\006\003\125\004\012\014\104\124\303\234\122
+\113\124\122\125\123\124\040\102\151\154\147\151\040\304\260\154
+\145\164\151\305\237\151\155\040\166\145\040\102\151\154\151\305
+\237\151\155\040\107\303\274\166\145\156\154\151\304\237\151\040
+\110\151\172\155\145\164\154\145\162\151\040\101\056\305\236\056
+\061\102\060\100\006\003\125\004\003\014\071\124\303\234\122\113
+\124\122\125\123\124\040\105\154\145\153\164\162\157\156\151\153
+\040\123\145\162\164\151\146\151\153\141\040\110\151\172\155\145
+\164\040\123\141\304\237\154\141\171\304\261\143\304\261\163\304
+\261\040\110\066
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\006\175\241\362\145\354\212
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Certinomis - Root CA"
+#
+# Issuer: CN=Certinomis - Root CA,OU=0002 433998903,O=Certinomis,C=FR
+# Serial Number: 1 (0x1)
+# Subject: CN=Certinomis - Root CA,OU=0002 433998903,O=Certinomis,C=FR
+# Not Valid Before: Mon Oct 21 09:17:18 2013
+# Not Valid After : Fri Oct 21 09:17:18 2033
+# Fingerprint (SHA-256): 2A:99:F5:BC:11:74:B7:3C:BB:1D:62:08:84:E0:1C:34:E5:1C:CB:39:78:DA:12:5F:0E:33:26:88:83:BF:41:58
+# Fingerprint (SHA1): 9D:70:BB:01:A5:A4:A0:18:11:2E:F7:1C:01:B9:32:C5:34:E7:88:A8
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Certinomis - Root CA"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\132\061\013\060\011\006\003\125\004\006\023\002\106\122\061
+\023\060\021\006\003\125\004\012\023\012\103\145\162\164\151\156
+\157\155\151\163\061\027\060\025\006\003\125\004\013\023\016\060
+\060\060\062\040\064\063\063\071\071\070\071\060\063\061\035\060
+\033\006\003\125\004\003\023\024\103\145\162\164\151\156\157\155
+\151\163\040\055\040\122\157\157\164\040\103\101
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\132\061\013\060\011\006\003\125\004\006\023\002\106\122\061
+\023\060\021\006\003\125\004\012\023\012\103\145\162\164\151\156
+\157\155\151\163\061\027\060\025\006\003\125\004\013\023\016\060
+\060\060\062\040\064\063\063\071\071\070\071\060\063\061\035\060
+\033\006\003\125\004\003\023\024\103\145\162\164\151\156\157\155
+\151\163\040\055\040\122\157\157\164\040\103\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\001
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\222\060\202\003\172\240\003\002\001\002\002\001\001
+\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060
+\132\061\013\060\011\006\003\125\004\006\023\002\106\122\061\023
+\060\021\006\003\125\004\012\023\012\103\145\162\164\151\156\157
+\155\151\163\061\027\060\025\006\003\125\004\013\023\016\060\060
+\060\062\040\064\063\063\071\071\070\071\060\063\061\035\060\033
+\006\003\125\004\003\023\024\103\145\162\164\151\156\157\155\151
+\163\040\055\040\122\157\157\164\040\103\101\060\036\027\015\061
+\063\061\060\062\061\060\071\061\067\061\070\132\027\015\063\063
+\061\060\062\061\060\071\061\067\061\070\132\060\132\061\013\060
+\011\006\003\125\004\006\023\002\106\122\061\023\060\021\006\003
+\125\004\012\023\012\103\145\162\164\151\156\157\155\151\163\061
+\027\060\025\006\003\125\004\013\023\016\060\060\060\062\040\064
+\063\063\071\071\070\071\060\063\061\035\060\033\006\003\125\004
+\003\023\024\103\145\162\164\151\156\157\155\151\163\040\055\040
+\122\157\157\164\040\103\101\060\202\002\042\060\015\006\011\052
+\206\110\206\367\015\001\001\001\005\000\003\202\002\017\000\060
+\202\002\012\002\202\002\001\000\324\314\011\012\054\077\222\366
+\177\024\236\013\234\232\152\035\100\060\144\375\252\337\016\036
+\006\133\237\120\205\352\315\215\253\103\147\336\260\372\176\200
+\226\236\204\170\222\110\326\343\071\356\316\344\131\130\227\345
+\056\047\230\352\223\250\167\233\112\360\357\164\200\055\353\060
+\037\265\331\307\200\234\142\047\221\210\360\112\211\335\334\210
+\346\024\371\325\003\057\377\225\333\275\237\354\054\372\024\025
+\131\225\012\306\107\174\151\030\271\247\003\371\312\166\251\317
+\307\157\264\136\005\376\356\301\122\262\165\062\207\354\355\051
+\146\073\363\112\026\202\366\326\232\333\162\230\351\336\360\305
+\114\245\253\265\352\001\342\214\056\144\177\144\157\375\243\045
+\223\213\310\242\016\111\215\064\360\037\354\130\105\056\064\252
+\204\120\275\347\262\112\023\270\260\017\256\070\135\260\251\033
+\346\163\311\132\241\331\146\100\252\251\115\246\064\002\255\204
+\176\262\043\301\373\052\306\147\364\064\266\260\225\152\063\117
+\161\104\265\255\300\171\063\210\340\277\355\243\240\024\264\234
+\011\260\012\343\140\276\370\370\146\210\315\133\361\167\005\340
+\265\163\156\301\175\106\056\216\113\047\246\315\065\012\375\345
+\115\175\252\052\243\051\307\132\150\004\350\345\326\223\244\142
+\302\305\346\364\117\306\371\237\032\215\202\111\031\212\312\131
+\103\072\350\015\062\301\364\114\023\003\157\156\246\077\221\163
+\313\312\163\157\022\040\213\356\300\202\170\336\113\056\302\111
+\303\035\355\026\366\044\364\047\033\134\127\061\334\125\356\250
+\036\157\154\254\342\105\314\127\127\212\165\127\031\340\265\130
+\231\111\066\061\074\063\001\155\026\112\315\270\052\203\204\206
+\233\371\140\322\037\155\221\003\323\140\246\325\075\232\335\167
+\220\075\065\244\237\017\136\365\122\104\151\271\300\272\334\317
+\175\337\174\331\304\254\206\042\062\274\173\153\221\357\172\370
+\027\150\260\342\123\125\140\055\257\076\302\203\330\331\011\053
+\360\300\144\333\207\213\221\314\221\353\004\375\166\264\225\232
+\346\024\006\033\325\064\035\276\330\377\164\034\123\205\231\340
+\131\122\112\141\355\210\236\153\111\211\106\176\040\132\331\347
+\112\345\152\356\322\145\021\103\002\003\001\000\001\243\143\060
+\141\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001
+\006\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001
+\001\377\060\035\006\003\125\035\016\004\026\004\024\357\221\114
+\365\245\303\060\350\057\010\352\323\161\042\244\222\150\170\164
+\331\060\037\006\003\125\035\043\004\030\060\026\200\024\357\221
+\114\365\245\303\060\350\057\010\352\323\161\042\244\222\150\170
+\164\331\060\015\006\011\052\206\110\206\367\015\001\001\013\005
+\000\003\202\002\001\000\176\075\124\332\042\135\032\130\076\073
+\124\047\272\272\314\310\343\032\152\352\076\371\022\353\126\137
+\075\120\316\340\352\110\046\046\317\171\126\176\221\034\231\077
+\320\241\221\034\054\017\117\230\225\131\123\275\320\042\330\210
+\135\234\067\374\373\144\301\170\214\213\232\140\011\352\325\372
+\041\137\320\164\145\347\120\305\277\056\271\013\013\255\265\260
+\027\246\022\214\324\142\170\352\126\152\354\012\322\100\303\074
+\005\060\076\115\224\267\237\112\003\323\175\047\113\266\376\104
+\316\372\031\063\032\155\244\102\321\335\314\310\310\327\026\122
+\203\117\065\224\263\022\125\175\345\342\102\353\344\234\223\011
+\300\114\133\007\253\307\155\021\240\120\027\224\043\250\265\012
+\222\017\262\172\301\140\054\070\314\032\246\133\377\362\014\343
+\252\037\034\334\270\240\223\047\336\143\343\177\041\237\072\345
+\236\372\340\023\152\165\353\226\134\142\221\224\216\147\123\266
+\211\370\022\011\313\157\122\133\003\162\206\120\225\010\324\215
+\207\206\025\037\225\044\330\244\157\232\316\244\235\233\155\322
+\262\166\006\206\306\126\010\305\353\011\332\066\302\033\133\101
+\276\141\052\343\160\346\270\246\370\266\132\304\275\041\367\377
+\252\137\241\154\166\071\146\326\352\114\125\341\000\063\233\023
+\230\143\311\157\320\001\040\011\067\122\347\014\117\076\315\274
+\365\137\226\047\247\040\002\225\340\056\350\007\101\005\037\025
+\156\326\260\344\031\340\017\002\223\000\047\162\305\213\321\124
+\037\135\112\303\100\227\176\125\246\174\301\063\004\024\001\035
+\111\040\151\013\031\223\235\156\130\042\367\100\014\106\014\043
+\143\363\071\322\177\166\121\247\364\310\241\361\014\166\042\043
+\106\122\051\055\342\243\101\007\126\151\230\322\005\011\274\151
+\307\132\141\315\217\201\140\025\115\200\335\220\342\175\304\120
+\362\214\073\156\112\307\306\346\200\053\074\201\274\021\200\026
+\020\047\327\360\315\077\171\314\163\052\303\176\123\221\326\156
+\370\365\363\307\320\121\115\216\113\245\133\346\031\027\073\326
+\201\011\334\042\334\356\216\271\304\217\123\341\147\273\063\270
+\210\025\106\317\355\151\065\377\165\015\106\363\316\161\341\305
+\153\206\102\006\271\101
+END
+
+# Trust for "Certinomis - Root CA"
+# Issuer: CN=Certinomis - Root CA,OU=0002 433998903,O=Certinomis,C=FR
+# Serial Number: 1 (0x1)
+# Subject: CN=Certinomis - Root CA,OU=0002 433998903,O=Certinomis,C=FR
+# Not Valid Before: Mon Oct 21 09:17:18 2013
+# Not Valid After : Fri Oct 21 09:17:18 2033
+# Fingerprint (SHA-256): 2A:99:F5:BC:11:74:B7:3C:BB:1D:62:08:84:E0:1C:34:E5:1C:CB:39:78:DA:12:5F:0E:33:26:88:83:BF:41:58
+# Fingerprint (SHA1): 9D:70:BB:01:A5:A4:A0:18:11:2E:F7:1C:01:B9:32:C5:34:E7:88:A8
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Certinomis - Root CA"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\235\160\273\001\245\244\240\030\021\056\367\034\001\271\062\305
+\064\347\210\250
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\024\012\375\215\250\050\265\070\151\333\126\176\141\042\003\077
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\132\061\013\060\011\006\003\125\004\006\023\002\106\122\061
+\023\060\021\006\003\125\004\012\023\012\103\145\162\164\151\156
+\157\155\151\163\061\027\060\025\006\003\125\004\013\023\016\060
+\060\060\062\040\064\063\063\071\071\070\071\060\063\061\035\060
+\033\006\003\125\004\003\023\024\103\145\162\164\151\156\157\155
+\151\163\040\055\040\122\157\157\164\040\103\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\001
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "OISTE WISeKey Global Root GB CA"
+#
+# Issuer: CN=OISTE WISeKey Global Root GB CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH
+# Serial Number:76:b1:20:52:74:f0:85:87:46:b3:f8:23:1a:f6:c2:c0
+# Subject: CN=OISTE WISeKey Global Root GB CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH
+# Not Valid Before: Mon Dec 01 15:00:32 2014
+# Not Valid After : Thu Dec 01 15:10:31 2039
+# Fingerprint (SHA-256): 6B:9C:08:E8:6E:B0:F7:67:CF:AD:65:CD:98:B6:21:49:E5:49:4A:67:F5:84:5E:7B:D1:ED:01:9F:27:B8:6B:D6
+# Fingerprint (SHA1): 0F:F9:40:76:18:D3:D7:6A:4B:98:F0:A8:35:9E:0C:FD:27:AC:CC:ED
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "OISTE WISeKey Global Root GB CA"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\155\061\013\060\011\006\003\125\004\006\023\002\103\110\061
+\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113\145
+\171\061\042\060\040\006\003\125\004\013\023\031\117\111\123\124
+\105\040\106\157\165\156\144\141\164\151\157\156\040\105\156\144
+\157\162\163\145\144\061\050\060\046\006\003\125\004\003\023\037
+\117\111\123\124\105\040\127\111\123\145\113\145\171\040\107\154
+\157\142\141\154\040\122\157\157\164\040\107\102\040\103\101
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\155\061\013\060\011\006\003\125\004\006\023\002\103\110\061
+\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113\145
+\171\061\042\060\040\006\003\125\004\013\023\031\117\111\123\124
+\105\040\106\157\165\156\144\141\164\151\157\156\040\105\156\144
+\157\162\163\145\144\061\050\060\046\006\003\125\004\003\023\037
+\117\111\123\124\105\040\127\111\123\145\113\145\171\040\107\154
+\157\142\141\154\040\122\157\157\164\040\107\102\040\103\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\166\261\040\122\164\360\205\207\106\263\370\043\032\366
+\302\300
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\265\060\202\002\235\240\003\002\001\002\002\020\166
+\261\040\122\164\360\205\207\106\263\370\043\032\366\302\300\060
+\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\155
+\061\013\060\011\006\003\125\004\006\023\002\103\110\061\020\060
+\016\006\003\125\004\012\023\007\127\111\123\145\113\145\171\061
+\042\060\040\006\003\125\004\013\023\031\117\111\123\124\105\040
+\106\157\165\156\144\141\164\151\157\156\040\105\156\144\157\162
+\163\145\144\061\050\060\046\006\003\125\004\003\023\037\117\111
+\123\124\105\040\127\111\123\145\113\145\171\040\107\154\157\142
+\141\154\040\122\157\157\164\040\107\102\040\103\101\060\036\027
+\015\061\064\061\062\060\061\061\065\060\060\063\062\132\027\015
+\063\071\061\062\060\061\061\065\061\060\063\061\132\060\155\061
+\013\060\011\006\003\125\004\006\023\002\103\110\061\020\060\016
+\006\003\125\004\012\023\007\127\111\123\145\113\145\171\061\042
+\060\040\006\003\125\004\013\023\031\117\111\123\124\105\040\106
+\157\165\156\144\141\164\151\157\156\040\105\156\144\157\162\163
+\145\144\061\050\060\046\006\003\125\004\003\023\037\117\111\123
+\124\105\040\127\111\123\145\113\145\171\040\107\154\157\142\141
+\154\040\122\157\157\164\040\107\102\040\103\101\060\202\001\042
+\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003
+\202\001\017\000\060\202\001\012\002\202\001\001\000\330\027\267
+\034\112\044\052\326\227\261\312\342\036\373\175\070\357\230\365
+\262\071\230\116\047\270\021\135\173\322\045\224\210\202\025\046
+\152\033\061\273\250\133\041\041\053\330\017\116\237\132\361\261
+\132\344\171\326\062\043\053\341\123\314\231\105\134\173\117\255
+\274\277\207\112\013\113\227\132\250\366\110\354\175\173\015\315
+\041\006\337\236\025\375\101\212\110\267\040\364\241\172\033\127
+\324\135\120\377\272\147\330\043\231\037\310\077\343\336\377\157
+\133\167\261\153\156\270\311\144\367\341\312\101\106\016\051\161
+\320\271\043\374\311\201\137\116\367\157\337\277\204\255\163\144
+\273\267\102\216\151\366\324\166\035\176\235\247\270\127\212\121
+\147\162\327\324\250\270\225\124\100\163\003\366\352\364\353\376
+\050\102\167\077\235\043\033\262\266\075\200\024\007\114\056\117
+\367\325\012\026\015\275\146\103\067\176\043\103\171\303\100\206
+\365\114\051\332\216\232\255\015\245\004\207\210\036\205\343\351
+\123\325\233\310\213\003\143\170\353\340\031\112\156\273\057\153
+\063\144\130\223\255\151\277\217\033\357\202\110\307\002\003\001
+\000\001\243\121\060\117\060\013\006\003\125\035\017\004\004\003
+\002\001\206\060\017\006\003\125\035\023\001\001\377\004\005\060
+\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\065
+\017\310\066\143\136\342\243\354\371\073\146\025\316\121\122\343
+\221\232\075\060\020\006\011\053\006\001\004\001\202\067\025\001
+\004\003\002\001\000\060\015\006\011\052\206\110\206\367\015\001
+\001\013\005\000\003\202\001\001\000\100\114\373\207\262\231\201
+\220\176\235\305\260\260\046\315\210\173\053\062\215\156\270\041
+\161\130\227\175\256\067\024\257\076\347\367\232\342\175\366\161
+\230\231\004\252\103\164\170\243\343\111\141\076\163\214\115\224
+\340\371\161\304\266\026\016\123\170\037\326\242\207\057\002\071
+\201\051\074\257\025\230\041\060\376\050\220\000\214\321\341\313
+\372\136\310\375\370\020\106\073\242\170\102\221\027\164\125\012
+\336\120\147\115\146\321\247\377\375\331\300\265\250\243\212\316
+\146\365\017\103\315\247\053\127\173\143\106\152\252\056\122\330
+\364\355\341\155\255\051\220\170\110\272\341\043\252\243\211\354
+\265\253\226\300\264\113\242\035\227\236\172\362\156\100\161\337
+\150\361\145\115\316\174\005\337\123\145\251\245\360\261\227\004
+\160\025\106\003\230\324\322\277\124\264\240\130\175\122\157\332
+\126\046\142\324\330\333\211\061\157\034\360\042\302\323\142\034
+\065\315\114\151\025\124\032\220\230\336\353\036\137\312\167\307
+\313\216\075\103\151\234\232\130\320\044\073\337\033\100\226\176
+\065\255\201\307\116\161\272\210\023
+END
+
+# Trust for "OISTE WISeKey Global Root GB CA"
+# Issuer: CN=OISTE WISeKey Global Root GB CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH
+# Serial Number:76:b1:20:52:74:f0:85:87:46:b3:f8:23:1a:f6:c2:c0
+# Subject: CN=OISTE WISeKey Global Root GB CA,OU=OISTE Foundation Endorsed,O=WISeKey,C=CH
+# Not Valid Before: Mon Dec 01 15:00:32 2014
+# Not Valid After : Thu Dec 01 15:10:31 2039
+# Fingerprint (SHA-256): 6B:9C:08:E8:6E:B0:F7:67:CF:AD:65:CD:98:B6:21:49:E5:49:4A:67:F5:84:5E:7B:D1:ED:01:9F:27:B8:6B:D6
+# Fingerprint (SHA1): 0F:F9:40:76:18:D3:D7:6A:4B:98:F0:A8:35:9E:0C:FD:27:AC:CC:ED
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "OISTE WISeKey Global Root GB CA"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\017\371\100\166\030\323\327\152\113\230\360\250\065\236\014\375
+\047\254\314\355
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\244\353\271\141\050\056\267\057\230\260\065\046\220\231\121\035
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\155\061\013\060\011\006\003\125\004\006\023\002\103\110\061
+\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113\145
+\171\061\042\060\040\006\003\125\004\013\023\031\117\111\123\124
+\105\040\106\157\165\156\144\141\164\151\157\156\040\105\156\144
+\157\162\163\145\144\061\050\060\046\006\003\125\004\003\023\037
+\117\111\123\124\105\040\127\111\123\145\113\145\171\040\107\154
+\157\142\141\154\040\122\157\157\164\040\107\102\040\103\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\166\261\040\122\164\360\205\207\106\263\370\043\032\366
+\302\300
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Certification Authority of WoSign G2"
+#
+# Issuer: CN=Certification Authority of WoSign G2,O=WoSign CA Limited,C=CN
+# Serial Number:6b:25:da:8a:88:9d:7c:bc:0f:05:b3:b1:7a:61:45:44
+# Subject: CN=Certification Authority of WoSign G2,O=WoSign CA Limited,C=CN
+# Not Valid Before: Sat Nov 08 00:58:58 2014
+# Not Valid After : Tue Nov 08 00:58:58 2044
+# Fingerprint (SHA-256): D4:87:A5:6F:83:B0:74:82:E8:5E:96:33:94:C1:EC:C2:C9:E5:1D:09:03:EE:94:6B:02:C3:01:58:1E:D9:9E:16
+# Fingerprint (SHA1): FB:ED:DC:90:65:B7:27:20:37:BC:55:0C:9C:56:DE:BB:F2:78:94:E1
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Certification Authority of WoSign G2"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\130\061\013\060\011\006\003\125\004\006\023\002\103\116\061
+\032\060\030\006\003\125\004\012\023\021\127\157\123\151\147\156
+\040\103\101\040\114\151\155\151\164\145\144\061\055\060\053\006
+\003\125\004\003\023\044\103\145\162\164\151\146\151\143\141\164
+\151\157\156\040\101\165\164\150\157\162\151\164\171\040\157\146
+\040\127\157\123\151\147\156\040\107\062
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\130\061\013\060\011\006\003\125\004\006\023\002\103\116\061
+\032\060\030\006\003\125\004\012\023\021\127\157\123\151\147\156
+\040\103\101\040\114\151\155\151\164\145\144\061\055\060\053\006
+\003\125\004\003\023\044\103\145\162\164\151\146\151\143\141\164
+\151\157\156\040\101\165\164\150\157\162\151\164\171\040\157\146
+\040\127\157\123\151\147\156\040\107\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\153\045\332\212\210\235\174\274\017\005\263\261\172\141
+\105\104
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\174\060\202\002\144\240\003\002\001\002\002\020\153
+\045\332\212\210\235\174\274\017\005\263\261\172\141\105\104\060
+\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\130
+\061\013\060\011\006\003\125\004\006\023\002\103\116\061\032\060
+\030\006\003\125\004\012\023\021\127\157\123\151\147\156\040\103
+\101\040\114\151\155\151\164\145\144\061\055\060\053\006\003\125
+\004\003\023\044\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171\040\157\146\040\127
+\157\123\151\147\156\040\107\062\060\036\027\015\061\064\061\061
+\060\070\060\060\065\070\065\070\132\027\015\064\064\061\061\060
+\070\060\060\065\070\065\070\132\060\130\061\013\060\011\006\003
+\125\004\006\023\002\103\116\061\032\060\030\006\003\125\004\012
+\023\021\127\157\123\151\147\156\040\103\101\040\114\151\155\151
+\164\145\144\061\055\060\053\006\003\125\004\003\023\044\103\145
+\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150
+\157\162\151\164\171\040\157\146\040\127\157\123\151\147\156\040
+\107\062\060\202\001\042\060\015\006\011\052\206\110\206\367\015
+\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202
+\001\001\000\276\305\304\240\042\200\111\117\277\331\207\021\306
+\123\341\273\017\275\140\177\257\366\202\016\037\334\260\216\075
+\227\340\120\074\217\072\357\146\073\105\007\233\040\370\343\327
+\045\206\065\220\026\242\135\157\060\031\010\207\013\177\006\262
+\235\142\217\336\257\222\245\140\324\053\200\232\122\077\365\232
+\203\351\064\132\313\331\325\142\134\346\016\340\337\006\230\016
+\200\174\312\264\035\023\210\153\016\250\044\167\003\320\356\133
+\363\312\151\221\065\071\126\305\155\343\367\075\117\136\223\070
+\044\312\030\351\044\313\222\003\335\314\034\075\011\160\344\040
+\344\361\256\254\273\163\151\243\143\072\017\105\017\241\112\232
+\302\321\143\254\313\020\370\075\346\116\050\267\353\304\225\261
+\254\375\136\253\372\101\313\135\235\113\334\364\174\166\357\147
+\177\000\172\215\322\240\032\134\115\042\341\265\332\335\166\263
+\324\166\337\136\270\213\230\310\024\124\314\153\027\222\267\340
+\112\277\111\224\141\013\070\220\217\135\044\154\045\173\073\171
+\331\342\176\235\255\237\230\241\006\374\170\024\140\127\370\356
+\200\167\261\002\003\001\000\001\243\102\060\100\060\016\006\003
+\125\035\017\001\001\377\004\004\003\002\001\006\060\017\006\003
+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\035\006
+\003\125\035\016\004\026\004\024\372\140\251\353\145\305\335\026
+\024\010\116\014\017\215\233\340\367\144\257\147\060\015\006\011
+\052\206\110\206\367\015\001\001\013\005\000\003\202\001\001\000
+\127\303\172\066\202\234\215\230\342\253\100\252\107\217\307\247
+\133\355\174\347\075\146\132\073\061\273\337\363\026\063\221\374
+\174\173\245\302\246\146\343\252\260\267\047\230\077\111\327\140
+\147\147\077\066\117\112\313\361\024\372\132\207\050\034\355\217
+\101\062\306\225\371\175\332\275\173\133\302\260\041\343\217\106
+\334\041\070\103\164\114\373\060\370\027\162\301\062\374\310\221
+\027\304\314\130\067\116\013\314\132\367\041\065\050\203\154\140
+\055\104\353\122\214\120\075\265\154\022\327\372\011\273\154\262
+\112\261\305\211\344\374\323\122\330\141\027\376\172\224\204\217
+\171\266\063\131\272\017\304\013\342\160\240\113\170\056\372\310
+\237\375\257\221\145\012\170\070\025\345\227\027\024\335\371\340
+\054\064\370\070\320\204\042\000\300\024\121\030\053\002\334\060
+\132\360\350\001\174\065\072\043\257\010\344\257\252\216\050\102
+\111\056\360\365\231\064\276\355\017\113\030\341\322\044\074\273
+\135\107\267\041\362\215\321\012\231\216\343\156\076\255\160\340
+\217\271\312\314\156\201\061\366\173\234\172\171\344\147\161\030
+END
+
+# Trust for "Certification Authority of WoSign G2"
+# Issuer: CN=Certification Authority of WoSign G2,O=WoSign CA Limited,C=CN
+# Serial Number:6b:25:da:8a:88:9d:7c:bc:0f:05:b3:b1:7a:61:45:44
+# Subject: CN=Certification Authority of WoSign G2,O=WoSign CA Limited,C=CN
+# Not Valid Before: Sat Nov 08 00:58:58 2014
+# Not Valid After : Tue Nov 08 00:58:58 2044
+# Fingerprint (SHA-256): D4:87:A5:6F:83:B0:74:82:E8:5E:96:33:94:C1:EC:C2:C9:E5:1D:09:03:EE:94:6B:02:C3:01:58:1E:D9:9E:16
+# Fingerprint (SHA1): FB:ED:DC:90:65:B7:27:20:37:BC:55:0C:9C:56:DE:BB:F2:78:94:E1
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Certification Authority of WoSign G2"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\373\355\334\220\145\267\047\040\067\274\125\014\234\126\336\273
+\362\170\224\341
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\310\034\175\031\252\313\161\223\362\120\370\122\250\036\272\140
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\130\061\013\060\011\006\003\125\004\006\023\002\103\116\061
+\032\060\030\006\003\125\004\012\023\021\127\157\123\151\147\156
+\040\103\101\040\114\151\155\151\164\145\144\061\055\060\053\006
+\003\125\004\003\023\044\103\145\162\164\151\146\151\143\141\164
+\151\157\156\040\101\165\164\150\157\162\151\164\171\040\157\146
+\040\127\157\123\151\147\156\040\107\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\153\045\332\212\210\235\174\274\017\005\263\261\172\141
+\105\104
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "CA WoSign ECC Root"
+#
+# Issuer: CN=CA WoSign ECC Root,O=WoSign CA Limited,C=CN
+# Serial Number:68:4a:58:70:80:6b:f0:8f:02:fa:f6:de:e8:b0:90:90
+# Subject: CN=CA WoSign ECC Root,O=WoSign CA Limited,C=CN
+# Not Valid Before: Sat Nov 08 00:58:58 2014
+# Not Valid After : Tue Nov 08 00:58:58 2044
+# Fingerprint (SHA-256): 8B:45:DA:1C:06:F7:91:EB:0C:AB:F2:6B:E5:88:F5:FB:23:16:5C:2E:61:4B:F8:85:56:2D:0D:CE:50:B2:9B:02
+# Fingerprint (SHA1): D2:7A:D2:BE:ED:94:C0:A1:3C:C7:25:21:EA:5D:71:BE:81:19:F3:2B
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "CA WoSign ECC Root"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\106\061\013\060\011\006\003\125\004\006\023\002\103\116\061
+\032\060\030\006\003\125\004\012\023\021\127\157\123\151\147\156
+\040\103\101\040\114\151\155\151\164\145\144\061\033\060\031\006
+\003\125\004\003\023\022\103\101\040\127\157\123\151\147\156\040
+\105\103\103\040\122\157\157\164
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\106\061\013\060\011\006\003\125\004\006\023\002\103\116\061
+\032\060\030\006\003\125\004\012\023\021\127\157\123\151\147\156
+\040\103\101\040\114\151\155\151\164\145\144\061\033\060\031\006
+\003\125\004\003\023\022\103\101\040\127\157\123\151\147\156\040
+\105\103\103\040\122\157\157\164
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\150\112\130\160\200\153\360\217\002\372\366\336\350\260
+\220\220
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\002\011\060\202\001\217\240\003\002\001\002\002\020\150
+\112\130\160\200\153\360\217\002\372\366\336\350\260\220\220\060
+\012\006\010\052\206\110\316\075\004\003\003\060\106\061\013\060
+\011\006\003\125\004\006\023\002\103\116\061\032\060\030\006\003
+\125\004\012\023\021\127\157\123\151\147\156\040\103\101\040\114
+\151\155\151\164\145\144\061\033\060\031\006\003\125\004\003\023
+\022\103\101\040\127\157\123\151\147\156\040\105\103\103\040\122
+\157\157\164\060\036\027\015\061\064\061\061\060\070\060\060\065
+\070\065\070\132\027\015\064\064\061\061\060\070\060\060\065\070
+\065\070\132\060\106\061\013\060\011\006\003\125\004\006\023\002
+\103\116\061\032\060\030\006\003\125\004\012\023\021\127\157\123
+\151\147\156\040\103\101\040\114\151\155\151\164\145\144\061\033
+\060\031\006\003\125\004\003\023\022\103\101\040\127\157\123\151
+\147\156\040\105\103\103\040\122\157\157\164\060\166\060\020\006
+\007\052\206\110\316\075\002\001\006\005\053\201\004\000\042\003
+\142\000\004\341\375\216\270\103\044\253\226\173\205\302\272\013
+\255\215\340\072\343\044\271\322\261\276\210\072\312\277\112\270
+\371\357\054\057\257\121\120\074\107\165\154\370\224\267\233\374
+\050\036\305\124\314\143\235\026\113\123\301\347\040\253\315\254
+\045\322\177\217\302\301\132\202\136\060\213\172\124\316\003\265
+\221\177\252\224\320\321\212\110\314\202\005\046\241\325\121\022
+\326\173\066\243\102\060\100\060\016\006\003\125\035\017\001\001
+\377\004\004\003\002\001\006\060\017\006\003\125\035\023\001\001
+\377\004\005\060\003\001\001\377\060\035\006\003\125\035\016\004
+\026\004\024\252\375\325\132\243\366\207\213\062\205\375\321\062
+\133\200\105\223\363\003\270\060\012\006\010\052\206\110\316\075
+\004\003\003\003\150\000\060\145\002\061\000\344\244\204\260\201
+\325\075\260\164\254\224\244\350\016\075\000\164\114\241\227\153
+\371\015\121\074\241\331\073\364\015\253\251\237\276\116\162\312
+\205\324\331\354\265\062\105\030\157\253\255\002\060\175\307\367
+\151\143\057\241\341\230\357\023\020\321\171\077\321\376\352\073
+\177\336\126\364\220\261\025\021\330\262\042\025\320\057\303\046
+\056\153\361\221\262\220\145\364\232\346\220\356\112
+END
+
+# Trust for "CA WoSign ECC Root"
+# Issuer: CN=CA WoSign ECC Root,O=WoSign CA Limited,C=CN
+# Serial Number:68:4a:58:70:80:6b:f0:8f:02:fa:f6:de:e8:b0:90:90
+# Subject: CN=CA WoSign ECC Root,O=WoSign CA Limited,C=CN
+# Not Valid Before: Sat Nov 08 00:58:58 2014
+# Not Valid After : Tue Nov 08 00:58:58 2044
+# Fingerprint (SHA-256): 8B:45:DA:1C:06:F7:91:EB:0C:AB:F2:6B:E5:88:F5:FB:23:16:5C:2E:61:4B:F8:85:56:2D:0D:CE:50:B2:9B:02
+# Fingerprint (SHA1): D2:7A:D2:BE:ED:94:C0:A1:3C:C7:25:21:EA:5D:71:BE:81:19:F3:2B
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "CA WoSign ECC Root"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\322\172\322\276\355\224\300\241\074\307\045\041\352\135\161\276
+\201\031\363\053
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\200\306\123\356\141\202\050\162\360\377\041\271\027\312\262\040
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\106\061\013\060\011\006\003\125\004\006\023\002\103\116\061
+\032\060\030\006\003\125\004\012\023\021\127\157\123\151\147\156
+\040\103\101\040\114\151\155\151\164\145\144\061\033\060\031\006
+\003\125\004\003\023\022\103\101\040\127\157\123\151\147\156\040
+\105\103\103\040\122\157\157\164
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\150\112\130\160\200\153\360\217\002\372\366\336\350\260
+\220\220
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE

From b81b45dabd129b9b5031b1b8736102b41ddfc758 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Sat, 21 Nov 2015 12:45:23 +0100
Subject: [PATCH 242/323] crypto: update root certificates

Update the list of root certificates in src/node_root_certs.h with
tools/mk-ca-bundle.pl.

PR-URL: https://github.com/nodejs/node/pull/3951
Reviewed-By: Fedor Indutny <fedor@indutny.com>
---
 src/node_root_certs.h | 367 ++++++++++++++++--------------------------
 1 file changed, 136 insertions(+), 231 deletions(-)

diff --git a/src/node_root_certs.h b/src/node_root_certs.h
index bab6992602aa1f..866f75fd36bd54 100644
--- a/src/node_root_certs.h
+++ b/src/node_root_certs.h
@@ -1,23 +1,4 @@
 
-/* Equifax Secure CA */
-"-----BEGIN CERTIFICATE-----\n"
-"MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4G\n"
-"A1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0\n"
-"aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMx\n"
-"EDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRl\n"
-"IEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2R\n"
-"FGiYCh7+2gRvE4RiIcPRfM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP\n"
-"/PvwDN1Dulsr4R+AcJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/\n"
-"FP3gx7kCAwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ\n"
-"MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUg\n"
-"QXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjAL\n"
-"BgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gjIBBPM5iQn9QwHQYDVR0OBBYE\n"
-"FEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQFMAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsF\n"
-"VjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaS\n"
-"bn+2kmOeUJXRmm/kEd5jhW6Y7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA\n"
-"2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4\n"
-"-----END CERTIFICATE-----\n",
-
 /* GlobalSign Root CA */
 "-----BEGIN CERTIFICATE-----\n"
 "MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMC\n"
@@ -85,30 +66,6 @@
 "t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==\n"
 "-----END CERTIFICATE-----\n",
 
-/* Verisign Class 4 Public Primary Certification Authority - G3 */
-"-----BEGIN CERTIFICATE-----\n"
-"MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQG\n"
-"EwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0\n"
-"IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv\n"
-"cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1h\n"
-"cnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3\n"
-"MTYyMzU5NTlaMIHKMQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAd\n"
-"BgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlT\n"
-"aWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu\n"
-"IENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCC\n"
-"ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK3LpRFpxlmr8Y+1GQ9Wzsy1HyDkniYl\n"
-"S+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaStBO3IFsJ+mGuqPKljYXCKtbeZjbSmwL0\n"
-"qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0GbdU6LM8BDcVHOLBKFGMzNcF0C5nk3T875V\n"
-"g+ixiY5afJqWIpA7iCXy0lOIAgwLePLmNxdLMEYH5IBtptiWLugs+BGzOA1mppvqySNb247i\n"
-"8xOOGlktqgLw7KSHZtzBP/XYufTsgsbSPZUd5cBPhMnZo0QoBmrXRazwa2rvTl/4EYIeOGM0\n"
-"ZlDUPpNz+jDDZq3/ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAj/ola09b5KROJ1Wr\n"
-"IhVZPMq1CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXttmhwwjIDLk5Mq\n"
-"g6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKmfjaF3H48\n"
-"ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c2NU8Qh0XwRJdRTjD\n"
-"OPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/bLvSHgCwIe34QWKCudiyxLtG\n"
-"UPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==\n"
-"-----END CERTIFICATE-----\n",
-
 /* Entrust.net Premium 2048 Secure Server CA */
 "-----BEGIN CERTIFICATE-----\n"
 "MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVz\n"
@@ -675,31 +632,6 @@
 "uCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==\n"
 "-----END CERTIFICATE-----\n",
 
-/* UTN DATACorp SGC Root CA */
-"-----BEGIN CERTIFICATE-----\n"
-"MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCBkzELMAkG\n"
-"A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UE\n"
-"ChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVz\n"
-"dC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3JwIFNHQzAeFw05OTA2MjQxODU3MjFaFw0x\n"
-"OTA2MjQxOTA2MzBaMIGTMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNh\n"
-"bHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsT\n"
-"GGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dD\n"
-"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6\n"
-"E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZD0/Ww5y0\n"
-"vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK4ESGoE1O1kduSUrL\n"
-"Z9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykqlXvY8qdOD1R8oQ2AswkDwf9c\n"
-"3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulWbfXv33i+Ybqypa4ETLyorGkVl73v67SM\n"
-"vzX41MPRKA5cOp9wGDMgd8SirwIDAQABo4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8E\n"
-"BTADAQH/MB0GA1UdDgQWBBRTMtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAu\n"
-"hixodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUE\n"
-"IzAhBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB\n"
-"AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowftGzet/Hy+\n"
-"UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyjj98C5OBxOvG0I3Kg\n"
-"qgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVHKWss5nbZqSl9Mt3JNjy9rjXx\n"
-"EZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jF\n"
-"VkwPDPafepE39peC4N1xaf92P2BNPM/3mfnGV/TJVTl4uix5yaaIK/QI\n"
-"-----END CERTIFICATE-----\n",
-
 /* UTN USERFirst Hardware Root CA */
 "-----BEGIN CERTIFICATE-----\n"
 "MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCBlzELMAkG\n"
@@ -1121,54 +1053,6 @@
 "oKfN5XozNmr6mis=\n"
 "-----END CERTIFICATE-----\n",
 
-/* TURKTRUST Certificate Services Provider Root 1 */
-"-----BEGIN CERTIFICATE-----\n"
-"MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOcUktUUlVT\n"
-"VCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQG\n"
-"DAJUUjEPMA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykgMjAwNSBUw5xSS1RSVVNUIEJp\n"
-"bGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWe\n"
-"LjAeFw0wNTA1MTMxMDI3MTdaFw0xNTAzMjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RS\n"
-"VVNUIEVsZWt0cm9uaWsgU2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNV\n"
-"BAYMAlRSMQ8wDQYDVQQHDAZBTktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1Qg\n"
-"QmlsZ2kgxLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEu\n"
-"xZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7XfIMYGFb\n"
-"azt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GXyGl8hMW0kWxsE2qkVa2kheiVfrMArwDCBRj1\n"
-"cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8iSi9BB35JYbOG7E6mQW6EvAPs9TscyB/C\n"
-"7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5CurKZ8y1UiBAG6uEaPj1nH/vO+3yC6BFd\n"
-"SsG5FOpU2WabfIl9BJpiyelSPJ6c79L1JuTm5Rh8i27fbMx4W09ysstcP4wFjdFMjK2Sx+F4\n"
-"f2VsSQZQLJ4ywtdKxnWKWU51b0dewQIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3\n"
-"DQEBBQUAA4IBAQAV9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46sWrv7/hg0Uw2ZkUd\n"
-"82YCdAR7kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxEq8Sn5RTOPEFh\n"
-"fEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55FyB0SFHljK\n"
-"VETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdAaLX/7KfS0zgYnNN9\n"
-"aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKSRGQDJereW26fyfJOrN3H\n"
-"-----END CERTIFICATE-----\n",
-
-/* TURKTRUST Certificate Services Provider Root 2 */
-"-----BEGIN CERTIFICATE-----\n"
-"MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOcUktUUlVT\n"
-"VCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQG\n"
-"EwJUUjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0\n"
-"acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2Fz\n"
-"xLFtIDIwMDUwHhcNMDUxMTA3MTAwNzU3WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2\n"
-"VMOcUktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8Sx\n"
-"MQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJp\n"
-"bGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWe\n"
-"LiAoYykgS2FzxLFtIDIwMDUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpNn7D\n"
-"kUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqeLCDe2JAOCtFp0if7qnefJ1Il4std2NiDUBd9\n"
-"irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKIx+XlZEdhR3n9wFHxwZnn3M5q+6+1ATDc\n"
-"RhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJQv2gQrSdiVFVKc8bcLyEVK3BEx+Y9C52\n"
-"YItdP5qtygy/p1Zbj3e41Z55SZI/4PGXJHpsmxcPbe9TmJEr5A++WXkHeLuXlfSfadRYhwqp\n"
-"48y2WBmfJiGxxFmNskF1wK1pzpwACPI2/z7woQ8arBT9pmAPAgMBAAGjQzBBMB0GA1UdDgQW\n"
-"BBTZN7NOBf3Zz58SFq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8GA1UdEwEB/wQFMAMB\n"
-"Af8wDQYJKoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/nttRbj2hWyfIvwq\n"
-"ECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4Jl3vpao6\n"
-"+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFzgw2lGh1uEpJ+hGIA\n"
-"F728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotHuFEJjOp9zYhys2AzsfAKRO8P\n"
-"9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LSy3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9R\n"
-"nuk5UrbnBEI=\n"
-"-----END CERTIFICATE-----\n",
-
 /* SwissSign Gold CA - G2 */
 "-----BEGIN CERTIFICATE-----\n"
 "MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNI\n"
@@ -1571,56 +1455,6 @@
 "vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==\n"
 "-----END CERTIFICATE-----\n",
 
-/* TC TrustCenter Class 2 CA II */
-"-----BEGIN CERTIFICATE-----\n"
-"MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UE\n"
-"BhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0\n"
-"Q2VudGVyIENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0Eg\n"
-"SUkwHhcNMDYwMTEyMTQzODQzWhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoG\n"
-"A1UEChMTVEMgVHJ1c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xh\n"
-"c3MgMiBDQTElMCMGA1UEAxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJ\n"
-"KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/R\n"
-"KrLqk2jftMjWQ+nEdVl//OEd+DFwIxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKg\n"
-"uNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2JXjIeIqki\n"
-"RUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQXa7pIXSSTYtZgo+U4+lK8edJsBTj9WLL1XK9\n"
-"H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7uSNQZu+995OKdy1u2bv/jzVrndIIFuoAl\n"
-"OMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD\n"
-"AgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3kUrL84J6E1wIqzCB7QYDVR0fBIHlMIHiMIHfoIHc\n"
-"oIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18yX2NhX0lJ\n"
-"LmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUy\n"
-"MENsYXNzJTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290\n"
-"Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdD9i\n"
-"YXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iSGNn3Bzn1LL4GdXpo\n"
-"UxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprtZjluS5TmVfwLG4t3wVMTZonZ\n"
-"KNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8au0WOB9/WIFaGusyiC2y8zl3gK9etmF1\n"
-"KdsjTYjKUCjLhdLTEKJZbtOTVAB6okaVhgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbq\n"
-"NZn1l7kPJOzHdiEoZa5X6AeIdUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcX\n"
-"jFq32nQozZfkvQ==\n"
-"-----END CERTIFICATE-----\n",
-
-/* TC TrustCenter Universal CA I */
-"-----BEGIN CERTIFICATE-----\n"
-"MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTELMAkGA1UE\n"
-"BhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0\n"
-"Q2VudGVyIFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2Fs\n"
-"IENBIEkwHhcNMDYwMzIyMTU1NDI4WhcNMjUxMjMxMjI1OTU5WjB5MQswCQYDVQQGEwJERTEc\n"
-"MBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIg\n"
-"VW5pdmVyc2FsIENBMSYwJAYDVQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCC\n"
-"ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B\n"
-"6DGtxnSRJJZ4Hgmgm5qVSkr1YnwCqMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3T\n"
-"fCZdzHd55yx4Oagmcw6iXSVphU9VDprvxrlE4Vc93x9UIuVvZaozhDrzznq+VZeujRIPFDPi\n"
-"UHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtwag+1m7Z3W0hZneTvWq3zwZ7U10VOylY0Ibw+\n"
-"F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9OgdwZu5GQfezmlwQek8wiSdeXhrYTCjxD\n"
-"I3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYDVR0jBBgwFoAUkqR1LKSevoFE63n8isWV\n"
-"pesQdXMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFJKkdSyk\n"
-"nr6BROt5/IrFlaXrEHVzMA0GCSqGSIb3DQEBBQUAA4IBAQAo0uCG1eb4e/CX3CJrO5UUVg8R\n"
-"MKWaTzqwOuAGy2X17caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/CyvwbZ71q+s2IhtNer\n"
-"NXxTPqYn8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3ghUJGooWMNjs\n"
-"ydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPTujdEWBF6\n"
-"AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/2TYcuiUaUj0a7CIM\n"
-"HOCkoj3w6DnPgcB77V0fb8XQC9eY\n"
-"-----END CERTIFICATE-----\n",
-
 /* Deutsche Telekom Root CA 2 */
 "-----BEGIN CERTIFICATE-----\n"
 "MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UE\n"
@@ -1643,28 +1477,6 @@
 "hpLzGITY+9HPBVZkVw==\n"
 "-----END CERTIFICATE-----\n",
 
-/* ComSign Secured CA */
-"-----BEGIN CERTIFICATE-----\n"
-"MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAwPDEbMBkG\n"
-"A1UEAxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJ\n"
-"TDAeFw0wNDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwxGzAZBgNVBAMTEkNvbVNpZ24g\n"
-"U2VjdXJlZCBDQTEQMA4GA1UEChMHQ29tU2lnbjELMAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3\n"
-"DQEBAQUAA4IBDwAwggEKAoIBAQDGtWhfHZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjW\n"
-"aueP1H5XJLkGieQcPOqs49ohgHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqY\n"
-"HU4Gk/v1iDurX8sWv+bznkqH7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20\n"
-"IZFKF3ueMv5WJDmyVIRD9YTC2LxBkMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr\n"
-"9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d19guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt6+UarA9z\n"
-"1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUwAwEB/zBEBgNVHR8EPTA7MDmgN6A1hjNodHRw\n"
-"Oi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29tU2lnblNlY3VyZWRDQS5jcmwwDgYDVR0P\n"
-"AQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58ADsAj8c+DkWfHl3sMB0GA1UdDgQWBBTB\n"
-"S+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkqhkiG9w0BAQUFAAOCAQEAFs/ukhNQq3sUnjO2QiBq\n"
-"1BW9Cav8cujvR3qQrFHBZE7piL1DRYHjZiM/EoZNGeQFsOY3wo3aBijJD4mkU6l1P7CW+6tM\n"
-"M1X5eCZGbxs2mPtCdsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtpFhpFfTMDZflScZAm\n"
-"laxMDPWLkz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP51qJThRv4zdL\n"
-"hfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQzOjRXUDpv\n"
-"gV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==\n"
-"-----END CERTIFICATE-----\n",
-
 /* Cybertrust Global Root */
 "-----BEGIN CERTIFICATE-----\n"
 "MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMP\n"
@@ -1768,26 +1580,6 @@
 "RxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho\n"
 "-----END CERTIFICATE-----\n",
 
-/* Buypass Class 3 CA 1 */
-"-----BEGIN CERTIFICATE-----\n"
-"MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UE\n"
-"CgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMyBDQSAx\n"
-"MB4XDTA1MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzELMAkGA1UEBhMCTk8xHTAbBgNV\n"
-"BAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0Eg\n"
-"MTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZE\n"
-"C4DVC69TB4sSveZn8AKxifZgisRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhj\n"
-"P5JW3SROjvi6K//zNIqeKNc0n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IX\n"
-"F4Rs4HyI+MkcVyzwPX6UvCWThOiaAJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2R\n"
-"hzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+mbEwi5A3\n"
-"lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E\n"
-"FgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUA\n"
-"A4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFPBdy7pYmrEzMqnji3jG8CcmPHc3ceCQa6\n"
-"Oyh7pEfJYWsICCD8igWKH7y6xsL+z27sEzNxZy5p+qksP2bAEllNC1QCkoS72xLvg3BweMhT\n"
-"+t/Gxv/ciC8HwEmdMldg0/L2mSlf56oBzKwzqBwKu5HEA6BvtjT5htOzdlSY9EqBs1OdTUDs\n"
-"5XcTRa9bqh/YL0yCe/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQjel/wroQk5PMr+4ok\n"
-"oyeYZdowdXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915\n"
-"-----END CERTIFICATE-----\n",
-
 /* EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 */
 "-----BEGIN CERTIFICATE-----\n"
 "MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNVBAMML0VC\n"
@@ -2623,29 +2415,6 @@
 "n7fofMM=\n"
 "-----END CERTIFICATE-----\n",
 
-/* A-Trust-nQual-03 */
-"-----BEGIN CERTIFICATE-----\n"
-"MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJBVDFIMEYG\n"
-"A1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERh\n"
-"dGVudmVya2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5RdWFsLTAzMRkwFwYDVQQDDBBB\n"
-"LVRydXN0LW5RdWFsLTAzMB4XDTA1MDgxNzIyMDAwMFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJ\n"
-"BgNVBAYTAkFUMUgwRgYDVQQKDD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1l\n"
-"IGltIGVsZWt0ci4gRGF0ZW52ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwt\n"
-"MDMxGTAXBgNVBAMMEEEtVHJ1c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw\n"
-"ggEKAoIBAQCtPWFuA/OQO8BBC4SAzewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUj\n"
-"lUC5B3ilJfYKvUWG6Nm9wASOhURh73+nyfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZznF/QJuK\n"
-"qiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPESU7l0+m0iKsMrmKS1GWH2WrX9IWf5DMiJaXl\n"
-"yDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4iHQF63n1k3Flyp3HaxgtPVxO59X4PzF9\n"
-"j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs2e3Vcuy+VwHOBVWf3tFgiBCzAgMBAAGj\n"
-"NjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0OBAoECERqlWdVeRFPMA4GA1UdDwEB/wQEAwIB\n"
-"BjANBgkqhkiG9w0BAQUFAAOCAQEAVdRU0VlIXLOThaq/Yy/kgM40ozRiPvbY7meIMQQDbwvU\n"
-"B/tOdQ/TLtPAF8fGKOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmrsQd7TZjTXLDR8KdC\n"
-"oLXEjq/+8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZdJXDRZslo+S4R\n"
-"FGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GSmYHovjrH\n"
-"F1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmEDNuxUCAKGkq6ahq9\n"
-"7BvIxYSazQ==\n"
-"-----END CERTIFICATE-----\n",
-
 /* TWCA Root Certification Authority */
 "-----BEGIN CERTIFICATE-----\n"
 "MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UE\n"
@@ -3976,3 +3745,139 @@
 "2lZFA4gKn2fQ1XmxqI1AbQ3CekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UC\n"
 "Kc2Jo5YPSjXnTkLAdc0Hz+Ys63su\n"
 "-----END CERTIFICATE-----\n",
+
+/* TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H5 */
+"-----BEGIN CERTIFICATE-----\n"
+"MIIEJzCCAw+gAwIBAgIHAI4X/iQggTANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UEBhMCVFIx\n"
+"DzANBgNVBAcMBkFua2FyYTFNMEsGA1UECgxEVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2lt\n"
+"IHZlIEJpbGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7Fni4xQjBABgNVBAMMOVTD\n"
+"nFJLVFJVU1QgRWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSBI\n"
+"NTAeFw0xMzA0MzAwODA3MDFaFw0yMzA0MjgwODA3MDFaMIGxMQswCQYDVQQGEwJUUjEPMA0G\n"
+"A1UEBwwGQW5rYXJhMU0wSwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg\n"
+"QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktU\n"
+"UlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg1MIIB\n"
+"IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApCUZ4WWe60ghUEoI5RHwWrom/4NZzkQq\n"
+"L/7hzmAD/I0Dpe3/a6i6zDQGn1k19uwsu537jVJp45wnEFPzpALFp/kRGml1bsMdi9GYjZOH\n"
+"p3GXDSHHmflS0yxjXVW86B8BSLlg/kJK9siArs1mep5Fimh34khon6La8eHBEJ/rPCmBp+Ey\n"
+"CNSgBbGM+42WAA4+Jd9ThiI7/PS98wl+d+yG6w8z5UNP9FR1bSmZLmZaQ9/LXMrI5Tjxfjs1\n"
+"nQ/0xVqhzPMggCTTV+wVunUlm+hkS7M0hO8EuPbJbKoCPrZV4jI3X/xml1/N1p7HIL9Nxqw/\n"
+"dV8c7TKcfGkAaZHjIxhT6QIDAQABo0IwQDAdBgNVHQ4EFgQUVpkHHtOsDGlktAxQR95DLL4g\n"
+"wPswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB\n"
+"AJ5FdnsXSDLyOIspve6WSk6BGLFRRyDN0GSxDsnZAdkJzsiZ3GglE9Rc8qPoBP5yCccLqh0l\n"
+"VX6Wmle3usURehnmp349hQ71+S4pL+f5bFgWV1Al9j4uPqrtd3GqqpmWRgqujuwqURawXs3q\n"
+"ZwQcWDD1YIq9pr1N5Za0/EKJAWv2cMhQOQwt1WbZyNKzMrcbGW3LM/nfpeYVhDfwwvJllpKQ\n"
+"d/Ct9JDpEXjXk4nAPQu6KfTomZ1yju2dL+6SfaHx/126M2CFYv4HAqGEVka+lgqaE9chTLd8\n"
+"B59OTj+RdPsnnRHM3eaxynFNExc5JsUpISuTKWqW+qtB4Uu2NQvAmxU=\n"
+"-----END CERTIFICATE-----\n",
+
+/* TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H6 */
+"-----BEGIN CERTIFICATE-----\n"
+"MIIEJjCCAw6gAwIBAgIGfaHyZeyKMA0GCSqGSIb3DQEBCwUAMIGxMQswCQYDVQQGEwJUUjEP\n"
+"MA0GA1UEBwwGQW5rYXJhMU0wSwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0g\n"
+"dmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOc\n"
+"UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg2\n"
+"MB4XDTEzMTIxODA5MDQxMFoXDTIzMTIxNjA5MDQxMFowgbExCzAJBgNVBAYTAlRSMQ8wDQYD\n"
+"VQQHDAZBbmthcmExTTBLBgNVBAoMRFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBC\n"
+"aWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEuxZ4uMUIwQAYDVQQDDDlUw5xSS1RS\n"
+"VVNUIEVsZWt0cm9uaWsgU2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLEgSDYwggEi\n"
+"MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdsGjW6L0UlqMACprx9MfMkU1xeHe59yEm\n"
+"FXNRFpQJRwXiM/VomjX/3EsvMsew7eKC5W/a2uqsxgbPJQ1BgfbBOCK9+bGlprMBvD9QFyv2\n"
+"6WZV1DOzXPhDIHiTVRZwGTLmiddk671IUP320EEDwnS3/faAz1vFq6TWlRKb55cTMgPp1KtD\n"
+"WxbtMyJkKbbSk60vbNg9tvYdDjTu0n2pVQ8g9P0pu5FbHH3GQjhtQiht1AH7zYiXSX6484P4\n"
+"tZgvsycLSF5W506jM7NE1qXyGJTtHB6plVxiSvgNZ1GpryHV+DKdeboaX+UEVU0TRv/yz3TH\n"
+"GmNtwx8XEsMeED5gCLMxAgMBAAGjQjBAMB0GA1UdDgQWBBTdVRcT9qzoSCHK77Wv0QAy7Z6M\n"
+"tTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEA\n"
+"b1gNl0OqFlQ+v6nfkkU/hQu7VtMMUszIv3ZnXuaqs6fvuay0EBQNdH49ba3RfdCaqaXKGDsC\n"
+"QC4qnFAUi/5XfldcEQlLNkVS9z2sFP1E34uXI9TDwe7UU5X+LEr+DXCqu4svLcsyo4LyVN/Y\n"
+"8t3XSHLuSqMplsNEzm61kod2pLv0kmzOLBQJZo6NrRa1xxsJYTvjIKIDgI6tflEATseWhvtD\n"
+"mHd9KMeP2Cpu54Rvl0EpABZeTeIT6lnAY2c6RPuY/ATTMHKm9ocJV612ph1jmv3XZch4gyt1\n"
+"O6VbuA1df74jrlZVlFjvH4GMKrLN5ptjnhi85WsGtAuYSyher4hYyw==\n"
+"-----END CERTIFICATE-----\n",
+
+/* Certinomis - Root CA */
+"-----BEGIN CERTIFICATE-----\n"
+"MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjETMBEGA1UE\n"
+"ChMKQ2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAbBgNVBAMTFENlcnRp\n"
+"bm9taXMgLSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMzMTAyMTA5MTcxOFowWjELMAkG\n"
+"A1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAz\n"
+"MR0wGwYDVQQDExRDZXJ0aW5vbWlzIC0gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP\n"
+"ADCCAgoCggIBANTMCQosP5L2fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4\n"
+"kkjW4znuzuRZWJflLieY6pOod5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9\n"
+"n+ws+hQVWZUKxkd8aRi5pwP5ynapz8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDF\n"
+"TKWrteoB4owuZH9kb/2jJZOLyKIOSY008B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb5nPJWqHZ\n"
+"ZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09xRLWtwHkziOC/7aOgFLScCbAK42C++PhmiM1b\n"
+"8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE6OXWk6RiwsXm9E/G+Z8ajYJJGYrKWUM6\n"
+"6A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJwx3tFvYk9CcbXFcx3FXuqB5vbKziRcxX\n"
+"V4p1VxngtViZSTYxPDMBbRZKzbgqg4SGm/lg0h9tkQPTYKbVPZrdd5A9NaSfD171UkRpucC6\n"
+"3M9933zZxKyGIjK8e2uR73r4F2iw4lNVYC2vPsKD2NkJK/DAZNuHi5HMkesE/Xa0lZrmFAYb\n"
+"1TQdvtj/dBxThZngWVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGjYzBhMA4GA1UdDwEB\n"
+"/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I6tNxIqSSaHh0\n"
+"2TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsFAAOCAgEA\n"
+"fj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/0KGRHCwPT5iVWVO9\n"
+"0CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWwF6YSjNRieOpWauwK0kDDPAUw\n"
+"Pk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZSg081lLMSVX3l4kLr5JyTCcBMWwerx20R\n"
+"oFAXlCOotQqSD7J6wWAsOMwaplv/8gzjqh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5n\n"
+"U7aJ+BIJy29SWwNyhlCVCNSNh4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrj\n"
+"cOa4pvi2WsS9Iff/ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu\n"
+"6AdBBR8Vbtaw5BngDwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwj\n"
+"Y/M50n92Uaf0yKHxDHYiI0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ8ow7bkrH\n"
+"xuaAKzyBvBGAFhAn1/DNP3nMcyrDflOR1m749fPH0FFNjkulW+YZFzvWgQncItzujrnEj1Ph\n"
+"Z7szuIgVRs/taTX/dQ1G885x4cVrhkIGuUE=\n"
+"-----END CERTIFICATE-----\n",
+
+/* OISTE WISeKey Global Root GB CA */
+"-----BEGIN CERTIFICATE-----\n"
+"MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYD\n"
+"VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBF\n"
+"bmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0x\n"
+"NDEyMDExNTAwMzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdX\n"
+"SVNlS2V5MSIwIAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9P\n"
+"SVNURSBXSVNlS2V5IEdsb2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A\n"
+"MIIBCgKCAQEA2Be3HEokKtaXscriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvY\n"
+"D06fWvGxWuR51jIjK+FTzJlFXHtPrby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX\n"
+"1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNku7dCjmn2\n"
+"1HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4oQnc/nSMbsrY9gBQHTC5P99UKFg29ZkM3fiND\n"
+"ecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvgGUpuuy9rM2RYk61pv48b74JIxwIDAQAB\n"
+"o1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUNQ/INmNe4qPs\n"
+"+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQELBQADggEBAEBM+4ey\n"
+"mYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8+5/ea4n32cZiZBKpDdHij40lhPnOMTZTg+XHE\n"
+"thYOU3gf1qKHLwI5gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0VQreUGdNZtGn//3Z\n"
+"wLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEuiHZeeevJuQHHf\n"
+"aPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02IcNc1MaRVU\n"
+"GpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=\n"
+"-----END CERTIFICATE-----\n",
+
+/* Certification Authority of WoSign G2 */
+"-----BEGIN CERTIFICATE-----\n"
+"MIIDfDCCAmSgAwIBAgIQayXaioidfLwPBbOxemFFRDANBgkqhkiG9w0BAQsFADBYMQswCQYD\n"
+"VQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxLTArBgNVBAMTJENlcnRpZmlj\n"
+"YXRpb24gQXV0aG9yaXR5IG9mIFdvU2lnbiBHMjAeFw0xNDExMDgwMDU4NThaFw00NDExMDgw\n"
+"MDU4NThaMFgxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEtMCsG\n"
+"A1UEAxMkQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgb2YgV29TaWduIEcyMIIBIjANBgkqhkiG\n"
+"9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvsXEoCKASU+/2YcRxlPhuw+9YH+v9oIOH9ywjj2X4FA8\n"
+"jzrvZjtFB5sg+OPXJYY1kBaiXW8wGQiHC38Gsp1ij96vkqVg1CuAmlI/9ZqD6TRay9nVYlzm\n"
+"DuDfBpgOgHzKtB0TiGsOqCR3A9DuW/PKaZE1OVbFbeP3PU9ekzgkyhjpJMuSA93MHD0JcOQg\n"
+"5PGurLtzaaNjOg9FD6FKmsLRY6zLEPg95k4ot+vElbGs/V6r+kHLXZ1L3PR8du9nfwB6jdKg\n"
+"GlxNIuG12t12s9R23164i5jIFFTMaxeSt+BKv0mUYQs4kI9dJGwlezt52eJ+na2fmKEG/HgU\n"
+"YFf47oB3sQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV\n"
+"HQ4EFgQU+mCp62XF3RYUCE4MD42b4Pdkr2cwDQYJKoZIhvcNAQELBQADggEBAFfDejaCnI2Y\n"
+"4qtAqkePx6db7XznPWZaOzG73/MWM5H8fHulwqZm46qwtyeYP0nXYGdnPzZPSsvxFPpahygc\n"
+"7Y9BMsaV+X3avXtbwrAh449G3CE4Q3RM+zD4F3LBMvzIkRfEzFg3TgvMWvchNSiDbGAtROtS\n"
+"jFA9tWwS1/oJu2yySrHFieT801LYYRf+epSEj3m2M1m6D8QL4nCgS3gu+sif/a+RZQp4OBXl\n"
+"lxcU3fngLDT4ONCEIgDAFFEYKwLcMFrw6AF8NTojrwjkr6qOKEJJLvD1mTS+7Q9LGOHSJDy7\n"
+"XUe3IfKN0QqZjuNuPq1w4I+5ysxugTH2e5x6eeRncRg=\n"
+"-----END CERTIFICATE-----\n",
+
+/* CA WoSign ECC Root */
+"-----BEGIN CERTIFICATE-----\n"
+"MIICCTCCAY+gAwIBAgIQaEpYcIBr8I8C+vbe6LCQkDAKBggqhkjOPQQDAzBGMQswCQYDVQQG\n"
+"EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMTEkNBIFdvU2lnbiBF\n"
+"Q0MgUm9vdDAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4NThaMEYxCzAJBgNVBAYTAkNO\n"
+"MRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEbMBkGA1UEAxMSQ0EgV29TaWduIEVDQyBS\n"
+"b290MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE4f2OuEMkq5Z7hcK6C62N4DrjJLnSsb6IOsq/\n"
+"Srj57ywvr1FQPEd1bPiUt5v8KB7FVMxjnRZLU8HnIKvNrCXSf4/CwVqCXjCLelTOA7WRf6qU\n"
+"0NGKSMyCBSah1VES1ns2o0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd\n"
+"BgNVHQ4EFgQUqv3VWqP2h4syhf3RMluARZPzA7gwCgYIKoZIzj0EAwMDaAAwZQIxAOSkhLCB\n"
+"1T2wdKyUpOgOPQB0TKGXa/kNUTyh2Tv0Daupn75OcsqF1NnstTJFGG+rrQIwfcf3aWMvoeGY\n"
+"7xMQ0Xk/0f7qO3/eVvSQsRUR2LIiFdAvwyYua/GRspBl9JrmkO5K\n"
+"-----END CERTIFICATE-----\n",

From f29c5d6e703fd38245a808af15eee98ee82baf98 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Sat, 21 Nov 2015 20:21:11 -0500
Subject: [PATCH 243/323] configure: `v8_use_snapshot` should be `true`

`v8_use_snapshot` should be either `true` or `false`, not 1 or 0.

PR-URL: https://github.com/nodejs/node/pull/3962
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 381ddd471b7b2b..8dccf8a32a97ff 100755
--- a/configure
+++ b/configure
@@ -777,7 +777,7 @@ def configure_v8(o):
   o['variables']['v8_no_strict_aliasing'] = 1  # Work around compiler bugs.
   o['variables']['v8_optimized_debug'] = 0  # Compile with -O0 in debug builds.
   o['variables']['v8_random_seed'] = 0  # Use a random seed for hash tables.
-  o['variables']['v8_use_snapshot'] = 0 if options.without_snapshot else 1
+  o['variables']['v8_use_snapshot'] = 'false' if options.without_snapshot else 'true'
 
 def configure_openssl(o):
   o['variables']['node_use_openssl'] = b(not options.without_ssl)

From f4ca007b42ff4c96ff4adf5f110af81888156a19 Mon Sep 17 00:00:00 2001
From: Carl Lei <xecycle@gmail.com>
Date: Tue, 3 Nov 2015 19:21:31 +0800
Subject: [PATCH 244/323] doc: clarify that fs streams expect blocking fd

This clarifies that fs.createReadStream and fs.createWriteStream, when
passed a fd, expects the fd to be blocking, and suggests net.Socket as
an alternative.

PR-URL: https://github.com/nodejs/node/pull/3641
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/fs.markdown | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/api/fs.markdown b/doc/api/fs.markdown
index 86e77539b922fa..6511b274c3c841 100644
--- a/doc/api/fs.markdown
+++ b/doc/api/fs.markdown
@@ -307,6 +307,8 @@ start at 0. The `encoding` can be any one of those accepted by [Buffer][].
 
 If `fd` is specified, `ReadStream` will ignore the `path` argument and will use
 the specified file descriptor. This means that no `open` event will be emitted.
+Note that `fd` should be blocking; non-blocking `fd`s should be passed to
+`net.Socket`.
 
 If `autoClose` is false, then the file descriptor won't be closed, even if
 there's an error.  It is your responsibility to close it and make sure
@@ -341,7 +343,8 @@ default mode `w`. The `defaultEncoding` can be any one of those accepted by [Buf
 
 Like `ReadStream` above, if `fd` is specified, `WriteStream` will ignore the
 `path` argument and will use the specified file descriptor. This means that no
-`open` event will be emitted.
+`open` event will be emitted. Note that `fd` should be blocking; non-blocking
+`fd`s should be passed to `net.Socket`.
 
 If `options` is a string, then it specifies the encoding.
 

From f9fe0aee53c5ad0eec975e989fa35ff267501635 Mon Sep 17 00:00:00 2001
From: Carl Lei <xecycle@gmail.com>
Date: Tue, 3 Nov 2015 09:52:46 +0800
Subject: [PATCH 245/323] test: numeric flags to fs.open

This has been supperted for long but never tested nor documented.

PR-URL: https://github.com/nodejs/node/pull/3641
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/parallel/test-fs-open-numeric-flags.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 test/parallel/test-fs-open-numeric-flags.js

diff --git a/test/parallel/test-fs-open-numeric-flags.js b/test/parallel/test-fs-open-numeric-flags.js
new file mode 100644
index 00000000000000..d3bd42227c2a53
--- /dev/null
+++ b/test/parallel/test-fs-open-numeric-flags.js
@@ -0,0 +1,16 @@
+'use strict';
+const common = require('../common');
+
+const constants = require('constants');
+const assert = require('assert');
+const fs = require('fs');
+const path = require('path');
+
+common.refreshTmpDir();
+
+// O_WRONLY without O_CREAT shall fail with ENOENT
+const pathNE = path.join(common.tmpDir, 'file-should-not-exist');
+assert.throws(
+  () => fs.openSync(pathNE, constants.O_WRONLY),
+  (e) => e.code === 'ENOENT'
+);

From 77251d99de46119256fd0657ed3007d802a53b4a Mon Sep 17 00:00:00 2001
From: Carl Lei <xecycle@gmail.com>
Date: Tue, 3 Nov 2015 09:53:59 +0800
Subject: [PATCH 246/323] doc: numeric flags to fs.open

This has been supperted for long but never tested nor documented.

PR-URL: https://github.com/nodejs/node/pull/3641
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/fs.markdown | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/api/fs.markdown b/doc/api/fs.markdown
index 6511b274c3c841..20aef1147f0157 100644
--- a/doc/api/fs.markdown
+++ b/doc/api/fs.markdown
@@ -529,6 +529,11 @@ created. On POSIX systems, `path` is considered to exist even if it is a symlink
 to a non-existent file. The exclusive flag may or may not work with network file
 systems.
 
+`flags` can also be a number as documented by open(2); commonly used constants
+are available from `require('constants')`.  On Windows, flags are translated to
+their equivalent ones where applicable, e.g. `O_WRONLY` to `FILE_GENERIC_WRITE`,
+or `O_EXCL|O_CREAT` to `CREATE_NEW`, as accepted by CreateFileW.
+
 On Linux, positional writes don't work when the file is opened in append mode.
 The kernel ignores the position argument and always appends the data to
 the end of the file.

From 4849a543867c7389e042c6a0b8241fdbcaa91a20 Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Fri, 9 Oct 2015 13:58:44 +0100
Subject: [PATCH 247/323] doc: Adding best practises for crypto.pbkdf2

Added some information around usages of how to use iterations, how to
choose decent salts and updating the example to have a significant
work factor and to use sha512.

PR-URL: https://github.com/nodejs/node/pull/3290
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
---
 doc/api/crypto.markdown | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/api/crypto.markdown b/doc/api/crypto.markdown
index 048bc077785c92..60231b17072692 100644
--- a/doc/api/crypto.markdown
+++ b/doc/api/crypto.markdown
@@ -620,9 +620,16 @@ Asynchronous PBKDF2 function.  Applies the selected HMAC digest function
 salt and number of iterations.  The callback gets two arguments:
 `(err, derivedKey)`.
 
+The number of iterations passed to pbkdf2 should be as high as possible, the
+higher the number, the more secure it will be, but will take a longer amount of
+time to complete.
+
+Chosen salts should also be unique. It is recommended that the salts are random
+and their length is greater than 16 bytes. See [NIST SP 800-132] for details.
+
 Example:
 
-    crypto.pbkdf2('secret', 'salt', 4096, 64, 'sha256', function(err, key) {
+    crypto.pbkdf2('secret', 'salt', 100000, 512, 'sha512', function(err, key) {
       if (err)
         throw err;
       console.log(key.toString('hex'));  // 'c5e478d...1469e50'
@@ -789,6 +796,7 @@ See the reference for other recommendations and details.
 [RFC 3526]: http://www.rfc-editor.org/rfc/rfc3526.txt
 [crypto.pbkdf2]: #crypto_crypto_pbkdf2_password_salt_iterations_keylen_digest_callback
 [EVP_BytesToKey]: https://www.openssl.org/docs/crypto/EVP_BytesToKey.html
+[NIST SP 800-132]: http://csrc.nist.gov/publications/nistpubs/800-132/nist-sp800-132.pdf
 [NIST SP 800-131A]: http://csrc.nist.gov/publications/nistpubs/800-131A/sp800-131A.pdf
 [initialization vector]: http://en.wikipedia.org/wiki/Initialization_vector
 [Caveats]: #crypto_caveats

From 4602e01221b1140dc4a0b3aeba9949885bc28cc3 Mon Sep 17 00:00:00 2001
From: Lewis Cowper <lewis.cowper@googlemail.com>
Date: Mon, 23 Nov 2015 10:06:53 +0100
Subject: [PATCH 248/323] doc: replace sane with reasonable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removing ableist language because we don't need to make the comparison
to people with mental health issues to get our point across.

PR-URL: https://github.com/nodejs/node/pull/3980
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 doc/api/modules.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/modules.markdown b/doc/api/modules.markdown
index 5c1d7671e4f701..ceab37d536ca3a 100644
--- a/doc/api/modules.markdown
+++ b/doc/api/modules.markdown
@@ -79,7 +79,7 @@ by checking `require.main.filename`.
 <!-- type=misc -->
 
 The semantics of Node.js's `require()` function were designed to be general
-enough to support a number of sane directory structures. Package manager
+enough to support a number of reasonable directory structures. Package manager
 programs such as `dpkg`, `rpm`, and `npm` will hopefully find it possible to
 build native packages from Node.js modules without modification.
 

From 665a35d45e4f427a0c6a29fb74115f1e42c4ae9a Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 21 Nov 2015 20:10:52 -0800
Subject: [PATCH 249/323] test: address flaky test-http-client-timeout-event

Use common.platformTimeout() to make test more reliable on Raspberry Pi.

Fixes: https://github.com/nodejs/node/issues/2555
PR-URL: https://github.com/nodejs/node/pull/3968

Reviewed-By: Brendan Ashworth <brendan.ashworth@me.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Roman Klauke <romaaan.git@gmail.com>
---
 test/parallel/test-http-client-timeout-event.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/parallel/test-http-client-timeout-event.js b/test/parallel/test-http-client-timeout-event.js
index c9d65941923408..aaa32e5b24d14d 100644
--- a/test/parallel/test-http-client-timeout-event.js
+++ b/test/parallel/test-http-client-timeout-event.js
@@ -33,8 +33,8 @@ server.listen(options.port, options.host, function() {
   setTimeout(function() {
     req.destroy();
     assert.equal(timeout_events, 1);
-  }, 100);
+  }, common.platformTimeout(100));
   setTimeout(function() {
     req.end();
-  }, 50);
+  }, common.platformTimeout(50));
 });

From 1fe4d30efcc2a24a0f8d32bb2358e3e53858075d Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 20 Nov 2015 10:15:31 -0800
Subject: [PATCH 250/323] test: retry on smartos if ECONNREFUSED

SmartOS has a bug that causes unexpected ECONNREFUSED errors.

See https://smartos.org/bugview/OS-2767

If ECONNREFUSED on SmartOS, retry the test one time.

Fixes: https://github.com/nodejs/node/issues/3864
Fixes: https://github.com/nodejs/node/issues/2815
PR-URL: https://github.com/nodejs/node/pull/3941
Reviewed-By: Fedor Indutny <fedor@indutny.com>
---
 tools/test.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/test.py b/tools/test.py
index 26b70233d53f85..49db74727aea38 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -138,6 +138,13 @@ def RunSingle(self, parallel, thread_id):
       try:
         start = datetime.now()
         output = case.Run()
+        # SmartOS has a bug that causes unexpected ECONNREFUSED errors.
+        # See https://smartos.org/bugview/OS-2767
+        # If ECONNREFUSED on SmartOS, retry the test one time.
+        if (output.UnexpectedOutput() and
+          sys.platform == 'sunos5' and
+          'ECONNREFUSED' in output.output.stderr):
+            output = case.Run()
         case.duration = (datetime.now() - start)
       except IOError, e:
         return

From 7e18f2ec62682d847c5d40dd5eda16066e00d116 Mon Sep 17 00:00:00 2001
From: Bryon Leung <teslaslegacy@gmail.com>
Date: Wed, 7 Oct 2015 13:47:57 -0400
Subject: [PATCH 251/323] src: add BE support to StringBytes::Encode()

Versions of Node.js after v0.12 have relocated byte-swapping away from
the StringBytes::Encode function, thereby causing a nan test (which
accesses this function directly) to fail on big-endian machines.

This change re-introduces byte swapping in StringBytes::Encode,
done via a call to a function in util-inl. Another change in
NodeBuffer::StringSlice was necessary to avoid double byte swapping
in big-endian function calls to StringSlice.

PR-URL: https://github.com/nodejs/node/pull/3410
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 src/node_buffer.cc  |  9 ++++++---
 src/string_bytes.cc | 16 ++++++++++++----
 src/util-inl.h      | 14 ++++++++++++++
 src/util.h          |  2 ++
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/node_buffer.cc b/src/node_buffer.cc
index 8b850700792a5b..dca75a817b7414 100644
--- a/src/node_buffer.cc
+++ b/src/node_buffer.cc
@@ -477,10 +477,11 @@ void StringSlice<UCS2>(const FunctionCallbackInfo<Value>& args) {
   // need to reorder on BE platforms.  See http://nodejs.org/api/buffer.html
   // regarding Node's "ucs2" encoding specification.
   const bool aligned = (reinterpret_cast<uintptr_t>(data) % sizeof(*buf) == 0);
-  if (IsLittleEndian() && aligned) {
-    buf = reinterpret_cast<const uint16_t*>(data);
-  } else {
+  if (IsLittleEndian() && !aligned) {
     // Make a copy to avoid unaligned accesses in v8::String::NewFromTwoByte().
+    // This applies ONLY to little endian platforms, as misalignment will be
+    // handled by a byte-swapping operation in StringBytes::Encode on
+    // big endian platforms.
     uint16_t* copy = new uint16_t[length];
     for (size_t i = 0, k = 0; i < length; i += 1, k += 2) {
       // Assumes that the input is little endian.
@@ -490,6 +491,8 @@ void StringSlice<UCS2>(const FunctionCallbackInfo<Value>& args) {
     }
     buf = copy;
     release = true;
+  } else {
+    buf = reinterpret_cast<const uint16_t*>(data);
   }
 
   args.GetReturnValue().Set(StringBytes::Encode(env->isolate(), buf, length));
diff --git a/src/string_bytes.cc b/src/string_bytes.cc
index 90fafd40cd3379..a916caf75e8960 100644
--- a/src/string_bytes.cc
+++ b/src/string_bytes.cc
@@ -6,6 +6,7 @@
 
 #include <limits.h>
 #include <string.h>  // memcpy
+#include <vector>
 
 // When creating strings >= this length v8's gc spins up and consumes
 // most of the execution time. For these cases it's more performant to
@@ -406,9 +407,7 @@ size_t StringBytes::Write(Isolate* isolate,
           reinterpret_cast<uintptr_t>(buf) % sizeof(uint16_t);
       if (is_aligned) {
         uint16_t* const dst = reinterpret_cast<uint16_t*>(buf);
-        for (size_t i = 0; i < nchars; i++)
-          dst[i] = dst[i] << 8 | dst[i] >> 8;
-        break;
+        SwapBytes(dst, dst, nchars);
       }
 
       ASSERT_EQ(sizeof(uint16_t), 2);
@@ -857,7 +856,16 @@ Local<Value> StringBytes::Encode(Isolate* isolate,
                                  const uint16_t* buf,
                                  size_t buflen) {
   Local<String> val;
-
+  std::vector<uint16_t> dst;
+  if (IsBigEndian()) {
+    // Node's "ucs2" encoding expects LE character data inside a
+    // Buffer, so we need to reorder on BE platforms.  See
+    // http://nodejs.org/api/buffer.html regarding Node's "ucs2"
+    // encoding specification
+    dst.resize(buflen);
+    SwapBytes(&dst[0], buf, buflen);
+    buf = &dst[0];
+  }
   if (buflen < EXTERN_APEX) {
     val = String::NewFromTwoByte(isolate,
                                  buf,
diff --git a/src/util-inl.h b/src/util-inl.h
index 75bdb4784aaaf3..669b7e7535884b 100644
--- a/src/util-inl.h
+++ b/src/util-inl.h
@@ -198,6 +198,20 @@ TypeName* Unwrap(v8::Local<v8::Object> object) {
   return static_cast<TypeName*>(pointer);
 }
 
+void SwapBytes(uint16_t* dst, const uint16_t* src, size_t buflen) {
+  for (size_t i = 0; i < buflen; i++) {
+    // __builtin_bswap16 generates more efficient code with
+    // g++ 4.8 on PowerPC and other big-endian archs
+#ifdef __GNUC__
+    dst[i] = __builtin_bswap16(src[i]);
+#else
+    dst[i] = (src[i] << 8) | (src[i] >> 8);
+#endif
+  }
+}
+
+
+
 }  // namespace node
 
 #endif  // SRC_UTIL_INL_H_
diff --git a/src/util.h b/src/util.h
index 20cd54758cb102..7b2bc0f1a270ba 100644
--- a/src/util.h
+++ b/src/util.h
@@ -176,6 +176,8 @@ inline void ClearWrap(v8::Local<v8::Object> object);
 template <typename TypeName>
 inline TypeName* Unwrap(v8::Local<v8::Object> object);
 
+inline void SwapBytes(uint16_t* dst, const uint16_t* src, size_t buflen);
+
 class Utf8Value {
   public:
     explicit Utf8Value(v8::Isolate* isolate, v8::Local<v8::Value> value);

From b1dfa8bebb72b9eef219b9d3958ad4e7f177b091 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Mon, 23 Nov 2015 22:32:09 -0800
Subject: [PATCH 252/323] doc: fix typo in README
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/4000
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bf8787241769d9..fc7e2abf8b8bfd 100644
--- a/README.md
+++ b/README.md
@@ -353,7 +353,7 @@ Instructions:
 All security bugs in node.js are taken seriously and should be reported by
 emailing security@nodejs.org. This will be delivered to a subset of the project
 team who handle security issues. Please don't disclose security bugs
-public until they have been handled by the security team.
+publicly until they have been handled by the security team.
 
 Your email will be acknowledged within 24 hours, and you’ll receive a more
 detailed response to your email within 48 hours indicating the next steps in

From dd0d15fc47863d89bd1d999a7c4b800301bcc2fc Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 21 Nov 2015 12:37:49 -0800
Subject: [PATCH 253/323] test: add TAP diagnostic message for retried tests

Tests on SmartOS are sometimes retried due to a SmartOS issue on CI.
When this happens, a TAP diagnostic message is written.

PR-URL: https://github.com/nodejs/node/pull/3960
Reviewed-By: Fedor Indutny <fedor@indutny.com>
---
 tools/test.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/tools/test.py b/tools/test.py
index 49db74727aea38..4baca769c25ee5 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -145,6 +145,7 @@ def RunSingle(self, parallel, thread_id):
           sys.platform == 'sunos5' and
           'ECONNREFUSED' in output.output.stderr):
             output = case.Run()
+            output.diagnostic.append('ECONNREFUSED received, test retried')
         case.duration = (datetime.now() - start)
       except IOError, e:
         return
@@ -255,6 +256,10 @@ def HasRun(self, output):
 
 class TapProgressIndicator(SimpleProgressIndicator):
 
+  def _printDiagnostic(self, messages):
+    for l in messages.splitlines():
+      logger.info('# ' + l)
+
   def Starting(self):
     logger.info('1..%i' % len(self.cases))
     self._done = 0
@@ -270,14 +275,13 @@ def HasRun(self, output):
       if FLAKY in output.test.outcomes and self.flaky_tests_mode == DONTCARE:
         status_line = status_line + ' # TODO : Fix flaky test'
       logger.info(status_line)
+      self._printDiagnostic("\n".join(output.diagnostic))
 
       if output.HasTimedOut():
-        logger.info('# TIMEOUT')
+        self._printDiagnostic('TIMEOUT')
 
-      for l in output.output.stderr.splitlines():
-        logger.info('#' + l)
-      for l in output.output.stdout.splitlines():
-        logger.info('#' + l)
+      self._printDiagnostic(output.output.stderr)
+      self._printDiagnostic(output.output.stdout)
     else:
       skip = skip_regex.search(output.output.stdout)
       if skip:
@@ -288,6 +292,7 @@ def HasRun(self, output):
         if FLAKY in output.test.outcomes:
           status_line = status_line + ' # TODO : Fix flaky test'
         logger.info(status_line)
+      self._printDiagnostic("\n".join(output.diagnostic))
 
     duration = output.test.duration
 
@@ -490,6 +495,7 @@ def __init__(self, test, command, output, store_unexpected_output):
     self.command = command
     self.output = output
     self.store_unexpected_output = store_unexpected_output
+    self.diagnostic = []
 
   def UnexpectedOutput(self):
     if self.HasCrashed():

From f0a2e2cdec87e13a434f969235a16dae2618cd7d Mon Sep 17 00:00:00 2001
From: Bryan English <bryan@bryanenglish.com>
Date: Mon, 23 Nov 2015 18:27:54 -0800
Subject: [PATCH 254/323] doc: message.header duplication correction

The old version of the text here was slightly incorrect, so it
just defers the details to the section in which they're fully
described.

PR-URL: https://github.com/nodejs/node/pull/3997
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
---
 doc/api/http.markdown | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/doc/api/http.markdown b/doc/api/http.markdown
index 51b2b57a3bae8d..154580a8946b2b 100644
--- a/doc/api/http.markdown
+++ b/doc/api/http.markdown
@@ -25,11 +25,7 @@ HTTP API is very low-level. It deals with stream handling and message
 parsing only. It parses a message into headers and body but it does not
 parse the actual headers or the body.
 
-Defined headers that allow multiple values are concatenated with a `,`
-character, except for the `set-cookie` and `cookie` headers which are
-represented as an array of values.  Headers such as `content-length`
-which can only have a single value are parsed accordingly, and only a
-single value is represented on the parsed object.
+See [message.headers][] for details on how duplicate headers are handled.
 
 The raw headers as they were received are retained in the `rawHeaders`
 property, which is an array of `[key, value, key2, value2, ...]`.  For
@@ -1083,6 +1079,7 @@ There are a few special headers that should be noted.
 * Sending an Authorization header will override using the `auth` option
   to compute basic authentication.
 
+[message.headers][]: #http_message_headers
 [constructor options]: #http_new_agent_options
 [`destroy()`]: #http_agent_destroy
 ['checkContinue']: #http_event_checkcontinue

From a863e8d667ceec37670dedebf20dc0120ad36898 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sun, 22 Nov 2015 19:29:14 -0800
Subject: [PATCH 255/323] test: remove flaky status for cluster test

The test did not fail after 9999 runs in continuous integration.

Remove it's flaky status.

Fixes: https://github.com/nodejs/node/issues/2557
PR-URL: https://github.com/nodejs/node/pull/3975
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Roman Klauke <romaaan.git@gmail.com>
---
 test/parallel/parallel.status | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index 9334614d5626d8..189083819d54ff 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -10,7 +10,6 @@ prefix parallel
 test-tls-ticket-cluster           : PASS,FLAKY
 
 [$system==linux]
-test-cluster-worker-forced-exit   : PASS,FLAKY
 test-http-client-timeout-event    : PASS,FLAKY
 test-child-process-buffering      : PASS,FLAKY
 test-child-process-exit-code      : PASS,FLAKY

From c584c3e08fa557eff7349e286defe625561cdbed Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Mon, 23 Nov 2015 14:58:18 -0500
Subject: [PATCH 256/323] util,src: allow lookup of hidden values

This commit adds an internal util method that makes hidden
values in the C++ layer visible in JS.

PR-URL: https://github.com/nodejs/node/pull/3988
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 lib/internal/util.js                |  3 +++
 src/node_util.cc                    | 19 +++++++++++++++++
 test/parallel/test-util-internal.js | 32 +++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 test/parallel/test-util-internal.js

diff --git a/lib/internal/util.js b/lib/internal/util.js
index a31f22e6e9f186..5be073f18a2217 100644
--- a/lib/internal/util.js
+++ b/lib/internal/util.js
@@ -1,7 +1,10 @@
 'use strict';
 
+const binding = process.binding('util');
 const prefix = '(node) ';
 
+exports.getHiddenValue = binding.getHiddenValue;
+
 // All the internal deprecations have to use this function only, as this will
 // prepend the prefix to the actual message.
 exports.deprecate = function(fn, msg) {
diff --git a/src/node_util.cc b/src/node_util.cc
index 19c3e3240a52af..a520b8d5f354ac 100644
--- a/src/node_util.cc
+++ b/src/node_util.cc
@@ -10,6 +10,7 @@ using v8::Context;
 using v8::FunctionCallbackInfo;
 using v8::Local;
 using v8::Object;
+using v8::String;
 using v8::Value;
 
 static void IsMapIterator(const FunctionCallbackInfo<Value>& args) {
@@ -28,6 +29,23 @@ static void IsPromise(const FunctionCallbackInfo<Value>& args) {
   args.GetReturnValue().Set(args[0]->IsPromise());
 }
 
+
+static void GetHiddenValue(const FunctionCallbackInfo<Value>& args) {
+  Environment* env = Environment::GetCurrent(args);
+
+  if (!args[0]->IsObject())
+    return env->ThrowTypeError("obj must be an object");
+
+  if (!args[1]->IsString())
+    return env->ThrowTypeError("name must be a string");
+
+  Local<Object> obj = args[0].As<Object>();
+  Local<String> name = args[1].As<String>();
+
+  args.GetReturnValue().Set(obj->GetHiddenValue(name));
+}
+
+
 void Initialize(Local<Object> target,
                 Local<Value> unused,
                 Local<Context> context) {
@@ -35,6 +53,7 @@ void Initialize(Local<Object> target,
   env->SetMethod(target, "isMapIterator", IsMapIterator);
   env->SetMethod(target, "isSetIterator", IsSetIterator);
   env->SetMethod(target, "isPromise", IsPromise);
+  env->SetMethod(target, "getHiddenValue", GetHiddenValue);
 }
 
 }  // namespace util
diff --git a/test/parallel/test-util-internal.js b/test/parallel/test-util-internal.js
new file mode 100644
index 00000000000000..9ab883ec8b6dcd
--- /dev/null
+++ b/test/parallel/test-util-internal.js
@@ -0,0 +1,32 @@
+'use strict';
+// Flags: --expose_internals
+
+const common = require('../common');
+const assert = require('assert');
+const internalUtil = require('internal/util');
+
+function getHiddenValue(obj, name) {
+  return function() {
+    internalUtil.getHiddenValue(obj, name);
+  };
+}
+
+assert.throws(getHiddenValue(), /obj must be an object/);
+assert.throws(getHiddenValue(null, 'foo'), /obj must be an object/);
+assert.throws(getHiddenValue(undefined, 'foo'), /obj must be an object/);
+assert.throws(getHiddenValue('bar', 'foo'), /obj must be an object/);
+assert.throws(getHiddenValue(85, 'foo'), /obj must be an object/);
+assert.throws(getHiddenValue({}), /name must be a string/);
+assert.throws(getHiddenValue({}, null), /name must be a string/);
+assert.throws(getHiddenValue({}, []), /name must be a string/);
+assert.deepEqual(internalUtil.getHiddenValue({}, 'foo'), undefined);
+
+let arrowMessage;
+
+try {
+  require('../fixtures/syntax/bad_syntax');
+} catch (err) {
+  arrowMessage = internalUtil.getHiddenValue(err, 'arrowMessage');
+}
+
+assert(/bad_syntax\.js:1/.test(arrowMessage));

From baac81d95fa1f9d51b794ae6f4060e2d59a8a3c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Sch=C3=A4r?= <jscissr@gmail.com>
Date: Fri, 20 Nov 2015 22:16:55 +0100
Subject: [PATCH 257/323] net: add local address/port for better errors

Adds localAddress and localPort to req so we have better error messages.
Also fixes a case where ex is used before it is declared.

PR-URL: https://github.com/nodejs/node/pull/3946
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 lib/net.js                                    | 10 +++++++---
 test/parallel/test-net-connect-local-error.js | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 test/parallel/test-net-connect-local-error.js

diff --git a/lib/net.js b/lib/net.js
index d7f3eae03914fc..f778043572362e 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -817,6 +817,8 @@ function connect(self, address, port, addressType, localAddress, localPort) {
     req.oncomplete = afterConnect;
     req.address = address;
     req.port = port;
+    req.localAddress = localAddress;
+    req.localPort = localPort;
 
     if (addressType === 4)
       err = self._handle.connect(req, address, port);
@@ -1056,15 +1058,17 @@ function afterConnect(status, handle, req, readable, writable) {
     self._connecting = false;
     var details;
     if (req.localAddress && req.localPort) {
-      ex.localAddress = req.localAddress;
-      ex.localPort = req.localPort;
-      details = ex.localAddress + ':' + ex.localPort;
+      details = req.localAddress + ':' + req.localPort;
     }
     var ex = exceptionWithHostPort(status,
                                    'connect',
                                    req.address,
                                    req.port,
                                    details);
+    if (details) {
+      ex.localAddress = req.localAddress;
+      ex.localPort = req.localPort;
+    }
     self._destroy(ex);
   }
 }
diff --git a/test/parallel/test-net-connect-local-error.js b/test/parallel/test-net-connect-local-error.js
new file mode 100644
index 00000000000000..197b283bdf3621
--- /dev/null
+++ b/test/parallel/test-net-connect-local-error.js
@@ -0,0 +1,15 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const net = require('net');
+
+var client = net.connect({
+  port: common.PORT + 1,
+  localPort: common.PORT,
+  localAddress: common.localhostIPv4
+});
+
+client.on('error', common.mustCall(function onError(err) {
+  assert.equal(err.localPort, common.PORT);
+  assert.equal(err.localAddress, common.localhostIPv4);
+}));

From 19ed33df80b53a4f775e4d36f1e9cb3f27acb651 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Mon, 23 Nov 2015 16:01:35 -0800
Subject: [PATCH 258/323] test: skip test if in FreeBSD jail
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test test-net-socket-local-address is flaky in FreeBSD jail but robust
otherwise.

Fixes: https://github.com/nodejs/node/issues/2475
PR-URL: https://github.com/nodejs/node/pull/3995
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 test/parallel/parallel.status                 |  1 -
 .../parallel/test-net-socket-local-address.js | 20 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index 189083819d54ff..4a8aab5e53b181 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -19,4 +19,3 @@ test-child-process-exit-code      : PASS,FLAKY
 [$system==solaris] # Also applies to SmartOS
 
 [$system==freebsd]
-test-net-socket-local-address     : PASS,FLAKY
diff --git a/test/parallel/test-net-socket-local-address.js b/test/parallel/test-net-socket-local-address.js
index 4c0e31d08c4771..502c2d226d54b8 100644
--- a/test/parallel/test-net-socket-local-address.js
+++ b/test/parallel/test-net-socket-local-address.js
@@ -1,24 +1,30 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
-var net = require('net');
+const common = require('../common');
+const assert = require('assert');
+const net = require('net');
+
+// skip test in FreeBSD jails
+if (common.inFreeBSDJail) {
+  console.log('1..0 # Skipped: In a FreeBSD jail');
+  return;
+}
 
 var conns = 0;
 var clientLocalPorts = [];
 var serverRemotePorts = [];
 
-var server = net.createServer(function(socket) {
+const server = net.createServer(function(socket) {
   serverRemotePorts.push(socket.remotePort);
   conns++;
 });
 
-var client = new net.Socket();
+const client = new net.Socket();
 
-server.on('close', function() {
+server.on('close', common.mustCall(function() {
   assert.deepEqual(clientLocalPorts, serverRemotePorts,
                    'client and server should agree on the ports used');
   assert.equal(2, conns);
-});
+}));
 
 server.listen(common.PORT, common.localhostIPv4, testConnect);
 

From 99fd1ec28d13feab08cc12f8c2f7cc4374785fb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <mic.besace@gmail.com>
Date: Fri, 20 Nov 2015 11:52:17 +0100
Subject: [PATCH 259/323] deps: backport 819b40a from V8 upstream

Original commit message:

    Use baseline code to compute message locations.

    This switches Isolate::ComputeLocation to use baseline code when
    computing message locations. This unifies locations between optimized
    and non-optimized code by always going through the FrameSummary for
    location computation.

    R=bmeurer@chromium.org
    TEST=message/regress/regress-4266
    BUG=v8:4266
    LOG=n

    Review URL: https://codereview.chromium.org/1331603002

    Cr-Commit-Position: refs/heads/master@{#30635}

Fixes: https://github.com/nodejs/node/issues/3934
PR-URL: https://github.com/nodejs/node/pull/3937
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 deps/v8/src/ast-numbering.cc                    |  2 +-
 deps/v8/src/compiler/ast-graph-builder.cc       |  3 +--
 deps/v8/src/compiler/linkage.cc                 |  3 ++-
 .../v8/src/full-codegen/arm/full-codegen-arm.cc |  2 +-
 .../full-codegen/arm64/full-codegen-arm64.cc    |  2 +-
 .../src/full-codegen/ia32/full-codegen-ia32.cc  |  2 +-
 .../src/full-codegen/mips/full-codegen-mips.cc  |  2 +-
 .../full-codegen/mips64/full-codegen-mips64.cc  |  2 +-
 .../v8/src/full-codegen/ppc/full-codegen-ppc.cc |  2 +-
 .../v8/src/full-codegen/x64/full-codegen-x64.cc |  2 +-
 .../v8/src/full-codegen/x87/full-codegen-x87.cc |  2 +-
 deps/v8/src/isolate.cc                          |  9 +++++++--
 deps/v8/src/scopes.cc                           |  4 ++--
 deps/v8/src/scopes.h                            |  4 ++--
 deps/v8/test/message/regress/regress-4266.js    | 11 +++++++++++
 deps/v8/test/message/regress/regress-4266.out   | 10 ++++++++++
 deps/v8/test/mjsunit/regress/regress-4266.js    | 17 +++++++++++++++++
 17 files changed, 61 insertions(+), 18 deletions(-)
 create mode 100644 deps/v8/test/message/regress/regress-4266.js
 create mode 100644 deps/v8/test/message/regress/regress-4266.out
 create mode 100644 deps/v8/test/mjsunit/regress/regress-4266.js

diff --git a/deps/v8/src/ast-numbering.cc b/deps/v8/src/ast-numbering.cc
index dc0528caa0cff6..4becade296fa52 100644
--- a/deps/v8/src/ast-numbering.cc
+++ b/deps/v8/src/ast-numbering.cc
@@ -553,7 +553,7 @@ bool AstNumberingVisitor::Renumber(FunctionLiteral* node) {
   Scope* scope = node->scope();
 
   if (scope->HasIllegalRedeclaration()) {
-    scope->VisitIllegalRedeclaration(this);
+    Visit(scope->GetIllegalRedeclaration());
     DisableOptimization(kFunctionWithIllegalRedeclaration);
     return Finish(node);
   }
diff --git a/deps/v8/src/compiler/ast-graph-builder.cc b/deps/v8/src/compiler/ast-graph-builder.cc
index e7725799233cbb..947d2e3b185f1b 100644
--- a/deps/v8/src/compiler/ast-graph-builder.cc
+++ b/deps/v8/src/compiler/ast-graph-builder.cc
@@ -586,8 +586,7 @@ void AstGraphBuilder::CreateGraphBody(bool stack_check) {
 
   // Visit illegal re-declaration and bail out if it exists.
   if (scope->HasIllegalRedeclaration()) {
-    AstEffectContext for_effect(this);
-    scope->VisitIllegalRedeclaration(this);
+    VisitForEffect(scope->GetIllegalRedeclaration());
     return;
   }
 
diff --git a/deps/v8/src/compiler/linkage.cc b/deps/v8/src/compiler/linkage.cc
index 2bbedaceb26b07..80b5e2616f3262 100644
--- a/deps/v8/src/compiler/linkage.cc
+++ b/deps/v8/src/compiler/linkage.cc
@@ -218,10 +218,10 @@ int Linkage::FrameStateInputCount(Runtime::FunctionId function) {
   switch (function) {
     case Runtime::kAllocateInTargetSpace:
     case Runtime::kDateField:
-    case Runtime::kFinalizeClassDefinition:        // TODO(conradw): Is it safe?
     case Runtime::kDefineClassMethod:              // TODO(jarin): Is it safe?
     case Runtime::kDefineGetterPropertyUnchecked:  // TODO(jarin): Is it safe?
     case Runtime::kDefineSetterPropertyUnchecked:  // TODO(jarin): Is it safe?
+    case Runtime::kFinalizeClassDefinition:        // TODO(conradw): Is it safe?
     case Runtime::kForInDone:
     case Runtime::kForInStep:
     case Runtime::kGetOriginalConstructor:
@@ -244,6 +244,7 @@ int Linkage::FrameStateInputCount(Runtime::FunctionId function) {
     case Runtime::kInlineGetCallerJSFunction:
     case Runtime::kInlineGetPrototype:
     case Runtime::kInlineRegExpExec:
+    case Runtime::kInlineSubString:
     case Runtime::kInlineToObject:
       return 1;
     case Runtime::kInlineDeoptimizeNow:
diff --git a/deps/v8/src/full-codegen/arm/full-codegen-arm.cc b/deps/v8/src/full-codegen/arm/full-codegen-arm.cc
index 197a5ecc6fc1f9..56f7e62ded8bae 100644
--- a/deps/v8/src/full-codegen/arm/full-codegen-arm.cc
+++ b/deps/v8/src/full-codegen/arm/full-codegen-arm.cc
@@ -338,7 +338,7 @@ void FullCodeGenerator::Generate() {
   // redeclaration.
   if (scope()->HasIllegalRedeclaration()) {
     Comment cmnt(masm_, "[ Declarations");
-    scope()->VisitIllegalRedeclaration(this);
+    VisitForEffect(scope()->GetIllegalRedeclaration());
 
   } else {
     PrepareForBailoutForId(BailoutId::FunctionEntry(), NO_REGISTERS);
diff --git a/deps/v8/src/full-codegen/arm64/full-codegen-arm64.cc b/deps/v8/src/full-codegen/arm64/full-codegen-arm64.cc
index 73aaf46abde31a..96e8d957d5c543 100644
--- a/deps/v8/src/full-codegen/arm64/full-codegen-arm64.cc
+++ b/deps/v8/src/full-codegen/arm64/full-codegen-arm64.cc
@@ -344,7 +344,7 @@ void FullCodeGenerator::Generate() {
   // redeclaration.
   if (scope()->HasIllegalRedeclaration()) {
     Comment cmnt(masm_, "[ Declarations");
-    scope()->VisitIllegalRedeclaration(this);
+    VisitForEffect(scope()->GetIllegalRedeclaration());
 
   } else {
     PrepareForBailoutForId(BailoutId::FunctionEntry(), NO_REGISTERS);
diff --git a/deps/v8/src/full-codegen/ia32/full-codegen-ia32.cc b/deps/v8/src/full-codegen/ia32/full-codegen-ia32.cc
index 5aa64094413334..1503211b0b8b67 100644
--- a/deps/v8/src/full-codegen/ia32/full-codegen-ia32.cc
+++ b/deps/v8/src/full-codegen/ia32/full-codegen-ia32.cc
@@ -341,7 +341,7 @@ void FullCodeGenerator::Generate() {
   // redeclaration.
   if (scope()->HasIllegalRedeclaration()) {
     Comment cmnt(masm_, "[ Declarations");
-    scope()->VisitIllegalRedeclaration(this);
+    VisitForEffect(scope()->GetIllegalRedeclaration());
 
   } else {
     PrepareForBailoutForId(BailoutId::FunctionEntry(), NO_REGISTERS);
diff --git a/deps/v8/src/full-codegen/mips/full-codegen-mips.cc b/deps/v8/src/full-codegen/mips/full-codegen-mips.cc
index c8da77fba2128c..2f0173191b89ae 100644
--- a/deps/v8/src/full-codegen/mips/full-codegen-mips.cc
+++ b/deps/v8/src/full-codegen/mips/full-codegen-mips.cc
@@ -356,7 +356,7 @@ void FullCodeGenerator::Generate() {
   // redeclaration.
   if (scope()->HasIllegalRedeclaration()) {
     Comment cmnt(masm_, "[ Declarations");
-    scope()->VisitIllegalRedeclaration(this);
+    VisitForEffect(scope()->GetIllegalRedeclaration());
 
   } else {
     PrepareForBailoutForId(BailoutId::FunctionEntry(), NO_REGISTERS);
diff --git a/deps/v8/src/full-codegen/mips64/full-codegen-mips64.cc b/deps/v8/src/full-codegen/mips64/full-codegen-mips64.cc
index 231e8ba3840a77..db25e433dc240c 100644
--- a/deps/v8/src/full-codegen/mips64/full-codegen-mips64.cc
+++ b/deps/v8/src/full-codegen/mips64/full-codegen-mips64.cc
@@ -351,7 +351,7 @@ void FullCodeGenerator::Generate() {
   // redeclaration.
   if (scope()->HasIllegalRedeclaration()) {
     Comment cmnt(masm_, "[ Declarations");
-    scope()->VisitIllegalRedeclaration(this);
+    VisitForEffect(scope()->GetIllegalRedeclaration());
 
   } else {
     PrepareForBailoutForId(BailoutId::FunctionEntry(), NO_REGISTERS);
diff --git a/deps/v8/src/full-codegen/ppc/full-codegen-ppc.cc b/deps/v8/src/full-codegen/ppc/full-codegen-ppc.cc
index 656c37523247f4..5c25c6dc9ed959 100644
--- a/deps/v8/src/full-codegen/ppc/full-codegen-ppc.cc
+++ b/deps/v8/src/full-codegen/ppc/full-codegen-ppc.cc
@@ -349,7 +349,7 @@ void FullCodeGenerator::Generate() {
   // redeclaration.
   if (scope()->HasIllegalRedeclaration()) {
     Comment cmnt(masm_, "[ Declarations");
-    scope()->VisitIllegalRedeclaration(this);
+    VisitForEffect(scope()->GetIllegalRedeclaration());
 
   } else {
     PrepareForBailoutForId(BailoutId::FunctionEntry(), NO_REGISTERS);
diff --git a/deps/v8/src/full-codegen/x64/full-codegen-x64.cc b/deps/v8/src/full-codegen/x64/full-codegen-x64.cc
index 7e0553103f3fff..a9a5e162438a09 100644
--- a/deps/v8/src/full-codegen/x64/full-codegen-x64.cc
+++ b/deps/v8/src/full-codegen/x64/full-codegen-x64.cc
@@ -338,7 +338,7 @@ void FullCodeGenerator::Generate() {
   // redeclaration.
   if (scope()->HasIllegalRedeclaration()) {
     Comment cmnt(masm_, "[ Declarations");
-    scope()->VisitIllegalRedeclaration(this);
+    VisitForEffect(scope()->GetIllegalRedeclaration());
 
   } else {
     PrepareForBailoutForId(BailoutId::FunctionEntry(), NO_REGISTERS);
diff --git a/deps/v8/src/full-codegen/x87/full-codegen-x87.cc b/deps/v8/src/full-codegen/x87/full-codegen-x87.cc
index cfa752c19145db..fdf42cdb8a3c5b 100644
--- a/deps/v8/src/full-codegen/x87/full-codegen-x87.cc
+++ b/deps/v8/src/full-codegen/x87/full-codegen-x87.cc
@@ -338,7 +338,7 @@ void FullCodeGenerator::Generate() {
   // redeclaration.
   if (scope()->HasIllegalRedeclaration()) {
     Comment cmnt(masm_, "[ Declarations");
-    scope()->VisitIllegalRedeclaration(this);
+    VisitForEffect(scope()->GetIllegalRedeclaration());
 
   } else {
     PrepareForBailoutForId(BailoutId::FunctionEntry(), NO_REGISTERS);
diff --git a/deps/v8/src/isolate.cc b/deps/v8/src/isolate.cc
index f63d423fa741c4..1b44ee6834a695 100644
--- a/deps/v8/src/isolate.cc
+++ b/deps/v8/src/isolate.cc
@@ -1279,9 +1279,14 @@ void Isolate::ComputeLocation(MessageLocation* target) {
     Object* script = fun->shared()->script();
     if (script->IsScript() &&
         !(Script::cast(script)->source()->IsUndefined())) {
-      int pos = frame->LookupCode()->SourcePosition(frame->pc());
-      // Compute the location from the function and the reloc info.
       Handle<Script> casted_script(Script::cast(script));
+      // Compute the location from the function and the relocation info of the
+      // baseline code. For optimized code this will use the deoptimization
+      // information to get canonical location information.
+      List<FrameSummary> frames(FLAG_max_inlining_levels + 1);
+      it.frame()->Summarize(&frames);
+      FrameSummary& summary = frames.last();
+      int pos = summary.code()->SourcePosition(summary.pc());
       *target = MessageLocation(casted_script, pos, pos + 1, handle(fun));
     }
   }
diff --git a/deps/v8/src/scopes.cc b/deps/v8/src/scopes.cc
index 8f821461d16949..9c0e471989aba6 100644
--- a/deps/v8/src/scopes.cc
+++ b/deps/v8/src/scopes.cc
@@ -550,9 +550,9 @@ void Scope::SetIllegalRedeclaration(Expression* expression) {
 }
 
 
-void Scope::VisitIllegalRedeclaration(AstVisitor* visitor) {
+Expression* Scope::GetIllegalRedeclaration() {
   DCHECK(HasIllegalRedeclaration());
-  illegal_redecl_->Accept(visitor);
+  return illegal_redecl_;
 }
 
 
diff --git a/deps/v8/src/scopes.h b/deps/v8/src/scopes.h
index 2f600b9f0cbc3a..12a5a9b18a5316 100644
--- a/deps/v8/src/scopes.h
+++ b/deps/v8/src/scopes.h
@@ -189,9 +189,9 @@ class Scope: public ZoneObject {
   // the additional requests will be silently ignored.
   void SetIllegalRedeclaration(Expression* expression);
 
-  // Visit the illegal redeclaration expression. Do not call if the
+  // Retrieve the illegal redeclaration expression. Do not call if the
   // scope doesn't have an illegal redeclaration node.
-  void VisitIllegalRedeclaration(AstVisitor* visitor);
+  Expression* GetIllegalRedeclaration();
 
   // Check if the scope has (at least) one illegal redeclaration.
   bool HasIllegalRedeclaration() const { return illegal_redecl_ != NULL; }
diff --git a/deps/v8/test/message/regress/regress-4266.js b/deps/v8/test/message/regress/regress-4266.js
new file mode 100644
index 00000000000000..552176bccf54e0
--- /dev/null
+++ b/deps/v8/test/message/regress/regress-4266.js
@@ -0,0 +1,11 @@
+// Copyright 2015 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(function() {
+  try {
+    [].foo();
+  } catch (e) {
+    throw e;
+  }
+})();
diff --git a/deps/v8/test/message/regress/regress-4266.out b/deps/v8/test/message/regress/regress-4266.out
new file mode 100644
index 00000000000000..d31541debe0a95
--- /dev/null
+++ b/deps/v8/test/message/regress/regress-4266.out
@@ -0,0 +1,10 @@
+# Copyright 2015 the V8 project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+*%(basename)s:9: TypeError: [].foo is not a function
+    throw e;
+    ^
+TypeError: [].foo is not a function
+    at *%(basename)s:7:8
+    at *%(basename)s:11:3
diff --git a/deps/v8/test/mjsunit/regress/regress-4266.js b/deps/v8/test/mjsunit/regress/regress-4266.js
new file mode 100644
index 00000000000000..f886250a87399a
--- /dev/null
+++ b/deps/v8/test/mjsunit/regress/regress-4266.js
@@ -0,0 +1,17 @@
+// Copyright 2015 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --turbo-filter=test --allow-natives-syntax
+
+function test() {
+  try {
+    [].foo();
+  } catch (e) {
+    return e.message;
+  }
+}
+
+assertEquals("[].foo is not a function", test());
+%OptimizeFunctionOnNextCall(test);
+assertEquals("[].foo is not a function", test());

From 1f0e8dca8e5a1e375282dd07ec001f056b2c243b Mon Sep 17 00:00:00 2001
From: Matt Loring <mattloring@google.com>
Date: Tue, 22 Sep 2015 11:53:56 -0700
Subject: [PATCH 260/323] installer: install the tick processor

The tick processor is used to provide readable profiling information
from isolate tick logs (produced by a call to node -prof).

This patch installs the file at $PREFIX/share/doc/node/tick-processor.

PR-URL: https://github.com/nodejs/node/pull/3032
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 tools/install.py    | 45 +++++++++++++++++++++++++++++++++++++++++++++
 tools/rpm/node.spec |  4 ++++
 2 files changed, 49 insertions(+)

diff --git a/tools/install.py b/tools/install.py
index cb86c65699df88..99cbbf249f76c7 100755
--- a/tools/install.py
+++ b/tools/install.py
@@ -10,6 +10,7 @@
 import os
 import re
 import shutil
+import stat
 import sys
 
 # set at init time
@@ -126,6 +127,48 @@ def subdir_files(path, dest, action):
   for subdir, files in ret.items():
     action(files, subdir + '/')
 
+def build_tick_processor(action):
+  tmp_script = 'out/Release/tick-processor'
+  if action == install:
+    # construct script
+    scripts = [
+        'tools/v8-prof/polyfill.js',
+        'deps/v8/tools/splaytree.js',
+        'deps/v8/tools/codemap.js',
+        'deps/v8/tools/csvparser.js',
+        'deps/v8/tools/consarray.js',
+        'deps/v8/tools/csvparser.js',
+        'deps/v8/tools/consarray.js',
+        'deps/v8/tools/profile.js',
+        'deps/v8/tools/profile_view.js',
+        'deps/v8/tools/logreader.js',
+        'deps/v8/tools/tickprocessor.js',
+        'deps/v8/tools/SourceMap.js',
+        'deps/v8/tools/tickprocessor-driver.js']
+    args = []
+    if sys.platform == 'win32':
+      args.append('--windows')
+    elif sys.platform == 'darwin':
+      args.append('--nm=' + abspath(install_path, 'share/doc/node') + '/mac-nm')
+      args.append('--mac')
+    with open(tmp_script, 'w') as out_file:
+      # Add #! line to run with node
+      out_file.write('#! ' + abspath(install_path, 'bin/node') + '\n')
+      # inject arguments
+      for arg in args:
+        out_file.write('process.argv.splice(2, 0, \'' + arg + '\');\n')
+      # cat in source files
+      for script in scripts:
+        with open(script) as in_file:
+          shutil.copyfileobj(in_file, out_file)
+    # make executable
+    st = os.stat(tmp_script)
+    os.chmod(tmp_script, st.st_mode | stat.S_IEXEC)
+  # perform installations
+  action([tmp_script], 'share/doc/node/')
+  if sys.platform == 'darwin':
+    action(['deps/v8/tools/mac-nm'], 'share/doc/node/')
+
 def files(action):
   is_windows = sys.platform == 'win32'
 
@@ -140,6 +183,8 @@ def files(action):
 
   action(['deps/v8/tools/gdbinit'], 'share/doc/node/')
 
+  build_tick_processor(action)
+
   if 'freebsd' in sys.platform or 'openbsd' in sys.platform:
     action(['doc/node.1'], 'man/man1/')
   else:
diff --git a/tools/rpm/node.spec b/tools/rpm/node.spec
index 39b98ec5541c53..a86cdf74db750d 100644
--- a/tools/rpm/node.spec
+++ b/tools/rpm/node.spec
@@ -94,6 +94,7 @@ done
 /usr/include/*
 /usr/lib/node_modules/
 /usr/share/doc/node/gdbinit
+/usr/share/doc/node/tick-processor
 /usr/share/man/man1/node.1.gz
 /usr/share/systemtap/tapset/node.stp
 %{_datadir}/%{name}/
@@ -101,6 +102,9 @@ done
 
 
 %changelog
+* Tue Sep 22 2015 Matt Loring <mattloring@google.com>
+- Added tick processor.
+
 * Tue Jul 7 2015 Ali Ijaz Sheikh <ofrobots@google.com>
 - Added gdbinit.
 

From ed255abdc10fe962ef528b19d46faedae21fa3be Mon Sep 17 00:00:00 2001
From: Chunyang Dai <chunyang.dai@intel.com>
Date: Thu, 22 Oct 2015 00:24:12 +0800
Subject: [PATCH 261/323] build,src: add Intel Vtune profiling support

This feature supports the Intel Vtune profiling support for JITted
JavaScript on IA32 / X64 / X32 platform. The advantage of this profiling
is that the user / developer of NodeJS application can get the detailed
profiling information for every line of the JavaScript source code.
This information will be very useful for the owner to optimize their
applications.

This feature is a compile-time option. For windows platform, the user
needs to pass the following parameter to vcbuild.bat: "enable-vtune"

For other OS, the user needs to pass the following parameter to
./configure command: "--enable-vtune-profiling"

PR-URL: https://github.com/nodejs/node/pull/3785
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 configure   | 17 +++++++++++++++++
 node.gyp    |  8 ++++++++
 src/node.cc |  7 +++++++
 vcbuild.bat |  7 +++++--
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 8dccf8a32a97ff..51673e3fa96a0e 100755
--- a/configure
+++ b/configure
@@ -86,6 +86,14 @@ parser.add_option("--fully-static",
     help="Generate an executable without external dynamic libraries. This "
          "will not work on OSX when using default compilation environment")
 
+parser.add_option("--enable-vtune-profiling",
+    action="store_true",
+    dest="enable_vtune_profiling",
+    help="Enable profiling support for Intel Vtune profiler to profile"
+         "JavaScript code executed in nodejs. This feature is only available "
+         "for ia32, x32 or x64 platform.")
+
+
 parser.add_option("--link-module",
     action="append",
     dest="linked_module",
@@ -679,6 +687,15 @@ def configure_node(o):
     o['variables']['node_core_target_name'] = 'node_base'
     o['variables']['node_target_type'] = 'static_library'
 
+  if target_arch in ('x86', 'x64', 'ia32', 'x32'):
+    o['variables']['node_enable_v8_vtunejit'] = b(options.enable_vtune_profiling)
+  elif options.enable_vtune_profiling:
+    raise Exception(
+       'vtune profiler for JavaScript is only supported on x86, x32 or x64 '
+       'platform.')
+  else:
+    o['variables']['node_enable_v8_vtunejit'] = 'false'
+
   if flavor in ('solaris', 'mac', 'linux', 'freebsd'):
     use_dtrace = not options.without_dtrace
     # Don't enable by default on linux and freebsd
diff --git a/node.gyp b/node.gyp
index 0e8fd576f0735a..d1de17c6daf64b 100644
--- a/node.gyp
+++ b/node.gyp
@@ -12,6 +12,7 @@
     'node_use_openssl%': 'true',
     'node_shared_openssl%': 'false',
     'node_v8_options%': '',
+    'node_enable_v8_vtunejit%': 'false',
     'node_target_type%': 'executable',
     'node_core_target_name%': 'node',
     'library_files': [
@@ -221,6 +222,13 @@
               'defines': [ 'NODE_HAVE_SMALL_ICU=1' ],
           }]],
         }],
+        [ 'node_enable_v8_vtunejit=="true" and (target_arch=="x64" or \
+           target_arch=="ia32" or target_arch=="x32")', {
+          'defines': [ 'NODE_ENABLE_VTUNE_PROFILING' ],
+          'dependencies': [
+            'deps/v8/src/third_party/vtune/v8vtune.gyp:v8_vtune'
+          ],
+        }],
         [ 'node_use_openssl=="true"', {
           'defines': [ 'HAVE_OPENSSL=1' ],
           'sources': [
diff --git a/src/node.cc b/src/node.cc
index 7dfa708b7b1ad1..4e591ff5af6053 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -43,6 +43,10 @@
 #include "v8-profiler.h"
 #include "zlib.h"
 
+#ifdef NODE_ENABLE_VTUNE_PROFILING
+#include "../deps/v8/src/third_party/vtune/v8-vtune.h"
+#endif
+
 #include <errno.h>
 #include <limits.h>  // PATH_MAX
 #include <locale.h>
@@ -4025,6 +4029,9 @@ static void StartNodeInstance(void* arg) {
   Isolate::CreateParams params;
   ArrayBufferAllocator* array_buffer_allocator = new ArrayBufferAllocator();
   params.array_buffer_allocator = array_buffer_allocator;
+#ifdef NODE_ENABLE_VTUNE_PROFILING
+  params.code_event_handler = vTune::GetVtuneCodeEventHandler();
+#endif
   Isolate* isolate = Isolate::New(params);
   if (track_heap_objects) {
     isolate->GetHeapProfiler()->StartTrackingHeapObjects(true);
diff --git a/vcbuild.bat b/vcbuild.bat
index 08b1462e172192..43618bcd7bdf1d 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -37,6 +37,7 @@ set i18n_arg=
 set download_arg=
 set release_urls_arg=
 set build_release=
+set enable_vtune_profiling=
 
 :next-arg
 if "%1"=="" goto args-done
@@ -71,6 +72,7 @@ if /i "%1"=="full-icu"      set i18n_arg=%1&goto arg-ok
 if /i "%1"=="intl-none"     set i18n_arg=%1&goto arg-ok
 if /i "%1"=="download-all"  set download_arg="--download=all"&goto arg-ok
 if /i "%1"=="ignore-flaky"  set test_args=%test_args% --flaky-tests=dontcare&goto arg-ok
+if /i "%1"=="enable-vtune"  set enable_vtune_profiling="--enable-vtune-profiling"&goto arg-ok
 
 echo Warning: ignoring invalid command line option `%1`.
 
@@ -168,7 +170,7 @@ goto run
 if defined noprojgen goto msbuild
 
 @rem Generate the VS project.
-python configure %download_arg% %i18n_arg% %debug_arg% %snapshot_arg% %noetw_arg% %noperfctr_arg% --dest-cpu=%target_arch% --tag=%TAG%
+python configure %download_arg% %i18n_arg% %debug_arg% %snapshot_arg% %noetw_arg% %noperfctr_arg% %enable_vtune_profiling% --dest-cpu=%target_arch% --tag=%TAG%
 if errorlevel 1 goto create-msvs-files-failed
 if not exist node.sln goto create-msvs-files-failed
 echo Project files generated.
@@ -259,13 +261,14 @@ echo Failed to create vc project files.
 goto exit
 
 :help
-echo vcbuild.bat [debug/release] [msi] [test-all/test-uv/test-internet/test-pummel/test-simple/test-message] [clean] [noprojgen] [small-icu/full-icu/intl-none] [nobuild] [nosign] [x86/x64] [download-all]
+echo vcbuild.bat [debug/release] [msi] [test-all/test-uv/test-internet/test-pummel/test-simple/test-message] [clean] [noprojgen] [small-icu/full-icu/intl-none] [nobuild] [nosign] [x86/x64] [download-all] [enable-vtune]
 echo Examples:
 echo   vcbuild.bat                : builds release build
 echo   vcbuild.bat debug          : builds debug build
 echo   vcbuild.bat release msi    : builds release build and MSI installer package
 echo   vcbuild.bat test           : builds debug build and runs tests
 echo   vcbuild.bat build-release  : builds the release distribution as used by nodejs.org
+echo   vcbuild.bat enable-vtune   : builds nodejs with Intel Vtune profiling support to profile JavaScript
 goto exit
 
 :exit

From ab5b529dd2acf1a6183ab6bd859d4b2992fcd1b6 Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Tue, 24 Nov 2015 21:48:03 +0000
Subject: [PATCH 262/323] buffer: default to UTF8 in byteLength()

If an undefined encoding is passed to byteLength(),
assume that it is UTF8 immediately. This yields a
small speedup, as it prevents string operations on
the encoding argument.

PR-URL: https://github.com/nodejs/node/pull/4010
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 lib/buffer.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/buffer.js b/lib/buffer.js
index 210fdf4f058ff2..dff740e1b2b363 100644
--- a/lib/buffer.js
+++ b/lib/buffer.js
@@ -272,6 +272,7 @@ function byteLength(string, encoding) {
 
       case 'utf8':
       case 'utf-8':
+      case undefined:
         return binding.byteLengthUtf8(string);
 
       case 'ucs2':

From d0621c5649ce980279fbc2cc25ab79a6b6e87839 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Wed, 25 Nov 2015 09:47:41 -0800
Subject: [PATCH 263/323] test: mark fork regression test flaky on windows

See https://github.com/nodejs/node/issues/3635 for details and failure
examples.

Ref: https://github.com/nodejs/node/issues/3635
PR-URL: https://github.com/nodejs/node/pull/4005
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 test/parallel/parallel.status | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index 4a8aab5e53b181..43bfdfdd12ad7b 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -7,7 +7,8 @@ prefix parallel
 [true] # This section applies to all platforms
 
 [$system==win32]
-test-tls-ticket-cluster           : PASS,FLAKY
+test-tls-ticket-cluster              : PASS,FLAKY
+test-child-process-fork-regr-gh-2847 : PASS,FLAKY
 
 [$system==linux]
 test-http-client-timeout-event    : PASS,FLAKY

From 054a216b6f9c1a3048103ebb40891f7e49f5bc80 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Tue, 24 Nov 2015 08:31:11 -0800
Subject: [PATCH 264/323] test: mark cluster-net-send test flaky on windows

See https://github.com/nodejs/node/issues/3957 for details and examples
failures.

Ref: https://github.com/nodejs/node/issues/3957
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: https://github.com/nodejs/node/pull/4006
---
 test/parallel/parallel.status | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index 43bfdfdd12ad7b..b30ec2a7dc019f 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -2,18 +2,19 @@ prefix parallel
 
 # To mark a test as flaky, list the test name in the appropriate section
 # below, without ".js", followed by ": PASS,FLAKY". Example:
-# sample-test                       : PASS,FLAKY
+# sample-test                        : PASS,FLAKY
 
 [true] # This section applies to all platforms
 
 [$system==win32]
+test-cluster-net-send                : PASS,FLAKY
 test-tls-ticket-cluster              : PASS,FLAKY
 test-child-process-fork-regr-gh-2847 : PASS,FLAKY
 
 [$system==linux]
-test-http-client-timeout-event    : PASS,FLAKY
-test-child-process-buffering      : PASS,FLAKY
-test-child-process-exit-code      : PASS,FLAKY
+test-http-client-timeout-event       : PASS,FLAKY
+test-child-process-buffering         : PASS,FLAKY
+test-child-process-exit-code         : PASS,FLAKY
 
 [$system==macos]
 

From e68ea16c3250bb4abf9664c7aa7216ce57be7276 Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Tue, 24 Nov 2015 19:52:35 -0500
Subject: [PATCH 265/323] util: add decorateErrorStack()

This commit adds the decorateErrorStack() method. This function
uses the internal util's getHiddenValue() method to extract
arrow messages from error objects and attach them to the
error's stack trace.

PR-URL: https://github.com/nodejs/node/pull/4013
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 lib/util.js                                   | 11 ++++++
 .../test-util-decorate-error-stack.js         | 35 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 test/parallel/test-util-decorate-error-stack.js

diff --git a/lib/util.js b/lib/util.js
index 928e148e28c80b..8e2d335ad3426a 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -883,3 +883,14 @@ exports._exceptionWithHostPort = function(err,
   }
   return ex;
 };
+
+
+exports.decorateErrorStack = function(err) {
+  if (!(isError(err) && err.stack))
+    return;
+
+  const arrow = internalUtil.getHiddenValue(err, 'arrowMessage');
+
+  if (arrow)
+    err.stack = arrow + err.stack;
+};
diff --git a/test/parallel/test-util-decorate-error-stack.js b/test/parallel/test-util-decorate-error-stack.js
new file mode 100644
index 00000000000000..b609ee3372574b
--- /dev/null
+++ b/test/parallel/test-util-decorate-error-stack.js
@@ -0,0 +1,35 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const util = require('util');
+
+assert.doesNotThrow(function() {
+  util.decorateErrorStack();
+  util.decorateErrorStack(null);
+  util.decorateErrorStack(1);
+  util.decorateErrorStack(true);
+});
+
+// Verify that a stack property is not added to non-Errors
+const obj = {};
+util.decorateErrorStack(obj);
+assert.strictEqual(obj.stack, undefined);
+
+// Verify that the stack is decorated when possible
+let err;
+
+try {
+  require('../fixtures/syntax/bad_syntax');
+} catch (e) {
+  err = e;
+  assert(!/var foo bar;/.test(err.stack));
+  util.decorateErrorStack(err);
+}
+
+assert(/var foo bar;/.test(err.stack));
+
+// Verify that the stack is unchanged when there is no arrow message
+err = new Error('foo');
+const originalStack = err.stack;
+util.decorateErrorStack(err);
+assert.strictEqual(originalStack, err.stack);

From aaab108dfefcd29c222c1623ffa0645ff4212751 Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Tue, 24 Nov 2015 19:55:51 -0500
Subject: [PATCH 266/323] repl: attach location info to syntax errors

Currently, when a file with a syntax error is imported in the
REPL, no information is provided on the error's location. This
commit adds the error's location to the stack trace.

Refs: https://github.com/nodejs/node/issues/2762
Refs: https://github.com/nodejs/node/issues/3411
Refs: https://github.com/nodejs/node/issues/3784
PR-URL: https://github.com/nodejs/node/pull/4013
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 lib/repl.js                                   |  1 +
 test/parallel/test-repl-syntax-error-stack.js | 39 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 test/parallel/test-repl-syntax-error-stack.js

diff --git a/lib/repl.js b/lib/repl.js
index 2da336eae8cf93..bd3a75d88e5826 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -274,6 +274,7 @@ function REPLServer(prompt,
   self._domain.on('error', function(e) {
     debug('domain error');
     const top = replMap.get(self);
+    util.decorateErrorStack(e);
     top.outputStream.write((e.stack || e) + '\n');
     top.lineParser.reset();
     top.bufferedCommand = '';
diff --git a/test/parallel/test-repl-syntax-error-stack.js b/test/parallel/test-repl-syntax-error-stack.js
new file mode 100644
index 00000000000000..573059e8d9f34f
--- /dev/null
+++ b/test/parallel/test-repl-syntax-error-stack.js
@@ -0,0 +1,39 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const path = require('path');
+const repl = require('repl');
+const util = require('util');
+let found = false;
+
+process.on('exit', () => {
+  assert.strictEqual(found, true);
+});
+
+// A stream to push an array into a REPL
+function ArrayStream() {
+  this.run = function(data) {
+    data.forEach(line => {
+      this.emit('data', line + '\n');
+    });
+  };
+}
+util.inherits(ArrayStream, require('stream').Stream);
+ArrayStream.prototype.readable = true;
+ArrayStream.prototype.writable = true;
+ArrayStream.prototype.resume = function() {};
+ArrayStream.prototype.write = function(output) {
+  if (/var foo bar;/.test(output))
+    found = true;
+};
+
+const putIn = new ArrayStream();
+const testMe = repl.start('', putIn);
+let file = path.resolve(__dirname, '../fixtures/syntax/bad_syntax');
+
+if (common.isWindows)
+  file = file.replace(/\\/g, '\\\\');
+
+putIn.run(['.clear']);
+putIn.run([`require('${file}');`]);

From 00b839a2b853c5cc496eeb5124cea4efc824f99d Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Tue, 24 Nov 2015 20:59:49 -0800
Subject: [PATCH 267/323] test: use platform-based timeout for reliability

test-http-client-timeout-with-data fails on Raspberry Pi in CI from time
to time.

Use a platform-based timeout to improve reliability.

PR-URL: https://github.com/nodejs/node/pull/4015
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Roman Reiss <me@silverwind.io>
---
 .../parallel/test-http-client-timeout-with-data.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/parallel/test-http-client-timeout-with-data.js b/test/parallel/test-http-client-timeout-with-data.js
index 0aefe62ef45055..673908fe6d465f 100644
--- a/test/parallel/test-http-client-timeout-with-data.js
+++ b/test/parallel/test-http-client-timeout-with-data.js
@@ -1,7 +1,7 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
-var http = require('http');
+const common = require('../common');
+const assert = require('assert');
+const http = require('http');
 
 var ntimeouts = 0;
 var nchunks = 0;
@@ -11,21 +11,21 @@ process.on('exit', function() {
   assert.equal(nchunks, 2);
 });
 
-var options = {
+const options = {
   method: 'GET',
   port: common.PORT,
   host: '127.0.0.1',
   path: '/'
 };
 
-var server = http.createServer(function(req, res) {
+const server = http.createServer(function(req, res) {
   res.writeHead(200, {'Content-Length':'2'});
   res.write('*');
-  setTimeout(function() { res.end('*'); }, 100);
+  setTimeout(function() { res.end('*'); }, common.platformTimeout(100));
 });
 
 server.listen(options.port, options.host, function() {
-  var req = http.request(options, onresponse);
+  const req = http.request(options, onresponse);
   req.end();
 
   function onresponse(res) {

From f3c50f5fb5f2c72448e1f947669eba61dad8d685 Mon Sep 17 00:00:00 2001
From: Roman Reiss <me@silverwind.io>
Date: Sat, 21 Nov 2015 01:19:04 +0100
Subject: [PATCH 268/323] doc: fix rare case of misaligned columns

By using the same unit for the offset of the main column as used for the
left column width, we ensure that browsers render the columns
conistently.

Ref: https://github.com/nodejs/help/issues/32

PR-URL: https://github.com/nodejs/node/pull/3948
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 doc/api_assets/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api_assets/style.css b/doc/api_assets/style.css
index 3be4c88f960d86..f03753d09bf66f 100644
--- a/doc/api_assets/style.css
+++ b/doc/api_assets/style.css
@@ -356,7 +356,7 @@ span.type {
 
 #column1.interior {
   width: 702px;
-  border-left: 13em solid #f2f5f0;
+  border-left: 234px solid #f2f5f0;
   padding-left: 2.0em;
 }
 

From d94a70ec51e7985b0988ceaed57d4eec4a601206 Mon Sep 17 00:00:00 2001
From: Julien Gilli <julien.gilli@joyent.com>
Date: Mon, 23 Nov 2015 13:13:40 -0800
Subject: [PATCH 269/323] test: fix test-domain-exit-dispose-again

test-domain-exit-dispose-again had been written for node v0.10.x, and
was using the fact that callbacks scheduled with `process.nextTick`
wouldn't run if the domain attached to it was disposed.

This is not longer the case, and as a result the test would not catch
any regression: it would always pass.

This change rewrites that test to check that the current domain is
cleared properly when processing the rest of the timers list if a
timer's callback throws an error. This makes the test fail without the
original fix, and pass with the original fix, as expected.

PR: #3990
PR-URL: https://github.com/nodejs/node/pull/3990
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 .../test-domain-exit-dispose-again.js         | 63 +++++++------------
 1 file changed, 23 insertions(+), 40 deletions(-)

diff --git a/test/parallel/test-domain-exit-dispose-again.js b/test/parallel/test-domain-exit-dispose-again.js
index d7046481d112ea..6fe9f25fb0d887 100644
--- a/test/parallel/test-domain-exit-dispose-again.js
+++ b/test/parallel/test-domain-exit-dispose-again.js
@@ -1,56 +1,39 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
-var domain = require('domain');
-var disposalFailed = false;
+const common = require('../common');
+const assert = require('assert');
+const domain = require('domain');
 
-// no matter what happens, we should increment a 10 times.
-var a = 0;
-log();
-function log() {
-  console.log(a++, process.domain);
-  if (a < 10) setTimeout(log, 20);
-}
-
-var secondTimerRan = false;
-
-// in 50ms we'll throw an error.
+// Use the same timeout value so that both timers' callbacks are called during
+// the same invocation of the underlying native timer's callback (listOnTimeout
+// in lib/timers.js).
 setTimeout(err, 50);
-setTimeout(secondTimer, 50);
+setTimeout(common.mustCall(secondTimer), 50);
+
 function err() {
-  var d = domain.create();
-  d.on('error', handle);
+  const d = domain.create();
+  d.on('error', handleDomainError);
   d.run(err2);
 
   function err2() {
-    // this timeout should never be called, since the domain gets
-    // disposed when the error happens.
-    setTimeout(function() {
-      console.error('This should not happen.');
-      disposalFailed = true;
-      process.exit(1);
-    });
-
     // this function doesn't exist, and throws an error as a result.
     err3();
   }
 
-  function handle(e) {
-    // this should clean up everything properly.
-    d.dispose();
-    console.error(e);
-    console.error('in handler', process.domain, process.domain === d);
+  function handleDomainError(e) {
+    // In the domain's error handler, the current active domain should be the
+    // domain within which the error was thrown.
+    assert.equal(process.domain, d);
   }
 }
 
 function secondTimer() {
-  console.log('In second timer');
-  secondTimerRan = true;
+  // secondTimer was scheduled before any domain had been created, so its
+  // callback should not have any active domain set when it runs.
+  // Do not use assert here, as it throws errors and if a domain with an error
+  // handler is active, then asserting wouldn't make the test fail.
+  if (process.domain !== null) {
+    console.log('process.domain should be null, but instead is:',
+      process.domain);
+    process.exit(1);
+  }
 }
-
-process.on('exit', function() {
-  assert.equal(a, 10);
-  assert.equal(disposalFailed, false);
-  assert(secondTimerRan);
-  console.log('ok');
-});

From 69c95bbdb7808d1b3c215a2d8542e976e3983f68 Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Wed, 25 Nov 2015 16:38:01 -0500
Subject: [PATCH 270/323] test: move ArrayStream to common

A number of REPL tests define the same ArrayStream object. This
commit moves the repeated code into common.js.

PR-URL: https://github.com/nodejs/node/pull/4027
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 test/common.js                                | 20 +++++++++++++++++++
 test/parallel/test-repl-.save.load.js         | 17 +---------------
 test/parallel/test-repl-autolibs.js           | 20 ++++---------------
 test/parallel/test-repl-console.js            |  7 ++-----
 test/parallel/test-repl-domain.js             | 17 +---------------
 test/parallel/test-repl-end-emits-exit.js     |  7 ++-----
 test/parallel/test-repl-options.js            |  7 ++-----
 test/parallel/test-repl-reset-event.js        |  7 ++-----
 test/parallel/test-repl-syntax-error-stack.js | 16 ++-------------
 test/parallel/test-repl-tab-complete-crash.js | 19 +++---------------
 test/parallel/test-repl-tab-complete.js       | 17 +---------------
 11 files changed, 40 insertions(+), 114 deletions(-)

diff --git a/test/common.js b/test/common.js
index 572a1dcf982e46..470f2f4688d598 100644
--- a/test/common.js
+++ b/test/common.js
@@ -5,6 +5,8 @@ var fs = require('fs');
 var assert = require('assert');
 var os = require('os');
 var child_process = require('child_process');
+const stream = require('stream');
+const util = require('util');
 
 
 exports.testDir = path.dirname(__filename);
@@ -449,3 +451,21 @@ exports.fileExists = function(pathname) {
 exports.fail = function(msg) {
   assert.fail(null, null, msg);
 };
+
+
+// A stream to push an array into a REPL
+function ArrayStream() {
+  this.run = function(data) {
+    data.forEach(line => {
+      this.emit('data', line + '\n');
+    });
+  };
+}
+
+util.inherits(ArrayStream, stream.Stream);
+exports.ArrayStream = ArrayStream;
+ArrayStream.prototype.readable = true;
+ArrayStream.prototype.writable = true;
+ArrayStream.prototype.pause = function() {};
+ArrayStream.prototype.resume = function() {};
+ArrayStream.prototype.write = function() {};
diff --git a/test/parallel/test-repl-.save.load.js b/test/parallel/test-repl-.save.load.js
index f63b61bf41e15b..2b9ceed4db633c 100644
--- a/test/parallel/test-repl-.save.load.js
+++ b/test/parallel/test-repl-.save.load.js
@@ -9,24 +9,9 @@ common.refreshTmpDir();
 
 var repl = require('repl');
 
-// A stream to push an array into a REPL
-function ArrayStream() {
-  this.run = function(data) {
-    var self = this;
-    data.forEach(function(line) {
-      self.emit('data', line + '\n');
-    });
-  };
-}
-util.inherits(ArrayStream, require('stream').Stream);
-ArrayStream.prototype.readable = true;
-ArrayStream.prototype.writable = true;
-ArrayStream.prototype.resume = function() {};
-ArrayStream.prototype.write = function() {};
-
 var works = [['inner.one'], 'inner.o'];
 
-var putIn = new ArrayStream();
+const putIn = new common.ArrayStream();
 var testMe = repl.start('', putIn);
 
 
diff --git a/test/parallel/test-repl-autolibs.js b/test/parallel/test-repl-autolibs.js
index e37f2d036ece4d..05cc299f56888f 100644
--- a/test/parallel/test-repl-autolibs.js
+++ b/test/parallel/test-repl-autolibs.js
@@ -1,25 +1,13 @@
-/* eslint-disable required-modules */
 'use strict';
+const common = require('../common');
 var assert = require('assert');
 var util = require('util');
 var repl = require('repl');
 
-// A stream to push an array into a REPL
-function ArrayStream() {
-  this.run = function(data) {
-    var self = this;
-    data.forEach(function(line) {
-      self.emit('data', line + '\n');
-    });
-  };
-}
-util.inherits(ArrayStream, require('stream').Stream);
-ArrayStream.prototype.readable = true;
-ArrayStream.prototype.writable = true;
-ArrayStream.prototype.resume = function() {};
-ArrayStream.prototype.write = function() {};
+// This test adds global variables
+common.globalCheck = false;
 
-var putIn = new ArrayStream();
+const putIn = new common.ArrayStream();
 var testMe = repl.start('', putIn, null, true);
 
 test1();
diff --git a/test/parallel/test-repl-console.js b/test/parallel/test-repl-console.js
index e66fcb1621adc5..fe737d841e1651 100644
--- a/test/parallel/test-repl-console.js
+++ b/test/parallel/test-repl-console.js
@@ -1,13 +1,10 @@
 'use strict';
 var common = require('../common'),
     assert = require('assert'),
-    Stream = require('stream'),
     repl = require('repl');
 
-// create a dummy stream that does nothing
-var stream = new Stream();
-stream.write = stream.pause = stream.resume = function() {};
-stream.readable = stream.writable = true;
+// Create a dummy stream that does nothing
+const stream = new common.ArrayStream();
 
 var r = repl.start({
   input: stream,
diff --git a/test/parallel/test-repl-domain.js b/test/parallel/test-repl-domain.js
index 7528f502878f63..baf0485b3b80b2 100644
--- a/test/parallel/test-repl-domain.js
+++ b/test/parallel/test-repl-domain.js
@@ -5,22 +5,7 @@ var common = require('../common');
 var util   = require('util');
 var repl   = require('repl');
 
-// A stream to push an array into a REPL
-function ArrayStream() {
-  this.run = function(data) {
-    var self = this;
-    data.forEach(function(line) {
-      self.emit('data', line + '\n');
-    });
-  };
-}
-util.inherits(ArrayStream, require('stream').Stream);
-ArrayStream.prototype.readable = true;
-ArrayStream.prototype.writable = true;
-ArrayStream.prototype.resume = function() {};
-ArrayStream.prototype.write = function() {};
-
-var putIn = new ArrayStream();
+const putIn = new common.ArrayStream();
 var testMe = repl.start('', putIn);
 
 putIn.write = function(data) {
diff --git a/test/parallel/test-repl-end-emits-exit.js b/test/parallel/test-repl-end-emits-exit.js
index e4bc4da78c142d..2c18b413d68c0f 100644
--- a/test/parallel/test-repl-end-emits-exit.js
+++ b/test/parallel/test-repl-end-emits-exit.js
@@ -1,15 +1,12 @@
 'use strict';
 var common = require('../common'),
     assert = require('assert'),
-    Stream = require('stream'),
     repl = require('repl'),
     terminalExit = 0,
     regularExit = 0;
 
-// create a dummy stream that does nothing
-var stream = new Stream();
-stream.write = stream.pause = stream.resume = function() {};
-stream.readable = stream.writable = true;
+// Create a dummy stream that does nothing
+const stream = new common.ArrayStream();
 
 function testTerminalMode() {
   var r1 = repl.start({
diff --git a/test/parallel/test-repl-options.js b/test/parallel/test-repl-options.js
index 5bc37d2d7117f3..ec3b144ec0ef77 100644
--- a/test/parallel/test-repl-options.js
+++ b/test/parallel/test-repl-options.js
@@ -1,15 +1,12 @@
 'use strict';
 var common = require('../common'),
     assert = require('assert'),
-    Stream = require('stream'),
     repl = require('repl');
 
 common.globalCheck = false;
 
-// create a dummy stream that does nothing
-var stream = new Stream();
-stream.write = stream.pause = stream.resume = function() {};
-stream.readable = stream.writable = true;
+// Create a dummy stream that does nothing
+const stream = new common.ArrayStream();
 
 // 1, mostly defaults
 var r1 = repl.start({
diff --git a/test/parallel/test-repl-reset-event.js b/test/parallel/test-repl-reset-event.js
index e6d4eed1385b10..0bd43dcd6c370e 100644
--- a/test/parallel/test-repl-reset-event.js
+++ b/test/parallel/test-repl-reset-event.js
@@ -4,12 +4,9 @@ common.globalCheck = false;
 
 var assert = require('assert');
 var repl = require('repl');
-var Stream = require('stream');
 
-// create a dummy stream that does nothing
-var dummy = new Stream();
-dummy.write = dummy.pause = dummy.resume = function() {};
-dummy.readable = dummy.writable = true;
+// Create a dummy stream that does nothing
+const dummy = new common.ArrayStream();
 
 function testReset(cb) {
   var r = repl.start({
diff --git a/test/parallel/test-repl-syntax-error-stack.js b/test/parallel/test-repl-syntax-error-stack.js
index 573059e8d9f34f..647d3e3569ce00 100644
--- a/test/parallel/test-repl-syntax-error-stack.js
+++ b/test/parallel/test-repl-syntax-error-stack.js
@@ -11,24 +11,12 @@ process.on('exit', () => {
   assert.strictEqual(found, true);
 });
 
-// A stream to push an array into a REPL
-function ArrayStream() {
-  this.run = function(data) {
-    data.forEach(line => {
-      this.emit('data', line + '\n');
-    });
-  };
-}
-util.inherits(ArrayStream, require('stream').Stream);
-ArrayStream.prototype.readable = true;
-ArrayStream.prototype.writable = true;
-ArrayStream.prototype.resume = function() {};
-ArrayStream.prototype.write = function(output) {
+common.ArrayStream.prototype.write = function(output) {
   if (/var foo bar;/.test(output))
     found = true;
 };
 
-const putIn = new ArrayStream();
+const putIn = new common.ArrayStream();
 const testMe = repl.start('', putIn);
 let file = path.resolve(__dirname, '../fixtures/syntax/bad_syntax');
 
diff --git a/test/parallel/test-repl-tab-complete-crash.js b/test/parallel/test-repl-tab-complete-crash.js
index 85ab0577eb8601..484580f1e72fe5 100644
--- a/test/parallel/test-repl-tab-complete-crash.js
+++ b/test/parallel/test-repl-tab-complete-crash.js
@@ -1,32 +1,19 @@
 'use strict';
 
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 const util = require('util');
 const repl = require('repl');
 
 var referenceErrorCount = 0;
 
-// A stream to push an array into a REPL
-function ArrayStream() {
-  this.run = function(data) {
-    const self = this;
-    data.forEach(function(line) {
-      self.emit('data', line + '\n');
-    });
-  };
-}
-util.inherits(ArrayStream, require('stream').Stream);
-ArrayStream.prototype.readable = true;
-ArrayStream.prototype.writable = true;
-ArrayStream.prototype.resume = function() {};
-ArrayStream.prototype.write = function(msg) {
+common.ArrayStream.prototype.write = function(msg) {
   if (msg.startsWith('ReferenceError: ')) {
     referenceErrorCount++;
   }
 };
 
-const putIn = new ArrayStream();
+const putIn = new common.ArrayStream();
 const testMe = repl.start('', putIn);
 
 // https://github.com/nodejs/node/issues/3346
diff --git a/test/parallel/test-repl-tab-complete.js b/test/parallel/test-repl-tab-complete.js
index 1cb6e7791d3c2b..6bf7d5059d0116 100644
--- a/test/parallel/test-repl-tab-complete.js
+++ b/test/parallel/test-repl-tab-complete.js
@@ -20,23 +20,8 @@ process.on('exit', function() {
   assert.strictEqual(referenceErrors, expectedReferenceErrors);
 });
 
-// A stream to push an array into a REPL
-function ArrayStream() {
-  this.run = function(data) {
-    var self = this;
-    data.forEach(function(line) {
-      self.emit('data', line + '\n');
-    });
-  };
-}
-util.inherits(ArrayStream, require('stream').Stream);
-ArrayStream.prototype.readable = true;
-ArrayStream.prototype.writable = true;
-ArrayStream.prototype.resume = function() {};
-ArrayStream.prototype.write = function() {};
-
 var works = [['inner.one'], 'inner.o'];
-var putIn = new ArrayStream();
+const putIn = new common.ArrayStream();
 var testMe = repl.start('', putIn);
 
 // Some errors are passed to the domain, but do not callback

From c50003746b6f576eb616f7db6f3d50b7d869997c Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Tue, 24 Nov 2015 22:12:36 -0800
Subject: [PATCH 271/323] test: mark test flaky on FreeBSD
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Mark test-net-socket-local-address flaky on FreeBSD. It times out with
some frequency on CI.

Ref: https://github.com/nodejs/node/issues/2475
PR-URL: https://github.com/nodejs/node/pull/4016
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 test/parallel/parallel.status | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index b30ec2a7dc019f..bce36b53bbe5d2 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -21,3 +21,4 @@ test-child-process-exit-code         : PASS,FLAKY
 [$system==solaris] # Also applies to SmartOS
 
 [$system==freebsd]
+test-net-socket-local-address     : PASS,FLAKY

From a76d78811944ec2643a7f21196e8454dbc2a68e5 Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Wed, 25 Nov 2015 10:36:25 +1100
Subject: [PATCH 272/323] build: update signtool description, add url
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/4011
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Alexis Campailla <orangemocha@nodejs.org>
---
 vcbuild.bat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vcbuild.bat b/vcbuild.bat
index 43618bcd7bdf1d..4136fb1860f82f 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -188,7 +188,7 @@ if "%target%" == "Clean" goto exit
 @rem Skip signing if the `nosign` option was specified.
 if defined nosign goto licensertf
 
-signtool sign /a /d "node" /t http://timestamp.globalsign.com/scripts/timestamp.dll Release\node.exe
+signtool sign /a /d "Node.js" /du "https://nodejs.org" /t http://timestamp.globalsign.com/scripts/timestamp.dll Release\node.exe
 if errorlevel 1 echo Failed to sign exe&goto exit
 
 :licensertf
@@ -208,7 +208,7 @@ msbuild "%~dp0tools\msvs\msi\nodemsi.sln" /m /t:Clean,Build /p:PlatformToolset=%
 if errorlevel 1 goto exit
 
 if defined nosign goto upload
-signtool sign /a /d "node" /t http://timestamp.globalsign.com/scripts/timestamp.dll node-v%FULLVERSION%-%target_arch%.msi
+signtool sign /a /d "Node.js" /du "https://nodejs.org" /t http://timestamp.globalsign.com/scripts/timestamp.dll node-v%FULLVERSION%-%target_arch%.msi
 if errorlevel 1 echo Failed to sign msi&goto exit
 
 :upload

From a2b7596ac0b61a68a8008215203d4d5b9692b48c Mon Sep 17 00:00:00 2001
From: jpersson <jonathan.persson@creuna.se>
Date: Sun, 29 Nov 2015 12:51:24 -0500
Subject: [PATCH 273/323] doc: fix color of linked code blocks

Links nested in backticks were not visually distinguishable before, this
fixes them.

PR-URL: https://github.com/nodejs/node/pull/4068
Reviewed-By: Roman Reiss <me@silverwind.io>
---
 doc/api_assets/style.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/api_assets/style.css b/doc/api_assets/style.css
index f03753d09bf66f..6f26c3a0c71075 100644
--- a/doc/api_assets/style.css
+++ b/doc/api_assets/style.css
@@ -343,6 +343,10 @@ li code {
   padding: 0.2em 0.4em;
 }
 
+a code {
+  color: inherit;
+}
+
 span.type {
   color: #222;
 }

From 8988e1e1170be7ea172b9e74480050d385b70dcb Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Wed, 25 Nov 2015 22:27:29 +0100
Subject: [PATCH 274/323] module,repl: remove repl require() hack

Remove a hack that was introduced in commit bb6d468d from November 2010.
This is groundwork for a follow-up commit that makes it possible to use
internal modules in lib/repl.js.

PR-URL: https://github.com/nodejs/node/pull/4026
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 lib/_debugger.js           |  2 +-
 lib/internal/module.js     | 26 ++++++++++++++++++++++-
 lib/module.js              | 43 +++++++-------------------------------
 lib/repl.js                |  6 +++++-
 src/node.js                |  2 +-
 test/parallel/test-repl.js |  4 ++++
 6 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/lib/_debugger.js b/lib/_debugger.js
index ba8ee0f30dcad2..f76bf6e2ef238d 100644
--- a/lib/_debugger.js
+++ b/lib/_debugger.js
@@ -5,7 +5,7 @@ const path = require('path');
 const net = require('net');
 const vm = require('vm');
 const Module = require('module');
-const repl = Module.requireRepl();
+const repl = require('repl');
 const inherits = util.inherits;
 const assert = require('assert');
 const spawn = require('child_process').spawn;
diff --git a/lib/internal/module.js b/lib/internal/module.js
index 7f3a39e539424a..ef55aa64bd5642 100644
--- a/lib/internal/module.js
+++ b/lib/internal/module.js
@@ -1,6 +1,30 @@
 'use strict';
 
-module.exports.stripBOM = stripBOM;
+module.exports = { makeRequireFunction, stripBOM };
+
+// Invoke with makeRequireFunction.call(module) where |module| is the
+// Module object to use as the context for the require() function.
+function makeRequireFunction() {
+  const Module = this.constructor;
+  const self = this;
+
+  function require(path) {
+    return self.require(path);
+  }
+
+  require.resolve = function(request) {
+    return Module._resolveFilename(request, self);
+  };
+
+  require.main = process.mainModule;
+
+  // Enable support to add extra extension types.
+  require.extensions = Module._extensions;
+
+  require.cache = Module._cache;
+
+  return require;
+}
 
 /**
  * Remove byte order marker. This catches EF BB BF (the UTF-8 BOM)
diff --git a/lib/module.js b/lib/module.js
index 8b9b59551ece76..6a4cd885a3a3f5 100644
--- a/lib/module.js
+++ b/lib/module.js
@@ -274,17 +274,6 @@ Module._load = function(request, parent, isMain) {
     debug('Module._load REQUEST %s parent: %s', request, parent.id);
   }
 
-  // REPL is a special case, because it needs the real require.
-  if (request === 'internal/repl' || request === 'repl') {
-    if (Module._cache[request]) {
-      return Module._cache[request];
-    }
-    var replModule = new Module(request);
-    replModule._compile(NativeModule.getSource(request), `${request}.js`);
-    NativeModule._cache[request] = replModule;
-    return replModule.exports;
-  }
-
   var filename = Module._resolveFilename(request, parent);
 
   var cachedModule = Module._cache[filename];
@@ -376,27 +365,9 @@ var resolvedArgv;
 // the file.
 // Returns exception, if any.
 Module.prototype._compile = function(content, filename) {
-  var self = this;
   // remove shebang
   content = content.replace(shebangRe, '');
 
-  function require(path) {
-    return self.require(path);
-  }
-
-  require.resolve = function(request) {
-    return Module._resolveFilename(request, self);
-  };
-
-  require.main = process.mainModule;
-
-  // Enable support to add extra extension types
-  require.extensions = Module._extensions;
-
-  require.cache = Module._cache;
-
-  var dirname = path.dirname(filename);
-
   // create wrapper function
   var wrapper = Module.wrap(content);
 
@@ -421,8 +392,10 @@ Module.prototype._compile = function(content, filename) {
       global.v8debug.Debug.setBreakPoint(compiledWrapper, 0, 0);
     }
   }
-  var args = [self.exports, require, self, filename, dirname];
-  return compiledWrapper.apply(self.exports, args);
+  const dirname = path.dirname(filename);
+  const require = internalModule.makeRequireFunction.call(this);
+  const args = [this.exports, require, this, filename, dirname];
+  return compiledWrapper.apply(this.exports, args);
 };
 
 
@@ -488,10 +461,10 @@ Module._initPaths = function() {
   Module.globalPaths = modulePaths.slice(0);
 };
 
-// bootstrap repl
-Module.requireRepl = function() {
-  return Module._load('internal/repl', '.');
-};
+// TODO(bnoordhuis) Unused, remove in the future.
+Module.requireRepl = internalUtil.deprecate(function() {
+  return NativeModule.require('internal/repl');
+}, 'Module.requireRepl is deprecated.');
 
 Module._preloadModules = function(requests) {
   if (!Array.isArray(requests))
diff --git a/lib/repl.js b/lib/repl.js
index bd3a75d88e5826..74c7729fdc1d56 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -21,6 +21,7 @@
 
 'use strict';
 
+const internalModule = require('internal/module');
 const util = require('util');
 const inherits = util.inherits;
 const Stream = require('stream');
@@ -29,6 +30,7 @@ const path = require('path');
 const fs = require('fs');
 const Interface = require('readline').Interface;
 const Console = require('console').Console;
+const Module = require('module');
 const domain = require('domain');
 const debug = util.debuglog('repl');
 
@@ -522,6 +524,8 @@ REPLServer.prototype.createContext = function() {
     context.global.global = context;
   }
 
+  const module = new Module('<repl>');
+  const require = internalModule.makeRequireFunction.call(module);
   context.module = module;
   context.require = require;
 
@@ -661,7 +665,7 @@ REPLServer.prototype.complete = function(line, callback) {
     completionGroupsLoaded();
   } else if (match = line.match(requireRE)) {
     // require('...<Tab>')
-    var exts = Object.keys(require.extensions);
+    const exts = Object.keys(this.context.require.extensions);
     var indexRe = new RegExp('^index(' + exts.map(regexpEscape).join('|') +
                              ')$');
 
diff --git a/src/node.js b/src/node.js
index ca1312bb4b7c8d..1cf03972feacb1 100644
--- a/src/node.js
+++ b/src/node.js
@@ -144,7 +144,7 @@
         // If -i or --interactive were passed, or stdin is a TTY.
         if (process._forceRepl || NativeModule.require('tty').isatty(0)) {
           // REPL
-          var cliRepl = Module.requireRepl();
+          var cliRepl = NativeModule.require('internal/repl');
           cliRepl.createInternalRepl(process.env, function(err, repl) {
             if (err) {
               throw err;
diff --git a/test/parallel/test-repl.js b/test/parallel/test-repl.js
index 5234d8e009ee58..03792789e87f69 100644
--- a/test/parallel/test-repl.js
+++ b/test/parallel/test-repl.js
@@ -278,6 +278,10 @@ function error_test() {
       expect: 'undefined\n' + prompt_unix },
     { client: client_unix, send: '/* \'\n"\n\'"\'\n*/',
       expect: 'undefined\n' + prompt_unix },
+    // REPL should get a normal require() function, not one that allows
+    // access to internal modules without the --expose_internals flag.
+    { client: client_unix, send: 'require("internal/repl")',
+      expect: /^Error: Cannot find module 'internal\/repl'/ },
   ]);
 }
 

From 098a3113e1a01dac6070e5d0d98f65cc47fdce06 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Wed, 25 Nov 2015 22:37:43 +0100
Subject: [PATCH 275/323] util: move .decorateErrorStack to internal/util

Move the method that was added in commit 8ca412b from earlier this month
from lib/util.js to lib/internal/util.js.

Avoids exposing a method that we may not wish to expose just yet, seeing
how it relies on implementation details.

PR-URL: https://github.com/nodejs/node/pull/4026
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 lib/internal/util.js                          | 18 ++++++++++++++++
 lib/repl.js                                   |  3 ++-
 lib/util.js                                   | 21 +++----------------
 .../test-util-decorate-error-stack.js         | 17 ++++++++-------
 4 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/lib/internal/util.js b/lib/internal/util.js
index 5be073f18a2217..c34682ed1b3809 100644
--- a/lib/internal/util.js
+++ b/lib/internal/util.js
@@ -57,3 +57,21 @@ exports._deprecate = function(fn, msg) {
 
   return deprecated;
 };
+
+exports.decorateErrorStack = function decorateErrorStack(err) {
+  if (!(exports.isError(err) && err.stack))
+    return;
+
+  const arrow = exports.getHiddenValue(err, 'arrowMessage');
+
+  if (arrow)
+    err.stack = arrow + err.stack;
+};
+
+exports.isError = function isError(e) {
+  return exports.objectToString(e) === '[object Error]' || e instanceof Error;
+};
+
+exports.objectToString = function objectToString(o) {
+  return Object.prototype.toString.call(o);
+};
diff --git a/lib/repl.js b/lib/repl.js
index 74c7729fdc1d56..d0849c325991cf 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -22,6 +22,7 @@
 'use strict';
 
 const internalModule = require('internal/module');
+const internalUtil = require('internal/util');
 const util = require('util');
 const inherits = util.inherits;
 const Stream = require('stream');
@@ -276,7 +277,7 @@ function REPLServer(prompt,
   self._domain.on('error', function(e) {
     debug('domain error');
     const top = replMap.get(self);
-    util.decorateErrorStack(e);
+    internalUtil.decorateErrorStack(e);
     top.outputStream.write((e.stack || e) + '\n');
     top.lineParser.reset();
     top.bufferedCommand = '';
diff --git a/lib/util.js b/lib/util.js
index 8e2d335ad3426a..0ccfca0304af9c 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -5,6 +5,9 @@ const Buffer = require('buffer').Buffer;
 const internalUtil = require('internal/util');
 const binding = process.binding('util');
 
+const isError = internalUtil.isError;
+const objectToString = internalUtil.objectToString;
+
 var Debug;
 
 const formatRegExp = /%[sdj%]/g;
@@ -680,9 +683,6 @@ function isDate(d) {
 }
 exports.isDate = isDate;
 
-function isError(e) {
-  return objectToString(e) === '[object Error]' || e instanceof Error;
-}
 exports.isError = isError;
 
 function isFunction(arg) {
@@ -698,10 +698,6 @@ exports.isPrimitive = isPrimitive;
 
 exports.isBuffer = Buffer.isBuffer;
 
-function objectToString(o) {
-  return Object.prototype.toString.call(o);
-}
-
 
 function pad(n) {
   return n < 10 ? '0' + n.toString(10) : n.toString(10);
@@ -883,14 +879,3 @@ exports._exceptionWithHostPort = function(err,
   }
   return ex;
 };
-
-
-exports.decorateErrorStack = function(err) {
-  if (!(isError(err) && err.stack))
-    return;
-
-  const arrow = internalUtil.getHiddenValue(err, 'arrowMessage');
-
-  if (arrow)
-    err.stack = arrow + err.stack;
-};
diff --git a/test/parallel/test-util-decorate-error-stack.js b/test/parallel/test-util-decorate-error-stack.js
index b609ee3372574b..24fee56df7b655 100644
--- a/test/parallel/test-util-decorate-error-stack.js
+++ b/test/parallel/test-util-decorate-error-stack.js
@@ -1,18 +1,19 @@
+// Flags: --expose_internals
 'use strict';
 const common = require('../common');
 const assert = require('assert');
-const util = require('util');
+const internalUtil = require('internal/util');
 
 assert.doesNotThrow(function() {
-  util.decorateErrorStack();
-  util.decorateErrorStack(null);
-  util.decorateErrorStack(1);
-  util.decorateErrorStack(true);
+  internalUtil.decorateErrorStack();
+  internalUtil.decorateErrorStack(null);
+  internalUtil.decorateErrorStack(1);
+  internalUtil.decorateErrorStack(true);
 });
 
 // Verify that a stack property is not added to non-Errors
 const obj = {};
-util.decorateErrorStack(obj);
+internalUtil.decorateErrorStack(obj);
 assert.strictEqual(obj.stack, undefined);
 
 // Verify that the stack is decorated when possible
@@ -23,7 +24,7 @@ try {
 } catch (e) {
   err = e;
   assert(!/var foo bar;/.test(err.stack));
-  util.decorateErrorStack(err);
+  internalUtil.decorateErrorStack(err);
 }
 
 assert(/var foo bar;/.test(err.stack));
@@ -31,5 +32,5 @@ assert(/var foo bar;/.test(err.stack));
 // Verify that the stack is unchanged when there is no arrow message
 err = new Error('foo');
 const originalStack = err.stack;
-util.decorateErrorStack(err);
+internalUtil.decorateErrorStack(err);
 assert.strictEqual(originalStack, err.stack);

From aaeced915ed66c153401a0f000410bc3ce9da848 Mon Sep 17 00:00:00 2001
From: yorkie <yorkiefixer@gmail.com>
Date: Wed, 4 Nov 2015 16:17:21 +0800
Subject: [PATCH 276/323] doc: fix the exception description

A value shouldn't be described as doing inherit from some class, more
strictly, the value is an instance of the class `Error`.

PR-URL: https://github.com/nodejs/node/pull/3658
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Stephan Belanger <admin@stephenbelanger.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
---
 doc/api/errors.markdown | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/api/errors.markdown b/doc/api/errors.markdown
index ccadbc484053d3..d2c09f2e6b7788 100644
--- a/doc/api/errors.markdown
+++ b/doc/api/errors.markdown
@@ -357,9 +357,10 @@ of argument validation.
 
 <!--type=misc-->
 
-A JavaScript "exception" is a value that is thrown as a result of an invalid operation or
-as the target of a `throw` statement. While it is not required that these values inherit from
-`Error`, all exceptions thrown by Node.js or the JavaScript runtime *will* be instances of Error.
+A JavaScript exception is a value that is thrown as a result of an invalid operation or
+as the target of a `throw` statement. While it is not required that these values are instances of
+`Error` or classes which inherit from `Error`, all exceptions thrown by Node.js or the JavaScript
+runtime *will* be instances of Error.
 
 Some exceptions are *unrecoverable* at the JavaScript layer. These exceptions will always bring
 down the process. These are usually failed `assert()` checks or `abort()` calls in the C++ layer.

From c93e2678f0c896c9d7f85b2174ec307601373fb8 Mon Sep 17 00:00:00 2001
From: Brian White <mscdex@mscdex.net>
Date: Thu, 15 Oct 2015 15:55:42 -0400
Subject: [PATCH 277/323] util: fix constructor/instanceof checks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These new checks are similar to the one introduced in 089d68861,
but for other types of objects. Specifically, if an object was
created in a different context, the constructor object will not be
the same as the constructor object in the current context, so we
have to compare constructor names instead.

PR-URL: https://github.com/nodejs/node/pull/3385
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
---
 lib/util.js                        | 20 ++++++++++++--------
 test/parallel/test-util-inspect.js | 10 ++++++++++
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/lib/util.js b/lib/util.js
index 0ccfca0304af9c..c07edfe87d6405 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -198,6 +198,7 @@ function ensureDebugIsInitialized() {
 
 function inspectPromise(p) {
   ensureDebugIsInitialized();
+  // Only create a mirror if the object is a Promise.
   if (!binding.isPromise(p))
     return null;
   const mirror = Debug.MakeMirror(p, true);
@@ -292,16 +293,19 @@ function formatValue(ctx, value, recurseTimes) {
   var constructor = getConstructorOf(value);
   var base = '', empty = false, braces, formatter;
 
+  // We can't compare constructors for various objects using a comparison like
+  // `constructor === Array` because the object could have come from a different
+  // context and thus the constructor won't match. Instead we check the
+  // constructor names (including those up the prototype chain where needed) to
+  // determine object types.
   if (Array.isArray(value)) {
-    // We can't use `constructor === Array` because this could
-    // have come from a Debug context.
-    // Otherwise, an Array will print "Array [...]".
+    // Unset the constructor to prevent "Array [...]" for ordinary arrays.
     if (constructor && constructor.name === 'Array')
       constructor = null;
     braces = ['[', ']'];
     empty = value.length === 0;
     formatter = formatArray;
-  } else if (value instanceof Set) {
+  } else if (objectToString(value) === '[object Set]') {
     braces = ['{', '}'];
     // With `showHidden`, `length` will display as a hidden property for
     // arrays. For consistency's sake, do the same for `size`, even though this
@@ -310,7 +314,7 @@ function formatValue(ctx, value, recurseTimes) {
       keys.unshift('size');
     empty = value.size === 0;
     formatter = formatSet;
-  } else if (value instanceof Map) {
+  } else if (objectToString(value) === '[object Map]') {
     braces = ['{', '}'];
     // Ditto.
     if (ctx.showHidden)
@@ -318,8 +322,7 @@ function formatValue(ctx, value, recurseTimes) {
     empty = value.size === 0;
     formatter = formatMap;
   } else {
-    // Only create a mirror if the object superficially looks like a Promise.
-    var promiseInternals = value instanceof Promise && inspectPromise(value);
+    var promiseInternals = inspectPromise(value);
     if (promiseInternals) {
       braces = ['{', '}'];
       formatter = formatPromise;
@@ -335,7 +338,8 @@ function formatValue(ctx, value, recurseTimes) {
         empty = false;
         formatter = formatCollectionIterator;
       } else {
-        if (constructor === Object)
+        // Unset the constructor to prevent "Object {...}" for ordinary objects.
+        if (constructor && constructor.name === 'Object')
           constructor = null;
         braces = ['{', '}'];
         empty = true;  // No other data than keys.
diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js
index 320d5e444ad80a..5831c40e77e930 100644
--- a/test/parallel/test-util-inspect.js
+++ b/test/parallel/test-util-inspect.js
@@ -141,6 +141,16 @@ for (const o of vals) {
 
 assert.strictEqual(util.inspect(valsOutput), '[ [ 1, 2 ] ]');
 
+// test for other constructors in different context
+var obj = require('vm').runInNewContext('(function(){return {}})()', {});
+assert.strictEqual(util.inspect(obj), '{}');
+obj = require('vm').runInNewContext('var m=new Map();m.set(1,2);m', {});
+assert.strictEqual(util.inspect(obj), 'Map { 1 => 2 }');
+obj = require('vm').runInNewContext('var s=new Set();s.add(1);s.add(2);s', {});
+assert.strictEqual(util.inspect(obj), 'Set { 1, 2 }');
+obj = require('vm').runInNewContext('fn=function(){};new Promise(fn,fn)', {});
+assert.strictEqual(util.inspect(obj), 'Promise { <pending> }');
+
 // test for property descriptors
 var getter = Object.create(null, {
   a: {

From 22b09712227f34989f3b4439d2271864a1e1c8cf Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Wed, 25 Nov 2015 19:41:09 -0800
Subject: [PATCH 278/323] test: eliminate multicast test FreeBSD flakiness

test-dgram-multicast-multi-process was flaky on FreeBSD and Raspeberry
Pi. This refactoring fixes the issue by eliminating a race condition.

Fixes: https://github.com/nodejs/node/issues/2474
PR-URL: https://github.com/nodejs/node/pull/4042
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 .../test-dgram-multicast-multi-process.js     | 301 +++++++++---------
 1 file changed, 150 insertions(+), 151 deletions(-)

diff --git a/test/internet/test-dgram-multicast-multi-process.js b/test/internet/test-dgram-multicast-multi-process.js
index 0bef2e1dc028c1..f72402eef64147 100644
--- a/test/internet/test-dgram-multicast-multi-process.js
+++ b/test/internet/test-dgram-multicast-multi-process.js
@@ -1,30 +1,122 @@
 'use strict';
-var common = require('../common'),
-    assert = require('assert'),
-    dgram = require('dgram'),
-    util = require('util'),
-    Buffer = require('buffer').Buffer,
-    fork = require('child_process').fork,
-    LOCAL_BROADCAST_HOST = '224.0.0.114',
-    TIMEOUT = common.platformTimeout(5000),
-    messages = [
-      new Buffer('First message to send'),
-      new Buffer('Second message to send'),
-      new Buffer('Third message to send'),
-      new Buffer('Fourth message to send')
-    ];
+const common = require('../common');
+const assert = require('assert');
+const dgram = require('dgram');
+const fork = require('child_process').fork;
+const LOCAL_BROADCAST_HOST = '224.0.0.114';
+const TIMEOUT = common.platformTimeout(5000);
+const messages = [
+  new Buffer('First message to send'),
+  new Buffer('Second message to send'),
+  new Buffer('Third message to send'),
+  new Buffer('Fourth message to send')
+];
+const workers = {};
+const listeners = 3;
+
+
+// Skip test in FreeBSD jails.
+if (common.inFreeBSDJail) {
+  console.log('1..0 # Skipped: In a FreeBSD jail');
+  return;
+}
+
+function launchChildProcess(index) {
+  const worker = fork(__filename, ['child']);
+  workers[worker.pid] = worker;
+
+  worker.messagesReceived = [];
+
+  // Handle the death of workers.
+  worker.on('exit', function(code, signal) {
+    // Don't consider this the true death if the worker has finished
+    // successfully or if the exit code is 0.
+    if (worker.isDone || code === 0) {
+      return;
+    }
+
+    dead += 1;
+    console.error('[PARENT] Worker %d died. %d dead of %d',
+                  worker.pid,
+                  dead,
+                  listeners);
+
+    if (dead === listeners) {
+      console.error('[PARENT] All workers have died.');
+      console.error('[PARENT] Fail');
+      process.exit(1);
+    }
+  });
+
+  worker.on('message', function(msg) {
+    if (msg.listening) {
+      listening += 1;
+
+      if (listening === listeners) {
+        // All child process are listening, so start sending.
+        sendSocket.sendNext();
+      }
+      return;
+    }
+    if (msg.message) {
+      worker.messagesReceived.push(msg.message);
+
+      if (worker.messagesReceived.length === messages.length) {
+        done += 1;
+        worker.isDone = true;
+        console.error('[PARENT] %d received %d messages total.',
+                      worker.pid,
+                      worker.messagesReceived.length);
+      }
+
+      if (done === listeners) {
+        console.error('[PARENT] All workers have received the ' +
+                      'required number of messages. Will now compare.');
+
+        Object.keys(workers).forEach(function(pid) {
+          const worker = workers[pid];
+
+          var count = 0;
+
+          worker.messagesReceived.forEach(function(buf) {
+            for (var i = 0; i < messages.length; ++i) {
+              if (buf.toString() === messages[i].toString()) {
+                count++;
+                break;
+              }
+            }
+          });
+
+          console.error('[PARENT] %d received %d matching messages.',
+                        worker.pid, count);
+
+          assert.strictEqual(count, messages.length,
+                       'A worker received an invalid multicast message');
+        });
+
+        clearTimeout(timer);
+        console.error('[PARENT] Success');
+        killChildren(workers);
+      }
+    }
+  });
+}
+
+function killChildren(children) {
+  Object.keys(children).forEach(function(key) {
+    const child = children[key];
+    child.kill();
+  });
+}
 
 if (process.argv[2] !== 'child') {
-  var workers = {},
-      listeners = 3,
-      listening = 0,
-      dead = 0,
-      i = 0,
-      done = 0,
-      timer = null;
-
-  //exit the test if it doesn't succeed within TIMEOUT
-  timer = setTimeout(function() {
+  var listening = 0;
+  var dead = 0;
+  var i = 0;
+  var done = 0;
+
+  // Exit the test if it doesn't succeed within TIMEOUT.
+  var timer = setTimeout(function() {
     console.error('[PARENT] Responses were not received within %d ms.',
                   TIMEOUT);
     console.error('[PARENT] Fail');
@@ -34,101 +126,18 @@ if (process.argv[2] !== 'child') {
     process.exit(1);
   }, TIMEOUT);
 
-  //launch child processes
+  // Launch child processes.
   for (var x = 0; x < listeners; x++) {
-    (function() {
-      var worker = fork(process.argv[1], ['child']);
-      workers[worker.pid] = worker;
-
-      worker.messagesReceived = [];
-
-      //handle the death of workers
-      worker.on('exit', function(code, signal) {
-        // don't consider this the true death if the
-        // worker has finished successfully
-
-        // or if the exit code is 0
-        if (worker.isDone || code === 0) {
-          return;
-        }
-
-        dead += 1;
-        console.error('[PARENT] Worker %d died. %d dead of %d',
-                      worker.pid,
-                      dead,
-                      listeners);
-
-        if (dead === listeners) {
-          console.error('[PARENT] All workers have died.');
-          console.error('[PARENT] Fail');
-
-          killChildren(workers);
-
-          process.exit(1);
-        }
-      });
-
-      worker.on('message', function(msg) {
-        if (msg.listening) {
-          listening += 1;
-
-          if (listening === listeners) {
-            //all child process are listening, so start sending
-            sendSocket.sendNext();
-          }
-        }
-        else if (msg.message) {
-          worker.messagesReceived.push(msg.message);
-
-          if (worker.messagesReceived.length === messages.length) {
-            done += 1;
-            worker.isDone = true;
-            console.error('[PARENT] %d received %d messages total.',
-                          worker.pid,
-                          worker.messagesReceived.length);
-          }
-
-          if (done === listeners) {
-            console.error('[PARENT] All workers have received the ' +
-                          'required number of messages. Will now compare.');
-
-            Object.keys(workers).forEach(function(pid) {
-              var worker = workers[pid];
-
-              var count = 0;
-
-              worker.messagesReceived.forEach(function(buf) {
-                for (var i = 0; i < messages.length; ++i) {
-                  if (buf.toString() === messages[i].toString()) {
-                    count++;
-                    break;
-                  }
-                }
-              });
-
-              console.error('[PARENT] %d received %d matching messages.',
-                            worker.pid, count);
-
-              assert.equal(count, messages.length,
-                           'A worker received an invalid multicast message');
-            });
-
-            clearTimeout(timer);
-            console.error('[PARENT] Success');
-            killChildren(workers);
-          }
-        }
-      });
-    })(x);
+    launchChildProcess(x);
   }
 
   var sendSocket = dgram.createSocket('udp4');
-  // FIXME a libuv limitation makes it necessary to bind()
-  // before calling any of the set*() functions - the bind()
-  // call is what creates the actual socket...
+  // FIXME: a libuv limitation makes it necessary to bind()
+  // before calling any of the set*() functions. The bind()
+  // call is what creates the actual socket.
   sendSocket.bind();
 
-  // The socket is actually created async now
+  // The socket is actually created async now.
   sendSocket.on('listening', function() {
     sendSocket.setTTL(1);
     sendSocket.setBroadcast(true);
@@ -141,7 +150,7 @@ if (process.argv[2] !== 'child') {
   });
 
   sendSocket.sendNext = function() {
-    var buf = messages[i++];
+    const buf = messages[i++];
 
     if (!buf) {
       try { sendSocket.close(); } catch (e) {}
@@ -151,61 +160,51 @@ if (process.argv[2] !== 'child') {
     sendSocket.send(buf, 0, buf.length,
                     common.PORT, LOCAL_BROADCAST_HOST, function(err) {
           if (err) throw err;
-          console.error('[PARENT] sent %s to %s:%s',
-                        util.inspect(buf.toString()),
+          console.error('[PARENT] sent "%s" to %s:%s',
+                        buf.toString(),
                         LOCAL_BROADCAST_HOST, common.PORT);
           process.nextTick(sendSocket.sendNext);
         });
   };
-
-  function killChildren(children) {
-    Object.keys(children).forEach(function(key) {
-      var child = children[key];
-      child.kill();
-    });
-  }
 }
 
 if (process.argv[2] === 'child') {
-  var receivedMessages = [];
-  var listenSocket = dgram.createSocket({
+  const receivedMessages = [];
+  const listenSocket = dgram.createSocket({
     type: 'udp4',
     reuseAddr: true
   });
 
-  listenSocket.on('message', function(buf, rinfo) {
-    console.error('[CHILD] %s received %s from %j', process.pid,
-                  util.inspect(buf.toString()), rinfo);
+  listenSocket.on('listening', function() {
+    listenSocket.addMembership(LOCAL_BROADCAST_HOST);
 
-    receivedMessages.push(buf);
+    listenSocket.on('message', function(buf, rinfo) {
+      console.error('[CHILD] %s received "%s" from %j', process.pid,
+                    buf.toString(), rinfo);
 
-    process.send({ message: buf.toString() });
+      receivedMessages.push(buf);
 
-    if (receivedMessages.length == messages.length) {
-      // .dropMembership() not strictly needed but here as a sanity check
-      listenSocket.dropMembership(LOCAL_BROADCAST_HOST);
-      process.nextTick(function() {
-        listenSocket.close();
-      });
-    }
-  });
+      process.send({ message: buf.toString() });
 
-  listenSocket.on('close', function() {
-    //HACK: Wait to exit the process to ensure that the parent
-    //process has had time to receive all messages via process.send()
-    //This may be indicitave of some other issue.
-    setTimeout(function() {
-      process.exit();
-    }, 1000);
-  });
+      if (receivedMessages.length == messages.length) {
+        // .dropMembership() not strictly needed but here as a sanity check.
+        listenSocket.dropMembership(LOCAL_BROADCAST_HOST);
+        process.nextTick(function() {
+          listenSocket.close();
+        });
+      }
+    });
 
-  listenSocket.on('listening', function() {
+    listenSocket.on('close', function() {
+      // HACK: Wait to exit the process to ensure that the parent
+      // process has had time to receive all messages via process.send()
+      // This may be indicative of some other issue.
+      setTimeout(function() {
+        process.exit();
+      }, common.platformTimeout(1000));
+    });
     process.send({ listening: true });
   });
 
   listenSocket.bind(common.PORT);
-
-  listenSocket.on('listening', function() {
-    listenSocket.addMembership(LOCAL_BROADCAST_HOST);
-  });
 }

From 7793c364fc59a480c94387f8f42681d9e28f2658 Mon Sep 17 00:00:00 2001
From: Dave <dave@jut.io>
Date: Mon, 30 Nov 2015 02:41:51 -0800
Subject: [PATCH 279/323] child_process: flush consuming streams

When a client calls read() with a nonzero argument
on a Socket, that Socket sets this._consuming to true.
It never sets this._consuming back to false.
ChildProcess.flushStdio() currently doesn't flush
any streams where _consuming is truthy. But, that means
that it never flushes any stream that has ever been read from.
This prevents a child process from ever closing if one of
its streams has been read from, causing issue #4049. This
commit allows consuming streams to be flushed, and the
child process to emit a close event.

Fixes: https://github.com/nodejs/node/issues/4049
PR-URL: https://github.com/nodejs/node/pull/4071
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 lib/internal/child_process.js                   |  2 +-
 test/parallel/test-child-process-flush-stdio.js | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 test/parallel/test-child-process-flush-stdio.js

diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js
index e93e1ae2e62c79..04bd270b185974 100644
--- a/lib/internal/child_process.js
+++ b/lib/internal/child_process.js
@@ -217,7 +217,7 @@ util.inherits(ChildProcess, EventEmitter);
 function flushStdio(subprocess) {
   if (subprocess.stdio == null) return;
   subprocess.stdio.forEach(function(stream, fd, stdio) {
-    if (!stream || !stream.readable || stream._consuming)
+    if (!stream || !stream.readable)
       return;
     stream.resume();
   });
diff --git a/test/parallel/test-child-process-flush-stdio.js b/test/parallel/test-child-process-flush-stdio.js
new file mode 100644
index 00000000000000..5fd7eb3bc99922
--- /dev/null
+++ b/test/parallel/test-child-process-flush-stdio.js
@@ -0,0 +1,17 @@
+'use strict';
+const cp = require('child_process');
+const common = require('../common');
+const assert = require('assert');
+
+const p = cp.spawn('echo');
+
+p.on('close', common.mustCall(function(code, signal) {
+  assert.strictEqual(code, 0);
+  assert.strictEqual(signal, null);
+}));
+
+p.stdout.read();
+
+setTimeout(function() {
+  p.kill();
+}, 100);

From c61237d3ea28d89605784fb47262533d91a3995b Mon Sep 17 00:00:00 2001
From: Luigi Pinca <luigipinca@gmail.com>
Date: Tue, 1 Dec 2015 09:10:12 +0100
Subject: [PATCH 280/323] doc: fix internal link to child.send()

PR-URL: https://github.com/nodejs/node/pull/4089
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/child_process.markdown | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/api/child_process.markdown b/doc/api/child_process.markdown
index 5f1aea770dce76..708a87424824f9 100644
--- a/doc/api/child_process.markdown
+++ b/doc/api/child_process.markdown
@@ -461,7 +461,7 @@ leaner than [`child_process.exec()`][]. It has the same options.
 This is a special case of the [`child_process.spawn()`][] functionality for
 spawning Node.js processes. In addition to having all the methods in a normal
 ChildProcess instance, the returned object has a communication channel built-in.
-See [`child.send(message, [sendHandle])`][] for details.
+See [`ChildProcess#send()`][] for details.
 
 These child Node.js processes are still whole new instances of V8. Assume at
 least 30ms startup and 10mb memory for each new Node.js. That is, you cannot
@@ -779,5 +779,4 @@ process has exited.
 [spawn]: #child_process_child_process_spawn_command_args_options
 [`child_process.exec()`]: #child_process_child_process_exec_command_options_callback
 [`child_process.spawn()`]: #child_process_child_process_spawn_command_args_options
-[`child.send(message, [sendHandle])`]: #child_process_child_send_message_sendhandle_callback
 [`child_process.spawnSync()`]: #child_process_child_process_spawnsync_command_args_options

From 430264817bc0646405a35b8504454b2232477c54 Mon Sep 17 00:00:00 2001
From: Bryan English <bryan@bryanenglish.com>
Date: Wed, 18 Nov 2015 17:42:05 -0800
Subject: [PATCH 281/323] test: add test for repl.defineCommand()

It also tests displayPrompt by checking for '> '.

PR-URL: https://github.com/nodejs/node/pull/3908
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 test/parallel/test-repl-definecommand.js | 43 ++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 test/parallel/test-repl-definecommand.js

diff --git a/test/parallel/test-repl-definecommand.js b/test/parallel/test-repl-definecommand.js
new file mode 100644
index 00000000000000..a28689a55d1b1e
--- /dev/null
+++ b/test/parallel/test-repl-definecommand.js
@@ -0,0 +1,43 @@
+'use strict';
+
+require('../common');
+
+const stream = require('stream'),
+      assert = require('assert'),
+      repl = require('repl');
+
+var output = '';
+const inputStream = new stream.PassThrough();
+const outputStream = new stream.PassThrough();
+outputStream.on('data', function(d) {
+  output += d;
+});
+
+const r = repl.start({
+  input: inputStream,
+  output: outputStream,
+  terminal: true
+});
+
+r.defineCommand('say1', {
+  help: 'help for say1',
+  action: function(thing) {
+    output = '';
+    this.write('hello ' + thing);
+    this.displayPrompt();
+  }
+});
+
+r.defineCommand('say2', function() {
+  output = '';
+  this.write('hello from say2');
+  this.displayPrompt();
+});
+
+inputStream.write('.help\n');
+assert(/\nsay1\thelp for say1\n/.test(output), 'help for say1 not present');
+assert(/\nsay2\t\n/.test(output), 'help for say2 not present');
+inputStream.write('.say1 node developer\n');
+assert(/> hello node developer/.test(output), 'say1 outputted incorrectly');
+inputStream.write('.say2 node developer\n');
+assert(/> hello from say2/.test(output), 'say2 outputted incorrectly');

From 0e18e683248fb5261d4297ee87757f40076c7829 Mon Sep 17 00:00:00 2001
From: "Peter A. Bigot" <pab@pabigot.com>
Date: Mon, 23 Nov 2015 16:12:46 -0600
Subject: [PATCH 282/323] buffer: fix writeInt{B,L}E for some neg values

The algorithm used to convert negative values to hex generates incorrect
values when the low byte(s) of the value are zero because a carried
subtraction is applied prematurely.

Fixes: https://github.com/nodejs/node/issues/3992
PR-URL: https://github.com/nodejs/node/pull/3994
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
 lib/buffer.js                | 14 ++++++++++----
 test/parallel/test-buffer.js | 30 ++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/lib/buffer.js b/lib/buffer.js
index dff740e1b2b363..f37bdcc60ed300 100644
--- a/lib/buffer.js
+++ b/lib/buffer.js
@@ -939,10 +939,13 @@ Buffer.prototype.writeIntLE = function(value, offset, byteLength, noAssert) {
 
   var i = 0;
   var mul = 1;
-  var sub = value < 0 ? 1 : 0;
+  var sub = 0;
   this[offset] = value;
-  while (++i < byteLength && (mul *= 0x100))
+  while (++i < byteLength && (mul *= 0x100)) {
+    if (value < 0 && sub === 0 && this[offset + i - 1] !== 0)
+      sub = 1;
     this[offset + i] = ((value / mul) >> 0) - sub;
+  }
 
   return offset + byteLength;
 };
@@ -962,10 +965,13 @@ Buffer.prototype.writeIntBE = function(value, offset, byteLength, noAssert) {
 
   var i = byteLength - 1;
   var mul = 1;
-  var sub = value < 0 ? 1 : 0;
+  var sub = 0;
   this[offset + i] = value;
-  while (--i >= 0 && (mul *= 0x100))
+  while (--i >= 0 && (mul *= 0x100)) {
+    if (value < 0 && sub === 0 && this[offset + i + 1] !== 0)
+      sub = 1;
     this[offset + i] = ((value / mul) >> 0) - sub;
+  }
 
   return offset + byteLength;
 };
diff --git a/test/parallel/test-buffer.js b/test/parallel/test-buffer.js
index 37c9e6431e9c86..6222e1aa39b9a5 100644
--- a/test/parallel/test-buffer.js
+++ b/test/parallel/test-buffer.js
@@ -1027,6 +1027,26 @@ assert.equal(buf.readInt8(0), -1);
   assert.deepEqual(buf.toJSON().data, [0xed, 0xcb, 0xaa]);
   assert.equal(buf.readIntBE(0, 3), -0x123456);
 
+  buf = new Buffer(3);
+  buf.writeIntLE(-0x123400, 0, 3);
+  assert.deepEqual(buf.toJSON().data, [0x00, 0xcc, 0xed]);
+  assert.equal(buf.readIntLE(0, 3), -0x123400);
+
+  buf = new Buffer(3);
+  buf.writeIntBE(-0x123400, 0, 3);
+  assert.deepEqual(buf.toJSON().data, [0xed, 0xcc, 0x00]);
+  assert.equal(buf.readIntBE(0, 3), -0x123400);
+
+  buf = new Buffer(3);
+  buf.writeIntLE(-0x120000, 0, 3);
+  assert.deepEqual(buf.toJSON().data, [0x00, 0x00, 0xee]);
+  assert.equal(buf.readIntLE(0, 3), -0x120000);
+
+  buf = new Buffer(3);
+  buf.writeIntBE(-0x120000, 0, 3);
+  assert.deepEqual(buf.toJSON().data, [0xee, 0x00, 0x00]);
+  assert.equal(buf.readIntBE(0, 3), -0x120000);
+
   buf = new Buffer(5);
   buf.writeUIntLE(0x1234567890, 0, 5);
   assert.deepEqual(buf.toJSON().data, [0x90, 0x78, 0x56, 0x34, 0x12]);
@@ -1056,6 +1076,16 @@ assert.equal(buf.readInt8(0), -1);
   buf.writeIntBE(-0x1234567890, 0, 5);
   assert.deepEqual(buf.toJSON().data, [0xed, 0xcb, 0xa9, 0x87, 0x70]);
   assert.equal(buf.readIntBE(0, 5), -0x1234567890);
+
+  buf = new Buffer(5);
+  buf.writeIntLE(-0x0012000000, 0, 5);
+  assert.deepEqual(buf.toJSON().data, [0x00, 0x00, 0x00, 0xee, 0xff]);
+  assert.equal(buf.readIntLE(0, 5), -0x0012000000);
+
+  buf = new Buffer(5);
+  buf.writeIntBE(-0x0012000000, 0, 5);
+  assert.deepEqual(buf.toJSON().data, [0xff, 0xee, 0x00, 0x00, 0x00]);
+  assert.equal(buf.readIntBE(0, 5), -0x0012000000);
 })();
 
 // test Buffer slice

From 2b5b127e1408eac260ac5a9e3d5a84107d0ba670 Mon Sep 17 00:00:00 2001
From: Santiago Gimeno <santiago.gimeno@gmail.com>
Date: Tue, 24 Nov 2015 21:39:24 +0100
Subject: [PATCH 283/323] test: fix cluster-disconnect-handles flakiness

Sometimes the test was timing out because the worker process remained
stuck in the breakpoint and didn't exit. This could happen because the
continue was sent before the breakpoint was set. If that's the case,
with this change, a new continue command is sent so the worker process
can end.

PR-URL: https://github.com/nodejs/node/pull/4009
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 test/parallel/test-cluster-disconnect-handles.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/test/parallel/test-cluster-disconnect-handles.js b/test/parallel/test-cluster-disconnect-handles.js
index 5fa98844537eb8..a6a79ef6a2ae45 100644
--- a/test/parallel/test-cluster-disconnect-handles.js
+++ b/test/parallel/test-cluster-disconnect-handles.js
@@ -33,6 +33,7 @@ if (cluster.isMaster) {
   worker.on('message', common.mustCall(message => {
     assert.strictEqual(Array.isArray(message), true);
     assert.strictEqual(message[0], 'listening');
+    let continueRecv = false;
     const address = message[1];
     const host = address.address;
     const debugClient = net.connect({ host, port: common.PORT });
@@ -41,13 +42,25 @@ if (cluster.isMaster) {
     debugClient.on('data', data => protocol.execute(data));
     debugClient.once('connect', common.mustCall(() => {
       protocol.onResponse = common.mustCall(res => {
-        protocol.onResponse = () => {};
+        protocol.onResponse = (res) => {
+          // It can happen that the first continue was sent before the break
+          // event was received. If that's the case, send also a continue from
+          // here so the worker exits
+          if (res.body.command === 'continue') {
+            continueRecv = true;
+          } else if (res.body.event === 'break' && continueRecv) {
+            const req = protocol.serialize({ command: 'continue' });
+            debugClient.write(req);
+          }
+        };
         const conn = net.connect({ host, port: address.port });
         conn.once('connect', common.mustCall(() => {
           conn.destroy();
           assert.notDeepStrictEqual(handles, {});
           worker.disconnect();
           assert.deepStrictEqual(handles, {});
+          // Always send the continue, as the break event might have already
+          // been received.
           const req = protocol.serialize({ command: 'continue' });
           debugClient.write(req);
         }));

From 0869ef3c55b5c94a1586802869096e9e65aada68 Mon Sep 17 00:00:00 2001
From: Zirak <zirakertan@gmail.com>
Date: Sun, 15 Nov 2015 14:46:17 +0000
Subject: [PATCH 284/323] repl: allow leading period in multiline input

When writing multiline input, one can't chain function calls as if the
lines begin with a period, since those are treated as REPL commands.

Before:

    > ([0, 1, 2]
    ... .map(x => x + 1))
    Invalid REPL keyword

After:

    > ([0, 1, 2]
    ... .map(x => x + 1))
    [ 1, 2, 3 ]

PR-URL: https://github.com/nodejs/node/pull/3835
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 lib/repl.js                | 2 +-
 test/parallel/test-repl.js | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/repl.js b/lib/repl.js
index d0849c325991cf..be9d6fa72c39e3 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -391,7 +391,7 @@ function REPLServer(prompt,
       var rest = matches && matches[2];
       if (self.parseREPLKeyword(keyword, rest) === true) {
         return;
-      } else {
+      } else if (!self.bufferedCommand) {
         self.outputStream.write('Invalid REPL keyword\n');
         skipCatchall = true;
       }
diff --git a/test/parallel/test-repl.js b/test/parallel/test-repl.js
index 03792789e87f69..cda4e9886f0daf 100644
--- a/test/parallel/test-repl.js
+++ b/test/parallel/test-repl.js
@@ -117,6 +117,11 @@ function error_test() {
       expect: prompt_multiline },
     { client: client_unix, send: '+ ".2"}`',
       expect: `'io.js 1.0.2'\n${prompt_unix}` },
+    // Dot prefix in multiline commands aren't treated as commands
+    { client: client_unix, send: '("a"',
+      expect: prompt_multiline },
+    { client: client_unix, send: '.charAt(0))',
+      expect: `'a'\n${prompt_unix}` },
     // Floating point numbers are not interpreted as REPL commands.
     { client: client_unix, send: '.1234',
       expect: '0.1234' },

From 95dd60c6579413bb956b266b7e285ee6e6c8e158 Mon Sep 17 00:00:00 2001
From: Jan Krems <jan.krems@groupon.com>
Date: Mon, 30 Nov 2015 10:40:02 -0800
Subject: [PATCH 285/323] doc: reword https.Agent example text

PR-URL: https://github.com/nodejs/node/pull/4075
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 doc/api/https.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/https.markdown b/doc/api/https.markdown
index b2e917b72a8709..8a916311fc664f 100644
--- a/doc/api/https.markdown
+++ b/doc/api/https.markdown
@@ -195,7 +195,7 @@ Example:
       ...
     }
 
-Or does not use an `Agent`.
+Alternatively, opt out of connection pooling by not using an `Agent`.
 
 Example:
 

From 1279adc75616a6402e37df8d10071148eb3ee1b6 Mon Sep 17 00:00:00 2001
From: Andrei Sedoi <bsnote@gmail.com>
Date: Thu, 26 Nov 2015 15:55:05 +0000
Subject: [PATCH 286/323] timers: optimize callback call: bind -> arrow

ES6 arrow functions are much more efficient than `.bind()` functions.

PR-URL: https://github.com/nodejs/node/pull/4038
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 lib/timers.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/timers.js b/lib/timers.js
index b75b7ccfc0a85d..543a1bf601c7ea 100644
--- a/lib/timers.js
+++ b/lib/timers.js
@@ -192,21 +192,21 @@ exports.setTimeout = function(callback, after) {
     case 2:
       break;
     case 3:
-      ontimeout = callback.bind(timer, arguments[2]);
+      ontimeout = () => callback.call(timer, arguments[2]);
       break;
     case 4:
-      ontimeout = callback.bind(timer, arguments[2], arguments[3]);
+      ontimeout = () => callback.call(timer, arguments[2], arguments[3]);
       break;
     case 5:
       ontimeout =
-          callback.bind(timer, arguments[2], arguments[3], arguments[4]);
+        () => callback.call(timer, arguments[2], arguments[3], arguments[4]);
       break;
     // slow case
     default:
       var args = new Array(length - 2);
       for (var i = 2; i < length; i++)
         args[i - 2] = arguments[i];
-      ontimeout = callback.apply.bind(callback, timer, args);
+      ontimeout = () => callback.apply(timer, args);
       break;
   }
   timer._onTimeout = ontimeout;
@@ -247,20 +247,20 @@ exports.setInterval = function(callback, repeat) {
     case 2:
       break;
     case 3:
-      ontimeout = callback.bind(timer, arguments[2]);
+      ontimeout = () => callback.call(timer, arguments[2]);
       break;
     case 4:
-      ontimeout = callback.bind(timer, arguments[2], arguments[3]);
+      ontimeout = () => callback.call(timer, arguments[2], arguments[3]);
       break;
     case 5:
       ontimeout =
-          callback.bind(timer, arguments[2], arguments[3], arguments[4]);
+        () => callback.call(timer, arguments[2], arguments[3], arguments[4]);
       break;
     default:
       var args = new Array(length - 2);
       for (var i = 2; i < length; i += 1)
         args[i - 2] = arguments[i];
-      ontimeout = callback.apply.bind(callback, timer, args);
+      ontimeout = () => callback.apply(timer, args);
       break;
   }
   timer._onTimeout = wrapper;
@@ -272,7 +272,7 @@ exports.setInterval = function(callback, repeat) {
   return timer;
 
   function wrapper() {
-    timer._repeat.call(this);
+    timer._repeat();
 
     // Timer might be closed - no point in restarting it
     if (!timer._repeat)

From 1b434e0654d8e92f5caead12639b6e0cdb93302f Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Tue, 1 Dec 2015 11:27:39 -0500
Subject: [PATCH 287/323] util: determine object types in C++
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Determine object types of regular expressions, Dates, Maps, and
Sets in the C++ layer instead of depending on toString()
behavior in JavaScript.

PR-URL: https://github.com/nodejs/node/pull/4100
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 lib/util.js      |  9 ++++-----
 src/node_util.cc | 29 +++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/lib/util.js b/lib/util.js
index c07edfe87d6405..aa75950c217f74 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -6,7 +6,6 @@ const internalUtil = require('internal/util');
 const binding = process.binding('util');
 
 const isError = internalUtil.isError;
-const objectToString = internalUtil.objectToString;
 
 var Debug;
 
@@ -305,7 +304,7 @@ function formatValue(ctx, value, recurseTimes) {
     braces = ['[', ']'];
     empty = value.length === 0;
     formatter = formatArray;
-  } else if (objectToString(value) === '[object Set]') {
+  } else if (binding.isSet(value)) {
     braces = ['{', '}'];
     // With `showHidden`, `length` will display as a hidden property for
     // arrays. For consistency's sake, do the same for `size`, even though this
@@ -314,7 +313,7 @@ function formatValue(ctx, value, recurseTimes) {
       keys.unshift('size');
     empty = value.size === 0;
     formatter = formatSet;
-  } else if (objectToString(value) === '[object Map]') {
+  } else if (binding.isMap(value)) {
     braces = ['{', '}'];
     // Ditto.
     if (ctx.showHidden)
@@ -673,7 +672,7 @@ function isUndefined(arg) {
 exports.isUndefined = isUndefined;
 
 function isRegExp(re) {
-  return objectToString(re) === '[object RegExp]';
+  return binding.isRegExp(re);
 }
 exports.isRegExp = isRegExp;
 
@@ -683,7 +682,7 @@ function isObject(arg) {
 exports.isObject = isObject;
 
 function isDate(d) {
-  return objectToString(d) === '[object Date]';
+  return binding.isDate(d);
 }
 exports.isDate = isDate;
 
diff --git a/src/node_util.cc b/src/node_util.cc
index a520b8d5f354ac..ea800ff339a36f 100644
--- a/src/node_util.cc
+++ b/src/node_util.cc
@@ -13,12 +13,37 @@ using v8::Object;
 using v8::String;
 using v8::Value;
 
+
+static void IsRegExp(const FunctionCallbackInfo<Value>& args) {
+  CHECK_EQ(1, args.Length());
+  args.GetReturnValue().Set(args[0]->IsRegExp());
+}
+
+
+static void IsDate(const FunctionCallbackInfo<Value>& args) {
+  CHECK_EQ(1, args.Length());
+  args.GetReturnValue().Set(args[0]->IsDate());
+}
+
+
+static void IsMap(const FunctionCallbackInfo<Value>& args) {
+  CHECK_EQ(1, args.Length());
+  args.GetReturnValue().Set(args[0]->IsMap());
+}
+
+
 static void IsMapIterator(const FunctionCallbackInfo<Value>& args) {
   CHECK_EQ(1, args.Length());
   args.GetReturnValue().Set(args[0]->IsMapIterator());
 }
 
 
+static void IsSet(const FunctionCallbackInfo<Value>& args) {
+  CHECK_EQ(1, args.Length());
+  args.GetReturnValue().Set(args[0]->IsSet());
+}
+
+
 static void IsSetIterator(const FunctionCallbackInfo<Value>& args) {
   CHECK_EQ(1, args.Length());
   args.GetReturnValue().Set(args[0]->IsSetIterator());
@@ -50,7 +75,11 @@ void Initialize(Local<Object> target,
                 Local<Value> unused,
                 Local<Context> context) {
   Environment* env = Environment::GetCurrent(context);
+  env->SetMethod(target, "isRegExp", IsRegExp);
+  env->SetMethod(target, "isDate", IsDate);
+  env->SetMethod(target, "isMap", IsMap);
   env->SetMethod(target, "isMapIterator", IsMapIterator);
+  env->SetMethod(target, "isSet", IsSet);
   env->SetMethod(target, "isSetIterator", IsSetIterator);
   env->SetMethod(target, "isPromise", IsPromise);
   env->SetMethod(target, "getHiddenValue", GetHiddenValue);

From cb55c67a0032e0ec9df51dc8d8c425514586de92 Mon Sep 17 00:00:00 2001
From: Brian White <mscdex@mscdex.net>
Date: Mon, 30 Nov 2015 23:56:35 -0500
Subject: [PATCH 288/323] test: improve cluster-disconnect-handles test

This commit fixes two issues in test-cluster-disconnect-handles:

1. If the master's TCP connection to the worker fails, the worker
process stays alive and causes many other tests that use the same
common port number to also fail (with EADDRINUSE).

2. One particular problem that can cause the master's TCP connection
to fail is attempting an IPv6 connection to the worker when no IPv6
network interfaces are available.

PR-URL: https://github.com/nodejs/node/pull/4084
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 .../test-cluster-disconnect-handles.js        | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/test/parallel/test-cluster-disconnect-handles.js b/test/parallel/test-cluster-disconnect-handles.js
index a6a79ef6a2ae45..f35f101dbd1879 100644
--- a/test/parallel/test-cluster-disconnect-handles.js
+++ b/test/parallel/test-cluster-disconnect-handles.js
@@ -23,6 +23,7 @@ cluster.schedulingPolicy = cluster.SCHED_RR;
 // is to make sure the connection is still sitting in the master's
 // pending handle queue.
 if (cluster.isMaster) {
+  let isKilling = false;
   const handles = require('internal/cluster').handles;
   // FIXME(bnoordhuis) lib/cluster.js scans the execArgv arguments for
   // debugger flags and renumbers any port numbers it sees starting
@@ -68,11 +69,30 @@ if (cluster.isMaster) {
     }));
   }));
   process.on('exit', () => assert.deepStrictEqual(handles, {}));
+  process.on('uncaughtException', function(ex) {
+    // Make sure we clean up so as not to leave a stray worker process running
+    // if we encounter a connection or other error
+    if (!worker.isDead()) {
+      if (!isKilling) {
+        isKilling = true;
+        worker.once('exit', function() {
+          throw ex;
+        });
+        worker.process.kill();
+      }
+      return;
+    }
+    throw ex;
+  });
 } else {
   const server = net.createServer(socket => socket.pipe(socket));
-  server.listen(() => {
+  const cb = () => {
     process.send(['listening', server.address()]);
     debugger;
-  });
+  };
+  if (common.hasIPv6)
+    server.listen(cb);
+  else
+    server.listen(0, common.localhostIPv4, cb);
   process.on('disconnect', process.exit);
 }

From 1c1af81ea0e16c2008b5e7f99750de297067ec21 Mon Sep 17 00:00:00 2001
From: Brian White <mscdex@mscdex.net>
Date: Thu, 19 Mar 2015 22:04:07 -0400
Subject: [PATCH 289/323] streams: update .readable/.writable to false

These properties were initially used to determine stream status
back in node v0.8 and earlier. Since streams2 however, these
properties were *always* true, which can be misleading for
example if you are trying to immediately determine whether
a Writable stream is still writable or not (to avoid a "write after
end" exception).

PR-URL: https://github.com/nodejs/node/pull/4083
Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com>
---
 lib/_stream_readable.js                     |  3 ++-
 lib/_stream_writable.js                     |  1 +
 test/parallel/test-stream2-compatibility.js | 22 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index ab47830767c525..99be380196591f 100644
--- a/lib/_stream_readable.js
+++ b/lib/_stream_readable.js
@@ -385,6 +385,7 @@ function onEofChunk(stream, state) {
     }
   }
   state.ended = true;
+  stream.readable = false;
 
   // emit 'readable' now to make sure it gets picked up.
   emitReadable(stream);
@@ -670,7 +671,7 @@ Readable.prototype.on = function(ev, fn) {
     this.resume();
   }
 
-  if (ev === 'readable' && this.readable) {
+  if (ev === 'readable' && !this._readableState.endEmitted) {
     var state = this._readableState;
     if (!state.readableListening) {
       state.readableListening = true;
diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js
index 9c7e2630161cd9..9cfd42db7676ca 100644
--- a/lib/_stream_writable.js
+++ b/lib/_stream_writable.js
@@ -483,4 +483,5 @@ function endWritable(stream, state, cb) {
       stream.once('finish', cb);
   }
   state.ended = true;
+  stream.writable = false;
 }
diff --git a/test/parallel/test-stream2-compatibility.js b/test/parallel/test-stream2-compatibility.js
index 9eab7b713bf167..cbb65facfa7073 100644
--- a/test/parallel/test-stream2-compatibility.js
+++ b/test/parallel/test-stream2-compatibility.js
@@ -1,6 +1,7 @@
 'use strict';
 var common = require('../common');
 var R = require('_stream_readable');
+var W = require('_stream_writable');
 var assert = require('assert');
 
 var util = require('util');
@@ -29,4 +30,25 @@ var reader = new TestReader();
 setImmediate(function() {
   assert.equal(ondataCalled, 1);
   console.log('ok');
+  reader.push(null);
+});
+
+function TestWriter() {
+  W.apply(this);
+  this.write('foo');
+  this.end();
+}
+
+util.inherits(TestWriter, W);
+
+TestWriter.prototype._write = function(chunk, enc, cb) {
+  cb();
+};
+
+var writer = new TestWriter();
+
+process.on('exit', function() {
+  assert.strictEqual(reader.readable, false);
+  assert.strictEqual(writer.writable, false);
+  console.log('ok');
 });

From e8e4e0718b013f1242d512886f3f8193ebbc1704 Mon Sep 17 00:00:00 2001
From: Myles Borins <mborins@us.ibm.com>
Date: Wed, 2 Dec 2015 10:47:45 -0800
Subject: [PATCH 290/323] meta: remove use of profanity in source
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The CoC requests to avoid the casual use of profanity.

PR-URL: https://github.com/nodejs/node/pull/4122
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: targos - Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: Brian White <mscdex@mscdex.net>
---
 benchmark/http_simple_bench.sh | 2 +-
 lib/dns.js                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/benchmark/http_simple_bench.sh b/benchmark/http_simple_bench.sh
index 30bd050b6486b8..ade6a8d10eb0ff 100755
--- a/benchmark/http_simple_bench.sh
+++ b/benchmark/http_simple_bench.sh
@@ -42,7 +42,7 @@ ab_hello_world() {
   data_fn="$dir/$date.data"
 
   echo "Bench $name starts in 3 seconds..."
-  # let shit calm down
+  # let things calm down
   sleep 3
 
   # hammer that as hard as it can for 10 seconds.
diff --git a/lib/dns.js b/lib/dns.js
index 8bd61caee96066..782cdfa3f79df4 100644
--- a/lib/dns.js
+++ b/lib/dns.js
@@ -14,7 +14,7 @@ const isIp = net.isIP;
 
 
 function errnoException(err, syscall, hostname) {
-  // FIXME(bnoordhuis) Remove this backwards compatibility shite and pass
+  // FIXME(bnoordhuis) Remove this backwards compatibility nonsense and pass
   // the true error to the user. ENOTFOUND is not even a proper POSIX error!
   if (err === uv.UV_EAI_MEMORY ||
       err === uv.UV_EAI_NODATA ||

From cfc97641eed586685bd689fcf65c2944c7f0db51 Mon Sep 17 00:00:00 2001
From: Stefan Budeanu <stefan@budeanu.com>
Date: Tue, 24 Nov 2015 19:17:49 -0500
Subject: [PATCH 291/323] crypto: fix native module compilation with FIPS

Prevent OpenSSL's fipsld from being used to link native modules
because this requires the original OpenSSL source to be
available after Node's installation.

Fixes: https://github.com/nodejs/node/issues/3815
PR-URL: https://github.com/nodejs/node/pull/4023
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
---
 .gitignore        |  1 +
 Makefile          |  2 +-
 configure         | 11 ++++++++++-
 tools/gyp_node.py |  5 +++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2e6f583bf732b4..931bf8c024dc3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@ ipch/
 
 /config.mk
 /config.gypi
+/config_fips.gypi
 *-nodegyp*
 /gyp-mac-tool
 /dist-osx
diff --git a/Makefile b/Makefile
index 02619fac98ddd7..a99b112508c448 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ clean:
 
 distclean:
 	-rm -rf out
-	-rm -f config.gypi icu_config.gypi
+	-rm -f config.gypi icu_config.gypi config_fips.gypi
 	-rm -f config.mk
 	-rm -rf $(NODE_EXE) $(NODE_G_EXE)
 	-rm -rf node_modules
diff --git a/configure b/configure
index 51673e3fa96a0e..45d401b7485ad8 100755
--- a/configure
+++ b/configure
@@ -804,7 +804,7 @@ def configure_openssl(o):
     o['variables']['openssl_fips'] = options.openssl_fips
     fips_dir = os.path.join(root_dir, 'deps', 'openssl', 'fips')
     fips_ld = os.path.abspath(os.path.join(fips_dir, 'fipsld'))
-    o['make_global_settings'] = [
+    o['make_fips_settings'] = [
       ['LINK', fips_ld + ' <(openssl_fips)/bin/fipsld'],
     ]
   else:
@@ -1126,6 +1126,15 @@ configure_fullystatic(output)
 variables = output['variables']
 del output['variables']
 
+# make_global_settings for special FIPS linking
+# should not be used to compile modules in node-gyp
+config_fips = { 'make_global_settings' : [] }
+if 'make_fips_settings' in output:
+  config_fips['make_global_settings'] = output['make_fips_settings']
+  del output['make_fips_settings']
+  write('config_fips.gypi', do_not_edit +
+        pprint.pformat(config_fips, indent=2) + '\n')
+
 # make_global_settings should be a root level element too
 if 'make_global_settings' in output:
   make_global_settings = output['make_global_settings']
diff --git a/tools/gyp_node.py b/tools/gyp_node.py
index 7b495055c180c8..064abe30aa209c 100755
--- a/tools/gyp_node.py
+++ b/tools/gyp_node.py
@@ -30,10 +30,12 @@ def run_gyp(args):
     args.append(os.path.join(node_root, 'node.gyp'))
     common_fn  = os.path.join(node_root, 'common.gypi')
     options_fn = os.path.join(node_root, 'config.gypi')
+    options_fips_fn = os.path.join(node_root, 'config_fips.gypi')
   else:
     args.append(os.path.join(os.path.abspath(node_root), 'node.gyp'))
     common_fn  = os.path.join(os.path.abspath(node_root), 'common.gypi')
     options_fn = os.path.join(os.path.abspath(node_root), 'config.gypi')
+    options_fips_fn = os.path.join(os.path.abspath(node_root), 'config_fips.gypi')
 
   if os.path.exists(common_fn):
     args.extend(['-I', common_fn])
@@ -41,6 +43,9 @@ def run_gyp(args):
   if os.path.exists(options_fn):
     args.extend(['-I', options_fn])
 
+  if os.path.exists(options_fips_fn):
+    args.extend(['-I', options_fips_fn])
+
   args.append('--depth=' + node_root)
 
   # There's a bug with windows which doesn't allow this feature.

From f3417e2574e5cfd7d6f4912a61cb489ae3a8e765 Mon Sep 17 00:00:00 2001
From: Scott Buchanan <sbuchanan@ebay.com>
Date: Thu, 3 Dec 2015 14:11:22 -0500
Subject: [PATCH 292/323] doc: standardize references to node.js in docs

trivial commit to fix a couple inconsistent references to
the name of the project

PR-URL: https://github.com/nodejs/node/pull/4136
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Roman Klauke <romaaan.git@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
---
 doc/api/documentation.markdown | 2 +-
 doc/api/process.markdown       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/api/documentation.markdown b/doc/api/documentation.markdown
index 269b844ef36aaa..dc09e4689491d2 100644
--- a/doc/api/documentation.markdown
+++ b/doc/api/documentation.markdown
@@ -65,4 +65,4 @@ Please do not suggest API changes in this area; they will be refused.
 Every HTML file in the markdown has a corresponding JSON file with the
 same data.
 
-This feature was added in node v0.6.12.  It is experimental.
+This feature was added in Node.js v0.6.12.  It is experimental.
diff --git a/doc/api/process.markdown b/doc/api/process.markdown
index 327b16c82b4223..7e70a79151083e 100644
--- a/doc/api/process.markdown
+++ b/doc/api/process.markdown
@@ -24,7 +24,7 @@ finished running the process will exit. Therefore you **must** only perform
 checks on the module's state (like for unit tests). The callback takes one
 argument, the code the process is exiting with.
 
-This event is only emitted when node exits explicitly by process.exit() or
+This event is only emitted when Node.js exits explicitly by process.exit() or
 implicitly by the event loop draining.
 
 Example of listening for `exit`:

From 4b43bf0385815e7518c156c2d7ee18b83b4683c2 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Tue, 1 Dec 2015 13:13:40 -0800
Subject: [PATCH 293/323] test: fix flaky test-net-socket-local-address
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

test-net-socket-local-address had a race condition that resulted in
unreliability on FreeBSD and Windows. This changes fixes the issue.

Fixes: https://github.com/nodejs/node/issues/2475
PR-URL: https://github.com/nodejs/node/pull/4109
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
---
 test/parallel/parallel.status                  |  1 -
 test/parallel/test-net-socket-local-address.js | 10 ++++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index bce36b53bbe5d2..b30ec2a7dc019f 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -21,4 +21,3 @@ test-child-process-exit-code         : PASS,FLAKY
 [$system==solaris] # Also applies to SmartOS
 
 [$system==freebsd]
-test-net-socket-local-address     : PASS,FLAKY
diff --git a/test/parallel/test-net-socket-local-address.js b/test/parallel/test-net-socket-local-address.js
index 502c2d226d54b8..7e90bd2f79ba47 100644
--- a/test/parallel/test-net-socket-local-address.js
+++ b/test/parallel/test-net-socket-local-address.js
@@ -15,7 +15,7 @@ var serverRemotePorts = [];
 
 const server = net.createServer(function(socket) {
   serverRemotePorts.push(socket.remotePort);
-  conns++;
+  testConnect();
 });
 
 const client = new net.Socket();
@@ -29,7 +29,12 @@ server.on('close', common.mustCall(function() {
 server.listen(common.PORT, common.localhostIPv4, testConnect);
 
 function testConnect() {
-  if (conns == 2) {
+  if (conns > serverRemotePorts.length || conns > clientLocalPorts.length) {
+    // We're waiting for a callback to fire.
+    return;
+  }
+
+  if (conns === 2) {
     return server.close();
   }
   client.connect(common.PORT, common.localhostIPv4, function() {
@@ -37,4 +42,5 @@ function testConnect() {
     this.once('close', testConnect);
     this.destroy();
   });
+  conns++;
 }

From 3169eed1e35317e5d72f9b78bdcc14055dafb559 Mon Sep 17 00:00:00 2001
From: jpersson <jonathan.persson@creuna.se>
Date: Fri, 27 Nov 2015 18:30:32 -0500
Subject: [PATCH 294/323] doc: add links and backticks around names

* add backticks around names
* add single quotes around event names
* add parenthesis after function names
* add internal links between different sections
* add external links to MDN for some JavaScript references
* sort the link definitions alphabetically

PR-URL: https://github.com/nodejs/node/pull/4054
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
---
 doc/api/assert.markdown         |  21 ++--
 doc/api/buffer.markdown         |  25 ++--
 doc/api/child_process.markdown  |  68 ++++++-----
 doc/api/cluster.markdown        |  41 +++----
 doc/api/console.markdown        |  27 +++--
 doc/api/crypto.markdown         |  59 +++++-----
 doc/api/dgram.markdown          |  56 +++++----
 doc/api/dns.markdown            |  34 +++---
 doc/api/domain.markdown         |  52 +++++----
 doc/api/errors.markdown         |  82 ++++++-------
 doc/api/fs.markdown             | 117 +++++++++++--------
 doc/api/globals.markdown        |  16 +--
 doc/api/http.markdown           | 200 ++++++++++++++++----------------
 doc/api/https.markdown          |  66 ++++++-----
 doc/api/modules.markdown        |   5 +-
 doc/api/net.markdown            | 138 ++++++++++++----------
 doc/api/process.markdown        |  82 ++++++-------
 doc/api/readline.markdown       |  34 +++---
 doc/api/repl.markdown           |  16 +--
 doc/api/stream.markdown         | 142 +++++++++++------------
 doc/api/string_decoder.markdown |   2 +-
 doc/api/synopsis.markdown       |   2 +-
 doc/api/timers.markdown         |   7 +-
 doc/api/tls.markdown            |  28 ++---
 doc/api/tty.markdown            |   4 +-
 doc/api/util.markdown           |   6 +-
 doc/api/vm.markdown             |   7 +-
 27 files changed, 712 insertions(+), 625 deletions(-)

diff --git a/doc/api/assert.markdown b/doc/api/assert.markdown
index 6ea4071b79cc14..c35fc1ad0832a0 100644
--- a/doc/api/assert.markdown
+++ b/doc/api/assert.markdown
@@ -19,7 +19,7 @@ comparison operator ( `==` ).
 This only considers enumerable properties. It does not test object prototypes,
 attached symbols, or non-enumerable properties. This can lead to some
 potentially surprising results. For example, this does not throw an
-`AssertionError` because the properties on the `Error` object are
+`AssertionError` because the properties on the [`Error`][] object are
 non-enumerable:
 
     // WARNING: This does not throw an AssertionError!
@@ -32,11 +32,11 @@ operator ( `===` ).
 
 ## assert.doesNotThrow(block[, error][, message])
 
-Expects `block` not to throw an error. See [assert.throws()][] for more details.
+Expects `block` not to throw an error. See [`assert.throws()`][] for more details.
 
 If `block` throws an error and if it is of a different type from `error`, the
 thrown error will get propagated back to the caller. The following call will
-throw the `TypeError`, since we're not matching the error types in the
+throw the [`TypeError`][], since we're not matching the error types in the
 assertion.
 
     assert.doesNotThrow(
@@ -72,11 +72,11 @@ argument in callbacks.
 
 ## assert.notDeepEqual(actual, expected[, message])
 
-Tests for any deep inequality. Opposite of `assert.deepEqual`.
+Tests for any deep inequality. Opposite of [`assert.deepEqual`][].
 
 ## assert.notDeepStrictEqual(actual, expected[, message])
 
-Tests for deep inequality. Opposite of `assert.deepStrictEqual`.
+Tests for deep inequality. Opposite of [`assert.deepStrictEqual`][].
 
 ## assert.notEqual(actual, expected[, message])
 
@@ -94,7 +94,7 @@ Tests strict equality as determined by the strict equality operator ( `===` ).
 
 ## assert.throws(block[, error][, message])
 
-Expects `block` to throw an error. `error` can be a constructor, `RegExp`, or
+Expects `block` to throw an error. `error` can be a constructor, [`RegExp`][], or
 validation function.
 
 Validate instanceof using constructor:
@@ -106,7 +106,7 @@ Validate instanceof using constructor:
       Error
     );
 
-Validate error message using RegExp:
+Validate error message using [`RegExp`][]:
 
     assert.throws(
       function() {
@@ -129,4 +129,9 @@ Custom error validation:
       "unexpected error"
     );
 
-[assert.throws()]: #assert_assert_throws_block_error_message
+[`assert.deepEqual`]: #assert_assert_deepequal_actual_expected_message
+[`assert.deepStrictEqual`]: #assert_assert_deepstrictequal_actual_expected_message
+[`assert.throws()`]: #assert_assert_throws_block_error_message
+[`Error`]: errors.html#errors_class_error
+[`RegExp`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions
+[`TypeError`]: errors.html#errors_class_typeerror
\ No newline at end of file
diff --git a/doc/api/buffer.markdown b/doc/api/buffer.markdown
index 52c57010e5ba71..ae0c145abb3c7d 100644
--- a/doc/api/buffer.markdown
+++ b/doc/api/buffer.markdown
@@ -50,7 +50,7 @@ instead of cloning it.
 
 While more efficient, it introduces subtle incompatibilities with the typed
 arrays specification.  `ArrayBuffer#slice()` makes a copy of the slice while
-`Buffer#slice()` creates a view.
+[`Buffer#slice()`][] creates a view.
 
 ## Class: Buffer
 
@@ -76,11 +76,11 @@ Copies the passed `buffer` data onto a new `Buffer` instance.
 Allocates a new buffer of `size` bytes.  `size` must be less than
 1,073,741,824 bytes (1 GB) on 32 bits architectures or
 2,147,483,648 bytes (2 GB) on 64 bits architectures,
-otherwise a `RangeError` is thrown.
+otherwise a [`RangeError`][] is thrown.
 
 Unlike `ArrayBuffers`, the underlying memory for buffers is not initialized. So
 the contents of a newly created `Buffer` are unknown and could contain
-sensitive data. Use `buf.fill(0)` to initialize a buffer to zeroes.
+sensitive data. Use [`buf.fill(0)`][] to initialize a buffer to zeroes.
 
 ### new Buffer(str[, encoding])
 
@@ -97,7 +97,7 @@ Allocates a new buffer containing the given `str`.
 * Return: Number
 
 Gives the actual byte length of a string. `encoding` defaults to `'utf8'`.
-This is not the same as `String.prototype.length` since that returns the
+This is not the same as [`String.prototype.length`][] since that returns the
 number of *characters* in a string.
 
 Example:
@@ -286,9 +286,9 @@ buffer.
 * `byteOffset` Number, Optional, Default: 0
 * Return: Number
 
-Operates similar to [Array#indexOf()][]. Accepts a String, Buffer or Number.
+Operates similar to [`Array#indexOf()`][]. Accepts a String, Buffer or Number.
 Strings are interpreted as UTF8. Buffers will use the entire buffer. So in order
-to compare a partial Buffer use `Buffer#slice()`. Numbers can range from 0 to
+to compare a partial Buffer use [`Buffer#slice()`][]. Numbers can range from 0 to
 255.
 
 ### buf.length
@@ -311,7 +311,7 @@ buffer object.  It does not change when the contents of the buffer are changed.
 While the `length` property is not immutable, changing the value of `length`
 can result in undefined and inconsistent behavior. Applications that wish to
 modify the length of a buffer should therefore treat `length` as read-only and
-use `buf.slice` to create a new buffer.
+use [`buf.slice`][] to create a new buffer.
 
     buf = new Buffer(10);
     buf.write("abcdefghj", 0, "ascii");
@@ -882,7 +882,7 @@ to `false`.
 * Number, Default: 50
 
 How many bytes will be returned when `buffer.inspect()` is called. This can
-be overridden by user modules. See [util.inspect()][] for more details on
+be overridden by user modules. See [`util.inspect()`][] for more details on
 `buffer.inspect()` behavior.
 
 Note that this is a property on the buffer module returned by
@@ -932,6 +932,11 @@ un-pooled Buffer instance using SlowBuffer and copy out the relevant bits.
 Though this should be used sparingly and only be a last resort *after* a developer
 has actively observed undue memory retention in their applications.
 
+[`Array#indexOf()`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf
+[`buf.fill(0)`]: #buffer_buf_fill_value_offset_end
+[`buf.slice`]: #buffer_buf_slice_start_end
 [`buf1.compare(buf2)`]: #buffer_buf_compare_otherbuffer
-[Array#indexOf()]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf
-[util.inspect()]: util.html#util_util_inspect_object_options
+[`Buffer#slice()`]: #buffer_buf_slice_start_end
+[`RangeError`]: errors.html#errors_class_rangeerror
+[`String.prototype.length`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/length
+[`util.inspect()`]: util.html#util_util_inspect_object_options
diff --git a/doc/api/child_process.markdown b/doc/api/child_process.markdown
index 708a87424824f9..d6791ac07bb033 100644
--- a/doc/api/child_process.markdown
+++ b/doc/api/child_process.markdown
@@ -19,7 +19,7 @@ convenient.
 
 ## Class: ChildProcess
 
-`ChildProcess` is an [EventEmitter][].
+`ChildProcess` is an [`EventEmitter`][].
 
 Child processes always have three streams associated with them. `child.stdin`,
 `child.stdout`, and `child.stderr`.  These may be shared with the stdio
@@ -27,7 +27,7 @@ streams of the parent process, or they may be separate stream objects
 which can be piped to and from.
 
 The ChildProcess class is not intended to be used directly.  Use the
-`spawn()`, `exec()`, `execFile()`, or `fork()` methods to create a Child
+[`spawn()`][], [`exec()`][], [`execFile()`][], or [`fork()`][] methods to create a Child
 Process instance.
 
 ### Event: 'close'
@@ -37,7 +37,7 @@ Process instance.
   was killed by the parent.
 
 This event is emitted when the stdio streams of a child process have all
-terminated.  This is distinct from 'exit', since multiple processes
+terminated.  This is distinct from `'exit'`, since multiple processes
 might share the same stdio streams.
 
 ### Event: 'disconnect'
@@ -56,7 +56,7 @@ Emitted when:
 2. The process could not be killed, or
 3. Sending a message to the child process failed for whatever reason.
 
-Note that the `exit`-event may or may not fire after an error has occurred. If
+Note that the `'exit'` event may or may not fire after an error has occurred. If
 you are listening on both events to fire a function, remember to guard against
 calling your function twice.
 
@@ -75,8 +75,8 @@ of the signal, otherwise `null`.
 
 Note that the child process stdio streams might still be open.
 
-Also, note that Node.js establishes signal handlers for `'SIGINT'` and
-`'SIGTERM`', so it will not terminate due to receipt of those signals,
+Also, note that Node.js establishes signal handlers for `SIGINT` and
+`SIGTERM`, so it will not terminate due to receipt of those signals,
 it will exit.
 
 See `waitpid(2)`.
@@ -84,11 +84,11 @@ See `waitpid(2)`.
 ### Event: 'message'
 
 * `message` {Object} a parsed JSON object or primitive value.
-* `sendHandle` {Handle object} a [net.Socket][] or [net.Server][] object, or
+* `sendHandle` {Handle object} a [`net.Socket`][] or [`net.Server`][] object, or
   undefined.
 
 Messages sent by `.send(message, [sendHandle])` are obtained using the
-`message` event.
+`'message'` event.
 
 ### child.connected
 
@@ -103,11 +103,11 @@ gracefully once there are no other connections keeping it alive. After calling
 this method the `.connected` flag will be set to `false` in both the parent and
 child, and it is no longer possible to send messages.
 
-The 'disconnect' event will be emitted when there are no messages in the process
+The `'disconnect'` event will be emitted when there are no messages in the process
 of being received, most likely immediately.
 
 Note that you can also call `process.disconnect()` in the child process when the
-child process has any open IPC channels with the parent (i.e `fork()`).
+child process has any open IPC channels with the parent (i.e [`fork()`][]).
 
 ### child.kill([signal])
 
@@ -188,17 +188,17 @@ will emit objects each time it receives a message on its channel.
 
 There is a special case when sending a `{cmd: 'NODE_foo'}` message. All messages
 containing a `NODE_` prefix in its `cmd` property will not be emitted in
-the `message` event, since they are internal messages used by Node.js core.
-Messages containing the prefix are emitted in the `internalMessage` event.
+the `'message'` event, since they are internal messages used by Node.js core.
+Messages containing the prefix are emitted in the `'internalMessage'` event.
 Avoid using this feature; it is subject to change without notice.
 
 The `sendHandle` option to `child.send()` is for sending a TCP server or
 socket object to another process. The child will receive the object as its
-second argument to the `message` event.
+second argument to the `'message'` event.
 
 The `callback` option is a function that is invoked after the message is
 sent but before the target may have received it.  It is called with a single
-argument: `null` on success, or an `Error` object on failure.
+argument: `null` on success, or an [`Error`][] object on failure.
 
 `child.send()` emits an `'error'` event if no callback was given and the message
 cannot be sent, for example because the child process has already exited.
@@ -237,7 +237,7 @@ Note that the server is now shared between the parent and child, this means
 that some connections will be handled by the parent and some by the child.
 
 For `dgram` servers the workflow is exactly the same.  Here you listen on
-a `message` event instead of `connection` and use `server.bind` instead of
+a `'message'` event instead of `'connection'` and use `server.bind` instead of
 `server.listen`.  (Currently only supported on UNIX platforms.)
 
 #### Example: sending socket object
@@ -308,7 +308,7 @@ to the same object, or null.
 * {Array}
 
 A sparse array of pipes to the child process, corresponding with positions in
-the [stdio][] option to [spawn][] that have been set to `'pipe'`.
+the [`stdio`][] option to [`spawn()`][] that have been set to `'pipe'`.
 Note that streams 0-2 are also available as ChildProcess.stdin,
 ChildProcess.stdout, and ChildProcess.stderr, respectively.
 
@@ -392,7 +392,7 @@ Runs a command in a shell and buffers the output.
     });
 
 The callback gets the arguments `(error, stdout, stderr)`. On success, `error`
-will be `null`.  On error, `error` will be an instance of `Error` and `error.code`
+will be `null`.  On error, `error` will be an instance of [`Error`][] and `error.code`
 will be the exit code of the child process, and `error.signal` will be set to the
 signal that terminated the process.
 
@@ -452,7 +452,7 @@ leaner than [`child_process.exec()`][]. It has the same options.
     (Default: `process.execArgv`)
   * `silent` {Boolean} If true, stdin, stdout, and stderr of the child will be
     piped to the parent, otherwise they will be inherited from the parent, see
-    the "pipe" and "inherit" options for `spawn()`'s `stdio` for more details
+    the `'pipe'` and `'inherit'` options for [`spawn()`][]'s [`stdio`][] for more details
     (default is false)
   * `uid` {Number} Sets the user identity of the process. (See setuid(2).)
   * `gid` {Number} Sets the group identity of the process. (See setgid(2).)
@@ -473,7 +473,7 @@ done with care and by default will talk over the fd represented an
 environmental variable `NODE_CHANNEL_FD` on the child process. The input and
 output on this fd is expected to be line delimited JSON objects.
 
-*Note: Unlike the `fork()` POSIX system call, `child_process.fork()` does not clone the
+*Note: Unlike the `fork()` POSIX system call, [`child_process.fork()`][] does not clone the
 current process.*
 
 ### child_process.spawn(command[, args][, options])
@@ -614,7 +614,7 @@ As a shorthand, the `stdio` argument may be one of the following strings:
 * `'ignore'` - `['ignore', 'ignore', 'ignore']`
 * `'inherit'` - `[process.stdin, process.stdout, process.stderr]` or `[0,1,2]`
 
-Otherwise, the 'stdio' option to `child_process.spawn()` is an array where each
+Otherwise, the `'stdio'` option to [`child_process.spawn()`][] is an array where each
 index corresponds to a fd in the child.  The value is one of the following:
 
 1. `'pipe'` - Create a pipe between the child process and the parent process.
@@ -698,7 +698,7 @@ the `SIGTERM` signal and doesn't exit, your process will wait until the child
 process has exited.
 
 If the process times out, or has a non-zero exit code, this method ***will***
-throw.  The `Error` object will contain the entire result from
+throw.  The [`Error`][] object will contain the entire result from
 [`child_process.spawnSync()`][]
 
 ### child_process.execSync(command[, options])
@@ -732,7 +732,7 @@ the `SIGTERM` signal and doesn't exit, your process will wait until the child
 process has exited.
 
 If the process times out, or has a non-zero exit code, this method ***will***
-throw.  The `Error` object will contain the entire result from
+throw.  The [`Error`][] object will contain the entire result from
 [`child_process.spawnSync()`][]
 
 ### child_process.spawnSync(command[, args][, options])
@@ -767,16 +767,20 @@ until the process has completely exited. That is to say, if the process handles
 the `SIGTERM` signal and doesn't exit, your process will wait until the child
 process has exited.
 
-[below]: #child_process_asynchronous_process_creation
-[synchronous counterparts]: #child_process_synchronous_process_creation
-[EventEmitter]: events.html#events_class_events_eventemitter
-[`ChildProcess#kill()`]: #child_process_child_kill_signal
-[`ChildProcess#send()`]: #child_process_child_send_message_sendhandle_callback
-[net.Server]: net.html#net_class_net_server
-[net.Socket]: net.html#net_class_net_socket
-[`child_process.fork()`]: #child_process_child_process_fork_modulepath_args_options
-[stdio]: #child_process_options_stdio
-[spawn]: #child_process_child_process_spawn_command_args_options
 [`child_process.exec()`]: #child_process_child_process_exec_command_options_callback
+[`child_process.fork()`]: #child_process_child_process_fork_modulepath_args_options
 [`child_process.spawn()`]: #child_process_child_process_spawn_command_args_options
 [`child_process.spawnSync()`]: #child_process_child_process_spawnsync_command_args_options
+[`ChildProcess#kill()`]: #child_process_child_kill_signal
+[`ChildProcess#send()`]: #child_process_child_send_message_sendhandle_callback
+[`Error`]: errors.html#errors_class_error
+[`EventEmitter`]: events.html#events_class_events_eventemitter
+[`exec()`]: #child_process_child_process_exec_command_options_callback
+[`execFile()`]: #child_process_child_process_execfile_file_args_options_callback
+[`fork()`]: #child_process_child_process_fork_modulepath_args_options
+[`net.Server`]: net.html#net_class_net_server
+[`net.Socket`]: net.html#net_class_net_socket
+[`spawn()`]: #child_process_child_process_spawn_command_args_options
+[`stdio`]: #child_process_options_stdio
+[below]: #child_process_asynchronous_process_creation
+[synchronous counterparts]: #child_process_synchronous_process_creation
diff --git a/doc/api/cluster.markdown b/doc/api/cluster.markdown
index 702ef4ede79b3a..d300b274a1627e 100644
--- a/doc/api/cluster.markdown
+++ b/doc/api/cluster.markdown
@@ -46,7 +46,7 @@ server in a worker.
 
 <!--type=misc-->
 
-The worker processes are spawned using the `child_process.fork` method,
+The worker processes are spawned using the [`child_process.fork`][] method,
 so that they can communicate with the parent via IPC and pass server
 handles back and forth.
 
@@ -119,7 +119,7 @@ Similar to the `cluster.on('disconnect')` event, but specific to this worker.
 
 ### Event: 'error'
 
-This event is the same as the one provided by `child_process.fork()`.
+This event is the same as the one provided by [`child_process.fork()`][].
 
 In a worker you can also use `process.on('error')`.
 
@@ -160,7 +160,7 @@ It is not emitted in the worker.
 
 Similar to the `cluster.on('message')` event, but specific to this worker.
 
-This event is the same as the one provided by `child_process.fork()`.
+This event is the same as the one provided by [`child_process.fork()`][].
 
 In a worker you can also use `process.on('message')`.
 
@@ -219,7 +219,7 @@ It is not emitted in the worker.
 
 ### worker.disconnect()
 
-In a worker, this function will close all servers, wait for the 'close' event on
+In a worker, this function will close all servers, wait for the `'close'` event on
 those servers, and then disconnect the IPC channel.
 
 In the master, an internal message is sent to the worker causing it to call
@@ -238,12 +238,12 @@ automatically closed by workers, and disconnect does not wait for them to close
 before exiting.
 
 Note that in a worker, `process.disconnect` exists, but it is not this function,
-it is [disconnect][].
+it is [`disconnect`][].
 
 Because long living server connections may block workers from disconnecting, it
 may be useful to send a message, so application specific actions may be taken to
 close them. It also may be useful to implement a timeout, killing a worker if
-the `disconnect` event has not been emitted after some time.
+the `'disconnect'` event has not been emitted after some time.
 
     if (cluster.isMaster) {
       var worker = cluster.fork();
@@ -290,7 +290,7 @@ cluster.workers
 
 This function returns `true` if the worker is connected to its master via its IPC
 channel, `false` otherwise. A worker is connected to its master after it's been
-created. It is disconnected after the `disconnect` event is emitted.
+created. It is disconnected after the `'disconnect'` event is emitted.
 
 ### worker.isDead()
 
@@ -311,13 +311,13 @@ Causes `.suicide` to be set.
 This method is aliased as `worker.destroy()` for backwards compatibility.
 
 Note that in a worker, `process.kill()` exists, but it is not this function,
-it is [kill][].
+it is [`kill`][].
 
 ### worker.process
 
 * {ChildProcess object}
 
-All workers are created using `child_process.fork()`, the returned object
+All workers are created using [`child_process.fork()`][], the returned object
 from this function is stored as `.process`. In a worker, the global `process`
 is stored.
 
@@ -337,7 +337,7 @@ disconnection.
 Send a message to a worker or master, optionally with a handle.
 
 In the master this sends a message to a specific worker. It is identical to
-[ChildProcess.send()][].
+[`ChildProcess.send()`][].
 
 In a worker this sends a message to the master. It is identical to
 `process.send()`.
@@ -380,7 +380,7 @@ Emitted after the worker IPC channel has disconnected. This can occur when a
 worker exits gracefully, is killed, or is disconnected manually (such as with
 worker.disconnect()).
 
-There may be a delay between the `disconnect` and `exit` events.  These events
+There may be a delay between the `'disconnect'` and `'exit'` events.  These events
 can be used to detect if the process is stuck in a cleanup or if there are
 long-living connections.
 
@@ -395,7 +395,7 @@ long-living connections.
 * `signal` {String} the name of the signal (eg. `'SIGHUP'`) that caused
   the process to be killed.
 
-When any of the workers die the cluster module will emit the 'exit' event.
+When any of the workers die the cluster module will emit the `'exit'` event.
 
 This can be used to restart the worker by calling `.fork()` again.
 
@@ -411,7 +411,7 @@ See [child_process event: 'exit'][].
 
 * `worker` {Worker object}
 
-When a new worker is forked the cluster module will emit a 'fork' event.
+When a new worker is forked the cluster module will emit a `'fork'` event.
 This can be used to log worker activity, and create your own timeout.
 
     var timeouts = [];
@@ -435,8 +435,8 @@ This can be used to log worker activity, and create your own timeout.
 * `worker` {Worker object}
 * `address` {Object}
 
-After calling `listen()` from a worker, when the 'listening' event is emitted on
-the server, a listening event will also be emitted on `cluster` in the master.
+After calling `listen()` from a worker, when the `'listening'` event is emitted on
+the server, a `'listening'` event will also be emitted on `cluster` in the master.
 
 The event handler is executed with two arguments, the `worker` contains the worker
 object and the `address` object contains the following connection properties:
@@ -469,7 +469,7 @@ See [child_process event: 'message'][].
 
 After forking a new worker, the worker should respond with an online message.
 When the master receives an online message it will emit this event.
-The difference between 'fork' and 'online' is that fork is emitted when the
+The difference between `'fork'` and `'online'` is that fork is emitted when the
 master forks a worker, and 'online' is emitted when the worker is running.
 
     cluster.on('online', function(worker) {
@@ -644,10 +644,11 @@ the worker's unique id is the easiest way to find the worker.
       var worker = cluster.workers[id];
     });
 
-[server.close()]: net.html#net_event_close
-[disconnect]: child_process.html#child_process_child_disconnect
-[kill]: process.html#process_process_kill_pid_signal
+[`child_process.fork()`]: child_process.html#child_process_child_process_fork_modulepath_args_options
+[`ChildProcess.send()`]: child_process.html#child_process_child_send_message_sendhandle_callback
+[`disconnect`]: child_process.html#child_process_child_disconnect
+[`kill`]: process.html#process_process_kill_pid_signal
+[`server.close()`]: net.html#net_event_close
 [Child Process module]: child_process.html#child_process_child_process_fork_modulepath_args_options
-[ChildProcess.send()]: child_process.html#child_process_child_send_message_sendhandle_callback
 [child_process event: 'exit']: child_process.html#child_process_event_exit
 [child_process event: 'message']: child_process.html#child_process_event_message
diff --git a/doc/api/console.markdown b/doc/api/console.markdown
index b481a7d17c98e1..0d96ace8d01956 100644
--- a/doc/api/console.markdown
+++ b/doc/api/console.markdown
@@ -66,12 +66,12 @@ should worry about unless you log huge amounts of data.
 
 ### console.assert(value[, message][, ...])
 
-Similar to [assert.ok()][], but the error message is formatted as
+Similar to [`assert.ok()`][], but the error message is formatted as
 `util.format(message...)`.
 
 ### console.dir(obj[, options])
 
-Uses `util.inspect` on `obj` and prints resulting string to stdout. This function
+Uses [`util.inspect()`][] on `obj` and prints resulting string to stdout. This function
 bypasses any custom `inspect()` function on `obj`. An optional *options* object
 may be passed that alters certain aspects of the formatted string:
 
@@ -83,15 +83,15 @@ object. This is useful for inspecting large complicated objects. Defaults to
 `2`. To make it recurse indefinitely pass `null`.
 
 - `colors` - if `true`, then the output will be styled with ANSI color codes.
-Defaults to `false`. Colors are customizable, see [customizing util.inspect colors][].
+Defaults to `false`. Colors are customizable, see [customizing `util.inspect()` colors][].
 
 ### console.error([data][, ...])
 
-Same as `console.log` but prints to stderr.
+Same as [`console.log()`][] but prints to stderr.
 
 ### console.info([data][, ...])
 
-Same as `console.log`.
+Same as [`console.log()`][].
 
 ### console.log([data][, ...])
 
@@ -102,8 +102,8 @@ Prints to stdout with newline. This function can take multiple arguments in a
     console.log('count: %d', count);
     // prints 'count: 5'
 
-If formatting elements are not found in the first string then `util.inspect`
-is used on each argument.  See [util.format()][] for more information.
+If formatting elements are not found in the first string then [`util.inspect()`][]
+is used on each argument.  See [`util.format()`][] for more information.
 
 ### console.time(label)
 
@@ -134,10 +134,13 @@ to the current position.
 
 ### console.warn([data][, ...])
 
-Same as `console.error`.
+Same as [`console.error()`][].
 
-[assert.ok()]: assert.html#assert_assert_value_message_assert_ok_value_message
-[customizing util.inspect colors]: util.html#util_customizing_util_inspect_colors
-[util.format()]: util.html#util_util_format_format
-[`console.timeEnd()`]: #console_console_timeend_label
+[`assert.ok()`]: assert.html#assert_assert_value_message_assert_ok_value_message
+[`console.error()`]: #console_console_error_data
+[`console.log()`]: #console_console_log_data
 [`console.time()`]: #console_console_time_label
+[`console.timeEnd()`]: #console_console_timeend_label
+[`util.format()`]: util.html#util_util_format_format
+[`util.inspect()`]: util.html#util_util_inspect_object_options
+[customizing `util.inspect()` colors]: util.html#util_customizing_util_inspect_colors
diff --git a/doc/api/crypto.markdown b/doc/api/crypto.markdown
index 60231b17072692..5e733efab7428c 100644
--- a/doc/api/crypto.markdown
+++ b/doc/api/crypto.markdown
@@ -89,7 +89,7 @@ data as it is streamed.
 
 Class for decrypting data.
 
-Returned by `crypto.createDecipher` and `crypto.createDecipheriv`.
+Returned by [`crypto.createDecipher`][] and [`crypto.createDecipheriv`][].
 
 Decipher objects are [streams][] that are both readable and writable.
 The written enciphered data is used to produce the plain-text data on
@@ -125,7 +125,7 @@ You can disable auto padding if the data has been encrypted without
 standard block padding to prevent `decipher.final` from checking and
 removing it. This will only work if the input data's length is a multiple of
 the ciphers block size. You must call this before streaming data to
-`decipher.update`.
+[`decipher.update`][].
 
 ### decipher.update(data[, input_encoding][, output_encoding])
 
@@ -426,15 +426,15 @@ is used to compute the hash.  Once the writable side of the stream is ended,
 use the `read()` method to get the enciphered contents.  The legacy `update`
 and `final` methods are also supported.
 
-Note: `createCipher` derives keys with the OpenSSL function [EVP_BytesToKey][]
+Note: `createCipher` derives keys with the OpenSSL function [`EVP_BytesToKey`][]
 with the digest algorithm set to MD5, one iteration, and no salt. The lack of
 salt allows dictionary attacks as the same password always creates the same key.
 The low iteration count and non-cryptographically secure hash algorithm allow
 passwords to be tested very rapidly.
 
-In line with OpenSSL's recommendation to use pbkdf2 instead of EVP_BytesToKey it
-is recommended you derive a key and iv yourself with [crypto.pbkdf2][] and to
-then use [createCipheriv()][] to create the cipher stream.
+In line with OpenSSL's recommendation to use pbkdf2 instead of [`EVP_BytesToKey`][] it
+is recommended you derive a key and iv yourself with [`crypto.pbkdf2`][] and to
+then use [`createCipheriv()`][] to create the cipher stream.
 
 ## crypto.createCipheriv(algorithm, key, iv)
 
@@ -448,7 +448,7 @@ the raw key used by the algorithm.  `iv` is an [initialization vector][].
 
 ## crypto.createCredentials(details)
 
-    Stability: 0 - Deprecated: Use [tls.createSecureContext][] instead.
+    Stability: 0 - Deprecated: Use [`tls.createSecureContext`][] instead.
 
 Creates a credentials object, with the optional details being a
 dictionary with keys:
@@ -474,12 +474,12 @@ publicly trusted list of CAs as given in
 ## crypto.createDecipher(algorithm, password)
 
 Creates and returns a decipher object, with the given algorithm and
-key.  This is the mirror of the [createCipher()][] above.
+key.  This is the mirror of the [`createCipher()`][] above.
 
 ## crypto.createDecipheriv(algorithm, key, iv)
 
 Creates and returns a decipher object, with the given algorithm, key
-and iv.  This is the mirror of the [createCipheriv()][] above.
+and iv.  This is the mirror of the [`createCipheriv()`][] above.
 
 ## crypto.createDiffieHellman(prime[, prime_encoding][, generator][, generator_encoding])
 
@@ -500,7 +500,7 @@ If no `generator` is specified, then `2` is used.
 ## crypto.createECDH(curve_name)
 
 Creates an Elliptic Curve (EC) Diffie-Hellman key exchange object using a
-predefined curve specified by the `curve_name` string. Use [getCurves()][] to
+predefined curve specified by the `curve_name` string. Use [`getCurves()`][] to
 obtain a list of available curve names. On recent releases,
 `openssl ecparam -list_curves` will also display the name and description of
 each available elliptic curve.
@@ -583,8 +583,8 @@ supported groups are: `'modp1'`, `'modp2'`, `'modp5'` (defined in
 [RFC 2412][], but see [Caveats][]) and `'modp14'`, `'modp15'`,
 `'modp16'`, `'modp17'`, `'modp18'` (defined in [RFC 3526][]).  The
 returned object mimics the interface of objects created by
-[crypto.createDiffieHellman()][] above, but will not allow changing
-the keys (with [diffieHellman.setPublicKey()][] for example). The
+[`crypto.createDiffieHellman()`][] above, but will not allow changing
+the keys (with [`diffieHellman.setPublicKey()`][] for example). The
 advantage of using this routine is that the parties do not have to
 generate nor exchange group modulus beforehand, saving both processor
 and communication time.
@@ -635,7 +635,7 @@ Example:
       console.log(key.toString('hex'));  // 'c5e478d...1469e50'
     });
 
-You can get a list of supported digest functions with [crypto.getHashes()][].
+You can get a list of supported digest functions with [`crypto.getHashes()`][].
 
 ## crypto.pbkdf2Sync(password, salt, iterations, keylen[, digest])
 
@@ -782,22 +782,25 @@ Based on the recommendations of [NIST SP 800-131A]:
 
 See the reference for other recommendations and details.
 
-[stream]: stream.html
-[streams]: stream.html
+[`createCipher()`]: #crypto_crypto_createcipher_algorithm_password
+[`createCipheriv()`]: #crypto_crypto_createcipheriv_algorithm_key_iv
+[`crypto.createDecipher`]: #crypto_crypto_createdecipher_algorithm_password
+[`crypto.createDecipheriv`]: #crypto_crypto_createdecipheriv_algorithm_key_iv
+[`crypto.createDiffieHellman()`]: #crypto_crypto_creatediffiehellman_prime_prime_encoding_generator_generator_encoding
+[`crypto.getHashes()`]: #crypto_crypto_gethashes
+[`crypto.pbkdf2`]: #crypto_crypto_pbkdf2_password_salt_iterations_keylen_digest_callback
+[`decipher.update`]: #crypto_decipher_update_data_input_encoding_output_encoding
+[`diffieHellman.setPublicKey()`]: #crypto_diffiehellman_setpublickey_public_key_encoding
+[`EVP_BytesToKey`]: https://www.openssl.org/docs/crypto/EVP_BytesToKey.html
+[`getCurves()`]: #crypto_crypto_getcurves
+[`tls.createSecureContext`]: tls.html#tls_tls_createsecurecontext_details
 [buffer]: buffer.html
 [buffers]: buffer.html
-[createCipher()]: #crypto_crypto_createcipher_algorithm_password
-[createCipheriv()]: #crypto_crypto_createcipheriv_algorithm_key_iv
-[getCurves()]: #crypto_crypto_getcurves
-[crypto.createDiffieHellman()]: #crypto_crypto_creatediffiehellman_prime_prime_encoding_generator_generator_encoding
-[tls.createSecureContext]: tls.html#tls_tls_createsecurecontext_details
-[diffieHellman.setPublicKey()]: #crypto_diffiehellman_setpublickey_public_key_encoding
+[Caveats]: #crypto_caveats
+[initialization vector]: http://en.wikipedia.org/wiki/Initialization_vector
+[NIST SP 800-131A]: http://csrc.nist.gov/publications/nistpubs/800-131A/sp800-131A.pdf
+[NIST SP 800-132]: http://csrc.nist.gov/publications/nistpubs/800-132/nist-sp800-132.pdf
 [RFC 2412]: http://www.rfc-editor.org/rfc/rfc2412.txt
 [RFC 3526]: http://www.rfc-editor.org/rfc/rfc3526.txt
-[crypto.pbkdf2]: #crypto_crypto_pbkdf2_password_salt_iterations_keylen_digest_callback
-[EVP_BytesToKey]: https://www.openssl.org/docs/crypto/EVP_BytesToKey.html
-[NIST SP 800-132]: http://csrc.nist.gov/publications/nistpubs/800-132/nist-sp800-132.pdf
-[NIST SP 800-131A]: http://csrc.nist.gov/publications/nistpubs/800-131A/sp800-131A.pdf
-[initialization vector]: http://en.wikipedia.org/wiki/Initialization_vector
-[Caveats]: #crypto_caveats
-[crypto.getHashes()]: #crypto_crypto_gethashes
+[stream]: stream.html
+[streams]: stream.html
diff --git a/doc/api/dgram.markdown b/doc/api/dgram.markdown
index 3db13305281f5a..71c59db3bf747c 100644
--- a/doc/api/dgram.markdown
+++ b/doc/api/dgram.markdown
@@ -6,7 +6,7 @@
 
 Datagram sockets are available through `require('dgram')`.
 
-Important note: the behavior of `dgram.Socket#bind()` has changed in v0.10
+Important note: the behavior of [`dgram.Socket#bind()`][] has changed in v0.10
 and is always asynchronous now.  If you have code that looks like this:
 
     var s = dgram.createSocket('udp4');
@@ -23,11 +23,11 @@ You have to change it to this:
 ## Class: dgram.Socket
 
 The dgram Socket class encapsulates the datagram functionality.  It
-should be created via `dgram.createSocket(...)`
+should be created via [`dgram.createSocket(...)`][]
 
 ### Event: 'close'
 
-Emitted after a socket is closed with `close()`.  No new `message` events will be emitted
+Emitted after a socket is closed with [`close()`][].  No new `'message'` events will be emitted
 on this socket.
 
 ### Event: 'error'
@@ -79,16 +79,16 @@ this object will contain `address` , `family` and `port`.
 For UDP sockets, listen for datagrams on a named `port` and optional
 `address`. If `port` is not specified, the OS will try to bind to a random
 port. If `address` is not specified, the OS will try to listen on
-all addresses.  After binding is done, a "listening" event is emitted
+all addresses.  After binding is done, a `'listening'` event is emitted
 and the `callback`(if specified) is called. Specifying both a
-"listening" event listener and `callback` is not harmful but not very
+`'listening'` event listener and `callback` is not harmful but not very
 useful.
 
 A bound datagram socket keeps the Node.js process running to receive
 datagrams.
 
-If binding fails, an "error" event is generated. In rare case (e.g.
-binding a closed socket), an `Error` may be thrown by this method.
+If binding fails, an `'error'` event is generated. In rare case (e.g.
+binding a closed socket), an [`Error`][] may be thrown by this method.
 
 Example of a UDP server listening on port 41234:
 
@@ -125,8 +125,7 @@ Example of a UDP server listening on port 41234:
 
 The `port` and `address` properties of `options`, as well as the optional
 callback function, behave as they do on a call to
-[socket.bind(port, \[address\], \[callback\])
-](#dgram_socket_bind_port_address_callback).
+[`socket.bind(port, \[address\], \[callback\])`][].
 
 If `exclusive` is `false` (default), then cluster workers will use the same
 underlying handle, allowing connection handling duties to be shared. When
@@ -143,14 +142,14 @@ shown below.
 ### socket.close([callback])
 
 Close the underlying socket and stop listening for data on it. If a callback is
-provided, it is added as a listener for the ['close'][] event.
+provided, it is added as a listener for the [`'close'`][] event.
 
 ### socket.dropMembership(multicastAddress[, multicastInterface])
 
 * `multicastAddress` String
 * `multicastInterface` String, Optional
 
-Opposite of `addMembership` - tells the kernel to leave a multicast group with
+Opposite of [`addMembership()`][] - tells the kernel to leave a multicast group with
 `IP_DROP_MEMBERSHIP` socket option. This is automatically called by the kernel
 when the socket is closed or process terminates, so most apps will never need to call
 this.
@@ -241,7 +240,7 @@ packets will also be received on the local interface.
 
 * `ttl` Integer
 
-Sets the `IP_MULTICAST_TTL` socket option.  TTL stands for "Time to Live," but in this
+Sets the `IP_MULTICAST_TTL` socket option.  TTL stands for "Time to Live", but in this
 context it specifies the number of IP hops that a packet is allowed to go through,
 specifically for multicast traffic.  Each router or gateway that forwards a packet
 decrements the TTL. If the TTL is decremented to 0 by a router, it will not be forwarded.
@@ -253,7 +252,7 @@ systems is 1.
 
 * `ttl` Integer
 
-Sets the `IP_TTL` socket option.  TTL stands for "Time to Live," but in this context it
+Sets the `IP_TTL` socket option.  TTL stands for "Time to Live", but in this context it
 specifies the number of IP hops that a packet is allowed to go through.  Each router or
 gateway that forwards a packet decrements the TTL.  If the TTL is decremented to 0 by a
 router, it will not be forwarded.  Changing TTL values is typically done for network
@@ -280,39 +279,48 @@ Returns `socket`.
 
 ## dgram.createSocket(options[, callback])
 * `options` Object
-* `callback` Function. Attached as a listener to `message` events.
+* `callback` Function. Attached as a listener to `'message'` events.
 * Returns: Socket object
 
 The `options` object should contain a `type` field of either `udp4` or `udp6`
 and an optional boolean `reuseAddr` field.
 
-When `reuseAddr` is `true` `socket.bind()` will reuse the address, even if
+When `reuseAddr` is `true` [`socket.bind()`][] will reuse the address, even if
 another process has already bound a socket on it. `reuseAddr` defaults to
 `false`.
 
-Takes an optional callback which is added as a listener for `message` events.
+Takes an optional callback which is added as a listener for `'message'` events.
 
-Call `socket.bind()` if you want to receive datagrams. `socket.bind()` will
+Call [`socket.bind()`][] if you want to receive datagrams. [`socket.bind()`][] will
 bind to the "all interfaces" address on a random port (it does the right thing
 for both `udp4` and `udp6` sockets). You can then retrieve the address and port
-with `socket.address().address` and `socket.address().port`.
+with [`socket.address().address`][] and [`socket.address().port`][].
 
 ## dgram.createSocket(type[, callback])
 
 * `type` String. Either 'udp4' or 'udp6'
-* `callback` Function. Attached as a listener to `message` events.
+* `callback` Function. Attached as a listener to `'message'` events.
   Optional
 * Returns: Socket object
 
 Creates a datagram Socket of the specified types.  Valid types are `udp4`
 and `udp6`.
 
-Takes an optional callback which is added as a listener for `message` events.
+Takes an optional callback which is added as a listener for `'message'` events.
 
-Call `socket.bind()` if you want to receive datagrams. `socket.bind()` will
+Call [`socket.bind()`][] if you want to receive datagrams. [`socket.bind()`][] will
 bind to the "all interfaces" address on a random port (it does the right thing
 for both `udp4` and `udp6` sockets). You can then retrieve the address and port
-with `socket.address().address` and `socket.address().port`.
-
-['close']: #dgram_event_close
+with [`socket.address().address`][] and [`socket.address().port`][].
+
+[`'close'`]: #dgram_event_close
+[`addMembership()`]: #dgram_socket_addmembership_multicastaddress_multicastinterface
+[`close()`]: #dgram_socket_close_callback
+[`dgram.createSocket(...)`]: #dgram_dgram_createsocket_options_callback
+[`dgram.Socket#bind()`]: #dgram_socket_bind_options_callback
+[`Error`]: errors.html#errors_class_error
+[`socket.address().address`]: #dgram_socket_address
+[`socket.address().port`]: #dgram_socket_address
+[`socket.bind()`]: #dgram_socket_bind_port_address_callback
+[`socket.bind(port, \[address\], \[callback\])`]: #dgram_socket_bind_port_address_callback
 [byte length]: buffer.html#buffer_class_method_buffer_bytelength_string_encoding
diff --git a/doc/api/dns.markdown b/doc/api/dns.markdown
index e7b9fbb7987b93..ef68b93b8afabf 100644
--- a/doc/api/dns.markdown
+++ b/doc/api/dns.markdown
@@ -8,7 +8,7 @@ This module contains functions that belong to two different categories:
 
 1) Functions that use the underlying operating system facilities to perform
 name resolution, and that do not necessarily do any network communication.
-This category contains only one function: `dns.lookup()`. __Developers looking
+This category contains only one function: [`dns.lookup()`][]. __Developers looking
 to perform name resolution in the same way that other applications on the same
 operating system behave should use [`dns.lookup()`][].__
 
@@ -97,7 +97,7 @@ With the `all` option set, the arguments change to `(err, addresses)`, with
 `addresses` being an array of objects with the properties `address` and
 `family`.
 
-On error, `err` is an `Error` object, where `err.code` is the error code.
+On error, `err` is an [`Error`][] object, where `err.code` is the error code.
 Keep in mind that `err.code` will be set to `'ENOENT'` not only when
 the hostname does not exist but also when the lookup fails in other ways
 such as no available file descriptors.
@@ -118,7 +118,7 @@ Resolves the given address and port into a hostname and service using
 The callback has arguments `(err, hostname, service)`. The `hostname` and
 `service` arguments are strings (e.g. `'localhost'` and `'http'` respectively).
 
-On error, `err` is an `Error` object, where `err.code` is the error code.
+On error, `err` is an [`Error`][] object, where `err.code` is the error code.
 
 
 ## dns.resolve(hostname[, rrtype], callback)
@@ -142,7 +142,7 @@ The callback has arguments `(err, addresses)`.  The type of each item
 in `addresses` is determined by the record type, and described in the
 documentation for the corresponding lookup methods below.
 
-On error, `err` is an `Error` object, where `err.code` is
+On error, `err` is an [`Error`][] object, where `err.code` is
 one of the error codes listed below.
 
 
@@ -215,7 +215,7 @@ Reverse resolves an ip address to an array of hostnames.
 
 The callback has arguments `(err, hostnames)`.
 
-On error, `err` is an `Error` object, where `err.code` is
+On error, `err` is an [`Error`][] object, where `err.code` is
 one of the error codes listed below.
 
 ## dns.setServers(servers)
@@ -259,7 +259,7 @@ Each DNS query can return one of the following error codes:
 
 ## Supported getaddrinfo flags
 
-The following flags can be passed as hints to `dns.lookup()`.
+The following flags can be passed as hints to [`dns.lookup()`][].
 
 - `dns.ADDRCONFIG`: Returned address types are determined by the types
 of addresses supported by the current system. For example, IPv4 addresses
@@ -271,17 +271,17 @@ on some operating systems (e.g FreeBSD 10.1).
 
 ## Implementation considerations
 
-Although `dns.lookup()` and `dns.resolve*()/dns.reverse()` functions have the same
+Although [`dns.lookup()`][] and `dns.resolve*()/dns.reverse()` functions have the same
 goal of associating a network name with a network address (or vice versa),
 their behavior is quite different. These differences can have subtle but
 significant consequences on the behavior of Node.js programs.
 
 ### dns.lookup
 
-Under the hood, `dns.lookup()` uses the same operating system facilities as most
-other programs. For instance, `dns.lookup()` will almost always resolve a given
+Under the hood, [`dns.lookup()`][] uses the same operating system facilities as most
+other programs. For instance, [`dns.lookup()`][] will almost always resolve a given
 name the same way as the `ping` command. On most POSIX-like operating systems,
-the behavior of the `dns.lookup()` function can be tweaked by changing settings
+the behavior of the [`dns.lookup()`][] function can be tweaked by changing settings
 in `nsswitch.conf(5)` and/or `resolv.conf(5)`, but be careful that changing
 these files will change the behavior of all other programs running on the same
 operating system.
@@ -299,21 +299,21 @@ setting the 'UV_THREADPOOL_SIZE' environment variable to a value greater than
 
 ### dns.resolve, functions starting with dns.resolve and dns.reverse
 
-These functions are implemented quite differently than `dns.lookup()`. They do
+These functions are implemented quite differently than [`dns.lookup()`][]. They do
 not use `getaddrinfo(3)` and they _always_ perform a DNS query on the network.
 This network communication is always done asynchronously, and does not use
 libuv's threadpool.
 
 As a result, these functions cannot have the same negative impact on other
-processing that happens on libuv's threadpool that `dns.lookup()` can have.
+processing that happens on libuv's threadpool that [`dns.lookup()`][] can have.
 
-They do not use the same set of configuration files than what `dns.lookup()`
+They do not use the same set of configuration files than what [`dns.lookup()`][]
 uses. For instance, _they do not use the configuration from `/etc/hosts`_.
 
-[Implementation considerations section]: #dns_implementation_considerations
-[supported `getaddrinfo` flags]: #dns_supported_getaddrinfo_flags
+[`dns.lookup()`]: #dns_dns_lookup_hostname_options_callback
 [`dns.resolve()`]: #dns_dns_resolve_hostname_rrtype_callback
 [`dns.resolve4()`]: #dns_dns_resolve4_hostname_callback
+[`Error`]: errors.html#errors_class_error
+[Implementation considerations section]: #dns_implementation_considerations
+[supported `getaddrinfo` flags]: #dns_supported_getaddrinfo_flags
 [the official libuv documentation]: http://docs.libuv.org/en/latest/threadpool.html
-[`dns.lookup()`]: #dns_dns_lookup_hostname_options_callback
-
diff --git a/doc/api/domain.markdown b/doc/api/domain.markdown
index c62b8555f035c4..16854d46acce6c 100644
--- a/doc/api/domain.markdown
+++ b/doc/api/domain.markdown
@@ -11,7 +11,7 @@ in the future.
 
 Domains provide a way to handle multiple different IO operations as a
 single group.  If any of the event emitters or callbacks registered to a
-domain emit an `error` event, or throw an error, then the domain object
+domain emit an `'error'` event, or throw an error, then the domain object
 will be notified, rather than losing the context of the error in the
 `process.on('uncaughtException')` handler, or causing the program to
 exit immediately with an error code.
@@ -23,7 +23,7 @@ exit immediately with an error code.
 Domain error handlers are not a substitute for closing down your
 process when an error occurs.
 
-By the very nature of how `throw` works in JavaScript, there is almost
+By the very nature of how [`throw`][] works in JavaScript, there is almost
 never any way to safely "pick up where you left off", without leaking
 references, or creating some other sort of undefined brittle state.
 
@@ -174,11 +174,11 @@ function handleRequest(req, res) {
 
 <!-- type=misc -->
 
-Any time an Error object is routed through a domain, a few extra fields
+Any time an `Error` object is routed through a domain, a few extra fields
 are added to it.
 
 * `error.domain` The domain that first handled the error.
-* `error.domainEmitter` The event emitter that emitted an 'error' event
+* `error.domainEmitter` The event emitter that emitted an `'error'` event
   with the error object.
 * `error.domainBound` The callback function which was bound to the
   domain, and passed an error as its first argument.
@@ -207,8 +207,8 @@ If you *want* to nest Domain objects as children of a parent Domain,
 then you must explicitly add them.
 
 Implicit binding routes thrown errors and `'error'` events to the
-Domain's `error` event, but does not register the EventEmitter on the
-Domain, so `domain.dispose()` will not shut down the EventEmitter.
+Domain's `'error'` event, but does not register the EventEmitter on the
+Domain, so [`domain.dispose()`][] will not shut down the EventEmitter.
 Implicit binding only takes care of thrown errors and `'error'` events.
 
 ## Explicit Binding
@@ -264,8 +264,8 @@ Returns a new Domain object.
 The Domain class encapsulates the functionality of routing errors and
 uncaught exceptions to the active Domain object.
 
-Domain is a child class of [EventEmitter][].  To handle the errors that it
-catches, listen to its `error` event.
+Domain is a child class of [`EventEmitter`][].  To handle the errors that it
+catches, listen to its `'error'` event.
 
 ### domain.run(fn[, arg][, ...])
 
@@ -312,12 +312,12 @@ to the domain.
 * `emitter` {EventEmitter | Timer} emitter or timer to be added to the domain
 
 Explicitly adds an emitter to the domain.  If any event handlers called by
-the emitter throw an error, or if the emitter emits an `error` event, it
-will be routed to the domain's `error` event, just like with implicit
+the emitter throw an error, or if the emitter emits an `'error'` event, it
+will be routed to the domain's `'error'` event, just like with implicit
 binding.
 
-This also works with timers that are returned from `setInterval` and
-`setTimeout`.  If their callback function throws, it will be caught by
+This also works with timers that are returned from [`setInterval()`][] and
+[`setTimeout()`][].  If their callback function throws, it will be caught by
 the domain 'error' handler.
 
 If the Timer or EventEmitter was already bound to a domain, it is removed
@@ -327,7 +327,7 @@ from that one, and bound to this one instead.
 
 * `emitter` {EventEmitter | Timer} emitter or timer to be removed from the domain
 
-The opposite of `domain.add(emitter)`.  Removes domain handling from the
+The opposite of [`domain.add(emitter)`][].  Removes domain handling from the
 specified emitter.
 
 ### domain.bind(callback)
@@ -337,7 +337,7 @@ specified emitter.
 
 The returned function will be a wrapper around the supplied callback
 function.  When the returned function is called, any errors that are
-thrown will be routed to the domain's `error` event.
+thrown will be routed to the domain's `'error'` event.
 
 #### Example
 
@@ -361,11 +361,11 @@ thrown will be routed to the domain's `error` event.
 * `callback` {Function} The callback function
 * return: {Function} The intercepted function
 
-This method is almost identical to `domain.bind(callback)`.  However, in
-addition to catching thrown errors, it will also intercept `Error`
+This method is almost identical to [`domain.bind(callback)`][].  However, in
+addition to catching thrown errors, it will also intercept [`Error`][]
 objects sent as the first argument to the function.
 
-In this way, the common `if (er) return callback(er);` pattern can be replaced
+In this way, the common `if (err) return callback(err);` pattern can be replaced
 with a single error handler in a single place.
 
 #### Example
@@ -397,12 +397,12 @@ with a single error handler in a single place.
 The `enter` method is plumbing used by the `run`, `bind`, and `intercept`
 methods to set the active domain. It sets `domain.active` and `process.domain`
 to the domain, and implicitly pushes the domain onto the domain stack managed
-by the domain module (see `domain.exit()` for details on the domain stack). The
+by the domain module (see [`domain.exit()`][] for details on the domain stack). The
 call to `enter` delimits the beginning of a chain of asynchronous calls and I/O
 operations bound to a domain.
 
 Calling `enter` changes only the active domain, and does not alter the domain
-itself. `Enter` and `exit` can be called an arbitrary number of times on a
+itself. `enter` and `exit` can be called an arbitrary number of times on a
 single domain.
 
 If the domain on which `enter` is called has been disposed, `enter` will return
@@ -420,7 +420,7 @@ If there are multiple, nested domains bound to the current execution context,
 `exit` will exit any domains nested within this domain.
 
 Calling `exit` changes only the active domain, and does not alter the domain
-itself. `Enter` and `exit` can be called an arbitrary number of times on a
+itself. `enter` and `exit` can be called an arbitrary number of times on a
 single domain.
 
 If the domain on which `exit` is called has been disposed, `exit` will return
@@ -432,7 +432,15 @@ without exiting the domain.
     explicitly via error event handlers set on the domain.
 
 Once `dispose` has been called, the domain will no longer be used by callbacks
-bound into the domain via `run`, `bind`, or `intercept`, and a `dispose` event
+bound into the domain via `run`, `bind`, or `intercept`, and a `'dispose'` event
 is emitted.
 
-[EventEmitter]: events.html#events_class_events_eventemitter
+[`domain.add(emitter)`]: #domain_domain_add_emitter
+[`domain.bind(callback)`]: #domain_domain_bind_callback
+[`domain.dispose()`]: #domain_domain_dispose
+[`domain.exit()`]: #domain_domain_exit
+[`Error`]: errors.html#errors_class_error
+[`EventEmitter`]: events.html#events_class_events_eventemitter
+[`setInterval()`]: timers.html#timers_setinterval_callback_delay_arg
+[`setTimeout()`]: timers.html#timers_settimeout_callback_delay_arg
+[`throw`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/throw
diff --git a/doc/api/errors.markdown b/doc/api/errors.markdown
index d2c09f2e6b7788..799a8141af43e1 100644
--- a/doc/api/errors.markdown
+++ b/doc/api/errors.markdown
@@ -3,7 +3,7 @@
 <!--type=misc-->
 
 Errors generated by Node.js fall into two categories: JavaScript errors and system
-errors. All errors inherit from or are instances of JavaScript's [Error][]
+errors. All errors inherit from or are instances of JavaScript's [`Error`][]
 class and are guaranteed to provide *at least* the attributes available on that
 class.
 
@@ -15,7 +15,7 @@ opportunity to **intercept** this error based on how the API **propagates** it.
 
 The style of API called determines how generated errors are handed back, or
 **propagated**, to client code, which in turn informs how the client may **intercept**
-the error. Exceptions can be intercepted using the `try / catch` construct;
+the error. Exceptions can be intercepted using the [`try / catch` construct][];
 other propagation strategies are covered [below][].
 
 ## Error Propagation and Interception
@@ -26,9 +26,9 @@ All Node.js APIs will treat invalid arguments as exceptional -- that is, if pass
 invalid arguments, they will *immediately* generate and throw the error as an
 exception, even if they are an otherwise asynchronous API.
 
-Synchronous APIs (like [fs.readFileSync][]) will throw the error. The act of
+Synchronous APIs (like [`fs.readFileSync`][]) will throw the error. The act of
 *throwing* a value (in this case, the error) turns the value into an **exception**.
-Exceptions may be caught using the `try { } catch(err) { }` construct.
+Exceptions may be caught using the [`try { } catch(err) { }`][] construct.
 
 Asynchronous APIs have **two** mechanisms for error propagation; one mechanism
 for APIs that represent a single operation, and one for APIs that represent
@@ -38,20 +38,20 @@ multiple operations over time.
 
 <!--type=misc-->
 
-The other mechanism for providing errors is the "error" event. This is
+The other mechanism for providing errors is the `'error'` event. This is
 typically used by [stream-based][] and [event emitter-based][] APIs, which
 themselves represent a series of asynchronous operations over time (versus a
-single operation that may pass or fail). If no "error" event handler is
+single operation that may pass or fail). If no `'error'` event handler is
 attached to the source of the error, the error will be thrown. At this point,
 it will crash the process as an unhandled exception unless [domains][] are
-employed appropriately or [process.on('uncaughtException')][] has a handler.
+employed appropriately or [`process.on('uncaughtException')`][] has a handler.
 
 ```javascript
 var net = require('net');
 
 var connection = net.connect('localhost');
 
-// adding an "error" event handler to a stream:
+// adding an 'error' event handler to a stream:
 connection.on('error', function(err) {
   // if the connection is reset by the server, or if it can't
   // connect at all, or on any sort of error encountered by
@@ -72,7 +72,7 @@ var EventEmitter = require('events');
 var ee = new EventEmitter();
 
 setImmediate(function() {
-  // this will crash the process because no "error" event
+  // this will crash the process because no 'error' event
   // handler has been added.
   ee.emit('error', new Error('This will crash'));
 });
@@ -154,7 +154,7 @@ errors as well as plain JavaScript errors.
 
 #### new Error(message)
 
-Instantiates a new Error object and sets its `.message` property to the provided
+Instantiates a new `Error` object and sets its `.message` property to the provided
 message. Its `.stack` will represent the point in the program at which `new Error`
 was called. Stack traces are subject to [V8's stack trace API][].
 Stack traces only extend to the beginning of synchronous code execution, *or* a number of frames given by
@@ -279,12 +279,12 @@ The number of frames captured by the stack trace is bounded by the smaller of
 `Error.stackTraceLimit` or the number of available frames on the current event
 loop tick.
 
-System-level errors are generated as augmented Error instances, which are detailed
+System-level errors are generated as augmented `Error` instances, which are detailed
 [below](#errors_system_errors).
 
 ### Class: RangeError
 
-A subclass of Error that indicates that a provided argument was not within the
+A subclass of `Error` that indicates that a provided argument was not within the
 set or range of acceptable values for a function; whether that be a numeric
 range, or outside the set of options for a given function parameter. An example:
 
@@ -292,12 +292,12 @@ range, or outside the set of options for a given function parameter. An example:
 require('net').connect(-1);  // throws RangeError, port should be > 0 && < 65536
 ```
 
-Node.js will generate and throw RangeError instances *immediately* -- they are a form
+Node.js will generate and throw `RangeError` instances *immediately* -- they are a form
 of argument validation.
 
 ### Class: ReferenceError
 
-A subclass of Error that indicates that an attempt is being made to access a variable
+A subclass of `Error` that indicates that an attempt is being made to access a variable
 that is not defined. Most commonly it indicates a typo, or an otherwise broken program.
 While client code may generate and propagate these errors, in practice only V8 will do
 so.
@@ -306,7 +306,7 @@ so.
 doesNotExist; // throws ReferenceError, doesNotExist is not a variable in this program.
 ```
 
-ReferenceError instances will have an `.arguments` member that is an array containing
+`ReferenceError` instances will have an `.arguments` member that is an array containing
 one element -- a string representing the variable that was not defined.
 
 ```javascript
@@ -323,7 +323,7 @@ dependencies.
 
 ### Class: SyntaxError
 
-A subclass of Error that indicates that a program is not valid JavaScript.
+A subclass of `Error` that indicates that a program is not valid JavaScript.
 These errors may only be generated and propagated as a result of code
 evaluation. Code evaluation may happen as a result of `eval`, `Function`,
 `require`, or [vm][]. These errors are almost always indicative of a broken
@@ -342,7 +342,7 @@ by other contexts.
 
 ### Class: TypeError
 
-A subclass of Error that indicates that a provided argument is not an allowable
+A subclass of `Error` that indicates that a provided argument is not an allowable
 type. For example, passing a function to a parameter which expects a string would
 be considered a TypeError.
 
@@ -350,7 +350,7 @@ be considered a TypeError.
 require('url').parse(function() { }); // throws TypeError, since it expected a string
 ```
 
-Node.js will generate and throw TypeError instances *immediately* -- they are a form
+Node.js will generate and throw `TypeError` instances *immediately* -- they are a form
 of argument validation.
 
 ### Exceptions vs. Errors
@@ -373,7 +373,7 @@ react to. They are generated at the syscall level: an exhaustive list of error
 codes and their meanings is available by running `man 2 intro` or `man 3 errno`
 on most Unices; or [online][].
 
-In Node.js, system errors are represented as augmented Error objects -- not full
+In Node.js, system errors are represented as augmented `Error` objects -- not full
 subclasses, but instead an error instance with added members.
 
 ### Class: System Error
@@ -400,7 +400,7 @@ permissions.
 
 #### EADDRINUSE: Address already in use
 
-An attempt to bind a server ([net][], [http][], or [https][]) to a local
+An attempt to bind a server ([`net`][], [`http`][], or [`https`][]) to a local
 address failed due to another server on the local system already occupying
 that address.
 
@@ -414,7 +414,7 @@ on the foreign host.
 
 A connection was forcibly closed by a peer. This normally results
 from a loss of the connection on the remote socket due to a timeout
-or reboot. Commonly encountered via the [http][] and [net][] modules.
+or reboot. Commonly encountered via the [`http`][] and [`net`][] modules.
 
 #### EEXIST: File exists
 
@@ -438,18 +438,18 @@ that will run the Node.js process.
 
 #### ENOENT: No such file or directory
 
-Commonly raised by [fs][] operations; a component of the specified pathname
+Commonly raised by [`fs`][] operations; a component of the specified pathname
 does not exist -- no entity (file or directory) could be found by the given path.
 
 #### ENOTDIR: Not a directory
 
 A component of the given pathname existed, but was not a directory as expected.
-Commonly raised by [fs.readdir][].
+Commonly raised by [`fs.readdir`][].
 
 #### ENOTEMPTY: Directory not empty
 
 A directory with entries was the target of an operation that requires
-an empty directory -- usually [fs.unlink][].
+an empty directory -- usually [`fs.unlink`][].
 
 #### EPERM: Operation not permitted
 
@@ -459,30 +459,32 @@ privileges.
 #### EPIPE: Broken pipe
 
 A write on a pipe, socket, or FIFO for which there is no process to read the
-data. Commonly encountered at the [net][] and [http][] layers, indicative that
+data. Commonly encountered at the [`net`][] and [`http`][] layers, indicative that
 the remote side of the stream being written to has been closed.
 
 #### ETIMEDOUT: Operation timed out
 
 A connect or send request failed because the connected party did not properly
-respond after a period of time. Usually encountered by [http][] or [net][] --
+respond after a period of time. Usually encountered by [`http`][] or [`net`][] --
 often a sign that a connected socket was not `.end()`'d appropriately.
 
-[Error]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error
+[`Error`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error
+[`fs.readdir`]: fs.html#fs_fs_readdir_path_callback
+[`fs.readFileSync`]: fs.html#fs_fs_readfilesync_file_options
+[`fs.unlink`]: fs.html#fs_fs_unlink_path_callback
+[`fs`]: fs.html
+[`http`]: http.html
+[`https`]: https.html
+[`net`]: net.html
+[`process.on('uncaughtException')`]: process.html#process_event_uncaughtexception
+[`try / catch` construct]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/try...catch
+[`try { } catch(err) { }`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/try...catch
 [below]: #errors_error_propagation_and_interception
-[fs.readFileSync]: fs.html#fs_fs_readfilesync_file_options
-[stream-based]: stream.html
-[event emitter-based]: events.html#events_class_events_eventemitter
 [domains]: domain.html
-[process.on('uncaughtException')]: process.html#process_event_uncaughtexception
-[V8's stack trace API]: https://code.google.com/p/v8-wiki/wiki/JavaScriptStackTraceApi
-[vm]: vm.html
+[event emitter-based]: events.html#events_class_events_eventemitter
+[file descriptors]: http://en.wikipedia.org/wiki/File_descriptor
 [online]: http://man7.org/linux/man-pages/man3/errno.3.html
+[stream-based]: stream.html
 [syscall]: http://man7.org/linux/man-pages/man2/syscall.2.html
-[net]: net.html
-[http]: http.html
-[https]: https.html
-[file descriptors]: http://en.wikipedia.org/wiki/File_descriptor
-[fs]: fs.html
-[fs.readdir]: fs.html#fs_fs_readdir_path_callback
-[fs.unlink]: fs.html#fs_fs_unlink_path_callback
+[V8's stack trace API]: https://code.google.com/p/v8-wiki/wiki/JavaScriptStackTraceApi
+[vm]: vm.html
diff --git a/doc/api/fs.markdown b/doc/api/fs.markdown
index 20aef1147f0157..3b1ac6d7412557 100644
--- a/doc/api/fs.markdown
+++ b/doc/api/fs.markdown
@@ -64,7 +64,7 @@ will be relative to `process.cwd()`.
 
 Most fs functions let you omit the callback argument. If you do, a default
 callback is used that rethrows errors. To get a trace to the original call
-site, set the NODE_DEBUG environment variable:
+site, set the `NODE_DEBUG` environment variable:
 
     $ cat script.js
     function bad() {
@@ -94,7 +94,7 @@ Objects returned from `fs.watch()` are of this type.
 * `filename` {String} The filename that changed (if relevant/available)
 
 Emitted when something changes in a watched directory or file.
-See more details in [fs.watch][].
+See more details in [`fs.watch()`][].
 
 ### Event: 'error'
 
@@ -118,18 +118,18 @@ Emitted when the ReadStream's file is opened.
 
 ## Class: fs.Stats
 
-Objects returned from `fs.stat()`, `fs.lstat()` and `fs.fstat()` and their
+Objects returned from [`fs.stat()`][], [`fs.lstat()`][] and [`fs.fstat()`][] and their
 synchronous counterparts are of this type.
 
  - `stats.isFile()`
  - `stats.isDirectory()`
  - `stats.isBlockDevice()`
  - `stats.isCharacterDevice()`
- - `stats.isSymbolicLink()` (only valid with  `fs.lstat()`)
+ - `stats.isSymbolicLink()` (only valid with [`fs.lstat()`][])
  - `stats.isFIFO()`
  - `stats.isSocket()`
 
-For a regular file `util.inspect(stats)` would return a string very
+For a regular file [`util.inspect(stats)`][] would return a string very
 similar to this:
 
     { dev: 2114,
@@ -148,9 +148,9 @@ similar to this:
       birthtime: Mon, 10 Oct 2011 23:24:11 GMT }
 
 Please note that `atime`, `mtime`, `birthtime`, and `ctime` are
-instances of [Date][MDN-Date] object and to compare the values of
+instances of [`Date`][MDN-Date] object and to compare the values of
 these objects you should use appropriate methods. For most general
-uses [getTime()][MDN-Date-getTime] will return the number of
+uses [`getTime()`][MDN-Date-getTime] will return the number of
 milliseconds elapsed since _1 January 1970 00:00:00 UTC_ and this
 integer should be sufficient for any comparison, however there are
 additional methods which can be used for displaying fuzzy information.
@@ -222,7 +222,7 @@ argument will be populated. The following example checks if the file
 
 ## fs.accessSync(path[, mode])
 
-Synchronous version of `fs.access`. This throws if any accessibility checks
+Synchronous version of [`fs.access()`][]. This throws if any accessibility checks
 fail, and does nothing otherwise.
 
 ## fs.appendFile(file, data[, options], callback)
@@ -255,7 +255,7 @@ _Note: Specified file descriptors will not be closed automatically._
 
 ## fs.appendFileSync(file, data[, options])
 
-The synchronous version of `fs.appendFile`. Returns `undefined`.
+The synchronous version of [`fs.appendFile()`][]. Returns `undefined`.
 
 ## fs.chmod(path, mode, callback)
 
@@ -286,7 +286,7 @@ Synchronous close(2). Returns `undefined`.
 
 ## fs.createReadStream(path[, options])
 
-Returns a new ReadStream object (See `Readable Stream`).
+Returns a new [`ReadStream`][] object. (See [Readable Stream][]).
 
 Be aware that, unlike the default value set for `highWaterMark` on a
 readable stream (16 kb), the stream returned by this method has a
@@ -303,12 +303,12 @@ default value of 64 kb for the same parameter.
 
 `options` can include `start` and `end` values to read a range of bytes from
 the file instead of the entire file.  Both `start` and `end` are inclusive and
-start at 0. The `encoding` can be any one of those accepted by [Buffer][].
+start at 0. The `encoding` can be any one of those accepted by [`Buffer`][].
 
 If `fd` is specified, `ReadStream` will ignore the `path` argument and will use
-the specified file descriptor. This means that no `open` event will be emitted.
+the specified file descriptor. This means that no `'open'` event will be emitted.
 Note that `fd` should be blocking; non-blocking `fd`s should be passed to
-`net.Socket`.
+[`net.Socket`][].
 
 If `autoClose` is false, then the file descriptor won't be closed, even if
 there's an error.  It is your responsibility to close it and make sure
@@ -327,7 +327,7 @@ If `options` is a string, then it specifies the encoding.
 
 ## fs.createWriteStream(path[, options])
 
-Returns a new WriteStream object (See `Writable Stream`).
+Returns a new [`WriteStream`][] object. (See [Writable Stream][]).
 
 `options` is an object or string with the following defaults:
 
@@ -339,18 +339,18 @@ Returns a new WriteStream object (See `Writable Stream`).
 `options` may also include a `start` option to allow writing data at
 some position past the beginning of the file.  Modifying a file rather
 than replacing it may require a `flags` mode of `r+` rather than the
-default mode `w`. The `defaultEncoding` can be any one of those accepted by [Buffer][].
+default mode `w`. The `defaultEncoding` can be any one of those accepted by [`Buffer`][].
 
-Like `ReadStream` above, if `fd` is specified, `WriteStream` will ignore the
+Like [`ReadStream`][], if `fd` is specified, `WriteStream` will ignore the
 `path` argument and will use the specified file descriptor. This means that no
-`open` event will be emitted. Note that `fd` should be blocking; non-blocking
-`fd`s should be passed to `net.Socket`.
+`'open'` event will be emitted. Note that `fd` should be blocking; non-blocking
+`fd`s should be passed to [`net.Socket`][].
 
 If `options` is a string, then it specifies the encoding.
 
 ## fs.exists(path, callback)
 
-    Stability: 0 - Deprecated: Use [fs.stat][] or [fs.access][] instead.
+    Stability: 0 - Deprecated: Use [`fs.stat()`][] or [`fs.access()`][] instead.
 
 Test whether or not the given path exists by checking with the file system.
 Then call the `callback` argument with either true or false.  Example:
@@ -367,9 +367,9 @@ non-existent.
 
 ## fs.existsSync(path)
 
-    Stability: 0 - Deprecated: Use [fs.statSync][] or [fs.accessSync][] instead.
+    Stability: 0 - Deprecated: Use [`fs.statSync()`][] or [`fs.accessSync()`][] instead.
 
-Synchronous version of [`fs.exists`][].
+Synchronous version of [`fs.exists()`][].
 Returns `true` if the file exists, `false` otherwise.
 
 ## fs.fchmod(fd, mode, callback)
@@ -393,7 +393,7 @@ Synchronous fchown(2). Returns `undefined`.
 ## fs.fstat(fd, callback)
 
 Asynchronous fstat(2). The callback gets two arguments `(err, stats)` where
-`stats` is a `fs.Stats` object. `fstat()` is identical to `stat()`, except that
+`stats` is a `fs.Stats` object. `fstat()` is identical to [`stat()`][], except that
 the file to be stat-ed is specified by the file descriptor `fd`.
 
 ## fs.fstatSync(fd)
@@ -425,7 +425,7 @@ descriptor.
 
 ## fs.futimesSync(fd, atime, mtime)
 
-Synchronous version of `fs.futimes()`. Returns `undefined`.
+Synchronous version of [`fs.futimes()`][]. Returns `undefined`.
 
 ## fs.lchmod(path, mode, callback)
 
@@ -540,7 +540,7 @@ the end of the file.
 
 ## fs.openSync(path, flags[, mode])
 
-Synchronous version of `fs.open()`. Returns an integer representing the file
+Synchronous version of [`fs.open()`][]. Returns an integer representing the file
 descriptor.
 
 ## fs.read(fd, buffer, offset, length, position, callback)
@@ -599,7 +599,7 @@ _Note: Specified file descriptors will not be closed automatically._
 
 ## fs.readFileSync(file[, options])
 
-Synchronous version of `fs.readFile`. Returns the contents of the `file`.
+Synchronous version of [`fs.readFile`][]. Returns the contents of the `file`.
 
 If the `encoding` option is specified then this function returns a
 string. Otherwise it returns a buffer.
@@ -630,7 +630,7 @@ Example:
 
 ## fs.readSync(fd, buffer, offset, length, position)
 
-Synchronous version of `fs.read`. Returns the number of `bytesRead`.
+Synchronous version of [`fs.read()`][]. Returns the number of `bytesRead`.
 
 ## fs.realpathSync(path[, cache])
 
@@ -657,12 +657,12 @@ Synchronous rmdir(2). Returns `undefined`.
 ## fs.stat(path, callback)
 
 Asynchronous stat(2). The callback gets two arguments `(err, stats)` where
-`stats` is a [fs.Stats][] object.  See the [fs.Stats][] section below for more
+`stats` is a [`fs.Stats`][] object.  See the [`fs.Stats`][] section below for more
 information.
 
 ## fs.statSync(path)
 
-Synchronous stat(2). Returns an instance of `fs.Stats`.
+Synchronous stat(2). Returns an instance of [`fs.Stats`][].
 
 ## fs.symlink(destination, path[, type], callback)
 
@@ -705,8 +705,8 @@ have effectively stopped watching `filename`.
 Calling `fs.unwatchFile()` with a filename that is not being watched is a
 no-op, not an error.
 
-_Note: `fs.watch` is more efficient than `fs.watchFile` and `fs.unwatchFile`.
-`fs.watch` should be used instead of `fs.watchFile` and `fs.unwatchFile`
+_Note: [`fs.watch()`][] is more efficient than `fs.watchFile()` and `fs.unwatchFile()`.
+`fs.watch()` should be used instead of `fs.watchFile()` and `fs.unwatchFile()`
 when possible._
 
 ## fs.utimes(path, atime, mtime, callback)
@@ -716,19 +716,19 @@ Change file timestamps of the file referenced by the supplied path.
 Note: the arguments `atime` and `mtime` of the following related functions does
 follow the below rules:
 
-- If the value is a numberable string like "123456789", the value would get
+- If the value is a numberable string like `'123456789'`, the value would get
   converted to corresponding number.
 - If the value is `NaN` or `Infinity`, the value would get converted to
   `Date.now()`.
 
 ## fs.utimesSync(path, atime, mtime)
 
-Synchronous version of `fs.utimes()`. Returns `undefined`.
+Synchronous version of [`fs.utimes()`][]. Returns `undefined`.
 
 ## fs.watch(filename[, options][, listener])
 
 Watch for changes on `filename`, where `filename` is either a file or a
-directory.  The returned object is a [fs.FSWatcher][].
+directory.  The returned object is a [`fs.FSWatcher`][].
 
 The second argument is optional. The `options` if provided should be an object.
 The supported boolean members are `persistent` and `recursive`. `persistent`
@@ -740,7 +740,7 @@ on supported platforms (See Caveats below).
 The default is `{ persistent: true, recursive: false }`.
 
 The listener callback gets two arguments `(event, filename)`.  `event` is either
-'rename' or 'change', and `filename` is the name of the file which triggered
+`'rename'` or `'change'`, and `filename` is the name of the file which triggered
 the event.
 
 ### Caveats
@@ -822,7 +822,7 @@ _Note: when an `fs.watchFile` operation results in an `ENOENT` error, it will
  of zero. If the file is created later on, the listener will be called again,
  with the latest stat objects. This is a change in functionality since v0.10._
 
-_Note: `fs.watch` is more efficient than `fs.watchFile` and `fs.unwatchFile`.
+_Note: [`fs.watch()`][] is more efficient than `fs.watchFile` and `fs.unwatchFile`.
 `fs.watch` should be used instead of `fs.watchFile` and `fs.unwatchFile`
 when possible._
 
@@ -860,7 +860,7 @@ the current position. See pwrite(2).
 
 The callback will receive the arguments `(err, written, string)` where `written`
 specifies how many _bytes_ the passed string required to be written. Note that
-bytes written is not the same as string characters. See [Buffer.byteLength][].
+bytes written is not the same as string characters. See [`Buffer.byteLength`][].
 
 Unlike when writing `buffer`, the entire string must be written. No substring
 may be specified. This is because the byte offset of the resulting data may not
@@ -911,25 +911,40 @@ _Note: Specified file descriptors will not be closed automatically._
 
 ## fs.writeFileSync(file, data[, options])
 
-The synchronous version of `fs.writeFile`. Returns `undefined`.
+The synchronous version of [`fs.writeFile()`][]. Returns `undefined`.
 
 ## fs.writeSync(fd, buffer, offset, length[, position])
 
 ## fs.writeSync(fd, data[, position[, encoding]])
 
-Synchronous versions of `fs.write()`. Returns the number of bytes written.
-
-[fs.watch]: #fs_fs_watch_filename_options_listener
-[Readable Stream]: stream.html#stream_class_stream_readable
-[MDN-Date]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date
+Synchronous versions of [`fs.write()`][]. Returns the number of bytes written.
+
+[`Buffer.byteLength`]: buffer.html#buffer_class_method_buffer_bytelength_string_encoding
+[`Buffer`]: buffer.html#buffer_buffer
+[`fs.access()`]: #fs_fs_access_path_mode_callback
+[`fs.accessSync()`]: #fs_fs_accesssync_path_mode
+[`fs.appendFile()`]: fs.html#fs_fs_appendfile_file_data_options_callback
+[`fs.exists()`]: fs.html#fs_fs_exists_path_callback
+[`fs.fstat()`]: #fs_fs_fstat_fd_callback
+[`fs.FSWatcher`]: #fs_class_fs_fswatcher
+[`fs.futimes()`]: #fs_fs_futimes_fd_atime_mtime_callback
+[`fs.lstat()`]: #fs_fs_lstat_path_callback
+[`fs.open()`]: #fs_fs_open_path_flags_mode_callback
+[`fs.read()`]: #fs_fs_read_fd_buffer_offset_length_position_callback
+[`fs.readFile`]: #fs_fs_readfile_file_options_callback
+[`fs.stat()`]: #fs_fs_stat_path_callback
+[`fs.Stats`]: #fs_class_fs_stats
+[`fs.statSync()`]: #fs_fs_statsync_path
+[`fs.utimes()`]: #fs_fs_futimes_fd_atime_mtime_callback
+[`fs.watch()`]: #fs_fs_watch_filename_options_listener
+[`fs.write()`]: #fs_fs_write_fd_buffer_offset_length_position_callback
+[`fs.writeFile()`]: #fs_fs_writefile_file_data_options_callback
+[`net.Socket`]: net.html#net_class_net_socket
+[`ReadStream`]: #fs_class_fs_readstream
+[`stat()`]: fs.html#fs_fs_stat_path_callback
+[`util.inspect(stats)`]: util.html#util_util_inspect_object_options
+[`WriteStream`]: #fs_class_fs_writestream
 [MDN-Date-getTime]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date/getTime
+[MDN-Date]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date
+[Readable Stream]: stream.html#stream_class_stream_readable
 [Writable Stream]: stream.html#stream_class_stream_writable
-[fs.stat]: #fs_fs_stat_path_callback
-[`fs.exists`]: fs.html#fs_fs_exists_path_callback
-[fs.access]: #fs_fs_access_path_mode_callback
-[fs.statSync]: #fs_fs_statsync_path
-[fs.accessSync]: #fs_fs_accesssync_path_mode
-[fs.Stats]: #fs_class_fs_stats
-[Buffer]: buffer.html#buffer_buffer
-[fs.FSWatcher]: #fs_class_fs_fswatcher
-[Buffer.byteLength]: buffer.html#buffer_class_method_buffer_bytelength_string_encoding
diff --git a/doc/api/globals.markdown b/doc/api/globals.markdown
index dd675c90664c49..5ac7bd9a0c3aa9 100644
--- a/doc/api/globals.markdown
+++ b/doc/api/globals.markdown
@@ -11,7 +11,7 @@ actually in the global scope but in the module scope - this will be noted.
 
 * {Function}
 
-Used to handle binary data. See the [buffer section][]
+Used to handle binary data. See the [buffer section][].
 
 ## __dirname
 
@@ -48,7 +48,7 @@ Example: running `node example.js` from `/Users/mjr`
 
 ## clearInterval(t)
 
-Stop a timer that was previously created with `setInterval()`. The callback
+Stop a timer that was previously created with [`setInterval()`][]. The callback
 will not execute.
 
 <!--type=global-->
@@ -57,7 +57,7 @@ The timer functions are global variables. See the [timers][] section.
 
 ## clearTimeout(t)
 
-Stop a timer that was previously created with `setTimeout()`. The callback will
+Stop a timer that was previously created with [`setTimeout()`][]. The callback will
 not execute.
 
 ## console
@@ -66,7 +66,7 @@ not execute.
 
 * {Object}
 
-Used to print to stdout and stderr. See the [console][] section.
+Used to print to stdout and stderr. See the [`console`][] section.
 
 ## exports
 
@@ -111,7 +111,7 @@ See the [module system documentation][] for more information.
 
 * {Object}
 
-The process object. See the [process object][] section.
+The process object. See the [`process` object][] section.
 
 ## require()
 
@@ -179,9 +179,11 @@ cannot span more than 24.8 days.
 
 Returns an opaque value that represents the timer.
 
+[`console`]: console.html
+[`process` object]: process.html#process_process
+[`setInterval()`]: #globals_setinterval_cb_ms
+[`setTimeout()`]: #globals_settimeout_cb_ms
 [buffer section]: buffer.html
 [module system documentation]: modules.html
 [Modules]: modules.html#modules_modules
-[process object]: process.html#process_process
-[console]: console.html
 [timers]: timers.html
diff --git a/doc/api/http.markdown b/doc/api/http.markdown
index 154580a8946b2b..091f738be6b2fa 100644
--- a/doc/api/http.markdown
+++ b/doc/api/http.markdown
@@ -25,7 +25,7 @@ HTTP API is very low-level. It deals with stream handling and message
 parsing only. It parses a message into headers and body but it does not
 parse the actual headers or the body.
 
-See [message.headers][] for details on how duplicate headers are handled.
+See [`message.headers`][] for details on how duplicate headers are handled.
 
 The raw headers as they were received are retained in the `rawHeaders`
 property, which is an array of `[key, value, key2, value2, ...]`.  For
@@ -60,7 +60,7 @@ agents when they are no longer in use, so that the Sockets will be shut
 down.
 
 Sockets are removed from the agent's pool when the socket emits either
-a "close" event or a special "agentRemove" event. This means that if
+a `'close'` event or a special `'agentRemove'` event. This means that if
 you intend to keep one HTTP request open for a long time and don't
 want it to stay in the pool you can do something along the lines of:
 
@@ -97,10 +97,10 @@ Alternatively, you could just opt out of pooling entirely using
     in a free state.  Only relevant if `keepAlive` is set to `true`.
     Default = `256`.
 
-The default `http.globalAgent` that is used by `http.request` has all
+The default [`http.globalAgent`][] that is used by [`http.request()`][] has all
 of these values set to their respective defaults.
 
-To configure any of them, you must create your own `Agent` object.
+To configure any of them, you must create your own [`http.Agent`][] object.
 
 ```javascript
 var http = require('http');
@@ -156,7 +156,7 @@ Agent.  Do not modify.
 
 ## Class: http.ClientRequest
 
-This object is created internally and returned from `http.request()`.  It
+This object is created internally and returned from [`http.request()`][].  It
 represents an _in-progress_ request whose header has already been queued.  The
 header is still mutable using the `setHeader(name, value)`, `getHeader(name)`,
 `removeHeader(name)` API.  The actual header will be sent along with the first
@@ -165,7 +165,7 @@ data chunk or when closing the connection.
 To get the response, add a listener for `'response'` to the request object.
 `'response'` will be emitted from the request object when the response
 headers have been received.  The `'response'` event is executed with one
-argument which is an instance of [http.IncomingMessage][].
+argument which is an instance of [`http.IncomingMessage`][].
 
 During the `'response'` event, one can add listeners to the
 response object; particularly to listen for the `'data'` event.
@@ -183,7 +183,7 @@ Note: Node.js does not check whether Content-Length and the length of the body
 which has been transmitted are equal or not.
 
 The request implements the [Writable Stream][] interface. This is an
-[EventEmitter][] with the following events:
+[`EventEmitter`][] with the following events:
 
 ### Event: 'abort'
 
@@ -196,11 +196,11 @@ emitted on the first call to `abort()`.
 
 `function (response, socket, head) { }`
 
-Emitted each time a server responds to a request with a CONNECT method. If this
-event isn't being listened for, clients receiving a CONNECT method will have
+Emitted each time a server responds to a request with a `CONNECT` method. If this
+event isn't being listened for, clients receiving a `CONNECT` method will have
 their connections closed.
 
-A client server pair that show you how to listen for the `connect` event.
+A client server pair that show you how to listen for the `'connect'` event.
 
     var http = require('http');
     var net = require('net');
@@ -268,7 +268,7 @@ the client should send the request body.
 `function (response) { }`
 
 Emitted when a response is received to this request. This event is emitted only
-once. The `response` argument will be an instance of [http.IncomingMessage][].
+once. The `response` argument will be an instance of [`http.IncomingMessage`][].
 
 Options:
 
@@ -290,7 +290,7 @@ Emitted each time a server responds to a request with an upgrade. If this
 event isn't being listened for, clients receiving an upgrade header will have
 their connections closed.
 
-A client server pair that show you how to listen for the `upgrade` event.
+A client server pair that show you how to listen for the `'upgrade'` event.
 
     var http = require('http');
 
@@ -343,7 +343,7 @@ unsent, it will flush them to the stream. If the request is
 chunked, this will send the terminating `'0\r\n\r\n'`.
 
 If `data` is specified, it is equivalent to calling
-`request.write(data, encoding)` followed by `request.end(callback)`.
+[`response.write(data, encoding)`][] followed by `request.end(callback)`.
 
 If `callback` is specified, it will be called when the request stream
 is finished.
@@ -363,17 +363,17 @@ the optimization and kickstart the request.
 ### request.setNoDelay([noDelay])
 
 Once a socket is assigned to this request and is connected
-[socket.setNoDelay()][] will be called.
+[`socket.setNoDelay()`][] will be called.
 
 ### request.setSocketKeepAlive([enable][, initialDelay])
 
 Once a socket is assigned to this request and is connected
-[socket.setKeepAlive()][] will be called.
+[`socket.setKeepAlive()`][] will be called.
 
 ### request.setTimeout(timeout[, callback])
 
 Once a socket is assigned to this request and is connected
-[socket.setTimeout()][] will be called.
+[`socket.setTimeout()`][] will be called.
 
 ### request.write(chunk[, encoding][, callback])
 
@@ -383,7 +383,7 @@ server--in that case it is suggested to use the
 `['Transfer-Encoding', 'chunked']` header line when
 creating the request.
 
-The `chunk` argument should be a [Buffer][] or a string.
+The `chunk` argument should be a [`Buffer`][] or a string.
 
 The `encoding` argument is optional and only applies when `chunk` is a string.
 Defaults to `'utf8'`.
@@ -395,7 +395,7 @@ Returns `request`.
 
 ## Class: http.Server
 
-This is an [EventEmitter][] with the following events:
+This is an [`EventEmitter`][] with the following events:
 
 ### Event: 'checkContinue'
 
@@ -405,21 +405,21 @@ Emitted each time a request with an http Expect: 100-continue is received.
 If this event isn't listened for, the server will automatically respond
 with a 100 Continue as appropriate.
 
-Handling this event involves calling [response.writeContinue()][] if the client
+Handling this event involves calling [`response.writeContinue()`][] if the client
 should continue to send the request body, or generating an appropriate HTTP
 response (e.g., 400 Bad Request) if the client should not continue to send the
 request body.
 
-Note that when this event is emitted and handled, the `request` event will
+Note that when this event is emitted and handled, the `'request'` event will
 not be emitted.
 
 ### Event: 'clientError'
 
 `function (exception, socket) { }`
 
-If a client connection emits an 'error' event, it will be forwarded here.
+If a client connection emits an `'error'` event, it will be forwarded here.
 
-`socket` is the `net.Socket` object that the error originated from.
+`socket` is the [`net.Socket`][] object that the error originated from.
 
 ### Event: 'close'
 
@@ -431,8 +431,8 @@ Emitted when the server closes.
 
 `function (request, socket, head) { }`
 
-Emitted each time a client requests a http CONNECT method. If this event isn't
-listened for, then clients requesting a CONNECT method will have their
+Emitted each time a client requests a http `CONNECT` method. If this event isn't
+listened for, then clients requesting a `CONNECT` method will have their
 connections closed.
 
 * `request` is the arguments for the http request, as it is in the request
@@ -441,7 +441,7 @@ connections closed.
 * `head` is an instance of Buffer, the first packet of the tunneling stream,
   this may be empty.
 
-After this event is emitted, the request's socket will not have a `data`
+After this event is emitted, the request's socket will not have a `'data'`
 event listener, meaning you will need to bind to it in order to handle data
 sent to the server on that socket.
 
@@ -450,8 +450,8 @@ sent to the server on that socket.
 `function (socket) { }`
 
 When a new TCP stream is established. `socket` is an object of type
-`net.Socket`. Usually users will not want to access this event. In
-particular, the socket will not emit `readable` events because of how
+[`net.Socket`][]. Usually users will not want to access this event. In
+particular, the socket will not emit `'readable'` events because of how
 the protocol parser attaches to the socket. The `socket` can also be
 accessed at `request.connection`.
 
@@ -461,8 +461,8 @@ accessed at `request.connection`.
 
 Emitted each time there is a request. Note that there may be multiple requests
 per connection (in the case of keep-alive connections).
- `request` is an instance of [http.IncomingMessage][] and `response` is
-an instance of [http.ServerResponse][].
+ `request` is an instance of [`http.IncomingMessage`][] and `response` is
+an instance of [`http.ServerResponse`][].
 
 ### Event: 'upgrade'
 
@@ -478,13 +478,13 @@ closed.
 * `head` is an instance of Buffer, the first packet of the upgraded stream,
   this may be empty.
 
-After this event is emitted, the request's socket will not have a `data`
+After this event is emitted, the request's socket will not have a `'data'`
 event listener, meaning you will need to bind to it in order to handle data
 sent to the server on that socket.
 
 ### server.close([callback])
 
-Stops the server from accepting new connections.  See [net.Server.close()][].
+Stops the server from accepting new connections.  See [`net.Server.close()`][].
 
 ### server.listen(handle[, callback])
 
@@ -501,14 +501,14 @@ already been bound to a port or domain socket.
 Listening on a file descriptor is not supported on Windows.
 
 This function is asynchronous. The last parameter `callback` will be added as
-a listener for the ['listening'][] event. See also [net.Server.listen()][].
+a listener for the `'listening'` event. See also [`net.Server.listen()`][].
 
 ### server.listen(path[, callback])
 
 Start a UNIX socket server listening for connections on the given `path`.
 
 This function is asynchronous. The last parameter `callback` will be added as
-a listener for the ['listening'][] event.  See also [net.Server.listen(path)][].
+a listener for the `'listening'` event.  See also [`net.Server.listen(path)`][].
 
 ### server.listen(port[, hostname][, backlog][, callback])
 
@@ -525,7 +525,7 @@ The actual length will be determined by your OS through sysctl settings such as
 parameter is 511 (not 512).
 
 This function is asynchronous. The last parameter `callback` will be added as
-a listener for the ['listening'][] event.  See also [net.Server.listen(port)][].
+a listener for the `'listening'` event.  See also [`net.Server.listen(port)`][].
 
 ### server.maxHeadersCount
 
@@ -571,14 +571,14 @@ This object is created internally by a HTTP server--not by the user. It is
 passed as the second parameter to the `'request'` event.
 
 The response implements the [Writable Stream][] interface. This is an
-[EventEmitter][] with the following events:
+[`EventEmitter`][] with the following events:
 
 ### Event: 'close'
 
 `function () { }`
 
 Indicates that the underlying connection was terminated before
-[response.end()][] was called or able to flush.
+[`response.end()`][] was called or able to flush.
 
 ### Event: 'finish'
 
@@ -610,17 +610,16 @@ emit trailers, with a list of the header fields in its value. E.g.,
     response.end();
 
 Attempting to set a trailer field name that contains invalid characters will
-result in a `TypeError` being thrown.
+result in a [`TypeError`][] being thrown.
 
 ### response.end([data][, encoding][, callback])
 
 This method signals to the server that all of the response headers and body
 have been sent; that server should consider this message complete.
-The method, `response.end()`, MUST be called on each
-response.
+The method, `response.end()`, MUST be called on each response.
 
 If `data` is specified, it is equivalent to calling
-`response.write(data, encoding)` followed by `response.end(callback)`.
+[`response.write(data, encoding)`][] followed by `response.end(callback)`.
 
 If `callback` is specified, it will be called when the response stream
 is finished.
@@ -628,7 +627,7 @@ is finished.
 ### response.finished
 
 Boolean value that indicates whether the response has completed. Starts
-as `false`. After `response.end()` executes, the value will be `true`.
+as `false`. After [`response.end()`][] executes, the value will be `true`.
 
 ### response.getHeader(name)
 
@@ -675,7 +674,7 @@ or
     response.setHeader("Set-Cookie", ["type=ninja", "language=javascript"]);
 
 Attempting to set a header field name that contains invalid characters will
-result in a `TypeError` being thrown.
+result in a [`TypeError`][] being thrown.
 
 ### response.setTimeout(msecs, callback)
 
@@ -696,7 +695,7 @@ Returns `response`.
 
 ### response.statusCode
 
-When using implicit headers (not calling [response.writeHead()][] explicitly),
+When using implicit headers (not calling [`response.writeHead()`][] explicitly),
 this property controls the status code that will be sent to the client when
 the headers get flushed.
 
@@ -709,7 +708,7 @@ status code which was sent out.
 
 ### response.statusMessage
 
-When using implicit headers (not calling `response.writeHead()` explicitly), this property
+When using implicit headers (not calling [`response.writeHead()`][] explicitly), this property
 controls the status message that will be sent to the client when the headers get
 flushed. If this is left as `undefined` then the standard message for the status
 code will be used.
@@ -723,7 +722,7 @@ status message which was sent out.
 
 ### response.write(chunk[, encoding][, callback])
 
-If this method is called and [response.writeHead()][] has not been called,
+If this method is called and [`response.writeHead()`][] has not been called,
 it will switch to implicit header mode and flush the implicit headers.
 
 This sends a chunk of the response body. This method may
@@ -737,9 +736,9 @@ will be called when this chunk of data is flushed.
 **Note**: This is the raw HTTP body and has nothing to do with
 higher-level multi-part body encodings that may be used.
 
-The first time `response.write()` is called, it will send the buffered
+The first time [`response.write()`][] is called, it will send the buffered
 header information and the first body to the client. The second time
-`response.write()` is called, Node.js assumes you're going to be streaming
+[`response.write()`][] is called, Node.js assumes you're going to be streaming
 data, and sends that separately. That is, the response is buffered up to the
 first chunk of body.
 
@@ -750,7 +749,7 @@ buffer. Returns `false` if all or part of the data was queued in user memory.
 ### response.writeContinue()
 
 Sends a HTTP/1.1 100 Continue message to the client, indicating that
-the request body should be sent. See the ['checkContinue'][] event on `Server`.
+the request body should be sent. See the [`'checkContinue'`][] event on `Server`.
 
 ### response.writeHead(statusCode[, statusMessage][, headers])
 
@@ -767,9 +766,9 @@ Example:
       'Content-Type': 'text/plain' });
 
 This method must only be called once on a message and it must
-be called before [response.end()][] is called.
+be called before [`response.end()`][] is called.
 
-If you call [response.write()][] or [response.end()][] before calling this, the
+If you call [`response.write()`][] or [`response.end()`][] before calling this, the
 implicit/mutable headers will be calculated and call this function for you.
 
 Note that Content-Length is given in bytes not characters. The above example
@@ -781,8 +780,8 @@ which has been transmitted are equal or not.
 
 ## http.IncomingMessage
 
-An `IncomingMessage` object is created by [http.Server][] or
-[http.ClientRequest][] and passed as the first argument to the `'request'`
+An `IncomingMessage` object is created by [`http.Server`][] or
+[`http.ClientRequest`][] and passed as the first argument to the `'request'`
 and `'response'` event respectively. It may be used to access response status,
 headers and data.
 
@@ -831,7 +830,7 @@ Also `response.httpVersionMajor` is the first integer and
 
 ### message.method
 
-**Only valid for request obtained from [http.Server][].**
+**Only valid for request obtained from [`http.Server`][].**
 
 The request method as a string. Read only. Example:
 `'GET'`, `'DELETE'`.
@@ -861,7 +860,7 @@ Header names are not lowercased, and duplicates are not merged.
 ### message.rawTrailers
 
 The raw request/response trailer keys and values exactly as they were
-received.  Only populated at the 'end' event.
+received.  Only populated at the `'end'` event.
 
 ### message.setTimeout(msecs, callback)
 
@@ -874,30 +873,30 @@ Returns `message`.
 
 ### message.statusCode
 
-**Only valid for response obtained from `http.ClientRequest`.**
+**Only valid for response obtained from [`http.ClientRequest`][].**
 
 The 3-digit HTTP response status code. E.G. `404`.
 
 ### message.statusMessage
 
-**Only valid for response obtained from `http.ClientRequest`.**
+**Only valid for response obtained from [`http.ClientRequest`][].**
 
 ### message.socket
 
-The `net.Socket` object associated with the connection.
+The [`net.Socket`][] object associated with the connection.
 
-With HTTPS support, use [request.socket.getPeerCertificate()][] to obtain the
+With HTTPS support, use [`request.socket.getPeerCertificate()`][] to obtain the
 client's authentication details.
 
 The HTTP response status message (reason phrase). E.G. `OK` or `Internal Server Error`.
 
 ### message.trailers
 
-The request/response trailers object. Only populated at the 'end' event.
+The request/response trailers object. Only populated at the `'end'` event.
 
 ### message.url
 
-**Only valid for request obtained from [http.Server][].**
+**Only valid for request obtained from [`http.Server`][].**
 
 Request URL string. This contains only the URL that is
 present in the actual HTTP request. If the request is:
@@ -945,14 +944,14 @@ Found'`.
 
 ## http.createClient([port][, host])
 
-    Stability: 0 - Deprecated: Use [http.request][] instead.
+    Stability: 0 - Deprecated: Use [`http.request()`][] instead.
 
 Constructs a new HTTP client. `port` and `host` refer to the server to be
 connected to.
 
 ## http.createServer([requestListener])
 
-Returns a new instance of [http.Server][].
+Returns a new instance of [`http.Server`][].
 
 The `requestListener` is a function which is automatically
 added to the `'request'` event.
@@ -960,7 +959,7 @@ added to the `'request'` event.
 ## http.get(options[, callback])
 
 Since most requests are GET requests without bodies, Node.js provides this
-convenience method. The only difference between this method and `http.request()`
+convenience method. The only difference between this method and [`http.request()`][]
 is that it sets the method to GET and calls `req.end()` automatically.
 
 Example:
@@ -982,14 +981,14 @@ Node.js maintains several connections per server to make HTTP requests.
 This function allows one to transparently issue requests.
 
 `options` can be an object or a string. If `options` is a string, it is
-automatically parsed with [url.parse()][].
+automatically parsed with [`url.parse()`][].
 
 Options:
 
 - `protocol`: Protocol to use. Defaults to `'http'`.
 - `host`: A domain name or IP address of the server to issue the request to.
   Defaults to `'localhost'`.
-- `hostname`: Alias for `host`. To support `url.parse()` `hostname` is
+- `hostname`: Alias for `host`. To support [`url.parse()`][] `hostname` is
   preferred over `host`.
 - `family`: IP address family to use when resolving `host` and `hostname`.
   Valid values are `4` or `6`. When unspecified, both IP v4 and v6 will be
@@ -1005,17 +1004,17 @@ Options:
 - `headers`: An object containing request headers.
 - `auth`: Basic authentication i.e. `'user:password'` to compute an
   Authorization header.
-- `agent`: Controls [Agent][] behavior. When an Agent is used request will
+- `agent`: Controls [`Agent`][] behavior. When an Agent is used request will
   default to `Connection: keep-alive`. Possible values:
- - `undefined` (default): use [globalAgent][] for this host and port.
+ - `undefined` (default): use [`http.globalAgent`][] for this host and port.
  - `Agent` object: explicitly use the passed in `Agent`.
  - `false`: opts out of connection pooling with an Agent, defaults request to
    `Connection: close`.
 
 The optional `callback` parameter will be added as a one time listener for
-the ['response'][] event.
+the `'response'` event.
 
-`http.request()` returns an instance of the [http.ClientRequest][]
+`http.request()` returns an instance of the [`http.ClientRequest`][]
 class. The `ClientRequest` instance is a writable stream. If one needs to
 upload a file with a POST request, then write to the `ClientRequest` object.
 
@@ -1073,41 +1072,44 @@ There are a few special headers that should be noted.
 
 * Sending an 'Expect' header will immediately send the request headers.
   Usually, when sending 'Expect: 100-continue', you should both set a timeout
-  and listen for the `continue` event. See RFC2616 Section 8.2.3 for more
+  and listen for the `'continue'` event. See RFC2616 Section 8.2.3 for more
   information.
 
 * Sending an Authorization header will override using the `auth` option
   to compute basic authentication.
 
-[message.headers][]: #http_message_headers
-[constructor options]: #http_new_agent_options
+[`'checkContinue'`]: #http_event_checkcontinue
+[`'listening'`]: net.html#net_event_listening
+[`'response'`]: #http_event_response
+[`Agent`]: #http_class_http_agent
+[`Buffer`]: buffer.html#buffer_buffer
 [`destroy()`]: #http_agent_destroy
-['checkContinue']: #http_event_checkcontinue
-['listening']: net.html#net_event_listening
-['response']: #http_event_response
-[Agent]: #http_class_http_agent
-[Buffer]: buffer.html#buffer_buffer
-[EventEmitter]: events.html#events_class_events_eventemitter
+[`EventEmitter`]: events.html#events_class_events_eventemitter
+[`http.Agent`]: #http_class_http_agent
+[`http.ClientRequest`]: #http_class_http_clientrequest
+[`http.globalAgent`]: #http_http_globalagent
+[`http.IncomingMessage`]: #http_http_incomingmessage
+[`http.request()`]: #http_http_request_options_callback
+[`http.Server`]: #http_class_http_server
+[`http.ServerResponse`]: #http_class_http_serverresponse
+[`message.headers`]: #http_message_headers
+[`net.Server.close()`]: net.html#net_server_close_callback
+[`net.Server.listen()`]: net.html#net_server_listen_handle_callback
+[`net.Server.listen(path)`]: net.html#net_server_listen_path_callback
+[`net.Server.listen(port)`]: net.html#net_server_listen_port_hostname_backlog_callback
+[`net.Socket`]: net.html#net_class_net_socket
+[`request.socket.getPeerCertificate()`]: tls.html#tls_tlssocket_getpeercertificate_detailed
+[`response.end()`]: #http_response_end_data_encoding_callback
+[`response.write()`]: #http_response_write_chunk_encoding_callback
+[`response.write(data, encoding)`]: #http_response_write_chunk_encoding_callback
+[`response.writeContinue()`]: #http_response_writecontinue
+[`response.writeHead()`]: #http_response_writehead_statuscode_statusmessage_headers
+[`socket.setKeepAlive()`]: net.html#net_socket_setkeepalive_enable_initialdelay
+[`socket.setNoDelay()`]: net.html#net_socket_setnodelay_nodelay
+[`socket.setTimeout()`]: net.html#net_socket_settimeout_timeout_callback
+[`stream.setEncoding()`]: stream.html#stream_stream_setencoding_encoding
+[`TypeError`]: errors.html#errors_class_typeerror
+[`url.parse()`]: url.html#url_url_parse_urlstr_parsequerystring_slashesdenotehost
+[constructor options]: #http_new_agent_options
 [Readable Stream]: stream.html#stream_class_stream_readable
 [Writable Stream]: stream.html#stream_class_stream_writable
-[globalAgent]: #http_http_globalagent
-[http.ClientRequest]: #http_class_http_clientrequest
-[http.IncomingMessage]: #http_http_incomingmessage
-[http.ServerResponse]: #http_class_http_serverresponse
-[http.Server]: #http_class_http_server
-[http.request]: #http_http_request_options_callback
-[net.Server.close()]: net.html#net_server_close_callback
-['listening']: net.html#net_event_listening
-[net.Server.listen(path)]: net.html#net_server_listen_path_callback
-[net.Server.listen(port)]: net.html#net_server_listen_port_hostname_backlog_callback
-[net.Server.listen()]: net.html#net_server_listen_handle_callback
-[response.end()]: #http_response_end_data_encoding_callback
-[response.write()]: #http_response_write_chunk_encoding_callback
-[response.writeContinue()]: #http_response_writecontinue
-[response.writeHead()]: #http_response_writehead_statuscode_statusmessage_headers
-[socket.setKeepAlive()]: net.html#net_socket_setkeepalive_enable_initialdelay
-[socket.setNoDelay()]: net.html#net_socket_setnodelay_nodelay
-[socket.setTimeout()]: net.html#net_socket_settimeout_timeout_callback
-[request.socket.getPeerCertificate()]: tls.html#tls_tlssocket_getpeercertificate_detailed
-[stream.setEncoding()]: stream.html#stream_stream_setencoding_encoding
-[url.parse()]: url.html#url_url_parse_urlstr_parsequerystring_slashesdenotehost
diff --git a/doc/api/https.markdown b/doc/api/https.markdown
index 8a916311fc664f..6b688668f7f47e 100644
--- a/doc/api/https.markdown
+++ b/doc/api/https.markdown
@@ -7,26 +7,26 @@ separate module.
 
 ## Class: https.Agent
 
-An Agent object for HTTPS similar to [http.Agent][].  See [https.request()][]
+An Agent object for HTTPS similar to [`http.Agent`][].  See [`https.request()`][]
 for more information.
 
 ## Class: https.Server
 
 This class is a subclass of `tls.Server` and emits events same as
-`http.Server`. See `http.Server` for more information.
+[`http.Server`][]. See [`http.Server`][] for more information.
 
 ### server.setTimeout(msecs, callback)
 
-See [http.Server#setTimeout()][].
+See [`http.Server#setTimeout()`][].
 
 ### server.timeout
 
-See [http.Server#timeout][].
+See [`http.Server#timeout`][].
 
 ## https.createServer(options[, requestListener])
 
 Returns a new HTTPS web server object. The `options` is similar to
-[tls.createServer()][].  The `requestListener` is a function which is
+[`tls.createServer()`][].  The `requestListener` is a function which is
 automatically added to the `'request'` event.
 
 Example:
@@ -61,20 +61,20 @@ Or
 
 ### server.close([callback])
 
-See [http.close()][] for details.
+See [`http.close()`][] for details.
 
 ### server.listen(handle[, callback])
 ### server.listen(path[, callback])
 ### server.listen(port[, host][, backlog][, callback])
 
-See [http.listen()][] for details.
+See [`http.listen()`][] for details.
 
 ## https.get(options, callback)
 
-Like `http.get()` but for HTTPS.
+Like [`http.get()`][] but for HTTPS.
 
 `options` can be an object or a string. If `options` is a string, it is
-automatically parsed with [url.parse()][].
+automatically parsed with [`url.parse()`][].
 
 Example:
 
@@ -94,16 +94,16 @@ Example:
 
 ## https.globalAgent
 
-Global instance of [https.Agent][] for all HTTPS client requests.
+Global instance of [`https.Agent`][] for all HTTPS client requests.
 
 ## https.request(options, callback)
 
 Makes a request to a secure web server.
 
 `options` can be an object or a string. If `options` is a string, it is
-automatically parsed with [url.parse()][].
+automatically parsed with [`url.parse()`][].
 
-All options from [http.request()][] are valid.
+All options from [`http.request()`][] are valid.
 
 Example:
 
@@ -150,15 +150,15 @@ The options argument has the following options
 - `headers`: An object containing request headers.
 - `auth`: Basic authentication i.e. `'user:password'` to compute an
   Authorization header.
-- `agent`: Controls [Agent][] behavior. When an Agent is used request will
+- `agent`: Controls [`Agent`][] behavior. When an Agent is used request will
   default to `Connection: keep-alive`. Possible values:
- - `undefined` (default): use [globalAgent][] for this host and port.
+ - `undefined` (default): use [`globalAgent`][] for this host and port.
  - `Agent` object: explicitly use the passed in `Agent`.
  - `false`: opts out of connection pooling with an Agent, defaults request to
    `Connection: close`.
 
-The following options from [tls.connect()][] can also be specified. However, a
-[globalAgent][] silently ignores these.
+The following options from [`tls.connect()`][] can also be specified. However, a
+[`globalAgent`][] silently ignores these.
 
 - `pfx`: Certificate, Private key and CA certificates to use for SSL. Default `null`.
 - `key`: Private key to use for SSL. Default `null`.
@@ -175,9 +175,9 @@ The following options from [tls.connect()][] can also be specified. However, a
   request is sent. Default `true`.
 - `secureProtocol`: The SSL method to use, e.g. `SSLv3_method` to force
   SSL version 3. The possible values depend on your installation of
-  OpenSSL and are defined in the constant [SSL_METHODS][].
+  OpenSSL and are defined in the constant [`SSL_METHODS`][].
 
-In order to specify these options, use a custom `Agent`.
+In order to specify these options, use a custom [`Agent`][].
 
 Example:
 
@@ -213,17 +213,19 @@ Example:
       ...
     }
 
-[http.Server#setTimeout()]: http.html#http_server_settimeout_msecs_callback
-[http.Server#timeout]: http.html#http_server_timeout
-[Agent]: #https_class_https_agent
-[globalAgent]: #https_https_globalagent
-[http.listen()]: http.html#http_server_listen_port_hostname_backlog_callback
-[url.parse()]: url.html#url_url_parse_urlstr_parsequerystring_slashesdenotehost
-[http.close()]: http.html#http_server_close_callback
-[http.Agent]: http.html#http_class_http_agent
-[http.request()]: http.html#http_http_request_options_callback
-[https.Agent]: #https_class_https_agent
-[https.request()]: #https_https_request_options_callback
-[tls.connect()]: tls.html#tls_tls_connect_options_callback
-[tls.createServer()]: tls.html#tls_tls_createserver_options_secureconnectionlistener
-[SSL_METHODS]: http://www.openssl.org/docs/ssl/ssl.html#DEALING_WITH_PROTOCOL_METHODS
+[`Agent`]: #https_class_https_agent
+[`globalAgent`]: #https_https_globalagent
+[`http.Agent`]: http.html#http_class_http_agent
+[`http.close()`]: http.html#http_server_close_callback
+[`http.get()`]: http.html#http_http_get_options_callback
+[`http.listen()`]: http.html#http_server_listen_port_hostname_backlog_callback
+[`http.request()`]: http.html#http_http_request_options_callback
+[`http.Server#setTimeout()`]: http.html#http_server_settimeout_msecs_callback
+[`http.Server#timeout`]: http.html#http_server_timeout
+[`http.Server`]: http.html#http_class_http_server
+[`https.Agent`]: #https_class_https_agent
+[`https.request()`]: #https_https_request_options_callback
+[`SSL_METHODS`]: http://www.openssl.org/docs/ssl/ssl.html#DEALING_WITH_PROTOCOL_METHODS
+[`tls.connect()`]: tls.html#tls_tls_connect_options_callback
+[`tls.createServer()`]: tls.html#tls_tls_createserver_options_secureconnectionlistener
+[`url.parse()`]: url.html#url_url_parse_urlstr_parsequerystring_slashesdenotehost
diff --git a/doc/api/modules.markdown b/doc/api/modules.markdown
index ceab37d536ca3a..00c1c77915c93f 100644
--- a/doc/api/modules.markdown
+++ b/doc/api/modules.markdown
@@ -299,7 +299,7 @@ A required module prefixed with `'./'` is relative to the file calling
 Without a leading '/', './', or '../' to indicate a file, the module must
 either be a core module or is loaded from a `node_modules` folder.
 
-If the given path does not exist, `require()` will throw an Error with its
+If the given path does not exist, `require()` will throw an [`Error`][] with its
 `code` property set to `'MODULE_NOT_FOUND'`.
 
 ## Folders as Modules
@@ -519,4 +519,5 @@ object.  Since `require()` returns the `module.exports`, and the `module` is
 typically *only* available within a specific module's code, it must be
 explicitly exported in order to be used.
 
-[module resolution]: https://nodejs.org/api/modules.html#modules_all_together
+[`Error`]: errors.html#errors_class_error
+[module resolution]: #modules_all_together
diff --git a/doc/api/net.markdown b/doc/api/net.markdown
index 0a44c6535b3dec..85bf6a7497d81c 100644
--- a/doc/api/net.markdown
+++ b/doc/api/net.markdown
@@ -10,7 +10,7 @@ this module with `require('net');`.
 
 This class is used to create a TCP or local server.
 
-`net.Server` is an [EventEmitter][] with the following events:
+`net.Server` is an [`EventEmitter`][] with the following events:
 
 ### Event: 'close'
 
@@ -28,7 +28,7 @@ Emitted when a new connection is made. `socket` is an instance of
 
 * {Error Object}
 
-Emitted when an error occurs.  The ['close'][] event will be called directly
+Emitted when an error occurs.  The [`'close'`][] event will be called directly
 following this event.  See example in discussion of `server.listen`.
 
 ### Event: 'listening'
@@ -61,19 +61,19 @@ Don't call `server.address()` until the `'listening'` event has been emitted.
 
 Stops the server from accepting new connections and keeps existing
 connections. This function is asynchronous, the server is finally
-closed when all connections are ended and the server emits a ['close'][] event.
+closed when all connections are ended and the server emits a [`'close'`][] event.
 The optional `callback` will be called once the `'close'` event occurs. Unlike
 that event, it will be called with an Error as its only argument if the server
 was not open when it was closed.
 
 ### server.connections
 
-    Stability: 0 - Deprecated: Use [server.getConnections][] instead.
+    Stability: 0 - Deprecated: Use [`server.getConnections`][] instead.
 
 The number of concurrent connections on the server.
 
 This becomes `null` when sending a socket to a child with
-`child_process.fork()`. To poll forks and get current number of active
+[`child_process.fork()`][]. To poll forks and get current number of active
 connections use asynchronous `server.getConnections` instead.
 
 ### server.getConnections(callback)
@@ -98,9 +98,9 @@ already been bound to a port or domain socket.
 Listening on a file descriptor is not supported on Windows.
 
 This function is asynchronous.  When the server has been bound,
-['listening'][] event will be emitted.
+[`'listening'`][] event will be emitted.
 The last parameter `callback` will be added as a listener for the
-['listening'][] event.
+[`'listening'`][] event.
 
 ### server.listen(options[, callback])
 
@@ -138,8 +138,8 @@ shown below.
 Start a local socket server listening for connections on the given `path`.
 
 This function is asynchronous.  When the server has been bound,
-['listening'][] event will be emitted.  The last parameter `callback`
-will be added as a listener for the ['listening'][] event.
+[`'listening'`][] event will be emitted.  The last parameter `callback`
+will be added as a listener for the [`'listening'`][] event.
 
 On UNIX, the local domain is usually known as the UNIX domain. The path is a
 filesystem path name. It is subject to the same naming conventions and
@@ -170,8 +170,8 @@ The actual length will be determined by your OS through sysctl settings such as
 parameter is 511 (not 512).
 
 This function is asynchronous.  When the server has been bound,
-['listening'][] event will be emitted.  The last parameter `callback`
-will be added as a listener for the ['listening'][] event.
+[`'listening'`][] event will be emitted.  The last parameter `callback`
+will be added as a listener for the [`'listening'`][] event.
 
 One issue some users run into is getting `EADDRINUSE` errors. This means that
 another server is already running on the requested port. One way of handling this
@@ -195,7 +195,7 @@ Set this property to reject connections when the server's connection count gets
 high.
 
 It is not recommended to use this option once a socket has been sent to a child
-with `child_process.fork()`.
+with [`child_process.fork()`][].
 
 ### server.ref()
 
@@ -217,7 +217,7 @@ Returns `server`.
 
 This object is an abstraction of a TCP or local socket.  `net.Socket`
 instances implement a duplex Stream interface.  They can be created by the
-user and used as a client (with `connect()`) or they can be created by Node.js
+user and used as a client (with [`connect()`][]) or they can be created by Node.js
 and passed to the user through the `'connection'` event of a server.
 
 ### new net.Socket([options])
@@ -237,7 +237,7 @@ Set `readable` and/or `writable` to `true` to allow reads and/or writes on this
 socket (NOTE: Works only when `fd` is passed).
 About `allowHalfOpen`, refer to `createServer()` and `'end'` event.
 
-`net.Socket` instances are [EventEmitter][] with the following events:
+`net.Socket` instances are [`EventEmitter`][] with the following events:
 
 ### Event: 'close'
 
@@ -249,7 +249,7 @@ which says if the socket was closed due to a transmission error.
 ### Event: 'connect'
 
 Emitted when a socket connection is successfully established.
-See `connect()`.
+See [`connect()`][].
 
 ### Event: 'data'
 
@@ -290,16 +290,16 @@ following this event.
 Emitted after resolving the hostname but before connecting.
 Not applicable to UNIX sockets.
 
-* `err` {Error | Null} The error object.  See [dns.lookup()][].
+* `err` {Error | Null} The error object.  See [`dns.lookup()`][].
 * `address` {String} The IP address.
-* `family` {String | Null} The address type.  See [dns.lookup()][].
+* `family` {String | Null} The address type.  See [`dns.lookup()`][].
 
 ### Event: 'timeout'
 
 Emitted if the socket times out from inactivity. This is only to notify that
 the socket has been idle. The user must manually close the connection.
 
-See also: `socket.setTimeout()`
+See also: [`socket.setTimeout()`][]
 
 ### socket.address()
 
@@ -324,7 +324,7 @@ written, but the buffer may contain strings, and the strings are lazily
 encoded, so the exact number of bytes is not known.)
 
 Users who experience large or growing `bufferSize` should attempt to
-"throttle" the data flows in their program with `pause()` and `resume()`.
+"throttle" the data flows in their program with [`pause()`][] and [`resume()`][].
 
 ### socket.bytesRead
 
@@ -360,17 +360,17 @@ specifies:
 Normally this method is not needed, as `net.createConnection` opens the
 socket. Use this only if you are implementing a custom Socket.
 
-This function is asynchronous. When the ['connect'][] event is emitted the
+This function is asynchronous. When the [`'connect'`][] event is emitted the
 socket is established. If there is a problem connecting, the `'connect'` event
-will not be emitted, the `'error'` event will be emitted with the exception.
+will not be emitted, the [`'error'`][] event will be emitted with the exception.
 
 The `connectListener` parameter will be added as a listener for the
-['connect'][] event.
+[`'connect'`][] event.
 
 ### socket.connect(path[, connectListener])
 ### socket.connect(port[, host][, connectListener])
 
-As [socket.connect(options[, connectListener])](#net_socket_connect_options_connectlistener),
+As [`socket.connect(options\[, connectListener\])`][],
 with options either as either `{port: port, host: host}` or `{path: path}`.
 
 ### socket.destroy()
@@ -399,7 +399,7 @@ The numeric representation of the local port. For example,
 
 ### socket.pause()
 
-Pauses the reading of data. That is, `'data'` events will not be emitted.
+Pauses the reading of data. That is, [`'data'`][] events will not be emitted.
 Useful to throttle back an upload.
 
 ### socket.ref()
@@ -426,12 +426,12 @@ The numeric representation of the remote port. For example,
 
 ### socket.resume()
 
-Resumes reading after a call to `pause()`.
+Resumes reading after a call to [`pause()`][].
 
 ### socket.setEncoding([encoding])
 
-Set the encoding for the socket as a Readable Stream. See
-[stream.setEncoding()][] for more information.
+Set the encoding for the socket as a [Readable Stream][]. See
+[`stream.setEncoding()`][] for more information.
 
 ### socket.setKeepAlive([enable][, initialDelay])
 
@@ -460,14 +460,14 @@ Returns `socket`.
 Sets the socket to timeout after `timeout` milliseconds of inactivity on
 the socket. By default `net.Socket` do not have a timeout.
 
-When an idle timeout is triggered the socket will receive a `'timeout'`
-event but the connection will not be severed. The user must manually `end()`
-or `destroy()` the socket.
+When an idle timeout is triggered the socket will receive a [`'timeout'`][]
+event but the connection will not be severed. The user must manually [`end()`][]
+or [`destroy()`][] the socket.
 
 If `timeout` is 0, then the existing idle timeout is disabled.
 
 The optional `callback` parameter will be added as a one time listener for the
-`'timeout'` event.
+[`'timeout'`][] event.
 
 Returns `socket`.
 
@@ -486,21 +486,21 @@ case of a string--it defaults to UTF8 encoding.
 
 Returns `true` if the entire data was flushed successfully to the kernel
 buffer. Returns `false` if all or part of the data was queued in user memory.
-`'drain'` will be emitted when the buffer is again free.
+[`'drain'`][] will be emitted when the buffer is again free.
 
 The optional `callback` parameter will be executed when the data is finally
 written out - this may not be immediately.
 
 ## net.connect(options[, connectListener])
 
-A factory function, which returns a new ['net.Socket'][] and automatically
+A factory function, which returns a new [`net.Socket`][] and automatically
 connects with the supplied `options`.
 
-The options are passed to both the ['net.Socket'][] constructor and the
-['socket.connect'][] method.
+The options are passed to both the [`net.Socket`][] constructor and the
+[`socket.connect`][] method.
 
 The `connectListener` parameter will be added as a listener for the
-['connect'][] event once.
+[`'connect'`][] event once.
 
 Here is an example of a client of the previously described echo server:
 
@@ -525,32 +525,32 @@ changed to
 
 ## net.connect(path[, connectListener])
 
-A factory function, which returns a new unix ['net.Socket'][] and automatically
+A factory function, which returns a new unix [`net.Socket`][] and automatically
 connects to the supplied `path`.
 
 The `connectListener` parameter will be added as a listener for the
-['connect'][] event once.
+[`'connect'`][] event once.
 
 ## net.connect(port[, host][, connectListener])
 
-A factory function, which returns a new ['net.Socket'][] and automatically
+A factory function, which returns a new [`net.Socket`][] and automatically
 connects to the supplied `port` and `host`.
 
 If `host` is omitted, `'localhost'` will be assumed.
 
 The `connectListener` parameter will be added as a listener for the
-['connect'][] event once.
+[`'connect'`][] event once.
 
 ## net.createConnection(options[, connectListener])
 
-A factory function, which returns a new ['net.Socket'][] and automatically
+A factory function, which returns a new [`net.Socket`][] and automatically
 connects with the supplied `options`.
 
-The options are passed to both the ['net.Socket'][] constructor and the
-['socket.connect'][] method.
+The options are passed to both the [`net.Socket`][] constructor and the
+[`socket.connect`][] method.
 
 The `connectListener` parameter will be added as a listener for the
-['connect'][] event once.
+[`'connect'`][] event once.
 
 Here is an example of a client of the previously described echo server:
 
@@ -575,26 +575,26 @@ changed to
 
 ## net.createConnection(path[, connectListener])
 
-A factory function, which returns a new unix ['net.Socket'][] and automatically
+A factory function, which returns a new unix [`net.Socket`][] and automatically
 connects to the supplied `path`.
 
 The `connectListener` parameter will be added as a listener for the
-['connect'][] event once.
+[`'connect'`][] event once.
 
 ## net.createConnection(port[, host][, connectListener])
 
-A factory function, which returns a new ['net.Socket'][] and automatically
+A factory function, which returns a new [`net.Socket`][] and automatically
 connects to the supplied `port` and `host`.
 
 If `host` is omitted, `'localhost'` will be assumed.
 
 The `connectListener` parameter will be added as a listener for the
-['connect'][] event once.
+[`'connect'`][] event once.
 
 ## net.createServer([options][, connectionListener])
 
 Creates a new server. The `connectionListener` argument is
-automatically set as a listener for the ['connection'][] event.
+automatically set as a listener for the [`'connection'`][] event.
 
 `options` is an object with the following defaults:
 
@@ -605,13 +605,13 @@ automatically set as a listener for the ['connection'][] event.
 
 If `allowHalfOpen` is `true`, then the socket won't automatically send a FIN
 packet when the other end of the socket sends a FIN packet. The socket becomes
-non-readable, but still writable. You should call the `end()` method explicitly.
-See ['end'][] event for more information.
+non-readable, but still writable. You should call the [`end()`][] method explicitly.
+See [`'end'`][] event for more information.
 
 If `pauseOnConnect` is `true`, then the socket associated with each incoming
 connection will be paused, and no data will be read from its handle. This allows
 connections to be passed between processes without any data being read by the
-original process. To begin reading data from a paused socket, call `resume()`.
+original process. To begin reading data from a paused socket, call [`resume()`][].
 
 Here is an example of an echo server which listens for connections
 on port 8124:
@@ -657,15 +657,27 @@ Returns true if input is a version 4 IP address, otherwise returns false.
 
 Returns true if input is a version 6 IP address, otherwise returns false.
 
-['close']: #net_event_close
-['connect']: #net_event_connect
-['connection']: #net_event_connection
-['end']: #net_event_end
-[EventEmitter]: events.html#events_class_events_eventemitter
-['listening']: #net_event_listening
-[server.getConnections]: #net_server_getconnections_callback
+[`'close'`]: #net_event_close
+[`'connect'`]: #net_event_connect
+[`'connection'`]: #net_event_connection
+[`'data'`]: #net_event_data
+[`'drain'`]: #net_event_drain
+[`'end'`]: #net_event_end
+[`'error'`]: #net_event_error_1
+[`'listening'`]: #net_event_listening
+[`'timeout'`]: #net_event_timeout
+[`child_process.fork()`]: child_process.html#child_process_child_process_fork_modulepath_args_options
+[`connect()`]: #net_socket_connect_options_connectlistener
+[`destroy()`]: #net_socket_destroy
+[`dns.lookup()`]: dns.html#dns_dns_lookup_hostname_options_callback
+[`end()`]: #net_socket_end_data_encoding
+[`EventEmitter`]: events.html#events_class_events_eventemitter
+[`net.Socket`]: #net_class_net_socket
+[`pause()`]: #net_socket_pause
+[`resume()`]: #net_socket_resume
+[`server.getConnections`]: #net_server_getconnections_callback
+[`socket.connect(options\[, connectListener\])`]: #net_socket_connect_options_connectlistener
+[`socket.connect`]: #net_socket_connect_options_connectlistener
+[`socket.setTimeout()`]: #net_socket_settimeout_timeout_callback
+[`stream.setEncoding()`]: stream.html#stream_readable_setencoding_encoding
 [Readable Stream]: stream.html#stream_class_stream_readable
-[stream.setEncoding()]: stream.html#stream_readable_setencoding_encoding
-['net.Socket']: #net_class_net_socket
-[dns.lookup()]: dns.html#dns_dns_lookup_hostname_options_callback
-['socket.connect']: #net_socket_connect_options_connectlistener
diff --git a/doc/api/process.markdown b/doc/api/process.markdown
index 7e70a79151083e..73724b39b96ff2 100644
--- a/doc/api/process.markdown
+++ b/doc/api/process.markdown
@@ -3,22 +3,22 @@
 <!-- type=global -->
 
 The `process` object is a global object and can be accessed from anywhere.
-It is an instance of [EventEmitter][].
+It is an instance of [`EventEmitter`][].
 
 ## Event: 'beforeExit'
 
 This event is emitted when Node.js empties its event loop and has nothing else to
 schedule. Normally, Node.js exits when there is no work scheduled, but a listener
-for 'beforeExit' can make asynchronous calls, and cause Node.js to continue.
+for `'beforeExit'` can make asynchronous calls, and cause Node.js to continue.
 
-'beforeExit' is not emitted for conditions causing explicit termination, such as
-`process.exit()` or uncaught exceptions, and should not be used as an
-alternative to the 'exit' event unless the intention is to schedule more work.
+`'beforeExit'` is not emitted for conditions causing explicit termination, such as
+[`process.exit()`][] or uncaught exceptions, and should not be used as an
+alternative to the `'exit'` event unless the intention is to schedule more work.
 
 ## Event: 'exit'
 
 Emitted when the process is about to exit. There is no way to prevent the
-exiting of the event loop at this point, and once all `exit` listeners have
+exiting of the event loop at this point, and once all `'exit'` listeners have
 finished running the process will exit. Therefore you **must** only perform
 **synchronous** operations in this handler. This is a good hook to perform
 checks on the module's state (like for unit tests). The callback takes one
@@ -27,7 +27,7 @@ argument, the code the process is exiting with.
 This event is only emitted when Node.js exits explicitly by process.exit() or
 implicitly by the event loop draining.
 
-Example of listening for `exit`:
+Example of listening for `'exit'`:
 
     process.on('exit', function(code) {
       // do *NOT* do this
@@ -40,10 +40,10 @@ Example of listening for `exit`:
 ## Event: 'message'
 
 * `message` {Object} a parsed JSON object or primitive value
-* `sendHandle` {Handle object} a [net.Socket][] or [net.Server][] object, or
+* `sendHandle` {Handle object} a [`net.Socket`][] or [`net.Server`][] object, or
   undefined.
 
-Messages sent by [ChildProcess.send()][] are obtained using the `'message'`
+Messages sent by [`ChildProcess.send()`][] are obtained using the `'message'`
 event on the child's process object.
 
 ## Event: 'rejectionHandled'
@@ -63,9 +63,9 @@ event loop turn it takes for the `'unhandledRejection'` event to be emitted.
 Another way of stating this is that, unlike in synchronous code where there is
 an ever-growing list of unhandled exceptions, with promises there is a
 growing-and-shrinking list of unhandled rejections. In synchronous code, the
-'uncaughtException' event tells you when the list of unhandled exceptions
+`'uncaughtException'` event tells you when the list of unhandled exceptions
 grows. And in asynchronous code, the `'unhandledRejection'` event tells you
-when the list of unhandled rejections grows, while the 'rejectionHandled'
+when the list of unhandled rejections grows, while the `'rejectionHandled'`
 event tells you when the list of unhandled rejections shrinks.
 
 For example using the rejection detection hooks in order to keep a map of all
@@ -91,7 +91,7 @@ Emitted when an exception bubbles all the way back to the event loop. If a
 listener is added for this exception, the default action (which is to print
 a stack trace and exit) will not occur.
 
-Example of listening for `uncaughtException`:
+Example of listening for `'uncaughtException'`:
 
     process.on('uncaughtException', function(err) {
       console.log('Caught exception: ' + err);
@@ -105,7 +105,7 @@ Example of listening for `uncaughtException`:
     nonexistentFunc();
     console.log('This will not run.');
 
-Note that `uncaughtException` is a very crude mechanism for exception
+Note that `'uncaughtException'` is a very crude mechanism for exception
 handling.
 
 Do *not* use it as the Node.js equivalent of `On Error Resume Next`. An
@@ -115,9 +115,9 @@ is in an undefined state. Blindly resuming means *anything* could happen.
 Think of resuming as pulling the power cord when you are upgrading your system.
 Nine out of ten times nothing happens - but the 10th time, your system is bust.
 
-`uncaughtException` should be used to perform synchronous cleanup before
+`'uncaughtException'` should be used to perform synchronous cleanup before
 shutting down the process. It is not safe to resume normal operation after
-`uncaughtException`. If you do use it, restart your application after every
+`'uncaughtException'`. If you do use it, restart your application after every
 unhandled exception!
 
 You have been warned.
@@ -127,12 +127,12 @@ You have been warned.
 Emitted whenever a `Promise` is rejected and no error handler is attached to
 the promise within a turn of the event loop. When programming with promises
 exceptions are encapsulated as rejected promises. Such promises can be caught
-and handled using `promise.catch(...)` and rejections are propagated through
+and handled using [`promise.catch(...)`][] and rejections are propagated through
 a promise chain. This event is useful for detecting and keeping track of
 promises that were rejected whose rejections were not handled yet. This event
 is emitted with the following arguments:
 
- - `reason` the object with which the promise was rejected (usually an `Error`
+ - `reason` the object with which the promise was rejected (usually an [`Error`][]
 instance).
  - `p` the promise that was rejected.
 
@@ -175,7 +175,7 @@ operations are pending.  The following status codes are used in other
 cases:
 
 * `1` **Uncaught Fatal Exception** - There was an uncaught exception,
-  and it was not handled by a domain or an `uncaughtException` event
+  and it was not handled by a domain or an `'uncaughtException'` event
   handler.
 * `2` - Unused (reserved by Bash for builtin misuse)
 * `3` **Internal JavaScript Parse Error** - The JavaScript source code
@@ -219,7 +219,7 @@ cases:
 <!--name=SIGINT, SIGHUP, etc.-->
 
 Emitted when the processes receives a signal. See sigaction(2) for a list of
-standard POSIX signal names such as SIGINT, SIGHUP, etc.
+standard POSIX signal names such as `SIGINT`, `SIGHUP`, etc.
 
 Example of listening for `SIGINT`:
 
@@ -315,7 +315,7 @@ Changes the current working directory of the process or throws an exception if t
 
 An Object containing the JavaScript representation of the configure options
 that were used to compile the current Node.js executable. This is the same as
-the "config.gypi" file that was produced when running the `./configure` script.
+the `config.gypi` file that was produced when running the `./configure` script.
 
 An example of the possible output looks like:
 
@@ -350,14 +350,14 @@ If `process.connected` is false, it is no longer possible to send messages.
 
 Returns the current working directory of the process.
 
-   console.log('Current directory: ' + process.cwd());
+    console.log('Current directory: ' + process.cwd());
 
 ## process.disconnect()
 
 Close the IPC channel to the parent process, allowing this child to exit
 gracefully once there are no other connections keeping it alive.
 
-Identical to the parent process's [ChildProcess.disconnect()][].
+Identical to the parent process's [`ChildProcess.disconnect()`][].
 
 If Node.js was not spawned with an IPC channel, `process.disconnect()` will be
 undefined.
@@ -434,7 +434,7 @@ The shell that executed Node.js should see the exit code as 1.
 ## process.exitCode
 
 A number which will be the process exit code, when the process either
-exits gracefully, or is exited via `process.exit()` without specifying
+exits gracefully, or is exited via [`process.exit()`][] without specifying
 a code.
 
 Specifying a code to `process.exit(code)` will override any previous
@@ -527,7 +527,7 @@ Android)
 
 Reads /etc/group and initializes the group access list, using all groups of
 which the user is a member. This is a privileged operation, meaning you need
-to be root or have the CAP_SETGID capability.
+to be root or have the `CAP_SETGID` capability.
 
 `user` is a user name or user ID. `extra_group` is a group name or group ID.
 
@@ -543,7 +543,7 @@ Some care needs to be taken when dropping privileges. Example:
 
 Send a signal to a process. `pid` is the process id and `signal` is the
 string describing the signal to send.  Signal names are strings like
-'SIGINT' or 'SIGHUP'.  If omitted, the signal will be 'SIGTERM'.
+`SIGINT` or `SIGHUP`.  If omitted, the signal will be `SIGTERM`.
 See [Signal Events][] and kill(2) for more information.
 
 Will throw an error if target does not exist, and as a special case, a signal
@@ -604,7 +604,7 @@ This will generate:
 Once the current event loop turn runs to completion, call the callback
 function.
 
-This is *not* a simple alias to `setTimeout(fn, 0)`, it's much more
+This is *not* a simple alias to [`setTimeout(fn, 0)`][], it's much more
 efficient.  It runs before any additional I/O events (including
 timers) fire in subsequent ticks of the event loop.
 
@@ -693,8 +693,8 @@ for the source tarball and headers-only tarball.
 
 `process.release` contains the following properties:
 
-* `name`: a string with a value that will always be `"node"` for Node.js. For
-  legacy io.js releases, this will be `"io.js"`.
+* `name`: a string with a value that will always be `'node'` for Node.js. For
+  legacy io.js releases, this will be `'io.js'`.
 * `sourceUrl`: a complete URL pointing to a _.tar.gz_ file containing the
   source of the current release.
 * `headersUrl`: a complete URL pointing to a _.tar.gz_ file containing only
@@ -724,7 +724,7 @@ relied upon to exist.
 
 When Node.js is spawned with an IPC channel attached, it can send messages to its
 parent process using `process.send()`. Each will be received as a
-['message'][] event on the parent's `ChildProcess` object.
+[`'message'`][] event on the parent's `ChildProcess` object.
 
 If Node.js was not spawned with an IPC channel, `process.send()` will be undefined.
 
@@ -794,7 +794,7 @@ Note: this function is only available on POSIX platforms (i.e. not Windows,
 Android)
 
 Sets the supplementary group IDs. This is a privileged operation, meaning you
-need to be root or have the CAP_SETGID capability.
+need to be root or have the `CAP_SETGID` capability.
 
 The list can contain group IDs, group names or both.
 
@@ -869,7 +869,7 @@ For example, a `console.log` equivalent could look like this:
     };
 
 `process.stderr` and `process.stdout` are unlike other streams in Node.js in
-that they cannot be closed (`end()` will throw), they never emit the `finish`
+that they cannot be closed (`end()` will throw), they never emit the `'finish'`
 event and that writes can block when output is redirected to a file (although
 disks are fast and operating systems normally employ write-back caching so it
 should be a very rare occurrence indeed.)
@@ -891,7 +891,7 @@ See [the tty docs][] for more information.
 
 ## process.title
 
-Getter/setter to set what is displayed in 'ps'.
+Getter/setter to set what is displayed in `ps.
 
 When used as a setter, the maximum length is platform-specific and probably
 short.
@@ -944,13 +944,17 @@ Will print something like:
       icu: '55.1',
       openssl: '1.0.1k' }
 
-[ChildProcess.disconnect()]: child_process.html#child_process_child_disconnect
-[ChildProcess.send()]: child_process.html#child_process_child_send_message_sendhandle_callback
-[Signal Events]: #process_signal_events
-[EventEmitter]: events.html#events_class_events_eventemitter
-[net.Server]: net.html#net_class_net_server
-[net.Socket]: net.html#net_class_net_socket
+[`'message'`]: child_process.html#child_process_event_message
+[`ChildProcess.disconnect()`]: child_process.html#child_process_child_disconnect
+[`ChildProcess.send()`]: child_process.html#child_process_child_send_message_sendhandle_callback
+[`Error`]: errors.html#errors_class_error
+[`EventEmitter`]: events.html#events_class_events_eventemitter
+[`net.Server`]: net.html#net_class_net_server
+[`net.Socket`]: net.html#net_class_net_socket
+[`process.exit()`]: #process_process_exit_code
+[`promise.catch(...)`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/catch
 [`require.main`]: modules.html#modules_accessing_the_main_module
-['message']: child_process.html#child_process_event_message
+[`setTimeout(fn, 0)`]: timers.html#timers_settimeout_callback_delay_arg
+[Signal Events]: #process_signal_events
 [Stream compatibility]: stream.html#stream_compatibility_with_older_node_js_versions
 [the tty docs]: tty.html#tty_tty
diff --git a/doc/api/readline.markdown b/doc/api/readline.markdown
index ac5c61fa1cc9cf..112206993b2449 100644
--- a/doc/api/readline.markdown
+++ b/doc/api/readline.markdown
@@ -3,7 +3,7 @@
     Stability: 2 - Stable
 
 To use this module, do `require('readline')`. Readline allows reading of a
-stream (such as `process.stdin`) on a line-by-line basis.
+stream (such as [`process.stdin`][]) on a line-by-line basis.
 
 Note that once you've invoked this module, your Node.js program will not
 terminate until you've closed the interface. Here's how to allow your
@@ -31,13 +31,14 @@ stream.
 ### rl.close()
 
 Closes the `Interface` instance, relinquishing control on the `input` and
-`output` streams. The "close" event will also be emitted.
+`output` streams. The `'close'` event will also be emitted.
 
 ### rl.pause()
 
 Pauses the readline `input` stream, allowing it to be resumed later if needed.
 
-Note that this doesn't immediately pause the stream of events. Several events may be emitted after calling `pause`, including `line`.
+Note that this doesn't immediately pause the stream of events. Several events may
+be emitted after calling `pause`, including `line`.
 
 ### rl.prompt([preserveCursor])
 
@@ -100,7 +101,7 @@ Example:
 
 Emitted when `close()` is called.
 
-Also emitted when the `input` stream receives its "end" event. The `Interface`
+Also emitted when the `input` stream receives its `'end'` event. The `Interface`
 instance should be considered "finished" once this is emitted. For example, when
 the `input` stream receives `^D`, respectively known as `EOT`.
 
@@ -114,7 +115,7 @@ the `input` stream receives a `^C`, respectively known as `SIGINT`.
 Emitted whenever the `input` stream receives a `\n`, usually received when the
 user hits enter, or return. This is a good hook to listen for user input.
 
-Example of listening for `line`:
+Example of listening for `'line'`:
 
     rl.on('line', function (cmd) {
       console.log('You just typed: '+cmd);
@@ -129,7 +130,7 @@ Emitted whenever the `input` stream is paused.
 Also emitted whenever the `input` stream is not paused and receives the
 `SIGCONT` event. (See events `SIGTSTP` and `SIGCONT`)
 
-Example of listening for `pause`:
+Example of listening for `'pause'`:
 
     rl.on('pause', function() {
       console.log('Readline paused.');
@@ -141,7 +142,7 @@ Example of listening for `pause`:
 
 Emitted whenever the `input` stream is resumed.
 
-Example of listening for `resume`:
+Example of listening for `'resume'`:
 
     rl.on('resume', function() {
       console.log('Readline resumed.');
@@ -191,10 +192,10 @@ Emitted whenever the `input` stream receives a `^Z`, respectively known as
 `SIGTSTP`. If there is no `SIGTSTP` event listener present when the `input`
 stream receives a `SIGTSTP`, the program will be sent to the background.
 
-When the program is resumed with `fg`, the `pause` and `SIGCONT` events will be
+When the program is resumed with `fg`, the `'pause'` and `SIGCONT` events will be
 emitted. You can use either to resume the stream.
 
-The `pause` and `SIGCONT` events will not be triggered if the stream was paused
+The `'pause'` and `SIGCONT` events will not be triggered if the stream was paused
 before the program was sent to the background.
 
 Example of listening for `SIGTSTP`:
@@ -246,7 +247,7 @@ Clears the screen from the current position of the cursor down.
 
 ## readline.createInterface(options)
 
-Creates a readline `Interface` instance. Accepts an "options" Object that takes
+Creates a readline `Interface` instance. Accepts an `options Object that takes
 the following values:
 
  - `input` - the readable stream to listen to (Required).
@@ -287,8 +288,8 @@ Also `completer` can be run in async mode if it accepts two arguments:
       callback(null, [['123'], linePartial]);
     }
 
-`createInterface` is commonly used with `process.stdin` and
-`process.stdout` in order to accept user input:
+`createInterface` is commonly used with [`process.stdin`][] and
+[`process.stdout`][] in order to accept user input:
 
     var readline = require('readline');
     var rl = readline.createInterface({
@@ -297,12 +298,12 @@ Also `completer` can be run in async mode if it accepts two arguments:
     });
 
 Once you have a readline instance, you most commonly listen for the
-`"line"` event.
+`'line'` event.
 
 If `terminal` is `true` for this instance then the `output` stream will get
 the best compatibility if it defines an `output.columns` property, and fires
-a `"resize"` event on the `output` if/when the columns ever change
-(`process.stdout` does this automatically when it is a TTY).
+a `'resize'` event on the `output` if/when the columns ever change
+([`process.stdout`][] does this automatically when it is a TTY).
 
 ## readline.cursorTo(stream, x, y)
 
@@ -311,3 +312,6 @@ Move cursor to the specified position in a given TTY stream.
 ## readline.moveCursor(stream, dx, dy)
 
 Move cursor relative to it's current position in a given TTY stream.
+
+[`process.stdin`]: process.html#process_process_stdin
+[`process.stdout`]: process.html#process_process_stdout
diff --git a/doc/api/repl.markdown b/doc/api/repl.markdown
index 8961bb3fb54215..d5d4ec62ec7549 100644
--- a/doc/api/repl.markdown
+++ b/doc/api/repl.markdown
@@ -120,7 +120,7 @@ The following key combinations in the REPL have these special effects:
 ### Customizing Object displays in the REPL
 
 The REPL module internally uses
-[util.inspect()][], when printing values. However, `util.inspect` delegates the
+[`util.inspect()`][], when printing values. However, `util.inspect` delegates the
  call to the object's `inspect()` function, if it has one. You can read more
  about this delegation [here][].
 
@@ -147,8 +147,8 @@ This inherits from [Readline Interface][] with the following events:
 `function () {}`
 
 Emitted when the user exits the REPL in any of the defined ways. Namely, typing
-`.exit` at the repl, pressing Ctrl+C twice to signal SIGINT, or pressing Ctrl+D
-to signal "end" on the `input` stream.
+`.exit` at the repl, pressing Ctrl+C twice to signal `SIGINT`, or pressing Ctrl+D
+to signal `'end'` on the `input` stream.
 
 Example of listening for `exit`:
 
@@ -216,8 +216,8 @@ Example of invoking that command from the REPL:
 
 * `preserveCursor` {Boolean}
 
-Like [readline.prompt][] except also adding indents with ellipses when inside
-blocks. The `preserveCursor` argument is passed to [readline.prompt][]. This is
+Like [`readline.prompt`][] except also adding indents with ellipses when inside
+blocks. The `preserveCursor` argument is passed to [`readline.prompt`][]. This is
 used primarily with `defineCommand`. It's also used internally to render each
 prompt line.
 
@@ -323,7 +323,7 @@ a `net.Server` and `net.Socket` instance, see: https://gist.github.com/2209310
 For an example of running a REPL instance over `curl(1)`,
 see: https://gist.github.com/2053342
 
-[Readline Interface]: readline.html#readline_class_interface
-[readline.prompt]: readline.html#readline_rl_prompt_preservecursor
-[util.inspect()]: util.html#util_util_inspect_object_options
+[`readline.prompt`]: readline.html#readline_rl_prompt_preservecursor
+[`util.inspect()`]: util.html#util_util_inspect_object_options
 [here]: util.html#util_custom_inspect_function_on_objects
+[Readline Interface]: readline.html#readline_class_interface
diff --git a/doc/api/stream.markdown b/doc/api/stream.markdown
index caf9daeaf21362..b76ef0093e1847 100644
--- a/doc/api/stream.markdown
+++ b/doc/api/stream.markdown
@@ -4,8 +4,8 @@
 
 A stream is an abstract interface implemented by various objects in
 Node.js.  For example a [request to an HTTP server][] is a stream, as is
-[stdout][]. Streams are readable, writable, or both. All streams are
-instances of [EventEmitter][]
+[`stdout`][]. Streams are readable, writable, or both. All streams are
+instances of [`EventEmitter`][].
 
 You can load the Stream base classes by doing `require('stream')`.
 There are base classes provided for [Readable][] streams, [Writable][]
@@ -126,7 +126,7 @@ mode, then data will be lost.
 
 You can switch to flowing mode by doing any of the following:
 
-* Adding a [`'data'` event][] handler to listen for data.
+* Adding a [`'data'`][] event handler to listen for data.
 * Calling the [`resume()`][] method to explicitly open the flow.
 * Calling the [`pipe()`][] method to send the data to a [Writable][].
 
@@ -134,7 +134,7 @@ You can switch back to paused mode by doing either of the following:
 
 * If there are no pipe destinations, by calling the [`pause()`][]
   method.
-* If there are pipe destinations, by removing any [`'data'` event][]
+* If there are pipe destinations, by removing any [`'data'`][] event
   handlers, and removing all pipe destinations by calling the
   [`unpipe()`][] method.
 
@@ -153,7 +153,7 @@ Examples of readable streams include:
 * [crypto streams][]
 * [tcp sockets][]
 * [child process stdout and stderr][]
-* [process.stdin][]
+* [`process.stdin`][]
 
 #### Event: 'close'
 
@@ -161,13 +161,13 @@ Emitted when the stream and any of its underlying resources (a file
 descriptor, for example) have been closed. The event indicates that
 no more events will be emitted, and no further computation will occur.
 
-Not all streams will emit the 'close' event.
+Not all streams will emit the `'close'` event.
 
 #### Event: 'data'
 
 * `chunk` {Buffer | String} The chunk of data.
 
-Attaching a `data` event listener to a stream that has not been
+Attaching a `'data'` event listener to a stream that has not been
 explicitly paused will switch the stream into flowing mode. Data will
 then be passed as soon as it is available.
 
@@ -185,7 +185,7 @@ readable.on('data', function(chunk) {
 
 This event fires when there will be no more data to read.
 
-Note that the `end` event **will not fire** unless the data is
+Note that the `'end'` event **will not fire** unless the data is
 completely consumed.  This can be done by switching into flowing mode,
 or by calling `read()` repeatedly until you get to the end.
 
@@ -221,13 +221,13 @@ readable.on('readable', function() {
 });
 ```
 
-Once the internal buffer is drained, a `readable` event will fire
+Once the internal buffer is drained, a `'readable'` event will fire
 again when more data is available.
 
-The `readable` event is not emitted in the "flowing" mode with the
+The `'readable'` event is not emitted in the "flowing" mode with the
 sole exception of the last one, on end-of-stream.
 
-The 'readable' event indicates that the stream has new information:
+The `'readable'` event indicates that the stream has new information:
 either new data is available or the end of the stream has been reached.
 In the former case, `.read()` will return that data. In the latter case,
 `.read()` will return null. For instance, in the following example, `foo.txt`
@@ -275,7 +275,7 @@ readable.isPaused() // === false
 * Return: `this`
 
 This method will cause a stream in flowing mode to stop emitting
-`data` events, switching out of flowing mode.  Any data that becomes
+`'data'` events, switching out of flowing mode.  Any data that becomes
 available will remain in the internal buffer.
 
 ```javascript
@@ -375,9 +375,9 @@ readable.on('readable', function() {
 ```
 
 If this method returns a data chunk, then it will also trigger the
-emission of a [`'data'` event][].
+emission of a [`'data'`][] event.
 
-Note that calling `readable.read([size])` after the `end` event has been
+Note that calling `readable.read([size])` after the `'end'` event has been
 triggered will return `null`. No runtime error will be raised.
 
 #### readable.resume()
@@ -389,7 +389,7 @@ events.
 
 This method will switch the stream into flowing mode.  If you do *not*
 want to consume the data from a stream, but you *do* want to get to
-its `end` event, you can call [`readable.resume()`][] to open the flow of
+its `'end'` event, you can call [`readable.resume()`][] to open the flow of
 data.
 
 ```javascript
@@ -460,7 +460,7 @@ parser, which needs to "un-consume" some data that it has
 optimistically pulled out of the source, so that the stream can be
 passed on to some other party.
 
-Note that `stream.unshift(chunk)` cannot be called after the `end` event
+Note that `stream.unshift(chunk)` cannot be called after the `'end'` event
 has been triggered; a runtime error will be raised.
 
 If you find that you must often call `stream.unshift(chunk)` in your
@@ -565,11 +565,11 @@ Examples of writable streams include:
 * [crypto streams][]
 * [tcp sockets][]
 * [child process stdin][]
-* [process.stdout][], [process.stderr][]
+* [`process.stdout`][], [`process.stderr`][]
 
 #### Event: 'drain'
 
-If a [`writable.write(chunk)`][] call returns false, then the `drain`
+If a [`writable.write(chunk)`][] call returns false, then the `'drain'`
 event will indicate when it is appropriate to begin writing more data
 to the stream.
 
@@ -671,7 +671,7 @@ Buffered data will be flushed either at `.uncork()` or at `.end()` call.
 * `callback` {Function} Optional callback for when the stream is finished
 
 Call this method when no more data will be written to the stream.  If
-supplied, the callback is attached as a listener on the `finish` event.
+supplied, the callback is attached as a listener on the `'finish'` event.
 
 Calling [`write()`][] after calling [`end()`][] will raise an error.
 
@@ -710,7 +710,7 @@ If the data had to be buffered internally, then it will return
 This return value is strictly advisory.  You MAY continue to write,
 even if it returns `false`.  However, writes will be buffered in
 memory, so it is best not to do this excessively.  Instead, wait for
-the `drain` event before writing more data.
+the `'drain'` event before writing more data.
 
 
 ## API for Stream Implementors
@@ -907,7 +907,7 @@ passed, it signals the end of the stream (EOF), after which no more data
 can be written.
 
 The data added with `push` can be pulled out by calling the `read()` method
-when the `'readable'`event fires.
+when the `'readable'` event fires.
 
 This API is designed to be as flexible as possible.  For example,
 you may be wrapping a lower-level source which has some sort of
@@ -1118,8 +1118,8 @@ initialized.
 
 #### Events: 'finish' and 'end'
 
-The [`finish`][] and [`end`][] events are from the parent Writable
-and Readable classes respectively. The `finish` event is fired after
+The [`'finish'`][] and [`'end'`][] events are from the parent Writable
+and Readable classes respectively. The `'finish'` event is fired after
 `.end()` is called and all chunks have been processed by `_transform`,
 `end` is fired after all data has been output which is after the callback
 in `_flush` has been called.
@@ -1467,7 +1467,7 @@ var writable = new stream.Writable({
 <!--type=misc-->
 
 Both Writable and Readable streams will buffer data on an internal
-object which can be retrieved from `_writableState.getBuffer()` or 
+object which can be retrieved from `_writableState.getBuffer()` or
 `_readableState.buffer`, respectively.
 
 The amount of data that will potentially be buffered depends on the
@@ -1510,7 +1510,7 @@ no longer have to worry about losing `'data'` chunks.
 Most programs will continue to function normally.  However, this
 introduces an edge case in the following conditions:
 
-* No [`'data'` event][] handler is added.
+* No [`'data'`][] event handler is added.
 * The [`resume()`][] method is never called.
 * The stream is not piped to any writable destination.
 
@@ -1671,60 +1671,60 @@ code) will know when to check again, by calling `stream.read(0)`.  In
 those cases, you *may* call `stream.push('')`.
 
 So far, the only use case for this functionality is in the
-[tls.CryptoStream][] class, which is deprecated in Node.js/io.js v1.0.  If you
+[`tls.CryptoStream`][] class, which is deprecated in Node.js/io.js v1.0.  If you
 find that you have to use `stream.push('')`, please consider another
 approach, because it almost certainly indicates that something is
 horribly wrong.
 
-[request to an HTTP server]: http.html#http_http_incomingmessage
-[EventEmitter]: events.html#events_class_events_eventemitter
-[Object mode]: #stream_object_mode
+[_read]: #stream_readable_read_size_1
+[_write]: #stream_writable_write_chunk_encoding_callback_1
+[`'data'`]: #stream_event_data
+[`'end'`]: #stream_event_end
+[`'finish'`]: #stream_event_finish
+[`_read()`]: #stream_readable_read_size_1
+[`_read(size)`]: #stream_readable_read_size_1
+[`_write()`]: #stream_writable_write_chunk_encoding_callback_1
+[`_write(chunk, encoding, callback)`]: #stream_writable_write_chunk_encoding_callback_1
+[`end()`]: #stream_writable_end_chunk_encoding_callback
+[`EventEmitter`]: events.html#events_class_events_eventemitter
+[`pause()`]: #stream_readable_pause
+[`pipe()`]: #stream_readable_pipe_destination_options
+[`process.stderr`]: process.html#process_process_stderr
+[`process.stdin`]: process.html#process_process_stdin
+[`process.stdout`]: process.html#process_process_stdout
+[`readable.resume()`]: #stream_readable_resume
+[`resume()`]: #stream_readable_resume
+[`stdout`]: process.html#process_process_stdout
+[`stream.push()`]: #stream_readable_push_chunk_encoding
 [`stream.push(chunk)`]: #stream_readable_push_chunk_encoding
 [`stream.push(null)`]: #stream_readable_push_chunk_encoding
-[`stream.push()`]: #stream_readable_push_chunk_encoding
+[`stream.write(chunk)`]: #stream_writable_write_chunk_encoding_callback
+[`tls.CryptoStream`]: tls.html#tls_class_cryptostream
 [`unpipe()`]: #stream_readable_unpipe_destination
-[unpiped]: #stream_readable_unpipe_destination
-[tcp sockets]: net.html#net_class_net_socket
-[http responses, on the client]: http.html#http_http_incomingmessage
-[http requests, on the server]: http.html#http_http_incomingmessage
-[http requests, on the client]: http.html#http_class_http_clientrequest
-[http responses, on the server]: http.html#http_class_http_serverresponse
-[fs read streams]: fs.html#fs_class_fs_readstream
-[fs write streams]: fs.html#fs_class_fs_writestream
-[zlib streams]: zlib.html
-[zlib]: zlib.html
-[crypto streams]: crypto.html
-[crypto]: crypto.html
-[tls.CryptoStream]: tls.html#tls_class_cryptostream
-[process.stdin]: process.html#process_process_stdin
-[stdout]: process.html#process_process_stdout
-[process.stdout]: process.html#process_process_stdout
-[process.stderr]: process.html#process_process_stderr
-[child process stdout and stderr]: child_process.html#child_process_child_stdout
-[child process stdin]: child_process.html#child_process_child_stdin
+[`unpipe()`]: #stream_readable_unpipe_destination
+[`util.inherits`]: util.html#util_util_inherits_constructor_superconstructor
+[`writable.write(chunk)`]: #stream_writable_write_chunk_encoding_callback
+[`write()`]: #stream_writable_write_chunk_encoding_callback
+[`write(chunk, encoding, callback)`]: #stream_writable_write_chunk_encoding_callback
 [API for Stream Consumers]: #stream_api_for_stream_consumers
 [API for Stream Implementors]: #stream_api_for_stream_implementors
-[Readable]: #stream_class_stream_readable
-[Writable]: #stream_class_stream_writable
+[child process stdin]: child_process.html#child_process_child_stdin
+[child process stdout and stderr]: child_process.html#child_process_child_stdout
+[crypto streams]: crypto.html
+[crypto]: crypto.html
 [Duplex]: #stream_class_stream_duplex
+[fs read streams]: fs.html#fs_class_fs_readstream
+[fs write streams]: fs.html#fs_class_fs_writestream
+[http requests, on the client]: http.html#http_class_http_clientrequest
+[http requests, on the server]: http.html#http_http_incomingmessage
+[http responses, on the client]: http.html#http_http_incomingmessage
+[http responses, on the server]: http.html#http_class_http_serverresponse
+[Object mode]: #stream_object_mode
+[Readable]: #stream_class_stream_readable
+[request to an HTTP server]: http.html#http_http_incomingmessage
+[tcp sockets]: net.html#net_class_net_socket
 [Transform]: #stream_class_stream_transform
-[`end`]: #stream_event_end
-[`finish`]: #stream_event_finish
-[`_read(size)`]: #stream_readable_read_size_1
-[`_read()`]: #stream_readable_read_size_1
-[_read]: #stream_readable_read_size_1
-[`writable.write(chunk)`]: #stream_writable_write_chunk_encoding_callback
-[`write(chunk, encoding, callback)`]: #stream_writable_write_chunk_encoding_callback
-[`write()`]: #stream_writable_write_chunk_encoding_callback
-[`stream.write(chunk)`]: #stream_writable_write_chunk_encoding_callback
-[`_write(chunk, encoding, callback)`]: #stream_writable_write_chunk_encoding_callback_1
-[`_write()`]: #stream_writable_write_chunk_encoding_callback_1
-[_write]: #stream_writable_write_chunk_encoding_callback_1
-[`util.inherits`]: util.html#util_util_inherits_constructor_superconstructor
-[`end()`]: #stream_writable_end_chunk_encoding_callback
-[`'data'` event]: #stream_event_data
-[`resume()`]: #stream_readable_resume
-[`readable.resume()`]: #stream_readable_resume
-[`pause()`]: #stream_readable_pause
-[`unpipe()`]: #stream_readable_unpipe_destination
-[`pipe()`]: #stream_readable_pipe_destination_options
+[unpiped]: #stream_readable_unpipe_destination
+[Writable]: #stream_class_stream_writable
+[zlib streams]: zlib.html
+[zlib]: zlib.html
diff --git a/doc/api/string_decoder.markdown b/doc/api/string_decoder.markdown
index 885af7745a23a0..b58bcd2cf422c9 100644
--- a/doc/api/string_decoder.markdown
+++ b/doc/api/string_decoder.markdown
@@ -17,7 +17,7 @@ additional support for utf8.
 
 ## Class: StringDecoder
 
-Accepts a single argument, `encoding` which defaults to `utf8`.
+Accepts a single argument, `encoding` which defaults to `'utf8'`.
 
 ### decoder.end()
 
diff --git a/doc/api/synopsis.markdown b/doc/api/synopsis.markdown
index f9e8b19ed6fcfe..347b22e3cad284 100644
--- a/doc/api/synopsis.markdown
+++ b/doc/api/synopsis.markdown
@@ -3,7 +3,7 @@
 <!--type=misc-->
 
 An example of a [web server][] written with Node.js which responds with
-'Hello World':
+`'Hello World'`:
 
     var http = require('http');
 
diff --git a/doc/api/timers.markdown b/doc/api/timers.markdown
index 3a087be76a5cf2..4d5caf2e0ee0e5 100644
--- a/doc/api/timers.markdown
+++ b/doc/api/timers.markdown
@@ -28,7 +28,7 @@ Returns the timer.
 ## setImmediate(callback[, arg][, ...])
 
 To schedule the "immediate" execution of `callback` after I/O events
-callbacks and before `setTimeout` and `setInterval` . Returns an
+callbacks and before [`setTimeout`][] and [`setInterval`][]. Returns an
 `immediateObject` for possible use with `clearImmediate()`. Optionally you
 can also pass arguments to the callback.
 
@@ -64,7 +64,7 @@ immediately, as if the `delay` was set to 1.
 
 ## unref()
 
-The opaque value returned by `setTimeout` and `setInterval` also has the method
+The opaque value returned by [`setTimeout`][] and [`setInterval`][] also has the method
 `timer.unref()` which will allow you to create a timer that is active but if
 it is the only item left in the event loop, it won't keep the program running.
 If the timer is already `unref`d calling `unref` again will have no effect.
@@ -74,3 +74,6 @@ will wakeup the event loop, creating too many of these may adversely effect
 event loop performance -- use wisely.
 
 Returns the timer.
+
+[`setInterval`]: timers.html#timers_setinterval_callback_delay_arg
+[`setTimeout`]: timers.html#timers_settimeout_callback_delay_arg
diff --git a/doc/api/tls.markdown b/doc/api/tls.markdown
index e6c115112d5e4e..74f22e5112dbea 100644
--- a/doc/api/tls.markdown
+++ b/doc/api/tls.markdown
@@ -159,7 +159,7 @@ Returned by tls.createSecurePair.
 The event is emitted from the SecurePair once the pair has successfully
 established a secure connection.
 
-Similarly to the checking for the server 'secureConnection' event,
+Similarly to the checking for the server `'secureConnection'` event,
 pair.cleartext.authorized should be checked to confirm whether the certificate
 used properly authorized.
 
@@ -173,7 +173,7 @@ connections using TLS or SSL.
 
 `function (exception, tlsSocket) { }`
 
-When a client connection emits an 'error' event before secure connection is
+When a client connection emits an `'error'` event before secure connection is
 established - it will be forwarded here.
 
 `tlsSocket` is the [tls.TLSSocket][] that the error originated from.
@@ -207,9 +207,9 @@ Calling `callback(err)` will result in a `socket.destroy(err)` call.
 
 Typical flow:
 
-1. Client connects to server and sends `OCSPRequest` to it (via status info
+1. Client connects to server and sends `'OCSPRequest'` to it (via status info
    extension in ClientHello.)
-2. Server receives request and invokes `OCSPRequest` event listener if present
+2. Server receives request and invokes `'OCSPRequest'` event listener if present
 3. Server grabs OCSP url from either `certificate` or `issuer` and performs an
    [OCSP request] to the CA
 4. Server receives `OCSPResponse` from CA and sends it back to client via
@@ -333,7 +333,7 @@ gets high.
 
 ## Class: tls.TLSSocket
 
-This is a wrapped version of [net.Socket][] that does transparent encryption
+This is a wrapped version of [`net.Socket`][] that does transparent encryption
 of written data and all required TLS negotiation.
 
 This instance implements a duplex [Stream][] interfaces.  It has all the
@@ -346,7 +346,7 @@ only return data while the connection is open.
 
 Construct a new TLSSocket object from existing TCP socket.
 
-`socket` is an instance of [net.Socket][]
+`socket` is an instance of [`net.Socket`][]
 
 `options` is an optional object that might contain following properties:
 
@@ -356,7 +356,7 @@ Construct a new TLSSocket object from existing TCP socket.
   - `isServer`: If `true` - TLS socket will be instantiated in server-mode.
     Default: `false`
 
-  - `server`: An optional [net.Server][] instance
+  - `server`: An optional [`net.Server`][] instance
 
   - `requestCert`: Optional, see [tls.createSecurePair][]
 
@@ -371,7 +371,7 @@ Construct a new TLSSocket object from existing TCP socket.
   - `session`: Optional, a `Buffer` instance, containing TLS session
 
   - `requestOCSP`: Optional, if `true` - OCSP status request extension would
-    be added to client hello, and `OCSPResponse` event will be emitted on socket
+    be added to client hello, and `'OCSPResponse'` event will be emitted on socket
     before establishing secure communication
 
 ### Event: 'OCSPResponse'
@@ -605,7 +605,7 @@ Creates a new client connection to the given `port` and `host` (old API) or
     error. Default: 1024.
 
 The `callback` parameter will be added as a listener for the
-['secureConnect'][] event.
+[`'secureConnect'`][] event.
 
 `tls.connect()` returns a [tls.TLSSocket][] object.
 
@@ -719,7 +719,7 @@ NOTE: `cleartext` has the same APIs as [tls.TLSSocket][]
 ## tls.createServer(options[, secureConnectionListener])
 
 Creates a new [tls.Server][].  The `connectionListener` argument is
-automatically set as a listener for the [secureConnection][] event.  The
+automatically set as a listener for the [`'secureConnection'`][] event.  The
 `options` object has these possibilities:
 
   - `pfx`: A string or `Buffer` containing the private key, certificate and
@@ -922,11 +922,11 @@ Example:
 [tls.createServer]: #tls_tls_createserver_options_secureconnectionlistener
 [tls.createSecurePair]: #tls_tls_createsecurepair_context_isserver_requestcert_rejectunauthorized_options
 [tls.TLSSocket]: #tls_class_tls_tlssocket
-[net.Server]: net.html#net_class_net_server
-[net.Socket]: net.html#net_class_net_socket
+[`net.Server`]: net.html#net_class_net_server
+[`net.Socket`]: net.html#net_class_net_socket
 [net.Server.address()]: net.html#net_server_address
-['secureConnect']: #tls_event_secureconnect
-[secureConnection]: #tls_event_secureconnection
+[`'secureConnect'`]: #tls_event_secureconnect
+[`'secureConnection'`]: #tls_event_secureconnection
 [Perfect Forward Secrecy]: #tls_perfect_forward_secrecy
 [Stream]: stream.html#stream_stream
 [SSL_METHODS]: http://www.openssl.org/docs/ssl/ssl.html#DEALING_WITH_PROTOCOL_METHODS
diff --git a/doc/api/tty.markdown b/doc/api/tty.markdown
index 279a1dd0b9440e..251742a0e1b89b 100644
--- a/doc/api/tty.markdown
+++ b/doc/api/tty.markdown
@@ -53,12 +53,12 @@ has changed.
 ### ws.columns
 
 A `Number` that gives the number of columns the TTY currently has. This property
-gets updated on "resize" events.
+gets updated on `'resize'` events.
 
 ### ws.rows
 
 A `Number` that gives the number of rows the TTY currently has. This property
-gets updated on "resize" events.
+gets updated on `'resize'` events.
 
 ## tty.isatty(fd)
 
diff --git a/doc/api/util.markdown b/doc/api/util.markdown
index b1ab10a81e094f..3ae232c86b9b15 100644
--- a/doc/api/util.markdown
+++ b/doc/api/util.markdown
@@ -233,7 +233,7 @@ formatted according to the returned Object. This is similar to how
 
     Stability: 0 - Deprecated
 
-Internal alias for Array.isArray.
+Internal alias for [`Array.isArray`][].
 
 Returns `true` if the given "object" is an `Array`. `false` otherwise.
 
@@ -297,7 +297,7 @@ Returns `true` if the given "object" is a `Date`. `false` otherwise.
 
     Stability: 0 - Deprecated
 
-Returns `true` if the given "object" is an `Error`. `false` otherwise.
+Returns `true` if the given "object" is an [`Error`][]. `false` otherwise.
 
     var util = require('util');
 
@@ -505,4 +505,6 @@ Deprecated predecessor of `stream.pipe()`.
 
 Deprecated predecessor of `console.log`.
 
+[`Array.isArray`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/isArray
 [constructor]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Object/constructor
+[`Error`]: errors.html#errors_class_error
diff --git a/doc/api/vm.markdown b/doc/api/vm.markdown
index 10c8cbc4ce4fd2..592d42d9151874 100644
--- a/doc/api/vm.markdown
+++ b/doc/api/vm.markdown
@@ -35,7 +35,7 @@ The options when creating a script are:
   Applies only to syntax errors compiling the code; errors while running the
   code are controlled by the options to the script's methods.
 - `timeout`: a number of milliseconds to execute `code` before terminating
-  execution. If execution is terminated, an `Error` will be thrown.
+  execution. If execution is terminated, an [`Error`][] will be thrown.
 
 ### script.runInContext(contextifiedSandbox[, options])
 
@@ -141,7 +141,7 @@ The options for running a script are:
   Applies only to runtime errors executing the code; it is impossible to create
   a `Script` instance with syntax errors, as the constructor will throw.
 - `timeout`: a number of milliseconds to execute the script before terminating
-  execution. If execution is terminated, an `Error` will be thrown.
+  execution. If execution is terminated, an [`Error`][] will be thrown.
 
 ## vm.createContext([sandbox])
 
@@ -273,7 +273,8 @@ e.g. `(0,eval)('code')`. However, it also has the following additional options:
   Will capture both syntax errors from compiling `code` and runtime errors
   thrown by executing the compiled code. Defaults to `true`.
 - `timeout`: a number of milliseconds to execute `code` before terminating
-  execution. If execution is terminated, an `Error` will be thrown.
+  execution. If execution is terminated, an [`Error`][] will be thrown.
 
 [indirect `eval` call]: http://es5.github.io/#x10.4.2
 [global object]: http://es5.github.io/#x15.1
+[`Error`]: errors.html#errors_class_error

From f4164bd8df46350b3a487857e3138f0888c0aff4 Mon Sep 17 00:00:00 2001
From: jpersson <jonathan.persson@creuna.se>
Date: Wed, 2 Dec 2015 11:17:19 -0500
Subject: [PATCH 295/323] doc: update links to use https where possible

PR-URL: https://github.com/nodejs/node/pull/4054
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
---
 doc/api/addons.markdown   |  2 +-
 doc/api/crypto.markdown   | 10 +++++-----
 doc/api/errors.markdown   |  2 +-
 doc/api/https.markdown    |  4 ++--
 doc/api/punycode.markdown |  2 +-
 doc/api/tls.markdown      | 22 +++++++++++-----------
 doc/api/vm.markdown       |  4 ++--
 doc/api/zlib.markdown     |  4 ++--
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/doc/api/addons.markdown b/doc/api/addons.markdown
index 28a5457cca7c72..d8f9953ecc4467 100644
--- a/doc/api/addons.markdown
+++ b/doc/api/addons.markdown
@@ -871,4 +871,4 @@ Test in JavaScript by running:
 [download]: https://github.com/rvagg/node-addon-examples
 [node-gyp]: https://github.com/nodejs/node-gyp
 [v8 reference]: http://izs.me/v8-docs/main.html
-[Embedder's Guide]: http://code.google.com/apis/v8/embed.html
+[Embedder's Guide]: https://code.google.com/apis/v8/embed.html
diff --git a/doc/api/crypto.markdown b/doc/api/crypto.markdown
index 5e733efab7428c..62e83e62db2210 100644
--- a/doc/api/crypto.markdown
+++ b/doc/api/crypto.markdown
@@ -14,7 +14,7 @@ decipher, sign and verify methods.
 
 The class used for working with signed public key & challenges. The most
 common usage for this series of functions is when dealing with the `<keygen>`
-element. http://www.openssl.org/docs/apps/spkac.html
+element. https://www.openssl.org/docs/apps/spkac.html
 
 Returned by `crypto.Certificate`.
 
@@ -464,7 +464,7 @@ dictionary with keys:
   (Certificate Revocation List)
 * `ciphers`: A string describing the ciphers to use or exclude.
   Consult
-  <http://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT>
+  <https://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT>
   for details on the format.
 
 If no 'ca' details are given, then Node.js will use the default
@@ -797,10 +797,10 @@ See the reference for other recommendations and details.
 [buffer]: buffer.html
 [buffers]: buffer.html
 [Caveats]: #crypto_caveats
-[initialization vector]: http://en.wikipedia.org/wiki/Initialization_vector
+[initialization vector]: https://en.wikipedia.org/wiki/Initialization_vector
 [NIST SP 800-131A]: http://csrc.nist.gov/publications/nistpubs/800-131A/sp800-131A.pdf
 [NIST SP 800-132]: http://csrc.nist.gov/publications/nistpubs/800-132/nist-sp800-132.pdf
-[RFC 2412]: http://www.rfc-editor.org/rfc/rfc2412.txt
-[RFC 3526]: http://www.rfc-editor.org/rfc/rfc3526.txt
+[RFC 2412]: https://www.rfc-editor.org/rfc/rfc2412.txt
+[RFC 3526]: https://www.rfc-editor.org/rfc/rfc3526.txt
 [stream]: stream.html
 [streams]: stream.html
diff --git a/doc/api/errors.markdown b/doc/api/errors.markdown
index 799a8141af43e1..6ffc24e9499ae5 100644
--- a/doc/api/errors.markdown
+++ b/doc/api/errors.markdown
@@ -482,7 +482,7 @@ often a sign that a connected socket was not `.end()`'d appropriately.
 [below]: #errors_error_propagation_and_interception
 [domains]: domain.html
 [event emitter-based]: events.html#events_class_events_eventemitter
-[file descriptors]: http://en.wikipedia.org/wiki/File_descriptor
+[file descriptors]: https://en.wikipedia.org/wiki/File_descriptor
 [online]: http://man7.org/linux/man-pages/man3/errno.3.html
 [stream-based]: stream.html
 [syscall]: http://man7.org/linux/man-pages/man2/syscall.2.html
diff --git a/doc/api/https.markdown b/doc/api/https.markdown
index 6b688668f7f47e..59d97939f634c3 100644
--- a/doc/api/https.markdown
+++ b/doc/api/https.markdown
@@ -167,7 +167,7 @@ The following options from [`tls.connect()`][] can also be specified. However, a
 - `ca`: An authority certificate or array of authority certificates to check
   the remote host against.
 - `ciphers`: A string describing the ciphers to use or exclude. Consult
-  <http://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT> for
+  <https://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT> for
   details on the format.
 - `rejectUnauthorized`: If `true`, the server certificate is verified against
   the list of supplied CAs. An `'error'` event is emitted if verification
@@ -225,7 +225,7 @@ Example:
 [`http.Server`]: http.html#http_class_http_server
 [`https.Agent`]: #https_class_https_agent
 [`https.request()`]: #https_https_request_options_callback
-[`SSL_METHODS`]: http://www.openssl.org/docs/ssl/ssl.html#DEALING_WITH_PROTOCOL_METHODS
+[`SSL_METHODS`]: https://www.openssl.org/docs/ssl/ssl.html#DEALING_WITH_PROTOCOL_METHODS
 [`tls.connect()`]: tls.html#tls_tls_connect_options_callback
 [`tls.createServer()`]: tls.html#tls_tls_createserver_options_secureconnectionlistener
 [`url.parse()`]: url.html#url_url_parse_urlstr_parsequerystring_slashesdenotehost
diff --git a/doc/api/punycode.markdown b/doc/api/punycode.markdown
index c54a981fedb45b..0b3f49d9ba69a3 100644
--- a/doc/api/punycode.markdown
+++ b/doc/api/punycode.markdown
@@ -67,4 +67,4 @@ Creates a string based on an array of numeric code point values.
 A string representing the current Punycode.js version number.
 
 [Punycode.js]: https://mths.be/punycode
-[JavaScript uses UCS-2 internally]: http://mathiasbynens.be/notes/javascript-encoding
+[JavaScript uses UCS-2 internally]: https://mathiasbynens.be/notes/javascript-encoding
diff --git a/doc/api/tls.markdown b/doc/api/tls.markdown
index 74f22e5112dbea..bdb0337b666460 100644
--- a/doc/api/tls.markdown
+++ b/doc/api/tls.markdown
@@ -425,7 +425,7 @@ Example:
 { name: 'AES256-SHA', version: 'TLSv1/SSLv3' }
 
 See SSL_CIPHER_get_name() and SSL_CIPHER_get_version() in
-http://www.openssl.org/docs/ssl/ssl.html#DEALING_WITH_CIPHERS for more
+https://www.openssl.org/docs/ssl/ssl.html#DEALING_WITH_CIPHERS for more
 information.
 
 ### tlsSocket.getEphemeralKeyInfo()
@@ -680,7 +680,7 @@ dictionary with keys:
   (Certificate Revocation List)
 * `ciphers`: A string describing the ciphers to use or exclude.
   Consult
-  <http://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT>
+  <https://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT>
   for details on the format.
 * `honorCipherOrder` : When choosing a cipher, use the server's preferences
   instead of the client preferences. For further details see `tls` module
@@ -914,10 +914,10 @@ Example:
     console.log(ciphers); // ['AES128-SHA', 'AES256-SHA', ...]
 
 
-[OpenSSL cipher list format documentation]: http://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT
-[Chrome's 'modern cryptography' setting]: http://www.chromium.org/Home/chromium-security/education/tls#TOC-Deprecation-of-TLS-Features-Algorithms-in-Chrome
+[OpenSSL cipher list format documentation]: https://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT
+[Chrome's 'modern cryptography' setting]: https://www.chromium.org/Home/chromium-security/education/tls#TOC-Deprecation-of-TLS-Features-Algorithms-in-Chrome
 [specific attacks affecting larger AES key sizes]: https://www.schneier.com/blog/archives/2009/07/another_new_aes.html
-[BEAST attacks]: http://blog.ivanristic.com/2011/10/mitigating-the-beast-attack-on-tls.html
+[BEAST attacks]: https://blog.ivanristic.com/2011/10/mitigating-the-beast-attack-on-tls.html
 [crypto.getCurves()]: crypto.html#crypto_crypto_getcurves
 [tls.createServer]: #tls_tls_createserver_options_secureconnectionlistener
 [tls.createSecurePair]: #tls_tls_createsecurepair_context_isserver_requestcert_rejectunauthorized_options
@@ -929,15 +929,15 @@ Example:
 [`'secureConnection'`]: #tls_event_secureconnection
 [Perfect Forward Secrecy]: #tls_perfect_forward_secrecy
 [Stream]: stream.html#stream_stream
-[SSL_METHODS]: http://www.openssl.org/docs/ssl/ssl.html#DEALING_WITH_PROTOCOL_METHODS
+[SSL_METHODS]: https://www.openssl.org/docs/ssl/ssl.html#DEALING_WITH_PROTOCOL_METHODS
 [tls.Server]: #tls_class_tls_server
-[SSL_CTX_set_timeout]: http://www.openssl.org/docs/ssl/SSL_CTX_set_timeout.html
-[RFC 4492]: http://www.rfc-editor.org/rfc/rfc4492.txt
-[Forward secrecy]: http://en.wikipedia.org/wiki/Perfect_forward_secrecy
+[SSL_CTX_set_timeout]: https://www.openssl.org/docs/ssl/SSL_CTX_set_timeout.html
+[RFC 4492]: https://www.rfc-editor.org/rfc/rfc4492.txt
+[Forward secrecy]: https://en.wikipedia.org/wiki/Perfect_forward_secrecy
 [DHE]: https://en.wikipedia.org/wiki/Diffie%E2%80%93Hellman_key_exchange
 [ECDHE]: https://en.wikipedia.org/wiki/Elliptic_curve_Diffie%E2%80%93Hellman
-[asn1.js]: http://npmjs.org/package/asn1.js
-[OCSP request]: http://en.wikipedia.org/wiki/OCSP_stapling
+[asn1.js]: https://npmjs.org/package/asn1.js
+[OCSP request]: https://en.wikipedia.org/wiki/OCSP_stapling
 [TLS recommendations]: https://wiki.mozilla.org/Security/Server_Side_TLS
 [TLS Session Tickets]: https://www.ietf.org/rfc/rfc5077.txt
 [getPeerCertificate]: #tls_tlssocket_getpeercertificate_detailed
diff --git a/doc/api/vm.markdown b/doc/api/vm.markdown
index 592d42d9151874..fd36c6b21f7ee0 100644
--- a/doc/api/vm.markdown
+++ b/doc/api/vm.markdown
@@ -275,6 +275,6 @@ e.g. `(0,eval)('code')`. However, it also has the following additional options:
 - `timeout`: a number of milliseconds to execute `code` before terminating
   execution. If execution is terminated, an [`Error`][] will be thrown.
 
-[indirect `eval` call]: http://es5.github.io/#x10.4.2
-[global object]: http://es5.github.io/#x15.1
+[indirect `eval` call]: https://es5.github.io/#x10.4.2
+[global object]: https://es5.github.io/#x15.1
 [`Error`]: errors.html#errors_class_error
diff --git a/doc/api/zlib.markdown b/doc/api/zlib.markdown
index 8d4d7e87e3918f..5b1cf407820d53 100644
--- a/doc/api/zlib.markdown
+++ b/doc/api/zlib.markdown
@@ -356,8 +356,8 @@ Decompress a raw Buffer with Inflate.
 
 Decompress a raw Buffer with Unzip.
 
-[accept-encoding]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.3
-[content-encoding]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11
+[accept-encoding]: https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.3
+[content-encoding]: https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11
 [Memory Usage Tuning]: #zlib_memory_usage_tuning
 [zlib documentation]: http://zlib.net/manual.html#Constants
 [options]: #zlib_class_options

From 85b601224b3375281c216f1de2b213122088ffc9 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Thu, 19 Nov 2015 08:42:59 -0800
Subject: [PATCH 296/323] doc: add HTTP working group

Charter for the HTTP Working Group

PR-URL: https://github.com/nodejs/node/pull/3919
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Brian White <mscdex@mscdex.net>
---
 WORKING_GROUPS.md | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/WORKING_GROUPS.md b/WORKING_GROUPS.md
index e3e1f3c37f7dbe..aa573844b790a9 100644
--- a/WORKING_GROUPS.md
+++ b/WORKING_GROUPS.md
@@ -29,9 +29,13 @@ back in to the TSC.
 * [Addon API](#addon-api)
 * [Benchmarking](#benchmarking)
 * [Post-mortem](#post-mortem)
+* [Intl](#intl)
+* [HTTP](#http)
+
+#### Process:
+
 * [Starting a Working Group](#starting-a-wg)
 * [Bootstrap Governance](#bootstrap-governance)
-* [Intl](#Intl)
 
 ### [Website](https://github.com/nodejs/website)
 
@@ -170,6 +174,19 @@ Their responsibilities are:
 * Publishing regular update summaries and other promotional
 content.
 
+### [HTTP](https://github.com/nodejs/http)
+
+The HTTP working group is chartered for the support and improvement of the
+HTTP implementation in Node. It's responsibilities are:
+
+* Addressing HTTP issues on the Node.js issue tracker.
+* Authoring and editing HTTP documentation within the Node.js project.
+* Reviewing changes to HTTP functionality within the Node.js project.
+* Working with the ecosystem of HTTP related module developers to evolve the
+  HTTP implementation and APIs in core.
+* Advising the CTC on all HTTP related issues and discussions.
+* Messaging about the future of HTTP to give the community advance notice of
+  changes.
 
 ### [Roadmap](https://github.com/nodejs/roadmap)
 

From 424eb962b19bc7676e95a7b0cd81199649c81206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kat=20March=C3=A1n?= <kzm@sykosomatic.org>
Date: Thu, 3 Dec 2015 15:45:39 -0800
Subject: [PATCH 297/323] doc: add zkat to collaborators

PR-URL: https://github.com/nodejs/node/pull/4142
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Rebecca Turner <me@re-becca.org>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index fc7e2abf8b8bfd..e2fde1ffeaffc6 100644
--- a/README.md
+++ b/README.md
@@ -419,6 +419,7 @@ information about the governance of the Node.js project, see
 * [tunniclm](https://github.com/tunniclm) - **Mike Tunnicliffe** &lt;m.j.tunnicliffe@gmail.com&gt;
 * [vkurchatkin](https://github.com/vkurchatkin) - **Vladimir Kurchatkin** &lt;vladimir.kurchatkin@gmail.com&gt;
 * [yosuke-furukawa](https://github.com/yosuke-furukawa) - **Yosuke Furukawa** &lt;yosuke.furukawa@gmail.com&gt;
+* [zkat](https://github.com/zkat) - **Kat Marchán** &lt;kzm@sykosomatic.org&gt;
 
 Collaborators & TSC members follow the [COLLABORATOR_GUIDE.md](./COLLABORATOR_GUIDE.md) in
 maintaining the Node.js project.

From fa0cdf75d9783256b6afee9ed6ab3355fa68effa Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rebecca@npmjs.com>
Date: Thu, 3 Dec 2015 15:48:00 -0800
Subject: [PATCH 298/323] doc: add iarna to collaborators
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/4144
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
Reviewed-By: Kat Marchán <kzm@sykosomatic.org>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index e2fde1ffeaffc6..f057645b5b5b8e 100644
--- a/README.md
+++ b/README.md
@@ -389,6 +389,7 @@ information about the governance of the Node.js project, see
 * [domenic](https://github.com/domenic) - **Domenic Denicola** &lt;d@domenic.me&gt;
 * [evanlucas](https://github.com/evanlucas) - **Evan Lucas** &lt;evanlucas@me.com&gt;
 * [geek](https://github.com/geek) - **Wyatt Preul** &lt;wpreul@gmail.com&gt;
+* [iarna](https://github.com/iarna) - **Rebecca Turner** &lt;me@re-becca.org&gt;
 * [isaacs](https://github.com/isaacs) - **Isaac Z. Schlueter** &lt;i@izs.me&gt;
 * [jbergstroem](https://github.com/jbergstroem) - **Johan Bergström** &lt;bugs@bergstroem.nu&gt;
 * [joaocgreis](https://github.com/joaocgreis) - **João Reis** &lt;reis@janeasystems.com&gt;

From fd5ed6888d25bf14fa2ad35a8ab8b251a4a4a6f1 Mon Sep 17 00:00:00 2001
From: Minwoo Jung <jmwsoft@gmail.com>
Date: Fri, 4 Dec 2015 08:49:56 +0900
Subject: [PATCH 299/323] doc: add JungMinu to collaborators
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/4143
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Colin Ihrig <http://www.cjihrig.com>
Reviewed-By: Kat Marchán <kzm@sykosomatic.org>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f057645b5b5b8e..71582cee7771d5 100644
--- a/README.md
+++ b/README.md
@@ -394,6 +394,7 @@ information about the governance of the Node.js project, see
 * [jbergstroem](https://github.com/jbergstroem) - **Johan Bergström** &lt;bugs@bergstroem.nu&gt;
 * [joaocgreis](https://github.com/joaocgreis) - **João Reis** &lt;reis@janeasystems.com&gt;
 * [julianduque](https://github.com/julianduque) - **Julian Duque** &lt;julianduquej@gmail.com&gt;
+* [JungMinu](https://github.com/JungMinu) - **Minwoo Jung** &lt;jmwsoft@gmail.com&gt;
 * [lxe](https://github.com/lxe) - **Aleksey Smolenchuk** &lt;lxe@lxe.co&gt;
 * [mhdawson](https://github.com/mhdawson) - **Michael Dawson** &lt;michael_dawson@ca.ibm.com&gt;
 * [micnic](https://github.com/micnic) - **Nicu Micleușanu** &lt;micnic90@gmail.com&gt;

From 458facdf66395c38cfb6104109cf39d2938c9709 Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Thu, 3 Dec 2015 20:07:30 -0500
Subject: [PATCH 300/323] src: define getpid() based on OS

94b9948 added unistd.h to src/env.cc in order to use getpid().
However, this doesn't exist on Windows. This commit conditionally
defines getpid() based on the OS.

Fixes: https://github.com/nodejs/node/issues/4145
PR-URL: https://github.com/nodejs/node/pull/4146
Reviewed-By: Brian White <mscdex@mscdex.net>
---
 src/env.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/env.cc b/src/env.cc
index e28866efd06894..d5845ad8b5e692 100644
--- a/src/env.cc
+++ b/src/env.cc
@@ -1,6 +1,13 @@
 #include "env.h"
 #include "env-inl.h"
 #include "v8.h"
+
+#if defined(_MSC_VER)
+#define getpid GetCurrentProcessId
+#else
+#include <unistd.h>
+#endif
+
 #include <stdio.h>
 
 namespace node {

From 756ab9caadcba43d59149584accdd204ac173e40 Mon Sep 17 00:00:00 2001
From: Brian White <mscdex@mscdex.net>
Date: Thu, 3 Dec 2015 18:37:38 -0500
Subject: [PATCH 301/323] stream: be less eager with readable flag

As of 34b535f4c, test-child-process-flush-stdio was failing
on CentOS 5 systems in CI due to the change in stream state
checking in `child_process`. This commit fixes those failures
by making readable streams less eager in setting their readable
flag on EOF.

Fixes: https://github.com/nodejs/node/issues/4125
PR-URL: https://github.com/nodejs/node/pull/4141
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/_stream_readable.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index 99be380196591f..7074cd2ca508a5 100644
--- a/lib/_stream_readable.js
+++ b/lib/_stream_readable.js
@@ -385,7 +385,6 @@ function onEofChunk(stream, state) {
     }
   }
   state.ended = true;
-  stream.readable = false;
 
   // emit 'readable' now to make sure it gets picked up.
   emitReadable(stream);

From be41eb751b0705f90c5a5eb795724bb3a72047c5 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 27 Nov 2015 19:40:56 -0800
Subject: [PATCH 302/323] test: refactor test-http-exit-delay

test-http-exit-delay was introduced to confirm the removal of a 1 second
delay that can occur when exiting node after an http request.

This change refactors the test for simplicity and also in the hopes of
either eliminating flakiness on CI or, if not that, at least making
the source of the flakiness easier to track down.

Ref: https://github.com/nodejs/node/commit/16b59cbc
Fixes: https://github.com/nodejs/node/issues/4045
PR-URL: https://github.com/nodejs/node/pull/4055
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/parallel/test-http-exit-delay.js | 45 ++++++++++-----------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/test/parallel/test-http-exit-delay.js b/test/parallel/test-http-exit-delay.js
index b06b33b5948eaf..507ce5b1fc58e2 100644
--- a/test/parallel/test-http-exit-delay.js
+++ b/test/parallel/test-http-exit-delay.js
@@ -1,41 +1,30 @@
 'use strict';
-var assert = require('assert');
-var common = require('../common');
-var http = require('http');
+const assert = require('assert');
+const common = require('../common');
+const http = require('http');
 
 var start;
-var server = http.createServer(function(req, res) {
+const server = http.createServer(common.mustCall(function(req, res) {
   req.resume();
   req.on('end', function() {
     res.end('Success');
   });
 
   server.close();
-});
-
-server.listen(common.PORT, 'localhost', function() {
-  var interval_id = setInterval(function() {
-    start = new Date();
-    if (start.getMilliseconds() > 100)
-      return;
-
-    console.log(start.toISOString());
-    var req = http.request({
-      'host': 'localhost',
-      'port': common.PORT,
-      'agent': false,
-      'method': 'PUT'
-    });
+}));
 
-    req.end('Test');
-    clearInterval(interval_id);
-  }, 10);
-});
+server.listen(common.PORT, 'localhost', common.mustCall(function() {
+  start = new Date();
+  const req = http.request({
+    'host': 'localhost',
+    'port': common.PORT,
+    'agent': false,
+    'method': 'PUT'
+  });
+  req.end('Test');
+}));
 
 process.on('exit', function() {
-  var end = new Date();
-  console.log(end.toISOString());
-  assert.equal(start.getSeconds(), end.getSeconds());
-  assert(end.getMilliseconds() < 900);
-  console.log('ok');
+  const end = new Date();
+  assert(end - start < 1000, 'Entire test should take less than one second');
 });

From 0cd4a523926b9e293d518c040e07598640bb7cbc Mon Sep 17 00:00:00 2001
From: yorkie <yorkiefixer@gmail.com>
Date: Fri, 4 Dec 2015 06:07:01 +0800
Subject: [PATCH 303/323] doc: improve child_process.markdown wording

PR-URL: https://github.com/nodejs/node/pull/4138
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/child_process.markdown | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/api/child_process.markdown b/doc/api/child_process.markdown
index d6791ac07bb033..322add74f46b81 100644
--- a/doc/api/child_process.markdown
+++ b/doc/api/child_process.markdown
@@ -26,9 +26,9 @@ Child processes always have three streams associated with them. `child.stdin`,
 streams of the parent process, or they may be separate stream objects
 which can be piped to and from.
 
-The ChildProcess class is not intended to be used directly.  Use the
-[`spawn()`][], [`exec()`][], [`execFile()`][], or [`fork()`][] methods to create a Child
-Process instance.
+The `ChildProcess` class is not intended to be used directly.  Use the
+[`spawn()`][], [`exec()`][], [`execFile()`][], or [`fork()`][] methods to create
+an instance of `ChildProcess`.
 
 ### Event: 'close'
 

From d969c0965caf2faeabfe2de6f957879c78f25461 Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Wed, 2 Dec 2015 11:49:35 -0500
Subject: [PATCH 304/323] src: define Is* util functions with macros

The Is* type checking functions in node_util.cc are mostly
the same boilerplate. This commit defines them using a macro.

Refs: https://github.com/nodejs/node/pull/4100
PR-URL: https://github.com/nodejs/node/pull/4118
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 src/node_util.cc | 66 +++++++++++++++++-------------------------------
 1 file changed, 23 insertions(+), 43 deletions(-)

diff --git a/src/node_util.cc b/src/node_util.cc
index ea800ff339a36f..1e0f214ae4470a 100644
--- a/src/node_util.cc
+++ b/src/node_util.cc
@@ -14,45 +14,27 @@ using v8::String;
 using v8::Value;
 
 
-static void IsRegExp(const FunctionCallbackInfo<Value>& args) {
-  CHECK_EQ(1, args.Length());
-  args.GetReturnValue().Set(args[0]->IsRegExp());
-}
-
+#define VALUE_METHOD_MAP(V)                                                   \
+  V(isArrayBuffer, IsArrayBuffer)                                             \
+  V(isDataView, IsDataView)                                                   \
+  V(isDate, IsDate)                                                           \
+  V(isMap, IsMap)                                                             \
+  V(isMapIterator, IsMapIterator)                                             \
+  V(isPromise, IsPromise)                                                     \
+  V(isRegExp, IsRegExp)                                                       \
+  V(isSet, IsSet)                                                             \
+  V(isSetIterator, IsSetIterator)                                             \
+  V(isTypedArray, IsTypedArray)
 
-static void IsDate(const FunctionCallbackInfo<Value>& args) {
-  CHECK_EQ(1, args.Length());
-  args.GetReturnValue().Set(args[0]->IsDate());
-}
 
+#define V(_, ucname) \
+  static void ucname(const FunctionCallbackInfo<Value>& args) {               \
+    CHECK_EQ(1, args.Length());                                               \
+    args.GetReturnValue().Set(args[0]->ucname());                             \
+  }
 
-static void IsMap(const FunctionCallbackInfo<Value>& args) {
-  CHECK_EQ(1, args.Length());
-  args.GetReturnValue().Set(args[0]->IsMap());
-}
-
-
-static void IsMapIterator(const FunctionCallbackInfo<Value>& args) {
-  CHECK_EQ(1, args.Length());
-  args.GetReturnValue().Set(args[0]->IsMapIterator());
-}
-
-
-static void IsSet(const FunctionCallbackInfo<Value>& args) {
-  CHECK_EQ(1, args.Length());
-  args.GetReturnValue().Set(args[0]->IsSet());
-}
-
-
-static void IsSetIterator(const FunctionCallbackInfo<Value>& args) {
-  CHECK_EQ(1, args.Length());
-  args.GetReturnValue().Set(args[0]->IsSetIterator());
-}
-
-static void IsPromise(const FunctionCallbackInfo<Value>& args) {
-  CHECK_EQ(1, args.Length());
-  args.GetReturnValue().Set(args[0]->IsPromise());
-}
+  VALUE_METHOD_MAP(V)
+#undef V
 
 
 static void GetHiddenValue(const FunctionCallbackInfo<Value>& args) {
@@ -75,13 +57,11 @@ void Initialize(Local<Object> target,
                 Local<Value> unused,
                 Local<Context> context) {
   Environment* env = Environment::GetCurrent(context);
-  env->SetMethod(target, "isRegExp", IsRegExp);
-  env->SetMethod(target, "isDate", IsDate);
-  env->SetMethod(target, "isMap", IsMap);
-  env->SetMethod(target, "isMapIterator", IsMapIterator);
-  env->SetMethod(target, "isSet", IsSet);
-  env->SetMethod(target, "isSetIterator", IsSetIterator);
-  env->SetMethod(target, "isPromise", IsPromise);
+
+#define V(lcname, ucname) env->SetMethod(target, #lcname, ucname);
+  VALUE_METHOD_MAP(V)
+#undef V
+
   env->SetMethod(target, "getHiddenValue", GetHiddenValue);
 }
 

From 9d16729b2037c12af56583acbcc255a87cc8d6d2 Mon Sep 17 00:00:00 2001
From: Michael Cornacchia <cornacch@ca.ibm.com>
Date: Fri, 6 Nov 2015 12:51:48 -0500
Subject: [PATCH 305/323] test: skip instead of fail when mem constrained
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The current implementation of tests for strings with length at or
exceeding kStringMaxLength allocate a temporary buffer inside a try
block to skip the test if there is insufficient memory. This commit adds
an invocation of the garbage collector after the temporary buffer is
allocated so that memory is freed for later allocations.

Change the corresponding catch block to rethrow the original exception
instead of asserting the exception message to provide more information
about the exception.

Add an additional check before trying to allocate memory to immediately
skip the test on machines with insufficient total memory.

PR-URL: https://github.com/nodejs/node/pull/3697
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
---
 test/common.js                                |  2 ++
 .../test-stringbytes-external-at-max.js       | 24 ++++++++++++-----
 ...ingbytes-external-exceed-max-by-1-ascii.js | 24 ++++++++++++-----
 ...ngbytes-external-exceed-max-by-1-base64.js | 24 ++++++++++++-----
 ...ngbytes-external-exceed-max-by-1-binary.js | 24 ++++++++++++-----
 ...tringbytes-external-exceed-max-by-1-hex.js | 24 ++++++++++++-----
 ...ringbytes-external-exceed-max-by-1-utf8.js | 24 ++++++++++++-----
 ...st-stringbytes-external-exceed-max-by-2.js | 26 +++++++++++++------
 .../test-stringbytes-external-exceed-max.js   | 26 +++++++++++++------
 9 files changed, 140 insertions(+), 58 deletions(-)

diff --git a/test/common.js b/test/common.js
index 470f2f4688d598..5fb1e05a5f9c20 100644
--- a/test/common.js
+++ b/test/common.js
@@ -22,6 +22,8 @@ exports.isLinuxPPCBE = (process.platform === 'linux') &&
 exports.isSunOS = process.platform === 'sunos';
 exports.isFreeBSD = process.platform === 'freebsd';
 
+exports.enoughTestMem = os.totalmem() > 0x20000000; /* 512MB */
+
 function rimrafSync(p) {
   try {
     var st = fs.lstatSync(p);
diff --git a/test/parallel/test-stringbytes-external-at-max.js b/test/parallel/test-stringbytes-external-at-max.js
index 6678e5355224b3..31f476d66b18ba 100644
--- a/test/parallel/test-stringbytes-external-at-max.js
+++ b/test/parallel/test-stringbytes-external-at-max.js
@@ -1,22 +1,32 @@
 'use strict';
+// Flags: --expose-gc
 
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 
 // v8 fails silently if string length > v8::String::kMaxLength
 // v8::String::kMaxLength defined in v8.h
 const kStringMaxLength = process.binding('buffer').kStringMaxLength;
 
+const skipMessage =
+  '1..0 # Skipped: intensive toString tests due to memory confinements';
+if (!common.enoughTestMem) {
+  console.log(skipMessage);
+  return;
+}
+assert(typeof gc === 'function', 'Run this test with --expose-gc');
+
 try {
-  new Buffer(kStringMaxLength * 3);
+  var buf = new Buffer(kStringMaxLength);
+  // Try to allocate memory first then force gc so future allocations succeed.
+  new Buffer(2 * kStringMaxLength);
+  gc();
 } catch(e) {
-  assert.equal(e.message, 'Invalid array buffer length');
-  console.log(
-      '1..0 # Skipped: intensive toString tests due to memory confinements');
+  // If the exception is not due to memory confinement then rethrow it.
+  if (e.message !== 'Invalid array buffer length') throw (e);
+  console.log(skipMessage);
   return;
 }
 
-const buf = new Buffer(kStringMaxLength);
-
 const maxString = buf.toString('binary');
 assert.equal(maxString.length, kStringMaxLength);
diff --git a/test/parallel/test-stringbytes-external-exceed-max-by-1-ascii.js b/test/parallel/test-stringbytes-external-exceed-max-by-1-ascii.js
index e982cf9eb092fd..4789089d5e0040 100644
--- a/test/parallel/test-stringbytes-external-exceed-max-by-1-ascii.js
+++ b/test/parallel/test-stringbytes-external-exceed-max-by-1-ascii.js
@@ -1,23 +1,33 @@
 'use strict';
+// Flags: --expose-gc
 
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 
+const skipMessage =
+  '1..0 # Skipped: intensive toString tests due to memory confinements';
+if (!common.enoughTestMem) {
+  console.log(skipMessage);
+  return;
+}
+assert(typeof gc === 'function', 'Run this test with --expose-gc');
+
 // v8 fails silently if string length > v8::String::kMaxLength
 // v8::String::kMaxLength defined in v8.h
 const kStringMaxLength = process.binding('buffer').kStringMaxLength;
 
 try {
-  new Buffer(kStringMaxLength * 3);
+  var buf = new Buffer(kStringMaxLength + 1);
+  // Try to allocate memory first then force gc so future allocations succeed.
+  new Buffer(2 * kStringMaxLength);
+  gc();
 } catch(e) {
-  assert.equal(e.message, 'Invalid array buffer length');
-  console.log(
-      '1..0 # Skipped: intensive toString tests due to memory confinements');
+  // If the exception is not due to memory confinement then rethrow it.
+  if (e.message !== 'Invalid array buffer length') throw (e);
+  console.log(skipMessage);
   return;
 }
 
-const buf = new Buffer(kStringMaxLength + 1);
-
 assert.throws(function() {
   buf.toString('ascii');
 }, /toString failed/);
diff --git a/test/parallel/test-stringbytes-external-exceed-max-by-1-base64.js b/test/parallel/test-stringbytes-external-exceed-max-by-1-base64.js
index 43a3358759e249..8f52d6ac30dd9f 100644
--- a/test/parallel/test-stringbytes-external-exceed-max-by-1-base64.js
+++ b/test/parallel/test-stringbytes-external-exceed-max-by-1-base64.js
@@ -1,23 +1,33 @@
 'use strict';
+// Flags: --expose-gc
 
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 
+const skipMessage =
+  '1..0 # Skipped: intensive toString tests due to memory confinements';
+if (!common.enoughTestMem) {
+  console.log(skipMessage);
+  return;
+}
+assert(typeof gc === 'function', 'Run this test with --expose-gc');
+
 // v8 fails silently if string length > v8::String::kMaxLength
 // v8::String::kMaxLength defined in v8.h
 const kStringMaxLength = process.binding('buffer').kStringMaxLength;
 
 try {
-  new Buffer(kStringMaxLength * 3);
+  var buf = new Buffer(kStringMaxLength + 1);
+  // Try to allocate memory first then force gc so future allocations succeed.
+  new Buffer(2 * kStringMaxLength);
+  gc();
 } catch(e) {
-  assert.equal(e.message, 'Invalid array buffer length');
-  console.log(
-      '1..0 # Skipped: intensive toString tests due to memory confinements');
+  // If the exception is not due to memory confinement then rethrow it.
+  if (e.message !== 'Invalid array buffer length') throw (e);
+  console.log(skipMessage);
   return;
 }
 
-const buf = new Buffer(kStringMaxLength + 1);
-
 assert.throws(function() {
   buf.toString('base64');
 }, /toString failed/);
diff --git a/test/parallel/test-stringbytes-external-exceed-max-by-1-binary.js b/test/parallel/test-stringbytes-external-exceed-max-by-1-binary.js
index 9d0d2c3e897057..79dac9cc41dcf0 100644
--- a/test/parallel/test-stringbytes-external-exceed-max-by-1-binary.js
+++ b/test/parallel/test-stringbytes-external-exceed-max-by-1-binary.js
@@ -1,23 +1,33 @@
 'use strict';
+// Flags: --expose-gc
 
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 
+const skipMessage =
+  '1..0 # Skipped: intensive toString tests due to memory confinements';
+if (!common.enoughTestMem) {
+  console.log(skipMessage);
+  return;
+}
+assert(typeof gc === 'function', 'Run this test with --expose-gc');
+
 // v8 fails silently if string length > v8::String::kMaxLength
 // v8::String::kMaxLength defined in v8.h
 const kStringMaxLength = process.binding('buffer').kStringMaxLength;
 
 try {
-  new Buffer(kStringMaxLength * 3);
+  var buf = new Buffer(kStringMaxLength + 1);
+  // Try to allocate memory first then force gc so future allocations succeed.
+  new Buffer(2 * kStringMaxLength);
+  gc();
 } catch(e) {
-  assert.equal(e.message, 'Invalid array buffer length');
-  console.log(
-      '1..0 # Skipped: intensive toString tests due to memory confinements');
+  // If the exception is not due to memory confinement then rethrow it.
+  if (e.message !== 'Invalid array buffer length') throw (e);
+  console.log(skipMessage);
   return;
 }
 
-const buf = new Buffer(kStringMaxLength + 1);
-
 assert.throws(function() {
   buf.toString('binary');
 }, /toString failed/);
diff --git a/test/parallel/test-stringbytes-external-exceed-max-by-1-hex.js b/test/parallel/test-stringbytes-external-exceed-max-by-1-hex.js
index 2937b4aab85813..50d0dad5829160 100644
--- a/test/parallel/test-stringbytes-external-exceed-max-by-1-hex.js
+++ b/test/parallel/test-stringbytes-external-exceed-max-by-1-hex.js
@@ -1,23 +1,33 @@
 'use strict';
+// Flags: --expose-gc
 
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 
+const skipMessage =
+  '1..0 # Skipped: intensive toString tests due to memory confinements';
+if (!common.enoughTestMem) {
+  console.log(skipMessage);
+  return;
+}
+assert(typeof gc === 'function', 'Run this test with --expose-gc');
+
 // v8 fails silently if string length > v8::String::kMaxLength
 // v8::String::kMaxLength defined in v8.h
 const kStringMaxLength = process.binding('buffer').kStringMaxLength;
 
 try {
-  new Buffer(kStringMaxLength * 3);
+  var buf = new Buffer(kStringMaxLength + 1);
+  // Try to allocate memory first then force gc so future allocations succeed.
+  new Buffer(2 * kStringMaxLength);
+  gc();
 } catch(e) {
-  assert.equal(e.message, 'Invalid array buffer length');
-  console.log(
-      '1..0 # Skipped: intensive toString tests due to memory confinements');
+  // If the exception is not due to memory confinement then rethrow it.
+  if (e.message !== 'Invalid array buffer length') throw (e);
+  console.log(skipMessage);
   return;
 }
 
-const buf = new Buffer(kStringMaxLength + 1);
-
 assert.throws(function() {
   buf.toString('hex');
 }, /toString failed/);
diff --git a/test/parallel/test-stringbytes-external-exceed-max-by-1-utf8.js b/test/parallel/test-stringbytes-external-exceed-max-by-1-utf8.js
index ee297a880dacbd..ecd6eaf954e191 100644
--- a/test/parallel/test-stringbytes-external-exceed-max-by-1-utf8.js
+++ b/test/parallel/test-stringbytes-external-exceed-max-by-1-utf8.js
@@ -1,23 +1,33 @@
 'use strict';
+// Flags: --expose-gc
 
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 
+const skipMessage =
+  '1..0 # Skipped: intensive toString tests due to memory confinements';
+if (!common.enoughTestMem) {
+  console.log(skipMessage);
+  return;
+}
+assert(typeof gc === 'function', 'Run this test with --expose-gc');
+
 // v8 fails silently if string length > v8::String::kMaxLength
 // v8::String::kMaxLength defined in v8.h
 const kStringMaxLength = process.binding('buffer').kStringMaxLength;
 
 try {
-  new Buffer(kStringMaxLength * 3);
+  var buf = new Buffer(kStringMaxLength + 1);
+  // Try to allocate memory first then force gc so future allocations succeed.
+  new Buffer(2 * kStringMaxLength);
+  gc();
 } catch(e) {
-  assert.equal(e.message, 'Invalid array buffer length');
-  console.log(
-      '1..0 # Skipped: intensive toString tests due to memory confinements');
+  // If the exception is not due to memory confinement then rethrow it.
+  if (e.message !== 'Invalid array buffer length') throw (e);
+  console.log(skipMessage);
   return;
 }
 
-const buf = new Buffer(kStringMaxLength + 1);
-
 assert.throws(function() {
   buf.toString();
 }, /toString failed|Invalid array buffer length/);
diff --git a/test/parallel/test-stringbytes-external-exceed-max-by-2.js b/test/parallel/test-stringbytes-external-exceed-max-by-2.js
index 879e4ae91dfb60..8350c4532eafdc 100644
--- a/test/parallel/test-stringbytes-external-exceed-max-by-2.js
+++ b/test/parallel/test-stringbytes-external-exceed-max-by-2.js
@@ -1,22 +1,32 @@
 'use strict';
+// Flags: --expose-gc
 
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 
+const skipMessage =
+  '1..0 # Skipped: intensive toString tests due to memory confinements';
+if (!common.enoughTestMem) {
+  console.log(skipMessage);
+  return;
+}
+assert(typeof gc === 'function', 'Run this test with --expose-gc');
+
 // v8 fails silently if string length > v8::String::kMaxLength
 // v8::String::kMaxLength defined in v8.h
 const kStringMaxLength = process.binding('buffer').kStringMaxLength;
 
 try {
-  new Buffer(kStringMaxLength * 3);
+  var buf = new Buffer(kStringMaxLength + 2);
+  // Try to allocate memory first then force gc so future allocations succeed.
+  new Buffer(2 * kStringMaxLength);
+  gc();
 } catch(e) {
-  assert.equal(e.message, 'Invalid array buffer length');
-  console.log(
-      '1..0 # Skipped: intensive toString tests due to memory confinements');
+  // If the exception is not due to memory confinement then rethrow it.
+  if (e.message !== 'Invalid array buffer length') throw (e);
+  console.log(skipMessage);
   return;
 }
 
-const buf2 = new Buffer(kStringMaxLength + 2);
-
-const maxString = buf2.toString('utf16le');
+const maxString = buf.toString('utf16le');
 assert.equal(maxString.length, (kStringMaxLength + 2) / 2);
diff --git a/test/parallel/test-stringbytes-external-exceed-max.js b/test/parallel/test-stringbytes-external-exceed-max.js
index 0a6f585b66f3ad..fd19cfb9e20697 100644
--- a/test/parallel/test-stringbytes-external-exceed-max.js
+++ b/test/parallel/test-stringbytes-external-exceed-max.js
@@ -1,23 +1,33 @@
 'use strict';
+// Flags: --expose-gc
 
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 
+const skipMessage =
+  '1..0 # Skipped: intensive toString tests due to memory confinements';
+if (!common.enoughTestMem) {
+  console.log(skipMessage);
+  return;
+}
+assert(typeof gc === 'function', 'Run this test with --expose-gc');
+
 // v8 fails silently if string length > v8::String::kMaxLength
 // v8::String::kMaxLength defined in v8.h
 const kStringMaxLength = process.binding('buffer').kStringMaxLength;
 
 try {
-  new Buffer(kStringMaxLength * 3);
+  var buf = new Buffer(kStringMaxLength * 2 + 2);
+  // Try to allocate memory first then force gc so future allocations succeed.
+  new Buffer(2 * kStringMaxLength);
+  gc();
 } catch(e) {
-  assert.equal(e.message, 'Invalid array buffer length');
-  console.log(
-      '1..0 # Skipped: intensive toString tests due to memory confinements');
+  // If the exception is not due to memory confinement then rethrow it.
+  if (e.message !== 'Invalid array buffer length') throw (e);
+  console.log(skipMessage);
   return;
 }
 
-const buf0 = new Buffer(kStringMaxLength * 2 + 2);
-
 assert.throws(function() {
-  buf0.toString('utf16le');
+  buf.toString('utf16le');
 }, /toString failed/);

From 6f957a70d86d322f0a9825659c048cebf15b9ab5 Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Tue, 24 Nov 2015 14:07:29 +1100
Subject: [PATCH 306/323] doc: s/node.js/Node.js in readme
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/3998
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 71582cee7771d5..9cc24ad94bae60 100644
--- a/README.md
+++ b/README.md
@@ -147,7 +147,7 @@ $ man doc/node.1
 To test if Node.js was built correctly:
 
 ```
-$ node -e "console.log('Hello from node.js ' + process.version)"
+$ node -e "console.log('Hello from Node.js ' + process.version)"
 ```
 
 ### Windows
@@ -174,7 +174,7 @@ To run the tests:
 To test if Node.js was built correctly:
 
 ```
-$ node -e "console.log('Hello from node.js ' + process.version)"
+$ node -e "console.log('Hello from Node.js ' + process.version)"
 ```
 
 ### Android / Android based devices, aka. Firefox OS
@@ -350,7 +350,7 @@ Instructions:
 
 ## Security
 
-All security bugs in node.js are taken seriously and should be reported by
+All security bugs in Node.js are taken seriously and should be reported by
 emailing security@nodejs.org. This will be delivered to a subset of the project
 team who handle security issues. Please don't disclose security bugs
 publicly until they have been handled by the security team.

From da6be4d31a75478905128856cf91896a8d15b0cb Mon Sep 17 00:00:00 2001
From: Gireesh Punathil <gpunathi@in.ibm.com>
Date: Mon, 23 Nov 2015 04:28:13 -0500
Subject: [PATCH 307/323] test: fix time resolution constraint

The modification time of a file is assumed to happen at the
exact time when it was requested. As the utime API specification
delcares that the resolution of the result is 1 second,
relax the constrain to 1 second helps the test case to be
robust and consistent under different load conditions in the system

PR-URL: https://github.com/nodejs/node/pull/3981
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
---
 test/parallel/test-fs-utimes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/parallel/test-fs-utimes.js b/test/parallel/test-fs-utimes.js
index 49746bfbfb8bb5..2ad6cea4379b2e 100644
--- a/test/parallel/test-fs-utimes.js
+++ b/test/parallel/test-fs-utimes.js
@@ -23,7 +23,7 @@ function check_mtime(resource, mtime) {
   var real_mtime = fs._toUnixTimestamp(stats.mtime);
   // check up to single-second precision
   // sub-second precision is OS and fs dependant
-  return Math.floor(mtime) == Math.floor(real_mtime);
+  return mtime - real_mtime < 2;
 }
 
 function expect_errno(syscall, resource, err, errno) {

From 9e9346fa3254b492e87430a12742eba80e6bc6fe Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Sat, 5 Dec 2015 00:31:49 +0100
Subject: [PATCH 308/323] src: use GetCurrentProcessId() for process.pid

Commit a9c0c65 ("src: define getpid() based on OS") made src/env.cc
use `GetCurrentProcessId()` on Windows for the PID in log messages.
`GetCurrentProcessId()` is also what is used by libuv, OpenSSL and V8.

This commit makes `process.pid` use `GetCurrentProcessId()` instead of
`_getpid()` for consistency.

PR-URL: https://github.com/nodejs/node/pull/4163
Reviewed-By: Brian White <mscdex@mscdex.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
---
 src/node.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/node.cc b/src/node.cc
index 4e591ff5af6053..d8681292aad36a 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -68,9 +68,8 @@
 #if defined(_MSC_VER)
 #include <direct.h>
 #include <io.h>
-#include <process.h>
 #define strcasecmp _stricmp
-#define getpid _getpid
+#define getpid GetCurrentProcessId
 #define umask _umask
 typedef int mode_t;
 #else

From e3a8e8bba420dbd588d2ece64be01537b85d6f1c Mon Sep 17 00:00:00 2001
From: Bryce Baril <bryce@ravenwall.com>
Date: Fri, 4 Dec 2015 10:08:51 -0800
Subject: [PATCH 309/323] buffer: Prevent Buffer constructor deopt

The Buffer constructor will generally get inlined, but any call to the Buffer
constructor for a string without encoding will cause an eager deoptimization
of any function that inlined the Buffer constructor. This is due to a an
out-of-bounds read on `arguments[1]`. This change prevents that deopt.

PR-URL: https://github.com/nodejs/node/pull/4158
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
---
 lib/buffer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/buffer.js b/lib/buffer.js
index f37bdcc60ed300..5f67ea104b47de 100644
--- a/lib/buffer.js
+++ b/lib/buffer.js
@@ -40,7 +40,7 @@ function alignPool() {
 }
 
 
-function Buffer(arg) {
+function Buffer(arg, encoding) {
   // Common case.
   if (typeof arg === 'number') {
     // If less than zero, or NaN.
@@ -51,7 +51,7 @@ function Buffer(arg) {
 
   // Slightly less common case.
   if (typeof arg === 'string') {
-    return fromString(arg, arguments[1]);
+    return fromString(arg, encoding);
   }
 
   // Unusual.

From b3f3b2e1571cded4a80e03fa582186ee76cd2cd8 Mon Sep 17 00:00:00 2001
From: Santiago Gimeno <santiago.gimeno@gmail.com>
Date: Sat, 21 Nov 2015 15:33:51 +0100
Subject: [PATCH 310/323] test: fix cluster-worker-isdead
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Check if the worker 'isDead' instead of 'isConnected' as the
'disconnect' event is not guaranteed to be received before the
'exit' event.
Remove the 'net' dependency as it is not used.

PR-URL: https://github.com/nodejs/node/pull/3954
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
---
 test/parallel/test-cluster-worker-isdead.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/parallel/test-cluster-worker-isdead.js b/test/parallel/test-cluster-worker-isdead.js
index 70a96539851398..90454cb86089a7 100644
--- a/test/parallel/test-cluster-worker-isdead.js
+++ b/test/parallel/test-cluster-worker-isdead.js
@@ -2,7 +2,6 @@
 require('../common');
 var cluster = require('cluster');
 var assert = require('assert');
-var net = require('net');
 
 if (cluster.isMaster) {
   var worker = cluster.fork();
@@ -11,7 +10,7 @@ if (cluster.isMaster) {
             'created.');
 
   worker.on('exit', function() {
-    assert.ok(!worker.isConnected(),
+    assert.ok(worker.isDead(),
               'After an event has been emitted, ' +
               'isDead should return true');
   });

From 634c5f1f81da0bf5c41ceb997ada2a2d2a29ca1b Mon Sep 17 00:00:00 2001
From: fansworld-claudio <cr@fansworld.tv>
Date: Wed, 2 Dec 2015 14:58:50 -0300
Subject: [PATCH 311/323] doc: url.format - true slash postfix behaviour

Change url.format's references to slash postfixing to reflect
true behaviour (it only automatically postfixes slashes to the
slashedProtocols when host is present).

Fixes: #3361

PR-URL: https://github.com/nodejs/node/pull/4119
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
---
 doc/api/url.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/api/url.markdown b/doc/api/url.markdown
index 8c8cd5bf1b85bf..c6a4b2351b0227 100644
--- a/doc/api/url.markdown
+++ b/doc/api/url.markdown
@@ -87,12 +87,12 @@ Here's how the formatting process works:
 * `path` will be ignored.
 * `protocol` is treated the same with or without the trailing `:` (colon).
   * The protocols `http`, `https`, `ftp`, `gopher`, `file` will be
-    postfixed with `://` (colon-slash-slash).
+    postfixed with `://` (colon-slash-slash) as long as `host`/`hostname` are present.
   * All other protocols `mailto`, `xmpp`, `aim`, `sftp`, `foo`, etc will
     be postfixed with `:` (colon).
 * `slashes` set to `true` if the protocol requires `://` (colon-slash-slash)
   * Only needs to be set for protocols not previously listed as requiring
-    slashes, such as `mongodb://localhost:8000/`.
+    slashes, such as `mongodb://localhost:8000/`, or if `host`/`hostname` are absent.
 * `auth` will be used if present.
 * `hostname` will only be used if `host` is absent.
 * `port` will only be used if `host` is absent.

From 4c8800c2dec2fc8d0a6b3cf71f22fb7b69e6c83b Mon Sep 17 00:00:00 2001
From: yorkie <yorkiefixer@gmail.com>
Date: Wed, 25 Nov 2015 12:40:42 +0800
Subject: [PATCH 312/323] fs,doc: use `target` instead of `destination`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/3912
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: Bert Belder <bertbelder@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 doc/api/fs.markdown | 12 +++++++++---
 lib/fs.js           | 12 ++++++------
 src/node_file.cc    | 10 +++++-----
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/doc/api/fs.markdown b/doc/api/fs.markdown
index 3b1ac6d7412557..7c06803b3ee72a 100644
--- a/doc/api/fs.markdown
+++ b/doc/api/fs.markdown
@@ -664,16 +664,22 @@ information.
 
 Synchronous stat(2). Returns an instance of [`fs.Stats`][].
 
-## fs.symlink(destination, path[, type], callback)
+## fs.symlink(target, path[, type], callback)
 
 Asynchronous symlink(2). No arguments other than a possible exception are given
 to the completion callback.
 The `type` argument can be set to `'dir'`, `'file'`, or `'junction'` (default
 is `'file'`) and is only available on Windows (ignored on other platforms).
 Note that Windows junction points require the destination path to be absolute.  When using
-`'junction'`, the `destination` argument will automatically be normalized to absolute path.
+`'junction'`, the `target` argument will automatically be normalized to absolute path.
 
-## fs.symlinkSync(destination, path[, type])
+Here is an example below:
+
+    fs.symlink('./foo', './new-port');
+
+It would create a symlic link named with "new-port" that points to "foo".
+
+## fs.symlinkSync(target, path[, type])
 
 Synchronous symlink(2). Returns `undefined`.
 
diff --git a/lib/fs.js b/lib/fs.js
index 8a0de7ccf14fcd..fe9ae991b8be64 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -920,29 +920,29 @@ function preprocessSymlinkDestination(path, type, linkPath) {
   }
 }
 
-fs.symlink = function(destination, path, type_, callback_) {
+fs.symlink = function(target, path, type_, callback_) {
   var type = (typeof type_ === 'string' ? type_ : null);
   var callback = makeCallback(arguments[arguments.length - 1]);
 
-  if (!nullCheck(destination, callback)) return;
+  if (!nullCheck(target, callback)) return;
   if (!nullCheck(path, callback)) return;
 
   var req = new FSReqWrap();
   req.oncomplete = callback;
 
-  binding.symlink(preprocessSymlinkDestination(destination, type, path),
+  binding.symlink(preprocessSymlinkDestination(target, type, path),
                   pathModule._makeLong(path),
                   type,
                   req);
 };
 
-fs.symlinkSync = function(destination, path, type) {
+fs.symlinkSync = function(target, path, type) {
   type = (typeof type === 'string' ? type : null);
 
-  nullCheck(destination);
+  nullCheck(target);
   nullCheck(path);
 
-  return binding.symlink(preprocessSymlinkDestination(destination, type, path),
+  return binding.symlink(preprocessSymlinkDestination(target, type, path),
                          pathModule._makeLong(path),
                          type);
 };
diff --git a/src/node_file.cc b/src/node_file.cc
index b84e0e44c442b0..b6ef7d5b78f70e 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -580,15 +580,15 @@ static void Symlink(const FunctionCallbackInfo<Value>& args) {
 
   int len = args.Length();
   if (len < 1)
-    return TYPE_ERROR("dest path required");
+    return TYPE_ERROR("target path required");
   if (len < 2)
     return TYPE_ERROR("src path required");
   if (!args[0]->IsString())
-    return TYPE_ERROR("dest path must be a string");
+    return TYPE_ERROR("target path must be a string");
   if (!args[1]->IsString())
     return TYPE_ERROR("src path must be a string");
 
-  node::Utf8Value dest(env->isolate(), args[0]);
+  node::Utf8Value target(env->isolate(), args[0]);
   node::Utf8Value path(env->isolate(), args[1]);
   int flags = 0;
 
@@ -604,9 +604,9 @@ static void Symlink(const FunctionCallbackInfo<Value>& args) {
   }
 
   if (args[3]->IsObject()) {
-    ASYNC_DEST_CALL(symlink, args[3], *path, *dest, *path, flags)
+    ASYNC_DEST_CALL(symlink, args[3], *path, *target, *path, flags)
   } else {
-    SYNC_DEST_CALL(symlink, *dest, *path, *dest, *path, flags)
+    SYNC_DEST_CALL(symlink, *target, *path, *target, *path, flags)
   }
 }
 

From e84aeec8831f853a1743d5f03664c1ca4cbf188a Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 4 Dec 2015 22:40:14 -0800
Subject: [PATCH 313/323] test: mark test-cluster-shared-leak flaky

test-cluster-shared-leak is flaky on Windows.

Refs: https://github.com/nodejs/node/issues/3956

PR-URL: https://github.com/nodejs/node/pull/4162
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Roman Klauke <romaaan.git@gmail.com>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
---
 test/parallel/parallel.status | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index b30ec2a7dc019f..b4d449a6f57ef0 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -7,9 +7,10 @@ prefix parallel
 [true] # This section applies to all platforms
 
 [$system==win32]
+test-child-process-fork-regr-gh-2847 : PASS,FLAKY
 test-cluster-net-send                : PASS,FLAKY
+test-cluster-shared-leak             : PASS,FLAKY
 test-tls-ticket-cluster              : PASS,FLAKY
-test-child-process-fork-regr-gh-2847 : PASS,FLAKY
 
 [$system==linux]
 test-http-client-timeout-event       : PASS,FLAKY

From 8f845ba28a07667b0f8bde452fc34829eae50f7d Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Sat, 5 Dec 2015 16:03:30 -0500
Subject: [PATCH 314/323] stream_wrap: error if stream has StringDecoder

If `.setEncoding` was called on input stream - all emitted `data` will
be `String`s instances, not `Buffer`s. This is unacceptable for
`StreamWrap`, and should not lead to the crash.

Fix: https://github.com/nodejs/node/issues/3970
PR-URL: https://github.com/nodejs/node/pull/4031
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 lib/_stream_wrap.js                        | 16 ++++++++++++---
 test/parallel/test-stream-wrap-encoding.js | 23 ++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 test/parallel/test-stream-wrap-encoding.js

diff --git a/lib/_stream_wrap.js b/lib/_stream_wrap.js
index 924d07a986a906..7eb3008484b2aa 100644
--- a/lib/_stream_wrap.js
+++ b/lib/_stream_wrap.js
@@ -4,6 +4,7 @@ const assert = require('assert');
 const util = require('util');
 const Socket = require('net').Socket;
 const JSStream = process.binding('js_stream').JSStream;
+const Buffer = require('buffer').Buffer;
 const uv = process.binding('uv');
 const debug = util.debuglog('stream_wrap');
 
@@ -39,15 +40,24 @@ function StreamWrap(stream) {
   };
 
   this.stream.pause();
-  this.stream.on('error', function(err) {
+  this.stream.on('error', function onerror(err) {
     self.emit('error', err);
   });
-  this.stream.on('data', function(chunk) {
+  this.stream.on('data', function ondata(chunk) {
+    if (!(chunk instanceof Buffer)) {
+      // Make sure that no further `data` events will happen
+      this.pause();
+      this.removeListener('data', ondata);
+
+      self.emit('error', new Error('Stream has StringDecoder'));
+      return;
+    }
+
     debug('data', chunk.length);
     if (self._handle)
       self._handle.readBuffer(chunk);
   });
-  this.stream.once('end', function() {
+  this.stream.once('end', function onend() {
     debug('end');
     if (self._handle)
       self._handle.emitEOF();
diff --git a/test/parallel/test-stream-wrap-encoding.js b/test/parallel/test-stream-wrap-encoding.js
new file mode 100644
index 00000000000000..d23faaab4a65f3
--- /dev/null
+++ b/test/parallel/test-stream-wrap-encoding.js
@@ -0,0 +1,23 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+
+const StreamWrap = require('_stream_wrap');
+const Duplex = require('stream').Duplex;
+
+const stream = new Duplex({
+  read: function() {
+  },
+  write: function() {
+  }
+});
+
+stream.setEncoding('ascii');
+
+const wrap = new StreamWrap(stream);
+
+wrap.on('error', common.mustCall(function(err) {
+  assert(/StringDecoder/.test(err.message));
+}));
+
+stream.push('ohai');

From 8a60aa13032b95bf89621a5ab4417db2fe280b00 Mon Sep 17 00:00:00 2001
From: Santiago Gimeno <santiago.gimeno@gmail.com>
Date: Sat, 21 Nov 2015 22:29:37 +0100
Subject: [PATCH 315/323] test: don't check the # of chunks in test-http-1.0

As it can happen that the HTTP response is received in more than
one TCP chunk.

PR-URL: https://github.com/nodejs/node/pull/3961
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
---
 test/parallel/test-http-1.0.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/test/parallel/test-http-1.0.js b/test/parallel/test-http-1.0.js
index bf55c616d91996..9989c9b969b879 100644
--- a/test/parallel/test-http-1.0.js
+++ b/test/parallel/test-http-1.0.js
@@ -13,10 +13,7 @@ function test(handler, request_generator, response_validator) {
   var server = http.createServer(handler);
 
   var client_got_eof = false;
-  var server_response = {
-    data: '',
-    chunks: []
-  };
+  var server_response = '';
 
   function cleanup() {
     server.close();
@@ -36,8 +33,7 @@ function test(handler, request_generator, response_validator) {
     });
 
     c.on('data', function(chunk) {
-      server_response.data += chunk;
-      server_response.chunks.push(chunk);
+      server_response += chunk;
     });
 
     c.on('end', function() {
@@ -65,7 +61,7 @@ function test(handler, request_generator, response_validator) {
   }
 
   function response_validator(server_response, client_got_eof, timed_out) {
-    var m = server_response.data.split('\r\n\r\n');
+    var m = server_response.split('\r\n\r\n');
     assert.equal(m[1], body);
     assert.equal(true, client_got_eof);
     assert.equal(false, timed_out);
@@ -107,8 +103,7 @@ function test(handler, request_generator, response_validator) {
         '\r\n' +
         'Hello, world!');
 
-    assert.equal(expected_response, server_response.data);
-    assert.equal(1, server_response.chunks.length);
+    assert.equal(expected_response, server_response);
     assert.equal(true, client_got_eof);
     assert.equal(false, timed_out);
   }
@@ -151,8 +146,7 @@ function test(handler, request_generator, response_validator) {
         '0\r\n' +
         '\r\n');
 
-    assert.equal(expected_response, server_response.data);
-    assert.equal(1, server_response.chunks.length);
+    assert.equal(expected_response, server_response);
     assert.equal(true, client_got_eof);
     assert.equal(false, timed_out);
   }

From 12649f449672d7488c82ce576969b6ba1a1d94b9 Mon Sep 17 00:00:00 2001
From: Super Zheng <superzheng@tencent.com>
Date: Fri, 4 Dec 2015 16:14:24 +0800
Subject: [PATCH 316/323] build: add "--partly-static" build options

A lot of machines don't upgrade libstdc++.so library for a long time,
but the new version of node requires the latest GLIBCXX.

Using "--fully-static" configurable options may resolve this problem,
but the side effect is that the size of the executable file will be
increased.

Adding "--partly-static" configurable options it will only build
libgcc and libstdc++ libraries into executable file, resolve the
problem and control the size of file.

PR-URL: https://github.com/nodejs/node/pull/4152
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
---
 configure | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 45d401b7485ad8..811303ed452d7f 100755
--- a/configure
+++ b/configure
@@ -84,7 +84,13 @@ parser.add_option("--fully-static",
     action="store_true",
     dest="fully_static",
     help="Generate an executable without external dynamic libraries. This "
-         "will not work on OSX when using default compilation environment")
+         "will not work on OSX when using the default compilation environment")
+
+parser.add_option("--partly-static",
+    action="store_true",
+    dest="partly_static",
+    help="Generate an executable with libgcc and libstdc++ libraries. This "
+         "will not work on OSX when using the default compilation environment")
 
 parser.add_option("--enable-vtune-profiling",
     action="store_true",
@@ -816,12 +822,19 @@ def configure_openssl(o):
   configure_library('openssl', o)
 
 
-def configure_fullystatic(o):
-  if options.fully_static:
-    o['libraries'] += ['-static']
+def configure_static(o):
+  if options.fully_static or options.partly_static:
     if flavor == 'mac':
       print("Generation of static executable will not work on OSX "
-            "when using default compilation environment")
+            "when using the default compilation environment")
+      return
+
+    if options.fully_static:
+      o['libraries'] += ['-static']
+    elif options.partly_static:
+      o['libraries'] += ['-static-libgcc', '-static-libstdc++']
+      if options.enable_asan:
+        o['libraries'] += ['-static-libasan']
 
 
 def configure_winsdk(o):
@@ -1119,7 +1132,7 @@ configure_v8(output)
 configure_openssl(output)
 configure_winsdk(output)
 configure_intl(output)
-configure_fullystatic(output)
+configure_static(output)
 
 # variables should be a root level element,
 # move everything else to target_defaults

From 0c2a0dc859a7f322db7885c2cc18655d72f748e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Pocztarski?= <r.pocztarski@gmail.com>
Date: Wed, 2 Dec 2015 18:13:27 +0100
Subject: [PATCH 317/323] test: skip long path tests on non-Windows

If not running on Windows it skips the long path tests in:

* test-fs-long-path.js
* test-require-long-path.js

Fixes: https://github.com/nodejs/node/issues/2255
PR-URL: https://github.com/nodejs/node/pull/4116
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
---
 test/parallel/test-fs-long-path.js      | 5 +++++
 test/parallel/test-require-long-path.js | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/test/parallel/test-fs-long-path.js b/test/parallel/test-fs-long-path.js
index 6ecf54902964fa..eadbcd1f78df98 100644
--- a/test/parallel/test-fs-long-path.js
+++ b/test/parallel/test-fs-long-path.js
@@ -4,6 +4,11 @@ var fs = require('fs');
 var path = require('path');
 var assert = require('assert');
 
+if (!common.isWindows) {
+  console.log('1..0 # Skipped: this test is Windows-specific.');
+  return;
+}
+
 var successes = 0;
 
 // make a path that will be at least 260 chars long.
diff --git a/test/parallel/test-require-long-path.js b/test/parallel/test-require-long-path.js
index 1f7e28cba2960c..c30a76a5a9e099 100644
--- a/test/parallel/test-require-long-path.js
+++ b/test/parallel/test-require-long-path.js
@@ -3,6 +3,11 @@ const common = require('../common');
 const fs = require('fs');
 const path = require('path');
 
+if (!common.isWindows) {
+  console.log('1..0 # Skipped: this test is Windows-specific.');
+  return;
+}
+
 // make a path that is more than 260 chars long.
 const dirNameLen = Math.max(260 - common.tmpDir.length, 1);
 const dirName = path.join(common.tmpDir, 'x'.repeat(dirNameLen));

From da5ac55c83eb2c09cfb3baf7875529e8f1113529 Mon Sep 17 00:00:00 2001
From: Michael Ruddy <mruddybtc@gmail.com>
Date: Thu, 19 Nov 2015 14:00:00 -0500
Subject: [PATCH 318/323] crypto: simplify using pre-existing keys with ECDH

These changes simplify using ECDH with private keys that are not
dynamically generated with ECDH.generateKeys.

Support for computing the public key corresponding to the given private
key was added. Validity checks to reduce the possibility of computing
a weak or invalid shared secret were also added.

Finally, ECDH.setPublicKey was softly deprecated.

PR-URL: https://github.com/nodejs/node/pull/3511
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
---
 doc/api/crypto.markdown         |  48 ++++++++++++---
 src/node_crypto.cc              |  76 ++++++++++++++++++++---
 src/node_crypto.h               |   5 +-
 test/parallel/test-crypto-dh.js | 106 +++++++++++++++++++++++++++-----
 4 files changed, 197 insertions(+), 38 deletions(-)

diff --git a/doc/api/crypto.markdown b/doc/api/crypto.markdown
index 62e83e62db2210..f90ec1c429a826 100644
--- a/doc/api/crypto.markdown
+++ b/doc/api/crypto.markdown
@@ -260,7 +260,23 @@ then a buffer is returned.
 
 Sets the EC Diffie-Hellman private key. Key encoding can be `'binary'`,
 `'hex'` or `'base64'`. If no encoding is provided, then a buffer is
-expected.
+expected. If `private_key` is not valid for the curve specified when
+the ECDH object was created, then an error is thrown. Upon setting
+the private key, the associated public point (key) is also generated
+and set in the ECDH object.
+
+### ECDH.setPublicKey(public_key[, encoding])
+
+    Stability: 0 - Deprecated
+
+Sets the EC Diffie-Hellman public key. Key encoding can be `'binary'`,
+`'hex'` or `'base64'`. If no encoding is provided, then a buffer is
+expected. Note that there is not normally a reason to call this
+method. This is because ECDH only needs your private key and the
+other party's public key to compute the shared secret. Thus, usually
+either `generateKeys` or `setPrivateKey` will be called.
+Note that `setPrivateKey` attempts to generate the public point/key
+associated with the private key being set.
 
 Example (obtaining a shared secret):
 
@@ -268,20 +284,21 @@ Example (obtaining a shared secret):
     var alice = crypto.createECDH('secp256k1');
     var bob = crypto.createECDH('secp256k1');
 
-    alice.generateKeys();
+    // Note: This is a shortcut way to specify one of Alice's previous private
+    // keys. It would be unwise to use such a predictable private key in a real
+    // application.
+    alice.setPrivateKey(
+      crypto.createHash('sha256').update('alice', 'utf8').digest()
+    );
+
+    // Bob uses a newly generated cryptographically strong pseudorandom key pair
     bob.generateKeys();
 
     var alice_secret = alice.computeSecret(bob.getPublicKey(), null, 'hex');
     var bob_secret = bob.computeSecret(alice.getPublicKey(), null, 'hex');
 
-    /* alice_secret and bob_secret should be the same */
-    console.log(alice_secret == bob_secret);
-
-### ECDH.setPublicKey(public_key[, encoding])
-
-Sets the EC Diffie-Hellman public key. Key encoding can be `'binary'`,
-`'hex'` or `'base64'`. If no encoding is provided, then a buffer is
-expected.
+    // alice_secret and bob_secret should be the same shared secret value
+    console.log(alice_secret === bob_secret);
 
 ## Class: Hash
 
@@ -761,6 +778,17 @@ default, set the `crypto.DEFAULT_ENCODING` field to 'binary'.  Note
 that new programs will probably expect buffers, so only use this as a
 temporary measure.
 
+Usage of `ECDH` with non-dynamically generated key pairs has been simplified.
+Now, `setPrivateKey` can be called with a preselected private key and the
+associated public point (key) will be computed and stored in the object.
+This allows you to only store and provide the private part of the EC key pair.
+`setPrivateKey` now also validates that the private key is valid for the curve.
+`ECDH.setPublicKey` is now deprecated as its inclusion in the API is not
+useful. Either a previously stored private key should be set, which
+automatically generates the associated public key, or `generateKeys` should be
+called. The main drawback of `ECDH.setPublicKey` is that it can be used to put
+the ECDH key pair into an inconsistent state.
+
 ## Caveats
 
 The crypto module still supports some algorithms which are already
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index bd7314c9db902c..e7df4b4ef86f32 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -124,6 +124,13 @@ struct ClearErrorOnReturn {
   ~ClearErrorOnReturn() { ERR_clear_error(); }
 };
 
+// Pop errors from OpenSSL's error stack that were added
+// between when this was constructed and destructed.
+struct MarkPopErrorOnReturn {
+  MarkPopErrorOnReturn() { ERR_set_mark(); }
+  ~MarkPopErrorOnReturn() { ERR_pop_to_mark(); }
+};
+
 static uv_mutex_t* locks;
 
 const char* const root_certs[] = {
@@ -4656,8 +4663,6 @@ void ECDH::GenerateKeys(const FunctionCallbackInfo<Value>& args) {
 
   if (!EC_KEY_generate_key(ecdh->key_))
     return env->ThrowError("Failed to generate EC_KEY");
-
-  ecdh->generated_ = true;
 }
 
 
@@ -4697,6 +4702,9 @@ void ECDH::ComputeSecret(const FunctionCallbackInfo<Value>& args) {
 
   ECDH* ecdh = Unwrap<ECDH>(args.Holder());
 
+  if (!ecdh->IsKeyPairValid())
+    return env->ThrowError("Invalid key pair");
+
   EC_POINT* pub = ecdh->BufferToPoint(Buffer::Data(args[0]),
                                       Buffer::Length(args[0]));
   if (pub == nullptr)
@@ -4728,9 +4736,6 @@ void ECDH::GetPublicKey(const FunctionCallbackInfo<Value>& args) {
 
   ECDH* ecdh = Unwrap<ECDH>(args.Holder());
 
-  if (!ecdh->generated_)
-    return env->ThrowError("You should generate ECDH keys first");
-
   const EC_POINT* pub = EC_KEY_get0_public_key(ecdh->key_);
   if (pub == nullptr)
     return env->ThrowError("Failed to get ECDH public key");
@@ -4763,9 +4768,6 @@ void ECDH::GetPrivateKey(const FunctionCallbackInfo<Value>& args) {
 
   ECDH* ecdh = Unwrap<ECDH>(args.Holder());
 
-  if (!ecdh->generated_)
-    return env->ThrowError("You should generate ECDH keys first");
-
   const BIGNUM* b = EC_KEY_get0_private_key(ecdh->key_);
   if (b == nullptr)
     return env->ThrowError("Failed to get ECDH private key");
@@ -4799,12 +4801,42 @@ void ECDH::SetPrivateKey(const FunctionCallbackInfo<Value>& args) {
   if (priv == nullptr)
     return env->ThrowError("Failed to convert Buffer to BN");
 
+  if (!ecdh->IsKeyValidForCurve(priv)) {
+    BN_free(priv);
+    return env->ThrowError("Private key is not valid for specified curve.");
+  }
+
   int result = EC_KEY_set_private_key(ecdh->key_, priv);
   BN_free(priv);
 
   if (!result) {
     return env->ThrowError("Failed to convert BN to a private key");
   }
+
+  // To avoid inconsistency, clear the current public key in-case computing
+  // the new one fails for some reason.
+  EC_KEY_set_public_key(ecdh->key_, nullptr);
+
+  MarkPopErrorOnReturn mark_pop_error_on_return;
+  (void) &mark_pop_error_on_return;  // Silence compiler warning.
+
+  const BIGNUM* priv_key = EC_KEY_get0_private_key(ecdh->key_);
+  CHECK_NE(priv_key, nullptr);
+
+  EC_POINT* pub = EC_POINT_new(ecdh->group_);
+  CHECK_NE(pub, nullptr);
+
+  if (!EC_POINT_mul(ecdh->group_, pub, priv_key, nullptr, nullptr, nullptr)) {
+    EC_POINT_free(pub);
+    return env->ThrowError("Failed to generate ECDH public key");
+  }
+
+  if (!EC_KEY_set_public_key(ecdh->key_, pub)) {
+    EC_POINT_free(pub);
+    return env->ThrowError("Failed to set generated public key");
+  }
+
+  EC_POINT_free(pub);
 }
 
 
@@ -4818,12 +4850,36 @@ void ECDH::SetPublicKey(const FunctionCallbackInfo<Value>& args) {
   EC_POINT* pub = ecdh->BufferToPoint(Buffer::Data(args[0].As<Object>()),
                                       Buffer::Length(args[0].As<Object>()));
   if (pub == nullptr)
-    return;
+    return env->ThrowError("Failed to convert Buffer to EC_POINT");
 
   int r = EC_KEY_set_public_key(ecdh->key_, pub);
   EC_POINT_free(pub);
   if (!r)
-    return env->ThrowError("Failed to convert BN to a private key");
+    return env->ThrowError("Failed to set EC_POINT as the public key");
+}
+
+
+bool ECDH::IsKeyValidForCurve(const BIGNUM* private_key) {
+  ASSERT_NE(group_, nullptr);
+  CHECK_NE(private_key, nullptr);
+  // Private keys must be in the range [1, n-1].
+  // Ref: Section 3.2.1 - http://www.secg.org/sec1-v2.pdf
+  if (BN_cmp(private_key, BN_value_one()) < 0) {
+    return false;
+  }
+  BIGNUM* order = BN_new();
+  CHECK_NE(order, nullptr);
+  bool result = EC_GROUP_get_order(group_, order, nullptr) &&
+                BN_cmp(private_key, order) < 0;
+  BN_free(order);
+  return result;
+}
+
+
+bool ECDH::IsKeyPairValid() {
+  MarkPopErrorOnReturn mark_pop_error_on_return;
+  (void) &mark_pop_error_on_return;  // Silence compiler warning.
+  return 1 == EC_KEY_check_key(key_);
 }
 
 
diff --git a/src/node_crypto.h b/src/node_crypto.h
index beeb2fb4458267..d3d66e32dd1313 100644
--- a/src/node_crypto.h
+++ b/src/node_crypto.h
@@ -693,7 +693,6 @@ class ECDH : public BaseObject {
  protected:
   ECDH(Environment* env, v8::Local<v8::Object> wrap, EC_KEY* key)
       : BaseObject(env, wrap),
-        generated_(false),
         key_(key),
         group_(EC_KEY_get0_group(key_)) {
     MakeWeak<ECDH>(this);
@@ -710,7 +709,9 @@ class ECDH : public BaseObject {
 
   EC_POINT* BufferToPoint(char* data, size_t len);
 
-  bool generated_;
+  bool IsKeyPairValid();
+  bool IsKeyValidForCurve(const BIGNUM* private_key);
+
   EC_KEY* key_;
   const EC_GROUP* group_;
 };
diff --git a/test/parallel/test-crypto-dh.js b/test/parallel/test-crypto-dh.js
index f3e54c46a8e16b..a1e8fb1d7da4ac 100644
--- a/test/parallel/test-crypto-dh.js
+++ b/test/parallel/test-crypto-dh.js
@@ -1,13 +1,13 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
-var constants = require('constants');
+const common = require('../common');
+const assert = require('assert');
+const constants = require('constants');
 
 if (!common.hasCrypto) {
   console.log('1..0 # Skipped: missing crypto');
   return;
 }
-var crypto = require('crypto');
+const crypto = require('crypto');
 
 // Test Diffie-Hellman with two parties sharing a secret,
 // using various encodings as we go along
@@ -150,36 +150,110 @@ assert.equal(bad_dh.verifyError, constants.DH_NOT_SUITABLE_GENERATOR);
 
 
 // Test ECDH
-var ecdh1 = crypto.createECDH('prime256v1');
-var ecdh2 = crypto.createECDH('prime256v1');
-var key1 = ecdh1.generateKeys();
-var key2 = ecdh2.generateKeys('hex');
-var secret1 = ecdh1.computeSecret(key2, 'hex', 'base64');
-var secret2 = ecdh2.computeSecret(key1, 'binary', 'buffer');
+const ecdh1 = crypto.createECDH('prime256v1');
+const ecdh2 = crypto.createECDH('prime256v1');
+key1 = ecdh1.generateKeys();
+key2 = ecdh2.generateKeys('hex');
+secret1 = ecdh1.computeSecret(key2, 'hex', 'base64');
+secret2 = ecdh2.computeSecret(key1, 'binary', 'buffer');
 
 assert.equal(secret1, secret2.toString('base64'));
 
 // Point formats
 assert.equal(ecdh1.getPublicKey('buffer', 'uncompressed')[0], 4);
-var firstByte = ecdh1.getPublicKey('buffer', 'compressed')[0];
+let firstByte = ecdh1.getPublicKey('buffer', 'compressed')[0];
 assert(firstByte === 2 || firstByte === 3);
-var firstByte = ecdh1.getPublicKey('buffer', 'hybrid')[0];
+firstByte = ecdh1.getPublicKey('buffer', 'hybrid')[0];
 assert(firstByte === 6 || firstByte === 7);
 
 // ECDH should check that point is on curve
-var ecdh3 = crypto.createECDH('secp256k1');
-var key3 = ecdh3.generateKeys();
+const ecdh3 = crypto.createECDH('secp256k1');
+const key3 = ecdh3.generateKeys();
 
 assert.throws(function() {
-  var secret3 = ecdh2.computeSecret(key3, 'binary', 'buffer');
+  ecdh2.computeSecret(key3, 'binary', 'buffer');
 });
 
 // ECDH should allow .setPrivateKey()/.setPublicKey()
-var ecdh4 = crypto.createECDH('prime256v1');
+const ecdh4 = crypto.createECDH('prime256v1');
 
 ecdh4.setPrivateKey(ecdh1.getPrivateKey());
 ecdh4.setPublicKey(ecdh1.getPublicKey());
 
 assert.throws(function() {
   ecdh4.setPublicKey(ecdh3.getPublicKey());
+}, /Failed to convert Buffer to EC_POINT/);
+
+// Verify that we can use ECDH without having to use newly generated keys.
+const ecdh5 = crypto.createECDH('secp256k1');
+
+// Verify errors are thrown when retrieving keys from an uninitialized object.
+assert.throws(function() {
+  ecdh5.getPublicKey();
+}, /Failed to get ECDH public key/);
+assert.throws(function() {
+  ecdh5.getPrivateKey();
+}, /Failed to get ECDH private key/);
+
+// A valid private key for the secp256k1 curve.
+const cafebabeKey = 'cafebabe'.repeat(8);
+// Associated compressed and uncompressed public keys (points).
+const cafebabePubPtComp =
+'03672a31bfc59d3f04548ec9b7daeeba2f61814e8ccc40448045007f5479f693a3';
+const cafebabePubPtUnComp =
+'04672a31bfc59d3f04548ec9b7daeeba2f61814e8ccc40448045007f5479f693a3' +
+'2e02c7f93d13dc2732b760ca377a5897b9dd41a1c1b29dc0442fdce6d0a04d1d';
+ecdh5.setPrivateKey(cafebabeKey, 'hex');
+assert.equal(ecdh5.getPrivateKey('hex'), cafebabeKey);
+// Show that the public point (key) is generated while setting the private key.
+assert.equal(ecdh5.getPublicKey('hex'), cafebabePubPtUnComp);
+
+// Compressed and uncompressed public points/keys for other party's private key
+// 0xDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEF
+const peerPubPtComp =
+'02c6b754b20826eb925e052ee2c25285b162b51fdca732bcf67e39d647fb6830ae';
+const peerPubPtUnComp =
+'04c6b754b20826eb925e052ee2c25285b162b51fdca732bcf67e39d647fb6830ae' +
+'b651944a574a362082a77e3f2b5d9223eb54d7f2f76846522bf75f3bedb8178e';
+
+const sharedSecret =
+'1da220b5329bbe8bfd19ceef5a5898593f411a6f12ea40f2a8eead9a5cf59970';
+
+assert.equal(ecdh5.computeSecret(peerPubPtComp, 'hex', 'hex'), sharedSecret);
+assert.equal(ecdh5.computeSecret(peerPubPtUnComp, 'hex', 'hex'), sharedSecret);
+
+// Verify that we still have the same key pair as before the computation.
+assert.equal(ecdh5.getPrivateKey('hex'), cafebabeKey);
+assert.equal(ecdh5.getPublicKey('hex'), cafebabePubPtUnComp);
+
+// Verify setting and getting compressed and non-compressed serializations.
+ecdh5.setPublicKey(cafebabePubPtComp, 'hex');
+assert.equal(ecdh5.getPublicKey('hex'), cafebabePubPtUnComp);
+assert.equal(ecdh5.getPublicKey('hex', 'compressed'), cafebabePubPtComp);
+ecdh5.setPublicKey(cafebabePubPtUnComp, 'hex');
+assert.equal(ecdh5.getPublicKey('hex'), cafebabePubPtUnComp);
+assert.equal(ecdh5.getPublicKey('hex', 'compressed'), cafebabePubPtComp);
+
+// Show why allowing the public key to be set on this type does not make sense.
+ecdh5.setPublicKey(peerPubPtComp, 'hex');
+assert.equal(ecdh5.getPublicKey('hex'), peerPubPtUnComp);
+assert.throws(function() {
+  // Error because the public key does not match the private key anymore.
+  ecdh5.computeSecret(peerPubPtComp, 'hex', 'hex');
+}, /Invalid key pair/);
+
+// Set to a valid key to show that later attempts to set an invalid key are
+// rejected.
+ecdh5.setPrivateKey(cafebabeKey, 'hex');
+
+[ // Some invalid private keys for the secp256k1 curve.
+  '0000000000000000000000000000000000000000000000000000000000000000',
+  'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141',
+  'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF',
+].forEach(function(element, index, object) {
+  assert.throws(function() {
+    ecdh5.setPrivateKey(element, 'hex');
+  }, /Private key is not valid for specified curve/);
+  // Verify object state did not change.
+  assert.equal(ecdh5.getPrivateKey('hex'), cafebabeKey);
 });

From 8a5e4345fde266d322cc76f130aaf7ed58b0f212 Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Sun, 6 Dec 2015 13:28:15 +1100
Subject: [PATCH 319/323] node: s/doNTCallbackX/nextTickCallbackWithXArgs/

Rename doNTCallback functions for clarity when profiling, these make
sense internally but the "NT" in particular is a bit obtuse to be
immediately understandable by non-core developers.

PR-URL: https://github.com/nodejs/node/pull/4167
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
---
 src/node.js                     | 30 +++++++++++++++---------------
 test/message/eval_messages.out  |  8 ++++----
 test/message/nexttick_throw.out |  2 +-
 test/message/stdin_messages.out |  8 ++++----
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/node.js b/src/node.js
index 1cf03972feacb1..8a6a2521e2f3d2 100644
--- a/src/node.js
+++ b/src/node.js
@@ -356,20 +356,20 @@
           // callback invocation with small numbers of arguments to avoid the
           // performance hit associated with using `fn.apply()`
           if (args === undefined) {
-            doNTCallback0(callback);
+            nextTickCallbackWith0Args(callback);
           } else {
             switch (args.length) {
               case 1:
-                doNTCallback1(callback, args[0]);
+                nextTickCallbackWith1Arg(callback, args[0]);
                 break;
               case 2:
-                doNTCallback2(callback, args[0], args[1]);
+                nextTickCallbackWith2Args(callback, args[0], args[1]);
                 break;
               case 3:
-                doNTCallback3(callback, args[0], args[1], args[2]);
+                nextTickCallbackWith3Args(callback, args[0], args[1], args[2]);
                 break;
               default:
-                doNTCallbackMany(callback, args);
+                nextTickCallbackWithManyArgs(callback, args);
             }
           }
           if (1e4 < tickInfo[kIndex])
@@ -397,20 +397,20 @@
           // callback invocation with small numbers of arguments to avoid the
           // performance hit associated with using `fn.apply()`
           if (args === undefined) {
-            doNTCallback0(callback);
+            nextTickCallbackWith0Args(callback);
           } else {
             switch (args.length) {
               case 1:
-                doNTCallback1(callback, args[0]);
+                nextTickCallbackWith1Arg(callback, args[0]);
                 break;
               case 2:
-                doNTCallback2(callback, args[0], args[1]);
+                nextTickCallbackWith2Args(callback, args[0], args[1]);
                 break;
               case 3:
-                doNTCallback3(callback, args[0], args[1], args[2]);
+                nextTickCallbackWith3Args(callback, args[0], args[1], args[2]);
                 break;
               default:
-                doNTCallbackMany(callback, args);
+                nextTickCallbackWithManyArgs(callback, args);
             }
           }
           if (1e4 < tickInfo[kIndex])
@@ -424,7 +424,7 @@
       } while (tickInfo[kLength] !== 0);
     }
 
-    function doNTCallback0(callback) {
+    function nextTickCallbackWith0Args(callback) {
       var threw = true;
       try {
         callback();
@@ -435,7 +435,7 @@
       }
     }
 
-    function doNTCallback1(callback, arg1) {
+    function nextTickCallbackWith1Arg(callback, arg1) {
       var threw = true;
       try {
         callback(arg1);
@@ -446,7 +446,7 @@
       }
     }
 
-    function doNTCallback2(callback, arg1, arg2) {
+    function nextTickCallbackWith2Args(callback, arg1, arg2) {
       var threw = true;
       try {
         callback(arg1, arg2);
@@ -457,7 +457,7 @@
       }
     }
 
-    function doNTCallback3(callback, arg1, arg2, arg3) {
+    function nextTickCallbackWith3Args(callback, arg1, arg2, arg3) {
       var threw = true;
       try {
         callback(arg1, arg2, arg3);
@@ -468,7 +468,7 @@
       }
     }
 
-    function doNTCallbackMany(callback, args) {
+    function nextTickCallbackWithManyArgs(callback, args) {
       var threw = true;
       try {
         callback.apply(null, args);
diff --git a/test/message/eval_messages.out b/test/message/eval_messages.out
index b02da9b2808087..4fb3c7f56d5859 100644
--- a/test/message/eval_messages.out
+++ b/test/message/eval_messages.out
@@ -7,7 +7,7 @@ SyntaxError: Strict mode code may not include a with statement
     at Object.<anonymous> ([eval]-wrapper:*:*)
     at Module._compile (module.js:*:*)
     at node.js:*:*
-    at doNTCallback0 (node.js:*:*)
+    at nextTickCallbackWith0Args (node.js:*:*)
     at process._tickCallback (node.js:*:*)
 42
 42
@@ -20,7 +20,7 @@ Error: hello
     at Object.<anonymous> ([eval]-wrapper:*:*)
     at Module._compile (module.js:*:*)
     at node.js:*:*
-    at doNTCallback0 (node.js:*:*)
+    at nextTickCallbackWith0Args (node.js:*:*)
     at process._tickCallback (node.js:*:*)
 [eval]:1
 throw new Error("hello")
@@ -31,7 +31,7 @@ Error: hello
     at Object.<anonymous> ([eval]-wrapper:*:*)
     at Module._compile (module.js:*:*)
     at node.js:*:*
-    at doNTCallback0 (node.js:*:*)
+    at nextTickCallbackWith0Args (node.js:*:*)
     at process._tickCallback (node.js:*:*)
 100
 [eval]:1
@@ -43,7 +43,7 @@ ReferenceError: y is not defined
     at Object.<anonymous> ([eval]-wrapper:*:*)
     at Module._compile (module.js:*:*)
     at node.js:*:*
-    at doNTCallback0 (node.js:*:*)
+    at nextTickCallbackWith0Args (node.js:*:*)
     at process._tickCallback (node.js:*:*)
 [eval]:1
 var ______________________________________________; throw 10
diff --git a/test/message/nexttick_throw.out b/test/message/nexttick_throw.out
index 1dd60694a892b8..1e03f6de84b90a 100644
--- a/test/message/nexttick_throw.out
+++ b/test/message/nexttick_throw.out
@@ -4,7 +4,7 @@
         ^
 ReferenceError: undefined_reference_error_maker is not defined
     at *test*message*nexttick_throw.js:*:*
-    at doNTCallback0 (node.js:*:*)
+    at nextTickCallbackWith0Args (node.js:*:*)
     at process._tickCallback (node.js:*:*)
     at Function.Module.runMain (module.js:*:*)
     at startup (node.js:*:*)
diff --git a/test/message/stdin_messages.out b/test/message/stdin_messages.out
index 94a55c79aba043..57908426079e15 100644
--- a/test/message/stdin_messages.out
+++ b/test/message/stdin_messages.out
@@ -8,7 +8,7 @@ SyntaxError: Strict mode code may not include a with statement
     at Object.<anonymous> ([stdin]-wrapper:*:*)
     at Module._compile (module.js:*:*)
     at node.js:*:*
-    at doNTCallback0 (node.js:*:*)
+    at nextTickCallbackWith0Args (node.js:*:*)
     at process._tickCallback (node.js:*:*)
 42
 42
@@ -22,7 +22,7 @@ Error: hello
     at Object.<anonymous> ([stdin]-wrapper:*:*)
     at Module._compile (module.js:*:*)
     at node.js:*:*
-    at doNTCallback0 (node.js:*:*)
+    at nextTickCallbackWith0Args (node.js:*:*)
     at process._tickCallback (node.js:*:*)
 
 [stdin]:1
@@ -34,7 +34,7 @@ Error: hello
     at Object.<anonymous> ([stdin]-wrapper:*:*)
     at Module._compile (module.js:*:*)
     at node.js:*:*
-    at doNTCallback0 (node.js:*:*)
+    at nextTickCallbackWith0Args (node.js:*:*)
     at process._tickCallback (node.js:*:*)
 100
 
@@ -47,7 +47,7 @@ ReferenceError: y is not defined
     at Object.<anonymous> ([stdin]-wrapper:*:*)
     at Module._compile (module.js:*:*)
     at node.js:*:*
-    at doNTCallback0 (node.js:*:*)
+    at nextTickCallbackWith0Args (node.js:*:*)
     at process._tickCallback (node.js:*:*)
 
 [stdin]:1

From 08a3f29fd42d478b5aec8fb909d2936d36035b7b Mon Sep 17 00:00:00 2001
From: Matt Loring <mattloring@google.com>
Date: Mon, 7 Dec 2015 16:52:53 -0700
Subject: [PATCH 320/323] buffer: fix range checking for slowToString

If `start` is not a valid number in the range, then the default value
zero will be used. Same way, if `end` is not a valid number in the
accepted range, then, by default, the length of the buffer is assumed.

Fixes: https://github.com/nodejs/node/issues/2668
Ref: https://github.com/nodejs/node/pull/2919
PR-URL: https://github.com/nodejs/node/pull/4019
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 lib/buffer.js        | 31 ++++++++++++++++++++++++++-----
 src/node_internals.h |  2 +-
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/lib/buffer.js b/lib/buffer.js
index 5f67ea104b47de..1d1d5382c584d4 100644
--- a/lib/buffer.js
+++ b/lib/buffer.js
@@ -327,13 +327,34 @@ Object.defineProperty(Buffer.prototype, 'offset', {
 function slowToString(encoding, start, end) {
   var loweredCase = false;
 
-  start = start >>> 0;
-  end = end === undefined || end === Infinity ? this.length : end >>> 0;
+  // No need to verify that "this.length <= MAX_UINT32" since it's a read-only
+  // property of a typed array.
+
+  // This behaves neither like String nor Uint8Array in that we set start/end
+  // to their upper/lower bounds if the value passed is out of range.
+  // undefined is handled specially as per ECMA-262 6th Edition,
+  // Section 13.3.3.7 Runtime Semantics: KeyedBindingInitialization.
+  if (start === undefined || start < 0)
+    start = 0;
+  // Return early if start > this.length. Done here to prevent potential uint32
+  // coercion fail below.
+  if (start > this.length)
+    return '';
+
+  if (end === undefined || end > this.length)
+    end = this.length;
+
+  if (end <= 0)
+    return '';
+
+  // Force coersion to uint32. This will also coerce falsey/NaN values to 0.
+  end >>>= 0;
+  start >>>= 0;
+
+  if (end <= start)
+    return '';
 
   if (!encoding) encoding = 'utf8';
-  if (start < 0) start = 0;
-  if (end > this.length) end = this.length;
-  if (end <= start) return '';
 
   while (true) {
     switch (encoding) {
diff --git a/src/node_internals.h b/src/node_internals.h
index bfe4fced26297a..e1ba9e22941e31 100644
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -172,7 +172,7 @@ inline MUST_USE_RESULT bool ParseArrayIndex(v8::Local<v8::Value> arg,
     return true;
   }
 
-  int32_t tmp_i = arg->Int32Value();
+  int32_t tmp_i = arg->Uint32Value();
 
   if (tmp_i < 0)
     return false;

From 1d50819c852ff352c89d0e57b784cdec5c508143 Mon Sep 17 00:00:00 2001
From: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Date: Mon, 7 Dec 2015 16:53:48 -0700
Subject: [PATCH 321/323] test: check range fix for slowToString

Verify that start and end are coerced properly.

Ref: https://github.com/nodejs/node/pull/2919
PR-URL: https://github.com/nodejs/node/pull/4019
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
---
 test/parallel/test-buffer.js | 81 +++++++++++++++++++++++++++++++++---
 1 file changed, 75 insertions(+), 6 deletions(-)

diff --git a/test/parallel/test-buffer.js b/test/parallel/test-buffer.js
index 6222e1aa39b9a5..808a8829b32d39 100644
--- a/test/parallel/test-buffer.js
+++ b/test/parallel/test-buffer.js
@@ -248,14 +248,83 @@ b.copy(new Buffer(1), 1, 1, 1);
 // try to copy 0 bytes from past the end of the source buffer
 b.copy(new Buffer(1), 0, 2048, 2048);
 
-// try to toString() a 0-length slice of a buffer, both within and without the
-// valid buffer range
-assert.equal(new Buffer('abc').toString('ascii', 0, 0), '');
-assert.equal(new Buffer('abc').toString('ascii', -100, -100), '');
-assert.equal(new Buffer('abc').toString('ascii', 100, 100), '');
+const rangeBuffer = new Buffer('abc');
+
+// if start >= buffer's length, empty string will be returned
+assert.equal(rangeBuffer.toString('ascii', 3), '');
+assert.equal(rangeBuffer.toString('ascii', +Infinity), '');
+assert.equal(rangeBuffer.toString('ascii', 3.14, 3), '');
+assert.equal(rangeBuffer.toString('ascii', 'Infinity', 3), '');
+
+// if end <= 0, empty string will be returned
+assert.equal(rangeBuffer.toString('ascii', 1, 0), '');
+assert.equal(rangeBuffer.toString('ascii', 1, -1.2), '');
+assert.equal(rangeBuffer.toString('ascii', 1, -100), '');
+assert.equal(rangeBuffer.toString('ascii', 1, -Infinity), '');
+
+// if start < 0, start will be taken as zero
+assert.equal(rangeBuffer.toString('ascii', -1, 3), 'abc');
+assert.equal(rangeBuffer.toString('ascii', -1.99, 3), 'abc');
+assert.equal(rangeBuffer.toString('ascii', -Infinity, 3), 'abc');
+assert.equal(rangeBuffer.toString('ascii', '-1', 3), 'abc');
+assert.equal(rangeBuffer.toString('ascii', '-1.99', 3), 'abc');
+assert.equal(rangeBuffer.toString('ascii', '-Infinity', 3), 'abc');
+
+// if start is an invalid integer, start will be taken as zero
+assert.equal(rangeBuffer.toString('ascii', 'node.js', 3), 'abc');
+assert.equal(rangeBuffer.toString('ascii', {}, 3), 'abc');
+assert.equal(rangeBuffer.toString('ascii', [], 3), 'abc');
+assert.equal(rangeBuffer.toString('ascii', NaN, 3), 'abc');
+assert.equal(rangeBuffer.toString('ascii', null, 3), 'abc');
+assert.equal(rangeBuffer.toString('ascii', undefined, 3), 'abc');
+assert.equal(rangeBuffer.toString('ascii', false, 3), 'abc');
+assert.equal(rangeBuffer.toString('ascii', '', 3), 'abc');
+
+// but, if start is an integer when coerced, then it will be coerced and used.
+assert.equal(rangeBuffer.toString('ascii', '-1', 3), 'abc');
+assert.equal(rangeBuffer.toString('ascii', '1', 3), 'bc');
+assert.equal(rangeBuffer.toString('ascii', '-Infinity', 3), 'abc');
+assert.equal(rangeBuffer.toString('ascii', '3', 3), '');
+assert.equal(rangeBuffer.toString('ascii', Number(3), 3), '');
+assert.equal(rangeBuffer.toString('ascii', '3.14', 3), '');
+assert.equal(rangeBuffer.toString('ascii', '1.99', 3), 'bc');
+assert.equal(rangeBuffer.toString('ascii', '-1.99', 3), 'abc');
+assert.equal(rangeBuffer.toString('ascii', 1.99, 3), 'bc');
+assert.equal(rangeBuffer.toString('ascii', true, 3), 'bc');
+
+// if end > buffer's length, end will be taken as buffer's length
+assert.equal(rangeBuffer.toString('ascii', 0, 5), 'abc');
+assert.equal(rangeBuffer.toString('ascii', 0, 6.99), 'abc');
+assert.equal(rangeBuffer.toString('ascii', 0, Infinity), 'abc');
+assert.equal(rangeBuffer.toString('ascii', 0, '5'), 'abc');
+assert.equal(rangeBuffer.toString('ascii', 0, '6.99'), 'abc');
+assert.equal(rangeBuffer.toString('ascii', 0, 'Infinity'), 'abc');
+
+// if end is an invalid integer, end will be taken as buffer's length
+assert.equal(rangeBuffer.toString('ascii', 0, 'node.js'), '');
+assert.equal(rangeBuffer.toString('ascii', 0, {}), '');
+assert.equal(rangeBuffer.toString('ascii', 0, NaN), '');
+assert.equal(rangeBuffer.toString('ascii', 0, undefined), 'abc');
+assert.equal(rangeBuffer.toString('ascii', 0), 'abc');
+assert.equal(rangeBuffer.toString('ascii', 0, null), '');
+assert.equal(rangeBuffer.toString('ascii', 0, []), '');
+assert.equal(rangeBuffer.toString('ascii', 0, false), '');
+assert.equal(rangeBuffer.toString('ascii', 0, ''), '');
+
+// but, if end is an integer when coerced, then it will be coerced and used.
+assert.equal(rangeBuffer.toString('ascii', 0, '-1'), '');
+assert.equal(rangeBuffer.toString('ascii', 0, '1'), 'a');
+assert.equal(rangeBuffer.toString('ascii', 0, '-Infinity'), '');
+assert.equal(rangeBuffer.toString('ascii', 0, '3'), 'abc');
+assert.equal(rangeBuffer.toString('ascii', 0, Number(3)), 'abc');
+assert.equal(rangeBuffer.toString('ascii', 0, '3.14'), 'abc');
+assert.equal(rangeBuffer.toString('ascii', 0, '1.99'), 'a');
+assert.equal(rangeBuffer.toString('ascii', 0, '-1.99'), '');
+assert.equal(rangeBuffer.toString('ascii', 0, 1.99), 'a');
+assert.equal(rangeBuffer.toString('ascii', 0, true), 'a');
 
 // try toString() with a object as a encoding
-assert.equal(new Buffer('abc').toString({toString: function() {
+assert.equal(rangeBuffer.toString({toString: function() {
   return 'ascii';
 }}), 'abc');
 

From da3137d0c5d5254e5d81a32674ca0559729bbcb5 Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Tue, 1 Dec 2015 20:34:45 -0500
Subject: [PATCH 322/323] src: don't print garbage errors

If JS throws an object whose toString() method throws, then Node
attempts to print an empty message, but actually prints garbage.
This commit checks for this case, and prints a message instead.

Fixes: https://github.com/nodejs/node/issues/4079
PR-URL: https://github.com/nodejs/node/pull/4112
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
---
 src/node.cc                           | 6 ++++--
 test/fixtures/throws_error7.js        | 5 +++++
 test/parallel/test-error-reporting.js | 9 ++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 test/fixtures/throws_error7.js

diff --git a/src/node.cc b/src/node.cc
index d8681292aad36a..bf544c470d9472 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -1511,8 +1511,10 @@ static void ReportException(Environment* env,
         name.IsEmpty() ||
         name->IsUndefined()) {
       // Not an error object. Just print as-is.
-      node::Utf8Value message(env->isolate(), er);
-      PrintErrorString("%s\n", *message);
+      String::Utf8Value message(er);
+
+      PrintErrorString("%s\n", *message ? *message :
+                                          "<toString() threw exception>");
     } else {
       node::Utf8Value name_string(env->isolate(), name);
       node::Utf8Value message_string(env->isolate(), message);
diff --git a/test/fixtures/throws_error7.js b/test/fixtures/throws_error7.js
new file mode 100644
index 00000000000000..f730bc6def1ba9
--- /dev/null
+++ b/test/fixtures/throws_error7.js
@@ -0,0 +1,5 @@
+throw {
+  toString: function() {
+    throw this;
+  }
+};
diff --git a/test/parallel/test-error-reporting.js b/test/parallel/test-error-reporting.js
index 88ef5d306e3e37..b5b70eeb3b2add 100644
--- a/test/parallel/test-error-reporting.js
+++ b/test/parallel/test-error-reporting.js
@@ -24,8 +24,6 @@ function errExec(script, callback) {
 
     // Count the tests
     exits++;
-
-    console.log('.');
   });
 }
 
@@ -64,6 +62,11 @@ errExec('throws_error6.js', function(err, stdout, stderr) {
   assert.ok(/SyntaxError/.test(stderr));
 });
 
+// Object that throws in toString() doesn't print garbage
+errExec('throws_error7.js', function(err, stdout, stderr) {
+  assert.ok(/<toString\(\) threw exception/.test(stderr));
+});
+
 process.on('exit', function() {
-  assert.equal(6, exits);
+  assert.equal(7, exits);
 });

From 9f34df8c2bb83ba3d81f7a3d3b9e209fd43c2321 Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Tue, 8 Dec 2015 11:21:40 +1100
Subject: [PATCH 323/323] 2015-12-08, Version 5.2.0 (Stable)

Notable changes:
---
 CHANGELOG.md       | 114 +++++++++++++++++++++++++++++++++++++++++++++
 src/node_version.h |   6 +--
 2 files changed, 117 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ed7cf28bdac01..4860135b18cc43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,119 @@
 # Node.js ChangeLog
 
+## 2015-12-08, Version 5.2.0 (Stable), @rvagg
+
+### Notable changes
+
+* 
+
+### Known issues
+
+* Surrogate pair in REPL can freeze terminal. [#690](https://github.com/nodejs/node/issues/690)
+* Calling `dns.setServers()` while a DNS query is in progress can cause the process to crash on a failed assertion. [#894](https://github.com/nodejs/node/issues/894)
+* `url.resolve` may transfer the auth portion of the url when resolving between two full hosts, see [#1435](https://github.com/nodejs/node/issues/1435).
+* Unicode characters in filesystem paths are not handled consistently across platforms or Node.js APIs. See [#2088](https://github.com/nodejs/node/issues/2088), [#3401](https://github.com/nodejs/node/issues/3401) and [#3519](https://github.com/nodejs/node/issues/3519).
+
+### Commits
+
+* [[`08a3f29fd4`](https://github.com/nodejs/node/commit/08a3f29fd4)] - **buffer**: fix range checking for slowToString (Matt Loring) [#4019](https://github.com/nodejs/node/pull/4019)
+* [[`e3a8e8bba4`](https://github.com/nodejs/node/commit/e3a8e8bba4)] - **buffer**: Prevent Buffer constructor deopt (Bryce Baril) [#4158](https://github.com/nodejs/node/pull/4158)
+* [[`0e18e68324`](https://github.com/nodejs/node/commit/0e18e68324)] - **buffer**: fix writeInt{B,L}E for some neg values (Peter A. Bigot) [#3994](https://github.com/nodejs/node/pull/3994)
+* [[`ab5b529dd2`](https://github.com/nodejs/node/commit/ab5b529dd2)] - **buffer**: default to UTF8 in byteLength() (Tom Gallacher) [#4010](https://github.com/nodejs/node/pull/4010)
+* [[`fcf0e8ebdf`](https://github.com/nodejs/node/commit/fcf0e8ebdf)] - **buffer**: move checkFloat from lib into src (Matt Loring) [#3763](https://github.com/nodejs/node/pull/3763)
+* [[`12649f4496`](https://github.com/nodejs/node/commit/12649f4496)] - **build**: add "--partly-static" build options (Super Zheng) [#4152](https://github.com/nodejs/node/pull/4152)
+* [[`a76d788119`](https://github.com/nodejs/node/commit/a76d788119)] - **build**: update signtool description, add url (Rod Vagg) [#4011](https://github.com/nodejs/node/pull/4011)
+* [[`ed255abdc1`](https://github.com/nodejs/node/commit/ed255abdc1)] - **(SEMVER-MINOR)** **build,src**: add Intel Vtune profiling support (Chunyang Dai) [#3785](https://github.com/nodejs/node/pull/3785)
+* [[`7793c364fc`](https://github.com/nodejs/node/commit/7793c364fc)] - **child_process**: flush consuming streams (Dave) [#4071](https://github.com/nodejs/node/pull/4071)
+* [[`f29c5d6e70`](https://github.com/nodejs/node/commit/f29c5d6e70)] - **configure**: `v8_use_snapshot` should be `true` (Fedor Indutny) [#3962](https://github.com/nodejs/node/pull/3962)
+* [[`da5ac55c83`](https://github.com/nodejs/node/commit/da5ac55c83)] - **(SEMVER-MINOR)** **crypto**: simplify using pre-existing keys with ECDH (Michael Ruddy) [#3511](https://github.com/nodejs/node/pull/3511)
+* [[`cfc97641ee`](https://github.com/nodejs/node/commit/cfc97641ee)] - **crypto**: fix native module compilation with FIPS (Stefan Budeanu) [#4023](https://github.com/nodejs/node/pull/4023)
+* [[`b81b45dabd`](https://github.com/nodejs/node/commit/b81b45dabd)] - **crypto**: update root certificates (Ben Noordhuis) [#3951](https://github.com/nodejs/node/pull/3951)
+* [[`def681a07e`](https://github.com/nodejs/node/commit/def681a07e)] - **crypto**: disable crypto.createCipher in FIPS mode (Stefan Budeanu) [#3754](https://github.com/nodejs/node/pull/3754)
+* [[`ce423f3624`](https://github.com/nodejs/node/commit/ce423f3624)] - **debugger**: introduce exec method for debugger (Jackson Tian)
+* [[`99fd1ec28d`](https://github.com/nodejs/node/commit/99fd1ec28d)] - **deps**: backport 819b40a from V8 upstream (Michaël Zasso) [#3937](https://github.com/nodejs/node/pull/3937)
+* [[`634c5f1f81`](https://github.com/nodejs/node/commit/634c5f1f81)] - **doc**: url.format - true slash postfix behaviour (fansworld-claudio) [#4119](https://github.com/nodejs/node/pull/4119)
+* [[`6f957a70d8`](https://github.com/nodejs/node/commit/6f957a70d8)] - **doc**: s/node.js/Node.js in readme (Rod Vagg) [#3998](https://github.com/nodejs/node/pull/3998)
+* [[`0cd4a52392`](https://github.com/nodejs/node/commit/0cd4a52392)] - **doc**: improve child_process.markdown wording (yorkie) [#4138](https://github.com/nodejs/node/pull/4138)
+* [[`fd5ed6888d`](https://github.com/nodejs/node/commit/fd5ed6888d)] - **doc**: add JungMinu to collaborators (Minwoo Jung) [#4143](https://github.com/nodejs/node/pull/4143)
+* [[`fa0cdf75d9`](https://github.com/nodejs/node/commit/fa0cdf75d9)] - **doc**: add iarna to collaborators (Rebecca Turner) [#4144](https://github.com/nodejs/node/pull/4144)
+* [[`424eb962b1`](https://github.com/nodejs/node/commit/424eb962b1)] - **doc**: add zkat to collaborators (Kat Marchán) [#4142](https://github.com/nodejs/node/pull/4142)
+* [[`85b601224b`](https://github.com/nodejs/node/commit/85b601224b)] - **doc**: add HTTP working group (James M Snell) [#3919](https://github.com/nodejs/node/pull/3919)
+* [[`f4164bd8df`](https://github.com/nodejs/node/commit/f4164bd8df)] - **doc**: update links to use https where possible (jpersson) [#4054](https://github.com/nodejs/node/pull/4054)
+* [[`3169eed1e3`](https://github.com/nodejs/node/commit/3169eed1e3)] - **doc**: add links and backticks around names (jpersson) [#4054](https://github.com/nodejs/node/pull/4054)
+* [[`f3417e2574`](https://github.com/nodejs/node/commit/f3417e2574)] - **doc**: standardize references to node.js in docs (Scott Buchanan) [#4136](https://github.com/nodejs/node/pull/4136)
+* [[`95dd60c657`](https://github.com/nodejs/node/commit/95dd60c657)] - **doc**: reword https.Agent example text (Jan Krems) [#4075](https://github.com/nodejs/node/pull/4075)
+* [[`c61237d3ea`](https://github.com/nodejs/node/commit/c61237d3ea)] - **doc**: fix internal link to child.send() (Luigi Pinca) [#4089](https://github.com/nodejs/node/pull/4089)
+* [[`aaeced915e`](https://github.com/nodejs/node/commit/aaeced915e)] - **doc**: fix the exception description (yorkie) [#3658](https://github.com/nodejs/node/pull/3658)
+* [[`a2b7596ac0`](https://github.com/nodejs/node/commit/a2b7596ac0)] - **doc**: fix color of linked code blocks (jpersson) [#4068](https://github.com/nodejs/node/pull/4068)
+* [[`f3c50f5fb5`](https://github.com/nodejs/node/commit/f3c50f5fb5)] - **doc**: fix rare case of misaligned columns (Roman Reiss) [#3948](https://github.com/nodejs/node/pull/3948)
+* [[`f0a2e2cdec`](https://github.com/nodejs/node/commit/f0a2e2cdec)] - **doc**: message.header duplication correction (Bryan English) [#3997](https://github.com/nodejs/node/pull/3997)
+* [[`b1dfa8bebb`](https://github.com/nodejs/node/commit/b1dfa8bebb)] - **doc**: fix typo in README (Rich Trott) [#4000](https://github.com/nodejs/node/pull/4000)
+* [[`4602e01221`](https://github.com/nodejs/node/commit/4602e01221)] - **doc**: replace sane with reasonable (Lewis Cowper) [#3980](https://github.com/nodejs/node/pull/3980)
+* [[`4849a54386`](https://github.com/nodejs/node/commit/4849a54386)] - **doc**: Adding best practises for crypto.pbkdf2 (Tom Gallacher) [#3290](https://github.com/nodejs/node/pull/3290)
+* [[`77251d99de`](https://github.com/nodejs/node/commit/77251d99de)] - **doc**: numeric flags to fs.open (Carl Lei) [#3641](https://github.com/nodejs/node/pull/3641)
+* [[`f4ca007b42`](https://github.com/nodejs/node/commit/f4ca007b42)] - **doc**: clarify that fs streams expect blocking fd (Carl Lei) [#3641](https://github.com/nodejs/node/pull/3641)
+* [[`26eeae8016`](https://github.com/nodejs/node/commit/26eeae8016)] - **doc**: fix broken references (Alexander Gromnitsky) [#3944](https://github.com/nodejs/node/pull/3944)
+* [[`f90227b0e8`](https://github.com/nodejs/node/commit/f90227b0e8)] - **doc**: move fs.existsSync() deprecation message (Martin Forsberg) [#3942](https://github.com/nodejs/node/pull/3942)
+* [[`bbcb2a2e65`](https://github.com/nodejs/node/commit/bbcb2a2e65)] - **doc**: clarify module loading behavior (cjihrig) [#3920](https://github.com/nodejs/node/pull/3920)
+* [[`0997178037`](https://github.com/nodejs/node/commit/0997178037)] - **doc**: add reference for buffer.inspect() (cjihrig) [#3921](https://github.com/nodejs/node/pull/3921)
+* [[`6c16c40283`](https://github.com/nodejs/node/commit/6c16c40283)] - **doc**: clarify v5.1.1 notable items (Rod Vagg) [#4156](https://github.com/nodejs/node/pull/4156)
+* [[`4c8800c2de`](https://github.com/nodejs/node/commit/4c8800c2de)] - **fs,doc**: use `target` instead of `destination` (yorkie) [#3912](https://github.com/nodejs/node/pull/3912)
+* [[`1f0e8dca8e`](https://github.com/nodejs/node/commit/1f0e8dca8e)] - **installer**: install the tick processor (Matt Loring) [#3032](https://github.com/nodejs/node/pull/3032)
+* [[`e8e4e0718b`](https://github.com/nodejs/node/commit/e8e4e0718b)] - **meta**: remove use of profanity in source (Myles Borins) [#4122](https://github.com/nodejs/node/pull/4122)
+* [[`13834caa28`](https://github.com/nodejs/node/commit/13834caa28)] - **module**: fix column offsets in errors (Tristian Flanagan) [#2867](https://github.com/nodejs/node/pull/2867)
+* [[`8988e1e117`](https://github.com/nodejs/node/commit/8988e1e117)] - **module,repl**: remove repl require() hack (Ben Noordhuis) [#4026](https://github.com/nodejs/node/pull/4026)
+* [[`baac81d95f`](https://github.com/nodejs/node/commit/baac81d95f)] - **net**: add local address/port for better errors (Jan Schär) [#3946](https://github.com/nodejs/node/pull/3946)
+* [[`12754c5dc3`](https://github.com/nodejs/node/commit/12754c5dc3)] - **net**: small code cleanup (Jan Schär) [#3943](https://github.com/nodejs/node/pull/3943)
+* [[`8a5e4345fd`](https://github.com/nodejs/node/commit/8a5e4345fd)] - **node**: s/doNTCallbackX/nextTickCallbackWithXArgs/ (Rod Vagg) [#4167](https://github.com/nodejs/node/pull/4167)
+* [[`0869ef3c55`](https://github.com/nodejs/node/commit/0869ef3c55)] - **(SEMVER-MINOR)** **repl**: allow leading period in multiline input (Zirak) [#3835](https://github.com/nodejs/node/pull/3835)
+* [[`aaab108dfe`](https://github.com/nodejs/node/commit/aaab108dfe)] - **repl**: attach location info to syntax errors (cjihrig) [#4013](https://github.com/nodejs/node/pull/4013)
+* [[`9e9346fa32`](https://github.com/nodejs/node/commit/9e9346fa32)] - **src**: use GetCurrentProcessId() for process.pid (Ben Noordhuis) [#4163](https://github.com/nodejs/node/pull/4163)
+* [[`d969c0965c`](https://github.com/nodejs/node/commit/d969c0965c)] - **src**: define Is* util functions with macros (cjihrig) [#4118](https://github.com/nodejs/node/pull/4118)
+* [[`458facdf66`](https://github.com/nodejs/node/commit/458facdf66)] - **src**: define getpid() based on OS (cjihrig) [#4146](https://github.com/nodejs/node/pull/4146)
+* [[`7e18f2ec62`](https://github.com/nodejs/node/commit/7e18f2ec62)] - **(SEMVER-MINOR)** **src**: add BE support to StringBytes::Encode() (Bryon Leung) [#3410](https://github.com/nodejs/node/pull/3410)
+* [[`756ab9caad`](https://github.com/nodejs/node/commit/756ab9caad)] - **stream**: be less eager with readable flag (Brian White) [#4141](https://github.com/nodejs/node/pull/4141)
+* [[`8f845ba28a`](https://github.com/nodejs/node/commit/8f845ba28a)] - **stream_wrap**: error if stream has StringDecoder (Fedor Indutny) [#4031](https://github.com/nodejs/node/pull/4031)
+* [[`1c1af81ea0`](https://github.com/nodejs/node/commit/1c1af81ea0)] - **streams**: update .readable/.writable to false (Brian White) [#4083](https://github.com/nodejs/node/pull/4083)
+* [[`1d50819c85`](https://github.com/nodejs/node/commit/1d50819c85)] - **test**: check range fix for slowToString (Sakthipriyan Vairamani) [#4019](https://github.com/nodejs/node/pull/4019)
+* [[`0c2a0dc859`](https://github.com/nodejs/node/commit/0c2a0dc859)] - **test**: skip long path tests on non-Windows (Rafał Pocztarski) [#4116](https://github.com/nodejs/node/pull/4116)
+* [[`8a60aa1303`](https://github.com/nodejs/node/commit/8a60aa1303)] - **test**: don't check the # of chunks in test-http-1.0 (Santiago Gimeno) [#3961](https://github.com/nodejs/node/pull/3961)
+* [[`e84aeec883`](https://github.com/nodejs/node/commit/e84aeec883)] - **test**: mark test-cluster-shared-leak flaky (Rich Trott) [#4162](https://github.com/nodejs/node/pull/4162)
+* [[`b3f3b2e157`](https://github.com/nodejs/node/commit/b3f3b2e157)] - **test**: fix cluster-worker-isdead (Santiago Gimeno) [#3954](https://github.com/nodejs/node/pull/3954)
+* [[`da6be4d31a`](https://github.com/nodejs/node/commit/da6be4d31a)] - **test**: fix time resolution constraint (Gireesh Punathil) [#3981](https://github.com/nodejs/node/pull/3981)
+* [[`9d16729b20`](https://github.com/nodejs/node/commit/9d16729b20)] - **test**: skip instead of fail when mem constrained (Michael Cornacchia) [#3697](https://github.com/nodejs/node/pull/3697)
+* [[`be41eb751b`](https://github.com/nodejs/node/commit/be41eb751b)] - **test**: refactor test-http-exit-delay (Rich Trott) [#4055](https://github.com/nodejs/node/pull/4055)
+* [[`4b43bf0385`](https://github.com/nodejs/node/commit/4b43bf0385)] - **test**: fix flaky test-net-socket-local-address (Rich Trott) [#4109](https://github.com/nodejs/node/pull/4109)
+* [[`cb55c67a00`](https://github.com/nodejs/node/commit/cb55c67a00)] - **test**: improve cluster-disconnect-handles test (Brian White) [#4084](https://github.com/nodejs/node/pull/4084)
+* [[`2b5b127e14`](https://github.com/nodejs/node/commit/2b5b127e14)] - **test**: fix cluster-disconnect-handles flakiness (Santiago Gimeno) [#4009](https://github.com/nodejs/node/pull/4009)
+* [[`430264817b`](https://github.com/nodejs/node/commit/430264817b)] - **test**: add test for repl.defineCommand() (Bryan English) [#3908](https://github.com/nodejs/node/pull/3908)
+* [[`22b0971222`](https://github.com/nodejs/node/commit/22b0971222)] - **test**: eliminate multicast test FreeBSD flakiness (Rich Trott) [#4042](https://github.com/nodejs/node/pull/4042)
+* [[`c50003746b`](https://github.com/nodejs/node/commit/c50003746b)] - **test**: mark test flaky on FreeBSD (Rich Trott) [#4016](https://github.com/nodejs/node/pull/4016)
+* [[`69c95bbdb7`](https://github.com/nodejs/node/commit/69c95bbdb7)] - **test**: move ArrayStream to common (cjihrig) [#4027](https://github.com/nodejs/node/pull/4027)
+* [[`d94a70ec51`](https://github.com/nodejs/node/commit/d94a70ec51)] - **test**: fix test-domain-exit-dispose-again (Julien Gilli) [#3990](https://github.com/nodejs/node/pull/3990)
+* [[`00b839a2b8`](https://github.com/nodejs/node/commit/00b839a2b8)] - **test**: use platform-based timeout for reliability (Rich Trott) [#4015](https://github.com/nodejs/node/pull/4015)
+* [[`054a216b6f`](https://github.com/nodejs/node/commit/054a216b6f)] - **test**: mark cluster-net-send test flaky on windows (Rich Trott) [#4006](https://github.com/nodejs/node/pull/4006)
+* [[`d0621c5649`](https://github.com/nodejs/node/commit/d0621c5649)] - **test**: mark fork regression test flaky on windows (Rich Trott) [#4005](https://github.com/nodejs/node/pull/4005)
+* [[`19ed33df80`](https://github.com/nodejs/node/commit/19ed33df80)] - **test**: skip test if in FreeBSD jail (Rich Trott) [#3995](https://github.com/nodejs/node/pull/3995)
+* [[`a863e8d667`](https://github.com/nodejs/node/commit/a863e8d667)] - **test**: remove flaky status for cluster test (Rich Trott) [#3975](https://github.com/nodejs/node/pull/3975)
+* [[`dd0d15fc47`](https://github.com/nodejs/node/commit/dd0d15fc47)] - **test**: add TAP diagnostic message for retried tests (Rich Trott) [#3960](https://github.com/nodejs/node/pull/3960)
+* [[`1fe4d30efc`](https://github.com/nodejs/node/commit/1fe4d30efc)] - **test**: retry on smartos if ECONNREFUSED (Rich Trott) [#3941](https://github.com/nodejs/node/pull/3941)
+* [[`665a35d45e`](https://github.com/nodejs/node/commit/665a35d45e)] - **test**: address flaky test-http-client-timeout-event (Rich Trott) [#3968](https://github.com/nodejs/node/pull/3968)
+* [[`f9fe0aee53`](https://github.com/nodejs/node/commit/f9fe0aee53)] - **test**: numeric flags to fs.open (Carl Lei) [#3641](https://github.com/nodejs/node/pull/3641)
+* [[`54aafa17af`](https://github.com/nodejs/node/commit/54aafa17af)] - **test**: http complete list of non-concat headers (Bryan English) [#3930](https://github.com/nodejs/node/pull/3930)
+* [[`788541b40c`](https://github.com/nodejs/node/commit/788541b40c)] - **test**: fix race condition in unrefd interval test (Michael Cornacchia) [#3550](https://github.com/nodejs/node/pull/3550)
+* [[`e129d83996`](https://github.com/nodejs/node/commit/e129d83996)] - **test**: skip/replace weak crypto tests in FIPS mode (Stefan Budeanu) [#3757](https://github.com/nodejs/node/pull/3757)
+* [[`bc27379453`](https://github.com/nodejs/node/commit/bc27379453)] - **test**: avoid test timeouts on rpi (Stefan Budeanu) [#3902](https://github.com/nodejs/node/pull/3902)
+* [[`272732e76b`](https://github.com/nodejs/node/commit/272732e76b)] - **test**: fix flaky test-child-process-spawnsync-input (Rich Trott) [#3889](https://github.com/nodejs/node/pull/3889)
+* [[`781f8c0d1e`](https://github.com/nodejs/node/commit/781f8c0d1e)] - **test**: add OS X to module loading error test (Evan Lucas) [#3901](https://github.com/nodejs/node/pull/3901)
+* [[`f99c6363de`](https://github.com/nodejs/node/commit/f99c6363de)] - **test**: module loading error fix solaris #3798 (fansworld-claudio) [#3855](https://github.com/nodejs/node/pull/3855)
+* [[`1279adc756`](https://github.com/nodejs/node/commit/1279adc756)] - **timers**: optimize callback call: bind -> arrow (Andrei Sedoi) [#4038](https://github.com/nodejs/node/pull/4038)
+* [[`d7a7d3e6f7`](https://github.com/nodejs/node/commit/d7a7d3e6f7)] - **tools**: update certdata.txt (Ben Noordhuis) [#3951](https://github.com/nodejs/node/pull/3951)
+* [[`1b434e0654`](https://github.com/nodejs/node/commit/1b434e0654)] - **util**: determine object types in C++ (cjihrig) [#4100](https://github.com/nodejs/node/pull/4100)
+* [[`c93e2678f0`](https://github.com/nodejs/node/commit/c93e2678f0)] - **util**: fix constructor/instanceof checks (Brian White) [#3385](https://github.com/nodejs/node/pull/3385)
+* [[`098a3113e1`](https://github.com/nodejs/node/commit/098a3113e1)] - **util**: move .decorateErrorStack to internal/util (Ben Noordhuis) [#4026](https://github.com/nodejs/node/pull/4026)
+* [[`e68ea16c32`](https://github.com/nodejs/node/commit/e68ea16c32)] - **util**: add decorateErrorStack() (cjihrig) [#4013](https://github.com/nodejs/node/pull/4013)
+* [[`c584c3e08f`](https://github.com/nodejs/node/commit/c584c3e08f)] - **util,src**: allow lookup of hidden values (cjihrig) [#3988](https://github.com/nodejs/node/pull/3988)
+
 ## 2015-12-04, Version 5.1.1 (Stable), @rvagg
 
 ### Notable changes
diff --git a/src/node_version.h b/src/node_version.h
index d60b7e0aa00188..bf751cfd57d37b 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -2,10 +2,10 @@
 #define SRC_NODE_VERSION_H_
 
 #define NODE_MAJOR_VERSION 5
-#define NODE_MINOR_VERSION 1
-#define NODE_PATCH_VERSION 2
+#define NODE_MINOR_VERSION 2
+#define NODE_PATCH_VERSION 0
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)